From 1ded0cb24c4cd6b456ff18b6162d2173cc6330fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 14 Oct 2016 17:36:57 +0200
Subject: [PATCH 0001/3246] gcc: Make 6.x the default

Fixes #19456.
---
 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 00b05fce30f..589d077f0f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4538,7 +4538,7 @@ in
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc = gcc5;
+  gcc = gcc6;
 
   wrapCCMulti = cc:
     if system == "x86_64-linux" then lowPrio (

From bbc204cd98ec83e40f3ebae7889fdd095179ea9e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 14 Oct 2016 17:52:14 +0200
Subject: [PATCH 0002/3246] binutils: Add lib output

Some packages depend on libbfd. This prevents them from having all of
binutils in their closure (which is 29 MiB).
---
 .../tools/misc/binutils/default.nix           |  8 +++++++-
 .../tools/misc/binutils/no-plugins.patch      | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/binutils/no-plugins.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 4c32255e875..0214cafb1a7 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -32,9 +32,15 @@ stdenv.mkDerivation rec {
     # This is needed, for instance, so that running "ldd" on a binary that is
     # PaX-marked to disable mprotect doesn't fail with permission denied.
     ./pt-pax-flags.patch
+
+    # Bfd looks in BINDIR/../lib for some plugins that don't
+    # exist. This is pointless (since users can't install plugins
+    # there) and causes a cycle between the lib and bin outputs, so
+    # get rid of it.
+    ./no-plugins.patch
   ];
 
-  outputs = [ "out" "info" ] ++ (optional (cross == null) "dev");
+  outputs = [ "out" "lib" "info" ] ++ (optional (cross == null) "dev");
 
   nativeBuildInputs = [ bison ];
   buildInputs = [ zlib ];
diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch
new file mode 100644
index 00000000000..9624b7976b7
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/no-plugins.patch
@@ -0,0 +1,19 @@
+diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c
+--- binutils-2.27-orig/bfd/plugin.c	2016-10-14 17:46:30.791315555 +0200
++++ binutils-2.27/bfd/plugin.c	2016-10-14 17:46:38.583298765 +0200
+@@ -333,6 +333,7 @@
+   if (plugin_program_name == NULL)
+     return found;
+ 
++#if 0
+   plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL);
+   p = make_relative_prefix (plugin_program_name,
+ 			    BINDIR,
+@@ -364,6 +365,7 @@
+   free (p);
+   if (d)
+     closedir (d);
++#endif
+ 
+   return found;
+ }

From 04fefde9e42f84d956fb2112fd3ff0b65c742d3e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 19 Oct 2016 16:19:11 +0200
Subject: [PATCH 0003/3246] audiofile: Fix build on GCC 6

http://hydra.nixos.org/build/42228674
---
 .../libraries/audiofile/default.nix           |  2 +-
 .../libraries/audiofile/gcc-6.patch           | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/audiofile/gcc-6.patch

diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index c76115000cb..78867881dc3 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind";
   };
 
-  patches = [ ./CVE-2015-7747.patch ];
+  patches = [ ./CVE-2015-7747.patch ./gcc-6.patch ];
 
   meta = with stdenv.lib; {
     description = "Library for reading and writing audio files in various formats";
diff --git a/pkgs/development/libraries/audiofile/gcc-6.patch b/pkgs/development/libraries/audiofile/gcc-6.patch
new file mode 100644
index 00000000000..1a7edd5af9a
--- /dev/null
+++ b/pkgs/development/libraries/audiofile/gcc-6.patch
@@ -0,0 +1,30 @@
+http://patchwork.ozlabs.org/patch/630200/
+
+From 28cfdbbcb96a69087c3d21faf69b5eae7bcf6d69 Mon Sep 17 00:00:00 2001
+From: Hodorgasm <nsane457@gmail.com>
+Date: Wed, 11 May 2016 21:42:07 -0400
+Subject: [PATCH] Cast to unsigned while left bit-shifting
+
+GCC-6 now treats the left bitwise-shift of a negative integer as nonconformant so explicitly cast to an unsigned int while bit-shifting.
+
+Downloaded from upstream PR:
+https://github.com/mpruett/audiofile/pull/28
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libaudiofile/modules/SimpleModule.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h
+index 03c6c69..4014fb2 100644
+--- a/libaudiofile/modules/SimpleModule.h
++++ b/libaudiofile/modules/SimpleModule.h
+@@ -123,7 +123,7 @@ struct signConverter
+ 	typedef typename IntTypes<Format>::UnsignedType UnsignedType;
+ 
+ 	static const int kScaleBits = (Format + 1) * CHAR_BIT - 1;
+-	static const int kMinSignedValue = -1 << kScaleBits;
++	static const int kMinSignedValue = static_cast<signed>(static_cast<unsigned>(-1) << kScaleBits);;
+ 
+ 	struct signedToUnsigned : public std::unary_function<SignedType, UnsignedType>
+ 	{

From b5cbecd12794c79f4ddb9ef11e6e6b9131d8930e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 2 Nov 2016 15:31:43 +0100
Subject: [PATCH 0004/3246] memtest86+: Build with gcc 5

http://hydra.nixos.org/build/43011285
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 547895a340c..b93d0f51751 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2626,7 +2626,9 @@ in
 
   memtest86 = callPackage ../tools/misc/memtest86 { };
 
-  memtest86plus = callPackage ../tools/misc/memtest86+ { };
+  memtest86plus = callPackage ../tools/misc/memtest86+ {
+    stdenv = overrideCC stdenv gcc5;
+  };
 
   meo = callPackage ../tools/security/meo {
     boost = boost155;

From 624cecfd1e76e0e17850d126db9af056654275ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 3 Nov 2016 09:24:03 +0100
Subject: [PATCH 0005/3246] libfaketime: Fix build on gcc 6

http://hydra.nixos.org/build/43031670
---
 pkgs/development/libraries/libfaketime/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix
index 7d430614257..49710339828 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/pkgs/development/libraries/libfaketime/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
     makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib)
   '';
 
+  # Work around "libfaketime.c:513:7: error: nonnull argument 'buf' compared to NULL [-Werror=nonnull-compare]".
+  NIX_CFLAGS_COMPILE = "-Wno-nonnull-compare";
+
   meta = with stdenv.lib; {
     description = "Report faked system time to programs without having to change the system-wide time";
     homepage = http://www.code-wizards.com/projects/libfaketime/;

From 820186434ae33fee3953c8e74f111c45d6779192 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 9 Nov 2016 14:46:26 +0100
Subject: [PATCH 0006/3246] guile: Fix random test failure

Also, let's try parallel building again. Seems to work on several
tries.

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24769#12

http://hydra.nixos.org/build/43385084
---
 .../interpreters/guile/default.nix            |  8 ++--
 .../interpreters/guile/fix-test.patch         | 38 +++++++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/interpreters/guile/fix-test.patch

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 97f8f61a98e..391885a4404 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -16,8 +16,8 @@
 
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
-  propagatedBuildInputs = [ gmp boehmgc ]
 
+  propagatedBuildInputs = [ gmp boehmgc ]
     # XXX: These ones aren't normally needed here, but since
     # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
     # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
@@ -27,11 +27,9 @@
   # A native Guile 2.0 is needed to cross-build Guile.
   selfNativeBuildInput = true;
 
-  # Guile 2.0.11 repeatable fails with 8-core parallel building because
-  # libguile/vm-i-system.i is not created in time
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
-  patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch ] ++
+  patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch ./fix-test.patch ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
   # Explicitly link against libgcc_s, to work around the infamous
diff --git a/pkgs/development/interpreters/guile/fix-test.patch b/pkgs/development/interpreters/guile/fix-test.patch
new file mode 100644
index 00000000000..91bfa822b9e
--- /dev/null
+++ b/pkgs/development/interpreters/guile/fix-test.patch
@@ -0,0 +1,38 @@
+From 2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
+Date: Fri, 4 Nov 2016 22:45:51 +0100
+Subject: tests: Avoid race condition in REPL server test.
+
+Fixes <http://bugs.gnu.org/24769>.
+Reported by Rob Browning <rlb@defaultvalue.org>.
+
+* test-suite/tests/00-repl-server.test ("simple expression"): Add call
+to 'select' before 'display'.
+---
+ test-suite/tests/00-repl-server.test | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/test-suite/tests/00-repl-server.test b/test-suite/tests/00-repl-server.test
+index 1f570a9..4b5ec0c 100644
+--- a/test-suite/tests/00-repl-server.test
++++ b/test-suite/tests/00-repl-server.test
+@@ -105,8 +105,14 @@ reached."
+       "scheme@(repl-server)> $1 = 42\n"
+     (with-repl-server socket
+       (read-until-prompt socket %last-line-before-prompt)
+-      (display "(+ 40 2)\n(quit)\n" socket)
+-      (read-string socket)))
++
++      ;; Wait until 'repl-reader' in boot-9 has written the prompt.
++      ;; Otherwise, if we write too quickly, 'repl-reader' checks for
++      ;; 'char-ready?' and doesn't print the prompt.
++      (match (select (list socket) '() (list socket) 3)
++        (((_) () ())
++         (display "(+ 40 2)\n(quit)\n" socket)
++         (read-string socket)))))
+ 
+   (pass-if "HTTP inter-protocol attack"           ;CVE-2016-8606
+     (with-repl-server socket
+-- 
+cgit v1.0
+

From a399c55a0f45381e0581597bc87700134d059de6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 9 Nov 2016 15:28:57 +0100
Subject: [PATCH 0007/3246] libraw: 0.17.1 -> 0.17.2

Also apply a fix from Debian for building with GCC 6.
---
 pkgs/development/libraries/libraw/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index fedc5287b49..10979abdeab 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,13 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5";
+    sha256 = "0p6imxpsfn82i0i9w27fnzq6q6gwzvb9f7sygqqakv36fqnc9c4j";
   };
 
+  patches =
+    [ (fetchurl {
+        url = https://anonscm.debian.org/cgit/pkg-phototools/libraw.git/plain/debian/patches/0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823;
+        sha256 = "1lcg5l0wmwiyzhhm67c1c7hy8py6ihxfmicnhrwpi3i6f16vq29w";
+      })
+    ];
+
   outputs = [ "out" "lib" "dev" "doc" ];
 
   buildInputs = [ jasper ];

From 1751568e9fddb140d1e2f1070b5629224b126162 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 17 Jan 2017 04:58:14 +0100
Subject: [PATCH 0008/3246] ragel: fix build with gcc 6

---
 pkgs/development/tools/parsing/ragel/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 05546da67f0..0fe243e8aaf 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -20,6 +20,8 @@ let
 
       configureFlags = [ "--with-colm=${colm}" ];
 
+      NIX_CFLAGS_COMPILE = "-std=gnu++98";
+
       doCheck = true;
 
       meta = with stdenv.lib; {

From a9be685dbfbb427d623de69ad3b25977d7559eed Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 17 Jan 2017 05:07:11 +0100
Subject: [PATCH 0009/3246] geos: 3.5.0 -> 3.6.1

---
 pkgs/development/libraries/geos/default.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index d63a1bb7572..de7111f6be3 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,24 +1,17 @@
-{ composableDerivation, fetchurl, python }:
+{ stdenv, fetchurl, fetchpatch, python }:
 
-let inherit (composableDerivation) edf; in
-
-composableDerivation.composableDerivation {} rec {
-
-  flags =
-  # python and ruby untested 
-    edf { name = "python"; enable = { buildInputs = [ python ]; }; };
-    # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
-    # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
-
-  name = "geos-3.5.0";
+stdenv.mkDerivation rec {
+  name = "geos-3.6.1";
 
   src = fetchurl {
     url = "http://download.osgeo.org/geos/${name}.tar.bz2";
-    sha256 = "49982b23bcfa64a53333dab136b82e25354edeb806e5a2e2f5b8aa98b1d0ae02";
+    sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja";
   };
 
   enableParallelBuilding = true;
 
+  buildInputs = [ python ];
+
   meta = {
     description = "C++ port of the Java Topology Suite (JTS)";
     homepage = http://geos.refractions.net/;

From e28c3a4d42d81216bc19d01b1ba30236b5a54e66 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 17 Jan 2017 22:51:17 +0100
Subject: [PATCH 0010/3246] protobuf3_0: 3.0.0 -> 3.0.2

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

diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix
index f80acf462b8..4e77e7f1fbe 100644
--- a/pkgs/development/libraries/protobuf/3.0.nix
+++ b/pkgs/development/libraries/protobuf/3.0.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }:
 
 callPackage ./generic-v3.nix {
-  version = "3.0.0";
-  sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7";
+  version = "3.0.2";
+  sha256 = "16wmr1fgdqpf84fkq90cxvccfsxx7h0q0wzqkbg8vdjmka412g09";
 }

From 26d24cf111cd5e800ee3d89ed484a5eabae68a5c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 00:11:59 +0100
Subject: [PATCH 0011/3246] protobuf3_0: fix build with gcc 6

---
 pkgs/development/libraries/protobuf/generic-v3.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index f74aea9dbd5..315608bf2b4 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation";
+
   meta = {
     description = "Google's data interchange format";
     longDescription =

From 064dd204b716d22c645b696914efc3da8de8bd9d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 00:22:08 +0100
Subject: [PATCH 0012/3246] qt4: add patch to fix build with gcc6, set c++ std

---
 .../development/libraries/qt-4.x/4.8/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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 91a8899f4d1..cfb4ac61459 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -80,12 +80,19 @@ stdenv.mkDerivation rec {
         gtk = gtk2.out;
         gdk_pixbuf = gdk_pixbuf.out;
       })
-    ++ [(fetchpatch {
+    ++ [
+      (fetchpatch {
         name = "fix-medium-font.patch";
         url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/"
           + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4";
         sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j";
-      })];
+      })
+      (fetchpatch {
+        name = "qt4-gcc6.patch";
+        url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f";
+        sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34";
+      })
+    ];
 
   preConfigure = ''
     export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
@@ -145,8 +152,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = false;
 
-  NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
-    "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
+  NIX_CFLAGS_COMPILE = "-std=gnu++98"
+    + optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
+      "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
     + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1";
 
   NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)

From fe0fe963bd12205b78f5b82026105e31e784532d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 01:12:49 +0100
Subject: [PATCH 0013/3246] smpeg: build with gcc 6

---
 pkgs/development/libraries/smpeg/default.nix  |  7 ++--
 pkgs/development/libraries/smpeg/format.patch | 11 +++++++
 pkgs/development/libraries/smpeg/gcc6.patch   | 33 +++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/smpeg/format.patch
 create mode 100644 pkgs/development/libraries/smpeg/gcc6.patch

diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
index 6803dfd76de..f248d65e2ed 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -10,9 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0";
   };
 
-  enableParallelBuilding = true;
+  patches = [
+    ./format.patch
+    ./gcc6.patch
+  ];
 
-  hardeningDisable = [ "format" ];
+  enableParallelBuilding = true;
 
   buildInputs = [ SDL gtk2 mesa ];
 
diff --git a/pkgs/development/libraries/smpeg/format.patch b/pkgs/development/libraries/smpeg/format.patch
new file mode 100644
index 00000000000..8486dee5cda
--- /dev/null
+++ b/pkgs/development/libraries/smpeg/format.patch
@@ -0,0 +1,11 @@
+--- a/plaympeg.c	2014-09-04 08:55:10.646132150 +0200
++++ b/plaympeg.c	2014-09-04 08:56:57.465210820 +0200
+@@ -262,7 +262,7 @@
+       answer[i] = c;
+     }
+     answer[i] = 0;
+-    fprintf(stderr, answer + 4);
++    fprintf(stderr, "%s", answer + 4);
+   }
+   while(answer[3] == '-');
+ 
diff --git a/pkgs/development/libraries/smpeg/gcc6.patch b/pkgs/development/libraries/smpeg/gcc6.patch
new file mode 100644
index 00000000000..165feb4428c
--- /dev/null
+++ b/pkgs/development/libraries/smpeg/gcc6.patch
@@ -0,0 +1,33 @@
+--- a/audio/hufftable.cpp
++++ b/audio/hufftable.cpp
+@@ -9,6 +9,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <climits>
+ #include "MPEGaudio.h"
+ 
+ static const unsigned int
+@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16,  1},{  8,  1},{  4,
+ 
+ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, UINT_MAX, UINT_MAX, 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+   { 2, 3-1, 3-1, 0, 17,htd02},
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, UINT_MAX, UINT_MAX, 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+   { 6, 4-1, 4-1, 0, 31,htd06},
+   { 7, 6-1, 6-1, 0, 71,htd07},
+@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN
+   {11, 8-1, 8-1, 0,127,htd11},
+   {12, 8-1, 8-1, 0,127,htd12},
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14, UINT_MAX, UINT_MAX, 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
+   {16,16-1,16-1, 1,511,htd16},
+   {17,16-1,16-1, 2,511,htd16},

From aca78bf6373b78bc72454cc67e34ca7eec9c780b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 14:48:13 +0100
Subject: [PATCH 0014/3246] wxGTK: build with gcc 6

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

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index c4530da5453..6b9aa458735 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     + optionalString withMesa "${mesa.out}/lib ";
 
   # Work around a bug in configure.
-  NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" ];
+  NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ];
 
   preConfigure = "
     substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='

From 1877be499d1fb30c9399cdfc034ff3a84c4a38af Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 20:42:53 +0100
Subject: [PATCH 0015/3246] wxGTK30: fix build with gcc 6

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

diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix
index 5c45b29ec5c..ed937272514 100644
--- a/pkgs/development/libraries/wxGTK-3.0/default.nix
+++ b/pkgs/development/libraries/wxGTK-3.0/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf, setfile
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm
+, xf86vidmodeproto , 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
@@ -33,6 +33,11 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = optional stdenv.isDarwin AGL;
 
+  patches = [ (fetchpatch {
+    url = "https://raw.githubusercontent.com/jessehager/MINGW-packages/af6ece963d8157dd3fbc710bcc190647c4924c63/mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch";
+    sha256 = "0100pg0z7i6cjyysf2k3330pmqmdaxgc9hz6kxnfvc31dynjcq3h";
+  }) ];
+
   configureFlags =
     [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
       (if compat24 then "--enable-compat24" else "--disable-compat24")

From b98bcca019e5dc65e460ee9c8b8f3080b3379782 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 02:03:42 +0100
Subject: [PATCH 0016/3246] audacity: fix build with gcc 6

---
 pkgs/applications/audio/audacity/default.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index f91fc03ec01..8b81fd7c35a 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -13,12 +13,19 @@ stdenv.mkDerivation rec {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
     sha256 = "1ggr6g0mk36rqj7ahsg8b0b1r9kphwajzvxgn43md263rm87n04h";
   };
-  patches = [(fetchpatch {
-    name = "new-ffmpeg.patch";
-    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
-      + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
-    sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
-  })];
+  patches = [
+    (fetchpatch {
+      name = "new-ffmpeg.patch";
+      url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
+        + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
+      sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
+    })
+    (fetchpatch {
+      name = "gcc6.patch";
+      url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch";
+      sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2";
+    })
+  ];
 
   preConfigure = /* we prefer system-wide libs */ ''
     mv lib-src lib-src-rm

From d6bac43a14a1c2b95c9cf963c960d1a917412290 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 02:09:16 +0100
Subject: [PATCH 0017/3246] podofo: 0.9.3 -> 0.9.4, pin to gcc5

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

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 0b67ce16331..b68bc20ecf3 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
-, openssl, libpng, lua5 }:
+, gcc5, openssl, libpng, lua5 }:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.3";
+  name = "podofo-0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "1n12lbq9x15vqn7dc0hsccp56l5jdff1xrhvlfqlbklxx0qiw9pc";
+    sha256 = "0ngqgwl38afmzcj2zpf18a2g63vhm2fp45cbf9z62129rdgm1pyc";
   };
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake gcc5 ];
   buildInputs = [ lua5 stdenv.cc.libc ];
 
   crossAttrs = {

From 55c8891426d289545e732ad3bf3eda82381dc8df Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 02:18:03 +0100
Subject: [PATCH 0018/3246] libe-book: fix build with gcc6

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

diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix
index 02195dede93..1e374b8ad1f 100644
--- a/pkgs/development/libraries/libe-book/default.nix
+++ b/pkgs/development/libraries/libe-book/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
+  NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
   meta = {
     inherit (s) version;
     description = ''Library for import of reflowable e-book formats'';

From 3fc9934e58da48ae912de9e9c5b748b07a4eee93 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 02:24:04 +0100
Subject: [PATCH 0019/3246] linuxPackages.perf: fix build with gcc6

---
 pkgs/os-specific/linux/kernel/perf.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 9e572498457..76f2662f21b 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation {
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=bool-compare -Wno-error=deprecated-declarations";
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations"
+    "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
+  ];
 
   installFlags = "install install-man ASCIIDOC8=1";
 

From e52d072c64a497980e33786f75991620c4c65d51 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 12:43:05 +0100
Subject: [PATCH 0020/3246] libtasn1: 4.9 -> 4.10

---
 pkgs/development/libraries/libtasn1/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 150e7455c03..3b74406d7bf 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -5,16 +5,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02";
+    sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8";
   };
 
   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;

From 53a2bbd552a5dc09537f2d1dae6ff760fedd7a7e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 15:48:29 +0100
Subject: [PATCH 0021/3246] thunderbird: add patch to fix build with gcc6

---
 .../mailreaders/thunderbird/default.nix       |  2 +
 .../mailreaders/thunderbird/gcc6.patch        | 75 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 5f1483672b2..89cdfcb1aa4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     sha512 = "1f4579ac37b8ab98c91fe2e3e6742ba1b005ca9346d23f467d19e6af45eb457cab749bf91ed2a79f2058bd66f54da661da3ea5d5786f8c4b472d8a2a6c34db4b";
   };
 
+  patches = [ ./gcc6.patch ];
+
   # New sed no longer tolerates this mistake.
   postPatch = ''
     for f in mozilla/{js/src,}/configure; do
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch b/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch
new file mode 100644
index 00000000000..bd102220285
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch
@@ -0,0 +1,75 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1457596445 -32400
+# Node ID 55212130f19da3079167a6b0a5a0ed6689c9a71d
+# Parent  27c94617d7064d566c24a42e11cd4c7ef725923d
+Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj
+
+Our STL wrappers do various different things, one of which is including
+mozalloc.h for infallible operator new. mozalloc.h includes stdlib.h,
+which, in libstdc++ >= 6 is now itself a wrapper around cstdlib, which
+circles back to our STL wrapper.
+
+But of the things our STL wrappers do, including mozalloc.h is not one
+that is necessary for cstdlib. So skip including mozalloc.h in our
+cstdlib wrapper.
+
+Additionally, some C++ sources (in media/mtransport) are including
+headers in an extern "C" block, which end up including stdlib.h, which
+ends up including cstdlib because really, this is all C++, and our
+wrapper pre-includes <new> for mozalloc.h, which fails because templates
+don't work inside extern "C". So, don't pre-include <new> when we're not
+including mozalloc.h.
+
+
+diff --git a/mozilla/config/gcc-stl-wrapper.template.h b/mozilla/config/gcc-stl-wrapper.template.h
+--- a/mozilla/config/gcc-stl-wrapper.template.h
++++ b/mozilla/config/gcc-stl-wrapper.template.h
+@@ -12,33 +12,40 @@
+ // compiling ObjC.
+ #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
+ #  error "STL code can only be used with -fno-exceptions"
+ #endif
+ 
+ // Silence "warning: #include_next is a GCC extension"
+ #pragma GCC system_header
+ 
++// Don't include mozalloc for cstdlib. See bug 1245076.
++#ifndef moz_dont_include_mozalloc_for_cstdlib
++#  define moz_dont_include_mozalloc_for_cstdlib
++#endif
++#ifndef moz_dont_include_mozalloc_for_${HEADER}
+ // mozalloc.h wants <new>; break the cycle by always explicitly
+ // including <new> here.  NB: this is a tad sneaky.  Sez the gcc docs:
+ //
+ //    `#include_next' does not distinguish between <file> and "file"
+ //    inclusion, nor does it check that the file you specify has the
+ //    same name as the current file. It simply looks for the file
+ //    named, starting with the directory in the search path after the
+ //    one where the current file was found.
+-#include_next <new>
++#  include_next <new>
+ 
+ // See if we're in code that can use mozalloc.  NB: this duplicates
+ // code in nscore.h because nscore.h pulls in prtypes.h, and chromium
+ // can't build with that being included before base/basictypes.h.
+-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
+-#  include "mozilla/mozalloc.h"
+-#else
+-#  error "STL code can only be used with infallible ::operator new()"
++#  if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
++#    include "mozilla/mozalloc.h"
++#  else
++#    error "STL code can only be used with infallible ::operator new()"
++#  endif
++
+ #endif
+ 
+ #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)
+ // Enable checked iterators and other goodies
+ //
+ // FIXME/bug 551254: gcc's debug STL implementation requires -frtti.
+ // Figure out how to resolve this with -fno-rtti.  Maybe build with
+ // -frtti in DEBUG builds?
+

From b705cd4da7a7c12aef5b199a40ba729d773d0d3c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 22:57:29 +0100
Subject: [PATCH 0022/3246] openxcom: add patch to fix build with gcc6

---
 pkgs/games/openxcom/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 7b939af096a..32ba63709d7 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boost
+{stdenv, fetchurl, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost
 , SDL, SDL_image, SDL_mixer, SDL_gfx }:
 
 let version = "1.0.0"; in
@@ -13,6 +13,11 @@ stdenv.mkDerivation {
   buildInputs = [ cmake mesa zlib openssl libyamlcpp boost
     SDL SDL_image SDL_mixer SDL_gfx ];
 
+  patches = [ (fetchpatch {
+    url = "https://github.com/SupSuper/OpenXcom/commit/49bec0851fc6e5365cac0f71b2c40a80ddf95e77.patch";
+    sha256 = "156fk8wz4qc0nmqq3zjb6kw84qirabads2azr6xvlgb3lcn327v2";
+  }) ];
+
   meta = {
     description = "Open source clone of UFO: Enemy Unknown";
     homepage = http://openxcom.org;

From 1ce3d0b97e23e024e82ffbc64f3e0042f94496dc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 23:10:28 +0100
Subject: [PATCH 0023/3246] warmux: add patch to fix build with gcc6

---
 pkgs/games/warmux/gcc-fix.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch
index 1ac476b92a3..913b912af7d 100644
--- a/pkgs/games/warmux/gcc-fix.patch
+++ b/pkgs/games/warmux/gcc-fix.patch
@@ -34,3 +34,18 @@ Author: Felix Geyer <debfx-pkg@fobos.de>
  #include <WARMUX_types.h>
  #include <WARMUX_network.h>
  #include <WARMUX_index_server.h>
+
+Description: Fix conversion error in gcc 6.
+Author: Robin Gloster <mail@glob.in>
+
+--- warmux-11.04.1.orig/src/interface/weapon_menu.cpp	2017-01-19 23:06:32.401035923 +0100
++++ warmux-11.04.1/src/interface/weapon_menu.cpp	2017-01-19 23:07:14.245866593 +0100
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+   if (!show)
+-    return false;
++    return nullptr;
+   const std::vector<PolygonItem *>& items = poly->GetItem();
+   WeaponMenuItem * tmp;
+   Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);

From 3bc2154f99e9dbcdf55b3bfb766029f8b0154b97 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 21 Jan 2017 13:49:24 +0100
Subject: [PATCH 0024/3246] spidermonkey_1_8_5: add patch to fix build with
 gcc6

---
 pkgs/development/interpreters/spidermonkey/1.8.5.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 3c5eef01db0..ed09ac7467d 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }:
+{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
 
 stdenv.mkDerivation rec {
   name = "spidermonkey-${version}";
@@ -22,7 +22,13 @@ stdenv.mkDerivation rec {
     ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"}
   '';
 
-  patches = stdenv.lib.optionals stdenv.isArm [
+  patches = [
+    (fetchpatch {
+      name = "gcc6.patch";
+      url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e";
+      sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
+    })
+  ] ++ stdenv.lib.optionals stdenv.isArm [
     # Explained below in configureFlags for ARM
     ./1.8.5-findvanilla.patch
     # Fix for hard float flags.

From 87d85c1d273e3236f357c875183e386815b5428a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 21 Jan 2017 14:42:59 +0100
Subject: [PATCH 0025/3246] dirac: fix build with gcc6

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

diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix
index ac94e077b9a..7b42ead14bd 100644
--- a/pkgs/development/libraries/dirac/default.nix
+++ b/pkgs/development/libraries/dirac/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./dirac-1.0.2.patch ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   postInstall = ''
     # keep only necessary binaries
     find $out/bin \( -name '*RGB*' -or -name '*YUV*' -or -name create_dirac_testfile.pl \) -delete

From 2b51c411636f9f40c63439dc7d43b78cc0a34c17 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 21 Jan 2017 14:43:22 +0100
Subject: [PATCH 0026/3246] freeimage: fix build with gcc6

---
 pkgs/development/libraries/freeimage/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index 42105c7022c..6ee7670fc29 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -1,11 +1,15 @@
-{stdenv, fetchurl, unzip, darwin}:
+{ stdenv, fetchurl, unzip, darwin }:
+
 stdenv.mkDerivation {
   name = "freeimage-3.17.0";
+
   src = fetchurl {
     url = mirror://sourceforge/freeimage/FreeImage3170.zip;
     sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v";
   };
+
   buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
+
   prePatch = if stdenv.isDarwin
              then ''
     sed -e 's/gcc-4.0/clang/g' \
@@ -38,6 +42,8 @@ stdenv.mkDerivation {
   preInstall = "mkdir -p $out/include $out/lib";
   postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install";
 
+  NIX_CFLAGS_COMPILE = "-Wno-narrowing";
+
   meta = {
     description = "Open Source library for accessing popular graphics image file formats";
     homepage = http://freeimage.sourceforge.net/;

From 539564d641659c716c49050ac651dd17ceb3f995 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 21 Jan 2017 14:43:45 +0100
Subject: [PATCH 0027/3246] libjack2: add patch to fix build with gcc6

---
 pkgs/misc/jackaudio/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index a4e4e408fec..a38c9b76410 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
-, bash, libsamplerate, libsndfile, readline, gcc
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper
+, bash, libsamplerate, libsndfile, readline
 
 # Optional Dependencies
 , dbus ? null, libffado ? null, alsaLib ? null
@@ -34,11 +34,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
-  buildInputs = [ gcc
-    python
-
-    libsamplerate libsndfile readline
-
+  buildInputs = [ python libsamplerate libsndfile readline
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ];
 
@@ -46,7 +42,13 @@ stdenv.mkDerivation rec {
     substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
   '';
 
-  patches = [ ./jack-gcc5.patch ];
+  patches = [
+    ./jack-gcc5.patch
+    (fetchpatch {
+      url = "https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch";
+      sha256 = "0vywakbmlskvs9ginij9ilk39wjyzg7w6cf1qxp11hb0hj69fir5";
+    })
+  ];
 
   configurePhase = ''
     python waf configure --prefix=$out \

From 292c03c9c808dff5e89f6197ad8a81502c91ecc5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 22 Jan 2017 20:24:27 +0100
Subject: [PATCH 0028/3246] ams-lv2: 1.1.0 -> 1.2.1

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

diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index 9d62696a3f8..fbbb9f90f8a 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }:
+{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }:
 
 stdenv.mkDerivation  rec {
   name = "ams-lv2-${version}";
-  version = "1.1.0";
+  version = "1.2.1";
 
-  src = fetchurl {
-    url = "https://github.com/blablack/ams-lv2/archive/v${version}.tar.gz";
-    sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5";
+  src = fetchFromGitHub {
+    owner = "blablack";
+    repo = "ams-lv2";
+    rev = version;
+    sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x";
   };
 
   buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ];

From 2ca70d5b648937817fd3ba3fde597307641b28ea Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 22 Jan 2017 20:25:16 +0100
Subject: [PATCH 0029/3246] apvlv: 0.1 -> 0.1.5

---
 pkgs/applications/misc/apvlv/default.nix | 37 +++++++++++++++---------
 pkgs/top-level/all-packages.nix          |  4 +--
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index 88e08b40914..977f5e94e5d 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -1,26 +1,37 @@
-{ stdenv, fetchurl, cmake, pkgconfig,
-  gtk2 , poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy
+, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.1.f7f7b9c";
+  version = "0.1.5";
   name = "apvlv-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/downloads/naihe2010/apvlv/${name}-Source.tar.gz";
-    sha256 = "125nlcfjdhgzi9jjxh9l2yc9g39l6jahf8qh2555q20xkxf4rl0w";
+  src = fetchFromGitHub {
+    owner = "naihe2010";
+    repo = "apvlv";
+    rev = "v${version}";
+    sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i";
   };
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler.dev}/include/poppler"
-  '';
+  NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
 
   buildInputs = [
     pkgconfig cmake
-     poppler
-     freetype gtk2
-     libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
-   ];
+    poppler pcre libxkbcommon epoxy
+    freetype gtk3
+    libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
+  ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch";
+      sha256 = "1am8dgv2kkpqmm2vaysa61czx8ppdx94zb3c59sx88np50jpy70w";
+    })
+    (fetchpatch {
+      url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch";
+      sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j";
+    })
+  ];
 
   installPhase = ''
     # binary
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0ad47dc536..885c37713fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15718,9 +15718,7 @@ in
     inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas;
   };
 
-  apvlv = callPackage ../applications/misc/apvlv {
-    gtk2 = gtk2-x11;
-  };
+  apvlv = callPackage ../applications/misc/apvlv { };
 
   xpdf = callPackage ../applications/misc/xpdf {
     base14Fonts = "${ghostscript}/share/ghostscript/fonts";

From f6a46e0be553be4d170c80ab4c3c66c289558eb1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 22 Jan 2017 19:56:55 +0100
Subject: [PATCH 0030/3246] acoustidFingerprinter: add patch to fix build with
 gcc6

---
 pkgs/tools/audio/acoustid-fingerprinter/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index 208b4c2b38b..80149fa98dd 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }:
+{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }:
 
 stdenv.mkDerivation rec {
   name = "acoustid-fingerprinter-${version}";
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${(builtins.parseDrvName taglib.name).version}" ];
 
+  patches = [ (fetchpatch {
+    url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw";
+    sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk";
+  }) ];
+
   meta = with stdenv.lib; {
     homepage = "http://acoustid.org/fingerprinter";
     description = "Audio fingerprinting tool using chromaprint";

From 6ce688c3d826aafb17f1e410c0e7ccb057c65187 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 23 Jan 2017 01:33:49 +0100
Subject: [PATCH 0031/3246] gnome3.gjs: 1.46 -> 1.47, use spidermonkey_31

---
 pkgs/desktops/gnome-3/3.22/core/gjs/default.nix | 4 ++--
 pkgs/desktops/gnome-3/3.22/core/gjs/src.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
index ac5572decb8..1141db03c40 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_24, pango, readline, glib, libxml2, dbus }:
+, spidermonkey_31, pango, readline, glib, libxml2, dbus }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
 
-  propagatedBuildInputs = [ spidermonkey_24 ];
+  propagatedBuildInputs = [ spidermonkey_31 ];
 
   postInstall = ''
     sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
index 1f4ef08f9b1..7af8d7c531b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
@@ -1,11 +1,11 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: rec {
-  name = "gjs-${major}.0";
-  major = "1.46";
+  name = "gjs-${major}.4";
+  major = "1.47";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz";
-    sha256 = "2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4";
+    sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1";
   };
 }

From 9bf73bded14832d0bc90041eb3b12b3c520919b5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 23 Jan 2017 01:34:41 +0100
Subject: [PATCH 0032/3246] html-tidy: 5.0.0 -> 5.2.0

---
 pkgs/tools/text/html-tidy/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index c0db454ed29..1a264885b48 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, cmake, libxslt }:
+{ stdenv, fetchFromGitHub, cmake, libxslt }:
 
-let
-  version = "5.0.0";
-in
 stdenv.mkDerivation rec {
   name = "html-tidy-${version}";
+  version = "5.2.0";
 
-  src = fetchurl {
-    url = "https://github.com/htacg/tidy-html5/archive/${version}.tar.gz";
-    sha256 = "1qz7hgk482496agngp9grz4jqkyxrp29r2ywbccc9i5198yspca4";
+  src = fetchFromGitHub {
+    owner = "htacg";
+    repo = "tidy-html5";
+    rev = version;
+    sha256 = "1yxp3kjsxd5zwwn4r5rpyq5ndyylbcnb9pisdyf7dxjqd47z64bc";
   };
 
   nativeBuildInputs = [ cmake libxslt/*manpage*/ ];

From 3d9e90fe5429420cb1de71a401b55a1c82587210 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Jan 2017 20:07:40 +0100
Subject: [PATCH 0033/3246] edbrowse: mark as broken

---
 pkgs/applications/editors/edbrowse/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index e6f942dbfdd..e5e64a32e97 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl, perl, html-tidy }:
+{ stdenv, fetchurl, spidermonkey, unzip, curl, pcre, readline, openssl, perl, html-tidy }:
+
 stdenv.mkDerivation rec {
   name = "edbrowse-${version}";
   version = "3.6.1";
 
   nativeBuildInputs = [ unzip ];
-  buildInputs = [ curl pcre readline openssl spidermonkey_24 perl html-tidy ];
+  buildInputs = [ curl pcre readline openssl spidermonkey perl html-tidy ];
 
   patchPhase = ''
     substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  NIX_CFLAGS_COMPILE = "-I${spidermonkey_24.dev}/include/mozjs-24";
+  NIX_CFLAGS_COMPILE = "-I${spidermonkey}/include/mozjs-31";
   makeFlags = "-C src prefix=$(out)";
 
   src = fetchurl {
@@ -34,5 +35,6 @@ stdenv.mkDerivation rec {
     homepage = http://edbrowse.org/;
     maintainers = [ maintainers.schmitthenner maintainers.vrthra ];
     platforms = platforms.linux;
+    broken = true;  # no compatible spidermonkey
   };
 }

From 9beb44fb84fa579edcbdb9089facce25248bac02 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Jan 2017 20:07:57 +0100
Subject: [PATCH 0034/3246] spidermonkey_24: remove

---
 .../interpreters/spidermonkey/24.nix          | 62 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 63 deletions(-)
 delete mode 100644 pkgs/development/interpreters/spidermonkey/24.nix

diff --git a/pkgs/development/interpreters/spidermonkey/24.nix b/pkgs/development/interpreters/spidermonkey/24.nix
deleted file mode 100644
index 6e354c54296..00000000000
--- a/pkgs/development/interpreters/spidermonkey/24.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }:
-
-stdenv.mkDerivation rec {
-  version = "24.2.0";
-  name = "spidermonkey-${version}";
-
-  src = fetchurl {
-    url = "mirror://mozilla/js/mozjs-${version}.tar.bz2";
-    sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6";
-  };
-
-  outputs = [ "out" "dev" "lib" ];
-
-  propagatedBuildInputs = [ nspr ];
-
-  buildInputs = [ pkgconfig perl python2 zip libffi readline icu ];
-
-  postPatch = ''
-    # Fixes an issue with version detection under perl 5.22.x
-    sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
-  '';
-
-  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
-    export LIBXUL_DIST=$out
-  '';
-
-  setOutputFlags = false;
-  configureFlags = [
-    "--libdir=$(lib)/lib"
-    "--includedir=$(dev)/include"
-    "--enable-threadsafe"
-    "--with-system-icu"
-    "--with-system-nspr"
-    "--with-system-ffi"
-    "--enable-readline"
-  ];
-
-  # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
-  preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-  preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522
-
-  postInstall = ''
-    rm "$lib"/lib/*.a # halve the output size
-    moveToOutput "bin/js*-config" "$dev" # break the cycle
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Mozilla's JavaScript engine written in C/C++";
-    homepage = https://developer.mozilla.org/en/SpiderMonkey;
-    # TODO: MPL/GPL/LGPL tri-license.
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58485491408..b2ccdcb9161 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5914,7 +5914,6 @@ in
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
   spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
-  spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.nix { };
   spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
   spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
   spidermonkey = spidermonkey_31;

From c765f680e3675faff57e05f41072616bac56b67a Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 19 Feb 2017 10:18:54 -0800
Subject: [PATCH 0035/3246] Updates to bundlerEnv

---
 .../ruby-modules/bundler-env/default.nix      | 66 +++++++++++++++----
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 57ca23d4143..e82a6af0085 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -46,11 +46,20 @@ let
 
   importedGemset = import gemset';
 
-  filteredGemset = (lib.filterAttrs (name: attrs:
-    if (builtins.hasAttr "groups" attrs)
-    then (builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups)
-    else true
-  ) importedGemset);
+  platformMatches = attrs: (
+  !(attrs ? "platforms") ||
+    builtins.any (platform:
+      platform.engine == ruby.rubyEngine &&
+        (!(platform ? "version") || platform.version == ruby.version.majMin)
+    ) attrs.platforms
+  );
+
+  groupMatches = attrs: (
+  !(attrs ? "groups") ||
+    builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups
+  );
+
+  filteredGemset = lib.filterAttrs (name: attrs: platformMatches attrs && groupMatches attrs) importedGemset;
 
   applyGemConfigs = attrs:
     (if gemConfig ? "${attrs.gemName}"
@@ -67,25 +76,54 @@ let
     if hasBundler then gems.bundler
     else defs.bundler.override (attrs: { inherit ruby; });
 
-  gems = lib.flip lib.mapAttrs configuredGemset (name: attrs:
-    buildRubyGem ((removeAttrs attrs ["source"]) // attrs.source // {
-      inherit ruby;
-      gemName = name;
-      gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
-    }));
+  pathDerivation = {
+    usesGemspec ? false, ...
+  }@attrs:
+    let
+      res = {
+          inherit usesGemspec;
+          type = "derivation";
+          name = attrs.gemName;
+          version = attrs.version;
+          outPath = attrs.path;
+          outputs = [ "out" ];
+          out = res;
+          outputName = "out";
+        };
+    in res;
+
+  buildGem = name: attrs: (
+    let
+      gemAttrs = ((removeAttrs attrs ["source"]) // attrs.source // {
+        inherit ruby;
+        gemName = name;
+        gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
+      });
+    in
+    if gemAttrs.type == "path" then pathDerivation gemAttrs
+    else buildRubyGem gemAttrs);
+
+  gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
+
+  maybeCopyAll = { usesGemspec ? false, ...}@main:
+  (if usesGemspec then ''
+  cp -a ${gemdir}/* $out/
+  '' else ""
+  );
 
   # We have to normalize the Gemfile.lock, otherwise bundler tries to be
   # helpful by doing so at run time, causing executables to immediately bail
   # out. Yes, I'm serious.
   confFiles = runCommand "gemfile-and-lockfile" {} ''
     mkdir -p $out
-    cp ${gemfile'} $out/Gemfile
-    cp ${lockfile'} $out/Gemfile.lock
+    ${maybeCopyAll mainGem}
+    cp ${gemfile'} $out/Gemfile || ls -l $out/Gemfile
+    cp ${lockfile'} $out/Gemfile.lock || ls -l $out/Gemfile.lock
   '';
 
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
 
-  binPaths = if mainGem != null then [ mainGem ] else envPaths;
+  binPaths = if mainGem != null then [ mainGem ] ++ envPaths else envPaths;
 
   bundlerEnv = buildEnv {
     inherit ignoreCollisions;

From 3c9941114f1c1801c388fbd1fc31907b14625b72 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 19 Feb 2017 10:51:35 -0800
Subject: [PATCH 0036/3246] Need to handle "null" mainGems

Not every gem package uses pname, nor should it.
---
 pkgs/development/ruby-modules/bundler-env/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index e82a6af0085..ba9ea5f3fa8 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -105,7 +105,9 @@ let
 
   gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
 
-  maybeCopyAll = { usesGemspec ? false, ...}@main:
+  maybeCopyAll = main: if main == null then "" else copyIfUseGemspec main;
+
+  copyIfUseGemspec = { usesGemspec ? false, ...}@main:
   (if usesGemspec then ''
   cp -a ${gemdir}/* $out/
   '' else ""

From 0481a33d214b3129970d0951e2fe82548c4d3d04 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Mon, 20 Feb 2017 21:03:44 -0800
Subject: [PATCH 0037/3246] Simplifying interface on gemset.nix slightly.

`usesGemspec` no longer required to trigger the "copy everything into
gemfile-and-lock" behavior. If the mainGem is referred to by path,
that's sufficient.
---
 .../ruby-modules/bundler-env/default.nix       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index ba9ea5f3fa8..794dd11665d 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -76,16 +76,14 @@ let
     if hasBundler then gems.bundler
     else defs.bundler.override (attrs: { inherit ruby; });
 
-  pathDerivation = {
-    usesGemspec ? false, ...
-  }@attrs:
+  pathDerivation = { gemName, version, path, ...  }:
     let
       res = {
-          inherit usesGemspec;
           type = "derivation";
-          name = attrs.gemName;
-          version = attrs.version;
-          outPath = attrs.path;
+          bundledByPath = true;
+          name = gemName;
+          version = version;
+          outPath = path;
           outputs = [ "out" ];
           out = res;
           outputName = "out";
@@ -105,10 +103,10 @@ let
 
   gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
 
-  maybeCopyAll = main: if main == null then "" else copyIfUseGemspec main;
+  maybeCopyAll = main: if main == null then "" else copyIfBundledByPath main;
 
-  copyIfUseGemspec = { usesGemspec ? false, ...}@main:
-  (if usesGemspec then ''
+  copyIfBundledByPath = { bundledByPath ? false, ...}@main:
+  (if bundledByPath then ''
   cp -a ${gemdir}/* $out/
   '' else ""
   );

From 318189f26febf90a6fa8e506e93ddbf37331a09f Mon Sep 17 00:00:00 2001
From: butterflya <rtdvrs+butterflya@gmail.com>
Date: Sat, 11 Mar 2017 15:50:06 +0100
Subject: [PATCH 0038/3246] Cleanup gnome.sh

No functional changes
---
 maintainers/scripts/gnome.sh | 52 ++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh
index 9398331d0d6..b2d55d7fbed 100755
--- a/maintainers/scripts/gnome.sh
+++ b/maintainers/scripts/gnome.sh
@@ -2,11 +2,11 @@
 
 set -o pipefail
 
-GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
+GNOME_FTP=ftp.gnome.org/pub/GNOME/sources
 
 # projects that don't follow the GNOME major versioning, or that we don't want to
 # programmatically update
-NO_GNOME_MAJOR="gtkhtml gdm"
+NO_GNOME_MAJOR='gtkhtml gdm'
 
 usage() {
   echo "Usage: $0 gnome_dir <show project>|<update project>|<update-all> [major.minor]" >&2
@@ -18,10 +18,10 @@ if [ "$#" -lt 2 ]; then
   usage
 fi
 
-GNOME_TOP="$1"
+GNOME_TOP=$1
 shift
 
-action="$1"
+action=$1
 
 # curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
 # any conversations with sysadmin. Somehow lftp works.
@@ -36,18 +36,18 @@ else
 fi
 
 find_project() {
-  exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d $@
+  exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d "$@"
 }
 
 show_project() {
-  local project="$1"
-  local majorVersion="$2"
-  local version=""
+  local project=$1
+  local majorVersion=$2
+  local version=
 
   if [ -z "$majorVersion" ]; then
     echo "Looking for available versions..." >&2
-    local available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` )
-    if [ "$?" -ne "0" ]; then
+    local available_baseversions=$(ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n)
+    if [ "$?" -ne 0 ]; then
       echo "Project $project not found" >&2
       return 1
     fi
@@ -59,11 +59,11 @@ show_project() {
   
   if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then
     # not a major version
-    version="$majorVersion"
+    version=$majorVersion
     majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2)
   fi
   
-  local FTPDIR="${GNOME_FTP}/${project}/${majorVersion}"
+  local FTPDIR=${GNOME_FTP}/${project}/${majorVersion}
   
   #version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
   # gnome's LATEST-IS is broken. Do not trust it.
@@ -92,7 +92,7 @@ show_project() {
   		esac
   	done
   	echo "Found versions ${!versions[@]}" >&2
-  	version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1`
+  	version=$(echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1)
         if [ -z "$version" ]; then
           echo "No version available for major $majorVersion" >&2
           return 1
@@ -103,7 +103,7 @@ show_project() {
   
   local name=${project}-${version}
   echo "Fetching .sha256 file" >&2
-  local sha256out=$(curl -s -f http://${FTPDIR}/${name}.sha256sum)
+  local sha256out=$(curl -s -f http://"${FTPDIR}"/"${name}".sha256sum)
   
   if [ "$?" -ne "0" ]; then
   	echo "Version not found" >&2
@@ -136,8 +136,8 @@ fetchurl: {
 }
 
 update_project() {
-  local project="$1"
-  local majorVersion="$2"
+  local project=$1
+  local majorVersion=$2
 
   # find project in nixpkgs tree
   projectPath=$(find_project -name "$project" -print)
@@ -150,14 +150,14 @@ update_project() {
   
   if [ "$?" -eq "0" ]; then
     echo "Updating $projectPath/src.nix" >&2
-    echo -e "$src" > "$projectPath/src.nix"
+    echo -e "$src" > "$projectPath"/src.nix
   fi
 
   return 0
 }
 
-if [ "$action" == "update-all" ]; then
-  majorVersion="$2"
+if [ "$action" = "update-all" ]; then
+  majorVersion=$2
   if [ -z "$majorVersion" ]; then
     echo "No major version specified" >&2
     usage
@@ -170,23 +170,23 @@ if [ "$action" == "update-all" ]; then
       echo "Skipping $project"
     else
       echo "= Updating $project to $majorVersion" >&2
-      update_project $project $majorVersion
+      update_project "$project" "$majorVersion"
       echo >&2
     fi
   done
 else
-  project="$2"
-  majorVersion="$3"
+  project=$2
+  majorVersion=$3
 
   if [ -z "$project" ]; then
     echo "No project specified, exiting" >&2
     usage
   fi
 
-  if [ "$action" == "show" ]; then
-    show_project $project $majorVersion
-  elif [ "$action" == "update" ]; then
-    update_project $project $majorVersion
+  if [ "$action" = show ]; then
+    show_project "$project" "$majorVersion"
+  elif [ "$action" = update ]; then
+    update_project "$project" "$majorVersion"
   else
     echo "Unknown action $action" >&2
     usage

From c2b0cb5db6c9df000060501ca2dd5293694da216 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 16 Mar 2017 17:48:09 -0400
Subject: [PATCH 0039/3246] nixos: nix snowflake logo for the nixos manual
 launcher

---
 nixos/modules/services/misc/nixos-manual.nix |  5 ++---
 pkgs/data/misc/nixos-artwork/icons.nix       | 13 +++++++++++++
 pkgs/top-level/all-packages.nix              |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/data/misc/nixos-artwork/icons.nix

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 622607f3b32..515864ec2e2 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -62,8 +62,7 @@ let
     name = "nixos-manual";
     desktopName = "NixOS Manual";
     genericName = "View NixOS documentation in a web browser";
-    # TODO: find a better icon (Nix logo + help overlay?)
-    icon = "system-help";
+    icon = "nix-snowflake";
     exec = "${helpScript}/bin/nixos-help";
     categories = "System";
   };
@@ -115,7 +114,7 @@ in
 
     environment.systemPackages =
       [ manual.manual helpScript ]
-      ++ optional config.services.xserver.enable desktopItem
+      ++ optionals config.services.xserver.enable [desktopItem pkgs.nixos-icons]
       ++ optional config.programs.man.enable manual.manpages;
 
     boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];
diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix
new file mode 100644
index 00000000000..cee6e600cbe
--- /dev/null
+++ b/pkgs/data/misc/nixos-artwork/icons.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchFromGitHub, imagemagick }:
+
+stdenv.mkDerivation {
+  name = "nixos-icons-2017-03-16";
+  srcs = fetchFromGitHub {
+    owner = "nixos";
+    repo = "nixos-artwork";
+    rev = "783ca1249fc4cfe523ad4e541f37e2229891bc8b";
+    sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a";
+  };
+  makeFlags = [ "DESTDIR=$(out)" "prefix=" ];
+  buildInputs = [ imagemagick ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d6ab328d22..5459b3ded5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17830,6 +17830,7 @@ with pkgs;
   nix-serve = callPackage ../tools/package-management/nix-serve { };
 
   nixos-artwork = callPackage ../data/misc/nixos-artwork { };
+  nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
 
   nixos-container = callPackage ../tools/virtualization/nixos-container { };
 

From 7f6e8a1cd5297d35e7cf431f682b1b1abfa26f16 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 26 Mar 2017 17:32:30 -0700
Subject: [PATCH 0040/3246] Adding "allBins" flag on bundlerEnv

The bin stubs need to be built where there's access to /nix/store - so
it can't happen in a nix-shell run. Ergo, a shell.nix needs to be able
to signal to the build that all bins need to be built.
---
 .../ruby-modules/bundler-env/default.nix      | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 794dd11665d..7d2f0efe001 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -12,6 +12,7 @@
 , gemfile ? null
 , lockfile ? null
 , gemset ? null
+, allBins ? false
 , ruby ? defs.ruby
 , gemConfig ? defaultGemConfig
 , postBuild ? null
@@ -123,7 +124,17 @@ let
 
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
 
-  binPaths = if mainGem != null then [ mainGem ] ++ envPaths else envPaths;
+  binPaths = if !allBins && mainGem != null then [ mainGem ] else envPaths;
+
+  genStubs = binPaths: ''
+    ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
+      "${ruby}/bin/ruby" \
+      "${confFiles}/Gemfile" \
+      "$out/${ruby.gemPath}" \
+      "${bundler}/${ruby.gemPath}" \
+      ${lib.escapeShellArg binPaths} \
+      ${lib.escapeShellArg groups}
+  '';
 
   bundlerEnv = buildEnv {
     inherit ignoreCollisions;
@@ -133,15 +144,7 @@ let
     paths = envPaths;
     pathsToLink = [ "/lib" ];
 
-    postBuild = ''
-      ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
-        "${ruby}/bin/ruby" \
-        "${confFiles}/Gemfile" \
-        "$out/${ruby.gemPath}" \
-        "${bundler}/${ruby.gemPath}" \
-        ${lib.escapeShellArg binPaths} \
-        ${lib.escapeShellArg groups}
-    '' + lib.optionalString (postBuild != null) postBuild;
+    postBuild = (genStubs binPaths) + lib.optionalString (postBuild != null) postBuild;
 
     meta = { platforms = ruby.meta.platforms; } // meta;
 
@@ -173,7 +176,7 @@ let
           require 'bundler/setup'
         '';
         in stdenv.mkDerivation {
-          name = "interactive-${drvName}-environment";
+          name = "${drvName}-interactive-environment";
           nativeBuildInputs = [ wrappedRuby bundlerEnv ];
           shellHook = ''
             export OLD_IRBRC="$IRBRC"

From 89fda10d31f2843c87aa2232d8d7f19adbccb3e8 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Mon, 24 Apr 2017 18:45:00 -0700
Subject: [PATCH 0041/3246] Starting decomposition of bundlerEnv

---
 .../ruby-modules/bundler-env/basic.nix        | 134 ++++++++++++
 .../ruby-modules/bundler-env/default.nix      | 157 ++------------
 .../ruby-modules/bundler-env/functions.nix    |  49 +++++
 .../bundler-env/too-complicated.nix           | 195 ++++++++++++++++++
 4 files changed, 394 insertions(+), 141 deletions(-)
 create mode 100644 pkgs/development/ruby-modules/bundler-env/basic.nix
 create mode 100644 pkgs/development/ruby-modules/bundler-env/functions.nix
 create mode 100644 pkgs/development/ruby-modules/bundler-env/too-complicated.nix

diff --git a/pkgs/development/ruby-modules/bundler-env/basic.nix b/pkgs/development/ruby-modules/bundler-env/basic.nix
new file mode 100644
index 00000000000..705c8dabd63
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/basic.nix
@@ -0,0 +1,134 @@
+{ stdenv, runCommand, ruby, lib
+, defaultGemConfig, buildRubyGem, buildEnv
+, makeWrapper
+, bundler
+}@defs:
+
+{
+  drvName
+, pname
+, gemfile
+, lockfile
+, gemset
+, ruby ? defs.ruby
+, gemConfig ? defaultGemConfig
+, postBuild ? null
+, document ? []
+, meta ? {}
+, groups ? ["default"]
+, ignoreCollisions ? false
+, ...
+}@args:
+
+with (import ./functions.nix);
+
+let
+  mainGem = gems."${pname}" or (throw "bundlerEnv: gem ${pname} not found");
+
+  importedGemset = import gemset;
+
+  filteredGemset = lib.filterAttrs (name: attrs: platformMatches attrs && groupMatches attrs) importedGemset;
+
+  configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs:
+    applyGemConfigs (attrs // { inherit ruby; gemName = name; })
+  );
+
+  hasBundler = builtins.hasAttr "bundler" filteredGemset;
+
+  bundler =
+    if hasBundler then gems.bundler
+    else defs.bundler.override (attrs: { inherit ruby; });
+
+  gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
+
+  copyIfBundledByPath = { bundledByPath ? false, ...}@main:
+  (if bundledByPath then ''
+  cp -a ${gemdir}/* $out/
+  '' else ""
+  );
+
+  maybeCopyAll = main: if main == null then "" else copyIfBundledByPath main;
+
+  # We have to normalize the Gemfile.lock, otherwise bundler tries to be
+  # helpful by doing so at run time, causing executables to immediately bail
+  # out. Yes, I'm serious.
+  confFiles = runCommand "gemfile-and-lockfile" {} ''
+    mkdir -p $out
+    ${maybeCopyAll mainGem}
+    cp ${gemfile} $out/Gemfile || ls -l $out/Gemfile
+    cp ${lockfile} $out/Gemfile.lock || ls -l $out/Gemfile.lock
+  '';
+
+  buildGem = name: attrs: (
+    let
+      gemAttrs = composeGemAttrs gems name attrs;
+    in
+    if gemAttrs.type == "path" then
+      pathDerivation gemAttrs
+    else
+      buildRubyGem gemAttrs
+  );
+
+  envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
+
+  # binPaths = if mainGem != null then [ mainGem ] else envPaths;
+
+in
+  buildEnv {
+    inherit ignoreCollisions;
+
+    name = drvName;
+
+    paths = envPaths;
+    pathsToLink = [ "/lib" ];
+
+    postBuild = genStubsScript defs // args // {
+      inherit confFiles bundler;
+      binPaths = envPaths;
+    } + lib.optionalString (postBuild != null) postBuild;
+
+    meta = { platforms = ruby.meta.platforms; } // meta;
+
+    passthru = rec {
+      inherit ruby bundler gems;
+
+      wrappedRuby = stdenv.mkDerivation {
+        name = "wrapped-ruby-${drvName}";
+        nativeBuildInputs = [ makeWrapper ];
+        buildCommand = ''
+          mkdir -p $out/bin
+          for i in ${ruby}/bin/*; do
+            makeWrapper "$i" $out/bin/$(basename "$i") \
+              --set BUNDLE_GEMFILE ${confFiles}/Gemfile \
+              --set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \
+              --set BUNDLE_FROZEN 1 \
+              --set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \
+              --set GEM_PATH ${bundlerEnv}/${ruby.gemPath}
+          done
+        '';
+      };
+
+      env = let
+        irbrc = builtins.toFile "irbrc" ''
+          if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?)
+            require ENV["OLD_IRBRC"]
+          end
+          require 'rubygems'
+          require 'bundler/setup'
+        '';
+        in stdenv.mkDerivation {
+          name = "${drvName}-interactive-environment";
+          nativeBuildInputs = [ wrappedRuby bundlerEnv ];
+          shellHook = ''
+            export OLD_IRBRC="$IRBRC"
+            export IRBRC=${irbrc}
+          '';
+          buildCommand = ''
+            echo >&2 ""
+            echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+            echo >&2 ""
+            exit 1
+          '';
+        };
+    };
+  }
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 7d2f0efe001..5218d7f0c4d 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -1,5 +1,6 @@
 { stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib
 , callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv
+, linkFarm
 , git
 , makeWrapper
 , bundler
@@ -12,7 +13,6 @@
 , gemfile ? null
 , lockfile ? null
 , gemset ? null
-, allBins ? false
 , ruby ? defs.ruby
 , gemConfig ? defaultGemConfig
 , postBuild ? null
@@ -45,151 +45,26 @@ let
     if gemset == null then gemdir + "/gemset.nix"
     else gemset;
 
-  importedGemset = import gemset';
-
-  platformMatches = attrs: (
-  !(attrs ? "platforms") ||
-    builtins.any (platform:
-      platform.engine == ruby.rubyEngine &&
-        (!(platform ? "version") || platform.version == ruby.version.majMin)
-    ) attrs.platforms
-  );
-
-  groupMatches = attrs: (
-  !(attrs ? "groups") ||
-    builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups
-  );
-
-  filteredGemset = lib.filterAttrs (name: attrs: platformMatches attrs && groupMatches attrs) importedGemset;
-
-  applyGemConfigs = attrs:
-    (if gemConfig ? "${attrs.gemName}"
-    then attrs // gemConfig."${attrs.gemName}" attrs
-    else attrs);
-
-  configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs:
-    applyGemConfigs (attrs // { inherit ruby; gemName = name; })
-  );
-
-  hasBundler = builtins.hasAttr "bundler" filteredGemset;
-
-  bundler =
-    if hasBundler then gems.bundler
-    else defs.bundler.override (attrs: { inherit ruby; });
-
-  pathDerivation = { gemName, version, path, ...  }:
-    let
-      res = {
-          type = "derivation";
-          bundledByPath = true;
-          name = gemName;
-          version = version;
-          outPath = path;
-          outputs = [ "out" ];
-          out = res;
-          outputName = "out";
-        };
-    in res;
-
-  buildGem = name: attrs: (
-    let
-      gemAttrs = ((removeAttrs attrs ["source"]) // attrs.source // {
-        inherit ruby;
-        gemName = name;
-        gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
-      });
-    in
-    if gemAttrs.type == "path" then pathDerivation gemAttrs
-    else buildRubyGem gemAttrs);
-
-  gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
-
-  maybeCopyAll = main: if main == null then "" else copyIfBundledByPath main;
-
-  copyIfBundledByPath = { bundledByPath ? false, ...}@main:
-  (if bundledByPath then ''
-  cp -a ${gemdir}/* $out/
-  '' else ""
-  );
-
-  # We have to normalize the Gemfile.lock, otherwise bundler tries to be
-  # helpful by doing so at run time, causing executables to immediately bail
-  # out. Yes, I'm serious.
-  confFiles = runCommand "gemfile-and-lockfile" {} ''
-    mkdir -p $out
-    ${maybeCopyAll mainGem}
-    cp ${gemfile'} $out/Gemfile || ls -l $out/Gemfile
-    cp ${lockfile'} $out/Gemfile.lock || ls -l $out/Gemfile.lock
-  '';
-
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
 
-  binPaths = if !allBins && mainGem != null then [ mainGem ] else envPaths;
+  binPaths = if mainGem != null then [ mainGem ] else envPaths;
 
-  genStubs = binPaths: ''
-    ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
-      "${ruby}/bin/ruby" \
-      "${confFiles}/Gemfile" \
-      "$out/${ruby.gemPath}" \
-      "${bundler}/${ruby.gemPath}" \
-      ${lib.escapeShellArg binPaths} \
-      ${lib.escapeShellArg groups}
-  '';
+  basicEnv = import ./basic args // { inherit drvName pname gemfile lockfile gemset; };
 
-  bundlerEnv = buildEnv {
-    inherit ignoreCollisions;
+  # Idea here is a mkDerivation that gen-bin-stubs new stubs "as specified" -
+  # either specific executables or the bin/ for certain gem(s), but
+  # incorporates the basicEnv as a requirement so that its $out is in our path.
 
-    name = drvName;
+  # When stubbing the bins for a gem, we should use the gem expression
+  # directly, which means that basicEnv should somehow make it available.
 
-    paths = envPaths;
-    pathsToLink = [ "/lib" ];
+  # Different use cases should use different variations on this file, rather
+  # than the expression trying to deduce a use case.
 
-    postBuild = (genStubs binPaths) + lib.optionalString (postBuild != null) postBuild;
-
-    meta = { platforms = ruby.meta.platforms; } // meta;
-
-    passthru = rec {
-      inherit ruby bundler gems;
-
-      wrappedRuby = stdenv.mkDerivation {
-        name = "wrapped-ruby-${drvName}";
-        nativeBuildInputs = [ makeWrapper ];
-        buildCommand = ''
-          mkdir -p $out/bin
-          for i in ${ruby}/bin/*; do
-            makeWrapper "$i" $out/bin/$(basename "$i") \
-              --set BUNDLE_GEMFILE ${confFiles}/Gemfile \
-              --set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \
-              --set BUNDLE_FROZEN 1 \
-              --set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \
-              --set GEM_PATH ${bundlerEnv}/${ruby.gemPath}
-          done
-        '';
-      };
-
-      env = let
-        irbrc = builtins.toFile "irbrc" ''
-          if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?)
-            require ENV["OLD_IRBRC"]
-          end
-          require 'rubygems'
-          require 'bundler/setup'
-        '';
-        in stdenv.mkDerivation {
-          name = "${drvName}-interactive-environment";
-          nativeBuildInputs = [ wrappedRuby bundlerEnv ];
-          shellHook = ''
-            export OLD_IRBRC="$IRBRC"
-            export IRBRC=${irbrc}
-          '';
-          buildCommand = ''
-            echo >&2 ""
-            echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
-            echo >&2 ""
-            exit 1
-          '';
-        };
-    };
-  };
+  # The basicEnv should be put into passthru so that e.g. nix-shell can use it.
 in
-  bundlerEnv
+  (linkFarm drvName entries) // {
+    passthru = {
+      inherit basicEnv;
+    };
+  }
diff --git a/pkgs/development/ruby-modules/bundler-env/functions.nix b/pkgs/development/ruby-modules/bundler-env/functions.nix
new file mode 100644
index 00000000000..a2d17be4701
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/functions.nix
@@ -0,0 +1,49 @@
+rec {
+  platformMatches = attrs: (
+  !(attrs ? "platforms") ||
+    builtins.any (platform:
+      platform.engine == ruby.rubyEngine &&
+        (!(platform ? "version") || platform.version == ruby.version.majMin)
+    ) attrs.platforms
+  );
+
+  groupMatches = attrs: (
+  !(attrs ? "groups") ||
+    builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups
+  );
+
+  applyGemConfigs = attrs:
+    (if gemConfig ? "${attrs.gemName}"
+    then attrs // gemConfig."${attrs.gemName}" attrs
+    else attrs);
+
+  genStubsScript = { lib, ruby, confFile, bundler, groups, binPaths }@args: ''
+      ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
+        "${ruby}/bin/ruby" \
+        "${confFiles}/Gemfile" \
+        "$out/${ruby.gemPath}" \
+        "${bundler}/${ruby.gemPath}" \
+        ${lib.escapeShellArg binPaths} \
+        ${lib.escapeShellArg groups}
+    '';
+
+  pathDerivation = { gemName, version, path, ...  }:
+    let
+      res = {
+          type = "derivation";
+          bundledByPath = true;
+          name = gemName;
+          version = version;
+          outPath = path;
+          outputs = [ "out" ];
+          out = res;
+          outputName = "out";
+        };
+    in res;
+
+  composeGemAttrs = gems: name: attrs: ((removeAttrs attrs ["source"]) // attrs.source // {
+    inherit ruby;
+    gemName = name;
+    gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
+  });
+}
diff --git a/pkgs/development/ruby-modules/bundler-env/too-complicated.nix b/pkgs/development/ruby-modules/bundler-env/too-complicated.nix
new file mode 100644
index 00000000000..7d2f0efe001
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/too-complicated.nix
@@ -0,0 +1,195 @@
+{ stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib
+, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv
+, git
+, makeWrapper
+, bundler
+, tree
+}@defs:
+
+{ name ? null
+, pname ? null
+, gemdir ? null
+, gemfile ? null
+, lockfile ? null
+, gemset ? null
+, allBins ? false
+, ruby ? defs.ruby
+, gemConfig ? defaultGemConfig
+, postBuild ? null
+, document ? []
+, meta ? {}
+, groups ? ["default"]
+, ignoreCollisions ? false
+, ...
+}@args:
+
+let
+  drvName =
+    if name != null then name
+    else if pname != null then "${toString pname}-${mainGem.version}"
+    else throw "bundlerEnv: either pname or name must be set";
+
+  mainGem =
+    if pname == null then null
+    else gems."${pname}" or (throw "bundlerEnv: gem ${pname} not found");
+
+  gemfile' =
+    if gemfile == null then gemdir + "/Gemfile"
+    else gemfile;
+
+  lockfile' =
+    if lockfile == null then gemdir + "/Gemfile.lock"
+    else lockfile;
+
+  gemset' =
+    if gemset == null then gemdir + "/gemset.nix"
+    else gemset;
+
+  importedGemset = import gemset';
+
+  platformMatches = attrs: (
+  !(attrs ? "platforms") ||
+    builtins.any (platform:
+      platform.engine == ruby.rubyEngine &&
+        (!(platform ? "version") || platform.version == ruby.version.majMin)
+    ) attrs.platforms
+  );
+
+  groupMatches = attrs: (
+  !(attrs ? "groups") ||
+    builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups
+  );
+
+  filteredGemset = lib.filterAttrs (name: attrs: platformMatches attrs && groupMatches attrs) importedGemset;
+
+  applyGemConfigs = attrs:
+    (if gemConfig ? "${attrs.gemName}"
+    then attrs // gemConfig."${attrs.gemName}" attrs
+    else attrs);
+
+  configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs:
+    applyGemConfigs (attrs // { inherit ruby; gemName = name; })
+  );
+
+  hasBundler = builtins.hasAttr "bundler" filteredGemset;
+
+  bundler =
+    if hasBundler then gems.bundler
+    else defs.bundler.override (attrs: { inherit ruby; });
+
+  pathDerivation = { gemName, version, path, ...  }:
+    let
+      res = {
+          type = "derivation";
+          bundledByPath = true;
+          name = gemName;
+          version = version;
+          outPath = path;
+          outputs = [ "out" ];
+          out = res;
+          outputName = "out";
+        };
+    in res;
+
+  buildGem = name: attrs: (
+    let
+      gemAttrs = ((removeAttrs attrs ["source"]) // attrs.source // {
+        inherit ruby;
+        gemName = name;
+        gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
+      });
+    in
+    if gemAttrs.type == "path" then pathDerivation gemAttrs
+    else buildRubyGem gemAttrs);
+
+  gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
+
+  maybeCopyAll = main: if main == null then "" else copyIfBundledByPath main;
+
+  copyIfBundledByPath = { bundledByPath ? false, ...}@main:
+  (if bundledByPath then ''
+  cp -a ${gemdir}/* $out/
+  '' else ""
+  );
+
+  # We have to normalize the Gemfile.lock, otherwise bundler tries to be
+  # helpful by doing so at run time, causing executables to immediately bail
+  # out. Yes, I'm serious.
+  confFiles = runCommand "gemfile-and-lockfile" {} ''
+    mkdir -p $out
+    ${maybeCopyAll mainGem}
+    cp ${gemfile'} $out/Gemfile || ls -l $out/Gemfile
+    cp ${lockfile'} $out/Gemfile.lock || ls -l $out/Gemfile.lock
+  '';
+
+  envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
+
+  binPaths = if !allBins && mainGem != null then [ mainGem ] else envPaths;
+
+  genStubs = binPaths: ''
+    ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
+      "${ruby}/bin/ruby" \
+      "${confFiles}/Gemfile" \
+      "$out/${ruby.gemPath}" \
+      "${bundler}/${ruby.gemPath}" \
+      ${lib.escapeShellArg binPaths} \
+      ${lib.escapeShellArg groups}
+  '';
+
+  bundlerEnv = buildEnv {
+    inherit ignoreCollisions;
+
+    name = drvName;
+
+    paths = envPaths;
+    pathsToLink = [ "/lib" ];
+
+    postBuild = (genStubs binPaths) + lib.optionalString (postBuild != null) postBuild;
+
+    meta = { platforms = ruby.meta.platforms; } // meta;
+
+    passthru = rec {
+      inherit ruby bundler gems;
+
+      wrappedRuby = stdenv.mkDerivation {
+        name = "wrapped-ruby-${drvName}";
+        nativeBuildInputs = [ makeWrapper ];
+        buildCommand = ''
+          mkdir -p $out/bin
+          for i in ${ruby}/bin/*; do
+            makeWrapper "$i" $out/bin/$(basename "$i") \
+              --set BUNDLE_GEMFILE ${confFiles}/Gemfile \
+              --set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \
+              --set BUNDLE_FROZEN 1 \
+              --set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \
+              --set GEM_PATH ${bundlerEnv}/${ruby.gemPath}
+          done
+        '';
+      };
+
+      env = let
+        irbrc = builtins.toFile "irbrc" ''
+          if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?)
+            require ENV["OLD_IRBRC"]
+          end
+          require 'rubygems'
+          require 'bundler/setup'
+        '';
+        in stdenv.mkDerivation {
+          name = "${drvName}-interactive-environment";
+          nativeBuildInputs = [ wrappedRuby bundlerEnv ];
+          shellHook = ''
+            export OLD_IRBRC="$IRBRC"
+            export IRBRC=${irbrc}
+          '';
+          buildCommand = ''
+            echo >&2 ""
+            echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+            echo >&2 ""
+            exit 1
+          '';
+        };
+    };
+  };
+in
+  bundlerEnv

From 2b414e1c1553c1ff678d172f99da227670b8f68e Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Mon, 1 May 2017 09:07:42 -0700
Subject: [PATCH 0042/3246] Test harnesses

---
 .../ruby-modules/bundler-env/basic.nix        | 42 +++++++------
 .../ruby-modules/bundler-env/default.nix      | 47 +++++++++-----
 .../ruby-modules/bundler-env/functions.nix    |  5 +-
 .../ruby-modules/bundler-env/tap-support.nix  | 20 ++++++
 .../ruby-modules/bundler-env/test.nix         | 49 +++++++++++++++
 .../ruby-modules/bundler-env/testing.nix      | 62 +++++++++++++++++++
 6 files changed, 189 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/development/ruby-modules/bundler-env/tap-support.nix
 create mode 100644 pkgs/development/ruby-modules/bundler-env/test.nix
 create mode 100644 pkgs/development/ruby-modules/bundler-env/testing.nix

diff --git a/pkgs/development/ruby-modules/bundler-env/basic.nix b/pkgs/development/ruby-modules/bundler-env/basic.nix
index 705c8dabd63..7f96a8ce0e7 100644
--- a/pkgs/development/ruby-modules/bundler-env/basic.nix
+++ b/pkgs/development/ruby-modules/bundler-env/basic.nix
@@ -5,11 +5,11 @@
 }@defs:
 
 {
-  drvName
-, pname
+  pname
 , gemfile
 , lockfile
 , gemset
+, gemdir
 , ruby ? defs.ruby
 , gemConfig ? defaultGemConfig
 , postBuild ? null
@@ -20,14 +20,13 @@
 , ...
 }@args:
 
-with (import ./functions.nix);
+with (import ./functions.nix { inherit lib ruby gemConfig groups; });
 
 let
-  mainGem = gems."${pname}" or (throw "bundlerEnv: gem ${pname} not found");
 
   importedGemset = import gemset;
 
-  filteredGemset = lib.filterAttrs (name: attrs: platformMatches attrs && groupMatches attrs) importedGemset;
+  filteredGemset = filterGemset importedGemset;
 
   configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs:
     applyGemConfigs (attrs // { inherit ruby; gemName = name; })
@@ -47,14 +46,18 @@ let
   '' else ""
   );
 
-  maybeCopyAll = main: if main == null then "" else copyIfBundledByPath main;
+  maybeCopyAll = pname: if pname == null then "" else
+  let
+    mainGem = gems."${pname}" or (throw "bundlerEnv: gem ${pname} not found");
+  in
+    copyIfBundledByPath mainGem;
 
   # We have to normalize the Gemfile.lock, otherwise bundler tries to be
   # helpful by doing so at run time, causing executables to immediately bail
   # out. Yes, I'm serious.
   confFiles = runCommand "gemfile-and-lockfile" {} ''
     mkdir -p $out
-    ${maybeCopyAll mainGem}
+    ${maybeCopyAll pname}
     cp ${gemfile} $out/Gemfile || ls -l $out/Gemfile
     cp ${lockfile} $out/Gemfile.lock || ls -l $out/Gemfile.lock
   '';
@@ -71,13 +74,10 @@ let
 
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
 
-  # binPaths = if mainGem != null then [ mainGem ] else envPaths;
-
-in
-  buildEnv {
+  basicEnv = buildEnv {
     inherit ignoreCollisions;
 
-    name = drvName;
+    name = pname;
 
     paths = envPaths;
     pathsToLink = [ "/lib" ];
@@ -90,20 +90,20 @@ in
     meta = { platforms = ruby.meta.platforms; } // meta;
 
     passthru = rec {
-      inherit ruby bundler gems;
+      inherit ruby bundler gems; # drvName;
 
       wrappedRuby = stdenv.mkDerivation {
-        name = "wrapped-ruby-${drvName}";
+        name = "wrapped-ruby-${pname}";
         nativeBuildInputs = [ makeWrapper ];
         buildCommand = ''
           mkdir -p $out/bin
           for i in ${ruby}/bin/*; do
             makeWrapper "$i" $out/bin/$(basename "$i") \
               --set BUNDLE_GEMFILE ${confFiles}/Gemfile \
-              --set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \
+              --set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} \
               --set BUNDLE_FROZEN 1 \
-              --set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \
-              --set GEM_PATH ${bundlerEnv}/${ruby.gemPath}
+              --set GEM_HOME ${basicEnv}/${ruby.gemPath} \
+              --set GEM_PATH ${basicEnv}/${ruby.gemPath}
           done
         '';
       };
@@ -117,8 +117,8 @@ in
           require 'bundler/setup'
         '';
         in stdenv.mkDerivation {
-          name = "${drvName}-interactive-environment";
-          nativeBuildInputs = [ wrappedRuby bundlerEnv ];
+          name = "${pname}-interactive-environment";
+          nativeBuildInputs = [ wrappedRuby basicEnv ];
           shellHook = ''
             export OLD_IRBRC="$IRBRC"
             export IRBRC=${irbrc}
@@ -131,4 +131,6 @@ in
           '';
         };
     };
-  }
+  };
+in
+  basicEnv
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 5218d7f0c4d..d1fa4785c06 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -24,15 +24,13 @@
 }@args:
 
 let
+  inherit (import ./functions.nix (defs // args)) genStubsScript;
+
   drvName =
     if name != null then name
-    else if pname != null then "${toString pname}-${mainGem.version}"
+    else if pname != null then "${toString pname}-${basicEnv.gems."${pname}".version}"
     else throw "bundlerEnv: either pname or name must be set";
 
-  mainGem =
-    if pname == null then null
-    else gems."${pname}" or (throw "bundlerEnv: gem ${pname} not found");
-
   gemfile' =
     if gemfile == null then gemdir + "/Gemfile"
     else gemfile;
@@ -45,12 +43,13 @@ let
     if gemset == null then gemdir + "/gemset.nix"
     else gemset;
 
-  envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
-
-  binPaths = if mainGem != null then [ mainGem ] else envPaths;
-
-  basicEnv = import ./basic args // { inherit drvName pname gemfile lockfile gemset; };
+  basicEnv = (callPackage ./basic.nix {}) (args // { inherit pname gemdir;
+    gemfile = gemfile';
+    lockfile  = lockfile';
+    gemset = gemset';
+  });
 
+  inherit (basicEnv) envPaths;
   # Idea here is a mkDerivation that gen-bin-stubs new stubs "as specified" -
   # either specific executables or the bin/ for certain gem(s), but
   # incorporates the basicEnv as a requirement so that its $out is in our path.
@@ -63,8 +62,26 @@ let
 
   # The basicEnv should be put into passthru so that e.g. nix-shell can use it.
 in
-  (linkFarm drvName entries) // {
-    passthru = {
-      inherit basicEnv;
-    };
-  }
+  if builtins.trace "pname: ${toString pname}" pname == null then
+    basicEnv // { inherit name; }
+  else
+    (buildEnv {
+      inherit ignoreCollisions;
+
+      name = builtins.trace "name: ${toString drvName}" drvName;
+
+      paths = envPaths;
+      pathsToLink = [ "/lib" ];
+
+      postBuild = genStubsScript defs // args // {
+        inherit bundler;
+        confFiles = basicEnv.confFiles;
+        binPaths = [ basicEnv.mainGem ];
+      } + lib.optionalString (postBuild != null) postBuild;
+
+      meta = { platforms = ruby.meta.platforms; } // meta;
+      passthru = basicEnv.passthru // {
+        inherit basicEnv;
+        inherit (basicEnv) env;
+      };
+    })
diff --git a/pkgs/development/ruby-modules/bundler-env/functions.nix b/pkgs/development/ruby-modules/bundler-env/functions.nix
index a2d17be4701..75dd276f663 100644
--- a/pkgs/development/ruby-modules/bundler-env/functions.nix
+++ b/pkgs/development/ruby-modules/bundler-env/functions.nix
@@ -1,4 +1,7 @@
+{ lib, ruby, groups, gemConfig, ... }:
 rec {
+  filterGemset = gemset: lib.filterAttrs (name: attrs: platformMatches attrs && groupMatches attrs) gemset;
+
   platformMatches = attrs: (
   !(attrs ? "platforms") ||
     builtins.any (platform:
@@ -17,7 +20,7 @@ rec {
     then attrs // gemConfig."${attrs.gemName}" attrs
     else attrs);
 
-  genStubsScript = { lib, ruby, confFile, bundler, groups, binPaths }@args: ''
+  genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths }: ''
       ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
         "${ruby}/bin/ruby" \
         "${confFiles}/Gemfile" \
diff --git a/pkgs/development/ruby-modules/bundler-env/tap-support.nix b/pkgs/development/ruby-modules/bundler-env/tap-support.nix
new file mode 100644
index 00000000000..ba576683d37
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/tap-support.nix
@@ -0,0 +1,20 @@
+with builtins;
+let
+  withIndexes = list: genList (idx: (elemAt list idx) // {index = idx;}) (length list);
+
+  testLine = report: "${okStr report} ${toString report.index} ${report.description}" + testDirective report + testYaml report;
+
+  testDirective = report: "";
+
+  testYaml = report: "";
+
+  okStr = { result, ...}: if result == "pass" then "ok" else "not ok";
+in
+  {
+    output = reports: ''
+      TAP version 13
+      1..${toString (length reports)}'' + (foldl' (l: r: l + "\n" + r) "" (map testLine (withIndexes reports))) + ''
+
+      # Finished at ${toString currentTime}
+      '';
+  }
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
new file mode 100644
index 00000000000..3f77eb1fb43
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -0,0 +1,49 @@
+{ writeText, lib, ruby, defaultGemConfig, callPackage }:
+let
+  test = import ./testing.nix;
+  tap = import ./tap-support.nix;
+
+  bundlerEnv = callPackage ./default.nix {};
+
+  testConfigs = {
+    groups = ["default"];
+    gemConfig =  defaultGemConfig;
+    confFiles = "./testConfs";
+  };
+  functions = (import ./functions.nix ({ inherit lib ruby; } // testConfigs));
+
+  should = {
+    equal = expected: actual:
+    if actual == expected then
+    (test.passed "= ${toString expected}") else
+    (test.failed "'${toString actual}'(${builtins.typeOf actual}) != '${toString expected}'(${builtins.typeOf expected})");
+
+    beASet = actual:
+    if builtins.isAttrs actual then
+    (test.passed "is a set") else
+    (test.failed "is not a set, was ${builtins.typeOf actual}: ${toString actual}");
+  };
+
+  justName = bundlerEnv {
+    name = "test";
+    gemset = ./test/gemset.nix;
+  };
+
+  pnamed = bundlerEnv {
+    pname = "test";
+    gemset = ./test/gemset.nix;
+  };
+
+  results = builtins.concatLists [
+    (test.run "Filter empty gemset" {} (set: functions.filterGemset set == {}))
+    (test.run "bundlerEnv { name }" justName {
+      name = should.equal "test";
+    })
+    (test.run "bundlerEnv { pname }" pnamed
+     {
+      name = should.equal "test-0.1.2";
+      env = should.beASet;
+    })
+  ];
+in
+  writeText "test-results.tap" (tap.output results)
diff --git a/pkgs/development/ruby-modules/bundler-env/testing.nix b/pkgs/development/ruby-modules/bundler-env/testing.nix
new file mode 100644
index 00000000000..43d10fca044
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/testing.nix
@@ -0,0 +1,62 @@
+with builtins;
+let
+  /*
+  underTest = {
+    x = {
+      a = 1;
+      b = "2";
+    };
+  };
+
+  tests = [
+    (root: false)
+    {
+      x = [
+        (set: true)
+        {
+          a = (a: a > 1);
+          b = (b: b == "3");
+        }
+      ];
+    }
+  ];
+
+  results = run "Examples" underTest tests;
+  */
+
+  passed = desc: {
+    result = "pass";
+    description = desc;
+  };
+
+  failed = desc: {
+    result = "failed";
+    description = desc;
+  };
+
+  prefixName = name: res: {
+    inherit (res) result;
+    description = "${name}: ${res.description}";
+  };
+
+  run = name: under: tests: if isList tests then
+    (concatLists (map (run name under) tests))
+  else if isAttrs tests then
+    (concatLists (map (
+    subName: run (name + "." + subName) (if hasAttr subName under then getAttr subName under else "<MISSING!>") (getAttr subName tests)
+    ) (attrNames tests)))
+  else if isFunction tests then
+    let
+      res = tests under;
+    in
+      if isBool res then
+        [
+          (prefixName name (if tests under then passed "passed" else failed "failed"))
+        ]
+      else
+        [ (prefixName name res) ]
+  else [
+    failed (name ": not a function, list or set")
+  ];
+in
+  { inherit run passed failed; }

From eef6df55f10ea804963f40237b5666e62f1205e1 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 1 May 2017 18:34:53 -0300
Subject: [PATCH 0043/3246] terminology: wrap libcurl.so in LD_LIBRARY_PATH

---
 pkgs/desktops/enlightenment/terminology.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index fc36a7e7a65..5f2db064af2 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl }:
+{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "1x4j2q4qqj10ckbka0zaq2r2zm66ff1x791kp8slv1ff7fw45vdz";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
 
-  buildInputs = [ efl ];
+  buildInputs = [ efl curl ];
 
   NIX_CFLAGS_COMPILE = [
     "-I${efl}/include/ecore-con-1"
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
     "-I${efl}/include/ethumb-1"
   ];
 
+  postInstall = ''
+    for f in $out/bin/*; do
+      wrapProgram $f --prefix LD_LIBRARY_PATH : ${curl.out}/lib
+    done
+  '';
+
   meta = {
     description = "The best terminal emulator written with the EFL";
     homepage = http://enlightenment.org/;

From 627724d38681c36ad9a902ee3398002bbccdd698 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 1 May 2017 18:35:16 -0300
Subject: [PATCH 0044/3246] ephoto: wrap libcurl.so in LD_LIBRARY_PATH

---
 pkgs/desktops/enlightenment/ephoto.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index b0606e95792..ee6013dae29 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl }:
+{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "ephoto-${version}";
@@ -9,13 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "0l6zrk22fap6pylmzxwp6nycy8l5wdc7jza890h4zrwmpfag8w31";
   };
 
-  nativeBuildInputs = [
-    pkgconfig
-  ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
 
-  buildInputs = [
-    efl
- ];
+  buildInputs = [ efl curl ];
 
   NIX_CFLAGS_COMPILE = [
     "-I${efl}/include/ecore-con-1"
@@ -29,6 +25,10 @@ stdenv.mkDerivation rec {
     "-I${efl}/include/ethumb-client-1"
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib
+  '';
+
   meta = {
     description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
     homepage = http://smhouston.us/ephoto/;

From 30e086d3494a22f59fd793d823dece7b6ffbe693 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 1 May 2017 18:35:34 -0300
Subject: [PATCH 0045/3246] rage: wrap libcurl.so in LD_LIBRARY_PATH

---
 pkgs/desktops/enlightenment/rage.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix
index a9222105058..4d102b31e3b 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, curl, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "rage-${version}";
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-good
     gst_all_1.gst-plugins-bad
     gst_all_1.gst-libav
+    curl
  ];
 
   NIX_CFLAGS_COMPILE = [
@@ -38,6 +39,10 @@ stdenv.mkDerivation rec {
     "-I${efl}/include/ethumb-client-1"
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib
+  '';
+
   meta = {
     description = "Video + Audio player along the lines of mplayer";
     homepage = http://enlightenment.org/;

From 37452080840cbc94c078210c3784424c90feb645 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 1 May 2017 18:35:48 -0300
Subject: [PATCH 0046/3246] econnman: wrap libcurl.so in LD_LIBRARY_PATH

---
 pkgs/desktops/enlightenment/econnman.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix
index 60e63dc68ed..7739e2bd09e 100644
--- a/pkgs/desktops/enlightenment/econnman.nix
+++ b/pkgs/desktops/enlightenment/econnman.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "econnman-${version}";
@@ -11,12 +11,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ];
 
-  buildInputs = [ efl python2Packages.python dbus ];
+  buildInputs = [ efl python2Packages.python dbus curl ];
 
   pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ];
 
   postInstall = ''
     wrapPythonPrograms
+    wrapProgram $out/bin/econnman-bin --prefix LD_LIBRARY_PATH : ${curl.out}/lib
   '';
 
   meta = {

From 66fed6d28f70263f6a4105e6e8504742618932cb Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Wed, 3 May 2017 20:27:42 -0700
Subject: [PATCH 0047/3246] Basically working. Checking against actual use
 cases.

---
 .../ruby-modules/bundler-env/basic.nix        |  8 ++--
 .../ruby-modules/bundler-env/default.nix      | 12 +++---
 .../ruby-modules/bundler-env/functions.nix    |  2 +-
 .../ruby-modules/bundler-env/test.nix         | 37 ++++++++++++++++---
 .../ruby-modules/bundler-env/test/Gemfile     |  0
 .../bundler-env/test/Gemfile.lock             |  0
 6 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/ruby-modules/bundler-env/test/Gemfile
 create mode 100644 pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock

diff --git a/pkgs/development/ruby-modules/bundler-env/basic.nix b/pkgs/development/ruby-modules/bundler-env/basic.nix
index 7f96a8ce0e7..4557a7500f6 100644
--- a/pkgs/development/ruby-modules/bundler-env/basic.nix
+++ b/pkgs/development/ruby-modules/bundler-env/basic.nix
@@ -82,15 +82,15 @@ let
     paths = envPaths;
     pathsToLink = [ "/lib" ];
 
-    postBuild = genStubsScript defs // args // {
-      inherit confFiles bundler;
+    postBuild = genStubsScript (defs // args // {
+      inherit confFiles bundler groups;
       binPaths = envPaths;
-    } + lib.optionalString (postBuild != null) postBuild;
+    }) + lib.optionalString (postBuild != null) postBuild;
 
     meta = { platforms = ruby.meta.platforms; } // meta;
 
     passthru = rec {
-      inherit ruby bundler gems; # drvName;
+      inherit ruby bundler gems mainGem confFiles; # drvName;
 
       wrappedRuby = stdenv.mkDerivation {
         name = "wrapped-ruby-${pname}";
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index d1fa4785c06..30896a598e4 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -24,7 +24,7 @@
 }@args:
 
 let
-  inherit (import ./functions.nix (defs // args)) genStubsScript;
+  inherit (import ./functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
 
   drvName =
     if name != null then name
@@ -62,21 +62,21 @@ let
 
   # The basicEnv should be put into passthru so that e.g. nix-shell can use it.
 in
-  if builtins.trace "pname: ${toString pname}" pname == null then
+  if pname == null then
     basicEnv // { inherit name; }
   else
     (buildEnv {
       inherit ignoreCollisions;
 
-      name = builtins.trace "name: ${toString drvName}" drvName;
+      name = drvName;
 
       paths = envPaths;
       pathsToLink = [ "/lib" ];
 
-      postBuild = genStubsScript defs // args // {
-        inherit bundler;
+      postBuild = genStubsScript {
+        inherit lib ruby bundler groups;
         confFiles = basicEnv.confFiles;
-        binPaths = [ basicEnv.mainGem ];
+        binPaths = [ basicEnv.gems."${pname}" ];
       } + lib.optionalString (postBuild != null) postBuild;
 
       meta = { platforms = ruby.meta.platforms; } // meta;
diff --git a/pkgs/development/ruby-modules/bundler-env/functions.nix b/pkgs/development/ruby-modules/bundler-env/functions.nix
index 75dd276f663..21efcacff8a 100644
--- a/pkgs/development/ruby-modules/bundler-env/functions.nix
+++ b/pkgs/development/ruby-modules/bundler-env/functions.nix
@@ -20,7 +20,7 @@ rec {
     then attrs // gemConfig."${attrs.gemName}" attrs
     else attrs);
 
-  genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths }: ''
+  genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: ''
       ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
         "${ruby}/bin/ruby" \
         "${confFiles}/Gemfile" \
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index 3f77eb1fb43..cb06d1012d2 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -1,9 +1,17 @@
+/*
+Run with:
+nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace; and cat result
+
+Confusingly, the ideal result ends with something like:
+error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed
+*/
 { writeText, lib, ruby, defaultGemConfig, callPackage }:
 let
   test = import ./testing.nix;
   tap = import ./tap-support.nix;
 
   bundlerEnv = callPackage ./default.nix {};
+  basicEnv = callPackage ./basic.nix {};
 
   testConfigs = {
     groups = ["default"];
@@ -22,6 +30,18 @@ let
     if builtins.isAttrs actual then
     (test.passed "is a set") else
     (test.failed "is not a set, was ${builtins.typeOf actual}: ${toString actual}");
+
+    haveKeys = expected: actual:
+    if builtins.all
+      (ex: builtins.any (ac: ex == ac) (builtins.attrNames actual))
+      expected then
+      (test.passed "has expected keys") else
+      (test.failed "keys differ: expected [${lib.concatStringsSep ";" expected}] have [${lib.concatStringsSep ";" (builtins.attrNames actual)}]");
+
+    havePrefix = expected: actual:
+    if lib.hasPrefix expected actual then
+    (test.passed "has prefix '${expected}'") else
+    (test.failed "prefix '${expected}' not found in '${actual}'");
   };
 
   justName = bundlerEnv {
@@ -29,9 +49,12 @@ let
     gemset = ./test/gemset.nix;
   };
 
-  pnamed = bundlerEnv {
+  pnamed = basicEnv {
     pname = "test";
+    gemdir = ./test;
     gemset = ./test/gemset.nix;
+    gemfile = ./test/Gemfile;
+    lockfile = ./test/Gemfile.lock;
   };
 
   results = builtins.concatLists [
@@ -40,10 +63,14 @@ let
       name = should.equal "test";
     })
     (test.run "bundlerEnv { pname }" pnamed
-     {
-      name = should.equal "test-0.1.2";
-      env = should.beASet;
-    })
+    [
+      (should.haveKeys [ "name" "env" "postBuild" ])
+      {
+        name = should.equal "test-0.1.2";
+        env = should.beASet;
+        postBuild = should.havePrefix "nananana";
+      }
+    ])
   ];
 in
   writeText "test-results.tap" (tap.output results)
diff --git a/pkgs/development/ruby-modules/bundler-env/test/Gemfile b/pkgs/development/ruby-modules/bundler-env/test/Gemfile
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock b/pkgs/development/ruby-modules/bundler-env/test/Gemfile.lock
new file mode 100644
index 00000000000..e69de29bb2d

From 42ff593555c9f74429441082a898b7d42bd5b287 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Sun, 7 May 2017 16:05:53 -0700
Subject: [PATCH 0048/3246] nylas-mail: 2.0.31

Added new email client Nylas-Mail.
---
 .../mailreaders/nylas-mail/default.nix        | 134 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   7 +-
 2 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/mailreaders/nylas-mail/default.nix

diff --git a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
new file mode 100644
index 00000000000..6914dbdb7bf
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
@@ -0,0 +1,134 @@
+{ config
+, stdenv
+, pkgs
+, fetchurl
+, dpkg
+, lib
+, gnome2
+, libgnome_keyring
+, desktop_file_utils
+, python2
+, nodejs
+, libnotify
+, alsaLib
+, atk
+, glib
+, pango
+, gdk_pixbuf
+, cairo
+, freetype
+, fontconfig
+, dbus
+, nss
+, nspr
+, cups
+, expat
+, wget
+, udev
+, xorg
+, libgcrypt
+, makeWrapper
+, gcc-unwrapped
+, coreutils
+}:
+
+stdenv.mkDerivation rec {
+   name = "${pkgname}-${version}";
+   pkgname = "nylas-mail";
+   version = "2.0.31";
+   subVersion = "e675deb";
+
+   src = fetchurl {
+     url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb";
+     sha256 = "b036956174f998bd4a2662a1f59cb4a302465b3ed06c487de88ff2721e372f6e";
+   };
+
+   # Build dependencies
+   propagatedBuildInputs = [
+     gnome2.gtk
+     gnome2.GConf
+     libgnome_keyring
+     desktop_file_utils
+     python2
+     nodejs
+     libnotify
+     alsaLib
+     atk
+     glib
+     pango
+     gdk_pixbuf
+     cairo
+     freetype
+     fontconfig
+     dbus
+     nss
+     nspr
+     cups
+     expat
+     wget
+     udev
+     gcc-unwrapped
+     coreutils
+     xorg.libXScrnSaver
+     xorg.libXi
+     xorg.libXtst
+     xorg.libXcursor
+     xorg.libXdamage
+     xorg.libXrandr
+     xorg.libXcomposite
+     xorg.libXext
+     xorg.libXfixes
+     xorg.libXrender
+     xorg.libX11
+     xorg.libxkbfile
+   ];
+
+   # Runtime dependencies
+   buildInputs = [ makeWrapper gnome2.gnome_keyring ];
+
+   phases = [ "unpackPhase" ];
+
+   unpackPhase = ''
+    mkdir -p $out
+
+    ${dpkg}/bin/dpkg-deb -x $src unpacked
+    mv unpacked/usr/* $out/
+
+    # Fix path in desktop file
+    substituteInPlace $out/share/applications/nylas-mail.desktop \
+        --replace /usr/bin/nylas-mail $out/bin/nylas-mail
+
+     # Patch librariess
+     noderp=$(patchelf --print-rpath $out/share/nylas-mail/libnode.so)
+     patchelf --set-rpath $noderp:$out/lib:${stdenv.cc.cc.lib}/lib:${xorg.libxkbfile.out}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
+         $out/share/nylas-mail/libnode.so
+
+     ffrp=$(patchelf --print-rpath $out/share/nylas-mail/libffmpeg.so)
+     patchelf --set-rpath $ffrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
+         $out/share/nylas-mail/libffmpeg.so
+
+     # Patch binaries
+     binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas)
+     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+         --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
+         $out/share/nylas-mail/nylas
+
+    wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib";
+
+    # Fix path to bash so apm can install plugins.
+    substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \
+          --replace /bin/bash ${stdenv.shell}
+
+    wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \
+        --set PATH "${coreutils}/bin"
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+             --set-rpath ${gcc-unwrapped.lib}/lib \
+        $out/share/nylas-mail/resources/apm/bin/node
+   '';
+
+   meta = {
+     description = "Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email.";
+     license = stdenv.lib.licenses.gpl3;
+     homepage = https://nylas.com;
+   };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bebd1058e97..0913505b277 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1022,8 +1022,11 @@ with pkgs;
 
   mpdris2 = callPackage ../tools/audio/mpdris2 { };
 
+
   nfdump = callPackage ../tools/networking/nfdump { };
 
+  onboard = callPackage ../applications/misc/onboard { };
+
   playerctl = callPackage ../tools/audio/playerctl { };
 
   socklog = callPackage ../tools/system/socklog { };
@@ -15910,6 +15913,8 @@ with pkgs;
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };
 
+  nylas-mail = callPackage ../applications/networking/mailreaders/nylas-mail { };
+
   thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
     inherit (gnome2) libIDL;
     libpng = libpng_apng;
@@ -17011,7 +17016,7 @@ with pkgs;
   quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { };
 
   quakespasm = callPackage ../games/quakespasm { };
-  
+
   ioquake3 = callPackage ../games/quake3/ioquake { };
 
   quantumminigolf = callPackage ../games/quantumminigolf {};

From 0145ec999c3a5e3d205e94221ce07f11e9fc3b35 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Tue, 9 May 2017 09:39:20 -0700
Subject: [PATCH 0049/3246] Current round of tests pass, but filter function is
 failing to include when groups match in use.

---
 .../ruby-modules/bundler-env/assertions.nix   | 24 +++++++++++
 .../ruby-modules/bundler-env/basic.nix        |  7 +++-
 .../ruby-modules/bundler-env/functions.nix    |  3 +-
 .../ruby-modules/bundler-env/stubs.nix        | 33 +++++++++++++++
 .../ruby-modules/bundler-env/test.nix         | 40 +++++--------------
 pkgs/development/ruby-modules/gem/default.nix |  3 ++
 6 files changed, 77 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/development/ruby-modules/bundler-env/assertions.nix
 create mode 100644 pkgs/development/ruby-modules/bundler-env/stubs.nix

diff --git a/pkgs/development/ruby-modules/bundler-env/assertions.nix b/pkgs/development/ruby-modules/bundler-env/assertions.nix
new file mode 100644
index 00000000000..3cf67d6f3eb
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/assertions.nix
@@ -0,0 +1,24 @@
+{ test, lib, ...}:
+{
+  equal = expected: actual:
+    if actual == expected then
+      (test.passed "= ${toString expected}") else
+      (test.failed "'${toString actual}'(${builtins.typeOf actual}) != '${toString expected}'(${builtins.typeOf expected})");
+
+  beASet = actual:
+    if builtins.isAttrs actual then
+      (test.passed "is a set") else
+      (test.failed "is not a set, was ${builtins.typeOf actual}: ${toString actual}");
+
+  haveKeys = expected: actual:
+    if builtins.all
+    (ex: builtins.any (ac: ex == ac) (builtins.attrNames actual))
+    expected then
+      (test.passed "has expected keys") else
+      (test.failed "keys differ: expected [${lib.concatStringsSep ";" expected}] have [${lib.concatStringsSep ";" (builtins.attrNames actual)}]");
+
+  havePrefix = expected: actual:
+    if lib.hasPrefix expected actual then
+      (test.passed "has prefix '${expected}'") else
+      (test.failed "prefix '${expected}' not found in '${actual}'");
+}
diff --git a/pkgs/development/ruby-modules/bundler-env/basic.nix b/pkgs/development/ruby-modules/bundler-env/basic.nix
index 4557a7500f6..75fe7342344 100644
--- a/pkgs/development/ruby-modules/bundler-env/basic.nix
+++ b/pkgs/development/ruby-modules/bundler-env/basic.nix
@@ -20,7 +20,9 @@
 , ...
 }@args:
 
-with (import ./functions.nix { inherit lib ruby gemConfig groups; });
+with (
+builtins.trace "basic functions"
+import ./functions.nix { inherit lib ruby gemConfig groups; });
 
 let
 
@@ -69,7 +71,8 @@ let
     if gemAttrs.type == "path" then
       pathDerivation gemAttrs
     else
-      buildRubyGem gemAttrs
+      builtins.trace (lib.showVal (gemAttrs.ruby or "def ruby"))
+        buildRubyGem gemAttrs
   );
 
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
diff --git a/pkgs/development/ruby-modules/bundler-env/functions.nix b/pkgs/development/ruby-modules/bundler-env/functions.nix
index 21efcacff8a..4c1f6deb55b 100644
--- a/pkgs/development/ruby-modules/bundler-env/functions.nix
+++ b/pkgs/development/ruby-modules/bundler-env/functions.nix
@@ -1,4 +1,5 @@
 { lib, ruby, groups, gemConfig, ... }:
+builtins.trace (if ruby.stubbed or false then "functions has stubbed ruby" else "functions has live ruby")
 rec {
   filterGemset = gemset: lib.filterAttrs (name: attrs: platformMatches attrs && groupMatches attrs) gemset;
 
@@ -44,7 +45,7 @@ rec {
         };
     in res;
 
-  composeGemAttrs = gems: name: attrs: ((removeAttrs attrs ["source"]) // attrs.source // {
+  composeGemAttrs = gems: name: attrs: ((removeAttrs attrs ["source" "platforms"]) // attrs.source // {
     inherit ruby;
     gemName = name;
     gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
diff --git a/pkgs/development/ruby-modules/bundler-env/stubs.nix b/pkgs/development/ruby-modules/bundler-env/stubs.nix
new file mode 100644
index 00000000000..3585681478c
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/stubs.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, ruby, callPackage, ... }:
+let
+  real = {
+    inherit (stdenv) mkDerivation;
+  };
+  mkDerivation = {name, ...}@argSet:
+  derivation {
+    inherit name;
+    text = (builtins.toJSON (lib.filterAttrs ( n: v: builtins.any (x: x == n) ["name" "system"]) argSet));
+    builder = stdenv.shell;
+    args = [ "-c" "echo  $(<$textPath) > $out"];
+    system = stdenv.system;
+    passAsFile = ["text"];
+  };
+  fetchurl = {url?"", urls ? [],...}: "fetchurl:${if urls == [] then url else builtins.head urls}";
+
+  stdenv' = stdenv // {
+    inherit mkDerivation;
+    stubbed = true;
+  };
+  ruby' = ruby // {
+    stdenv = stdenv';
+    stubbed = true;
+  };
+in
+  {
+    ruby = ruby';
+    buildRubyGem = callPackage ../gem {
+      inherit fetchurl;
+      ruby = ruby';
+    };
+    stdenv = stdenv';
+  }
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index cb06d1012d2..28e5dbe318a 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -5,44 +5,24 @@ nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace
 Confusingly, the ideal result ends with something like:
 error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed
 */
-{ writeText, lib, ruby, defaultGemConfig, callPackage }:
+{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage }@defs:
 let
   test = import ./testing.nix;
   tap = import ./tap-support.nix;
+  stubs = import ./stubs.nix defs;
+  should = import ./assertions.nix { inherit test lib; };
 
-  bundlerEnv = callPackage ./default.nix {};
-  basicEnv = callPackage ./basic.nix {};
+  basicEnv = callPackage ./basic.nix stubs;
+  bundlerEnv = callPackage ./default.nix stubs // {
+    inherit basicEnv;
+  };
 
   testConfigs = {
     groups = ["default"];
     gemConfig =  defaultGemConfig;
     confFiles = "./testConfs";
   };
-  functions = (import ./functions.nix ({ inherit lib ruby; } // testConfigs));
-
-  should = {
-    equal = expected: actual:
-    if actual == expected then
-    (test.passed "= ${toString expected}") else
-    (test.failed "'${toString actual}'(${builtins.typeOf actual}) != '${toString expected}'(${builtins.typeOf expected})");
-
-    beASet = actual:
-    if builtins.isAttrs actual then
-    (test.passed "is a set") else
-    (test.failed "is not a set, was ${builtins.typeOf actual}: ${toString actual}");
-
-    haveKeys = expected: actual:
-    if builtins.all
-      (ex: builtins.any (ac: ex == ac) (builtins.attrNames actual))
-      expected then
-      (test.passed "has expected keys") else
-      (test.failed "keys differ: expected [${lib.concatStringsSep ";" expected}] have [${lib.concatStringsSep ";" (builtins.attrNames actual)}]");
-
-    havePrefix = expected: actual:
-    if lib.hasPrefix expected actual then
-    (test.passed "has prefix '${expected}'") else
-    (test.failed "prefix '${expected}' not found in '${actual}'");
-  };
+  functions = (import ./functions.nix ({ inherit lib; ruby = stubs.ruby; } // testConfigs));
 
   justName = bundlerEnv {
     name = "test";
@@ -66,9 +46,9 @@ let
     [
       (should.haveKeys [ "name" "env" "postBuild" ])
       {
-        name = should.equal "test-0.1.2";
+        name = should.equal "test";
         env = should.beASet;
-        postBuild = should.havePrefix "nananana";
+        postBuild = should.havePrefix "/nix/store";
       }
     ])
   ];
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index ade6659c400..09dbc258876 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -74,6 +74,8 @@ let
 
 in
 
+builtins.trace (gemName)
+builtins.trace (stdenv.stubbed or false)
 stdenv.mkDerivation (attrs // {
   inherit ruby;
   inherit doCheck;
@@ -87,6 +89,7 @@ stdenv.mkDerivation (attrs // {
     ++ lib.optional stdenv.isDarwin darwin.libobjc
     ++ buildInputs;
 
+  #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}";
   name = attrs.name or "${namePrefix}${gemName}-${version}";
 
   inherit src;

From 2ba83bd2dcb645e91fe9b5db0afcfaf39ad1fa92 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Tue, 9 May 2017 14:37:02 -0700
Subject: [PATCH 0050/3246] Removed onboard package from all-packages..

Onboard was left in accidentally.
---
 pkgs/top-level/all-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0913505b277..6c95a907864 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1022,11 +1022,8 @@ with pkgs;
 
   mpdris2 = callPackage ../tools/audio/mpdris2 { };
 
-
   nfdump = callPackage ../tools/networking/nfdump { };
 
-  onboard = callPackage ../applications/misc/onboard { };
-
   playerctl = callPackage ../tools/audio/playerctl { };
 
   socklog = callPackage ../tools/system/socklog { };

From ba096d8ddf26b7ffc5f5179257dd16a52d6322b0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 9 May 2017 21:11:50 +0200
Subject: [PATCH 0051/3246] mfcl2700dnlpr: init at 3.2.0-1

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

diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
new file mode 100644
index 00000000000..3a5f8d3ce4e
--- /dev/null
+++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
@@ -0,0 +1,44 @@
+{ coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }:
+
+stdenv.mkDerivation rec {
+  name = "mfcl2700dnlpr-${meta.version}";
+
+  src = fetchurl {
+    url = "http://download.brother.com/welcome/dlf102085/${name}.i386.deb";
+    sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m";
+  };
+
+  nativeBuildInputs = [ dpkg makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    dpkg-deb -x $src $out
+
+    dir=$out/opt/brother/Printers/MFCL2700DN
+
+    substituteInPlace $dir/lpd/filter_MFCL2700DN \
+      --replace /usr/bin/perl ${perl}/bin/perl \
+      --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
+      --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #"
+
+    wrapProgram $dir/lpd/filter_MFCL2700DN \
+      --prefix PATH : ${stdenv.lib.makeBinPath [
+        coreutils ghostscript gnugrep gnused which
+      ]}
+
+    interpreter=$(cat $NIX_CC/nix-support/dynamic-linker)
+    patchelf --set-interpreter "$interpreter" $dir/inf/braddprinter
+    patchelf --set-interpreter "$interpreter" $dir/lpd/brprintconflsr3
+    patchelf --set-interpreter "$interpreter" $dir/lpd/rawtobr3
+  '';
+
+  meta = {
+    description = "Brother MFC-L2700DN LPR driver";
+    homepage = "http://www.brother.com/";
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.tv ];
+    platforms = [ "i686-linux" ];
+    version = "3.2.0-1";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1467add1e91..cdf210d5acf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18379,6 +18379,8 @@ with pkgs;
   mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { };
   mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { };
 
+  mfcl2700dnlpr = callPackage_i686 ../misc/cups/drivers/mfcl2700dnlpr { };
+
   samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { };
   samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
   samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { };

From 6fdcc7f5b43b750aff56ac535202768e15b4c06a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 9 May 2017 21:12:57 +0200
Subject: [PATCH 0052/3246] mfcl2700dncupswrapper: init at 3.2.0-1

---
 .../drivers/mfcl2700dncupswrapper/default.nix | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix

diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
new file mode 100644
index 00000000000..0378aac6d70
--- /dev/null
+++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
@@ -0,0 +1,44 @@
+{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "mfcl2700dncupswrapper-${meta.version}";
+
+  src = fetchurl {
+    url = "http://download.brother.com/welcome/dlf102086/${name}.i386.deb";
+    sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1";
+  };
+
+  nativeBuildInputs = [ dpkg makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    dpkg-deb -x $src $out
+
+    basedir=${mfcl2700dnlpr}/opt/brother/Printers/MFCL2700DN
+    dir=$out/opt/brother/Printers/MFCL2700DN
+
+    substituteInPlace $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \
+      --replace /usr/bin/perl ${perl}/bin/perl \
+      --replace "basedir =~" "basedir = \"$basedir\"; #" \
+      --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #"
+
+    wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
+
+    mkdir -p $out/lib/cups/filter
+    mkdir -p $out/share/cups/model
+
+    ln $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN $out/lib/cups/filter
+    ln $dir/cupswrapper/brother-MFCL2700DN-cups-en.ppd $out/share/cups/model
+  '';
+
+  meta = {
+    description = "Brother MFC-L2700DN CUPS wrapper driver";
+    homepage = "http://www.brother.com/";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.tv ];
+    platforms = stdenv.lib.platforms.linux;
+    version = "3.2.0-1";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdf210d5acf..8f1772c29f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18379,6 +18379,7 @@ with pkgs;
   mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { };
   mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { };
 
+  mfcl2700dncupswrapper = callPackage ../misc/cups/drivers/mfcl2700dncupswrapper { };
   mfcl2700dnlpr = callPackage_i686 ../misc/cups/drivers/mfcl2700dnlpr { };
 
   samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { };

From 07f781bd8d8b114985b47762bf0930729a5247ce Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Wed, 10 May 2017 10:00:21 -0700
Subject: [PATCH 0053/3246] Current round of tests pass, but filter function is
 failing to include when platform match in use.

---
 .../ruby-modules/bundler-env/basic.nix         | 11 ++++-------
 .../ruby-modules/bundler-env/functions.nix     | 18 ++++++++++--------
 .../ruby-modules/bundler-env/runtests.sh       |  2 ++
 .../ruby-modules/bundler-env/test.nix          | 16 ++++++++++++----
 pkgs/development/ruby-modules/gem/default.nix  |  2 --
 5 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100755 pkgs/development/ruby-modules/bundler-env/runtests.sh

diff --git a/pkgs/development/ruby-modules/bundler-env/basic.nix b/pkgs/development/ruby-modules/bundler-env/basic.nix
index 75fe7342344..80f12c14bfe 100644
--- a/pkgs/development/ruby-modules/bundler-env/basic.nix
+++ b/pkgs/development/ruby-modules/bundler-env/basic.nix
@@ -20,15 +20,13 @@
 , ...
 }@args:
 
-with (
-builtins.trace "basic functions"
-import ./functions.nix { inherit lib ruby gemConfig groups; });
+with  import ./functions.nix { inherit lib gemConfig; };
 
 let
 
   importedGemset = import gemset;
 
-  filteredGemset = filterGemset importedGemset;
+  filteredGemset = filterGemset { inherit ruby groups; } importedGemset;
 
   configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs:
     applyGemConfigs (attrs // { inherit ruby; gemName = name; })
@@ -66,13 +64,12 @@ let
 
   buildGem = name: attrs: (
     let
-      gemAttrs = composeGemAttrs gems name attrs;
+      gemAttrs = composeGemAttrs ruby gems name attrs;
     in
     if gemAttrs.type == "path" then
       pathDerivation gemAttrs
     else
-      builtins.trace (lib.showVal (gemAttrs.ruby or "def ruby"))
-        buildRubyGem gemAttrs
+      buildRubyGem gemAttrs
   );
 
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
diff --git a/pkgs/development/ruby-modules/bundler-env/functions.nix b/pkgs/development/ruby-modules/bundler-env/functions.nix
index 4c1f6deb55b..5a51f4d8208 100644
--- a/pkgs/development/ruby-modules/bundler-env/functions.nix
+++ b/pkgs/development/ruby-modules/bundler-env/functions.nix
@@ -1,17 +1,19 @@
-{ lib, ruby, groups, gemConfig, ... }:
-builtins.trace (if ruby.stubbed or false then "functions has stubbed ruby" else "functions has live ruby")
+{ lib, gemConfig, ... }:
 rec {
-  filterGemset = gemset: lib.filterAttrs (name: attrs: platformMatches attrs && groupMatches attrs) gemset;
+  filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
 
-  platformMatches = attrs: (
+  platformMatches = {rubyEngine, version, ...}@ruby: attrs: (
   !(attrs ? "platforms") ||
+  builtins.trace "ruby engine: ${rubyEngine}"
+  builtins.trace "ruby version ${version.majMin}"
     builtins.any (platform:
-      platform.engine == ruby.rubyEngine &&
-        (!(platform ? "version") || platform.version == ruby.version.majMin)
+    builtins.trace "checking: ${platform.engine}/${platform.version}"
+      platform.engine == rubyEngine &&
+        (!(platform ? "version") || platform.version == version.majMin)
     ) attrs.platforms
   );
 
-  groupMatches = attrs: (
+  groupMatches = groups: attrs: (
   !(attrs ? "groups") ||
     builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups
   );
@@ -45,7 +47,7 @@ rec {
         };
     in res;
 
-  composeGemAttrs = gems: name: attrs: ((removeAttrs attrs ["source" "platforms"]) // attrs.source // {
+  composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["source" "platforms"]) // attrs.source // {
     inherit ruby;
     gemName = name;
     gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
diff --git a/pkgs/development/ruby-modules/bundler-env/runtests.sh b/pkgs/development/ruby-modules/bundler-env/runtests.sh
new file mode 100755
index 00000000000..c3db8ed34af
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/runtests.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace && cat result
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index 28e5dbe318a..af3d81d483d 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -18,11 +18,10 @@ let
   };
 
   testConfigs = {
-    groups = ["default"];
+    inherit lib;
     gemConfig =  defaultGemConfig;
-    confFiles = "./testConfs";
   };
-  functions = (import ./functions.nix ({ inherit lib; ruby = stubs.ruby; } // testConfigs));
+  functions = (import ./functions.nix testConfigs);
 
   justName = bundlerEnv {
     name = "test";
@@ -38,7 +37,16 @@ let
   };
 
   results = builtins.concatLists [
-    (test.run "Filter empty gemset" {} (set: functions.filterGemset set == {}))
+    (test.run "Filter empty gemset" {} (set: functions.filterGemset {inherit ruby; groups = ["default"]; } set == {}))
+    ( let gemSet = { test = { groups = ["x" "y"]; }; };
+      in
+      test.run "Filter matches a group" gemSet (set: functions.filterGemset {inherit ruby; groups = ["y" "z"];} set == gemSet))
+    ( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version;}]; }; };
+      in
+      test.run "Filter matches on platform" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
+    ( let gemSet = { test = { groups = ["x" "y"]; }; };
+      in
+      test.run "Filter excludes based on groups" gemSet (set: functions.filterGemset {inherit ruby; groups = ["a" "b"];} set == {}))
     (test.run "bundlerEnv { name }" justName {
       name = should.equal "test";
     })
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index 09dbc258876..62a9d60686f 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -74,8 +74,6 @@ let
 
 in
 
-builtins.trace (gemName)
-builtins.trace (stdenv.stubbed or false)
 stdenv.mkDerivation (attrs // {
   inherit ruby;
   inherit doCheck;

From 731917a800aaf7acbd8d20a0c45ac30d35204f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 10 May 2017 09:52:11 +0100
Subject: [PATCH 0054/3246] cups: mount private /tmp

printer driver and wrapper are often not written with security in mind.

While reviewing https://github.com/NixOS/nixpkgs/pull/25654 I found
a symlink-race vulnerability within the wrapper code, when writing
unique files in /tmp.
I expect this script to be reused in other models as well
as similar vulnerabilities in the code of other vendors. Therefore
I propose to make /tmp of cups.service private so that only processes
with the same privileges are able to access these files.
---
 nixos/modules/services/printing/cupsd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 7ce2ae38fb3..ba9f99e6a8f 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -324,6 +324,8 @@ in
               fi
             ''}
           '';
+
+          serviceConfig.PrivateTmp = true;
       };
 
     systemd.services.cups-browsed = mkIf avahiEnabled

From 14f4b21fe526fe0c3069a48b6c2350da79d5c027 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Wed, 10 May 2017 17:17:33 -0700
Subject: [PATCH 0055/3246] Added self as maintainer.

---
 lib/maintainers.nix                                             | 1 +
 pkgs/applications/networking/mailreaders/nylas-mail/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a9d44984e5d..611d5c38ddb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -249,6 +249,7 @@
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
   johbo = "Johannes Bornhold <johannes@bornhold.name>";
+  johnramsden = "John Ramsden <johnramsden@riseup.net>"
   joko = "Ioannis Koutras <ioannis.koutras@gmail.com>";
   jonafato = "Jon Banafato <jon@jonafato.com>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
index 6914dbdb7bf..6e3c1accbaf 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
@@ -129,6 +129,7 @@ stdenv.mkDerivation rec {
    meta = {
      description = "Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email.";
      license = stdenv.lib.licenses.gpl3;
+     maintainers = with maintainers; [ johnramsden ];
      homepage = https://nylas.com;
    };
 }

From ca95b4fdbd1435e42bc6e72d52dc3ea4b98dc533 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Wed, 10 May 2017 19:21:00 -0700
Subject: [PATCH 0056/3246] Missing semicolon.

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 611d5c38ddb..69c5e4452e5 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -249,7 +249,7 @@
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
   johbo = "Johannes Bornhold <johannes@bornhold.name>";
-  johnramsden = "John Ramsden <johnramsden@riseup.net>"
+  johnramsden = "John Ramsden <johnramsden@riseup.net>";
   joko = "Ioannis Koutras <ioannis.koutras@gmail.com>";
   jonafato = "Jon Banafato <jon@jonafato.com>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";

From 1be1ba542154722e9cd9da4186dc631a8c06f36e Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Wed, 10 May 2017 19:47:40 -0700
Subject: [PATCH 0057/3246] Add longDescription with note about keyring.

---
 .../networking/mailreaders/nylas-mail/default.nix        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
index 6e3c1accbaf..a0083bd01a8 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
@@ -126,9 +126,12 @@ stdenv.mkDerivation rec {
         $out/share/nylas-mail/resources/apm/bin/node
    '';
 
-   meta = {
-     description = "Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email.";
-     license = stdenv.lib.licenses.gpl3;
+   meta = with stdenv.lib; {
+     description = "pen-source mail client built on the modern web with Electron, React, and Flux";
+     longDescription = ''
+        Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. Nylas-Mail requires gnome3 keyring. It can be enabled with "services.gnome3.gnome-keyring.enable = true;".
+     '';
+     license = licenses.gpl3;
      maintainers = with maintainers; [ johnramsden ];
      homepage = https://nylas.com;
    };

From 1f10c1112a6bfc4219e4a388be385be514ab1e70 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Wed, 10 May 2017 20:13:50 -0700
Subject: [PATCH 0058/3246] Fixed spelling in description and added info on
 keyring.

---
 .../networking/mailreaders/nylas-mail/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
index a0083bd01a8..7c3ee456f25 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
@@ -127,9 +127,9 @@ stdenv.mkDerivation rec {
    '';
 
    meta = with stdenv.lib; {
-     description = "pen-source mail client built on the modern web with Electron, React, and Flux";
+     description = "Open-source mail client built on the modern web with Electron, React, and Flux";
      longDescription = ''
-        Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. Nylas-Mail requires gnome3 keyring. It can be enabled with "services.gnome3.gnome-keyring.enable = true;".
+        Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. To run nylas-mail, an additional manual step is required. Make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup".
      '';
      license = licenses.gpl3;
      maintainers = with maintainers; [ johnramsden ];

From 56d214b0eaed1d9fe2b6e76d30dbb2cd279e3a5c Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Fri, 12 May 2017 09:44:39 -0700
Subject: [PATCH 0059/3246] Fixed platform filtering.

---
 pkgs/development/ruby-modules/bundler-env/functions.nix | 6 ++----
 pkgs/development/ruby-modules/bundler-env/test.nix      | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler-env/functions.nix b/pkgs/development/ruby-modules/bundler-env/functions.nix
index 5a51f4d8208..d9f02324cc2 100644
--- a/pkgs/development/ruby-modules/bundler-env/functions.nix
+++ b/pkgs/development/ruby-modules/bundler-env/functions.nix
@@ -4,12 +4,10 @@ rec {
 
   platformMatches = {rubyEngine, version, ...}@ruby: attrs: (
   !(attrs ? "platforms") ||
-  builtins.trace "ruby engine: ${rubyEngine}"
-  builtins.trace "ruby version ${version.majMin}"
+  builtins.length attrs.platforms == 0 ||
     builtins.any (platform:
-    builtins.trace "checking: ${platform.engine}/${platform.version}"
       platform.engine == rubyEngine &&
-        (!(platform ? "version") || platform.version == version.majMin)
+        (!(platform ? "version") || platform.version.majMin == version.majMin)
     ) attrs.platforms
   );
 
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index af3d81d483d..c3de862f153 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -41,6 +41,9 @@ let
     ( let gemSet = { test = { groups = ["x" "y"]; }; };
       in
       test.run "Filter matches a group" gemSet (set: functions.filterGemset {inherit ruby; groups = ["y" "z"];} set == gemSet))
+    ( let gemSet = { test = { platforms = []; }; };
+      in
+      test.run "Filter matches empty platforms list" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
     ( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version;}]; }; };
       in
       test.run "Filter matches on platform" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))

From c39508b2549ff1a2b27279b4fe1c003454c78fb8 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Fri, 12 May 2017 09:47:00 -0700
Subject: [PATCH 0060/3246] Fixed platform test.

---
 pkgs/development/ruby-modules/bundler-env/functions.nix | 2 +-
 pkgs/development/ruby-modules/bundler-env/test.nix      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler-env/functions.nix b/pkgs/development/ruby-modules/bundler-env/functions.nix
index d9f02324cc2..ce8a1b69c74 100644
--- a/pkgs/development/ruby-modules/bundler-env/functions.nix
+++ b/pkgs/development/ruby-modules/bundler-env/functions.nix
@@ -7,7 +7,7 @@ rec {
   builtins.length attrs.platforms == 0 ||
     builtins.any (platform:
       platform.engine == rubyEngine &&
-        (!(platform ? "version") || platform.version.majMin == version.majMin)
+        (!(platform ? "version") || platform.version == version.majMin)
     ) attrs.platforms
   );
 
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index c3de862f153..164098e3f87 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -44,7 +44,7 @@ let
     ( let gemSet = { test = { platforms = []; }; };
       in
       test.run "Filter matches empty platforms list" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
-    ( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version;}]; }; };
+    ( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version.majMin;}]; }; };
       in
       test.run "Filter matches on platform" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
     ( let gemSet = { test = { groups = ["x" "y"]; }; };

From 171e3f85cea2bb5568be793a57b71426b8f35ce6 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Sun, 14 May 2017 00:41:54 -0400
Subject: [PATCH 0061/3246] neovim: neovim-ruby 0.3.1 -> 0.4.0

---
 pkgs/applications/editors/neovim/ruby_provider/gemset.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
index c3ed45a7848..6eac5714857 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
+++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
@@ -11,9 +11,9 @@
     dependencies = ["msgpack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "018mk4vqaxzbk4anq558h2rgj8prbn2rmi777iwrg3n0v8k5nxqw";
+      sha256 = "1gvwa1zkirai7605x4hn2lynbw1caviga272iyy472jv7hs2zn92";
       type = "gem";
     };
-    version = "0.3.1";
+    version = "0.4.0";
   };
-}
\ No newline at end of file
+}

From ae84d19e651ddb09d22b31aae181fa6a500fdb65 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Mon, 15 May 2017 09:36:30 -0700
Subject: [PATCH 0062/3246] Final testing

---
 pkgs/development/ruby-modules/bundler-env/basic.nix    | 10 +++++++---
 pkgs/development/ruby-modules/bundler-env/default.nix  |  6 +++---
 pkgs/development/ruby-modules/bundler-env/test.nix     |  8 ++++----
 .../ruby-modules/bundler-env/test/gemset.nix           | 10 ++++++++++
 4 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/ruby-modules/bundler-env/test/gemset.nix

diff --git a/pkgs/development/ruby-modules/bundler-env/basic.nix b/pkgs/development/ruby-modules/bundler-env/basic.nix
index 80f12c14bfe..33a379c0275 100644
--- a/pkgs/development/ruby-modules/bundler-env/basic.nix
+++ b/pkgs/development/ruby-modules/bundler-env/basic.nix
@@ -5,7 +5,8 @@
 }@defs:
 
 {
-  pname
+  name
+, pname ? name
 , gemfile
 , lockfile
 , gemset
@@ -77,7 +78,9 @@ let
   basicEnv = buildEnv {
     inherit ignoreCollisions;
 
-    name = pname;
+    name = if name == null then pname else name;
+
+    #name = pname;
 
     paths = envPaths;
     pathsToLink = [ "/lib" ];
@@ -92,7 +95,8 @@ let
     passthru = rec {
       inherit ruby bundler gems mainGem confFiles; # drvName;
 
-      wrappedRuby = stdenv.mkDerivation {
+      wrappedRuby =
+      stdenv.mkDerivation {
         name = "wrapped-ruby-${pname}";
         nativeBuildInputs = [ makeWrapper ];
         buildCommand = ''
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 30896a598e4..68267a4aead 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -27,7 +27,7 @@ let
   inherit (import ./functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
 
   drvName =
-    if name != null then name
+    if name != null then lib.traceVal name
     else if pname != null then "${toString pname}-${basicEnv.gems."${pname}".version}"
     else throw "bundlerEnv: either pname or name must be set";
 
@@ -43,7 +43,7 @@ let
     if gemset == null then gemdir + "/gemset.nix"
     else gemset;
 
-  basicEnv = (callPackage ./basic.nix {}) (args // { inherit pname gemdir;
+  basicEnv = (callPackage ./basic.nix {}) (args // { inherit pname name gemdir;
     gemfile = gemfile';
     lockfile  = lockfile';
     gemset = gemset';
@@ -63,7 +63,7 @@ let
   # The basicEnv should be put into passthru so that e.g. nix-shell can use it.
 in
   if pname == null then
-    basicEnv // { inherit name; }
+    basicEnv // { inherit name basicEnv; }
   else
     (buildEnv {
       inherit ignoreCollisions;
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index 164098e3f87..e49c4fd93f2 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -24,11 +24,11 @@ let
   functions = (import ./functions.nix testConfigs);
 
   justName = bundlerEnv {
-    name = "test";
+    name = "test-0.1.2";
     gemset = ./test/gemset.nix;
   };
 
-  pnamed = basicEnv {
+  pnamed = bundlerEnv {
     pname = "test";
     gemdir = ./test;
     gemset = ./test/gemset.nix;
@@ -51,13 +51,13 @@ let
       in
       test.run "Filter excludes based on groups" gemSet (set: functions.filterGemset {inherit ruby; groups = ["a" "b"];} set == {}))
     (test.run "bundlerEnv { name }" justName {
-      name = should.equal "test";
+      name = should.equal "test-0.1.2";
     })
     (test.run "bundlerEnv { pname }" pnamed
     [
       (should.haveKeys [ "name" "env" "postBuild" ])
       {
-        name = should.equal "test";
+        name = should.equal "test-0.1.2";
         env = should.beASet;
         postBuild = should.havePrefix "/nix/store";
       }
diff --git a/pkgs/development/ruby-modules/bundler-env/test/gemset.nix b/pkgs/development/ruby-modules/bundler-env/test/gemset.nix
new file mode 100644
index 00000000000..53f15f96bc6
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundler-env/test/gemset.nix
@@ -0,0 +1,10 @@
+{
+  test = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+}

From 0bbbdfbc528e5b0f6fe0870304314a393923e02d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 20 May 2017 22:25:05 -0500
Subject: [PATCH 0063/3246] manual: add "declarative package management"
 section
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This section gives some details on how to setup an "environment"
without having to go through NixOS (although it could be used there
too). I’ve tried to make it straightforward and have a kind of
"tutorial" feel. Not sure if that’s appropriate for the manual, so any
recommended changes would be helpful.
---
 doc/configuration.xml | 213 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 213 insertions(+)

diff --git a/doc/configuration.xml b/doc/configuration.xml
index 56950e07ab5..361d23f7c65 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -243,5 +243,218 @@ set of packages.
 
 </section>
 
+<section xml:id="sec-declarative-package-management">
+  <title>Declarative Package Management</title>
+
+  <section xml:id="sec-building-environment">
+    <title>Build an environment</title>
+
+    <para>
+      Using <literal>packageOverrides</literal>, it is possible to manage
+      packages declaratively. This means that we can list all of our desired
+      packages within a declarative Nix expression. For example, to have
+      <literal>aspell</literal>, <literal>bc</literal>,
+      <literal>ffmpeg</literal>, <literal>coreutils</literal>,
+      <literal>gdb</literal>, <literal>nixUnstable</literal>,
+      <literal>emscripten</literal>, <literal>jq</literal>,
+      <literal>nox</literal>, and <literal>silver-searcher</literal>, we could
+      use the following in <filename>~/.config/nixpkgs/config.nix</filename>:
+    </para>
+
+    <screen>
+{
+  packageOverrides = pkgs: with pkgs; {
+    myPackages = pkgs.buildEnv {
+      name = "my-packages";
+      paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ];
+    };
+  };
+}
+    </screen>
+
+    <para>
+      To install it into our environment, you can just run <literal>nix-env -iA
+      nixpkgs.myPackages</literal>. If you want to load the packages to be built
+      from a working copy of <literal>nixpkgs</literal> you just run
+      <literal>nix-env -f. -iA myPackages</literal>. To explore what's been
+      installed, just look through <filename>~/.nix-profile/</filename>. You can
+      see that a lot of stuff has been installed. Some of this stuff is useful
+      some of it isn't. Let's tell Nixpkgs to only link the stuff that we want:
+    </para>
+
+    <screen>
+{
+  packageOverrides = pkgs: with pkgs; {
+    myPackages = pkgs.buildEnv {
+      name = "my-packages";
+      paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ];
+      pathsToLink = [ "/share" "/bin" ];
+    };
+  };
+}
+    </screen>
+
+    <para>
+      <literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed
+      which gets rid of the extra stuff in the profile.
+      <filename>/bin</filename> and <filename>/share</filename> are good
+      defaults for a user environment, getting rid of the clutter. If you are
+      running on Nix on MacOS, you may want to add another path as well,
+      <filename>/Applications</filename>, that makes GUI apps available.
+    </para>
+
+  </section>
+
+  <section xml:id="sec-getting-documentation">
+    <title>Getting documentation</title>
+
+    <para>
+      After building that new environment, look through
+      <filename>~/.nix-profile</filename> to make sure everything is there that
+      we wanted. Discerning readers will note that some files are missing. Look
+      inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this.
+      There are no man pages for any of the Nix tools! This is because some
+      packages like Nix have multiple outputs for things like documentation (see
+      section 4). Let's make Nix install those as well.
+    </para>
+
+    <screen>
+{
+  packageOverrides = pkgs: with pkgs; {
+    myPackages = pkgs.buildEnv {
+      name = "my-packages";
+      paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ];
+      pathsToLink = [ "/share/man" "/share/doc" /bin" ];
+      extraOutputsToInstall = [ "man" "doc" ];
+    };
+  };
+}
+    </screen>
+
+    <para>
+      This provides us with some useful documentation for using our packages.
+      However, if we actually want those manpages to be detected by man, we need
+      to set up our environment. This can also be managed within Nix
+      expressions.
+    </para>
+
+    <screen>
+{
+  packageOverrides = pkgs: with pkgs; rec {
+    myProfile = writeText "my-profile" ''
+export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
+export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
+    '';
+    myPackages = pkgs.buildEnv {
+      name = "my-packages";
+      paths = [
+        (runCommand "profile" {} ''
+mkdir -p $out/etc/profile.d
+cp ${myProfile} $out/etc/profile.d/my-profile.sh
+        '')
+        aspell
+        bc
+        coreutils
+        ffmpeg
+        man
+        nixUnstable
+        emscripten
+        jq
+        nox
+        silver-searcher
+      ];
+      pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ];
+      extraOutputsToInstall = [ "man" "doc" ];
+    };
+  };
+}
+    </screen>
+
+    <para>
+      For this to work fully, you must also have this script sourced when you
+      are logged in. Try adding something like this to your
+      <filename>~/.profile</filename> file:
+    </para>
+
+    <screen>
+#!/bin/sh
+if [ -d $HOME/.nix-profile/etc/profile.d ]; then
+  for i in $HOME/.nix-profile/etc/profile.d/*.sh; do
+    if [ -r $i ]; then
+      . $i
+    fi
+  done
+fi
+    </screen>
+
+    <para>
+      Now just run <literal>source $HOME/.profile</literal> and you can starting
+      loading man pages from your environent.
+    </para>
+
+  </section>
+    
+  <section xml:id="sec-gnu-info-setup">
+    <title>GNU info setup</title>
+
+    <para>
+      Configuring GNU info is a little bit trickier than man pages. To work
+      correctly, info needs a database to be generated. This can be done with
+      some small modifications to our environment scripts.
+    </para>
+
+    <screen>
+{
+  packageOverrides = pkgs: with pkgs; rec {
+    myProfile = writeText "my-profile" ''
+export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
+export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
+export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info
+    '';
+    myPackages = pkgs.buildEnv {
+      name = "my-packages";
+      paths = [
+        (runCommand "profile" {} ''
+mkdir -p $out/etc/profile.d
+cp ${myProfile} $out/etc/profile.d/my-profile.sh
+        '')
+        aspell
+        bc
+        coreutils
+        ffmpeg
+        man
+        nixUnstable
+        emscripten
+        jq
+        nox
+        silver-searcher
+        texinfoInteractive
+      ];
+      pathsToLink = [ "/share/man" "/share/doc" "/share/info" "/bin" "/etc" ];
+      extraOutputsToInstall = [ "man" "doc" "info" ];
+      postBuild = ''
+          if [ -x $out/bin/install-info -a -w $out/share/info ]; then
+            shopt -s nullglob
+            for i in $out/share/info/*.info $out/share/info/*.info.gz; do
+                $out/bin/install-info $i $out/share/info/dir
+            done
+          fi
+      '';
+    };
+  };
+}
+    </screen>
+
+    <para>
+      <literal>postBuild</literal> tells Nixpkgs to run a command after building
+      the environment. In this case, <literal>install-info</literal> adds the
+      installed info pages to <literal>dir</literal> which is GNU info's default
+      root node. Note that <literal>texinfoInteractive</literal> is added to the
+      environment to give the <literal>install-info</literal> command.
+    </para>
+
+  </section>
+
+</section>
 
 </chapter>

From 29e04dfdaa85b8dcc4b3d5def175b33c210bb31f Mon Sep 17 00:00:00 2001
From: Renzo Carbonara <gnuk0001@gmail.com>
Date: Fri, 7 Apr 2017 19:02:33 +0200
Subject: [PATCH 0064/3246] hunspellDicts: add spanish dictionaries.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cf4f91f1a238da953edd1d6b83d225cefe7d5b52, which
removed all of the spanish dictionaries. These dictionaries were
previously part of the “Red IRIS” project, but they are now part of the
“Recursos Linguísticos Abiertos del Español” project.

Additionally, this cleans up the implementation of all the Hunspell
dictionaries, since the supposedly internal `mkDict` function was either
overspecialized or overgeneralized. Now we don't try to abstract beyond
what makes sense to be abstracted.
---
 .../libraries/hunspell/dictionaries.nix       | 219 ++++++++++++++++--
 1 file changed, 195 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 0d21649a9b1..120b4176c19 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -1,30 +1,13 @@
 /* hunspell dictionaries */
 
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip }:
 
-with stdenv.lib;
 
 let
-
   mkDict =
-  { name, src, meta, readmeFile, dictFileName, ... }:
-  let
-    isFrench = hasSuffix "fr_" dictFileName;
-    isItaly = hasSuffix "it_" dictFileName;
-    isSpanish = hasSuffix "es_" dictFileName;
-    isEnglish = hasSuffix "en_" dictFileName;
-  in
-  stdenv.mkDerivation rec {
-    inherit name src meta;
-    buildInputs = [ unzip ];
-    sourceRoot = ".";
-    phases = "unpackPhase installPhase" + (if isItaly then "patchPhase" else "");
-    unpackCmd = "unzip $src ${readmeFile} ${dictFileName}.dic ${dictFileName}.aff";
-    prePatch = if isItaly then ''
-    # Fix dic file empty lines (FS#22275)
-    sed '/^\/$/d' -i it_IT.dic
-    '' else "";
-
+  { name, readmeFile, dictFileName, ... }@args:
+  stdenv.mkDerivation (rec {
+    inherit name;
     installPhase = ''
       # hunspell dicts
       install -dm755 "$out/share/hunspell"
@@ -38,7 +21,45 @@ let
       install -dm755 "$out/share/doc"
       install -m644 ${readmeFile} $out/share/doc/${name}.txt
     '';
-  };
+  } // args);
+
+  mkDictFromRla =
+    { shortName, shortDescription, dictFileName }:
+    mkDict rec {
+      inherit dictFileName;
+      version = "2.2";
+      name = "hunspell-dict-${shortName}-rla-${version}";
+      readmeFile = "README.txt";
+      src = fetchFromGitHub {
+        owner = "sbosio";
+        repo = "rla-es";
+        rev = "v${version}";
+        sha256 = "0n9ms092k7vg7xpd3ksadxydbrizkb7js7dfxr08nbnnb9fgy0i8";
+      };
+      meta = with stdenv.lib; {
+        description = "Hunspell dictionary for ${shortDescription} from rla";
+        homepage = https://github.com/sbosio/rla-es;
+        license = with licenses; [ gpl3 lgpl3 mpl11 ];
+        maintainers = with maintainers; [ renzo ];
+        platforms = platforms.all;
+      };
+      phases = "unpackPhase patchPhase buildPhase installPhase";
+      buildInputs = [ bash coreutils unzip which zip ];
+      patchPhase = ''
+        substituteInPlace ortograf/herramientas/make_dict.sh \
+           --replace /bin/bash bash \
+           --replace /dev/stderr stderr.log
+
+        substituteInPlace ortograf/herramientas/remover_comentarios.sh \
+           --replace /bin/bash bash \
+      '';
+      buildPhase = ''
+        cd ortograf/herramientas
+        bash -x ./make_dict.sh -l ${dictFileName} -2
+        unzip ${dictFileName}.zip \
+          ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
+      '';
+    };
 
   mkDictFromDicollecte =
     { shortName, shortDescription, longDescription, dictFileName }:
@@ -59,6 +80,12 @@ let
         maintainers = with maintainers; [ renzo ];
         platforms = platforms.all;
       };
+      buildInputs = [ unzip ];
+      phases = "unpackPhase installPhase";
+      sourceRoot = ".";
+      unpackCmd = ''
+        unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
+      '';
     };
 
   mkDictFromWordlist =
@@ -75,9 +102,15 @@ let
         maintainers = with maintainers; [ renzo ];
         platforms = platforms.all;
       };
+      buildInputs = [ unzip ];
+      phases = "unpackPhase installPhase";
+      sourceRoot = ".";
+      unpackCmd = ''
+        unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
+      '';
     };
 
-  mkLinguistico =
+  mkDictFromLinguistico =
     { shortName, shortDescription, dictFileName, src }:
     mkDict rec {
       inherit src dictFileName;
@@ -90,6 +123,16 @@ let
         maintainers = with maintainers; [ renzo ];
         platforms = platforms.all;
       };
+      buildInputs = [ unzip ];
+      phases = "unpackPhase patchPhase installPhase";
+      sourceRoot = ".";
+      prePatch = ''
+        # Fix dic file empty lines (FS#22275)
+        sed '/^\/$/d' -i ${dictFileName}.dic
+      '';
+      unpackCmd = ''
+        unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
+      '';
     };
 
   mkDictFromXuxen =
@@ -169,6 +212,134 @@ in {
     };
   };
 
+  /* SPANISH */
+
+  es-any = mkDictFromRla {
+    shortName = "es-any";
+    shortDescription = "Spanish (any variant)";
+    dictFileName = "es_ANY";
+  };
+
+  es-ar = mkDictFromRla {
+    shortName = "es-ar";
+    shortDescription = "Spanish (Argentina)";
+    dictFileName = "es_AR";
+  };
+
+  es-bo = mkDictFromRla {
+    shortName = "es-bo";
+    shortDescription = "Spanish (Bolivia)";
+    dictFileName = "es_BO";
+  };
+
+  es-cl = mkDictFromRla {
+    shortName = "es-cl";
+    shortDescription = "Spanish (Chile)";
+    dictFileName = "es_CL";
+  };
+
+  es-co = mkDictFromRla {
+    shortName = "es-co";
+    shortDescription = "Spanish (Colombia)";
+    dictFileName = "es_CO";
+  };
+
+  es-cr = mkDictFromRla {
+    shortName = "es-cr";
+    shortDescription = "Spanish (Costra Rica)";
+    dictFileName = "es_CR";
+  };
+
+  es-cu = mkDictFromRla {
+    shortName = "es-cu";
+    shortDescription = "Spanish (Cuba)";
+    dictFileName = "es_CU";
+  };
+
+  es-do = mkDictFromRla {
+    shortName = "es-do";
+    shortDescription = "Spanish (Dominican Republic)";
+    dictFileName = "es_DO";
+  };
+
+  es-ec = mkDictFromRla {
+    shortName = "es-ec";
+    shortDescription = "Spanish (Ecuador)";
+    dictFileName = "es_EC";
+  };
+
+  es-es = mkDictFromRla {
+    shortName = "es-es";
+    shortDescription = "Spanish (Spain)";
+    dictFileName = "es_ES";
+  };
+
+  es-gt = mkDictFromRla {
+    shortName = "es-gt";
+    shortDescription = "Spanish (Guatemala)";
+    dictFileName = "es_GT";
+  };
+
+  es-hn = mkDictFromRla {
+    shortName = "es-hn";
+    shortDescription = "Spanish (Honduras)";
+    dictFileName = "es_HN";
+  };
+
+  es-mx = mkDictFromRla {
+    shortName = "es-mx";
+    shortDescription = "Spanish (Mexico)";
+    dictFileName = "es_MX";
+  };
+
+  es-ni = mkDictFromRla {
+    shortName = "es-ni";
+    shortDescription = "Spanish (Nicaragua)";
+    dictFileName = "es_NI";
+  };
+
+  es-pa = mkDictFromRla {
+    shortName = "es-pa";
+    shortDescription = "Spanish (Panama)";
+    dictFileName = "es_PA";
+  };
+
+  es-pe = mkDictFromRla {
+    shortName = "es-pe";
+    shortDescription = "Spanish (Peru)";
+    dictFileName = "es_PE";
+  };
+
+  es-pr = mkDictFromRla {
+    shortName = "es-pr";
+    shortDescription = "Spanish (Puerto Rico)";
+    dictFileName = "es_PR";
+  };
+
+  es-py = mkDictFromRla {
+    shortName = "es-py";
+    shortDescription = "Spanish (Paraguay)";
+    dictFileName = "es_PY";
+  };
+
+  es-sv = mkDictFromRla {
+    shortName = "es-sv";
+    shortDescription = "Spanish (El Salvador)";
+    dictFileName = "es_SV";
+  };
+
+  es-uy = mkDictFromRla {
+    shortName = "es-uy";
+    shortDescription = "Spanish (Uruguay)";
+    dictFileName = "es_UY";
+  };
+
+  es-ve = mkDictFromRla {
+    shortName = "es-ve";
+    shortDescription = "Spanish (Venezuela)";
+    dictFileName = "es_VE";
+  };
+
   /* FRENCH */
 
   fr-any = mkDictFromDicollecte {
@@ -215,7 +386,7 @@ in {
 
   /* ITALIAN */
 
-  it-it =  mkLinguistico rec {
+  it-it =  mkDictFromLinguistico rec {
     shortName = "it-it";
     dictFileName = "it_IT";
     shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico";

From 235d5c5c4755058e37cdbcc2ce450cb15fd37296 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 23 May 2017 11:24:33 +0200
Subject: [PATCH 0065/3246] openjdk8: 8u131-b11 -> 8u152-b04

---
 pkgs/development/compilers/openjdk/8.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 7ddf2c7ef5d..e157249fb2f 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -21,42 +21,42 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "131";
-  build = "11";
+  update = "152";
+  build = "04";
   baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "1k401wsickbdy50yxjd26v8qm9519kxayaj3b103cr6ygp2rd9s6";
+             sha256 = "1hnpbx0v89jmbg58ym4zm255da11zf5jq8y5s58zj4x2z6b1fpxi";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "1qj75bb17a9czvxz7rm246w97cavglrssx0l1mkbickx0i0wamm8";
+             sha256 = "060q01msfyspn14c9mkf9x0l8sprki9n8zb3cwlgglhnr2d4gfbr";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "0kh8rk5y3n4g3hyjzflc8nwc0kyakjivpwlpj1bncsm1sykw8lr8";
+             sha256 = "0705667y6llsmszvdcbhbxzbn1csv1f2rlyghwggx5xnaq46dhx6";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "0gqa58mwwyf6mbgp48j1akv1y8yq55zpwfziqrbdbpkcsaf603n7";
+             sha256 = "13f4h43lw9q1292fymn2d7whwvccpkcqraasdhvzf904101xcpsl";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "0ymvvi7srr9qkss20s1yg3x2mjw178bscrnxa6s8y82gsw02y820";
+             sha256 = "16wqinqv0aqyf6jg3nsn6rj5s7ggq82wvx86zm584g56011vkgf6";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "0507mxvir4s536pdz45pvmahwa6s3h2yhg6rwdzrb568ab06asmi";
+             sha256 = "0japl4nyb8y3w1mpfpkxn5vkf8fap1rg340vjnb6qm6fpqvl964f";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "0igbg8axk028kqs9q11m8hb5bg2fa0qcwffbpfbhilyw5gmf7cy8";
+             sha256 = "024zphx9r92ws9xjihvhyrbbbamfl7js0s24ff577v5z5gdb1lly";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "0l63zm5a7ql3xvfxy5kzazq2184mpx0zyqzinjmq7v0q573g8xak";
+             sha256 = "1crnbjjv1s6ndqpllcrggcpsxvqcnpr58zp51y0hjz3m3gpsxwcq";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";

From b21805d972bd86668490c88cdaa79829921a723b Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Tue, 23 May 2017 18:12:23 -0400
Subject: [PATCH 0066/3246] elastix: init at 4.8

---
 .../science/biology/elastix/default.nix       | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/science/biology/elastix/default.nix

diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix
new file mode 100644
index 00000000000..55647713e6e
--- /dev/null
+++ b/pkgs/development/libraries/science/biology/elastix/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, itk, python }:
+
+stdenv.mkDerivation rec {
+  _name    = "elastix";
+  _version = "4.8";
+  name  = "${_name}-${_version}";
+
+  src = fetchFromGitHub {
+    owner  = "SuperElastix";
+    repo   = "elastix";
+    rev    = "ef057ff89233822b26b04b31c3c043af57d5deff";
+    sha256 = "0gm3a8dgqww50h6zld9ighjk92wlpybpimjwfz4s5h82vdjsvxrm";
+  };
+
+  nativeBuildInputs = [ cmake python ];
+  buildInputs = [ itk ];
+
+  cmakeFlags = [ "-DUSE_KNNGraphAlphaMutualInformationMetric=OFF" ];
+
+  checkPhase = "ctest";
+
+  meta = with stdenv.lib; {
+    homepage = http://elastix.isi.uu.nl/;
+    description = "Image registration toolkit based on ITK";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16b52fa6f67..5792b91465c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7520,6 +7520,8 @@ with pkgs;
 
   vmmlib = callPackage ../development/libraries/vmmlib {};
 
+  elastix = callPackage ../development/libraries/science/biology/elastix { };
+
   enchant = callPackage ../development/libraries/enchant { };
 
   enet = callPackage ../development/libraries/enet { };

From 8d5ff00dad82b53ca76dd51d4588ba7539879565 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Thu, 25 May 2017 21:52:41 +0200
Subject: [PATCH 0067/3246] teensy-loader-cli: Update to latest git.

This fixes uploading programs greater than 128k to Teensy 3.1/3.2.
---
 pkgs/development/tools/misc/teensy-loader-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index db86f1a56d6..7b360655c4f 100644
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
   name = "teensy-loader-cli-${version}";
   src = fetchgit {
     url = "git://github.com/PaulStoffregen/teensy_loader_cli.git";
-    rev = "001da416bc362ff24485ff97e3a729bd921afe98";
-    sha256 = "36aed0a725055e36d71183ff57a023993099fdc380072177cffc7676da3c3966";
+    rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2";
+    sha256 = "1a663bv3lvm7bsf2wcaj2c0vpmniak7w5hwix5qgz608bvm2v781";
   };
 
   buildInputs = [ unzip libusb ];

From 998d011e426c2f8c51946ebbc4931a464f531db9 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sat, 27 May 2017 15:19:34 -0700
Subject: [PATCH 0068/3246] Restructuring files

---
 .../basic.nix => bundled-common/default.nix}  |  0
 .../functions.nix                             |  0
 .../gen-bin-stubs.rb                          |  0
 .../ruby-modules/bundled-common/test.nix      | 23 ++++++++++
 .../ruby-modules/bundler-env/default.nix      |  4 +-
 .../ruby-modules/bundler-env/test.nix         | 44 +++----------------
 pkgs/development/ruby-modules/runtests.sh     |  6 +++
 .../{bundler-env => testing}/assertions.nix   |  0
 .../ruby-modules/testing/driver.nix           | 20 +++++++++
 .../{bundler-env => testing}/runtests.sh      |  0
 .../{bundler-env => testing}/stubs.nix        |  0
 .../{bundler-env => testing}/tap-support.nix  |  0
 .../{bundler-env => testing}/testing.nix      |  0
 13 files changed, 56 insertions(+), 41 deletions(-)
 rename pkgs/development/ruby-modules/{bundler-env/basic.nix => bundled-common/default.nix} (100%)
 rename pkgs/development/ruby-modules/{bundler-env => bundled-common}/functions.nix (100%)
 rename pkgs/development/ruby-modules/{bundler-env => bundled-common}/gen-bin-stubs.rb (100%)
 create mode 100644 pkgs/development/ruby-modules/bundled-common/test.nix
 create mode 100755 pkgs/development/ruby-modules/runtests.sh
 rename pkgs/development/ruby-modules/{bundler-env => testing}/assertions.nix (100%)
 create mode 100644 pkgs/development/ruby-modules/testing/driver.nix
 rename pkgs/development/ruby-modules/{bundler-env => testing}/runtests.sh (100%)
 rename pkgs/development/ruby-modules/{bundler-env => testing}/stubs.nix (100%)
 rename pkgs/development/ruby-modules/{bundler-env => testing}/tap-support.nix (100%)
 rename pkgs/development/ruby-modules/{bundler-env => testing}/testing.nix (100%)

diff --git a/pkgs/development/ruby-modules/bundler-env/basic.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
similarity index 100%
rename from pkgs/development/ruby-modules/bundler-env/basic.nix
rename to pkgs/development/ruby-modules/bundled-common/default.nix
diff --git a/pkgs/development/ruby-modules/bundler-env/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
similarity index 100%
rename from pkgs/development/ruby-modules/bundler-env/functions.nix
rename to pkgs/development/ruby-modules/bundled-common/functions.nix
diff --git a/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
similarity index 100%
rename from pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb
rename to pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/pkgs/development/ruby-modules/bundled-common/test.nix
new file mode 100644
index 00000000000..b24a620ed50
--- /dev/null
+++ b/pkgs/development/ruby-modules/bundled-common/test.nix
@@ -0,0 +1,23 @@
+{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }@defs:
+let
+  testConfigs = {
+    inherit lib;
+    gemConfig =  defaultGemConfig;
+  };
+  functions = (import ./functions.nix testConfigs);
+in
+  builtins.concatLists [
+    (test.run "Filter empty gemset" {} (set: functions.filterGemset {inherit ruby; groups = ["default"]; } set == {}))
+    ( let gemSet = { test = { groups = ["x" "y"]; }; };
+      in
+      test.run "Filter matches a group" gemSet (set: functions.filterGemset {inherit ruby; groups = ["y" "z"];} set == gemSet))
+    ( let gemSet = { test = { platforms = []; }; };
+      in
+      test.run "Filter matches empty platforms list" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
+    ( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version.majMin;}]; }; };
+      in
+      test.run "Filter matches on platform" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
+    ( let gemSet = { test = { groups = ["x" "y"]; }; };
+      in
+      test.run "Filter excludes based on groups" gemSet (set: functions.filterGemset {inherit ruby; groups = ["a" "b"];} set == {}))
+  ]
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 68267a4aead..46d9e99f671 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -24,7 +24,7 @@
 }@args:
 
 let
-  inherit (import ./functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
+  inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
 
   drvName =
     if name != null then lib.traceVal name
@@ -43,7 +43,7 @@ let
     if gemset == null then gemdir + "/gemset.nix"
     else gemset;
 
-  basicEnv = (callPackage ./basic.nix {}) (args // { inherit pname name gemdir;
+  basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name gemdir;
     gemfile = gemfile';
     lockfile  = lockfile';
     gemset = gemset';
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index e49c4fd93f2..63da7044c0c 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -1,28 +1,9 @@
-/*
-Run with:
-nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace; and cat result
-
-Confusingly, the ideal result ends with something like:
-error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed
-*/
-{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage }@defs:
+{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs:
 let
-  test = import ./testing.nix;
-  tap = import ./tap-support.nix;
-  stubs = import ./stubs.nix defs;
-  should = import ./assertions.nix { inherit test lib; };
-
-  basicEnv = callPackage ./basic.nix stubs;
   bundlerEnv = callPackage ./default.nix stubs // {
-    inherit basicEnv;
+    basicEnv = callPackage ../bundled-common stubs;
   };
 
-  testConfigs = {
-    inherit lib;
-    gemConfig =  defaultGemConfig;
-  };
-  functions = (import ./functions.nix testConfigs);
-
   justName = bundlerEnv {
     name = "test-0.1.2";
     gemset = ./test/gemset.nix;
@@ -35,21 +16,8 @@ let
     gemfile = ./test/Gemfile;
     lockfile = ./test/Gemfile.lock;
   };
-
-  results = builtins.concatLists [
-    (test.run "Filter empty gemset" {} (set: functions.filterGemset {inherit ruby; groups = ["default"]; } set == {}))
-    ( let gemSet = { test = { groups = ["x" "y"]; }; };
-      in
-      test.run "Filter matches a group" gemSet (set: functions.filterGemset {inherit ruby; groups = ["y" "z"];} set == gemSet))
-    ( let gemSet = { test = { platforms = []; }; };
-      in
-      test.run "Filter matches empty platforms list" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
-    ( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version.majMin;}]; }; };
-      in
-      test.run "Filter matches on platform" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
-    ( let gemSet = { test = { groups = ["x" "y"]; }; };
-      in
-      test.run "Filter excludes based on groups" gemSet (set: functions.filterGemset {inherit ruby; groups = ["a" "b"];} set == {}))
+in
+  builtins.concatLists [
     (test.run "bundlerEnv { name }" justName {
       name = should.equal "test-0.1.2";
     })
@@ -62,6 +30,4 @@ let
         postBuild = should.havePrefix "/nix/store";
       }
     ])
-  ];
-in
-  writeText "test-results.tap" (tap.output results)
+  ]
diff --git a/pkgs/development/ruby-modules/runtests.sh b/pkgs/development/ruby-modules/runtests.sh
new file mode 100755
index 00000000000..d0faaf971db
--- /dev/null
+++ b/pkgs/development/ruby-modules/runtests.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -o xtrace
+pwd
+find . -name text.nix
+testfiles=$(find . -name test.nix)
+nix-build -E "with import <nixpkgs> {}; callPackage testing/driver.nix { testFiles = [ $testfiles ]; }" --show-trace && cat result
diff --git a/pkgs/development/ruby-modules/bundler-env/assertions.nix b/pkgs/development/ruby-modules/testing/assertions.nix
similarity index 100%
rename from pkgs/development/ruby-modules/bundler-env/assertions.nix
rename to pkgs/development/ruby-modules/testing/assertions.nix
diff --git a/pkgs/development/ruby-modules/testing/driver.nix b/pkgs/development/ruby-modules/testing/driver.nix
new file mode 100644
index 00000000000..65e7c8d4416
--- /dev/null
+++ b/pkgs/development/ruby-modules/testing/driver.nix
@@ -0,0 +1,20 @@
+/*
+Run with:
+nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace; and cat result
+
+Confusingly, the ideal result ends with something like:
+error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed
+*/
+{ writeText, lib, callPackage, testFiles, stdenv, ruby }@defs:
+let
+  testTools = rec {
+    test = import ./testing.nix;
+    stubs = import ./stubs.nix defs;
+    should = import ./assertions.nix { inherit test lib; };
+  };
+
+  tap = import ./tap-support.nix;
+
+  results = builtins.concatLists (map (file: callPackage file testTools) testFiles);
+in
+  writeText "test-results.tap" (tap.output results)
diff --git a/pkgs/development/ruby-modules/bundler-env/runtests.sh b/pkgs/development/ruby-modules/testing/runtests.sh
similarity index 100%
rename from pkgs/development/ruby-modules/bundler-env/runtests.sh
rename to pkgs/development/ruby-modules/testing/runtests.sh
diff --git a/pkgs/development/ruby-modules/bundler-env/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix
similarity index 100%
rename from pkgs/development/ruby-modules/bundler-env/stubs.nix
rename to pkgs/development/ruby-modules/testing/stubs.nix
diff --git a/pkgs/development/ruby-modules/bundler-env/tap-support.nix b/pkgs/development/ruby-modules/testing/tap-support.nix
similarity index 100%
rename from pkgs/development/ruby-modules/bundler-env/tap-support.nix
rename to pkgs/development/ruby-modules/testing/tap-support.nix
diff --git a/pkgs/development/ruby-modules/bundler-env/testing.nix b/pkgs/development/ruby-modules/testing/testing.nix
similarity index 100%
rename from pkgs/development/ruby-modules/bundler-env/testing.nix
rename to pkgs/development/ruby-modules/testing/testing.nix

From e4bb4d4788547e09c35e85d1271ffb07122d2b1b Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sat, 27 May 2017 15:22:06 -0700
Subject: [PATCH 0069/3246] Cleaning out obsolete files

---
 .../bundler-env/too-complicated.nix           | 195 ------------------
 .../ruby-modules/testing/runtests.sh          |   2 -
 2 files changed, 197 deletions(-)
 delete mode 100644 pkgs/development/ruby-modules/bundler-env/too-complicated.nix
 delete mode 100755 pkgs/development/ruby-modules/testing/runtests.sh

diff --git a/pkgs/development/ruby-modules/bundler-env/too-complicated.nix b/pkgs/development/ruby-modules/bundler-env/too-complicated.nix
deleted file mode 100644
index 7d2f0efe001..00000000000
--- a/pkgs/development/ruby-modules/bundler-env/too-complicated.nix
+++ /dev/null
@@ -1,195 +0,0 @@
-{ stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib
-, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv
-, git
-, makeWrapper
-, bundler
-, tree
-}@defs:
-
-{ name ? null
-, pname ? null
-, gemdir ? null
-, gemfile ? null
-, lockfile ? null
-, gemset ? null
-, allBins ? false
-, ruby ? defs.ruby
-, gemConfig ? defaultGemConfig
-, postBuild ? null
-, document ? []
-, meta ? {}
-, groups ? ["default"]
-, ignoreCollisions ? false
-, ...
-}@args:
-
-let
-  drvName =
-    if name != null then name
-    else if pname != null then "${toString pname}-${mainGem.version}"
-    else throw "bundlerEnv: either pname or name must be set";
-
-  mainGem =
-    if pname == null then null
-    else gems."${pname}" or (throw "bundlerEnv: gem ${pname} not found");
-
-  gemfile' =
-    if gemfile == null then gemdir + "/Gemfile"
-    else gemfile;
-
-  lockfile' =
-    if lockfile == null then gemdir + "/Gemfile.lock"
-    else lockfile;
-
-  gemset' =
-    if gemset == null then gemdir + "/gemset.nix"
-    else gemset;
-
-  importedGemset = import gemset';
-
-  platformMatches = attrs: (
-  !(attrs ? "platforms") ||
-    builtins.any (platform:
-      platform.engine == ruby.rubyEngine &&
-        (!(platform ? "version") || platform.version == ruby.version.majMin)
-    ) attrs.platforms
-  );
-
-  groupMatches = attrs: (
-  !(attrs ? "groups") ||
-    builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups
-  );
-
-  filteredGemset = lib.filterAttrs (name: attrs: platformMatches attrs && groupMatches attrs) importedGemset;
-
-  applyGemConfigs = attrs:
-    (if gemConfig ? "${attrs.gemName}"
-    then attrs // gemConfig."${attrs.gemName}" attrs
-    else attrs);
-
-  configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs:
-    applyGemConfigs (attrs // { inherit ruby; gemName = name; })
-  );
-
-  hasBundler = builtins.hasAttr "bundler" filteredGemset;
-
-  bundler =
-    if hasBundler then gems.bundler
-    else defs.bundler.override (attrs: { inherit ruby; });
-
-  pathDerivation = { gemName, version, path, ...  }:
-    let
-      res = {
-          type = "derivation";
-          bundledByPath = true;
-          name = gemName;
-          version = version;
-          outPath = path;
-          outputs = [ "out" ];
-          out = res;
-          outputName = "out";
-        };
-    in res;
-
-  buildGem = name: attrs: (
-    let
-      gemAttrs = ((removeAttrs attrs ["source"]) // attrs.source // {
-        inherit ruby;
-        gemName = name;
-        gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
-      });
-    in
-    if gemAttrs.type == "path" then pathDerivation gemAttrs
-    else buildRubyGem gemAttrs);
-
-  gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
-
-  maybeCopyAll = main: if main == null then "" else copyIfBundledByPath main;
-
-  copyIfBundledByPath = { bundledByPath ? false, ...}@main:
-  (if bundledByPath then ''
-  cp -a ${gemdir}/* $out/
-  '' else ""
-  );
-
-  # We have to normalize the Gemfile.lock, otherwise bundler tries to be
-  # helpful by doing so at run time, causing executables to immediately bail
-  # out. Yes, I'm serious.
-  confFiles = runCommand "gemfile-and-lockfile" {} ''
-    mkdir -p $out
-    ${maybeCopyAll mainGem}
-    cp ${gemfile'} $out/Gemfile || ls -l $out/Gemfile
-    cp ${lockfile'} $out/Gemfile.lock || ls -l $out/Gemfile.lock
-  '';
-
-  envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
-
-  binPaths = if !allBins && mainGem != null then [ mainGem ] else envPaths;
-
-  genStubs = binPaths: ''
-    ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
-      "${ruby}/bin/ruby" \
-      "${confFiles}/Gemfile" \
-      "$out/${ruby.gemPath}" \
-      "${bundler}/${ruby.gemPath}" \
-      ${lib.escapeShellArg binPaths} \
-      ${lib.escapeShellArg groups}
-  '';
-
-  bundlerEnv = buildEnv {
-    inherit ignoreCollisions;
-
-    name = drvName;
-
-    paths = envPaths;
-    pathsToLink = [ "/lib" ];
-
-    postBuild = (genStubs binPaths) + lib.optionalString (postBuild != null) postBuild;
-
-    meta = { platforms = ruby.meta.platforms; } // meta;
-
-    passthru = rec {
-      inherit ruby bundler gems;
-
-      wrappedRuby = stdenv.mkDerivation {
-        name = "wrapped-ruby-${drvName}";
-        nativeBuildInputs = [ makeWrapper ];
-        buildCommand = ''
-          mkdir -p $out/bin
-          for i in ${ruby}/bin/*; do
-            makeWrapper "$i" $out/bin/$(basename "$i") \
-              --set BUNDLE_GEMFILE ${confFiles}/Gemfile \
-              --set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \
-              --set BUNDLE_FROZEN 1 \
-              --set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \
-              --set GEM_PATH ${bundlerEnv}/${ruby.gemPath}
-          done
-        '';
-      };
-
-      env = let
-        irbrc = builtins.toFile "irbrc" ''
-          if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?)
-            require ENV["OLD_IRBRC"]
-          end
-          require 'rubygems'
-          require 'bundler/setup'
-        '';
-        in stdenv.mkDerivation {
-          name = "${drvName}-interactive-environment";
-          nativeBuildInputs = [ wrappedRuby bundlerEnv ];
-          shellHook = ''
-            export OLD_IRBRC="$IRBRC"
-            export IRBRC=${irbrc}
-          '';
-          buildCommand = ''
-            echo >&2 ""
-            echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
-            echo >&2 ""
-            exit 1
-          '';
-        };
-    };
-  };
-in
-  bundlerEnv
diff --git a/pkgs/development/ruby-modules/testing/runtests.sh b/pkgs/development/ruby-modules/testing/runtests.sh
deleted file mode 100755
index c3db8ed34af..00000000000
--- a/pkgs/development/ruby-modules/testing/runtests.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace && cat result

From 2b7cfdd6e9edeb5cd00730c11faae51f87e02be4 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 May 2017 13:27:41 +0100
Subject: [PATCH 0070/3246] fix missing variable in bundler-env

---
 pkgs/development/ruby-modules/bundled-common/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 33a379c0275..586e44a56c7 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -93,7 +93,7 @@ let
     meta = { platforms = ruby.meta.platforms; } // meta;
 
     passthru = rec {
-      inherit ruby bundler gems mainGem confFiles; # drvName;
+      inherit ruby bundler gems mainGem confFiles envPaths;
 
       wrappedRuby =
       stdenv.mkDerivation {

From c4fc70f53cfaf673bde7fd009826d62bececa161 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Wed, 31 May 2017 09:44:46 -0700
Subject: [PATCH 0071/3246] Starting to add tool builder. Extracting bundler
 file computation.

---
 .../ruby-modules/bundled-common/default.nix   |  2 +-
 .../ruby-modules/bundled-common/functions.nix | 20 ++++++++++++
 .../ruby-modules/bundled-common/test.nix      | 29 ++++++++++++++++-
 .../ruby-modules/bundler-env/default.nix      |  8 ++---
 .../ruby-modules/testing/assertions.nix       |  8 +++--
 .../ruby-modules/testing/tap-support.nix      |  2 +-
 .../development/ruby-modules/tool/default.nix | 32 +++++++++++++++++++
 7 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/ruby-modules/tool/default.nix

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 33a379c0275..e532224195f 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -7,10 +7,10 @@
 {
   name
 , pname ? name
+, gemdir
 , gemfile
 , lockfile
 , gemset
-, gemdir
 , ruby ? defs.ruby
 , gemConfig ? defaultGemConfig
 , postBuild ? null
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index ce8a1b69c74..1d7c4878e13 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -1,5 +1,25 @@
 { lib, gemConfig, ... }:
 rec {
+  bundlerFiles = {
+    gemfile ? null
+  , lockfile ? null
+  , gemset ? null
+  , gemdir ? null
+  , ...
+  }: {
+    gemfile =
+    if gemfile == null then assert gemdir != null; gemdir + "/Gemfile"
+    else gemfile;
+
+    lockfile =
+    if lockfile == null then assert gemdir != null; gemdir + "/Gemfile.lock"
+    else lockfile;
+
+    gemset =
+    if gemset == null then assert gemdir != null; gemdir + "/gemset.nix"
+    else gemset;
+  };
+
   filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
 
   platformMatches = {rubyEngine, version, ...}@ruby: attrs: (
diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/pkgs/development/ruby-modules/bundled-common/test.nix
index b24a620ed50..ee3754595f3 100644
--- a/pkgs/development/ruby-modules/bundled-common/test.nix
+++ b/pkgs/development/ruby-modules/bundled-common/test.nix
@@ -7,7 +7,34 @@ let
   functions = (import ./functions.nix testConfigs);
 in
   builtins.concatLists [
-    (test.run "Filter empty gemset" {} (set: functions.filterGemset {inherit ruby; groups = ["default"]; } set == {}))
+    ( test.run "All set, no gemdir" (functions.bundlerFiles {
+      gemfile  = test/Gemfile;
+      lockfile = test/Gemfile.lock;
+      gemset   = test/gemset.nix;
+    }) {
+      gemfile  = should.equal test/Gemfile;
+      lockfile = should.equal test/Gemfile.lock;
+      gemset   = should.equal test/gemset.nix;
+    })
+
+    ( test.run "Just gemdir" (functions.bundlerFiles {
+      gemdir = test/.;
+    }) {
+      gemfile  = should.equal test/Gemfile;
+      lockfile = should.equal test/Gemfile.lock;
+      gemset   = should.equal test/gemset.nix;
+    })
+
+    ( test.run "Gemset and dir" (functions.bundlerFiles {
+      gemdir = test/.;
+      gemset = test/extraGemset.nix;
+    }) {
+      gemfile  = should.equal test/Gemfile;
+      lockfile = should.equal test/Gemfile.lock;
+      gemset   = should.equal test/extraGemset.nix;
+    })
+
+    ( test.run "Filter empty gemset" {} (set: functions.filterGemset {inherit ruby; groups = ["default"]; } set == {}))
     ( let gemSet = { test = { groups = ["x" "y"]; }; };
       in
       test.run "Filter matches a group" gemSet (set: functions.filterGemset {inherit ruby; groups = ["y" "z"];} set == gemSet))
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 46d9e99f671..89fafb5f230 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -1,10 +1,6 @@
 { stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib
 , callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv
-, linkFarm
-, git
-, makeWrapper
-, bundler
-, tree
+, linkFarm, git, makeWrapper, bundler, tree
 }@defs:
 
 { name ? null
@@ -13,12 +9,12 @@
 , gemfile ? null
 , lockfile ? null
 , gemset ? null
+, groups ? ["default"]
 , ruby ? defs.ruby
 , gemConfig ? defaultGemConfig
 , postBuild ? null
 , document ? []
 , meta ? {}
-, groups ? ["default"]
 , ignoreCollisions ? false
 , ...
 }@args:
diff --git a/pkgs/development/ruby-modules/testing/assertions.nix b/pkgs/development/ruby-modules/testing/assertions.nix
index 3cf67d6f3eb..f28cfcd508d 100644
--- a/pkgs/development/ruby-modules/testing/assertions.nix
+++ b/pkgs/development/ruby-modules/testing/assertions.nix
@@ -3,7 +3,11 @@
   equal = expected: actual:
     if actual == expected then
       (test.passed "= ${toString expected}") else
-      (test.failed "'${toString actual}'(${builtins.typeOf actual}) != '${toString expected}'(${builtins.typeOf expected})");
+      (test.failed (
+      "expected '${toString expected}'(${builtins.typeOf expected})"
+      + " !=  "+
+      "actual '${toString actual}'(${builtins.typeOf actual})"
+      ));
 
   beASet = actual:
     if builtins.isAttrs actual then
@@ -15,7 +19,7 @@
     (ex: builtins.any (ac: ex == ac) (builtins.attrNames actual))
     expected then
       (test.passed "has expected keys") else
-      (test.failed "keys differ: expected [${lib.concatStringsSep ";" expected}] have [${lib.concatStringsSep ";" (builtins.attrNames actual)}]");
+      (test.failed "keys differ: expected: [${lib.concatStringsSep ";" expected}] actual: [${lib.concatStringsSep ";" (builtins.attrNames actual)}]");
 
   havePrefix = expected: actual:
     if lib.hasPrefix expected actual then
diff --git a/pkgs/development/ruby-modules/testing/tap-support.nix b/pkgs/development/ruby-modules/testing/tap-support.nix
index ba576683d37..3147ed066c1 100644
--- a/pkgs/development/ruby-modules/testing/tap-support.nix
+++ b/pkgs/development/ruby-modules/testing/tap-support.nix
@@ -2,7 +2,7 @@ with builtins;
 let
   withIndexes = list: genList (idx: (elemAt list idx) // {index = idx;}) (length list);
 
-  testLine = report: "${okStr report} ${toString report.index} ${report.description}" + testDirective report + testYaml report;
+  testLine = report: "${okStr report} ${toString (report.index + 1)} ${report.description}" + testDirective report + testYaml report;
 
   testDirective = report: "";
 
diff --git a/pkgs/development/ruby-modules/tool/default.nix b/pkgs/development/ruby-modules/tool/default.nix
new file mode 100644
index 00000000000..02bf3b96a26
--- /dev/null
+++ b/pkgs/development/ruby-modules/tool/default.nix
@@ -0,0 +1,32 @@
+{ stdenv }@defs:
+
+{
+  name
+, gemdir
+, exes ? []
+, scripts ? []
+, postBuild
+}@args:
+
+let
+  basicEnv = (callPackage ../bundled-common {}) (args // { inherit name gemdir;
+    gemfile = gemfile';
+    lockfile  = lockfile';
+    gemset = gemset';
+  });
+
+  args = removeAttrs args_ [ "name" "postBuild" ]
+  // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
+in
+   runCommand name args ''
+    mkdir -p $out; cd $out;
+      ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' '${x}';\n") exes)}
+      ${(lib.concatMapStrings (s: "makeWrapper ${out}/bin/$(basename ${s}) $srcdir/${s} " +
+              "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+
+              "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+
+              "--set BUNDLE_FROZEN 1 "+
+              "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+
+              "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+
+              "--run \"cd $srcdir\";\n") scripts)}
+    ${postBuild}
+  ''

From 580f7b47a3aa4a09a5096c74b53e254961f65f51 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Thu, 1 Jun 2017 00:06:20 -0700
Subject: [PATCH 0072/3246] Update version to 2.0.32-fec7941 and apply proposed
 changes.

---
 .../mailreaders/nylas-mail/default.nix        | 211 +++++++++---------
 1 file changed, 105 insertions(+), 106 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
index 7c3ee456f25..47f633c7cfc 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
@@ -1,94 +1,93 @@
-{ config
-, stdenv
-, pkgs
-, fetchurl
-, dpkg
-, lib
-, gnome2
-, libgnome_keyring
-, desktop_file_utils
-, python2
-, nodejs
-, libnotify
+{ dpkg, fetchurl, lib, pkgs, stdenv, config
 , alsaLib
 , atk
-, glib
-, pango
-, gdk_pixbuf
 , cairo
-, freetype
-, fontconfig
-, dbus
-, nss
-, nspr
-, cups
-, expat
-, wget
-, udev
-, xorg
-, libgcrypt
-, makeWrapper
-, gcc-unwrapped
 , coreutils
+, cups
+, dbus
+, desktop_file_utils
+, expat
+, fontconfig
+, freetype
+, gcc-unwrapped
+, gdk_pixbuf
+, glib
+, gnome2
+, libgcrypt
+, libgnome_keyring
+, libnotify
+, makeWrapper
+, nodejs
+, nspr
+, nss
+, pango
+, python2
+, udev
+, wget
+, xorg
 }:
 
 stdenv.mkDerivation rec {
-   name = "${pkgname}-${version}";
-   pkgname = "nylas-mail";
-   version = "2.0.31";
-   subVersion = "e675deb";
+  name = "${pkgname}-${version}";
+  pkgname = "nylas-mail";
+  version = "2.0.32";
+  subVersion = "fec7941";
 
-   src = fetchurl {
-     url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb";
-     sha256 = "b036956174f998bd4a2662a1f59cb4a302465b3ed06c487de88ff2721e372f6e";
-   };
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb";
+        sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada";
+      }
+    else
+      throw "NylasMail is not supported on ${stdenv.system}";
 
-   # Build dependencies
-   propagatedBuildInputs = [
-     gnome2.gtk
-     gnome2.GConf
-     libgnome_keyring
-     desktop_file_utils
-     python2
-     nodejs
-     libnotify
-     alsaLib
-     atk
-     glib
-     pango
-     gdk_pixbuf
-     cairo
-     freetype
-     fontconfig
-     dbus
-     nss
-     nspr
-     cups
-     expat
-     wget
-     udev
-     gcc-unwrapped
-     coreutils
-     xorg.libXScrnSaver
-     xorg.libXi
-     xorg.libXtst
-     xorg.libXcursor
-     xorg.libXdamage
-     xorg.libXrandr
-     xorg.libXcomposite
-     xorg.libXext
-     xorg.libXfixes
-     xorg.libXrender
-     xorg.libX11
-     xorg.libxkbfile
-   ];
+  # Build dependencies
+  propagatedBuildInputs = [
+    alsaLib
+    atk
+    cairo
+    coreutils
+    cups
+    dbus
+    desktop_file_utils
+    expat
+    fontconfig
+    freetype
+    gcc-unwrapped
+    gdk_pixbuf
+    glib
+    gnome2.GConf
+    gnome2.gtk
+    libgnome_keyring
+    libnotify
+    nodejs
+    nspr
+    nss
+    pango
+    python2
+    udev
+    wget
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libxkbfile
+  ];
 
-   # Runtime dependencies
-   buildInputs = [ makeWrapper gnome2.gnome_keyring ];
+  # Runtime dependencies
+  buildInputs = [ makeWrapper gnome2.gnome_keyring ];
 
-   phases = [ "unpackPhase" ];
+  phases = [ "unpackPhase" ];
 
-   unpackPhase = ''
+  unpackPhase = ''
     mkdir -p $out
 
     ${dpkg}/bin/dpkg-deb -x $src unpacked
@@ -96,43 +95,43 @@ stdenv.mkDerivation rec {
 
     # Fix path in desktop file
     substituteInPlace $out/share/applications/nylas-mail.desktop \
-        --replace /usr/bin/nylas-mail $out/bin/nylas-mail
+      --replace /usr/bin/nylas-mail $out/bin/nylas-mail
 
-     # Patch librariess
-     noderp=$(patchelf --print-rpath $out/share/nylas-mail/libnode.so)
-     patchelf --set-rpath $noderp:$out/lib:${stdenv.cc.cc.lib}/lib:${xorg.libxkbfile.out}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
-         $out/share/nylas-mail/libnode.so
+    # Patch librariess
+    noderp=$(patchelf --print-rpath $out/share/nylas-mail/libnode.so)
+    patchelf --set-rpath $noderp:$out/lib:${stdenv.cc.cc.lib}/lib:${xorg.libxkbfile.out}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
+      $out/share/nylas-mail/libnode.so
 
-     ffrp=$(patchelf --print-rpath $out/share/nylas-mail/libffmpeg.so)
-     patchelf --set-rpath $ffrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
-         $out/share/nylas-mail/libffmpeg.so
+    ffrp=$(patchelf --print-rpath $out/share/nylas-mail/libffmpeg.so)
+    patchelf --set-rpath $ffrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
+      $out/share/nylas-mail/libffmpeg.so
 
-     # Patch binaries
-     binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas)
-     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-         --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
-         $out/share/nylas-mail/nylas
+    # Patch binaries
+    binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas)
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
+      $out/share/nylas-mail/nylas
 
     wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib";
 
     # Fix path to bash so apm can install plugins.
     substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \
-          --replace /bin/bash ${stdenv.shell}
+      --replace /bin/bash ${stdenv.shell}
 
     wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \
-        --set PATH "${coreutils}/bin"
+      --set PATH "${coreutils}/bin"
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-             --set-rpath ${gcc-unwrapped.lib}/lib \
-        $out/share/nylas-mail/resources/apm/bin/node
-   '';
+      --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node
+  '';
 
-   meta = with stdenv.lib; {
-     description = "Open-source mail client built on the modern web with Electron, React, and Flux";
-     longDescription = ''
-        Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. To run nylas-mail, an additional manual step is required. Make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup".
-     '';
-     license = licenses.gpl3;
-     maintainers = with maintainers; [ johnramsden ];
-     homepage = https://nylas.com;
-   };
+  meta = with stdenv.lib; {
+    description = "Open-source mail client built on the modern web with Electron, React, and Flux";
+    longDescription = ''
+      Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. To run nylas-mail, an additional manual step is required. Make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup".
+    '';
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ johnramsden ];
+    homepage = https://nylas.com;
+    platforms = [ "x86_64-linux" ];
+  };
 }

From 1b55c0bc697b28510853188eccbe035f0f53e23c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 2 Jun 2017 15:20:10 +0200
Subject: [PATCH 0073/3246] flann: 1.8.4 -> 1.9.1

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

diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix
index 145d2b42a9d..5f67c84bd19 100644
--- a/pkgs/development/libraries/flann/default.nix
+++ b/pkgs/development/libraries/flann/default.nix
@@ -1,11 +1,13 @@
-{stdenv, fetchurl, unzip, cmake, python}:
+{ stdenv, fetchFromGitHub, unzip, cmake, python }:
 
 stdenv.mkDerivation {
-  name = "flann-1.8.4";
+  name = "flann-1.9.1";
 
-  src = fetchurl {
-    url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip;
-    sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz";
+  src = fetchFromGitHub {
+    owner = "mariusmuja";
+    repo = "flann";
+    rev = "1.9.1";
+    sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
   };
 
   buildInputs = [ unzip cmake python ];

From fd5e201bf2270073b1c02076447c0843caa09f07 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 5 Jun 2017 18:22:19 +0800
Subject: [PATCH 0074/3246] pass: add plugins to support importing and updating

---
 pkgs/tools/security/pass/default.nix | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index baa53492d3e..331a75495ed 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl
+{ stdenv, lib, fetchurl, fetchFromGitHub
 , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
 , makeWrapper
 
@@ -12,7 +12,17 @@ assert x11Support -> xclip != null
                   && xdotool != null
                   && dmenu != null;
 
-stdenv.mkDerivation rec {
+let
+  plugins = map (p: (fetchFromGitHub {
+    owner  = "roddhjav";
+    repo   = "pass-${p.name}";
+    inherit (p) rev sha256;
+  })) [
+    { name = "import"; rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; }
+    { name = "update"; rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; }
+  ];
+
+in stdenv.mkDerivation rec {
   version = "1.7.1";
   name    = "password-store-${version}";
 
@@ -29,6 +39,13 @@ stdenv.mkDerivation rec {
   installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
 
   postInstall = ''
+    # plugins
+    ${stdenv.lib.concatStringsSep "\n" (map (plugin: ''
+      pushd ${plugin}
+      PREFIX=$out make install
+      popd
+    '') plugins)}
+
     # Install Emacs Mode. NOTE: We can't install the necessary
     # dependencies (s.el and f.el) here. The user has to do this
     # himself.

From c18c50a42e68e5327d8612d5aed2e25d094205d3 Mon Sep 17 00:00:00 2001
From: roblabla <robinlambertz+dev@gmail.com>
Date: Tue, 6 Jun 2017 12:59:47 +0200
Subject: [PATCH 0075/3246] cyrus-sasl: Add saslauthd service support

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/system/saslauthd.nix   | 63 +++++++++++++++++++
 .../libraries/cyrus-sasl/default.nix          |  1 -
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/system/saslauthd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f7608a57d71..4ab70707d72 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -534,6 +534,7 @@
   ./services/system/earlyoom.nix
   ./services/system/kerberos.nix
   ./services/system/nscd.nix
+  ./services/system/saslauthd.nix
   ./services/system/uptimed.nix
   ./services/torrent/deluge.nix
   ./services/torrent/flexget.nix
diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix
new file mode 100644
index 00000000000..281716cf186
--- /dev/null
+++ b/nixos/modules/services/system/saslauthd.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  nssModulesPath = config.system.nssModules.path;
+  cfg = config.services.saslauthd;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.saslauthd = {
+
+      enable = mkEnableOption "Whether to enable the Cyrus SASL authentication daemon.";
+
+      package = mkOption {
+        default = pkgs.cyrus_sasl.bin;
+        defaultText = "pkgs.cyrus_sasl.bin";
+        type = types.package;
+        description = "Cyrus SASL package to use.";
+      };
+
+      mechanism = mkOption {
+        type = types.str;
+        default = "pam";
+        description = "Auth mechanism to use";
+      };
+
+      config = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Configuration to use for Cyrus SASL authentication daemon.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.saslauthd = {
+      description = "Cyrus SASL authentication daemon";
+
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "@${cfg.package}/sbin/saslauthd saslauthd -a ${cfg.mechanism} -O ${pkgs.writeText "saslauthd.conf" cfg.config}";
+        Type = "forking";
+        PIDFile = "/run/saslauthd/saslauthd.pid";
+        Restart = "always";
+      };
+    };
+  };
+}
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 05eb575547d..590092e988c 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
   # Set this variable at build-time to make sure $out can be evaluated.
   preConfigure = ''
     configureFlagsArray=( --with-plugindir=$out/lib/sasl2
-                          --with-configdir=$out/lib/sasl2
                           --with-saslauthd=/run/saslauthd
                           --enable-login
                         )

From c3150412c3ed95ff55dd55180c02e227f5d0d371 Mon Sep 17 00:00:00 2001
From: roblabla <robinlambertz+dev@gmail.com>
Date: Tue, 6 Jun 2017 13:00:28 +0200
Subject: [PATCH 0076/3246] cyrus-sasl: Add optional LDAP support

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

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 590092e988c..4bdd12eb685 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook }:
+{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ openssl db gettext kerberos ]
+    ++ lib.optional enableLdap openldap
     ++ lib.optional stdenv.isFreeBSD autoreconfHook
     ++ lib.optional stdenv.isLinux pam
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-openssl=${openssl.dev}"
-  ];
+  ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}";
 
   # Set this variable at build-time to make sure $out can be evaluated.
   preConfigure = ''

From 1cfed62073a7c4bd7ea70498041ae3f271977ff3 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Tue, 6 Jun 2017 21:37:23 +0200
Subject: [PATCH 0077/3246] llvm_4: Fix debugVersion

Previously failed on installation phase
when `substituteInPlace` could not find the cmake exports file.
---
 pkgs/development/compilers/llvm/4/llvm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 1a78d672bfe..c859c7b958d 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -115,11 +115,11 @@ in stdenv.mkDerivation rec {
   + stdenv.lib.optionalString (enableSharedLibraries) ''
     moveToOutput "lib/libLLVM-*" "$lib"
     moveToOutput "lib/libLLVM.${shlib}" "$lib"
-    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
   ''
   + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
-    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
     install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib
     install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config

From e57deab6d04dc351f413c42d87bf71a2efe7b967 Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@gmail.com>
Date: Thu, 1 Jun 2017 13:57:39 -0700
Subject: [PATCH 0078/3246] gh-ost: init at 1.0.36

---
 pkgs/tools/misc/gh-ost/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/misc/gh-ost/default.nix

diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
new file mode 100644
index 00000000000..24841a2bac7
--- /dev/null
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+let
+  goPackagePath = "github.com/github/gh-ost";
+  version = "1.0.36";
+  sha256 = "0qa7k50bf87bx7sr6iwqri8l49f811gs0bj3ivslxfibcs1z5d4h";
+
+in {
+  gh-ost = buildGoPackage ({
+    name = "gh-ost-${version}";
+    inherit goPackagePath;
+
+    src = fetchFromGitHub {
+      owner = "github";
+      repo  = "gh-ost";
+      rev   = "v${version}";
+      inherit sha256;
+    };
+
+    meta = with stdenv.lib; {
+      description = "Triggerless online schema migration solution for MySQL";
+      homepage = https://github.com/github/gh-ost;
+      license = licenses.mit;
+      platforms = platforms.linux;
+    };
+  });
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a40e8e38d99..5a9d8e0b1b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -999,6 +999,8 @@ with pkgs;
 
   genromfs = callPackage ../tools/filesystems/genromfs { };
 
+  gh-ost = callPackage ../tools/misc/gh-ost { };
+
   gist = callPackage ../tools/text/gist { };
 
   glide = callPackage ../development/tools/glide { };

From 964d9b7a067fc48d9774c5bff37d7fff41158f5a Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Fri, 9 Jun 2017 09:04:33 -0700
Subject: [PATCH 0079/3246] Made gemdir handling into a common function

---
 .../ruby-modules/bundled-common/default.nix   | 21 ++++++++++---------
 .../ruby-modules/bundler-env/default.nix      | 18 +---------------
 .../ruby-modules/testing/tap-support.nix      |  1 +
 .../development/ruby-modules/tool/default.nix | 14 +++++++------
 4 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 30c82100d5e..2aea35844fe 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -7,10 +7,10 @@
 {
   name
 , pname ? name
-, gemdir
-, gemfile
-, lockfile
-, gemset
+, gemdir ? null
+, gemfile ? null
+, lockfile ? null
+, gemset ? null
 , ruby ? defs.ruby
 , gemConfig ? defaultGemConfig
 , postBuild ? null
@@ -24,8 +24,9 @@
 with  import ./functions.nix { inherit lib gemConfig; };
 
 let
+  gemFiles = bundlerFiles args;
 
-  importedGemset = import gemset;
+  importedGemset = import gemFiles.gemset;
 
   filteredGemset = filterGemset { inherit ruby groups; } importedGemset;
 
@@ -42,9 +43,9 @@ let
   gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
 
   copyIfBundledByPath = { bundledByPath ? false, ...}@main:
-  (if bundledByPath then ''
-  cp -a ${gemdir}/* $out/
-  '' else ""
+  (if bundledByPath then
+      assert gemFiles.gemdir != nil; "cp -a ${gemFiles.gemdir}/* $out/"
+    else ""
   );
 
   maybeCopyAll = pname: if pname == null then "" else
@@ -59,8 +60,8 @@ let
   confFiles = runCommand "gemfile-and-lockfile" {} ''
     mkdir -p $out
     ${maybeCopyAll pname}
-    cp ${gemfile} $out/Gemfile || ls -l $out/Gemfile
-    cp ${lockfile} $out/Gemfile.lock || ls -l $out/Gemfile.lock
+    cp ${gemFiles.gemfile} $out/Gemfile || ls -l $out/Gemfile
+    cp ${gemFiles.lockfile} $out/Gemfile.lock || ls -l $out/Gemfile.lock
   '';
 
   buildGem = name: attrs: (
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 89fafb5f230..a72647fb00a 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -27,23 +27,7 @@ let
     else if pname != null then "${toString pname}-${basicEnv.gems."${pname}".version}"
     else throw "bundlerEnv: either pname or name must be set";
 
-  gemfile' =
-    if gemfile == null then gemdir + "/Gemfile"
-    else gemfile;
-
-  lockfile' =
-    if lockfile == null then gemdir + "/Gemfile.lock"
-    else lockfile;
-
-  gemset' =
-    if gemset == null then gemdir + "/gemset.nix"
-    else gemset;
-
-  basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name gemdir;
-    gemfile = gemfile';
-    lockfile  = lockfile';
-    gemset = gemset';
-  });
+  basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name; });
 
   inherit (basicEnv) envPaths;
   # Idea here is a mkDerivation that gen-bin-stubs new stubs "as specified" -
diff --git a/pkgs/development/ruby-modules/testing/tap-support.nix b/pkgs/development/ruby-modules/testing/tap-support.nix
index 3147ed066c1..555ce89d833 100644
--- a/pkgs/development/ruby-modules/testing/tap-support.nix
+++ b/pkgs/development/ruby-modules/testing/tap-support.nix
@@ -4,6 +4,7 @@ let
 
   testLine = report: "${okStr report} ${toString (report.index + 1)} ${report.description}" + testDirective report + testYaml report;
 
+  # These are part of the TAP spec, not yet implemented.
   testDirective = report: "";
 
   testYaml = report: "";
diff --git a/pkgs/development/ruby-modules/tool/default.nix b/pkgs/development/ruby-modules/tool/default.nix
index 02bf3b96a26..04c385d75ae 100644
--- a/pkgs/development/ruby-modules/tool/default.nix
+++ b/pkgs/development/ruby-modules/tool/default.nix
@@ -2,24 +2,26 @@
 
 {
   name
+  # gemdir is the location of the Gemfile{,.lock} and gemset.nix; usually ./.
 , gemdir
+  # Exes is the list of executables provided by the gems in the Gemfile
 , exes ? []
+  # Scripts are programs included directly in nixpkgs that depend on gems
 , scripts ? []
+, gemfile ? null
+, lockfile ? null
+, gemset ? null
 , postBuild
 }@args:
 
 let
-  basicEnv = (callPackage ../bundled-common {}) (args // { inherit name gemdir;
-    gemfile = gemfile';
-    lockfile  = lockfile';
-    gemset = gemset';
-  });
+  basicEnv = (callPackage ../bundled-common {}) args;
 
   args = removeAttrs args_ [ "name" "postBuild" ]
   // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
 in
    runCommand name args ''
-    mkdir -p $out; cd $out;
+    mkdir -p ${out}/bin; cd $out;
       ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' '${x}';\n") exes)}
       ${(lib.concatMapStrings (s: "makeWrapper ${out}/bin/$(basename ${s}) $srcdir/${s} " +
               "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+

From 53481f8f0b568b0185a7bd58102452153b827bbe Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sat, 10 Jun 2017 16:58:32 -0700
Subject: [PATCH 0080/3246] Docs and extras on tool/

---
 pkgs/development/ruby-modules/tool/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/tool/default.nix b/pkgs/development/ruby-modules/tool/default.nix
index 04c385d75ae..97158213e10 100644
--- a/pkgs/development/ruby-modules/tool/default.nix
+++ b/pkgs/development/ruby-modules/tool/default.nix
@@ -6,11 +6,13 @@
 , gemdir
   # Exes is the list of executables provided by the gems in the Gemfile
 , exes ? []
-  # Scripts are programs included directly in nixpkgs that depend on gems
+  # Scripts are ruby programs depend on gems in the Gemfile (e.g. scripts/rails)
 , scripts ? []
 , gemfile ? null
 , lockfile ? null
 , gemset ? null
+, preferLocalBuild ? false
+, allowSubstitutes ? false
 , postBuild
 }@args:
 

From dd86c6d25a0d06ea9234850fce7dafff34c987ec Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sat, 10 Jun 2017 17:11:37 -0700
Subject: [PATCH 0081/3246] Adding Corundum as demo of rubyTool

---
 lib/maintainers.nix                           |   1 +
 .../development/ruby-modules/tool/default.nix |   1 +
 pkgs/development/tools/corundum/Gemfile       |   3 +
 pkgs/development/tools/corundum/Gemfile.lock  |  56 +++++++
 pkgs/development/tools/corundum/default.nix   |  13 ++
 pkgs/development/tools/corundum/gemset.nix    | 154 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 7 files changed, 229 insertions(+)
 create mode 100644 pkgs/development/tools/corundum/Gemfile
 create mode 100644 pkgs/development/tools/corundum/Gemfile.lock
 create mode 100644 pkgs/development/tools/corundum/default.nix
 create mode 100644 pkgs/development/tools/corundum/gemset.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 57fa0bdd565..f3204ab3b34 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -372,6 +372,7 @@
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
   nthorne = "Niklas Thörne <notrupertthorne@gmail.com>";
+  nyarly = "Judson Lester <nyarly@gmail.com>";
   obadz = "obadz <obadz-nixos@obadz.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
diff --git a/pkgs/development/ruby-modules/tool/default.nix b/pkgs/development/ruby-modules/tool/default.nix
index 97158213e10..5a11218fdea 100644
--- a/pkgs/development/ruby-modules/tool/default.nix
+++ b/pkgs/development/ruby-modules/tool/default.nix
@@ -13,6 +13,7 @@
 , gemset ? null
 , preferLocalBuild ? false
 , allowSubstitutes ? false
+, meta ? {}
 , postBuild
 }@args:
 
diff --git a/pkgs/development/tools/corundum/Gemfile b/pkgs/development/tools/corundum/Gemfile
new file mode 100644
index 00000000000..5f817ae498a
--- /dev/null
+++ b/pkgs/development/tools/corundum/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "corundum", "=0.6.2"
diff --git a/pkgs/development/tools/corundum/Gemfile.lock b/pkgs/development/tools/corundum/Gemfile.lock
new file mode 100644
index 00000000000..40ad1948394
--- /dev/null
+++ b/pkgs/development/tools/corundum/Gemfile.lock
@@ -0,0 +1,56 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    calibrate (0.0.1)
+    caliph (0.3.1)
+    corundum (0.6.2)
+      bundler (~> 1.10)
+      caliph (~> 0.3)
+      mattock (~> 0.9)
+      paint (~> 0.8)
+      rspec (>= 2.0, < 4)
+      simplecov (>= 0.5)
+      simplecov-json (~> 0.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    json (2.1.0)
+    mattock (0.10.1)
+      calibrate (~> 0.0.1)
+      caliph (~> 0.3)
+      rake (~> 10.0)
+      tilt (> 0)
+      valise (~> 1.1)
+    paint (0.9.0)
+    rake (10.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.1)
+    simplecov-json (0.2)
+      json
+      simplecov
+    tilt (2.0.7)
+    valise (1.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  corundum (= 0.6.2)
+
+BUNDLED WITH
+   1.14.4
diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix
new file mode 100644
index 00000000000..36f5bb06c34
--- /dev/null
+++ b/pkgs/development/tools/corundum/default.nix
@@ -0,0 +1,13 @@
+{ rubyTool }:
+
+rubyTool {
+  name = "corundum-0.6.2";
+  gemdir = ./.;
+  meta = {
+    description = "Tool and libraries for maintaining Ruby gems.";
+    homepage    = http://sass-lang.com/;
+    license     = licenses.mit;
+    maintainers = [ maintainers.nyarly ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/corundum/gemset.nix b/pkgs/development/tools/corundum/gemset.nix
new file mode 100644
index 00000000000..e395e098e6d
--- /dev/null
+++ b/pkgs/development/tools/corundum/gemset.nix
@@ -0,0 +1,154 @@
+{
+  calibrate = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17kmlss7db70pjwdbbhag7mnixh8wasdq6n1v8663x50z9c7n2ng";
+      type = "gem";
+    };
+    version = "0.0.1";
+  };
+  caliph = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08d07n4m4yh1h9icq6n9dkw4jwgdmgd638f15mxr2pvqp4wycsnr";
+      type = "gem";
+    };
+    version = "0.3.1";
+  };
+  corundum = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y6shjrqaqyh14a1r4ic660g6jnq4abdrx9imglyalzyrlrwbsxq";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  diff-lcs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
+      type = "gem";
+    };
+    version = "1.3";
+  };
+  docile = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  mattock = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02d6igwr4sfj4jnky8d5h0rm2cc665k1bqz7sj4khzvr18nk3ai6";
+      type = "gem";
+    };
+    version = "0.10.1";
+  };
+  paint = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fcn7cfrhbl4nl95fmcd67q33h7bl3iafsafs6w9yj4nqzagz1yc";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
+      type = "gem";
+    };
+    version = "10.5.0";
+  };
+  rspec = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  rspec-core = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  rspec-expectations = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  rspec-mocks = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  rspec-support = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  simplecov = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww";
+      type = "gem";
+    };
+    version = "0.14.1";
+  };
+  simplecov-html = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f3psphismgp6jp1fxxz09zbswh7m2xxxr6gqlzdh7sgv415clvm";
+      type = "gem";
+    };
+    version = "0.10.1";
+  };
+  simplecov-json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x9hr08pkj5d14nfzsn5h8b7ayl6q0xir45dcx5rv2a7g10kzlpp";
+      type = "gem";
+    };
+    version = "0.2";
+  };
+  tilt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b";
+      type = "gem";
+    };
+    version = "2.0.7";
+  };
+  valise = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1arsbmk2gifrhv244qrld7s3202xrnxy6vlc5gqklg70dpsinbn5";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 867c35215af..0c17e255ba4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6161,6 +6161,7 @@ with pkgs;
   bundix = callPackage ../development/ruby-modules/bundix { };
   bundler = callPackage ../development/ruby-modules/bundler { };
   bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
+  rubyTool = callPackage ../development/ruby-modules/tool { };
 
   inherit (callPackage ../development/interpreters/ruby {})
     ruby_2_0_0

From 78cb9163a6a7960e3ae55c30eb377343cb0e2f5f Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sat, 10 Jun 2017 17:22:13 -0700
Subject: [PATCH 0082/3246] Adding Corundum to all-packages

---
 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 0c17e255ba4..0686adaea5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6462,6 +6462,8 @@ with pkgs;
 
   cookiecutter = pythonPackages.cookiecutter;
 
+  corundum = callPackage ../development/tools/corundum { };
+
   ctags = callPackage ../development/tools/misc/ctags { };
 
   ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {};

From fc302bc07fd7a771751a6b94760730f1032e1f76 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sat, 10 Jun 2017 17:38:49 -0700
Subject: [PATCH 0083/3246] Not quite done - something fishy about the name
 attr

---
 pkgs/development/ruby-modules/tool/default.nix | 13 +++++++------
 pkgs/development/tools/corundum/default.nix    |  6 ++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ruby-modules/tool/default.nix b/pkgs/development/ruby-modules/tool/default.nix
index 5a11218fdea..9b8848592b2 100644
--- a/pkgs/development/ruby-modules/tool/default.nix
+++ b/pkgs/development/ruby-modules/tool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv }@defs:
+{ lib, stdenv, callPackage, runCommand, ruby }@defs:
 
 {
   name
@@ -8,25 +8,26 @@
 , exes ? []
   # Scripts are ruby programs depend on gems in the Gemfile (e.g. scripts/rails)
 , scripts ? []
+, ruby ? defs.ruby
 , gemfile ? null
 , lockfile ? null
 , gemset ? null
 , preferLocalBuild ? false
 , allowSubstitutes ? false
 , meta ? {}
-, postBuild
+, postBuild ? ""
 }@args:
 
 let
   basicEnv = (callPackage ../bundled-common {}) args;
 
-  args = removeAttrs args_ [ "name" "postBuild" ]
+  cmdArgs = removeAttrs args [ "name" "postBuild" ]
   // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
 in
-   runCommand name args ''
-    mkdir -p ${out}/bin; cd $out;
+   runCommand name cmdArgs ''
+    mkdir -p $out/bin; cd $out;
       ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' '${x}';\n") exes)}
-      ${(lib.concatMapStrings (s: "makeWrapper ${out}/bin/$(basename ${s}) $srcdir/${s} " +
+      ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " +
               "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+
               "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+
               "--set BUNDLE_FROZEN 1 "+
diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix
index 36f5bb06c34..53cb8e8f3b7 100644
--- a/pkgs/development/tools/corundum/default.nix
+++ b/pkgs/development/tools/corundum/default.nix
@@ -1,9 +1,11 @@
-{ rubyTool }:
+{ lib, rubyTool }:
 
 rubyTool {
   name = "corundum-0.6.2";
   gemdir = ./.;
-  meta = {
+  exes = [ "corundum-skel" ];
+
+  meta = with lib; {
     description = "Tool and libraries for maintaining Ruby gems.";
     homepage    = http://sass-lang.com/;
     license     = licenses.mit;

From 5e528db0d91211a33c26322d8ecb0b06a557cc67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= <muoniurn@gmail.com>
Date: Sat, 3 Jun 2017 16:33:52 +0200
Subject: [PATCH 0084/3246] aliza: init at 1.28.10

---
 .../science/medicine/aliza/default.nix        | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/science/medicine/aliza/default.nix

diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix
new file mode 100644
index 00000000000..31307322f34
--- /dev/null
+++ b/pkgs/applications/science/medicine/aliza/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, mesa }:
+
+with stdenv.lib;
+stdenv.mkDerivation {
+  name = "aliza";
+  src = fetchurl {
+    # Hosted on muoniurn's google drive
+    url = "https://drive.google.com/uc?export=download&id=0B0s_Yf4jjfZ4RFgwRmxLX1VaVnM";
+    sha256 = "0cakck4axfgzryh3w086p44ls90czjz65662mgdhfas1z4q5iibr";
+    name = "aliza.rpm";
+  };
+
+  buildInputs = [ rpmextract makeWrapper ];
+
+  unpackCmd = "rpmextract $curSrc";
+
+  patchPhase = ''
+    sed -i 's/^Exec.*$/Exec=aliza %F/' share/applications/aliza.desktop
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r bin share $out
+
+    runHook postInstall
+  '';
+
+  postInstall = let
+    libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ];
+  in ''
+    ${patchelf}/bin/patchelf \
+      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $out/bin/aliza
+
+    ${patchelf}/bin/patchelf \
+      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $out/bin/aliza-vtkvol
+
+    wrapProgram $out/bin/aliza \
+      --prefix LD_LIBRARY_PATH : ${libs}
+
+    wrapProgram $out/bin/aliza-vtkvol \
+      --prefix LD_LIBRARY_PATH : ${libs}
+  '';
+
+  meta = {
+    description = "Medical imaging software with 2D, 3D and 4D capabilities";
+    homepage = "http://www.aliza-dicom-viewer.com";
+    license = licenses.unfreeRedistributable;
+    maintainers = with maintainers; [ mounium ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 713a16ee113..45913f289d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17746,6 +17746,10 @@ with pkgs;
     cmake = cmakeCurses;
   });
 
+  ### SCIENCE/MEDICINE
+
+  aliza = callPackage ../applications/science/medicine/aliza { };
+
   ### PHYSICS
 
   sacrifice = callPackage ../applications/science/physics/sacrifice {};

From 800139b7fead7692d91f8b949c99a85a3affae07 Mon Sep 17 00:00:00 2001
From: shak-mar <shakmar@openmailbox.org>
Date: Fri, 16 Jun 2017 07:59:04 +0200
Subject: [PATCH 0085/3246] i2p: Add i686-linux platform

---
 pkgs/tools/networking/i2p/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index d5b9ff665d4..f760a32d7dd 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -16,7 +16,19 @@ stdenv.mkDerivation rec {
     set -B
     mkdir -p $out/{bin,share}
     cp -r pkg-temp/* $out
-    cp installer/lib/wrapper/linux64/* $out
+    '' +
+
+    # TODO: Compile wrapper ourselves, see https://geti2p.net/en/misc/manual-wrapper
+    (if stdenv.system == "i686-linux"
+    then ''
+      cp installer/lib/wrapper/linux/* $out
+    '' else ''
+      cp installer/lib/wrapper/linux64/* $out
+    '')
+
+     # */ # comment end for vim
+
+    + ''
     sed -i $out/i2prouter -i $out/runplain.sh \
       -e "s#uname#${coreutils}/bin/uname#" \
       -e "s#which#${which}/bin/which#" \
@@ -39,6 +51,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.joelmo ];
     license = licenses.gpl2;
     # TODO: support other systems, just copy appropriate lib/wrapper.. to $out
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }

From c66d81b4d0c6d38f066d057c7e37bd16a9b67109 Mon Sep 17 00:00:00 2001
From: shak-mar <shakmar@openmailbox.org>
Date: Fri, 16 Jun 2017 13:13:52 +0200
Subject: [PATCH 0086/3246] i2p: 0.9.28 -> 0.9.30

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

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index f760a32d7dd..d646b74ff71 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.28";
+  name = "i2p-0.9.30";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "1xagyywnck2c5xalr7bc7cv5ikk4igf7avmc0n28nz9pkais1y1y";
+    sha256 = "03hrirmah3ba9ygql487jy233nsxkfjyz82mmyppazi0mcgiass1";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];

From eb8e289fad6a1ce1436afc7dd3816aa1e0edf178 Mon Sep 17 00:00:00 2001
From: shak-mar <shakmar@openmailbox.org>
Date: Fri, 16 Jun 2017 23:27:41 +0200
Subject: [PATCH 0087/3246] i2p: Build java service wrapper from source

The most tricky part was the JAVA_TOOL_OPTIONS part.  `javah` simply
throws a NullPointerException if it cannot find a java compiler.  See
http://grepcode.com/file/repository.grepcode.com/java/root/jdk/openjdk/6-b27/javax/tools/ToolProvider.java#ToolProvider.getSystemJavaCompiler%28%29
on how that compiler is searched for.
---
 pkgs/tools/networking/i2p/default.nix | 39 +++++++++++++++++++--------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index d646b74ff71..b20b98eccbf 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,5 +1,30 @@
 { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
+let wrapper = stdenv.mkDerivation rec {
+  name = "wrapper-${version}";
+  version = "3.5.32";
+  src = fetchurl {
+    url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
+    sha256 = "1v388p5jjbpwybw0zjv5glzny17fwdwppaci2lqcsnm6qw0667f1";
+  };
+  buildInputs = [ jdk ];
+  buildPhase = ''
+    export ANT_HOME=${ant}
+    export JAVA_HOME=${jdk}/lib/openjdk/jre/
+    export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME
+    export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar
+    ./build32.sh
+  '';
+  installPhase = ''
+    mkdir -p $out/{bin,lib}
+    cp bin/wrapper $out/bin/wrapper
+    cp lib/wrapper.jar $out/lib/wrapper.jar
+    cp lib/libwrapper.so $out/lib/libwrapper.so
+  '';
+};
+
+in
+
 stdenv.mkDerivation rec {
   name = "i2p-0.9.30";
   src = fetchurl {
@@ -16,19 +41,11 @@ stdenv.mkDerivation rec {
     set -B
     mkdir -p $out/{bin,share}
     cp -r pkg-temp/* $out
-    '' +
 
-    # TODO: Compile wrapper ourselves, see https://geti2p.net/en/misc/manual-wrapper
-    (if stdenv.system == "i686-linux"
-    then ''
-      cp installer/lib/wrapper/linux/* $out
-    '' else ''
-      cp installer/lib/wrapper/linux64/* $out
-    '')
+    cp ${wrapper}/bin/wrapper $out/i2psvc
+    cp ${wrapper}/lib/wrapper.jar $out/lib
+    cp ${wrapper}/lib/libwrapper.so $out/lib
 
-     # */ # comment end for vim
-
-    + ''
     sed -i $out/i2prouter -i $out/runplain.sh \
       -e "s#uname#${coreutils}/bin/uname#" \
       -e "s#which#${which}/bin/which#" \

From e3f057d84586d3011e434fbcfb2d6b2048aa8918 Mon Sep 17 00:00:00 2001
From: shak-mar <shakmar@openmailbox.org>
Date: Sat, 17 Jun 2017 15:55:40 +0200
Subject: [PATCH 0088/3246] i2p: wrapper: Fix 64bit build

I didn't actually build this on 64bit, so let's see what Travis will do.
---
 pkgs/tools/networking/i2p/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index b20b98eccbf..e13ada5994c 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -13,7 +13,8 @@ let wrapper = stdenv.mkDerivation rec {
     export JAVA_HOME=${jdk}/lib/openjdk/jre/
     export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME
     export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar
-    ./build32.sh
+    sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make
+    ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
   '';
   installPhase = ''
     mkdir -p $out/{bin,lib}
@@ -67,7 +68,6 @@ stdenv.mkDerivation rec {
     description = "Applications and router for I2P, anonymity over the Internet";
     maintainers = [ maintainers.joelmo ];
     license = licenses.gpl2;
-    # TODO: support other systems, just copy appropriate lib/wrapper.. to $out
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }

From c9fdf3f4db3f9fbcb3a2248c3db6152256d56272 Mon Sep 17 00:00:00 2001
From: James <james@schoolshape.com>
Date: Fri, 16 Jun 2017 12:43:04 +0100
Subject: [PATCH 0089/3246] coturn: allow use of ports < 1024

---
 nixos/modules/services/networking/coturn.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix
index 14e6932d868..65273a4bf93 100644
--- a/nixos/modules/services/networking/coturn.nix
+++ b/nixos/modules/services/networking/coturn.nix
@@ -320,6 +320,14 @@ in {
         RuntimeDirectory = "turnserver";
         User = "turnserver";
         Group = "turnserver";
+        AmbientCapabilities =
+          mkIf (
+            cfg.listening-port < 1024 ||
+            cfg.alt-listening-port < 1024 ||
+            cfg.tls-listening-port < 1024 ||
+            cfg.alt-tls-listening-port < 1024 ||
+            cfg.min-port < 1024
+          ) "cap_net_bind_service";
         Restart = "on-abort";
       };
     };

From 38e4c28abf29faf9267cd948eb901a45ddd33b17 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Sun, 25 Jun 2017 13:58:18 +0200
Subject: [PATCH 0090/3246] vivaldi-ffmpeg-codecs: init at 59.0.3071.104

Due to licensing costs, Vivaldi bundles a version of ffmpeg compiled
without support for the common H.264 codec. However, it is possible to
supply a custom libffmpeg.so with additional codecs. This derivation
uses the Chromium source to compile a compatible libffmpeg.so.

This approach is recommended by a Vivaldi developer, see
https://gist.github.com/ruario/bec42d156d30affef655
---
 lib/maintainers.nix                           |  1 +
 .../browsers/vivaldi/ffmpeg-codecs.nix        | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e0b0d89c016..524028991f7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -297,6 +297,7 @@
   lihop = "Leroy Hopson <nixos@leroy.geek.nz>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
   linus = "Linus Arver <linusarver@gmail.com>";
+  lluchs = "Lukas Werling <lukas.werling@gmail.com>";
   lnl7 = "Daiderd Jordan <daiderd@gmail.com>";
   loskutov = "Ignat Loskutov <ignat.loskutov@gmail.com>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
new file mode 100644
index 00000000000..fb10e2b6c83
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, fetchpatch
+, dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss
+, pciutils, pkgconfig, python2, xdg_utils
+}:
+
+stdenv.mkDerivation rec {
+  name = "${product}-${version}";
+  product = "vivaldi-ffmpeg-codecs";
+  version = "59.0.3071.104";
+
+  src = fetchurl {
+    url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
+    sha512 = "419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf";
+  };
+
+  buildInputs = [ ];
+
+  nativeBuildInputs = [
+    dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig
+    python2 xdg_utils
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gconf=false use_gio=false use_gnome_keyring=false use_kerberos=false use_cups=false use_sysroot=false use_gold=false linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false is_clang=false is_component_build=true is_debug=false symbol_level=0"
+    python tools/gn/bootstrap/bootstrap.py -v -s --no-clean --gn-gen-args "$args"
+    out/Release/gn gen out/Release -v --args="$args"
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    ninja -C out/Release -v libffmpeg.so
+  '';
+
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -p "$out/lib"
+    cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Additional support for proprietary codecs for Vivaldi";
+    homepage    = "https://ffmpeg.org/";
+    license     = licenses.lgpl21;
+    maintainers = with maintainers; [ lluchs ];
+    platforms   = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff4a86293d3..53c520980c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15305,6 +15305,8 @@ with pkgs;
 
   vivaldi = callPackage ../applications/networking/browsers/vivaldi {};
 
+  vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};
+
   openmpt123 = callPackage ../applications/audio/openmpt123 {};
 
   opusfile = callPackage ../applications/audio/opusfile { };

From 603e84caefe2be319263ad6f83637af533834cc9 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 25 Jun 2017 17:40:22 -0700
Subject: [PATCH 0091/3246] Fixing an overload of "pname"

---
 .../ruby-modules/bundled-common/default.nix         |  9 +++++----
 .../ruby-modules/bundled-common/functions.nix       |  2 ++
 .../ruby-modules/bundler-env/default.nix            |  2 +-
 pkgs/development/ruby-modules/tool/default.nix      | 13 +++++++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 2aea35844fe..354353ffab1 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -7,6 +7,7 @@
 {
   name
 , pname ? name
+, mainGemName ? null
 , gemdir ? null
 , gemfile ? null
 , lockfile ? null
@@ -44,13 +45,13 @@ let
 
   copyIfBundledByPath = { bundledByPath ? false, ...}@main:
   (if bundledByPath then
-      assert gemFiles.gemdir != nil; "cp -a ${gemFiles.gemdir}/* $out/"
+      assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/"
     else ""
   );
 
-  maybeCopyAll = pname: if pname == null then "" else
+  maybeCopyAll = pkgname: if pkgname == null then "" else
   let
-    mainGem = gems."${pname}" or (throw "bundlerEnv: gem ${pname} not found");
+    mainGem = gems."${pkgname}" or (throw "bundlerEnv: gem ${pkgname} not found");
   in
     copyIfBundledByPath mainGem;
 
@@ -59,7 +60,7 @@ let
   # out. Yes, I'm serious.
   confFiles = runCommand "gemfile-and-lockfile" {} ''
     mkdir -p $out
-    ${maybeCopyAll pname}
+    ${maybeCopyAll mainGemName}
     cp ${gemFiles.gemfile} $out/Gemfile || ls -l $out/Gemfile
     cp ${gemFiles.lockfile} $out/Gemfile.lock || ls -l $out/Gemfile.lock
   '';
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index 1d7c4878e13..b17a4639e77 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -7,6 +7,8 @@ rec {
   , gemdir ? null
   , ...
   }: {
+    inherit gemdir;
+
     gemfile =
     if gemfile == null then assert gemdir != null; gemdir + "/Gemfile"
     else gemfile;
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index a72647fb00a..7d175cfeccb 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -27,7 +27,7 @@ let
     else if pname != null then "${toString pname}-${basicEnv.gems."${pname}".version}"
     else throw "bundlerEnv: either pname or name must be set";
 
-  basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name; });
+  basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name; mainGemName = pname; });
 
   inherit (basicEnv) envPaths;
   # Idea here is a mkDerivation that gen-bin-stubs new stubs "as specified" -
diff --git a/pkgs/development/ruby-modules/tool/default.nix b/pkgs/development/ruby-modules/tool/default.nix
index 9b8848592b2..a5308b79ff3 100644
--- a/pkgs/development/ruby-modules/tool/default.nix
+++ b/pkgs/development/ruby-modules/tool/default.nix
@@ -1,5 +1,14 @@
 { lib, stdenv, callPackage, runCommand, ruby }@defs:
 
+# Use for simple installation of Ruby tools shipped in a Gem.
+# Start with a Gemfile that includes `gem <toolgem>`
+# > nix-shell -p bundler bundix
+# (shell)> bundle lock
+# (shell)> bundix
+# Then use rubyTool in the default.nix:
+
+# rubyTool { name = "gemifiedTool"; gemdir = ./.; exes = ["gemified-tool"]; }
+# The 'exes' parameter ensures that a copy of e.g. rake doesn't polute the system.
 {
   name
   # gemdir is the location of the Gemfile{,.lock} and gemset.nix; usually ./.
@@ -25,8 +34,8 @@ let
   // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
 in
    runCommand name cmdArgs ''
-    mkdir -p $out/bin; cd $out;
-      ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' '${x}';\n") exes)}
+    mkdir -p $out/bin;
+      ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)}
       ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " +
               "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+
               "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+

From 019afb0c806301e03de764a77dcc11fcbc3fd77a Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Thu, 22 Jun 2017 20:34:32 -0400
Subject: [PATCH 0092/3246] Generalize building of Elixir interpreter

---
 lib/maintainers.nix                           |  1 +
 pkgs/development/beam-modules/default.nix     | 13 +++++++--
 pkgs/development/beam-modules/lib.nix         |  8 +++++
 pkgs/development/interpreters/elixir/1.3.nix  |  6 ++++
 pkgs/development/interpreters/elixir/1.4.nix  |  6 ++++
 .../{default.nix => generic-builder.nix}      | 29 +++++++++----------
 pkgs/top-level/beam-packages.nix              |  3 ++
 7 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/interpreters/elixir/1.3.nix
 create mode 100644 pkgs/development/interpreters/elixir/1.4.nix
 rename pkgs/development/interpreters/elixir/{default.nix => generic-builder.nix} (75%)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 328a5d772db..2c56949229b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -42,6 +42,7 @@
   andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
   andsild = "Anders Sildnes <andsild@gmail.com>";
   aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
+  ankhers = "Justin Wood <justin.k.wood@gmail.com>";
   antono = "Antono Vasiljev <self@antono.info>";
   apeschar = "Albert Peschar <albert@peschar.net>";
   apeyroux = "Alexandre Peyroux <alex@px.io>";
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index d1a2a785a9c..26cba333c23 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -37,9 +37,16 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = if versionAtLeast (lib.getVersion erlang) "18"
-                 then callPackage ../interpreters/elixir { debugInfo = true; }
-                 else throw "Elixir requires at least Erlang/OTP R18.";
+        elixir = defaultScope.elixir-1_4;
+
+        elixir-1_4 = if versionAtLeast (lib.getVersion erlang) "18"
+                     then lib.callElixir ../interpreters/elixir/1.4.nix { debugInfo = true; }
+                     else throw "Elixir requires at least Erlang/OTP R18.";
+
+        elixir-1_3 = if versionAtLeast (lib.getVersion erlang) "18"
+                     then lib.callElixir ../interpreters/elixir/1.3.nix { debugInfo = true; }
+                     else throw "Elixir requires at least Erlang/OTP R18.";
+
         lfe = callPackage ../interpreters/lfe { };
 
         # Non hex packages
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index 009bfb4975b..9d7a4bbd34e 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -43,4 +43,12 @@ rec {
         mkDerivation = pkgs.makeOverridable builder;
       };
 
+  callElixir = drv: args:
+    let
+      builder = callPackage ../../development/interpreters/elixir/generic-builder.nix args;
+    in
+      callPackage drv {
+        mkDerivation = pkgs.makeOverridable builder;
+      };
+
 }
diff --git a/pkgs/development/interpreters/elixir/1.3.nix b/pkgs/development/interpreters/elixir/1.3.nix
new file mode 100644
index 00000000000..90d81ee0120
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.3.nix
@@ -0,0 +1,6 @@
+{ mkDerivation }:
+
+mkDerivation rec {
+  version = "1.3.4";
+  sha256 = "01qqv1ghvfadcwcr5p88w8j217cgaf094pmpqllij3l0q1yg104l";
+}
diff --git a/pkgs/development/interpreters/elixir/1.4.nix b/pkgs/development/interpreters/elixir/1.4.nix
new file mode 100644
index 00000000000..2729c994220
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.4.nix
@@ -0,0 +1,6 @@
+{ mkDerivation }:
+
+mkDerivation rec {
+  version = "1.4.5";
+  sha256 = "18ivcxmh5bak13k3rjy7jjzin57rgb2nffhwnqb2wl7bpi8mrarw";
+}
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
similarity index 75%
rename from pkgs/development/interpreters/elixir/default.nix
rename to pkgs/development/interpreters/elixir/generic-builder.nix
index 0e77b2af252..60f044e16d0 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, coreutils, curl, bash,
-  debugInfo ? false }:
+{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, coreutils, curl
+, bash, debugInfo ? false }:
 
-stdenv.mkDerivation rec {
-  name = "elixir-${version}";
-  version = "1.4.4";
+{ baseName ? "elixir"
+, version
+, sha256 ? null
+, rev ? "v${version}"
+, src ? fetchFromGitHub { inherit rev sha256; owner = "elixir-lang"; repo = "elixir"; }
+}:
 
-  src = fetchFromGitHub {
-    owner = "elixir-lang";
-    repo = "elixir";
-    rev = "v${version}";
-    sha256 = "0m51cirkv1dahw4z2jlmz58cwmpy0dya88myx4wykq0v5bh1xbq8";
-  };
+stdenv.mkDerivation ({
+  name = "${baseName}-${version}";
+
+  inherit src version;
 
   buildInputs = [ erlang rebar makeWrapper ];
 
-  # Elixir expects that UTF-8 locale to be set (see https://github.com/elixir-lang/elixir/issues/3548).
-  # In other cases there is warnings during compilation.
   LANG = "en_US.UTF-8";
   LC_TYPE = "en_US.UTF-8";
 
@@ -66,6 +65,6 @@ stdenv.mkDerivation rec {
 
     license = licenses.epl10;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ the-kenny havvy couchemar ];
+    maintainers = with maintainers; [ the-kenny havvy couchemar ankhers ];
   };
-}
+})
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index acdbea67332..877feaee871 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -57,6 +57,9 @@ rec {
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR19.elixir`.
     elixir = packages.erlang.elixir;
+    elixir-1_4 = packages.erlang.elixir-1_4;
+    elixir-1_3 = packages.erlang.elixir-1_3;
+
     lfe = packages.erlang.lfe;
   };
 

From 838956b179f786eb27a0d21eeddd5909f083ee29 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Thu, 22 Jun 2017 21:17:25 -0400
Subject: [PATCH 0093/3246] Add erlang that is in scope

---
 pkgs/development/beam-modules/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 26cba333c23..d54520212a5 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -40,11 +40,19 @@ let
         elixir = defaultScope.elixir-1_4;
 
         elixir-1_4 = if versionAtLeast (lib.getVersion erlang) "18"
-                     then lib.callElixir ../interpreters/elixir/1.4.nix { debugInfo = true; }
+                     then
+                       lib.callElixir ../interpreters/elixir/1.4.nix {
+                         debugInfo = true;
+                         erlang = erlang;
+                       }
                      else throw "Elixir requires at least Erlang/OTP R18.";
 
         elixir-1_3 = if versionAtLeast (lib.getVersion erlang) "18"
-                     then lib.callElixir ../interpreters/elixir/1.3.nix { debugInfo = true; }
+                     then
+                       lib.callElixir ../interpreters/elixir/1.3.nix {
+                         debugInfo = true;
+                         erlang = erlang;
+                       }
                      else throw "Elixir requires at least Erlang/OTP R18.";
 
         lfe = callPackage ../interpreters/lfe { };

From 3595f8e8d69e10b4989052e52ba4f08ce30857d2 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Fri, 23 Jun 2017 12:38:10 -0400
Subject: [PATCH 0094/3246] Add in scope rebar version

---
 pkgs/development/beam-modules/default.nix | 24 +++++++++-----------
 pkgs/development/beam-modules/lib.nix     | 27 +++++++++++++++++++----
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index d54520212a5..07cc2ebd94b 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -39,21 +39,17 @@ let
         # BEAM-based languages.
         elixir = defaultScope.elixir-1_4;
 
-        elixir-1_4 = if versionAtLeast (lib.getVersion erlang) "18"
-                     then
-                       lib.callElixir ../interpreters/elixir/1.4.nix {
-                         debugInfo = true;
-                         erlang = erlang;
-                       }
-                     else throw "Elixir requires at least Erlang/OTP R18.";
+        elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
+                       debugInfo = true;
+                       erlang = erlang;
+                       rebar = defaultScope.rebar;
+                     };
 
-        elixir-1_3 = if versionAtLeast (lib.getVersion erlang) "18"
-                     then
-                       lib.callElixir ../interpreters/elixir/1.3.nix {
-                         debugInfo = true;
-                         erlang = erlang;
-                       }
-                     else throw "Elixir requires at least Erlang/OTP R18.";
+        elixir-1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" {
+                       debugInfo = true;
+                       erlang = erlang;
+                       rebar = defaultScope.rebar;
+                     };
 
         lfe = callPackage ../interpreters/lfe { };
 
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index 9d7a4bbd34e..df0af405763 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -43,12 +43,31 @@ rec {
         mkDerivation = pkgs.makeOverridable builder;
       };
 
-  callElixir = drv: args:
+  /* Uses generic-builder to evaluate provided drv containing Elixir version
+  specific data.
+
+  drv: package containing version-specific args;
+  vsn: minimum OTP version that Elixir will build on;
+  builder: generic builder for all Erlang versions;
+  args: arguments merged into version-specific args, used mostly to customize
+        dependencies;
+
+  Arguments passed to the generic-builder are overridable.
+
+  Please note that "mkDerivation" defined here is the one called from 1.4.nix
+  and similar files.
+  */
+  callElixir = drv: vsn: args:
     let
+      inherit (stdenv.lib) versionAtLeast;
       builder = callPackage ../../development/interpreters/elixir/generic-builder.nix args;
     in
-      callPackage drv {
-        mkDerivation = pkgs.makeOverridable builder;
-      };
+      if versionAtLeast (getVersion args.erlang) vsn
+      then
+        callPackage drv {
+          mkDerivation = pkgs.makeOverridable builder;
+        }
+      else
+        throw "Elixir requires at least Erlang/OTP R${vsn}.";
 
 }

From aa1f059116b9e7685e9b905434148c202674f4df Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Sat, 24 Jun 2017 09:44:48 -0400
Subject: [PATCH 0095/3246] Remove defaultScope in favour of rec for elixir
 versions

Also removed superfluous path segments from elixir generic builder
---
 pkgs/development/beam-modules/default.nix | 10 ++++------
 pkgs/development/beam-modules/lib.nix     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 07cc2ebd94b..69265aa53e4 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -16,7 +16,7 @@ let
     in
       import ./hex-packages.nix {
         inherit pkgs stdenv callPackage;
-      } // {
+      } // rec {
         inherit callPackage erlang;
         beamPackages = self;
 
@@ -37,18 +37,16 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = defaultScope.elixir-1_4;
+        elixir = elixir-1_4;
 
         elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
+                       inherit rebar erlang;
                        debugInfo = true;
-                       erlang = erlang;
-                       rebar = defaultScope.rebar;
                      };
 
         elixir-1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" {
+                       inherit rebar erlang;
                        debugInfo = true;
-                       erlang = erlang;
-                       rebar = defaultScope.rebar;
                      };
 
         lfe = callPackage ../interpreters/lfe { };
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index df0af405763..8a93282d1ec 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -60,7 +60,7 @@ rec {
   callElixir = drv: vsn: args:
     let
       inherit (stdenv.lib) versionAtLeast;
-      builder = callPackage ../../development/interpreters/elixir/generic-builder.nix args;
+      builder = callPackage ../interpreters/elixir/generic-builder.nix args;
     in
       if versionAtLeast (getVersion args.erlang) vsn
       then

From 909da3998e9c59c17d17f31a9713b9894a6f8374 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Mon, 26 Jun 2017 12:42:56 -0400
Subject: [PATCH 0096/3246] Include Elixir 1.5 rc

---
 pkgs/development/beam-modules/default.nix    | 5 +++++
 pkgs/development/interpreters/elixir/1.5.nix | 6 ++++++
 pkgs/top-level/beam-packages.nix             | 1 +
 3 files changed, 12 insertions(+)
 create mode 100644 pkgs/development/interpreters/elixir/1.5.nix

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 69265aa53e4..d1907e07262 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -39,6 +39,11 @@ let
         # BEAM-based languages.
         elixir = elixir-1_4;
 
+        elixir-1_5 = lib.callElixir ../interpreters/elixir/1.5.nix "18" {
+                       inherit rebar erlang;
+                       debugInfo = true;
+                     };
+
         elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
                        inherit rebar erlang;
                        debugInfo = true;
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
new file mode 100644
index 00000000000..4ef30204ce3
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -0,0 +1,6 @@
+{ mkDerivation }:
+
+mkDerivation rec {
+  version = "1.5.0-rc.0";
+  sha256 = "1p0sawz86w9na56c42ivdacqxzldjb9s9cvl2isj3sy4nwsa0l0j";
+}
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 877feaee871..3a2d9161783 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -57,6 +57,7 @@ rec {
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR19.elixir`.
     elixir = packages.erlang.elixir;
+    elixir-1_5 = packages.erlang.elixir-1_5;
     elixir-1_4 = packages.erlang.elixir-1_4;
     elixir-1_3 = packages.erlang.elixir-1_3;
 

From 803797c6d6983ea2652247b8335aa1f96744d323 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Mon, 26 Jun 2017 16:58:44 -0400
Subject: [PATCH 0097/3246] Inherit the elixir versions for beam modules

Rename attributes from elixir-1_x to elixir_1_x
---
 pkgs/development/beam-modules/default.nix | 8 ++++----
 pkgs/top-level/beam-packages.nix          | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index d1907e07262..ffafe88cc7f 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -37,19 +37,19 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = elixir-1_4;
+        elixir = elixir_1_4;
 
-        elixir-1_5 = lib.callElixir ../interpreters/elixir/1.5.nix "18" {
+        elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix "18" {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
 
-        elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
+        elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
 
-        elixir-1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" {
+        elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 3a2d9161783..8d01ad36139 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -56,10 +56,7 @@ rec {
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR19.elixir`.
-    elixir = packages.erlang.elixir;
-    elixir-1_5 = packages.erlang.elixir-1_5;
-    elixir-1_4 = packages.erlang.elixir-1_4;
-    elixir-1_3 = packages.erlang.elixir-1_3;
+    inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3;
 
     lfe = packages.erlang.lfe;
   };

From 46faaa69b86ba0ef9d416358de0ab3929985a6b4 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Mon, 26 Jun 2017 23:09:11 -0400
Subject: [PATCH 0098/3246] Make assertion for OTP version in the generic
 elixir builder

Changed Elixir 1.5 to include the fact it is an rc release
---
 pkgs/development/beam-modules/lib.nix         |  10 +-
 pkgs/development/interpreters/elixir/1.3.nix  |   1 +
 pkgs/development/interpreters/elixir/1.4.nix  |   1 +
 pkgs/development/interpreters/elixir/1.5.nix  |   1 +
 .../interpreters/elixir/generic-builder.nix   | 107 ++++++++++--------
 5 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index 8a93282d1ec..43c1a3e45d5 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -62,12 +62,8 @@ rec {
       inherit (stdenv.lib) versionAtLeast;
       builder = callPackage ../interpreters/elixir/generic-builder.nix args;
     in
-      if versionAtLeast (getVersion args.erlang) vsn
-      then
-        callPackage drv {
-          mkDerivation = pkgs.makeOverridable builder;
-        }
-      else
-        throw "Elixir requires at least Erlang/OTP R${vsn}.";
+      callPackage drv {
+        mkDerivation = pkgs.makeOverridable builder;
+      };
 
 }
diff --git a/pkgs/development/interpreters/elixir/1.3.nix b/pkgs/development/interpreters/elixir/1.3.nix
index 90d81ee0120..43d48e2cf7c 100644
--- a/pkgs/development/interpreters/elixir/1.3.nix
+++ b/pkgs/development/interpreters/elixir/1.3.nix
@@ -3,4 +3,5 @@
 mkDerivation rec {
   version = "1.3.4";
   sha256 = "01qqv1ghvfadcwcr5p88w8j217cgaf094pmpqllij3l0q1yg104l";
+  minimumOTPVersion = "18";
 }
diff --git a/pkgs/development/interpreters/elixir/1.4.nix b/pkgs/development/interpreters/elixir/1.4.nix
index 2729c994220..9ddd9062acd 100644
--- a/pkgs/development/interpreters/elixir/1.4.nix
+++ b/pkgs/development/interpreters/elixir/1.4.nix
@@ -3,4 +3,5 @@
 mkDerivation rec {
   version = "1.4.5";
   sha256 = "18ivcxmh5bak13k3rjy7jjzin57rgb2nffhwnqb2wl7bpi8mrarw";
+  minimumOTPVersion = "18";
 }
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index 4ef30204ce3..d9e2e9c16c6 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -3,4 +3,5 @@
 mkDerivation rec {
   version = "1.5.0-rc.0";
   sha256 = "1p0sawz86w9na56c42ivdacqxzldjb9s9cvl2isj3sy4nwsa0l0j";
+  minimumOTPVersion = "18";
 }
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 60f044e16d0..a3f60a7f22e 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -1,70 +1,77 @@
-{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, coreutils, curl
-, bash, debugInfo ? false }:
+{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper,
+  coreutils, curl, bash, debugInfo ? false }:
 
 { baseName ? "elixir"
 , version
+, minimumOTPVersion
 , sha256 ? null
 , rev ? "v${version}"
 , src ? fetchFromGitHub { inherit rev sha256; owner = "elixir-lang"; repo = "elixir"; }
 }:
 
-stdenv.mkDerivation ({
-  name = "${baseName}-${version}";
+let
+  inherit (stdenv.lib) getVersion versionAtLeast;
 
-  inherit src version;
+in
+  assert versionAtLeast (getVersion erlang) minimumOTPVersion;
 
-  buildInputs = [ erlang rebar makeWrapper ];
+  stdenv.mkDerivation ({
+    name = "${baseName}-${version}";
 
-  LANG = "en_US.UTF-8";
-  LC_TYPE = "en_US.UTF-8";
+    inherit src version;
 
-  setupHook = ./setup-hook.sh;
+    buildInputs = [ erlang rebar makeWrapper ];
 
-  inherit debugInfo;
+    LANG = "en_US.UTF-8";
+    LC_TYPE = "en_US.UTF-8";
 
-  buildFlags = if debugInfo
-   then "ERL_COMPILER_OPTIONS=debug_info"
-   else "";
+    setupHook = ./setup-hook.sh;
 
-  preBuild = ''
-    # The build process uses ./rebar. Link it to the nixpkgs rebar
-    rm -v rebar
-    ln -s ${rebar}/bin/rebar rebar
+    inherit debugInfo;
 
-    substituteInPlace Makefile \
-      --replace "/usr/local" $out
-  '';
+    buildFlags = if debugInfo
+     then "ERL_COMPILER_OPTIONS=debug_info"
+     else "";
 
-  postFixup = ''
-    # Elixir binaries are shell scripts which run erl. Add some stuff
-    # to PATH so the scripts can run without problems.
+    preBuild = ''
+      # The build process uses ./rebar. Link it to the nixpkgs rebar
+      rm -v rebar
+      ln -s ${rebar}/bin/rebar rebar
 
-    for f in $out/bin/*; do
-     b=$(basename $f)
-      if [ $b == "mix" ]; then continue; fi
-      wrapProgram $f \
-        --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
-        --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
-    done
-
-    substituteInPlace $out/bin/mix \
-          --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://elixir-lang.org/";
-    description = "A functional, meta-programming aware language built on top of the Erlang VM";
-
-    longDescription = ''
-      Elixir is a functional, meta-programming aware language built on
-      top of the Erlang VM. It is a dynamic language with flexible
-      syntax and macro support that leverages Erlang's abilities to
-      build concurrent, distributed and fault-tolerant applications
-      with hot code upgrades.
+      substituteInPlace Makefile \
+        --replace "/usr/local" $out
     '';
 
-    license = licenses.epl10;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ the-kenny havvy couchemar ankhers ];
-  };
-})
+    postFixup = ''
+      # Elixir binaries are shell scripts which run erl. Add some stuff
+      # to PATH so the scripts can run without problems.
+
+      for f in $out/bin/*; do
+       b=$(basename $f)
+        if [ $b == "mix" ]; then continue; fi
+        wrapProgram $f \
+          --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
+          --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
+      done
+
+      substituteInPlace $out/bin/mix \
+            --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir"
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = "http://elixir-lang.org/";
+      description = "A functional, meta-programming aware language built on top of the Erlang VM";
+
+      longDescription = ''
+        Elixir is a functional, meta-programming aware language built on
+        top of the Erlang VM. It is a dynamic language with flexible
+        syntax and macro support that leverages Erlang's abilities to
+        build concurrent, distributed and fault-tolerant applications
+        with hot code upgrades.
+      '';
+
+      license = licenses.epl10;
+      platforms = platforms.unix;
+      maintainers = with maintainers; [ the-kenny havvy couchemar ankhers ];
+    };
+  })

From dc2f1569b30a61f43a2870867910ee21c8d8d5b2 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Mon, 26 Jun 2017 23:10:13 -0400
Subject: [PATCH 0099/3246] Add the new elixir versions to the top level

---
 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 d80777adc54..c3c1be513ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5990,8 +5990,14 @@ with pkgs;
 
   inherit (beam.interpreters)
     erlang erlang_odbc erlang_javac erlang_odbc_javac
-    erlangR17 erlangR18 erlangR19 erlangR20
-    erlang_basho_R16B02 elixir lfe;
+    elixir elixir_1_5_rc elixir_1_4 elixir_1_3
+    lfe
+    erlangR16 erlangR16_odbc
+    erlang_basho_R16B02 erlang_basho_R16B02_odbc
+    erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac
+    erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac
+    erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac
+    erlangR20 erlangR20_odbc erlangR20_javac erlangR20_odbc_javac;
 
   inherit (beam.packages.erlang)
     rebar rebar3-open rebar3

From cc09faa6fb3052da94066a3f95d317f5c720e054 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Mon, 26 Jun 2017 23:12:39 -0400
Subject: [PATCH 0100/3246] Remove additional OTP version information

---
 pkgs/development/beam-modules/default.nix | 6 +++---
 pkgs/development/beam-modules/lib.nix     | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index ffafe88cc7f..f0a049bb4b2 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -39,17 +39,17 @@ let
         # BEAM-based languages.
         elixir = elixir_1_4;
 
-        elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix "18" {
+        elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
 
-        elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
+        elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
 
-        elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" {
+        elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index 43c1a3e45d5..da21cc17bf2 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -47,7 +47,6 @@ rec {
   specific data.
 
   drv: package containing version-specific args;
-  vsn: minimum OTP version that Elixir will build on;
   builder: generic builder for all Erlang versions;
   args: arguments merged into version-specific args, used mostly to customize
         dependencies;
@@ -57,7 +56,7 @@ rec {
   Please note that "mkDerivation" defined here is the one called from 1.4.nix
   and similar files.
   */
-  callElixir = drv: vsn: args:
+  callElixir = drv: args:
     let
       inherit (stdenv.lib) versionAtLeast;
       builder = callPackage ../interpreters/elixir/generic-builder.nix args;

From 495a022e440d1eb0cc17008da9d4ce516dcf82a5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 27 Jun 2017 08:23:43 -0500
Subject: [PATCH 0101/3246] llvmPackages_4: 4.0.0 -> 4.0.1

---
 pkgs/development/compilers/llvm/4/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/4/default.nix        | 6 +++---
 pkgs/development/compilers/llvm/4/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/4/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/4/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/4/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/4/llvm.nix           | 9 +--------
 pkgs/development/compilers/llvm/4/openmp.nix         | 2 +-
 8 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 64dbaa21dd4..73fd12da88b 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -9,7 +9,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "12n99m60aa680cir3ql56s1jsv6lp61hq4w9rabf4c6vpn7gi9ff"}
+      unpackFile ${fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index 15918f9c1eb..83640cf6f3d 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -2,7 +2,7 @@
 let
   callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
 
-  release_version = "4.0.0";
+  release_version = "4.0.1";
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
@@ -10,8 +10,8 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "059ipqq27gd928ay06f1ck3vw6y5h5z4zd766x8k0k7jpqimpwnk";
-  clang-tools-extra_src = fetch "clang-tools-extra" "16bwckgcxfn56mbqjlxi7fxja0zm9hjfa6s3ncm3dz98n5zd7ds1";
+  compiler-rt_src = fetch "compiler-rt" "0h5lpv1z554szi4r4blbskhwrkd78ir50v3ng8xvk1s86fa7gj53";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m";
 
   self = {
     llvm = callPackage ./llvm.nix {
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index a43826d7a31..b74d2fb89dc 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "15ngfcjc3pjakpwfq7d4n546jj0rgfdv5rpb1qv9xgv9mp236kag";
+  src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index 3a0e996fb9a..6a3d9110136 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw";
+  src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index f9cd72b4200..776109ee74d 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k";
+  src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm ];
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index a3c46a4c7e9..7d33179913b 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "0g83hbw1r4gd0z8hlph9i34xs6dlcc69vz3h2bqwkhb2qq2qzg9d";
+  src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4";
 
   patches = [ ./lldb-libedit.patch ];
   postPatch = ''
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 98c24495355..a551e8a9af3 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  src = fetch "llvm" "1giklnw71wzsgbqg9wb5x7dxnbj39m6zpfvskvzvhwvfz4fm244d";
+  src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
   shlib = if stdenv.isDarwin then "dylib" else "so";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
@@ -64,13 +64,6 @@ in stdenv.mkDerivation rec {
   + stdenv.lib.optionalString (enableSharedLibraries) ''
     substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
     patch -p1 < ./llvm-outputs.patch
-  ''
-  # Remove broken tests: (https://bugs.llvm.org//show_bug.cgi?id=31610)
-  + ''
-    rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll
-    rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll
-    rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll
-    rm test/CodeGen/AMDGPU/runtime-metadata.ll
   '';
 
   # hacky fix: created binaries need to be run before installation
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix
index 197e9a78465..0bdf5c71e1f 100644
--- a/pkgs/development/compilers/llvm/4/openmp.nix
+++ b/pkgs/development/compilers/llvm/4/openmp.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "openmp-${version}";
 
-  src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv";
+  src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From 70e7e543c5493761cf065dc96ec8c8cbafe40aba Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Tue, 27 Jun 2017 10:56:36 -0700
Subject: [PATCH 0102/3246] A few cleanups and renames. One feature remains...

---
 pkgs/development/ruby-modules/bundled-common/default.nix      | 2 --
 .../ruby-modules/{tool => bundler-app}/default.nix            | 0
 pkgs/development/tools/corundum/default.nix                   | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/development/ruby-modules/{tool => bundler-app}/default.nix (100%)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 354353ffab1..6e7bd7a898b 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -82,8 +82,6 @@ let
 
     name = if name == null then pname else name;
 
-    #name = pname;
-
     paths = envPaths;
     pathsToLink = [ "/lib" ];
 
diff --git a/pkgs/development/ruby-modules/tool/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
similarity index 100%
rename from pkgs/development/ruby-modules/tool/default.nix
rename to pkgs/development/ruby-modules/bundler-app/default.nix
diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix
index 53cb8e8f3b7..b7c0006a7b5 100644
--- a/pkgs/development/tools/corundum/default.nix
+++ b/pkgs/development/tools/corundum/default.nix
@@ -1,7 +1,7 @@
 { lib, rubyTool }:
 
-rubyTool {
-  name = "corundum-0.6.2";
+bundlerApp {
+  pname = "corundum";
   gemdir = ./.;
   exes = [ "corundum-skel" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0686adaea5f..e6c1d9e2330 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6161,7 +6161,7 @@ with pkgs;
   bundix = callPackage ../development/ruby-modules/bundix { };
   bundler = callPackage ../development/ruby-modules/bundler { };
   bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
-  rubyTool = callPackage ../development/ruby-modules/tool { };
+  bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
 
   inherit (callPackage ../development/interpreters/ruby {})
     ruby_2_0_0

From a19f9668f219a47e2c819797c952950486bbba86 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Tue, 27 Jun 2017 14:03:14 -0400
Subject: [PATCH 0103/3246] Remove Erlang specific version retrieval

---
 pkgs/development/beam-modules/lib.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index da21cc17bf2..dd4ed5e1bbf 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -12,15 +12,6 @@ rec {
 
   callPackage = callPackageWith pkgs;
 
-  /* Erlang/OTP-specific version retrieval, returns 19 for OTP R19 */
-  getVersion = x:
-   let
-     parse = drv: (builtins.parseDrvName drv).version;
-   in builtins.replaceStrings ["B" "-"] ["." "."] (
-      if builtins.isString x
-      then parse x
-      else x.version or (parse x.name));
-
   /* Uses generic-builder to evaluate provided drv containing OTP-version
   specific data.
 

From 442f76d72a422aa44a3ff744d8d6c1d61f500354 Mon Sep 17 00:00:00 2001
From: Katyucha <sylvain.luce@gmail.com>
Date: Wed, 7 Jun 2017 22:31:40 +0200
Subject: [PATCH 0104/3246] Vault: 0.6.5 -> 0.7.2 with services

---
 nixos/modules/module-list.nix             |   1 +
 nixos/modules/services/security/vault.nix | 208 ++++++++++++++++++++++
 pkgs/tools/security/vault/default.nix     |   4 +-
 3 files changed, 211 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/security/vault.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5d9b062f204..7de839c201a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -555,6 +555,7 @@
   ./services/security/tor.nix
   ./services/security/torify.nix
   ./services/security/torsocks.nix
+  ./services/security/vault.nix
   ./services/system/cgmanager.nix
   ./services/system/cloud-init.nix
   ./services/system/dbus.nix
diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
new file mode 100644
index 00000000000..314bf59804d
--- /dev/null
+++ b/nixos/modules/services/security/vault.nix
@@ -0,0 +1,208 @@
+{ config, lib, pkgs, utils, ... }:
+
+with lib;
+let
+
+  inherit (pkgs) vault;
+
+  cfg = config.services.vault;
+ 
+  configFile = pkgs.writeText "vault.hcl" ''
+    listener "tcp" {
+      address = "${cfg.listener.address}"
+   
+      ${optionalString (cfg.listener.cluster_address != null)''
+        cluster_address = "${cfg.listener.cluster_address}"
+      ''}
+      
+      ${optionalString (cfg.listener.tls_cert_file != null)''
+        tls_cert_file = "${cfg.listener.tls_cert_file}"
+      ''}
+      
+      ${optionalString (cfg.listener.tls_key_file != null)''
+        tls_key_file = "${cfg.listener.tls_key_file}"
+      ''}
+      
+      ${if cfg.listener.tls_disable then "tls_disable = \"1\"" else "" } 
+
+      tls_min_version = "${cfg.listener.tls_min_version}" 
+
+
+      ${optionalString (cfg.listener.tls_cipher_suites != null)''
+        tls_cipher_suites = \"${cfg.listener.tls_cipher_suites}\"
+      ''}
+
+      tls_prefer_server_cipher_suites = "${boolToString cfg.listener.tls_prefer_server_cipher_suites}"
+
+      tls_require_and_verify_client_cert = "${boolToString cfg.listener.tls_require_and_verify_client_cert}"
+
+    }
+
+    storage "${cfg.storage.backend}" {
+      ${cfg.storage.extraConfig}
+    }
+
+    ${if cfg.telemetry.extraConfig != "" then "
+      telemetry { 
+        ${if cfg.telemetry.disable_hostname then "disable_hostname = \"true\"" else ""}
+        ${cfg.telemetry.extraConfig}
+      }" else ""}
+
+  '';
+
+in
+{
+  options = {
+
+    services.vault = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enables the vault daemon.
+        '';
+      };
+
+      listener = {
+
+        address = mkOption {
+          type = types.str;
+          default = "127.0.0.1:8200";
+          description = ''
+            The name of the ip interface to listen to.
+          '';
+        };
+
+        cluster_address = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            The name of the address to bind to for cluster server-to-server requests.
+          '';
+        };
+
+        tls_cert_file = mkOption {
+          type = types.str;
+          default = "";
+          description = ''
+            The name of the crt file for the ssl certificate.
+          '';
+        };
+        
+        tls_key_file = mkOption {
+          type = types.str;
+          default = "";
+          description = ''
+            The name of the key file for the ssl certificate.
+          '';
+        };
+
+        tls_disable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Specifies if TLS will be disabled. Vault assumes TLS by default, so you must explicitly disable TLS to opt-in to insecure communication.
+          '';
+        };
+        
+        tls_min_version = mkOption {
+          type = types.enum [ "tls10" "tls11" "tls12" ];
+          default = "tls12";
+          description = ''
+             The minimum supported version of TLS. Accepted values are "tls10", "tls11" or "tls12".
+          '';
+        };
+
+        tls_cipher_suites = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+             The list of supported ciphersuites as a comma-separated-list.
+          '';
+        };
+
+        tls_prefer_server_cipher_suites = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+             Specifies to prefer the server's ciphersuite over the client ciphersuites.
+          '';
+        };
+
+        tls_require_and_verify_client_cert = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+             Turns on client authentication for this listener.
+          '';
+        };
+
+      };
+
+      storage = {
+    
+        backend = mkOption {
+          type =  types.str;
+          default = "inMemory";
+          description = ''
+            The name of the type of storage backend.
+          '';
+        };
+
+        extraConfig = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Configuration for storage
+          '';
+        };
+ 
+      };
+
+
+      telemetry = {
+
+        disable_hostname = mkOption {
+          type =  types.bool;
+          default = false;
+          description = ''
+            Specifies if gauge values should be prefixed with the local hostname. 
+          '';
+        };
+
+        extraConfig = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            configuration for telemetry
+          '';
+        };        
+
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.vault =
+    { description = "Vault server daemon";
+
+      wantedBy = ["multi-user.target"];
+
+      preStart =
+        ''
+          mkdir -m 0755 -p /var/lib/vault
+        '';
+
+      serviceConfig =
+        { ExecStart =
+            "${pkgs.vault}/bin/vault server -config ${configFile}";
+          KillMode = "process";
+        };
+    };   
+  };
+
+}
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 0344fc0a74e..6e8128ec00f 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,7 +9,7 @@ let
   };
 in buildGoPackage rec {
   name = "vault-${version}";
-  version = "0.6.5";
+  version = "0.7.2";
 
   goPackagePath = "github.com/hashicorp/vault";
 
@@ -17,7 +17,7 @@ in buildGoPackage rec {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "0ci46zn9d9h26flgjf4inmvk4mb1hlixvx5g7vg02raw0cqvknnb";
+    sha256 = "1kclpyb9a9y5zjvrlbxnkac4fl3lwqsr98v4yydf9ihl5v7wy4f5";
   };
 
   buildFlagsArray = ''

From cad450e6d6339fee852b468411c065c5f43c73c9 Mon Sep 17 00:00:00 2001
From: Katyucha <sylvain.luce@gmail.com>
Date: Fri, 9 Jun 2017 20:00:54 +0200
Subject: [PATCH 0105/3246] delete lines

---
 nixos/modules/services/security/vault.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 314bf59804d..eae3a8ca618 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -27,7 +27,6 @@ let
 
       tls_min_version = "${cfg.listener.tls_min_version}" 
 
-
       ${optionalString (cfg.listener.tls_cipher_suites != null)''
         tls_cipher_suites = \"${cfg.listener.tls_cipher_suites}\"
       ''}

From 4c428b4a6f8793e62889819e7e9877e6cbca6210 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 27 Jun 2017 14:54:25 +0000
Subject: [PATCH 0106/3246] vault: run as an unpivileged user

---
 nixos/modules/misc/ids.nix                |   2 +
 nixos/modules/services/security/vault.nix | 269 ++++++++--------------
 pkgs/tools/security/vault/default.nix     |   4 +-
 3 files changed, 101 insertions(+), 174 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 22059bb7fbb..4c4e7cfe0d1 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -139,6 +139,7 @@
       btsync = 113;
       minecraft = 114;
       #monetdb = 115; # unused (not packaged), removed 2016-09-19
+      vault = 115;
       rippled = 116;
       murmur = 117;
       foundationdb = 118;
@@ -415,6 +416,7 @@
       btsync = 113;
       #minecraft = 114; # unused
       #monetdb = 115; # unused (not packaged), removed 2016-09-19
+      vault = 115;
       #ripped = 116; # unused
       #murmur = 117; # unused
       foundationdb = 118;
diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index eae3a8ca618..dc06f89cce8 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -1,207 +1,132 @@
-{ config, lib, pkgs, utils, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 let
-
-  inherit (pkgs) vault;
-
   cfg = config.services.vault;
- 
+
   configFile = pkgs.writeText "vault.hcl" ''
     listener "tcp" {
-      address = "${cfg.listener.address}"
-   
-      ${optionalString (cfg.listener.cluster_address != null)''
-        cluster_address = "${cfg.listener.cluster_address}"
-      ''}
-      
-      ${optionalString (cfg.listener.tls_cert_file != null)''
-        tls_cert_file = "${cfg.listener.tls_cert_file}"
-      ''}
-      
-      ${optionalString (cfg.listener.tls_key_file != null)''
-        tls_key_file = "${cfg.listener.tls_key_file}"
-      ''}
-      
-      ${if cfg.listener.tls_disable then "tls_disable = \"1\"" else "" } 
-
-      tls_min_version = "${cfg.listener.tls_min_version}" 
-
-      ${optionalString (cfg.listener.tls_cipher_suites != null)''
-        tls_cipher_suites = \"${cfg.listener.tls_cipher_suites}\"
-      ''}
-
-      tls_prefer_server_cipher_suites = "${boolToString cfg.listener.tls_prefer_server_cipher_suites}"
-
-      tls_require_and_verify_client_cert = "${boolToString cfg.listener.tls_require_and_verify_client_cert}"
-
+      address = "${cfg.address}"
+      tls_cert_file = "${cfg.tlsCertFile}"
+      tls_key_file = "${cfg.tlsKeyFile}"
+      ${cfg.listenerExtraConfig}
     }
-
-    storage "${cfg.storage.backend}" {
-      ${cfg.storage.extraConfig}
+    storage "${cfg.storageBackend}" {
+      ${cfg.storageConfig}
     }
-
-    ${if cfg.telemetry.extraConfig != "" then "
-      telemetry { 
-        ${if cfg.telemetry.disable_hostname then "disable_hostname = \"true\"" else ""}
-        ${cfg.telemetry.extraConfig}
-      }" else ""}
-
+    ${optionalString (cfg.telemetryConfig != "") ''
+        telemetry {
+          ${cfg.telemetryConfig}
+        }
+      ''}
   '';
-
 in
 {
   options = {
 
     services.vault = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enables the vault daemon.
+      enable = mkEnableOption "Vault daemon";
+
+      address = mkOption {
+        type = types.str;
+        default = "127.0.0.1:8200";
+        description = "The name of the ip interface to listen to";
+      };
+
+      tlsCertFile = mkOption {
+        type = types.str;
+        default = "/etc/vault/cert.pem";
+        example = "/path/to/your/cert.pem";
+        description = "TLS certificate file. A self-signed certificate will be generated if file not exists";
+      };
+
+      tlsKeyFile = mkOption {
+        type = types.str;
+        default = "/etc/vault/key.pem";
+        example = "/path/to/your/key.pem";
+        description = "TLS private key file. A self-signed certificate will be generated if file not exists";
+      };
+
+      listenerExtraConfig = mkOption {
+        type = types.lines;
+        default = ''
+          tls_min_version = "tls12"
         '';
+        description = "extra configuration";
       };
 
-      listener = {
-
-        address = mkOption {
-          type = types.str;
-          default = "127.0.0.1:8200";
-          description = ''
-            The name of the ip interface to listen to.
-          '';
-        };
-
-        cluster_address = mkOption {
-          type = types.nullOr types.str;
-          default = null;
-          description = ''
-            The name of the address to bind to for cluster server-to-server requests.
-          '';
-        };
-
-        tls_cert_file = mkOption {
-          type = types.str;
-          default = "";
-          description = ''
-            The name of the crt file for the ssl certificate.
-          '';
-        };
-        
-        tls_key_file = mkOption {
-          type = types.str;
-          default = "";
-          description = ''
-            The name of the key file for the ssl certificate.
-          '';
-        };
-
-        tls_disable = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Specifies if TLS will be disabled. Vault assumes TLS by default, so you must explicitly disable TLS to opt-in to insecure communication.
-          '';
-        };
-        
-        tls_min_version = mkOption {
-          type = types.enum [ "tls10" "tls11" "tls12" ];
-          default = "tls12";
-          description = ''
-             The minimum supported version of TLS. Accepted values are "tls10", "tls11" or "tls12".
-          '';
-        };
-
-        tls_cipher_suites = mkOption {
-          type = types.nullOr types.str;
-          default = null;
-          description = ''
-             The list of supported ciphersuites as a comma-separated-list.
-          '';
-        };
-
-        tls_prefer_server_cipher_suites = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-             Specifies to prefer the server's ciphersuite over the client ciphersuites.
-          '';
-        };
-
-        tls_require_and_verify_client_cert = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-             Turns on client authentication for this listener.
-          '';
-        };
-
+      storageBackend = mkOption {
+        type = types.enum ["inmem" "consul" "zookeeper" "file" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs"];
+        default = "inmem";
+        description = "The name of the type of storage backend";
       };
 
-      storage = {
-    
-        backend = mkOption {
-          type =  types.str;
-          default = "inMemory";
-          description = ''
-            The name of the type of storage backend.
-          '';
-        };
-
-        extraConfig = mkOption {
-          type = types.lines;
-          default = "";
-          description = ''
-            Configuration for storage
-          '';
-        };
- 
+      storageConfig = mkOption {
+        type = types.lines;
+        description = "Storage configuration";
+        default = "";
       };
 
-
-      telemetry = {
-
-        disable_hostname = mkOption {
-          type =  types.bool;
-          default = false;
-          description = ''
-            Specifies if gauge values should be prefixed with the local hostname. 
-          '';
-        };
-
-        extraConfig = mkOption {
-          type = types.lines;
-          default = "";
-          description = ''
-            configuration for telemetry
-          '';
-        };        
-
+      telemetryConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Telemetry configuration";
       };
-
     };
-
   };
 
   config = mkIf cfg.enable {
 
-    systemd.services.vault =
-    { description = "Vault server daemon";
+    users.extraUsers.vault = {
+      name = "vault";
+      group = "vault";
+      uid = config.ids.uids.vault;
+      description = "Vault daemon user";
+    };
+    users.extraGroups.vault.gid = config.ids.gids.vault;
+
+    systemd.services.vault = {
+      description = "Vault server daemon";
 
       wantedBy = ["multi-user.target"];
+      after = [ "network.target" ];
 
-      preStart =
-        ''
-          mkdir -m 0755 -p /var/lib/vault
-        '';
+      preStart = ''
+        mkdir -m 0755 -p /var/lib/vault
+        chown -R vault:vault /var/lib/vault
 
-      serviceConfig =
-        { ExecStart =
-            "${pkgs.vault}/bin/vault server -config ${configFile}";
-          KillMode = "process";
-        };
-    };   
+        # generate a self-signed certificate, you will have to set environment variable "VAULT_SKIP_VERIFY=1" in the client
+        if [ ! -s ${cfg.tlsCertFile} -o ! -s ${cfg.tlsKeyFile} ]; then
+          mkdir -p $(dirname ${cfg.tlsCertFile}) || true
+          mkdir -p $(dirname ${cfg.tlsKeyFile }) || true
+          ${pkgs.openssl.bin}/bin/openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 99999 \
+            -subj /C=US/ST=NY/L=NYC/O=vault/CN=${cfg.address} \
+            -keyout ${cfg.tlsKeyFile} -out ${cfg.tlsCertFile}
+
+          chown root:vault ${cfg.tlsKeyFile} ${cfg.tlsCertFile}
+          chmod 440 ${cfg.tlsKeyFile} ${cfg.tlsCertFile}
+        fi
+      '';
+
+      serviceConfig = {
+        User = "vault";
+        Group = "vault";
+        PermissionsStartOnly = true;
+        ExecStart = "${pkgs.vault}/bin/vault server -config ${configFile}";
+        PrivateDevices = true;
+        PrivateTmp = true;
+        ProtectSystem = "full";
+        ProtectHome = "read-only";
+        AmbientCapabilities = "cap_ipc_lock";
+        NoNewPrivileges = true;
+        KillSignal = "SIGINT";
+        TimeoutStopSec = "30s";
+        Restart = "on-failure";
+        StartLimitInterval = "60s";
+        StartLimitBurst = 3;
+      };
+    };
   };
 
 }
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 6e8128ec00f..2c8f24cf8bd 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,7 +9,7 @@ let
   };
 in buildGoPackage rec {
   name = "vault-${version}";
-  version = "0.7.2";
+  version = "0.7.3";
 
   goPackagePath = "github.com/hashicorp/vault";
 
@@ -17,7 +17,7 @@ in buildGoPackage rec {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1kclpyb9a9y5zjvrlbxnkac4fl3lwqsr98v4yydf9ihl5v7wy4f5";
+    sha256 = "15wj1pfgzwzjfrqy7b5bx4y9f0hbpqlfif58l5xamwm88229qk4m";
   };
 
   buildFlagsArray = ''

From 899e2b5748e7c2ea0a4f5c2dde74b15f15fe7e69 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@gmail.com>
Date: Tue, 27 Jun 2017 22:09:05 +0200
Subject: [PATCH 0107/3246] Force check the filesystem before resizing

The message buffer of the kernel lists
> Please run 'e2fsck -f /dev/disk/by-label/nixos' first.
as the output of the command `resize2fs "$device"`.
This fixes NixOS/nixpkgs#26910.
---
 nixos/modules/system/boot/stage-1-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 9a125dcb0ae..1f4ab3eae07 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -301,6 +301,7 @@ mountFS() {
         *x-nixos.autoresize*)
             if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then
                 echo "resizing $device..."
+                e2fsck -fp "$device"
                 resize2fs "$device"
             fi
             ;;

From d016ef1f5be81bfcb58ad745e2127d8ec9d52cc3 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 27 Jun 2017 19:32:11 +0000
Subject: [PATCH 0108/3246] create directory only for "file" storage

---
 nixos/modules/services/security/vault.nix | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index dc06f89cce8..2f4935ee1a3 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -57,7 +57,7 @@ in
       };
 
       storageBackend = mkOption {
-        type = types.enum ["inmem" "consul" "zookeeper" "file" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs"];
+        type = types.enum ["inmem" "inmem_transactional" "inmem_ha" "inmem_transactional_ha" "file_transactional" "consul" "zookeeper" "file" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs"];
         default = "inmem";
         description = "The name of the type of storage backend";
       };
@@ -65,7 +65,10 @@ in
       storageConfig = mkOption {
         type = types.lines;
         description = "Storage configuration";
-        default = "";
+        default = if (cfg.storageBackend == "file" || cfg.storageBackend == "file_transactional") then ''
+                    path = "/var/lib/vault"
+                  '' else ''
+                  '';
       };
 
       telemetryConfig = mkOption {
@@ -92,10 +95,18 @@ in
       wantedBy = ["multi-user.target"];
       after = [ "network.target" ];
 
-      preStart = ''
-        mkdir -m 0755 -p /var/lib/vault
-        chown -R vault:vault /var/lib/vault
-
+      preStart =
+        optionalString (cfg.storageBackend == "file" || cfg.storageBackend == "file_transactional")
+          (let
+            matched = builtins.match ''.*path[ ]*=[ ]*"([^"]+)".*'' (toString cfg.storageConfig);
+            path = if matched == null then
+                     throw ''`storageBackend` "${cfg.storageBackend}" requires path in `storageConfig`''
+                   else
+                     head matched;
+          in ''
+            [ -d "${path}"] || install -d -m0700 -o vault -g vault "${path}"
+          '') +
+      ''
         # generate a self-signed certificate, you will have to set environment variable "VAULT_SKIP_VERIFY=1" in the client
         if [ ! -s ${cfg.tlsCertFile} -o ! -s ${cfg.tlsKeyFile} ]; then
           mkdir -p $(dirname ${cfg.tlsCertFile}) || true

From 69ecd62a955d8ddd640b2ebb94d451ce3318be7a Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Tue, 27 Jun 2017 16:19:49 -0700
Subject: [PATCH 0109/3246] Switched from phases to buildCommand, and moved
 makeWrapper to nativeBuildInputs as reccomended.

---
 .../networking/mailreaders/nylas-mail/default.nix        | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
index 47f633c7cfc..9073899fd6c 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
     else
       throw "NylasMail is not supported on ${stdenv.system}";
 
-  # Build dependencies
   propagatedBuildInputs = [
     alsaLib
     atk
@@ -82,12 +81,12 @@ stdenv.mkDerivation rec {
     xorg.libxkbfile
   ];
 
-  # Runtime dependencies
-  buildInputs = [ makeWrapper gnome2.gnome_keyring ];
 
-  phases = [ "unpackPhase" ];
+  buildInputs = [ gnome2.gnome_keyring ];
 
-  unpackPhase = ''
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
     mkdir -p $out
 
     ${dpkg}/bin/dpkg-deb -x $src unpacked

From 7330e804567e4cf05c3aac880a0518875f0a5b54 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 28 Jun 2017 00:58:19 +0000
Subject: [PATCH 0110/3246] vault: start after consul if consul is used as
 storage backend

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

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 2f4935ee1a3..1d93ff21007 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -93,7 +93,8 @@ in
       description = "Vault server daemon";
 
       wantedBy = ["multi-user.target"];
-      after = [ "network.target" ];
+      after = [ "network.target" ]
+           ++ optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
 
       preStart =
         optionalString (cfg.storageBackend == "file" || cfg.storageBackend == "file_transactional")

From 7f8e3f87b3d7bfd7a1ad32d155b411c809bfa7d2 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Tue, 13 Jun 2017 23:36:52 -0400
Subject: [PATCH 0111/3246] apt: init at 1.4.6

---
 pkgs/tools/package-management/apt/default.nix | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/tools/package-management/apt/default.nix

diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
new file mode 100644
index 00000000000..de1c2405076
--- /dev/null
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, lib, fetchzip, pkgconfig, cmake, perl, curl, gtest, lzma, bzip2 , lz4
+, db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45
+
+# used when WITH_DOC=ON
+, w3m
+, Po4a
+, doxygen
+
+# used when WITH_NLS=ON
+, gettext
+
+# opts
+, withDocs ? true
+, withNLS ? true
+}:
+
+stdenv.mkDerivation rec {
+  name = "apt-${version}";
+
+  version = "1.4.6";
+
+  src = fetchzip {
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/apt_${version}.tar.xz";
+    sha256 = "0ahwhmscrmnpvl1r732wg93dzkhv8c1sph2yrqgsrhr73c1616ix";
+  };
+
+  buildInputs = [
+    pkgconfig cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin
+  ] ++ lib.optionals withDocs [
+    doxygen Po4a w3m
+  ] ++ lib.optionals withNLS [
+    gettext
+  ];
+
+  preConfigure = ''
+    export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";
+
+    cmakeFlagsArray+=(
+      -DBERKELEY_DB_INCLUDE_DIRS="${db}"/include
+      -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl
+      -DROOT_GROUP=root
+      -DWITH_DOC=${if withDocs then "ON" else "OFF"}
+      -DUSE_NLS=${if withNLS then "ON" else "OFF"}
+    )
+
+    for f in doc/*; do
+      if [[ -f "$f" ]]; then
+        substituteInPlace "$f" \
+          --replace \
+            "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+            "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd"
+      fi
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "";
+    homepage = "https://launchpad.net/ubuntu/+source/apt";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff58787a286..e10d8143034 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -523,6 +523,10 @@ with pkgs;
 
   apg = callPackage ../tools/security/apg { };
 
+  apt = callPackage ../tools/package-management/apt {
+    inherit (perlPackages) Po4a;
+  };
+
   autorevision = callPackage ../tools/misc/autorevision { };
 
   bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };

From e149f0234451e6ac714492076e5796546a2b035b Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Tue, 27 Jun 2017 22:33:18 -0700
Subject: [PATCH 0112/3246] Using pname and fetching versions

---
 .../ruby-modules/bundled-common/default.nix   | 24 +++++++++++++++----
 .../ruby-modules/bundler-app/default.nix      |  9 +++----
 .../ruby-modules/bundler-env/default.nix      |  7 +-----
 pkgs/development/tools/corundum/default.nix   |  2 +-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 6e7bd7a898b..09eb36a247a 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -5,8 +5,8 @@
 }@defs:
 
 {
-  name
-, pname ? name
+  name ? null
+, pname ? null
 , mainGemName ? null
 , gemdir ? null
 , gemfile ? null
@@ -22,6 +22,8 @@
 , ...
 }@args:
 
+assert name == null -> pname != null;
+
 with  import ./functions.nix { inherit lib gemConfig; };
 
 let
@@ -43,6 +45,20 @@ let
 
   gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
 
+  name' = if name != null then
+    name
+  else
+    let
+      gem = gems."${pname}";
+      version = gem.version;
+    in
+      "${pname}-${version}";
+
+  pname' = if pname != null then
+    pname
+  else
+    name;
+
   copyIfBundledByPath = { bundledByPath ? false, ...}@main:
   (if bundledByPath then
       assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/"
@@ -78,9 +94,9 @@ let
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
 
   basicEnv = buildEnv {
-    inherit ignoreCollisions;
+    inherit  ignoreCollisions;
 
-    name = if name == null then pname else name;
+    name = name';
 
     paths = envPaths;
     pathsToLink = [ "/lib" ];
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index a5308b79ff3..99d1dd64dc4 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -7,10 +7,11 @@
 # (shell)> bundix
 # Then use rubyTool in the default.nix:
 
-# rubyTool { name = "gemifiedTool"; gemdir = ./.; exes = ["gemified-tool"]; }
+# rubyTool { pname = "gemifiedTool"; gemdir = ./.; exes = ["gemified-tool"]; }
 # The 'exes' parameter ensures that a copy of e.g. rake doesn't polute the system.
 {
-  name
+  # use the name of the name in question; its version will be picked up from the gemset
+  pname
   # gemdir is the location of the Gemfile{,.lock} and gemset.nix; usually ./.
 , gemdir
   # Exes is the list of executables provided by the gems in the Gemfile
@@ -30,10 +31,10 @@
 let
   basicEnv = (callPackage ../bundled-common {}) args;
 
-  cmdArgs = removeAttrs args [ "name" "postBuild" ]
+  cmdArgs = removeAttrs args [ "pname" "postBuild" ]
   // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
 in
-   runCommand name cmdArgs ''
+   runCommand basicEnv.name cmdArgs ''
     mkdir -p $out/bin;
       ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)}
       ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " +
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 7d175cfeccb..2e2653621a7 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -22,11 +22,6 @@
 let
   inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
 
-  drvName =
-    if name != null then lib.traceVal name
-    else if pname != null then "${toString pname}-${basicEnv.gems."${pname}".version}"
-    else throw "bundlerEnv: either pname or name must be set";
-
   basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name; mainGemName = pname; });
 
   inherit (basicEnv) envPaths;
@@ -48,7 +43,7 @@ in
     (buildEnv {
       inherit ignoreCollisions;
 
-      name = drvName;
+      name = basicEnv.name;
 
       paths = envPaths;
       pathsToLink = [ "/lib" ];
diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix
index b7c0006a7b5..e149a25859a 100644
--- a/pkgs/development/tools/corundum/default.nix
+++ b/pkgs/development/tools/corundum/default.nix
@@ -1,4 +1,4 @@
-{ lib, rubyTool }:
+{ lib, bundlerApp }:
 
 bundlerApp {
   pname = "corundum";

From fdb90f6df720b44f0475e42657a2f6c09797b42a Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Mon, 17 Apr 2017 17:00:23 +0000
Subject: [PATCH 0113/3246] pharo: 5.0 -> 6.0

Create a new set of VM packages to keep up with changes in the
upstream Pharo project.
---
 pkgs/development/pharo/launcher/default.nix   |  19 ++-
 pkgs/development/pharo/vm/build-vm-legacy.nix |  72 ++++++++++
 pkgs/development/pharo/vm/build-vm.nix        | 133 +++++++++++-------
 pkgs/development/pharo/vm/default.nix         |  36 ++---
 pkgs/development/pharo/vm/wrapper.sh          |  62 ++++++++
 pkgs/development/pharo/wrapper/default.nix    |  58 ++++++++
 pkgs/development/pharo/wrapper/magic          |  37 +++++
 pkgs/development/pharo/wrapper/pharo-vm.sh    |  57 ++++++++
 pkgs/top-level/all-packages.nix               |   9 +-
 9 files changed, 392 insertions(+), 91 deletions(-)
 create mode 100644 pkgs/development/pharo/vm/build-vm-legacy.nix
 create mode 100644 pkgs/development/pharo/vm/wrapper.sh
 create mode 100644 pkgs/development/pharo/wrapper/default.nix
 create mode 100644 pkgs/development/pharo/wrapper/magic
 create mode 100644 pkgs/development/pharo/wrapper/pharo-vm.sh

diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 911680b1eb8..a54a6671d7f 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }:
+{ stdenv, fetchurl, bash, pharo, unzip, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.9-2016.01.14";
+  version = "2017.02.28";
   name = "pharo-launcher-${version}";
   src = fetchurl {
-    url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip";
-    sha256 = "0lzdnaw7l1rrzbrq53xsy38aiz6id5x7s78ds1dhb31vqc241yy8";
+    url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip";
+    sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0";
   };
 
   executable-name = "pharo-launcher";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   # because upstream tarball has no top-level directory.
   sourceRoot = ".";
 
-  buildInputs = [ bash pharo-vm unzip ];
+  buildInputs = [ bash pharo unzip ];
 
   installPhase = ''
     mkdir -p $prefix/share/pharo-launcher
@@ -37,8 +37,7 @@ stdenv.mkDerivation rec {
 
     cat > $prefix/bin/${executable-name} <<EOF
     #!${bash}/bin/bash
-
-    exec ${pharo-vm}/bin/pharo-vm-x $prefix/share/pharo-launcher/pharo-launcher.image
+    exec ${pharo}/bin/pharo $prefix/share/pharo-launcher/pharo-launcher.image
     EOF
     chmod +x $prefix/bin/${executable-name}
   '';
@@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
      secs=5
      echo -n "Running headless Pharo for $secs seconds to check for a crash... "
      timeout $secs \
-       ${pharo-vm}/bin/pharo-vm-nox PharoLauncher.image --no-quit eval 'true'
+       ${pharo}/bin/pharo -nodisplay PharoLauncher.image --no-quit eval 'true'
      test "$?" == 124 && echo "ok")
   '';
 
@@ -78,7 +77,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.lukego ];
-    platforms = pharo-vm.meta.platforms;
+    maintainers = [ ];
+    platforms = pharo.meta.platforms;
   };
 }
diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix
new file mode 100644
index 00000000000..111b985bdb3
--- /dev/null
+++ b/pkgs/development/pharo/vm/build-vm-legacy.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, ... }:
+
+{ name, src, ... }:
+
+stdenv.mkDerivation rec {
+
+  inherit name src;
+
+  pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
+
+  hardeningDisable = [ "format" "pic" ];
+
+  # Building
+  preConfigure = ''
+    cd build/
+  '';
+  resources = ./resources;
+  installPhase = ''
+    mkdir -p "$prefix/lib/$name"
+
+    cd ../../results
+
+    mv vm-display-null vm-display-null.so
+    mv vm-display-X11 vm-display-X11.so
+    mv vm-sound-null vm-sound-null.so
+    mv vm-sound-ALSA vm-sound-ALSA.so
+    mv pharo pharo-vm
+
+    cp * "$prefix/lib/$name"
+
+    mkdir $prefix/bin
+
+    chmod u+w $prefix/bin
+    cat > $prefix/bin/pharo-cog <<EOF
+    #!${bash}/bin/bash
+    # disable parameter expansion to forward all arguments unprocessed to the VM
+    set -f
+    exec $prefix/lib/$name/pharo-vm "\$@"
+    EOF
+
+    chmod +x $prefix/bin/pharo-cog
+
+    ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name
+  '';
+
+  buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
+
+  meta = {
+    description = "Clean and innovative Smalltalk-inspired environment";
+    longDescription = ''
+      Pharo's goal is to deliver a clean, innovative, free open-source
+      Smalltalk-inspired environment. By providing a stable and small core
+      system, excellent dev tools, and maintained releases, Pharo is an
+      attractive platform to build and deploy mission critical applications.
+
+      This package provides the executable VM. You should probably not care
+      about this package (which represents a packaging detail) and have a
+      look at the pharo-vm-core package instead.
+
+      Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu
+      packaging (ppa:pharo/stable)' project.
+    '';
+    homepage = http://pharo.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.lukego ];
+    # Pharo VM sources are packaged separately for darwin (OS X)
+    platforms = with stdenv.lib;
+                  intersectLists
+                    platforms.mesaPlatforms
+                    (subtractLists platforms.darwin platforms.unix);
+  };
+}
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 1f9e82f866e..02399ecb9c2 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -1,76 +1,103 @@
-{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, makeDesktopItem }:
+{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc6, ... }:
 
-{ name, src, binary-basename, ... }:
+{ name, src, version, source-date, source-url, ... }:
 
+# Build the Pharo VM
 stdenv.mkDerivation rec {
+  inherit name src;
 
-  inherit name src binary-basename;
+  # Command line invocation name.
+  # Distinct name for 64-bit builds because they only work with 64-bit images.
+  cmd = if stdenv.is64bit then "pharo-spur64" else "pharo-spur";
 
+  # Choose desired VM sources. Separate for 32-bit and 64-bit VM.
+  # (Could extent to building more VM variants e.g. SpurV3, Sista, etc.)
+  vm = if stdenv.is64bit then "spur64src" else "spursrc";
+
+  # Choose target platform name in the format used by the vm.
+  flavor =
+    if      stdenv.isLinux && stdenv.isi686    then "linux32x86"
+    else if stdenv.isLinux && stdenv.isx86_64  then "linux64x64"
+    else if stdenv.isDarwin && stdenv.isi686   then "macos32x86"
+    else if stdenv.isDarwin && stdenv.isx86_64 then "macos64x64"
+    else abort "Unsupported platform: only Linux/Darwin x86/x64 are supported.";
+
+  # Shared data (for the sources file)
   pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
 
-  desktopItem = makeDesktopItem {
-    inherit name;
-    desktopName = "Pharo VM";
-    genericName = "Pharo Virtual Machine";
-    exec = "${binary-basename}-x %F";
-    icon = "pharo";
-    terminal = "false";
-    type="Application";
-    startupNotify = "false";
-    categories = "Development;";
-    mimeType = "application/x-pharo-image";
-  };
-
+  # Note: -fPIC causes the VM to segfault.
   hardeningDisable = [ "format" "pic" ];
 
-  # Building
+  # Regenerate the configure script.
+  # Unnecessary? But the build breaks without this.
+  autoreconfPhase = ''
+    (cd opensmalltalk-vm/platforms/unix/config && make)
+  '';
+
+  # Configure with options modeled on the 'mvm' build script from the vm.
+  configureScript = "platforms/unix/config/configure";
+  configureFlags = [ "--without-npsqueak"
+                     "--with-vmversion=5.0"
+                     "--with-src=${vm}" ];
+  CFLAGS = "-msse2 -D_GNU_SOURCE -DCOGMTVM=0 -g -O2 -DNDEBUG -DDEBUGVM=0";
+  LDFLAGS = "-Wl,-z,now";
+
+  # VM sources require some patching before build.
+  prePatch = ''
+    patchShebangs opensmalltalk-vm/build.${flavor}
+    # Fix hard-coded path to /bin/rm in a script
+    sed -i -e 's:/bin/rm:rm:' opensmalltalk-vm/platforms/unix/config/mkmf
+    # Fill in mandatory metadata about the VM source version
+    sed -i -e 's!\$Date\$!$Date: ${source-date} $!' \
+           -e 's!\$Rev\$!$Rev: ${version} $!' \
+           -e 's!\$URL\$!$URL: ${source-url} $!' \
+           opensmalltalk-vm/platforms/Cross/vm/sqSCCSVersion.h
+  '';
+
+  # Note: --with-vmcfg configure option is broken so copy plugin specs to ./
   preConfigure = ''
-    cd build/
+    cd opensmalltalk-vm
+    cp build.${flavor}/pharo.cog.spur/plugins.{ext,int} .
   '';
-  resources = ./resources;
+
+  # (No special build phase.)
+
   installPhase = ''
-    mkdir -p "$prefix/lib/$name"
+    # Install in working directory and then copy
+    make install-squeak install-plugins prefix=$(pwd)/products
 
-    cd ../../results
+    # Copy binaries & rename from 'squeak' to 'pharo'
+    mkdir -p $out
+    cp    products/lib/squeak/5.0-*/squeak $out/pharo
 
-    mv vm-display-null vm-display-null.so
-    mv vm-display-X11 vm-display-X11.so
-    mv vm-sound-null vm-sound-null.so
-    mv vm-sound-ALSA vm-sound-ALSA.so
-    mv pharo pharo-vm
+    cp -r products/lib/squeak/5.0-*/*.so $out
+    ln -s "${pharo-share}/lib/"*.sources $out
 
-    cp * "$prefix/lib/$name"
+    # Create a shell script to run the VM in the proper environment.
+    # 
+    # These wrapper puts all relevant libraries into the
+    # LD_LIBRARY_PATH. This is important because various C code in the VM
+    # and Smalltalk code in the image will search for them there.
+    mkdir -p $out/bin
+    chmod u+w $out/bin
 
-    mkdir -p "$prefix/share/applications"
-    cp "${desktopItem}/share/applications/"* $prefix/share/applications
+    # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc.
+    libs=$out:$(patchelf --print-rpath $out/pharo):${cairo}/lib:${mesa}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib
 
-    mkdir $prefix/bin
-
-    chmod u+w $prefix/bin
-    cat > $prefix/bin/${binary-basename}-x <<EOF
-    #!${bash}/bin/bash
-
-    # disable parameter expansion to forward all arguments unprocessed to the VM
+    # Create the script
+    cat > $out/bin/${cmd} <<EOF
+    #!/bin/sh
     set -f
-
-    exec $prefix/lib/$name/pharo-vm "\$@"
+    LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:$libs" exec $out/pharo "\$@"
     EOF
-
-    cat > $prefix/bin/${binary-basename}-nox <<EOF
-    #!${bash}/bin/bash
-
-    # disable parameter expansion to forward all arguments unprocessed to the VM
-    set -f
-
-    exec $prefix/lib/$name/pharo-vm -vm-display-null "\$@"
-    EOF
-
-    chmod +x $prefix/bin/${binary-basename}-x $prefix/bin/${binary-basename}-nox
-
-    ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name
+    chmod +x $prefix/bin/${cmd}
   '';
 
-  buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
+  enableParallelBuilding = true;
+
+  # Note: Force gcc6 because gcc5 crashes when compiling the VM.
+  buildInputs = [ bash unzip glibc openssl gcc6 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid autoreconfHook ];
+
 
   meta = {
     description = "Clean and innovative Smalltalk-inspired environment";
@@ -89,7 +116,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.lukego ];
     # Pharo VM sources are packaged separately for darwin (OS X)
     platforms = with stdenv.lib;
                   intersectLists
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index aca5c37d265..6d84981e7ad 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -1,27 +1,15 @@
-{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, makeDesktopItem } @args:
+{ stdenv, callPackage, callPackage_i686, ...} @pkgs:
+
+let
+  i686    = callPackage_i686 ./vms.nix {};
+  native  = callPackage ./vms.nix {};
+in
 
 rec {
-  pharo-vm-build = import ./build-vm.nix args;
-
-  base-url = http://files.pharo.org/vm/src/vm-unix-sources/blessed;
-
-  pharo-no-spur = pharo-vm-build rec {
-    version = "2016.02.18";
-    name = "pharo-vm-i386-${version}";
-    binary-basename = "pharo-vm";
-    src = fetchurl {
-      url = "${base-url}/pharo-vm-${version}.tar.bz2";
-      sha256 = "16n2zg7v2s1ml0vvpbhkw6khmgn637sr0d7n2b28qm5yc8pfhcj4";
-    };
-  };
-
-  pharo-spur = pharo-vm-build rec {
-    version = "2016.07.16";
-    name = "pharo-vm-spur-i386-${version}";
-    binary-basename = "pharo-spur-vm";
-    src = fetchurl {
-      url = "${base-url}/pharo-vm-spur-${version}.tar.bz2";
-      sha256 = "07nk4w5wh7gcf27cch5paqp9zdlshnknpv4y7imxlkjd76viac2b";
-    };
-  };
+  cog32 = i686.cog;
+  spur32 = i686.spur;
+  spur64 = if stdenv.is64bit then native.spur else "none";
+  multi-vm-wrapper  = callPackage ../wrapper { inherit cog32 spur32 spur64; };
 }
+
+
diff --git a/pkgs/development/pharo/vm/wrapper.sh b/pkgs/development/pharo/vm/wrapper.sh
new file mode 100644
index 00000000000..b08a1a6d128
--- /dev/null
+++ b/pkgs/development/pharo/vm/wrapper.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+# This is based on the script by David T. Lewis posted here:
+#  http://lists.squeakfoundation.org/pipermail/vm-dev/2017-April/024836.html
+#
+# VM run utility script
+# usage: run <myimage>
+#
+# Select a VM and run an image based on the image format number
+
+# Search for the image filename in the command line arguments
+for arg in $*; do
+    case ${arg} in
+        -*) # ignore
+        ;;
+        *) # either an option argument or the image name
+            if test -f ${arg}; then
+                magic=$(file -m @share@/magic "$arg")
+                case "$magic" in
+                    'Smalltalk image V3 32b*')
+                        image=${arg}
+                        vm=@cog-vm@/bin/pharo-cog
+                        ;;
+                    'Smalltalk image Spur 32b*')
+                        image=${arg}
+                        vm=@spur-vm@/bin/pharo-spur
+                        ;;
+                    'Smalltalk image Spur 64b*')
+                        if "@spur64-vm@" == "none"; then
+                            echo "error: detected 64-bit image but 64-bit VM is not available" >&2
+                            exit 1
+                        fi
+                        image=${arg}
+                        vm=@spur64-vm@/bin/pharo-spur64
+                        ;;
+                esac
+            fi
+            ;;
+    esac
+done
+
+# Extra arguments to pass to the VM
+args=""
+
+# Print a message to explain our DWIM'ery.
+if -n "$image"; then
+    echo "using VM selected by image type."
+    echo "  image: $image"
+    echo "  type:  $magic"
+    echo "  vm:    $vm"
+elif test "$#" == 0; then
+    echo "using default vm and image; none specified on command line"
+    args="@default-image@"
+    # XXX Just assume this is the right VM (for pharo launcher)
+    vm=@cog-vm@/bin/pharo-cog
+else
+    echo "using default vm; image type not detected"
+fi
+
+# Run the VM
+set -f
+exec ${vm} $args "$@"
+
diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix
new file mode 100644
index 00000000000..bd37c31df6a
--- /dev/null
+++ b/pkgs/development/pharo/wrapper/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }:
+
+stdenv.mkDerivation rec {
+  name = "pharo-vm";
+  src = ./.;
+  inherit cog32 spur32 spur64 file;
+  magic = ./magic;
+  desktopItem = makeDesktopItem {
+    inherit name;
+    desktopName = "Pharo VM";
+    genericName = "Pharo Virtual Machine";
+    exec = "pharo %F";
+    icon = "pharo";
+    terminal = "false";
+    type="Application";
+    startupNotify = "false";
+    categories = "Development;";
+    mimeType = "application/x-pharo-image";
+  };
+  buildPhase = ''
+    substituteAllInPlace ./pharo-vm.sh
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pharo-vm.sh $out/bin/pharo
+    chmod +x $out/bin/pharo
+  '';
+  meta = {
+    description = "Pharo virtual machine (multiple variants)";
+
+    longDescription = ''
+      Pharo's goal is to deliver a clean, innovative, free open-source
+      Smalltalk-inspired environment. By providing a stable and small core
+      system, excellent dev tools, and maintained releases, Pharo is an
+      attractive platform to build and deploy mission critical applications.
+
+      This package provides a front-end for starting the virtual
+      machine. The command 'pharo-vm' automatically detects the type
+      of image and executes a suitable virtual machine: CogV3, Spur,
+      or Spur64. This makes it easy to open Pharo images because you
+      do not have to worry about which virtual machine variant is
+      required.
+
+      More about the Cog family of virtual machines:
+        http://www.mirandabanda.org/cogblog/about-cog/
+    '';
+
+    homepage = http://pharo.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.lukego ];
+    # Pharo VM sources are packaged separately for darwin (OS X)
+    platforms = with stdenv.lib;
+                  intersectLists
+                    platforms.mesaPlatforms
+                    (subtractLists platforms.darwin platforms.unix);
+  };
+}
+
diff --git a/pkgs/development/pharo/wrapper/magic b/pkgs/development/pharo/wrapper/magic
new file mode 100644
index 00000000000..3870ef2dd01
--- /dev/null
+++ b/pkgs/development/pharo/wrapper/magic
@@ -0,0 +1,37 @@
+# Smalltalk image file formats
+0 lelong    6502  Smalltalk image V3 32b  (%d)
+!:mime application/squeak-image
+0      belong   6502    Smalltalk image V3 32b  (%d)
+!:mime application/squeak-image
+0      lelong   6504    Smalltalk image V3 32b +C (%d)
+!:mime application/cog-image
+0      belong   6504    Smalltalk image V3 32b +C (%d)
+!:mime application/cog-image
+0      lelong   68000   Smalltalk image V3 64b  (%d)
+!:mime application/squeak64-image
+4      belong   68000   Smalltalk image V3 64b  (%d)
+!:mime application/squeak64-image
+0      lelong   68002   Smalltalk image V3 64b +C (%d)
+!:mime application/cog64-image
+4      belong   68002   Smalltalk image V3 64b +C (%d)
+!:mime application/cog64-image
+0      lelong   6505    Smalltalk image V3 32b +C+NF (%d)
+!:mime application/cog-image
+0      belong   6505    Smalltalk image V3 32b +C+NF (%d)
+!:mime application/cog-image
+0      lelong   68003   Smalltalk image V3 64b +C+NF (%d)
+!:mime application/cog64-image
+4      belong   68003   Smalltalk image V3 64b +C+NF (%d)
+!:mime application/cog64-image
+0      lelong   6521    Smalltalk image Spur 32b +C+NF (%d)
+!:mime application/spur-image
+0      belong   6521    Smalltalk image Spur 32b +C+NF (%d)
+!:mime application/spur-image
+0      lelong   68019   Smalltalk image Spur 64b +C+NF (%d)
+!:mime application/spur64-image
+4      belong   68019   Smalltalk image Spur 64b +C+NF (%d)
+!:mime application/spur64-image
+0      lelong   68021   Smalltalk image Spur 64b +C+NF+Tag (%d)
+!:mime application/spur64-image
+4      belong   68021   Smalltalk image Spur 64b +C+NF+Tag (%d)
+!:mime application/spur64-image
diff --git a/pkgs/development/pharo/wrapper/pharo-vm.sh b/pkgs/development/pharo/wrapper/pharo-vm.sh
new file mode 100644
index 00000000000..7ccab99cd76
--- /dev/null
+++ b/pkgs/development/pharo/wrapper/pharo-vm.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# This is based on the script by David T. Lewis posted here:
+#  http://lists.squeakfoundation.org/pipermail/vm-dev/2017-April/024836.html
+#
+# VM run utility script
+# usage: run <myimage>
+#
+# Select a VM and run an image based on the image format number
+
+PATH=$PATH:@file@/bin
+
+# Search for the image filename in the command line arguments
+for arg in $* $SQUEAK_IMAGE; do
+    case ${arg} in
+        -*) # ignore
+        ;;
+        *) # either an option argument or the image name
+            if test -e ${arg}; then
+                magic=$(file -L -b -m @magic@ "$arg")
+                case "$magic" in
+                    "Smalltalk image V3 32b"*)
+                        image=${arg}
+                        vm=@cog32@/bin/pharo-cog
+                        ;;
+                    "Smalltalk image Spur 32b"*)
+                        image=${arg}
+                        vm=@spur32@/bin/pharo-spur
+                        ;;
+                    "Smalltalk image Spur 64b"*)
+                        if [ "@spur64vm@" == "none" ]; then
+                            echo "error: detected 64-bit image but 64-bit VM is not available" >&2
+                            exit 1
+                        fi
+                        image=${arg}
+                        vm=@spur64@/bin/pharo-spur64
+                        ;;
+                esac
+            fi
+            ;;
+    esac
+done
+
+# Print a message to explain our DWIM'ery.
+if [ -n "$image" ]; then
+    echo "using VM selected by image type."
+    echo "  image: $image"
+    echo "  type:  $magic"
+    echo "  vm:    $vm"
+else
+    echo "using default vm; image type not detected"
+    vm=@cog32@/bin/pharo-cog
+fi
+
+# Run the VM
+set -f
+exec -- ${vm} $@
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d80777adc54..0a16148b1f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6383,10 +6383,11 @@ with pkgs;
 
   guile-xcb = callPackage ../development/guile-modules/guile-xcb { };
 
-  pharo-vms = callPackage_i686 ../development/pharo/vm { };
-  pharo-vm  = pharo-vms.pharo-no-spur;
-  pharo-vm5 = pharo-vms.pharo-spur;
-
+  pharo-vms = callPackage ../development/pharo/vm { };
+  pharo = pharo-vms.multi-vm-wrapper;
+  pharo-cog32 = pharo-vms.cog32;
+  pharo-spur32 = pharo-vms.spur32;
+  pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64;
   pharo-launcher = callPackage ../development/pharo/launcher { };
 
   srecord = callPackage ../development/tools/misc/srecord { };

From 519f17035fed92f2cf4b8e40544e4d2ec9424fea Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 28 Jun 2017 01:15:20 +0000
Subject: [PATCH 0114/3246] vault: add unitConfig.RequiresMountsFor to systemd
 config

---
 nixos/modules/services/security/vault.nix | 30 +++++++++++++----------
 pkgs/tools/security/vault/default.nix     |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 1d93ff21007..5a195271994 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -79,7 +79,18 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = let
+    localDir = if (cfg.storageBackend == "file" || cfg.storageBackend == "file_transactional") then
+                 let
+                   matched = builtins.match ''.*path[ ]*=[ ]*"([^"]+)".*'' (toString cfg.storageConfig);
+                 in
+                   if matched == null then
+                     throw ''`storageBackend` "${cfg.storageBackend}" requires path in `storageConfig`''
+                   else
+                     head matched
+               else
+                 null;
+  in mkIf cfg.enable {
 
     users.extraUsers.vault = {
       name = "vault";
@@ -96,18 +107,9 @@ in
       after = [ "network.target" ]
            ++ optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
 
-      preStart =
-        optionalString (cfg.storageBackend == "file" || cfg.storageBackend == "file_transactional")
-          (let
-            matched = builtins.match ''.*path[ ]*=[ ]*"([^"]+)".*'' (toString cfg.storageConfig);
-            path = if matched == null then
-                     throw ''`storageBackend` "${cfg.storageBackend}" requires path in `storageConfig`''
-                   else
-                     head matched;
-          in ''
-            [ -d "${path}"] || install -d -m0700 -o vault -g vault "${path}"
-          '') +
-      ''
+      preStart = optionalString (localDir != null) ''
+        install -d -m0700 -o vault -g vault "${localDir}"
+      '' + ''
         # generate a self-signed certificate, you will have to set environment variable "VAULT_SKIP_VERIFY=1" in the client
         if [ ! -s ${cfg.tlsCertFile} -o ! -s ${cfg.tlsKeyFile} ]; then
           mkdir -p $(dirname ${cfg.tlsCertFile}) || true
@@ -138,6 +140,8 @@ in
         StartLimitInterval = "60s";
         StartLimitBurst = 3;
       };
+
+      unitConfig.RequiresMountsFor = optional (localDir != null) localDir;
     };
   };
 
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 2c8f24cf8bd..29fba280280 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 let
   vaultBashCompletions = fetchFromGitHub {

From 2056c7e39548a1106b2f0101fdfd3fb8b7510479 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 28 Jun 2017 22:08:36 +0000
Subject: [PATCH 0115/3246] removed generation of self-signed certificate

---
 nixos/modules/services/security/vault.nix | 32 +++++++++--------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 5a195271994..91d5810195a 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -7,8 +7,12 @@ let
   configFile = pkgs.writeText "vault.hcl" ''
     listener "tcp" {
       address = "${cfg.address}"
-      tls_cert_file = "${cfg.tlsCertFile}"
-      tls_key_file = "${cfg.tlsKeyFile}"
+      ${if (cfg.tlsCertFile == null || cfg.tlsKeyFile == null) then ''
+          tls_disable = "true"
+        '' else ''
+          tls_cert_file = "${cfg.tlsCertFile}"
+          tls_key_file = "${cfg.tlsKeyFile}"
+        ''}
       ${cfg.listenerExtraConfig}
     }
     storage "${cfg.storageBackend}" {
@@ -35,17 +39,17 @@ in
       };
 
       tlsCertFile = mkOption {
-        type = types.str;
-        default = "/etc/vault/cert.pem";
+        type = types.nullOr types.str;
+        default = null;
         example = "/path/to/your/cert.pem";
-        description = "TLS certificate file. A self-signed certificate will be generated if file not exists";
+        description = "TLS certificate file. TLS will be disabled unless this option is set";
       };
 
       tlsKeyFile = mkOption {
-        type = types.str;
-        default = "/etc/vault/key.pem";
+        type = types.nullOr types.str;
+        default = null;
         example = "/path/to/your/key.pem";
-        description = "TLS private key file. A self-signed certificate will be generated if file not exists";
+        description = "TLS private key file. TLS will be disabled unless this option is set";
       };
 
       listenerExtraConfig = mkOption {
@@ -109,18 +113,6 @@ in
 
       preStart = optionalString (localDir != null) ''
         install -d -m0700 -o vault -g vault "${localDir}"
-      '' + ''
-        # generate a self-signed certificate, you will have to set environment variable "VAULT_SKIP_VERIFY=1" in the client
-        if [ ! -s ${cfg.tlsCertFile} -o ! -s ${cfg.tlsKeyFile} ]; then
-          mkdir -p $(dirname ${cfg.tlsCertFile}) || true
-          mkdir -p $(dirname ${cfg.tlsKeyFile }) || true
-          ${pkgs.openssl.bin}/bin/openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 99999 \
-            -subj /C=US/ST=NY/L=NYC/O=vault/CN=${cfg.address} \
-            -keyout ${cfg.tlsKeyFile} -out ${cfg.tlsCertFile}
-
-          chown root:vault ${cfg.tlsKeyFile} ${cfg.tlsCertFile}
-          chmod 440 ${cfg.tlsKeyFile} ${cfg.tlsCertFile}
-        fi
       '';
 
       serviceConfig = {

From 3fddb48020aab9934752b1f19e5c35d7d3881a05 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Wed, 28 Jun 2017 15:56:41 -0700
Subject: [PATCH 0116/3246] Add Nylas mail module. Still needs keyring
 configuration

---
 nixos/modules/programs/nylas-mail.nix | 43 +++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 nixos/modules/programs/nylas-mail.nix

diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix
new file mode 100644
index 00000000000..d1427d89024
--- /dev/null
+++ b/nixos/modules/programs/nylas-mail.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.nylas-mail;
+  defaultUser = "nylas-mail";
+in {
+  ###### interface
+  options = {
+    services.nylas-mail = {
+
+      enable = mkEnableOption ''
+        nylas-mail - Open-source mail client built on the modern web with Electron, React, and Flux
+      '';
+
+      gnome3-keyring = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Enable gnome3 keyring for nylas-mail.";
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.nylas-mail;
+        defaultText = "pkgs.nylas-mail";
+        example = literalExample "pkgs.nylas-mail";
+        description = ''
+          nylas-mail package to use.
+        '';
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+
+
+  };
+}

From 9f4c3b2efd02447ffb403678e880cd3340aaaa48 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Wed, 28 Jun 2017 16:13:10 -0700
Subject: [PATCH 0117/3246] Add keyring enable option and add Nylas to
 systemPackages

---
 nixos/modules/programs/nylas-mail.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix
index d1427d89024..fc18a9a4760 100644
--- a/nixos/modules/programs/nylas-mail.nix
+++ b/nixos/modules/programs/nylas-mail.nix
@@ -19,16 +19,6 @@ in {
         default = true;
         description = "Enable gnome3 keyring for nylas-mail.";
       };
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.nylas-mail;
-        defaultText = "pkgs.nylas-mail";
-        example = literalExample "pkgs.nylas-mail";
-        description = ''
-          nylas-mail package to use.
-        '';
-      };
     };
   };
 
@@ -37,7 +27,11 @@ in {
 
   config = mkIf cfg.enable {
 
+    environment.systemPackages = [pkgs.nylas-mail];
 
+    services.gnome3.gnome-keyring = mkIf cfg.gnome3-keyring {
+      enable = true;
+    };
 
   };
 }

From ca16df17bd72fe8516a4a2dc6a18d3e9f86f89b0 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 29 Jun 2017 02:02:13 +0000
Subject: [PATCH 0118/3246] vault: build as Makefile project, not as Go package

---
 pkgs/tools/security/vault/default.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 29fba280280..a0437588309 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, go, gox }:
 
 let
   vaultBashCompletions = fetchFromGitHub {
@@ -7,12 +7,10 @@ let
     rev = "e2f59b64be1fa5430fa05c91b6274284de4ea77c";
     sha256 = "10m75rp3hy71wlmnd88grmpjhqy0pwb9m8wm19l0f463xla54frd";
   };
-in buildGoPackage rec {
+in stdenv.mkDerivation rec {
   name = "vault-${version}";
   version = "0.7.3";
 
-  goPackagePath = "github.com/hashicorp/vault";
-
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
@@ -20,14 +18,21 @@ in buildGoPackage rec {
     sha256 = "15wj1pfgzwzjfrqy7b5bx4y9f0hbpqlfif58l5xamwm88229qk4m";
   };
 
-  buildFlagsArray = ''
-    -ldflags=
-      -X github.com/hashicorp/vault/version.GitCommit=${version}
+  nativeBuildInputs = [ go gox ];
+
+  buildPhase = ''
+    substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
+
+    mkdir -p src/github.com/hashicorp
+    ln -s $(pwd) src/github.com/hashicorp/vault
+
+    GOPATH=$(pwd) make
   '';
 
-  postInstall = ''
-    mkdir -p $bin/share/bash-completion/completions/
-    cp ${vaultBashCompletions}/vault-bash-completion.sh $bin/share/bash-completion/completions/vault
+  installPhase = ''
+    mkdir -p $out/bin $out/share/bash-completion/completions
+    cp pkg/*/* $out/bin/
+    cp ${vaultBashCompletions}/vault-bash-completion.sh $out/share/bash-completion/completions/vault
   '';
 
   meta = with stdenv.lib; {

From 8181b075bac51fbce46a7b4d52e339b429f1250a Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Wed, 28 Jun 2017 22:29:49 -0700
Subject: [PATCH 0119/3246] Quoted NIX_CC

---
 .../networking/mailreaders/nylas-mail/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
index 9073899fd6c..b9d4be3e380 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
 
     # Patch binaries
     binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas)
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+    patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \
       --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
       $out/share/nylas-mail/nylas
 
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \
       --set PATH "${coreutils}/bin"
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+    patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \
       --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node
   '';
 

From fb62250664fef3c1a51a942a5b7c2fd97070166d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 29 Jun 2017 16:19:24 +0200
Subject: [PATCH 0120/3246] buku: Enabled tests and added shell completion

---
 pkgs/applications/misc/buku/default.nix | 30 ++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 72ba96ad701..18d59d12fba 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, pythonPackages, fetchFromGitHub,
-}:
+{ stdenv, pythonPackages, fetchFromGitHub }:
 
 with pythonPackages; buildPythonApplication rec {
   version = "3.0";
@@ -12,6 +11,13 @@ with pythonPackages; buildPythonApplication rec {
     sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax";
   };
 
+  buildInputs = [
+    pytestcov
+    pytest-catchlog
+    hypothesis
+    pytest
+  ];
+
   propagatedBuildInputs = [
     cryptography
     beautifulsoup4
@@ -19,13 +25,27 @@ with pythonPackages; buildPythonApplication rec {
     urllib3
   ];
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  preCheck = ''
+    # Fixes two tests for wrong encoding
+    export PYTHONIOENCODING=utf-8
+
+    # https://github.com/jarun/Buku/pull/167
+    substituteInPlace setup.py \
+      --replace "hypothesis==3.7.0" "hypothesis>=3.7.0"
+
+    # Disables a test which requires internet
+    substituteInPlace tests/test_bukuDb.py \
+      --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')"
+  '';
 
   installPhase = ''
     make install PREFIX=$out
-  '';
 
-  doCheck = false;
+    mkdir -p $out/share/zsh/site-functions $out/share/bash-completion/completions $out/share/fish/vendor_completions.d
+    cp auto-completion/zsh/* $out/share/zsh/site-functions
+    cp auto-completion/bash/* $out/share/bash-completion/completions
+    cp auto-completion/fish/* $out/share/fish/vendor_completions.d
+  '';
 
   meta = with stdenv.lib; {
     description = "Private cmdline bookmark manager";

From 54be67dbd03b0ede6dccce34581367995d3c1fd8 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Thu, 29 Jun 2017 18:09:06 +0000
Subject: [PATCH 0121/3246] pharo6: Minor fixes and cleanups

---
 pkgs/development/pharo/launcher/default.nix |  4 ++--
 pkgs/development/pharo/vm/build-vm.nix      | 25 ++++++++++-----------
 pkgs/development/pharo/wrapper/default.nix  |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index a54a6671d7f..9cec6e81ae6 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     cat > $prefix/bin/${executable-name} <<EOF
     #!${bash}/bin/bash
-    exec ${pharo}/bin/pharo $prefix/share/pharo-launcher/pharo-launcher.image
+    exec "${pharo}/bin/pharo" $prefix/share/pharo-launcher/pharo-launcher.image
     EOF
     chmod +x $prefix/bin/${executable-name}
   '';
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
      secs=5
      echo -n "Running headless Pharo for $secs seconds to check for a crash... "
      timeout $secs \
-       ${pharo}/bin/pharo -nodisplay PharoLauncher.image --no-quit eval 'true'
+       "${pharo}/bin/pharo" -nodisplay PharoLauncher.image --no-quit eval 'true'
      test "$?" == 124 && echo "ok")
   '';
 
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 02399ecb9c2..e2ed4dcb239 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -31,7 +31,9 @@ stdenv.mkDerivation rec {
   # Regenerate the configure script.
   # Unnecessary? But the build breaks without this.
   autoreconfPhase = ''
-    (cd opensmalltalk-vm/platforms/unix/config && make)
+    pushd opensmalltalk-vm/platforms/unix/config
+    make
+    popd
   '';
 
   # Configure with options modeled on the 'mvm' build script from the vm.
@@ -67,30 +69,28 @@ stdenv.mkDerivation rec {
     make install-squeak install-plugins prefix=$(pwd)/products
 
     # Copy binaries & rename from 'squeak' to 'pharo'
-    mkdir -p $out
-    cp    products/lib/squeak/5.0-*/squeak $out/pharo
-
-    cp -r products/lib/squeak/5.0-*/*.so $out
-    ln -s "${pharo-share}/lib/"*.sources $out
+    mkdir -p "$out"
+    cp products/lib/squeak/5.0-*/squeak "$out/pharo"
+    cp -r products/lib/squeak/5.0-*/*.so "$out"
+    ln -s "${pharo-share}/lib/"*.sources "$out"
 
     # Create a shell script to run the VM in the proper environment.
-    # 
+    #
     # These wrapper puts all relevant libraries into the
     # LD_LIBRARY_PATH. This is important because various C code in the VM
     # and Smalltalk code in the image will search for them there.
-    mkdir -p $out/bin
-    chmod u+w $out/bin
+    mkdir -p "$out/bin"
 
     # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc.
-    libs=$out:$(patchelf --print-rpath $out/pharo):${cairo}/lib:${mesa}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib
+    libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${mesa}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib
 
     # Create the script
-    cat > $out/bin/${cmd} <<EOF
+    cat > "$out/bin/${cmd}" <<EOF
     #!/bin/sh
     set -f
     LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:$libs" exec $out/pharo "\$@"
     EOF
-    chmod +x $prefix/bin/${cmd}
+    chmod +x "$out/bin/${cmd}"
   '';
 
   enableParallelBuilding = true;
@@ -98,7 +98,6 @@ stdenv.mkDerivation rec {
   # Note: Force gcc6 because gcc5 crashes when compiling the VM.
   buildInputs = [ bash unzip glibc openssl gcc6 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid autoreconfHook ];
 
-
   meta = {
     description = "Clean and innovative Smalltalk-inspired environment";
     longDescription = ''
diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix
index bd37c31df6a..f60b8a6d203 100644
--- a/pkgs/development/pharo/wrapper/default.nix
+++ b/pkgs/development/pharo/wrapper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }:
 
 stdenv.mkDerivation rec {
-  name = "pharo-vm";
+  name = "pharo";
   src = ./.;
   inherit cog32 spur32 spur64 file;
   magic = ./magic;

From 8761ef256fdb608e063802aa2053973355f55241 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Thu, 29 Jun 2017 18:09:16 +0000
Subject: [PATCH 0122/3246] pharo: Removed obsolete duplicate ofwrapper.sh

---
 pkgs/development/pharo/vm/wrapper.sh | 62 ----------------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 pkgs/development/pharo/vm/wrapper.sh

diff --git a/pkgs/development/pharo/vm/wrapper.sh b/pkgs/development/pharo/vm/wrapper.sh
deleted file mode 100644
index b08a1a6d128..00000000000
--- a/pkgs/development/pharo/vm/wrapper.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# This is based on the script by David T. Lewis posted here:
-#  http://lists.squeakfoundation.org/pipermail/vm-dev/2017-April/024836.html
-#
-# VM run utility script
-# usage: run <myimage>
-#
-# Select a VM and run an image based on the image format number
-
-# Search for the image filename in the command line arguments
-for arg in $*; do
-    case ${arg} in
-        -*) # ignore
-        ;;
-        *) # either an option argument or the image name
-            if test -f ${arg}; then
-                magic=$(file -m @share@/magic "$arg")
-                case "$magic" in
-                    'Smalltalk image V3 32b*')
-                        image=${arg}
-                        vm=@cog-vm@/bin/pharo-cog
-                        ;;
-                    'Smalltalk image Spur 32b*')
-                        image=${arg}
-                        vm=@spur-vm@/bin/pharo-spur
-                        ;;
-                    'Smalltalk image Spur 64b*')
-                        if "@spur64-vm@" == "none"; then
-                            echo "error: detected 64-bit image but 64-bit VM is not available" >&2
-                            exit 1
-                        fi
-                        image=${arg}
-                        vm=@spur64-vm@/bin/pharo-spur64
-                        ;;
-                esac
-            fi
-            ;;
-    esac
-done
-
-# Extra arguments to pass to the VM
-args=""
-
-# Print a message to explain our DWIM'ery.
-if -n "$image"; then
-    echo "using VM selected by image type."
-    echo "  image: $image"
-    echo "  type:  $magic"
-    echo "  vm:    $vm"
-elif test "$#" == 0; then
-    echo "using default vm and image; none specified on command line"
-    args="@default-image@"
-    # XXX Just assume this is the right VM (for pharo launcher)
-    vm=@cog-vm@/bin/pharo-cog
-else
-    echo "using default vm; image type not detected"
-fi
-
-# Run the VM
-set -f
-exec ${vm} $args "$@"
-

From bc81760a9216c65267016d4eb5bab4d51eaf8bd3 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 29 Jun 2017 20:38:14 +0200
Subject: [PATCH 0123/3246] buku: test & completions revision

---
 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 18d59d12fba..fea813021d2 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -11,7 +11,7 @@ with pythonPackages; buildPythonApplication rec {
     sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     pytestcov
     pytest-catchlog
     hypothesis
@@ -29,7 +29,7 @@ with pythonPackages; buildPythonApplication rec {
     # Fixes two tests for wrong encoding
     export PYTHONIOENCODING=utf-8
 
-    # https://github.com/jarun/Buku/pull/167
+    # Should be upstream, see https://github.com/jarun/Buku/pull/167
     substituteInPlace setup.py \
       --replace "hypothesis==3.7.0" "hypothesis>=3.7.0"
 

From 68bf28adaf4272b1540633fb65d848f152b028fa Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 29 Jun 2017 21:10:56 +0000
Subject: [PATCH 0124/3246] vault: services.vault.storagePath for the file
 backend

---
 nixos/modules/services/security/vault.nix | 45 ++++++++++++-----------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 91d5810195a..6b11248adb3 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -16,7 +16,8 @@ let
       ${cfg.listenerExtraConfig}
     }
     storage "${cfg.storageBackend}" {
-      ${cfg.storageConfig}
+      ${optionalString (cfg.storagePath   != null) ''path = "${cfg.storagePath}"''}
+      ${optionalString (cfg.storageConfig != null) cfg.storageConfig}
     }
     ${optionalString (cfg.telemetryConfig != "") ''
         telemetry {
@@ -61,18 +62,21 @@ in
       };
 
       storageBackend = mkOption {
-        type = types.enum ["inmem" "inmem_transactional" "inmem_ha" "inmem_transactional_ha" "file_transactional" "consul" "zookeeper" "file" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs"];
+        type = types.enum [ "inmem" "file" "consul" "zookeeper" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs" ];
         default = "inmem";
         description = "The name of the type of storage backend";
       };
 
+      storagePath = mkOption {
+        type = types.nullOr types.path;
+        default = if cfg.storageBackend == "file" then "/var/lib/vault" else null;
+        description = "Data directory for file backend";
+      };
+
       storageConfig = mkOption {
-        type = types.lines;
+        type = types.nullOr types.lines;
+        default = null;
         description = "Storage configuration";
-        default = if (cfg.storageBackend == "file" || cfg.storageBackend == "file_transactional") then ''
-                    path = "/var/lib/vault"
-                  '' else ''
-                  '';
       };
 
       telemetryConfig = mkOption {
@@ -83,18 +87,15 @@ in
     };
   };
 
-  config = let
-    localDir = if (cfg.storageBackend == "file" || cfg.storageBackend == "file_transactional") then
-                 let
-                   matched = builtins.match ''.*path[ ]*=[ ]*"([^"]+)".*'' (toString cfg.storageConfig);
-                 in
-                   if matched == null then
-                     throw ''`storageBackend` "${cfg.storageBackend}" requires path in `storageConfig`''
-                   else
-                     head matched
-               else
-                 null;
-  in mkIf cfg.enable {
+  config = mkIf cfg.enable {
+    assertions = [
+      { assertion = cfg.storageBackend == "inmem" -> (cfg.storagePath == null && cfg.storageConfig == null);
+        message = ''The "inmem" storage expects no services.vault.storagePath nor services.vault.storageConfig'';
+      }
+      { assertion = (cfg.storageBackend == "file" -> (cfg.storagePath != null && cfg.storageConfig == null)) && (cfg.storagePath != null -> cfg.storageBackend == "file");
+        message = ''You must set services.vault.storagePath only when using the "file" backend'';
+      }
+    ];
 
     users.extraUsers.vault = {
       name = "vault";
@@ -111,8 +112,8 @@ in
       after = [ "network.target" ]
            ++ optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
 
-      preStart = optionalString (localDir != null) ''
-        install -d -m0700 -o vault -g vault "${localDir}"
+      preStart = optionalString (cfg.storagePath != null) ''
+        install -d -m0700 -o vault -g vault "${cfg.storagePath}"
       '';
 
       serviceConfig = {
@@ -133,7 +134,7 @@ in
         StartLimitBurst = 3;
       };
 
-      unitConfig.RequiresMountsFor = optional (localDir != null) localDir;
+      unitConfig.RequiresMountsFor = optional (cfg.storagePath != null) cfg.storagePath;
     };
   };
 

From 86d3b59a951ccb0cd6d1750a002d0f5a951774da Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Fri, 30 Jun 2017 07:24:09 +0000
Subject: [PATCH 0125/3246] pharo: More quoting

---
 pkgs/development/pharo/vm/build-vm.nix     | 2 +-
 pkgs/development/pharo/wrapper/pharo-vm.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index e2ed4dcb239..2f2db1293c7 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   # Note: --with-vmcfg configure option is broken so copy plugin specs to ./
   preConfigure = ''
     cd opensmalltalk-vm
-    cp build.${flavor}/pharo.cog.spur/plugins.{ext,int} .
+    cp build."${flavor}"/pharo.cog.spur/plugins.{ext,int} .
   '';
 
   # (No special build phase.)
diff --git a/pkgs/development/pharo/wrapper/pharo-vm.sh b/pkgs/development/pharo/wrapper/pharo-vm.sh
index 7ccab99cd76..d5bd1a2d801 100644
--- a/pkgs/development/pharo/wrapper/pharo-vm.sh
+++ b/pkgs/development/pharo/wrapper/pharo-vm.sh
@@ -53,5 +53,5 @@ fi
 
 # Run the VM
 set -f
-exec -- ${vm} $@
+exec -- "${vm}" "$@"
 

From 4ed1d53cbecccebe0ebe654b8847943e93ffd493 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Fri, 30 Jun 2017 07:30:02 +0000
Subject: [PATCH 0126/3246] pharo: Add missing file: vms.nix

---
 pkgs/development/pharo/vm/vms.nix | 46 +++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/development/pharo/vm/vms.nix

diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix
new file mode 100644
index 00000000000..15e8c3ef06e
--- /dev/null
+++ b/pkgs/development/pharo/vm/vms.nix
@@ -0,0 +1,46 @@
+{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc6, fetchFromGitHub } @args:
+
+let
+  pharo-vm-build = import ./build-vm.nix args;
+  pharo-vm-build-legacy = import ./build-vm-legacy.nix args;
+in
+
+let suffix = if stdenv.is64bit then "64" else "32"; in
+
+rec {
+  # Build the latest VM
+  spur = pharo-vm-build rec {
+    name = "pharo-spur${suffix}";
+    version = "git.${revision}";
+    src = fetchFromGitHub {
+      owner = "pharo-project";
+      repo = "pharo-vm";
+      rev = revision;
+      sha256 = "0dkiy5fq1xn2n93cwf767xz24c01ic0wfw94jk9nvn7pmcfj7m62";
+    };
+    # This metadata will be compiled into the VM and introspectable
+    # from Smalltalk. This has been manually extracted from 'git log'.
+    #
+    # The build would usually generate this automatically using
+    # opensmalltalk-vm/.git_filters/RevDateURL.smudge but that script
+    # is too impure to run from nix.
+    revision = "6a63f68a3dd4deb7c17dd2c7ac6e4dd4b0b6d937";
+    source-date = "Tue May 30 19:41:27 2017 -0700";
+    source-url  = "https://github.com/pharo-project/pharo-vm";
+  };
+
+  # Build an old ("legacy") CogV3 VM for running pre-spur images.
+  # (Could be nicer to build the latest VM in CogV3 mode but this is
+  # not supported on the Pharo VM variant at the moment.)
+  cog = pharo-vm-build-legacy rec {
+    version = "2016.02.18";
+    name = "pharo-cog${suffix}";
+    base-url = http://files.pharo.org/vm/src/vm-unix-sources/blessed;
+    src = fetchurl {
+      url = "${base-url}/pharo-vm-${version}.tar.bz2";
+      sha256 = "16n2zg7v2s1ml0vvpbhkw6khmgn637sr0d7n2b28qm5yc8pfhcj4";
+    };
+  };
+
+}
+

From d55f8276ae4417b13c600ae86be1dff7ca0142cd Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Fri, 30 Jun 2017 07:50:06 +0000
Subject: [PATCH 0127/3246] pharo: Update build-vm.nix for latest upstream

---
 pkgs/development/pharo/vm/build-vm.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 2f2db1293c7..2f2e125ea39 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   # Regenerate the configure script.
   # Unnecessary? But the build breaks without this.
   autoreconfPhase = ''
-    pushd opensmalltalk-vm/platforms/unix/config
+    pushd platforms/unix/config
     make
     popd
   '';
@@ -46,19 +46,18 @@ stdenv.mkDerivation rec {
 
   # VM sources require some patching before build.
   prePatch = ''
-    patchShebangs opensmalltalk-vm/build.${flavor}
+    patchShebangs build.${flavor}
     # Fix hard-coded path to /bin/rm in a script
-    sed -i -e 's:/bin/rm:rm:' opensmalltalk-vm/platforms/unix/config/mkmf
+    sed -i -e 's:/bin/rm:rm:' platforms/unix/config/mkmf
     # Fill in mandatory metadata about the VM source version
     sed -i -e 's!\$Date\$!$Date: ${source-date} $!' \
            -e 's!\$Rev\$!$Rev: ${version} $!' \
            -e 's!\$URL\$!$URL: ${source-url} $!' \
-           opensmalltalk-vm/platforms/Cross/vm/sqSCCSVersion.h
+           platforms/Cross/vm/sqSCCSVersion.h
   '';
 
   # Note: --with-vmcfg configure option is broken so copy plugin specs to ./
   preConfigure = ''
-    cd opensmalltalk-vm
     cp build."${flavor}"/pharo.cog.spur/plugins.{ext,int} .
   '';
 

From 96600d57704536a3de652ea30814e047aa6a8ba5 Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Wed, 10 May 2017 21:15:20 +0200
Subject: [PATCH 0128/3246] pharo-vm: Add third-party libraries to
 LD_LIBRARY_PATH of legacy VM

This commit adds the third party libraries needed by the default Pharo
environment to the LD_LIBRARY_PATH, by using makeWrapper.
---
 pkgs/development/pharo/vm/build-vm-legacy.nix | 10 ++++++++--
 pkgs/development/pharo/vm/default.nix         |  2 +-
 pkgs/development/pharo/vm/vms.nix             |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix
index 111b985bdb3..b2e37344afc 100644
--- a/pkgs/development/pharo/vm/build-vm-legacy.nix
+++ b/pkgs/development/pharo/vm/build-vm-legacy.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, ... }:
+{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }:
 
 { name, src, ... }:
 
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     cd build/
   '';
   resources = ./resources;
+
   installPhase = ''
     mkdir -p "$prefix/lib/$name"
 
@@ -40,10 +41,15 @@ stdenv.mkDerivation rec {
 
     chmod +x $prefix/bin/pharo-cog
 
+    # Add cairo library to the library path.
+    wrapProgram $prefix/bin/pharo-cog --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH}
+
     ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name
   '';
 
-  buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
+  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo mesa freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ];
+  nativeBuildInputs = [ unzip cmake gcc makeWrapper ];
+  buildInputs = [ bash glibc openssl mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
 
   meta = {
     description = "Clean and innovative Smalltalk-inspired environment";
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index 6d84981e7ad..e6269503a4c 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, callPackage_i686, ...} @pkgs:
+{ stdenv, callPackage, callPackage_i686, makeWrapper, ...} @pkgs:
 
 let
   i686    = callPackage_i686 ./vms.nix {};
diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix
index 15e8c3ef06e..bd1bddc69e9 100644
--- a/pkgs/development/pharo/vm/vms.nix
+++ b/pkgs/development/pharo/vm/vms.nix
@@ -1,4 +1,4 @@
-{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc6, fetchFromGitHub } @args:
+{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc6, fetchFromGitHub, makeWrapper} @args:
 
 let
   pharo-vm-build = import ./build-vm.nix args;

From ab162eeffca437cd218cc959b44b548a5a89f981 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 30 Jun 2017 14:47:55 +0200
Subject: [PATCH 0129/3246] buku: added not to remove line on next version

---
 pkgs/applications/misc/buku/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index fea813021d2..ea3ca107d24 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pythonPackages, fetchFromGitHub }:
 
 with pythonPackages; buildPythonApplication rec {
-  version = "3.0";
+  version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck
   name = "buku-${version}";
 
   src = fetchFromGitHub {
@@ -29,7 +29,8 @@ with pythonPackages; buildPythonApplication rec {
     # Fixes two tests for wrong encoding
     export PYTHONIOENCODING=utf-8
 
-    # Should be upstream, see https://github.com/jarun/Buku/pull/167
+    ### Remove this for 3.1 ###
+    # See https://github.com/jarun/Buku/pull/167 (merged)
     substituteInPlace setup.py \
       --replace "hypothesis==3.7.0" "hypothesis>=3.7.0"
 

From d07f30f628f52186aa68b0c918c88aa9ed36f988 Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Thu, 29 Jun 2017 12:06:55 -0400
Subject: [PATCH 0130/3246] cc-wrapper: improve response file parsing speed

---
 pkgs/build-support/cc-wrapper/default.nix     |  17 +-
 .../cc-wrapper/parseResponseFile.c            | 181 ++++++++++++++++++
 pkgs/build-support/cc-wrapper/utils.sh        |  65 ++-----
 pkgs/stdenv/darwin/default.nix                |  12 +-
 pkgs/stdenv/linux/default.nix                 |   6 +
 5 files changed, 232 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/build-support/cc-wrapper/parseResponseFile.c

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 935e6fb6267..61afa56fc49 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -10,7 +10,7 @@
 , zlib ? null, extraPackages ? [], extraBuildCommands ? ""
 , dyld ? null # TODO: should this be a setup-hook on dyld?
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
-, hostPlatform, targetPlatform
+, buildPackages ? {}, hostPlatform, targetPlatform
 , runCommand ? null
 }:
 
@@ -120,6 +120,17 @@ let
          null)
     else "";
 
+  parseResponseFile = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
+  then buildPackages.stdenv.mkDerivation {
+    name = "parse-response-file";
+    src = ./parseResponseFile.c;
+    buildCommand = ''
+      # Make sure the output file doesn't refer to the input nix path
+      cp "$src" parseResponseFile.c
+      "$CC" -O3 -o "$out" parseResponseFile.c
+    '';
+  } else "";
+
 in
 
 stdenv.mkDerivation {
@@ -368,11 +379,11 @@ stdenv.mkDerivation {
     + ''
       substituteAll ${preWrap ./add-flags.sh} $out/nix-support/add-flags.sh
       substituteAll ${preWrap ./add-hardening.sh} $out/nix-support/add-hardening.sh
-      cp -p ${preWrap ./utils.sh} $out/nix-support/utils.sh
+      substituteAll ${preWrap ./utils.sh} $out/nix-support/utils.sh
     ''
     + extraBuildCommands;
 
-  inherit dynamicLinker;
+  inherit dynamicLinker parseResponseFile;
 
   crossAttrs = {
     shell = shell.crossDrv + shell.crossDrv.shellPath;
diff --git a/pkgs/build-support/cc-wrapper/parseResponseFile.c b/pkgs/build-support/cc-wrapper/parseResponseFile.c
new file mode 100644
index 00000000000..4a2a21e5ba3
--- /dev/null
+++ b/pkgs/build-support/cc-wrapper/parseResponseFile.c
@@ -0,0 +1,181 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+typedef enum {
+  UNQUOTED,
+  SINGLE_QUOTED,
+  DOUBLE_QUOTED
+} quote_state;
+
+typedef enum {
+  BEFORE_FIRST_WORD,
+  IN_WORD,
+  AFTER_WORD
+} word_break_state;
+
+void emitWordChar(word_break_state *w, char c) {
+  switch(*w) { // Note: These all fall through
+  case AFTER_WORD:
+    putchar(' ');
+  case BEFORE_FIRST_WORD:
+    putchar('\'');
+    *w = IN_WORD;
+  case IN_WORD:
+    if(c == '\'') {
+      printf("'\\''");
+    } else {
+      putchar(c);
+    }
+  }
+}
+
+void emitWordEnd(word_break_state *w) {
+  if(*w == IN_WORD) {
+    putchar('\'');
+    *w = AFTER_WORD;
+  } // Otherwise, the state remains the same
+}
+
+typedef struct {
+  word_break_state *w;
+  char *subFilename; // Non-null if we're currently accumulating a response file name
+  size_t subFilenameUsed; // If subFilename == 0, this should be 0; this should always be less than (subFilenameAllocated - 1), to allow room for the null byte
+  size_t subFilenameAllocated; // If subFilename == 0, this should be 0
+} file_state; // The state of parsing a single file
+
+static const unsigned int INITIAL_SUB_FILENAME_CHARS = 32; // Arbitrary, but must be > 0
+
+void *exitIfNull(void *p) {
+  if(!p) {
+    fprintf(stderr, "Out of memory");
+    exit(2);
+  }
+  return p;
+}
+
+void wordChar(file_state *s, char c) {
+  if(s->subFilename) { // We're accumulating a file to recursively process
+    // Allocate more space if we need to
+    if(s->subFilenameUsed >= s->subFilenameAllocated - 1) {
+      size_t newSize = s->subFilenameAllocated * 2;
+      s->subFilename = exitIfNull(realloc(s->subFilename, newSize));
+      s->subFilenameAllocated = newSize;
+    }
+    s->subFilename[s->subFilenameUsed++] = c;
+  } else if(*s->w != IN_WORD && c == '@') { // This is the first letter in the word; note that even quoted or escaped @'s are recursively interpreted
+    s->subFilename = exitIfNull(malloc(INITIAL_SUB_FILENAME_CHARS * sizeof(*(s->subFilename))));
+    assert(s->subFilenameUsed == 0);
+    assert(s->subFilenameAllocated == 0);
+    s->subFilenameAllocated = INITIAL_SUB_FILENAME_CHARS;
+  } else {
+    emitWordChar(s->w, c);
+  }
+}
+
+void processFile(word_break_state *w, const char *filename);
+
+void endWord(file_state *s) {
+  if(s->subFilename) {
+    s->subFilename[s->subFilenameUsed] = '\0';
+
+    processFile(s->w, s->subFilename);
+
+    free(s->subFilename);
+    s->subFilename = 0;
+    s->subFilenameUsed = 0;
+    s->subFilenameAllocated = 0;
+  } else {
+    emitWordEnd(s->w);
+  }
+}
+
+void processFile(word_break_state *w, const char *filename) {
+  FILE *h = fopen(filename, "r");
+  if(!h) { //TODO: We assume it's because the file doesn't exist, but perhaps we should check for other failure cases
+    emitWordChar(w, '@');
+    while(*filename) {
+      emitWordChar(w, *filename);
+      ++filename;
+    }
+    emitWordEnd(w);
+    return;
+  }
+
+  char c;
+  quote_state q = UNQUOTED;
+  file_state s = {
+    .w = w,
+    .subFilename = 0,
+    .subFilenameUsed = 0,
+    .subFilenameAllocated = 0
+  };
+  while((c = fgetc(h)) != EOF) {
+    //fprintf(stderr, "%d\n", c);
+    switch(c) {
+    case '\'':
+      switch(q) {
+      case UNQUOTED:
+        q = SINGLE_QUOTED;
+        break;
+      case SINGLE_QUOTED:
+        q = UNQUOTED;
+        break;
+      case DOUBLE_QUOTED:
+        wordChar(&s, '\'');
+        break;
+      }
+      break;
+    case '"':
+      switch(q) {
+      case UNQUOTED:
+        q = DOUBLE_QUOTED;
+        break;
+      case SINGLE_QUOTED:
+        wordChar(&s, '"');
+        break;
+      case DOUBLE_QUOTED:
+        q = UNQUOTED;
+        break;
+      }
+      break;
+    case '\\':
+      c = fgetc(h);
+      if(c != EOF) {
+        wordChar(&s, c);
+      }
+      break;
+    case ' ':
+    case '\t':
+    case '\n':
+    case '\v':
+    case '\f':
+    case '\r':
+      if(q == UNQUOTED) {
+        endWord(&s);
+      } else {
+        wordChar(&s, c);
+      }
+      break;
+    default:
+      wordChar(&s, c);
+      break;
+    }
+  }
+
+  endWord(&s);
+
+  fclose(h);
+}
+
+int main(int argc, const char *argv[]) {
+  if(argc != 2) {
+    fprintf(stderr, "Usage: %s [responsefile]", argv[0]);
+    return 1;
+  }
+
+  word_break_state w = BEFORE_FIRST_WORD;
+  processFile(&w, argv[1]);
+
+  return 0;
+}
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 8cefc47816f..3d8ea6842f1 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -23,52 +23,27 @@ badPath() {
         "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
 }
 
-# @args.rsp parser.
-# Char classes: space, other, backslash, single quote, double quote.
-# States: 0 - outside, 1/2 - unquoted arg/slash, 3/4 - 'arg'/slash, 5/6 - "arg"/slash.
-# State transitions:
-rspT=(01235 01235 11111 33413 33333 55651 55555)
-# Push (a) arg or (c) char on transition:
-rspP[10]=a rspP[01]=c rspP[11]=c rspP[21]=c rspP[33]=c rspP[43]=c rspP[55]=c rspP[65]=c
-
-rspParse() {
-    rsp=()
-    local state=0
-    local arg=''
-    local c
-
-    while read -r -N1 c; do
-        local cls=1
-        case "$c" in
-            ' ' | $'\t' | $'\r' | $'\n') cls=0 ;;
-            '\') cls=2 ;;
-            "'") cls=3 ;;
-            '"') cls=4 ;;
-        esac
-        local nextstates="${rspT[$state]}"
-        local nextstate="${nextstates:$cls:1}"
-        case "${rspP[$state$nextstate]}" in
-            'c') arg+="$c" ;;
-            'a') rsp+=("$arg"); arg='' ;;
-        esac
-        state="$nextstate"
-    done
-
-    if [ "$state" -ne 0 ]; then
-        rsp+=("$arg")
-    fi
-}
-
 expandResponseParams() {
+    local inparams=("$@")
+    local n=0
+    local p
     params=()
-    while [ $# -gt 0 ]; do
-        local p="$1"
-        shift
-        if [ "${p:0:1}" = '@' -a -e "${p:1}" ]; then
-            rspParse <"${p:1}"
-            set -- "${rsp[@]}" "$@"
-        else
-            params+=("$p")
-        fi
+    while [ $n -lt ${#inparams[*]} ]; do
+        p=${inparams[n]}
+        case $p in
+            @*)
+                local parseResponseFile="@parseResponseFile@"
+                if [ -n "$parseResponseFile" ] ; then
+                    eval "params+=($("$parseResponseFile" "${p:1}"))"
+                else
+                    echo "Response files aren't supported during bootstrapping" >&2
+                    exit 1
+                fi
+                ;;
+            *)
+                params+=("$p")
+                ;;
+        esac
+        n=$((n + 1))
     done
 }
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 03a815109c2..e62aee9a02d 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -61,7 +61,10 @@ in rec {
                           allowedRequisites ? null}:
     let
       thisStdenv = import ../generic {
-        inherit config shell extraBuildInputs allowedRequisites;
+        inherit config shell extraBuildInputs;
+        allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
+          thisStdenv.cc.parseResponseFile
+        ];
 
         name = "stdenv-darwin-boot-${toString step}";
 
@@ -73,6 +76,9 @@ in rec {
           nativeTools  = true;
           nativePrefix = bootstrapTools;
           nativeLibc   = false;
+          buildPackages = lib.optionalAttrs (last ? stdenv) {
+            inherit (last) stdenv;
+          };
           hostPlatform = localSystem;
           targetPlatform = localSystem;
           libc         = last.pkgs.darwin.Libsystem;
@@ -297,6 +303,9 @@ in rec {
       inherit shell;
       nativeTools = false;
       nativeLibc  = false;
+      buildPackages = {
+        inherit (prevStage) stdenv;
+      };
       hostPlatform = localSystem;
       targetPlatform = localSystem;
       inherit (pkgs) coreutils binutils gnugrep;
@@ -319,6 +328,7 @@ in rec {
       gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
       gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
       binutils-raw.dev binutils gettext
+      cc.parseResponseFile
     ]) ++ (with pkgs.darwin; [
       dyld Libsystem CF cctools ICU libiconv locale
     ]);
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index b116a48a2bd..c2879d93e17 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -76,6 +76,9 @@ let
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
           nativeTools = false;
           nativeLibc = false;
+          buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
+            inherit (prevStage) stdenv;
+          };
           hostPlatform = localSystem;
           targetPlatform = localSystem;
           cc = prevStage.gcc-unwrapped;
@@ -241,6 +244,9 @@ in
         nativeTools = false;
         nativeLibc = false;
         isGNU = true;
+        buildPackages = {
+          inherit (prevStage) stdenv;
+        };
         hostPlatform = localSystem;
         targetPlatform = localSystem;
         cc = prevStage.gcc-unwrapped;

From 44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5 Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Sat, 1 Jul 2017 00:01:58 +0200
Subject: [PATCH 0131/3246] pulseaudio: Resolve conflicting asound.conf of
 pulseaudio and alsa

Fixes issue #25790.
---
 nixos/modules/config/pulseaudio.nix   | 2 ++
 nixos/modules/services/audio/alsa.nix | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index bd80c811348..b12ef2fe861 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -6,6 +6,7 @@ with lib;
 let
 
   cfg = config.hardware.pulseaudio;
+  alsaCfg = config.sound;
 
   systemWide = cfg.enable && cfg.systemWide;
   nonSystemWide = cfg.enable && !cfg.systemWide;
@@ -76,6 +77,7 @@ let
     ctl.!default {
       type pulse
     }
+    ${alsaCfg.extraConfig}
   '');
 
 in {
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index 53786dbc627..acf48d3c3d0 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -7,6 +7,8 @@ let
 
   inherit (pkgs) alsaUtils;
 
+  pulseaudioEnabled = config.hardware.pulseaudio.enable;
+
 in
 
 {
@@ -80,7 +82,7 @@ in
 
     environment.systemPackages = [ alsaUtils ];
 
-    environment.etc = mkIf (config.sound.extraConfig != "")
+    environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "")
       [
         { source = pkgs.writeText "asound.conf" config.sound.extraConfig;
           target = "asound.conf";

From 5abfed0e0bfb260c005191563ecac1278b9df7ec Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 1 Jul 2017 14:48:18 +0100
Subject: [PATCH 0132/3246] qt5: Add qtcharts submodule

---
 pkgs/development/libraries/qt-5/5.9/default.nix  |  7 ++++---
 pkgs/development/libraries/qt-5/5.9/qtcharts.nix | 10 ++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.9/qtcharts.nix

diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
index 7aba54fb883..8f9be38fc88 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/default.nix
@@ -99,6 +99,7 @@ let
         inherit developerBuild decryptSslTraffic;
       };
 
+      qtcharts = callPackage ./qtcharts.nix {};
       qtconnectivity = callPackage ./qtconnectivity.nix {};
       qtdeclarative = callPackage ./qtdeclarative {};
       qtdoc = callPackage ./qtdoc.nix {};
@@ -128,10 +129,10 @@ let
 
       env = callPackage ../qt-env.nix {};
       full = env "qt-${qtbase.version}" ([
-        qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
+        qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
         qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
-        qtsensors qtserialport qtsvg qttools qttranslations
-        qtwebsockets qtx11extras qtxmlpatterns
+        qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets
+        qtx11extras qtxmlpatterns
       ] ++ optional (!stdenv.isDarwin) qtwayland
         ++ optional (stdenv.isDarwin) qtmacextras);
 
diff --git a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix
new file mode 100644
index 00000000000..46713eb7a9e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix
@@ -0,0 +1,10 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtcharts";
+  qtInputs = [ qtbase ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
+}

From dde58651401cf6ab4d63cdec043d677607af0924 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 1 Jul 2017 13:23:12 +0200
Subject: [PATCH 0133/3246] docker-tools: set group/owner when creating a pure
 layer

---
 pkgs/build-support/docker/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 4ebe3c0615d..004816a0b39 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -234,11 +234,10 @@ rec {
     # Files to add to the layer.
     contents ? null,
     # Additional commands to run on the layer before it is tar'd up.
-    extraCommands ? ""
+    extraCommands ? "", uid ? 0, gid ? 0
   }:
     runCommand "docker-layer-${name}" {
       inherit baseJson contents extraCommands;
-
       buildInputs = [ jshon rsync ];
     }
     ''
@@ -260,7 +259,7 @@ rec {
       # Tar up the layer and throw it into 'layer.tar'.
       echo "Packing layer..."
       mkdir $out
-      tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
+      tar -C layer --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
 
       # Compute a checksum of the tarball.
       echo "Computing layer checksum..."
@@ -297,7 +296,7 @@ rec {
     # How much disk to allocate for the temporary virtual machine.
     diskSize ? 1024,
     # Commands (bash) to run on the layer; these do not require sudo.
-    extraCommands ? ""
+    extraCommands ? "", uid ? 0, gid ? 0
   }:
     # Generate an executable script from the `runAsRoot` text.
     let runAsRootScript = shellScript "run-as-root.sh" runAsRoot;
@@ -375,7 +374,7 @@ rec {
     # Docker config; e.g. what command to run on the container.
     config ? null,
     # Optional bash script to run on the files prior to fixturizing the layer.
-    extraCommands ? "",
+    extraCommands ? "", uid ? 0, gid ? 0,
     # Optional bash script to run as root on the image when provisioning.
     runAsRoot ? null,
     # Size of the virtual machine disk to provision when building the image.
@@ -398,7 +397,7 @@ rec {
         if runAsRoot == null
         then mkPureLayer {
           name = baseName;
-          inherit baseJson contents extraCommands;
+          inherit baseJson contents extraCommands uid gid;
         } else mkRootLayer {
           name = baseName;
           inherit baseJson fromImage fromImageName fromImageTag
@@ -498,7 +497,7 @@ rec {
         chmod -R a-w image
 
         echo "Cooking the image..."
-        tar -C image --mtime="@$SOURCE_DATE_EPOCH" -c . | pigz -nT > $out
+        tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 -c . | pigz -nT > $out
 
         echo "Finished."
       '';

From 42464f64f7292e1e17b8a6a74d87770016ac08e8 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 1 Jul 2017 00:06:51 -0300
Subject: [PATCH 0134/3246] firefox: fix the drmSupport option

At some point the config flag must have changed from --enable-eme to
--enable-eme=widevine, so it was having no effect.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 4fe89a403de..7c9ffc0f478 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -153,7 +153,7 @@ stdenv.mkDerivation (rec {
   ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga"
   ++ flag crashreporterSupport "crashreporter"
   ++ flag safeBrowsingSupport "safe-browsing"
-  ++ flag drmSupport "eme"
+  ++ lib.optional drmSupport "--enable-eme=widevine"
 
   ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
                     else [ "--disable-debug" "--enable-release"

From c3996de4fd1014a9a0977d25e1235ea2949954d8 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 2 Jul 2017 00:39:55 +0000
Subject: [PATCH 0135/3246] vault: remove-references-to go compiler

---
 pkgs/tools/security/vault/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index a0437588309..9de6216ea59 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, go, gox }:
+{ stdenv, fetchFromGitHub, go, gox, removeReferencesTo }:
 
 let
   vaultBashCompletions = fetchFromGitHub {
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
     sha256 = "15wj1pfgzwzjfrqy7b5bx4y9f0hbpqlfif58l5xamwm88229qk4m";
   };
 
-  nativeBuildInputs = [ go gox ];
+  nativeBuildInputs = [ go gox removeReferencesTo ];
 
   buildPhase = ''
     substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
@@ -31,7 +31,10 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin $out/share/bash-completion/completions
+
     cp pkg/*/* $out/bin/
+    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
+
     cp ${vaultBashCompletions}/vault-bash-completion.sh $out/share/bash-completion/completions/vault
   '';
 

From 111b5eb6377839b9518ea40fba6a71f121574ea1 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 1 Jul 2017 18:50:44 -0700
Subject: [PATCH 0136/3246] groff: Add site.tmac to fix man page coloring

This enables groff to correctly respond to the LESS_TERMCAP_*
environment variables, allowing colorized man pages.

Patch is taken from Arch Linux;
see https://bugs.archlinux.org/task/33760.
---
 pkgs/tools/text/groff/default.nix |  3 +++
 pkgs/tools/text/groff/site.tmac   | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/tools/text/groff/site.tmac

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index aa9ece8955b..4e2f6af0669 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -59,6 +59,9 @@ stdenv.mkDerivation rec {
   postInstall = ''
     rm $doc/share/doc/groff/examples/hdtbl/*color*ps
     find $doc/share/doc/groff/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//'
+    for f in 'man.local' 'mdoc.local'; do
+        cat '${./site.tmac}' >>"$out/share/groff/site-tmac/$f"
+    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/text/groff/site.tmac b/pkgs/tools/text/groff/site.tmac
new file mode 100644
index 00000000000..8ef1040ca4a
--- /dev/null
+++ b/pkgs/tools/text/groff/site.tmac
@@ -0,0 +1,16 @@
+.
+.if n \{\
+.  \" Character translations for non-keyboard
+.  \" characters - to make them searchable
+.  if '\*[.T]'utf8' \{\
+.    char \- \N'45'
+.    char - \N'45'
+.    char ' \N'39'
+.    char \' \N'39'
+.  \}
+.
+.  \" Shut off SGR by default (groff colors)
+.  \" Require GROFF_SGR envvar defined to turn it on
+.  if '\V[GROFF_SGR]'' \
+.    output x X tty: sgr 0
+.\}

From ed59b2c892f462fa3fb94e4a51dc6831f9ec06af Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 2 Jul 2017 08:48:41 -0400
Subject: [PATCH 0137/3246] Revert "i3: add `configFile` to enable cutom
 configuration locations"

---
 .../window-managers/i3/default.nix            | 135 ++++++++----------
 pkgs/top-level/all-packages.nix               |   2 -
 2 files changed, 61 insertions(+), 76 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index a4eb850f939..df7ba69c5c5 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,85 +1,72 @@
 { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
 , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
 , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
-, xorgserver, xvfb_run, symlinkJoin, configFile ? null }:
+, xorgserver, xvfb_run }:
 
-let
+stdenv.mkDerivation rec {
+  name = "i3-${version}";
   version = "4.13";
 
-  i3 = stdenv.mkDerivation rec {
-    name = "i3-${version}";
-
-    src = fetchurl {
-      url = "http://i3wm.org/downloads/${name}.tar.bz2";
-      sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl";
-    };
-
-    nativeBuildInputs = [ which pkgconfig makeWrapper ];
-
-    buildInputs = [
-      libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
-      libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
-      perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
-      perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
-      xorgserver xvfb_run
-    ];
-
-    configureFlags = [ "--disable-builddir" ];
-
-    enableParallelBuilding = true;
-
-    postPatch = ''
-      patchShebangs .
-    '';
-
-    # Tests have been failing (at least for some people in some cases)
-    # and have been disabled until someone wants to fix them. Some
-    # initial digging uncovers that the tests call out to `git`, which
-    # they shouldn't, and then even once that's fixed have some
-    # perl-related errors later on. For more, see
-    # https://github.com/NixOS/nixpkgs/issues/7957
-    doCheck = false; # stdenv.system == "x86_64-linux";
-
-    checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-    ''
-      (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output)
-      ! grep -q '^not ok' testcases/latest/complete-run.log
-    '';
-
-    postInstall = ''
-      wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB"
-      for program in $out/bin/i3-sensible-*; do
-        sed -i 's/which/command -v/' $program
-      done
-    '';
-
-    separateDebugInfo = true;
-
-    meta = with stdenv.lib; {
-      description = "A tiling window manager";
-      homepage    = "http://i3wm.org";
-      maintainers = with maintainers; [ garbas modulistic fpletz ];
-      license     = licenses.bsd3;
-      platforms   = platforms.all;
-
-      longDescription = ''
-        A tiling window manager primarily targeted at advanced users and
-        developers. Based on a tree as data structure, supports tiling,
-        stacking, and tabbing layouts, handled dynamically, as well as
-        floating windows. Configured via plain text file. Multi-monitor.
-        UTF-8 clean.
-      '';
-    };
-
+  src = fetchurl {
+    url = "http://i3wm.org/downloads/${name}.tar.bz2";
+    sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl";
   };
-in if configFile == null then i3 else symlinkJoin {
-  name = "i3-with-config-${version}";
-  paths = [ i3 ];
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ which pkgconfig makeWrapper ];
 
-  postBuild = ''
-      wrapProgram $out/bin/i3 \
-      --add-flags "-c ${configFile}"
+  buildInputs = [
+    libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
+    libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
+    perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
+    perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
+    xorgserver xvfb_run
+  ];
+
+  configureFlags = [ "--disable-builddir" ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    patchShebangs .
   '';
+
+  # Tests have been failing (at least for some people in some cases)
+  # and have been disabled until someone wants to fix them. Some
+  # initial digging uncovers that the tests call out to `git`, which
+  # they shouldn't, and then even once that's fixed have some
+  # perl-related errors later on. For more, see
+  # https://github.com/NixOS/nixpkgs/issues/7957
+  doCheck = false; # stdenv.system == "x86_64-linux";
+
+  checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+  ''
+    (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output)
+    ! grep -q '^not ok' testcases/latest/complete-run.log
+  '';
+
+  postInstall = ''
+    wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB"
+    for program in $out/bin/i3-sensible-*; do
+      sed -i 's/which/command -v/' $program
+    done
+  '';
+
+  separateDebugInfo = true;
+
+  meta = with stdenv.lib; {
+    description = "A tiling window manager";
+    homepage    = "http://i3wm.org";
+    maintainers = with maintainers; [ garbas modulistic fpletz ];
+    license     = licenses.bsd3;
+    platforms   = platforms.all;
+
+    longDescription = ''
+      A tiling window manager primarily targeted at advanced users and
+      developers. Based on a tree as data structure, supports tiling,
+      stacking, and tabbing layouts, handled dynamically, as well as
+      floating windows. Configured via plain text file. Multi-monitor.
+      UTF-8 clean.
+    '';
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3b82b4be0a..e57991abddf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14492,8 +14492,6 @@ with pkgs;
 
   i3 = callPackage ../applications/window-managers/i3 {
     xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
-
-    configFile = config.i3.configFile or null;
   };
 
   i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { };

From b97747a052610b1b4883039edee14cf6210ac3b6 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 2 Jul 2017 16:22:40 +0100
Subject: [PATCH 0138/3246] firefox wrapper: add libudev to libs

Fixes #26913 (gamepad support).
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index cffdfa7a97d..1dd5c9191f0 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -8,6 +8,7 @@
 , google_talk_plugin, fribid, gnome3/*.gnome_shell*/
 , esteidfirefoxplugin
 , vlc_npapi
+, libudev
 }:
 
 ## configurability of the wrapper itself
@@ -46,7 +47,7 @@ let
      );
   libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
          ++ lib.optionals (cfg.enableQuakeLive or false)
-         (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
+         (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ])
          ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
          ++ lib.optional (config.pulseaudio or false) libpulseaudio;
   gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];

From b86eb39a58aa27174b33400cc6873e285d7b4b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= <muoniurn@gmail.com>
Date: Sun, 2 Jul 2017 23:39:08 +0200
Subject: [PATCH 0139/3246] aliza: 1.28.10->1.29.2

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

diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix
index 31307322f34..7cdacc1738b 100644
--- a/pkgs/applications/science/medicine/aliza/default.nix
+++ b/pkgs/applications/science/medicine/aliza/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
   name = "aliza";
   src = fetchurl {
     # Hosted on muoniurn's google drive
-    url = "https://drive.google.com/uc?export=download&id=0B0s_Yf4jjfZ4RFgwRmxLX1VaVnM";
-    sha256 = "0cakck4axfgzryh3w086p44ls90czjz65662mgdhfas1z4q5iibr";
+    url = "https://drive.google.com/uc?export=download&id=0B0s_Yf4jjfZ4WUJaSERHN3FsNFE";
+    sha256 = "1nfp3ghjnfxmxiclg76gcn7a3mhvi6h7s5wmd9v9l6w8lfq9vj5h";
     name = "aliza.rpm";
   };
 

From c16297654e59030e46df9e25a6c847d0b080748c Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 2 Jul 2017 20:13:21 -0400
Subject: [PATCH 0140/3246] Swig 3.0.10 -> 3.0.12

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

diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 2a6b6880183..9b4fd05dc0a 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "swig-${version}";
-  version = "3.0.10";
+  version = "3.0.12";
 
   src = fetchFromGitHub {
     owner = "swig";
     repo = "swig";
     rev = "rel-${version}";
-    sha256 = "049rj883r9mf2bgabj3b03p7cnmqgl5939lmh8v5nnia24zb51jg";
+    sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
   };
 
   nativeBuildInputs = [ autoconf automake libtool bison ];

From 0641253ae66d748b5ff0562c4edba3f9502a38e3 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 2 Jul 2017 17:18:58 -0700
Subject: [PATCH 0141/3246] Small changes in response to review.

---
 pkgs/development/ruby-modules/bundled-common/default.nix | 2 +-
 pkgs/development/ruby-modules/runtests.sh                | 2 +-
 pkgs/development/ruby-modules/testing/tap-support.nix    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 09eb36a247a..1bf6257f655 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -140,7 +140,7 @@ let
           name = "${pname}-interactive-environment";
           nativeBuildInputs = [ wrappedRuby basicEnv ];
           shellHook = ''
-            export OLD_IRBRC="$IRBRC"
+            export OLD_IRBRC=$IRBRC
             export IRBRC=${irbrc}
           '';
           buildCommand = ''
diff --git a/pkgs/development/ruby-modules/runtests.sh b/pkgs/development/ruby-modules/runtests.sh
index d0faaf971db..8bb8c8a5462 100755
--- a/pkgs/development/ruby-modules/runtests.sh
+++ b/pkgs/development/ruby-modules/runtests.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o xtrace
-pwd
+cd $(dirname $0)
 find . -name text.nix
 testfiles=$(find . -name test.nix)
 nix-build -E "with import <nixpkgs> {}; callPackage testing/driver.nix { testFiles = [ $testfiles ]; }" --show-trace && cat result
diff --git a/pkgs/development/ruby-modules/testing/tap-support.nix b/pkgs/development/ruby-modules/testing/tap-support.nix
index 555ce89d833..74fcceebaa0 100644
--- a/pkgs/development/ruby-modules/testing/tap-support.nix
+++ b/pkgs/development/ruby-modules/testing/tap-support.nix
@@ -5,8 +5,8 @@ let
   testLine = report: "${okStr report} ${toString (report.index + 1)} ${report.description}" + testDirective report + testYaml report;
 
   # These are part of the TAP spec, not yet implemented.
+  #c.f.  https://github.com/NixOS/nixpkgs/issues/27071
   testDirective = report: "";
-
   testYaml = report: "";
 
   okStr = { result, ...}: if result == "pass" then "ok" else "not ok";

From 728bb987ec4c3bcf7e43cb7b98db229ec52b93ed Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 2 Jul 2017 17:55:41 -0700
Subject: [PATCH 0142/3246] Adding docs for bundlerApp.

---
 doc/languages-frameworks/ruby.xml           | 27 ++++++++++++++++++---
 pkgs/development/tools/corundum/default.nix |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index 3c6e4f5e01a..6a14854b5c5 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -41,12 +41,34 @@ bundlerEnv rec {
 <para>Please check in the <filename>Gemfile</filename>, <filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so future updates can be run easily.
 </para>
 
-<para>Resulting derivations also have two helpful items, <literal>env</literal> and <literal>wrapper</literal>. The first one allows one to quickly drop into
+<para>For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. <command>rake</command> at the command line, there is an alternative builder called <literal>bundlerApp</literal>. Set up the <filename>gemset.nix</filename> the same way, and then, for example:
+</para>
+
+<screen>
+  <![CDATA[{ lib, bundlerApp }:
+
+bundlerApp {
+  pname = "corundum";
+  gemdir = ./.;
+  exes = [ "corundum-skel" ];
+
+  meta = with lib; {
+    description = "Tool and libraries for maintaining Ruby gems.";
+    homepage    = https://github.com/nyarly/corundum;
+    license     = licenses.mit;
+    maintainers = [ maintainers.nyarly ];
+    platforms   = platforms.unix;
+  };
+}]]>
+
+<para>The chief advantage of <literal>bundlerApp</literal> over <literal>bundlerEnv</literal> is the the executables introduced in the environment are precisely those selected in the <literal>exes</literal> list, as opposed to <literal>bundlerEnv</literal> which adds all the executables made available by gems in the gemset, which can mean e.g. <command>rspec</command> or <command>rake</command> in unpredicable versions available from various packages.
+
+<para>Resulting derivations for both builders also have two helpful items, <literal>env</literal> and <literal>wrapper</literal>. The first one allows one to quickly drop into
 <command>nix-shell</command> with the specified environment present. E.g. <command>nix-shell -A sensu.env</command> would give you an environment with Ruby preset
 so it has all the libraries necessary for <literal>sensu</literal> in its paths. The second one can be used to make derivations from custom Ruby scripts which have
 <filename>Gemfile</filename>s with their dependencies specified. It is a derivation with <command>ruby</command> wrapped so it can find all the needed dependencies.
 For example, to make a derivation <literal>my-script</literal> for a <filename>my-script.rb</filename> (which should be placed in <filename>bin</filename>) you should
-run <command>bundix</command> as specified above and then use <literal>bundlerEnv</literal> lile this:</para>
+run <command>bundix</command> as specified above and then use <literal>bundlerEnv</literal> like this:</para>
 
 <programlisting>
 <![CDATA[let env = bundlerEnv {
@@ -74,4 +96,3 @@ in stdenv.mkDerivation {
 </programlisting>
 
 </section>
-
diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix
index e149a25859a..22d7b236ffa 100644
--- a/pkgs/development/tools/corundum/default.nix
+++ b/pkgs/development/tools/corundum/default.nix
@@ -7,7 +7,7 @@ bundlerApp {
 
   meta = with lib; {
     description = "Tool and libraries for maintaining Ruby gems.";
-    homepage    = http://sass-lang.com/;
+    homepage    = https://github.com/nyarly/corundum;
     license     = licenses.mit;
     maintainers = [ maintainers.nyarly ];
     platforms   = platforms.unix;

From 196273e177f2270d6d29b56e238f184c83394133 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 3 Jul 2017 10:17:27 +0200
Subject: [PATCH 0143/3246] virtualenvwrapper: only add Python to $PATH, fixes
 #26982

---
 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 37f78d211ab..0d540f6ca7c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25215,9 +25215,9 @@ in {
       stevedore
       virtualenv
       virtualenv-clone
-    ] ++ optional isPy26 argparse;
+    ];
 
-    patchPhase = ''
+    postPatch = ''
       for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do
         substituteInPlace "$file" --replace "which" "${pkgs.which}/bin/which"
 
@@ -25248,7 +25248,7 @@ in {
 
         # WARNING: Don't indent the lines below because that would break EOF
         cat > "$wrapper" << EOF
-export PATH="$PATH:\$PATH"
+export PATH="${python}/bin:\$PATH"
 export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)"
 source "$wrapped"
 EOF

From c2a37617ead77161d7d646a90ec5e2029ea5e49e Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 3 Jul 2017 20:14:38 +0200
Subject: [PATCH 0144/3246] nnn: init at 1.2

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

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
new file mode 100644
index 00000000000..1005006c402
--- /dev/null
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "nnn-${version}";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "jarun";
+    repo = "nnn";
+    rev = "v${version}";
+    sha256 = "1idrwm02218q7qd2pg2m8ld76bg32wbzl8y1h8ch7gzxihgn4559";
+  };
+
+  configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
+  preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses readline ];
+
+  installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+
+  meta = {
+    description = "Small ncurses-based file browser forked from noice";
+    homepage = https://github.com/jarun/nnn;
+    license = licenses.bsd2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9a55eb84cf..06af856f855 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3364,6 +3364,8 @@ with pkgs;
     graphicalSupport = true;
   };
 
+  nnn = callPackage ../applications/misc/nnn { };
+
   notify-osd = callPackage ../applications/misc/notify-osd { };
 
   nox = callPackage ../tools/package-management/nox {

From 334e85e75abdfd87dd948ac226ed6c00d1143023 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 3 Jul 2017 19:46:02 +0000
Subject: [PATCH 0145/3246] vault: do not restart the service on "nixos-rebuild
 switch"

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

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 6b11248adb3..146afec344a 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -112,6 +112,8 @@ in
       after = [ "network.target" ]
            ++ optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
 
+      restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients.
+
       preStart = optionalString (cfg.storagePath != null) ''
         install -d -m0700 -o vault -g vault "${cfg.storagePath}"
       '';

From 2bc7b4e134079cf72307538e57b8968cfb27d70c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 1 Jul 2017 00:27:48 +0000
Subject: [PATCH 0146/3246] cc-wrapper: simplify expandResponseParams parser

Import from https://github.com/orivej/expand-compiler-args/tree/b2446902fe7816f34c3f21d29a66da3ee2b1601e
---
 pkgs/build-support/cc-wrapper/default.nix     |  16 +-
 .../cc-wrapper/expand-response-params.c       |  84 ++++++++
 .../cc-wrapper/parseResponseFile.c            | 181 ------------------
 pkgs/build-support/cc-wrapper/utils.sh        |  33 ++--
 pkgs/stdenv/darwin/default.nix                |   8 +-
 5 files changed, 109 insertions(+), 213 deletions(-)
 create mode 100644 pkgs/build-support/cc-wrapper/expand-response-params.c
 delete mode 100644 pkgs/build-support/cc-wrapper/parseResponseFile.c

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 61afa56fc49..de0fcf953e4 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -120,14 +120,14 @@ let
          null)
     else "";
 
-  parseResponseFile = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
+  expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
   then buildPackages.stdenv.mkDerivation {
-    name = "parse-response-file";
-    src = ./parseResponseFile.c;
+    name = "expand-response-params";
+    src = ./expand-response-params.c;
     buildCommand = ''
-      # Make sure the output file doesn't refer to the input nix path
-      cp "$src" parseResponseFile.c
-      "$CC" -O3 -o "$out" parseResponseFile.c
+      # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
+      cp "$src" expand-response-params.c
+      "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
     '';
   } else "";
 
@@ -383,7 +383,9 @@ stdenv.mkDerivation {
     ''
     + extraBuildCommands;
 
-  inherit dynamicLinker parseResponseFile;
+  inherit dynamicLinker expand-response-params;
+
+  expandResponseParams = expand-response-params; # for substitution in utils.sh
 
   crossAttrs = {
     shell = shell.crossDrv + shell.crossDrv.shellPath;
diff --git a/pkgs/build-support/cc-wrapper/expand-response-params.c b/pkgs/build-support/cc-wrapper/expand-response-params.c
new file mode 100644
index 00000000000..ca4ba65ec45
--- /dev/null
+++ b/pkgs/build-support/cc-wrapper/expand-response-params.c
@@ -0,0 +1,84 @@
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef struct { char *data; size_t len, cap; } String;
+
+void resize(String *s, size_t len) {
+    s->len = len;
+    if (s->cap < s->len) {
+        s->cap = s->len * 2;
+        s->data = (char *)realloc(s->data, s->cap);
+        assert(s->data);
+    }
+}
+
+void append(String *s, const char *data, size_t len) {
+    resize(s, s->len + len);
+    memcpy(s->data + s->len - len, data, len);
+}
+
+typedef enum { space = 0, other = 1, backslash = 2, apostrophe = 3, quotation_mark = 4 } CharClass;
+typedef enum { outside, unq, unq_esc, sq, sq_esc, dq, dq_esc } State;
+
+// current State -> CharClass -> next State
+const State transitions[][5] = {
+    [outside] = {outside, unq, unq_esc, sq,  dq},
+    [unq]     = {outside, unq, unq_esc, sq,  dq},
+    [unq_esc] = {unq,     unq, unq,     unq, unq},
+    [sq]      = {sq,      sq,  sq_esc,  unq, sq},
+    [sq_esc]  = {sq,      sq,  sq,      sq,  sq},
+    [dq]      = {dq,      dq,  dq_esc,  dq,  unq},
+    [dq_esc]  = {dq,      dq,  dq,      dq,  dq},
+};
+
+CharClass charClass(int c) {
+    return c == '\\' ? backslash : c == '\'' ? apostrophe : c == '"' ? quotation_mark :
+            isspace(c) ? space : other;
+}
+
+// expandArg writes NULL-terminated expansions of `arg', a NULL-terminated
+// string, to stdout.  If arg does not begin with `@' or does not refer to a
+// file, it is written as is.  Otherwise the contents of the file are
+// recursively expanded.  On unexpected EOF in malformed response files an
+// incomplete final argument is written, even if it is empty, to parse like GCC.
+void expandArg(String *arg) {
+    FILE *f;
+    if (arg->data[0] != '@' || !(f = fopen(&arg->data[1], "r"))) {
+        fwrite(arg->data, 1, arg->len, stdout);
+        return;
+    }
+
+    resize(arg, 0);
+    State cur = outside;
+    int c;
+    do {
+        c = fgetc(f);
+        State next = transitions[cur][charClass(c)];
+        if ((cur == unq && next == outside) || (cur != outside && c == EOF)) {
+            append(arg, "", 1);
+            expandArg(arg);
+            resize(arg, 0);
+        } else if (cur == unq_esc || cur == sq_esc || cur == dq_esc ||
+                   cur == outside ? next == unq : cur == next) {
+            char s = c;
+            append(arg, &s, 1);
+        }
+        cur = next;
+    } while (c != EOF);
+
+    fclose(f);
+}
+
+int main(int argc, char **argv) {
+    String arg = { 0 };
+    while (*++argv) {
+        resize(&arg, 0);
+        append(&arg, *argv, strlen(*argv) + 1);
+        expandArg(&arg);
+    }
+    free(arg.data);
+    return EXIT_SUCCESS;
+}
diff --git a/pkgs/build-support/cc-wrapper/parseResponseFile.c b/pkgs/build-support/cc-wrapper/parseResponseFile.c
deleted file mode 100644
index 4a2a21e5ba3..00000000000
--- a/pkgs/build-support/cc-wrapper/parseResponseFile.c
+++ /dev/null
@@ -1,181 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-typedef enum {
-  UNQUOTED,
-  SINGLE_QUOTED,
-  DOUBLE_QUOTED
-} quote_state;
-
-typedef enum {
-  BEFORE_FIRST_WORD,
-  IN_WORD,
-  AFTER_WORD
-} word_break_state;
-
-void emitWordChar(word_break_state *w, char c) {
-  switch(*w) { // Note: These all fall through
-  case AFTER_WORD:
-    putchar(' ');
-  case BEFORE_FIRST_WORD:
-    putchar('\'');
-    *w = IN_WORD;
-  case IN_WORD:
-    if(c == '\'') {
-      printf("'\\''");
-    } else {
-      putchar(c);
-    }
-  }
-}
-
-void emitWordEnd(word_break_state *w) {
-  if(*w == IN_WORD) {
-    putchar('\'');
-    *w = AFTER_WORD;
-  } // Otherwise, the state remains the same
-}
-
-typedef struct {
-  word_break_state *w;
-  char *subFilename; // Non-null if we're currently accumulating a response file name
-  size_t subFilenameUsed; // If subFilename == 0, this should be 0; this should always be less than (subFilenameAllocated - 1), to allow room for the null byte
-  size_t subFilenameAllocated; // If subFilename == 0, this should be 0
-} file_state; // The state of parsing a single file
-
-static const unsigned int INITIAL_SUB_FILENAME_CHARS = 32; // Arbitrary, but must be > 0
-
-void *exitIfNull(void *p) {
-  if(!p) {
-    fprintf(stderr, "Out of memory");
-    exit(2);
-  }
-  return p;
-}
-
-void wordChar(file_state *s, char c) {
-  if(s->subFilename) { // We're accumulating a file to recursively process
-    // Allocate more space if we need to
-    if(s->subFilenameUsed >= s->subFilenameAllocated - 1) {
-      size_t newSize = s->subFilenameAllocated * 2;
-      s->subFilename = exitIfNull(realloc(s->subFilename, newSize));
-      s->subFilenameAllocated = newSize;
-    }
-    s->subFilename[s->subFilenameUsed++] = c;
-  } else if(*s->w != IN_WORD && c == '@') { // This is the first letter in the word; note that even quoted or escaped @'s are recursively interpreted
-    s->subFilename = exitIfNull(malloc(INITIAL_SUB_FILENAME_CHARS * sizeof(*(s->subFilename))));
-    assert(s->subFilenameUsed == 0);
-    assert(s->subFilenameAllocated == 0);
-    s->subFilenameAllocated = INITIAL_SUB_FILENAME_CHARS;
-  } else {
-    emitWordChar(s->w, c);
-  }
-}
-
-void processFile(word_break_state *w, const char *filename);
-
-void endWord(file_state *s) {
-  if(s->subFilename) {
-    s->subFilename[s->subFilenameUsed] = '\0';
-
-    processFile(s->w, s->subFilename);
-
-    free(s->subFilename);
-    s->subFilename = 0;
-    s->subFilenameUsed = 0;
-    s->subFilenameAllocated = 0;
-  } else {
-    emitWordEnd(s->w);
-  }
-}
-
-void processFile(word_break_state *w, const char *filename) {
-  FILE *h = fopen(filename, "r");
-  if(!h) { //TODO: We assume it's because the file doesn't exist, but perhaps we should check for other failure cases
-    emitWordChar(w, '@');
-    while(*filename) {
-      emitWordChar(w, *filename);
-      ++filename;
-    }
-    emitWordEnd(w);
-    return;
-  }
-
-  char c;
-  quote_state q = UNQUOTED;
-  file_state s = {
-    .w = w,
-    .subFilename = 0,
-    .subFilenameUsed = 0,
-    .subFilenameAllocated = 0
-  };
-  while((c = fgetc(h)) != EOF) {
-    //fprintf(stderr, "%d\n", c);
-    switch(c) {
-    case '\'':
-      switch(q) {
-      case UNQUOTED:
-        q = SINGLE_QUOTED;
-        break;
-      case SINGLE_QUOTED:
-        q = UNQUOTED;
-        break;
-      case DOUBLE_QUOTED:
-        wordChar(&s, '\'');
-        break;
-      }
-      break;
-    case '"':
-      switch(q) {
-      case UNQUOTED:
-        q = DOUBLE_QUOTED;
-        break;
-      case SINGLE_QUOTED:
-        wordChar(&s, '"');
-        break;
-      case DOUBLE_QUOTED:
-        q = UNQUOTED;
-        break;
-      }
-      break;
-    case '\\':
-      c = fgetc(h);
-      if(c != EOF) {
-        wordChar(&s, c);
-      }
-      break;
-    case ' ':
-    case '\t':
-    case '\n':
-    case '\v':
-    case '\f':
-    case '\r':
-      if(q == UNQUOTED) {
-        endWord(&s);
-      } else {
-        wordChar(&s, c);
-      }
-      break;
-    default:
-      wordChar(&s, c);
-      break;
-    }
-  }
-
-  endWord(&s);
-
-  fclose(h);
-}
-
-int main(int argc, const char *argv[]) {
-  if(argc != 2) {
-    fprintf(stderr, "Usage: %s [responsefile]", argv[0]);
-    return 1;
-  }
-
-  word_break_state w = BEFORE_FIRST_WORD;
-  processFile(&w, argv[1]);
-
-  return 0;
-}
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 3d8ea6842f1..87e48da9c8d 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -24,26 +24,17 @@ badPath() {
 }
 
 expandResponseParams() {
-    local inparams=("$@")
-    local n=0
-    local p
-    params=()
-    while [ $n -lt ${#inparams[*]} ]; do
-        p=${inparams[n]}
-        case $p in
-            @*)
-                local parseResponseFile="@parseResponseFile@"
-                if [ -n "$parseResponseFile" ] ; then
-                    eval "params+=($("$parseResponseFile" "${p:1}"))"
-                else
-                    echo "Response files aren't supported during bootstrapping" >&2
-                    exit 1
-                fi
-                ;;
-            *)
-                params+=("$p")
-                ;;
-        esac
-        n=$((n + 1))
+    params=("$@")
+    local arg
+    for arg in "$@"; do
+        if [[ "$arg" == @* ]]; then
+            if [ -n "@expandResponseParams@" ]; then
+                readarray -d '' params < <("@expandResponseParams@" "$@")
+                return 0
+            else
+                echo "Response files aren't supported during bootstrapping" >&2
+                return 1
+            fi
+        fi
     done
 }
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index e62aee9a02d..1c0b42886ca 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -54,7 +54,7 @@ in rec {
     __sandboxProfile = binShClosure + libSystemProfile;
   };
 
-  stageFun = step: last: {shell             ? "${bootstrapTools}/bin/sh",
+  stageFun = step: last: {shell             ? "${bootstrapTools}/bin/bash",
                           overrides         ? (self: super: {}),
                           extraPreHook      ? "",
                           extraBuildInputs,
@@ -63,7 +63,7 @@ in rec {
       thisStdenv = import ../generic {
         inherit config shell extraBuildInputs;
         allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
-          thisStdenv.cc.parseResponseFile
+          thisStdenv.cc.expand-response-params
         ];
 
         name = "stdenv-darwin-boot-${toString step}";
@@ -86,7 +86,7 @@ in rec {
           cc           = { name = "clang-9.9.9"; outPath = bootstrapTools; };
         };
 
-        preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/sh") ''
+        preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") ''
           # Don't patch #!/interpreter because it leads to retained
           # dependencies on the bootstrapTools in the final stdenv.
           dontPatchShebangs=1
@@ -328,7 +328,7 @@ in rec {
       gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
       gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
       binutils-raw.dev binutils gettext
-      cc.parseResponseFile
+      cc.expand-response-params
     ]) ++ (with pkgs.darwin; [
       dyld Libsystem CF cctools ICU libiconv locale
     ]);

From f9ec52dedceb3904b49c27d49076a881c43ba4cf Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Tue, 4 Jul 2017 01:58:48 +0300
Subject: [PATCH 0147/3246] Added networking.extraLocalHosts option

It adds its contents to '127.0.0.1' line of /etc/hosts
It makes possible to point multiple domains to localhost in correct way
---
 nixos/modules/config/networking.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index d503f5a8b20..ea9e8b712c6 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -20,12 +20,24 @@ in
 
   options = {
 
+    networking.extraLocalHosts = lib.mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "localhost.localdomain" "workinprogress.example.com" ];
+      description = ''
+        Additional entries to be appended to 127.0.0.1 entry in <filename>/etc/hosts</filename>.
+      '';
+    };
+
+
     networking.extraHosts = lib.mkOption {
       type = types.lines;
       default = "";
       example = "192.168.0.1 lanlocalhost";
       description = ''
         Additional entries to be appended to <filename>/etc/hosts</filename>.
+        Note that entries for 127.0.0.1 will not always work correctly if added from here.
+        They should be added via <literal>networking.extraLocalHosts</literal>.
       '';
     };
 
@@ -187,11 +199,11 @@ in
         "rpc".source = pkgs.glibc.out + "/etc/rpc";
 
         # /etc/hosts: Hostname-to-IP mappings.
-        "hosts".text =
+        "hosts".text = let foo = concatStringsSep " " cfg.extraLocalHosts; in
           ''
-            127.0.0.1 localhost
+            127.0.0.1 localhost ${foo}
             ${optionalString cfg.enableIPv6 ''
-              ::1 localhost
+              ::1 localhost ${foo}
             ''}
             ${cfg.extraHosts}
           '';

From aad0ebb19454227bcca81f4856c9f5f2fe55fa2b Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Mon, 3 Jul 2017 23:16:10 -0400
Subject: [PATCH 0148/3246] cc-wrapper: expand-response-params: fix parsing of
 quotes that are quoted and escaped

---
 pkgs/build-support/cc-wrapper/expand-response-params.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/expand-response-params.c b/pkgs/build-support/cc-wrapper/expand-response-params.c
index ca4ba65ec45..05b9c62b1e8 100644
--- a/pkgs/build-support/cc-wrapper/expand-response-params.c
+++ b/pkgs/build-support/cc-wrapper/expand-response-params.c
@@ -62,7 +62,7 @@ void expandArg(String *arg) {
             expandArg(arg);
             resize(arg, 0);
         } else if (cur == unq_esc || cur == sq_esc || cur == dq_esc ||
-                   cur == outside ? next == unq : cur == next) {
+                   (cur == outside ? next == unq : cur == next)) {
             char s = c;
             append(arg, &s, 1);
         }

From c4528eb4cce429095320dec1946adb7990a05eed Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 30 Jun 2017 23:51:42 +0200
Subject: [PATCH 0149/3246] mpd service: Start when needed and harden

---
 nixos/modules/services/audio/mpd.nix | 35 +++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 11628781bbd..bd6c316243c 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -44,6 +44,16 @@ in {
         '';
       };
 
+      startWhenNeeded = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If set, <command>mpd</command> is socket-activated; that
+          is, instead of having it permanently running as a daemon,
+          systemd will start it on the first incoming connection.
+        '';
+      };
+
       musicDirectory = mkOption {
         type = types.path;
         default = "${cfg.dataDir}/music";
@@ -123,10 +133,23 @@ in {
 
   config = mkIf cfg.enable {
 
+    systemd.sockets.mpd = mkIf cfg.startWhenNeeded {
+      description = "Music Player Daemon Socket";
+      wantedBy = [ "sockets.target" ];
+      listenStreams = [
+        "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}"
+      ];
+      socketConfig = {
+        Backlog = 5;
+        KeepAlive = true;
+        PassCredentials = true;
+      };
+    };
+
     systemd.services.mpd = {
       after = [ "network.target" "sound.target" ];
       description = "Music Player Daemon";
-      wantedBy = [ "multi-user.target" ];
+      wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
 
       preStart = ''
         mkdir -p "${cfg.dataDir}" && chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}"
@@ -136,6 +159,16 @@ in {
         User = "${cfg.user}";
         PermissionsStartOnly = true;
         ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon ${mpdConf}";
+        Type = "notify";
+        LimitRTPRIO = 50;
+        LimitRTTIME = "infinity";
+        ProtectSystem = true;
+        NoNewPrivileges = true;
+        ProtectKernelTunables = true;
+        ProtectControlGroups = true;
+        ProtectKernelModules = true;
+        RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
+        RestrictNamespaces = true;
       };
     };
 

From 7f13a3f5b8e8241c97612f74f8603025d1259c4d Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 4 Jul 2017 13:42:53 +0300
Subject: [PATCH 0150/3246] maxx: init at 1.0.0

---
 .../services/x11/desktop-managers/default.nix |  2 +-
 .../services/x11/desktop-managers/maxx.nix    | 46 +++++++++++++
 pkgs/desktops/maxx/default.nix                | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/maxx.nix
 create mode 100644 pkgs/desktops/maxx/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index c207aab5de0..4b57d9641f5 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -19,7 +19,7 @@ in
   # E.g., if Plasma 5 is enabled, it supersedes xterm.
   imports = [
     ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
-    ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
+    ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
new file mode 100644
index 00000000000..258348ee749
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.maxx;
+  deps = [ pkgs.gcc ] ++ cfg.extraPackages;
+in {
+  options.services.xserver.desktopManager.maxx = {
+    enable = mkEnableOption "MaXX desktop environment";
+
+    extraPackages = mkOption {
+      type = with types; listOf package;
+      default = with pkgs; [
+        xorg.xclock
+      ];
+      description = ''
+        Extra packages visible to session.
+      '';
+    };
+  };
+
+  config = mkIf (xcfg.enable && cfg.enable) {
+    environment.systemPackages = [ pkgs.maxx ];
+
+    # there is hardcoded path in binaries
+    system.activationScripts.setup-maxx = ''
+      mkdir -p /opt
+      ln -sfn ${pkgs.maxx}/opt/MaXX /opt
+    '';
+
+    services.xserver.desktopManager.session = [
+    { name = "MaXX";
+      start = ''
+        export PATH="${makeBinPath deps}:$PATH"
+        export GTK_PATH="${pkgs.gtk-engine-murrine}/lib/gtk-2.0:${pkgs.gtk_engines}/lib/gtk-2.0:$GTK_PATH"
+        export GDK_PIXBUF_MODULE_FILE=$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)
+
+        exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt
+      '';
+    }];
+  };
+
+  meta.maintainers = [ maintainers.gnidorah ];
+}
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
new file mode 100644
index 00000000000..95cbd617dc2
--- /dev/null
+++ b/pkgs/desktops/maxx/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl
+, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
+, libXinerama, libXdamage, libICE, libXtst
+, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses5
+, bash }:
+
+let
+  version = "Indy-1.0.0";
+
+  deps = [
+    libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
+    libXinerama libXdamage libICE libXtst
+    stdenv.cc.cc fontconfig pango cairo glib libxml2 atk gtk2 gdk_pixbuf mesa_noglu ncurses5
+  ];
+in stdenv.mkDerivation {
+  name = "MaXX-${version}";
+
+  srcs = [
+    (fetchurl {
+      url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-NO-ARCH.tar.gz";
+      sha256 = "004ia6xl8y2hmbq7j98ppgiwffjc62224x9q6w5z17sjibs8xcvx";
+    })
+    (fetchurl {
+      url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-x86_64.tar.gz";
+      sha256 = "134z7hinh01w43m6xiqgh939w5w79860g4kzsd911rfcl3z353av";
+    })
+  ];
+
+  buildPhase = ''
+    while IFS= read -r -d $'\0' i; do
+      if isELF "$i"; then
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" || true
+        patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i"
+      fi
+    done < <(find "." -type f -print0)
+
+    substituteInPlace bin/adminterm \
+      --replace /bin/bash ${bash}/bin/bash
+
+    substituteInPlace share/misc/HOME/initMaXX-Desktop-Home.sh \
+      --replace "cp " "cp --no-preserve=mode "
+  '';
+
+  installPhase = ''
+    maxx=$out/opt/MaXX
+    mkdir -p "$maxx" $out/share
+
+    mv -- ./* "$maxx"
+    ln -s $maxx/share/icons $out/share
+    ln -s $maxx/share/themes $out/share
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A replica of IRIX Interactive Desktop";
+    homepage = http://www.maxxinteractive.com;
+    license = licenses.free;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = ["x86_64-linux"];
+    hydraPlatforms = [];
+    longDescription = ''
+      A clone of IRIX Interactive Desktop made in agreement with SGI. 
+      Provides simple and fast retro desktop environment.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e27e56d83e..a492c1ba146 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17574,6 +17574,8 @@ with pkgs;
     callPackage = newScope pkgs.mate;
   });
 
+  maxx = callPackage ../desktops/maxx { };
+
   pantheon = recurseIntoAttrs rec {
     callPackage = newScope pkgs.pantheon;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };

From 57a0224a426f1623e4cc2559b1a0f3169f67c561 Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Tue, 4 Jul 2017 21:48:59 +0200
Subject: [PATCH 0151/3246] nix: short TMPDIR for tests on Darwin

This fixes test failures due to overly long nix-daemon socket paths.
---
 pkgs/tools/package-management/nix/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 45dfd52dba1..a90f38ccc09 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -79,6 +79,9 @@ let
 
     doInstallCheck = true;
 
+    # socket path becomes too long otherwise
+    preInstallCheck = lib.optional stdenv.isDarwin "export TMPDIR=/tmp";
+
     separateDebugInfo = stdenv.isLinux;
 
     crossAttrs = {

From 535a6c3520c3e34c5d74008764d12165650ec4d4 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 26 Jun 2017 12:56:00 +0000
Subject: [PATCH 0152/3246] fetchFromGitHub: fix fetchSubmodules=true when
 revision is not hexadecimal

---
 pkgs/build-support/fetchgit/default.nix       | 16 ++--------------
 pkgs/build-support/fetchgit/gitrepotoname.nix | 14 ++++++++++++++
 pkgs/build-support/fetchgit/nix-prefetch-git  |  4 ++--
 pkgs/top-level/all-packages.nix               | 12 +++++++-----
 4 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/build-support/fetchgit/gitrepotoname.nix

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 8e060b87ebd..57afb1c4ab8 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,21 +1,9 @@
-{stdenv, git, cacert}: let
-  urlToName = url: rev: let
-    inherit (stdenv.lib) removeSuffix splitString last;
-    base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
+{stdenv, git, cacert, gitRepoToName}:
 
-    matched = builtins.match "(.*).git" base;
-
-    short = builtins.substring 0 7 rev;
-
-    appendShort = if (builtins.match "[a-f0-9]*" rev) != null
-      then "-${short}"
-      else "";
-  in "${if matched == null then base else builtins.head matched}${appendShort}";
-in
 { url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? deepClone
 , fetchSubmodules ? true, deepClone ? false
 , branchName ? null
-, name ? urlToName url rev
+, name ? gitRepoToName url rev
 , # Shell code executed after the file has been fetched
   # successfully. This can do things like check or transform the file.
   postFetch ? ""
diff --git a/pkgs/build-support/fetchgit/gitrepotoname.nix b/pkgs/build-support/fetchgit/gitrepotoname.nix
new file mode 100644
index 00000000000..9f4392c387f
--- /dev/null
+++ b/pkgs/build-support/fetchgit/gitrepotoname.nix
@@ -0,0 +1,14 @@
+{ lib }:
+
+urlOrRepo: rev: let
+  inherit (lib) removeSuffix splitString last;
+  base = last (splitString ":" (baseNameOf (removeSuffix "/" urlOrRepo)));
+
+  matched = builtins.match "(.*).git" base;
+
+  short = builtins.substring 0 7 rev;
+
+  appendShort = if (builtins.match "[a-f0-9]*" rev) != null
+    then "-${short}"
+    else "";
+in "${if matched == null then base else builtins.head matched}${appendShort}"
\ No newline at end of file
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 9e4f346f7a5..c3ba15d5902 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -282,8 +282,8 @@ _clone_user_rev() {
             if test -z "$(echo "$rev" | tr -d 0123456789abcdef)"; then
                 clone "$dir" "$url" "$rev" "" 1>&2
             else
-                echo 1>&2 "Bad commit hash or bad reference."
-                exit 1
+                # if revision is not hexadecimal it might be a tag
+                clone "$dir" "$url" "" "refs/tags/$rev" 1>&2
             fi;;
     esac
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5114b46bf39..aa6259c3f84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -185,8 +185,10 @@ with pkgs;
 
   fetchzip = callPackage ../build-support/fetchzip { };
 
+  gitRepoToName = callPackage ../build-support/fetchgit/gitrepotoname.nix { };
+
   fetchFromGitHub = {
-    owner, repo, rev, name ? "${repo}-${rev}-src",
+    owner, repo, rev, name ? gitRepoToName repo rev,
     fetchSubmodules ? false, private ? false,
     githubBase ? "github.com", varPrefix ? null,
     ... # For hash agility
@@ -223,7 +225,7 @@ with pkgs;
     } // passthruAttrs) // { inherit rev; };
 
   fetchFromBitbucket = {
-    owner, repo, rev, name ? "${repo}-${rev}-src",
+    owner, repo, rev, name ? gitRepoToName repo rev,
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
@@ -234,7 +236,7 @@ with pkgs;
 
   # cgit example, snapshot support is optional in cgit
   fetchFromSavannah = {
-    repo, rev, name ? "${repo}-${rev}-src",
+    repo, rev, name ? gitRepoToName repo rev,
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
@@ -244,7 +246,7 @@ with pkgs;
 
   # gitlab example
   fetchFromGitLab = {
-    owner, repo, rev, name ? "${repo}-${rev}-src",
+    owner, repo, rev, name ? gitRepoToName repo rev,
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
@@ -254,7 +256,7 @@ with pkgs;
 
   # gitweb example, snapshot support is optional in gitweb
   fetchFromRepoOrCz = {
-    repo, rev, name ? "${repo}-${rev}-src",
+    repo, rev, name ? gitRepoToName repo rev,
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;

From b935b21ffd06284d0c8297651d7d28c0961d3274 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 26 Jun 2017 18:10:37 +0000
Subject: [PATCH 0153/3246] fix regressions where "${repo}-${rev}-scr" pattern
 was hardcoded

---
 pkgs/applications/audio/sisco.lv2/default.nix  | 2 +-
 pkgs/development/interpreters/ruby/default.nix | 2 +-
 pkgs/servers/mail/postfix/pfixtools.nix        | 2 +-
 pkgs/tools/networking/email/default.nix        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix
index d429d545234..8ac7a9115ca 100644
--- a/pkgs/applications/audio/sisco.lv2/default.nix
+++ b/pkgs/applications/audio/sisco.lv2/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   inherit name;
 
   srcs = [ src robtkSrc ];
-  sourceRoot = "sisco.lv2-${src.rev}-src";
+  sourceRoot = src.name;
 
   buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ];
 
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index a552b2719bb..f3d4ae4bb00 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -59,7 +59,7 @@ let
         srcs = [ rubySrc rubygemsSrc ];
         sourceRoot =
           if useRailsExpress then
-            "ruby-${tag}-src"
+            rubySrc.name
           else
             unpackdir rubySrc;
 
diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix
index 1bbe6f3466b..6a0d7fb588f 100644
--- a/pkgs/servers/mail/postfix/pfixtools.nix
+++ b/pkgs/servers/mail/postfix/pfixtools.nix
@@ -10,7 +10,7 @@ let
     sha256 = "1vmbrw686f41n6xfjphfshn96vl07ynvnsyjdw9yfn9bfnldcjcq";
   };
 
-  srcRoot = "pfixtools-${pfixtoolsSrc.rev}-src";
+  srcRoot = pfixtoolsSrc.name;
 
   libCommonSrc = fetchFromGitHub {
     owner = "Fruneau";
diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix
index 017da63a1e9..c7a6fbcfd7c 100644
--- a/pkgs/tools/networking/email/default.nix
+++ b/pkgs/tools/networking/email/default.nix
@@ -8,7 +8,7 @@ let
     sha256 = "1cxxzhm36civ6vjdgrk7mfmlzkih44kdii6l2xgy4r434s8rzcpn";
   };
 
-  srcRoot = "eMail-${eMailSrc.rev}-src";
+  srcRoot = eMailSrc.name;
 
   dlibSrc = fetchFromGitHub {
     owner = "deanproxy";

From e7521e289ccbcba8928a0c0a2220fbbb35716556 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 4 Jul 2017 20:09:34 +0000
Subject: [PATCH 0154/3246] gitRepoToName: make it compatible with old
 fetchFromGitHub's "${repo}-${rev}-scr" to avoid mass rebuild

---
 pkgs/build-support/fetchgit/gitrepotoname.nix | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/fetchgit/gitrepotoname.nix b/pkgs/build-support/fetchgit/gitrepotoname.nix
index 9f4392c387f..90005b54569 100644
--- a/pkgs/build-support/fetchgit/gitrepotoname.nix
+++ b/pkgs/build-support/fetchgit/gitrepotoname.nix
@@ -1,14 +1,19 @@
 { lib }:
 
-urlOrRepo: rev: let
-  inherit (lib) removeSuffix splitString last;
-  base = last (splitString ":" (baseNameOf (removeSuffix "/" urlOrRepo)));
+let
+  inherit (lib) removeSuffix hasPrefix removePrefix splitString stringToCharacters concatMapStrings last elem;
 
-  matched = builtins.match "(.*).git" base;
-
-  short = builtins.substring 0 7 rev;
-
-  appendShort = if (builtins.match "[a-f0-9]*" rev) != null
-    then "-${short}"
-    else "";
-in "${if matched == null then base else builtins.head matched}${appendShort}"
\ No newline at end of file
+  allowedChars = stringToCharacters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-._?=";
+  sanitizeStoreName = s:
+    let
+      s' = concatMapStrings (c: if elem c allowedChars then c else "") (stringToCharacters s);
+      s'' = if hasPrefix "." s' then "_${removePrefix "." s'}" else s';
+    in
+      s'';
+in
+  urlOrRepo: rev:
+    let
+      repo' = last (splitString ":" (baseNameOf (removeSuffix ".git" (removeSuffix "/" urlOrRepo))));
+      rev' = baseNameOf rev;
+    in
+     "${sanitizeStoreName repo'}-${sanitizeStoreName rev'}-src"

From 12f54a57467acb9f3a44cd0959a4e32c591856e1 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Fri, 30 Jun 2017 15:55:40 +0200
Subject: [PATCH 0155/3246] networkmanager service: use resolved if enabled

---
 nixos/modules/services/networking/networkmanager.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 58c93d8e2ac..cbe8d059c84 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -9,11 +9,16 @@ let
   # /var/lib/misc is for dnsmasq.leases.
   stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";
 
+  dns =
+    if cfg.useDnsmasq then "dnsmasq"
+    else if config.services.resolved.enable then "systemd-resolved"
+    else "default";
+
   configFile = writeText "NetworkManager.conf" ''
     [main]
     plugins=keyfile
     dhcp=${cfg.dhcp}
-    dns=${if cfg.useDnsmasq then "dnsmasq" else "default"}
+    dns=${dns}
 
     [keyfile]
     ${optionalString (cfg.unmanaged != [])

From aebe8586bc94ffe6c828abd2712475a14b681108 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 4 Jul 2017 21:17:04 -0400
Subject: [PATCH 0156/3246] ammonite: 0.9.9 -> 1.0.0

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 12551ed741c..feb6865566f 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -5,12 +5,12 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "0.9.9";
+  version = "1.0.0";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "0qiqy681y1w21gjxw30kn44vxh9615j3825v06aq690p56w3rc63";
+    sha256 = "0d74b3aasgg4ap5ishzzm4jbf1k4dxv7gzd88d69miyapsaa4p0c";
   };
 
   propagatedBuildInputs = [ jre ] ;

From fbbf926ce956808509fc94fafcd8ce12b4d93934 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 4 Jul 2017 21:36:30 -0400
Subject: [PATCH 0157/3246] ammonite: add test

---
 nixos/tests/ammonite.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 nixos/tests/ammonite.nix

diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix
new file mode 100644
index 00000000000..e1dee71fddf
--- /dev/null
+++ b/nixos/tests/ammonite.nix
@@ -0,0 +1,20 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "ammonite";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  nodes = {
+    amm =
+      { config, pkgs, ... }:
+        {
+          environment.systemPackages = [ pkgs.ammonite ];
+        };
+    };
+
+  testScript = ''
+    startAll;
+
+    $amm->succeed("amm -c 'val foo = 21; println(foo * 2)' | grep 42")
+  '';
+})

From 448fe16856176a633e4e05d82ac57983d5e61bfa Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Wed, 5 Jul 2017 04:53:51 +0000
Subject: [PATCH 0158/3246] pharo: Add PharoV60.sources to support newer images

---
 pkgs/development/pharo/vm/share.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
index aba42e3981c..54e686c82fe 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
     sha256 = "0ykl1y0a4yy5qn8fwz0wkl8fcn4pqv9q0w0r2llhzdz3jdg1k69g";
   };
 
+  sources60Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV60.sources.zip;
+    sha256 = "0xbdi679ryb2zg412xy6zkh22l20pmbl92m3qhfgzjvgybna8z2a";
+  };
+
   buildInputs = [ unzip ];
 
   installPhase = ''
@@ -43,6 +48,7 @@ stdenv.mkDerivation rec {
     unzip ${sources30Zip} -d $prefix/lib/
     unzip ${sources40Zip} -d $prefix/lib/
     unzip ${sources50Zip} -d $prefix/lib/
+    unzip ${sources60Zip} -d $prefix/lib/
   '';
 
   meta = {

From af92427f46f866327d757df8c0ed05ba129847a6 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Wed, 5 Jul 2017 04:54:50 +0000
Subject: [PATCH 0159/3246] pharo: Compile with -DPharoVM

This is important. The VM was not compiled in "Pharo mode" and this
made certain primitives return different values to the Smalltalk side.

(Practically speaking I am surprised that the VM has been working
basically fine for me for weeks, but this resolves a problem with
adding filetree:// repositories with Monticello that failed in an
obscure way when the file permissions lookup primitive did not behave
as expected.)

See also:
https://pharo.fogbugz.com/f/cases/20217/Image-does-not-detect-incompatible-opensmalltalk-vm
---
 pkgs/development/pharo/vm/build-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 2f2e125ea39..054b64db732 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--without-npsqueak"
                      "--with-vmversion=5.0"
                      "--with-src=${vm}" ];
-  CFLAGS = "-msse2 -D_GNU_SOURCE -DCOGMTVM=0 -g -O2 -DNDEBUG -DDEBUGVM=0";
+  CFLAGS = "-DPharoVM -DIMMUTABILITY=1 -msse2 -D_GNU_SOURCE -DCOGMTVM=0 -g -O2 -DNDEBUG -DDEBUGVM=0";
   LDFLAGS = "-Wl,-z,now";
 
   # VM sources require some patching before build.

From febadbce3f5f5015f133d04e9476634c988a19b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Jul 2017 09:09:12 +0200
Subject: [PATCH 0160/3246] gnutls: bugfix 3.5.13 -> 3.5.14

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

diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index e47537c64a9..62ff2547569 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.5.13";
+  version = "3.5.14";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
-    sha256 = "15ihq6p0hnnhs8cnjrkj40dmlcaa1jjg8xg0g2ydbnlqs454ixbr";
+    sha256 = "1nhv0mf3apz65ljh335l8xds7wpn08ywljkrvws08apljbn2v8aa";
   };
 
   # Skip two tests introduced in 3.5.11.  Probable reasons of failure:

From 1db1ba9048483005ea86709cb33f23a946a990b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 5 Jul 2017 09:33:39 +0200
Subject: [PATCH 0161/3246] groff: (nitpick) quote shell variables

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

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 4e2f6af0669..fc6b1abf24d 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
   # Remove example output with (random?) colors and creation date
   # to avoid non-determinism in the output.
   postInstall = ''
-    rm $doc/share/doc/groff/examples/hdtbl/*color*ps
-    find $doc/share/doc/groff/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//'
+    rm "$doc"/share/doc/groff/examples/hdtbl/*color*ps
+    find "$doc"/share/doc/groff/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//'
     for f in 'man.local' 'mdoc.local'; do
         cat '${./site.tmac}' >>"$out/share/groff/site-tmac/$f"
     done

From cd8a1a7ceb373a3bcf7894827a6e2e6bf39d0295 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Wed, 5 Jul 2017 13:48:18 +0200
Subject: [PATCH 0162/3246] networkd: Allow new MulticastDNS setting which
 gained an implementation in systemd v233

---
 nixos/modules/system/boot/networkd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index f96dde15361..b151b568892 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -94,7 +94,7 @@ let
   checkNetwork = checkUnitConfig "Network" [
     (assertOnlyFields [
       "Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute"
-      "LLMNR" "Domains" "Bridge" "Bond"
+      "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond"
     ])
     (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"])
     (assertValueOneOf "DHCPServer" boolValues)
@@ -103,6 +103,7 @@ let
     (assertValueOneOf "IPv4LL" boolValues)
     (assertValueOneOf "IPv4LLRoute" boolValues)
     (assertValueOneOf "LLMNR" boolValues)
+    (assertValueOneOf "MulticastDNS" boolValues)
   ];
 
   checkAddress = checkUnitConfig "Address" [

From 69a8564521f17b7c2f4faca1f92aac856b57f733 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Wed, 5 Jul 2017 15:27:28 +0200
Subject: [PATCH 0163/3246] go-ethereum: 1.4.7 -> 1.6.6

---
 pkgs/applications/altcoins/go-ethereum.nix | 23 ++++++----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 3beb38e0d2d..7f7c3f304c2 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -1,31 +1,20 @@
-{ stdenv, lib, go, fetchgit }:
+{ stdenv, lib, clang, buildGoPackage, fetchgit }:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "go-ethereum-${version}";
-  version = "1.4.7";
+  version = "1.6.6";
   rev = "refs/tags/v${version}";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
-  buildInputs = [ go ];
+  buildInputs = [ clang ];
+  preBuild = "export CC=clang";
 
   src = fetchgit {
     inherit rev;
     url = "https://${goPackagePath}";
-    sha256 = "19q518kxkvrr44cvsph4wv3lr6ivqsckz1f22r62932s3sq6gyd8";
+    sha256 = "066s7fp9pbyq670xwnib4p7zaxs941r9kpvj2hm6bkr28yrpvp1a";
   };
 
-  buildPhase = ''
-    export GOROOT=$(mktemp -d --suffix=-goroot)
-    ln -sv ${go}/share/go/* $GOROOT
-    ln -svf ${go}/bin $GOROOT
-    make all
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -v build/bin/* $out/bin
-  '';
-
   meta = {
     homepage = "https://ethereum.github.io/go-ethereum/";
     description = "Official golang implementation of the Ethereum protocol";

From ad627ae3e83c078590d7516bdf54e80c46b2a758 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 5 Jul 2017 16:01:05 +0200
Subject: [PATCH 0164/3246] mergerfs: 2.22.1 -> 2.23.0

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

diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index 0259af7a63e..929c6690a26 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mergerfs-${version}";
-  version = "2.22.1";
+  version = "2.23.0";
 
   # not using fetchFromGitHub because of changelog being built with git log
   src = fetchgit {
     url = "https://github.com/trapexit/mergerfs";
     rev = "refs/tags/${version}";
-    sha256 = "12dm64l74wyagbwxsz57p8j3dwl9hgi0j3b6i0pn9m5ar7qrnv00";
+    sha256 = "0k4nn0f4c355q7hnni7iia8qi9m0khvyd04hx1hmlrnf0zsi9mfw";
     deepClone = true;
     leaveDotGit = true;
   };

From c23dcd72a0a0f5c4e0b63418a8602aa7f131219a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 5 Jul 2017 16:04:54 +0200
Subject: [PATCH 0165/3246] Enable some more debug info

---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 1 +
 pkgs/development/libraries/boehm-gc/default.nix    | 1 +
 pkgs/development/libraries/libsodium/default.nix   | 1 +
 pkgs/development/libraries/openssl/default.nix     | 1 +
 pkgs/development/libraries/sqlite/default.nix      | 1 +
 pkgs/tools/networking/curl/default.nix             | 1 +
 6 files changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 974989dc24b..9f97b18b4d7 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -26,6 +26,7 @@ in stdenv.mkDerivation rec {
   # FIXME: might be nice to put different APIs in different outputs
   # (e.g. libaws-cpp-sdk-s3.so in output "s3").
   outputs = [ "out" "dev" ];
+  separateDebugInfo = stdenv.isLinux;
 
   buildInputs = [ cmake curl ];
 
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index d32ec6cbf58..e4311c0a5e9 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   outputs = [ "out" "dev" "doc" ];
+  separateDebugInfo = stdenv.isLinux;
 
   configureFlags =
     [ "--enable-cplusplus" ]
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index bfe224d28cd..b508b2fea0e 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "out" "dev" ];
+  separateDebugInfo = stdenv.isLinux;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 2120e60ec6a..c0296f42406 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -29,6 +29,7 @@ let
 
     outputs = [ "bin" "dev" "out" "man" ];
     setOutputFlags = false;
+    separateDebugInfo = stdenv.isLinux;
 
     nativeBuildInputs = [ perl ];
     buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 5230df99524..21d89c49e7c 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
   };
 
   outputs = [ "bin" "dev" "out" ];
+  separateDebugInfo = stdenv.isLinux;
 
   buildInputs = lib.optionals interactive [ readline ncurses ];
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index d1f7c4112c6..daf5a19b01c 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
+  separateDebugInfo = stdenv.isLinux;
 
   enableParallelBuilding = true;
 

From de6ec55911966ede962221090c77ae29e7d07dff Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Wed, 5 Jul 2017 16:33:52 +0200
Subject: [PATCH 0166/3246] seth: 0.5.1 -> 0.5.6

---
 pkgs/applications/altcoins/seth.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix
index bf2d6f65326..b2f5cfdea06 100644
--- a/pkgs/applications/altcoins/seth.nix
+++ b/pkgs/applications/altcoins/seth.nix
@@ -1,22 +1,22 @@
 { stdenv, makeWrapper, lib, fetchFromGitHub
-, bc, coreutils, curl, ethabi, git, gnused, jshon, solc, which }:
+, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which }:
 
 stdenv.mkDerivation rec {
   name = "seth-${version}";
-  version = "0.5.1";
+  version = "0.5.6";
 
   src = fetchFromGitHub {
     owner = "dapphub";
     repo = "seth";
     rev = "v${version}";
-    sha256 = "1qph1gldj24r8l6aswb1w133lrm8zsxmmxl4krjik0a73bm4ghdm";
+    sha256 = "1zl70xy7njjwy4k4g84v7lpf9a2nnnbxh4mkpw7jzqfs2mr636z6";
   };
 
   nativeBuildInputs = [makeWrapper];
   buildPhase = "true";
   makeFlags = ["prefix=$(out)"];
   postInstall = let path = lib.makeBinPath [
-    bc coreutils curl ethabi git gnused jshon solc which
+    bc coreutils curl ethabi git gnused jshon perl solc which
   ]; in ''
     wrapProgram "$out/bin/seth" --prefix PATH : "${path}"
   '';

From 52ceb981a112a6323b5662a75ca72355f0e2da92 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 5 Jul 2017 17:20:12 +0200
Subject: [PATCH 0167/3246] gitlab-runner_1_11: 1.11.4 -> 1.11.5

---
 .../tools/continuous-integration/gitlab-runner/v1.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
index d51a3270592..a3e6a063596 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "1.11.4";
+  version = "1.11.5";
   # 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 = "1ijkzn8jkzx1dzxhkf17987ligyf758xzas6ysix5b781jnkdm8z";
+    sha256 = "0qy3xrq574c1lhkqw1zrkcn32w0ky3f4fppzdjhb5zwqvnaz7kx0";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "0sq2nndnkzqv2yjljg08xwa3ppddn6vqcivhfh43zwwmansvb9ha";
+    sha256 = "12clc28yc157s2kaa8239p0g086vq062jfjh2m1bxqmaypw9pyla";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "1pm88546cijmrrcvvrajp2g6rsrzxhy83cwwwky8jjkl5w4hhmz4";
+    sha256 = "1xgx8jbgcc3ga7dkjxa2i8nj4afsdavzpfrgpdzma03jkcq1g2sv";
   };
 
   patches = [ ./fix-shell-path.patch ];

From ab8dd33e5cda3abe78d244f23e6097cd3e3bca4e Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 5 Jul 2017 16:01:26 +0000
Subject: [PATCH 0168/3246] support old naming, just add escaping of unsafe
 chars

---
 pkgs/build-support/fetchgit/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 57afb1c4ab8..8e060b87ebd 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,9 +1,21 @@
-{stdenv, git, cacert, gitRepoToName}:
+{stdenv, git, cacert}: let
+  urlToName = url: rev: let
+    inherit (stdenv.lib) removeSuffix splitString last;
+    base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
 
+    matched = builtins.match "(.*).git" base;
+
+    short = builtins.substring 0 7 rev;
+
+    appendShort = if (builtins.match "[a-f0-9]*" rev) != null
+      then "-${short}"
+      else "";
+  in "${if matched == null then base else builtins.head matched}${appendShort}";
+in
 { url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? deepClone
 , fetchSubmodules ? true, deepClone ? false
 , branchName ? null
-, name ? gitRepoToName url rev
+, name ? urlToName url rev
 , # Shell code executed after the file has been fetched
   # successfully. This can do things like check or transform the file.
   postFetch ? ""

From 5142e8f2b2057ec02c59f4406019d41bebaff59f Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Wed, 5 Jul 2017 09:12:03 -0700
Subject: [PATCH 0169/3246] Grammar, spelling fixed.

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

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index 6a14854b5c5..eb1696ad224 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -61,9 +61,9 @@ bundlerApp {
   };
 }]]>
 
-<para>The chief advantage of <literal>bundlerApp</literal> over <literal>bundlerEnv</literal> is the the executables introduced in the environment are precisely those selected in the <literal>exes</literal> list, as opposed to <literal>bundlerEnv</literal> which adds all the executables made available by gems in the gemset, which can mean e.g. <command>rspec</command> or <command>rake</command> in unpredicable versions available from various packages.
+<para>The chief advantage of <literal>bundlerApp</literal> over <literal>bundlerEnv</literal> is the executables introduced in the environment are precisely those selected in the <literal>exes</literal> list, as opposed to <literal>bundlerEnv</literal> which adds all the executables made available by gems in the gemset, which can mean e.g. <command>rspec</command> or <command>rake</command> in unpredictable versions available from various packages.
 
-<para>Resulting derivations for both builders also have two helpful items, <literal>env</literal> and <literal>wrapper</literal>. The first one allows one to quickly drop into
+<para>Resulting derivations for both builders also have two helpful attributes, <literal>env</literal> and <literal>wrapper</literal>. The first one allows one to quickly drop into
 <command>nix-shell</command> with the specified environment present. E.g. <command>nix-shell -A sensu.env</command> would give you an environment with Ruby preset
 so it has all the libraries necessary for <literal>sensu</literal> in its paths. The second one can be used to make derivations from custom Ruby scripts which have
 <filename>Gemfile</filename>s with their dependencies specified. It is a derivation with <command>ruby</command> wrapped so it can find all the needed dependencies.

From 5b9f4e160d3e57713f22b9c7124f4ec5e1c0e4b0 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Wed, 5 Jul 2017 16:31:42 +0200
Subject: [PATCH 0170/3246] solc: 0.4.11 -> 0.4.12

---
 pkgs/development/compilers/solc/default.nix | 26 +++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 3ed5a2bef72..6ace7d96be8 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,28 +1,30 @@
 { stdenv, fetchzip, fetchgit, boost, cmake }:
 
-let jsoncpp = fetchzip {
-  url = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
-  sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0";
-}; in
+let
+  version = "0.4.12";
+  rev = "194ff033ae44944ac59aa7bd3da89ba94ec5893c";
+  sha256 = "0gkg3nay0625qmhxxxax1d1c4dl554ri3pkwd12qfg6g1w6j04w7";
+  jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
+  jsoncpp = fetchzip {
+    url = jsoncppURL;
+    sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0";
+  };
+in
 
-let commit = "68ef5810593e7c8092ed41d5f474dd43141624eb"; in
-
-stdenv.mkDerivation rec {
-  version = "0.4.11";
+stdenv.mkDerivation {
   name = "solc-${version}";
 
   # Cannot use `fetchFromGitHub' because of submodules
   src = fetchgit {
     url = "https://github.com/ethereum/solidity";
-    rev = commit;
-    sha256 = "13zycybf23yvf3hkf9zgw9gbc1y4ifzxaf7sll69bsn24fcyq961";
+    inherit rev sha256;
   };
 
   patchPhase = ''
-    echo >commit_hash.txt ${commit}
+    echo >commit_hash.txt '${rev}'
     echo >prerelease.txt
     substituteInPlace deps/jsoncpp.cmake \
-      --replace https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz ${jsoncpp}
+      --replace '${jsoncppURL}' ${jsoncpp}
     substituteInPlace cmake/EthCompilerSettings.cmake \
       --replace 'add_compile_options(-Werror)' ""
   '';

From a63732f9b22f4687c647b2837afd0742640efb8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 5 Jul 2017 20:21:51 +0200
Subject: [PATCH 0171/3246] Kwallet: Fixes bug that dbus could not find the
 kwallet service

---
 .../libraries/kde-frameworks/kwallet-dbus.patch          | 9 +++++++++
 pkgs/development/libraries/kde-frameworks/kwallet.nix    | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch

diff --git a/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch
new file mode 100644
index 00000000000..00f3d8baedf
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch
@@ -0,0 +1,9 @@
+diff --git a/src/runtime/kwalletd/org.kde.kwalletd5.service.in b/src/runtime/kwalletd/org.kde.kwalletd5.service.in
+index 76eb90e..7a78e83 100644
+--- a/src/runtime/kwalletd/org.kde.kwalletd5.service.in
++++ b/src/runtime/kwalletd/org.kde.kwalletd5.service.in
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=org.kde.kwalletd5
+-Exec=@CMAKE_INSTALL_PREFIX@/bin/kwalletd5
++Exec=@CMAKE_INSTALL_BINDIR@/kwalletd5
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index fca0dedd083..ece915071ad 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -15,4 +15,5 @@ mkDerivation {
     knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme
   ];
   propagatedBuildInputs = [ qtbase ];
+  patches = [ ./kwallet-dbus.patch ];
 }

From 754c3f6ba4a33cfd4f573c1fee3b5df74ba00ee2 Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Wed, 5 Jul 2017 15:54:45 -0400
Subject: [PATCH 0172/3246] cc-wrapper: fix response file parsing on ios-cross

---
 pkgs/os-specific/darwin/ios-cross/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
index e0981d48c8c..f56c8148317 100644
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ b/pkgs/os-specific/darwin/ios-cross/default.nix
@@ -6,7 +6,9 @@
 , stdenv
 , coreutils
 , gnugrep
-, hostPlatform, targetPlatform
+, buildPackages
+, hostPlatform
+, targetPlatform
 }:
 
 /* As of this writing, known-good prefix/arch/simulator triples:
@@ -29,7 +31,7 @@ let
   sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk";
 
 in (import ../../../build-support/cc-wrapper {
-    inherit stdenv coreutils gnugrep runCommand;
+    inherit stdenv coreutils gnugrep runCommand buildPackages;
     nativeTools = false;
     nativeLibc = false;
     inherit binutils;

From eca3e8cc4be16b092e55295d69f58cf92297812f Mon Sep 17 00:00:00 2001
From: tjikini <ildrenchay@gmail.com>
Date: Wed, 5 Jul 2017 23:37:11 +0300
Subject: [PATCH 0173/3246] elvish: 0.5 -> 0.9

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

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 7dc6029acb4..ee0de492926 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "elvish-${version}";
-  version = "0.5";
+  version = "0.9";
 
   goPackagePath = "github.com/elves/elvish";
 
@@ -10,13 +10,13 @@ buildGoPackage rec {
     repo = "elvish";
     owner = "elves";
     rev = version;
-    sha256 = "1dk5f8a2wpgd5cw45ippvx46fxk0yap64skfpzpiqz8bkbnrwbz6";
+    sha256 = "0alsv04iihrk1nffp6fmyzxid26dqhg1k45957c2ymyzyq9cglxj";
   };
 
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
-    description = "A Novel unix shell in go language";
+    description = "A friendly and expressive Unix shell";
     homepage = https://github.com/elves/elvish;
     license = licenses.bsd2;
     maintainers = with maintainers; [ vrthra ];

From 6fd51f96fe99409d67a08a3eaad34108f6ab1b04 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 1 Jul 2017 15:25:20 +0100
Subject: [PATCH 0174/3246] qbs: init at 1.8

---
 .../tools/build-managers/qbs/default.nix      | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/qbs/default.nix

diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
new file mode 100644
index 00000000000..dc2d545a765
--- /dev/null
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, qt5, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "qbs-${version}";
+
+  version = "1.8";
+
+  src = fetchFromGitHub {
+    owner = "qt-labs";
+    repo = "qbs";
+    rev = "fa9c21d6908e0dad805113f570ac883c1dc5067a";
+    sha256 = "1manriz75rav1vldkk829yk1la9md4m872l5ykl9m982i9801d9g";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = with qt5; [
+    qtbase
+    qtscript
+  ];
+
+  installFlags = [ "INSTALL_ROOT=$(out)" ];
+
+  buildPhase = ''
+    # From http://doc.qt.io/qbs/building.html
+    qmake -r qbs.pro
+    make
+  '';
+
+  postInstall = ''
+    mv $out/usr/local/* "$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool that helps simplify the build process for developing projects across multiple platforms";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ expipiplus1 ];
+    inherit version;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39aeecfcdbb..7224abfeb4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9430,6 +9430,8 @@ with pkgs;
 
   re2 = callPackage ../development/libraries/re2 { };
 
+  qbs = callPackage ../development/tools/build-managers/qbs { };
+
   qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
   qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; };
 

From 6bf72482eb2c0c5908af0395e616e80c1de7c8f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 6 Jul 2017 00:44:41 +0200
Subject: [PATCH 0175/3246] make-autostartitem: Use the right path for storing
 the desktop files

The freedesktop specification says that the autostart folder is located at $XDG_CONFIG_DIRS/autostart.
Nixos defines XDG_CONFIG_DIRS as /etc/xdg. So we need to copy the desktop files into the right folder
with make-startupitem.
---
 pkgs/build-support/make-startupitem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix
index fad6f00d821..da1d4105c89 100644
--- a/pkgs/build-support/make-startupitem/default.nix
+++ b/pkgs/build-support/make-startupitem/default.nix
@@ -19,14 +19,14 @@ stdenv.mkDerivation {
   priority = 5;
 
   buildCommand = ''
-    mkdir -p $out/share/autostart
+    mkdir -p $out/etc/xdg/autostart
     target=${name}.desktop
     cp ${package}/share/applications/${srcPrefix}${name}.desktop $target
     chmod +rw $target
     echo "X-KDE-autostart-phase=${phase}" >> $target
     ${lib.optionalString (after != null) ''echo "${after}" >> $target''}
     ${lib.optionalString (condition != null) ''echo "${condition}" >> $target''}
-    cp $target $out/share/autostart
+    cp $target $out/etc/xdg/autostart
   '';
 
   # this will automatically put 'package' in the environment when you

From 407324faa9b1a4a0641cb1146cc910328210ab6e Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Wed, 5 Jul 2017 16:28:01 -0700
Subject: [PATCH 0176/3246] Rename nylas-mail to nylas-mail-bin.

Change pkg in module, and name in pkg.
---
 nixos/modules/programs/nylas-mail.nix                         | 2 +-
 .../mailreaders/{nylas-mail => nylas-mail-bin}/default.nix    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/applications/networking/mailreaders/{nylas-mail => nylas-mail-bin}/default.nix (90%)

diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix
index fc18a9a4760..9a6cf755f2a 100644
--- a/nixos/modules/programs/nylas-mail.nix
+++ b/nixos/modules/programs/nylas-mail.nix
@@ -27,7 +27,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [pkgs.nylas-mail];
+    environment.systemPackages = [ pkgs.nylas-mail-bin ];
 
     services.gnome3.gnome-keyring = mkIf cfg.gnome3-keyring {
       enable = true;
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
similarity index 90%
rename from pkgs/applications/networking/mailreaders/nylas-mail/default.nix
rename to pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
index b9d4be3e380..4c768325fee 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation rec {
   name = "${pkgname}-${version}";
-  pkgname = "nylas-mail";
+  pkgname = "nylas-mail-bin";
   version = "2.0.32";
   subVersion = "fec7941";
 
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Open-source mail client built on the modern web with Electron, React, and Flux";
     longDescription = ''
-      Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. To run nylas-mail, an additional manual step is required. Make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup".
+      Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. Nylas Mail can be enabled with it's requirements by enabling 'services.nylas-mail.enable=true'. Alternatively, make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup".
     '';
     license = licenses.gpl3;
     maintainers = with maintainers; [ johnramsden ];

From c38207983a04c3a6a17ce77e854ce2ffde207283 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Wed, 5 Jul 2017 16:54:30 -0700
Subject: [PATCH 0177/3246] Missed the attribute name in all-packages.nix
 during rename.

---
 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 6c95a907864..8b2193a45ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15910,7 +15910,7 @@ with pkgs;
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };
 
-  nylas-mail = callPackage ../applications/networking/mailreaders/nylas-mail { };
+  nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { };
 
   thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
     inherit (gnome2) libIDL;

From 3ec2a2f476d32be5376e3cbd3253e750eaec70d5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Jul 2017 20:09:14 -0400
Subject: [PATCH 0178/3246] linux: Clean up kernel config warnings

---
 .../linux/kernel/common-config.nix            | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 912fb8dcee4..48b0352d8e9 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -39,7 +39,7 @@ with stdenv.lib;
   SCHEDSTATS n
   DETECT_HUNG_TASK y
 
-  ${optionalString (versionOlder version "4.10") ''
+  ${optionalString (versionOlder version "4.4") ''
     CPU_NOTIFIER_ERROR_INJECT? n
   ''}
 
@@ -593,7 +593,7 @@ with stdenv.lib;
   FW_LOADER_USER_HELPER_FALLBACK? n
 
   # Disable various self-test modules that have no use in a production system
-  ${optionalString (versionOlder version "4.9") ''
+  ${optionalString (versionOlder version "4.4") ''
     ARM_KPROBES_TEST? n
   ''}
 
@@ -602,8 +602,6 @@ with stdenv.lib;
   BACKTRACE_SELF_TEST? n
   CRC32_SELFTEST? n
   CRYPTO_TEST? n
-  DRM_DEBUG_MM_SELFTEST? n
-  EFI_TEST? n
   GLOB_SELFTEST? n
   INTERVAL_TREE_TEST? n
   LNET_SELFTEST? n
@@ -612,29 +610,37 @@ with stdenv.lib;
   NOTIFIER_ERROR_INJECTION? n
   PERCPU_TEST? n
   RBTREE_TEST? n
-  RCU_PERF_TEST? n
   RCU_TORTURE_TEST? n
-  TEST_ASYNC_DRIVER_PROBE? n
-  TEST_BITMAP? n
   TEST_BPF? n
   TEST_FIRMWARE? n
-  TEST_HASH? n
   TEST_HEXDUMP? n
   TEST_KSTRTOX? n
   TEST_LIST_SORT? n
   TEST_LKM? n
-  TEST_PARMAN? n
   TEST_PRINTF? n
   TEST_RHASHTABLE? n
-  TEST_SORT? n
   TEST_STATIC_KEYS? n
   TEST_STRING_HELPERS? n
   TEST_UDELAY? n
   TEST_USER_COPY? n
-  TEST_UUID? n
-  WW_MUTEX_SELFTEST? n
   XZ_DEC_TEST? n
 
+  ${optionalString (versionOlder version "4.4") ''
+    EFI_TEST? n
+    RCU_PERF_TEST? n
+    TEST_ASYNC_DRIVER_PROBE? n
+    TEST_BITMAP? n
+    TEST_HASH? n
+    TEST_UUID? n
+  ''}
+
+  ${optionalString (versionAtLeast version "4.11") ''
+    DRM_DEBUG_MM_SELFTEST? n
+    TEST_PARMAN? n
+    TEST_SORT? n
+    WW_MUTEX_SELFTEST? n
+  ''}
+
   # ChromiumOS support
   ${optionalString (features.chromiumos or false) ''
     CHROME_PLATFORMS y

From 905fff7d3f925a083fc28fcd52db107df19b4397 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Wed, 5 Jul 2017 19:24:09 +0200
Subject: [PATCH 0179/3246] hsevm: init at 0.3.2

---
 pkgs/applications/altcoins/default.nix |  2 +
 pkgs/applications/altcoins/hsevm.nix   | 53 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 3 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/altcoins/hsevm.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 1fcfd5f2b60..9f227ad3320 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -39,6 +39,8 @@ rec {
   ethrun = callPackage ./ethrun.nix { };
   seth = callPackage ./seth.nix { };
 
+  hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {});
+
   primecoin  = callPackage ./primecoin.nix { withGui = true; };
   primecoind = callPackage ./primecoin.nix { withGui = false; };
 
diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hsevm.nix
new file mode 100644
index 00000000000..6db55e9ab07
--- /dev/null
+++ b/pkgs/applications/altcoins/hsevm.nix
@@ -0,0 +1,53 @@
+{ aeson, ansi-wl-pprint, base, base16-bytestring
+, base64-bytestring, binary, brick, bytestring, containers
+, cryptonite, data-dword, deepseq, directory, filepath, ghci-pretty
+, here, HUnit, lens, lens-aeson, memory, mtl, optparse-generic
+, process, QuickCheck, quickcheck-text, readline, rosezipper
+, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
+, text-format, unordered-containers, vector, vty
+, mkDerivation, fetchFromGitHub, lib
+, ncurses, zlib, bzip2, solc
+}:
+
+lib.overrideDerivation (mkDerivation rec {
+  pname = "hsevm";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "dapphub";
+    repo = "hsevm";
+    rev = "v${version}";
+    sha256 = "1c6zpphs03yfvyfbv1cjf04qh5q2miq7rpd7kx2cil77msi8hxw4";
+  };
+
+  isLibrary = false;
+  isExecutable = true;
+  enableSharedExecutables = false;
+
+  postInstall = ''
+    rm -rf $out/{lib,share}
+  '';
+
+  extraLibraries = [
+    aeson ansi-wl-pprint base base16-bytestring base64-bytestring
+    binary brick bytestring containers cryptonite data-dword deepseq
+    directory filepath ghci-pretty lens lens-aeson memory mtl
+    optparse-generic process QuickCheck quickcheck-text readline
+    rosezipper temporary text text-format unordered-containers vector
+    vty
+  ];
+  executableHaskellDepends = [
+    readline zlib bzip2
+  ];
+  testHaskellDepends = [
+    base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck
+    tasty tasty-hunit tasty-quickcheck text vector
+  ];
+
+  homepage = "https://github.com/dapphub/hsevm";
+  description = "Ethereum virtual machine evaluator";
+  license = stdenv.lib.licenses.agpl3;
+  maintainers = [stdenv.lib.maintainers.dbrock];
+}) (attrs: {
+  buildInputs = attrs.buildInputs ++ [solc];
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 209520097f0..7aabd3b8bf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13272,6 +13272,7 @@ with pkgs;
   ethabi = self.altcoins.ethabi;
   ethrun = self.altcoins.ethrun;
   seth = self.altcoins.seth;
+  hsevm = self.altcoins.hsevm;
 
   stellar-core = self.altcoins.stellar-core;
 

From bcdfbad836a04cda074124635861d46e11ad9646 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 6 Jul 2017 07:04:13 +0200
Subject: [PATCH 0180/3246] lambda-mod-zsh-theme: 2017-05-21 -> 2017-07-05

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

diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix
index b1b17bef29d..8e2a0950d19 100644
--- a/pkgs/shells/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "lambda-mod-zsh-theme-unstable-2017-05-21";
+  name = "lambda-mod-zsh-theme-unstable-2017-07-05";
 
   src = fetchFromGitHub {
     owner = "halfo";
     repo = "lambda-mod-zsh-theme";
-    sha256 = "1410ryc22i20na5ypa1q6f106lkjj8n1qfjmb77q4rspi0ydaiy4";
-    rev = "6fa277361ec2c84e612b5b6d876797ebe72102a5";
+    sha256 = "03kdhifxsnfbly6hqpr1h6kf52kyhdbh82nvwkkyrz1lw2cxl89n";
+    rev = "ba7d5fea16db91fc8de887e69250f4e501b1e36d";
   };
 
   buildPhases = [ "unpackPhase" "installPhase" ];

From b5c94380e018c86af98906eebf38741d5e6620de Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 6 Jul 2017 09:49:47 +0300
Subject: [PATCH 0181/3246] gtk-engine-bluecurve: init at 1.0

---
 .../gtk2/gtk-engine-bluecurve/default.nix     | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix

diff --git a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
new file mode 100644
index 00000000000..c01fb7f15dd
--- /dev/null
+++ b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
+
+stdenv.mkDerivation {
+  name = "gtk-engine-bluecurve-1.0";
+
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2";
+    sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ gtk2 ];
+
+  meta = {
+    description = "Original Bluecurve engine from Red Hat's artwork package";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.gnidorah ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 209520097f0..e76781b7980 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17655,6 +17655,8 @@ with pkgs;
 
   gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };
 
+  gtk-engine-bluecurve = callPackage ../misc/themes/gtk2/gtk-engine-bluecurve { };
+
   gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };
 
   gnome_themes_standard = gnome3.gnome_themes_standard;

From 42b1fdaec58808c58116bd89e882ee4435885b3a Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Thu, 6 Jul 2017 11:45:30 +0200
Subject: [PATCH 0182/3246] bundix: 2.2.0 -> 2.3.1

---
 .../ruby-modules/bundix/default.nix           | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index 8ccc6dbf306..0caa8b226f0 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -1,35 +1,30 @@
-{ buildRubyGem, fetchFromGitHub, lib, bundler, ruby, nix, nix-prefetch-git }:
+{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, ruby, nix,
+  nix-prefetch-git }:
 
 buildRubyGem rec {
   inherit ruby;
 
   name = "${gemName}-${version}";
   gemName = "bundix";
-  version = "2.2.1";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "manveru";
     repo = "bundix";
     rev = version;
-    sha256 = "1gh90yxm4k27jdjdl3r31fcg4sk7k54jlbw1zfm1p9q3i7k8x4i7";
+    sha256 = "0ap23abv6chiv7v97ic6b1qf5by6b26as5yrpxg5q7p2giyiv33v";
   };
 
-  buildInputs = [bundler];
+  buildInputs = [ ruby bundler ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  postInstall = ''
-    substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \
-      --replace \
-        "'nix-instantiate'" \
-        "'${nix.out}/bin/nix-instantiate'" \
-      --replace \
-        "'nix-hash'" \
-        "'${nix.out}/bin/nix-hash'" \
-      --replace \
-        "'nix-prefetch-url'" \
-        "'${nix.out}/bin/nix-prefetch-url'" \
-      --replace \
-        "'nix-prefetch-git'" \
-        "'${nix-prefetch-git}/bin/nix-prefetch-git'"
+  preFixup = ''
+    wrapProgram $out/bin/bundix \
+                --prefix PATH : "${nix.out}/bin" \
+                --prefix PATH : "${nix-prefetch-git.out}/bin" \
+                --prefix PATH : "${bundler.out}/bin" \
+                --set GEM_HOME "${bundler}/${bundler.ruby.gemPath}" \
+                --set GEM_PATH "${bundler}/${bundler.ruby.gemPath}"
   '';
 
   meta = {

From 74f55017d26bb0931184bbcb54630000ce5ee107 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 6 Jul 2017 11:13:29 +0000
Subject: [PATCH 0183/3246] Update nixops to 1.5.1

(cherry picked from commit 1b57bf274ae5c76e91b2b264d8aa8bfcecb72102)
---
 pkgs/tools/package-management/nixops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 820bcbb9a35..1467faac8e3 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.5";
+  version = "1.5.1";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
+    sha256 = "0pba9c8ya4hvqmg458p74g69hb06lh0f5bsgw7dsi8pjrcb0624g";
   };
 })

From 8fcc92fc692b4ec7511530068cf0ab1e5d757082 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 6 Jul 2017 04:06:10 +0200
Subject: [PATCH 0184/3246] glibc: fix unaligned __tls_get_addr issue

---
 pkgs/development/libraries/glibc/common.nix   |  3 +-
 .../libraries/glibc/fix-x64-abi.patch         | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/glibc/fix-x64-abi.patch

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 647a34e95db..1b53acf12b1 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -68,7 +68,8 @@ stdenv.mkDerivation ({
     ++ lib.optionals stdenv.isi686 [
       ./fix-i686-memchr.patch
       ./i686-fix-vectorized-strcspn.patch
-    ];
+    ]
+    ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch;
 
   postPatch =
     # Needed for glibc to build with the gnumake 3.82
diff --git a/pkgs/development/libraries/glibc/fix-x64-abi.patch b/pkgs/development/libraries/glibc/fix-x64-abi.patch
new file mode 100644
index 00000000000..1d60dcd7988
--- /dev/null
+++ b/pkgs/development/libraries/glibc/fix-x64-abi.patch
@@ -0,0 +1,35 @@
+From 3288c6da64add3b4561b8c10fff522027caea01c Mon Sep 17 00:00:00 2001
+From: Nicholas Miell <nmiell@gmail.com>
+Date: Sat, 17 Jun 2017 18:21:07 -0700
+Subject: [PATCH] Align the stack on entry to __tls_get_addr()
+
+Old versions of gcc (4 & 5) didn't align the stack according to the
+AMD64 psABI when calling __tls_get_addr(). Apparently new versions of
+gcc (7) got much more aggressive about vectorizing and generating MOVAPS
+instructions, which means old binaries built with the buggy versions of
+gcc are much more likely to crash when using versions of glibc built
+using gcc 7.
+
+For example, a large number of Linux games built using the Unity game
+engine and available for purchase on Steam.
+---
+ elf/dl-tls.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/elf/dl-tls.c b/elf/dl-tls.c
+index 5aba33b3fa..3f3cb917de 100644
+--- a/elf/dl-tls.c
++++ b/elf/dl-tls.c
+@@ -827,6 +827,10 @@ rtld_hidden_proto (__tls_get_addr)
+ rtld_hidden_def (__tls_get_addr)
+ #endif
+
++#ifdef __x86_64__
++/* Old versions of gcc didn't align the stack. */
++__attribute__((force_align_arg_pointer))
++#endif
+ /* The generic dynamic and local dynamic model cannot be used in
+    statically linked applications.  */
+ void *
+--
+2.13.0

From 1f779011e9986a290dc252dce85d9a162968d5d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Jul 2017 09:01:31 +0200
Subject: [PATCH 0185/3246] ghc-8.2.1: update snapshot to release candidate 3

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

diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix
index 6b0cdf4fbdc..92014200c61 100644
--- a/pkgs/development/compilers/ghc/8.2.1.nix
+++ b/pkgs/development/compilers/ghc/8.2.1.nix
@@ -9,8 +9,8 @@
 
 let
   inherit (bootPkgs) ghc;
-  version = "8.2.1-rc2";
-  preReleaseName = "ghc-8.2.0.20170507";
+  version = "8.2.1-rc3";
+  preReleaseName = "ghc-8.2.0.20170704";
   commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
   commonPreConfigure =  ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
@@ -27,7 +27,7 @@ in stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz";
-    sha256 = "1hy3l6nzkyhzwy9mii4zs51jv048zwvdqk1q3188jznz35392zrn";
+    sha256 = "0ccfybbjrmd8yzqbfdqvb6clz2kd005wi8sx3mfjmbkmxv0l4jry";
   };
 
   postPatch = "patchShebangs .";

From ab8af93b2693cbc97ff1836f2b1518c0e7f58b57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Jul 2017 03:01:17 +0200
Subject: [PATCH 0186/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.3.1-4-gaa50929-dirty from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/da393a1daecebce968b8b793b396bb32ff116259.
---
 .../haskell-modules/hackage-packages.nix      | 268 ++++++++++++------
 1 file changed, 184 insertions(+), 84 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index af123de5654..1f6a39b8651 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5462,6 +5462,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "FontyFruity_0_5_3_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , directory, filepath, text, vector, xml
+     }:
+     mkDerivation {
+       pname = "FontyFruity";
+       version = "0.5.3.3";
+       sha256 = "0p02w0v93y11f7rzsc1im2rvld6h0pgrhmd827ypzamibry6xl5h";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq directory filepath text
+         vector xml
+       ];
+       description = "A true type file format loader";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ForSyDe" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath, mtl
      , old-time, parameterized-data, pretty, process, random
@@ -37571,8 +37588,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.35.6";
-       sha256 = "1pp4wyii4gb585nvy8zzylpaxbmhxw6r0v28qdsm825kqldhvy4f";
+       version = "4.35.9";
+       sha256 = "1d7xd9v8gc0ahyx557470dw01s3zs6vz594a4hy95bgx5d45s357";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42405,12 +42422,16 @@ self: {
      }) {};
 
   "clash-multisignal" = callPackage
-    ({ mkDerivation, base, clash-prelude, QuickCheck }:
+    ({ mkDerivation, base, clash-prelude, deepseq
+     , ghc-typelits-knownnat, QuickCheck
+     }:
      mkDerivation {
        pname = "clash-multisignal";
-       version = "0.1.0.0";
-       sha256 = "0hb9pxggdw8sg5g4227sghf366b2psl7l83c9mcy5dcxlng3znl4";
-       libraryHaskellDepends = [ base clash-prelude QuickCheck ];
+       version = "0.2.0.0";
+       sha256 = "0jqlz3h226ql641z4kzwf921f5sb0zf9zh2c9gli4bbw7csn93nd";
+       libraryHaskellDepends = [
+         base clash-prelude deepseq ghc-typelits-knownnat QuickCheck
+       ];
        homepage = "https://github.com/ra1u/clash-multisignal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51835,8 +51856,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-basic";
-       version = "0.2.0.1";
-       sha256 = "16j5jvry7hfgnyz4bsi1a2kja7q7a0sfafswa942pqby6dzcgxz1";
+       version = "0.2.0.3";
+       sha256 = "0xmc9cj22nw90c4l9ava7da14d2y3pvip81admgjx8cqgz93255k";
        libraryHaskellDepends = [
          aeson base binary bytestring cases containers hssqlppp lens
          lens-aeson mtl overload postgresql-simple simple-effects
@@ -52225,8 +52246,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, hspec, lens, tagged }:
      mkDerivation {
        pname = "data-diverse";
-       version = "0.4.0.0";
-       sha256 = "0jqyn4jwdvzijqwrb5j0052h95vxdwgixfb5a7cgwa574yipks09";
+       version = "0.5.0.0";
+       sha256 = "0cr67dpfbzayw2hhg8zf4yqwgbkjn5dislh7r96fjz1mkif6m0zz";
        libraryHaskellDepends = [ base containers ghc-prim lens tagged ];
        testHaskellDepends = [ base hspec lens tagged ];
        homepage = "https://github.com/louispan/data-diverse#readme";
@@ -58514,6 +58535,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dlist_0_8_0_3" = callPackage
+    ({ mkDerivation, base, Cabal, deepseq, QuickCheck
+     , quickcheck-instances
+     }:
+     mkDerivation {
+       pname = "dlist";
+       version = "0.8.0.3";
+       sha256 = "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base Cabal QuickCheck quickcheck-instances
+       ];
+       homepage = "https://github.com/spl/dlist";
+       description = "Difference lists";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dlist-instances" = callPackage
     ({ mkDerivation, base, dlist, semigroups }:
      mkDerivation {
@@ -64534,8 +64573,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.8.2.4";
-       sha256 = "01zzvd751bxy1mbfimqxn5ck172cc54lp7ch7p0yxln9ss2ngzj2";
+       version = "0.8.2.5";
+       sha256 = "0vl9kc0grhp72rlx922khvf5833qshyx4danismf8n5r3i9f7qr0";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
@@ -66128,13 +66167,13 @@ self: {
      }:
      mkDerivation {
        pname = "fast-tagsoup";
-       version = "1.0.13";
-       sha256 = "11h9d9a3wk87vw1xwc309cxhind1xbwhbvrqx6648dxf3nj5h1i5";
+       version = "1.0.14";
+       sha256 = "08vxz22iilai542h4g5c8xdawib9b0r7jlfmiga8ys7aq7nvgcsj";
        libraryHaskellDepends = [
          base bytestring containers tagsoup text text-icu
        ];
        homepage = "https://github.com/vshabanov/fast-tagsoup";
-       description = "Fast parser for tagsoup package";
+       description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -69017,8 +69056,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.3.3";
-       sha256 = "0rl6zwamkwdjnlmn2rr0mh16idci5xqgr70qsvqarj34h1ax2idb";
+       version = "0.5.3.4";
+       sha256 = "066czbpbjk893q3npghmz94w9pqd0k89p8xxrmgd4g8gqqr1fii6";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -92963,6 +93002,8 @@ self: {
        pname = "heap";
        version = "1.0.3";
        sha256 = "00plmd5b8dlgb8324h1dbd168apfcx3hkv65rhi463a8lff7xmcv";
+       revision = "1";
+       editedCabalFile = "0j1f0xl3y2vqiyh3m9w5vssxyi62s6qic3zmpkm429vawyh4yad5";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
@@ -97567,8 +97608,8 @@ self: {
      }:
      mkDerivation {
        pname = "hnormalise";
-       version = "0.4.1.1";
-       sha256 = "0q25mds552c87f2xs7s82b749drg3r41qswy0k8jmyz5dsc9wcir";
+       version = "0.4.2.0";
+       sha256 = "1h38qr8d8dbn81bghh3imb7jink6b06wadbpyg4axfr39s21xvkg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119093,8 +119134,8 @@ self: {
      }:
      mkDerivation {
        pname = "ldap-client";
-       version = "0.1.0";
-       sha256 = "18c33jfgwa7vdickxshyhmrqdpndy7ayjd3z0zqkjqa7awd0zcf4";
+       version = "0.2.0";
+       sha256 = "0vs6n3q9svwhcp6853ipxmw1anmy8qfy3xajjsf7h4pjnqzy7g88";
        libraryHaskellDepends = [
          asn1-encoding asn1-types async base bytestring connection
          containers network semigroups stm text
@@ -125511,21 +125552,21 @@ self: {
      }) {};
 
   "madlang" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, composition, containers
-     , criterion, directory, file-embed, hspec, hspec-megaparsec
-     , megaparsec, microlens, MonadRandom, mtl, optparse-applicative
-     , random-shuffle, template-haskell, text
+    ({ mkDerivation, ansi-wl-pprint, base, composition
+     , composition-extra, containers, criterion, directory, file-embed
+     , hspec, hspec-megaparsec, megaparsec, microlens, MonadRandom, mtl
+     , optparse-applicative, random-shuffle, template-haskell, text
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.3.1.1";
-       sha256 = "1ybbf281kpmdwggjvmhpilip0pficsqqg1m1nizgwwlgg76kwnj3";
+       version = "2.3.2.0";
+       sha256 = "0cg38m9ji0l8kv3sqqhwbvn57all0h9652acjdhhcg3n98hxpam6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base composition containers directory file-embed
-         megaparsec microlens MonadRandom mtl optparse-applicative
-         random-shuffle template-haskell text
+         ansi-wl-pprint base composition composition-extra containers
+         directory file-embed megaparsec microlens MonadRandom mtl
+         optparse-applicative random-shuffle template-haskell text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -127792,7 +127833,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
-  "mediabus_0_4_0_0" = callPackage
+  "mediabus_0_4_0_1" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, cereal
      , conduit, conduit-combinators, conduit-extra, containers
      , data-default, deepseq, hspec, lens, lifted-async, monad-control
@@ -127803,8 +127844,8 @@ self: {
      }:
      mkDerivation {
        pname = "mediabus";
-       version = "0.4.0.0";
-       sha256 = "00aps3hlml830ws4czpabzndwh2dvmyih1hy6k841zj7kzpvmg73";
+       version = "0.4.0.1";
+       sha256 = "0f0ip2l87a7divqp580iziskx3fkvv6f6vny42vz7v4p77i05p20";
        libraryHaskellDepends = [
          array async base bytestring cereal conduit conduit-combinators
          conduit-extra containers data-default deepseq lens lifted-async
@@ -127818,7 +127859,7 @@ self: {
          monad-control mtl QuickCheck singletons spool stm tagged
          template-haskell text time transformers type-spec vector
        ];
-       homepage = "https://github.com/lindenbaum/mediabus";
+       homepage = "https://github.com/sheyll/mediabus";
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127892,7 +127933,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
-  "mediabus-rtp_0_4_0_0" = callPackage
+  "mediabus-rtp_0_4_0_1" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, cereal
      , conduit, conduit-combinators, conduit-extra, containers
      , data-default, deepseq, hspec, lens, lifted-async, mediabus
@@ -127903,8 +127944,8 @@ self: {
      }:
      mkDerivation {
        pname = "mediabus-rtp";
-       version = "0.4.0.0";
-       sha256 = "0b8nhyb072nqcikq40la226da30vg343cjmp4qjpsr714i2sd3rk";
+       version = "0.4.0.1";
+       sha256 = "1yfy8aak1z9bbwy676qyfxa7hmk1n94f3dn1x070hvpbvgpgmijb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127925,7 +127966,7 @@ self: {
          monad-control monad-logger mtl QuickCheck singletons spool stm
          tagged template-haskell text time transformers type-spec vector
        ];
-       homepage = "https://github.com/lindenbaum/mediabus-rtp";
+       homepage = "https://github.com/sheyll/mediabus-rtp";
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129958,8 +129999,8 @@ self: {
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.1.1.0";
-       sha256 = "16ww5nbjdkjlwsr3dapv3px12dvi9dxbmz9z62n3hfpz5c4v5864";
+       version = "0.1.2.0";
+       sha256 = "1f9gs5lmcg86gs35fsdjq7bdhxyawdfna5lp84chsxl5fqa44wjs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137490,8 +137531,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.4.0.0";
-       sha256 = "1cp77flxddnxiln2x1iy9f0ijrim9ai7xry87h23y8xn1zgwvyh4";
+       version = "0.4.1.0";
+       sha256 = "0vlcvvgl6sncgw03ks20b115jlznlv4f1n9fnzwzignws09hyf6y";
        libraryHaskellDepends = [
          async base binary bytestring template-haskell unix
        ];
@@ -139951,6 +139992,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "onpartitions" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "onpartitions";
+       version = "0.1.0.0";
+       sha256 = "0iy4hpibiz6v93kz8jv5phb96sh6ygcdakf9vqss5d5622s5pgf1";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/paolino/onpartitions";
+       description = "partition lenses";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "onu-course" = callPackage
     ({ mkDerivation, base, smallcheck }:
      mkDerivation {
@@ -144667,8 +144720,8 @@ self: {
      }:
      mkDerivation {
        pname = "pcgen";
-       version = "1.0.0";
-       sha256 = "1nh05bf7xd0l9jrjzvvmng64q5wc6j7iz856g8z3d20mcv2q1lza";
+       version = "2.0.1";
+       sha256 = "15116krysjvp3if7rdqcfjgqappfybjzwmgrkd5v5x8w62izhnla";
        libraryHaskellDepends = [ base random ];
        testHaskellDepends = [ base hspec QuickCheck random ];
        benchmarkHaskellDepends = [ base criterion deepseq random ];
@@ -146154,8 +146207,8 @@ self: {
      }:
      mkDerivation {
        pname = "pg-store";
-       version = "0.4.2";
-       sha256 = "1i1ma0m7qmn2v2qswv5kj1rbbfscqirkcvyr5nf07czbghwpx1v6";
+       version = "0.4.3";
+       sha256 = "1qqy79yqhwjw094p8i4qanmjwlvym7lndnqiw10mgp0xn63rznid";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring hashable
          haskell-src-meta mtl postgresql-libpq scientific tagged
@@ -152683,8 +152736,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.0.6";
-       sha256 = "0w8n7l4ws3awccqf6g12bk09l10s4scmdvr5vkxhhpm5cmawd0fq";
+       version = "4.3.0";
+       sha256 = "1walyz9x0rxa9n77kr0w7gpm2vnydxq70ii782ygzy0izymhnx39";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153017,6 +153070,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers_2_4_2" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, filepath, mtl, parsec, syb, utf8-string
+     }:
+     mkDerivation {
+       pname = "protocol-buffers";
+       version = "2.4.2";
+       sha256 = "13z1sh8z5b3nlscqnzw137k3979d4war3yzhxclljqq2z88rm1bv";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath mtl
+         parsec syb utf8-string
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
@@ -163902,6 +163973,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "safe-exceptions_0_1_6_0" = callPackage
+    ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
+     , void
+     }:
+     mkDerivation {
+       pname = "safe-exceptions";
+       version = "0.1.6.0";
+       sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i";
+       libraryHaskellDepends = [ base deepseq exceptions transformers ];
+       testHaskellDepends = [ base hspec void ];
+       homepage = "https://github.com/fpco/safe-exceptions#readme";
+       description = "Safe, consistent, and easy exception handling";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safe-exceptions-checked" = callPackage
     ({ mkDerivation, base, deepseq, hspec, safe-exceptions
      , transformers
@@ -163910,8 +163997,8 @@ self: {
        pname = "safe-exceptions-checked";
        version = "0.1.0";
        sha256 = "0gyaq2pf87dqn0l6n3mi0qamf99y3zj5xxh513c0iqwdh8mma1yq";
-       revision = "1";
-       editedCabalFile = "1nnnljp0l70zafgfl09kskf965p993plmk52pv2wqhjj94xdnwzb";
+       revision = "2";
+       editedCabalFile = "18fwk5yr8zm4y215vbsl149jkn9pxyv3m8mgq3979pvs1c4kqivz";
        libraryHaskellDepends = [
          base deepseq safe-exceptions transformers
        ];
@@ -171779,6 +171866,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "simple-logging" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, iso8601-time
+     , lens, mtl, simple-effects, string-conv, text, time, vector
+     }:
+     mkDerivation {
+       pname = "simple-logging";
+       version = "0.2.0.1";
+       sha256 = "1x0vclb2an4mbwxqk44z0rpw1ai0pq2kc9ak0chyzijbk1vivwmx";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions iso8601-time lens mtl
+         simple-effects string-conv text time vector
+       ];
+       testHaskellDepends = [ base simple-effects ];
+       homepage = "https://gitlab.com/haskell-hr/logging";
+       description = "Logging effect to plug into the simple-effects framework";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "simple-money" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -172447,9 +172552,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "singnal";
-       version = "0.1.0.0";
-       sha256 = "099akvb0j6a7hh4g5pm8i8hy8pmsc6i33jg957zsbnbh72s0ck3d";
+       version = "0.1.1.0";
+       sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj";
        libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/zaoqi/Signal.hs";
+       description = "Singnal";
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
@@ -179953,21 +180060,20 @@ self: {
      }) {};
 
   "streaming-concurrency" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hspec, lifted-async
+    ({ mkDerivation, base, exceptions, hspec, lifted-async
      , monad-control, QuickCheck, quickcheck-instances, stm, streaming
-     , streaming-bytestring, streaming-with, transformers-base
+     , streaming-with, transformers-base
      }:
      mkDerivation {
        pname = "streaming-concurrency";
-       version = "0.1.0.0";
-       sha256 = "1g2p928mvkwwdy0xbm8c6ph2cdqswj1gpi0zq6ln1bl4f3xd98rz";
+       version = "0.3.0.0";
+       sha256 = "1dnlnm57rlk900n148xnfihx917rc9lggx6fdzhf7cjbi1n2ibn2";
        libraryHaskellDepends = [
-         base bytestring exceptions lifted-async monad-control stm streaming
-         streaming-bytestring streaming-with transformers-base
+         base exceptions lifted-async monad-control stm streaming
+         streaming-with transformers-base
        ];
        testHaskellDepends = [
-         base bytestring hspec QuickCheck quickcheck-instances streaming
-         streaming-bytestring
+         base hspec QuickCheck quickcheck-instances streaming
        ];
        description = "Concurrency support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
@@ -185136,16 +185242,16 @@ self: {
      }) {};
 
   "teardown" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, criterion, doctest, Glob
-     , protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit
+    ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest
+     , Glob, protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit
      , tasty-rerun, tasty-smallcheck, text, time
      }:
      mkDerivation {
        pname = "teardown";
-       version = "0.1.0.0";
-       sha256 = "0sg113khwlb56x0rgb47lm0hf0cfsr9wc31w98nav9zcw5gndm33";
+       version = "0.1.0.1";
+       sha256 = "0jxhr73dq4gvbzrwhbqsrwg1v8qa2mj1nfygb44kj60diwa4cwj2";
        libraryHaskellDepends = [
-         ansi-wl-pprint base protolude text time
+         ansi-wl-pprint base deepseq protolude text time
        ];
        testHaskellDepends = [
          base doctest Glob protolude QuickCheck tasty tasty-hspec
@@ -188788,19 +188894,16 @@ self: {
      }) {};
 
   "throwable-exceptions" = callPackage
-    ({ mkDerivation, base, doctest, either, safe-exceptions, tasty
-     , tasty-discover, tasty-hunit, template-haskell, text
+    ({ mkDerivation, base, doctest, either, safe-exceptions, silently
+     , tasty, tasty-discover, tasty-hunit, template-haskell, text
      }:
      mkDerivation {
        pname = "throwable-exceptions";
-       version = "0.1.0.7";
-       sha256 = "1afxzk9xvxlvi13ysda9gcv6zzr7njcvi5p15lbn9bg68nrwqazj";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.0.8";
+       sha256 = "0d8dxrd922rxnn417yn2ij71v6vb9c5i37qvcmdixfh773p9sm8r";
        libraryHaskellDepends = [ base safe-exceptions template-haskell ];
-       executableHaskellDepends = [ base safe-exceptions ];
        testHaskellDepends = [
-         base doctest either safe-exceptions tasty tasty-discover
+         base doctest either safe-exceptions silently tasty tasty-discover
          tasty-hunit text
        ];
        homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md";
@@ -192797,14 +192900,13 @@ self: {
   "tweet-hs" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, composition, containers, criterion, data-default
-     , directory, extra, hspec, hspec-megaparsec, http-client
-     , http-client-tls, http-types, lens, megaparsec
-     , optparse-applicative, split, text
+     , directory, extra, hspec, http-client, http-client-tls, http-types
+     , lens, megaparsec, optparse-applicative, split, text
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "0.6.0.1";
-       sha256 = "1rd1isvbia2cvxbfxx6sxk8vz3vjckpwa7ci0sgpbmb6qcm0ddyr";
+       version = "0.6.1.2";
+       sha256 = "17nvm7xnb5gvmq977bz812gd6s3dfvvkxd2zwcdayczdmnz06gyz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192813,10 +192915,8 @@ self: {
          http-types lens megaparsec optparse-applicative split text
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring hspec hspec-megaparsec megaparsec
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
+       testHaskellDepends = [ base bytestring hspec ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
@@ -195799,8 +195899,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.4.3";
-       sha256 = "17rrikfid54z8h95qns5q7bdxadnnggv1pl2d9ilz9pz9hi7a9g6";
+       version = "0.5";
+       sha256 = "0i444yzxn4g8khjj8m2n4507qwvdvsypsb4qkylkz23214c6qax4";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions ghc-prim hashable
          microlens microlens-mtl mtl safe stm text text-format transformers

From 565e2b571bed08f89339cdea21356fac068976f6 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 6 Jul 2017 17:13:12 +0200
Subject: [PATCH 0187/3246] iosevka: 1.13.0 -> 1.13.1

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

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 10bc5787e40..053a3ae76c1 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "iosevka-${version}";
-  version = "1.13.0";
+  version = "1.13.1";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip";
-    sha256 = "03jc8a10177wk35gyp0n317azakyy5qzc6vbh331552asawckswr";
+    sha256 = "05nnzbhv0sidbzzamz10nlh3j974m95p3dmd66165y4wxyhs989i";
   };
 
   sourceRoot = ".";

From 54f2ded821a619ed6dc187a9e4cde3f4ebbc3c70 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 6 Jul 2017 11:07:52 -0400
Subject: [PATCH 0188/3246] elpa-packages: 2017-07-06

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index a7ac2325eac..98b8282b999 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -95,10 +95,10 @@
     ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "ahungry-theme";
-        version = "1.3.0";
+        version = "1.4.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ahungry-theme-1.3.0.tar";
-          sha256 = "1p2zaq0s4bbl5cx6wyab24wamw7m0mysb0v47dqjmnvfc25z84rq";
+          url = "https://elpa.gnu.org/packages/ahungry-theme-1.4.0.tar";
+          sha256 = "1n8k12mfn01f20j0pyd7ycj77x0y3a008xc94frklaaqjc0v26s4";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -821,10 +821,10 @@
     gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "gited";
-        version = "0.2.5";
+        version = "0.3.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gited-0.2.5.tar";
-          sha256 = "186cyay7nk2khnhilrwzjipb3syxl0s4n96b48j9plaba48azz11";
+          url = "https://elpa.gnu.org/packages/gited-0.3.1.tar";
+          sha256 = "14ng63hxd6l76r8m54gzqq9j66cqz48ad1zaamn100h4b2rzf2q8";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1445,10 +1445,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170622";
+        version = "20170703";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170622.tar";
-          sha256 = "0922lcbr2r7bkswljqzbm5y3ny1n67qfrmf7h7z9hsw2wy0505dp";
+          url = "https://elpa.gnu.org/packages/org-20170703.tar";
+          sha256 = "04rg2fldbsxizq84xl6613s8xnwyp8iwmxm167v69bc85xaf7s9s";
         };
         packageRequires = [];
         meta = {
@@ -1651,10 +1651,10 @@
       }) {};
     rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "rnc-mode";
-        version = "0.1";
+        version = "0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rnc-mode-0.1.el";
-          sha256 = "18hm9g05ld8i1apr28dmd9ccq6dc0w6rdqhi0k7ka95jxxdr9m6d";
+          url = "https://elpa.gnu.org/packages/rnc-mode-0.2.el";
+          sha256 = "0xhvcfqjkb010wc7r218xcjidv1c8597vayyv09vk97z4qxqkrbd";
         };
         packageRequires = [];
         meta = {

From 47bd7537875b5a16f6b8e7508873d0068b956fbe Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 6 Jul 2017 11:08:10 -0400
Subject: [PATCH 0189/3246] org-packages: 2017-07-06

---
 .../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 7e8715f32a9..82bd5ea0c52 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 = "20170622";
+        version = "20170703";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170622.tar";
-          sha256 = "0z4ypv6q4nx4icir69xchzn58xzndnxlkg0v4pb62gqghdxng6vy";
+          url = "http://orgmode.org/elpa/org-20170703.tar";
+          sha256 = "0l590ygknlbz3r0w9zzljwqn8vasz5w82wsivi9bi60lf0d0hx58";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170622";
+        version = "20170703";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170622.tar";
-          sha256 = "0ix4gmr6y9nrna9sc9cy30533mxlnvlfnf25492ky6dkssbxb10s";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170703.tar";
+          sha256 = "0l7hsz6rbq1zw6wdlm3ryxb60md44rvx0waii98hww89zpdi0gmw";
         };
         packageRequires = [];
         meta = {

From 45d772288e68bc308de2b2460b8569073dbd7bf3 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 6 Jul 2017 11:12:14 -0400
Subject: [PATCH 0190/3246] melpa-stable-packages: 2017-07-06

---
 .../emacs-modes/melpa-stable-generated.nix    | 148 ++++++++++--------
 1 file changed, 85 insertions(+), 63 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 1ed81a16f4a..6e1cc04a2f6 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -884,12 +884,12 @@
     add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "add-hooks";
-        version = "3.0.0";
+        version = "3.1.0";
         src = fetchFromGitHub {
           owner = "nickmccurdy";
           repo = "add-hooks";
-          rev = "9b1bdb91c59ea9c2cc0aba48262c49069273d856";
-          sha256 = "1jzgyfcr6m64q79qibnbqa41sbpivslwk2hygbk9yp46l5vgj1hc";
+          rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7";
+          sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1052,12 +1052,12 @@
     ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ahungry-theme";
-        version = "1.3.0";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "color-theme-ahungry";
-          rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74";
-          sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4";
+          rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf";
+          sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -6141,15 +6141,16 @@
           homepage = "https://melpa.org/#/darcula-theme";
           license = lib.licenses.free;
         };
+      }) {};
     darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "0.3.5";
+        version = "0.3.7";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "dde50661210d8610cd03526a6c9a922bb0e494a6";
-          sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6";
+          rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555";
+          sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -6162,7 +6163,6 @@
           license = lib.licenses.free;
         };
       }) {};
-      }) {};
     dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dart-mode";
@@ -6334,12 +6334,12 @@
     decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "decide";
-        version = "0.5";
+        version = "0.7";
         src = fetchFromGitHub {
           owner = "lifelike";
           repo = "decide-mode";
-          rev = "ce0cd15e8e42d458d86cbf4c1effd03cefec33bd";
-          sha256 = "0wm24ndiyhrayg1gz456s0s1ddlpcvg4vp555g4zzl3zcpsy94bg";
+          rev = "90133687118c236142b8110571c463304b3192f9";
+          sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide";
@@ -8310,12 +8310,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "1.1.1";
+        version = "1.1.2";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b";
-          sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r";
+          rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c";
+          sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -9634,12 +9634,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20.0";
+        version = "20.0.1";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "040bdce67f88d833bfb59adae130a4ffb4c180f0";
-          sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0";
+          rev = "a01de6873844ba510084090abec734c4166d71fa";
+          sha256 = "0bni9rchblp3n7lh07wq3rpf5xykh79jm6bl6f2dk2j24wwrhjqs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -11015,22 +11015,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
+    exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "1.5";
+        version = "1.6.4";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "1ab5ce73fd9aca5267416b998084e1a8e96122a7";
-          sha256 = "1ncnsqlnqikm1fv9ahv6jrmdp02czhcbmln346llwzwrpw31ly78";
+          rev = "6e6c4c3ce5f65c71ba08565edbec2dfb0cf64e0c";
+          sha256 = "1r6d6sb9ylfqidcbrr7f75m68s1cpm220pnb4hl0qv5n6hr8h5gi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
           sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
           name = "exwm-x";
         };
-        packageRequires = [ cl-lib exwm swiper switch-window ];
+        packageRequires = [ bind-key cl-lib exwm swiper switch-window ];
         meta = {
           homepage = "https://melpa.org/#/exwm-x";
           license = lib.licenses.free;
@@ -15408,12 +15408,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "0.3.1";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "35c1506bec0cb43629d30cae8be6cd7f793fff8b";
-          sha256 = "1dlh4ppnbliv2ipfysdrnpix5kg6nwjc0468whi3w758nwpkamzc";
+          rev = "6d4ccb3f7376d6326b58b25f3c94ab546418a030";
+          sha256 = "13n8k5ak3y1x6i27x47sji49kdbqhnc3ywqkn4xwmxcnrs28kr25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -21270,12 +21270,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "0.8";
+        version = "0.8.1";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c";
-          sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b";
+          rev = "134b41557ab539219d9e3a1b3c8939df93676726";
+          sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -22250,12 +22250,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.8.1";
+        version = "0.8.2";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "77bc1c735b41acb6d43692dc3dcb60f323656cb5";
-          sha256 = "0b33bbmj7c62zn882max569wyybb9b04plb47sg55amv3nv8c8fr";
+          rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a";
+          sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -23614,12 +23614,12 @@
     neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neon-mode";
-        version = "1.2.1";
+        version = "1.2.2";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "neon-mode";
-          rev = "d0f8f003840081b57d4f372d9ff41c057422b1a1";
-          sha256 = "135b7h5vx0w7p6k2f5d8lcqxd5w199089wcar3kk0frb9vrk3xss";
+          rev = "044040df9e83a015ddfe58940b503b6197fc29ce";
+          sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@@ -23782,12 +23782,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "0.5.7";
+        version = "0.5.9";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "e041942cb0f4f02d00cf30afb956208496562ba4";
-          sha256 = "00d6fz5kg2k6py5mj2h9rzbqa4gkiv02h9ba55psfgbnmak6ip0v";
+          rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82";
+          sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -24510,15 +24510,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
+    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
         version = "4.0";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "7070f2a64de65e0446536fb974c940399a4097a3";
-          sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a";
+          rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35";
+          sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -24531,6 +24531,7 @@
           csharp-mode
           dash
           emacs
+          f
           flycheck
           popup
           s
@@ -25027,12 +25028,12 @@
     org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-journal";
-        version = "1.12.0";
+        version = "1.12.1";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "24313870fa682a53e7f3f916b0e853a731868886";
-          sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh";
+          rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d";
+          sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -29502,12 +29503,12 @@
     resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "resize-window";
-        version = "0.6";
+        version = "0.7";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "274a96e9754b606d85c9dd62cfed628ff4f736df";
-          sha256 = "0ax18sflqh9wg938gaz9m5r1i45761qym7r1lyqqxp24jzp4wa6j";
+          rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904";
+          sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
@@ -30991,12 +30992,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "0.0.6";
+        version = "0.0.7";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "23d6d213a90e031dec8dbbaaeac5ddbe2cf050de";
-          sha256 = "0y96l6m7lnw2wsi5zbla88xgxmw3zksblnk36bgr153bik14waxf";
+          rev = "3adbfe7c03d509538a6e43bafda27ea290298a14";
+          sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -31030,6 +31031,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "silkworm-theme";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "silkworm-theme";
+          rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b";
+          sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme";
+          sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13";
+          name = "silkworm-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/silkworm-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simple-bookmarks";
@@ -31369,12 +31391,12 @@
     slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slstats";
-        version = "1.8";
+        version = "1.9";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "slstats.el";
-          rev = "7488623cbe406eaafccc36d293e8c42bbd308085";
-          sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n";
+          rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167";
+          sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -32626,12 +32648,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "588ec8b9476c8d7f5f16018a7aaf90ee828fb4f5";
-          sha256 = "1ckvsckqlbdcw6nbsrh9xizbpkr7r88ks39av8dhn5n412c5jm4g";
+          rev = "26e8b0615def4f0531682b8a849f55d330616ac1";
+          sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -32878,12 +32900,12 @@
     switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "switch-window";
-        version = "1.5.0";
+        version = "1.5.1";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "switch-window";
-          rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b";
-          sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f";
+          rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d";
+          sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
@@ -34772,12 +34794,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "5.5";
+        version = "5.6";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "af4ff24ae4489e0a3bfbbddf6bc934f66b0af527";
-          sha256 = "1z88wy7m6rj028dqxzyyyf67gw4jqd72dgsvlr8inwimds2iplbv";
+          rev = "c08343904835cbae12f48e0758b0a6a014d76a74";
+          sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";

From 49da250e9c2b7426aad8ce5559a324ba10a0b1ac Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 6 Jul 2017 11:14:57 -0400
Subject: [PATCH 0191/3246] melpa-packages: 2017-07-06

Removals:
 - gregorio-mode: repo no longer exists
---
 .../editors/emacs-modes/melpa-generated.nix   | 941 +++++++++---------
 1 file changed, 471 insertions(+), 470 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 55a6f691041..708713e8181 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -801,8 +801,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
-          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
+          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
+          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1174,12 +1174,12 @@
     add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "add-hooks";
-        version = "20170518.209";
+        version = "20170705.2205";
         src = fetchFromGitHub {
           owner = "nickmccurdy";
           repo = "add-hooks";
-          rev = "f7a94ef1762ad8eb58d24c0857751863ea93cd5b";
-          sha256 = "1j524wvl9l9hzahq8by9bnh745kg2z7l808ad9b0y0wx5kf17xlz";
+          rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7";
+          sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1403,12 +1403,12 @@
     ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ahungry-theme";
-        version = "20160721.2122";
+        version = "20170702.2226";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "color-theme-ahungry";
-          rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74";
-          sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4";
+          rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf";
+          sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -1487,12 +1487,12 @@
     alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alda-mode";
-        version = "20170611.1031";
+        version = "20170629.2153";
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "e32d3908e40287648b3e88014aa9c2c977a9b715";
-          sha256 = "0993zm6dn2k85pkyvwf63ccqc90z1s8b3qaqpxm9qprinimxff6h";
+          rev = "24f2495ab209f8f00b7883285637e207b6f07201";
+          sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1508,12 +1508,12 @@
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
-        version = "20170202.6";
+        version = "20170701.751";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766";
-          sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq";
+          rev = "d1d19c76393ffe80fb11c6837e8582c3cb087d40";
+          sha256 = "1gyjswlgbx5p1pq74qncrcjypkrfqd3dxm39bnbaszc6rhb58k8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1592,12 +1592,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170627.538";
+        version = "20170703.112";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "c491f5fa2267e7f8df180d7d125d9faeccbdea46";
-          sha256 = "080xdw3jz687dfpg2ad7j35axagbnlz7bbrxxj018gh9b5hy3i1k";
+          rev = "f155ce7e6984d8fe11831cd8a9f89828f5c5be43";
+          sha256 = "1860ia7ld566f2z2pskvyi0cnfl20frszi4w5281px6y2c8g4zxw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -4023,12 +4023,12 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20170411.608";
+        version = "20170702.237";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "f2bedeeb5804a4863bb53aca6f77195f7d530c38";
-          sha256 = "1p2l6zqls2c8v1ahn9rkfj6vvcsx1ymd0rd590scj8kqhjjyq3n7";
+          rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b";
+          sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -5094,8 +5094,8 @@
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "bifocal-mode";
-          rev = "e33923fd9970a6d46c9366264818abcb9856d6e4";
-          sha256 = "07vkqgz45di0ccjs21psywx74ji9k0bbgix15k0nnav66fzv1i47";
+          rev = "05d1076069d0a19292a38e835c32137e43ee9708";
+          sha256 = "1fvr8vvpdd2xawv1j58wpxakbia31rzy513dakd78mlfkih2ixvg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
@@ -5157,8 +5157,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400";
-          sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf";
+          rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c";
+          sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5470,8 +5470,8 @@
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "blog-admin";
-          rev = "a7d3fa9317e9aa0b492e61b0706c4d9ca2f7a4b5";
-          sha256 = "0ry1n53y1jz0gmijhypp84kaxkxn8g1pma74dwqmsy7f5ayhwi3h";
+          rev = "98e397c4014f7c81c42722028778726cbf9baf8c";
+          sha256 = "0fj0yri8hayqb6fwgj5i6bw7yx4jsdq7jh9aqd5zdpmyfc6lshzr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin";
@@ -5633,7 +5633,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170626.844";
+        version = "20170703.1431";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
@@ -6445,12 +6445,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20170520.147";
+        version = "20170701.429";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb";
-          sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1";
+          rev = "b6deeffe032527696e32623b69bdf07b538a315e";
+          sha256 = "0ldc26wpgx01i1sfy9kc52dh3lmy53dr3pxxrn841rb37yc4h1rh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6718,12 +6718,12 @@
     calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "calfw";
-        version = "20170410.1920";
+        version = "20170703.1704";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
-          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
+          rev = "bcfc0c546c3c58e1f635a9a29efdf56c9421a3ce";
+          sha256 = "0n7kn0g7mxylp28w5llrz22w12qjvypa1g82660qr2d9ga9mb0v9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw";
@@ -7014,8 +7014,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643";
-          sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f";
+          rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890";
+          sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -7056,8 +7056,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643";
-          sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f";
+          rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890";
+          sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7305,7 +7305,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12262";
+          rev = "12267";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7929,12 +7929,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170620.207";
+        version = "20170705.951";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "55a579f56a05d945e6ce5764002d2cadafa581eb";
-          sha256 = "1lni2a9gy44xna62w6kfv678j8zk1dawwaqrbyn3mdy1s7d3mcj9";
+          rev = "4a7b5ffc245be2b4285bed07f66ca88c5b4420a8";
+          sha256 = "1k5zdw3cag9918kv51ph0jlg0wa0m4fbzl7yf3cvsfb78xf4apmd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8205,7 +8205,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "306591";
+          rev = "307254";
           sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
         };
         recipeFile = fetchurl {
@@ -8675,12 +8675,12 @@
     clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "clomacs";
-        version = "20170128.850";
+        version = "20170705.719";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clomacs";
-          rev = "0c7793b52166730a563c3318cdcb9f2b423bc675";
-          sha256 = "1sj4awcz6xdk1lq7yz69d8v0d97alipc3avzmnby6lpm2pw1n45a";
+          rev = "7af6fa717f08fda930641a27f3a07743c2042514";
+          sha256 = "1diavwmjgaz0jxjbkzhlca9klqd7kmpih98clp8wiavhms80ykds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
@@ -8847,8 +8847,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "e40e8f5c4216ac1e176342887d1af95965528344";
-          sha256 = "0l45qjyq8x64l96mikrpnbnw1919a8l8lrs40lzca35b429sbyqq";
+          rev = "8bc93cdd797e6396040bd00eee877734af0d3759";
+          sha256 = "1b92ba67dkihyixd1p2pkaqcgr39gf64vka1sbbx2fcwczyv3q32";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -10053,8 +10053,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61";
-          sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2";
+          rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05";
+          sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10395,8 +10395,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
-          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
+          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
+          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10915,12 +10915,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170628.1034";
+        version = "20170705.417";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74";
-          sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5";
+          rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896";
+          sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11066,8 +11066,8 @@
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "cov";
-          rev = "158d6bacb0986a27aa90a5b6dce81ae820b62cef";
-          sha256 = "1n510afmaprwlv6hck2kc9myvj9wsrspqyjzj5vql1y9c6w1xhsc";
+          rev = "519239cc37d3ad0204fecac99f42e1694ce57d3d";
+          sha256 = "1kb2rmxx91q4cwm1npzyiykwg5jxhhz7waykh5vqxr5y81hr5nza";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov";
@@ -11981,8 +11981,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "20256403e4d81b7eea1165bf78b8faf8502e8204";
-          sha256 = "1njxnzss34w6wary9icj7vsazhmc9bz3ix1qf3bjacbi1n5q3k2c";
+          rev = "749d07b9c1eee8751c690967dc48bdd11c0cfc06";
+          sha256 = "0h51h7c19ncb3a6q4mgkq06fdc4q64s71z4a9rwwxk7kqs842hwg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12124,12 +12124,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20170628.811";
+        version = "20170702.1007";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "7491ab2dfe5d0200f32cb3100671ea4db419dffe";
-          sha256 = "1bnhybals3b6bfngsqyksdp8n3kdar9ihffc5ppc77rvvjcl7p3w";
+          rev = "f4de0fa84bec756ea31419f8db0b900fd1603c83";
+          sha256 = "1wzwiahab6r8y772mg6268sh7l3b1fw4hxl10d38qv2khy641vlv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -12334,12 +12334,12 @@
     darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20170528.2201";
+        version = "20170629.1848";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "e5e2433fccb225b347c84c3bba5e3ed9769c2922";
-          sha256 = "0l3clqy9zrd8xbaacx7ck8kw1x6rl1b9vd5ss57wnqpsdz25nggi";
+          rev = "475fd1b583958d40b1cba6cfaf4ccfd7d5ca8f18";
+          sha256 = "1w2jsg5nyms6iz02digwj96dry926hs0d2c9pi7y252zifhldkdp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12628,12 +12628,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170610.1729";
+        version = "20170705.533";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643";
-          sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f";
+          rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890";
+          sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12731,12 +12731,12 @@
     decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "decide";
-        version = "20160314.1248";
+        version = "20170702.1617";
         src = fetchFromGitHub {
           owner = "lifelike";
           repo = "decide-mode";
-          rev = "f243afc7cff11d9696552695e2dfc0ca91e1c5b6";
-          sha256 = "05n57djagbkm8im4168d5d2fr2ibfnckya7qzrca1f9rmm0ah15j";
+          rev = "90133687118c236142b8110571c463304b3192f9";
+          sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide";
@@ -12960,12 +12960,12 @@
     demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "demo-it";
-        version = "20170126.739";
+        version = "20170628.1503";
         src = fetchFromGitHub {
           owner = "howardabrams";
           repo = "demo-it";
-          rev = "f61f336c8c291208d9feef2ce495e8c659052f77";
-          sha256 = "1wb7n4k2qwl3m7y22zag6rdzi1gqb8a5lj7crpkkn5ryycbxbbpi";
+          rev = "1e8b42ff6479fa541eeec5699b4727af136d40da";
+          sha256 = "1x9crsc8n5pqyp60h46gz6wz98qaj3bygk11vd39qpfh2hxdxxi6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it";
@@ -13731,10 +13731,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170623.1621";
+        version = "20170630.752";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "14lkdkk6z2zx0rvz8vnhz9a7i87irm1a5wc3q39wmf8q5vh32pkc";
+          sha256 = "1jl14z15ilkwl45xv34akabnx4430siqkjv14sqi33g3qmnln90y";
           name = "dired+.el";
         };
         recipeFile = fetchurl {
@@ -14843,12 +14843,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170615.437";
+        version = "20170630.922";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "55d2f8eb0b6ed6a1964741c61d898c97ed934b7a";
-          sha256 = "0wbhjfiidl1fbxhdrpk9f7wc3kvb4nshwzfxd1vrgpx48kaiahgb";
+          rev = "dc9c0b938ea0bc7a30a79fb74f2e66f1fb2128be";
+          sha256 = "04wwv3pps4kwld590x5gwif69izcbapp0y4w3i4nsc88ld08sp96";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15278,7 +15278,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1800204";
+          rev = "1801041";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15903,12 +15903,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20170605.1440";
+        version = "20170705.2343";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "4624e67ca26cb348063a97a8f59a3fbcbf8a5736";
-          sha256 = "0ds11hphxp8jxsc50lvnr9n4macvzd82y7siqh8wvswk62l8vb4x";
+          rev = "a6356007a58dc72636ab94c89536c621f089bb0c";
+          sha256 = "00qcq1bs8wyxj9cf2jy691ddddz0v5czwn92x40nc43a7qi0a9h1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -16346,8 +16346,8 @@
         src = fetchFromGitHub {
           owner = "stsquad";
           repo = "emacs_chrome";
-          rev = "0a50fbb524fe256560f481701c000309c627b9ca";
-          sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd";
+          rev = "f7cf37c3f605812d429fd90699d6d33f6ac9db8d";
+          sha256 = "1i4fvw7703pr505mzspkc7sphh3mbg4pvbpfcr847lrg66pdw419";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server";
@@ -16763,12 +16763,12 @@
     el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-get";
-        version = "20170112.2204";
+        version = "20170701.1607";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "f7bb3855b2393f667f597d30775749faa5038cfc";
-          sha256 = "0i89fmn8k3p3qciqq2vhbl86mn9s9l0hinn6kgs637v0fanyahsd";
+          rev = "3925f0189d99c6cddbe19831c2020f97adcc4933";
+          sha256 = "1lzmhfhwfnkpcbkvkl5vzfjv3h7wb85y9j98wrb3vlydbc9735dw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16847,12 +16847,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170513.2050";
+        version = "20170705.1739";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "22682dd020ac93b621bf45e57c738e551e2cb14b";
-          sha256 = "1hv9i78fchvmygmb7pfx1ybkq270aibdhjsidzskipfzw40p0dz2";
+          rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c";
+          sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -17013,12 +17013,12 @@
     el2markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el2markdown";
-        version = "20160822.1135";
+        version = "20170630.1158";
         src = fetchFromGitHub {
           owner = "Lindydancer";
           repo = "el2markdown";
-          rev = "712364b9f64d2f6501a069e1bfed207de0237881";
-          sha256 = "12l50k56h1aiwmvvxrka3y1i82sv5xc7vn99z3y3kl31yl3g6382";
+          rev = "368d99313683cd943c99feaffca356be60bdb636";
+          sha256 = "1h0cr8qcvj9r3acb6bf5nyglvi5gdglwflkfl5jbzp0nm1p9iqcg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2markdown";
@@ -17221,12 +17221,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170531.206";
+        version = "20170703.1849";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55";
-          sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg";
+          rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6";
+          sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17295,8 +17295,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55";
-          sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg";
+          rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6";
+          sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17753,12 +17753,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170613.1339";
+        version = "20170701.1412";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "4970cbb55767e5f31913b21fb1ae733b6479ccd0";
-          sha256 = "0v0gw8ba073k6n48vrksp1bkrsh0fyg7wmc0mpjf13qcbcwn3ydd";
+          rev = "6b654b5fdc4e8f09cd842a0dde83ded284223c2f";
+          sha256 = "02z965inkp3bxg9nyqscjs14dfzx7s18s3kx7ry50j2yi0iki6rg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -18841,12 +18841,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170625.617";
+        version = "20170703.505";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "e70a39d6e079dc1f818ad49d39c328fd3d9df1d9";
-          sha256 = "08qm2vbdimbmwhz4zdhc2kypkk8c0vhw8ihl5z8l9yfq4nw2wrc7";
+          rev = "4a253e1c24bfb993ca115dac7c9c03189fa0f7cc";
+          sha256 = "1vkihm7m5zpcyyr418661gfpdwixqzyrbp2vlhf6vd7i26ik3i8c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -18954,12 +18954,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20170301.856";
+        version = "20170702.59";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "deb9affaadce11c356df53b6b62ab376ef652d16";
-          sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0";
+          rev = "d9c43561d8d50066c1774e3cf3df12e168c9fc92";
+          sha256 = "145zn11l9i0lmjr83zvn8snviqqn6kw24dm5ihlllgxycclsvcrm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19482,8 +19482,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "e629ff20dce103b4c38ee3a654c9b4a83867d41a";
-          sha256 = "1x34b7f4xkpa6w5gllvz7cmlnvvyy474gscbxvypszdf4ynxpcv1";
+          rev = "9e9ad191ce49eb410c7a95a8410122eed8049755";
+          sha256 = "06iyy74hpnc9aqrgbwndx1shvdq05z8hys9siv4ng13725cfpj0k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19645,12 +19645,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170608.1234";
+        version = "20170705.1947";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "3752438d17c45553956cf775022b2358ff3d8731";
-          sha256 = "0a2afjg0ygd88qp5pc39ghwck837f6sk57c8zbcsyxwrabxnchhd";
+          rev = "61a8bf7d6cc6881e5555922eb36eecc6733a2b87";
+          sha256 = "0anc7bdar2q5c41ilah3p04p4z3mxkqlv91nkky72i58sgrw6za6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
@@ -19750,12 +19750,12 @@
     esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esh-help";
-        version = "20140107.222";
+        version = "20170702.1912";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "esh-help";
-          rev = "3dc15f2f6086d4e4da977468fda67229a859c927";
-          sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms";
+          rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695";
+          sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
@@ -20439,12 +20439,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170624.1221";
+        version = "20170704.1409";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "cecbcfbdda16653e3b5ddc7de2eab25537ec154b";
-          sha256 = "0s6g822m19dq557ax42vwvgd017qff8hdajdjb03bfp2gd2zwb66";
+          rev = "a375ac8aea43980dfa60525c7585be64896e42d1";
+          sha256 = "1b3j29d4ppbgfg15vfyxz7rpjppqma9am3hk57qxq08n5y3skaxf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -21342,12 +21342,12 @@
     evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "20170623.1221";
+        version = "20170702.302";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "dc62ac317fd29f018e9785c1b3b7dd7ad57b3938";
-          sha256 = "18j33smlajj7ynigfgm64z3kfys5idbxin2gd93civ2564n85r33";
+          rev = "c50372d152b123fbf7bc26b49504505a22e82635";
+          sha256 = "1xvpjs91wr351gl0xb3fbbm4yhv2rcgbqcn8srw022a2snhrdw27";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21884,22 +21884,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
+    exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170628.732";
+        version = "20170706.408";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "3b9367779653635cf5e0ab1554b9709b109859ed";
-          sha256 = "0802az9ywfjmainj1is335ni1dm8hfrj3rabhmhwjsa9h0crh5f5";
+          rev = "c73155257a3248d30a9f602de8247ac3e32ba400";
+          sha256 = "1bcmrmyx12g11laz9f994vhmqyv1g0qvmp0sbh07nl1q42xy86m6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
           sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
           name = "exwm-x";
         };
-        packageRequires = [ cl-lib exwm swiper switch-window ];
+        packageRequires = [ bind-key cl-lib exwm swiper switch-window ];
         meta = {
           homepage = "https://melpa.org/#/exwm-x";
           license = lib.licenses.free;
@@ -23553,12 +23553,12 @@
     flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-clang-analyzer";
-        version = "20170623.446";
+        version = "20170704.2333";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "flycheck-clang-analyzer";
-          rev = "4c7d24a6a20ef528ee4ac28e5f783af6732b639a";
-          sha256 = "0ncp9jwxf1lqxzpxz6ivn4qhg6bn318ykmfrw4jp1iz73qxx0kh8";
+          rev = "a33752224cb1da13b35d0d60b2017fe73d167781";
+          sha256 = "1f6nb92fg1lgf4xz8x1i61njwnqrab94p88kliaa7g9r4hfhgv8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer";
@@ -23658,12 +23658,12 @@
     flycheck-coverity = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-coverity";
-        version = "20170520.825";
+        version = "20170703.1759";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "flycheck-coverity";
-          rev = "fb8ef7b07ca17681b72272331d43578f30405bec";
-          sha256 = "0068wzh2fyrbjn5gvfyf1kpfppfw49mnwkd0n046nhjgaz9y1lc7";
+          rev = "cb211e3dd50413a5042eb20175be518214591c9d";
+          sha256 = "17c5lppa5axw6wga3k8zqmn5f2syadlqbavrqgsi8k8nlcckxy1x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55e8df91adbcf8b059096e02aba2781424250381/recipes/flycheck-coverity";
@@ -24523,8 +24523,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
-          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
+          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
+          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -26355,11 +26355,11 @@
     fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fuel";
-        version = "20170627.1447";
+        version = "20170705.1534";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "7a9817aeb69f503cb8433510db59a2f110cd7f43";
-          sha256 = "0y755v2bv9lq9sban6in49d6kz7cgz3hyg4mpns53ibiqc0jf0sy";
+          rev = "1eff2b3dbcbe6d8518a5ec42207b5578dbe93530";
+          sha256 = "1nr5s98xss68scmbzrfmdn1ri4hfny6317j6bhksxqnd6dr6za8q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26480,12 +26480,12 @@
     futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "futhark-mode";
-        version = "20170623.756";
+        version = "20170705.1240";
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "9e2a79856fd07fdad91113c9eb10566193b74586";
-          sha256 = "0a395l9kvx1flyzfp2npsz4izww4kqkj3sby3fv5knrhd4dz5jdi";
+          rev = "8e3b72bcf26b992546d794b10b96d05ed01f0a73";
+          sha256 = "1y2y701ks3fd6khls4i30b906akxqj3l1c15nbblp6xl07bznxw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26810,12 +26810,12 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20170411.1021";
+        version = "20170704.1044";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "41059d6295dbaa207b2203fb6b78003de4888714";
-          sha256 = "19ri8q3wbpw3vsw2iq1ym60gk0j4f9bniipiddrjqqirhcns8zzq";
+          rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd";
+          sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -27125,12 +27125,12 @@
     ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub";
-        version = "20170614.840";
+        version = "20170702.512";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "ghub";
-          rev = "efdc28e3d27dd0847ceece593ecd1e9ed3287c9f";
-          sha256 = "0vh6y36b219vg2iwxbcdkdsnpnmb4kkvr9pz2kgiayyqrmz3ck37";
+          rev = "16c3300bb5d82b141aefa94c47ad9f97a58b0011";
+          sha256 = "1w1cqz32rx4i4hcjkz2znlchp5h4xg74znm9819k4anlf635lshd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub";
@@ -27339,8 +27339,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53";
-          sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n";
+          rev = "b8d558678821e35450c19e415656e366ebe44c38";
+          sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27755,12 +27755,12 @@
     github-modern-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-modern-theme";
-        version = "20170624.2230";
+        version = "20170628.2332";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
           repo = "GitHub-Modern-Theme-For-Emacs";
-          rev = "4bdcaf765d87995be99e15775fe313fe98c3ee57";
-          sha256 = "1lkbx06dgwc19h9bxxwvqqwwdpy0dm8djazvzbsxw0x200cx2j2m";
+          rev = "1890ab87ca8a046b3fc7b54220647d9ef43a6780";
+          sha256 = "00jw2qf4x943sib0j6grcmm3lfr0ac23wa3vnzjzc509v4l7jzwp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5506d93bd8cf59cd281091b377c1bb9a4243666/recipes/github-modern-theme";
@@ -27839,12 +27839,12 @@
     github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-theme";
-        version = "20170624.2223";
+        version = "20170630.1501";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
           repo = "emacs-github-theme";
-          rev = "99dd601d7f80893d42531510204f8115ed27f32b";
-          sha256 = "03gnwg482m8mhhfdi7jlinyjwwv4l3jf8s84spkl4jl4d97brk04";
+          rev = "29f00a51d949a248a5f6355a97131e216747c797";
+          sha256 = "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
@@ -28324,8 +28324,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61";
-          sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2";
+          rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05";
+          sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28870,8 +28870,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "85799e8cd3040b960e4dcc544cc9bb7c9cd716c3";
-          sha256 = "16khvjfiv4x1rghac2d970875w6jyg2fl7pbj801q0ia5cm7cxz8";
+          rev = "d75bd35c8fd1c32aab86ea47e7ef4d3c776faa0a";
+          sha256 = "0s1q9qw6azzbzr7k4c58m6d83cbz3srn63mi73jlh5fmad1w8g4p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -29137,12 +29137,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20170316.1124";
+        version = "20170629.1129";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "af03c6dfde43f6f6d39a1363267d591cf76aab66";
-          sha256 = "1adgg08bsi8p03a6rpc1a23dxvrikc37zcljrdyc4j2z8ci839x4";
+          rev = "eecdf6b7aaed40a71eff13c44456d63127e494bc";
+          sha256 = "1y7dxd40w5zkp59m0n1ybf128zhpi2wkjbw5v5w0ps7nx782dnzp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29267,8 +29267,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "525f899f69623828d75f0e744250316f27ed02a6";
-          sha256 = "01711l9g64d6sxhappn8cpxl315cprc3a5dnbkgm0vsaas6kl4xa";
+          rev = "2f63009220e9b13516696396a8bf1a5be4757e33";
+          sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29502,27 +29502,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "gregorio-mode";
-        version = "20151026.720";
-        src = fetchFromGitHub {
-          owner = "cajetanus";
-          repo = "gregorio-mode.el";
-          rev = "5b618a8d05cc073bd8e6f1e4e56eceb4de60eab3";
-          sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/81317d4ad793d8a58770844ec9a526a2c695f94a/recipes/gregorio-mode";
-          sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx";
-          name = "gregorio-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/gregorio-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grep-a-lot";
@@ -29648,12 +29627,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170628.1209";
+        version = "20170705.815";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "525f899f69623828d75f0e744250316f27ed02a6";
-          sha256 = "01711l9g64d6sxhappn8cpxl315cprc3a5dnbkgm0vsaas6kl4xa";
+          rev = "2f63009220e9b13516696396a8bf1a5be4757e33";
+          sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29711,12 +29690,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20170627.215";
+        version = "20170705.1636";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "1e41219fce47a8b5201de98f954e7040b4eea980";
-          sha256 = "0yaw60pny5q63ljn4pwx316rix7385rycvyiakcn7zfd00nwnvdh";
+          rev = "fff195715b537ac6f13b89034c232a8f33bca45e";
+          sha256 = "0l5iwxj0ahn3r2sha4045lwlqi4s8070p1rbiw5fmad3v66i3m3j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -29858,12 +29837,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170628.747";
+        version = "20170702.724";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "f4b0d8d83bad30b99a919639b387189350c6fc62";
-          sha256 = "0cif4d4n0l5apfksg67zsavh6wrv2pcpq2r0m8zjfg48hv6qmsad";
+          rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f";
+          sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30362,12 +30341,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170601.2103";
+        version = "20170704.1445";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "7eb94b5a5d9478a0da869bd26ba51d08e574d843";
-          sha256 = "1bj077gpg2xzzjcriv9zixjqalppv0ya5s3bpxn2w93jkzxa9xd5";
+          rev = "00ca4d935e80707e18c17e40630ea9e36b39592c";
+          sha256 = "049q8igjx4y9jancqv0bibd2jhz02llm1v6xfl9379v5p6nkfm3b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30631,12 +30610,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170627.155";
+        version = "20170705.2232";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9d840649dd08f0c417add55c3b434d34f4b381a1";
-          sha256 = "0az1a95drpcmzkqn0jw9kc9kjbz7wbgphzrwcag4rg8ljkn7q80r";
+          rev = "f0bbfb828320c95992d6fc593be849f522cde0cc";
+          sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31240,12 +31219,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170622.1355";
+        version = "20170701.629";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9d840649dd08f0c417add55c3b434d34f4b381a1";
-          sha256 = "0az1a95drpcmzkqn0jw9kc9kjbz7wbgphzrwcag4rg8ljkn7q80r";
+          rev = "f0bbfb828320c95992d6fc593be849f522cde0cc";
+          sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -33049,8 +33028,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
-          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
+          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
+          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33343,8 +33322,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "89a7564edc6b23ffba52b02353528b9b6285c729";
-          sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1";
+          rev = "a4c267aef5a3344bd4d76b6b6cf13e120cbe002e";
+          sha256 = "13r4s6k0yxp3z68756sni27l7lmlfhdz3hx021w7lhn4np69i299";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -33610,8 +33589,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "792e340352b3ddc579e34d8d6ffb4219bac5cbeb";
-          sha256 = "1af9xkzmn84374kr0czlivzxxfay35l2pw8rp7nkr0w0kjhmmxmr";
+          rev = "da7d479c89090155996bf568bd89fa8a8859eac7";
+          sha256 = "1vpfb6n1k7j8wmzsn3j2a8g2hf6lxc8jp77xgzi3kd0wwdyjmqg2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -33690,12 +33669,12 @@
     hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hexo";
-        version = "20170627.22";
+        version = "20170702.1915";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "hexo.el";
-          rev = "235264a99435552ebd57c0a7784ec0c500b7966a";
-          sha256 = "0j3z1zabzc2mmlvzzp21pmfv03p5lf0cjf0xadiy5df2z2xnrmfa";
+          rev = "201c795ded01d96690ceadc1dd068744aceaeda8";
+          sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo";
@@ -33913,12 +33892,12 @@
     hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hierarchy";
-        version = "20170617.1126";
+        version = "20170706.552";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "e71c2970dc4eb90e5473f7a038e7ccba4dac6c36";
-          sha256 = "10mlbz3xlbvka5bw5cxymbha5vkkbb9sfziwxgfx5bwrhjp6n90z";
+          rev = "3f5d0d932fb6d2152f4c269df10bcc435a5ac764";
+          sha256 = "1qj2sf3x2bq54n0xqllis3abikjgbp18qn1i4vff5cs6n2an69cb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -33933,10 +33912,10 @@
       }) {};
     highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "highlight";
-        version = "20170223.743";
+        version = "20170702.732";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=145";
-          sha256 = "05dsa2sfciajwagm1gzl3v2r199nl1yjnb6l0v8ria3f9d72yj5j";
+          url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=149";
+          sha256 = "0kh72fmqsha25rz0g3ff983badh20clsig7blrhvl8c4bv3sqs56";
           name = "highlight.el";
         };
         recipeFile = fetchurl {
@@ -34470,12 +34449,12 @@
     historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "historian";
-        version = "20170416.2154";
+        version = "20170630.1054";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d";
-          sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip";
+          rev = "99e282bdd8994cb4e23185d9004b2cb42a214927";
+          sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -34737,12 +34716,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170623.1400";
+        version = "20170705.1355";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "24fef866f5aaee475da845145a516b3c368fde81";
-          sha256 = "0h3pn079i2vj9japba7wbsfap5s5qjglvvbmncmgjd26sl4q4hr0";
+          rev = "67d52175fbc5a194367e421a33ff4359a0ee016d";
+          sha256 = "11l13j9j3bh7p1hprlpvjc8ir8643d7px4a89rpwa2m70z9v0skp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35572,7 +35551,7 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170625.1911";
+        version = "20170704.1507";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087";
           sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
@@ -35779,12 +35758,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20170601.559";
+        version = "20170705.1656";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40";
-          sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm";
+          rev = "e8c2716cb38067d23f35666be83323267e692618";
+          sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -36094,12 +36073,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20170530.1839";
+        version = "20170705.1656";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40";
-          sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm";
+          rev = "e8c2716cb38067d23f35666be83323267e692618";
+          sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -36178,12 +36157,12 @@
     idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
     melpaBuild {
         pname = "idris-mode";
-        version = "20170628.1231";
+        version = "20170703.2038";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "e4347cfb75e4efdb43b52b01bd759c84aba84804";
-          sha256 = "0m26xwp0gysawf7dzx2k70hlxky0qbfpxqfs7clb17dv1i7ixa6y";
+          rev = "7de2809515cfb413a7be5fab71d6814d2699e1e3";
+          sha256 = "0v6as33dpqmggmprpimv5rrm7vpfakka5hszz5f5p2k5v212yvk8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -36675,12 +36654,12 @@
     importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "importmagic";
-        version = "20170601.1828";
+        version = "20170702.1844";
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "41f90782b7d5c58f53ad0187b816faeea408e4cf";
-          sha256 = "1w73734n8qwhvina1y9m60b5jj5yy1csizbldyph4vcgi3x0ff6l";
+          rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c";
+          sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@@ -36801,12 +36780,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170620.808";
+        version = "20170705.305";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "74e84231ec9565c4420019b913e3f16521dea542";
-          sha256 = "1lmvdmcy47swgj1nqhq91w50fh9iz0zwn06ygns1z06s9gcqc6sm";
+          rev = "9fa8f37a7be33337ab0e865b1718bbb81eea295a";
+          sha256 = "1h6637sa83jckswp81682yis5srhaj02r6ycxzcc1ngfap3mkks7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -37302,12 +37281,12 @@
     interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interleave";
-        version = "20170211.807";
+        version = "20170630.22";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "interleave";
-          rev = "822ae2d29aaf92bcf96324442126b551e4477d6a";
-          sha256 = "0nq2f6pgq4vszy3hx84qdml4i9lbqlrh9knqgwgrl819vr15srqg";
+          rev = "2c0458038bf0440f271f6e000039027be411eba7";
+          sha256 = "0rpw1ms80hr01s76av8cvid4gvkd3sapx0c3g3a05za0bq1jqacw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
@@ -37884,12 +37863,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170623.1108";
+        version = "20170703.2350";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74";
-          sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5";
+          rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896";
+          sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37947,12 +37926,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170605.2046";
+        version = "20170704.1238";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "117369f882f81fb9cc88459a4072a2789138c136";
-          sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f";
+          rev = "b0407466a1e6dc23150663757f6b48e14cc5290a";
+          sha256 = "0wapfnz7l32qc93xbx64bd42v4b4dav3288ij3pc7r03r4by02m4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37993,8 +37972,8 @@
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d";
-          sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip";
+          rev = "99e282bdd8994cb4e23185d9004b2cb42a214927";
+          sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -38010,12 +37989,12 @@
     ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-hydra";
-        version = "20170609.938";
+        version = "20170703.2350";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74";
-          sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5";
+          rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896";
+          sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38098,8 +38077,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
-          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
+          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
+          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38764,12 +38743,12 @@
     jemdoc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jemdoc-mode";
-        version = "20170611.1536";
+        version = "20170704.1327";
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "jemdoc-mode";
-          rev = "0b09b0368acf3b90c9b58274ff8c2a1e77d1d5e1";
-          sha256 = "094smy6n30lwgldg958z387dc0nzjvghlai5xpxc5q2i1gjjqh78";
+          rev = "529b4d4681e1198b9892f340fdd6c3f1592a047a";
+          sha256 = "1f8nn8mv18q3x3k32i6kjis9f3g1ybdjcfaw8hywqwy6k8dr734m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49a8c0f885df0b91d758b4d7c92bd67368da8a56/recipes/jemdoc-mode";
@@ -39203,12 +39182,12 @@
     js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
     melpaBuild {
         pname = "js2-refactor";
-        version = "20170525.544";
+        version = "20170703.314";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "6ee315825b6f0424f15a8520733dc145c85ccd83";
-          sha256 = "14ykvbj5f9w5pk8l73k8niwr62slfx956px35zn51563sjs55gnd";
+          rev = "01a8d98958b8c546a6a9eb3b339a1dee864684fa";
+          sha256 = "09pap1r9aiif8rmmzpw01154iravsmqw8msbdrxgbqlpndcaqnmi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -40274,8 +40253,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "aaca07b200702a6b40e0016556f8d3683fce6bb0";
-          sha256 = "1rg3n0bp8f2bz6rcf01656hvv7mn3a7wr3hc1c7j0830a1d7nn2w";
+          rev = "ae8f3a2dfccdf4495c137163e5e68b9130fee34e";
+          sha256 = "04nik71cd3cnx41rz0nhwkk41nx7r0x63ldf4rihz6q1h43zxpzv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -41044,12 +41023,12 @@
     ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170616.2223";
+        version = "20170702.200";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "0e577560f0c01f9e4bbd5280edf113020e65c3f3";
-          sha256 = "01ndc6llqfdz8x64k5c1bjvvx47nd2dag4fn48xfsb8vrpnp78i2";
+          rev = "9dca096255f7ca92ff887d70b6c4c67ce3374ff1";
+          sha256 = "0k63sad7w1gym3l5p0hfnwjhj8a0ic59z6g1zf3j10752439bsx3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -41989,6 +41968,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    livereload = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }:
+    melpaBuild {
+        pname = "livereload";
+        version = "20170628.2350";
+        src = fetchFromGitHub {
+          owner = "joaotavora";
+          repo = "emacs-livereload";
+          rev = "1e501d7e46dbd476c2c7cc9d20b5ac9d41fb1955";
+          sha256 = "1z1v2panxrqpam5ysnilx83y6b4dwxmxqhmbgjwfyd1bdmr4iya4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/330731804c442226fa2faaa3da408e9253a1c051/recipes/livereload";
+          sha256 = "1z0dbg82l6znz1b03v19a8fnq6b1smikpvaplpxlgny82xrs9als";
+          name = "livereload";
+        };
+        packageRequires = [ emacs websocket ];
+        meta = {
+          homepage = "https://melpa.org/#/livereload";
+          license = lib.licenses.free;
+        };
+      }) {};
     livescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "livescript-mode";
@@ -42037,8 +42037,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "a143b4a4f33d548f126e7d212e91b7742fe1af18";
-          sha256 = "1nl9sq71dsny6hm4bd9bh1nzxx4iqd7a91x2lyyjlfnnf1f4602a";
+          rev = "45bbe61cd4d8950d8f91e2c9efd6d36c7e4245e2";
+          sha256 = "0dzpdjg7yrbvkmx0nfn3wgs0bi5j38k6js75axxfpgk1jp4l8x8a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -42284,12 +42284,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20170518.428";
+        version = "20170705.1217";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "c85f0527664538ac9d59bbac9bea40c207c8b9d5";
-          sha256 = "1gnia7vkhdh116b7hyxnrnkjnqliqsy5zskn43wjhfw6swf0ipxn";
+          rev = "134b41557ab539219d9e3a1b3c8939df93676726";
+          sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -42494,12 +42494,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170601.1101";
+        version = "20170629.33";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "6fe3246e00995ca7ebe3b3c36ea58a69de521193";
-          sha256 = "1ib4ld45wfwq5c48w56k8ca5qggjmxgpn2q0vvi556awk47anhqr";
+          rev = "3e93b3fd754931cfd122855659afbd070d844bac";
+          sha256 = "0g45zrch41041axpi5j6jbng1dbjqhpysr38cv2f1kqdmw9ybg9a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -42849,12 +42849,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170625.1144";
+        version = "20170705.2113";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53";
-          sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n";
+          rev = "b8d558678821e35450c19e415656e366ebe44c38";
+          sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42877,12 +42877,12 @@
     magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-annex";
-        version = "20170621.1328";
+        version = "20170702.832";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "15eca25c59bef89da75f9a741d194698d0e708eb";
-          sha256 = "184873b01b9dvwjjx6xsfz4v8rwhwsz9knjw7yjggmql20lxdpqq";
+          rev = "85b860cb53d6f0088255013ef849af9a882110f9";
+          sha256 = "1jj467kdvklb1sl0dyyb00jnl4xgz56mql1wnr4nmiqbxaqzqa46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -43045,12 +43045,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170625.1144";
+        version = "20170701.1313";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53";
-          sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n";
+          rev = "b8d558678821e35450c19e415656e366ebe44c38";
+          sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43066,12 +43066,12 @@
     magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-rockstar";
-        version = "20161013.544";
+        version = "20170703.704";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "magit-rockstar";
-          rev = "bccce1ac8e012f52e29470c1c7d815f9bb1a192b";
-          sha256 = "0z411x2w6ldy3b8qbavfvfgvkbjd1rl0m1plr44ynp55awrhj0k2";
+          rev = "a65042e3445008b55190f1258ae54bd78e12174b";
+          sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
@@ -43532,8 +43532,8 @@
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "c832bd706293f394c9b2ed9b2da96cde7f4347f3";
-          sha256 = "0n4iv1f7qp6n5hs28p30v9gg6qm8p25q1y301g0ljmsr2f55qjcf";
+          rev = "4463a734a9377d6c17a0cdba0f1e7ced0db7bbdc";
+          sha256 = "1h99cgpw28gg9lqh53pzpp7qh350dbcran90387jrh5plyicsq3m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43704,12 +43704,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170627.900";
+        version = "20170702.738";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "ae5eeecf1228d12b48f0d6bb22149ab2aaa9aba8";
-          sha256 = "110z98kpfb7bw8r7xn1cr2hjbmm91gcvv6il2pzxmha24qwswxgy";
+          rev = "2c8d0e537ea7a2e823b7768b603f7194beebe565";
+          sha256 = "1w8vm5inmrzxp790ynpdbh6wavc9jq0f0jafc5a277hsxhbl9i7z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44275,12 +44275,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170625.1942";
+        version = "20170628.2045";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "77bc1c735b41acb6d43692dc3dcb60f323656cb5";
-          sha256 = "0b33bbmj7c62zn882max569wyybb9b04plb47sg55amv3nv8c8fr";
+          rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a";
+          sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -45624,12 +45624,12 @@
     monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-alt-theme";
-        version = "20170529.1607";
+        version = "20170630.1348";
         src = fetchFromGitHub {
           owner = "dawidof";
           repo = "emacs-monokai-theme";
-          rev = "09370802ddf6010a9a83b6c38cfc055e31433a73";
-          sha256 = "1dn8z2lj8kvgs0vxiiqm0wz73sgqykkbi32d6f7qa6i4ishyw341";
+          rev = "f342b6afc31f929be0626eca2d696ee9fab78011";
+          sha256 = "1lgsqrwf21b0rh4x8nmj08a46ld7dkq4jhwxi1fi7a9xhmi2yd4i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme";
@@ -45645,12 +45645,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "20170314.1612";
+        version = "20170705.1152";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36";
-          sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r";
+          rev = "71bcced6da1033822ea52e4ac9f312f9d6b5e062";
+          sha256 = "1kwngvpih9q7wkdv6ayisi2c22xi9jh9jffd4qzc652p26yhmzq6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -47332,12 +47332,12 @@
     neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neon-mode";
-        version = "20170628.611";
+        version = "20170630.245";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "neon-mode";
-          rev = "0666c4ca4ccf0c3b712115617a035413ca40df22";
-          sha256 = "14kcp5yy306gj9clqlzrabdhq71q3p5wsbwc4gcy1r1kmia1mp4c";
+          rev = "044040df9e83a015ddfe58940b503b6197fc29ce";
+          sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@@ -47584,11 +47584,11 @@
     nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nikola";
-        version = "20170301.1148";
+        version = "20170703.1321";
         src = fetchgit {
           url = "https://git.daemons.cf/drymer/nikola.el/";
-          rev = "6752cc70b08889ff5184ac111616863f1881d357";
-          sha256 = "0cwn05q0fj6xddfc5qimryvqi5l68sqyxvw638vzmrpnzl6dfc9h";
+          rev = "964715ac30943c9d6976999cad208dc60d09def0";
+          sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola";
@@ -47692,8 +47692,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "c7346a275c4cdcb59b3961241ddc52b79452d716";
-          sha256 = "17vyi7215pwffa1hfsgkmgc1xkxkqqmrmg06rsxdy747mi4vpvr0";
+          rev = "a3dc1e65abe29f9d0528d3b5ea45812f4dcd63ed";
+          sha256 = "0bliq5wnzp3n0pdf6c2271ngxxgphqimjm6qv8kxl83f1mpfpknc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47835,12 +47835,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170621.1348";
+        version = "20170702.457";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "1f10dbf40266c8e675e2e10f708f87ec61413ab5";
-          sha256 = "03dndvbvb3f9ia1sk03zhbi43mq2irxbcxdaazvvyfk021bffbzs";
+          rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82";
+          sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -48021,11 +48021,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170625.557";
+        version = "20170704.432";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "c9deb329331afbd16f42ef122aba92375ce6dad8";
-          sha256 = "1zzbg0i76m6pqmy5mh5bdrfmfa9hzw5z0r6vyxgy344ry6fq9bl7";
+          rev = "6a79229737198110c9ae1a3c3e9b86d09b78bd94";
+          sha256 = "017cp7z9l97xszlz4v97943zn1k03hmwxx9hphjrl7015hr38zwc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48435,22 +48435,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-async = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-async";
-        version = "20170624.1810";
+        version = "20170705.2131";
         src = fetchFromGitHub {
           owner = "astahlman";
           repo = "ob-async";
-          rev = "fc0020e515fe156fdda7fbf47f12c4b00029d44b";
-          sha256 = "1b2gpzml8hjcadb4sdhhwdj14h9hj1aawq9iic5sqffc8nsakfqc";
+          rev = "079dbcbfa229407ae2f53689a4d045f827adabd5";
+          sha256 = "0jinxwv72yypns22iv2v4ll1wkg2ca5vbx1v36pgxgmjvawfilvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
           sha256 = "0k7kv71nnibp53lav774c61w9pzhq8qvch9rvpyyrwbyd67ninl8";
           name = "ob-async";
         };
-        packageRequires = [ async org ];
+        packageRequires = [ async emacs org ];
         meta = {
           homepage = "https://melpa.org/#/ob-async";
           license = lib.licenses.free;
@@ -49589,15 +49589,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
+    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170620.719";
+        version = "20170705.1133";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "7070f2a64de65e0446536fb974c940399a4097a3";
-          sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a";
+          rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35";
+          sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -49610,6 +49610,7 @@
           csharp-mode
           dash
           emacs
+          f
           flycheck
           popup
           s
@@ -49955,12 +49956,12 @@
     org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-alert";
-        version = "20160701.1900";
+        version = "20170701.1855";
         src = fetchFromGitHub {
           owner = "groksteve";
           repo = "org-alert";
-          rev = "685c18aa5ce994360c7f9e8bbf49590c412187ac";
-          sha256 = "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s";
+          rev = "169acc082643b6b793aab17ab7e0de3694e74698";
+          sha256 = "0khk1jyy4vxsfalf27f53d1g9w41qq6i6c9xm670pj6xrf38hxj9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert";
@@ -50102,12 +50103,12 @@
     org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-brain";
-        version = "20170625.1444";
+        version = "20170706.447";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "org-brain";
-          rev = "318d5a375b9d58e22ec8a80332ac8424916b9d7a";
-          sha256 = "15gqw87qlxbbvbcyxqp3h5vi1f0pashd131181mqjq5w3x8jk534";
+          rev = "497c18f517074629394c4c30de03d985e0c5ca8c";
+          sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -50773,12 +50774,12 @@
     org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-journal";
-        version = "20170221.612";
+        version = "20170705.217";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "c020fa3f58cdeff51701322334daa6253a144db6";
-          sha256 = "0pcymhjaybaxpghixa2gnshzqy03hafmzjdas8q087dn7b19cr8h";
+          rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d";
+          sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -50860,8 +50861,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "379a22c9c6f785a4b250a5225ebe8dc958bc8f6f";
-          sha256 = "1i6in0f56kxp8mn8wfz5rfx2vxf4br47vaswxwb3nyvcqnhx41wz";
+          rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a";
+          sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -50880,8 +50881,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "379a22c9c6f785a4b250a5225ebe8dc958bc8f6f";
-          sha256 = "1i6in0f56kxp8mn8wfz5rfx2vxf4br47vaswxwb3nyvcqnhx41wz";
+          rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a";
+          sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51074,11 +51075,11 @@
     org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-parser";
-        version = "20170528.1324";
+        version = "20170703.1738";
         src = fetchhg {
           url = "https://bitbucket.com/zck/org-parser.el";
-          rev = "c4870192ea24";
-          sha256 = "04s39zfa1gwn6zclgdhz3b9fbgyqlbysh6hsn7iqkwfzkpmc2n9c";
+          rev = "e8c81e633595";
+          sha256 = "1zwwn0xwpq8iscl0cznq3cxcr7kpwrxl6w9v2nrxjs3lffzyzl7a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -51091,21 +51092,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }:
+    org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-password-manager";
-        version = "20170124.549";
+        version = "20170701.919";
         src = fetchgit {
           url = "https://git.leafac.com/org-password-manager";
-          rev = "a982506652a2f5f4afeb338238e724d361cbc74d";
-          sha256 = "0x9f0vlgawbvga56yj95pdcx1j9r51ax76xsbbyrir0iyawgh258";
+          rev = "b2814d26287f2b6295a39098da9f5e2fbc5f2de2";
+          sha256 = "1pzlmy5vry9q898r4chgn6qp6s1ajlkv946lhn6z7qpdspvy9kyy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
           sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm";
           name = "org-password-manager";
         };
-        packageRequires = [ org s ];
+        packageRequires = [ dash org s ];
         meta = {
           homepage = "https://melpa.org/#/org-password-manager";
           license = lib.licenses.free;
@@ -51288,12 +51289,12 @@
     org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-recent-headings";
-        version = "20170604.1353";
+        version = "20170703.1625";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-recent-headings";
-          rev = "9b373ddafe33283ed9a41bddc65f05d6e9bfcda6";
-          sha256 = "0k92z02dyzax35wx7q5s9zasmkba9vzb2y7jf55jn8d7qjdw4lnn";
+          rev = "b3d6e3514b57aba7be4de676d1aa92c19e08cd42";
+          sha256 = "0367kkyxnkbgk3w0qvbl9xqxn5mbwpsj7qxf4s0c4jhdw2sk3k20";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -52542,8 +52543,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "82375dba2d7c5fcc1ddce4579a3b44aaa1afa84e";
-          sha256 = "007s3x4111zlinicxarsibkhcykdy71219417rwvdhdj29ick2jg";
+          rev = "957fc496311e8c685a5299aeaeb0f1882caaa3af";
+          sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -52580,12 +52581,12 @@
     ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-gfm";
-        version = "20170304.1504";
+        version = "20170628.1402";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "ox-gfm";
-          rev = "47c466b660ec184af70589df1c3a26d90241cd1c";
-          sha256 = "0jwk7nrdc09mrmwc6myyhlnqq4fap15s8spbzl78zsw3kf89n4vs";
+          rev = "99f93011b069e02b37c9660b8fcb45dab086a07f";
+          sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
@@ -52766,22 +52767,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
+    ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-pandoc";
-        version = "20161125.35";
+        version = "20170706.431";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ox-pandoc";
-          rev = "d9cf410096fb27be8eb13b2207697f8530f62abf";
-          sha256 = "0c8nfvh9vn850i3minfqvri2py48ycgz3sf5p1l0a3k98s4x4jl3";
+          rev = "1dd4370f52b6db999f3b5edbb146c26034024ef4";
+          sha256 = "0cm1a83jblrp76z5a9hmicsq2b3i5xwpyy1d08ahk0hffq0mbimq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
-        packageRequires = [ dash emacs ht org ];
+        packageRequires = [ cl-lib dash emacs ht org ];
         meta = {
           homepage = "https://melpa.org/#/ox-pandoc";
           license = lib.licenses.free;
@@ -53084,12 +53085,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170624.1712";
+        version = "20170702.227";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "08affd2ae70f245f2697cdbf5c7a5f72fb325ce0";
-          sha256 = "1rfi1qgwn7ngg3s6hpkqgaz2iygq0iv6y6vjzvbbmk1i9s8f51qz";
+          rev = "416d1cba6664b0783722129d24f4a748bd71e057";
+          sha256 = "1718raqkpzscrnih519dp7a7jnaymjgcaqppfgskbsw59r46p7sj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -55664,8 +55665,8 @@
         src = fetchFromGitHub {
           owner = "brocode";
           repo = "play-routes-mode";
-          rev = "ec861ab171fc5513df082d26b96a2e9d545ad64c";
-          sha256 = "1yn3270d0djsi7jwxw0arrylsyxkwbwawyw2ifpn6iwzcz55cnxh";
+          rev = "22d7b87e0eaf0330f2b2283872f8dc08a3258771";
+          sha256 = "0j61adh2lsh2zgz1v9i2jzh56ngnrpvsblipvc472k5dxa5qdxin";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode";
@@ -56635,12 +56636,12 @@
     prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "prettier-js";
-        version = "20170613.2323";
+        version = "20170703.519";
         src = fetchFromGitHub {
           owner = "prettier";
           repo = "prettier-emacs";
-          rev = "4bfc8b3f8e459235dca24796f18a3587d59f4aef";
-          sha256 = "1nzb0gf6hac35nnz6scqkfcwgp8ahwzv8qql9g1gkd5vhiag21ac";
+          rev = "22a333402aa9bbe00e2943f6aa6e25c402345241";
+          sha256 = "0dsm4iz8d2qj72a7jpznjy4skiznsh5lpai95p612dlanafgfpyn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js";
@@ -57177,12 +57178,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170626.653";
+        version = "20170704.2358";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "28df7d105cbfde2d9fbf322325a15edd85ced77a";
-          sha256 = "0v2x7psx7zgwpmxvqx7yq38vhsikrlnzlr798y8p1aqx6k4y9xfd";
+          rev = "c917c6e188de27331815f39511ed45a408de22d0";
+          sha256 = "11f52g8r5zb34nigm68gm8hwgkw184psknd7zqya0l1ipwkhhrif";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -57475,8 +57476,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "12acbc2678073c3439b427be0b713b97e2074bfb";
-          sha256 = "1rb2055zrv956z0sl1q2g88xnn82yns9vacjrg9ab2466amdcmjw";
+          rev = "6bd51a59df41b99058ec8c2b03a177a218267ce5";
+          sha256 = "1bgi9954xb70wjymxyzihjfqy29ps28x9h1brnd2krza15rwgrwf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -59495,12 +59496,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20170603.1430";
+        version = "20170630.1507";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "3d0fcb80eb017ee2277440d688bf366af3bcdf6f";
-          sha256 = "1i71z36hk46w50c9p4b078rqlh4bvwb3dcylhfcwnp4b8j02f31p";
+          rev = "b3719faa0207688db5db543e5420648c11928d4f";
+          sha256 = "0hn9qcc6c5lgna57yjlwkfl5yahwwgvjnhgp1r0idzamfc631g5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -59837,8 +59838,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "e136fe3e11d6cb46166c49999d57f6f50bac9d3d";
-          sha256 = "1adwv5p8rk1b146vg76lpnfrkj19mdzn5l5ghsls197n2j9q00x4";
+          rev = "7758d2a42a1a98199a9ed6af95bf70fe70f0c168";
+          sha256 = "0q08yfrv6mfkhh5rm0wq6c8p6sb60rib5z42k98y9d92gsn96lzz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -60417,12 +60418,12 @@
     resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "resize-window";
-        version = "20170624.1658";
+        version = "20170704.2212";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "274a96e9754b606d85c9dd62cfed628ff4f736df";
-          sha256 = "0ax18sflqh9wg938gaz9m5r1i45761qym7r1lyqqxp24jzp4wa6j";
+          rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904";
+          sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
@@ -60459,12 +60460,12 @@
     restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restclient";
-        version = "20170627.153";
+        version = "20170703.33";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "8292fe68c73561413cebff88008509180768718d";
-          sha256 = "16c2g8s64lxav5r5v8cqv5ihlskvz22kld5d1vzf3vzr2c9c4dwx";
+          rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247";
+          sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -60484,8 +60485,8 @@
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "8292fe68c73561413cebff88008509180768718d";
-          sha256 = "16c2g8s64lxav5r5v8cqv5ihlskvz22kld5d1vzf3vzr2c9c4dwx";
+          rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247";
+          sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -61085,12 +61086,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170527.450";
+        version = "20170705.144";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
-          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
+          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
+          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61151,7 +61152,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59201";
+          rev = "59273";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -61232,7 +61233,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59201";
+          rev = "59273";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -61669,12 +61670,12 @@
     salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
     melpaBuild {
         pname = "salt-mode";
-        version = "20170626.444";
+        version = "20170702.246";
         src = fetchFromGitHub {
           owner = "glynnforrest";
           repo = "salt-mode";
-          rev = "3a570369c9ed4e04a9bffa7e79ced0c8bd7f99b1";
-          sha256 = "1d4fk1387xjch3a8xrij8knvrs18c7iq7m9jclzy2v6bp9ml2lnb";
+          rev = "ea4980b9c9e8e7570086a2558fe7f66c62a528ad";
+          sha256 = "0ygi9kzkfqzizygaqwqpymn8s7kr8ci38v61qmy4n58n9c19fdwx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -61858,11 +61859,11 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170530.355";
+        version = "20170629.2356";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "736da7f466aad2b64c846ece258082c6aac647ae";
+          rev = "03834eb7fa0922efaa31d2157d9effa2b7e04810";
           sha256 = "0idj4p3d36yp0irp1yfbihq8mf17jc7facz5qy6kx7zj0wdx4fjw";
         };
         recipeFile = fetchurl {
@@ -62442,10 +62443,10 @@
       }) {};
     second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "second-sel";
-        version = "20170307.946";
+        version = "20170702.729";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=28";
-          sha256 = "1sgwza2ka3iqsajnppq2vd150h1wbkzzi04rk7bzpqj32dyh7gbx";
+          url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=29";
+          sha256 = "1yq06a04j44r019cjv2jb3kfpfqhnxdf3b4hhz4d3fz7v1hsicwg";
           name = "second-sel.el";
         };
         recipeFile = fetchurl {
@@ -63527,12 +63528,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "20170624.1454";
+        version = "20170703.926";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "23d6d213a90e031dec8dbbaaeac5ddbe2cf050de";
-          sha256 = "0y96l6m7lnw2wsi5zbla88xgxmw3zksblnk36bgr153bik14waxf";
+          rev = "3adbfe7c03d509538a6e43bafda27ea290298a14";
+          sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -64051,12 +64052,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170612.900";
+        version = "20170701.436";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "94f1a311de0c79c8245784543b05359714550d72";
-          sha256 = "1ypsl1vin5h90sr4cc127f8gm23h4pkag6zwfwx53h2yrsj7vvrh";
+          rev = "35b0ae538b2023c91b035b3f9c133b28f0afbaf8";
+          sha256 = "12ks2d91bvsxkwwjjgs9ymcwf3w90x7r0krvb6nsgh970s35yv78";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -64114,12 +64115,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170622.1604";
+        version = "20170705.643";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "74c1a83711a0c2b96e9387f3fa03f387a6713193";
-          sha256 = "05rs4da1dgwvcwvbq70angwqh3zjhsxnjvp5rpfvk5lzw9p8ng9r";
+          rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6";
+          sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -64303,12 +64304,12 @@
     slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slstats";
-        version = "20170612.725";
+        version = "20170629.235";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "slstats.el";
-          rev = "7488623cbe406eaafccc36d293e8c42bbd308085";
-          sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n";
+          rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167";
+          sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -64825,12 +64826,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170624.504";
+        version = "20170705.1319";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "0f32a87ae7a70c4a39debe4aa4585029f35ea30a";
-          sha256 = "0gdskz49lqm20prhanqcldfz6sbiqpdfpn6xl5p3yqskdz4b4pdp";
+          rev = "34ca8a68b201879e88c3814a2dfe3a1b9609bac3";
+          sha256 = "0ybij6m0h27q3q1pv1cny5bpg35q0m0yx071db40qd8pdvxn0b90";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -65185,8 +65186,8 @@
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "22b3efd741e26f59e18c9fd28691d8b84c9130ab";
-          sha256 = "0hjp5ci7miggw0gs2y8q867gi7p3dq2yyfkckkh52isrp0yvz0wf";
+          rev = "8a4da1125dd284e55139084d62fb29af5bcbcc20";
+          sha256 = "1c85ycaqyrncp7pbax6mdnz1v91hpi1pc9jspd6irwhhs8b9jxfk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -65734,12 +65735,12 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20170621.45";
+        version = "20170630.2327";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "b1c41ddd290153fcc1df8f1d0fb54062e9943894";
-          sha256 = "1ga6h2jbnkjkf5f1hqg5jy5fw0cwlgzpn2f1mcrj04302i2vliv4";
+          rev = "e6ccec6c80ee2bbddbad5a88cb9d2cd2db8a1a33";
+          sha256 = "0ga99imh00h0bnc4m2q335y0x8zp6xs1n47rqqhxp6iwmw2fz20z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -65755,12 +65756,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170605.838";
+        version = "20170703.237";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "bc611779a7a3c10b7367bc8c985923d26ee91443";
-          sha256 = "1slnzb26fkmj01hakzbaarlmf2ng4d1zkimgb93axx0svxh03qc7";
+          rev = "655ad80f6d63aa6bb2fcc8f73e5a2c65f807b02d";
+          sha256 = "0b4l3afajkcgahzara666fhkxm6wbgim65r4yy73psadhwpfhp3l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -65776,12 +65777,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170621.718";
+        version = "20170705.1052";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "be01cae704dc73e6a4b53766e655fb0dfba1bbc1";
-          sha256 = "0c8mx9ivalgvazhn51lbmskayhdhwnmvq5jp5wi7925p05i0kb3z";
+          rev = "6f41a3321296c35c1b77660cf3956f07b3b68086";
+          sha256 = "0n8gchqrm8nm687wpqm599622yhvylkf1vslw0akgq3r4vsyfini";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -67336,12 +67337,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "20170525.1254";
+        version = "20170703.1433";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "13611ca0e4dfb8e6e4a314142368bfa7f0de5b9b";
-          sha256 = "0svlf2kgdbhwaygydvwvhinafiwv3qrgyn5wkfpcnz1km30g92hf";
+          rev = "59e140248a667127771aa7aa49ee0511c55e8817";
+          sha256 = "0j0lrphg97lvyxlchgws7l0n0c76hxh6sbm0c98dvsnki6jgfj72";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -67714,8 +67715,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74";
-          sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5";
+          rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896";
+          sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67773,12 +67774,12 @@
     switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "switch-window";
-        version = "20170522.2042";
+        version = "20170701.246";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "switch-window";
-          rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b";
-          sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f";
+          rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d";
+          sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
@@ -68487,8 +68488,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "c823729104873d0d1eeff4256eb15ee4c1dbfa36";
-          sha256 = "1zkjyj3jm2q23yfjvrvikrm6c6lvcysnnhivfvvrh0qr7qlqvwfz";
+          rev = "477a87418980cfba695b2507a268d632f4e7a220";
+          sha256 = "1xgi33wi69v3lx62q8lk04njcjz8ny2lnjn7ll332bcgx7sbh292";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -69446,8 +69447,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "4aaa92ece8503a6da9bc6701604f69acf2b99d07";
-          sha256 = "1my582c0ln1byxid5acdd6dk7lvi7lwd6gka10s4bp4w3xrd55x8";
+          rev = "49e5103920e75a149d02c7d487496c8c79154a6c";
+          sha256 = "1ywqyz27k1h87rz3vwyzchsajl52smp0ypwdmwggj2yn1mrcc9p6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -69805,12 +69806,12 @@
     tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tldr";
-        version = "20170621.2059";
+        version = "20170702.1859";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "tldr.el";
-          rev = "2d80571cbffc5c02aad771da4b00502d86242926";
-          sha256 = "14gc1ihiyk7j4vf33r2kq3sbj37gw9s17p3gykj2sfviq295s006";
+          rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1";
+          sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
@@ -70478,12 +70479,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170625.1509";
+        version = "20170705.1153";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
-          sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
+          rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0";
+          sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -70503,8 +70504,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
-          sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
+          rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0";
+          sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71310,11 +71311,11 @@
     undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "undo-tree";
-        version = "20161012.701";
+        version = "20170706.246";
         src = fetchgit {
           url = "http://www.dr-qubit.org/git/undo-tree.git";
-          rev = "4cba00bb049cfaa2ee6821a9e347209a88a740b5";
-          sha256 = "0qawh5cr0ahdg1rks96g9fbva2nfkz8mbl82jnps6axqdf57gm38";
+          rev = "e9a9102f515acd7523158f20e83f300600374989";
+          sha256 = "07y1pn0dzwh1avkd3dm96lcjisvnr7p02wbhxf1m3dgaxf059mcn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/undo-tree";
@@ -71780,12 +71781,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170616.1454";
+        version = "20170702.1322";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400";
-          sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf";
+          rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c";
+          sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -72347,12 +72348,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20170508.735";
+        version = "20170701.1603";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "282274b319f2c3598ac6bbdd27a8b7ca40b0bb0e";
-          sha256 = "0va5aqij3gan3j37jjhx8a8bv0zdpid5x18jfynzizlyk68fc196";
+          rev = "c08343904835cbae12f48e0758b0a6a014d76a74";
+          sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -73055,12 +73056,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20170325.357";
+        version = "20170627.2306";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "0a324086eb9cf2d357d3c8a431e80cd45fce016a";
-          sha256 = "0hcyy44xxg6f7c10db6xf8944wiaijxln3kgrl49kc0m3icilxyy";
+          rev = "770d54fafb1a0a140b449e6132db22e70b4d6aa9";
+          sha256 = "1f6h5n42fwwby880wikh8fdlk2zqimkl7wdb8wvr5kq1nqfqpz3f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -73855,8 +73856,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "74daf284e32bf84d29377d1d7a638b640ebf8f76";
-          sha256 = "0rx05is17g255gymyp6lvsskg5i6c4s28q89kbspdyfwx3rr42qa";
+          rev = "2b3ba6dcc3e99cea75d4bf2b4e6cf0898d9a2615";
+          sha256 = "0yga1vf54lf35my64ixw5ssq6jr6ph914afqv5r2gri007bi2zvw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -74266,12 +74267,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20170517.1242";
+        version = "20170706.349";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395";
-          sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m";
+          rev = "e300dab6c4be06ae42bc2f1919ed37e8624c3605";
+          sha256 = "07lz63yzjxj1y2524b7cd829srl3dvng7g67kf1377njgyrrgq0f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -74854,12 +74855,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170627.1123";
+        version = "20170706.348";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "dba445db28d3c1d0e2d0a9924ab96061850bb00c";
-          sha256 = "03wcifmmianrh0qp7p2pvhbpnzh0yjh5ys7x7qv3ywr62bnv4akh";
+          rev = "ea43010b362f6b5dd214f2f81daf4c12f6433f40";
+          sha256 = "0cwk3m1179ldb1qk6jx0g156vsqv14h3bqgfyb4yc5bg980ikm61";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -74938,12 +74939,12 @@
     xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-reformat-code";
-        version = "20170111.812";
+        version = "20170706.339";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-reformat-code";
-          rev = "7e5bbd09be8035a482a76417d900cb5d3a70e1cd";
-          sha256 = "04xwf9jxk4805bl7xj05kjfgl7m71zp94qdvw4g37s6q8v25j73d";
+          rev = "655cc8820118737db7b758ab72ad107d7fff091a";
+          sha256 = "12zrgp76nq18anp7vc7pj0w9a688i7xylplqh55jv9q24xgmpyhs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code";
@@ -75509,8 +75510,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "ebb1349c55dadd9aa1a87a80f3392023a1fbad43";
-          sha256 = "0zijnhjjdppwmy69bdh1wvqfmkvijqpazvk71b3b3ns6w8cln582";
+          rev = "40fc1d12a4f69cacf8b6b07d3372dee2969cb2e5";
+          sha256 = "0ahkrgl1isd9bppclk8i72fkm9c0hmhf9i5zc1n9k96c4x9h831i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -76535,11 +76536,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170620.2134";
+        version = "20170703.2041";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "d5aa3fb7d4cd";
-          sha256 = "0154cij71gczwpc0rxpa669dx6ds6b383y9f3fi1hh6i6w5dw1dm";
+          rev = "d8f7969db645";
+          sha256 = "03xyal7r0gc6r4vx23sx44vcm4fk68dkxyd1x0jw47im4xfmfvzv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From 968e0b2bafd724e6cfeff1584bcf99d1d2941d66 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 6 Jul 2017 11:42:20 -0400
Subject: [PATCH 0192/3246] linux-copperhead: 4.11.8.a -> 4.12.b

---
 .../linux/kernel/linux-hardened-copperhead.nix         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index b779e8298c0..b1448b02c6e 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,15 +1,15 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.11.8";
-  revision = "a";
-  sha256 = "02wy5gpgl2hz06dlqcgg9i3ydnxkyw0m1350vc5xyh6ld5r7jnn5";
+  version = "4.12";
+  revision = "b";
+  sha256 = "117n42sw2g40p68plr7b77mq18vibqjv0i4130f1bj6gk0sqn5i6";
 in
 
 import ./generic.nix (args // {
   version = "${version}-${revision}";
-  extraMeta.branch = "4.11";
-  modDirVersion = version;
+  extraMeta.branch = "4.12";
+  modDirVersion = "${version}.0";
 
   src = fetchFromGitHub {
     inherit sha256;

From b89a5b221046432501e51db804a29eae3564ca9b Mon Sep 17 00:00:00 2001
From: 0xABAB <0xABAB@users.noreply.github.com>
Date: Thu, 6 Jul 2017 20:43:22 +0200
Subject: [PATCH 0193/3246] nfs-utils: Replace reference to /bin/true

---
 pkgs/os-specific/linux/nfs-utils/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 0db6c4ec67e..2e410fec561 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -39,6 +39,9 @@ in stdenv.mkDerivation rec {
       sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd
 
       configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags"
+      
+      substituteInPlace systemd/nfs-utils.service \
+        --replace "/bin/true" "${coreutils}/bin/true"
 
       substituteInPlace utils/mount/Makefile.in \
         --replace "chmod 4511" "chmod 0511"

From 1f70f3801b7173ddb2890fbe39f57d6dae3e6611 Mon Sep 17 00:00:00 2001
From: Yacine Hmito <yacine.hmito@gmail.com>
Date: Tue, 9 May 2017 17:07:18 +0200
Subject: [PATCH 0194/3246] Make zshrc more predictable

Originially, `programs.zsh` sets default values for some
initialisation scripts.
Nix resolves the case of multiple values by concatenating them all.
It is however impossible to predict where the default script will be
inserted; but we never want the default value to override the
user-specified ones.
Now, it doesn't set default values; almost everything is hardcoded at
the begining of the file.
---
 nixos/modules/programs/zsh/oh-my-zsh.nix |  4 ++
 nixos/modules/programs/zsh/zsh.nix       | 71 +++++++++++-------------
 2 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix
index 446c05da39d..aa5844cdc4d 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@@ -42,6 +42,10 @@ in
     };
 
     config = mkIf cfg.enable {
+
+      # Prevent zsh from overwriting oh-my-zsh's prompt
+      programs.zsh.promptInit = mkDefault "";
+
       environment.systemPackages = with pkgs; [ oh-my-zsh ];
 
       programs.zsh.interactiveShellInit = with pkgs; with builtins; ''
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index b276bf9bb73..a055291282c 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -97,45 +97,6 @@ in
 
   config = mkIf cfg.enable {
 
-    programs.zsh = {
-
-      shellInit = ''
-        . ${config.system.build.setEnvironment}
-
-        ${cfge.shellInit}
-      '';
-
-      loginShellInit = cfge.loginShellInit;
-
-      interactiveShellInit = ''
-        # history defaults
-        SAVEHIST=2000
-        HISTSIZE=2000
-        HISTFILE=$HOME/.zsh_history
-
-        setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK
-
-        # 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 $p/share/zsh/vendor-completions)
-        done
-
-        ${if cfg.enableCompletion then "autoload -U compinit && compinit" else ""}
-
-        ${optionalString (cfg.enableAutosuggestions)
-          "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
-        }
-
-        ${zshAliases}
-        ${cfg.promptInit}
-
-        ${cfge.interactiveShellInit}
-
-        HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
-      '';
-
-    };
-
     environment.etc."zshenv".text =
       ''
         # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.
@@ -146,6 +107,10 @@ in
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
         export __ETC_ZSHENV_SOURCED=1
 
+        . ${config.system.build.setEnvironment}
+
+        ${cfge.shellInit}
+
         ${cfg.shellInit}
 
         # Read system-wide modifications.
@@ -163,6 +128,8 @@ in
         if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
         __ETC_ZPROFILE_SOURCED=1
 
+        ${cfge.loginShellInit}
+
         ${cfg.loginShellInit}
 
         # Read system-wide modifications.
@@ -182,8 +149,34 @@ in
 
         . /etc/zinputrc
 
+        # history defaults
+        SAVEHIST=2000
+        HISTSIZE=2000
+        HISTFILE=$HOME/.zsh_history
+
+        setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK
+
+        HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
+
+        ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"}
+
+        ${optionalString (cfg.enableAutosuggestions)
+          "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
+        }
+
+        ${zshAliases}
+
+        ${cfge.interactiveShellInit}
+
         ${cfg.interactiveShellInit}
 
+        ${cfg.promptInit}
+
+        # 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 $p/share/zsh/vendor-completions)
+        done
+
         # Read system-wide modifications.
         if test -f /etc/zshrc.local; then
           . /etc/zshrc.local

From 7e3a1a58cf8e5bf6cac5811493389953090f678a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 6 Jul 2017 22:50:29 +0200
Subject: [PATCH 0195/3246] Revert "ncurses: look for terminfo entries in /etc"

This reverts commit b73a862f1777ad709b3088255d3967733549fbc9.
---
 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 e6db7af6ee2..827a556a468 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -46,9 +46,6 @@ stdenv.mkDerivation rec {
   buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
 
   preConfigure = ''
-    # These paths end up in the default lookup chain.
-    export TERMINFO_DIRS=/etc/terminfo
-
     export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
     configureFlagsArray+=(

From 3f8f8bf5f6fc1f2e04ba0266b12df26939d980a3 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 23 Jun 2017 18:26:42 +0100
Subject: [PATCH 0196/3246] fossil: 1.36 -> 2.2

---
 pkgs/applications/version-management/fossil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 69c763acd83..cefdc1108bf 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -2,15 +2,15 @@
 , tcllib, withJson ? true}:
 
 stdenv.mkDerivation rec {
-  name = "fossil-1.36";
+  name = "fossil-2.2";
 
   src = fetchurl {
     urls = 
       [
-        https://fossil-scm.org/index.html/uv/download/fossil-src-1.36.tar.gz
+        https://www.fossil-scm.org/index.html/uv/fossil-src-2.2.tar.gz
       ];
     name = "${name}.tar.gz";
-    sha256 = "04px1mnq5dlc6gaihxj5nj6k7ac43wfryzifaairjh74qmgc6xi6";
+    sha256 = "0wfgacfg29dkl0c3l1rp5ji0kraa64gcbg5lh8p4m7mqdqcq53wv";
   };
 
   buildInputs = [ zlib openssl readline sqlite which ed ]

From 77f8447515a104288a6f9f8e574dab8f74eb565b Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Wed, 5 Jul 2017 22:12:42 -0400
Subject: [PATCH 0197/3246] qutebrowser: 0.10.1 -> 0.11.0

---
 .../networking/browsers/qutebrowser/default.nix           | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 614473d39ee..5ec4340dba7 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook
-, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking
+, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
 , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav
 , qtwebkit-plugins
@@ -26,12 +26,12 @@ let
 
 in buildPythonApplication rec {
   name = "qutebrowser-${version}";
-  version = "0.10.1";
+  version = "0.11.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "57f4915f0f2b1509f3aa1cb9c47117fdaad35b4c895e9223c4eb0a6e8af51917";
+    sha256 = "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv";
   };
 
   # Needs tox
@@ -48,7 +48,7 @@ in buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = [
-    pyyaml pyqt5 jinja2 pygments pypeg2 cssutils
+    pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl
   ];
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ae586aa72d..cf108ea6e5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15722,7 +15722,7 @@ with pkgs;
   };
 
   qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser {
-    inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils;
+    inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl;
     inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
   };
 

From 3ff40547f0ff932574ec65fb4848ab4696d34d46 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Wed, 5 Jul 2017 21:36:04 -0400
Subject: [PATCH 0198/3246] leo-editor: Don't hardcode pythonX.Ym

---
 pkgs/applications/editors/leo-editor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index 81f9ddd96d2..b05bbd053c1 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/leo-editor
     mv * $out/share/leo-editor
 
-    makeWrapper ${python3Packages.python}/bin/python3.5m $out/bin/leo \
+    makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \
       --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \
       --add-flags "-O $out/share/leo-editor/launchLeo.py"
   '';

From 8ff05c85ee89bbb3241a194d85db2f37b057d178 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Thu, 6 Jul 2017 21:30:30 -0700
Subject: [PATCH 0199/3246] Add poly library for manipulating polynomials.

---
 .../science/logic/poly/default.nix            | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/science/logic/poly/default.nix

diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix
new file mode 100644
index 00000000000..f573f0c15b4
--- /dev/null
+++ b/pkgs/applications/science/logic/poly/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, gmp, cmake, python}:
+
+let version = "0.1.3";
+in
+
+stdenv.mkDerivation {
+  name = "libpoly-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SRI-CSL/libpoly/archive/v${version}.tar.gz";
+    sha256 = "0nd90585imnznyp04vg6a5ixxkd3bavhv1437397aj2k3dfc0y2k";
+  };
+
+  buildInputs = [ cmake gmp python ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/SRI-CSL/libpoly;
+    description = "C library for manipulating polynomials";
+    license = licenses.gplv3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61406ae271d..07a6a422e8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18091,6 +18091,8 @@ with pkgs;
 
   picosat = callPackage ../applications/science/logic/picosat {};
 
+  libpoly = callPackage ../applications/science/logic/poly/default.nix {};
+
   prooftree = (with ocamlPackages_4_01_0;
     callPackage  ../applications/science/logic/prooftree {
       camlp5 = camlp5_transitional;

From 6387a7ec8bd626ffae610bc08d4bc441f9afef15 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Thu, 6 Jul 2017 21:31:38 -0700
Subject: [PATCH 0200/3246] Update yices to add libpoly/mcsat functionality and
 add soname target.

---
 .../applications/science/logic/yices/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index cf5114b4a41..0ec7f93d26f 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, gmp-static, gperf, autoreconfHook }:
+{ stdenv, fetchurl, gmp-static, gperf, autoreconfHook, libpoly }:
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
   version = "2.5.1";
 
   src = fetchurl {
-    url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-${version}-src.tar.gz&accept=I+Agree";
-    name = "yices-${version}-src.tar.gz";
+    url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=${name}-src.tar.gz&accept=I+Agree";
+    name = "${name}-src.tar.gz";
     sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c";
   };
 
@@ -14,13 +14,19 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
                      "--with-static-gmp-include-dir=${gmp-static.dev}/include"
+                     "--enable-mcsat"
                    ];
-  buildInputs = [ gmp-static gperf autoreconfHook ];
+  buildInputs = [ gmp-static gperf autoreconfHook libpoly ];
 
   enableParallelBuilding = true;
   doCheck = true;
 
-  installPhase = ''make install LDCONFIG=true'';
+  # Includes a fix for the embedded soname being libyices.so.2.5, but
+  # only installing the libyices.so.2.5.1 file.
+  installPhase = ''
+      make install LDCONFIG=true
+      (cd $out/lib && ln -s -f libyices.so.2.5.1 libyices.so.2.5)
+  '';
 
   meta = with stdenv.lib; {
     description = "A high-performance theorem prover and SMT solver";

From 75ca36935522eb66769502d4d99a3eec59afd843 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 6 Jul 2017 23:29:54 -0700
Subject: [PATCH 0201/3246] rust-bindgen: 0.25.5 -> 0.26.1

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

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 6ac192e6375..8fb668df5b9 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -4,13 +4,13 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.25.5";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "0hv90h279frbxjay5g5vphds6wj3fiid9f2vmg1nr8887y4nif0k";
+    sha256 = "1w1vbfhmcrcl0vacxkivmavjp51cvpyq5lk75n9zs80q5x38ypna";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib"
   '';
 
-  depsSha256 = "0ylm1wzf9aqcyfmmgpb18bdp5c5d73pnnjw13cv373511mkj1y0m";
+  depsSha256 = "0s1x4ygjwc14fbl2amz5g6n7lq07zy8b00mvwfw6vi6k4bq1g59i";
 
   doCheck = false; # A test fails because it can't find standard headers in NixOS
 

From ff348f4b6dc3e3c95370489d002ba7b7a04ae7d3 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 7 Jul 2017 11:41:39 +0300
Subject: [PATCH 0202/3246] linux: Enable more I/O schedulers

---
 pkgs/os-specific/linux/kernel/common-config.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 912fb8dcee4..cdae5b28990 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -92,6 +92,14 @@ with stdenv.lib;
   # module, so that the initrd gets a good I/O scheduler.
   IOSCHED_CFQ y
   BLK_CGROUP y # required by CFQ
+  IOSCHED_DEADLINE y
+  ${optionalString (versionAtLeast version "4.11") ''
+    MQ_IOSCHED_DEADLINE y
+  ''}
+  ${optionalString (versionAtLeast version "4.12") ''
+    MQ_IOSCHED_KYBER y
+    IOSCHED_BFQ m
+  ''}
 
   # Enable NUMA.
   NUMA? y

From 9728c26d28a8ff7f950e66cf8a07118574dc8023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 7 Jul 2017 09:50:05 +0100
Subject: [PATCH 0203/3246] elvish: remove unnecessary deps.nix

fully vendorized now
---
 pkgs/shells/elvish/default.nix |  2 --
 pkgs/shells/elvish/deps.nix    | 20 --------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/shells/elvish/deps.nix

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index ee0de492926..1d1dddd0c2a 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -13,8 +13,6 @@ buildGoPackage rec {
     sha256 = "0alsv04iihrk1nffp6fmyzxid26dqhg1k45957c2ymyzyq9cglxj";
   };
 
-  goDeps = ./deps.nix;
-
   meta = with stdenv.lib; {
     description = "A friendly and expressive Unix shell";
     homepage = https://github.com/elves/elvish;
diff --git a/pkgs/shells/elvish/deps.nix b/pkgs/shells/elvish/deps.nix
deleted file mode 100644
index cff60bad0a9..00000000000
--- a/pkgs/shells/elvish/deps.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/elves/getopt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/elves/getopt";
-      rev = "f91a7bf920995832d55a1182f26657bc975b9c24";
-      sha256 = "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-sqlite3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-sqlite3";
-      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
-      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
-    };
-  }
-]

From e36b588f93035c06d9c99a464b05d81852006aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 7 Jul 2017 10:44:33 +0200
Subject: [PATCH 0204/3246] luajit: add 2.0 version again

The reason will be apparent from the followup commit.
Also order the phases, quote shell variables, add myself to
maintainers, etc.
---
 .../interpreters/luajit/default.nix           | 86 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 1694e3e4850..cd47883001b 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,41 +1,67 @@
 { stdenv, fetchurl }:
+rec {
 
-stdenv.mkDerivation rec {
-  name    = "luajit-${version}";
-  version = "2.1.0-beta3";
-  luaversion = "5.1";
+  luajit = luajit_2_1;
 
-  src = fetchurl {
-    url    = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
+  luajit_2_0 = generic {
+    version = "2.0.5";
+    isStable = true;
+    sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
+  };
+
+  luajit_2_1 = generic {
+    version = "2.1.0-beta3";
+    isStable = false;
     sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
   };
 
-  enableParallelBuilding = true;
 
-  patchPhase = ''
-    substituteInPlace Makefile \
-      --replace /usr/local $out
+  generic =
+    { version, sha256 ? null, isStable
+    , name ? "luajit-${version}"
+    , src ?
+      (fetchurl {
+        url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
+        inherit sha256;
+      })
+    }:
 
-    substituteInPlace src/Makefile --replace gcc cc
-  '' + stdenv.lib.optionalString (stdenv.cc.libc != null)
-  ''
-    substituteInPlace Makefile \
-      --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig
-  '';
+    stdenv.mkDerivation rec {
+      inherit name version src;
 
-  configurePhase = false;
-  buildFlags     = [ "amalg" ]; # Build highly optimized version
-  installPhase   = ''
-    make install INSTALL_INC=$out/include PREFIX=$out
-    ln -s $out/bin/luajit* $out/bin/lua
-    ln -s $out/bin/luajit* $out/bin/luajit
-  '';
+      luaversion = "5.1";
 
-  meta = with stdenv.lib; {
-    description = "High-performance JIT compiler for Lua 5.1";
-    homepage    = http://luajit.org;
-    license     = licenses.mit;
-    platforms   = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers ; [ thoughtpolice smironov ];
-  };
+      patchPhase = ''
+        substituteInPlace Makefile \
+          --replace /usr/local "$out"
+
+        substituteInPlace src/Makefile --replace gcc cc
+      '' + stdenv.lib.optionalString (stdenv.cc.libc != null)
+      ''
+        substituteInPlace Makefile \
+          --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig
+      '';
+
+      configurePhase = false;
+
+      buildFlags = [ "amalg" ]; # Build highly optimized version
+      enableParallelBuilding = true;
+
+      installPhase   = ''
+        make install INSTALL_INC="$out"/include PREFIX="$out"
+        ln -s "$out"/bin/luajit-* "$out"/bin/lua
+      ''
+        + stdenv.lib.optionalString (!isStable)
+          ''
+            ln -s "$out"/bin/luajit-* "$out"/bin/luajit
+          '';
+
+      meta = with stdenv.lib; {
+        description = "High-performance JIT compiler for Lua 5.1";
+        homepage    = http://luajit.org;
+        license     = licenses.mit;
+        platforms   = platforms.linux ++ platforms.darwin;
+        maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
+      };
+    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61406ae271d..68d08ec660a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6117,7 +6117,8 @@ with pkgs;
 
   luaPackages = lua52Packages;
 
-  luajit = callPackage ../development/interpreters/luajit {};
+  inherit (callPackages ../development/interpreters/luajit {})
+    luajit luajit_2_0 luajit_2_1;
 
   luarocks = luaPackages.luarocks;
 

From b8726c346cdb12a1537c94a2f18f46dc822c8e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 7 Jul 2017 10:53:07 +0200
Subject: [PATCH 0205/3246] luajit: switch to 2.0.5 on aarch64 by default

---
 pkgs/development/interpreters/luajit/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index cd47883001b..59ddfde08ae 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,7 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, hostPlatform }:
 rec {
 
-  luajit = luajit_2_1;
+  luajit =
+    # Compatibility problems with lightuserdata pointers; see:
+    # https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L101
+    if hostPlatform.is64bit && (hostPlatform.isArm || hostPlatform.isSunOS)
+      then luajit_2_0
+      else luajit_2_1;
 
   luajit_2_0 = generic {
     version = "2.0.5";

From 0f2db06540bac596ac47816b76c189f4715c8ea5 Mon Sep 17 00:00:00 2001
From: Hector Jusforgues <hector.jusforgues@gmail.com>
Date: Fri, 7 Jul 2017 11:01:45 +0200
Subject: [PATCH 0206/3246] consul_exporter: init at 0.3.0 (#27162)

---
 lib/maintainers.nix                           |  1 +
 .../monitoring/prometheus/consul-exporter.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/consul-exporter.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 69bb69c8e20..79335606304 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -224,6 +224,7 @@
   havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
   hce = "Hans-Christian Esperer <hc@hcesperer.org>";
+  hectorj = "Hector Jusforgues <hector.jusforgues+nixos@gmail.com>";
   heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
   hinton = "Tom Hinton <t@larkery.com>";
diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
new file mode 100644
index 00000000000..47abcb33ee7
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "consul_exporter-${version}";
+  version = "0.3.0";
+
+  goPackagePath = "github.com/prometheus/consul_exporter";
+
+  src = fetchFromGitHub {
+    owner = "prometheus";
+    repo = "consul_exporter";
+    rev = "v${version}";
+    sha256 = "1zffbxyfmqpbdqkx5rb5vjgd9j4p4zcrh6jvn1zhbdzrcs7khnd9";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Prometheus exporter for Consul metrics";
+    homepage = https://github.com/prometheus/consul_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hectorj ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68d08ec660a..28f449d134b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11320,6 +11320,7 @@ with pkgs;
   prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
   prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
+  prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
   prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
   prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
   prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };

From 14f20834454215c311b48a6932ca8a0f1c57e3a3 Mon Sep 17 00:00:00 2001
From: Thorsten Weber <tw@360vier.de>
Date: Fri, 7 Jul 2017 11:41:30 +0200
Subject: [PATCH 0207/3246] git-ftp: init at 1.4.0

---
 lib/maintainers.nix                        |  1 +
 pkgs/development/tools/git-ftp/default.nix | 27 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/git-ftp/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d095029f5b0..406f3a6094e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -561,6 +561,7 @@
   tv = "Tomislav Viljetić <tv@shackspace.de>";
   tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";
   tvorog = "Marsel Zaripov <marszaripov@gmail.com>";
+  tweber = "Thorsten Weber <tw+nixpkgs@360vier.de>";
   twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
   uralbash = "Svintsov Dmitry <root@uralbash.ru>";
   utdemir = "Utku Demir <me@utdemir.com>";
diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
new file mode 100644
index 00000000000..b4bc680a19a
--- /dev/null
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, pandoc, man }:
+stdenv.mkDerivation rec {
+  name = "git-ftp-${version}";
+  version = "1.4.0";
+  src = fetchFromGitHub {
+    owner = "git-ftp";
+    repo = "git-ftp";
+    rev = version;
+    sha256 = "0n8q1azamf10qql8f8c4ppbd3iisy460gwxx09v5d9hji5md27s3";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    make install-all prefix=$out
+  '';
+
+  buildInputs = [pandoc man];
+
+  meta = with stdenv.lib; {
+    description = "Git powered FTP client written as shell script.";
+    homepage = https://git-ftp.github.io/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ tweber ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56bd308b6bd..6587a3b78f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2066,6 +2066,8 @@ with pkgs;
 
   git-lfs = callPackage ../applications/version-management/git-lfs { };
 
+  git-ftp = callPackage ../development/tools/git-ftp { };
+
   git-series = callPackage ../development/tools/git-series { };
 
   git-up = callPackage ../applications/version-management/git-up { };

From 707703185dfede1af71d37ac474f1112d280b771 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 7 Jul 2017 11:57:00 +0200
Subject: [PATCH 0208/3246] nixos-rebuild: Respect empty NIX_REMOTE

Fixes #11384.

Note: in Nix 1.12, you can set NIX_REMOTE to "local" to avoid
ambiguity.
---
 nixos/modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 4b5e7b3230c..9ede74a54cd 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -250,7 +250,7 @@ trap cleanup EXIT
 # If --repair is given, don't try to use the Nix daemon, because the
 # flag can only be used directly.
 if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then
-    export NIX_REMOTE=${NIX_REMOTE:-daemon}
+    export NIX_REMOTE=${NIX_REMOTE-daemon}
 fi
 
 

From e78b820bebd556e7fbc27c8e31e2eddff3f6164d Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Wed, 28 Jun 2017 22:11:56 -0400
Subject: [PATCH 0209/3246] gambit: 4.8.6 -> 4.8.8-f3ffeb6

Using a yet unreleased development version of gambit,
so as to be able to build a recent gerbil.

Update the way gambit is bootstrapped, which involves building a
release version of gambit (which for a development gambit, is not the
same version as the current version of gambit).
---
 .../compilers/gambit/bootstrap.nix            | 41 ++++++++++
 pkgs/development/compilers/gambit/default.nix | 76 +++++++++++++++----
 2 files changed, 101 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/compilers/gambit/bootstrap.nix

diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
new file mode 100644
index 00000000000..65fb20aa260
--- /dev/null
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, autoconf, ... }:
+
+stdenv.mkDerivation rec {
+  name    = "gambit-bootstrap-${version}";
+  version = "4.8.8";
+  tarball_version = "v4_8_8";
+
+  src = fetchurl {
+    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz";
+    sha256 = "075k2z04d6svxqf9paj3xvp0mm0xzy0vbma1y61s0lkywdim8xjz";
+  };
+
+  buildInputs = [ autoconf ];
+
+  configurePhase = ''
+    ./configure --prefix=$out --enable-single-host
+  '';
+
+  buildPhase = ''
+    # Copy the (configured) sources now, not later, so we don't have to filter out
+    # all the intermediate build products.
+    mkdir -p $out ; cp -rp . $out/
+
+    # build the gsc-boot* compiler
+    make bootstrap
+  '';
+
+  installPhase = ''
+    cp -fa ./ $out/
+  '';
+
+  forceShare = [ "info" ];
+
+  meta = {
+    description = "Optimizing Scheme to C compiler, bootstrap step";
+    homepage    = "http://gambitscheme.org";
+    license     = stdenv.lib.licenses.lgpl2;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
+  };
+}
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 7e17cee9abd..58b08ebd4fb 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -1,31 +1,75 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs }:
 
 stdenv.mkDerivation rec {
   name    = "gambit-${version}";
-  version = "4.8.6";
-  devver  = "4_8_6";
+  version = "4.8.8-f3ffeb6";
+  bootstrap = import ./bootstrap.nix ( pkgs );
 
-  src = fetchurl {
-    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${devver}-devel.tgz";
-    sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl";
+#  devver  = "4_8_8";
+#  src = fetchurl {
+#    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${version}-devel.tgz";
+#    sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl";
+#  };
+  src = fetchgit {
+    url = "https://github.com/feeley/gambit.git";
+    rev = "f3ffeb695aeea80c18c1b9ef276b57898c780dca";
+    sha256 = "1lqixsrgk9z2gj6z1nkys0pfd3m5zjxrp3gvqn2wpr9h7hjb8x06";
   };
 
-  configureFlags = [
-    "--enable-single-host"
-    "--enable-shared"
-    "--enable-absolute-shared-libs"
-    "--enable-c-opt=-O6" "--enable-gcc-opts" "--enable-inline-jumps"
-    "--enable-thread-system=posix" "--enable-dynamic-tls"
-    "--enable-openssl"
-  ];
+  buildInputs = [ openssl git autoconf bootstrap ];
 
-  buildInputs = [ openssl ];
+  configurePhase = ''
+    options=(
+      --prefix=$out
+      --enable-single-host
+      --enable-c-opt=-O2
+      --enable-gcc-opts
+      --enable-shared
+      --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it.
+      --enable-poll
+      --enable-openssl
+
+      #--enable-multiple-versions # Nope, NixOS already does version multiplexing
+      #--enable-guide
+      #--enable-track-scheme
+      #--enable-high-res-timing
+      #--enable-max-processors=4
+      #--enable-multiple-vms
+      #--enable-dynamic-tls
+      #--enable-multiple-vms
+      #--enable-multiple-threaded-vms  ## when SMP branch is merged in
+      #--enable-thread-system=posix    ## default when --enable-multiple-vms is on.
+      #--enable-profile
+      #--enable-coverage
+      #--enable-inline-jumps
+      #--enable-char-size=1" ; default is 4
+    )
+    ./configure ''${options[@]}
+  '';
+
+  buildPhase = ''
+    # Make bootstrap compiler, from release bootstrap
+    mkdir -p boot/wip-compiler &&
+    cp -rp ${bootstrap}/. boot/wip-compiler/. &&
+    chmod -R u+w boot &&
+    cd boot/wip-compiler && \
+    cp ../../gsc/makefile.in ../../gsc/*.scm gsc && \
+    (cd gsc && make bootclean ) &&
+    make bootstrap &&
+    cd ../.. &&
+    cp boot/wip-compiler/gsc/gsc gsc-boot &&
+
+    # Now use the bootstrap compiler to build the real thing!
+    make -j2 from-scratch
+  '';
+
+  doCheck = true;
 
   meta = {
     description = "Optimizing Scheme to C compiler";
     homepage    = "http://gambitscheme.org";
     license     = stdenv.lib.licenses.lgpl2;
     platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
   };
 }

From f96e4edb177728dfe3565825a706c96ff706ff63 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Wed, 28 Jun 2017 22:14:22 -0400
Subject: [PATCH 0210/3246] gerbil: 0.11 -> 0.12-DEV

---
 pkgs/development/compilers/gerbil/default.nix | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index 7ea403715a5..22047b663d0 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -1,15 +1,22 @@
-{ stdenv, fetchurl, fetchgit, gambit, openssl, zlib, coreutils, rsync, bash }:
+{ stdenv, fetchurl, fetchgit, gambit,
+  coreutils, rsync, bash,
+  openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }:
 
 stdenv.mkDerivation rec {
   name    = "gerbil-${version}";
 
-  version = "0.11";
-  src = fetchurl {
-    url    = "https://github.com/vyzo/gerbil/archive/v${version}.tar.gz";
-    sha256 = "0mqg6cqdcf5qr7vk79x5zkls7z2wm8i3lhwn0b7i0g1m6yyyyff7";
+  version = "0.12-DEV";
+  src = fetchgit {
+    url = "https://github.com/vyzo/gerbil.git";
+    rev = "3657b6e940ea248e0b312f276590e38ff68997e7";
+    sha256 = "11ys7082ghkm4yikz4qxmv3jpxcr42jfi0jhjw1mpzbqdg6004w2";
   };
 
-  buildInputs = [ gambit openssl zlib coreutils rsync bash ];
+  buildInputs = [
+    gambit openssl
+    coreutils rsync bash
+    zlib openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb
+  ];
 
   postPatch = ''
     patchShebangs .
@@ -21,7 +28,13 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     runHook preBuild
+
+    # Enable all optional libraries
+    substituteInPlace "src/std/build-features.ss" --replace '#f' '#t'
+
+    # Build, replacing make by build.sh
     ( cd src && sh build.sh )
+
     runHook postBuild
   '';
 

From 17dbed4c070d8a839f7dbe85d3ad4744576c1553 Mon Sep 17 00:00:00 2001
From: Niklas Thorne <notrupertthorne@gmail.com>
Date: Fri, 7 Jul 2017 13:58:02 +0200
Subject: [PATCH 0211/3246] git-big-picture: init at 0.9.0

---
 .../git-and-tools/git-big-picture/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
new file mode 100644
index 00000000000..509a1b42cfa
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -0,0 +1,23 @@
+{ fetchgit, python2Packages, stdenv, git, graphviz }:
+
+python2Packages.buildPythonApplication rec {
+    pname = "git-big-picture";
+    version = "0.9.0";
+
+    name = "${pname}-${version}";
+
+    src = fetchgit {
+      url = "https://github.com/esc/${pname}.git";
+      rev = "fbe3b9504e255da859067fd58e90d849d63e5381";
+      sha256 = "1h283gzs4nx8lrarmr454zza52cilmnbdrqn1n33v3cn1rayl3c9";
+    };
+
+  propagatedBuildInputs = [ git graphviz ];
+
+  meta = {
+    description = "Tool for visualization of Git repositories.";
+    homepage = https://github.com/esc/git-big-picture;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28f449d134b..bf801305ccb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2063,6 +2063,8 @@ with pkgs;
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
+  git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { };
+
   git-crecord = callPackage ../applications/version-management/git-crecord { };
 
   git-lfs = callPackage ../applications/version-management/git-lfs { };

From 941d83df0439e1252c10caab0c9789367fa21d3e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 7 Jul 2017 13:21:11 +0100
Subject: [PATCH 0212/3246] kops: 1.6.0 -> 1.6.2

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

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index aaade82e31d..e036fb2f38b 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kops-${version}";
-  version = "1.6.0";
+  version = "1.6.2";
 
   goPackagePath = "k8s.io/kops";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = version;
     owner = "kubernetes";
     repo = "kops";
-    sha256 = "1z890kjgsdnghg71v4sp7lljvw14dhzr23m2qjmk6wndyssscykr";
+    sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l";
   };
 
   buildInputs = [go-bindata];

From 17aedafef8a75959637ec6ca508ccce872cdd173 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 7 Jul 2017 13:39:19 +0100
Subject: [PATCH 0213/3246] kubernetes-helm: 2.4.1 -> 2.5.0

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 19b6c030f2e..dc7d2b8b2ea 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,11 +4,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "0vjkcilxzwvkgcczcbq58nl2j17ddqiysxm5yl13agnmxzvxw6r2"
-             else "1ga9gxzji48vhbaa0pkxd03h89zgjsbikbki9xla1qbvyvqjnw5g";
-
+             then "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd"
+             else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj";
   pname = "helm";
-  version = "2.4.1";
+  version = "2.5.0";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";

From f6a7b851d4f646ad6770beaa54556dd882c9bde0 Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Wed, 5 Jul 2017 12:00:22 -0400
Subject: [PATCH 0214/3246] buildbot: 0.9.7 -> 0.9.9.post2

- adds grid-view plugin
- module fixup
- tested on nixos
---
 .../buildbot/master.nix                       |  6 +--
 .../tools/build-managers/buildbot/default.nix |  6 +--
 .../tools/build-managers/buildbot/plugins.nix | 37 +++++++++++++++----
 .../tools/build-managers/buildbot/worker.nix  |  4 +-
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index fe0c452d067..846efc8b5b9 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -225,11 +225,7 @@ in {
         User = cfg.user;
         Group = cfg.group;
         WorkingDirectory = cfg.home;
-        Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.www}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.waterfall-view}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.console-view}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages:${pkgs.python27Packages.dateutil}/lib/python2.7/site-packages:${pkgs.python27Packages.six}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy}/lib/python2.7/site-packages:${pkgs.python27Packages.jinja2}/lib/python2.7/site-packages:${pkgs.python27Packages.markupsafe}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy_migrate}/lib/python2.7/site-packages:${pkgs.python27Packages.tempita}/lib/python2.7/site-packages:${pkgs.python27Packages.decorator}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlparse}/lib/python2.7/site-packages:${pkgs.python27Packages.txaio}/lib/python2.7/site-packages:${pkgs.python27Packages.autobahn}/lib/python2.7/site-packages:${pkgs.python27Packages.pyjwt}/lib/python2.7/site-packages:${pkgs.python27Packages.distro}/lib/python2.7/site-packages:${pkgs.python27Packages.pbr}/lib/python2.7/site-packages:${pkgs.python27Packages.urllib3}/lib/python2.7/site-packages";
-
-        # NOTE: call twistd directly with stdout logging for systemd
-        #ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}";
-        ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac";
+        ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}";
       };
 
     };
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 64ab960c88b..2ed436981e0 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -13,11 +13,11 @@ let
   package = pythonPackages.buildPythonApplication (rec {
     name = "${pname}-${version}";
     pname = "buildbot";
-    version = "0.9.7";
+    version = "0.9.9.post2";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0cwy39ap2v9kni3zm92633cnqf7qsnb4zlargx060pbfagkg1jwg";
+      sha256 = "0g932pvkxqq3ijwkwwa29jd9sp5895gv40c3k7m2acc5dp8ygb9w";
     };
 
     buildInputs = with pythonPackages; [
@@ -83,7 +83,7 @@ let
 
     meta = with stdenv.lib; {
       homepage = http://buildbot.net/;
-      description = "Continuous integration system that automates the build/test cycle";
+      description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes";
       maintainers = with maintainers; [ nand0p ryansydnor ];
       license = licenses.gpl2;
     };
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 3c15e256a3f..63fc61cd1b8 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -4,11 +4,11 @@ let
   buildbot-pkg = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-pkg";
-    version = "0.9.7";
+    version = "0.9.9.post2";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0p351r10y42gwgxb2qg7xlsbhmnzdmqp6h4922l0yfii3pzmrdzv";
+      sha256 = "1h24fzyr4kfm1nb2627hgg9nl5mwv1gihc3f2wb5000gxmjdasg8";
     };
 
     propagatedBuildInputs = with pythonPackages; [ setuptools ];
@@ -25,14 +25,14 @@ in {
   www = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot_www";
-    version = "0.9.7";
+    version = "0.9.9.post2";
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
 
     src = pythonPackages.fetchPypi {
       inherit pname version format;
-      sha256 = "1wf2spnilm0dkyw95vf57lca453sbly4r6ak3lxa8bpwhxb6lkdn";
+      sha256 = "1yzk3sy9i8g8wz9vvghhxnafs5dzsd3sybmm8lg043129rh116b9";
     };
 
     meta = with stdenv.lib; {
@@ -46,11 +46,11 @@ in {
   console-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-console-view";
-    version = "0.9.7";
+    version = "0.9.9.post2";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1iv77886rbbn0wlzl5qiqc08rgbymxirqh3vmimqwsabbh7fhzkm";
+      sha256 = "0mmlxzlzl0r97jf0g98m7k1b13mzzy80445i0biazkj0vzkpwxza";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -66,11 +66,11 @@ in {
   waterfall-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-waterfall-view";
-    version = "0.9.7";
+    version = "0.9.9.post2";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1q42l25cryx0yp6lbbl0mxnxkb9h24wawhzhi1wkc3kj8zs5sifn";
+      sha256 = "0pq45gddwjd61nxmr48cl8s533i4gy3wg9wzbj3g1yb30yrz8qf4";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -82,4 +82,25 @@ in {
       license = licenses.gpl2;
     };
   };
+
+  grid-view = pythonPackages.buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "buildbot-grid-view";
+    version = "0.9.9.post2";
+
+    src = pythonPackages.fetchPypi {
+      inherit pname version;
+      sha256 = "16y7br1yniby8yp932ildn14cxvbw5ywx36d703c4d98dmnlrpaw";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
+
+    meta = with stdenv.lib; {
+      homepage = http://buildbot.net/;
+      description = "Buildbot Grid View Plugin";
+      maintainers = with maintainers; [ nand0p ];
+      license = licenses.gpl2;
+    };
+  };
+
 }
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 28fb719d84a..f87e8db8555 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "0.9.7";
+  version = "0.9.9.post2";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0s62i808l13a8dprmrb2dikh7d1xvvdnw3pfhl6im0i9fc64w6x4";
+    sha256 = "1wb2fw0djamhn1sb7rwnf12i4ijdq9y4k33ri7dcwxxcavxsvqa0";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 209520097f0..a9fb0b540d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6549,7 +6549,7 @@ with pkgs;
     pythonPackages = python2Packages;
   };
   buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]);
-  buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view ]);
+  buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view ]);
 
   buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
 

From c4ecdfd39eeef4a649b2d4fc7f7eaa9013525942 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 7 Jul 2017 08:17:21 -0700
Subject: [PATCH 0215/3246] gx: 20160601-f84ddf7 -> 0.12.0

---
 pkgs/tools/package-management/gx/default.nix  |  13 +-
 pkgs/tools/package-management/gx/deps.nix     | 322 +++++++++++++-----
 .../package-management/gx/go/default.nix      |   6 +-
 3 files changed, 249 insertions(+), 92 deletions(-)

diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix
index b879ef002b1..524dc01cbe7 100644
--- a/pkgs/tools/package-management/gx/default.nix
+++ b/pkgs/tools/package-management/gx/default.nix
@@ -1,24 +1,19 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gx-${version}";
-  version = "20160601-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "f84ddf792ceb329e20c857731154798e1ce87314";
+  version = "0.12.0";
+  rev = "refs/tags/v${version}";
 
   goPackagePath = "github.com/whyrusleeping/gx";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/whyrusleeping/gx";
-    sha256 = "10a6p9ba526jr6m66x3vsa3xsjlnzv7yma8vyp8d0bf0hs44bpih";
+    sha256 = "0pvf0j14xnzy01fxilja8xbki0i0g7h7y20jzw74ds5a7ywsdx8r";
   };
 
-  prePatch = ''
-    substituteInPlace tests/lib/random-dep.go \
-      --replace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" "github.com/jbenet/go-random"
-  '';
-
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix
index 19372f807c2..c34d142c385 100644
--- a/pkgs/tools/package-management/gx/deps.nix
+++ b/pkgs/tools/package-management/gx/deps.nix
@@ -1,29 +1,11 @@
 [
   {
-    goPackagePath = "github.com/anacrolix/missinggo";
+    goPackagePath = "github.com/agl/ed25519";
     fetch = {
       type = "git";
-      url = "https://github.com/anacrolix/missinggo";
-      rev = "e40875155efce3d98562ca9e265e152c364ada3e";
-      sha256 = "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg";
-    };
-  }
-  {
-    goPackagePath = "github.com/anacrolix/sync";
-    fetch = {
-      type = "git";
-      url = "https://github.com/anacrolix/sync";
-      rev = "812602587b72df6a2a4f6e30536adc75394a374b";
-      sha256 = "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l";
-    };
-  }
-  {
-    goPackagePath = "github.com/anacrolix/utp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/anacrolix/utp";
-      rev = "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0";
-      sha256 = "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7";
+      url = "https://github.com/agl/ed25519";
+      rev = "5312a61534124124185d41f09206b9fef1d88403";
+      sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i";
     };
   }
   {
@@ -31,17 +13,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/blang/semver";
-      rev = "aea32c919a18e5ef4537bbd283ff29594b1b0165";
-      sha256 = "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd";
+      rev = "4a1e882c79dcf4ec00d2e29fac74b9c8938d5052";
+      sha256 = "07rk2jzmppw1v06qvsn11l1mwkyg6y9y06jfik316zq8glfh8b3m";
     };
   }
   {
-    goPackagePath = "github.com/bradfitz/iter";
+    goPackagePath = "github.com/btcsuite/btcd";
     fetch = {
       type = "git";
-      url = "https://github.com/bradfitz/iter";
-      rev = "454541ec3da2a73fc34fd049b19ee5777bf19345";
-      sha256 = "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i";
+      url = "https://github.com/btcsuite/btcd";
+      rev = "9822ffad6802d3b902442b727a238230194d961f";
+      sha256 = "0mk3qxpn29gsbkvk6rj6jzsw3fn2z51afq890wpk4qz029kvip2h";
     };
   }
   {
@@ -49,8 +31,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/codegangsta/cli";
-      rev = "e5bef42c62aa7d25aba4880dc02b7624f01e9e19";
-      sha256 = "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq";
+      rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2";
+      sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-semver";
+      rev = "1817cd4bea52af76542157eeabd74b057d1a199e";
+      sha256 = "0hfxcg87ag0zdfarbymfx2qmhcdzm8br39sxvhfc7n37rqdcsh9n";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "dda3e8acadcc9affc16faf33fbb229db78399245";
+      sha256 = "1f1lm6bgwnrd985n1aagqw0bxfx37z71fwfcijiz9k258vj4wlga";
     };
   }
   {
@@ -58,8 +58,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/ipfs/go-ipfs-api";
-      rev = "7c354892da3abdaafb6ac576c100b259b1a73dac";
-      sha256 = "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc";
+      rev = "2da86eb64d56571c123c02ae82140c7b4b95f72a";
+      sha256 = "1ljlzjig0qv2mjzyk2piid12b4043584qskx6ikbz5i16cnbvqsq";
+    };
+  }
+  {
+    goPackagePath = "github.com/ipfs/go-ipfs-util";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ipfs/go-ipfs-util";
+      rev = "f25fcc891281327394bb48000ef0970d11baff2b";
+      sha256 = "1a79ggx0ma9ny39kjm0gzicrn541gyis4fn7kmkkfjjfaj8v5l3y";
+    };
+  }
+  {
+    goPackagePath = "github.com/ipfs/go-log";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ipfs/go-log";
+      rev = "48d644b006ba26f1793bffc46396e981801078e3";
+      sha256 = "0q2bk2s2v626ikm2pjalq4qg4n53yyf1bb81jbljb23iijxrqsbr";
     };
   }
   {
@@ -71,33 +89,6 @@
       sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf";
     };
   }
-  {
-    goPackagePath = "github.com/jbenet/go-multiaddr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-multiaddr";
-      rev = "f3dff105e44513821be8fbe91c89ef15eff1b4d4";
-      sha256 = "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-multiaddr-net";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-multiaddr-net";
-      rev = "d4cfd691db9f50e430528f682ca603237b0eaae0";
-      sha256 = "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-multihash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-multihash";
-      rev = "e8d2374934f16a971d1e94a864514a21ac74bf7f";
-      sha256 = "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp";
-    };
-  }
   {
     goPackagePath = "github.com/jbenet/go-os-rename";
     fetch = {
@@ -108,21 +99,12 @@
     };
   }
   {
-    goPackagePath = "github.com/jbenet/go-random";
+    goPackagePath = "github.com/jbenet/goprocess";
     fetch = {
       type = "git";
-      url = "https://github.com/jbenet/go-random";
-      rev = "384f606e91f542a98e779e652eed88051618f0f7";
-      sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-random-files";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-random-files";
-      rev = "737479700b40b4b50e914e963ce8d9d44603e3c8";
-      sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw";
+      url = "https://github.com/jbenet/goprocess";
+      rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b";
+      sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s";
     };
   }
   {
@@ -134,13 +116,139 @@
       sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
     };
   }
+  {
+    goPackagePath = "github.com/libp2p/go-floodsub";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-floodsub";
+      rev = "a922092abea58f07c32eabe303ec817569578740";
+      sha256 = "0wbi67jyfvrzfsb9lkrhjgg9k66yk5sww7nvihhc9rdnblygigs3";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-crypto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-crypto";
+      rev = "e89e1de117dd65c6129d99d1d853f48bc847cf17";
+      sha256 = "1lb0qzspx99sqbdxbf9dczwcmmirl4h26q9x3v6ris253zmqcbyw";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-host";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-host";
+      rev = "c1fc482de113ce7e4cdc9453a1c1c0fe4164d985";
+      sha256 = "1hiz5j64s248vml7i4gwjvz59g7l08zjfklhrbmk0cjxwhx9ypy0";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-interface-conn";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-interface-conn";
+      rev = "95afdbf0c900237f3b9104f1f7cfd3d56175a241";
+      sha256 = "0dv0jc08hfzb8gsi14c2ivancq7pxs8d482l4rw89mg04m2pgnaa";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-net";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-net";
+      rev = "2680a9894c7aabada540f728a53d7c1a16a1a44a";
+      sha256 = "1k44dz2dk7ahlfls6vk747jy8kbxmjhqyni8zw2wiz6sfm5hyw10";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-peer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-peer";
+      rev = "166a39e33e7a2a47a4bf999264f254ecaa4fe232";
+      sha256 = "0kgv1n2c8rfz92vk014sqm1bla7a99w18ydyphjjhc96fmlbrzgl";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-peerstore";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-peerstore";
+      rev = "744a149e48eb42e032540507c8545d12cc3b7f6f";
+      sha256 = "1bcmqkdlvvxdz9dbqrcfmvhx0wnnk94fb2yl9ys1nx7mnqgl64y8";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-protocol";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-protocol";
+      rev = "40488c03777c16bfcd65da2f675b192863cbc2dc";
+      sha256 = "1mvhi8pdfyn3lb1j1y4iz2mggnf0dz7ccbmrbij739v6cpjfwwbb";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-libp2p-transport";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-libp2p-transport";
+      rev = "5d3cb5861b59c26052a5fe184e45c381ec17e22d";
+      sha256 = "1v63gavw98f6hs151mqk0bbdl46a9ci9m2pcx807wxdsmfphynar";
+    };
+  }
+  {
+    goPackagePath = "github.com/libp2p/go-maddr-filter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libp2p/go-maddr-filter";
+      rev = "90aacb5ee155f0d6f3fa8b34d775de842606c0b1";
+      sha256 = "0ijs599hppj78dg2v7rcglqs82pysygq84yabpis5b99fjp9bay0";
+    };
+  }
   {
     goPackagePath = "github.com/mitchellh/go-homedir";
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/go-homedir";
-      rev = "1111e456ffea841564ac0fa5f69c26ef44dafec9";
-      sha256 = "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23";
+      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multiaddr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multiaddr";
+      rev = "33741da7b3f5773a599d4a03c333704fc560ef34";
+      sha256 = "0idhv960k68jvh0frhh28dw46p527m2g67rjwjh6r5va5sd8qjcd";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multiaddr-net";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multiaddr-net";
+      rev = "a7b93d11855f04f56908e1385991eb6a400fcc43";
+      sha256 = "1q0d8asxxhxhm774xn29n1x6zni6pmm78lvm3652ipyj026y243k";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multihash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multihash";
+      rev = "a52a6a4768da72eba89ea7f59f70e9d42ddd3072";
+      sha256 = "0r6fmzvg4vjwc5wzfqn7jjxndcw8n0galdx6f524yd9bcfdlph5b";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiformats/go-multistream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiformats/go-multistream";
+      rev = "b8f1996688ab586031517919b49b1967fca8d5d9";
+      sha256 = "0y2hl78lmnd0rbryfmscgxa6kmjdfz00pz60ymhg8k4cifqai0x2";
     };
   }
   {
@@ -148,8 +256,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/sabhiram/go-git-ignore";
-      rev = "228fcfa2a06e870a3ef238d54c45ea847f492a37";
-      sha256 = "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj";
+      rev = "87c28ffedb6cb7ff29ae89e0440e9ddee0d95a9e";
+      sha256 = "1qysvwjvbzq1wms09dm0sban58xq22bbkwpd7qnk28r99g6267rl";
+    };
+  }
+  {
+    goPackagePath = "github.com/spaolacci/murmur3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spaolacci/murmur3";
+      rev = "0d12bf811670bf6a1a63828dfbd003eded177fce";
+      sha256 = "0fv74n0cvgnxpfd04xyiry6ii1ag7mhwwk0kwplpvnbwi8y9yq1x";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/go-logging";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/go-logging";
+      rev = "0457bb6b88fc1973573aaf6b5145d8d3ae972390";
+      sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn";
     };
   }
   {
@@ -166,8 +292,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/whyrusleeping/json-filter";
-      rev = "e9937f5649231265a56d0a419f062530425401a1";
-      sha256 = "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s";
+      rev = "ff25329a9528f01c5175414f16cc0a6a162a5b8b";
+      sha256 = "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/mafmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/mafmt";
+      rev = "15300f9d3a2d71db61951a8705d5ea8878764837";
+      sha256 = "0fiwrj8pla9y8q0m4ifyrh8gacmrz278h2zihdbqbk2b17b002yr";
+    };
+  }
+  {
+    goPackagePath = "github.com/whyrusleeping/progmeter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/progmeter";
+      rev = "974d8fe8cd87585865b1370184050e89d606e817";
+      sha256 = "05njc5minpaxzwb6yg5zjr52ar4ar7qkiml45zsrp2ny92dyx07j";
     };
   }
   {
@@ -188,13 +332,31 @@
       sha256 = "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72";
     };
   }
+  {
+    goPackagePath = "github.com/whyrusleeping/timecache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/whyrusleeping/timecache";
+      rev = "cfcb2f1abfee846c430233aef0b630a946e0a5a6";
+      sha256 = "0nnra7ivq7cj34rj2ib8hgfdpik3smr1hy7x18svhfin8z1xsj2s";
+    };
+  }
   {
     goPackagePath = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "f3241ce8505855877cc8a9717bd61a0f7c4ea83c";
-      sha256 = "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq";
+      rev = "a48ac81e47fd6f9ed1258f3b60ae9e75f93cb7ed";
+      sha256 = "0zpgwc362rghm3fv0s964dqmw6krixzxww2qxhnik9hvf7srapjd";
+    };
+  }
+  {
+    goPackagePath = "leb.io/hashland";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tildeleb/hashland";
+      rev = "e13accbe55f7fa03c73c74ace4cca4c425e47260";
+      sha256 = "1ygfp7kjnm964w2bv61bsyxpw5y6vy6k4pra1lhd5r3nhlxgs31g";
     };
   }
 ]
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
index aa5acfa22d5..6a9589f9ac2 100644
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -5,15 +5,15 @@
 
 buildGoPackage rec {
   name = "gx-go-${version}";
-  version = "20160611-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "639fc0be1a153c59d8946904cceecf0b66ab2944";
+  version = "1.5.0";
+  rev = "refs/tags/v${version}";
 
   goPackagePath = "github.com/whyrusleeping/gx-go";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/whyrusleeping/gx-go";
-    sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l";
+    sha256 = "0bg4h5lzs293qmlsr9n257vjpr5w6bxb4ampb25gsn3fgy3rvsis";
   };
 
   goDeps = ../deps.nix;

From 006ac6b224dd29f1771734de39ce67ff92a28924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 7 Jul 2017 16:23:02 +0100
Subject: [PATCH 0216/3246] exa: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 4dd49e02e0e..110125727bf 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -21,15 +21,15 @@ let
   '';
 in buildRustPackage rec {
   name = "exa-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
-  depsSha256 = "0c1vyl1c67xq18ss0xs5cjdfn892jpwj6ml51dfppzfyns3namm4";
+  depsSha256 = "0j320hhf2vqaha137pjj4pyiw6d3p5h3nhy3pl9vna1g5mnl1sn7";
 
   src = fetchFromGitHub {
     owner = "ogham";
     repo = "exa";
     rev = "v${version}";
-    sha256 = "0065gj4pbbppbnwp23s6bb7zlz428nrir00d0kz7axydxk6swhyv";
+    sha256 = "0i9psgna2wwv9qyw9cif4qznqiyi16vl763hpm2yr195aj700339";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];

From 8fc5beb8553eeb016870528f74f1b89527a08b1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 7 Jul 2017 17:22:15 +0200
Subject: [PATCH 0217/3246] httpd: 2.4.25 -> 2.4.26

CVE-2017-3167, CVE-2017-3169, CVE-2017-7659, CVE-2017-7668,  CVE-2017-7679
---
 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 f70d6266e8d..568b0ee6c04 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.25";
+  version = "2.4.26";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "1cl0bkqg6srb1sypga0cn8dcmdyxldavij73zmmkxvlz3kgw4zpq";
+    sha1 = "b10b0f569a0e5adfef61d8c7f0813d42046e399a";
   };
 
   # FIXME: -dev depends on -doc

From 93b1b3d6e64d37b85d751d5855d227090f6cf3ee Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 7 Jul 2017 17:33:01 +0200
Subject: [PATCH 0218/3246] perl-PDF-API2: 2.030 -> 2.033

---
 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 1e772e40620..0bd8b0c5b0d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10719,16 +10719,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   PDFAPI2 = buildPerlPackage rec {
-    name = "PDF-API2-2.030";
+    name = "PDF-API2-2.033";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz";
-      sha256 = "a802c25c1f00b093778223fc7aea94ebd87a9abdb915151746b8ee5d4a358769";
+      sha256 = "9c0866ec1a3053f73afaca5f5cdbe6925903b4ce606f4bf4ac317731a69d27a0";
     };
+    buildInputs = [ TestException TestMemoryCycle ];
     propagatedBuildInputs = [ FontTTF ];
     meta = {
       description = "Facilitates the creation and modification of PDF files";
-      license = stdenv.lib.licenses.lgpl21;
-      maintainers = [ maintainers.rycee ];
+      license = stdenv.lib.licenses.lgpl21Plus;
     };
   };
 

From a14cf0618219a6f135e786e69e78eb0b866248f8 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 6 Jul 2017 19:29:48 -0400
Subject: [PATCH 0219/3246] stdenv: Harden hook runners

Instead of eval, use a "nameref" to get the name of the array and
iterate with that. Also, make the for-loop parameter a local variable,
too.
---
 pkgs/stdenv/generic/setup.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index eb63b18e5f3..191abf7596b 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -17,8 +17,9 @@ runHook() {
     shift
     local var="$hookName"
     if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
-    eval "local -a dummy=(\"\${$var[@]}\")"
-    for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do
+    local -n var
+    local hook
+    for hook in "_callImplicitHook 0 $hookName" "${var[@]}"; do
         _eval "$hook" "$@"
     done
     return 0
@@ -32,8 +33,9 @@ runOneHook() {
     shift
     local var="$hookName"
     if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
-    eval "local -a dummy=(\"\${$var[@]}\")"
-    for hook in "_callImplicitHook 1 $hookName" "${dummy[@]}"; do
+    local -n var
+    local hook
+    for hook in "_callImplicitHook 1 $hookName" "${var[@]}"; do
         if _eval "$hook" "$@"; then
             return 0
         fi

From e57a220f810a9698c5df27a7488839ebea3226e2 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 29 Jun 2017 20:28:27 -0400
Subject: [PATCH 0220/3246] stdenv, swift: Use `local fd` in is* bash functions
 for hygiene

---
 .../development/compilers/swift/patches/build-script-pax.patch | 3 ++-
 pkgs/stdenv/generic/setup.sh                                   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch
index 9f1976a2d88..fa2ccdf9d5c 100644
--- a/pkgs/development/compilers/swift/patches/build-script-pax.patch
+++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch
@@ -1,12 +1,13 @@
 --- swift/utils/build-script-impl	2017-01-23 12:47:20.401326309 -0600
 +++ swift-pax/utils/build-script-impl	2017-01-23 13:24:10.339366996 -0600
-@@ -1823,6 +1823,16 @@ function set_lldb_xcodebuild_options() {
+@@ -1823,6 +1823,17 @@ function set_lldb_xcodebuild_options() {
      fi
  }
  
 +## XXX: Taken from nixpkgs /pkgs/stdenv/generic/setup.sh
 +isELF() {
 +    local fn="$1"
++    local fd
 +    local magic
 +    exec {fd}< "$fn"
 +    read -n 4 -u $fd magic
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 191abf7596b..e5d2ba8682d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -194,6 +194,7 @@ _addRpathPrefix() {
 # Return success if the specified file is an ELF object.
 isELF() {
     local fn="$1"
+    local fd
     local magic
     exec {fd}< "$fn"
     read -n 4 -u $fd magic
@@ -205,6 +206,7 @@ isELF() {
 # "#!").
 isScript() {
     local fn="$1"
+    local fd
     local magic
     if ! [ -x /bin/sh ]; then return 0; fi
     exec {fd}< "$fn"

From fbbf5e79c3f0ccfe8f320891e648c7e7a6ef4337 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 7 Jul 2017 17:57:30 +0200
Subject: [PATCH 0221/3246] python.pkgs.virtualenv: move to separate expression

---
 .../python-modules/virtualenv/default.nix     | 31 +++++++++++++++++++
 .../virtualenv-change-prefix.patch            |  0
 pkgs/top-level/python-packages.nix            | 25 +--------------
 3 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/virtualenv/default.nix
 rename pkgs/development/python-modules/{ => virtualenv}/virtualenv-change-prefix.patch (100%)

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
new file mode 100644
index 00000000000..f6d3a747ee4
--- /dev/null
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -0,0 +1,31 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, recursivePthLoader
+}:
+
+buildPythonPackage rec {
+  pname = "virtualenv";
+  version = "15.0.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d";
+  };
+
+  # Doubt this is needed - FRidh 2017-07-07
+  pythonPath = [ recursivePthLoader ];
+
+  patches = [ ./virtualenv-change-prefix.patch ];
+
+  # Tarball doesn't contain tests
+  doCheck = false;
+
+  meta = {
+    description = "A tool to create isolated Python environments";
+    homepage = http://www.virtualenv.org;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ goibhniu ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
similarity index 100%
rename from pkgs/development/python-modules/virtualenv-change-prefix.patch
rename to pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 232f0693ab9..5fc8e228dd9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25169,30 +25169,7 @@ in {
     };
   };
 
-  virtualenv = buildPythonPackage rec {
-    name = "virtualenv-15.0.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/v/virtualenv/${name}.tar.gz";
-      sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d";
-    };
-
-    pythonPath = [ self.recursivePthLoader ];
-
-    patches = [ ../development/python-modules/virtualenv-change-prefix.patch ];
-
-    propagatedBuildInputs = with self; [ ];
-
-    # Tarball doesn't contain tests
-    doCheck = false;
-
-    meta = {
-      description = "A tool to create isolated Python environments";
-      homepage = http://www.virtualenv.org;
-      license = licenses.mit;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
+  virtualenv = callPackage ../development/python-modules/virtualenv { };
 
   virtualenv-clone = buildPythonPackage rec {
     name = "virtualenv-clone-0.2.5";

From 7fdf18e8928870d6e015ad8aadc4a3e856076f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 29 Jan 2017 12:07:44 +0100
Subject: [PATCH 0222/3246] stdenv: refactor (no change in semantics)

This just moves some expressions around in preparation to further changes.
---
 pkgs/stdenv/generic/default.nix | 75 ++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index ce9beb2bbc6..8db0017f2d9 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -290,15 +290,15 @@ let
         in [ nativeBuildInputs buildInputs ];
 
       propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies;
-    in
 
       # Throw an error if trying to evaluate an non-valid derivation
-      assert let v = checkValidity attrs;
+      validityCondition =
+			 let v = checkValidity attrs;
              in if !v.valid
                then throwEvalHelp (removeAttrs v ["valid"])
                else true;
 
-      lib.addPassthru (derivation (
+      derivationArg =
         (removeAttrs attrs
           ["meta" "passthru" "crossAttrs" "pos"
            "__impureHostDeps" "__propagatedImpureHostDeps"
@@ -343,37 +343,44 @@ let
           __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
         } // (if outputs' != [ "out" ] then {
           outputs = outputs';
-        } else { })))) (
-      {
-        overrideAttrs = f: mkDerivation (attrs // (f attrs));
-        # The meta attribute is passed in the resulting attribute set,
-        # but it's not part of the actual derivation, i.e., it's not
-        # passed to the builder and is not a dependency.  But since we
-        # include it in the result, it *is* available to nix-env for queries.
-        meta = { }
-            # If the packager hasn't specified `outputsToInstall`, choose a default,
-            # which is the name of `p.bin or p.out or p`;
-            # if he has specified it, it will be overridden below in `// meta`.
-            #   Note: This default probably shouldn't be globally configurable.
-            #   Services and users should specify outputs explicitly,
-            #   unless they are comfortable with this default.
-          // { outputsToInstall =
-            let
-              outs = outputs'; # the value passed to derivation primitive
-              hasOutput = out: builtins.elem out outs;
-            in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )];
-          }
-          // meta
-            # Fill `meta.position` to identify the source location of the package.
-          // lib.optionalAttrs (pos' != null)
-            { position = pos'.file + ":" + toString pos'.line; }
-          ;
-        inherit passthru;
-      } //
-      # Pass through extra attributes that are not inputs, but
-      # should be made available to Nix expressions using the
-      # derivation (e.g., in assertions).
-      passthru);
+        } else { }));
+
+      # The meta attribute is passed in the resulting attribute set,
+      # but it's not part of the actual derivation, i.e., it's not
+      # passed to the builder and is not a dependency.  But since we
+      # include it in the result, it *is* available to nix-env for queries.
+      meta = { }
+          # If the packager hasn't specified `outputsToInstall`, choose a default,
+          # which is the name of `p.bin or p.out or p`;
+          # if he has specified it, it will be overridden below in `// meta`.
+          #   Note: This default probably shouldn't be globally configurable.
+          #   Services and users should specify outputs explicitly,
+          #   unless they are comfortable with this default.
+        // { outputsToInstall =
+          let
+            outs = outputs'; # the value passed to derivation primitive
+            hasOutput = out: builtins.elem out outs;
+          in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )];
+        }
+        // attrs.meta or {}
+          # Fill `meta.position` to identify the source location of the package.
+        // lib.optionalAttrs (pos' != null)
+          { position = pos'.file + ":" + toString pos'.line; }
+        ;
+
+    in
+
+      assert validityCondition;
+
+      lib.addPassthru (derivation derivationArg) (
+        {
+          overrideAttrs = f: mkDerivation (attrs // (f attrs));
+          inherit meta passthru;
+        } //
+        # Pass through extra attributes that are not inputs, but
+        # should be made available to Nix expressions using the
+        # derivation (e.g., in assertions).
+        passthru);
 
   # The stdenv that we are producing.
   result =

From 5afcdc88fa7ce9583eecec136de49685923e8df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 29 Jan 2017 22:12:41 +0100
Subject: [PATCH 0223/3246] stdenv: simple refactor to get rid of pos'

Suggested by Ericson2314.
---
 pkgs/stdenv/generic/default.nix | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 8db0017f2d9..065f4fb508d 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -135,7 +135,10 @@ let
     , crossConfig ? null
     , meta ? {}
     , passthru ? {}
-    , pos ? null # position used in error messages and for meta.position
+    , pos ? # position used in error messages and for meta.position
+        (if attrs.meta.description or null != null
+          then builtins.unsafeGetAttrPos "description" attrs.meta
+          else builtins.unsafeGetAttrPos "name" attrs)
     , separateDebugInfo ? false
     , outputs ? [ "out" ]
     , __impureHostDeps ? []
@@ -153,15 +156,7 @@ let
         (map (drv: drv.crossDrv or drv) propagatedBuildInputs)
       ];
     in let
-      pos' =
-        if pos != null then
-          pos
-        else if attrs.meta.description or null != null then
-          builtins.unsafeGetAttrPos "description" attrs.meta
-        else
-          builtins.unsafeGetAttrPos "name" attrs;
-      pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»";
-
+      pos_str = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
 
       remediation = {
         unfree = remediate_whitelist "Unfree";
@@ -216,7 +211,7 @@ let
 
       throwEvalHelp = { reason , errormsg ? "" }:
         throw (''
-          Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate.
+          Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
 
           '' + ((builtins.getAttr reason remediation) attrs));
 
@@ -293,7 +288,7 @@ let
 
       # Throw an error if trying to evaluate an non-valid derivation
       validityCondition =
-			 let v = checkValidity attrs;
+             let v = checkValidity attrs;
              in if !v.valid
                then throwEvalHelp (removeAttrs v ["valid"])
                else true;
@@ -364,8 +359,8 @@ let
         }
         // attrs.meta or {}
           # Fill `meta.position` to identify the source location of the package.
-        // lib.optionalAttrs (pos' != null)
-          { position = pos'.file + ":" + toString pos'.line; }
+        // lib.optionalAttrs (pos != null)
+          { position = pos.file + ":" + toString pos.line; }
         ;
 
     in

From dfc004e69c23cb48cce2c7537169a81b299a0af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Jul 2017 09:32:43 +0200
Subject: [PATCH 0224/3246] lib.lists.mutuallyExclusive: add function

---
 lib/lists.nix                   | 8 ++++++++
 pkgs/stdenv/generic/default.nix | 7 +------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index a04b1b27893..6a8fd8a1840 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -477,4 +477,12 @@ rec {
   */
   subtractLists = e: filter (x: !(elem x e));
 
+  /* Test if two lists have no common element.
+     It should be slightly more efficient than (intersectLists a b == [])
+  */
+  mutuallyExclusive = a: b:
+    (builtins.length a) == 0 ||
+    (!(builtins.elem (builtins.head a) b) &&
+     mutuallyExclusive (builtins.tail a) b);
+
 }
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 065f4fb508d..690b917b376 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -45,13 +45,8 @@ let
         throw ''‘${showLicense license}’ is not an attribute of lib.licenses''
     ) list;
 
-  mutuallyExclusive = a: b:
-    (builtins.length a) == 0 ||
-    (!(builtins.elem (builtins.head a) b) &&
-     mutuallyExclusive (builtins.tail a) b);
-
   areLicenseListsValid =
-    if mutuallyExclusive whitelist blacklist then
+    if lib.mutuallyExclusive whitelist blacklist then
       assert onlyLicenses whitelist; assert onlyLicenses blacklist; true
     else
       throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive.";

From 21ef8d5c89281a71750cdf51ef7c8d69c52b63ed Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Thu, 6 Jul 2017 15:14:01 +0200
Subject: [PATCH 0225/3246] network-manager: fix hard-coded path for modprobe

---
 pkgs/tools/networking/network-manager/default.nix    |  4 +++-
 pkgs/tools/networking/network-manager/modprobe.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/network-manager/modprobe.patch

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 3ef4188052b..d2a51b3acc8 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
        --replace /usr/bin/ping6 ${inetutils}/bin/ping
     substituteInPlace src/devices/nm-arping-manager.c \
        --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);'
-    substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe
     substituteInPlace data/84-nm-drivers.rules \
       --replace /bin/sh ${stdenv.shell}
     substituteInPlace data/85-nm-unmanaged.rules \
@@ -43,6 +42,8 @@ stdenv.mkDerivation rec {
       --replace /bin/kill ${coreutils}/bin/kill
     substituteInPlace clients/common/nm-vpn-helpers.c \
       --subst-var-by openconnect ${openconnect}
+    substituteInPlace src/nm-core-utils.c \
+      --subst-var-by modprobeBinPath ${kmod}/bin/modprobe
     # to enable link-local connections
     configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
   '';
@@ -79,6 +80,7 @@ stdenv.mkDerivation rec {
       url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch";
     })
     ./openconnect_helper_path.patch
+    ./modprobe.patch
   ];
 
   buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
diff --git a/pkgs/tools/networking/network-manager/modprobe.patch b/pkgs/tools/networking/network-manager/modprobe.patch
new file mode 100644
index 00000000000..487c70b0165
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/modprobe.patch
@@ -0,0 +1,11 @@
+--- a/src/nm-core-utils.c	2017-02-15 13:10:27.000000000 +0100
++++ b/src/nm-core-utils.c	2017-07-06 14:28:41.575815695 +0200
+@@ -419,7 +419,7 @@
+ 
+ 	/* construct the argument list */
+ 	argv = g_ptr_array_sized_new (4);
+-	g_ptr_array_add (argv, "/sbin/modprobe");
++	g_ptr_array_add (argv, "@modprobeBinPath@");
+ 	g_ptr_array_add (argv, (char *) arg1);
+ 
+ 	va_start (ap, arg1);

From e8e57452f4a35cfa5a20ede5dd6e0c6404f35903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 2 Jul 2017 13:52:14 +0200
Subject: [PATCH 0226/3246] stdenv: separate all meta-checking code (~200
 lines)

Only cosmetic changes are done otherwise.
Real refactoring is left for later.

There's a small slow-down on my machine:
$ time nix-env -qa -P >/dev/null
gets from ~2.8 to ~3.5 seconds (negligible change in RAM).
That's most likely caused by sharing less computation between different
mkDerivation calls, and I plan to improve that soon.
---
 pkgs/stdenv/generic/check-meta.nix | 197 +++++++++++++++++++++++++++
 pkgs/stdenv/generic/default.nix    | 211 ++---------------------------
 2 files changed, 212 insertions(+), 196 deletions(-)
 create mode 100644 pkgs/stdenv/generic/check-meta.nix

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
new file mode 100644
index 00000000000..8b2cf01f169
--- /dev/null
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -0,0 +1,197 @@
+# Extend a derivation with checks for brokenness, license, etc.  Throw a
+# descriptive error when the check fails; return `derivationArg` otherwise.
+# Note: no dependencies are checked in this step.
+
+{ lib, config, system, meta, derivationArg, mkDerivationArg }:
+
+let
+  attrs = mkDerivationArg; # TODO: probably get rid of passing this one
+
+  # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426
+  # for why this defaults to false, but I (@copumpkin) want to default it to true soon.
+  shouldCheckMeta = config.checkMeta or false;
+
+  allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
+
+  whitelist = config.whitelistedLicenses or [];
+  blacklist = config.blacklistedLicenses or [];
+
+  onlyLicenses = list:
+    lib.lists.all (license:
+      let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
+      if license == l then true else
+        throw ''‘${showLicense license}’ is not an attribute of lib.licenses''
+    ) list;
+
+  areLicenseListsValid =
+    if lib.mutuallyExclusive whitelist blacklist then
+      assert onlyLicenses whitelist; assert onlyLicenses blacklist; true
+    else
+      throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive.";
+
+  hasLicense = attrs:
+    attrs ? meta.license;
+
+  hasWhitelistedLicense = assert areLicenseListsValid; attrs:
+    hasLicense attrs && builtins.elem attrs.meta.license whitelist;
+
+  hasBlacklistedLicense = assert areLicenseListsValid; attrs:
+    hasLicense attrs && builtins.elem attrs.meta.license blacklist;
+
+  allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
+
+  isUnfree = licenses: lib.lists.any (l:
+    !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
+
+  # Alow granular checks to allow only some unfree packages
+  # Example:
+  # {pkgs, ...}:
+  # {
+  #   allowUnfree = false;
+  #   allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name);
+  # }
+  allowUnfreePredicate = config.allowUnfreePredicate or (x: false);
+
+  # Check whether unfree packages are allowed and if not, whether the
+  # package has an unfree license and is not explicitely allowed by the
+  # `allowUNfreePredicate` function.
+  hasDeniedUnfreeLicense = attrs:
+    !allowUnfree &&
+    hasLicense attrs &&
+    isUnfree (lib.lists.toList attrs.meta.license) &&
+    !allowUnfreePredicate attrs;
+
+  allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []);
+  allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x;
+
+  hasAllowedInsecure = attrs:
+    (attrs.meta.knownVulnerabilities or []) == [] ||
+    allowInsecurePredicate attrs ||
+    builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1";
+
+  showLicense = license: license.shortName or "unknown";
+
+  pos_str = meta.position or "«unknown-file»";
+
+  remediation = {
+    unfree = remediate_whitelist "Unfree";
+    broken = remediate_whitelist "Broken";
+    blacklisted = x: "";
+    insecure = remediate_insecure;
+    unknown-meta = x: "";
+  };
+  remediate_whitelist = allow_attr: attrs:
+    ''
+      a) For `nixos-rebuild` you can set
+        { nixpkgs.config.allow${allow_attr} = true; }
+      in configuration.nix to override this.
+
+      b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
+        { allow${allow_attr} = true; }
+      to ~/.config/nixpkgs/config.nix.
+    '';
+
+  remediate_insecure = attrs:
+    ''
+
+      Known issues:
+
+    '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + ''
+
+        You can install it anyway by whitelisting this package, using the
+        following methods:
+
+        a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to
+           `nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
+           like so:
+
+             {
+               nixpkgs.config.permittedInsecurePackages = [
+                 "${attrs.name or "«name-missing»"}"
+               ];
+             }
+
+        b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
+        ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in
+        ~/.config/nixpkgs/config.nix, like so:
+
+             {
+               permittedInsecurePackages = [
+                 "${attrs.name or "«name-missing»"}"
+               ];
+             }
+
+      '';
+
+  throwEvalHelp = { reason , errormsg ? "" }:
+    throw (''
+      Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
+
+      '' + ((builtins.getAttr reason remediation) attrs));
+
+  metaTypes = with lib.types; rec {
+    # These keys are documented
+    description = str;
+    longDescription = str;
+    branch = str;
+    homepage = str;
+    downloadPage = str;
+    license = either (listOf lib.types.attrs) (either lib.types.attrs str);
+    maintainers = listOf str;
+    priority = int;
+    platforms = listOf str;
+    hydraPlatforms = listOf str;
+    broken = bool;
+
+    # Weirder stuff that doesn't appear in the documentation?
+    version = str;
+    tag = str;
+    updateWalker = bool;
+    executables = listOf str;
+    outputsToInstall = listOf str;
+    position = str;
+    repositories = attrsOf str;
+    isBuildPythonPackage = platforms;
+    schedulingPriority = str;
+    downloadURLRegexp = str;
+    isFcitxEngine = bool;
+    isIbusEngine = bool;
+  };
+
+  checkMetaAttr = k: v:
+    if metaTypes?${k} then
+      if metaTypes.${k}.check v then null else "key '${k}' has a value ${v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}"
+    else "key '${k}' is unrecognized; expected one of: \n\t      [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
+  checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
+
+  # Check if a derivation is valid, that is whether it passes checks for
+  # e.g brokenness or license.
+  #
+  # Return { valid: Bool } and additionally
+  # { reason: String; errormsg: String } if it is not valid, where
+  # reason is one of "unfree", "blacklisted" or "broken".
+  checkValidity = attrs:
+    if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then
+      { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; }
+    else if hasBlacklistedLicense attrs then
+      { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; }
+    else if !allowBroken && attrs.meta.broken or false then
+      { valid = false; reason = "broken"; errormsg = "is marked as broken"; }
+    else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then
+      { valid = false; reason = "broken"; errormsg = "is not supported on ‘${system}’"; }
+    else if !(hasAllowedInsecure attrs) then
+      { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }
+    else let res = checkMeta (attrs.meta or {}); in if res != [] then
+      { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }
+    else { valid = true; };
+
+  # Throw an error if trying to evaluate an non-valid derivation
+  validityCondition =
+         let v = checkValidity attrs;
+         in if !v.valid
+           then throwEvalHelp (removeAttrs v ["valid"])
+           else true;
+
+in
+  assert validityCondition;
+  derivationArg
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 690b917b376..c790093ee4e 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -27,72 +27,8 @@ let lib = import ../../../lib; in lib.makeOverridable (
 let
   inherit (targetPlatform) system;
 
-  # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426
-  # for why this defaults to false, but I (@copumpkin) want to default it to true soon.
-  shouldCheckMeta = config.checkMeta or false;
-
-  allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
-
-  whitelist = config.whitelistedLicenses or [];
-  blacklist = config.blacklistedLicenses or [];
-
   ifDarwin = attrs: if system == "x86_64-darwin" then attrs else {};
 
-  onlyLicenses = list:
-    lib.lists.all (license:
-      let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
-      if license == l then true else
-        throw ''‘${showLicense license}’ is not an attribute of lib.licenses''
-    ) list;
-
-  areLicenseListsValid =
-    if lib.mutuallyExclusive whitelist blacklist then
-      assert onlyLicenses whitelist; assert onlyLicenses blacklist; true
-    else
-      throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive.";
-
-  hasLicense = attrs:
-    attrs ? meta.license;
-
-  hasWhitelistedLicense = assert areLicenseListsValid; attrs:
-    hasLicense attrs && builtins.elem attrs.meta.license whitelist;
-
-  hasBlacklistedLicense = assert areLicenseListsValid; attrs:
-    hasLicense attrs && builtins.elem attrs.meta.license blacklist;
-
-  allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
-
-  isUnfree = licenses: lib.lists.any (l:
-    !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
-
-  # Alow granular checks to allow only some unfree packages
-  # Example:
-  # {pkgs, ...}:
-  # {
-  #   allowUnfree = false;
-  #   allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name);
-  # }
-  allowUnfreePredicate = config.allowUnfreePredicate or (x: false);
-
-  # Check whether unfree packages are allowed and if not, whether the
-  # package has an unfree license and is not explicitely allowed by the
-  # `allowUNfreePredicate` function.
-  hasDeniedUnfreeLicense = attrs:
-    !allowUnfree &&
-    hasLicense attrs &&
-    isUnfree (lib.lists.toList attrs.meta.license) &&
-    !allowUnfreePredicate attrs;
-
-  allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []);
-  allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x;
-
-  hasAllowedInsecure = attrs:
-    (attrs.meta.knownVulnerabilities or []) == [] ||
-    allowInsecurePredicate attrs ||
-    builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1";
-
-  showLicense = license: license.shortName or "unknown";
-
   defaultNativeBuildInputs = extraBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
@@ -151,120 +87,6 @@ let
         (map (drv: drv.crossDrv or drv) propagatedBuildInputs)
       ];
     in let
-      pos_str = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
-
-      remediation = {
-        unfree = remediate_whitelist "Unfree";
-        broken = remediate_whitelist "Broken";
-        blacklisted = x: "";
-        insecure = remediate_insecure;
-        unknown-meta = x: "";
-      };
-      remediate_whitelist = allow_attr: attrs:
-        ''
-          a) For `nixos-rebuild` you can set
-            { nixpkgs.config.allow${allow_attr} = true; }
-          in configuration.nix to override this.
-
-          b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
-            { allow${allow_attr} = true; }
-          to ~/.config/nixpkgs/config.nix.
-        '';
-
-      remediate_insecure = attrs:
-        ''
-
-          Known issues:
-
-        '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + ''
-
-          You can install it anyway by whitelisting this package, using the
-          following methods:
-
-          a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to
-             `nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
-             like so:
-
-               {
-                 nixpkgs.config.permittedInsecurePackages = [
-                   "${attrs.name or "«name-missing»"}"
-                 ];
-               }
-
-          b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
-          ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in
-          ~/.config/nixpkgs/config.nix, like so:
-
-               {
-                 permittedInsecurePackages = [
-                   "${attrs.name or "«name-missing»"}"
-                 ];
-               }
-
-        '';
-
-
-      throwEvalHelp = { reason , errormsg ? "" }:
-        throw (''
-          Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
-
-          '' + ((builtins.getAttr reason remediation) attrs));
-
-      metaTypes = with lib.types; rec {
-        # These keys are documented
-        description = str;
-        longDescription = str;
-        branch = str;
-        homepage = str;
-        downloadPage = str;
-        license = either (listOf lib.types.attrs) (either lib.types.attrs str);
-        maintainers = listOf str;
-        priority = int;
-        platforms = listOf str;
-        hydraPlatforms = listOf str;
-        broken = bool;
-
-        # Weirder stuff that doesn't appear in the documentation?
-        version = str;
-        tag = str;
-        updateWalker = bool;
-        executables = listOf str;
-        outputsToInstall = listOf str;
-        position = str;
-        repositories = attrsOf str;
-        isBuildPythonPackage = platforms;
-        schedulingPriority = str;
-        downloadURLRegexp = str;
-        isFcitxEngine = bool;
-        isIbusEngine = bool;
-      };
-
-      checkMetaAttr = k: v:
-        if metaTypes?${k} then
-          if metaTypes.${k}.check v then null else "key '${k}' has a value ${v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}"
-        else "key '${k}' is unrecognized; expected one of: \n\t      [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
-      checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
-
-      # Check if a derivation is valid, that is whether it passes checks for
-      # e.g brokenness or license.
-      #
-      # Return { valid: Bool } and additionally
-      # { reason: String; errormsg: String } if it is not valid, where
-      # reason is one of "unfree", "blacklisted" or "broken".
-      checkValidity = attrs:
-        if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then
-          { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; }
-        else if hasBlacklistedLicense attrs then
-          { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; }
-        else if !allowBroken && attrs.meta.broken or false then
-          { valid = false; reason = "broken"; errormsg = "is marked as broken"; }
-        else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
-          { valid = false; reason = "broken"; errormsg = "is not supported on ‘${result.system}’"; }
-        else if !(hasAllowedInsecure attrs) then
-          { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }
-        else let res = checkMeta (attrs.meta or {}); in if res != [] then
-          { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }
-        else { valid = true; };
 
       outputs' =
         outputs ++
@@ -281,13 +103,6 @@ let
 
       propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies;
 
-      # Throw an error if trying to evaluate an non-valid derivation
-      validityCondition =
-             let v = checkValidity attrs;
-             in if !v.valid
-               then throwEvalHelp (removeAttrs v ["valid"])
-               else true;
-
       derivationArg =
         (removeAttrs attrs
           ["meta" "passthru" "crossAttrs" "pos"
@@ -360,17 +175,21 @@ let
 
     in
 
-      assert validityCondition;
-
-      lib.addPassthru (derivation derivationArg) (
-        {
-          overrideAttrs = f: mkDerivation (attrs // (f attrs));
-          inherit meta passthru;
-        } //
-        # Pass through extra attributes that are not inputs, but
-        # should be made available to Nix expressions using the
-        # derivation (e.g., in assertions).
-        passthru);
+      lib.addPassthru
+        (derivation (import ./check-meta.nix
+          {
+            inherit lib config meta derivationArg;
+            mkDerivationArg = attrs;
+            inherit system; # TODO: cross-compilation?
+          }))
+        ( {
+            overrideAttrs = f: mkDerivation (attrs // (f attrs));
+            inherit meta passthru;
+          } //
+          # Pass through extra attributes that are not inputs, but
+          # should be made available to Nix expressions using the
+          # derivation (e.g., in assertions).
+          passthru);
 
   # The stdenv that we are producing.
   result =

From 4cf4d7180dfb7dba21e1dc832539daa5d31e2a23 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 5 Jul 2017 17:56:53 -0400
Subject: [PATCH 0227/3246] stdenv: Conservatively move `mkDerivation` into
 it's own file

---
 pkgs/stdenv/generic/default.nix         | 165 ++----------------------
 pkgs/stdenv/generic/make-derivation.nix | 155 ++++++++++++++++++++++
 2 files changed, 168 insertions(+), 152 deletions(-)
 create mode 100644 pkgs/stdenv/generic/make-derivation.nix

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index c790093ee4e..1d4425f9c78 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -27,8 +27,6 @@ let lib = import ../../../lib; in lib.makeOverridable (
 let
   inherit (targetPlatform) system;
 
-  ifDarwin = attrs: if system == "x86_64-darwin" then attrs else {};
-
   defaultNativeBuildInputs = extraBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
@@ -37,7 +35,7 @@ let
     ]
       # FIXME this on Darwin; see
       # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369
-    ++ lib.optional result.isLinux ../../build-support/setup-hooks/audit-tmpdir.sh
+    ++ lib.optional hostPlatform.isLinux ../../build-support/setup-hooks/audit-tmpdir.sh
     ++ [
       ../../build-support/setup-hooks/multiple-outputs.sh
       ../../build-support/setup-hooks/move-sbin.sh
@@ -46,153 +44,8 @@ let
       cc
     ];
 
-  # `mkDerivation` wraps the builtin `derivation` function to
-  # produce derivations that use this stdenv and its shell.
-  #
-  # See also:
-  #
-  # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv
-  #   Details on how to use this mkDerivation function
-  #
-  # * https://nixos.org/nix/manual/#ssec-derivation
-  #   Explanation about derivations in general
-  mkDerivation =
-    { nativeBuildInputs ? []
-    , buildInputs ? []
-
-    , propagatedNativeBuildInputs ? []
-    , propagatedBuildInputs ? []
-
-    , crossConfig ? null
-    , meta ? {}
-    , passthru ? {}
-    , pos ? # position used in error messages and for meta.position
-        (if attrs.meta.description or null != null
-          then builtins.unsafeGetAttrPos "description" attrs.meta
-          else builtins.unsafeGetAttrPos "name" attrs)
-    , separateDebugInfo ? false
-    , outputs ? [ "out" ]
-    , __impureHostDeps ? []
-    , __propagatedImpureHostDeps ? []
-    , sandboxProfile ? ""
-    , propagatedSandboxProfile ? ""
-    , ... } @ attrs:
-    let
-      dependencies = [
-        (map (drv: drv.nativeDrv or drv) nativeBuildInputs)
-        (map (drv: drv.crossDrv or drv) buildInputs)
-      ];
-      propagatedDependencies = [
-        (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)
-        (map (drv: drv.crossDrv or drv) propagatedBuildInputs)
-      ];
-    in let
-
-      outputs' =
-        outputs ++
-        (if separateDebugInfo then assert targetPlatform.isLinux; [ "debug" ] else []);
-
-      dependencies' = let
-          justMap = map lib.chooseDevOutputs dependencies;
-          nativeBuildInputs = lib.elemAt justMap 0
-            ++ lib.optional targetPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh;
-          buildInputs = lib.elemAt justMap 1
-               # TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`.
-            ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh;
-        in [ nativeBuildInputs buildInputs ];
-
-      propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies;
-
-      derivationArg =
-        (removeAttrs attrs
-          ["meta" "passthru" "crossAttrs" "pos"
-           "__impureHostDeps" "__propagatedImpureHostDeps"
-           "sandboxProfile" "propagatedSandboxProfile"])
-        // (let
-          # TODO(@Ericson2314): Reversing of dep lists is just temporary to avoid Darwin mass rebuild.
-          computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'));
-          computedPropagatedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists (lib.reverseList propagatedDependencies'));
-          computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')));
-          computedPropagatedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists (lib.reverseList propagatedDependencies')));
-        in
-        {
-          builder = attrs.realBuilder or shell;
-          args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
-          stdenv = result;
-          system = result.system;
-          userHook = config.stdenv.userHook or null;
-          __ignoreNulls = true;
-
-          nativeBuildInputs = lib.elemAt dependencies' 0;
-          buildInputs = lib.elemAt dependencies' 1;
-
-          propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0;
-          propagatedBuildInputs = lib.elemAt propagatedDependencies' 1;
-        } // ifDarwin {
-          # TODO: remove lib.unique once nix has a list canonicalization primitive
-          __sandboxProfile =
-          let profiles = [ extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];
-              final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles));
-          in final;
-          __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]);
-          __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [
-            "/dev/zero"
-            "/dev/random"
-            "/dev/urandom"
-            "/bin/sh"
-          ];
-          __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
-        } // (if outputs' != [ "out" ] then {
-          outputs = outputs';
-        } else { }));
-
-      # The meta attribute is passed in the resulting attribute set,
-      # but it's not part of the actual derivation, i.e., it's not
-      # passed to the builder and is not a dependency.  But since we
-      # include it in the result, it *is* available to nix-env for queries.
-      meta = { }
-          # If the packager hasn't specified `outputsToInstall`, choose a default,
-          # which is the name of `p.bin or p.out or p`;
-          # if he has specified it, it will be overridden below in `// meta`.
-          #   Note: This default probably shouldn't be globally configurable.
-          #   Services and users should specify outputs explicitly,
-          #   unless they are comfortable with this default.
-        // { outputsToInstall =
-          let
-            outs = outputs'; # the value passed to derivation primitive
-            hasOutput = out: builtins.elem out outs;
-          in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )];
-        }
-        // attrs.meta or {}
-          # Fill `meta.position` to identify the source location of the package.
-        // lib.optionalAttrs (pos != null)
-          { position = pos.file + ":" + toString pos.line; }
-        ;
-
-    in
-
-      lib.addPassthru
-        (derivation (import ./check-meta.nix
-          {
-            inherit lib config meta derivationArg;
-            mkDerivationArg = attrs;
-            inherit system; # TODO: cross-compilation?
-          }))
-        ( {
-            overrideAttrs = f: mkDerivation (attrs // (f attrs));
-            inherit meta passthru;
-          } //
-          # Pass through extra attributes that are not inputs, but
-          # should be made available to Nix expressions using the
-          # derivation (e.g., in assertions).
-          passthru);
-
   # The stdenv that we are producing.
-  result =
+  stdenv =
     derivation (
     (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
     {
@@ -206,7 +59,7 @@ let
 
       inherit preHook initialPath shell defaultNativeBuildInputs;
     }
-    // ifDarwin {
+    // lib.optionalAttrs hostPlatform.isDarwin {
       __sandboxProfile = stdenvSandboxProfile;
       __impureHostDeps = __stdenvImpureHostDeps;
     })
@@ -228,7 +81,15 @@ let
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;
 
-      inherit mkDerivation;
+      inherit (import ./make-derivation.nix {
+        inherit lib config stdenv;
+        # TODO(@Ericson2314): Remove
+        inherit
+          extraBuildInputs
+          __extraImpureHostDeps
+          extraSandboxProfile
+          hostPlatform targetPlatform;
+      }) mkDerivation;
 
       # For convenience, bring in the library functions in lib/ so
       # packages don't have to do that themselves.
@@ -247,4 +108,4 @@ let
     # like curl = if stdenv ? curl then stdenv.curl else ...).
     // extraAttrs;
 
-in result)
+in stdenv)
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
new file mode 100644
index 00000000000..92d5d2a3d9d
--- /dev/null
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -0,0 +1,155 @@
+{ lib, config, stdenv
+
+# TODO(@Ericson2314): get off stdenv
+, extraBuildInputs
+, __extraImpureHostDeps
+, extraSandboxProfile
+, hostPlatform, targetPlatform
+}:
+
+rec {
+  # `mkDerivation` wraps the builtin `derivation` function to
+  # produce derivations that use this stdenv and its shell.
+  #
+  # See also:
+  #
+  # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv
+  #   Details on how to use this mkDerivation function
+  #
+  # * https://nixos.org/nix/manual/#ssec-derivation
+  #   Explanation about derivations in general
+  mkDerivation =
+    { nativeBuildInputs ? []
+    , buildInputs ? []
+
+    , propagatedNativeBuildInputs ? []
+    , propagatedBuildInputs ? []
+
+    , crossConfig ? null
+    , meta ? {}
+    , passthru ? {}
+    , pos ? # position used in error messages and for meta.position
+        (if attrs.meta.description or null != null
+          then builtins.unsafeGetAttrPos "description" attrs.meta
+          else builtins.unsafeGetAttrPos "name" attrs)
+    , separateDebugInfo ? false
+    , outputs ? [ "out" ]
+    , __impureHostDeps ? []
+    , __propagatedImpureHostDeps ? []
+    , sandboxProfile ? ""
+    , propagatedSandboxProfile ? ""
+    , ... } @ attrs:
+    let
+      dependencies = [
+        (map (drv: drv.nativeDrv or drv) nativeBuildInputs)
+        (map (drv: drv.crossDrv or drv) buildInputs)
+      ];
+      propagatedDependencies = [
+        (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)
+        (map (drv: drv.crossDrv or drv) propagatedBuildInputs)
+      ];
+    in let
+
+      outputs' =
+        outputs ++
+        (if separateDebugInfo then assert targetPlatform.isLinux; [ "debug" ] else []);
+
+      dependencies' = let
+          justMap = map lib.chooseDevOutputs dependencies;
+          nativeBuildInputs = lib.elemAt justMap 0
+            ++ lib.optional targetPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh;
+          buildInputs = lib.elemAt justMap 1
+               # TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`.
+            ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh;
+        in [ nativeBuildInputs buildInputs ];
+
+      propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies;
+
+      derivationArg =
+        (removeAttrs attrs
+          ["meta" "passthru" "crossAttrs" "pos"
+           "__impureHostDeps" "__propagatedImpureHostDeps"
+           "sandboxProfile" "propagatedSandboxProfile"])
+        // (let
+          # TODO(@Ericson2314): Reversing of dep lists is just temporary to avoid Darwin mass rebuild.
+          computedSandboxProfile =
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'));
+          computedPropagatedSandboxProfile =
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists (lib.reverseList propagatedDependencies'));
+          computedImpureHostDeps =
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')));
+          computedPropagatedImpureHostDeps =
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists (lib.reverseList propagatedDependencies')));
+        in
+        {
+          builder = attrs.realBuilder or stdenv.shell;
+          args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
+          inherit stdenv;
+          system = stdenv.system; # TODO(@Ericson2314): be correct about cross compilation
+          userHook = config.stdenv.userHook or null;
+          __ignoreNulls = true;
+
+          nativeBuildInputs = lib.elemAt dependencies' 0;
+          buildInputs = lib.elemAt dependencies' 1;
+
+          propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0;
+          propagatedBuildInputs = lib.elemAt propagatedDependencies' 1;
+        } // lib.optionalAttrs (hostPlatform.isDarwin) {
+          # TODO: remove lib.unique once nix has a list canonicalization primitive
+          __sandboxProfile =
+          let profiles = [ extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];
+              final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles));
+          in final;
+          __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]);
+          __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [
+            "/dev/zero"
+            "/dev/random"
+            "/dev/urandom"
+            "/bin/sh"
+          ];
+          __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
+        } // (if outputs' != [ "out" ] then {
+          outputs = outputs';
+        } else { }));
+
+      # The meta attribute is passed in the resulting attribute set,
+      # but it's not part of the actual derivation, i.e., it's not
+      # passed to the builder and is not a dependency.  But since we
+      # include it in the result, it *is* available to nix-env for queries.
+      meta = { }
+          # If the packager hasn't specified `outputsToInstall`, choose a default,
+          # which is the name of `p.bin or p.out or p`;
+          # if he has specified it, it will be overridden below in `// meta`.
+          #   Note: This default probably shouldn't be globally configurable.
+          #   Services and users should specify outputs explicitly,
+          #   unless they are comfortable with this default.
+        // { outputsToInstall =
+          let
+            outs = outputs'; # the value passed to derivation primitive
+            hasOutput = out: builtins.elem out outs;
+          in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )];
+        }
+        // attrs.meta or {}
+          # Fill `meta.position` to identify the source location of the package.
+        // lib.optionalAttrs (pos != null)
+          { position = pos.file + ":" + toString pos.line; }
+        ;
+
+    in
+
+      lib.addPassthru
+        (derivation (import ./check-meta.nix
+          {
+            inherit lib config meta derivationArg;
+            mkDerivationArg = attrs;
+            inherit (stdenv) system; # TODO: cross-compilation?
+          }))
+        ( {
+            overrideAttrs = f: mkDerivation (attrs // (f attrs));
+            inherit meta passthru;
+          } //
+          # Pass through extra attributes that are not inputs, but
+          # should be made available to Nix expressions using the
+          # derivation (e.g., in assertions).
+          passthru);
+}

From afc20239939829490e2d7a3beb7028b7c1dcc803 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 5 Jul 2017 19:58:24 -0400
Subject: [PATCH 0228/3246] stdenv: Have mkDerivation pull the "extra"
 arguments from stdenv instead

Something more elaborate is needed for the "*Platform" arguments.
---
 pkgs/stdenv/generic/default.nix         |  5 ++---
 pkgs/stdenv/generic/make-derivation.nix | 11 ++++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 1d4425f9c78..d7b736a12e5 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -71,6 +71,8 @@ let
         platforms = lib.platforms.all;
       };
 
+      inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile;
+
       # Utility flags to test the type of platform.
       inherit (hostPlatform)
         isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
@@ -85,9 +87,6 @@ let
         inherit lib config stdenv;
         # TODO(@Ericson2314): Remove
         inherit
-          extraBuildInputs
-          __extraImpureHostDeps
-          extraSandboxProfile
           hostPlatform targetPlatform;
       }) mkDerivation;
 
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 92d5d2a3d9d..ec48e537413 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -1,9 +1,6 @@
 { lib, config, stdenv
 
 # TODO(@Ericson2314): get off stdenv
-, extraBuildInputs
-, __extraImpureHostDeps
-, extraSandboxProfile
 , hostPlatform, targetPlatform
 }:
 
@@ -73,11 +70,11 @@ rec {
         // (let
           # TODO(@Ericson2314): Reversing of dep lists is just temporary to avoid Darwin mass rebuild.
           computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'));
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'));
           computedPropagatedSandboxProfile =
             lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists (lib.reverseList propagatedDependencies'));
           computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')));
           computedPropagatedImpureHostDeps =
             lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists (lib.reverseList propagatedDependencies')));
         in
@@ -97,11 +94,11 @@ rec {
         } // lib.optionalAttrs (hostPlatform.isDarwin) {
           # TODO: remove lib.unique once nix has a list canonicalization primitive
           __sandboxProfile =
-          let profiles = [ extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];
+          let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];
               final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles));
           in final;
           __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]);
-          __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [
+          __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ stdenv.__extraImpureHostDeps ++ [
             "/dev/zero"
             "/dev/random"
             "/dev/urandom"

From e08e354e0405ffec2159331282cff68be30dd515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 7 Jul 2017 18:23:43 +0200
Subject: [PATCH 0229/3246] luajit: revert to 2.1 on aarch64 for now

https://nix-cache.s3.amazonaws.com/log/irncmyl5d6h21jzg5rm10q8s2sxqirmv-luajit-2.0.5.drv
It's hard to debug for me, without an aarch64 machine.
---
 pkgs/development/interpreters/luajit/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 59ddfde08ae..a754e2c4347 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -4,7 +4,8 @@ rec {
   luajit =
     # Compatibility problems with lightuserdata pointers; see:
     # https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L101
-    if hostPlatform.is64bit && (hostPlatform.isArm || hostPlatform.isSunOS)
+    if hostPlatform.is64bit && (/*hostPlatform.isArm ||*/ hostPlatform.isSunOS)
+        # FIXME: fix the aarch64 build
       then luajit_2_0
       else luajit_2_1;
 

From bdabf6a6f2d6652aa5329b0a76e2972dd80c204d Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Wed, 28 Jun 2017 19:20:02 -0400
Subject: [PATCH 0230/3246] pythonPackages.mechanize: 0.2.5 -> 0.3.5

---
 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 5fc8e228dd9..1ad11bbd4cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13512,15 +13512,15 @@ in {
   mccabe = callPackage ../development/python-modules/mccabe { };
 
   mechanize = buildPythonPackage (rec {
-    name = "mechanize-0.2.5";
+    name = "mechanize-0.3.5";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/m/mechanize/${name}.tar.gz";
-      sha256 = "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf";
+      sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl";
     };
 
-    propagatedBuildInputs = with self; [ clientform ];
+    propagatedBuildInputs = with self; [ clientform html5lib ];
 
     doCheck = false;
 

From ff5423cdca4adc5a18463be1aa1dd1603453c724 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 7 Jul 2017 18:35:50 +0200
Subject: [PATCH 0231/3246] calibre: use bundled html5lib

The bundled html5lib may be old and insecure, but that's all upstream
supports. Since dependencies are now requiring a newer html5lib we have
no choice but to let it use the bundled version.
---
 pkgs/applications/misc/calibre/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index f4cbc142d6b..37cb027aa36 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.1.1";
+  version = "3.3.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1lh1gz0915r49igfhy1icz79qx36s3d8m32qlih0g3zn7jahp86g";
+    sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
     # Remove unneeded files and libs
     rm -rf resources/calibre-portable.* \
-           src/{chardet,cherrypy,html5lib,odf,routes}
+           src/{chardet,cherrypy,odf,routes}
   '';
 
   dontUseQmakeConfigure = true;
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     python pyqt5 sip
     regex msgpack
     # the following are distributed with calibre, but we use upstream instead
-    chardet cherrypy html5lib_0_9999999 odfpy routes
+    chardet cherrypy odfpy routes
   ]);
 
   installPhase = ''

From 382285b34b20f578b4ca1af5ba243213f7f59394 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Fri, 7 Jul 2017 19:50:10 +0300
Subject: [PATCH 0232/3246] Fix homepage

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

diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix
index b1f33ff99cf..8b17da99b9a 100644
--- a/pkgs/servers/openpts/default.nix
+++ b/pkgs/servers/openpts/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "TCG Platform Trust Service (PTS)";
-    homepage = "ttp://sourceforge.jp/projects/openpts";
+    homepage = "http://sourceforge.jp/projects/openpts";
     license = stdenv.lib.licenses.cpl10;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];

From a302d7360f201cc4fcfb4a43a432b31536795507 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 5 Jul 2017 21:47:48 -0400
Subject: [PATCH 0233/3246] top-level: {build,host,target}Platform are defined
 in the stdenv instead

See #27069 for a discussion of this
---
 pkgs/build-support/cc-wrapper/default.nix |  5 ++-
 pkgs/stdenv/adapters.nix                  |  8 ++--
 pkgs/stdenv/cross/default.nix             | 11 ++----
 pkgs/stdenv/custom/default.nix            |  8 ++--
 pkgs/stdenv/darwin/default.nix            | 24 ++++--------
 pkgs/stdenv/freebsd/default.nix           | 14 ++++---
 pkgs/stdenv/generic/default.nix           | 45 ++++++++++++++++-------
 pkgs/stdenv/generic/make-derivation.nix   | 18 ++++-----
 pkgs/stdenv/linux/default.nix             | 24 ++++--------
 pkgs/stdenv/native/default.nix            |  9 +----
 pkgs/stdenv/nix/default.nix               |  7 ++--
 pkgs/top-level/stage.nix                  | 41 ++++-----------------
 12 files changed, 90 insertions(+), 124 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 935e6fb6267..e6576e5a389 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -10,7 +10,6 @@
 , zlib ? null, extraPackages ? [], extraBuildCommands ? ""
 , dyld ? null # TODO: should this be a setup-hook on dyld?
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
-, hostPlatform, targetPlatform
 , runCommand ? null
 }:
 
@@ -22,12 +21,14 @@ assert !nativeTools ->
 assert !(nativeLibc && noLibc);
 assert (noLibc || nativeLibc) == (libc == null);
 
-assert targetPlatform != hostPlatform -> runCommand != null;
+assert stdenv.targetPlatform != stdenv.hostPlatform -> runCommand != null;
 
 # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper.
 assert cc.langVhdl or false -> zlib != null;
 
 let
+  inherit (stdenv) hostPlatform targetPlatform;
+
   # Prefix for binaries. Customarily ends with a dash separator.
   #
   # TODO(@Ericson2314) Make unconditional, or optional but always true by
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 7515a72fcfd..5848ee87b1b 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -61,11 +61,9 @@ rec {
                     , buildPlatform, hostPlatform, targetPlatform
                     } @ overrideArgs: let
     stdenv = overrideArgs.stdenv.override {
-      # TODO(@Ericson2314): Cannot do this for now because then Nix thinks the
-      # resulting derivation should be built on the host platform.
-      #hostPlatform = buildPlatform;
-      #targetPlatform = hostPlatform;
-      inherit cc;
+      inherit
+        buildPlatform hostPlatform targetPlatform
+        cc;
 
       allowedRequisites = null;
 
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 125c4300975..c83714d01f2 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -14,21 +14,18 @@ in bootStages ++ [
 
   # Build Packages
   (vanillaPackages: {
-    buildPlatform = localSystem;
-    hostPlatform = localSystem;
-    targetPlatform = crossSystem;
     inherit config overlays;
     selfBuild = false;
+    stdenv =
+      assert vanillaPackages.hostPlatform == localSystem;
+      assert vanillaPackages.targetPlatform == localSystem;
+      vanillaPackages.stdenv.override { targetPlatform = crossSystem; };
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
-    inherit (vanillaPackages) stdenv;
   })
 
   # Run Packages
   (buildPackages: {
-    buildPlatform = localSystem;
-    hostPlatform = crossSystem;
-    targetPlatform = crossSystem;
     inherit config overlays;
     selfBuild = false;
     stdenv = buildPackages.makeStdenvCross {
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index d5dc977b37a..b6ea8685f8e 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -15,11 +15,11 @@ in bootStages ++ [
 
   # Additional stage, built using custom stdenv
   (vanillaPackages: {
-    buildPlatform = localSystem;
-    hostPlatform = localSystem;
-    targetPlatform = localSystem;
     inherit config overlays;
-    stdenv = config.replaceStdenv { pkgs = vanillaPackages; };
+    stdenv =
+      assert vanillaPackages.hostPlatform == localSystem;
+      assert vanillaPackages.targetPlatform == localSystem;
+      config.replaceStdenv { pkgs = vanillaPackages; };
   })
 
 ]
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 03a815109c2..0e68b5c8e12 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -65,6 +65,10 @@ in rec {
 
         name = "stdenv-darwin-boot-${toString step}";
 
+        buildPlatform = localSystem;
+        hostPlatform = localSystem;
+        targetPlatform = localSystem;
+
         cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {
           inherit shell;
           inherit (last) stdenv;
@@ -73,8 +77,6 @@ in rec {
           nativeTools  = true;
           nativePrefix = bootstrapTools;
           nativeLibc   = false;
-          hostPlatform = localSystem;
-          targetPlatform = localSystem;
           libc         = last.pkgs.darwin.Libsystem;
           isClang      = true;
           cc           = { name = "clang-9.9.9"; outPath = bootstrapTools; };
@@ -90,9 +92,6 @@ in rec {
         '';
         initialPath  = [ bootstrapTools ];
 
-        hostPlatform = localSystem;
-        targetPlatform = localSystem;
-
         fetchurlBoot = import ../../build-support/fetchurl {
           stdenv = stage0.stdenv;
           curl   = bootstrapTools;
@@ -107,9 +106,6 @@ in rec {
       };
 
     in {
-      buildPlatform = localSystem;
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
       inherit config overlays;
       stdenv = thisStdenv;
     };
@@ -279,6 +275,10 @@ in rec {
 
     name = "stdenv-darwin";
 
+    buildPlatform = localSystem;
+    hostPlatform = localSystem;
+    targetPlatform = localSystem;
+
     preHook = commonPreHook + ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
@@ -286,9 +286,6 @@ in rec {
     stdenvSandboxProfile = binShClosure + libSystemProfile;
     extraSandboxProfile  = binShClosure + libSystemProfile;
 
-    hostPlatform = localSystem;
-    targetPlatform = localSystem;
-
     initialPath = import ../common-path.nix { inherit pkgs; };
     shell       = "${pkgs.bash}/bin/bash";
 
@@ -297,8 +294,6 @@ in rec {
       inherit shell;
       nativeTools = false;
       nativeLibc  = false;
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
       inherit (pkgs) coreutils binutils gnugrep;
       inherit (pkgs.darwin) dyld;
       cc   = pkgs.llvmPackages.clang-unwrapped;
@@ -338,9 +333,6 @@ in rec {
     stage3
     stage4
     (prevStage: {
-      buildPlatform = localSystem;
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
       inherit config overlays;
       stdenv = stdenvDarwin prevStage;
     })
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 389a5b9985f..d15afe76189 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -35,6 +35,9 @@ let inherit (localSystem) system; in
 
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-1";
+      buildPlatform = localSystem;
+      hostPlatform = localSystem;
+      targetPlatform = localSystem;
       inherit config;
       initialPath = [ "/" "/usr" ];
       hostPlatform = localSystem;
@@ -52,6 +55,9 @@ let inherit (localSystem) system; in
 
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-0";
+      buildPlatform = localSystem;
+      hostPlatform = localSystem;
+      targetPlatform = localSystem;
       inherit config;
       initialPath = [ prevStage.bootstrapTools ];
       inherit (prevStage.stdenv)
@@ -62,12 +68,12 @@ let inherit (localSystem) system; in
   })
 
   (prevStage: {
-    buildPlatform = localSystem;
-    hostPlatform = localSystem;
-    targetPlatform = localSystem;
     inherit config overlays;
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-3";
+      buildPlatform = localSystem;
+      hostPlatform = localSystem;
+      targetPlatform = localSystem;
       inherit config;
 
       inherit (prevStage.stdenv)
@@ -77,8 +83,6 @@ let inherit (localSystem) system; in
         nativeTools  = true;
         nativePrefix = "/usr";
         nativeLibc   = true;
-        hostPlatform = localSystem;
-        targetPlatform = localSystem;
         inherit (prevStage) stdenv;
         cc           = {
           name    = "clang-9.9.9";
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index d7b736a12e5..a5d3c5a8ff5 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -15,18 +15,32 @@ let lib = import ../../../lib; in lib.makeOverridable (
 , stdenvSandboxProfile ? ""
 , extraSandboxProfile ? ""
 
-, # The platforms here do *not* correspond to the stage the stdenv is
-  # used in, but rather the previous one, in which it was built. We
-  # use the latter two platforms, like a cross compiler, because the
-  # stand environment is a build tool if you squint at it, and because
-  # neither of these are used when building stdenv so we know the
-  # build platform is irrelevant.
-  hostPlatform, targetPlatform
+  ## Platform parameters
+  ##
+  ## The "build" "host" "target" terminology below comes from GNU Autotools. See
+  ## its documentation for more information on what those words mean. Note that
+  ## each should always be defined, even when not cross compiling.
+  ##
+  ## For purposes of bootstrapping, think of each stage as a "sliding window"
+  ## over a list of platforms. Specifically, the host platform of the previous
+  ## stage becomes the build platform of the current one, and likewise the
+  ## target platform of the previous stage becomes the host platform of the
+  ## current one.
+  ##
+
+, # The platform on which packages are built. Consists of `system`, a
+  # string (e.g.,`i686-linux') identifying the most import attributes of the
+  # build platform, and `platform` a set of other details.
+  buildPlatform
+
+, # The platform on which packages run.
+  hostPlatform
+
+, # The platform which build tools (especially compilers) build for in this stage,
+  targetPlatform
 }:
 
 let
-  inherit (targetPlatform) system;
-
   defaultNativeBuildInputs = extraBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
@@ -49,7 +63,11 @@ let
     derivation (
     (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
     {
-      inherit system name;
+      inherit name;
+
+      # Nix itself uses the `system` field of a derivation to decide where to
+      # build it. This is a bit confusing for cross compilation.
+      inherit (buildPlatform) system;
 
       builder = shell;
 
@@ -59,7 +77,7 @@ let
 
       inherit preHook initialPath shell defaultNativeBuildInputs;
     }
-    // lib.optionalAttrs hostPlatform.isDarwin {
+    // lib.optionalAttrs buildPlatform.isDarwin {
       __sandboxProfile = stdenvSandboxProfile;
       __impureHostDeps = __stdenvImpureHostDeps;
     })
@@ -71,6 +89,8 @@ let
         platforms = lib.platforms.all;
       };
 
+      inherit buildPlatform hostPlatform targetPlatform;
+
       inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile;
 
       # Utility flags to test the type of platform.
@@ -85,9 +105,6 @@ let
 
       inherit (import ./make-derivation.nix {
         inherit lib config stdenv;
-        # TODO(@Ericson2314): Remove
-        inherit
-          hostPlatform targetPlatform;
       }) mkDerivation;
 
       # For convenience, bring in the library functions in lib/ so
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index ec48e537413..31b0428eeb2 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -1,8 +1,4 @@
-{ lib, config, stdenv
-
-# TODO(@Ericson2314): get off stdenv
-, hostPlatform, targetPlatform
-}:
+{ lib, config, stdenv }:
 
 rec {
   # `mkDerivation` wraps the builtin `derivation` function to
@@ -49,12 +45,12 @@ rec {
 
       outputs' =
         outputs ++
-        (if separateDebugInfo then assert targetPlatform.isLinux; [ "debug" ] else []);
+        (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []);
 
       dependencies' = let
           justMap = map lib.chooseDevOutputs dependencies;
           nativeBuildInputs = lib.elemAt justMap 0
-            ++ lib.optional targetPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh;
+            ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh;
           buildInputs = lib.elemAt justMap 1
                # TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`.
             ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh;
@@ -82,7 +78,7 @@ rec {
           builder = attrs.realBuilder or stdenv.shell;
           args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
           inherit stdenv;
-          system = stdenv.system; # TODO(@Ericson2314): be correct about cross compilation
+          inherit (stdenv) system;
           userHook = config.stdenv.userHook or null;
           __ignoreNulls = true;
 
@@ -91,7 +87,7 @@ rec {
 
           propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0;
           propagatedBuildInputs = lib.elemAt propagatedDependencies' 1;
-        } // lib.optionalAttrs (hostPlatform.isDarwin) {
+        } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
           # TODO: remove lib.unique once nix has a list canonicalization primitive
           __sandboxProfile =
           let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];
@@ -139,7 +135,9 @@ rec {
           {
             inherit lib config meta derivationArg;
             mkDerivationArg = attrs;
-            inherit (stdenv) system; # TODO: cross-compilation?
+            # Nix itself uses the `system` field of a derivation to decide where
+            # to build it. This is a bit confusing for cross compilation.
+            inherit (stdenv) system;
           }))
         ( {
             overrideAttrs = f: mkDerivation (attrs // (f attrs));
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index b116a48a2bd..a27aca771ab 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -52,8 +52,11 @@ let
     let
 
       thisStdenv = import ../generic {
-        inherit config extraBuildInputs;
         name = "stdenv-linux-boot";
+        buildPlatform = localSystem;
+        hostPlatform = localSystem;
+        targetPlatform = localSystem;
+        inherit config extraBuildInputs;
         preHook =
           ''
             # Don't patch #!/interpreter because it leads to retained
@@ -64,9 +67,6 @@ let
         shell = "${bootstrapTools}/bin/bash";
         initialPath = [bootstrapTools];
 
-        hostPlatform = localSystem;
-        targetPlatform = localSystem;
-
         fetchurlBoot = import ../../build-support/fetchurl/boot.nix {
           inherit system;
         };
@@ -76,8 +76,6 @@ let
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
           nativeTools = false;
           nativeLibc = false;
-          hostPlatform = localSystem;
-          targetPlatform = localSystem;
           cc = prevStage.gcc-unwrapped;
           isGNU = true;
           libc = prevStage.glibc;
@@ -99,9 +97,6 @@ let
       };
 
     in {
-      buildPlatform = localSystem;
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
       inherit config overlays;
       stdenv = thisStdenv;
     };
@@ -241,8 +236,6 @@ in
         nativeTools = false;
         nativeLibc = false;
         isGNU = true;
-        hostPlatform = localSystem;
-        targetPlatform = localSystem;
         cc = prevStage.gcc-unwrapped;
         libc = self.glibc;
         inherit (self) stdenv binutils coreutils gnugrep;
@@ -263,11 +256,11 @@ in
   # dependency (`nix-store -qR') on bootstrapTools or the first
   # binutils built.
   (prevStage: {
-    buildPlatform = localSystem;
-    hostPlatform = localSystem;
-    targetPlatform = localSystem;
     inherit config overlays;
     stdenv = import ../generic rec {
+      buildPlatform = localSystem;
+      hostPlatform = localSystem;
+      targetPlatform = localSystem;
       inherit config;
 
       preHook = ''
@@ -280,9 +273,6 @@ in
       initialPath =
         ((import ../common-path.nix) {pkgs = prevStage;});
 
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
-
       extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
         # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
         lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 31973c2cdc5..02734f2f3e5 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -81,6 +81,7 @@ let
     { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }:
 
     import ../generic {
+      buildPlatform = localSystem;
       hostPlatform = localSystem;
       targetPlatform = localSystem;
 
@@ -125,8 +126,6 @@ in
         "i686-solaris" = "/usr/gnu";
         "x86_64-solaris" = "/opt/local/gcc47";
       }.${system} or "/usr";
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
       inherit stdenv;
     };
 
@@ -140,9 +139,6 @@ in
 
   # First build a stdenv based only on tools outside the store.
   (prevStage: {
-    buildPlatform = localSystem;
-    hostPlatform = localSystem;
-    targetPlatform = localSystem;
     inherit config overlays;
     stdenv = makeStdenv {
       inherit (prevStage) cc fetchurl;
@@ -152,9 +148,6 @@ 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: {
-    buildPlatform = localSystem;
-    hostPlatform = localSystem;
-    targetPlatform = localSystem;
     inherit config overlays;
     stdenv = makeStdenv {
       inherit (prevStage.stdenv) cc fetchurl;
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 7ab797ce91b..aaf6c523ea4 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -10,10 +10,13 @@ bootStages ++ [
   (prevStage: let
     inherit (prevStage) stdenv;
   in {
-    inherit (prevStage) buildPlatform hostPlatform targetPlatform;
     inherit config overlays;
 
     stdenv = import ../generic rec {
+      buildPlatform = localSystem;
+      hostPlatform = localSystem;
+      targetPlatform = localSystem;
+
       inherit config;
 
       preHook = ''
@@ -30,8 +33,6 @@ bootStages ++ [
         nativeTools = false;
         nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr";
         nativeLibc = true;
-        hostPlatform = localSystem;
-        targetPlatform = localSystem;
         inherit stdenv;
         inherit (prevStage) binutils coreutils gnugrep;
         cc = prevStage.gcc.cc;
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 2a8f4ff4b3c..617fa0c30ce 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -18,30 +18,6 @@
 , # Use to reevaluate Nixpkgs; a dirty hack that should be removed
   nixpkgsFun
 
-  ## Platform parameters
-  ##
-  ## The "build" "host" "target" terminology below comes from GNU Autotools. See
-  ## its documentation for more information on what those words mean. Note that
-  ## each should always be defined, even when not cross compiling.
-  ##
-  ## For purposes of bootstrapping, think of each stage as a "sliding window"
-  ## over a list of platforms. Specifically, the host platform of the previous
-  ## stage becomes the build platform of the current one, and likewise the
-  ## target platform of the previous stage becomes the host platform of the
-  ## current one.
-  ##
-
-, # The platform on which packages are built. Consists of `system`, a
-  # string (e.g.,`i686-linux') identifying the most import attributes of the
-  # build platform, and `platform` a set of other details.
-  buildPlatform
-
-, # The platform on which packages run.
-  hostPlatform
-
-, # The platform which build tools (especially compilers) build for in this stage,
-  targetPlatform
-
   ## Other parameters
   ##
 
@@ -69,10 +45,10 @@
 , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc
   # outside of the store.  Thus, GCC, GFortran, & co. must always look for files
   # in standard system directories (/usr/include, etc.)
-  noSysDirs ? buildPlatform.system != "x86_64-freebsd"
-           && buildPlatform.system != "i686-freebsd"
-           && buildPlatform.system != "x86_64-solaris"
-           && buildPlatform.system != "x86_64-kfreebsd-gnu"
+  noSysDirs ? stdenv.buildPlatform.system != "x86_64-freebsd"
+           && stdenv.buildPlatform.system != "i686-freebsd"
+           && stdenv.buildPlatform.system != "x86_64-solaris"
+           && stdenv.buildPlatform.system != "x86_64-kfreebsd-gnu"
 
 , # The configuration attribute set
   config
@@ -98,19 +74,18 @@ let
       // { recurseForDerivations = false; };
     __targetPackages = (if __targetPackages == null then self else __targetPackages)
       // { recurseForDerivations = false; };
-    inherit stdenv
-      buildPlatform hostPlatform targetPlatform;
+    inherit stdenv;
   };
 
   # The old identifiers for cross-compiling. These should eventually be removed,
   # and the packages that rely on them refactored accordingly.
   platformCompat = self: super: let
-    # TODO(@Ericson2314) this causes infinite recursion
-    #inherit (self) buildPlatform hostPlatform targetPlatform;
+    inherit (super.stdenv) buildPlatform hostPlatform targetPlatform;
   in {
     stdenv = super.stdenv // {
-      inherit (buildPlatform) platform;
+      inherit (super.stdenv.buildPlatform) platform;
     };
+    inherit buildPlatform hostPlatform targetPlatform;
     inherit (buildPlatform) system platform;
   };
 

From 9dc2a3aeba864f0fd989e50344500a94df0efc1f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 7 Jul 2017 13:24:33 -0400
Subject: [PATCH 0234/3246] doc: Update cross compilation chapter for
 stdenv.{build,host,target}Platform

---
 doc/cross-compilation.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 650db718665..77d020afa2d 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -37,8 +37,9 @@
     </para>
     <para>
       In Nixpkgs, these three platforms are defined as attribute sets under the names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal>.
-      All three are always defined at the top level, so one can get at them just like a dependency in a function that is imported with <literal>callPackage</literal>:
-      <programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...</programlisting>
+      All three are always defined as attributes in the standard environment, and at the top level. That means one can get at them just like a dependency in a function that is imported with <literal>callPackage</literal>:
+      <programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>, or just off <varname>stdenv</varname>:
+      <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>.
     </para>
     <variablelist>
       <varlistentry>

From 9932ecea90cb51b4a19081d8bf1dac2bcd92ef70 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Fri, 7 Jul 2017 11:20:19 -0800
Subject: [PATCH 0235/3246] qsyncthingtray: 0.5.7 -> 0.5.8

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

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 671370252a7..e8ab85121da 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -5,14 +5,14 @@
 , preferQWebView ? false }:
 
 mkDerivation rec {
-  version = "0.5.7";
+  version = "0.5.8";
   name = "qsyncthingtray-${version}";
 
   src = fetchFromGitHub {
     owner  = "sieren";
     repo   = "QSyncthingTray";
     rev    = "${version}";
-    sha256 = "0crrdpdmlc4ahkvp5znzc4zhfwsdih655q1kfjf0g231mmynxhvq";
+    sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w";
   };
 
   buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit;

From 6cbd9ce8f9e0ca111a99a8f57adb7a8ba6cd957d Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Fri, 7 Jul 2017 12:54:32 -0700
Subject: [PATCH 0236/3246] Fix license reference for added libpoly library.

---
 pkgs/applications/science/logic/poly/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix
index f573f0c15b4..2fdbd87a275 100644
--- a/pkgs/applications/science/logic/poly/default.nix
+++ b/pkgs/applications/science/logic/poly/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = https://github.com/SRI-CSL/libpoly;
     description = "C library for manipulating polynomials";
-    license = licenses.gplv3;
+    license = licenses.lgpl3;
     platforms = platforms.all;
   };
 }

From f71d556e187b4de3b4fbc8adc8e0ec6c53868094 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Tue, 30 May 2017 22:55:03 +0200
Subject: [PATCH 0237/3246] mysql service: add changelog for changed dataDir

---
 nixos/doc/manual/release-notes/rl-1709.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 34cfe1702e9..3ae2d260c99 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -85,6 +85,10 @@ rmdir /var/lib/ipfs/.ipfs
     </para>
   </listitem>
   <listitem>
+    <para>
+      The following changes apply if the <literal>stateVersion</literal> is changed to 17.09 or higher.
+      For <literal>stateVersion = "17.03</literal> or lower the old behavior is preserved.
+    </para>
     <para>
       The <literal>postgres</literal> default version was changed from 9.5 to 9.6.
     </para>
@@ -94,6 +98,9 @@ rmdir /var/lib/ipfs/.ipfs
     <para>
       The <literal>postgres</literal> default <literal>dataDir</literal> has changed from <literal>/var/db/postgres</literal> to <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is 9.6 for example.
     </para>
+    <para>
+      The <literal>mysql</literal> default <literal>dataDir</literal> has changed from <literal>/var/mysql</literal> to <literal>/var/lib/mysql</literal>.
+    </para>
   </listitem>
   <listitem>
     <para>
@@ -115,7 +122,6 @@ rmdir /var/lib/ipfs/.ipfs
   </listitem>
 </itemizedlist>
 
-
 <para>Other notable improvements:</para>
 
 <itemizedlist>

From f65b55d7ce760a3c9957cc3da1127c1f8fe8e33c Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Sat, 8 Jul 2017 00:35:49 +0200
Subject: [PATCH 0238/3246] go_1_6: Fix darwin (sierra) compile, backport
 systime syscall fix

This patches go1.6 minimally with a change that was backported
to upstream go1.4.
---
 pkgs/development/compilers/go/1.6.nix         |  1 +
 .../compilers/go/fix-systime-1.6.patch        | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/compilers/go/fix-systime-1.6.patch

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 4a777d7b4f1..61408c0ebb3 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -113,6 +113,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./remove-tools-1.5.patch
     ./creds-test.patch
+    ./fix-systime-1.6.patch
 
     # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
     # actually works on old versions too.
diff --git a/pkgs/development/compilers/go/fix-systime-1.6.patch b/pkgs/development/compilers/go/fix-systime-1.6.patch
new file mode 100644
index 00000000000..e4a3932001e
--- /dev/null
+++ b/pkgs/development/compilers/go/fix-systime-1.6.patch
@@ -0,0 +1,45 @@
+diff --git a/src/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s
+index e09b906ba5..fa8ff2f65c 100644
+--- a/src/runtime/sys_darwin_amd64.s
++++ b/src/runtime/sys_darwin_amd64.s
+@@ -157,6 +157,7 @@ systime:
+ 	// Fall back to system call (usually first call in this thread).
+ 	MOVQ	SP, DI
+ 	MOVQ	$0, SI
++	MOVQ	$0, DX  // required as of Sierra; Issue 16570
+ 	MOVL	$(0x2000000+116), AX
+ 	SYSCALL
+ 	CMPQ	AX, $0
+diff --git a/src/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go
+index 70b53b87f4..79083117b6 100644
+--- a/src/syscall/syscall_darwin_amd64.go
++++ b/src/syscall/syscall_darwin_amd64.go
+@@ -26,14 +26,21 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
+ }
+ 
+ //sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
+-func Gettimeofday(tv *Timeval) (err error) {
+-	// The tv passed to gettimeofday must be non-nil
+-	// but is otherwise unused.  The answers come back
+-	// in the two registers.
++func Gettimeofday(tv *Timeval) error {
++	// The tv passed to gettimeofday must be non-nil.
++	// Before macOS Sierra (10.12), tv was otherwise unused and
++	// the answers came back in the two registers.
++	// As of Sierra, gettimeofday return zeros and populates
++	// tv itself.
+ 	sec, usec, err := gettimeofday(tv)
+-	tv.Sec = sec
+-	tv.Usec = usec
+-	return err
++	if err != nil {
++		return err
++	}
++	if sec != 0 || usec != 0 {
++		tv.Sec = sec
++		tv.Usec = usec
++	}
++	return nil
+ }
+ 
+ func SetKevent(k *Kevent_t, fd, mode, flags int) {

From 1a7d9f573b6c8f763461a6166cb629968fe33301 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 7 Jul 2017 19:52:57 -0400
Subject: [PATCH 0239/3246] gradle: 4.0 -> 4.0.1

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 460c6d44e4e..24897232fbc 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-4.0";
+    name = "gradle-4.0.1";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "1zlxnyb7iva0bb0862vbigfjrmxgbisa2zam7j896ams57g2vgan";
+      sha256 = "1m2gnh1vs3f5acdqcxmc8d0pi65bzm3v1nliz29rhdfi01if85yp";
     };
   };
 

From cca61e0371fd1d0293d9c4dfcac05402da1f5e77 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 8 Jul 2017 04:27:18 +0200
Subject: [PATCH 0240/3246] fish-foreign-env: hide warnings when setting PATH

---
 pkgs/shells/fish-foreign-env/default.nix         |  6 ++++--
 .../fish-foreign-env/hide-path-warnings.patch    | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/shells/fish-foreign-env/hide-path-warnings.patch

diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish-foreign-env/default.nix
index 477c103c095..76a979bcda1 100644
--- a/pkgs/shells/fish-foreign-env/default.nix
+++ b/pkgs/shells/fish-foreign-env/default.nix
@@ -11,15 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl";
   };
 
-  buildCommand = ''
+  installPhase = ''
     mkdir -p $out/share/fish-foreign-env/functions/
-    cp $src/functions/* $out/share/fish-foreign-env/functions/
+    cp functions/* $out/share/fish-foreign-env/functions/
     sed -e "s|sed|${gnused}/bin/sed|" \
         -e "s|bash|${bash}/bin/bash|" \
         -e "s|\| tr|\| ${coreutils}/bin/tr|" \
         -i $out/share/fish-foreign-env/functions/*
   '';
 
+  patches = [ ./hide-path-warnings.patch ];
+
   meta = with stdenv.lib; {
     description = "A foreign environment interface for Fish shell";
     license = licenses.mit;
diff --git a/pkgs/shells/fish-foreign-env/hide-path-warnings.patch b/pkgs/shells/fish-foreign-env/hide-path-warnings.patch
new file mode 100644
index 00000000000..b7ac4edc518
--- /dev/null
+++ b/pkgs/shells/fish-foreign-env/hide-path-warnings.patch
@@ -0,0 +1,16 @@
+diff --git a/functions/fenv.apply.fish b/functions/fenv.apply.fish
+index 34a25e3..6837e7f 100644
+--- a/functions/fenv.apply.fish
++++ b/functions/fenv.apply.fish
+@@ -30,8 +30,9 @@ function fenv.apply
+ 
+         if test "$key" = 'PATH'
+           set value (echo $value | tr ':' '\n')
++          set -g -x $key $value ^/dev/null
++        else
++          set -g -x $key $value
+         end
+-
+-        set -g -x $key $value
+     end
+ end

From f501db5573209c0589621cbdf7a2aa373c2a17c3 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sat, 8 Jul 2017 01:05:48 +0200
Subject: [PATCH 0241/3246] pqiv: 2.8.3 -> 2.9

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

diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index 2023d9486bd..7e375367a2d 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (rec {
   name = "pqiv-${version}";
-  version = "2.8.3";
+  version = "2.9";
 
   src = fetchFromGitHub {
     owner = "phillipberndt";
     repo = "pqiv";
     rev = version;
-    sha256 = "0fhmqa1q1y5y0ivrgx9xv864zqvd5dk4fiqi4bgi1ybdfx7vv2fy";
+    sha256 = "1xncf6aq52zpxpmz3ikmlkinz7y3nmbpgfxjb7q40sqs00n0mfsd";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 59ad9714f6887c317232fca9d01fc1ca6971e67d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 07:03:17 +0200
Subject: [PATCH 0242/3246] mono: 5.0.0.48 -> 5.0.1.1

---
 pkgs/development/compilers/mono/5.0.nix           | 4 ++--
 pkgs/development/compilers/mono/generic-cmake.nix | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix
index e51bbc0c308..911ba0ae02a 100644
--- a/pkgs/development/compilers/mono/5.0.nix
+++ b/pkgs/development/compilers/mono/5.0.nix
@@ -2,6 +2,6 @@
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
-  version = "5.0.0.48";
-  sha256 = "13n20wmijkhd7vm41lzz1n774rna67d94prl33bz1lly0idsciq0";
+  version = "5.0.1.1";
+  sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8";
 })
diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix
index ab232f07d1b..f6e3f5a0100 100644
--- a/pkgs/development/compilers/mono/generic-cmake.nix
+++ b/pkgs/development/compilers/mono/generic-cmake.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   configurePhase = ''
-    substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}"
+    patchShebangs ./
     ./autogen.sh --prefix $out
   '';
 
@@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
   # LLVM path to point into the Mono LLVM build, since it's private anyway.
   preBuild = ''
     makeFlagsArray=(INSTALL=`type -tp install`)
-    patchShebangs ./
     substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share"
   '' + stdenv.lib.optionalString withLLVM ''
     substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"

From 43b2b55743cb0505fe80dd767d768fc411f2852c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 04:11:28 +0000
Subject: [PATCH 0243/3246] hol_light: 2016-07-23 -> 2017-07-06

---
 .../science/logic/hol_light/Makefile.patch       | 13 -------------
 .../science/logic/hol_light/default.nix          | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/hol_light/Makefile.patch

diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch
deleted file mode 100644
index 5c1ec4f7aaf..00000000000
--- a/pkgs/applications/science/logic/hol_light/Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Makefile
-===================================================================
---- a/Makefile	(révision 199)
-+++ b/Makefile	(copie de travail)
-@@ -59,7 +59,7 @@
-              then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \
-              else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \
-                   then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \
--                  else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" ; \
-+                  else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" -o ${CAMLP5_VERSION} = "6.17" ; \
-                        then cp pa_j_3.1x_6.11.ml pa_j.ml; \
-                        else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \
-                        fi \
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index fbd732595e6..8d7c11ee91b 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, writeScript, ocaml, camlp5 }:
+{ stdenv, fetchFromGitHub, fetchpatch, writeScript, ocaml, camlp5 }:
 
 let
   start_script = ''
@@ -9,18 +9,24 @@ let
 in
 
 stdenv.mkDerivation {
-  name     = "hol_light-2016-07-23";
+  name     = "hol_light-2017-07-06";
 
   src = fetchFromGitHub {
     owner  = "jrh13";
     repo   = "hol-light";
-    rev    = "67cff936dda719f0e0ee57ab9d07c779ff664660";
-    sha256 = "0r85ifdvsvk2cdv7s4a0kf9ha6jdznqmz7swvp577f8r182klr28";
+    rev    = "0ad8cbdb4de08a38dac600f352555e8454499faa";
+    sha256 = "0px9hl1b0mkyqv84j0si1zdq4066ffdrhzp27p2iah9l8ynbvpaq";
   };
 
   buildInputs = [ ocaml camlp5 ];
 
-  patches = [ ./Makefile.patch ];
+  patches = [ (fetchpatch {
+      url = https://github.com/girving/hol-light/commit/f80524bad61fd6f6facaa42153b2e29d1eab4658.patch;
+      sha256 = "1563wp597vakhmsgg8940dpirzzfvvxqp75x3dnx20rvmi2n2xw0";
+    })
+  ];
+
+  postPatch = "cp pa_j_3.1x_{6,7}.xx.ml";
 
   installPhase = ''
     mkdir -p "$out/lib/hol_light" "$out/bin"

From cacc9faac7418450d89912fa6f40ec45a45773a7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 04:20:11 +0000
Subject: [PATCH 0244/3246] camlPackages.camlp5: 6.17 -> 7.01

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

diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index bc98e6454d1..648ec965d35 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation {
 
-  name = "camlp5${if transitional then "_transitional" else ""}-6.17";
+  name = "camlp5${if transitional then "_transitional" else ""}-7.01";
 
   src = fetchzip {
-    url = https://github.com/camlp5/camlp5/archive/rel617.tar.gz;
-    sha256 = "0finmr6y0lyd7mnl61kmvwd32cmmf64m245vdh1iy0139rxf814c";
+    url = https://github.com/camlp5/camlp5/archive/rel701.tar.gz;
+    sha256 = "1gxhj7y30f1hbcqnqgg80wz0ymbslsfh09kl2kiackp49fywl606";
   };
 
   buildInputs = [ ocaml ];

From 4523f0251f888f1ad0d272da9c9ee9bb681d7193 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 06:23:59 +0000
Subject: [PATCH 0245/3246] ocamlPackages.bolt: fix for ocamlopt

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

diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix
index 5d1fe8aa0d1..fa9b353f4d6 100644
--- a/pkgs/development/ocaml-modules/bolt/default.nix
+++ b/pkgs/development/ocaml-modules/bolt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, which, camlp4 }:
+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast; in
 
@@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ocaml findlib ocamlbuild which camlp4 ];
 
-  patchPhase = ''
+  patches = [ (fetchpatch {
+      url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch;
+      sha256 = "08cl39r98w312sw23cskd5wian6zg20isn9ki41hnbcgkazhi7pb";
+    })
+  ];
+
+  postPatch = ''
     patch myocamlbuild.ml <<EOF
 70,74c70
 <         let camlp4of =

From eb2be6d97e30559dda2ae4855a5431db42d4e2fa Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 08:52:02 +0200
Subject: [PATCH 0246/3246] acgtk: 1.1 -> 1.3.1

---
 .../science/logic/acgtk/default.nix           | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ++++
 pkgs/top-level/ocaml-packages.nix             |  2 --
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index fa890c03b6f..9c8ecd01639 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -1,42 +1,42 @@
-{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4,
+{ stdenv, fetchurl, ocamlPackages,
   buildBytecode ? true,
   buildNative ? true,
   installExamples ? true,
   installEmacsMode ? true }:
 
-let inherit (stdenv.lib) getVersion versionAtLeast
+let inherit (stdenv.lib) versionAtLeast
                          optionals optionalString; in
 
-assert versionAtLeast (getVersion ocaml) "3.07";
-assert versionAtLeast (getVersion dypgen) "20080925";
-assert versionAtLeast (getVersion bolt) "1.4";
+let inherit (ocamlPackages) ocaml camlp4; in
 
 assert buildBytecode || buildNative;
 
 stdenv.mkDerivation {
 
-  name = "acgtk-1.1";
+  name = "acgtk-1.3.1";
 
   src = fetchurl {
-    url = "http://www.loria.fr/equipes/calligramme/acg/software/acg-1.1-20140905.tar.gz";
-    sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6";
+    url = http://calligramme.loria.fr/acg/software/acg-1.3.1-20170303.tar.gz;
+    sha256 = "1hhrf6bx2x2wbv5ldn4fnxhpr9lyrj3zh1vcnx8wf8f06ih4rzfq";
   };
 
-  buildInputs = [ ocaml findlib dypgen bolt ansiterminal camlp4 ];
+  buildInputs = with ocamlPackages; [
+    ocaml findlib camlp4 ansiterminal biniou bolt ocaml_cairo2 dypgen easy-format ocf yojson
+  ];
 
   patches = [ ./install-emacs-to-site-lisp.patch
               ./use-nix-ocaml-byteflags.patch ];
 
   postPatch = stdenv.lib.optionalString (camlp4 != null) ''
     substituteInPlace src/Makefile.master.in \
-      --replace "+camlp4" "${camlp4}/lib/ocaml/${getVersion ocaml}/site-lib/camlp4/"
+      --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/"
   '';
 
   # The bytecode executable is dependent on the dynamic library provided by
   # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to
   # -rpath) to make sure that ocamlrun is able to link the library at
   # runtime and that Nix detects a runtime dependency.
-  NIX_OCAML_BYTEFLAGS = "-dllpath ${ansiterminal}/lib/ocaml/${getVersion ocaml}/site-lib/ANSITerminal";
+  NIX_OCAML_BYTEFLAGS = "-dllpath ${ocamlPackages.ansiterminal}/lib/ocaml/${ocaml.version}/site-lib/ANSITerminal";
 
   buildFlags = optionalString buildBytecode "byte"
              + " "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 350180b5dc6..5b1f5d4f61c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17927,6 +17927,10 @@ with pkgs;
 
   abella = callPackage ../applications/science/logic/abella {};
 
+  acgtk = callPackage ../applications/science/logic/acgtk {
+    ocamlPackages = ocamlPackages_4_03;
+  };
+
   alt-ergo = callPackage ../applications/science/logic/alt-ergo {
     ocamlPackages = ocamlPackages_4_02;
   };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index fea8fe05bab..d7a6c6cb63d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -15,8 +15,6 @@ let
 
     buildOcaml = callPackage ../build-support/ocaml { };
 
-    acgtk = callPackage ../applications/science/logic/acgtk { };
-
     alcotest = callPackage ../development/ocaml-modules/alcotest {};
 
     angstrom = callPackage ../development/ocaml-modules/angstrom { };

From 208edec09a9175ce6d4e79a4cab741b8ed502e8f Mon Sep 17 00:00:00 2001
From: wheatdog <wheatdoge@gamil.com>
Date: Thu, 6 Jul 2017 14:44:43 +0800
Subject: [PATCH 0247/3246] ttf-envy-code-r: init at preview7

---
 lib/maintainers.nix                         |  1 +
 pkgs/data/fonts/ttf-envy-code-r/default.nix | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/data/fonts/ttf-envy-code-r/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 69bb69c8e20..cf42543a48e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -315,6 +315,7 @@
   luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
   lukego = "Luke Gorrie <luke@snabb.co>";
   lw = "Sergey Sofeychuk <lw@fmap.me>";
+  lyt = "Tim Liou <wheatdoge@gmail.com>";
   m3tti = "Mathaeus Sander <mathaeus.peter.sander@gmail.com>";
   ma27 = "Maximilian Bosch <maximilian@mbosch.me>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix
new file mode 100644
index 00000000000..6b178de137d
--- /dev/null
+++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "ttf-envy-code-r";
+  version = "PR7";
+
+  src = fetchurl {
+    url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip";
+    sha256 = "9f7e9703aaf21110b4e1a54d954d57d4092727546348598a5a8e8101e4597aff";
+  };
+
+  buildInputs = [unzip];
+
+  installPhase = ''
+    for f in *.ttf; do
+        install -Dm 644 "$f" "$out/share/fonts/truetype/$f"
+    done
+    install -Dm 644 Read\ Me.txt "$out/share/doc/readme.txt"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://damieng.com/blog/tag/envy-code-r;
+    description = "Free scalable coding font by DamienG";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lyt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 316076f3fe8..45d5dab326c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13096,6 +13096,8 @@ with pkgs;
 
   ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
 
+  ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {};
+
   tzdata = callPackage ../data/misc/tzdata { };
 
   ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };

From e99b90475b89ba9c93ba6d0f4777dfae4e334f77 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 8 Jul 2017 10:49:25 +0200
Subject: [PATCH 0248/3246] unifont: 10.0.01 -> 10.0.02

---
 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 693de6d78c6..6fef0c1b6cb 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 = "10.0.01";
+  version = "10.0.02";
 
   ttf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.ttf";
-    sha256 = "0yfz5y4vidb7h6csv6k8h0mx808psdn4vx4842bnyz0fkyhr9h3y";
+    sha256 = "1g7iaw2vx7yq8d3z625p6ainkn35wpfsimbl75lyj3d8206fhx0z";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
-    sha256 = "0shlr5804knh14qnv270yzsyfndw6na5ajbx4kvx20gfyxzcsi76";
+    sha256 = "1l2cnkshpsg3mw5ps1ghzqm2a1nr7jfdn2bxqyvw7d0l5xyxvg3d";
   };
 
   buildInputs = [ mkfontscale mkfontdir ];

From 5172fd68d3fcdb1f5f39b685d7bd43ba2221e0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Jul 2017 10:18:53 +0200
Subject: [PATCH 0249/3246] ttf-envy-code-r: nitpick changes

- start version with 0. to get actual version semantics
- better location for readme.txt
- widen platforms to unix
---
 pkgs/data/fonts/ttf-envy-code-r/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix
index 6b178de137d..8db10d7f582 100644
--- a/pkgs/data/fonts/ttf-envy-code-r/default.nix
+++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "ttf-envy-code-r";
+let
+  pname = "ttf-envy-code-r";
   version = "PR7";
+in
+stdenv.mkDerivation rec {
+  name = "${pname}-0.${version}";
 
   src = fetchurl {
     url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip";
@@ -15,14 +17,14 @@ stdenv.mkDerivation rec {
     for f in *.ttf; do
         install -Dm 644 "$f" "$out/share/fonts/truetype/$f"
     done
-    install -Dm 644 Read\ Me.txt "$out/share/doc/readme.txt"
+    install -Dm 644 Read\ Me.txt "$out/share/doc/${pname}/readme.txt"
   '';
 
   meta = with stdenv.lib; {
     homepage = http://damieng.com/blog/tag/envy-code-r;
     description = "Free scalable coding font by DamienG";
     license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.lyt ];
   };
 }

From e81cf2f06c787b5dc36a39e578c7c070a40bd395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Jul 2017 11:38:22 +0200
Subject: [PATCH 0250/3246] terminus-font-ttf: nitpick fixes/improvements

share/doc/COPYING would be a too general name and could collide with
other packages.
---
 pkgs/data/fonts/terminus-font-ttf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix
index e9adc4c0422..01959f91195 100644
--- a/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/pkgs/data/fonts/terminus-font-ttf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188";
   };
 
-  buildInputs = [unzip];
+  nativeBuildInputs = [ unzip ];
 
   installPhase = ''
     for i in *.ttf; do
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       install -Dm 644 "$i" "$out/share/fonts/truetype/$destname"
     done
 
-    install -Dm 644 COPYING "$out/share/doc/COPYING"
+    install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING"
   '';
 
   meta = with stdenv.lib; {
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = http://files.ax86.net/terminus-ttf;
     license = licenses.ofl;
     maintainers = with maintainers; [ okasu ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 698f1f9717aa375205bc24d5f7da0abfcf1461e2 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 7 Jul 2017 07:27:04 -0700
Subject: [PATCH 0251/3246] hugo: 0.24.1 -> 0.25

---
 pkgs/applications/misc/hugo/default.nix | 4 ++--
 pkgs/applications/misc/hugo/deps.nix    | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 595c58db992..142c558a95d 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.24.1";
+  version = "0.25";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "gohugoio";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "0zphxi11rny6wh1ysz7508fdrsbxj3n138q2bkkqaz0rrdab710a";
+    sha256 = "01p063nsyhavf13cva3sdqdcc7s42gi7iry4v857f1c2i402f0zk";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 4a3f4ff15cb..ff832d4961f 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -359,6 +359,15 @@
       sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz";
     };
   }
+  {
+    goPackagePath = "golang.org/x/image";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/image";
+      rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d";
+      sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r";
+    };
+  }
   {
     goPackagePath = "golang.org/x/net";
     fetch = {

From ec359a828679aff5789f551bb95db9d206fc4a1b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 11:14:16 +0200
Subject: [PATCH 0252/3246] ocamlPackages.sequence: 0.8 -> 0.10

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

diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix
index ae973178d13..34f342faaa3 100644
--- a/pkgs/development/ocaml-modules/sequence/default.nix
+++ b/pkgs/development/ocaml-modules/sequence/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
 
-let version = "0.8"; in
+let version = "0.10"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-sequence-${version}";
+  name = "ocaml${ocaml.version}-sequence-${version}";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "sequence";
-    rev = "${version}";
-    sha256 = "1y9nkz6g4plnbk1pcdbvs7f719r48zxrp3gsaxyq1vg98i9h8qr3";
+    rev = version;
+    sha256 = "0pl8pv758wn8bm555i8f0fvfn2pw88w1bmzjrzrv01092d85wx1g";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ounit ];

From 9d526675368dd51134151b6cc3fd0e94a5b5c2bc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 11:31:11 +0200
Subject: [PATCH 0253/3246] =?UTF-8?q?ocamlPackages.qtest:=20requires=20OCa?=
 =?UTF-8?q?ml=20=E2=89=A5=204?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix
index 6d5f8ecc683..4d3ab0ddb4f 100644
--- a/pkgs/development/ocaml-modules/qtest/default.nix
+++ b/pkgs/development/ocaml-modules/qtest/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4"
+then throw "qtest is not available for OCaml ${ocaml.version}"
+else
+
 let version = "2.2"; in
 
 stdenv.mkDerivation {

From ff24bf1fb60f937cdf83725c684a6458fdf4f45f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 11:39:14 +0200
Subject: [PATCH 0254/3246] ocaml: 4.04.1 -> 4.04.2

---
 pkgs/development/compilers/ocaml/4.04.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix
index a63034d700d..4f49bcf8072 100644
--- a/pkgs/development/compilers/ocaml/4.04.nix
+++ b/pkgs/development/compilers/ocaml/4.04.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "04";
-  patch_version = "1";
-  sha256 = "11f2kcldpad9h5ihi1crad5lvv2501iccb2g4c8m197fnjac8b12";
+  patch_version = "2";
+  sha256 = "0bhgjzi78l10824qga85nlh18jg9lb6aiamf9dah1cs6jhzfsn6i";
 
   # If the executable is stipped it does not work
   dontStrip = true;

From 676156a658a8d506e18d6d515b4a79b73e22bb7a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 12:22:39 +0200
Subject: [PATCH 0255/3246] obuild: fix build

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

diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix
index 0b5295654d3..1de95f73037 100644
--- a/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/pkgs/development/tools/ocaml/obuild/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
   buildInputs = [ ocaml ];
 
   buildPhase = ''
+    patchShebangs ./bootstrap
     ./bootstrap
   '';
 

From 53e67781eccdc276b182997457989f69c6a355cb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 08:43:28 +0000
Subject: [PATCH 0256/3246] ocamlPackages.sedlex: fix name

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

diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index 2d1746bde0f..6fcdb5ec6fa 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -3,7 +3,7 @@
 assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 
 stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-${version}";
+  name = "ocaml${ocaml.version}-sedlex-${version}";
   version = "1.99.3";
 
   src = fetchzip {

From 645f11b13da59e6f7082572ad272db1d425b0cc6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 13:53:04 +0200
Subject: [PATCH 0257/3246] smplayer: 17.6.0 -> 17.7.0

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index b7e4fe6b7c6..ea5af4ab118 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-17.6.0";
+  name = "smplayer-17.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0kgrkn50sgr79jfj66p59wka17prnxibf7fbfpg5m0n95kdkr7rg";
+    sha256 = "1g35h8xqs2bdwjdibzgs1ab2z2lmwgj8h53a7vqydv3j3crxx9wk";
   };
 
   buildInputs = [ qtscript ];

From 83fbc0f0359f6885d5c3b22fb5331f459ade7329 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 1 Jul 2017 16:59:15 +0200
Subject: [PATCH 0258/3246] docker-tools: fixup permssions for extraCommands

---
 pkgs/build-support/docker/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 004816a0b39..592dcd3cae7 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -252,6 +252,8 @@ rec {
         echo "No contents to add to layer."
       fi
 
+      chmod ug+w layer
+
       if [[ -n $extraCommands ]]; then
         (cd layer; eval "$extraCommands")
       fi
@@ -296,7 +298,7 @@ rec {
     # How much disk to allocate for the temporary virtual machine.
     diskSize ? 1024,
     # Commands (bash) to run on the layer; these do not require sudo.
-    extraCommands ? "", uid ? 0, gid ? 0
+    extraCommands ? ""
   }:
     # Generate an executable script from the `runAsRoot` text.
     let runAsRootScript = shellScript "run-as-root.sh" runAsRoot;
@@ -311,6 +313,8 @@ rec {
           echo "Adding $item..."
           rsync -ak --chown=0:0 $item/ layer/
         done
+
+        chmod ug+w layer
       '';
 
       postMount = ''

From 4a3e1d83a15375056562ce4cf4599913d79479fc Mon Sep 17 00:00:00 2001
From: Robin Raymond <robin@robinraymond.de>
Date: Fri, 30 Jun 2017 16:52:59 +0200
Subject: [PATCH 0259/3246] godot 2.1.1-stable -> 2.1.3-stable

---
 pkgs/development/tools/godot/default.nix                | 4 ++--
 pkgs/development/tools/godot/pkg_config_additions.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index a2ff8410889..62bf6557f68 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name    = "godot-${version}";
-  version = "2.1.1-stable";
+  version = "2.1.3-stable";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = version;
-    sha256 = "071qkm1l6yn2s9ha67y15w2phvy5m5wl3wqvrslhfmnsir3q3k01";
+    sha256 = "04qbab0icpv3ascr4dqgj18sqvw04a1jypcngb0ji8npa8q9wxb2";
   };
 
   buildInputs = [
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
index f5e835a7374..c4675322e2b 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -1,5 +1,5 @@
 +++ build/platform/x11/detect.py
-@@ -132,6 +132,10 @@
+@@ -139,6 +139,10 @@
      env.ParseConfig('pkg-config xinerama --cflags --libs')
      env.ParseConfig('pkg-config xcursor --cflags --libs')
      env.ParseConfig('pkg-config xrandr --cflags --libs')
@@ -9,4 +9,4 @@
 +    env.ParseConfig('pkg-config zlib --cflags --libs')
 
      if (env['builtin_openssl'] == 'no'):
-         env.ParseConfig('pkg-config openssl --cflags --libs')
+         # Currently not compatible with OpenSSL 1.1.0+

From 3a227e673abc5935f3aaa7a7350da54f52172924 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 8 Jul 2017 15:21:42 +0200
Subject: [PATCH 0260/3246] mldonkey: 3.1.5 -> 3.1.6

---
 .../networking/p2p/mldonkey/default.nix        | 18 ++++++++++++------
 pkgs/top-level/all-packages.nix                |  4 +---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index 416995f120c..629e748fcac 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,14 +1,20 @@
-{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }:
+{ stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }:
 
 stdenv.mkDerivation (rec {
-  name = "mldonkey-3.1.5";
+  name = "mldonkey-3.1.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
-    sha256 = "1jqik6b09p27ckssppfiqpph7alxbgpnf9w1s0lalmi3qyyd9ybl";
+    url = https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2;
+    sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv";
   };
 
-  buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ];
+  preConfigure = stdenv.lib.optionalString (ocamlPackages.camlp4 != null) ''
+    substituteInPlace Makefile --replace '+camlp4' \
+      '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4'
+  '';
+
+  buildInputs = [ zlib ncurses bzip2 file gd libpng libjpeg ] ++
+  (with ocamlPackages; [ ocaml camlp4 ]);
   configureFlags = [ "--disable-gui" ];
 
   meta = {
@@ -17,7 +23,7 @@ stdenv.mkDerivation (rec {
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
   };
-} // (if !ocaml.nativeCompilers then
+} // (if !ocamlPackages.ocaml.nativeCompilers then
 {
   # Byte code compilation (the ocaml opt compiler is not supported in some platforms)
   buildPhase = "make mlnet.byte";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa97f4d3087..f49741b320b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15063,9 +15063,7 @@ with pkgs;
 
   mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
 
-  mldonkey = callPackage ../applications/networking/p2p/mldonkey {
-    ocaml = ocamlPackages_4_01_0.ocaml;
-  };
+  mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
 
   MMA = callPackage ../applications/audio/MMA { };
 

From 0b6a5042835787bcfe9ab4901d8f364058998ade Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 8 Jul 2017 08:44:14 -0500
Subject: [PATCH 0261/3246] moby: init at 2017-07-06

---
 pkgs/development/tools/misc/moby/default.nix | 27 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/tools/misc/moby/default.nix

diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix
new file mode 100644
index 00000000000..e6f7ac3290b
--- /dev/null
+++ b/pkgs/development/tools/misc/moby/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildGoPackage, go, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "moby-${version}";
+  version = "2017-07-06";
+  rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40";
+
+  goPackagePath = "github.com/moby/tool";
+
+  src = fetchFromGitHub {
+    owner = "moby";
+    repo = "tool";
+    inherit rev;
+    sha256 = "0xhasm69g5gwihcm8g7rff9nkx7iffvd642bknky6j3w133gs5lp";
+  };
+
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X main.GitCommit=${builtins.substring 0 7 rev} -X main.Version=0.0.0")
+  '';
+
+  meta = {
+    description = "Assembly tool for the Moby project, an open framework to assemble specialized container systems without reinventing the wheel";
+    license = lib.licenses.asl20;
+    homepage = https://mobyproject.org;
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 350180b5dc6..a6d1b0a1bbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6967,6 +6967,8 @@ with pkgs;
 
   mk = callPackage ../development/tools/build-managers/mk { };
 
+  moby = callPackage ../development/tools/misc/moby { };
+
   msgpack-tools = callPackage ../development/tools/msgpack-tools { };
 
   msitools = callPackage ../development/tools/misc/msitools { };

From ceff05aa4f25ce8d0d0b7a81761017c406497393 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 8 Jul 2017 09:20:23 -0500
Subject: [PATCH 0262/3246] linuxkit: init at 2017-07-08

---
 .../tools/misc/linuxkit/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/misc/linuxkit/default.nix

diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix
new file mode 100644
index 00000000000..71bc3b87a7a
--- /dev/null
+++ b/pkgs/development/tools/misc/linuxkit/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildGoPackage, go, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "linuxkit-${version}";
+  version = "2017-07-08";
+  rev = "8ca19a84d5281b1b15c7a48c21e5786943b47f1c";
+
+  goPackagePath = "github.com/linuxkit/linuxkit";
+
+  src = fetchFromGitHub {
+    owner = "linuxkit";
+    repo = "linuxkit";
+    inherit rev;
+    sha256 = "150y7hnjhi81iik7np27y5466ldaackq72mpi7vmybbl7vr1wgw4";
+  };
+
+  subPackages = [ "src/cmd/linuxkit" ];
+
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X main.GitCommit=${builtins.substring 0 7 rev} -X main.Version=0.0.0")
+  '';
+
+  meta = {
+    description = "A toolkit for building secure, portable and lean operating systems for containers";
+    license = lib.licenses.asl20;
+    homepage = https://github.com/linuxkit/linuxkit;
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6d1b0a1bbc..b2c79f77edb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6942,6 +6942,8 @@ with pkgs;
 
   libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
 
+  linuxkit = callPackage ../development/tools/misc/linuxkit { };
+
   lit = callPackage ../development/tools/misc/lit { };
 
   lsof = callPackage ../development/tools/misc/lsof { };

From 50831d543d37bb2953386922c6b5c7488f9028ba Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Jul 2017 13:41:27 -0400
Subject: [PATCH 0263/3246] busybox: 1.26.2 -> 1.27.0

---
 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 815e2e0f6ef..5447f13abc4 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -27,11 +27,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.26.2";
+  name = "busybox-1.27.0";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns";
+    sha256 = "1kcr0jvik0c31ls4f3li359xv7w0b60hv64fknj28bwlkdgbvpx5";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

From 5f2826fbed5ee26fb905f3950c2d7c5631933ba3 Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Sat, 8 Jul 2017 21:13:16 +0300
Subject: [PATCH 0264/3246] Added networking.hosts and networking.fqdn options

---
 nixos/modules/config/networking.nix | 47 ++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index ea9e8b712c6..c0b0c8494c8 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -20,24 +20,35 @@ in
 
   options = {
 
-    networking.extraLocalHosts = lib.mkOption {
-      type = types.listOf types.str;
-      default = [];
-      example = [ "localhost.localdomain" "workinprogress.example.com" ];
+    networking.fqdn = lib.mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "foo.example.com";
       description = ''
-        Additional entries to be appended to 127.0.0.1 entry in <filename>/etc/hosts</filename>.
+        Full qualified domain name, if any.
       '';
     };
 
+    networking.hosts = lib.mkOption {
+      type = types.attrsOf ( types.listOf types.str );
+      default = {};
+      example = ''
+        {
+          "localhost" = [ "foo.bar" ];
+          "192.168.0.2" = [ "fileserver.local" "nameserver.local" ];
+        };
+      '';
+      description = ''
+        Locally defined maps of IP addresses to hostnames'
+      '';
+    };
 
     networking.extraHosts = lib.mkOption {
       type = types.lines;
       default = "";
       example = "192.168.0.1 lanlocalhost";
       description = ''
-        Additional entries to be appended to <filename>/etc/hosts</filename>.
-        Note that entries for 127.0.0.1 will not always work correctly if added from here.
-        They should be added via <literal>networking.extraLocalHosts</literal>.
+        Additional verbatim entries to be appended to <filename>/etc/hosts</filename>.
       '';
     };
 
@@ -199,12 +210,26 @@ in
         "rpc".source = pkgs.glibc.out + "/etc/rpc";
 
         # /etc/hosts: Hostname-to-IP mappings.
-        "hosts".text = let foo = concatStringsSep " " cfg.extraLocalHosts; in
+        "hosts".text =
+          let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
+              allToString = set : concatStringsSep "\n" ( map ( oneToString set ) ( builtins.attrNames set ));
+              userLocalHosts =
+                if builtins.hasAttr "127.0.0.1" cfg.hosts
+                then concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "127.0.0.1" cfg.hosts))
+                else "";
+              userLocalHosts6 =
+                if builtins.hasAttr "::1" cfg.hosts
+                then concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "::1" cfg.hosts))
+                else "";
+              otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
+              maybeFQDN = if cfg.fqdn == null then "" else cfq.fqdn;
+          in
           ''
-            127.0.0.1 localhost ${foo}
+            127.0.0.1 ${maybeFQDN} ${userLocalHosts} localhost
             ${optionalString cfg.enableIPv6 ''
-              ::1 localhost ${foo}
+              ::1 ${maybeFQDN} ${userLocalHosts6} localhost
             ''}
+            ${otherHosts}
             ${cfg.extraHosts}
           '';
 

From ca54c3f1aaea5b2a32c9add3e1b619066a46e29a Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Sat, 8 Jul 2017 22:30:02 +0300
Subject: [PATCH 0265/3246] Typo fix

---
 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 c0b0c8494c8..7065368f715 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -25,7 +25,7 @@ in
       default = null;
       example = "foo.example.com";
       description = ''
-        Full qualified domain name, if any.
+        Fully qualified domain name, if any.
       '';
     };
 

From 396db6493d63352394d0f94cf8d939de637517d7 Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Sat, 8 Jul 2017 23:04:47 +0300
Subject: [PATCH 0266/3246] Style adjustments

Also dangerous typo fix
---
 nixos/modules/config/networking.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 7065368f715..d0e5b35e42e 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -213,16 +213,14 @@ in
         "hosts".text =
           let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
               allToString = set : concatStringsSep "\n" ( map ( oneToString set ) ( builtins.attrNames set ));
-              userLocalHosts =
-                if builtins.hasAttr "127.0.0.1" cfg.hosts
-                then concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "127.0.0.1" cfg.hosts))
-                else "";
-              userLocalHosts6 =
-                if builtins.hasAttr "::1" cfg.hosts
-                then concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "::1" cfg.hosts))
-                else "";
+              userLocalHosts = optionalString
+                ( builtins.hasAttr "127.0.0.1" cfg.hosts )
+                ( concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "127.0.0.1" cfg.hosts)));
+              userLocalHosts6 = optionalString
+                ( builtins.hasAttr "::1" cfg.hosts )
+                ( concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "::1" cfg.hosts)));
               otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
-              maybeFQDN = if cfg.fqdn == null then "" else cfq.fqdn;
+              maybeFQDN = optionalString ( cfg.fqdn != null ) cfg.fqdn;
           in
           ''
             127.0.0.1 ${maybeFQDN} ${userLocalHosts} localhost

From b963ba1bee2e60fff9ce58afa1e7fab1fe8921a8 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 8 Jul 2017 14:22:38 -0700
Subject: [PATCH 0267/3246] dolphinEmuMaster: 20150802 -> 20170705

removed a substitution that is no longer needed, add new
dependencies, and use fetchFromGitHub instead of fetchgit
---
 pkgs/misc/emulators/dolphin-emu/master.nix | 28 +++++++++-------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 499e1177c3e..ed44ea59311 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,23 +1,17 @@
 { stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
-, gettext, git, libpthreadstubs, libXrandr, libXext, readline
-, openal, libXdmcp, portaudio, fetchgit, libusb, libevdev
+, pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline
+, openal, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
 , libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20150802";
-  src = fetchgit {
-    url = git://github.com/dolphin-emu/dolphin.git;
-    rev = "5097a22844b850b429872f4de390bd958b11a616";
-    sha256 = "09jx61cxvfimnq1snkv6w3m9qidrgp0j0w81c7pbkpmcwysz8xya";
-    fetchSubmodules = false;
+  name = "dolphin-emu-20170705";
+  src = fetchFromGitHub {
+    owner = "dolphin-emu";
+    repo = "dolphin";
+    rev = "29cc009706f133aac39ebaa7003d37555b926109";
+    sha256 = "0axd2z14lyqlaxrjssc0dkqnjdk3ccxh2fqrhya0jc2rsm8ighlz";
   };
 
-  postPatch = ''
-    for f in Source/Core/VideoBackends/{Software,OGL}/RasterFont.{h,cpp}; do
-      substituteInPlace "$f" --replace " CHAR_WIDTH " " CHARWIDTH "
-    done
-  '';
-
   cmakeFlags = ''
     -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
     -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
@@ -27,9 +21,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
-                  gettext libpthreadstubs libXrandr libXext readline openal
-                  libevdev git libXdmcp portaudio libusb libpulseaudio ];
+  buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib pcre
+                  gettext libpthreadstubs libXrandr libXext libSM readline openal
+                  libevdev libXdmcp portaudio libusb libpulseaudio ];
 
   meta = {
     homepage = http://dolphin-emu.org/;

From 2f9799399255bdacc028092b904f6ea0afc7a09a Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Sun, 9 Jul 2017 00:28:05 +0300
Subject: [PATCH 0268/3246] Documentation fixes

---
 nixos/modules/config/networking.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index d0e5b35e42e..760f8353fb3 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -34,12 +34,12 @@ in
       default = {};
       example = ''
         {
-          "localhost" = [ "foo.bar" ];
+          "127.0.0.1" = [ "foo.bar.baz" ];
           "192.168.0.2" = [ "fileserver.local" "nameserver.local" ];
         };
       '';
       description = ''
-        Locally defined maps of IP addresses to hostnames'
+        Locally defined maps of hostnames to IP addresses.
       '';
     };
 

From 32dec43701673e25341d8575ba05dfd9d1ba0e5e Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richardipsum@fastmail.co.uk>
Date: Sat, 8 Jul 2017 19:42:16 +0100
Subject: [PATCH 0269/3246] lrexlib: 2.7.2 (broken) -> 2.8.0

The shared objects are not available in 'pcre.dev', so to build the rex_pcre.so
file we must specify 'pcre.out' as the directory to obtain shared objects
from, 'pcre.dev' is still needed for the header files though.
---
 pkgs/top-level/lua-packages.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 71aef7544dd..f33b397958c 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -311,24 +311,23 @@ let
 
   lrexlib = buildLuaPackage rec {
     name = "lrexlib-${version}";
-    version = "2.7.2";
+    version = "2.8.0";
     src = fetchzip {
-      url = "https://github.com/rrthomas/lrexlib/archive/150c251be57c4e569da0f48bf6b01fbca97179fe.zip";
-      sha256 = "0acb3258681bjq61piz331r99bdff6cnkjaigq5phg3699iz5h75";
+      url = "https://github.com/rrthomas/lrexlib/archive/rel-2-8-0.zip";
+      sha256 = "1c62ny41b1ih6iddw5qn81gr6dqwfffzdp7q6m8x09zzcdz78zhr";
     };
     buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ];
 
     buildPhase = let
-      luaVariable = "LUA_PATH=${luastdlib}/share/lua/${lua.luaversion}/?.lua";
+      luaVariable = ''LUA_PATH="${luastdlib}/share/lua/${lua.luaversion}/?/init.lua;${luastdlib}/share/lua/${lua.luaversion}/?.lua"'';
 
-      pcreVariable = "PCRE_DIR=${pcre.dev}";
+      pcreVariable = "PCRE_DIR=${pcre.out} PCRE_INCDIR=${pcre.dev}/include";
       onigVariable = "ONIG_DIR=${oniguruma}";
       gnuVariable = "GNU_INCDIR=${gnulib}/lib";
       treVariable = "TRE_DIR=${tre}";
       posixVariable = "POSIX_DIR=${glibc.dev}";
     in ''
-      sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' \
-          -i Makefile
+      sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' -i Makefile
       ${luaVariable} make
     '';
 
@@ -341,7 +340,6 @@ let
       homepage = "https://github.com/lua-stdlib/lua-stdlib/";
       platforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
-      broken = true;
     };
   };
 

From 3483c09f595ab13af6bd5211fdca0ebc0cdece93 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Sun, 9 Jul 2017 03:23:53 +0300
Subject: [PATCH 0270/3246] ion: init at 1.0.3

---
 lib/maintainers.nix             |  1 +
 pkgs/shells/ion/default.nix     | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/shells/ion/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 60f62d1a84e..4232da31e86 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -155,6 +155,7 @@
   drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
   dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>";
   dtzWill = "Will Dietz <nix@wdtz.org>";
+  dywedir = "Vladyslav M. <dywedir@protonmail.ch>";
   e-user = "Alexander Kahl <nixos@sodosopa.io>";
   ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
   edanaher = "Evan Danaher <nixos@edanaher.net>";
diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
new file mode 100644
index 00000000000..4ab03b31fb9
--- /dev/null
+++ b/pkgs/shells/ion/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "ion-${version}";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    owner = "redox-os";
+    repo = "ion";
+    rev = version;
+    sha256 = "0c2haw9qiwysyp1xj6qla8d6zpsdlygagzh86sk04c2b4ssyaca3";
+  };
+
+  depsSha256 = "0w2jgbrcx57js8ihzs5acp6b1niw1c7khdxrv14y3z9mmm9j55hs";
+
+  meta = with stdenv.lib; {
+    description = "Modern system shell with simple (and powerful) syntax";
+    homepage = https://github.com/redox-os/ion;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dywedir ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26170f0dfda..f4b7d78c129 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5032,6 +5032,8 @@ with pkgs;
 
   fish-foreign-env = callPackage ../shells/fish-foreign-env { };
 
+  ion = callPackage ../shells/ion { };
+
   mksh = callPackage ../shells/mksh { };
 
   oh = callPackage ../shells/oh { };

From 6db77ccef456fd2d7426fa77390f2c05ac412143 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Sat, 8 Jul 2017 20:32:16 -0400
Subject: [PATCH 0271/3246] Fix quoting in Elixir generic builder

---
 pkgs/development/interpreters/elixir/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index a3f60a7f22e..ff63406aea3 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -48,7 +48,7 @@ in
 
       for f in $out/bin/*; do
        b=$(basename $f)
-        if [ $b == "mix" ]; then continue; fi
+        if [ "$b" = mix ]; then continue; fi
         wrapProgram $f \
           --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
           --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt

From 73c21aad92dd2fb0c40ecd0268ac8ab24f1724ff Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 4 Jul 2017 21:48:15 +0200
Subject: [PATCH 0272/3246] kronometer: fix build

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

diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 6db3278fade..d74e2b4e12a 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, fetchurl, lib,
   extra-cmake-modules, kdoctools, wrapGAppsHook,
-  kconfig, kinit
+  kconfig, kcrash, kinit
 }:
 
 let
@@ -21,5 +21,5 @@ mkDerivation rec {
     maintainers = with maintainers; [ peterhoeg ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  propagatedBuildInputs = [ kconfig kinit ];
+  propagatedBuildInputs = [ kconfig kcrash kinit ];
 }

From 4a8d67ebec3c1c2f0c98c5ffe1611a81150cea52 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 4 Jul 2017 23:03:25 +0200
Subject: [PATCH 0273/3246] krusader: fix compilation

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

diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 7f5dad62d26..6ed78848d8c 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, fetchurl, lib,
   extra-cmake-modules, kdoctools, wrapGAppsHook,
-  kconfig, kinit, kparts
+  kconfig, kcrash, kinit, kparts
 }:
 
 let
@@ -23,5 +23,5 @@ in mkDerivation rec {
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  propagatedBuildInputs = [ kconfig kinit kparts ];
+  propagatedBuildInputs = [ kconfig kcrash kinit kparts ];
 }

From 5906a2714d64e0fc8053f862cb6971b867129389 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 9 Jul 2017 09:36:58 +0800
Subject: [PATCH 0274/3246] krusader: add missing dependencies

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

diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 6ed78848d8c..bcf351ff46a 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, fetchurl, lib,
   extra-cmake-modules, kdoctools, wrapGAppsHook,
-  kconfig, kcrash, kinit, kparts
+  karchive, kconfig, kcrash, kguiaddons, kinit, kparts, kwindowsystem
 }:
 
 let
@@ -23,5 +23,5 @@ in mkDerivation rec {
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  propagatedBuildInputs = [ kconfig kcrash kinit kparts ];
+  propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ];
 }

From a8c1419d5361cd54849b4b8f06d131ed07fc2a83 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 9 Jul 2017 09:39:06 +0800
Subject: [PATCH 0275/3246] peruse: add missing dependencies

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

diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index cd872fd966e..ddcfba6f182 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, fetchFromGitHub, fetchurl, lib,
   extra-cmake-modules, kdoctools, wrapGAppsHook,
-  baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
+  baloo, karchive, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
 
 let
@@ -23,7 +23,7 @@ in mkDerivation rec {
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
 
-  propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
+  propagatedBuildInputs = [ baloo karchive kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
 
   pathsToLink = [ "/etc/xdg/peruse.knsrc"];
 

From e9c803f09fbadcd49a83f014c15ca0112ff7dfda Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 9 Jul 2017 04:25:37 +0200
Subject: [PATCH 0276/3246] peruse: one last missing dependency

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

diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index ddcfba6f182..a3fdca001d9 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, fetchFromGitHub, fetchurl, lib,
   extra-cmake-modules, kdoctools, wrapGAppsHook,
-  baloo, karchive, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
+  baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
 
 let
@@ -23,7 +23,7 @@ in mkDerivation rec {
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
 
-  propagatedBuildInputs = [ baloo karchive kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
+  propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami knewstuff plasma-framework ];
 
   pathsToLink = [ "/etc/xdg/peruse.knsrc"];
 

From 6e2579c46566b9784e09db890e97c95215332cf3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 9 Jul 2017 04:44:10 +0200
Subject: [PATCH 0277/3246] partition-manager: add missing dependencies

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

diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index af5a45902bb..a1c1eccdd88 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, fetchurl, lib
 , extra-cmake-modules, kdoctools, wrapGAppsHook
-, kconfig, kinit, kpmcore
-, kcrash, eject, libatasmart }:
+, kconfig, kcrash, kinit, kpmcore
+, eject, libatasmart }:
 
 let
   pname = "partitionmanager";

From 163393865fd4828842f956d603c1c83fe6ab08b2 Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Sun, 9 Jul 2017 08:56:36 +0300
Subject: [PATCH 0278/3246] Style optimizations

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

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 760f8353fb3..6035facb594 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -212,13 +212,13 @@ in
         # /etc/hosts: Hostname-to-IP mappings.
         "hosts".text =
           let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
-              allToString = set : concatStringsSep "\n" ( map ( oneToString set ) ( builtins.attrNames set ));
+              allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set );
               userLocalHosts = optionalString
                 ( builtins.hasAttr "127.0.0.1" cfg.hosts )
-                ( concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "127.0.0.1" cfg.hosts)));
+                ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" ));
               userLocalHosts6 = optionalString
                 ( builtins.hasAttr "::1" cfg.hosts )
-                ( concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "::1" cfg.hosts)));
+                ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
               otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
               maybeFQDN = optionalString ( cfg.fqdn != null ) cfg.fqdn;
           in

From cf515b0f9fe941cf709cb2aac513786f35b983cc Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Sun, 9 Jul 2017 08:01:28 +0200
Subject: [PATCH 0279/3246] corebird: 1.5 -> 1.5.1

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

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 7b67ad235e3..86a93309b1f 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -3,14 +3,14 @@
 , glib_networking }:
 
 stdenv.mkDerivation rec {
-  version = "1.5";
+  version = "1.5.1";
   name = "corebird-${version}";
 
   src = fetchFromGitHub {
     owner = "baedert";
     repo = "corebird";
     rev = version;
-    sha256 = "0nll3ns1riylxg33w6myz5x8h6ai39k5fw2bkf96g5rgmi6zsjma";
+    sha256 = "1qajb4xms3vsfm5sg91z9ka0nrzgfi0fjgjxqm7snhkfgxlkph7w";
   };
 
   preConfigure = ''

From 1df820cd3df68cbf281f37c92b5ee620dfefd6ac Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 9 Jul 2017 08:52:27 +0200
Subject: [PATCH 0280/3246] feh: 2.18.2 -> 2.19

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index b7949b4d4f9..5de8e7892ab 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.18.2";
+  version = "2.19";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil";
+    sha256 = "1sfhr6628xpj9p6bqihdq35y139x2gmrpydjlrwsl1rs77c2bgnf";
   };
 
   outputs = [ "out" "man" "doc" ];

From 25028cb750f9224ace34c53b33d6f50b17e5a935 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 6 Jul 2017 18:53:25 +0700
Subject: [PATCH 0281/3246] add btrfs-progs bash-completion, fix #25793

---
 pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 525aa2fec28..d9b01eb5239 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
   # This should be fine on all platforms so apply universally
   patchPhase = "sed -i s/-O1/-O2/ configure";
 
+  postInstall = ''
+    install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs
+  '';
+
   meta = with stdenv.lib; {
     description = "Utilities for the btrfs filesystem";
     homepage = https://btrfs.wiki.kernel.org/;

From ee5a17514c500244b2911c80f3d42311bdf97491 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sat, 8 Jul 2017 21:32:17 -0400
Subject: [PATCH 0282/3246] re2c : Fix build by adjusting sourceRoot.

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

diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index a70afe51179..6d74656d616 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "re2c-${version}";
   version = "0.16";
 
-  sourceRoot = "${name}-src/re2c";
+  sourceRoot = "re2c/re2c";
 
   src = fetchFromGitHub {
     owner = "skvadrik";

From 19dfb63036b4a5c8a73ebf66b0b51c7acba07570 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 9 Jul 2017 09:59:08 +0200
Subject: [PATCH 0283/3246] sshuttle: 0.78.0 -> 0.78.3, use py3 for tests to
 succeed

---
 pkgs/tools/security/sshuttle/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index daa02497d0f..65d9165a26b 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -1,23 +1,29 @@
-{ stdenv, pythonPackages, fetchurl, makeWrapper, pandoc
+{ stdenv, python3Packages, fetchurl, makeWrapper, pandoc
 , coreutils, iptables, nettools, openssh, procps }:
   
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   name = "sshuttle-${version}";
-  version = "0.78.0";
+  version = "0.78.3";
 
   src = fetchurl {
-    sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b";
+    sha256 = "12xyq5h77b57cnkljdk8qyjxzys512b73019s20x6ck5brj1m8wa";
     url = "mirror://pypi/s/sshuttle/${name}.tar.gz";
   };
 
   patches = [ ./sudo.patch ];
 
-  propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ];
-  nativeBuildInputs = [ makeWrapper pandoc pythonPackages.setuptools_scm ];
+  propagatedBuildInputs = with python3Packages; [ mock pytest ];
+  nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ];
   buildInputs =
     [ coreutils openssh ] ++
     stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
 
+  checkInputs = with python3Packages; [ pytest pytestrunner ];
+
+  # Tests only run with Python 3. Server-side Python 2 still works if client
+  # uses Python 3, so it should be fine.
+  doCheck = true;
+
   postInstall = let
     mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
   in ''

From 3a891c67fc87b3c591e75ca78af1c8d9b33445c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 9 Jul 2017 10:38:11 +0200
Subject: [PATCH 0284/3246] re2c: fix sourceRoot in a more robust way

Reverting ee5a17514c5 would also work.
The temporary confusion was due to #26877 changes.
---
 pkgs/development/tools/parsing/re2c/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index 6d74656d616..fbbe0bb5d99 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "re2c-${version}";
   version = "0.16";
 
-  sourceRoot = "re2c/re2c";
+  sourceRoot = "${src.name}/re2c";
 
   src = fetchFromGitHub {
     owner = "skvadrik";

From 784240de3e75867efa8d1f73d90b9ef03aba2fac Mon Sep 17 00:00:00 2001
From: 0xABAB <0xABAB@users.noreply.github.com>
Date: Sun, 9 Jul 2017 10:40:53 +0200
Subject: [PATCH 0285/3246] wine: add missing dependency libcap on Linux

---
 pkgs/misc/emulators/wine/base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 92815ffaa0a..348b52dd492 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
 
   buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:
   [ pkgs.freetype ]
+  ++ lib.optional stdenv.isLinux         pkgs.libcap
   ++ lib.optional pngSupport             pkgs.libpng
   ++ lib.optional jpegSupport            pkgs.libjpeg
   ++ lib.optional cupsSupport            pkgs.cups

From bd129c2b3e033bd92d5c93cca4d516b021d408e6 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sat, 8 Jul 2017 21:58:43 -0400
Subject: [PATCH 0286/3246] unzipNLS : Fix build by removing patch fuzz.

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

diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index 896cdd50973..a35e473ec36 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
+  patchFlags = "-p1 -F3";
+
   patches = [
     ./CVE-2014-8139.diff
     ./CVE-2014-8140.diff

From 01557ee8b9f3382ea2d4a354c4c04354e4a17d22 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 9 Jul 2017 12:17:02 +0200
Subject: [PATCH 0287/3246] sshuttle: clean up expression a little bit

---
 pkgs/tools/security/sshuttle/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 65d9165a26b..2d663175ec9 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -12,13 +12,12 @@ python3Packages.buildPythonApplication rec {
 
   patches = [ ./sudo.patch ];
 
-  propagatedBuildInputs = with python3Packages; [ mock pytest ];
   nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ];
   buildInputs =
     [ coreutils openssh ] ++
     stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
 
-  checkInputs = with python3Packages; [ pytest pytestrunner ];
+  checkInputs = with python3Packages; [ mock pytest pytestrunner ];
 
   # Tests only run with Python 3. Server-side Python 2 still works if client
   # uses Python 3, so it should be fine.

From 0fb8456b1316797cc6cd45814b3250e432eeef77 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 8 Jul 2017 00:11:44 +0200
Subject: [PATCH 0288/3246] minio service: add additional config options

Set access and secret key and disable browser.
Tests extended to do real operations against minio.
---
 nixos/modules/services/web-servers/minio.nix | 42 ++++++++++++++++++++
 nixos/tests/minio.nix                        | 17 +++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix
index 1893edf3a77..843f0d98687 100644
--- a/nixos/modules/services/web-servers/minio.nix
+++ b/nixos/modules/services/web-servers/minio.nix
@@ -29,6 +29,40 @@ in
       description = "The config directory, for the access keys and other settings.";
     };
 
+    accessKey = mkOption {
+      default = "";
+      type = types.str;
+      description = ''
+        Access key of 5 to 20 characters in length that clients use to access the server.
+        This overrides the access key that is generated by minio on first startup and stored inside the
+        <literal>configDir</literal> directory.
+      '';
+    };
+
+    secretKey = mkOption {
+      default = "";
+      type = types.str;
+      description = ''
+        Specify the Secret key of 8 to 40 characters in length that clients use to access the server.
+        This overrides the secret key that is generated by minio on first startup and stored inside the
+        <literal>configDir</literal> directory.
+      '';
+    };
+
+    region = mkOption {
+      default = "us-east-1";
+      type = types.str;
+      description = ''
+        The physical location of the server. By default it is set to us-east-1, which is same as AWS S3's and Minio's default region.
+      '';
+    };
+
+    browser = mkOption {
+      default = true;
+      type = types.bool;
+      description = "Enable or disable access to web UI.";
+    };
+
     package = mkOption {
       default = pkgs.minio;
       defaultText = "pkgs.minio";
@@ -57,6 +91,14 @@ in
         Group = "minio";
         LimitNOFILE = 65536;
       };
+      environment = {
+        MINIO_REGION = "${cfg.region}";
+        MINIO_BROWSER = "${if cfg.browser then "on" else "off"}";
+      } // optionalAttrs (cfg.accessKey != "") {
+        MINIO_ACCESS_KEY = "${cfg.accessKey}";
+      } // optionalAttrs (cfg.secretKey != "") {
+        MINIO_SECRET_KEY = "${cfg.secretKey}";
+      };
     };
 
     users.extraUsers.minio = {
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index 462a3bc4768..a349265b2f5 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -4,8 +4,15 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ bachp ];
   };
 
-  machine = { config, pkgs, ... }: {
-    services.minio.enable = true;
+  nodes = {
+    machine = { config, pkgs, ... }: {
+      services.minio = {
+        enable = true;
+        accessKey = "BKIKJAA5BMMU2RHO6IBB";
+        secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
+      };
+      environment.systemPackages = [ pkgs.minio-client ];
+    };
   };
 
   testScript =
@@ -14,6 +21,12 @@ import ./make-test.nix ({ pkgs, ...} : {
       $machine->waitForUnit("minio.service");
       $machine->waitForOpenPort(9000);
       $machine->succeed("curl --fail http://localhost:9000/minio/index.html");
+
+      # Create a test bucket on the server
+      $machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4");
+      $machine->succeed("mc mb minio/test-bucket");
+      $machine->succeed("mc ls minio") =~ /test-bucket/ or die;
       $machine->shutdown;
+
     '';
 })

From f2be840e985e73d19e43567bd0437ec9ab9025bb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 9 Jul 2017 22:43:32 +0800
Subject: [PATCH 0289/3246] re2c: minor cleanup

---
 pkgs/development/tools/parsing/re2c/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index fbbe0bb5d99..dcf89d1604d 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -7,19 +7,19 @@ stdenv.mkDerivation rec {
   sourceRoot = "${src.name}/re2c";
 
   src = fetchFromGitHub {
-    owner = "skvadrik";
-    repo = "re2c";
-    rev = version;
+    owner  = "skvadrik";
+    repo   = "re2c";
+    rev    = version;
     sha256 = "0cijgmbyx34nwl2jmsswggkgvzy364871rkbxz8biq9x8xrhhjw5";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tool for writing very fast and very flexible scanners";
     homepage    = "http://re2c.org";
-    license     = stdenv.lib.licenses.publicDomain;
-    platforms   = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.publicDomain;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ thoughtpolice ];
   };
 }

From 4aad6d800dff278d3f2b865f48d7577f28abb402 Mon Sep 17 00:00:00 2001
From: Michael Walker <mike@barrucadu.co.uk>
Date: Sun, 9 Jul 2017 16:46:16 +0100
Subject: [PATCH 0290/3246] ezstream: init at 0.6.0 (#27259)

* ezstream: init at 0.6.0

* ezstream: pkgconfig belongs to nativeBuildInput
---
 lib/maintainers.nix                   |  1 +
 pkgs/tools/audio/ezstream/default.nix | 33 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/audio/ezstream/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0f84dba8107..142e7ff7869 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -63,6 +63,7 @@
   bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
   badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
+  barrucadu = "Michael Walker <mike@barrucadu.co.uk>";
   basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>";
   Baughn = "Svein Ove Aas <sveina@gmail.com>";
   bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix
new file mode 100644
index 00000000000..6524bedf939
--- /dev/null
+++ b/pkgs/tools/audio/ezstream/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "ezstream-${version}";
+  version = "0.6.0";
+
+  src = fetchurl {
+    url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${name}.tar.gz";
+    sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9";
+  };
+
+  buildInputs = [ libiconv libshout taglib libxml2 ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "A command line source client for Icecast media streaming servers";
+    longDescription = ''
+      Ezstream is a command line source client for Icecast media
+      streaming servers. It began as the successor of the old "shout"
+      utility, and has since gained a lot of useful features.
+
+      In its basic mode of operation, it streams media files or data
+      from standard input without reencoding and thus requires only
+      very little CPU resources.
+    '';
+    homepage = http://icecast.org/ezstream/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.barrucadu ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1eaf1313f8e..b62908e2798 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -545,6 +545,8 @@ with pkgs;
 
   enpass = callPackage ../tools/security/enpass { };
 
+  ezstream = callPackage ../tools/audio/ezstream { };
+
   genymotion = callPackage ../development/mobile/genymotion { };
 
   grc = callPackage ../tools/misc/grc { };

From 466e7e23c6f71ebed7050802d377102002fc2a0d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 9 Jul 2017 17:02:12 +0100
Subject: [PATCH 0291/3246] caddy: 0.10.3 -> 0.10.4

The dependencies are now fully vendored
---
 pkgs/servers/caddy/default.nix |   8 +-
 pkgs/servers/caddy/deps.nix    | 201 ---------------------------------
 2 files changed, 3 insertions(+), 206 deletions(-)
 delete mode 100644 pkgs/servers/caddy/deps.nix

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 5e5ac3bcafd..77c83630514 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.10.3";
+  version = "0.10.4";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "0srz1cji1z6ag591vfwjd0aypi32hr7hh9ypps8p5szf075rkr8p";
+    sha256 = "0zch19a38487dflx84dlkwz67by9g4v2v8d7wrslqhs14a0sifhk";
   };
 
   buildFlagsArray = ''
@@ -20,12 +20,10 @@ buildGoPackage rec {
       -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version}
   '';
 
-  goDeps = ./deps.nix;
-
   meta = with stdenv.lib; {
     homepage = https://caddyserver.com;
     description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";
     license = licenses.asl20;
-    maintainers = with maintainers; [ rushmorem fpletz ];
+    maintainers = with maintainers; [ rushmorem fpletz zimbatm ];
   };
 }
diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix
deleted file mode 100644
index e2b318ca60e..00000000000
--- a/pkgs/servers/caddy/deps.nix
+++ /dev/null
@@ -1,201 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
-[
-  {
-    goPackagePath = "github.com/codahale/aesnicheck";
-    fetch = {
-      type = "git";
-      url = "https://github.com/codahale/aesnicheck";
-      rev = "349fcc471aaccc29cd074e1275f1a494323826cd";
-      sha256 = "1zab6jjs5hiqpq484pbpx490zlj42v7hf4wwkqmicyaq7wclfnka";
-    };
-  }
-  {
-    goPackagePath = "github.com/dustin/go-humanize";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dustin/go-humanize";
-      rev = "259d2a102b871d17f30e3cd9881a642961a1e486";
-      sha256 = "1jiada1pfhw2wwkx7cjsa6ixa8c37w51b3x09vlr4m0l945pval9";
-    };
-  }
-  {
-    goPackagePath = "github.com/flynn/go-shlex";
-    fetch = {
-      type = "git";
-      url = "https://github.com/flynn/go-shlex";
-      rev = "3f9db97f856818214da2e1057f8ad84803971cff";
-      sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";
-    };
-  }
-  {
-    goPackagePath = "github.com/gorilla/websocket";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/websocket";
-      rev = "a91eba7f97777409bc2c443f5534d41dd20c5720";
-      sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-syslog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-syslog";
-      rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb";
-      sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/golang-lru";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/golang-lru";
-      rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
-      sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
-    };
-  }
-  {
-    goPackagePath = "github.com/jimstudt/http-authentication";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jimstudt/http-authentication";
-      rev = "3eca13d6893afd7ecabe15f4445f5d2872a1b012";
-      sha256 = "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08";
-    };
-  }
-  {
-    goPackagePath = "github.com/lucas-clemente/aes12";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lucas-clemente/aes12";
-      rev = "25700e67be5c860bcc999137275b9ef8b65932bd";
-      sha256 = "08zbfy5n6ki6fjaihk7y686dwksdglds9c8f1klkldvjbg8mw4vp";
-    };
-  }
-  {
-    goPackagePath = "github.com/lucas-clemente/fnv128a";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lucas-clemente/fnv128a";
-      rev = "393af48d391698c6ae4219566bfbdfef67269997";
-      sha256 = "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184";
-    };
-  }
-  {
-    goPackagePath = "github.com/lucas-clemente/quic-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lucas-clemente/quic-go";
-      rev = "bb280f29be75d6d78c64a32692b668e2a99c57bb";
-      sha256 = "1a6xqh7z8amb1372kb63kmn764w6c0ypcl7c4c7kyy2sqx8lyjyc";
-    };
-  }
-  {
-    goPackagePath = "github.com/lucas-clemente/quic-go-certificates";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lucas-clemente/quic-go-certificates";
-      rev = "d2f86524cced5186554df90d92529757d22c1cb6";
-      sha256 = "033099nv0y9pbv0v292x6g0mvwr2w02jf4vvpwx6sjpwbla4xjxd";
-    };
-  }
-  {
-    goPackagePath = "github.com/miekg/dns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/miekg/dns";
-      rev = "e78414ef75607394ad7d917824f07f381df2eafa";
-      sha256 = "1g5rgbjy7nr0l6074plh2aqiwiy9nck9bhhks9c5ki3r00fjj3ay";
-    };
-  }
-  {
-    goPackagePath = "github.com/naoina/go-stringutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/naoina/go-stringutil";
-      rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b";
-      sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6";
-    };
-  }
-  {
-    goPackagePath = "github.com/naoina/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/naoina/toml";
-      rev = "e6f5723bf2a66af014955e0888881314cf294129";
-      sha256 = "0kh7xnckw689kksh23ginyl3g8h2yqyvjh54nmnfvjaj886lvbsf";
-    };
-  }
-  {
-    goPackagePath = "github.com/russross/blackfriday";
-    fetch = {
-      type = "git";
-      url = "https://github.com/russross/blackfriday";
-      rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae";
-      sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137";
-    };
-  }
-  {
-    goPackagePath = "github.com/xenolf/lego";
-    fetch = {
-      type = "git";
-      url = "https://github.com/xenolf/lego";
-      rev = "aaa8e70aec58a858b6bef0706b367dd5e8d58128";
-      sha256 = "0899mdgb01bpz83zyxzln8ygyll78gmcslw5i36q9m60pqj59z60";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "e7ba82683099cae71475961448ab8f903ea77c26";
-      sha256 = "0w6zvzchgzk197siq3qbsh6pdpnx7g9xc08k5axv5yc6w8qhgx11";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "1a68b1313cf4ad7778376e82641197b60c02f65c";
-      sha256 = "1nfva16dasc9h5y1njcfnr2g09damk754g3yliij3ar06k06p1xf";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "210eee5cf7323015d097341bcf7166130d001cd8";
-      sha256 = "0sm9548ky5vi2sr5zjzwwna5f4pfs0nmlaw0pjnamxwfjzy4jnfb";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/natefinch/lumberjack.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/natefinch/lumberjack.v2";
-      rev = "a96e63847dc3c67d17befa69c303767e2f84e54f";
-      sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/square/go-jose.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/square/go-jose.v1";
-      rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d";
-      sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
-      sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
-    };
-  }
-]

From bc7c311c4d0cedfe76883f6923cfbb828500485e Mon Sep 17 00:00:00 2001
From: Gabriel Adomnicai <gabesoft@gmail.com>
Date: Thu, 25 May 2017 23:41:42 -0700
Subject: [PATCH 0292/3246] Fixed meteor Future is not defined error

---
 pkgs/servers/meteor/main.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/meteor/main.patch b/pkgs/servers/meteor/main.patch
index b5834bf6292..4c21a29a05c 100644
--- a/pkgs/servers/meteor/main.patch
+++ b/pkgs/servers/meteor/main.patch
@@ -2,7 +2,7 @@ diff --git a/tools/cli/main.js b/tools/cli/main.js
 index 84f94bc..4fbda17 100644
 --- a/tools/cli/main.js
 +++ b/tools/cli/main.js
-@@ -484,6 +484,44 @@ var springboard = function (rel, options) {
+@@ -484,6 +484,45 @@ var springboard = function (rel, options) {
      process.exit(ret.wait());
    }
  
@@ -10,6 +10,7 @@ index 84f94bc..4fbda17 100644
 +  // patch shebang:
 +  var fs = require('fs');
 +  var path = require("path")
++  var Future = require("fibers/future")
 +  var srcOld = fs.readFileSync(executable, 'utf8');
 +  srcNew = srcOld.replace(/^#!\/bin\/bash/, '#!/bin/sh');
 +  if (srcOld !== srcNew) {

From 6152f4af263f77576a6af918aafa00d726b7ca78 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Jul 2017 03:24:03 +0200
Subject: [PATCH 0293/3246] Jenkinsfile-vim-syntax: init

---
 pkgs/misc/vim-plugins/default.nix      | 297 +++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |   2 +
 2 files changed, 157 insertions(+), 142 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0077185ded4..09eda93b09a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -169,22 +169,22 @@ rec {
   };
 
   Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Supertab-2016-11-27";
+    name = "Supertab-2017-06-20";
     src = fetchgit {
       url = "git://github.com/ervandew/supertab";
-      rev = "cdaa5c27c5a7f8b08a43d0b2e65929512299e33a";
-      sha256 = "0hym28chljfglqdrxajbh92r35cppxl5wyxdrgqwpa0am9d2xdvg";
+      rev = "22aac5c2cb6a8ebe906bf1495eb727717390e62e";
+      sha256 = "1m70rx9ba2aqydfr9yxsrff61qyzmnda24qkgn666ypnsai7cfbn";
     };
     dependencies = [];
 
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2017-05-30";
+    name = "Syntastic-2017-07-07";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "159900a1a2d3db2c4d3757f1085f377c6e59ac02";
-      sha256 = "1bq3di4kr855sma0qp6gyrrphy23hy2mn9ws5knnzicxmq5fixqb";
+      rev = "e1161a723a353db99780f9a9351340df7abbb106";
+      sha256 = "00gvx33yz199n7lynli0fb8cf58lb5cs0jxrqggjjy261xv2lcq1";
     };
     dependencies = [];
 
@@ -202,11 +202,11 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2017-06-05";
+    name = "Tagbar-2017-06-15";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "87a1263f5d8b3623bee5e6036254480e668b5f74";
-      sha256 = "1s6727vwrcikv9dmkl6s1c2r2r107p733j8sjjxshl68bi62ms8z";
+      rev = "f5792732de16b8a2cc202f920e363eb413d7241d";
+      sha256 = "188xdmrp2g7bfzg95pv1qa2l17sqwy1g2p4syj7546fksddmwgms";
     };
     dependencies = [];
 
@@ -224,22 +224,22 @@ rec {
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-06-05";
+    name = "The_NERD_tree-2017-06-30";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "a9ab90198be0581fe961125bba3f282a666ef7ff";
-      sha256 = "0qf2xjr2hyz08xalgv6yjr5rrrcxgv76sshr7d62sygg6qfsnbgw";
+      rev = "2e43ad074bb3b7fafc77b9eea5098047d6fe6e90";
+      sha256 = "1mbj0qcjmrc4n0p9i96rm29qpi5j1shp69iv5kcv8sxiqgfrlqlm";
     };
     dependencies = [];
 
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2017-01-20";
+    name = "UltiSnips-2017-06-30";
     src = fetchgit {
       url = "git://github.com/SirVer/ultisnips";
-      rev = "5352d98f212e273b3e8b1d84efdbe2d6a6d557e9";
-      sha256 = "0d27823qnfd9qcj2a2x77slsw725jfa9s40ilw4qp9ab03bma1ci";
+      rev = "423f264e753cec260b4f14455126e6db7ba429af";
+      sha256 = "19g3k0nqzizv39rxwgkca9n2gsd19z2wwsmicr0zcgnf50nhkznh";
     };
     dependencies = [];
 
@@ -408,11 +408,11 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2017-06-02";
+    name = "vim-autoformat-2017-06-26";
     src = fetchgit {
       url = "https://github.com/Chiel92/vim-autoformat";
-      rev = "41d1c14de27f76f400c51d45b1617319266d9f4a";
-      sha256 = "0myhs5fjq9lr0ag49scdhchsifhc7djmyrx88nhsing33l4nbjzk";
+      rev = "ad189cdde5a50699a1d6b2b4b669e73942e47710";
+      sha256 = "0jk1qigvz2xkpr13ii0pg0nszrnzwn51gckxjvgaqwbsz967ccsj";
     };
     dependencies = [];
 
@@ -441,11 +441,11 @@ rec {
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-06-06";
+    name = "deoplete-nvim-2017-07-05";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "8bd63b7e4f9bb3cf2040724dd71cff195564166a";
-      sha256 = "1jf6l5li7m4m2ijfndqgm95mpw9c188vfbsggnzp2ivcxc7bd8bv";
+      rev = "376b0c9bbdd30e51a253319ff63762165f30d41a";
+      sha256 = "0r6bwwsl9r40nv02hca1h00wgakmrjqzamz3whf7xnb0vx9p29n9";
     };
     dependencies = [];
 
@@ -474,11 +474,11 @@ rec {
   };
 
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2017-05-13";
+    name = "vim-closetag-2017-07-04";
     src = fetchgit {
       url = "https://github.com/alvan/vim-closetag";
-      rev = "52a0747c9e1a52b1aedcace4801657d63462718f";
-      sha256 = "0499cmyq7hs9b5rcnw1xd2w56xyw73qw9v5iqx3c7nsjka46ffys";
+      rev = "e15684e10eb456399fc496467cc9ece1e18a7ec8";
+      sha256 = "1rs1dlnn5syxny3qrgggyz8rc6anr8gkhkn19i72nmrvcbb40w0k";
     };
     dependencies = [];
 
@@ -496,11 +496,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-06-10";
+    name = "clighter8-2017-07-08";
     src = fetchgit {
       url = "https://github.com/bbchung/clighter8";
-      rev = "c83091b35c0d09cee0d6850c91824f72a0d8c513";
-      sha256 = "105a4c753n57svyz8abs5w0v2747pyfly7dzjyh6i5yraaq2g7bx";
+      rev = "83ebf9e3961fcf1a4ccc557ab5f8c55cb813bc3b";
+      sha256 = "0rv16fbg0ga5csk9p2zczh100i55j1h70s0rcvdbgzfmbbmgsda7";
     };
     dependencies = [];
     preFixup = ''
@@ -510,11 +510,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-06-10";
+    name = "neomake-2017-07-07";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "cc916f35fa3d131b2d6529d0e47bde141d99b7c3";
-      sha256 = "00kz9ny3z4j6nhgzxarj8d072k6sf4qiwgfj4ckmllq5fyb2ik4l";
+      rev = "79c7dba684e3b179d7416d84fc86fac38f8190fe";
+      sha256 = "039b76n7d2nbbzrd83y4j8g103dvnrmk1pa84is5r5qv33hdpc0x";
     };
     dependencies = [];
 
@@ -554,11 +554,11 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2017-06-01";
+    name = "vim-tmux-navigator-2017-06-20";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-tmux-navigator";
-      rev = "b93e176b7150942d9f0556347d1c8f6d0b690124";
-      sha256 = "1xjvx4svv1kdqmv114ghx7cfrb5kmbljlwac8bsw36rq3kyknwrn";
+      rev = "3e83ddc509c66ac86b0c2961613076f74f34a2b6";
+      sha256 = "0zp81qkaahcl85s60cphqh7rsw3hpvnlr98p5lwzp5dsbxxh0iby";
     };
     dependencies = [];
 
@@ -576,11 +576,11 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2017-06-04";
+    name = "ctrlp-vim-2017-07-04";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "019f20a6f280b875b3812ea4d03a4cf1647cd0d9";
-      sha256 = "1zyl140ykjc1g7kc306f03q7xcxjzx757hphdgcb63ksql2k1f33";
+      rev = "b9b334b7ee07f03bbbc46193bb544124bd430148";
+      sha256 = "1pzhffbbmw45x6izdhyi7zp6wy2x2r93g6jz03fdj0qmja0wk1b4";
     };
     dependencies = [];
 
@@ -642,11 +642,11 @@ rec {
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2017-04-30";
+    name = "neco-ghc-2017-06-17";
     src = fetchgit {
       url = "https://github.com/eagletmt/neco-ghc";
-      rev = "aeb84b9ef05d1c5b0c835365ddcd424930fb0cd2";
-      sha256 = "1yhdrjqw5chq7jgk397swh4axpv6m4aqracyqmx4bb65pzqbwdxl";
+      rev = "ea515ae60a0523539fe75680f07aa2a588de9a99";
+      sha256 = "1pj5a5v3x8vnkck60kc25ph9b5xx0d8ipa4f4llxpc0q8d2xzk6w";
     };
     dependencies = [];
 
@@ -697,11 +697,11 @@ rec {
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2017-03-30";
+    name = "vim-localvimrc-2017-07-06";
     src = fetchgit {
       url = "https://github.com/embear/vim-localvimrc";
-      rev = "f2c576cda5a4dfd7a1030564c602dd6ab8589732";
-      sha256 = "10wvglf8dygai0094bwwcilffms0m3y36h2sb46iaqw8yz00d78b";
+      rev = "48c01c214ea0312e8045aaa1a28b30850e98a194";
+      sha256 = "158ajdg3n8j0cxk2ry8rmnpfvnzmznhl573v8ddw6xni58b7bg4d";
     };
     dependencies = [];
 
@@ -719,11 +719,11 @@ rec {
   };
 
   ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ensime-vim-2017-04-06";
+    name = "ensime-vim-2017-07-06";
     src = fetchgit {
       url = "https://github.com/ensime/ensime-vim";
-      rev = "4fd7886b169388e07261c525826c0e453094e446";
-      sha256 = "194qwj3glw3l9yxvd26vn10kl06v1sykqx2cznskqa3vj3z8jb01";
+      rev = "a8a2f024283af8e0b69165960ba59d850d1b80a4";
+      sha256 = "0vn7iv05jil7j1k4wgnnb9b1b4yqlxjkqmmz8a71291qg17bs5c8";
     };
     dependencies = ["vimproc" "vimshell" "self" "forms"];
     pythonDependencies = with pythonPackages; [ sexpdata websocket_client ];
@@ -741,11 +741,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-06-10";
+    name = "vim-go-2017-07-06";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "7b93bae4b08091c4d6243dafc2e040a84ea91d1d";
-      sha256 = "0hrzgxlkqvlh45pvli2aqnzx58vyjhmcz6rr28cm7x8b0wf20r00";
+      rev = "f08fcab5c51bee18174340405b773a950446e9f5";
+      sha256 = "1hsfaca9mhp7829b6kl7bmrwm03kjjhz9grmjzgr7v3arlpcv9sa";
     };
     dependencies = [];
 
@@ -774,11 +774,11 @@ rec {
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2017-06-10";
+    name = "psc-ide-vim-2017-07-05";
     src = fetchgit {
       url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "f5fc6aadf805ec0186efc63cbf294f251c1b2056";
-      sha256 = "0syrvkbbrcxmss07sppgsg43j241fm6yqj8ii54fm51vss02qxp8";
+      rev = "22813d6222766d773e77fadf36ee5eed4162ece4";
+      sha256 = "0261nkzj7412f55l6yxsr9xh2ynvnm5zb6ciasj809ynqapqvx2i";
     };
     dependencies = [];
 
@@ -829,11 +829,11 @@ rec {
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2017-05-28";
+    name = "calendar-vim-2017-07-02";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim";
-      rev = "12c06ba87f32002b3c9f34fe881bcbaf3ab1721b";
-      sha256 = "02ss39227c8jfn95hqwwpgn1rvrgwib8h5h0j9rvl6x491jj98wg";
+      rev = "1b4bff01dbcf81e9415c4181e702762f2c4f5638";
+      sha256 = "0lsyy7xn460sawpki2svc29b2dm7n6vi0r22jm4djk7n5y9y4xj4";
     };
     dependencies = [];
 
@@ -917,22 +917,22 @@ rec {
   };
 
   auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "auto-pairs-2017-03-22";
+    name = "auto-pairs-2017-07-03";
     src = fetchgit {
       url = "https://github.com/jiangmiao/auto-pairs";
-      rev = "20ec5b043f82ffa11a079f545438e6544ef112ed";
-      sha256 = "14pypb2kfrylhn73gx964hls040zaqnpl1am6f0yi01h524xz0xf";
+      rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda";
+      sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6";
     };
     dependencies = [];
 
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nerdtree-tabs-2017-02-22";
+    name = "vim-nerdtree-tabs-2017-07-04";
     src = fetchgit {
       url = "https://github.com/jistr/vim-nerdtree-tabs";
-      rev = "01ae3cdc7018fa33f140cce3e7cdf210c04ffbab";
-      sha256 = "01z2xp95sqi5mxhdxm8q0zkx83rn16qbv884rj2irmbl1k8fhv62";
+      rev = "47bbe5afc26f701f08d31b2bbdb660f117367ded";
+      sha256 = "0a1gqdvmpa4gylnb7sxs6zr89i60fl16p477200x18hgh2zd2v02";
     };
     dependencies = [];
 
@@ -972,11 +972,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2017-06-10";
+    name = "fzf-vim-2017-07-01";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "cf60e546476f73514a326416916b6a98f88d8abd";
-      sha256 = "11cls65zfv9gzz8qmg44q0i03hmwhqb8i53lb42vdz2bzicdasv3";
+      rev = "55f6bc83677235a7f6ffc35496ecae2e2a764417";
+      sha256 = "0yir125q9cgpk5b07ns9rg0s8f65g7jfka1jq9ir02w47090kgnb";
     };
     dependencies = [];
 
@@ -1049,11 +1049,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-06-09";
+    name = "vimtex-2017-07-06";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "0ae4e776cb78ce0c18635fecd6f518e3f40e5f80";
-      sha256 = "1iz87nr89wamxpg4whfqdfhp6qmfff6jjp58sjzh5q32lzzmi48s";
+      rev = "b31b49f0dca7c7acff9b7256315c3dc3bcedac98";
+      sha256 = "1qbhypswa2pa61ksyqp987q9413wvwkhj0avcbvli2n3hn8scz5f";
     };
     dependencies = [];
 
@@ -1118,12 +1118,23 @@ rec {
 
   };
 
+  Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Jenkinsfile-vim-syntax-2017-05-16";
+    src = fetchgit {
+      url = "https://github.com/martinda/Jenkinsfile-vim-syntax";
+      rev = "d3ad4bc4888740c524bfa2f8b3192cfb23ddec3f";
+      sha256 = "1sw1rwxspa94aak9gq6i1z47cqhkm2nbbj8xlkzbk3c04mqljksf";
+    };
+    dependencies = [];
+
+  };
+
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-06-05";
+    name = "vim-startify-2017-06-15";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "53c53b24440d14d7886484ad662549fc78550c40";
-      sha256 = "1w3kxvydnd7rh2fp3ra677dw11rsnmnm9bav92j3dkkb5afhmj3v";
+      rev = "7f910ed4367de96310fedc98d5a12b97173a405f";
+      sha256 = "1l5q8mqqp6gzmxqm5i0lx6lbm181vmkcg8w24ypa77vnid0ihd93";
     };
     dependencies = [];
 
@@ -1174,11 +1185,11 @@ rec {
   };
 
   vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-indent-guides-2016-04-17";
+    name = "vim-indent-guides-2017-07-03";
     src = fetchgit {
       url = "https://github.com/nathanaelkane/vim-indent-guides";
-      rev = "018298ead9d3aa9cd3b4ae222f81022a33978b09";
-      sha256 = "0zyrs9r3vza2kqhqir6qpkygy6yljpn877bvycspv89ljzczmwrs";
+      rev = "b40687195c01caf40f62d20093296590b48e3a75";
+      sha256 = "17hc3bdb707lkg0kyac2czjjijdrzarnh6sr78s9rqpwrj3fj4i4";
     };
     dependencies = [];
 
@@ -1240,11 +1251,11 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2017-05-08";
+    name = "vim-watchdogs-2017-06-23";
     src = fetchgit {
       url = "https://github.com/osyo-manga/vim-watchdogs";
-      rev = "fcf1b1bacba95ac9739adb3851c3595136c96d0e";
-      sha256 = "11qldi4p34x8y974ajvv88pw2wjxsrlpx03n846nyhqridgpfsj9";
+      rev = "22a08dcd33223ddbe95c977ca72e77d62d2c75d9";
+      sha256 = "0d3i39cz5kpps2gxlbz2l73bz0rs67lhh6qrpzl3a2p014hixbyi";
     };
     dependencies = [];
 
@@ -1262,11 +1273,11 @@ rec {
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2017-06-09";
+    name = "python-mode-2017-07-04";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "4c426b98c2f9094f44bdbe02f43e44badfa61724";
-      sha256 = "0lpd5k2j22r5wx5x5wh97mdsfyspfxf23kh241l7zbfm573r4jy0";
+      rev = "d2dead6ce9d900b26dbf1a06c52969f4194eda64";
+      sha256 = "1iq26a2l9maapz3433pwywmqla4wf7jass7s7bh32h10m2fh88a0";
     };
     dependencies = [];
 
@@ -1295,22 +1306,22 @@ rec {
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-05-07";
+    name = "vim-grammarous-2017-07-02";
     src = fetchgit {
       url = "https://github.com/rhysd/vim-grammarous";
-      rev = "607fc41ebd8dcd1fb00eecde52a3c9e4fbab3c64";
-      sha256 = "0pv9747lkmhwxcdrhbnd28rh6rsslzrf9yqlznhjxqa6z9in81ca";
+      rev = "d117cd139b58319d8ac94f2fd36ee548b6ea1e88";
+      sha256 = "0a5a65j9a3s54z9asjmfbqsvawx014bq772jqgpsxww53lap3s5x";
     };
     dependencies = [];
 
   };
 
   vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-puppet-2017-04-06";
+    name = "vim-puppet-2017-07-02";
     src = fetchgit {
       url = "https://github.com/rodjek/vim-puppet";
-      rev = "cce0312adcaa15c462aba89057565520c1928685";
-      sha256 = "1cmgmrn534ycw0jc1m8fsrw7qjis2529bvb1jiv5jqqdyff3bw2f";
+      rev = "cb1863af2ba4de9fb1c1d952d82692502348fb92";
+      sha256 = "0a3q6f8jplxbvpjaz9vnh589al64vg567nc00xabp46vcm83nk4x";
     };
     dependencies = [];
 
@@ -1328,33 +1339,33 @@ rec {
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-06-09";
+    name = "neoformat-2017-07-06";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "a52b155f6cc2f401afb04f865b2198d47b393ddd";
-      sha256 = "1a0j1k3bm9mp9d622m4kh5n9r2q4330kd0n3n9n60kmy3bnpa5w1";
+      rev = "0a4904771ee0df76f01146bdcbac5dde4f5a61af";
+      sha256 = "09i4ngih8cd3613mhsz0bbpwppbwsx723k7xx9ha6ybnfrmhx1ra";
     };
     dependencies = [];
 
   };
 
   deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-rust-2017-05-30";
+    name = "deoplete-rust-2017-06-28";
     src = fetchgit {
       url = "https://github.com/sebastianmarkow/deoplete-rust";
-      rev = "5447ee448d3d63cda4681e6309b1c18c493e1cd1";
-      sha256 = "1dr95vnp11zzia7vnwdhhrmkslnak77nps4zr447f34lxk185v5d";
+      rev = "505735576e29d30fee5074a9a49fdeb989c632b2";
+      sha256 = "0nqvk7f7asbfcfiv2lw3hinsaln648xc8k5jd630q0p4gyyxqpdm";
     };
     dependencies = [];
 
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2017-05-17";
+    name = "vim-polyglot-2017-06-12";
     src = fetchgit {
       url = "https://github.com/sheerun/vim-polyglot";
-      rev = "d5b9c4ae84aaa98bdfbf15cba90eeafa5aded091";
-      sha256 = "17crapp8l2d77cpw6ac4a2y3q7ipi11in2jz2169m78y643gbz42";
+      rev = "8eab5f5403afc1c33a7593459a27f7ff625fa60b";
+      sha256 = "0q2xfmqk5iad6gv8zzlpcv48xpv7lwr6mswc7mdllzkgaqilz75g";
     };
     dependencies = [];
 
@@ -1372,44 +1383,44 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-05-27";
+    name = "neocomplete-vim-2017-06-24";
     src = fetchgit {
       url = "https://github.com/shougo/neocomplete.vim";
-      rev = "4fd73faa262f5e3063422d9fc244c65f1b758cf3";
-      sha256 = "0hl5incxkxb491vnf3j2hndv4x31ic6dgj7wqka1bfqjcl53wjfl";
+      rev = "186881fc40d9b774766a81189af17826d27406c2";
+      sha256 = "0x9fmvliwxm49q8970byaqrnrffcxjf29z0y7xsfi56sv277lpl5";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2017-06-11";
+    name = "neosnippet-snippets-2017-07-05";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "0507e9c200a904a21fa5d15ee66a1ea9fe07bb01";
-      sha256 = "1rc67yqfhzqxq15sl258kdwgk8r55w470s0vcd1ax2h8yd4s7sc7";
+      rev = "b89c544264912b064c79da2a90fc5d4e69d621b2";
+      sha256 = "1cqgagzxl559mf06kkggdm90g27is0x80qqrrha09ng16hf6qf7a";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-06-11";
+    name = "neosnippet-vim-2017-06-24";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "6f87e27d4e20ea8b71821df06f71818716a13cf3";
-      sha256 = "0wfbicqblz91w5rzndy8zirzf819abmjv1az8yd26q1bbh3j0jpb";
+      rev = "867149c56651f0958bfde1f56e203f90afba134d";
+      sha256 = "19cwpans16ahmmnjfqxz5x3zw89qn93c9sc80sscw76i4ih4skml";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2017-05-27";
+    name = "unite-vim-2017-07-01";
     src = fetchgit {
       url = "https://github.com/shougo/unite.vim";
-      rev = "ada33d888934d8a9e60aa8ff828b651aaedb6457";
-      sha256 = "0f4vnp3avpy7ns5ndr29ibff9d8hazji95y6m5idvziswywzpwsy";
+      rev = "ad15f96365b5cb43a45d0ca779df6a497f954f15";
+      sha256 = "0pigwfwyas4zdzrazk08p9bnbmi51np4gb0mf5dy434glw9rrvjz";
     };
     dependencies = [];
 
@@ -1522,11 +1533,11 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2017-06-06";
+    name = "vim-dispatch-2017-06-23";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "1beee74e5ae75c46fd3f1255cce2543769102dc0";
-      sha256 = "0jvcxr22i3yqcfvshl97939kki9ng9mvmf79qph3y9x2h0fhzikm";
+      rev = "ca10dc106a5a3684573a3841560b167f4b86fde1";
+      sha256 = "1ad98k08i5zcyggjxcxygr4j513fg43di99gqg1jbi8xvyhgha69";
     };
     dependencies = [];
 
@@ -1577,22 +1588,22 @@ rec {
   };
 
   vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-haskellconceal-2014-10-28";
+    name = "vim-haskellconceal-2017-06-15";
     src = fetchgit {
       url = "https://github.com/twinside/vim-haskellconceal";
-      rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9";
-      sha256 = "1a1v0m3qj0gian3mp5xynf2ghscr3xaid37b0wi38bb4f2qrigqy";
+      rev = "802f82a5afee56e9e1251e6f756104a3bd114234";
+      sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r";
     };
     dependencies = [];
 
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-06-05";
+    name = "youcompleteme-2017-07-07";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "b20809332c3298cb954cff20006cb52955b54b2d";
-      sha256 = "19a9lyc2xx1qp39dgyyi74bnslh6vhdi4y55b61li07b5qa4sh20";
+      rev = "d299f9eb708ec83713f904dbb49c4260b6b22240";
+      sha256 = "0g2spq5c9sps0zql8pg0xbnxbcqn0aacy96jd1ixxh6dg9gijkp0";
     };
     dependencies = [];
     buildPhase = ''
@@ -1614,11 +1625,11 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2017-05-24";
+    name = "vim-airline-themes-2017-06-24";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "43fe3927b884dcf722f9109e39801db110186dab";
-      sha256 = "1rl4im3pllkfvc5z3shmwblzvp4s3lri3clzpirzqmywa027d0p8";
+      rev = "7865fd8ba435edd01ff7b59de06a9be73e01950d";
+      sha256 = "0fd4s8y6w5flbrikislcvj2a0jb77rd6gwg207qskxfqncxsbswn";
     };
     dependencies = [];
 
@@ -1768,22 +1779,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2017-06-08";
+    name = "vim-wakatime-2017-07-03";
     src = fetchgit {
       url = "https://github.com/wakatime/vim-wakatime";
-      rev = "a96180dd0e694e9a5dadfb65e4c3465a9184840f";
-      sha256 = "0wf108myrfjslf56xqiwsl2mkaqz7qn5k7ggvcfwmhp91lzl5aan";
+      rev = "0c5368cf01f4d452a05eb5e5569e6fe78dca2657";
+      sha256 = "025d0gz0fs3jb062jp7js11b8vb20zyxa32llqsjkyy4gr8kv53b";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2017-06-08";
+    name = "command-t-2017-06-23";
     src = fetchgit {
       url = "https://github.com/wincent/command-t";
-      rev = "3f0d21a06d9b936bcd79970c1b2301b05dd297bc";
-      sha256 = "15wil973sqfgvix9li15qk49kv9l3rn8zqis2cl71k6xh1xvd9ff";
+      rev = "29f2606a9665058a98b56f2d8062ba614a3f246e";
+      sha256 = "0q6kqjy88w1478k2q6vqyyid69whd72746i0cd33xnslgykwm2hn";
     };
     dependencies = [];
     buildInputs = [ perl ruby git ];
@@ -1824,7 +1835,7 @@ rec {
       sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq";
     };
     dependencies = [];
-    buildInputs = [ python3 ];
+    buildInputs = [ python3 ]; 
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -2218,11 +2229,11 @@ rec {
   };
 
   vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-syntax-checker-2013-07-12";
+    name = "vim-addon-syntax-checker-2017-06-26";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-syntax-checker";
-      rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77";
-      sha256 = "0gcvb922w4jsi203ygbnij9xhmgc6knj9b3ivw3m0fv5ckk4iw5f";
+      rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344";
+      sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -2251,11 +2262,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-05-08";
+    name = "vim-airline-2017-07-07";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "466198adc015a9d81e975374d8e206dcf3efd173";
-      sha256 = "1dq47y24dc84dkpgv44jh5n2q5jqm5xvriql81441lbwldyq99ld";
+      rev = "e03afa1733c6296774ca95ef981bd8fd39bb1151";
+      sha256 = "0n8l4al4hicnz1xyhcbyb6iw3fxrjslmxk18zanyqcamhfj94vy3";
     };
     dependencies = [];
 
@@ -2317,11 +2328,11 @@ rec {
   };
 
   vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2016-03-16";
+    name = "vim-latex-live-preview-2017-06-22";
     src = fetchgit {
       url = "git://github.com/xuhdev/vim-latex-live-preview";
-      rev = "99501642c1dd3f703ac6301ae13469f4990b7a06";
-      sha256 = "0dkm3v1jqi8aq0jfpa6fdwgbfbwidc32ci1y9vhqb1prs15qrqfl";
+      rev = "becc9d4f1a774e6deb7a96015200de35f1bec1a3";
+      sha256 = "0mqvzk94byiccm7v8kdk0hcbz05k9l69kv3ljg8djbvj5q6zzi2m";
     };
     dependencies = [];
 
@@ -2339,11 +2350,11 @@ rec {
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2016-11-20";
+    name = "vim-signature-2017-06-20";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "7e13913188809c45e14988270213744d1c3bb485";
-      sha256 = "0lcmv8fxj50r1r51379sxdy0ra3s0i1cgyqi4wp2zmpz06c1c2nx";
+      rev = "c6decc68d644a66a34345ea09677469d6e482e1f";
+      sha256 = "1iflyvskimq74hzb6l8mzjv3rh0i15bw9jv5x6arns86q3201l23";
     };
     dependencies = [];
 
@@ -2361,11 +2372,11 @@ rec {
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2017-06-09";
+    name = "vim-snippets-2017-07-07";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "d21f43c210ac7b04ec1bcda39f10b03a934a9ae8";
-      sha256 = "1vv7kpin3aqzz47937b5w5q2hcr9gldz0x39i6z3wa3q4x2sg366";
+      rev = "0817950a4fb8ccd48ec38a2b65cf046b597eecb3";
+      sha256 = "0hxd96zl5gjkx5d381yzyrbahwbz3r9dljzn2cxbdbjsb7im6aks";
     };
     dependencies = [];
 
@@ -2401,14 +2412,15 @@ rec {
       sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h";
     };
     dependencies = [];
+
   };
 
   vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vinegar-2017-05-23";
+    name = "vinegar-2017-06-27";
     src = fetchgit {
       url = "git://github.com/tpope/vim-vinegar";
-      rev = "9abe956acc14444c0fda75eb98c8e31cf81b4c26";
-      sha256 = "16a85lk20v50krl899w0i9zl6gp7478f4pd6mqz8519d76vbmy99";
+      rev = "c795cb739347cbddeeb288c3c35da9f140a513c9";
+      sha256 = "1dcirb0b73s2l14ppn8mlh79pjpf9kgym9im05039ynr9rl83fv3";
     };
     dependencies = [];
 
@@ -2424,4 +2436,5 @@ rec {
     dependencies = [];
 
   };
+
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index cda3865d3de..5f106218dae 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -84,6 +84,7 @@
 "github:luochen1990/rainbow"
 "github:lyokha/vim-xkbswitch"
 "github:machakann/vim-highlightedyank"
+"github:martinda/Jenkinsfile-vim-syntax"
 "github:mhinz/vim-startify"
 "github:michaeljsmith/vim-indent-object"
 "github:mileszs/ack.vim"
@@ -101,6 +102,7 @@
 "github:rhysd/vim-grammarous"
 "github:rodjek/vim-puppet"
 "github:rust-lang/rust.vim"
+"github:sebastianmarkow/deoplete-rust"
 "github:sbdchd/neoformat"
 "github:sheerun/vim-polyglot"
 "github:shougo/neco-vim"

From ebaff599ba0e76ab3c505c4039df979d3799a17c Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Sun, 9 Jul 2017 18:59:09 +0200
Subject: [PATCH 0294/3246] nixos/auditd: init at 2.7.6 (#27261)

#11864 Support Linux audit subsystem
Add the auditd.service as NixOS module to be able to
generate profiles from /var/log/audit/audit.log
with apparmor-utils.

auditd needs the folder /var/log/audit to be present on start
so this is generated in ExecPreStart.

auditd starts with -s nochange so that effective audit processing
is managed by the audit.service.
---
 nixos/modules/module-list.nix     |  1 +
 nixos/modules/security/auditd.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 nixos/modules/security/auditd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a2add1b3e43..3aeb1225ae5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -116,6 +116,7 @@
   ./security/apparmor.nix
   ./security/apparmor-suid.nix
   ./security/audit.nix
+  ./security/auditd.nix
   ./security/ca.nix
   ./security/chromium-suid-sandbox.nix
   ./security/dhparams.nix
diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
new file mode 100644
index 00000000000..319dce9a6c5
--- /dev/null
+++ b/nixos/modules/security/auditd.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  options.security.auditd.enable = mkEnableOption "the Linux Audit daemon";
+
+  config = mkIf config.security.auditd.enable {
+    systemd.services.auditd = {
+      description = "Linux Audit daemon";
+      wantedBy = [ "basic.target" ];
+
+      unitConfig = {
+        ConditionVirtualization = "!container";
+        ConditionSecurity = [ "audit" ];
+      };
+
+      path = [ pkgs.audit ];
+
+      serviceConfig = {
+        ExecStartPre="${pkgs.coreutils}/bin/mkdir -p /var/log/audit";
+        ExecStart = "${pkgs.audit}/bin/auditd -l -n -s nochange";
+      };
+    };
+  };
+}

From 56923a410eb34534f3a2facfdbc7c8fd2bd7be6f Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer@necsi.edu>
Date: Sun, 9 Jul 2017 13:32:52 -0400
Subject: [PATCH 0295/3246] pjsip: 2.5.5 -> 2.6

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

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 4ccc3fd5237..bceabc2a64a 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pjsip-${version}";
-  version = "2.5.5";
+  version = "2.6";
 
   src = fetchurl {
     url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
-    sha256 = "ab39207b761d3485199cd881410afeb2d171dff7c2bf75e8caae91c6dca508f3";
+    sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig";
   };
 
   buildInputs = [ openssl libsamplerate alsaLib ];

From 64c3247f6ff94221ef20f4d577154fa59e9aa0e3 Mon Sep 17 00:00:00 2001
From: 239 <239@users.noreply.github.com>
Date: Sun, 9 Jul 2017 20:23:48 +0200
Subject: [PATCH 0296/3246] opera: 45.0.2552.898 -> 46.0.2597.39

- updated to 46.0.2597.39
- gtk2 dependency changed to gtk3
- 32-bit package is no longer supported
---
 .../networking/browsers/opera/default.nix     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 26e3d2de7a9..52a2ce9164c 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -12,7 +12,7 @@
 , gdk_pixbuf
 , glib
 , gnome2
-, gtk2
+, gtk3
 , libX11
 , libxcb
 , libXScrnSaver
@@ -37,7 +37,7 @@
 let
 
   mirror = https://get.geo.opera.com/pub/opera/desktop;
-  version = "45.0.2552.898";
+  version = "46.0.2597.39";
 
   rpath = stdenv.lib.makeLibraryPath [
 
@@ -55,7 +55,7 @@ let
     gdk_pixbuf.out
     glib.out
     gnome2.GConf.out
-    gtk2.out
+    gtk3.out
     libX11.out
     libXScrnSaver.out
     libXcomposite.out
@@ -88,17 +88,18 @@ in stdenv.mkDerivation {
   name = "opera-${version}";
 
   src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
-        sha256 = "1a7y13mgc8g7swdg0x2l9h6cmqw74h2wxizi3vmlgz2fj5zlkn0g";
-      }
-    else if stdenv.system == "x86_64-linux" then
+    #if stdenv.system == "i686-linux" then
+    #  fetchurl {
+    #    url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
+    #    sha256 = "...";
+    #  }
+    #else 
+    if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
-        sha256 = "0rmagj0s1j3a6rpyrs29xnbngsq700rgaqkph108fbnj80hif1ia";
+        sha256 = "1ladvqilm5rr222wjybvribnyii2l0p8jbsd10xr06wps63g1kia";
       }
-    else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
+    else throw "Opera is not supported on ${stdenv.system} (only x86_64 linux is supported)";
 
   unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
 

From 69289e8f2a46f8a77cf816b793ec6908c4bce7ce Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer@necsi.edu>
Date: Sun, 9 Jul 2017 14:28:17 -0400
Subject: [PATCH 0297/3246] asio: 1.10.6 -> 1.10.8

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

diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix
index 76ef5ff1d98..dae8657388f 100644
--- a/pkgs/development/libraries/asio/default.nix
+++ b/pkgs/development/libraries/asio/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, boost, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "asio-1.10.6";
+  name = "asio-1.10.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/asio/${name}.tar.bz2";
-    sha256 = "0phr6zq8z78dwhhzs3h27q32mcv1ffg2gyq880rw3xmilx01rmz0";
+    sha256 = "0jgdl4fxw0hwy768rl3lhdc0czz7ak7czf3dg10j21pdpfpfvpi6";
   };
 
   propagatedBuildInputs = [ boost ];

From b6e15bde7a48f9ee1b0e44b0def6b3d20e241a93 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Sun, 9 Jul 2017 15:04:47 -0400
Subject: [PATCH 0298/3246] pgadmin: make desktop item

This change adds the .desktop file so that pgAdmin shows up in the menu
system of desktop environments (ex. GNOME, XFCE, etc).

Closes #27067
---
 pkgs/applications/misc/pgadmin/default.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index fba7b6371f6..968071e454e 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib }:
+{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   name = "pgadmin3-${version}";
@@ -29,4 +29,21 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ domenkozar wmertens ];
     platforms = platforms.unix;
   };
+
+  postFixup = let
+    desktopItem = makeDesktopItem {
+      name = "pgAdmin";
+      desktopName = "pgAdmin III";
+      genericName = "SQL Administration";
+      exec = "pgadmin3";
+      icon = "pgAdmin3";
+      type = "Application";
+      categories = "Application;Development;";
+      mimeType = "text/html";
+    };
+  in ''
+    mkdir -p $out/share/pixmaps;
+    cp pgadmin/include/images/pgAdmin3.png $out/share/pixmaps/;
+    cp -rv ${desktopItem}/share/applications $out/share/
+  '';
 }

From 4ae629dd9191bd3123e90c31fa28aa52334f3553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Th=C3=B6rne?= <notrupertthorne@gmail.com>
Date: Sun, 9 Jul 2017 21:21:51 +0200
Subject: [PATCH 0299/3246] git-big-picture: init at 0.9.0

Updated after review comments.
---
 .../git-and-tools/git-big-picture/default.nix | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 509a1b42cfa..6918f048eae 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -1,23 +1,30 @@
-{ fetchgit, python2Packages, stdenv, git, graphviz }:
+{ fetchFromGitHub, python2Packages, stdenv, git, graphviz }:
 
 python2Packages.buildPythonApplication rec {
-    pname = "git-big-picture";
-    version = "0.9.0";
+  pname = "git-big-picture";
+  version = "0.9.0";
 
-    name = "${pname}-${version}";
+  name = "${pname}-${version}";
 
-    src = fetchgit {
-      url = "https://github.com/esc/${pname}.git";
-      rev = "fbe3b9504e255da859067fd58e90d849d63e5381";
-      sha256 = "1h283gzs4nx8lrarmr454zza52cilmnbdrqn1n33v3cn1rayl3c9";
-    };
+  src = fetchFromGitHub {
+    owner = "esc";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1h283gzs4nx8lrarmr454zza52cilmnbdrqn1n33v3cn1rayl3c9";
+  };
 
-  propagatedBuildInputs = [ git graphviz ];
+  buildInputs = [ git graphviz ];
+
+  postFixup = ''
+    wrapProgram $out/bin/git-big-picture \
+      --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs  }
+    '';
 
   meta = {
     description = "Tool for visualization of Git repositories.";
     homepage = https://github.com/esc/git-big-picture;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nthorne ];
   };
 }

From 7b52b0c0677cedbec1a772aeb4f40f8c7cb37576 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 9 Jul 2017 21:04:33 +0200
Subject: [PATCH 0300/3246] youtube-dl: 2017.06.18 -> 2017.07.09

---
 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 0af3b72f6af..b730d45c9e2 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.06.18";
+  version = "2017.07.09";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "16az9rwr71hvs2z2xagnk71xqs7si0nb8rkn63r7pfv4rb134ggm";
+    sha256 = "0phrfby2nk5y5x5173bbg3jcr2ajk849al3zji5y39z39dj36ba2";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d29fc731b3d97959331322d2ff787e665e7d6342 Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Sun, 9 Jul 2017 23:12:57 +0300
Subject: [PATCH 0301/3246] Example of networking.hosts is now literalExample

---
 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 6035facb594..3a643943d3d 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -32,7 +32,7 @@ in
     networking.hosts = lib.mkOption {
       type = types.attrsOf ( types.listOf types.str );
       default = {};
-      example = ''
+      example = literalExample ''
         {
           "127.0.0.1" = [ "foo.bar.baz" ];
           "192.168.0.2" = [ "fileserver.local" "nameserver.local" ];

From 35e912793ac5b4c6e808dc23e61d755d473580ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 6 Jul 2017 18:03:12 +0200
Subject: [PATCH 0302/3246] maintainers: Add nh2

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 142e7ff7869..6e88e0d4299 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -390,6 +390,7 @@
   neeasade = "Nathan Isom <nathanisom27@gmail.com>";
   nequissimus = "Tim Steinbach <tim@nequissimus.com>";
   nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
+  nh2 = "Niklas Hambüchen <mail@nh2.me>";
   nhooyr = "Anmol Sethi <anmol@aubble.com>";
   nickhu = "Nick Hu <me@nickhu.co.uk>";
   nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";

From a37f3a3573bfd39b00ece2ec3f00661b020ad14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 6 Jul 2017 18:05:40 +0200
Subject: [PATCH 0303/3246] hotspot: init at 1.0.0

---
 .../tools/analysis/hotspot/default.nix        | 64 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/hotspot/default.nix

diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix
new file mode 100644
index 00000000000..ee9fbb11196
--- /dev/null
+++ b/pkgs/development/tools/analysis/hotspot/default.nix
@@ -0,0 +1,64 @@
+{ stdenv,
+  cmake,
+  elfutils,
+  extra-cmake-modules,
+  fetchFromGitHub,
+  kconfigwidgets,
+  ki18n,
+  kitemmodels,
+  kitemviews,
+  libelf,
+  qtbase,
+  threadweaver,
+}:
+
+stdenv.mkDerivation rec {
+  name = "hotspot-${version}";
+  version = "1.0.0"; # don't forget to bump `rev` below when you change this
+
+  src = fetchFromGitHub {
+    owner = "KDAB";
+    repo = "hotspot";
+    # TODO: For some reason, `fetchSubmodules` doesn't work when using `rev = "v${version}";`,
+    #       so using an explicit commit instead. See #15559
+    rev = "352687bf620529e9887616651f123f922cb421a4";
+    sha256 = "09ly15yafpk31p3w7h2xixf1xdmx803w9fyb2aq7mhmc7pcxqjsx";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [
+    cmake
+    elfutils
+    extra-cmake-modules
+    kconfigwidgets
+    ki18n
+    kitemmodels
+    kitemviews
+    libelf
+    qtbase
+    threadweaver
+  ];
+
+  # hotspot checks for the presence of third party libraries'
+  # git directory to give a nice warning when you forgot to clone
+  # submodules; but Nix clones them and removes .git (for reproducibility).
+  # So we need to fake their existence here.
+  postPatch = ''
+    mkdir -p 3rdparty/perfparser/.git
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A GUI for Linux perf";
+    longDescription = ''
+      hotspot is a GUI replacement for `perf report`.
+      It takes a perf.data file, parses and evaluates its contents and
+      then displays the result in a graphical way.
+    '';
+    homepage = "https://github.com/KDAB/hotspot";
+    license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ nh2 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9e5c35814e..52df066c74d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2430,6 +2430,8 @@ with pkgs;
 
   host = bind.host;
 
+  hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { };
+
   hping = callPackage ../tools/networking/hping { };
 
   htpdate = callPackage ../tools/networking/htpdate { };

From e211504db610101adc3ef40977b62607427bbe35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Jul 2017 13:03:21 +0200
Subject: [PATCH 0304/3246] Get rid of some usages of osx_private_sdk

For example this reduces haskell closure on
darwin for some packages for almost 500MB.
---
 .../apple-source-releases/libsecurity_apple_csp/default.nix   | 4 ++--
 .../libsecurity_apple_x509_cl/default.nix                     | 2 +-
 .../darwin/apple-source-releases/libsecurity_asn1/default.nix | 2 +-
 .../apple-source-releases/libsecurity_cdsa_plugin/default.nix | 4 ++--
 .../libsecurity_cdsa_utilities/default.nix                    | 2 +-
 .../apple-source-releases/libsecurity_cdsa_utils/default.nix  | 2 +-
 .../apple-source-releases/libsecurity_ocspd/default.nix       | 2 +-
 .../apple-source-releases/libsecurity_pkcs12/default.nix      | 2 +-
 .../apple-source-releases/libsecurity_utilities/default.nix   | 4 ++--
 .../darwin/apple-source-releases/libsecurityd/default.nix     | 4 ++--
 .../darwin/apple-source-releases/libunwind/default.nix        | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
index 04b1e2f21fe..1018100ba9c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, osx_private_sdk, stdenv }:
+{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, CommonCrypto, stdenv }:
 appleDerivation {
   buildInputs = [
     libsecurity_cdsa_utilities
@@ -19,7 +19,7 @@ appleDerivation {
     for file in lib/castContext.h lib/gladmanContext.h lib/desContext.h lib/rc4Context.h; do
       substituteInPlace ''$file --replace \
         '/usr/local/include/CommonCrypto/CommonCryptorSPI.h' \
-        '${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/CommonCrypto/CommonCryptorSPI.h'
+        '${CommonCrypto}/include/CommonCrypto/CommonCryptorSPI.h'
     done
     
     substituteInPlace lib/opensshWrap.cpp --replace RSA_DSA_Keys.h RSA_DSA_keys.h
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix
index d2f15e19ccf..c5e9418ce91 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd, osx_private_sdk }:
+{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd }:
 appleDerivation {
   buildInputs = [
     libsecurity_cdsa_plugin
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix
index ab11d893d19..a1c3204c15a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
+{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities }:
 appleDerivation {
   __propagatedImpureHostDeps = [
     "/System/Library/Frameworks/Security.framework/Security"
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix
index b0c35f0e30c..b2dbb75f297 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, osx_private_sdk, perl }:
+{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, perl }:
 appleDerivation {
   buildInputs = [
     libsecurity_cdsa_utilities
@@ -12,4 +12,4 @@ appleDerivation {
   preBuild = ''
     perl lib/generator.pl lib lib/generator.cfg lib lib || exit 1
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix
index 6f2436f2149..26515353b73 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix
@@ -1,4 +1,4 @@
-{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4, osx_private_sdk }:
+{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4 }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
index d9b594bc47c..aa73c281cab 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
@@ -1,4 +1,4 @@
-{ Security, appleDerivation, apple_sdk, cppcheck, libsecurity_cdsa_utilities, libsecurity_utilities, m4, osx_private_sdk }:
+{ Security, appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix
index 25701442d2b..81551e9a76e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
+{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix
index f84c2d8963f..b225d062dc9 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain, osx_private_sdk }:
+{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain }:
 appleDerivation {
   patchPhase = ''
     substituteInPlace lib/pkcsoids.h --replace '#error' '#warning'
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
index 9de1d120cc9..8dae6072413 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
@@ -1,4 +1,4 @@
-{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, osx_private_sdk, sqlite, stdenv }:
+{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, sqlite, stdenv, osx_private_sdk }:
 appleDerivation {
   buildInputs = [
     libauto
@@ -16,7 +16,7 @@ appleDerivation {
     substituteInPlace lib/ccaudit.cpp --replace '<bsm/libbsm.h>' '"bsm/libbsm.h"'
     substituteInPlace lib/powerwatch.h --replace \
       '<IOKit/pwr_mgt/IOPMLibPrivate.h>' \
-      '"${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/PrivateHeaders/pwr_mgt/IOPMLibPrivate.h"'
+      '"${IOKit}/Library/Frameworks/IOKit.framework/Headers/pwr_mgt/IOPMLibPrivate.h"'
 
     cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/security_utilities/utilities_dtrace.h lib
     cp -R ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/bsm lib
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix
index d311f678337..48bb80eb751 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
+{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities }:
 appleDerivation {
   buildInputs = [
     libsecurity_cdsa_utilities
@@ -20,4 +20,4 @@ appleDerivation {
   postInstall = ''
     ln -s ''$out/include/securityd ''$out/include/securityd_client
   '';
-}
\ No newline at end of file
+}
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 b4b2b685895..bd219ae434c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, dyld, osx_private_sdk }:
+{ stdenv, appleDerivation }:
 
 appleDerivation {
   buildPhase = ":";

From fca0b3602dbe499f608f0dab96a373b4616c9e6e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 9 Jul 2017 18:16:58 -0400
Subject: [PATCH 0305/3246] linux-copperhead: 4.12.b -> 4.12.c

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index b1448b02c6e..21261f98b86 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -2,8 +2,8 @@
 
 let
   version = "4.12";
-  revision = "b";
-  sha256 = "117n42sw2g40p68plr7b77mq18vibqjv0i4130f1bj6gk0sqn5i6";
+  revision = "c";
+  sha256 = "1jbzadvmbw0xhpknyi26zdwhvfrxrwvccrbm621z3b3mklsmdzjn";
 in
 
 import ./generic.nix (args // {

From d38656b3c347ee81ab6896b09464d78dfd5a1a7a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 9 Jul 2017 18:20:14 -0400
Subject: [PATCH 0306/3246] linux-copperhead: 4.12.c -> 4.12.d

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 21261f98b86..7f7c54731f5 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -2,8 +2,8 @@
 
 let
   version = "4.12";
-  revision = "c";
-  sha256 = "1jbzadvmbw0xhpknyi26zdwhvfrxrwvccrbm621z3b3mklsmdzjn";
+  revision = "d";
+  sha256 = "1glhqk6py8wkv291fh57r4z5hbiymzkhr8cqrh3r97yni2zs6lj4";
 in
 
 import ./generic.nix (args // {

From 1f926aa94fec553fd0e5b384d3a6d556d29128ae Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Jul 2017 00:16:58 +0200
Subject: [PATCH 0307/3246] irssi: 1.0.3 -> 1.0.4 for multiple CVEs

Fixes:
  * CVE-2017-10965
  * CVE-2017-10966

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

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

From 586f78082882e99bc0f76797186ca48c3f036b34 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Jul 2017 00:17:58 +0200
Subject: [PATCH 0308/3246] php56: 5.6.30 -> 5.6.31 for multiple CVEs

Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See https://secure.php.net/ChangeLog-5.php#5.6.31.
---
 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 709f0fad41e..ad138677187 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -325,8 +325,8 @@ let
 
 in {
   php56 = generic {
-    version = "5.6.30";
-    sha256 = "01krq8r9xglq59x376zlg261yikckq179jmhnlcg3gqxza9w41d1";
+    version = "5.6.31";
+    sha256 = "03xixkvfp64bqp97p8vlj3hp63bpjw7hc16b7fgm7w35rdlp2fcg";
   };
 
   php70 = generic {

From f15f580ccad514a2605208995e168e4108c6c80f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Jul 2017 00:19:37 +0200
Subject: [PATCH 0309/3246] php70: 7.0.19 -> 7.0.21 for multiple CVEs

Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.0.20
  * https://secure.php.net/ChangeLog-7.php#7.0.21
---
 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 ad138677187..6ded39ce036 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -330,8 +330,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.19";
-    sha256 = "0nbxgx5fkj1bcach97a3169kwic7jbd4b435n7v25v1aq2pw0fhg";
+    version = "7.0.21";
+    sha256 = "07r3qqyyvf16k4xk5b2070fwilggmph5937drjm8cvyyjb1k789b";
   };
 
   php71 = generic {

From 456c76169d57919cae92f0bb5314dfd3c12417e1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Jul 2017 00:21:12 +0200
Subject: [PATCH 0310/3246] php71: 7.1.5 -> 7.1.7

Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.1.6
  * https://secure.php.net/ChangeLog-7.php#7.1.7
---
 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 6ded39ce036..675616a5f21 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -335,7 +335,7 @@ in {
   };
 
   php71 = generic {
-    version = "7.1.5";
-    sha256 = "15w60nrickdi0rlsy5yw6aa1j42m6z2chv90f7fbgn0v9xwa9si8";
+    version = "7.1.7";
+    sha256 = "1y0z5n0kyd15wzmn1lprjgaysbg0z428q9cjbx4dqf3zk296g6q7";
   };
 }

From d2ff74f9dde46dd63b475986de935d0986d82988 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 10 Jul 2017 00:05:27 +0000
Subject: [PATCH 0311/3246] unionfs-fuse: 1.0 -> 2.0

---
 pkgs/tools/filesystems/unionfs-fuse/default.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix                 |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index b7d7a07a084..cfe3ff421fe 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "unionfs-fuse-${version}";
-  version = "1.0";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "rpodgorny";
     repo = "unionfs-fuse";
     rev = "v${version}";
-    sha256 = "0g2hd6yi6v8iqzmgncg1zi9a7ixy9hsh51rzf6jnmzi79543dihf";
+    sha256 = "0lb8zgdxnjy2fjr2284hvdfn7inc1in44ynzgcr66x54bxzvynj6";
   };
 
   patches =
@@ -34,10 +34,11 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "FUSE UnionFS implementation";
-    homepage = http://podgorny.cz/moin/UnionFsFuse;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://github.com/rpodgorny/unionfs-fuse;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52df066c74d..0802f663c8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1346,7 +1346,7 @@ with pkgs;
 
   unifdef = callPackage ../development/tools/misc/unifdef { };
 
-  "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { };
+  unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { };
 
   usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
   usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { };

From 05c2d800250e69504686c8d55b5d598a0529186c Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Fri, 7 Jul 2017 12:49:45 +0200
Subject: [PATCH 0312/3246] haskellPackages.inline-java: Add jdk build
 dependency

---
 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 230016d78c8..d9b185b4751 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -198,6 +198,8 @@ self: super: {
         '';
       })) pkgs.libcxx;
 
+  inline-java = addBuildDepend super.inline-java pkgs.jdk;
+
   # tests don't compile for some odd reason
   jwt = dontCheck super.jwt;
 

From 4dd55c1bf68b2548979a08dfa7231ced41e440eb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 10 Jul 2017 10:40:13 +0800
Subject: [PATCH 0313/3246] syncthing: 0.14.30 -> 0.14.31

---
 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 f7fed7208e1..033e6e5e0ab 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.30";
+  version = "0.14.31";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "14f2v8i8ga9vii015vbx70k1vd85ac0ygykz2z614ii932g5lfdr";
+    sha256 = "1zg9gj0g89swr8cxxrpl96adhqgxz40dwkm7n61q1vycd6hhl73d";
   };
 
   buildInputs = [ go removeReferencesTo ];

From 2b3dcfab041ec7413e456f4f6a3ae0af69f3b255 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Mon, 10 Jul 2017 03:49:29 +0000
Subject: [PATCH 0314/3246] pharo: build with gcc48

Building with GCC > 4.9 produces a broken VM for reasons that are not
yet understood, see
http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html

also disable "stackprotector" hardening for compatibility with this
older gcc.
---
 pkgs/development/pharo/vm/build-vm.nix | 16 ++++++++++++----
 pkgs/development/pharo/vm/vms.nix      |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 054b64db732..cb4dd776f61 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc6, ... }:
+{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }:
 
 { name, src, version, source-date, source-url, ... }:
 
@@ -26,7 +26,9 @@ stdenv.mkDerivation rec {
   pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
 
   # Note: -fPIC causes the VM to segfault.
-  hardeningDisable = [ "format" "pic" ];
+  hardeningDisable = [ "format" "pic"
+                       # while the VM depends on <= gcc48:
+                       "stackprotector" ];
 
   # Regenerate the configure script.
   # Unnecessary? But the build breaks without this.
@@ -94,8 +96,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # Note: Force gcc6 because gcc5 crashes when compiling the VM.
-  buildInputs = [ bash unzip glibc openssl gcc6 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid autoreconfHook ];
+  # gcc 4.8 used for the build:
+  #
+  # gcc5 crashes during compilation; gcc >= 4.9 produces a
+  # binary that crashes when forking a child process. See:
+  # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
+  #
+  # (stack protection is disabled above for gcc 4.8 compatibility.)
+  buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid autoreconfHook ];
 
   meta = {
     description = "Clean and innovative Smalltalk-inspired environment";
diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix
index bd1bddc69e9..5258f4f6e77 100644
--- a/pkgs/development/pharo/vm/vms.nix
+++ b/pkgs/development/pharo/vm/vms.nix
@@ -1,4 +1,4 @@
-{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc6, fetchFromGitHub, makeWrapper} @args:
+{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, fetchFromGitHub, makeWrapper} @args:
 
 let
   pharo-vm-build = import ./build-vm.nix args;

From 3365fdea045779cb888a5473979f567043a3a2ff Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 9 Jul 2017 21:23:05 -0700
Subject: [PATCH 0315/3246] wineUnstable: 2.10 -> 2.11

2.11 was picked instead of 2.12 since staging hasn't caught up yet,
 also updates staging
---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 043d305bbe8..3ea16a2db68 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.10";
+    version = "2.11";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "0ygiaayi2mv6jl450d03i4x2gd2bg3mwk3s2pxas87g8sbzzg3a8";
+    sha256 = "0g6cwjyqwc660w33453aklh3hpc0b8rrb88dryn23ah6wannvagg";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1i7lzr8w9w9hfa5djclp5n19plfgff6p1yhrs94a62jspf6c10sw";
+    sha256 = "0crv7hl39as0pjbi8ldws611izccdnss4hca4pgbz5cc80bki9gw";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 6ab8d349890622499fc57382032379855d4cd427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Mon, 10 Jul 2017 06:12:24 +0200
Subject: [PATCH 0316/3246] nix-zsh-completions: 0.3 -> 0.3.1

---
 pkgs/shells/nix-zsh-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix
index 5faca2fa8e8..46b3ce37b35 100644
--- a/pkgs/shells/nix-zsh-completions/default.nix
+++ b/pkgs/shells/nix-zsh-completions/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spwhitt";
     repo = "nix-zsh-completions";
-    rev = "0.3";
-    sha256 = "1vwkd4nppjrvy6xb0vx4z73awrhaah1433dp6h4ghi3cdrrjn7ri";
+    rev = "0.3.1";
+    sha256 = "1sbc52f5818bcygljrji84dyvgw727x50m9v6qfrsdaji3zkqga1";
   };
 
   installPhase = ''

From 22aebcf1e1ddc5505b54b590b2ab93dc660216a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Mon, 10 Jul 2017 06:27:27 +0200
Subject: [PATCH 0317/3246] nix-zsh-completions: add missing version to
 derivation name

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

diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix
index 46b3ce37b35..1261a4429a4 100644
--- a/pkgs/shells/nix-zsh-completions/default.nix
+++ b/pkgs/shells/nix-zsh-completions/default.nix
@@ -1,12 +1,16 @@
 { stdenv, fetchFromGitHub }:
 
+let
+  version = "0.3.1";
+in
+
 stdenv.mkDerivation rec {
-  name = "nix-zsh-completions";
+  name = "nix-zsh-completions-${version}";
 
   src = fetchFromGitHub {
     owner = "spwhitt";
     repo = "nix-zsh-completions";
-    rev = "0.3.1";
+    rev = "${version}";
     sha256 = "1sbc52f5818bcygljrji84dyvgw727x50m9v6qfrsdaji3zkqga1";
   };
 

From 1532d5632f134688cbc361a797f9848fa3bd036d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 8 Jul 2017 19:18:45 +0100
Subject: [PATCH 0318/3246] wireguard: 0.0.20170629 -> 0.0.20170706

---
 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 9677339d915..63e2e4ef493 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.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170629";
+  version = "0.0.20170706";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "51c44624f20eaff96780845214f85491c0c7330598633cd180bb2a6547e5d2b2";
+    sha256 = "0cvc2iv1836l6f0c3v3kqn3zqrr80i123f1cz5kilhk5c91vjqsp";
   };
 
   meta = with stdenv.lib; {

From ff5f7f9588322ee9c49178e4ddb4b82ff1d1f641 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Mon, 10 Jul 2017 00:07:31 -0700
Subject: [PATCH 0319/3246] hugo: 0.25 -> 0.25.1

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 142c558a95d..27757e4e31a 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.25";
+  version = "0.25.1";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "gohugoio";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "01p063nsyhavf13cva3sdqdcc7s42gi7iry4v857f1c2i402f0zk";
+    sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz";
   };
 
   goDeps = ./deps.nix;

From 9a219a7ec0a060907796c36864459d7b438916ef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 7 Jun 2017 09:32:11 +0200
Subject: [PATCH 0320/3246] nettools: 1.60_p20120127084908 ->
 1.60_p20161110235919

Some tools now need to be explcitely enabled. This version ships the same
executables as the previous one.
---
 pkgs/os-specific/linux/net-tools/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index ac3cad41479..9fbf3055715 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "net-tools-1.60_p20120127084908";
+  name = "net-tools-1.60_p20161110235919";
 
   src = fetchurl {
     url = "mirror://gentoo/distfiles/${name}.tar.xz";
-    sha256 = "408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94";
+    sha256 = "1kbgwkys45kb5wqhchi1kf0sfw93c1cl0hgyw7yhacxzdfxjmdfr";
   };
 
   preBuild =
@@ -13,7 +13,15 @@ stdenv.mkDerivation rec {
       cp ${./config.h} config.h
     '';
 
-  makeFlags = "BASEDIR=$(out) mandir=/share/man";
+  makeFlags = [
+    "BASEDIR=$(out)"
+    "mandir=/share/man"
+    "HAVE_ARP_TOOLS=1"
+    "HAVE_PLIP_TOOLS=1"
+    "HAVE_SERIAL_TOOLS=1"
+    "HAVE_HOSTNAME_TOOLS=1"
+    "HAVE_HOSTNAME_SYMLINKS=1"
+  ];
 
   meta = {
     homepage = http://net-tools.sourceforge.net/;

From 8c73028fc63d9444acf6470a26f4c6a0452b37bc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Jul 2017 02:07:50 +0200
Subject: [PATCH 0321/3246] libwebp: 0.4.3 -> 0.6.0

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

diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 6da1b00ee81..673cd7abe7d 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -27,11 +27,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libwebp-${version}";
-  version = "0.4.3";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
-    sha256 = "1i4hfczjm3b1qj1g4cc9hgb69l47f3nkgf6hk7nz4dm9zmc0vgpg";
+    sha256 = "0h1brwkyxc7lb8lc53aacdks5vc1y9hzngqi41gg7y6l56912a69";
   };
 
   configureFlags = [

From 7b44b7abd0047b202abe682a2d21ad649ee708a9 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 31 Dec 2016 10:58:25 +0100
Subject: [PATCH 0322/3246] ndppd: init at 0.2.5

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

diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix
new file mode 100644
index 00000000000..a15c441b9cc
--- /dev/null
+++ b/pkgs/applications/networking/ndppd/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, gzip, ... }:
+
+stdenv.mkDerivation rec {
+  name = "ndppd-${version}";
+  version = "0.2.5";
+
+  src = fetchFromGitHub {
+    owner = "DanielAdolfsson";
+    repo = "ndppd";
+    rev = "${version}";
+    sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  preConfigure = ''
+    substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip
+  '';
+
+  meta = {
+    description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces";
+    homepage = "https://github.com/DanielAdolfsson/ndppd";
+    license = stdenv.lib.licenses.gpl3;
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.fadenb ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0802f663c8c..b9d3bb92c0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3259,6 +3259,8 @@ with pkgs;
 
   ndjbdns = callPackage ../tools/networking/ndjbdns { };
 
+  ndppd = callPackage ../applications/networking/ndppd { };
+
   neofetch = callPackage ../tools/misc/neofetch { };
 
   nerdfonts = callPackage ../data/fonts/nerdfonts { };

From 33acb13fcdc53ac1c24676192ac132b69a9c5065 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 May 2017 01:53:18 +0200
Subject: [PATCH 0323/3246] lldpd: remove references to gcc-wrapper

---
 pkgs/tools/networking/lldpd/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 8e3bd7a82bf..6b816fc8740 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig
+{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo
 , libevent, readline, net_snmp }:
 
 stdenv.mkDerivation rec {
@@ -16,13 +16,17 @@ stdenv.mkDerivation rec {
     "--with-snmp"
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig removeReferencesTo ];
   buildInputs = [ libevent readline net_snmp ];
 
   enableParallelBuilding = true;
 
   outputs = [ "out" "dev" "man" "doc" ];
 
+  preFixup = ''
+    find $out -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
+  '';
+
   meta = with lib; {
     description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments";
     homepage = "https://vincentbernat.github.io/lldpd/";

From c3b566bb8767019c288d0cf6bb275d705955988e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 19:12:30 +0100
Subject: [PATCH 0324/3246] pinentry: 0.9.7 -> 1.0.0

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

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 97e66a250d7..25edec9efd4 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -10,11 +10,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "pinentry-0.9.7";
+  name = "pinentry-1.0.0";
 
   src = fetchurl {
     url = "mirror://gnupg/pinentry/${name}.tar.bz2";
-    sha256 = "1cp7wjqr6nx31mdclr61s2h84ijqjl0ph99kgj4vyawpjj1j1633";
+    sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn";
   };
 
   buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ];

From 90f9d52b738618cd4ee6840456a6ca54e5d722e1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Jul 2017 09:00:30 +0200
Subject: [PATCH 0325/3246] matrix-synapse: 0.21.0 -> 0.22.1

---
 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 39be4e8bdad..c7c33928714 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.21.0";
+  version = "0.22.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0mxgpfyh7265kh379hsb53lni43xcq9nffanbxwrg8hp8c79pcg3";
+    sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7";
   };
 
   patches = [ ./matrix-synapse.patch ];

From 06e701af4d16cbc0dce6a70f4a113119c07e7ae8 Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer@necsi.edu>
Date: Sun, 9 Jul 2017 15:20:38 -0400
Subject: [PATCH 0326/3246] maintainers: added olynch

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 142e7ff7869..cde9598b6fb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -409,6 +409,7 @@
   okasu = "Okasu <oka.sux@gmail.com>";
   olcai = "Erik Timan <dev@timan.info>";
   olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>";
+  olynch = "Owen Lynch <owen@olynch.me>";
   orbekk = "KJ Ørbekk <kjetil.orbekk@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   orivej = "Orivej Desh <orivej@gmx.fr>";

From 5160ae5d5c3ff17919f21ac3be41ab5e1115a747 Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer@necsi.edu>
Date: Sun, 9 Jul 2017 15:22:57 -0400
Subject: [PATCH 0327/3246] libargon2: init at 20161029

---
 .../libraries/libargon2/default.nix           | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/libargon2/default.nix

diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix
new file mode 100644
index 00000000000..68df0a288fc
--- /dev/null
+++ b/pkgs/development/libraries/libargon2/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "libargon2-${version}";
+  version = "20161029";
+  src = fetchFromGitHub {
+    owner = "P-H-C";
+    repo = "phc-winner-argon2";
+    rev = "${version}";
+    sha256 = "021g8wi4g67ywm8zf3yncqwrmfz7ypgm1ih9wcmnxip5n75rymh5";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    make install PREFIX=$out
+    mkdir -p $out/lib/pkgconfig
+    substitute libargon2.pc $out/lib/pkgconfig/libargon2.pc \
+      --replace @UPSTREAM_VER@ "${version}"                 \
+      --replace @HOST_MULTIARCH@ ""                         \
+      --replace 'prefix=/usr' "prefix=$out"
+    ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015";
+    longDescription = ''
+      A password-hashing function created by by Alex Biryukov, Daniel Dinu, and
+      Dmitry Khovratovich. Argon2 was declared the winner of the Password
+      Hashing Competition (PHC). There were 24 submissions and 9 finalists.
+      Catena, Lyra2, Makwa and yescrypt were given special recognition. The PHC
+      recommends using Argon2 rather than legacy algorithms.
+    '';
+    homepage = https://www.argon2.com/;
+    license = with licenses; [ asl20 cc0 ];
+    maintainers = with maintainers; [ taeer olynch ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b62908e2798..d7976644cfd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11889,6 +11889,8 @@ with pkgs;
 
   libaio = callPackage ../os-specific/linux/libaio { };
 
+  libargon2 = callPackage ../development/libraries/libargon2 { };
+
   libatasmart = callPackage ../os-specific/linux/libatasmart { };
 
   libcgroup = callPackage ../os-specific/linux/libcgroup { };

From b6d0c1eb18e2d7704989029b77ce3e6074a72b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 10 Jul 2017 08:51:15 +0100
Subject: [PATCH 0328/3246] libargon2: do not override pre/postInstall hook

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

diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix
index 68df0a288fc..79cbf09317c 100644
--- a/pkgs/development/libraries/libargon2/default.nix
+++ b/pkgs/development/libraries/libargon2/default.nix
@@ -3,6 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libargon2-${version}";
   version = "20161029";
+
   src = fetchFromGitHub {
     owner = "P-H-C";
     repo = "phc-winner-argon2";
@@ -11,14 +12,16 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out
-    make install PREFIX=$out
+    runHook preInstall
     mkdir -p $out/lib/pkgconfig
     substitute libargon2.pc $out/lib/pkgconfig/libargon2.pc \
       --replace @UPSTREAM_VER@ "${version}"                 \
       --replace @HOST_MULTIARCH@ ""                         \
       --replace 'prefix=/usr' "prefix=$out"
+
+    make install PREFIX=$out
     ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {

From ec570448a036095e181b33b978d71dfc61e56202 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 10 Jul 2017 09:56:51 +0200
Subject: [PATCH 0329/3246] docker-ce: 17.03.02-ce -> 17.06.0-ce

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../virtualization/containerd/default.nix     |   2 +-
 .../virtualization/docker/default.nix         | 100 ++++++++++--------
 .../virtualization/docker/proxy.nix           |   1 -
 pkgs/top-level/all-packages.nix               |   7 +-
 4 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index c07670b5de6..b918177f543 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ removeReferencesTo go ];
 
   preBuild = ''
-    ln -s $(pwd) vendor/src/github.com/docker/containerd
+    ln -s $(pwd) vendor/src/github.com/containerd/containerd
   '';
 
   installPhase = ''
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index d4e84f9f1e9..b811ab42ff2 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,13 +1,10 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
-, go-md2man, go, containerd, runc, docker-proxy, tini
+, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
 , sqlite, iproute, bridge-utils, devicemapper, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
 , procps
 }:
 
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md
-# https://github.com/docker/docker/blob/TAG/hack/dockerfile/binaries-commits
-
 with lib;
 
 rec {
@@ -23,7 +20,7 @@ rec {
 
     src = fetchFromGitHub {
       owner = "docker";
-      repo = "docker";
+      repo = "docker-ce";
       rev = "v${version}";
       sha256 = sha256;
     };
@@ -68,7 +65,7 @@ rec {
 
     buildInputs = [
       makeWrapper removeReferencesTo pkgconfig go-md2man go
-      sqlite devicemapper btrfs-progs systemd
+      sqlite devicemapper btrfs-progs systemd libtool
     ];
 
     dontStrip = true;
@@ -78,26 +75,43 @@ rec {
       ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
       ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper";
 
-    # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
-    postPatch = ''
-      substituteInPlace ./hack/make.sh                   --replace libsystemd-journal libsystemd
-      substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
-    '';
-
     buildPhase = ''
-      patchShebangs .
+      # build engine
+      cd ./components/engine
       export AUTO_GOPATH=1
       export DOCKER_GITCOMMIT="${rev}"
       ./hack/make.sh dynbinary
+      cd -
+
+      # build cli
+      cd ./components/cli
+      # Mimic AUTO_GOPATH
+      mkdir -p .gopath/src/github.com/docker/
+      ln -sf $PWD .gopath/src/github.com/docker/cli
+      export GOPATH="$PWD/.gopath:$GOPATH"
+      export GITCOMMIT="${rev}"
+      export VERSION="${version}"
+      source ./scripts/build/.variables
+      export CGO_ENABLED=1
+      go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker
+      cd -
     '';
 
+    # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
+    patchPhase = ''
+      patchShebangs .
+      substituteInPlace ./components/engine/hack/make.sh                   --replace libsystemd-journal libsystemd
+      substituteInPlace ./components/engine/daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
+      substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" ""
+     '';
+
     outputs = ["out" "man"];
 
     extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ];
 
     installPhase = ''
-      install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker
-      install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
+      install -Dm755 ./components/cli/docker $out/libexec/docker/docker
+      install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
       makeWrapper $out/libexec/docker/docker $out/bin/docker \
         --prefix PATH : "$out/libexec/docker:$extraPath"
       makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
@@ -111,18 +125,28 @@ rec {
       ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
 
       # systemd
-      install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
+      install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
 
-      # completion
-      install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker
-      install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish
-      install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
+      # completion (cli)
+      install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker
+      install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish
+      install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
+
+      # Include contributed man pages (cli)
+      # Generate man pages from cobra commands
+      echo "Generate man pages from cobra"
+      cd ./components/cli
+      mkdir -p ./man/man1
+      go build -o /tmp/gen-manpages github.com/docker/cli/man
+      /tmp/gen-manpages --root . --target ./man/man1
+
+      # Generate legacy pages from markdown
+      echo "Generate legacy manpages"
+      ./man/md2man-all.sh -q
 
-      # Include contributed man pages
-      man/md2man-all.sh -q
       manRoot="$man/share/man"
       mkdir -p "$manRoot"
-      for manDir in man/man?; do
+      for manDir in ./man/man?; do
         manBase="$(basename "$manDir")" # "man1"
         for manFile in "$manDir"/*; do
           manName="$(basename "$manFile")" # "docker-build.1"
@@ -140,31 +164,19 @@ rec {
       homepage = http://www.docker.com/;
       description = "An open source project to pack, ship and run any application as a lightweight container";
       license = licenses.asl20;
-      maintainers = with maintainers; [ offline tailhook ];
+      maintainers = with maintainers; [ offline tailhook vdemeester ];
       platforms = platforms.linux;
     };
   };
 
-  docker_17_03 = dockerGen rec {
-    version = "17.03.2-ce";
-    rev = "f5ec1e2"; # git commit
-    sha256 = "1y3rkzgg8vpjq61y473lnh0qyc6msl4ixw7ci2p56fyqrhkmhf96";
-    runcRev = "54296cf40ad8143b62dbcaa1d90e520a2136ddfe";
-    runcSha256 = "0ylymx7pi4jmvbqj94j2i8qspy8cpq0m91l6a0xiqlx43yx6qi2m";
-    containerdRev = "4ab9917febca54791c5f071a9d1f404867857fcc";
-    containerdSha256 = "06f2gsx4w9z4wwjhrpafmz6c829wi8p7crj6sya6x9ii50bkn8p6";
-    tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
-    tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
-  };
-
-  docker_17_05 = dockerGen rec {
-    version = "17.05.0-ce";
-    rev = "90d35abf7b3535c1c319c872900fbd76374e521c"; # git commit
-    sha256 = "1m4fcawjj14qws57813wjxjwgnrfxgxnnzlj61csklp0s9dhg7df";
-    runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228";
-    runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl";
-    containerdRev = "9048e5e50717ea4497b757314bad98ea3763c145";
-    containerdSha256 = "1r9xhvzzh7md08nqb0rbp5d1rdr7jylb3da954d0267i0kh2iksa";
+  docker_17_06 = dockerGen rec {
+    version = "17.06.0-ce";
+    rev = "02c1d876176546b5f069dae758d6a7d2ead6bd48"; # git commit
+    sha256 = "0wrg4ygcq4c7f2bwa7pgc7y33idg0hijavx40588jaglz4k8sqpm";
+    runcRev = "992a5be178a62e026f4069f443c6164912adbf09";
+    runcSha256 = "0ylkbn5rprw5cgxazvrwj7balikpfm8vlybwdbfpwnsqk3gc6p8k";
+    containerdRev = "cfb82a876ecc11b5ca0977d1733adbe58599088a";
+    containerdSha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552";
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
index beb65976696..651631b478f 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -27,4 +27,3 @@ buildGoPackage rec {
     platforms = docker.meta.platforms;
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e802a2f2c8..db116806b4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13685,11 +13685,10 @@ with pkgs;
   };
 
   inherit (callPackage ../applications/virtualization/docker { })
-    docker_17_03
-    docker_17_05;
+    docker_17_06;
 
-  docker = docker_17_03;
-  docker-edge = docker_17_05;
+  docker = docker_17_06;
+  docker-edge = docker_17_06;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 

From 8f1825d83839bea0257029adce18f06552ddcf11 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 10 Jul 2017 10:18:20 +0200
Subject: [PATCH 0330/3246] ponyc: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 6b7f87b1e95..6e393426b7a 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "0zzr3mmjp7010d3jfly6lbwaib546praml97kgj92yixahnwz533";
+    sha256 = "02hmn066jswaij2ib0faabm2i9cqz562z6s0vakgwnxyrk4qayif";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From c060b8792a9cc1bb174069f9769b5ce03e478696 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@users.noreply.github.com>
Date: Mon, 10 Jul 2017 11:18:29 +0200
Subject: [PATCH 0331/3246] Mopidy-iris: init at 3.0.0 (#26518)

---
 .../audio/mopidy-iris/default.nix             | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/audio/mopidy-iris/default.nix

diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
new file mode 100644
index 00000000000..d2ba955f9fb
--- /dev/null
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, pythonPackages, mopidy, mopidy-local-images }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "mopidy-iris-${version}";
+  version = "3.0.3";
+
+  src = pythonPackages.fetchPypi {
+    inherit version;
+    pname = "Mopidy-Iris";
+    sha256 = "1j8zrkvgs2f6jcqf1sn79afiirk5plfrkychlzcwqrxix293ngjr";
+  };
+
+  propagatedBuildInputs = [
+    mopidy
+    mopidy-local-images
+    pythonPackages.configobj
+    pythonPackages.pylast
+    pythonPackages.spotipy
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/jaedb/Iris";
+    description = "A fully-functional Mopidy web client encompassing Spotify and many other backends";
+    license = licenses.asl20;
+    maintainers = [ maintainers.rvolosatovs ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e802a2f2c8..40e455e87e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15135,6 +15135,8 @@ with pkgs;
 
   mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { };
 
+  mopidy-iris = callPackage ../applications/audio/mopidy-iris { };
+
   motif = callPackage ../development/libraries/motif { };
 
   mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {};

From cd7a01d56efa58bf6fbed20c89fdee0f3ef7759b Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 2 Jul 2017 11:58:15 -0400
Subject: [PATCH 0332/3246] eclipse-cpp: 4.6.0 -> 4.7.0

---
 pkgs/applications/editors/eclipse/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index e28278638e3..de7fae6a536 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -18,21 +18,21 @@ rec {
 
   ### Eclipse CPP
 
-  eclipse-cpp = eclipse-cpp-46; # always point to latest
+  eclipse-cpp = eclipse-cpp-47; # always point to latest
 
-  eclipse-cpp-46 = buildEclipse {
-    name = "eclipse-cpp-4.6.0";
-    description = "Eclipse IDE for C/C++ Developers, Neon release";
+  eclipse-cpp-47 = buildEclipse {
+    name = "eclipse-cpp-4.7.0";
+    description = "Eclipse IDE for C/C++ Developers, Oxygen release";
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
-          sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz;
+          sha512 = "813c791e739d7d0e2ab242a5bacadca135bbeee20ef97aa830353cd90f63fa6e9c89cfcc6aadf635c742befe035bd6e3f15103013f63c419f6144e86ebde3ed1";
         }
       else if stdenv.system == "i686-linux" then
         fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
-          sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk.tar.gz;
+          sha512 = "2b50f4a00306a89cda1aaaa606e62285cacbf93464a9dd3f3319dca3e2c578b802e685de6f78e5e617d269e21271188effe73d41f491a6de946e28795d82db8a";
         }
       else throw "Unsupported system: ${stdenv.system}";
   };

From c3d036df717c44570cec0c3f1d8dbeeff2618fca Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 2 Jul 2017 11:58:29 -0400
Subject: [PATCH 0333/3246] eclipse-modeling: 4.6 -> 4.7

---
 pkgs/applications/editors/eclipse/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index de7fae6a536..b039bd168d8 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -56,21 +56,21 @@ rec {
 
   ### Eclipse Modeling
 
-  eclipse-modeling = eclipse-modeling-46; # always point to latest
+  eclipse-modeling = eclipse-modeling-47; # always point to latest
 
-  eclipse-modeling-46 = buildEclipse {
-    name = "eclipse-modeling-4.6";
+  eclipse-modeling-47 = buildEclipse {
+    name = "eclipse-modeling-4.7";
     description = "Eclipse Modeling Tools";
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk-x86_64.tar.gz;
-          sha1 = "3695fd049c4cca2d235f424557e19877795a8183";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk-x86_64.tar.gz;
+          sha512 = "3b9a7ad4b5d6b77fbdd64e8d323e0adb6c2904763ad042b374b4d87cef8607408cb407e395870fc755d58c0c800e20818adcf456ebe193d76cede16c5fe12271";
         }
       else
         fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk.tar.gz;
-          sha1 = "fa0694a0b44e8e9c2301417f84dba45cf9ac6e61";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk.tar.gz;
+          sha512 = "b8597c1dec117e69c72a5e1a53e09b1f81a7c9de86ed7e71a9d007664603202df301745f186ded02b2e76410345863e80a2ba40867d6848e5375601289999206";
         };
   };
 

From 95d73068defd9627353a6045cab1fa06d0ff2ecd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 10 Jul 2017 14:42:39 +0300
Subject: [PATCH 0334/3246] awstats: Fix doc path

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

diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix
index ecf31d6c9d6..1b3b694bf78 100644
--- a/pkgs/tools/system/awstats/default.nix
+++ b/pkgs/tools/system/awstats/default.nix
@@ -44,9 +44,9 @@ perlPackages.buildPerlPackage rec {
     mkdir -p "$bin/bin"
     ln -s "$out/wwwroot/cgi-bin/awstats.pl" "$bin/bin/awstats"
 
-    mkdir -p "$doc/share/"
+    mkdir -p "$doc/share/doc"
     mv README.md docs/
-    mv docs "$doc/share/awstats"
+    mv docs "$doc/share/doc/awstats"
   '';
 
   meta = with stdenv.lib; {

From 217bd1fb3803fd01b95b857a227d5cfec59131ac Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 10 Jul 2017 14:44:29 +0300
Subject: [PATCH 0335/3246] shaarli: Move docs to correct place

---
 pkgs/servers/web-apps/shaarli/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 1c58194027a..41a27690a2a 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     rm -r {cache,pagecache,tmp,data}/
-    mv doc/ $doc/
+    mkdir -p $doc/share/doc
+    mv doc/ $doc/share/doc/shaarli
     mkdir $out/
     cp -R ./* $out
   '';

From 745dadf139090f588c6d5548b6614b39e597d7ad Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 10 Jul 2017 14:47:52 +0300
Subject: [PATCH 0336/3246] socklog: Move docs to the correct location

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

diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix
index 0b893bfe0dc..0b95dcdb193 100644
--- a/pkgs/tools/system/socklog/default.nix
+++ b/pkgs/tools/system/socklog/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
       mv man"/"*.$i $man/share/man/man$i
     done
 
-    mkdir -p $doc/share/socklog/html
-    mv doc"/"*.html $doc/share/socklog/html/
+    mkdir -p $doc/share/doc/socklog/html
+    mv doc/*.html $doc/share/doc/socklog/html/
 
     runHook postInstall
   '';

From 299af45989336d0146de324426f17154a9612090 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 10 Jul 2017 14:52:47 +0300
Subject: [PATCH 0337/3246] wallabag: Move docs to correct directory

---
 pkgs/servers/web-apps/wallabag/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index d330dd2d1ab..215e9fade0a 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   ''; # exposes $WALLABAG_DATA
 
   installPhase = ''
-    mv docs $doc/
+    mkdir -p $doc/share/doc
+    mv docs $doc/share/doc/wallabag
     mkdir $out/
     cp -R * $out/
   '';

From 08743fe0a31c788d45143e23406777d65535633f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Jul 2017 14:07:54 +0200
Subject: [PATCH 0338/3246] luajit: 2.0 actually doesn't support aarch64 at all

I suppose 2.1 with caveats with some pointers is better than nothing.
I'm sorry for the potential confusion.  In particular, the problem
about 64-bit pointers is the same in 2.0 and 2.1, despite the warning
only being shown for 2.1 on the web site.
---
 .../interpreters/luajit/default.nix           | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index a754e2c4347..3f8554a298e 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchurl, hostPlatform }:
+{ stdenv, lib, fetchurl, hostPlatform }:
 rec {
 
-  luajit =
-    # Compatibility problems with lightuserdata pointers; see:
-    # https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L101
-    if hostPlatform.is64bit && (/*hostPlatform.isArm ||*/ hostPlatform.isSunOS)
-        # FIXME: fix the aarch64 build
-      then luajit_2_0
-      else luajit_2_1;
+  luajit = luajit_2_1;
 
   luajit_2_0 = generic {
     version = "2.0.5";
     isStable = true;
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
+  } // {
+    # 64-bit ARM isn't supported upstream
+    meta = meta // {
+      platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
+    };
   };
 
   luajit_2_1 = generic {
@@ -22,6 +21,14 @@ rec {
   };
 
 
+  meta = with stdenv.lib; {
+    description = "High-performance JIT compiler for Lua 5.1";
+    homepage    = http://luajit.org;
+    license     = licenses.mit;
+    platforms   = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
+  };
+
   generic =
     { version, sha256 ? null, isStable
     , name ? "luajit-${version}"
@@ -33,7 +40,7 @@ rec {
     }:
 
     stdenv.mkDerivation rec {
-      inherit name version src;
+      inherit name version src meta;
 
       luaversion = "5.1";
 
@@ -61,13 +68,5 @@ rec {
           ''
             ln -s "$out"/bin/luajit-* "$out"/bin/luajit
           '';
-
-      meta = with stdenv.lib; {
-        description = "High-performance JIT compiler for Lua 5.1";
-        homepage    = http://luajit.org;
-        license     = licenses.mit;
-        platforms   = platforms.linux ++ platforms.darwin;
-        maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
-      };
     };
 }

From 02464668c09a3d9c8e419df913a87a84a57ce1e7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 9 Jul 2017 15:12:32 -0400
Subject: [PATCH 0339/3246] lib: Add isPowerPC predicate, and fix family name

---
 lib/systems/inspect.nix | 1 +
 lib/systems/parse.nix   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 8228705272e..a81e88989c0 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -8,6 +8,7 @@ rec {
     "64bit"      = { cpu = { bits = 64; }; };
     i686         = { cpu = cpuTypes.i686; };
     x86_64       = { cpu = cpuTypes.x86_64; };
+    PowerPC      = { cpu = cpuTypes.powerpc; };
     x86          = { cpu = { family = "x86"; }; };
     Arm          = { cpu = { family = "arm"; }; };
     Mips         = { cpu = { family = "mips"; }; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index bf21d74b931..befe90f9abe 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -44,7 +44,7 @@ rec {
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
     mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };
-    powerpc  = { bits = 32; significantByte = bigEndian;    family = "powerpc"; };
+    powerpc  = { bits = 32; significantByte = bigEndian;    family = "power"; };
   };
 
   isVendor = isType "vendor";

From 2f198956c7b214d79715f13b57eb1b9069ebb523 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 29 Jun 2017 01:17:52 -0400
Subject: [PATCH 0340/3246] stdenv: Make separate-debug-info.sh a
 `nativeBuildInput`

---
 pkgs/stdenv/generic/make-derivation.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 31b0428eeb2..e2f072d8149 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -49,12 +49,10 @@ rec {
 
       dependencies' = let
           justMap = map lib.chooseDevOutputs dependencies;
-          nativeBuildInputs = lib.elemAt justMap 0
+          nativeBuildInputs = lib.head justMap
+            ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
             ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh;
-          buildInputs = lib.elemAt justMap 1
-               # TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`.
-            ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh;
-        in [ nativeBuildInputs buildInputs ];
+        in [ nativeBuildInputs ] ++ lib.tail justMap;
 
       propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies;
 

From 5896d84dbbcff1b1e589e274e3addb6a0f1d2e4d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 29 Jun 2017 01:19:20 -0400
Subject: [PATCH 0341/3246] stdenv: Stop reversing the list of sandbox stuff

We're breaking hashes anyways
---
 pkgs/stdenv/generic/make-derivation.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index e2f072d8149..05221e2f3c1 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -62,15 +62,14 @@ rec {
            "__impureHostDeps" "__propagatedImpureHostDeps"
            "sandboxProfile" "propagatedSandboxProfile"])
         // (let
-          # TODO(@Ericson2314): Reversing of dep lists is just temporary to avoid Darwin mass rebuild.
           computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'));
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies');
           computedPropagatedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists (lib.reverseList propagatedDependencies'));
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies');
           computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies'));
           computedPropagatedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists (lib.reverseList propagatedDependencies')));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies'));
         in
         {
           builder = attrs.realBuilder or stdenv.shell;

From 8e9d618ef3a7e9f6b12fc8d7dee4e0207d20f1dd Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 10 Jul 2017 12:49:19 +0200
Subject: [PATCH 0342/3246] unifont: 10.0.02 -> 10.0.04

See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00004.html
for release announcement
---
 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 6fef0c1b6cb..bd99d20480b 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 = "10.0.02";
+  version = "10.0.04";
 
   ttf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.ttf";
-    sha256 = "1g7iaw2vx7yq8d3z625p6ainkn35wpfsimbl75lyj3d8206fhx0z";
+    sha256 = "0qp9zf8cx86syr8wl2z8yxlr5r83n156744ylzc0cg3rlmkx6r22";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
-    sha256 = "1l2cnkshpsg3mw5ps1ghzqm2a1nr7jfdn2bxqyvw7d0l5xyxvg3d";
+    sha256 = "1mj2np6j4jdbfnl0i3zlpg95ic9zq8bhvz8wf3pxkc85zmnk6w62";
   };
 
   buildInputs = [ mkfontscale mkfontdir ];

From 3678981f9f90815230eaaa656611b59885b037ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Jul 2017 18:10:17 +0200
Subject: [PATCH 0343/3246] knot-resolver: remove aarch64 from meta.platforms

It will compile but won't really work ATM.
---
 pkgs/servers/dns/knot-resolver/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index b0c493b6248..441e1f1ab0f 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -62,7 +62,8 @@ stdenv.mkDerivation rec {
     description = "Caching validating DNS resolver, from .cz domain registry";
     homepage = https://knot-resolver.cz;
     license = licenses.gpl3Plus;
-    platforms = platforms.unix;
+    # Platforms using negative pointers for stack won't work ATM due to LuaJIT impl.
+    platforms = filter (p: p != "aarch64-linux") platforms.unix;
     maintainers = [ maintainers.vcunat /* upstream developer */ ];
   };
 }

From fe3fb77774f735b0620f20b65e594045d6c410e1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 10 Jul 2017 12:07:20 -0500
Subject: [PATCH 0344/3246] vim-plugins: Add nim.vim

---
 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 09eda93b09a..1523010b6d7 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1827,6 +1827,17 @@ rec {
 
   };
 
+  nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "nim-vim-2016-05-19";
+    src = fetchgit {
+      url = "https://github.com/zah/nim.vim";
+      rev = "dcf25798f4a3f75e9538f9915959061edbff97cf";
+      sha256 = "1jaiqkspfz2a4ny130dl0h6x9752flpcwwy0kscrqmlqf5fqiyvm";
+    };
+    dependencies = [];
+
+  };
+
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "deoplete-go-2017-05-26";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 5f106218dae..da5c1d62a2f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -144,6 +144,7 @@
 "github:wincent/command-t"
 "github:xolox/vim-easytags"
 "github:xolox/vim-misc"
+"github:zah/nim.vim"
 "github:zchee/deoplete-jedi"
 "github:zchee/deoplete-go"
 "goyo"

From 3cb745d5a69018829ac15f7d5a508135f6bda123 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 10 Jul 2017 11:59:14 -0400
Subject: [PATCH 0345/3246] stdenv: Store one package per line in
 nix-support/propagated-*

This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
---
 pkgs/build-support/cc-wrapper/default.nix     |  4 ++--
 pkgs/build-support/gcc-wrapper-old/builder.sh |  2 +-
 .../setup-hooks/multiple-outputs.sh           |  2 +-
 pkgs/build-support/trivial-builders.nix       |  2 +-
 .../desktops/kde-4.14/kde-package/default.nix |  2 +-
 .../compilers/openjdk-darwin/8.nix            |  2 +-
 .../compilers/openjdk-darwin/default.nix      |  2 +-
 pkgs/development/compilers/openjdk/7.nix      |  2 +-
 pkgs/development/compilers/openjdk/8.nix      |  2 +-
 .../compilers/oraclejdk/jdk-linux-base.nix    |  2 +-
 pkgs/development/compilers/zulu/default.nix   |  2 +-
 .../haskell-modules/generic-builder.nix       |  2 +-
 pkgs/misc/misc.nix                            |  2 +-
 pkgs/stdenv/generic/builder.sh                |  5 +++--
 pkgs/stdenv/generic/setup.sh                  | 20 +++++++++++++------
 15 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 676fbd00688..37d62891ecf 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -275,9 +275,9 @@ stdenv.mkDerivation {
       # Propagate the wrapped cc so that if you install the wrapper,
       # you get tools like gcov, the manpages, etc. as well (including
       # for binutils and Glibc).
-      echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
+      printLines ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
 
-      echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
+      printLines ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
     ''
 
     + optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh
index a8e8a370ec0..4f141f6b8f2 100644
--- a/pkgs/build-support/gcc-wrapper-old/builder.sh
+++ b/pkgs/build-support/gcc-wrapper-old/builder.sh
@@ -211,5 +211,5 @@ cp -p $utils $out/nix-support/utils.sh
 # tools like gcov, the manpages, etc. as well (including for binutils
 # and Glibc).
 if test -z "$nativeTools"; then
-    echo $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages
+    printLines $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages
 fi
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 62a6491b8dc..9abf50f6ea4 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -202,7 +202,7 @@ _multioutPropagateDev() {
 
     mkdir -p "${!propagaterOutput}"/nix-support
     for output in $propagatedBuildOutputs; do
-        echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
+        echo "${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
     done
 }
 
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 4debd963639..1ee1fe8298f 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -84,7 +84,7 @@ rec {
         mkdir -p $out/nix-support
         cp ${script} $out/nix-support/setup-hook
       '' + lib.optionalString (deps != []) ''
-        echo ${toString deps} > $out/nix-support/propagated-native-build-inputs
+        printLines ${toString deps} > $out/nix-support/propagated-native-build-inputs
       '' + lib.optionalString (substitutions != {}) ''
         substituteAll ${script} $out/nix-support/setup-hook
       '');
diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix
index d5de6f5f6bc..3637d9f89cb 100644
--- a/pkgs/desktops/kde-4.14/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/default.nix
@@ -86,7 +86,7 @@ rec {
        };})
         ''
           mkdir -pv $out/nix-support
-          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
+          printLines ${toString list} | tee $out/nix-support/propagated-user-env-packages
         '';
 
   # Given manifest module data, return the module
diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
index 51effd2c784..691829c7788 100644
--- a/pkgs/development/compilers/openjdk-darwin/8.nix
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -33,7 +33,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $out/nix-support
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+      printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
 
       install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
 
diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index 10a9eb2b366..8ce0835fcb6 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -23,7 +23,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $out/nix-support
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+      printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
 
       install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
 
diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix
index 6dcbb0a330f..9ef7d26b2ef 100644
--- a/pkgs/development/compilers/openjdk/7.nix
+++ b/pkgs/development/compilers/openjdk/7.nix
@@ -190,7 +190,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $jre/nix-support
-      echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
+      printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
 
       # Set JAVA_HOME automatically.
       mkdir -p $out/nix-support
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 7ddf2c7ef5d..da1332127eb 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -202,7 +202,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $jre/nix-support
-      echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
+      printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
 
       # Set JAVA_HOME automatically.
       mkdir -p $out/nix-support
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 8fe775de146..196544a6476 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -157,7 +157,7 @@ let result = stdenv.mkDerivation rec {
     ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
 
     mkdir -p $out/nix-support
-    echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+    printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
 
     # Set JAVA_HOME automatically.
     cat <<EOF >> $out/nix-support/setup-hook
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 7621aa82bc7..021e94761f8 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
     find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
 
     mkdir -p $out/nix-support
-    echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+    printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
 
     # Set JAVA_HOME automatically.
     cat <<EOF >> $out/nix-support/setup-hook
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 97a3adaf220..e097fd5af33 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -311,7 +311,7 @@ stdenv.mkDerivation ({
     ${optionalString isGhcjs ''
       for exeDir in "$out/bin/"*.jsexe; do
         exe="''${exeDir%.jsexe}"
-        printf '%s\n' '#!${nodejs}/bin/node' > "$exe"
+        printLines '#!${nodejs}/bin/node' > "$exe"
         cat "$exeDir/all.js" >> "$exe"
         chmod +x "$exe"
       done
diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix
index 6357c4e6f90..6e8c6f4486f 100644
--- a/pkgs/misc/misc.nix
+++ b/pkgs/misc/misc.nix
@@ -23,7 +23,7 @@ in
   */
   collection = {list, name} : runCommand "collection-${name}" {} ''
     mkdir -p $out/nix-support
-    echo ${builtins.toString list} > $out/nix-support/propagated-user-env-packages
+    printLines ${builtins.toString list} > $out/nix-support/propagated-user-env-packages
   '';
 
   /* creates a derivation symlinking references C/C++ libs into one include and lib directory called $out/cdt-envs/${name}
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index a46c46c2db5..f8c0fd44ac7 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -1,4 +1,3 @@
-export PATH=
 for i in $initialPath; do
     if [ "$i" = / ]; then i=; fi
     PATH=$PATH${PATH:+:}$i/bin
@@ -15,4 +14,6 @@ cat "$setup" >> $out/setup
 # Allow the user to install stdenv using nix-env and get the packages
 # in stdenv.
 mkdir $out/nix-support
-echo $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
+if [ "$propagatedUserEnvPkgs" ]; then
+    printf '%s\n' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
+fi
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index e5d2ba8682d..de94565ed6d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -215,6 +215,11 @@ isScript() {
     if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi
 }
 
+# printf unfortunately will print a trailing newline regardless
+printLines() {
+    [[ $# -gt 0 ]] || return 0
+    printf '%s\n' "$@"
+}
 
 ######################################################################
 # Initialisation.
@@ -300,9 +305,12 @@ findInputs() {
     fi
 
     if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then
-        for i in $(cat "$pkg/nix-support/$propagatedBuildInputsFile"); do
-            findInputs "$i" $var $propagatedBuildInputsFile
+        local fd pkgNext
+        exec {fd}<"$pkg/nix-support/$propagatedBuildInputsFile"
+        while IFS= read -r -u $fd pkgNext; do
+            findInputs "$pkgNext" $var $propagatedBuildInputsFile
         done
+        exec {fd}<&-
     fi
 }
 
@@ -794,17 +802,17 @@ fixupPhase() {
         fi
         if [ -n "$propagated" ]; then
             mkdir -p "${!outputDev}/nix-support"
-            echo "$propagated" > "${!outputDev}/nix-support/propagated-native-build-inputs"
+            printLines $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     else
         if [ -n "$propagatedBuildInputs" ]; then
             mkdir -p "${!outputDev}/nix-support"
-            echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs"
+            printLines $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"
         fi
 
         if [ -n "$propagatedNativeBuildInputs" ]; then
             mkdir -p "${!outputDev}/nix-support"
-            echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs"
+            printLines $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     fi
 
@@ -817,7 +825,7 @@ fixupPhase() {
 
     if [ -n "$propagatedUserEnvPkgs" ]; then
         mkdir -p "${!outputBin}/nix-support"
-        echo "$propagatedUserEnvPkgs" > "${!outputBin}/nix-support/propagated-user-env-packages"
+        printLines $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
     fi
 
     runHook postFixup

From e4dd6377a5b0d20ccd13b14d03c09ec06a73118e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 10 Jul 2017 19:43:55 +0200
Subject: [PATCH 0346/3246] mitmproxy: add patch to bump pyopenssl dependency

---
 pkgs/tools/networking/mitmproxy/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 36bb9cb791b..715bc209e97 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
+{ stdenv, fetchurl, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   baseName = "mitmproxy";
@@ -12,6 +12,15 @@ python3Packages.buildPythonPackage rec {
     sha256 = "1x1a28al5clpfd69rjcpw26gjjnpsm1vfl4scrwpdd1jhkw044h9";
   };
 
+  patches = [
+    # Bump pyopenssl dependency
+    # https://github.com/mitmproxy/mitmproxy/pull/2252
+    (fetchurl {
+      url = "https://patch-diff.githubusercontent.com/raw/mitmproxy/mitmproxy/pull/2252.patch";
+      sha256 = "0s3a6lf0wjnxi1r70qlhh0siaxhk5j2cysnv4xfkji3f2v7hhri4";
+    })
+  ];
+
   propagatedBuildInputs = with python3Packages; [
     blinker click certifi construct cryptography
     cssutils editorconfig h2 html2text hyperframe

From 07f27eddae754d883f876425854e39d7e656fa1e Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 10 Jul 2017 13:02:07 -0500
Subject: [PATCH 0347/3246] jnettop: add patch for 64bit counters (#27283)

Add patch (from Debian) to use 64bit counters for transfer totals. Otherwise counters overflow at 4GB.
---
 pkgs/tools/networking/jnettop/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix
index a09da684c98..ec2f34f5601 100644
--- a/pkgs/tools/networking/jnettop/default.nix
+++ b/pkgs/tools/networking/jnettop/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }:
+{ fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
   name = "jnettop-0.13.0";
@@ -10,7 +10,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoconf libpcap ncurses pkgconfig glib ];
 
-  patches = [ ./no-dns-resolution.patch ];
+  patches = [
+    ./no-dns-resolution.patch
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/j/jnettop/0.13.0-1/debian/patches/0001-Use-64-bit-integers-for-byte-totals-support-bigger-u.patch";
+      sha256 = "1b0alc12sj8pzcb66f8xslbqlbsvq28kz34v6jfhbb1q25hyr7jg";
+    })
+  ];
+
   preConfigure = '' autoconf '';
 
   meta = {

From 79ddb5d5e066215f52d8514f778bd0e7dc9e203f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Jul 2017 20:15:42 +0200
Subject: [PATCH 0348/3246] =?UTF-8?q?ocamlPackages.topkg:=20requires=20OCa?=
 =?UTF-8?q?ml=20=E2=89=A5=204.01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix
index f343eed6b46..fa238a84b35 100644
--- a/pkgs/development/ocaml-modules/topkg/default.nix
+++ b/pkgs/development/ocaml-modules/topkg/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.01"
+then throw "topkg is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-topkg-${version}";
   version = "0.8.1";

From c9468acdf42611ce5a753a394796b1a0977c600b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Jul 2017 20:18:09 +0200
Subject: [PATCH 0349/3246] =?UTF-8?q?ocamlPackages.ocaml-migrate-parsetree?=
 =?UTF-8?q?:=20requires=20OCaml=20=E2=89=A5=204.02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ocaml-migrate-parsetree/default.nix         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index a056cdeb1b5..46cc922917e 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder, result }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation rec {
    name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
    version = "0.7";

From 73860eea0fee231e928204c5f5ee74707e43363a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Jul 2017 18:20:55 +0000
Subject: [PATCH 0350/3246] ocamlPackages.result: 1.1 -> 1.2

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

diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix
index f531de5118e..362ad697934 100644
--- a/pkgs/development/ocaml-modules/ocaml-result/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, ocaml, findlib }:
 
-let version = "1.1"; in
+let version = "1.2"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-result-${version}";
+  name = "ocaml${ocaml.version}-result-${version}";
 
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = "result";
     rev = "${version}";
-    sha256 = "05y07rxdbkaxsc8cy458y00gq05i8gp35hhwg1b757mam21ccxxz";
+    sha256 = "1jwzpcmxwgkfsbjz9zl59v12hf1vv4r9kiifancn9p8gm206g3g0";
   };
 
   buildInputs = [ ocaml findlib ];

From 46dc5394cd995f0b5ba6c842424d1de594fead31 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 2 Apr 2017 19:00:02 +0200
Subject: [PATCH 0351/3246] Update e-mail address for nckx

---
 lib/maintainers.nix                                            | 2 +-
 pkgs/applications/video/minitube/default.nix                   | 3 ++-
 .../linux/util-linux/rtcwake-search-PATH-for-shutdown.patch    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6cfa493353f..e80fb20929a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -385,7 +385,7 @@
   nand0p = "Fernando Jose Pando <nando@hex7.com>";
   Nate-Devv = "Nathan Moore <natedevv@gmail.com>";
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
-  nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
+  nckx = "Tobias Geerinckx-Rice <github@tobias.gr>";
   ndowens = "Nathan Owens <ndowens04@gmail.com>";
   neeasade = "Nathan Isom <nathanisom27@gmail.com>";
   nequissimus = "Tim Steinbach <tim@nequissimus.com>";
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 971588901b4..f70c142ab41 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook
-# "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>
+# "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google
+# account. You'll need to generate (and please share :-) a new one if it breaks.
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
 
 stdenv.mkDerivation rec {
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 2dd3fcc4ebe..5f38861bf68 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
@@ -2,7 +2,7 @@ Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown,
 which isn't valid on NixOS (and a compatibility link on most other modern
 distros anyway).
 
-  -- nckx <tobias.geerinckx.rice@gmail.com>
+  -- nckx <github@tobias.gr>
 --- a/include/pathnames.h
 +++ b/include/pathnames.h
 @@ -53,7 +53,7 @@

From 56743ea677fbdb50e2ae18988ddcb729c24c7cd3 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Mon, 10 Jul 2017 15:55:55 -0400
Subject: [PATCH 0352/3246] calibre: fix html5lib error

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 37cb027aa36..8341898fa23 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
     # Remove unneeded files and libs
     rm -rf resources/calibre-portable.* \
-           src/{chardet,cherrypy,odf,routes}
+           src/{chardet,cherrypy,html5lib,odf,routes}
   '';
 
   dontUseQmakeConfigure = true;
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
     poppler_utils libpng imagemagick libjpeg
     fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
   ] ++ (with python2Packages; [
+    html5lib_0_9999999 # needs to be before mechanize ?
     apsw cssselect cssutils dateutil lxml mechanize netifaces pillow
     python pyqt5 sip
     regex msgpack

From 82ddeaba8824cca0213ef7548c153af2449eafc8 Mon Sep 17 00:00:00 2001
From: Chris Duncan <celldee@gmail.com>
Date: Mon, 10 Jul 2017 21:54:03 +0100
Subject: [PATCH 0353/3246] sway: Add pam, gdk_pixbuf build inputs

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

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index f392945b36d..7f08ce3686e 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pango, libinput
 , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
 , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
-, xwayland
+, xwayland, pam, gdk_pixbuf
 }:
 
 let
@@ -19,7 +19,7 @@ in
 
     nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
 
-    buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland ];
+    buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf ];
 
     patchPhase = ''
       sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;

From c27ebd41c55f78c1f861959283bd04f6fcb27b4e Mon Sep 17 00:00:00 2001
From: Chris Duncan <celldee@gmail.com>
Date: Mon, 10 Jul 2017 21:56:36 +0100
Subject: [PATCH 0354/3246] sway: Add cmake version number flag

---
 pkgs/applications/window-managers/sway/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 7f08ce3686e..1299540e5ee 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -26,6 +26,7 @@ in
     '';
 
     makeFlags = "PREFIX=$(out)";
+    cmakeFlags = "-DVERSION=${version}";
     installPhase = "PREFIX=$out make install";
 
     LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];

From cca84bc6c9430db748168dc8344cf5598c4ee8c9 Mon Sep 17 00:00:00 2001
From: Chris Duncan <celldee@gmail.com>
Date: Mon, 10 Jul 2017 22:00:22 +0100
Subject: [PATCH 0355/3246] sway: 0.12.2 -> 0.13.0

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

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 1299540e5ee..ac725733d64 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.12.2";
+  version = "0.13.0";
 in
   stdenv.mkDerivation rec {
     name = "sway-${version}";
@@ -14,7 +14,7 @@ in
       owner = "Sircmpwn";
       repo = "sway";
       rev = "${version}";
-      sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs";
+      sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q";
     };
 
     nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];

From fdc49ed8fac458dbfc15eca84660c217f2d2fdfb Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 10 Jul 2017 15:04:32 -0700
Subject: [PATCH 0356/3246] coqPackages.paco: Add attribute to 8_5 and 8_6 as
 well

---
 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 2a91cfa3207..5e4d76a9c87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18019,6 +18019,7 @@ with pkgs;
     flocq = callPackage ../development/coq-modules/flocq {};
     interval = callPackage ../development/coq-modules/interval {};
     mathcomp = callPackage ../development/coq-modules/mathcomp { };
+    paco = callPackage ../development/coq-modules/paco {};
     math-classes = callPackage ../development/coq-modules/math-classes { };
     ssreflect = callPackage ../development/coq-modules/ssreflect { };
     QuickChick = callPackage ../development/coq-modules/QuickChick {};
@@ -18036,6 +18037,7 @@ with pkgs;
     flocq = callPackage ../development/coq-modules/flocq {};
     interval = callPackage ../development/coq-modules/interval {};
     mathcomp = callPackage ../development/coq-modules/mathcomp { };
+    paco = callPackage ../development/coq-modules/paco {};
     ssreflect = callPackage ../development/coq-modules/ssreflect { };
     QuickChick = callPackage ../development/coq-modules/QuickChick {};
     fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};

From 42e6b754fbc5c0d887f4730fcc1de77800000b93 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 11 Jul 2017 00:26:16 +0200
Subject: [PATCH 0357/3246] disnix: 0.7 -> 0.7.1

---
 pkgs/tools/package-management/disnix/default.nix          | 6 +++---
 pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index e83f8047f4b..534f8767a05 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.7";
+  name = "disnix-0.7.1";
   
   src = fetchurl {
-    url = https://github.com/svanderburg/disnix/files/842828/disnix-0.7.tar.gz;
-    sha256 = "120iaqpj7zcy94dpizzdxjwf8qb2rfrx5394jghmhc6jy88vdp71";
+    url = https://github.com/svanderburg/disnix/releases/download/disnix-0.7.1/disnix-0.7.1.tar.gz;
+    sha256 = "0wxik73bk3hh4xjjj8jcgrwv1722m7cqgpiiwjsgxs346jvhrv2s";
   };
   
   buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 81be1549c83..2a6a0dcc78a 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.6";
+  name = "disnixos-0.6.1";
   
   src = fetchurl {
-    url = https://github.com/svanderburg/disnixos/files/842874/disnixos-0.6.tar.gz;
-    sha256 = "0pgqsk8qndn614z02jq3vbxzpx6fmgsm6pr1g0iqz55pzwamw9j7";
+    url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.6.1/disnixos-0.6.1.tar.gz;
+    sha256 = "0pqv8n9942vjwmb32m1af29fi0vjlsbwkj2c7h1xs28z6wahr7wa";
   };
   
   buildInputs = [ socat pkgconfig dysnomia disnix getopt ];

From c87d4d4a19eda532fbb4a294257f124556539ebc Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Mon, 10 Jul 2017 20:25:12 -0400
Subject: [PATCH 0358/3246] Generalize building of LFE

---
 pkgs/development/beam-modules/default.nix     |  3 +-
 pkgs/development/beam-modules/lib.nix         | 22 +++++++++++
 pkgs/development/interpreters/lfe/1.2.nix     |  6 +++
 .../lfe/{default.nix => generic-builder.nix}  | 39 +++++++------------
 pkgs/top-level/beam-packages.nix              |  2 +-
 5 files changed, 44 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/interpreters/lfe/1.2.nix
 rename pkgs/development/interpreters/lfe/{default.nix => generic-builder.nix} (68%)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index f0a049bb4b2..b48abb34611 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -54,7 +54,8 @@ let
                        debugInfo = true;
                      };
 
-        lfe = callPackage ../interpreters/lfe { };
+        lfe = lfe_1_2;
+        lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3; };
 
         # Non hex packages
         hex = callPackage ./hex {};
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index dd4ed5e1bbf..26d868a8e7c 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -56,4 +56,26 @@ rec {
         mkDerivation = pkgs.makeOverridable builder;
       };
 
+  /* Uses generic-builder to evaluate provided drv containing Elixir version
+  specific data.
+
+  drv: package containing version-specific args;
+  builder: generic builder for all Erlang versions;
+  args: arguments merged into version-specific args, used mostly to customize
+        dependencies;
+
+  Arguments passed to the generic-builder are overridable.
+
+  Please note that "mkDerivation" defined here is the one called from 1.2.nix
+  and similar files.
+  */
+  callLFE = drv: args:
+    let
+      inherit (stdenv.lib) versionAtLeast;
+      builder = callPackage ../interpreters/lfe/generic-builder.nix args;
+    in
+      callPackage drv {
+        mkDerivation = pkgs.makeOverridable builder;
+      };
+
 }
diff --git a/pkgs/development/interpreters/lfe/1.2.nix b/pkgs/development/interpreters/lfe/1.2.nix
new file mode 100644
index 00000000000..2bd1df41fb6
--- /dev/null
+++ b/pkgs/development/interpreters/lfe/1.2.nix
@@ -0,0 +1,6 @@
+{ mkDerivation }:
+
+mkDerivation {
+  version = "1.2.1";
+  sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz";
+}
diff --git a/pkgs/development/interpreters/lfe/default.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
similarity index 68%
rename from pkgs/development/interpreters/lfe/default.nix
rename to pkgs/development/interpreters/lfe/generic-builder.nix
index cafcc4c28ee..c55872afbfb 100644
--- a/pkgs/development/interpreters/lfe/default.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -1,33 +1,19 @@
-{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, beamPackages }:
+{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3 }:
 
-let
-  inherit (beamPackages) buildRebar3 buildHex;
-  proper = buildHex rec {
-    name    = "proper";
-    version = "1.1.1-beta";
-    sha256  = "0hnkhs761yjynw9382w8wm4j3x0r7lllzavaq2kh9n7qy3zc1rdx";
+{ baseName ? "lfe"
+, version
+, sha256 ? null
+, rev ? version
+, src ? fetchFromGitHub { inherit rev sha256; owner = "rvirding"; repo = "lfe"; }
+}:
 
-    configurePhase = ''
-      ${erlang}/bin/escript write_compile_flags include/compile_flags.hrl
-    '';
-  };
-in
-buildRebar3 rec {
-  name    = "lfe";
-  version = "1.2.1";
+buildRebar3 {
+  name = "${baseName}";
 
-  src = fetchFromGitHub {
-    owner  = "rvirding";
-    repo   = name;
-    rev    = version;
-    sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz";
-  };
+  inherit src version;
 
-  buildInputs = [ makeWrapper ];
-  beamDeps    = [ proper ];
+  buildInputs = [ erlang makeWrapper ];
   patches     = [ ./no-test-deps.patch ];
-  doCheck     = true;
-  checkTarget = "travis";
 
   # These installPhase tricks are based on Elixir's Makefile.
   # TODO: Make, upload, and apply a patch.
@@ -41,6 +27,7 @@ buildRebar3 rec {
     install -m644 _build/default/lib/lfe/ebin/* $ebindir
 
     install -m755 -d $bindir
+
     for bin in bin/lfe{,c,doc,script}; do install -m755 $bin $bindir; done
 
     install -m755 -d $out/bin
@@ -70,7 +57,7 @@ buildRebar3 rec {
     downloadPage = "https://github.com/rvirding/lfe/releases";
 
     license      = licenses.asl20;
-    maintainers  = with maintainers; [ yurrriq ];
+    maintainers  = with maintainers; [ yurrriq ankhers ];
     platforms    = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 8d01ad36139..62ffaec26f3 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -58,7 +58,7 @@ rec {
     # `beam.packages.erlangR19.elixir`.
     inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3;
 
-    lfe = packages.erlang.lfe;
+    inherit (packages.erlang) lfe lfe_1_2;
   };
 
   # Helper function to generate package set with a specific Erlang version.

From e78b9a68a0fbbb791dbb297d17f94578e5f46643 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 10 Jul 2017 18:04:14 -0700
Subject: [PATCH 0359/3246] coqPackages.paco: 1.2.7 -> 1.2.8

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

diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix
index 98d447d21d3..93ef7c14f1f 100644
--- a/pkgs/development/coq-modules/paco/default.nix
+++ b/pkgs/development/coq-modules/paco/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "coq-paco-${coq.coq-version}-${version}";
-  version = "1.2.7";
+  version = "1.2.8";
 
   src = fetchurl {
     url = "http://plv.mpi-sws.org/paco/paco-${version}.zip";
-    sha256 = "010fs74c0cmb9sz5dmrgzg4pmb2mgwia4gm0g9l7j2fq5xxcschb";
+    sha256 = "1lcmdr0y2d7gzyvr8dal3pi7fibbd60bpi1l32fw89xiyrgqhsqy";
   };
 
   buildInputs = [ coq.ocaml coq.camlp5 unzip ];

From d40dd2c70da336a046760af91791b86ed2ee2a73 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 10 Jul 2017 18:04:42 -0700
Subject: [PATCH 0360/3246] coqPackages.QuickChick: 20170422 -> 20170710

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

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 8fc12e5759d..80cdcfec287 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -1,16 +1,16 @@
 {stdenv, fetchgit, coq, coqPackages}:
 
-let revision = "04785ee692036e7ba9f4c4e380b1995128a97bf8"; in
+let revision = "ee436635a34873c79f49c3d2d507194216f6e8e9"; in
 
 stdenv.mkDerivation rec {
 
   name = "coq-QuickChick-${coq.coq-version}-${version}";
-  version = "20170422-${builtins.substring 0 7 revision}";
+  version = "20170710-${builtins.substring 0 7 revision}";
 
   src = fetchgit {
     url = git://github.com/QuickChick/QuickChick.git;
     rev = revision;
-    sha256 = "1x5idk9d9r5mj1w54676a5j92wr1id7c9dmknkpmnh78rgrqzy5j";
+    sha256 = "0sq14j1kl4m4plyxj2dbkfwa6iqipmf9w7mxxxcbsm718m0xf1gr";
   };
 
   buildInputs = [ coq.ocaml coq.camlp5 ];

From 399dee93ae548e83447a514917cf5409ab7c2c8f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 10 Jul 2017 18:15:14 -0700
Subject: [PATCH 0361/3246] coqPackages.autosubst: New expression

---
 .../0001-changes-to-work-with-Coq-8.6.patch   | 134 ++++++++++++++++++
 .../coq-modules/autosubst/default.nix         |  27 ++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 163 insertions(+)
 create mode 100644 pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch
 create mode 100644 pkgs/development/coq-modules/autosubst/default.nix

diff --git a/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch b/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch
new file mode 100644
index 00000000000..dde0e2e03eb
--- /dev/null
+++ b/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch
@@ -0,0 +1,134 @@
+From 5b40a32e35fe446cda20ed34c756a010856f39ce Mon Sep 17 00:00:00 2001
+From: Theo Giannakopoulos <theo.giannakopoulos@baesystems.com>
+Date: Wed, 5 Apr 2017 15:48:55 -0400
+Subject: [PATCH] changes to work with Coq 8.6
+
+---
+ theories/Autosubst_Derive.v | 12 ++++++++++++
+ theories/Autosubst_MMap.v   |  3 ++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/theories/Autosubst_Derive.v b/theories/Autosubst_Derive.v
+index 61995de..cf87f67 100644
+--- a/theories/Autosubst_Derive.v
++++ b/theories/Autosubst_Derive.v
+@@ -18,6 +18,7 @@ Hint Extern 0 (Ids _) => derive_Ids : derive.
+ 
+ Ltac derive_Rename :=
+   match goal with [ |- Rename ?term ] =>
++    let inst := fresh "inst" in
+     hnf; fix inst 2; change _ with (Rename term) in inst;
+     intros xi s; change (annot term s); destruct s;
+     match goal with
+@@ -66,6 +67,7 @@ Ltac has_var s :=
+ Ltac derive_Subst :=
+   match goal with [ |- Subst ?term ] =>
+     require_instance (Rename term);
++    let inst := fresh "inst" in
+     hnf; fix inst 2; change _ with (Subst term) in inst;
+     intros sigma s; change (annot term s); destruct s;
+     match goal with
+@@ -107,6 +109,7 @@ Hint Extern 0 (Subst _) => derive_Subst : derive.
+ Ltac derive_HSubst :=
+   match goal with [ |- HSubst ?inner ?outer ] =>
+     require_instance (Subst inner);
++    let inst := fresh "inst" in
+     hnf; fix inst 2; change _ with (HSubst inner outer) in inst;
+     intros sigma s; change (annot outer s); destruct s;
+     match goal with
+@@ -327,6 +330,7 @@ Ltac derive_SubstLemmas :=
+      assert (up_upren_n :
+                forall xi n, upn n (ren xi) = ren (iterate upren n xi)) by
+        (apply up_upren_n_internal, up_upren);
++     let ih := fresh "ih" in
+      fix ih 2; intros xi s; destruct s; try reflexivity; simpl; f_equal;
+      try apply mmap_ext; intros; rewrite ?up_upren, ?up_upren_n; apply ih);
+ 
+@@ -337,6 +341,7 @@ Ltac derive_SubstLemmas :=
+        (apply up_id_internal; reflexivity);
+      assert (up_id_n : forall n, upn n ids = ids) by
+        (apply up_id_n_internal, up_id);
++     let ih := fresh "ih" in
+      fix ih 1; intros s; destruct s; simpl; f_equal; try reflexivity;
+      rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros; apply ih);
+ 
+@@ -344,6 +349,7 @@ Ltac derive_SubstLemmas :=
+ 
+     assert (ren_subst_comp :
+        forall xi sigma (s : term), (rename xi s).[sigma] = s.[xi >>> sigma]) by(
++     let ih := fresh "ih" in
+      fix ih 3; intros xi sigma s; destruct s; try reflexivity; simpl; f_equal;
+      rewrite ?up_comp_ren_subst, ?up_comp_ren_subst_n, ?mmap_comp;
+      try apply mmap_ext; intros; apply ih);
+@@ -357,6 +363,7 @@ Ltac derive_SubstLemmas :=
+      assert (up_comp_subst_ren_n :
+       forall sigma xi n, upn n (sigma >>> rename xi) = upn n sigma >>> rename (iterate upren n xi))
+       by (apply up_comp_subst_ren_n_internal; apply up_comp_subst_ren);
++     let ih := fresh "ih" in
+      fix ih 3; intros sigma xi s; destruct s; try reflexivity; simpl;
+      f_equal; rewrite ?up_comp_subst_ren, ?up_comp_subst_ren_n, ?mmap_comp;
+      try (rewrite hcomp_ren_internal; [|apply rename_subst]);
+@@ -368,6 +375,7 @@ Ltac derive_SubstLemmas :=
+       by (apply up_comp_internal; [reflexivity|apply ren_subst_comp|apply subst_ren_comp]);
+      assert (up_comp_n : forall sigma tau n, upn n (sigma >> tau) = upn n sigma >> upn n tau)
+       by (apply up_comp_n_internal; apply up_comp);
++     let ih := fresh "ih" in
+      fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal;
+      rewrite ?up_comp, ?up_comp_n, ?mmap_comp, ?hcomp_dist_internal;
+      try apply mmap_ext; intros; apply ih);
+@@ -382,6 +390,7 @@ Ltac derive_HSubstLemmas :=
+   let ids := constr:(ids : var -> inner) in
+ 
+   assert (hsubst_id : forall (s : outer), s.|[ids] = s) by (
++    let ih := fresh "ih" in
+     fix ih 1; intros s; destruct s; try reflexivity; simpl; f_equal;
+     rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros;
+     (apply subst_id || apply ih)
+@@ -390,6 +399,7 @@ Ltac derive_HSubstLemmas :=
+   assert (hsubst_comp : forall (theta eta : var -> inner) (s : outer),
+     s.|[theta].|[eta] = s.|[theta >> eta])
+   by (
++    let ih := fresh "ih" in
+     fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal;
+     rewrite <- ?up_comp, <- ?up_comp_n, ?mmap_comp; try apply mmap_ext; intros;
+     (apply subst_comp || apply ih)
+@@ -405,6 +415,7 @@ Ltac derive_SubstHSubstComp :=
+   assert (ren_hsubst_comp : forall xi (theta : var -> inner) (s : outer),
+     rename xi s.|[theta] = (rename xi s).|[theta]
+   ) by (
++    let ih := fresh "ih" in
+     fix ih 3; intros xi theta s; destruct s; try reflexivity; simpl; f_equal;
+     rewrite ?mmap_comp; try apply mmap_ext; intros; simpl; apply ih
+   );
+@@ -421,6 +432,7 @@ Ltac derive_SubstHSubstComp :=
+     apply up_hcomp_n_internal; apply up_hcomp
+   );
+ 
++  let ih := fresh "ih" in
+   fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal;
+   rewrite ?up_hcomp, ?up_hcomp_n, ?hcomp_lift_n_internal, ?mmap_comp;
+   try apply mmap_ext; intros; apply ih
+diff --git a/theories/Autosubst_MMap.v b/theories/Autosubst_MMap.v
+index f8387e7..7af7902 100644
+--- a/theories/Autosubst_MMap.v
++++ b/theories/Autosubst_MMap.v
+@@ -23,7 +23,7 @@ Arguments mmap {A B _} f !s /.
+ Class MMapExt (A B : Type) `{MMap A B} := 
+   mmap_ext : forall f g,
+     (forall t, f t = g t) -> forall s, mmap f s = mmap g s.
+-Arguments mmap_ext {A B _ _ f g} H s.
++Arguments mmap_ext {A B H' _ f g} H s : rename.
+ 
+ Class MMapLemmas (A B : Type) `{MMap A B} := {
+   mmap_id x : mmap id x = x;
+@@ -123,6 +123,7 @@ Tactic Notation "msimpl" "in" "*" := (in_all msimplH); msimpl.
+ 
+ Ltac derive_MMap :=
+   hnf; match goal with [ |- (?A -> ?A) -> ?B -> ?B ] =>
++    let map := fresh "map" in
+     intros f; fix map 1; intros xs; change (annot B xs); destruct xs;
+     match goal with
+       | [ |- annot _ ?ys ] =>
+-- 
+2.13.2
+
diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
new file mode 100644
index 00000000000..d27ba005299
--- /dev/null
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, coq, mathcomp }:
+
+stdenv.mkDerivation rec {
+
+  name = "coq-autosubst-${coq.coq-version}-${version}";
+  version = "5b40a32e";
+
+  src = fetchgit {
+    url = git://github.com/uds-psl/autosubst.git;
+    rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034";
+    sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0";
+  };
+
+  propagatedBuildInputs = [ mathcomp ];
+
+  patches = [./0001-changes-to-work-with-Coq-8.6.patch];
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = https://www.ps.uni-saarland.de/autosubst/;
+    description = "Automation for de Bruijn syntax and substitution in Coq";
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e4d76a9c87..491d11ca9f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18013,6 +18013,7 @@ with pkgs;
     };
     coqPackages = coqPackages_8_5;
 
+    autosubst = callPackage ../development/coq-modules/autosubst {};
     coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
     coquelicot = callPackage ../development/coq-modules/coquelicot {};
     dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
@@ -18031,6 +18032,7 @@ with pkgs;
     coq = callPackage ../applications/science/logic/coq {};
     coqPackages = coqPackages_8_6;
 
+    autosubst = callPackage ../development/coq-modules/autosubst {};
     coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
     coquelicot = callPackage ../development/coq-modules/coquelicot {};
     dpdgraph = callPackage ../development/coq-modules/dpdgraph {};

From c072fb47291608ec63d1154d2d71c9e8f8a42c41 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 10 Jul 2017 18:17:04 -0700
Subject: [PATCH 0362/3246] coqPackages_8_6.heq: Add to the 8.6 set

---
 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 491d11ca9f0..c783b3cb916 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18037,6 +18037,7 @@ with pkgs;
     coquelicot = callPackage ../development/coq-modules/coquelicot {};
     dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
     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 {};

From 3095a46bfc54f0016683f26217244b868d68bf1c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Jul 2017 03:40:07 +0200
Subject: [PATCH 0363/3246] ocamlPackages.oasis: 0.4.7 -> 0.4.10

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

diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 214a2239688..6ff5ee72666 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.7";
+  version = "0.4.10";
   name = "ocaml-oasis-${version}";
 
   # You must manually update the url, not just the version. OCamlforge keys off
   # the number after download.php, not the filename.
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/1635/oasis-${version}.tar.gz";
-    sha256 = "13crvqiy0hhlnm4qfyxq2jjvs11ldxf15c4g9q91k1x3wj04pg2l";
+    url = https://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz;
+    sha256 = "13ah03pbcvrjv5lmx971hvkm9rvbvimska5wmjfvgvd20ca0gn8w";
   };
 
   createFindlibDestdir = true;

From 5f3568cbce977a9d45f6de78657ced7f9295d6ee Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 10 Jul 2017 10:34:33 +0200
Subject: [PATCH 0364/3246] pony-stable: 2017-03-30 -> 2017-04-20

---
 pkgs/development/compilers/ponyc/pony-stable.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 9bee8e299c0..c91d9d603d5 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation {
-  name = "pony-stable-unstable-2017-03-30";
+  name = "pony-stable-unstable-2017-04-20";
 
   src = fetchFromGitHub {
-    owner = "jemc";
+    owner = "ponylang";
     repo = "pony-stable";
-    rev = "39890c7f11f79009630de6b551bd076868f7f5a2";
-    sha256 = "1w15dg4l03zzncpllwww8jhsj7z1wgvhf89n7agr9f1w9m2zpskc";
+    rev = "b2ea566b02ec40480f888652b04eaa5f191a241e";
+    sha256 = "1bixkxccsrnyip3yp42r14rbhk832pvzwbkh6ash4ip2isxa6b19";
   };
 
   buildInputs = [ ponyc ];

From 412da3210bb017c189418994f5bc3ad9655c8deb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Jul 2017 02:45:08 +0000
Subject: [PATCH 0365/3246] ocamlPackages.oasis: remove 0.4.6

---
 .../janestreet/buildOcamlJane.nix             |  4 +--
 .../janestreet/js-build-tools.nix             |  4 +--
 pkgs/development/tools/ocaml/oasis/0.4.6.nix  | 35 -------------------
 pkgs/top-level/ocaml-packages.nix             |  1 -
 4 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/tools/ocaml/oasis/0.4.6.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
index 6e988c4479a..61b2038bfd2 100644
--- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
+++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
@@ -1,4 +1,4 @@
-{ buildOcaml, opam, js_build_tools, ocaml_oasis_46, fetchurl } :
+{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } :
 
 { name, version ? "113.33.03", buildInputs ? [],
   hash ? "",
@@ -14,7 +14,7 @@ buildOcaml (args // {
 
   hasSharedObjects = true;
 
-  buildInputs = [ ocaml_oasis_46 js_build_tools opam ] ++ buildInputs;
+  buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs;
 
   dontAddPrefix = true;
 
diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
index 328ffc58bdc..2c314f3dbde 100644
--- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
+++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, ocaml_oasis_46, opam}:
+{ stdenv, buildOcaml, fetchurl, ocaml_oasis, opam }:
 
 buildOcaml rec {
   name = "js-build-tools";
@@ -13,7 +13,7 @@ buildOcaml rec {
 
   hasSharedObjects = true;
 
-  buildInputs = [ ocaml_oasis_46 opam ];
+  buildInputs = [ ocaml_oasis opam ];
 
   dontAddPrefix = true;
   configurePhase = "./configure --prefix $prefix";
diff --git a/pkgs/development/tools/ocaml/oasis/0.4.6.nix b/pkgs/development/tools/ocaml/oasis/0.4.6.nix
deleted file mode 100644
index b5e977d623b..00000000000
--- a/pkgs/development/tools/ocaml/oasis/0.4.6.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4
-, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml-oasis-0.4.6";
-
-  src = fetchurl {
-    url = http://forge.ocamlcore.org/frs/download.php/1604/oasis-0.4.6.tar.gz;
-    sha256 = "1yxv3ckkf87nz0cyll0yy1kd295j5pv3jqwkfrr1y65wkz5vw90k";
-  };
-
-  createFindlibDestdir = true;
-
-  buildInputs =
-    [
-      ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4
-    ];
-
-  propagatedBuildInputs = [ ocaml_data_notation ];
-
-  configurePhase = "ocaml setup.ml -configure --prefix $out";
-  buildPhase     = "ocaml setup.ml -build";
-  installPhase   = "ocaml setup.ml -install";
-
-  meta = with stdenv.lib; {
-    homepage = http://oasis.forge.ocamlcore.org/;
-    description = "Configure, build and install system for OCaml projects";
-    license = licenses.lgpl21;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = with maintainers; [
-      vbgl z77z
-    ];
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d7a6c6cb63d..cf8f49fb427 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -397,7 +397,6 @@ let
     ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };
 
     ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };
-    ocaml_oasis_46 = callPackage ../development/tools/ocaml/oasis/0.4.6.nix { };
 
     ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { };
 

From 0be14a588f69f980b547cb067c2363b78fbb8ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Jul 2017 08:55:55 +0200
Subject: [PATCH 0366/3246] nixos tests.misc: unblock a man-page test

I'm not sure what's wrong, but the pages look OK.  Discussion:
https://github.com/NixOS/nixpkgs/pull/27061#issuecomment-314330032
---
 nixos/tests/misc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index b926a62194b..1b24551009c 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -34,7 +34,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
 
       subtest "nixos-rebuild", sub {
-          $machine->succeed("nixos-rebuild --help | grep SYNOPSIS");
+          $machine->succeed("nixos-rebuild --help | grep 'NixOS module' ");
       };
 
       # Sanity check for uid/gid assignment.

From fbf3f4d473a622dc5faaef52c4b398d498d8419a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 11 Jul 2017 09:43:30 +0200
Subject: [PATCH 0367/3246] pythonPackages.rjsmin: init at 1.0.12

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

diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix
new file mode 100644
index 00000000000..24adf830699
--- /dev/null
+++ b/pkgs/development/python-modules/rjsmin/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "rjsmin";
+  version = "1.0.12";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1wc62d0f80kw1kjv8nlxychh0iy66a6pydi4vfvhh2shffm935fx";
+  };
+
+  # The package does not ship tests, and the setup machinary confuses
+  # tests auto-discovery
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://opensource.perlig.de/rjsmin/;
+    license = licenses.asl20;
+    description = "Javascript minifier written in python";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ad11bbd4cf..f74e4ccb383 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21222,6 +21222,8 @@ in {
     };
   };
 
+  rjsmin = callPackage ../development/python-modules/rjsmin { };
+
   pysolr = buildPythonPackage rec {
     name = "pysolr-${version}";
     version = "3.3.3";

From a2c5fbe56d0a94ea8f07c4bcd74ac541fe024790 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 11 Jul 2017 09:44:12 +0200
Subject: [PATCH 0368/3246] pythonPackages.rcssmin: init at 1.0.6

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

diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix
new file mode 100644
index 00000000000..9347cd55cf3
--- /dev/null
+++ b/pkgs/development/python-modules/rcssmin/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "rcssmin";
+  version = "1.0.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0w42l4dhxghcz7pj3q7hkxp015mvb8z2cq9sfxbl31npsfavd1ya";
+  };
+
+  # The package does not ship tests, and the setup machinary confuses
+  # tests auto-discovery
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://opensource.perlig.de/rcssmin/;
+    license = licenses.asl20;
+    description = "CSS minifier written in pure python";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f74e4ccb383..15936af0300 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21072,6 +21072,8 @@ in {
     };
   };
 
+  rcssmin = callPackage ../development/python-modules/rcssmin { };
+
   recommonmark = buildPythonPackage rec {
     name = "recommonmark-${version}";
     version = "0.4.0";

From 73076f325223bb47c00dcfe5b24772f47e17412f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 11 Jul 2017 09:58:12 +0200
Subject: [PATCH 0369/3246] pythonPackages.django_appconf: 1.0.1 -> 1.0.2

---
 .../python-modules/django_appconf/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +-----------------
 2 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/django_appconf/default.nix

diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix
new file mode 100644
index 00000000000..77fc708a50b
--- /dev/null
+++ b/pkgs/development/python-modules/django_appconf/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, six }:
+buildPythonPackage rec {
+  pname = "django-appconf";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    description = "A helper class for handling configuration defaults of packaged apps gracefully";
+    homepage = http://django-appconf.readthedocs.org/;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ desiderius ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 15936af0300..42cd541f7c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9865,27 +9865,7 @@ in {
     };
   };
 
-  django_appconf = buildPythonPackage rec {
-    name = "django-appconf-${version}";
-    version = "1.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-appconf/django-appconf-${version}.tar.gz";
-      sha256 = "0q3fg17qi4vwpipbj075zn4wk58p6a946kah8wayks1423xpa4xs";
-    };
-
-    # No tests in archive
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ six ];
-
-    meta = {
-      description = "A helper class for handling configuration defaults of packaged apps gracefully";
-      homepage = http://django-appconf.readthedocs.org/;
-      license = licenses.bsd2;
-      maintainers = with maintainers; [ desiderius ];
-    };
-  };
+  django_appconf = callPackage ../development/python-modules/django_appconf { };
 
   django_colorful = buildPythonPackage rec {
     name = "django-colorful-${version}";

From e200a97d6a36c5a40722c03d283c3eb60e25de8b Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 11 Jul 2017 09:44:39 +0200
Subject: [PATCH 0370/3246] pythonPackages.django_compressor: 1.5 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix
new file mode 100644
index 00000000000..5d8626ec576
--- /dev/null
+++ b/pkgs/development/python-modules/django_compressor/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi,
+  rcssmin, rjsmin, django_appconf }:
+buildPythonPackage rec {
+    pname = "django_compressor";
+    version = "2.1.1";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1s42dkq3qp1niaf69markd7m3ljgf2bspyz2nk0sa07f8q04004j";
+    };
+
+    # Need to setup django testing
+    doCheck = false;
+
+    propagatedBuildInputs = [ rcssmin rjsmin django_appconf ];
+
+    meta = with stdenv.lib; {
+      description = "Compresses linked and inline JavaScript or CSS into single cached files";
+      homepage = http://django-compressor.readthedocs.org/en/latest/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ desiderius ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42cd541f7c1..e5cc154ee9d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9889,27 +9889,7 @@ in {
     };
   };
 
-  django_compressor = buildPythonPackage rec {
-    name = "django-compressor-${version}";
-    version = "1.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django_compressor/django_compressor-${version}.tar.gz";
-      sha256 = "0bp2acagc6b1mmcajlmjf5vvp6zj429bq7p2wks05n47pwfzv281";
-    };
-
-    # Need to setup django testing
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ django_appconf ];
-
-    meta = {
-      description = "Compresses linked and inline JavaScript or CSS into single cached files";
-      homepage = http://django-compressor.readthedocs.org/en/latest/;
-      license = licenses.mit;
-      maintainers = with maintainers; [ desiderius ];
-    };
-  };
+  django_compressor = callPackage ../development/python-modules/django_compressor { };
 
   django_compat = callPackage ../development/python-modules/django-compat { };
 

From bf60fbe2e1a7b2e6b0e972c595c5b4f541252d22 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Jul 2017 10:03:28 +0200
Subject: [PATCH 0371/3246] ghex: init at 3.18.3

---
 maintainers/scripts/gnome.sh                    |  2 +-
 .../desktops/gnome-3/3.22/apps/ghex/default.nix | 17 +++++++++++++++++
 pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix    | 10 ++++++++++
 pkgs/desktops/gnome-3/3.22/default.nix          |  2 ++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix

diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh
index 9398331d0d6..a6f0dca2b82 100755
--- a/maintainers/scripts/gnome.sh
+++ b/maintainers/scripts/gnome.sh
@@ -6,7 +6,7 @@ GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
 
 # projects that don't follow the GNOME major versioning, or that we don't want to
 # programmatically update
-NO_GNOME_MAJOR="gtkhtml gdm"
+NO_GNOME_MAJOR="ghex gtkhtml gdm"
 
 usage() {
   echo "Usage: $0 gnome_dir <show project>|<update project>|<update-all> [major.minor]" >&2
diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix b/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix
new file mode 100644
index 00000000000..1179b2fdc5c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2,
+  wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  inherit (import ./src.nix fetchurl) name src;
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+  buildInputs = [ gnome3.gtk intltool itstool libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Ghex;
+    description = "Hex editor for GNOME desktop environment";
+    platforms = platforms.linux;
+    maintainers = gnome3.maintainers;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix b/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix
new file mode 100644
index 00000000000..edaa51d9478
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "ghex-3.18.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz;
+    sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index 12a9ae0b5af..e79b66bdedf 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -268,6 +268,8 @@ let
 
   gedit = callPackage ./apps/gedit { };
 
+  ghex = callPackage ./apps/ghex { };
+
   glade = callPackage ./apps/glade { };
 
   gnome-boxes = callPackage ./apps/gnome-boxes { };

From 8fd63939d0a0b44b2a3854151a546133bb7ae308 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Jul 2017 13:22:17 +0200
Subject: [PATCH 0372/3246] data: update hackage snapshot for 'callCabal'

---
 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 5b54ea2178c..8d4bacd9bc5 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 = "60443435510c1523ae4596f20595a274531dd485";
-  sha256 = "1k3c0ix5rax92ywrpjxd7cmbzwsgrv03s6dvq6wjm8vljchqg4li";
+  rev = "43b26c8a8f64f6caf7b4345eff0099798adcac28";
+  sha256 = "0p5w7x690aqmywxgpigmsig83lnbpx37332gpcn1licxb6wya0dm";
 }

From 1434128a18f6083e5a3834dc1bd794dc555395c3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 11 Jul 2017 08:22:56 -0400
Subject: [PATCH 0373/3246] linux-copperhead: 4.12.d -> 4.12.e

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 7f7c54731f5..6230911fbee 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -2,8 +2,8 @@
 
 let
   version = "4.12";
-  revision = "d";
-  sha256 = "1glhqk6py8wkv291fh57r4z5hbiymzkhr8cqrh3r97yni2zs6lj4";
+  revision = "e";
+  sha256 = "1zxmfddj3nx8fd4nfxi0sxa3j9byq1dkp05plnknmi45b3ji57zh";
 in
 
 import ./generic.nix (args // {

From de965b78ab1e26227ec9baec0ceb6089b78c8ec1 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Tue, 11 Jul 2017 14:31:27 +0200
Subject: [PATCH 0374/3246] jackline: 2017-05-21 -> 2017-05-24

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

diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index a9cb3f09bce..bc6e7a5f7de 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -3,14 +3,14 @@
 assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
 
 stdenv.mkDerivation rec {
-  version = "2017-05-21";
+  version = "2017-05-24";
   name = "jackline-${version}";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
     repo   = "jackline";
-    rev    = "0a1e4ea23245633fe23edf09b2309659a1bc3649";
-    sha256 = "1wnmwsp3a5nh3qs4h9grrdsvv0i3p419cfmhrrql3lj2x3ngdw82";
+    rev    = "49a326d5696aa24f3ac18534c8860e03d0d58548";
+    sha256 = "0p741mzq4kkqyly8njga1f5dxdnfz31wy2lpvs5542pq0iwvdj7k";
   };
 
   buildInputs = with ocamlPackages; [

From dd27e21b2ae21329efc10c9be6833bc51f0bdccf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Jul 2017 14:39:06 +0200
Subject: [PATCH 0375/3246] data: update hackage snapshot some more

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 8d4bacd9bc5..3aef8f6017b 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -7,5 +7,5 @@ fetchFromGitHub {
   owner = "commercialhaskell";
   repo = "all-cabal-hashes";
   rev = "43b26c8a8f64f6caf7b4345eff0099798adcac28";
-  sha256 = "0p5w7x690aqmywxgpigmsig83lnbpx37332gpcn1licxb6wya0dm";
+  sha256 = "1yfaxzgdrf7cifz4qq462amja2iq7r99nvpggggs8scwg4dz1i0b";
 }

From cb105d35a95f0667930782d2d377418671c12331 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Tue, 11 Jul 2017 08:56:23 -0400
Subject: [PATCH 0376/3246] Ensure lfe 1.2 is exported at the top level

---
 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 2a91cfa3207..5726b02f448 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6049,7 +6049,7 @@ with pkgs;
   inherit (beam.interpreters)
     erlang erlang_odbc erlang_javac erlang_odbc_javac
     elixir elixir_1_5_rc elixir_1_4 elixir_1_3
-    lfe
+    lfe lfe_1_2
     erlangR16 erlangR16_odbc
     erlang_basho_R16B02 erlang_basho_R16B02_odbc
     erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac

From b1081224d8ddbbafe235fda98725708a16515a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Jul 2017 15:13:49 +0200
Subject: [PATCH 0377/3246] unbound: bugfix 1.6.3 -> 1.6.4

Unbound is no longer a mass rebuild.
---
 pkgs/tools/networking/unbound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 7fc5fb90173..e700ea4fb28 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.6.3";
+  version = "1.6.4";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "0pw4m4z5qspsagxzbjb61xq5bhd57amw26xqvqzi6b8d3mf6azjc";
+    sha256 = "1vbzfzp932nhii5vq7z7rpczdyv624p17sy9hj1cn763ds0qh2nz";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

From 7d547a6b4c1611051dc9b3b23f1df2ebf3f25927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Jul 2017 15:34:05 +0200
Subject: [PATCH 0378/3246] texlive: switch to a *working* temporary mirror

See #24683.
---
 pkgs/tools/typesetting/tex/texlive/bin.nix     | 4 +++-
 pkgs/tools/typesetting/tex/texlive/default.nix | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 5591f64cee9..34520e92a9a 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -20,7 +20,9 @@ let
   common = rec {
     src = fetchurl {
       url = # "ftp://tug.org/historic/systems/texlive/${year}/"
-        "http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016" # FIXME: a proper mirror
+      #"http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016"
+      # FIXME: a proper mirror, though tarballs.nixos.org saves this case ATM
+        http://146.185.144.154/texlive-2016
         + "/texlive-${year}0523b-source.tar.xz";
       sha256 = "1v91vahxlxkdra0qz3f132vvx5d9cx2jy84yl1hkch0agyj2rcx8";
     };
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 692f6b1772c..13eb90c77af 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -110,7 +110,9 @@ let
 
       url = args.url or "${urlPrefix}/${urlName}.tar.xz";
       urlPrefix = args.urlPrefix or
-        http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016;
+        http://146.185.144.154/texlive-2016
+        #http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016
+        ;
       # XXX XXX XXX FIXME: mirror the snapshot XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
       #  ("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive");
       #mirror = "http://ftp.math.utah.edu";

From 469aeb9a7feaf474ca340d905640c6bbf759bf0d Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 11 Jul 2017 16:37:06 +0200
Subject: [PATCH 0379/3246] helm:0.8.6 -> 0.9.0 (#27302)

---
 pkgs/applications/audio/helm/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index 712f309fad0..80fb6a9ef92 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -1,21 +1,21 @@
-  { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, libjack2
+  { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
   , lv2, pkgconfig, mesa }:
 
   stdenv.mkDerivation rec {
-  version = "0.8.6";
+  version = "0.9.0";
   name = "helm-${version}";
 
   src = fetchFromGitHub {
     owner = "mtytel";
     repo = "helm";
-    rev = "19f86e6b4db83c1c6b143fc27883592ac4e43489";
-    sha256 = "0a46wnbfqkns8l136v79rr9gv4hhba065igjwkjddf045c9l94l8";
+    rev = "927d2ed27f71a735c3ff2a1226ce3129d1544e7e";
+    sha256 = "17ys2vvhncx9i3ydg3xwgz1d3gqv4yr5mqi7vr0i0ca6nad6x3d4";
   };
 
   buildInputs = [
     xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
     xorg.libXinerama xorg.libXrender xorg.libXrandr
-    freetype alsaLib libjack2 pkgconfig mesa lv2
+    freetype alsaLib curl libjack2 pkgconfig mesa lv2
   ];
 
   CXXFLAGS = "-DHAVE_LROUND";
@@ -26,6 +26,7 @@
 
   buildPhase = ''
     make lv2
+    make standalone
   '';
 
   installPhase = ''

From c725924dfd2c686f269b4a7668f52e11a92f2e46 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Tue, 11 Jul 2017 16:38:46 +0200
Subject: [PATCH 0380/3246] gitlab-runner service: support graceful termination
 (#27222)

The current behavior was for gitlab-runner is to immediately terminate when there
was a restart required. This can lead to aborted builds and is annoying to users.

By enabling graceful mode gitlab-runner will wait for all builds to finish before
terminating. The disadvantage is that a nixos-rebuild switch needs to wait till
all jobs are done. Because of that it is not enabled by default.
---
 .../continuous-integration/gitlab-runner.nix  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 048343b3360..b11bc031b3f 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -15,6 +15,23 @@ in
       description = "Verbatim config.toml to use";
     };
 
+    gracefulTermination = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Finish all remaining jobs before stopping, restarting or reconfiguring.
+        If not set gitlab-runner will stop immediatly without waiting for jobs to finish,
+        which will lead to failed builds.
+      '';
+    };
+
+    gracefulTimeout = mkOption {
+      default = "infinity";
+      type = types.str;
+      example = "5min 20s";
+      description = ''Time to wait until a graceful shutdown is turned into a forceful one.'';
+    };
+
     workDir = mkOption {
       default = "/var/lib/gitlab-runner";
       type = types.path;
@@ -45,6 +62,11 @@ in
           --service gitlab-runner \
           --user gitlab-runner \
         '';
+
+      } //  optionalAttrs (cfg.gracefulTermination) {
+        TimeoutStopSec = "${cfg.gracefulTimeout}";
+        KillSignal = "SIGQUIT";
+        KillMode = "process";
       };
     };
 

From 2c1097a83b2a689bf2f58f2c9d24a47441460750 Mon Sep 17 00:00:00 2001
From: Alexander Schmolck <a.schmolck+git@gmail.com>
Date: Tue, 11 Jul 2017 17:00:17 +0100
Subject: [PATCH 0381/3246] git: add missing deps for filter-branch etc
 (#27221)

Several git commands are implemented as shell scripts that run awk, sed, grep
and perl. There is some existing patching in the postinstall for perl to rewrite
it to an absolute reference to pkgs.perl, but several other packages are both
missing as a dependency and have no rewrite logic.

In particular git filter-branch depends on sed and grep.

Additionally, the perl logic also seds git-am, which is now a binary not a shell
script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part
was obsolete.

I tested this by grepping all shell scripts for the relevant commands and then
comparing the diffs of the new version to what is produced in master. All
changes in the scripts seem good to me.
---
 .../git-and-tools/git/default.nix             | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index fd9aa94c543..981b57b44c1 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -1,5 +1,6 @@
 { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio
-, gnugrep, gzip, openssh
+, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
+, gzip, openssh
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
 , libxslt, tcl, tk, makeWrapper, libiconv
 , svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs
@@ -104,11 +105,24 @@ stdenv.mkDerivation {
           --replace ' grep' ' ${gnugrep}/bin/grep' \
           --replace ' egrep' ' ${gnugrep}/bin/egrep'
 
-      # Fix references to the perl binary. Note that the tab character
-      # in the patterns is important.
-      sed -i -e 's|	perl -ne|	${perl}/bin/perl -ne|g' \
-             -e 's|	perl -e|	${perl}/bin/perl -e|g' \
-             $out/libexec/git-core/{git-am,git-submodule}
+      # Fix references to the perl, sed, awk and various coreutil binaries used by
+      # shell scripts that git calls (e.g. filter-branch)
+      SCRIPT="$(cat <<'EOS'
+        BEGIN{
+          @a=(
+            '${perl}/bin/perl', '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
+            '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
+            '${coreutils}/bin/wc', '${coreutils}/bin/tr'
+          );
+        }
+        foreach $c (@a) {
+          $n=(split("/", $c))[-1];
+          s|(?<=[^#][^/.-])\b''${n}(?=\s)|''${c}|g
+        }
+      EOS
+      )"
+      perl -0777 -i -pe "$SCRIPT" \
+        $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,stash,submodule,subtree,web--browse}
 
       # Fix references to gettext.
       substituteInPlace $out/libexec/git-core/git-sh-i18n \

From bd2cef064c18d71a5dbc06f9f0fc8c66f6153a6e Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Wed, 12 Jul 2017 02:23:42 +1000
Subject: [PATCH 0382/3246] st: refactor deprecated `isNull' function

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

diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 9b3dc84bcbd..387f00cc91e 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -3,7 +3,7 @@
 
 with stdenv.lib;
 
-let patches' = if isNull patches then [] else patches;
+let patches' = if patches == null then [] else patches;
 in stdenv.mkDerivation rec {
   name = "st-0.7";
 

From 4934a512d1a004a225aa98e18cf764ba9d72df51 Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Wed, 12 Jul 2017 02:25:18 +1000
Subject: [PATCH 0383/3246] st: refactor out `stdenv.lib' already in scope

---
 pkgs/applications/misc/st/default.nix | 2 +-
 pkgs/applications/misc/st/wayland.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 387f00cc91e..16d6ca2e26f 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://st.suckless.org/;
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
     maintainers = with maintainers; [viric andsild];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix
index 4d9f0ef3f8d..ab890c8db71 100644
--- a/pkgs/applications/misc/st/wayland.nix
+++ b/pkgs/applications/misc/st/wayland.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://st.suckless.org/;
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
     maintainers = with maintainers; [ ];
     platforms = with platforms; linux;
   };

From 88874e7650f8139e06ec89b7779ebc98c2ec397d Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Wed, 12 Jul 2017 02:53:43 +1000
Subject: [PATCH 0384/3246] xst: init at 0.7.1

---
 lib/maintainers.nix               |  1 +
 pkgs/applications/misc/st/xst.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/st/xst.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d095029f5b0..0f6087c50f6 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -585,6 +585,7 @@
   volth = "Jaroslavas Pocepko <jaroslavas@volth.com>";
   vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
   vrthra = "Rahul Gopinath <rahul@gopinath.org>";
+  vyp = "vyp <elisp.vim@gmail.com>";
   wedens = "wedens <kirill.wedens@gmail.com>";
   willtim = "Tim Philip Williams <tim.williams.public@gmail.com>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix
new file mode 100644
index 00000000000..cd4d9f1814f
--- /dev/null
+++ b/pkgs/applications/misc/st/xst.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }:
+
+with stdenv.lib;
+
+let
+  version = "0.7.1";
+  name = "xst-${version}";
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "https://github.com/neeasade/xst/archive/v${version}.tar.gz";
+    sha256 = "19ayx1753f2s6k7f6yn256bsssm20ggffs1diakgjqwcyjcxxn7q";
+  };
+
+  buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
+
+  installPhase = ''
+    TERMINFO=$out/share/terminfo make install PREFIX=$out
+  '';
+
+  meta = {
+    homepage = "https://github.com/neeasade/xst";
+    description = "Simple terminal fork that can load config from Xresources";
+    license = licenses.mit;
+    maintainers = maintainers.vyp;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56bd308b6bd..6acb9304528 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15887,6 +15887,8 @@ with pkgs;
     patches = config.st.patches or null;
   };
 
+  xst = callPackage ../applications/misc/st/xst.nix { };
+
   stag = callPackage ../applications/misc/stag {
     curses = ncurses;
   };

From 0f9b6b97efb8c54f12bf7736f7e415dd287458b7 Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer@necsi.edu>
Date: Tue, 11 Jul 2017 13:00:07 -0400
Subject: [PATCH 0385/3246] opendht: init at 1.3.4

---
 pkgs/tools/security/opendht/default.nix | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/security/opendht/default.nix

diff --git a/pkgs/tools/security/opendht/default.nix b/pkgs/tools/security/opendht/default.nix
new file mode 100644
index 00000000000..75d2b090e71
--- /dev/null
+++ b/pkgs/tools/security/opendht/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchFromGitHub
+, autoconf
+, automake
+, libtool
+, pkgconfig
+, nettle
+, gnutls
+, libmsgpack
+, readline
+, libargon2
+}:
+
+stdenv.mkDerivation rec {
+  name = "opendht-${version}";
+  version = "1.3.4";
+
+  src = fetchFromGitHub {
+    owner = "savoirfairelinux";
+    repo = "opendht";
+    rev = "${version}";
+    sha256 = "0karj37f0zq39w0ip8ahrjr6lcrrn9jd6bpzylp1m92jzs8pfki8";
+  };
+
+  buildInputs = [
+    autoconf
+    automake
+    libtool
+    pkgconfig
+    nettle
+    gnutls
+    libmsgpack
+    readline
+    libargon2
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A C++11 Kademlia distributed hash table implementation";
+    homepage = https://github.com/savoirfairelinux/opendht;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ taeer olynch ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c783b3cb916..ff237b556b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3460,6 +3460,8 @@ with pkgs;
 
   opendbx = callPackage ../development/libraries/opendbx { };
 
+  opendht = callPackage ../tools/security/opendht {};
+
   opendkim = callPackage ../development/libraries/opendkim { };
 
   opendylan = callPackage ../development/compilers/opendylan {

From 0573610a5fbc82d54114f367bbf41b43798a1c0e Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Tue, 11 Jul 2017 14:16:48 -0400
Subject: [PATCH 0386/3246] Make sure the LFE test suite is being run

---
 pkgs/development/beam-modules/default.nix     |  2 +-
 .../interpreters/lfe/generic-builder.nix      | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index b48abb34611..fa748da0031 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -55,7 +55,7 @@ let
                      };
 
         lfe = lfe_1_2;
-        lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3; };
+        lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
 
         # Non hex packages
         hex = callPackage ./hex {};
diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
index c55872afbfb..9595337bd56 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3 }:
+{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
 
 { baseName ? "lfe"
 , version
@@ -7,13 +7,30 @@
 , src ? fetchFromGitHub { inherit rev sha256; owner = "rvirding"; repo = "lfe"; }
 }:
 
+let
+  proper = buildHex {
+    name = "proper";
+    version = "1.1.1-beta";
+
+    sha256  = "0hnkhs761yjynw9382w8wm4j3x0r7lllzavaq2kh9n7qy3zc1rdx";
+
+    configurePhase = ''
+      ${erlang}/bin/escript write_compile_flags include/compile_flags.hrl
+    '';
+  };
+
+in
+
 buildRebar3 {
-  name = "${baseName}";
+  name = baseName;
 
   inherit src version;
 
   buildInputs = [ erlang makeWrapper ];
+  beamDeps    = [ proper ];
   patches     = [ ./no-test-deps.patch ];
+  doCheck     = true;
+  checkTarget = "travis";
 
   # These installPhase tricks are based on Elixir's Makefile.
   # TODO: Make, upload, and apply a patch.

From f5a7ce13174f04b94f807f731915029c1d7739df Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 16 Jun 2017 05:12:37 +0200
Subject: [PATCH 0387/3246] ldns: also build examples

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

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 91eb7aecea9..ff63b6af25e 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     patchShebangs doc/doxyparse.pl
   '';
 
-  outputs = [ "out" "dev" "man" ];
+  outputs = [ "out" "dev" "man" "examples" ];
 
   nativeBuildInputs = [ perl ];
   buildInputs = [ openssl ];
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     moveToOutput "bin/ldns-config" "$dev"
+
+    pushd examples
+    configureFlagsArray+=( "--bindir=$examples/bin" )
+    configurePhase
+    make
+    make install
+    popd
   '';
 
   meta = with stdenv.lib; {

From 71304fa3bf6dadee2f3c57c76f108626ac16cddb Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Tue, 11 Jul 2017 21:57:12 +0200
Subject: [PATCH 0388/3246] di: 4.43 -> 4.44

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

diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index 3e00ee795ff..8bc94b64be9 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "di-${version}";
-  version = "4.43";
+  version = "4.44";
 
   src = fetchurl {
     url = "http://gentoo.com/di/${name}.tar.gz";
-    sha256 = "1q25jy51qfzsym9b2w0cqzscq2j492gn60dy6gbp88m8nwm4sdy8";
+    sha256 = "0803lp8kd3mp1jcm17i019xiqxdy85hhs6xk67zib8gmvg500gcn";
   };
 
   makeFlags = [ "INSTALL_DIR=$(out)" ];

From 7e6fd08a3613fe854a358121375dc57a1f7f74ba Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Tue, 11 Jul 2017 21:59:26 +0200
Subject: [PATCH 0389/3246] phraseapp-client: 1.4.3 -> 1.4.5

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

diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix
index 1823c2cfad6..d5908210cbd 100644
--- a/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/pkgs/tools/misc/phraseapp-client/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "phraseapp-client-${version}";
-  version = "1.4.3";
+  version = "1.4.5";
 
   goPackagePath = "github.com/phrase/phraseapp-client";
   subPackages = [ "." ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "phrase";
     repo = "phraseapp-client";
     rev = version;
-    sha256 = "1nfab7y75vl0vg9vy8gc46h7wikk94nky1n415im1xbpsnqg77wz";
+    sha256 = "0zky7jcs7h6zmvkb0na4la6h7g63jlrziifqk831fd1gspdzgajp";
   };
 
   meta = with stdenv.lib; {

From f3cbde9125e19b261847281098ab35532996eb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 11 Jul 2017 21:56:29 +0200
Subject: [PATCH 0390/3246] codesearch: correct version number

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

diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
index ccb3f1d9ed9..fc7d74804fe 100644
--- a/pkgs/tools/text/codesearch/default.nix
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "codesearch-${version}";
-  version = "20150617-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20150717-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
 
   goPackagePath = "github.com/google/codesearch";

From cfd5740a7eaa08cd11ffee250c61fd7996e6efca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 11 Jul 2017 22:18:09 +0200
Subject: [PATCH 0391/3246] cutecom: 0.22.0 -> 0.44.0

---
 pkgs/tools/misc/cutecom/default.nix | 20 +++++++++++++-------
 pkgs/top-level/all-packages.nix     |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index de9604200ba..e3f8a4c43a5 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -1,16 +1,22 @@
-{ stdenv, fetchurl, qt4, cmake }:
+{ stdenv, fetchFromGitHub, qtbase, qtserialport, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "cutecom-0.22.0";
-  src = fetchurl {
-    url = "http://cutecom.sourceforge.net/${name}.tar.gz";
-    sha256 = "199fvl463nyn77r3nm8xgzgifs28j5759kkcnc5xbwww2nk20rhv";
+  name = "cutecom-${version}";
+  version = "0.40.0";
+  src = fetchFromGitHub {
+    owner = "neundorf";
+    repo = "CuteCom";
+    rev = "v${version}";
+    sha256 = "1bn6vndqlvn73riq6p0nanmcl35ja9gsil5hvfpf509r7i8gx4ds";
   };
-  buildInputs = [qt4 cmake];
+
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt --replace "#find_package(Serialport REQUIRED)" "find_package(Qt5SerialPort REQUIRED)"
+  '';
+  buildInputs = [qtbase qtserialport cmake];
 
   meta = {
     description = "A graphical serial terminal";
-    version = "0.22.0";
     homepage = http://cutecom.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.bennofs ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff237b556b6..b24ff9cac5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13606,7 +13606,7 @@ with pkgs;
 
   cuneiform = callPackage ../tools/graphics/cuneiform {};
 
-  cutecom = callPackage ../tools/misc/cutecom { };
+  cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
 
   cutegram =
     let callpkg = libsForQt56.callPackage;

From 778169409f39919c42957f3d9cb0aeb230b786d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 11 Jul 2017 22:40:03 +0200
Subject: [PATCH 0392/3246] xvkbd: 3.7 -> 3.8

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

diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index c7c7b9e5567..399531f71eb 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "xvkbd-${version}";
-  version = "3.7";
+  version = "3.8";
   src = fetchurl {
-    url = "http://homepage3.nifty.com/tsato/xvkbd/xvkbd-${version}.tar.gz";
-    sha256 = "02y9ks9sa4sn3vkbgswjs5qcd85xhwvarnmhg41pq3l2d617cpw9";
+    url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz";
+    sha256 = "16r5wbb5za02ha0ilwswx37lrwa6j40px8c9gkpnmmpb5r7kv91c";
   };
 
   buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];

From 4a370d7fb9e96311b0a757331e4bb74435f046d5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Jul 2017 22:54:40 +0200
Subject: [PATCH 0393/3246] ocamlPackages.fmt: 0.8.2 -> 0.8.4

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

diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix
index 469f808947a..0d6ab72fade 100644
--- a/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/pkgs/development/ocaml-modules/fmt/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner, result, uchar }:
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-fmt-0.8.2";
+  name = "ocaml${ocaml.version}-fmt-0.8.4";
 
   src = fetchurl {
-    url = http://erratique.ch/software/fmt/releases/fmt-0.8.2.tbz;
-    sha256 = "020qz74cm65bzrywf6kylm93gr5x1ayl6hfmxaql995f6whb388i";
+    url = http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz;
+    sha256 = "1qilsbisqqhmn8b1ar9lvjbgz8vf4gmqwqjnnjzgld2a3gmh8qvv";
   };
 
   unpackCmd = "tar xjf $src";

From 1d7aefd585ace3749b9f381ad030644171c97ff9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Jul 2017 21:00:43 +0000
Subject: [PATCH 0394/3246] ocamlPackages.fpath: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix
index 88f12003380..c5382ddd265 100644
--- a/pkgs/development/ocaml-modules/fpath/default.nix
+++ b/pkgs/development/ocaml-modules/fpath/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, astring }:
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-fpath-0.7.1";
+  name = "ocaml${ocaml.version}-fpath-0.7.2";
   src = fetchurl {
-    url = http://erratique.ch/software/fpath/releases/fpath-0.7.1.tbz;
-    sha256 = "05134ij27xjl6gaqsc65yl19vfj6cjxq3mbm9bf4mija8grdpn6g";
+    url = http://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz;
+    sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic";
   };
 
   unpackCmd = "tar xjf $src";

From eca15bd0c240d7bda132b70a551173f1022cc1db Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 12 Jul 2017 07:39:47 +0900
Subject: [PATCH 0395/3246] flashplayer: 26.0.0.131 -> 26.0.0.137

---
 .../networking/browsers/chromium/plugins.nix           |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 4e2a2f84b96..be9aa16e151 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 = "26.0.0.131";
+    version = "26.0.0.137";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1cw5pmzfyaaxxd3kf90nz8zn5r06qmkh8l793j3db4n0ffxg5c1s";
+      sha256 = "0zmslmy7i7ywb2frckg5afkmfqb2lm2mahq0qs8msjzcx9jk4pyx";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index e7893d22717..c25390a7c99 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 = "26.0.0.131";
+  version = "26.0.0.137";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0yqrw2gl9i0z33kcv5dpp3x3jyq9ksqfaqjgkk7xcy127ahric8s"
+          "1kdwprrrxbdgll05x148vhg86ph77ygr99ycfblblj8wjkcz9s0z"
         else
-          "0cmjqm5asqqcqavpkldm6wgjb49m9n018rixi7cj9zcwhfakm7zr"
+          "1ldv0fca43kdda949095r3gk1bc9p8n94z61qijkmrpv91zv5qvl"
       else
         if arch == "x86_64" then
-          "0agz4k5319m5bd0nqzkzvy8r28nr6c5j9b0jr6a8yh9s844aga8w"
+          "0db6dcqal7p79q26kglnsbiv3ysx9r3c7rkdiynww18gzr40vwls"
         else
-          "0jzvhyi1qgfjp9l85ffgcxqa87ymi899q2j68b9hfsn9hlw1sc5f";
+          "1fm6p91c63pyr0lra29vcq2dplb2c7a5114nm4r9rrrzjxakqw5w";
   };
 
   nativeBuildInputs = [ unzip ];

From 04be8b9ef53a1dc0a11597c8879d92882cab4219 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 12 Jul 2017 07:40:12 +0900
Subject: [PATCH 0396/3246] flashplayer-standalone: 26.0.0.131 -> 26.0.0.137

---
 .../browsers/mozilla-plugins/flashplayer/standalone.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index b290caaee3e..d7dd83b58f3 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,7 +55,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "26.0.0.131";
+  version = "26.0.0.137";
 
   src = fetchurl {
     url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "000a019x15yk6qkx8yg7l496lc5knvw0kqgzial491d73zw8qjhn"
+        "095457h83zs6cvdyyrh01069kgg8cnhgs1by6s9xpdxgc851n8gp"
       else
-        "0rmsfi70hvp5vvdvcr8w7knz8bzf70r3ysnsgz3yv3b9p5dvsbjk";
+        "1zw3f612cfb8lr331hwqzlpd0gn3r0139bq76pbbbahh2chq99f8";
   };
 
   nativeBuildInputs = [ unzip ];

From 0419452113ebb135907257bb063cb690a4de0b52 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 11 Jul 2017 21:54:13 -0400
Subject: [PATCH 0397/3246] Fix Darwin stdenv to work on 10.13

The main changes are in libSystem, which lost the coretls component in 10.13
and some hardening changes that quietly crash any program that uses %n in
a non-constant format string, so we've needed to patch a lot of programs that
use gnulib.
---
 pkgs/applications/editors/nano/default.nix    |  4 +++-
 .../libraries/libunistring/default.nix        |  2 +-
 pkgs/development/tools/misc/gnum4/default.nix |  4 ++--
 pkgs/development/tools/parsing/bison/3.x.nix  |  4 +++-
 .../Libsystem/reexported_libraries            |  2 +-
 .../Libsystem/system_kernel_symbols           |  2 --
 pkgs/stdenv/darwin/darwin-secure-format.patch | 15 ++++++++++++
 pkgs/stdenv/darwin/default.nix                | 23 +++++++++++++------
 pkgs/tools/compression/gzip/default.nix       |  4 +++-
 pkgs/tools/misc/coreutils/default.nix         |  3 ++-
 10 files changed, 46 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/stdenv/darwin/darwin-secure-format.patch

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index f3527d85fd7..6a740bbf6f1 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, hostPlatform, fetchurl, fetchFromGitHub
 , ncurses
 , texinfo
 , gettext ? null
@@ -27,6 +27,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1hl9gni3qmblr062a7w6vz16gvxbswgc5c19c923ja0bk48vyhyb";
   };
 
+  patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch;
+
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
   buildInputs = [ ncurses ];
 
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 662767b6678..20874f6f6a1 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ra1baz2187kbw9im47g6kqb5mx9plq703mkjxaval8rxv5q3q4w";
   };
 
-  patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ];
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch stdenv.secure-format-patch ];
 
   outputs = [ "out" "dev" "info" "doc" ];
 
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index fbbd6cc4d6f..33ea7890746 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, hostPlatform, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "gnum4-1.4.18";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--with-syscmd-shell=${stdenv.shell}";
 
   # Upstream is aware of it; it may be in the next release.
-  patches = [ ./s_isdir.patch ];
+  patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch;
 
   # FIXME needs gcc 4.9 in bootstrap tools
   hardeningDisable = [ "stackprotector" ];
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index ebbee4e693d..0369d7dabde 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl, help2man }:
+{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }:
 
 stdenv.mkDerivation rec {
   name = "bison-3.0.4";
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e";
   };
 
+  patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch;
+
   nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
index 00aaba1d498..494426eba6d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
@@ -19,7 +19,7 @@
 
 /usr/lib/system/libsystem_configuration.dylib
 /usr/lib/system/libsystem_coreservices.dylib
-/usr/lib/system/libsystem_coretls.dylib
+# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13
 /usr/lib/system/libsystem_dnssd.dylib
 /usr/lib/system/libsystem_info.dylib
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
index ff9073157a5..ed76787a900 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
@@ -376,7 +376,6 @@ _fsync
 _fsync$NOCANCEL
 _ftruncate
 _futimes
-_get_dp_control_port
 _getattrlist
 _getattrlistat
 _getattrlistbulk
@@ -838,7 +837,6 @@ _sendmsg$NOCANCEL
 _sendmsg_x
 _sendto
 _sendto$NOCANCEL
-_set_dp_control_port
 _setattrlist
 _setaudit
 _setaudit_addr
diff --git a/pkgs/stdenv/darwin/darwin-secure-format.patch b/pkgs/stdenv/darwin/darwin-secure-format.patch
new file mode 100644
index 00000000000..b14d8be6ef1
--- /dev/null
+++ b/pkgs/stdenv/darwin/darwin-secure-format.patch
@@ -0,0 +1,15 @@
+With format string strictness, High Sierra also enforces that %n isn't used
+in dynamic format strings, but we should just disable its use on darwin in
+general.
+
+--- a/lib/vasnprintf.c	2017-06-22 15:19:15.000000000 -0700
++++ b/lib/vasnprintf.c	2017-06-22 15:20:20.000000000 -0700
+@@ -4869,7 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *
+ #endif
+                   *fbp = dp->conversion;
+ #if USE_SNPRINTF
+-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
++# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+                 fbp[1] = '%';
+                 fbp[2] = 'n';
+                 fbp[3] = '\0';
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index f6d9bcac510..e7ce04b0a14 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -4,15 +4,15 @@
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
   fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/c4effbe806be9a0a3727fdbbc9a5e28149347532/${file}";
+    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/10cbca5b30c6cb421ce15139f32ae3a4977292cf/${file}";
     inherit (localSystem) system;
     inherit sha256 executable;
   }; in {
-    sh      = fetch { file = "sh";    sha256 = "1b9r3dksj907bpxp589yhc4217cas73vni8sng4r57f04ydjcinr"; };
-    bzip2   = fetch { file = "bzip2"; sha256 = "1wm28jgap4cbr8hf4ambg6h9flr2b4mcbh7fw20i0l51v6n8igky"; };
-    mkdir   = fetch { file = "mkdir"; sha256 = "0jc32mzx2whhx2xh70grvvgz4jj26118p9yxmhjqcysagc0k7y66"; };
-    cpio    = fetch { file = "cpio";  sha256 = "0x5dcczkzn0g8yb4pah449jmgy3nmpzrqy4s480grcx05b6v6hkp"; };
-    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "0ifdc8bwxdhmpbhx2vd3lwjg71gqm6pi5mfm0fkcsbqavl8hd8hz"; executable = false; };
+    sh      = fetch { file = "sh";    sha256 = "0s8a9vpzj6vadq4jmf4r8cargwnsf327hdjydxgqsfxb8y1q39w3"; };
+    bzip2   = fetch { file = "bzip2"; sha256 = "1jqljpjr8mkiv7g5rl5impqx3all8vn1mxxdwa004pr3h48c1zgg"; };
+    mkdir   = fetch { file = "mkdir"; sha256 = "17zsjiwnq07i5r85q1hg7f6cnkcgllwy2amz9klaqwjy4vzz4vwh"; };
+    cpio    = fetch { file = "cpio";  sha256 = "04hrair58dgja6syh442pswiga5an9nl58ls57yknkn2pq51nx9m"; };
+    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "103833hrci0vwi1gi978hkp69rncicvpdszn87ffpf1cq0jzpa14"; executable = false; };
   }
 }:
 
@@ -109,7 +109,13 @@ in rec {
         stdenvSandboxProfile = binShClosure + libSystemProfile;
         extraSandboxProfile  = binShClosure + libSystemProfile;
 
-        extraAttrs = { inherit platform; parent = last; };
+        extraAttrs = {
+          inherit platform;
+          parent = last;
+
+          # This is used all over the place so I figured I'd just leave it here for now
+          secure-format-patch = ./darwin-secure-format.patch;
+        };
         overrides  = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
 
@@ -319,6 +325,9 @@ in rec {
       inherit platform bootstrapTools;
       libc         = pkgs.darwin.Libsystem;
       shellPackage = pkgs.bash;
+
+      # This is used all over the place so I figured I'd just leave it here for now
+      secure-format-patch = ./darwin-secure-format.patch;
     };
 
     allowedRequisites = (with pkgs; [
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index cb7dc65c710..bb9555fa600 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz }:
+{ stdenv, hostPlatform, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
   name = "gzip-${version}";
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz";
   };
 
+  patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch;
+
   outputs = [ "out" "man" "info" ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 9a988a2b431..099e9ee0849 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
   # FIXME needs gcc 4.9 in bootstrap tools
   hardeningDisable = [ "stackprotector" ];
 
-  patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
+  patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
+    ++ optional hostPlatform.isDarwin stdenv.secure-format-patch;
 
   # The test tends to fail on btrfs and maybe other unusual filesystems.
   postPatch = optionalString (!hostPlatform.isDarwin) ''

From b9dfbeb82816689f0c42e78d462327032001af49 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Wed, 12 Jul 2017 02:43:04 +0800
Subject: [PATCH 0398/3246] xautomation: init at 1.09

---
 lib/maintainers.nix                    |  1 +
 pkgs/tools/X11/xautomation/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/X11/xautomation/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0cd4084bc27..b36659ef3ad 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -573,6 +573,7 @@
   utdemir = "Utku Demir <me@utdemir.com>";
   #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012
   uwap = "uwap <me@uwap.name>";
+  vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
   vanzef = "Ivan Solyankin <vanzef@gmail.com>";
   vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";
diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix
new file mode 100644
index 00000000000..79ef4cb56dc
--- /dev/null
+++ b/pkgs/tools/X11/xautomation/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }:
+
+let version = "1.09"; in
+stdenv.mkDerivation {
+  name = "xautomation-${version}";
+  src = fetchurl {
+    url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz";
+    sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libpng libX11 libXext libXi libXtst ];
+
+  meta = {
+    homepage = https://www.hoopajoo.net/projects/xautomation.html;
+    description = "Control X from the command line for scripts, and do \"visual scraping\" to find things on the screen";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ vaibhavsagar ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index deaaf4b2f2c..2e5b003f48a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16694,6 +16694,8 @@ with pkgs;
     inherit (xorg) libXt;
   };
 
+  xautomation = callPackage ../tools/X11/xautomation { };
+
   xawtv = callPackage ../applications/video/xawtv { };
 
   xbindkeys = callPackage ../tools/X11/xbindkeys { };

From 3bb9954a6bb977f3e33f766ae5df926495ef7bc4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 16 Jun 2017 05:11:56 +0200
Subject: [PATCH 0399/3246] dns-root-data: init at 2017-06-16

---
 pkgs/data/misc/dns-root-data/default.nix      | 29 +++++++++++++++++++
 pkgs/data/misc/dns-root-data/root.ds          |  3 ++
 pkgs/data/misc/dns-root-data/root.key         |  2 ++
 .../misc/dns-root-data/update-root-key.sh     |  9 ++++++
 pkgs/development/libraries/gnutls/generic.nix |  4 ++-
 pkgs/development/libraries/ldns/default.nix   |  9 ++++--
 pkgs/tools/networking/unbound/default.nix     |  3 +-
 pkgs/top-level/all-packages.nix               |  2 ++
 8 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/data/misc/dns-root-data/default.nix
 create mode 100644 pkgs/data/misc/dns-root-data/root.ds
 create mode 100644 pkgs/data/misc/dns-root-data/root.key
 create mode 100755 pkgs/data/misc/dns-root-data/update-root-key.sh

diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix
new file mode 100644
index 00000000000..ec0d9c83ad5
--- /dev/null
+++ b/pkgs/data/misc/dns-root-data/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchurl }:
+
+let
+
+  rootHints = fetchurl {
+    url = "http://www.internic.net/domain/named.root";
+    sha256 = "1zf3ydn44z70gq1kd95lvk9cp68xlbl8vqpswqlhd30qafx6v6d1";
+  };
+
+  rootKey = ./root.key;
+  rootDs = ./root.ds;
+
+in
+
+stdenv.mkDerivation {
+  name = "dns-root-data-2017-07-11";
+
+  buildCommand = ''
+    mkdir $out
+    cp ${rootHints} $out/root.hints
+    cp ${rootKey} $out/root.key
+    cp ${rootDs} $out/root.ds
+  '';
+
+  meta = with lib; {
+    description = "DNS root data including root zone and DNSSEC key";
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/data/misc/dns-root-data/root.ds
new file mode 100644
index 00000000000..61c5b8fcd34
--- /dev/null
+++ b/pkgs/data/misc/dns-root-data/root.ds
@@ -0,0 +1,3 @@
+; created by unbound-anchor on Tue Jul 11 23:48:16 2017
+. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
+. IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D
diff --git a/pkgs/data/misc/dns-root-data/root.key b/pkgs/data/misc/dns-root-data/root.key
new file mode 100644
index 00000000000..9046cefcb71
--- /dev/null
+++ b/pkgs/data/misc/dns-root-data/root.key
@@ -0,0 +1,2 @@
+.	172800	IN	DNSKEY	257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} ;;state=1 [ ADDPEND ]
+.	172800	IN	DNSKEY	257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b} ;;state=2 [  VALID  ]
diff --git a/pkgs/data/misc/dns-root-data/update-root-key.sh b/pkgs/data/misc/dns-root-data/update-root-key.sh
new file mode 100755
index 00000000000..5db179621a7
--- /dev/null
+++ b/pkgs/data/misc/dns-root-data/update-root-key.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p busybox unbound
+
+TMP=`mktemp`
+unbound-anchor -a $TMP
+grep -Ev "^($$|;)" $TMP | sed -e 's/ ;;count=.*//' > root.key
+rm $TMP
+
+unbound-anchor -F -a root.ds
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 48aa3fb9673..2a73682a746 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,6 +1,7 @@
 { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv
 , tpmSupport ? false, trousers, which, nettools, libunistring
+, unbound, dns-root-data
 
 # Version dependent args
 , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
@@ -32,12 +33,13 @@ stdenv.mkDerivation {
   ++ [
     "--disable-dependency-tracking"
     "--enable-fast-install"
+    "--with-unbound-root-key-file=${dns-root-data}/root.key"
   ] ++ lib.optional guileBindings
     [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
 
   enableParallelBuilding = true;
 
-  buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ]
+  buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ]
     ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ lib.optional guileBindings guile
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index ff63b6af25e..816b850f100 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, perl}:
+{stdenv, fetchurl, openssl, perl, dns-root-data}:
 
 stdenv.mkDerivation rec {
   pname = "ldns";
@@ -20,7 +20,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl ];
   buildInputs = [ openssl ];
 
-  configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill"];
+  configureFlags = [
+    "--with-ssl=${openssl.dev}"
+    "--with-trust-anchor=${dns-root-data}/root.key"
+    "--with-drill"
+    "--disable-gost"
+  ];
 
   postInstall = ''
     moveToOutput "bin/ldns-config" "$dev"
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 7fc5fb90173..b70fc2ced83 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, nettle, expat, libevent }:
+{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }:
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
     "--sysconfdir=/etc"
     "--sbindir=\${out}/bin"
+    "--with-rootkey-file=${dns-root-data}/root.key"
     "--enable-pie"
     "--enable-relro-now"
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c783b3cb916..3ce85d114b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12807,6 +12807,8 @@ with pkgs;
 
   dina-font-pcf = callPackage ../data/fonts/dina-pcf { };
 
+  dns-root-data = callPackage ../data/misc/dns-root-data { };
+
   docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { };
 
   docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { };

From 02a268430e13061aad441ec4a28579d46af79e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 12 Jul 2017 10:16:45 +0200
Subject: [PATCH 0400/3246] gapi-ocaml: 0.3.1 -> 0.3.4

---
 .../ocaml-modules/gapi-ocaml/default.nix            | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 8ead12427fd..a993a64a49a 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,10 +1,13 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
 
 stdenv.mkDerivation rec {
-  name = "gapi-ocaml-0.3.1";
-  src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/1665/${name}.tar.gz";
-    sha256 = "1fn563k9mpqp61909l5bzddnkyn04bk106vrcr7qiim1d2i6cf8i";
+  name = "gapi-ocaml-${version}";
+  version = "0.3.4";
+  src = fetchFromGitHub {
+    owner = "astrada";
+    repo = "gapi-ocaml";
+    rev = "v${version}";
+    sha256 = "07p6p108fyf9xz54jbcld40k3r9zyybxmr5i3rrkhgwm8gb6sbhv";
   };
   buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];

From 8f5f9864539df229554b25737f3f02dfd1e3db45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Jul 2017 11:01:49 +0100
Subject: [PATCH 0401/3246] opendht: move to pkgs/development/libraries

location is more appropriate
---
 .../security => development/libraries}/opendht/default.nix      | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{tools/security => development/libraries}/opendht/default.nix (100%)

diff --git a/pkgs/tools/security/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
similarity index 100%
rename from pkgs/tools/security/opendht/default.nix
rename to pkgs/development/libraries/opendht/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a34e66142a..c24c2f246a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3460,7 +3460,7 @@ with pkgs;
 
   opendbx = callPackage ../development/libraries/opendbx { };
 
-  opendht = callPackage ../tools/security/opendht {};
+  opendht = callPackage ../development/libraries/opendht {};
 
   opendkim = callPackage ../development/libraries/opendkim { };
 

From 1f1001c0f7182c8e8c5072015285ae214fe19710 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Wed, 12 Jul 2017 12:39:34 +0100
Subject: [PATCH 0402/3246] terminus: 4.40 -> 4.46

---
 pkgs/data/fonts/terminus-font/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 29c4c250fb9..c1ee2250c9a 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }:
+{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "terminus-font-4.40";
+  name = "terminus-font-4.46";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
-    sha256 = "0487cyx5h1f0crbny5sg73a22gmym5vk1i7646gy7hgiscj2rxb4";
+    sha256 = "1kavqw38aarz0vpwz4b7l6l8xkyc5096zaf9ypqnvdwraqz46aaf";
   };
 
-  buildInputs = [ perl bdftopcf mkfontdir mkfontscale ];
+  buildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];
 
   patchPhase = ''
     substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'

From 07e7527fdb14769b6ecb39a787fa2c053895f9f0 Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Wed, 12 Jul 2017 21:23:40 +0800
Subject: [PATCH 0403/3246] undaemonize: init at 2017-07-11 (#27325)

---
 pkgs/tools/system/undaemonize/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/system/undaemonize/default.nix

diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/tools/system/undaemonize/default.nix
new file mode 100644
index 00000000000..e82ee18b831
--- /dev/null
+++ b/pkgs/tools/system/undaemonize/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "undaemonize-2017-07-11";
+  src = fetchFromGitHub {
+    repo = "undaemonize";
+    owner = "nickstenning";
+    rev = "a181cfd900851543ee1f85fe8f76bc8916b446d4";
+    sha256 = "1fkrgj3xfhj820qagh5p0rabl8z2hpad6yp984v92h9pgbfwxs33";
+  };
+  installPhase = ''
+    install -D undaemonize $out/bin/undaemonize
+  '';
+  meta = {
+    description = "Tiny helper utility to force programs which insist on daemonizing themselves to run in the foreground";
+    homepage = "https://github.com/nickstenning/undaemonize";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.canndrew ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c24c2f246a7..71e101aee6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19127,4 +19127,6 @@ with pkgs;
   linode-cli = callPackage ../tools/virtualization/linode-cli { };
 
   hss = callPackage ../tools/networking/hss {};
+
+  undaemonize = callPackage ../tools/system/undaemonize {};
 }

From 6dcba74af6aa44ef662499070a6c36c8a7c56a3d Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Wed, 12 Jul 2017 15:21:35 +0300
Subject: [PATCH 0404/3246] solc: 0.4.12 -> 0.4.13

---
 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 6ace7d96be8..c2b1413b482 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchzip, fetchgit, boost, cmake }:
 
 let
-  version = "0.4.12";
-  rev = "194ff033ae44944ac59aa7bd3da89ba94ec5893c";
-  sha256 = "0gkg3nay0625qmhxxxax1d1c4dl554ri3pkwd12qfg6g1w6j04w7";
+  version = "0.4.13";
+  rev = "0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14";
+  sha256 = "0rhrm0bmk5s2358j40yx7dzr1938q17dchzflrxw6y7yvkhscxrm";
   jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;

From 442d04d1dde24a628fd2427926724219a5c4dc6b Mon Sep 17 00:00:00 2001
From: Mikael Brockman <mikael@brockman.se>
Date: Mon, 10 Jul 2017 17:10:45 +0300
Subject: [PATCH 0405/3246] solc: make sure to use dynamic Boost libs

For some reason the default options enable static Boost libs on Darwin,
but that doesn't work for us.
---
 pkgs/development/compilers/solc/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index c2b1413b482..24bd7d4f517 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation {
       --replace '${jsoncppURL}' ${jsoncpp}
     substituteInPlace cmake/EthCompilerSettings.cmake \
       --replace 'add_compile_options(-Werror)' ""
+    substituteInPlace cmake/EthDependencies.cmake \
+      --replace 'set(Boost_USE_STATIC_LIBS ON)'   \
+                'set(Boost_USE_STATIC_LIBS OFF)'
   '';
 
   buildInputs = [ boost cmake ];

From cbc54299b36e7faf5687e8c613123c7a0cc8b16f Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Wed, 12 Jul 2017 16:43:29 +0300
Subject: [PATCH 0406/3246] solc: build on both linux and darwin

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

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 24bd7d4f517..714f06d0b53 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation {
     longDescription = "This package also includes `lllc', the LLL compiler.";
     homepage = https://github.com/ethereum/solidity;
     license = stdenv.lib.licenses.gpl3;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
     maintainers = [ stdenv.lib.maintainers.dbrock ];
     inherit version;
   };

From d314a65c2384c230fc1d231581ce05a21aae8f32 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 12 Jul 2017 15:55:36 +0200
Subject: [PATCH 0407/3246] psc-package: 0.1.1 -> 0.2.0

---
 pkgs/development/compilers/purescript/psc-package/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index 70ef8b63277..306eaa93958 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 mkDerivation rec {
   pname = "psc-package";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "purescript";
     repo = pname;
     rev = "v${version}";
-    sha256 = "078xjn10yq4i0ff78bxscvxhn29p3s7iwv3pjyqxzlhaymn5949l";
+    sha256 = "0vid8vc8n8xj0qa4gnm1any9s18rdh7yn960vgix17r7a3bdndwb";
   };
 
   isLibrary = false;

From 8dc7d34942bfe6a6631967284596a3990451fbcb Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Wed, 12 Jul 2017 10:01:40 -0400
Subject: [PATCH 0408/3246] LFE 1.2 does not support OTP 20

---
 pkgs/development/interpreters/lfe/1.2.nix             | 1 +
 pkgs/development/interpreters/lfe/generic-builder.nix | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/pkgs/development/interpreters/lfe/1.2.nix b/pkgs/development/interpreters/lfe/1.2.nix
index 2bd1df41fb6..b81acdaa499 100644
--- a/pkgs/development/interpreters/lfe/1.2.nix
+++ b/pkgs/development/interpreters/lfe/1.2.nix
@@ -3,4 +3,5 @@
 mkDerivation {
   version = "1.2.1";
   sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz";
+  maximumOTPVersion = "19";
 }
diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
index 9595337bd56..fb034a471e7 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -2,12 +2,17 @@
 
 { baseName ? "lfe"
 , version
+, maximumOTPVersion
 , sha256 ? null
 , rev ? version
 , src ? fetchFromGitHub { inherit rev sha256; owner = "rvirding"; repo = "lfe"; }
 }:
 
 let
+  inherit (stdenv.lib) getVersion versionAtLeast splitString head;
+
+  mainVersion = head (splitString "." (getVersion erlang));
+
   proper = buildHex {
     name = "proper";
     version = "1.1.1-beta";
@@ -20,6 +25,7 @@ let
   };
 
 in
+assert versionAtLeast maximumOTPVersion mainVersion;
 
 buildRebar3 {
   name = baseName;

From 811142aa710ba2d4a20fe73d7a70dbecd8ab51b8 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Wed, 12 Jul 2017 10:10:13 -0400
Subject: [PATCH 0409/3246] elixir: 1.5.0-rc.0 -> 1.5.0-rc.1

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

diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index d9e2e9c16c6..add21c15a2d 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.5.0-rc.0";
-  sha256 = "1p0sawz86w9na56c42ivdacqxzldjb9s9cvl2isj3sy4nwsa0l0j";
+  version = "1.5.0-rc.1";
+  sha256 = "1aqbhyzwjqg57f99kwqzxkk4gjaqgwb7nmgpgdp7psa0ly742i9q";
   minimumOTPVersion = "18";
 }

From 9747eca164e48186e759a247fe68818f326e3f27 Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Wed, 12 Jul 2017 22:36:28 +0800
Subject: [PATCH 0410/3246] houdini: init at 16.0.633 (#27326)

---
 pkgs/applications/misc/houdini/default.nix | 15 +++++
 pkgs/applications/misc/houdini/runtime.nix | 76 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 3 files changed, 93 insertions(+)
 create mode 100644 pkgs/applications/misc/houdini/default.nix
 create mode 100644 pkgs/applications/misc/houdini/runtime.nix

diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix
new file mode 100644
index 00000000000..4e40230108b
--- /dev/null
+++ b/pkgs/applications/misc/houdini/default.nix
@@ -0,0 +1,15 @@
+{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }:
+
+let
+  version = "16.0.633";
+  houdini-runtime = callPackage ./runtime.nix { };
+in buildFHSUserEnv rec {
+  name = "houdini-${version}";
+
+  extraBuildCommands = ''
+    mkdir -p $out/usr/lib/sesi
+  '';
+
+  runScript = "${undaemonize}/bin/undaemonize ${houdini-runtime}/bin/houdini";
+}
+
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
new file mode 100644
index 00000000000..bfd53ef835d
--- /dev/null
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -0,0 +1,76 @@
+{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, bc }:
+
+let
+  ld_library_path = builtins.concatStringsSep ":" [
+    "${stdenv.cc.cc.lib}/lib64"
+    "/run/opengl-driver/lib"
+    (stdenv.lib.makeLibraryPath [
+      mesa_glu
+      xorg.libXmu
+      xorg.libXi
+      xorg.libXext
+      xorg.libX11
+      xorg.libXrender
+      fontconfig
+      libSM
+      libICE
+      zlib
+      libpng
+    ])
+  ];
+  license_dir = "~/.config/houdini";
+in
+stdenv.mkDerivation rec {
+  version = "16.0.633";
+  name = "houdini-runtime-${version}";
+  src = requireFile rec {
+    name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz";
+    sha256 = "1laxncwgsr4hj53bn4pn9ibv3pkrpliwxlx0558wgnhq42js3wvl";
+    message = ''
+      This nix expression requires that ${name} is already part of the store.
+      Download it from https://sidefx.com and add it to the nix store with:
+        
+          nix-prefetch-url <URL>
+
+      This can't be done automatically because you need to create an account on
+      their website and agree to their license terms before you can download
+      it. That's what you get for using proprietary software.
+    '';
+  };
+
+  buildInputs = [ bc ];
+  installPhase = ''
+    patchShebangs houdini.install
+    mkdir -p $out
+    sed -i "s|/usr/lib/sesi|${license_dir}|g" houdini.install
+    ./houdini.install --install-houdini \
+                      --no-install-menus \
+                      --no-install-bin-symlink \
+                      --auto-install \
+                      --no-root-check \
+                      --accept-EULA \
+                      $out
+    sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/Licensing.opt
+    sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe
+    sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup
+    echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh
+    echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh
+  '';
+  postFixup = ''
+    INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
+    for BIN in $(find $out/bin -type f -executable); do
+      if patchelf $BIN 2>/dev/null ; then
+        echo "Patching ELF $BIN"
+        patchelf --set-interpreter "$INTERPRETER" "$BIN"
+      fi
+    done
+  '';
+  meta = {
+    description = "3D animation application software";
+    homepage = "https://sidefx.com";
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.canndrew ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71e101aee6c..a6fe66e0397 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19129,4 +19129,6 @@ with pkgs;
   hss = callPackage ../tools/networking/hss {};
 
   undaemonize = callPackage ../tools/system/undaemonize {};
+
+  houdini = callPackage ../applications/misc/houdini {};
 }

From 770b2b69125c8dcdaa9e57324293c704865ba474 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 7 Jul 2017 17:36:28 +0200
Subject: [PATCH 0411/3246] apr: 1.5.2 -> 1.6.2

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

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 329cd77ad26..9abf48289ae 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.5.2";
+  name = "apr-1.6.2";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "0ypn51xblix5ys9xy7da3ngdydip0qqh9rdq8nz54w9aq8lys0vx";
+    sha256 = "1gffipa87pflvgvw01dbkvgh75p8n2sr56m1pcl01avv6zm9q409";
   };
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];

From 222c2b34d909e1dbcd42e7fe474745b9ad1e3bfb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 7 Jul 2017 17:36:43 +0200
Subject: [PATCH 0412/3246] apr-util: 1.5.4 -> 1.6.0

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

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 1829b3306eb..3251693f574 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -13,11 +13,11 @@ assert ldapSupport -> openldap != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "apr-util-1.5.4";
+  name = "apr-util-1.6.0";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
+    sha256 = "0k6a90d67xl36brz69s7adgkswjmw7isnjblm1naqmjblwzwjx44";
   };
 
   patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch;

From 9ed95423d41bec2355660e0d068521c5a6fa55ca Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 12 Jul 2017 09:52:48 -0500
Subject: [PATCH 0413/3246] isyncUnstable: 20170329 -> 20170514

---
 pkgs/tools/networking/isync/unstable.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix
index 4adcaf2b9da..9d32f91d0e1 100644
--- a/pkgs/tools/networking/isync/unstable.nix
+++ b/pkgs/tools/networking/isync/unstable.nix
@@ -1,17 +1,20 @@
-{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl, zlib
-, autoconf, automake }:
+{
+  stdenv, fetchgit,
+  autoconf, automake, cyrus_sasl, db, openssl, perl, pkgconfig, zlib,
+}:
 
 stdenv.mkDerivation rec {
-  name = "isync-git-20170329";
-  rev = "1fdf793a3fb9f4704977ef49e0a490a83291ea4d";
+  name = "isync-git-20170514";
+  rev = "4b3768806278a70db696ba52645dc1b6eb8de58a";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/isync/isync";
     inherit rev;
-    sha256 = "1m54jjww1b7a6rfw4wckzx6z1nd90psbb6cs38b9c015cs0vwaf5";
+    sha256 = "1cv1isw01cfp7724z6f4pf6k4rx3k1lg0pc1xcq17zpikx9d10fb";
   };
 
-  buildInputs = [ openssl pkgconfig db cyrus_sasl zlib autoconf automake ];
+  nativeBuildInputs = [ autoconf automake perl pkgconfig ];
+  buildInputs = [ cyrus_sasl db openssl zlib ];
 
   preConfigure = ''
     touch ChangeLog

From f482ea2ed252049800d82bb646ca17fea6d3bddf Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 12 Jul 2017 23:50:04 +0800
Subject: [PATCH 0414/3246] quaternion: 2017-04-15 -> 2017-06-29

---
 .../instant-messengers/quaternion/default.nix      | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 03fc0d85292..a2510c77738 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -2,7 +2,7 @@
 
 mkDerivation rec {
   name = "quaternion-git-${version}";
-  version = "2017-04-15";
+  version = "2017-06-29";
 
   # quaternion and tensor share the same libqmatrixclient library as a git submodule
   #
@@ -12,9 +12,9 @@ mkDerivation rec {
   # derivation.
 
   src = fetchgit {
-    url             = "https://github.com/Fxrh/Quaternion.git";
-    rev             = "c35475a6755cdb75e2a6c8ca5b943685d07d9707";
-    sha256          = "0cm5j4vdnp5cljfnv5jqf89ccymspaqc6j9bb4c1x891vr42np0m";
+    url             = "https://github.com/QMatrixClient/Quaternion.git";
+    rev             = "1febc0178fd3d02b7426f58981b54924ad60c84d";
+    sha256          = "1whjhlphdhk7kgw2zqc0wj3k2i9gkp79qq2bnrh4mbcp3qmcqngr";
     fetchSubmodules = true;
   };
 
@@ -28,14 +28,12 @@ mkDerivation rec {
   postInstall = ''
     substituteInPlace $out/share/applications/quaternion.desktop \
       --replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
-
-    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   meta = with lib; {
-    homepage = https://matrix.org/docs/projects/client/quaternion.html;
     description = "Cross-platform desktop IM client for the Matrix protocol";
-    license = licenses.gpl3;
+    homepage    = https://matrix.org/docs/projects/client/quaternion.html;
+    license     = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
     inherit (qtbase.meta) platforms;
     inherit version;

From fc47846e39126b50302401fca8b15929e41ba711 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 12 Jul 2017 23:56:35 +0800
Subject: [PATCH 0415/3246] syncthing: 0.14.31 -> 0.14.32

---
 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 033e6e5e0ab..5fb950886e3 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.31";
+  version = "0.14.32";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "1zg9gj0g89swr8cxxrpl96adhqgxz40dwkm7n61q1vycd6hhl73d";
+    sha256 = "1agjr3m4gnywbp40idi0pwy25cp836sdcar7r6r9hwcqxyyzz545";
   };
 
   buildInputs = [ go removeReferencesTo ];

From 299c57e6f34849f2e6d97fa0490537d53c07d35f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 31 May 2017 11:28:11 +0800
Subject: [PATCH 0416/3246] terragrunt: make v0.11.1 use its own deps file

---
 .../networking/cluster/terragrunt/0.11.1.nix  |   2 +-
 .../cluster/terragrunt/deps_0_11.nix          | 111 ++++++++++++++++++
 2 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix

diff --git a/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix b/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix
index 7ed2cef0e3b..359579c3fde 100644
--- a/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
   };
 
-  goDeps = ./deps.nix;
+  goDeps = ./deps_0_11.nix;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix b/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix
new file mode 100644
index 00000000000..5ea04d1f424
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix
@@ -0,0 +1,111 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
+[
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5";
+      sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj";
+    };
+  }
+  {
+    goPackagePath = "github.com/bgentry/go-netrc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bgentry/go-netrc";
+      rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480";
+      sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-errors/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-errors/errors";
+      rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105";
+      sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-getter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-getter";
+      rev = "90b6568eac830f62a08e8f1f46375daa63e57015";
+      sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-version";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-version";
+      rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77";
+      sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
+      sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-zglob";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-zglob";
+      rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab";
+      sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-testing-interface";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-testing-interface";
+      rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8";
+      sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
+      sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
+      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "d70f47eeca3afd795160003bc6e28b001d60c67c";
+      sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif";
+    };
+  }
+]

From ef78ff84209162532c41c859693a9630dafab971 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Jul 2017 00:09:07 +0800
Subject: [PATCH 0417/3246] terragrunt: 0.12.16 -> 0.12.24

---
 .../networking/cluster/terragrunt/default.nix |  4 ++--
 .../networking/cluster/terragrunt/deps.nix    | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index a343f1f951b..d7988267f2f 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.12.16";
+  version = "0.12.24";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "07xxk7r9wvjv3v0l95g7sy5yphypfxmlymxzi7yv3b8dznifwm0y";
+    sha256 = "0rkbicvqjadb99qw65g3k7pqal5sn05png30qwy59cv4gjr9q9m4";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 5ea04d1f424..fc7da0a2a99 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -1,12 +1,12 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
 [
   {
     goPackagePath = "github.com/aws/aws-sdk-go";
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5";
-      sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj";
+      rev = "ae53883b2478fd8e2bdca2748367d5b5fa27ca22";
+      sha256 = "0sa5g69wpk6hbd6g52cc7l5c6zph9zyc5l9dy4288xn4hpb6c23q";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-getter";
-      rev = "90b6568eac830f62a08e8f1f46375daa63e57015";
-      sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism";
+      rev = "2814e6fb2ca5b3bd950c97eff22553ecb3c7f77b";
+      sha256 = "1pkqa5vdyc79iiw25b9vpl9f32nwv2pzh6f98l30678ypha0miqn";
     };
   }
   {
@@ -86,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
-      sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
+      rev = "d0303fe809921458f417bcf828397a65db30a7e4";
+      sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
-      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
+      rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a";
+      sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9";
     };
   }
   {
@@ -104,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "d70f47eeca3afd795160003bc6e28b001d60c67c";
-      sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif";
+      rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2";
+      sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr";
     };
   }
 ]

From 16cc87ca294359414897c51a6248f4fff28db29d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Jul 2017 00:12:22 +0800
Subject: [PATCH 0418/3246] terraform: disable checks for 0.9 as they are
 failing again

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

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 4ecf6342764..92b043cfdbd 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -51,6 +51,7 @@ in {
   terraform_0_9_11 = generic {
     version = "0.9.11";
     sha256 = "045zcpd4g9c52ynhgh3213p422ahds63mzhmd2iwcmj88g8i1w6x";
-    doCheck = true;
+    # checks are failing again
+    doCheck = false;
   };
 }

From 08ef46892c24f05445b8e499fc1a9ee0982d7346 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Tue, 11 Jul 2017 15:28:56 +0200
Subject: [PATCH 0419/3246] google-fonts: 2016-08-30 -> 2017-06-28

---
 pkgs/data/fonts/google-fonts/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index fd3425e3c7c..de281c278e6 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "google-fonts-${version}";
-  version = "2016-08-30";
+  version = "2017-06-28";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fonts";
-    rev = "7a4070f65f2ca85ffdf2d465ff5e095005bae197";
-    sha256 = "0c20vcsd0jki8drrim68z2ca0cxli4wyh1i1gyg4iyac0a0v8wx3";
+    rev = "b1cb16c0ce2402242e0106d15b0429d1b8075ecc";
+    sha256 = "18kyclwipkdv4zxfws87x2l91jwn34vrizw8rmv8lqznnfsjh2lg";
   };
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "13n2icpdp1z7i14rnfwkjdydhbjgdvyl1crd71hfy6l1j2p3kzyf";
+  outputHash = "0n0j2hi1qb2sc6p3v6lpaqb2aq0m9xjmi7apz3hf2nx97rrsam22";
 
   phases = [ "unpackPhase" "patchPhase" "installPhase" ];
 

From 18e2b44653406ec120c725c2f3568844eaa3af29 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Jul 2017 00:22:04 +0800
Subject: [PATCH 0420/3246] wp-cli: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix
index 9e692e214b9..6603ac510b7 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/pkgs/development/tools/wp-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, php }:
 
 let
-  version = "1.2.0";
+  version = "1.2.1";
 
   bin  = "bin/wp";
   ini  = "etc/php/wp-cli.ini";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
-    sha256 = "1v51230gpw3ghz8vp3s1ykrwnmka9gj0r7xjad79bc9y250vr920";
+    sha256 = "1ds9nhm0akajwykblg0s131vki02k3rpf72a851r3wjw2qv116wz";
   };
 
   buildCommand = ''

From 71e44b1453babc4d3d79fca647785a4c9b0bb6cb Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 12 Jul 2017 17:23:26 +0100
Subject: [PATCH 0421/3246] vscode: 1.13.0 -> 1.14.0

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 50103de4d05..e5b7d1c65ee 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.13.0";
+  version = "1.14.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "069pv0w8yhsv50glpcxzypsjc7mxmrcrv25c75rnv43yiyamjvyi";
-    "x86_64-linux" = "0cjkkvd5rs82yji0kpnbvzgwz5qvh9x6bmjd51rrvjz84dbwhgzq";
-    "x86_64-darwin" = "1qbxv5drqrx9k835a6zj3kkbh4sga5r9y0gf9bq16g3gf0dd9bwq";
+    "i686-linux" = "04xv9fr11j7k0yfb7aa2sdmq74hh43aarlvx8nxppzbn2k18dgb3";
+    "x86_64-linux" = "1m252cpj4pck40rxnrbp1wapn5d4grn15x7d3s059xb965kga4k7";
+    "x86_64-darwin" = "1hwjdrnrhvrmwbq935k4scgw68x817ms89gy471afbhpl65xmp8n";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 88d9d2de5b6bb551227cc428d90c0b2c31f2a051 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 12 Jul 2017 19:08:16 +0200
Subject: [PATCH 0422/3246] Use LLVM 4 on all platforms

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6fe66e0397..5a3e21a40f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5702,8 +5702,7 @@ with pkgs;
   llvm_35 = llvmPackages_35.llvm;
   llvm_34 = llvmPackages_34.llvm;
 
-  llvmPackages = recurseIntoAttrs
-    (if stdenv.isDarwin then llvmPackages_4 else llvmPackages_39);
+  llvmPackages = recurseIntoAttrs llvmPackages_4;
 
   llvmPackagesSelf = llvmPackages_34.override {
     stdenv = libcxxStdenv;

From 6a3a4f559bae4f4b2aa13091242ca07b5a757798 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Jul 2017 21:11:53 +0000
Subject: [PATCH 0423/3246] ocamlPackages.integers: init at 0.2.2

---
 .../ocaml-modules/integers/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/integers/default.nix

diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix
new file mode 100644
index 00000000000..e76c3aadc03
--- /dev/null
+++ b/pkgs/development/ocaml-modules/integers/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }:
+
+stdenv.mkDerivation {
+	name = "ocaml${ocaml.version}-integers-0.2.2";
+
+	src = fetchurl {
+		url = https://github.com/ocamllabs/ocaml-integers/releases/download/v0.2.2/integers-0.2.2.tbz;
+		sha256 = "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk";
+	};
+
+	unpackCmd = "tar xjf $src";
+
+	buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+
+	inherit (topkg) buildPhase installPhase;
+
+	meta = {
+		description = "Various signed and unsigned integer types for OCaml";
+		license = stdenv.lib.licenses.mit;
+		homepage = https://github.com/ocamllabs/ocaml-integers;
+		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 cf8f49fb427..0e6df5942c7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -228,6 +228,8 @@ let
 
     inotify = callPackage ../development/ocaml-modules/inotify { };
 
+    integers = callPackage ../development/ocaml-modules/integers { };
+
     io-page = callPackage ../development/ocaml-modules/io-page { };
 
     ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { };

From dd907450fe4739efd7d1e80fba8d6d9d1c4133ad Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Jul 2017 07:17:15 +0000
Subject: [PATCH 0424/3246] ocamlPackages.ctypes: 0.11.2 -> 0.11.5

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

diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix
index aaddc7b08d5..24a67a38f3c 100644
--- a/pkgs/development/ocaml-modules/ctypes/default.nix
+++ b/pkgs/development/ocaml-modules/ctypes/default.nix
@@ -2,13 +2,13 @@
 
 buildOcaml rec {
   name = "ctypes";
-  version = "0.11.2";
+  version = "0.11.5";
 
   minimumSupportedOcamlVersion = "4";
 
   src = fetchurl {
     url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz";
-    sha256 = "1ml80i8j5lpg3qwc074fks2hgxjq5cfdm9r6cznv605s05ajr3kh";
+    sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf";
   };
 
   buildInputs = [ ncurses pkgconfig ];

From 5772d292d7dc201335314e806aaec3b82f541508 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Jul 2017 07:17:55 +0000
Subject: [PATCH 0425/3246] ocsigenserver: enable deflatemod extension

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

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 1d283e5e55e..c8e60015d01 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
 lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
 libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
-, pgocaml
+, camlzip, pgocaml
 }:
 
 let mkpath = p: n:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt
   ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
-  ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml ];
+  ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];
 
   configureFlags = "--root $(out) --prefix /";
 

From 63cda55aa2fce72f05ecb4478aef6b2d8783efae Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Jul 2017 18:11:14 +0000
Subject: [PATCH 0426/3246] ocamlPackages.menhir: 20170418 -> 20170712

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

diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index b02015e6d56..2a101da74d5 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170418" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170712" else "20140422"
 }@args:
 
 let
   sha256 =
   if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20170418" then "0avxkighxfr9x3vh2dkc5r1k2w7q2dz005w7syyzr7qjybpavpii"
+  else if version == "20170712" then "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"
   else throw ("menhir: unknown version " ++ version);
 in
 

From 50339315e5adc26b5683349bbb188ce624c1b84c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 12 Jul 2017 20:29:42 +0200
Subject: [PATCH 0427/3246] ndisc6: do not attempt to install suid binaries

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

diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
index 86eec455564..b8680ca20d3 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
+    "--disable-suid-install"
   ];
 
   installFlags = [

From 6620e007f48a526544d59b949eae8143a66cb597 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 12 Jul 2017 20:31:27 +0200
Subject: [PATCH 0428/3246] ndisc6: change meta.homepage to https

The http address is a permanent redirect
---
 pkgs/tools/networking/ndisc6/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
index b8680ca20d3..56cdbd17825 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.remlab.net/ndisc6/;
+    homepage = https://www.remlab.net/ndisc6/;
     description = "A small collection of useful tools for IPv6 networking";
     maintainers = with maintainers; [ eelco wkennington ];
     platforms = platforms.linux;

From 574f3c3bfef49c682490e065b8f93e93ed49038b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Jul 2017 20:24:54 +0200
Subject: [PATCH 0429/3246] ocamlPackages.csv: 1.5 -> 1.7

---
 .../development/ocaml-modules/csv/default.nix | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
index 4bb8f8ace9c..751d40ff706 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -1,19 +1,35 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_lwt }:
+
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.2"
+  then {
+    version = "1.7";
+    url = https://math.umons.ac.be/anum/software/csv/csv-1.7.tar.gz;
+    sha256 = "1mmcjiiz0jppgipavpph5kn04xcpalw4scbjrw2z3drghvr3qqwf";
+    lwtSupport = true;
+  } else {
+    version = "1.5";
+    url = https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz;
+    sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g";
+    lwtSupport = false;
+  };
+in
 
 stdenv.mkDerivation {
 
-  name = "ocaml-csv-1.5";
+  name = "ocaml${ocaml.version}-csv-${param.version}";
 
   src = fetchzip {
-    url = https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz;
-    sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g";
+    inherit (param) url sha256;
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ];
+  buildInputs = [ ocaml findlib ocamlbuild ]
+  ++ stdenv.lib.optional param.lwtSupport ocaml_lwt;
 
   createFindlibDestdir = true;
 
-  configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
+  configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"
+  + stdenv.lib.optionalString param.lwtSupport " --enable-lwt";
 
   buildPhase = "ocaml setup.ml -build";
 

From 51edf3bf88e4c1ba7a32ac9bfecfdbf69322bad0 Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Wed, 12 Jul 2017 14:27:03 +0000
Subject: [PATCH 0430/3246] miso: init at 0.2.0.0

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

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index fd7f15008d2..7efb75c3329 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -150,6 +150,17 @@ self: super:
   http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ];
   # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.*
 
+  # These are the correct dependencies specified when calling `cabal2nix --compiler ghcjs`
+  # By default, the `miso` derivation present in hackage-packages.nix
+  # does not contain dependencies suitable for ghcjs
+  miso = overrideCabal super.miso (drv: {
+      libraryHaskellDepends = with self; [
+        BoundedChan bytestring containers ghcjs-base aeson base
+        http-api-data http-types network-uri scientific servant text
+        transformers unordered-containers vector
+      ];
+    });
+
   pqueue = overrideCabal super.pqueue (drv: {
     postPatch = ''
       sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs

From 8d76effc178747f0c8f456fe619c1b014736a6af Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Jul 2017 16:04:14 -0400
Subject: [PATCH 0431/3246] stdenv-setup: Make the package accumulators
 associative arrays instead of strings

This is generally cleaner: less eval, less worrying about separators,
and probably also faster. I got the idea from that python wrapper
script.
---
 .../haskell-modules/generic-builder.nix       |  2 +-
 pkgs/development/interpreters/python/wrap.sh  |  2 +-
 pkgs/servers/x11/xorg/builder.sh              |  4 +--
 pkgs/stdenv/generic/setup.sh                  | 27 +++++++++----------
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index e097fd5af33..a8da63493a4 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -211,7 +211,7 @@ stdenv.mkDerivation ({
     configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
 
     # nativePkgs defined in stdenv/setup.hs
-    for p in $nativePkgs; do
+    for p in "''${!nativePkgs[@]}"; do
       if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
         cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
         continue
diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh
index 1c74e612b55..4b9b2024981 100644
--- a/pkgs/development/interpreters/python/wrap.sh
+++ b/pkgs/development/interpreters/python/wrap.sh
@@ -86,7 +86,7 @@ wrapPythonProgramsIn() {
 _addToPythonPath() {
     local dir="$1"
     # Stop if we've already visited here.
-    if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi
+    [ -n "${pythonPathsSeen[$dir]}" ] || return 0
     pythonPathsSeen[$dir]=1
     # addToSearchPath is defined in stdenv/generic/setup.sh. It will have
     # the effect of calling `export program_X=$dir/...:$program_X`.
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 055886374df..3a8cf6fa6c8 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -18,14 +18,14 @@ postInstall() {
 
     for r in $requires; do
         if test -n "$crossConfig"; then
-            for p in $crossPkgs; do
+            for p in "${!crossPkgs[@]}"; do
                 if test -e $p/lib/pkgconfig/$r.pc; then
                     echo "  found requisite $r in $p"
                     propagatedBuildInputs="$propagatedBuildInputs $p"
                 fi
             done
         else
-            for p in $nativePkgs; do
+            for p in "${!nativePkgs[@]}"; do
                 if test -e $p/lib/pkgconfig/$r.pc; then
                     echo "  found requisite $r in $p"
                     propagatedNativeBuildInputs="$propagatedNativeBuildInputs $p"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index de94565ed6d..e90c7e03473 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -275,17 +275,14 @@ runHook addInputsHook
 
 # Recursively find all build inputs.
 findInputs() {
-    local pkg="$1"
+    local pkg=$1
     local var=$2
+    local -n varDeref=$var
     local propagatedBuildInputsFile=$3
 
-    case ${!var} in
-        *\ $pkg\ *)
-            return 0
-            ;;
-    esac
-
-    eval $var="'${!var} $pkg '"
+    # Stop if we've already added this one
+    [[ -z "${varDeref["$pkg"]}" ]] || return 0
+    varDeref["$pkg"]=1
 
     if ! [ -e "$pkg" ]; then
         echo "build input $pkg does not exist" >&2
@@ -296,8 +293,8 @@ findInputs() {
         source "$pkg"
     fi
 
-    if [ -d $1/bin ]; then
-        addToSearchPath _PATH $1/bin
+    if [ -d "$pkg/bin" ]; then
+        addToSearchPath _PATH "$pkg/bin"
     fi
 
     if [ -f "$pkg/nix-support/setup-hook" ]; then
@@ -317,19 +314,19 @@ findInputs() {
 if [ -z "$crossConfig" ]; then
     # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)
     # are handled identically to nativeBuildInputs
-    nativePkgs=""
+    declare -gA nativePkgs
     for i in $nativeBuildInputs $buildInputs \
              $defaultNativeBuildInputs $defaultBuildInputs \
              $propagatedNativeBuildInputs $propagatedBuildInputs; do
         findInputs $i nativePkgs propagated-native-build-inputs
     done
 else
-    crossPkgs=""
+    declare -gA crossPkgs
     for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
         findInputs $i crossPkgs propagated-build-inputs
     done
 
-    nativePkgs=""
+    declare -gA nativePkgs
     for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
         findInputs $i nativePkgs propagated-native-build-inputs
     done
@@ -345,7 +342,7 @@ _addToNativeEnv() {
     runHook envHook "$pkg"
 }
 
-for i in $nativePkgs; do
+for i in "${!nativePkgs[@]}"; do
     _addToNativeEnv $i
 done
 
@@ -356,7 +353,7 @@ _addToCrossEnv() {
     runHook crossEnvHook "$pkg"
 }
 
-for i in $crossPkgs; do
+for i in "${!crossPkgs[@]}"; do
     _addToCrossEnv $i
 done
 

From 5d4efb2c816d2143f29cad8153faad1686557b2a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Jul 2017 20:23:06 -0400
Subject: [PATCH 0432/3246] stdenv-setup: Misc improvements as directed by
 ShellCheck

I took some liberties with the flags-echoing code to make it more
concise and correct. Also, a few warnings in findInputs and friends I
skipped because I am going to rewrite those anyways.

Thanks @grahamc for telling me about this great linter!
---
 pkgs/stdenv/generic/setup.sh | 140 +++++++++++++++++++++++------------
 1 file changed, 93 insertions(+), 47 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index e90c7e03473..2e424c1f581 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -52,9 +52,9 @@ runOneHook() {
 _callImplicitHook() {
     local def="$1"
     local hookName="$2"
-    case "$(type -t $hookName)" in
-        (function|alias|builtin) $hookName;;
-        (file) source $hookName;;
+    case "$(type -t "$hookName")" in
+        (function|alias|builtin) "$hookName";;
+        (file) source "$hookName";;
         (keyword) :;;
         (*) if [ -z "${!hookName}" ]; then return "$def"; else eval "${!hookName}"; fi;;
     esac
@@ -66,7 +66,7 @@ _callImplicitHook() {
 _eval() {
     local code="$1"
     shift
-    if [ "$(type -t $code)" = function ]; then
+    if [ "$(type -t "$code")" = function ]; then
         eval "$code \"\$@\""
     else
         eval "$code"
@@ -80,12 +80,14 @@ _eval() {
 nestingLevel=0
 
 startNest() {
-    nestingLevel=$(($nestingLevel + 1))
+    # Assert natural as sanity check.
+    let nestingLevel+=1 "nestingLevel>=0"
     echo -en "\033[$1p"
 }
 
 stopNest() {
-    nestingLevel=$(($nestingLevel - 1))
+    # Assert natural as sanity check.
+    let nestingLevel-=1 "nestingLevel>=0"
     echo -en "\033[q"
 }
 
@@ -120,7 +122,7 @@ exitHandler() {
         # - system time for the shell
         # - user time for all child processes
         # - system time for all child processes
-        echo "build time elapsed: " ${times[*]}
+        echo "build time elapsed: " "${times[@]}"
     fi
 
     if [ $exitCode != 0 ]; then
@@ -197,7 +199,7 @@ isELF() {
     local fd
     local magic
     exec {fd}< "$fn"
-    read -n 4 -u $fd magic
+    read -r -n 4 -u $fd magic
     exec {fd}<&-
     if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi
 }
@@ -210,7 +212,7 @@ isScript() {
     local magic
     if ! [ -x /bin/sh ]; then return 0; fi
     exec {fd}< "$fn"
-    read -n 2 -u $fd magic
+    read -r -n 2 -u $fd magic
     exec {fd}<&-
     if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi
 }
@@ -439,14 +441,14 @@ substitute() {
         p="${params[$n]}"
 
         if [ "$p" = --replace ]; then
-            pattern="${params[$((n + 1))]}"
-            replacement="${params[$((n + 2))]}"
-            n=$((n + 2))
+            pattern="${params[$n + 1]}"
+            replacement="${params[$n + 2]}"
+            let n+=2
         fi
 
         if [ "$p" = --subst-var ]; then
-            varName="${params[$((n + 1))]}"
-            n=$((n + 1))
+            varName="${params[$n + 1]}"
+            let n+=1
             # check if the used nix attribute name is a valid bash name
             if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
                 echo "WARNING: substitution variables should be valid bash names,"
@@ -459,9 +461,9 @@ substitute() {
         fi
 
         if [ "$p" = --subst-var-by ]; then
-            pattern="@${params[$((n + 1))]}@"
-            replacement="${params[$((n + 2))]}"
-            n=$((n + 2))
+            pattern="@${params[$n + 1]}@"
+            replacement="${params[$n + 2]}"
+            let n+=2
         fi
 
         content="${content//"$pattern"/$replacement}"
@@ -525,7 +527,9 @@ dumpVars() {
 # Utility function: echo the base name of the given path, with the
 # prefix `HASH-' removed, if present.
 stripHash() {
-    local strippedName="$(basename "$1")";
+    local strippedName
+    # On separate line for `set -e`
+    strippedName="$(basename "$1")"
     if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
         echo "$strippedName" | cut -c34-
     else
@@ -582,6 +586,7 @@ unpackPhase() {
 
     if [ -z "$srcs" ]; then
         if [ -z "$src" ]; then
+            # shellcheck disable=SC2016
             echo 'variable $src or $srcs should point to the source'
             exit 1
         fi
@@ -601,7 +606,7 @@ unpackPhase() {
 
     # Unpack all source archives.
     for i in $srcs; do
-        unpackFile $i
+        unpackFile "$i"
     done
 
     # Find the source directory.
@@ -665,6 +670,7 @@ patchPhase() {
                 ;;
         esac
         # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
+        # shellcheck disable=SC2086
         $uncompress < "$i" 2>&1 | patch ${patchFlags:--p1}
         stopNest
     done
@@ -681,18 +687,19 @@ fixLibtool() {
 configurePhase() {
     runHook preConfigure
 
-    if [ -z "$configureScript" -a -x ./configure ]; then
+    if [[ -z "$configureScript" && -x ./configure ]]; then
         configureScript=./configure
     fi
 
     if [ -z "$dontFixLibtool" ]; then
-        find . -iname "ltmain.sh" | while read i; do
+        local i
+        find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do
             echo "fixing libtool script $i"
-            fixLibtool $i
+            fixLibtool "$i"
         done
     fi
 
-    if [ -z "$dontAddPrefix" -a -n "$prefix" ]; then
+    if [[ -z "$dontAddPrefix" && -n "$prefix" ]]; then
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
@@ -711,8 +718,14 @@ configurePhase() {
     fi
 
     if [ -n "$configureScript" ]; then
-        echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
-        $configureScript $configureFlags "${configureFlagsArray[@]}"
+        # shellcheck disable=SC2086
+        local flagsArray=($configureFlags "${configureFlagsArray[@]}")
+        printf 'configure flags:'
+        printf ' %q' "${flagsArray[@]}"
+        echo
+        # shellcheck disable=SC2086
+        $configureScript "${flagsArray[@]}"
+        unset flagsArray
     else
         echo "no configure script, doing nothing"
     fi
@@ -724,17 +737,23 @@ configurePhase() {
 buildPhase() {
     runHook preBuild
 
-    if [ -z "$makeFlags" ] && ! [ -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile" ]; then
+    if [ -z "$makeFlags" ] && ! [[ -n "$makefile" || -e "Makefile" || -e "makefile" || -e "GNUmakefile" ]]; then
         echo "no Makefile, doing nothing"
     else
         # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
         makeFlags="SHELL=$SHELL $makeFlags"
 
-        echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
-        make ${makefile:+-f $makefile} \
+        # shellcheck disable=SC2086
+        local flagsArray=( \
             ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
             $makeFlags "${makeFlagsArray[@]}" \
-            $buildFlags "${buildFlagsArray[@]}"
+            $buildFlags "${buildFlagsArray[@]}")
+
+        printf 'build flags:'
+        printf ' %q' "${flagsArray[@]}"
+        echo
+        make ${makefile:+-f $makefile} "${flagsArray[@]}"
+        unset flagsArray
     fi
 
     runHook postBuild
@@ -744,11 +763,17 @@ buildPhase() {
 checkPhase() {
     runHook preCheck
 
-    echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
-    make ${makefile:+-f $makefile} \
+    # shellcheck disable=SC2086
+    local flagsArray=( \
         ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
         $makeFlags "${makeFlagsArray[@]}" \
-        ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check}
+        ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check})
+
+    printf 'check flags:'
+    printf ' %q' "${flagsArray[@]}"
+    echo
+    make ${makefile:+-f $makefile} "${flagsArray[@]}"
+    unset flagsArray
 
     runHook postCheck
 }
@@ -762,10 +787,17 @@ installPhase() {
     fi
 
     installTargets=${installTargets:-install}
-    echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
-    make ${makefile:+-f $makefile} $installTargets \
+
+    # shellcheck disable=SC2086
+    local flagsArray=( $installTargets \
         $makeFlags "${makeFlagsArray[@]}" \
-        $installFlags "${installFlagsArray[@]}"
+        $installFlags "${installFlagsArray[@]}")
+
+    printf 'install flags:'
+    printf ' %q' "${flagsArray[@]}"
+    echo
+    make ${makefile:+-f $makefile} "${flagsArray[@]}"
+    unset flagsArray
 
     runHook postInstall
 }
@@ -799,16 +831,19 @@ fixupPhase() {
         fi
         if [ -n "$propagated" ]; then
             mkdir -p "${!outputDev}/nix-support"
+            # shellcheck disable=SC2086
             printLines $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     else
         if [ -n "$propagatedBuildInputs" ]; then
             mkdir -p "${!outputDev}/nix-support"
+            # shellcheck disable=SC2086
             printLines $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"
         fi
 
         if [ -n "$propagatedNativeBuildInputs" ]; then
             mkdir -p "${!outputDev}/nix-support"
+            # shellcheck disable=SC2086
             printLines $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     fi
@@ -822,6 +857,7 @@ fixupPhase() {
 
     if [ -n "$propagatedUserEnvPkgs" ]; then
         mkdir -p "${!outputBin}/nix-support"
+        # shellcheck disable=SC2086
         printLines $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
     fi
 
@@ -832,11 +868,17 @@ fixupPhase() {
 installCheckPhase() {
     runHook preInstallCheck
 
-    echo "installcheck flags: $makeFlags ${makeFlagsArray[@]} $installCheckFlags ${installCheckFlagsArray[@]}"
-    make ${makefile:+-f $makefile} \
+    # shellcheck disable=SC2086
+    local flagsArray=( \
         ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
         $makeFlags "${makeFlagsArray[@]}" \
-        $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck}
+        $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck})
+
+    printf 'installcheck flags:'
+    printf ' %q' "${flagsArray[@]}"
+    echo
+    make ${makefile:+-f $makefile} "${flagsArray[@]}"
+    unset flagsArray
 
     runHook postInstallCheck
 }
@@ -845,14 +887,18 @@ installCheckPhase() {
 distPhase() {
     runHook preDist
 
-    echo "dist flags: $distFlags ${distFlagsArray[@]}"
-    make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
+    # shellcheck disable=SC2086
+    local flagsArray=($distFlags "${distFlagsArray[@]}" ${distTarget:-dist})
+
+    echo 'dist flags: %q' "${flagsArray[@]}"
+    make ${makefile:+-f $makefile} "${flagsArray[@]}"
 
     if [ "$dontCopyDist" != 1 ]; then
         mkdir -p "$out/tarballs"
 
         # Note: don't quote $tarballs, since we explicitly permit
         # wildcards in there.
+        # shellcheck disable=SC2086
         cp -pvd ${tarballs:-*.tar.gz} $out/tarballs
     fi
 
@@ -894,14 +940,14 @@ genericBuild() {
     fi
 
     for curPhase in $phases; do
-        if [ "$curPhase" = buildPhase -a -n "$dontBuild" ]; then continue; fi
-        if [ "$curPhase" = checkPhase -a -z "$doCheck" ]; then continue; fi
-        if [ "$curPhase" = installPhase -a -n "$dontInstall" ]; then continue; fi
-        if [ "$curPhase" = fixupPhase -a -n "$dontFixup" ]; then continue; fi
-        if [ "$curPhase" = installCheckPhase -a -z "$doInstallCheck" ]; then continue; fi
-        if [ "$curPhase" = distPhase -a -z "$doDist" ]; then continue; fi
+        if [[ "$curPhase" = buildPhase && -n "$dontBuild" ]]; then continue; fi
+        if [[ "$curPhase" = checkPhase && -z "$doCheck" ]]; then continue; fi
+        if [[ "$curPhase" = installPhase && -n "$dontInstall" ]]; then continue; fi
+        if [[ "$curPhase" = fixupPhase && -n "$dontFixup" ]]; then continue; fi
+        if [[ "$curPhase" = installCheckPhase && -z "$doInstallCheck" ]]; then continue; fi
+        if [[ "$curPhase" = distPhase && -z "$doDist" ]]; then continue; fi
 
-        if [ -n "$tracePhases" ]; then
+        if [[ -n "$tracePhases" ]]; then
             echo
             echo "@ phase-started $out $curPhase"
         fi

From e47dcb9cefdf154450382662fb59db0593eb773f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Jul 2017 19:27:37 +0000
Subject: [PATCH 0433/3246] ocamlPackages.tsdl: 0.9.0 -> 0.9.4

---
 .../ocaml-modules/tsdl/default.nix            | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix
index d47d5d3169b..01fa5b7ba6a 100644
--- a/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -1,44 +1,40 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ctypes, result, SDL2, pkgconfig, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, opam, ocb-stubblr }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "tsdl is not available for OCaml ${ocaml.version}"
+else
 
 let
-  inherit (stdenv.lib) getVersion;
-
   pname = "tsdl";
-  version = "0.9.0";
+  version = "0.9.4";
   webpage = "http://erratique.ch/software/${pname}";
-
 in
 
 stdenv.mkDerivation {
-  name = "ocaml-${pname}-${version}";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "02x0wsy5nxagxrh07yb2h4yqqy1bxryp2gwrylds0j6ybqsv4shm";
+    sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild result pkgconfig opam ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg result pkgconfig opam ocb-stubblr ];
   propagatedBuildInputs = [ SDL2 ctypes ];
 
   createFindlibDestdir = true;
 
   unpackCmd = "tar xjf $src";
 
-  buildPhase = ''
+  preConfigure = ''
     # The following is done to avoid an additional dependency (ncurses)
     # due to linking in the custom bytecode runtime. Instead, just
     # compile directly into a native binary, even if it's just a
     # temporary build product.
     substituteInPlace myocamlbuild.ml \
       --replace ".byte" ".native"
-
-    ocaml pkg/build.ml native=true native-dynlink=true
   '';
 
-  installPhase = ''
-    opam-installer --script --prefix=$out ${pname}.install | sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     homepage = "${webpage}";

From ff965a59f5c095ae4d6939e491892e0b786cc8a8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Jul 2017 22:11:36 +0200
Subject: [PATCH 0434/3246] scite: 3.7.3 -> 3.7.5

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

diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index d02a08a0a59..05cf21fcc53 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "scite-${version}";
-  version = "3.7.3";
+  version = "3.7.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite373.tgz";
-    sha256 = "05d81h1fqhjlw9apvrni3x2q4a562cd5ra1071qpna8h4ml0an9m";
+    url = http://www.scintilla.org/scite375.tgz;
+    sha256 = "11pg9bifyyqpblqsrl1b9f8shb3fa6fgzclvjba6hwh7hh98drji";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b38e33775b80d096370c73ce1eed112f1821047e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Jul 2017 21:29:15 +0100
Subject: [PATCH 0435/3246] xst: use fetchFromGitHub

---
 pkgs/applications/misc/st/xst.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix
index cd4d9f1814f..5aaf04bbfd8 100644
--- a/pkgs/applications/misc/st/xst.nix
+++ b/pkgs/applications/misc/st/xst.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }:
+{ stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }:
 
 with stdenv.lib;
 
@@ -8,9 +8,11 @@ let
 in stdenv.mkDerivation {
   inherit name;
 
-  src = fetchurl {
-    url = "https://github.com/neeasade/xst/archive/v${version}.tar.gz";
-    sha256 = "19ayx1753f2s6k7f6yn256bsssm20ggffs1diakgjqwcyjcxxn7q";
+  src = fetchFromGitHub {
+    owner = "neeasade";
+    repo = "xst";
+    rev = "v${version}";
+    sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc";
   };
 
   buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];

From fa5700544b5c921ce24383d516db16c1386be1f1 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 12 Jul 2017 21:56:12 +0100
Subject: [PATCH 0436/3246] nixos-install: quote nixos-prepare-root arguments

This prevents the script from breaking when channel_root is empty.
---
 nixos/modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index e2ae2ee9fdf..087fbcd4512 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -140,7 +140,7 @@ channel_closure="$tmpdir/channel.closure"
 nix-store --export $channel_root > $channel_closure
 
 # Populate the target root directory with the basics
-@prepare_root@/bin/nixos-prepare-root $mountPoint $channel_root $system_root @nixClosure@ $system_closure $channel_closure
+@prepare_root@/bin/nixos-prepare-root "$mountPoint" "$channel_root" "$system_root" @nixClosure@ "$system_closure" "$channel_closure"
 
 # nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead
 chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store

From df7ad644c901bf5704a467075f38979421efe5d1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 5 Jul 2017 01:15:40 +0200
Subject: [PATCH 0437/3246] nova-filters: bug fix and add maintainer

---
 pkgs/applications/audio/nova-filters/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix
index fff3582f7df..b361e6c33ae 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     sed -i -e '4d' SConstruct
     sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct
     sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp
+    sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp
     sed -i "s/= check/= detail::filter_base<internal_type, checked>::check/" nova/source/dsp/filter.hpp
   '';
 
@@ -27,10 +28,11 @@ stdenv.mkDerivation rec {
     scons $sconsFlags "prefix=$out" install
   '';
 
-  meta = {
-    homepage = http://klingt.org/~tim/nova-filters/;
+  meta = with stdenv.lib; {
     description = "LADSPA plugins based on filters of nova";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = http://klingt.org/~tim/nova-filters/;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
   };
 }

From 5d693c84d2e492080e982bf7429d6e923229d721 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 12 Jul 2017 11:56:43 -0400
Subject: [PATCH 0438/3246] stdenv-setup: Clean up 'substitute()' for style and
 error handling

It now blows up on null byte in file (rather than silently truncating),
and invalid arguments (rather than silently skipping).
---
 pkgs/stdenv/generic/setup.sh | 75 +++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 2e424c1f581..0d9a647a5c3 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -421,50 +421,55 @@ fi
 
 
 substitute() {
-    local input="$1"
-    local output="$2"
+    local input=$1
+    local output=$2
+    shift 2
 
     if [ ! -f "$input" ]; then
-      echo "substitute(): file '$input' does not exist"
+      echo "${FUNCNAME[0]}(): ERROR: file '$input' does not exist" >&2
       return 1
     fi
 
-    local -a params=("$@")
+    local content
+    # read returns non-0 on EOF, so we want read to fail
+    if IFS='' read -r -N 0 content < "$input"; then
+        echo "${FUNCNAME[0]}(): ERROR: File \"$input\" has null bytes, won't process" >&2
+        return 1
+    fi
 
-    local n p pattern replacement varName content
+    while (( "$#" )); do
+        case "$1" in
+            --replace)
+                pattern=$2
+                replacement=$3
+                shift 3
+                ;;
 
-    # a slightly hacky way to keep newline at the end
-    content="$(cat "$input"; printf "%s" X)"
-    content="${content%X}"
+            --subst-var)
+                local varName=$2
+                shift 2
+                # check if the used nix attribute name is a valid bash name
+                if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
+                    echo "${FUNCNAME[0]}(): WARNING: substitution variables should be valid bash names," >&2
+                    echo "  \"$varName\" isn't and therefore was skipped; it might be caused" >&2
+                    echo "  by multi-line phases in variables - see #14907 for details." >&2
+                    continue
+                fi
+                pattern=@$varName@
+                replacement=${!varName}
+                ;;
 
-    for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p="${params[$n]}"
+            --subst-var-by)
+                pattern=@$2@
+                replacement=$3
+                shift 3
+                ;;
 
-        if [ "$p" = --replace ]; then
-            pattern="${params[$n + 1]}"
-            replacement="${params[$n + 2]}"
-            let n+=2
-        fi
-
-        if [ "$p" = --subst-var ]; then
-            varName="${params[$n + 1]}"
-            let n+=1
-            # check if the used nix attribute name is a valid bash name
-            if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
-                echo "WARNING: substitution variables should be valid bash names,"
-                echo "  \"$varName\" isn't and therefore was skipped; it might be caused"
-                echo "  by multi-line phases in variables - see #14907 for details."
-                continue
-            fi
-            pattern="@$varName@"
-            replacement="${!varName}"
-        fi
-
-        if [ "$p" = --subst-var-by ]; then
-            pattern="@${params[$n + 1]}@"
-            replacement="${params[$n + 2]}"
-            let n+=2
-        fi
+            *)
+                echo "${FUNCNAME[0]}(): ERROR: Invalid command line argument: $1" >&2
+                return 1
+                ;;
+        esac
 
         content="${content//"$pattern"/$replacement}"
     done

From 7b27f7c28fda894b7a625790889f6caca048b9f3 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Thu, 13 Jul 2017 00:32:27 +0000
Subject: [PATCH 0439/3246] pycodestyle: 2.0.0 -> 2.3.1

---
 .../python-modules/pycodestyle/default.nix    | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +----------------
 2 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/pycodestyle/default.nix

diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix
new file mode 100644
index 00000000000..e6c7a85aaf2
--- /dev/null
+++ b/pkgs/development/python-modules/pycodestyle/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "pycodestyle";
+  version = "2.3.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rk78b66p57ala26mdldl9lafr48blv5s659sah9q50qnfjmc8k8";
+  };
+
+  meta = with lib; {
+    description = "Python style guide checker (formerly called pep8)";
+    homepage = https://pycodestyle.readthedocs.io;
+    license = licenses.mit;
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f3adb9d9d5..43debbdfbb1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10671,22 +10671,7 @@ in {
     };
   };
 
-  pycodestyle = buildPythonPackage rec {
-    name = "pycodestyle-${version}";
-    version = "2.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pycodestyle/${name}.tar.gz";
-      sha256 = "1rz2v8506mdjdyxcnv9ygiw6v0d4dqx8z5sjyjm0w2v32h5l5w1p";
-    };
-
-    meta = {
-      description = "Python style guide checker (formerly called pep8)";
-      homepage = https://pycodestyle.readthedocs.io;
-      license = licenses.mit;
-      maintainers = with maintainers; [ garbas ];
-    };
-  };
+  pycodestyle = callPackage ../development/python-modules/pycodestyle { };
 
   filebytes = buildPythonPackage rec {
     name = "filebytes-0.9.12";

From fc2819d998a713ed04a95d728b63f0c921334906 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Jul 2017 04:34:56 +0300
Subject: [PATCH 0440/3246] munge: 0.5.11 -> 0.5.12, fix for Linux

---
 pkgs/tools/security/munge/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix
index 96847c983f1..f04f67c7a43 100644
--- a/pkgs/tools/security/munge/default.nix
+++ b/pkgs/tools/security/munge/default.nix
@@ -1,31 +1,33 @@
-{ stdenv, fetchFromGitHub, gnused, perl, libgcrypt, zlib, bzip2 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "munge-0.5.11";
+  name = "munge-0.5.12";
 
   src = fetchFromGitHub {
     owner = "dun";
     repo = "munge";
     rev = "${name}";
-    sha256 = "02847p742nq3cb8ayf5blrdicybq72nfsnggqkxr33cpppmsfwg9";
+    sha256 = "1wvkc63bqclpm5xmp3rn199x3jqd99255yicyydgz83cixp7wdbh";
   };
 
-  buildInputs = [ gnused perl libgcrypt zlib bzip2 ];
+  nativeBuildInputs = [ autoreconfHook gawk gnused ];
+  buildInputs = [ libgcrypt zlib bzip2 ];
 
-  preConfigure = ''
+  preAutoreconf = ''
     # Remove the install-data stuff, since it tries to write to /var
-    sed -i '505,511d' src/etc/Makefile.in
+    substituteInPlace src/Makefile.am --replace "etc \\" "\\"
   '';
 
   configureFlags = [
     "--localstatedir=/var"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = ''
       An authentication service for creating and validating credentials
     '';
-    maintainers = [ stdenv.lib.maintainers.rickynils ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.rickynils ];
   };
 }

From 5cb11abc9e7a24ea7d8b612f0957e516dea8d288 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Jul 2017 09:41:51 +0800
Subject: [PATCH 0441/3246] systemd: paths and slices are supported for user
 units too

---
 nixos/modules/system/boot/systemd.nix | 32 +++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 00d6d370dd7..46761fdc0e9 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -659,16 +659,22 @@ in
         }));
     };
 
+    systemd.user.paths = mkOption {
+      default = {};
+      type = with types; attrsOf (submodule [ { options = pathOptions; } unitConfig ]);
+      description = "Definition of systemd per-user path units.";
+    };
+
     systemd.user.services = mkOption {
       default = {};
       type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ] );
       description = "Definition of systemd per-user service units.";
     };
 
-    systemd.user.timers = mkOption {
+    systemd.user.slices = mkOption {
       default = {};
-      type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] );
-      description = "Definition of systemd per-user timer units.";
+      type = with types; attrsOf (submodule [ { options = sliceOptions; } unitConfig ] );
+      description = "Definition of systemd per-user slice units.";
     };
 
     systemd.user.sockets = mkOption {
@@ -683,6 +689,12 @@ in
       description = "Definition of systemd per-user target units.";
     };
 
+    systemd.user.timers = mkOption {
+      default = {};
+      type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] );
+      description = "Definition of systemd per-user timer units.";
+    };
+
     systemd.additionalUpstreamSystemUnits = mkOption {
       default = [ ];
       type = types.listOf types.str;
@@ -799,12 +811,12 @@ in
       };
 
     systemd.units =
-      mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
+         mapAttrs' (n: v: nameValuePair "${n}.path"    (pathToUnit    n v)) cfg.paths
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
-      // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
-      // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers
-      // mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths
-      // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices
+      // mapAttrs' (n: v: nameValuePair "${n}.slice"   (sliceToUnit   n v)) cfg.slices
+      // mapAttrs' (n: v: nameValuePair "${n}.socket"  (socketToUnit  n v)) cfg.sockets
+      // mapAttrs' (n: v: nameValuePair "${n}.target"  (targetToUnit  n v)) cfg.targets
+      // mapAttrs' (n: v: nameValuePair "${n}.timer"   (timerToUnit   n v)) cfg.timers
       // listToAttrs (map
                    (v: let n = escapeSystemdPath v.where;
                        in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts)
@@ -813,7 +825,9 @@ in
                        in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts);
 
     systemd.user.units =
-         mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services
+         mapAttrs' (n: v: nameValuePair "${n}.path"    (pathToUnit    n v)) cfg.user.paths
+      // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services
+      // mapAttrs' (n: v: nameValuePair "${n}.slice"   (sliceToUnit   n v)) cfg.user.slices
       // mapAttrs' (n: v: nameValuePair "${n}.socket"  (socketToUnit  n v)) cfg.user.sockets
       // mapAttrs' (n: v: nameValuePair "${n}.target"  (targetToUnit  n v)) cfg.user.targets
       // mapAttrs' (n: v: nameValuePair "${n}.timer"   (timerToUnit   n v)) cfg.user.timers;

From e59c532c2399a62391211275790c8a420bc07f05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 11:10:46 +0200
Subject: [PATCH 0442/3246] haskell-hspec-meta: use latest version when
 compiling with ghc-8.2.x

Fixes https://github.com/hspec/hspec/issues/323.
---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index e4d0e00a326..2297fda171f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -60,9 +60,10 @@ self: super: {
   ghc-syb-utils = dontCheck super.ghc-syb-utils;
 
   # Older, LTS-8-based versions don't compile.
-  vector = super.vector_0_12_0_1;
+  hspec-meta = self.hspec-meta_2_4_4;
   primitive = self.primitive_0_6_2_0;
   syb = self.syb_0_7;
+  vector = super.vector_0_12_0_1;
 
   # Work around overly restrictive constraints on the version of 'base'.
   doctest = doJailbreak super.doctest;

From f980dbec97ddb8e518f3342ab0896ecda311c39f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 12:07:15 +0200
Subject: [PATCH 0443/3246] haskell-ChasingBottoms: jailbreak to fix build with
 ghc-8.2.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 2297fda171f..5794f05ebcc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -67,5 +67,6 @@ self: super: {
 
   # Work around overly restrictive constraints on the version of 'base'.
   doctest = doJailbreak super.doctest;
+  ChasingBottoms = doJailbreak super.ChasingBottoms;
 
 }

From 0ee5424ebfa7aa87f65fb58cd325536a024c09f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 12:14:14 +0200
Subject: [PATCH 0444/3246] haskell-doctest: remove obsolete jailbreak;
 ghc-8.2.x can build this package now

---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 5794f05ebcc..2373fda66d2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -66,7 +66,6 @@ self: super: {
   vector = super.vector_0_12_0_1;
 
   # Work around overly restrictive constraints on the version of 'base'.
-  doctest = doJailbreak super.doctest;
   ChasingBottoms = doJailbreak super.ChasingBottoms;
 
 }

From 26762f1e1e94288b27d695e42d4bc76c0bb071b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 12:19:42 +0200
Subject: [PATCH 0445/3246] haskell-base-orphans: disable test suite to avoid
 build failures with ghc-8.2.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 2373fda66d2..4b848478fa9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -68,4 +68,7 @@ self: super: {
   # Work around overly restrictive constraints on the version of 'base'.
   ChasingBottoms = doJailbreak super.ChasingBottoms;
 
+  # https://github.com/haskell-compat/base-orphans/issues/42
+  base-orphans = dontCheck super.base-orphans;
+
 }

From 2180d2c1180b04b14877cccad841fdb06941255a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 12:24:06 +0200
Subject: [PATCH 0446/3246] haskell-jailbreak-cabal: use stable version from
 ghc-8.0.x in ghc-8.2.x package set

The version compiled with Cabal 2.x breaks many packages, like doctest and
hashable. This needs further investigation.
---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 4b848478fa9..90d00722996 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -39,8 +39,8 @@ self: super: {
   # cabal-install can use the native Cabal library.
   cabal-install = super.cabal-install.override { Cabal = null; };
 
-  # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
+  # jailbreak-cabal doesn't seem to work right with the native Cabal version.
+  jailbreak-cabal = pkgs.haskellPackages.jailbreak-cabal;
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {

From bde4ef2234fa1aea2edace217faf4b4cd478d718 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 12:25:55 +0200
Subject: [PATCH 0447/3246] haskell-hashable: jailbreak to fix build with
 ghc-8.2.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 90d00722996..33503a75c02 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -67,6 +67,7 @@ self: super: {
 
   # Work around overly restrictive constraints on the version of 'base'.
   ChasingBottoms = doJailbreak super.ChasingBottoms;
+  hashable = doJailbreak super.hashable;
 
   # https://github.com/haskell-compat/base-orphans/issues/42
   base-orphans = dontCheck super.base-orphans;

From c6ccfcd01a958764fde88b94ec08e10aee2ec5ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 19:17:52 +0200
Subject: [PATCH 0448/3246] haskell-base-orphans: use latest version when
 compiling with ghc-8.2.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 33503a75c02..62bb55fba1d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -60,6 +60,7 @@ self: super: {
   ghc-syb-utils = dontCheck super.ghc-syb-utils;
 
   # Older, LTS-8-based versions don't compile.
+  base-orphans = self.base-orphans_0_6;
   hspec-meta = self.hspec-meta_2_4_4;
   primitive = self.primitive_0_6_2_0;
   syb = self.syb_0_7;
@@ -69,7 +70,4 @@ self: super: {
   ChasingBottoms = doJailbreak super.ChasingBottoms;
   hashable = doJailbreak super.hashable;
 
-  # https://github.com/haskell-compat/base-orphans/issues/42
-  base-orphans = dontCheck super.base-orphans;
-
 }

From 559b1b7647a82e2daf0e382bdf9477fa32557e58 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 19:27:16 +0200
Subject: [PATCH 0449/3246] haskell-semigroupoids: use latest version when
 compiling with ghc-8.2.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 62bb55fba1d..d1127be24fe 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -63,6 +63,7 @@ self: super: {
   base-orphans = self.base-orphans_0_6;
   hspec-meta = self.hspec-meta_2_4_4;
   primitive = self.primitive_0_6_2_0;
+  semigroupoids = self.semigroupoids_5_2;
   syb = self.syb_0_7;
   vector = super.vector_0_12_0_1;
 

From 85c884278e3c52de8adb3c697552893f092c12d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 19:27:37 +0200
Subject: [PATCH 0450/3246] haskell-lens: use latest version when compiling
 with ghc-8.2.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index d1127be24fe..8e18435c0c4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -62,6 +62,7 @@ self: super: {
   # Older, LTS-8-based versions don't compile.
   base-orphans = self.base-orphans_0_6;
   hspec-meta = self.hspec-meta_2_4_4;
+  lens = self.lens_4_15_3;
   primitive = self.primitive_0_6_2_0;
   semigroupoids = self.semigroupoids_5_2;
   syb = self.syb_0_7;

From b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Jul 2017 04:35:54 +0300
Subject: [PATCH 0451/3246] slurm: 15-08-5-1 -> 17.02.6, slurm-llnl -> slurm

---
 .../services/computing/slurm/slurm.nix        |  6 +++---
 pkgs/servers/computing/slurm/default.nix      | 21 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index ee38a42199e..fb91a29a400 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -36,9 +36,9 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.slurm-llnl;
-        defaultText = "pkgs.slurm-llnl";
-        example = literalExample "pkgs.slurm-llnl-full";
+        default = pkgs.slurm;
+        defaultText = "pkgs.slurm";
+        example = literalExample "pkgs.slurm-full";
         description = ''
           The package to use for slurm binaries.
         '';
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 311d707e9c5..69afd479af3 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl
+{ stdenv, fetchurl, pkgconfig, libtool, curl, python, munge, perl, pam, openssl
 , ncurses, mysql, gtk2, lua, hwloc, numactl
 }:
 
 stdenv.mkDerivation rec {
-  name = "slurm-llnl-${version}";
-  version = "15-08-5-1";
+  name = "slurm-${version}";
+  version = "17.02.6";
 
   src = fetchurl {
-    url = "https://github.com/SchedMD/slurm/archive/slurm-${version}.tar.gz";
-    sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1";
+    url = "https://www.schedmd.com/downloads/latest/slurm-17.02.6.tar.bz2";
+    sha256 = "1sp4xg15jc569r6dh61svgk2fmy3ndcgr5358yryajslf1w14mzh";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'
+  # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es
+  # this doesn't fix tests completely at least makes slurmd to launch
+  hardeningDisable = [ "bindnow" ];
+
+  nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
     curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl
   ];
@@ -25,8 +30,8 @@ stdenv.mkDerivation rec {
     ] ++ stdenv.lib.optional (gtk2 == null)  "--disable-gtktest";
 
   preConfigure = ''
-    substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}"
-    substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}"
+    patchShebangs ./doc/html/shtml2html.py
+    patchShebangs ./doc/man/man2html.py
   '';
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91ac16960cc..926d045948c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11485,9 +11485,9 @@ with pkgs;
 
   storm = callPackage ../servers/computing/storm { };
 
-  slurm-llnl = callPackage ../servers/computing/slurm { gtk2 = null; };
+  slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
 
-  slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { });
+  slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
 
   systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
 

From 00d73c42407d22cb94bac67ca889318e1c373787 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Jul 2017 04:49:21 +0300
Subject: [PATCH 0452/3246] python2Packages.pyslurm: init

---
 .../python-modules/pyslurm/default.nix        | 24 +++++++++++++++++++
 .../pyslurm/pyslurm-dlfcn.patch               | 18 ++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++++
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyslurm/default.nix
 create mode 100644 pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch

diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
new file mode 100644
index 00000000000..2acdef1b372
--- /dev/null
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }:
+
+buildPythonPackage rec {
+  name = "pyslurm";
+
+  src = fetchFromGitHub {
+    repo = "pyslurm";
+    owner = "PySlurm";
+    rev = "69e4f4fd66003b98ddb7da25613fe641d4ae160d";
+    sha256 = "051kafkndbniklxyf0drb360aiblnqcf9rqjbvmqh66zrfya1m28";
+  };
+
+  patches = [ ./pyslurm-dlfcn.patch ];
+
+  buildInputs = [ cython slurm ];
+  setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/PySlurm/pyslurm";
+    description = "Python bindings to Slurm";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.veprbl ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch b/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch
new file mode 100644
index 00000000000..2b3798a3070
--- /dev/null
+++ b/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch
@@ -0,0 +1,18 @@
+diff --git a/pyslurm/__init__.py b/pyslurm/__init__.py
+index 81643e1..e8b6836 100644
+--- a/pyslurm/__init__.py
++++ b/pyslurm/__init__.py
+@@ -11,8 +11,11 @@ import sys
+ old_dlopen_flags = ''
+ if hasattr(sys, "setdlopenflags"):
+     old_dlopen_flags = sys.getdlopenflags()
+-    import DLFCN
+-    sys.setdlopenflags(old_dlopen_flags | DLFCN.RTLD_GLOBAL)
++    if sys.version_info >= (3,6):
++        from os import RTLD_GLOBAL
++    else:
++        from DLFCN import RTLD_GLOBAL
++    sys.setdlopenflags(old_dlopen_flags | RTLD_GLOBAL)
+ 
+ from .pyslurm import *
+ 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f3adb9d9d5..ea89b736beb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -324,6 +324,10 @@ in {
 
   pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
 
+  pyslurm = callPackage ../development/python-modules/pyslurm {
+    slurm = pkgs.slurm;
+  };
+
   python-sql = callPackage ../development/python-modules/python-sql { };
 
   python-stdnum = callPackage ../development/python-modules/python-stdnum { };

From 07e492c6e673075ba98c4f06c5bb00798e6e67ec Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 13 Jul 2017 09:29:50 +0200
Subject: [PATCH 0453/3246] tor-browser-bundle-bin: do not call home to check
 tbb version

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 419f24cfb0c..968735495af 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -173,11 +173,12 @@ stdenv.mkDerivation rec {
     cat >mozilla.cfg <<EOF
     // First line must be a comment
 
-    // Always update via Nix
+    // Always update via Nixpkgs
     lockPref("app.update.auto", false);
     lockPref("app.update.enabled", false);
     lockPref("extensions.update.autoUpdateDefault", false);
     lockPref("extensions.update.enabled", false);
+    lockPref("extensions.torbutton.versioncheck_enabled", false);
 
     // User should never change these.  Locking prevents these
     // values from being written to prefs.js, avoiding Store

From 9e12be50b48898328f78d3ee9f7d5d164e2bd395 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 13 Jul 2017 09:57:10 +0200
Subject: [PATCH 0454/3246] tor-browser-bundle-bin: support injecting
 additional prefs

The `extraPrefs` parameter is injected verbatim into the mozilla.cfg
file.

Note that the syntax is a superset of the usual prefs.js syntax.  The
following procedures are of particular interest:
pref() to set a preference as if it had been toggled in about:config
defaultPref() to set the *default* value of a preference
lockPref() to set a preference & prevent further modification
clearPref() to reset a preference to its default state

Example:
```nix
tor-browser-bundle-bin.override {
  extraPrefs = ''
    // Increase default security level
    pref("extensions.torbutton.security_slider", 2);
  '';
}
```
---
 .../networking/browsers/tor-browser-bundle-bin/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 968735495af..5bcf47a4905 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -37,6 +37,9 @@
 
 # Pluggable transport dependencies
 , python27
+
+# Extra preferences
+, extraPrefs ? ""
 }:
 
 with stdenv.lib;
@@ -197,6 +200,10 @@ stdenv.mkDerivation rec {
     // Defaults to creating $TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket
     lockPref("extensions.torlauncher.control_port_use_ipc", true);
     lockPref("extensions.torlauncher.socks_port_use_ipc", true);
+
+    ${optionalString (extraPrefs != "") ''
+      ${extraPrefs}
+    ''}
     EOF
 
     # Hard-code path to TBB fonts; see also FONTCONFIG_FILE in

From 4f174769f2b9a0d7e048eb2d17835d7db4559d4b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Thu, 13 Jul 2017 17:03:44 +0800
Subject: [PATCH 0455/3246] vulnix: use zope.interface from pythonPackages

---
 pkgs/tools/security/vulnix/requirements.nix | 25 +++------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
index 280fc2279b4..11faca44ef9 100644
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -10,8 +10,7 @@ rec {
     propagatedBuildInputs = [
       persistent
       transaction
-      zope_interface
-    ] ++ (with pythonPackages; [ coverage ]);
+    ] ++ (with pythonPackages; [ zope_interface coverage ]);
 
     meta = with stdenv.lib; {
       homepage = "";
@@ -62,9 +61,7 @@ rec {
       url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz";
       sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c";
     };
-    propagatedBuildInputs = [
-      zope_interface
-    ] ++ (with pythonPackages; [ six wheel ]);
+    propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ];
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -78,9 +75,7 @@ rec {
       url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz";
       sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f";
     };
-    propagatedBuildInputs = [
-      zope_interface
-    ] ++ (with pythonPackages; [ six wheel ]);
+    propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ];
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -115,18 +110,4 @@ rec {
       description = "Fork of Python 3 pickle module.";
     };
   };
-
-  zope_interface = pythonPackages.buildPythonPackage {
-    name = "zope.interface-4.3.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916/zope.interface-4.3.3.tar.gz";
-      sha256 = "8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88";
-    };
-    propagatedBuildInputs = [ ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.zpt21;
-      description = "Interfaces for Python";
-    };
-  };
 }

From 9ab69a3416820df4b499e9a9fe0eb347985fd0c8 Mon Sep 17 00:00:00 2001
From: Tom Smeets <Tom.TSmeets@Gmail.com>
Date: Thu, 13 Jul 2017 11:23:24 +0200
Subject: [PATCH 0456/3246] android-studio-preview: init at 3.0.0.5 canary 6

Added the `androidStudioPackages` attribute containing both
the `stable` and `preview` channels.
Changed the attribute `andorid-studio` to point to
  `androidStudioPackages.stable`
Added the attribute `andorid-studio-preview` pointing to
  `androidStudioPackages.preview`

I have tested this package using the new koltin support,
no issues found yet.
---
 .../{default.nix => common.nix}               | 27 +++--------
 .../editors/android-studio/packages.nix       | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++--
 3 files changed, 56 insertions(+), 25 deletions(-)
 rename pkgs/applications/editors/android-studio/{default.nix => common.nix} (72%)
 create mode 100644 pkgs/applications/editors/android-studio/packages.nix

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/common.nix
similarity index 72%
rename from pkgs/applications/editors/android-studio/default.nix
rename to pkgs/applications/editors/android-studio/common.nix
index 0ba89099eb3..e74d04218f4 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -1,3 +1,4 @@
+{ pname, version, build, src, meta }:
 { bash
 , buildFHSUserEnv
 , coreutils
@@ -32,12 +33,9 @@
 }:
 
 let
-
-  version = "2.3.3.0";
-  build = "162.4069837";
-
   androidStudio = stdenv.mkDerivation {
-    name = "android-studio";
+    inherit src meta;
+    name = "${pname}";
     buildInputs = [
       makeWrapper
       unzip
@@ -96,32 +94,21 @@ let
         --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";
-      sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
-    };
-    meta = with stdenv.lib; {
-      description = "The Official IDE for Android";
-      homepage = https://developer.android.com/studio/index.html;
-      license = licenses.asl20;
-      platforms = [ "x86_64-linux" ];
-      maintainers = with maintainers; [ primeos ];
-    };
   };
 
   # Android Studio downloads prebuilt binaries as part of the SDK. These tools
   # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS
   # environment is used as a work around for that.
   fhsEnv = buildFHSUserEnv {
-    name = "android-studio-fhs-env";
+    name = "${pname}-fhs-env";
   };
 
 in writeTextFile {
-  name = "android-studio-${version}";
-  destination = "/bin/android-studio";
+  name = "${pname}-${version}";
+  destination = "/bin/${pname}";
   executable = true;
   text = ''
     #!${bash}/bin/bash
-    ${fhsEnv}/bin/android-studio-fhs-env ${androidStudio}/bin/studio.sh
+    ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh
   '';
 }
diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
new file mode 100644
index 00000000000..cf7173934bb
--- /dev/null
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -0,0 +1,46 @@
+{  stdenv, callPackage, fetchurl, makeFontsConf }:
+let
+  mkStudio = opts: callPackage (import ./common.nix opts);
+in rec {
+  stable = mkStudio rec {
+    pname = "android-studio";
+    version = "2.3.3.0";
+    build = "162.4069837";
+
+    src = fetchurl {
+      url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
+      sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
+    };
+
+    meta = with stdenv.lib; {
+      description = "The Official IDE for Android";
+      homepage = https://developer.android.com/studio/index.html;
+      license = licenses.asl20;
+      platforms = [ "x86_64-linux" ];
+      maintainers = with maintainers; [ primeos ];
+    };
+  } {
+    fontsConf = makeFontsConf {
+      fontDirectories = [];
+    };
+  };
+
+  preview = mkStudio rec {
+    pname = "android-studio-preview";
+    version = "3.0.0.5";
+    build = "171.4163606";
+
+    src = fetchurl {
+      url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
+      sha256 = "1gxnpw4jf3iic9d47sjbndpysq8kk8pgnb8l7azkc2rba5cj8skg";
+    };
+
+    meta = stable.meta // {
+      homepage = https://developer.android.com/studio/preview/index.html;
+    };
+  } {
+    fontsConf = makeFontsConf {
+      fontDirectories = [];
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7533ff00e2..7c8386ffbc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13253,11 +13253,9 @@ with pkgs;
 
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
-  android-studio = callPackage ../applications/editors/android-studio {
-    fontsConf = makeFontsConf {
-      fontDirectories = [];
-    };
-  };
+  androidStudioPackages = callPackage ../applications/editors/android-studio/packages.nix {};
+  android-studio = androidStudioPackages.stable;
+  android-studio-preview = androidStudioPackages.preview;
 
   antfs-cli = callPackage ../applications/misc/antfs-cli {};
 

From 1e1472ed93e1256dfdac4908ae8edcb90ceff21c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Jul 2017 13:07:42 +0200
Subject: [PATCH 0457/3246] llvmPackages_4: don't change *.outputs

It was blocking channel(s).  See:
https://github.com/NixOS/nixpkgs/pull/26818#issuecomment-315020922
---
 pkgs/development/compilers/llvm/4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index 8fee3f4a87c..9e5bccff355 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -16,7 +16,7 @@ let
   # Add man output without introducing extra dependencies.
   overrideManOutput = drv:
     let drv-manpages = drv.override { enableManpages = true; }; in
-    drv // { man = drv-manpages.man; outputs = drv.outputs ++ ["man"]; };
+    drv // { man = drv-manpages.man; /*outputs = drv.outputs ++ ["man"];*/ };
 
   llvm = callPackage ./llvm.nix {
     inherit compiler-rt_src stdenv;

From cfc6e4471b10d79f618b3cfd8fd59aca2752dee9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 13 Jul 2017 13:45:07 +0200
Subject: [PATCH 0458/3246] tinycc: 0.9.27pre-20170605 -> 0.9.27pre-20170710

Various CPP improvements/fixes
Support forward declaration of enums (GNU extension)
Initial implementation of C11 _Generic
---
 pkgs/development/compilers/tinycc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index c7e3c4b3c67..7e083ffe67b 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,10 +2,10 @@
 with stdenv.lib;
 
 let
-  date = "20170605";
+  date = "20170710";
   version = "0.9.27pre-${date}";
-  rev = "3e4b7693bfd5b76570b35558c83a935326513eff";
-  sha256 = "0m5k1df73kakvg9xz06y3nlac4mwfccni6hdijaf4w8fyy3zz4bg";
+  rev = "2acb04f7f2077a4cff103421d79ceee48441918a";
+  sha256 = "1rh89dx1myqfm752d4rlzrm8aadfm17fm88ps0q9ibmbxavb45qw";
 in
 
 stdenv.mkDerivation rec {

From 6da222918e9deef9526e2f1df006ce5140b69106 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Jul 2017 08:30:47 -0400
Subject: [PATCH 0459/3246] linux: 4.9.36 -> 4.9.37

---
 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 dcd5694ebbc..c42dbad5756 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.36";
+  version = "4.9.37";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1x615q5fl17fqr8h0552l7lzrpmn1n9azmsrnq9xhf980imfj0d0";
+    sha256 = "14300vddyz7x6vg1mx64a0i8i61fk5bl8azcvv7rf3b97c4cy7pn";
   };
 
   kernelPatches = args.kernelPatches;

From 24de0bad42d548fe84750f5fe6a4d3ca496c3b8a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Jul 2017 08:34:51 -0400
Subject: [PATCH 0460/3246] linux: 4.11.9 -> 4.11.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index 51151b449a4..eded1422440 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11.9";
+  version = "4.11.10";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0q60690hmqhz2x3v6qyjq7lhp2j99dcldvd46myc9ggp78d93j1z";
+    sha256 = "1dma031rcj8nvcb3znbcffafwm5cpax3cvqkq9zspa8lf5ah52si";
   };
 
   kernelPatches = args.kernelPatches;

From 6131b4d52d2f5fa46551b07c51dc6fe9c06c42a9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Jul 2017 08:36:50 -0400
Subject: [PATCH 0461/3246] linux: 4.12 -> 4.12.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index d4861e1de55..5ce28029c11 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,13 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12";
-  modDirVersion = "4.12.0";
+  version = "4.12.1";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1asq73lq0f81qwv21agcrpc3694fs14sja26q48y936hskn3np54";
+    sha256 = "0qm8lp6z3f2frqb585i5r7cb6hbzd0m13p0ywz4s8bqxwmrym1cw";
   };
 
   kernelPatches = args.kernelPatches;

From 45a2534459ea6b2ccc4c015236a0a690304621ea Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Jul 2017 08:40:08 -0400
Subject: [PATCH 0462/3246] linux-copperhead: 4.12.e -> 4.12.1.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 6230911fbee..6cd306381c1 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.12";
-  revision = "e";
-  sha256 = "1zxmfddj3nx8fd4nfxi0sxa3j9byq1dkp05plnknmi45b3ji57zh";
+  version = "4.12.1";
+  revision = "a";
+  sha256 = "0fjw5fmxpvdhfqkr4lcpmqw8xxj92q19ya8q48yhxvv149ahcvhq";
 in
 
 import ./generic.nix (args // {

From eb5263a9f12b8e585075893a23c6e062db4b8af4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Jul 2017 08:45:43 -0400
Subject: [PATCH 0463/3246] git: 2.13.2 -> 2.13.3

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 981b57b44c1..c6082f71af8 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -12,7 +12,7 @@
 }:
 
 let
-  version = "2.13.2";
+  version = "2.13.3";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1rfx2gj7dw9rw0w22ihi940zv3wdrj1xmjv25djq2vs6a4vsq40d";
+    sha256 = "0qiy696pwqhbxcrvm3zhyjnfjrym541glhvgc4cynrwg8az27ali";
   };
 
   hardeningDisable = [ "format" ];

From fe768392e20ea3bc1d23beb6a68e910c568b03ac Mon Sep 17 00:00:00 2001
From: GRBurst <JuliusE89@gmail.com>
Date: Thu, 13 Jul 2017 02:04:33 +0200
Subject: [PATCH 0464/3246] Add GRBurst as maintainer

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 40830e88748..e29ff585975 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -219,6 +219,7 @@
   goodrone = "Andrew Trachenko <goodrone@gmail.com>";
   gpyh = "Yacine Hmito <yacine.hmito@gmail.com>";
   grahamc = "Graham Christensen <graham@grahamc.com>";
+  grburst = "Julius Elias <grburst@openmailbox.org>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
   guillaumekoenig = "Guillaume Koenig <guillaume.edward.koenig@gmail.com>";

From 63ee6d6e2902a982b77875301b568f4e8b6633fa Mon Sep 17 00:00:00 2001
From: GRBurst <JuliusE89@gmail.com>
Date: Thu, 13 Jul 2017 02:11:47 +0200
Subject: [PATCH 0465/3246] xcwd: init at 2016-09-30

fixes #27345
---
 pkgs/tools/X11/xcwd/default.nix | 31 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/X11/xcwd/default.nix

diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix
new file mode 100644
index 00000000000..1d42f791fb5
--- /dev/null
+++ b/pkgs/tools/X11/xcwd/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, libX11 }:
+
+stdenv.mkDerivation rec {
+  version = "2016-09-30";
+  name = "xcwd-${version}";
+
+  src = fetchFromGitHub {
+    owner   = "schischi";
+    repo    = "xcwd";
+    rev     = "3f0728b932904985b703b33bd5c936ea96cf15a0";
+    sha256  = "0lwfz6qg7fkiq86skp51vpav33yik22ps4dvr48asv3570skhlf9";
+  };
+
+  buildInputs = [ libX11 ];
+
+  makeFlags = "prefix=$(out)";
+
+  installPhase = ''
+    install -D xcwd "$out/bin/xcwd"
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      A simple tool which print the current working directory of the currently focused window
+    '';
+    homepage = https://github.com/schischi/xcwd;
+    maintainers = [ maintainers.grburst ];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7533ff00e2..c5d9dcd655c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4905,6 +4905,8 @@ with pkgs;
 
   xclip = callPackage ../tools/misc/xclip { };
 
+  xcwd = callPackage ../tools/X11/xcwd { };
+
   xtitle = callPackage ../tools/misc/xtitle { };
 
   xdelta = callPackage ../tools/compression/xdelta { };

From 6fda535869484c60c8ea6f9ce1fde05fb4968863 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Jul 2017 08:54:34 -0400
Subject: [PATCH 0466/3246] linux-copperhead: Fix modDirVersion

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 6cd306381c1..4b44ce9b00d 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -9,7 +9,7 @@ in
 import ./generic.nix (args // {
   version = "${version}-${revision}";
   extraMeta.branch = "4.12";
-  modDirVersion = "${version}.0";
+  modDirVersion = "${version}";
 
   src = fetchFromGitHub {
     inherit sha256;

From 4e47390bce0b45f19924d515df898914ddd1068c Mon Sep 17 00:00:00 2001
From: Stefan Lau <stefan.lau@holidaycheck.com>
Date: Thu, 13 Jul 2017 12:17:37 +0200
Subject: [PATCH 0467/3246] nodejs: 8.1.0 -> 8.1.4

---
 pkgs/development/web/nodejs/v8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 273eb014180..49da505e439 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.1.0";
+    version = "8.1.4";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "1z3pcyxni8qmxljz6vbghm8242sr63l0dbc7x22ywbbqkfv21zzj";
+      sha256 = "00f38bif8f6ws6pcfpfy5cdvanry39l4wb2gzm39qx3rbx28cg58";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];

From 8ff35d6adf19c0d0abc7579ab3c6a01ddc170ed1 Mon Sep 17 00:00:00 2001
From: Stefan Lau <stefan.lau@holidaycheck.com>
Date: Thu, 1 Jun 2017 12:53:34 +0200
Subject: [PATCH 0468/3246] gnome-control-center: wrap with wrapGAppsHook

---
 .../gnome-3/3.22/core/gnome-control-center/default.nix   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
index eac25b3e569..a972fee8413 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
+{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook
 , libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
 , gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
@@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   buildInputs = with gnome3;
-    [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas
+    [ pkgconfig intltool ibus gtk glib glib_networking upower libcanberra_gtk2 gsettings_desktop_schemas
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
       gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
       accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
-      gnome3.vino udev libcanberra_gtk3 libgudev
+      gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook
       networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker
       cracklib ];
 
@@ -39,9 +39,6 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = with gnome3; ''
-    wrapProgram $out/bin/gnome-control-center \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     for i in $out/share/applications/*; do
       substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
     done

From 2b4bc03969ca9b5d7c7027b8ac76a013e751e855 Mon Sep 17 00:00:00 2001
From: Stefan Lau <stefan.lau@holidaycheck.com>
Date: Thu, 1 Jun 2017 12:53:55 +0200
Subject: [PATCH 0469/3246] gnome-online-accounts: wrap with wrapGAppsHook

---
 .../3.22/core/gnome-online-accounts/default.nix    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
index 85c15042614..29f6ae3e860 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
+{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, wrapGAppsHook
 , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
-, telepathy_glib, intltool, dbus_libs, icu
+, telepathy_glib, intltool, dbus_libs, icu, glib_networking
 , libsoup, docbook_xsl_ns, docbook_xsl, gnome3
 }:
 
@@ -11,16 +11,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
-                  libsecret dbus_glib telepathy_glib intltool icu libsoup
+  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
+                  libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup
                   docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
 
-  preFixup = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;

From aed23cfc0c6958ffd2446e670a0f4719af3cad5d Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 13 Jul 2017 13:06:06 +0200
Subject: [PATCH 0470/3246] screen: 4.6.0 -> 4.6.1

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

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

From 8fa0b47c6dacd00ce81b5c047e5b36dc313380b8 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <apeyroux@users.noreply.github.com>
Date: Thu, 13 Jul 2017 15:09:33 +0200
Subject: [PATCH 0471/3246] grammalecte: 0.5.17 -> 0.5.17.2 (#27190)

---
 .../python-modules/grammalecte/default.nix          |  9 +++++----
 .../python-modules/grammalecte/spellchecker.patch   | 13 +++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/grammalecte/spellchecker.patch

diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix
index 8ad1dd62869..ac476f6bb6a 100644
--- a/pkgs/development/python-modules/grammalecte/default.nix
+++ b/pkgs/development/python-modules/grammalecte/default.nix
@@ -7,16 +7,17 @@
 
 buildPythonPackage rec {
   pname = "grammalecte";
-  version = "0.5.17";
+  version = "0.5.17.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.dicollecte.org/grammalecte/oxt/Grammalecte-fr-v${version}.zip";
-    sha256 = "0ccvj8p8bwvrj8bp370dzjs16pwm755a7364lvk8bp4505n7g0b6";
+    url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip";
+    sha256 = "1g5i978cdz14rfdi4z2ayb2c1rf8cq991slwsv0krhpvl9ripl9c";
   };
 
   propagatedBuildInputs = [ bottle ];
 
+  patches = [ ./spellchecker.patch ];
   preBuild = "cd ..";
   postInstall = ''
     mkdir $out/bin
@@ -34,4 +35,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ gpl3 ];
     maintainers = with lib.maintainers; [ apeyroux ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/grammalecte/spellchecker.patch b/pkgs/development/python-modules/grammalecte/spellchecker.patch
new file mode 100644
index 00000000000..151eaa62f4a
--- /dev/null
+++ b/pkgs/development/python-modules/grammalecte/spellchecker.patch
@@ -0,0 +1,13 @@
+diff --git a/spellchecker.py b/spellchecker.py
+index 37ac0ea..a60b3a9 100644
+--- a/spellchecker.py
++++ b/spellchecker.py
+@@ -2,7 +2,7 @@
+ # Wrapper for the IBDAWG class.
+ # Useful to check several dictionaries at once.
+ 
+-import ibdawg
++from grammalecte import ibdawg
+ 
+ 
+ dDictionaries = {

From 3ae2158bae205df10dcbba6a5a4bd9b4f5169a80 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 10 Jul 2017 16:44:49 +0200
Subject: [PATCH 0472/3246] pythonPackages.django: 1.11.2 -> 1.11.3

See https://docs.djangoproject.com/en/1.11/releases/1.11.3/ for release
informations
---
 pkgs/development/python-modules/django/1_11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index f0035095b04..20f9d8505ab 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -5,13 +5,13 @@
 buildPythonPackage rec {
   pname = "Django";
   name = "${pname}-${version}";
-  version = "1.11.2";
+  version = "1.11.3";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
-    sha256 = "05q6bgm3vkdqg72i1m1z8bp2jdrm9n1c37aka1brwkyzh820fnrw";
+    sha256 = "0swgmwnfi6sa5fg5yxcs4k554cj9zp92w5n454xfsibjjl5dxycy";
   };
 
   patches = [

From 706f0c384946804fe56cb6f7d43e59b465503ce6 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 5 Jul 2017 10:47:03 +0200
Subject: [PATCH 0473/3246] gnugrep: 3.0 -> 3.1

See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00000.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 b33ea716978..0db140c7891 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 = "3.0"; in
+let version = "3.1"; in
 
 stdenv.mkDerivation {
   name = "gnugrep-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/grep/grep-${version}.tar.xz";
-    sha256 = "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72";
+    sha256 = "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv";
   };
 
   # Perl is needed for testing

From 9937f13308097210db9c9eaa61fadb73698fd475 Mon Sep 17 00:00:00 2001
From: florianjacob <accounts+github@florianjacob.de>
Date: Thu, 13 Jul 2017 15:40:31 +0200
Subject: [PATCH 0474/3246] resolved: use resolved's static resolv.conf
 (#27144)

because it is upstream's recommended mode of operation:
https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
---
 nixos/modules/config/networking.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index d503f5a8b20..cc967947dff 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -223,7 +223,9 @@ in
             '';
 
       } // optionalAttrs config.services.resolved.enable {
-        "resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+        # symlink the static version of resolv.conf as recommended by upstream:
+        # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
+        "resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf";
       } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
         "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
       };

From d518096abc9ba779d70ad86b4d49304239a4a759 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 13 Jul 2017 15:50:48 +0200
Subject: [PATCH 0475/3246] gnome3.gnome_control_center: remove unused variable

This broke the evaluation.
---
 .../desktops/gnome-3/3.22/core/gnome-control-center/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
index a972fee8413..23d32cdbac3 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
       gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook
-      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker
+      networkmanager modemmanager gnome3.gnome-bluetooth grilo tracker
       cracklib ];
 
   preBuild = ''

From 40cf34aaaeac3c94569b70d697b6b2715f946ca2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 13 Jul 2017 15:43:38 +0200
Subject: [PATCH 0476/3246] nix: 1.11.11 -> 1.11.12

---
 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 80241cd3ebe..8703ea1ca54 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/crqd5wmrqipl4n1fcm5kkc1zg4sj80js-nix-1.11.11";
-  i686-linux = "/nix/store/wsjn14xp5ja509d4dxb1c78zhirw0b5x-nix-1.11.11";
-  x86_64-darwin = "/nix/store/zqkqnhk85g2shxlpb04y72h1i3db3gpl-nix-1.11.11";
+  x86_64-linux = "/nix/store/2y3cn6siixhr7pbsz2grry89jzchkxyd-nix-1.11.12";
+  i686-linux = "/nix/store/sbz8z995lysxja8brnxmw7hgi6ljigrq-nix-1.11.12";
+  x86_64-darwin = "/nix/store/gs2z548x41ah2h8fqnbn87syzazrlsb8-nix-1.11.12";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a90f38ccc09..2bcf445bee6 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -152,10 +152,10 @@ in rec {
   nix = nixStable;
 
   nixStable = (common rec {
-    name = "nix-1.11.11";
+    name = "nix-1.11.12";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5";
+      sha256 = "02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2";
     };
   }) // { perl-bindings = nixStable; };
 

From f90d7b23a77df2b80c7eed9f6d0c7911c7fc7c5c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 13 Jul 2017 17:50:11 +0200
Subject: [PATCH 0477/3246] alienfx: do not attempt to install suid executables

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

diff --git a/pkgs/os-specific/linux/alienfx/default.nix b/pkgs/os-specific/linux/alienfx/default.nix
index 93d77819e57..263ee167a95 100644
--- a/pkgs/os-specific/linux/alienfx/default.nix
+++ b/pkgs/os-specific/linux/alienfx/default.nix
@@ -16,9 +16,9 @@ stdenv.mkDerivation {
 
   prePatch = ''
     substituteInPlace Makefile --replace /usr/ $out/
-    substituteInPlace Makefile --replace "install -o root -g root" "install"
+    substituteInPlace Makefile --replace "install -o root -g root -m 4755" "install -m 555"
   '';
- 
+
   patches = [./unistd.patch];
   buildInputs = [ libusb1 ];
   makeFlags = "build";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   '';
   installTargets = "install";
   postInstall = ''cp alienfx.1 $out/man/man1'';
-  
+
   meta = {
     description = "Controls AlienFX lighting";
     homepage = "https://github.com/tibz/alienfx";

From 484df87ab13f456f1b20b18310dd3b27c3fc0858 Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer@necsi.edu>
Date: Tue, 11 Jul 2017 16:26:42 -0400
Subject: [PATCH 0478/3246] ring-daemon: init at 2017-07-11

---
 .../ring-daemon/default.nix                   | 149 ++++++++++++++++++
 .../ring-daemon/notestsapps.patch             | 106 +++++++++++++
 .../ring-daemon/restbed.nix                   |  41 +++++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 298 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch
 create mode 100644 pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix

diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
new file mode 100644
index 00000000000..0632e787c70
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -0,0 +1,149 @@
+{ stdenv
+, fetchgit
+, which
+, autoreconfHook
+, pkgconfig
+, automake
+, libtool
+, pjsip
+, libyamlcpp
+, alsaLib
+, libpulseaudio
+, libsamplerate
+, libsndfile
+, dbus
+, dbus_cplusplus
+, ffmpeg
+, udev
+, pcre
+, gsm
+, speex
+, boost
+, opendht
+, libmsgpack
+, gnutls
+, zlib
+, jsoncpp
+, xlibs
+, libargon2
+, cryptopp
+, openssl
+, perl
+, python3
+, bash
+, libupnp
+, speexdsp
+, fetchFromGitHub
+, cmake
+, asio
+}:
+
+let
+  myPython = python3.withPackages (ps: with ps; [
+    pygobject3
+    dbus-python
+  ]);
+
+  src = fetchgit {
+    url = https://gitlab.savoirfairelinux.com/ring/ring-daemon.git;
+    rev = "006b8dc7be08fe9beb68709af71004e7bc1ceb5c";
+    sha256 = "0ih9g0rismrhx6nqcy3jqfbcs166grg0shnfmrnmykl9h0xy8z47";
+  };
+
+  patchdir = "${src}/contrib/src";
+
+  restbed = import ./restbed.nix {
+    inherit stdenv fetchFromGitHub cmake asio openssl;
+    patches = [
+    "${patchdir}/restbed/CMakeLists.patch"
+    "${patchdir}/restbed/strand.patch"
+    "${patchdir}/restbed/uri_cpp.patch"
+    "${patchdir}/restbed/dns-resolution-error.patch"
+    "${patchdir}/restbed/string.patch"
+    ];
+  };
+
+  pjsip' = stdenv.lib.overrideDerivation pjsip (old: {
+    patches = [
+      "${patchdir}/pjproject/gnutls.patch"
+      ./notestsapps.patch # this one had to be modified
+      "${patchdir}/pjproject/fix_base64.patch"
+      "${patchdir}/pjproject/ipv6.patch"
+      "${patchdir}/pjproject/ice_config.patch"
+      "${patchdir}/pjproject/multiple_listeners.patch"
+      "${patchdir}/pjproject/pj_ice_sess.patch"
+      "${patchdir}/pjproject/fix_turn_fallback.patch"
+      "${patchdir}/pjproject/fix_ioqueue_ipv6_sendto.patch"
+      "${patchdir}/pjproject/add_dtls_transport.patch"
+    ];
+    CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000";
+  }); 
+in
+stdenv.mkDerivation rec {
+  name = "ring-daemon-${version}";
+  version = "2017-07-11";
+
+  inherit src;
+
+  nativeBuildInputs = [
+    which
+    autoreconfHook
+    automake
+    libtool
+    pkgconfig
+  ];
+
+  buildInputs = [
+    pjsip'
+    libyamlcpp
+    alsaLib
+    libpulseaudio
+    libsamplerate
+    libsndfile
+    dbus
+    dbus_cplusplus
+    ffmpeg
+    udev
+    pcre
+    gsm
+    speex
+    boost
+    opendht
+    libmsgpack
+    gnutls
+    zlib
+    jsoncpp
+    restbed
+    xlibs.libX11
+    libargon2
+    cryptopp
+    openssl
+    perl
+    libupnp
+    speexdsp
+  ];
+
+  postInstall = ''
+    mkdir $out/bin
+    ln -s $out/lib/ring/dring $out/bin/dring
+    cp -R ./tools/dringctrl/ $out/
+    substitute ./tools/dringctrl/dringctrl.py $out/dringctrl/dringctrl.py \
+      --replace '#!/usr/bin/env python3' "#!${myPython}/bin/python3"
+    chmod +x $out/dringctrl/dringctrl.py
+    ln -s $out/dringctrl/dringctrl.py $out/bin/dringctrl.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Voice-over-IP software phone";
+    longDescription = ''
+      As the SIP/audio daemon and the user interface are separate processes, it
+      is easy to provide different user interfaces. GNU Ring comes with various
+      graphical user interfaces and even scripts to control the daemon from the
+      shell.
+    '';
+    homepage = https://ring.cx;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ taeer olynch ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch b/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch
new file mode 100644
index 00000000000..842060935b0
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch
@@ -0,0 +1,106 @@
+/* diff --git a/Makefile b/Makefile */
+/* index 33a4e6b..a486eb7 100644 */
+/* --- a/Makefile */
+/* +++ b/Makefile */
+/* @@ -4,7 +4,7 @@ include build/host-$(HOST_NAME).mak */
+/*  include version.mak */
+ 
+/*  LIB_DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build */
+/* -DIRS = $(LIB_DIRS) pjsip-apps/build $(EXTRA_DIRS) */
+/* +DIRS = $(LIB_DIRS) $(EXTRA_DIRS) */
+ 
+/*  ifdef MINSIZE */
+/*  MAKE_FLAGS := MINSIZE=1 */
+diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
+index cb601cb..862a78a 100644
+--- a/pjlib-util/build/Makefile
++++ b/pjlib-util/build/Makefile
+@@ -54,7 +54,6 @@ export UTIL_TEST_OBJS += xml.o encryption.o stun.o resolver_test.o test.o \
+ export UTIL_TEST_CFLAGS += $(_CFLAGS)
+ export UTIL_TEST_CXXFLAGS += $(_CXXFLAGS)
+ export UTIL_TEST_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS)
+-export UTIL_TEST_EXE:=pjlib-util-test-$(TARGET_NAME)$(HOST_EXE)
+ 
+ 	
+ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
+diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile
+index 1e64950..a75fa65 100644
+--- a/pjlib/build/Makefile
++++ b/pjlib/build/Makefile
+@@ -56,7 +56,6 @@ export TEST_OBJS += activesock.o atomic.o echo_clt.o errno.o exception.o \
+ export TEST_CFLAGS += $(_CFLAGS)
+ export TEST_CXXFLAGS += $(_CXXFLAGS)
+ export TEST_LDFLAGS += $(PJLIB_LDLIB) $(_LDFLAGS)
+-export TEST_EXE := pjlib-test-$(TARGET_NAME)$(HOST_EXE)
+ 
+ 
+ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
+diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
+index 8012cb7..2ca283a 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -165,7 +165,6 @@ export PJMEDIA_TEST_LDFLAGS += $(PJMEDIA_CODEC_LDLIB) \
+ 			       $(PJLIB_UTIL_LDLIB) \
+ 			       $(PJNATH_LDLIB) \
+ 			       $(_LDFLAGS)
+-export PJMEDIA_TEST_EXE:=pjmedia-test-$(TARGET_NAME)$(HOST_EXE)
+ 
+ 	
+ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
+diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
+index 1bc08b5..109f79b 100644
+--- a/pjnath/build/Makefile
++++ b/pjnath/build/Makefile
+@@ -54,7 +54,6 @@ export PJNATH_TEST_OBJS += ice_test.o stun.o sess_auth.o server.o concur_test.o
+ export PJNATH_TEST_CFLAGS += $(_CFLAGS)
+ export PJNATH_TEST_CXXFLAGS += $(_CXXFLAGS)
+ export PJNATH_TEST_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS)
+-export PJNATH_TEST_EXE:=pjnath-test-$(TARGET_NAME)$(HOST_EXE)
+ 
+ 	
+ ###############################################################################
+@@ -65,7 +64,6 @@ export PJTURN_CLIENT_OBJS += client_main.o
+ export PJTURN_CLIENT_CFLAGS += $(_CFLAGS)
+ export PJTURN_CLIENT_CXXFLAGS += $(_CXXFLAGS)
+ export PJTURN_CLIENT_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS)
+-export PJTURN_CLIENT_EXE:=pjturn-client-$(TARGET_NAME)$(HOST_EXE)
+ 
+ ###############################################################################
+ # Defines for building TURN server application
+@@ -76,7 +74,6 @@ export PJTURN_SRV_OBJS += allocation.o auth.o listener_udp.o \
+ export PJTURN_SRV_CFLAGS += $(_CFLAGS)
+ export PJTURN_SRV_CXXFLAGS += $(_CXXFLAGS)
+ export PJTURN_SRV_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS)
+-export PJTURN_SRV_EXE:=pjturn-srv-$(TARGET_NAME)$(HOST_EXE)
+ 
+ 	
+ 	
+diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
+index d2a5c2a..7e2ec60 100644
+--- a/pjsip/build/Makefile
++++ b/pjsip/build/Makefile
+@@ -140,7 +140,7 @@ export PJSUA2_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ 			   account.o endpoint.o json.o persistent.o types.o \
+ 			   siptypes.o call.o presence.o media.o
+ export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
+-export PJSUA2_LIB_CXXFLAGS = $(PJSUA2_LIB_CFLAGS) 
++export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) $(PJ_VIDEO_CFLAGS) 
+ export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
+ 			     $(PJSIP_UA_LDLIB) \
+ 			     $(PJSIP_SIMPLE_LDLIB) \
+@@ -165,7 +165,6 @@ export PJSUA2_TEST_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ export PJSUA2_TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
+ export PJSUA2_TEST_CXXFLAGS = $(PJSUA2_LIB_CFLAGS) 
+ export PJSUA2_TEST_LDFLAGS += $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(LDFLAGS)
+-export PJSUA2_TEST_EXE := pjsua2-test-$(TARGET_NAME)$(HOST_EXE)
+ 
+ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
+ 
+@@ -195,7 +194,6 @@ export TEST_LDFLAGS += $(PJSIP_LDLIB) \
+ 		       $(PJLIB_UTIL_LDLIB) \
+ 		       $(PJNATH_LDLIB) \
+ 		       $(_LDFLAGS)
+-export TEST_EXE := pjsip-test-$(TARGET_NAME)$(HOST_EXE)
+ 
+ 	
+ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
new file mode 100644
index 00000000000..208be3a42fd
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, asio
+, openssl
+, patches
+}:
+
+stdenv.mkDerivation rec {
+  name = "restbed-${version}";
+  version = "2016-09-15";
+
+  src = fetchFromGitHub {
+    owner = "Corvusoft";
+    repo = "restbed";
+    rev = "34187502642144ab9f749ab40f5cdbd8cb17a54a";
+    sha256 = "1jb38331fcicyiisqdprhq6zwfc6g518fm3l4qw9aiv5k9nqim22";
+  };
+
+  inherit patches;
+
+  buildInputs = [ 
+    cmake
+    asio
+    openssl
+  ];
+
+  meta = with stdenv.lib; {
+    description = "HTTP framework for building networked applications";
+    longDescription = ''
+      HTTP framework for building networked applications that require seamless
+      and secure communication, with the flexability to model a range of
+      business processes. Targeting mobile, tablet, desktop, and embedded
+      production environments.
+    '';
+    homepage = https://corvusoft.co.uk/;
+    license = licenses.agpl;
+    maintainers = with maintainers; [ taeer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff237b556b6..b054e3a91b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1089,6 +1089,8 @@ with pkgs;
 
   syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
 
+  ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { };
+
   rsyslog = callPackage ../tools/system/rsyslog {
     hadoop = null; # Currently Broken
     czmq = czmq3;

From 42395a191b36614ae4e009fda238d0eee748aa13 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 13 Jul 2017 20:12:50 +0300
Subject: [PATCH 0479/3246] kernel-config: Disable Xen on non-x86

There's an upstream build failure on ARM (not directly related to Xen
but rather some other config options it enables). The xen package is
x86_64-only anyways.
---
 .../linux/kernel/common-config.nix            | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index f9cb9e73e77..73dce131cf8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -521,27 +521,29 @@ with stdenv.lib;
   ${optionalString (versionAtLeast version "3.13") ''
     KVM_VFIO y
   ''}
-  XEN? y
-  XEN_DOM0? y
-  ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false))  ''
-    PCI_XEN? y
-    HVC_XEN? y
-    HVC_XEN_FRONTEND? y
-    XEN_SYS_HYPERVISOR? y
-    SWIOTLB_XEN? y
-    XEN_BACKEND? y
-    XEN_BALLOON? y
-    XEN_BALLOON_MEMORY_HOTPLUG? y
-    XEN_EFI? y
-    XEN_HAVE_PVMMU? y
-    XEN_MCE_LOG? y
-    XEN_PVH? y
-    XEN_PVHVM? y
-    XEN_SAVE_RESTORE? y
-    XEN_SCRUB_PAGES? y
-    XEN_SELFBALLOONING? y
-    XEN_STUB? y
-    XEN_TMEM? y
+  ${optionalString (stdenv.isx86_64 || stdenv.isi686) ''
+    XEN? y
+    XEN_DOM0? y
+    ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false))  ''
+      PCI_XEN? y
+      HVC_XEN? y
+      HVC_XEN_FRONTEND? y
+      XEN_SYS_HYPERVISOR? y
+      SWIOTLB_XEN? y
+      XEN_BACKEND? y
+      XEN_BALLOON? y
+      XEN_BALLOON_MEMORY_HOTPLUG? y
+      XEN_EFI? y
+      XEN_HAVE_PVMMU? y
+      XEN_MCE_LOG? y
+      XEN_PVH? y
+      XEN_PVHVM? y
+      XEN_SAVE_RESTORE? y
+      XEN_SCRUB_PAGES? y
+      XEN_SELFBALLOONING? y
+      XEN_STUB? y
+      XEN_TMEM? y
+    ''}
   ''}
   KSM y
   ${optionalString (!stdenv.is64bit) ''

From 8bafd3aaa41d254bdff9b3ff4417d6597bc42f9b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Jul 2017 19:34:45 +0200
Subject: [PATCH 0480/3246] ginac: 1.6.2 -> 1.7.2

---
 pkgs/applications/science/math/ginac/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index ee67af62bb1..1956ebdcb0f 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, cln, pkgconfig, readline, gmp }:
+{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
 
 stdenv.mkDerivation rec {
-  name = "ginac-1.6.2";
+  name = "ginac-1.7.2";
 
   src = fetchurl {
     url    = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "1pivcqqaf142l6vrj2azq6dxrcyzhag4za2dwicb4gsb09ax4d0g";
+    sha256 = "1dyq47gc97jn1r5sy0klxs5b4lzhckyjqgsvwcs2a9ybqmhmpdr4";
   };
 
   propagatedBuildInputs = [ cln ];
 
   buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isDarwin gmp;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig python ];
+
+  preConfigure = "patchShebangs ginsh";
 
   configureFlags = "--disable-rpath";
 

From 058f46cc1338e51a8233b84b9776008c2796c015 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Jul 2017 17:38:51 +0000
Subject: [PATCH 0481/3246] libraw: set meta.platforms to unix

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

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 10979abdeab..0047f30aad2 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
     homepage = http://www.libraw.org/;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
 

From 247e772f35676a5a4d9afd47bc59e2ba5174802d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Jul 2017 17:39:14 +0000
Subject: [PATCH 0482/3246] libspectre: set meta.platforms to unix

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

diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix
index a04c5631ecb..647e6f16fdf 100644
--- a/pkgs/development/libraries/libspectre/default.nix
+++ b/pkgs/development/libraries/libspectre/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     '';
 
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 68ee2c6c307da44c8d0dfd08adf6b0b3c3310cdc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Jul 2017 17:40:21 +0000
Subject: [PATCH 0483/3246] gst-plugins-good: fix build on darwin

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

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index c28cfca31c5..c18d8332b0c 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -4,6 +4,7 @@
 , libvpx, speex, flac, taglib, libshout
 , cairo, gdk_pixbuf, aalib, libcaca
 , libsoup, libpulseaudio, libintlOrEmpty
+, darwin
 }:
 
 let
@@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
     libsoup libshout
   ]
   ++ libintlOrEmpty
+  ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
   ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
 
   preFixup = ''

From bd7bf3381426814aaeda4b2de24fca1410b535c3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Jul 2017 17:57:55 +0000
Subject: [PATCH 0484/3246] ocaml: init at 4.05.0

---
 pkgs/development/compilers/ocaml/4.05.nix | 9 +++++++++
 pkgs/top-level/ocaml-packages.nix         | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/ocaml/4.05.nix

diff --git a/pkgs/development/compilers/ocaml/4.05.nix b/pkgs/development/compilers/ocaml/4.05.nix
new file mode 100644
index 00000000000..a63b06a9f62
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.05.nix
@@ -0,0 +1,9 @@
+import ./generic.nix {
+  major_version = "4";
+  minor_version = "05";
+  patch_version = "0";
+  sha256 = "1y9fw1ci9pwnbbrr9nwr8cq8vypcxwdf4akvxard3mxl2jx2g984";
+
+  # If the executable is stipped it does not work
+  dontStrip = true;
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 0e6df5942c7..bc5253328cf 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -941,7 +941,9 @@ in rec
 
   ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }) (self: super: { });
 
-  ocamlPackages_latest = ocamlPackages_4_04;
+  ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { }) (self: super: { });
+
+  ocamlPackages_latest = ocamlPackages_4_05;
 
   ocamlPackages = ocamlPackages_4_02;
 }

From 273a4c1c78d9e0b3aa852f197ce9ecc0e63ce42b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 13 Jul 2017 14:56:40 -0400
Subject: [PATCH 0485/3246] stdenv-setup: Combine [[ .. ]] && [[ .. ]] into one
 [[ .. && .. ]]

Also remove useless quotes on same line
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 0d9a647a5c3..de83e4fb18f 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -742,7 +742,7 @@ configurePhase() {
 buildPhase() {
     runHook preBuild
 
-    if [ -z "$makeFlags" ] && ! [[ -n "$makefile" || -e "Makefile" || -e "makefile" || -e "GNUmakefile" ]]; then
+    if [[ -z $makeFlags && ! ( -n $makefile || -e Makefile || -e makefile || -e GNUmakefile[[ ) ]]; then
         echo "no Makefile, doing nothing"
     else
         # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409

From 2743078f664ae07c4bed06a96182c6a86bd7fa32 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 13 Jul 2017 14:59:53 -0400
Subject: [PATCH 0486/3246] stdenv-setup: Remove useless quotes

foo=$1 surprisingly doesn't need quotes in Bash. Word splits are only
syntactic in string variable (not array var!) assignments.
---
 pkgs/stdenv/generic/setup.sh | 70 ++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index de83e4fb18f..f95b2e58837 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -13,10 +13,10 @@ set -o pipefail
 # code). The hooks for <hookName> are the shell function or variable
 # <hookName>, and the values of the shell array ‘<hookName>Hooks’.
 runHook() {
-    local hookName="$1"
+    local hookName=$1
     shift
     local var="$hookName"
-    if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+    if [[ $hookName =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
     local -n var
     local hook
     for hook in "_callImplicitHook 0 $hookName" "${var[@]}"; do
@@ -29,10 +29,10 @@ runHook() {
 # Run all hooks with the specified name, until one succeeds (returns a
 # zero exit code). If none succeed, return a non-zero exit code.
 runOneHook() {
-    local hookName="$1"
+    local hookName=$1
     shift
     local var="$hookName"
-    if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+    if [[ $hookName =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
     local -n var
     local hook
     for hook in "_callImplicitHook 1 $hookName" "${var[@]}"; do
@@ -50,8 +50,8 @@ runOneHook() {
 # environment variables) and from shell scripts (as functions). If you
 # want to allow multiple hooks, use runHook instead.
 _callImplicitHook() {
-    local def="$1"
-    local hookName="$2"
+    local def=$1
+    local hookName=$2
     case "$(type -t "$hookName")" in
         (function|alias|builtin) "$hookName";;
         (file) source "$hookName";;
@@ -64,7 +64,7 @@ _callImplicitHook() {
 # A function wrapper around ‘eval’ that ensures that ‘return’ inside
 # hooks exits the hook, not the caller.
 _eval() {
-    local code="$1"
+    local code=$1
     shift
     if [ "$(type -t "$code")" = function ]; then
         eval "$code \"\$@\""
@@ -195,26 +195,26 @@ _addRpathPrefix() {
 
 # Return success if the specified file is an ELF object.
 isELF() {
-    local fn="$1"
+    local fn=$1
     local fd
     local magic
     exec {fd}< "$fn"
     read -r -n 4 -u $fd magic
     exec {fd}<&-
-    if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi
+    if [[ $magic =~ ELF ]]; then return 0; else return 1; fi
 }
 
 # Return success if the specified file is a script (i.e. starts with
 # "#!").
 isScript() {
-    local fn="$1"
+    local fn=$1
     local fd
     local magic
     if ! [ -x /bin/sh ]; then return 0; fi
     exec {fd}< "$fn"
     read -r -n 2 -u $fd magic
     exec {fd}<&-
-    if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi
+    if [[ $magic =~ \#! ]]; then return 0; else return 1; fi
 }
 
 # printf unfortunately will print a trailing newline regardless
@@ -255,8 +255,8 @@ fi
 
 # Check that the pre-hook initialised SHELL.
 if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
-BASH="$SHELL"
-export CONFIG_SHELL="$SHELL"
+BASH=$SHELL
+export CONFIG_SHELL=$SHELL
 
 
 # Dummy implementation of the paxmark function. On Linux, this is
@@ -283,7 +283,7 @@ findInputs() {
     local propagatedBuildInputsFile=$3
 
     # Stop if we've already added this one
-    [[ -z "${varDeref["$pkg"]}" ]] || return 0
+    [[ -z ${varDeref[$pkg]} ]] || return 0
     varDeref["$pkg"]=1
 
     if ! [ -e "$pkg" ]; then
@@ -373,7 +373,7 @@ export TZ=UTC
 # for instance if we just want to perform a test build/install to a
 # temporary location and write a build report to $out.
 if [ -z "$prefix" ]; then
-    prefix="$out";
+    prefix=$out;
 fi
 
 if [ "$useTempPrefix" = 1 ]; then
@@ -449,7 +449,7 @@ substitute() {
                 local varName=$2
                 shift 2
                 # check if the used nix attribute name is a valid bash name
-                if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
+                if ! [[ $varName =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
                     echo "${FUNCNAME[0]}(): WARNING: substitution variables should be valid bash names," >&2
                     echo "  \"$varName\" isn't and therefore was skipped; it might be caused" >&2
                     echo "  by multi-line phases in variables - see #14907 for details." >&2
@@ -480,7 +480,7 @@ substitute() {
 
 
 substituteInPlace() {
-    local fileName="$1"
+    local fileName=$1
     shift
     substitute "$fileName" "$fileName" "$@"
 }
@@ -490,8 +490,8 @@ substituteInPlace() {
 # character or underscore. Note: other names that aren't bash-valid
 # will cause an error during `substitute --subst-var`.
 substituteAll() {
-    local input="$1"
-    local output="$2"
+    local input=$1
+    local output=$2
     local -a args=()
 
     # Select all environment variables that start with a lowercase character.
@@ -507,7 +507,7 @@ substituteAll() {
 
 
 substituteAllInPlace() {
-    local fileName="$1"
+    local fileName=$1
     shift
     substituteAll "$fileName" "$fileName" "$@"
 }
@@ -534,7 +534,7 @@ dumpVars() {
 stripHash() {
     local strippedName
     # On separate line for `set -e`
-    strippedName="$(basename "$1")"
+    strippedName=$(basename "$1")
     if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
         echo "$strippedName" | cut -c34-
     else
@@ -545,7 +545,7 @@ stripHash() {
 
 unpackCmdHooks+=(_defaultUnpack)
 _defaultUnpack() {
-    local fn="$1"
+    local fn=$1
 
     if [ -d "$fn" ]; then
 
@@ -576,7 +576,7 @@ _defaultUnpack() {
 
 
 unpackFile() {
-    curSrc="$1"
+    curSrc=$1
     header "unpacking source archive $curSrc" 3
     if ! runOneHook unpackCmd "$curSrc"; then
         echo "do not know how to unpack source archive $curSrc"
@@ -595,7 +595,7 @@ unpackPhase() {
             echo 'variable $src or $srcs should point to the source'
             exit 1
         fi
-        srcs="$src"
+        srcs=$src
     fi
 
     # To determine the source directory created by unpacking the
@@ -629,7 +629,7 @@ unpackPhase() {
                             echo "unpacker produced multiple directories"
                             exit 1
                         fi
-                        sourceRoot="$i"
+                        sourceRoot=$i
                         ;;
                 esac
             fi
@@ -692,7 +692,7 @@ fixLibtool() {
 configurePhase() {
     runHook preConfigure
 
-    if [[ -z "$configureScript" && -x ./configure ]]; then
+    if [[ -z $configureScript && -x ./configure ]]; then
         configureScript=./configure
     fi
 
@@ -704,7 +704,7 @@ configurePhase() {
         done
     fi
 
-    if [[ -z "$dontAddPrefix" && -n "$prefix" ]]; then
+    if [[ -z $dontAddPrefix && -n $prefix ]]; then
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
@@ -912,7 +912,7 @@ distPhase() {
 
 
 showPhaseHeader() {
-    local phase="$1"
+    local phase=$1
     case $phase in
         unpackPhase) header "unpacking sources";;
         patchPhase) header "patching sources";;
@@ -945,14 +945,14 @@ genericBuild() {
     fi
 
     for curPhase in $phases; do
-        if [[ "$curPhase" = buildPhase && -n "$dontBuild" ]]; then continue; fi
-        if [[ "$curPhase" = checkPhase && -z "$doCheck" ]]; then continue; fi
-        if [[ "$curPhase" = installPhase && -n "$dontInstall" ]]; then continue; fi
-        if [[ "$curPhase" = fixupPhase && -n "$dontFixup" ]]; then continue; fi
-        if [[ "$curPhase" = installCheckPhase && -z "$doInstallCheck" ]]; then continue; fi
-        if [[ "$curPhase" = distPhase && -z "$doDist" ]]; then continue; fi
+        if [[ $curPhase = buildPhase && -n $dontBuild ]]; then continue; fi
+        if [[ $curPhase = checkPhase && -z $doCheck ]]; then continue; fi
+        if [[ $curPhase = installPhase && -n $dontInstall ]]; then continue; fi
+        if [[ $curPhase = fixupPhase && -n $dontFixup ]]; then continue; fi
+        if [[ $curPhase = installCheckPhase && -z $doInstallCheck ]]; then continue; fi
+        if [[ $curPhase = distPhase && -z $doDist ]]; then continue; fi
 
-        if [[ -n "$tracePhases" ]]; then
+        if [[ -n $tracePhases ]]; then
             echo
             echo "@ phase-started $out $curPhase"
         fi

From 9748e9ad86159f62cc857a5c72bc78f434fd2198 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 13 Jul 2017 21:41:48 +0200
Subject: [PATCH 0487/3246] acct: 6.6.3 -> 6.6.4

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

diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix
index 6ec9cc62744..ca8fbdcf031 100644
--- a/pkgs/tools/system/acct/default.nix
+++ b/pkgs/tools/system/acct/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "acct-6.6.3";
+  name = "acct-6.6.4";
 
   src = fetchurl {
     url = "mirror://gnu/acct/${name}.tar.gz";
-    sha256 = "14x0zklwlg7cc7amlyzffqr8az3fqj1h9dyj0hvl1kpi7cr7kbjy";
+    sha256 = "0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac";
   };
 
   doCheck = true;

From 01ec484a474d469ffd3546125d166a404f1636db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Jul 2017 21:24:55 +0200
Subject: [PATCH 0488/3246] libvirt: add missing gettext in libvirt-guests.sh

Or else this is seen in the system log:

.../libexec/libvirt-guests.sh: line 211: gettext: command not found
---
 pkgs/development/libraries/libvirt/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 511f97eb3cd..9c11081843c 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -74,6 +74,8 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/libexec/libvirt-guests.sh \
       --replace "$out/bin" "${gettext}/bin" \
       --replace "lock/subsys" "lock"
+    sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \
+        -i "$out/libexec/libvirt-guests.sh"
   '' + optionalString stdenv.isLinux ''
     rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
     wrapProgram $out/sbin/libvirtd \

From a9ea9d4f56272df4a8963595435aecd4af8cab66 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Thu, 13 Jul 2017 22:49:12 +0300
Subject: [PATCH 0489/3246] =?UTF-8?q?darkhttpd:=20platforms.linux=20?=
 =?UTF-8?q?=E2=86=92=20platforms.all?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/servers/http/darkhttpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix
index ba733c5bde5..a30933e51a3 100644
--- a/pkgs/servers/http/darkhttpd/default.nix
+++ b/pkgs/servers/http/darkhttpd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Small and secure static webserver";
     homepage = http://dmr.ath.cx/net/darkhttpd/;
     license = stdenv.lib.licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.bobvanderlinden ];
   };
 }

From 30a14204149c8fb43001c4f2188e8e655a9a389a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 13 Jul 2017 16:31:39 -0400
Subject: [PATCH 0490/3246] stdenv-setup: Pull out and explain 3-part printing
 of commands

@Dezgeg made the good point that the reasons for doing this were not at
all intuitive.
---
 pkgs/stdenv/generic/setup.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index f95b2e58837..35fe8fd6950 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -104,6 +104,17 @@ closeNest() {
     done
 }
 
+# Prints a command such that all word splits are unambiguous. We need
+# to split the command in three parts because the middle format string
+# will be, and must be, repeated for each argument. The first argument
+# goes before the ':' and is just for convenience.
+echoCmd() {
+    printf "%s:" "$1"
+    shift
+    printf ' %q' "$@"
+    echo
+}
+
 
 ######################################################################
 # Error handling.
@@ -725,9 +736,7 @@ configurePhase() {
     if [ -n "$configureScript" ]; then
         # shellcheck disable=SC2086
         local flagsArray=($configureFlags "${configureFlagsArray[@]}")
-        printf 'configure flags:'
-        printf ' %q' "${flagsArray[@]}"
-        echo
+        echoCmd 'configure flags' "${flagsArray[@]}"
         # shellcheck disable=SC2086
         $configureScript "${flagsArray[@]}"
         unset flagsArray
@@ -754,9 +763,7 @@ buildPhase() {
             $makeFlags "${makeFlagsArray[@]}" \
             $buildFlags "${buildFlagsArray[@]}")
 
-        printf 'build flags:'
-        printf ' %q' "${flagsArray[@]}"
-        echo
+        echoCmd 'build flags' "${flagsArray[@]}"
         make ${makefile:+-f $makefile} "${flagsArray[@]}"
         unset flagsArray
     fi
@@ -774,9 +781,7 @@ checkPhase() {
         $makeFlags "${makeFlagsArray[@]}" \
         ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check})
 
-    printf 'check flags:'
-    printf ' %q' "${flagsArray[@]}"
-    echo
+    echoCmd 'check flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
     unset flagsArray
 
@@ -798,9 +803,7 @@ installPhase() {
         $makeFlags "${makeFlagsArray[@]}" \
         $installFlags "${installFlagsArray[@]}")
 
-    printf 'install flags:'
-    printf ' %q' "${flagsArray[@]}"
-    echo
+    echoCmd 'install flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
     unset flagsArray
 
@@ -879,9 +882,7 @@ installCheckPhase() {
         $makeFlags "${makeFlagsArray[@]}" \
         $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck})
 
-    printf 'installcheck flags:'
-    printf ' %q' "${flagsArray[@]}"
-    echo
+    echoCmd 'installcheck flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
     unset flagsArray
 

From b9e404def44ad822f6392026eda4340f8126fa5c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 13 Jul 2017 22:58:03 +0200
Subject: [PATCH 0491/3246] dash: 0.5.8 -> 0.5.9.1

Contains mostly fixes as far as I can tell.
---
 pkgs/shells/dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index eaccb9a68da..1de2a52634b 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dash-0.5.8";
+  name = "dash-0.5.9.1";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
-    sha256 = "03y6z8akj72swa6f42h2dhq3p09xasbi6xia70h2vc27fwikmny6";
+    sha256 = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659";
   };
 
   hardeningDisable = [ "format" ];

From 9e6195839962e21887a718da7bda8fb10f171385 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Thu, 13 Jul 2017 23:09:04 +0200
Subject: [PATCH 0492/3246] tarsum: Fix source path in docker.src

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

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 4ebe3c0615d..e06be51f4a4 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -42,7 +42,7 @@ rec {
     cp ${./tarsum.go} tarsum.go
     export GOPATH=$(pwd)
     mkdir src
-    ln -sT ${docker.src}/pkg/tarsum src/tarsum
+    ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum
     go build
 
     cp tarsum $out

From f91c591ea2651ba05946209ef435a15ff87ce5e8 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 13 Jul 2017 14:44:18 -0700
Subject: [PATCH 0493/3246] wineUnstable, wineStaging: 2.11 -> 2.12

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 3ea16a2db68..9557c54d456 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.11";
+    version = "2.12";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "0g6cwjyqwc660w33453aklh3hpc0b8rrb88dryn23ah6wannvagg";
+    sha256 = "19qk880fk7xxzx9jcl6sjzilhzssn0csqlqr9vnfd1qlhjpi2v29";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0crv7hl39as0pjbi8ldws611izccdnss4hca4pgbz5cc80bki9gw";
+    sha256 = "00qqpw5fmpwg4589q2dwlv3jrcyj0yzv4mk63w5ydhvmy5gq48wy";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 7ef578f160cbcfbcad94d233a5e10944ba81f6bb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Jul 2017 23:04:13 +0200
Subject: [PATCH 0494/3246] zulu: 8.19.0.1 -> 8.21.0.1

---
 pkgs/development/compilers/zulu/default.nix | 37 +++++++++++++--------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 7621aa82bc7..c4cdf70f14a 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -1,17 +1,28 @@
-{ stdenv, pkgs, fetchurl, unzip, makeWrapper, setJavaClassPath, swingSupport ? true }:
-
-with pkgs;
+{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
+, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib
+, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg
+, swingSupport ? true }:
 
 let
-  version = "8.19.0.1";
-  openjdk = "8.0.112";
+  version = "8.21.0.1";
+  openjdk = "8.0.131";
 
-  sha256_linux = "1icb6in1197n44wk2cqnrxr7w0bd5abxxysfrhbg56jlb9nzmp4x";
-  sha256_darwin = "0kxwh62a6kckc9l9jkgakf86lqkqazp3dwfwaxqc4cg5zczgbhmd";
+  sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p";
+  sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7";
 
   platform = if stdenv.isDarwin then "macosx" else "linux";
   hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
   extension = if stdenv.isDarwin then "zip" else "tar.gz";
+
+  libraries = [
+    stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu
+    xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
+    gnome2.gtk cairo gdk_pixbuf atk
+  ] ++ (lib.optionals swingSupport (with xorg; [
+    xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
+    xorg.libXt xorg.libXrender stdenv.cc.cc
+  ]));
+
 in stdenv.mkDerivation rec {
   inherit version openjdk platform hash extension;
 
@@ -22,7 +33,7 @@ in stdenv.mkDerivation rec {
     sha256 = hash;
   };
 
-  buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin [ unzip ];
+  buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip;
 
   installPhase = ''
     mkdir -p $out
@@ -51,9 +62,6 @@ in stdenv.mkDerivation rec {
     EOF
   '';
 
-  libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk ]
-      ++ (if swingSupport then [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc ] else [ ]);
-
   rpath = stdenv.lib.strings.makeLibraryPath libraries;
 
   passthru = {
@@ -64,8 +72,11 @@ in stdenv.mkDerivation rec {
     homepage = https://www.azul.com/products/zulu/;
     license = licenses.gpl2;
     description = "Certified builds of OpenJDK";
-    longDescription = "Certified builds of OpenJDK that can be deployed across multiple operating systems, containers, hypervisors and Cloud platforms";
-    maintainers = with maintainers; [ nequissimus ];
+    longDescription = ''
+      Certified builds of OpenJDK that can be deployed across multiple
+      operating systems, containers, hypervisors and Cloud platforms.
+    '';
+    maintainers = with maintainers; [ nequissimus fpletz ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }

From af70b8fc23db2219d864830ec30fed1ac8d548bb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 13 Jul 2017 20:35:00 +0200
Subject: [PATCH 0495/3246] nginxMainline: 1.13.2 -> 1.13.3 for CVE-2017-7529

---
 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 959e9d4ebf8..ced0fd0976f 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.13.2";
-  sha256 = "0w4vj6hl23z9kdw09v7jzq3c1593i4fhwmrz6qx2g7cq2i6j6zyp";
+  version = "1.13.3";
+  sha256 = "0whdpgfb1y9r7f3y91r4m0wpgrwwdl2byahp9a7gn0n30j0gjwsv";
 })

From 6e1aaeacfc0d7819cf4ea9a2ffaea433919e722a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 13 Jul 2017 20:35:27 +0200
Subject: [PATCH 0496/3246] nginx: 1.12.0 -> 1.12.1 for CVE-2017-7529

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

diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index bc8b831eec7..aa03d6162dd 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.12.0";
-  sha256 = "0c2vg6530qplwk8rhldww5r3cwcbw1avka53qg9sh85nzlk2w8ml";
+  version = "1.12.1";
+  sha256 = "1yvnmj7vlykrqdi6amkvs63lva6qkxd98sqv0a8hz8w5ci1bz4w7";
 })

From 3d360a5ffbb7be0cd7d8f8782af15bcab006c99c Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Mon, 26 Jun 2017 19:32:11 -0400
Subject: [PATCH 0497/3246] gnupg agent module: Remove unnecessary unit
 configuration

These just seem to duplicate upstream systemd units, which are already
included in nixos configuration by systemd.packages
---
 nixos/modules/programs/gnupg.nix | 55 --------------------------------
 1 file changed, 55 deletions(-)

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index 68adee94f79..f2f5fe4ea80 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -55,79 +55,24 @@ in
   };
 
   config = mkIf cfg.agent.enable {
-    systemd.user.services.gpg-agent = {
-      serviceConfig = {
-        ExecStart = [
-          ""
-          ("${pkgs.gnupg}/bin/gpg-agent --supervised "
-            + optionalString cfg.agent.enableSSHSupport "--enable-ssh-support")
-        ];
-        ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload gpg-agent";
-      };
-    };
-
     systemd.user.sockets.gpg-agent = {
       wantedBy = [ "sockets.target" ];
-      listenStreams = [ "%t/gnupg/S.gpg-agent" ];
-      socketConfig = {
-        FileDescriptorName = "std";
-        SocketMode = "0600";
-        DirectoryMode = "0700";
-      };
     };
 
     systemd.user.sockets.gpg-agent-ssh = mkIf cfg.agent.enableSSHSupport {
       wantedBy = [ "sockets.target" ];
-      listenStreams = [ "%t/gnupg/S.gpg-agent.ssh" ];
-      socketConfig = {
-        FileDescriptorName = "ssh";
-        Service = "gpg-agent.service";
-        SocketMode = "0600";
-        DirectoryMode = "0700";
-      };
     };
 
     systemd.user.sockets.gpg-agent-extra = mkIf cfg.agent.enableExtraSocket {
       wantedBy = [ "sockets.target" ];
-      listenStreams = [ "%t/gnupg/S.gpg-agent.extra" ];
-      socketConfig = {
-        FileDescriptorName = "extra";
-        Service = "gpg-agent.service";
-        SocketMode = "0600";
-        DirectoryMode = "0700";
-      };
     };
 
     systemd.user.sockets.gpg-agent-browser = mkIf cfg.agent.enableBrowserSocket {
       wantedBy = [ "sockets.target" ];
-      listenStreams = [ "%t/gnupg/S.gpg-agent.browser" ];
-      socketConfig = {
-        FileDescriptorName = "browser";
-        Service = "gpg-agent.service";
-        SocketMode = "0600";
-        DirectoryMode = "0700";
-      };
-    };
-
-    systemd.user.services.dirmngr = {
-      requires = [ "dirmngr.socket" ];
-      after = [ "dirmngr.socket" ];
-      unitConfig = {
-        RefuseManualStart = "true";
-      };
-      serviceConfig = {
-        ExecStart = "${pkgs.gnupg}/bin/dirmngr --supervised";
-        ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload dirmngr";
-      };
     };
 
     systemd.user.sockets.dirmngr = {
       wantedBy = [ "sockets.target" ];
-      listenStreams = [ "%t/gnupg/S.dirmngr" ];
-      socketConfig = {
-        SocketMode = "0600";
-        DirectoryMode = "0700";
-      };
     };
 
     systemd.packages = [ pkgs.gnupg ];

From 38e971d2e1b9f969f1fd0332a6d5a5773b0a22d1 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Mon, 26 Jun 2017 19:33:23 -0400
Subject: [PATCH 0498/3246] gnupg agent module: Fix dirmngr.enable option

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

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index f2f5fe4ea80..8af55f38992 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -71,7 +71,7 @@ in
       wantedBy = [ "sockets.target" ];
     };
 
-    systemd.user.sockets.dirmngr = {
+    systemd.user.sockets.dirmngr = mkIf cfg.dirmngr.enable {
       wantedBy = [ "sockets.target" ];
     };
 

From 627260ddbf8c029181fd195b93d8d9ffcfe0dd54 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Mon, 26 Jun 2017 19:33:57 -0400
Subject: [PATCH 0499/3246] gnupg agent module: Only set tty for interactive
 shells

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

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index 8af55f38992..ea46d5934d9 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -77,7 +77,7 @@ in
 
     systemd.packages = [ pkgs.gnupg ];
 
-    environment.extraInit = ''
+    environment.interactiveShellInit = ''
       # Bind gpg-agent to this TTY if gpg commands are used.
       export GPG_TTY=$(tty)
 

From 04aa269fb1f74a2623dff62e355621244f430604 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 13 Jul 2017 11:50:29 -0500
Subject: [PATCH 0500/3246] opensmtpd: Fix attempt to set unsupported
 permissions during install

---
 pkgs/servers/mail/opensmtpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 7ad5f6e9ad5..d2667597c62 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
       substituteInPlace smtpd/smtpctl.c --replace \
         'if (geteuid())' \
         'if (geteuid() != 0 && !(argc > 1 && !strcmp(argv[1], "encrypt")))'
+      substituteInPlace mk/smtpctl/Makefile.in --replace "chmod 2555" "chmod 0555"
     '';
 
   configureFlags = [

From 5c336fc5494b41de2866b010f6d444a1240e6139 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@matrix.ai>
Date: Tue, 11 Jul 2017 23:56:52 +1000
Subject: [PATCH 0501/3246] phpPackages.phpcbf: init at 2.6.0

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 221427e0851..c5e3ac0ac55 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -286,4 +286,31 @@ let
       maintainers = with maintainers; [ javaguirre ];
     };
   };
+
+  phpcbf = pkgs.stdenv.mkDerivation rec {
+    name = "phpcbf-${version}";
+    version = "2.6.0";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
+      sha256 = "1ijf52cgd85ypvw431nnmzij6156ryhfvmajpkr7plfw0iccqc5j";
+    };
+
+    phases = [ "installPhase" ];
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+
+    installPhase = ''
+      mkdir -p $out/bin
+      install -D $src $out/libexec/phpcbf/phpcbf.phar
+      makeWrapper ${php}/bin/php $out/bin/phpcbf \
+        --add-flags "$out/libexec/phpcbf/phpcbf.phar"
+    '';
+
+    meta = with pkgs.lib; {
+      description = "PHP coding standard beautifier and fixer";
+      license = licenses.bsd3;
+      homepage = https://squizlabs.github.io/PHP_CodeSniffer/;
+      maintainers = with maintainers; [ cmcdragonkai ];
+    };
+  };
 }; in self

From 6943cd3ebd8273fae88b74c791f0acef433719c1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 14 Jul 2017 00:40:51 +0200
Subject: [PATCH 0502/3246] darkhttpd: 1.11 -> 1.12

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

diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix
index a30933e51a3..9b9ab843a70 100644
--- a/pkgs/servers/http/darkhttpd/default.nix
+++ b/pkgs/servers/http/darkhttpd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "darkhttpd-${version}";
-  version = "1.11";
+  version = "1.12";
 
   src = fetchurl {
     url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2";
-    sha256 = "0lbcv6pa82md0gqyyskxndf8hm58y76nrnkanc831ia3vm529bdg";
+    sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155";
   };
 
   installPhase = ''

From ba8fe290ecadae3b6abc375377937302cfd67ff2 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Jul 2017 18:54:14 -0400
Subject: [PATCH 0503/3246] slurm: add alias attribute for backward
 compatibility

Fixes: b917a8760 ('slurm: 15-08-5-1 -> 17.02.6, slurm-llnl -> slurm')
---
 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 fe78ed68005..525d9a823fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11490,8 +11490,10 @@ with pkgs;
   storm = callPackage ../servers/computing/storm { };
 
   slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
+  slurm-llnl = slurm; # renamed July 2017
 
   slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
+  slurm-llnl-full = slurm-full; # renamed July 2017
 
   systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
 

From fabbd62f75dd580c5f0f19370e657e639a8fac25 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Jul 2017 19:03:45 -0400
Subject: [PATCH 0504/3246] rivet: 2.5.3 -> 2.5.4

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

diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index f68c2ea877d..454c868dfcd 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rivet-${version}";
-  version = "2.5.3";
+  version = "2.5.4";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    sha256 = "1r0x575ivvm68nnh9qlfvdra5298i047qcbxcg37ki2aaqq07qcr";
+    sha256 = "1qi7am60f2l4krd3sbj95mbzfk82lir0wy8z27yr9ncq6qcm48kp";
   };
 
   postPatch = "patchShebangs ./src/Analyses/cat_with_lines";

From bc2c5761326e9226975f7819e94eeec016997446 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Jul 2017 19:04:02 -0400
Subject: [PATCH 0505/3246] yoda: 1.6.6 -> 1.6.7

---
 .../libraries/physics/yoda/default.nix            | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index e6d0f3c500e..dd1b3305646 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,26 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "yoda-${version}";
-  version = "1.6.6";
+  version = "1.6.7";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    sha256 = "088xx4q6b03bnj6xg5189m8wsznhal8aj3jk40sbj24idm4jl5yg";
+    sha256 = "05jyv5dypa6d4q1m8wm2qycgq1i0bgzwzzm9qqdj0b43ff2kggra";
   };
 
   pythonPath = []; # python wrapper support
 
-  patches = [
-    (fetchpatch {
-      url = "https://yoda.hepforge.org/hg/yoda/rev/3dbc8927e715?style=raw";
-      sha256 = "02rm34z9lbab66p7gpij12qwdph5fddpksg80qz0m537wjwy2ddy";
-    })
-    (fetchpatch {
-      url = "https://yoda.hepforge.org/hg/yoda/rev/669c2be582ef?style=raw";
-      sha256 = "0s705cl3bazpvpvy46vv1k223knwxq2yy5na1c6lv217sq9w86wj";
-    })
-  ];
-
   buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ]
     ++ stdenv.lib.optional withRootSupport root;
 

From e826a6a24774045b7d7d4e9814d8356278b84568 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 12 Jul 2017 19:00:19 -0400
Subject: [PATCH 0506/3246] stdenv: Move some logic from cross adapter to
 stdenv proper

Eventually the adapter will be removed.  Moved is

 - Name suffix from hostPlatform

 - configurePlatforms

   To not cause more breakage, the default is currently [], but
   eventually it will be [ "build" "host" ], as the cross adapter makes
   it today.
---
 pkgs/stdenv/adapters.nix                | 19 +------------------
 pkgs/stdenv/generic/make-derivation.nix | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 5848ee87b1b..ac382927b1b 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -73,15 +73,8 @@ rec {
     };
   in stdenv // {
     mkDerivation =
-      { name ? "", buildInputs ? [], nativeBuildInputs ? []
+      { buildInputs ? [], nativeBuildInputs ? []
       , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
-      , # Disabling the tests by default when cross compiling, as usually the
-        # tests rely on being able to run produced binaries.
-        doCheck ? false
-      , configureFlags ? []
-      , # Target is not included by default because most programs don't care.
-        # Including it then would cause needless massive rebuilds.
-        configurePlatforms   ? args.crossAttrs.configurePlatforms   or [ "build" "host" ]
       , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false
       , ...
       } @ args:
@@ -106,7 +99,6 @@ rec {
         nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull;
       in
         stdenv.mkDerivation (args // {
-          name = name + "-" + hostPlatform.config;
           nativeBuildInputs = nativeBuildInputs
             ++ nativeInputsFromBuildInputs
             ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
@@ -116,15 +108,6 @@ rec {
             ++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook
             ;
 
-          inherit doCheck;
-
-          # This parameter is sometimes a string and sometimes a list, yuck
-          configureFlags = let inherit (stdenv.lib) optional elem; in
-            (if stdenv.lib.isString configureFlags then [configureFlags] else configureFlags)
-            ++ optional (elem "build"  configurePlatforms) "--build=${buildPlatform.config}"
-            ++ optional (elem "host"   configurePlatforms) "--host=${hostPlatform.config}"
-            ++ optional (elem "target" configurePlatforms) "--target=${targetPlatform.config}";
-
           # Cross-linking dynamic libraries, every buildInput should
           # be propagated because ld needs the -rpath-link to find
           # any library needed to link the program dynamically at
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 05221e2f3c1..1486b11f701 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -12,12 +12,22 @@ rec {
   # * https://nixos.org/nix/manual/#ssec-derivation
   #   Explanation about derivations in general
   mkDerivation =
-    { nativeBuildInputs ? []
+    { name ? ""
+
+    , nativeBuildInputs ? []
     , buildInputs ? []
 
     , propagatedNativeBuildInputs ? []
     , propagatedBuildInputs ? []
 
+    , configureFlags ? []
+    , # Target is not included by default because most programs don't care.
+      # Including it then would cause needless mass rebuilds.
+      #
+      # TODO(@Ericson2314): Make [ "build" "host" ] always the default.
+      configurePlatforms ? lib.optionals
+        (stdenv.hostPlatform != stdenv.buildPlatform)
+        [ "build" "host" ]
     , crossConfig ? null
     , meta ? {}
     , passthru ? {}
@@ -72,6 +82,9 @@ rec {
             lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies'));
         in
         {
+          name = name + lib.optionalString
+            (stdenv.hostPlatform != stdenv.buildPlatform)
+            stdenv.hostPlatform.config;
           builder = attrs.realBuilder or stdenv.shell;
           args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
           inherit stdenv;
@@ -84,6 +97,14 @@ rec {
 
           propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0;
           propagatedBuildInputs = lib.elemAt propagatedDependencies' 1;
+
+          # This parameter is sometimes a string and sometimes a list, yuck
+          configureFlags = let inherit (lib) optional elem; in
+            (if lib.isString configureFlags then [configureFlags] else configureFlags)
+            ++ optional (elem "build"  configurePlatforms) "--build=${stdenv.buildPlatform.config}"
+            ++ optional (elem "host"   configurePlatforms) "--host=${stdenv.hostPlatform.config}"
+            ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}";
+
         } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
           # TODO: remove lib.unique once nix has a list canonicalization primitive
           __sandboxProfile =

From 245e4a38013ca7ae14edb01564d5b8c3f3bdcf46 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Fri, 14 Jul 2017 03:31:53 +0300
Subject: [PATCH 0507/3246] darkhttpd: update homepage

---
 pkgs/servers/http/darkhttpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix
index 9b9ab843a70..0ca888fd6ed 100644
--- a/pkgs/servers/http/darkhttpd/default.nix
+++ b/pkgs/servers/http/darkhttpd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Small and secure static webserver";
-    homepage = http://dmr.ath.cx/net/darkhttpd/;
+    homepage = https://unix4lyfe.org/darkhttpd/;
     license = stdenv.lib.licenses.bsd3;
     platforms = platforms.all;
     maintainers = [ maintainers.bobvanderlinden ];

From 6778866a7a5154a7e4c0ce617d013c8a7105b244 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Jul 2017 23:38:57 -0400
Subject: [PATCH 0508/3246] lhapdf: 6.1.6 -> 6.2.0

---
 .../libraries/physics/lhapdf/default.nix      | 12 ++++------
 .../physics/lhapdf/distutils-c++.patch        | 24 -------------------
 .../libraries/physics/lhapdf/maintainer.sh    |  2 +-
 .../libraries/physics/lhapdf/pdf_sets.nix     |  2 +-
 4 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/libraries/physics/lhapdf/distutils-c++.patch

diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 90a6d17f09a..ed8c4daa38b 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,19 +1,15 @@
-{ stdenv, fetchurl, boost, python2 }:
+{ stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
   name = "lhapdf-${version}";
-  version = "6.1.6";
+  version = "6.2.0";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
-    sha256 = "1sgbaxv8clcfy4d96fkwfyqcd4b29i0hwv32ry4vy69j5qiki0f2";
+    sha256 = "005jfapdj3mmk62p9qgvw7nyg93pqy249p1xy2ws1qx42xj76lih";
   };
 
-  buildInputs = [ boost python2 ];
-
-  patches = [ ./distutils-c++.patch ];
-
-  configureFlags = "--with-boost=${boost.dev}";
+  buildInputs = [ python2 ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch
deleted file mode 100644
index 822c3e38272..00000000000
--- a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/wrappers/python/Makefile.am
-+++ b/wrappers/python/Makefile.am
-@@ -25,7 +25,7 @@ fix-out-of-source: $(FIXSOURCES)
- 
- if WITH_PYTHON
- 
--PYEXT_ENV = CC=$(CC) CXX=$(CXX)
-+PYEXT_ENV = CC=$(CXX) CXX=$(CXX)
- 
- ## Always force setup.py, it's not good at guessing what needs to rebuild
- all-local: fix-out-of-source
-diff --git a/wrappers/python/Makefile.in b/wrappers/python/Makefile.in
-index 925460c..fdc8888 100644
---- a/wrappers/python/Makefile.in
-+++ b/wrappers/python/Makefile.in
-@@ -266,7 +266,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = lhapdf.cpp lhapdf.pyx clhapdf.pxd
- FIXSOURCES = $(EXTRA_DIST) 
--@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CC) CXX=$(CXX)
-+@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CXX) CXX=$(CXX)
- all: all-am
- 
- .SUFFIXES:
diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
index b0ced3b24e0..a8518d340b7 100755
--- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh
+++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/"
+BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/"
 
 for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*<a href=\"\([^\"]*.tar.gz\)\".*/\1/;tx;d;:x"`; do
 	echo -n "    \"${pdf_set%.tar.gz}\" = \""
diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index c2a0babb4d5..79a28922a4e 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -6,7 +6,7 @@ let
       inherit name;
 
       src = fetchurl {
-        url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/${name}.tar.gz";
+        url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/${name}.tar.gz";
         inherit sha256;
       };
 

From c7692b183940605ce3cff5b8f75153361bc10dcd Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Jul 2017 23:39:48 -0400
Subject: [PATCH 0509/3246] lhapdf: update PDF sets

---
 .../libraries/physics/lhapdf/pdf_sets.nix     | 149 ++++++++++++++++--
 1 file changed, 139 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index 79a28922a4e..b0f831f11da 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -21,8 +21,26 @@ let
     };
 in
   stdenv.lib.mapAttrs mkPdfSet {
-    "ATLAS-epWZ12-EIG" = "01nj0zn19sk2ir4fk1202jsz457yrpqrsm99gn60a6rbamjybk73";
-    "ATLAS-epWZ12-VAR" = "13kra15c5ahjldprdvp343c7gd875g8hca7r1bx9ccz6nffxram6";
+    "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0";
+    "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i";
+    "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll";
+    "ABMP16_3_nnlo" = "0bwirm3wqyjj6i3asya7kjmmjhqi69l1rnc6gnq7v136ajmv96y0";
+    "ABMP16_4_nnlo" = "1cw52ijyrhgvyqc28pp278bavy9acvs6qywysgc7qjifygb14mca";
+    "ABMP16_5_nnlo" = "0iyypvj4645g7nh8w6v88pz37p81bxilgc4p7wlkaa90hiq0wrk0";
+    "ABMP16als112_5_nnlo" = "17kg6gvl09p5gm99yb9d8hkl1q51904qflsziv3r5ybxs18ym5g8";
+    "ABMP16als113_5_nnlo" = "1gaiyq70zxx7c7c0gkkad3ygbhdwc563al2a6ksy78q8is3bhdy9";
+    "ABMP16als114_5_nnlo" = "1gd41d8ay8i8m35qfqsm96jcv8vx6hpdsrdzsj415f4zpw5j29fm";
+    "ABMP16als115_5_nnlo" = "0i70z8i0qgzr875szdh8sa6x3xcdkvrfsba97a6ha7b6km4p1yjk";
+    "ABMP16als116_5_nnlo" = "11rph6vmmvvsi8msfp2agb7747n7xjgxb7z766i5jkvnggbmz75m";
+    "ABMP16als117_5_nnlo" = "1sz9hy2m983aiwyssg60v4kq1zvz4xxvbzrgsdik1qv13bj4wx9w";
+    "ABMP16als118_5_nnlo" = "1slvr5ygwwryk63mah45xp5x31qwrf0gkrnh4p9fvl4rdkji6z0z";
+    "ABMP16als119_5_nnlo" = "1iqs1bi8r22awflf698cj39q8s2w86fwvdfgqb6sr8csm36ih6qp";
+    "ABMP16als120_5_nnlo" = "051bqfyh2017vnvlisvkm1ik6x7n829p8205f5algsw7wi1s7b9v";
+    "ATLAS-epWZ12-EIG" = "010ddmyfrmscgd1xdjsxsjc773jlvbh3s6mjbwk9zd298i3bf4kx";
+    "ATLAS-epWZ12-VAR" = "1r9ip8549dzhs02skm8v00g6nsh7q1rwd3syz3bd6cl4sqhs0k37";
+    "ATLAS-epWZ16-EIG" = "0b1zzp8p0kh4xjn76nm6waqlvdpqvnwyqsnnqdp2n7b9r9ssryyf";
+    "ATLAS-epWZ16-THEO" = "0b0wqa203b2x159y54xhf9yh34lkchp48vp9693k51g9aznx8gjm";
+    "ATLAS-epWZ16-VAR" = "1zkhlv8yxfla46gj57119w9prsd3zyy5vg275bayfwa6b71gmc0b";
     "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag";
     "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v";
     "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9";
@@ -99,6 +117,10 @@ in
     "CT10wnlo_as_0127" = "1svmgs55kg74rifjyns38lggv1c18mzmpmvsv116rrllklb19pfp";
     "CT10wnlo_nf3" = "1m13if0d9xijq695x41snpwwrsgs5a0jvil6j2ww8cspc33d7vr3";
     "CT10wnlo_nf4" = "1b9lz23rn2w7fqwxxgf6fcg620ac58dnb1ssj3ml3vfn7z88yx43";
+    "CT14MC1nlo" = "0z82q7xr9agq8iyw7w2rcclh27mry5snn5jswn3cxpgnalls50rx";
+    "CT14MC1nnlo" = "0fj6hjdv82fp4iv7iyk9gna7sksnpkgqx0bsrl2wjbigm4ys031g";
+    "CT14MC2nlo" = "1x6a6js1jpvkykagz6w3klh6hb2wf56r3kh65i6qlnzak4m7b8sq";
+    "CT14MC2nnlo" = "0hbdz8agjm16mm51hclpl2nsa5ji88zpqdsn682xgihq64kahsnb";
     "CT14llo" = "0sz2ni8xcjjg8034qjrhb77ak1akzlf5fwq00qs9c196lk5b2x7s";
     "CT14llo_NF3" = "07zzs3jprh0haqx5bcsii213m99m2nh9vki76d9cbhicyzx23pc1";
     "CT14llo_NF4" = "0bxkw5qms6dpab0zf1hhd8dllrjip2izbv23aqpg72d5rqxb6ny4";
@@ -146,6 +168,20 @@ in
     "CT14qed_inc_proton" = "0gv0rlr6l62gidqp02ifn75d1ribvbihgpaqc92fww73zwilr7l0";
     "CT14qed_neutron" = "0ck1vmqk17i7rq42hra79cz2rm8ngxv4da6dvz62l6m2nrga3l2k";
     "CT14qed_proton" = "1gijxkq5gpsljijblzd13kgr7xjjvnjv18v02jivylf73igsakd7";
+    "EPPS16nlo_CT14nlo_Ag108" = "1p7gckhv44h04rvknd6fdizy9c1jqfwic7ppf0ra14ic8wp1g7wg";
+    "EPPS16nlo_CT14nlo_Al27" = "0hxyakfgknmixxndfj14i44afp5gcfz9afjvjdaj702sv42a7qa8";
+    "EPPS16nlo_CT14nlo_Au197" = "1g272110y3a1fr6raxdfhagn68i0lcnwbdhiiqg4j6wb6v4m3p6i";
+    "EPPS16nlo_CT14nlo_Be9" = "0zxsdmvz919ajwwb917613byshhpr876jcg9kik0pkz8c4ddr2z0";
+    "EPPS16nlo_CT14nlo_C12" = "0mjmjk9n36aikhm8i6zwzfszyb5zcy1syn13vs2rm12x535j6dm5";
+    "EPPS16nlo_CT14nlo_Ca40" = "18vd67splj75sjijfvhyq0q6068yr8l083sczamwpmy8z3l798ih";
+    "EPPS16nlo_CT14nlo_Cu64" = "0g64gpc5cssmwl1sn7cl0ramsg2zfq7snr9bzr41q2dznbvqahgd";
+    "EPPS16nlo_CT14nlo_Fe56" = "0dxfzpx99ha9g27bxx6xzxxh87va91qqwq6hnz1qsligjfx7q4yz";
+    "EPPS16nlo_CT14nlo_He4" = "1ln5kz3270kyx6m3ji6q5xyp5a23f3kbwh9z9dmdwwsw7q9n8way";
+    "EPPS16nlo_CT14nlo_Li6" = "04rviiml0rnym9qppsczcydw37r923ljx8hj63vv6dxng0g617qb";
+    "EPPS16nlo_CT14nlo_Pb208" = "1b2zibpigdvvkg29zh7zm32jpdr2prm35jasafh17pfpwlfc55mb";
+    "EPPS16nlo_CT14nlo_Pt195" = "14v1gicvm8i8z9d98rlv5rbhaglkbi9fhs3z465p4d764al6znnc";
+    "EPPS16nlo_CT14nlo_Sn119" = "10nxn6rdp7svsrkdcdwxryjmirn1s871yj1w493adpfcy3chqw9k";
+    "EPPS16nlo_CT14nlo_W184" = "1x8ndmkzmnl79vz1bgi9972190x03asvgnls6qiz746xl37q4ky7";
     "GRVPI0" = "0i5icsw9hf4jm25d0szxqc3r1131n417lv8b4gslg93xqj4ry1hf";
     "GRVPI1" = "05j3mcrb0sq4nzv7y0k68f2m3v8vnd13mzbhq43gjq712cbj126p";
     "HERAPDF15LO_EIG" = "12cqj3vqwi86sfgxkiwbd7rnpw1awnbqbc852b0x32d9j18nz9c2";
@@ -213,7 +249,7 @@ in
     "HERAPDF20_NNLO_ALPHAS_115" = "0nlimqmfhx2ijx48ylciih5diwlsb5zzkli82rgnnxci3r4ycjq4";
     "HERAPDF20_NNLO_ALPHAS_116" = "0nr8svx60zrf42nxg74v0h759y9lwg54892xpdmswg7mw0nwcrm9";
     "HERAPDF20_NNLO_ALPHAS_117" = "0xiqdr2r5dyyp5q56b3w04wy3raqrh1mjsv1fm05xswxn2xwyhlq";
-    "HERAPDF20_NNLO_ALPHAS_118" = "";
+    "HERAPDF20_NNLO_ALPHAS_118" = "0d0w0f077g11s4clx1556y9xx5nn1dgm8zcp0bk92v4lapngf33c";
     "HERAPDF20_NNLO_ALPHAS_119" = "1w9nl0pnfc1cii4knmqdq4cnh6shhhgj8pg4a42bx20lvqc3aqgb";
     "HERAPDF20_NNLO_ALPHAS_120" = "1lksn0rcxq2scwpnps8dawlzijhvwbg0pn2is4r29igbqck2jvb3";
     "HERAPDF20_NNLO_ALPHAS_121" = "03d58rbibvgcvmsw86q3030qnw5nnvq8p6diqscd9srb8br06p8m";
@@ -234,7 +270,7 @@ in
     "JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r";
     "JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq";
     "JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn";
-    "LUXqed_plus_PDF4LHC15_nnlo_100" = "009wb1ibh4yfbqh5fsznc2g9g50rl6g0pq0x9qf7iiq2vd40rzsz";
+    "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib";
     "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16";
     "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj";
     "METAv10LHCHfull" = "1w623939fjdyx1316rxyaavf6kmxff19himr00br57jrw3v49nfg";
@@ -341,6 +377,33 @@ in
     "MSTW2008nnlo_mcrange_fixasmz" = "05c8z2q2866550clx2mwb1jvhpn0agkyg82vvrswi3h4hgkvlfjx";
     "MSTW2008nnlo_mcrange_fixasmz_nf3" = "0r86xsl1wfphwdj2hhlilkwc2949m7bcn42dms14g7w45i24g6id";
     "MSTW2008nnlo_mcrange_nf3" = "1c9lsggncwghvw9mgd18h50ljrnlpp1p5r2zlzf8z3g8i4f3aaih";
+    "NNFF10_KAm_lo" = "19wn44svz61lhk33kzc6id18w6qbkw4bfnwncar19phrjjp965v6";
+    "NNFF10_KAm_nlo" = "191db9pj5yspiqc7598r147j9wvfc4s6cm0q805m5vmzpfg2cgr6";
+    "NNFF10_KAm_nnlo" = "1hm8vhk1p31zdn72bgcyyq0w5qii1ba0cf81wjlbhwv4fadfd4sy";
+    "NNFF10_KAp_lo" = "13yas11c7xxij45zrd3r6njjvx33kn9lg8i28ki0y4nw6ss21w3b";
+    "NNFF10_KAp_nlo" = "1jza83klbcb3j2pcg2xhgj2imh4llb6hsfkbfj294q0isqypgzsv";
+    "NNFF10_KAp_nnlo" = "0xwl34a31ajxwlgx6bhzzyf9b2xiq7bpv51p4zi6k1xihs91vwzc";
+    "NNFF10_KAsum_lo" = "128cj81qp09hn99dnkm9q06wf2dr7xjq9qmwvrmdizrd8cwfa4l1";
+    "NNFF10_KAsum_nlo" = "19pglfl1i5qg8sj3hg0qnhr1f66isfbrv7f901hnxniibbdjxib2";
+    "NNFF10_KAsum_nnlo" = "1769ybc49a94appmiw0bbn3kkvcpw82sggxgvvda5jq9m36m9yzb";
+    "NNFF10_PIm_lo" = "095xl0cs6p5z44hydfa963ylxvzqxdwwj1n8jn7n0c48rwssx357";
+    "NNFF10_PIm_nlo" = "1fn8863092fn4aqacprbsdxlgz27q6pam08pccwq9ps0dwjn7cc5";
+    "NNFF10_PIm_nnlo" = "0j4p50k821pphy8i6s73h3c29d7jb3bp5s4l8rl3bfb0nfx4p6hq";
+    "NNFF10_PIp_lo" = "0hhw2ympx1a8d3sl953k27yzww0j2f5m9b865gv1ybb3l9ccv1i6";
+    "NNFF10_PIp_nlo" = "18k3s7i1xvh8717n5cdllbb6zs8svh2bkw0k2zf4ql5ijiypvc10";
+    "NNFF10_PIp_nnlo" = "16mywhpc3439dpk2c1i6gxrv9khyyg0kl4gsc41qyi3r4d7k6n2c";
+    "NNFF10_PIsum_lo" = "1yh3hxfmgzgpwqidmzlc189syjbsj4vyswc4kch7yykxw4dqf6sa";
+    "NNFF10_PIsum_nlo" = "12rgg0nc9rjvwfpf0y9kl1w9814a4pv4b17p46h8qm6kfyqqwjia";
+    "NNFF10_PIsum_nnlo" = "19iz4q31apgm2il9478c7zmmc6kgz2wyp84qja761jvyl6z0img5";
+    "NNFF10_PRm_lo" = "0c5pavhf5flx2nmld2dprgp1lsbvsrjw5mqdzvgkks7ibvq0ap5j";
+    "NNFF10_PRm_nlo" = "0nfwhp9hacnm95w2qa5hvmfwaj7drc0w7lxqw1lrdp074bpd0ma3";
+    "NNFF10_PRm_nnlo" = "084dz4xxmydf71vkhcrmj03jkwyj56jxvmbzm22mdh2dxmkz3l1g";
+    "NNFF10_PRp_lo" = "014m0vjzrr4rbi84qxzmrym07kc4wax29fs66mfxkmrimxpb9l21";
+    "NNFF10_PRp_nlo" = "0lrzw2618kgk7vsksbr1qxqc4h9lza573bz6208hwdgkmh7awasc";
+    "NNFF10_PRp_nnlo" = "0bv07hh5rxvqw58jcam3piiiy19w325nrwivrifyv5wii8sybz8r";
+    "NNFF10_PRsum_lo" = "1a9m77rl49wzzgdkr6x618bzcm2p50f915bbggknx5xjw550dqd1";
+    "NNFF10_PRsum_nlo" = "1qambqywda7lvvkd6kx2r1g60v6lnqcamdd51396id33fvw3k45h";
+    "NNFF10_PRsum_nnlo" = "1kijaxw6v1w33q6l89raz7ic59zcmd3nx5djp83lyg134a15crmw";
     "NNPDF21_lo_as_0119_100" = "19qw2hp1yk82qgcrpx8wp2fg8wklaj6rr653m6mndhhr0aa0w80v";
     "NNPDF21_lo_as_0130_100" = "0p5cw77dg5pkhl3d0y6r3k8vhw4m467wf3gd8kp2l5vcbdwb4izv";
     "NNPDF21_lostar_as_0119_100" = "0i23axf0xl11nb2dn6p34bnm1xfisnn3a82db9dz863n60gqb5x4";
@@ -465,7 +528,7 @@ in
     "NNPDF30_nlo_as_0118_atlas" = "034h2wgakbm3mx70034nwb44ii38rca7xv3az3fhcnjbpg9vnf0p";
     "NNPDF30_nlo_as_0118_cms" = "08g9315fpc4khwfjf76vvyqa9nannvwq0bpc42f9f7yc0pck71qa";
     "NNPDF30_nlo_as_0118_cons" = "1lw0fhy9gwk3zr7vq7qh9p6zprbyd4faln3npnxs2snncic1mnz6";
-    "NNPDF30_nlo_as_0118_hera" = "0ndgfpxl9mrf1fk6w5q9ag3qm9rr4q3jkymfnr4frkmzcdxjnvzn";
+    "NNPDF30_nlo_as_0118_hera" = "1833gd9h3gg75hblxf5qh5hp61k7n9vavb91ll9lbqmcbfr34aas";
     "NNPDF30_nlo_as_0118_hera_1000" = "0lljb96d3q25yw3fz3cbk2in90q6srpc4alkz95nyrvgp25xgbgy";
     "NNPDF30_nlo_as_0118_hessian" = "0h8d2zc02ccr1rmlsf4xd5a41irbs9q9wx68caj2xy0i7qr8rsmp";
     "NNPDF30_nlo_as_0118_mc" = "12nnyzh2f6mv4gq4x4b8nlqx34lbj5y2y60zivfdbcpyg2spj5y8";
@@ -510,7 +573,7 @@ in
     "NNPDF30_nnlo_as_0118_atlas" = "013jm6f2hnmzc2di7spf6zp31fwhm6c9sddwql36hww63w8sys71";
     "NNPDF30_nnlo_as_0118_cms" = "1w0ax68rg5877s35zlg13c451fcz2rij4adzwhz4yf4skkbgflng";
     "NNPDF30_nnlo_as_0118_cons" = "1qniswwj6cmcs7bm4n11jx2disqcwszl08cb7im824nvrcjka2pg";
-    "NNPDF30_nnlo_as_0118_hera" = "07k4wlfd63zmhnxq06avdpfrgfnc2ziqhsgyy3w4lvara9i27il0";
+    "NNPDF30_nnlo_as_0118_hera" = "05j5yrra93dxh1nah19hszd0q3pj4zfica8a7vm5akbfn02rccj6";
     "NNPDF30_nnlo_as_0118_hera_1000" = "0ssiw9fk5fqwg77rbycrxrclldws35n6gj4a4sj6d9yc87vz1g7z";
     "NNPDF30_nnlo_as_0118_hessian" = "1hb32bamwlx5il8g2sf5gy6xjr7r4rky7xgvdhf5ndq7v3n1ncx1";
     "NNPDF30_nnlo_as_0118_mc" = "1gxl4c5z2vh382y8l2kpr8vy4fqvbxvrw6xjc6dp229ak89cd6c2";
@@ -536,6 +599,72 @@ in
     "NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg";
     "NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq";
     "NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk";
+    "NNPDF31_lo_as_0118" = "0xdxn21k08vrb1pdpafkb7cqrjq7z08ydmbxplgl9dyn4mcqk4jg";
+    "NNPDF31_lo_as_0130" = "0xkljqnkrq542vjxapnzx5ba5m6ixyqqkfdcn73m576zlkslx0md";
+    "NNPDF31_lo_pch_as_0118" = "1y6nidprll6as4ygpvxld71b9ksn5mjci3dc6cjamijarcdpgpsq";
+    "NNPDF31_lo_pch_as_0130" = "0lbb7906lx7fxj346h7apdmhi85biaknh8vzkf8z11mh1dy7hm3w";
+    "NNPDF31_nlo_as_0116" = "00qlx5xdl0g99hb0vycpmflbsw73i952w1qpf84hraqd9xs9wq0w";
+    "NNPDF31_nlo_as_0118" = "01jsfvd3bl0lca93hwlm5lngarlgkn8nmj048yj3qjj5vs98w7rx";
+    "NNPDF31_nlo_as_0118_1000" = "1ms69qgi3mhrwi3jxapykfsiqwq3cfpx38jwmsv4pq2g2hhawvfq";
+    "NNPDF31_nlo_as_0118_C1p6" = "0xig1dyf9sr72c2daksy6wicgfj8gxnyjbvxz1w8f1m0ww0mlwkx";
+    "NNPDF31_nlo_as_0118_hessian" = "11kc9waf3c28ncb4irwvpnlbp5p6bzs6l9hfkix6v9c4z5d804rq";
+    "NNPDF31_nlo_as_0118_mc" = "0xjrv6p4qanvx7l44cggj4jc29pnnf3lrnsa7sijzfardwsp60az";
+    "NNPDF31_nlo_as_0118_nf_4" = "0ciasq6r5j424b1qgz6z4s1s9zycj8z9syws9cjc6c65warjcca7";
+    "NNPDF31_nlo_as_0118_nf_6" = "0li61z1c83cjxgnsqp5hnd272w5wljj06ad73w1jmxv8jplb1l2m";
+    "NNPDF31_nlo_as_0120" = "18b3acwhykwacf4av0a5cn77d0wvwxbjljh96nxmj0pdg8rs2v9s";
+    "NNPDF31_nlo_hessian_pdfas" = "0yffdh37sxxfhaylg5rczyggx2313h4wzhig4j37nby35cj13dmr";
+    "NNPDF31_nlo_pch_as_0116" = "04wl2n4iil8svxk6k970dc2c0gpbyvw23lvl5w522imahrc0kmph";
+    "NNPDF31_nlo_pch_as_0118" = "0hcaaxd01769pvjqp92wqch6hqlnf3wddik13gp3rr9rcg8rf31l";
+    "NNPDF31_nlo_pch_as_0118_1000" = "1mnfyvlnwz0ga985nkn7px0b7mzai6jx74j8pyy8mdpjbgkmwpq6";
+    "NNPDF31_nlo_pch_as_0118_hessian" = "13z0icvq1ryix0kg7p5c4569v4hiv2mins2b2ai88jf16rj99n4r";
+    "NNPDF31_nlo_pch_as_0118_mc" = "1wg1wlzf8qi1h83y9aajglacvhs9zm68p9dvn4w6fmqrj0hppd3g";
+    "NNPDF31_nlo_pch_as_0118_nf_3" = "0xvqms66myq84bpszs04apfbc66i4jq2qdkkbp4cy3pq573bpvmr";
+    "NNPDF31_nlo_pch_as_0118_nf_4" = "0yylm6zbrm4j9lh05vmwxbkdn6b83zxbpj7s43ygi1bl7jnsxmnh";
+    "NNPDF31_nlo_pch_as_0118_nf_6" = "1j3a3blikmz36a8nraaak9ax6rykirx14lghvszs6zjnfxr44h5m";
+    "NNPDF31_nlo_pch_as_0120" = "1hmzaar0ri15w37hagpn9jzq4kxs1231cwqn9zz2pr6a9rk99k8m";
+    "NNPDF31_nlo_pch_hessian_pdfas" = "19fc6fyp4i761nl3f4vxrcy0rpgnhvaqh4w0sq44j1dfnsn0y4lr";
+    "NNPDF31_nlo_pch_pdfas" = "1ql7j0xb49id82ab51ppphyrkag2m39jpsb3whna88bal3jh1710";
+    "NNPDF31_nlo_pdfas" = "1xdzrwbfax9q492a63agx7a4jd4jp5r3pwgyyyqagvfxi4f1q17n";
+    "NNPDF31_nnlo_as_0108" = "0gjwk058lbhmkmfmxkvxndnda10nih7zc711wp4c5gk70nhp1m6k";
+    "NNPDF31_nnlo_as_0110" = "1lmi58ljspxs04zwx6bax6gf9221y1algrz7hjv63glc4j23q9h5";
+    "NNPDF31_nnlo_as_0112" = "0qz79ljj9javl940bvpidiy9fqv91d53g1l9i2gbxd72rgr52h1w";
+    "NNPDF31_nnlo_as_0114" = "1wjvwdl8mp36x5cqrgny15lnm696k5nxpwax0ry1win3gy7mb2kp";
+    "NNPDF31_nnlo_as_0116" = "1zkxzdfgklpxy3bwvjlhpqq2s2g40q2f9wzibf9qb294c69wm886";
+    "NNPDF31_nnlo_as_0117" = "1vwqqxwzx1cwy9ndr0aav6xxi4n18px6n0rsvwbrz0v4gsyr6mh1";
+    "NNPDF31_nnlo_as_0118" = "0mi9ln96xy3pjifrjmw9mvgwlb81229spa9x1df084rpy8hab80f";
+    "NNPDF31_nnlo_as_0118_1000" = "1bcjsxnp205v9ipf0j57pfnzl7kd89ds3w0gnjdsq8q86s0c5k23";
+    "NNPDF31_nnlo_as_0118_collider" = "071ddwk53axsg7zdyf287nyqk3g3ayr95irp8kh8fsql3kvaw5hn";
+    "NNPDF31_nnlo_as_0118_hessian" = "1g4cp3y54yn38c9kiljrqvq4201pikwd58sa4ngw0vbasp8hn612";
+    "NNPDF31_nnlo_as_0118_mc" = "1x8ai1a8gv1if0l66596fwi4qdwla3aci27c23n5i60g83lf6hza";
+    "NNPDF31_nnlo_as_0118_mc_138" = "0jbwmiqfcf36p5mbqp7gzvrr8s9k7a7wrkbhr8nymipr9yczd51h";
+    "NNPDF31_nnlo_as_0118_mc_164" = "1myybl60kkdxaxlij9r3i3l090m4m4709g1dnp85k90vjryafwkc";
+    "NNPDF31_nnlo_as_0118_nf_4" = "05hglnfv1d9gl4m34c2hwzf96pl39mihwly6sffq7dxsjdbr8yhw";
+    "NNPDF31_nnlo_as_0118_nf_6" = "1bzfgcyphhpdizd307d91syg0xf0ki5cv0n9kij9a366ixf3m14z";
+    "NNPDF31_nnlo_as_0118_noLHC" = "0ibvp81ys8dajhxbv7cjdsybvgs258yh45a99xskm3jknzg90a36";
+    "NNPDF31_nnlo_as_0118_noZpt" = "0xszskydvzaw7ipyzslirimfys9vnm3nsyrimb8kzcnwnhviq7p7";
+    "NNPDF31_nnlo_as_0118_nojets" = "0kci82bxd8njgb6w9zr7mcy8sswg6ldfvs0jclqm09yjl05nl3p2";
+    "NNPDF31_nnlo_as_0118_notop" = "15wl949pdmfp3ikxkzcaqgqqmifs6d81z2smxg4m7hq1hg56y5lf";
+    "NNPDF31_nnlo_as_0118_proton" = "1gx94jhavk9fvs0klqnkq152b23mvd2y68jpvfzhg7jvcl10fqal";
+    "NNPDF31_nnlo_as_0118_wEMC" = "1z3yv8i7yb2ng1ap3qqy5qxkkq7ds19dzp76qrivrcfqh0ymdq8m";
+    "NNPDF31_nnlo_as_0119" = "1c4ymkshqp70713p6n9kjmrqr1pjsb1gjw20pmy47azr0a6pcryy";
+    "NNPDF31_nnlo_as_0120" = "12bgvx6kk5bw30ng81b6hcqdqn2vi3zc60xn21z6nv1995ky44mm";
+    "NNPDF31_nnlo_as_0122" = "0kmaxwxrk5yrrj00z8fkl4y7n08yrx1159zp6p450vcnwx512p10";
+    "NNPDF31_nnlo_as_0124" = "01gxfwsxqvng8d6kbmz6jq05l00d2gw4snjmcsj76lk9xcmkjmwi";
+    "NNPDF31_nnlo_hessian_pdfas" = "1dd4yzh5vhr11qh5w1wfb1ppda4sk9f78h781p1ds165qsw2vcqj";
+    "NNPDF31_nnlo_pch_as_0116" = "0zaigf1dhcidlqyyffjq193p1xcc94dbkqjfppmpdzwd4q283ydz";
+    "NNPDF31_nnlo_pch_as_0118" = "0x2s5v0p7k3a3v01wr8rvp2al0x4l2bx9wwmvfjcm4k2f2m011s5";
+    "NNPDF31_nnlo_pch_as_0118_1000" = "1kwc21p2s383973k5jqciqjpmp4xlvj59zsxjs9nvsywzp9k7vaq";
+    "NNPDF31_nnlo_pch_as_0118_hessian" = "15wb8yap14mqbawbifgl57dkn8iwvby7pkn0yvrb0rrpgyivgxhr";
+    "NNPDF31_nnlo_pch_as_0118_mc" = "0f2ymg5sd78531pxyvprqaw1dg9sbys5di46zjz1qycs8r3kcznm";
+    "NNPDF31_nnlo_pch_as_0118_mc_138" = "0mzwhsp3xid0s32cpzq5z6vq7w90v3xr5nfdvhgbpqvl992gxbvb";
+    "NNPDF31_nnlo_pch_as_0118_mc_164" = "13a4wsn2pv5w7847asjk30nzm9kcscsxcnjx4ygzdvk9938z7rxb";
+    "NNPDF31_nnlo_pch_as_0118_nf_3" = "07v7n9yxbnmnyxngncfiy9v1k2njsy1bqvzchjqpzd9l3w751dpk";
+    "NNPDF31_nnlo_pch_as_0118_nf_4" = "0lsa5zjyg0qx23fjx6lyi0bwkq7did4lbxwbi3d5gibnrr917lnq";
+    "NNPDF31_nnlo_pch_as_0118_nf_6" = "0drb8ylkfs18sc5k3ynwrydwgcyv55f7la2m6cl412gbrwkbhina";
+    "NNPDF31_nnlo_pch_as_0120" = "0ckflm3s97c9vgf5klnscf51dyhqcjsm83a7kqxq4085q1rwwixj";
+    "NNPDF31_nnlo_pch_hessian_pdfas" = "010yzzhqay4mkyn5had3sdrfwd9qfm65y6w0riiamdcx561mwjcv";
+    "NNPDF31_nnlo_pch_pdfas" = "1yp113p6kzqw8cizxawgnhmkz6xw27mqi76jy417c9lvmy4mq43p";
+    "NNPDF31_nnlo_pdfas" = "0ixj0bmwv1hjg2kvmpyd8r2jykh7a5ng1d469wd3amqkc4ww9kcq";
     "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8";
     "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8";
     "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72";
@@ -567,10 +696,10 @@ in
     "abm11_5n_as_nnlo" = "0091vwjkc686d1dnfn2dpa7jb56p8gli2z687fpx5f8yhjzpbh80";
     "abm11_5n_nlo" = "1bpf37mg5wgcf1id2am98l5mj162xrnb8k16ppfx3qxlakp0iabl";
     "abm11_5n_nnlo" = "1mpk322mqs078pk2nxxk8fa29ka6cxzsf65ffiny38678djmfqd2";
-    "abm12lhc_3_nnlo" = "0hwgspbp6dpw5lz211i0vjgg45hag7zr3djfdk16gkr86sra7ba6";
-    "abm12lhc_4_nnlo" = "161qdm0axsqhg6lizx0h4kdg714kl2d6mb8y7wrvanr0v0db9zkl";
-    "abm12lhc_5_nnlo" = "0vshq0fx5nigzdf0vryr2v4kggc37byalzfjswm70l3nnjhxp6xs";
-    "cteq6" = "0wk6fmajvbdh8wmx1wmyd9n53m82vvh2gj4iric4b4ig9ssmbjx9";
+    "abm12lhc_3_nnlo" = "09k90vhjq7p0i0aaq2697pq2dc86bkmnv4q8zyqxjp3wnqx1v95f";
+    "abm12lhc_4_nnlo" = "1hciv1z9b5fiz7swv21gr0rshijj9yj2n8x4l54v9g0jyd061jaz";
+    "abm12lhc_5_nnlo" = "00xxkrhbfkxhg33mkpwwk5nsdp4nmi0zmllx5z5ygxl24rinsq9j";
+    "cteq6" = "0lp110wldhliad354v29f0rhdzf5qrs1ibklj0cmzp2rcbp8zrix";
     "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap";
     "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y";
     "nCTEQ15FullNuc_1_1" = "0nx1n814mkikd01pxmpndk2qxpwqwd55cbn6z1kgxm8qlhhhd2zw";

From f33f7dc0fab77c386ef27b70e58c5af68100f596 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 14 Jul 2017 12:30:49 +0800
Subject: [PATCH 0510/3246] nodejs: 4.8.1 -> 4.8.4

---
 pkgs/development/web/nodejs/v4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index edef6f7663c..24832b6b8be 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "4.8.1";
+    version = "4.8.4";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
-      sha256 = "0kcalypjf1036gr4mv1gy682hc1rp18ms3cv7mz0941qnizkzrms";
+      sha256 = "35fe633a48cbe93c79327161d9dc964ac9810f4ceb2ed8628487e6e14a15905b";
     };
 
   })

From fffe1efa03b4c59cfabf22d672745a373e22aade Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 14 Jul 2017 12:31:09 +0800
Subject: [PATCH 0511/3246] nodejs: 6.9.5 -> 6.11.1

---
 pkgs/development/web/nodejs/v6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index 5fb122aefa8..9419b59e921 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -10,10 +10,10 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "6.9.5";
+    version = "6.11.1";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "1cxnsprv2sy2djskx6yfw14f578s1fwzvmvnw7rh75djajix3znp";
+      sha256 = "6f6655b85919aa54cb045a6d69a226849802fcc26491d0db4ce59873e41cc2b8";
     };
   })

From ea4e03d7aca300e629cb19084719dcaf7baf4d93 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 14 Jul 2017 12:31:48 +0800
Subject: [PATCH 0512/3246] nodejs: 7.10.0 -> 7.10.1

---
 pkgs/development/web/nodejs/v7.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
index 1c074fa4751..86d4fed8eab 100644
--- a/pkgs/development/web/nodejs/v7.nix
+++ b/pkgs/development/web/nodejs/v7.nix
@@ -10,13 +10,12 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "7.10.0";
+    version = "7.10.1";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "08czj7ssvzgv13zvhg2y9mhy4cc6pvm4bcp7rbzj3a2ba8axsd6w";
+      sha256 = "654db852149a1cc59ece68ec573b0486907e8febe8353cee097dd29ea5a56cfa";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
   })
-

From c5fe03ace2d7fae09aa5fdce1047e642fe7718cc Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Fri, 14 Jul 2017 14:01:42 +0900
Subject: [PATCH 0513/3246] r-pbdZMQ: fix Darwin install

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 7354f5e5715..3de25dd1478 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -281,6 +281,7 @@ let
     pbdMPI = [ pkgs.openmpi ];
     pbdNCDF4 = [ pkgs.netcdf ];
     pbdPROF = [ pkgs.openmpi ];
+    pbdZMQ = [ pkgs.which ];
     PKI = [ pkgs.openssl.dev ];
     png = [ pkgs.libpng.dev ];
     PopGenome = [ pkgs.zlib.dev ];

From c61da1b383d61a147d6a696e465b2cd290c6074f Mon Sep 17 00:00:00 2001
From: hhm <heehooman+vcs-ci@gmail.com>
Date: Fri, 14 Jul 2017 00:16:01 -0400
Subject: [PATCH 0514/3246] add self (hhm) to maintainers

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e29ff585975..e716c4f97db 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -231,6 +231,7 @@
   hectorj = "Hector Jusforgues <hector.jusforgues+nixos@gmail.com>";
   heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
+  hhm = "hhm <heehooman+nixpkgs@gmail.com>";
   hinton = "Tom Hinton <t@larkery.com>";
   hodapp = "Chris Hodapp <hodapp87@gmail.com>";
   hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";

From c5798c1db29a9e8aaffb49128452d6fb37462d39 Mon Sep 17 00:00:00 2001
From: hhm <heehooman+vcs-ci@gmail.com>
Date: Fri, 14 Jul 2017 00:40:35 -0400
Subject: [PATCH 0515/3246] hebcal: init at 4.13

fixes #27373
---
 pkgs/tools/misc/hebcal/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/misc/hebcal/default.nix

diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix
new file mode 100644
index 00000000000..f7be5dbbbe4
--- /dev/null
+++ b/pkgs/tools/misc/hebcal/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  version = "4.13";
+  name = "hebcal-${version}";
+
+  src = fetchFromGitHub {
+    owner = "hebcal";
+    repo = "hebcal";
+    rev = "v${version}";
+    sha256 = "0h9hbfkbq620sw9gnnkivv7yi7dnp1k6axzwr0yccbv5cg67xs3h";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://hebcal.github.io";
+    description = "A perpetual Jewish Calendar";
+    longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays.";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.hhm ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe78ed68005..48e9f8fc2b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1035,6 +1035,8 @@ with pkgs;
 
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
+  hebcal = callPackage ../tools/misc/hebcal {};
+
   hexio = callPackage ../development/tools/hexio { };
 
   hostsblock = callPackage ../tools/misc/hostsblock { };

From 53a50dfa7a6c634fb33382bb254e9ab40429b40b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Jul 2017 22:46:03 +0200
Subject: [PATCH 0516/3246] ocamlPackages.camomile: fix build for OCaml 4.05

---
 pkgs/development/ocaml-modules/camomile/0.8.2.nix   | 4 ++++
 pkgs/development/ocaml-modules/camomile/default.nix | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
index 63daf21e408..a7e591e049e 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
@@ -1,5 +1,9 @@
 {stdenv, fetchurl, ocaml, findlib, camlp4}:
 
+if stdenv.lib.versionAtLeast ocaml.version "4.05"
+then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation rec {
   name = "camomile-${version}";
   version = "0.8.2";
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index 950d7f7fc8f..48517036dc6 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, camlp4}:
+{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
 
 stdenv.mkDerivation rec {
   name = "camomile-${version}";
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045";
   };
 
+  patches = [ (fetchpatch {
+    url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch;
+    sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb";
+  })];
+
   buildInputs = [ocaml findlib camlp4];
 
   createFindlibDestdir = true;

From 85070e1df124fa212ab3ad75e79a72993f16a201 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 14 Jul 2017 07:27:55 +0200
Subject: [PATCH 0517/3246] fast-cli: init at 1.0.0

---
 .../node-packages/node-packages-v4.nix        | 1236 +++-
 .../node-packages/node-packages-v6.json       |    1 +
 .../node-packages/node-packages-v6.nix        | 5857 +++++++++--------
 3 files changed, 4129 insertions(+), 2965 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index c8e51f53a9a..d22e217efbb 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -634,13 +634,13 @@ let
         sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
       };
     };
-    "readable-stream-2.2.11" = {
+    "readable-stream-2.3.3" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.11";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz";
-        sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
+        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
       };
     };
     "xtend-4.0.1" = {
@@ -670,22 +670,22 @@ let
         sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
       };
     };
-    "safe-buffer-5.0.1" = {
+    "safe-buffer-5.1.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.0.1";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
+        sha1 = "893312af69b2123def71f57889001671eeb2c853";
       };
     };
-    "string_decoder-1.0.2" = {
+    "string_decoder-1.0.3" = {
       name = "string_decoder";
       packageName = "string_decoder";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz";
-        sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
+        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -733,13 +733,13 @@ let
         sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12";
       };
     };
-    "fined-1.0.2" = {
+    "fined-1.1.0" = {
       name = "fined";
       packageName = "fined";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz";
-        sha1 = "5b28424b760d7598960b7ef8480dff8ad3660e97";
+        url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz";
+        sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476";
       };
     };
     "flagged-respawn-0.3.2" = {
@@ -949,13 +949,13 @@ let
         sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145";
       };
     };
-    "arr-flatten-1.0.3" = {
+    "arr-flatten-1.1.0" = {
       name = "arr-flatten";
       packageName = "arr-flatten";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz";
-        sha1 = "a274ed85ac08849b6bd7847c4580745dc51adfb1";
+        url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
+        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
       };
     };
     "expand-range-1.8.2" = {
@@ -1237,31 +1237,40 @@ let
         sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
-    "lodash.assignwith-4.2.0" = {
-      name = "lodash.assignwith";
-      packageName = "lodash.assignwith";
-      version = "4.2.0";
+    "expand-tilde-2.0.2" = {
+      name = "expand-tilde";
+      packageName = "expand-tilde";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz";
-        sha1 = "127a97f02adc41751a954d24b0de17e100e038eb";
+        url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz";
+        sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
       };
     };
-    "lodash.isempty-4.4.0" = {
-      name = "lodash.isempty";
-      packageName = "lodash.isempty";
-      version = "4.4.0";
+    "is-plain-object-2.0.4" = {
+      name = "is-plain-object";
+      packageName = "is-plain-object";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz";
-        sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e";
+        url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
+        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
       };
     };
-    "lodash.pick-4.4.0" = {
-      name = "lodash.pick";
-      packageName = "lodash.pick";
-      version = "4.4.0";
+    "object.defaults-1.1.0" = {
+      name = "object.defaults";
+      packageName = "object.defaults";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz";
-        sha1 = "52f05610fff9ded422611441ed1fc123a03001b3";
+        url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz";
+        sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf";
+      };
+    };
+    "object.pick-1.2.0" = {
+      name = "object.pick";
+      packageName = "object.pick";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz";
+        sha1 = "b5392bee9782da6d9fb7d6afaf539779f1234c2b";
       };
     };
     "parse-filepath-1.0.1" = {
@@ -1273,6 +1282,42 @@ let
         sha1 = "159d6155d43904d16c10ef698911da1e91969b73";
       };
     };
+    "isobject-3.0.1" = {
+      name = "isobject";
+      packageName = "isobject";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz";
+        sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
+      };
+    };
+    "array-each-1.0.1" = {
+      name = "array-each";
+      packageName = "array-each";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz";
+        sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f";
+      };
+    };
+    "array-slice-1.0.0" = {
+      name = "array-slice";
+      packageName = "array-slice";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz";
+        sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f";
+      };
+    };
+    "for-own-1.0.0" = {
+      name = "for-own";
+      packageName = "for-own";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz";
+        sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b";
+      };
+    };
     "is-absolute-0.2.6" = {
       name = "is-absolute";
       packageName = "is-absolute";
@@ -1678,13 +1723,13 @@ let
         sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
-    "npmlog-4.1.0" = {
+    "npmlog-4.1.2" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.1.0";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz";
-        sha1 = "dc59bee85f64f00ed424efb2af0783df25d1c0b5";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
       };
     };
     "osenv-0.1.4" = {
@@ -2020,15 +2065,6 @@ let
         sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
       };
     };
-    "safe-buffer-5.1.0" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz";
-        sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223";
-      };
-    };
     "stringstream-0.0.5" = {
       name = "stringstream";
       packageName = "stringstream";
@@ -2623,13 +2659,13 @@ let
         sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
       };
     };
-    "normalize-package-data-2.3.8" = {
+    "normalize-package-data-2.4.0" = {
       name = "normalize-package-data";
       packageName = "normalize-package-data";
-      version = "2.3.8";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz";
-        sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb";
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
+        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
       };
     };
     "read-pkg-up-1.0.1" = {
@@ -2686,13 +2722,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.4.2" = {
+    "hosted-git-info-2.5.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.4.2";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz";
-        sha1 = "0076b9f46a270506ddbaaea56496897460612a67";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
+        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3253,6 +3289,15 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
+    "safe-buffer-5.0.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
+      };
+    };
     "truncate-1.0.5" = {
       name = "truncate";
       packageName = "truncate";
@@ -3406,6 +3451,15 @@ let
         sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a";
       };
     };
+    "ansi-regex-3.0.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
+        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+      };
+    };
     "ansicolors-0.3.2" = {
       name = "ansicolors";
       packageName = "ansicolors";
@@ -3433,13 +3487,13 @@ let
         sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
       };
     };
-    "cacache-9.2.8" = {
+    "cacache-9.2.9" = {
       name = "cacache";
       packageName = "cacache";
-      version = "9.2.8";
+      version = "9.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz";
-        sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4";
+        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
+        sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd";
       };
     };
     "call-limit-1.1.0" = {
@@ -3568,6 +3622,15 @@ let
         sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
       };
     };
+    "libnpx-9.0.7" = {
+      name = "libnpx";
+      packageName = "libnpx";
+      version = "9.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.0.7.tgz";
+        sha1 = "e30e4d5d0cc21c849541441855d0d334d00b009b";
+      };
+    };
     "lockfile-1.0.3" = {
       name = "lockfile";
       packageName = "lockfile";
@@ -3622,13 +3685,13 @@ let
         sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
       };
     };
-    "lru-cache-4.0.2" = {
+    "lru-cache-4.1.1" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.0.2";
+      version = "4.1.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.1.1.tgz";
+        sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55";
       };
     };
     "mississippi-1.3.0" = {
@@ -3685,13 +3748,13 @@ let
         sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
       };
     };
-    "npm-registry-client-8.3.0" = {
+    "npm-registry-client-8.4.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "8.3.0";
+      version = "8.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz";
-        sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
+        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
       };
     };
     "npm-user-validate-1.0.0" = {
@@ -3712,13 +3775,13 @@ let
         sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
-    "pacote-2.7.36" = {
+    "pacote-2.7.38" = {
       name = "pacote";
       packageName = "pacote";
-      version = "2.7.36";
+      version = "2.7.38";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz";
-        sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c";
+        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz";
+        sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1";
       };
     };
     "path-is-inside-1.0.2" = {
@@ -3766,13 +3829,13 @@ let
         sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
       };
     };
-    "read-package-json-2.0.5" = {
+    "read-package-json-2.0.10" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.5";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz";
-        sha1 = "f93a64e641529df68a08c64de46389e8a3f88845";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.10.tgz";
+        sha1 = "dc0229f6dde6b4b705b39e25b2d970ebe95685ae";
       };
     };
     "read-package-tree-5.1.6" = {
@@ -3838,6 +3901,15 @@ let
         sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
       };
     };
+    "strip-ansi-4.0.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
+        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+      };
+    };
     "text-table-0.2.0" = {
       name = "text-table";
       packageName = "text-table";
@@ -3865,22 +3937,13 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
-    "update-notifier-2.1.0" = {
+    "update-notifier-2.2.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz";
-        sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
-      };
-    };
-    "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";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz";
+        sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
       };
     };
     "validate-npm-package-name-3.0.0" = {
@@ -3892,6 +3955,15 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
+    "worker-farm-1.4.1" = {
+      name = "worker-farm";
+      packageName = "worker-farm";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz";
+        sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8";
+      };
+    };
     "write-file-atomic-2.1.0" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -4000,13 +4072,13 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
-    "asap-2.0.5" = {
+    "asap-2.0.6" = {
       name = "asap";
       packageName = "asap";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz";
-        sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
+        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
+        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
       };
     };
     "promzard-0.3.0" = {
@@ -4018,6 +4090,285 @@ let
         sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
       };
     };
+    "dotenv-4.0.0" = {
+      name = "dotenv";
+      packageName = "dotenv";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz";
+        sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d";
+      };
+    };
+    "yargs-8.0.2" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "8.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
+        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    };
+    "get-caller-file-1.0.2" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
+        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
+      };
+    };
+    "os-locale-2.0.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz";
+        sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4";
+      };
+    };
+    "read-pkg-up-2.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+      };
+    };
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    };
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    };
+    "string-width-2.1.0" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz";
+        sha1 = "030664561fc146c9423ec7d978fe2457437fe6d0";
+      };
+    };
+    "which-module-2.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    };
+    "yargs-parser-7.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
+        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
+      };
+    };
+    "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";
+      };
+    };
+    "mem-1.1.0" = {
+      name = "mem";
+      packageName = "mem";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
+        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
+      };
+    };
+    "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";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
+    "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";
+      };
+    };
+    "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";
+      };
+    };
+    "find-up-2.1.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
+        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+      };
+    };
+    "read-pkg-2.0.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+      };
+    };
+    "locate-path-2.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
+        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+      };
+    };
+    "p-locate-2.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
+        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+      };
+    };
+    "path-exists-3.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
+        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+      };
+    };
+    "p-limit-1.1.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz";
+        sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc";
+      };
+    };
+    "load-json-file-2.0.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+      };
+    };
+    "path-type-2.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+      };
+    };
+    "strip-bom-3.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+      };
+    };
+    "is-fullwidth-code-point-2.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+      };
+    };
     "lodash._createset-4.0.3" = {
       name = "lodash._createset";
       packageName = "lodash._createset";
@@ -4180,22 +4531,22 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "make-fetch-happen-2.4.12" = {
+    "make-fetch-happen-2.4.13" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "2.4.12";
+      version = "2.4.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz";
-        sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.13.tgz";
+        sha1 = "3139ba2f4230a8384e7ba394534816c872ecbf4b";
       };
     };
-    "npm-pick-manifest-1.0.3" = {
+    "npm-pick-manifest-1.0.4" = {
       name = "npm-pick-manifest";
       packageName = "npm-pick-manifest";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.3.tgz";
-        sha1 = "a56fed120b2d8adaec5334ddd07cf23b2389e8de";
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
+        sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8";
       };
     };
     "promise-retry-1.1.1" = {
@@ -4234,13 +4585,13 @@ let
         sha1 = "36549cf04ed1aee9b2a30c0143252238daf94016";
       };
     };
-    "agentkeepalive-3.2.0" = {
+    "agentkeepalive-3.3.0" = {
       name = "agentkeepalive";
       packageName = "agentkeepalive";
-      version = "3.2.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz";
-        sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd";
+        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
+        sha1 = "6d5de5829afd3be2712201a39275fd11c651857c";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -4252,22 +4603,22 @@ let
         sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72";
       };
     };
-    "http-proxy-agent-1.0.0" = {
+    "http-proxy-agent-2.0.0" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz";
-        sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a";
+        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz";
+        sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4";
       };
     };
-    "https-proxy-agent-1.0.0" = {
+    "https-proxy-agent-2.0.0" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz";
-        sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz";
+        sha1 = "ffaa4b6faf586ac340c18a140431e76b7d7f2944";
       };
     };
     "node-fetch-npm-2.0.1" = {
@@ -4279,13 +4630,13 @@ let
         sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465";
       };
     };
-    "socks-proxy-agent-2.1.1" = {
+    "socks-proxy-agent-3.0.0" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
-      version = "2.1.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz";
-        sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3";
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz";
+        sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -4297,22 +4648,31 @@ let
         sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
       };
     };
-    "agent-base-2.1.1" = {
+    "agent-base-4.1.0" = {
       name = "agent-base";
       packageName = "agent-base";
-      version = "2.1.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz";
-        sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.0.tgz";
+        sha1 = "20e17401cd49b3c076bf56a4bc6c5b436ffa8d55";
       };
     };
-    "semver-5.0.3" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.0.3";
+    "es6-promisify-5.0.0" = {
+      name = "es6-promisify";
+      packageName = "es6-promisify";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
-        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
+        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
+        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
+      };
+    };
+    "es6-promise-4.1.1" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
+        sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a";
       };
     };
     "encoding-0.1.12" = {
@@ -4450,13 +4810,13 @@ let
         sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
       };
     };
-    "boxen-1.1.0" = {
+    "boxen-1.2.0" = {
       name = "boxen";
       packageName = "boxen";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz";
-        sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz";
+        sha1 = "03478d84be7fe02189b80904d81d6a80384368f1";
       };
     };
     "configstore-3.1.0" = {
@@ -4468,6 +4828,15 @@ let
         sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1";
       };
     };
+    "import-lazy-2.1.0" = {
+      name = "import-lazy";
+      packageName = "import-lazy";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz";
+        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
+      };
+    };
     "is-npm-1.0.0" = {
       name = "is-npm";
       packageName = "is-npm";
@@ -4486,15 +4855,6 @@ let
         sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
       };
     };
-    "lazy-req-2.0.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
-        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
-      };
-    };
     "semver-diff-2.1.0" = {
       name = "semver-diff";
       packageName = "semver-diff";
@@ -4522,13 +4882,13 @@ let
         sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
       };
     };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
+    "chalk-2.0.1" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz";
+        sha1 = "dbec49436d2ae15f536114e76d14656cdbc0f44d";
       };
     };
     "cli-boxes-1.0.0" = {
@@ -4540,22 +4900,13 @@ let
         sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
       };
     };
-    "string-width-2.0.0" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz";
-        sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e";
-      };
-    };
-    "term-size-0.1.1" = {
+    "term-size-1.2.0" = {
       name = "term-size";
       packageName = "term-size";
-      version = "0.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz";
-        sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca";
+        url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz";
+        sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
     "widest-line-1.0.0" = {
@@ -4567,67 +4918,94 @@ let
         sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
       };
     };
-    "is-fullwidth-code-point-2.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
+    "ansi-styles-3.1.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz";
+        sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750";
+      };
+    };
+    "supports-color-4.2.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz";
+        sha1 = "ad986dc7eb2315d009b4d77c8169c2231a684037";
+      };
+    };
+    "color-convert-1.9.0" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
+        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
+      };
+    };
+    "color-name-1.1.2" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
+        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
+      };
+    };
+    "has-flag-2.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
-        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz";
+        sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
       };
     };
-    "execa-0.4.0" = {
+    "execa-0.7.0" = {
       name = "execa";
       packageName = "execa";
-      version = "0.4.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz";
-        sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3";
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
       };
     };
-    "cross-spawn-async-2.2.5" = {
-      name = "cross-spawn-async";
-      packageName = "cross-spawn-async";
-      version = "2.2.5";
+    "cross-spawn-5.1.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz";
-        sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc";
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
       };
     };
-    "is-stream-1.1.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "1.1.0";
+    "get-stream-3.0.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
-        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
       };
     };
-    "npm-run-path-1.0.0" = {
-      name = "npm-run-path";
-      packageName = "npm-run-path";
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz";
-        sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f";
-      };
-    };
-    "path-key-1.0.0" = {
-      name = "path-key";
-      packageName = "path-key";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz";
-        sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af";
-      };
-    };
-    "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";
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
       };
     };
     "dot-prop-4.1.1" = {
@@ -4729,15 +5107,6 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "get-stream-3.0.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
-      };
-    };
     "is-redirect-1.0.0" = {
       name = "is-redirect";
       packageName = "is-redirect";
@@ -4819,6 +5188,24 @@ let
         sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
       };
     };
+    "errno-0.1.4" = {
+      name = "errno";
+      packageName = "errno";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz";
+        sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
+      };
+    };
+    "prr-0.0.0" = {
+      name = "prr";
+      packageName = "prr";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
+        sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
+      };
+    };
     "adm-zip-0.4.7" = {
       name = "adm-zip";
       packageName = "adm-zip";
@@ -5215,13 +5602,13 @@ let
         sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
       };
     };
-    "commander-2.9.0" = {
+    "commander-2.11.0" = {
       name = "commander";
       packageName = "commander";
-      version = "2.9.0";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
-        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+        url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
+        sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563";
       };
     };
     "is-my-json-valid-2.16.0" = {
@@ -5233,15 +5620,6 @@ let
         sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693";
       };
     };
-    "graceful-readlink-1.0.1" = {
-      name = "graceful-readlink";
-      packageName = "graceful-readlink";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
-        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
-      };
-    };
     "generate-function-2.0.0" = {
       name = "generate-function";
       packageName = "generate-function";
@@ -5513,14 +5891,14 @@ in
           sources."replace-ext-0.0.1"
           (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.2.11" // {
+              (sources."readable-stream-2.3.3" // {
                 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."safe-buffer-5.0.1"
-                  sources."string_decoder-1.0.2"
+                  sources."safe-buffer-5.1.1"
+                  sources."string_decoder-1.0.3"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -5555,7 +5933,7 @@ in
                 dependencies = [
                   (sources."arr-diff-2.0.0" // {
                     dependencies = [
-                      sources."arr-flatten-1.0.3"
+                      sources."arr-flatten-1.1.0"
                     ];
                   })
                   sources."array-unique-0.2.1"
@@ -5675,16 +6053,43 @@ in
               })
             ];
           })
-          (sources."fined-1.0.2" // {
+          (sources."fined-1.1.0" // {
             dependencies = [
-              (sources."expand-tilde-1.2.2" // {
+              (sources."expand-tilde-2.0.2" // {
                 dependencies = [
-                  sources."os-homedir-1.0.2"
+                  (sources."homedir-polyfill-1.0.1" // {
+                    dependencies = [
+                      sources."parse-passwd-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              (sources."is-plain-object-2.0.4" // {
+                dependencies = [
+                  sources."isobject-3.0.1"
+                ];
+              })
+              (sources."object.defaults-1.1.0" // {
+                dependencies = [
+                  sources."array-each-1.0.1"
+                  sources."array-slice-1.0.0"
+                  (sources."for-own-1.0.0" // {
+                    dependencies = [
+                      sources."for-in-1.0.2"
+                    ];
+                  })
+                  sources."isobject-3.0.1"
+                ];
+              })
+              (sources."object.pick-1.2.0" // {
+                dependencies = [
+                  (sources."isobject-2.1.0" // {
+                    dependencies = [
+                      sources."isarray-1.0.0"
+                    ];
+                  })
                 ];
               })
-              sources."lodash.assignwith-4.2.0"
-              sources."lodash.isempty-4.4.0"
-              sources."lodash.pick-4.4.0"
               (sources."parse-filepath-1.0.1" // {
                 dependencies = [
                   (sources."is-absolute-0.2.6" // {
@@ -5917,19 +6322,19 @@ in
           sources."abbrev-1.1.0"
         ];
       })
-      (sources."npmlog-4.1.0" // {
+      (sources."npmlog-4.1.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.11" // {
+              (sources."readable-stream-2.3.3" // {
                 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."safe-buffer-5.0.1"
-                  sources."string_decoder-1.0.2"
+                  sources."safe-buffer-5.1.1"
+                  sources."string_decoder-1.0.3"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -6045,7 +6450,7 @@ in
           sources."oauth-sign-0.8.2"
           sources."performance-now-0.2.0"
           sources."qs-6.4.0"
-          sources."safe-buffer-5.1.0"
+          sources."safe-buffer-5.1.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -6157,9 +6562,9 @@ in
                         ];
                       })
                       sources."map-obj-1.0.1"
-                      (sources."normalize-package-data-2.3.8" // {
+                      (sources."normalize-package-data-2.4.0" // {
                         dependencies = [
-                          sources."hosted-git-info-2.4.2"
+                          sources."hosted-git-info-2.5.0"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -6421,19 +6826,19 @@ in
                   })
                 ];
               })
-              (sources."npmlog-4.1.0" // {
+              (sources."npmlog-4.1.2" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.4" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.11" // {
+                      (sources."readable-stream-2.3.3" // {
                         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."safe-buffer-5.0.1"
-                          sources."string_decoder-1.0.2"
+                          sources."safe-buffer-5.1.1"
+                          sources."string_decoder-1.0.3"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -6543,7 +6948,7 @@ in
                   sources."oauth-sign-0.8.2"
                   sources."performance-now-0.2.0"
                   sources."qs-6.4.0"
-                  sources."safe-buffer-5.1.0"
+                  sources."safe-buffer-5.1.1"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -6624,14 +7029,14 @@ in
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.2.11" // {
+                  (sources."readable-stream-2.3.3" // {
                     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."safe-buffer-5.0.1"
-                      sources."string_decoder-1.0.2"
+                      sources."safe-buffer-5.1.1"
+                      sources."string_decoder-1.0.3"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -6663,19 +7068,19 @@ in
                   })
                 ];
               })
-              (sources."npmlog-4.1.0" // {
+              (sources."npmlog-4.1.2" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.4" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.11" // {
+                      (sources."readable-stream-2.3.3" // {
                         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."safe-buffer-5.0.1"
-                          sources."string_decoder-1.0.2"
+                          sources."safe-buffer-5.1.1"
+                          sources."string_decoder-1.0.3"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -6785,7 +7190,7 @@ in
                   sources."oauth-sign-0.8.2"
                   sources."performance-now-0.2.0"
                   sources."qs-6.4.0"
-                  sources."safe-buffer-5.1.0"
+                  sources."safe-buffer-5.1.1"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -6866,14 +7271,14 @@ in
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.2.11" // {
+                  (sources."readable-stream-2.3.3" // {
                     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."safe-buffer-5.0.1"
-                      sources."string_decoder-1.0.2"
+                      sources."safe-buffer-5.1.1"
+                      sources."string_decoder-1.0.3"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -6970,19 +7375,19 @@ in
           })
         ];
       })
-      (sources."npmlog-4.1.0" // {
+      (sources."npmlog-4.1.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.11" // {
+              (sources."readable-stream-2.3.3" // {
                 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."safe-buffer-5.0.1"
-                  sources."string_decoder-1.0.2"
+                  sources."safe-buffer-5.1.1"
+                  sources."string_decoder-1.0.3"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -7100,7 +7505,7 @@ in
           sources."oauth-sign-0.8.2"
           sources."performance-now-0.2.0"
           sources."qs-6.4.0"
-          sources."safe-buffer-5.1.0"
+          sources."safe-buffer-5.1.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -7187,14 +7592,14 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."readable-stream-2.2.11" // {
+          (sources."readable-stream-2.3.3" // {
             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."safe-buffer-5.0.1"
-              sources."string_decoder-1.0.2"
+              sources."safe-buffer-5.1.1"
+              sources."string_decoder-1.0.3"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -7213,10 +7618,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.0.3";
+    version = "5.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz";
-      sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856";
+      url = "https://registry.npmjs.org/npm/-/npm-5.2.0.tgz";
+      sha1 = "0014eb05ead6870587fa1c068108935c898e9847";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -7226,13 +7631,13 @@ in
         ];
       })
       sources."abbrev-1.1.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-3.0.0"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.1.2"
       sources."archy-1.0.0"
       sources."bluebird-3.5.0"
-      (sources."cacache-9.2.8" // {
+      (sources."cacache-9.2.9" // {
         dependencies = [
           sources."y18n-3.2.1"
         ];
@@ -7242,6 +7647,11 @@ in
       sources."cmd-shim-2.0.2"
       (sources."columnify-1.5.4" // {
         dependencies = [
+          (sources."strip-ansi-3.0.1" // {
+            dependencies = [
+              sources."ansi-regex-2.1.1"
+            ];
+          })
           (sources."wcwidth-1.0.1" // {
             dependencies = [
               (sources."defaults-1.0.3" // {
@@ -7261,7 +7671,7 @@ in
       sources."detect-indent-5.0.0"
       (sources."dezalgo-1.0.3" // {
         dependencies = [
-          sources."asap-2.0.5"
+          sources."asap-2.0.6"
         ];
       })
       sources."editor-1.0.0"
@@ -7304,7 +7714,7 @@ in
       })
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -7315,6 +7725,129 @@ in
         ];
       })
       sources."lazy-property-1.0.0"
+      (sources."libnpx-9.0.7" // {
+        dependencies = [
+          sources."dotenv-4.0.0"
+          sources."y18n-3.2.1"
+          (sources."yargs-8.0.2" // {
+            dependencies = [
+              sources."camelcase-4.1.0"
+              (sources."cliui-3.2.0" // {
+                dependencies = [
+                  (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."wrap-ansi-2.1.0"
+                ];
+              })
+              sources."decamelize-1.2.0"
+              sources."get-caller-file-1.0.2"
+              (sources."os-locale-2.0.0" // {
+                dependencies = [
+                  (sources."execa-0.5.1" // {
+                    dependencies = [
+                      sources."cross-spawn-4.0.2"
+                      (sources."get-stream-2.3.1" // {
+                        dependencies = [
+                          sources."object-assign-4.1.1"
+                          (sources."pinkie-promise-2.0.1" // {
+                            dependencies = [
+                              sources."pinkie-2.0.4"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."is-stream-1.1.0"
+                      (sources."npm-run-path-2.0.2" // {
+                        dependencies = [
+                          sources."path-key-2.0.1"
+                        ];
+                      })
+                      sources."p-finally-1.0.0"
+                      sources."signal-exit-3.0.2"
+                      sources."strip-eof-1.0.0"
+                    ];
+                  })
+                  (sources."lcid-1.0.0" // {
+                    dependencies = [
+                      sources."invert-kv-1.0.0"
+                    ];
+                  })
+                  (sources."mem-1.1.0" // {
+                    dependencies = [
+                      sources."mimic-fn-1.1.0"
+                    ];
+                  })
+                ];
+              })
+              (sources."read-pkg-up-2.0.0" // {
+                dependencies = [
+                  (sources."find-up-2.1.0" // {
+                    dependencies = [
+                      (sources."locate-path-2.0.0" // {
+                        dependencies = [
+                          (sources."p-locate-2.0.0" // {
+                            dependencies = [
+                              sources."p-limit-1.1.0"
+                            ];
+                          })
+                          sources."path-exists-3.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."read-pkg-2.0.0" // {
+                    dependencies = [
+                      (sources."load-json-file-2.0.0" // {
+                        dependencies = [
+                          (sources."parse-json-2.2.0" // {
+                            dependencies = [
+                              (sources."error-ex-1.3.1" // {
+                                dependencies = [
+                                  sources."is-arrayish-0.2.1"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."pify-2.3.0"
+                          sources."strip-bom-3.0.0"
+                        ];
+                      })
+                      (sources."path-type-2.0.0" // {
+                        dependencies = [
+                          sources."pify-2.3.0"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              sources."require-directory-2.1.1"
+              sources."require-main-filename-1.0.1"
+              sources."set-blocking-2.0.0"
+              (sources."string-width-2.1.0" // {
+                dependencies = [
+                  sources."is-fullwidth-code-point-2.0.0"
+                ];
+              })
+              sources."which-module-2.0.0"
+              sources."yargs-parser-7.0.0"
+            ];
+          })
+        ];
+      })
       sources."lockfile-1.0.3"
       (sources."lodash._baseuniq-4.6.0" // {
         dependencies = [
@@ -7326,7 +7859,7 @@ in
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
-      (sources."lru-cache-4.0.2" // {
+      (sources."lru-cache-4.1.1" // {
         dependencies = [
           sources."pseudomap-1.0.2"
           sources."yallist-2.1.2"
@@ -7398,7 +7931,7 @@ in
         ];
       })
       sources."nopt-4.0.1"
-      (sources."normalize-package-data-2.3.8" // {
+      (sources."normalize-package-data-2.4.0" // {
         dependencies = [
           (sources."is-builtin-module-1.0.0" // {
             dependencies = [
@@ -7410,7 +7943,7 @@ in
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-5.1.2"
-      (sources."npm-registry-client-8.3.0" // {
+      (sources."npm-registry-client-8.4.0" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
             dependencies = [
@@ -7420,7 +7953,7 @@ in
         ];
       })
       sources."npm-user-validate-1.0.0"
-      (sources."npmlog-4.1.0" // {
+      (sources."npmlog-4.1.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
@@ -7442,6 +7975,11 @@ in
                   })
                 ];
               })
+              (sources."strip-ansi-3.0.1" // {
+                dependencies = [
+                  sources."ansi-regex-2.1.1"
+                ];
+              })
               sources."wide-align-1.1.2"
             ];
           })
@@ -7456,11 +7994,11 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."pacote-2.7.36" // {
+      (sources."pacote-2.7.38" // {
         dependencies = [
-          (sources."make-fetch-happen-2.4.12" // {
+          (sources."make-fetch-happen-2.4.13" // {
             dependencies = [
-              (sources."agentkeepalive-3.2.0" // {
+              (sources."agentkeepalive-3.3.0" // {
                 dependencies = [
                   (sources."humanize-ms-1.2.1" // {
                     dependencies = [
@@ -7470,14 +8008,17 @@ in
                 ];
               })
               sources."http-cache-semantics-3.7.3"
-              (sources."http-proxy-agent-1.0.0" // {
+              (sources."http-proxy-agent-2.0.0" // {
                 dependencies = [
-                  (sources."agent-base-2.1.1" // {
+                  (sources."agent-base-4.1.0" // {
                     dependencies = [
-                      sources."semver-5.0.3"
+                      (sources."es6-promisify-5.0.0" // {
+                        dependencies = [
+                          sources."es6-promise-4.1.1"
+                        ];
+                      })
                     ];
                   })
-                  sources."extend-3.0.1"
                   (sources."debug-2.6.8" // {
                     dependencies = [
                       sources."ms-2.0.0"
@@ -7485,11 +8026,15 @@ in
                   })
                 ];
               })
-              (sources."https-proxy-agent-1.0.0" // {
+              (sources."https-proxy-agent-2.0.0" // {
                 dependencies = [
-                  (sources."agent-base-2.1.1" // {
+                  (sources."agent-base-4.1.0" // {
                     dependencies = [
-                      sources."semver-5.0.3"
+                      (sources."es6-promisify-5.0.0" // {
+                        dependencies = [
+                          sources."es6-promise-4.1.1"
+                        ];
+                      })
                     ];
                   })
                   (sources."debug-2.6.8" // {
@@ -7497,7 +8042,6 @@ in
                       sources."ms-2.0.0"
                     ];
                   })
-                  sources."extend-3.0.1"
                 ];
               })
               (sources."node-fetch-npm-2.0.1" // {
@@ -7514,14 +8058,17 @@ in
                   })
                 ];
               })
-              (sources."socks-proxy-agent-2.1.1" // {
+              (sources."socks-proxy-agent-3.0.0" // {
                 dependencies = [
-                  (sources."agent-base-2.1.1" // {
+                  (sources."agent-base-4.1.0" // {
                     dependencies = [
-                      sources."semver-5.0.3"
+                      (sources."es6-promisify-5.0.0" // {
+                        dependencies = [
+                          sources."es6-promise-4.1.1"
+                        ];
+                      })
                     ];
                   })
-                  sources."extend-3.0.1"
                   (sources."socks-1.1.10" // {
                     dependencies = [
                       sources."ip-1.1.5"
@@ -7542,7 +8089,7 @@ in
               })
             ];
           })
-          sources."npm-pick-manifest-1.0.3"
+          sources."npm-pick-manifest-1.0.4"
           (sources."promise-retry-1.1.1" // {
             dependencies = [
               sources."err-code-1.1.2"
@@ -7584,7 +8131,7 @@ in
           sources."util-extend-1.0.3"
         ];
       })
-      (sources."read-package-json-2.0.5" // {
+      (sources."read-package-json-2.0.10" // {
         dependencies = [
           (sources."json-parse-helpfulerror-1.0.3" // {
             dependencies = [
@@ -7594,13 +8141,12 @@ in
         ];
       })
       sources."read-package-tree-5.1.6"
-      (sources."readable-stream-2.2.11" // {
+      (sources."readable-stream-2.3.3" // {
         dependencies = [
           sources."core-util-is-1.0.2"
           sources."isarray-1.0.0"
           sources."process-nextick-args-1.0.7"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
           sources."util-deprecate-1.0.2"
         ];
       })
@@ -7691,7 +8237,7 @@ in
       })
       sources."retry-0.10.1"
       sources."rimraf-2.6.1"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -7717,7 +8263,7 @@ in
         ];
       })
       sources."ssri-4.1.6"
-      sources."strip-ansi-3.0.1"
+      sources."strip-ansi-4.0.0"
       (sources."tar-2.2.1" // {
         dependencies = [
           sources."block-stream-0.0.9"
@@ -7732,27 +8278,59 @@ in
         ];
       })
       sources."unpipe-1.0.0"
-      (sources."update-notifier-2.1.0" // {
+      (sources."update-notifier-2.2.0" // {
         dependencies = [
-          (sources."boxen-1.1.0" // {
+          (sources."boxen-1.2.0" // {
             dependencies = [
               sources."ansi-align-2.0.0"
               sources."camelcase-4.1.0"
+              (sources."chalk-2.0.1" // {
+                dependencies = [
+                  (sources."ansi-styles-3.1.0" // {
+                    dependencies = [
+                      (sources."color-convert-1.9.0" // {
+                        dependencies = [
+                          sources."color-name-1.1.2"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."escape-string-regexp-1.0.5"
+                  (sources."supports-color-4.2.0" // {
+                    dependencies = [
+                      sources."has-flag-2.0.0"
+                    ];
+                  })
+                ];
+              })
               sources."cli-boxes-1.0.0"
-              (sources."string-width-2.0.0" // {
+              (sources."string-width-2.1.0" // {
                 dependencies = [
                   sources."is-fullwidth-code-point-2.0.0"
                 ];
               })
-              (sources."term-size-0.1.1" // {
+              (sources."term-size-1.2.0" // {
                 dependencies = [
-                  (sources."execa-0.4.0" // {
+                  (sources."execa-0.7.0" // {
                     dependencies = [
-                      sources."cross-spawn-async-2.2.5"
+                      (sources."cross-spawn-5.1.0" // {
+                        dependencies = [
+                          (sources."shebang-command-1.2.0" // {
+                            dependencies = [
+                              sources."shebang-regex-1.0.0"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."get-stream-3.0.0"
                       sources."is-stream-1.1.0"
-                      sources."npm-run-path-1.0.0"
-                      sources."object-assign-4.1.1"
-                      sources."path-key-1.0.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"
                     ];
                   })
@@ -7768,6 +8346,11 @@ in
                           sources."number-is-nan-1.0.1"
                         ];
                       })
+                      (sources."strip-ansi-3.0.1" // {
+                        dependencies = [
+                          sources."ansi-regex-2.1.1"
+                        ];
+                      })
                     ];
                   })
                 ];
@@ -7778,7 +8361,16 @@ in
             dependencies = [
               sources."ansi-styles-2.2.1"
               sources."escape-string-regexp-1.0.5"
-              sources."has-ansi-2.0.0"
+              (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"
             ];
           })
@@ -7801,6 +8393,7 @@ in
               })
             ];
           })
+          sources."import-lazy-2.1.0"
           sources."is-npm-1.0.0"
           (sources."latest-version-3.1.0" // {
             dependencies = [
@@ -7854,12 +8447,11 @@ in
               })
             ];
           })
-          sources."lazy-req-2.0.0"
           sources."semver-diff-2.1.0"
           sources."xdg-basedir-3.0.0"
         ];
       })
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       (sources."validate-npm-package-name-3.0.0" // {
         dependencies = [
           sources."builtins-1.0.3"
@@ -7870,6 +8462,16 @@ in
           sources."isexe-2.0.0"
         ];
       })
+      (sources."worker-farm-1.4.1" // {
+        dependencies = [
+          (sources."errno-0.1.4" // {
+            dependencies = [
+              sources."prr-0.0.0"
+            ];
+          })
+          sources."xtend-4.0.1"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.1.0"
       sources."debuglog-1.0.1"
@@ -8042,11 +8644,7 @@ in
                   sources."supports-color-2.0.0"
                 ];
               })
-              (sources."commander-2.9.0" // {
-                dependencies = [
-                  sources."graceful-readlink-1.0.1"
-                ];
-              })
+              sources."commander-2.11.0"
               (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index b362281ee21..db96f28cf6b 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -15,6 +15,7 @@
 , "eslint"
 , "eslint_d"
 , "emojione"
+, "fast-cli"
 , "fetch-bower"
 , "forever"
 , "git-run"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 1fca6530808..0e134c1cdc3 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -4,51 +4,6 @@
 
 let
   sources = {
-    "async-2.4.1" = {
-      name = "async";
-      packageName = "async";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz";
-        sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7";
-      };
-    };
-    "babel-core-6.25.0" = {
-      name = "babel-core";
-      packageName = "babel-core";
-      version = "6.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz";
-        sha1 = "7dd42b0463c742e9d5296deb3ec67a9322dad729";
-      };
-    };
-    "babel-traverse-6.25.0" = {
-      name = "babel-traverse";
-      packageName = "babel-traverse";
-      version = "6.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz";
-        sha1 = "2257497e2fcd19b89edc13c4c91381f9512496f1";
-      };
-    };
-    "babel-types-6.25.0" = {
-      name = "babel-types";
-      packageName = "babel-types";
-      version = "6.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz";
-        sha1 = "70afb248d5660e5d18f811d91c8303b54134a18e";
-      };
-    };
-    "babylon-6.17.3" = {
-      name = "babylon";
-      packageName = "babylon";
-      version = "6.17.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babylon/-/babylon-6.17.3.tgz";
-        sha1 = "1327d709950b558f204e5352587fd0290f8d8e48";
-      };
-    };
     "colors-0.6.0-1" = {
       name = "colors";
       packageName = "colors";
@@ -58,24 +13,6 @@ let
         sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a";
       };
     };
-    "commander-0.6.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
-        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
-      };
-    };
-    "deasync-0.1.10" = {
-      name = "deasync";
-      packageName = "deasync";
-      version = "0.1.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.10.tgz";
-        sha1 = "4e4a6836fbe0477bd5f908308bd2a96557d5d7fe";
-      };
-    };
     "ejs-2.3.4" = {
       name = "ejs";
       packageName = "ejs";
@@ -85,13 +22,40 @@ let
         sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98";
       };
     };
-    "global-paths-0.1.2" = {
-      name = "global-paths";
-      packageName = "global-paths";
-      version = "0.1.2";
+    "pkginfo-0.2.2" = {
+      name = "pkginfo";
+      packageName = "pkginfo";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz";
-        sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299";
+        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz";
+        sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e";
+      };
+    };
+    "commander-0.6.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+      };
+    };
+    "wrench-1.3.9" = {
+      name = "wrench";
+      packageName = "wrench";
+      version = "1.3.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz";
+        sha1 = "6f13ec35145317eb292ca5f6531391b244111411";
+      };
+    };
+    "xmldom-0.1.19" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
+        sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
       };
     };
     "jsonlint-1.5.1" = {
@@ -103,6 +67,51 @@ let
         sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6";
       };
     };
+    "uglify-js-2.6.1" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
+        sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
+      };
+    };
+    "resolve-1.3.3" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz";
+        sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5";
+      };
+    };
+    "global-paths-0.1.2" = {
+      name = "global-paths";
+      packageName = "global-paths";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz";
+        sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299";
+      };
+    };
+    "source-map-0.1.9" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz";
+        sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599";
+      };
+    };
+    "xml2tss-0.0.5" = {
+      name = "xml2tss";
+      packageName = "xml2tss";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz";
+        sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e";
+      };
+    };
     "moment-2.17.1" = {
       name = "moment";
       packageName = "moment";
@@ -121,193 +130,76 @@ let
         sha1 = "3269bddf81c54535f408abc784c32b0d2bd55f6f";
       };
     };
-    "pkginfo-0.2.2" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.2.2";
+    "nomnom-1.8.1" = {
+      name = "nomnom";
+      packageName = "nomnom";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz";
-        sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e";
+        url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz";
+        sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7";
       };
     };
-    "resolve-1.3.3" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.3.3";
+    "JSV-4.0.2" = {
+      name = "JSV";
+      packageName = "JSV";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz";
-        sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5";
+        url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz";
+        sha1 = "d077f6825571f82132f9dffaed587b4029feff57";
       };
     };
-    "source-map-0.1.9" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.1.9";
+    "underscore-1.6.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz";
-        sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
       };
     };
-    "wrench-1.3.9" = {
-      name = "wrench";
-      packageName = "wrench";
-      version = "1.3.9";
+    "chalk-0.4.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz";
-        sha1 = "6f13ec35145317eb292ca5f6531391b244111411";
+        url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
+        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
       };
     };
-    "xml2tss-0.0.5" = {
-      name = "xml2tss";
-      packageName = "xml2tss";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz";
-        sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e";
-      };
-    };
-    "xmldom-0.1.19" = {
-      name = "xmldom";
-      packageName = "xmldom";
-      version = "0.1.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
-        sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
-      };
-    };
-    "lodash-4.17.4" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
-        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
-      };
-    };
-    "babel-code-frame-6.22.0" = {
-      name = "babel-code-frame";
-      packageName = "babel-code-frame";
-      version = "6.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz";
-        sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
-      };
-    };
-    "babel-generator-6.25.0" = {
-      name = "babel-generator";
-      packageName = "babel-generator";
-      version = "6.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz";
-        sha1 = "33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc";
-      };
-    };
-    "babel-helpers-6.24.1" = {
-      name = "babel-helpers";
-      packageName = "babel-helpers";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz";
-        sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
-      };
-    };
-    "babel-messages-6.23.0" = {
-      name = "babel-messages";
-      packageName = "babel-messages";
-      version = "6.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz";
-        sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
-      };
-    };
-    "babel-template-6.25.0" = {
-      name = "babel-template";
-      packageName = "babel-template";
-      version = "6.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz";
-        sha1 = "665241166b7c2aa4c619d71e192969552b10c071";
-      };
-    };
-    "babel-runtime-6.23.0" = {
-      name = "babel-runtime";
-      packageName = "babel-runtime";
-      version = "6.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz";
-        sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b";
-      };
-    };
-    "babel-register-6.24.1" = {
-      name = "babel-register";
-      packageName = "babel-register";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz";
-        sha1 = "7e10e13a2f71065bdfad5a1787ba45bca6ded75f";
-      };
-    };
-    "convert-source-map-1.5.0" = {
-      name = "convert-source-map";
-      packageName = "convert-source-map";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz";
-        sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5";
-      };
-    };
-    "debug-2.6.8" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
-        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
-      };
-    };
-    "json5-0.5.1" = {
-      name = "json5";
-      packageName = "json5";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
-        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
-      };
-    };
-    "minimatch-3.0.4" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
-      };
-    };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
-      };
-    };
-    "private-0.1.7" = {
-      name = "private";
-      packageName = "private";
+    "has-color-0.1.7" = {
+      name = "has-color";
+      packageName = "has-color";
       version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
-        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
+        url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
+        sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
       };
     };
-    "slash-1.0.0" = {
-      name = "slash";
-      packageName = "slash";
+    "ansi-styles-1.0.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
-        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
+        sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
+      };
+    };
+    "strip-ansi-0.1.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
+        sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
+      };
+    };
+    "async-0.2.10" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
     "source-map-0.5.6" = {
@@ -319,301 +211,148 @@ let
         sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
-    "chalk-1.1.3" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
-      };
-    };
-    "esutils-2.0.2" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
-        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
-      };
-    };
-    "js-tokens-3.0.1" = {
-      name = "js-tokens";
-      packageName = "js-tokens";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz";
-        sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7";
-      };
-    };
-    "ansi-styles-2.2.1" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
-        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
-      };
-    };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
-      };
-    };
-    "has-ansi-2.0.0" = {
-      name = "has-ansi";
-      packageName = "has-ansi";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
-        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
-      };
-    };
-    "strip-ansi-3.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
-      };
-    };
-    "supports-color-2.0.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
-        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
-      };
-    };
-    "ansi-regex-2.1.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
-      };
-    };
-    "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";
-      };
-    };
-    "jsesc-1.3.0" = {
-      name = "jsesc";
-      packageName = "jsesc";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz";
-        sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
-      };
-    };
-    "trim-right-1.0.1" = {
-      name = "trim-right";
-      packageName = "trim-right";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz";
-        sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
-      };
-    };
-    "repeating-2.0.1" = {
-      name = "repeating";
-      packageName = "repeating";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
-        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
-      };
-    };
-    "is-finite-1.0.2" = {
-      name = "is-finite";
-      packageName = "is-finite";
+    "uglify-to-browserify-1.0.2" = {
+      name = "uglify-to-browserify";
+      packageName = "uglify-to-browserify";
       version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
-    "core-js-2.4.1" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz";
-        sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e";
-      };
-    };
-    "regenerator-runtime-0.10.5" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.10.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
-        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
-      };
-    };
-    "home-or-tmp-2.0.0" = {
-      name = "home-or-tmp";
-      packageName = "home-or-tmp";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz";
-        sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
-      };
-    };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-      };
-    };
-    "source-map-support-0.4.15" = {
-      name = "source-map-support";
-      packageName = "source-map-support";
-      version = "0.4.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz";
-        sha1 = "03202df65c06d2bd8c7ec2362a193056fef8d3b1";
-      };
-    };
-    "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";
-      };
-    };
-    "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";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
-    "ms-2.0.0" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
-        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
-      };
-    };
-    "brace-expansion-1.1.8" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
-        sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
-      };
-    };
-    "balanced-match-1.0.0" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
-        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
-      };
-    };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
-    "globals-9.18.0" = {
-      name = "globals";
-      packageName = "globals";
-      version = "9.18.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a";
-      };
-    };
-    "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";
-      };
-    };
-    "loose-envify-1.3.1" = {
-      name = "loose-envify";
-      packageName = "loose-envify";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz";
-        sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
-      };
-    };
-    "to-fast-properties-1.0.3" = {
-      name = "to-fast-properties";
-      packageName = "to-fast-properties";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz";
-        sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47";
-      };
-    };
-    "bindings-1.2.1" = {
-      name = "bindings";
-      packageName = "bindings";
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
       version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
-        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
       };
     };
-    "nan-2.6.2" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.6.2";
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
-        sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    };
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    };
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    };
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    };
+    "wordwrap-0.0.2" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    };
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    };
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    };
+    "kind-of-3.2.2" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz";
+        sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
+      };
+    };
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    };
+    "repeat-string-1.6.1" = {
+      name = "repeat-string";
+      packageName = "repeat-string";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+      };
+    };
+    "is-buffer-1.1.5" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
+        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
+      };
+    };
+    "path-parse-1.0.5" = {
+      name = "path-parse";
+      packageName = "path-parse";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz";
+        sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
       };
     };
     "array-unique-0.2.1" = {
@@ -706,87 +445,6 @@ let
         sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
-    "nomnom-1.8.1" = {
-      name = "nomnom";
-      packageName = "nomnom";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz";
-        sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7";
-      };
-    };
-    "JSV-4.0.2" = {
-      name = "JSV";
-      packageName = "JSV";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz";
-        sha1 = "d077f6825571f82132f9dffaed587b4029feff57";
-      };
-    };
-    "underscore-1.6.0" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
-        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
-      };
-    };
-    "chalk-0.4.0" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
-        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
-      };
-    };
-    "has-color-0.1.7" = {
-      name = "has-color";
-      packageName = "has-color";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
-        sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
-      };
-    };
-    "ansi-styles-1.0.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
-        sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
-      };
-    };
-    "strip-ansi-0.1.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
-        sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
-      };
-    };
-    "is-0.3.0" = {
-      name = "is";
-      packageName = "is";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz";
-        sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7";
-      };
-    };
-    "path-parse-1.0.5" = {
-      name = "path-parse";
-      packageName = "path-parse";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz";
-        sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
-      };
-    };
     "amdefine-1.0.1" = {
       name = "amdefine";
       packageName = "amdefine";
@@ -814,6 +472,15 @@ let
         sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
       };
     };
+    "is-0.3.0" = {
+      name = "is";
+      packageName = "is";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz";
+        sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7";
+      };
+    };
     "adal-node-0.1.21" = {
       name = "adal-node";
       packageName = "adal-node";
@@ -1516,15 +1183,6 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
-    "wordwrap-0.0.2" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
-        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
-      };
-    };
     "xml2js-0.1.14" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -1606,13 +1264,13 @@ let
         sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
       };
     };
-    "safe-buffer-5.1.0" = {
+    "safe-buffer-5.1.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.1.0";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz";
-        sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
+        sha1 = "893312af69b2123def71f57889001671eeb2c853";
       };
     };
     "buffer-equal-constant-time-1.0.1" = {
@@ -1687,40 +1345,40 @@ let
         sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea";
       };
     };
-    "ms-rest-2.2.0" = {
+    "ms-rest-2.2.1" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.0.tgz";
-        sha1 = "5f2507522f1585e26666815588dbacbcec7fb79f";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.1.tgz";
+        sha1 = "652f09dee89c115e5b672bd3de4d16dcc7961377";
       };
     };
-    "ms-rest-azure-2.1.2" = {
+    "ms-rest-azure-2.2.1" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "2.1.2";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.1.2.tgz";
-        sha1 = "9774b1d4141c8a3a250ae5da36fc2654542be738";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.1.tgz";
+        sha1 = "ca9a9fb492b1fe1a41ca8e472edc1dd0922323e6";
       };
     };
-    "@types/node-7.0.31" = {
+    "@types/node-7.0.36" = {
       name = "@types/node";
       packageName = "@types/node";
-      version = "7.0.31";
+      version = "7.0.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-7.0.31.tgz";
-        sha1 = "80ea4d175599b2a00149c29a10a4eb2dff592e86";
+        url = "https://registry.npmjs.org/@types/node/-/node-7.0.36.tgz";
+        sha1 = "54286fcce8a4f7498cea1ec5fce5f5edd3521948";
       };
     };
-    "@types/request-0.0.42" = {
+    "@types/request-0.0.45" = {
       name = "@types/request";
       packageName = "@types/request";
-      version = "0.0.42";
+      version = "0.0.45";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-0.0.42.tgz";
-        sha1 = "e47a53bf0b130464854fb693297746a0c0479c31";
+        url = "https://registry.npmjs.org/@types/request/-/request-0.0.45.tgz";
+        sha1 = "c6e52be8b108eb035c35aa9af56a38a260c3e7e6";
       };
     };
     "@types/uuid-2.0.30" = {
@@ -1732,15 +1390,6 @@ let
         sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5";
       };
     };
-    "is-buffer-1.1.5" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "1.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
-        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
-      };
-    };
     "is-stream-1.1.0" = {
       name = "is-stream";
       packageName = "is-stream";
@@ -2065,15 +1714,6 @@ let
         sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
       };
     };
-    "async-0.2.10" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
-        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
-      };
-    };
     "deep-equal-1.0.1" = {
       name = "deep-equal";
       packageName = "deep-equal";
@@ -2092,6 +1732,15 @@ let
         sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5";
       };
     };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
     "ncp-0.4.2" = {
       name = "ncp";
       packageName = "ncp";
@@ -2110,6 +1759,15 @@ let
         sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d";
       };
     };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
     "glob-7.1.2" = {
       name = "glob";
       packageName = "glob";
@@ -2137,6 +1795,15 @@ let
         sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
       };
     };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+      };
+    };
     "once-1.4.0" = {
       name = "once";
       packageName = "once";
@@ -2146,6 +1813,15 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
     "wrappy-1.0.2" = {
       name = "wrappy";
       packageName = "wrappy";
@@ -2155,6 +1831,33 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
+    "brace-expansion-1.1.8" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
+        sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
     "colors-0.6.2" = {
       name = "colors";
       packageName = "colors";
@@ -2380,13 +2083,40 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "commander-2.9.0" = {
+    "async-2.5.0" = {
+      name = "async";
+      packageName = "async";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz";
+        sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d";
+      };
+    };
+    "lodash-4.17.4" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
+        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
+      };
+    };
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    };
+    "commander-2.11.0" = {
       name = "commander";
       packageName = "commander";
-      version = "2.9.0";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
-        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+        url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
+        sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563";
       };
     };
     "is-my-json-valid-2.16.0" = {
@@ -2407,13 +2137,58 @@ let
         sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
       };
     };
-    "graceful-readlink-1.0.1" = {
-      name = "graceful-readlink";
-      packageName = "graceful-readlink";
-      version = "1.0.1";
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
-        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    };
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    };
+    "has-ansi-2.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+    };
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    };
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    };
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
     "generate-function-2.0.0" = {
@@ -2731,31 +2506,22 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.11" = {
+    "readable-stream-2.3.3" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.11";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz";
-        sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
+        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
       };
     };
-    "safe-buffer-5.0.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
-      };
-    };
-    "string_decoder-1.0.2" = {
+    "string_decoder-1.0.3" = {
       name = "string_decoder";
       packageName = "string_decoder";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz";
-        sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
+        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
       };
     };
     "http-basic-2.5.1" = {
@@ -2767,22 +2533,31 @@ let
         sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb";
       };
     };
-    "promise-7.3.0" = {
+    "promise-7.3.1" = {
       name = "promise";
       packageName = "promise";
-      version = "7.3.0";
+      version = "7.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/promise/-/promise-7.3.0.tgz";
-        sha1 = "e7feec5aa87a2cbb81acf47d9a3adbd9d4642d7b";
+        url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
+        sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
       };
     };
-    "asap-2.0.5" = {
+    "asap-2.0.6" = {
       name = "asap";
       packageName = "asap";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz";
-        sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
+        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
+        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
+      };
+    };
+    "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" = {
@@ -2992,13 +2767,13 @@ let
         sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
       };
     };
-    "mime-db-1.28.0" = {
+    "mime-db-1.29.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.28.0";
+      version = "1.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.28.0.tgz";
-        sha1 = "fedd349be06d2865b7fc57d837c6de4f17d7ac3c";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz";
+        sha1 = "48d26d235589651704ac5916ca06001914266878";
       };
     };
     "camelcase-keys-2.1.0" = {
@@ -3010,15 +2785,6 @@ let
         sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
       };
     };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
-      };
-    };
     "loud-rejection-1.6.0" = {
       name = "loud-rejection";
       packageName = "loud-rejection";
@@ -3046,13 +2812,13 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "normalize-package-data-2.3.8" = {
+    "normalize-package-data-2.4.0" = {
       name = "normalize-package-data";
       packageName = "normalize-package-data";
-      version = "2.3.8";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz";
-        sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb";
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
+        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
       };
     };
     "object-assign-4.1.1" = {
@@ -3127,13 +2893,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.4.2" = {
+    "hosted-git-info-2.5.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.4.2";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz";
-        sha1 = "0076b9f46a270506ddbaaea56496897460612a67";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
+        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3316,6 +3082,33 @@ let
         sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2";
       };
     };
+    "repeating-2.0.1" = {
+      name = "repeating";
+      packageName = "repeating";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
+        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
+      };
+    };
+    "is-finite-1.0.2" = {
+      name = "is-finite";
+      packageName = "is-finite";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+      };
+    };
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
     "get-stdin-4.0.1" = {
       name = "get-stdin";
       packageName = "get-stdin";
@@ -3379,6 +3172,33 @@ let
         sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1";
       };
     };
+    "debug-2.6.8" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
+        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "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";
@@ -3478,13 +3298,13 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "crypto-browserify-3.11.0" = {
+    "crypto-browserify-3.11.1" = {
       name = "crypto-browserify";
       packageName = "crypto-browserify";
-      version = "3.11.0";
+      version = "3.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz";
-        sha1 = "3652a0906ab9b2a7e0c3ce66a408e957a2485522";
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz";
+        sha1 = "948945efc6757a400d6e5e5af47194d10064279f";
       };
     };
     "defined-1.0.0" = {
@@ -3829,13 +3649,13 @@ let
         sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75";
       };
     };
-    "base64-js-1.2.0" = {
+    "base64-js-1.2.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz";
-        sha1 = "a39992d723584811982be5e290bb6a53d86700f1";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz";
+        sha1 = "a91947da1f4a516ea38e5b4ec0ec3773675e0886";
       };
     };
     "ieee754-1.1.8" = {
@@ -3973,13 +3793,13 @@ let
         sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
       };
     };
-    "cipher-base-1.0.3" = {
+    "cipher-base-1.0.4" = {
       name = "cipher-base";
       packageName = "cipher-base";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz";
-        sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07";
+        url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
+        sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de";
       };
     };
     "des.js-1.0.0" = {
@@ -4000,13 +3820,13 @@ let
         sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
       };
     };
-    "bn.js-4.11.6" = {
+    "bn.js-4.11.7" = {
       name = "bn.js";
       packageName = "bn.js";
-      version = "4.11.6";
+      version = "4.11.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz";
-        sha1 = "53344adb14617a13f6e8dd2ce28905d1c0ba3215";
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz";
+        sha1 = "ddb048e50d9482790094c13eb3fcfc833ce7ab46";
       };
     };
     "browserify-rsa-4.0.1" = {
@@ -4045,13 +3865,13 @@ let
         sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
       };
     };
-    "hash.js-1.0.3" = {
+    "hash.js-1.1.3" = {
       name = "hash.js";
       packageName = "hash.js";
-      version = "1.0.3";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz";
-        sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
+        url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz";
+        sha1 = "340dedbe6290187151c1ea1d777a3448935df846";
       };
     };
     "hmac-drbg-1.0.1" = {
@@ -4846,6 +4666,15 @@ let
         sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963";
       };
     };
+    "base64-js-1.2.0" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz";
+        sha1 = "a39992d723584811982be5e290bb6a53d86700f1";
+      };
+    };
     "xmlbuilder-8.2.2" = {
       name = "xmlbuilder";
       packageName = "xmlbuilder";
@@ -4954,13 +4783,13 @@ let
         sha1 = "8f8016ab74c415f274f4fb1943faaf7e92030eff";
       };
     };
-    "parse-torrent-file-4.0.2" = {
+    "parse-torrent-file-4.0.3" = {
       name = "parse-torrent-file";
       packageName = "parse-torrent-file";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.2.tgz";
-        sha1 = "981a22143832abbcd99052d889d31a39ae3f9bfe";
+        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz";
+        sha1 = "3e2ab0a464a803cc35d1357a1029d1cbd11dae37";
       };
     };
     "simple-get-2.6.0" = {
@@ -4990,13 +4819,13 @@ let
         sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
       };
     };
-    "bencode-0.11.0" = {
+    "bencode-1.0.0" = {
       name = "bencode";
       packageName = "bencode";
-      version = "0.11.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bencode/-/bencode-0.11.0.tgz";
-        sha1 = "7ea65d4ce00300393a43a92d5640b6fb0204dc64";
+        url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz";
+        sha1 = "0b83aea885b3547b579ada0c6a5e7739fe4d073e";
       };
     };
     "simple-sha1-2.1.0" = {
@@ -5431,13 +5260,13 @@ let
         sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
       };
     };
-    "k-rpc-socket-1.6.2" = {
+    "k-rpc-socket-1.7.1" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.6.2";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz";
-        sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.1.tgz";
+        sha1 = "e6e92a00b2c74906ad69c42b6ea213dce8914d95";
       };
     };
     "bencode-0.8.0" = {
@@ -5512,13 +5341,13 @@ let
         sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61";
       };
     };
-    "ipaddr.js-1.3.0" = {
+    "ipaddr.js-1.4.0" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz";
-        sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz";
+        sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0";
       };
     };
     "get-browser-rtc-1.0.2" = {
@@ -5539,6 +5368,15 @@ let
         sha1 = "6b94b3e447cb6a363f785eaf94af6359e8e81c80";
       };
     };
+    "safe-buffer-5.0.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
+      };
+    };
     "ultron-1.1.0" = {
       name = "ultron";
       packageName = "ultron";
@@ -5854,13 +5692,13 @@ let
         sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc";
       };
     };
-    "sax-1.2.2" = {
+    "sax-1.2.4" = {
       name = "sax";
       packageName = "sax";
-      version = "1.2.2";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz";
-        sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828";
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+        sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
       };
     };
     "xmlbuilder-4.2.1" = {
@@ -6313,13 +6151,13 @@ let
         sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c";
       };
     };
-    "acorn-5.0.3" = {
+    "acorn-5.1.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.0.3";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz";
-        sha1 = "c460df08491463f028ccb82eab3730bf01087b3d";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz";
+        sha1 = "53fe161111f912ab999ee887a90a0bc52822fd75";
       };
     };
     "foreach-2.0.5" = {
@@ -6430,13 +6268,13 @@ let
         sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
       };
     };
-    "compression-1.6.2" = {
+    "compression-1.7.0" = {
       name = "compression";
       packageName = "compression";
-      version = "1.6.2";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz";
-        sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3";
+        url = "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz";
+        sha1 = "030c9f198f1643a057d776a738e922da4373012d";
       };
     };
     "express-4.15.3" = {
@@ -6457,13 +6295,13 @@ let
         sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
       };
     };
-    "bytes-2.3.0" = {
+    "bytes-2.5.0" = {
       name = "bytes";
       packageName = "bytes";
-      version = "2.3.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz";
-        sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070";
+        url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz";
+        sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a";
       };
     };
     "compressible-2.0.10" = {
@@ -6475,15 +6313,6 @@ let
         sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd";
       };
     };
-    "debug-2.2.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
-      };
-    };
     "on-headers-1.0.1" = {
       name = "on-headers";
       packageName = "on-headers";
@@ -6511,15 +6340,6 @@ let
         sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
       };
     };
-    "ms-0.7.1" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
-      };
-    };
     "array-flatten-1.1.1" = {
       name = "array-flatten";
       packageName = "array-flatten";
@@ -6772,6 +6592,15 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
+    "ipaddr.js-1.3.0" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz";
+        sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec";
+      };
+    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -6835,13 +6664,13 @@ let
         sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
       };
     };
-    "read-package-json-2.0.5" = {
+    "read-package-json-2.0.10" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.5";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz";
-        sha1 = "f93a64e641529df68a08c64de46389e8a3f88845";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.10.tgz";
+        sha1 = "dc0229f6dde6b4b705b39e25b2d970ebe95685ae";
       };
     };
     "validate-npm-package-name-3.0.0" = {
@@ -7132,6 +6961,15 @@ let
         sha1 = "8e5f14be0bdaedb73e07200310aa416c27350fc4";
       };
     };
+    "normalize-package-data-2.3.8" = {
+      name = "normalize-package-data";
+      packageName = "normalize-package-data";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz";
+        sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb";
+      };
+    };
     "npm-cache-filename-1.0.2" = {
       name = "npm-cache-filename";
       packageName = "npm-cache-filename";
@@ -8321,6 +8159,24 @@ let
         sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
       };
     };
+    "bindings-1.2.1" = {
+      name = "bindings";
+      packageName = "bindings";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
+      };
+    };
+    "nan-2.6.2" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
+        sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
+      };
+    };
     "jsonparse-0.0.6" = {
       name = "jsonparse";
       packageName = "jsonparse";
@@ -8567,13 +8423,13 @@ let
         sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884";
       };
     };
-    "cors-2.8.3" = {
+    "cors-2.8.4" = {
       name = "cors";
       packageName = "cors";
-      version = "2.8.3";
+      version = "2.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz";
-        sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802";
+        url = "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz";
+        sha1 = "2bd381f2eb201020105cd50ea59da63090694686";
       };
     };
     "docker-parse-image-3.0.1" = {
@@ -9062,13 +8918,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.72.0" = {
+    "aws-sdk-2.84.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.72.0";
+      version = "2.84.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.72.0.tgz";
-        sha1 = "59021c14e354f34a4fb4f229ac10f8e36428f4d4";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.84.0.tgz";
+        sha1 = "c87bb05bc43bea681c115503f73a7e784c9bfeb6";
       };
     };
     "request-2.81.0" = {
@@ -9485,6 +9341,24 @@ let
         sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459";
       };
     };
+    "ajv-5.2.2" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "5.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz";
+        sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39";
+      };
+    };
+    "babel-code-frame-6.22.0" = {
+      name = "babel-code-frame";
+      packageName = "babel-code-frame";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz";
+        sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
+      };
+    };
     "doctrine-2.0.0" = {
       name = "doctrine";
       packageName = "doctrine";
@@ -9530,6 +9404,15 @@ let
         sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
       };
     };
+    "esutils-2.0.2" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+      };
+    };
     "file-entry-cache-2.0.0" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
@@ -9539,6 +9422,15 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
+    "globals-9.18.0" = {
+      name = "globals";
+      packageName = "globals";
+      version = "9.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
+        sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a";
+      };
+    };
     "ignore-3.3.3" = {
       name = "ignore";
       packageName = "ignore";
@@ -9548,13 +9440,13 @@ let
         sha1 = "432352e57accd87ab3110e82d3fea0e47812156d";
       };
     };
-    "inquirer-3.1.0" = {
+    "inquirer-3.2.0" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.1.0.tgz";
-        sha1 = "e05400d48b94937c2d3caa7038663ba9189aab01";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.0.tgz";
+        sha1 = "45b44c2160c729d7578c54060b3eed94487bb42b";
       };
     };
     "is-resolvable-1.0.0" = {
@@ -9566,13 +9458,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.8.4" = {
+    "js-yaml-3.9.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.8.4";
+      version = "3.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz";
-        sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz";
+        sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce";
       };
     };
     "levn-0.3.0" = {
@@ -9638,22 +9530,40 @@ let
         sha1 = "a8116c133fac2c61f4a420ab6cdf5c4d61f0e435";
       };
     };
-    "esrecurse-4.1.0" = {
-      name = "esrecurse";
-      packageName = "esrecurse";
-      version = "4.1.0";
+    "fast-deep-equal-1.0.0" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz";
-        sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz";
+        sha1 = "96256a3bc975595eb36d82e9929d060d893439ff";
       };
     };
-    "estraverse-4.1.1" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "4.1.1";
+    "json-schema-traverse-0.3.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz";
-        sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
+        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
+      };
+    };
+    "js-tokens-3.0.2" = {
+      name = "js-tokens";
+      packageName = "js-tokens";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz";
+        sha1 = "9866df395102130e38f7f996bceb65443209c25b";
+      };
+    };
+    "esrecurse-4.2.0" = {
+      name = "esrecurse";
+      packageName = "esrecurse";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz";
+        sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -9782,6 +9692,15 @@ let
         sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b";
       };
     };
+    "chalk-2.0.1" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz";
+        sha1 = "dbec49436d2ae15f536114e76d14656cdbc0f44d";
+      };
+    };
     "cli-cursor-2.1.0" = {
       name = "cli-cursor";
       packageName = "cli-cursor";
@@ -9845,13 +9764,67 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
-    "string-width-2.0.0" = {
+    "string-width-2.1.0" = {
       name = "string-width";
       packageName = "string-width";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz";
+        sha1 = "030664561fc146c9423ec7d978fe2457437fe6d0";
+      };
+    };
+    "strip-ansi-4.0.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
+        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+      };
+    };
+    "ansi-styles-3.1.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz";
+        sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750";
+      };
+    };
+    "supports-color-4.2.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz";
+        sha1 = "ad986dc7eb2315d009b4d77c8169c2231a684037";
+      };
+    };
+    "color-convert-1.9.0" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
+        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
+      };
+    };
+    "color-name-1.1.2" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
+        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
+      };
+    };
+    "has-flag-2.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz";
-        sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e";
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz";
+        sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
       };
     };
     "restore-cursor-2.0.0" = {
@@ -9917,6 +9890,15 @@ let
         sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
+    "ansi-regex-3.0.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
+        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+      };
+    };
     "tryit-1.0.3" = {
       name = "tryit";
       packageName = "tryit";
@@ -9935,13 +9917,13 @@ let
         sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86";
       };
     };
-    "esprima-3.1.3" = {
+    "esprima-4.0.0" = {
       name = "esprima";
       packageName = "esprima";
-      version = "3.1.3";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
+        sha1 = "4499eddcd1110e0b218bacf2fa7f7f59f55ca804";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -10034,13 +10016,13 @@ let
         sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
       };
     };
-    "eslint-3.19.0" = {
+    "eslint-4.2.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "3.19.0";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
-        sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
+        url = "https://registry.npmjs.org/eslint/-/eslint-4.2.0.tgz";
+        sha1 = "a2b3184111b198e02e9c7f3cca625a5e01c56b3d";
       };
     };
     "supports-color-3.2.3" = {
@@ -10052,132 +10034,6 @@ let
         sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6";
       };
     };
-    "escope-3.6.0" = {
-      name = "escope";
-      packageName = "escope";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz";
-        sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
-      };
-    };
-    "inquirer-0.12.0" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
-        sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e";
-      };
-    };
-    "pluralize-1.2.1" = {
-      name = "pluralize";
-      packageName = "pluralize";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz";
-        sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
-      };
-    };
-    "strip-bom-3.0.0" = {
-      name = "strip-bom";
-      packageName = "strip-bom";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
-        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
-      };
-    };
-    "table-3.8.3" = {
-      name = "table";
-      packageName = "table";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
-        sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
-      };
-    };
-    "es6-map-0.1.5" = {
-      name = "es6-map";
-      packageName = "es6-map";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
-        sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
-      };
-    };
-    "es6-weak-map-2.0.2" = {
-      name = "es6-weak-map";
-      packageName = "es6-weak-map";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz";
-        sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f";
-      };
-    };
-    "d-1.0.0" = {
-      name = "d";
-      packageName = "d";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz";
-        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
-      };
-    };
-    "es5-ext-0.10.23" = {
-      name = "es5-ext";
-      packageName = "es5-ext";
-      version = "0.10.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz";
-        sha1 = "7578b51be974207a5487821b56538c224e4e7b38";
-      };
-    };
-    "es6-iterator-2.0.1" = {
-      name = "es6-iterator";
-      packageName = "es6-iterator";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz";
-        sha1 = "8e319c9f0453bf575d374940a655920e59ca5512";
-      };
-    };
-    "es6-set-0.1.5" = {
-      name = "es6-set";
-      packageName = "es6-set";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz";
-        sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
-      };
-    };
-    "es6-symbol-3.1.1" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
-        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
-      };
-    };
-    "event-emitter-0.3.5" = {
-      name = "event-emitter";
-      packageName = "event-emitter";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
-        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
-      };
-    };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
-      };
-    };
     "has-flag-1.0.0" = {
       name = "has-flag";
       packageName = "has-flag";
@@ -10187,6 +10043,186 @@ let
         sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
       };
     };
+    "ora-1.3.0" = {
+      name = "ora";
+      packageName = "ora";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz";
+        sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a";
+      };
+    };
+    "phantomjs-prebuilt-2.1.14" = {
+      name = "phantomjs-prebuilt";
+      packageName = "phantomjs-prebuilt";
+      version = "2.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz";
+        sha1 = "d53d311fcfb7d1d08ddb24014558f1188c516da0";
+      };
+    };
+    "promise-phantom-3.1.6" = {
+      name = "promise-phantom";
+      packageName = "promise-phantom";
+      version = "3.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz";
+        sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
+      };
+    };
+    "zen-observable-0.5.2" = {
+      name = "zen-observable";
+      packageName = "zen-observable";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz";
+        sha1 = "845a1cfda804a13419ec8ec12343e1f4c45cd07a";
+      };
+    };
+    "cli-spinners-1.0.0" = {
+      name = "cli-spinners";
+      packageName = "cli-spinners";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.0.tgz";
+        sha1 = "ef987ed3d48391ac3dab9180b406a742180d6e6a";
+      };
+    };
+    "log-symbols-1.0.2" = {
+      name = "log-symbols";
+      packageName = "log-symbols";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz";
+        sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
+      };
+    };
+    "es6-promise-4.0.5" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz";
+        sha1 = "7882f30adde5b240ccfa7f7d78c548330951ae42";
+      };
+    };
+    "extract-zip-1.5.0" = {
+      name = "extract-zip";
+      packageName = "extract-zip";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz";
+        sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
+      };
+    };
+    "fs-extra-1.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+      };
+    };
+    "hasha-2.2.0" = {
+      name = "hasha";
+      packageName = "hasha";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
+        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
+      };
+    };
+    "kew-0.7.0" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
+        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
+      };
+    };
+    "request-progress-2.0.1" = {
+      name = "request-progress";
+      packageName = "request-progress";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
+        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
+      };
+    };
+    "concat-stream-1.5.0" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz";
+        sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611";
+      };
+    };
+    "mkdirp-0.5.0" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+        sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
+      };
+    };
+    "yauzl-2.4.1" = {
+      name = "yauzl";
+      packageName = "yauzl";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
+        sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
+      };
+    };
+    "fd-slicer-1.0.1" = {
+      name = "fd-slicer";
+      packageName = "fd-slicer";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
+        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+      };
+    };
+    "pend-1.2.0" = {
+      name = "pend";
+      packageName = "pend";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
+        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+      };
+    };
+    "throttleit-1.0.0" = {
+      name = "throttleit";
+      packageName = "throttleit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
+        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
+      };
+    };
+    "mkpath-1.0.0" = {
+      name = "mkpath";
+      packageName = "mkpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz";
+        sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d";
+      };
+    };
+    "node-phantom-simple-2.2.4" = {
+      name = "node-phantom-simple";
+      packageName = "node-phantom-simple";
+      version = "2.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz";
+        sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d";
+      };
+    };
     "glob-3.2.11" = {
       name = "glob";
       packageName = "glob";
@@ -10475,15 +10511,6 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "kind-of-3.2.2" = {
-      name = "kind-of";
-      packageName = "kind-of";
-      version = "3.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz";
-        sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
-      };
-    };
     "normalize-path-2.1.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
@@ -10520,13 +10547,13 @@ let
         sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145";
       };
     };
-    "arr-flatten-1.0.3" = {
+    "arr-flatten-1.1.0" = {
       name = "arr-flatten";
       packageName = "arr-flatten";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz";
-        sha1 = "a274ed85ac08849b6bd7847c4580745dc51adfb1";
+        url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
+        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
       };
     };
     "expand-range-1.8.2" = {
@@ -10592,15 +10619,6 @@ let
         sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c";
       };
     };
-    "repeat-string-1.6.1" = {
-      name = "repeat-string";
-      packageName = "repeat-string";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
-        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
-      };
-    };
     "is-number-3.0.0" = {
       name = "is-number";
       packageName = "is-number";
@@ -10727,13 +10745,13 @@ let
         sha1 = "db604112cb74e0d477554e9b505b17abddfab786";
       };
     };
-    "npmlog-4.1.0" = {
+    "npmlog-4.1.2" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.1.0";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz";
-        sha1 = "dc59bee85f64f00ed424efb2af0783df25d1c0b5";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
       };
     };
     "tar-pack-3.4.0" = {
@@ -10781,6 +10799,15 @@ let
         sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1";
       };
     };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    };
     "wide-align-1.1.2" = {
       name = "wide-align";
       packageName = "wide-align";
@@ -11070,6 +11097,15 @@ let
         sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
       };
     };
+    "graceful-readlink-1.0.1" = {
+      name = "graceful-readlink";
+      packageName = "graceful-readlink";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+      };
+    };
     "acorn-2.7.0" = {
       name = "acorn";
       packageName = "acorn";
@@ -11160,96 +11196,6 @@ let
         sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
       };
     };
-    "yargs-3.10.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
-        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
-      };
-    };
-    "uglify-to-browserify-1.0.2" = {
-      name = "uglify-to-browserify";
-      packageName = "uglify-to-browserify";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
-        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
-      };
-    };
-    "camelcase-1.2.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
-        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
-      };
-    };
-    "cliui-2.1.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
-        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
-      };
-    };
-    "window-size-0.1.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
-        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
-      };
-    };
-    "center-align-0.1.3" = {
-      name = "center-align";
-      packageName = "center-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
-        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
-      };
-    };
-    "right-align-0.1.3" = {
-      name = "right-align";
-      packageName = "right-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
-        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
-      };
-    };
-    "align-text-0.1.4" = {
-      name = "align-text";
-      packageName = "align-text";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
-        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
-      };
-    };
-    "lazy-cache-1.0.4" = {
-      name = "lazy-cache";
-      packageName = "lazy-cache";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
-        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
-      };
-    };
-    "longest-1.0.1" = {
-      name = "longest";
-      packageName = "longest";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
-        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
-      };
-    };
     "acorn-1.2.2" = {
       name = "acorn";
       packageName = "acorn";
@@ -11637,13 +11583,13 @@ let
         sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12";
       };
     };
-    "fined-1.0.2" = {
+    "fined-1.1.0" = {
       name = "fined";
       packageName = "fined";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz";
-        sha1 = "5b28424b760d7598960b7ef8480dff8ad3660e97";
+        url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz";
+        sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476";
       };
     };
     "flagged-respawn-0.3.2" = {
@@ -11718,31 +11664,40 @@ let
         sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449";
       };
     };
-    "lodash.assignwith-4.2.0" = {
-      name = "lodash.assignwith";
-      packageName = "lodash.assignwith";
-      version = "4.2.0";
+    "expand-tilde-2.0.2" = {
+      name = "expand-tilde";
+      packageName = "expand-tilde";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz";
-        sha1 = "127a97f02adc41751a954d24b0de17e100e038eb";
+        url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz";
+        sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
       };
     };
-    "lodash.isempty-4.4.0" = {
-      name = "lodash.isempty";
-      packageName = "lodash.isempty";
-      version = "4.4.0";
+    "is-plain-object-2.0.4" = {
+      name = "is-plain-object";
+      packageName = "is-plain-object";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz";
-        sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e";
+        url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
+        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
       };
     };
-    "lodash.pick-4.4.0" = {
-      name = "lodash.pick";
-      packageName = "lodash.pick";
-      version = "4.4.0";
+    "object.defaults-1.1.0" = {
+      name = "object.defaults";
+      packageName = "object.defaults";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz";
-        sha1 = "52f05610fff9ded422611441ed1fc123a03001b3";
+        url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz";
+        sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf";
+      };
+    };
+    "object.pick-1.2.0" = {
+      name = "object.pick";
+      packageName = "object.pick";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz";
+        sha1 = "b5392bee9782da6d9fb7d6afaf539779f1234c2b";
       };
     };
     "parse-filepath-1.0.1" = {
@@ -11754,6 +11709,42 @@ let
         sha1 = "159d6155d43904d16c10ef698911da1e91969b73";
       };
     };
+    "isobject-3.0.1" = {
+      name = "isobject";
+      packageName = "isobject";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz";
+        sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
+      };
+    };
+    "array-each-1.0.1" = {
+      name = "array-each";
+      packageName = "array-each";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz";
+        sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f";
+      };
+    };
+    "array-slice-1.0.0" = {
+      name = "array-slice";
+      packageName = "array-slice";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz";
+        sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f";
+      };
+    };
+    "for-own-1.0.0" = {
+      name = "for-own";
+      packageName = "for-own";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz";
+        sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b";
+      };
+    };
     "is-absolute-0.2.6" = {
       name = "is-absolute";
       packageName = "is-absolute";
@@ -12240,40 +12231,40 @@ let
         sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d";
       };
     };
-    "@reactivex/rxjs-5.4.1" = {
+    "@reactivex/rxjs-5.4.2" = {
       name = "@reactivex/rxjs";
       packageName = "@reactivex/rxjs";
-      version = "5.4.1";
+      version = "5.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.1.tgz";
-        sha1 = "e472c38c84eb411690f281253d3a93a3466ad041";
+        url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.2.tgz";
+        sha1 = "ab530dbbdab71071369828ef11c8d7ae558d5116";
       };
     };
-    "chai-4.0.2" = {
+    "chai-4.1.0" = {
       name = "chai";
       packageName = "chai";
-      version = "4.0.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chai/-/chai-4.0.2.tgz";
-        sha1 = "2f7327c4de6f385dd7787999e2ab02697a32b83b";
+        url = "https://registry.npmjs.org/chai/-/chai-4.1.0.tgz";
+        sha1 = "331a0391b55c3af8740ae9c3b7458bc1c3805e6d";
       };
     };
-    "chai-as-promised-7.0.0" = {
+    "chai-as-promised-7.1.1" = {
       name = "chai-as-promised";
       packageName = "chai-as-promised";
-      version = "7.0.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.0.0.tgz";
-        sha1 = "c87ee613eaa196766393da6fbb4052f112acf675";
+        url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz";
+        sha1 = "08645d825deb8696ee61725dbf590c012eb00ca0";
       };
     };
-    "fast-json-patch-1.2.2" = {
+    "fast-json-patch-2.0.3" = {
       name = "fast-json-patch";
       packageName = "fast-json-patch";
-      version = "1.2.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-1.2.2.tgz";
-        sha1 = "d377d97c6911dbdd2a1c80bfacda048a4f83bbf9";
+        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.3.tgz";
+        sha1 = "d17ab0b94d742ec200bef297a378b57368a47f09";
       };
     };
     "iterare-0.0.8" = {
@@ -12339,13 +12330,13 @@ let
         sha1 = "3d38321828231e434f287514959c37a82b629f42";
       };
     };
-    "vscode-jsonrpc-3.3.0" = {
+    "vscode-jsonrpc-3.3.1" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
-      version = "3.3.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.0.tgz";
-        sha1 = "03bdab0b10f04727ec3b8d403cd511a8a365b13d";
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz";
+        sha1 = "b7857be58b97af664a8cdd071c91891d6c7d6a67";
       };
     };
     "vscode-languageserver-3.3.0" = {
@@ -12510,6 +12501,15 @@ let
         sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4";
       };
     };
+    "express-urlrewrite-1.2.0" = {
+      name = "express-urlrewrite";
+      packageName = "express-urlrewrite";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.2.0.tgz";
+        sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb";
+      };
+    };
     "lodash-id-0.13.0" = {
       name = "lodash-id";
       packageName = "lodash-id";
@@ -12546,6 +12546,15 @@ let
         sha1 = "784ac7734e4a453a9c6e6e8680a9329275c8b687";
       };
     };
+    "please-upgrade-node-1.0.1" = {
+      name = "please-upgrade-node";
+      packageName = "please-upgrade-node";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-1.0.1.tgz";
+        sha1 = "f92dd3443d9797f5742510ea2fd205f811b3b1f7";
+      };
+    };
     "pluralize-3.1.0" = {
       name = "pluralize";
       packageName = "pluralize";
@@ -12618,6 +12627,15 @@ let
         sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
+    "path-to-regexp-1.7.0" = {
+      name = "path-to-regexp";
+      packageName = "path-to-regexp";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
+        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+      };
+    };
     "steno-0.4.4" = {
       name = "steno";
       packageName = "steno";
@@ -12879,6 +12897,15 @@ let
         sha1 = "694e8d20681bfe490282c8ab886be98f09f42fe7";
       };
     };
+    "core-js-2.4.1" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz";
+        sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e";
+      };
+    };
     "di-0.0.1" = {
       name = "di";
       packageName = "di";
@@ -12951,13 +12978,13 @@ let
         sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b";
       };
     };
-    "useragent-2.1.13" = {
+    "useragent-2.2.1" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.13";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz";
-        sha1 = "bba43e8aa24d5ceb83c2937473e102e21df74c10";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz";
+        sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e";
       };
     };
     "custom-event-1.0.1" = {
@@ -13320,6 +13347,15 @@ let
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
+    "debug-2.2.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+      };
+    };
     "json3-3.3.2" = {
       name = "json3";
       packageName = "json3";
@@ -13329,6 +13365,15 @@ let
         sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
       };
     };
+    "ms-0.7.1" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+      };
+    };
     "lru-cache-2.2.4" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -14004,6 +14049,15 @@ let
         sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
       };
     };
+    "convert-source-map-1.5.0" = {
+      name = "convert-source-map";
+      packageName = "convert-source-map";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz";
+        sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5";
+      };
+    };
     "express-2.5.11" = {
       name = "express";
       packageName = "express";
@@ -14130,6 +14184,15 @@ let
         sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
       };
     };
+    "commander-2.9.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+      };
+    };
     "debug-2.6.0" = {
       name = "debug";
       packageName = "debug";
@@ -14589,22 +14652,13 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "bcryptjs-2.4.0" = {
+    "bcryptjs-2.4.3" = {
       name = "bcryptjs";
       packageName = "bcryptjs";
-      version = "2.4.0";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz";
-        sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678";
-      };
-    };
-    "body-parser-1.15.2" = {
-      name = "body-parser";
-      packageName = "body-parser";
-      version = "1.15.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz";
-        sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67";
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz";
+        sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb";
       };
     };
     "cheerio-0.22.0" = {
@@ -14616,15 +14670,6 @@ let
         sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e";
       };
     };
-    "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";
-      };
-    };
     "cookie-parser-1.4.3" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -14634,13 +14679,13 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "cors-2.8.1" = {
+    "cors-2.8.3" = {
       name = "cors";
       packageName = "cors";
-      version = "2.8.1";
+      version = "2.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz";
-        sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383";
+        url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz";
+        sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802";
       };
     };
     "cron-1.2.1" = {
@@ -14652,31 +14697,13 @@ let
         sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
       };
     };
-    "express-4.14.0" = {
-      name = "express";
-      packageName = "express";
-      version = "4.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz";
-        sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66";
-      };
-    };
-    "follow-redirects-1.2.1" = {
+    "follow-redirects-1.2.4" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.2.1";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz";
-        sha1 = "796c716970df4fb0096165393545040f61b00f59";
-      };
-    };
-    "fs-extra-1.0.0" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
-        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz";
+        sha1 = "355e8f4d16876b43f577b0d5ce2668b9723214ea";
       };
     };
     "fs.notify-0.0.4" = {
@@ -14688,6 +14715,15 @@ let
         sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d";
       };
     };
+    "hash-sum-1.0.2" = {
+      name = "hash-sum";
+      packageName = "hash-sum";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz";
+        sha1 = "33b40777754c6432573c120cc3808bbd10d47f04";
+      };
+    };
     "i18next-1.10.6" = {
       name = "i18next";
       packageName = "i18next";
@@ -14697,31 +14733,40 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "js-yaml-3.7.0" = {
+    "js-yaml-3.8.4" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.7.0";
+      version = "3.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz";
+        sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6";
       };
     };
-    "jsonata-1.0.10" = {
+    "jsonata-1.2.6" = {
       name = "jsonata";
       packageName = "jsonata";
-      version = "1.0.10";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz";
-        sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96";
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz";
+        sha1 = "d44fea5a54145600c1a3875e942ab6727adbddb5";
       };
     };
-    "mqtt-2.2.1" = {
+    "mqtt-2.9.0" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "2.2.1";
+      version = "2.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz";
-        sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz";
+        sha1 = "379ceb787a52fc15cb8fc96d558a32c123f12a9d";
+      };
+    };
+    "multer-1.3.0" = {
+      name = "multer";
+      packageName = "multer";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz";
+        sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2";
       };
     };
     "mustache-2.3.0" = {
@@ -14733,13 +14778,13 @@ let
         sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
       };
     };
-    "oauth2orize-1.7.0" = {
+    "oauth2orize-1.8.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz";
-        sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.8.0.tgz";
+        sha1 = "f2ddc0115d635d0480746249c00f0ea1a9c51ba8";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -14769,22 +14814,22 @@ let
         sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
       };
     };
-    "uglify-js-2.7.5" = {
+    "uglify-js-3.0.20" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.5";
+      version = "3.0.20";
       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-3.0.20.tgz";
+        sha1 = "cb35b2bcfe478051b6f3282be8db4e4add49a1e5";
       };
     };
-    "when-3.7.7" = {
+    "when-3.7.8" = {
       name = "when";
       packageName = "when";
-      version = "3.7.7";
+      version = "3.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz";
-        sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
+        url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz";
+        sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82";
       };
     };
     "ws-1.1.1" = {
@@ -14841,33 +14886,6 @@ let
         sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
       };
     };
-    "http-errors-1.5.1" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
-        sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
-      };
-    };
-    "qs-6.2.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
-        sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
-      };
-    };
-    "setprototypeof-1.0.2" = {
-      name = "setprototypeof";
-      packageName = "setprototypeof";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
-        sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
-      };
-    };
     "css-select-1.2.0" = {
       name = "css-select";
       packageName = "css-select";
@@ -14958,6 +14976,15 @@ let
         sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5";
       };
     };
+    "lodash.pick-4.4.0" = {
+      name = "lodash.pick";
+      packageName = "lodash.pick";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz";
+        sha1 = "52f05610fff9ded422611441ed1fc123a03001b3";
+      };
+    };
     "lodash.reduce-4.6.0" = {
       name = "lodash.reduce";
       packageName = "lodash.reduce";
@@ -15030,51 +15057,6 @@ let
         sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90";
       };
     };
-    "content-disposition-0.5.1" = {
-      name = "content-disposition";
-      packageName = "content-disposition";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
-        sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
-      };
-    };
-    "finalhandler-0.5.0" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
-        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
-      };
-    };
-    "send-0.14.1" = {
-      name = "send";
-      packageName = "send";
-      version = "0.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
-        sha1 = "a954984325392f51532a7760760e459598c89f7a";
-      };
-    };
-    "serve-static-1.11.2" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz";
-        sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7";
-      };
-    };
-    "send-0.14.2" = {
-      name = "send";
-      packageName = "send";
-      version = "0.14.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz";
-        sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef";
-      };
-    };
     "retry-0.6.1" = {
       name = "retry";
       packageName = "retry";
@@ -15120,6 +15102,15 @@ let
         sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
       };
     };
+    "esprima-3.1.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+      };
+    };
     "commist-1.0.0" = {
       name = "commist";
       packageName = "commist";
@@ -15138,13 +15129,13 @@ let
         sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
       };
     };
-    "mqtt-packet-5.3.0" = {
+    "mqtt-packet-5.4.0" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "5.3.0";
+      version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz";
-        sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz";
+        sha1 = "387104c06aa68fbb9f8159d0c722dd5c3e45df22";
       };
     };
     "reinterval-1.1.0" = {
@@ -15156,13 +15147,13 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
-    "websocket-stream-3.3.3" = {
+    "websocket-stream-5.0.0" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
-      version = "3.3.3";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz";
-        sha1 = "361da5404a337e60cfbc29b4a46368762679df0b";
+        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.0.tgz";
+        sha1 = "1d1318f0576ce20a12555372108ae9418a403634";
       };
     };
     "leven-1.0.2" = {
@@ -15219,6 +15210,51 @@ let
         sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b";
       };
     };
+    "ws-3.0.0" = {
+      name = "ws";
+      packageName = "ws";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-3.0.0.tgz";
+        sha1 = "98ddb00056c8390cb751e7788788497f99103b6c";
+      };
+    };
+    "append-field-0.1.0" = {
+      name = "append-field";
+      packageName = "append-field";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz";
+        sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a";
+      };
+    };
+    "busboy-0.2.14" = {
+      name = "busboy";
+      packageName = "busboy";
+      version = "0.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz";
+        sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453";
+      };
+    };
+    "dicer-0.2.5" = {
+      name = "dicer";
+      packageName = "dicer";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
+        sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
+      };
+    };
+    "streamsearch-0.1.2" = {
+      name = "streamsearch";
+      packageName = "streamsearch";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+      };
+    };
     "feedparser-1.1.3" = {
       name = "feedparser";
       packageName = "feedparser";
@@ -16092,13 +16128,13 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "cacache-9.2.8" = {
+    "cacache-9.2.9" = {
       name = "cacache";
       packageName = "cacache";
-      version = "9.2.8";
+      version = "9.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz";
-        sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4";
+        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
+        sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd";
       };
     };
     "call-limit-1.1.0" = {
@@ -16137,6 +16173,15 @@ let
         sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
       };
     };
+    "libnpx-9.0.7" = {
+      name = "libnpx";
+      packageName = "libnpx";
+      version = "9.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.0.7.tgz";
+        sha1 = "e30e4d5d0cc21c849541441855d0d334d00b009b";
+      };
+    };
     "lodash._baseuniq-4.6.0" = {
       name = "lodash._baseuniq";
       packageName = "lodash._baseuniq";
@@ -16209,13 +16254,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-8.3.0" = {
+    "npm-registry-client-8.4.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "8.3.0";
+      version = "8.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz";
-        sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
+        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
       };
     };
     "npm-user-validate-1.0.0" = {
@@ -16236,13 +16281,13 @@ let
         sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
-    "pacote-2.7.36" = {
+    "pacote-2.7.38" = {
       name = "pacote";
       packageName = "pacote";
-      version = "2.7.36";
+      version = "2.7.38";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz";
-        sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c";
+        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz";
+        sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1";
       };
     };
     "promise-inflight-1.0.1" = {
@@ -16299,13 +16344,22 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
-    "update-notifier-2.1.0" = {
+    "update-notifier-2.2.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz";
-        sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz";
+        sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
+      };
+    };
+    "worker-farm-1.4.1" = {
+      name = "worker-farm";
+      packageName = "worker-farm";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz";
+        sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8";
       };
     };
     "write-file-atomic-2.1.0" = {
@@ -16344,6 +16398,105 @@ let
         sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093";
       };
     };
+    "dotenv-4.0.0" = {
+      name = "dotenv";
+      packageName = "dotenv";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz";
+        sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d";
+      };
+    };
+    "yargs-8.0.2" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "8.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
+        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    };
+    "os-locale-2.0.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz";
+        sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4";
+      };
+    };
+    "read-pkg-up-2.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+      };
+    };
+    "which-module-2.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    };
+    "yargs-parser-7.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
+        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
+      };
+    };
+    "read-pkg-2.0.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+      };
+    };
+    "load-json-file-2.0.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+      };
+    };
+    "path-type-2.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+      };
+    };
+    "strip-bom-3.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+      };
+    };
     "lodash._createset-4.0.3" = {
       name = "lodash._createset";
       packageName = "lodash._createset";
@@ -16416,22 +16569,22 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "make-fetch-happen-2.4.12" = {
+    "make-fetch-happen-2.4.13" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "2.4.12";
+      version = "2.4.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz";
-        sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.13.tgz";
+        sha1 = "3139ba2f4230a8384e7ba394534816c872ecbf4b";
       };
     };
-    "npm-pick-manifest-1.0.3" = {
+    "npm-pick-manifest-1.0.4" = {
       name = "npm-pick-manifest";
       packageName = "npm-pick-manifest";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.3.tgz";
-        sha1 = "a56fed120b2d8adaec5334ddd07cf23b2389e8de";
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
+        sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8";
       };
     };
     "promise-retry-1.1.1" = {
@@ -16461,13 +16614,13 @@ let
         sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20";
       };
     };
-    "agentkeepalive-3.2.0" = {
+    "agentkeepalive-3.3.0" = {
       name = "agentkeepalive";
       packageName = "agentkeepalive";
-      version = "3.2.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz";
-        sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd";
+        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
+        sha1 = "6d5de5829afd3be2712201a39275fd11c651857c";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -16479,22 +16632,22 @@ let
         sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72";
       };
     };
-    "http-proxy-agent-1.0.0" = {
+    "http-proxy-agent-2.0.0" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz";
-        sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a";
+        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz";
+        sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4";
       };
     };
-    "https-proxy-agent-1.0.0" = {
+    "https-proxy-agent-2.0.0" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz";
-        sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz";
+        sha1 = "ffaa4b6faf586ac340c18a140431e76b7d7f2944";
       };
     };
     "node-fetch-npm-2.0.1" = {
@@ -16506,13 +16659,13 @@ let
         sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465";
       };
     };
-    "socks-proxy-agent-2.1.1" = {
+    "socks-proxy-agent-3.0.0" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
-      version = "2.1.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz";
-        sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3";
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz";
+        sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -16524,22 +16677,31 @@ let
         sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
       };
     };
-    "agent-base-2.1.1" = {
+    "agent-base-4.1.0" = {
       name = "agent-base";
       packageName = "agent-base";
-      version = "2.1.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz";
-        sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.0.tgz";
+        sha1 = "20e17401cd49b3c076bf56a4bc6c5b436ffa8d55";
       };
     };
-    "semver-5.0.3" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.0.3";
+    "es6-promisify-5.0.0" = {
+      name = "es6-promisify";
+      packageName = "es6-promisify";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
-        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
+        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
+        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
+      };
+    };
+    "es6-promise-4.1.1" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
+        sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a";
       };
     };
     "socks-1.1.10" = {
@@ -16596,13 +16758,13 @@ let
         sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
       };
     };
-    "boxen-1.1.0" = {
+    "boxen-1.2.0" = {
       name = "boxen";
       packageName = "boxen";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz";
-        sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz";
+        sha1 = "03478d84be7fe02189b80904d81d6a80384368f1";
       };
     };
     "configstore-3.1.0" = {
@@ -16614,6 +16776,15 @@ let
         sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1";
       };
     };
+    "import-lazy-2.1.0" = {
+      name = "import-lazy";
+      packageName = "import-lazy";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz";
+        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
+      };
+    };
     "latest-version-3.1.0" = {
       name = "latest-version";
       packageName = "latest-version";
@@ -16623,15 +16794,6 @@ let
         sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
       };
     };
-    "lazy-req-2.0.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
-        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
-      };
-    };
     "xdg-basedir-3.0.0" = {
       name = "xdg-basedir";
       packageName = "xdg-basedir";
@@ -16650,58 +16812,49 @@ let
         sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
       };
     };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
-      };
-    };
-    "term-size-0.1.1" = {
+    "term-size-1.2.0" = {
       name = "term-size";
       packageName = "term-size";
-      version = "0.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz";
-        sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca";
+        url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz";
+        sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
-    "execa-0.4.0" = {
+    "execa-0.7.0" = {
       name = "execa";
       packageName = "execa";
-      version = "0.4.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz";
-        sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3";
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
       };
     };
-    "cross-spawn-async-2.2.5" = {
-      name = "cross-spawn-async";
-      packageName = "cross-spawn-async";
-      version = "2.2.5";
+    "cross-spawn-5.1.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz";
-        sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc";
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
       };
     };
-    "npm-run-path-1.0.0" = {
-      name = "npm-run-path";
-      packageName = "npm-run-path";
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz";
-        sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f";
-      };
-    };
-    "path-key-1.0.0" = {
-      name = "path-key";
-      packageName = "path-key";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz";
-        sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af";
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
       };
     };
     "unique-string-1.0.0" = {
@@ -16983,22 +17136,22 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.34.4" = {
+    "snyk-1.36.2" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.34.4";
+      version = "1.36.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.34.4.tgz";
-        sha1 = "9f0d50ab4f0544b125fa21c67dd162de1e7ce91b";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.36.2.tgz";
+        sha1 = "88be72a8da75a02e920f2be7f5830402b5e0eb41";
       };
     };
-    "spawn-please-0.2.0" = {
+    "spawn-please-0.3.0" = {
       name = "spawn-please";
       packageName = "spawn-please";
-      version = "0.2.0";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.2.0.tgz";
-        sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
+        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz";
+        sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11";
       };
     };
     "aproba-1.0.4" = {
@@ -17064,6 +17217,42 @@ let
         sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9";
       };
     };
+    "es6-symbol-3.1.1" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
+        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
+      };
+    };
+    "d-1.0.0" = {
+      name = "d";
+      packageName = "d";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz";
+        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
+      };
+    };
+    "es5-ext-0.10.24" = {
+      name = "es5-ext";
+      packageName = "es5-ext";
+      version = "0.10.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz";
+        sha1 = "a55877c9924bc0c8d9bd3c2cbe17495ac1709b14";
+      };
+    };
+    "es6-iterator-2.0.1" = {
+      name = "es6-iterator";
+      packageName = "es6-iterator";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz";
+        sha1 = "8e319c9f0453bf575d374940a655920e59ca5512";
+      };
+    };
     "form-data-2.0.0" = {
       name = "form-data";
       packageName = "form-data";
@@ -17100,6 +17289,15 @@ let
         sha1 = "f27aec2498b24027ac719214026521591111508f";
       };
     };
+    "snyk-gradle-plugin-1.0.2" = {
+      name = "snyk-gradle-plugin";
+      packageName = "snyk-gradle-plugin";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.0.2.tgz";
+        sha1 = "364550d5f388673400296d3ab31df358c678bb9e";
+      };
+    };
     "snyk-module-1.8.1" = {
       name = "snyk-module";
       packageName = "snyk-module";
@@ -17109,6 +17307,15 @@ let
         sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca";
       };
     };
+    "snyk-mvn-plugin-1.0.0" = {
+      name = "snyk-mvn-plugin";
+      packageName = "snyk-mvn-plugin";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.0.tgz";
+        sha1 = "99ae297b7ae40fa8df78a39fa13816dc513c2d10";
+      };
+    };
     "snyk-policy-1.7.1" = {
       name = "snyk-policy";
       packageName = "snyk-policy";
@@ -17118,13 +17325,13 @@ let
         sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
       };
     };
-    "snyk-python-plugin-1.0.0" = {
+    "snyk-python-plugin-1.2.2" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.0.0";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.0.0.tgz";
-        sha1 = "d3915fbd933305d9988d86a56a7381e73c4565f7";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.2.tgz";
+        sha1 = "296948cba5ac80d2ce178a5cb7ecfcff88fdf263";
       };
     };
     "snyk-recursive-readdir-2.0.0" = {
@@ -17154,6 +17361,15 @@ let
         sha1 = "13743a058437dff890baaf437c333c966a743cb6";
       };
     };
+    "snyk-sbt-plugin-1.0.2" = {
+      name = "snyk-sbt-plugin";
+      packageName = "snyk-sbt-plugin";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.0.2.tgz";
+        sha1 = "ce2aa9a3b08af6680d5ee8a007ecb6ae55fb72d1";
+      };
+    };
     "snyk-tree-1.0.0" = {
       name = "snyk-tree";
       packageName = "snyk-tree";
@@ -17226,6 +17442,60 @@ let
         sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181";
       };
     };
+    "clone-deep-0.3.0" = {
+      name = "clone-deep";
+      packageName = "clone-deep";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz";
+        sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8";
+      };
+    };
+    "shallow-clone-0.1.2" = {
+      name = "shallow-clone";
+      packageName = "shallow-clone";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz";
+        sha1 = "5909e874ba77106d73ac414cfec1ffca87d97060";
+      };
+    };
+    "kind-of-2.0.1" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz";
+        sha1 = "018ec7a4ce7e3a86cb9141be519d24c8faa981b5";
+      };
+    };
+    "lazy-cache-0.2.7" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "0.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz";
+        sha1 = "7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65";
+      };
+    };
+    "mixin-object-2.0.1" = {
+      name = "mixin-object";
+      packageName = "mixin-object";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz";
+        sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e";
+      };
+    };
+    "for-in-0.1.8" = {
+      name = "for-in";
+      packageName = "for-in";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz";
+        sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1";
+      };
+    };
     "minimatch-3.0.2" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -17454,33 +17724,6 @@ let
         sha1 = "07e30ad79531844179b642d2d8399435182c8727";
       };
     };
-    "busboy-0.2.14" = {
-      name = "busboy";
-      packageName = "busboy";
-      version = "0.2.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz";
-        sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453";
-      };
-    };
-    "dicer-0.2.5" = {
-      name = "dicer";
-      packageName = "dicer";
-      version = "0.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
-        sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
-      };
-    };
-    "streamsearch-0.1.2" = {
-      name = "streamsearch";
-      packageName = "streamsearch";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
-        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
-      };
-    };
     "object.assign-4.0.4" = {
       name = "object.assign";
       packageName = "object.assign";
@@ -17770,6 +18013,15 @@ let
         sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e";
       };
     };
+    "winreg-1.2.3" = {
+      name = "winreg";
+      packageName = "winreg";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz";
+        sha1 = "93ad116b2696da87d58f7265a8fcea5254a965d5";
+      };
+    };
     "airplay-protocol-2.0.2" = {
       name = "airplay-protocol";
       packageName = "airplay-protocol";
@@ -17995,24 +18247,6 @@ let
         sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94";
       };
     };
-    "fd-slicer-1.0.1" = {
-      name = "fd-slicer";
-      packageName = "fd-slicer";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
-        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
-      };
-    };
-    "pend-1.2.0" = {
-      name = "pend";
-      packageName = "pend";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
-        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
-      };
-    };
     "engine.io-1.8.4" = {
       name = "engine.io";
       packageName = "engine.io";
@@ -18040,33 +18274,6 @@ let
         sha1 = "9fe85dee25853ca6babe25bd2ad68710863e91c2";
       };
     };
-    "extract-zip-1.5.0" = {
-      name = "extract-zip";
-      packageName = "extract-zip";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz";
-        sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
-      };
-    };
-    "hasha-2.2.0" = {
-      name = "hasha";
-      packageName = "hasha";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
-        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
-      };
-    };
-    "kew-0.7.0" = {
-      name = "kew";
-      packageName = "kew";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
-        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
-      };
-    };
     "request-2.67.0" = {
       name = "request";
       packageName = "request";
@@ -18076,42 +18283,6 @@ let
         sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
       };
     };
-    "request-progress-2.0.1" = {
-      name = "request-progress";
-      packageName = "request-progress";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
-        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
-      };
-    };
-    "concat-stream-1.5.0" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz";
-        sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611";
-      };
-    };
-    "mkdirp-0.5.0" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
-        sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
-      };
-    };
-    "yauzl-2.4.1" = {
-      name = "yauzl";
-      packageName = "yauzl";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
-        sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
-      };
-    };
     "bl-1.0.3" = {
       name = "bl";
       packageName = "bl";
@@ -18139,15 +18310,6 @@ let
         sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
       };
     };
-    "throttleit-1.0.0" = {
-      name = "throttleit";
-      packageName = "throttleit";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
-        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
-      };
-    };
     "commoner-0.10.8" = {
       name = "commoner";
       packageName = "commoner";
@@ -18166,6 +18328,15 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
+    "private-0.1.7" = {
+      name = "private";
+      packageName = "private";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
+        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
+      };
+    };
     "recast-0.11.23" = {
       name = "recast";
       packageName = "recast";
@@ -19139,13 +19310,22 @@ let
         sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
       };
     };
-    "coa-1.0.3" = {
+    "coa-1.0.4" = {
       name = "coa";
       packageName = "coa";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz";
-        sha1 = "1b54a5e1dcf77c990455d4deea98c564416dc893";
+        url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz";
+        sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd";
+      };
+    };
+    "js-yaml-3.7.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
       };
     };
     "whet.extend-0.9.9" = {
@@ -19211,6 +19391,15 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
+    "async-2.4.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz";
+        sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7";
+      };
+    };
     "blueimp-md5-2.7.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
@@ -19337,6 +19526,15 @@ let
         sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
       };
     };
+    "npm-registry-client-8.3.0" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "8.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz";
+        sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f";
+      };
+    };
     "octicons-3.5.0" = {
       name = "octicons";
       packageName = "octicons";
@@ -19382,6 +19580,15 @@ let
         sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3";
       };
     };
+    "superagent-3.5.2" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "3.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz";
+        sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8";
+      };
+    };
     "winston-2.3.1" = {
       name = "winston";
       packageName = "winston";
@@ -19391,24 +19598,6 @@ let
         sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "yargs-8.0.2" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "8.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
-        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
-      };
-    };
-    "color-convert-1.9.0" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
-        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
-      };
-    };
     "color-string-1.5.2" = {
       name = "color-string";
       packageName = "color-string";
@@ -19418,15 +19607,6 @@ let
         sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9";
       };
     };
-    "color-name-1.1.2" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
-        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
-      };
-    };
     "simple-swizzle-0.2.2" = {
       name = "simple-swizzle";
       packageName = "simple-swizzle";
@@ -19445,6 +19625,15 @@ let
         sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
       };
     };
+    "diff-3.3.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz";
+        sha1 = "056695150d7aa93237ca7e378ac3b1682b7963b9";
+      };
+    };
     "hogan.js-3.0.2" = {
       name = "hogan.js";
       packageName = "hogan.js";
@@ -19598,6 +19787,15 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
+    "hosted-git-info-2.4.2" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz";
+        sha1 = "0076b9f46a270506ddbaaea56496897460612a67";
+      };
+    };
     "npm-registry-client-8.1.1" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
@@ -19607,6 +19805,33 @@ let
         sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf";
       };
     };
+    "readable-stream-2.2.11" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz";
+        sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72";
+      };
+    };
+    "update-notifier-2.1.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz";
+        sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
+      };
+    };
+    "lazy-req-2.0.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
+        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
+      };
+    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -19643,67 +19868,22 @@ let
         sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa";
       };
     };
-    "os-locale-2.0.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "2.0.0";
+    "cookiejar-2.1.1" = {
+      name = "cookiejar";
+      packageName = "cookiejar";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz";
-        sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4";
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz";
+        sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
       };
     };
-    "read-pkg-up-2.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "2.0.0";
+    "form-data-2.2.0" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
-      };
-    };
-    "which-module-2.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
-        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
-      };
-    };
-    "yargs-parser-7.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
-        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
-      };
-    };
-    "read-pkg-2.0.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
-        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
-      };
-    };
-    "load-json-file-2.0.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
-        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
-      };
-    };
-    "path-type-2.0.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
-        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.2.0.tgz";
+        sha1 = "9a5e3b9295f980b2623cf64fa238b14cebca707b";
       };
     };
     "adm-zip-0.4.7" = {
@@ -19760,13 +19940,31 @@ let
         sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4";
       };
     };
-    "enhanced-resolve-3.1.0" = {
+    "ajv-keywords-2.1.0" = {
+      name = "ajv-keywords";
+      packageName = "ajv-keywords";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz";
+        sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0";
+      };
+    };
+    "enhanced-resolve-3.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "3.1.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz";
-        sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz";
+        sha1 = "950964ecc7f0332a42321b673b38dc8ff15535b3";
+      };
+    };
+    "escope-3.6.0" = {
+      name = "escope";
+      packageName = "escope";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz";
+        sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
       };
     };
     "json-loader-0.5.4" = {
@@ -19778,6 +19976,15 @@ let
         sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de";
       };
     };
+    "json5-0.5.1" = {
+      name = "json5";
+      packageName = "json5";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+      };
+    };
     "loader-runner-2.3.0" = {
       name = "loader-runner";
       packageName = "loader-runner";
@@ -19787,13 +19994,13 @@ let
         sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2";
       };
     };
-    "loader-utils-0.2.17" = {
+    "loader-utils-1.1.0" = {
       name = "loader-utils";
       packageName = "loader-utils";
-      version = "0.2.17";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz";
-        sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348";
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz";
+        sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd";
       };
     };
     "memory-fs-0.4.1" = {
@@ -19814,6 +20021,15 @@ let
         sha1 = "a3a59ec97024985b46e958379646f96c4b616646";
       };
     };
+    "uglifyjs-webpack-plugin-0.4.6" = {
+      name = "uglifyjs-webpack-plugin";
+      packageName = "uglifyjs-webpack-plugin";
+      version = "0.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz";
+        sha1 = "b951f4abb6bd617e66f63eb891498e391763e309";
+      };
+    };
     "watchpack-1.3.1" = {
       name = "watchpack";
       packageName = "watchpack";
@@ -19823,13 +20039,49 @@ let
         sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87";
       };
     };
-    "webpack-sources-0.2.3" = {
+    "webpack-sources-1.0.1" = {
       name = "webpack-sources";
       packageName = "webpack-sources";
-      version = "0.2.3";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz";
-        sha1 = "17c62bfaf13c707f9d02c479e0dcdde8380697fb";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz";
+        sha1 = "c7356436a4d13123be2e2426a05d1dad9cbe65cf";
+      };
+    };
+    "es6-map-0.1.5" = {
+      name = "es6-map";
+      packageName = "es6-map";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
+        sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
+      };
+    };
+    "es6-weak-map-2.0.2" = {
+      name = "es6-weak-map";
+      packageName = "es6-weak-map";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz";
+        sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f";
+      };
+    };
+    "es6-set-0.1.5" = {
+      name = "es6-set";
+      packageName = "es6-set";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz";
+        sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
+      };
+    };
+    "event-emitter-0.3.5" = {
+      name = "event-emitter";
+      packageName = "event-emitter";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
+        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
       };
     };
     "big.js-3.1.3" = {
@@ -19877,22 +20129,22 @@ let
         sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
       };
     };
-    "source-list-map-1.1.2" = {
+    "source-list-map-2.0.0" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "1.1.2";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz";
-        sha1 = "9889019d1024cce55cdc069498337ef6186a11a1";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz";
+        sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085";
       };
     };
-    "bytes-2.5.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "2.5.0";
+    "babel-runtime-6.23.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.23.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz";
-        sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a";
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz";
+        sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b";
       };
     };
     "death-1.1.0" = {
@@ -19904,13 +20156,22 @@ let
         sha1 = "01aa9c401edd92750514470b8266390c66c67318";
       };
     };
-    "gunzip-maybe-1.4.0" = {
+    "gunzip-maybe-1.4.1" = {
       name = "gunzip-maybe";
       packageName = "gunzip-maybe";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.0.tgz";
-        sha1 = "7d8316c8d0571e1d08a5a79e46fff0afe8172b19";
+        url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz";
+        sha1 = "39c72ed89d1b49ba708e18776500488902a52027";
+      };
+    };
+    "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" = {
@@ -19931,13 +20192,13 @@ let
         sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
       };
     };
-    "node-emoji-1.5.1" = {
+    "node-emoji-1.7.0" = {
       name = "node-emoji";
       packageName = "node-emoji";
-      version = "1.5.1";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz";
-        sha1 = "fd918e412769bf8c448051238233840b2aff16a1";
+        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.7.0.tgz";
+        sha1 = "a400490aac409b616d13941532200f128af037f9";
       };
     };
     "object-path-0.11.4" = {
@@ -19976,6 +20237,15 @@ let
         sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9";
       };
     };
+    "regenerator-runtime-0.10.5" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
+        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
+      };
+    };
     "is-deflate-1.0.0" = {
       name = "is-deflate";
       packageName = "is-deflate";
@@ -20003,6 +20273,15 @@ let
         sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52";
       };
     };
+    "loose-envify-1.3.1" = {
+      name = "loose-envify";
+      packageName = "loose-envify";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz";
+        sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
+      };
+    };
     "ci-info-1.0.0" = {
       name = "ci-info";
       packageName = "ci-info";
@@ -20012,6 +20291,15 @@ let
         sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
       };
     };
+    "lodash.toarray-4.4.0" = {
+      name = "lodash.toarray";
+      packageName = "lodash.toarray";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz";
+        sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561";
+      };
+    };
     "cli-list-0.2.0" = {
       name = "cli-list";
       packageName = "cli-list";
@@ -20021,15 +20309,6 @@ let
         sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582";
       };
     };
-    "cross-spawn-5.1.0" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
-      };
-    };
     "fullname-3.3.0" = {
       name = "fullname";
       packageName = "fullname";
@@ -20120,15 +20399,6 @@ let
         sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a";
       };
     };
-    "update-notifier-2.2.0" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz";
-        sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
-      };
-    };
     "yeoman-character-1.1.0" = {
       name = "yeoman-character";
       packageName = "yeoman-character";
@@ -20165,24 +20435,6 @@ let
         sha1 = "0f3d2bb01f7f25362c127212f53c1572906333fe";
       };
     };
-    "shebang-command-1.2.0" = {
-      name = "shebang-command";
-      packageName = "shebang-command";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
-        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
-      };
-    };
-    "shebang-regex-1.0.0" = {
-      name = "shebang-regex";
-      packageName = "shebang-regex";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
-        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
-      };
-    };
     "execa-0.6.3" = {
       name = "execa";
       packageName = "execa";
@@ -20264,6 +20516,42 @@ let
         sha1 = "08ff4334603388399b329e6b9538dc7a3cf5de7d";
       };
     };
+    "execa-0.4.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz";
+        sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3";
+      };
+    };
+    "cross-spawn-async-2.2.5" = {
+      name = "cross-spawn-async";
+      packageName = "cross-spawn-async";
+      version = "2.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz";
+        sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc";
+      };
+    };
+    "npm-run-path-1.0.0" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz";
+        sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f";
+      };
+    };
+    "path-key-1.0.0" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz";
+        sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af";
+      };
+    };
     "execall-1.0.0" = {
       name = "execall";
       packageName = "execall";
@@ -20345,15 +20633,6 @@ let
         sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1";
       };
     };
-    "import-lazy-2.1.0" = {
-      name = "import-lazy";
-      packageName = "import-lazy";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz";
-        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
-      };
-    };
     "bin-version-check-2.1.0" = {
       name = "bin-version-check";
       packageName = "bin-version-check";
@@ -20372,15 +20651,6 @@ let
         sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473";
       };
     };
-    "log-symbols-1.0.2" = {
-      name = "log-symbols";
-      packageName = "log-symbols";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz";
-        sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
-      };
-    };
     "object-values-1.0.0" = {
       name = "object-values";
       packageName = "object-values";
@@ -20516,15 +20786,6 @@ let
         sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
       };
     };
-    "ansi-styles-3.1.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz";
-        sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750";
-      };
-    };
     "pad-component-0.0.1" = {
       name = "pad-component";
       packageName = "pad-component";
@@ -20549,91 +20810,54 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.10.2";
+    version = "1.9.13";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.10.2.tgz";
-      sha1 = "998e5cc410fc8eec02fb9007ef95c76ab4ac586f";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.13.tgz";
+      sha1 = "5ab8089cee9a9bf4ba46298d87c7039a4f2a7410";
     };
     dependencies = [
-      sources."async-2.4.1"
-      (sources."babel-core-6.25.0" // {
+      sources."colors-0.6.0-1"
+      sources."ejs-2.3.4"
+      sources."pkginfo-0.2.2"
+      sources."commander-0.6.1"
+      sources."wrench-1.3.9"
+      sources."xmldom-0.1.19"
+      sources."jsonlint-1.5.1"
+      (sources."uglify-js-2.6.1" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
       })
-      sources."babel-traverse-6.25.0"
-      sources."babel-types-6.25.0"
-      sources."babylon-6.17.3"
-      sources."colors-0.6.0-1"
-      sources."commander-0.6.1"
-      sources."deasync-0.1.10"
-      sources."ejs-2.3.4"
+      sources."resolve-1.3.3"
       sources."global-paths-0.1.2"
-      sources."jsonlint-1.5.1"
+      sources."source-map-0.1.9"
+      sources."xml2tss-0.0.5"
       sources."moment-2.17.1"
       sources."node.extend-1.0.10"
-      sources."pkginfo-0.2.2"
-      sources."resolve-1.3.3"
-      sources."source-map-0.1.9"
-      sources."wrench-1.3.9"
-      sources."xml2tss-0.0.5"
-      sources."xmldom-0.1.19"
-      sources."lodash-4.17.4"
-      sources."babel-code-frame-6.22.0"
-      (sources."babel-generator-6.25.0" // {
-        dependencies = [
-          sources."source-map-0.5.6"
-        ];
-      })
-      sources."babel-helpers-6.24.1"
-      sources."babel-messages-6.23.0"
-      sources."babel-template-6.25.0"
-      sources."babel-runtime-6.23.0"
-      sources."babel-register-6.24.1"
-      sources."convert-source-map-1.5.0"
-      sources."debug-2.6.8"
-      sources."json5-0.5.1"
-      sources."minimatch-3.0.4"
-      sources."path-is-absolute-1.0.1"
-      sources."private-0.1.7"
-      sources."slash-1.0.0"
-      sources."chalk-1.1.3"
-      sources."esutils-2.0.2"
-      sources."js-tokens-3.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."detect-indent-4.0.0"
-      sources."jsesc-1.3.0"
-      sources."trim-right-1.0.1"
-      sources."repeating-2.0.1"
-      sources."is-finite-1.0.2"
-      sources."number-is-nan-1.0.1"
-      sources."core-js-2.4.1"
-      sources."regenerator-runtime-0.10.5"
-      sources."home-or-tmp-2.0.0"
-      sources."mkdirp-0.5.1"
-      (sources."source-map-support-0.4.15" // {
-        dependencies = [
-          sources."source-map-0.5.6"
-        ];
-      })
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."minimist-0.0.8"
-      sources."ms-2.0.0"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
-      sources."globals-9.18.0"
-      sources."invariant-2.2.2"
-      sources."loose-envify-1.3.1"
-      sources."to-fast-properties-1.0.3"
-      sources."bindings-1.2.1"
-      sources."nan-2.6.2"
+      sources."nomnom-1.8.1"
+      sources."JSV-4.0.2"
+      sources."underscore-1.6.0"
+      sources."chalk-0.4.0"
+      sources."has-color-0.1.7"
+      sources."ansi-styles-1.0.0"
+      sources."strip-ansi-0.1.1"
+      sources."async-0.2.10"
+      sources."uglify-to-browserify-1.0.2"
+      sources."yargs-3.10.0"
+      sources."camelcase-1.2.1"
+      sources."cliui-2.1.0"
+      sources."decamelize-1.2.0"
+      sources."window-size-0.1.0"
+      sources."center-align-0.1.3"
+      sources."right-align-0.1.3"
+      sources."wordwrap-0.0.2"
+      sources."align-text-0.1.4"
+      sources."lazy-cache-1.0.4"
+      sources."kind-of-3.2.2"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.5"
+      sources."path-parse-1.0.5"
       sources."array-unique-0.2.1"
       (sources."global-modules-0.2.3" // {
         dependencies = [
@@ -20651,21 +20875,10 @@ in
       sources."which-1.2.14"
       sources."parse-passwd-1.0.0"
       sources."isexe-2.0.0"
-      (sources."nomnom-1.8.1" // {
-        dependencies = [
-          sources."chalk-0.4.0"
-          sources."ansi-styles-1.0.0"
-          sources."strip-ansi-0.1.1"
-        ];
-      })
-      sources."JSV-4.0.2"
-      sources."underscore-1.6.0"
-      sources."has-color-0.1.7"
-      sources."is-0.3.0"
-      sources."path-parse-1.0.5"
       sources."amdefine-1.0.1"
       sources."xml2js-0.2.8"
       sources."sax-0.5.8"
+      sources."is-0.3.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -20697,8 +20910,8 @@ in
       sources."azure-arm-commerce-0.2.0"
       (sources."azure-arm-compute-3.0.0-preview" // {
         dependencies = [
-          sources."ms-rest-2.2.0"
-          sources."ms-rest-azure-2.1.2"
+          sources."ms-rest-2.2.1"
+          sources."ms-rest-azure-2.2.1"
           sources."async-0.2.7"
         ];
       })
@@ -20709,24 +20922,24 @@ in
       sources."azure-arm-insights-0.11.3"
       (sources."azure-arm-iothub-1.0.1-preview" // {
         dependencies = [
-          sources."ms-rest-2.2.0"
-          sources."ms-rest-azure-2.1.2"
+          sources."ms-rest-2.2.1"
+          sources."ms-rest-azure-2.2.1"
           sources."async-0.2.7"
         ];
       })
       sources."azure-arm-servermanagement-0.1.2"
       (sources."azure-arm-network-1.1.0-preview" // {
         dependencies = [
-          sources."ms-rest-2.2.0"
-          sources."ms-rest-azure-2.1.2"
+          sources."ms-rest-2.2.1"
+          sources."ms-rest-azure-2.2.1"
           sources."async-0.2.7"
         ];
       })
       sources."azure-arm-powerbiembedded-0.1.0"
       (sources."azure-arm-trafficmanager-1.1.0-preview" // {
         dependencies = [
-          sources."ms-rest-azure-2.1.2"
-          sources."ms-rest-2.2.0"
+          sources."ms-rest-azure-2.2.1"
+          sources."ms-rest-2.2.1"
           sources."async-0.2.7"
         ];
       })
@@ -20736,8 +20949,8 @@ in
       sources."azure-arm-devtestlabs-0.1.0"
       (sources."azure-graph-2.1.0-preview" // {
         dependencies = [
-          sources."ms-rest-azure-2.1.2"
-          sources."ms-rest-2.2.0"
+          sources."ms-rest-azure-2.2.1"
+          sources."ms-rest-2.2.1"
           sources."async-0.2.7"
         ];
       })
@@ -20858,15 +21071,15 @@ in
       sources."xpath.js-1.0.7"
       sources."base64url-2.0.0"
       sources."jwa-1.1.5"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."buffer-equal-constant-time-1.0.1"
       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"
       sources."sax-0.5.2"
-      sources."@types/node-7.0.31"
-      sources."@types/request-0.0.42"
+      sources."@types/node-7.0.36"
+      sources."@types/request-0.0.45"
       sources."@types/uuid-2.0.30"
       sources."is-buffer-1.1.5"
       sources."is-stream-1.1.0"
@@ -20942,13 +21155,13 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.4.1"
+          sources."async-2.5.0"
         ];
       })
       (sources."har-validator-2.0.6" // {
         dependencies = [
           sources."chalk-1.1.3"
-          sources."commander-2.9.0"
+          sources."commander-2.11.0"
           sources."ansi-styles-2.2.1"
           sources."strip-ansi-3.0.1"
         ];
@@ -20971,7 +21184,6 @@ in
       sources."has-ansi-2.0.0"
       sources."supports-color-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.1"
@@ -21020,17 +21232,16 @@ in
       sources."amdefine-1.0.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."readable-stream-2.3.3"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."http-response-object-1.1.0"
       sources."then-request-2.2.0"
       sources."typedarray-0.0.6"
       sources."http-basic-2.5.1"
-      sources."promise-7.3.0"
-      sources."asap-2.0.5"
+      sources."promise-7.3.1"
+      sources."asap-2.0.6"
       sources."os-homedir-1.0.2"
       sources."mute-stream-0.0.7"
     ];
@@ -21095,13 +21306,13 @@ in
       sources."ext-list-2.2.2"
       sources."meow-3.7.0"
       sources."sort-keys-length-1.0.1"
-      sources."mime-db-1.28.0"
+      sources."mime-db-1.29.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."minimist-1.2.0"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
@@ -21110,7 +21321,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -21218,7 +21429,7 @@ in
       })
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      sources."crypto-browserify-3.11.0"
+      sources."crypto-browserify-3.11.1"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."domain-browser-1.1.7"
@@ -21243,21 +21454,13 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.11" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."readable-stream-2.3.3"
       sources."resolve-1.3.3"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
       sources."stream-http-2.7.2"
-      (sources."string_decoder-1.0.2" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."string_decoder-1.0.3"
       sources."subarg-1.0.0"
       sources."syntax-error-1.3.0"
       sources."through2-2.0.3"
@@ -21284,7 +21487,7 @@ in
       sources."lodash.memoize-3.0.4"
       sources."source-map-0.5.6"
       sources."pako-0.2.9"
-      sources."base64-js-1.2.0"
+      sources."base64-js-1.2.1"
       sources."ieee754-1.1.8"
       sources."typedarray-0.0.6"
       sources."core-util-is-1.0.2"
@@ -21305,22 +21508,22 @@ in
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.0"
       sources."buffer-xor-1.0.3"
-      sources."cipher-base-1.0.3"
+      sources."cipher-base-1.0.4"
+      sources."safe-buffer-5.1.1"
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
-      sources."bn.js-4.11.6"
+      sources."bn.js-4.11.7"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
       sources."parse-asn1-5.1.0"
       sources."brorand-1.1.0"
-      sources."hash.js-1.0.3"
+      sources."hash.js-1.1.3"
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
       sources."ripemd160-2.0.1"
       sources."sha.js-2.4.8"
       sources."hash-base-2.0.2"
-      sources."safe-buffer-5.1.0"
       sources."miller-rabin-4.0.0"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -21456,7 +21659,7 @@ in
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
@@ -21464,7 +21667,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -21554,12 +21757,12 @@ in
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.7"
-      sources."parse-torrent-file-4.0.2"
+      sources."parse-torrent-file-4.0.3"
       sources."simple-get-2.6.0"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."thirty-two-1.0.2"
       sources."uniq-1.0.1"
-      sources."bencode-0.11.0"
+      sources."bencode-1.0.0"
       sources."simple-sha1-2.1.0"
       sources."rusha-0.8.6"
       sources."once-1.4.0"
@@ -21645,26 +21848,25 @@ in
       })
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.6.2"
-      sources."bn.js-4.11.6"
+      sources."k-rpc-socket-1.7.1"
+      sources."bn.js-4.11.7"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
       (sources."simple-peer-6.4.4" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."ws-2.3.1"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
           sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
         ];
       })
       sources."string2compact-1.2.2"
@@ -21673,7 +21875,7 @@ in
           sources."ultron-1.0.2"
         ];
       })
-      sources."ipaddr.js-1.3.0"
+      sources."ipaddr.js-1.4.0"
       sources."get-browser-rtc-1.0.2"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
@@ -21713,17 +21915,15 @@ in
       sources."voc-0.5.0"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."exit-on-epipe-1.0.0"
-      sources."commander-2.9.0"
+      sources."commander-2.11.0"
       sources."typedarray-0.0.6"
-      sources."graceful-readlink-1.0.1"
-      sources."sax-1.2.2"
+      sources."sax-1.2.4"
       sources."underscore-1.6.0"
     ];
     buildInputs = globalBuildInputs;
@@ -21870,6 +22070,7 @@ in
             ];
           })
           sources."nopt-3.0.6"
+          sources."normalize-package-data-2.3.8"
           sources."npm-package-arg-4.1.1"
           sources."readable-stream-2.1.5"
           sources."request-2.74.0"
@@ -21900,7 +22101,7 @@ in
       sources."browserify-transform-tools-1.7.0"
       sources."falafel-2.1.0"
       sources."through-2.3.8"
-      sources."acorn-5.0.3"
+      sources."acorn-5.1.1"
       sources."foreach-2.0.5"
       sources."isarray-0.0.1"
       sources."object-keys-1.0.11"
@@ -21932,7 +22133,7 @@ in
       sources."browserify-zlib-0.1.4"
       (sources."buffer-4.9.1" // {
         dependencies = [
-          sources."base64-js-1.2.0"
+          sources."base64-js-1.2.1"
           sources."isarray-1.0.0"
         ];
       })
@@ -21945,7 +22146,7 @@ in
       })
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      sources."crypto-browserify-3.11.0"
+      sources."crypto-browserify-3.11.1"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."domain-browser-1.1.7"
@@ -21964,11 +22165,10 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.11" // {
+      (sources."readable-stream-2.3.3" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."shasum-1.0.2"
@@ -22027,22 +22227,22 @@ in
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.0"
       sources."buffer-xor-1.0.3"
-      sources."cipher-base-1.0.3"
+      sources."cipher-base-1.0.4"
+      sources."safe-buffer-5.1.1"
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
-      sources."bn.js-4.11.6"
+      sources."bn.js-4.11.7"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
       sources."parse-asn1-5.1.0"
       sources."brorand-1.1.0"
-      sources."hash.js-1.0.3"
+      sources."hash.js-1.1.3"
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
       sources."ripemd160-2.0.1"
       sources."sha.js-2.4.8"
       sources."hash-base-2.0.2"
-      sources."safe-buffer-5.1.0"
       sources."miller-rabin-4.0.0"
       sources."function-bind-1.1.0"
       sources."is-buffer-1.1.5"
@@ -22070,11 +22270,10 @@ in
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
       sources."chalk-1.1.3"
-      sources."compression-1.6.2"
+      sources."compression-1.7.0"
       (sources."express-4.15.3" // {
         dependencies = [
           sources."debug-2.6.7"
-          sources."ms-2.0.0"
         ];
       })
       sources."ansi-styles-2.2.1"
@@ -22084,15 +22283,15 @@ in
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
       sources."accepts-1.3.3"
-      sources."bytes-2.3.0"
+      sources."bytes-2.5.0"
       sources."compressible-2.0.10"
-      sources."debug-2.2.0"
+      sources."debug-2.6.8"
       sources."on-headers-1.0.1"
       sources."vary-1.1.1"
       sources."mime-types-2.1.15"
       sources."negotiator-0.6.1"
       sources."mime-db-1.27.0"
-      sources."ms-0.7.1"
+      sources."ms-2.0.0"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.2"
@@ -22105,7 +22304,6 @@ in
       (sources."finalhandler-1.0.3" // {
         dependencies = [
           sources."debug-2.6.7"
-          sources."ms-2.0.0"
         ];
       })
       sources."fresh-0.5.0"
@@ -22120,7 +22318,6 @@ in
       (sources."send-0.15.3" // {
         dependencies = [
           sources."debug-2.6.7"
-          sources."ms-2.0.0"
         ];
       })
       sources."serve-static-1.12.3"
@@ -22139,17 +22336,17 @@ in
       sources."npm-package-arg-5.1.2"
       sources."promzard-0.3.0"
       sources."read-1.0.7"
-      (sources."read-package-json-2.0.5" // {
+      (sources."read-package-json-2.0.10" // {
         dependencies = [
           sources."glob-7.1.2"
         ];
       })
       sources."validate-npm-package-license-3.0.1"
       sources."validate-npm-package-name-3.0.0"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."mute-stream-0.0.7"
       sources."json-parse-helpfulerror-1.0.3"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."jju-1.3.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
@@ -22217,7 +22414,7 @@ in
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
       sources."proto-list-1.2.4"
-      sources."asap-2.0.5"
+      sources."asap-2.0.6"
       sources."iferr-0.1.5"
       sources."fstream-ignore-1.0.5"
       sources."pseudomap-1.0.2"
@@ -22258,15 +22455,14 @@ in
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      (sources."async-2.4.1" // {
+      (sources."async-2.5.0" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
       })
-      sources."commander-2.9.0"
+      sources."commander-2.11.0"
       sources."is-my-json-valid-2.16.0"
       sources."pinkie-promise-2.0.1"
-      sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
       sources."jsonpointer-4.0.1"
@@ -22560,7 +22756,7 @@ in
       sources."JSONStream-0.8.4"
       sources."basic-auth-1.1.0"
       sources."cookie-signature-1.0.6"
-      sources."cors-2.8.3"
+      sources."cors-2.8.4"
       sources."docker-parse-image-3.0.1"
       sources."end-of-stream-1.4.0"
       sources."from2-1.3.0"
@@ -22601,9 +22797,9 @@ in
           sources."minimist-1.2.0"
           sources."split2-2.1.1"
           sources."through2-2.0.3"
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."pump-1.0.2"
@@ -22616,9 +22812,9 @@ in
       (sources."tar-stream-1.5.4" // {
         dependencies = [
           sources."bl-1.2.1"
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       (sources."through2-0.6.5" // {
@@ -22642,16 +22838,16 @@ in
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."once-1.3.3"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."lru-cache-2.7.3"
       sources."stream-shift-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.1"
       sources."util-deprecate-1.0.2"
       sources."level-packager-0.18.0"
       sources."bytewise-1.1.0"
@@ -22712,17 +22908,18 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.1"
-      sources."async-2.4.1"
+      sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.72.0"
+      sources."aws-sdk-2.84.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
       sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."lodash-4.17.4"
-      sources."buffer-5.0.6"
+      sources."buffer-4.9.1"
       sources."crypto-browserify-1.0.9"
+      sources."events-1.1.1"
       sources."jmespath-0.15.0"
       sources."querystring-0.2.0"
       sources."sax-1.2.1"
@@ -22730,8 +22927,9 @@ in
       sources."uuid-3.0.1"
       sources."xml2js-0.4.17"
       sources."xmlbuilder-4.2.1"
-      sources."base64-js-1.2.0"
+      sources."base64-js-1.2.1"
       sources."ieee754-1.1.8"
+      sources."isarray-1.0.0"
       sources."punycode-1.3.2"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
@@ -22751,7 +22949,7 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."stringstream-0.0.5"
       (sources."tough-cookie-2.3.2" // {
         dependencies = [
@@ -22870,7 +23068,7 @@ in
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
       sources."lowercase-keys-1.0.0"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."timed-out-4.0.1"
       sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
@@ -22887,7 +23085,7 @@ in
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."minimist-1.2.0"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       (sources."read-pkg-up-1.0.1" // {
         dependencies = [
           sources."find-up-1.1.2"
@@ -22899,7 +23097,7 @@ in
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -22935,12 +23133,13 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "4.0.0";
+    version = "4.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-4.0.0.tgz";
-      sha1 = "7277c01437fdf41dccd168d5aa0e49b75ca1f260";
+      url = "https://registry.npmjs.org/eslint/-/eslint-4.2.0.tgz";
+      sha1 = "a2b3184111b198e02e9c7f3cca625a5e01c56b3d";
     };
     dependencies = [
+      sources."ajv-5.2.2"
       sources."babel-code-frame-6.22.0"
       sources."chalk-1.1.3"
       sources."concat-stream-1.6.0"
@@ -22956,13 +23155,21 @@ in
       sources."globals-9.18.0"
       sources."ignore-3.3.3"
       sources."imurmurhash-0.1.4"
-      sources."inquirer-3.1.0"
-      sources."is-my-json-valid-2.16.0"
+      (sources."inquirer-3.2.0" // {
+        dependencies = [
+          sources."chalk-2.0.1"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-styles-3.1.0"
+          sources."supports-color-4.2.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.8.4"
+      sources."js-yaml-3.9.0"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.4"
+      sources."minimatch-3.0.4"
       sources."mkdirp-0.5.1"
       sources."natural-compare-1.4.0"
       sources."optionator-0.8.2"
@@ -22971,9 +23178,16 @@ in
       sources."progress-2.0.0"
       sources."require-uncached-1.0.3"
       sources."strip-json-comments-2.0.1"
-      sources."table-4.0.1"
+      (sources."table-4.0.1" // {
+        dependencies = [
+          sources."ajv-4.11.8"
+        ];
+      })
       sources."text-table-0.2.0"
-      sources."js-tokens-3.0.1"
+      sources."co-4.6.0"
+      sources."fast-deep-equal-1.0.0"
+      sources."json-schema-traverse-0.3.1"
+      sources."js-tokens-3.0.2"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -22982,21 +23196,17 @@ in
       sources."ansi-regex-2.1.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."ms-2.0.0"
-      (sources."esrecurse-4.1.0" // {
-        dependencies = [
-          sources."estraverse-4.1.1"
-        ];
-      })
+      sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
-      sources."acorn-5.0.3"
+      sources."acorn-5.1.1"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
@@ -23020,13 +23230,9 @@ in
       sources."pinkie-2.0.4"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
       sources."ansi-escapes-2.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.1.0"
@@ -23036,8 +23242,16 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."string-width-2.0.0"
+      (sources."string-width-2.1.0" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."through-2.3.8"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.2"
+      sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
@@ -23048,18 +23262,16 @@ in
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
       sources."is-fullwidth-code-point-2.0.0"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
       sources."tryit-1.0.3"
       sources."argparse-1.0.9"
-      sources."esprima-3.1.3"
+      sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
       sources."jsonify-0.0.0"
       sources."prelude-ls-1.1.2"
       sources."type-check-0.3.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
       sources."deep-is-0.1.3"
       sources."wordwrap-1.0.0"
@@ -23067,10 +23279,8 @@ in
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
-      sources."ajv-4.11.8"
       sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
-      sources."co-4.6.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -23083,10 +23293,10 @@ in
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
     packageName = "eslint_d";
-    version = "4.2.5";
+    version = "5.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-4.2.5.tgz";
-      sha1 = "f0d3a150e2960a7d787841ab83eaef746432c5e1";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.0.0.tgz";
+      sha1 = "88bbceec5d5eead280b63b6351881bc05bfe3987";
     };
     dependencies = [
       (sources."chalk-1.1.3" // {
@@ -23094,20 +23304,25 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      sources."eslint-3.19.0"
+      sources."eslint-4.2.0"
       sources."optionator-0.8.2"
       sources."resolve-1.3.3"
-      sources."supports-color-3.2.3"
+      (sources."supports-color-3.2.3" // {
+        dependencies = [
+          sources."has-flag-1.0.0"
+        ];
+      })
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."ansi-regex-2.1.1"
+      sources."ajv-5.2.2"
       sources."babel-code-frame-6.22.0"
       sources."concat-stream-1.6.0"
       sources."debug-2.6.8"
       sources."doctrine-2.0.0"
-      sources."escope-3.6.0"
+      sources."eslint-scope-3.7.1"
       sources."espree-3.4.3"
       sources."esquery-1.0.0"
       sources."estraverse-4.2.0"
@@ -23117,56 +23332,51 @@ in
       sources."globals-9.18.0"
       sources."ignore-3.3.3"
       sources."imurmurhash-0.1.4"
-      sources."inquirer-0.12.0"
-      sources."is-my-json-valid-2.16.0"
+      (sources."inquirer-3.2.0" // {
+        dependencies = [
+          sources."chalk-2.0.1"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-styles-3.1.0"
+          sources."supports-color-4.2.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.8.4"
+      sources."js-yaml-3.9.0"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.4"
+      sources."minimatch-3.0.4"
       sources."mkdirp-0.5.1"
       sources."natural-compare-1.4.0"
       sources."path-is-inside-1.0.2"
-      sources."pluralize-1.2.1"
-      sources."progress-1.1.8"
+      sources."pluralize-4.0.0"
+      sources."progress-2.0.0"
       sources."require-uncached-1.0.3"
-      sources."shelljs-0.7.8"
-      sources."strip-bom-3.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."table-3.8.3" // {
+      (sources."table-4.0.1" // {
         dependencies = [
-          sources."string-width-2.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
+          sources."ajv-4.11.8"
         ];
       })
       sources."text-table-0.2.0"
-      sources."user-home-2.0.0"
-      sources."js-tokens-3.0.1"
+      sources."co-4.6.0"
+      sources."fast-deep-equal-1.0.0"
+      sources."json-schema-traverse-0.3.1"
+      sources."js-tokens-3.0.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."ms-2.0.0"
-      sources."es6-map-0.1.5"
-      sources."es6-weak-map-2.0.2"
-      (sources."esrecurse-4.1.0" // {
-        dependencies = [
-          sources."estraverse-4.1.1"
-        ];
-      })
-      sources."d-1.0.0"
-      sources."es5-ext-0.10.23"
-      sources."es6-iterator-2.0.1"
-      sources."es6-set-0.1.5"
-      sources."es6-symbol-3.1.1"
-      sources."event-emitter-0.3.5"
+      sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
-      sources."acorn-5.0.3"
+      sources."acorn-5.1.1"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
@@ -23190,57 +23400,58 @@ in
       sources."pinkie-2.0.4"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
-      sources."ansi-escapes-1.4.0"
-      sources."cli-cursor-1.0.2"
+      sources."ansi-escapes-2.0.0"
+      sources."cli-cursor-2.1.0"
       sources."cli-width-2.1.0"
-      sources."figures-1.7.0"
-      sources."readline2-1.0.1"
-      sources."run-async-0.1.0"
-      sources."rx-lite-3.1.2"
-      sources."string-width-1.0.2"
+      sources."external-editor-2.0.4"
+      sources."figures-2.0.0"
+      sources."mute-stream-0.0.7"
+      sources."run-async-2.3.0"
+      sources."rx-lite-4.0.8"
+      sources."rx-lite-aggregates-4.0.8"
+      (sources."string-width-2.1.0" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."through-2.3.8"
-      sources."restore-cursor-1.0.1"
-      sources."exit-hook-1.1.1"
-      sources."onetime-1.1.0"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."mute-stream-0.0.5"
-      sources."number-is-nan-1.0.1"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.2"
+      sources."has-flag-2.0.0"
+      sources."restore-cursor-2.0.0"
+      sources."onetime-2.0.1"
+      sources."signal-exit-3.0.2"
+      sources."mimic-fn-1.1.0"
+      sources."iconv-lite-0.4.18"
+      sources."jschardet-1.4.2"
+      sources."tmp-0.0.31"
+      sources."os-tmpdir-1.0.2"
+      sources."is-promise-2.1.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."tryit-1.0.3"
       sources."argparse-1.0.9"
-      sources."esprima-3.1.3"
+      sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
       sources."jsonify-0.0.0"
       sources."prelude-ls-1.1.2"
       sources."type-check-0.3.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
-      sources."interpret-1.0.3"
-      sources."rechoir-0.6.2"
-      sources."ajv-4.11.8"
       sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
-      sources."co-4.6.0"
-      sources."os-homedir-1.0.2"
       sources."deep-is-0.1.3"
       sources."wordwrap-1.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."path-parse-1.0.5"
-      sources."has-flag-1.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -23253,10 +23464,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "3.0.3";
+    version = "3.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-3.0.3.tgz";
-      sha1 = "7b4c61210bf6949f0ac16803889ea1abf2b285ea";
+      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.1.tgz";
+      sha1 = "f5680fbee2cb2a56e99042b14d935e3eb861b300";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -23265,6 +23476,199 @@ in
     };
     production = true;
   };
+  fast-cli = nodeEnv.buildNodePackage {
+    name = "fast-cli";
+    packageName = "fast-cli";
+    version = "1.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz";
+      sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010";
+    };
+    dependencies = [
+      sources."chalk-1.1.3"
+      sources."log-update-1.0.2"
+      sources."meow-3.7.0"
+      (sources."ora-1.3.0" // {
+        dependencies = [
+          sources."cli-cursor-2.1.0"
+          sources."restore-cursor-2.0.0"
+          sources."onetime-2.0.1"
+        ];
+      })
+      sources."phantomjs-prebuilt-2.1.14"
+      sources."promise-phantom-3.1.6"
+      sources."zen-observable-0.5.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-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."camelcase-keys-2.1.0"
+      sources."decamelize-1.2.0"
+      sources."loud-rejection-1.6.0"
+      sources."map-obj-1.0.1"
+      sources."minimist-1.2.0"
+      sources."normalize-package-data-2.4.0"
+      sources."object-assign-4.1.1"
+      sources."read-pkg-up-1.0.1"
+      sources."redent-1.0.0"
+      sources."trim-newlines-1.0.0"
+      sources."camelcase-2.1.1"
+      sources."currently-unhandled-0.4.1"
+      sources."signal-exit-3.0.2"
+      sources."array-find-index-1.0.2"
+      sources."hosted-git-info-2.5.0"
+      sources."is-builtin-module-1.0.0"
+      sources."semver-5.3.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.1"
+      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."get-stdin-4.0.1"
+      sources."cli-spinners-1.0.0"
+      sources."log-symbols-1.0.2"
+      sources."mimic-fn-1.1.0"
+      sources."es6-promise-4.0.5"
+      sources."extract-zip-1.5.0"
+      sources."fs-extra-1.0.0"
+      sources."hasha-2.2.0"
+      sources."kew-0.7.0"
+      sources."progress-1.1.8"
+      sources."request-2.79.0"
+      sources."request-progress-2.0.1"
+      sources."which-1.2.14"
+      sources."concat-stream-1.5.0"
+      sources."debug-0.7.4"
+      (sources."mkdirp-0.5.0" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."yauzl-2.4.1"
+      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."fd-slicer-1.0.1"
+      sources."pend-1.2.0"
+      sources."jsonfile-2.4.0"
+      sources."klaw-1.3.1"
+      sources."is-stream-1.1.0"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.6.0"
+      sources."caseless-0.11.0"
+      sources."combined-stream-1.0.5"
+      sources."extend-3.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      sources."har-validator-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.15"
+      sources."oauth-sign-0.8.2"
+      sources."qs-6.3.2"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.2"
+      sources."tunnel-agent-0.4.3"
+      sources."uuid-3.1.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."commander-2.11.0"
+      sources."is-my-json-valid-2.16.0"
+      sources."generate-function-2.0.0"
+      sources."generate-object-property-1.2.0"
+      sources."jsonpointer-4.0.1"
+      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.4.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.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.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsbn-0.1.1"
+      sources."tweetnacl-0.14.5"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."mime-db-1.27.0"
+      sources."punycode-1.4.1"
+      sources."throttleit-1.0.0"
+      sources."isexe-2.0.0"
+      sources."co-4.6.0"
+      sources."mkpath-1.0.0"
+      (sources."node-phantom-simple-2.2.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
+      sources."tmp-0.0.31"
+      sources."ms-2.0.0"
+      sources."os-tmpdir-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Test your download speed using fast.com";
+      homepage = "https://github.com/sindresorhus/fast-cli#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
   fetch-bower = nodeEnv.buildNodePackage {
     name = "fetch-bower";
     packageName = "fetch-bower";
@@ -23380,7 +23784,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.3"
+      sources."arr-flatten-1.1.0"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -23411,12 +23815,12 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.36"
@@ -23426,7 +23830,7 @@ in
         ];
       })
       sources."nopt-4.0.1"
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -23572,7 +23976,7 @@ in
       sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4";
     };
     dependencies = [
-      sources."async-2.4.1"
+      sources."async-2.5.0"
       sources."lodash.groupby-4.6.0"
       sources."minilog-2.0.8"
       sources."simple-git-1.73.0"
@@ -23653,7 +24057,7 @@ in
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
-          sources."asap-2.0.5"
+          sources."asap-2.0.6"
         ];
       })
       sources."xml2js-0.4.17"
@@ -23721,7 +24125,7 @@ in
       sources."acorn-globals-1.0.9"
       sources."pop-iterate-1.0.1"
       sources."weak-map-1.0.5"
-      sources."sax-1.2.2"
+      sources."sax-1.2.4"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
       sources."nan-2.6.2"
@@ -23784,9 +24188,9 @@ in
       sources."replace-ext-0.0.1"
       (sources."through2-2.0.3" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."vinyl-0.5.3"
@@ -23813,13 +24217,17 @@ in
       sources."inherits-2.0.3"
       sources."xtend-4.0.1"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.1"
       sources."util-deprecate-1.0.2"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
       sources."extend-3.0.1"
       sources."findup-sync-0.4.3"
-      sources."fined-1.0.2"
+      (sources."fined-1.1.0" // {
+        dependencies = [
+          sources."expand-tilde-2.0.2"
+        ];
+      })
       sources."flagged-respawn-0.3.2"
       sources."lodash.isplainobject-4.0.6"
       sources."lodash.isstring-4.0.1"
@@ -23843,7 +24251,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.3"
+      sources."arr-flatten-1.1.0"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -23886,10 +24294,21 @@ in
       sources."which-1.2.14"
       sources."parse-passwd-1.0.0"
       sources."isexe-2.0.0"
-      sources."lodash.assignwith-4.2.0"
-      sources."lodash.isempty-4.4.0"
-      sources."lodash.pick-4.4.0"
+      (sources."is-plain-object-2.0.4" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."object.defaults-1.1.0" // {
+        dependencies = [
+          sources."for-own-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."object.pick-1.2.0"
       sources."parse-filepath-1.0.1"
+      sources."array-each-1.0.1"
+      sources."array-slice-1.0.0"
       sources."is-absolute-0.2.6"
       sources."map-cache-0.2.2"
       sources."path-root-0.1.1"
@@ -24085,9 +24504,9 @@ in
           sources."source-map-0.4.4"
         ];
       })
-      (sources."js-yaml-3.8.4" // {
+      (sources."js-yaml-3.9.0" // {
         dependencies = [
-          sources."esprima-3.1.3"
+          sources."esprima-4.0.0"
         ];
       })
       (sources."mkdirp-0.5.1" // {
@@ -24164,18 +24583,18 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-    version = "2.0.0";
+    version = "2.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.0.0.tgz";
-      sha1 = "aad1582560c53dc91c13be6c2abb76cebbc9c971";
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.0.1.tgz";
+      sha1 = "37abd20a6fe7569c55bc823848e6e40e9148c1a6";
     };
     dependencies = [
-      sources."@reactivex/rxjs-5.4.1"
-      sources."chai-4.0.2"
-      sources."chai-as-promised-7.0.0"
-      sources."chalk-1.1.3"
-      sources."commander-2.9.0"
-      sources."fast-json-patch-1.2.2"
+      sources."@reactivex/rxjs-5.4.2"
+      sources."chai-4.1.0"
+      sources."chai-as-promised-7.1.1"
+      sources."chalk-2.0.1"
+      sources."commander-2.11.0"
+      sources."fast-json-patch-2.0.3"
       sources."glob-7.1.2"
       sources."iterare-0.0.8"
       sources."lodash-4.17.4"
@@ -24185,7 +24604,7 @@ in
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-1.2.0"
       sources."typescript-2.3.4"
-      sources."vscode-jsonrpc-3.3.0"
+      sources."vscode-jsonrpc-3.3.1"
       sources."vscode-languageserver-3.3.0"
       sources."vscode-languageserver-types-3.3.0"
       sources."symbol-observable-1.0.4"
@@ -24199,152 +24618,25 @@ in
       sources."get-func-name-2.0.0"
       sources."pathval-1.1.0"
       sources."type-detect-4.0.3"
-      sources."eslint-3.19.0"
-      sources."babel-code-frame-6.22.0"
-      sources."concat-stream-1.6.0"
-      sources."debug-2.6.8"
-      sources."doctrine-2.0.0"
-      sources."escope-3.6.0"
-      sources."espree-3.4.3"
-      sources."esquery-1.0.0"
-      sources."estraverse-4.2.0"
-      sources."esutils-2.0.2"
-      sources."file-entry-cache-2.0.0"
-      sources."globals-9.18.0"
-      sources."ignore-3.3.3"
-      sources."imurmurhash-0.1.4"
-      sources."inquirer-0.12.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.8.4"
-      sources."json-stable-stringify-1.0.1"
-      sources."levn-0.3.0"
-      sources."mkdirp-0.5.1"
-      sources."natural-compare-1.4.0"
-      sources."optionator-0.8.2"
-      sources."path-is-inside-1.0.2"
-      sources."pluralize-1.2.1"
-      sources."progress-1.1.8"
-      sources."require-uncached-1.0.3"
-      sources."shelljs-0.7.8"
-      sources."strip-bom-3.0.0"
-      sources."strip-json-comments-2.0.1"
-      (sources."table-3.8.3" // {
-        dependencies = [
-          sources."string-width-2.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
-      sources."text-table-0.2.0"
-      sources."user-home-2.0.0"
-      sources."js-tokens-3.0.1"
-      sources."inherits-2.0.3"
-      sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.11"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
-      sources."util-deprecate-1.0.2"
-      sources."ms-2.0.0"
-      sources."es6-map-0.1.5"
-      sources."es6-weak-map-2.0.2"
-      (sources."esrecurse-4.1.0" // {
-        dependencies = [
-          sources."estraverse-4.1.1"
-        ];
-      })
-      sources."d-1.0.0"
-      sources."es5-ext-0.10.23"
-      sources."es6-iterator-2.0.1"
-      sources."es6-set-0.1.5"
-      sources."es6-symbol-3.1.1"
-      sources."event-emitter-0.3.5"
-      sources."object-assign-4.1.1"
-      sources."acorn-5.0.3"
-      (sources."acorn-jsx-3.0.1" // {
-        dependencies = [
-          sources."acorn-3.3.0"
-        ];
-      })
-      sources."flat-cache-1.2.2"
-      sources."circular-json-0.3.1"
-      sources."del-2.2.2"
-      sources."graceful-fs-4.1.11"
-      sources."write-0.2.1"
-      sources."globby-5.0.0"
-      sources."is-path-cwd-1.0.0"
-      sources."is-path-in-cwd-1.0.0"
-      sources."pify-2.3.0"
-      sources."pinkie-promise-2.0.1"
-      sources."rimraf-2.6.1"
-      sources."array-union-1.0.2"
-      sources."arrify-1.0.1"
-      sources."array-uniq-1.0.3"
-      sources."is-path-inside-1.0.0"
-      sources."pinkie-2.0.4"
-      sources."ansi-escapes-1.4.0"
-      sources."ansi-regex-2.1.1"
-      sources."cli-cursor-1.0.2"
-      sources."cli-width-2.1.0"
-      sources."figures-1.7.0"
-      sources."readline2-1.0.1"
-      sources."run-async-0.1.0"
-      sources."rx-lite-3.1.2"
-      sources."string-width-1.0.2"
-      sources."strip-ansi-3.0.1"
-      sources."through-2.3.8"
-      sources."restore-cursor-1.0.1"
-      sources."exit-hook-1.1.1"
-      sources."onetime-1.1.0"
+      sources."ansi-styles-3.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."mute-stream-0.0.5"
-      sources."number-is-nan-1.0.1"
-      sources."once-1.4.0"
-      sources."wrappy-1.0.2"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."tryit-1.0.3"
-      sources."argparse-1.0.9"
-      sources."esprima-3.1.3"
-      sources."sprintf-js-1.0.3"
-      sources."jsonify-0.0.0"
-      sources."prelude-ls-1.1.2"
-      sources."type-check-0.3.2"
-      sources."minimist-0.0.8"
-      sources."deep-is-0.1.3"
-      sources."wordwrap-1.0.0"
-      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.3"
-      sources."rechoir-0.6.2"
-      sources."resolve-1.3.3"
-      sources."path-parse-1.0.5"
-      sources."ajv-4.11.8"
-      sources."ajv-keywords-1.5.1"
-      sources."slice-ansi-0.0.4"
-      sources."co-4.6.0"
-      sources."os-homedir-1.0.2"
-      sources."ansi-styles-2.2.1"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
-      sources."graceful-readlink-1.0.1"
+      sources."supports-color-4.2.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.2"
+      sources."has-flag-2.0.0"
+      sources."deep-equal-1.0.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
       sources."minimatch-3.0.4"
+      sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."any-promise-1.3.0"
+      sources."object-assign-4.1.1"
       sources."thenify-all-1.6.0"
       sources."thenify-3.3.0"
     ];
@@ -24378,10 +24670,10 @@ in
   jshint = nodeEnv.buildNodePackage {
     name = "jshint";
     packageName = "jshint";
-    version = "2.9.4";
+    version = "2.9.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz";
-      sha1 = "5e3ba97848d5290273db514aee47fe24cf592934";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz";
+      sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c";
     };
     dependencies = [
       sources."cli-1.0.1"
@@ -24459,25 +24751,29 @@ in
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.10.1";
+    version = "0.11.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.10.1.tgz";
-      sha1 = "1edd299681d3960959cf3b1859d192dc19898a40";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.11.2.tgz";
+      sha1 = "f31b366bd3c540ecebf0cf3e0f4d04c427b21781";
     };
     dependencies = [
       sources."body-parser-1.17.2"
       sources."chalk-1.1.3"
-      (sources."compression-1.6.2" // {
+      (sources."compression-1.7.0" // {
         dependencies = [
-          sources."bytes-2.3.0"
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
+          sources."bytes-2.5.0"
+          sources."debug-2.6.8"
         ];
       })
       sources."connect-pause-0.1.1"
-      sources."cors-2.8.3"
+      sources."cors-2.8.4"
       sources."errorhandler-1.5.0"
       sources."express-4.15.3"
+      (sources."express-urlrewrite-1.2.0" // {
+        dependencies = [
+          sources."path-to-regexp-1.7.0"
+        ];
+      })
       sources."json-parse-helpfulerror-1.0.3"
       sources."lodash-4.17.4"
       sources."lodash-id-0.13.0"
@@ -24493,6 +24789,7 @@ in
         ];
       })
       sources."object-assign-4.1.1"
+      sources."please-upgrade-node-1.0.1"
       sources."pluralize-3.1.0"
       sources."request-2.81.0"
       sources."server-destroy-1.0.1"
@@ -24531,6 +24828,7 @@ in
       sources."accepts-1.3.3"
       sources."compressible-2.0.10"
       sources."on-headers-1.0.1"
+      sources."safe-buffer-5.1.1"
       sources."vary-1.1.1"
       sources."negotiator-0.6.1"
       sources."escape-html-1.0.3"
@@ -24555,6 +24853,7 @@ in
       sources."ipaddr.js-1.3.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
+      sources."isarray-0.0.1"
       sources."jju-1.3.0"
       sources."graceful-fs-4.1.11"
       sources."is-promise-2.1.0"
@@ -24575,7 +24874,6 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.1.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -24668,9 +24966,9 @@ in
       sources."parse-json-2.2.0"
       sources."pinkie-promise-2.0.1"
       sources."read-all-stream-3.1.0"
-      (sources."readable-stream-2.2.11" // {
+      (sources."readable-stream-2.3.3" // {
         dependencies = [
-          sources."safe-buffer-5.0.1"
+          sources."isarray-1.0.0"
         ];
       })
       sources."timed-out-3.1.3"
@@ -24681,13 +24979,8 @@ in
       sources."is-arrayish-0.2.1"
       sources."pinkie-2.0.4"
       sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      (sources."string_decoder-1.0.2" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."prepend-http-1.0.4"
       (sources."rc-1.2.1" // {
@@ -24720,12 +25013,12 @@ in
       sources."read-pkg-1.1.0"
       sources."path-exists-2.1.0"
       sources."load-json-file-1.1.0"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."path-type-1.1.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -24744,14 +25037,14 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.8.4";
+    version = "3.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz";
-      sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz";
+      sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce";
     };
     dependencies = [
       sources."argparse-1.0.9"
-      sources."esprima-3.1.3"
+      sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
     ];
     buildInputs = globalBuildInputs;
@@ -24811,7 +25104,7 @@ in
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
       sources."rimraf-2.6.1"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       (sources."socket.io-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
@@ -24821,7 +25114,7 @@ in
       })
       sources."source-map-0.5.6"
       sources."tmp-0.0.31"
-      sources."useragent-2.1.13"
+      sources."useragent-2.2.1"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.6.7"
@@ -24863,7 +25156,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.3"
+      sources."arr-flatten-1.1.0"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -24893,25 +25186,17 @@ in
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
-      (sources."readable-stream-2.2.11" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      (sources."string_decoder-1.0.2" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.36"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -25251,7 +25536,7 @@ in
       sources."oauth-0.9.15"
       sources."passport-oauth2-1.4.0"
       sources."uid2-0.0.3"
-      sources."sax-1.2.2"
+      sources."sax-1.2.4"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
     ];
@@ -25274,14 +25559,14 @@ in
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-fs-2.4.4"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."xtend-4.0.1"
       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."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
@@ -25352,7 +25637,7 @@ in
         ];
       })
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.3"
+      sources."arr-flatten-1.1.0"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -25545,7 +25830,7 @@ in
       sources."concat-stream-1.6.0"
       sources."graceful-fs-4.1.11"
       sources."mkdirp-0.5.1"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."npm-package-arg-4.2.1"
       sources."once-1.4.0"
       sources."request-2.81.0"
@@ -25555,15 +25840,15 @@ in
       sources."npmlog-3.1.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -25705,7 +25990,7 @@ in
       sources."minimatch-3.0.4"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       sources."osenv-0.1.4"
       sources."request-2.81.0"
       sources."rimraf-2.6.1"
@@ -25728,12 +26013,12 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
@@ -25890,7 +26175,7 @@ in
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
@@ -25899,7 +26184,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -25995,7 +26280,7 @@ in
         ];
       })
       sources."nopt-4.0.1"
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       sources."request-2.81.0"
       sources."tar-2.2.1"
       (sources."tar-pack-3.4.0" // {
@@ -26010,11 +26295,19 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.11"
+      (sources."readable-stream-2.3.3" // {
+        dependencies = [
+          sources."safe-buffer-5.1.1"
+        ];
+      })
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.2"
+      (sources."string_decoder-1.0.3" // {
+        dependencies = [
+          sources."safe-buffer-5.1.1"
+        ];
+      })
       sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
@@ -26117,7 +26410,7 @@ in
     dependencies = [
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -26138,13 +26431,13 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       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."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
@@ -26295,7 +26588,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.3"
+      sources."arr-flatten-1.1.0"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -26326,18 +26619,18 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.36"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -26523,61 +26816,55 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.16.2";
+    version = "0.17.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.2.tgz";
-      sha1 = "3f77d608f1b0e89907af3f31e2c3eb8844a2b17b";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.17.4.tgz";
+      sha1 = "087a2819f6b59700166be29b04946ad40ac513d2";
     };
     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."bcryptjs-2.4.3"
+      sources."body-parser-1.17.2"
       sources."cheerio-0.22.0"
-      sources."clone-2.1.0"
+      sources."clone-2.1.1"
+      sources."cookie-0.3.1"
       sources."cookie-parser-1.4.3"
-      sources."cors-2.8.1"
+      sources."cors-2.8.3"
       sources."cron-1.2.1"
-      sources."express-4.14.0"
-      (sources."follow-redirects-1.2.1" // {
-        dependencies = [
-          sources."debug-2.6.8"
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."express-4.15.3"
+      sources."follow-redirects-1.2.4"
       sources."fs-extra-1.0.0"
       sources."fs.notify-0.0.4"
+      sources."hash-sum-1.0.2"
       sources."i18next-1.10.6"
       sources."is-utf8-0.2.1"
-      sources."js-yaml-3.7.0"
+      sources."js-yaml-3.8.4"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonata-1.0.10"
+      sources."jsonata-1.2.6"
       sources."media-typer-0.3.0"
-      sources."mqtt-2.2.1"
+      sources."mqtt-2.9.0"
+      (sources."multer-1.3.0" // {
+        dependencies = [
+          sources."object-assign-3.0.0"
+        ];
+      })
       sources."mustache-2.3.0"
       sources."nopt-3.0.6"
-      sources."oauth2orize-1.7.0"
+      sources."oauth2orize-1.8.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.2.0"
       sources."semver-5.3.0"
       sources."sentiment-2.1.0"
-      (sources."uglify-js-2.7.5" // {
+      sources."uglify-js-3.0.20"
+      sources."when-3.7.8"
+      (sources."ws-1.1.1" // {
         dependencies = [
-          sources."async-0.2.10"
+          sources."ultron-1.0.2"
         ];
       })
-      sources."when-3.7.7"
-      sources."ws-1.1.1"
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.8"
       sources."node-red-node-email-0.1.23"
@@ -26587,7 +26874,6 @@ in
           sources."caseless-0.12.0"
           sources."form-data-2.1.4"
           sources."har-validator-4.2.1"
-          sources."qs-6.4.0"
           sources."tunnel-agent-0.6.0"
         ];
       })
@@ -26595,19 +26881,18 @@ in
       sources."bcrypt-1.0.2"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
-      sources."debug-2.2.0"
+      sources."debug-2.6.7"
       sources."depd-1.1.0"
-      sources."http-errors-1.5.1"
-      sources."iconv-lite-0.4.13"
+      sources."http-errors-1.6.1"
+      sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
-      sources."qs-6.2.0"
+      sources."qs-6.4.0"
       sources."type-is-1.6.15"
-      sources."ms-0.7.1"
+      sources."ms-2.0.0"
       sources."inherits-2.0.3"
-      sources."setprototypeof-1.0.2"
+      sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
-      sources."unpipe-1.0.0"
       sources."mime-types-2.1.15"
       sources."mime-db-1.27.0"
       sources."css-select-1.2.0"
@@ -26636,41 +26921,37 @@ in
       sources."nth-check-1.0.1"
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.1"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
+      sources."object-assign-4.1.1"
       sources."vary-1.1.1"
       sources."moment-timezone-0.5.13"
       sources."moment-2.18.1"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
-      sources."content-disposition-0.5.1"
+      sources."content-disposition-0.5.2"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
-      sources."etag-1.7.0"
-      sources."finalhandler-0.5.0"
-      sources."fresh-0.3.0"
+      sources."etag-1.8.0"
+      sources."finalhandler-1.0.3"
+      sources."fresh-0.5.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.4"
       sources."range-parser-1.2.0"
-      sources."send-0.14.1"
-      (sources."serve-static-1.11.2" // {
-        dependencies = [
-          sources."send-0.14.2"
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."send-0.15.3"
+      sources."serve-static-1.12.3"
       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.3.0"
       sources."destroy-1.0.4"
@@ -26685,18 +26966,26 @@ in
       sources."json5-0.2.0"
       sources."keygrip-1.0.1"
       sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
       sources."commist-1.0.0"
       sources."concat-stream-1.6.0"
       sources."end-of-stream-1.4.0"
       sources."help-me-1.1.0"
       sources."minimist-1.2.0"
-      sources."mqtt-packet-5.3.0"
+      sources."mqtt-packet-5.4.0"
       sources."pump-1.0.2"
       sources."reinterval-1.1.0"
       sources."split2-2.1.1"
-      sources."websocket-stream-3.3.3"
+      (sources."websocket-stream-5.0.0" // {
+        dependencies = [
+          (sources."ws-3.0.0" // {
+            dependencies = [
+              sources."safe-buffer-5.0.1"
+            ];
+          })
+        ];
+      })
       sources."xtend-4.0.1"
       sources."leven-1.0.2"
       sources."typedarray-0.0.6"
@@ -26742,29 +27031,37 @@ in
       sources."through2-filter-2.0.0"
       sources."jsonify-0.0.0"
       sources."bl-1.2.1"
+      sources."ultron-1.1.0"
+      sources."append-field-0.1.0"
+      (sources."busboy-0.2.14" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+          sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      (sources."dicer-0.2.5" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+          sources."isarray-0.0.1"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      sources."streamsearch-0.1.2"
       sources."abbrev-1.1.0"
       sources."uid2-0.0.3"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
+      sources."commander-2.9.0"
       sources."source-map-0.5.6"
-      sources."uglify-to-browserify-1.0.2"
-      sources."yargs-3.10.0"
-      sources."camelcase-1.2.1"
-      sources."cliui-2.1.0"
-      sources."decamelize-1.2.0"
-      sources."window-size-0.1.0"
-      sources."center-align-0.1.3"
-      sources."right-align-0.1.3"
-      sources."wordwrap-0.0.2"
-      sources."align-text-0.1.4"
-      sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.2"
-      sources."longest-1.0.1"
-      sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."graceful-readlink-1.0.1"
       sources."options-0.0.6"
-      sources."ultron-1.0.2"
-      sources."sax-1.2.2"
+      sources."sax-1.2.4"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
       (sources."feedparser-1.1.3" // {
@@ -26778,6 +27075,7 @@ in
       (sources."request-2.74.0" // {
         dependencies = [
           sources."bl-1.1.2"
+          sources."qs-6.2.3"
           sources."readable-stream-2.0.6"
           sources."string_decoder-0.10.31"
         ];
@@ -26791,7 +27089,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.4.1"
+          sources."async-2.5.0"
         ];
       })
       sources."har-validator-2.0.6"
@@ -26806,7 +27104,6 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
-      sources."commander-2.9.0"
       sources."is-my-json-valid-2.16.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
@@ -26815,7 +27112,6 @@ in
       sources."strip-ansi-3.0.1"
       sources."supports-color-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.1"
@@ -26889,6 +27185,7 @@ in
           sources."minimist-0.0.10"
         ];
       })
+      sources."wordwrap-0.0.3"
       (sources."mimelib-0.3.1" // {
         dependencies = [
           sources."addressparser-1.0.1"
@@ -26913,23 +27210,19 @@ in
           sources."caseless-0.12.0"
           sources."form-data-2.1.4"
           sources."har-validator-4.2.1"
-          sources."qs-6.4.0"
           sources."tunnel-agent-0.6.0"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       sources."rc-1.1.7"
       sources."rimraf-2.5.4"
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
+          sources."debug-2.2.0"
           sources."once-1.3.3"
           sources."readable-stream-2.1.5"
+          sources."ms-0.7.1"
           sources."string_decoder-0.10.31"
         ];
       })
@@ -26940,7 +27233,6 @@ in
       sources."delegates-1.0.0"
       sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.2"
@@ -27093,25 +27385,30 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.0.3";
+    version = "5.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz";
-      sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856";
+      url = "https://registry.npmjs.org/npm/-/npm-5.2.0.tgz";
+      sha1 = "0014eb05ead6870587fa1c068108935c898e9847";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
       sources."abbrev-1.1.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-3.0.0"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.1.2"
       sources."archy-1.0.0"
       sources."bluebird-3.5.0"
-      sources."cacache-9.2.8"
+      sources."cacache-9.2.9"
       sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
-      sources."columnify-1.5.4"
+      (sources."columnify-1.5.4" // {
+        dependencies = [
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."config-chain-1.1.11"
       sources."detect-indent-5.0.0"
       sources."dezalgo-1.0.3"
@@ -27123,20 +27420,21 @@ in
       sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
       sources."init-package-json-1.10.1"
       sources."lazy-property-1.0.0"
+      sources."libnpx-9.0.7"
       sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
-      sources."lru-cache-4.0.2"
+      sources."lru-cache-4.1.1"
       sources."mississippi-1.3.0"
       sources."mkdirp-0.5.1"
       sources."move-concurrently-1.0.1"
@@ -27146,33 +27444,29 @@ in
         ];
       })
       sources."nopt-4.0.1"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-5.1.2"
-      sources."npm-registry-client-8.3.0"
+      sources."npm-registry-client-8.4.0"
       sources."npm-user-validate-1.0.0"
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       sources."once-1.4.0"
       sources."opener-1.4.3"
       sources."osenv-0.1.4"
-      sources."pacote-2.7.36"
+      sources."pacote-2.7.38"
       sources."path-is-inside-1.0.2"
       sources."promise-inflight-1.0.1"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.5"
+      sources."read-package-json-2.0.10"
       sources."read-package-tree-5.1.6"
-      (sources."readable-stream-2.2.11" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."readable-stream-2.3.3"
       sources."request-2.81.0"
       sources."retry-0.10.1"
       sources."rimraf-2.6.1"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -27186,17 +27480,18 @@ in
         ];
       })
       sources."ssri-4.1.6"
-      sources."strip-ansi-3.0.1"
+      sources."strip-ansi-4.0.0"
       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."unpipe-1.0.0"
-      sources."update-notifier-2.1.0"
-      sources."uuid-3.0.1"
+      sources."update-notifier-2.2.0"
+      sources."uuid-3.1.0"
       sources."validate-npm-package-name-3.0.0"
       sources."which-1.2.14"
+      sources."worker-farm-1.4.1"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.1.0"
       sources."debuglog-1.0.1"
@@ -27216,7 +27511,7 @@ in
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
       sources."proto-list-1.2.4"
-      sources."asap-2.0.5"
+      sources."asap-2.0.6"
       sources."fstream-ignore-1.0.5"
       sources."minimatch-3.0.4"
       sources."brace-expansion-1.1.8"
@@ -27225,6 +27520,69 @@ in
       sources."fs.realpath-1.0.0"
       sources."path-is-absolute-1.0.1"
       sources."promzard-0.3.0"
+      sources."dotenv-4.0.0"
+      sources."yargs-8.0.2"
+      sources."camelcase-4.1.0"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      sources."get-caller-file-1.0.2"
+      sources."os-locale-2.0.0"
+      sources."read-pkg-up-2.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."set-blocking-2.0.0"
+      (sources."string-width-2.1.0" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
+      sources."which-module-2.0.0"
+      sources."yargs-parser-7.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."execa-0.5.1"
+      sources."lcid-1.0.0"
+      sources."mem-1.1.0"
+      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."object-assign-4.1.1"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
+      sources."path-key-2.0.1"
+      sources."invert-kv-1.0.0"
+      sources."mimic-fn-1.1.0"
+      sources."find-up-2.1.0"
+      sources."read-pkg-2.0.0"
+      sources."locate-path-2.0.0"
+      sources."p-locate-2.0.0"
+      sources."path-exists-3.0.0"
+      sources."p-limit-1.1.0"
+      sources."load-json-file-2.0.0"
+      sources."path-type-2.0.0"
+      sources."parse-json-2.2.0"
+      sources."pify-2.3.0"
+      sources."strip-bom-3.0.0"
+      sources."error-ex-1.3.1"
+      sources."is-arrayish-0.2.1"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
       sources."pseudomap-1.0.2"
@@ -27255,39 +27613,41 @@ in
       sources."builtin-modules-1.1.1"
       sources."are-we-there-yet-1.1.4"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
-      sources."set-blocking-2.0.0"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."delegates-1.0.0"
-      sources."object-assign-4.1.1"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
+      (sources."wide-align-1.1.2" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."make-fetch-happen-2.4.12"
-      sources."npm-pick-manifest-1.0.3"
+      sources."make-fetch-happen-2.4.13"
+      sources."npm-pick-manifest-1.0.4"
       sources."promise-retry-1.1.1"
       sources."protoduck-4.0.0"
       sources."tar-fs-1.15.3"
       sources."tar-stream-1.5.4"
-      sources."agentkeepalive-3.2.0"
+      sources."agentkeepalive-3.3.0"
       sources."http-cache-semantics-3.7.3"
-      sources."http-proxy-agent-1.0.0"
-      sources."https-proxy-agent-1.0.0"
+      sources."http-proxy-agent-2.0.0"
+      sources."https-proxy-agent-2.0.0"
       sources."node-fetch-npm-2.0.1"
-      sources."socks-proxy-agent-2.1.1"
+      sources."socks-proxy-agent-3.0.0"
       sources."humanize-ms-1.2.1"
       sources."ms-2.0.0"
-      (sources."agent-base-2.1.1" // {
-        dependencies = [
-          sources."semver-5.0.3"
-        ];
-      })
-      sources."extend-3.0.1"
+      sources."agent-base-4.1.0"
       sources."debug-2.6.8"
+      sources."es6-promisify-5.0.0"
+      sources."es6-promise-4.1.1"
       sources."encoding-0.1.12"
       sources."json-parse-helpfulerror-1.0.3"
       sources."iconv-lite-0.4.18"
@@ -27303,16 +27663,13 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      (sources."string_decoder-1.0.2" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
+      sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
@@ -27373,52 +27730,69 @@ in
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
-      (sources."boxen-1.1.0" // {
+      (sources."boxen-1.2.0" // {
         dependencies = [
-          sources."string-width-2.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
+          sources."chalk-2.0.1"
+        ];
+      })
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."ansi-styles-2.2.1"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
+          sources."ansi-regex-2.1.1"
         ];
       })
-      sources."chalk-1.1.3"
       sources."configstore-3.1.0"
+      sources."import-lazy-2.1.0"
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
-      sources."lazy-req-2.0.0"
       sources."semver-diff-2.1.0"
       sources."xdg-basedir-3.0.0"
-      (sources."ansi-align-2.0.0" // {
+      sources."ansi-align-2.0.0"
+      sources."cli-boxes-1.0.0"
+      (sources."term-size-1.2.0" // {
         dependencies = [
-          sources."string-width-2.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
+          sources."execa-0.7.0"
+          sources."cross-spawn-5.1.0"
+          sources."get-stream-3.0.0"
         ];
       })
-      sources."camelcase-4.1.0"
-      sources."cli-boxes-1.0.0"
-      sources."term-size-0.1.1"
-      sources."widest-line-1.0.0"
-      sources."execa-0.4.0"
-      sources."cross-spawn-async-2.2.5"
-      sources."is-stream-1.1.0"
-      sources."npm-run-path-1.0.0"
-      sources."path-key-1.0.0"
-      sources."strip-eof-1.0.0"
-      sources."ansi-styles-2.2.1"
+      (sources."widest-line-1.0.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."ansi-styles-3.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
+      sources."supports-color-4.2.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.2"
+      sources."has-flag-2.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
       sources."dot-prop-4.1.1"
       sources."make-dir-1.0.0"
       sources."unique-string-1.0.0"
       sources."is-obj-1.0.1"
-      sources."pify-2.3.0"
       sources."crypto-random-string-1.0.0"
       sources."package-json-4.0.1"
-      sources."got-6.7.1"
+      (sources."got-6.7.1" // {
+        dependencies = [
+          sources."get-stream-3.0.0"
+        ];
+      })
       sources."registry-auth-token-3.3.1"
       sources."registry-url-3.1.0"
       sources."create-error-class-3.0.2"
       sources."duplexer3-0.1.4"
-      sources."get-stream-3.0.0"
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
       sources."lowercase-keys-1.0.0"
@@ -27436,6 +27810,8 @@ in
       sources."strip-json-comments-2.0.1"
       sources."builtins-1.0.3"
       sources."isexe-2.0.0"
+      sources."errno-0.1.4"
+      sources."prr-0.0.0"
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
@@ -27496,7 +27872,7 @@ in
       sources."rimraf-2.6.1"
       sources."retry-0.6.0"
       sources."couch-login-0.1.20"
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -27514,7 +27890,7 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -27577,19 +27953,11 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      (sources."readable-stream-2.2.11" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."readable-stream-2.3.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      (sources."string_decoder-1.0.2" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
@@ -27641,17 +28009,17 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.11.3";
+    version = "2.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.11.3.tgz";
-      sha1 = "5e0172857f89004340b1b9afc0e9acb3bc56d440";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.12.1.tgz";
+      sha1 = "9a41006f5186e8a59da7fd2b466fee9e896d865d";
     };
     dependencies = [
       sources."bluebird-3.5.0"
       sources."chalk-1.1.3"
       sources."cint-8.2.1"
       sources."cli-table-0.3.1"
-      sources."commander-2.9.0"
+      sources."commander-2.11.0"
       sources."fast-diff-1.1.1"
       sources."find-up-1.1.2"
       sources."get-stdin-5.0.1"
@@ -27667,7 +28035,7 @@ in
       sources."require-dir-0.3.2"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.34.4" // {
+      (sources."snyk-1.36.2" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -27678,13 +28046,30 @@ in
           sources."timed-out-2.0.0"
         ];
       })
-      sources."spawn-please-0.2.0"
-      (sources."update-notifier-1.0.3" // {
+      sources."spawn-please-0.3.0"
+      (sources."update-notifier-2.2.0" // {
         dependencies = [
-          sources."boxen-0.6.0"
-          sources."configstore-2.1.0"
-          sources."camelcase-2.1.1"
-          sources."uuid-2.0.3"
+          (sources."boxen-1.2.0" // {
+            dependencies = [
+              sources."chalk-2.0.1"
+            ];
+          })
+          sources."configstore-3.1.0"
+          sources."latest-version-3.1.0"
+          sources."xdg-basedir-3.0.0"
+          sources."camelcase-4.1.0"
+          sources."string-width-2.1.0"
+          sources."ansi-styles-3.1.0"
+          sources."supports-color-4.2.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+          sources."dot-prop-4.1.1"
+          sources."write-file-atomic-2.1.0"
+          sources."package-json-4.0.1"
+          sources."got-6.7.1"
+          sources."timed-out-4.0.1"
+          sources."unzip-response-2.0.1"
         ];
       })
       sources."ansi-styles-2.2.1"
@@ -27694,7 +28079,6 @@ in
       sources."supports-color-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"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
@@ -27704,7 +28088,7 @@ in
       sources."ansistyles-0.1.3"
       sources."aproba-1.0.4"
       sources."archy-1.0.0"
-      sources."asap-2.0.5"
+      sources."asap-2.0.6"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
@@ -27764,7 +28148,7 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.5"
+      sources."read-package-json-2.0.10"
       sources."read-package-tree-5.1.6"
       (sources."readable-stream-2.1.5" // {
         dependencies = [
@@ -27837,21 +28221,21 @@ in
       sources."es6-symbol-3.1.1"
       sources."ms-2.0.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.23"
+      sources."es5-ext-0.10.24"
       sources."es6-iterator-2.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.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."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -27949,9 +28333,11 @@ in
       sources."open-0.0.5"
       sources."os-name-1.0.3"
       sources."snyk-config-1.0.1"
+      sources."snyk-gradle-plugin-1.0.2"
       sources."snyk-module-1.8.1"
+      sources."snyk-mvn-plugin-1.0.0"
       sources."snyk-policy-1.7.1"
-      sources."snyk-python-plugin-1.0.0"
+      sources."snyk-python-plugin-1.2.2"
       (sources."snyk-recursive-readdir-2.0.0" // {
         dependencies = [
           sources."minimatch-3.0.2"
@@ -27963,6 +28349,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
+      sources."snyk-sbt-plugin-1.0.2"
       sources."snyk-tree-1.0.0"
       sources."snyk-try-require-1.2.0"
       (sources."tempfile-1.1.1" // {
@@ -28015,9 +28402,26 @@ in
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
-      sources."js-yaml-3.8.4"
+      sources."clone-deep-0.3.0"
+      sources."for-own-1.0.0"
+      sources."is-plain-object-2.0.4"
+      (sources."shallow-clone-0.1.2" // {
+        dependencies = [
+          sources."kind-of-2.0.1"
+          sources."lazy-cache-0.2.7"
+        ];
+      })
+      sources."for-in-1.0.2"
+      sources."isobject-3.0.1"
+      sources."is-extendable-0.1.1"
+      (sources."mixin-object-2.0.1" // {
+        dependencies = [
+          sources."for-in-0.1.8"
+        ];
+      })
+      sources."js-yaml-3.9.0"
       sources."argparse-1.0.9"
-      sources."esprima-3.1.3"
+      sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
       (sources."clite-0.3.0" // {
         dependencies = [
@@ -28094,7 +28498,7 @@ in
       sources."is-utf8-0.2.1"
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
-      sources."promise-7.3.0"
+      sources."promise-7.3.1"
       sources."string-length-1.0.1"
       sources."duplexify-3.5.0"
       sources."infinity-agent-2.0.3"
@@ -28106,9 +28510,33 @@ in
       })
       sources."stream-shift-1.0.0"
       sources."querystring-0.2.0"
-      sources."lazy-req-1.1.0"
-      sources."ansi-align-1.1.0"
+      sources."import-lazy-2.1.0"
+      (sources."ansi-align-2.0.0" // {
+        dependencies = [
+          sources."string-width-2.1.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."cli-boxes-1.0.0"
+      sources."term-size-1.2.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.2"
+      sources."has-flag-2.0.0"
+      sources."execa-0.7.0"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."strip-eof-1.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."path-key-2.0.1"
+      sources."make-dir-1.0.0"
+      sources."unique-string-1.0.0"
+      sources."crypto-random-string-1.0.0"
+      sources."duplexer3-0.1.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -28134,11 +28562,10 @@ in
           sources."content-type-1.0.2"
         ];
       })
-      (sources."compression-1.6.2" // {
+      (sources."compression-1.7.0" // {
         dependencies = [
-          sources."bytes-2.3.0"
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
+          sources."bytes-2.5.0"
+          sources."debug-2.6.8"
         ];
       })
       sources."connect-busboy-0.0.2"
@@ -28160,7 +28587,7 @@ in
           sources."ms-0.7.1"
         ];
       })
-      sources."js-yaml-3.8.4"
+      sources."js-yaml-3.9.0"
       sources."mediawiki-title-0.5.6"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
       sources."node-uuid-1.4.8"
@@ -28189,7 +28616,7 @@ in
           sources."camelcase-3.0.0"
         ];
       })
-      sources."asap-2.0.5"
+      sources."asap-2.0.6"
       sources."is-arguments-1.0.2"
       sources."bytes-2.4.0"
       sources."debug-2.6.7"
@@ -28212,6 +28639,7 @@ in
       sources."accepts-1.3.3"
       sources."compressible-2.0.10"
       sources."on-headers-1.0.1"
+      sources."safe-buffer-5.1.1"
       sources."vary-1.1.1"
       sources."busboy-0.2.14"
       sources."dicer-0.2.5"
@@ -28249,7 +28677,7 @@ in
         ];
       })
       sources."object.assign-4.0.4"
-      sources."promise-7.3.0"
+      sources."promise-7.3.1"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
@@ -28291,7 +28719,7 @@ in
       sources."define-properties-1.1.2"
       sources."foreach-2.0.5"
       sources."argparse-1.0.9"
-      sources."esprima-3.1.3"
+      sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -28308,7 +28736,6 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.1.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -28361,10 +28788,9 @@ in
       sources."hot-shots-4.5.0"
       (sources."limitation-0.2.0" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."dnscache-1.0.1"
@@ -28391,29 +28817,26 @@ in
       sources."hat-0.0.3"
       (sources."kad-fs-0.0.4" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."kad-localstorage-0.0.7"
       (sources."kad-memstore-0.0.1" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."lodash-3.10.1"
       sources."merge-1.2.0"
       (sources."msgpack5-3.4.1" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."process-nextick-args-1.0.7"
@@ -28421,10 +28844,9 @@ in
       sources."dom-storage-2.0.2"
       (sources."bl-1.2.1" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."get-caller-file-1.0.2"
@@ -28452,7 +28874,7 @@ in
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."path-type-1.1.0"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
@@ -28460,7 +28882,7 @@ in
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -28485,10 +28907,10 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.36.3";
+    version = "0.37.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.3.tgz";
-      sha1 = "7100ab8190192a19633c98a2ea124e089a68c19e";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz";
+      sha1 = "535019f8dcbae8932bd38b28533bf61c0f979048";
     };
     dependencies = [
       sources."airplayer-2.0.0"
@@ -28527,7 +28949,7 @@ in
           sources."bencode-0.7.0"
         ];
       })
-      sources."windows-no-runnable-0.0.6"
+      sources."winreg-1.2.3"
       sources."xtend-4.0.1"
       sources."airplay-protocol-2.0.2"
       sources."appendable-cli-menu-2.0.0"
@@ -28544,12 +28966,12 @@ in
       sources."big-integer-1.6.23"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
@@ -28588,7 +29010,7 @@ in
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
@@ -28597,7 +29019,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -28645,11 +29067,11 @@ in
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.7"
-      sources."parse-torrent-file-4.0.2"
+      sources."parse-torrent-file-4.0.3"
       sources."simple-get-2.6.0"
       sources."thirty-two-1.0.2"
       sources."uniq-1.0.1"
-      sources."bencode-0.11.0"
+      sources."bencode-1.0.0"
       sources."simple-sha1-2.1.0"
       sources."rusha-0.8.6"
       sources."simple-concat-1.0.0"
@@ -28682,11 +29104,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."randombytes-2.0.5" // {
-        dependencies = [
-          sources."safe-buffer-5.1.0"
-        ];
-      })
+      sources."randombytes-2.0.5"
       sources."run-parallel-1.1.6"
       sources."buffer-alloc-unsafe-1.0.0"
       sources."debug-2.6.8"
@@ -28732,8 +29150,8 @@ in
       })
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.6.2"
-      sources."bn.js-4.11.6"
+      sources."k-rpc-socket-1.7.1"
+      sources."bn.js-4.11.7"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
@@ -28741,6 +29159,7 @@ in
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
           sources."ws-2.3.1"
+          sources."safe-buffer-5.0.1"
         ];
       })
       sources."string2compact-1.2.2"
@@ -28749,7 +29168,7 @@ in
           sources."ultron-1.0.2"
         ];
       })
-      sources."ipaddr.js-1.3.0"
+      sources."ipaddr.js-1.4.0"
       sources."get-browser-rtc-1.0.2"
       sources."ultron-1.1.0"
       sources."addr-to-ip-port-1.4.2"
@@ -29047,7 +29466,7 @@ in
       sources."run-parallel-1.1.6"
       sources."thunky-1.0.2"
       sources."buffer-alloc-unsafe-1.0.0"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."ip-1.1.5"
       sources."fifo-0.1.4"
       (sources."peer-wire-protocol-0.7.0" // {
@@ -29083,31 +29502,30 @@ in
       })
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      (sources."k-rpc-socket-1.6.2" // {
+      (sources."k-rpc-socket-1.7.1" // {
         dependencies = [
-          sources."bencode-0.11.0"
+          sources."bencode-1.0.0"
         ];
       })
-      sources."bn.js-4.11.6"
+      sources."bn.js-4.11.7"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
       sources."simple-get-2.6.0"
       (sources."simple-peer-6.4.4" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
-          sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
+          sources."string_decoder-1.0.3"
         ];
       })
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
+          sources."readable-stream-2.3.3"
           sources."ws-2.3.1"
           sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
           sources."safe-buffer-5.0.1"
-          sources."string_decoder-1.0.2"
           sources."ultron-1.1.0"
         ];
       })
@@ -29199,7 +29617,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.4.1"
+      sources."async-2.5.0"
       sources."lodash-4.17.4"
       sources."mime-db-1.27.0"
       sources."assert-plus-0.2.0"
@@ -29237,7 +29655,7 @@ in
       sources."sntp-1.0.9"
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
-      sources."commander-2.9.0"
+      sources."commander-2.11.0"
       sources."is-my-json-valid-2.16.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -29245,7 +29663,6 @@ in
       sources."strip-ansi-3.0.1"
       sources."supports-color-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.1"
@@ -29265,10 +29682,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.4.4";
+    version = "1.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.4.4.tgz";
-      sha1 = "a8d1447b14c9bf67e6d420dcadd10fb9a4fad65a";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.5.2.tgz";
+      sha1 = "7ea0751da27b93bfb6cecfcec509994f52d83bb3";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -29293,7 +29710,7 @@ in
           sources."source-map-0.1.31"
         ];
       })
-      sources."commander-2.9.0"
+      sources."commander-2.11.0"
       sources."detective-4.5.0"
       sources."glob-5.0.15"
       sources."graceful-fs-4.1.11"
@@ -29302,7 +29719,6 @@ in
       sources."private-0.1.7"
       sources."q-1.5.0"
       sources."recast-0.11.23"
-      sources."graceful-readlink-1.0.1"
       sources."acorn-4.0.13"
       sources."defined-1.0.0"
       sources."inflight-1.0.6"
@@ -29364,7 +29780,7 @@ in
       sources."crypto-0.0.3"
       sources."xml2js-0.2.4"
       sources."xmlbuilder-0.4.2"
-      sources."sax-1.2.2"
+      sources."sax-1.2.4"
       sources."coffee-script-1.6.3"
       sources."node-uuid-1.4.1"
       (sources."connect-2.11.0" // {
@@ -29425,7 +29841,7 @@ in
       sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -29515,15 +29931,15 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."compression-1.6.2" // {
+      (sources."compression-1.7.0" // {
         dependencies = [
-          sources."bytes-2.3.0"
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
+          sources."bytes-2.5.0"
+          sources."debug-2.6.8"
+          sources."ms-2.0.0"
         ];
       })
-      sources."commander-2.9.0"
-      sources."js-yaml-3.8.4"
+      sources."commander-2.11.0"
+      sources."js-yaml-3.9.0"
       sources."cookies-0.7.0"
       sources."request-2.81.0"
       sources."async-0.9.2"
@@ -29604,9 +30020,9 @@ in
       sources."iconv-lite-0.4.8"
       sources."compressible-2.0.10"
       sources."on-headers-1.0.1"
-      sources."graceful-readlink-1.0.1"
+      sources."safe-buffer-5.1.1"
       sources."argparse-1.0.9"
-      sources."esprima-3.1.3"
+      sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
       sources."keygrip-1.0.1"
       sources."aws-sign2-0.6.0"
@@ -29624,7 +30040,6 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.1.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -29708,8 +30123,7 @@ in
       sources."uc.micro-1.0.3"
       (sources."htmlparser2-3.9.2" // {
         dependencies = [
-          sources."readable-stream-2.2.11"
-          sources."safe-buffer-5.0.1"
+          sources."readable-stream-2.3.3"
         ];
       })
       sources."regexp-quote-0.0.0"
@@ -29725,11 +30139,7 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      (sources."string_decoder-1.0.2" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."jsonparse-1.3.1"
       sources."through-2.3.8"
@@ -29764,7 +30174,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."graceful-fs-4.1.11"
       sources."minimatch-3.0.4"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
@@ -29773,8 +30183,8 @@ in
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -29908,11 +30318,11 @@ in
         ];
       })
       sources."json-schema-0.2.3"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
@@ -29972,8 +30382,8 @@ in
       sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
     };
     dependencies = [
-      sources."sax-1.2.2"
-      sources."coa-1.0.3"
+      sources."sax-1.2.4"
+      sources."coa-1.0.4"
       sources."js-yaml-3.7.0"
       sources."colors-1.1.2"
       sources."whet.extend-0.9.9"
@@ -30021,14 +30431,14 @@ in
       sources."graceful-fs-4.1.11"
       sources."object-assign-4.1.1"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."prr-0.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."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -30050,10 +30460,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.3.4";
+    version = "2.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz";
-      sha1 = "3d38321828231e434f287514959c37a82b629f42";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz";
+      sha1 = "c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -30066,10 +30476,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.0.17";
+    version = "3.0.24";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.17.tgz";
-      sha1 = "d228cd55c2df9b3d2f53f147568cb4cc4a72cc06";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.24.tgz";
+      sha1 = "ee93400ad9857fb7a1671778db83f6a23f033121";
     };
     dependencies = [
       sources."commander-2.9.0"
@@ -30087,10 +30497,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.19";
+    version = "1.1.23";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.19.tgz";
-      sha1 = "83e0c9d79c808f7acb5f2da5a1ea77e3db571558";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.23.tgz";
+      sha1 = "8067752f07877ef4311833146d58f7badf2f9f4a";
     };
     dependencies = [
       sources."async-2.4.1"
@@ -30108,7 +30518,16 @@ in
       sources."hasher-1.2.0"
       sources."ignore-3.2.7"
       sources."just-detect-adblock-1.0.0"
-      sources."keen.io-0.1.3"
+      (sources."keen.io-0.1.3" // {
+        dependencies = [
+          sources."superagent-0.21.0"
+          sources."qs-1.2.0"
+          sources."mime-1.2.11"
+          sources."methods-1.0.1"
+          sources."form-data-0.1.3"
+          sources."async-0.9.2"
+        ];
+      })
       sources."knockout-3.4.2"
       sources."lodash-4.17.4"
       (sources."mkdirp-0.5.1" // {
@@ -30122,8 +30541,17 @@ in
         dependencies = [
           sources."nopt-4.0.1"
           sources."npm-registry-client-8.1.1"
+          sources."readable-stream-2.2.11"
           sources."request-2.81.0"
+          sources."isarray-1.0.0"
+          sources."safe-buffer-5.0.1"
+          (sources."string_decoder-1.0.3" // {
+            dependencies = [
+              sources."safe-buffer-5.1.1"
+            ];
+          })
           sources."combined-stream-1.0.5"
+          sources."extend-3.0.1"
           sources."forever-agent-0.6.1"
           sources."form-data-2.1.4"
           sources."hawk-3.1.3"
@@ -30141,6 +30569,7 @@ in
         dependencies = [
           sources."request-2.81.0"
           sources."combined-stream-1.0.5"
+          sources."extend-3.0.1"
           sources."forever-agent-0.6.1"
           sources."form-data-2.1.4"
           sources."hawk-3.1.3"
@@ -30183,18 +30612,18 @@ in
           sources."ms-0.7.2"
         ];
       })
-      (sources."superagent-0.21.0" // {
+      (sources."superagent-3.5.2" // {
         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"
-          sources."readable-stream-1.0.27-1"
-          sources."async-0.9.2"
-          sources."isarray-0.0.1"
-          sources."string_decoder-0.10.31"
+          sources."component-emitter-1.2.1"
+          sources."cookiejar-2.1.1"
+          sources."extend-3.0.1"
+          sources."form-data-2.2.0"
+          sources."formidable-1.1.1"
+          sources."readable-stream-2.3.3"
+          sources."combined-stream-1.0.5"
+          sources."delayed-stream-1.0.0"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
         ];
       })
       (sources."temp-0.8.3" // {
@@ -30210,8 +30639,10 @@ in
       })
       (sources."yargs-8.0.2" // {
         dependencies = [
-          sources."string-width-2.0.0"
+          sources."string-width-2.1.0"
           sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
         ];
       })
       sources."bytes-2.4.0"
@@ -30240,7 +30671,7 @@ in
       sources."is-arrayish-0.3.1"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."diff-3.2.0"
+      sources."diff-3.3.0"
       (sources."hogan.js-3.0.2" // {
         dependencies = [
           sources."mkdirp-0.3.0"
@@ -30353,6 +30784,15 @@ in
       sources."editions-1.3.3"
       sources."typechecker-4.4.1"
       sources."underscore-1.5.2"
+      sources."formidable-1.0.14"
+      sources."component-emitter-1.1.2"
+      sources."cookiejar-2.0.1"
+      sources."reduce-component-1.0.1"
+      sources."extend-1.2.1"
+      sources."readable-stream-1.0.27-1"
+      sources."core-util-is-1.0.2"
+      sources."isarray-0.0.1"
+      sources."string_decoder-0.10.31"
       sources."clone-2.1.1"
       sources."JSONStream-1.3.1"
       sources."ansi-regex-2.1.1"
@@ -30360,7 +30800,7 @@ in
       sources."ansistyles-0.1.3"
       sources."aproba-1.1.2"
       sources."archy-1.0.0"
-      sources."asap-2.0.5"
+      sources."asap-2.0.6"
       sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
@@ -30369,7 +30809,13 @@ in
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
       sources."fs-vacuum-1.2.10"
-      sources."fs-write-stream-atomic-1.0.10"
+      (sources."fs-write-stream-atomic-1.0.10" // {
+        dependencies = [
+          sources."readable-stream-2.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
+        ];
+      })
       sources."fstream-1.0.11"
       sources."fstream-npm-1.2.1"
       (sources."glob-7.1.2" // {
@@ -30412,20 +30858,23 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.5"
+      sources."read-package-json-2.0.10"
       sources."read-package-tree-5.1.6"
-      sources."readable-stream-2.2.11"
       sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.1"
-      sources."sha-2.0.1"
+      (sources."sha-2.0.1" // {
+        dependencies = [
+          sources."readable-stream-2.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
+        ];
+      })
       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."string_decoder-0.10.31"
         ];
       })
       sources."strip-ansi-3.0.1"
@@ -30459,6 +30908,9 @@ in
         ];
       })
       sources."proto-list-1.2.4"
+      sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.1"
+      sources."util-deprecate-1.0.2"
       (sources."fstream-ignore-1.0.5" // {
         dependencies = [
           sources."minimatch-3.0.4"
@@ -30472,21 +30924,54 @@ 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.6.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
+        ];
+      })
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
+          sources."readable-stream-2.3.3"
           sources."once-1.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
         ];
       })
       sources."end-of-stream-1.4.0"
-      sources."flush-write-stream-1.0.2"
-      sources."from2-2.3.0"
-      sources."parallel-transform-1.1.0"
+      (sources."flush-write-stream-1.0.2" // {
+        dependencies = [
+          sources."readable-stream-2.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
+        ];
+      })
+      (sources."from2-2.3.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
+        ];
+      })
+      (sources."parallel-transform-1.1.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
+        ];
+      })
       sources."pump-1.0.2"
       sources."pumpify-1.3.5"
       sources."stream-each-1.2.0"
-      sources."through2-2.0.3"
+      (sources."through2-2.0.3" // {
+        dependencies = [
+          sources."readable-stream-2.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
+        ];
+      })
       sources."typedarray-0.0.6"
       sources."stream-shift-1.0.0"
       sources."cyclist-0.2.2"
@@ -30495,7 +30980,13 @@ in
       sources."run-queue-1.0.3"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      sources."are-we-there-yet-1.1.4"
+      (sources."are-we-there-yet-1.1.4" // {
+        dependencies = [
+          sources."readable-stream-2.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
+        ];
+      })
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
@@ -30512,16 +31003,9 @@ in
       sources."util-extend-1.0.3"
       sources."json-parse-helpfulerror-1.0.3"
       sources."jju-1.3.0"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
-      sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
-      sources."extend-3.0.1"
       sources."har-validator-4.2.1"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
@@ -30565,16 +31049,30 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
-      sources."stream-iterate-1.2.0"
-      sources."block-stream-0.0.9"
-      sources."unique-slug-2.0.0"
-      (sources."boxen-1.1.0" // {
+      (sources."stream-iterate-1.2.0" // {
         dependencies = [
-          sources."string-width-2.0.0"
+          sources."readable-stream-2.3.3"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.3"
+        ];
+      })
+      sources."block-stream-0.0.9"
+      sources."unique-slug-2.0.0"
+      (sources."boxen-1.2.0" // {
+        dependencies = [
+          sources."chalk-2.0.1"
+          sources."string-width-2.1.0"
           sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."ansi-styles-2.2.1"
+          sources."supports-color-2.0.0"
         ];
       })
-      sources."chalk-1.1.3"
       (sources."configstore-3.1.0" // {
         dependencies = [
           sources."write-file-atomic-2.1.0"
@@ -30587,30 +31085,37 @@ in
       sources."xdg-basedir-3.0.0"
       (sources."ansi-align-2.0.0" // {
         dependencies = [
-          sources."string-width-2.0.0"
+          sources."string-width-2.1.0"
           sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
         ];
       })
       sources."camelcase-4.1.0"
       sources."cli-boxes-1.0.0"
-      sources."term-size-0.1.1"
+      sources."term-size-1.2.0"
       sources."widest-line-1.0.0"
-      sources."execa-0.4.0"
-      (sources."cross-spawn-async-2.2.5" // {
+      sources."ansi-styles-3.1.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."supports-color-4.2.0"
+      sources."has-flag-2.0.0"
+      sources."execa-0.7.0"
+      (sources."cross-spawn-5.1.0" // {
         dependencies = [
           sources."lru-cache-4.1.1"
         ];
       })
+      sources."get-stream-3.0.0"
       sources."is-stream-1.1.0"
-      sources."npm-run-path-1.0.0"
-      sources."path-key-1.0.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
       sources."strip-eof-1.0.0"
+      sources."shebang-command-1.2.0"
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
+      sources."shebang-regex-1.0.0"
+      sources."path-key-2.0.1"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."dot-prop-4.1.1"
       sources."make-dir-1.0.0"
       sources."unique-string-1.0.0"
@@ -30623,7 +31128,6 @@ in
       sources."registry-url-3.1.0"
       sources."create-error-class-3.0.2"
       sources."duplexer3-0.1.4"
-      sources."get-stream-3.0.0"
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
       sources."lowercase-keys-1.0.0"
@@ -30637,11 +31141,7 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      (sources."ssri-4.1.6" // {
-        dependencies = [
-          sources."safe-buffer-5.1.0"
-        ];
-      })
+      sources."ssri-4.1.6"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
@@ -30654,11 +31154,7 @@ in
           sources."ms-0.7.2"
         ];
       })
-      (sources."has-binary-0.1.7" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
+      sources."has-binary-0.1.7"
       (sources."socket.io-adapter-0.5.0" // {
         dependencies = [
           sources."debug-2.3.3"
@@ -30667,6 +31163,7 @@ in
       })
       (sources."socket.io-client-1.7.4" // {
         dependencies = [
+          sources."component-emitter-1.2.1"
           sources."debug-2.3.3"
           sources."ms-0.7.2"
         ];
@@ -30674,8 +31171,6 @@ in
       (sources."socket.io-parser-2.3.1" // {
         dependencies = [
           sources."debug-2.2.0"
-          sources."component-emitter-1.1.2"
-          sources."isarray-0.0.1"
           sources."ms-0.7.1"
         ];
       })
@@ -30691,9 +31186,9 @@ in
       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.4" // {
         dependencies = [
+          sources."component-emitter-1.2.1"
           sources."debug-2.3.3"
           sources."ws-1.1.2"
           sources."ms-0.7.2"
@@ -30712,18 +31207,15 @@ in
       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."cliui-3.2.0"
       sources."decamelize-1.2.0"
       sources."get-caller-file-1.0.2"
       (sources."os-locale-2.0.0" // {
         dependencies = [
           sources."execa-0.5.1"
+          sources."cross-spawn-4.0.2"
           sources."get-stream-2.3.1"
-          sources."npm-run-path-2.0.2"
-          sources."path-key-2.0.1"
+          sources."lru-cache-4.1.1"
         ];
       })
       sources."read-pkg-up-2.0.0"
@@ -30735,12 +31227,6 @@ in
       sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."mem-1.1.0"
-      (sources."cross-spawn-4.0.2" // {
-        dependencies = [
-          sources."lru-cache-4.1.1"
-        ];
-      })
-      sources."p-finally-1.0.0"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
       sources."invert-kv-1.0.0"
@@ -30862,7 +31348,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.4.1"
+      sources."async-2.5.0"
       sources."lodash-4.17.4"
       sources."mime-db-1.27.0"
       sources."assert-plus-0.2.0"
@@ -30900,7 +31386,7 @@ in
       sources."sntp-1.0.9"
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
-      sources."commander-2.9.0"
+      sources."commander-2.11.0"
       sources."is-my-json-valid-2.16.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -30908,7 +31394,6 @@ in
       sources."strip-ansi-3.0.1"
       sources."supports-color-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.1"
@@ -30930,27 +31415,28 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "2.6.1";
+    version = "3.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz";
-      sha1 = "2e0457f0abb1ac5df3ab106c69c672f236785f07";
+      url = "https://registry.npmjs.org/webpack/-/webpack-3.2.0.tgz";
+      sha1 = "8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f";
     };
     dependencies = [
-      sources."acorn-5.0.3"
+      sources."acorn-5.1.1"
       (sources."acorn-dynamic-import-2.0.2" // {
         dependencies = [
           sources."acorn-4.0.13"
         ];
       })
-      sources."ajv-4.11.8"
-      sources."ajv-keywords-1.5.1"
-      sources."async-2.4.1"
-      sources."enhanced-resolve-3.1.0"
+      sources."ajv-5.2.2"
+      sources."ajv-keywords-2.1.0"
+      sources."async-2.5.0"
+      sources."enhanced-resolve-3.3.0"
+      sources."escope-3.6.0"
       sources."interpret-1.0.3"
       sources."json-loader-0.5.4"
       sources."json5-0.5.1"
       sources."loader-runner-2.3.0"
-      sources."loader-utils-0.2.17"
+      sources."loader-utils-1.1.0"
       sources."memory-fs-0.4.1"
       sources."mkdirp-0.5.1"
       (sources."node-libs-browser-2.0.0" // {
@@ -30961,13 +31447,9 @@ in
       sources."source-map-0.5.6"
       sources."supports-color-3.2.3"
       sources."tapable-0.2.6"
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."yargs-3.10.0"
-        ];
-      })
+      sources."uglifyjs-webpack-plugin-0.4.6"
       sources."watchpack-1.3.1"
-      sources."webpack-sources-0.2.3"
+      sources."webpack-sources-1.0.1"
       (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
@@ -30975,22 +31457,34 @@ in
         ];
       })
       sources."co-4.6.0"
+      sources."fast-deep-equal-1.0.0"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
       sources."lodash-4.17.4"
       sources."graceful-fs-4.1.11"
       sources."object-assign-4.1.1"
+      sources."es6-map-0.1.5"
+      sources."es6-weak-map-2.0.2"
+      sources."esrecurse-4.2.0"
+      sources."estraverse-4.2.0"
+      sources."d-1.0.0"
+      sources."es5-ext-0.10.24"
+      sources."es6-iterator-2.0.1"
+      sources."es6-set-0.1.5"
+      sources."es6-symbol-3.1.1"
+      sources."event-emitter-0.3.5"
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.11"
+      sources."readable-stream-2.3.3"
       sources."prr-0.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."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
       sources."assert-1.4.1"
@@ -30998,7 +31492,7 @@ in
       sources."buffer-4.9.1"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      sources."crypto-browserify-3.11.0"
+      sources."crypto-browserify-3.11.1"
       sources."domain-browser-1.1.7"
       sources."events-1.1.1"
       sources."https-browserify-0.0.1"
@@ -31023,7 +31517,7 @@ in
       })
       sources."vm-browserify-0.0.4"
       sources."pako-0.2.9"
-      sources."base64-js-1.2.0"
+      sources."base64-js-1.2.1"
       sources."ieee754-1.1.8"
       sources."date-now-0.1.4"
       sources."browserify-cipher-1.0.0"
@@ -31034,24 +31528,20 @@ in
       sources."diffie-hellman-5.0.2"
       sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
-      (sources."randombytes-2.0.5" // {
-        dependencies = [
-          sources."safe-buffer-5.1.0"
-        ];
-      })
+      sources."randombytes-2.0.5"
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.0"
       sources."buffer-xor-1.0.3"
-      sources."cipher-base-1.0.3"
+      sources."cipher-base-1.0.4"
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
-      sources."bn.js-4.11.6"
+      sources."bn.js-4.11.7"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
       sources."parse-asn1-5.1.0"
       sources."brorand-1.1.0"
-      sources."hash.js-1.0.3"
+      sources."hash.js-1.1.3"
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
@@ -31066,6 +31556,11 @@ in
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
       sources."has-flag-1.0.0"
+      (sources."uglify-js-2.8.29" // {
+        dependencies = [
+          sources."yargs-3.10.0"
+        ];
+      })
       sources."uglify-to-browserify-1.0.2"
       sources."camelcase-1.2.1"
       sources."cliui-2.1.0"
@@ -31102,7 +31597,7 @@ in
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
-      sources."arr-flatten-1.0.3"
+      sources."arr-flatten-1.1.0"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
       sources."repeat-element-1.1.2"
@@ -31137,7 +31632,7 @@ in
       sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.36"
       sources."nopt-4.0.1"
-      sources."npmlog-4.1.0"
+      sources."npmlog-4.1.2"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -31177,7 +31672,11 @@ in
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
-      sources."har-validator-4.2.1"
+      (sources."har-validator-4.2.1" // {
+        dependencies = [
+          sources."ajv-4.11.8"
+        ];
+      })
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
@@ -31239,7 +31738,7 @@ in
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-2.0.0"
-      sources."source-list-map-1.1.2"
+      sources."source-list-map-2.0.0"
       sources."get-caller-file-1.0.2"
       sources."os-locale-1.4.0"
       sources."read-pkg-up-1.0.1"
@@ -31261,7 +31760,7 @@ in
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       sources."path-type-1.1.0"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
@@ -31269,7 +31768,7 @@ in
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -31304,10 +31803,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.24.5";
+    version = "0.27.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.24.5.tgz";
-      sha1 = "92c72adf4de8dacccaf6b4259eb4990f6c4f8e3b";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.27.5.tgz";
+      sha1 = "06fe67d8040802993f9f1e1923d671cbf9ead5d1";
     };
     dependencies = [
       sources."babel-runtime-6.23.0"
@@ -31315,21 +31814,30 @@ in
       sources."camelcase-4.1.0"
       sources."chalk-1.1.3"
       sources."cmd-shim-2.0.2"
-      sources."commander-2.9.0"
+      sources."commander-2.11.0"
       sources."death-1.1.0"
       sources."debug-2.6.8"
       sources."detect-indent-5.0.0"
-      sources."gunzip-maybe-1.4.0"
+      sources."glob-7.1.2"
+      sources."gunzip-maybe-1.4.1"
       sources."ini-1.3.4"
-      sources."inquirer-3.1.0"
+      (sources."inquirer-3.2.0" // {
+        dependencies = [
+          sources."chalk-2.0.1"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-styles-3.1.0"
+          sources."supports-color-4.2.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."invariant-2.2.2"
       sources."is-builtin-module-1.0.0"
       sources."is-ci-1.0.10"
       sources."leven-2.1.0"
       sources."loud-rejection-1.6.0"
-      sources."minimatch-3.0.4"
+      sources."micromatch-2.3.11"
       sources."mkdirp-0.5.1"
-      sources."node-emoji-1.5.1"
+      sources."node-emoji-1.7.0"
       sources."object-path-0.11.4"
       sources."proper-lockfile-2.0.1"
       sources."read-1.0.7"
@@ -31352,8 +31860,17 @@ in
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
       sources."graceful-fs-4.1.11"
-      sources."graceful-readlink-1.0.1"
       sources."ms-2.0.0"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.4"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
       sources."browserify-zlib-0.1.4"
       sources."is-deflate-1.0.0"
       sources."is-gzip-1.0.0"
@@ -31362,25 +31879,22 @@ in
       sources."through2-2.0.3"
       sources."pako-0.2.9"
       sources."duplexify-3.5.0"
-      sources."end-of-stream-1.0.0"
-      sources."inherits-2.0.3"
-      sources."readable-stream-2.2.11"
+      (sources."end-of-stream-1.0.0" // {
+        dependencies = [
+          sources."once-1.3.3"
+        ];
+      })
+      sources."readable-stream-2.3.3"
       sources."stream-shift-1.0.0"
-      sources."once-1.3.3"
-      sources."wrappy-1.0.2"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.0.1"
-      sources."string_decoder-1.0.2"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       (sources."pump-1.0.2" // {
         dependencies = [
-          (sources."end-of-stream-1.4.0" // {
-            dependencies = [
-              sources."once-1.4.0"
-            ];
-          })
+          sources."end-of-stream-1.4.0"
         ];
       })
       sources."xtend-4.0.1"
@@ -31394,8 +31908,16 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."string-width-2.0.0"
+      (sources."string-width-2.1.0" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."through-2.3.8"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.2"
+      sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
@@ -31407,15 +31929,55 @@ in
       sources."is-promise-2.1.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."loose-envify-1.3.1"
-      sources."js-tokens-3.0.1"
+      sources."js-tokens-3.0.2"
       sources."builtin-modules-1.1.1"
       sources."ci-info-1.0.0"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
+      sources."arr-diff-2.0.0"
+      sources."array-unique-0.2.1"
+      sources."braces-1.8.5"
+      sources."expand-brackets-0.1.5"
+      sources."extglob-0.3.2"
+      sources."filename-regex-2.0.1"
+      sources."is-extglob-1.0.0"
+      sources."is-glob-2.0.1"
+      sources."kind-of-3.2.2"
+      sources."normalize-path-2.1.1"
+      sources."object.omit-2.0.1"
+      sources."parse-glob-3.0.4"
+      sources."regex-cache-0.4.3"
+      sources."arr-flatten-1.1.0"
+      sources."expand-range-1.8.2"
+      sources."preserve-0.2.0"
+      sources."repeat-element-1.1.2"
+      sources."fill-range-2.2.3"
+      sources."is-number-2.1.0"
+      sources."isobject-2.1.0"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.5"
+      sources."is-posix-bracket-0.1.1"
+      sources."remove-trailing-separator-1.0.2"
+      sources."for-own-0.1.5"
+      sources."is-extendable-0.1.1"
+      sources."for-in-1.0.2"
+      sources."glob-base-0.3.0"
+      sources."is-dotfile-1.0.3"
+      sources."glob-parent-2.0.0"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-primitive-2.0.0"
       sources."minimist-0.0.8"
+      sources."lodash.toarray-4.4.0"
       sources."string.prototype.codepointat-0.2.0"
       sources."retry-0.10.1"
       sources."aws-sign2-0.6.0"
@@ -31480,10 +32042,6 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
-      sources."glob-7.1.2"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."path-is-absolute-1.0.1"
       sources."chownr-1.0.1"
       sources."bl-1.2.1"
       sources."spdx-correct-1.0.2"
@@ -31507,7 +32065,7 @@ in
       sha1 = "0cd75211379ed87105f99510885759062147b517";
     };
     dependencies = [
-      sources."async-2.4.1"
+      sources."async-2.5.0"
       sources."chalk-1.1.3"
       sources."cli-list-0.2.0"
       sources."configstore-3.1.0"
@@ -31516,7 +32074,15 @@ in
       sources."fullname-3.3.0"
       sources."got-6.7.1"
       sources."humanize-string-1.0.1"
-      sources."inquirer-3.1.0"
+      (sources."inquirer-3.2.0" // {
+        dependencies = [
+          sources."chalk-2.0.1"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-styles-3.1.0"
+          sources."supports-color-4.2.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       (sources."insight-0.8.4" // {
         dependencies = [
           sources."async-1.5.2"
@@ -31594,6 +32160,7 @@ in
       (sources."yeoman-character-1.1.0" // {
         dependencies = [
           sources."supports-color-3.2.3"
+          sources."has-flag-1.0.0"
         ];
       })
       sources."yeoman-doctor-2.1.0"
@@ -31663,7 +32230,7 @@ in
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
       sources."lowercase-keys-1.0.0"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.1.1"
       sources."timed-out-4.0.1"
       sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
@@ -31678,8 +32245,16 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."string-width-2.0.0"
+      (sources."string-width-2.1.0" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."through-2.3.8"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.2"
+      sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."iconv-lite-0.4.18"
@@ -31779,7 +32354,7 @@ in
       sources."camelcase-keys-2.1.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.8"
+      sources."normalize-package-data-2.4.0"
       (sources."redent-1.0.0" // {
         dependencies = [
           sources."indent-string-2.1.0"
@@ -31789,7 +32364,7 @@ in
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.2"
+      sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -31816,20 +32391,12 @@ in
       sources."duplexer2-0.1.4"
       sources."node-status-codes-1.0.0"
       sources."read-all-stream-3.1.0"
-      (sources."readable-stream-2.2.11" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."readable-stream-2.3.3"
       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-1.0.2" // {
-        dependencies = [
-          sources."safe-buffer-5.0.1"
-        ];
-      })
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
       sources."registry-auth-token-3.3.1"
       sources."execall-1.0.0"
@@ -31865,9 +32432,12 @@ in
       sources."lodash.pad-4.5.1"
       sources."lodash.padend-4.6.1"
       sources."lodash.padstart-4.6.1"
-      (sources."boxen-1.1.0" // {
+      (sources."boxen-1.2.0" // {
         dependencies = [
           sources."camelcase-4.1.0"
+          sources."chalk-2.0.1"
+          sources."ansi-styles-3.1.0"
+          sources."supports-color-4.2.0"
         ];
       })
       sources."import-lazy-2.1.0"
@@ -31880,11 +32450,9 @@ in
       sources."semver-diff-2.1.0"
       sources."ansi-align-2.0.0"
       sources."cli-boxes-1.0.0"
-      (sources."term-size-0.1.1" // {
+      (sources."term-size-1.2.0" // {
         dependencies = [
-          sources."execa-0.4.0"
-          sources."npm-run-path-1.0.0"
-          sources."path-key-1.0.0"
+          sources."execa-0.7.0"
         ];
       })
       (sources."widest-line-1.0.0" // {
@@ -31893,7 +32461,6 @@ in
           sources."is-fullwidth-code-point-1.0.0"
         ];
       })
-      sources."has-flag-1.0.0"
       (sources."bin-version-check-2.1.0" // {
         dependencies = [
           sources."semver-4.3.6"
@@ -31919,7 +32486,7 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."diff-3.2.0"
+      sources."diff-3.3.0"
       sources."globby-6.1.0"
       sources."grouped-queue-0.3.3"
       sources."is-scoped-1.0.0"
@@ -31949,8 +32516,6 @@ in
           sources."is-fullwidth-code-point-1.0.0"
         ];
       })
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -31960,4 +32525,4 @@ in
     };
     production = true;
   };
-}
\ No newline at end of file
+}

From ab87dc585d190a2c026d106e67f870ab80809390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 14 Jul 2017 07:17:13 +0100
Subject: [PATCH 0518/3246] fast-cli: add reference to all-packages.nix

fixes #27375
---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48e9f8fc2b0..0fd2c602442 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -985,6 +985,10 @@ with pkgs;
 
   fastJson = callPackage ../development/libraries/fastjson { };
 
+  fast-cli = nodePackages.fast-cli.overrideDerivation (old: {
+    buildInputs = old.buildInputs ++ [phantomjs2];
+  });
+
   filebench = callPackage ../tools/misc/filebench { };
 
   fsmon = callPackage ../tools/misc/fsmon { };

From 9728d77cf3f03cf7d20be10f29ba5e361f8207a5 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Fri, 14 Jul 2017 17:19:18 +1000
Subject: [PATCH 0519/3246] jruby: 9.1.5.0 -> 9.1.12.0

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

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 8fed11829ca..74203eca380 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "9.1.5.0";
+  version = "9.1.12.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha256 = "0rmpbg62cy06pq8xxmnkqc2m2c5kg1kj816wbrf7qjdlzfpg7r18";
+    sha256 = "15x5w4awy8h6xfkbj0p4xnb68xzfrss1rf2prk0kzk5kyjakrcnx";
   };
 
   buildInputs = [ makeWrapper ];

From fc44b573ca2213f633c2f94908903af36de0dad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 14 Jul 2017 08:43:45 +0100
Subject: [PATCH 0520/3246] mfcl2700dnlpr: remove meta.version

---
 pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
index 3a5f8d3ce4e..1be1351bb82 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
@@ -1,7 +1,8 @@
 { coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }:
 
 stdenv.mkDerivation rec {
-  name = "mfcl2700dnlpr-${meta.version}";
+  name = "mfcl2700dnlpr-${version}";
+  version = "3.2.0-1";
 
   src = fetchurl {
     url = "http://download.brother.com/welcome/dlf102085/${name}.i386.deb";
@@ -39,6 +40,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.unfree;
     maintainers = [ stdenv.lib.maintainers.tv ];
     platforms = [ "i686-linux" ];
-    version = "3.2.0-1";
   };
 }

From 459e3864d210cd9e77f1736fab03a56dfb3baa99 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 14 Jul 2017 04:40:27 -0400
Subject: [PATCH 0521/3246] root: 6.10.00 -> 6.10.02

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

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 8916a9fd167..c13169041aa 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "root-${version}";
-  version = "6.10.00";
+  version = "6.10.02";
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    sha256 = "1rxqcpqf1b3sxig5xbh3mkvarhg9lgj2f0gv0j48klfw8kgfwlsp";
+    sha256 = "1ryp9397xpbnxha6s222c10pa50lf2qf5s35n31lc29s90p8s9kc";
   };
 
   buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ]

From 8d9740e100e9f2d9d2d2f075404e33295013560d Mon Sep 17 00:00:00 2001
From: Mikael Brockman <mikael@brockman.se>
Date: Thu, 15 Jun 2017 14:46:26 +0300
Subject: [PATCH 0522/3246] dapp: init at v0.5.2

Simple tool for creating Ethereum-based dapps
---
 pkgs/applications/altcoins/dapp.nix    | 33 ++++++++++++++++++++++++++
 pkgs/applications/altcoins/default.nix |  1 +
 pkgs/top-level/all-packages.nix        |  1 +
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/altcoins/dapp.nix

diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix
new file mode 100644
index 00000000000..e80dd6429fe
--- /dev/null
+++ b/pkgs/applications/altcoins/dapp.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchFromGitHub, makeWrapper
+, seth, git, solc, shellcheck, nodejs, hsevm }:
+
+stdenv.mkDerivation rec {
+  name = "dapp";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "dapphub";
+    repo = "dapp";
+    rev = "v${version}";
+    sha256 = "1529ml5r1l5g6xcak7k3h3ih214mgnk87jsxyk0rvk245jkard1y";
+  };
+
+  nativeBuildInputs = [makeWrapper shellcheck];
+  buildPhase = "true";
+  doCheck = false;
+  checkPhase = "make test";
+  makeFlags = ["prefix=$(out)"];
+  postInstall = let path = lib.makeBinPath [
+    nodejs solc git seth hsevm
+  ]; in ''
+    wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
+  '';
+
+  meta = {
+    description = "Simple tool for creating Ethereum-based dapps";
+    homepage = https://github.com/dapphub/dapp/;
+    maintainers = [stdenv.lib.maintainers.dbrock];
+    license = lib.licenses.gpl3;
+    inherit version;
+  };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index a2d995c36b9..1fbabc338f2 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -38,6 +38,7 @@ rec {
   ethabi = callPackage ./ethabi.nix { };
   ethrun = callPackage ./ethrun.nix { };
   seth = callPackage ./seth.nix { };
+  dapp = callPackage ./dapp.nix { };
 
   hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {});
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 600c0a8f63a..76a4594e3db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13337,6 +13337,7 @@ with pkgs;
   ethabi = self.altcoins.ethabi;
   ethrun = self.altcoins.ethrun;
   seth = self.altcoins.seth;
+  dapp = self.altcoins.dapp;
   hsevm = self.altcoins.hsevm;
 
   stellar-core = self.altcoins.stellar-core;

From 640137d2cb444c1a97caebd39ec61d891d5d4f2f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 14 Jul 2017 07:14:14 -0500
Subject: [PATCH 0523/3246] dropbox: 29.4.20 -> 30.4.22

---
 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 8eed4b7856a..155c8787430 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -24,11 +24,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "29.4.20";
+  version = "30.4.22";
   sha256 =
     {
-      "x86_64-linux" = "0w8n8q846mqq8f3yisn9xazf323sn579zyp1kwrdrmmqalwiwcl2";
-      "i686-linux"   = "0zgdnpizgkw2q6wglkdhpzzrhnpplfi2ldcw1z0k9r6slici5mfk";
+      "x86_64-linux" = "0qc99j6hpd1k5bmvcll3rjglksrjw0mw2nrwj3s3kh55j6fy8a0r";
+      "i686-linux"   = "0zyl1q76cpwly4k7h4klnyrv50nyxi2wpz5sii1a00jbmr7snhab";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 8a35f751d1f20ba73cd4c478c6dfbc46db1ced34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Jul 2017 16:28:25 +0200
Subject: [PATCH 0524/3246] nixos/spice-vdagentd: remove needless shell

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

diff --git a/nixos/modules/services/misc/spice-vdagentd.nix b/nixos/modules/services/misc/spice-vdagentd.nix
index f8133394ffd..f322ba4cbd5 100644
--- a/nixos/modules/services/misc/spice-vdagentd.nix
+++ b/nixos/modules/services/misc/spice-vdagentd.nix
@@ -23,7 +23,7 @@ in
       '';
       serviceConfig = {
         Type = "forking";
-        ExecStart = "/bin/sh -c '${pkgs.spice-vdagent}/bin/spice-vdagentd'";
+        ExecStart = "${pkgs.spice-vdagent}/bin/spice-vdagentd";
       };
     };
   };

From af7c7b42c137b65a6d12de63544cad400de636f5 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Fri, 14 Jul 2017 16:55:53 +0200
Subject: [PATCH 0525/3246] postfix: complete remake of postfix service
 (#27276)

---
 nixos/modules/services/mail/postfix.nix | 582 ++++++++++++++++++------
 1 file changed, 438 insertions(+), 144 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index caaa87b94d6..845c6acc7fe 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -9,7 +9,8 @@ let
   group = cfg.group;
   setgidGroup = cfg.setgidGroup;
 
-  haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != "";
+  haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != ""
+                      || cfg.extraAliases != "";
   haveTransport = cfg.transport != "";
   haveVirtual = cfg.virtual != "";
 
@@ -25,149 +26,275 @@ let
 
   clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl);
 
-  mainCf =
-    ''
-      compatibility_level = 9999
+  mainCf = let
+    escape = replaceStrings ["$"] ["$$"];
+    mkList = items: "\n  " + concatMapStringsSep "\n  " escape items;
+    mkVal = value:
+      if isList value then mkList value
+        else " " + (if value == true then "yes"
+        else if value == false then "no"
+        else toString value);
+    mkEntry = name: value: "${escape name} =${mkVal value}";
+  in
+    concatStringsSep "\n" (mapAttrsToList mkEntry (recursiveUpdate defaultConf cfg.config))
+      + "\n" + cfg.extraConfig;
 
-      mail_owner = ${user}
-      default_privs = nobody
+  defaultConf = {
+    compatibility_level  = "9999";
+    mail_owner           = user;
+    default_privs        = "nobody";
 
-      # NixOS specific locations
-      data_directory = /var/lib/postfix/data
-      queue_directory = /var/lib/postfix/queue
+    # NixOS specific locations
+    data_directory       = "/var/lib/postfix/data";
+    queue_directory      = "/var/lib/postfix/queue";
 
-      # Default location of everything in package
-      meta_directory = ${pkgs.postfix}/etc/postfix
-      command_directory = ${pkgs.postfix}/bin
-      sample_directory = /etc/postfix
-      newaliases_path = ${pkgs.postfix}/bin/newaliases
-      mailq_path = ${pkgs.postfix}/bin/mailq
-      readme_directory = no
-      sendmail_path = ${pkgs.postfix}/bin/sendmail
-      daemon_directory = ${pkgs.postfix}/libexec/postfix
-      manpage_directory = ${pkgs.postfix}/share/man
-      html_directory = ${pkgs.postfix}/share/postfix/doc/html
-      shlib_directory = no
+    # Default location of everything in package
+    meta_directory       = "${pkgs.postfix}/etc/postfix";
+    command_directory    = "${pkgs.postfix}/bin";
+    sample_directory     = "/etc/postfix";
+    newaliases_path      = "${pkgs.postfix}/bin/newaliases";
+    mailq_path           = "${pkgs.postfix}/bin/mailq";
+    readme_directory     = false;
+    sendmail_path        = "${pkgs.postfix}/bin/sendmail";
+    daemon_directory     = "${pkgs.postfix}/libexec/postfix";
+    manpage_directory    = "${pkgs.postfix}/share/man";
+    html_directory       = "${pkgs.postfix}/share/postfix/doc/html";
+    shlib_directory      = false;
+    relayhost            = if cfg.lookupMX || cfg.relayHost == ""
+                             then cfg.relayHost
+                             else "[${cfg.relayHost}]";
+    mail_spool_directory = "/var/spool/mail/";
+    setgid_group         = setgidGroup;
+  }
+  // optionalAttrs config.networking.enableIPv6 { inet_protocols = "all"; }
+  // optionalAttrs (cfg.networks != null) { mynetworks = cfg.networks; }
+  // optionalAttrs (cfg.networksStyle != "") { mynetworks_style = cfg.networksStyle; }
+  // optionalAttrs (cfg.hostname != "") { myhostname = cfg.hostname; }
+  // optionalAttrs (cfg.domain != "") { mydomain = cfg.domain; }
+  // optionalAttrs (cfg.origin != "") { myorigin =  cfg.origin; }
+  // optionalAttrs (cfg.destination != null) { mydestination = cfg.destination; }
+  // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; }
+  // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; }
+  // optionalAttrs haveAliases { alias_maps = "${cfg.aliasMapType}:/etc/postfix/aliases"; }
+  // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfx/transport"; }
+  // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; }
+  // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
+  // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; }
+  // optionalAttrs (cfg.sslCert != "") {
+    smtp_tls_CAfile = cfg.sslCACert;
+    smtp_tls_cert_file = cfg.sslCert;
+    smtp_tls_key_file = cfg.sslKey;
 
-    ''
-    + optionalString config.networking.enableIPv6 ''
-      inet_protocols = all
-    ''
-    + (if cfg.networks != null then
-        ''
-          mynetworks = ${concatStringsSep ", " cfg.networks}
-        ''
-      else if cfg.networksStyle != "" then
-        ''
-          mynetworks_style = ${cfg.networksStyle}
-        ''
-      else
-        "")
-    + optionalString (cfg.hostname != "") ''
-      myhostname = ${cfg.hostname}
-    ''
-    + optionalString (cfg.domain != "") ''
-      mydomain = ${cfg.domain}
-    ''
-    + optionalString (cfg.origin != "") ''
-      myorigin = ${cfg.origin}
-    ''
-    + optionalString (cfg.destination != null) ''
-      mydestination = ${concatStringsSep ", " cfg.destination}
-    ''
-    + optionalString (cfg.relayDomains != null) ''
-      relay_domains = ${concatStringsSep ", " cfg.relayDomains}
-    ''
-    + ''
-      relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then
-          cfg.relayHost
-        else
-          "[" + cfg.relayHost + "]"}
+    smtp_use_tls = true;
 
-      mail_spool_directory = /var/spool/mail/
+    smtpd_tls_CAfile = cfg.sslCACert;
+    smtpd_tls_cert_file = cfg.sslCert;
+    smtpd_tls_key_file = cfg.sslKey;
 
-      setgid_group = ${setgidGroup}
-    ''
-    + optionalString (cfg.sslCert != "") ''
+    smtpd_use_tls = true;
+  };
 
-      smtp_tls_CAfile = ${cfg.sslCACert}
-      smtp_tls_cert_file = ${cfg.sslCert}
-      smtp_tls_key_file = ${cfg.sslKey}
+  masterCfOptions = { options, config, name, ... }: {
+    options = {
+      name = mkOption {
+        type = types.str;
+        default = name;
+        example = "smtp";
+        description = ''
+          The name of the service to run. Defaults to the attribute set key.
+        '';
+      };
 
-      smtp_use_tls = yes
+      type = mkOption {
+        type = types.enum [ "inet" "unix" "fifo" "pass" ];
+        default = "unix";
+        example = "inet";
+        description = "The type of the service";
+      };
 
-      smtpd_tls_CAfile = ${cfg.sslCACert}
-      smtpd_tls_cert_file = ${cfg.sslCert}
-      smtpd_tls_key_file = ${cfg.sslKey}
+      private = mkOption {
+        type = types.bool;
+        example = false;
+        description = ''
+          Whether the service's sockets and storage directory is restricted to
+          be only available via the mail system. If <literal>null</literal> is
+          given it uses the postfix default <literal>true</literal>.
+        '';
+      };
 
-      smtpd_use_tls = yes
-    ''
-    + optionalString (cfg.recipientDelimiter != "") ''
-      recipient_delimiter = ${cfg.recipientDelimiter}
-    ''
-    + optionalString haveAliases ''
-      alias_maps = hash:/etc/postfix/aliases
-    ''
-    + optionalString haveTransport ''
-      transport_maps = hash:/etc/postfix/transport
-    ''
-    + optionalString haveVirtual ''
-      virtual_alias_maps = hash:/etc/postfix/virtual
-    ''
-    + optionalString (cfg.dnsBlacklists != []) ''
-      smtpd_client_restrictions = ${clientRestrictions}
-    ''
-    + cfg.extraConfig;
+      privileged = mkOption {
+        type = types.bool;
+        example = true;
+        description = "";
+      };
 
-  masterCf = ''
-    # ==========================================================================
-    # service type  private unpriv  chroot  wakeup  maxproc command + args
-    #               (yes)   (yes)   (no)    (never) (100)
-    # ==========================================================================
-    smtp      inet  n       -       n       -       -       smtpd
-  '' + optionalString cfg.enableSubmission ''
-    submission inet n       -       n       -       -       smtpd
-      ${concatStringsSep "\n  " (mapAttrsToList (x: y: "-o " + x + "=" + y) cfg.submissionOptions)}
-  ''
-  + ''
-    pickup    unix  n       -       n       60      1       pickup
-    cleanup   unix  n       -       n       -       0       cleanup
-    qmgr      unix  n       -       n       300     1       qmgr
-    tlsmgr    unix  -       -       n       1000?   1       tlsmgr
-    rewrite   unix  -       -       n       -       -       trivial-rewrite
-    bounce    unix  -       -       n       -       0       bounce
-    defer     unix  -       -       n       -       0       bounce
-    trace     unix  -       -       n       -       0       bounce
-    verify    unix  -       -       n       -       1       verify
-    flush     unix  n       -       n       1000?   0       flush
-    proxymap  unix  -       -       n       -       -       proxymap
-    proxywrite unix -       -       n       -       1       proxymap
-  ''
-  + optionalString cfg.enableSmtp ''
-    smtp      unix  -       -       n       -       -       smtp
-    relay     unix  -       -       n       -       -       smtp
-    	      -o smtp_fallback_relay=
-    #       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
-  ''
-  + ''
-    showq     unix  n       -       n       -       -       showq
-    error     unix  -       -       n       -       -       error
-    retry     unix  -       -       n       -       -       error
-    discard   unix  -       -       n       -       -       discard
-    local     unix  -       n       n       -       -       local
-    virtual   unix  -       n       n       -       -       virtual
-    lmtp      unix  -       -       n       -       -       lmtp
-    anvil     unix  -       -       n       -       1       anvil
-    scache    unix  -       -       n       -       1       scache
-    ${cfg.extraMasterConf}
-  '';
+      chroot = mkOption {
+        type = types.bool;
+        example = true;
+        description = ''
+          Whether the service is chrooted to have only access to the
+          <option>services.postfix.queueDir</option> and the closure of
+          store paths specified by the <option>program</option> option.
+        '';
+      };
 
-  aliases =
+      wakeup = mkOption {
+        type = types.int;
+        example = 60;
+        description = ''
+          Automatically wake up the service after the specified number of
+          seconds. If <literal>0</literal> is given, never wake the service
+          up.
+        '';
+      };
+
+      wakeupUnusedComponent = mkOption {
+        type = types.bool;
+        example = false;
+        description = ''
+          If set to <literal>false</literal> the component will only be woken
+          up if it is used. This is equivalent to postfix' notion of adding a
+          question mark behind the wakeup time in
+          <filename>master.cf</filename>
+        '';
+      };
+
+      maxproc = mkOption {
+        type = types.int;
+        example = 1;
+        description = ''
+          The maximum number of processes to spawn for this service. If the
+          value is <literal>0</literal> it doesn't have any limit. If
+          <literal>null</literal> is given it uses the postfix default of
+          <literal>100</literal>.
+        '';
+      };
+
+      command = mkOption {
+        type = types.str;
+        default = name;
+        example = "smtpd";
+        description = ''
+          A program name specifying a Postfix service/daemon process.
+          By default it's the attribute <option>name</option>.
+        '';
+      };
+
+      args = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "-o" "smtp_helo_timeout=5" ];
+        description = ''
+          Arguments to pass to the <option>command</option>. There is no shell
+          processing involved and shell syntax is passed verbatim to the
+          process.
+        '';
+      };
+
+      rawEntry = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        internal = true;
+        description = ''
+          The raw configuration line for the <filename>master.cf</filename>.
+        '';
+      };
+    };
+
+    config.rawEntry = let
+      mkBool = bool: if bool then "y" else "n";
+      mkArg = arg: "${optionalString (hasPrefix "-" arg) "\n  "}${arg}";
+
+      maybeOption = fun: option:
+        if options.${option}.isDefined then fun config.${option} else "-";
+
+      # This is special, because we have two options for this value.
+      wakeup = let
+        wakeupDefined = options.wakeup.isDefined;
+        wakeupUCDefined = options.wakeupUnusedComponent.isDefined;
+        finalValue = toString config.wakeup
+                   + optionalString (!config.wakeupUnusedComponent) "?";
+      in if wakeupDefined && wakeupUCDefined then finalValue else "-";
+
+    in [
+      config.name
+      config.type
+      (maybeOption mkBool "private")
+      (maybeOption (b: mkBool (!b)) "privileged")
+      (maybeOption mkBool "chroot")
+      wakeup
+      (maybeOption toString "maxproc")
+      (config.command + " " + concatMapStringsSep " " mkArg config.args)
+    ];
+  };
+
+  masterCfContent = let
+
+    labels = [
+      "# service" "type" "private" "unpriv" "chroot" "wakeup" "maxproc"
+      "command + args"
+    ];
+
+    labelDefaults = [
+      "# " "" "(yes)" "(yes)" "(no)" "(never)" "(100)" "" ""
+    ];
+
+    masterCf = mapAttrsToList (const (getAttr "rawEntry")) cfg.masterConfig;
+
+    # A list of the maximum width of the columns across all lines and labels
+    maxWidths = let
+      foldLine = line: acc: let
+        columnLengths = map stringLength line;
+      in zipListsWith max acc columnLengths;
+      # We need to handle the last column specially here, because it's
+      # open-ended (command + args).
+      lines = [ labels labelDefaults ] ++ (map (l: init l ++ [""]) masterCf);
+    in fold foldLine (genList (const 0) (length labels)) lines;
+
+    # Pad a string with spaces from the right (opposite of fixedWidthString).
+    pad = width: str: let
+      padWidth = width - stringLength str;
+      padding = concatStrings (genList (const " ") padWidth);
+    in str + optionalString (padWidth > 0) padding;
+
+    # It's + 2 here, because that's the amount of spacing between columns.
+    fullWidth = fold (width: acc: acc + width + 2) 0 maxWidths;
+
+    formatLine = line: concatStringsSep "  " (zipListsWith pad maxWidths line);
+
+    formattedLabels = let
+      sep = "# " + concatStrings (genList (const "=") (fullWidth + 5));
+      lines = [ sep (formatLine labels) (formatLine labelDefaults) sep ];
+    in concatStringsSep "\n" lines;
+
+  in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n";
+
+  headerCheckOptions = { ... }:
+  {
+    options = {
+      pattern = mkOption {
+        type = types.str;
+        default = "/^.*/";
+        example = "/^X-Mailer:/";
+        description = "A regexp pattern matching the header";
+      };
+      action = mkOption {
+        type = types.str;
+        default = "DUNNO";
+        example = "BCC mail@example.com";
+        description = "The action to be executed when the pattern is matched";
+      };
+    };
+  };
+
+  headerChecks = concatStringsSep "\n" (map (x: "${x.pattern} ${x.action}") cfg.headerChecks) + cfg.extraHeaderChecks;
+
+  aliases = let seperator = if cfg.aliasMapType == "hash" then ":" else ""; in
     optionalString (cfg.postmasterAlias != "") ''
-      postmaster: ${cfg.postmasterAlias}
+      postmaster${seperator} ${cfg.postmasterAlias}
     ''
     + optionalString (cfg.rootAlias != "") ''
-      root: ${cfg.rootAlias}
+      root${seperator} ${cfg.rootAlias}
     ''
     + cfg.extraAliases
   ;
@@ -176,8 +303,9 @@ let
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
   checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
-  masterCfFile = pkgs.writeText "postfix-master.cf" masterCf;
+  masterCfFile = pkgs.writeText "postfix-master.cf" masterCfContent;
   transportFile = pkgs.writeText "postfix-transport" cfg.transport;
+  headerChecksFile = pkgs.writeText "postfix-header-checks" headerChecks;
 
 in
 
@@ -199,27 +327,29 @@ in
         default = true;
         description = "Whether to enable smtp in master.cf.";
       };
-      
+
       enableSubmission = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable smtp submission";
+        description = "Whether to enable smtp submission.";
       };
 
       submissionOptions = mkOption {
         type = types.attrs;
-        default = { "smtpd_tls_security_level" = "encrypt";
-                    "smtpd_sasl_auth_enable" = "yes";
-                    "smtpd_client_restrictions" = "permit_sasl_authenticated,reject";
-                    "milter_macro_daemon_name" = "ORIGINATING";
-                  };
+        default = {
+          smtpd_tls_security_level = "encrypt";
+          smtpd_sasl_auth_enable = "yes";
+          smtpd_client_restrictions = "permit_sasl_authenticated,reject";
+          milter_macro_daemon_name = "ORIGINATING";
+        };
+        example = {
+          smtpd_tls_security_level = "encrypt";
+          smtpd_sasl_auth_enable = "yes";
+          smtpd_sasl_type = "dovecot";
+          smtpd_client_restrictions = "permit_sasl_authenticated,reject";
+          milter_macro_daemon_name = "ORIGINATING";
+        };
         description = "Options for the submission config in master.cf";
-        example = { "smtpd_tls_security_level" = "encrypt";
-                    "smtpd_sasl_auth_enable" = "yes";
-                    "smtpd_sasl_type" = "dovecot";
-                    "smtpd_client_restrictions" = "permit_sasl_authenticated,reject";
-                    "milter_macro_daemon_name" = "ORIGINATING";
-                  };
       };
 
       setSendmail = mkOption {
@@ -352,6 +482,25 @@ in
         ";
       };
 
+      aliasMapType = mkOption {
+        type = with types; enum [ "hash" "regexp" "pcre" ];
+        default = "hash";
+        example = "regexp";
+        description = "The format the alias map should have. Use regexp if you want to use regular expressions.";
+      };
+
+      config = mkOption {
+        type = with types; attrsOf (either bool (either str (listOf str)));
+        default = defaultConf;
+        description = ''
+          The main.cf configuration file as key value set.
+        '';
+        example = {
+          mail_owner = "postfix";
+          smtp_use_tls = true;
+        };
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -395,6 +544,14 @@ in
         ";
       };
 
+      virtualMapType = mkOption {
+        type = types.enum ["hash" "regexp" "pcre"];
+        default = "hash";
+        description = ''
+          What type of virtual alias map file to use. Use <literal>"regexp"</literal> for regular expressions.
+        '';
+      };
+
       transport = mkOption {
         default = "";
         description = "
@@ -413,6 +570,22 @@ in
         description = "contents of check_client_access for overriding dnsBlacklists";
       };
 
+      masterConfig = mkOption {
+        type = types.attrsOf (types.submodule masterCfOptions);
+        default = {};
+        example =
+          { submission = {
+              type = "inet";
+              args = [ "-o" "smtpd_tls_security_level=encrypt" ];
+            };
+          };
+        description = ''
+          An attribute set of service options, which correspond to the service
+          definitions usually done within the Postfix
+          <filename>master.cf</filename> file.
+        '';
+      };
+
       extraMasterConf = mkOption {
         type = types.lines;
         default = "";
@@ -420,6 +593,27 @@ in
         description = "Extra lines to append to the generated master.cf file.";
       };
 
+      enableHeaderChecks = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "Whether to enable postfix header checks";
+      };
+
+      headerChecks = mkOption {
+        type = types.listOf (types.submodule headerCheckOptions);
+        default = [];
+        example = [ { pattern = "/^X-Spam-Flag:/"; action = "REDIRECT spam@example.com"; } ];
+        description = "Postfix header checks.";
+      };
+
+      extraHeaderChecks = mkOption {
+        type = types.lines;
+        default = "";
+        example = "/^X-Spam-Flag:/ REDIRECT spam@example.com";
+        description = "Extra lines to /etc/postfix/header_checks file.";
+      };
+
       aliasFiles = mkOption {
         type = types.attrsOf types.path;
         default = {};
@@ -530,6 +724,101 @@ in
             ${pkgs.postfix}/bin/postfix set-permissions config_directory=/var/lib/postfix/conf
           '';
         };
+
+      services.postfix.masterConfig = {
+        smtp_inet = {
+          name = "smtp";
+          type = "inet";
+          private = false;
+          command = "smtpd";
+        };
+        pickup = {
+          private = false;
+          wakeup = 60;
+          maxproc = 1;
+        };
+        cleanup = {
+          private = false;
+          maxproc = 0;
+        };
+        qmgr = {
+          private = false;
+          wakeup = 300;
+          maxproc = 1;
+        };
+        tlsmgr = {
+          wakeup = 1000;
+          wakeupUnusedComponent = false;
+          maxproc = 1;
+        };
+        rewrite = {
+          command = "trivial-rewrite";
+        };
+        bounce = {
+          maxproc = 0;
+        };
+        defer = {
+          maxproc = 0;
+          command = "bounce";
+        };
+        trace = {
+          maxproc = 0;
+          command = "bounce";
+        };
+        verify = {
+          maxproc = 1;
+        };
+        flush = {
+          private = false;
+          wakeup = 1000;
+          wakeupUnusedComponent = false;
+          maxproc = 0;
+        };
+        proxymap = {
+          command = "proxymap";
+        };
+        proxywrite = {
+          maxproc = 1;
+          command = "proxymap";
+        };
+        showq = {
+          private = false;
+        };
+        error = {};
+        retry = {
+          command = "error";
+        };
+        discard = {};
+        local = {
+          privileged = true;
+        };
+        virtual = {
+          privileged = true;
+        };
+        lmtp = {
+        };
+        anvil = {
+          maxproc = 1;
+        };
+        scache = {
+          maxproc = 1;
+        };
+      } // optionalAttrs cfg.enableSubmission {
+        submission = {
+          type = "inet";
+          private = false;
+          command = "smtpd";
+          args = let
+            mkKeyVal = opt: val: [ "-o" (opt + "=" + val) ];
+          in concatLists (mapAttrsToList mkKeyVal cfg.submissionOptions);
+        };
+      } // optionalAttrs cfg.enableSmtp {
+        smtp = {};
+        relay = {
+          command = "smtp";
+          args = [ "-o" "smtp_fallback_relay=" ];
+        };
+      };
     }
 
     (mkIf haveAliases {
@@ -541,9 +830,14 @@ in
     (mkIf haveVirtual {
       services.postfix.mapFiles."virtual" = virtualFile;
     })
+    (mkIf cfg.enableHeaderChecks {
+      services.postfix.mapFiles."header_checks" = headerChecksFile;
+    })
     (mkIf (cfg.dnsBlacklists != []) {
       services.postfix.mapFiles."client_access" = checkClientAccessFile;
     })
+    (mkIf (cfg.extraConfig != "") {
+      warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ];
+    })
   ]);
-
 }

From 407b56986e1915847f4526ffb9aa9465c73f746f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 8 Jun 2017 21:55:47 +0200
Subject: [PATCH 0526/3246] nixos/lighttpd: fix indent (tab -> space)

---
 nixos/modules/services/web-servers/lighttpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 84cd0a4095d..8c3f7b219ac 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -177,7 +177,7 @@ in
       configText = mkOption {
         default = "";
         type = types.lines;
-	example = ''...verbatim config file contents...'';
+        example = ''...verbatim config file contents...'';
         description = ''
           Overridable config file contents to use for lighttpd. By default, use
           the contents automatically generated by NixOS.

From aca5ba405e95d22a3934e03e947968866d23bdb6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 02:01:03 -0400
Subject: [PATCH 0527/3246] cc-wrapper: Unify and improve dynamic linker flag
 logic

Besides deduplicating overlapping logic, clear warning messages were
added for:

 - No glob/path for dynamic linker provided (use default glob)

 - Glob did not expand to anything (don't append flag)

 - glob expanded to multiple things (take first, like before)
---
 pkgs/build-support/cc-wrapper/default.nix | 66 +++++++++++------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 37d62891ecf..4dc3d1845a4 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -105,22 +105,20 @@ let
       done
     '');
 
-  # The dynamic linker has different names on different platforms.
+  # The dynamic linker has different names on different platforms. This is a
+  # shell glob that ought to match it.
   dynamicLinker =
-    if !nativeLibc then
-      (if targetPlatform.system == "i686-linux"     then "ld-linux.so.2" else
-       if targetPlatform.system == "x86_64-linux"   then "ld-linux-x86-64.so.2" else
-       # ARM with a wildcard, which can be "" or "-armhf".
-       if targetPlatform.isArm32                    then "ld-linux*.so.3" else
-       if targetPlatform.system == "aarch64-linux"  then "ld-linux-aarch64.so.1" else
-       if targetPlatform.system == "powerpc-linux"  then "ld.so.1" else
-       if targetPlatform.system == "mips64el-linux" then "ld.so.1" else
-       if targetPlatform.system == "x86_64-darwin"  then "/usr/lib/dyld" else
-       if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else
-       builtins.trace
-         "Don't know the name of the dynamic linker for platform ${targetPlatform.config}, so guessing instead."
-         null)
-    else "";
+    /**/ if libc == null then null
+    else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
+    else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
+    # ARM with a wildcard, which can be "" or "-armhf".
+    else if targetPlatform.isArm32                    then "${libc_lib}/lib/ld-linux*.so.3"
+    else if targetPlatform.system == "aarch64-linux"  then "${libc_lib}/lib/ld-linux-aarch64.so.1"
+    else if targetPlatform.system == "powerpc-linux"  then "${libc_lib}/lib/ld.so.1"
+    else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1"
+    else if targetPlatform.system == "x86_64-darwin"  then "/usr/lib/dyld"
+    else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
+    else null;
 
   expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
   then buildPackages.stdenv.mkDerivation {
@@ -175,39 +173,39 @@ stdenv.mkDerivation {
       }
     ''
 
-      # TODO(@Ericson2314): Unify logic next hash break
-    + optionalString (libc != null) (if (targetPlatform.isDarwin) then ''
-      echo $dynamicLinker > $out/nix-support/dynamic-linker
-
-      echo "export LD_DYLD_PATH=\"$dynamicLinker\"" >> $out/nix-support/setup-hook
-    '' else if dynamicLinker != null then ''
-      dynamicLinker="${libc_lib}/lib/$dynamicLinker"
-      echo $dynamicLinker > $out/nix-support/dynamic-linker
-
-      if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
-        echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
+    + optionalString (libc != null) (''
+      if [[ -z ''${dynamicLinker+x} ]]; then
+        echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
+        dynamicLinker="${libc_lib}/lib/ld*.so.?"
       fi
 
-      # The dynamic linker is passed in `ldflagsBefore' to allow
-      # explicit overrides of the dynamic linker by callers to gcc/ld
-      # (the *last* value counts, so ours should come first).
-      echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before
-    '' else ''
-      dynamicLinker=`eval 'echo $libc/lib/ld*.so.?'`
+      # Expand globs to fill array of options
+      dynamicLinker=($dynamicLinker)
+
+      case ''${#dynamicLinker[@]} in
+        0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;;
+        1) echo "Using dynamic linker: '$dynamicLinker'" >&2;;
+        *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
+      esac
+
       if [ -n "$dynamicLinker" ]; then
         echo $dynamicLinker > $out/nix-support/dynamic-linker
 
+    '' + (if targetPlatform.isDarwin then ''
+        printf "export LD_DYLD_PATH+=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
+    '' else ''
         if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
           echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
         fi
 
-        ldflagsBefore="-dynamic-linker $dlinker"
+        ldflagsBefore=(-dynamic-linker "$dynamicLinker")
+    '') + ''
       fi
 
       # The dynamic linker is passed in `ldflagsBefore' to allow
       # explicit overrides of the dynamic linker by callers to gcc/ld
       # (the *last* value counts, so ours should come first).
-      echo "$ldflagsBefore" > $out/nix-support/libc-ldflags-before
+      printLines "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
     '')
 
     + optionalString (libc != null) ''

From e40f3bea3e20127aced4f7b806173b6868bd0724 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 14 Jul 2017 19:25:13 +0200
Subject: [PATCH 0528/3246] nginx: make listen addresses configurable

---
 .../services/web-servers/nginx/default.nix    | 52 ++++++++++---------
 .../web-servers/nginx/vhost-options.nix       | 26 +++++++---
 2 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index ae14aa28ae3..f83413b4534 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -123,45 +123,49 @@ let
 
   vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost:
       let
-        serverName = vhost.serverName;
         ssl = vhost.enableSSL || vhost.forceSSL;
-        port = if vhost.port != null then vhost.port else (if ssl then 443 else 80);
-        listenString = toString port + optionalString ssl " ssl http2"
-          + optionalString vhost.default " default_server";
-        acmeLocation = optionalString vhost.enableACME (''
+        defaultPort = if ssl then 443 else 80;
+
+        listenString = { addr, port, ... }:
+          "listen ${addr}:${toString (if port != null then port else defaultPort)} "
+          + optionalString ssl "ssl http2 "
+          + optionalString vhost.default "default_server"
+          + ";";
+
+        redirectListenString = { addr, ... }:
+          "listen ${addr}:80 ${optionalString vhost.default "default_server"};";
+
+        acmeLocation = ''
           location /.well-known/acme-challenge {
             ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"}
             root ${vhost.acmeRoot};
             auth_basic off;
           }
-        '' + (optionalString (vhost.acmeFallbackHost != null) ''
-          location @acme-fallback {
-            auth_basic off;
-            proxy_pass http://${vhost.acmeFallbackHost};
-          }
-        ''));
+          ${optionalString (vhost.acmeFallbackHost != null) ''
+            location @acme-fallback {
+              auth_basic off;
+              proxy_pass http://${vhost.acmeFallbackHost};
+            }
+          ''}
+        '';
+
       in ''
         ${optionalString vhost.forceSSL ''
           server {
-            listen 80 ${optionalString vhost.default "default_server"};
-            ${optionalString enableIPv6
-              ''listen [::]:80 ${optionalString vhost.default "default_server"};''
-            }
+            ${concatMapStringsSep "\n" redirectListenString vhost.listen}
 
-            server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};
-            ${acmeLocation}
+            server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
+            ${optionalString vhost.enableACME acmeLocation}
             location / {
-              return 301 https://$host${optionalString (port != 443) ":${toString port}"}$request_uri;
+              return 301 https://$host$request_uri;
             }
           }
         ''}
 
         server {
-          listen ${listenString};
-          ${optionalString enableIPv6 "listen [::]:${listenString};"}
-
-          server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};
-          ${acmeLocation}
+          ${concatMapStringsSep "\n" listenString vhost.listen}
+          server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
+          ${optionalString vhost.enableACME acmeLocation}
           ${optionalString (vhost.root != null) "root ${vhost.root};"}
           ${optionalString (vhost.globalRedirect != null) ''
             return 301 http${optionalString ssl "s"}://${vhost.globalRedirect}$request_uri;
@@ -380,7 +384,7 @@ in
 
       virtualHosts = mkOption {
         type = types.attrsOf (types.submodule (import ./vhost-options.nix {
-          inherit lib;
+          inherit config lib;
         }));
         default = {
           localhost = {};
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index c0ea645b3df..60260512bc2 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -3,7 +3,7 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{ lib }:
+{ config, lib }:
 
 with lib;
 {
@@ -26,12 +26,26 @@ with lib;
       '';
     };
 
-    port = mkOption {
-      type = types.nullOr types.int;
-      default = null;
+    listen = mkOption {
+      type = with types; listOf (submodule {
+        options = {
+          addr = mkOption { type = str; description = "IP address."; };
+          port = mkOption { type = nullOr int; description = "Port number."; };
+        };
+      });
+      default =
+        [ { addr = "0.0.0.0"; port = null; } ]
+        ++ optional config.networking.enableIPv6
+          { addr = "[::]"; port = null; };
+      example = [
+        { addr = "195.154.1.1"; port = 443; }
+        { addr = "192.168.1.2"; port = 443; }
+      ];
       description = ''
-        Port for the server. Defaults to 80 for http
-        and 443 for https (i.e. when enableSSL is set).
+        Listen addresses and ports for this virtual host.
+        IPv6 addresses must be enclosed in square brackets.
+        Setting the port to <literal>null</literal> defaults
+        to 80 for http and 443 for https (i.e. when enableSSL is set).
       '';
     };
 

From b5c6543de3f6e24680b52e0e798c7f61753f1473 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 15 Jul 2017 03:47:38 +0800
Subject: [PATCH 0529/3246] postgresql-9.2.20 -> postgresql-9.2.21
 postgresql-9.3.16 -> postgresql-9.3.17 postgresql-9.4.11 -> postgresql-9.4.12
 postgresql-9.5.6 -> postgresql-9.5.7 postgresql-9.6.2 -> postgresql-9.6.3

Fixes:
  * CVE-2017-7484
  * CVE-2017-7485
  * CVE-2017-7486

See:
  * https://www.postgresql.org/about/news/1746/
---
 pkgs/servers/sql/postgresql/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 2362ee84329..28f91693575 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -97,33 +97,33 @@ in {
   };
 
   postgresql92 = common {
-    version = "9.2.20";
+    version = "9.2.21";
     psqlSchema = "9.2";
-    sha256 = "09lgvl996py3mciybnlv0hycfwfxr41n0wksb2jvxjh0hjpbv2hb";
+    sha256 = "0697e843523ee60c563f987f9c65bc4201294b18525d6e5e4b2c50c6d4058ef9";
   };
 
   postgresql93 = common {
-    version = "9.3.16";
+    version = "9.3.17";
     psqlSchema = "9.3";
-    sha256 = "0wv8qsi0amdhcl1qvkvas3lm37w6zsi818f5fxm6n0ngr155wpw4";
+    sha256 = "9c03e5f280cfe9bd202fa01af773eb146abd8ab3065f7279d574c568f6948dbe";
   };
 
   postgresql94 = common {
-    version = "9.4.11";
+    version = "9.4.12";
     psqlSchema = "9.4";
-    sha256 = "08wxrk8wdhnz0756dsa8jkj0pqanjfpw7w715lyv10618p853sz3";
+    sha256 = "fca055481875d1c49e31c28443f56472a1474b3fbe25b7ae64440c6118f82e64";
   };
 
   postgresql95 = common {
-    version = "9.5.6";
+    version = "9.5.7";
     psqlSchema = "9.5";
-    sha256 = "0bz1b9r249ffjfvldaiah2g78ccwq30ddh8hdvlq61z26inmz7mv";
+    sha256 = "8b1e936f82109325decc0f5575e846b93fb4fd384e8c4bde83ff5e7f87fc6cad";
   };
 
   postgresql96 = common {
-    version = "9.6.2";
+    version = "9.6.3";
     psqlSchema = "9.6";
-    sha256 = "1jahzqqw5inyvmacic2ihhj5f8z50lapci2fwws91h719ccbb1q1";
+    sha256 = "1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6";
   };
 
 }

From 5ff18c44846de017438eead7e1b674d24d599859 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 14 Jul 2017 22:52:36 +0300
Subject: [PATCH 0530/3246] libuv: Disable yet another test

This consistently times out for me on ARM, and apparently for others as
well: https://github.com/libuv/libuv/issues/687
---
 pkgs/development/libraries/libuv/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index fdf5191bf72..97672436641 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
       "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent
       "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
       "getaddrinfo_fail" "getaddrinfo_fail_sync"
+      "threadpool_multiple_event_loops" # times out on slow machines
     ]
       # sometimes: timeout (no output), failed uv_listen
       ++ stdenv.lib.optionals stdenv.isDarwin [ "process_title" "emfile" ];

From 292827b0e0a52312a1abe67bfc8baa44afd04e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Jul 2017 17:20:58 +0200
Subject: [PATCH 0531/3246] nixos/libvirt: modify xml with xmlstarlet

Instead of grep and sed, which is brittle.

(I don't know how to preserve the comment we currently add to say that
this line is auto-updated. But I don't think it adds much value, so I'm
not spending any effort on it.)
---
 nixos/modules/virtualisation/libvirtd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 10a38b99f87..c8742b27c6d 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -162,11 +162,11 @@ in {
         for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do
             test -f "$file" || continue
             # get (old) emulator path from config file
-            emulator=$(grep "^[[:space:]]*<emulator>" "$file" | sed 's,^[[:space:]]*<emulator>\(.*\)</emulator>.*,\1,')
+            emulator=$("${pkgs.xmlstarlet}/bin/xmlstarlet" select --template --value-of "/domain/devices/emulator" "$file")
             # get a (definitely) working emulator path by re-scanning $PATH
             new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator"))
             # write back
-            sed -i "s,^[[:space:]]*<emulator>.*,    <emulator>$new_emulator</emulator> <!-- WARNING: emulator dirname is auto-updated by the nixos libvirtd module -->," "$file"
+            "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/devices/emulator" -v "$new_emulator" "$file"
         done
       ''; # */
 

From b8e109d6acf61df5c02825f5b485239649f4ea31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Jul 2017 17:22:59 +0200
Subject: [PATCH 0532/3246] nixos/libvirt: prevent OVMF path from being garbage
 collected

Use xmlstarlet to update the OVMF path on each startup, like we do for
<emulator>...qemu-kvm</emulator>.

A libvirt domain using UEFI cannot start if the OVMF path is garbage
collected/missing.
---
 nixos/modules/virtualisation/libvirtd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index c8742b27c6d..b24ea0f33c9 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -167,6 +167,9 @@ in {
             new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator"))
             # write back
             "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/devices/emulator" -v "$new_emulator" "$file"
+
+            # Also refresh the OVMF path. Files with no matches are ignored.
+            "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/os/loader" -v "${pkgs.OVMF.fd}/FV/OVMF_CODE.fd" "$file"
         done
       ''; # */
 

From 5bee13f14f69b15ccbf26cff2c30e617e2798bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 14 Jul 2017 21:54:28 +0100
Subject: [PATCH 0533/3246] restbed: fix license and evaluation

cc @Radvendi @joachifm
---
 .../networking/instant-messengers/ring-daemon/restbed.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
index 208be3a42fd..0546d2dae47 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   inherit patches;
 
-  buildInputs = [ 
+  buildInputs = [
     cmake
     asio
     openssl
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       production environments.
     '';
     homepage = https://corvusoft.co.uk/;
-    license = licenses.agpl;
+    license = licenses.agpl3;
     maintainers = with maintainers; [ taeer ];
     platforms = platforms.linux;
   };

From 3ef073e9f14e55defa2cb688ed389bc6fe1d5553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 14 Jul 2017 22:11:45 +0100
Subject: [PATCH 0534/3246] nodePackages.js-beautify: init at 1.6.14

fixes #21980
---
 .../node-packages/node-packages-v6.json       |   1 +
 .../node-packages/node-packages-v6.nix        | 385 ++++++++++++------
 2 files changed, 251 insertions(+), 135 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index db96f28cf6b..627f6bf4b88 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -31,6 +31,7 @@
 , "jayschema"
 , "jshint"
 , "json"
+, "js-beautify"
 , "jsontool"
 , "json-server"
 , "js-yaml"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 0e134c1cdc3..e241864f082 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -607,13 +607,13 @@ let
         sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47";
       };
     };
-    "azure-arm-network-1.1.0-preview" = {
+    "azure-arm-network-2.0.0" = {
       name = "azure-arm-network";
       packageName = "azure-arm-network";
-      version = "1.1.0-preview";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-1.1.0-preview.tgz";
-        sha1 = "e6ca3e27a0169ff49849f0378bc6c531b08a2b8b";
+        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-2.0.0.tgz";
+        sha1 = "95e3d2658a68ecb0a2f90f611966f9852877f625";
       };
     };
     "azure-arm-powerbiembedded-0.1.0" = {
@@ -1003,22 +1003,22 @@ let
         sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
       };
     };
-    "ms-rest-1.15.7" = {
+    "ms-rest-2.2.1" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "1.15.7";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz";
-        sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.1.tgz";
+        sha1 = "652f09dee89c115e5b672bd3de4d16dcc7961377";
       };
     };
-    "ms-rest-azure-1.15.7" = {
+    "ms-rest-azure-2.2.1" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "1.15.7";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz";
-        sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.1.tgz";
+        sha1 = "ca9a9fb492b1fe1a41ca8e472edc1dd0922323e6";
       };
     };
     "node-forge-0.6.23" = {
@@ -1345,67 +1345,22 @@ let
         sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea";
       };
     };
-    "ms-rest-2.2.1" = {
+    "ms-rest-1.15.7" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "2.2.1";
+      version = "1.15.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.1.tgz";
-        sha1 = "652f09dee89c115e5b672bd3de4d16dcc7961377";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz";
+        sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
       };
     };
-    "ms-rest-azure-2.2.1" = {
+    "ms-rest-azure-1.15.7" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "2.2.1";
+      version = "1.15.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.1.tgz";
-        sha1 = "ca9a9fb492b1fe1a41ca8e472edc1dd0922323e6";
-      };
-    };
-    "@types/node-7.0.36" = {
-      name = "@types/node";
-      packageName = "@types/node";
-      version = "7.0.36";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-7.0.36.tgz";
-        sha1 = "54286fcce8a4f7498cea1ec5fce5f5edd3521948";
-      };
-    };
-    "@types/request-0.0.45" = {
-      name = "@types/request";
-      packageName = "@types/request";
-      version = "0.0.45";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-0.0.45.tgz";
-        sha1 = "c6e52be8b108eb035c35aa9af56a38a260c3e7e6";
-      };
-    };
-    "@types/uuid-2.0.30" = {
-      name = "@types/uuid";
-      packageName = "@types/uuid";
-      version = "2.0.30";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz";
-        sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5";
-      };
-    };
-    "is-stream-1.1.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
-        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
-      };
-    };
-    "@types/form-data-0.0.33" = {
-      name = "@types/form-data";
-      packageName = "@types/form-data";
-      version = "0.0.33";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz";
-        sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz";
+        sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
       };
     };
     "async-0.2.7" = {
@@ -1660,6 +1615,51 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
+    "@types/node-7.0.37" = {
+      name = "@types/node";
+      packageName = "@types/node";
+      version = "7.0.37";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-7.0.37.tgz";
+        sha1 = "f129fff94d14a60c3d99eadb9fe0c98119e09c8f";
+      };
+    };
+    "@types/request-0.0.45" = {
+      name = "@types/request";
+      packageName = "@types/request";
+      version = "0.0.45";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/request/-/request-0.0.45.tgz";
+        sha1 = "c6e52be8b108eb035c35aa9af56a38a260c3e7e6";
+      };
+    };
+    "@types/uuid-2.0.30" = {
+      name = "@types/uuid";
+      packageName = "@types/uuid";
+      version = "2.0.30";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz";
+        sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
+    "@types/form-data-0.0.33" = {
+      name = "@types/form-data";
+      packageName = "@types/form-data";
+      version = "0.0.33";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz";
+        sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8";
+      };
+    };
     "debug-0.7.4" = {
       name = "debug";
       packageName = "debug";
@@ -8918,13 +8918,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.84.0" = {
+    "aws-sdk-2.85.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.84.0";
+      version = "2.85.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.84.0.tgz";
-        sha1 = "c87bb05bc43bea681c115503f73a7e784c9bfeb6";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.85.0.tgz";
+        sha1 = "e3860761c9a2f8a9017461ab7f3bd075f69dfa8f";
       };
     };
     "request-2.81.0" = {
@@ -11007,13 +11007,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.27" = {
+    "clean-css-3.4.28" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.27";
+      version = "3.4.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.27.tgz";
-        sha1 = "adef75b31c160ffa5d72f4de67966e2660c1a255";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz";
+        sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff";
       };
     };
     "commander-2.6.0" = {
@@ -12474,6 +12474,33 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
+    "editorconfig-0.13.2" = {
+      name = "editorconfig";
+      packageName = "editorconfig";
+      version = "0.13.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.2.tgz";
+        sha1 = "8e57926d9ee69ab6cb999f027c2171467acceb35";
+      };
+    };
+    "bluebird-3.5.0" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz";
+        sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
+      };
+    };
+    "lru-cache-3.2.0" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz";
+        sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee";
+      };
+    };
     "body-parser-1.17.2" = {
       name = "body-parser";
       packageName = "body-parser";
@@ -12870,15 +12897,6 @@ let
         sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
       };
     };
-    "bluebird-3.5.0" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz";
-        sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
-      };
-    };
     "combine-lists-1.0.1" = {
       name = "combine-lists";
       packageName = "combine-lists";
@@ -16173,13 +16191,13 @@ let
         sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
       };
     };
-    "libnpx-9.0.7" = {
+    "libnpx-9.2.0" = {
       name = "libnpx";
       packageName = "libnpx";
-      version = "9.0.7";
+      version = "9.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.0.7.tgz";
-        sha1 = "e30e4d5d0cc21c849541441855d0d334d00b009b";
+        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.0.tgz";
+        sha1 = "ce721ffc7bdfa275c18677b82728e6ee96a50642";
       };
     };
     "lodash._baseuniq-4.6.0" = {
@@ -20891,10 +20909,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.14";
+    version = "0.10.15";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.14.tgz";
-      sha1 = "e702e81a68b2b52db11e707796b484001b22063e";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.15.tgz";
+      sha1 = "15386d528bcd2521147934e3f183b53897a18c2c";
     };
     dependencies = [
       sources."adal-node-0.1.21"
@@ -20906,56 +20924,92 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-1.0.3"
-      sources."azure-arm-commerce-0.2.0"
-      (sources."azure-arm-compute-3.0.0-preview" // {
+      (sources."azure-arm-cdn-1.0.3" // {
         dependencies = [
-          sources."ms-rest-2.2.1"
-          sources."ms-rest-azure-2.2.1"
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
+      (sources."azure-arm-commerce-0.2.0" // {
+        dependencies = [
+          sources."ms-rest-azure-1.15.7"
+          sources."ms-rest-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
+      sources."azure-arm-compute-3.0.0-preview"
+      (sources."azure-arm-datalake-analytics-1.0.2-preview" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
+      (sources."azure-arm-datalake-store-1.0.2-preview" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
           sources."async-0.2.7"
         ];
       })
-      sources."azure-arm-datalake-analytics-1.0.2-preview"
-      sources."azure-arm-datalake-store-1.0.2-preview"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
-      (sources."azure-arm-iothub-1.0.1-preview" // {
+      sources."azure-arm-iothub-1.0.1-preview"
+      (sources."azure-arm-servermanagement-0.1.2" // {
         dependencies = [
-          sources."ms-rest-2.2.1"
-          sources."ms-rest-azure-2.2.1"
+          sources."ms-rest-azure-1.15.7"
+          sources."ms-rest-1.15.7"
           sources."async-0.2.7"
         ];
       })
-      sources."azure-arm-servermanagement-0.1.2"
-      (sources."azure-arm-network-1.1.0-preview" // {
+      sources."azure-arm-network-2.0.0"
+      (sources."azure-arm-powerbiembedded-0.1.0" // {
         dependencies = [
-          sources."ms-rest-2.2.1"
-          sources."ms-rest-azure-2.2.1"
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
           sources."async-0.2.7"
         ];
       })
-      sources."azure-arm-powerbiembedded-0.1.0"
-      (sources."azure-arm-trafficmanager-1.1.0-preview" // {
+      sources."azure-arm-trafficmanager-1.1.0-preview"
+      (sources."azure-arm-dns-0.11.1" // {
         dependencies = [
-          sources."ms-rest-azure-2.2.1"
-          sources."ms-rest-2.2.1"
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
           sources."async-0.2.7"
         ];
       })
-      sources."azure-arm-dns-0.11.1"
-      sources."azure-arm-website-0.11.4"
-      sources."azure-arm-rediscache-0.2.3"
-      sources."azure-arm-devtestlabs-0.1.0"
-      (sources."azure-graph-2.1.0-preview" // {
+      (sources."azure-arm-website-0.11.4" // {
         dependencies = [
-          sources."ms-rest-azure-2.2.1"
-          sources."ms-rest-2.2.1"
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
           sources."async-0.2.7"
         ];
       })
+      (sources."azure-arm-rediscache-0.2.3" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
+      (sources."azure-arm-devtestlabs-0.1.0" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
+      sources."azure-graph-2.1.0-preview"
       sources."azure-gallery-2.0.0-pre.18"
-      sources."azure-keyvault-0.11.0"
+      (sources."azure-keyvault-0.11.0" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
       sources."azure-asm-compute-0.18.0"
       sources."azure-asm-hdinsight-0.10.2"
       sources."azure-asm-trafficmanager-0.10.3"
@@ -20966,8 +21020,20 @@ in
         ];
       })
       sources."azure-asm-network-0.13.0"
-      sources."azure-arm-resource-1.6.1-preview"
-      sources."azure-arm-storage-0.15.0-preview"
+      (sources."azure-arm-resource-1.6.1-preview" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
+      (sources."azure-arm-storage-0.15.0-preview" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
       sources."azure-asm-sb-0.10.1"
       sources."azure-asm-sql-0.10.1"
       sources."azure-asm-storage-0.12.0"
@@ -20984,9 +21050,27 @@ in
           sources."xml2js-0.2.7"
         ];
       })
-      sources."azure-arm-batch-0.3.0"
-      sources."azure-batch-0.5.2"
-      sources."azure-servicefabric-0.1.5"
+      (sources."azure-arm-batch-0.3.0" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
+      (sources."azure-batch-0.5.2" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
+      (sources."azure-servicefabric-0.1.5" // {
+        dependencies = [
+          sources."ms-rest-1.15.7"
+          sources."ms-rest-azure-1.15.7"
+          sources."async-0.2.7"
+        ];
+      })
       sources."applicationinsights-0.16.0"
       sources."caller-id-0.1.0"
       sources."colors-1.1.2"
@@ -21009,8 +21093,8 @@ in
         ];
       })
       sources."moment-2.18.1"
-      sources."ms-rest-1.15.7"
-      (sources."ms-rest-azure-1.15.7" // {
+      sources."ms-rest-2.2.1"
+      (sources."ms-rest-azure-2.2.1" // {
         dependencies = [
           sources."async-0.2.7"
         ];
@@ -21078,12 +21162,6 @@ in
       sources."envconf-0.0.4"
       sources."duplexer-0.1.1"
       sources."sax-0.5.2"
-      sources."@types/node-7.0.36"
-      sources."@types/request-0.0.45"
-      sources."@types/uuid-2.0.30"
-      sources."is-buffer-1.1.5"
-      sources."is-stream-1.1.0"
-      sources."@types/form-data-0.0.33"
       sources."browserify-mime-1.2.9"
       sources."extend-1.2.1"
       sources."json-edm-parser-0.1.2"
@@ -21116,6 +21194,12 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
+      sources."@types/node-7.0.37"
+      sources."@types/request-0.0.45"
+      sources."@types/uuid-2.0.30"
+      sources."is-buffer-1.1.5"
+      sources."is-stream-1.1.0"
+      sources."@types/form-data-0.0.33"
       sources."debug-0.7.4"
       sources."q-0.9.7"
       sources."pkginfo-0.4.0"
@@ -22910,7 +22994,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.84.0"
+      sources."aws-sdk-2.85.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
@@ -24063,7 +24147,7 @@ in
       sources."xml2js-0.4.17"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
-      (sources."clean-css-3.4.27" // {
+      (sources."clean-css-3.4.28" // {
         dependencies = [
           sources."commander-2.8.1"
         ];
@@ -24733,6 +24817,37 @@ in
     };
     production = true;
   };
+  js-beautify = nodeEnv.buildNodePackage {
+    name = "js-beautify";
+    packageName = "js-beautify";
+    version = "1.6.14";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.6.14.tgz";
+      sha1 = "d3b8f7322d02b9277d58bd238264c327e58044cd";
+    };
+    dependencies = [
+      sources."config-chain-1.1.11"
+      sources."editorconfig-0.13.2"
+      sources."mkdirp-0.5.1"
+      sources."nopt-3.0.6"
+      sources."proto-list-1.2.4"
+      sources."ini-1.3.4"
+      sources."bluebird-3.5.0"
+      sources."commander-2.11.0"
+      sources."lru-cache-3.2.0"
+      sources."sigmund-1.0.1"
+      sources."pseudomap-1.0.2"
+      sources."minimist-0.0.8"
+      sources."abbrev-1.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "jsbeautifier.org for node";
+      homepage = http://jsbeautifier.org/;
+      license = "MIT";
+    };
+    production = true;
+  };
   jsontool = nodeEnv.buildNodePackage {
     name = "jsontool";
     packageName = "jsontool";
@@ -27385,10 +27500,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.2.0";
+    version = "5.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.2.0.tgz";
-      sha1 = "0014eb05ead6870587fa1c068108935c898e9847";
+      url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz";
+      sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -27427,7 +27542,7 @@ in
       sources."ini-1.3.4"
       sources."init-package-json-1.10.1"
       sources."lazy-property-1.0.0"
-      sources."libnpx-9.0.7"
+      sources."libnpx-9.2.0"
       sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
@@ -32525,4 +32640,4 @@ in
     };
     production = true;
   };
-}
+}
\ No newline at end of file

From 3006919a0b1513a7a4e31e456e06dca7868e5905 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Fri, 14 Jul 2017 08:01:32 +0200
Subject: [PATCH 0535/3246] restic: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 742c1cafc93..8f918dda59b 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "restic-${version}";
-  version = "0.6.1";
+  version = "0.7.0";
 
   goPackagePath = "github.com/restic/restic";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "1rp4s1gh07j06457rhl4r0qnxqn0h7n4i8k50akdr87nwyikkn17";
+    sha256 = "1whzzma2c199i604qy1a807zhi8qgri1r9bbxl5l7wlfh7x0n6sd";
   };
 
   buildPhase = ''

From 954c66983df36e50ec569dce6350b8a8344d99c2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 14 Jul 2017 20:02:15 -0400
Subject: [PATCH 0536/3246] perf: Apply patch for offline kernels

As per https://lkml.org/lkml/2017/7/13/314, perf is broken in 4.9.36 and 4.9.37
Patches in this commit are taken from
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=39f4f2c018bd831c325e11983f8893caf72fd9eb

This will allow perf to build again and should be included in a future 4.9.x release,
allowing the custom patching to be removed again
---
 .../linux/kernel/perf-offline-probe.patch     | 224 ++++++++++++++++++
 pkgs/os-specific/linux/kernel/perf.nix        |   2 +-
 2 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/perf-offline-probe.patch

diff --git a/pkgs/os-specific/linux/kernel/perf-offline-probe.patch b/pkgs/os-specific/linux/kernel/perf-offline-probe.patch
new file mode 100644
index 00000000000..7334a339c85
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/perf-offline-probe.patch
@@ -0,0 +1,224 @@
+From 8a937a25a7e3c19d5fb3f9d92f605cf5fda219d8 Mon Sep 17 00:00:00 2001
+From: Masami Hiramatsu <mhiramat@kernel.org>
+Date: Wed, 4 Jan 2017 12:30:19 +0900
+Subject: perf probe: Fix to probe on gcc generated symbols for offline kernel
+
+From: Masami Hiramatsu <mhiramat@kernel.org>
+
+commit 8a937a25a7e3c19d5fb3f9d92f605cf5fda219d8 upstream.
+
+Fix perf-probe to show probe definition on gcc generated symbols for
+offline kernel (including cross-arch kernel image).
+
+gcc sometimes optimizes functions and generate new symbols with suffixes
+such as ".constprop.N" or ".isra.N" etc. Since those symbol names are
+not recorded in DWARF, we have to find correct generated symbols from
+offline ELF binary to probe on it (kallsyms doesn't correct it).  For
+online kernel or uprobes we don't need it because those are rebased on
+_text, or a section relative address.
+
+E.g. Without this:
+
+  $ perf probe -k build-arm/vmlinux -F __slab_alloc*
+  __slab_alloc.constprop.9
+  $ perf probe -k build-arm/vmlinux -D __slab_alloc
+  p:probe/__slab_alloc __slab_alloc+0
+
+If you put above definition on target machine, it should fail
+because there is no __slab_alloc in kallsyms.
+
+With this fix, perf probe shows correct probe definition on
+__slab_alloc.constprop.9:
+
+  $ perf probe -k build-arm/vmlinux -D __slab_alloc
+  p:probe/__slab_alloc __slab_alloc.constprop.9+0
+
+Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: http://lkml.kernel.org/r/148350060434.19001.11864836288580083501.stgit@devbox
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Krister Johansen <kjlx@templeofstupid.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/perf/util/probe-event.c |   48 +++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 47 insertions(+), 1 deletion(-)
+
+--- a/tools/perf/util/probe-event.c
++++ b/tools/perf/util/probe-event.c
+@@ -618,6 +618,51 @@ error:
+	return ret ? : -ENOENT;
+ }
+
++/*
++ * Rename DWARF symbols to ELF symbols -- gcc sometimes optimizes functions
++ * and generate new symbols with suffixes such as .constprop.N or .isra.N
++ * etc. Since those symbols are not recorded in DWARF, we have to find
++ * correct generated symbols from offline ELF binary.
++ * For online kernel or uprobes we don't need this because those are
++ * rebased on _text, or already a section relative address.
++ */
++static int
++post_process_offline_probe_trace_events(struct probe_trace_event *tevs,
++					int ntevs, const char *pathname)
++{
++	struct symbol *sym;
++	struct map *map;
++	unsigned long stext = 0;
++	u64 addr;
++	int i;
++
++	/* Prepare a map for offline binary */
++	map = dso__new_map(pathname);
++	if (!map || get_text_start_address(pathname, &stext) < 0) {
++		pr_warning("Failed to get ELF symbols for %s\n", pathname);
++		return -EINVAL;
++	}
++
++	for (i = 0; i < ntevs; i++) {
++		addr = tevs[i].point.address + tevs[i].point.offset - stext;
++		sym = map__find_symbol(map, addr);
++		if (!sym)
++			continue;
++		if (!strcmp(sym->name, tevs[i].point.symbol))
++			continue;
++		/* If we have no realname, use symbol for it */
++		if (!tevs[i].point.realname)
++			tevs[i].point.realname = tevs[i].point.symbol;
++		else
++			free(tevs[i].point.symbol);
++		tevs[i].point.symbol = strdup(sym->name);
++		tevs[i].point.offset = addr - sym->start;
++	}
++	map__put(map);
++
++	return 0;
++}
++
+ static int add_exec_to_probe_trace_events(struct probe_trace_event *tevs,
+					  int ntevs, const char *exec)
+ {
+@@ -694,7 +739,8 @@ post_process_kernel_probe_trace_events(s
+
+	/* Skip post process if the target is an offline kernel */
+	if (symbol_conf.ignore_vmlinux_buildid)
+-		return 0;
++		return post_process_offline_probe_trace_events(tevs, ntevs,
++						symbol_conf.vmlinux_name);
+
+	reloc_sym = kernel_get_ref_reloc_sym();
+	if (!reloc_sym) {
+
+---
+
+From 3e96dac7c956089d3f23aca98c4dfca57b6aaf8a Mon Sep 17 00:00:00 2001
+From: Masami Hiramatsu <mhiramat@kernel.org>
+Date: Wed, 11 Jan 2017 15:00:47 +0900
+Subject: perf probe: Add error checks to offline probe post-processing
+
+From: Masami Hiramatsu <mhiramat@kernel.org>
+
+commit 3e96dac7c956089d3f23aca98c4dfca57b6aaf8a upstream.
+
+Add error check codes on post processing and improve it for offline
+probe events as:
+
+ - post processing fails if no matched symbol found in map(-ENOENT)
+   or strdup() failed(-ENOMEM).
+
+ - Even if the symbol name is the same, it updates symbol address
+   and offset.
+
+Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: http://lkml.kernel.org/r/148411443738.9978.4617979132625405545.stgit@devbox
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Krister Johansen <kjlx@templeofstupid.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/perf/util/probe-event.c |   50 +++++++++++++++++++++++++++---------------
+ 1 file changed, 33 insertions(+), 17 deletions(-)
+
+--- a/tools/perf/util/probe-event.c
++++ b/tools/perf/util/probe-event.c
+@@ -618,6 +618,33 @@ error:
+	return ret ? : -ENOENT;
+ }
+
++/* Adjust symbol name and address */
++static int post_process_probe_trace_point(struct probe_trace_point *tp,
++					   struct map *map, unsigned long offs)
++{
++	struct symbol *sym;
++	u64 addr = tp->address + tp->offset - offs;
++
++	sym = map__find_symbol(map, addr);
++	if (!sym)
++		return -ENOENT;
++
++	if (strcmp(sym->name, tp->symbol)) {
++		/* If we have no realname, use symbol for it */
++		if (!tp->realname)
++			tp->realname = tp->symbol;
++		else
++			free(tp->symbol);
++		tp->symbol = strdup(sym->name);
++		if (!tp->symbol)
++			return -ENOMEM;
++	}
++	tp->offset = addr - sym->start;
++	tp->address -= offs;
++
++	return 0;
++}
++
+ /*
+  * Rename DWARF symbols to ELF symbols -- gcc sometimes optimizes functions
+  * and generate new symbols with suffixes such as .constprop.N or .isra.N
+@@ -630,11 +657,9 @@ static int
+ post_process_offline_probe_trace_events(struct probe_trace_event *tevs,
+					int ntevs, const char *pathname)
+ {
+-	struct symbol *sym;
+	struct map *map;
+	unsigned long stext = 0;
+-	u64 addr;
+-	int i;
++	int i, ret = 0;
+
+	/* Prepare a map for offline binary */
+	map = dso__new_map(pathname);
+@@ -644,23 +669,14 @@ post_process_offline_probe_trace_events(
+	}
+
+	for (i = 0; i < ntevs; i++) {
+-		addr = tevs[i].point.address + tevs[i].point.offset - stext;
+-		sym = map__find_symbol(map, addr);
+-		if (!sym)
+-			continue;
+-		if (!strcmp(sym->name, tevs[i].point.symbol))
+-			continue;
+-		/* If we have no realname, use symbol for it */
+-		if (!tevs[i].point.realname)
+-			tevs[i].point.realname = tevs[i].point.symbol;
+-		else
+-			free(tevs[i].point.symbol);
+-		tevs[i].point.symbol = strdup(sym->name);
+-		tevs[i].point.offset = addr - sym->start;
++		ret = post_process_probe_trace_point(&tevs[i].point,
++						     map, stext);
++		if (ret < 0)
++			break;
+	}
+	map__put(map);
+
+-	return 0;
++	return ret;
+ }
+
+ static int add_exec_to_probe_trace_events(struct probe_trace_event *tevs,
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 3fbad924568..cb13167eebc 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   inherit (kernel) src;
 
-  patches = kernel.patches ++ [ ./perf-binutils-path.patch ];
+  patches = kernel.patches ++ [ ./perf-binutils-path.patch ./perf-offline-probe.patch ];
 
   preConfigure = ''
     cd tools/perf

From 08e0f106e3d3a05455b9afa926b4e2e8211f1ed2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 15 Jul 2017 09:10:43 +0200
Subject: [PATCH 0537/3246] gnumeric: 1.12.34 -> 1.12.35

goffice: 0.10.34 -> 0.10.35
---
 pkgs/applications/office/gnumeric/default.nix  | 6 +++---
 pkgs/development/libraries/goffice/default.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index fda320dd54a..69a96c6148e 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -9,11 +9,11 @@ let
   isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
   isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
 in stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.34";
+  name = "gnumeric-1.12.35";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "0b4920812d82ec4c25204543dff9dd3bdbac17bfaaabd1aa02d47fbe2981c725";
+    sha256 = "77b1e3ce523578a807767ad71680fb865ac021d7bfadf93eada99ae094c06c0a";
   };
 
   configureFlags = "--disable-component";
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
     for f in "$out"/bin/gnumeric-*; do
       wrapProgram $f \
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-        ${stdenv.lib.optionalString (!stdenv.isDarwin) "--prefix GIO_EXTRA_MODULES : '${gnome3.dconf}/lib/gio/modules'"}
+        ${stdenv.lib.optionalString (!stdenv.isDarwin) "--prefix GIO_EXTRA_MODULES : '${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules'"}
     done
   '';
 
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 8b4103dec7f..7971448133e 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -2,11 +2,11 @@
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.34";
+  name = "goffice-0.10.35";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "554a75a22b5863b3b17595148bee6462122f2dbf031dfa78b61e941e3c2dd603";
+    sha256 = "c19001afca09dc5446e06605a113d81a57124018a09c5889aeebba16cf1d5738";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 371ad29661df49b77922acb78f307b12ddc0ade7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jul 2017 09:26:38 +0200
Subject: [PATCH 0538/3246] abc-verifier: fix typo in meta

---
 pkgs/applications/science/logic/abc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix
index 47fd8e5dbc8..bab9b302d7d 100644
--- a/pkgs/applications/science/logic/abc/default.nix
+++ b/pkgs/applications/science/logic/abc/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A tool for squential logic synthesis and ormal verification";
+    description = "A tool for squential logic synthesis and formal verification";
     homepage    = "https://people.eecs.berkeley.edu/~alanmi/abc/abc.htm";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.unix;

From efe66e221f0cbdcb7a75f6e5e1d7d3ffadc23374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jul 2017 10:06:46 +0200
Subject: [PATCH 0539/3246] evince: patch CVE-2017-1000083 + minor changes

This removes help for now but fixes #27388.
The minor update might be related to the patch so it's included.
---
 .../desktops/gnome-3/3.22/core/evince/default.nix | 15 ++++++++++++++-
 pkgs/desktops/gnome-3/3.22/core/evince/src.nix    |  6 +++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
index 7629e5b5655..340825cd666 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
@@ -4,12 +4,23 @@
 , librsvg, gobjectIntrospection
 , recentListSize ? null # 5 is not enough, allow passing a different number
 , supportXPS ? false    # Open XML Paper Specification via libgxps
+, fetchpatch, autoreconfHook
 }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  patches = [
+    (fetchpatch {
+      name = "CVE-2017-1000083"; # https://bugzilla.gnome.org/show_bug.cgi?id=784630
+      url = "https://git.gnome.org/browse/evince/patch/?id=fa072dbbfd96";
+      sha256 = "12xg00jvbsh54dr2dyq2ha5a05x2bpzd1lh2k3sppq3h7a02lsjy";
+    })
+  ];
+  # missing help for now; fixing the autogen phase seemed too difficult
+  postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am";
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook/*for patches*/ ];
 
   buildInputs = [
     intltool perl perlXMLParser libxml2
@@ -43,6 +54,8 @@ stdenv.mkDerivation rec {
     gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")
   '';
 
+  enableParallelBuilding = true;
+
   doCheck = false; # would need pythonPackages.dogTail, which is missing
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
index 36572a58e17..07997a5c095 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "evince-3.22.0";
+  name = "evince-3.22.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/evince/3.22/evince-3.22.0.tar.xz;
-    sha256 = "22ebabf890057e8b43020ffdebdbb57d6a586beba031838f0f0c8a596c479d46";
+    url = mirror://gnome/sources/evince/3.22/evince-3.22.1.tar.xz;
+    sha256 = "f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c";
   };
 }

From 9480628286d1b19ef6b708d62d77059a9763fd1d Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 15 Jul 2017 10:21:12 +0200
Subject: [PATCH 0540/3246] insync: 1.3.16.36155 -> 1.3.17.36167

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

diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 5690705d1f2..93efdb74c08 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "insync-${version}";
-  version = "1.3.16.36155";
+  version = "1.3.17.36167";
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
-        sha256 = "1gf1qg7mkbcgqhwxkiljmd1w2zvarq6vhxhips3w06bqdyg12210";
+        sha256 = "0mvg22psiy4x9g7k1fm9pigz2a70jmin7zg2nfzapfnqjlnrbw3n";
       }
     else
       throw "${name} is not supported on ${stdenv.system}";

From 338a19520493f941a3f478bf852074e74a67b03d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jul 2017 10:38:01 +0200
Subject: [PATCH 0541/3246] dns-root-data: improve determinism, clear key
 status

Nitpicks:
- The timestamps there were useless.
- The generator now switched the two keys; I don't know why.

I intentionally remove the comments like "state=1 [ ADDPEND ]".
The problem is that keys e.g. in ADDPEND state are *not* immediately
usable for validation - see RFC5011 for details.  I verified that Unbound
does disregard this on the format we and Debian use ATM, presumably due
to removing parts of the comments, but it would be confusing nevertheless.
---
 pkgs/data/misc/dns-root-data/root.ds            | 1 -
 pkgs/data/misc/dns-root-data/root.key           | 4 ++--
 pkgs/data/misc/dns-root-data/update-root-key.sh | 9 +++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/data/misc/dns-root-data/root.ds
index 61c5b8fcd34..7578e0405d9 100644
--- a/pkgs/data/misc/dns-root-data/root.ds
+++ b/pkgs/data/misc/dns-root-data/root.ds
@@ -1,3 +1,2 @@
-; created by unbound-anchor on Tue Jul 11 23:48:16 2017
 . IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
 . IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D
diff --git a/pkgs/data/misc/dns-root-data/root.key b/pkgs/data/misc/dns-root-data/root.key
index 9046cefcb71..c0da7b3f60f 100644
--- a/pkgs/data/misc/dns-root-data/root.key
+++ b/pkgs/data/misc/dns-root-data/root.key
@@ -1,2 +1,2 @@
-.	172800	IN	DNSKEY	257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} ;;state=1 [ ADDPEND ]
-.	172800	IN	DNSKEY	257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b} ;;state=2 [  VALID  ]
+.	172800	IN	DNSKEY	257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b}
+.	172800	IN	DNSKEY	257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b}
diff --git a/pkgs/data/misc/dns-root-data/update-root-key.sh b/pkgs/data/misc/dns-root-data/update-root-key.sh
index 5db179621a7..9a3141aef19 100755
--- a/pkgs/data/misc/dns-root-data/update-root-key.sh
+++ b/pkgs/data/misc/dns-root-data/update-root-key.sh
@@ -2,8 +2,9 @@
 #!nix-shell -i bash -p busybox unbound
 
 TMP=`mktemp`
-unbound-anchor -a $TMP
-grep -Ev "^($$|;)" $TMP | sed -e 's/ ;;count=.*//' > root.key
-rm $TMP
+unbound-anchor -a "$TMP"
+grep -Ev "^($$|;)" "$TMP" | sed -e 's/ ;;.*//' > root.key
 
-unbound-anchor -F -a root.ds
+unbound-anchor -F -a "$TMP"
+sed '/^;/d' < "$TMP" > root.ds
+rm $TMP

From 2ab67778d6935f6c59ba9c4667cdad0554b7dbbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jul 2017 11:28:56 +0200
Subject: [PATCH 0542/3246] pciutils: 3.5.4 -> 3.5.5

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

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 998a3bdf6d1..8a4fe6cb3cf 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
 stdenv.mkDerivation rec {
-  name = "pciutils-3.5.4"; # with database from 2017-02
+  name = "pciutils-3.5.5"; # with database from 2017-07
 
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
-    sha256 = "0rpy7kkb2y89wmbcbfjjjxsk2x89v5xxhxib4vpl131ip5m3qab4";
+    sha256 = "1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5";
   };
 
   buildInputs = [ pkgconfig zlib kmod which ];

From 240313e251fc2f07cade7578fe6d01a625c967c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jul 2017 11:34:52 +0200
Subject: [PATCH 0543/3246] libjpeg(-turbo): 1.5.1 -> 1.5.2

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

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index cd8484170bd..d1181966815 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "libjpeg-turbo-${version}";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
-    sha256 = "0v365hm6z6lddcqagjj15wflk66rqyw75m73cqzl65rh4lyrshj1";
+    sha256 = "0a5m0psfp5952y5vrcs0nbdz1y9wqzg2ms0xwrx752034wxr964h";
   }; # github releases still need autotools, surprisingly
 
   patches =

From 0f09b057944dd3fdee3422ba46d66d5f28298f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jul 2017 11:39:46 +0200
Subject: [PATCH 0544/3246] libpng: 1.6.29 -> 1.6.30

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index c2f50af84ca..0ae40a76386 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -5,13 +5,13 @@
 assert zlib != null;
 
 let
-  version = "1.6.29";
-  patchVersion = "1.6.26";
+  version = "1.6.30";
+  patchVersion = "1.6.30";
   # patchVersion = version;
-  sha256 = "0fgjqp7x6jynacmqh6dj72cn6nnf6yxjfqqqfsxrx0pyx22bcia2";
+  sha256 = "0rin6la7q03vb7wsafhlvzqri1v9ky30g4ljsfcwa37pzwpk6z16";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
-    sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1";
+    sha256 = "06nrcp2n77f563hch8g9gv62jg894mvya6zizj5fsmbqzaqmjqqs";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 

From 0134709369b2f5e7f8ae7de2869c1f5433e2f48d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 15 Jul 2017 11:39:56 +0200
Subject: [PATCH 0545/3246] getdata: 0.9.4 -> 0.10.0

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

diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix
index 5dbf22df552..22e7d216e6c 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/pkgs/development/libraries/getdata/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, libtool }:
 stdenv.mkDerivation rec {
   name = "getdata-${version}";
-  version = "0.9.4";
+  version = "0.10.0";
   src = fetchurl {
     url = "mirror://sourceforge/getdata/${name}.tar.xz";
-    sha256 = "0kikla8sxv6f1rlh77m86dajcsa7b1029zb8iigrmksic27mj9ja";
+    sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym";
   };
 
+  buildInputs = [ libtool ];
+
   meta = with stdenv.lib; {
     description = "Reference implementation of the Dirfile Standards";
     license = licenses.lgpl21Plus;

From 5a03a05520068abd1a5964310abfac22a90c26e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jul 2017 11:43:47 +0200
Subject: [PATCH 0546/3246] gtk3: maintenance 3.22.15 -> 3.22.16

---
 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 917371678e9..cf888641b94 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 = "15";
+  ver_min = "16";
   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 = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb";
+    sha256 = "3e0c3ad01f3c8c5c9b1cc1ae00852bd55164c8e5a9c1f90ba5e07f14f175fe2c";
   };
 
   outputs = [ "out" "dev" ];

From 7d80f94f754f848410b6a3be831bee7c9e82174a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jul 2017 11:46:54 +0200
Subject: [PATCH 0547/3246] dbus: maintenance 1.10.18 -> 1.10.20

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

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index f569f53861d..5fe13d86f2d 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.10.18";
-  sha256 = "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0";
+  version = "1.10.20";
+  sha256 = "0j0b8rn9fvh1m4nndp9fzq09xw50grp5kfvkv7jgs9al1dwbjx75";
 
 self = stdenv.mkDerivation {
     name = "dbus-${version}";

From 071693e5df98a7493f8a62eaf0d190d02e285740 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 15 Jul 2017 11:49:52 +0200
Subject: [PATCH 0548/3246] matio: 1.5.9 -> 1.5.10

---
 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 b33950d35e0..83ddcbf52e1 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.9";
+  name = "matio-1.5.10";
   src = fetchurl {
     url = "mirror://sourceforge/matio/${name}.tar.gz";
-    sha256 = "0p60c3wdj4w7v7hzdc0iivciq4hwxzhhx0zq8gpv9i8yhdjzkdxy";
+    sha256 = "00dmg2f5k2xgakp7l0lganz122b1agazw5d899xci35xrqc9j821";
   };
 
   meta = with stdenv.lib; {

From 3d1266fcbdf6f9bd56a09f6cf661a2bec2f410a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jul 2017 12:28:25 +0200
Subject: [PATCH 0549/3246] mesa: maintenance 17.1.4 -> 17.1.5

---
 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 e1bd4255636..45819a8f3a6 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.1.4";
+  version = "17.1.5";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -82,7 +82,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 = "06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad";
+    sha256 = "378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9";
   };
 
   prePatch = "patchShebangs .";

From cc583b75fb4241cb7b6e005942fc928f64f60a5b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 7 Jul 2017 00:54:10 +0200
Subject: [PATCH 0550/3246] chromium: 59.0.3071.109 -> 59.0.3071.115

use several system libraries instead of bundled

see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
---
 .../networking/browsers/chromium/common.nix   | 31 ++++++++-
 ...romium-59.0.3071.115-system_ffmpeg-1.patch | 63 +++++++++++++++++++
 .../browsers/chromium/upstream-info.nix       | 18 +++---
 3 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 43b6da6bf34..11177f3ee48 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, ninja, which, nodejs
+{ stdenv, ninja, which, nodejs, fetchurl, gnutar
 
 # default dependencies
 , bzip2, flac, speex, libopus
@@ -14,6 +14,7 @@
 , glib, gtk2, gtk3, dbus_glib
 , libXScrnSaver, libXcursor, libXtst, mesa
 , protobuf, speechd, libXdamage, cups
+, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2
 
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
@@ -36,6 +37,8 @@ buildFun:
 
 with stdenv.lib;
 
+# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
+
 let
   # The additional attributes for creating derivations based on the chromium
   # source tree.
@@ -57,7 +60,7 @@ let
     in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
 
   gnSystemLibraries = [
-    "flac" "libwebp" "snappy" "yasm"
+    "ffmpeg" "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "snappy" # "libpng" "libjpeg"
   ];
 
   opusWithCustomModes = libopus.override {
@@ -70,6 +73,7 @@ let
     libpng libcap
     xdg_utils yasm minizip libwebp
     libusb1 re2 zlib
+    ffmpeg harfbuzz libxslt harfbuzz-icu libxml2
   ];
 
   # build paths and release info
@@ -78,6 +82,11 @@ let
   buildPath = "out/${buildType}";
   libExecPath = "$out/libexec/${packageName}";
 
+  freetype_source = fetchurl {
+    url = http://anduin.linuxfromscratch.org/BLFS/other/chromium-freetype.tar.xz;
+    sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77";
+  };
+
   base = rec {
     name = "${packageName}-${version}";
     inherit (upstream-info) version;
@@ -88,6 +97,7 @@ let
     nativeBuildInputs = [
       ninja which python2Packages.python perl pkgconfig
       python2Packages.ply python2Packages.jinja2 nodejs
+      gnutar
     ];
 
     buildInputs = defaultDependencies ++ [
@@ -108,6 +118,7 @@ let
       # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
       # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
       ./patches/fix_network_api_crash.patch
+      ./patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
     ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
       ++ optional enableWideVine ./patches/widevine.patch;
 
@@ -139,6 +150,22 @@ let
       # use our own nodejs
       mkdir -p third_party/node/linux/node-linux-x64/bin
       ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node
+
+      # use patched freetype
+      # FIXME https://bugs.chromium.org/p/pdfium/issues/detail?id=733
+      # FIXME http://savannah.nongnu.org/bugs/?51156
+      tar -xJf ${freetype_source}
+
+      # remove unused third-party
+      for lib in ${toString gnSystemLibraries}; do
+        find -type f -path "*third_party/$lib/*"     \
+            \! -path "*third_party/$lib/chromium/*"  \
+            \! -path "*third_party/$lib/google/*"    \
+            \! -path "*base/third_party/icu/*"       \
+            \! -path "*base/third_party/libevent/*"  \
+            \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
+            -delete
+      done
     '';
 
     gnFlags = mkGnFlags ({
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
new file mode 100644
index 00000000000..2ffdcc0ad6a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
@@ -0,0 +1,63 @@
+Submitted By:            DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date:                    2017-06-25
+Initial Package Version: 57.0.2987.110
+Upstream Status:         Not submitted
+Origin:                  Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
+Description:             Allows building with system provided ffmpeg. Rediffed
+                         for chromium-59.0.3071.109.
+
+diff -Naurp chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h
+--- chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h	2017-06-20 17:03:19.000000000 -0500
++++ chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h	2017-06-23 00:21:10.551912699 -0500
+@@ -23,10 +23,6 @@
+ 
+ // Include FFmpeg header files.
+ extern "C" {
+-// Disable deprecated features which result in spammy compile warnings.  This
+-// list of defines must mirror those in the 'defines' section of FFmpeg's
+-// BUILD.gn file or the headers below will generate different structures!
+-#define FF_API_CONVERGENCE_DURATION 0
+ // Upstream libavcodec/utils.c still uses the deprecated
+ // av_dup_packet(), causing deprecation warnings.
+ // The normal fix for such things is to disable the feature as below,
+@@ -40,7 +36,6 @@ extern "C" {
+ MSVC_PUSH_DISABLE_WARNING(4244);
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+-#include <libavformat/internal.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
+ #include <libavutil/imgutils.h>
+diff -Naurp chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc
+--- chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc	2017-06-20 17:03:19.000000000 -0500
++++ chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc	2017-06-23 00:22:56.289311692 -0500
+@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+   // If no estimate is found, the stream entry will be kInfiniteDuration.
+   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
+                                                     kInfiniteDuration);
+-  const AVFormatInternal* internal = format_context->internal;
+-  if (internal && internal->packet_buffer &&
+-      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-    struct AVPacketList* packet_buffer = internal->packet_buffer;
+-    while (packet_buffer != internal->packet_buffer_end) {
+-      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
+-                start_time_estimates.size());
+-      const AVStream* stream =
+-          format_context->streams[packet_buffer->pkt.stream_index];
+-      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-        const base::TimeDelta packet_pts =
+-            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
+-        // We ignore kNoTimestamp here since -int64_t::min() is possible; see
+-        // https://crbug.com/700501. Technically this is a valid value, but in
+-        // practice shouldn't occur, so just ignore it when estimating.
+-        if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
+-            packet_pts < start_time_estimates[stream->index]) {
+-          start_time_estimates[stream->index] = packet_pts;
+-        }
+-      }
+-      packet_buffer = packet_buffer->next;
+-    }
+-  }
+ 
+   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
+ 
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index bb4f9a1371b..708320e92a2 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 = "1lr8yc1inj0r0znak4rq37c9r0jhmag0ny9dqxng2jpgqq7mkp2g";
-    sha256bin64 = "1yyw7i50jkgkwrgp4by83m0xwsi44bkxsyw47lrqbfzask3zazbm";
-    version = "60.0.3112.40";
+    sha256 = "086j8s8wjwk26gfb7hdqn1lsmwgr9mmw93yfi6s4wia9ra0ccwj2";
+    sha256bin64 = "0z1dshxzyn5zhr4xg5mvrq70jxsfkwv50achq802322y4jz52f7n";
+    version = "60.0.3112.66";
   };
   dev = {
-    sha256 = "1xhv32bxiwz56gcbw47syl88a54x5gira4drh378zp8cwgh9pz4z";
-    sha256bin64 = "18k3wml6yl2qghhnxb2w2d0k2397i0829nk0sqc38qz2sjbbvzna";
-    version = "61.0.3135.4";
+    sha256 = "1hbf7hv4934686dp0dbqy06vbwb2kq4wz5hjfdxrgafrzqac2j7g";
+    sha256bin64 = "1gg1a3k80qncr7dpw9gycndv52396cqyq9zfmzf6c4njpn2khjfv";
+    version = "61.0.3153.4";
   };
   stable = {
-    sha256 = "1naqlxz9w07nlnwxkmxwf9jnxvmagj88xcjqh9r873a26wsypyl3";
-    sha256bin64 = "1h086irdsjs27n7ch54hy7zbiypc4swr8wnxjha1q39wc1bpc7hl";
-    version = "59.0.3071.109";
+    sha256 = "0w1i4q7w5lcajc18jrchrhhm00x0jzm846l5x7a5rcp3baawkjrp";
+    sha256bin64 = "1naq20508qjm9hlwlpj686a0lawca58rnr35ws2gh2gsyxrxnmx1";
+    version = "59.0.3071.115";
   };
 }

From a3aa0ba18be43165a76d1e1cc301699cb05152b0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 10 Jul 2017 07:55:09 -0300
Subject: [PATCH 0551/3246] bochs: 2.6.8 -> 2.6.9

---
 .../virtualization/bochs/default.nix          | 151 +++++++-----------
 1 file changed, 54 insertions(+), 97 deletions(-)

diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index dfd92685579..211bd2f39e0 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, config
+{ stdenv, fetchurl
 , pkgconfig, libtool
 , gtk2, mesa, readline, libX11, libXpm
 , docbook_xml_dtd_45, docbook_xsl
 , sdlSupport ? true, SDL2 ? null
-, termSupport ? true , ncurses ? null
+, termSupport ? true, ncurses ? null
 , wxSupport ? true, wxGTK ? null
-# Optional, undocumented dependencies
 , wgetSupport ? false, wget ? null
 , curlSupport ? false, curl ? null
 }:
@@ -16,58 +15,17 @@ assert wxSupport -> (gtk2 != null && wxGTK != null);
 assert wgetSupport -> (wget != null);
 assert curlSupport -> (curl != null);
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bochs-${version}";
-  version = "2.6.8";
+  version = "2.6.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz";
-    sha256 = "1kl5cmbz6qgg33j5vv9898nzdppp1rqgy24r5pv762aaj7q0ww3r";
+    sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
   };
 
-  # The huge list of configurable options
-  # Blatantly based on ffmpeg expressions
-
-  termSupport = config.bochs.termSupport or true;
-  sdlSupport = config.bochs.sdlSupport or true;
-  wxSupport = config.bochs.wxSupport or false;
-  largefile = config.bochs.largefile or true;
-  idleHack = config.bochs.idleHack or true;
-  plugins = config.bochs.plugins or false; # Warning! Broken
-  a20Pin = config.bochs.a20Pin or true;
-  emulate64Bits = config.bochs.emulate64Bits or false;
-  smp = config.bochs.smp or false;
-  largeRamfile = config.bochs.largeRamfile or true;
-  repeatSpeedups = config.bochs.repeatSpeedups or false;
-  handlersChaining = config.bochs.handlersChaining or false;
-  traceLinking = config.bochs.traceLinking or false;
-  configurableMSRegs = config.bochs.configurableMSRegs or false;
-  showIPS = config.bochs.showIPS or true;
-  debugger = config.bochs.debugger or false;
-  disasm = config.bochs.disasm or false;
-  debuggerGui = config.bochs.debuggerGui or false;
-  gdbStub = config.bochs.gdbStub or false;
-  IODebug = config.Bochs.IODebug or false;
-  fpu = config.bochs.fpu or true;
-  svm = config.bochs.svm or false;
-  avx = config.bochs.avx or false;
-  evex = config.bochs.evex or false;
-  x86Debugger = config.bochs.x86Debugger or false;
-  pci = config.bochs.pci or true;
-  uhci = config.bochs.uhci or false;
-  ohci = config.bochs.ohci or false;
-  ne2k = config.bochs.ne2k or true;
-  pNIC = config.bochs.pNIC or true;
-  e1000 = config.bochs.e1000 or true;
-  clgd54xx = config.bochs.clgd54xx or true;
-  voodoo = config.bochs.voodoo or true;
-  cdrom = config.bochs.cdrom or true;
-  sb16 = config.bochs.sb16 or true;
-  es1370 = config.bochs.es1370 or true;
-  gameport = config.bochs.gameport or true;
-  busMouse = config.bochs.busMouse or false;
-
   buildInputs = with stdenv.lib;
   [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
   ++ optionals termSupport [ ncurses ]
@@ -83,7 +41,6 @@ stdenv.mkDerivation rec {
     "--with-rfb=no"
     "--with-vncsrv=no"
     "--with-svga=no" # it doesn't compile on NixOS
-    "--with-wx=no"
 
     # These will always be "yes" on NixOS
     "--enable-ltdl-install=yes"
@@ -100,69 +57,69 @@ stdenv.mkDerivation rec {
 
     # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation
     "--enable-3dnow=no"
-    "--enable-usb-xhci=no"
     "--enable-monitor-mwait=no"
     "--enable-raw-serial=no" ]
     # Boolean flags
-    ++ stdenv.lib.optional termSupport "--with-term"
-    ++ stdenv.lib.optional sdlSupport "--with-sdl2"
-    ++ stdenv.lib.optional wxSupport "--with-wx"
-    ++ stdenv.lib.optional largefile "--enable-largefile"
-    ++ stdenv.lib.optional idleHack "--enable-idle-hack"
-    ++ stdenv.lib.optional plugins "--enable-plugins"
-    ++ stdenv.lib.optional a20Pin "--enable-a20-pin"
-    ++ stdenv.lib.optional emulate64Bits "--enable-x86-64"
-    ++ stdenv.lib.optional smp "--enable-smp"
-    ++ stdenv.lib.optional largeRamfile "--enable-large-ramfile"
-    ++ stdenv.lib.optional repeatSpeedups "--enable-repeat-speedups"
-    ++ stdenv.lib.optional handlersChaining "--enable-handlers-chaining"
-    ++ stdenv.lib.optional traceLinking "--enable-trace-linking"
-    ++ stdenv.lib.optional configurableMSRegs "--enable-configurable-msrs"
-    ++ stdenv.lib.optional showIPS "--enable-show-ips"
-    ++ stdenv.lib.optional debugger "--enable-debugger"
-    ++ stdenv.lib.optional disasm "--enable-disasm"
-    ++ stdenv.lib.optional debuggerGui "--enable-debugger-gui"
-    ++ stdenv.lib.optional gdbStub "--enable-gdb-stub"
-    ++ stdenv.lib.optional IODebug "--enable-iodebug"
-    ++ stdenv.lib.optional fpu "--enable-fpu"
-    ++ stdenv.lib.optional svm "--enable-svm"
-    ++ stdenv.lib.optional avx "--enable-avx"
-    ++ stdenv.lib.optional evex "--enable-evex"
-    ++ stdenv.lib.optional x86Debugger "--enable-x86-debugger"
-    ++ stdenv.lib.optional pci "--enable-pci"
-    ++ stdenv.lib.optional uhci "--enable-usb"
-    ++ stdenv.lib.optional ohci "--enable-usb-ohci"
-    ++ stdenv.lib.optional ne2k "--enable-ne2000"
-    ++ stdenv.lib.optional pNIC "--enable-pnic"
-    ++ stdenv.lib.optional e1000 "--enable-e1000"
-    ++ stdenv.lib.optional clgd54xx "--enable-clgd54xx"
-    ++ stdenv.lib.optional voodoo "--enable-voodoo"
-    ++ stdenv.lib.optional cdrom "--enable-cdrom"
-    ++ stdenv.lib.optional sb16 "--enable-sb16"
-    ++ stdenv.lib.optional es1370 "--enable-es1370"
-    ++ stdenv.lib.optional busMouse "--enable-busmouse"
-    ;
+    ++ optionals termSupport [ "--with-term" ]
+    ++ optionals sdlSupport [ "--with-sdl2" ]
+    ++ optionals wxSupport [ "--with-wx" ]
+    # These are completely configurable, and they don't depend of external tools
+    ++ [ "--enable-cpu-level=6" # from 3 to 6
+         "--enable-largefile"
+         "--enable-idle-hack"
+         "--enable-plugins=no" # Plugins are a bit buggy in Bochs
+         "--enable-a20-pin"
+         "--enable-x86-64"
+         "--enable-smp"
+         "--enable-large-ramfile"
+         "--enable-repeat-speedups"
+         "--enable-handlers-chaining"
+         "--enable-trace-linking"
+         "--enable-configurable-msrs"
+         "--enable-show-ips"
+         "--enable-debugger" #conflicts with gdb-stub option
+         "--enable-disasm"
+         "--enable-debugger-gui"
+         "--enable-gdb-stub=no" # conflicts with debugger option
+         "--enable-iodebug"
+         "--enable-fpu"
+         "--enable-svm"
+         "--enable-avx"
+         "--enable-evex"
+         "--enable-x86-debugger"
+         "--enable-pci"
+         "--enable-usb"
+         "--enable-usb-ohci"
+         "--enable-usb-ehci"
+         "--enable-usb-xhci"
+         "--enable-ne2000"
+         "--enable-pnic"
+         "--enable-e1000"
+         "--enable-clgd54xx"
+         "--enable-voodoo"
+         "--enable-cdrom"
+         "--enable-sb16"
+         "--enable-es1370"
+         "--enable-busmouse" ];
 
   NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/";
   NIX_LDFLAGS="-L${libtool.lib}/lib";
 
   hardeningDisable = [ "format" ];
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "An open-source IA-32 (x86) PC emulator";
     longDescription = ''
-    Bochs is an open-source (LGPL), highly portable IA-32 PC emulator,
-    written in C++, that runs on most popular platforms. It includes
-    emulation of the Intel x86 CPU, common I/O devices, and a custom
-    BIOS.
+      Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written
+      in C++, that runs on most popular platforms. It includes emulation of the
+      Intel x86 CPU, common I/O devices, and a custom BIOS.
     '';
     homepage = http://bochs.sourceforge.net/;
     license = licenses.lgpl2Plus;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
-
-# TODO: study config.bochs.* implementation (like config.ffmpeg.* options)
-# TODO: investigate the wxWidgets problem (maybe upstream devteam didn't update wxGTK GUI)
-# TODO: investigate svga support - the Bochs sources explicitly cite /usr/include/svga.h
+# TODO: plugins
+# TODO: svga support - the Bochs sources explicitly cite /usr/include/vga.h
+# TODO: a better way to organize the options

From d30fc3be985ceb78c39669907ffa1bce6bff7728 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 15 Jul 2017 12:13:14 +0000
Subject: [PATCH 0552/3246] ocamlPackages.sedlex: 1.99.3 -> 1.99.4

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

diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index 6fcdb5ec6fa..1e3cb02b913 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools }:
+{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned }:
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.02";
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "sedlex is not available for OCaml ${ocaml.version}"
+else
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-sedlex-${version}";
-  version = "1.99.3";
+  version = "1.99.4";
 
   src = fetchzip {
     url = "http://github.com/alainfrisch/sedlex/archive/v${version}.tar.gz";
-    sha256 = "1wghjy3qyj43ll1ikchlqy7fv2hxcn3ap9xgsscm2ch09d8dcv7y";
+    sha256 = "1b7nqxyfcz8i7m4b8zil2rn6ygh2czy26f9v64xnxn8r0hy9sh1m";
   };
 
-  buildInputs = [ ocaml findlib ppx_tools ];
+  buildInputs = [ ocaml findlib ppx_tools_versioned ];
 
   propagatedBuildInputs = [ gen ];
 

From 78fc7269be11dbe85921a5d40ff9d526cdf7ea6e Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 15 Jul 2017 15:09:53 +0200
Subject: [PATCH 0553/3246] paperwork: 1.0.6.1 -> 1.2

---
 pkgs/applications/office/paperwork/default.nix | 10 +++++-----
 pkgs/top-level/python-packages.nix             | 15 +++++----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index c2481241818..e24d96257b2 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -1,19 +1,19 @@
 { lib, python3Packages, fetchFromGitHub, gtk3, cairo
 , aspellDicts, buildEnv
 , gnome3, hicolor_icon_theme
-, xvfb_run, dbus
+, xvfb_run, dbus, libnotify
 }:
 
 python3Packages.buildPythonApplication rec {
   name = "paperwork-${version}";
   # Don't forget to also update paperwork-backend when updating this!
-  version = "1.0.6.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     repo = "paperwork";
     owner = "jflesch";
     rev = version;
-    sha256 = "1v1lxyi4crdik4jlwjds9n6lzw4m4l4f9n5azlinv8wb477qpv6h";
+    sha256 = "1cb9wnhhpm3dyxjrkyl9bbva56xx85vlwlb7z07m1icflcln14x5";
   };
 
   # Patch out a few paths that assume that we're using the FHS:
@@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec {
   }}/lib/aspell";
 
   checkInputs = [ xvfb_run dbus.daemon ];
-  buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme ];
+  buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme libnotify ];
 
   # A few parts of chkdeps need to have a display and a dbus session, so we not
   # only need to run a virtual X server + dbus but also have a large enough
@@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = with python3Packages; [
-    paperwork-backend pypillowfight gtk3 cairo
+    paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil
   ];
 
   makeWrapperArgs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 429c16d2cdb..b38f58b7c7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8192,30 +8192,25 @@ in {
 
   paperwork-backend = buildPythonPackage rec {
     name = "paperwork-backend-${version}";
-    version = "1.0.6";
+    version = "1.2.0";
 
     src = pkgs.fetchFromGitHub {
       owner = "jflesch";
       repo = "paperwork-backend";
       rev = version;
-      sha256 = "11jbhv9xcpimp9iq2b1hlpljzij73s86rb5lpgzhslqc7zmm5bxn";
+      sha256 = "1pzyy14f9wzh9vwn855k1z48a8mbs73j1dk8730kdlcdkmn3l1ms";
     };
 
     # Python 2.x is not supported.
     disabled = !isPy3k && !isPyPy;
 
-    # Make sure that chkdeps exits with status 1 if a dependency is not found.
-    postPatch = ''
-      sed -i -e '/print.*Missing dependencies/,/^ *$/ {
-        /^ *$/ a \    sys.exit(1)
-      }' scripts/paperwork-shell
-    '';
-
     preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend";
 
     propagatedBuildInputs = with self; [
       pyenchant simplebayes pillow pycountry whoosh termcolor
-      python-Levenshtein pyinsane2 pygobject3 pyocr pkgs.poppler_gi
+      python-Levenshtein pyinsane2 pygobject3 pyocr
+      pkgs.poppler_gi pkgs.gtk3
+      natsort
     ];
 
     meta = {

From 39ef4d2fe9ac549af31b24dab75ac08fab255f5c Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sat, 15 Jul 2017 14:54:42 +0100
Subject: [PATCH 0554/3246] nixos tests: fix postgresql tests

1. Needs to call makeTest or else nothing happens when you run
   `nix-build nixos/tests/postgresql.nix`.

2. Tests run as root, so there needs to be a corresponding user in
   PostgreSQL.
---
 nixos/tests/postgresql.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 1f4f43a2666..b5f4e1a4c14 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -14,7 +14,7 @@ let
     INSERT INTO sth (id) VALUES (1);
     INSERT INTO sth (id) VALUES (1);
   '';
-  make-postgresql-test = postgresql-name: postgresql-package: {
+  make-postgresql-test = postgresql-name: postgresql-package: makeTest {
     name = postgresql-name;
     meta = with pkgs.stdenv.lib.maintainers; {
       maintainers = [ zagy ];
@@ -24,6 +24,9 @@ let
       {
         services.postgresql.package=postgresql-package;
         services.postgresql.enable = true;
+        services.postgresql.initialScript = pkgs.writeText "init.sql" ''
+          CREATE USER root WITH SUPERUSER;
+        '';
       };
 
     testScript = ''

From 502a272ee78727712c53d316cacba1b416e37d5e Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sat, 15 Jul 2017 14:58:17 +0100
Subject: [PATCH 0555/3246] postgresql: enable XML functions

I suspect these functions aren't widely used, but they are enabled in
PostgreSQL on Ubuntu and Arch.
---
 nixos/tests/postgresql.nix              | 3 +++
 pkgs/servers/sql/postgresql/default.nix | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index b5f4e1a4c14..54e7ec9ba17 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -13,6 +13,8 @@ let
     INSERT INTO sth (id) VALUES (1);
     INSERT INTO sth (id) VALUES (1);
     INSERT INTO sth (id) VALUES (1);
+    CREATE TABLE xmltest ( doc xml );
+    INSERT INTO xmltest (doc) VALUES ('<test>ok</test>'); -- check if libxml2 enabled
   '';
   make-postgresql-test = postgresql-name: postgresql-package: makeTest {
     name = postgresql-name;
@@ -41,6 +43,7 @@ let
       $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 3');
       $machine->succeed('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 5');
       $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 4');
+      $machine->succeed('test $(psql postgres -tAc "SELECT xpath(\'/test/text()\', doc) FROM xmltest;"|wc -l) -eq 1');
       $machine->shutdown;
     '';
 
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 2362ee84329..363fbe51adf 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, makeWrapper }:
+{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper }:
 
 let
 
@@ -15,7 +15,7 @@ let
     setOutputFlags = false; # $out retains configureFlags :-/
 
     buildInputs =
-      [ zlib readline openssl makeWrapper ]
+      [ zlib readline openssl libxml2 makeWrapper ]
       ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
 
     enableParallelBuilding = true;
@@ -24,6 +24,7 @@ let
 
     configureFlags = [
       "--with-openssl"
+      "--with-libxml"
       "--sysconfdir=/etc"
       "--libdir=$(lib)/lib"
     ]

From b3729eb3f228dbaa76477a84c0bbe861cb8aa3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 7 Jul 2017 11:50:42 +0200
Subject: [PATCH 0556/3246] libuv: 1.12.0 -> 1.13.1

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

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 97672436641..1bc58260afe 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,14 +2,14 @@
 , ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.12.0";
+  version = "1.13.1";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "0m025i0sfm4iv3aiic88x4y4bbhhdb204pmd9r383fsl458fck2p";
+    sha256 = "0k348kgdphha1w4cw78zngq3gqcrhcn0az7k0k4w2bgmdf4ip8z8";
   };
 
   postPatch = let

From 9906e4492e3cf29ebd389c3015a9f3402ae584eb Mon Sep 17 00:00:00 2001
From: Stefan Lau <github@stefanlau.com>
Date: Sat, 15 Jul 2017 14:54:18 +0200
Subject: [PATCH 0557/3246] dunst: 1.1.0 -> 1.2.0

---
 pkgs/applications/misc/dunst/default.nix | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 221bd3c4bf5..919ad10fa70 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,32 +1,25 @@
 { stdenv, fetchFromGitHub, fetchpatch
-, pkgconfig, which, perl
-, cairo, dbus, freetype, gdk_pixbuf, glib, libX11, libXScrnSaver
-, libXext, libXinerama, libnotify, libxdg_basedir, pango, xproto
-, librsvg
+, pkgconfig, which, perl, gtk2, xrandr
+, cairo, dbus, gdk_pixbuf, glib, libX11, libXScrnSaver
+, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg
 }:
 
 stdenv.mkDerivation rec {
   name = "dunst-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
-    owner = "knopwob";
+    owner = "dunst-project";
     repo = "dunst";
     rev = "v${version}";
-    sha256 = "102s0rkcdz22hnacsi3dhm7kj3lsw9gnikmh3a7wk862nkvvwjmk";
+    sha256 = "0jncnb4z4hg92ws08bkf52jswsd4vqlzyznwbynhh2jh6q0sl18b";
   };
 
-  patches = [(fetchpatch {
-    name = "add-svg-support.patch";
-    url = "https://github.com/knopwob/dunst/commit/63b11141185d1d07a6d12212257a543e182d250a.patch";
-    sha256 = "0giiaj5zjim7xqcav5ij5gn4x6nnchkllwcx0ln16j0p3vbi4y4x";
-  })];
-
   nativeBuildInputs = [ perl pkgconfig which ];
 
   buildInputs = [
-    cairo dbus freetype gdk_pixbuf glib libX11 libXScrnSaver libXext
-    libXinerama libnotify libxdg_basedir pango xproto librsvg
+    cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
+    libXinerama libnotify libxdg_basedir pango xproto librsvg gtk2 xrandr
   ];
 
   outputs = [ "out" "man" ];

From 81736497a4dcf9f79591a12685f616e56f4a086c Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sat, 15 Jul 2017 08:18:19 +0200
Subject: [PATCH 0558/3246] neomutt: 20170609 -> 20170714

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

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 3473d321c75..7de359bae5a 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -2,14 +2,14 @@
 , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  version = "20170609";
+  version = "20170714";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "015dd6rphvqdmnv477f1is22l7n5gvcvyblbyp0ggbp64650k0bz";
+    sha256 = "0jbh83hvq1jwb8ps7ffl2325y6i79wdnwcn6db0r5prmxax18hw1";
   };
 
   nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ];

From eff03340c42292b01054333708c2a0b85a58730d Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 14 Jul 2017 17:20:16 +0700
Subject: [PATCH 0559/3246] python.pkgs.django_tagging: move to separate
 expression

---
 .../python-modules/django_tagging/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +---------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/django_tagging/default.nix

diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix
new file mode 100644
index 00000000000..6207408e012
--- /dev/null
+++ b/pkgs/development/python-modules/django_tagging/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, django }:
+
+buildPythonPackage rec {
+  pname = "django-tagging";
+  version = "0.4.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  propagatedBuildInputs = [ django ];
+
+  meta = {
+    description = "A generic tagging application for Django projects";
+    homepage = https://github.com/Fantomas42/django-tagging;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b38f58b7c7a..6e10fb37331 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9933,24 +9933,7 @@ in {
 
   django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
 
-  django_tagging = buildPythonPackage rec {
-    name = "django-tagging-0.4.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-tagging/${name}.tar.gz";
-      sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ django ];
-
-    meta = {
-      description = "A generic tagging application for Django projects";
-      homepage = https://github.com/Fantomas42/django-tagging;
-    };
-  };
+  django_tagging = callPackage ../development/python-modules/django_tagging { };
 
   django_tagging_0_3 = self.django_tagging.override (attrs: rec {
     name = "django-tagging-0.3.6";

From bcb73a13e36095e65b3461a07a09ee065886dc98 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 14 Jul 2017 18:08:02 +0700
Subject: [PATCH 0560/3246] python-packages.django_tagging_0_3: use
 overrideAttrs

---
 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 6e10fb37331..bd3b910779d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9935,7 +9935,7 @@ in {
 
   django_tagging = callPackage ../development/python-modules/django_tagging { };
 
-  django_tagging_0_3 = self.django_tagging.override (attrs: rec {
+  django_tagging_0_3 = self.django_tagging.overrideAttrs (attrs: rec {
     name = "django-tagging-0.3.6";
 
     src = pkgs.fetchurl {

From 2d546a98e2d70e7a7836b038102f48f55f674b98 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 14 Jul 2017 18:59:48 +0700
Subject: [PATCH 0561/3246] python.pkgs.acoustics: move to separate expression

---
 .../python-modules/acoustics/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +----------------
 2 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/acoustics/default.nix

diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix
new file mode 100644
index 00000000000..d1cb1180358
--- /dev/null
+++ b/pkgs/development/python-modules/acoustics/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, cython, pytest, numpy, scipy, matplotlib, pandas, tabulate }:
+
+buildPythonPackage rec {
+  pname = "acoustics";
+  version = "0.1.2";
+  name = "${pname}-${version}";
+
+  buildInputs = [ cython pytest ];
+  propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b75a47de700d01e704de95953a6e969922b2f510d7eefe59f7f8980ad44ad1b7";
+  };
+
+  # Tests not distributed
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A package for acousticians";
+    maintainer = with maintainers; [ fridh ];
+    license = with licenses; [ bsd3 ];
+    homepage = https://github.com/python-acoustics/python-acoustics;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd3b910779d..b426fdaefc9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -84,29 +84,7 @@ in {
 
   vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; };
 
-  acoustics = buildPythonPackage rec {
-    pname = "acoustics";
-    version = "0.1.2";
-    name = pname + "-" + version;
-
-    buildInputs = with self; [ cython pytest ];
-    propagatedBuildInputs = with self; [ numpy scipy matplotlib pandas tabulate ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-      sha256 = "b75a47de700d01e704de95953a6e969922b2f510d7eefe59f7f8980ad44ad1b7";
-    };
-
-    # Tests not distributed
-    doCheck = false;
-
-    meta = {
-      description = "A package for acousticians";
-      maintainer = with maintainers; [ fridh ];
-      license = with licenses; [ bsd3 ];
-      homepage = https://github.com/python-acoustics/python-acoustics;
-    };
-  };
+  acoustics = callPackage ../development/python-modules/acoustics { };
 
   "3to2" = callPackage ../development/python-modules/3to2 { };
 

From 85239d1455c0a19b083a4ec9245a5acda4eb5d44 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 14 Jul 2017 19:34:28 +0700
Subject: [PATCH 0562/3246] python.pkgs.ansicolor: move to separate expression

---
 .../python-modules/ansicolor/default.nix      | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +----------------
 2 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/ansicolor/default.nix

diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix
new file mode 100644
index 00000000000..3a45811ed9b
--- /dev/null
+++ b/pkgs/development/python-modules/ansicolor/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "ansicolor";
+  version = "0.2.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/numerodix/ansicolor/";
+    description = "A library to produce ansi color output and colored highlighting and diffing";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ andsild ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b426fdaefc9..e5060cac853 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -100,22 +100,7 @@ in {
 
   agate-sql = callPackage ../development/python-modules/agate-sql { };
 
-  ansicolor = buildPythonPackage rec {
-    name = "ansicolor-${version}";
-    version = "0.2.4";
-
-    src = pkgs.fetchurl{
-      url = "mirror://pypi/a/ansicolor/${name}.tar.gz";
-      sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h";
-    };
-
-    meta = {
-      homepage = "https://github.com/numerodix/ansicolor/";
-      description = "A library to produce ansi color output and colored highlighting and diffing";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ andsild ];
-    };
-  };
+  ansicolor = callPackage ../development/python-modules/ansicolor { };
 
   asn1crypto = callPackage ../development/python-modules/asn1crypto { };
 

From 501eb9712ef5f8f6d59e417ad2607798c1e31863 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 14 Jul 2017 19:57:40 +0700
Subject: [PATCH 0563/3246] python.pkgs.emcee: move to separate expression

---
 .../python-modules/emcee/default.nix          | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 14 +------------
 2 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/emcee/default.nix

diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix
new file mode 100644
index 00000000000..3e95859fc0f
--- /dev/null
+++ b/pkgs/development/python-modules/emcee/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, numpy }:
+
+buildPythonPackage rec {
+  pname = "emcee";
+  version = "2.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qyafp9jfya0mkxgqfvljf0rkic5fm8nimzwadyrxyvq7nd07qaw";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  meta = with stdenv.lib; {
+    description = "Kick ass affine-invariant ensemble MCMC sampling";
+    homepage = http://dan.iel.fm/emcee;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e5060cac853..63206861058 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -130,19 +130,7 @@ in {
 
   dkimpy = callPackage ../development/python-modules/dkimpy { };
 
-  emcee = buildPythonPackage {
-    name = "emcee-2.1.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/emcee/emcee-2.1.0.tar.gz";
-      sha256 = "0qyafp9jfya0mkxgqfvljf0rkic5fm8nimzwadyrxyvq7nd07qaw";
-    };
-    propagatedBuildInputs = [ self.numpy ];
-    meta = {
-      homepage = http://dan.iel.fm/emcee;
-      license = "MIT";
-      description = "Kick ass affine-invariant ensemble MCMC sampling";
-    };
-  };
+  emcee = callPackage ../development/python-modules/emcee { };
 
   dbus-python = callPackage ../development/python-modules/dbus {
     dbus = pkgs.dbus;

From 6506c41fd9d6b02d6378cf9c8b88109823802ef5 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 14 Jul 2017 20:37:35 +0700
Subject: [PATCH 0564/3246] python.pkgs.discid: move to separate expression

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

diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix
new file mode 100644
index 00000000000..167efe91425
--- /dev/null
+++ b/pkgs/development/python-modules/discid/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, libdiscid, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "discid";
+  version = "1.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b39d443051b26d0230be7a6c616243daae93337a8711dd5d4119bb6a0e516fa8";
+  };
+
+  patchPhase = ''
+    substituteInPlace discid/libdiscid.py \
+      --replace '_open_library(_LIB_NAME)' "_open_library('${libdiscid}/lib/libdiscid.so.0')"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python binding of libdiscid";
+    homepage    = "https://python-discid.readthedocs.org/";
+    license     = licenses.lgpl3Plus;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63206861058..62d8c185974 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -136,26 +136,7 @@ in {
     dbus = pkgs.dbus;
   };
 
-  discid = buildPythonPackage rec {
-    name = "discid-1.1.0";
-
-    meta = {
-      description = "Python binding of libdiscid";
-      homepage    = "https://python-discid.readthedocs.org/";
-      license     = licenses.lgpl3Plus;
-      platforms   = platforms.linux;
-    };
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/discid/${name}.tar.gz";
-      sha256 = "b39d443051b26d0230be7a6c616243daae93337a8711dd5d4119bb6a0e516fa8";
-    };
-
-    patchPhase = ''
-      substituteInPlace discid/libdiscid.py \
-        --replace '_open_library(_LIB_NAME)' "_open_library('${pkgs.libdiscid}/lib/libdiscid.so.0')"
-    '';
-  };
+  discid = callPackage ../development/python-modules/discid { };
 
   discordpy = callPackage ../development/python-modules/discordpy { };
 

From 3e75b0fd129bb1fda3736fc6950181097534f34b Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 14 Jul 2017 21:30:45 +0700
Subject: [PATCH 0565/3246] python.pkgs.pygame_sdl2: move to separate
 expression

---
 .../python-modules/pygame_sdl2/default.nix    | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 32 ++----------------
 2 files changed, 35 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/python-modules/pygame_sdl2/default.nix

diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix
new file mode 100644
index 00000000000..6f6163bb35e
--- /dev/null
+++ b/pkgs/development/python-modules/pygame_sdl2/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub
+, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
+
+buildPythonPackage rec {
+  pname = "pygame_sdl2";
+  version = "6.99.10.1227";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "renpy";
+    repo = "${pname}";
+    rev = "renpy-${version}";
+    sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1";
+  };
+
+  buildInputs = [
+    SDL2 SDL2_image SDL2_ttf SDL2_mixer
+    cython libjpeg libpng
+  ];
+
+  postInstall = ''
+    ( cd "$out"/include/python*/ ;
+      ln -s pygame-sdl2 pygame_sdl2 || true ; )
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A reimplementation of parts of pygame API using SDL2";
+    homepage    = "https://github.com/renpy/pygame_sdl2";
+    # Some parts are also available under Zlib License
+    license     = licenses.lgpl2;
+    maintainers = with maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62d8c185974..dcaf8e5819a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -196,38 +196,10 @@ in {
 
   pygame-git = callPackage ../development/python-modules/pygame/git.nix { };
 
-  pygame_sdl2 = buildPythonPackage rec {
-    pname = "pygame_sdl2";
-    version = "6.99.10.1227";
-    name = "${pname}-${version}";
-
-    meta = {
-      description = "A reimplementation of parts of pygame API using SDL2";
-      homepage    = "https://github.com/renpy/pygame_sdl2";
-      # Some parts are also available under Zlib License
-      license     = licenses.lgpl2;
-      maintainers = with maintainers; [ raskin ];
-    };
-
-    propagatedBuildInputs = with self; [ ];
-    buildInputs = with pkgs; with self; [
-      SDL2 SDL2_image SDL2_ttf SDL2_mixer
-      cython libjpeg libpng ];
-
-    postInstall = ''
-      ( cd "$out"/include/python*/ ;
-        ln -s pygame-sdl2 pygame_sdl2 || true ; )
-    '';
-
-    src = pkgs.fetchFromGitHub {
-      owner = "renpy";
-      repo = "${pname}";
-      rev = "renpy-${version}";
-      sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1";
-    };
-  };
+  pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };
 
   pygobject2 = callPackage ../development/python-modules/pygobject { };
+
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };
 
   pygtk = callPackage ../development/python-modules/pygtk { libglade = null; };

From eed3b4991b764247f38a4917b2d5954606d6c525 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 12:32:41 +0700
Subject: [PATCH 0566/3246] python.pkgs.unifi: move to separate expression

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

diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix
new file mode 100644
index 00000000000..89496e00e56
--- /dev/null
+++ b/pkgs/development/python-modules/unifi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage
+, fetchPypi, urllib3 }:
+
+buildPythonPackage rec {
+  pname = "unifi";
+  version = "1.2.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0prgx01hzs49prrazgxrinm7ivqzy57ch06qm2h7s1p957sazds8";
+  };
+
+  propagatedBuildInputs = [ urllib3 ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "An API towards the Ubiquity Networks UniFi controller";
+    homepage    = https://pypi.python.org/pypi/unifi/;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dcaf8e5819a..298c7d9eec6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -256,26 +256,7 @@ in {
     hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
   };
 
-  unifi = buildPythonPackage rec {
-    name = "unifi-1.2.5";
-
-    propagatedBuildInputs = with self; [ urllib3 ];
-
-    # upstream has no tests
-    doCheck = false;
-
-    meta = {
-      description = "An API towards the Ubiquity Networks UniFi controller";
-      homepage    = https://pypi.python.org/pypi/unifi/;
-      license     = licenses.mit;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/u/unifi/${name}.tar.gz";
-      sha256 = "0prgx01hzs49prrazgxrinm7ivqzy57ch06qm2h7s1p957sazds8";
-    };
-  };
+  unifi = callPackage ../development/python-modules/unifi { };
 
   pyunbound = callPackage ../tools/networking/unbound/python.nix { };
 

From f6b103b51edccf320f8f3e4f95cd499a334c2975 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 12:43:13 +0700
Subject: [PATCH 0567/3246] python.pkgs.aafigure: move to separate expression

---
 .../python-modules/aafigure/default.nix       | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 29 +----------------
 2 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/aafigure/default.nix

diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix
new file mode 100644
index 00000000000..1084eca762b
--- /dev/null
+++ b/pkgs/development/python-modules/aafigure/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchPypi, pillow }:
+
+buildPythonPackage rec {
+  pname = "aafigure";
+  version = "0.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091";
+  };
+
+  propagatedBuildInputs = [ pillow ];
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  # Fix impurity. TODO: Do the font lookup using fontconfig instead of this
+  # manual method. Until that is fixed, we get this whenever we run aafigure:
+  #   WARNING: font not found, using PIL default font
+  patchPhase = ''
+    sed -i "s|/usr/share/fonts|/nonexisting-fonts-path|" aafigure/PILhelper.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "ASCII art to image converter";
+    homepage = https://launchpad.net/aafigure/;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ bjornfor ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 298c7d9eec6..dadbf0db86d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -262,34 +262,7 @@ in {
 
   # packages defined here
 
-  aafigure = buildPythonPackage rec {
-    name = "aafigure-0.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/aafigure/${name}.tar.gz";
-      sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091";
-    };
-
-    propagatedBuildInputs = with self; [ pillow ];
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    # Fix impurity. TODO: Do the font lookup using fontconfig instead of this
-    # manual method. Until that is fixed, we get this whenever we run aafigure:
-    #   WARNING: font not found, using PIL default font
-    patchPhase = ''
-      sed -i "s|/usr/share/fonts|/nonexisting-fonts-path|" aafigure/PILhelper.py
-    '';
-
-    meta = {
-      description = "ASCII art to image converter";
-      homepage = https://launchpad.net/aafigure/;
-      license = licenses.bsd2;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  aafigure = callPackage ../development/python-modules/aafigure { };
 
   altair = buildPythonPackage rec {
     name = "altair-1.2.0";

From 2ce14a8ce9feeb257c87b40df39ab50cceb69560 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 12:58:25 +0700
Subject: [PATCH 0568/3246] python.pkgs.altair: move to separate expression

---
 .../python-modules/altair/default.nix         | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +-------------
 2 files changed, 31 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/altair/default.nix

diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
new file mode 100644
index 00000000000..a0504de4fb8
--- /dev/null
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pytest, vega, pandas, ipython, traitlets }:
+
+buildPythonPackage rec {
+  pname = "altair";
+  version = "1.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n";
+  };
+
+  buildInputs = [ pytest ];
+
+  checkPhase = ''
+    export LANG=en_US.UTF-8
+    py.test altair --doctest-modules
+  '';
+
+  propagatedBuildInputs = [ vega pandas ipython traitlets ];
+
+  meta = with stdenv.lib; {
+    description = "A declarative statistical visualization library for Python.";
+    homepage = https://github.com/altair-viz/altair;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ teh ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dadbf0db86d..ada5409509d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -264,28 +264,7 @@ in {
 
   aafigure = callPackage ../development/python-modules/aafigure { };
 
-  altair = buildPythonPackage rec {
-    name = "altair-1.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/altair/${name}.tar.gz";
-      sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n";
-    };
-    buildInputs = [ self.pytest ];
-
-    checkPhase = ''
-      export LANG=en_US.UTF-8
-      py.test altair --doctest-modules
-    '';
-    propagatedBuildInputs = with self; [ vega pandas ipython traitlets ];
-    meta = {
-      description = "A declarative statistical visualization library for Python.";
-      homepage = https://github.com/altair-viz/altair;
-      license = licenses.bsd3;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ teh ];
-    };
-  };
+  altair = callPackage ../development/python-modules/altair { };
   vega = buildPythonPackage rec {
     name = "vega-0.4.4";
 

From ee1022bf2654c0d2c60689ab9bb409ff9d07e937 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 13:05:39 +0700
Subject: [PATCH 0569/3246] python.pkgs.vega: move to separate expression

---
 .../python-modules/vega/default.nix           | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +---------------
 2 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/vega/default.nix

diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
new file mode 100644
index 00000000000..efdce1e6dba
--- /dev/null
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage , fetchPypi
+, pytest, jupyter_core, pandas }:
+
+buildPythonPackage rec {
+  pname = "vega";
+  version = "0.4.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm";
+  };
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ jupyter_core pandas ];
+
+  meta = with stdenv.lib; {
+    description = "An IPython/Jupyter widget for Vega and Vega-Lite";
+    longDescription = ''
+      To use this you have to enter a nix-shell with vega. Then run:
+
+      jupyter nbextension install --user --py vega
+      jupyter nbextension enable --user vega
+    '';
+    homepage = https://github.com/vega/ipyvega;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ teh ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ada5409509d..1a22caf25f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -265,31 +265,8 @@ in {
   aafigure = callPackage ../development/python-modules/aafigure { };
 
   altair = callPackage ../development/python-modules/altair { };
-  vega = buildPythonPackage rec {
-    name = "vega-0.4.4";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/v/vega/${name}.tar.gz";
-      sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm";
-    };
-
-    buildInputs = [ self.pytest ];
-    propagatedBuildInputs = with self; [ jupyter_core pandas ];
-
-    meta = {
-      description = " An IPython/Jupyter widget for Vega and Vega-Lite.";
-      longDescription = ''
-        To use this you have to enter a nix-shell with vega. Then run:
-
-        jupyter nbextension install --user --py vega
-        jupyter nbextension enable --user vega
-      '';
-      homepage = https://github.com/vega/ipyvega;
-      license = licenses.bsd3;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ teh ];
-    };
-  };
+  vega = callPackage ../development/python-modules/vega { };
 
   acme = buildPythonPackage rec {
     inherit (pkgs.certbot) src version;

From d437a722af873eb037e5ae0ad2e4d06210271601 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 13:18:20 +0700
Subject: [PATCH 0570/3246] python.pkgs.acme: move to separate expression

---
 .../python-modules/acme/default.nix           | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 14 +-------------
 2 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/acme/default.nix

diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix
new file mode 100644
index 00000000000..71357e5bef2
--- /dev/null
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, certbot, nose, cryptography, pyasn1, pyopenssl, pyRFC3339
+, pytz, requests, six, werkzeug, mock, ndg-httpsclient }:
+
+buildPythonPackage rec {
+  inherit (certbot) src version;
+
+  pname = "acme";
+  name = "${pname}-${version}";
+
+  propagatedBuildInputs = [
+    cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock
+    ndg-httpsclient
+  ];
+
+  buildInputs = [ nose ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/acme";
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a22caf25f4..ef410649380 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -268,19 +268,7 @@ in {
 
   vega = callPackage ../development/python-modules/vega { };
 
-  acme = buildPythonPackage rec {
-    inherit (pkgs.certbot) src version;
-
-    name = "acme-${version}";
-
-    propagatedBuildInputs = with self; [
-      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock
-      ndg-httpsclient
-    ];
-
-    buildInputs = with self; [ nose ];
-    postUnpack = "sourceRoot=\${sourceRoot}/acme";
-  };
+  acme = callPackage ../development/python-modules/acme { };
 
   acme-tiny = buildPythonPackage rec {
     name = "acme-tiny-${version}";

From 2857dbd497f56d7383129a2ee68b142e32c2349d Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 13:41:02 +0700
Subject: [PATCH 0571/3246] python.pkgs.zeroconf: move to separate expression

---
 .../python-modules/zeroconf/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +----------------
 2 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/zeroconf/default.nix

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
new file mode 100644
index 00000000000..487f657680c
--- /dev/null
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, netifaces, six, enum-compat }:
+
+buildPythonPackage rec {
+  pname = "zeroconf";
+  version = "0.18.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2";
+  };
+
+  propagatedBuildInputs = [ netifaces six enum-compat ];
+
+  meta = with stdenv.lib; {
+    description = "A pure python implementation of multicast DNS service discovery";
+    homepage = "https://github.com/jstasiak/python-zeroconf";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef410649380..16e9dfb4752 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30073,25 +30073,7 @@ EOF
   zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else
     (pkgs.zeitgeist.override{python2Packages=self;}).py;
 
-  zeroconf = buildPythonPackage rec {
-    pname = "zeroconf";
-    version = "0.18.0";
-    name = "${pname}-${version}";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2";
-    };
-
-    propagatedBuildInputs = with self; [ netifaces six enum-compat ];
-
-    meta = {
-      description = "A pure python implementation of multicast DNS service discovery";
-      homepage = "https://github.com/jstasiak/python-zeroconf";
-      license = licenses.lgpl21;
-      maintainers = with maintainers; [ abbradar ];
-    };
-  };
+  zeroconf = callPackage ../development/python-modules/zeroconf { };
 
   zipfile36 = buildPythonPackage rec {
     pname = "zipfile36";

From 4546623b37363475695999551f57961477e53009 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 13:50:30 +0700
Subject: [PATCH 0572/3246] python.pkgs.vine: move to separate expression

---
 .../python-modules/vine/default.nix           | 23 +++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +++----------------
 2 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/vine/default.nix

diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix
new file mode 100644
index 00000000000..85b17f5119c
--- /dev/null
+++ b/pkgs/development/python-modules/vine/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, case, pytest, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "vine";
+  version = "1.1.3";
+  name = "${pname}-${version}";
+
+  disable = pythonOlder "2.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7";
+  };
+
+  buildInputs = [ case pytest ];
+
+  meta = with stdenv.lib; {
+    description = "Python promises";
+    homepage = https://github.com/celery/vine;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 16e9dfb4752..4d50d997fdb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30030,25 +30030,7 @@ EOF
 
   uranium = callPackage ../development/python-modules/uranium { };
 
-  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 ];
-
-    meta = {
-      homepage = https://github.com/celery/vine;
-      description = "python promises";
-      license = licenses.bsd3;
-    };
-  };
+  vine = callPackage ../development/python-modules/vine { };
 
   wp_export_parser = buildPythonPackage rec {
     name = "${pname}-${version}";
@@ -30062,13 +30044,11 @@ EOF
     };
   };
 
-  wptserve = callPackage ../development/python-modules/wptserve {};
+  wptserve = callPackage ../development/python-modules/wptserve { };
 
-  yenc = callPackage ../development/python-modules/yenc {
-  };
+  yenc = callPackage ../development/python-modules/yenc { };
 
-  zeep = callPackage ../development/python-modules/zeep {
-  };
+  zeep = callPackage ../development/python-modules/zeep { };
 
   zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else
     (pkgs.zeitgeist.override{python2Packages=self;}).py;

From 33bcafcf5b7192bffc751191ece6a9d11684987e Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 14:00:15 +0700
Subject: [PATCH 0573/3246] python.pkgs.stripe: move to separate expression

---
 .../python-modules/stripe/default.nix         | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +----------------
 2 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/stripe/default.nix

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
new file mode 100644
index 00000000000..5a1e114fb25
--- /dev/null
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, unittest2, mock, requests }:
+
+buildPythonPackage rec {
+  pname = "stripe";
+  version = "1.41.1";
+  name = "${pname}-${version}";
+
+  # Tests require network connectivity and there's no easy way to disable
+  # them. ~ C.
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5";
+  };
+
+  buildInputs = [ unittest2 mock ];
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = with stdenv.lib; {
+    description = "Stripe Python bindings";
+    homepage = "https://github.com/stripe/stripe-python";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d50d997fdb..276885afc43 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30004,29 +30004,7 @@ EOF
 
   typed-ast = callPackage ../development/python-modules/typed-ast { };
 
-  stripe = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "stripe";
-    version = "1.41.1";
-
-    # Tests require network connectivity and there's no easy way to disable
-    # them. ~ C.
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/${pname}/${name}.tar.gz";
-      sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5";
-    };
-
-    buildInputs = with self; [ unittest2 mock ];
-    propagatedBuildInputs = with self; [ requests ];
-
-    meta = {
-      homepage = "https://github.com/stripe/stripe-python";
-      description = "Stripe Python bindings";
-      license = licenses.mit;
-    };
-  };
+  stripe = callPackage ../development/python-modules/stripe { };
 
   uranium = callPackage ../development/python-modules/uranium { };
 

From 911655fe5fb5709087b5cda8721dc3678b4a2a93 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 14:07:43 +0700
Subject: [PATCH 0574/3246] python.pkgs.yamllint: move to separate expression

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

diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
new file mode 100644
index 00000000000..6fbd6886b1a
--- /dev/null
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, nose, pyyaml }:
+
+buildPythonPackage rec {
+  pname = "yamllint";
+  version = "0.5.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84";
+  };
+
+  buildInputs = [ nose ];
+
+  propagatedBuildInputs = [  pyyaml ];
+
+  meta = with stdenv.lib; {
+    description = "A linter for YAML files";
+    homepage = "https://github.com/adrienverge/yamllint";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ mikefaille ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 276885afc43..f6a71581b8a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29956,26 +29956,7 @@ EOF
     };
   };
 
-  yamllint = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "yamllint";
-    version = "0.5.2";
-
-    src = pkgs.fetchurl{
-      url = "mirror://pypi/y/${pname}/${name}.tar.gz";
-      sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [  pyyaml ];
-
-    meta = {
-      homepage = "https://github.com/adrienverge/yamllint";
-      description = "A linter for YAML files";
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ mikefaille ];
-    };
-  };
+  yamllint = callPackage ../development/python-modules/yamllint { };
 
   yarl = callPackage ../development/python-modules/yarl { };
 

From b493824162bcf9cbe490e1fad74fca5ce30d28d0 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 14:51:07 +0700
Subject: [PATCH 0575/3246] python.pkgs.pypandoc: move to separate expression

---
 .../python-modules/pypandoc/default.nix       | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +--------------
 2 files changed, 33 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/pypandoc/default.nix

diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
new file mode 100644
index 00000000000..8e06ba38ef9
--- /dev/null
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pip, pandoc, glibcLocales, haskellPackages, texlive }:
+
+buildPythonPackage rec {
+  pname = "pypandoc";
+  version = "1.3.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6";
+  };
+
+  # Fix tests: first requires network access, second is a bug (reported upstream)
+  preConfigure = ''
+    substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'"
+    substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'<h1 id=\"title\">title</h1>'"
+  '';
+
+  LC_ALL="en_US.UTF-8";
+
+  propagatedBuildInputs = [ pip ];
+
+  buildInputs = [ pandoc texlive.combined.scheme-small haskellPackages.pandoc-citeproc glibcLocales ];
+
+  meta = with stdenv.lib; {
+    description = "Thin wrapper for pandoc";
+    homepage = "https://github.com/bebraw/pypandoc";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bennofs kristoff3r ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f6a71581b8a..f74d9baae8c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29930,31 +29930,7 @@ EOF
     };
   };
 
-  pypandoc = buildPythonPackage rec {
-    name = "pypandoc-1.3.3";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pypandoc/${name}.tar.gz";
-      sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6";
-    };
-
-    # Fix tests: first requires network access, second is a bug (reported upstream)
-    preConfigure = ''
-      substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'"
-      substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'<h1 id=\"title\">title</h1>'"
-    '';
-
-    LC_ALL="en_US.UTF-8";
-
-    propagatedBuildInputs = with self; [ self.pip ];
-    buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc pkgs.glibcLocales ];
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Thin wrapper for pandoc";
-      homepage = "https://github.com/bebraw/pypandoc";
-      license = licenses.mit;
-      maintainers = with maintainers; [ bennofs kristoff3r ];
-    };
-  };
+  pypandoc = callPackage ../development/python-modules/pypandoc { };
 
   yamllint = callPackage ../development/python-modules/yamllint { };
 

From 9115f68bdea5b6202fd0b4b7ffc3bf2abcfee859 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 15:19:17 +0700
Subject: [PATCH 0576/3246] python.pkgs.pytoml: move to separate expression

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

diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix
new file mode 100644
index 00000000000..55479e76daf
--- /dev/null
+++ b/pkgs/development/python-modules/pytoml/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchgit
+, python }:
+
+buildPythonPackage rec {
+  pname = "pytoml";
+  version = "0.1.11";
+  name = "${pname}-${version}";
+
+  checkPhase = "${python.interpreter} test/test.py";
+
+  # fetchgit used to ensure test submodule is available
+  src = fetchgit {
+    url = "${meta.homepage}.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A TOML parser/writer for Python";
+    homepage    = https://github.com/avakar/pytoml;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f74d9baae8c..ad1aa0eab45 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29909,26 +29909,7 @@ 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 ];
-    };
-  };
+  pytoml = callPackage ../development/python-modules/pytoml { };
 
   pypandoc = callPackage ../development/python-modules/pypandoc { };
 

From cca503b3891dab1cc2cf0dbd4a8095f87d1fcff9 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 15:33:16 +0700
Subject: [PATCH 0577/3246] python.pkgs.packaging: move to separate expression

---
 .../python-modules/packaging/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +------------
 2 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/packaging/default.nix

diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
new file mode 100644
index 00000000000..776ec7ffc4b
--- /dev/null
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pyparsing, six, pytest, pretend }:
+
+buildPythonPackage rec {
+  pname = "packaging";
+  version = "16.8";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e";
+  };
+
+  propagatedBuildInputs = [ pyparsing six ];
+
+  buildInputs = [ pytest pretend ];
+
+  meta = with stdenv.lib; {
+    description = "Core utilities for Python packages";
+    homepage = "https://github.com/pypa/packaging";
+    license = [ licenses.bsd2 licenses.asl20 ];
+    maintainers = with maintainers; [ bennofs ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad1aa0eab45..e1a295d56ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29892,22 +29892,7 @@ EOF
     };
   };
 
-  packaging = buildPythonPackage rec {
-    name = "packaging-16.8";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/packaging/${name}.tar.gz";
-      sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e";
-    };
-    propagatedBuildInputs = with self; [ pyparsing six ];
-    buildInputs = with self; [ pytest pretend ];
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Core utilities for Python packages";
-      homepage = "https://github.com/pypa/packaging";
-      license = [ licenses.bsd2 licenses.asl20 ];
-      maintainers = with maintainers; [ bennofs ];
-    };
-  };
+  packaging = callPackage ../development/python-modules/packaging { };
 
   pytoml = callPackage ../development/python-modules/pytoml { };
 

From f0ac8236968eb5a38a5f0cd21b014a8fe8715e56 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 16:19:34 +0700
Subject: [PATCH 0578/3246] python.pkgs.intervaltree: move to separate
 expression

---
 .../python-modules/intervaltree/default.nix   | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +-------------
 2 files changed, 34 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/intervaltree/default.nix

diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix
new file mode 100644
index 00000000000..69b35df2973
--- /dev/null
+++ b/pkgs/development/python-modules/intervaltree/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, python, pytest, sortedcontainers }:
+
+buildPythonPackage rec {
+  version = "2.1.0";
+  pname = "intervaltree";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02w191m9zxkcjqr1kv2slxvhymwhj3jnsyy3a28b837pi15q19dc";
+  };
+
+  buildInputs = [ pytest ];
+
+  propagatedBuildInputs = [ sortedcontainers ];
+
+  checkPhase = ''
+    runHook preCheck
+    # pytest will try to run tests for nix_run_setup.py / files in build/lib which fails
+    mv nix_run_setup.py run_setup
+    rm build -rf
+    ${python.interpreter} run_setup test
+    runHook postCheck
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Editable interval tree data structure for Python 2 and 3";
+    homepage =  https://github.com/chaimleib/intervaltree;
+    license = [ licenses.asl20 ];
+    maintainers =  [ maintainers.bennofs ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1a295d56ed..00fb06ae1da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29867,30 +29867,7 @@ EOF
     };
   };
 
-  intervaltree = buildPythonPackage rec {
-    name = "intervaltree-${version}";
-    version = "2.1.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/intervaltree/${name}.tar.gz";
-      sha256 = "02w191m9zxkcjqr1kv2slxvhymwhj3jnsyy3a28b837pi15q19dc";
-    };
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ sortedcontainers ];
-    checkPhase = ''
-      runHook preCheck
-      # pytest will try to run tests for nix_run_setup.py / files in build/lib which fails
-      mv nix_run_setup.py run_setup
-      rm build -rf
-      ${python.interpreter} run_setup test
-      runHook postCheck
-    '';
-    meta = with pkgs.stdenv.lib; {
-      description = "Editable interval tree data structure for Python 2 and 3";
-      homepage =  https://github.com/chaimleib/intervaltree;
-      license = [ licenses.asl20 ];
-      maintainers =  [ maintainers.bennofs ];
-    };
-  };
+  intervaltree = callPackage ../development/python-modules/intervaltree { };
 
   packaging = callPackage ../development/python-modules/packaging { };
 

From 552975879167ae5428e9828dfba38ed70440795e Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 16:48:27 +0700
Subject: [PATCH 0579/3246] python.pkgs.jsonref: move to separate expression

---
 .../python-modules/jsonref/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +----------------
 2 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/jsonref/default.nix

diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix
new file mode 100644
index 00000000000..ca9549b677b
--- /dev/null
+++ b/pkgs/development/python-modules/jsonref/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pytest, mock }:
+
+buildPythonPackage rec {
+  pname = "jsonref";
+  version = "0.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lqa8dy1sr1bxi00ri79lmbxvzxi84ki8p46zynyrgcqhwicxq2n";
+  };
+
+  buildInputs = [ pytest mock ];
+
+  checkPhase = ''
+    py.test tests.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An implementation of JSON Reference for Python";
+    homepage    = "http://github.com/gazpachoking/jsonref";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ nand0p ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00fb06ae1da..f8e7f4c3bf5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29771,29 +29771,7 @@ EOF
 
   autobahn = callPackage ../development/python-modules/autobahn { };
 
-  jsonref = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "jsonref";
-    version = "0.1";
-
-    meta = {
-      description = "An implementation of JSON Reference for Python.";
-      homepage    = "http://github.com/gazpachoking/jsonref";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ nand0p ];
-      platforms   = platforms.all;
-    };
-
-    buildInputs = with self; [ pytest mock ];
-    checkPhase = ''
-      py.test tests.py
-    '';
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/${pname}/${name}.tar.gz";
-      sha256 = "1lqa8dy1sr1bxi00ri79lmbxvzxi84ki8p46zynyrgcqhwicxq2n";
-    };
-  };
+  jsonref = callPackage ../development/python-modules/jsonref { };
 
   whoosh = callPackage ../development/python-modules/whoosh { };
 

From a5d75f0f18a0af23fe6b01fc971fe2db39db151d Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 15 Jul 2017 16:53:43 +0700
Subject: [PATCH 0580/3246] python.pkgs.yapf: move to separate expression

fixes #27379
---
 .../python-modules/yapf/default.nix           | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +---------------
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/yapf/default.nix

diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
new file mode 100644
index 00000000000..b7f9d713927
--- /dev/null
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "yapf";
+  version = "0.11.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A formatter for Python code.";
+    homepage    = "https://github.com/google/yapf";
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ siddharthist ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f8e7f4c3bf5..4b6d1bf82e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29752,22 +29752,7 @@ EOF
     };
   };
 
-  yapf = buildPythonPackage rec {
-    name = "yapf-${version}";
-    version = "0.11.0";
-
-    meta = {
-      description = "A formatter for Python code.";
-      homepage    = "https://github.com/google/yapf";
-      license     = licenses.asl20;
-      maintainers = with maintainers; [ siddharthist ];
-    };
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/y/yapf/${name}.tar.gz";
-      sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij";
-    };
-  };
+  yapf = callPackage ../development/python-modules/yapf { };
 
   autobahn = callPackage ../development/python-modules/autobahn { };
 

From 549df83e8e985db88fffee47575d4245cd29d9e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 15 Jul 2017 18:56:51 +0200
Subject: [PATCH 0581/3246] neovim-ruby: 0.4.0 -> 0.5.0

---
 .../editors/neovim/ruby_provider/Gemfile.lock          |  6 +++---
 .../editors/neovim/ruby_provider/gemset.nix            | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
index 88100b2e8f8..327edca0ed2 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
+++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    msgpack (1.0.2)
-    neovim (0.3.1)
+    msgpack (1.1.0)
+    neovim (0.5.0)
       msgpack (~> 1.0)
 
 PLATFORMS
@@ -12,4 +12,4 @@ DEPENDENCIES
   neovim
 
 BUNDLED WITH
-   1.12.5
+   1.15.1
diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
index 6eac5714857..fbb9c63a1cf 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
+++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
@@ -2,18 +2,18 @@
   msgpack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg";
+      sha256 = "0ck7w17d6b4jbb8inh1q57bghi9cjkiaxql1d3glmj1yavbpmlh7";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.1.0";
   };
   neovim = {
     dependencies = ["msgpack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gvwa1zkirai7605x4hn2lynbw1caviga272iyy472jv7hs2zn92";
+      sha256 = "1da0ha3mz63iyihldp7185b87wx86jg07023xjhbng6i28y1ksn7";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.0";
   };
-}
+}
\ No newline at end of file

From 812346c9c9d32c08e1928897c50876fa8e375a3a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 May 2017 15:32:48 +0100
Subject: [PATCH 0582/3246] google-compute-engine: init at 20170523

---
 .../0001-allow-nologin-other-paths.patch      | 27 +++++++++
 .../google-compute-engine/default.nix         | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 84 insertions(+)
 create mode 100644 pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch
 create mode 100644 pkgs/tools/virtualization/google-compute-engine/default.nix

diff --git a/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch b/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch
new file mode 100644
index 00000000000..650e80c24fb
--- /dev/null
+++ b/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch
@@ -0,0 +1,27 @@
+From 2e9ac201af238b742c7032962b9b12a8b66bab0c Mon Sep 17 00:00:00 2001
+From: zimbatm <zimbatm@zimbatm.com>
+Date: Mon, 29 May 2017 22:36:15 +0100
+Subject: [PATCH] allow nologin on other paths
+
+---
+ google_compute_engine/accounts/accounts_utils.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/google_compute_engine/accounts/accounts_utils.py b/google_compute_engine/accounts/accounts_utils.py
+index 57e62be..d7eda06 100644
+--- a/google_compute_engine/accounts/accounts_utils.py
++++ b/google_compute_engine/accounts/accounts_utils.py
+@@ -295,8 +295,8 @@ class AccountsUtils(object):
+     # logins. This helps avoid problems caused by operator and root sharing
+     # a home directory in CentOS and RHEL.
+     pw_entry = self._GetUser(user)
+-    if pw_entry and pw_entry.pw_shell == '/sbin/nologin':
+-      message = 'Not updating user %s. User set /sbin/nologin as login shell.'
++    if pw_entry and os.path.basename(pw_entry.pw_shell) == 'nologin':
++      message = 'Not updating user %s. User set `nologin` as login shell.'
+       self.logger.debug(message, user)
+       return True
+ 
+-- 
+2.13.0
+
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
new file mode 100644
index 00000000000..7a5350fe2eb
--- /dev/null
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, fetchFromGitHub
+, pythonPackages
+, bash
+, shadow
+, systemd
+, utillinux
+}:
+let
+  version = "20170523";
+in
+pythonPackages.buildPythonApplication {
+  name = "google-compute-engine-${version}";
+  namePrefix = "";
+
+  src = fetchFromGitHub {
+    owner = "GoogleCloudPlatform";
+    repo = "compute-image-packages";
+    rev = version;
+    sha256 = "1qxyj3lj9in6m8yi6y6wcmc3662h9z4qax07v97rdnay99mxdv68";
+  };
+
+  patches = [ ./0001-allow-nologin-other-paths.patch ];
+
+  postPatch = ''
+    for file in $(find google_compute_engine -type f); do
+      substituteInPlace "$file" \
+        --replace /bin/systemctl "${systemd}/bin/systemctl" \
+        --replace /bin/bash "${bash}/bin/bash" \
+        --replace /sbin/hwclock "${utillinux}/bin/hwclock"
+
+      # SELinux tool ???  /sbin/restorecon
+    done
+
+    substituteInPlace google_config/udev/64-gce-disk-removal.rules \
+      --replace /bin/sh "${bash}/bin/sh" \
+      --replace /bin/umount "${utillinux}/bin/umount" \
+      --replace /usr/bin/logger "${utillinux}/bin/logger"
+  '';
+
+  postInstall = ''
+    # allows to install the package in `services.udev.packages` in NixOS
+    mkdir -p $out/lib/udev/rules.d
+    cp -r google_config/udev/*.rules $out/lib/udev/rules.d
+  '';
+
+  propagatedBuildInputs = with pythonPackages; [ boto setuptools ];
+
+  meta = with lib; {
+    description = "Google Compute Engine tools and services";
+    homepage = https://github.com/GoogleCloudPlatform/compute-image-packages;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c0a73ccb3d..d82677928eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2191,6 +2191,8 @@ with pkgs;
 
   google-fonts = callPackage ../data/fonts/google-fonts { };
 
+  google-compute-engine = callPackage ../tools/virtualization/google-compute-engine {  };
+
   gource = callPackage ../applications/version-management/gource { };
 
   gpart = callPackage ../tools/filesystems/gpart { };

From 681f866e22756a8a24cdec5ee57d8a0245d0df4b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 15 Jul 2017 19:32:38 +0200
Subject: [PATCH 0583/3246] qgis: 2.18.4 -> 2.18.10

---
 pkgs/applications/gis/qgis/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index b8c9d171814..10c2ab9ebf9 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,24 +5,15 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.18.4";
+  name = "qgis-2.18.10";
 
   buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
     (stdenv.lib.optional withGrass grass) ++
-    (with python2Packages; [ numpy psycopg2 requests python2Packages.qscintilla sip ]);
+    (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]);
 
   nativeBuildInputs = [ cmake makeWrapper ];
 
-  patches = [
-    # See https://hub.qgis.org/issues/16071
-    (fetchpatch {
-      name = "fix-build-against-recent-sip";
-      url = "https://github.com/qgis/QGIS/commit/85a0db24f32351f6096cd8282f03ad5c2f4e6ef5.patch";
-      sha256 = "0snspzdrpawd7j5b69i8kk7pmmy6ij8bn02bzg94qznfpf9ihf30";
-    })
-  ];
-
   # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
   #enableParallelBuilding = true;
 
@@ -34,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "1s264pahxpn0215xmzm8q2khr5xspipd7bbvxah5kj339kyjfy3k";
+    sha256 = "1vrzxhnpzd75iia4xmhbxy90x0wlvj2w4210f0r8203hd2m4sxdj";
   };
 
   cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";

From aaaa470ff821fc3dd32b4bb240047694ed26ac83 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 15 Jul 2017 13:47:21 -0400
Subject: [PATCH 0584/3246] mkDerivation: Fix errors from #27365

`nix-build pkgs/top-level/release.nix -A tarball` now succeeds.

`configureFlags = null` lead to a type error, and one overrideDrv
needed to be converted to to append a configureFlags list instead of
string due to the normalization.

Thanks @vcunat for alerting me to the issues---sorry I did not catch
them before merging my own PR.
---
 pkgs/stdenv/generic/make-derivation.nix | 6 ++++--
 pkgs/top-level/all-packages.nix         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 1486b11f701..be271daf8c8 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -98,9 +98,11 @@ rec {
           propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0;
           propagatedBuildInputs = lib.elemAt propagatedDependencies' 1;
 
-          # This parameter is sometimes a string and sometimes a list, yuck
+          # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
           configureFlags = let inherit (lib) optional elem; in
-            (if lib.isString configureFlags then [configureFlags] else configureFlags)
+            (/**/ if lib.isString configureFlags then [configureFlags]
+             else if configureFlags == null      then []
+             else                                     configureFlags)
             ++ optional (elem "build"  configurePlatforms) "--build=${stdenv.buildPlatform.config}"
             ++ optional (elem "host"   configurePlatforms) "--host=${stdenv.hostPlatform.config}"
             ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b62908e2798..57c8ecd6770 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3591,7 +3591,7 @@ with pkgs;
           (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ];
                     # Fix this build error in ./tests/examples/waylandsink:
                     #   main.c:28:2: error: #error "Wayland is not supported in GTK+"
-                    configureFlags = attrs.configureFlags or "" + "--enable-wayland=no";
+                    configureFlags = attrs.configureFlags or [] ++ [ "--enable-wayland=no" ];
                   });
       };
   };

From c93d68b6ed7704ecd93b7a734ab025d990a9b5b2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 May 2017 15:33:24 +0100
Subject: [PATCH 0585/3246] google-compute-image module: use google services

This adds a few google-specific services to setup the machine.

Accounts are now dynamically created using the google-accounts-daemon,
which allows to click on the "SSH" button in the console and have it
working.

The NixOS image now supports the userdata startup and shutdown scripts.

Misc:
* add all the google services from https://github.com/GoogleCloudPlatform/compute-image-packages/tree/master/google_compute_engine_init/systemd
* add udev rules for disk labels
* synched sysctl rules with https://github.com/GoogleCloudPlatform/compute-image-packages/blob/master/google_config/sysctl/11-gce-network-security.conf
---
 .../virtualisation/google-compute-image.nix   | 149 +++++++++++++++++-
 1 file changed, 144 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 3943a62f8a4..4a8dadaa281 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -3,13 +3,11 @@
 with lib;
 let
   diskSize = 1024; # MB
+  gce = pkgs.google-compute-engine;
 in
 {
   imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ];
 
-  # https://cloud.google.com/compute/docs/tutorials/building-images
-  networking.firewall.enable = mkDefault false;
-
   system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
     name = "google-compute-image";
     postVM = ''
@@ -49,12 +47,18 @@ in
   services.openssh.permitRootLogin = "prohibit-password";
   services.openssh.passwordAuthentication = mkDefault false;
 
+  # Use GCE udev rules for dynamic disk volumes
+  services.udev.packages = [ gce ];
+
   # Force getting the hostname from Google Compute.
   networking.hostName = mkDefault "";
 
   # Always include cryptsetup so that NixOps can use it.
   environment.systemPackages = [ pkgs.cryptsetup ];
 
+  # Rely on GCP's firewall instead
+  networking.firewall.enable = mkDefault false;
+
   # Configure default metadata hostnames
   networking.extraHosts = ''
     169.254.169.254 metadata.google.internal metadata
@@ -64,6 +68,132 @@ in
 
   networking.usePredictableInterfaceNames = false;
 
+  # allow the google-accounts-daemon to manage users
+  users.mutableUsers = true;
+  # and allow users to sudo without password
+  security.sudo.enable = true;
+  security.sudo.extraConfig = ''
+  %google-sudoers ALL=(ALL:ALL) NOPASSWD:ALL
+  '';
+
+  # NOTE: google-accounts tries to write to /etc/sudoers.d but the folder doesn't exist
+  # FIXME: not such file or directory on dynamic SSH provisioning
+  systemd.services.google-accounts-daemon = {
+    description = "Google Compute Engine Accounts Daemon";
+    # This daemon creates dynamic users
+    enable = config.users.mutableUsers;
+    after = [
+      "network.target"
+      "google-instance-setup.service"
+      "google-network-setup.service"
+    ];
+    wantedBy = [ "multi-user.target" ];
+    requires = ["network.target"];
+    path = with pkgs; [ shadow ];
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = "${gce}/bin/google_accounts_daemon --debug";
+    };
+  };
+
+  systemd.services.google-clock-skew-daemon = {
+    description = "Google Compute Engine Clock Skew Daemon";
+    after = [
+      "network.target"
+      "google-instance-setup.service"
+      "google-network-setup.service"
+    ];
+    requires = [ "network.target" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = "${gce}/bin/google_clock_skew_daemon --debug";
+    };
+  };
+
+  systemd.services.google-instance-setup = {
+    description = "Google Compute Engine Instance Setup";
+    after = ["fs.target" "network-online.target" "network.target" "rsyslog.service"];
+    before = ["sshd.service"];
+    wants = ["local-fs.target" "network-online.target" "network.target"];
+    wantedBy = [ "sshd.service" "multi-user.target" ];
+    path = with pkgs; [ ethtool ];
+    serviceConfig = {
+      ExecStart = "${gce}/bin/google_instance_setup --debug";
+      Type = "oneshot";
+    };
+  };
+
+  systemd.services.google-ip-forwarding-daemon = {
+    description = "Google Compute Engine IP Forwarding Daemon";
+    after = ["network.target" "google-instance-setup.service" "google-network-setup.service"];
+    requires = ["network.target"];
+    wantedBy = [ "multi-user.target" ];
+    path = with pkgs; [ iproute ];
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = "${gce}/bin/google_ip_forwarding_daemon --debug";
+    };
+  };
+
+  systemd.services.google-shutdown-scripts = {
+    description = "Google Compute Engine Shutdown Scripts";
+    after = [
+      "local-fs.target"
+      "network-online.target"
+      "network.target"
+      "rsyslog.service"
+      "google-instance-setup.service"
+      "google-network-setup.service"
+    ];
+    wants = [ "local-fs.target" "network-online.target" "network.target"];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      ExecStart = "${pkgs.coreutils}/bin/true";
+      ExecStop = "${gce}/bin/google_metadata_script_runner --debug --script-type shutdown";
+      Type = "oneshot";
+      RemainAfterExit = true;
+      TimeoutStopSec = 0;
+    };
+  };
+
+  systemd.services.google-network-setup = {
+    description = "Google Compute Engine Network Setup";
+    after = [
+      "local-fs.target"
+      "network-online.target"
+      "network.target"
+      "rsyslog.service"
+    ];
+    wants = [ "local-fs.target" "network-online.target" "network.target"];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      ExecStart = "${gce}/bin/google_network_setup --debug";
+      KillMode = "process";
+      Type = "oneshot";
+    };
+  };
+
+  systemd.services.google-startup-scripts = {
+    description = "Google Compute Engine Startup Scripts";
+    after = [
+      "local-fs.target"
+      "network-online.target"
+      "network.target"
+      "rsyslog.service"
+      "google-instance-setup.service"
+      "google-network-setup.service"
+    ];
+    wants = [ "local-fs.target" "network-online.target" "network.target"];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup";
+      KillMode = "process";
+      Type = "oneshot";
+    };
+  };
+
+  # TODO: remove this
   systemd.services.fetch-ssh-keys =
     { description = "Fetch host keys and authorized_keys for root user";
 
@@ -113,9 +243,13 @@ in
       serviceConfig.StandardOutput = "journal+console";
     };
 
-  # Setings taken from https://cloud.google.com/compute/docs/tutorials/building-images#providedkernel
+  # Settings taken from https://github.com/GoogleCloudPlatform/compute-image-packages/blob/master/google_config/sysctl/11-gce-network-security.conf
   boot.kernel.sysctl = {
-    # enables syn flood protection
+    # Turn on SYN-flood protections.  Starting with 2.6.26, there is no loss
+    # of TCP functionality/features under normal conditions.  When flood
+    # protections kick in under high unanswered-SYN load, the system
+    # should remain more stable, with a trade off of some loss of TCP
+    # functionality/features (e.g. TCP Window scaling).
     "net.ipv4.tcp_syncookies" = mkDefault "1";
 
     # ignores source-routed packets
@@ -169,6 +303,11 @@ in
     # randomizes addresses of mmap base, heap, stack and VDSO page
     "kernel.randomize_va_space" = mkDefault "2";
 
+    # Reboot the machine soon after a kernel panic.
+    "kernel.panic" = mkDefault "10";
+
+    ## Not part of the original config
+
     # provides protection from ToCToU races
     "fs.protected_hardlinks" = mkDefault "1";
 

From 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 01:17:09 -0400
Subject: [PATCH 0586/3246] cc-wrapper: Always export environment variables for
 binutils

Before, this only happened when cross compiling.
---
 pkgs/build-support/cc-wrapper/default.nix   | 33 +++++++--------------
 pkgs/build-support/cc-wrapper/setup-hook.sh | 27 +++++++++++++----
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 4dc3d1845a4..1b52a0b8b12 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -71,22 +71,6 @@ let
         -e 's^addCVars^addCVars${_infixSalt}^g' \
         -e 's^\[ -z "\$crossConfig" \]^\[\[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" \]\]^g'
 
-    '' + stdenv.lib.optionalString (textFile == ./setup-hook.sh) ''
-      cat << 'EOF' >> $out
-        for CMD in ar as nm objcopy ranlib strip strings size ld windres
-        do
-          # which is not part of stdenv, but compgen will do for now
-          if
-            PATH=$_PATH type -p ${prefix}$CMD > /dev/null
-          then
-            export ''$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=${prefix}''${CMD};
-          fi
-        done
-      EOF
-
-      sed -i $out -e 's_envHooks_crossEnvHooks_g'
-    '' + ''
-
       # NIX_ things which we don't both use and define, we revert them
       #asymmetric=$(
       #  for pre in "" "\\$"
@@ -143,6 +127,7 @@ stdenv.mkDerivation {
   inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
   gnugrep_bin = if nativeTools then "" else gnugrep;
 
+  binPrefix = prefix;
 
   passthru = {
     inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
@@ -303,20 +288,24 @@ stdenv.mkDerivation {
         wrap ${prefix}ld.bfd ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd
       fi
 
-      export real_cc=${prefix}cc
-      export real_cxx=${prefix}c++
+      # We export environment variables pointing to the wrapped nonstandard
+      # cmds, lest some lousy configure script use those to guess compiler
+      # version.
+      export named_cc=${prefix}cc
+      export named_cxx=${prefix}c++
+
       export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}"
 
       if [ -e $ccPath/${prefix}gcc ]; then
         wrap ${prefix}gcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcc
         ln -s ${prefix}gcc $out/bin/${prefix}cc
-        export real_cc=${prefix}gcc
-        export real_cxx=${prefix}g++
+        export named_cc=${prefix}gcc
+        export named_cxx=${prefix}g++
       elif [ -e $ccPath/clang ]; then
         wrap ${prefix}clang ${preWrap ./cc-wrapper.sh} $ccPath/clang
         ln -s ${prefix}clang $out/bin/${prefix}cc
-        export real_cc=clang
-        export real_cxx=clang++
+        export named_cc=${prefix}clang
+        export named_cxx=${prefix}clang++
       fi
 
       if [ -e $ccPath/${prefix}g++ ]; then
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index f4f7ab181d3..2900dc71a41 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -1,5 +1,3 @@
-export NIX_CC=@out@
-
 addCVars () {
     if [ -d $1/include ]; then
         export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
@@ -39,9 +37,26 @@ if [ -n "@coreutils_bin@" ]; then
 fi
 
 if [ -z "$crossConfig" ]; then
-    export CC=@real_cc@
-    export CXX=@real_cxx@
+  ENV_PREFIX=""
 else
-    export BUILD_CC=@real_cc@
-    export BUILD_CXX=@real_cxx@
+  ENV_PREFIX="BUILD_"
 fi
+
+export NIX_${ENV_PREFIX}CC=@out@
+
+export ${ENV_PREFIX}CC=@named_cc@
+export ${ENV_PREFIX}CXX=@named_cxx@
+
+for CMD in \
+    cpp \
+    ar as nm objcopy ranlib strip strings size ld windres
+do
+    if
+        PATH=$_PATH type -p @binPrefix@$CMD > /dev/null
+    then
+        export ${ENV_PREFIX}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD};
+    fi
+done
+
+# No local scope available for sourced files
+unset ENV_PREFIX

From c3d9ec531b53aa42fce7c6df8527d8b591d56a68 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 16 Jul 2017 01:06:56 +0300
Subject: [PATCH 0587/3246] pythonPackages.unittest2: Fix missing argument to
 substituteInPlace

---
 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 429c16d2cdb..971585d9bd4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24840,7 +24840,7 @@ in {
 
     postPatch = ''
       # argparse is needed for python < 2.7, which we do not support anymore.
-      substituteInPlace setup.py --replace "argparse"
+      substituteInPlace setup.py --replace "argparse" ""
 
       # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547
       sed -i '510i\        return None, False' unittest2/loader.py

From 63bb133373e5d6996fdde864819efd1be7d6ef32 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Mon, 19 Jun 2017 01:18:56 +0200
Subject: [PATCH 0588/3246] journalwatch & journalwatch service: init at 1.1.0

---
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/logging/journalwatch.nix | 246 ++++++++++++++++++
 pkgs/tools/system/journalwatch/default.nix    |  43 +++
 pkgs/top-level/python-packages.nix            |   3 +
 4 files changed, 293 insertions(+)
 create mode 100644 nixos/modules/services/logging/journalwatch.nix
 create mode 100644 pkgs/tools/system/journalwatch/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1f2fbb7d85c..7194e1f8385 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -243,6 +243,7 @@
   ./services/logging/graylog.nix
   ./services/logging/heartbeat.nix
   ./services/logging/journalbeat.nix
+  ./services/logging/journalwatch.nix
   ./services/logging/klogd.nix
   ./services/logging/logcheck.nix
   ./services/logging/logrotate.nix
diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix
new file mode 100644
index 00000000000..d49795fe2b7
--- /dev/null
+++ b/nixos/modules/services/logging/journalwatch.nix
@@ -0,0 +1,246 @@
+{ config, lib, pkgs, services, ... }:
+with lib;
+
+let
+  cfg = config.services.journalwatch;
+  user = "journalwatch";
+  dataDir = "/var/lib/${user}";
+
+  journalwatchConfig = pkgs.writeText "config" (''
+    # (File Generated by NixOS journalwatch module.)
+    [DEFAULT]
+    mail_binary = ${cfg.mailBinary}
+    priority = ${toString cfg.priority}
+    mail_from = ${cfg.mailFrom}
+  ''
+  + optionalString (cfg.mailTo != null) ''
+    mail_to = ${cfg.mailTo}
+  ''
+  + cfg.extraConfig);
+
+  journalwatchPatterns = pkgs.writeText "patterns" ''
+    # (File Generated by NixOS journalwatch module.)
+
+    ${mkPatterns cfg.filterBlocks}
+  '';
+
+  # empty line at the end needed to to separate the blocks
+  mkPatterns = filterBlocks: concatStringsSep "\n" (map (block: ''
+    ${block.match}
+    ${block.filters}
+
+  '') filterBlocks);
+
+
+in {
+  options = {
+    services.journalwatch = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If enabled, periodically check the journal with journalwatch and report the results by mail.
+        '';
+      };
+
+      priority = mkOption {
+        type = types.int;
+        default = 6;
+        description = ''
+          Lowest priority of message to be considered.
+          A value between 7 ("debug"), and 0 ("emerg"). Defaults to 6 ("info").
+          If you don't care about anything with "info" priority, you can reduce
+          this to e.g. 5 ("notice") to considerably reduce the amount of
+          messages without needing many <option>filterBlocks</option>.
+        '';
+      };
+
+      # HACK: this is a workaround for journalwatch's usage of socket.getfqdn() which always returns localhost if
+      # there's an alias for the localhost on a separate line in /etc/hosts, or take for ages if it's not present and
+      # then return something right-ish in the direction of /etc/hostname. Just bypass it completely.
+      mailFrom = mkOption {
+        type = types.str;
+        default = "journalwatch@${config.networking.hostName}";
+        description = ''
+          Mail address to send journalwatch reports from.
+        '';
+      };
+
+      mailTo = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Mail address to send journalwatch reports to.
+        '';
+      };
+
+      mailBinary = mkOption {
+        type = types.path;
+        default = "/run/wrappers/bin/sendmail";
+        description = ''
+          Sendmail-compatible binary to be used to send the messages.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Extra lines to be added verbatim to the journalwatch/config configuration file.
+          You can add any commandline argument to the config, without the '--'.
+          See <literal>journalwatch --help</literal> for all arguments and their description.
+          '';
+      };
+
+      filterBlocks = mkOption {
+        type = types.listOf (types.submodule {
+          options = {
+           match = mkOption {
+              type = types.str;
+              example = "SYSLOG_IDENTIFIER = systemd";
+              description = ''
+                Syntax: <literal>field = value</literal>
+                Specifies the log entry <literal>field</literal> this block should apply to.
+                If the <literal>field</literal> of a message matches this <literal>value</literal>,
+                this patternBlock's <option>filters</option> are applied.
+                If <literal>value</literal> starts and ends with a slash, it is interpreted as
+                an extended python regular expression, if not, it's an exact match.
+                The journal fields are explained in systemd.journal-fields(7).
+              '';
+            };
+
+            filters = mkOption {
+              type = types.str;
+              example = ''
+                (Stopped|Stopping|Starting|Started) .*
+                (Reached target|Stopped target) .*
+              '';
+              description = ''
+                The filters to apply on all messages which satisfy <option>match</option>.
+                Any of those messages that match any specified filter will be removed from journalwatch's output.
+                Each filter is an extended Python regular expression.
+                You can specify multiple filters and separate them by newlines.
+                Lines starting with '#' are comments. Inline-comments are not permitted.
+              '';
+            };
+          };
+        });
+
+        example = [
+          # examples taken from upstream
+          {
+            match = "_SYSTEMD_UNIT = systemd-logind.service";
+            filters = ''
+              New session [a-z]?\d+ of user \w+\.
+              Removed session [a-z]?\d+\.
+            '';
+          }
+
+          {
+            match = "SYSLOG_IDENTIFIER = /(CROND|crond)/";
+            filters = ''
+              pam_unix\(crond:session\): session (opened|closed) for user \w+
+              \(\w+\) CMD .*
+            '';
+          }
+        ];
+
+        # another example from upstream.
+        # very useful on priority = 6, and required as journalwatch throws an error when no pattern is defined at all.
+        default = [
+          {
+            match = "SYSLOG_IDENTIFIER = systemd";
+            filters = ''
+              (Stopped|Stopping|Starting|Started) .*
+              (Created slice|Removed slice) user-\d*\.slice\.
+              Received SIGRTMIN\+24 from PID .*
+              (Reached target|Stopped target) .*
+              Startup finished in \d*ms\.
+            '';
+          }
+        ];
+
+
+        description = ''
+          filterBlocks can be defined to blacklist journal messages which are not errors.
+          Each block matches on a log entry field, and the filters in that block then are matched
+          against all messages with a matching log entry field.
+
+          All messages whose PRIORITY is at least 6 (INFO) are processed by journalwatch.
+          If you don't specify any filterBlocks, PRIORITY is reduced to 5 (NOTICE) by default.
+
+          All regular expressions are extended Python regular expressions, for details
+          see: http://doc.pyschools.com/html/regex.html
+        '';
+      };
+
+      interval = mkOption {
+        type = types.str;
+        default = "hourly";
+        description = ''
+          How often to run journalwatch.
+
+          The format is described in systemd.time(7).
+        '';
+      };
+      accuracy = mkOption {
+        type = types.str;
+        default = "10min";
+        description = ''
+          The time window around the interval in which the journalwatch run will be scheduled.
+
+          The format is described in systemd.time(7).
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.${user} = {
+      isSystemUser = true;
+      createHome = true;
+      home = dataDir;
+      # for journal access
+      group = "systemd-journal";
+    };
+
+    systemd.services.journalwatch = {
+      environment = {
+        XDG_DATA_HOME = "${dataDir}/share";
+        XDG_CONFIG_HOME = "${dataDir}/config";
+      };
+      serviceConfig = {
+        User = user;
+        Type = "oneshot";
+        PermissionsStartOnly = true;
+        ExecStart = "${pkgs.python3Packages.journalwatch}/bin/journalwatch mail";
+        # lowest CPU and IO priority, but both still in best-effort class to prevent starvation
+        Nice=19;
+        IOSchedulingPriority=7;
+      };
+      preStart = ''
+        chown -R ${user}:systemd-journal ${dataDir}
+        chmod -R u+rwX,go-w ${dataDir}
+        mkdir -p ${dataDir}/config/journalwatch
+        ln -sf ${journalwatchConfig} ${dataDir}/config/journalwatch/config
+        ln -sf ${journalwatchPatterns} ${dataDir}/config/journalwatch/patterns
+      '';
+    };
+
+    systemd.timers.journalwatch = {
+      description = "Periodic journalwatch run";
+      wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnCalendar = cfg.interval;
+        AccuracySec = cfg.accuracy;
+        Persistent = true;
+      };
+    };
+
+  };
+
+  meta = {
+    maintainers = with stdenv.lib.maintainers; [ florianjacob ];
+  };
+}
diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix
new file mode 100644
index 00000000000..a424eb6c4b2
--- /dev/null
+++ b/pkgs/tools/system/journalwatch/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, buildPythonPackage, fetchurl, fetchgit, pythonOlder, systemd, pytest }:
+
+buildPythonPackage rec {
+  pname = "journalwatch";
+  name = "${pname}-${version}";
+  version = "1.1.0";
+  disabled = pythonOlder "3.3";
+
+
+  src = fetchurl {
+    url = "https://github.com/The-Compiler/${pname}/archive/v${version}.tar.gz";
+    sha512 = "3hvbgx95hjfivz9iv0hbhj720wvm32z86vj4a60lji2zdfpbqgr2b428lvg2cpvf71l2xn6ca5v0hzyz57qylgwqzgfrx7hqhl5g38s";
+  };
+
+  # can be removed post 1.1.0
+  postPatch = ''
+    substituteInPlace test_journalwatch.py \
+      --replace "U Thu Jan  1 00:00:00 1970 prio foo [1337]" "U Thu Jan  1 00:00:00 1970 pprio foo [1337]"
+  '';
+
+
+  doCheck = true;
+
+  checkPhase = ''
+    pytest test_journalwatch.py
+  '';
+
+  buildInputs = [
+    pytest
+  ];
+
+  propagatedBuildInputs = [
+    systemd
+  ];
+
+
+  meta = with stdenv.lib; {
+    description = "journalwatch is a tool to find error messages in the systemd journal.";
+    homepage = "https://github.com/The-Compiler/journalwatch";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ florianjacob ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b6d1bf82e3..9694965c598 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12382,6 +12382,9 @@ in {
     };
   };
 
+  journalwatch = callPackage ../tools/system/journalwatch {
+    inherit (self) systemd pytest;
+  };
 
   jrnl = buildPythonPackage rec {
     name = "jrnl-1.9.7";

From c5ef98bb34bee5f27337d601750dd79aa6fd2289 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Jul 2017 19:14:44 -0400
Subject: [PATCH 0589/3246] linux: 4.12.1 -> 4.12.2

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index 5ce28029c11..4cb408d33cb 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.1";
+  version = "4.12.2";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0qm8lp6z3f2frqb585i5r7cb6hbzd0m13p0ywz4s8bqxwmrym1cw";
+    sha256 = "1ql5y6bvb1bx9b2k5iksdzjgzxnq852rvq69kdnkwa98p8p8ayha";
   };
 
   kernelPatches = args.kernelPatches;

From ccec16579d01a1c7e9451ba9a90f6a99daa2002b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Jul 2017 19:17:06 -0400
Subject: [PATCH 0590/3246] linux: 4.11.10 -> 4.11.11

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index eded1422440..9bb4e85d3f9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11.10";
+  version = "4.11.11";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1dma031rcj8nvcb3znbcffafwm5cpax3cvqkq9zspa8lf5ah52si";
+    sha256 = "1dvs1r3vq15akyv0yxvim6j09pqac5dagqbchvdlsw5yi4fnylc8";
   };
 
   kernelPatches = args.kernelPatches;

From b04858db1bd86768f6bc612f3e063677e4f941d9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Jul 2017 19:22:07 -0400
Subject: [PATCH 0591/3246] linux: 4.9.37 -> 4.9.38

Remove temporary patches to perf as well
---
 pkgs/os-specific/linux/kernel/linux-4.9.nix   |   4 +-
 .../linux/kernel/perf-offline-probe.patch     | 224 ------------------
 pkgs/os-specific/linux/kernel/perf.nix        |   2 +-
 3 files changed, 3 insertions(+), 227 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/perf-offline-probe.patch

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index c42dbad5756..260b776999d 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.37";
+  version = "4.9.38";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14300vddyz7x6vg1mx64a0i8i61fk5bl8azcvv7rf3b97c4cy7pn";
+    sha256 = "0x4h2b6xapqyxgivj9ay5yclmyl434bjfmq9ikajy7fmgpc8kmvn";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/perf-offline-probe.patch b/pkgs/os-specific/linux/kernel/perf-offline-probe.patch
deleted file mode 100644
index 7334a339c85..00000000000
--- a/pkgs/os-specific/linux/kernel/perf-offline-probe.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From 8a937a25a7e3c19d5fb3f9d92f605cf5fda219d8 Mon Sep 17 00:00:00 2001
-From: Masami Hiramatsu <mhiramat@kernel.org>
-Date: Wed, 4 Jan 2017 12:30:19 +0900
-Subject: perf probe: Fix to probe on gcc generated symbols for offline kernel
-
-From: Masami Hiramatsu <mhiramat@kernel.org>
-
-commit 8a937a25a7e3c19d5fb3f9d92f605cf5fda219d8 upstream.
-
-Fix perf-probe to show probe definition on gcc generated symbols for
-offline kernel (including cross-arch kernel image).
-
-gcc sometimes optimizes functions and generate new symbols with suffixes
-such as ".constprop.N" or ".isra.N" etc. Since those symbol names are
-not recorded in DWARF, we have to find correct generated symbols from
-offline ELF binary to probe on it (kallsyms doesn't correct it).  For
-online kernel or uprobes we don't need it because those are rebased on
-_text, or a section relative address.
-
-E.g. Without this:
-
-  $ perf probe -k build-arm/vmlinux -F __slab_alloc*
-  __slab_alloc.constprop.9
-  $ perf probe -k build-arm/vmlinux -D __slab_alloc
-  p:probe/__slab_alloc __slab_alloc+0
-
-If you put above definition on target machine, it should fail
-because there is no __slab_alloc in kallsyms.
-
-With this fix, perf probe shows correct probe definition on
-__slab_alloc.constprop.9:
-
-  $ perf probe -k build-arm/vmlinux -D __slab_alloc
-  p:probe/__slab_alloc __slab_alloc.constprop.9+0
-
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lkml.kernel.org/r/148350060434.19001.11864836288580083501.stgit@devbox
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: Krister Johansen <kjlx@templeofstupid.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- tools/perf/util/probe-event.c |   48 +++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 47 insertions(+), 1 deletion(-)
-
---- a/tools/perf/util/probe-event.c
-+++ b/tools/perf/util/probe-event.c
-@@ -618,6 +618,51 @@ error:
-	return ret ? : -ENOENT;
- }
-
-+/*
-+ * Rename DWARF symbols to ELF symbols -- gcc sometimes optimizes functions
-+ * and generate new symbols with suffixes such as .constprop.N or .isra.N
-+ * etc. Since those symbols are not recorded in DWARF, we have to find
-+ * correct generated symbols from offline ELF binary.
-+ * For online kernel or uprobes we don't need this because those are
-+ * rebased on _text, or already a section relative address.
-+ */
-+static int
-+post_process_offline_probe_trace_events(struct probe_trace_event *tevs,
-+					int ntevs, const char *pathname)
-+{
-+	struct symbol *sym;
-+	struct map *map;
-+	unsigned long stext = 0;
-+	u64 addr;
-+	int i;
-+
-+	/* Prepare a map for offline binary */
-+	map = dso__new_map(pathname);
-+	if (!map || get_text_start_address(pathname, &stext) < 0) {
-+		pr_warning("Failed to get ELF symbols for %s\n", pathname);
-+		return -EINVAL;
-+	}
-+
-+	for (i = 0; i < ntevs; i++) {
-+		addr = tevs[i].point.address + tevs[i].point.offset - stext;
-+		sym = map__find_symbol(map, addr);
-+		if (!sym)
-+			continue;
-+		if (!strcmp(sym->name, tevs[i].point.symbol))
-+			continue;
-+		/* If we have no realname, use symbol for it */
-+		if (!tevs[i].point.realname)
-+			tevs[i].point.realname = tevs[i].point.symbol;
-+		else
-+			free(tevs[i].point.symbol);
-+		tevs[i].point.symbol = strdup(sym->name);
-+		tevs[i].point.offset = addr - sym->start;
-+	}
-+	map__put(map);
-+
-+	return 0;
-+}
-+
- static int add_exec_to_probe_trace_events(struct probe_trace_event *tevs,
-					  int ntevs, const char *exec)
- {
-@@ -694,7 +739,8 @@ post_process_kernel_probe_trace_events(s
-
-	/* Skip post process if the target is an offline kernel */
-	if (symbol_conf.ignore_vmlinux_buildid)
--		return 0;
-+		return post_process_offline_probe_trace_events(tevs, ntevs,
-+						symbol_conf.vmlinux_name);
-
-	reloc_sym = kernel_get_ref_reloc_sym();
-	if (!reloc_sym) {
-
----
-
-From 3e96dac7c956089d3f23aca98c4dfca57b6aaf8a Mon Sep 17 00:00:00 2001
-From: Masami Hiramatsu <mhiramat@kernel.org>
-Date: Wed, 11 Jan 2017 15:00:47 +0900
-Subject: perf probe: Add error checks to offline probe post-processing
-
-From: Masami Hiramatsu <mhiramat@kernel.org>
-
-commit 3e96dac7c956089d3f23aca98c4dfca57b6aaf8a upstream.
-
-Add error check codes on post processing and improve it for offline
-probe events as:
-
- - post processing fails if no matched symbol found in map(-ENOENT)
-   or strdup() failed(-ENOMEM).
-
- - Even if the symbol name is the same, it updates symbol address
-   and offset.
-
-Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Link: http://lkml.kernel.org/r/148411443738.9978.4617979132625405545.stgit@devbox
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: Krister Johansen <kjlx@templeofstupid.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- tools/perf/util/probe-event.c |   50 +++++++++++++++++++++++++++---------------
- 1 file changed, 33 insertions(+), 17 deletions(-)
-
---- a/tools/perf/util/probe-event.c
-+++ b/tools/perf/util/probe-event.c
-@@ -618,6 +618,33 @@ error:
-	return ret ? : -ENOENT;
- }
-
-+/* Adjust symbol name and address */
-+static int post_process_probe_trace_point(struct probe_trace_point *tp,
-+					   struct map *map, unsigned long offs)
-+{
-+	struct symbol *sym;
-+	u64 addr = tp->address + tp->offset - offs;
-+
-+	sym = map__find_symbol(map, addr);
-+	if (!sym)
-+		return -ENOENT;
-+
-+	if (strcmp(sym->name, tp->symbol)) {
-+		/* If we have no realname, use symbol for it */
-+		if (!tp->realname)
-+			tp->realname = tp->symbol;
-+		else
-+			free(tp->symbol);
-+		tp->symbol = strdup(sym->name);
-+		if (!tp->symbol)
-+			return -ENOMEM;
-+	}
-+	tp->offset = addr - sym->start;
-+	tp->address -= offs;
-+
-+	return 0;
-+}
-+
- /*
-  * Rename DWARF symbols to ELF symbols -- gcc sometimes optimizes functions
-  * and generate new symbols with suffixes such as .constprop.N or .isra.N
-@@ -630,11 +657,9 @@ static int
- post_process_offline_probe_trace_events(struct probe_trace_event *tevs,
-					int ntevs, const char *pathname)
- {
--	struct symbol *sym;
-	struct map *map;
-	unsigned long stext = 0;
--	u64 addr;
--	int i;
-+	int i, ret = 0;
-
-	/* Prepare a map for offline binary */
-	map = dso__new_map(pathname);
-@@ -644,23 +669,14 @@ post_process_offline_probe_trace_events(
-	}
-
-	for (i = 0; i < ntevs; i++) {
--		addr = tevs[i].point.address + tevs[i].point.offset - stext;
--		sym = map__find_symbol(map, addr);
--		if (!sym)
--			continue;
--		if (!strcmp(sym->name, tevs[i].point.symbol))
--			continue;
--		/* If we have no realname, use symbol for it */
--		if (!tevs[i].point.realname)
--			tevs[i].point.realname = tevs[i].point.symbol;
--		else
--			free(tevs[i].point.symbol);
--		tevs[i].point.symbol = strdup(sym->name);
--		tevs[i].point.offset = addr - sym->start;
-+		ret = post_process_probe_trace_point(&tevs[i].point,
-+						     map, stext);
-+		if (ret < 0)
-+			break;
-	}
-	map__put(map);
-
--	return 0;
-+	return ret;
- }
-
- static int add_exec_to_probe_trace_events(struct probe_trace_event *tevs,
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index cb13167eebc..3fbad924568 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   inherit (kernel) src;
 
-  patches = kernel.patches ++ [ ./perf-binutils-path.patch ./perf-offline-probe.patch ];
+  patches = kernel.patches ++ [ ./perf-binutils-path.patch ];
 
   preConfigure = ''
     cd tools/perf

From 81b993369c63b0d042814418f20bc71b44c7e84f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Jul 2017 19:25:42 -0400
Subject: [PATCH 0592/3246] linux: 4.4.76 -> 4.4.77

---
 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 5ac5a52c0a5..76dc8f030cd 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.76";
+  version = "4.4.77";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "180mngyar7ky2aiaszmgfqpfvwi0kxcym8j3ifflzggwqjkgrrki";
+    sha256 = "1s5l5b3hpm691w94a3ddliy4gcxi2s9xm3hsazdwgzqrqdv70ysy";
   };
 
   kernelPatches = args.kernelPatches;

From b103e9317afdd80bf6a12b316a35c757f04da50e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Jul 2017 19:30:44 -0400
Subject: [PATCH 0593/3246] linux-testing: 4.12-rc7 -> 4.13-rc1

---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 +++-
 pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 73dce131cf8..9700373c852 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -302,7 +302,9 @@ with stdenv.lib;
   CIFS_UPCALL y
   CIFS_ACL y
   CIFS_DFS_UPCALL y
-  CIFS_SMB2 y
+  ${optionalString (versionOlder version "4.13") ''
+    CIFS_SMB2 y
+  ''}
   ${optionalString (versionAtLeast version "3.12") ''
     CEPH_FSCACHE y
   ''}
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 60dfe85a160..c7a4ca30a7c 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12-rc7";
-  modDirVersion = "4.12.0-rc7";
-  extraMeta.branch = "4.12";
+  version = "4.13-rc1";
+  modDirVersion = "4.13.0-rc1";
+  extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1svfswv0b4gagv1yiavwb22p726h0w81lgxjqq0h9m3gf4xlqp3x";
+    sha256 = "1pdbykp2336vk7ynrz0l95rwqags6kklbr08wjc7zpmdaad6yd6m";
   };
 
   features.iwlwifi = true;

From df929d62166676bc7630e7e6a4f0241c408fd647 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Jul 2017 19:44:12 -0400
Subject: [PATCH 0594/3246] linux-copperhead: 4.12.1.a -> 4.12.2.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 4b44ce9b00d..878f69dbaa5 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.12.1";
+  version = "4.12.2";
   revision = "a";
-  sha256 = "0fjw5fmxpvdhfqkr4lcpmqw8xxj92q19ya8q48yhxvv149ahcvhq";
+  sha256 = "0w3k5a30li2qz2msach9sg9qsvmjsc4mf9k3ad5dxd0667a0hygm";
 in
 
 import ./generic.nix (args // {

From 3739858571e24e5f5a97a0627369826b240fb8e0 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 15 Jul 2017 20:29:49 -0400
Subject: [PATCH 0595/3246] cc-wrapper: Use new bash uppercase subsitution
 syntax in setup hook

While this requires newer bash, stdenv's setup.sh now does across the
board anyways. This way is more concise.
---
 pkgs/build-support/cc-wrapper/setup-hook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 2900dc71a41..3e8494cf9c1 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -52,9 +52,9 @@ for CMD in \
     ar as nm objcopy ranlib strip strings size ld windres
 do
     if
-        PATH=$_PATH type -p @binPrefix@$CMD > /dev/null
+        PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null
     then
-        export ${ENV_PREFIX}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD};
+        export "${ENV_PREFIX}${CMD^^}=@binPrefix@${CMD}";
     fi
 done
 

From dca801fbb7031699e4405b139781c03c561ae630 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sat, 15 Jul 2017 22:58:07 -0400
Subject: [PATCH 0596/3246] tarsnap: 1.0.37 -> 1.0.38

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

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 0f95a26c940..9fca48bde1b 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -8,11 +8,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "tarsnap-${version}";
-  version = "1.0.37";
+  version = "1.0.38";
 
   src = fetchurl {
     url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
-    sha256 = "1ynv323qi6775lzjb6hvifl8ajkv2bizy43sajadjfqvcl9r96gs";
+    sha256 = "0nyd722i7q8h81h5mvwxai0f3jmwd93r3ahjkmr12k55p8c0rvkn";
   };
 
   preConfigure = ''

From 8df013c786bab17a2f3e1ec09e4093b72f5a5342 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sat, 15 Jul 2017 23:52:10 -0300
Subject: [PATCH 0597/3246] zuki-themes: 3.20.2017-02-17 -> 3.20.2017-04-23
 zuki-themes: 3.22.2017-02-17 -> 3.22.2017-04-23 zuki-themes: add src for
 gtk-3.24 (3.24.2017-04-23)

---
 pkgs/misc/themes/zuki/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
index 491885a14b3..8fa6176f22e 100644
--- a/pkgs/misc/themes/zuki/default.nix
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -4,20 +4,23 @@ stdenv.mkDerivation rec {
   name = "zuki-themes-${version}";
   version = "${gnome3.version}.${date}";
   date = {
-    "3.20" = "2017-02-09";
-    "3.22" = "2017-02-17";
+    "3.20" = "2017-05-03";
+    "3.22" = "2017-04-23";
+    "3.24" = "2017-06-26";
   }."${gnome3.version}";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "zuki-themes";
     rev = {
-      "3.20" = "b9106c3c05012b7e91394819ca550def3357d2eb";
-      "3.22" = "fc3cf7c372bcc439870c4785f91b8ea7af73e1cc";
+      "3.20" = "ce7ae498df7d5c81acaf48ed957b9f828356d58c";
+      "3.22" = "e97f2c3cf75b5205bc5ecd6072696327169fde5d";
+      "3.24" = "d25e0a2fb6e08ad107d8bb627451433362f2a830";
     }."${gnome3.version}";
     sha256 = {
-      "3.20" = "03k18p25gsscv05934vs0py26vpcrx93wi5bj6di277c6kwgjzxg";
-      "3.22" = "02ppk8wsx0k7j3zgmcb1l8jgij0m5rdkrahfv884jxkyjr6wwgs5";
+      "3.20" = "0na81q9mc8kwn9m04kkcchrdr67087dqf3q155imhjgqrxjhh3w4";
+      "3.22" = "195v0d2sgqh92c104xqm00p68yxp6kzp5mzx8q7s36bdv9p972q4";
+      "3.24" = "0z5swi5aah3s4yinfglh491qydxgjkqwf6zxyz7k9c1d7lrvj3ww";
     }."${gnome3.version}";
   };
 

From f1b45f7d4136a04526d5b4ab09664e1dc005d38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Jul 2017 09:06:21 +0100
Subject: [PATCH 0598/3246] lttng-ust: add missing python dependency

---
 pkgs/development/tools/misc/lttng-ust/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index 8994d0c3512..3b294d13757 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, liburcu }:
+{ stdenv, fetchurl, liburcu, python }:
 
 # NOTE:
 #   ./configure ...
@@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
     sha256 = "196snxrs1p205jz566rwxh7dqzsa3k16c7vm6k7i3gdvrmkx54dq";
   };
 
-  buildInputs = [ liburcu ];
+  buildInputs = [ liburcu python ];
+
+  preConfigure = ''
+    patchShebangs .
+  '';
 
   meta = with stdenv.lib; {
     description = "LTTng Userspace Tracer libraries";

From e8a8f1233a4c6610eb63d6995a507fc662798bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Wed, 5 Jul 2017 16:19:32 +0200
Subject: [PATCH 0599/3246] snapper: add nixos module

fixes #27154
---
 nixos/modules/module-list.nix           |   1 +
 nixos/modules/services/misc/snapper.nix | 152 ++++++++++++++++++++++++
 nixos/release.nix                       |   1 +
 nixos/tests/snapper.nix                 |  43 +++++++
 4 files changed, 197 insertions(+)
 create mode 100644 nixos/modules/services/misc/snapper.nix
 create mode 100644 nixos/tests/snapper.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1f2fbb7d85c..4335a4b3eec 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -326,6 +326,7 @@
   ./services/misc/ripple-data-api.nix
   ./services/misc/rogue.nix
   ./services/misc/siproxd.nix
+  ./services/misc/snapper.nix
   ./services/misc/sonarr.nix
   ./services/misc/spice-vdagentd.nix
   ./services/misc/ssm-agent.nix
diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix
new file mode 100644
index 00000000000..62b344d11b0
--- /dev/null
+++ b/nixos/modules/services/misc/snapper.nix
@@ -0,0 +1,152 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.snapper;
+in
+
+{
+  options.services.snapper = {
+
+    snapshotInterval = mkOption {
+      type = types.str;
+      default = "hourly";
+      description = ''
+        Snapshot interval.
+
+        The format is described in
+        <citerefentry><refentrytitle>systemd.time</refentrytitle>
+        <manvolnum>7</manvolnum></citerefentry>.
+      '';
+    };
+
+    cleanupInterval = mkOption {
+      type = types.str;
+      default = "1d";
+      description = ''
+        Cleanup interval.
+
+        The format is described in
+        <citerefentry><refentrytitle>systemd.time</refentrytitle>
+        <manvolnum>7</manvolnum></citerefentry>.
+      '';
+    };
+
+    filters = mkOption {
+      type = types.nullOr types.lines;
+      default = null;
+      description = ''
+        Global display difference filter. See man:snapper(8) for more details.
+      '';
+    };
+
+    configs = mkOption {
+      default = { };
+      example = literalExample {
+        "home" = {
+          subvolume = "/home";
+          extraConfig = ''
+            ALLOW_USERS="alice"
+          '';
+        };
+      };
+
+      description = ''
+        Subvolume configuration
+      '';
+
+      type = types.attrsOf (types.submodule {
+        options = {
+          subvolume = mkOption {
+            type = types.path;
+            description = ''
+              Path of the subvolume or mount point.
+              This path is a subvolume and has to contain a subvolume named
+              .snapshots.
+              See also man:snapper(8) section PERMISSIONS.
+            '';
+          };
+
+          fstype = mkOption {
+            type = types.enum [ "btrfs" ];
+            default = "btrfs";
+            description = ''
+              Filesystem type. Only btrfs is stable and tested.
+            '';
+          };
+
+          extraConfig = mkOption {
+            type = types.lines;
+            default = "";
+            description = ''
+              Additional configuration next to SUBVOLUME and FSTYPE.
+              See man:snapper-configs(5).
+            '';
+          };
+        };
+      });
+    };
+  };
+
+  config = mkIf (cfg.configs != {}) (let
+    documentation = [ "man:snapper(8)" "man:snapper-configs(5)" ];
+  in {
+
+    environment = {
+
+      systemPackages = [ pkgs.snapper ];
+
+      # Note: snapper/config-templates/default is only needed for create-config
+      #       which is not the NixOS way to configure.
+      etc = {
+
+        "sysconfig/snapper".text = ''
+          SNAPPER_CONFIGS="${lib.concatStringsSep " " (builtins.attrNames cfg.configs)}"
+        '';
+
+      }
+      // (mapAttrs' (name: subvolume: nameValuePair "snapper/configs/${name}" ({
+        text = ''
+          ${subvolume.extraConfig}
+          FSTYPE="${subvolume.fstype}"
+          SUBVOLUME="${subvolume.subvolume}"
+        '';
+      })) cfg.configs)
+      // (lib.optionalAttrs (cfg.filters != null) {
+        "snapper/filters/default.txt".text = cfg.filters;
+      });
+
+    };
+
+    services.dbus.packages = [ pkgs.snapper ];
+
+    systemd.services.snapper-timeline = {
+      description = "Timeline of Snapper Snapshots";
+      inherit documentation;
+      serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --timeline";
+    };
+
+    systemd.timers.snapper-timeline = {
+      description = "Timeline of Snapper Snapshots";
+      inherit documentation;
+      wantedBy = [ "basic.target" ];
+      timerConfig.OnCalendar = cfg.snapshotInterval;
+    };
+
+    systemd.services.snapper-cleanup = {
+      description = "Cleanup of Snapper Snapshots";
+      inherit documentation;
+      serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --cleanup";
+    };
+
+    systemd.timers.snapper-cleanup = {
+      description = "Cleanup of Snapper Snapshots";
+      inherit documentation;
+      wantedBy = [ "basic.target" ];
+      timerConfig.OnBootSec = "10m";
+      timerConfig.OnUnitActiveSec = cfg.cleanupInterval;
+    };
+  });
+}
+
diff --git a/nixos/release.nix b/nixos/release.nix
index 467e3bb8cd6..0dbdadf9781 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -303,6 +303,7 @@ in rec {
   tests.simple = callTest tests/simple.nix {};
   tests.slim = callTest tests/slim.nix {};
   tests.smokeping = callTest tests/smokeping.nix {};
+  tests.snapper = callTest tests/snapper.nix {};
   tests.taskserver = callTest tests/taskserver.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
diff --git a/nixos/tests/snapper.nix b/nixos/tests/snapper.nix
new file mode 100644
index 00000000000..74ec22fd349
--- /dev/null
+++ b/nixos/tests/snapper.nix
@@ -0,0 +1,43 @@
+import ./make-test.nix ({ ... }:
+{
+  name = "snapper";
+
+  machine = { pkgs, lib, ... }: {
+    boot.initrd.postDeviceCommands = ''
+      ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux /dev/vdb
+    '';
+
+    virtualisation.emptyDiskImages = [ 4096 ];
+
+    fileSystems = lib.mkVMOverride {
+      "/home" = {
+        device = "/dev/disk/by-label/aux";
+        fsType = "btrfs";
+      };
+    };
+    services.snapper.configs.home.subvolume = "/home";
+    services.snapper.filters = "/nix";
+  };
+
+  testScript = ''
+    $machine->succeed("btrfs subvolume create /home/.snapshots");
+
+    $machine->succeed("snapper -c home list");
+
+    $machine->succeed("snapper -c home create --description empty");
+
+    $machine->succeed("echo test > /home/file");
+    $machine->succeed("snapper -c home create --description file");
+
+    $machine->succeed("snapper -c home status 1..2");
+
+    $machine->succeed("snapper -c home undochange 1..2");
+    $machine->fail("ls /home/file");
+
+    $machine->succeed("snapper -c home delete 2");
+
+    $machine->succeed("systemctl --wait start snapper-timeline.service");
+
+    $machine->succeed("systemctl --wait start snapper-cleanup.service");
+  '';
+})

From e621a6a5f855196c3221d77322b9db83e9f4f8c0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 16 Jul 2017 11:14:04 +0200
Subject: [PATCH 0600/3246] opkg: 0.3.4 -> 0.3.5

---
 pkgs/tools/package-management/opkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index 3b636ab0e29..e1e57a84b55 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -2,11 +2,11 @@
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.4";
+  version = "0.3.5";
   name = "opkg-${version}";
   src = fetchurl {
     url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
-    sha256 = "1glkxjhsaaji172phd1gv8g0k0fs09pij6k01cl9namnac5r02vm";
+    sha256 = "0ciz6h6sx9hnz463alpkcqwqnq8jk382ifc6z89j29hix8fw4jvk";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From f31773b8522cb4b7966b21d526cac86ef3bc1bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Jul 2017 11:10:10 +0100
Subject: [PATCH 0601/3246] tarsnapper: 0.2.1 -> 0.4

- project is not a python library -> move out of pythonPackages.
- also enable tests
---
 .../python-modules/tarsnapper-path.patch      | 20 ---------------
 pkgs/tools/backup/tarsnapper/default.nix      | 25 +++++++++++++++++++
 .../backup/tarsnapper/remove-argparse.patch   | 10 ++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            | 20 ---------------
 5 files changed, 37 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/python-modules/tarsnapper-path.patch
 create mode 100644 pkgs/tools/backup/tarsnapper/default.nix
 create mode 100644 pkgs/tools/backup/tarsnapper/remove-argparse.patch

diff --git a/pkgs/development/python-modules/tarsnapper-path.patch b/pkgs/development/python-modules/tarsnapper-path.patch
deleted file mode 100644
index 337ad49f971..00000000000
--- a/pkgs/development/python-modules/tarsnapper-path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/tarsnapper/script.py b/src/tarsnapper/script.py
-index 737ac8d..52cc775 100644
---- a/src/tarsnapper/script.py
-+++ b/src/tarsnapper/script.py
-@@ -48,7 +48,7 @@ class TarsnapBackend(object):
-         """
-         ``arguments`` is a single list of strings.
-         """
--        call_with = ['tarsnap']
-+        call_with = ['@NIXTARSNAPPATH@']
-         for option in self.options:
-             key = option[0]
-             pre = "-" if len(key) == 1 else "--"
-@@ -499,4 +499,4 @@ def run():
- 
- 
- if __name__ == '__main__':
--    run()
-\ No newline at end of file
-+    run()
diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix
new file mode 100644
index 00000000000..54d85343e2d
--- /dev/null
+++ b/pkgs/tools/backup/tarsnapper/default.nix
@@ -0,0 +1,25 @@
+{ python3Packages, fetchFromGitHub , tarsnap }:
+
+python3Packages.buildPythonApplication rec {
+  name = "tarsnapper-${version}";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "miracle2k";
+    repo = "tarsnapper";
+    rev = version;
+    sha256 = "03db49188f4v1946c8mqqj30ah10x68hbg3a58js0syai32v12pm";
+  };
+
+  buildInputs = with python3Packages; [ nose pytest ];
+
+  checkPhase = ''
+    py.test .
+  '';
+
+  propagatedBuildInputs = with python3Packages; [ pyyaml dateutil pexpect ];
+
+  patches = [ ./remove-argparse.patch ];
+
+  makeWrapperArgs = ["--prefix PATH : ${tarsnap}/bin"];
+}
diff --git a/pkgs/tools/backup/tarsnapper/remove-argparse.patch b/pkgs/tools/backup/tarsnapper/remove-argparse.patch
new file mode 100644
index 00000000000..5fd36b14a13
--- /dev/null
+++ b/pkgs/tools/backup/tarsnapper/remove-argparse.patch
@@ -0,0 +1,10 @@
+--- tarsnapper-0.4-src.org/setup.py	1980-01-02 00:00:00.000000000 +0000
++++ tarsnapper-0.4-src/setup.py	2017-07-16 10:54:36.596499451 +0100
+@@ -45,6 +45,6 @@
+       url='http://github.com/miracle2k/tarsnapper',
+       license='BSD',
+       packages=['tarsnapper'],
+-      install_requires = ['argparse>=1.1', 'pyyaml>=3.09', 'python-dateutil>=2.4.0', 'pexpect>=3.1'],
++      install_requires = ['pyyaml>=3.09', 'python-dateutil>=2.4.0', 'pexpect>=3.1'],
+       **kw
+ )
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8118bd9d98b..95ff1dc58fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4370,6 +4370,8 @@ with pkgs;
 
   tarsnap = callPackage ../tools/backup/tarsnap { };
 
+  tarsnapper = callPackage ../tools/backup/tarsnapper { };
+
   tcpcrypt = callPackage ../tools/security/tcpcrypt { };
 
   tcptraceroute = callPackage ../tools/networking/tcptraceroute { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b6d1bf82e3..d79ba6af0e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23664,26 +23664,6 @@ in {
     };
   };
 
-  tarsnapper = buildPythonPackage rec {
-    name = "tarsnapper-0.2.1";
-    disabled = isPy3k;
-
-    src = pkgs.fetchgit {
-      url = https://github.com/miracle2k/tarsnapper.git;
-      rev = "620439bca68892f2ffaba1079a34b18496cc6596";
-      sha256 = "1n2k2r9x11r1ph9jcjhlk44hsghfnl1pl3aakbx121qc5dg7b0yn";
-    };
-
-    propagatedBuildInputs = with self; [ argparse pyyaml ];
-
-    patches = [ ../development/python-modules/tarsnapper-path.patch ];
-
-    preConfigure = ''
-      substituteInPlace src/tarsnapper/script.py \
-        --replace '@NIXTARSNAPPATH@' '${pkgs.tarsnap}/bin/tarsnap'
-    '';
-  };
-
   taskcoach = buildPythonPackage rec {
     name = "TaskCoach-1.3.22";
     disabled = isPy3k;

From b57bf746a190eef648e62da1828273acc12f0d0c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 16 Jul 2017 12:42:45 +0200
Subject: [PATCH 0602/3246] ocaml-top: 1.1.3 -> 1.1.4

ocamlPackages.ocp-build: 1.99.18-beta -> 1.99.19-beta
---
 pkgs/development/tools/ocaml/ocaml-top/default.nix | 14 +++++++-------
 pkgs/development/tools/ocaml/ocp-build/default.nix |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix
index e194a77fbe8..e9331d078cf 100644
--- a/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchzip, ncurses
 , ocamlPackages
-, opam }:
+, jbuilder }:
 
 stdenv.mkDerivation {
-  name = "ocaml-top-1.1.3";
+  name = "ocaml-top-1.1.4";
   src = fetchzip {
-    url = https://github.com/OCamlPro/ocaml-top/archive/1.1.3.tar.gz;
-    sha256 = "0islyinv7lwhg8hkg4xn30wwz1nv50rj0wpsis8jpimw6jdsnax3";
+    url = https://github.com/OCamlPro/ocaml-top/archive/1.1.4.tar.gz;
+    sha256 = "1lmzjmnzsg8xdz0q5nm95zclihi9z80kzsalapg0s9wq0id8qm4j";
   };
 
-  buildInputs = [ ncurses opam ]
+  buildInputs = [ ncurses jbuilder ]
   ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]);
 
   configurePhase = ''
@@ -17,9 +17,9 @@ stdenv.mkDerivation {
     ocp-build -init
   '';
 
-  buildPhase = "ocp-build ocaml-top";
+  buildPhase = "jbuilder build";
 
-  installPhase = "opam-installer --prefix=$out";
+  inherit (jbuilder) installPhase;
 
   meta = {
     homepage = http://www.typerex.org/ocaml-top.html;
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 931e6989aa1..2a9a634d0a4 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }:
 let
-  version = "1.99.18-beta";
+  version = "1.99.19-beta";
 in
 buildOcaml {
 
@@ -11,7 +11,7 @@ buildOcaml {
     owner = "OCamlPro";
     repo = "ocp-build";
     rev = version;
-    sha256 = "14vzam8p1d2c5qxljrhsfppd8a3j9lxx8kzxlplwclkr2laar0ss";
+    sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj";
   };
 
   buildInputs = [ ocaml ];

From 4d30116c9efdd2a08dc06b229e768c33225bb368 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sun, 16 Jul 2017 13:41:35 +0200
Subject: [PATCH 0603/3246] bashSnippets: init at 1.12.0 (#27408)

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

diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix
new file mode 100644
index 00000000000..542450080fe
--- /dev/null
+++ b/pkgs/applications/misc/bashSnippets/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper
+, curl, netcat, mpv, python, bind, iproute, bc, gitMinimal }:
+let
+  version = "1.12.0";
+  deps = lib.makeBinPath [
+    curl
+    mpv
+    python
+    bind.dnsutils
+    iproute
+    bc
+    gitMinimal
+  ];
+in
+stdenv.mkDerivation {
+  name = "bashSnippets-${version}";
+
+  src = fetchFromGitHub {
+    owner = "alexanderepstein";
+    repo = "Bash-Snippets";
+    rev = "v${version}";
+    sha256 = "0kx2a8z3jbmmardw9z8fpghbw5mrbz4knb3wdihq35iarcbrddrg";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  patchPhase = ''
+    patchShebangs install.sh
+    substituteInPlace install.sh --replace /usr/local "$out"
+  '';
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p "$out"/bin "$out"/man/man1
+    ./install.sh all
+    for file in "$out"/bin/*; do
+      wrapProgram "$file" --prefix PATH : "${deps}"
+    done
+  '';
+
+  meta = with lib; {
+    description = "A collection of small bash scripts for heavy terminal users";
+    homepage = https://github.com/alexanderepstein/Bash-Snippets;
+    license = licenses.mit;
+    maintainers = with maintainers; [ infinisil ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8118bd9d98b..9ed13a1739f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13399,6 +13399,8 @@ with pkgs;
     libgpod = pkgs.libgpod.override { monoSupport = true; };
   };
 
+  bashSnippets = callPackage ../applications/misc/bashSnippets { };
+
   batik = callPackage ../applications/graphics/batik { };
 
   batti = callPackage ../applications/misc/batti { };

From 96b4ed637b25bd3d4a3d64872b186f22dc210fca Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Sun, 16 Jul 2017 05:08:48 -0700
Subject: [PATCH 0604/3246] factorio: 0.15.26 -> 0.15.30 (#27421)

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

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 1d52cf845d9..5c24c3ec807 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de
 
 with stdenv.lib;
 let
-  version = if releaseType != "demo" then "0.15.26" else "0.15.25";
+  version = if releaseType != "demo" then "0.15.30" else "0.15.25";
 
   arch = if stdenv.system == "x86_64-linux" then {
     inUrl = "linux64";
@@ -26,8 +26,8 @@ let
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
     name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
     x64 = {
-      headless =           fetchurl { inherit name url; sha256 = "1nblfff1m5wgp177l508y94n61lga3palhzw4frp2vd98sdp7gqk"; };
-      alpha    = authenticatedFetch { inherit name url; sha256 = "0g7k58h15q4n9wxf96rx72w340xpdbj8k1faaxixrfrfx8bnmsls"; };
+      headless =           fetchurl { inherit name url; sha256 = "0nmr73i9acnqgphfmsps7f8jlw0f2gyal9l8pldlp4rk0cjgvszy"; };
+      alpha    = authenticatedFetch { inherit name url; sha256 = "1ydh44na2lbvdv4anrblym7d6wxwapfbwap40n3722llrsad0zsz"; };
       demo     =           fetchurl { inherit name url; sha256 = "1qz6g8mf221ic663zk92l6rs77ggfydaw2d8g2s7wy0j9097qbsl"; };
     };
     i386 = {

From 00335098a5cde0b221db83e555019a251d3d40f9 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 24 Jun 2016 13:41:12 +0000
Subject: [PATCH 0605/3246] oraclejdk8: armv7l support

---
 .../compilers/oraclejdk/jdk-linux-base.nix    | 55 +++++++++++++------
 .../compilers/oraclejdk/jdk8cpu-linux.nix     |  1 +
 .../compilers/oraclejdk/jdk8psu-linux.nix     |  1 +
 pkgs/top-level/all-packages.nix               |  7 ++-
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 196544a6476..08fd724f773 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -3,6 +3,7 @@
 , downloadUrl
 , sha256_i686
 , sha256_x86_64
+, sha256_armv7l
 , jceName
 , jceDownloadUrl
 , sha256JCE
@@ -34,10 +35,13 @@
 , setJavaClassPath
 }:
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+assert stdenv.system == "i686-linux"
+    || stdenv.system == "x86_64-linux"
+    || stdenv.system == "armv7l-linux";
 assert swingSupport -> xorg != null;
 
 let
+  abortArch = abort "jdk requires i686-linux, x86_64-linux, or armv7l-linux";
 
   /**
    * The JRE libraries are in directories that depend on the CPU.
@@ -47,8 +51,10 @@ let
       "i386"
     else if stdenv.system == "x86_64-linux" then
       "amd64"
+    else if stdenv.system == "armv7l-linux" then
+      "arm"
     else
-      abort "jdk requires i686-linux or x86_64 linux";
+      abortArch;
 
   jce =
     if installjce then
@@ -59,6 +65,14 @@ let
       }
     else
       "";
+
+  rSubPaths = [
+    "lib/${architecture}/jli"
+    "lib/${architecture}/server"
+    "lib/${architecture}/xawt"
+    "lib/${architecture}"
+  ];
+
 in
 
 let result = stdenv.mkDerivation rec {
@@ -78,8 +92,14 @@ let result = stdenv.mkDerivation rec {
         url = downloadUrl;
         sha256 = sha256_x86_64;
       }
+    else if stdenv.system == "armv7l-linux" then
+      requireFile {
+        name = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz";
+        url = downloadUrl;
+        sha256 = sha256_armv7l;
+      }
     else
-      abort "jdk requires i686-linux or x86_64 linux";
+      abortArch;
 
   nativeBuildInputs = [ file ]
     ++ stdenv.lib.optional installjce unzip;
@@ -134,18 +154,6 @@ let result = stdenv.mkDerivation rec {
       cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security
     fi
 
-    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli
-    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server
-    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt
-    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}
-
-    # set all the dynamic linkers
-    find $out -type f -perm -0100 \
-        -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "$rpath" {} \;
-
-    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
     if test -z "$pluginSupport"; then
       rm -f $out/bin/javaws
       if test -n "$installjdk"; then
@@ -163,11 +171,22 @@ let result = stdenv.mkDerivation rec {
     cat <<EOF >> $out/nix-support/setup-hook
     if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
     EOF
+  '';
+
+  postFixup = ''
+    rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
+
+    # set all the dynamic linkers
+    find $out -type f -perm -0100 \
+        -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "$rpath" {} \;
+
+    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
 
     # Oracle Java Mission Control needs to know where libgtk-x11 and related is
-    if test -n "$installjdk"; then
+    if test -n "$installjdk" -a -x $out/bin/jmc; then
       wrapProgram "$out/bin/jmc" \
-          --suffix-each LD_LIBRARY_PATH ':' "${rpath}"
+          --suffix-each LD_LIBRARY_PATH ':' "$rpath"
     fi
   '';
 
@@ -192,7 +211,7 @@ let result = stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     license = licenses.unfree;
-    platforms = [ "i686-linux" "x86_64-linux" ]; # some inherit jre.meta.platforms
+    platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" ]; # some inherit jre.meta.platforms
   };
 
 }; in result
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 8e93f76ff18..1c761d58603 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -4,6 +4,7 @@ import ./jdk-linux-base.nix {
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
   sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80";
   sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2";
+  sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
   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 8e93f76ff18..1c761d58603 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -4,6 +4,7 @@ import ./jdk-linux-base.nix {
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
   sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80";
   sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2";
+  sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8118bd9d98b..8d0f32a4493 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5619,8 +5619,8 @@ with pkgs;
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk7.jre // { outputs = [ "jre" ]; }));
 
-  jdk8 = openjdk8 // { outputs = [ "out" ]; };
-  jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
+  jdk8 = if stdenv.isArm then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
+  jre8 = if stdenv.isArm then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk8.jre // { outputs = [ "jre" ]; }));
   jre8_headless =
@@ -5653,7 +5653,8 @@ with pkgs;
 
   supportsJDK =
     system == "i686-linux" ||
-    system == "x86_64-linux";
+    system == "x86_64-linux" ||
+    system == "armv7l-linux";
 
   jdkdistro = oraclejdk8distro;
 

From 0d06192c4f5f82637aee54395cabb7d01153a63d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 16 Jul 2017 07:42:48 -0500
Subject: [PATCH 0606/3246] breeze-icons: generate icon cache

Fixes #21345 by generating the icon cache when the theme is installed.
---
 .../development/libraries/kde-frameworks/breeze-icons.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
index 9e4a40b22ab..c8382ed3408 100644
--- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
@@ -1,9 +1,13 @@
-{ mkDerivation, lib, extra-cmake-modules, qtsvg }:
+{ mkDerivation, lib, extra-cmake-modules, gtk3, qtsvg }:
 
 mkDerivation {
   name = "breeze-icons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules gtk3 ];
   buildInputs = [ qtsvg ];
   outputs = [ "out" ]; # only runtime outputs
+  postInstall = ''
+    gtk-update-icon-cache "''${out:?}/share/icons/breeze"
+    gtk-update-icon-cache "''${out:?}/share/icons/breeze-dark"
+  '';
 }

From 9953a798fba84a558a3dd9c5b013c95698108e1f Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Sun, 16 Jul 2017 06:09:57 -0700
Subject: [PATCH 0607/3246] factorio: authenticatedFetch now handles 404
 properly

---
 pkgs/games/factorio/fetch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/factorio/fetch.sh b/pkgs/games/factorio/fetch.sh
index 30d9c9fdefe..312dc9b6d61 100644
--- a/pkgs/games/factorio/fetch.sh
+++ b/pkgs/games/factorio/fetch.sh
@@ -33,7 +33,7 @@ $curl --data-urlencode csrf_token="$csrf" \
 
 if grep -q 'Location: https://' headers; then
     # Now download. We need --insecure for this, but the sha256 should cover us.
-    $curl --insecure --location $url > $out
+    $curl --insecure --location --fail $url > $out || { echo "Login succeeded, but subsequent fetch failed."; exit 1; }
     set +x
 else
     set +x

From ce6fe1a61be52e6cb6d0d0f11ec917d31a93a7b7 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Sun, 2 Jul 2017 18:58:31 +0100
Subject: [PATCH 0608/3246] bitlbee: Add optional libpurple dependency

---
 .../instant-messengers/bitlbee/default.nix       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 5ee93bd4df5..abb0a117297 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,4 +1,5 @@
-{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
+{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python,
+enableLibPurple ? false, pidgin ? null }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -11,20 +12,25 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check;
 
-  buildInputs = [ gnutls glib libotr python ];
+  buildInputs = [ gnutls glib libotr python ]
+    ++ optional enableLibPurple pidgin;
+
+  preConfigure = optionalString enableLibPurple
+    "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${pidgin}/lib/pkgconfig";
 
   configureFlags = [
     "--gcov=1"
     "--otr=1"
     "--ssl=gnutls"
     "--pidfile=/var/lib/bitlbee/bitlbee.pid"
-  ];
+  ]
+  ++ optional enableLibPurple "--purple=1";
 
-  buildPhase = ''
+  buildPhase = optionalString (!enableLibPurple) ''
     make install-dev
   '';
 
-  doCheck = true;
+  doCheck = !enableLibPurple; # Checks fail with libpurple for some reason
 
   meta = {
     description = "IRC instant messaging gateway";

From 65e38b7c52976007a2bed5d6b971073cdb9f5bbd Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Sun, 2 Jul 2017 19:06:44 +0100
Subject: [PATCH 0609/3246] bitlbee service: Add option to load libpurple
 plugins into bitlbee

---
 nixos/modules/services/networking/bitlbee.nix | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index e72ea20ccce..bd26804788f 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -7,6 +7,10 @@ let
   cfg = config.services.bitlbee;
   bitlbeeUid = config.ids.uids.bitlbee;
 
+  bitlbeePkg = if cfg.libpurple_plugins == []
+  then pkgs.bitlbee
+  else pkgs.bitlbee.override { enableLibPurple = true; };
+
   bitlbeeConfig = pkgs.writeText "bitlbee.conf"
     ''
     [settings]
@@ -25,6 +29,12 @@ let
     ${cfg.extraDefaults}
     '';
 
+  purple_plugin_path =
+    lib.concatMapStringsSep ":"
+      (plugin: "${plugin}/lib/pidgin/")
+      cfg.libpurple_plugins
+    ;
+
 in
 
 {
@@ -90,6 +100,15 @@ in
         '';
       };
 
+      libpurple_plugins = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        example = literalExample "[ pkgs.purple-matrix ]";
+        description = ''
+          The list of libpurple plugins to install.
+        '';
+      };
+
       configDir = mkOption {
         default = "/var/lib/bitlbee";
         type = types.path;
@@ -144,14 +163,16 @@ in
       };
 
     systemd.services.bitlbee =
-      { description = "BitlBee IRC to other chat networks gateway";
+      {
+        environment.PURPLE_PLUGIN_PATH = purple_plugin_path;
+        description = "BitlBee IRC to other chat networks gateway";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         serviceConfig.User = "bitlbee";
-        serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
+        serviceConfig.ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
       };
 
-    environment.systemPackages = [ pkgs.bitlbee ];
+    environment.systemPackages = [ bitlbeePkg ];
 
   };
 

From 9ce8aadf5a6ff34452fef81774b3bae2ccbaa2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urban=20=C5=A0kudnik?= <urban.skudnik@gmail.com>
Date: Sun, 16 Jul 2017 13:46:43 +0200
Subject: [PATCH 0610/3246] jetbrains.idea-ultimate: 2017.1.4 -> 2017.1.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 99a1837f9f2..4dfdbf6f2d6 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -304,12 +304,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2017.1.4";
+    version = "2017.1.5";
     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}-no-jdk.tar.gz";
-      sha256 = "0byrsbsscpzb0syamzpavny879src5dlclnissa7173rh8hgkna4";
+      sha256 = "0gjj2g9fcrbbbp3v4clg0kj48qdw0gqcn9im4h8p3z2zscpg16ag";
     };
     wmClass = "jetbrains-idea";
     update-channel = "IDEA_Release";

From 141706567ca148cf2d5bab484b20a78877a5bee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 16 Jul 2017 16:41:58 +0200
Subject: [PATCH 0611/3246] jetbrains.idea-community: 2017.1.4 -> 2017.1.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 4dfdbf6f2d6..6939475bf5e 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -265,12 +265,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2017.1.4";
+    version = "2017.1.5"; /* updated by script */
     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 = "1w1knq969dl8rxlkhr9mw8cr2vszn384acwhspimrd3zs9825r45";
+      sha256 = "830c662c517e8d0131dc2df150d6f75adb3d8becaf9de96393730b0f4ae6ccf0"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";

From 37daf755d9e3dbfd71c0dd692e95f07df98385fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 16 Jul 2017 16:42:32 +0200
Subject: [PATCH 0612/3246] jetbrains.pycharm-{community,professional}:
 2017.1.4 -> 2017.1.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 6939475bf5e..cb17462ab42 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -343,12 +343,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2017.1.4"; /* updated by script */
+    version = "2017.1.5"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1e69ab29215a9c8c4626de6727df433ae0d9f6ed46eba2a6f48ffa52c2b04256"; /* updated by script */
+      sha256 = "1a0bbf0d881527e08aad7a5adaa3ad44e8754c3eb2c3a8ed5ab113491549679b"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm_Release";
@@ -356,12 +356,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2017.1.4"; /* updated by script */
+    version = "2017.1.5"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "bbae5602b9cf6d26ccce9e1bf8b388d79c27cf89673d1a56f248bf0a50e518ed"; /* updated by script */
+      sha256 = "52519dfd0e913b5ccb8767155cd4d1fd413967d5010e8474cdc9a1fa688016ce"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm_Release";

From 0c78b20194b5f2a7a82323a8fb7f25970fd46ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 16 Jul 2017 16:43:08 +0200
Subject: [PATCH 0613/3246] jetbrains.ruby-mine: 2017.1.4 -> 2017.1.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index cb17462ab42..8a80b516a70 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -382,12 +382,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2017.1.4";
+    version = "2017.1.5"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "06jk0anlnc4gr240i51kam47shdjgda6zg3hglk5w3bpvbyix68z";
+      sha256 = "198eb3d7914529ce3a6857e038167e194fb838c4b94242048ae45e8413458d66"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "rm2017.1";

From e6fdfbb8ddba6a0a860d7250e2ebf56e41581361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 16 Jul 2017 16:43:31 +0200
Subject: [PATCH 0614/3246] jetbrains.rider: 171.4456.575 -> 171.4456.1432

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 8a80b516a70..9bd002137c4 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -369,15 +369,15 @@ in
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "171.4456.575"; /* updated by script */
+    version = "171.4456.1432"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz";
-      sha256 = "9b7f46e9c800a091f2cdbe9fda08041729e2abc0ce57252731da659b2424707b"; /* updated by script */
+      url = "https://download.jetbrains.com/resharper/Rider-RC-${version}.tar.gz";
+      sha256 = "37bad69cdfcc4f297b2500a7bb673af7ef8f1fd45baa4eb2fa388d2c4bcb41ee"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
-    update-channel = "rider1.0EAP";
+    update-channel = "rider_2017_1_eap";
   };
 
   ruby-mine = buildRubyMine rec {

From ae26f291bcb6da0910fd3de47ff970e696f2c155 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 16 Jul 2017 17:22:45 +0200
Subject: [PATCH 0615/3246] systemd: 233 -> 234

---
 pkgs/os-specific/linux/systemd/default.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 41f9c1e3e99..7ea17855b09 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -9,14 +9,14 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  version = "233";
+  version = "234";
   name = "systemd-${version}";
 
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "systemd";
-    rev = "72782e7ad96f9da9b0e5873f87a64007068cee06";
-    sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rjr1lbh4nkl5mcwpa";
+    rev = "ba777535a890c2a2b7677dfacc63e12c578b9b3f";
+    sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rja1lbh4nkl5mcwpa";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];
@@ -99,8 +99,6 @@ stdenv.mkDerivation rec {
         --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
 
       configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
-
-      #export NIX_CFLAGS_LINK+=" -Wl,-rpath,$libudev/lib"
     '';
 
   PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
@@ -166,16 +164,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  /*
-  # some libs fail to link to liblzma and/or libffi
-  postFixup = let extraLibs = stdenv.lib.makeLibraryPath [ xz.out libffi.out zlib.out ];
-    in ''
-      for f in "$out"/lib/*.so.0.*; do
-        patchelf --set-rpath `patchelf --print-rpath "$f"`':${extraLibs}' "$f"
-      done
-    '';
-  */
-
   # The interface version prevents NixOS from switching to an
   # incompatible systemd at runtime.  (Switching across reboots is
   # fine, of course.)  It should be increased whenever systemd changes

From c2cf696430055498467dd9deec59939e8d52a43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Jul 2017 18:28:02 +0100
Subject: [PATCH 0616/3246] nixos/agetty: override upstream default

Since systemd 234 we keep default value for ExecStart in the upstream service file.
Therefor we need to override it in our module.
---
 nixos/modules/services/ttys/agetty.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 051d54e932f..f8dd75ea2c4 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -68,14 +68,19 @@ in
     services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixosLabel} (\m) - \l >>>'';
 
     systemd.services."getty@" =
-      { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM";
+      { serviceConfig.ExecStart = [
+          "" # override upstream default with an empty ExecStart
+          (gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM")
+        ];
         restartIfChanged = false;
       };
 
     systemd.services."serial-getty@" =
-      { serviceConfig.ExecStart =
-          let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
-          in gettyCmd "%I ${speeds} $TERM";
+      let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed); in
+      { serviceConfig.ExecStart = [
+          "" # override upstream default with an empty ExecStart
+          (gettyCmd "%I ${speeds} $TERM")
+        ];
         restartIfChanged = false;
       };
 

From 5d29744f4dc2c8d62fc5a99f896aa96ea440874d Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 16 Jul 2017 18:53:14 +0200
Subject: [PATCH 0617/3246] mopidy-iris: 3.0.3 -> 3.0.5

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

diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index d2ba955f9fb..a39c6327763 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-iris-${version}";
-  version = "3.0.3";
+  version = "3.0.5";
 
   src = pythonPackages.fetchPypi {
     inherit version;
     pname = "Mopidy-Iris";
-    sha256 = "1j8zrkvgs2f6jcqf1sn79afiirk5plfrkychlzcwqrxix293ngjr";
+    sha256 = "0rabpzmiis13z4qz3vqlsfc9xjkwracafckahnq2cq97qawyq9y9";
   };
 
   propagatedBuildInputs = [

From b6188438607bbb817d17db31b061870379a8faf6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 16 Jul 2017 18:57:38 +0200
Subject: [PATCH 0618/3246] nixos/taskserver: Fix manual PKI management

The helper tool had a very early check whether the automatically created
CA key/cert are available and thus it would abort if the key was
unavailable even though we don't need or even want to have the CA key.

Unfortunately our NixOS test didn't catch this, because it was just
switching from a configuration with an automatically created CA to a
manual configuration without deleting the generated keys and certs.

This is done now in the tests and it's also fixed in the helper tool.

Reported-by: @jpotier
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/misc/taskserver/helper-tool.py | 2 ++
 nixos/tests/taskserver.nix                            | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py
index b97bc1df74f..22a3d8d5311 100644
--- a/nixos/modules/services/misc/taskserver/helper-tool.py
+++ b/nixos/modules/services/misc/taskserver/helper-tool.py
@@ -448,6 +448,8 @@ def cli(ctx):
     """
     Manage Taskserver users and certificates
     """
+    if not IS_AUTO_CONFIG:
+        return
     for path in (CA_KEY, CA_CERT, CRL_FILE):
         if not os.path.exists(path):
             msg = "CA setup not done or incomplete, missing file {}."
diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix
index cdccb11d888..75be97a507d 100644
--- a/nixos/tests/taskserver.nix
+++ b/nixos/tests/taskserver.nix
@@ -246,6 +246,10 @@ in {
     };
 
     subtest "check manual configuration", sub {
+      # Remove the keys from automatic CA creation, to make sure the new
+      # generation doesn't use keys from before.
+      $server->succeed('rm -rf ${cfg.dataDir}/keys/* >&2');
+
       $server->succeed('${switchToNewServer} >&2');
       $server->waitForUnit("taskserver.service");
       $server->waitForOpenPort(${portStr});

From dce958ac396e88c09d5b19c284f41eef68f54ce7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 16 Jul 2017 11:39:40 -0500
Subject: [PATCH 0619/3246] buildenv: read propagated-user-env-packages
 line-by-line

Since 3cb745d5a69018829ac15f7d5a508135f6bda123, the format of
propagated-user-env-packages has changed and propagated packages have not been
included by buildenv, including in the system environment.

The buildenv builder is modified to read propagated-user-env-packages
line-by-line, instead of expecting all packages on one line.
---
 pkgs/build-support/buildenv/builder.pl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 678f5a3fe9e..7cc37d15673 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -141,12 +141,11 @@ sub addPkg {
     my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
     if (-e $propagatedFN) {
         open PROP, "<$propagatedFN" or die;
-        my $propagated = <PROP>;
-        close PROP;
-        my @propagated = split ' ', $propagated;
-        foreach my $p (@propagated) {
+        while (my $p = <PROP>) {
+            chomp $p;
             $postponed{$p} = 1 unless defined $done{$p};
         }
+        close PROP;
     }
 }
 

From 75fde4130d4caa08561be31cb8e6058fcf71fb07 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 30 Jun 2017 00:03:21 +0200
Subject: [PATCH 0620/3246] scyther: init at 1.1.3

---
 .../science/programming/scyther/default.nix   | 82 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 84 insertions(+)
 create mode 100644 pkgs/applications/science/programming/scyther/default.nix

diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix
new file mode 100644
index 00000000000..6e009067e4e
--- /dev/null
+++ b/pkgs/applications/science/programming/scyther/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, lib, fetchFromGitHub, glibc, flex, bison, python27Packages, graphviz, cmake
+, includeGUI ? true
+, includeProtocols ? true
+}:
+let
+  version = "1.1.3";
+in
+stdenv.mkDerivation {
+  name = "scyther-${version}";
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    sha256 = "0rb4ha5bnjxnwj4f3hciq7kyj96fhw14hqbwl5kr9cdw8q62mx0h";
+    owner = "cascremers";
+    repo = "scyther";
+  };
+
+  buildInputs = [
+    cmake
+    glibc.static
+    flex
+    bison
+  ] ++ lib.optional includeGUI [
+    python27Packages.wrapPython
+  ];
+
+  patchPhase = ''
+    # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work
+    printf "%s\n" "#define TAGVERSION \"${version}\"" > src/version.h
+  '' + lib.optionalString includeGUI ''
+    file=gui/Scyther/Scyther.py
+    
+    # By default the scyther binary is looked for in the directory of the python script ($out/gui), but we want to have it look where our cli package is
+    substituteInPlace $file --replace "return getMyDir()" "return \"$out/bin\""
+
+    # Removes the Shebang from the file, as this would be wrapped wrongly
+    sed -i -e "1d" $file
+  '';
+
+  configurePhase = ''
+    (cd src && cmakeConfigurePhase)
+  '';
+
+  propagatedBuildInputs = lib.optional includeGUI [
+    python27Packages.wxPython
+    graphviz
+  ];
+  
+  dontUseCmakeBuildDir = true;
+  cmakeFlags = [ "-DCMAKE_C_FLAGS=-std=gnu89" ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp src/scyther-linux "$out/bin/scyther-cli"
+  '' + lib.optionalString includeGUI ''
+    mkdir -p "$out/gui"
+    cp -r gui/* "$out/gui"
+    ln -s ../gui/scyther-gui.py "$out/bin/scyther-gui"
+    ln -s ../bin/scyther-cli "$out/bin/scyther-linux"
+  '' + lib.optionalString includeProtocols (if includeGUI then ''
+      ln -s ./gui/Protocols "$out/protocols"
+    '' else ''
+      mkdir -p "$out/protocols"
+      cp -r gui/Protocols/* "$out/protocols"
+    '');
+
+  postFixup = lib.optionalString includeGUI ''
+    wrapPythonProgramsIn "$out/gui" "$out $pythonPath"
+  '';
+
+  doInstallCheck = includeGUI;
+  installCheckPhase = ''
+    "$out/gui/scyther.py" "$src/gui/Protocols/Demo/ns3.spdl"
+  '';
+
+  meta = with lib; {
+    description = "Scyther is a tool for the automatic verification of security protocols.";
+    homepage = https://www.cs.ox.ac.uk/people/cas.cremers/scyther/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ infinisil ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 593fb7d3a36..9c52320c83e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17852,6 +17852,8 @@ with pkgs;
 
   plm = callPackage ../applications/science/programming/plm { };
 
+  scyther = callPackage_i686 ../applications/science/programming/scyther { };
+
   ### SCIENCE/LOGIC
 
   abc-verifier = callPackage ../applications/science/logic/abc {};

From f74a1e6bcb982ad423075bba28fa888f78dfa152 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Sun, 16 Jul 2017 18:12:17 +0200
Subject: [PATCH 0621/3246] Keybase updates

keybase: 1.0.20 -> 1.0.22
keybase-gui: 1.0.23-20170519175207.d6c5e9e -> 1.0.25-20170714172717.73f9070
kbfs: 20170209.d1db463 -> 20170429.44efa06
---
 pkgs/tools/security/kbfs/default.nix        | 8 ++++----
 pkgs/tools/security/keybase-gui/default.nix | 9 +++++----
 pkgs/tools/security/keybase/default.nix     | 6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix
index e502c296a50..28c6caae6c3 100644
--- a/pkgs/tools/security/kbfs/default.nix
+++ b/pkgs/tools/security/kbfs/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kbfs-${version}";
-  version = "20170209.d1db463";
+  version = "20170429.44efa06";
 
   goPackagePath = "github.com/keybase/kbfs";
   subPackages = [ "kbfsfuse" ];
@@ -12,8 +12,8 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "keybase";
     repo = "kbfs";
-    rev = "d1db46315d9271f21ca2700a84ca19767e638296";
-    sha256 = "12i2m370r27mmn37s55krdkhr5k8kpl3x8y3gzg7w5zn2wiw8i1g";
+    rev = "44efa0682d931d8489f5e84542e8d00baeb12592";
+    sha256 = "1q6hklyr6zq3xr1azz1c6rlpsjc036f222cd20vf79m58dn906n5";
   };
 
   buildFlags = [ "-tags production" ];
@@ -22,6 +22,6 @@ buildGoPackage rec {
     homepage = https://www.keybase.io;
     description = "The Keybase FS FUSE driver";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ bennofs ];
+    maintainers = with maintainers; [ bennofs np ];
   };
 }
diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix
index 636b955ddfc..a45a6ea2a04 100644
--- a/pkgs/tools/security/keybase-gui/default.nix
+++ b/pkgs/tools/security/keybase-gui/default.nix
@@ -22,7 +22,7 @@ let
     pango
     systemd
     xorg.libX11
-    xorg.libXScrnSaver
+    xorg.libxcb
     xorg.libXcomposite
     xorg.libXcursor
     xorg.libXdamage
@@ -31,15 +31,16 @@ let
     xorg.libXi
     xorg.libXrandr
     xorg.libXrender
+    xorg.libXScrnSaver
     xorg.libXtst
   ];
 in
 stdenv.mkDerivation rec {
   name = "keybase-gui-${version}";
-  version = "1.0.23-20170519175207.d6c5e9e";
+  version = "1.0.25-20170714172717.73f9070";
   src = fetchurl {
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb";
-    sha256 = "14nylwpd64ngx1kdb4pk2laghslx9872fb2a9jgkbgbgnan5nkmm";
+    sha256 = "0yrq18rrc30f7ymajvd71r29z1by7h6abyaxx2gmrg648qgc6zv4";
   };
   phases = ["unpackPhase" "installPhase" "fixupPhase"];
   unpackPhase = ''
@@ -86,6 +87,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.keybase.io/;
     description = "The Keybase official GUI.";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ puffnfresh ];
+    maintainers = with maintainers; [ puffnfresh np ];
   };
 }
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 5d212c0b80f..e4fa484b08e 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "keybase-${version}";
-  version = "1.0.20";
+  version = "1.0.22";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/keybase" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner  = "keybase";
     repo   = "client";
     rev    = "v${version}";
-    sha256 = "1418x2z1j4bzq29qab8pmqrvg8piycqcabdjmq2inkvlll3s5n3v";
+    sha256 = "1642d11gjgkdklppmm1j3vwc2r3qg9qqw5x07jnqs819i57mr47f";
   };
 
   buildFlags = [ "-tags production" ];
@@ -22,6 +22,6 @@ buildGoPackage rec {
     homepage = https://www.keybase.io/;
     description = "The Keybase official command-line utility and service.";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ carlsverre ];
+    maintainers = with maintainers; [ carlsverre np ];
   };
 }

From c226ee619aa0dd573a0045f6b0b5437d662433b4 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Sun, 16 Jul 2017 22:30:34 +0100
Subject: [PATCH 0622/3246] tt-rss: 16.3 -> 17.4

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

diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index d42656cf0f6..2cc0cac8a60 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "tt-rss-${version}";
-  version = "16.3";
+  version = "17.4";
 
   src = fetchgit {
-    url = "https://tt-rss.org/gitlab/fox/tt-rss.git";
+    url = "https://git.tt-rss.org/git/tt-rss.git";
     rev = "refs/tags/${version}";
-    sha256 = "1584lcq6kcy9f8ik5djb9apck9hxvfpl54sn6yhl3pdfrfdj3nw5";
+    sha256 = "07ng21n4pva56cxnxkzd6vzs381zn67psqpm51ym5wnl644jqh08";
   };
 
   buildPhases = ["unpackPhase" "installPhase"];

From 870375e19d1ec3ad69de7eb1c73c6c80cc214108 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 17 Jul 2017 00:38:10 +0000
Subject: [PATCH 0623/3246] all-hardware.nix: add VMware support. (#27430)

NixOS does not boot in VMware guest without these modules
---
 nixos/modules/profiles/all-hardware.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 530b2fbffd1..6e6ae98e19f 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -41,6 +41,9 @@
 
       # Virtio (QEMU, KVM etc.) support.
       "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
+      
+      # VMware support.
+      "mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock"
 
       # Hyper-V support.
       "hv_storvsc"

From e4eea75fa79aa6f32e8e200fa318ca9d54a86d8c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Jul 2017 04:48:43 +0200
Subject: [PATCH 0624/3246] zfs: 0.6.5.10 -> 0.6.5.11

---
 pkgs/os-specific/linux/spl/default.nix | 4 ++--
 pkgs/os-specific/linux/zfs/default.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 26cc8ea7c71..2f9f971194a 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -62,8 +62,8 @@ in
   assert buildKernel -> kernel != null;
   {
     splStable = common {
-      version = "0.6.5.10";
-      sha256 = "1zdxggpdz9j0lpcqfnkvf4iym7mp2k246sg1s4frqaw1pwwcw9vi";
+      version = "0.6.5.11";
+      sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5";
     };
     splUnstable = common {
       version = "0.7.0-rc4";
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 50f4e6f2b41..dd9bc713bdc 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -123,12 +123,12 @@ in
     # to be adapted
     zfsStable = common {
       # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = null;
+      incompatibleKernelVersion = "4.12";
 
-      version = "0.6.5.10";
+      version = "0.6.5.11";
 
       # this package should point to the latest release.
-      sha256 = "04gn5fj22z17zq2nazxwl3j9dr33l79clha6ipxvdz241bhjqrk3";
+      sha256 = "1wqz43cjr21m3f52ahcikl2798pbzj5sfy16zqxwiqpv7iy09kr3";
       extraPatches = [
         (fetchpatch {
           url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";

From 7f0994c33d125c481b8efb52df51fe5f97dff597 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 14 Jul 2017 00:48:36 +0200
Subject: [PATCH 0625/3246] zfsUnstable: 0.7.0-rc4 -> 0.7.0-rc5

---
 pkgs/os-specific/linux/spl/default.nix | 4 ++--
 pkgs/os-specific/linux/zfs/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 2f9f971194a..941bd8a8671 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -66,7 +66,7 @@ in
       sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5";
     };
     splUnstable = common {
-      version = "0.7.0-rc4";
-      sha256 = "13r5qwrdnaabqfy9fvizvdj4n4cvfv6zy4jh0vijzjvbjd4an9g1";
+      version = "0.7.0-rc5";
+      sha256 = "17y25g02c9swi3n90lhjvazcnsr69nh50dz3b8g1c08zlz9n2akp";
     };
   }
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index dd9bc713bdc..414f2ba444a 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -141,10 +141,10 @@ in
       # comment/uncomment if breaking kernel versions are known
       incompatibleKernelVersion = "4.12";
 
-      version = "0.7.0-rc4";
+      version = "0.7.0-rc5";
 
       # this package should point to a version / git revision compatible with the latest kernel release
-      sha256 = "16jiq2h7m2ljg5xv7m5lqmsszzclkhvj1iq1wa9w740la4vl22kf";
+      sha256 = "1k0fl6lbi5winri58v26k7gngd560hbj0247rnwcbc6j01ixsr5n";
       extraPatches = [
         (fetchpatch {
           url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";

From 77a0b04f911a105534a8f6329b2c62474eaff89c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 14 Jul 2017 01:29:17 +0200
Subject: [PATCH 0626/3246] darktable: 2.2.4 -> 2.2.5

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 68ab287f1a6..8c1db9c039e 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.4";
+  version = "2.2.5";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "1n7rddkxwcifc3kcdlnar9w562xv4h78fqkkn27jihqzp3b4am5x";
+    sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3";
   };
 
   buildInputs =

From c2e9f45df2387c4b809793c77639ec209b53efb9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 14 Jul 2017 01:29:33 +0200
Subject: [PATCH 0627/3246] exiv2: 0.25 -> 0.26

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

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index a11be14df10..a1a07b43197 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, zlib, expat, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "exiv2-0.25";
+  name = "exiv2-0.26";
 
   src = fetchurl {
-    url = "http://www.exiv2.org/${name}.tar.gz";
-    sha256 = "197g6vgcpyf9p2cwn5p5hb1r714xsk1v4p96f5pv1z8mi9vzq2y8";
+    url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz";
+    sha256 = "1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7";
   };
   postPatch = "patchShebangs ./src/svn_version.sh";
 

From 6bcc20361f5a5cd4a54ecadd7343d5e319a92569 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 14 Jul 2017 20:46:00 -0400
Subject: [PATCH 0628/3246] herwig: 7.0.4 -> 7.1.1, thepeg: 2.0.3 -> 2.1.1

---
 .../libraries/physics/herwig/default.nix       | 18 ++++--------------
 .../libraries/physics/thepeg/default.nix       |  4 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index 737565d298e..407be5c5e4a 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -2,31 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "herwig-${version}";
-  version = "7.0.4";
+  version = "7.1.1";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
-    sha256 = "1vac5y5cyyn1z1ii1a6x1ysx2znxmfq9a51gxqib0i19mrn5y9p6";
+    sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j";
   };
 
-  patches = [
-    # Otherwise it causes an error
-    # lib/Herwig/HwMatchboxScales.so: undefined symbol: _Z8renScaleSt6vectorIN6ThePEG14Lorentz5VectorIdEESaIS2_EES4_S4_
-    (fetchpatch {
-      url = "https://herwig.hepforge.org/hg/herwig/rev/fe543583fa02?style=raw";
-      sha256 = "1y6a9q93wicw3c73xni74w5k25vidgcr60ffi2b2ymhb390jas83";
-    })
-  ];
-
   nativeBuildInputs = [ autoconf automake libtool ];
 
   buildInputs = [ boost fastjet gfortran gsl thepeg zlib ]
     # There is a bug that requires for MMHT PDF's to be presend during the build
     ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]);
 
-  preConfigure = ''
-    # needed for the patch above
-    autoreconf -i
+  postPatch = ''
+    patchShebangs ./cat_with_cpplines
   '';
 
   configureFlags = [
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 1216c34cdb8..7989eb518c7 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "thepeg-${version}";
-  version = "2.0.3";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
-    sha256 = "0d26linwv92iq23n4gx154jvyd0lz5vg41kf4nxa01nspy7scyy5";
+    sha256 = "1082n4q036sah5r4asyl3hpcyc05cymg40dnk3jsdjgv2v0vvc71";
   };
 
   buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];

From 3d505a1acd66f22d644919b87e95b91752aef41b Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sun, 16 Jul 2017 20:16:01 -0700
Subject: [PATCH 0629/3246] lftp: 4.7.7 -> 4.8.0

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

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index ae62195342f..67181d8aec3 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "lftp-${version}";
-  version = "4.7.7";
+  version = "4.8.0";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "104jvzmvbmblfg8n8ffrnrrg8za5l25n53lbkawwy5x3m4h1yi7y";
+    sha256 = "0z2432zxzg808swi72yak9kia976qrjj030grk0v4p54mcib3s34";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 8e98811f76fa29e8a3782e9b0b0acc6d16926cac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 17 Jul 2017 10:06:14 +0200
Subject: [PATCH 0630/3246] python36: 3.6.1 -> 3.6.2

---
 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 d2d922ce495..bca717b919b 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -27,7 +27,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.6";
-  minorVersion = "1";
+  minorVersion = "2";
   minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "0ha03sbakxblzyvlramx5fj0ranzmzx4pa2png6nn8gczkfi0650";
+    sha256 = "1ab4vlpdax1ihpiyiwchlgsk36apl4kgdw271wvl9l8ywhxpfacj";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

From 4c0e86ba678438b341b7b3b72769d4e80d338b49 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 16 Jul 2017 22:43:13 -0400
Subject: [PATCH 0631/3246] fastnlo: 2.3.1pre-2212 -> 2.3.1pre-2402

---
 .../libraries/physics/fastnlo/default.nix          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index e07583fccb5..e568e159797 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, boost, lhapdf, root, yoda }:
+{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
 
 stdenv.mkDerivation rec {
   name = "fastnlo_toolkit-${version}";
-  version = "2.3.1pre-2212";
+  version = "2.3.1pre-2402";
 
   src = fetchurl {
     url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz";
-    sha256 = "0xgnnwc002awvz6dhn7792jc8kdff843yjgvwmgcs60yvcj6blgp";
+    sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";
   };
 
-  buildInputs = [ boost lhapdf root yoda ];
+  buildInputs = [ boost fastjet gfortran gfortran.cc.lib lhapdf python2 root yoda ];
+  propagatedBuildInputs = [ zlib ];
 
-  CXXFLAGS="-std=c++11"; # for yoda
+  preConfigure = ''
+    substituteInPlace ./fastnlotoolkit/Makefile.in \
+      --replace "-fext-numeric-literals" ""
+  '';
 
   configureFlags = [
     "--with-yoda=${yoda}"

From c0cf19608faf447d4b78f77ff36a770462b19a22 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 16 Jun 2017 15:52:46 +0200
Subject: [PATCH 0632/3246] aspellWithDicts: create derivation with aspell and
 selected dictionaries

Currently, `aspell` checks the active profiles for dictionaries. While
this may be convenient, it does not work with `nix-shell` and it doesn't
allow any isolation.

This commit adds the possibility to use composition by creating a
derivation with `symlinkJoin` that contains all the chosen dictionaries,
and another derivation that wraps the executables linking to the dictionaries.

Nix example:

my_aspell = aspellWithDicts(ps: with ps; [ en nl ])

`nix-shell` example:

nix-shell -p 'aspellWithDicts(ps: with ps; [ en nl ])'
---
 .../libraries/aspell/aspell-with-dicts.nix    | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/aspell/aspell-with-dicts.nix

diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix
new file mode 100644
index 00000000000..eb96070f4fd
--- /dev/null
+++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix
@@ -0,0 +1,35 @@
+# Create a derivation that contains aspell and selected dictionaries.
+# Composition is done using `pkgs.buildEnv`.
+
+{ aspell
+, aspellDicts
+, makeWrapper
+, symlinkJoin
+, runCommand
+}:
+
+f:
+
+let
+  # Dictionaries we want
+  dicts = f aspellDicts;
+
+  # A tree containing the dictionaries
+  dictEnv = symlinkJoin {
+    name = "aspell-dicts";
+    paths = dicts;
+  };
+
+in runCommand "aspell-env" {
+  buildInputs = [ makeWrapper ];
+} ''
+  # Construct wrappers in /bin
+  mkdir -p $out/bin
+  pushd "${aspell}/bin"
+  for prg in *; do
+    if [ -f "$prg" ]; then
+      makeWrapper "${aspell}/bin/$prg" "$out/bin/$prg" --set ASPELL_CONF "data-dir ${dictEnv}/lib/aspell"
+    fi
+  done
+  popd
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d09b8893b4..149f99504a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7393,6 +7393,8 @@ with pkgs;
 
   aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {});
 
+  aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix { };
+
   attica = callPackage ../development/libraries/attica { };
 
   attr = callPackage ../development/libraries/attr { };

From d2aa638ee2b6f9771cf63f90dbc04a3eb3ecc384 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 17 Jul 2017 10:34:57 +0200
Subject: [PATCH 0633/3246] update-python-libraries script: don't forget to
 break when we actually find an update

---
 maintainers/scripts/update-python-libraries | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index d06dee15099..7c73510c353 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -91,6 +91,7 @@ def _get_latest_version_pypi(package, extension):
         if release['filename'].endswith(extension):
             # TODO: In case of wheel we need to do further checks!
             sha256 = release['digests']['sha256']
+            break
     else:
         sha256 = None
     return version, sha256

From ff22d73d2e58e6e79c3be4e73723064d522d3c72 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 17 Jul 2017 11:24:10 +0200
Subject: [PATCH 0634/3246] solvespace: Fix path in desktop entry file

---
 pkgs/applications/graphics/solvespace/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index a55b19dc5b6..9026fc5d7cb 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
+  postInstall = ''
+    substituteInPlace $out/share/applications/solvespace.desktop \
+      --replace /usr/bin/ $out/bin/ \
+  '';
+
   meta = {
     description = "A parametric 3d CAD program";
     license = stdenv.lib.licenses.gpl3;

From 8669fb1f96cfd68ed68d9d76ff1f0237d4d96748 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Fri, 14 Jul 2017 11:47:15 +0100
Subject: [PATCH 0635/3246] tinc service: BindToAddress and ListenAddress are
 different options, they should not be mistaken

---
 nixos/doc/manual/release-notes/rl-1709.xml | 10 ++++++++++
 nixos/modules/services/networking/tinc.nix | 13 +++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 3ae2d260c99..72dfd60bedd 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -120,6 +120,16 @@ rmdir /var/lib/ipfs/.ipfs
       also serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>services.tinc.networks.&lt;name&gt;.listenAddress</literal>
+      option had a misleading name that did not correspond to its behavior. It
+      now correctly defines the ip to listen for incoming connections on. To
+      keep the previous behaviour, use
+      <literal>services.tinc.networks.&lt;name&gt;.bindToAddress</literal>
+      instead. Refer to the description of the options for more details.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 79a0aa953fe..7376d2d24a0 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -79,7 +79,15 @@ in
               default = null;
               type = types.nullOr types.str;
               description = ''
-                The ip adress to bind to.
+                The ip address to listen on for incoming connections.
+              '';
+            };
+
+            bindToAddress = mkOption {
+              default = null;
+              type = types.nullOr types.str;
+              description = ''
+                The ip address to bind to (both listen on and send packets from).
               '';
             };
 
@@ -131,7 +139,8 @@ in
               Name = ${if data.name == null then "$HOST" else data.name}
               DeviceType = ${data.interfaceType}
               ${optionalString (data.ed25519PrivateKeyFile != null) "Ed25519PrivateKeyFile = ${data.ed25519PrivateKeyFile}"}
-              ${optionalString (data.listenAddress != null) "BindToAddress = ${data.listenAddress}"}
+              ${optionalString (data.listenAddress != null) "ListenAddress = ${data.listenAddress}"}
+              ${optionalString (data.bindToAddress != null) "BindToAddress = ${data.bindToAddress}"}
               Device = /dev/net/tun
               Interface = tinc.${network}
               ${data.extraConfig}

From 67d02cd60a29212700e051833bf72702a27bde5a Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 1 Jul 2017 22:47:14 -0400
Subject: [PATCH 0636/3246] cnijfilter: init at 2.80

this driver reads support files from lib/bjlib as well as lib/cups,
which is why the path in cupsd.nix is tweaked
---
 nixos/modules/services/printing/cupsd.nix     |   2 +-
 .../cups/drivers/cnijfilter_2_80/default.nix  | 109 ++++++++++++++++++
 .../cnijfilter_2_80/patches/libpng15.patch    |  23 ++++
 .../patches/missing-include.patch             |  20 ++++
 pkgs/top-level/all-packages.nix               |   3 +
 5 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
 create mode 100644 pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch
 create mode 100644 pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 7ce2ae38fb3..c5dea1a3e61 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -37,7 +37,7 @@ let
       [ cups.out additionalBackends cups-filters pkgs.ghostscript ]
       ++ optional cfg.gutenprint gutenprint
       ++ cfg.drivers;
-    pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ];
+    pathsToLink = [ "/lib" "/share/cups" "/bin" ];
     postBuild = cfg.bindirCmds;
     ignoreCollisions = true;
   };
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
new file mode 100644
index 00000000000..0a0f5e3782f
--- /dev/null
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
@@ -0,0 +1,109 @@
+{ stdenv, lib, fetchzip,
+  autoconf, automake, libtool,
+  cups, popt, libtiff, libpng,
+  ghostscript }:
+
+/* this derivation is basically just a transcription of the rpm .spec
+   file included in the tarball */
+
+stdenv.mkDerivation rec {
+  name = "cnijfilter-${version}";
+
+  /* important note about versions: cnijfilter packages seem to use
+     versions in a non-standard way.  the version indicates which
+     printers are supported in the package.  so this package should
+     not be "upgraded" in the usual way.
+
+     instead, if you want to include another version supporting your
+     printer, you should try to abstract out the common things (which
+     should be pretty much everything except the version and the 'pr'
+     and 'pr_id' values to loop over). */
+  version = "2.80";
+
+  src = fetchzip {
+    url = "http://gdlp01.c-wss.com/gds/1/0100000841/01/cnijfilter-common-2.80-1.tar.gz";
+    sha256 = "06s9nl155yxmx56056y22kz1p5b2sb5fhr3gf4ddlczjkd1xch53";
+  };
+
+  buildInputs = [ autoconf libtool automake
+                  cups popt libtiff libpng
+                  ghostscript ];
+
+  patches = [ ./patches/missing-include.patch
+              ./patches/libpng15.patch ];
+
+  postPatch = ''
+    sed -i "s|/usr/lib/cups/backend|$out/lib/cups/backend|" backend/src/Makefile.am;
+    sed -i "s|/usr|$out|" backend/src/cnij_backend_common.c;
+    sed -i "s|/usr/bin|${ghostscript}/bin|" pstocanonij/filter/pstocanonij.c;
+    sed -i "s|/usr/local|$out|" libs/bjexec/bjexec.c;
+  '';
+
+  configurePhase = ''
+    cd libs
+    ./autogen.sh --prefix=$out;
+
+    cd ../cngpij
+    ./autogen.sh --prefix=$out --enable-progpath=$out/bin;
+
+    cd ../pstocanonij
+    ./autogen.sh --prefix=$out --enable-progpath=$out/bin;
+
+    cd ../backend
+    ./autogen.sh --prefix=$out;
+    cd ..;
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin $out/lib/cups/filter $out/share/cups/model;
+  '';
+
+  postInstall = ''
+    for pr in mp140 mp210 ip3500 mp520 ip4500 mp610; do
+      cd ppd;
+      ./autogen.sh --prefix=$out --program-suffix=$pr
+      make clean;
+      make;
+      make install;
+
+      cd ../cnijfilter;
+      ./autogen.sh --prefix=$out --program-suffix=$pr --enable-libpath=/var/lib/cups/path/lib/bjlib --enable-binpath=$out/bin;
+      make clean;
+      make;
+      make install;
+
+      cd ..;
+    done;
+
+    mkdir -p $out/lib/bjlib;
+    for pr_id in 315 316 319 328 326 327; do
+      install -c -m 755 $pr_id/database/* $out/lib/bjlib;
+      install -c -s -m 755 $pr_id/libs_bin/*.so.* $out/lib;
+    done;
+
+    pushd $out/lib;
+    for so_file in *.so.*; do
+      ln -s $so_file ''${so_file/.so.*/}.so;
+      patchelf --set-rpath $out/lib $so_file;
+    done;
+    popd;
+  '';
+
+  /* the tarball includes some pre-built shared libraries.  we run
+     'patchelf --set-rpath' on them just a few lines above, so that
+     they can find each other.  but that's not quite enough.  some of
+     those libraries load each other in non-standard ways -- they
+     don't list each other in the DT_NEEDED section.  so, if the
+     standard 'patchelf --shrink-rpath' (from
+     pkgs/development/tools/misc/patchelf/setup-hook.sh) is run on
+     them, it undoes the --set-rpath.  this prevents that. */
+  dontPatchELF = true;
+
+  meta = with lib; {
+    description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series.  (MP520 drivers also work for MX700.)";
+    homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jerith666 ];
+  };
+}
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch
new file mode 100644
index 00000000000..f5b3a1b13db
--- /dev/null
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch
@@ -0,0 +1,23 @@
+diff -aur cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c
+--- cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c	2009-03-26 06:11:05.000000000 +0100
++++ cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c	2012-02-10 09:33:52.512334139 +0100
+@@ -1520,8 +1520,8 @@
+ 	short			tmpformat;
+ 	short			retbyte = 0;
+ 	short			bpp = 3;
+-	long			width = 0;
+-	long			length = 0;
++	png_uint_32		width = 0;
++	png_uint_32		length = 0;
+ 	long			rstep = 0;
+ 	long			RasterLength = 0;
+ 	long			i;
+@@ -1574,7 +1574,7 @@
+ 		goto onErr;
+ 	}
+ 
+-	if (setjmp (png_p->jmpbuf))
++	if (setjmp (png_jmpbuf(png_p)))
+ 	{
+ 		png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
+ 		goto onErr;
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch
new file mode 100644
index 00000000000..20c2d756d1e
--- /dev/null
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch
@@ -0,0 +1,20 @@
+--- a/backend/src/cnij_backend_common.c	2008-09-01 10:05:44.000000000 +0200
++++ b/backend/src/cnij_backend_common.c	2012-05-06 17:38:40.000000000 +0200
+@@ -39,6 +39,7 @@
+ // CUPS Header
+ #include <cups/cups.h>
+ #include <cups/ipp.h>
++#include <cups/ppd.h>
+ 
+ // Header file for CANON
+ #include "cnij_backend_common.h"
+--- a/cngpijmon/src/bjcupsmon_cups.c	2008-09-02 12:28:24.000000000 +0200
++++ b/cngpijmon/src/bjcupsmon_cups.c	2012-05-06 17:39:20.000000000 +0200
+@@ -21,6 +21,7 @@
+ /*** Includes ***/
+ #include <cups/cups.h>
+ #include <cups/language.h>
++#include <cups/ppd.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <pwd.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c87ab0a1c4e..9f65d993ab1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18255,6 +18255,9 @@ with pkgs;
 
   cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
 
+  # this driver ships with pre-compiled 32-bit binary libraries
+  cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { };
+
   cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 {
     libusb = libusb1;
   };

From 957e653b41786d982b7bb994be64058c7a6ebd5c Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Sat, 1 Jul 2017 09:45:49 -0400
Subject: [PATCH 0637/3246] draftsight: 2017-SP1 -> 2017-SP2

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

diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index a1cf91989eb..17334c5b366 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -6,7 +6,7 @@
 
 assert stdenv.system == "x86_64-linux";
 
-let version = "2017-SP1"; in
+let version = "2017-SP2"; in
 stdenv.mkDerivation {
   name = "draftsight-${version}";
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
   src = requireFile {
     name = "draftSight.deb";
     url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0";
-    sha256 = "0s7b74685r0961kd59hxpdp9s5yhvzx8307imsxm66f99s8rswdv";
+    sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr";
   };
 
   libPath = stdenv.lib.makeLibraryPath [ gcc.cc mesa xdg_utils

From ca0f2d8ce7c1c9e816930b8a46243eddf288d939 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 17 Jul 2017 10:51:59 +0200
Subject: [PATCH 0638/3246] python.pkgs.numpy: 1.12.1 -> 1.13.1

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

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index d427a33f80f..965dda8c43a 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "numpy";
-  version = "1.12.1";
+  version = "1.13.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numpy/numpy-${version}.zip";
-    sha256 = "a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542";
+    sha256 = "c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb";
   };
 
   disabled = isPyPy;

From c2df8a28eec869c0f6cf10811f8d3bbc65b6dfc0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 17 Jul 2017 10:52:41 +0200
Subject: [PATCH 0639/3246] python.pkgs.scipy: 0.19.0 -> 0.19.1

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

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index a7428f134a7..ed4e205a2ae 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "scipy";
-  version = "0.19.0";
+  version = "0.19.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://pypi/s/scipy/scipy-${version}.zip";
-    sha256 = "4190d34bf9a09626cd42100bbb12e3d96b2daf1a8a3244e991263eb693732122";
+    url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
+    sha256 = "a19a2ca7a7336495ec180adeaa0dfdcf41e96dbbee90d51c3ed828ba570884e6";
   };
 
   buildInputs = [ gfortran nose numpy.blas ];

From ac3cae1191eaf34a1ef846dc20070ab0e28db796 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 17 Jul 2017 10:52:59 +0200
Subject: [PATCH 0640/3246] python.pkgs.pandas: 0.20.2 -> 0.20.3

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index ee75d211ad8..e9297676eaf 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -27,12 +27,12 @@ let
   inherit (stdenv) isDarwin;
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.20.2";
+  version = "0.20.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "92173c976fcca70cb19a958eccdacf98af62ef7301bf786d0321cb8857cdfae6";
+    sha256 = "a777e07633d83d546c55706420179551c8e01075b53c497dcf8ae4036766bc66";
   };
 
   LC_ALL = "en_US.UTF-8";

From 0c9667efa0677aec8b6dd6896f542d7e4d4dea46 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 17 Jul 2017 10:53:24 +0200
Subject: [PATCH 0641/3246] python.pkgs.dask: 0.14.3 -> 0.15.1

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

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 6d5388a443c..740b0644381 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.14.3";
+  version = "0.15.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9bf007f9cedc08f73089f0621ff65ec0882fc0a834acef56830dfd2872908211";
+    sha256 = "f62f19ab5958b13d0ee733db18218c28a9d452a3554446a3dfb5ac3d4a5f7e34";
   };
 
   checkInputs = [ pytest ];

From 567b84dd50f9800f8563793946ca6fb99dc71777 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Sun, 16 Jul 2017 20:15:05 +0100
Subject: [PATCH 0642/3246] python.pkgs.pytorch: init at 0.1.12

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

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
new file mode 100644
index 00000000000..2088b2e0b10
--- /dev/null
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -0,0 +1,43 @@
+{ buildPythonPackage, fetchFromGitHub, lib, numpy, pyyaml, cffi, cmake,
+  git, stdenv }:
+
+buildPythonPackage rec {
+  version = "0.1.12";
+  pname = "pytorch";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pytorch";
+    repo = "pytorch";
+    rev = "v${version}";
+    sha256 = "0r8mf4xya76gz83y5z3hfxh0rydkydafhipl8g7d0bfrgw961jy9";
+  };
+
+  checkPhase = ''
+    ${stdenv.shell} test/run_test.sh
+  '';
+
+  buildInputs = [
+     cmake
+     git
+     numpy.blas
+  ];
+  
+  propagatedBuildInputs = [
+    cffi
+    numpy
+    pyyaml
+  ];
+
+  preConfigure = ''
+    export NO_CUDA=1
+  '';
+  
+  meta = {
+    description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration.";
+    homepage = http://pytorch.org/;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ teh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d79ba6af0e1..2afe071aa66 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10762,6 +10762,8 @@ in {
     };
   };
 
+  pytorch = callPackage ../development/python-modules/pytorch { };
+
   python_tvrage = buildPythonPackage (rec {
     version = "0.4.1";
     name = "tvrage-${version}";

From e0f988fc4648c308465ac60f39c364bfd3034f23 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 12 Jul 2017 12:27:15 +0200
Subject: [PATCH 0643/3246] pythonPackages.kombu: fix tests for python3.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0726bfc6f71..09cced82514 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12581,6 +12581,14 @@ in {
       sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h";
     };
 
+    # Backport fix for python-3.6 from master (see issue https://github.com/celery/kombu/issues/675)
+    # TODO remove at next update
+    patches = [ (pkgs.fetchpatch {
+      url = "https://github.com/celery/kombu/commit/dc3fceff59d79ceac3f8f11a5d697beabb4b7a7f.patch";
+      sha256 = "0s6gsihzjvmpffc7xrrcijw00r56yb74jg0sbjgng2v1324z1da9";
+      name = "don-t-modify-dict-size-while-iterating-over-it";
+    }) ];
+
     buildInputs = with self; [ pytest case pytz ];
 
     propagatedBuildInputs = with self; [ amqp ];

From 1e06824b3bb2d16718bf2a4c388c89ccbda32cda Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 12 Jul 2017 12:28:18 +0200
Subject: [PATCH 0644/3246] pythonPackages.olefile: init at 0.44

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

diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix
new file mode 100644
index 00000000000..5cf51b84132
--- /dev/null
+++ b/pkgs/development/python-modules/olefile/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "olefile";
+  version = "0.44";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "1bbk1xplmrhymqpk6rkb15sg7v9qfih7zh23p6g2fxxas06cmwk1";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python package to parse, read and write Microsoft OLE2 files";
+    homepage = https://www.decalage.info/python/olefileio;
+    # BSD like + reference to Pillow
+    license = "http://olefile.readthedocs.io/en/latest/License.html";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 09cced82514..dd41361916d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16621,6 +16621,8 @@ in {
     };
   };
 
+  olefile = callPackage ../development/python-modules/olefile { };
+
   oslo-log = buildPythonPackage rec {
     name = "oslo.log-${version}";
     version = "1.12.1";

From a8dd4d8e538fbb6fea9e2e0af14f057817d53d72 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 12 Jul 2017 12:28:55 +0200
Subject: [PATCH 0645/3246] pythonPackages.pillow: 3.4.2 -> 4.2.1

---
 .../python-modules/pillow/default.nix         | 62 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 58 +----------------
 2 files changed, 65 insertions(+), 55 deletions(-)
 create mode 100644 pkgs/development/python-modules/pillow/default.nix

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
new file mode 100644
index 00000000000..0fbb36b3c19
--- /dev/null
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy,
+  nose, olefile,
+  freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11}:
+buildPythonPackage rec {
+  pname = "Pillow";
+  version = "4.2.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wq0fiw964bj5rdmw66mhbfsjnmb13bcdr42krpk2ig5f1cgc967";
+  };
+
+  doCheck = !stdenv.isDarwin && !isPyPy;
+
+  # Disable imagefont tests, because they don't work well with infinality:
+  # https://github.com/python-pillow/Pillow/issues/1259
+  postPatch = ''
+    rm Tests/test_imagefont.py
+  '';
+
+  propagatedBuildInputs = [ olefile ];
+
+  buildInputs = [
+    freetype libjpeg zlib libtiff libwebp tcl nose lcms2 ]
+    ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ];
+
+  # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
+  preConfigure = let
+    libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"'';
+    libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"'';
+  in ''
+    sed -i "setup.py" \
+        -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ;
+            s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ;
+            s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ;
+            s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ;
+            s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ;
+            s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ;'
+    export LDFLAGS="-L${libwebp}/lib"
+    export CFLAGS="-I${libwebp}/include"
+  ''
+  # Remove impurities
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace setup.py \
+      --replace '"/Library/Frameworks",' "" \
+      --replace '"/System/Library/Frameworks"' ""
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://python-pillow.github.io/";
+    description = "Fork of The Python Imaging Library (PIL)";
+    longDescription = ''
+      The Python Imaging Library (PIL) adds image processing
+      capabilities to your Python interpreter.  This library
+      supports many file formats, and provides powerful image
+      processing and graphics capabilities.
+    '';
+    license = "http://www.pythonware.com/products/pil/license.htm";
+    maintainers = with maintainers; [ goibhniu prikhi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd41361916d..14945f72299 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17612,61 +17612,9 @@ in {
 
   pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
 
-  pillow = buildPythonPackage rec {
-    name = "Pillow-${version}";
-    version = "3.4.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/P/Pillow/${name}.tar.gz";
-      sha256 = "0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1";
-    };
-
-    doCheck = !stdenv.isDarwin && !isPyPy;
-
-    # Disable imagefont tests, because they don't work well with infinality:
-    # https://github.com/python-pillow/Pillow/issues/1259
-    postPatch = ''
-      rm Tests/test_imagefont.py
-    '';
-
-    buildInputs = with self; [
-      pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose pkgs.lcms2 ]
-      ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ];
-
-    # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
-    preConfigure = let
-      libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"'';
-      libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"'';
-    in ''
-      sed -i "setup.py" \
-          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude pkgs.freetype}|g ;
-              s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude pkgs.libjpeg}|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude pkgs.zlib}|g ;
-              s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude pkgs.lcms2}|g ;
-              s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude pkgs.libtiff}|g ;
-              s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' pkgs.tcl}|g ;'
-      export LDFLAGS="-L${pkgs.libwebp}/lib"
-      export CFLAGS="-I${pkgs.libwebp}/include"
-    ''
-    # Remove impurities
-    + stdenv.lib.optionalString stdenv.isDarwin ''
-      substituteInPlace setup.py \
-        --replace '"/Library/Frameworks",' "" \
-        --replace '"/System/Library/Frameworks"' ""
-    '';
-
-    meta = {
-      homepage = "https://python-pillow.github.io/";
-      description = "Fork of The Python Imaging Library (PIL)";
-      longDescription = ''
-        The Python Imaging Library (PIL) adds image processing
-        capabilities to your Python interpreter.  This library
-        supports many file formats, and provides powerful image
-        processing and graphics capabilities.
-      '';
-      license = "http://www.pythonware.com/products/pil/license.htm";
-      maintainers = with maintainers; [ goibhniu prikhi ];
-    };
+  pillow = callPackage ../development/python-modules/pillow {
+    inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk;
+    inherit (pkgs.xorg) libX11;
   };
 
   pkgconfig = buildPythonPackage rec {

From f7179c04747f4594416a63d499f3f3dae6c88aec Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 12 Jul 2017 12:29:59 +0200
Subject: [PATCH 0646/3246] pythonPackages.celery: fix tests for python3.6

---
 ...fix_endless_python3.6_loop_logger_isa.patch | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             |  6 ++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch

diff --git a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch
new file mode 100644
index 00000000000..27caa80dd4c
--- /dev/null
+++ b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch
@@ -0,0 +1,18 @@
+Description: Fix endless loop in logger_isa (Python 3.6)
+Author: George Psarakis <giwrgos.psarakis@gmail.com>
+Origin: upstream, https://github.com/celery/celery/commit/9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad
+Forwarded: not-needed
+Reviewed-By: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Last-Update: 2017-06-12
+
+--- celery-4.0.2.orig/celery/utils/log.py
++++ celery-4.0.2/celery/utils/log.py
+@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000):
+         else:
+             if this in seen:
+                 raise RuntimeError(
+-                    'Logger {0!r} parents recursive'.format(l),
++                    'Logger {0!r} parents recursive'.format(l.name),
+                 )
+             seen.add(this)
+             this = this.parent
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 14945f72299..39f4da0012c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3272,6 +3272,12 @@ in {
       sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3";
     };
 
+    # Fixes testsuite for python-3.6
+    # From ubuntu packaging: https://launchpad.net/ubuntu/+archive/primary/+files/celery_4.0.2-0ubuntu1.debian.tar.xz
+    # (linked from https://launchpad.net/ubuntu/+source/celery)
+    # https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream
+    patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ];
+
     buildInputs = with self; [ pytest case ];
     propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ];
 

From 9bb9d93ee77f9b9f6ab37ac0d24a60a6bc5719e5 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 12 Jul 2017 12:30:46 +0200
Subject: [PATCH 0647/3246] pythonPackages.pyparsing: 2.1.10 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
new file mode 100644
index 00000000000..f751a8bfbb2
--- /dev/null
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+    pname = "pyparsing";
+    name = "${pname}-${version}";
+    version = "2.2.0";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
+    };
+
+    # Not everything necessary to run the tests is included in the distribution
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      homepage = http://pyparsing.wikispaces.com/;
+      description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
+      license = licenses.mit;
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39f4da0012c..64253c4db6e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19293,23 +19293,7 @@ in {
     };
   };
 
-  pyparsing = buildPythonPackage rec {
-    name = "pyparsing-${version}";
-    version = "2.1.10";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyparsing/${name}.tar.gz";
-      sha256 = "811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188";
-    };
-
-    # Not everything necessary to run the tests is included in the distribution
-    doCheck = false;
-
-    meta = {
-      homepage = http://pyparsing.wikispaces.com/;
-      description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
-    };
-  };
+  pyparsing = callPackage ../development/python-modules/pyparsing { };
 
   pyparted = buildPythonPackage rec {
     name = "pyparted-${version}";

From 09d918d533697ab31500ee8610cee8b7eae1e8ab Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 12 Jul 2017 12:34:57 +0200
Subject: [PATCH 0648/3246] pythonPackages.django_raster: 0.4 -> 0.5

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

diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index 2332229100c..fbdc7282c1b 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -3,13 +3,13 @@
   pyparsing, django, celery
 }:
 buildPythonPackage rec {
-  version = "0.4";
+  version = "0.5";
   pname = "django-raster";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/django-raster/${name}.tar.gz";
-    sha256 = "7fd6afa42b07ac51a3873e3d4840325dd3a8a631fdb5b853c76fbbfe59a2b17f";
+    sha256 = "0v1jldb13s4dqq1vaq8ghfv3743jpi9a9n05bqgjm8szlkq8s7ah";
   };
 
   # Tests require a postgresql + postgis server

From 0e9676f62e293f35ea1d6495a69520c2bc65c542 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Jul 2017 15:54:19 +0200
Subject: [PATCH 0649/3246] imagemagick: 6.9.8-10 -> 6.9.9-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 39812b2cfc4..a9223749f39 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -13,8 +13,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.8-10";
-    sha256 = "040qs7nwcm84bjd9wryvd58zqfykbmn3y3qfc90lnldww7v6ihlg";
+    version = "6.9.9-0";
+    sha256 = "02xnvgjnmz2d4yv4iy1kh7an5w631p1s319jw23c8zpmqhfhk2ha";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.

From cff27d574e4ea0976bd71edf7e496cfd67176da3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Jul 2017 15:54:40 +0200
Subject: [PATCH 0650/3246] imagemagick7: 7.0.6-0 -> 7.0.6-1

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

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 5eaf488fff5..1a854a82bf0 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.6-0";
-    sha256 = "1vl9mkdp5pskl4lxd1p79ayv1k3gxpa8iz992d302qyllhm7wn1i";
+    version = "7.0.6-1";
+    sha256 = "1i3gsc0ps7cbvfmnk6fbi5hng18jwh4x4dqbz90a45x85023w9vs";
     patches = [];
   };
 in

From 8253fc2ae56e089fe086942671f9e84c431f2277 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 17 Jul 2017 10:37:52 -0400
Subject: [PATCH 0651/3246] pants: 1.2.1 -> 1.3.0

I'm also removing the pants13-pre attribute since it's unnecessary and I
don't want to maintain 1.4.x prereleases yet.

I'm temporarily taking out the pants native rust engine shenanigans until
I can get a nix-native rust build of it to work (it works on Linux but
not on Darwin!)
---
 .../tools/build-managers/pants/default.nix    | 151 +++---------------
 pkgs/top-level/all-packages.nix               |   2 +-
 pkgs/top-level/python-packages.nix            |   8 +-
 3 files changed, 32 insertions(+), 129 deletions(-)

diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 1e37a3f85e2..8ce495557e7 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -4,138 +4,37 @@ with stdenv.lib;
 with pythonPackages;
 
 let
-  # Get rid of this when pants 1.3.0 is released and make 0.5 the default
-  pathspec_0_3_4 = buildPythonApplication rec {
-    pname   = "pathspec";
-    version = "0.3.4";
-    name    = "${pname}-${version}";
+  version = "1.3.0";
+in buildPythonApplication rec {
+  inherit version;
+  pname = "pantsbuild.pants";
+  name  = "${pname}-${version}";
 
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn";
-    };
-
-    meta = {
-      description = "Utility library for gitignore-style pattern matching of file paths";
-      homepage = "https://github.com/cpburnz/python-path-specification";
-      license = licenses.mpl20;
-     maintainers = with maintainers; [ copumpkin ];
-    };
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "18fcf9047l9k006wz21g525p1w5avyjabmabh0giyz22xnm8g5gp";
   };
 
-  pants13-version = "1.3.0rc4";
-
-  # TODO: compile the rust native engine ourselves so we don't need to do this shit. We don't use
-  # fetchurl because we don't know the URL ahead of time, even though it's deterministic. So we have
-  # this downloader figure out the URL on the fly and then produce the deterministic result, so we
-  # can still be a fixed-output derivation.
-  pants13-native-engine-info = {
-    "x86_64-darwin" = { prefix = "mac/10.11";    hash = "04kfqp4fcxj7zkyb21rgp1kdrlnmayfvakpg5xips716d7pp6vc7"; };
-    "x86_64-linux"  = { prefix = "linux/x86_64"; hash = "0vgmcqxcabryxgvk4wmbclqjn56jbmsaysckgwfzhmif8pxyrfam"; };
-    "i686-linux"    = { prefix = "linux/i386";   hash = "1xgma6cwvzg1d07xq6bd3j4rpzp6wn6lz82xqprr6vflyn78qaaw"; };
-  }.${stdenv.system} or (throw "Unsupported system ${stdenv.system}!");
-
-  pants13-native-engine = runCommand "pants-native-${pants13-version}" {
-    buildInputs    = [ curl ];
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
-    outputHash     = pants13-native-engine-info.hash;
-  } ''
-    native_version=$(curl -k -L https://raw.githubusercontent.com/pantsbuild/pants/release_${pants13-version}/src/python/pants/engine/subsystem/native_engine_version)
-    curl -kLO "https://dl.bintray.com/pantsbuild/bin/build-support/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/native_engine.so"
-
-    # Ugh it tries to "download" from this prefix so let's just replicate their directory structure for now...
-    mkdir -p $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/
-
-    # These should behave the same way in Nix land and we try not to differentiate between OS revisions...
-    mkdir -p $out/bin/native-engine/mac/
-    ln -s 10.11 $out/bin/native-engine/mac/10.10
-    ln -s 10.11 $out/bin/native-engine/mac/10.12
-
-    cp native_engine.so $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/
+  prePatch = ''
+    sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
   '';
-in {
-  pants =
-    pythonPackages.buildPythonPackage rec {
-    pname   = "pantsbuild.pants";
-    version = "1.2.1";
-    name    = "${pname}-${version}";
 
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w";
-    };
+  # Unnecessary, and causes some really weird behavior around .class files, which
+  # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
+  dontStrip = true;
 
-    prePatch = ''
-      sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py
-    '';
+  propagatedBuildInputs = [
+    twitter-common-collections setproctitle setuptools six ansicolors
+    packaging pathspec scandir twitter-common-dirutil psutil requests
+    pystache pex docutils markdown pygments twitter-common-confluence
+    fasteners coverage pywatchman futures cffi
+  ];
 
-    # Unnecessary, and causes some really weird behavior around .class files, which
-    # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
-    dontStrip = true;
-
-    propagatedBuildInputs = [
-      ansicolors beautifulsoup4 cffi coverage docutils fasteners futures
-      isort lmdb markdown mock packaging pathspec_0_3_4 pep8 pex psutil pyflakes
-      pygments pystache pytestcov pytest pywatchman requests scandir
-      setproctitle setuptools six thrift wheel twitter-common-dirutil
-      twitter-common-confluence twitter-common-collections
-    ];
-
-    meta = {
-      description = "A build system for software projects in a variety of languages";
-      homepage    = "http://www.pantsbuild.org/";
-      license     = licenses.asl20;
-      maintainers = with maintainers; [ copumpkin ];
-      platforms   = platforms.unix;
-    };
-  };
-
-  pants13-pre = buildPythonApplication rec {
-    pname   = "pantsbuild.pants";
-    version = pants13-version;
-    name    = "${pname}-${version}";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "03zv3g55x056vjggwjr8lpniixcpb3kfy7xkl1bxsvjp2ih2wj6g";
-    };
-
-    prePatch = ''
-      sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
-
-      substituteInPlace src/pants/option/global_options.py \
-        --replace "'/etc/pantsrc'" "'$out/etc/pantsrc', '/etc/pantsrc'"
-    '';
-
-    # Unnecessary, and causes some really weird behavior around .class files, which
-    # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
-    dontStrip = true;
-
-    propagatedBuildInputs = [
-      twitter-common-collections setproctitle setuptools six ansicolors
-      packaging pathspec scandir twitter-common-dirutil psutil requests
-      pystache pex docutils markdown pygments twitter-common-confluence
-      fasteners coverage pywatchman futures cffi
-    ];
-
-    # Teach pants about where its native engine lives.
-    # TODO: there's probably a better way to teach it this without having it "download"
-    # from a local file: URL to its cache, but I don't know how and this seems to work.
-    postFixup = ''
-      mkdir -p $out/etc
-      cat >$out/etc/pantsrc <<EOF
-      [binaries]
-      baseurls: [ 'file://${pants13-native-engine}' ]
-      EOF
-    '';
-
-    meta = {
-      description = "A build system for software projects in a variety of languages";
-      homepage    = "http://www.pantsbuild.org/";
-      license     = licenses.asl20;
-      maintainers = with maintainers; [ copumpkin ];
-      platforms   = platforms.unix;
-    };
+  meta = {
+    description = "A build system for software projects in a variety of languages";
+    homepage    = "http://www.pantsbuild.org/";
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ copumpkin ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 149f99504a7..b6d3ae28401 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7067,7 +7067,7 @@ with pkgs;
 
   pahole = callPackage ../development/tools/misc/pahole {};
 
-  inherit (callPackages ../development/tools/build-managers/pants {}) pants pants13-pre;
+  pants = callPackage ../development/tools/build-managers/pants {};
 
   parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2afe071aa66..1dca2d77079 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8181,14 +8181,18 @@ in {
 
   pex = buildPythonPackage rec {
     name = "pex-${version}";
-    version = "1.2.2";
+    version = "1.2.7";
 
     src = self.fetchPypi {
       pname  = "pex";
-      sha256 = "1nwrf03cd6jw24lxyaalj59fdm2infr9glabznkpaq65mjzwshl3";
+      sha256 = "1m0gx9182w1dybkyjwwjyd6i87x2dzv252ks2fj8yn6avlcp5z4q";
       inherit version;
     };
 
+    prePatch = ''
+      substituteInPlace setup.py --replace 'SETUPTOOLS_REQUIREMENT,' '"setuptools"'
+    '';
+
     # A few more dependencies I don't want to handle right now...
     doCheck = false;
 

From 0edae74119d5353dea7898f245e824c52ac48513 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 1 Jul 2017 04:47:32 +0200
Subject: [PATCH 0652/3246] gst_all_1.gst-plugins-bad: allow building gtksink
 plugin

Corebird requires gtksink gstreamer plugin to play videos. [1] The plugin,
however, is only built when GTK is available.

This patch adds gtk3 as an optional dependency to gst_all_1.gst-plugins-bad
package, allowing the build of gtksink.

[1]: https://github.com/baedert/corebird/issues/431
---
 pkgs/development/libraries/gstreamer/bad/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 4efef258211..69378d95a30 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
 , faacSupport ? false, faac ? null
+, gtkSupport ? false, gtk3 ? null
 , faad2, libass, libkate, libmms
 , libmodplug, mpeg2dec, mpg123
 , openjpeg, libopus, librsvg
@@ -10,6 +11,7 @@
 }:
 
 assert faacSupport -> faac != null;
+assert gtkSupport -> gtk3 != null;
 
 let
   inherit (stdenv.lib) optional optionalString;
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gst-plugins-base orc
-    faad2 libass libkate libmms
+    faad2 gtk3 libass libkate libmms
     libmodplug mpeg2dec mpg123
     openjpeg libopus librsvg
     fluidsynth libvdpau
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
   ]
     ++ libintlOrEmpty
     ++ optional faacSupport faac
+    # for gtksink
+    ++ optional gtkSupport gtk3
     ++ optional stdenv.isLinux wayland
     # wildmidi requires apple's OpenAL
     # TODO: package apple's OpenAL, fix wildmidi, include on Darwin

From e564f16b7fc31462f9819099e99191baf703b38a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 17 Jul 2017 15:51:20 +0200
Subject: [PATCH 0653/3246] corebird: fix video playback

Corebird requires gst-plugins-bad compiled with GTK support to play
videos.

This commit enables the GTK support.
---
 pkgs/applications/networking/corebird/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 7b67ad235e3..288c800dd16 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking
-  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]);
+  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]);
 
   meta = {
     description = "Native Gtk+ Twitter client for the Linux desktop";

From ae8eff8b7b3a792236aaf3ac828e26edc0fe96ec Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 17 Jul 2017 11:03:47 -0400
Subject: [PATCH 0654/3246] lhapdf: update hash

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

diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index ed8c4daa38b..1a203172d2c 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
-    sha256 = "005jfapdj3mmk62p9qgvw7nyg93pqy249p1xy2ws1qx42xj76lih";
+    sha256 = "0gfjps7v93n0rrdndkhp22d93y892bf76pnzdhqbish0cigkkxph";
   };
 
   buildInputs = [ python2 ];

From f130ecdd304847fc7c0b182b97f1dfdc0b76a7d6 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 17 Jul 2017 11:20:47 -0400
Subject: [PATCH 0655/3246] coqPackages.compcert: Recent compcert supports
 64-bit architectures

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

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 8086a9f9749..f519776b689 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
     ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
-    (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
+    (if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux");
 
   installTargets = "documentation install";
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     mkdir -p $lib/share/doc/compcert
     mv doc/html $lib/share/doc/compcert/
     mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
-    mv backend cfrontend common cparser driver flocq x86 x86_32 lib \
+    mv backend cfrontend common cparser driver flocq x86 x86_64 lib \
       $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
   '';
 

From eb6c45bcae6a7448cbe894167b81f96a7eb5dc0e Mon Sep 17 00:00:00 2001
From: luigy <luigy@outlook.com>
Date: Fri, 14 Jul 2017 19:04:28 -0400
Subject: [PATCH 0656/3246] Fix #27448 argument list too long in fetchzip for
 darwin.

Paired with @Ericson2314
---
 pkgs/build-support/fetchzip/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 1145d32ba02..751dba56930 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -23,7 +23,6 @@ lib.overrideDerivation (fetchurl ({
   postFetch =
     ''
       export PATH=${unzip}/bin:$PATH
-      mkdir $out
 
       unpackDir="$TMPDIR/unpack"
       mkdir "$unpackDir"
@@ -32,8 +31,6 @@ lib.overrideDerivation (fetchurl ({
       renamed="$TMPDIR/${baseNameOf url}"
       mv "$downloadedFile" "$renamed"
       unpackFile "$renamed"
-
-      shopt -s dotglob
     ''
     + (if stripRoot then ''
       if [ $(ls "$unpackDir" | wc -l) != 1 ]; then
@@ -43,12 +40,11 @@ lib.overrideDerivation (fetchurl ({
       fi
       fn=$(cd "$unpackDir" && echo *)
       if [ -f "$unpackDir/$fn" ]; then
-        mv "$unpackDir/$fn" "$out"
-      else
-        mv "$unpackDir/$fn"/* "$out/"
+        mkdir $out
       fi
+      mv "$unpackDir/$fn" "$out"
     '' else ''
-      mv "$unpackDir"/* "$out/"
+      mv "$unpackDir" "$out"
     '') #*/
     + extraPostFetch;
 } // removeAttrs args [ "stripRoot" "extraPostFetch" ]))

From 960978fb682e2ec5591f310184f68bb1b0a6d662 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 12 Jul 2017 15:51:55 -0400
Subject: [PATCH 0657/3246] elpa-packages: 2017-07-17

---
 .../editors/emacs-modes/elpa-generated.nix    | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 98b8282b999..7d8d01aafd6 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -28,10 +28,10 @@
     ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
     elpaBuild {
         pname = "ada-mode";
-        version = "5.2.1";
+        version = "5.2.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ada-mode-5.2.1.tar";
-          sha256 = "099c8vm6jvwypff981vbs77y6hqq31fn6s8gwqkmncq04mk3vw34";
+          url = "https://elpa.gnu.org/packages/ada-mode-5.2.2.tar";
+          sha256 = "0c0lrj4vgsbawyshqbfb7gvndf0yb97wybqb0b34z7kan7q0xgvd";
         };
         packageRequires = [ cl-lib emacs wisi ];
         meta = {
@@ -319,14 +319,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    cobol-mode = callPackage ({ cl-lib ? null, 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 = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/cobol-mode.html";
           license = lib.licenses.free;
@@ -360,10 +361,10 @@
       }) {};
     company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "company";
-        version = "0.9.3";
+        version = "0.9.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-0.9.3.tar";
-          sha256 = "1b38najmah4s2smxslik6wbdvb0x77rm6fv45pcq5x5aaiplh5ap";
+          url = "https://elpa.gnu.org/packages/company-0.9.4.tar";
+          sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -821,10 +822,10 @@
     gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "gited";
-        version = "0.3.1";
+        version = "0.3.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gited-0.3.1.tar";
-          sha256 = "14ng63hxd6l76r8m54gzqq9j66cqz48ad1zaamn100h4b2rzf2q8";
+          url = "https://elpa.gnu.org/packages/gited-0.3.2.tar";
+          sha256 = "1y40zn1w5m2srrqffkpvvzk3j5zzq21smsqychyx2diggn4c0hgi";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1445,10 +1446,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170703";
+        version = "20170717";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170703.tar";
-          sha256 = "04rg2fldbsxizq84xl6613s8xnwyp8iwmxm167v69bc85xaf7s9s";
+          url = "https://elpa.gnu.org/packages/org-20170717.tar";
+          sha256 = "0jrkfclwlbfcdkf56awnmvyw5vb9qwbfyyf2z4ilwx29zps9mxnh";
         };
         packageRequires = [];
         meta = {
@@ -1472,10 +1473,10 @@
     other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "other-frame-window";
-        version = "1.0.3";
+        version = "1.0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/other-frame-window-1.0.3.el";
-          sha256 = "0vq1zfsdnxdjvmb7lkjyax27kfv0rw0141rd5fjnl6ap9yjwpxkv";
+          url = "https://elpa.gnu.org/packages/other-frame-window-1.0.4.el";
+          sha256 = "0hg82j8zjh0ann6bf56r0p8s0y3a016zny8byp80mcvkw63wrn5i";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1784,10 +1785,10 @@
       }) {};
     sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "sokoban";
-        version = "1.4";
+        version = "1.4.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sokoban-1.4.tar";
-          sha256 = "1yfkaw8rjris03qpj32vqhg5lfml4hz9v3adka6sw6dv4n67j9w1";
+          url = "https://elpa.gnu.org/packages/sokoban-1.4.2.tar";
+          sha256 = "0sciv7rl1p1ar1jris1py2slrd8kr4q6a4plmb0jq6lv9dlqyvc6";
         };
         packageRequires = [];
         meta = {
@@ -2130,10 +2131,10 @@
     wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "wisi";
-        version = "1.1.4";
+        version = "1.1.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wisi-1.1.4.tar";
-          sha256 = "1n0bq77vspbxpzs54r0rigb2fhj5a5vm8qxwgdnqdawanmq72l4r";
+          url = "https://elpa.gnu.org/packages/wisi-1.1.5.tar";
+          sha256 = "1q0dbykh9gvh0355vc1lwpriwlqq07jaydqx8zdrs6s0zyffx3a4";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {

From 5a48826ea432edf9bd725864dfda81591d99acd0 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 12 Jul 2017 15:52:10 -0400
Subject: [PATCH 0658/3246] org-packages: 2017-07-17

---
 .../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 82bd5ea0c52..29b793825c4 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 = "20170703";
+        version = "20170717";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170703.tar";
-          sha256 = "0l590ygknlbz3r0w9zzljwqn8vasz5w82wsivi9bi60lf0d0hx58";
+          url = "http://orgmode.org/elpa/org-20170717.tar";
+          sha256 = "1cbk01awnyan1jap184v2bxsk97k0p2qn19z7gnid6wiblybgs89";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170703";
+        version = "20170717";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170703.tar";
-          sha256 = "0l7hsz6rbq1zw6wdlm3ryxb60md44rvx0waii98hww89zpdi0gmw";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170717.tar";
+          sha256 = "0710ba6gq04cg8d87b5wi7bz9gq9yqvqmkmgscawfm2ynfw2q8sa";
         };
         packageRequires = [];
         meta = {

From b8213ab38f11c3a78ca314d7a4be703f76a33636 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 12 Jul 2017 15:53:26 -0400
Subject: [PATCH 0659/3246] melpa-stable-packages: 2017-07-17

---
 .../emacs-modes/melpa-stable-generated.nix    | 501 ++++++++++++++----
 1 file changed, 408 insertions(+), 93 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 6e1cc04a2f6..8f1bf8ff38d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1178,12 +1178,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "2.6.4";
+        version = "3.1.1";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "7134b7467a7061b57c8cda3503e9644d4ed92a2a";
-          sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x";
+          rev = "bb69345ead914345faad582723a2b61618f13289";
+          sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1606,12 +1606,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "0.4.3";
+        version = "0.5.4";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "c4629201a63047f9094be0d9150f201dd5be18ad";
-          sha256 = "0fr4brysc7sk89jp1ggl68r3r6ikrhipb2h5kc1b2a8vz7i05bq9";
+          rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43";
+          sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -1648,12 +1648,12 @@
     apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apache-mode";
-        version = "2.0";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "apache-mode";
-          rev = "7e79a6602da77b5c3a11dab93d46fef26abc860d";
-          sha256 = "0i4kmw0qbnnfbfih7iwfpihv5d6kh1l9k2b062dvc5mx1vvlr8k8";
+          rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
+          sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
@@ -1750,6 +1750,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apropospriate-theme";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "apropospriate-theme";
+          rev = "0d918da74a7a225fe5a586e26f5d834e579c5323";
+          sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
+          sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
+          name = "apropospriate-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/apropospriate-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "artbollocks-mode";
@@ -2173,12 +2194,12 @@
     auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-minor-mode";
-        version = "20170620";
+        version = "20170716";
         src = fetchFromGitHub {
           owner = "joewreschnig";
           repo = "auto-minor-mode";
-          rev = "c91c566cbaf8eac1fff0c7d9eef88308a566cc43";
-          sha256 = "0nq95k2wmq17awjz0kvzwnhpnda0813gdyjzlqpzpqb56092sbif";
+          rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2";
+          sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
@@ -2662,12 +2683,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "1.1.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "9c6ad190ecc71373f6ac7485c924f1ef3dce6fc4";
-          sha256 = "05z23amn1s1692y3wzwmbzpnm5m6qskq53aqp47wiyyxn3dq2kdj";
+          rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd";
+          sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -3468,8 +3489,8 @@
           sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw";
-          sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw";
+          sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4";
           name = "calfw";
         };
         packageRequires = [];
@@ -3478,6 +3499,90 @@
           license = lib.licenses.free;
         };
       }) {};
+    calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw-cal";
+        version = "1.6";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
+          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal";
+          sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m";
+          name = "calfw-cal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/calfw-cal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw-howm";
+        version = "1.6";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
+          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm";
+          sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0";
+          name = "calfw-howm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/calfw-howm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw-ical";
+        version = "1.6";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
+          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical";
+          sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q";
+          name = "calfw-ical";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/calfw-ical";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw-org";
+        version = "1.6";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
+          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org";
+          sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5";
+          name = "calfw-org";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/calfw-org";
+          license = lib.licenses.free;
+        };
+      }) {};
     camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "camcorder";
@@ -4501,12 +4606,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.9.0pre5";
+        version = "3.9.0pre6";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "372de3f8039f69b3a2edcf7120083ec4097f8bd3";
-          sha256 = "0yvh65b2fz4fpd2rx0q1c3gcidika5zx3nrm2rp4v6z69n2xgd13";
+          rev = "25b72e9097260d1faf254155a1199886c808a58f";
+          sha256 = "0rzy8fpagsqfln1x27mq89dh819jc8h2dlf7axmxq63g830c029q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4753,12 +4858,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "0.9.3";
+        version = "0.9.4";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb";
-          sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i";
+          rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56";
+          sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -5869,6 +5974,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
+    melpaBuild {
+        pname = "csound-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "hlolli";
+          repo = "csound-mode";
+          rev = "b0e74f149a15118e8d85bf073b2ff5e0dd3cba7f";
+          sha256 = "0c73xjhqgp1f7bplm47cgpssm8kpj3vda9n0fqcyq5i38ncfqwva";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
+          sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
+          name = "csound-mode";
+        };
+        packageRequires = [ emacs multi shut-up ];
+        meta = {
+          homepage = "https://melpa.org/#/csound-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csv";
@@ -6040,12 +6166,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "0.26alpha0";
+        version = "0.26pre1";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "5528995cc6d138456be9b9d42a422a3c5de7800a";
-          sha256 = "1fd3335f2ay24nhicncmy1sz0mcdrminphsv630wkifmykarz9zh";
+          rev = "85a2dfe76a2bc28d4c8c1a760ef04e614f61be73";
+          sha256 = "0gcdwzw952kddvxxgzsj93rqlvh2gs8bghz605zgm97baadvrizy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -7428,6 +7554,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dtrt-indent";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "jscheid";
+          repo = "dtrt-indent";
+          rev = "a54871bedadabede505b3913ee1039f5ab36cad2";
+          sha256 = "0ylch7q8lh2r10qzrb41bnrpnznvj5fjszazmxfcvj6ss8yrxjzi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
+          sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
+          name = "dtrt-indent";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/dtrt-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
     ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ducpel";
@@ -7661,12 +7808,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "0.9.9";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62";
-          sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis";
+          rev = "226fa5c661391c7f8317a24c9f757396e1900371";
+          sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -7787,12 +7934,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "2.11.3";
+        version = "2.11.6";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "ee28c043492a550c68ca2f465042cd51ef150b9e";
-          sha256 = "0jzw313hn7srr9mhwygl56iibx0wxra4php6pk9isbl338cw3gv0";
+          rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6";
+          sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -8436,12 +8583,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "2.1.1";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
-          sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
+          rev = "79077efc34aad25bb43cf46a28a69a308196c972";
+          sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -8457,12 +8604,12 @@
     elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "elfeed-web";
-        version = "2.1.1";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
-          sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
+          rev = "79077efc34aad25bb43cf46a28a69a308196c972";
+          sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -8800,12 +8947,12 @@
     elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elx";
-        version = "1.0.1";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "elx";
-          rev = "84c9cd5721be9594de743330e7abcec092d2838c";
-          sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4";
+          rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d";
+          sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx";
@@ -9746,8 +9893,8 @@
           sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
-          sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
+          sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y";
           name = "es-mode";
         };
         packageRequires = [ cl-lib dash spark ];
@@ -9798,6 +9945,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esh-help";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "esh-help";
+          rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695";
+          sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
+          sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
+          name = "esh-help";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "https://melpa.org/#/esh-help";
+          license = lib.licenses.free;
+        };
+      }) {};
     eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-autojump";
@@ -10187,8 +10355,8 @@
           sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
-          sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
+          sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39";
           name = "evil";
         };
         packageRequires = [ goto-chg undo-tree ];
@@ -10431,12 +10599,12 @@
     evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-matchit";
-        version = "2.2.1";
+        version = "2.2.2";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb";
-          sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl";
+          rev = "0b0e6d61a6462fc6fff7000b739ce5b31acd0d4c";
+          sha256 = "13qxsbvmi0dkzmf59j0xyjwwcspyhymm6swsagqy4b57ypis5hxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -11018,12 +11186,12 @@
     exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "1.6.4";
+        version = "1.7.2";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "6e6c4c3ce5f65c71ba08565edbec2dfb0cf64e0c";
-          sha256 = "1r6d6sb9ylfqidcbrr7f75m68s1cpm220pnb4hl0qv5n6hr8h5gi";
+          rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5";
+          sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -14304,6 +14472,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gl-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gl-conf-mode";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "llloret";
+          repo = "gitolite-emacs";
+          rev = "1a53e548277eb9c669bbeda4bee9be32be7a82ec";
+          sha256 = "059m30vvp71y630pcam6qfv5bxc35ygj26wcg28p56pccxxyj3q9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode";
+          sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm";
+          name = "gl-conf-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/gl-conf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "glab";
@@ -14790,12 +14979,12 @@
     google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "google-translate";
-        version = "0.11.13";
+        version = "0.11.14";
         src = fetchFromGitHub {
           owner = "atykhonov";
           repo = "google-translate";
-          rev = "c859592c3fda01594b270e388414a79373b5587b";
-          sha256 = "1arwq4nld3capjj2b3ask1pwy89fz25f550fb7cnhiv5rhqr51iw";
+          rev = "486c63bbfa0338589589f628703c38112035a5b2";
+          sha256 = "08b4lxnwy9iqxacbjjljybvvdkl9g2dy6vga6hw7h7h32qra8w2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate";
@@ -15345,12 +15534,12 @@
     gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gscholar-bibtex";
-        version = "0.3.1";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "gscholar-bibtex";
-          rev = "00b32521de3aa689bc58516ae10ba7f3ef1b6c92";
-          sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
+          rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b";
+          sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
@@ -15827,12 +16016,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.8.0";
+        version = "2.8.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d";
-          sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil";
+          rev = "c695a697461a48840f567bd5339909d4a80fa99f";
+          sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -16163,12 +16352,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.8.0";
+        version = "2.8.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d";
-          sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil";
+          rev = "c695a697461a48840f567bd5339909d4a80fa99f";
+          sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -16244,6 +16433,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-directory";
+        version = "0.6.4";
+        src = fetchFromGitHub {
+          owner = "masasam";
+          repo = "emacs-helm-directory";
+          rev = "2c6d45404506ba744888dcdb65e9f63878f2da16";
+          sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory";
+          sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n";
+          name = "helm-directory";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-directory";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dired-history";
@@ -17276,12 +17486,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "0.5.3";
+        version = "0.5.4";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "89a7564edc6b23ffba52b02353528b9b6285c729";
-          sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1";
+          rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1";
+          sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -19141,6 +19351,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    inverse-acme-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inverse-acme-theme";
+        version = "1.12.0";
+        src = fetchFromGitHub {
+          owner = "dcjohnson";
+          repo = "inverse-acme-theme";
+          rev = "e57f494fd94e49321a6396f530b8a13bae8b57df";
+          sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme";
+          sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5";
+          name = "inverse-acme-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/inverse-acme-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iplayer";
@@ -23740,12 +23971,12 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.11";
+        version = "1.11.12";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "026f4f9ae881d9196422981f1f85fa3137525014";
-          sha256 = "016c0ghqw7wmgdk47biqc0i4bav2igd5ayh6wr9bygrik81n126z";
+          rev = "04e071a5e4cdf7f5396a0e36874e0a023b7af232";
+          sha256 = "1hzp70sm4bwlbqnd7mmzan10wsgb03a1zfiqmwxnc61jgjxd5jva";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -23884,11 +24115,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.24.2";
+        version = "0.25pre0";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "2e86a4da55c29e0751d950839cdcbe40234ca8ba";
-          sha256 = "1g75k365cdl0670bs38bvf391hsiv7rwxbmwz53x03fyz4gl58by";
+          rev = "952a0f0cda7d1a12432d1c9ad71b41401cb1615c";
+          sha256 = "1mj3946sg2lxamcz16jkys88scx1fyhky3amwxnl5iszd15lhvxz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -24027,6 +24258,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "numbers";
+        version = "1.4";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "numbers.el";
+          rev = "74be68b94143f042ce461b2a69202f515acaf20c";
+          sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers";
+          sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h";
+          name = "numbers";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/numbers";
+          license = lib.licenses.free;
+        };
+      }) {};
     nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "nvm";
@@ -24517,8 +24769,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35";
-          sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5";
+          rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
+          sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -26547,12 +26799,12 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "1.6";
+        version = "1.7";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "b4c3bd9130044c4e106bac5ba73a50822865e258";
-          sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16";
+          rev = "2ccf4f68fa4d2aab7efbdc26ebdc45ac1ef1819c";
+          sha256 = "11b8c0qihgkl46hjqx6g1p1ifd7lc3q7jhqds3gr41zsrnlyi3p8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -29713,7 +29965,7 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "0.1.2";
+        version = "0.1.4";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
@@ -30004,6 +30256,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rufo";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "danielma";
+          repo = "rufo.el";
+          rev = "4e7413fafd0320f30190ae9835ab021cf7a9ebdc";
+          sha256 = "10gwr479q4kd6ndp9r2nzj7rzap21q3f0l3icrviah9l5xzdx2x0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo";
+          sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239";
+          name = "rufo";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/rufo";
+          license = lib.licenses.free;
+        };
+      }) {};
     runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "runner";
@@ -30992,12 +31265,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "0.0.7";
+        version = "0.0.8";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "3adbfe7c03d509538a6e43bafda27ea290298a14";
-          sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k";
+          rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2";
+          sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -31202,12 +31475,12 @@
     skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "skewer-mode";
-        version = "1.6.2";
+        version = "1.7.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "skewer-mode";
-          rev = "8a3a22ef4fe4d9d0831e82fde08c6355d0b19ed4";
-          sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv";
+          rev = "51f3bbeafea6701de78190a395f6376a9974f1e5";
+          sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
@@ -31958,12 +32231,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "1.3.3";
+        version = "1.3.5";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350";
-          sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2";
+          rev = "255e89303bb706b42057504e72caeb2764f3d413";
+          sha256 = "0y3gv664crng4vibbh0pfh9w0ys9m5gny2b1mrqb7ma6xa78xiv2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -32795,12 +33068,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "2.2.4";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a";
-          sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl";
+          rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9";
+          sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -34029,6 +34302,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "try";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "larstvei";
+          repo = "Try";
+          rev = "271b0a362cadf44d0694628b9e213f54516ef913";
+          sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try";
+          sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
+          name = "try";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/try";
+          license = lib.licenses.free;
+        };
+      }) {};
     tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }:
     melpaBuild {
         pname = "tss";
@@ -34323,6 +34617,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "underline-with-char";
+        version = "3.0.0";
+        src = fetchFromGitHub {
+          owner = "marcowahl";
+          repo = "underline-with-char";
+          rev = "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9";
+          sha256 = "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char";
+          sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd";
+          name = "underline-with-char";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/underline-with-char";
+          license = lib.licenses.free;
+        };
+      }) {};
     underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "underwater-theme";
@@ -36586,12 +36901,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "4.4";
+        version = "4.5";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "60615d101769694038b17a2c75bb31c26f36a042";
-          sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj";
+          rev = "ceb46240636865e86f3fe26906957943ba7bd73c";
+          sha256 = "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";

From 58b269f95983661337599bdf51797b0f7fc10bc1 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 12 Jul 2017 15:55:31 -0400
Subject: [PATCH 0660/3246] melpa-packages: 2017-07-17

---
 .../editors/emacs-modes/melpa-generated.nix   | 1793 +++++++++++------
 1 file changed, 1170 insertions(+), 623 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 708713e8181..53035f2415e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -801,8 +801,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
-          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
+          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
+          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1300,12 +1300,12 @@
     ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ag";
-        version = "20170420.1424";
+        version = "20170712.1549";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "2718190a0202aa4ab02b1f1f3d6ba7b996b69d6d";
-          sha256 = "1j3l7p3rnlax82jrdrjld1a26gk7cg002jcaj7677fhy261vxmib";
+          rev = "2efb3ea5c3f3b4de79a6f21fa8dbcf90afb758f5";
+          sha256 = "06aagmalpxvic285v0ipvir6777ipj6l9izfqsblbb7j70klw0dm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1592,12 +1592,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170703.112";
+        version = "20170713.146";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "f155ce7e6984d8fe11831cd8a9f89828f5c5be43";
-          sha256 = "1860ia7ld566f2z2pskvyi0cnfl20frszi4w5281px6y2c8g4zxw";
+          rev = "84514026e342aa3cc98d8b6492175e1bdf788e5c";
+          sha256 = "0s5cll8sq5hg1jm7g1nkcpbcz0n6f84ax9drzghv9y0m86v819mq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1631,6 +1631,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "all-the-icons-gnus";
+        version = "20170711.241";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "all-the-icons-gnus";
+          rev = "fe2080fe78c28b140be4ee2018cdf3c72b87fa31";
+          sha256 = "1lxq6fqrwxzd2cr8a7nvapaaf9pd1mfyqqk0rhg50fp3i16z5nkk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus";
+          sha256 = "0vdqhpa49p8vzbad426gl0dvniapyk73kbscvjv7mdl4bwhcr309";
+          name = "all-the-icons-gnus";
+        };
+        packageRequires = [ all-the-icons dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/all-the-icons-gnus";
+          license = lib.licenses.free;
+        };
+      }) {};
     all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons-ivy";
@@ -2334,12 +2355,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "20170419.152";
+        version = "20170708.1834";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "5af52ef940493d3d5acb56fc6372004ca48f75ca";
-          sha256 = "1n96n45ajx12ksnn8ij44b2jbcyvcki9k834ix96cwm1fcr553vg";
+          rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43";
+          sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2416,12 +2437,12 @@
     apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apache-mode";
-        version = "20170407.1140";
+        version = "20170711.913";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "apache-mode";
-          rev = "8fd0d4db7ede5d4e360630235ede3beb1ba56cdf";
-          sha256 = "0lawq0xx0y2kn89r633lb8kr4zkrbcm53dv8dylmv7lli9a7g1y9";
+          rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
+          sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
@@ -2587,8 +2608,8 @@
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "0d918da74a7a225fe5a586e26f5d834e579c5323";
-          sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw";
+          rev = "98c548917bb696d541a58bfcf85f02572d8f7ebd";
+          sha256 = "0kr6p1kf0sb036w9pb20xlfs7ynw357fv0zifsb8g7q1va7m5vs7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2936,12 +2957,12 @@
     atom-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "atom-dark-theme";
-        version = "20151119.2335";
+        version = "20170710.1612";
         src = fetchFromGitHub {
           owner = "whitlockjc";
           repo = "atom-dark-theme-emacs";
-          rev = "b6963e486d27eae7cd472736c106c7079c2a3d3c";
-          sha256 = "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464";
+          rev = "7fb37fd953e417acbcf7dd3f36e3167bed9bc887";
+          sha256 = "040xp0nqa9akjv30kgnw6l1248g2cl5yzihhfwbr8cgywqfir1lw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1f565871559d6ea4ca4bb2fbaebce58f2f383eb/recipes/atom-dark-theme";
@@ -3562,12 +3583,12 @@
     auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-minor-mode";
-        version = "20170620.1001";
+        version = "20170716.717";
         src = fetchFromGitHub {
           owner = "joewreschnig";
           repo = "auto-minor-mode";
-          rev = "c91c566cbaf8eac1fff0c7d9eef88308a566cc43";
-          sha256 = "0nq95k2wmq17awjz0kvzwnhpnda0813gdyjzlqpzpqb56092sbif";
+          rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2";
+          sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
@@ -4403,12 +4424,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170626.1114";
+        version = "20170713.1237";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "eeb0fbbc0115d87eeae4392d4d51f35346798bc0";
-          sha256 = "1v5wxb9ji4my99mgk5zivwjp57nz3ydjbsjmmanfjwdig98djak9";
+          rev = "f701a8e191ae9c0bd6ab93926ce993bb18a9e98c";
+          sha256 = "026a5frqvd2j09zzbf83mw3hmcj1ps7nsia87k0yn13sk62rd5bk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4424,12 +4445,12 @@
     bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bash-completion";
-        version = "20150514.728";
+        version = "20170716.629";
         src = fetchFromGitHub {
           owner = "szermatt";
           repo = "emacs-bash-completion";
-          rev = "1659c7ca38e2cf591525a3d0b9d97461de33916d";
-          sha256 = "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg";
+          rev = "d673bf1ed020cf1378fe3d90e1308f555cb0d1af";
+          sha256 = "18ql2k8zh2znl4lnks5r0k1b5l7x0hl1w9mhkp0anld2p2bv9f14";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -4819,12 +4840,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "20170625.850";
+        version = "20170714.709";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "c99bb0b2674ab704ba537fb46e5bf5d60376ea55";
-          sha256 = "1l20x3any7mrkm27ifl5xhq8xxacm2gq2cx9m644l8v4yji4835c";
+          rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd";
+          sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -5027,12 +5048,12 @@
     bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bibretrieve";
-        version = "20170417.620";
+        version = "20170709.1150";
         src = fetchFromGitHub {
           owner = "pzorin";
           repo = "bibretrieve";
-          rev = "813730a8967e003ca67342cc45b62c17cda77a7c";
-          sha256 = "0wy2013azglz095w4w3g693hr6f68z2fbwpc6gixr85rd0pk9hh9";
+          rev = "6aea308680f8f2cab4c5ae06bb3b64bd0a2d9215";
+          sha256 = "1lf1az6ijamvqcyvmyyppn53cqf2hp5v0bdj6d95j99rpz38pnfk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve";
@@ -5157,8 +5178,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c";
-          sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm";
+          rev = "7b055494e39efba8b237202b7c97f40aa19e2579";
+          sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5674,12 +5695,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20170528.2317";
+        version = "20170709.1244";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "4b76f0a86c84b0e4032cdee787c3ee55372e6c31";
-          sha256 = "1rr52dwwxq26v0h7apgr6nqpvfahrzm3j6p3zpbyp3lhb4sc2rjw";
+          rev = "2b7a41491df809e425b81a574fea64e9d6f7f011";
+          sha256 = "1haxw4xccalkwmrln5whd0lgfrq7lhdfyip2firlnrkaq8zw741w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -6718,16 +6739,16 @@
     calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "calfw";
-        version = "20170703.1704";
+        version = "20170714.840";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "bcfc0c546c3c58e1f635a9a29efdf56c9421a3ce";
-          sha256 = "0n7kn0g7mxylp28w5llrz22w12qjvypa1g82660qr2d9ga9mb0v9";
+          rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
+          sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw";
-          sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw";
+          sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4";
           name = "calfw";
         };
         packageRequires = [];
@@ -6736,6 +6757,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw-cal";
+        version = "20170320.506";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
+          sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal";
+          sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m";
+          name = "calfw-cal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/calfw-cal";
+          license = lib.licenses.free;
+        };
+      }) {};
     calfw-gcal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "calfw-gcal";
@@ -6757,6 +6799,69 @@
           license = lib.licenses.free;
         };
       }) {};
+    calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw-howm";
+        version = "20170703.1704";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
+          sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm";
+          sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0";
+          name = "calfw-howm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/calfw-howm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw-ical";
+        version = "20150703.119";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
+          sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical";
+          sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q";
+          name = "calfw-ical";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/calfw-ical";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw-org";
+        version = "20160302.1858";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278";
+          sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org";
+          sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5";
+          name = "calfw-org";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/calfw-org";
+          license = lib.licenses.free;
+        };
+      }) {};
     calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "calmer-forest-theme";
@@ -7014,8 +7119,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890";
-          sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k";
+          rev = "78798134af82a300e54a5d22d2f10c2885cd11ae";
+          sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -7056,8 +7161,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890";
-          sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k";
+          rev = "78798134af82a300e54a5d22d2f10c2885cd11ae";
+          sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7265,8 +7370,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "e33115d8a7516c49ea6ac7c570e9c63d34650672";
-          sha256 = "02j3sc1cj6pawsg2i9xw03xyzsa0irnxf0m0adcw2rylyz7bmwpa";
+          rev = "28484409e8f64f976bf3d80f10081b18f7724cf5";
+          sha256 = "0zvxrbf30hy511jmlfvmqj5yiysfbs73x064w1px7ghavczdjvx5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7305,7 +7410,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12267";
+          rev = "12270";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7448,12 +7553,12 @@
     cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cheat-sh";
-        version = "20170627.422";
+        version = "20170707.757";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "cheat-sh.el";
-          rev = "6409bb66241255cc9a0362f2acdcb0b34344f9f2";
-          sha256 = "1nmsja1s45fs93v2vbalfralixvzp88rgv47vf9p80i7x6w2149m";
+          rev = "f61dc1ab9f0d6933dfda5366b8051217f1e9b491";
+          sha256 = "028xyflii2ah6ijhq4fpmzsaj1nhps90kprpy7x7a9v4s85yvadx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
@@ -7929,12 +8034,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170705.951";
+        version = "20170717.303";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "4a7b5ffc245be2b4285bed07f66ca88c5b4420a8";
-          sha256 = "1k5zdw3cag9918kv51ph0jlg0wa0m4fbzl7yf3cvsfb78xf4apmd";
+          rev = "7daf4e968de21e7eb7bb2dc1b6ca30ae4e990532";
+          sha256 = "00y8d8gz0nfqr9dfd1nrkm32ckaln4cg6l6k3jbjzc0la673ljfr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8205,7 +8310,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "307254";
+          rev = "308172";
           sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
         };
         recipeFile = fetchurl {
@@ -8591,12 +8696,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170622.2345";
+        version = "20170712.349";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "197298e93af19f755cc2c54049dc5aeb04ce6553";
-          sha256 = "0l5aw6hj0ry58b2ws2m0dlrasp5w8x62qcsbbzilapk2ysb9h787";
+          rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4";
+          sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8616,8 +8721,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "197298e93af19f755cc2c54049dc5aeb04ce6553";
-          sha256 = "0l5aw6hj0ry58b2ws2m0dlrasp5w8x62qcsbbzilapk2ysb9h787";
+          rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4";
+          sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8654,12 +8759,12 @@
     clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "clojure-snippets";
-        version = "20170508.42";
+        version = "20170713.2310";
         src = fetchFromGitHub {
           owner = "mpenet";
           repo = "clojure-snippets";
-          rev = "1c6b37578c38d538ae017b23d4cd8697963b077e";
-          sha256 = "1pnxxzjbf0irbxapj7f4rqfv9j1x3qdgyq6pzi566c1qld3bkwn6";
+          rev = "36207f9d8738851f5b686dfe0225ad0553bf8e68";
+          sha256 = "0fb4l4gjzpr5rij4kyvz0r705blv2a5w1rf1c92d34g8jyy2hmd5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -8822,12 +8927,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20170626.509";
+        version = "20170712.809";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "0d05b0d4cf7252a381a28bd19577fb0d4ce6067b";
-          sha256 = "1gb5zjjjwsiz3lrm004qdki0ag8s5isczp1af2mgdgmc2626kqpd";
+          rev = "a20bf1a6b3c0c70f3637f5a8f4280ff3479ec180";
+          sha256 = "07m1z36823pzlf4d0wf3v053svgyi2r8wk7rxjmnzrz717y6xj9h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8847,8 +8952,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "8bc93cdd797e6396040bd00eee877734af0d3759";
-          sha256 = "1b92ba67dkihyixd1p2pkaqcgr39gf64vka1sbbx2fcwczyv3q32";
+          rev = "2d5e494637f9dad13fd0206ac3420e7d26f8b778";
+          sha256 = "0wsljwpd0ld4c0qxfn1x1a7xvcq8ik5dmxcys94cb2cw8xxgzbz2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9614,12 +9719,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170617.1502";
+        version = "20170715.1035";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "9dbabd146c5884c1a1940eef010bcf834510a8e2";
-          sha256 = "03nrim8r28d6zj7c6vgf5wldyfq7yfpc6yw37cmamkiqi0rhnc40";
+          rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56";
+          sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -10395,8 +10500,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
-          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
+          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
+          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10563,8 +10668,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2";
-          sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s";
+          rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
+          sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10661,6 +10766,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "config-general-mode";
+        version = "20170715.733";
+        src = fetchFromGitHub {
+          owner = "tlinden";
+          repo = "config-general-mode";
+          rev = "dd018f96f631a3fc6230ce5011d6357cf9720ef1";
+          sha256 = "15xvp40b3sbwjf492j0abaknwc5f0cz0f7hydy7mdqdlha20qahs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode";
+          sha256 = "1408xyzmb5aj1yrlgkymwy5x6rb1a9ynkx2m6hgj38qj6dz44cyy";
+          name = "config-general-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/config-general-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "config-parser";
@@ -10915,12 +11041,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170705.417";
+        version = "20170710.1111";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896";
-          sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw";
+          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
+          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11520,6 +11646,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
+    melpaBuild {
+        pname = "csound-mode";
+        version = "20170715.650";
+        src = fetchFromGitHub {
+          owner = "hlolli";
+          repo = "csound-mode";
+          rev = "9c96406bbda815a4c8068d9c4a2a0dd5bd8f3325";
+          sha256 = "14k2qbdn4l47kal647b8fy1lrcnivydnk651m02y3d6w41vgp7pq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
+          sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
+          name = "csound-mode";
+        };
+        packageRequires = [ emacs multi shut-up ];
+        meta = {
+          homepage = "https://melpa.org/#/csound-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "css-comb";
@@ -11714,8 +11861,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "3c024a91109657088eda0f858be639c8d40c451c";
-          sha256 = "03ppp20d98g824nnc4mnii3yzc58b5x3cbcifznr0pb0i4w5h42f";
+          rev = "e1e158d2103f0b441ed27ad4b2c0c123d7d710d7";
+          sha256 = "0mbqdnbd6rqhsfdn5rijp9siyp5720s1gj6sadpqp55qi9r1hnpx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11832,12 +11979,12 @@
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
-        version = "20170524.803";
+        version = "20170712.2110";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "8c3cc39bcff5def0d476c080b5248436da7f990f";
-          sha256 = "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi";
+          rev = "c5ad3a1815ba25b91aced8232b6f6268a10379d7";
+          sha256 = "1l8m5mk7qdvw9cc6ypqahrrzxfzdx7n5yp1j82dgli9gy0sq027v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@@ -11981,8 +12128,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "749d07b9c1eee8751c690967dc48bdd11c0cfc06";
-          sha256 = "0h51h7c19ncb3a6q4mgkq06fdc4q64s71z4a9rwwxk7kqs842hwg";
+          rev = "a2db27bb85d0daa4cc4b4b7d65c0e6a7cda5ec2a";
+          sha256 = "101gdyvhkb5lzsa69slaq0l81sjmrr34sb5sxbjxrbx5pk5wh9gz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12145,12 +12292,12 @@
     dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dante";
-        version = "20170622.34";
+        version = "20170708.421";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "b4e8e2b735408087a338813fc56979a5f2556d59";
-          sha256 = "002m6mpq6kk0dqa3vlpr5dj9fxmyzphzxqgf1zzwrfrig4bipzsp";
+          rev = "bf5d2bfc9a1696b97b1658a8090fdf80b6e9a730";
+          sha256 = "0y5gg85sp73xzn6hj54w19di4d9x5w0nzl6h7lfp7l9kg94v0dsv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12313,12 +12460,12 @@
     darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darkokai-theme";
-        version = "20160803.2058";
+        version = "20170711.403";
         src = fetchFromGitHub {
           owner = "sjrmanning";
           repo = "darkokai";
-          rev = "5c5cee814c370f99db486ad11165f2023a22f7be";
-          sha256 = "0by1c73hbc1y32ylb2pbfin6ydzxh2597rrm8xj8lc5g0ilch67n";
+          rev = "94f845d0194bfd45e6a3c17222bba19aece9dd63";
+          sha256 = "1zdzwjn3qcgxp7azz3sb5nfnmfd5mh9frvjlq5k013syy2p6xh44";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme";
@@ -12334,12 +12481,12 @@
     darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20170629.1848";
+        version = "20170715.1624";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "475fd1b583958d40b1cba6cfaf4ccfd7d5ca8f18";
-          sha256 = "1w2jsg5nyms6iz02digwj96dry926hs0d2c9pi7y252zifhldkdp";
+          rev = "257b0674a5c4ec510b51febba0c7a18e0f10a1bf";
+          sha256 = "1ww12h19scda90r4rkgiynk3zvhkhk44gwfqj2m49pr89y7j8lap";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12380,8 +12527,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "1e14307e2d829d3e4d502991d572eb9a5d7f173f";
-          sha256 = "1mvafh0zs3kns1l41qry2vf5vfrwllyhgcj97gmvczm9slqxp01a";
+          rev = "0468a3137c9e0d49121213f416fc7e2547d46a77";
+          sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12422,8 +12569,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "1e14307e2d829d3e4d502991d572eb9a5d7f173f";
-          sha256 = "1mvafh0zs3kns1l41qry2vf5vfrwllyhgcj97gmvczm9slqxp01a";
+          rev = "0468a3137c9e0d49121213f416fc7e2547d46a77";
+          sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12628,12 +12775,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170705.533";
+        version = "20170709.839";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890";
-          sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k";
+          rev = "78798134af82a300e54a5d22d2f10c2885cd11ae";
+          sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12901,8 +13048,8 @@
         version = "20160610.1739";
         src = fetchgit {
           url = "git://jblevins.org/git/deft.git";
-          rev = "59173ba0c048ead287dd1171a5a52ce53fd9a0cb";
-          sha256 = "12h6miqn3nmyhf7r5cm57fh9japv79mm6gyvlb3p0qw1zzlwnlcg";
+          rev = "86825cd420985112d9dd38060e0edb72b08c6dab";
+          sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft";
@@ -13148,12 +13295,12 @@
     diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diff-hl";
-        version = "20170617.1540";
+        version = "20170709.2000";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "diff-hl";
-          rev = "09b9354a8e703d24c132ee08d6c92eee1421fbd9";
-          sha256 = "03pk4d1l2vqhvp00z06kbgp4jyfw4nlqia6036kgwg2bp5pnc4aj";
+          rev = "bec9889de7bf48d28826039880cec9bfad24a628";
+          sha256 = "0f9krv08jlw1sawjajdfy0cp5mzbq7hzvy478z8p54s1fwga6wxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
@@ -13382,8 +13529,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
-          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
+          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
+          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13396,6 +13543,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-collapse = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-collapse";
+        version = "20170717.208";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "dired-hacks";
+          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
+          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
+          sha256 = "1k8h5cl8r68rnr1a3jnbc0ydflzm5mad7v7f1q60wks5hv61dsd1";
+          name = "dired-collapse";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "https://melpa.org/#/dired-collapse";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-details = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-details";
         version = "20130824.458";
@@ -13547,8 +13715,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
-          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
+          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
+          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13568,8 +13736,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
-          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
+          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
+          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13694,8 +13862,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
-          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
+          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
+          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13715,8 +13883,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
-          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
+          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
+          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13776,8 +13944,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
-          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
+          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
+          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13797,8 +13965,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
-          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
+          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
+          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13897,8 +14065,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
-          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
+          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
+          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14843,12 +15011,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170630.922";
+        version = "20170717.426";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "dc9c0b938ea0bc7a30a79fb74f2e66f1fb2128be";
-          sha256 = "04wwv3pps4kwld590x5gwif69izcbapp0y4w3i4nsc88ld08sp96";
+          rev = "a00ee6cc48179dfeb8836726d9faa9b4f119783a";
+          sha256 = "0f1szgr7xz2bg222x8b9h6kmi6diipc2r4j4yafjpsgkniv6c93c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15278,7 +15446,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1801041";
+          rev = "1802135";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15756,12 +15924,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170531.216";
+        version = "20170708.307";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62";
-          sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis";
+          rev = "226fa5c661391c7f8317a24c9f757396e1900371";
+          sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15903,12 +16071,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20170705.2343";
+        version = "20170711.1234";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "a6356007a58dc72636ab94c89536c621f089bb0c";
-          sha256 = "00qcq1bs8wyxj9cf2jy691ddddz0v5czwn92x40nc43a7qi0a9h1";
+          rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6";
+          sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -16405,12 +16573,12 @@
     editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-charset-extras";
-        version = "20170508.112";
+        version = "20170712.108";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "editorconfig-charset-extras-el";
-          rev = "1b8248de9e85bc846af8dfb53b70fdae8900cc69";
-          sha256 = "0gqnx5dwy9qxl1npvp8858i0lwjv1znpqr08h129vaycyyq1n69r";
+          rev = "bf2d23c57a485ee41d21a9a0015d5bd52baabf85";
+          sha256 = "0qgg2v9xpr8bm97pj4pxd9q6j8i6h94gb1j7lla0sn80cwymxwrx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras";
@@ -16642,12 +16810,12 @@
     ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170616.1117";
+        version = "20170714.1753";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "d3a40af5743c865e71b165600e8f1d0d2b72df53";
-          sha256 = "1jsdj0ll6m80xjxgy20ngkdfhak7scx1d474w3s46vvgcjl6z7p2";
+          rev = "08d2792d690cefb9ef2e00a14d3bbb1da55252a9";
+          sha256 = "0fw56v0xx4axw24wzy8rk69zy0nhajk4y3fqi1305acfgn6hnnvg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16767,8 +16935,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "3925f0189d99c6cddbe19831c2020f97adcc4933";
-          sha256 = "1lzmhfhwfnkpcbkvkl5vzfjv3h7wb85y9j98wrb3vlydbc9735dw";
+          rev = "4a1dde57e8a4d4c22ed279bac8253f5f16da9197";
+          sha256 = "19570r8y2cs8y51rmihk5hk5sqavck4bf0zanajnplhxw52h0fji";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16847,12 +17015,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170705.1739";
+        version = "20170706.936";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c";
-          sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp";
+          rev = "979ea29884f54c5ac4a6a5b2873547c0964e3dd3";
+          sha256 = "021ld1cs7swmrlbvnakwwx6xlyg95g8cnc6d1vk03a81p7s897il";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -17221,12 +17389,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170703.1849";
+        version = "20170709.954";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6";
-          sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff";
+          rev = "79077efc34aad25bb43cf46a28a69a308196c972";
+          sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17291,12 +17459,12 @@
     elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "elfeed-web";
-        version = "20170402.1842";
+        version = "20170709.954";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6";
-          sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff";
+          rev = "79077efc34aad25bb43cf46a28a69a308196c972";
+          sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17522,12 +17690,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20170603.2006";
+        version = "20170714.1600";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "b15af913435023fb6ce91e4ed79f8e9a1f936f6f";
-          sha256 = "15sga6fr6k29cncasfx5n71wspwshag8wcrmwa5py74ba31y98q5";
+          rev = "4155f4333545189901ce574601ef34dada07b672";
+          sha256 = "1q5qgjmmwnhgq4ckpkzy3wvmnj3cgzcggwm9q9jsdfmz0j1dgwn4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17970,12 +18138,12 @@
     elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elx";
-        version = "20161104.1831";
+        version = "20170712.510";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "elx";
-          rev = "84c9cd5721be9594de743330e7abcec092d2838c";
-          sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4";
+          rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d";
+          sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx";
@@ -18345,20 +18513,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "emms";
-        version = "20170619.1156";
+        version = "20170715.907";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "a4ec6697e45a006753bfd79c22f14524748df493";
-          sha256 = "07czram3jjhkc3ahjz86qq0fsh8ysdgvlpfyyvj3jmfah1sfk5d7";
+          rev = "e790730a4e258440184bc8ce5d3015efe09f8984";
+          sha256 = "0rh3hsggfw0yp5ssdwjpp0fdnc57cpcw02hxn80mrq16ylpj2zy9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
           sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
           name = "emms";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/emms";
           license = lib.licenses.free;
@@ -18619,12 +18788,12 @@
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20170617.931";
+        version = "20170709.207";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "a93f3d424a2ca07d81debbb024053d0e207e999a";
-          sha256 = "09vmn8ya3zbmwycaxw5kvlmfmqk0jn07zzajlrwds65p3k8ddcrl";
+          rev = "5bdf3ccc728ca2db734a686f9d4893c57ed59d90";
+          sha256 = "0nxf35b8mblzl3yqq9h2lpr3q6r89pqljyglxm38aid2f5mjnlvx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18841,12 +19010,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170703.505";
+        version = "20170710.347";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "4a253e1c24bfb993ca115dac7c9c03189fa0f7cc";
-          sha256 = "1vkihm7m5zpcyyr418661gfpdwixqzyrbp2vlhf6vd7i26ik3i8c";
+          rev = "aaaa9e34f5ea023621bc8123064d3183b35339a7";
+          sha256 = "11nxhzy4qc4y1gfi0m5c78jv2ib5gpsqdr1p84q0yqkzdc9wvcmd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19163,12 +19332,12 @@
     erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-image";
-        version = "20150914.314";
+        version = "20170713.1438";
         src = fetchFromGitHub {
           owner = "kidd";
           repo = "erc-image.el";
-          rev = "270a60706e3e0669350bb7aaea465570ef5074cf";
-          sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f";
+          rev = "a7e6c6d766f8c2589abf6fd79c5211f970fcbed3";
+          sha256 = "044cbz8r788j80f88d2irijpfvh22m9zjvd9ffj201fck428nakh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image";
@@ -19482,8 +19651,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "9e9ad191ce49eb410c7a95a8410122eed8049755";
-          sha256 = "06iyy74hpnc9aqrgbwndx1shvdq05z8hys9siv4ng13725cfpj0k";
+          rev = "de5cfabdad61d45a112d95e24ac44e3f51a4bd18";
+          sha256 = "14mi9qj2q0h21jy9zj4gqjz2205013d5s5l02asq6iid747jhx3j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19645,7 +19814,7 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170705.1947";
+        version = "20170705.2002";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
@@ -19653,8 +19822,8 @@
           sha256 = "0anc7bdar2q5c41ilah3p04p4z3mxkqlv91nkky72i58sgrw6za6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
-          sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
+          sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y";
           name = "es-mode";
         };
         packageRequires = [ cl-lib dash request s spark ];
@@ -19754,8 +19923,8 @@
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "esh-help";
-          rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695";
-          sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m";
+          rev = "15994c0d1c36f6209547742690c6d8f2ef505393";
+          sha256 = "0a0n05mhgp8gvxkld0510k4kq4m81aq2jdrgmfyafm5am5abz6lp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
@@ -19876,12 +20045,12 @@
     eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-prompt-extras";
-        version = "20160926.1723";
+        version = "20170713.11";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
           repo = "eshell-prompt-extras";
-          rev = "9825db1b9326e106f821364ae01ec9c7dbdf6d18";
-          sha256 = "1zijgwqm9j25ayiy4p5gl3xsrgv10l85j2p317i8bx9hn3v9rk5a";
+          rev = "52a8ce66da2c5f419efd41f2a6b6d4af03f78acd";
+          sha256 = "1biandbijdngalbjvbfv894qjzmj0fndypa31rmd75c0r5mg2mnf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
@@ -19901,8 +20070,8 @@
         src = fetchFromGitHub {
           owner = "peterwvj";
           repo = "eshell-up";
-          rev = "2216e149ffdd5cd8eb49d6661187d676b6a22d19";
-          sha256 = "1czl7gab46n9lxp91v1l9rgnz72h9x1im20yq4hw8w0x71a45ss7";
+          rev = "9c100bae5c3020e8d9307e4332d3b64e7dc28519";
+          sha256 = "00zdbcncjabgj5mp47l1chymx5na18v2g4kj730dgmj3rnl3iz2q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up";
@@ -19960,12 +20129,12 @@
     eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eslintd-fix";
-        version = "20170313.1943";
+        version = "20170711.552";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "eslintd-fix";
-          rev = "afa5cd1c1fb644a918e410ef396392b841146632";
-          sha256 = "04ixmv1y7zi32xwywn4dz0nvsvpmdk2m80y9fbaxi5skkx9r30g0";
+          rev = "895d70be11ccdbcdf0b44d5ae2a85d4ccac2920c";
+          sha256 = "1h43l4jvp3wbyyda3745m6c6ik6pn4k7pmq94ia9fbp4zqh4hsvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
@@ -19981,12 +20150,12 @@
     espresso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "espresso-theme";
-        version = "20130228.2348";
+        version = "20170716.813";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "espresso-theme";
-          rev = "c3a524e873f33923fe511791197a66dea5156687";
-          sha256 = "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq";
+          rev = "e79c5c14732b7e34aab75dbcc968839536536c59";
+          sha256 = "0jdyxyc6mk0vh35wgic8ikvs9cid7b5ffqx94pkg1kpridm2wrzc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27c929ec2eac0459c7018019702599e09ac908fd/recipes/espresso-theme";
@@ -20065,12 +20234,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170603.817";
+        version = "20170710.118";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "f2643cd3ae6727535ce76ed00a91bf96c09e280f";
-          sha256 = "1fyr963y2mnp8wk9jf0fpfp1k74ayhbcdyg1xknvd5jd5lyjgbkb";
+          rev = "064174931f0cbf91ad24fda883909a06eee10f6e";
+          sha256 = "0f6ikmgcakaa74p271nfkg55gbq2wxdjq978h8kp7x7vaczfjz0n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20439,16 +20608,16 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170704.1409";
+        version = "20170712.2350";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "a375ac8aea43980dfa60525c7585be64896e42d1";
-          sha256 = "1b3j29d4ppbgfg15vfyxz7rpjppqma9am3hk57qxq08n5y3skaxf";
+          rev = "dc936936666595afdbdbb4cc44c1f82e74c6802c";
+          sha256 = "0l0sjrfpp5xk5c74gryh1sf9hpv8qkykdwg59vzsmn0w9ii217p5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
-          sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
+          sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39";
           name = "evil";
         };
         packageRequires = [ cl-lib emacs goto-chg undo-tree ];
@@ -20796,12 +20965,12 @@
     evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-goggles";
-        version = "20170529.2251";
+        version = "20170710.724";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-goggles";
-          rev = "d2dfe823d5b1b70e4ed47518db98b238ff67b81a";
-          sha256 = "08hffzamrg3d8fqq94z7p9pywkzckhv6a58x7s1x7z8qvg2irlkz";
+          rev = "902270eea80594577d9af26298998406f79e59a0";
+          sha256 = "11v1zpi3jnsxdwhxv441rvbkyb6v1sg4zyk74aw14l5cf38f0d55";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -21006,12 +21175,12 @@
     evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-matchit";
-        version = "20170119.125";
+        version = "20170713.647";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "277623d8be7bd6ade8f301b9397b88575a0d01b9";
-          sha256 = "0bkc90ix8nivqkjkgb6iaq1a0g8dcp91im119dx98l6lxga57qli";
+          rev = "2fc961d94b27e528df1fc4b88d297dd9af8ed6d6";
+          sha256 = "16fk050q8ibdp4n5fflcz2scsbky7dg1kf97c28f1gszixp6yng0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -21027,12 +21196,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20170526.1158";
+        version = "20170716.1806";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "506f92dc610906fc279e50c598efe2068161edaa";
-          sha256 = "0ng2l70zllkvjsq2ybgdcdzyg0brplaznxr2y3qmbk72vgs3wxra";
+          rev = "8127c3161a6d990635684a020f708b7914445593";
+          sha256 = "10cy5shnd9dl9xkcl7gx4ksbbn2cqjww9ihw7ifawnwpa77bcf43";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -21258,12 +21427,12 @@
     evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-replace-with-register";
-        version = "20170616.813";
+        version = "20170713.225";
         src = fetchFromGitHub {
           owner = "Dewdrops";
           repo = "evil-ReplaceWithRegister";
-          rev = "0d8a67b578849c00a7a50540daf809dd2ee2b476";
-          sha256 = "1azxhb41f8ar3p5grdknpdljx85v2i6zjsp2qd7y8ij69kdw2z0b";
+          rev = "91cc7bf21a94703c441cc9212214075b226b7f67";
+          sha256 = "14rpn76qrf287s3y2agmddcxi27r226i53ixjvd694ss039g0r11";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register";
@@ -21887,12 +22056,12 @@
     exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170706.408";
+        version = "20170708.1735";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "c73155257a3248d30a9f602de8247ac3e32ba400";
-          sha256 = "1bcmrmyx12g11laz9f994vhmqyv1g0qvmp0sbh07nl1q42xy86m6";
+          rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5";
+          sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -22052,6 +22221,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    face-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "face-explorer";
+        version = "20170710.1201";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "face-explorer";
+          rev = "13bd4553bc4b09215a04d0267be1cb4ed834775c";
+          sha256 = "1zbm92imfbh1sm7j64vc1ig5yq6rdd8izkh80mci5k6nf1p3byk7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2370fdf6421dc518337e04bd2453a5f74e2df2b2/recipes/face-explorer";
+          sha256 = "1jfidkkizgwhkkrgvrmq5vrx5ir4zjw4zzc2alw9gkjn1ddq22q7";
+          name = "face-explorer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/face-explorer";
+          license = lib.licenses.free;
+        };
+      }) {};
     face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "face-remap-plus";
         version = "20170222.1742";
@@ -23406,12 +23596,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170626.1707";
+        version = "20170715.1345";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "4d9e16c03e935e926b61cf8446e43423cd93f577";
-          sha256 = "02b6cmrkacr7r34n1s9facdf0dvbv2084wn59xh4hbafpk9zcvhi";
+          rev = "b78d5a6f48c2ebd4298cf33c3364c63d86ae32cc";
+          sha256 = "14mp95k9365869fikzsvxha74121kbcrwp0pavv17calf29ycxck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23809,8 +23999,8 @@
         src = fetchFromGitHub {
           owner = "z4139jq";
           repo = "flycheck-demjsonlint";
-          rev = "1c433150fdf628dda4c9fad938bf7c79610b4460";
-          sha256 = "0kmvwmaxw64xjgchq8szk9mhbi6xp2jhv7qpgqndf4svia4pqws6";
+          rev = "a3dfe1df8ecdea76c076c0849901427567356228";
+          sha256 = "0zra3rl0kn70kn30wx1lqh9218k06mq3j8jadax61nnynw7bzsa5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b66df1afde83607408fb1b30e1260f22015bf448/recipes/flycheck-demjsonlint";
@@ -24120,12 +24310,12 @@
     flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-julia";
-        version = "20170627.1310";
+        version = "20170715.945";
         src = fetchFromGitHub {
           owner = "gdkrmr";
           repo = "flycheck-julia";
-          rev = "3aa2c26ed59310643a2f431e522dfc3c5daac085";
-          sha256 = "1nvqnwj94qya5s7zxxiwj20k49vmnhaiam72sfiannnpxawkj1q8";
+          rev = "0eaa3216dc35679d72c0d107127d48915516df08";
+          sha256 = "091zjabzrw1f194pmz60ij3ys8sw54dxj9q3vpl3sigr1jd1qq7v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia";
@@ -24523,8 +24713,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
-          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
+          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
+          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24733,8 +24923,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2";
-          sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s";
+          rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
+          sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -26355,11 +26545,11 @@
     fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fuel";
-        version = "20170705.1534";
+        version = "20170709.139";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "1eff2b3dbcbe6d8518a5ec42207b5578dbe93530";
-          sha256 = "1nr5s98xss68scmbzrfmdn1ri4hfny6317j6bhksxqnd6dr6za8q";
+          rev = "9adddfc5e5666febc2f98b230e4a7d2b4c02ce0b";
+          sha256 = "1ya7ghnclgcwha2cgi37z627q257xxd8c3igfl12k22ix4l5wr37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26480,12 +26670,12 @@
     futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "futhark-mode";
-        version = "20170705.1240";
+        version = "20170714.1430";
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "8e3b72bcf26b992546d794b10b96d05ed01f0a73";
-          sha256 = "1y2y701ks3fd6khls4i30b906akxqj3l1c15nbblp6xl07bznxw9";
+          rev = "dbc4ae1b8c977435d5369b18e1b624a62f8e8b13";
+          sha256 = "0h7244567anfrfm2wpkvy0g6bnczisv03rz2ipr35pqm3gf7hyh8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26831,12 +27021,12 @@
     general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "general";
-        version = "20170528.336";
+        version = "20170708.104";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "a8470934373b2bdd67f38e46e1dd4fb963cee31b";
-          sha256 = "17hg6iw3dz1ssxvz1zm8c90927a2sf22yv31g2y7n98jnpq622bs";
+          rev = "00efad765a3ace42a2833c65a169d96c7925623b";
+          sha256 = "1jp0vp4g46pcxsyz9d8n9iqf1rsaw4lhsrilmdkayj7n3skg4ipj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26936,12 +27126,12 @@
     ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ggtags";
-        version = "20170510.744";
+        version = "20170711.1806";
         src = fetchFromGitHub {
           owner = "leoliu";
           repo = "ggtags";
-          rev = "c7948943155eb712eb5aa1eeae8b50c8bb2eca13";
-          sha256 = "0qcwykjpa5424jpkw6s895827ym2cq5rv6j773wksnlbsg0v429v";
+          rev = "8579025b9b89c53221c6c608b92a85734ffb0116";
+          sha256 = "1fr12adssldynjayylqck85nnlcjx6pf15vp0hhvdnl689imbg3l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -26999,12 +27189,12 @@
     ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ghc";
-        version = "20170526.44";
+        version = "20170613.1212";
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "8bfd542ad210debd00a0be9f15b21c90043b15d4";
-          sha256 = "04vjp5m25yyxhdzwc50g0qcggzhg1rs4kyj7d0ax0blfnqzggf2c";
+          rev = "d867cd0fee3fdb4e93440d96506c522de743aec6";
+          sha256 = "0k615c7fvabs2y28kf0w3j8y3chqsbcdizv5z9jyf3519svb5sxn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27339,8 +27529,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "b8d558678821e35450c19e415656e366ebe44c38";
-          sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79";
+          rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
+          sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27881,12 +28071,12 @@
     gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
     melpaBuild {
         pname = "gitlab";
-        version = "20170120.22";
+        version = "20170710.724";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "730a86b770b0838c86e7080d8d502528e0c26792";
-          sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1";
+          rev = "67567a354a1888419331b79862f151817d9747c5";
+          sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
@@ -27941,6 +28131,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gl-conf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gl-conf-mode";
+        version = "20170714.610";
+        src = fetchFromGitHub {
+          owner = "llloret";
+          repo = "gitolite-emacs";
+          rev = "9136a9b737e0a5b6471a91571d104c487c43f35b";
+          sha256 = "0wls3sfplrf7wkg7g7fxx4s87cvm3p7myxw6k91np6pbfh8p0s9q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode";
+          sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm";
+          name = "gl-conf-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gl-conf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "glab";
@@ -28950,12 +29161,12 @@
     google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "google-translate";
-        version = "20161206.1408";
+        version = "20170713.119";
         src = fetchFromGitHub {
           owner = "atykhonov";
           repo = "google-translate";
-          rev = "52d34c96b400b1b933c727933279f79256951b19";
-          sha256 = "1acck34q5dqizx2wsm0q31lzwx0wwyzv6g53naf5m94bjw7xv088";
+          rev = "d8b84a8359fcc697114d1298840e9a45b111c974";
+          sha256 = "1qs4hcg1i2m487z50nnwgs0sa2xj4lpgizbrvi2yda0mf3m75fgc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate";
@@ -29141,8 +29352,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "eecdf6b7aaed40a71eff13c44456d63127e494bc";
-          sha256 = "1y7dxd40w5zkp59m0n1ybf128zhpi2wkjbw5v5w0ps7nx782dnzp";
+          rev = "0b533caa1ca0c4412748bde65753fa8c55ba4511";
+          sha256 = "14lkhny4s6kmybx7w9hi11bnyvg7imyxnirdk28rb19krj2n7b36";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29267,8 +29478,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "2f63009220e9b13516696396a8bf1a5be4757e33";
-          sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7";
+          rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c";
+          sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29405,8 +29616,8 @@
         src = fetchFromGitHub {
           owner = "ppareit";
           repo = "graphviz-dot-mode";
-          rev = "ca0f15158c3bbd516549532be1dd35bc51462c84";
-          sha256 = "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf";
+          rev = "fdaabbcc95d9156e3dadc84f81a4750c5b692580";
+          sha256 = "1s1qh5r0xp6hs0rl5yz5mkmjhpg04bh449c7vgjbb1pjsl1dl714";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e2f1e66b33fd95142be4622c996911e38d56281/recipes/graphviz-dot-mode";
@@ -29627,12 +29838,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170705.815";
+        version = "20170712.224";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "2f63009220e9b13516696396a8bf1a5be4757e33";
-          sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7";
+          rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c";
+          sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29648,12 +29859,12 @@
     gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruber-darker-theme";
-        version = "20170330.1211";
+        version = "20170716.647";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "gruber-darker-theme";
-          rev = "b9e59d9580d2b95dabf9a53ee3d51c2868b693fa";
-          sha256 = "16g3rshbh9xzr6ng58vp2qw3zin0ylvlnmdg54p5cf8f0d11fd4a";
+          rev = "3e5d5d67f8b004db288d6c2e1a0b02c3844ab5c5";
+          sha256 = "1az7fndm19wy8s3p6wxa0ps55amwmmpbschayzy3g3g26a4swcxi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme";
@@ -29690,12 +29901,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20170705.1636";
+        version = "20170712.1607";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "fff195715b537ac6f13b89034c232a8f33bca45e";
-          sha256 = "0l5iwxj0ahn3r2sha4045lwlqi4s8070p1rbiw5fmad3v66i3m3j";
+          rev = "a3aafd33d9b027e6c0d5ef81ebb04a2bb8545cf2";
+          sha256 = "1d9330yd2lch7yqlfvpv7gxyy00p4w9h6f0imn7bgj3y7wab20dw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -29732,12 +29943,12 @@
     gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gscholar-bibtex";
-        version = "20170509.1134";
+        version = "20170713.1934";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "gscholar-bibtex";
-          rev = "ba505ea5043092444afb4284ae268d37e1c51e54";
-          sha256 = "199jf65px1bbybyag5980fa99vjflrfp9s6dcxq1ascszrram0pl";
+          rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b";
+          sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
@@ -30383,11 +30594,11 @@
     haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-tab-indent";
-        version = "20151205.1159";
+        version = "20170701.258";
         src = fetchgit {
           url = "https://git.spwhitton.name/haskell-tab-indent";
-          rev = "93ea6a3a707fc34a97ce94e0285e9569e01062c4";
-          sha256 = "04698q2c75bbbcib94zdjkmm2k0zlxxzhnd34fflhzzxljcr02cj";
+          rev = "b4cb851aef96c42ec7b3cc37b6fdd867fe5a0853";
+          sha256 = "1ah1xagfzsbsgggva621p95qgd0bnsn733gb0ap4p4kgi5hwdqll";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent";
@@ -30610,12 +30821,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170705.2232";
+        version = "20170714.3";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "f0bbfb828320c95992d6fc593be849f522cde0cc";
-          sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46";
+          rev = "07f8f705f54506da537b1f615ee2e95e9033defb";
+          sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31051,12 +31262,12 @@
     helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-cider";
-        version = "20170617.2254";
+        version = "20170708.1525";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "helm-cider";
-          rev = "7dafd5ba9c961ef22fd3ba617f13a411034f68be";
-          sha256 = "01wabgaka3mjllmqm117rv28jxmcp1znaxbgrabgcndhgyd7ycyb";
+          rev = "9480e969d5387efdd5e66c6db089e02a296b2025";
+          sha256 = "0ci0z1zaypbdnjxk6bhf83kx808j4xi5ikqwq4w5mlsbz8f5iqx1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
@@ -31219,12 +31430,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170701.629";
+        version = "20170717.520";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "f0bbfb828320c95992d6fc593be849f522cde0cc";
-          sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46";
+          rev = "07f8f705f54506da537b1f615ee2e95e9033defb";
+          sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31384,6 +31595,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-directory";
+        version = "20170705.2102";
+        src = fetchFromGitHub {
+          owner = "masasam";
+          repo = "emacs-helm-directory";
+          rev = "2c6d45404506ba744888dcdb65e9f63878f2da16";
+          sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory";
+          sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n";
+          name = "helm-directory";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-directory";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dired-history";
@@ -31447,6 +31679,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-elscreen = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-elscreen";
+        version = "20170709.214";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-elscreen";
+          rev = "b8212866939dc4a1e1dc23ad572407b688e130e3";
+          sha256 = "0gy6lbdngiwfl9vfw32clagbmv70f93slc9zkm3dz3mca37435kz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe42a7fe2dc051c6c49aa75bce89bfe1b5fdbbb/recipes/helm-elscreen";
+          sha256 = "186k66kf2ak2ihha39989cz1aarqrvbgp213y1fwh9qsn1kxclnd";
+          name = "helm-elscreen";
+        };
+        packageRequires = [ cl-lib elscreen emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-elscreen";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-emmet = callPackage ({ emmet-mode, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-emmet";
@@ -31762,6 +32015,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-ghs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ghs";
+        version = "20170714.2241";
+        src = fetchFromGitHub {
+          owner = "iory";
+          repo = "emacs-helm-ghs";
+          rev = "f9d4ab80e8a33b21cd635285289ec5779bbe629f";
+          sha256 = "0f7wsln7z2dhqn334pjk6hrj36gvx39vg19g8ds9sj9dq9djlf27";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8d37030806905344a2ca56bfc469f5a238cd69/recipes/helm-ghs";
+          sha256 = "0bzy2vr2h9c886cm4gd161n7laym952bzy5fhcibafhzm4abl4sh";
+          name = "helm-ghs";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-ghs";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-git";
@@ -31874,8 +32148,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "730a86b770b0838c86e7080d8d502528e0c26792";
-          sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1";
+          rev = "67567a354a1888419331b79862f151817d9747c5";
+          sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
@@ -32245,6 +32519,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-kythe = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-kythe";
+        version = "20170709.26";
+        src = fetchFromGitHub {
+          owner = "MaskRay";
+          repo = "emacs-helm-kythe";
+          rev = "eabbef4948f8ec7c7b2fac498e9145dfdb10ca82";
+          sha256 = "1ws7vl0pvznmxb7yj77kfv4l52xkzblhsl68lfkf9cdxcj9g6177";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dd1a6d0b08ad750a0e44ebdf76109d29ab226bd3/recipes/helm-kythe";
+          sha256 = "1yybpic3jzp3yy8xlfdn2jj12h087vn0lj3mqx6xxj2nxd9q4949";
+          name = "helm-kythe";
+        };
+        packageRequires = [ dash emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-kythe";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-lobsters";
@@ -32269,12 +32564,12 @@
     helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ls-git";
-        version = "20170601.2200";
+        version = "20170716.109";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-ls-git";
-          rev = "1253c7615da055a95548b4f92a8a503fe249884e";
-          sha256 = "1zyix2whj9j19ica9pff1hh7vgyg1h009vx5xhcqw5sligrh2dwr";
+          rev = "47981a8d80e1d464a7cddde5a391b35626929f00";
+          sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git";
@@ -33028,8 +33323,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
-          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
+          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
+          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33318,12 +33613,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "20170616.1725";
+        version = "20170708.320";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "a4c267aef5a3344bd4d76b6b6cf13e120cbe002e";
-          sha256 = "13r4s6k0yxp3z68756sni27l7lmlfhdz3hx021w7lhn4np69i299";
+          rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1";
+          sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -33381,12 +33676,12 @@
     helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }:
     melpaBuild {
         pname = "helm-w3m";
-        version = "20150722.824";
+        version = "20170710.1238";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-w3m";
-          rev = "280673470672c9fbc57fd6a91defeb9f6641fc8a";
-          sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz";
+          rev = "0af89108183ac11dcf75be06fe23a60ae072463f";
+          sha256 = "0cjnlml9k1ak26v5j7qghpk2yj4rs37jlkpbn1m5y1j8231m472j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m";
@@ -34369,8 +34664,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "f4c463b99433d191b496055206552878e861f402";
-          sha256 = "1dq93rk33p35slkcpsw6lyyd18hd7zdll288riwkh7y4wdcbp5l8";
+          rev = "0721221ede01d6a3468e562fd7ea0df114de34e2";
+          sha256 = "09cyzvk1ixbmnd6wl8idxn0263mgsvcnh1742flvxa5wsbqm9f08";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34449,12 +34744,12 @@
     historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "historian";
-        version = "20170630.1054";
+        version = "20170715.2142";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "99e282bdd8994cb4e23185d9004b2cb42a214927";
-          sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb";
+          rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa";
+          sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -34716,12 +35011,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170705.1355";
+        version = "20170716.116";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "67d52175fbc5a194367e421a33ff4359a0ee016d";
-          sha256 = "11l13j9j3bh7p1hprlpvjc8ir8643d7px4a89rpwa2m70z9v0skp";
+          rev = "2412435e53c4f739a7aa93c9b9d80d861a1aa764";
+          sha256 = "0l5fw1c1dilsiiw82a1lwaa2xjq4dlfm51rvnkf2iay1ndr7l11x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35134,12 +35429,12 @@
     http-post-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "http-post-simple";
-        version = "20131010.2058";
+        version = "20170715.240";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "http-post-simple";
-          rev = "1c7b06cb0d6930aaaf3f319d9836786d40f1595f";
-          sha256 = "1nvcqh3wwczh83k4nb7zgk1r07bsaycbds4zhpy7gic3jhxbvdns";
+          rev = "f53697fca278c741051aeb668b00466b5e0fd3fe";
+          sha256 = "0krdbvvvzn323vx554yw7947nddl3icfjk4wf5kfx7fim5v3mdn6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/http-post-simple";
@@ -35551,10 +35846,10 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170704.1507";
+        version = "20170707.610";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087";
-          sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
+          url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1088";
+          sha256 = "0lckab25irgpm7y2wdg00v31514m6aw6n0wf9gz1v21zzc5ij6cz";
           name = "icicles.el";
         };
         recipeFile = fetchurl {
@@ -35758,12 +36053,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20170705.1656";
+        version = "20170708.1116";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "e8c2716cb38067d23f35666be83323267e692618";
-          sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd";
+          rev = "7b7136532ee4af0380f667f19700b53853bbbd7a";
+          sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -36031,12 +36326,12 @@
     ido-sort-mtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-sort-mtime";
-        version = "20131117.530";
+        version = "20170705.712";
         src = fetchFromGitHub {
           owner = "pkkm";
           repo = "ido-sort-mtime";
-          rev = "7b7c77f6856125a59aff99ba0ff8d2b369896b5e";
-          sha256 = "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd";
+          rev = "5f4ec2c562f79b7fb2d1480c88db1fa8a812d814";
+          sha256 = "1fqqkpz0x3q7fqmax90vxkpn14valkb0lprqs0w641cbq8a4wqm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36d2f7f1bb0d0694a25c1e83340781e08bee814b/recipes/ido-sort-mtime";
@@ -36077,8 +36372,8 @@
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "e8c2716cb38067d23f35666be83323267e692618";
-          sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd";
+          rev = "7b7136532ee4af0380f667f19700b53853bbbd7a";
+          sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -36178,16 +36473,16 @@
     ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ids-edit";
-        version = "20170628.810";
+        version = "20170709.338";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ids-edit";
-          rev = "3c133ce0074274bb6cf70566ba68a14047cdd61e";
-          sha256 = "00rrxdlr6wrkdwwl2ivsydblar6vhawvrf8f7cb62396z70xhrpi";
+          rev = "8d46429ef1a32c69d770f8187545588549086c91";
+          sha256 = "014apjzy6hgcg1mrvhkbp77baz59nafh96az2kfgixp8vwpmjyf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f12d49b6ece6d2ac8ecb80d881db560367ddc4ba/recipes/ids-edit";
-          sha256 = "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a1aa957ef9ec3db055f439f1cee2994e65ee17ea/recipes/ids-edit";
+          sha256 = "1n4gpcl3qj65cmaq9cdljsmrf84570z4chfvga6slsqjz5him8d1";
           name = "ids-edit";
         };
         packageRequires = [ emacs ];
@@ -36780,12 +37075,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170705.305";
+        version = "20170710.708";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "9fa8f37a7be33337ab0e865b1718bbb81eea295a";
-          sha256 = "1h6637sa83jckswp81682yis5srhaj02r6ycxzcc1ngfap3mkks7";
+          rev = "f7ec13ab2fbc36e99df196eb863a75baf3b92fd6";
+          sha256 = "01j4prrs78sq4w7cv15rdilxrqmjam2s1hrwijf6718c0s7dbpd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -37093,12 +37388,12 @@
     inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inkpot-theme";
-        version = "20170602.1000";
+        version = "20170709.1858";
         src = fetchFromGitHub {
           owner = "ideasman42";
           repo = "emacs-inkpot-theme";
-          rev = "d9e97a2b95a7740c8eb72fa795fface8b1500fd0";
-          sha256 = "1c8zl512c5mw126p43l6prdimfn2mi58msb0sw4csf9r1krkv8if";
+          rev = "b992c0996b4a711f3d6ebb6730c6f57edbc75fc5";
+          sha256 = "1ykbf5hhs7z33bca5j0vk8vdyrwghbiqgdjy064nccgxlqyysy0k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -37302,12 +37597,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170615.104";
+        version = "20170711.1415";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "fe791fbefa4689c944a00a356b331ed0516c5cfe";
-          sha256 = "10d9w4hp5hhbvbhbd605vpvzw0vhg862ikwjchq6jyly80kf3a60";
+          rev = "d03b3cb0cbc8d059a223366c4f7a2be85672c22f";
+          sha256 = "0zga7p2hazcwxjyzgrvq77d3j6q9mz7wz7mkqk0hzf00sdb1gpg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37362,6 +37657,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    inverse-acme-theme = callPackage ({ autothemer, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inverse-acme-theme";
+        version = "20170716.1100";
+        src = fetchFromGitHub {
+          owner = "dcjohnson";
+          repo = "inverse-acme-theme";
+          rev = "361a8840469648a9b98f16cc996df5f151d3c75f";
+          sha256 = "1dvaz36037wvh00m3ddqfp9w86pna3k058xw22i4xcdhp1518i03";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme";
+          sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5";
+          name = "inverse-acme-theme";
+        };
+        packageRequires = [ autothemer cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/inverse-acme-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     io-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "io-mode";
@@ -37758,12 +38074,12 @@
     itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "itail";
-        version = "20161022.1431";
+        version = "20170709.1543";
         src = fetchFromGitHub {
           owner = "re5et";
           repo = "itail";
-          rev = "129d7089fcf712c296706841afc5918955a83f19";
-          sha256 = "0jllp27syd533raj7lqfj5ismm7g7f4av9ikgqar8048m3xkvy2q";
+          rev = "a8c98583cbc4e2b761df95fd738efebb116fe6e6";
+          sha256 = "001i7xn6v8j3ls50cnsazjfkpzdnr01rb98a6h0nibkj8hi21myb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b810bf1deeb79064144d8b684fab336686018ef/recipes/itail";
@@ -37863,12 +38179,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170703.2350";
+        version = "20170716.1104";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896";
-          sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw";
+          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
+          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37926,12 +38242,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170704.1238";
+        version = "20170709.2151";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "b0407466a1e6dc23150663757f6b48e14cc5290a";
-          sha256 = "0wapfnz7l32qc93xbx64bd42v4b4dav3288ij3pc7r03r4by02m4";
+          rev = "acd6322571cb0820868a6febdc5326782a29b729";
+          sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37951,8 +38267,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "730a86b770b0838c86e7080d8d502528e0c26792";
-          sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1";
+          rev = "67567a354a1888419331b79862f151817d9747c5";
+          sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
@@ -37968,12 +38284,12 @@
     ivy-historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, historian, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-historian";
-        version = "20170416.2154";
+        version = "20170715.2120";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "99e282bdd8994cb4e23185d9004b2cb42a214927";
-          sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb";
+          rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa";
+          sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -37993,8 +38309,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896";
-          sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw";
+          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
+          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38052,12 +38368,12 @@
     ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-rich";
-        version = "20170517.554";
+        version = "20170716.1924";
         src = fetchFromGitHub {
           owner = "yevgnen";
           repo = "ivy-rich";
-          rev = "9c36765a941b88c3aa0f4739ad2cb7207c453575";
-          sha256 = "09m2m6nrgcpzyam50y3snir3dya1mif8c0miv77hkqa2w2ijxiq9";
+          rev = "84964443f9a3ded1676190e9e0f91dac4557cc21";
+          sha256 = "1gsf3klcrmabalfywxv5pffpbgw9nw90plc5xxq6a01f7b46rp7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -38077,8 +38393,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
-          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
+          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
+          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38764,12 +39080,12 @@
     jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "jenkins";
-        version = "20160903.1556";
+        version = "20170713.702";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "jenkins.el";
-          rev = "8a3c1849fcbac379ea88ba1c14f3a63bb9dd3244";
-          sha256 = "1dd7qmkdarrfm0gf115c2m2913jn7yv2ns0ic1ywq7b9v547i9cz";
+          rev = "b30d4ef658963b913ca02726f99755c10736fd9d";
+          sha256 = "15yl1j3lrag19vy5k5qymmf6ij0myaiwl5k7z1ij0b70y2qmfx7k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins";
@@ -39161,12 +39477,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170624.1249";
+        version = "20170716.1313";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "558f53f6b6749b09b03b858b0b1dfaeffbba4042";
-          sha256 = "1wr6hbd02raccvwqvy02va4hanjhqxpg418a7zxzjqj5mf1lj5nn";
+          rev = "b176925c4d8a21e0ed375e13cf6aa04cdf3b4a0e";
+          sha256 = "0ffr8wjqqs7p54hi8wgnd61dm4cs7112j56d8q9ycfmnw0fswyxk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39186,8 +39502,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "01a8d98958b8c546a6a9eb3b339a1dee864684fa";
-          sha256 = "09pap1r9aiif8rmmzpw01154iravsmqw8msbdrxgbqlpndcaqnmi";
+          rev = "17dff6480c8d0b8e4daf44d65181ebc1371d3bdf";
+          sha256 = "0fs9w3110cc62a8g6dasfmxi5zsmhhvhviw8r17p63f3snga6xi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -39453,12 +39769,12 @@
     julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "julia-mode";
-        version = "20170607.537";
+        version = "20170710.538";
         src = fetchFromGitHub {
           owner = "JuliaLang";
           repo = "julia-emacs";
-          rev = "f591c6d42e493d51f1522fd0449d6a62881adfad";
-          sha256 = "1wjbvwfdish673y5qjr3r8w935dv1cz8j0sv8dmd2i6w5wf5d1qb";
+          rev = "edaaff2e971a527460f838bebc0ef679f9a571b0";
+          sha256 = "1sm57dq58fjbjjprl1bf7vibrvp6v5m4ipiq7r73c2bdg8rmaapm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -39471,6 +39787,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "julia-repl";
+        version = "20170708.2324";
+        src = fetchFromGitHub {
+          owner = "tpapp";
+          repo = "julia-repl";
+          rev = "93b9d515e6f5fbacd42069a2ae6da3bd80b7c4d0";
+          sha256 = "1xpdr343b5qa1pb92d5nz0m9lswq2s8nzg46msjnb1dvihqyb27w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
+          sha256 = "1k8a54s7g64zasmmnywygr0ra3s3din5mkqb7b5van2l0d4hcmzn";
+          name = "julia-repl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/julia-repl";
+          license = lib.licenses.free;
+        };
+      }) {};
     julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "julia-shell";
@@ -39745,12 +40082,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170618.919";
+        version = "20170710.1014";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "06ab7e6c00d6a176712f27b583fea3823c6c360e";
-          sha256 = "141hjj56vax24mjkr0y0h51fc8wk7gjzknljwibaiwbmx9fyfm7f";
+          rev = "f2df1b80dfef88d38c5fbf1b9fad96e2091126c3";
+          sha256 = "0anfz9npizaghhvpcvplxsymvv9q3sl7bpiis281p8c7yhrl93h5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -40253,8 +40590,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "ae8f3a2dfccdf4495c137163e5e68b9130fee34e";
-          sha256 = "04nik71cd3cnx41rz0nhwkk41nx7r0x63ldf4rihz6q1h43zxpzv";
+          rev = "e4a8a4b17cb1ae073afc5df54d9fed9333f1cc72";
+          sha256 = "09z298s699jk76i6yrflplhvdc77flb2qfkzbb55ngmx0ajcf2h6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40333,12 +40670,12 @@
     kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20170512.950";
+        version = "20170716.1331";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "fe750b9f71e9970e2f1331aabc31d7b6dc8a41d2";
-          sha256 = "1w05yp3qwrpdb43h4iz4mkn92bsqbx137a83qyz6vgl95rpj7b9j";
+          rev = "700ea18fdc471ce351d7e2a443572746e8b93496";
+          sha256 = "09qznjadbmspm8n56rk3giyxcf79sxfxpimgn3vkdv09la1mdbb2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -41023,12 +41360,12 @@
     ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170702.200";
+        version = "20170714.1529";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "9dca096255f7ca92ff887d70b6c4c67ce3374ff1";
-          sha256 = "0k63sad7w1gym3l5p0hfnwjhj8a0ic59z6g1zf3j10752439bsx3";
+          rev = "f4abac98adfe747c93abd4398dac3aafa33a816c";
+          sha256 = "04gm8i663k9vgij0c9qqmicmq0dcxbnahjrx81agp2sqzixh6adx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -41594,12 +41931,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170623.1046";
+        version = "20170707.949";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "5aab7fa4fcd42d2f73d226843b4247d61ad917ba";
-          sha256 = "1fkkp483bhk560h7jv1ppr5x39nghh8va7fnnr36br6fdn53c7ki";
+          rev = "7cf7bda344f015750e89719209a49f5991bfdffa";
+          sha256 = "1h4129la499b3x3bz72s5c6bc8i7nvyh2kzxg7ff1h8xnwf1rcp1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41929,12 +42266,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170528.2030";
+        version = "20170716.827";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674";
-          sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa";
+          rev = "d4a0708e2bac6492355c675717e458f88b7fab63";
+          sha256 = "1fr8kwm6m3k57s55gfn3sjh6zb9hj57rqnygwq8klyvi5ydh9w9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -42037,8 +42374,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "45bbe61cd4d8950d8f91e2c9efd6d36c7e4245e2";
-          sha256 = "0dzpdjg7yrbvkmx0nfn3wgs0bi5j38k6js75axxfpgk1jp4l8x8a";
+          rev = "325ccf1c3d92533f8bc5c48d741d3aa23a6b2542";
+          sha256 = "05cz8jwkidwkzggifccl51daw6vbcy1fgnlwm27ppy933y306xyy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -42431,12 +42768,12 @@
     lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }:
     melpaBuild {
         pname = "lsp-go";
-        version = "20170419.605";
+        version = "20170709.1021";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-go";
-          rev = "3ef571cc8c534e305a3ad6831a0b244a30ca57fe";
-          sha256 = "0aiyspr1wg3lwx0sy8c52h86zjs9ifycy02c2w8q2287kv61lqxk";
+          rev = "d3ff1fdf5c5e735d5beebff3b0bbbdd3432fbfdf";
+          sha256 = "08kasnkg7v0haqrhd2r6dn094vcdhygc1v9nx3lhlfd1sq84m7qh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go";
@@ -42849,12 +43186,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170705.2113";
+        version = "20170711.1307";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "b8d558678821e35450c19e415656e366ebe44c38";
-          sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79";
+          rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
+          sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42881,8 +43218,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "85b860cb53d6f0088255013ef849af9a882110f9";
-          sha256 = "1jj467kdvklb1sl0dyyb00jnl4xgz56mql1wnr4nmiqbxaqzqa46";
+          rev = "2aa23cd169166e92be3e874c723ff224a9d42c15";
+          sha256 = "1bjv8a38y75cpbxhzxsnvzpq2cvs80x8ai7pspsqf4pp3w1dj45n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -43045,12 +43382,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170701.1313";
+        version = "20170709.510";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "b8d558678821e35450c19e415656e366ebe44c38";
-          sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79";
+          rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
+          sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43133,8 +43470,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-tbdiff";
-          rev = "2e7d54d290260e5834cca06863d78fc563d7373c";
-          sha256 = "07i0bnjkflgrrg246z996slzy28b2kjhhv13z0lcb72w46l935yr";
+          rev = "c9522a98bcdafc2d8ef3f3beb9ebe05daa42e577";
+          sha256 = "1nv5a8wfrsh41rvgzi1clwjdr9nc0g5rpgcjs1rvgncn7pjd5pi9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
@@ -43336,6 +43673,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
+    melpaBuild {
+        pname = "makefile-executor";
+        version = "20170626.533";
+        src = fetchFromGitHub {
+          owner = "thiderman";
+          repo = "makefile-executor.el";
+          rev = "5502f07a13b7d6860715faf70966721a11506b22";
+          sha256 = "1727i7nmm1i0cc8i2c1912irhb9vvk82xb0ac3ypjzi0s22k2fnf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
+          sha256 = "0889rq2a7ks2ynyq91xsa2kpzgd72kzbjxx0b34w8faknpj3b6hi";
+          name = "makefile-executor";
+        };
+        packageRequires = [ dash emacs f projectile s ];
+        meta = {
+          homepage = "https://melpa.org/#/makefile-executor";
+          license = lib.licenses.free;
+        };
+      }) {};
     maker-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "maker-mode";
@@ -43532,8 +43890,8 @@
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "4463a734a9377d6c17a0cdba0f1e7ced0db7bbdc";
-          sha256 = "1h99cgpw28gg9lqh53pzpp7qh350dbcran90387jrh5plyicsq3m";
+          rev = "01255150a80ada47bf3708daa93069ac3011831f";
+          sha256 = "1djlzcg6dl29rifdss3cy0g3xmscblqvkfwzykiqs2y7vl51r60b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43704,12 +44062,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170702.738";
+        version = "20170712.1703";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "2c8d0e537ea7a2e823b7768b603f7194beebe565";
-          sha256 = "1w8vm5inmrzxp790ynpdbh6wavc9jq0f0jafc5a277hsxhbl9i7z";
+          rev = "ea5549233b3ce1536dae3a4793df79971a3781da";
+          sha256 = "1gm76j4w0fv7194dkhky5pxrrwysi4n0n0v0dnl6wp079irc7kcj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -43795,12 +44153,12 @@
     markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
     melpaBuild {
         pname = "markdown-toc";
-        version = "20170224.2350";
+        version = "20170711.1249";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "markdown-toc";
-          rev = "0edc303871517da67483119f2b1969055e6e0608";
-          sha256 = "0fnb2qw7p5mmv9nbkjy2iw3whi40gxwxbdfwgadbypzk0yvh6a3v";
+          rev = "7038f4f6d5c2bc7e4aea89699a607ac2b7dd16a8";
+          sha256 = "1kvf30ib1kxp29k1xwixkq6l4jjr3q3g1wpvh9yfzk5ld97zmry1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc";
@@ -45005,12 +45363,12 @@
     minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "minizinc-mode";
-        version = "20170605.2342";
+        version = "20170708.358";
         src = fetchFromGitHub {
           owner = "m00nlight";
           repo = "minizinc-mode";
-          rev = "c33a8e23817468c2a64dcfede6dea41485fb43df";
-          sha256 = "1892s4cxzxdrwj2mjav1lqbisx20zsjgnw41m6a61ds7hg035c3w";
+          rev = "b621b9e106edbe094bcc8e609d9398a60c2ac8b5";
+          sha256 = "15d90fsrpc7qcnblgwjcqrqyyphbfjvdnkwj6dnv79d0m4n58m1c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode";
@@ -45292,12 +45650,12 @@
     mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "mocha";
-        version = "20170513.1501";
+        version = "20170712.907";
         src = fetchFromGitHub {
           owner = "scottaj";
           repo = "mocha.el";
-          rev = "dbda778badb8f33c9ed816b927710ef6d0123cf5";
-          sha256 = "1jvczadgkq2b8gxjg2pllg3qjr1ymnc9kjjgvyi7v91vb7h51yii";
+          rev = "60189c67a4800059411f71ca800d911240e8d22e";
+          sha256 = "1hqyy7piaara1hgba2jys923y395kpcf6i312zaw472ksixqhw7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -46415,12 +46773,12 @@
     multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multiple-cursors";
-        version = "20170215.552";
+        version = "20170713.1847";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "ddbe3ae932b6564c7429c3b2507510093ed1f3aa";
-          sha256 = "0icaz5md2jydsp8w9fdgxj7689g8v6yq123yi7bp17g6lfnw4v7y";
+          rev = "c94566597a80c07a1782a75644fe1a2ca4f29bad";
+          sha256 = "0g4w3xcwazdm6f07n00jgdkv5blrd9aaqmwbx28lm1qq3v6w0xqp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -47332,12 +47690,12 @@
     neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neon-mode";
-        version = "20170630.245";
+        version = "20170711.501";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "neon-mode";
-          rev = "044040df9e83a015ddfe58940b503b6197fc29ce";
-          sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa";
+          rev = "9c23289c0c8ed17d1596cfb95a5ade57df7db5f7";
+          sha256 = "0q5niz0di1r0wl0lsq8hcsz854xdwpzw798sl42qc1r5mdpz3ghz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@@ -47604,12 +47962,12 @@
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20170409.1737";
+        version = "20170716.948";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "58707562dd29c7a9f36e96a8e894caec90ce1e41";
-          sha256 = "1r6vs77b2rsdarkvcsg6awfa4mna308m53002vxykmpj9apkjszr";
+          rev = "05ac362f97874d50131ea38277cf95a5cfecb250";
+          sha256 = "0phxkvi1s49grc717iprg96dalb5w2jcj1dfyrh339xny11f2hqb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -47692,8 +48050,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "a3dc1e65abe29f9d0528d3b5ea45812f4dcd63ed";
-          sha256 = "0bliq5wnzp3n0pdf6c2271ngxxgphqimjm6qv8kxl83f1mpfpknc";
+          rev = "4ec6eb1fdf513d93090d5898762d1186eb6feb0d";
+          sha256 = "01vfj61rgfk0cyh1c4ai0ys0wjnjaqz6hdbg3b1dcfk4b09ydyjx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -48021,11 +48379,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170704.432";
+        version = "20170715.511";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "6a79229737198110c9ae1a3c3e9b86d09b78bd94";
-          sha256 = "017cp7z9l97xszlz4v97943zn1k03hmwxx9hphjrl7015hr38zwc";
+          rev = "4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051";
+          sha256 = "145313a0krav6lcalbpq6skyf2iw96c97v6cd7s6bci5i93w0mp3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48267,6 +48625,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "numbers";
+        version = "20170712.238";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "numbers.el";
+          rev = "74be68b94143f042ce461b2a69202f515acaf20c";
+          sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers";
+          sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h";
+          name = "numbers";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/numbers";
+          license = lib.licenses.free;
+        };
+      }) {};
     nummm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nummm-mode";
@@ -48539,6 +48918,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-coffeescript";
+        version = "20170713.2356";
+        src = fetchFromGitHub {
+          owner = "brantou";
+          repo = "ob-coffeescript";
+          rev = "6baabf3104e32ed151b0b9555db903a93a44db54";
+          sha256 = "08mmwy69h7dihi120c9agv8v5c6y6ghc94gmpb0rfxdjim1lrkmq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
+          sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p";
+          name = "ob-coffeescript";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ob-coffeescript";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-cypher";
@@ -48651,8 +49051,8 @@
         src = fetchFromGitHub {
           owner = "pope";
           repo = "ob-go";
-          rev = "1f582d5c16ff032207a40d49be0727190a227912";
-          sha256 = "1i0c7z1jfrd39pfdfr67qcisv578mmi6i73jnm9zliygk1mryggf";
+          rev = "28183e10581fa5fe0f5b5a885cbde32cb4b053ba";
+          sha256 = "1liggd9nbl90c6mc0iccchckwm1pw2lb23nn61y2p9c1hj9myhm8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go";
@@ -49592,12 +49992,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170705.1133";
+        version = "20170716.926";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35";
-          sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5";
+          rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
+          sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50774,12 +51174,12 @@
     org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-journal";
-        version = "20170705.217";
+        version = "20170712.657";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d";
-          sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr";
+          rev = "69b237d1b3c5cc0eb81fb5918df25d01e999b0f1";
+          sha256 = "1ss1lxxilbr177mlp4iygg8q74qfw68v8iap9fpj6lvlm7vawins";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -50861,8 +51261,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a";
-          sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya";
+          rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023";
+          sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -50881,8 +51281,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a";
-          sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya";
+          rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023";
+          sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51314,8 +51714,8 @@
         src = fetchFromGitHub {
           owner = "gongo";
           repo = "org-redmine";
-          rev = "4cdf9a2aea8420befd2d667d98f63c386f3e44f7";
-          sha256 = "0fvzrc8k67di5qyzh13ly5wx6m34rg980yl2rqp5d3vvw8mbbsqw";
+          rev = "e77d013bc3784947c46a5c53f03cd7d3c68552fc";
+          sha256 = "06miv3mf2a39vkf6mmm5ssc47inqh7dq82khsyc03anz4d4lj822";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/017a9dd8029d083ca0c1307f2b83be187c7615e5/recipes/org-redmine";
@@ -51331,12 +51731,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170626.1834";
+        version = "20170714.808";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "6abe56f638562cc683d866f209387c9d30a32299";
-          sha256 = "08rnqk4iwg86gndbra4f78qnxadbn0cyd2h3dffx30cl6y23w2vz";
+          rev = "208a7beb0f8d4f7830d1d801776acd99c723e87d";
+          sha256 = "0vf75sk3ik9vfqbr30yn9fn8ab7rc60y5vaiipvx9p6mgh6vhcad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51447,12 +51847,12 @@
     org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-static-blog";
-        version = "20170621.2328";
+        version = "20170706.646";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-static-blog";
-          rev = "e9ba61e8bbe6e2bd1cb5fe2e507d066fa05cabd9";
-          sha256 = "1ng94m39r7g573l7zl7561zchz5m5mzlf8a0ym2hj1cdf98x5ziv";
+          rev = "9dea733006ae53902e6ec91fb11ff058229afe84";
+          sha256 = "0gyhhcr54myg0r4pjc5z4mkmpc2xnw3ymykz3m0sm589q1i1ym34";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog";
@@ -52543,7 +52943,7 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "957fc496311e8c685a5299aeaeb0f1882caaa3af";
+          rev = "7ae7bc8bc84ffe0351e23a8a5dc72a18874bee61";
           sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2";
         };
         recipeFile = fetchurl {
@@ -53085,12 +53485,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170702.227";
+        version = "20170709.120";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "416d1cba6664b0783722129d24f4a748bd71e057";
-          sha256 = "1718raqkpzscrnih519dp7a7jnaymjgcaqppfgskbsw59r46p7sj";
+          rev = "4e4b34fc4f12ef2f7965fa959c5809aacdb6af63";
+          sha256 = "036gvgh97ng8l8srq4jgjil6na15fy4h7w7aljxx6wkmaik7nvg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -53606,12 +54006,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "20170612.1048";
+        version = "20170710.821";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "972d413b4d8284ba67ab43513a6a709692325f20";
-          sha256 = "16f2jimhdbqhpgq66qrakk6ajp87ixihgmzvx9aip6icnp10mhgc";
+          rev = "23ac701e2a1a1364ca96d267437c3413986a4497";
+          sha256 = "1kbwmdhv8fpw613yk8sgh3yz4rcrh2aygqkv3c46d5fr0xm04a80";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -53690,12 +54090,12 @@
     pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pasp-mode";
-        version = "20170615.605";
+        version = "20170711.516";
         src = fetchFromGitHub {
           owner = "santifa";
           repo = "pasp-mode";
-          rev = "77bde345cfb3822c86eb9b1aa8cca4e8fcc38420";
-          sha256 = "1x9ms4aljpbz9nfv4lrrlkvqb3a127sfd0a865lphdyivqrai3j3";
+          rev = "2d7307b7483eaf6030497c83dea39207cf843638";
+          sha256 = "1nxrad0mg1ywcjhh7npbnz69bxf44ih51f74m040mnvmmd15jw3q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode";
@@ -53711,12 +54111,12 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "20161111.1320";
+        version = "20170717.145";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "b4c3bd9130044c4e106bac5ba73a50822865e258";
-          sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16";
+          rev = "888bd9593f9239f28adab6d93fcdeec69bdf63ed";
+          sha256 = "0z1j3cfsh8cksv6l5fbzp6f72d5874kmg7i6agmab9ixjvgg0izc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -53854,6 +54254,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    paste-of-code = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "paste-of-code";
+        version = "20170709.1655";
+        src = fetchFromGitHub {
+          owner = "spebern";
+          repo = "paste-of-code.el";
+          rev = "92d258e8ec98598d847ecab82903f9224c7c2050";
+          sha256 = "1bf2d0i726psjwnqdp0w4h0qk7fnwcbwf1a66q7p8vczavqygfan";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b29a5101bb6fc01b8b6e1b798ce6f73bc6d34944/recipes/paste-of-code";
+          sha256 = "0wjcchpp1689arfz6s7gfq4bxn0svz6qj5azvjwwsyzais1bicdi";
+          name = "paste-of-code";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/paste-of-code";
+          license = lib.licenses.free;
+        };
+      }) {};
     pastebin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pastebin";
@@ -54632,12 +55053,12 @@
     perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "perspeen";
-        version = "20170312.19";
+        version = "20170711.2304";
         src = fetchFromGitHub {
           owner = "seudut";
           repo = "perspeen";
-          rev = "f093cfecde0e8ce0d5e390784c228831536aef72";
-          sha256 = "0gb8f23ls2f5zj9a9q3i39775g3zijwdnbl7gyqi4hi5v90rb0s4";
+          rev = "d69a7bb554d6eb003b7c5c222cbdbaacc7e01df0";
+          sha256 = "1r3c352i4vkzqi5rcyniaa2x05jjpq9x8j43bbs4m63lczik75mz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
@@ -55848,8 +56269,8 @@
         version = "20170419.303";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "0df827ef0bd0b0f858cc6dfd6ea83a4502e5f13b";
-          sha256 = "0z836mvpnm7pvv0b7ygls0s602yaydv1farrazscnx6sk8303qd9";
+          rev = "488bf1c3be5ebe66520f352bfb8d99917878ab42";
+          sha256 = "1p81ljxxsxd5dp9xn46zia0sp8d095ib3aaby3yzar55nvdfpl6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -56028,6 +56449,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    poly-ruby = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
+    melpaBuild {
+        pname = "poly-ruby";
+        version = "20170710.220";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "poly-ruby.el";
+          rev = "acc0c3cc8d0607edc769b35e19fcd39e8f57d903";
+          sha256 = "1gq7rz9s44cf4m9bdapr7rnvincxsp16yci7g3ljq0mpiyl1l2b0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby";
+          sha256 = "0d8s6bl5ynx0r5cwvfkd52rksiq5kdyrgbxds56r8ls6cfkwqngg";
+          name = "poly-ruby";
+        };
+        packageRequires = [ emacs polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/poly-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
     polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "polymode";
@@ -56451,12 +56893,12 @@
     powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "powerline";
-        version = "20161121.2320";
+        version = "20170708.1442";
         src = fetchFromGitHub {
           owner = "milkypostman";
           repo = "powerline";
-          rev = "67538e4dbc2f1d2f270142481eb0b0d24e8cde36";
-          sha256 = "0jjv6wszsnrdi5l5qz4d50nj6p6zzyvqmn1j31zlhypbvi05isls";
+          rev = "8a246902e86a0c59015bb897a9c59be9729ef5c4";
+          sha256 = "1q90y0l0vdach8irb9cigw8w5nllvzv5hg8hd8ljpb4j9jhc5y5n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline";
@@ -56636,12 +57078,12 @@
     prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "prettier-js";
-        version = "20170703.519";
+        version = "20170712.2334";
         src = fetchFromGitHub {
           owner = "prettier";
           repo = "prettier-emacs";
-          rev = "22a333402aa9bbe00e2943f6aa6e25c402345241";
-          sha256 = "0dsm4iz8d2qj72a7jpznjy4skiznsh5lpai95p612dlanafgfpyn";
+          rev = "9cac36f6b1c224e0772dc92d15a6105ec10d3f40";
+          sha256 = "0iwriz14aj5ripnr2v4y96pdl092h93i8mq2qi5jdi31fgi97sjj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js";
@@ -57448,6 +57890,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
+    melpaBuild {
+        pname = "proportional";
+        version = "20170628.137";
+        src = fetchFromGitHub {
+          owner = "ksjogo";
+          repo = "proportional";
+          rev = "eb2bb2b3d1ca058365049271dc341b1180009f1a";
+          sha256 = "1lc3xvkvy5lcy5zralbnwqlxmar443yq735pd023z6di54xm3991";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional";
+          sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx";
+          name = "proportional";
+        };
+        packageRequires = [ emacs use-package ];
+        meta = {
+          homepage = "https://melpa.org/#/proportional";
+          license = lib.licenses.free;
+        };
+      }) {};
     prosjekt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "prosjekt";
@@ -57476,8 +57939,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "6bd51a59df41b99058ec8c2b03a177a218267ce5";
-          sha256 = "1bgi9954xb70wjymxyzihjfqy29ps28x9h1brnd2krza15rwgrwf";
+          rev = "c78dbd7c895b8c80cd2f2401d73acf890edf82c6";
+          sha256 = "136l13mq0yki95lra6bvzzq602vhp48nnvw741gf7x34rd4k5kwg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57514,12 +57977,12 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20170607.1512";
+        version = "20170711.511";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "fb19c2624d209919204a1e247741595c500b5b74";
-          sha256 = "0732l03h37xqamnfqbazzbbx99rc8kn8k0rfxrk0ncjmfpj60jiy";
+          rev = "0a0ead9f8098afbb2f5648bfbbd5c3b7646a1b77";
+          sha256 = "0xfkj9kdd7i0jcca8nhsp7bv0x7wsxi03ncln9y8d7c2g72fjkdd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -58240,8 +58703,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "d4b0bdaec9042333f9d75688b3145658adef9f91";
-          sha256 = "0ik86kp7rmg0zyw3471pj82x5w9hpg6w3k3cvv4zjgfrhilxb9z1";
+          rev = "9f7797ae15bd5e4e5c4ad320afcc15eeb4cdae82";
+          sha256 = "0p3zmaq0vk5z4ia2i54rjdw4a1d4s9ljb28l48xbb82jmjlgniw7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -58383,12 +58846,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170626.1017";
+        version = "20170716.1133";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "11c6a487b2a3a22d1fbb7ae16bf3b7a5dabdeadb";
-          sha256 = "1yk4rrpfrqmq6cm9fg64qh7zzwrvwfpbixfp0352c0jplzxqgxqp";
+          rev = "4846252fb81c309eb5f7a6aa2dcc04804412c684";
+          sha256 = "0zcy7afvyzqmgsn88v5m73bkglnfavhqb4b7fviz355i3waiyfx5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -58425,12 +58888,12 @@
     python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-test";
-        version = "20170427.1549";
+        version = "20170711.1155";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "python-test.el";
-          rev = "7052b5ff1b599ce04800779b283bf4d293a7f223";
-          sha256 = "18i0nh4qslbnj106hnxjmzgyg1gwyv2k968xwna73lzp7d4ykaq4";
+          rev = "196efba6dae286e0719bc5993ee23e01db9a0912";
+          sha256 = "00hbwy0cnv2v1djncijmbsdxddd48p4g0mfr4nn83203243hvbn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test";
@@ -59388,6 +59851,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rdxmk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rdxmk";
+        version = "20170629.1834";
+        src = fetchFromGitHub {
+          owner = "jsalzbergedu";
+          repo = "rdxmk";
+          rev = "e78749fb29738365ffa4d863ffabeb969ebb0bcf";
+          sha256 = "0gwlqjk84ih89c2ckx0rrw07jgwd32wfwj4mibchdrn0ai891md0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/db54339795e0519f154328e54d47a7a0c80afc71/recipes/rdxmk";
+          sha256 = "14iavsgqp28y2ykgly8x69sny34r32dl4bpb47m921vk5n4y6zky";
+          name = "rdxmk";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/rdxmk";
+          license = lib.licenses.free;
+        };
+      }) {};
     react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "react-snippets";
@@ -59496,12 +59980,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20170630.1507";
+        version = "20170712.334";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "b3719faa0207688db5db543e5420648c11928d4f";
-          sha256 = "0hn9qcc6c5lgna57yjlwkfl5yahwwgvjnhgp1r0idzamfc631g5g";
+          rev = "ad333ac5e95f7e0c98cb4bc4c924ca9fff97cc88";
+          sha256 = "1yng0fj9zr57jwmaxk71vxlwpxahyc4iadyyj5v8c09a4ljvlfs6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -59834,12 +60318,12 @@
     redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redprl";
-        version = "20160912.1847";
+        version = "20170712.903";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "7758d2a42a1a98199a9ed6af95bf70fe70f0c168";
-          sha256 = "0q08yfrv6mfkhh5rm0wq6c8p6sb60rib5z42k98y9d92gsn96lzz";
+          rev = "a2f8c5612a055882db5c01b8160c0ae1bd44f1e1";
+          sha256 = "0glnribgqg6hg3ghb5saf26hwydmsg51aq45wj8mdf5dfncimqq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -60460,12 +60944,12 @@
     restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restclient";
-        version = "20170703.33";
+        version = "20170715.440";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247";
-          sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs";
+          rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c";
+          sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -60485,8 +60969,8 @@
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247";
-          sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs";
+          rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c";
+          sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -60855,12 +61339,12 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "20170422.832";
+        version = "20170710.711";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749";
-          sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9";
+          rev = "a0a9cfd532f05f9ccb42919b9105d8e902d971fd";
+          sha256 = "1gbgm00arfkgvp8gihpn1zf69lp4a5glhvrawnma6kraf5ldx0fs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -61086,12 +61570,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170705.144";
+        version = "20170714.1944";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769";
-          sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630";
+          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
+          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61152,7 +61636,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59273";
+          rev = "59350";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -61233,7 +61717,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59273";
+          rev = "59350";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -61415,6 +61899,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rufo";
+        version = "20170712.824";
+        src = fetchFromGitHub {
+          owner = "danielma";
+          repo = "rufo.el";
+          rev = "e827b44c8093715a204ed0e4a64ade34441f9355";
+          sha256 = "14qf3napgx8vycr0igrr8534yymgaqh2cb09iz7gbf65cmk86pq8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo";
+          sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239";
+          name = "rufo";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/rufo";
+          license = lib.licenses.free;
+        };
+      }) {};
     runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "runner";
@@ -61481,12 +61986,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170606.457";
+        version = "20170712.1214";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "ac6a45e6091c0d542b696b6e13551be7e333264a";
-          sha256 = "0hba3djxzgpk13xcfz51s0qlv9415q8701pkw9qq974fxqpcrawl";
+          rev = "60a1f36f4111e825d20d9c3aed561981c470806a";
+          sha256 = "0p09j3y90i0ninyr3alxra17r09ps4sj9klww638l9csk2cgw80f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -61859,12 +62364,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170629.2356";
+        version = "20170708.1211";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "03834eb7fa0922efaa31d2157d9effa2b7e04810";
-          sha256 = "0idj4p3d36yp0irp1yfbihq8mf17jc7facz5qy6kx7zj0wdx4fjw";
+          rev = "cee28b5e6121e6c85bb647b709c7a8c9e3883700";
+          sha256 = "1f5xkcr9kj5nwqh77hfxbs2i9zzsikbksa56lg9vw67pc78rs7vi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -61884,8 +62389,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "0b7aaa108710b2f197cbcb32fdb3ae12ff121747";
-          sha256 = "1yp382s4jxbyn646mv245gm5c2h1n734r8qzrspimipr79mrbklk";
+          rev = "a6e98831985be670148c527747b0e91330d0307b";
+          sha256 = "0yyacg09p74r4q56kqw3km6sqwnk2hpzxqi9jvbw10x2q2c618bk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -63528,12 +64033,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "20170703.926";
+        version = "20170714.1041";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "3adbfe7c03d509538a6e43bafda27ea290298a14";
-          sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k";
+          rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2";
+          sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -63968,12 +64473,12 @@
     skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "skewer-mode";
-        version = "20170122.938";
+        version = "20170709.939";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "skewer-mode";
-          rev = "18a90f401451f8ca0486bdaf45647ac3ccebc0ac";
-          sha256 = "1y25c3mq5fzlsjjj98p75jxynk1aaj72vp1zi6jrr2g8hay1yi31";
+          rev = "51f3bbeafea6701de78190a395f6376a9974f1e5";
+          sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
@@ -64052,12 +64557,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170701.436";
+        version = "20170712.2328";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "35b0ae538b2023c91b035b3f9c133b28f0afbaf8";
-          sha256 = "12ks2d91bvsxkwwjjgs9ymcwf3w90x7r0krvb6nsgh970s35yv78";
+          rev = "f89362f31d8c1ee752bfd9d3cc8a6b5766c94bd6";
+          sha256 = "0b2j0vvsm6psljdkyybjh5ki6drhvq98xwakifk0li220rsi3lkp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -64658,12 +65163,12 @@
     smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
     melpaBuild {
         pname = "smart-mode-line";
-        version = "20160818.508";
+        version = "20170708.1317";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "f6f0c0a81c1e4265bf95dad49a02579d8e859ac9";
-          sha256 = "0srwjvyhqmy3g0dlfs33f93x0f55da0zl9cs35hjls2adwlqk2cr";
+          rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e";
+          sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -64683,8 +65188,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "f6f0c0a81c1e4265bf95dad49a02579d8e859ac9";
-          sha256 = "0srwjvyhqmy3g0dlfs33f93x0f55da0zl9cs35hjls2adwlqk2cr";
+          rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e";
+          sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
@@ -64826,12 +65331,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170705.1319";
+        version = "20170716.1328";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "34ca8a68b201879e88c3814a2dfe3a1b9609bac3";
-          sha256 = "0ybij6m0h27q3q1pv1cny5bpg35q0m0yx071db40qd8pdvxn0b90";
+          rev = "d4445621b88f36a391fc8bfabbed4db08dc88f33";
+          sha256 = "0rsnc5b49n3s6k9a1vr1by1iq1ns9ba2l04k3siqr0hjr8jjwa7b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -65392,12 +65897,12 @@
     solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solidity-mode";
-        version = "20161017.1506";
+        version = "20170712.1442";
         src = fetchFromGitHub {
           owner = "ethereum";
           repo = "emacs-solidity";
-          rev = "db392f96f8e892b7788ebe25819a8ec195bb376d";
-          sha256 = "1x1ljbmrn06pbdcb7kjivbh2f2m29ivwa1ifl4lgi2rh884s27ma";
+          rev = "e4aa0190145d5cfad7d3f052ba44c88a1ebb6c7f";
+          sha256 = "1dh2av9grij2v179vfr2pric6bxibxbg34ij3488ki9crc2zpv4y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@@ -65756,12 +66261,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170703.237";
+        version = "20170711.102";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "655ad80f6d63aa6bb2fcc8f73e5a2c65f807b02d";
-          sha256 = "0b4l3afajkcgahzara666fhkxm6wbgim65r4yy73psadhwpfhp3l";
+          rev = "88661813baefece9899588cb34c633eda606f2ac";
+          sha256 = "1qb26ya4f3qd3rh9cpdb02qyqqz6yhgv05b095i9fvwlcbvr4v51";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -65777,12 +66282,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170705.1052";
+        version = "20170713.1156";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "6f41a3321296c35c1b77660cf3956f07b3b68086";
-          sha256 = "0n8gchqrm8nm687wpqm599622yhvylkf1vslw0akgq3r4vsyfini";
+          rev = "11d6958364271e11c920015c24d509f9bdcce6c9";
+          sha256 = "1z6l85459fbfyn266qdz09c57ns8d1650ksicl3li442ffh5s75i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -66361,10 +66866,10 @@
       }) {};
     sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "sqlplus";
-        version = "20161110.758";
+        version = "20170710.150";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=25";
-          sha256 = "04wqy4ss6499rpn0rnczmn39yi78xkqslblyq4xb700xzmzn7sg3";
+          url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=26";
+          sha256 = "19lrk1a9d9ljdnsiar5cgmp68c26b6aihi3rbgf3d5bcg9iqbp7q";
           name = "sqlplus.el";
         };
         recipeFile = fetchurl {
@@ -66507,12 +67012,12 @@
     ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-config-mode";
-        version = "20170603.251";
+        version = "20170711.1433";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "ba47dd11c5be684595ffa62dbdfdc616ce3eb9d6";
-          sha256 = "011n7vyhrawmymkhmr28isk5zvdljj9bhynmfr6v0mi2h7kn79p3";
+          rev = "8ce61a22d07cdcb96aa31fa9e5493875f00ad516";
+          sha256 = "03lpfj2gq0wl8zsjwdkwk5i6ih2cwcmya55cyw8fs8i19y3zhcyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
@@ -66528,12 +67033,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170628.52";
+        version = "20170711.725";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "c8b322a248ea8089eb26f2c5cee58ed47e5f43d3";
-          sha256 = "1iyvdbwm7v1acb2mjqz51c7ksi5169mg3kiksg3q5bhvmfjy6s3r";
+          rev = "ec4661059109f25df41db1800cac7ffc168fdbbc";
+          sha256 = "1nqf8nwwb188mlyn8xy8v9qzq3xin2pz6synldf0yr8gac8b7bll";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -67669,12 +68174,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "20170224.1825";
+        version = "20170716.2320";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a";
-          sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl";
+          rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9";
+          sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -67715,8 +68220,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896";
-          sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw";
+          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
+          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -68128,12 +68633,12 @@
     system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "system-packages";
-        version = "20170627.1127";
+        version = "20170710.612";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "170f07c3cdf2859efaedc60c7013f6d72e009468";
-          sha256 = "06knc4vy6lskp8jgfjg33v089kf8pm0lmqp9114apa6hwwqx9fd9";
+          rev = "ae993f994ed60a845c5752e90491cf127bb1c052";
+          sha256 = "1dp8q82k7s2h3pp6qh4x2hbvq23ykn09mf6ymfy62p8jdavfvcx2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -68170,12 +68675,12 @@
     systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "systemd";
-        version = "20170202.1844";
+        version = "20170708.1534";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "systemd-mode";
-          rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254";
-          sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l";
+          rev = "9cfd31533742859fa081b79aceafac315444a4b3";
+          sha256 = "0gckwjzqlqyl740r73bh3x5x4wina0irc7krgj2xp68xh4x7nw8y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -68488,8 +68993,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "477a87418980cfba695b2507a268d632f4e7a220";
-          sha256 = "1xgi33wi69v3lx62q8lk04njcjz8ny2lnjn7ll332bcgx7sbh292";
+          rev = "f103ace956d5e7039cf0785d93c2956bd7bea4f4";
+          sha256 = "0w82lzig3fy4p59rjj5dgi15mlmx6v4s6vm3z58rj65ql7qfzf88";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -69447,8 +69952,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "49e5103920e75a149d02c7d487496c8c79154a6c";
-          sha256 = "1ywqyz27k1h87rz3vwyzchsajl52smp0ypwdmwggj2yn1mrcc9p6";
+          rev = "0dd823580c78a79ae9696eb9b3650e400fff140f";
+          sha256 = "1j6pq0gxlfbcfkh9pmfgqpfvdmsd1q4jx384jib12y4g0maxnf2b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -69505,12 +70010,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170621.1159";
+        version = "20170712.638";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "ec4a2b7a68c2503a6bdb31f1b6977321ad588102";
-          sha256 = "1dj29365ia50gf4cicwvpcidlcp67hndyv60w6cgy6fghsslldnn";
+          rev = "329d4541b1aa5f90689e84c925562d3bda708755";
+          sha256 = "10rn2lxwir488x1d43bqvsg7la818si0w1qqsf59q79hllzjclg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -70242,12 +70747,12 @@
     traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
     melpaBuild {
         pname = "traad";
-        version = "20170528.2302";
+        version = "20170713.2320";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-traad";
-          rev = "4b84b8b4cf43e1167b3d7fcc51eb7a16b62c26f1";
-          sha256 = "0mpx2wlw7fhqmgvya3vq7yfjqpab10wjbgpxyyd2ki15nwc4c0xd";
+          rev = "7a443ad17643060f9b4c2897abe185bb9221e304";
+          sha256 = "1n91a8bdrji0kca38bh6jzwjfsg90jqqa47vvazsqk072fjjbnkr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -70374,12 +70879,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170330.2125";
+        version = "20170715.2304";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "3d44f4e916257855e5f0c3d06ebe78c2637c9b0c";
-          sha256 = "0dmydawpdjh821sfaki2km1sff5f2kspbhi9wkcss12m8kkz6fg4";
+          rev = "2c033fb7a2614a21920d1cb06665f590b97694da";
+          sha256 = "1ark2lcms43kk24352k1jbmgv5bcymmbfqhpbzrribagm5n9qr2h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -70981,12 +71486,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170530.953";
+        version = "20170710.427";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "9ad892fb2274decb637d12d81a8640d2c6cf11d3";
-          sha256 = "0ynnh3ac6zblcg2d0nf8fwdfmp5ymzjqncl64xa43m4lw24p6xng";
+          rev = "1cea84486f937946a90caacf2a7c86ca855d1c9d";
+          sha256 = "0s9gnlm52rsdda0qzfn89sjawd5r5qxdc878y11cak9zz4h6d706";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -71287,6 +71792,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "underline-with-char";
+        version = "20170714.1511";
+        src = fetchFromGitHub {
+          owner = "marcowahl";
+          repo = "underline-with-char";
+          rev = "f0d7fad3f5472909f52c7928192f137d2f52c255";
+          sha256 = "1qpqsspvvrfmzy93gj9h5zcj1gzf2fmw2kpl457cllvrks7yb8ry";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char";
+          sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd";
+          name = "underline-with-char";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/underline-with-char";
+          license = lib.licenses.free;
+        };
+      }) {};
     underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "underwater-theme";
@@ -71724,8 +72250,8 @@
         src = fetchFromGitHub {
           owner = "yuyang0";
           repo = "url-shortener";
-          rev = "48182912d4f3a704d0b53f1664b995cfbf2ccd28";
-          sha256 = "179hi6hsp2naczlcym3qxx9wbqx96bkkzvqygf3iffa0rmik4j7h";
+          rev = "817ac58f6fd2190f688619a91cdc28654b211df9";
+          sha256 = "1nah3vjg7966ssh2iwz8fingmcni867ksj2bjrvkgzmqbxqdxz9r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener";
@@ -71781,12 +72307,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170702.1322";
+        version = "20170710.1234";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c";
-          sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm";
+          rev = "7b055494e39efba8b237202b7c97f40aa19e2579";
+          sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -72705,12 +73231,12 @@
     vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vlf";
-        version = "20170501.932";
+        version = "20170713.1652";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "vlfi";
-          rev = "55e0c404c802c4cf056a8dde94a77df2970a42c7";
-          sha256 = "0v9zfav3gpw2vvmqdbp4g24jxxgprzql5z82i7rx6ma0in42kvz2";
+          rev = "b62bc046128df83c816a9b199ab5b4a7fcf93837";
+          sha256 = "1gbl08dh172fv8xc0b737cybm3bac5hlm37f50qp0xk4kdbfv2sh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
@@ -72850,12 +73376,12 @@
     vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
     melpaBuild {
         pname = "vue-mode";
-        version = "20170621.652";
+        version = "20170712.930";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "b5ecf28ec78033ddaac69065492fa4fd1d07637e";
-          sha256 = "0bybqffh2fbaah8iyib029v8wq0q9prcaydca4k2fr7hh5snrzwz";
+          rev = "e256f432b9cec9a0294fe3edf1c4965e1de28570";
+          sha256 = "11nrzdqwzd7ib8gv52vplcafiwmv5nm6ql3ahw512zkkb2w3bkza";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -73287,12 +73813,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170613.959";
+        version = "20170709.922";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "8c35710775de9369f0637a9bd5fde39e4074db72";
-          sha256 = "02l948kffqp5fds2gka6klv7myphnaakjk68g35sm98nxvzhf5cl";
+          rev = "e4304bcfa0c5121522ba2a5db75af8a2e4e81246";
+          sha256 = "1pyhipazvhqflpxxdaqjyp7l5vpcp3cbc4qqb5fy1zxnlb5yj62l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -74267,12 +74793,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20170706.349";
+        version = "20170707.1401";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "e300dab6c4be06ae42bc2f1919ed37e8624c3605";
-          sha256 = "07lz63yzjxj1y2524b7cd829srl3dvng7g67kf1377njgyrrgq0f";
+          rev = "791f985f63abe7f10de3fbd6fd49f9efac05a285";
+          sha256 = "0nh12j3bf247q1ikb2apcpbx8nxvvi9rpj4fbsjbnrs0v65n0v4v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -74792,12 +75318,12 @@
     xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-css-mode";
-        version = "20170517.1634";
+        version = "20170713.629";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "a5a19ee45b54eff7eeccd81b65ba42a0e9c7ba4c";
-          sha256 = "1x3vwqpbz06xg2wazg7skgsvgq36cs0445nrk2ahzvqknxh638vr";
+          rev = "df1906547f51f50c7e61ffa6c518a6ffb23d4770";
+          sha256 = "0q93nz5z4awasllnnqs6pzi83mrx8nl7d3mi13ppqhd50sjm0166";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -74813,12 +75339,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170620.1705";
+        version = "20170713.629";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "1ecbe880d6aea24a77a8bd903e2c82225a35caf4";
-          sha256 = "14081cmsm5xrcmfpz5jh92ml0yir0fwvn9pxpf4x93x1wmp6d5r7";
+          rev = "e28f16121619f1a929803ef1274d2853d1b43656";
+          sha256 = "1l7yf3k5gdz7flm8qqzkcdpj3cx9q1kklbl2znkxiyb6rvgh7qf2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -74834,12 +75360,12 @@
     xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-find";
-        version = "20170407.251";
+        version = "20170713.624";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "a83fd078b9b475edc5fd29e0c7d4f02f203e0390";
-          sha256 = "166f4yjz1s6bbjz4cw2n8hgv98ambhjy9qs7hkq9d7jjpcjgyzwr";
+          rev = "d5f12b6185af9674d236a758df16649bfafadf2c";
+          sha256 = "19cg18gh18pp1z862aykfhn44vhnbggr32rrs7smy33nq2h6q512";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
@@ -74855,12 +75381,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170706.348";
+        version = "20170713.626";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "ea43010b362f6b5dd214f2f81daf4c12f6433f40";
-          sha256 = "0cwk3m1179ldb1qk6jx0g156vsqv14h3bqgfyb4yc5bg980ikm61";
+          rev = "23dae1d6d14d238227e1ee0afeef6ef1561b0c31";
+          sha256 = "1mlqhmk9qpa34p30f8m0ylfajzyvq49qvl3hklgrzqgc9xx4yhxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -74876,12 +75402,12 @@
     xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-get-thing";
-        version = "20170527.1806";
+        version = "20170713.628";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-get-thing-or-selection";
-          rev = "5adaf02b8a7464ffb81ae185edb48902a4c3a4d4";
-          sha256 = "16cxk55haln36m57pszxbbyx2h0dzdxagsj2zvm6i2nn0jhyy4v7";
+          rev = "29a82b1a291ad6625b0da152ff1de10455d1831a";
+          sha256 = "1si443vicgq7swr79lc9jv7fxm8x273xajrm6xqahkxzyly2751q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -74897,12 +75423,12 @@
     xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-lookup";
-        version = "20170517.1459";
+        version = "20170713.615";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "lookup-word-on-internet";
-          rev = "3872d3273b472202052dfd63a7d8e388f9517830";
-          sha256 = "0krmxp55gbmbxmzkj293v7i9c9lfxji47g0cmfjiyhzzamz1kdgw";
+          rev = "91645ba91772bf4a1a20765722b72f7e374feacc";
+          sha256 = "0hrs77qllpa77964bwjdmq4bzr47bgc0n57jsaagcdbs7wc6bmc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup";
@@ -74918,12 +75444,12 @@
     xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-math-input";
-        version = "20170210.2128";
+        version = "20170707.2324";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "a4b8aa833f65c028f7f94b9c3b5b8993b8961736";
-          sha256 = "02xin68nrzlg6qaniincj5dk1aw5fbqfb8cj00yjyyjnv55jrbpn";
+          rev = "b944092474e5c9194860dbb6d007a8f2ce98c94c";
+          sha256 = "04ffknah3gmnjkk4wzhbzwj40mxzgwzxqq7cxrg4k86l9wq50pjb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
@@ -74960,12 +75486,12 @@
     xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20170221.2112";
+        version = "20170713.628";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "b5bd1ff843063f6eba32ab71f33f0ebde57d5e41";
-          sha256 = "1m5yd9kwsjy37f2czqhjpj5dkqf62pgj40a4ziy65mch4niw0slz";
+          rev = "62ac5be31f6b2e2ce10f695122e9cb7a9411e1ba";
+          sha256 = "1j3qq54v68nal60zxnc89a7cy5bbsnn1bp97n3giwdk03rla4yk6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -75510,8 +76036,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "40fc1d12a4f69cacf8b6b07d3372dee2969cb2e5";
-          sha256 = "0ahkrgl1isd9bppclk8i72fkm9c0hmhf9i5zc1n9k96c4x9h831i";
+          rev = "1b6d6cc5651a02547415cd571658efcafd9d36fa";
+          sha256 = "0xzw5inzpd2djqx8q276vhiw5j19irkaygnmjn5m5kh2xpzb6aah";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -75693,12 +76219,12 @@
     yara-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yara-mode";
-        version = "20160821.724";
+        version = "20170713.2206";
         src = fetchFromGitHub {
           owner = "binjo";
           repo = "yara-mode";
-          rev = "3ad06bc419329ec9c872fe3292da214b3aa9a1f1";
-          sha256 = "12xdhmxilqfrsqkx8dv5g78c0dcarsfjf3gy928rqjfhgslafbq6";
+          rev = "e3eb352a2e295a8a0955bc3e853f1edfd93cbf81";
+          sha256 = "1dn2ssshwj94nmhd2pnvqdwj0za3iri9ky4kd4w50kj9jz18d1wz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode";
@@ -75753,6 +76279,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yarn-mode";
+        version = "20170709.1237";
+        src = fetchFromGitHub {
+          owner = "anachronic";
+          repo = "yarn-mode";
+          rev = "99891000efe31214b065fa9446cd5e68c5c42ed8";
+          sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode";
+          sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg";
+          name = "yarn-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/yarn-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yascroll";
@@ -75777,12 +76324,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170624.803";
+        version = "20170716.1223";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "65952e30547754eb5ed11750f0cd736095fd6700";
-          sha256 = "1iycbb9rbyks860bigywy9h1607m67aq606068vlq13ivhz18b9f";
+          rev = "2a3a0cd2b18c21fc5f391273045f466c41da743c";
+          sha256 = "09s7ad3wl4rrmdyi0cxmn6vnpkcf97x0g0csy8a8lijsjnrvk4r9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -75880,12 +76427,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 = "20170622.146";
+        version = "20170710.103";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2";
-          sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s";
+          rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
+          sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -76140,12 +76687,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20170607.1301";
+        version = "20170709.1248";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "ab406749083a41e5ca7fe518949a09853f23e5d5";
-          sha256 = "0kanprhczqx14gn87wjwi9x4fg6dn7i64awbwsls4r5nkqf4ykn0";
+          rev = "379df55b3ea6f217e0187fb8cb6df70d02236cec";
+          sha256 = "0nj7qvr0z3gq31db8r3jsdljj93r0cijssbwxgqscvm945jpxc6x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -76536,11 +77083,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170703.2041";
+        version = "20170710.2029";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "d8f7969db645";
-          sha256 = "03xyal7r0gc6r4vx23sx44vcm4fk68dkxyd1x0jw47im4xfmfvzv";
+          rev = "96131375ac74";
+          sha256 = "1p19yy0xyf962rc0j3k4jxl9vyjjyd1ar61wmp6mf6jplj7sxyfl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From b4ee24d5b12c2bdd93dcf5c1e33e433ea4f41659 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 17 Jul 2017 12:13:31 -0400
Subject: [PATCH 0661/3246] pants13-pre: remove from pythonPackages

Sorry, I broke evaluation in my last pants commit!
---
 pkgs/top-level/python-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1dca2d77079..53d76ad3e96 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7990,7 +7990,6 @@ in {
 
   # These used to be here but were moved to all-packages, but I'll leave them around for a while.
   pants = pkgs.pants;
-  pants13-pre = pkgs.pants13-pre;
 
   paperwork-backend = buildPythonPackage rec {
     name = "paperwork-backend-${version}";

From b8d92a7840dd1bb377f83df9aae651624187ebf0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 17 Jul 2017 18:43:05 +0200
Subject: [PATCH 0662/3246] programs.gnupg: use extraInit instead of
 interactiveShellInit

Otherwise some programmes cannot use the GPG agent, e.g. applications
started from dmenu.

Behaviour was changed in #26888, this reverts that part.
---
 nixos/modules/programs/gnupg.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index ea46d5934d9..8af55f38992 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -77,7 +77,7 @@ in
 
     systemd.packages = [ pkgs.gnupg ];
 
-    environment.interactiveShellInit = ''
+    environment.extraInit = ''
       # Bind gpg-agent to this TTY if gpg commands are used.
       export GPG_TTY=$(tty)
 

From c4783a982b3dc45d0e9571d163ade0581788fbbd Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 17 Jul 2017 15:12:07 +0200
Subject: [PATCH 0663/3246] nginx: add gzip_vary to recommended settings

Google PageSpeed recommends turning this on to allow proxies to cache
---
 nixos/modules/services/web-servers/nginx/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index f83413b4534..2310912d0fd 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -65,6 +65,7 @@ let
         gzip_proxied any;
         gzip_comp_level 9;
         gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+        gzip_vary on;
       ''}
 
       ${optionalString (cfg.recommendedProxySettings) ''

From b09d036342d59af60fb5d6ac51296e07961818d9 Mon Sep 17 00:00:00 2001
From: Falco Peijnenburg <fpeijnenburg@gmail.com>
Date: Mon, 17 Jul 2017 15:40:33 +0200
Subject: [PATCH 0664/3246] Strongswan after network-online instead of network

The systemd service file shipped with strongswan has strongswan started after `network-online`. It turns out that this is for good reason: failure to connect on boot otherwise.

See this thread on the mailing list, which my colleague initiated after finding that our NixOS strongswan config wouldn't connect on boot:
https://lists.strongswan.org/pipermail/users/2017-January/010359.html

Tested on a local config (which has the strongswan service config overridden).
---
 nixos/modules/services/networking/strongswan.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
index 8778b0364f9..b0eb0460b9b 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -120,7 +120,7 @@ in
       wantedBy = [ "multi-user.target" ];
       path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux
       wants = [ "keys.target" ];
-      after = [ "network.target" "keys.target" ];
+      after = [ "network-online.target" "keys.target" ];
       environment = {
         STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; };
       };

From 90f0c3b93ee5f87e6ea2b3b3f71aaf3f7ea925f1 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Mon, 17 Jul 2017 21:46:02 +0300
Subject: [PATCH 0665/3246] =?UTF-8?q?html-xml-utils:=206.9=20=E2=86=92=207?=
 =?UTF-8?q?.1,=20macOS=20support?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/text/xml/html-xml-utils/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index 93655df64df..e2445e39e3c 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, curl, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "html-xml-utils-6.9";
+  name = "html-xml-utils-${version}";
+  version = "7.1";
 
   src = fetchurl {
     url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
-
-    sha256 = "1cpshwz60h7xsw1rvv84jl4bn9zjqii9hb8zvwm7a0fahkf03x4w";
+    sha256 = "0vnmcrbnc7irrszx5h71s3mqlp9wqh19zig519zbnr5qccigs3pc";
   };
 
-  meta = {
+  buildInputs = [curl libiconv];
+
+  meta = with stdenv.lib; {
     description = "Utilities for manipulating HTML and XML files";
     homepage = http://www.w3.org/Tools/HTML-XML-utils/;
-    license = stdenv.lib.licenses.w3c;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.w3c;
+    platforms = platforms.all;
   };
 }

From bcbcbd09d3e305c38dc9f0fb06d931c175451bdb Mon Sep 17 00:00:00 2001
From: Tom Smeets <Tom.TSmeets@Gmail.com>
Date: Mon, 17 Jul 2017 21:00:40 +0200
Subject: [PATCH 0666/3246] maintainers: Add myself (Tom Smeets)

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 60f62d1a84e..20957d7fd9f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -558,6 +558,7 @@
   tohl = "Tomas Hlavaty <tom@logand.com>";
   tokudan = "Daniel Frank <git@danielfrank.net>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
+  tomsmeets = "Tom Smeets <tom@tsmeets.nl>";
   travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
   trevorj = "Trevor Joynson <nix@trevor.joynson.io>";
   trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";

From ff41ec7d80f0c932573ea10740a921c1ff6704b7 Mon Sep 17 00:00:00 2001
From: Tom Smeets <Tom.TSmeets@Gmail.com>
Date: Mon, 17 Jul 2017 21:14:28 +0200
Subject: [PATCH 0667/3246] hid-listen: init at 1.01

---
 pkgs/tools/misc/hid-listen/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/hid-listen/default.nix

diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/tools/misc/hid-listen/default.nix
new file mode 100644
index 00000000000..0695fb915e9
--- /dev/null
+++ b/pkgs/tools/misc/hid-listen/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchzip }:
+stdenv.mkDerivation rec {
+  name = "hid-listen";
+  version = "1.01";
+
+  src = fetchzip {
+    name = "hid_listen_${version}";
+    url = "https://www.pjrc.com/teensy/hid_listen_${version}.zip";
+    sha256 = "0sd4dvi39fl4vy880mg531ryks5zglfz5mdyyqr7x6qv056ffx9w";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv ./hid_listen $out/bin/$hid_listen
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool thats prints debugging information from usb HID devices";
+    homepage = https://www.pjrc.com/teensy/hid_listen.html;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ tomsmeets ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f49741b320b..71a4736267f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1033,6 +1033,8 @@ with pkgs;
 
   hexio = callPackage ../development/tools/hexio { };
 
+  hid-listen = callPackage ../tools/misc/hid-listen { };
+
   hostsblock = callPackage ../tools/misc/hostsblock { };
 
   hr = callPackage ../applications/misc/hr { };

From dd7824919eeb7d5e7d7fe8cc0204c02ce0b4014c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Jul 2017 19:51:54 +0200
Subject: [PATCH 0668/3246] LTS Haskell 8.23

---
 .../configuration-hackage2nix.yaml            | 87 ++++++++++---------
 1 file changed, 48 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c3a33e73f77..204a23c6286 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 8.21
+  # LTS Haskell 8.23
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -177,10 +177,11 @@ default-package-overrides:
   - asn1-encoding ==0.9.5
   - asn1-parse ==0.9.4
   - asn1-types ==0.3.2
+  - astro ==0.4.2.0
   - async ==2.1.1.1
   - async-dejafu ==0.1.3.0
   - async-extra ==0.1.0.0
-  - async-refresh ==0.2.0
+  - async-refresh ==0.2.0.2
   - async-refresh-tokens ==0.1.0
   - atom-basic ==0.2.5
   - atom-conduit ==0.4.0.1
@@ -201,7 +202,7 @@ default-package-overrides:
   - avers-api-docs ==0.0.18.0
   - avers-server ==0.0.18.0
   - avwx ==0.3.0.2
-  - b9 ==0.5.31
+  - b9 ==0.5.32
   - backprop ==0.0.3.0
   - bake ==0.5
   - bank-holidays-england ==0.1.0.5
@@ -375,7 +376,7 @@ default-package-overrides:
   - clckwrks-theme-bootstrap ==0.4.2.1
   - cli ==0.1.2
   - clientsession ==0.9.1.2
-  - Clipboard ==2.3.1.0
+  - Clipboard ==2.3.2.0
   - clock ==0.7.2
   - clock-extras ==0.1.0.2
   - clumpiness ==0.17.0.0
@@ -529,7 +530,7 @@ default-package-overrides:
   - diagrams-lib ==1.4.1.2
   - diagrams-postscript ==1.4
   - diagrams-rasterific ==1.4
-  - diagrams-solve ==0.1.0.1
+  - diagrams-solve ==0.1.1
   - diagrams-svg ==1.4.1
   - dice ==0.1
   - dictionaries ==0.1.0.1
@@ -538,7 +539,7 @@ default-package-overrides:
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.0.1.3
-  - direct-sqlite ==2.3.19
+  - direct-sqlite ==2.3.20
   - directory-tree ==0.12.1
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
@@ -576,7 +577,7 @@ default-package-overrides:
   - drifter ==0.2.2
   - drifter-postgresql ==0.1.0
   - dsp ==0.2.3.1
-  - dual-tree ==0.2.0.9
+  - dual-tree ==0.2.1
   - dvorak ==0.1.0.0
   - dynamic-state ==0.2.2.0
   - dyre ==0.8.12
@@ -647,7 +648,7 @@ default-package-overrides:
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9
   - extensible ==0.3.7
-  - extensible-effects ==1.11.0.4
+  - extensible-effects ==1.11.1.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.5.3
   - extract-dependencies ==0.2.0.1
@@ -699,13 +700,13 @@ default-package-overrides:
   - foldl ==1.2.5
   - foldl-statistics ==0.1.4.6
   - folds ==0.7.3
-  - FontyFruity ==0.5.3.2
+  - FontyFruity ==0.5.3.3
   - force-layout ==0.4.0.6
   - foreign-store ==0.2
   - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
-  - foundation ==0.0.12
+  - foundation ==0.0.13
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
@@ -944,7 +945,7 @@ default-package-overrides:
   - haskeline ==0.7.4.0
   - haskell-gi ==0.20.2
   - haskell-gi-base ==0.20.3
-  - haskell-import-graph ==1.0.1
+  - haskell-import-graph ==1.0.2
   - haskell-lexer ==1.0.1
   - haskell-names ==0.8.0
   - haskell-neo4j-client ==0.3.2.4
@@ -1106,7 +1107,7 @@ default-package-overrides:
   - http-client-openssl ==0.2.0.5
   - http-client-tls ==0.3.5.1
   - http-common ==0.8.2.0
-  - http-conduit ==2.2.3.1
+  - http-conduit ==2.2.3.2
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.6.4
@@ -1249,7 +1250,7 @@ default-package-overrides:
   - language-c ==0.5.0
   - language-c-quote ==0.11.7.3
   - language-dockerfile ==0.3.6.0
-  - language-ecmascript ==0.17.1.0
+  - language-ecmascript ==0.17.2.0
   - language-fortran ==0.5.1
   - language-glsl ==0.2.0
   - language-haskell-extract ==0.2.4
@@ -1356,7 +1357,7 @@ default-package-overrides:
   - mega-sdist ==0.3.0.2
   - megaparsec ==5.2.0
   - memory ==0.14.6
-  - MemoTrie ==0.6.7
+  - MemoTrie ==0.6.8
   - mersenne-random ==1.0.0.1
   - mersenne-random-pure64 ==0.2.2.0
   - messagepack ==0.5.4
@@ -1385,12 +1386,13 @@ default-package-overrides:
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
   - mixed-types-num ==0.1.0.1
+  - mltool ==0.1.0.2
   - mmap ==0.5.9
   - mmorph ==1.0.9
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
   - modify-fasta ==0.8.2.3
-  - monad-control ==1.0.2.0
+  - monad-control ==1.0.2.1
   - monad-coroutine ==0.9.0.3
   - monad-extras ==0.6.0
   - monad-http ==0.1.0.0
@@ -1516,6 +1518,7 @@ default-package-overrides:
   - once ==0.2
   - one-liner ==0.9.1
   - OneTuple ==0.2.1
+  - Only ==0.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.5.3.0
   - opaleye-trans ==0.3.5
@@ -1588,13 +1591,13 @@ default-package-overrides:
   - phantom-state ==0.2.1.2
   - picedit ==0.2.3.0
   - picoparsec ==0.1.2.3
-  - pid1 ==0.1.0.1
+  - pid1 ==0.1.2.0
   - pinboard ==0.9.12.4
   - pinch ==0.3.2.0
   - pinchot ==0.24.0.0
   - pipes ==4.3.4
   - pipes-attoparsec ==0.5.1.5
-  - pipes-bytestring ==2.1.5
+  - pipes-bytestring ==2.1.6
   - pipes-cacophony ==0.4.1
   - pipes-category ==0.2.0.1
   - pipes-concurrency ==2.0.7
@@ -1653,6 +1656,11 @@ default-package-overrides:
   - pretty-simple ==2.0.0.0
   - pretty-types ==0.2.3.1
   - prettyclass ==1.0.0.0
+  - prettyprinter ==1.1
+  - prettyprinter-ansi-terminal ==1.1
+  - prettyprinter-compat-annotated-wl-pprint ==1
+  - prettyprinter-compat-ansi-wl-pprint ==1.0.1
+  - prettyprinter-compat-wl-pprint ==1.0.0.1
   - primes ==0.2.1.0
   - primitive ==0.6.1.0
   - printcess ==0.1.0.3
@@ -1675,13 +1683,13 @@ default-package-overrides:
   - proto-lens-protoc ==0.2.1.0
   - protobuf ==0.2.1.1
   - protobuf-simple ==0.1.0.4
-  - protocol-buffers ==2.4.0
-  - protocol-buffers-descriptor ==2.4.0
+  - protocol-buffers ==2.4.2
+  - protocol-buffers-descriptor ==2.4.2
   - protolude ==0.1.10
   - proxied ==0.2
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
-  - psqueues ==0.2.2.3
+  - psqueues ==0.2.3.0
   - publicsuffix ==0.20170109
   - pure-cdb ==0.1.2
   - pure-io ==0.2.1
@@ -1698,7 +1706,7 @@ default-package-overrides:
   - quickcheck-assertions ==0.3.0
   - quickcheck-instances ==0.3.12
   - quickcheck-io ==0.1.4
-  - quickcheck-simple ==0.1.0.1
+  - quickcheck-simple ==0.1.0.2
   - quickcheck-special ==0.1.0.5
   - quickcheck-text ==0.1.2.1
   - quickcheck-unicode ==1.0.1.0
@@ -1805,7 +1813,7 @@ default-package-overrides:
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
   - safe ==0.3.15
-  - safe-exceptions ==0.1.5.0
+  - safe-exceptions ==0.1.6.0
   - safe-exceptions-checked ==0.1.0
   - safecopy ==0.9.3.2
   - SafeSemaphore ==0.10.1
@@ -1819,7 +1827,7 @@ default-package-overrides:
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
-  - scientific ==0.3.4.15
+  - scientific ==0.3.5.1
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.5
   - scrypt ==0.5.0
@@ -1849,7 +1857,7 @@ default-package-overrides:
   - servant-elm ==0.4.0.1
   - servant-foreign ==0.9.1.1
   - servant-js ==0.9.3
-  - servant-JuicyPixels ==0.3.0.2
+  - servant-JuicyPixels ==0.3.0.3
   - servant-lucid ==0.7.1
   - servant-mock ==0.8.1.1
   - servant-purescript ==0.6.0.0
@@ -1935,16 +1943,16 @@ default-package-overrides:
   - Spock-worker ==0.3.1.0
   - spool ==0.1
   - spoon ==0.3.1
-  - spreadsheet ==0.1.3.4
+  - spreadsheet ==0.1.3.5
   - sql-words ==0.1.5.0
-  - sqlite-simple ==0.4.13.0
+  - sqlite-simple ==0.4.14.0
   - sqlite-simple-errors ==0.6.0.0
   - srcloc ==0.5.1.1
   - stache ==0.2.2
   - stack-run-auto ==0.1.1.4
   - stack-type ==0.1.0.0
   - stackage-curator ==0.14.5
-  - stackage-query ==0.1.0
+  - stackage-query ==0.1.1
   - stackage-types ==1.2.0
   - state-plus ==0.1.3
   - stateref ==0.3
@@ -1975,7 +1983,7 @@ default-package-overrides:
   - store ==0.4.3.1
   - store-core ==0.4.1
   - Strafunski-StrategyLib ==5.0.0.10
-  - stratosphere ==0.4.3
+  - stratosphere ==0.4.4
   - streaming ==0.1.4.5
   - streaming-bytestring ==0.1.4.6
   - streaming-commons ==0.1.17
@@ -2006,7 +2014,7 @@ default-package-overrides:
   - svg-tree ==0.6.1
   - SVGFonts ==1.6.0.1
   - swagger ==0.3.0
-  - swagger2 ==2.1.4
+  - swagger2 ==2.1.4.1
   - syb ==0.6
   - syb-with-class ==0.6.1.7
   - symbol ==0.2.4
@@ -2029,7 +2037,7 @@ default-package-overrides:
   - tar ==0.5.0.3
   - tar-conduit ==0.1.1
   - tardis ==0.4.1.0
-  - tasty ==0.11.2.1
+  - tasty ==0.11.2.2
   - tasty-ant-xml ==1.0.5
   - tasty-auto ==0.1.0.2
   - tasty-dejafu ==0.3.0.2
@@ -2073,7 +2081,7 @@ default-package-overrides:
   - test-invariant ==0.4.5.0
   - test-simple ==0.1.9
   - testing-feat ==0.4.0.3
-  - texmath ==0.9.4
+  - texmath ==0.9.4.1
   - text ==1.2.2.1
   - text-all ==0.3.1.0
   - text-binary ==0.2.1.1
@@ -2095,14 +2103,14 @@ default-package-overrides:
   - tf-random ==0.5
   - tfp ==1.0.0.2
   - th-abstraction ==0.2.3.0
-  - th-data-compat ==0.0.2.2
+  - th-data-compat ==0.0.2.4
   - th-desugar ==1.6
   - th-expand-syns ==0.4.3.0
   - th-extras ==0.0.0.4
   - th-lift ==0.7.7
   - th-lift-instances ==0.1.11
   - th-orphans ==0.13.3
-  - th-reify-compat ==0.0.1.1
+  - th-reify-compat ==0.0.1.2
   - th-reify-many ==0.1.7
   - th-to-exp ==0.0.1.0
   - th-utilities ==0.2.0.1
@@ -2132,6 +2140,7 @@ default-package-overrides:
   - titlecase ==0.1.0.3
   - tls ==1.3.11
   - tls-debug ==0.4.4
+  - tls-session-manager ==0.0.0.0
   - token-bucket ==0.1.0.1
   - tostring ==0.2.1.1
   - tracy ==0.1.4.0
@@ -2173,7 +2182,7 @@ default-package-overrides:
   - typography-geometry ==1.0.0.1
   - tz ==0.1.2.1
   - tzdata ==0.1.20161123.0
-  - ua-parser ==0.7.3
+  - ua-parser ==0.7.4
   - uglymemo ==0.1.0.1
   - unagi-chan ==0.4.0.0
   - unbound ==0.5.1
@@ -2262,7 +2271,7 @@ default-package-overrides:
   - wai-extra ==3.0.20.0
   - wai-handler-launch ==3.0.2.2
   - wai-logger ==2.3.0
-  - wai-middleware-auth ==0.1.2.0
+  - wai-middleware-auth ==0.1.2.1
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
@@ -2284,13 +2293,13 @@ default-package-overrides:
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.1
   - waitra ==0.0.4.0
-  - warp ==3.2.12
-  - warp-tls ==3.2.3
+  - warp ==3.2.13
+  - warp-tls ==3.2.4
   - wave ==0.1.5
   - wavefront ==0.7.1
   - wavefront-obj ==0.1.0.1
   - web-plugins ==0.2.9
-  - web-routes ==0.27.11
+  - web-routes ==0.27.12
   - web-routes-boomerang ==0.28.4.2
   - web-routes-happstack ==0.23.10
   - web-routes-hsp ==0.24.6.1
@@ -2373,7 +2382,7 @@ default-package-overrides:
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
   - yahoo-finance-api ==0.2.0.2
-  - yaml ==0.8.23.1
+  - yaml ==0.8.23.3
   - Yampa ==0.10.6
   - YampaSynth ==0.2
   - yes-precure5-command ==5.5.3

From 6de60af3a9ae5fc05e5c903012ee02c9505642a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Jul 2017 19:53:20 +0200
Subject: [PATCH 0669/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.3.1-12-gcb2265e from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f69cfc36c9bc2a52f9c3de9d0cc823a00db59705.
---
 .../haskell-modules/hackage-packages.nix      | 2731 ++++++++++-------
 1 file changed, 1628 insertions(+), 1103 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1f6a39b8651..8c361341960 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1411,13 +1411,25 @@ self: {
      }) {};
 
   "BiobaseBlast" = callPackage
-    ({ mkDerivation, array, base, BiobaseXNA, containers }:
+    ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes
+     , BiobaseXNA, bytestring, cereal, containers, deepseq, directory
+     , filepath, PrimitiveArray, split, tasty, tasty-quickcheck
+     , tasty-silver, tasty-th, vector, vector-th-unbox
+     }:
      mkDerivation {
        pname = "BiobaseBlast";
-       version = "0.0.0.1";
-       sha256 = "1p7f2azq92shmxvs3n683mr5965qkmijbj4ya6333cd7nilwgl0f";
-       libraryHaskellDepends = [ array base BiobaseXNA containers ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
+       version = "0.2.0.0";
+       sha256 = "0x4skz0akhhxplwk7v7jnyfgih4iwv8p5lkfh2cn1dm79bkbyj53";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary BiobaseTypes BiobaseXNA bytestring
+         cereal containers deepseq directory PrimitiveArray vector
+         vector-th-unbox
+       ];
+       testHaskellDepends = [
+         base bytestring containers filepath split tasty tasty-quickcheck
+         tasty-silver tasty-th
+       ];
+       homepage = "https://github.com/choener/BiobaseBlast";
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1528,18 +1540,23 @@ self: {
 
   "BiobaseNewick" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, cereal
-     , cereal-text, containers, fgl, ForestStructures, QuickCheck
-     , test-framework, test-framework-quickcheck2, test-framework-th
-     , text, text-binary, vector
+     , cereal-text, cmdargs, containers, fgl, ForestStructures
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     , test-framework-th, text, text-binary, vector
      }:
      mkDerivation {
        pname = "BiobaseNewick";
-       version = "0.0.0.1";
-       sha256 = "0izhxk24zjf767ng0gcjmcjfnngk0zh01a2sbd6icmmb45zaw75s";
+       version = "0.0.0.2";
+       sha256 = "1g8kdmraxv0qf3nzm7hi36nhw0j8kyjmjlwslp7a5n2zly2gcck4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base binary cereal cereal-text containers fgl
          ForestStructures QuickCheck text text-binary vector
        ];
+       executableHaskellDepends = [
+         base cmdargs ForestStructures text vector
+       ];
        testHaskellDepends = [
          aeson base binary cereal QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
@@ -2806,8 +2823,8 @@ self: {
     ({ mkDerivation, base, directory, unix, utf8-string, X11 }:
      mkDerivation {
        pname = "Clipboard";
-       version = "2.3.1.0";
-       sha256 = "1qsky3gh99l4csswd8w5iwx81v4cvg89h1wbr74ys0gswgiqbfyx";
+       version = "2.3.2.0";
+       sha256 = "1dr5ifmy5azib140bri9rzlq69jic430v9cv372jb42r78cci0iz";
        libraryHaskellDepends = [ base directory unix utf8-string X11 ];
        homepage = "http://haskell.org/haskellwiki/Clipboard";
        description = "System clipboard interface";
@@ -5447,22 +5464,6 @@ self: {
      }) {};
 
   "FontyFruity" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , directory, filepath, text, vector, xml
-     }:
-     mkDerivation {
-       pname = "FontyFruity";
-       version = "0.5.3.2";
-       sha256 = "05f558p3288qfg8prfvb28cc7mwd5nk07ias87xflq5x81pnw6c7";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq directory filepath text
-         vector xml
-       ];
-       description = "A true type file format loader";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "FontyFruity_0_5_3_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, filepath, text, vector, xml
      }:
@@ -5476,7 +5477,6 @@ self: {
        ];
        description = "A true type file format loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ForSyDe" = callPackage
@@ -5501,19 +5501,19 @@ self: {
 
   "ForestStructures" = callPackage
     ({ mkDerivation, base, containers, criterion, fgl, QuickCheck
-     , test-framework, test-framework-quickcheck2, test-framework-th
-     , unordered-containers, vector, vector-th-unbox
+     , tasty, tasty-quickcheck, tasty-th, unordered-containers, vector
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "ForestStructures";
-       version = "0.0.0.1";
-       sha256 = "04yiag6dwp2k4679b1ardccqayrq7503wxzy7y9a9pf2s558f7j5";
+       version = "0.0.0.2";
+       sha256 = "0gv9hvwbql015k28xvphx4dllpfp5dgi36l3bkg48630xrzhcx7y";
        libraryHaskellDepends = [
-         base containers fgl unordered-containers vector vector-th-unbox
+         base containers fgl QuickCheck unordered-containers vector
+         vector-th-unbox
        ];
        testHaskellDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
-         test-framework-th
+         base containers QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/choener/ForestStructures";
@@ -7138,6 +7138,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HDBC-session_0_1_1_1" = callPackage
+    ({ mkDerivation, base, HDBC }:
+     mkDerivation {
+       pname = "HDBC-session";
+       version = "0.1.1.1";
+       sha256 = "16ffb6fd6y3qxms6pf4qyc2b03pvnz62bbzrlszp7j48z1alwp15";
+       libraryHaskellDepends = [ base HDBC ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Bracketed connection for HDBC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HDBC-sqlite3" = callPackage
     ({ mkDerivation, base, bytestring, HDBC, mtl, sqlite, utf8-string
      }:
@@ -8772,6 +8785,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HaTeX_3_17_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hashable, matrix
+     , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
+     , wl-pprint-extras
+     }:
+     mkDerivation {
+       pname = "HaTeX";
+       version = "3.17.3.0";
+       sha256 = "1p1nimr7cjn7iizdkpxfr97c8ycz6gpn6jm6qgyllmwp3bnzkial";
+       libraryHaskellDepends = [
+         base bytestring containers hashable 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HaTeX-meta" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
      , haddock, haskell-src-exts, mtl, parsec
@@ -9224,8 +9259,8 @@ self: {
      }:
      mkDerivation {
        pname = "Hastodon";
-       version = "0.0.2";
-       sha256 = "1w55kiqbg1qz402xiydkj71h9qqz4fd40xa702ai18047a84s7pf";
+       version = "0.1.0";
+       sha256 = "012b8f2jb297bnx7sgsvz0vw0ic0xmlrr0b7fs65y6ycll6ih2zw";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types MissingH text
        ];
@@ -9431,6 +9466,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "Hipmunk-Utils" = callPackage
+    ({ mkDerivation, base, Hipmunk, linear, StateVar }:
+     mkDerivation {
+       pname = "Hipmunk-Utils";
+       version = "0.1.0.0";
+       sha256 = "0bybsm350fkqiwsmyd0x4ck4jrnzs1i0cdvww70dcbd2m4r099mm";
+       libraryHaskellDepends = [ base Hipmunk linear StateVar ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/suzumiyasmith/Hipmunk-Utils#readme";
+       description = "Useful functions for Hipmunk";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "HipmunkPlayground" = callPackage
     ({ mkDerivation, base, containers, GLFW, Hipmunk, OpenGL, StateVar
      , transformers
@@ -11890,8 +11938,8 @@ self: {
     ({ mkDerivation, base, newtype-generics }:
      mkDerivation {
        pname = "MemoTrie";
-       version = "0.6.7";
-       sha256 = "0whnqibl1has9s3dnkf4l5aimma8flxl7b2467fq5scl2gf07ayd";
+       version = "0.6.8";
+       sha256 = "194x8a1x8ch5xwpxaagrmpsjca92x1zjiq6dlqdgckyr49blknaz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base newtype-generics ];
@@ -22020,14 +22068,14 @@ self: {
 
   "aivika" = callPackage
     ({ mkDerivation, array, base, binary, containers, deepseq, mtl
-     , random, vector
+     , mwc-random, random, vector
      }:
      mkDerivation {
        pname = "aivika";
-       version = "5.1";
-       sha256 = "1mmpqmcvsx3qygwm8iszhcdnafp09vbnnklkskd1qsg55nisp0ps";
+       version = "5.2";
+       sha256 = "19d9bshjf5sivgzcbb0yl00i1z1kq3jr6xr7gddikh9wl0flnp9r";
        libraryHaskellDepends = [
-         array base binary containers deepseq mtl random vector
+         array base binary containers deepseq mtl mwc-random random vector
        ];
        homepage = "http://www.aivikasoft.com";
        description = "A multi-method simulation library";
@@ -22036,14 +22084,14 @@ self: {
 
   "aivika-branches" = callPackage
     ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl
-     , random
+     , mwc-random, random
      }:
      mkDerivation {
        pname = "aivika-branches";
-       version = "0.2";
-       sha256 = "0riavp8jvsxmlqxjljm0dsijvrc0vknhkrjgf9g501g5yypd6byy";
+       version = "0.3";
+       sha256 = "1xb7l92vhaccfx9n83x6viamnkxy97c6a3plcf7gllijzrc4i1pf";
        libraryHaskellDepends = [
-         aivika aivika-transformers base containers mtl random
+         aivika aivika-transformers base containers mtl mwc-random random
        ];
        homepage = "http://www.aivikasoft.com";
        description = "Nested discrete event simulation module for the Aivika library";
@@ -22052,16 +22100,16 @@ self: {
 
   "aivika-distributed" = callPackage
     ({ mkDerivation, aivika, aivika-transformers, base, binary
-     , containers, distributed-process, exceptions, mtl, random, stm
-     , time
+     , containers, distributed-process, exceptions, mtl, mwc-random
+     , random, stm, time
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "0.5";
-       sha256 = "0ghsnq1a9jfrdgaf4gqplka53ywnr8jbabz4ikdzvrh80nnf3gpc";
+       version = "0.6";
+       sha256 = "02i557qians780vzi6fvffwm967j4k2p0iphvj423lk6qywyvdy5";
        libraryHaskellDepends = [
          aivika aivika-transformers base binary containers
-         distributed-process exceptions mtl random stm time
+         distributed-process exceptions mtl mwc-random random stm time
        ];
        homepage = "http://www.aivikasoft.com";
        description = "Parallel distributed discrete event simulation module for the Aivika library";
@@ -22136,16 +22184,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aivika-gpss" = callPackage
+    ({ mkDerivation, aivika, aivika-transformers, base, containers
+     , hashable, mtl, unordered-containers
+     }:
+     mkDerivation {
+       pname = "aivika-gpss";
+       version = "0.3";
+       sha256 = "00pmkhyyk12di9kc1z9zsab44sprra9j5l0byb0h74526jrrcq2b";
+       libraryHaskellDepends = [
+         aivika aivika-transformers base containers hashable mtl
+         unordered-containers
+       ];
+       homepage = "http://www.aivikasoft.com";
+       description = "GPSS-like DSL for Aivika";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aivika-lattice" = callPackage
     ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl
-     , random
+     , mwc-random, random
      }:
      mkDerivation {
        pname = "aivika-lattice";
-       version = "0.2";
-       sha256 = "0bd3xwga4cq2qibywq20rnl7fhhxs7ax1dl13ylcaxbg0sxyd0cj";
+       version = "0.3";
+       sha256 = "1770w2jbfyvcrdsvlh00l7861ckxk37yk4qc27fmigd060gbz552";
        libraryHaskellDepends = [
-         aivika aivika-transformers base containers mtl random
+         aivika aivika-transformers base containers mtl mwc-random random
        ];
        homepage = "http://www.aivikasoft.com";
        description = "Nested discrete event simulation module for the Aivika library using lattice";
@@ -22154,15 +22219,15 @@ self: {
 
   "aivika-realtime" = callPackage
     ({ mkDerivation, aivika, aivika-transformers, async, base
-     , containers, mtl, random, stm, time
+     , containers, mtl, mwc-random, random, stm, time, vector
      }:
      mkDerivation {
        pname = "aivika-realtime";
-       version = "0.2";
-       sha256 = "0dbbhf55w1i2wfr8lw3y5k2a51kw3223gnfhbamzz2283g5n80pg";
+       version = "0.3";
+       sha256 = "1qprmkklyna16n56zxkaryy0fawvc9mjws0mcw87bcl56m18npcm";
        libraryHaskellDepends = [
-         aivika aivika-transformers async base containers mtl random stm
-         time
+         aivika aivika-transformers async base containers mtl mwc-random
+         random stm time vector
        ];
        homepage = "http://www.aivikasoft.com";
        description = "Soft real-time simulation module for the Aivika library";
@@ -22170,15 +22235,15 @@ self: {
      }) {};
 
   "aivika-transformers" = callPackage
-    ({ mkDerivation, aivika, array, base, containers, mtl, random
-     , vector
+    ({ mkDerivation, aivika, array, base, containers, mtl, mwc-random
+     , random, vector
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "5.1";
-       sha256 = "0ihwgql0ilavwx81f3z902r51p180b4facicd4sximnyg6qankdr";
+       version = "5.2";
+       sha256 = "1mz5wa66xazhh5x2wm01d7ixqg82zxls0ggkbixcjdm23a0560c1";
        libraryHaskellDepends = [
-         aivika array base containers mtl random vector
+         aivika array base containers mtl mwc-random random vector
        ];
        homepage = "http://www.aivikasoft.com";
        description = "Transformers for the Aivika simulation library";
@@ -24808,8 +24873,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp-conduit";
-       version = "0.2.0.0";
-       sha256 = "1mlapyp22bbnkz7ny2rs2da6a6nbs41j8ljsjlxv1x9cfnjzjayb";
+       version = "0.3.0.0";
+       sha256 = "0w4i8jk7s8j341nx6qsmvlj7n2nnpwy3vzvkfnbzkphy0abyg0yn";
        libraryHaskellDepends = [
          amqp base conduit exceptions lifted-base monad-control mtl
          resourcet text transformers transformers-base
@@ -27352,8 +27417,8 @@ self: {
     ({ mkDerivation, base, process, text }:
      mkDerivation {
        pname = "aspell-pipe";
-       version = "0.2";
-       sha256 = "11m2w8365amqy0r9ll2xyfrc07i4gcizyfvf0ayihvzaw1ciynkg";
+       version = "0.3";
+       sha256 = "1jl332g0v3zsjx4c340y5cw8rfpi527gki86y14zps6rb9b9nvzi";
        libraryHaskellDepends = [ base process text ];
        description = "Pipe-based interface to the Aspell program";
        license = stdenv.lib.licenses.bsd3;
@@ -27496,8 +27561,8 @@ self: {
      }:
      mkDerivation {
        pname = "astro";
-       version = "0.4.1.3";
-       sha256 = "1zakvwzdrlpqb8rx1bypb59gra3kxwb5yjwxgphzi9icgmd7y07p";
+       version = "0.4.2.0";
+       sha256 = "1bj7zmgr4i23ig5jwc9w2sc967569325gdjwyrf6xm100hzw5zc6";
        libraryHaskellDepends = [ base matrix time ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -27677,28 +27742,6 @@ self: {
      }) {};
 
   "async-refresh" = callPackage
-    ({ mkDerivation, base, criterion, formatting, HUnit, lens
-     , lifted-async, monad-control, monad-logger, safe-exceptions, stm
-     , test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "async-refresh";
-       version = "0.2.0";
-       sha256 = "075v54j8fivzchkrj4pnxpj0v36qd7q1yfslvvr0dm5k6qr0p498";
-       libraryHaskellDepends = [
-         base formatting lens lifted-async monad-control monad-logger
-         safe-exceptions stm text
-       ];
-       testHaskellDepends = [
-         base criterion HUnit monad-logger stm test-framework
-         test-framework-hunit text
-       ];
-       homepage = "https://github.com/mtesseract/async-refresh";
-       description = "Package implementing core logic for refreshing of expiring data";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "async-refresh_0_2_0_2" = callPackage
     ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async
      , microlens, microlens-th, monad-control, monad-logger
      , safe-exceptions, stm, test-framework, test-framework-hunit, text
@@ -27718,7 +27761,6 @@ self: {
        homepage = "https://github.com/mtesseract/async-refresh";
        description = "Package implementing core logic for refreshing of expiring data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-refresh-tokens" = callPackage
@@ -28927,8 +28969,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "11";
-       editedCabalFile = "0panmqlzp0mq004fc0rm6fywrmc07cgwsp2567g4v1ay8g812ls2";
+       revision = "12";
+       editedCabalFile = "0qkaww4mvkhc56vkfqi6a7i0hkdy6zwshlqyd0cnw2p1b6cv6zy1";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -29873,8 +29915,8 @@ self: {
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.5.31";
-       sha256 = "15bw30n89yhdskngsr8nfi78ks07fsy0n1mgq6h76vwgm1l9pk4d";
+       version = "0.5.32";
+       sha256 = "0d3ymgk83kfxzfd0a9x97sjcax4vd27p2dskpfiykqsn7wgylhhw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30727,6 +30769,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "basic-cpuid" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "basic-cpuid";
+       version = "0.1.0.0";
+       sha256 = "0gz4jpdp0zjn5yils4wplrg2mghpmxsh9f9yv07n81qb8mxwhg5p";
+       libraryHaskellDepends = [ base ];
+       description = "A small package to access the cpuid instruction directly";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "basic-lens" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -33450,6 +33503,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bit-stream" = callPackage
+    ({ mkDerivation, base, criterion, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, vector
+     }:
+     mkDerivation {
+       pname = "bit-stream";
+       version = "0.1.0.0";
+       sha256 = "1nn7yb15a1nlqjjmz0i4r53gh5wravp07faygn0hrvzvhwghgx1s";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         vector
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/Bodigrim/bit-stream#readme";
+       description = "Lazy, infinite, compact stream of 'Bool' with O(1) indexing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bit-vector" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
      , tasty-th, vector
@@ -35082,6 +35156,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bno055-haskell" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, h2c, mtl, resourcet }:
+     mkDerivation {
+       pname = "bno055-haskell";
+       version = "0.1.0";
+       sha256 = "1n4s0ljlgf1qrlyzaj161nbx7sa162v26p0i2i17n12m8zwjkp3s";
+       libraryHaskellDepends = [
+         base bytestring cereal h2c mtl resourcet
+       ];
+       homepage = "https://bitbucket.org/fmapE/bno055-haskell";
+       description = "Library for communication with the Bosch BNO055 orientation sensor";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "board-games" = callPackage
     ({ mkDerivation, array, base, cgi, containers, html, httpd-shed
      , network-uri, QuickCheck, random, transformers, utility-ht
@@ -35936,21 +36024,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_19" = callPackage
+  "brick_0_20_1" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-clist
      , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
      , template-haskell, text, text-zipper, transformers, vector, vty
+     , word-wrap
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.19";
-       sha256 = "17n8qcds1pv5vijpzw0w47qijcjxcydf3glwjxj645y0k8lpdcl1";
+       version = "0.20.1";
+       sha256 = "1yhxs2p83nrv9b5lw9cd21f6r735sjxkamhmc2vv8d63z2fncz0f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers contravariant data-clist deepseq dlist microlens
          microlens-mtl microlens-th stm template-haskell text text-zipper
-         transformers vector vty
+         transformers vector vty word-wrap
        ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
@@ -40473,6 +40562,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk2 = pkgs.gnome2.gtk;};
 
+  "celtchar" = callPackage
+    ({ mkDerivation, base, directory, file-embed, filepath, hspec
+     , megaparsec, mtl, ogmarkup, optparse-generic, pandoc
+     , raw-strings-qq, shakespeare, text, yaml
+     }:
+     mkDerivation {
+       pname = "celtchar";
+       version = "0.1.0.1";
+       sha256 = "19br3ygxn6r4qvix3d9dy71w5nwfxhy5h7qavpkk6k3nl6jmawaj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath megaparsec mtl ogmarkup pandoc shakespeare text yaml
+       ];
+       executableHaskellDepends = [
+         base directory file-embed filepath optparse-generic text
+       ];
+       testHaskellDepends = [ base hspec raw-strings-qq ];
+       homepage = "https://github.com/ogma-project/celtchar#readme";
+       description = "A tool to build a novel";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cerberus" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, cmdargs
      , conduit-extra, ekg, ekg-core, hslogger, http-client
@@ -41217,16 +41329,21 @@ self: {
 
   "chatwork" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
-     , data-default-class, http-client, http-client-tls, http-types, req
-     , text
+     , data-default-class, hspec, http-api-data, http-client
+     , http-client-tls, http-types, req, servant-server, text, warp
      }:
      mkDerivation {
        pname = "chatwork";
-       version = "0.1.0.0";
-       sha256 = "1harahpwd3m8d4qyf7lswhragpsin0qdj7j97jl482qkzvnpzbmf";
+       version = "0.1.1.0";
+       sha256 = "0xslzn94qhzidayv0nd8rfm9jvfi38dygvwd1lj7vwjgd4yrxy1m";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring connection data-default-class
-         http-client http-client-tls http-types req text
+         http-api-data http-client http-client-tls http-types req text
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing base bytestring connection data-default-class
+         hspec http-api-data http-client http-client-tls http-types req
+         servant-server text warp
        ];
        homepage = "https://github.com/matsubara0507/chatwork#readme";
        description = "The ChatWork API in Haskell";
@@ -41509,8 +41626,8 @@ self: {
      }:
      mkDerivation {
        pname = "chorale";
-       version = "0.1.7";
-       sha256 = "0p8y4lg53gp4wbvb23l9bjy6hn1w1kpwwil02np9acjrxvifjyjw";
+       version = "0.1.8";
+       sha256 = "0k7xavjscl0xpjrz0w3nh473clkaw58126xch66qykm3l361zgc4";
        libraryHaskellDepends = [ base containers safe ];
        testHaskellDepends = [
          base containers HUnit ieee754 QuickCheck safe test-framework
@@ -41761,6 +41878,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "church-pair" = callPackage
+    ({ mkDerivation, base, bifunctors, semigroups, transformers }:
+     mkDerivation {
+       pname = "church-pair";
+       version = "0.1.0.1";
+       sha256 = "1vrbfmzsysfqdxfah54w9kw0j9qaa0f514yz7qzflp8qgah6rckk";
+       libraryHaskellDepends = [
+         base bifunctors semigroups transformers
+       ];
+       description = "Church encoded pair";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cielo" = callPackage
     ({ mkDerivation, aeson, base, bytestring, convertible, data-default
      , hspec, http-client, http-types, lens, mtl, pretty-show
@@ -44064,8 +44194,8 @@ self: {
      }:
      mkDerivation {
        pname = "codec-rpm";
-       version = "0.1.1";
-       sha256 = "0qn79jr1z382kf08r5v48lj1zpsi88sxsvi0vwkv3ijz7gfx2lni";
+       version = "0.1.2";
+       sha256 = "15rdraaqzgp7qga8075rfk1vg2w10vj47nnfb584acc66gsc0k8i";
        libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring conduit
          conduit-combinators conduit-extra mtl parsec pretty resourcet text
@@ -47869,10 +47999,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot";
-       version = "2.2.0";
-       sha256 = "0ls81h1akdvpzgmicv55qi2w1zjxjsz264wkzdgl6qzvpd465djs";
-       revision = "3";
-       editedCabalFile = "0v3dmjz234kfjggrk7m2zwh03q6sgnmb3y4mizqc4qd9acnlhrjm";
+       version = "2.2.1";
+       sha256 = "04bfrxvz04jcc1favl21xb4qbj3gd0par0xg1f11r5s73ldnghb9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47895,8 +48023,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-c99";
-       version = "2.2.0";
-       sha256 = "173ydqyr2y4plhk1a8vlkvagk13yjrk65jd9h0hd08fv899gbfg9";
+       version = "2.2.1";
+       sha256 = "1wyw1jiicx39x7iscy9rld7pnfpan8xfp8lphn7b658hipw0v4aq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47917,8 +48045,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-cbmc";
-       version = "2.2.0";
-       sha256 = "03mf7kr808ww39a6g1brih8in7q8v4j9gz649kl4p1i8kk4fd7xc";
+       version = "2.2.1";
+       sha256 = "0xcm6qgylhvnjaih1jbl4dripik10nqm6536rdspj6kzg81qifd9";
        libraryHaskellDepends = [
          base bytestring copilot-c99 copilot-core copilot-sbv directory
          pretty process
@@ -47934,8 +48062,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-core";
-       version = "2.2.0";
-       sha256 = "18b0y28c40hbx2wpc7xim5dh3ph0g0lh9ksl6sq7jqfnaiwnr6ia";
+       version = "2.2.1";
+       sha256 = "1mzxb24chxfrkpr4487dxkwbnhaysyxsrv4y38ma76nq141xr105";
        libraryHaskellDepends = [
          base containers dlist mtl pretty pretty-ncols random
        ];
@@ -47949,10 +48077,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-language";
-       version = "2.2.0";
-       sha256 = "0z0jpwq5zx6f6fp6xk58n2s66d7r2ngd3xbkiabhd7w1a22wkfrm";
-       revision = "1";
-       editedCabalFile = "1bshf179n6l1svv86n46rk7pxdlas8nx6haj1fni9xg45ggipdks";
+       version = "2.2.1";
+       sha256 = "1pv54iwzcyvw46xq6am2l23sw223n8b9fqc910dkf2kjr6y6q6v8";
        libraryHaskellDepends = [
          array base containers copilot-core copilot-theorem data-reify
          ghc-prim mtl
@@ -47968,12 +48094,12 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-libraries";
-       version = "2.2.0";
-       sha256 = "0aqbyms7d33vklm702j36a4vw1m674h7zbqkzbkn6yzxnz76gbm6";
+       version = "2.2.1";
+       sha256 = "0ashnay40kkbysnbz8ay0r7ljzwkx07m4z960kfjnh3y6s5qk6ww";
        libraryHaskellDepends = [
          array base containers copilot-language mtl parsec
        ];
-       homepage = "https://github.com/leepike/copilot-libraries";
+       homepage = "https://github.com/Copilot-Language/copilot-libraries";
        description = "Libraries for the Copilot language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47985,8 +48111,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-sbv";
-       version = "2.2.0";
-       sha256 = "1blxhpv9ipamd2p40cdpbsx6dp27rrzqaj2rn0a6p11wz8378rcd";
+       version = "2.2.1";
+       sha256 = "00gym2xadw7zi5mrkfrnvxi6cr7c5rgmbwiflrif63j2q7v0z25l";
        libraryHaskellDepends = [
          base containers copilot-core directory filepath pretty sbv
        ];
@@ -48001,8 +48127,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-theorem";
-       version = "2.2.0";
-       sha256 = "037kbhl86h6yrfjr3fyvrbxy1mkm5akic4gnxgsrbing5yylhjf2";
+       version = "2.2.1";
+       sha256 = "1qw46k26f6cisyjmjn0d9g7sjkx67vpydiqm7l9f1hib4dygcznx";
        libraryHaskellDepends = [
          ansi-terminal base bimap containers copilot-core data-default
          directory mtl parsec pretty process random smtlib2 transformers xml
@@ -49462,6 +49588,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cron_0_6_0" = callPackage
+    ({ mkDerivation, attoparsec, base, criterion, 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.6.0";
+       sha256 = "0s40b0dlkrwhx3sqbca0a883wd54xbkgqfz4w0ncmsb06x3sdx04";
+       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
+       ];
+       benchmarkHaskellDepends = [ attoparsec base criterion text time ];
+       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
@@ -50125,15 +50276,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "cryptonite_0_23" = callPackage
+  "cryptonite_0_24" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, foundation
      , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
      , tasty-kat, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.23";
-       sha256 = "1680dxgmnjgj083jhsw3rlljwaw0zqi5099m59x6kwqkxhn1qjpf";
+       version = "0.24";
+       sha256 = "11js3fg1rbrgy17i0nq19v9w4w28s80zglb6fnlbz6zg8cik3hqp";
        libraryHaskellDepends = [
          base bytestring deepseq foundation ghc-prim integer-gmp memory
        ];
@@ -51960,8 +52111,8 @@ self: {
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "data-clist";
-       version = "0.1.1.0";
-       sha256 = "1dkd2qshc2srfafhbhqnq70hks74ngnqbmzdiiaccylx2cpbs2ms";
+       version = "0.1.2.0";
+       sha256 = "09hn47fa2y3gpbl6zdahi0qdn4m17kfg7bwc4ch6024kir73fg6f";
        libraryHaskellDepends = [ base deepseq QuickCheck ];
        homepage = "https://github.com/sw17ch/data-clist";
        description = "Simple functional ring type";
@@ -52243,18 +52394,36 @@ self: {
      }) {};
 
   "data-diverse" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, hspec, lens, tagged }:
+    ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
+     , hspec, tagged
+     }:
      mkDerivation {
        pname = "data-diverse";
-       version = "0.5.0.0";
-       sha256 = "0cr67dpfbzayw2hhg8zf4yqwgbkjn5dislh7r96fjz1mkif6m0zz";
-       libraryHaskellDepends = [ base containers ghc-prim lens tagged ];
-       testHaskellDepends = [ base hspec lens tagged ];
+       version = "0.8.1.0";
+       sha256 = "1lav14j4p01wym8s7j3haliiaj16lyglw5bbp7gn2xk3xg7z1k3p";
+       libraryHaskellDepends = [
+         base containers deepseq ghc-prim tagged
+       ];
+       testHaskellDepends = [ base hspec tagged ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/louispan/data-diverse#readme";
        description = "Extensible records and polymorphic variants";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-diverse-lens" = callPackage
+    ({ mkDerivation, base, data-diverse, hspec, lens, tagged }:
+     mkDerivation {
+       pname = "data-diverse-lens";
+       version = "0.1.1.0";
+       sha256 = "0arwpab3a88jdpcg1pnj96dfdhfnnzf5za3l8cfwzbsjrc5ddl44";
+       libraryHaskellDepends = [ base data-diverse lens tagged ];
+       testHaskellDepends = [ base data-diverse hspec lens tagged ];
+       homepage = "https://github.com/louispan/data-diverse-lens#readme";
+       description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-dword" = callPackage
     ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty
      , tasty-quickcheck, template-haskell
@@ -54351,21 +54520,21 @@ self: {
     ({ mkDerivation, base, bytestring, bzlib, containers, directory
      , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl
      , network, network-uri, old-locale, parsec, pretty, process
-     , process-extras, pureMD5, regex-compat, regex-tdfa
+     , process-extras, pureMD5, regex-compat, regex-tdfa, SHA
      , template-haskell, text, time, unix, Unixutils, utf8-string, zlib
      }:
      mkDerivation {
        pname = "debian";
-       version = "3.91.2";
-       sha256 = "0mhd5q2lx8x6ldijfk1w8ghpgncism10yyar5d39an7gcbalmc8n";
+       version = "3.93.2";
+       sha256 = "1a1brh07lvrchdll0aabmzikv7inlbaspx0nv3xa94cmzkgvr30l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring bzlib containers directory either exceptions
          filepath HaXml HUnit ListLike mtl network network-uri old-locale
          parsec pretty process process-extras pureMD5 regex-compat
-         regex-tdfa template-haskell text time unix Unixutils utf8-string
-         zlib
+         regex-tdfa SHA template-haskell text time unix Unixutils
+         utf8-string zlib
        ];
        executableHaskellDepends = [
          base directory filepath HaXml pretty process unix
@@ -56328,18 +56497,6 @@ self: {
      }) {};
 
   "diagrams-solve" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "diagrams-solve";
-       version = "0.1.0.1";
-       sha256 = "1piv8mi5182b2ggr28fnr4mda4vbk4mzasvy0nfp3517ii63mrbi";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Pure Haskell solver routines used by diagrams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-solve_0_1_1" = callPackage
     ({ mkDerivation, base, deepseq, tasty, tasty-hunit
      , tasty-quickcheck
      }:
@@ -56354,7 +56511,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Pure Haskell solver routines used by diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-svg" = callPackage
@@ -57286,23 +57442,6 @@ self: {
      }) {};
 
   "direct-sqlite" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, directory
-     , HUnit, temporary, text
-     }:
-     mkDerivation {
-       pname = "direct-sqlite";
-       version = "2.3.19";
-       sha256 = "0g7bwv1496qb1lgz15q83zjg8ddw1icpb98i70zrxpcdi2crnzpl";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring directory HUnit temporary text
-       ];
-       homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "direct-sqlite_2_3_20" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, directory
      , HUnit, temporary, text
      }:
@@ -57317,7 +57456,6 @@ self: {
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "directed-cubical" = callPackage
@@ -60116,17 +60254,6 @@ self: {
      }) {};
 
   "dual-tree" = callPackage
-    ({ mkDerivation, base, monoid-extras, newtype, semigroups }:
-     mkDerivation {
-       pname = "dual-tree";
-       version = "0.2.0.9";
-       sha256 = "193ncl8l186gxrfj5pszbmlwjw4gljlkziddql0dyqhr8yxhlzay";
-       libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
-       description = "Rose trees with cached and accumulating monoidal annotations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dual-tree_0_2_1" = callPackage
     ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck
      , semigroups, testing-feat
      }:
@@ -60142,7 +60269,6 @@ self: {
        ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "duckling" = callPackage
@@ -60769,6 +60895,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ease" = callPackage
+    ({ mkDerivation, base, data-default }:
+     mkDerivation {
+       pname = "ease";
+       version = "0.1.0.0";
+       sha256 = "17zj7s0qq3y4w6qd06hi4fc54m4j1f07wxm7yfnc47lsg5n9f4g0";
+       libraryHaskellDepends = [ base data-default ];
+       description = "Robert Penner's easing equations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "easy-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, either, http-conduit, mtl
      , resourcet, text
@@ -61746,8 +61883,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-elasticsearch";
-       version = "0.3.0.0";
-       sha256 = "0xv32kzsvl2g4vs9ygga3xn0x9dqm9vn8zg7hbj8agxrfnvprqvw";
+       version = "0.3.1.1";
+       sha256 = "0v78xrmnxx6z0lgx8lvc15hmd0zgm2kqibvkf9sj3cdza75vsr1q";
        libraryHaskellDepends = [
          aeson base bytestring ekg-core hostname http-client lens text time
          unordered-containers wreq
@@ -61913,6 +62050,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "elenco-albero" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "elenco-albero";
+       version = "1.0.0";
+       sha256 = "1plqdvyy4ln1cg2195bx6wpylnscj8b7zvks24qmq6sqskhckspr";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://bitbucket.org/ciezbit/elenco-albero";
+       description = "make tree from a list";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "elerea" = callPackage
     ({ mkDerivation, base, containers, transformers, transformers-base
      }:
@@ -64706,6 +64856,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventstore_0_15_0_1" = callPackage
+    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+     , cereal, clock, connection, containers, dns, dotnet-timespan
+     , ekg-core, exceptions, fast-logger, hashable, http-client
+     , interpolate, lifted-async, lifted-base, machines, monad-control
+     , monad-logger, mono-traversable, mtl, protobuf, random
+     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
+     , tasty-hunit, text, text-format, time, transformers-base
+     , unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "0.15.0.1";
+       sha256 = "0h6747m8xc1w37wqwjxy3w549cpmivjhrnmcfc3i7yn54rcyn3lv";
+       libraryHaskellDepends = [
+         aeson array base bifunctors bytestring cereal clock connection
+         containers dns dotnet-timespan ekg-core exceptions fast-logger
+         hashable http-client interpolate lifted-async lifted-base machines
+         monad-control monad-logger mono-traversable mtl protobuf random
+         safe-exceptions semigroups stm stm-chans text text-format time
+         transformers-base unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring cereal connection containers
+         dotnet-timespan exceptions fast-logger hashable lifted-async
+         lifted-base monad-control mono-traversable protobuf safe-exceptions
+         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
+         transformers-base unordered-containers uuid
+       ];
+       homepage = "https://github.com/YoEight/eventstore#readme";
+       description = "EventStore TCP Client";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "every" = callPackage
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
@@ -65602,8 +65788,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "1.11.0.4";
-       sha256 = "04vr4bwm7vz0r5i0j3rk80qz3m08d3gv99s1adhlyhflk6lgp4mg";
+       version = "1.11.1.0";
+       sha256 = "1z2k79pxy73rh7fxp70zbnzrcnqs9kchwm6hciyl2wr66bf58v4b";
        libraryHaskellDepends = [
          base transformers transformers-base type-aligned void
        ];
@@ -67770,6 +67956,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "filter-logger" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
+     , bytestring, data-default, fast-logger, http-types, HUnit, scotty
+     , semigroups, time, wai, wai-extra, wai-logger
+     }:
+     mkDerivation {
+       pname = "filter-logger";
+       version = "0.6.0.0";
+       sha256 = "089gcirir6dwp2p61349dyvgk596cb8vgswkydzpy2lmar01513q";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal base bytestring data-default
+         fast-logger http-types semigroups time wai wai-extra wai-logger
+       ];
+       executableHaskellDepends = [ aeson base bytestring scotty ];
+       testHaskellDepends = [ base bytestring HUnit ];
+       homepage = "https://github.com/caneroj1/filter-logger#readme";
+       description = "Filterable request logging wai middleware. Change how data is logged and when.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "filtrable" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -67817,8 +68025,8 @@ self: {
      }:
      mkDerivation {
        pname = "find-clumpiness";
-       version = "0.2.1.2";
-       sha256 = "06gzzbqkkn6xjc0x0vky082g9s3hgmx0ihkwpggna8svfs7dikz9";
+       version = "0.2.1.3";
+       sha256 = "08jkzkq7xw9nfv30qc9xh5nf31lqbd92smx95an6ch74hf7jb7p7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69510,8 +69718,8 @@ self: {
     ({ mkDerivation, base, xml }:
      mkDerivation {
        pname = "folgerhs";
-       version = "0.1.0.0";
-       sha256 = "1gvsvy17n2dk7j9kd6k7h1q2a4sn8xz80sv9mcrvz9qhrsinvbzv";
+       version = "0.1.0.1";
+       sha256 = "0kn89abvbk7faynhsyg177rayxddvwnkgsjb5cng8044n9glw9sb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base xml ];
@@ -69786,10 +69994,8 @@ self: {
      }:
      mkDerivation {
        pname = "forma";
-       version = "0.1.0";
-       sha256 = "10aqvr12hn6knzx0byz56ash4c3ss4r2bb80szl0dj2brasfzsaa";
-       revision = "2";
-       editedCabalFile = "00xy3385aw4xic7xv5ysfsvcxcn4bsbg9hj7sss4d7gx77ci0lf2";
+       version = "0.2.0";
+       sha256 = "05rd0v908imlfvp5m3lb5mc629790yyazsj79rpx0svhnxgsgl00";
        libraryHaskellDepends = [
          aeson base containers data-default-class mtl text
          unordered-containers
@@ -70133,8 +70339,8 @@ self: {
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.12";
-       sha256 = "1dlrknx0rhi1vjiw8pb25n5ml5rfahhhvwj64svdg51zm3m3aiyr";
+       version = "0.0.13";
+       sha256 = "0pvmq3lkbdzj861l7jkf5xsib77j756y0vml8kgr2rckpz5qashh";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -74548,6 +74754,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-timers" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ghc-timers";
+       version = "0.1.0.0";
+       sha256 = "074pvam1mb5sranh04i6xcs55vgk3h45vg0mdxnbxc3jmmv76lgi";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/bitonic/ghc-timers#readme";
+       description = "Provides bindings to functions starting and stopping the RTS timers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-typelits-extra" = callPackage
     ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
@@ -74869,8 +75087,8 @@ self: {
     ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
      mkDerivation {
        pname = "ghcjs-dom";
-       version = "0.9.0.0";
-       sha256 = "0z55qfvnyq5z22ynmnrxdymq6jgcs7ps04bznqna4fbcvlqy0zm9";
+       version = "0.9.1.1";
+       sha256 = "1932qq067cfl0g87457qgk4zdxxr4fx2an37z8l0zw1x221yi696";
        libraryHaskellDepends = [
          base ghcjs-dom-jsaddle text transformers
        ];
@@ -74906,8 +75124,8 @@ self: {
     ({ mkDerivation, jsaddle-dom }:
      mkDerivation {
        pname = "ghcjs-dom-jsaddle";
-       version = "0.9.0.0";
-       sha256 = "0ghk8nvfhwm5zwwiws2621gk08x73w11v0cab5nsdpyz1qn0dl5j";
+       version = "0.9.1.0";
+       sha256 = "120i3j07lk75lk59gi6pg56dka35r0vh97kj22cj4472qz0ix3sp";
        libraryHaskellDepends = [ jsaddle-dom ];
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -74919,8 +75137,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "ghcjs-dom-jsffi";
-       version = "0.9.0.0";
-       sha256 = "1q04gibg5jlqs287vwig43bxyi9gpy951mfpmv17qky8b50sxkmc";
+       version = "0.9.1.1";
+       sha256 = "1hx8w7x5j2gznkk32yplnnm657hyfk41lcxl4iinsjkm0lrlq54i";
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75509,8 +75727,7 @@ self: {
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, text, transformers, webkitgtk24x
-     , webkitgtk24x-gtk3
+     , haskell-gi-base, text, transformers, webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
@@ -75521,13 +75738,13 @@ self: {
          base bytestring containers haskell-gi haskell-gi-base text
          transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ];
+       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;};
+     }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "gi-javascriptcore_4_0_12" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
@@ -75736,7 +75953,7 @@ self: {
     ({ 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
-     , text, transformers, webkitgtk24x, webkitgtk24x-gtk3
+     , text, transformers, webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "gi-webkit";
@@ -75748,13 +75965,13 @@ self: {
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
          haskell-gi haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ];
+       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;};
+     }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "gi-webkit2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -77389,24 +77606,24 @@ self: {
   "glirc" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , bytestring, Cabal, config-schema, config-value, containers
-     , directory, filepath, gitrev, hashable, hookup, HsOpenSSL, HUnit
-     , irc-core, kan-extensions, lens, network, process, regex-tdfa
-     , semigroupoids, socks, split, stm, text, time, transformers, unix
-     , unordered-containers, vector, vty
+     , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
+     , HUnit, irc-core, kan-extensions, lens, network, process
+     , regex-tdfa, semigroupoids, socks, split, stm, template-haskell
+     , text, time, transformers, unix, unordered-containers, vector, vty
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.22";
-       sha256 = "02kfxarddlb7yjj17slvn28pz49m27l7ag06milxjg0k157dxkpi";
+       version = "2.23";
+       sha256 = "0iv4n6i63f1x1808a3dvrbxyibi7jd1c8barsqbf9h1bqwazgsah";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
          async attoparsec base base64-bytestring bytestring config-schema
-         config-value containers directory filepath gitrev hashable hookup
-         HsOpenSSL irc-core kan-extensions lens network process regex-tdfa
-         semigroupoids socks split stm text time transformers unix
-         unordered-containers vector vty
+         config-value containers directory filepath free gitrev hashable
+         hookup HsOpenSSL irc-core kan-extensions lens network process
+         regex-tdfa semigroupoids socks split stm template-haskell text time
+         transformers unix unordered-containers vector vty
        ];
        executableHaskellDepends = [ base lens text vty ];
        testHaskellDepends = [ base HUnit ];
@@ -78014,8 +78231,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.2.9";
-       sha256 = "083simwpm3d9jk1iaymb2sbkaa98yxg3ngg0rmvl8vk015p7hcxr";
+       version = "0.2.10";
+       sha256 = "1x5libj6rwrf39m1ksz5gzqldd7xy07glgk47cvjlszs9l5cq5i2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78306,7 +78523,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol_0_2_0" = callPackage
+  "gogol_0_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
      , conduit-extra, cryptonite, directory, exceptions, filepath
      , gogol-core, http-client, http-conduit, http-media, http-types
@@ -78316,8 +78533,8 @@ self: {
      }:
      mkDerivation {
        pname = "gogol";
-       version = "0.2.0";
-       sha256 = "13vci3bb7kh3mq4vb2b4zayl4cjvfxy64qsjwpaqjy563hbn5k2w";
+       version = "0.3.0";
+       sha256 = "0cb4kbdw8gyd8h0wkw8h55jabd7i1q523ki9ssjn19inb5pgjwv2";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive conduit conduit-extra
          cryptonite directory exceptions filepath gogol-core http-client
@@ -78343,12 +78560,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-adexchange-buyer_0_2_0" = callPackage
+  "gogol-adexchange-buyer_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adexchange-buyer";
-       version = "0.2.0";
-       sha256 = "1x1wqy2bbiw0kyni2swr8mcwpbqjvin5j8vxnc7vl4qiw8rkz1rx";
+       version = "0.3.0";
+       sha256 = "1hn2cn3p7jkqvpy0qq3hakcnrns4j2j961zg4xbb8z4mjjj3fgm8";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Buyer SDK";
@@ -78368,12 +78585,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-adexchange-seller_0_2_0" = callPackage
+  "gogol-adexchange-seller_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adexchange-seller";
-       version = "0.2.0";
-       sha256 = "1gpkksklsn0py5ih25gncrl988j4c06z6swqjx5v1mh297d35pj7";
+       version = "0.3.0";
+       sha256 = "1r8pvad01qjdv040agfisnj0183la74p44hvppa0zzbjsybv5n99";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Seller SDK";
@@ -78393,12 +78610,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-admin-datatransfer_0_2_0" = callPackage
+  "gogol-admin-datatransfer_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-datatransfer";
-       version = "0.2.0";
-       sha256 = "0apglzdmcdivc2s2ig1msx6ymzras0ppznb0k0xpm384sc60p5jh";
+       version = "0.3.0";
+       sha256 = "1qjlhg4kgfy93rl2nzivvdhjpyaf4csm4nl097ny649dmxjjf1q9";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Data Transfer SDK";
@@ -78418,12 +78635,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-admin-directory_0_2_0" = callPackage
+  "gogol-admin-directory_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-directory";
-       version = "0.2.0";
-       sha256 = "0wh7nb6w7qyljm4lp9d66wzy6aaf9q7wai5l1bjh62b5az9cw16z";
+       version = "0.3.0";
+       sha256 = "0pb3ymvx6hw46i1iwrvc4zv7mkmjwjk8w4q6h91jph7kv98kpmpk";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Directory SDK";
@@ -78443,12 +78660,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-admin-emailmigration_0_2_0" = callPackage
+  "gogol-admin-emailmigration_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-emailmigration";
-       version = "0.2.0";
-       sha256 = "1ljq9f7z510y2jch4rd4dmic13smmz5jm5gh27lykryalvx6fwmk";
+       version = "0.3.0";
+       sha256 = "1d7w4fv4v54mja7yx8rf29ms1hbjnkjgly54fqx5h4xyfgypymca";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Email Migration API v2 SDK";
@@ -78468,6 +78685,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-admin-reports_0_3_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-admin-reports";
+       version = "0.3.0";
+       sha256 = "0fms60bb7vyn3kkrg5j53x7f2r5111xy922w7a3i7xb04lsbxv3j";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Admin Reports SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-adsense" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -78480,12 +78710,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-adsense_0_2_0" = callPackage
+  "gogol-adsense_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense";
-       version = "0.2.0";
-       sha256 = "0k6vljav25pvdhhp7sab9f3qr398lx14mx9dqinp99lbkh9r7zcn";
+       version = "0.3.0";
+       sha256 = "0dispksc95m3ig409f44fl57jz4lqnhljhk6y957d520sf1arv53";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Management SDK";
@@ -78505,12 +78735,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-adsense-host_0_2_0" = callPackage
+  "gogol-adsense-host_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense-host";
-       version = "0.2.0";
-       sha256 = "1cvk1i7c86c5hjbfylfi0l2r3samqbkpd12278czsyz0npwcfbzm";
+       version = "0.3.0";
+       sha256 = "1rvglzr4a2lilknrdjla0s47gdkp5n2z6kpwcl0gfgdr00fbrcrw";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Host SDK";
@@ -78530,12 +78760,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-affiliates_0_2_0" = callPackage
+  "gogol-affiliates_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-affiliates";
-       version = "0.2.0";
-       sha256 = "11s3v77ap9p79cq1b4s1j3m8s9h1kbzqwygx65p2fpr935fdddw3";
+       version = "0.3.0";
+       sha256 = "1h7kx1ra0vz8pgvcjvj5ip44h077s9q5m7ixplq5vzrr4wdbrvvf";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Affiliate Network SDK";
@@ -78555,12 +78785,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-analytics_0_2_0" = callPackage
+  "gogol-analytics_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-analytics";
-       version = "0.2.0";
-       sha256 = "1ni9yhd06g0ifqwlcxczd792vgrnd5hy4zsiqnyxqrvq2jdzqm1q";
+       version = "0.3.0";
+       sha256 = "0myggz1cxq88q3s1sbw5v5zhcmrybjkqj9zd0ap6x4sa7qrp7dys";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Analytics SDK";
@@ -78580,12 +78810,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-android-enterprise_0_2_0" = callPackage
+  "gogol-android-enterprise_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-android-enterprise";
-       version = "0.2.0";
-       sha256 = "1snm8npkvsk1jc2wyn0c6k39cfv606nwpil0j4hiwm57mv7iyxp1";
+       version = "0.3.0";
+       sha256 = "0lnliq42ykmizlr8g43ic99lzk5rc7j1l3dl81xbymw0dq0frbcm";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play EMM SDK";
@@ -78605,12 +78835,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-android-publisher_0_2_0" = callPackage
+  "gogol-android-publisher_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-android-publisher";
-       version = "0.2.0";
-       sha256 = "18qd7361hnps7i7fsjjm66civ28y2spwgynng5x0g7x2qmpv8zf2";
+       version = "0.3.0";
+       sha256 = "1cf449zz6ahnqa71fqa25brj5h11xhbq4chw4hn2vczjwz8s6vrv";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Developer SDK";
@@ -78630,12 +78860,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-appengine_0_2_0" = callPackage
+  "gogol-appengine_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-appengine";
-       version = "0.2.0";
-       sha256 = "1r9msaj6z0afiv7vkl19pah3px8zjp8wb9x1y6sc6f8bjhwad77m";
+       version = "0.3.0";
+       sha256 = "131m4hqf84j4r2xjdbpsp95iww4sbxyw3lvn80pnddrzmvaj52hr";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App Engine Admin SDK";
@@ -78655,12 +78885,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-apps-activity_0_2_0" = callPackage
+  "gogol-apps-activity_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-activity";
-       version = "0.2.0";
-       sha256 = "1229hkj6vpvra1cwci5kj83hpg4kpn2f4z52lg6knphnaid8vjxm";
+       version = "0.3.0";
+       sha256 = "0ci85yml0sjjkwxcyfnb1xsw93zkvll0n6fb35kci1h07ywvl8d2";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Activity SDK";
@@ -78680,12 +78910,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-apps-calendar_0_2_0" = callPackage
+  "gogol-apps-calendar_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-calendar";
-       version = "0.2.0";
-       sha256 = "1bpw9zz6py1wyp6p9ipp5qv26y19papp2g2gxwdgskq8q72p45qv";
+       version = "0.3.0";
+       sha256 = "0gjill8hdkhp385i0ay6isb8rm6zcxh6ymdb7389wv6nhzpf5p3x";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Calendar SDK";
@@ -78705,12 +78935,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-apps-licensing_0_2_0" = callPackage
+  "gogol-apps-licensing_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-licensing";
-       version = "0.2.0";
-       sha256 = "11kaqj55s70kdl1iaymhcrhvlzpixrf1k2m52i0kmmw1z6c8fmhx";
+       version = "0.3.0";
+       sha256 = "0l7yknlp4c2qh0a86q504a6h0gnb0s8jd4glii30qsnim52pijhp";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise License Manager SDK";
@@ -78730,12 +78960,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-apps-reseller_0_2_0" = callPackage
+  "gogol-apps-reseller_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-reseller";
-       version = "0.2.0";
-       sha256 = "02zn3sjdm2v8q26a741n7v1zkl2iv81n5glddd60sk8304yxikwp";
+       version = "0.3.0";
+       sha256 = "119mlxr6yxmym9pgcmhix9m2s1s9i5zgh2pa3zzayk0jnqjjdpn4";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise Apps Reseller SDK";
@@ -78755,12 +78985,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-apps-tasks_0_2_0" = callPackage
+  "gogol-apps-tasks_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-tasks";
-       version = "0.2.0";
-       sha256 = "178phj5iml51qkih8k19vw2lzn3bfigkb5ikfb1kz547v1ixk42h";
+       version = "0.3.0";
+       sha256 = "0mcnz2qiymjriqplypzl3gycn9cyc362a38962b4ci7g718wx74v";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tasks SDK";
@@ -78780,12 +79010,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-appstate_0_2_0" = callPackage
+  "gogol-appstate_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-appstate";
-       version = "0.2.0";
-       sha256 = "1bn4b2b87rccw5261hl0jfw16xkwms2j8akh56s6z3p76r09gkqg";
+       version = "0.3.0";
+       sha256 = "129f5gdiq5gbdi6dg6ddz1cq2m0jjp48q7vk5lkxrr82iig05jkw";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App State SDK";
@@ -78805,12 +79035,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-autoscaler_0_2_0" = callPackage
+  "gogol-autoscaler_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-autoscaler";
-       version = "0.2.0";
-       sha256 = "173p6kmx38dvkzf9lz0xnd1h6zb7dc0ib5i58m3kpkcfqxfzbpcr";
+       version = "0.3.0";
+       sha256 = "0insf84wrnn98yqfm6scfmzjnxdj9hikz7wy0cg0vk25dpc2mhp0";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Autoscaler SDK";
@@ -78830,12 +79060,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-bigquery_0_2_0" = callPackage
+  "gogol-bigquery_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-bigquery";
-       version = "0.2.0";
-       sha256 = "1glqis8m21bhq0jxmviwvkh2xm7ikdca83yrb6nnwprpfxb3mkn3";
+       version = "0.3.0";
+       sha256 = "1zs497pxcpd87rhblg02bvi0wsqj16ym74v3kgm2mhwfw4spqv9z";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google BigQuery SDK";
@@ -78855,12 +79085,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-billing_0_2_0" = callPackage
+  "gogol-billing_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-billing";
-       version = "0.2.0";
-       sha256 = "1sgk3fx87p307m15iwrfn04ig0m9h2mpj4rqwjgvvb6jl36ngn2j";
+       version = "0.3.0";
+       sha256 = "12scf28cj2rr0r4z1g0y4ik22gd3yh5sy2wdllydi05qv1cffqbf";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Billing SDK";
@@ -78880,12 +79110,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-blogger_0_2_0" = callPackage
+  "gogol-blogger_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-blogger";
-       version = "0.2.0";
-       sha256 = "012zpc0b81pdjs3izq5v2h8dxxy0jjjpmjxxwzg5azsxpdcv2raa";
+       version = "0.3.0";
+       sha256 = "08p1hjm29xsmvbb9dj7krr7i1wapn32g9wh283ia2zajys6zscl7";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Blogger SDK";
@@ -78905,12 +79135,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-books_0_2_0" = callPackage
+  "gogol-books_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-books";
-       version = "0.2.0";
-       sha256 = "0373fv46mblw1c2mls8z2281n1j57df9wc57kf01ic5f8f4m42xx";
+       version = "0.3.0";
+       sha256 = "08g2ah36fk3a6val2p1wczd9b3h7zqp1a4ka7nrn3f9m04say5hs";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Books SDK";
@@ -78930,12 +79160,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-civicinfo_0_2_0" = callPackage
+  "gogol-civicinfo_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-civicinfo";
-       version = "0.2.0";
-       sha256 = "1hskyvwqym6d4865pvgrxpcbngissxiyixn6aimn7nlfmxzg2cvc";
+       version = "0.3.0";
+       sha256 = "0sgw2jgwki4nmyg9igavf8g2myxr8qnf4nif00jn236rg26pfr2d";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Civic Information SDK";
@@ -78955,12 +79185,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-classroom_0_2_0" = callPackage
+  "gogol-classroom_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-classroom";
-       version = "0.2.0";
-       sha256 = "0c5jyz0rhhg4ab05nzkj736iddgn975qpm21vhb16pnb7da03cdp";
+       version = "0.3.0";
+       sha256 = "1bij8szdrxlcfz8xl5472k8rfl10ffnq7hlq38za2pmm9jfhn2dn";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Classroom SDK";
@@ -78980,12 +79210,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-cloudmonitoring_0_2_0" = callPackage
+  "gogol-cloudmonitoring_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-cloudmonitoring";
-       version = "0.2.0";
-       sha256 = "1407agqnr99cifxbb31q8kf7cx5rl7z2rf0hxzmb82p5lwl7hmp2";
+       version = "0.3.0";
+       sha256 = "01mfc8f6vl3n499p4f70inak68g83yxc5pci485sxgwvfx078glx";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Monitoring SDK";
@@ -79005,12 +79235,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-cloudtrace_0_2_0" = callPackage
+  "gogol-cloudtrace_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-cloudtrace";
-       version = "0.2.0";
-       sha256 = "0aslcpxmf8dwpgw20f62p53fsayjqrqfi9zd81qcwgz9pzza369p";
+       version = "0.3.0";
+       sha256 = "1r2whm4s5dwhg9davw9qpcabwhpasyfd7qkjw471xnpnwrq4vcb6";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Trace SDK";
@@ -79030,12 +79260,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-compute_0_2_0" = callPackage
+  "gogol-compute_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-compute";
-       version = "0.2.0";
-       sha256 = "0qnzk9xvj39kkdy68iaab59q6qcivrhdbwi2qp2c3s3nbcy78r02";
+       version = "0.3.0";
+       sha256 = "0v902dgjn0hzf42di0kr159p9scpnsha7wxap4fj933x5pv7c97s";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine SDK";
@@ -79055,12 +79285,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-container_0_2_0" = callPackage
+  "gogol-container_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-container";
-       version = "0.2.0";
-       sha256 = "1fxwyc121n8zl98wp1aj6007nja4vfx6w2b7m4mrrkf5dw44id1x";
+       version = "0.3.0";
+       sha256 = "1vxl3k48mdfn3rnlld5rmgkjv30pfvg9agz6k2v9pbci5i9kbl8i";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Container Engine SDK";
@@ -79072,8 +79302,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-containerbuilder";
-       version = "0.2.0";
-       sha256 = "1xyizdpmgdqrfl4jwaya19rdzq75zwm0wiwq9ciq4a6nzzswhrjm";
+       version = "0.3.0";
+       sha256 = "15k8d8b58hggfw5izdmzkl44jkaiv1l0gfx237ciwmjjvaw5fdfy";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Container Builder SDK";
@@ -79106,7 +79336,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-core_0_2_0_1" = callPackage
+  "gogol-core_0_3_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, dlist, exceptions, hashable
      , http-api-data, http-client, http-media, http-types, lens
@@ -79115,8 +79345,8 @@ self: {
      }:
      mkDerivation {
        pname = "gogol-core";
-       version = "0.2.0.1";
-       sha256 = "03ig25l09jgmpyk705if6vdvacklkc7pzhj1jxcskg3lxhv5mrk2";
+       version = "0.3.0";
+       sha256 = "140chk0fb35zi7y0p908c7irwhqcgdw45iqpmrzzf2p238wlza7z";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit dlist exceptions hashable http-api-data http-client
@@ -79142,12 +79372,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-customsearch_0_2_0" = callPackage
+  "gogol-customsearch_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-customsearch";
-       version = "0.2.0";
-       sha256 = "0wjyy5m1hdxkai2g7mi8pva3jly0qgbcinyqyndqb9sjlvqdwv69";
+       version = "0.3.0";
+       sha256 = "075r7j4z9i1jbw6hznrq3ndb23yrp9xpqmwq64laqmh4mw3c47zj";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google CustomSearch SDK";
@@ -79168,12 +79398,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "gogol-dataflow_0_2_0" = callPackage
+  "gogol-dataflow_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dataflow";
-       version = "0.2.0";
-       sha256 = "1zqjpj0ry25hvj36m4i558k9rhh0xvabgkz60ms76cs550qhana5";
+       version = "0.3.0";
+       sha256 = "1cvzhvfipjpvprhgw2rdw9xsrkyka7cdfdk9716x4admly221qcx";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Dataflow SDK";
@@ -79193,12 +79423,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-dataproc_0_2_0" = callPackage
+  "gogol-dataproc_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dataproc";
-       version = "0.2.0";
-       sha256 = "0cq5x9ry0i5xlp1nxa4cg9564xblql6ar0v85sc4giikw3ga0ybv";
+       version = "0.3.0";
+       sha256 = "1b1s148xslz23ibcrx0gifim6kc5f3fsgfdnwh2n4bp0djvp8zy0";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Dataproc SDK";
@@ -79218,12 +79448,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-datastore_0_2_0" = callPackage
+  "gogol-datastore_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-datastore";
-       version = "0.2.0";
-       sha256 = "0mrqxi7syzpkc92ij6zn86p7301r86j01kma0vjcm8hfm69sdm2w";
+       version = "0.3.0";
+       sha256 = "0wdxvslimfhfm0nw8qv88av14gxjpfif9rxxp3gv8png0qf1qs25";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Datastore SDK";
@@ -79243,12 +79473,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-debugger_0_2_0" = callPackage
+  "gogol-debugger_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-debugger";
-       version = "0.2.0";
-       sha256 = "1ql2m2b19vkqkc4gfl9j39izv1awnnifb1bvkl1jy7li5bvr6aql";
+       version = "0.3.0";
+       sha256 = "05qjl7lg62xc5y6yycn98yk6d0qpk60caafw7q9drrgrdz5k7s7v";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Debugger SDK";
@@ -79268,12 +79498,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-deploymentmanager_0_2_0" = callPackage
+  "gogol-deploymentmanager_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-deploymentmanager";
-       version = "0.2.0";
-       sha256 = "00xccnjv5caj2fs358vqg8p5n7lgdiixi8ghmy85za0h9mc3injx";
+       version = "0.3.0";
+       sha256 = "01lc27xp2gry9fws5ysq46hld30fxh4lfr7p9lw4985ir82llb9s";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Deployment Manager SDK";
@@ -79293,12 +79523,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-dfareporting_0_2_0" = callPackage
+  "gogol-dfareporting_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dfareporting";
-       version = "0.2.0";
-       sha256 = "091ca105psyxz0n2rbl2flsqkpfj3yzry2bzsx7q2vb9ijbab5cj";
+       version = "0.3.0";
+       sha256 = "0dhayxwi4pjbj73gxflgk1gp3dvjw4vb07ai9nq22flac1xl1si7";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DCM/DFA Reporting And Trafficking SDK";
@@ -79318,12 +79548,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-discovery_0_2_0" = callPackage
+  "gogol-discovery_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-discovery";
-       version = "0.2.0";
-       sha256 = "1i4nm1rgc3fsfi1cmhd9annzvpzpzd3ani8q44375llavb094sam";
+       version = "0.3.0";
+       sha256 = "1j2j3zxqq95cd50cdwsvyn633x61fwlghld8nhn1hy12g9l7xdf8";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google APIs Discovery Service SDK";
@@ -79343,12 +79573,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-dns_0_2_0" = callPackage
+  "gogol-dns_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dns";
-       version = "0.2.0";
-       sha256 = "11xy0jr8d4z1dgw12fcz0151cjm9k96bl4xlnd4nlcbxgyjxa95z";
+       version = "0.3.0";
+       sha256 = "18af36fx7w0ybcfiacfih7fyvri0rxlm4920yigmgsx551rgrm5l";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud DNS SDK";
@@ -79368,12 +79598,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-doubleclick-bids_0_2_0" = callPackage
+  "gogol-doubleclick-bids_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-bids";
-       version = "0.2.0";
-       sha256 = "0g5pqihil93yi4yd0anvagzy560ims8jplnngbf6sx8aha1diwhr";
+       version = "0.3.0";
+       sha256 = "0gqlxdnxf2hqdaczvd0gi3ch3p23lk9mjd0xk03h6lhr8c2mx60c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Bid Manager SDK";
@@ -79393,12 +79623,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-doubleclick-search_0_2_0" = callPackage
+  "gogol-doubleclick-search_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-search";
-       version = "0.2.0";
-       sha256 = "1jw7k2b6zqqv5gn80jxfcfpjxhxxi6lc92cksgca421dgiaagkwf";
+       version = "0.3.0";
+       sha256 = "1wwsv0gbqcjd6xmz7pqjv9hyfg20hwwnxld46yjgiwsyadxrd54d";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Search SDK";
@@ -79418,12 +79648,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-drive_0_2_0" = callPackage
+  "gogol-drive_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-drive";
-       version = "0.2.0";
-       sha256 = "0v6chs7il6bh10s94w4cjz1mv5drcic9phpvi2a6n6s43qry0s6w";
+       version = "0.3.0";
+       sha256 = "1l353bwhkw1a3pv2ngjddgiilazq4qds3askkxxyajxzy5f19blz";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Drive SDK";
@@ -79435,8 +79665,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-firebase-dynamiclinks";
-       version = "0.2.0";
-       sha256 = "07hny6l80d8icv0mgzrxcrzv0pixrhss18iv951hqpkq4rniv8lb";
+       version = "0.3.0";
+       sha256 = "096rc42f6ajw7biys45zaz4wgwxyqh67js6ihj8aqi4w1b05j3zz";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Dynamic Links SDK";
@@ -79456,12 +79686,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-firebase-rules_0_2_0" = callPackage
+  "gogol-firebase-rules_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-firebase-rules";
-       version = "0.2.0";
-       sha256 = "0hxxm3r9g7ms26bj277rjvlam73b0xvspxknldf9rs21fdh9gfln";
+       version = "0.3.0";
+       sha256 = "0mrq1gp3s770lybwlzy126g8fx1kasqfh1qjd8lczga186972pqq";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Rules SDK";
@@ -79481,12 +79711,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-fitness_0_2_0" = callPackage
+  "gogol-fitness_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fitness";
-       version = "0.2.0";
-       sha256 = "131x8g52q1zbl64yswjyn5mrlznr38ms073kax0f7hyfscv433xz";
+       version = "0.3.0";
+       sha256 = "1awl1c1z4bcph8b6wgw34vyly7r6svs9h276h8h97z427006p1mv";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fitness SDK";
@@ -79506,12 +79736,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-fonts_0_2_0" = callPackage
+  "gogol-fonts_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fonts";
-       version = "0.2.0";
-       sha256 = "01lz60wsnjq6c8lyixj19mgkn8a81lin6156nzncl6m79qqsx9xl";
+       version = "0.3.0";
+       sha256 = "0p2ckncnrdgkjqp67l0mygqp80nkp7w3p7plhmraxw2wrjpy15mv";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fonts Developer SDK";
@@ -79531,12 +79761,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-freebasesearch_0_2_0" = callPackage
+  "gogol-freebasesearch_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-freebasesearch";
-       version = "0.2.0";
-       sha256 = "0py4k01i78lvmgis8gixsqxjniinccw4cfqs9khdc58njwqqczdk";
+       version = "0.3.0";
+       sha256 = "02m2cpf6jdvd2km3gjvhvhkq3cgy7ijy5abwkrpcwvjzl1hps2vc";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Freebase Search SDK";
@@ -79556,12 +79786,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-fusiontables_0_2_0" = callPackage
+  "gogol-fusiontables_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fusiontables";
-       version = "0.2.0";
-       sha256 = "0nd1kjkymw0qwiygzzx7nr75vi07w42dliv0yys81skx1nlw1ad8";
+       version = "0.3.0";
+       sha256 = "0icaa7zdblgs180gww0w4ffffim9fzb4qbl1pwjyvxa6b7vhrks7";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fusion Tables SDK";
@@ -79581,12 +79811,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-games_0_2_0" = callPackage
+  "gogol-games_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games";
-       version = "0.2.0";
-       sha256 = "1xbzdixlqbbimbc85fmdq0f2cj1w36drvbxxakipwir427pr7aya";
+       version = "0.3.0";
+       sha256 = "0r0x1g8wkq6vn4hk655wkl8fpfjlqppb0w9gscz99qsvv1gm16dz";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services SDK";
@@ -79606,12 +79836,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-games-configuration_0_2_0" = callPackage
+  "gogol-games-configuration_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games-configuration";
-       version = "0.2.0";
-       sha256 = "19f6w057a8rawka8zcdqxhbay2iigcvr6xzn57mawc8fc6wbiwjx";
+       version = "0.3.0";
+       sha256 = "04g2kiyzhnyczxl6648gzl14wfszxiihyajvc7428whp54b3b4yg";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Publishing SDK";
@@ -79631,12 +79861,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-games-management_0_2_0" = callPackage
+  "gogol-games-management_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games-management";
-       version = "0.2.0";
-       sha256 = "1ih03w6wx064553aq9d2qaxh5b972k8gnvrfr2bpjbrysdxv1rfz";
+       version = "0.3.0";
+       sha256 = "192phwrhnsnanq3gf7ss3dsflvnkzf058r1jnb9vqf5035mckb4p";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Management SDK";
@@ -79656,12 +79886,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-genomics_0_2_0" = callPackage
+  "gogol-genomics_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-genomics";
-       version = "0.2.0";
-       sha256 = "0mhvxq7d0g3hymkdwrxg3jgj6nnazm1b8rw5q6p3npj705b63vqh";
+       version = "0.3.0";
+       sha256 = "0d9i4jlv09fc4ry6qsdypkmx3faj6i5m9c6xv3xys1d06v4mzxkf";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Genomics SDK";
@@ -79681,12 +79911,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-gmail_0_2_0" = callPackage
+  "gogol-gmail_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-gmail";
-       version = "0.2.0";
-       sha256 = "1xgs58rvxx8mrz6z4451fng59ia2n0wb800jnzdmilv4p9h255xb";
+       version = "0.3.0";
+       sha256 = "0h9z55bcdyp0as0jzv5wj89v71fz2n75pg8dhwg90iw1pp3rrg83";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Gmail SDK";
@@ -79706,12 +79936,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-groups-migration_0_2_0" = callPackage
+  "gogol-groups-migration_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-migration";
-       version = "0.2.0";
-       sha256 = "1qmbps5qbpd6k4d9a2rp9cl9idj8bgykn9mh727qgqq8x19p8glk";
+       version = "0.3.0";
+       sha256 = "0c676dk7x62bdv8nr8wsk1icd7v93060zjbzwzl2xi46q0j59dmk";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Migration SDK";
@@ -79731,12 +79961,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-groups-settings_0_2_0" = callPackage
+  "gogol-groups-settings_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-settings";
-       version = "0.2.0";
-       sha256 = "1rky9vrcingnqq43g8bazhji2s7spf680v4xcg1ivh2b86xrn8x9";
+       version = "0.3.0";
+       sha256 = "1xy466x9xcbi7scf7fpnc5cy47hgsmdcg17hqzys4bp86sdc6738";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Settings SDK";
@@ -79748,8 +79978,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-iam";
-       version = "0.2.0";
-       sha256 = "0n3g2gr77ss8r1758422a88h81nxhjdkj8mwkihby7zi1if6d4y7";
+       version = "0.3.0";
+       sha256 = "1fn8jx5hq4dxh2i1xf4cbmbsbjwxcplxxh7har1ai4z9ya1zghxs";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity and Access Management (IAM) SDK";
@@ -79769,12 +79999,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-identity-toolkit_0_2_0" = callPackage
+  "gogol-identity-toolkit_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-identity-toolkit";
-       version = "0.2.0";
-       sha256 = "155w9hcwqg31njkjw6d8r2bnd8wfgxnvdnqc57ac6q1ajimr6pw3";
+       version = "0.3.0";
+       sha256 = "1mdkzd5gb8nlaf5nj04fsl97ghyzpkmr4w93pcd5vsr8yxy3lkwz";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity Toolkit SDK";
@@ -79794,12 +80024,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-kgsearch_0_2_0" = callPackage
+  "gogol-kgsearch_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-kgsearch";
-       version = "0.2.0";
-       sha256 = "08hsrwlnq9y4fj5h1asn2ilqvdaj2vjq9mm72k554qmid5jsk4z6";
+       version = "0.3.0";
+       sha256 = "0kldw64ff2p8h8mfdfbplxfk3jinxc8ibr33wa1qzpfzixb72v2n";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Knowledge Graph Search SDK";
@@ -79811,8 +80041,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-language";
-       version = "0.2.0";
-       sha256 = "1kwgq66njn73x1szhhmlh0jjcfl2m8qs4clkwfdk3xpiqickl8w8";
+       version = "0.3.0";
+       sha256 = "0ny2d5bv9dxn1w8rwzv5m7lr5g8akrxqvfhs15bwk87fxdainz5j";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Natural Language SDK";
@@ -79832,12 +80062,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-latencytest_0_2_0" = callPackage
+  "gogol-latencytest_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-latencytest";
-       version = "0.2.0";
-       sha256 = "156qczrzyvryjkzjar0s12zhjpl7paa72bixfgc2nkw78l6nmsca";
+       version = "0.3.0";
+       sha256 = "1gdllvcp6s7rf4093xl2fxq3bvqkrysnrs2s4abyppq54p4s6afk";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Network Performance Monitoring SDK";
@@ -79857,12 +80087,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-logging_0_2_0" = callPackage
+  "gogol-logging_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-logging";
-       version = "0.2.0";
-       sha256 = "1bfzhmlwsmsq3zw5qsh3jx2xiymcp3fbn7limkc7zwkj5xnqqbfd";
+       version = "0.3.0";
+       sha256 = "1i5q2qqr041qxn458a6300z07idbz17srix9kr2sm3mxbvc5h04g";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Logging SDK";
@@ -79874,8 +80104,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-manufacturers";
-       version = "0.2.0";
-       sha256 = "0dhgvy3vs4n05xx5kma039zk5wiw9s9iba09p0xa4r9kb7902w3x";
+       version = "0.3.0";
+       sha256 = "0211aq7gjmpkhvcqf7fyrwrhdfsn8k5g1qw9gjsisxq0m873i6w0";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Manufacturer Center SDK";
@@ -79895,12 +80125,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-maps-coordinate_0_2_0" = callPackage
+  "gogol-maps-coordinate_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-coordinate";
-       version = "0.2.0";
-       sha256 = "1d1h7xb4wbisb0q3dwqpgsff4pzkxjlimmrxjafdyy9nkjyh6js1";
+       version = "0.3.0";
+       sha256 = "1ajgf2g9yad6zwhap8b0qigf0nfsw5k3132ksnzkcrfflz74swvn";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Coordinate SDK";
@@ -79920,12 +80150,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-maps-engine_0_2_0" = callPackage
+  "gogol-maps-engine_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-engine";
-       version = "0.2.0";
-       sha256 = "07zv1fgjrdidj6d29nrhxbl6b5v136s763z8dzw2jwxgvhsl3zma";
+       version = "0.3.0";
+       sha256 = "15a6z7kxvad3ylr1pkwqlimzbwsk0p8qblfnwgnjbl3mr681xdvv";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Engine SDK";
@@ -79945,12 +80175,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-mirror_0_2_0" = callPackage
+  "gogol-mirror_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-mirror";
-       version = "0.2.0";
-       sha256 = "12s007vw1z3x7h6b902zf06kffwsar47l661dw4njw15cxzk6q0c";
+       version = "0.3.0";
+       sha256 = "0ckh2bkjd8c7ybc2yc295wgn0z9kmp471kfkxkjl3swb9dab3fhm";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Mirror SDK";
@@ -79962,8 +80192,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-ml";
-       version = "0.2.0";
-       sha256 = "0k5l59dbvsjxpl0j3rcxrfgpykyxkarc48r4a8x731xs53c2w848";
+       version = "0.3.0";
+       sha256 = "1qkk8v0yhdyphi5r18x4wawvhn0vwsfbz0gjvrf5mr0sdd80qhav";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Machine Learning SDK";
@@ -79983,12 +80213,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-monitoring_0_2_0" = callPackage
+  "gogol-monitoring_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-monitoring";
-       version = "0.2.0";
-       sha256 = "08dzdj4a4vxb6sj9ns66ag1di2lj4yl15sz8hlyzmhcp3s40bxg0";
+       version = "0.3.0";
+       sha256 = "03jslg15crnngarylydybb48vwq338hsb260mk4riahkg78kd7ga";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Monitoring SDK";
@@ -80008,12 +80238,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-oauth2_0_2_0" = callPackage
+  "gogol-oauth2_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-oauth2";
-       version = "0.2.0";
-       sha256 = "13sa51rh37cfa6qb4rxdirzyqyq7bpbbm1jgx2bsq2lfypmppnbv";
+       version = "0.3.0";
+       sha256 = "0fdjq6kvh04csi29g4nagmji5vqprvwra2gas42n79rq2qhxfx5n";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google OAuth2 SDK";
@@ -80033,12 +80263,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-pagespeed_0_2_0" = callPackage
+  "gogol-pagespeed_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-pagespeed";
-       version = "0.2.0";
-       sha256 = "046waxwf53vacam6pvxx6n1r1c02aj74my9cs8hwi8j3i0b3w0z5";
+       version = "0.3.0";
+       sha256 = "1k6n60w4z77fyy5bnsab8bdgr490zfb753m3ljsc7vxwqqfiqhrx";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google PageSpeed Insights SDK";
@@ -80058,12 +80288,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-partners_0_2_0" = callPackage
+  "gogol-partners_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-partners";
-       version = "0.2.0";
-       sha256 = "0b3j4if5vn98qg9d0j29fss4ww7zd5knlmhdv6q7hyvjzi1kmkiv";
+       version = "0.3.0";
+       sha256 = "0xhhmsplvfmsi860skrgpzzz3lixa0qcx73w9cv6da679fh0ddfv";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Partners SDK";
@@ -80083,12 +80313,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-people_0_2_0" = callPackage
+  "gogol-people_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-people";
-       version = "0.2.0";
-       sha256 = "1fyrkd03a5i75wj2yyhahh8d6vghwvvh13317kjxib0np7cc7c8q";
+       version = "0.3.0";
+       sha256 = "0j2frq599kjrv0wl9bpmpglw51wcjid2ysmm50hhlpbv78z55sfv";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google People SDK";
@@ -80108,12 +80338,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-play-moviespartner_0_2_0" = callPackage
+  "gogol-play-moviespartner_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-play-moviespartner";
-       version = "0.2.0";
-       sha256 = "0i4bdl1h1rlihcyzfvfzqqiqjihw2nc9n6qrjzfiq4w1av7hcwir";
+       version = "0.3.0";
+       sha256 = "0v1cs21y94m4ma414nann6k1mc0jfdyj5ariy9bm6hyqbd3c60zc";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Movies Partner SDK";
@@ -80133,12 +80363,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-plus_0_2_0" = callPackage
+  "gogol-plus_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus";
-       version = "0.2.0";
-       sha256 = "1nnq935bsdrqfdld05wqzdv2rzick0mdz7pjgvz908ks5p94zxij";
+       version = "0.3.0";
+       sha256 = "0qwswkjcv0i8m23y7dm9yrk343m3kdckg6srzi9q2jfip6h9hv8v";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + SDK";
@@ -80158,12 +80388,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-plus-domains_0_2_0" = callPackage
+  "gogol-plus-domains_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus-domains";
-       version = "0.2.0";
-       sha256 = "16qaviwhknw9ibgy10by80dkgph184z01wxvrxbyd99p0sg7yjf5";
+       version = "0.3.0";
+       sha256 = "0d0aijvdl2z9prv6qs6qriw54d6z9ljpl2nc5zwwk3647s62kvvi";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + Domains SDK";
@@ -80183,12 +80413,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-prediction_0_2_0" = callPackage
+  "gogol-prediction_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-prediction";
-       version = "0.2.0";
-       sha256 = "19wb5qpk3faw49mgvmqail515mg7ni8z3g50wsq0jgiv8w04dhwi";
+       version = "0.3.0";
+       sha256 = "136jrwlwwygz4icl8c5c1bj1l7j9lypc5qxkygs6azc3x3l8ih6g";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Prediction SDK";
@@ -80208,12 +80438,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-proximitybeacon_0_2_0" = callPackage
+  "gogol-proximitybeacon_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-proximitybeacon";
-       version = "0.2.0";
-       sha256 = "0mhlxy6ybsm6qmn02r2qbv5hmxcy6f9aiy8rbajqzjjry3dmvzsv";
+       version = "0.3.0";
+       sha256 = "1f54km4v9mgil6p12vvziwv5v00d23l5rvk66yl4h614mh402m2v";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Proximity Beacon SDK";
@@ -80233,12 +80463,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-pubsub_0_2_0" = callPackage
+  "gogol-pubsub_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-pubsub";
-       version = "0.2.0";
-       sha256 = "1lsy3ajp09gq4608mp22smmaizfmfr32fskfawfdhhg3wfznhf34";
+       version = "0.3.0";
+       sha256 = "1c2qwqmq3bjfcd322kpyyxfdhsbyxq3r2v614v14dm0kr4cxqnik";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Pub/Sub SDK";
@@ -80258,12 +80488,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-qpxexpress_0_2_0" = callPackage
+  "gogol-qpxexpress_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-qpxexpress";
-       version = "0.2.0";
-       sha256 = "04vqpgalh3nd9w2hgwr7r8n1xnv6yxfj69jxnlrjn0s1nrbbnbx6";
+       version = "0.3.0";
+       sha256 = "10v82f2bkn4i0w8gq79skagksi13p5i3280cb50x206a8cy9j350";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google QPX Express SDK";
@@ -80283,12 +80513,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-replicapool_0_2_0" = callPackage
+  "gogol-replicapool_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-replicapool";
-       version = "0.2.0";
-       sha256 = "0if2vnlgv3gvw5czanjbdfkpxhd0ipyivapxhqfzwnnbz82i2cw2";
+       version = "0.3.0";
+       sha256 = "1kjkf7bykmz5wzndj7h0yzwfds56m34d0jvq7m1rkhp2qnn1v1jl";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Manager SDK";
@@ -80308,12 +80538,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-replicapool-updater_0_2_0" = callPackage
+  "gogol-replicapool-updater_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-replicapool-updater";
-       version = "0.2.0";
-       sha256 = "1f1pj16c8l0pic72k0phy2g285mm4l91w2dx06ak2p3xvhpn8d8d";
+       version = "0.3.0";
+       sha256 = "14gm5wfay5d079hn39fcjwxfsz8pd02cc60id7jsxxc4jbyxjq42";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Updater SDK";
@@ -80333,12 +80563,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-resourcemanager_0_2_0" = callPackage
+  "gogol-resourcemanager_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourcemanager";
-       version = "0.2.0";
-       sha256 = "0i947wbnam2n0r9n5cxhljbcawkxq2gji9k73z4yhf4239xm7h9j";
+       version = "0.3.0";
+       sha256 = "0n2j9liwx5zd2flzmrq2z2hahbbgw2wx53d6nqykvaf5g3vc6l6b";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Resource Manager SDK";
@@ -80358,12 +80588,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-resourceviews_0_2_0" = callPackage
+  "gogol-resourceviews_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourceviews";
-       version = "0.2.0";
-       sha256 = "0wf1gg8d8v5jpzfdmzr6v01np3ad5lxxsgm9sjicgs2i59wj907v";
+       version = "0.3.0";
+       sha256 = "114gjdxzm4kq3ibk32dzy73zvmp9ls9bzb4k7szdkxr922861akp";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Groups SDK";
@@ -80375,8 +80605,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-runtimeconfig";
-       version = "0.2.0";
-       sha256 = "10d6b2pwicb49fzgmpph12rqy2m36xqr0ihwfjljsz80554jzffl";
+       version = "0.3.0";
+       sha256 = "004k1zy27gk98xh0h3c7ll3zxk2qif31znwnnyyxi30gmwlg19sj";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud RuntimeConfig SDK";
@@ -80388,8 +80618,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-safebrowsing";
-       version = "0.2.0";
-       sha256 = "0wd1sgrg796wdbj8rfg7lmcj86grnw24k2y247pk7yfxdxwp5f9j";
+       version = "0.3.0";
+       sha256 = "0sxhc8l7ck20zbn2h7zgcywkygh0gp3mzg0mkgvx1qs4hp0nryvq";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Safe Browsing APIs SDK";
@@ -80409,12 +80639,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-script_0_2_0" = callPackage
+  "gogol-script_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-script";
-       version = "0.2.0";
-       sha256 = "1js7v9m1h3017lra4khw0hmwm1j2np66bwdggs50rlciflh2wmz2";
+       version = "0.3.0";
+       sha256 = "1l2bd93zndmi4zy28ygq63cz020q83viz2pyzy1j0hk0inji9k81";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Script Execution SDK";
@@ -80426,8 +80656,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-servicecontrol";
-       version = "0.2.0";
-       sha256 = "09rwzdvdgi8kcw6v7b7i9wqakcb7ncf1m4cm26xr2n3m162ji50g";
+       version = "0.3.0";
+       sha256 = "0lfw9592arh01d3swxyp97glxqzc3cvcd3mn6pcm5q6dsjnda1hi";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Control SDK";
@@ -80439,8 +80669,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-servicemanagement";
-       version = "0.2.0";
-       sha256 = "0bbnd8wb7x26b5kgfsaw4747x808hbsfykxkz0pnfm5zyx6na3hb";
+       version = "0.3.0";
+       sha256 = "0qasq71k1bm9pm298sdivgnnr1sx9701nhmdn82lx8qglnxvd4v3";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Management SDK";
@@ -80461,12 +80691,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "gogol-sheets_0_2_0" = callPackage
+  "gogol-sheets_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-sheets";
-       version = "0.2.0";
-       sha256 = "1q1pdadk0nchq794z1qsv0y32y91c39w6r0q74iqq4b0s4sdp544";
+       version = "0.3.0";
+       sha256 = "1kj179262lada2dh3pq129kc6p0rdzppxhmyglin5p2nnlzmkm9d";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Sheets SDK";
@@ -80487,12 +80717,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "gogol-shopping-content_0_2_0" = callPackage
+  "gogol-shopping-content_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-shopping-content";
-       version = "0.2.0";
-       sha256 = "0qjncikv3qs428z3w1fg15hy1cdg2518pw2dj3qxpi8qjvfm6jgn";
+       version = "0.3.0";
+       sha256 = "05q68x2krghnv0j7f7bizhqpjgni2lqm03bp74ydcy7f2y675i55";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Content API for Shopping SDK";
@@ -80512,12 +80742,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-siteverification_0_2_0" = callPackage
+  "gogol-siteverification_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-siteverification";
-       version = "0.2.0";
-       sha256 = "0chazk5ihxdfcrqm2hsrx4xg5g6gy7v03smv3kxgvajvm0ck8x0z";
+       version = "0.3.0";
+       sha256 = "0pi4ljv20p5xjw11p99hksn8qz284pjv9f36i7hsdlf5bjd3v1dh";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Site Verification SDK";
@@ -80529,8 +80759,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-slides";
-       version = "0.2.0";
-       sha256 = "0k5csk32d6hz42k7d6yci70mxpgpy0s78jzj7d3hjhd5hny904z5";
+       version = "0.3.0";
+       sha256 = "1bqyq767c4w8m2w9i78vn6psnv68687l0kwf6kbmn150gvg9c1mb";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Slides SDK";
@@ -80550,12 +80780,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-spectrum_0_2_0" = callPackage
+  "gogol-spectrum_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-spectrum";
-       version = "0.2.0";
-       sha256 = "0zkggda3p7j1j6ja5qc33ilqjq73hpa5dbzvcgzh4mzhn9h3m396";
+       version = "0.3.0";
+       sha256 = "0b596ajxy6ph28l46wnh03cr264ry4yki197bxls8spvzf8pwf5b";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Spectrum Database SDK";
@@ -80575,12 +80805,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-sqladmin_0_2_0" = callPackage
+  "gogol-sqladmin_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-sqladmin";
-       version = "0.2.0";
-       sha256 = "0lz1vyhpm61gc7w8xmniv0s46gl8b28j9qgl5sqr8xlsca9qbjyp";
+       version = "0.3.0";
+       sha256 = "164w0sqy75m1dsvi64kyrihy647j2gm0k7kar46m9wvym1gvcr3r";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud SQL Administration SDK";
@@ -80600,12 +80830,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-storage_0_2_0" = callPackage
+  "gogol-storage_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage";
-       version = "0.2.0";
-       sha256 = "1nnq2yjwpwxrpz9ix32x12lnlmqm3nfmxl1cgjcaric8fkf2i18m";
+       version = "0.3.0";
+       sha256 = "18n4grbbwwg0ymh0gp6qhqdw7v9x81y70lxmslql0w9dlirg959v";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Storage JSON SDK";
@@ -80625,12 +80855,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-storage-transfer_0_2_0" = callPackage
+  "gogol-storage-transfer_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage-transfer";
-       version = "0.2.0";
-       sha256 = "07izvvdy5zfl3k3rkp447jw8jcxi24bmniyhbiwdd7ldcx49gak4";
+       version = "0.3.0";
+       sha256 = "0iwal6slja14gbdw2xjs79y3c6l56c1hvv0gyip3b3pz5i2xh4zb";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Storage Transfer SDK";
@@ -80650,12 +80880,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-tagmanager_0_2_0" = callPackage
+  "gogol-tagmanager_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-tagmanager";
-       version = "0.2.0";
-       sha256 = "0gsls15n3d7c7x1nzzr77bvpvsw78yfn1cp1njhikpwsy1i96n7w";
+       version = "0.3.0";
+       sha256 = "0hsplk3yvkdglv38pl9cckc6csh23adasyvfdzw08kfbk8b1llgp";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tag Manager SDK";
@@ -80675,12 +80905,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-taskqueue_0_2_0" = callPackage
+  "gogol-taskqueue_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-taskqueue";
-       version = "0.2.0";
-       sha256 = "19mqnnl65i5i0b4nzyw40nw97vzbrh2kxbxl9knpxjls5ab2q5sv";
+       version = "0.3.0";
+       sha256 = "0irzyv80q2n4jv144rryv5xqbg51gqyws1pnvpdi5lddq90yvjq3";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google TaskQueue SDK";
@@ -80700,12 +80930,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-translate_0_2_0" = callPackage
+  "gogol-translate_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-translate";
-       version = "0.2.0";
-       sha256 = "1k3qbsjhcd6231br44hmmschq0mav3pfgmcl2pcybx6shhjdnrdr";
+       version = "0.3.0";
+       sha256 = "0bwmymiz1whc2rffxzlkva72j5cq51y8gxfl7lq5bg668p3grcvk";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Translate SDK";
@@ -80725,12 +80955,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-urlshortener_0_2_0" = callPackage
+  "gogol-urlshortener_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-urlshortener";
-       version = "0.2.0";
-       sha256 = "0wl6grqh2a4n47c3gkhsr7ywsrjj0kpd9rhwzzg5ggms117rmckb";
+       version = "0.3.0";
+       sha256 = "1hmwk3pfxzyv0hxn33jms7c72yl8pnqnbfpza53ljq0abd749fcv";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google URL Shortener SDK";
@@ -80750,12 +80980,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-useraccounts_0_2_0" = callPackage
+  "gogol-useraccounts_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-useraccounts";
-       version = "0.2.0";
-       sha256 = "0rycp4g11crv9hjq9aw3i0xrggmkxyzrj9vnwrga84fvrg1lll4i";
+       version = "0.3.0";
+       sha256 = "0fzmq082x0vvml8c0pxhb3vrnvizmq9cmh8y30yapkad7xwgx3i9";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud User Accounts SDK";
@@ -80775,12 +81005,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-vision_0_2_0" = callPackage
+  "gogol-vision_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-vision";
-       version = "0.2.0";
-       sha256 = "0wb0hj0mfsjqyrjiyv29zm6labsmzbjxhdhvf14m4mp3fy73b1vc";
+       version = "0.3.0";
+       sha256 = "1ssdz7cv3v3hz024m3djv4asj6lpd4c7a3dzrnxm9ipfbfmjb5f9";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Vision SDK";
@@ -80800,12 +81030,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-webmaster-tools_0_2_0" = callPackage
+  "gogol-webmaster-tools_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-webmaster-tools";
-       version = "0.2.0";
-       sha256 = "0jx0bmx7yljc7dhks0mr06wkplfqcx6nxdfnlgrclplnyf0k8qq0";
+       version = "0.3.0";
+       sha256 = "0rkpjwnb064i7256j0q8gnkynny596qrg79h2wviadmifz9gyixp";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Search Console SDK";
@@ -80826,12 +81056,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "gogol-youtube_0_2_0" = callPackage
+  "gogol-youtube_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube";
-       version = "0.2.0";
-       sha256 = "01chn9bsap4sc2qzsbmm97pb5m3wksvp2f9ky3zw6v89slkaspj2";
+       version = "0.3.0";
+       sha256 = "1sv7djr2x73n3w0cbxncyzz64kxn7pwydcyznqipni7xv6hi5s1j";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Data SDK";
@@ -80851,12 +81081,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-youtube-analytics_0_2_0" = callPackage
+  "gogol-youtube-analytics_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube-analytics";
-       version = "0.2.0";
-       sha256 = "06s518qfiw7p7kc3d2y4ncfm57mic1z1sr3pwl4hjrds7k78v20f";
+       version = "0.3.0";
+       sha256 = "10888jai56jpw6snssclldmxn2my9vadrqm14dmrhl6sr3mabdbh";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Analytics SDK";
@@ -80876,12 +81106,12 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-youtube-reporting_0_2_0" = callPackage
+  "gogol-youtube-reporting_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube-reporting";
-       version = "0.2.0";
-       sha256 = "0f9dm434fhb8vslk9x0zhybp31pk2ydvy1yfhmj5kp23nmzlh5pi";
+       version = "0.3.0";
+       sha256 = "0j8xalrigh3rvxb8z009s6bs34nw68kwjvczm1hlx1fcifgjrp4f";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Reporting SDK";
@@ -83155,8 +83385,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk-mac-integration";
-       version = "0.3.3.1";
-       sha256 = "0fbbf797i36s65sxywqzvkbvnh4cj17w0km5ym31n7hnvd2i4rdg";
+       version = "0.3.4.0";
+       sha256 = "0irf8smnpsym2lkw6gslk31zibn7alp7g32cmq4062mgnlwlawn4";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
@@ -83411,8 +83641,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3-mac-integration";
-       version = "0.3.3.1";
-       sha256 = "1z709van0llwkfyrpmkqkzpcv82kwz54bw3rwwsqrx3mzi7q5fm5";
+       version = "0.3.4.0";
+       sha256 = "0cdx0qzmwz3bbg374c9nvwqsxgvc5c2h8i6m0x6d0sm714d8l0ac";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
@@ -83688,6 +83918,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "h2c" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, resourcet }:
+     mkDerivation {
+       pname = "h2c";
+       version = "1.0.0";
+       sha256 = "16aljqvzf8n1js0drqii99z3v8xba0468w27c9vmf5w483awkqjb";
+       libraryHaskellDepends = [ base bytestring mtl resourcet ];
+       homepage = "https://bitbucket.org/fmapE/h2c";
+       description = "Bindings to Linux I2C with support for repeated-start transactions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hArduino" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, serialport
      , time
@@ -87909,8 +88151,8 @@ self: {
        pname = "hashable";
        version = "1.2.6.1";
        sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll";
-       revision = "1";
-       editedCabalFile = "1saaj9izz0faj85svdd45z4iygqb9z8i130br9vlqp3py7f2ymzz";
+       revision = "2";
+       editedCabalFile = "0w4756sa04nk2bw3vnysb0y9d09zzg3c77aydkjfxz1hnl1dvnjn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88601,6 +88843,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-disque" = callPackage
+    ({ mkDerivation, base, bytestring, hedis, string-conversions
+     , transformers
+     }:
+     mkDerivation {
+       pname = "haskell-disque";
+       version = "0.0.1.1";
+       sha256 = "1375phlycnxajfni9yjgskh9a9nxz44jhr5ls508dgslwzvibzv8";
+       libraryHaskellDepends = [
+         base bytestring hedis string-conversions transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/ArekCzarnik/haskell-disque#readme";
+       description = "Client library for the Disque datastore";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-docs" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal
      , containers, cryptohash, directory, filepath, ghc, ghc-paths
@@ -88865,14 +89124,15 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-import-graph";
-       version = "1.0.1";
-       sha256 = "14myydivq7dphm2m9wsrwkbc8bn5gnq625mgmq2w4j3yzbaw4267";
+       version = "1.0.2";
+       sha256 = "17pfvbs6mkv8iv86qzqsnq45f5scry2xkx4b7y3kf9bcj39xx1z6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base classy-prelude ghc graphviz process text transformers
        ];
        executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ncaq/haskell-import-graph.git#readme";
        description = "create haskell import graph for graphviz";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92221,16 +92481,18 @@ self: {
      }) {inherit (pkgs) SDL_mixer;};
 
   "hblas" = callPackage
-    ({ mkDerivation, base, blas, hspec, liblapack, primitive
-     , storable-complex, vector
+    ({ mkDerivation, base, blas, HUnit, liblapack, primitive
+     , storable-complex, tasty, tasty-hunit, vector
      }:
      mkDerivation {
        pname = "hblas";
-       version = "0.4.0.0";
-       sha256 = "02kb6qk89sfs3hwq2xygisllpynnw5yn7z14pm6d22zxfmvidgcb";
+       version = "0.3.2.1";
+       sha256 = "05c2mqhwjq0r8jyaj0cncaxn4n5x27dd8z6lv8g8cdc7r749q59y";
+       revision = "2";
+       editedCabalFile = "02cxp6nxr2x1ka8bq8zjlx6kjy54lzsc9bdw1zf981f3i8yz9cj8";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ blas liblapack ];
-       testHaskellDepends = [ base hspec primitive vector ];
+       testHaskellDepends = [ base HUnit tasty tasty-hunit vector ];
        homepage = "http://github.com/wellposed/hblas/";
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -92461,6 +92723,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hcom" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "hcom";
+       version = "0.0.0.2";
+       sha256 = "1ps6q3sn0dlkhxkwgpq9jj0rklrnsgsrrlk63g9jr8lfris2wlzq";
+       doHaddock = false;
+       description = "Haskell COM support library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hcoord" = callPackage
     ({ mkDerivation, base, data-default, HUnit, ieee754, mtl
      , regex-pcre
@@ -93113,20 +93386,21 @@ self: {
 
   "hedgehog" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions, mmorph, mtl
-     , pretty-show, primitive, random, resourcet, stm, template-haskell
-     , text, th-lift, time, transformers, transformers-base, unix
-     , wl-pprint-annotated
+     , concurrent-output, containers, directory, exceptions
+     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
+     , random, resourcet, stm, template-haskell, text, th-lift, time
+     , transformers, transformers-base, unix, wl-pprint-annotated
      }:
      mkDerivation {
        pname = "hedgehog";
-       version = "0.4.1";
-       sha256 = "1zsfxls65pvfh57ig5lka3glw52f5h2pvnf7kk6aarasspyagx60";
+       version = "0.5";
+       sha256 = "02dy5fmwmrjgwj6p8rvr53rg362qayavbc184gf2f9q196rgijpk";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions mmorph mtl pretty-show primitive random
-         resourcet stm template-haskell text th-lift time transformers
-         transformers-base unix wl-pprint-annotated
+         directory exceptions lifted-async mmorph monad-control mtl
+         pretty-show primitive random resourcet stm template-haskell text
+         th-lift time transformers transformers-base unix
+         wl-pprint-annotated
        ];
        testHaskellDepends = [
          base containers pretty-show text transformers
@@ -93137,6 +93411,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hedgehog-quickcheck" = callPackage
+    ({ mkDerivation, base, hedgehog, QuickCheck, transformers }:
+     mkDerivation {
+       pname = "hedgehog-quickcheck";
+       version = "0.1";
+       sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1";
+       libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
+       homepage = "https://hedgehog.qa";
+       description = "Use QuickCheck generators in Hedgehog and vice versa";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hedis" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, HUnit, mtl, network, resource-pool, scanner
@@ -96632,8 +96918,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.2.2";
        sha256 = "1d12fjqyrj0wy8iq096h8mq2v76j8ihc2d8j1xc5qckw2g29539a";
-       revision = "2";
-       editedCabalFile = "0yhc50km7jfhdynvyvqyqi2jwpy554kwz1l9fsvklf2scfv4c3k5";
+       revision = "3";
+       editedCabalFile = "12ghp6d74iyd7h4hjnar7gfz3nal4f9z9lv8rwr5hy8a9xsinbfv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97692,19 +97978,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hoauth2_1_2_0" = callPackage
+  "hoauth2_1_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
      , http-types, microlens, text, unordered-containers, uri-bytestring
+     , uri-bytestring-aeson
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "1.2.0";
-       sha256 = "19f8r0dhm4kmzwfv9zsj2cfqpkkn68ncaxqp2kcz3cvr5habryay";
+       version = "1.3.0";
+       sha256 = "1aymrl28gs4dlzfxcnglfhnxk9l9ws0va0yvi1a966yfp0ps7w1n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring exceptions http-conduit http-types microlens
-         text unordered-containers uri-bytestring
+         text unordered-containers uri-bytestring uri-bytestring-aeson
        ];
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
@@ -98594,11 +98881,14 @@ self: {
      }) {};
 
   "hopenssl" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, HUnit, openssl }:
+    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
+     , HUnit, openssl
+     }:
      mkDerivation {
        pname = "hopenssl";
-       version = "2.2";
-       sha256 = "0hypc779yyrf3kgb9ik396zwf83d05x2gvrzr1nhv55pr8m0kvax";
+       version = "2.2.1";
+       sha256 = "1pxbs1k8sizvvz1nn1zv2i5grn0w11s9g09z07w5f80kbz0slcbh";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base doctest HUnit ];
@@ -99667,10 +99957,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.4.0";
-       sha256 = "0wrgdz6a2k64kgsp8qfpjpw4wywicjq50bvsr8i1mw11lkwysjkf";
-       revision = "1";
-       editedCabalFile = "1xfm12nlwyd6gd6b2c4zqjfxlqdsddg4qpy3dw08wlx42jvymrl9";
+       version = "2.4.2";
+       sha256 = "085imrvkxvw06sg8wcgzba9jw8hficizjf6lmqk4ai6ahpgmml6s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102343,8 +102631,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsparql";
-       version = "0.3.3";
-       sha256 = "08a24py8scbshrs1j0x5d6n1lsw1sxyp90wvvsscndnqsy60wcnl";
+       version = "0.3.4";
+       sha256 = "0nxj9aq59c02sdhz5nz5c3klcsglb4gpchah0b82fjbiphbs8sxb";
        libraryHaskellDepends = [
          base bytestring HTTP MissingH mtl network network-uri rdf4h text
          xml
@@ -102767,6 +103055,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-meta_2_4_4" = callPackage
+    ({ mkDerivation, ansi-terminal, array, async, base, call-stack
+     , deepseq, directory, filepath, hspec-expectations, HUnit
+     , QuickCheck, quickcheck-io, random, setenv, time, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-meta";
+       version = "2.4.4";
+       sha256 = "117n4j56wfh48xj02mv0wkp10bkr2xkyvwg7n7r2ynp03wrf9ykm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal array async base call-stack deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv time transformers
+       ];
+       executableHaskellDepends = [
+         ansi-terminal array async base call-stack deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv time transformers
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "A version of Hspec which is used to test Hspec itself";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-monad-control" = callPackage
     ({ mkDerivation, base, hspec-core, monad-control, transformers
      , transformers-base
@@ -103862,14 +104177,15 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "hsyslog_5" = callPackage
-    ({ mkDerivation, base, doctest }:
+  "hsyslog_5_0_1" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, doctest }:
      mkDerivation {
        pname = "hsyslog";
-       version = "5";
-       sha256 = "06prb179djw9fh6fylyjxx5fv76hblyx1crmkqvi8b62rrkwlbsd";
+       version = "5.0.1";
+       sha256 = "05k0ckgqzjpa3mqamlswi0kpvqxvq40awip0cvhpzjx64240vpl6";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/peti/hsyslog";
@@ -104647,8 +104963,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.2.3.1";
-       sha256 = "03na2nbm9la0shlijvjyb5mpp1prfskk4jmjy8iz707r0731dbjk";
+       version = "2.2.3.2";
+       sha256 = "1f0yqka43gp7vhv7yr4q6pqr8qw0qq2yh4y2lnayhc876zpw6ng3";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra exceptions http-client
          http-client-tls http-types lifted-base monad-control mtl resourcet
@@ -104912,17 +105228,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "http-media_0_7_0" = callPackage
+  "http-media_0_7_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , QuickCheck, test-framework, test-framework-quickcheck2
      , utf8-string
      }:
      mkDerivation {
        pname = "http-media";
-       version = "0.7.0";
-       sha256 = "11d5dcax7i58zhmaz1x35g0mbqm9h9ayzz058cm4p1p2dm7rsag5";
-       revision = "1";
-       editedCabalFile = "1z8pq2xfqjb8z8xar3inc51wsid9b66lfxrzq2sdb45953rcrbpd";
+       version = "0.7.1";
+       sha256 = "06b921qchv3avras2i7x0n7fy3rj7lr2dwm82b62fgzhy6riskh6";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers utf8-string
        ];
@@ -110328,6 +110642,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "integer-logarithms_1_0_2" = callPackage
+    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "integer-logarithms";
+       version = "1.0.2";
+       sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "integer-pure" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -111265,8 +111599,8 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "0.9.1";
-       sha256 = "10pvs70car553ykpzhgk8zxqpl6a8vlirbw7c9xx0g1lhf3hmvhi";
+       version = "0.9.2";
+       sha256 = "0r15mdknz1j85hws9bqfil6l39q88pbbjz0kbky9kl7y675hkzdj";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -113407,30 +113741,30 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "jose_0_6_0_2" = callPackage
+  "jose_0_6_0_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, concise, containers, cryptonite, hspec, lens, memory
      , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
-     , safe, tasty, tasty-hspec, tasty-quickcheck, template-haskell
-     , text, time, unordered-containers, vector, x509
+     , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck
+     , template-haskell, text, time, unordered-containers, vector, x509
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.6.0.2";
-       sha256 = "1m6ck60z9lmvc3rb8lpf4h7j3yvzmshwb8dm96s0d1ldhcmk26jy";
+       version = "0.6.0.3";
+       sha256 = "1d6d2w61v5di6mfd1ss14sx7i29bzvhjn7yplg0q2nmxnba5p2xx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring concise
          containers cryptonite lens memory monad-time mtl network-uri
-         QuickCheck quickcheck-instances safe template-haskell text time
-         unordered-containers vector x509
+         QuickCheck quickcheck-instances safe semigroups template-haskell
+         text time unordered-containers vector x509
        ];
        executableHaskellDepends = [ aeson base bytestring lens mtl ];
        testHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring concise
          containers cryptonite hspec lens memory monad-time mtl network-uri
-         QuickCheck quickcheck-instances safe tasty tasty-hspec
+         QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec
          tasty-quickcheck template-haskell text time unordered-containers
          vector x509
        ];
@@ -113533,18 +113867,18 @@ self: {
   "jsaddle" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, containers, deepseq, filepath, ghc-prim, http-types
-     , lens, primitive, process, ref-tf, scientific, stm, text, time
-     , transformers, unordered-containers, uuid, uuid-types, vector
+     , lens, primitive, process, random, ref-tf, scientific, stm, text
+     , time, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.9.2.1";
-       sha256 = "0527hsra6x9iblv1i8k145waha861zx5khk0f7c7sqar72qmrzj4";
+       version = "0.9.3.0";
+       sha256 = "1c96b2zxa8x4p28rxjnj9nz5999d4f8nfwj38yws0h2c3lwsm740";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
-         deepseq filepath ghc-prim http-types lens primitive process ref-tf
-         scientific stm text time transformers unordered-containers uuid
-         uuid-types vector
+         deepseq filepath ghc-prim http-types lens primitive process random
+         ref-tf scientific stm text time transformers unordered-containers
+         vector
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -113572,8 +113906,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.9.0.0";
-       sha256 = "0yc5m80n3k3l2m429p5icfwk50c6qdfs5h273rgdr9pjb2if5cmm";
+       version = "0.9.1.0";
+       sha256 = "16dgcdj1x58gpkqvz434f0ysyhwpy1dwqxs6bd24875n1hxjim77";
        libraryHaskellDepends = [
          base base-compat jsaddle lens text transformers
        ];
@@ -113601,17 +113935,16 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , doctest, filepath, foreign-store, ghc-prim, http-types, jsaddle
      , lens, network, primitive, process, QuickCheck, ref-tf, stm, text
-     , time, transformers, uuid, uuid-types, wai, wai-websockets, warp
-     , webdriver, websockets
+     , time, transformers, wai, wai-websockets, warp, webdriver
+     , websockets
      }:
      mkDerivation {
        pname = "jsaddle-warp";
-       version = "0.9.2.0";
-       sha256 = "08r9nzx8yvdw7klv7n19znqfp5r5585fvhz9jsk5mcinpkc7yvyv";
+       version = "0.9.3.0";
+       sha256 = "0lcwg3lgh6bah8zqjzk7hfy8pcjhjlq5a22y83332qn4ms9hfw8l";
        libraryHaskellDepends = [
          aeson base bytestring containers foreign-store http-types jsaddle
-         stm text time transformers uuid uuid-types wai wai-websockets warp
-         websockets
+         stm text time transformers wai wai-websockets warp websockets
        ];
        testHaskellDepends = [
          aeson base bytestring containers deepseq doctest filepath ghc-prim
@@ -114338,6 +114671,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "json-tracer" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , ghc-prim, hashable, hspec, hspec-core, hspec-discover
+     , hspec-expectations, microlens, microlens-ghc, mtl
+     , template-haskell, text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "json-tracer";
+       version = "0.0.1.2";
+       sha256 = "1687zjhc5d63qq7kzkq4kcn9qw9kwlb566kgfkh7yr8whp5rhgnd";
+       libraryHaskellDepends = [
+         aeson base containers ghc-prim hashable microlens microlens-ghc mtl
+         template-haskell text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hspec hspec-core
+         hspec-discover hspec-expectations microlens mtl time
+       ];
+       homepage = "https://github.com/autotaker/json-tracer#readme";
+       description = "A polymorphic, type-safe, json-structured tracing library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "json-types" = callPackage
     ({ mkDerivation, base, containers, text }:
      mkDerivation {
@@ -117930,20 +118286,18 @@ self: {
      }) {};
 
   "language-ecmascript" = callPackage
-    ({ mkDerivation, base, containers, data-default-class, Diff
-     , directory, filepath, HUnit, mtl, parsec, QuickCheck
+    ({ mkDerivation, base, charset, containers, data-default-class
+     , Diff, directory, filepath, HUnit, mtl, parsec, QuickCheck
      , template-haskell, test-framework, test-framework-hunit
      , test-framework-quickcheck2, testing-feat, uniplate, wl-pprint
      }:
      mkDerivation {
        pname = "language-ecmascript";
-       version = "0.17.1.0";
-       sha256 = "0gl82zq50x98jzagkzdb5fgf5gnspvpx6i66g3r25mcn606ky7nz";
-       revision = "2";
-       editedCabalFile = "0wndi8w3nchzvsmqxy5pbxld4c18a0b3ncffqfail1dpa6i30my6";
+       version = "0.17.2.0";
+       sha256 = "1szn269x93k7x2r1z6aj0fqraim1f6vyb7qbg5nfkv8l0gcrz10l";
        libraryHaskellDepends = [
-         base containers data-default-class Diff mtl parsec QuickCheck
-         template-haskell testing-feat uniplate wl-pprint
+         base charset containers data-default-class Diff mtl parsec
+         QuickCheck template-haskell testing-feat uniplate wl-pprint
        ];
        testHaskellDepends = [
          base containers data-default-class Diff directory filepath HUnit
@@ -118035,6 +118389,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-glsl_0_2_1" = callPackage
+    ({ mkDerivation, base, HUnit, parsec, prettyclass, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "language-glsl";
+       version = "0.2.1";
+       sha256 = "08hrl9s8640a61npdshjrw5q3j3b2gvms846cf832j0n19mi24h0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base parsec prettyclass ];
+       executableHaskellDepends = [ base parsec prettyclass ];
+       testHaskellDepends = [
+         base HUnit parsec prettyclass test-framework test-framework-hunit
+       ];
+       description = "GLSL abstract syntax tree, parser, and pretty-printer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-go" = callPackage
     ({ mkDerivation, array, base, parsec, utf8-string }:
      mkDerivation {
@@ -121446,6 +121820,8 @@ self: {
        pname = "linear";
        version = "1.20.6";
        sha256 = "1xcr36g6rr7k0vlzsh6szzxxrdi1f6vb9sxdilcpsb8xjvkk258m";
+       revision = "1";
+       editedCabalFile = "0jgfgn0i5882yhmbqc1w9g7gk713l5r66xyaxiwg7nmw82smmakk";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base base-orphans binary bytes cereal containers
@@ -122457,8 +122833,8 @@ self: {
     ({ mkDerivation, base, doctest, mtl }:
      mkDerivation {
        pname = "list-transformer";
-       version = "1.0.1";
-       sha256 = "0sjhhvdysfi9a70bkx3iwi81i5fyhak6jzxizlcqvc2x6vd79x95";
+       version = "1.0.2";
+       sha256 = "081sik71mli28lvai34zymcl58fiqcrbhzxdi6phmjizm5wj4pqi";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/Gabriel439/Haskell-List-Transformer-Library";
@@ -122578,8 +122954,8 @@ self: {
      }:
      mkDerivation {
        pname = "live-sequencer";
-       version = "0.0.5.2";
-       sha256 = "1qcjs56mfj62pvgv7ab1c2q7ya6ykaw1sixak43iprpviwa3i3w4";
+       version = "0.0.6";
+       sha256 = "0gsbixz0cmy9cajqj4s8iaf8mjk42162sd39bpcdp4xqyxfj5g63";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base event-list non-negative ];
@@ -123627,8 +124003,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "1.1.2";
-       sha256 = "0j17ylwga4vw0f0hahpmvm3nhk6s274m0msjv0r9jx6a6jx1wsmn";
+       version = "1.1.4";
+       sha256 = "1q9n0b0dwdkpvmpk60s65sw8z25k9nbybwnrfv6k0ifdjs86x6lh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124443,20 +124819,19 @@ self: {
      }) {};
 
   "loup" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-swf, base, basic-prelude
-     , bytestring, conduit, lifted-async, lifted-base, optparse-generic
-     , preamble, shakers, time, turtle, unordered-containers, uuid, yaml
+    ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
+     , conduit, lifted-async, lifted-base, optparse-generic, preamble
+     , shakers, time, turtle, unordered-containers, uuid, yaml
      }:
      mkDerivation {
        pname = "loup";
-       version = "0.0.10";
-       sha256 = "0j65vx9cpn0q1zhcz4wsk86wnqlmr2m8dkqgzy2scm7chfd2hbhv";
+       version = "0.0.13";
+       sha256 = "03ibb8ddrd7k9mhb8axg3jrbrn68kwi94sz7wnxr21ixiz2cb122";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson amazonka amazonka-swf base basic-prelude bytestring conduit
-         lifted-async lifted-base preamble time turtle unordered-containers
-         uuid yaml
+         aeson amazonka amazonka-swf base bytestring conduit lifted-async
+         lifted-base preamble time turtle unordered-containers uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
        homepage = "https://github.com/swift-nav/loup";
@@ -125559,8 +125934,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.3.2.0";
-       sha256 = "0cg38m9ji0l8kv3sqqhwbvn57all0h9652acjdhhcg3n98hxpam6";
+       version = "2.4.0.1";
+       sha256 = "1qldc05017i1dy1mcl79r0ynxx66qqnsyp8f3y5lk4jdgrfz9mb1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127240,28 +127615,27 @@ self: {
      }) {};
 
   "matterhorn" = callPackage
-    ({ mkDerivation, base, base-compat, brick, bytestring, cheapskate
-     , checkers, config-ini, connection, containers, directory, filepath
-     , gitrev, hashable, Hclip, mattermost-api, mattermost-api-qc
-     , microlens-platform, mtl, process, quickcheck-text, stm, strict
+    ({ mkDerivation, aspell-pipe, base, base-compat, brick, bytestring
+     , cheapskate, checkers, config-ini, connection, containers
+     , directory, filepath, gitrev, hashable, Hclip, mattermost-api
+     , mattermost-api-qc, microlens-platform, mtl, process
+     , quickcheck-text, skylighting, stm, stm-delay, strict
      , string-conversions, tasty, tasty-hunit, tasty-quickcheck
-     , temporary, text, text-zipper, time, transformers, Unique
+     , temporary, text, text-zipper, time, transformers, Unique, unix
      , unordered-containers, utf8-string, vector, vty, xdg-basedir
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "30802.1.0";
-       sha256 = "0sn8r6yaq2mc034dp9ib5gfcvw30p1a2frqkcmk9f9bjk22r5ix9";
-       revision = "2";
-       editedCabalFile = "1jrnxx144ckngbvk7sr3sw9im8a2w57dzqwzvdpxr2ql3hanwf2c";
+       version = "31000.0.0";
+       sha256 = "0kkyalrqfaq851lnj8vbrffyg2yjbr5mhqrh8a2y4hkd8yx1ji36";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base base-compat brick bytestring cheapskate config-ini connection
-         containers directory filepath gitrev hashable Hclip mattermost-api
-         microlens-platform mtl process stm strict temporary text
-         text-zipper time transformers unordered-containers utf8-string
-         vector vty xdg-basedir
+         aspell-pipe base base-compat brick bytestring cheapskate config-ini
+         connection containers directory filepath gitrev hashable Hclip
+         mattermost-api microlens-platform mtl process skylighting stm
+         stm-delay strict temporary text text-zipper time transformers unix
+         unordered-containers utf8-string vector vty xdg-basedir
        ];
        testHaskellDepends = [
          base base-compat brick bytestring cheapskate checkers config-ini
@@ -127271,35 +127645,33 @@ self: {
          tasty-quickcheck text text-zipper time transformers Unique
          unordered-containers vector vty xdg-basedir
        ];
-       description = "Terminal client for the MatterMost chat system";
+       description = "Terminal client for the Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mattermost-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, connection, containers
-     , cryptonite, gitrev, hashable, HTTP, HUnit, memory, microlens
-     , microlens-th, mtl, network-uri, pretty-show, process, stm, tasty
-     , tasty-hunit, template-haskell, text, time, unordered-containers
-     , websockets
+     , gitrev, hashable, HTTP, HUnit, memory, microlens, microlens-th
+     , mtl, network-uri, pretty-show, process, stm, tasty, tasty-hunit
+     , template-haskell, text, time, unordered-containers, websockets
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "30802.1.0";
-       sha256 = "0bbg37aj6jxrdvy1zx9q143s7gjhx5dnba9y8vyjcfgypyzlggsv";
+       version = "31000.0.0";
+       sha256 = "1v5m57qsd155rr6nz3y1yzvs2imia4ld3xb2ccha0cnbki6hw6wb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring connection containers cryptonite gitrev
-         hashable HTTP memory microlens microlens-th network-uri pretty-show
-         process stm template-haskell text time unordered-containers
-         websockets
+         aeson base bytestring connection containers gitrev hashable HTTP
+         memory microlens microlens-th network-uri pretty-show process stm
+         template-haskell text time unordered-containers websockets
        ];
        testHaskellDepends = [
          aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit
          text unordered-containers
        ];
-       description = "Client API for MatterMost chat system";
+       description = "Client API for Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -127310,8 +127682,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "30802.1.0";
-       sha256 = "0rld7i62z66w0c0jfrk6kj7a8ha6hczmavdy3qss14p3z651l8p3";
+       version = "31000.0.0";
+       sha256 = "1sjw31vg02ygxb61m2cvhl435zgsk6w5gnl4v34qd9ihbq4laa9r";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -127801,6 +128173,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "med-module" = callPackage
+    ({ mkDerivation, base, bytestring, storable-endian, transformers
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "med-module";
+       version = "0.1";
+       sha256 = "0qln8b2vfmmfx2700vybd895j22a82l4k95nk7kwpkilsf0h6vji";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring storable-endian transformers utility-ht
+       ];
+       description = "Parse song module files from Amiga MED and OctaMED";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "mediabus" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, cereal
      , conduit, conduit-combinators, conduit-extra, containers
@@ -129994,17 +130383,17 @@ self: {
      }) {};
 
   "miso" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, lucid, text
-     , vector
+    ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers
+     , lucid, text, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.1.2.0";
-       sha256 = "1f9gs5lmcg86gs35fsdjq7bdhxyawdfna5lp84chsxl5fqa44wjs";
+       version = "0.2.1.0";
+       sha256 = "0z7gl1bxh1c6caxwqbf1cqpgrklx7z7f4qp06pipmvwciggcf30v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers lucid text vector
+         aeson base BoundedChan bytestring containers lucid text vector
        ];
        homepage = "http://github.com/dmjio/miso";
        description = "A tasty Haskell front-end framework";
@@ -130790,22 +131179,6 @@ self: {
      }) {};
 
   "monad-control" = callPackage
-    ({ mkDerivation, base, stm, transformers, transformers-base
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "monad-control";
-       version = "1.0.2.0";
-       sha256 = "1k5lgwdnbqmzzc7y29pfq7a35g428qivsp5cafdv0mbn5kc59aq5";
-       libraryHaskellDepends = [
-         base stm transformers transformers-base transformers-compat
-       ];
-       homepage = "https://github.com/basvandijk/monad-control";
-       description = "Lift control operations, like exception catching, through monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-control_1_0_2_1" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
      }:
@@ -130819,7 +131192,6 @@ self: {
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-control-aligned" = callPackage
@@ -132119,20 +132491,18 @@ self: {
   "monky" = callPackage
     ({ mkDerivation, base, bytestring, cereal, composition, containers
      , directory, env-locale, formatting, mtl, netlink, network
-     , optparse-applicative, process, pulseaudio, statvfs, stm
+     , old-time, optparse-applicative, process, pulseaudio, statvfs, stm
      , template-haskell, text, time, transformers, unix
      }:
      mkDerivation {
        pname = "monky";
-       version = "2.2.0.0";
-       sha256 = "1bh86myk4nar4ckq0sly7hvj3bzz022yh2sgmfchr6wb05g92pav";
-       revision = "1";
-       editedCabalFile = "00666fcv432m8whkmnwpijjvj5w5xa64iv7wrcsrc3dcwq5wy20g";
+       version = "2.2.1.0";
+       sha256 = "1iw0q2ymddnjq2sbzan03abnj00fwaz8pjadbsn63053wai5axfx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal composition containers directory env-locale
-         formatting mtl netlink network pulseaudio statvfs stm
+         formatting mtl netlink network old-time pulseaudio statvfs stm
          template-haskell text time transformers unix
        ];
        executableHaskellDepends = [
@@ -135073,6 +135443,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "names-th_0_2_0_3" = callPackage
+    ({ mkDerivation, base, containers, template-haskell }:
+     mkDerivation {
+       pname = "names-th";
+       version = "0.2.0.3";
+       sha256 = "1ijy7wkmw8y5lv7f1p975jlp17r3yfv5v05csiqrs1zykcpjpghf";
+       libraryHaskellDepends = [ base containers template-haskell ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Manipulate name strings for TH";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "namespace" = callPackage
     ({ mkDerivation, base, containers, monoid-extras }:
      mkDerivation {
@@ -136381,8 +136764,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-api-support";
-       version = "0.2.2";
-       sha256 = "1az26wrfgc8jjvkcrni4i6nr5v6i6gb4193zy858sp90rsln7yiy";
+       version = "0.3.0";
+       sha256 = "0jjd84wwxjdvj1d17rwwmpdv03c18am09xafysw33d6777xh8dmk";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
@@ -137531,8 +137914,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.4.1.0";
-       sha256 = "0vlcvvgl6sncgw03ks20b115jlznlv4f1n9fnzwzignws09hyf6y";
+       version = "0.5.0.1";
+       sha256 = "0j3wxzf8p5ck3dxfb6bmv3g8xpknsdalgjgp39i47g4qf27prqgx";
        libraryHaskellDepends = [
          async base binary bytestring template-haskell unix
        ];
@@ -138955,8 +139338,8 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.0.2";
-       sha256 = "0ackcr1brczhnn66700i1dc3bj506vp79r4dzr7i40dyi19mk9fw";
+       version = "0.0.3";
+       sha256 = "0na22wnyhs30h2h6nfkpgfzxpbcan597l1gg9mayi3g41148cxvj";
        libraryHaskellDepends = [
          base containers foldl formatting lens linear numhask protolude
          QuickCheck
@@ -138966,7 +139349,7 @@ self: {
          tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        homepage = "https://github.com/tonyday567/numhask-range";
-       description = "see readme.md";
+       description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -139442,15 +139825,15 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
-  "octane_0_19_0" = callPackage
+  "octane_0_20_0" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
      , overloaded-records, rattletrap, text
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.19.0";
-       sha256 = "1qdz8y7jacj6yq61icdyqw2fr741nwq1p9yyns6shbv6c9z9zy51";
+       version = "0.20.0";
+       sha256 = "1lgvx8nkfjh7x7hnpn689499gcx3hwq13s4kh4j74q1xfhmawwyv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140291,6 +140674,8 @@ self: {
        pname = "opencv";
        version = "0.0.1.1";
        sha256 = "095vljv7y7am7dfn7hp9rncfcbcmmqvgzwgw6iwrp6s3z0qv10jn";
+       revision = "1";
+       editedCabalFile = "1gql71xhyd3ns0a7cigjgdpar7x0b0bwr9kvi17gfs91ggiw7684";
        configureFlags = [
          "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++"
        ];
@@ -140324,6 +140709,8 @@ self: {
        pname = "opencv-extra";
        version = "0.1.0.0";
        sha256 = "1ah6jipanqag0vk4fjd35rr5xi479w2iym0ix6wd9g9zswb89k8j";
+       revision = "1";
+       editedCabalFile = "0pqkh3lqmgspg6h38jff8g4w7s28k4l6r17d7xkrfrghhaxl47mp";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bindings-DSL bytestring containers inline-c inline-c-cpp
@@ -141307,17 +141694,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "optparse-generic_1_2_1" = callPackage
-    ({ mkDerivation, base, bytestring, optparse-applicative, semigroups
-     , system-filepath, text, time, transformers, void
+  "optparse-generic_1_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, Only, optparse-applicative
+     , semigroups, system-filepath, text, time, transformers, void
      }:
      mkDerivation {
        pname = "optparse-generic";
-       version = "1.2.1";
-       sha256 = "1dk945dp98mwk1v4y0cky3z0ngmd29nbg6fbaaxnigcrgpbvkjml";
+       version = "1.2.2";
+       sha256 = "110jil2n945x30d8wgdrgs7di310z9hdnzhw5c1zq2jfh3b54ygz";
        libraryHaskellDepends = [
-         base bytestring optparse-applicative semigroups system-filepath
-         text time transformers void
+         base bytestring Only optparse-applicative semigroups
+         system-filepath text time transformers void
        ];
        description = "Auto-generate a command-line parser for your datatype";
        license = stdenv.lib.licenses.bsd3;
@@ -144308,14 +144695,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "path-io_1_3_1" = callPackage
+  "path-io_1_3_2" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, exceptions
      , filepath, hspec, path, temporary, time, transformers, unix-compat
      }:
      mkDerivation {
        pname = "path-io";
-       version = "1.3.1";
-       sha256 = "166wxidsfyyv609bjfrn204k7lia02hgb4kmmbfv716dplywsb0q";
+       version = "1.3.2";
+       sha256 = "031y6dypf6wnwx7fnjyvn2sb5y1lxfibx0jnwc19h93harm3lfyp";
        libraryHaskellDepends = [
          base containers directory dlist exceptions filepath path temporary
          time transformers unix-compat
@@ -144842,8 +145229,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-slave-server";
-       version = "0.1.1.0";
-       sha256 = "0vjajkb0hamn68klihk6i6xwc6qc8ann5miqh9w71vgmwc5ksz0g";
+       version = "0.1.2.0";
+       sha256 = "16s1wgbvs7j8fbw82wwz8qxgyvvvcqjb54q2sb5qwjmlijw0rdwn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144856,7 +145243,7 @@ self: {
          unordered-containers uuid wreq yaml
        ];
        executableHaskellDepends = [
-         base optparse-applicative wai-extra warp
+         base lens optparse-applicative text wai-extra warp
        ];
        homepage = "https://github.com/NCrashed/pdf-slave-server#readme";
        description = "Web service for pdf-slave tool";
@@ -144988,6 +145375,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pdfname" = callPackage
+    ({ mkDerivation, base, directory, filepath, optparse-applicative
+     , pdfinfo, text
+     }:
+     mkDerivation {
+       pname = "pdfname";
+       version = "0.1.3";
+       sha256 = "0zrjz46fkrad76bwvylwv2ai9ygvrvh0mcdla26ax31w80wx5hk8";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filepath optparse-applicative pdfinfo text
+       ];
+       homepage = "https://github.com/asr/pdfname#readme";
+       description = "Name a PDF file using information from the pdfinfo command";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pdfsplit" = callPackage
     ({ mkDerivation, base, directory, pdfinfo, process, temporary }:
      mkDerivation {
@@ -145258,6 +145663,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "penrose" = callPackage
+    ({ mkDerivation, ad, aeson, base, containers, gloss, megaparsec
+     , old-time, random, text, websockets
+     }:
+     mkDerivation {
+       pname = "penrose";
+       version = "0.1.0.2";
+       sha256 = "0yva42b0av532a99kl0ldcfi229vs2m09w445r981i30xlilg5is";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ad aeson base containers gloss megaparsec old-time random text
+         websockets
+       ];
+       homepage = "http://penrose.ink";
+       description = "A system that automatically visualize mathematics";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "peparser" = callPackage
     ({ mkDerivation, base, binary, bytestring, haskell98 }:
      mkDerivation {
@@ -145469,14 +145893,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistable-record_0_5_0_1" = callPackage
+  "persistable-record_0_5_0_2" = callPackage
     ({ mkDerivation, array, base, containers, dlist, names-th
      , quickcheck-simple, template-haskell, th-data-compat, transformers
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.5.0.1";
-       sha256 = "0r0b23ixshsqqlqpg9jik5kkbdn5cxsr05bcmjwf3wcyrbl5c3g3";
+       version = "0.5.0.2";
+       sha256 = "125zx0c1jccbb62azx5z36gr27fa8rxr5ydnq5w1wyqi0w4kxg02";
        libraryHaskellDepends = [
          array base containers dlist names-th template-haskell
          th-data-compat transformers
@@ -145505,6 +145929,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistable-types-HDBC-pg_0_0_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, convertible, HDBC
+     , persistable-record, relational-query-HDBC, text-postgresql
+     }:
+     mkDerivation {
+       pname = "persistable-types-HDBC-pg";
+       version = "0.0.1.5";
+       sha256 = "0kdrqn6j7vsq748j9j22g3wqxik9pfy3s3dgk4gd5bqnp4gv7949";
+       libraryHaskellDepends = [
+         base bytestring convertible HDBC persistable-record
+         relational-query-HDBC text-postgresql
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "HDBC and Relational-Record instances of PostgreSQL extended types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
@@ -146256,8 +146698,8 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "10.8";
-       sha256 = "127xgzx1j2d4flqykgb6vp57zjmyc6jkx8l2jak4df68wpcy1gwq";
+       version = "10.9";
+       sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -146823,16 +147265,16 @@ self: {
      }) {};
 
   "pid1" = callPackage
-    ({ mkDerivation, base, process, unix }:
+    ({ mkDerivation, base, directory, process, unix }:
      mkDerivation {
        pname = "pid1";
-       version = "0.1.0.1";
-       sha256 = "1j25fgp44ww1iy2ybj3jy7frlf30ypvmnrwpm38qlm96ak46sfqn";
+       version = "0.1.2.0";
+       sha256 = "0xkz4vdh8cblpl8k2xmqs8vwv2c0vpxdbikcf2dnmzbg9fdvz5wy";
        revision = "1";
-       editedCabalFile = "0ii76hs4yg72w8pyynb7fbs80fw4knkfsv1gxqkagnm10hf3y8gk";
+       editedCabalFile = "11yg5pjci1d6p5ml0ic4vqn70vjx8vvhqs20rahgfqhh8palkyw9";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base process unix ];
+       libraryHaskellDepends = [ base directory process unix ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/fpco/pid1#readme";
        description = "Do signal handling and orphan reaping for Unix PID1 init processes";
@@ -147136,14 +147578,15 @@ self: {
 
   "pipes-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
-     , transformers
+     , stringsearch, transformers
      }:
      mkDerivation {
        pname = "pipes-bytestring";
-       version = "2.1.5";
-       sha256 = "10snjd1abl954gbcl2vxn5vsj830k4sb1jxs8z3h372has13ls9c";
+       version = "2.1.6";
+       sha256 = "061wcb48mdq694zhwb5xh423ss6f7cccxahc05cifrzkh033gp5i";
        libraryHaskellDepends = [
-         base bytestring pipes pipes-group pipes-parse transformers
+         base bytestring pipes pipes-group pipes-parse stringsearch
+         transformers
        ];
        description = "ByteString support for pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -148526,6 +148969,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "plot-light" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg
+     , colour, hspec, palette, QuickCheck, scientific, text, time
+     }:
+     mkDerivation {
+       pname = "plot-light";
+       version = "0.2.1";
+       sha256 = "1zpmmwqvpf6xba6pc7b884glwg3f23hc64srjshmaaa4dv3fjf21";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-svg colour palette scientific text time
+       ];
+       executableHaskellDepends = [
+         attoparsec attoparsec-time base blaze-svg colour scientific text
+         time
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/ocramz/plot-light";
+       description = "A lightweight plotting library, exporting to SVG";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plotfont" = callPackage
     ({ mkDerivation, base, containers, tasty, tasty-hunit }:
      mkDerivation {
@@ -148559,8 +149025,8 @@ self: {
     ({ mkDerivation, base, hspec, optparse-applicative, process }:
      mkDerivation {
        pname = "ploton";
-       version = "0.1.0.0";
-       sha256 = "0iv4ngwf7zj20wglpa2klj5a39nfqmwbh7s1kivrlia1mi0xck3d";
+       version = "0.3.0.0";
+       sha256 = "1c045pc42bangg2rlclc91ad78ynjbc5lccmc33hjswcxynv6lj2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base optparse-applicative process ];
@@ -150479,8 +150945,8 @@ self: {
      }:
      mkDerivation {
        pname = "postmark";
-       version = "0.1.1";
-       sha256 = "1jh1byixnc8mh3g4xb1w0nx9ghh5dchhqf1nxji869kbim2lqgaw";
+       version = "0.2.0";
+       sha256 = "14p4zff7phmavw4q0ygyd0b3sllgyn28q994zbgwmpvk9l1a6d80";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150804,8 +151270,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.44";
-       sha256 = "03x71m1sgq5l70xkmlvi8v3805xa39fbg9py54sqfdyk2rg56zyy";
+       version = "0.0.47";
+       sha256 = "1qjlw42xyynbwp72s2xx9kavvbqj13y603fpwf27hvab2ypyyg8w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152456,6 +152922,74 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) proj;};
 
+  "project-m36" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
+     , bytestring, Cabal, cassava, conduit, containers, criterion
+     , cryptohash-sha256, data-interval, deepseq, deepseq-generics
+     , directory, distributed-process, distributed-process-async
+     , distributed-process-client-server, distributed-process-extras
+     , either, extended-reals, filepath, ghc, ghc-boot, ghc-paths, Glob
+     , gnuplot, hashable, hashable-time, haskeline, http-api-data, HUnit
+     , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network
+     , network-transport, network-transport-tcp, old-locale
+     , optparse-applicative, parallel, path-pieces, random
+     , random-shuffle, resourcet, semigroups, stm, stm-containers
+     , template-haskell, temporary, text, time, transformers, unix
+     , unordered-containers, uuid, uuid-aeson, vector
+     , vector-binary-instances, websockets
+     }:
+     mkDerivation {
+       pname = "project-m36";
+       version = "0.1";
+       sha256 = "0g816q602vjkk0ix8wxwlc0w7fx9xaid9qiib9811y7ad4v9zkih";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring binary bytestring cassava
+         conduit containers cryptohash-sha256 data-interval deepseq
+         deepseq-generics directory distributed-process
+         distributed-process-async distributed-process-client-server
+         distributed-process-extras either extended-reals filepath ghc
+         ghc-boot ghc-paths Glob gnuplot hashable hashable-time haskeline
+         http-api-data list-t monad-parallel MonadRandom mtl
+         network-transport network-transport-tcp old-locale
+         optparse-applicative parallel path-pieces random-shuffle resourcet
+         stm stm-containers temporary text time transformers unix
+         unordered-containers uuid vector vector-binary-instances
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base base64-bytestring binary bytestring Cabal
+         cassava conduit containers data-interval deepseq deepseq-generics
+         directory either filepath ghc ghc-paths gnuplot hashable
+         hashable-time haskeline http-api-data HUnit list-t megaparsec
+         MonadRandom mtl network-transport-tcp optparse-applicative parallel
+         path-pieces random semigroups stm stm-containers template-haskell
+         temporary text time transformers unordered-containers uuid
+         uuid-aeson vector vector-binary-instances websockets
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring binary bytestring Cabal
+         cassava conduit containers data-interval deepseq deepseq-generics
+         directory either filepath gnuplot hashable hashable-time haskeline
+         http-api-data HUnit list-t megaparsec MonadRandom mtl network
+         network-transport network-transport-tcp optparse-applicative
+         parallel path-pieces random semigroups stm stm-containers
+         template-haskell temporary text time transformers
+         unordered-containers uuid uuid-aeson vector vector-binary-instances
+         websockets
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring Cabal cassava
+         containers criterion data-interval deepseq deepseq-generics
+         directory filepath gnuplot hashable hashable-time haskeline HUnit
+         megaparsec mtl parallel stm stm-containers temporary text time
+         unordered-containers uuid vector vector-binary-instances
+       ];
+       homepage = "https://github.com/agentm/project-m36";
+       description = "Relational Algebra Engine";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "project-template" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, conduit
      , conduit-extra, containers, directory, filepath, hspec, mtl
@@ -152736,8 +153270,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.3.0";
-       sha256 = "1walyz9x0rxa9n77kr0w7gpm2vnydxq70ii782ygzy0izymhnx39";
+       version = "4.4.0";
+       sha256 = "1rh8k1g8wpp898qh3g2k19v7qd95lv7l8vnb52dns350pgyswssx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153054,23 +153588,6 @@ self: {
      }) {};
 
   "protocol-buffers" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, filepath, mtl, parsec, syb, utf8-string
-     }:
-     mkDerivation {
-       pname = "protocol-buffers";
-       version = "2.4.0";
-       sha256 = "0sgybwg7js8dmzibr6cxn0p1n0m8kc9a3xqdbz7l8d4ili4q4khw";
-       libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath mtl
-         parsec syb utf8-string
-       ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers_2_4_2" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, parsec, syb, utf8-string
      }:
@@ -153085,15 +153602,14 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.4.0";
-       sha256 = "1x1xnb3ldgic9y6hskr4h7xdd4lxql2r5fcmsw366b0w631vr57q";
+       version = "2.4.2";
+       sha256 = "0r7n1pnkabzksik9zrqif490g135hcjgvc40zm5c0b3dpq64r4lb";
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
        ];
@@ -153366,29 +153882,6 @@ self: {
      }) {};
 
   "psqueues" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, deepseq
-     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
-     , QuickCheck, random, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, unordered-containers
-     }:
-     mkDerivation {
-       pname = "psqueues";
-       version = "0.2.2.3";
-       sha256 = "1dd6xv1wjxj1xinx155b14hijw8fafrg4096srzdzj7xyqq7qxbd";
-       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
-       testHaskellDepends = [
-         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq fingertree-psqueue ghc-prim
-         hashable mtl PSQueue random unordered-containers
-       ];
-       description = "Pure priority search queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "psqueues_0_2_3_0" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
      , QuickCheck, random, tagged, test-framework, test-framework-hunit
@@ -153409,7 +153902,6 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pstemmer" = callPackage
@@ -153918,8 +154410,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.11.5";
-       sha256 = "1yqfgmxb8210dzffg4img8f2nzfvys3g583j2948lj03y9q170y1";
+       version = "0.11.6";
+       sha256 = "0cl4lyx9b1fk4sf94nj6zjj1n5s7wr56ygrxyi0ac7fbav8r42w0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -154614,8 +155106,8 @@ self: {
      }:
      mkDerivation {
        pname = "qm-interpolated-string";
-       version = "0.1.0.0";
-       sha256 = "1ycys6ak809vyjgzjp2ra1ndnsficzdjs7kq7xaks0k50sscf7dd";
+       version = "0.1.1.0";
+       sha256 = "1fidkdn4smbv4ybc881168401gfq2l19qfb7w0bvki93jqqajhs1";
        libraryHaskellDepends = [
          base bytestring haskell-src-meta template-haskell text
        ];
@@ -154852,8 +155344,8 @@ self: {
     ({ mkDerivation, aeson, base, hashable, path-pieces, text }:
      mkDerivation {
        pname = "quantification";
-       version = "0.1";
-       sha256 = "0z7mwqpl83l8ss1ji8xna8z1s5nd78164ni9wmfiszhp4ghg2vpi";
+       version = "0.1.1";
+       sha256 = "092qnimc99x1n1g0mfpgsr85fbyd33isjsd9cc8rgb1n44ryj14m";
        libraryHaskellDepends = [ aeson base hashable path-pieces text ];
        homepage = "https://github.com/andrewthad/quantification#readme";
        description = "Data types and typeclasses to deal with universally and existentially quantified types";
@@ -155337,8 +155829,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-simple";
-       version = "0.1.0.1";
-       sha256 = "166mavvz2rsi0clxhv9vkqdiyiird0xj8mdlfbav664qn5mn2yx5";
+       version = "0.1.0.2";
+       sha256 = "0p1ky7sj42crn9sas9d2cs5cwz03wsk20p55x2wgmlj5rmpr5mla";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Test properties and default-mains for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -155362,18 +155854,18 @@ self: {
      }) {};
 
   "quickcheck-state-machine" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, constraints, containers
-     , hspec, mtl, parallel-io, QuickCheck, random, singletons, stm
+    ({ mkDerivation, ansi-wl-pprint, base, containers, mtl, parallel-io
+     , QuickCheck, random, stm
      }:
      mkDerivation {
        pname = "quickcheck-state-machine";
-       version = "0.0.0";
-       sha256 = "0022zqwncc263dcvcck06faqxqyqq2vj57zbnqk63hjpikghkk9d";
+       version = "0.1.0";
+       sha256 = "1jczx6c1s5ir7r7r90kf5fhac4sydayr4lm6zsvjs4ykqnnparh6";
        libraryHaskellDepends = [
-         ansi-wl-pprint base constraints containers mtl parallel-io
-         QuickCheck random singletons stm
+         ansi-wl-pprint base containers mtl parallel-io QuickCheck random
+         stm
        ];
-       testHaskellDepends = [ base hspec mtl QuickCheck random ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme";
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd3;
@@ -157072,15 +157564,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rattletrap_2_2_4" = callPackage
+  "rattletrap_2_5_0" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
      , binary-bits, bytestring, containers, data-binary-ieee754
      , filepath, hspec, template-haskell, temporary, text, vector
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.2.4";
-       sha256 = "19x353fks41555k7zax7i9h68hy8q420x071srn0q4bmsbzcpz1i";
+       version = "2.5.0";
+       sha256 = "14ksxmwy53xpa9k5swz8254x3kgswkb91r7fnkx85pph5x09qwxd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -160062,7 +160554,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query_0_9_1_0" = callPackage
+  "relational-query_0_9_2_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, dlist
      , names-th, persistable-record, quickcheck-simple, sql-words
      , template-haskell, text, th-reify-compat, time, time-locale-compat
@@ -160070,8 +160562,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.9.1.0";
-       sha256 = "1nv2kl2nzp3xawyhiwlh35a2z1x1hwa5fcqha78d2hnk2rd8036c";
+       version = "0.9.2.1";
+       sha256 = "0sdmvbzfxbs7hk71zdn8bhbzdcw10h9apm5gn47cmiqkyiv5si5k";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text th-reify-compat time
@@ -160106,7 +160598,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_6_2_0" = callPackage
+  "relational-query-HDBC_0_6_2_1" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
      , relational-schemas, template-haskell, th-data-compat
@@ -160114,8 +160606,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.2.0";
-       sha256 = "0w9qk25idc9cbis27948jw9hcyib63q4byp8dd8xrqcx4jir5xr3";
+       version = "0.6.2.1";
+       sha256 = "1slx0zh9487q77spajwibnxpc5xwcdqg6i98gzxfd1k3jfh2ylw2";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
@@ -160203,14 +160695,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-schemas_0_1_3_3" = callPackage
+  "relational-schemas_0_1_4_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, relational-query
      , template-haskell, time
      }:
      mkDerivation {
        pname = "relational-schemas";
-       version = "0.1.3.3";
-       sha256 = "1hqbx82cz4a2kmirlxild4n2rxw1xhj840ibyhzs5ppl325ibbrs";
+       version = "0.1.4.0";
+       sha256 = "1z0v175gx6yxmfjl55dyhsmpmyvrgwzynjy9yhi348kvij7iyivq";
        libraryHaskellDepends = [
          base bytestring containers relational-query template-haskell time
        ];
@@ -163083,6 +163575,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rot13_0_2_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, QuickCheck, text }:
+     mkDerivation {
+       pname = "rot13";
+       version = "0.2.0.1";
+       sha256 = "1p6lrjgigzbjigsyfsmx3kxrzm1aws3i708yl4xyh73arhcd89p0";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck text ];
+       homepage = "https://github.com/kvanberendonck/codec-rot13";
+       description = "Fast ROT13 cipher for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rotating-log" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-locale
      , time, time-locale-compat
@@ -163498,8 +164004,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.1.11";
-       sha256 = "0nngz9b2w2ppssg4361jf445grff4x1k7p2ark2c8bbg4afayn6h";
+       version = "0.1.12";
+       sha256 = "1pscz3a7n8a3337zh4xh44gf00hd86d4dnh059sj60gx6dac7zxh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -163957,23 +164463,6 @@ self: {
      }) {};
 
   "safe-exceptions" = callPackage
-    ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
-     , void
-     }:
-     mkDerivation {
-       pname = "safe-exceptions";
-       version = "0.1.5.0";
-       sha256 = "068srl44q66iv939fhk3mxalmxdn7348f6xh46pwg5mjj4vfrvvh";
-       revision = "1";
-       editedCabalFile = "0m0m2bj8xmiqj1qxkl00p0fndn6aw54a4yf2kx2qhijgzc4f1hwl";
-       libraryHaskellDepends = [ base deepseq exceptions transformers ];
-       testHaskellDepends = [ base hspec void ];
-       homepage = "https://github.com/fpco/safe-exceptions#readme";
-       description = "Safe, consistent, and easy exception handling";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "safe-exceptions_0_1_6_0" = callPackage
     ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
      , void
      }:
@@ -163986,7 +164475,6 @@ self: {
        homepage = "https://github.com/fpco/safe-exceptions#readme";
        description = "Safe, consistent, and easy exception handling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-exceptions-checked" = callPackage
@@ -164898,8 +165386,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.2.7";
-       sha256 = "1dd0m01dbjfjjrv79lnm853ldqkjsmv490a66912v58p51c7qvni";
+       version = "2.2.8";
+       sha256 = "1rldqn584zmlxa42fqqnr2idw82rmma9cfad7jl5ih5mb3hyii5g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165534,18 +166022,16 @@ self: {
   "scientific" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
-     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, vector
+     , primitive, QuickCheck, smallcheck, tasty, tasty-ant-xml
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.4.15";
-       sha256 = "1gsmpn3563k90nrai0jdjfvkxjjaxs7bxxsfbdpmw4xvbp2lmp9n";
-       revision = "2";
-       editedCabalFile = "1pxj3l4rm04l8rllv15sabspkw5nqhkhf38dsd2cyvr1n6669dd9";
+       version = "0.3.5.1";
+       sha256 = "19hvcqrrm375inqmci516xk32vir7dgw7ini8ij5rkdnrf1fd9jv";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq ghc-prim hashable
-         integer-gmp integer-logarithms text vector
+         integer-gmp integer-logarithms primitive text
        ];
        testHaskellDepends = [
          base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
@@ -167179,17 +167665,17 @@ self: {
   "sensu-run" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, http-client
      , http-types, lens, network, optparse-applicative, process
-     , temporary, text, time, vector, wreq
+     , temporary, text, time, unix, vector, wreq
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.1.1.3";
-       sha256 = "1zhhnddp81p42z243i10kma5jic283gqlg190lfifsg8kdg3yms1";
+       version = "0.2.0";
+       sha256 = "066pi6smcvffs7gsl1l45r2dshkw570p6h4s4nwsp5skf6k3568r";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base bytestring filepath http-client http-types lens network
-         optparse-applicative process temporary text time vector wreq
+         optparse-applicative process temporary text time unix vector wreq
        ];
        homepage = "https://github.com/maoe/sensu-run#readme";
        description = "A tool to send command execution results to Sensu";
@@ -167712,10 +168198,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-JuicyPixels";
-       version = "0.3.0.2";
-       sha256 = "1g9y1fqyd7v1cmwjid5i83qji2a4c514hmpz7ypz6zvd4ppj5v9l";
-       revision = "1";
-       editedCabalFile = "1sj4qyaf75nf1mciddga30b8ddrwv94184cz751n9abxidl18r49";
+       version = "0.3.0.3";
+       sha256 = "0kb53kla03clkv0686awjm6nc57r5yw0zmfs02036iplq6cc1yb0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167822,7 +168306,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-auth-cookie_0_5_0_4" = callPackage
+  "servant-auth-cookie_0_5_0_5" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , cereal, cookie, criterion, cryptonite, data-default, deepseq
      , exceptions, hspec, http-api-data, http-types, memory, mtl
@@ -167831,8 +168315,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.5.0.4";
-       sha256 = "0h9m9mzq2b5k5l3zp42cs45k5wi42bqvsp3lp2p1z1fb9as4cw2v";
+       version = "0.5.0.5";
+       sha256 = "1ml7f452ikfwzymvajrs0fmlww7pbq5prphsv65r12n4pzx9ynva";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -168470,6 +168954,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-generic" = callPackage
+    ({ mkDerivation, base, servant, servant-server, text, warp }:
+     mkDerivation {
+       pname = "servant-generic";
+       version = "0.1.0.0";
+       sha256 = "03gh879j9qdm666lvl2j2xiqyrgclfg2k4f1l4lslby5y81r4lv6";
+       libraryHaskellDepends = [ base servant servant-server ];
+       testHaskellDepends = [ base servant servant-server text warp ];
+       description = "Specify Servant APIs with records";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "servant-github" = callPackage
     ({ mkDerivation, aeson, base, hspec, http-api-data, http-client
      , http-link-header, QuickCheck, servant, servant-client, text
@@ -169231,7 +169727,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-swagger_1_1_3" = callPackage
+  "servant-swagger_1_1_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
      , cabal-doctest, directory, doctest, filepath, hspec, http-media
      , insert-ordered-containers, lens, QuickCheck, servant, swagger2
@@ -169239,8 +169735,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-swagger";
-       version = "1.1.3";
-       sha256 = "0hf3psdcbnj0mj73zdfhv0l4p432hxzj1i9m66al3kd3k7rz79pk";
+       version = "1.1.3.1";
+       sha256 = "0n5vvrxg1lllkm385g0jd2j5bsr21bcibwn5szdpn6r5yh2mvn78";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base bytestring hspec http-media insert-ordered-containers
@@ -169267,6 +169763,8 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.2.3.2.2.8";
        sha256 = "0daqlhwy48098wp2hjsnam7d29fj6zqxmdckqfc8z0xfs07ppbg8";
+       revision = "1";
+       editedCabalFile = "0n2c7sn7ly5wwlvns1nfzig3a6hxs1qn6jih3amnp116avvjkk1k";
        libraryHaskellDepends = [
          base blaze-markup bytestring directory file-embed filepath
          http-media servant servant-blaze servant-server servant-swagger
@@ -170366,8 +170864,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.25";
-       sha256 = "0svgrvp054vs00hx5pcdlmpc375c4r926nla4fgk1jax6ghbaw72";
+       version = "0.0.27";
+       sha256 = "0mlh6vzq7gdpyxm05y36fwjx0vjhbkk23qn2ajvc28l6d6d3p5ym";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -171673,8 +172171,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-effects";
-       version = "0.9.0.0";
-       sha256 = "1wrdqzwzi9gjjixg3rhkvc1lpi6br07inl0k6ngbrd8shxipwsa3";
+       version = "0.9.0.1";
+       sha256 = "1n5jr909g410zfy0vk4pvl5phy981hhxsx61hcm6p99f0vdybcwx";
        libraryHaskellDepends = [
          array base exceptions list-t monad-control MonadRandom mtl text
          transformers transformers-base
@@ -171867,18 +172365,23 @@ self: {
      }) {};
 
   "simple-logging" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, iso8601-time
-     , lens, mtl, simple-effects, string-conv, text, time, vector
+    ({ mkDerivation, aeson, base, bytestring, directory, exceptions
+     , filepath, hscolour, iso8601-time, lens, mtl, simple-effects
+     , string-conv, text, time, uuid, vector
      }:
      mkDerivation {
        pname = "simple-logging";
-       version = "0.2.0.1";
-       sha256 = "1x0vclb2an4mbwxqk44z0rpw1ai0pq2kc9ak0chyzijbk1vivwmx";
+       version = "0.2.0.2";
+       sha256 = "1a917vvwnzmv9jqrrmk6knv8wfrxwkbal6gxp24a2xkiqcjpgbjw";
        libraryHaskellDepends = [
-         aeson base bytestring exceptions iso8601-time lens mtl
+         aeson base bytestring directory exceptions filepath hscolour
+         iso8601-time lens mtl simple-effects string-conv text time uuid
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions hscolour iso8601-time lens mtl
          simple-effects string-conv text time vector
        ];
-       testHaskellDepends = [ base simple-effects ];
        homepage = "https://gitlab.com/haskell-hr/logging";
        description = "Logging effect to plug into the simple-effects framework";
        license = stdenv.lib.licenses.mit;
@@ -176907,8 +177410,8 @@ self: {
      }:
      mkDerivation {
        pname = "spreadsheet";
-       version = "0.1.3.4";
-       sha256 = "1hj90bad6b1iiycwlpghxwmwxc1h14702pw4qpxvcp2n9sn2cjky";
+       version = "0.1.3.5";
+       sha256 = "1h5a2ifr10ihaqvl819d0g3vnn2wzp27wqlfbk21v8wv07wrwckk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177194,6 +177697,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sql-words_0_1_5_1" = callPackage
+    ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
+     mkDerivation {
+       pname = "sql-words";
+       version = "0.1.5.1";
+       sha256 = "0nr4ld96s3n48ydd15jsxb823kk2682wkjd2h7vqc306891qwwzd";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "SQL keywords data constructors into OverloadedString";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sqlcipher" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , hspec, openssl, pretty, temporary, time, utf8-string
@@ -177233,27 +177750,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.13.0";
-       sha256 = "1s7rf4bip9ki6l3581x7h7ndlj5j369yvxfakfshrj5rcz329car";
-       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_14_0" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only
      , text, time, transformers
@@ -177272,7 +177768,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
@@ -177820,6 +178315,30 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "stack-bump" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, filepath
+     , Glob, hspec, lens, lens-aeson, optparse-applicative, process
+     , QuickCheck, strict, text, yaml
+     }:
+     mkDerivation {
+       pname = "stack-bump";
+       version = "0.7.1.0";
+       sha256 = "1la7v19zly3rnq0rwzv2h6hj9ibx0c0gdgvj4cc1pi893fyggkgz";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-terminal async base bytestring filepath Glob lens lens-aeson
+         optparse-applicative process strict text yaml
+       ];
+       testHaskellDepends = [
+         ansi-terminal async base bytestring filepath Glob hspec lens
+         lens-aeson optparse-applicative process QuickCheck strict text yaml
+       ];
+       homepage = "https://github.com/yamadapc/stack-bump";
+       description = "Dead simple version bumping for hpack packages";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stack-hpc-coveralls" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib
@@ -178132,25 +178651,6 @@ self: {
      }) {};
 
   "stackage-query" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath
-     , optparse-applicative, process, stackage-types, text, yaml
-     }:
-     mkDerivation {
-       pname = "stackage-query";
-       version = "0.1.0";
-       sha256 = "0q9v8p53xfv96rhq1a3yz9f1nblp6zhx2bfbvkkl98jq50yh501j";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal containers directory filepath optparse-applicative
-         process stackage-types text yaml
-       ];
-       homepage = "https://github.com/juhp/stackage-query";
-       description = "Stackage package query";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stackage-query_0_1_1" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , optparse-applicative, process, stackage-types, text, yaml
      }:
@@ -178167,7 +178667,6 @@ self: {
        homepage = "https://github.com/juhp/stackage-query";
        description = "Stackage package query";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-sandbox" = callPackage
@@ -179734,8 +180233,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.4.3";
-       sha256 = "0cwqni8n13jkk3m6blvppmx5lgnb91mc19xfa51xlpsfcdsfm101";
+       version = "0.4.4";
+       sha256 = "1gaxlxy1mcdlc6q7va8l6qry52svd2cangdlpvgj32ag95vvpdpc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -180066,8 +180565,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-concurrency";
-       version = "0.3.0.0";
-       sha256 = "1dnlnm57rlk900n148xnfihx917rc9lggx6fdzhf7cjbi1n2ibn2";
+       version = "0.3.0.1";
+       sha256 = "040x4g1q520s6a1kxi4j730r6vr7n539wg92mdcvg9bswa620yqj";
        libraryHaskellDepends = [
          base exceptions lifted-async monad-control stm streaming
          streaming-with transformers-base
@@ -180212,14 +180711,14 @@ self: {
 
   "streaming-with" = callPackage
     ({ mkDerivation, base, exceptions, managed, streaming-bytestring
-     , transformers
+     , temporary, transformers
      }:
      mkDerivation {
        pname = "streaming-with";
-       version = "0.1.0.0";
-       sha256 = "1gc8y3ak3w411yibzrbf9wa719zr0zym6pqmg3ihrdn03z1ij3h0";
+       version = "0.2.0.0";
+       sha256 = "02cdjmq7dxqfpqs73v7c63iwavbwb56fdd3pk4qs91vm6d0lfbrp";
        libraryHaskellDepends = [
-         base exceptions managed streaming-bytestring transformers
+         base exceptions managed streaming-bytestring temporary transformers
        ];
        description = "with/bracket-style idioms for use with streaming";
        license = stdenv.lib.licenses.mit;
@@ -181714,8 +182213,8 @@ self: {
      }:
      mkDerivation {
        pname = "superrecord";
-       version = "0.2.0.0";
-       sha256 = "0gjmh3mk5pkfqmq145h8zy9hc0vb18prhjqzv948qmihb1ixdaci";
+       version = "0.3.0.0";
+       sha256 = "1yya0lx3lqhr7pj3p72zi8xgjrqlrsrs9b6ilrskzkh0gjqcfjw5";
        libraryHaskellDepends = [
          aeson base constraints deepseq ghc-prim mtl text
        ];
@@ -181939,18 +182438,17 @@ self: {
 
   "swagger2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
-     , containers, doctest, generics-sop, Glob, hashable, hspec
-     , http-media, HUnit, insert-ordered-containers, lens, mtl, network
-     , QuickCheck, scientific, template-haskell, text, time
-     , transformers, transformers-compat, unordered-containers
-     , uuid-types, vector
+     , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
+     , hashable, hspec, http-media, HUnit, insert-ordered-containers
+     , lens, mtl, network, QuickCheck, scientific, template-haskell
+     , text, time, transformers, transformers-compat
+     , unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "swagger2";
-       version = "2.1.4";
-       sha256 = "0i3zchbshk8h0b6yip4p9lyz6abb4akv5n6lr3qsndz5pbxfibc5";
-       revision = "1";
-       editedCabalFile = "1sfabkac6a37frrzcmz6w0whszz39xpc3g0r8v2ihv0irswvfp2n";
+       version = "2.1.4.1";
+       sha256 = "0b4c9m6yvhj2z7krf7r3a4xmbnyiifhcc4ahl5xfkb2wh6g6nfi3";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base base-compat bytestring containers generics-sop hashable
          http-media insert-ordered-containers lens mtl network scientific
@@ -183059,15 +183557,15 @@ self: {
      }) {};
 
   "system-linux-proc" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, errors
-     , hedgehog, text
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , directory, errors, hedgehog, text
      }:
      mkDerivation {
        pname = "system-linux-proc";
-       version = "0.1.0.0";
-       sha256 = "0ij75jdkb7nan98yk6i1dznwqvw20x23krgasix33scf1yyk30ps";
+       version = "0.1.0.3";
+       sha256 = "0gljgsbyzya0grh0m13sld6v2cj7g9j5jcgh6yxff2mmqfcf3z7p";
        libraryHaskellDepends = [
-         attoparsec base bytestring containers errors text
+         attoparsec base bytestring containers directory errors text
        ];
        testHaskellDepends = [ base hedgehog ];
        homepage = "https://github.com/erikd/system-linux-proc";
@@ -184374,13 +184872,13 @@ self: {
      }:
      mkDerivation {
        pname = "tasty";
-       version = "0.11.2.1";
-       sha256 = "1fg2bk9x6jhksxcm4761ynmxgsx9clzg8xdykgzj1azjmk4dymk9";
+       version = "0.11.2.2";
+       sha256 = "006gnkr0s6id193j06g7zs1mdzdckbgc5vwclbk535xhrgr2gzk8";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers deepseq mtl
          optparse-applicative regex-tdfa stm tagged unbounded-delays
        ];
-       homepage = "http://documentup.com/feuerbach/tasty";
+       homepage = "https://github.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -186590,17 +187088,21 @@ self: {
      }) {};
 
   "testbench" = callPackage
-    ({ mkDerivation, base, boxes, criterion, deepseq, HUnit, statistics
-     , transformers
+    ({ mkDerivation, base, bytestring, cassava, criterion, deepseq
+     , dlist, HUnit, optparse-applicative, process, resourcet
+     , statistics, streaming, streaming-bytestring, streaming-cassava
+     , temporary, transformers, weigh
      }:
      mkDerivation {
        pname = "testbench";
-       version = "0.1.0.0";
-       sha256 = "10rydywa6d6adfzckafhiwwh1r84pzh60icrmv9h66kfzw328nb6";
+       version = "0.2.1.0";
+       sha256 = "0pka1vmzh4x0pzwlrxzzsjaxjd7py43m5ph3barwfrbjkqbyjzj6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base boxes criterion deepseq HUnit statistics transformers
+         base bytestring cassava criterion deepseq dlist HUnit
+         optparse-applicative process resourcet statistics streaming
+         streaming-bytestring streaming-cassava temporary transformers weigh
        ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
@@ -186730,29 +187232,6 @@ self: {
      }) {};
 
   "texmath" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
-     , utf8-string, xml
-     }:
-     mkDerivation {
-       pname = "texmath";
-       version = "0.9.4";
-       sha256 = "1591d0z2f8anql4sxh3566gyfmfyvvf83sg21ss9yrq8jw35srns";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers mtl pandoc-types parsec syb xml
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath process split temporary text
-         utf8-string xml
-       ];
-       homepage = "http://github.com/jgm/texmath";
-       description = "Conversion between formats used to represent mathematics";
-       license = "GPL";
-     }) {};
-
-  "texmath_0_9_4_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, process, split, syb, temporary, text
      , utf8-string, xml
@@ -186773,7 +187252,6 @@ self: {
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texrunner" = callPackage
@@ -186859,13 +187337,16 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-all_0_4_0_0" = callPackage
-    ({ mkDerivation, base, text, text-format }:
+  "text-all_0_4_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, text, text-format, utf8-string
+     }:
      mkDerivation {
        pname = "text-all";
-       version = "0.4.0.0";
-       sha256 = "0imy2q8dg1w3j0w8s0cc80fmjin99x2y7p41hdfwmaj5j1d5k6jb";
-       libraryHaskellDepends = [ base text text-format ];
+       version = "0.4.1.1";
+       sha256 = "195f1l4s6vfg4dhpmkfsd178rldknw0gdkl1qpbn3kzhba044y7w";
+       libraryHaskellDepends = [
+         base bytestring text text-format utf8-string
+       ];
        homepage = "http://github.com/aelve/text-all";
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
@@ -187300,6 +187781,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-postgresql_0_0_2_3" = callPackage
+    ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "text-postgresql";
+       version = "0.0.2.3";
+       sha256 = "0dp4f213d9rslgiqpmpk9dzl6yb9njmiym7s1fn3ms9aadipag72";
+       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
@@ -187959,8 +188458,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-data-compat";
-       version = "0.0.2.2";
-       sha256 = "0f6fcazfjb5iravmflx1s023hp2swzzkwk296l4jv64xjpxqvdd1";
+       version = "0.0.2.4";
+       sha256 = "0zs36p32khrvdi5m6zhf93jyrcv184bhyxp49w8cj0fms51w2vcs";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for data definition template of TH";
        license = stdenv.lib.licenses.bsd3;
@@ -188206,8 +188705,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-reify-compat";
-       version = "0.0.1.1";
-       sha256 = "04y539y3ajm92rxnc149qrvw02bk0m8sac1swn0q6763wahsa73j";
+       version = "0.0.1.2";
+       sha256 = "102w8zxsgdk1p7478p0sdhapai3paid3wyar2cpia649a17jlhwc";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/khibino/haskell-th-reify-compat/";
        description = "Compatibility for the result type of TH reify";
@@ -188673,8 +189172,8 @@ self: {
      }:
      mkDerivation {
        pname = "threadscope";
-       version = "0.2.7";
-       sha256 = "1dpxgzm29p07iy17hkfzki4c9ckhwx4acvjhlwxmpmaj2a1m6mnc";
+       version = "0.2.8";
+       sha256 = "067jwdh0xbv02mh9narwnw36wvz0d1v5wwhysmzbfc263l0iazn2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -188704,17 +189203,18 @@ self: {
      }) {};
 
   "threepenny-editors" = callPackage
-    ({ mkDerivation, base, casing, data-default, generics-sop
-     , profunctors, threepenny-gui
+    ({ mkDerivation, base, casing, containers, data-default
+     , generics-sop, profunctors, threepenny-gui
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.2.0.14";
-       sha256 = "1gw1pp2ylf3g8ijbsm7zfqmfba47hcwncnmdykzid7hb34c7zaw8";
+       version = "0.3.0";
+       sha256 = "090nhbb4yzjjmbbh1n48mi5i2kkky7s4kjwvmvbgf1694yjbb5ss";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base casing data-default generics-sop profunctors threepenny-gui
+         base casing containers data-default generics-sop profunctors
+         threepenny-gui
        ];
        homepage = "https://github.com/pepeiborra/threepenny-editors";
        description = "Composable algebraic editors";
@@ -190261,12 +190761,12 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "titlecase_1" = callPackage
+  "titlecase_1_0_1" = callPackage
     ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }:
      mkDerivation {
        pname = "titlecase";
-       version = "1";
-       sha256 = "1q7pll71rqgmzm90949i6fskfjysfdqhqvby0mh38ykm88bxm80w";
+       version = "1.0.1";
+       sha256 = "1k29br4ck9hpjq0w8md7i5kbh47svx74i2abv6ql2awxa0liqwz7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -191429,6 +191929,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transformers-bifunctors" = callPackage
+    ({ mkDerivation, base, mmorph, transformers }:
+     mkDerivation {
+       pname = "transformers-bifunctors";
+       version = "0.1";
+       sha256 = "01s8516m9cybx5gqxk8g00fnkbwpfi5vrm1pgi62pxk1cgbx699w";
+       libraryHaskellDepends = [ base mmorph transformers ];
+       homepage = "https://github.com/jystic/transformers-bifunctors";
+       description = "Bifunctors over monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "transformers-compat" = callPackage
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
@@ -191873,6 +192385,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "travis-pogodi" = callPackage
+    ({ mkDerivation, base, optparse-applicative, process }:
+     mkDerivation {
+       pname = "travis-pogodi";
+       version = "0.1.0";
+       sha256 = "1m75rlbzy0lm3nhp14kms3v1l9bykdva3ivgw4n8rqy5i48ismi0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base optparse-applicative process ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/4e6/travis-pogodi#readme";
+       description = "A better travis_wait";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "trawl" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, MissingH
      , optparse-applicative, process, split
@@ -192900,23 +193427,28 @@ self: {
   "tweet-hs" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, composition, containers, criterion, data-default
-     , directory, extra, hspec, http-client, http-client-tls, http-types
-     , lens, megaparsec, optparse-applicative, split, text
+     , directory, extra, hspec, hspec-megaparsec, htoml, http-client
+     , http-client-tls, http-types, lens, megaparsec
+     , optparse-applicative, QuickCheck, split, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "0.6.1.2";
-       sha256 = "17nvm7xnb5gvmq977bz812gd6s3dfvvkxd2zwcdayczdmnz06gyz";
+       version = "1.0.0.1";
+       sha256 = "0z1gi0mlxkchzq6644m5ya3qjz2jzi5rziak5jyz8b8ssvspw3nv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint authenticate-oauth base bytestring composition
-         containers data-default directory extra http-client http-client-tls
-         http-types lens megaparsec optparse-applicative split text
+         containers data-default directory extra htoml http-client
+         http-client-tls http-types lens megaparsec optparse-applicative
+         split text unordered-containers
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base bytestring hspec ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-megaparsec megaparsec QuickCheck
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
@@ -193165,10 +193697,8 @@ self: {
      }:
      mkDerivation {
        pname = "twilio";
-       version = "0.1.3.1";
-       sha256 = "0vsb0fli01fy1qbvqvmm12sl70nxz0gk7rsmghhyqwv01nmakfwk";
-       revision = "1";
-       editedCabalFile = "10dgcxjhmz7fn5fcgs28niyfpjq0vfs8fcpipq0ijcxwk6z78h3c";
+       version = "0.1.3.2";
+       sha256 = "1vbb846cdav6csm2y9asrdzvmh9s3pf4apyharrr1hwd2xz3jcga";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers errors exceptions free
          http-client http-client-tls http-types mtl network-uri old-locale
@@ -194107,8 +194637,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-duration";
-       version = "0.1.0.0";
-       sha256 = "06z2yq29z3mwyiwy2n389f39ygcrhjjib82vl1hkyj3573sillj8";
+       version = "0.1.1.0";
+       sha256 = "14na0mczkppzdixkr75z7vkp2rk7r1lsiysvgb6j29scj5a9l6x4";
        libraryHaskellDepends = [
          base lifted-base monad-control transformers-base
        ];
@@ -194432,17 +194962,18 @@ self: {
   "tyro" = callPackage
     ({ mkDerivation, aeson, base, bytestring, HUnit, protolude
      , reflection, singletons, test-framework, test-framework-hunit
-     , text
+     , text, vector
      }:
      mkDerivation {
        pname = "tyro";
-       version = "0.2.0.0";
-       sha256 = "116hay13pqngpxbqbxz60mzhz2ccgkiqgaz7frfqyc4mwqm80xnh";
+       version = "0.3.0.0";
+       sha256 = "0gx50kx5pvh8fi88wjh1hvmawnj1k1jl7z78h9q9spvg0l7nz4q5";
        libraryHaskellDepends = [
-         aeson base bytestring protolude reflection singletons text
+         aeson base bytestring protolude reflection singletons text vector
        ];
        testHaskellDepends = [
-         aeson base HUnit protolude test-framework test-framework-hunit text
+         aeson base bytestring HUnit protolude reflection singletons
+         test-framework test-framework-hunit text vector
        ];
        homepage = "https://github.com/rlupton20/tyro#readme";
        description = "Type derived JSON parsing using Aeson";
@@ -194544,8 +195075,8 @@ self: {
      }:
      mkDerivation {
        pname = "ua-parser";
-       version = "0.7.3";
-       sha256 = "043srsyff22vfhs2nwqmzp6w7vlqqlg3sl7acnbl4vical0k7cmx";
+       version = "0.7.4";
+       sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i";
        libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light text yaml
        ];
@@ -195030,12 +195561,13 @@ self: {
      }) {};
 
   "unboxed-ref" = callPackage
-    ({ mkDerivation, base, ghc-prim, primitive }:
+    ({ mkDerivation, async, base, ghc-prim, HUnit, primitive }:
      mkDerivation {
        pname = "unboxed-ref";
-       version = "0.3.0.0";
-       sha256 = "0zzw9myflayv0lzlfj11abgfxjb5yvyp3jw8xwbal92bzvd569gl";
+       version = "0.4.0.0";
+       sha256 = "0gvpp35mzx6ydwhwqdv319pl4yw7g4pyayciry83lnh3a3asisv4";
        libraryHaskellDepends = [ base ghc-prim primitive ];
+       testHaskellDepends = [ async base HUnit ];
        homepage = "https://github.com/winterland1989/unboxed-ref";
        description = "Fast unboxed references for ST and IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -196095,6 +196627,35 @@ self: {
        license = "GPL";
      }) {};
 
+  "unliftio" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath
+     , monad-logger, resourcet, transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.1.0.0";
+       sha256 = "053swazav18rrmlwskrgnw99wn7j7wznaadjmsf8nmzk13qzn18i";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath monad-logger resourcet
+         transformers unix unliftio-core
+       ];
+       homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio#readme";
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "unliftio-core" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "unliftio-core";
+       version = "0.1.0.0";
+       sha256 = "0wxv6s91wpfv2f5x17lwm04fvghcfnmzqw7p65117pr1r6yz5fcj";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio-core#readme";
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "unlit" = callPackage
     ({ mkDerivation, base, directory, text }:
      mkDerivation {
@@ -196834,6 +197395,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "urn-random" = callPackage
+    ({ mkDerivation, base, deepseq, haskell-src-meta, integer-gmp
+     , MonadRandom, QuickCheck, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "urn-random";
+       version = "0.1.0.0";
+       sha256 = "1zpx56gy8dnmnkkqqhzqxiw2yqkan6h2gfm9lq4218978801jdl4";
+       libraryHaskellDepends = [
+         base deepseq haskell-src-meta integer-gmp MonadRandom QuickCheck
+         template-haskell transformers
+       ];
+       homepage = "https://github.com/antalsz/urn-random";
+       description = "A package for updatable discrete distributions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "urxml" = callPackage
     ({ mkDerivation, base, filepath, mtl, optparse-applicative, parsec
      , process, syb
@@ -196859,8 +197437,8 @@ self: {
      }:
      mkDerivation {
        pname = "usb";
-       version = "1.3.0.4";
-       sha256 = "1izxrjwxs9h4gs9kaiw696p4r10wq6n5mijn80ab6bn716zkhwdf";
+       version = "1.3.0.5";
+       sha256 = "0r3v6w0nqcwz2vcaz0pdkfb8fs4ry2nlg9pfy77avv7mjwlvp7r1";
        libraryHaskellDepends = [
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
@@ -198929,14 +199507,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "viewprof_0_0_0_4" = callPackage
+  "viewprof_0_0_0_5" = callPackage
     ({ mkDerivation, base, brick, containers, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.4";
-       sha256 = "06a2bw0blamf29bf3hrwq5c98glx81argk9hsmnp6rjdjzwq6fcp";
+       version = "0.0.0.5";
+       sha256 = "1i1rrr920dappcvj7gjs60bjcrznb4ny4aslvxxidv93lz9kv617";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -200225,8 +200803,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-auth";
-       version = "0.1.2.0";
-       sha256 = "04lkj70lirgz8aj8zis23rd5an0xk0kskl94hvmm84jmq34s92cb";
+       version = "0.1.2.1";
+       sha256 = "0x3x3vc2l7glvfv6xcmqq0bw4mm8w2l577zx6qhx4399b03j56a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -201351,42 +201929,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, bytestring-builder, case-insensitive, containers
-     , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP
-     , http-date, http-types, http2, HUnit, iproute, lifted-base
-     , network, process, QuickCheck, silently, simple-sendfile, stm
-     , streaming-commons, text, time, transformers, unix, unix-compat
-     , vault, wai, word8
-     }:
-     mkDerivation {
-       pname = "warp";
-       version = "3.2.12";
-       sha256 = "04d7hfh52j0j241jn5yffng6iyf2hrfimn82pdrq0hz94giffg73";
-       libraryHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         bytestring-builder case-insensitive containers ghc-prim hashable
-         http-date http-types http2 iproute network simple-sendfile stm
-         streaming-commons text unix unix-compat vault wai word8
-       ];
-       testHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         bytestring-builder case-insensitive containers directory doctest
-         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
-         iproute lifted-base network process QuickCheck silently
-         simple-sendfile stm streaming-commons text time transformers unix
-         unix-compat vault wai word8
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers criterion hashable http-date
-         http-types network unix unix-compat
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_13" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
      , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP
@@ -201420,7 +201962,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -201464,23 +202005,6 @@ self: {
      }) {};
 
   "warp-tls" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
-     , network, streaming-commons, tls, wai, warp
-     }:
-     mkDerivation {
-       pname = "warp-tls";
-       version = "3.2.3";
-       sha256 = "14m2bzk5ivz9gdpxlcj6qnh46f2lycm1ybdjnfkj2876zrqwii7m";
-       libraryHaskellDepends = [
-         base bytestring cryptonite data-default-class network
-         streaming-commons tls wai warp
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp-tls_3_2_4" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, streaming-commons, tls, tls-session-manager, wai, warp
      }:
@@ -201495,7 +202019,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -201898,27 +202421,6 @@ self: {
      }) {};
 
   "web-routes" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, exceptions
-     , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
-     , split, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "web-routes";
-       version = "0.27.11";
-       sha256 = "1n4cvqbbnjhliy9080fff7nfn9x073vnp8vj7mh0ja4ii96lsqj5";
-       revision = "1";
-       editedCabalFile = "1kq9x2s1z2l9ldsbmzl29b4xbpv1w3ls98ca76d8d4dnwg5va14a";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring exceptions ghc-prim http-types mtl
-         parsec split text utf8-string
-       ];
-       testHaskellDepends = [ base hspec HUnit QuickCheck text ];
-       homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
-       description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "web-routes_0_27_12" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, exceptions
      , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
      , split, text, utf8-string
@@ -201937,7 +202439,6 @@ self: {
        homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
        description = "portable, type-safe URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-boomerang" = callPackage
@@ -202424,7 +202925,7 @@ self: {
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib
      , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers
-     , webkitgtk24x, webkitgtk24x-gtk3
+     , webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "webkitgtk3";
@@ -202434,16 +202935,15 @@ self: {
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ];
+       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;};
+     }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "webkitgtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x
-     , webkitgtk24x-gtk3
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
@@ -202451,11 +202951,11 @@ self: {
        sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
-       libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ];
+       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;};
+     }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "webpage" = callPackage
     ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
@@ -203632,8 +204132,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.21";
-       sha256 = "0gqiqqmm72fhkdax8p27mhpsl2f91zkqaj6xlwdhmbljfhb8ilhp";
+       version = "0.3.23";
+       sha256 = "0vj6195qqgx1ypv4h6jha3ayi73gcqxwwvcd7km12j4al68x6nvv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -203688,6 +204188,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "word-wrap" = callPackage
+    ({ mkDerivation, base, hspec, text }:
+     mkDerivation {
+       pname = "word-wrap";
+       version = "0.1";
+       sha256 = "1znkvh6nzx64v5kbfvr06r85idazxjx9qsbqgidrr5vnz0wccj76";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/jtdaugherty/word-wrap/";
+       description = "A library for word-wrapping";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "word24" = callPackage
     ({ mkDerivation, base, criterion, deepseq, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -203727,8 +204240,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordchoice";
-       version = "0.1.0.5";
-       sha256 = "0841dzjxnj9hm2lm31sa7xabaywdpnjjksy1c7b4idirdpmz9rhd";
+       version = "0.1.1.0";
+       sha256 = "1san5jgb2nc0shjk38jxgnqdj0mq248gqsn9zc1ldhai1qqy490h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206952,8 +207465,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.23.1";
-       sha256 = "0sv01yzi08mr2r7wkjcrsl5pf02zzv3y2n7amznv0pdj82sw16sa";
+       version = "0.8.23.3";
+       sha256 = "0hvmxl8krh8m3804d1nrvgmbirvw11a8iy80ciq4rg0csmz5r1fc";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
@@ -208377,6 +208890,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form-bootstrap4" = callPackage
+    ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
+     mkDerivation {
+       pname = "yesod-form-bootstrap4";
+       version = "0.1.0.0";
+       sha256 = "0n8pqa94v3ffx0225zv9mqlknwcwicdwrc0l3vj7iw4dggn1qy81";
+       libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ];
+       homepage = "https://github.com/ncaq/yesod-form-bootstrap4.git#readme";
+       description = "renderBootstrap4";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-form-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, yesod-core, yesod-form

From 47feb4531341c08502ef4755f8c7cca2ca0206ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jul 2017 17:32:28 +0200
Subject: [PATCH 0670/3246] haskell-hsyslog: update version override

And move it from configuration-nix to configuration-common.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 pkgs/development/haskell-modules/configuration-nix.nix    | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d9b185b4751..2833d5c4b87 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -873,4 +873,7 @@ self: super: {
     postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
   });
 
+  # Needs a newer version of hsyslog than lts-8.x provides.
+  logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5_0_1; };
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 34048c0b439..bb520ac20bc 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -470,7 +470,4 @@ self: super: builtins.intersectAttrs super {
   # Needs a newer version of brick than lts-8.x provides.
   hledger-iadd = super.hledger-iadd.override { brick = self.brick_0_19; };
 
-  # Needs a newer version of hsyslog than lts-8.x provides.
-  logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5; };
-
 }

From 85a70b50b95686ad499f95ef92d64cbed5600869 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Jul 2017 14:40:16 +0200
Subject: [PATCH 0671/3246] haskell-hledger-iadd: drop obsolete override (the
 build fails with or without it)

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index bb520ac20bc..7b9dbcdaa79 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -467,7 +467,4 @@ self: super: builtins.intersectAttrs super {
   # Without this override, the builds lacks pkg-config.
   opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; });
 
-  # Needs a newer version of brick than lts-8.x provides.
-  hledger-iadd = super.hledger-iadd.override { brick = self.brick_0_19; };
-
 }

From ac50c4d72e54c5bc2ff893e3db919e17ddc9e7cd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 17 Jul 2017 09:33:44 -0500
Subject: [PATCH 0672/3246] vcsh: Patch for Git 2.13.2

Fixes #27134.
---
 .../applications/version-management/vcsh/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
index e15bc489beb..77663e858ef 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -12,9 +12,15 @@ stdenv.mkDerivation rec {
   };
 
   patches =
-    [ (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch";
-                    sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k";
-                  })
+    [
+      (fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch";
+        sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k";
+      })
+      (fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/228.patch";
+        sha256 = "0sdn4mzrhaynw85knia2iw5b6rgy0l1rd6dwh0lwspnh668wqgam";
+      })
     ];
 
   buildInputs = [ which git ronn perl ShellCommand TestMost ];

From 7ba1c7a9fb76834f69ef75418921719b52d5d842 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 17 Jul 2017 22:45:27 +0100
Subject: [PATCH 0673/3246] iprover: 0.8.1 -> 2.5

---
 .../science/logic/iprover/default.nix           | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index fe906fbe357..af225a2961d 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, ocaml, eprover }:
+{ stdenv, fetchurl, ocaml, eprover, zlib }:
 
 stdenv.mkDerivation rec {
   name = "iprover-${version}";
-  version = "0.8.1";
+  version = "2.5";
 
   src = fetchurl {
-    url = "http://iprover.googlecode.com/files/iprover_v${version}.tar.gz";
-    sha256 = "15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w";
+    url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover-v${version}.tar.gz";
+    sha256 = "1mbxjczp6nqw0p33glqmw973c268yzy4gxflk1lfiyiihrjdhinb";
   };
 
-  buildInputs = [ ocaml eprover ];
+  buildInputs = [ ocaml eprover zlib ];
 
   preConfigure = ''patchShebangs .'';
 
@@ -25,12 +25,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An automated first-order logic theorem prover";
-    maintainers = with maintainers;
-    [
-      raskin
-    ];
+    homepage = http://www.cs.man.ac.uk/~korovink/iprover/;
+    maintainers = with maintainers; [ raskin gebner ];
     platforms = platforms.linux;
     license = licenses.gpl3;
-    downloadPage = "http://code.google.com/p/iprover/downloads/list";
   };
 }

From 9b0ff955fd5696656f385ce268541f45e7d84cd0 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Mon, 17 Jul 2017 23:55:31 +0200
Subject: [PATCH 0674/3246] wireguard: allow not storing private keys in
 world-readable /nix/store (#27433)

* wireguard: allow not storing private keys in world-readable /nix/store
---
 .../modules/services/networking/wireguard.nix | 85 +++++++++++++------
 1 file changed, 60 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 62ff708d244..d5b21ef1a23 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -23,8 +23,23 @@ let
 
       privateKey = mkOption {
         example = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=";
-        type = types.str;
-        description = "Base64 private key generated by wg genkey.";
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Base64 private key generated by wg genkey.
+
+          Warning: Consider using privateKeyFile instead if you do not
+          want to store the key in the world-readable Nix store.
+        '';
+      };
+
+      privateKeyFile = mkOption {
+        example = "/private/wireguard_key";
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Private key file as generated by wg genkey.
+        '';
       };
 
       listenPort = mkOption {
@@ -91,7 +106,22 @@ let
         example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I=";
         type = with types; nullOr str;
         description = ''
-          base64 preshared key generated by wg genpsk. Optional,
+          Base64 preshared key generated by wg genpsk. Optional,
+          and may be omitted. This option adds an additional layer of
+          symmetric-key cryptography to be mixed into the already existing
+          public-key cryptography, for post-quantum resistance.
+
+          Warning: Consider using presharedKeyFile instead if you do not
+          want to store the key in the world-readable Nix store.
+        '';
+      };
+
+      presharedKeyFile = mkOption {
+        default = null;
+        example = "/private/wireguard_psk";
+        type = with types; nullOr str;
+        description = ''
+          File pointing to preshared key as generated by wg pensk. Optional,
           and may be omitted. This option adds an additional layer of
           symmetric-key cryptography to be mixed into the already existing
           public-key cryptography, for post-quantum resistance.
@@ -134,54 +164,59 @@ let
 
   };
 
-  generateConf = name: values: pkgs.writeText "wireguard-${name}.conf" ''
-    [Interface]
-    PrivateKey = ${values.privateKey}
-    ${optionalString (values.listenPort != null)   "ListenPort = ${toString values.listenPort}"}
-
-    ${concatStringsSep "\n\n" (map (peer: ''
-    [Peer]
-    PublicKey = ${peer.publicKey}
-    ${optionalString (peer.presharedKey != null) "PresharedKey = ${peer.presharedKey}"}
-    ${optionalString (peer.allowedIPs != []) "AllowedIPs = ${concatStringsSep ", " peer.allowedIPs}"}
-    ${optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}"}
-    ${optionalString (peer.persistentKeepalive != null) "PersistentKeepalive = ${toString peer.persistentKeepalive}"}
-    '') values.peers)}
-  '';
-
   ipCommand = "${pkgs.iproute}/bin/ip";
   wgCommand = "${pkgs.wireguard}/bin/wg";
 
   generateUnit = name: values:
+    # exactly one way to specify the private key must be set
+    assert (values.privateKey != null) != (values.privateKeyFile != null);
+    let privKey = if values.privateKeyFile != null then values.privateKeyFile else pkgs.writeText "wg-key" values.privateKey;
+    in
     nameValuePair "wireguard-${name}"
       {
         description = "WireGuard Tunnel - ${name}";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
+
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
-          ExecStart = lib.flatten([
+          ExecStart = flatten([
             values.preSetup
 
             "-${ipCommand} link del dev ${name}"
             "${ipCommand} link add dev ${name} type wireguard"
-            "${wgCommand} setconf ${name} ${generateConf name values}"
 
             (map (ip:
-            ''${ipCommand} address add ${ip} dev ${name}''
+            "${ipCommand} address add ${ip} dev ${name}"
             ) values.ips)
 
+            ("${wgCommand} set ${name} private-key ${privKey}" +
+            optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}")
+
+            (map (peer:
+            assert (peer.presharedKeyFile == null) || (peer.presharedKey == null); # at most one of the two must be set
+            let psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile;
+            in
+            "${wgCommand} set ${name} peer ${peer.publicKey}" +
+            optionalString (psk != null) " preshared-key ${psk}" +
+            optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" +
+            optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" +
+            optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}"
+            ) values.peers)
+
             "${ipCommand} link set up dev ${name}"
 
-            (flatten (map (peer: (map (ip:
+            (map (peer: (map (ip:
             "${ipCommand} route add ${ip} dev ${name}"
-            ) peer.allowedIPs)) values.peers))
+            ) peer.allowedIPs)) values.peers)
 
             values.postSetup
           ]);
-
-          ExecStop = [ ''${ipCommand} link del dev "${name}"'' ] ++ values.postShutdown;
+          ExecStop = flatten([
+            "${ipCommand} link del dev ${name}"
+            values.postShutdown
+          ]);
         };
       };
 

From 46ead28a584ccc95a277d777f2e9be40cbe736c6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 18 Jul 2017 00:05:19 +0200
Subject: [PATCH 0675/3246] gnome3.gexiv2: 0.10.4 -> 0.10.6

---
 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 d27e10f104c..69d89bd5879 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}.4";
+  version = "${majorVersion}.6";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
-    sha256 = "190www3b61spfgwx42jw8h5hsz2996jcxky48k63468avjpk33dd";
+    sha256 = "09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk";
   };
 
   preConfigure = ''

From 5442484c5f5acd855b5e139212db2e98bebf0edd Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Mon, 10 Jul 2017 15:35:40 +0000
Subject: [PATCH 0676/3246] Update Mozilla Software Releases sub-key.

This commit update the Mozilla Software Releases, with the key found at:
https://gpg.mozilla.org/pks/lookup?search=Mozilla+Software+Releases+%3Crelease%40mozilla.com%3E&op=vindex
---
 .../browsers/firefox-bin/firefox.key          | 317 ++++++++++++++----
 1 file changed, 254 insertions(+), 63 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/firefox.key b/pkgs/applications/networking/browsers/firefox-bin/firefox.key
index 9169c4f9c44..bd27ce85c94 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/firefox.key
+++ b/pkgs/applications/networking/browsers/firefox-bin/firefox.key
@@ -1,63 +1,254 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQINBFWpQAQBEAC+9wVlwGLy8ILCybLesuB3KkHHK+Yt1F1PJaI30X448ttGzxCz
-PQpH6BoA73uzcTReVjfCFGvM4ij6qVV2SNaTxmNBrL1uVeEUsCuGduDUQMQYRGxR
-tWq5rCH48LnltKPamPiEBzrgFL3i5bYEUHO7M0lATEknG7Iaz697K/ssHREZfuuc
-B4GNxXMgswZ7GTZO3VBDVEw5GwU3sUvww93TwMC29lIPCux445AxZPKr5sOVEsEn
-dUB2oDMsSAoS/dZcl8F4otqfR1pXg618cU06omvq5yguWLDRV327BLmezYK0prD3
-P+7qwEp8MTVmxlbkrClS5j5pR47FrJGdyupNKqLzK+7hok5kBxhsdMsdTZLd4tVR
-jXf04isVO3iFFf/GKuwscOi1+ZYeB3l3sAqgFUWnjbpbHxfslTmo7BgvmjZvAH5Z
-asaewF3wA06biCDJdcSkC9GmFPmN5DS5/Dkjwfj8+dZAttuSKfmQQnypUPaJ2sBu
-blnJ6INpvYgsEZjV6CFG1EiDJDPu2Zxap8ep0iRMbBBZnpfZTn7SKAcurDJptxin
-CRclTcdOdi1iSZ35LZW0R2FKNnGL33u1IhxU9HRLw3XuljXCOZ84RLn6M+PBc1eZ
-suv1TA+Mn111yD3uDv/u/edZ/xeJccF6bYcMvUgRRZh0sgZ0ZT4b0Q6YcQARAQAB
-tC9Nb3ppbGxhIFNvZnR3YXJlIFJlbGVhc2VzIDxyZWxlYXNlQG1vemlsbGEuY29t
-PokCOAQTAQIAIgUCValABAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ
-Ybe1JtmPA1NQqg//Rr6/V7uLqrIwx0UFknyNJasRJZhUkYxdGsLD18zO0Na8Ve3Q
-sYpOC3ojpqaFUzpqm6KNv8eXfd/Ku7j3WGr9kPkbjZNghvy6V5Lva4JkxO6LMxKk
-JYqiqF2o1Gfda8NfcK08GFy4C0L8zNwlADvmdMo4382tmHNGbTTft7BeVaRrE9xW
-9eGmGQ2jYOsjxb5MsadAdZUuK8IC95ZHlUDR3gH9KqhfbQWp5Bo924Kiv+f2JUzN
-rrG98eOm1Qb8F9rePzZ2DOYRJyOe4p8Gpl+kojCXNntkJgcwJ1a1yRE6wy9RzpeB
-lCeoQuLS92MNne+deQZUskTZFoYXUadf6vbdfqL0nuPCKdl9lhef1QNwE30IRymt
-6fhJCFffFQjGdeMfSiCHgcI8ichQbrzhBCGGR3bAHan9c2EbQ+puqG3Aa0YjX6Db
-GJjWOI6A61bqSPepLCMVaXqV2mZEIaZWdZkOHjnRrU6CJdXG/+D4m1YBZwYM60eJ
-kNu4eMMwMFnRsHiWf7bhqKptwuk8HyIGp2o4j8iqrFRVJEbK/ctdhA3H1AlKug9f
-NrfwCfqhNCSBju97V03U26j04JMn9nrZ2UEGbpty+8ONTb38WX5/oC61BgwV8Ki4
-6Lwyb7fImUzz8jE83pjh7s3+NCKvvbH+VfT12f+V/fsphN3EwGwJPTC3fX25Ag0E
-ValA9AEQAK/z677fpoVUj4zQz0g60wVWf+1y2lGb8iFYICmvrJyaEra5SRkyihYA
-1WmEzhN4T//tHw3UIfe646+GkY3eIQW2jY9DM2XaElmMN8k/v54nbn5oD7rNEyCT
-FTvCOq5d74HH1vw96Lzay1vy45E7jPWvqfg9Se8KAnzElohTJjizyhU+0QbmPHnQ
-lY8gOkT/SvRo9bFEUnqjWh0fRq+K1tdLPhcFB1scc25iFqh9IAKUGDur8jQ+SDHC
-jgQlkFOg3rbqtaUOnVHPohfrBM90ZNwuneFgQY7ZFSUidCimp/EN4CXnzgjDYXUU
-A42S8G86+G4KAJC22gRQo4mcVmehwHTH0glfLmUK7TEu29A1KWNL3R/R7Zdyajjp
-CvUaK2A0Abj3ZE2BSDbJrVlbBVfy5kfPdZjhd3wUWqFaDHiVcImcjZRWPncllhcy
-6fhqEy3ELZrkezpJjnARsVkij3GXz6oX+HVULne2w0dkTXydR6muZI/GeNtrLHmA
-8B3/0/TllmLy8ChmYZVIKZ8zt1ghq3f+hFTXgtZil7eBewZgA6L+EXXK6dZj14lb
-e6CMS2kungTX9stU1s42I+WRbiqiLpAxCX6qcLBOWrJwsOep2nvu5bhrPHptSfRh
-F4Vs1xteVFckCWhcLgdYi/Je1XBEM+AAVa0k1FiywCg7MqlG6toLABEBAAGJBEQE
-GAECAA8FAlWpQPQCGwIFCQPCZwACKQkQYbe1JtmPA1PBXSAEGQECAAYFAlWpQPQA
-CgkQHGnE5V6ZBdsvxQ/6A62ZteN0b/TVfSJ51SdG66amwe2rpRX4UdSw7ifxo3qh
-gEICQmXR5c09qXwl17MFJWM3FhGrbxnA5KGgeWGtqrPup4QZPKU+l2Ea2QLSJSiB
-q5QqqEgZvR14Lhr/hCGhBAq9s/xbp8fbKNJj/uWiZ+uTPbt5T5rgKJ4+g3B6DNO1
-rH7F70OLrd32mxZs4pSxngHRAyiMPB59yQVDsVMha0JTqC+P96itUzvnInc/9mwE
-0EMiBtpDTkoBwbJVPnuv+7FjkOLn5s5u3RLH9fe8z1xnV0fPC0/ndrlNiuBpAn3z
-VCsWasvW18Vz8K+CQY8Sw0Jw75edBgFoz2QMFxHfDpMJefvMadB7mdte1lKk/Im9
-KFFH8Idh9b6zD0a/+Ooujukx6QpFfAVhe2sT2CIm2nmMAuAZI2cCt7SC+REn9n9M
-SuIWxN8YTE3qgAUB6F3ea0O0hGlLl+z5UOfX0bNAs+ebx/P6PczJtDzeqpmRb0QX
-qo55JWXLvmXT/fgjF7fNTTLsyCtV+xH6ZFKGpvGJGJMHApEbz2a0hy12RZH58eI1
-ueN3Tzn8nI57+oYSsqFw/QgcdGXDonLGJsPVzIpQRg92/GXSukWF+MsCjVOilHRS
-Y1wfPPmJ7+kMQ4rdXpjAhwNYJc1ff5N+omCxCKoFgYsCXlFCHFKs4JwRbTdd3Mku
-qBAAlBlIjym8NyJIBltfWckuhQTX4BiBltGPNga9CpQsml519EePuLtoe5H0fTUp
-4UYbL0ZzyJImQE2uw/hMNZ36bA057YtHOoP4FcPUwv6wsl5JC87UR1XFhAXb5xSU
-0qdi3hWh0hm772X6CBlM8lM6GtT/fDZkSGNXMQaIs1X/O9vf8wGg+HwLJcaCvybI
-4w7w1K0R7WjWZlJXutCZf8hRc0d88W/qSZYooKD9q2S7foqaJhySIaF11sH5ETvV
-P3oCfGVIVhKWb0Tp2jXPXlXLeRAQA8S+4B1o5XHiM+J3SNXhPQHRGQ3VGcDn45it
-g3F4xQX2Qvo4SV42NMYd6TykM/dIfQyJDOVg3CT3+nqfjCknf94SNvyZprHEPmpc
-DeseoPMw8kjKNwDwPXFLxBRntPgnqVXDcNN41OH2kqx4jF7FLlRmwNpB2mFVH8xe
-VuRm7h2WZRsaEoqvivhzRtESVA2um5Eg763CVTcNYlK6MD/iy8JzbMuZBrlOHr58
-HKDdcOy1W0z2quESGoqrwA995IgPav/1DSpyuJPNc/oUTWlhpYshqYKoflezAyKj
-30+UzC3R/mY03ri6zUvCgXHNgZlKUsM3VEXk6h5oDuaXniHLLzuxjTBVrILnGYgH
-SFRP80L/knz+o4Uvq4wj7NHnruc5fP1foFxRNsMt40yRJfU=
-=D+jC
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.5
+Comment: Hostname: keyserver.mozilla.org
+
+mQINBFWpQAQBEAC+9wVlwGLy8ILCybLesuB3KkHHK+Yt1F1PJaI30X448ttGzxCzPQpH6BoA
+73uzcTReVjfCFGvM4ij6qVV2SNaTxmNBrL1uVeEUsCuGduDUQMQYRGxRtWq5rCH48LnltKPa
+mPiEBzrgFL3i5bYEUHO7M0lATEknG7Iaz697K/ssHREZfuucB4GNxXMgswZ7GTZO3VBDVEw5
+GwU3sUvww93TwMC29lIPCux445AxZPKr5sOVEsEndUB2oDMsSAoS/dZcl8F4otqfR1pXg618
+cU06omvq5yguWLDRV327BLmezYK0prD3P+7qwEp8MTVmxlbkrClS5j5pR47FrJGdyupNKqLz
+K+7hok5kBxhsdMsdTZLd4tVRjXf04isVO3iFFf/GKuwscOi1+ZYeB3l3sAqgFUWnjbpbHxfs
+lTmo7BgvmjZvAH5ZasaewF3wA06biCDJdcSkC9GmFPmN5DS5/Dkjwfj8+dZAttuSKfmQQnyp
+UPaJ2sBublnJ6INpvYgsEZjV6CFG1EiDJDPu2Zxap8ep0iRMbBBZnpfZTn7SKAcurDJptxin
+CRclTcdOdi1iSZ35LZW0R2FKNnGL33u1IhxU9HRLw3XuljXCOZ84RLn6M+PBc1eZsuv1TA+M
+n111yD3uDv/u/edZ/xeJccF6bYcMvUgRRZh0sgZ0ZT4b0Q6YcQARAQABtC9Nb3ppbGxhIFNv
+ZnR3YXJlIFJlbGVhc2VzIDxyZWxlYXNlQG1vemlsbGEuY29tPohGBBARAgAGBQJVrP9LAAoJ
+EHYlQD1/DRWxU2QAoOOFRbkbIU1zKP2i3jy/6VKHkYEgAJ9N6f9Gmjm1/vtSrvjjlxWzzQQr
+kIhGBBARAgAGBQJVrTrjAAoJEMNOV0fiPdZ3BbkAoJUNHEqNv9dioaGMEIpiFtDjEm44AJ9U
+inMTfAYsL9yb15SdJWe/56VCcoheBBARCAAGBQJWBldjAAoJEAJasBBrF+oerNYA/13MQehk
+3AfkljGi252/cU6i1VOFpCuOeT7lK2c5unGcAP0WZjIDJgaHijtrF4MKCZbUnz37Vxm0OcU8
+qcGkYUwHi4heBBARCgAGBQJVrSz+AAoJEPCp59zTnkUulAYA/31nYhIpb7sVigone8OvFO19
+xtkR9/vy5+iKeYCVlvZtAP9rZ85ymuNYNqX06t+ruDqG2RfdUhJ6aD5IND+KD5ve7IkBHAQQ
+AQIABgUCVaz9fgAKCRCzxalYUIpD8muMB/sH58bMSzzF9zTXRropldw7Vbj9VrRD7NyoX4Ol
+DArtvdLqgPm0JUoP2gXINeSuVPpOfC676yVnBEMjIfqEjq09vcbwayS+Ncx4vQh2BmzDUNLE
+3SlnRn2bEWr9SQL/pOYUDUgmY5a0UIf/WKtBapsPE+Zan51ezYSEfxDNfUpA4T2/9iWwJ2ZO
+y0yIfLdHyvumuyiekJrfrMaF4L9Q0OnJwp1PwkvN4IVwhZeYDtIJN4nRcJK5LrwU7B97uef2
+hqBBll7/qCHl5y4Khb0csFanIg+pQLPUJdIiYtzoFtlgykB61pxqtU9rqGKW02JzEUT8DdPU
+XxmMBy6A8oGeBRH/iQEcBBABAgAGBQJVrRdcAAoJEGVzgtv/JREKQJgH/3nD/3/SumL7nG2g
+7Y1HQqWphUbn40XWvjZcHq3uBUn1QYXeZ5X56SANLM2t+uirGnNaZXW3cxEl5IyZVLbmcLWE
+BlVAcp2Bf3FXFbdJK59f+M+y2+jZT9feTyrw+EtLoiGTxgkLdJyMyI0xGmQhMx5V1ex1CxhZ
+K2JPjzCVYriBI0wIbmKi90YNMQoSsdMhYmX9bHl6XWS9TCDWsqj25FLYJL+WeVXpjO0NjRwE
+E6pc/qldeJYG5Vbf0snGxIerXe+l5D8Yd4PEAnpj58+5pXeoGYZn3WjX8eTFMAEU+QhLKWQ+
+j/Y8Kijge7fUxnSNBZ2KEnuDN/4Hv/DrCFLv14CJARwEEAECAAYFAlWtZVoACgkQ5DJ8bD4C
+mcBzsAf/RMqDdVHggQHc0/YLt1f/vY9Y7QQ6HwnDrtcNxxErSVcMguD8K6Oxir0TMSh+/YuZ
+AW8K4KSgEURwZqz4na8/eOxj8bluNmlcAseQDHswqU6CyB95Woy3BocihH7L0eDXZOMzsa33
+vRQHBMioLxIbpnVtVbFR1z7tmyfjcOrzP32xo5QoPoczKX26luMBjAvbw1FC0is2INnmUSYM
+4uH7iFZuXGPFYxcAqODqy5ys3MoPa4oZ71d0HoiRil1+s0Y+2ByddZ19pE2TXp4ZXNYNUj/2
+aRj8b4sTjR4rqhHIx/vfoK+VCNy/skFUZOyPdbbymE0stTRSJ1gr9CZLcBWYF4kBHAQQAQIA
+BgUCVcFZcAAKCRCJFz+VfFX5XqApB/938p+CJiDRnh2o7eDWnjSyAu7FWmWGkOQnjI/kraKx
+1vojsYnKRXD6mjq1QJ8Hsp4taJnLQjcokNTUiST4m/e4ZJExPWuJKkwlralWGH6NpqYcgWPa
+jSYb0eYQC4YqS0kfyzolrHdKI8Y4NGEU7yy5zsHwWkHt/mpNQMrYnXwyWdIrc03X/OXo51dJ
+yshJDRw3InREyBblFJcLvArNHz219wMrXAicPytw4wfPpVrmDx6GrZcI8q8ECWCjwSXXv7hR
+pEuFLSy5XPhMc+wYBJjNlUoiFBAF/7zENd3rMn9SCQLiIFYe0ubmO+bpeGy7TizbxOaCIfgU
+ouyy0BQXNuJBiQEcBBABAgAGBQJV0hrqAAoJEK18uZ+CSLoPzEIH/1D6sJMNAJtZCRGhJXvv
+6SYhv4pUVNyDF9FnUvRsovliojoe4IkuBTWKhPGrxbiD5IO/izr38shqNhhm9JE2/SQZHObY
+Pi+lyfDKbJgImTNxmS4F7JHnRLr37VxK1sVvuNkynJnqvCcp1g5xwNIx1rKcka3iuqJj6toM
+8XQfgsTHH1rUkWHbUV3QwNzXm+yhFm2s6QzxBooPzmFn8AY7CXD4pvcMR+M0Zy+e42nngd8l
+zRnmTBVig4pRq0GCMulFG+XjeVQZFpoIIxo2k1lczbRmGttONdGWSjxBUxReoTbSwM3C/50N
+robycGQgY0gd6LGtWtU8/uEfklEy2NluxYWJARwEEAEIAAYFAlWtAUYACgkQVu5xjc4OFUs0
+OAf+LM0dyyvUFGdXfJDpP2xMknXzsHAXWFEtH5jein58mv6dD3fTVcCouo1vMQH3WFFSLYZv
+wtNnHGrSBqFbNKqZ0ATQ5tcYaWsSZ+MVJJMXJDXFG/Oihg1nNOM33VdfV0RGPKP1I4cEROxm
+s3TUFkHW3cSCgMzs8I1OxfSoLrm6da8EN+2ct2InqzdQL2yisyTyrdmXoNpwXDxApKYkvVHQ
+4+9eJI5m0ZAr0mBjIeJdATcw4/lIVKTrV7UhrChxiffYJcz4SSC1crmr+2Fzw53CyAsAmYal
+UHep3Yr05oQ4oJRX9X3VrY/yELHwwxXaxCAdwwHbbXAMhZsPk9Mc20J6BokBHAQQAQgABgUC
+Va0isQAKCRCj1lIXO3Y+j6ZeB/91Q9/qr5oMWgOMsix8kflBLw2f/t+tRR0SWDw90bG1npJB
+6nq5Hl+Bz4/A4SWFTFrrrlZi1Enjn1FYBiZuHaSQ/+loYF/2dbQDbBKShfIk3J0lxqfKPAfK
+opRsEuxckC8YW1thGxt5eQQ8zkJoqBFTBzwiXOj3/ncJkX9q9krgUlfTSVmrT9nx0hjyNQQX
+rghsmBtpR7WCS7G7vNRGCNUorhtviUvL+ze1F7TTSGspVsVxo2ghmz5WT/cD9MV1gcVjojYm
+ksh5JIl39jCHr9hl8aRId/OfzsN+TKuBcpAxDkm9BCAps7oY8FlLKDFZTtHa000AkodKHT88
+nwnvKuqPiQEcBBABCAAGBQJVrTkDAAoJEPbQ92HczOykK9YH/0MARo3HlYXeS2bDqM/lwK/r
+QcPCCyYke6wbICjncbCOjgXHqG/lBhClNs7hp/7gqkUaR7H5tmeI4lalP40mSHHnnFvMD3Tc
+yhn350igK0bgrjWQDaYxhKlHT3vIXd/C24/vRSAxmqIKbP+IoXOyt2GMTQq8GOm2dgYRaTkw
+yHnGWnMaibctX8D4oCYR0/D4YJqPkfqobf8+1ZfP5GaMbSxE/Jwdo0kJa4vPjEzFXbygAbnc
+apzdwN6zgel2zh885rz7B7vIpMr/Y7eV85Q68qdyyhLe8cL8Y18YPzpFf+/PZNbgYxouafvn
+FwBhPQwg0gUF/+1eM3UE2ua+saSTGduJARwEEAEKAAYFAlWtCVsACgkQM0LhtmejiGMovwf8
+CfYJHNbwiwSMUoP4n7FrmElhBtxvlbnCMZKz08v+lFsfS3wU1LUN69GqirfF0vkQRSlSBp7n
+iCLHQCfSoqHMLgxF0P2xgXLjaYM/t/rxXDawJmW18G04dqFrtCPZTbwMT2PsPHTiWQdaN0e5
+0lXk9Vo+l6VbwQMg4zH7icZadeJgQooxFalHYFVXUVeex9t8/YdanFVrHFa3tao6azBTSUkJ
+vZtIu14SfxigDWIIwsx0xpVfJf3a/xC6HY3Q1a3NeBz3i6DwaK5wYqijZKl0WVdULKyqU98o
+F6y0mUv3d2o/p07Cqgeo6xxMkHqu83OLa2a0C7tYPLgL4EFc2FtikYkCHAQQAQIABgUCVaz7
+KAAKCRCWO3gxCjexfKxrD/4npm1rB7+pPlotbqK37Mur7egPbVSAzVNU/zUKPAuGUeP3C64Y
+N77ETx1kDuS+meAqMDHFc9Bf8HivPbtj6QcK96U5KstbmSh1Ow9YiQtxJgxGjg/CzREgZAFc
+jy0MhoklyPsFhv07s6MLOJMSM/krEN5nqjifQ0WdmTk02FLoHVWcLdjfgMiPiSjGbU3k7luv
+jPyRNzk831szE5mfa74rEYh4TBklse+2uB4DFQ/3oHZ1Sj6OBK6ujmNKQjIP7Cl+jmjr7+QK
+0OJcRaj/8AckDA5qXTZACh1S2syCDDMnX0V+dTxGCIoWOK+tt9mLohMzpEeD4NIX4qdpbbCR
+zeYZMHSomyBIsbA6B+/ftDE7W1N0/FtJ9adkkCynKULvh2CH5c5hgOOL22M+2spnywRoeJRU
+WU7hBM5OUH3JjA4Tu4j/cwp7dD7QzZrzmC9f5LQJ3OelejvVowWPQd3/tky4o1q6wlmFqAcA
+gtu97UwgBOSR9sJPGDlt1iC91UYAiBQQAA7ya8uXUS84mCQwTlr8j+YrowvEHK4IxpPREytT
+1LzzV/4Am4ndDFtujy83QjL0qaIIim1xIwoEosd4yidhpczw7f3b9dQpuBIFeQuhM7JsxP4t
+mE7S6k6GlEmqa3INPVaPGnsUGS7+xSMlcJXLtimPCSQvFma9YiGV5vtLy4kCHAQQAQIABgUC
+Vaz8uAAKCRASy06X4H5n0dg0D/9QoxIh9LRt1jor7OHG4xKUjKiXxn/KeQNlJnxI55dlWIvJ
+EJGheFjaDomzKBYuxmm2Ejx+eV5CHDLUYsLFYwWf8+JGOP75Ueglgr8A0/bdsL63KX6NP2DC
+g8XR4Z1aeei3WMY7p/qMWpqbQoAv9c3p49Ss2jSNuthWsRR6vbQ9iwze2oaUaA44WKQyhhbC
+wBU4SHYjlKCLqIBh/HXZFhZ4rDfuWgPBKvYU1nnOPF0jJRCco3Vgx3T9F+LZ3zo5UPt1Xapr
+3hMVS9iaJyl1w4z2miApUaZuHPuWKuO4CJ1GF1mS5T6vG8gB3Ts5zdtBF2xQIkCz+SM7vW/2
+i/82oq6P8EuLHEhrQPR4oTjXIvXdEJ9kgbjqcj8Xk+8teEOnuwh6iEhay9i/bf0D3Jd+roFN
+5dnWPxhOVjzrI3fwlK1/ylsZYqUYBEzt7Wj0MdhjeKssI5YICcqYXXjBttMw4B7DZXPFXzz3
+kHB56jZ/II4YUjpLO85Jo5A9SV+aIqa0mvCt6DvVWy/rhfxfoUdqNlhX11gkVLaA7xxgn/Nq
+POf+h5hVO2mwWkmart9YHKMZ3ukCdke65ITL/nsYSm2ZhG7OYjaCfu9jPWtkBstOEWyT9q4J
+TdViR7wN3eMefEG6rb49rxOYvGJu+cTVkp3SCpl0w1j+tPj4tkj7ENzPMXdnuYkCHAQQAQIA
+BgUCVa0s4gAKCRCKsTKWOgZTeuMyEACKOySKAd/xDcPcHg7Prvdws04Z8DIR0dY2qUlbRVx2
+jTmIXyry63CqbOJFbDg9uk5x0+lSotvrWtZ+NKSrg9VM6vyV4cc2P9rhqIBi3wO2elzAmpOa
+S2KKOjQ+2fS/xqh91ElJUu09xXQXJ0vMrqgui+zN1YBDiJV0WOmm90Mm2NPiihcWZmBmDorO
+qMQabwbjBLi0yUVHgAlkilY3mAB4tmEKDeN+4pYSAAhXAll9U+nyoVMgwMJscZyazOp4MqMb
+mFjyr4p5AGzv+OOJtjtCNKT6oW9Y+URLY0YKeOsPk0v5PlbQCVBlLeSBsNZudKav/Gvo7Mvz
+5uLTcneBFb+haYIiXO/FQm4uBHkzdNFLgaph81Wzh62AhbtBlfBOj/lbzN3k/xRwo64QU+2Z
+9GOhFlhjfROquY70FCQcspwNuqCdZybnkdpF2Qrr6Pi0qKR/Xb9Vd7PW0/gKQdwwlYTiDemg
+A21mYeJrYw873/7U/+kLFRvmPAEX4IOIOEN6XVjxvu78REi6CmXxOoYnH4aRSXDRyi1nsGjB
+43AtfAMMNCUigDgFP4sUsZAG1RAoxBhOsO/g9S5wx8H3rKITCXDjQh2SYeBwHFcU03EMcyzE
+QhbZNighN+aRKGIibteRxISiKU+kcWaHolemeo6wGF87QXEpJaQ2OwIoIxQYvDDmQokCHAQQ
+AQgABgUCVaz/8QAKCRA/8xuvEEv54t06D/9n1Nyn2QSUN1mXd7pomoaka+I2ogDbQpu9iuFq
+bkqfcH3UuG8yTKlPp9lYDBs0IEfG85Js6iVxJIultocrcDmOyDkyEsnYbdel/tn3X4yqD8eI
+6ImRoCE+gnQ3LoEIHuODfJoosM/jAHANs4fsla4/u5CZDXaaq7pYXGiTt7ndsfmLiCa7dAg7
+bVFfJagsnL/VjlfeWM9nW01rDL9LPxSN4tq7ZKXWZDonFZYJ4unsK/Cn6Pqco4Wb+FUOWCcW
+t8in1pgeNHZ9WnAgXG999/3iCbbQTLB6uVwY4Ax5P7VApnLVXV6QFVf7bN1DxE8kZk+pfLGc
+uD1LJSF0skE80M17kAt+iV+fam8EYzeGdG6cY6w+srndaMaq9ddiHIiQkR35SjJAGnrNRj8o
+oUr/vKOBnFfuwJLA2MOUVPZ8HWB+WXW8qhihw9CXa38Hdt4o5knMGRIyTWEF0TQDtRGQ6his
+VBN3OxJRXBj7/QgCG/GoYpweGKcsMU43p57TzbnXVVUytJsLFyexOGNzrUIxgDVPEvTUnNvd
+AihNZPdbW3YdFkP9pdwOyDpQwebXELUx1kp4ql0laueex4L1v+0a6rDYQeK1gOq5UGY+THRS
+gB2xsHl5zeryfgnjlUkUlxKuumz+9FI2fRtSpxmWllJkRF2oFMGRuLPGAWe8nHvfgkuGVokC
+HAQQAQgABgUCVa0bowAKCRCVY0f2+/OkFWKREACZ9TOmzvY6mrfWVEdldcYPj8cU/1LJhGdb
+No5YYMx+A72nchxGXepHA65OEK+f6rFMeZFPwpQPy6Sj3MhT623H/PECfeG87WcLOyJbfc3i
+9T5jvxS+ztG6abYI2J/50oMvjUWdWkDX3VvdPc0ZZ+KC+oHvx9a/9Yki48m4CEKglgVsrRW/
+b9AXZQCj07bB0GjQQtkqY/m1Z8m4ttzxfO7OBo/jHNF2An4/4gUDirXNDj0UdB5FYFJaTEUC
+neIj2x0fk1r4u6na8tINhiZ0M7IgjnDlBD5jwzvwG+3kYE6TnYp9Mfeg2MPC13tp7jrJatLL
+utrOzvmSVLGLXbkh9w+v+vx7qO3TxZUNlFqTmYs+vI2V/9j7KYV7Ttoind6Io7X9ImnYrvd8
+JOyVcO3867MplKnrnqHJvFStE+JcHEcw5aRw+WVmoFd/obGc34V3K62T977QQGOkrTYDEdje
+KADfjXXZkZMZc0IvzLBOJ1XB45+PKqJYCcJJS8Xr55+NGCDaaUPWDpkNGIqmX2n9kYROMKG6
+uWkZIqG0JlZkga3THSJIvLiy6uoOvDC4GoQ9JnTwpGv6r1Hwcg+4DCOrYKOoPKMMU24vHx2F
+tRRUgCXtr2cmi2ymHlUrtz8EXS4tblic8lixcbvPUqLEvbJ2gfWQvjXNd1whYE/wfvI9WBTE
+IokCHAQQAQgABgUCVa0b3wAKCRC8FzAbSRs/IQhXEADiKbCnsN/+Plllxn6SQHACEU75ackx
++Q02XiD/u+wUptYUGmJi4aaW9f6mgzedOxYK4S+/dCiFtkcYlL+FjaR0C7G6tMjrDgW+8nQC
+TPUNQA0gX2B8n06a7Zmdv3EbV/PIJJwTNSBp/dqKbvPKnRquOOpH+ayZ3awKOq/LlWBErbW1
+gB+FabN0lCe0iUIQTF9OH3GC4QsMtIrePueBmVrVPcHATV2Vw9UPqX1uX/tlXm5eai06oVT7
+V0FwUbg0o1eacblNXvHciHpe33zZIKkGBWwSjDVcU9/SN+U8GfoMYmyCma4iN3KaCklpzBkJ
+iQZtNKPAB5KJti8LDUxFi2sJd3sqWaZDGFhO+/PKhBKpqIhAzx1ppd11zLgh0eg6gQlXN8D8
+ELISRvQqGGNNZdChEFdzGElg5SMfmeEd37OaX4wceLLV0v7EA0doHMVo0enFhSwU3Ywtwxbi
+ukKc7H/ylG7+jvntjY+z7KktRsY/FkklrbrNhddMBQMMSAQUUz1GJ+6NUKmzXjqxFuuh3OAh
+qNzhJyABZWQcNMph+rogEslkenwoHV9gWRWtS3CMybJkKkbsWpYhMZNY6hFtgCwida7NPs83
+69v+yTTE6TU/NIlXUKYIf2LMqtOpEBTjaN3jKpUi5DeE3zBeh6iVKUrfCXbt8O0rYQPNWGSW
++MZ2t4kCHAQQAQgABgUCVvA4GwAKCRBE9G4UbQI5XfS9D/9XPK7jg0lmsNZ2sDIyeAw5n6oh
+SR5F20ocTMAVeXqN7VkvJdNpIqHJa13EP408DgTy9BsSptym/OQGE6B82BU7FZTEL6eMHnGG
+Dg+5ktx9+b73xLedzK75ti6ED+QuA4kDYcvW8hASht0zRcmFUzwbtuEopJ1Lk1R3oFLwCAov
+lhduC45nANWrTK5U+D1U2obl5PAvx+9mEfgvojlGH/C/WD74W+cQZFH7t4+muRzamckLyPft
+nTxjNF/lpYIm7z0QOwvzBYj+PJ09wYueK00RE5+i9Ff8DrjtVSXsziQvSjJuUlv0kVvM8r3t
+h4zBBNRhA4cinwqxhgqO4G+r2r9Gv0M2nKKOnWmyF+MSIRnhgONOQZe5a7kQxKVWkLicS2IG
+UpPeQyTWaqZzYXsD+Dm6DXD57vYTURtUkwO0CDONzT5XiS1HG1MZrw+V/Jai4HAvpF5WkTJX
+Pc1Lv75BxJj3wOAw4MzEWCCdr/N/dt5/+ULpEaSQfIg4L4iEj6rvabQyN0KbOxIDx+pPQ81i
+zfj36wIrDqhyCNIdmVH/yARltkL4XDEl/pt7Y3t6jqFhy057lektowClWcPeq3DoL0LFYnjN
+PpYvIjRIAXdhaYiAu2ViF8WdGzQ5tFeI7u3PQUG5NcPe+WOPOru3wMMrUhLgLHkCdNkjivP7
+9qIPSTkCGYkCHAQQAQgABgUCVvA48gAKCRC3hu8lqKOJoLRMEACmlyePsyE5CH7JALOWPDjT
+f+ERbn+JUTKF+QS0XyWclA/BIK8qmGWfgH38T9nocFnkw17D3GP8msv8ll+T4TzW9Kz9+GCU
+JcHzdsWj99npyeqG5tw+VfJctIBjsnX3mf4N0idvNrkAG5olbpR5UdsYYz62HstLqxibOg4z
+WhTyYvO6CjnszZrRJk0TYZON4cXN14WYq2OTrMaElx0My8o1qVBnK58pIRzv72PmvQqUk5Zj
+hUyp9gxjqqCJDz0hVK61ZuGP6iKK8KCLTfSxeat05LAbz8aC58qlg5DVktevHOjBgnTa8B7B
+gJ7bQ9PLMa3lF4H1eSiR9+8ecpzEfGHILoeIDIYH7z7J/S0mTgV3u5brOMYO+mE9CEfps85t
+VVoyJrIR8mGEdtE2YmdQpdFzYIYvRfq9tnXZjVsAAsC20Smw0LnjhYzAt9QJwZ9pFMXUTg6l
+C5xT+6LNrEY+JR3wC16q36bcbCNj0cBv1A3x6OI5OQfpexhLPDgoDiI+qozJIdj8MzJ8W6KU
+1Z3yb3dqACk77yv37rGO6uduSHnSti26c/cUIy6XZBbXBdobE9O3tr8hwvTQ1FXBmYnBrdiz
+U6tgxEA5czRC9HOkdk6y6ocbjmONpF6MxkpJAvTMk7IqC2/hisbV9x4utla+7tmNZU137QGc
+aK2AGQablVAy4YkCHAQQAQgABgUCVvCMigAKCRCkhaDtUbi3xAU7D/9gUPZSJ8pbZV9TLaKD
+57Bc7B78HNV/B438ib4dI33iihMTBHnCB1giPE9X54QoV8ASxrO/xveS1kkj78jERqUcED6Z
+HhMLb9SWs6CxUKdMdgovnIlFUc+t05D5mb6STi+zNihwO0JI+n79qhETy73WLpC7RR0aMx7z
+Ycbqp3NWPptcf1kVGJZGx+QbEHfVye98T5pkH5Wp+7LSlup6AldQT/oifxdGxLXbECTnwozR
+vyMpAaphoEHrET1YOmKnmw/Jyi6DLpTb3XvSf5Tntzr7HklCEcL9FvYCoHxiXWawLhuPhSyr
+FYeYtF1ypmzTgaJWyuTZ8sN9J+y7Tbchk/I6FpX+3YoTgPCcC7hv1Krs803N/3KuyBEvhzg7
+NYRikzO3fxXlBG0RMm+662E7KlERU24izbWhGiYwl34+MaxrIO4oDvF79LEN7y0+SjL4V0B9
+689d+HI1ZfS9O1xkOlW6y0QyagOzsTOUF12s2mWydFmipbYnIwsSsu6Nzk3yO4M+qYABJXJ3
+tIFQPTd7xqmPNlJ8mFtmzHDhb3Pv6sRNFLLujYM9cJpuNMbAHWdohz1bjBT9pZQ3zWpll5wo
+tUvGmJd6hTAXdUgmZ7lh7Uq6axClMmiLe1WYntcNpb04PyyEm2+GU5x123UTiSX2LGKa4t+H
+NSM8nJL8BJiGk80xVIkCHAQQAQoABgUCVa0OAwAKCRDDvTXkbdRdpVR+D/4/37e8WqKOHNPt
+eQu42sj0ZOfcqyVMA9TQ578F0s9MwoQuqfVhXGSWevOctuMv2qTBjBfFjkdPrKR5L4LNAgMs
+u1epHU0DPcRZUCbh1P7GpolmZ8KgnjT5Wpl1AcuOCaP08VMrt/e/JndTHp6btn6HsLVtryNh
+lL7oaeYbDr6/ovHNGHVIVSZgGP9f4Y8FiDpyfKav71vYLBMxtzM7lc3eFT1S10XhSW6k+8S5
+XldYWkLDriRXDE85C+9QndpOoQaIICp3ye3JVnUxa1qhvsYj9uPt1M6hKiBSoXdplrB+hQc+
+nqLNN3jxpGdmGmwrjtjqMhocMIguEqgARJOek3XKOppEhu+IcnJgU4edARJNLsBauiVBWY/6
+mZOFlZq6H48tVyziS2n/oIpi+aCc/fQeGs9zMTtFUohPfYtTcy9PecXMOYpSu4p4tQ07oucn
+xfBkRUgTdM5VwX7YwTcRwp9XhHACUEGBhrwMH8Iz+sK2jLF3FhJGkef1vFs0vqSf4I8DBFkY
+AKF848YyEcGHeINQloi3v0Kr2PpBxlRh+GPWwi++QPKXQFzlTiyVtMzoo/lpmAWUJwj0dbAb
+H/mohtvWtA1WPHC2JRZ52JLThhpDrK3t//Jdt2WHE91cMx7/2B0PK4O8/j7UVlsOJXpVPsGX
+5SFCeTB/iS4JtIwWN275zIkCMwQQAQgAHRYhBFnKni0qMx3iUaokJ18Dx2fCR6TVBQJZDvZC
+AAoJEF8Dx2fCR6TVoGkQAIjqaQ7tpdhDJ6ORNtLIt0TsWg0jg2rpoq+9Au36+UYBMuBJ3Py/
+tAsZ3cqQlig7lJiQqOuQZkbg1vcY4Kdad7AGa8Kq3sLn8h2XUlNU90X0KAwdCTA/YXxODlfU
+CD2hl4vJEoH/FZtfUsaLNHLmz0brKGrWvChq00j5bPfp90KYKqamGb3a4/LG4DHL4lmEBtP+
++YA0YqUQ3laOvKune2YwSGe4nKRarZnFiIn2OnH9w0vKN/x9IMGEtc5MbQVgGtmT5km3DUuX
+MDforshue6c7ao4nMOC96ajkWYZhybqHJgLOrEGPVUkOaEe7s1kx4ye9Ph3w/LXEE8Y8VFiZ
+orkA/8PTtx0M9hrCVkDp0w8YTzFJ9DFutrImuPT6+mNIk+0NQeuDsv492m/JXGLw/LRl97Tm
+HpKME+vDd5NBLo4OShlDKHwPszYcpSJTG9+5++csR95al3tWnuGX9V0/dO1s7Mv0f/z07nLB
+/tL+hEpqqA5aRiGzdx/KOrPZuhCTyfA3b2wvOblwf4A/E1yO7uzPTuSWnx1E14iZuaCPyZPX
+Eh3XSYCLEnQ05jy50uGXCDVR+xiE/5i/L3IxyhJk6zn5GOW5b8Taq5s/dFS3zWiFS6l0zQ1V
+QmJH8jdGLoBFvdVLZoAa1bihLo+nJVPR2RauWnxWoWk1NQoT3l02Lk6DiQI4BBMBAgAiBQJV
+qUAEAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBht7Um2Y8DU1CqD/9Gvr9Xu4uq
+sjDHRQWSfI0lqxElmFSRjF0awsPXzM7Q1rxV7dCxik4LeiOmpoVTOmqboo2/x5d938q7uPdY
+av2Q+RuNk2CG/LpXku9rgmTE7oszEqQliqKoXajUZ91rw19wrTwYXLgLQvzM3CUAO+Z0yjjf
+za2Yc0ZtNN+3sF5VpGsT3Fb14aYZDaNg6yPFvkyxp0B1lS4rwgL3lkeVQNHeAf0qqF9tBank
+Gj3bgqK/5/YlTM2usb3x46bVBvwX2t4/NnYM5hEnI57inwamX6SiMJc2e2QmBzAnVrXJETrD
+L1HOl4GUJ6hC4tL3Yw2d7515BlSyRNkWhhdRp1/q9t1+ovSe48Ip2X2WF5/VA3ATfQhHKa3p
++EkIV98VCMZ14x9KIIeBwjyJyFBuvOEEIYZHdsAdqf1zYRtD6m6obcBrRiNfoNsYmNY4joDr
+VupI96ksIxVpepXaZkQhplZ1mQ4eOdGtToIl1cb/4PibVgFnBgzrR4mQ27h4wzAwWdGweJZ/
+tuGoqm3C6TwfIganajiPyKqsVFUkRsr9y12EDcfUCUq6D182t/AJ+qE0JIGO73tXTdTbqPTg
+kyf2etnZQQZum3L7w41NvfxZfn+gLrUGDBXwqLjovDJvt8iZTPPyMTzemOHuzf40Iq+9sf5V
+9PXZ/5X9+ymE3cTAbAk9MLd9fbkCDQRVqUD0ARAAr/Prvt+mhVSPjNDPSDrTBVZ/7XLaUZvy
+IVggKa+snJoStrlJGTKKFgDVaYTOE3hP/+0fDdQh97rjr4aRjd4hBbaNj0MzZdoSWYw3yT+/
+nidufmgPus0TIJMVO8I6rl3vgcfW/D3ovNrLW/LjkTuM9a+p+D1J7woCfMSWiFMmOLPKFT7R
+BuY8edCVjyA6RP9K9Gj1sURSeqNaHR9Gr4rW10s+FwUHWxxzbmIWqH0gApQYO6vyND5IMcKO
+BCWQU6Detuq1pQ6dUc+iF+sEz3Rk3C6d4WBBjtkVJSJ0KKan8Q3gJefOCMNhdRQDjZLwbzr4
+bgoAkLbaBFCjiZxWZ6HAdMfSCV8uZQrtMS7b0DUpY0vdH9Htl3JqOOkK9RorYDQBuPdkTYFI
+NsmtWVsFV/LmR891mOF3fBRaoVoMeJVwiZyNlFY+dyWWFzLp+GoTLcQtmuR7OkmOcBGxWSKP
+cZfPqhf4dVQud7bDR2RNfJ1Hqa5kj8Z422sseYDwHf/T9OWWYvLwKGZhlUgpnzO3WCGrd/6E
+VNeC1mKXt4F7BmADov4Rdcrp1mPXiVt7oIxLaS6eBNf2y1TWzjYj5ZFuKqIukDEJfqpwsE5a
+snCw56nae+7luGs8em1J9GEXhWzXG15UVyQJaFwuB1iL8l7VcEQz4ABVrSTUWLLAKDsyqUbq
+2gsAEQEAAYkERAQYAQIADwUCValA9AIbAgUJA8JnAAIpCRBht7Um2Y8DU8FdIAQZAQIABgUC
+ValA9AAKCRAcacTlXpkF2y/FD/oDrZm143Rv9NV9InnVJ0brpqbB7aulFfhR1LDuJ/GjeqGA
+QgJCZdHlzT2pfCXXswUlYzcWEatvGcDkoaB5Ya2qs+6nhBk8pT6XYRrZAtIlKIGrlCqoSBm9
+HXguGv+EIaEECr2z/Funx9so0mP+5aJn65M9u3lPmuAonj6DcHoM07WsfsXvQ4ut3fabFmzi
+lLGeAdEDKIw8Hn3JBUOxUyFrQlOoL4/3qK1TO+cidz/2bATQQyIG2kNOSgHBslU+e6/7sWOQ
+4ufmzm7dEsf197zPXGdXR88LT+d2uU2K4GkCffNUKxZqy9bXxXPwr4JBjxLDQnDvl50GAWjP
+ZAwXEd8Okwl5+8xp0HuZ217WUqT8ib0oUUfwh2H1vrMPRr/46i6O6THpCkV8BWF7axPYIiba
+eYwC4BkjZwK3tIL5ESf2f0xK4hbE3xhMTeqABQHoXd5rQ7SEaUuX7PlQ59fRs0Cz55vH8/o9
+zMm0PN6qmZFvRBeqjnklZcu+ZdP9+CMXt81NMuzIK1X7EfpkUoam8YkYkwcCkRvPZrSHLXZF
+kfnx4jW543dPOfycjnv6hhKyoXD9CBx0ZcOicsYmw9XMilBGD3b8ZdK6RYX4ywKNU6KUdFJj
+XB88+Ynv6QxDit1emMCHA1glzV9/k36iYLEIqgWBiwJeUUIcUqzgnBFtN13cyS6oEACUGUiP
+Kbw3IkgGW19ZyS6FBNfgGIGW0Y82Br0KlCyaXnX0R4+4u2h7kfR9NSnhRhsvRnPIkiZATa7D
++Ew1nfpsDTnti0c6g/gVw9TC/rCyXkkLztRHVcWEBdvnFJTSp2LeFaHSGbvvZfoIGUzyUzoa
+1P98NmRIY1cxBoizVf8729/zAaD4fAslxoK/JsjjDvDUrRHtaNZmUle60Jl/yFFzR3zxb+pJ
+liigoP2rZLt+ipomHJIhoXXWwfkRO9U/egJ8ZUhWEpZvROnaNc9eVct5EBADxL7gHWjlceIz
+4ndI1eE9AdEZDdUZwOfjmK2DcXjFBfZC+jhJXjY0xh3pPKQz90h9DIkM5WDcJPf6ep+MKSd/
+3hI2/JmmscQ+alwN6x6g8zDySMo3APA9cUvEFGe0+CepVcNw03jU4faSrHiMXsUuVGbA2kHa
+YVUfzF5W5GbuHZZlGxoSiq+K+HNG0RJUDa6bkSDvrcJVNw1iUrowP+LLwnNsy5kGuU4evnwc
+oN1w7LVbTPaq4RIaiqvAD33kiA9q//UNKnK4k81z+hRNaWGliyGpgqh+V7MDIqPfT5TMLdH+
+ZjTeuLrNS8KBcc2BmUpSwzdUReTqHmgO5peeIcsvO7GNMFWsgucZiAdIVE/zQv+SfP6jhS+r
+jCPs0eeu5zl8/V+gXFE2wy3jTJEl9bkCDQRZS9m1ARAAvh1Nh4GgjpTFZy7uQRFz5PPXdZTB
+I+Y4hTpF2heoFzZDI6SLyz64Ooglum3ZglQ9ac+ChTSsO36aw4b22kCM9WDmkcl7wf21fG9o
+8gJDVjFjDWbwTWREaKjgS6s/Yb8f9gje/BGySojxynTi3zyTUN94q9dhVjfiQ79UzXZdN9Fy
+yIx2YO5tOo09hTWSZg16oxP47Mj1ATaS6UIrQMcMnOp0kuc6SufXPSWsUA+g2lW0dmHgPvIH
+wUfcjWqT2elF01e9KOFe7im29G6zOS2MRx8cr6KRg/eNWpHh5aI4quRUhYk4Kw4ohQTbs9ed
+0YttS4PMK+sq6xHpb28X6ZgrWnelPY9hfwcR4m7Ot3VQUG8JY9/aTlFCoeTgkhop+MCUI+dJ
+eY8depIa0PTzdEmEWRvPhTTv+CUdZ6v4z5LD6FhP+/5c6FCbcIb89Rp5fa53oYV5/KZf+0DU
+VgmpXFU7J7ZrGgDeU7vIzmwr8kcx0vtsVm1dVwYLACpTaaQPbISQUDM8sEcqKAqD7hWKaxNs
+b2M85L6q2/rnHq4g46yJzdR3b8EH+V9u+mUi9DIljDwcpvw7ReRQ9wPdDWLynnglIeGImbjY
+fr324yaIl4vNORAkbsoCkS/qc5v6MvKvYNle5fzb9S9kCbNZmD9c5/bHPjj9ENeQvzrl2pFh
+6dc1o5cAEQEAAYkEcgQYAQgAJhYhBBTyZoLQkWzdgeN7bWG3tSbZjwNTBQJZS9m1AhsCBQkD
+wmcAAkAJEGG3tSbZjwNTwXQgBBkBCAAdFiEE3OrF2WE1uRxOpnKru769uyTG81UFAllL2bUA
+CgkQu769uyTG81UFUw//bW5T7w2k8ukGfpIcm0gB98VgxKenSCmU6N+Ii0DwcNtzW+pmVWl2
+TbHIXDpvuD69ODWBDMXu6gBkrVzNEsK3uhzGe0tWA+5I7Vke3iEkbll7VRQlIOrw+n5NMvje
+uDqKsMt1gMEEdgRKddYApEAi49vV7XnqkB2lLKfAnf6o/KqPm8MuQ+u0xYanupZCldwdpcx5
+rybj79Es0iO9Gh/+3qOtR6ubOz3Vn78Lc3y6AP9pmtdOI2QX8foGK4hNmgHSP6uPLh/ERC9N
+ir0Lc2hoEhHEkQ8CnEaccp70r03VkEQuMJQJPUyRsGZ/gIm0SAm9JJxWHXJk2/5NUN83pHAX
+0LA4zxtWs4fVW5f8v9eIhFFPTZ4au+/cS9D4GFx4mlY34awcpAzrny2tntGEejY9HSJv4PuF
+ZCmtyS2q61N9EU8yuBwVM9cp5HntzG+OT4HYugtI6ibehM0S1Roy4ETwT+Ns41ffhCwdYMp8
+tzdeksQ35s7rkB9OJHj+q2dkGaV0FQb3FutbSpxbP4zk/dLqyxuivdUPHGtf4W/qklxzCWBg
+0VDFA7PwatmEXRxTjx77RelTY0V7K54dDyVv3Jh2+FzuaQZzzuIhv4gtqHntaqLnYl3h/QNL
+bOTE3ppvn9RUSR983Bd+M3QhbbwZrgG1m+hdUZUmji+wbK0wV0xHNEH+4BAAjbVzdNOs7hMv
+jY1wVDRFjvICVorNdNdU3ELy/9BAoiwOs2+zjDXmsX+3YtdzwKvdpQ24O0TvH4Vo3BkvKkJ7
+5EU7LroAbYQ2423m1MY3eaBslmX7TUJ3XE+k7OZF8AmcftgP4nhC4IQSCtoBc9+ncyGN4da1
+BpYO7b19tO0/HST8GHSrEcU9bGGdimS2eNkSgybA8wF6K0K9yvrpTNSZ7OBVlzQfEn8s70Gy
+zs/d6C/rTA+defnv3AMaciuINSEdFyfYq4wjt5PikvgceMAAkH/z69xTNg+6q3FQt/lyK7xX
+5qPMe2oFyDA1H+Cb/uL7ioo+jXh9gF+0fk8OP2IPzxYhBfulpVtgclmOuaekzaKeIv8NFW7G
+oA9OghziExePxg95OpL/VyQ7PJiAUj1pFovFk5HS6ejVZNEGJ/A5zLc1PBIcr/phu0luqhXA
+hImsZS6858GWQllWULNWw8bX5Blo8AvcfFVdq9iAK7aHN7g45ZR7Ze6qKHDyFv4XWuE/rj9C
+2mM/GAstvU0gGmbo6B1mNGMJuX3Gd3dG8fqFjE77OB2feJyfZ8UeF1nvG1hxlmuD1A5e6/os
+O9V7kjhXKzM2zSO11zHQ/5PlUisoUBjJ/QIK4v9RBNGtbRKso5X9Fke692lVgrdggDJ3j2Qq
+MuTo71rAVDLtxerc+GNq0GI=
+=YjV6
+-----END PGP PUBLIC KEY BLOCK-----

From 63402a188837f1a5317afc724ad710d12472f001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 1 Apr 2017 17:06:19 +0200
Subject: [PATCH 0677/3246] alacritty: init at 2017-07-08

fixes #21801
---
 pkgs/applications/misc/alacritty/default.nix | 61 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/applications/misc/alacritty/default.nix

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
new file mode 100644
index 00000000000..3dda61d95ae
--- /dev/null
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -0,0 +1,61 @@
+{ stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  cmake,
+  makeWrapper,
+  expat,
+  pkgconfig,
+  freetype,
+  fontconfig,
+  libX11,
+  gperf,
+  libXcursor,
+  libXxf86vm,
+  libXi,
+  xclip }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "alacritty-unstable-2017-07-08";
+
+  src = fetchFromGitHub {
+    owner = "jwilm";
+    repo = "alacritty";
+    rev = "94849c4f2a19bd49337f5cf090f94ac6a940c414";
+    sha256 = "0cawrq0787pcfifn5awccq29a1ag85wfbmx1ccz7m33prk3ry9jp";
+  };
+
+  depsSha256 = "0lb83aan6lgdsdcrd6zdrxhz5bi96cw4ygqqlpm43w42chwzz0xj";
+
+  buildInputs = [
+    cmake
+    makeWrapper
+    freetype
+    fontconfig
+    xclip
+    pkgconfig
+    expat
+    libX11
+    libXcursor
+    libXxf86vm
+    libXi
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    for f in $(find target/release -maxdepth 1 -type f); do
+      cp $f $out/bin
+    done;
+    wrapProgram $out/bin/alacritty --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath buildInputs}"
+  '';
+
+
+  meta = with stdenv.lib; {
+    description = "GPU-accelerated terminal emulator";
+    homepage = https://github.com/jwilm/alacritty;
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ mic92 ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cae4b2e781..ff11adb054d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -412,6 +412,10 @@ with pkgs;
 
   albert = libsForQt5.callPackage ../applications/misc/albert {};
 
+  alacritty = callPackage ../applications/misc/alacritty {
+    inherit (xorg) libXcursor libXxf86vm libXi;
+  };
+
   amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
 
   ammonite = callPackage ../development/tools/ammonite {};

From 66af169adb7ee7c553ba3ec642c86c869c4839c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 17 Jul 2017 21:06:56 +0100
Subject: [PATCH 0678/3246] rustRegistry: 2017-06-27 -> 2017-07-17

---
 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 eb15da9dfdc..5e280fb91c4 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,13 +7,13 @@
 { stdenv, fetchFromGitHub, git }:
 
 stdenv.mkDerivation {
-  name = "rustRegistry-2017-06-27";
+  name = "rustRegistry-2017-07-17";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "crates.io-index";
-    rev = "de7301b4aa5a933658ab14dba972cc2cab77da1c";
-    sha256 = "0dyx5n789pkmvk7x876v8rnagzp7xc8r2iysj2b70vcsqdvidnax";
+    rev = "14f1d497ede721229b23ad1e8b6122f34761f1a6";
+    sha256 = "1a9aav9yg7ffrilsnzlbaysxgzfzg455jfdh260n9y6wvpnpfvg9";
   };
   phases = [ "unpackPhase" "installPhase" ];
   installPhase = ''

From 8b4707798c2933708ccb5dbfff1573bd82173cd6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 18 Jul 2017 06:39:29 +0800
Subject: [PATCH 0679/3246] qtox: 1.10.2 -> 1.11.0

---
 .../networking/instant-messengers/qtox/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 2c6cf473f1c..0594a8944f5 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   name = "qtox-${version}";
-  version = "1.10.2";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner  = "tux3";
     repo   = "qTox";
     rev    = "v${version}";
-    sha256 = "0c2633rc9l73q9qs9hybn11hmlqbwsvih3sf6jk1jp4151k5wp1y";
+    sha256 = "0h8v359h1xn2xm6xa9q56mjiw58ap1bpiwx1dxxmphjildxadwck";
   };
 
   buildInputs = [

From cc8e2aec299a002ede108dea1c33b1161f1aa180 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 18 Jul 2017 00:58:20 +0200
Subject: [PATCH 0680/3246] expat: 2.2.1 -> 2.2.2

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

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 3cbfc4c568d..205faa845fe 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.1";
+  name = "expat-2.2.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q";
+    sha256 = "0ik0r39ala9c6hj4kxrk933klgwkzlkbrfhvhaykx8l1rwgr2xj3";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers

From b4387e7c2f78f7977ddae8ea3e4f5c7d408cf0bd Mon Sep 17 00:00:00 2001
From: Bill Sun <billksun@gmail.com>
Date: Mon, 17 Jul 2017 16:09:50 -0700
Subject: [PATCH 0681/3246] Add cmakeFlags for auto-type and yubikey (#27321)

* Add cmakeFlags for auto-type and yubikey

* Add libyubikey dependency

* Add auto-type dependencies

* Add new dependencies to buildInputs

* Fix duplication and capitalization in dependencies

* Add yubikey-personalization to dependency and build

* Add release build flag

* Revert "Add release build flag"

This reverts commit afabd63db0ad68348909c67b488787501b7991bb.
---
 pkgs/applications/misc/keepassx/community.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index b88291194eb..6ae86486b47 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch,
-  cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales
+  cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras
 , withKeePassHTTP ? true
 }:
 
@@ -16,7 +16,11 @@ stdenv.mkDerivation rec {
     sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc";
   };
 
-  cmakeFlags = [ "-DWITH_GUI_TESTS=ON" ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON");
+  cmakeFlags = [ 
+    "-DWITH_GUI_TESTS=ON" 
+    "-DWITH_XC_AUTOTYPE=ON"
+    "-DWITH_XC_YUBIKEY=ON"
+  ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON");
 
   doCheck = true;
   checkPhase = ''
@@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
     make test ARGS+="-E testgui --output-on-failure"
   '';
 
-  buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales ];
+  buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ];
 
   meta = {
     description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";

From d07bf424a91c97773706656af591ba32039c2203 Mon Sep 17 00:00:00 2001
From: hectorj <hector.jusforgues@gmail.com>
Date: Mon, 17 Jul 2017 22:07:50 +0200
Subject: [PATCH 0682/3246] nomad: 0.5.5 -> 0.5.6

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

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index 1d39534bc16..ce33fca4475 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "nomad-${version}";
-  version = "0.5.5";
+  version = "0.5.6";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "nomad";
     inherit rev;
-    sha256 = "17xq88ymm77b6y27l4v49i9hm6yjyrk61rdb2v7nvn8fa4bn6b65";
+    sha256 = "1ivxsrg8s5fcyhngf8wlrqw6j7s2iggbf9xkr8jnd80cxbcpnksl";
   };
 
   meta = with stdenv.lib; {

From f59e71e9c7a41618908fbab1f7517fd3af2c6855 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Jul 2017 08:43:07 +0200
Subject: [PATCH 0683/3246] heroku: mark as broken

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

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 6334bb2e5dd..0e0a46c906e 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -41,6 +41,7 @@ in stdenv.mkDerivation rec {
     maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
     license = licenses.mit;
     platforms = with platforms; unix;
+    broken = true; # Outdated function, not supported upstream. https://github.com/NixOS/nixpkgs/issues/27447
   };
 
   binPath = lib.makeBinPath [ postgresql ruby ];

From 09bae7cb706bf37f2da1e4d49c38e6bc78efb611 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Mon, 17 Jul 2017 23:53:31 -0700
Subject: [PATCH 0684/3246] build-fhs-userenv: Propagate $XAUTHORITY

The `DISPLAY` environment variable is propagated into chroots built with
`buildFHSUserEnv`, but currently the `XAUTHORITY` variable is not. When
the latter is set, its value is usually necessary in order to connect to
the X server identified by the former.

This matters for users running gdm3, for example, who have `XAUTHORITY`
set to something like `/run/user/1000/gdm/Xauthority` instead of the X
default of `~/.Xauthority`, which doesn't exist in that setup.

Fixes #21532.
---
 pkgs/build-support/build-fhs-userenv/chroot-user.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
index 11f672acb9f..833aab16ceb 100755
--- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb
+++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
@@ -16,6 +16,7 @@ mounts = { '/' => 'host',
 # Propagate environment variables
 envvars = [ 'TERM',
             'DISPLAY',
+            'XAUTHORITY',
             'HOME',
             'XDG_RUNTIME_DIR',
             'LANG',

From a2a625977903452169bf69ffa09184beaad6ec05 Mon Sep 17 00:00:00 2001
From: Mikael Brockman <mikael@brockman.se>
Date: Tue, 18 Jul 2017 11:09:47 +0300
Subject: [PATCH 0685/3246] dapp: v0.5.2 -> v0.5.3

---
 pkgs/applications/altcoins/dapp.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix
index e80dd6429fe..51de4d202e8 100644
--- a/pkgs/applications/altcoins/dapp.nix
+++ b/pkgs/applications/altcoins/dapp.nix
@@ -3,18 +3,18 @@
 
 stdenv.mkDerivation rec {
   name = "dapp";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "dapphub";
     repo = "dapp";
     rev = "v${version}";
-    sha256 = "1529ml5r1l5g6xcak7k3h3ih214mgnk87jsxyk0rvk245jkard1y";
+    sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird";
   };
 
   nativeBuildInputs = [makeWrapper shellcheck];
   buildPhase = "true";
-  doCheck = false;
+  doCheck = true;
   checkPhase = "make test";
   makeFlags = ["prefix=$(out)"];
   postInstall = let path = lib.makeBinPath [

From 75454c3122e230c4ad21582e6a48468e0fe9c62c Mon Sep 17 00:00:00 2001
From: Tom Smeets <Tom.TSmeets@Gmail.com>
Date: Tue, 18 Jul 2017 10:28:30 +0200
Subject: [PATCH 0686/3246] hid-listen: fix typo

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

diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/tools/misc/hid-listen/default.nix
index 0695fb915e9..916a6afa66b 100644
--- a/pkgs/tools/misc/hid-listen/default.nix
+++ b/pkgs/tools/misc/hid-listen/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    mv ./hid_listen $out/bin/$hid_listen
+    mv ./hid_listen $out/bin/hid_listen
   '';
 
   meta = with stdenv.lib; {

From 17642b5fd00b185f815361189241cd0462518857 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 18 Jul 2017 10:54:01 +0200
Subject: [PATCH 0687/3246] nix: 1.11.12 -> 1.11.13

---
 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 8703ea1ca54..4568a20e778 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/2y3cn6siixhr7pbsz2grry89jzchkxyd-nix-1.11.12";
-  i686-linux = "/nix/store/sbz8z995lysxja8brnxmw7hgi6ljigrq-nix-1.11.12";
-  x86_64-darwin = "/nix/store/gs2z548x41ah2h8fqnbn87syzazrlsb8-nix-1.11.12";
+  x86_64-linux = "/nix/store/avwiw7hb1qckag864sc6ixfxr8qmf94w-nix-1.11.13";
+  i686-linux = "/nix/store/8wv3ms0afw95hzsz4lxzv0nj4w3614z9-nix-1.11.13";
+  x86_64-darwin = "/nix/store/z21lvakv1l7lhasmv5fvaz8mlzxia8k9-nix-1.11.13";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2bcf445bee6..910dc6de871 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -152,10 +152,10 @@ in rec {
   nix = nixStable;
 
   nixStable = (common rec {
-    name = "nix-1.11.12";
+    name = "nix-1.11.13";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2";
+      sha256 = "0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913";
     };
   }) // { perl-bindings = nixStable; };
 

From 412bfda4227b040bd68b1c54388ce9b16e4eb196 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 18 Jul 2017 09:15:45 +0000
Subject: [PATCH 0688/3246] Add file with GCE image locations, similar to
 ec2-amis.nix. Will be used by nixops.

(cherry picked from commit 9d810ddcc1938a90090fd60f8924f4e83acbeee2)
---
 nixos/modules/virtualisation/gce-images.nix | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 nixos/modules/virtualisation/gce-images.nix

diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix
new file mode 100644
index 00000000000..8a9bda1b60c
--- /dev/null
+++ b/nixos/modules/virtualisation/gce-images.nix
@@ -0,0 +1,8 @@
+let self = {
+  "14.12" = "gs://nixos-cloud-images/nixos-14.12.471.1f09b77-x86_64-linux.raw.tar.gz";
+  "15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz";
+  "16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz";
+  "17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz";
+
+  latest = self."17.03";
+}; in self

From ec313abdcef77fa1b4143aa7497bb22ecd4503c5 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 18 Jul 2017 09:18:20 +0000
Subject: [PATCH 0689/3246] Add file with Azure image locations, similar to
 ec2-amis.nix. Will be used by nixops.

(cherry picked from commit e93f26847ea41cce6633b6a0feb6ce31b0722d5d)
---
 nixos/modules/virtualisation/azure-images.nix | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 nixos/modules/virtualisation/azure-images.nix

diff --git a/nixos/modules/virtualisation/azure-images.nix b/nixos/modules/virtualisation/azure-images.nix
new file mode 100644
index 00000000000..22c82fc14f6
--- /dev/null
+++ b/nixos/modules/virtualisation/azure-images.nix
@@ -0,0 +1,5 @@
+let self = {
+  "16.09" = "https://nixos.blob.core.windows.net/images/nixos-image-16.09.1694.019dcc3-x86_64-linux.vhd";
+
+  latest = self."16.09";
+}; in self

From 4ebe73dc1bb626051a6da9fdbcb5e0ddfaff6b1d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 14 Jul 2017 11:04:33 +0800
Subject: [PATCH 0690/3246] pythonpackages.zope_testrunner: 4.4.10 -> 4.7.0

---
 .../zope_testrunner/default.nix               | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-----------
 2 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/zope_testrunner/default.nix

diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
new file mode 100644
index 00000000000..fc1a3c4c902
--- /dev/null
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, zope_interface
+, zope_exceptions
+, zope_testing
+, six
+, subunit
+}:
+
+
+buildPythonPackage rec {
+  pname = "zope.testrunner";
+  version = "4.7.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8ffcb4989829544a83d27e42b2eeb28f8fc134bd847d71ce8dca54f710526ef0";
+    extension = "zip";
+  };
+
+  propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ stdenv.lib.optional (!isPy3k) subunit;
+
+  meta = with stdenv.lib; {
+    description = "A flexible test runner with layer support";
+    homepage = http://pypi.python.org/pypi/zope.testrunner;
+    license = licenses.zpt20;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f3adb9d9d5..0cafc8ff15b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26277,25 +26277,7 @@ EOF
   };
 
 
-  zope_testrunner = buildPythonPackage rec {
-    name = "zope.testrunner-${version}";
-    version = "4.4.10";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.testrunner/${name}.zip";
-      sha256 = "1w09wbqiqmq6hvrammi4fzc7fr129v63gdnzlk4qi2b1xy5qpqab";
-    };
-
-    propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;
-
-    meta = {
-      description = "A flexible test runner with layer support";
-      homepage = http://pypi.python.org/pypi/zope.testrunner;
-      license = licenses.zpt20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
+  zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };
 
   zope_traversing = buildPythonPackage rec {
     name = "zope.traversing-4.0.0";

From 8ea9602ed8fea10d619a16a6c050fb8f129754c3 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 14 Jul 2017 11:05:31 +0800
Subject: [PATCH 0691/3246] pythonpackages.zope_interface: 4.1.3 -> 4.4.2

---
 .../python-modules/zope_interface/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +------------
 2 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/zope_interface/default.nix

diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix
new file mode 100644
index 00000000000..bfde1f0a215
--- /dev/null
+++ b/pkgs/development/python-modules/zope_interface/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, zope_event
+}:
+
+buildPythonPackage rec {
+  pname = "zope.interface";
+  version = "4.4.2";
+  name = "${pname}-${version}";
+  
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4e59e427200201f69ef82956ddf9e527891becf5b7cde8ec3ce39e1d0e262eb0";
+  };
+
+  propagatedBuildInputs = [ zope_event ];
+
+  meta = with stdenv.lib; {
+    description = "Zope.Interface";
+    homepage = http://zope.org/Products/ZopeInterface;
+    license = licenses.zpt20;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0cafc8ff15b..113a0255170 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26298,23 +26298,8 @@ EOF
   };
 
 
-  zope_interface = buildPythonPackage rec {
-    name = "zope.interface-4.1.3";
+  zope_interface = callPackage ../development/python-modules/zope_interface { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.interface/${name}.tar.gz";
-      sha256 = "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if";
-    };
-
-    propagatedBuildInputs = with self; [ zope_event ];
-
-    meta = {
-      description = "Zope.Interface";
-      homepage = http://zope.org/Products/ZopeInterface;
-      license = licenses.zpt20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
 
   hgsvn = buildPythonPackage rec {
     name = "hgsvn-0.3.11";

From 7d19959ac5c17361e6fc56df303e4b4ee9e75816 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 14 Jul 2017 11:06:29 +0800
Subject: [PATCH 0692/3246] pythonPackages.zconfig: 3.0.3 -> 3.2.0

---
 .../python-modules/zconfig/default.nix        | 27 +++++++++++++++++++
 .../zconfig/skip-broken-test.patch            | 12 +++++++++
 pkgs/top-level/python-packages.nix            | 18 +------------
 3 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/zconfig/default.nix
 create mode 100644 pkgs/development/python-modules/zconfig/skip-broken-test.patch

diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
new file mode 100644
index 00000000000..aa90bf0ce1a
--- /dev/null
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, zope_testrunner
+}:
+
+buildPythonPackage rec {
+  pname = "ZConfig";
+  version = "3.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19";
+  };
+
+  patches = [ ./skip-broken-test.patch ];
+
+  propagatedBuildInputs = [ zope_testrunner ];
+
+  meta = with stdenv.lib; {
+    description = "Structured Configuration Library";
+    homepage = http://pypi.python.org/pypi/ZConfig;
+    license = licenses.zpt20;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/development/python-modules/zconfig/skip-broken-test.patch b/pkgs/development/python-modules/zconfig/skip-broken-test.patch
new file mode 100644
index 00000000000..ee3fcff4903
--- /dev/null
+++ b/pkgs/development/python-modules/zconfig/skip-broken-test.patch
@@ -0,0 +1,12 @@
+diff --git a/ZConfig/tests/test_schema2html.py b/ZConfig/tests/test_schema2html.py
+index 838cf7c..52daf4e 100644
+--- a/ZConfig/tests/test_schema2html.py
++++ b/ZConfig/tests/test_schema2html.py
+@@ -74,6 +74,7 @@ else:
+ 
+ class TestSchema2HTML(unittest.TestCase):
+ 
++    @unittest.skip('broken test (https://github.com/zopefoundation/ZConfig/issues/34)')
+     def test_no_schema(self):
+         self.assertRaises(SystemExit,
+                           run_transform)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 113a0255170..99cd6acb4d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25660,24 +25660,8 @@ EOF
     };
   });
 
-  zconfig = buildPythonPackage rec {
-    name = "zconfig-${version}";
-    version = "3.0.3";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/Z/ZConfig/ZConfig-${version}.tar.gz";
-      sha256 = "6577da957511d8c2f805fefd2e31cacc4117bb5c54aec03ad8ce374020c021f3";
-    };
-
-    propagatedBuildInputs = with self; [ zope_testrunner ];
-
-    meta = {
-      description = "Structured Configuration Library";
-      homepage = http://pypi.python.org/pypi/ZConfig;
-      license = licenses.zpt20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
+  zconfig = callPackage ../development/python-modules/zconfig { };
 
 
   zc_lockfile = buildPythonPackage rec {

From 41542791798f2bcbd4944c2241dc59b1280eaa83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 18 Jul 2017 11:01:59 +0100
Subject: [PATCH 0693/3246] zfsUnstable: mark as stable with 4.12

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

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 414f2ba444a..f281e5b590e 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -139,7 +139,7 @@ in
     };
     zfsUnstable = common {
       # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = "4.12";
+      incompatibleKernelVersion = null;
 
       version = "0.7.0-rc5";
 

From 638adf2d908c2122c223bf23d7a258f9266da31a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 17 Jul 2017 19:07:44 +0300
Subject: [PATCH 0694/3246] iproute: 4.11.0 -> 4.12.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 4ffc99b6ced..404e21bcbce 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.11.0";
+  version = "4.12.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "09l0phf09mw17bn3xlzfr80sbhw14mq8xv28iz5x15m6pll10rvj";
+    sha256 = "0zdxdsxyaazl85xhwskvsmpyzwf5qp21cvjsi1lw3xnrc914q2if";
   };
 
   patches = lib.optionals enableFan [

From 9ea795c2641f0b4fc04476c9167fe38626243b3f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 17 Jul 2017 19:08:01 +0300
Subject: [PATCH 0695/3246] pv: 1.6.0 -> 1.6.6

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

diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix
index 8a3aa08abb7..cd1e5457639 100644
--- a/pkgs/tools/misc/pv/default.nix
+++ b/pkgs/tools/misc/pv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl } :
 
 stdenv.mkDerivation rec {
-  name = "pv-1.6.0";
+  name = "pv-1.6.6";
 
   src = fetchurl {
     url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2";
-    sha256 = "13gg6r84pkvznpd1l11qw1jw9yna40gkgpni256khyx21m785khf";
+    sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0";
   };
 
   meta = {

From 27e503f00cf39755dcc1f59e592e727c5c9f3b71 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 17 Jul 2017 19:08:17 +0300
Subject: [PATCH 0696/3246] strace: 4.17 -> 4.18

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

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 549872646cb..2dad1c596ab 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
-  version = "4.17";
+  version = "4.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "06bl4dld5fk4a3iiq4pyrkm6sh63599ah8dmds0glg5vbw45pww1";
+    sha256 = "026agy9nq238nx3ynhmi8h3vx96yra4xacfsm2ybs9k23ry8ibc9";
   };
 
   nativeBuildInputs = [ perl ];

From 488db3d392856d841b72986700fc572306972da0 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Mon, 17 Jul 2017 12:32:16 +0900
Subject: [PATCH 0697/3246] mathematica: fix library paths

---
 pkgs/applications/science/math/mathematica/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 1a9adcd4782..6191af85bd1 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
     unixODBC
     libxml2
     libuuid
+    zlib
   ] ++ (with xorg; [
     libX11
     libXext
@@ -93,6 +94,12 @@ stdenv.mkDerivation rec {
 
     echo "=== Running MathInstaller ==="
     ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent
+
+    # Fix library paths
+    cd $out/libexec/Mathematica/Executables
+    for path in mathematica MathKernel Mathematica WolframKernel wolfram; do
+      sed -i -e 's/export LD_LIBRARY_PATH/export LD_LIBRARY_PATH=${builtins.replaceStrings ["/"] ["\\/"] "${zlib}/lib"}:\''${LD_LIBRARY_PATH}/' $path
+    done
   '';
 
   preFixup = ''

From d03178aae3469f8737fda65fa651ada2cb715058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 18 Jul 2017 13:41:28 +0200
Subject: [PATCH 0698/3246] Point to the new mailing list by replacing the old
 link

---
 README.md                   | 2 +-
 doc/quick-start.xml         | 2 +-
 nixos/doc/manual/manual.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1d5fbd218e2..1a0fb5014de 100644
--- a/README.md
+++ b/README.md
@@ -38,5 +38,5 @@ For pull-requests, please rebase onto nixpkgs `master`.
 
 Communication:
 
-* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev)
+* [Mailing list](https://groups.google.com/forum/#!forum/nix-devel)
 * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index 5ed959abace..ca86e6c9519 100644
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -212,7 +212,7 @@ $ nix-env -f . -iA libfoo</screen>
 
   <listitem>
     <para>Optionally commit the new package and open a pull request, or send a patch to
-    <literal>nix-dev@cs.uu.nl</literal>.</para>
+    <literal>https://groups.google.com/forum/#!forum/nix-devel</literal>.</para>
   </listitem>
 
 
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index 2c28dd44801..9aa332f026d 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -18,7 +18,7 @@
 
     <para>If you encounter problems, please report them on the
     <literal
-    xlink:href="http://lists.science.uu.nl/mailman/listinfo/nix-dev">nix-dev@lists.science.uu.nl</literal>
+    xlink:href="https://groups.google.com/forum/#!forum/nix-devel">nix-devel</literal>
     mailing list or on the <link
     xlink:href="irc://irc.freenode.net/#nixos">
     <literal>#nixos</literal> channel on Freenode</link>.  Bugs should

From ef95175ba30fd6b0e346f125e308529340e65c00 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 18 Jul 2017 07:54:36 -0400
Subject: [PATCH 0699/3246] manual: update mailing list links

---
 doc/languages-frameworks/haskell.md        | 6 +++---
 nixos/doc/manual/release-notes/rl-1509.xml | 2 +-
 nixos/doc/manual/release-notes/rl-1609.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 2ae3e39bb65..ce2889f744f 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -912,14 +912,14 @@ nix-build -A haskell.packages.integer-simple.ghc802.scientific
   - The *Journey into the Haskell NG infrastructure* series of postings
     describe the new Haskell infrastructure in great detail:
 
-      - [Part 1](http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015591.html)
+      - [Part 1](https://nixos.org/nix-dev/2015-January/015591.html)
         explains the differences between the old and the new code and gives
         instructions how to migrate to the new setup.
 
-      - [Part 2](http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015608.html)
+      - [Part 2](https://nixos.org/nix-dev/2015-January/015608.html)
         looks in-depth at how to tweak and configure your setup by means of
         overrides.
 
-      - [Part 3](http://lists.science.uu.nl/pipermail/nix-dev/2015-April/016912.html)
+      - [Part 3](https://nixos.org/nix-dev/2015-April/016912.html)
         describes the infrastructure that keeps the Haskell package set in Nixpkgs
         up-to-date.
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 967fbcf869d..6c1c46844cc 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -28,7 +28,7 @@ has the following highlights:</para>
     since version 0.0 as well as the most recent <link
     xlink:href="http://www.stackage.org/">Stackage Nightly</link>
     snapshot. The announcement <link
-    xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-September/018138.html">&quot;Full
+    xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">&quot;Full
     Stackage Support in Nixpkgs&quot;</link> gives additional
     details.</para>
   </listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index ade7d5581ce..3abafac9737 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -78,13 +78,13 @@ following incompatible changes:</para>
     our package set it loosely based on the latest available LTS release, i.e.
     LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will
     drop those old names entirely. <link
-    xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2016-June/020585.html">The
+    xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The
     motivation for this change</link> has been discussed at length on the
     <literal>nix-dev</literal> mailing list and in <link
     xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github issue
     #14897</link>. Development strategies for Haskell hackers who want to rely
     on Nix and NixOS have been described in <link
-    xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2016-June/020642.html">another
+    xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another
     nix-dev article</link>.</para>
   </listitem>
 

From ac55c6600b229a28cfc9767b9be5ace28d0b91fe Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 18 Jul 2017 19:57:11 +0800
Subject: [PATCH 0700/3246] qt5: 5.9.0 -> 5.9.1

---
 pkgs/development/libraries/qt-5/5.9/fetch.sh |   3 +-
 pkgs/development/libraries/qt-5/5.9/srcs.nix | 328 +++++++++----------
 2 files changed, 165 insertions(+), 166 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh
index 60acf2cea9d..2ae85bba391 100644
--- a/pkgs/development/libraries/qt-5/5.9/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh
@@ -1,3 +1,2 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/ \
-            http://download.qt.io/community_releases/5.9/5.9.0-final/ \
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \
             -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix
index 021cd935a14..247800b7578 100644
--- a/pkgs/development/libraries/qt-5/5.9/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix
@@ -3,331 +3,331 @@
 
 {
   qt3d = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qt3d-opensource-src-5.9.0.tar.xz";
-      sha256 = "1a8v70svsqxissj0rmna71f9g2w56w0zgk5s41m5acgvi9byzywy";
-      name = "qt3d-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz";
+      sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg";
+      name = "qt3d-opensource-src-5.9.1.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtactiveqt-opensource-src-5.9.0.tar.xz";
-      sha256 = "0d8n4q3r54kkb340ap802cc97jznhffzx1m7h2775q0h2nzvmiyp";
-      name = "qtactiveqt-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz";
+      sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg";
+      name = "qtactiveqt-opensource-src-5.9.1.tar.xz";
     };
   };
   qtandroidextras = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtandroidextras-opensource-src-5.9.0.tar.xz";
-      sha256 = "0xq3nd8nlbmd617lq60nb2lxblc84lk8wh14n18b3q81nsvc2yln";
-      name = "qtandroidextras-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz";
+      sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj";
+      name = "qtandroidextras-opensource-src-5.9.1.tar.xz";
     };
   };
   qtbase = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtbase-opensource-src-5.9.0.tar.xz";
-      sha256 = "0v19spxa4sfq0a35nab9n8n2s3jd0443px0k45zhhg103apv4zi6";
-      name = "qtbase-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz";
+      sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw";
+      name = "qtbase-opensource-src-5.9.1.tar.xz";
     };
   };
   qtcanvas3d = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtcanvas3d-opensource-src-5.9.0.tar.xz";
-      sha256 = "1jrv79rhpqyp4ip5fnf40plqcq9byl1fy8287ghq4jfhpm9bq5yq";
-      name = "qtcanvas3d-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz";
+      sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb";
+      name = "qtcanvas3d-opensource-src-5.9.1.tar.xz";
     };
   };
   qtcharts = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtcharts-opensource-src-5.9.0.tar.xz";
-      sha256 = "17m86csjymvcnprk8m4y6hx1qhlk9811rhqwwkqdymyyswx6xs3l";
-      name = "qtcharts-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz";
+      sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k";
+      name = "qtcharts-opensource-src-5.9.1.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtconnectivity-opensource-src-5.9.0.tar.xz";
-      sha256 = "0k52acsywr849nw86dfjqcv1lqgnq01akqrm0qjs7ysm1ayg8mcp";
-      name = "qtconnectivity-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz";
+      sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0";
+      name = "qtconnectivity-opensource-src-5.9.1.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdatavis3d-opensource-src-5.9.0.tar.xz";
-      sha256 = "1wvilla48jlw6zv2hc32ra0bs8p13s68sqbgr91bzbn7h7qaysv9";
-      name = "qtdatavis3d-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz";
+      sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13";
+      name = "qtdatavis3d-opensource-src-5.9.1.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdeclarative-opensource-src-5.9.0.tar.xz";
-      sha256 = "1g9yz7q2laqs80m4i6zngxrq3pd7z5khr2f48glma8cmiw4p56rw";
-      name = "qtdeclarative-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz";
+      sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj";
+      name = "qtdeclarative-opensource-src-5.9.1.tar.xz";
     };
   };
   qtdoc = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdoc-opensource-src-5.9.0.tar.xz";
-      sha256 = "1k67i67npcjyr89hlnljjxw5jkh49ql8yzw9m9b4gld7nk9dr4kr";
-      name = "qtdoc-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz";
+      sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x";
+      name = "qtdoc-opensource-src-5.9.1.tar.xz";
     };
   };
   qtgamepad = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtgamepad-opensource-src-5.9.0.tar.xz";
-      sha256 = "0lpj2qspidx6s2568m5v40j2zdnrl8zwjdp40zg4y2q6hy2gg597";
-      name = "qtgamepad-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz";
+      sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi";
+      name = "qtgamepad-opensource-src-5.9.1.tar.xz";
     };
   };
   qtgraphicaleffects = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtgraphicaleffects-opensource-src-5.9.0.tar.xz";
-      sha256 = "1cz4ykwlm1c0hbv4d8y07bwyz87nkz5l9ss3f65vadm8zcabqw55";
-      name = "qtgraphicaleffects-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz";
+      sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz";
+      name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz";
     };
   };
   qtimageformats = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtimageformats-opensource-src-5.9.0.tar.xz";
-      sha256 = "10alm3kz3md835hf5hx7322bak9pp9igi2knvymxsjqr8x87jq94";
-      name = "qtimageformats-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz";
+      sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr";
+      name = "qtimageformats-opensource-src-5.9.1.tar.xz";
     };
   };
   qtlocation = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtlocation-opensource-src-5.9.0.tar.xz";
-      sha256 = "1xia1y1pjill9m880rgmsl2zshcg1nvwkyfdb2lz8g8x9fj0pvp3";
-      name = "qtlocation-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz";
+      sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b";
+      name = "qtlocation-opensource-src-5.9.1.tar.xz";
     };
   };
   qtmacextras = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtmacextras-opensource-src-5.9.0.tar.xz";
-      sha256 = "1przk4dbyjdy18a5x1c4m04v40d70nkgwc569zjccpbqz0a0agbx";
-      name = "qtmacextras-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz";
+      sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11";
+      name = "qtmacextras-opensource-src-5.9.1.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtmultimedia-opensource-src-5.9.0.tar.xz";
-      sha256 = "1vk0vlp9wapj1pip5v0v0sxynlig38m3a1qbjhid3rm27f971cqb";
-      name = "qtmultimedia-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz";
+      sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4";
+      name = "qtmultimedia-opensource-src-5.9.1.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtnetworkauth-opensource-src-5.9.0.tar.xz";
-      sha256 = "157byylzir8cr5y407qpjmz9ag0b0qaz99n99nl2xjxkyll8ph0g";
-      name = "qtnetworkauth-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz";
+      sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra";
+      name = "qtnetworkauth-opensource-src-5.9.1.tar.xz";
     };
   };
   qtpurchasing = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtpurchasing-opensource-src-5.9.0.tar.xz";
-      sha256 = "0xcka24qjdydqhf7fhn2i2ycn3zsi4vzqv9s77wzmaksrazwb13q";
-      name = "qtpurchasing-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz";
+      sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss";
+      name = "qtpurchasing-opensource-src-5.9.1.tar.xz";
     };
   };
   qtquickcontrols = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtquickcontrols-opensource-src-5.9.0.tar.xz";
-      sha256 = "1zjl2wp5407y8iabwi30j4jpxh2j4y0ijb5jvvpdq583nbzgyg8p";
-      name = "qtquickcontrols-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz";
+      sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj";
+      name = "qtquickcontrols-opensource-src-5.9.1.tar.xz";
     };
   };
   qtquickcontrols2 = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtquickcontrols2-opensource-src-5.9.0.tar.xz";
-      sha256 = "170xgk4jw1b1rpq8838dc5sb0dyv1jap3yfgg5hymrjzrk0nzaq9";
-      name = "qtquickcontrols2-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz";
+      sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0";
+      name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtremoteobjects-opensource-src-5.9.0.tar.xz";
-      sha256 = "0f8dv7sswzck0l2md1zl44cbvi54mm6iiz4qh2hh3vqwyj9k5xyr";
-      name = "qtremoteobjects-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz";
+      sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0";
+      name = "qtremoteobjects-opensource-src-5.9.1.tar.xz";
     };
   };
   qtscript = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtscript-opensource-src-5.9.0.tar.xz";
-      sha256 = "0r697ap324l8lnbqbhrrqzsl9k4nmk6lcijxlaqn3ksxgfzbcciw";
-      name = "qtscript-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz";
+      sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp";
+      name = "qtscript-opensource-src-5.9.1.tar.xz";
     };
   };
   qtscxml = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtscxml-opensource-src-5.9.0.tar.xz";
-      sha256 = "0f2jnhl30ij6y4wzlvgjsqgpaywq4g0wc4yjw8s888vcfl062nb4";
-      name = "qtscxml-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz";
+      sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0";
+      name = "qtscxml-opensource-src-5.9.1.tar.xz";
     };
   };
   qtsensors = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtsensors-opensource-src-5.9.0.tar.xz";
-      sha256 = "0jdaw0i6rirs66x4cjh8l24fsyp020x1mv1psyf3ffbkdq1pngjx";
-      name = "qtsensors-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz";
+      sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was";
+      name = "qtsensors-opensource-src-5.9.1.tar.xz";
     };
   };
   qtserialbus = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtserialbus-opensource-src-5.9.0.tar.xz";
-      sha256 = "1zw32ha5hz7zsdp8m2dk58kivxd66vkzijbnhi8jvzjp4nf0pm1f";
-      name = "qtserialbus-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz";
+      sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa";
+      name = "qtserialbus-opensource-src-5.9.1.tar.xz";
     };
   };
   qtserialport = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtserialport-opensource-src-5.9.0.tar.xz";
-      sha256 = "0zwxfbyn5rg6vyrgpi5c3n852vd32m37ghzyj4l50ljndlz2w0l0";
-      name = "qtserialport-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz";
+      sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1";
+      name = "qtserialport-opensource-src-5.9.1.tar.xz";
     };
   };
   qtspeech = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtspeech-opensource-src-5.9.0.tar.xz";
-      sha256 = "0da7q3j49hn9j2wy0ny4ym4nxy33yi8p62v9vrq9r9lb4xqjipcl";
-      name = "qtspeech-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz";
+      sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c";
+      name = "qtspeech-opensource-src-5.9.1.tar.xz";
     };
   };
   qtsvg = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtsvg-opensource-src-5.9.0.tar.xz";
-      sha256 = "0zpy53vb0ckaj71ffl450qv9kipl8gwwcbbras8kbg6bpl8srl8g";
-      name = "qtsvg-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz";
+      sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr";
+      name = "qtsvg-opensource-src-5.9.1.tar.xz";
     };
   };
   qttools = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qttools-opensource-src-5.9.0.tar.xz";
-      sha256 = "1vl5lapnbaam51pfw89pshh6rxqwfrbpj0j8gdhzdngr6n79dzk4";
-      name = "qttools-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz";
+      sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4";
+      name = "qttools-opensource-src-5.9.1.tar.xz";
     };
   };
   qttranslations = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qttranslations-opensource-src-5.9.0.tar.xz";
-      sha256 = "0xsgvk8j7zl4infgmrkhdmjkizcihddqn9sc5g1dv2d94gc83jaw";
-      name = "qttranslations-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz";
+      sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja";
+      name = "qttranslations-opensource-src-5.9.1.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtvirtualkeyboard-opensource-src-5.9.0.tar.xz";
-      sha256 = "0xks7n70631p5ij7vbww5ihni6iscx9hkdw8c97nnzb1bvvaqx19";
-      name = "qtvirtualkeyboard-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz";
+      sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b";
+      name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz";
     };
   };
   qtwayland = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwayland-opensource-src-5.9.0.tar.xz";
-      sha256 = "0zlxlxrc15x69jwhcc6h0xi4mfchbb3pf27y3zy22yi3ynv2p04v";
-      name = "qtwayland-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz";
+      sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g";
+      name = "qtwayland-opensource-src-5.9.1.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebchannel-opensource-src-5.9.0.tar.xz";
-      sha256 = "1fg1g2h9s9v6lg10ix59pzws35fyh3hh5x2005pyp84xdg47mvqj";
-      name = "qtwebchannel-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz";
+      sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0";
+      name = "qtwebchannel-opensource-src-5.9.1.tar.xz";
     };
   };
   qtwebengine = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebengine-opensource-src-5.9.0.tar.xz";
-      sha256 = "085qq852kwb8rqw12w96647vfvsgqvw33wc4xn3cb2gwn1wsbm1f";
-      name = "qtwebengine-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz";
+      sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn";
+      name = "qtwebengine-opensource-src-5.9.1.tar.xz";
     };
   };
   qtwebkit = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz";
-      sha256 = "012fd8khiasfn8wx5ci310y94ap3y90a011f66cajm80fhxikbcd";
-      name = "qtwebkit-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz";
+      sha256 = "1ksjn1vjbfhdm4y4rg08ag4krk87ahp7qcdcpwll42l0rnz61998";
+      name = "qtwebkit-opensource-src-5.9.1.tar.xz";
     };
   };
   qtwebkit-examples = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/community_releases/5.9/5.9.0-final/qtwebkit-examples-opensource-src-5.9.0.tar.xz";
-      sha256 = "0zj700z90k4sss1b5zg4rlg5pkq79q72pql1d6zglrgp505s9a7x";
-      name = "qtwebkit-examples-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz";
+      sha256 = "1l2l7ycgqql6rf4gx6sjhsqjapdhvy6vxaxssax3l938nkk4vkp4";
+      name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebsockets-opensource-src-5.9.0.tar.xz";
-      sha256 = "1ml60p50hr3f68l0fiyqg2pf6n37flzxafzasis42jm4m757m5v2";
-      name = "qtwebsockets-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz";
+      sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1";
+      name = "qtwebsockets-opensource-src-5.9.1.tar.xz";
     };
   };
   qtwebview = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebview-opensource-src-5.9.0.tar.xz";
-      sha256 = "0ayjsdyymg9hrryn2y0c796cbwdf4hdpjdwjqkib57rblh5g39qw";
-      name = "qtwebview-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz";
+      sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn";
+      name = "qtwebview-opensource-src-5.9.1.tar.xz";
     };
   };
   qtwinextras = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwinextras-opensource-src-5.9.0.tar.xz";
-      sha256 = "12xh6wqjn1wmvy7rzay6a0wyc31lgv1zida87kr67dbwblmax03j";
-      name = "qtwinextras-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz";
+      sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s";
+      name = "qtwinextras-opensource-src-5.9.1.tar.xz";
     };
   };
   qtx11extras = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtx11extras-opensource-src-5.9.0.tar.xz";
-      sha256 = "0smzs29zqi77s1038ddkj3wzcchajqrjymwa5jgva7n2dn2x40wy";
-      name = "qtx11extras-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz";
+      sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6";
+      name = "qtx11extras-opensource-src-5.9.1.tar.xz";
     };
   };
   qtxmlpatterns = {
-    version = "5.9.0";
+    version = "5.9.1";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtxmlpatterns-opensource-src-5.9.0.tar.xz";
-      sha256 = "1f2mly7ddw4hpr3x0lpdahcikivwhiwa3238yrg4gz2c3lxj5y21";
-      name = "qtxmlpatterns-opensource-src-5.9.0.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz";
+      sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m";
+      name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz";
     };
   };
 }

From 9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 18 Jul 2017 20:51:56 +0800
Subject: [PATCH 0701/3246] handbrake: remove leftover file

---
 .../handbrake/handbrake-0.10.3-nolibav.patch  | 76 -------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch

diff --git a/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch b/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch
deleted file mode 100644
index 8539186aaa5..00000000000
--- a/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins.hb@gmail.com>
-Date: Tue, 3 Nov 2015 10:16:01 -0800
-Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling
-
----
-diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
-index 0d70597..373c2ab 100644
---- a/libhb/muxavformat.c
-+++ b/libhb/muxavformat.c
-@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m )
-     hb_mux_data_t * track;
-     int meta_mux;
-     int max_tracks;
--    int ii, ret;
-+    int ii, jj, ret;
- 
-     int clock_min, clock_max, clock;
-     hb_video_framerate_get_limits(&clock_min, &clock_max, &clock);
-@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m )
-         }
-     }
- 
-+    // Check for audio track associations
-+    for (ii = 0; ii < hb_list_count(job->list_audio); ii++)
-+    {
-+        audio = hb_list_item(job->list_audio, ii);
-+        switch (audio->config.out.codec & HB_ACODEC_MASK)
-+        {
-+            case HB_ACODEC_FFAAC:
-+            case HB_ACODEC_CA_AAC:
-+            case HB_ACODEC_CA_HAAC:
-+            case HB_ACODEC_FDK_AAC:
-+            case HB_ACODEC_FDK_HAAC:
-+                break;
-+
-+            default:
-+            {
-+                // Mark associated fallback audio tracks for any non-aac track
-+                for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ )
-+                {
-+                    hb_audio_t    * fallback;
-+                    int             codec;
-+
-+                    if (ii == jj) continue;
-+
-+                    fallback = hb_list_item( job->list_audio, jj );
-+                    codec = fallback->config.out.codec & HB_ACODEC_MASK;
-+                    if (fallback->config.in.track == audio->config.in.track &&
-+                        (codec == HB_ACODEC_FFAAC ||
-+                         codec == HB_ACODEC_CA_AAC ||
-+                         codec == HB_ACODEC_CA_HAAC ||
-+                         codec == HB_ACODEC_FDK_AAC ||
-+                         codec == HB_ACODEC_FDK_HAAC))
-+                    {
-+                        hb_mux_data_t * fallback_track;
-+                        int           * sd;
-+
-+                        track = audio->priv.mux_data;
-+                        fallback_track = fallback->priv.mux_data;
-+                        sd = (int*)av_stream_new_side_data(track->st,
-+                                                     AV_PKT_DATA_FALLBACK_TRACK,
-+                                                     sizeof(int));
-+                        if (sd != NULL)
-+                        {
-+                            *sd = fallback_track->st->index;
-+                        }
-+                    }
-+                }
-+            } break;
-+        }
-+    }
-+
-     char * subidx_fmt =
-         "size: %dx%d\n"
-         "org: %d, %d\n"

From dbe79a7d207b29c35a382a73ffa125fe2ca42d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 18 Jul 2017 15:14:56 +0200
Subject: [PATCH 0702/3246] hid-listen: change platforms to linux only

package fails to build on darwin, it doesn't seem clang compatible
and hardcodes certain framework paths
---
 pkgs/tools/misc/hid-listen/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/tools/misc/hid-listen/default.nix
index 916a6afa66b..0ebad4f7117 100644
--- a/pkgs/tools/misc/hid-listen/default.nix
+++ b/pkgs/tools/misc/hid-listen/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.pjrc.com/teensy/hid_listen.html;
     license = licenses.gpl3;
     maintainers = with maintainers; [ tomsmeets ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }

From 476fc5f26edab46a22d6a2a07e56fc14ea5b61ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Jul 2017 16:50:20 +0200
Subject: [PATCH 0703/3246] haskell-cautious-file: jailbreak to fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2833d5c4b87..63b7c765bad 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -274,7 +274,6 @@ self: super: {
   cabal-bounds = dontCheck super.cabal-bounds;          # http://hydra.cryp.to/build/496935/nixlog/1/raw
   cabal-meta = dontCheck super.cabal-meta;              # http://hydra.cryp.to/build/497892/log/raw
   camfort = dontCheck super.camfort;
-  cautious-file = dontCheck super.cautious-file;        # http://hydra.cryp.to/build/499730/log/raw
   cjk = dontCheck super.cjk;
   CLI = dontCheck super.CLI;                            # Upstream has no issue tracker.
   command-qq = dontCheck super.command-qq;              # http://hydra.cryp.to/build/499042/log/raw
@@ -876,4 +875,7 @@ self: super: {
   # Needs a newer version of hsyslog than lts-8.x provides.
   logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5_0_1; };
 
+  # Has a dependency on outdated versions of directory.
+  cautious-file = doJailbreak (dontCheck super.cautious-file);
+
 }

From 496dac571ce9c93c2a73bb4c61d10f36aa727715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 18 Jul 2017 17:15:00 +0200
Subject: [PATCH 0704/3246] racer[d]: fix RUST_SRC_PATH

`rustc.src` is a `tar.gz` archive, but we need it unpacked.
---
 pkgs/development/tools/rust/racer/default.nix  | 2 +-
 pkgs/development/tools/rust/racerd/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index d1cb4a8cd2e..b79d7e0670d 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   installPhase = ''
     mkdir -p $out/bin
     cp -p target/release/racer $out/bin/
-    wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rust.rustc.src}/src"
+    wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rustcSrc}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index 7aaa62fef59..166e3320d9c 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -18,7 +18,7 @@ buildRustPackage rec {
 
   buildInputs = [ makeWrapper ];
 
-  RUST_SRC_PATH = ''${rustPlatform.rust.rustc.src}/src'';
+  RUST_SRC_PATH = rustPlatform.rustcSrc;
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0978c71570..7910370e259 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5896,6 +5896,14 @@ with pkgs;
       buildRustPackage = callPackage ../build-support/rust {
         inherit rust;
       };
+
+      rustcSrc = stdenv.mkDerivation {
+        name = "rust-src";
+        src = rust.rustc.src;
+        phases = ["unpackPhase" "installPhase"];
+        installPhase = "mv src $out";
+      };
+
     });
 
   rainicorn = callPackage ../development/tools/rust/rainicorn { };

From 119a0fe53c66ef56cf3cb3e581fb404dfca3f51d Mon Sep 17 00:00:00 2001
From: Etienne Laurin <etienne@atnnn.com>
Date: Tue, 18 Jul 2017 15:42:14 +0000
Subject: [PATCH 0705/3246] RethinkDB 2.3.5 -> 2.3.6

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

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 5e22cb11882..cc82e75a615 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-${version}";
-  version = "2.3.5";
+  version = "2.3.6";
 
   src = fetchurl {
     url = "https://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "047fz3r0rn95mqr5p1xfdprf0hq4avq2a1q8zsdifxxid7hyx2nx";
+    sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4";
   };
 
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''

From 75d53270cbf4f0e33f239782cc37b00de3752d3e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 18 Jul 2017 05:23:04 +0200
Subject: [PATCH 0706/3246] gitAndTools.diff-so-fancy: 0.11.4 -> 1.1.0

---
 .../git-and-tools/diff-so-fancy/default.nix                | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 3b1837d16f1..b613898faaa 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "diff-so-fancy-${version}";
-  version = "0.11.4";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "so-fancy";
     repo = "diff-so-fancy";
     rev = "v${version}";
-    sha256 = "1za2rm8jzcdc6bkpl198nrqf5bc05nw53vlkk15nmmb9snnb69ig";
+    sha256 = "0wd9npcfp41ggvddrbif8qr25pm7jlzxzd3xn5rlq0y0frwx5akj";
   };
 
   # Perl is needed here for patchShebangs
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     # itself, so we are copying executable to lib, and only symlink it
     # from bin/
     cp diff-so-fancy $out/lib/diff-so-fancy
-    cp -r libexec $out/lib/diff-so-fancy
+    cp -r lib $out/lib/diff-so-fancy
     ln -s $out/lib/diff-so-fancy/diff-so-fancy $out/bin
 
     # ncurses is needed for `tput`
@@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
       diff-so-fancy builds on the good-lookin' output of git contrib's
       diff-highlight to upgrade your diffs' appearances.
     '';
+    maintainers = with maintainers; [ fpletz ];
   };
 }

From 1cf410053937e6281d8c174e6abb9ddd7f2880ca Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Jul 2017 15:18:28 +0200
Subject: [PATCH 0707/3246] lucenepp: 3.0.6 -> 3.0.7

---
 .../libraries/lucene++/default.nix            | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix
index 9f9b6aa4482..b4ec850b491 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/pkgs/development/libraries/lucene++/default.nix
@@ -2,33 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "lucene++-${version}";
-  version = "3.0.6";
+  version = "3.0.7";
 
   src = fetchurl {
     url = "https://github.com/luceneplusplus/LucenePlusPlus/"
         + "archive/rel_${version}.tar.gz";
-    sha256 = "068msvh05gsbfj1wwdqj698kxxfjdqy8zb6pqvail3ayjfj94w1y";
+    sha256 = "032yb35b381ifm7wb8cy2m3yndklnxyi5cgprjh48jqy641z46bc";
   };
 
-  patches = let
-    baseurl = "https://github.com/luceneplusplus/LucenePlusPlus";
-  in [
-    (fetchpatch {
-      url = "${baseurl}/pull/62.diff";
-      sha256 = "0v314877mjb0hljg4mcqi317m1p1v27rgsgf5wdr9swix43vmhgw";
-    })
-    (fetchpatch {
-      url = "${baseurl}/commit/994f03cf736229044a168835ae7387696041658f.diff";
-      sha256 = "0fcm5b87nxw062wjd7b4qrfcwsyblmcw19s64004pklj9grk30zz";
-    })
-  ];
-
   postPatch = ''
     sed -i -e '/Subversion *REQUIRED/d' \
            -e '/include.*CMakeExternal/d' \
            CMakeLists.txt
-    # not using -f because we want it to fail for the next release
-    rm CMakeExternal.txt
   '';
 
   cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ];

From cb2344829fc0b34c6f2dcfb905cd7a582a4a553f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 18 Jul 2017 18:01:48 +0200
Subject: [PATCH 0708/3246] graphicsmagick: 1.3.25 -> 1.3.26

---
 .../graphicsmagick/cmyka-bounds.patch         | 36 -------------------
 .../graphics/graphicsmagick/default.nix       | 33 ++---------------
 2 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch

diff --git a/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch b/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch
deleted file mode 100644
index dd375143277..00000000000
--- a/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# HG changeset patch
-# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
-# Date 1487905610 21600
-# Node ID 6156b4c2992d855ece6079653b3b93c3229fc4b8
-# Parent  0392c4305a4369984ec8069055acc470c0a73647
-Fix out of bounds access when reading CMYKA tiff which claims wrong samples/pixel.
-
-diff -r 0392c4305a43 -r 6156b4c2992d coders/tiff.c
---- a/coders/tiff.c	Sun Jan 29 10:04:57 2017 -0600
-+++ b/coders/tiff.c	Thu Feb 23 21:06:50 2017 -0600
-@@ -1230,8 +1230,8 @@
-                   case 0:
-                     if (samples_per_pixel == 1)
-                       *quantum_type=GrayQuantum;
--                      else
--                        *quantum_type=RedQuantum;
-+                    else
-+                      *quantum_type=RedQuantum;
-                     break;
-                   case 1:
-                     *quantum_type=GreenQuantum;
-@@ -1411,12 +1411,12 @@
-               }
-             else
-               {
--                if (image->matte)
-+                if (image->matte && samples_per_pixel >= 5)
-                   {
-                     *quantum_type=CMYKAQuantum;
-                     *quantum_samples=5;
-                   }
--                else
-+                else if (samples_per_pixel >= 4)
-                   {
-                     *quantum_type=CMYKQuantum;
-                     *quantum_samples=4;
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 0858dfba8b4..c8c9ac8f26e 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,47 +2,18 @@
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
-let version = "1.3.25"; in
+let version = "1.3.26"; in
 
 stdenv.mkDerivation {
   name = "graphicsmagick-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn";
+    sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v";
   };
 
   patches = [
     ./disable-popen.patch
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7996_CVE-2016-7997.patch";
-      sha256 = "0xsby2z8n7cnnln7szjznq7iaabq323wymvdjra59yb41aix74r2";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part1.patch";
-      sha256 = "02s0x9bkbnm5wrd0d2x9ld4d9z5xqpfk310lyylyr5zlnhqxmwgn";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part2.patch";
-      sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8682.patch";
-      sha256 = "1wfirw2yi5y72657kvnbgjs0f9b3rs9nvk8gjbwhb9a03z9ws0y5";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8683.patch";
-      sha256 = "102252zb34nj6alk1nhh1wbn3apd2v9rzk7clmm237332yj72vif";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch";
-      sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch";
-      sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa";
-    })
-    ./cmyka-bounds.patch
   ];
 
   configureFlags = [

From e7abb9b8ecc038caf5a9a254f26bb564707fb28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Tue, 18 Jul 2017 18:11:36 +0200
Subject: [PATCH 0709/3246] python-gnupg: 0.4.0 -> 0.4.1 and enable tests

---
 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 c4025e2c2ad..ad3fe27fc32 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -517,11 +517,11 @@ in {
 
   python-gnupg = buildPythonPackage rec {
     name    = "python-gnupg-${version}";
-    version = "0.4.0";
+    version = "0.4.1";
 
     src = pkgs.fetchurl {
       url    = "mirror://pypi/p/python-gnupg/${name}.tar.gz";
-      sha256 = "1yd88acafs9nwk6gzpbxjzpx0zd04qrvc6hmwhj1i89ghm2g7ap6";
+      sha256 = "06hfw9cmiw5306fyisp3kzg1hww260qzip829g7y7pj1mwpb0izg";
     };
 
     propagatedBuildInputs = [ pkgs.gnupg1 ];
@@ -530,10 +530,10 @@ in {
     patchPhase = ''
       substituteInPlace gnupg.py \
         --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'"
+      substituteInPlace test_gnupg.py \
+        --replace "gpgbinary=GPGBINARY" "gpgbinary='${pkgs.gnupg1}/bin/gpg'"
     '';
 
-    doCheck = false;
-
     meta = {
       description = "A wrapper for the Gnu Privacy Guard";
       homepage    = "https://pypi.python.org/pypi/python-gnupg";

From adb178c0e5e7fea2bd2bfa8def7d4bd1d841b327 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 18 Jul 2017 18:43:47 +0200
Subject: [PATCH 0710/3246] gnomeExtensions.topicons-plus: fix version string

It has to start with a digit.
---
 pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
index 4612c35ad25..4aedc10e056 100644
--- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-topicons-plus-${version}";
-  version = "v20";
+  version = "20";
 
   src = fetchFromGitHub {
     owner = "phocean";

From 3e502bc73a9356759a9cd01328a1e269c1e35c70 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 19 Jul 2017 03:12:30 +0900
Subject: [PATCH 0711/3246] oraclejdk: 8u131 -> 8u141

---
 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 1c761d58603..bc556bdfcad 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 = "131";
+  patchVersion = "141";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80";
-  sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2";
+  sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5";
+  sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784";
   sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 1c761d58603..bc556bdfcad 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 = "131";
+  patchVersion = "141";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80";
-  sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2";
+  sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5";
+  sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784";
   sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;

From 8dccc9b6993e2a9c8098dfcf9e38b0483241188c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 18 Jul 2017 20:20:49 +0200
Subject: [PATCH 0712/3246] eclipse-plugin-checkstyle: 7.3.0 -> 8.0.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 0f6d00ab40c..c0c96d9e1a4 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -194,12 +194,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "7.3.0.201612142232";
+    version = "8.0.0.201707161819";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.3.0/net.sf.eclipsecs-updatesite_${version}.zip";
-      sha256 = "1mbiszwnakfmjx5mnh9h2rrp9jzizkmz89p8z4spq2m9kwy1lkqj";
+      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.0.0/net.sf.eclipsecs-updatesite_${version}.zip";
+      sha256 = "1p07xcf71qc99sh73vqm9xxxgi819m58frv0cpvsn06y6ljr0aj2";
     };
 
     meta = with stdenv.lib; {

From 65b1613456bccb84a05e3426fcadb9d3f6355898 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 18 Jul 2017 09:51:49 +0200
Subject: [PATCH 0713/3246] frama-c: 20161101 (Silicon) -> 20170501
 (Phosphorus)

---
 .../tools/analysis/frama-c/default.nix        | 11 +++++-----
 .../tools/analysis/frama-c/dynamic.diff       | 20 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index ee36a9be43b..1ce0ca16153 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz
-, ltl2ba, coq, alt-ergo, why3 }:
+, ltl2ba, coq, alt-ergo, why3, autoconf
+}:
 
 let
   mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
@@ -8,12 +9,12 @@ in
 
 stdenv.mkDerivation rec {
   name    = "frama-c-${version}";
-  version = "20161101";
-  slang   = "Silicon";
+  version = "20170501";
+  slang   = "Phosphorus";
 
   src = fetchurl {
     url    = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
-    sha256 = "1qq045ymz1mx4m9dsypigrcagqyb2k78wk13nqlbykcs5xbihfdh";
+    sha256 = "16bccacms3n4rfpsxdxpdf24bk0hwrnzdpa2pbr6s847li73hkv1";
   };
 
   why2 = fetchurl {
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ autoconf makeWrapper ];
 
   buildInputs = with ocamlPackages; [
     ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph
diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff
index 7ab2b32de1e..737cad0cda4 100644
--- a/pkgs/development/tools/analysis/frama-c/dynamic.diff
+++ b/pkgs/development/tools/analysis/frama-c/dynamic.diff
@@ -1,12 +1,12 @@
 --- a/src/kernel_services/plugin_entry_points/dynamic.ml	2016-05-30 16:15:22.000000000 +0200
 +++ b/src/kernel_services/plugin_entry_points/dynamic.ml	2016-10-13 18:25:31.000000000 +0200
-@@ -287,7 +287,8 @@
-         (List.fold_right (add_dir ~user:false) Config.plugin_dir []) ;
-     let pkgs = ref [] in
-     List.iter (scan_directory pkgs) !load_path ;
--    let findlib_path = String.concat ":" !load_path in
-+    let findlib_path = String.concat ":" (!load_path @
-+      try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in
-     Klog.debug ~dkey "setting findlib path to %s" findlib_path;
-     Findlib.init ~env_ocamlpath:findlib_path ();
-     load_packages (List.rev !pkgs) ;
+@@ -270,7 +270,8 @@
+   load_path :=
+     List.fold_right (add_dir ~user:true) path
+       (List.fold_right (add_dir ~user:false) Config.plugin_dir []);
+-  let findlib_path = String.concat ":" !load_path in
++  let findlib_path = String.concat ":" (!load_path @
++    try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in
+   Klog.debug ~dkey "setting findlib path to %s" findlib_path;
+   Findlib.init ~env_ocamlpath:findlib_path ()
+ 

From ccf7b4b57e115eb59857d9cb847e7dfa7a90bf60 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 18 Jul 2017 12:10:29 -0700
Subject: [PATCH 0714/3246] wine-mono: 4.6.4 -> 4.7.0

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 9557c54d456..da0f39ac37e 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -24,9 +24,9 @@ in rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "4.6.4";
+      version = "4.7.0";
       url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
-      sha256 = "0lj1rhp9s8aaxd6764mfvnyswwalafaanz80vxg3badrfy0xbdwi";
+      sha256 = "18d5djnsb70740xs475jg1xsjsrq6zzjv0dmjq3vi7nbv56lg63n";
     };
   };
 

From 3c9897431ba199992b674d4d70295b57962232d2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 18 Jul 2017 18:17:25 +0300
Subject: [PATCH 0715/3246] afl: 2.44b -> 2.48b

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

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 92fd6cd1be0..4c3dfe4d07c 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "2.44b";
+  version = "2.48b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "0wvx4ibr5hhav9mld1gncdvfzb4iky85gam3x8a43ispjddyya6m";
+    sha256 = "00x7p8lqrpx60hwynl5dqwn6isr8yhl263avcwfw3dqc7v9lwhrz";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup

From c71233f12cb976b259e88ee4300687df26e5377d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 18 Jul 2017 21:32:13 +0200
Subject: [PATCH 0716/3246] broadcom_sta: Add patch for supporting Linux 4.12

The patch is from Arch Linux at:

https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl

Tested this by building against the following attributes:

  * linuxPackages.broadcom_sta
  * linuxPackages_latest.broadcom_sta
  * pkgsI686Linux.linuxPackages.broadcom_sta
  * pkgsI686Linux.linuxPackages_latest.broadcom_sta

I have not tested whether this works at runtime, because I do not posess
the hardware.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../linux/broadcom-sta/default.nix            |  2 +
 .../linux/broadcom-sta/linux-4.12.patch       | 68 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 2723e662b79..3143968d75c 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation {
     ./linux-4.8.patch
     # source: https://aur.archlinux.org/cgit/aur.git/tree/linux411.patch?h=broadcom-wl
     ./linux-4.11.patch
+    # source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl
+    ./linux-4.12.patch
     ./null-pointer-fix.patch
     ./gcc.patch
   ];
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch
new file mode 100644
index 00000000000..8abc73db4db
--- /dev/null
+++ b/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch
@@ -0,0 +1,68 @@
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index da36405..d3741eb 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR;
+ #endif
+ 
+ static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++           enum nl80211_iftype type, struct vif_params *params);
++#else
+            enum nl80211_iftype type, u32 *flags, struct vif_params *params);
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+ static s32
+ wl_cfg80211_scan(struct wiphy *wiphy,
+@@ -466,7 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ 
+ static s32
+ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++                         enum nl80211_iftype type,
++#else
+                          enum nl80211_iftype type, u32 *flags,
++#endif
+    struct vif_params *params)
+ {
+ 	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
+@@ -2361,6 +2369,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+                     const wl_event_msg_t *e, void *data)
+ {
+ 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++	struct cfg80211_bss *bss;
++	struct wlc_ssid *ssid;
++	ssid = &wl->profile->ssid;
++	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
++	ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
++	struct cfg80211_roam_info roam_info = {
++		.bss = bss,
++		.req_ie = conn_info->req_ie,
++		.req_ie_len = conn_info->req_ie_len,
++		.resp_ie = conn_info->resp_ie,
++		.resp_ie_len = conn_info->resp_ie_len,
++	};
++#endif
+ 	s32 err = 0;
+ 
+ 	wl_get_assoc_ies(wl);
+@@ -2368,12 +2390,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 	wl_update_bss_info(wl);
+ 	cfg80211_roamed(ndev,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++			&roam_info,
++#else
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)
+ 			&wl->conf->channel,	 
+ #endif
+ 			(u8 *)&wl->bssid,
+ 			conn_info->req_ie, conn_info->req_ie_len,
+-			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
++			conn_info->resp_ie, conn_info->resp_ie_len,
++#endif
++			GFP_KERNEL);
+ 	WL_DBG(("Report roaming result\n"));
+ 
+ 	set_bit(WL_STATUS_CONNECTED, &wl->status);

From 7c6b42a28c91a8480fa0aa5b8675080e3b401aa0 Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stesie@brokenpipe.de>
Date: Tue, 18 Jul 2017 21:09:36 +0200
Subject: [PATCH 0717/3246] keepass: 2.35 -> 2.36

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

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 57f6cfc4c4b..e36fbfa0f3f 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -8,11 +8,11 @@
 # plugin derivations in the Nix store and nowhere else.
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.35";
+  version = "2.36";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "1pv3x1lr2kymjpm6z26fqx997jivzy0diqsysq4diygj38wdkajz";
+    sha256 = "1j6qhy8h3z6higbpq3q9v04amvgbn90yj3kbsvj17azdkffkwzny";
   };
 
   sourceRoot = ".";

From 11bbd17015376addc1453de5ef4f0839a22e7941 Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stesie@brokenpipe.de>
Date: Tue, 18 Jul 2017 21:10:36 +0200
Subject: [PATCH 0718/3246] keepass-keepasshttp: 1.8.4.1 -> 1.8.4.2

---
 .../misc/keepass-plugins/keepasshttp/default.nix         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
index 5e43486b075..e64632d529b 100644
--- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
@@ -1,14 +1,17 @@
 { stdenv, buildEnv, fetchFromGitHub, mono }:
 
 let
-  version = "1.8.4.1";
+  version = "1.8.4.2";
   drv = stdenv.mkDerivation {
     name = "keepasshttp-${version}";
     src = fetchFromGitHub {
       owner = "pfn";
       repo = "keepasshttp";
-      rev = "${version}";
-      sha256 = "1074yv0pmzdwfwkx9fh7n2igdqwsyxypv55khkyng6synbv2p2fd";
+      #rev = "${version}";
+      # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff
+      # afterwards and didn't move the tag), hence reference by commitid
+      rev = "c2c4eb5388a02169400cba7a67be325caabdcc37";
+      sha256 = "0bkzxggbqx7sql3sp46bqham6r457in0vrgh3ai3lw2jrw79pwmh";
     };
 
     meta = {

From db163cdc3bd97000a7c01fcb6b08d7a52fab1eaf Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Tue, 18 Jul 2017 12:22:53 -0700
Subject: [PATCH 0719/3246] terminal-notifier: add shebang line to wrapper

Add shebang line to terminal-notifier to wrapper script. Without this line, the
script fails with "Exec format error" when called outside a shell (e.g. from
the Emacs alert package).
---
 pkgs/applications/misc/terminal-notifier/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index d9046c55e12..47cea34d4a5 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp -r terminal-notifier.app $out/Applications
     cat >$out/bin/terminal-notifier <<EOF
+    #!${stdenv.shell}
     cd $out/Applications/terminal-notifier.app
     exec ./Contents/MacOS/terminal-notifier "\$@"
     EOF

From 0d9a0efc8880219da5abadfe2ba09c5e0ddec6d6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 18 Jul 2017 22:27:47 +0200
Subject: [PATCH 0720/3246] slop: 6.3.41 -> 6.3.46

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

diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index b668b7af0d4..29a4dae9f74 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchFromGitHub, cmake
-, glm, mesa, gengetopt, libX11, libXext, libXrender, cppcheck}:
+, glm, mesa, libX11, libXext, libXrender, cppcheck, icu}:
 
 stdenv.mkDerivation rec {
   name = "slop-${version}";
-  version = "6.3.41";
+  version = "6.3.46";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "slop";
     rev = "v${version}";
-    sha256 = "051w2hcpz4qmvy7bmnzv7llxr2jbcpfxdadlzr2cidr323cann27";
+    sha256 = "0k4i0s0rk82la9ac173whrjgrlw9977b2dgp34czi3knlkz9ynsg";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ glm mesa gengetopt libX11 libXext libXrender ]
+  buildInputs = [ glm mesa libX11 libXext libXrender icu ]
                 ++ stdenv.lib.optional doCheck cppcheck;
 
   doCheck = false;

From fe05e165f7ceae8ee26b1dc79d6d07145f84d9b6 Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stesie@brokenpipe.de>
Date: Tue, 18 Jul 2017 21:25:15 +0200
Subject: [PATCH 0721/3246] tomboy: 1.15.7 -> 1.15.9

---
 pkgs/applications/misc/tomboy/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix
index 5d03989a39e..4464ab6a608 100644
--- a/pkgs/applications/misc/tomboy/default.nix
+++ b/pkgs/applications/misc/tomboy/default.nix
@@ -4,7 +4,7 @@
 , makeWrapper, lib}:
 
 let
-  version = "1.15.7";
+  version = "1.15.9";
 in
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz";
-    sha256 = "1i6sv6w2ms2x0nkgxq11agljiyg0yl4x2rzmcyvs2hxyf574hd1y";
+    sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q";
   };
 
   buildInputs = [ itstool intltool pkgconfig
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7910370e259..364ce1b381c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19129,7 +19129,9 @@ with pkgs;
 
   tomb = callPackage ../os-specific/linux/tomb {};
 
-  tomboy = callPackage ../applications/misc/tomboy {};
+  tomboy = callPackage ../applications/misc/tomboy {
+    mono = mono46;
+  };
 
   imatix_gsl = callPackage ../development/tools/imatix_gsl {};
 

From 99499a5e7653dce3fec3ccb619888e54b41276ff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 18 Jul 2017 23:33:10 +0200
Subject: [PATCH 0722/3246] mitmproxy: use fetchpatch for patch retrieval

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

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 715bc209e97..fc496b416ff 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, python3Packages }:
+{ stdenv, fetchpatch, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   baseName = "mitmproxy";
@@ -15,9 +15,9 @@ python3Packages.buildPythonPackage rec {
   patches = [
     # Bump pyopenssl dependency
     # https://github.com/mitmproxy/mitmproxy/pull/2252
-    (fetchurl {
+    (fetchpatch {
       url = "https://patch-diff.githubusercontent.com/raw/mitmproxy/mitmproxy/pull/2252.patch";
-      sha256 = "0s3a6lf0wjnxi1r70qlhh0siaxhk5j2cysnv4xfkji3f2v7hhri4";
+      sha256 = "1smld21df79249qbh412w8gi2agcf4zjhxnlawy19yjl1fk2h67c";
     })
   ];
 

From 37d87343bff111152aad2a5f486c581939d37a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 18 Jul 2017 22:37:56 +0100
Subject: [PATCH 0723/3246] python-gnupg: move out of python-packages

---
 .../python-modules/python-gnupg/default.nix   | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +----------------
 2 files changed, 31 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/python-gnupg/default.nix

diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix
new file mode 100644
index 00000000000..28870d3db85
--- /dev/null
+++ b/pkgs/development/python-modules/python-gnupg/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi, gnupg1 }:
+
+buildPythonPackage rec {
+  name    = "${pname}-${version}";
+  pname   = "python-gnupg";
+  version = "0.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06hfw9cmiw5306fyisp3kzg1hww260qzip829g7y7pj1mwpb0izg";
+  };
+
+  propagatedBuildInputs = [ gnupg1 ];
+
+  # Let's make the library default to our gpg binary
+  patchPhase = ''
+    substituteInPlace gnupg.py \
+    --replace "gpgbinary='gpg'" "gpgbinary='${gnupg1}/bin/gpg'"
+    substituteInPlace test_gnupg.py \
+    --replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg1}/bin/gpg'"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A wrapper for the Gnu Privacy Guard";
+    homepage    = https://pypi.python.org/pypi/python-gnupg;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ copumpkin ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad3fe27fc32..eceb3f2ac3f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -515,33 +515,7 @@ in {
     };
   };
 
-  python-gnupg = buildPythonPackage rec {
-    name    = "python-gnupg-${version}";
-    version = "0.4.1";
-
-    src = pkgs.fetchurl {
-      url    = "mirror://pypi/p/python-gnupg/${name}.tar.gz";
-      sha256 = "06hfw9cmiw5306fyisp3kzg1hww260qzip829g7y7pj1mwpb0izg";
-    };
-
-    propagatedBuildInputs = [ pkgs.gnupg1 ];
-
-    # Let's make the library default to our gpg binary
-    patchPhase = ''
-      substituteInPlace gnupg.py \
-        --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'"
-      substituteInPlace test_gnupg.py \
-        --replace "gpgbinary=GPGBINARY" "gpgbinary='${pkgs.gnupg1}/bin/gpg'"
-    '';
-
-    meta = {
-      description = "A wrapper for the Gnu Privacy Guard";
-      homepage    = "https://pypi.python.org/pypi/python-gnupg";
-      license     = licenses.bsd3;
-      maintainers = with maintainers; [ copumpkin ];
-      platforms   = platforms.unix;
-    };
-  };
+  python-gnupg = callPackage ../development/python-modules/python-gnupg {};
 
   python-uinput = buildPythonPackage rec {
     name = "python-uinput-${version}";

From d7103eadc8bd1e9e66fc6cf0ff3d739a9e73ec32 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 18 Jul 2017 10:20:34 +0200
Subject: [PATCH 0724/3246] boolector: 1.{5,6} -> 2.4.1

---
 .../science/logic/boolector/default.nix       | 47 +++++--------------
 pkgs/top-level/all-packages.nix               |  6 +--
 2 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix
index 37d25c9e947..2b40995b743 100644
--- a/pkgs/applications/science/logic/boolector/default.nix
+++ b/pkgs/applications/science/logic/boolector/default.nix
@@ -1,48 +1,23 @@
-{ stdenv, fetchurl, zlib, useV16 ? false }:
+{ stdenv, fetchurl }:
 
-let
-  v15 = rec {
-    name    = "boolector-${version}";
-    version = "1.5.118";
-    src = fetchurl {
-      url    = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz";
-      sha256 = "17j7q02rryvfwgvglxnhx0kv8hxwy8wbhzawn48lw05i98vxlmk9";
-    };
+stdenv.mkDerivation rec {
+  name    = "boolector-${version}";
+  version = "2.4.1";
+  src = fetchurl {
+    url    = "http://fmv.jku.at/boolector/boolector-${version}-with-lingeling-bbc.tar.bz2";
+    sha256 = "0mdf7hwix237pvknvrpazcx6s3ininj5k7vhysqjqgxa7lxgq045";
   };
 
-  v16 = rec {
-    name    = "boolector-${version}";
-    version = "1.6.0";
-    src = fetchurl {
-      url    = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz";
-      sha256 = "0jka4r6bc3i24axgdp6qbq6gjadwz9kvi11s2c5sbwmdnjd7cp85";
-    };
-  };
-
-  boolectorPkg = if useV16 then v16 else v15;
-  license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3;
-in
-stdenv.mkDerivation (boolectorPkg // {
-  buildInputs = [
-    zlib zlib.static (stdenv.lib.getOutput "static" stdenv.cc.libc)
-  ];
-
-  enableParallelBuilding = false;
-
   installPhase = ''
-    mkdir -p $out/bin $out/lib $out/include
-    cp boolector/boolector      $out/bin
-    cp boolector/deltabtor      $out/bin
-    cp boolector/synthebtor     $out/bin
-    cp boolector/libboolector.a $out/lib
-    cp boolector/boolector.h    $out/include
+    mkdir $out
+    mv boolector/bin $out
   '';
 
   meta = {
-    inherit license;
+    license = stdenv.lib.licenses.unfreeRedistributable;
     description = "An extremely fast SMT solver for bit-vectors and arrays";
     homepage    = "http://fmv.jku.at/boolector";
     platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
-})
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 364ce1b381c..b1b5c281d94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18217,11 +18217,7 @@ with pkgs;
   z3 = callPackage ../applications/science/logic/z3 {};
   z3_opt = callPackage ../applications/science/logic/z3_opt {};
 
-  boolector   = boolector15;
-  boolector15 = callPackage ../applications/science/logic/boolector {};
-  boolector16 = lowPrio (callPackage ../applications/science/logic/boolector {
-    useV16 = true;
-  });
+  boolector = callPackage ../applications/science/logic/boolector {};
 
   ### SCIENCE / ELECTRONICS
 

From 0b3d29d4ac08430bee94e90596cdd47b0b3c0dd2 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Wed, 24 May 2017 00:52:09 +0300
Subject: [PATCH 0725/3246] linux_samus_4_12: init at 4.12.2

Co-authored-by: Nikolay Amiantov <ab@fmap.me>

fixes #26038
---
 .../linux/kernel/linux-samus-4.12.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 18 +++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-samus-4.12.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix
new file mode 100644
index 00000000000..5599e1325d9
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix
@@ -0,0 +1,23 @@
+{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args:
+
+assert stdenv.is64bit;
+
+import ./generic.nix (args // rec {
+  version = "4.12.2";
+  extraMeta.branch = "4.12-2";
+
+  src =
+    let upstream = fetchFromGitHub {
+      owner = "raphael";
+      repo = "linux-samus";
+      rev = "v${extraMeta.branch}";
+      sha256 = "1dr74i79p8r13522w2ppi8gnjd9bhngc9d2hsn91ji6f5a8fbxx9";
+    }; in "${upstream}/build/linux";
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+
+  extraMeta.hydraPlatforms = [];
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1b5c281d94..facbb780692 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12108,6 +12108,20 @@ with pkgs;
     ];
   };
 
+
+  linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        kernelPatches.p9_fixes
+        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
+        # when adding a new linux version
+        kernelPatches.cpu-cgroup-v2."4.11"
+        kernelPatches.modinst_arg_list_too_long
+    ];
+  };
+
+  linux_samus_latest = linux_samus_4_12;
+
   linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix {
     kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
                       kernelPatches.chromiumos_no_link_restrictions
@@ -12312,6 +12326,10 @@ with pkgs;
 
   linux_grsec_server_xen = linux_grsec_nixos;
 
+  # Samus kernels
+  linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
+  linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest);
+
   # ChromiumOS kernels
   linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);
   linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest);

From 53d1eb0fc64ce2fb79e00199721c97f95e21cd61 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 18 Jul 2017 19:05:42 -0400
Subject: [PATCH 0726/3246] coqPackages_8_6.CoLoR: new expression 1.3.0

---
 .../development/coq-modules/CoLoR/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/coq-modules/CoLoR/default.nix

diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix
new file mode 100644
index 00000000000..3fac09277d1
--- /dev/null
+++ b/pkgs/development/coq-modules/CoLoR/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, coq }:
+
+stdenv.mkDerivation {
+  name = "coq${coq.coq-version}-CoLoR-1.3.0";
+
+  src = fetchurl {
+    url = https://gforge.inria.fr/frs/download.php/file/36399/color.1.3.0.tar.gz;
+    sha256 = "0n7431mc4a5bn9fsyk5167j2vnbxz4vgggjch4pm0x58lda8mxv1";
+  };
+
+  buildInputs = [ coq ];
+  enableParallelBuilding = true;
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = http://color.inria.fr/;
+    description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant.";
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index facbb780692..a36bb69bc3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18107,6 +18107,7 @@ with pkgs;
     paco = callPackage ../development/coq-modules/paco {};
     ssreflect = callPackage ../development/coq-modules/ssreflect { };
     QuickChick = callPackage ../development/coq-modules/QuickChick {};
+    CoLoR = callPackage ../development/coq-modules/CoLoR {};
     fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
   };
 

From 006a512e8f752fb862625407e507517ae71ca768 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 18 Jul 2017 19:09:20 -0400
Subject: [PATCH 0727/3246] coqPackages_8_6.math-classes: New expression (for
 8.6) 1.0.6

---
 .../coq-modules/math-classes/default.nix      | 21 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix
index e12327a347f..0e7549623e7 100644
--- a/pkgs/development/coq-modules/math-classes/default.nix
+++ b/pkgs/development/coq-modules/math-classes/default.nix
@@ -1,15 +1,20 @@
-{ stdenv, fetchFromGitHub, coq }:
+{ stdenv, fetchurl, coq }:
 
 stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-math-classes-2016-06-08";
+  name = "coq${coq.coq-version}-math-classes-1.0.6";
 
-  src = fetchFromGitHub {
-    owner  = "math-classes";
-    repo   = "math-classes";
-    rev    = "751e63b260bd2f78b280f2566c08a18034bd40b3";
-    sha256 = "0kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr";
+  src = fetchurl {
+    url = https://github.com/math-classes/math-classes/archive/1.0.6.tar.gz;
+    sha256 = "071hgjk4bz2ybci7dp2mw7xqmxmm2zph7kj28xcdg28iy796lf02";
   };
 
+  # src = fetchFromGitHub {
+  #   owner  = "math-classes";
+  #   repo   = "math-classes";
+  #   rev    = "1d426a08c2fbfd68bd1b3622fe8f31dd03712e6c";
+  #   sha256 = "3kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr";
+  # };
+
   buildInputs = [ coq ];
   enableParallelBuilding = true;
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
@@ -17,7 +22,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = https://math-classes.github.io;
     description = "A library of abstract interfaces for mathematical structures in Coq.";
-    maintainers = with maintainers; [ siddharthist ];
+    maintainers = with maintainers; [ siddharthist jwiegley ];
     platforms = coq.meta.platforms;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a36bb69bc3a..3a991208735 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18108,6 +18108,7 @@ with pkgs;
     ssreflect = callPackage ../development/coq-modules/ssreflect { };
     QuickChick = callPackage ../development/coq-modules/QuickChick {};
     CoLoR = callPackage ../development/coq-modules/CoLoR {};
+    math-classes = callPackage ../development/coq-modules/math-classes { };
     fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
   };
 

From 0bf019c99a707a23d279d196ff9c463175f4a5a6 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 18 Jul 2017 19:25:53 -0400
Subject: [PATCH 0728/3246] coqPackages_8_6.CoLoR: Fix installPhase

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

diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix
index 3fac09277d1..c7aaf2a2e32 100644
--- a/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/pkgs/development/coq-modules/CoLoR/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ coq ];
   enableParallelBuilding = true;
-  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  installPhase = ''
+    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://color.inria.fr/;

From 29e88a59c85492e39c303078acb2375c3f2054ef Mon Sep 17 00:00:00 2001
From: Anton Schirg <anton.schirg@posteo.de>
Date: Wed, 19 Jul 2017 02:26:38 +0200
Subject: [PATCH 0729/3246] houdini: change sha256, add missing libs, fix
 license dir patch, fix keyboard input

- Changed sha256 of src file, as this was apparantly changed on the
website

- Added missing libs: some X libs, alsa, dbus

- Changed patch to $out/houdini/Licensing.opt
localValidatorDir = ... was commented out in original file
so sed had no effect

- add export QT_XKB_CONFIG_ROOT
Without it only modifier keys worked, no text input
---
 pkgs/applications/misc/houdini/runtime.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index bfd53ef835d..8e89640d7dc 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, bc }:
+{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }:
 
 let
   ld_library_path = builtins.concatStringsSep ":" [
@@ -11,11 +11,19 @@ let
       xorg.libXext
       xorg.libX11
       xorg.libXrender
+      xorg.libXcursor
+      xorg.libXfixes
+      xorg.libXrender
+      xorg.libXcomposite
+      xorg.libXdamage
+      xorg.libXtst
+      alsaLib
       fontconfig
       libSM
       libICE
       zlib
       libpng
+      dbus
     ])
   ];
   license_dir = "~/.config/houdini";
@@ -25,7 +33,7 @@ stdenv.mkDerivation rec {
   name = "houdini-runtime-${version}";
   src = requireFile rec {
     name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz";
-    sha256 = "1laxncwgsr4hj53bn4pn9ibv3pkrpliwxlx0558wgnhq42js3wvl";
+    sha256 = "1wwm3gqmwn7xbm2qrpb4al44kzgswmsvmjndjkbqskwinxqmg9y2";
     message = ''
       This nix expression requires that ${name} is already part of the store.
       Download it from https://sidefx.com and add it to the nix store with:
@@ -50,11 +58,13 @@ stdenv.mkDerivation rec {
                       --no-root-check \
                       --accept-EULA \
                       $out
-    sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/Licensing.opt
+    echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt
     sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe
     sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup
     echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh
+    echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh
     echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh
+    echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh
   '';
   postFixup = ''
     INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)"

From db7260121cc2b172ea55bf6122003905727ca774 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 19 Jul 2017 10:44:42 +0800
Subject: [PATCH 0730/3246] qtox: add missing pcre dependency

---
 .../instant-messengers/qtox/default.nix       | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 0594a8944f5..c8c13a242ff 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,8 +1,9 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
-  libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg,
-  pango, atk, qrencode, ffmpeg, filter-audio,
-  qtbase, qtsvg, qttools, qttranslations, sqlcipher,
-  libvpx, libopus }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig,
+  libtoxcore,
+  libpthreadstubs, libXdmcp, libXScrnSaver,
+  qtbase, qtsvg, qttools, qttranslations,
+  atk, cairo, ffmpeg, filter-audio, gdk_pixbuf, glib, gtk2, libsodium, libopus,
+  libvpx, openal, opencv, pango, pcre, qrencode, sqlcipher }:
 
 mkDerivation rec {
   name = "qtox-${version}";
@@ -16,14 +17,12 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    libtoxcore openal opencv libsodium filter-audio
-    qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
-    pango atk qrencode ffmpeg qttranslations
-    sqlcipher
-    libopus libvpx
-  ] ++ (with xorg; [
-    libpthreadstubs libXdmcp
-  ]);
+    libtoxcore
+    libpthreadstubs libXdmcp libXScrnSaver
+    qtbase qtsvg qttools qttranslations
+    atk cairo ffmpeg filter-audio gdk_pixbuf glib gtk2 libopus libsodium
+    libvpx openal opencv pango pcre qrencode sqlcipher
+  ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 

From c9f487ac5d8a946cc51e7ece42d6590ef65994bc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 19 Jul 2017 11:52:36 +0800
Subject: [PATCH 0731/3246] gsoap: 2.8.42 -> 2.8.49

Fixes: CVE-2017-9765
---
 pkgs/development/libraries/gsoap/default.nix | 27 +++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index 89abd93180d..07efe42b99d 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -1,15 +1,28 @@
-{ stdenv, fetchurl, unzip, m4, bison, flex, openssl, zlib }:
+{ stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }:
 
-stdenv.mkDerivation rec {
+let
+  majorVersion = "2.8";
+
+in stdenv.mkDerivation rec {
   name = "gsoap-${version}";
-  version = "2.8.42";
+  version = "${majorVersion}.49";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip";
-    sha256 = "0fav4lhdibwggkf495pggmqna632jxkh6q2mi32b9hsn883pg5m7";
+    url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip";
+    sha256 = "0414q7zabkq3iiccl2yql3vbihbr7ach9d517b37zv3mp7nhj2aj";
   };
 
-  buildInputs = [ unzip m4 bison flex openssl zlib ];
+  buildInputs = [ openssl zlib ];
+  nativeBuildInputs = [ autoreconfHook bison flex m4 unzip ];
+  # Parallel building doesn't work as of 2.8.49
+  enableParallelBuilding = false;
+
+  # Future versions of automake require subdir-objects if the source is structured this way
+  # As of 2.8.49 (maybe earlier) this is needed to silence warnings
+  prePatch = ''
+    substituteInPlace configure.ac \
+      --replace 'AM_INIT_AUTOMAKE([foreign])' 'AM_INIT_AUTOMAKE([foreign subdir-objects])'
+  '';
 
   meta = with stdenv.lib; {
     description = "C/C++ toolkit for SOAP web services and XML-based applications";
@@ -27,6 +40,6 @@ stdenv.mkDerivation rec {
     #    restrictions)
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor ];
   };
 }

From 176c15a06ed86b72f3652dc0cc3b7552fe11e200 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 19 Jul 2017 12:36:52 +0800
Subject: [PATCH 0732/3246] plasma5: 5.10.3 -> 5.10.4

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

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index c1a6e867274..1b82b4c38fc 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.4/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index d1824f30527..c7b83ebc51d 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,339 +3,339 @@
 
 {
   bluedevil = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/bluedevil-5.10.3.tar.xz";
-      sha256 = "03qkd08nwqkc25wvj4964xgrj40m6vhzqg67fdqamav6d5np106g";
-      name = "bluedevil-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/bluedevil-5.10.4.tar.xz";
+      sha256 = "1q1mhblrcsz55fjjgw9xd49w2whxcbvwvr7w5rb99jbgixiijmxi";
+      name = "bluedevil-5.10.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/breeze-5.10.3.tar.xz";
-      sha256 = "048z84dsrx9ln5whg7vbp0amhhsnggh1jm4z6nmraizms2ay0w8a";
-      name = "breeze-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/breeze-5.10.4.tar.xz";
+      sha256 = "075iq5nr112la2zfmpkz0x7v1720zkil5b074g5p6yl058nfbg1d";
+      name = "breeze-5.10.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/breeze-grub-5.10.3.tar.xz";
-      sha256 = "1ghg7vc9ad6bw0b0q88srjwm8h9khyl93ljr2riaw3wh23slkw5z";
-      name = "breeze-grub-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/breeze-grub-5.10.4.tar.xz";
+      sha256 = "110d8jkgn6b28w4piwgl0lvkz7kkhx10948i8sb7dahyxilz57l2";
+      name = "breeze-grub-5.10.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/breeze-gtk-5.10.3.tar.xz";
-      sha256 = "0ai2hkd79g1y8clk0650qijq5w5fmaamhbapw6yddf4v4a40vspc";
-      name = "breeze-gtk-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/breeze-gtk-5.10.4.tar.xz";
+      sha256 = "0r0q5i24vqqaf9lyi7ac9i650ha6b3pv0js3r2vj0kivj1kh9wz5";
+      name = "breeze-gtk-5.10.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/breeze-plymouth-5.10.3.tar.xz";
-      sha256 = "1249ywi5s8ba5mzgi2773xz04g3shzc61bwsfcgpvzyc61q3dsl9";
-      name = "breeze-plymouth-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/breeze-plymouth-5.10.4.tar.xz";
+      sha256 = "16nvp2078py6gqwhi23rz0li6d1zv5i669q6whrpwd1xvb489xlg";
+      name = "breeze-plymouth-5.10.4.tar.xz";
     };
   };
   discover = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/discover-5.10.3.tar.xz";
-      sha256 = "189pv0zbl7mzswk65nlj8yq5ymj3ska8a52ws852blnccj8x18qn";
-      name = "discover-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/discover-5.10.4.tar.xz";
+      sha256 = "08bxk03jknbdyk1lsw59ml4d6p66shn6kijcsw44pkfiwxv4k7a8";
+      name = "discover-5.10.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kactivitymanagerd-5.10.3.tar.xz";
-      sha256 = "1y4xyg5swr2abiiqp67b95jfj4xbmgw1y51vj6njcdrkkkksz7qh";
-      name = "kactivitymanagerd-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kactivitymanagerd-5.10.4.tar.xz";
+      sha256 = "0z33r8iysd69a76fwid46rywpvqa63pc5p7bgi2vy6aw7py5x2r2";
+      name = "kactivitymanagerd-5.10.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kde-cli-tools-5.10.3.tar.xz";
-      sha256 = "1xmk45hj96qmfcprccsnlzr0hms98yvnnz8wkylgbnj75rcfq7ws";
-      name = "kde-cli-tools-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kde-cli-tools-5.10.4.tar.xz";
+      sha256 = "1d9bp2yi4i5g4lk4y51yhmixkhjfjz9g0nlg6l22p37rnwr416h6";
+      name = "kde-cli-tools-5.10.4.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kdecoration-5.10.3.tar.xz";
-      sha256 = "14ayrnv1q1rhjclh2pbjwnzssqk2m9zlpm64011y258r5q9mw8h3";
-      name = "kdecoration-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kdecoration-5.10.4.tar.xz";
+      sha256 = "15m62a0wwvssrr2k065kqmxj00fc4pvfmnxx6aakvnf11jwzs0r5";
+      name = "kdecoration-5.10.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kde-gtk-config-5.10.3.tar.xz";
-      sha256 = "049dk79wgqgk2jiicqyv32m6nhj6k7hw5qrhagg8js28b6sqkw0m";
-      name = "kde-gtk-config-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kde-gtk-config-5.10.4.tar.xz";
+      sha256 = "0r5kkvxf29mi45h0snsvjw9xkc02k9b2gai687sci7n8iwkjdc9j";
+      name = "kde-gtk-config-5.10.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kdeplasma-addons-5.10.3.tar.xz";
-      sha256 = "1lzkwa51845f97qz43j1k284hwjbg05cry7lj16nlaq0rlwncgps";
-      name = "kdeplasma-addons-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kdeplasma-addons-5.10.4.tar.xz";
+      sha256 = "19rd7lsxbjw9sr96jfis8hfdrpmm1djwi8cr2yw683zv5kjqzigf";
+      name = "kdeplasma-addons-5.10.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kgamma5-5.10.3.tar.xz";
-      sha256 = "19mcdj1xcsf43k3n77ybqj9i99l6m8yryw3bhcbzfxk0c6ccx9cy";
-      name = "kgamma5-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kgamma5-5.10.4.tar.xz";
+      sha256 = "04kfigplrhcc01dap9a7l43dh2ig3ihyc01vwsrik73l026vm2im";
+      name = "kgamma5-5.10.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/khotkeys-5.10.3.tar.xz";
-      sha256 = "1xbxbqvpnci2fanwvdrr6rnwabh3yfamndfhmy4gjik26y0i8yz4";
-      name = "khotkeys-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/khotkeys-5.10.4.tar.xz";
+      sha256 = "16apzdf2g42sr349jdjjal0lv2bpginb72f1c5p8cs14nvg0cnys";
+      name = "khotkeys-5.10.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kinfocenter-5.10.3.tar.xz";
-      sha256 = "0a94wz7fbck08aw3xrvn2hjbj3px5ivfzkh6hhqcxblnc5ahr0fk";
-      name = "kinfocenter-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kinfocenter-5.10.4.tar.xz";
+      sha256 = "1r0a4z6wzzkb30y76xx4x1gfbka7h3qn1j0fxyf2h97vd362g8zr";
+      name = "kinfocenter-5.10.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kmenuedit-5.10.3.tar.xz";
-      sha256 = "1y4riijwp1g3bji2wd21m7raf95prajd3sxcgr140sg0lq8zg8h2";
-      name = "kmenuedit-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kmenuedit-5.10.4.tar.xz";
+      sha256 = "1kvspljbzrbglyq1l69r7gdlqww674hxdbvrhq1v95sh33i3l29w";
+      name = "kmenuedit-5.10.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kscreen-5.10.3.tar.xz";
-      sha256 = "03l8ammyir82w8kdl4sm8lkp1nr0qghk04g838p34m05ah8hb7nl";
-      name = "kscreen-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kscreen-5.10.4.tar.xz";
+      sha256 = "0rahpg14raqngk8a63qh2bnqgga43dyzqfzd9ys94iqkxkmlsasw";
+      name = "kscreen-5.10.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kscreenlocker-5.10.3.tar.xz";
-      sha256 = "07k0smksglzq44llpn80xs7p8salfryphihran7frb1mvyg09yzx";
-      name = "kscreenlocker-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kscreenlocker-5.10.4.tar.xz";
+      sha256 = "17sykdkd43z2x9ccvninbhgypysqr1p052cp1aj2wbvl54hhiznp";
+      name = "kscreenlocker-5.10.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/ksshaskpass-5.10.3.tar.xz";
-      sha256 = "10cy8d4dbg8dzkh428x3vl6n2hh73b3fxnal8a2wwx23flhmg04c";
-      name = "ksshaskpass-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/ksshaskpass-5.10.4.tar.xz";
+      sha256 = "1nz6pw10k9r7y4h9wl4b5jxbk10jkdj8fymkzx94dcvgasia52jf";
+      name = "ksshaskpass-5.10.4.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/ksysguard-5.10.3.tar.xz";
-      sha256 = "0mgzqd3abhs03k815kij6n6jpiqhd13vzbyifcp4r0q8kh34b71s";
-      name = "ksysguard-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/ksysguard-5.10.4.tar.xz";
+      sha256 = "02p6c9lvgpcaszl5zigyjhcarjmp12hhhhfbkd448nmaklrw4qnl";
+      name = "ksysguard-5.10.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kwallet-pam-5.10.3.tar.xz";
-      sha256 = "0pysv9lfljar4krdkwns7fyyi0zz5629prfmdxs2aww6cq4d2x7m";
-      name = "kwallet-pam-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kwallet-pam-5.10.4.tar.xz";
+      sha256 = "1si9fyg4n7kxn2kff15r8ph6m5hipyb3fwif9hc0x5v8iwf7a9q2";
+      name = "kwallet-pam-5.10.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kwayland-integration-5.10.3.tar.xz";
-      sha256 = "1gfx5mxy1zan5shhddi4b6k578l19rkld2zkfa4g97hhvc0h83s9";
-      name = "kwayland-integration-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kwayland-integration-5.10.4.tar.xz";
+      sha256 = "02d4sy3fzh45r2j13m8fr3p3xkd98j40mnzwf54ljb9irvm3fplc";
+      name = "kwayland-integration-5.10.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kwin-5.10.3.tar.xz";
-      sha256 = "0vbrf7vm8s7hrzkgsjsqggswadvrr1k2g85y7w1pb781way7xwj3";
-      name = "kwin-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kwin-5.10.4.tar.xz";
+      sha256 = "0p7yv3a1qsv87ymr7kz8ayp3zspak1qw8lp051qrnaabpz951r39";
+      name = "kwin-5.10.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/kwrited-5.10.3.tar.xz";
-      sha256 = "0cjyvz5wg37dbnacsf3hz05bkwzpbznmlsy5plhqxr6wmq6q6l9q";
-      name = "kwrited-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/kwrited-5.10.4.tar.xz";
+      sha256 = "1di7xlgszw8iy4w7722x9g9998q8y48j1s8qd6mryqryr9ryq9b3";
+      name = "kwrited-5.10.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/libkscreen-5.10.3.tar.xz";
-      sha256 = "02hcsfmjzajbpki2pmpdycgccjqadd98vzam56sihsvivgxykw4h";
-      name = "libkscreen-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/libkscreen-5.10.4.tar.xz";
+      sha256 = "0zpybykj6s547j53a7x4flj45qhpk3z0d3sfp6wgi88gybnffj8g";
+      name = "libkscreen-5.10.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/libksysguard-5.10.3.tar.xz";
-      sha256 = "13s7j53jjyhd5kryyd1sy6yrx69h5smi7xg49d8as8zbf3rki08h";
-      name = "libksysguard-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/libksysguard-5.10.4.tar.xz";
+      sha256 = "01w0laywva0p0ar2lvr1k5000bhjikjfxsb4f6p30qswrchrmrh3";
+      name = "libksysguard-5.10.4.tar.xz";
     };
   };
   milou = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/milou-5.10.3.tar.xz";
-      sha256 = "18bgwpxfv5n4nxvs6xj6ihk22bpmb1b4cs9dxhfn931r8lnzzixb";
-      name = "milou-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/milou-5.10.4.tar.xz";
+      sha256 = "105fyrh5n90ih93b9lq21y6s2ckdgb7lf9624y13gii674yv9xhb";
+      name = "milou-5.10.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/oxygen-5.10.3.tar.xz";
-      sha256 = "07jqm9nl84b2s9i461mz4b8i1x22376k9n1g9prcjzxyy3494flv";
-      name = "oxygen-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/oxygen-5.10.4.tar.xz";
+      sha256 = "0hip9vkp33dg51xr1v46i0w7fs6cqwx3lssw82qyzf042zipyikd";
+      name = "oxygen-5.10.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/plasma-desktop-5.10.3.tar.xz";
-      sha256 = "1vwls9gavcipv8k2fwx9kzzldfcxch3g61nsc77dw0lrhcaf301d";
-      name = "plasma-desktop-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/plasma-desktop-5.10.4.tar.xz";
+      sha256 = "0g1cynvm58fg99n9ir0lwbsg3c4jh1fr330n12bx6ccgw66i1mgf";
+      name = "plasma-desktop-5.10.4.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/plasma-integration-5.10.3.tar.xz";
-      sha256 = "1vpgwzvqjcr6hgrh57777i21fbmixl6vrlyscdyk0912mdzplf5n";
-      name = "plasma-integration-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/plasma-integration-5.10.4.tar.xz";
+      sha256 = "0rf50yr97if7i8ghjsladw9krkcjn45qnpq86siph2hnn784x2q6";
+      name = "plasma-integration-5.10.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/plasma-nm-5.10.3.tar.xz";
-      sha256 = "1d8kncwcxw601n73m7igr2h09mk54qa2zgshrbd0h3496dw4xzxq";
-      name = "plasma-nm-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/plasma-nm-5.10.4.tar.xz";
+      sha256 = "0lxg2x73n353p69l4qgxm759f6vxl2z2rff60864yj80ija6i58c";
+      name = "plasma-nm-5.10.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/plasma-pa-5.10.3.tar.xz";
-      sha256 = "1dhkkfl39x17bd0hv3w0lclzlsialg7a7zydcjm345izpdgd11vx";
-      name = "plasma-pa-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/plasma-pa-5.10.4.tar.xz";
+      sha256 = "0nxn1vhylpy91kz4xihhrxagjlwdm5xi10blgkfkq98npg7g1had";
+      name = "plasma-pa-5.10.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/plasma-sdk-5.10.3.tar.xz";
-      sha256 = "0m426fj5d07bqj0n1gxcn7brjwf7xrsj50hy14hky246wchvqh43";
-      name = "plasma-sdk-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/plasma-sdk-5.10.4.tar.xz";
+      sha256 = "0m1q39gxrjk5fmz5dkwxz0wjngv9xib6xiw3k8rscjbby5q2x4g0";
+      name = "plasma-sdk-5.10.4.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/plasma-tests-5.10.3.tar.xz";
-      sha256 = "04pn5bzhs0y6msir2px985jghhswas9zn37jb4zdy0sxd9yhabqb";
-      name = "plasma-tests-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/plasma-tests-5.10.4.tar.xz";
+      sha256 = "0l8f0p3z1xfc5ki4696yr4ckdpcfswg53f9bbwfzgwg54h109zs9";
+      name = "plasma-tests-5.10.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-5.10.3.tar.xz";
-      sha256 = "0wfzdjpgd9fwycy4ww2j7xryh82wg4jfipnh9hicq2mss0x53mv9";
-      name = "plasma-workspace-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/plasma-workspace-5.10.4.tar.xz";
+      sha256 = "08d18swivlysh535fkkfc256rkl1p6b93y934w21bdyihs0mf18w";
+      name = "plasma-workspace-5.10.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-wallpapers-5.10.3.tar.xz";
-      sha256 = "0vhdypkkcranpb7zv2ghh0d5x5698d7vvyv1k7xcgsd1bwf3037f";
-      name = "plasma-workspace-wallpapers-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/plasma-workspace-wallpapers-5.10.4.tar.xz";
+      sha256 = "04jp14y8k5bchs80hj3r2h3qi17q3i4fbq6g09457qv7i195xgr2";
+      name = "plasma-workspace-wallpapers-5.10.4.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/plymouth-kcm-5.10.3.tar.xz";
-      sha256 = "0ss5wkqa729f2bs8s9ss4bslpj0946kylbg2g2vmfzzr5a68ri6d";
-      name = "plymouth-kcm-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/plymouth-kcm-5.10.4.tar.xz";
+      sha256 = "0l0b2jpgz22f50i7zwmq5mij3p9ym6d059qvy35j96cyn69947nx";
+      name = "plymouth-kcm-5.10.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.10.3";
+    version = "1-5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/polkit-kde-agent-1-5.10.3.tar.xz";
-      sha256 = "0csllzr47f173f8dymfhhplig7w55j3kfqr14i12lc3yhy5g5ns6";
-      name = "polkit-kde-agent-1-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/polkit-kde-agent-1-5.10.4.tar.xz";
+      sha256 = "1kk1g40pgzdwbpxymyf5f0m474g273nq7knkzz41jp7yqi7dh9jw";
+      name = "polkit-kde-agent-1-5.10.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/powerdevil-5.10.3.tar.xz";
-      sha256 = "0xjk8andskvygmb8ll0hxk8spc9ac0v3kyzyrd444va3q617zbi7";
-      name = "powerdevil-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/powerdevil-5.10.4.tar.xz";
+      sha256 = "1qlxdn7w6grwpqlwfwwsh0ag5bshi8m9mz2s1zvrfgk09wvl6mr2";
+      name = "powerdevil-5.10.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/sddm-kcm-5.10.3.tar.xz";
-      sha256 = "1gcla1lk8idxj4j4sr13wv3q2v6c4ylhgjqj1ik9qr9rk7r2ny8c";
-      name = "sddm-kcm-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/sddm-kcm-5.10.4.tar.xz";
+      sha256 = "1sljbd57nn1n26jdrbyj8dgrjdz3rfq8vacvx96a2nj3csnf0qlk";
+      name = "sddm-kcm-5.10.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/systemsettings-5.10.3.tar.xz";
-      sha256 = "0mfcyvzl5z3yqq0bbpwzhphir0vjjhvpifp17ra4w80j3f2c14jh";
-      name = "systemsettings-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/systemsettings-5.10.4.tar.xz";
+      sha256 = "05rchi657px3qizqq82z4k0wsjc4cm2w5wb1mb9ayg287cdrsnjy";
+      name = "systemsettings-5.10.4.tar.xz";
     };
   };
   user-manager = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/user-manager-5.10.3.tar.xz";
-      sha256 = "10iis34bpi0vic3x4r6gss8frfxg4zv9v8mg1rpbmrrs5q8799fn";
-      name = "user-manager-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/user-manager-5.10.4.tar.xz";
+      sha256 = "16swrdmf0b26zy5qipb89smh3cps1fvcxkz12sxd8i92m6cxa903";
+      name = "user-manager-5.10.4.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.10.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.3/xdg-desktop-portal-kde-5.10.3.tar.xz";
-      sha256 = "1hnbw211fn6aayx46h92nmjvdc0ar1bsy1dn1lg2a5575kq2lzgd";
-      name = "xdg-desktop-portal-kde-5.10.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.4/xdg-desktop-portal-kde-5.10.4.tar.xz";
+      sha256 = "01snfdj73r0hby9h32k7258r65ip62wk4p78qxibvffxm4ixw04l";
+      name = "xdg-desktop-portal-kde-5.10.4.tar.xz";
     };
   };
 }

From 5c6e4ea4beb54ed9470e34d902ac05256b2b2d78 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Mon, 10 Jul 2017 15:11:53 +1000
Subject: [PATCH 0733/3246] jruby: only wrap jruby executables

Other executables all invoke jruby, and so don't need to be wrapped.

In some cases wrapping breaks the executables because one file is a ruby
script that directly loads the other (e.g. `gem` is a wrapper that loads
`jgem`).  In this case, if the latter script has been wrapped by nix,
loading will fail.
---
 pkgs/development/interpreters/jruby/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 74203eca380..5c5ede3517c 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
      rm $out/bin/*.{bat,dll,exe,sh}
      mv $out/COPYING $out/LICENSE* $out/docs
 
-     for i in $out/bin/*; do
+     for i in $out/bin/jruby{,.bash}; do
        wrapProgram $i \
          --set JAVA_HOME ${jre}
      done

From 68935892abf9a308afd9dcee3522124e08c575c4 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Mon, 10 Jul 2017 16:40:26 +1000
Subject: [PATCH 0734/3246] bundix: use same ruby as bundler

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

diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index 0caa8b226f0..17f09724d18 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -1,8 +1,8 @@
-{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, ruby, nix,
+{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix,
   nix-prefetch-git }:
 
 buildRubyGem rec {
-  inherit ruby;
+  inherit (bundler) ruby;
 
   name = "${gemName}-${version}";
   gemName = "bundix";

From 0383c0aa6be37839f353d14e5d885ea5a5fa3932 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Mon, 10 Jul 2017 16:41:36 +1000
Subject: [PATCH 0735/3246] jruby: make package compatible with bundix; add
 devEnv

- Adds the necessary passthru vars for bundler, bundix, etc. to accept
  the package as a ruby.
- Adds the devEnv attribute, so that jruby.devEnv can be used to get
  an environment with bundler and bundix installed.
---
 .../interpreters/jruby/default.nix            | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 5c5ede3517c..0ea1bf19231 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -1,6 +1,9 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ stdenv, callPackage, fetchurl, makeWrapper, jre }:
 
-stdenv.mkDerivation rec {
+let
+# The version number here is whatever is reported by the RUBY_VERSION string
+rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
+jruby = stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
   version = "9.1.12.0";
@@ -22,12 +25,38 @@ stdenv.mkDerivation rec {
        wrapProgram $i \
          --set JAVA_HOME ${jre}
      done
+
+     ln -s $out/bin/jruby $out/bin/ruby
+
+     # Bundler tries to create this directory
+     mkdir -pv $out/${passthru.gemPath}
+     mkdir -p $out/nix-support
+     cat > $out/nix-support/setup-hook <<EOF
+       addGemPath() {
+         addToSearchPath GEM_PATH \$1/${passthru.gemPath}
+       }
+
+       envHooks+=(addGemPath)
+     EOF
   '';
 
+  passthru = rec {
+    rubyEngine = "jruby";
+    gemPath = "lib/${rubyEngine}/gems/${rubyVersion.libDir}";
+    libPath = "lib/${rubyEngine}/${rubyVersion.libDir}";
+  };
+
   meta = {
     description = "Ruby interpreter written in Java";
     homepage = http://jruby.org/;
     license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ];
     platforms = stdenv.lib.platforms.unix;
   };
-}
+};
+in jruby.overrideAttrs (oldAttrs: {
+  passthru = oldAttrs.passthru // {
+    devEnv = callPackage ../ruby/dev.nix {
+      ruby = jruby;
+    };
+  };
+})

From 7aaea7297e4a6be6e0e5bd3788df599d0b1cdac8 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Wed, 19 Jul 2017 15:18:44 +0900
Subject: [PATCH 0736/3246] Simplify the sed script

---
 pkgs/applications/science/math/mathematica/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 6191af85bd1..d2c62cdf21d 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
     # Fix library paths
     cd $out/libexec/Mathematica/Executables
     for path in mathematica MathKernel Mathematica WolframKernel wolfram; do
-      sed -i -e 's/export LD_LIBRARY_PATH/export LD_LIBRARY_PATH=${builtins.replaceStrings ["/"] ["\\/"] "${zlib}/lib"}:\''${LD_LIBRARY_PATH}/' $path
+      sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path
     done
   '';
 

From 1fef42dde9281810b2627158f18289f2ce528087 Mon Sep 17 00:00:00 2001
From: Elijah Caine <voigte@osuosl.org>
Date: Wed, 19 Jul 2017 00:30:51 -0700
Subject: [PATCH 0737/3246] container-linux-config-transpiler: init at 0.4.1
 (#27486)

---
 lib/maintainers.nix                           |  1 +
 .../default.nix                               | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/tools/container-linux-config-transpiler/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index dbc598601f7..e10136bf070 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -172,6 +172,7 @@
   ekleog = "Leo Gaspard <leo@gaspard.io>";
   elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
   eleanor = "Dejan Lukan <dejan@proteansec.com>";
+  elijahcaine = "Elijah Caine <elijahcainemv@gmail.com>";
   elitak = "Eric Litak <elitak@gmail.com>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
   eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>";
diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix
new file mode 100644
index 00000000000..eaae51f726b
--- /dev/null
+++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+
+with lib;
+
+buildGoPackage rec {
+  name = "ct-${version}";
+  version = "0.4.1";
+
+  goPackagePath = "github.com/coreos/container-linux-config-transpiler";
+
+  src = fetchFromGitHub {
+    owner = "coreos";
+    repo = "container-linux-config-transpiler";
+    rev = "v${version}";
+    sha256="1017xkinja30jcam8p1x2d9q4vkgkfn7gvkad004jkbbmd2216sa";
+  };
+
+  buildFlagsArray = ''
+    -ldflags=-X ${goPackagePath}/internal/version.Raw=v${version}
+  '';
+
+  postInstall = ''
+    mv $bin/bin/{internal,ct}
+    rm $bin/bin/tools
+  '';
+
+  meta = {
+    description = "Convert a Container Linux Config into Ignition";
+    license = licenses.asl20;
+    homepage = https://github.com/coreos/container-linux-config-transpiler;
+    maintainers = with maintainers; [elijahcaine];
+    platforms = with platforms; unix;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1336fd31efa..3db016ede6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -535,6 +535,8 @@ with pkgs;
 
   bonnie = callPackage ../tools/filesystems/bonnie { };
 
+  container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
+
   djmount = callPackage ../tools/filesystems/djmount { };
 
   dgsh = callPackage ../shells/dgsh { };

From 651748b016151c544a00c11fc7a274671020d344 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Wed, 19 Jul 2017 11:33:55 +0300
Subject: [PATCH 0738/3246] emacs-all-the-icons-fonts: 2.6.4 -> 3.1.1

---
 pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
index eea190d0a88..4082d5949a3 100644
--- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
+++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "emacs-all-the-icons-fonts-${version}";
-  version = "2.6.4";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "domtronn";
     repo = "all-the-icons.el";
     rev = version;
-    sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x";
+    sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf";
   };
 
   installPhase = ''

From fb2302e115b518ccb5349ac3a4827a3cbdb38640 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Wed, 19 Jul 2017 17:39:36 +0900
Subject: [PATCH 0739/3246] Add missing 'math'

---
 pkgs/applications/science/math/mathematica/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index d2c62cdf21d..10737a92f8c 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
 
     # Fix library paths
     cd $out/libexec/Mathematica/Executables
-    for path in mathematica MathKernel Mathematica WolframKernel wolfram; do
+    for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do
       sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path
     done
   '';

From fd174245806f77dd15a8617a14a3af864703d19f Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 15:50:21 +0700
Subject: [PATCH 0740/3246] python.pkgs.acme-tiny : move to separate expression

---
 .../python-modules/acme-tiny/default.nix      | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 36 +----------------
 2 files changed, 40 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/development/python-modules/acme-tiny/default.nix

diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix
new file mode 100644
index 00000000000..9558febec73
--- /dev/null
+++ b/pkgs/development/python-modules/acme-tiny/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, python, openssl }:
+
+buildPythonPackage rec {
+  pname = "acme-tiny";
+  version = "2016-03-26";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g";
+    rev = "7a5a2558c8d6e5ab2a59b9fec9633d9e63127971";
+    repo = "acme-tiny";
+    owner = "diafygi";
+  };
+
+  # source doesn't have any python "packaging" as such
+  configurePhase = " ";
+  buildPhase = " ";
+  # the tests are... complex
+  doCheck = false;
+
+  patchPhase = ''
+    substituteInPlace acme_tiny.py --replace "openssl" "${openssl.bin}/bin/openssl"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/${python.sitePackages}/
+    cp acme_tiny.py $out/${python.sitePackages}/
+    mkdir -p $out/bin
+    ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny
+    chmod +x $out/bin/acme_tiny
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
+    homepage = https://github.com/diafygi/acme-tiny;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eceb3f2ac3f..f2ae8c58c59 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -270,41 +270,7 @@ in {
 
   acme = callPackage ../development/python-modules/acme { };
 
-  acme-tiny = buildPythonPackage rec {
-    name = "acme-tiny-${version}";
-    version = "2016-03-26";
-
-    src = pkgs.fetchFromGitHub {
-      sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g";
-      rev = "7a5a2558c8d6e5ab2a59b9fec9633d9e63127971";
-      repo = "acme-tiny";
-      owner = "diafygi";
-    };
-
-    # source doesn't have any python "packaging" as such
-    configurePhase = " ";
-    buildPhase = " ";
-    # the tests are... complex
-    doCheck = false;
-
-    patchPhase = ''
-      substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl.bin}/bin/openssl"
-    '';
-
-    installPhase = ''
-      mkdir -p $out/${python.sitePackages}/
-      cp acme_tiny.py $out/${python.sitePackages}/
-      mkdir -p $out/bin
-      ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny
-      chmod +x $out/bin/acme_tiny
-    '';
-
-    meta = {
-      description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
-      homepage = https://github.com/diafygi/acme-tiny;
-      license = licenses.mit;
-    };
-  };
+  acme-tiny = callPackage ../development/python-modules/acme-tiny { };
 
   actdiag = buildPythonPackage rec {
     name = "actdiag-0.5.3";

From c21e915c972116b29bcf10c44f469f8036aa2aa5 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 15:59:47 +0700
Subject: [PATCH 0741/3246] python.pkgs.actdiag : move to separate expression

---
 .../python-modules/actdiag/default.nix        | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +---------------
 2 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/actdiag/default.nix

diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix
new file mode 100644
index 00000000000..064e5e6c11a
--- /dev/null
+++ b/pkgs/development/python-modules/actdiag/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pep8, nose, unittest2, docutils, blockdiag  }:
+
+buildPythonPackage rec {
+  pname = "actdiag";
+  version = "0.5.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa";
+  };
+
+  buildInputs = [ pep8 nose unittest2 docutils ];
+
+  propagatedBuildInputs = [ blockdiag ];
+
+  # One test fails:
+  #   UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
+    homepage = http://blockdiag.com/;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f2ae8c58c59..af1ab819b12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -272,30 +272,7 @@ in {
 
   acme-tiny = callPackage ../development/python-modules/acme-tiny { };
 
-  actdiag = buildPythonPackage rec {
-    name = "actdiag-0.5.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/actdiag/${name}.tar.gz";
-      sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa";
-    };
-
-    buildInputs = with self; [ pep8 nose unittest2 docutils ];
-
-    propagatedBuildInputs = with self; [ blockdiag ];
-
-    # One test fails:
-    #   UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128)
-    doCheck = false;
-
-    meta = {
-      description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
-      homepage = http://blockdiag.com/;
-      license = licenses.asl20;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  actdiag = callPackage ../development/python-modules/actdiag { };
 
   adal = buildPythonPackage rec {
     version = "0.1.0";

From 68bcf522c71ed7a2690544b8fc33be000ebe114e Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 16:04:59 +0700
Subject: [PATCH 0742/3246] python.pkgs.adal : move to separate expression

---
 .../python-modules/adal/default.nix           | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +---------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/adal/default.nix

diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
new file mode 100644
index 00000000000..982e63882ad
--- /dev/null
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, requests, pyjwt }:
+
+buildPythonPackage rec {
+  pname = "adal";
+  version = "0.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09";
+  };
+
+  propagatedBuildInputs =  [ requests pyjwt ];
+
+  meta = with stdenv.lib; {
+    description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
+    homepage = https://github.com/AzureAD/azure-activedirectory-library-for-python;
+    license = licenses.mit;
+    maintainers = with maintainers; [ phreedom ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index af1ab819b12..6d81ec98a18 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -274,24 +274,7 @@ in {
 
   actdiag = callPackage ../development/python-modules/actdiag { };
 
-  adal = buildPythonPackage rec {
-    version = "0.1.0";
-    name = "adal-${version}";
-
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/adal/adal-0.1.0.tar.gz;
-      sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09";
-    };
-
-    propagatedBuildInputs = with self; [ requests pyjwt ];
-
-    meta = {
-      description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
-      homepage = https://github.com/AzureAD/azure-activedirectory-library-for-python;
-      license = licenses.mit;
-      maintainers = with maintainers; [ phreedom ];
-    };
-  };
+  adal = callPackage ../development/python-modules/adal { };
 
   afew = buildPythonPackage rec {
     name = "afew-git-2017-02-08";

From 0e24b762ea5cc105783c67052e5b18249d2f1857 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 19 Jul 2017 11:20:09 +0200
Subject: [PATCH 0743/3246] libgcrypt: 1.7.8 -> 1.8.0

See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00006.html
for release information
---
 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 ac54858b1de..ed742bee874 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.8";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "16f1rsv4y4w2pk1il2jbcqggsb6mrlfva5vayd205fp68zm7d0ll";
+    sha256 = "06w97l88y2c29zf8p8cg0m4k2kiiyj6pqxdl0cxigi3wp2brdr13";
   };
 
   outputs = [ "out" "dev" "info" ];

From af02f13e2572a2bdde5a6e94e78f4f3dcc6a05a3 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 16:23:28 +0700
Subject: [PATCH 0744/3246] python.pkgs.afew : move to separate expression

---
 .../python-modules/afew/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 35 +----------------
 2 files changed, 40 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/development/python-modules/afew/default.nix

diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix
new file mode 100644
index 00000000000..4a2d4a0f722
--- /dev/null
+++ b/pkgs/development/python-modules/afew/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, isPy3k , dbacl, notmuch, chardet, subprocess32 }:
+
+buildPythonPackage rec {
+  pname = "afew";
+  version = "git-2017-02-08";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "afewmail";
+    repo = "afew";
+    rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67";
+    sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm";
+  };
+
+  buildInputs = [ dbacl ];
+
+  propagatedBuildInputs = [
+    notmuch
+    chardet
+  ] ++ stdenv.lib.optional (!isPy3k) subprocess32;
+
+  doCheck = false;
+
+  preConfigure = ''
+    substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${dbacl}/bin/dbacl'"
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/afew \
+      --prefix LD_LIBRARY_PATH : ${notmuch}/lib
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/teythoon/afew;
+    description = "An initial tagging script for notmuch mail";
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d81ec98a18..2a21ac792ae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -276,40 +276,7 @@ in {
 
   adal = callPackage ../development/python-modules/adal { };
 
-  afew = buildPythonPackage rec {
-    name = "afew-git-2017-02-08";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "afewmail";
-      repo = "afew";
-      rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67";
-      sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm";
-    };
-
-    buildInputs = with self; [ pkgs.dbacl ];
-
-    propagatedBuildInputs = with self; [
-      self.notmuch
-      self.chardet
-    ] ++ optional (!isPy3k) self.subprocess32;
-
-    doCheck = false;
-
-    preConfigure = ''
-      substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${pkgs.dbacl}/bin/dbacl'"
-    '';
-
-    postInstall = ''
-      wrapProgram $out/bin/afew \
-        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib
-    '';
-
-    meta = {
-      homepage = https://github.com/teythoon/afew;
-      description = "An initial tagging script for notmuch mail";
-      maintainers = with maintainers; [ garbas ];
-    };
-  };
+  afew = callPackage ../development/python-modules/afew { };
 
   aiodns = buildPythonPackage rec {
     name = "aiodns-${version}";

From 5eea07391ea407b502dcd3b59c7c0f319c29b713 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 16:32:53 +0700
Subject: [PATCH 0745/3246] python.pkgs.aiodns : move to separate expression

---
 .../python-modules/aiodns/default.nix         | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +---------------
 2 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/aiodns/default.nix

diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
new file mode 100644
index 00000000000..4265a7488f6
--- /dev/null
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, isPy33, isPy26, isPy27, isPyPy, python, pycares, asyncio, trollius }:
+
+buildPythonPackage rec {
+  pname = "aiodns";
+  version = "1.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
+  };
+
+  propagatedBuildInputs = with stdenv.lib; [ pycares ] 
+    ++ optional isPy33 asyncio 
+    ++ optional (isPy26 || isPy27 || isPyPy) trollius;
+
+  checkPhase = ''
+    ${python.interpreter} tests.py
+  '';
+
+  # 'Could not contact DNS servers'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/saghul/aiodns;
+    license = licenses.mit;
+    description = "Simple DNS resolver for asyncio";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2a21ac792ae..667d747582c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -278,30 +278,7 @@ in {
 
   afew = callPackage ../development/python-modules/afew { };
 
-  aiodns = buildPythonPackage rec {
-    name = "aiodns-${version}";
-    version = "1.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/aiodns/${name}.tar.gz";
-      sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
-    };
-
-    propagatedBuildInputs = with self; [ pycares ] ++ optional isPy33 asyncio ++ optional (isPy26 || isPy27 || isPyPy) trollius;
-
-    checkPhase = ''
-      ${python.interpreter} tests.py
-    '';
-
-    # 'Could not contact DNS servers'
-    doCheck = false;
-
-    meta = {
-      homepage = http://github.com/saghul/aiodns;
-      license = licenses.mit;
-      description = "Simple DNS resolver for asyncio";
-    };
-  };
+  aiodns = callPackage ../development/python-modules/aiodns { };
 
   aiofiles = callPackage ../development/python-modules/aiofiles { };
 

From 9b313484def34616a1d13cce9fa69e8ec6b96e2d Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 16:43:01 +0700
Subject: [PATCH 0746/3246] python.pkgs.alabaster : move to separate expression

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

diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix
new file mode 100644
index 00000000000..69bcaa1fc06
--- /dev/null
+++ b/pkgs/development/python-modules/alabaster/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pygments }:
+
+buildPythonPackage rec {
+  pname = "alabaster";
+  version = "0.7.7";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71";
+  };
+
+  propagatedBuildInputs = [ pygments ];
+
+  # No tests included
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/bitprophet/alabaster;
+    description = "A Sphinx theme";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 667d747582c..031fca0f6ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -305,26 +305,7 @@ in {
     };
   };
 
-  alabaster = buildPythonPackage rec {
-    name = "alabaster-0.7.7";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/alabaster/${name}.tar.gz";
-      sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71";
-    };
-
-    propagatedBuildInputs = with self; [ pygments ];
-
-    # No tests included
-    doCheck = false;
-
-    meta = {
-      homepage = https://github.com/bitprophet/alabaster;
-      description = "A Sphinx theme";
-      license = licenses.bsd3;
-    };
-  };
-
+  alabaster = callPackage ../development/python-modules/alabaster {};
 
   alembic = callPackage ../development/python-modules/alembic {};
 

From 22644615e3820ed015fa49d78d6299525680e289 Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Wed, 19 Jul 2017 11:42:25 +0200
Subject: [PATCH 0747/3246] idea-community: 2017.1.5 -> 2017.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 9bd002137c4..87895fc5113 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -265,12 +265,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2017.1.5"; /* updated by script */
+    version = "2017.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 = "830c662c517e8d0131dc2df150d6f75adb3d8becaf9de96393730b0f4ae6ccf0"; /* updated by script */
+      sha256 = "0z5abj41f5l9ilznr34lm4fsivrl2yjdxb2kdcis5abij6zl0g3f";
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";

From 2780e2a780d24dfb252cde0ac7ec560823e37798 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 19 Jul 2017 11:06:06 +0100
Subject: [PATCH 0748/3246] nixUnstable: pre5413_b4b1f452 -> pre5506_3162ad5f

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 910dc6de871..2c81b972f92 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -161,12 +161,12 @@ in rec {
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5413_b4b1f452";
+    suffix = "pre5506_3162ad5f";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "b4b1f4525f8dc8f320d666c208bff5cb36777580";
-      sha256 = "0qb18k2rp6bbg8g50754srl95dq0lr96i297856yhrx1hh1ja37z";
+      rev = "3162ad5ff497b92fc25cd3f397eaff01d67340cc";
+      sha256 = "0gs1fqqm2ghbq2svz1h4bna9f0zjw2cs8ha7cn27kwajb14qw8fk";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };

From 4cc69fac730a4020a0a6d31d07c9063efdace240 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 19 Jul 2017 12:14:47 +0200
Subject: [PATCH 0749/3246] ace: 6.4.2 -> 6.4.3

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

diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index 9bc714c5538..42988e334b0 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ace-${version}";
-  version = "6.4.2";
+  version = "6.4.3";
 
   src = fetchurl {
     url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "0dscvlgxy0fwma63azjkdbc85mh8k751ik67s88w6w75j0psld73";
+    sha256 = "07dvpi3abmjvg7m0aak4x82aj8cvw5zl2cqj525wd3fl6y0pn3mq";
   };
 
   enableParallelBuilding = true;

From 4206da05b0618f36615f5cf7d89118f2a5045325 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 17:23:52 +0700
Subject: [PATCH 0750/3246] python.pkgs.ansicolors : move to separate
 expression

---
 .../python-modules/ansicolors/default.nix     | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/ansicolors/default.nix

diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix
new file mode 100644
index 00000000000..bc070180654
--- /dev/null
+++ b/pkgs/development/python-modules/ansicolors/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "ansicolors";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/verigak/colors/";
+    description = "ANSI colors for Python";
+    license = licenses.isc;
+    maintainers = with maintainers; [ copumpkin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 031fca0f6ef..7d977a6eaac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -309,23 +309,7 @@ in {
 
   alembic = callPackage ../development/python-modules/alembic {};
 
-  ansicolors = buildPythonPackage rec {
-    name    = "ansicolors-${version}";
-    version = "1.0.2";
-
-    src = self.fetchPypi {
-      pname = "ansicolors";
-      inherit version;
-      sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n";
-    };
-
-    meta = {
-      homepage = "https://github.com/verigak/colors/";
-      description = "ANSI colors for Python";
-      license = licenses.isc;
-      maintainers = with maintainers; [ copumpkin ];
-    };
-  };
+  ansicolors = callPackage ../development/python-modules/ansicolors {};
 
   aniso8601 = buildPythonPackage rec {
     name = "aniso8601-${version}";

From ff6797e8aa0e3cca42acb7416f058d39eb0fa630 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 17:29:13 +0700
Subject: [PATCH 0751/3246] python.pkgs.aniso8601 : move to separate expression

---
 .../python-modules/aniso8601/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +---------------
 2 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/aniso8601/default.nix

diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix
new file mode 100644
index 00000000000..bc49e991b4f
--- /dev/null
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, dateutil }:
+
+buildPythonPackage rec {
+  pname = "aniso8601";
+  version = "1.2.0";
+  name = "${pname}-${version}";
+
+  meta = with stdenv.lib; {
+    description = "Parses ISO 8601 strings.";
+    homepage    = "https://bitbucket.org/nielsenb/aniso8601";
+    license     = licenses.bsd3;
+  };
+
+  propagatedBuildInputs = [ dateutil ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d977a6eaac..102db661811 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -311,23 +311,7 @@ in {
 
   ansicolors = callPackage ../development/python-modules/ansicolors {};
 
-  aniso8601 = buildPythonPackage rec {
-    name = "aniso8601-${version}";
-    version = "1.2.0";
-
-    meta = {
-      description = "Parses ISO 8601 strings.";
-      homepage    = "https://bitbucket.org/nielsenb/aniso8601";
-      license     = licenses.bsd3;
-    };
-
-    propagatedBuildInputs = with self; [ dateutil ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/aniso8601/${name}.tar.gz";
-      sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4";
-    };
-  };
+  aniso8601 = callPackage ../development/python-modules/aniso8601 {};
 
   asgiref = callPackage ../development/python-modules/asgiref { };
 

From 0671b8811515abe2b4f941bebd779484e7e648a7 Mon Sep 17 00:00:00 2001
From: David Sferruzza <david.sferruzza@gmail.com>
Date: Wed, 19 Jul 2017 11:28:32 +0200
Subject: [PATCH 0752/3246] veracrypt: 1.19 -> 1.21

---
 pkgs/applications/misc/veracrypt/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index a3fa8924df7..86924d9b3ca 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK30, devicemapper, makeself,
+{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself,
   wxGUI ? true
 }:
 
@@ -6,21 +6,20 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "veracrypt-${version}";
-  version = "1.19";
+  version = "1.21";
 
   src = fetchurl {
-    url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.gz";
-    sha256 = "111xs1zmic82lpn5spn0ca33q0g4za04a2k4cvjwdb7k3vcicq6v";
+    url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
+    sha256 = "0n036znmwnv70wy8r2j3b55bx2z3cch5fr83vnwjvzyyp0j7swa4";
   };
 
-  # The source archive appears to be compressed twice ...
   unpackPhase =
     ''
-      gzip -dc $src | tar xz
-      cd Vera*/src
+      tar xjf $src
+      cd src
     '';
 
-  nativeBuildInputs = [ makeself nasm pkgconfig ];
+  nativeBuildInputs = [ makeself yasm pkgconfig ];
   buildInputs = [ fuse devicemapper ]
     ++ optional wxGUI wxGTK30;
   makeFlags = optionalString (!wxGUI) "NOGUI=1";

From 84c305562035a7a7d2d8557735470d2d96e8b11a Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 17:41:57 +0700
Subject: [PATCH 0753/3246] python.pkgs.python-editor : move to separate
 expression

---
 .../python-modules/python-editor/default.nix    | 17 +++++++++++++++++
 pkgs/top-level/python-packages.nix              | 15 +--------------
 2 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/python-editor/default.nix

diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix
new file mode 100644
index 00000000000..98ed980588e
--- /dev/null
+++ b/pkgs/development/python-modules/python-editor/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  version = "0.4";
+  pname = "python-editor";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A library that provides the `editor` module for programmatically";
+    homepage = "https://github.com/fmoo/python-editor";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 102db661811..21f17b303c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -319,20 +319,7 @@ in {
 
   asgi_redis = callPackage ../development/python-modules/asgi_redis { };
 
-  python-editor = buildPythonPackage rec {
-    name = "python-editor-${version}";
-    version = "0.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-editor/${name}.tar.gz";
-      sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4";
-    };
-
-    meta = with stdenv.lib; {
-      description = "`python-editor` is a library that provides the `editor` module for programmatically";
-      homepage = "https://github.com/fmoo/python-editor";
-    };
-  };
+  python-editor = callPackage ../development/python-modules/python-editor { };
 
   python-gnupg = callPackage ../development/python-modules/python-gnupg {};
 

From ccf0468a84a61ddb85b6007af9fe5842cc6f7f47 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Wed, 19 Jul 2017 18:23:11 +0700
Subject: [PATCH 0754/3246] python.pkgs.python-uinput : move to separate
 expression

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

diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix
new file mode 100644
index 00000000000..93b67fe4782
--- /dev/null
+++ b/pkgs/development/python-modules/python-uinput/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, udev }:
+
+buildPythonPackage rec {
+  pname = "python-uinput";
+  version = "0.11.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "033zqiypjz0nigav6vz0s57pbzikvds55mxphrdpkdbpdikjnfcr";
+  };
+
+  buildInputs = [ 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 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 21f17b303c2..16f0ce0099c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -323,26 +323,7 @@ in {
 
   python-gnupg = callPackage ../development/python-modules/python-gnupg {};
 
-  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 ];
-    };
-  };
+  python-uinput = callPackage ../development/python-modules/python-uinput {};
 
   python-sybase = buildPythonPackage rec {
     name = "python-sybase-${version}";

From 8bfa41cbe7d54abc04c62571e978b845302be3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 19 Jul 2017 12:31:02 +0100
Subject: [PATCH 0755/3246] python.pkgs.ropper: document test failure on some
 setups

cc @bennofs
---
 pkgs/development/python-modules/ropper/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 37369b8f0bd..c8958f9dd1f 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -14,6 +14,8 @@ buildPythonApplication rec {
     inherit pname version;
     sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87";
   };
+  # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise
+  # workaround: sudo chmod 777 /dev/shm
   checkPhase = ''
     py.test testcases
   '';

From 6b628d7c03df05b445ba1a962bd5b09f7ae8e584 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 19 Jul 2017 12:49:46 +0200
Subject: [PATCH 0756/3246] rsync: build with own zlib again

Rsync has its own patched compress function, and to be able to use the `-z` flag, it needs to use that one.

With `-zz` rsync can use an external zlib, but then it can't talk to older rsync versions.

More details at https://bugs.mageia.org/show_bug.cgi?id=13669
---
 pkgs/applications/networking/sync/rsync/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index b24be07b8ee..1f5e9601ff2 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs = [libiconv zlib popt] ++ stdenv.lib.optional enableACLs acl;
   nativeBuildInputs = [perl];
 
-  configureFlags = ["--with-nobody-group=nogroup" "--without-included-zlib"];
+  configureFlags = ["--with-nobody-group=nogroup"];
 
   meta = base.meta // {
     description = "A fast incremental file transfer utility";

From ac594af559685963e22214c2e933c0c94801764b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 19 Jul 2017 14:35:21 +0200
Subject: [PATCH 0757/3246] pythonmagick: note to whoever maintains this that
 expression should be moved

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

diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index 332bb8794e7..b1f64afd9ae 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -1,3 +1,5 @@
+# This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`.
+
 {stdenv, fetchurl, python, boost, pkgconfig, imagemagick}:
 
 stdenv.mkDerivation rec {

From d36614cb2831fca809fc58d932328f51133de40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 19 Jul 2017 14:20:38 +0100
Subject: [PATCH 0758/3246] flamegraph: 2017-05-11 -> 2017-07-01

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

diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix
index 51bdf772adb..a351c325ea2 100644
--- a/pkgs/development/tools/flamegraph/default.nix
+++ b/pkgs/development/tools/flamegraph/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation {
-  name = "FlameGraph-2017-05-11";
+  name = "FlameGraph-2017-07-01";
 
   src = fetchFromGitHub {
     owner = "brendangregg";
     repo = "FlameGraph";
-    rev = "6b2a446dfb5d8027a0adf14adf71748aa502c247";
-    sha256 = "11j1776zsvhn9digqay1cbfhhxz01nv2hm44i4gnpqcxkada44l2";
+    rev = "a93d905911c07c96a73b35ddbcb5ddb2f39da4b6";
+    sha256 = "07z2ffnab41dz833wwgr875vjccqyh0238357g7ml1yg5445x2jy";
   };
 
   buildInputs = [ perl ];

From c1ff08bfe5f66b00408a89e9d10f9ba816933816 Mon Sep 17 00:00:00 2001
From: bugworm <bugworm@zoho.com>
Date: Wed, 19 Jul 2017 14:03:54 +0300
Subject: [PATCH 0759/3246] papirus-icon-theme: 20170616 -> 20170715

---
 pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 70bf0186f1c..082fa29fa9d 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "papirus-icon-theme-${version}";
-  version = "20170616";
+  version = "20170715";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "papirus-icon-theme";
     rev = "${version}";
-    sha256 = "008nkmxp3f9qqljif3v9ns3a8mflzffv2mm5zgjng9pmdl5x70j4";
+    sha256 = "0mpmgpjwc7azhypvrlnxaa0c4jc6g7vgy242apxrn8jcv9ndmwyk";
   };
 
   dontBuild = true;

From 60c9a4c94aa9c7445085e683df95be84d663069c Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Tue, 18 Jul 2017 21:50:45 -0400
Subject: [PATCH 0760/3246] alock: 20150418 -> 20160713

---
 pkgs/misc/screensavers/alock/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index 6f2ebbc5158..164471d144b 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -2,13 +2,15 @@
 , libX11, pam, libgcrypt, libXrender, imlib2 }:
 
 stdenv.mkDerivation rec {
-  date = "20150418";
+  date = "20160713";
   name = "alock-${date}";
 
+  # Please consider https://github.com/Arkq/alock/issues/5
+  # before upgrading past this revision.
   src = fetchgit {
     url = https://github.com/Arkq/alock;
-    rev = "69b547602d965733d415f877eb59d05966bd158d";
-    sha256 = "0lv2ng5qxzcq0vwbl61dbwigv79sin4zg90y9cgsz6ydvm4ncpas";
+    rev = "329ac152426639fe3c9e53debfc3f973c2988f50";
+    sha256 = "078nf2afyqv7hpk5kw50i57anm7qqd8jnczygnwimh2q40bljm7x";
   };
 
   configureFlags = [
@@ -17,12 +19,13 @@ stdenv.mkDerivation rec {
     "--enable-xrender"
     "--enable-imlib2"
   ];
+
   buildInputs = [
     pkgconfig autoreconfHook libX11
     pam libgcrypt libXrender imlib2
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/Arkq/alock;
     description = "Simple screen lock application for X server";
     longDescription = ''
@@ -31,10 +34,10 @@ stdenv.mkDerivation rec {
       the X server is unlocked and the user can continue to work.
 
       alock does not provide any fancy animations like xlock or
-      xscreensaver and never will. Its just for locking the current
+      xscreensaver and never will. It's just for locking the current
       X session.
     '';
-    platforms = with stdenv.lib.platforms; allBut cygwin;
-    maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ];
+    platforms = with platforms; allBut cygwin;
+    maintainers = with maintainers; [ ftrvxmtrx chris-martin ];
   };
 }

From b66858582ce71aaa753a8277571e66f541658c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 19 Jul 2017 18:17:39 +0200
Subject: [PATCH 0761/3246] python-pwntools: 3.7.0 -> 3.7.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 b872928597a..b403205190e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29481,11 +29481,11 @@ EOF
 
   pwntools = buildPythonPackage rec {
     name = "pwntools-${version}";
-    version = "3.7.0";
+    version = "3.7.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pwntools/${name}.tar.gz";
-      sha256 = "1d2q42cmgh7l2k6l2gy4zllgj9a5qc59af3skp2b80hmv88h6vij";
+      sha256 = "1c0n97cf3nql3n6sxpbp43x1byhkgfbpbl2b22h8nllgb8n0z9l0";
     };
     propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc unicorn intervaltree ];
 

From becf96b2ca59d94830a0de017a8fe9a07193828d Mon Sep 17 00:00:00 2001
From: Tom Smeets <Tom.TSmeets@Gmail.com>
Date: Wed, 19 Jul 2017 18:22:39 +0200
Subject: [PATCH 0762/3246] android-studio-preview: 3.0.0.5 -> 3.0.0.6

---
 pkgs/applications/editors/android-studio/packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index cf7173934bb..860f1e53297 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,16 +27,17 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.5";
-    build = "171.4163606";
+    version = "3.0.0.6";
+    build = "171.4182969";
 
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
-      sha256 = "1gxnpw4jf3iic9d47sjbndpysq8kk8pgnb8l7azkc2rba5cj8skg";
+      sha256 = "0s26k5qr0qg6az77yw2mvnhavwi4aza4ifvd45ljank8aqr6sp5i";
     };
 
     meta = stable.meta // {
       homepage = https://developer.android.com/studio/preview/index.html;
+      maintainers = with stdenv.lib.maintainers; [ tomsmeets ];
     };
   } {
     fontsConf = makeFontsConf {

From e1c57c46986a884fe188fb62944612db6c15ddb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 19 Jul 2017 18:40:14 +0200
Subject: [PATCH 0763/3246] pyelftools: 0.23 -> 0.24

---
 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 b403205190e..f8ed854cf69 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18392,12 +18392,12 @@ in {
 
   pyelftools = buildPythonPackage rec {
     pname = "pyelftools";
-    version = "0.23";
+    version = "0.24";
     name = "${pname}-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "1pi1mdzfffgl5qcz0prsa7hlbriycy7mgagi0fdrp3vf17fslmzw";
+      sha256 = "17259kf6hwwsmizr5myp9jv3k9g5i3dvmnl8m646pfd5hpb9gpg9";
     };
 
     checkPhase = ''

From 010163d04de8ebf6db119501eee844191c1dea77 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxc@cs.arizona.edu>
Date: Wed, 19 Jul 2017 09:46:34 -0700
Subject: [PATCH 0764/3246] ttyrec: fix build on Darwin (#27500)

* ttyrec: fix build on Darwin

* ttyrec: remove pointless empty list
---
 pkgs/tools/misc/ttyrec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix
index a836a2a0d0e..238d2d73d3b 100644
--- a/pkgs/tools/misc/ttyrec/default.nix
+++ b/pkgs/tools/misc/ttyrec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, buildPlatform }:
 
 stdenv.mkDerivation rec {
   name = "ttyrec-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./clang-fixes.patch ];
 
-  makeFlags = [ "CFLAGS=-DSVR4" ]
+  makeFlags = stdenv.lib.optional buildPlatform.isLinux "CFLAGS=-DSVR4"
     ++ stdenv.lib.optional stdenv.cc.isClang "CC=clang";
 
   installPhase = ''

From 3cc46829c74dacd11c7803ab5298e59fbab9e794 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Jul 2017 18:53:30 +0200
Subject: [PATCH 0765/3246] haskell-symengine: the build is broken because the
 system library this code binds to does not exist

This error isn't easily detectable, however, because the Cabal files declares
the dependency on "symengine" for the test program rather than for the library
itself.

https://github.com/symengine/symengine.hs/pull/14
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 63b7c765bad..8fa2cbcf713 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -375,7 +375,6 @@ self: super: {
   static-resources = dontCheck super.static-resources;
   strive = dontCheck super.strive;                      # fails its own hlint test with tons of warnings
   svndump = dontCheck super.svndump;
-  symengine = dontCheck super.symengine;
   tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit)
   th-printf = dontCheck super.th-printf;
   thumbnail-plus = dontCheck super.thumbnail-plus;

From a03d6116cebc0bf7f03aa4d200a902c6d8c0abd6 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 19 Jul 2017 21:34:17 +0200
Subject: [PATCH 0766/3246] gitlab: fix archive urls for gitlab service

Accessing an url like https://gitlab.example.org/group/project/repository/archive.tar.gz?ref=master
requires tar/gzip to be in the path of the gitlab-workhorse service otherwise it fails.
---
 nixos/modules/services/misc/gitlab.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 0ed5a539e7d..ccc1854d254 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -439,6 +439,8 @@ in {
       environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
       path = with pkgs; [
         gitAndTools.git
+        gnutar
+        gzip
         openssh
         gitlab-workhorse
       ];

From c4ea2d0b47916b1a6676ca313dfa6f78e0d5c2f5 Mon Sep 17 00:00:00 2001
From: Anton Schirg <anton.schirg@posteo.de>
Date: Wed, 19 Jul 2017 22:03:28 +0200
Subject: [PATCH 0767/3246] houdini: 16.0.633 -> 16.0.671

---
 pkgs/applications/misc/houdini/default.nix | 3 +--
 pkgs/applications/misc/houdini/runtime.nix | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix
index 4e40230108b..0b679617243 100644
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/pkgs/applications/misc/houdini/default.nix
@@ -1,10 +1,9 @@
 { zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }:
 
 let
-  version = "16.0.633";
   houdini-runtime = callPackage ./runtime.nix { };
 in buildFHSUserEnv rec {
-  name = "houdini-${version}";
+  name = "houdini-${houdini-runtime.version}";
 
   extraBuildCommands = ''
     mkdir -p $out/usr/lib/sesi
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 8e89640d7dc..3a91d27fc48 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -29,11 +29,11 @@ let
   license_dir = "~/.config/houdini";
 in
 stdenv.mkDerivation rec {
-  version = "16.0.633";
+  version = "16.0.671";
   name = "houdini-runtime-${version}";
   src = requireFile rec {
-    name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz";
-    sha256 = "1wwm3gqmwn7xbm2qrpb4al44kzgswmsvmjndjkbqskwinxqmg9y2";
+    name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz";
+    sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r";
     message = ''
       This nix expression requires that ${name} is already part of the store.
       Download it from https://sidefx.com and add it to the nix store with:

From 0b027720af00264b142e1ecade0e4fb576889909 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Wed, 19 Jul 2017 22:13:02 +0100
Subject: [PATCH 0768/3246] nixos tests: run postgresql tests with postgres
 user

---
 nixos/tests/postgresql.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 54e7ec9ba17..0ce37b55bb7 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -26,24 +26,26 @@ let
       {
         services.postgresql.package=postgresql-package;
         services.postgresql.enable = true;
-        services.postgresql.initialScript = pkgs.writeText "init.sql" ''
-          CREATE USER root WITH SUPERUSER;
-        '';
       };
 
     testScript = ''
+      sub check_count {
+        my ($select, $nlines) = @_;
+        return 'test $(sudo -u postgres psql postgres -tAc "' . $select . '"|wc -l) -eq ' . $nlines;
+      }
+
       $machine->start;
       $machine->waitForUnit("postgresql");
       # postgresql should be available just after unit start
-      $machine->succeed("cat ${test-sql} | psql postgres");
+      $machine->succeed("cat ${test-sql} | sudo -u postgres psql");
       $machine->shutdown; # make sure that postgresql survive restart (bug #1735)
       sleep(2);
       $machine->start;
       $machine->waitForUnit("postgresql");
-      $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 3');
-      $machine->succeed('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 5');
-      $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 4');
-      $machine->succeed('test $(psql postgres -tAc "SELECT xpath(\'/test/text()\', doc) FROM xmltest;"|wc -l) -eq 1');
+      $machine->fail(check_count("SELECT * FROM sth;", 3));
+      $machine->succeed(check_count("SELECT * FROM sth;", 5));
+      $machine->fail(check_count("SELECT * FROM sth;", 4));
+      $machine->succeed(check_count("SELECT xpath(\'/test/text()\', doc) FROM xmltest;", 1));
       $machine->shutdown;
     '';
 

From d1d0824b2f6e828eb9529dbb6666cbadd3e95726 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 19 Jul 2017 17:41:14 -0400
Subject: [PATCH 0769/3246] elastix: change platforms to "linux" from "unix"

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

diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix
index 55647713e6e..06550372ba8 100644
--- a/pkgs/development/libraries/science/biology/elastix/default.nix
+++ b/pkgs/development/libraries/science/biology/elastix/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = http://elastix.isi.uu.nl/;
     description = "Image registration toolkit based on ITK";
     maintainers = with maintainers; [ bcdarwin ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     license = licenses.asl20;
   };
 }

From d00e53dc1ac7341d06e662293721fcbf06bfa95a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 19 Jul 2017 23:58:53 +0200
Subject: [PATCH 0770/3246] bash-completion: 2.5 -> 2.7

---
 pkgs/shells/bash-completion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index 3ac1ca2172d..1c1b83d67b9 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bash-completion-${version}";
-  version = "2.5";
+  version = "2.7";
 
   src = fetchurl {
     url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1kwmii1z1ljx5i4z702ynsr8jgrq64bj9w9hl3n2aa2kcl659fdh";
+    sha256 = "07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1";
   };
 
   doCheck = true;

From 2b2a6f20701c4740526a8976f3ac60fc6be797e2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 19 Jul 2017 19:23:40 -0400
Subject: [PATCH 0771/3246] nixos/ldap: remove tls_checkpeer no when using TLS

---
 nixos/modules/config/ldap.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
index da875d6e482..710dfdd01af 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixos/modules/config/ldap.nix
@@ -19,7 +19,6 @@ let
       bind_policy ${config.users.ldap.bind.policy}
       ${optionalString config.users.ldap.useTLS ''
         ssl start_tls
-        tls_checkpeer no
       ''}
       ${optionalString (config.users.ldap.bind.distinguishedName != "") ''
         binddn ${config.users.ldap.bind.distinguishedName}

From d59dc71148515d081079d03a34aa9fe768afcf39 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 19 Jul 2017 23:46:49 +0200
Subject: [PATCH 0772/3246] strongswan: build xauth-pam module

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

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 2225df308ac..076126bea7e 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, systemd
+, ldns, unbound, pcsclite, openssl, systemd, pam
 , enableTNC ? false }:
 
 stdenv.mkDerivation rec {
@@ -14,9 +14,11 @@ stdenv.mkDerivation rec {
 
   dontPatchELF = true;
 
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs =
-    [ gmp pkgconfig python autoreconfHook iptables ldns unbound openssl pcsclite systemd.dev ]
-    ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ];
+    [ gmp python iptables ldns unbound openssl pcsclite ]
+    ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ systemd.dev pam ];
 
   patches = [
     ./ext_auth-path.patch
@@ -48,7 +50,7 @@ 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-af-alg" ]
+      "--enable-af-alg" "--enable-xauth-pam" ]
     ++ stdenv.lib.optional stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock"
     ++ stdenv.lib.optionals enableTNC [

From ab9239f4f98b9efba3177de926082d526b255c8d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 19 Jul 2017 23:48:05 +0200
Subject: [PATCH 0773/3246] strongswan build chapoly module

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

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 076126bea7e..2c0352152d5 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -50,7 +50,7 @@ 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-af-alg" "--enable-xauth-pam" ]
+      "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ]
     ++ stdenv.lib.optional stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock"
     ++ stdenv.lib.optionals enableTNC [

From bbafe64bddac90ac1ca7ee5dcdfb2f90dc21b5e4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 19 Jul 2017 22:35:41 +0200
Subject: [PATCH 0774/3246] hue-cli: init at 0.1.4

---
 pkgs/tools/networking/hue-cli/Gemfile      |  2 ++
 pkgs/tools/networking/hue-cli/Gemfile.lock | 18 ++++++++++++++
 pkgs/tools/networking/hue-cli/default.nix  | 10 ++++++++
 pkgs/tools/networking/hue-cli/gemset.nix   | 28 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 5 files changed, 60 insertions(+)
 create mode 100644 pkgs/tools/networking/hue-cli/Gemfile
 create mode 100644 pkgs/tools/networking/hue-cli/Gemfile.lock
 create mode 100644 pkgs/tools/networking/hue-cli/default.nix
 create mode 100644 pkgs/tools/networking/hue-cli/gemset.nix

diff --git a/pkgs/tools/networking/hue-cli/Gemfile b/pkgs/tools/networking/hue-cli/Gemfile
new file mode 100644
index 00000000000..7049659d503
--- /dev/null
+++ b/pkgs/tools/networking/hue-cli/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'hue-cli'
diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/pkgs/tools/networking/hue-cli/Gemfile.lock
new file mode 100644
index 00000000000..3b1f6570700
--- /dev/null
+++ b/pkgs/tools/networking/hue-cli/Gemfile.lock
@@ -0,0 +1,18 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    hue-cli (0.1.4)
+      hue-lib (>= 0.7.4)
+      json
+    hue-lib (0.7.4)
+      json
+    json (2.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  hue-cli
+
+BUNDLED WITH
+   1.15.1
diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/tools/networking/hue-cli/default.nix
new file mode 100644
index 00000000000..4f8d1039e5e
--- /dev/null
+++ b/pkgs/tools/networking/hue-cli/default.nix
@@ -0,0 +1,10 @@
+{ bundlerEnv, ruby }:
+
+bundlerEnv rec {
+  name = "hue-cli-${version}";
+
+  version = (import gemset).hue-cli.version;
+  inherit ruby;
+  gemdir = ./.;
+  gemset = ./gemset.nix;
+}
diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/pkgs/tools/networking/hue-cli/gemset.nix
new file mode 100644
index 00000000000..d1af93ff154
--- /dev/null
+++ b/pkgs/tools/networking/hue-cli/gemset.nix
@@ -0,0 +1,28 @@
+{
+  hue-cli = {
+    dependencies = ["hue-lib" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10gjf59pamfy2m17fs271d9ffrg1194b1m6vxzn6p7smzry52h9z";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  hue-lib = {
+    dependencies = ["json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pyl8g8gisdhl79gbzvnddqrsbq0lmflzg7n6yi6xrp5b5290shz";
+      type = "gem";
+    };
+    version = "0.7.4";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2955ac7c79a..0c677126d45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14608,6 +14608,8 @@ with pkgs;
 
   ht = callPackage ../applications/editors/ht { };
 
+  hue-cli = callPackage ../tools/networking/hue-cli { };
+
   hugin = callPackage ../applications/graphics/hugin { };
 
   hugo = callPackage ../applications/misc/hugo { };

From 95bf0cc1cb1ebb272ac456641bc19c0166b1ee4e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 18 Jul 2017 16:42:52 +0200
Subject: [PATCH 0775/3246] programs.zsh.ohMyZsh: add `package` option to make
 package overrides on module-base easier

---
 nixos/modules/programs/zsh/oh-my-zsh.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix
index aa5844cdc4d..9077643c444 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@@ -15,6 +15,16 @@ in
           '';
         };
 
+        package = mkOption {
+          default = pkgs.oh-my-zsh;
+          defaultText = "pkgs.oh-my-zsh";
+          description = ''
+            Package to install for `oh-my-zsh` usage.
+          '';
+
+          type = types.package;
+        };
+
         plugins = mkOption {
           default = [];
           type = types.listOf(types.str);
@@ -46,11 +56,11 @@ in
       # Prevent zsh from overwriting oh-my-zsh's prompt
       programs.zsh.promptInit = mkDefault "";
 
-      environment.systemPackages = with pkgs; [ oh-my-zsh ];
+      environment.systemPackages = [ cfg.package ];
 
-      programs.zsh.interactiveShellInit = with pkgs; with builtins; ''
+      programs.zsh.interactiveShellInit = with builtins; ''
         # oh-my-zsh configuration generated by NixOS
-        export ZSH=${oh-my-zsh}/share/oh-my-zsh
+        export ZSH=${cfg.package}/share/oh-my-zsh
 
         ${optionalString (length(cfg.plugins) > 0)
           "plugins=(${concatStringsSep " " cfg.plugins})"

From 83fe3f02684dfe7a253142c6d62c16fc4e916645 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Jul 2017 09:15:03 +0200
Subject: [PATCH 0776/3246] multi-ghc-travis: update to current Git master
 800980d76f7a74f3

---
 .../tools/haskell/multi-ghc-travis/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 81707a6bfc3..ed6c7d73fdb 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "multi-ghc-travis-${version}";
-  version = "git-2017-05-24";
+  version = "git-2017-07-26";
 
   buildInputs = [ ghc ];
 
   src = fetchFromGitHub {
     owner = "hvr";
     repo = "multi-ghc-travis";
-    rev = "c1dcbcbcd3eadcc63adeac65d63497885b422a44";
-    sha256 = "12xss8wgsqs2fghrfl4h6g5wli6wn274zmdsq5zdcib2m7da5yw2";
+    rev = "800980d76f7a74f3cdfd76b3dff351d52d2c84ee";
+    sha256 = "03y8b4iz5ly9vkjc551c1bxalg1vl4k2sic327s3vh00jmjgvhz6";
   };
 
   installPhase = ''
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/hvr/multi-ghc-travis";
     license = licenses.bsd3;
     platforms = ghc.meta.platforms;
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ jb55 peti ];
   };
 }

From aee463b204aaec97f95634d20dd2e00c62b05f44 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 20 Jul 2017 10:48:45 +0200
Subject: [PATCH 0777/3246] slop: 6.3.46 -> 6.3.47

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

diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index 29a4dae9f74..d2bf060edd0 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchFromGitHub, cmake
-, glm, mesa, libX11, libXext, libXrender, cppcheck, icu}:
+, glew, glm, mesa, libX11, libXext, libXrender, cppcheck, icu}:
 
 stdenv.mkDerivation rec {
   name = "slop-${version}";
-  version = "6.3.46";
+  version = "6.3.47";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "slop";
     rev = "v${version}";
-    sha256 = "0k4i0s0rk82la9ac173whrjgrlw9977b2dgp34czi3knlkz9ynsg";
+    sha256 = "05saxp5z2saq6b5hslxdc5kd7ln00svr5pazabcnchzydfhnkmsd";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ glm mesa libX11 libXext libXrender icu ]
+  buildInputs = [ glew glm mesa libX11 libXext libXrender icu ]
                 ++ stdenv.lib.optional doCheck cppcheck;
 
   doCheck = false;

From 20780bf33a8cdf9a5addc03c0b361b8bc33e5b3a Mon Sep 17 00:00:00 2001
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
Date: Thu, 20 Jul 2017 10:01:38 +0100
Subject: [PATCH 0778/3246] wolfssl: 3.10.3 -> 3.11.0

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

diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 1d19b441740..0f1f87b9bd6 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.10.3";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
-    rev = "v${version}";
-    sha256 = "05j3sg4vdzir89qy6y566wyfpqaz3mn53fiqg7ia4r7wjwhzbzrw";
+    rev = "v${version}-stable";
+    sha256 = "0s4s9adni2q1sgqpavbmxhkl8i98bmlw6gla6dnifgsm1dirv75w";
   };
 
   outputs = [ "out" "dev" "doc" "lib" ];

From 480397c35f16fbb2ee383ada3d8428d3667a39d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Jul 2017 12:57:33 +0200
Subject: [PATCH 0779/3246] poppler: update to version 0.56.0

Previous versions have a ton of bugs that may be used in DoS attacks, i.e. by
making poppler-based services crash when processing specially crafted PDF
documents.
---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 856c7bac8ce..e8edee3ba18 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -10,8 +10,8 @@
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.50.0";
-  sha256 = "0dmwnh59m75vhii6dw63x8l0qa0ha733pb8bdqzr7lw9nwc37jf9";
+  version = "0.56.0";
+  sha256 = "0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6";
 in
 stdenv.mkDerivation rec {
   name = "poppler-${suffix}-${version}";

From e8c72a46f5787b499facd24ae5d3aff84b5f2b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 20 Jul 2017 13:53:01 +0200
Subject: [PATCH 0780/3246] bashInteractive: add a warning not to be
 renamed/removed

---
 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 0c677126d45..5f4ecbd1676 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5052,6 +5052,7 @@ with pkgs;
     interactive = stdenv.isCygwin; # patch for cygwin requires readline support
   });
 
+  # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
   bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.4.nix {
     interactive = true;
   });

From b61f0fe40b7b79222e06a71911793f9f6b3bacae Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Thu, 20 Jul 2017 08:14:35 -0400
Subject: [PATCH 0781/3246] elixir: 1.5.0-rc.1 -> 1.5.0-rc.2

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

diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index add21c15a2d..0c3c0304a9b 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.5.0-rc.1";
-  sha256 = "1aqbhyzwjqg57f99kwqzxkk4gjaqgwb7nmgpgdp7psa0ly742i9q";
+  version = "1.5.0-rc.2";
+  sha256 = "0wfxsfz1qbb6iapg8j1qskva6j4mccxqvv79xbz08fzzb6n1wvxa";
   minimumOTPVersion = "18";
 }

From 563847275649c868c71d8df9103cc00b249fa422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Jul 2017 13:19:38 +0100
Subject: [PATCH 0782/3246] clion: 2017.1.3 -> 2017.2

---
 pkgs/applications/editors/jetbrains/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 87895fc5113..28a75befba8 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -50,6 +50,9 @@ let
 
           patchelf --set-interpreter $interp bin/gdb/bin/gdb
           patchelf --set-interpreter $interp bin/gdb/bin/gdbserver
+          patchelf --set-interpreter $interp \
+            --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$lldbLibPath" \
+            bin/clang/clang-tidy
         )
       '';
     });
@@ -213,12 +216,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2017.1.3";
+    version = "2017.2"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "045pkbbf4ypk9qkhldz08i7hbc6vaq68a8v9axnpndnvcrf0vf7g";
+      sha256 = "de7f47ec959be9653aa4d2028fb27f8327800d8370daa0ab2d1093f3469f4b49"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

From 2712554f4f2d3629ea3ab3d8ec437936bb5515e0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Jul 2017 11:54:25 +0300
Subject: [PATCH 0783/3246] xfsprogs: 4.5.0 -> 4.11.0

---
 pkgs/tools/filesystems/xfsprogs/default.nix | 59 +++++++++++----------
 pkgs/top-level/all-packages.nix             |  4 +-
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index ed41470f600..eaea921c6f5 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -1,56 +1,59 @@
-{ stdenv, fetchurl, gettext, libuuid, readline }:
+{ stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline, utillinux }:
+
+let
+  gentooPatch = name: sha256: fetchpatch {
+    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=8293574ab30c85e2965fb2b7dd890b44841b8404";
+    inherit sha256;
+  };
+in
 
 stdenv.mkDerivation rec {
-  name = "xfsprogs-4.5.0";
+  name = "xfsprogs-${version}";
+  version = "4.11.0";
 
-  src = fetchurl {
-    urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz")
-      [ "cmd_tars" "previous" ];
-    sha256 = "1y49rwvbbvqdq2a1x7p5i05bcfyv6xhmrfwafl6vvvw494qyp6z4";
+  src = fetchgit {
+    url = "git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "0icliinacg6c3ziaqzyyxfz9jykn80njj9fdv3milhsf81yhnrpn";
   };
 
-  prePatch = ''
-    sed -i "s,/bin/bash,$(type -P bash),g" install-sh
-    sed -i "s,ldconfig,$(type -P ldconfig),g" configure m4/libtool.m4
+  outputs = [ "bin" "dev" "out" "doc" ];
 
-    # Fixes from gentoo 3.2.1 ebuild
-    sed -i "/^PKG_DOC_DIR/s:@pkg_name@:${name}:" include/builddefs.in
-    sed -i "/LLDFLAGS.*libtool-libs/d" $(find -name Makefile)
-    sed -i '/LIB_SUBDIRS/s:libdisk::' Makefile
-  '';
+  nativeBuildInputs = [ autoconf automake libtool gettext ];
+  propagatedBuildInputs = [ utillinux ]; # Dev headers include <uuid/uuid.h>
+  buildInputs = [ readline ];
 
+  enableParallelBuilding = true;
+
+  # Why is all this garbage needed? Why? Why?
   patches = [
-    # This patch fixes shared libs installation, still not fixed in 4.2.0
-    ./4.3.0-sharedlibs.patch
+    (gentooPatch "xfsprogs-4.7.0-sharedlibs.patch" "1s83ihaccmjrw4zm0nbdwqk3jx4wc1rijpsqrg7ir71ln7qknwzz")
+    (gentooPatch "xfsprogs-4.7.0-libxcmd-link.patch" "1lvy1ajzml39a631a7jqficnzsd40bzkca7hkxv1ybiqyp8sf55s")
+    (gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7")
   ];
 
-  propagatedBuildInputs = [ libuuid ];
-  buildInputs = [ gettext readline ];
-
-  outputs = [ "bin" "dev" "out" ]; # TODO: review xfs
-
   preConfigure = ''
-    NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
+    sed -i Makefile -e '/cp include.install-sh/d'
+    make configure
   '';
 
   configureFlags = [
-    "MAKE=make"
-    "MSGFMT=msgfmt"
-    "MSGMERGE=msgmerge"
-    "XGETTEXT=xgettext"
     "--disable-lib64"
     "--enable-readline"
   ];
 
   installFlags = [ "install-dev" ];
 
-  enableParallelBuilding = true;
+  # FIXME: forbidden rpath
+  postInstall = ''
+    find . -type d -name .libs | xargs rm -rf
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://xfs.org/;
     description = "SGI XFS utilities";
     license = licenses.lgpl21;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ dezgeg ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f4ecbd1676..910bc7be953 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4945,8 +4945,8 @@ with pkgs;
     gnome_python = gnome2.gnome_python;
   };
 
-  xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
-  libxfs = xfsprogs.dev; # outputs TODO
+  xfsprogs = callPackage ../tools/filesystems/xfsprogs { utillinux = utillinuxMinimal; };
+  libxfs = xfsprogs.dev;
 
   xml2 = callPackage ../tools/text/xml/xml2 { };
 

From 31437ccf7a1ee6cf1b7ead988f3bd38647b1ff02 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 20 Jul 2017 11:50:56 -0400
Subject: [PATCH 0784/3246] coq2html: New expression

---
 .../science/logic/coq2html/default.nix        |  38 +++++++
 pkgs/top-level/all-packages.nix               | 101 ++++--------------
 2 files changed, 58 insertions(+), 81 deletions(-)
 create mode 100644 pkgs/applications/science/logic/coq2html/default.nix

diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix
new file mode 100644
index 00000000000..9687ac66ead
--- /dev/null
+++ b/pkgs/applications/science/logic/coq2html/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, lib, make, fetchgit, ocaml }:
+
+let 
+  version = "20170720";
+in
+
+stdenv.mkDerivation {
+  name = "coq2html-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/xavierleroy/coq2html";
+    rev = "e2b94093c6b9a877717f181765e30577de22439e";
+    sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610";
+  };
+
+  buildInputs = [ make ocaml ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp coq2html $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "coq2html is an HTML documentation generator for Coq source files";
+    longDescription = ''
+      coq2html is an HTML documentation generator for Coq source files. It is
+      an alternative to the standard coqdoc documentation generator
+      distributed along with Coq. The major feature of coq2html is its ability
+      to fold proof scripts: in the generated HTML, proof scripts are
+      initially hidden, but can be revealed one by one by clicking on the
+      "Proof" keyword.
+    '';
+    homepage = https://github.com/xavierleroy/coq2html;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 910bc7be953..9b5824e5573 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -412,10 +412,6 @@ with pkgs;
 
   albert = libsForQt5.callPackage ../applications/misc/albert {};
 
-  alacritty = callPackage ../applications/misc/alacritty {
-    inherit (xorg) libXcursor libXxf86vm libXi;
-  };
-
   amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
 
   ammonite = callPackage ../development/tools/ammonite {};
@@ -535,8 +531,6 @@ with pkgs;
 
   bonnie = callPackage ../tools/filesystems/bonnie { };
 
-  container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
-
   djmount = callPackage ../tools/filesystems/djmount { };
 
   dgsh = callPackage ../shells/dgsh { };
@@ -991,10 +985,6 @@ with pkgs;
 
   fastJson = callPackage ../development/libraries/fastjson { };
 
-  fast-cli = nodePackages.fast-cli.overrideDerivation (old: {
-    buildInputs = old.buildInputs ++ [phantomjs2];
-  });
-
   filebench = callPackage ../tools/misc/filebench { };
 
   fsmon = callPackage ../tools/misc/fsmon { };
@@ -1045,12 +1035,8 @@ with pkgs;
 
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
-  hebcal = callPackage ../tools/misc/hebcal {};
-
   hexio = callPackage ../development/tools/hexio { };
 
-  hid-listen = callPackage ../tools/misc/hid-listen { };
-
   hostsblock = callPackage ../tools/misc/hostsblock { };
 
   hr = callPackage ../applications/misc/hr { };
@@ -1103,8 +1089,6 @@ with pkgs;
 
   syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
 
-  ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { };
-
   rsyslog = callPackage ../tools/system/rsyslog {
     hadoop = null; # Currently Broken
     czmq = czmq3;
@@ -2199,8 +2183,6 @@ with pkgs;
 
   google-fonts = callPackage ../data/fonts/google-fonts { };
 
-  google-compute-engine = callPackage ../tools/virtualization/google-compute-engine {  };
-
   gource = callPackage ../applications/version-management/gource { };
 
   gpart = callPackage ../tools/filesystems/gpart { };
@@ -3405,8 +3387,6 @@ with pkgs;
     graphicalSupport = true;
   };
 
-  nnn = callPackage ../applications/misc/nnn { };
-
   notify-osd = callPackage ../applications/misc/notify-osd { };
 
   nox = callPackage ../tools/package-management/nox {
@@ -4380,8 +4360,6 @@ with pkgs;
 
   tarsnap = callPackage ../tools/backup/tarsnap { };
 
-  tarsnapper = callPackage ../tools/backup/tarsnapper { };
-
   tcpcrypt = callPackage ../tools/security/tcpcrypt { };
 
   tcptraceroute = callPackage ../tools/networking/tcptraceroute { };
@@ -5632,8 +5610,8 @@ with pkgs;
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk7.jre // { outputs = [ "jre" ]; }));
 
-  jdk8 = if stdenv.isArm then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
-  jre8 = if stdenv.isArm then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
+  jdk8 = openjdk8 // { outputs = [ "out" ]; };
+  jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk8.jre // { outputs = [ "jre" ]; }));
   jre8_headless =
@@ -5666,8 +5644,7 @@ with pkgs;
 
   supportsJDK =
     system == "i686-linux" ||
-    system == "x86_64-linux" ||
-    system == "armv7l-linux";
+    system == "x86_64-linux";
 
   jdkdistro = oraclejdk8distro;
 
@@ -5901,14 +5878,6 @@ with pkgs;
       buildRustPackage = callPackage ../build-support/rust {
         inherit rust;
       };
-
-      rustcSrc = stdenv.mkDerivation {
-        name = "rust-src";
-        src = rust.rustc.src;
-        phases = ["unpackPhase" "installPhase"];
-        installPhase = "mv src $out";
-      };
-
     });
 
   rainicorn = callPackage ../development/tools/rust/rainicorn { };
@@ -6086,7 +6055,7 @@ with pkgs;
   inherit (beam.interpreters)
     erlang erlang_odbc erlang_javac erlang_odbc_javac
     elixir elixir_1_5_rc elixir_1_4 elixir_1_3
-    lfe lfe_1_2
+    lfe
     erlangR16 erlangR16_odbc
     erlang_basho_R16B02 erlang_basho_R16B02_odbc
     erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac
@@ -7086,7 +7055,7 @@ with pkgs;
 
   pahole = callPackage ../development/tools/misc/pahole {};
 
-  pants = callPackage ../development/tools/build-managers/pants {};
+  inherit (callPackages ../development/tools/build-managers/pants {}) pants pants13-pre;
 
   parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
 
@@ -7412,8 +7381,6 @@ with pkgs;
 
   aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {});
 
-  aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix { };
-
   attica = callPackage ../development/libraries/attica { };
 
   attr = callPackage ../development/libraries/attr { };
@@ -7678,8 +7645,6 @@ with pkgs;
 
   vmmlib = callPackage ../development/libraries/vmmlib {};
 
-  elastix = callPackage ../development/libraries/science/biology/elastix { };
-
   enchant = callPackage ../development/libraries/enchant { };
 
   enet = callPackage ../development/libraries/enet { };
@@ -11526,10 +11491,8 @@ with pkgs;
   storm = callPackage ../servers/computing/storm { };
 
   slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
-  slurm-llnl = slurm; # renamed July 2017
 
   slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
-  slurm-llnl-full = slurm-full; # renamed July 2017
 
   systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
 
@@ -12113,20 +12076,6 @@ with pkgs;
     ];
   };
 
-
-  linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        kernelPatches.p9_fixes
-        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
-        # when adding a new linux version
-        kernelPatches.cpu-cgroup-v2."4.11"
-        kernelPatches.modinst_arg_list_too_long
-    ];
-  };
-
-  linux_samus_latest = linux_samus_4_12;
-
   linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix {
     kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
                       kernelPatches.chromiumos_no_link_restrictions
@@ -12331,10 +12280,6 @@ with pkgs;
 
   linux_grsec_server_xen = linux_grsec_nixos;
 
-  # Samus kernels
-  linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
-  linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest);
-
   # ChromiumOS kernels
   linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);
   linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest);
@@ -13311,9 +13256,11 @@ with pkgs;
 
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
-  androidStudioPackages = callPackage ../applications/editors/android-studio/packages.nix {};
-  android-studio = androidStudioPackages.stable;
-  android-studio-preview = androidStudioPackages.preview;
+  android-studio = callPackage ../applications/editors/android-studio {
+    fontsConf = makeFontsConf {
+      fontDirectories = [];
+    };
+  };
 
   antfs-cli = callPackage ../applications/misc/antfs-cli {};
 
@@ -13381,8 +13328,6 @@ with pkgs;
   ethabi = self.altcoins.ethabi;
   ethrun = self.altcoins.ethrun;
   seth = self.altcoins.seth;
-  dapp = self.altcoins.dapp;
-  hsevm = self.altcoins.hsevm;
 
   stellar-core = self.altcoins.stellar-core;
 
@@ -13440,8 +13385,6 @@ with pkgs;
     libgpod = pkgs.libgpod.override { monoSupport = true; };
   };
 
-  bashSnippets = callPackage ../applications/misc/bashSnippets { };
-
   batik = callPackage ../applications/graphics/batik { };
 
   batti = callPackage ../applications/misc/batti { };
@@ -14609,8 +14552,6 @@ with pkgs;
 
   ht = callPackage ../applications/editors/ht { };
 
-  hue-cli = callPackage ../tools/networking/hue-cli { };
-
   hugin = callPackage ../applications/graphics/hugin { };
 
   hugo = callPackage ../applications/misc/hugo { };
@@ -18003,10 +17944,6 @@ with pkgs;
     cmake = cmakeCurses;
   });
 
-  ### SCIENCE/MEDICINE
-
-  aliza = callPackage ../applications/science/medicine/aliza { };
-
   ### PHYSICS
 
   sacrifice = callPackage ../applications/science/physics/sacrifice {};
@@ -18132,6 +18069,10 @@ with pkgs;
   coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
   coq = coqPackages.coq;
 
+  coq2html = callPackage ../applications/science/logic/coq2html {
+    make = pkgs.gnumake3;
+  };
+
   cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
 
   cubicle = callPackage ../applications/science/logic/cubicle { };
@@ -18246,7 +18187,11 @@ with pkgs;
   z3 = callPackage ../applications/science/logic/z3 {};
   z3_opt = callPackage ../applications/science/logic/z3_opt {};
 
-  boolector = callPackage ../applications/science/logic/boolector {};
+  boolector   = boolector15;
+  boolector15 = callPackage ../applications/science/logic/boolector {};
+  boolector16 = lowPrio (callPackage ../applications/science/logic/boolector {
+    useV16 = true;
+  });
 
   ### SCIENCE / ELECTRONICS
 
@@ -18503,9 +18448,6 @@ with pkgs;
 
   cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
 
-  # this driver ships with pre-compiled 32-bit binary libraries
-  cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { };
-
   cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 {
     libusb = libusb1;
   };
@@ -18701,7 +18643,6 @@ with pkgs;
   nix-serve = callPackage ../tools/package-management/nix-serve { };
 
   nixos-artwork = callPackage ../data/misc/nixos-artwork { };
-  nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
 
   nixos-container = callPackage ../tools/virtualization/nixos-container { };
 
@@ -19154,9 +19095,7 @@ with pkgs;
 
   tomb = callPackage ../os-specific/linux/tomb {};
 
-  tomboy = callPackage ../applications/misc/tomboy {
-    mono = mono46;
-  };
+  tomboy = callPackage ../applications/misc/tomboy {};
 
   imatix_gsl = callPackage ../development/tools/imatix_gsl {};
 

From eea396ca9b54a4b0152723d77f77cdf90d5356a5 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <patrick.callahan@sigfig.com>
Date: Thu, 20 Jul 2017 10:02:48 -0700
Subject: [PATCH 0785/3246] pythonPackages.arrow: 0.7.0 -> 0.10.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 f8ed854cf69..f3c788894f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -765,15 +765,15 @@ in {
 
   arrow = buildPythonPackage rec {
     name = "arrow-${version}";
-    version = "0.7.0";
+    version = "0.10.0";
 
     src = pkgs.fetchurl {
       url    = "mirror://pypi/a/arrow/${name}.tar.gz";
-      sha256 = "0yx10dz3hp825fcq9w15zbp26v622npcjscb91da05zig8036lra";
+      sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0";
     };
 
     checkPhase = ''
-      nosetests
+      nosetests --cover-package=arrow
     '';
 
     buildInputs = with self; [ nose chai simplejson ];

From 98fe450553c34e44232971fbaad8709b853e89c8 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <patrick.callahan@sigfig.com>
Date: Thu, 20 Jul 2017 10:03:09 -0700
Subject: [PATCH 0786/3246] pythonPackages.pympler: disable tests on Darwin
 since the included psutil test needs /proc

---
 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 f3c788894f4..cf48a16aa9c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14023,6 +14023,8 @@ in {
      substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e"
     '';
 
+    doCheck = stdenv.hostPlatform.isLinux;
+
     meta = {
       description = "Tool to measure, monitor and analyze memory behavior";
       homepage = http://pythonhosted.org/Pympler/;

From 3e8a565a04cef3a40dc7b1c29e464a1fc6e00232 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 20 Jul 2017 19:31:08 +0200
Subject: [PATCH 0787/3246] libressl: refactor, drop 2.4, 2.5.4 -> 2.5.5, init
 2.6

---
 pkgs/development/libraries/libressl/2.4.nix   | 22 -----------
 pkgs/development/libraries/libressl/2.5.nix   | 24 ------------
 .../libraries/libressl/default.nix            | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 11 ++----
 4 files changed, 43 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/development/libraries/libressl/2.4.nix
 delete mode 100644 pkgs/development/libraries/libressl/2.5.nix
 create mode 100644 pkgs/development/libraries/libressl/default.nix

diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix
deleted file mode 100644
index c5642635b0f..00000000000
--- a/pkgs/development/libraries/libressl/2.4.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "libressl-${version}";
-  version = "2.4.5";
-
-  src = fetchurl {
-    url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "0is3zqjcxxncycq44m3if6s5hiq31kpq85pxdnpm3sdfb3iw806k";
-  };
-
-  enableParallelBuilding = true;
-
-  outputs = [ "bin" "dev" "out" "man" ];
-
-  meta = with stdenv.lib; {
-    description = "Free TLS/SSL implementation";
-    homepage    = "http://www.libressl.org";
-    platforms   = platforms.all;
-    maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
-  };
-}
diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix
deleted file mode 100644
index 6ab07248655..00000000000
--- a/pkgs/development/libraries/libressl/2.5.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "libressl-${version}";
-  version = "2.5.4";
-
-  src = fetchurl {
-    url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "1ykf6dqlbafafhbdfmcj19pjj1z6wmsq0rmyqga1i0xv5x95nyhh";
-  };
-
-  enableParallelBuilding = true;
-
-  outputs = [ "bin" "dev" "out" "man" ];
-
-  dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong
-
-  meta = with stdenv.lib; {
-    description = "Free TLS/SSL implementation";
-    homepage    = "http://www.libressl.org";
-    platforms   = platforms.all;
-    maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
-  };
-}
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
new file mode 100644
index 00000000000..4ce1b664725
--- /dev/null
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl }:
+
+let
+
+  generic = { version, sha256 }: stdenv.mkDerivation rec {
+    name = "libressl-${version}";
+    inherit version;
+
+    src = fetchurl {
+      url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
+      inherit sha256;
+    };
+
+    enableParallelBuilding = true;
+
+    outputs = [ "bin" "dev" "out" "man" ];
+
+    dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong
+
+    meta = with stdenv.lib; {
+      description = "Free TLS/SSL implementation";
+      homepage    = "http://www.libressl.org";
+      platforms   = platforms.all;
+      maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
+    };
+  };
+
+in {
+
+  libressl_2_5 = generic {
+    version = "2.5.5";
+    sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5";
+  };
+
+  libressl_2_6 = generic {
+    version = "2.6.0";
+    sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b5824e5573..3297ab19704 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9601,14 +9601,11 @@ with pkgs;
 
   openslp = callPackage ../development/libraries/openslp {};
 
-  libressl = libressl_2_5;
-  libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
-    fetchurl = fetchurlBoot;
-  };
-  libressl_2_5 = callPackage ../development/libraries/libressl/2.5.nix {
-    fetchurl = fetchurlBoot;
-  };
+  inherit (callPackages ../development/libraries/libressl { })
+    libressl_2_5
+    libressl_2_6;
 
+  libressl = libressl_2_5;
 
   boringssl = callPackage ../development/libraries/boringssl { };
 

From e69dfc252a35753ce96aecfcfbf5281eb14d5eec Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 20 Jul 2017 19:36:50 +0200
Subject: [PATCH 0788/3246] Revert "coq2html: New expression"

This reverts commit 31437ccf7a1ee6cf1b7ead988f3bd38647b1ff02.
---
 .../science/logic/coq2html/default.nix        |  38 -------
 pkgs/top-level/all-packages.nix               | 101 ++++++++++++++----
 2 files changed, 81 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/coq2html/default.nix

diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix
deleted file mode 100644
index 9687ac66ead..00000000000
--- a/pkgs/applications/science/logic/coq2html/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, lib, make, fetchgit, ocaml }:
-
-let 
-  version = "20170720";
-in
-
-stdenv.mkDerivation {
-  name = "coq2html-${version}";
-
-  src = fetchgit {
-    url = "https://github.com/xavierleroy/coq2html";
-    rev = "e2b94093c6b9a877717f181765e30577de22439e";
-    sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610";
-  };
-
-  buildInputs = [ make ocaml ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp coq2html $out/bin
-  '';
-
-  meta = with stdenv.lib; {
-    description = "coq2html is an HTML documentation generator for Coq source files";
-    longDescription = ''
-      coq2html is an HTML documentation generator for Coq source files. It is
-      an alternative to the standard coqdoc documentation generator
-      distributed along with Coq. The major feature of coq2html is its ability
-      to fold proof scripts: in the generated HTML, proof scripts are
-      initially hidden, but can be revealed one by one by clicking on the
-      "Proof" keyword.
-    '';
-    homepage = https://github.com/xavierleroy/coq2html;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ jwiegley ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3297ab19704..59891f98f87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -412,6 +412,10 @@ with pkgs;
 
   albert = libsForQt5.callPackage ../applications/misc/albert {};
 
+  alacritty = callPackage ../applications/misc/alacritty {
+    inherit (xorg) libXcursor libXxf86vm libXi;
+  };
+
   amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
 
   ammonite = callPackage ../development/tools/ammonite {};
@@ -531,6 +535,8 @@ with pkgs;
 
   bonnie = callPackage ../tools/filesystems/bonnie { };
 
+  container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
+
   djmount = callPackage ../tools/filesystems/djmount { };
 
   dgsh = callPackage ../shells/dgsh { };
@@ -985,6 +991,10 @@ with pkgs;
 
   fastJson = callPackage ../development/libraries/fastjson { };
 
+  fast-cli = nodePackages.fast-cli.overrideDerivation (old: {
+    buildInputs = old.buildInputs ++ [phantomjs2];
+  });
+
   filebench = callPackage ../tools/misc/filebench { };
 
   fsmon = callPackage ../tools/misc/fsmon { };
@@ -1035,8 +1045,12 @@ with pkgs;
 
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
+  hebcal = callPackage ../tools/misc/hebcal {};
+
   hexio = callPackage ../development/tools/hexio { };
 
+  hid-listen = callPackage ../tools/misc/hid-listen { };
+
   hostsblock = callPackage ../tools/misc/hostsblock { };
 
   hr = callPackage ../applications/misc/hr { };
@@ -1089,6 +1103,8 @@ with pkgs;
 
   syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
 
+  ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { };
+
   rsyslog = callPackage ../tools/system/rsyslog {
     hadoop = null; # Currently Broken
     czmq = czmq3;
@@ -2183,6 +2199,8 @@ with pkgs;
 
   google-fonts = callPackage ../data/fonts/google-fonts { };
 
+  google-compute-engine = callPackage ../tools/virtualization/google-compute-engine {  };
+
   gource = callPackage ../applications/version-management/gource { };
 
   gpart = callPackage ../tools/filesystems/gpart { };
@@ -3387,6 +3405,8 @@ with pkgs;
     graphicalSupport = true;
   };
 
+  nnn = callPackage ../applications/misc/nnn { };
+
   notify-osd = callPackage ../applications/misc/notify-osd { };
 
   nox = callPackage ../tools/package-management/nox {
@@ -4360,6 +4380,8 @@ with pkgs;
 
   tarsnap = callPackage ../tools/backup/tarsnap { };
 
+  tarsnapper = callPackage ../tools/backup/tarsnapper { };
+
   tcpcrypt = callPackage ../tools/security/tcpcrypt { };
 
   tcptraceroute = callPackage ../tools/networking/tcptraceroute { };
@@ -5610,8 +5632,8 @@ with pkgs;
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk7.jre // { outputs = [ "jre" ]; }));
 
-  jdk8 = openjdk8 // { outputs = [ "out" ]; };
-  jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
+  jdk8 = if stdenv.isArm then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
+  jre8 = if stdenv.isArm then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk8.jre // { outputs = [ "jre" ]; }));
   jre8_headless =
@@ -5644,7 +5666,8 @@ with pkgs;
 
   supportsJDK =
     system == "i686-linux" ||
-    system == "x86_64-linux";
+    system == "x86_64-linux" ||
+    system == "armv7l-linux";
 
   jdkdistro = oraclejdk8distro;
 
@@ -5878,6 +5901,14 @@ with pkgs;
       buildRustPackage = callPackage ../build-support/rust {
         inherit rust;
       };
+
+      rustcSrc = stdenv.mkDerivation {
+        name = "rust-src";
+        src = rust.rustc.src;
+        phases = ["unpackPhase" "installPhase"];
+        installPhase = "mv src $out";
+      };
+
     });
 
   rainicorn = callPackage ../development/tools/rust/rainicorn { };
@@ -6055,7 +6086,7 @@ with pkgs;
   inherit (beam.interpreters)
     erlang erlang_odbc erlang_javac erlang_odbc_javac
     elixir elixir_1_5_rc elixir_1_4 elixir_1_3
-    lfe
+    lfe lfe_1_2
     erlangR16 erlangR16_odbc
     erlang_basho_R16B02 erlang_basho_R16B02_odbc
     erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac
@@ -7055,7 +7086,7 @@ with pkgs;
 
   pahole = callPackage ../development/tools/misc/pahole {};
 
-  inherit (callPackages ../development/tools/build-managers/pants {}) pants pants13-pre;
+  pants = callPackage ../development/tools/build-managers/pants {};
 
   parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
 
@@ -7381,6 +7412,8 @@ with pkgs;
 
   aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {});
 
+  aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix { };
+
   attica = callPackage ../development/libraries/attica { };
 
   attr = callPackage ../development/libraries/attr { };
@@ -7645,6 +7678,8 @@ with pkgs;
 
   vmmlib = callPackage ../development/libraries/vmmlib {};
 
+  elastix = callPackage ../development/libraries/science/biology/elastix { };
+
   enchant = callPackage ../development/libraries/enchant { };
 
   enet = callPackage ../development/libraries/enet { };
@@ -11488,8 +11523,10 @@ with pkgs;
   storm = callPackage ../servers/computing/storm { };
 
   slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
+  slurm-llnl = slurm; # renamed July 2017
 
   slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
+  slurm-llnl-full = slurm-full; # renamed July 2017
 
   systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
 
@@ -12073,6 +12110,20 @@ with pkgs;
     ];
   };
 
+
+  linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        kernelPatches.p9_fixes
+        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
+        # when adding a new linux version
+        kernelPatches.cpu-cgroup-v2."4.11"
+        kernelPatches.modinst_arg_list_too_long
+    ];
+  };
+
+  linux_samus_latest = linux_samus_4_12;
+
   linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix {
     kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
                       kernelPatches.chromiumos_no_link_restrictions
@@ -12277,6 +12328,10 @@ with pkgs;
 
   linux_grsec_server_xen = linux_grsec_nixos;
 
+  # Samus kernels
+  linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
+  linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest);
+
   # ChromiumOS kernels
   linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);
   linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest);
@@ -13253,11 +13308,9 @@ with pkgs;
 
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
-  android-studio = callPackage ../applications/editors/android-studio {
-    fontsConf = makeFontsConf {
-      fontDirectories = [];
-    };
-  };
+  androidStudioPackages = callPackage ../applications/editors/android-studio/packages.nix {};
+  android-studio = androidStudioPackages.stable;
+  android-studio-preview = androidStudioPackages.preview;
 
   antfs-cli = callPackage ../applications/misc/antfs-cli {};
 
@@ -13325,6 +13378,8 @@ with pkgs;
   ethabi = self.altcoins.ethabi;
   ethrun = self.altcoins.ethrun;
   seth = self.altcoins.seth;
+  dapp = self.altcoins.dapp;
+  hsevm = self.altcoins.hsevm;
 
   stellar-core = self.altcoins.stellar-core;
 
@@ -13382,6 +13437,8 @@ with pkgs;
     libgpod = pkgs.libgpod.override { monoSupport = true; };
   };
 
+  bashSnippets = callPackage ../applications/misc/bashSnippets { };
+
   batik = callPackage ../applications/graphics/batik { };
 
   batti = callPackage ../applications/misc/batti { };
@@ -14549,6 +14606,8 @@ with pkgs;
 
   ht = callPackage ../applications/editors/ht { };
 
+  hue-cli = callPackage ../tools/networking/hue-cli { };
+
   hugin = callPackage ../applications/graphics/hugin { };
 
   hugo = callPackage ../applications/misc/hugo { };
@@ -17941,6 +18000,10 @@ with pkgs;
     cmake = cmakeCurses;
   });
 
+  ### SCIENCE/MEDICINE
+
+  aliza = callPackage ../applications/science/medicine/aliza { };
+
   ### PHYSICS
 
   sacrifice = callPackage ../applications/science/physics/sacrifice {};
@@ -18066,10 +18129,6 @@ with pkgs;
   coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
   coq = coqPackages.coq;
 
-  coq2html = callPackage ../applications/science/logic/coq2html {
-    make = pkgs.gnumake3;
-  };
-
   cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
 
   cubicle = callPackage ../applications/science/logic/cubicle { };
@@ -18184,11 +18243,7 @@ with pkgs;
   z3 = callPackage ../applications/science/logic/z3 {};
   z3_opt = callPackage ../applications/science/logic/z3_opt {};
 
-  boolector   = boolector15;
-  boolector15 = callPackage ../applications/science/logic/boolector {};
-  boolector16 = lowPrio (callPackage ../applications/science/logic/boolector {
-    useV16 = true;
-  });
+  boolector = callPackage ../applications/science/logic/boolector {};
 
   ### SCIENCE / ELECTRONICS
 
@@ -18445,6 +18500,9 @@ with pkgs;
 
   cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
 
+  # this driver ships with pre-compiled 32-bit binary libraries
+  cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { };
+
   cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 {
     libusb = libusb1;
   };
@@ -18640,6 +18698,7 @@ with pkgs;
   nix-serve = callPackage ../tools/package-management/nix-serve { };
 
   nixos-artwork = callPackage ../data/misc/nixos-artwork { };
+  nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
 
   nixos-container = callPackage ../tools/virtualization/nixos-container { };
 
@@ -19092,7 +19151,9 @@ with pkgs;
 
   tomb = callPackage ../os-specific/linux/tomb {};
 
-  tomboy = callPackage ../applications/misc/tomboy {};
+  tomboy = callPackage ../applications/misc/tomboy {
+    mono = mono46;
+  };
 
   imatix_gsl = callPackage ../development/tools/imatix_gsl {};
 

From ec4f51fd9e3703558bfb500585ad689d0c23acc1 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Thu, 20 Jul 2017 20:51:51 +0300
Subject: [PATCH 0789/3246] flac123: init at 0.0.12 (#27520)

* flac123: init at 0.0.12

* flac123: add to all-packages.nix

* flac123: use autoreconfHook
---
 pkgs/applications/audio/flac123/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/audio/flac123/default.nix

diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix
new file mode 100644
index 00000000000..f0863bfc50b
--- /dev/null
+++ b/pkgs/applications/audio/flac123/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }:
+
+stdenv.mkDerivation rec {
+  name = "flac123-${version}";
+  version = "0.0.12";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz";
+    sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ flac libao libogg popt ];
+
+  meta = with stdenv.lib; {
+    homepage = http://flac-tools.sourceforge.net/;
+    description = "A command-line program for playing FLAC audio files";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59891f98f87..6b211df35ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1934,6 +1934,8 @@ with pkgs;
 
   fdk_aac = callPackage ../development/libraries/fdk-aac { };
 
+  flac123 = callPackage ../applications/audio/flac123 { };
+
   flamegraph = callPackage ../development/tools/flamegraph { };
 
   # Awkward historical capitalization for flamegraph. Remove eventually

From e849c7645e130772b57fc04681b205d75419e9bd Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Thu, 20 Jul 2017 15:21:03 +0200
Subject: [PATCH 0790/3246] nodejs: 8.1.4 -> 8.2.0

---
 pkgs/development/web/nodejs/v8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 49da505e439..84f4e496070 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.1.4";
+    version = "8.2.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "00f38bif8f6ws6pcfpfy5cdvanry39l4wb2gzm39qx3rbx28cg58";
+      sha256 = "10a72gl24kzdhf598wnlpvld1lz175h6l9fsr06bc3k3fr8rgs2c";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];

From 79fdf7d017a553d85a9835b38235f0ab8ea67d0e Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Thu, 20 Jul 2017 19:30:12 +0100
Subject: [PATCH 0791/3246] {lib}mediainfo{gui}: 0.7.95 -> 0.7.97

Changelog available at:
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 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 5d7a89060fa..787f97ac1b1 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.95";
+  version = "0.7.97";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m";
+    sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index a2c52181757..38888b0ebdc 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.95";
+  version = "0.7.97";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m";
+    sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 09b829695c4..cc6f5205d92 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.95";
+  version = "0.7.97";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0snrcashc5c5gcwvfh7sl7z4h523d8vxbfin3gb6g81zv43d2b23";
+    sha256 = "0rpxxbszi7i4hspdzdif9inhlwxdkf0iggaim6682clqb6pv7sld";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From b09c87ab47183a5a8e0184643e928edb24d2c19c Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michaelpj@gmail.com>
Date: Wed, 19 Jul 2017 22:09:18 +0100
Subject: [PATCH 0792/3246] Factorio service: fix typo in attribute path

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

diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index e7f070d0877..1dc8ce93a0e 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -39,7 +39,7 @@ let
     admins = [];
   };
   serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings));
-  modDir = pkgs.factorio-mkModDirDrv cfg.mods;
+  modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods;
 in
 {
   options = {

From 22acfd0327e02a110bb975e1692aef6d8c5524e3 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 19 Jul 2017 18:20:46 +0200
Subject: [PATCH 0793/3246] docker service: add option to do automatic pruning

This allows to run the prune job periodically on a machine.
By default the if enabled the job is run once a week.

The structure is similar to how system.autoUpgrade works.
---
 nixos/modules/virtualisation/docker.nix | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index c26cae06cd1..25274c440e6 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -94,6 +94,37 @@ in
             <command>docker</command> daemon.
           '';
       };
+
+    autoPrune = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to periodically prune Docker resources. If enabled, a systemd timer will run
+          <literal>docker system prune -f</literal> once a day.
+        '';
+      };
+
+      flags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "--all" ];
+        description = ''
+          Any additional flags passed to <command>docker system prune</command>.
+        '';
+      };
+
+      dates = mkOption {
+        default = "weekly";
+        type = types.str;
+        description = ''
+          Specification (in the format described by
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>7</manvolnum></citerefentry>) of the time at
+          which the prune will occur.
+        '';
+      };
+    };
   };
 
   ###### implementation
@@ -137,6 +168,22 @@ in
           SocketGroup = "docker";
         };
       };
+
+
+      systemd.services.docker-prune = {
+        description = "Prune docker resources";
+
+        restartIfChanged = false;
+        unitConfig.X-StopOnRemoval = false;
+
+        serviceConfig.Type = "oneshot";
+
+        script = ''
+          ${pkgs.docker}/bin/docker system prune -f ${toString cfg.autoPrune.flags}
+        '';
+
+        startAt = optional cfg.autoPrune.enable cfg.autoPrune.dates;
+      };
     }
   ]);
 

From 1206f9120a3b1d763d368daac0b39c503bcd06e6 Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Thu, 20 Jul 2017 19:33:33 +0100
Subject: [PATCH 0794/3246] libzen: 0.4.34 -> 0.4.35

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

diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index 5bb3f79f790..ab473bbe85c 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.34";
+  version = "0.4.35";
   name = "libzen-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
-    sha256 = "02krmhl6dplidz6h251ajpzzdhzzm0hp0lwwv9rgn55xjgh4yxw3";
+    sha256 = "12a1icgcffgv503ii2k1453kxg5hfly09mf4zjcc80aq8a6rf8by";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 6f72708c126dbdad4edc0dec2d4e77bc20e743d3 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@gmail.com>
Date: Thu, 20 Jul 2017 22:29:30 +0200
Subject: [PATCH 0795/3246] armadillo: Make use of openBLAS's built-in LAPACK

Even though the linked openBLAS contains LAPACK, the functionality was
not usable due to armadillo needing to link against it explicitly.
---
 pkgs/development/libraries/armadillo/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index d5a601f09ba..514c73f5e0f 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -12,9 +12,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openblasCompat superlu hdf5 ];
 
-  cmakeFlags = [ "-DDETECT_HDF5=ON" ];
+  cmakeFlags = let
+    libSuff = if stdenv.isDarwin then "dylib" else "so";
+  in [
+    "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas.${libSuff}"
+    "-DDETECT_HDF5=ON"
+  ];
 
- patches = [ ./use-unix-config-on-OS-X.patch ];
+  patches = [ ./use-unix-config-on-OS-X.patch ];
 
   meta = with stdenv.lib; {
     description = "C++ linear algebra library";

From 23ad77b9980fdd7f943da38cd745c4ccfdda15a7 Mon Sep 17 00:00:00 2001
From: Kai Harries <kai.harries@gmail.com>
Date: Thu, 20 Jul 2017 22:19:11 +0200
Subject: [PATCH 0796/3246] diffoscope: wrap executable and include tools in
 PATH

diffoscope was looking for the tools it uses during runtime, but the
tools there neither part of the closure nor were they in the
PATH. This commit fixes this.
---
 pkgs/tools/misc/diffoscope/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 4f0a9ba12c1..37af52f55b6 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -5,7 +5,13 @@
 , enableBloat ? false
 }:
 
-python3.pkgs.buildPythonApplication rec {
+    # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
+    # Also these libraries: python3-guestfs
+    # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
+let tools = [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
+              gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
+            ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ];
+in python3.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
   name = "${pname}-${version}";
   version = "77";
@@ -26,14 +32,6 @@ python3.pkgs.buildPythonApplication rec {
     sed -i setup.py -e "/'rpm-python',/d"
   '';
 
-  # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
-  # Also these libraries: python3-guestfs
-  # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
-  buildInputs =
-    map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
-      gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
-    ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
-
   pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
@@ -41,6 +39,7 @@ python3.pkgs.buildPythonApplication rec {
   postInstall = ''
     mkdir -p $out/share/man/man1
     ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
+    wrapProgram $out/bin/diffoscope --prefix PATH : ${lib.makeBinPath tools}
   '';
 
   meta = with stdenv.lib; {

From faad06df6be94e7306cc0f4a749711a844fc3718 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 20 Jul 2017 13:52:43 -0700
Subject: [PATCH 0797/3246] wine: 2.0.1 -> 2.0.2

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index da0f39ac37e..e92c77462ca 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 = "2.0.1";
+    version = "2.0.2";
     url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.xz";
-    sha256 = "10qm0xxqzvl4y3mhvaxcaacrcs8d5kdz5wf0gbxpmp36wnm4xyvc";
+    sha256 = "16iwf48cfi39aqyy8131jz4x7lr551c9yc0mnks7g24j77sq867p";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {

From 63aa5df737d34fa37e2ae51a884acc26f73b50f8 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Thu, 20 Jul 2017 15:44:40 -0400
Subject: [PATCH 0798/3246] alock: 20160713 -> 20170720

---
 pkgs/misc/screensavers/alock/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index 164471d144b..f05073469b7 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -2,17 +2,17 @@
 , libX11, pam, libgcrypt, libXrender, imlib2 }:
 
 stdenv.mkDerivation rec {
-  date = "20160713";
+  date = "20170720";
   name = "alock-${date}";
 
-  # Please consider https://github.com/Arkq/alock/issues/5
-  # before upgrading past this revision.
   src = fetchgit {
     url = https://github.com/Arkq/alock;
-    rev = "329ac152426639fe3c9e53debfc3f973c2988f50";
-    sha256 = "078nf2afyqv7hpk5kw50i57anm7qqd8jnczygnwimh2q40bljm7x";
+    rev = "2035e1d4a2293432f5503e82d10f899232eb0f38";
+    sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6";
   };
 
+  PAM_DEFAULT_SERVICE = "login";
+
   configureFlags = [
     "--enable-pam"
     "--enable-hash"

From 17c8fe21fd3bdda83d8261023d1675a9f0c9cb98 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 20 Jul 2017 21:31:04 +0000
Subject: [PATCH 0799/3246] libvirt: 3.1.0 -> 3.5.0 (#25411)

---
 pkgs/development/libraries/libvirt/default.nix | 5 +++--
 pkgs/top-level/python-packages.nix             | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 9c11081843c..805a4c0b63d 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 # if you update, also bump pythonPackages.libvirt or it will break
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "3.1.0";
+  version = "3.5.0";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.xz";
-    sha256 = "1a9j6yqfy7i5yv414wk6nv26a5bpfyyg0rpcps6ybi6a1yd04ybq";
+    sha256 = "05mm4xdw6g960rwvc9189nhxpm1vrilnmpl4h4m1lha11pivlqr9";
   };
 
   patches = [ ./build-on-bsd.patch ];
@@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
     "--with-virtualport"
     "--with-init-script=systemd+redhat"
     "--with-storage-disk"
+  ] ++ optionals (stdenv.isLinux && zfs != null) [
     "--with-storage-zfs"
   ] ++ optionals stdenv.isDarwin [
     "--with-init-script=none"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f8ed854cf69..104dd5354e7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26839,13 +26839,13 @@ EOF
   };
 
   libvirt = let
-    version = "3.1.0";
+    version = "3.5.0";
   in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "06524dhm27fjfnmr5bqdxlmm1g9ixvzaaq572hgyy5dqwfn64spk";
+      sha256 = "06mc0cm4k90z8vxaslk3ifpajg8w8dvm0m2mxwcd6fdzps8fwpsw";
     };
 
     buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From 8777174d60a7d5d001dc509f643afe04dc5f7619 Mon Sep 17 00:00:00 2001
From: Rhys <rimmington@gmail.com>
Date: Mon, 17 Jul 2017 08:03:51 +1000
Subject: [PATCH 0800/3246] nixos/oauth2_proxy: actually pass provider-specific
 options

Syntax errors prevented important parameters from being passed to
oauth2_proxy, which could have permitted unauthorised access to
services behind the proxy.
---
 nixos/modules/services/security/oauth2_proxy.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index e292fd9851e..3e5087766b1 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -21,21 +21,20 @@ let
     '';
 
     github = cfg: ''
-      $(optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}") \
-      $(optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}") \
+      ${optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}"} \
+      ${optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}"} \
     '';
 
     google = cfg: ''
       --google-admin-email=${cfg.google.adminEmail} \
       --google-service-account=${cfg.google.serviceAccountJSON} \
-      $(repeatedArgs (group: "--google-group=${group}") cfg.google.groups) \
+      ${repeatedArgs (group: "--google-group=${group}") cfg.google.groups} \
     '';
   };
 
   authenticatedEmailsFile = pkgs.writeText "authenticated-emails" cfg.email.addresses;
 
-  getProviderOptions = cfg: provider:
-    if providerSpecificOptions ? provider then providerSpecificOptions.provider cfg else "";
+  getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: "") cfg;
 
   mkCommandLine = cfg: ''
     --provider='${cfg.provider}' \

From 90afb0c10fe6f437fca498298747b2bcb6a77d39 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 21 Jul 2017 02:10:03 +0200
Subject: [PATCH 0801/3246] maim: 5.4.63 -> 5.4.64

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

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index 2a8255e3744..39933e70e39 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.4.63";
+  version = "5.4.64";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "16jl62hzrq1kciqwr9s3bxgcf9yz42kiwc5abkay1yd0vfcx200i";
+    sha256 = "16ipqs4s5hn7a7380n8w1ijj26d9n356bqwl1h8z5i1skbj4w7hj";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 2c4eb2a9dcbe6c8f1f970458696299109f2346b9 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 21 Jul 2017 10:09:25 +0800
Subject: [PATCH 0802/3246] kde-applications: 17.04.2 -> 17.04.3

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 2232 ++++++++++++++++----------------
 2 files changed, 1117 insertions(+), 1117 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index ad521a2b038..929771ed5fa 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.04.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 66498b0d280..ec3628abef2 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
 
 {
   akonadi = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akonadi-17.04.2.tar.xz";
-      sha256 = "08b3xyrff3y3s3c39l1fv3i55rdz6fq9mrsi3g80vs4i4x70f46d";
-      name = "akonadi-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akonadi-17.04.3.tar.xz";
+      sha256 = "0cddlz5v25ak9x1f682rjm3vlaqfm9n9y1bfd3h3md59j9l4gq49";
+      name = "akonadi-17.04.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-17.04.2.tar.xz";
-      sha256 = "17nx990k3l0mgwssrdg9avvp4yf6ichakx0cq4yg4mif5rc4angd";
-      name = "akonadi-calendar-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akonadi-calendar-17.04.3.tar.xz";
+      sha256 = "0543wixfwy80sx0lsy8jwlbyr3cxl3jyf04n644zyrkl461lv637";
+      name = "akonadi-calendar-17.04.3.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-tools-17.04.2.tar.xz";
-      sha256 = "1qbj5fkzia0bjzyv8mybqf2gg917dyjqmiywf4asr0xlqxwydccj";
-      name = "akonadi-calendar-tools-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akonadi-calendar-tools-17.04.3.tar.xz";
+      sha256 = "1yzfv80lyair5nkyql17ijnbcp9iyidhwrff6if9kn87sv5i9b4v";
+      name = "akonadi-calendar-tools-17.04.3.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akonadiconsole-17.04.2.tar.xz";
-      sha256 = "00wps8p6094bywkc6yrh9rpqp0q49nq68kmnbm7jqd9k07g93mxz";
-      name = "akonadiconsole-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akonadiconsole-17.04.3.tar.xz";
+      sha256 = "1v449q0d1ld84jjy0bshnf99ss5qq9mg2vp9c2wl2i8f640k7f0v";
+      name = "akonadiconsole-17.04.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akonadi-contacts-17.04.2.tar.xz";
-      sha256 = "0fnmfcfxzjghfh3plliksa7sffjy8m2hif1s8gsdv2bl5v13gxbz";
-      name = "akonadi-contacts-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akonadi-contacts-17.04.3.tar.xz";
+      sha256 = "03sffvybravzmg8qjqylgvfrn7ajvahkm7qnr8k44b9i9cy676ak";
+      name = "akonadi-contacts-17.04.3.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akonadi-import-wizard-17.04.2.tar.xz";
-      sha256 = "0wg1nnrfafmpdb0li7d9i3qfdam4v2ybkbrbwgdwiawdqs9znaaa";
-      name = "akonadi-import-wizard-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akonadi-import-wizard-17.04.3.tar.xz";
+      sha256 = "0gb2vzvznmyc3qvrzaka5q43qp982izm4yf7i340yi780qaixz18";
+      name = "akonadi-import-wizard-17.04.3.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akonadi-mime-17.04.2.tar.xz";
-      sha256 = "1ariwnjgsyccfa3iky3sf8lz08hv44jd6xa4hjfyz4bkp822grld";
-      name = "akonadi-mime-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akonadi-mime-17.04.3.tar.xz";
+      sha256 = "050kn3shqnzk22bx2h83b6qymn3npscnjqd2vrrwvbwh1b2ww2si";
+      name = "akonadi-mime-17.04.3.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akonadi-notes-17.04.2.tar.xz";
-      sha256 = "00p7sksfid7lln43f65jna8dr4w47wkxqyls2gzbgnblpd7m2rqg";
-      name = "akonadi-notes-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akonadi-notes-17.04.3.tar.xz";
+      sha256 = "1l8rhfvl8fh04igldggcq1fz1f6s595c89hzzza75qqbcs2azfps";
+      name = "akonadi-notes-17.04.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akonadi-search-17.04.2.tar.xz";
-      sha256 = "111r1fplrd13xb7s36cm9bk5zkj8ap33d252xarwmzpj51q0l3vh";
-      name = "akonadi-search-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akonadi-search-17.04.3.tar.xz";
+      sha256 = "0b4magnl3lrlnfsnsw46vkbhkp1bbxf2fgjfm84vndmwyglj1605";
+      name = "akonadi-search-17.04.3.tar.xz";
     };
   };
   akregator = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/akregator-17.04.2.tar.xz";
-      sha256 = "0ngpw432pm57p34y4wcvrxlrlmixlgrpqawgn2b73dhvb2m8ypvy";
-      name = "akregator-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/akregator-17.04.3.tar.xz";
+      sha256 = "12wajdwn3pp2prl9b2wlx1326b9w75j04yhg6q3082nrhlgmcnm2";
+      name = "akregator-17.04.3.tar.xz";
     };
   };
   analitza = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/analitza-17.04.2.tar.xz";
-      sha256 = "0qs2mp7nlca9y8lpycwfsmdd33ficz36z2fbmqzqm837w1r5jplp";
-      name = "analitza-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/analitza-17.04.3.tar.xz";
+      sha256 = "0scz8qi25gk1p8n6134wbcrknvxihyjkwvs6x22606nnrghlfc1b";
+      name = "analitza-17.04.3.tar.xz";
     };
   };
   ark = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ark-17.04.2.tar.xz";
-      sha256 = "0zdyxd7ghwrj48avyqv4q6dpyrxryzrg8v5ljwwsizlb7lp25afx";
-      name = "ark-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ark-17.04.3.tar.xz";
+      sha256 = "1b9kadiz91d86q3hrailzd56pbaxzh7jmvy317nfiqrflw541sin";
+      name = "ark-17.04.3.tar.xz";
     };
   };
   artikulate = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/artikulate-17.04.2.tar.xz";
-      sha256 = "0rjqpn8aa0y3v2940qgfxl9xdrls1jw6yfvgqdsicrhd9qwpr6i2";
-      name = "artikulate-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/artikulate-17.04.3.tar.xz";
+      sha256 = "0axc54cqyhmb28rzxlflmms4cfv2539wwb4lmgm99z8kgg7634g6";
+      name = "artikulate-17.04.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/audiocd-kio-17.04.2.tar.xz";
-      sha256 = "0h6zvlhyi9dxmcxgcnn12pj056r62a6389nd9dnqzcc3m7jp0ypi";
-      name = "audiocd-kio-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/audiocd-kio-17.04.3.tar.xz";
+      sha256 = "1q1zlp2p94044p0gb6vwzybvj3g2c1lwnyj4x2kim6wkj2x9pqrf";
+      name = "audiocd-kio-17.04.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/baloo-widgets-17.04.2.tar.xz";
-      sha256 = "1fspq5n53zgnwpvnq0z9g77xhfspd3indcvim8j8ls5qhmn4c8g9";
-      name = "baloo-widgets-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/baloo-widgets-17.04.3.tar.xz";
+      sha256 = "1awhqv8gqjkdcblsq9sn6wd2f2693niyk59x0vhf3ml87sqmhki4";
+      name = "baloo-widgets-17.04.3.tar.xz";
     };
   };
   blinken = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/blinken-17.04.2.tar.xz";
-      sha256 = "12pzbgxhdrzjnzg02hd96pxcqpjnzfrlv2bjpkpzb7ng70wb50ia";
-      name = "blinken-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/blinken-17.04.3.tar.xz";
+      sha256 = "13m0854d4bahhcpfq7v04ydhvxs79x9h0rhhvp9zapzq8kvhc6s0";
+      name = "blinken-17.04.3.tar.xz";
     };
   };
   blogilo = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/blogilo-17.04.2.tar.xz";
-      sha256 = "14pn6l2qvgf7ab05i93lnhm6fjhy41xwnxa5v7an7xc8ismi5ric";
-      name = "blogilo-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/blogilo-17.04.3.tar.xz";
+      sha256 = "1ziipi55hwmkmf7pr9j64qhc0px3v4pzd3b4b2gqz4fjg2sggp12";
+      name = "blogilo-17.04.3.tar.xz";
     };
   };
   bomber = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/bomber-17.04.2.tar.xz";
-      sha256 = "19c5ak9cw3ybcvw21rzjh7k0q7g1j9dv060pvjdfsphfyzkym5m3";
-      name = "bomber-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/bomber-17.04.3.tar.xz";
+      sha256 = "13z4zs9mvcwlidxx17nx6qzbdcc7r15adh5awxnjxnqv0akmqj7p";
+      name = "bomber-17.04.3.tar.xz";
     };
   };
   bovo = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/bovo-17.04.2.tar.xz";
-      sha256 = "0z4ajphzrnag1zqv3d9i6cvrfn5b74sklacxhn09hgjgx6ihps77";
-      name = "bovo-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/bovo-17.04.3.tar.xz";
+      sha256 = "0a27n64krkj6nmkzyi5vww6nsc2bzjlfzh8k32r8fjix500263i1";
+      name = "bovo-17.04.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/calendarsupport-17.04.2.tar.xz";
-      sha256 = "1n2nb15fn3v6hlp8ya3ah3pdyjjss1632a51k696lg474dhxvlzk";
-      name = "calendarsupport-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/calendarsupport-17.04.3.tar.xz";
+      sha256 = "1xv8n8hc5kp0cvbj7fpd065sb329ps3sazfmrf4h4gkh1zj5i8wi";
+      name = "calendarsupport-17.04.3.tar.xz";
     };
   };
   cantor = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/cantor-17.04.2.tar.xz";
-      sha256 = "0811770qn76ri11mgx2pac7vg67mj5qg3v3zhx4ym3f072lfp57i";
-      name = "cantor-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/cantor-17.04.3.tar.xz";
+      sha256 = "0lcvhc2pyhyzlj9px6cni99l0zddyv32gk32s3wg7pz71msaw91w";
+      name = "cantor-17.04.3.tar.xz";
     };
   };
   cervisia = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/cervisia-17.04.2.tar.xz";
-      sha256 = "1gar8rx9vknpc7fnwlg7kvwj90wv9wd8c3dd59fj55d9fpwin3qg";
-      name = "cervisia-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/cervisia-17.04.3.tar.xz";
+      sha256 = "1hrik6r87sx2d99fnn89k48mf76xnrq4wgh2zg03hmf327ydviq2";
+      name = "cervisia-17.04.3.tar.xz";
     };
   };
   dolphin = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/dolphin-17.04.2.tar.xz";
-      sha256 = "1yd0fawz9n64gsd868qzp424h653f5lf22r5mf116bkgxia59b25";
-      name = "dolphin-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/dolphin-17.04.3.tar.xz";
+      sha256 = "1q8pj2wh186l76cg5ir3l9f6xma1kjgbrk9kfd9br400dx2pz62a";
+      name = "dolphin-17.04.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/dolphin-plugins-17.04.2.tar.xz";
-      sha256 = "1h8g962pmpwahhrnzzd7x15j7p3bcxg92csfkd0y2mn6pfl9zb5s";
-      name = "dolphin-plugins-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/dolphin-plugins-17.04.3.tar.xz";
+      sha256 = "1is11ja2lzqxnsmj6kkr1q9l9csjy4ymv869yrgsbid0xjc2krj3";
+      name = "dolphin-plugins-17.04.3.tar.xz";
     };
   };
   dragon = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/dragon-17.04.2.tar.xz";
-      sha256 = "0yp0bswjq9zymczyscy3y186d7g921jmah6i5wd36j1vgff3i0ry";
-      name = "dragon-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/dragon-17.04.3.tar.xz";
+      sha256 = "1raki9yp51s73ca6fv093pbhwjfw3hbiazbhfwf6f3dqag24w11w";
+      name = "dragon-17.04.3.tar.xz";
     };
   };
   eventviews = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/eventviews-17.04.2.tar.xz";
-      sha256 = "0rf87q002ax5r6qh99hmbdrm528grw3ib5zi5pnjai3l403vd6g6";
-      name = "eventviews-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/eventviews-17.04.3.tar.xz";
+      sha256 = "18j8xikfxn2mpx61d4ynahai9s6gwi0x5xsfvnyrc2v43a69w7ks";
+      name = "eventviews-17.04.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ffmpegthumbs-17.04.2.tar.xz";
-      sha256 = "02i9x2amkwc40a7fpk939spgwbrcfm1s9swgmp1wzyg7arrf4qz3";
-      name = "ffmpegthumbs-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ffmpegthumbs-17.04.3.tar.xz";
+      sha256 = "1f8xrga8v045g5drcls87m9w5d00887sglk274gi1jmf60sy55jk";
+      name = "ffmpegthumbs-17.04.3.tar.xz";
     };
   };
   filelight = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/filelight-17.04.2.tar.xz";
-      sha256 = "0wpcmk6i8hfalzymj8m1hsg1qi2hil8x51nvxg0c55x1cqg6k9a0";
-      name = "filelight-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/filelight-17.04.3.tar.xz";
+      sha256 = "0srwhi3zi3gv8iid21f9gk709w59r4l7z560piywfgdmpp9spmgg";
+      name = "filelight-17.04.3.tar.xz";
     };
   };
   granatier = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/granatier-17.04.2.tar.xz";
-      sha256 = "0bxf4cv1351bzz3yafdadih8bdcjjn0119zazmll2jjdnh4qiq0z";
-      name = "granatier-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/granatier-17.04.3.tar.xz";
+      sha256 = "1gv4xikxkqfw54pcgrkj5l2m84fc39pckyg495aid3fbh73pgi7i";
+      name = "granatier-17.04.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/grantlee-editor-17.04.2.tar.xz";
-      sha256 = "1sjrsljp0g53gi4vlcmz6r9k657k4wr1l10743sfmg268skvs84b";
-      name = "grantlee-editor-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/grantlee-editor-17.04.3.tar.xz";
+      sha256 = "0lm97icf22gbrq9pgj8cmwcgpqb5nsgwv78ldz8hp1s9x05qck2v";
+      name = "grantlee-editor-17.04.3.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/grantleetheme-17.04.2.tar.xz";
-      sha256 = "102a49ifkvjpz2703fr6dv45ksyg7y1yjc6xm0im95vb66aw3cb5";
-      name = "grantleetheme-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/grantleetheme-17.04.3.tar.xz";
+      sha256 = "0jbgxjlsih2alc5ylbkrwwc2ij11ywsynlz1vsm0qzrfb7j534si";
+      name = "grantleetheme-17.04.3.tar.xz";
     };
   };
   gwenview = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/gwenview-17.04.2.tar.xz";
-      sha256 = "0x9pxw33ahzn0h4klgiw7ifcgkdwv7l1zzfapbh9gr9h3rbrpsra";
-      name = "gwenview-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/gwenview-17.04.3.tar.xz";
+      sha256 = "12dy8hicrbns40gjnz2j60cqyjmrz5ci8sq2npblq5gr3avhdgla";
+      name = "gwenview-17.04.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/incidenceeditor-17.04.2.tar.xz";
-      sha256 = "1qhkmw6n402xnv5ggpfp586gii5z6r5gqmgfd0jzxlnygslqd784";
-      name = "incidenceeditor-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/incidenceeditor-17.04.3.tar.xz";
+      sha256 = "1xjgmz23q45s5m3kzfdr3k94l711i672m8cp5lfv9sczv4lgi45y";
+      name = "incidenceeditor-17.04.3.tar.xz";
     };
   };
   jovie = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/jovie-17.04.2.tar.xz";
-      sha256 = "0mcv00hk1h1hl7hg4n2pcbsjw1g21k98fls7424jjh6vgvarbxmg";
-      name = "jovie-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/jovie-17.04.3.tar.xz";
+      sha256 = "0v9ndwp7phd62vnp3qv3ax9khrzbqwhs0mv2glf8r8w4qqv39gsq";
+      name = "jovie-17.04.3.tar.xz";
     };
   };
   juk = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/juk-17.04.2.tar.xz";
-      sha256 = "01lsmfd5h1km5w9xz9bwh07qvxlgh2j8nl638bxx6k9vydg53gll";
-      name = "juk-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/juk-17.04.3.tar.xz";
+      sha256 = "1kff1rcipw1m19w7dij3fjzqm4xkgzzy3qanhwhbicy77pkmcwjp";
+      name = "juk-17.04.3.tar.xz";
     };
   };
   k3b = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/k3b-17.04.2.tar.xz";
-      sha256 = "1yv2rgwsvabyj7pj91yir6zj7bc4n9psazg0q658pyqbdkgwrkx8";
-      name = "k3b-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/k3b-17.04.3.tar.xz";
+      sha256 = "0a1hk0is5iswbvrq1zlj8fgr02dg94nm1393s3j1ashgvxsfzmfk";
+      name = "k3b-17.04.3.tar.xz";
     };
   };
   kaccessible = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kaccessible-17.04.2.tar.xz";
-      sha256 = "00m2ya93isyhr9cbx7fa79pi1iqnj5nqqnjmh8kqx9abkpvy2yff";
-      name = "kaccessible-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kaccessible-17.04.3.tar.xz";
+      sha256 = "1iik3dbdxqr9702mcrvij56j3w5wr4vmylnpkr9lm46pf0kpxyby";
+      name = "kaccessible-17.04.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kaccounts-integration-17.04.2.tar.xz";
-      sha256 = "0wrfyfczm92qz0w6gyvaac8n0763fviglji7ls73y0gy7xm1lfmj";
-      name = "kaccounts-integration-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kaccounts-integration-17.04.3.tar.xz";
+      sha256 = "0s67vgk2sh11gf2icg5syk3zy66ilkdnjspahhfsmvqkgpgcr3w7";
+      name = "kaccounts-integration-17.04.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kaccounts-providers-17.04.2.tar.xz";
-      sha256 = "0y2y231f0xyysxnwdprlffp3m4wxyxabc2d4j8sr9w9gn0qfzdkj";
-      name = "kaccounts-providers-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kaccounts-providers-17.04.3.tar.xz";
+      sha256 = "0j3w66gvvaa1fsncr2h15lw3fk4m1qzkhzaxp13yg5cig3mkg3bb";
+      name = "kaccounts-providers-17.04.3.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kaddressbook-17.04.2.tar.xz";
-      sha256 = "0y44b3wwpgpzim3an8kvrhqnw1wg0m2fcmanm2sj9vvccayy9fl6";
-      name = "kaddressbook-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kaddressbook-17.04.3.tar.xz";
+      sha256 = "0gr3g0vi2h9qy4fw82g997wq2snam71qivqg5fk7bdgvzi3qm2d0";
+      name = "kaddressbook-17.04.3.tar.xz";
     };
   };
   kajongg = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kajongg-17.04.2.tar.xz";
-      sha256 = "08wzxkhfwagh2awcs4wdg56ks628bwysim5whwhrvw3rzc30v2ig";
-      name = "kajongg-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kajongg-17.04.3.tar.xz";
+      sha256 = "0clq9gvxn8lma5s1qxl2j56nylbs1vijqlw1xplxi4pfwzv2d09g";
+      name = "kajongg-17.04.3.tar.xz";
     };
   };
   kalarm = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kalarm-17.04.2.tar.xz";
-      sha256 = "0km7fzhd8iskg4bkn6x62y9pgcvq8zwrjk3w7qvrx5j6dszjw11w";
-      name = "kalarm-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kalarm-17.04.3.tar.xz";
+      sha256 = "00h90n9r05ffgca34fz1f5vr4c95xgq6ay6a0y7p7bda2kvl2rwg";
+      name = "kalarm-17.04.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kalarmcal-17.04.2.tar.xz";
-      sha256 = "0rca71h85rd88fkx0pkxj40c8fnyiwfcnvmczkd9xb729hvrfblk";
-      name = "kalarmcal-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kalarmcal-17.04.3.tar.xz";
+      sha256 = "1qn9idrjql02fzbvjdk70jqp1c4npjmbjgfbnjg2m4jnd98xd7yr";
+      name = "kalarmcal-17.04.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kalgebra-17.04.2.tar.xz";
-      sha256 = "12496gk238ipi2zmxx4njwc58mx9q3w463qp9ji23abv3c59g44f";
-      name = "kalgebra-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kalgebra-17.04.3.tar.xz";
+      sha256 = "0hcybpy7bjmxym09xlv4mi4fidl8l130c0ghbigw8774f11k6vp5";
+      name = "kalgebra-17.04.3.tar.xz";
     };
   };
   kalzium = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kalzium-17.04.2.tar.xz";
-      sha256 = "0gckmnbgym09kq53q0n3jsqfiaz4g7235ylpnwsaids3243jpa06";
-      name = "kalzium-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kalzium-17.04.3.tar.xz";
+      sha256 = "0pwxbb1qgkbx9y3320hwx96ymy91p6ycarvx731cyinp6v9lizld";
+      name = "kalzium-17.04.3.tar.xz";
     };
   };
   kamera = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kamera-17.04.2.tar.xz";
-      sha256 = "1ikniri791v63zzsng7yjvdil6vz08cw2iz9f0dwxzldlwws41j6";
-      name = "kamera-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kamera-17.04.3.tar.xz";
+      sha256 = "0gjxv55lzdfwxk7cm8s9yzk5z6lqb64irx57682l76an3azkjwsf";
+      name = "kamera-17.04.3.tar.xz";
     };
   };
   kanagram = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kanagram-17.04.2.tar.xz";
-      sha256 = "06yqc197yzzzzga45db8i05q2yr4jyjf5bvry0k22nss3wgsy8mk";
-      name = "kanagram-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kanagram-17.04.3.tar.xz";
+      sha256 = "01479ryshlaf9kqd3nlhdrx02i8xp7sn7n1ir4cdxpnm8jg28x0c";
+      name = "kanagram-17.04.3.tar.xz";
     };
   };
   kapman = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kapman-17.04.2.tar.xz";
-      sha256 = "15yyp69m096wbmpi52fi2ca6i83w0agjgsy1j6qiy6ki0fj2xyry";
-      name = "kapman-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kapman-17.04.3.tar.xz";
+      sha256 = "0llrh5g52gzvyxa5l3ardjv17msy2zj83in2g4cy094g1zciyk40";
+      name = "kapman-17.04.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kapptemplate-17.04.2.tar.xz";
-      sha256 = "0v5v6m0z7jgq5lzlpa3qkza3s0amx6xikwcg1lbzivnwfjvyb9nj";
-      name = "kapptemplate-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kapptemplate-17.04.3.tar.xz";
+      sha256 = "0r4s5lfggv3nbqgi2y5y9zbyqp3fc7hlhlbdfr24cyljagmi8hgw";
+      name = "kapptemplate-17.04.3.tar.xz";
     };
   };
   kate = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kate-17.04.2.tar.xz";
-      sha256 = "1bya5xh57icsbx9jmk5w330xm97bjs3amvlnj0i8rplawjzcai8h";
-      name = "kate-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kate-17.04.3.tar.xz";
+      sha256 = "1p6sfn80f8hvkgrg6z2yk7h23v403695sp39fb7s3q4cn5a0sch8";
+      name = "kate-17.04.3.tar.xz";
     };
   };
   katomic = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/katomic-17.04.2.tar.xz";
-      sha256 = "06bdvc8nckckd3rin7q7cjajxv0yzsq6m1jwzmyh90mm2sbq5g0j";
-      name = "katomic-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/katomic-17.04.3.tar.xz";
+      sha256 = "0rm2alxjmr74m2nxf5vwg3j5ynajz4c5z57cnpmzwvxgdh2c49p0";
+      name = "katomic-17.04.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kblackbox-17.04.2.tar.xz";
-      sha256 = "1z6ladzhd1mgcqv0y199wv3dafpmy7h6yfgy7hgl26pqgw2qpz9z";
-      name = "kblackbox-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kblackbox-17.04.3.tar.xz";
+      sha256 = "183yvajbg8h48h4zwzm55zdajjan84dsnndg1db4n8gyibkv3f9d";
+      name = "kblackbox-17.04.3.tar.xz";
     };
   };
   kblocks = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kblocks-17.04.2.tar.xz";
-      sha256 = "0a3d4q2kph192zp6lcm2wxh8f55s3wj3wvxvfjk3v5vwjld6a298";
-      name = "kblocks-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kblocks-17.04.3.tar.xz";
+      sha256 = "0j66756d66ravgiq4ybfyhm4hacmys9snjyadr035103j26z89pw";
+      name = "kblocks-17.04.3.tar.xz";
     };
   };
   kblog = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kblog-17.04.2.tar.xz";
-      sha256 = "1w97qkp2mwf7wqjwrrq94sah32cdybgxp2rzs5ypwaszka77xcd9";
-      name = "kblog-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kblog-17.04.3.tar.xz";
+      sha256 = "10ngg2b83mczd937ikwzbwdqlrvlxsqzgrz95454x3s3j649hcy9";
+      name = "kblog-17.04.3.tar.xz";
     };
   };
   kbounce = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kbounce-17.04.2.tar.xz";
-      sha256 = "1mgbjgbp2wmghvjgyf1s3gjwnwg4c8h6ni01mazqv8jlf0v14g1j";
-      name = "kbounce-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kbounce-17.04.3.tar.xz";
+      sha256 = "1f9np47ddhybnmm0m98fwpy51d9c8zgl7qrlj8g3diia45hy1s39";
+      name = "kbounce-17.04.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kbreakout-17.04.2.tar.xz";
-      sha256 = "1pydl6p7f8f1jxd6k8d563wwigx52fg850d2x736wzw1nk4vwg8b";
-      name = "kbreakout-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kbreakout-17.04.3.tar.xz";
+      sha256 = "0s7khwg6sl709gjzf5ymq5l79iilnfx14jp5bnck0ir568vhybkf";
+      name = "kbreakout-17.04.3.tar.xz";
     };
   };
   kbruch = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kbruch-17.04.2.tar.xz";
-      sha256 = "0kpzqlnx3wzygnna5l1rssclz9fkvl6mzr5jnr730d5c3r7hymby";
-      name = "kbruch-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kbruch-17.04.3.tar.xz";
+      sha256 = "11r50x5yp7s749prqwkxf3k5pm93pmk0h3b0i9c5507nbh2b2x9b";
+      name = "kbruch-17.04.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kcachegrind-17.04.2.tar.xz";
-      sha256 = "148wmzq482jarpg0sywdlrjc0bgb2vkg0g2pn7wqj1czijs5l0rv";
-      name = "kcachegrind-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kcachegrind-17.04.3.tar.xz";
+      sha256 = "0wcjvmdsqg27b2d4rzvrl98nqj5k7hp02d1w136fklfsh5mzxbxn";
+      name = "kcachegrind-17.04.3.tar.xz";
     };
   };
   kcalc = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kcalc-17.04.2.tar.xz";
-      sha256 = "03lzvhs4kyj9cvhw6kh1xmhs2r9vaa4a9ibqnkjb6xx1nx4cpm84";
-      name = "kcalc-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kcalc-17.04.3.tar.xz";
+      sha256 = "1zshisq51vwsd04fxc5pw7lywrimpz04v2c9ad6lxwppmxcjr177";
+      name = "kcalc-17.04.3.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kcalcore-17.04.2.tar.xz";
-      sha256 = "05v1w8k70cdvvw5kv4994llbifrq2almir74i44v4i1449x7ziqn";
-      name = "kcalcore-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kcalcore-17.04.3.tar.xz";
+      sha256 = "17i7d29yq06his3qjn5jblbdzf04500q9sdh7cr7xffdr3rpahdc";
+      name = "kcalcore-17.04.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kcalutils-17.04.2.tar.xz";
-      sha256 = "1hj3k4lqj019cy8p7j6f20lkc75g8wma1p8vwynzlclnz43bsikp";
-      name = "kcalutils-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kcalutils-17.04.3.tar.xz";
+      sha256 = "07k0vx3rdn1dvg16b3ipwng87aibr9g1jv9wg0hnk0fydsrpf99n";
+      name = "kcalutils-17.04.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kcharselect-17.04.2.tar.xz";
-      sha256 = "1xw5sd93zkkkp3v75p718bwrd9m391pryb12slrk66nsq1lbw1wn";
-      name = "kcharselect-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kcharselect-17.04.3.tar.xz";
+      sha256 = "1cy3ljdmip0zqqmyqjj2d5jd5q0hyxiqkl8pcgl2hb7ypx5c06sx";
+      name = "kcharselect-17.04.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kcolorchooser-17.04.2.tar.xz";
-      sha256 = "156w22x3hx244l6v1zlndl45bxq25nnagji6zl0jspsa4csbzfrn";
-      name = "kcolorchooser-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kcolorchooser-17.04.3.tar.xz";
+      sha256 = "0jc7cynzbvc1r743fzqlfl5ck0cdd7m63lh27i033c4fpvvi4f6k";
+      name = "kcolorchooser-17.04.3.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kcontacts-17.04.2.tar.xz";
-      sha256 = "0nj7kff7yk7pbmq8g65qpj4g489mxfgwh8axbxsz8z31fgsg1i7s";
-      name = "kcontacts-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kcontacts-17.04.3.tar.xz";
+      sha256 = "0y0vnpk09bk8w5dx8a2zpng2phdzlrs2s380saf06h01n0ni9g01";
+      name = "kcontacts-17.04.3.tar.xz";
     };
   };
   kcron = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kcron-17.04.2.tar.xz";
-      sha256 = "1k3ya01icz65zyl33p3668p6ivkrlfpp95aydfmnfcd2q365vksx";
-      name = "kcron-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kcron-17.04.3.tar.xz";
+      sha256 = "11sbb1wvl1v6z0059hkmg3p29p8b77ij51kvkv3dicyvh7xzc4f8";
+      name = "kcron-17.04.3.tar.xz";
     };
   };
   kdav = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdav-17.04.2.tar.xz";
-      sha256 = "0yhjl9p4rnd6r5jwscxhwgv9d2xkj34mx4hh3rk4mc28bhy3yw9w";
-      name = "kdav-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdav-17.04.3.tar.xz";
+      sha256 = "1yv8jhfak671k1s0fsy3j4bj7y64shhipp9k67v34q5cgg0q4hwl";
+      name = "kdav-17.04.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdebugsettings-17.04.2.tar.xz";
-      sha256 = "1c05zh66ahnm1ann35bm9q93lg6cylrfsyawki8g5485ivxfs5xh";
-      name = "kdebugsettings-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdebugsettings-17.04.3.tar.xz";
+      sha256 = "1l2jg75jfvbf9ixs2spg4b284vimsf0hz04yhfcqicljykrwlwq4";
+      name = "kdebugsettings-17.04.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-dev-scripts-17.04.2.tar.xz";
-      sha256 = "1vid5j08x8pkzzhqr78nsn4r9nnhisvsb7bfl9a1pc609y461y31";
-      name = "kde-dev-scripts-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-dev-scripts-17.04.3.tar.xz";
+      sha256 = "0cshxm7s2ivvj1baciy3il8vbk9qby9ybdclrhkq6n7a7li5w1lm";
+      name = "kde-dev-scripts-17.04.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-dev-utils-17.04.2.tar.xz";
-      sha256 = "1xf20zdlrinp9kxdky9a5lvflxikzdzv2yj211nlir8a63iv0bz7";
-      name = "kde-dev-utils-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-dev-utils-17.04.3.tar.xz";
+      sha256 = "02d0fm4dv5vl5zi3xp608m9c8rnv00x7wk3hkv4mdvi7li5h62j4";
+      name = "kde-dev-utils-17.04.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdeedu-data-17.04.2.tar.xz";
-      sha256 = "1bdh14d9ypai97jcxf1sfaw6ccfnf2ckj677fc8gl8g7fid094np";
-      name = "kdeedu-data-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdeedu-data-17.04.3.tar.xz";
+      sha256 = "01vv6x600hpqpvg25aa07mbsjsnv83jqghna1bwqxgwrx1p3z8nd";
+      name = "kdeedu-data-17.04.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-mobipocket-17.04.2.tar.xz";
-      sha256 = "0qyv804a9cvqm0dm77zd79jj27i09jbw2cpgmazg3jn0plb5lkm6";
-      name = "kdegraphics-mobipocket-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdegraphics-mobipocket-17.04.3.tar.xz";
+      sha256 = "1nir7k3sf8q0k8ancs5mhp4qs5v405mjdiwnqf92mpmpfv6gw7ba";
+      name = "kdegraphics-mobipocket-17.04.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-thumbnailers-17.04.2.tar.xz";
-      sha256 = "06vr377nr59n599dsmi250nak78ka1zkfa8ckp93sasp5nlilbnp";
-      name = "kdegraphics-thumbnailers-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdegraphics-thumbnailers-17.04.3.tar.xz";
+      sha256 = "041bd8in0kwma5xkdwv9304r49rim4sxc977l7dnpyf306dx48rr";
+      name = "kdegraphics-thumbnailers-17.04.3.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ar-17.04.2.tar.xz";
-      sha256 = "0w675vdbvms758y9hywjkg72sl37i2q1n8wq7mrqkvbgd7fri198";
-      name = "kde-l10n-ar-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ar-17.04.3.tar.xz";
+      sha256 = "1z72mz94c95m2fq4k1aaqga8j9pnf4735radlny9ybfvv3wyliyb";
+      name = "kde-l10n-ar-17.04.3.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ast-17.04.2.tar.xz";
-      sha256 = "0v6qsn1x6rgll1hpr482jis0pljmqw0bax31a7vvr16ahp0rlrmk";
-      name = "kde-l10n-ast-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ast-17.04.3.tar.xz";
+      sha256 = "0r4srnzb30c0616zl15qbadb9rpkskvdhrqhxmy5pj0vaq349y8p";
+      name = "kde-l10n-ast-17.04.3.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bg-17.04.2.tar.xz";
-      sha256 = "0hi7dvv25yji3924983k3fjgxynz1avp6l9amj7frn6g0c68lbp4";
-      name = "kde-l10n-bg-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bg-17.04.3.tar.xz";
+      sha256 = "15ffbpsynzqinjvirn4aa7ij87awq4b2kv8bx6bbnpv727b34cm8";
+      name = "kde-l10n-bg-17.04.3.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bs-17.04.2.tar.xz";
-      sha256 = "11sikg952dv75f12rd7sky9rwamr9w4szdqkd9zw9kdgy6q2izn7";
-      name = "kde-l10n-bs-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bs-17.04.3.tar.xz";
+      sha256 = "0hc9gsw7i1wmvxd5lg3xd14njsdnfpf82km3hny46lyiqki1riyd";
+      name = "kde-l10n-bs-17.04.3.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca-17.04.2.tar.xz";
-      sha256 = "0s4j2vqxbpbsira0zyxz13kd59iicam2fhqz6xnlrd769vbfcbbv";
-      name = "kde-l10n-ca-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca-17.04.3.tar.xz";
+      sha256 = "0h6aj2hi1gyjq7prza9v207ipcis32hr2a76i5rrbnf5c8hpih1r";
+      name = "kde-l10n-ca-17.04.3.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-17.04.2";
+    version = "ca_valencia-17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca@valencia-17.04.2.tar.xz";
-      sha256 = "1dib0xvjcpg996smni56vncdq9wb9jcfr4abvqm7x3v50ip95f7f";
-      name = "kde-l10n-ca_valencia-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca@valencia-17.04.3.tar.xz";
+      sha256 = "1bvl1v9niqb9h2ilji70qfcybx7lraszkimbi6zawvimj5y68jfg";
+      name = "kde-l10n-ca_valencia-17.04.3.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-cs-17.04.2.tar.xz";
-      sha256 = "05hjzfrzafb9xabsb15lq5hl152brqf68hvl3h0vsmxyw7hqzxrj";
-      name = "kde-l10n-cs-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-cs-17.04.3.tar.xz";
+      sha256 = "0miqxwhbcqzds8lgq5g7zb2w0gkx3y7g45vq989641jaqqlfca1c";
+      name = "kde-l10n-cs-17.04.3.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-da-17.04.2.tar.xz";
-      sha256 = "05g8vh33fxvi6dmj6ryr6i2j3l4fd4cj3dkzch76bgvi00750fah";
-      name = "kde-l10n-da-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-da-17.04.3.tar.xz";
+      sha256 = "0j7j9b9i81984fyh7g5yv9j0gasws9hz648ycqi96k43zs80cahb";
+      name = "kde-l10n-da-17.04.3.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-de-17.04.2.tar.xz";
-      sha256 = "1hiqbscd2py88z45g7blbj74ayqj4mmgy0b8z6hcxn9n0ph4sidb";
-      name = "kde-l10n-de-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-de-17.04.3.tar.xz";
+      sha256 = "0ra0idakfiggiw8x67iw4jbv9g2g0ypcskgcjzvwm61q9dqnr6hy";
+      name = "kde-l10n-de-17.04.3.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-el-17.04.2.tar.xz";
-      sha256 = "066n3r1vi9j8nln4xyhgpjhsl7gwhl6q7gqbdcp6zpwgxhwv6zic";
-      name = "kde-l10n-el-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-el-17.04.3.tar.xz";
+      sha256 = "1lmxrx7vkdpa9m730his0z9ry6nvycp4428waz0r4wxqqfz1acwr";
+      name = "kde-l10n-el-17.04.3.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-17.04.2";
+    version = "en_GB-17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-en_GB-17.04.2.tar.xz";
-      sha256 = "1307v713djkhny8rcg2schcwljn1cp728yllh227m30znprrqn41";
-      name = "kde-l10n-en_GB-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-en_GB-17.04.3.tar.xz";
+      sha256 = "1mr9rgxklfnmhd7yb5h3hddjjn1qxxbqw16sn5d1d077p3wz6896";
+      name = "kde-l10n-en_GB-17.04.3.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eo-17.04.2.tar.xz";
-      sha256 = "06i2m3g4s4raa1vzynfw5m89ydkcgjlbd96a4qxx76v888q65lsl";
-      name = "kde-l10n-eo-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eo-17.04.3.tar.xz";
+      sha256 = "1aq501z6mnpp8h354p45wwxs4fbfawm0dj67xh74xcr6sh0nj3ap";
+      name = "kde-l10n-eo-17.04.3.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-es-17.04.2.tar.xz";
-      sha256 = "1al4figznf5f6lgpz2l57x01n87jlaqxldgp7gi545672lxzyx44";
-      name = "kde-l10n-es-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-es-17.04.3.tar.xz";
+      sha256 = "1hk8731avlmirzhv2sckrqaf4ykgvy2brnq0a86dr4n95138hhmw";
+      name = "kde-l10n-es-17.04.3.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-et-17.04.2.tar.xz";
-      sha256 = "1dhqk1sj32pij4wc4pgfih3i8g3jf9b223rnraymhbsima200hx4";
-      name = "kde-l10n-et-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-et-17.04.3.tar.xz";
+      sha256 = "0cdy7mmjg8q5s19lqjsbhn64h3fk6f8y0j3ldvnmc4wj24gfnc5n";
+      name = "kde-l10n-et-17.04.3.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eu-17.04.2.tar.xz";
-      sha256 = "0kix9qs15488ns71hv67yvp3w03n68lxjll6cjxhyhrfcji9ldwc";
-      name = "kde-l10n-eu-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eu-17.04.3.tar.xz";
+      sha256 = "06c2940qsqf03acly35jpcnsljzq20mljmlzx9234i7gqr88g74r";
+      name = "kde-l10n-eu-17.04.3.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fa-17.04.2.tar.xz";
-      sha256 = "1867hgiqh51f6nzdmkq6nplnq7hs22lvzpishckhzw8x770sv10b";
-      name = "kde-l10n-fa-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fa-17.04.3.tar.xz";
+      sha256 = "1q3a2dyvrk22azj0rngb8h0dh88aczsxys7aaf4yvvwsdm7zbj8k";
+      name = "kde-l10n-fa-17.04.3.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fi-17.04.2.tar.xz";
-      sha256 = "1p4agangwvdzcx9029wslq5228wkgk4kpxddi2alzhlcxd25fk7b";
-      name = "kde-l10n-fi-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fi-17.04.3.tar.xz";
+      sha256 = "0hfzs1g5ikz6cgjss7kibxx2vd0zxn9rny7br4ysp1x89nz5qb34";
+      name = "kde-l10n-fi-17.04.3.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fr-17.04.2.tar.xz";
-      sha256 = "0lby60rklzcjk62qw2inslvhv4fli57kjn6a76hidcwvwmi3kcyh";
-      name = "kde-l10n-fr-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fr-17.04.3.tar.xz";
+      sha256 = "14i752qqdzdgbxh8r9rmjmjjsmhhh6vpcna3gp8g577r7y8rqpwk";
+      name = "kde-l10n-fr-17.04.3.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ga-17.04.2.tar.xz";
-      sha256 = "06xkiizvcsg61ww8gdqjn84ymhwcxr9pkf8p0g5mrplvnxc9v1ys";
-      name = "kde-l10n-ga-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ga-17.04.3.tar.xz";
+      sha256 = "164jc111sgj8mqcvvqx8yccjjinvk5h7g5z4a964dwhh587xir1h";
+      name = "kde-l10n-ga-17.04.3.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-gl-17.04.2.tar.xz";
-      sha256 = "059xv4a7mgf16h3wj2m4j1f32r8msvk0fdw62dlfypk0xi8lnzch";
-      name = "kde-l10n-gl-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-gl-17.04.3.tar.xz";
+      sha256 = "1c5vz652fd91pxx8p5savcfjg40ks96qay8djjvjznhs8rpkmxf9";
+      name = "kde-l10n-gl-17.04.3.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-he-17.04.2.tar.xz";
-      sha256 = "1w3rc832ngw91m1yrd988hxp8y0aaqgvkizkgmjiki0gqk3fkj25";
-      name = "kde-l10n-he-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-he-17.04.3.tar.xz";
+      sha256 = "142np920w44jwrkkrbplnfdyxpf72c0r86zwfdps7cc2giycj793";
+      name = "kde-l10n-he-17.04.3.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hi-17.04.2.tar.xz";
-      sha256 = "1kd4yxq3m5kg3crn6w86aiipslkfa4z79prm3fd6d4a5zpacmqbf";
-      name = "kde-l10n-hi-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hi-17.04.3.tar.xz";
+      sha256 = "17r2rfzk7773zxj454zm33fysd0jfc0kaji2pcpi27skypxcrsl7";
+      name = "kde-l10n-hi-17.04.3.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hr-17.04.2.tar.xz";
-      sha256 = "1m3avcrbyz31ir8qwwf9lhl4xr4qg241j99jbv28mgmsiv73ifji";
-      name = "kde-l10n-hr-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hr-17.04.3.tar.xz";
+      sha256 = "08fak1f5f5228djl28l8xx026mxq5khklvklss8fi42l57091azv";
+      name = "kde-l10n-hr-17.04.3.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hu-17.04.2.tar.xz";
-      sha256 = "1vh94d0ffjak5gwf4flgc2giq6vswyh57i334sq7n3vbpg6rwh7s";
-      name = "kde-l10n-hu-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hu-17.04.3.tar.xz";
+      sha256 = "0i5lgkdxs81kjhjrhzjdk0ayp28vdigrsfv1n6k0aqj3jzfpbhbz";
+      name = "kde-l10n-hu-17.04.3.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ia-17.04.2.tar.xz";
-      sha256 = "0k391rwrrj6bd86nd791pk0ih7g3z1b7vva43dmlishh5xind12p";
-      name = "kde-l10n-ia-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ia-17.04.3.tar.xz";
+      sha256 = "18bgdyazgqcslyajz97g0s96linx89ngr916zqknz64xqhxdhvdy";
+      name = "kde-l10n-ia-17.04.3.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-id-17.04.2.tar.xz";
-      sha256 = "13pfybpngzv1lscd3q4x4qh8kxs2k7md9biyibrs1vpyr28jw01c";
-      name = "kde-l10n-id-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-id-17.04.3.tar.xz";
+      sha256 = "0dncq9p12bgn4d6zra4skk6mb1ivnswn0z51llqrma90271ibflr";
+      name = "kde-l10n-id-17.04.3.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-is-17.04.2.tar.xz";
-      sha256 = "19cngzf26438amwfc7prz6hrszlqr78j2w9djm7y24gy7r6blfjq";
-      name = "kde-l10n-is-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-is-17.04.3.tar.xz";
+      sha256 = "1pkp87di1da6f2f9jjsj7li19d8pcn5ljhk1fhbrqc9b3whaansm";
+      name = "kde-l10n-is-17.04.3.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-it-17.04.2.tar.xz";
-      sha256 = "0wfsvrhmmarl277qvgwh4w9nl3rcqslkd4fjsl88m7230xzcjy6k";
-      name = "kde-l10n-it-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-it-17.04.3.tar.xz";
+      sha256 = "0n468q4z29mfl9b4a4clmv643p6fhlhf5mhsfl6dsi4l0v9a15mk";
+      name = "kde-l10n-it-17.04.3.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ja-17.04.2.tar.xz";
-      sha256 = "1b41f8pki75rc2swjaf1hvdvvjqvfz0glawrh4dda872naw65mhy";
-      name = "kde-l10n-ja-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ja-17.04.3.tar.xz";
+      sha256 = "00q937jdq6c2q2x75ky2xyfij0654xfzjm904j6kimvmpkyc33xk";
+      name = "kde-l10n-ja-17.04.3.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-kk-17.04.2.tar.xz";
-      sha256 = "01jrsjwlv10qdyzlwljf74cdwxprmsfvhi1pdlhv271z2ix661w5";
-      name = "kde-l10n-kk-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-kk-17.04.3.tar.xz";
+      sha256 = "1srjbxg969rhzqw81vy8kab9pkasp061i4r5ark8rg8k7agjdcml";
+      name = "kde-l10n-kk-17.04.3.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-km-17.04.2.tar.xz";
-      sha256 = "1fw62awnkmk7q4ybjqiszj8d0jkmm247lq25l6h8zsmidc9x4xz9";
-      name = "kde-l10n-km-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-km-17.04.3.tar.xz";
+      sha256 = "1szigmhybhfa70lg2wzpkzja73c20szzr8wawjzy869ql8fcip3w";
+      name = "kde-l10n-km-17.04.3.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ko-17.04.2.tar.xz";
-      sha256 = "1b5pqr5q7kn4vh7p8kngsw82ya7lv1jzbn8ngzrr8qkf6hh6ig2a";
-      name = "kde-l10n-ko-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ko-17.04.3.tar.xz";
+      sha256 = "1j9zgf9pl3nns5a8jdd2ggragq2ln3x11h7y2apkffihyd0kz40v";
+      name = "kde-l10n-ko-17.04.3.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lt-17.04.2.tar.xz";
-      sha256 = "06pn3dx7dx26w16lfcwdrzphakvnk709bs5mki9p08pdmamjdr7w";
-      name = "kde-l10n-lt-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lt-17.04.3.tar.xz";
+      sha256 = "1rpia72cz2a3knxzzanhhpqp3r89mj5dn4yh9ym81xw6s4acz5fg";
+      name = "kde-l10n-lt-17.04.3.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lv-17.04.2.tar.xz";
-      sha256 = "0a2kchx1qkyqzmqa7ajadfpxa5zywyhv55db5qax2xncz1w7v515";
-      name = "kde-l10n-lv-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lv-17.04.3.tar.xz";
+      sha256 = "1vpdgq90ph7c6yjvn0ijdq7ry699m03i7857sxq9vsgy4hi7xi14";
+      name = "kde-l10n-lv-17.04.3.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-mr-17.04.2.tar.xz";
-      sha256 = "0mjg9v484ayafgdz0z6ahsqsdlyn3iv9sa0xwg2x2fc04r5k5dni";
-      name = "kde-l10n-mr-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-mr-17.04.3.tar.xz";
+      sha256 = "1rfp5bi6xpdc503id328h8jl6z8alzjvg24dspaj209390hvldqv";
+      name = "kde-l10n-mr-17.04.3.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nb-17.04.2.tar.xz";
-      sha256 = "0bxq83qg39ivcr0qvxb0cd0q9mkjwp9j4h86s14wp5yq6jp0vcni";
-      name = "kde-l10n-nb-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nb-17.04.3.tar.xz";
+      sha256 = "1d25ffix6pakdcpcr2qz1h6729550l9ba93z545n0psjgqpwvmmr";
+      name = "kde-l10n-nb-17.04.3.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nds-17.04.2.tar.xz";
-      sha256 = "0rpdbk83rmj24m3by7igvab5aaskizfqxwfyvcjj0zhxpals0px4";
-      name = "kde-l10n-nds-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nds-17.04.3.tar.xz";
+      sha256 = "0pvx1rm6bx9xwyl4zfcw52mwif06350i9wmwz0kxxg3zs7lqb7h3";
+      name = "kde-l10n-nds-17.04.3.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nl-17.04.2.tar.xz";
-      sha256 = "180dsd92qap14pkqr4xv63zdaqz4s1jyx590d705yvbf3mkc1bwx";
-      name = "kde-l10n-nl-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nl-17.04.3.tar.xz";
+      sha256 = "1ivm2qsl0dmkrgmddnp3cjmcjc6jag0wawhklacp1c9iscfcrppm";
+      name = "kde-l10n-nl-17.04.3.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nn-17.04.2.tar.xz";
-      sha256 = "1vbb3jvhhv8pksff8330i2b2qjksb4lksw3pb52ph2h77gb36bh3";
-      name = "kde-l10n-nn-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nn-17.04.3.tar.xz";
+      sha256 = "0jsx980g7zn8m9xd7ljiqz1w9cvlgy84bl6hjhi0a89mfwkd27lg";
+      name = "kde-l10n-nn-17.04.3.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pa-17.04.2.tar.xz";
-      sha256 = "0v0a6bcrnrpy2ayj7d4v6lfgaxly3nk3d6dgmy26nydgmyg0xfsa";
-      name = "kde-l10n-pa-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pa-17.04.3.tar.xz";
+      sha256 = "149d7pdxb0543c36gyxidd7z4j2jw5nbilv7c561j3zazbbcg4nm";
+      name = "kde-l10n-pa-17.04.3.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pl-17.04.2.tar.xz";
-      sha256 = "0chzlzyxjhh1rv4gl7pbph7fs09p932mkl7az8yihj3zl5cvw82n";
-      name = "kde-l10n-pl-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pl-17.04.3.tar.xz";
+      sha256 = "04zxzx8586328v9dw6w5igxa95i7raqzpvdxshphv3wfnjgbzad5";
+      name = "kde-l10n-pl-17.04.3.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt-17.04.2.tar.xz";
-      sha256 = "14yp29l7fb2jlpx2dd12zn64q39yf7p9p79iynjsg3spwfdm5zpi";
-      name = "kde-l10n-pt-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt-17.04.3.tar.xz";
+      sha256 = "009dnijcznzaf6p85mg3j7s4zhjfmk4smk8bkns6pjn1r2wdpfbi";
+      name = "kde-l10n-pt-17.04.3.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-17.04.2";
+    version = "pt_BR-17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt_BR-17.04.2.tar.xz";
-      sha256 = "12g1mbdhw18pga063gczsxvmigdwgncc0qk8vy1rj6h5q3w6kkfm";
-      name = "kde-l10n-pt_BR-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt_BR-17.04.3.tar.xz";
+      sha256 = "07ird1j382m8c9459nvhmw0jy8i8ri5wmh6h7m36b8m4i7cbfdcx";
+      name = "kde-l10n-pt_BR-17.04.3.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ro-17.04.2.tar.xz";
-      sha256 = "0sqym2mx927pfvdq5lny64scg80xyrz3q1vlg3sk8gyil0n942gv";
-      name = "kde-l10n-ro-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ro-17.04.3.tar.xz";
+      sha256 = "1zs9yxv7566yi7rz9z9zk7mzq2rkh50y6s92sp52wyzsr3q4pl9j";
+      name = "kde-l10n-ro-17.04.3.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ru-17.04.2.tar.xz";
-      sha256 = "1gcy1ssir2fgg1djv7jbh9jv3y1pxs3yrxaqdd0m4zdkva1knx5p";
-      name = "kde-l10n-ru-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ru-17.04.3.tar.xz";
+      sha256 = "12a5s73rwnx25vvwdgqis24q26x8kg6zrin3gili4kdmfxr0x27i";
+      name = "kde-l10n-ru-17.04.3.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sk-17.04.2.tar.xz";
-      sha256 = "0yq5b9z77bijfa3y1dx2d6avpirwzbdsz9zng93r8a3lzyv3syfi";
-      name = "kde-l10n-sk-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sk-17.04.3.tar.xz";
+      sha256 = "0s3s94nb7dl7pdfm5pa7cw66q4vvjqqmv6rrzriia3z1dgg0n9y4";
+      name = "kde-l10n-sk-17.04.3.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sl-17.04.2.tar.xz";
-      sha256 = "1k117r37waxlxhdhlh7s2fii2iyv8himfkxnbm4lcxfbmhqj82cn";
-      name = "kde-l10n-sl-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sl-17.04.3.tar.xz";
+      sha256 = "1n0bj63inj5j9zxqfimza7frqikzyxjr7cyfaqa46ck2wcawhmwm";
+      name = "kde-l10n-sl-17.04.3.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sr-17.04.2.tar.xz";
-      sha256 = "17xpb1q7qamz70qbg2k9i4jfbz1qsv4n0j5hw4ix9bm2dncaaqa9";
-      name = "kde-l10n-sr-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sr-17.04.3.tar.xz";
+      sha256 = "0cs5rab87yydwpg6pql67x05802yzdj28y6rfzc0z0kr4diay34h";
+      name = "kde-l10n-sr-17.04.3.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sv-17.04.2.tar.xz";
-      sha256 = "1xlzc96pcwlbja3m0m15ii8n4lxf8h8ganyyh43zgxikcibcny70";
-      name = "kde-l10n-sv-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sv-17.04.3.tar.xz";
+      sha256 = "01f8zr3rf8zvsd0v69vyy45nn7bq9zlxf6f5lgr0i1yd4xjz6fvn";
+      name = "kde-l10n-sv-17.04.3.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-tr-17.04.2.tar.xz";
-      sha256 = "1fmmwv85cgazk655hdaykljjrh4cgghh0wkjf57n8lkkc7503278";
-      name = "kde-l10n-tr-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-tr-17.04.3.tar.xz";
+      sha256 = "082xrk31hajdq9hhnxh7z6ngn56q2adn8xjwkfizjyl3frf8ksya";
+      name = "kde-l10n-tr-17.04.3.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ug-17.04.2.tar.xz";
-      sha256 = "0l350qq3bfbvs7621lrl9azlx4mw5vdlrndp606v878abxaw16bh";
-      name = "kde-l10n-ug-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ug-17.04.3.tar.xz";
+      sha256 = "01k9mchkkwyka0sgwg1mx0j1sax227s4mnm74vmpshj651nxqm3r";
+      name = "kde-l10n-ug-17.04.3.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-uk-17.04.2.tar.xz";
-      sha256 = "1xnkknd2k8zdiq322nbiim9hg7gvww5zv3x7gqjrrqy7nha75mh4";
-      name = "kde-l10n-uk-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-uk-17.04.3.tar.xz";
+      sha256 = "1nwlqbr8cxcs2ny85bmzn549j66b1d7fiswlwgrvjlqj4mav3cwz";
+      name = "kde-l10n-uk-17.04.3.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-wa-17.04.2.tar.xz";
-      sha256 = "1f9sphx3rlc5m1ji0ihxs3p6wb7b53acfjyd5vps3b3cbf3j4aa3";
-      name = "kde-l10n-wa-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-wa-17.04.3.tar.xz";
+      sha256 = "13flih2ca2r8l3favp0xw1hcvwd07dsj64rmg6s2ysk3pcizy3i8";
+      name = "kde-l10n-wa-17.04.3.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-17.04.2";
+    version = "zh_CN-17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_CN-17.04.2.tar.xz";
-      sha256 = "1258f5s3pg6a9mfniwdf44w3y6pnf14m8nmqpfy534z68ypw6ymw";
-      name = "kde-l10n-zh_CN-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_CN-17.04.3.tar.xz";
+      sha256 = "02gzlwbq1zqaa1kqk7pd55yv7agg7igbb2147yvdj9462igpzjyi";
+      name = "kde-l10n-zh_CN-17.04.3.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-17.04.2";
+    version = "zh_TW-17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_TW-17.04.2.tar.xz";
-      sha256 = "0qz66hz1yabdgx3yq7cc6i5w9m01yp8pjrh46blskq6apwfwdhmg";
-      name = "kde-l10n-zh_TW-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_TW-17.04.3.tar.xz";
+      sha256 = "0x1nwahmh6142g21a949hibmx2slgbvrp5iwq137zmzmxffp7y9h";
+      name = "kde-l10n-zh_TW-17.04.3.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.33";
+    version = "4.14.34";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdelibs-4.14.33.tar.xz";
-      sha256 = "0594ak7d93sqk293p3jdi0mad2wwglk7m7x6sgj2jgaxjn3c5amq";
-      name = "kdelibs-4.14.33.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdelibs-4.14.34.tar.xz";
+      sha256 = "1yxwz6dln7km22cwxsns2rxxmw5p1c126xqnczz5fcjvalrk8zbp";
+      name = "kdelibs-4.14.34.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdenetwork-filesharing-17.04.2.tar.xz";
-      sha256 = "1fac78wbh61vsk1ibkvhffgnlpds9a6ax6jyly2n9lrcqifann64";
-      name = "kdenetwork-filesharing-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdenetwork-filesharing-17.04.3.tar.xz";
+      sha256 = "0r16jgsp45cf7gyjii04gq12wm68j86mrz4502szq0c02hfnmrsd";
+      name = "kdenetwork-filesharing-17.04.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdenlive-17.04.2.tar.xz";
-      sha256 = "1jzwar4bdjrbf97i9g6njzibv3ywcwha4cjkmj70pql67d5nmki9";
-      name = "kdenlive-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdenlive-17.04.3.tar.xz";
+      sha256 = "1n4x12pri0kw0lk3376l2059rnabi4c54ax8bdmx39hhn7lqxv45";
+      name = "kdenlive-17.04.3.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdepim-addons-17.04.2.tar.xz";
-      sha256 = "08hcgkjk3mwlg07g5k2b02kc67xyp2kxgh80f0v342kg455lq3fw";
-      name = "kdepim-addons-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdepim-addons-17.04.3.tar.xz";
+      sha256 = "118n8jdpjr50wgf45y2gzbqljbyichg4a6df014cdi0qcc55mcdl";
+      name = "kdepim-addons-17.04.3.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdepim-apps-libs-17.04.2.tar.xz";
-      sha256 = "1ala5hqzhpny0sncm96kpalj7dxkh06p6j0sk3725lpjqhr1ng15";
-      name = "kdepim-apps-libs-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdepim-apps-libs-17.04.3.tar.xz";
+      sha256 = "154057mxhkhm4lwlm49lx2m02qkddv0w96ikani7prb5p0kdw09i";
+      name = "kdepim-apps-libs-17.04.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdepim-runtime-17.04.2.tar.xz";
-      sha256 = "16crq3yc7djsas9klg1vl9nmk27fqj9770lfpysgz0pglb6j6k92";
-      name = "kdepim-runtime-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdepim-runtime-17.04.3.tar.xz";
+      sha256 = "07fcrvs9aqjxn7big60hh9hcd6mg211cmk69wdhhi455arjsfpzq";
+      name = "kdepim-runtime-17.04.3.tar.xz";
     };
   };
   kde-runtime = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kde-runtime-17.04.2.tar.xz";
-      sha256 = "1885cyarf6g460mnfl1wij0xg5n4z7w406lmlrk1w4h90ql48j69";
-      name = "kde-runtime-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kde-runtime-17.04.3.tar.xz";
+      sha256 = "05dshxx8bx872c4vp42i9n0dv19zq79p5m1lpd9kvmfpk3cvpxin";
+      name = "kde-runtime-17.04.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdesdk-kioslaves-17.04.2.tar.xz";
-      sha256 = "10sigid2zwgjfw737gr4wmm2ajx31v1y8y28l7dqd6y4jlkzf34j";
-      name = "kdesdk-kioslaves-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdesdk-kioslaves-17.04.3.tar.xz";
+      sha256 = "1j9m08r8jpdq5fqp9irvbqyb37maah1wz2xg4byinrn9qqp76dfl";
+      name = "kdesdk-kioslaves-17.04.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdesdk-thumbnailers-17.04.2.tar.xz";
-      sha256 = "1bq36gqqkf2cklj6rh35r88d4vknn22p0x3p6mq9ixca0sw7yc4a";
-      name = "kdesdk-thumbnailers-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdesdk-thumbnailers-17.04.3.tar.xz";
+      sha256 = "0jjaajz3yxghm7phzhw3cgc0y4kgsc1vs0yc1w4cn8kmipal0x1q";
+      name = "kdesdk-thumbnailers-17.04.3.tar.xz";
     };
   };
   kdf = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdf-17.04.2.tar.xz";
-      sha256 = "00g9jyl4bxmrbxri1q3893gw362v4rzp0gpc94d46v2vi6xqb501";
-      name = "kdf-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdf-17.04.3.tar.xz";
+      sha256 = "1d5nrp3x7r5fvghj7acrjhbz6n2cvd2qr60s6i0za7703b5iflyr";
+      name = "kdf-17.04.3.tar.xz";
     };
   };
   kdialog = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdialog-17.04.2.tar.xz";
-      sha256 = "184fyajhv4isirlv4sp8w2zxr7zkijknhsh6a1qpvr1r48ivw5aw";
-      name = "kdialog-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdialog-17.04.3.tar.xz";
+      sha256 = "15b5qhxy387wpv2hx6hw31r3lyh7j30vwzn9q474vsmp6jj2zq5m";
+      name = "kdialog-17.04.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kdiamond-17.04.2.tar.xz";
-      sha256 = "0krnb2g63zww655xmx1yn1105zkqryid5ip2vkn3cva2l1x8zfwr";
-      name = "kdiamond-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kdiamond-17.04.3.tar.xz";
+      sha256 = "0ri611bmqa81qlsfqmza4n5m14hlcrljhi4xlq2h5pcmg3j8ihyj";
+      name = "kdiamond-17.04.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/keditbookmarks-17.04.2.tar.xz";
-      sha256 = "12s9v5m681f9sz49h1xdnpriik8q2zswgr051kvvckbdrxj46rqc";
-      name = "keditbookmarks-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/keditbookmarks-17.04.3.tar.xz";
+      sha256 = "0pxrf18rml40lh2z3l8kk1nlzpdbwf3jdlzjy745fdc9x9q3phhm";
+      name = "keditbookmarks-17.04.3.tar.xz";
     };
   };
   kfilereplace = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kfilereplace-17.04.2.tar.xz";
-      sha256 = "1das2szmhw3lcpl2r3cqcylx3dx3xnvqclnasr3h5ahg4z86aqhn";
-      name = "kfilereplace-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kfilereplace-17.04.3.tar.xz";
+      sha256 = "115p6kjax7rhz646pvfi1av7pbllh42fmykzk4ld4mblgs56nj1j";
+      name = "kfilereplace-17.04.3.tar.xz";
     };
   };
   kfind = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kfind-17.04.2.tar.xz";
-      sha256 = "0d04p14fzwryf9kjx7ancqi9cfhsmy9xc9ylyi7frbafr6kac5va";
-      name = "kfind-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kfind-17.04.3.tar.xz";
+      sha256 = "12iaj6f1b1w3b8jnhdh0gg9k57qxmicsxw68bi0ha4i8lw6dmfc5";
+      name = "kfind-17.04.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kfloppy-17.04.2.tar.xz";
-      sha256 = "1f2aah2kskvyxpwkglv38ql955x1870saycym20b058dirinxg42";
-      name = "kfloppy-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kfloppy-17.04.3.tar.xz";
+      sha256 = "0ayaslvnfhf3v082dfv62ml5ss185jkm1cx7jlqqvpn84l6vykmk";
+      name = "kfloppy-17.04.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kfourinline-17.04.2.tar.xz";
-      sha256 = "1423hcikj2fyy26vm5nl5q5pg6xbsjppkvd6qhjwzj9csd9m2ysr";
-      name = "kfourinline-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kfourinline-17.04.3.tar.xz";
+      sha256 = "00ci1vbnqvr84ihdh6dcp7dw5pjqx3s40j5fafym0q2mji1q0cwj";
+      name = "kfourinline-17.04.3.tar.xz";
     };
   };
   kgeography = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kgeography-17.04.2.tar.xz";
-      sha256 = "1f7g9i4a2phi5gi5h6phn4w8l1yw2hf862yl6wwsgp4lb3agwcjb";
-      name = "kgeography-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kgeography-17.04.3.tar.xz";
+      sha256 = "0l9923fzpq5dxjvhsbxb03fh717yrys1najqdfyw1f9vs3fmkws9";
+      name = "kgeography-17.04.3.tar.xz";
     };
   };
   kget = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kget-17.04.2.tar.xz";
-      sha256 = "0hnizzplcmhvkyl270bbsi587f6adb1n6vpjji1scwnfjz42pjma";
-      name = "kget-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kget-17.04.3.tar.xz";
+      sha256 = "1fffkpnzhi9gl9xib398l8az16wyysjlphqga0a9a0bfkk6h884k";
+      name = "kget-17.04.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kgoldrunner-17.04.2.tar.xz";
-      sha256 = "0ihh2qr7dn5ibax0ljh7ahzhr193a5ghmzgaxkfk4649qc34vnx5";
-      name = "kgoldrunner-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kgoldrunner-17.04.3.tar.xz";
+      sha256 = "15sjikgk1qr36r5z6fbx535i6dj1l08klihrzyymmnr1vl5s02pr";
+      name = "kgoldrunner-17.04.3.tar.xz";
     };
   };
   kgpg = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kgpg-17.04.2.tar.xz";
-      sha256 = "0svr1qv9g6dm1m5ilbyws1mhrdjjq31iw0dwza3fri3vsmhhqpmx";
-      name = "kgpg-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kgpg-17.04.3.tar.xz";
+      sha256 = "1xdnpmrb6kd48ppvim2bs9c2abhr55f5ha25xr3r89blawmw16w0";
+      name = "kgpg-17.04.3.tar.xz";
     };
   };
   khangman = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/khangman-17.04.2.tar.xz";
-      sha256 = "1g06sm5fwdhysj7hjsrdj19hdf0q1kzc5li4h6klp4gim8hzji7w";
-      name = "khangman-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/khangman-17.04.3.tar.xz";
+      sha256 = "0n49zhwcsb8mgn416kzvq0x97b3x8mnln480wf8nd58f63hd4hdn";
+      name = "khangman-17.04.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/khelpcenter-17.04.2.tar.xz";
-      sha256 = "0zggqlyfgmpxgvjy83lqah9y927xzj8dy13pih0slnk01z50386c";
-      name = "khelpcenter-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/khelpcenter-17.04.3.tar.xz";
+      sha256 = "1sri5vb730k5n03kiykds024kl2hyw4bhzclxy5v0x36sjdqyz1z";
+      name = "khelpcenter-17.04.3.tar.xz";
     };
   };
   kholidays = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kholidays-17.04.2.tar.xz";
-      sha256 = "1cyncg08binky75n93r0l5qlx1zw73dqx3xp4i7xajc7qkmiy1x9";
-      name = "kholidays-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kholidays-17.04.3.tar.xz";
+      sha256 = "1hljhvlk6z3a4injfafwazai25qicmbdazj12pxb0wn5s538m9nw";
+      name = "kholidays-17.04.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kidentitymanagement-17.04.2.tar.xz";
-      sha256 = "00pxbbnl4l4cq5mlmgf89ndfy4wykbfvhslws4is6wm3qf9v99gm";
-      name = "kidentitymanagement-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kidentitymanagement-17.04.3.tar.xz";
+      sha256 = "17n7shm642jxnbzz11k9xrb7c3lmhzi3dabrl4qwxam1vf4zli6a";
+      name = "kidentitymanagement-17.04.3.tar.xz";
     };
   };
   kig = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kig-17.04.2.tar.xz";
-      sha256 = "0w1gl28rqqprijlqsfc8x6qjjc6nylniqvlpm71rgiwyq0zpyl1p";
-      name = "kig-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kig-17.04.3.tar.xz";
+      sha256 = "1r8w0b99fi0jj8ah2sxgzpz93b1324d4vrrjvgz1wjcwskwqmbld";
+      name = "kig-17.04.3.tar.xz";
     };
   };
   kigo = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kigo-17.04.2.tar.xz";
-      sha256 = "01yjdwcfwibw1c7dgk2alyp9mj9vy70fki0zf85gi91cwkrqklsi";
-      name = "kigo-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kigo-17.04.3.tar.xz";
+      sha256 = "0qx4bccniavbsy4icy98r4i3rgqcq3vw4fim9ad1ibmwsakzwrb9";
+      name = "kigo-17.04.3.tar.xz";
     };
   };
   killbots = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/killbots-17.04.2.tar.xz";
-      sha256 = "09a6h7q0nwj4lk81mrh1cpi27pjyxpdrk9lr2kgmjxgksavsi1p6";
-      name = "killbots-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/killbots-17.04.3.tar.xz";
+      sha256 = "0hjpzkdc0rgqiawy8vqh54bb693lhps9h2x9gxjsdhmk225l44b1";
+      name = "killbots-17.04.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kimagemapeditor-17.04.2.tar.xz";
-      sha256 = "00ln9mkmsky4fjn931d6y94f34fp7p11cx2vg1rafxzygr4zv0wz";
-      name = "kimagemapeditor-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kimagemapeditor-17.04.3.tar.xz";
+      sha256 = "1c1gv3bac40a4ix45ydxbn5rys1z33c3ycxvii17cgv591yqrana";
+      name = "kimagemapeditor-17.04.3.tar.xz";
     };
   };
   kimap = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kimap-17.04.2.tar.xz";
-      sha256 = "1g0j3n1ybx4vwyil7nic4rva2xn0dc86kbh1awcrk5q61pvkwmlr";
-      name = "kimap-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kimap-17.04.3.tar.xz";
+      sha256 = "0bdcxlwlr8k2ydmaimm4ja2kgg93qp0bjfl2cpsrzsfrp7fky5q2";
+      name = "kimap-17.04.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kio-extras-17.04.2.tar.xz";
-      sha256 = "1k84yn9q5w0wsa0rfr5rkz9pnsnhpn0xmdxx2r3kriq866iy2wfh";
-      name = "kio-extras-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kio-extras-17.04.3.tar.xz";
+      sha256 = "10zr3gafwswnk9qzb2f0ysllzbxfzq3l482f75sfzn8i2ripd3z1";
+      name = "kio-extras-17.04.3.tar.xz";
     };
   };
   kiriki = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kiriki-17.04.2.tar.xz";
-      sha256 = "116llc5p785h17wlqmy7hhjm3h8cbzsa8wh5hc13g3db58zyy3l4";
-      name = "kiriki-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kiriki-17.04.3.tar.xz";
+      sha256 = "1a4bnxv7y55fgkb0p0x7i09sqajsxg599zxqdfhsrm4ak6cqgkrg";
+      name = "kiriki-17.04.3.tar.xz";
     };
   };
   kiten = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kiten-17.04.2.tar.xz";
-      sha256 = "0khyg5m13ax2i7ml7cf23jq5zr090vdqm03b6m1959lhk3warvjw";
-      name = "kiten-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kiten-17.04.3.tar.xz";
+      sha256 = "1bxj013cb9jbahjghrdiq544zm7z4l4m1yd0zm0g9in9kp7rimzz";
+      name = "kiten-17.04.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kjumpingcube-17.04.2.tar.xz";
-      sha256 = "073hdjv6aa6lannn2avanjcxzgsz5pdfh5xi3r1hlmcwzwx4ydis";
-      name = "kjumpingcube-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kjumpingcube-17.04.3.tar.xz";
+      sha256 = "0n1lpp6mvhj65zdw19hqsi21fwmfrxng570w1sbc4nr2xq5axibn";
+      name = "kjumpingcube-17.04.3.tar.xz";
     };
   };
   kldap = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kldap-17.04.2.tar.xz";
-      sha256 = "1d5fbw11hz071rk814pfqa8gy8plznnr5wx5y16vb75a4sll1iw4";
-      name = "kldap-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kldap-17.04.3.tar.xz";
+      sha256 = "03ynbrf5slmkdigp4wpwys1gn6iyd9n6b2ki3adcff9vb6k636kc";
+      name = "kldap-17.04.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kleopatra-17.04.2.tar.xz";
-      sha256 = "0ph1rmxgq8n3yb61rhphw3b3kv8drdw13a418xwzc1kddpksa8r8";
-      name = "kleopatra-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kleopatra-17.04.3.tar.xz";
+      sha256 = "08v1gldjk0f6d3card84ml4654irxswmvcizg5zbd8cbqb3mxzpw";
+      name = "kleopatra-17.04.3.tar.xz";
     };
   };
   klettres = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/klettres-17.04.2.tar.xz";
-      sha256 = "093fb3n6dza44v3dqjragwkirid86frdv2v4yf54smpj8i5ykz21";
-      name = "klettres-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/klettres-17.04.3.tar.xz";
+      sha256 = "1gc1haxgx380q5chzm6l7hwf9laimjff3j2dvlfcqjq6hjjdasfw";
+      name = "klettres-17.04.3.tar.xz";
     };
   };
   klickety = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/klickety-17.04.2.tar.xz";
-      sha256 = "18xian4xwsj7wm5i6239cnabigzy05w02gwall884xk61mjwgqi7";
-      name = "klickety-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/klickety-17.04.3.tar.xz";
+      sha256 = "1622y0ijw9y28i7fqbxlxj7hi1g1p5ff8dgn9f7bz02a67pdpxxz";
+      name = "klickety-17.04.3.tar.xz";
     };
   };
   klines = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/klines-17.04.2.tar.xz";
-      sha256 = "0va4ia1za6mynb0xxyn1z9xag0vs3pscgwkq1jfjyrd1k5inribr";
-      name = "klines-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/klines-17.04.3.tar.xz";
+      sha256 = "1rzp34309ay7hrrjh6ya0ghr167dkxpkizvhz7l7dzrqv9r216wg";
+      name = "klines-17.04.3.tar.xz";
     };
   };
   klinkstatus = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/klinkstatus-17.04.2.tar.xz";
-      sha256 = "0mx16r98nr8ic5j9aqy32sz946v58cdzvhja4hxy56a2619pn7p8";
-      name = "klinkstatus-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/klinkstatus-17.04.3.tar.xz";
+      sha256 = "0lx9f382nsl008r796bpck5f6q8iw6kh46kzkbxn6ygcc6fxz4nk";
+      name = "klinkstatus-17.04.3.tar.xz";
     };
   };
   kmag = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmag-17.04.2.tar.xz";
-      sha256 = "1aswvc7zy8sd2jplyjmn05yvz4zjsjxy7arpzr5pb6q0za1fx1f0";
-      name = "kmag-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmag-17.04.3.tar.xz";
+      sha256 = "0frj2nzmkc0k8vmhhan0qb5qq519msjyz8g16yxip2wgw98n7z8w";
+      name = "kmag-17.04.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmahjongg-17.04.2.tar.xz";
-      sha256 = "116ahf9yaw23bxz0hvfd8bs8276vc2nr3b383vahsgywakvcq71q";
-      name = "kmahjongg-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmahjongg-17.04.3.tar.xz";
+      sha256 = "14afsfnnkdwhwqlyxvi16aldwanvn6s5nip6dy6k6aprap03y600";
+      name = "kmahjongg-17.04.3.tar.xz";
     };
   };
   kmail = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmail-17.04.2.tar.xz";
-      sha256 = "0vqhfnr9jz2yfjbk5cghmdxhdxlhk3x6mw9b33xq2cn9iink0n4l";
-      name = "kmail-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmail-17.04.3.tar.xz";
+      sha256 = "0ml3vkk8d8hhhl3ir09dfn17vnkc94m8vr7fln3246w8rajzcnxb";
+      name = "kmail-17.04.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmail-account-wizard-17.04.2.tar.xz";
-      sha256 = "1l7fq7yzhp9ad1ij8fj47j9pq7adl9p2jgwsyg7gkhrfa8s02ygv";
-      name = "kmail-account-wizard-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmail-account-wizard-17.04.3.tar.xz";
+      sha256 = "1d03kvjx92bqqh7b57kpfcy5viwkxwv4f113hw57bm6myfbv430z";
+      name = "kmail-account-wizard-17.04.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmailtransport-17.04.2.tar.xz";
-      sha256 = "0yjzvfwyz546486n9d1r8lr0q41ffjlg5c3klg8zc54d8290ghdw";
-      name = "kmailtransport-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmailtransport-17.04.3.tar.xz";
+      sha256 = "0d8w2xq0zjmk3h0hawsbacfvwb3s5qkzqns5hsdrf1dv7mx4w76r";
+      name = "kmailtransport-17.04.3.tar.xz";
     };
   };
   kmbox = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmbox-17.04.2.tar.xz";
-      sha256 = "0p1pf1a96h5bqhs5lmid0z9nd613x9vlwpraqdym5kyrzndvccys";
-      name = "kmbox-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmbox-17.04.3.tar.xz";
+      sha256 = "1r457xa9s30hpm92cd5lga89g1y256macfmi9kj4l0vjvjphligh";
+      name = "kmbox-17.04.3.tar.xz";
     };
   };
   kmime = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmime-17.04.2.tar.xz";
-      sha256 = "1jz4bj2rgcn4fmjybvrlq5i6fpx1jzqlzk0z5dv0yrqrln20lmw8";
-      name = "kmime-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmime-17.04.3.tar.xz";
+      sha256 = "107ylqgnc63l4a554c4rxp4ckyq33bgy6rwmgihysyy8ff4gfa9a";
+      name = "kmime-17.04.3.tar.xz";
     };
   };
   kmines = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmines-17.04.2.tar.xz";
-      sha256 = "0py92mbjqni0zpds8lf5wmirjwf8cw84ybirba73x6w40ysl3ny8";
-      name = "kmines-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmines-17.04.3.tar.xz";
+      sha256 = "0m42zmfy51qricg9k1rf3b0bcl4cg982iazrh85qcgvpjlgba70n";
+      name = "kmines-17.04.3.tar.xz";
     };
   };
   kmix = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmix-17.04.2.tar.xz";
-      sha256 = "1dgxz6c2mm5wnmap6pj3pbiajgpm5xx1q2kklhqxc2gkqxrz25a2";
-      name = "kmix-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmix-17.04.3.tar.xz";
+      sha256 = "1q5pk99hn4shfrbcfab8d1bh79i77v16q3ss2cfa6y8xkrny05rd";
+      name = "kmix-17.04.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmousetool-17.04.2.tar.xz";
-      sha256 = "065s73yksb39yawdz2ai221jncphanmxpxirdfnhljbg8d551k30";
-      name = "kmousetool-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmousetool-17.04.3.tar.xz";
+      sha256 = "08f7lvvqks75g0bcjd0cylixa93fr85rnc5jni0ygvi02b9fiy5a";
+      name = "kmousetool-17.04.3.tar.xz";
     };
   };
   kmouth = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmouth-17.04.2.tar.xz";
-      sha256 = "1iqa059169w4r94r99w338z5mbkxhcfz6xjycrw2nkvnp5spc4mw";
-      name = "kmouth-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmouth-17.04.3.tar.xz";
+      sha256 = "1x1g29ipq8v6zshhybwsm9ib8f0ks8rxyc0wjn0ncyirvrwr1ka3";
+      name = "kmouth-17.04.3.tar.xz";
     };
   };
   kmplot = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kmplot-17.04.2.tar.xz";
-      sha256 = "0rdg9ywmxd0bicb030kpyhcrgbhpvaac339gxwq1q2arrczds38x";
-      name = "kmplot-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kmplot-17.04.3.tar.xz";
+      sha256 = "0v8v2bqarn34xahnprpyi66szaq0kjp16cqz90kk8d4ch4xnvhjv";
+      name = "kmplot-17.04.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/knavalbattle-17.04.2.tar.xz";
-      sha256 = "091wvhnj98s1c0as90h6qy0sx47bb95gbczljq2rrnxz6sjw3x52";
-      name = "knavalbattle-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/knavalbattle-17.04.3.tar.xz";
+      sha256 = "1qkpzd0fdnz6cdd308xsrk2g6s5lfpq8v5nl6rd6h6ksv599017n";
+      name = "knavalbattle-17.04.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/knetwalk-17.04.2.tar.xz";
-      sha256 = "0g0q9m63qc33gfklpqpncvd3qdjpbjb53701ypiby3dlyb1znf3d";
-      name = "knetwalk-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/knetwalk-17.04.3.tar.xz";
+      sha256 = "16p7lxc4qzs4r2yjgshc8pcgpdi714rll6x0mzgsb0fdpdk3wrjg";
+      name = "knetwalk-17.04.3.tar.xz";
     };
   };
   knotes = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/knotes-17.04.2.tar.xz";
-      sha256 = "1ypl677rhgq8hmy9y5zryfs4zcyzj88ajlwvsxd3lv9ybkc7ymhy";
-      name = "knotes-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/knotes-17.04.3.tar.xz";
+      sha256 = "0x6ymg6x3yiaz3gz9kaj88clw7ra0bbmyh230hi0s9v0x085slp3";
+      name = "knotes-17.04.3.tar.xz";
     };
   };
   kolf = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kolf-17.04.2.tar.xz";
-      sha256 = "157gppkzgv3394pcxr3mc9vi0bd8hy9bjmmjcq9g8p5gdpj148ag";
-      name = "kolf-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kolf-17.04.3.tar.xz";
+      sha256 = "15l4pgidr6r4hh6q6c7gslh7027j1f5xxzwh5w76vlx3j0spzm7l";
+      name = "kolf-17.04.3.tar.xz";
     };
   };
   kollision = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kollision-17.04.2.tar.xz";
-      sha256 = "065h6lm71h4184jk8lh1gz5bq1kyxnpyf7jg0y50q9g8fm147s5j";
-      name = "kollision-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kollision-17.04.3.tar.xz";
+      sha256 = "0wlwyayrcjrlgzvci3ih2as6dw38jm0j4s15c13ssr545r7mdd4m";
+      name = "kollision-17.04.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kolourpaint-17.04.2.tar.xz";
-      sha256 = "09kgmkqzcr534vz24w9p27zzd0hwh43cz09pjfdcgcwq5bsnni3s";
-      name = "kolourpaint-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kolourpaint-17.04.3.tar.xz";
+      sha256 = "1xy95vmwajlzvmaqg02ywd8ar8j0ncv0qr5gm49qc57kxnylixhj";
+      name = "kolourpaint-17.04.3.tar.xz";
     };
   };
   kompare = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kompare-17.04.2.tar.xz";
-      sha256 = "0q6mi2l3bvl15qrylngdrngsvzv2dc26550pkjm1db94byx1qfk2";
-      name = "kompare-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kompare-17.04.3.tar.xz";
+      sha256 = "16wvfb337prnd9ncq1076hg3fz83lykpmaxmhznrjbiw8plc11n2";
+      name = "kompare-17.04.3.tar.xz";
     };
   };
   konqueror = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/konqueror-17.04.2.tar.xz";
-      sha256 = "0f36frk1wzw75w982clzlfxic7nj8nmslwy2wk855p3arcrg2dcq";
-      name = "konqueror-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/konqueror-17.04.3.tar.xz";
+      sha256 = "08dv4w507zm1qhzis543jamggpsl2rardcvkqanlrh24v83q9zl8";
+      name = "konqueror-17.04.3.tar.xz";
     };
   };
   konquest = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/konquest-17.04.2.tar.xz";
-      sha256 = "10apw2dj9xxrv4rw200lxb1iiqd2kpikb7njkf1x0h7c6lp7isxc";
-      name = "konquest-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/konquest-17.04.3.tar.xz";
+      sha256 = "0slnjkzlp0sk3sc5mjg27n918g4l4dsmz4ikz0cwbp46dbfz5y4c";
+      name = "konquest-17.04.3.tar.xz";
     };
   };
   konsole = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/konsole-17.04.2.tar.xz";
-      sha256 = "1v37v4shq0k3kv8vqnp9b1ghdirjj3vsjcvalkiagz94w1g61vyl";
-      name = "konsole-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/konsole-17.04.3.tar.xz";
+      sha256 = "1dhjadpcfh4d7h3ll2sr387c3hgskx8as9p6rksjwkp05mkbgh79";
+      name = "konsole-17.04.3.tar.xz";
     };
   };
   kontact = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kontact-17.04.2.tar.xz";
-      sha256 = "12gd453gdxmwbnqrlnbbqnqxd8chpf57mnjv498nhjv6sfj6mshv";
-      name = "kontact-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kontact-17.04.3.tar.xz";
+      sha256 = "148b86fd192nfc8yp9x5h4wwv7cnlyci1y3fb0wfl85h96d8sa5n";
+      name = "kontact-17.04.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kontactinterface-17.04.2.tar.xz";
-      sha256 = "1q4fdf4lglq84n0pva7fdqq4fqbwkq9g0qyp5mfq3fhvzbba3as1";
-      name = "kontactinterface-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kontactinterface-17.04.3.tar.xz";
+      sha256 = "0qlm7mfbhzbhfab0l9rfn5krnxlgbj9yny9bbn4isiyj8csjxmjy";
+      name = "kontactinterface-17.04.3.tar.xz";
     };
   };
   kopete = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kopete-17.04.2.tar.xz";
-      sha256 = "0bicwm8r4rl4awxkpi4hin95n37yj4ln29gp0z6j97fzc7kpiqlj";
-      name = "kopete-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kopete-17.04.3.tar.xz";
+      sha256 = "0gz47c9i9ziamh8295r407yamlwx3lqi6f2h9xrapsac8qm4cj7c";
+      name = "kopete-17.04.3.tar.xz";
     };
   };
   korganizer = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/korganizer-17.04.2.tar.xz";
-      sha256 = "0lrxy232v2gn40sd63xspyszkmqn1v6l40zcxpv9r7x62wn4v55r";
-      name = "korganizer-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/korganizer-17.04.3.tar.xz";
+      sha256 = "1z3vqlj1jhzvn9kq08hfpnw760yy8j4y82r151rb04c3k3x33mr7";
+      name = "korganizer-17.04.3.tar.xz";
     };
   };
   kpat = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kpat-17.04.2.tar.xz";
-      sha256 = "1r8i5aisllg9ykgy75gfnma2y8v6y67fa91z6r0q16bg66l2ij44";
-      name = "kpat-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kpat-17.04.3.tar.xz";
+      sha256 = "0j39nvb9nvgmg9lxw70q11vj1v08zy3dpbdrzx73v2grp7mvlc14";
+      name = "kpat-17.04.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kpimtextedit-17.04.2.tar.xz";
-      sha256 = "0d739nadn8n2393hq9rm2v8qx8l9jk7n1wgpbdbsddfq2lxz8g39";
-      name = "kpimtextedit-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kpimtextedit-17.04.3.tar.xz";
+      sha256 = "011y7f5aarznqs9ngbvi75h1z10avz1sp0286zmsi00g9733ap7h";
+      name = "kpimtextedit-17.04.3.tar.xz";
     };
   };
   kppp = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kppp-17.04.2.tar.xz";
-      sha256 = "1nm6kzjdwrl7206gwd47irhkj94vifxqhikc4g8jkvfh60rh87j8";
-      name = "kppp-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kppp-17.04.3.tar.xz";
+      sha256 = "158zgjjlmnk2lh048c271ac9a1h70x0ihm77xr5bgnjg1yyp8lwj";
+      name = "kppp-17.04.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kqtquickcharts-17.04.2.tar.xz";
-      sha256 = "0zjb7p3yxlpz8cyczsr9xwh44l7k1ddg1zwxqah91igdk7mc620x";
-      name = "kqtquickcharts-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kqtquickcharts-17.04.3.tar.xz";
+      sha256 = "1v7cllvz4bhkqnqfib723psvd053wvazvvniw1w6g69lv9a6kn88";
+      name = "kqtquickcharts-17.04.3.tar.xz";
     };
   };
   krdc = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/krdc-17.04.2.tar.xz";
-      sha256 = "0y8s28rwxjbpgq6kfhmrq9qr4h19iplfrgab7rb25zl881g9wycg";
-      name = "krdc-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/krdc-17.04.3.tar.xz";
+      sha256 = "0xi4s5w9wyrgcyqs4xixs8mcprnn3dp4p22fbgi8z8i25znd20d0";
+      name = "krdc-17.04.3.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kremotecontrol-17.04.2.tar.xz";
-      sha256 = "1lw45vnarqw975zz38z9nnmqvk91j2viijl0sf4h2ikx0myqiif7";
-      name = "kremotecontrol-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kremotecontrol-17.04.3.tar.xz";
+      sha256 = "1m1yh4knmj5llrgv043j50azq5s7clfmlg8b86nasz78svbdhxwg";
+      name = "kremotecontrol-17.04.3.tar.xz";
     };
   };
   kreversi = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kreversi-17.04.2.tar.xz";
-      sha256 = "1xhw4i4s7g7k3v4siprg2d1h9g4smqjwhz4qjzz236wmgky7na1b";
-      name = "kreversi-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kreversi-17.04.3.tar.xz";
+      sha256 = "0splganr60x9nz59jj4ysl8dk867c54k68d3pc8ac2yxhgb7qg0i";
+      name = "kreversi-17.04.3.tar.xz";
     };
   };
   krfb = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/krfb-17.04.2.tar.xz";
-      sha256 = "17lcv2kplawmvakashvrpk50g5ycw5fai4fiz0ijsj05ivqmrb6z";
-      name = "krfb-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/krfb-17.04.3.tar.xz";
+      sha256 = "0yx19gf8mh6l5k4apfim48jw61hcllwb2nbk9d7k08nl635lxd7i";
+      name = "krfb-17.04.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kross-interpreters-17.04.2.tar.xz";
-      sha256 = "0m2adnwhdclhhql0v3g2ay31g7ly67m3782ryq0vp9r8rcd5ga1b";
-      name = "kross-interpreters-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kross-interpreters-17.04.3.tar.xz";
+      sha256 = "1z7xnd4l1ksi0m4281pg9p0l2qv46acr1yijhrkg82va67y13r81";
+      name = "kross-interpreters-17.04.3.tar.xz";
     };
   };
   kruler = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kruler-17.04.2.tar.xz";
-      sha256 = "175c67m1wi9sl6is9f5pbsb3p6siyi9w7219p4ff6wbbjqjxpj2f";
-      name = "kruler-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kruler-17.04.3.tar.xz";
+      sha256 = "01pab2j5jpkqxmymhkkwlaw63idmbi9pdv0974ypg209lp51nw9i";
+      name = "kruler-17.04.3.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ksaneplugin-17.04.2.tar.xz";
-      sha256 = "16j4mpl9ick5d43rxnwmvfsb2wr5zgpmr3mlnmn99cvpr27v9mkg";
-      name = "ksaneplugin-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ksaneplugin-17.04.3.tar.xz";
+      sha256 = "0iyxzgxfvw8wk18bbhif5is8nj421rnf6hrm6jz8s1gzlamnmfkm";
+      name = "ksaneplugin-17.04.3.tar.xz";
     };
   };
   kscd = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kscd-17.04.2.tar.xz";
-      sha256 = "0cgxbhmmw8n7fwin3glzgfx0m1sdx2k4yhkrjislni3raiq4rv9x";
-      name = "kscd-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kscd-17.04.3.tar.xz";
+      sha256 = "1c2w5kjm020930460iyq3q9jb1m3lz8cld4zmd2q7vr68ga31756";
+      name = "kscd-17.04.3.tar.xz";
     };
   };
   kshisen = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kshisen-17.04.2.tar.xz";
-      sha256 = "0644aadh6svdhxb64hzhnvm11w071gax6bj30r0ad3zbqljzhnfv";
-      name = "kshisen-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kshisen-17.04.3.tar.xz";
+      sha256 = "14dswml5cgjr0q27gv7wgkl3mn3z2dvwa847k59s3mzpy7q45zyy";
+      name = "kshisen-17.04.3.tar.xz";
     };
   };
   ksirk = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ksirk-17.04.2.tar.xz";
-      sha256 = "0zh304xwknka6336avzpc5dvv2v6sl474d5q9vqzj8h0ybhdr5pb";
-      name = "ksirk-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ksirk-17.04.3.tar.xz";
+      sha256 = "16hibmv3697wzy62p51s5nkps942dav2wk7hllaykx3qzcr3dflf";
+      name = "ksirk-17.04.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ksnakeduel-17.04.2.tar.xz";
-      sha256 = "137am9qi5wfg90b7zf4hk0nsa8pm9f8cj7iraij492d6naif8an5";
-      name = "ksnakeduel-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ksnakeduel-17.04.3.tar.xz";
+      sha256 = "08v2yr8n9px55c467wyji2lmiyl1d7m7qm5ll7vynxsdzz6g02wq";
+      name = "ksnakeduel-17.04.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kspaceduel-17.04.2.tar.xz";
-      sha256 = "0jkr7xbgrgnwa94fdr1w03xxy75nksr31wb1sr2b3kpwp5ax1380";
-      name = "kspaceduel-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kspaceduel-17.04.3.tar.xz";
+      sha256 = "0y5c4hbxyl7pi4fp2zkkjmzqy27mazyh4capjnyjckqy91n3cfwa";
+      name = "kspaceduel-17.04.3.tar.xz";
     };
   };
   ksquares = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ksquares-17.04.2.tar.xz";
-      sha256 = "07fn872d126wv0gcfd58jd72ypajlpkfcd4njzj0v05x6i0njir0";
-      name = "ksquares-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ksquares-17.04.3.tar.xz";
+      sha256 = "04531lg5xz9rk81l0xqvy8wlh1jmpgfc74i0drv4s712v0bvjixb";
+      name = "ksquares-17.04.3.tar.xz";
     };
   };
   kstars = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kstars-17.04.2.tar.xz";
-      sha256 = "1r47l3zifb0carmgn0rv6wddqn483q9jadrwbahqp7b1yy14rkcj";
-      name = "kstars-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kstars-17.04.3.tar.xz";
+      sha256 = "011ncpkly5x6js9vx5d8pnrd3z9iz3zqxivx7cibjbgmwrl80dn8";
+      name = "kstars-17.04.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ksudoku-17.04.2.tar.xz";
-      sha256 = "11cvix24p1lpiss472yflcrwvygn0cxw4b5p9qhra643sx6bw5h5";
-      name = "ksudoku-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ksudoku-17.04.3.tar.xz";
+      sha256 = "0x54jmzjz01nlsxrn1hr6my54rb58v1qdibz03a8nl7pfndq6qhi";
+      name = "ksudoku-17.04.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ksystemlog-17.04.2.tar.xz";
-      sha256 = "1sw5f89khflmcbwwd1z399bwlnnl2lqp2qrj7wfdxb7s91j4jk2m";
-      name = "ksystemlog-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ksystemlog-17.04.3.tar.xz";
+      sha256 = "00g7cw2g2450x2m8wip62aajs2r6knw359s5lr5cl2llzasp297i";
+      name = "ksystemlog-17.04.3.tar.xz";
     };
   };
   kteatime = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kteatime-17.04.2.tar.xz";
-      sha256 = "10yqww3hybjirncjsxpya08c49ca0ac6zn6anjc1mb9nvji203xb";
-      name = "kteatime-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kteatime-17.04.3.tar.xz";
+      sha256 = "1cm5bmb0n8b6pxq0zbdl01mhrzh50ccrywzn2zjscbsnasnbynxk";
+      name = "kteatime-17.04.3.tar.xz";
     };
   };
   ktimer = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktimer-17.04.2.tar.xz";
-      sha256 = "19b27l308xb70wbx06fxykdwzcan3cjf7naj51fgma4qcm6xjdir";
-      name = "ktimer-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktimer-17.04.3.tar.xz";
+      sha256 = "0s5xvm2fk0i5lyj2420c561xbf536508l1basv3dn12l9xixmbm4";
+      name = "ktimer-17.04.3.tar.xz";
     };
   };
   ktnef = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktnef-17.04.2.tar.xz";
-      sha256 = "0vpq81gyjr14xf94h654v8cmfvndhc9wn8zznp9a7jbpzp4wdfnj";
-      name = "ktnef-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktnef-17.04.3.tar.xz";
+      sha256 = "06gyfz2xil0p9y1442dcwj3ymi1py3wrdbgkccc9vy4zpmaqmk68";
+      name = "ktnef-17.04.3.tar.xz";
     };
   };
   ktouch = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktouch-17.04.2.tar.xz";
-      sha256 = "17chk2vzvb8manyfcsnr73pfnvy128fi8g20r1gnidhgw6ix0s1r";
-      name = "ktouch-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktouch-17.04.3.tar.xz";
+      sha256 = "0ms1cbmf21w0ypwkxi3flazkkx790kciblk1izwn3p6ywqdig0ih";
+      name = "ktouch-17.04.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-accounts-kcm-17.04.2.tar.xz";
-      sha256 = "0kbnhkhw787bbgkpnchxkmwnzr2s4nqwmknzf34h613mlv7wspvg";
-      name = "ktp-accounts-kcm-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-accounts-kcm-17.04.3.tar.xz";
+      sha256 = "065gx0k28qialw41iqx3m25l1qppp77qssmhywb158pryy1v2clz";
+      name = "ktp-accounts-kcm-17.04.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-approver-17.04.2.tar.xz";
-      sha256 = "0986j2yy57jzg5z4czmrjw625ihw1393mv8h8kqipw727vvchka9";
-      name = "ktp-approver-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-approver-17.04.3.tar.xz";
+      sha256 = "11694778gg47fjq76rwxjibrcga7fqmnv88pmqvrb6hhskbnriav";
+      name = "ktp-approver-17.04.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-auth-handler-17.04.2.tar.xz";
-      sha256 = "0hlch8d2fj6xnnd39v5q9vri8svn1852am1kbvvyws770kgldj49";
-      name = "ktp-auth-handler-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-auth-handler-17.04.3.tar.xz";
+      sha256 = "0m3s8piyhi9r11pq202ky14drhm45gxvvvy30w2x57qz9k013c67";
+      name = "ktp-auth-handler-17.04.3.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-call-ui-17.04.2.tar.xz";
-      sha256 = "070ms5wyifqnc64x3r835vvbvn0l253qkn1li7bkqmsjg50q5sm7";
-      name = "ktp-call-ui-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-call-ui-17.04.3.tar.xz";
+      sha256 = "16zz91kiyz1mnipl6sqxqrak6cfhcp195in45cvlpcm5pn7gn0x6";
+      name = "ktp-call-ui-17.04.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-common-internals-17.04.2.tar.xz";
-      sha256 = "01xrdn1609ag2kha3wp756fh4kszvcp8biky3cgp52qasmp6k4k2";
-      name = "ktp-common-internals-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-common-internals-17.04.3.tar.xz";
+      sha256 = "12mwfd60f7iyb0f0y3yzscw38dygakhv9xlidwy4yxj6n7xylr0k";
+      name = "ktp-common-internals-17.04.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-list-17.04.2.tar.xz";
-      sha256 = "03iwx1xsd1scgw20s7n8cj7ai6cnlna19dd93s2a7r3z4jhwxkx0";
-      name = "ktp-contact-list-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-contact-list-17.04.3.tar.xz";
+      sha256 = "068m2nd969qrzsip4ks1zgcdardl4gzsdxm6jic04gxfhygrkllk";
+      name = "ktp-contact-list-17.04.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-runner-17.04.2.tar.xz";
-      sha256 = "1fal6g5zrh0s4wcxsqgps3a20xfdjc3pyw4dhdpgnsr6ig1z7rwn";
-      name = "ktp-contact-runner-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-contact-runner-17.04.3.tar.xz";
+      sha256 = "0qq1x1ip7vrjapq6aq8a7lbfcd6gn9cmal8g8247hilcjbmzlab2";
+      name = "ktp-contact-runner-17.04.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-desktop-applets-17.04.2.tar.xz";
-      sha256 = "0306lar375vh2wr9g2iicjawd5rm5zh7vp81jl0hgmzx7kxcjxgz";
-      name = "ktp-desktop-applets-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-desktop-applets-17.04.3.tar.xz";
+      sha256 = "0jsza9vaz7vn108j9c49fyqwyy2v7yjrmn3kpxn9kd4jmz81z74s";
+      name = "ktp-desktop-applets-17.04.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-filetransfer-handler-17.04.2.tar.xz";
-      sha256 = "044sr00rlcvxfw59f5m4i33jg4f8i77a8yjf3sdwjrnh03nsbjxz";
-      name = "ktp-filetransfer-handler-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-filetransfer-handler-17.04.3.tar.xz";
+      sha256 = "15bp0lrdingxz0sm9cxrjb3zhc1a56van2jl809v7703r3q6fliv";
+      name = "ktp-filetransfer-handler-17.04.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-kded-module-17.04.2.tar.xz";
-      sha256 = "19f5kdd3g54791a7ilsaas5ibj3f8gb889n82gh88lq7q9zrs5f3";
-      name = "ktp-kded-module-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-kded-module-17.04.3.tar.xz";
+      sha256 = "14jksyvl41179fm53834finmmh7pg5lyhgalvaa88dch62f3s6r7";
+      name = "ktp-kded-module-17.04.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-send-file-17.04.2.tar.xz";
-      sha256 = "1ydwnmyqwbf5qjhy9w2z2788p7maa591nlc946ar32wg2sc6ik57";
-      name = "ktp-send-file-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-send-file-17.04.3.tar.xz";
+      sha256 = "10h7y12z4l05yblh4drngqzb77yijik28iilj619491w865kia90";
+      name = "ktp-send-file-17.04.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktp-text-ui-17.04.2.tar.xz";
-      sha256 = "1s5dhhc1ihnlz08a2vwalzmk6zm2kb157smn07a9ilq0l64psdqa";
-      name = "ktp-text-ui-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktp-text-ui-17.04.3.tar.xz";
+      sha256 = "1ggac4v9wiqdqihnp9ddfh20p7kli2yhikdkiv8wb2ia3836j6y1";
+      name = "ktp-text-ui-17.04.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/ktuberling-17.04.2.tar.xz";
-      sha256 = "18krcrj9xlajj3q6vspw79snwnliqc00djpq8ra6yg2l56xqbwym";
-      name = "ktuberling-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/ktuberling-17.04.3.tar.xz";
+      sha256 = "0h66d6jhp9p47pb177hrjjkp0agwa4vzgjl53rib8lgv3ifyxq1d";
+      name = "ktuberling-17.04.3.tar.xz";
     };
   };
   kturtle = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kturtle-17.04.2.tar.xz";
-      sha256 = "140j7xws7kfw0cf4axf0jgfk9ywvrds79906iwzf1nig8rbxrfy1";
-      name = "kturtle-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kturtle-17.04.3.tar.xz";
+      sha256 = "04sykc7bsvc20i0nq8h1w89gafz6cli9x1iphf0l6v8whvb7avmn";
+      name = "kturtle-17.04.3.tar.xz";
     };
   };
   kubrick = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kubrick-17.04.2.tar.xz";
-      sha256 = "0pli70hkmb973j935fnjsaaml4gnck4jmzh3kph78wrhlxwqanqh";
-      name = "kubrick-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kubrick-17.04.3.tar.xz";
+      sha256 = "1zkjwsl7bsb170qac59psjkvdbqypfkp0s4snqvqw07jicbq75ss";
+      name = "kubrick-17.04.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kwalletmanager-17.04.2.tar.xz";
-      sha256 = "1y1h7j6jg0nm5kfw03k5b9m39v5vfyflcfrfcqz4q19c3zx7msrw";
-      name = "kwalletmanager-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kwalletmanager-17.04.3.tar.xz";
+      sha256 = "1wz27vg9h2g7q26ii1m358b3qdnra96zp3kwlz5yn5jkgv6500cr";
+      name = "kwalletmanager-17.04.3.tar.xz";
     };
   };
   kwave = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kwave-17.04.2.tar.xz";
-      sha256 = "0zk3xq76asz1lq1bvn5xyrly9qwz1bvipwsj03psckzzm0j2wx2j";
-      name = "kwave-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kwave-17.04.3.tar.xz";
+      sha256 = "1mps4fq351fxqpsrv74hchn64qm5407jr9vlh169khvrcjbj72xn";
+      name = "kwave-17.04.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/kwordquiz-17.04.2.tar.xz";
-      sha256 = "00x9l00d3aq8jcg4522faj9mp94k0526i41ls3wvmfd7q1i18viz";
-      name = "kwordquiz-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/kwordquiz-17.04.3.tar.xz";
+      sha256 = "0kacbsr56a063586vs4if4mcqp9fwics4344ha12zh2j2clr20h3";
+      name = "kwordquiz-17.04.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libgravatar-17.04.2.tar.xz";
-      sha256 = "1w36qj6n40k2yxva1qw9naag6zz05gcnia3sqmfamzxdji4l3nis";
-      name = "libgravatar-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libgravatar-17.04.3.tar.xz";
+      sha256 = "0mdnvr7k67v2j9x5zwfsy2d3hw6j83npcv7546yqxfv6myb0ffvc";
+      name = "libgravatar-17.04.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkcddb-17.04.2.tar.xz";
-      sha256 = "0cvy01krgvayc3hmsv55rrqjp72d27fz58clzw51p6zf2kvjn4q3";
-      name = "libkcddb-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkcddb-17.04.3.tar.xz";
+      sha256 = "01mmll75l2lv0djahfaikq5nc52z3k7zlc2hx3djw9xrhhvmd63k";
+      name = "libkcddb-17.04.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkcompactdisc-17.04.2.tar.xz";
-      sha256 = "1ywpghj4dy8ly15g55q8mhmx85xlxz3zasblhzsyxqh6rgwhnab6";
-      name = "libkcompactdisc-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkcompactdisc-17.04.3.tar.xz";
+      sha256 = "0zr581qyf81v9sfh3qvhkjh0krzs35y0gpi4wp07df071hiddmvj";
+      name = "libkcompactdisc-17.04.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkdcraw-17.04.2.tar.xz";
-      sha256 = "17dd68wlc7528prywps7slv6f9jfzbfhfmdlv20q0lzrjlxb2jxk";
-      name = "libkdcraw-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkdcraw-17.04.3.tar.xz";
+      sha256 = "1w0zhz20vf2i55wywzf7ar5sp2paflbxjg3r35p6wpfrlafzvnjw";
+      name = "libkdcraw-17.04.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkdegames-17.04.2.tar.xz";
-      sha256 = "07vs2077w7g6hvzaa9m7p6w3qc9daly174x7sq5an3wxb78zaj4k";
-      name = "libkdegames-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkdegames-17.04.3.tar.xz";
+      sha256 = "02j5kmbnxnmgf0vnmz6hzmkz5jc4aw2vm8gnjvs4l2hzcf7f82p8";
+      name = "libkdegames-17.04.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkdepim-17.04.2.tar.xz";
-      sha256 = "1s6vvbxjrhvgc147ila9ryy5z1c76dqc9nrxdblkdk36kgj193xs";
-      name = "libkdepim-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkdepim-17.04.3.tar.xz";
+      sha256 = "0a0kxx99swyw31bf9npbfa5smavpar2qg593dvg1basdy102lpcv";
+      name = "libkdepim-17.04.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkeduvocdocument-17.04.2.tar.xz";
-      sha256 = "1lakkz3ffp3qkhp15l8g04f1izgigv96ravj13yqvlafcj0l4wwh";
-      name = "libkeduvocdocument-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkeduvocdocument-17.04.3.tar.xz";
+      sha256 = "1z138s14cd7cfgv442i848m4w71f6442rjm8cghbd8m4kbd3m8yg";
+      name = "libkeduvocdocument-17.04.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkexiv2-17.04.2.tar.xz";
-      sha256 = "113gfmdvk85mlgq97hi5n4sn0ar55qy4lvrngzp70hr5gyk6jx87";
-      name = "libkexiv2-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkexiv2-17.04.3.tar.xz";
+      sha256 = "035akzr9f7f9k86j1ihx9ql574vjfm3ai792k8h46xh9d7xn385q";
+      name = "libkexiv2-17.04.3.tar.xz";
     };
   };
   libkface = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkface-17.04.2.tar.xz";
-      sha256 = "04cp6fqji8s6zsv09nbdkv9ikff5df5gb2nqbfdhh5hdyl5k9a6y";
-      name = "libkface-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkface-17.04.3.tar.xz";
+      sha256 = "081ghj31f39xxq692ad5a32w8kaks7xyl3xmcmgl0sp7yac102ar";
+      name = "libkface-17.04.3.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkgapi-17.04.2.tar.xz";
-      sha256 = "1awcfwf1haa38vnr5273y5xk9b64s7m139aqgyr7r72czm96ql8s";
-      name = "libkgapi-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkgapi-17.04.3.tar.xz";
+      sha256 = "1j6lg6mdd7bhapdkfpicksbd9y9b4qh0f9m3k3yddx318n49nl8r";
+      name = "libkgapi-17.04.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkgeomap-17.04.2.tar.xz";
-      sha256 = "0gbri3vfan9n3za0qd5bzbwvmkslbsylg5rw11zlcl9r8c5yz23p";
-      name = "libkgeomap-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkgeomap-17.04.3.tar.xz";
+      sha256 = "1zc4ja631f54xk1mycda1h4c3wdhq9ggn67xn68jrlv4wrsm3ly1";
+      name = "libkgeomap-17.04.3.tar.xz";
     };
   };
   libkipi = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkipi-17.04.2.tar.xz";
-      sha256 = "0spy876l7mzpb1kgbwxpi8nfyysd1xijg2ilbvbiisxf92krvxny";
-      name = "libkipi-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkipi-17.04.3.tar.xz";
+      sha256 = "1qf1qpq1q65fk96c6rvq4avlbqnfa7cr58fkcv8c620j7fkhh3iv";
+      name = "libkipi-17.04.3.tar.xz";
     };
   };
   libkleo = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkleo-17.04.2.tar.xz";
-      sha256 = "05pz45g11sxjcmijdklb4kp2n7ydi33vbdfl43fjl0s7rv7vmzr4";
-      name = "libkleo-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkleo-17.04.3.tar.xz";
+      sha256 = "1jk0qlsx6k77vg85xp1fjvz3b2h6f08zmwgjfh24gz9jacdps2bq";
+      name = "libkleo-17.04.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkmahjongg-17.04.2.tar.xz";
-      sha256 = "1dd58zz8zlcrwwn1zkhp2lw8h83fwiajaxf2yibwbk0bza1ydp3r";
-      name = "libkmahjongg-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkmahjongg-17.04.3.tar.xz";
+      sha256 = "1bwgrvzzwqd1zp9qskss8l20ihxd8z7mn4ap7xr2snr7m6bzandx";
+      name = "libkmahjongg-17.04.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libkomparediff2-17.04.2.tar.xz";
-      sha256 = "156s5lyna9wgj1cfqm36snyax9hybsr9xa72n246a94z81r6afsz";
-      name = "libkomparediff2-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libkomparediff2-17.04.3.tar.xz";
+      sha256 = "0jfhvp1dxbrblaqizflbs2c2r5ar1nd41rzhnrm4iwgafnpsa9av";
+      name = "libkomparediff2-17.04.3.tar.xz";
     };
   };
   libksane = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libksane-17.04.2.tar.xz";
-      sha256 = "12h6l6wa8g2qfddl9ylm9q4f8f2w7bgmii1v6yrmfb4nyr4bflda";
-      name = "libksane-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libksane-17.04.3.tar.xz";
+      sha256 = "0wvqdbi7a2ji2fhvxqn5iyab8qwq9ycb5lngj1wlyzp96c3lyz40";
+      name = "libksane-17.04.3.tar.xz";
     };
   };
   libksieve = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/libksieve-17.04.2.tar.xz";
-      sha256 = "0kz8nzd3cgipc3s3zif57d681ddb6xmb7kid25j3aypcz0i7gck1";
-      name = "libksieve-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/libksieve-17.04.3.tar.xz";
+      sha256 = "107bcfb3nvlwxhcwqdy90yki69xz2r7ipisb0dasxc70yvlkax83";
+      name = "libksieve-17.04.3.tar.xz";
     };
   };
   lokalize = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/lokalize-17.04.2.tar.xz";
-      sha256 = "0a85gjj40r5iw6mf190s4r4c4xsh1nfixj15g86acz02dn43zapn";
-      name = "lokalize-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/lokalize-17.04.3.tar.xz";
+      sha256 = "0v9q0xs6vgwxk6cpirpv41y49r7c74fwlqvrr23m70252781gx7a";
+      name = "lokalize-17.04.3.tar.xz";
     };
   };
   lskat = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/lskat-17.04.2.tar.xz";
-      sha256 = "0blnnyb7q6vxblvi6f1xigln70m1vjfpwav05qhm7msblhh5qp2j";
-      name = "lskat-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/lskat-17.04.3.tar.xz";
+      sha256 = "1bzrfb51aq0ir0kjsmzfvdfvjsj81xrn3sv6vsp0wmq1510dz0qq";
+      name = "lskat-17.04.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/mailcommon-17.04.2.tar.xz";
-      sha256 = "1f826r9m0xb418sqgx9lb23zf5am6cmgvcrx2d54c2va2vq97xgk";
-      name = "mailcommon-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/mailcommon-17.04.3.tar.xz";
+      sha256 = "1zyjcdn2x70304l2gyijwyv5p1p3wqvvlx9b6aj2xmhm0yvsfibk";
+      name = "mailcommon-17.04.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/mailimporter-17.04.2.tar.xz";
-      sha256 = "06q8k3x2nvhbgk1kh542rmqnc5c0hj4yzwl1c1clvjwlw7vpxdwh";
-      name = "mailimporter-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/mailimporter-17.04.3.tar.xz";
+      sha256 = "0f5nipzfz505c3bibsw6v4qnqd7bkv4fy61dyapka0dy0sxlmgdk";
+      name = "mailimporter-17.04.3.tar.xz";
     };
   };
   marble = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz";
-      sha256 = "1c6xmpkqilxd9zxz8kz7g47hwsa4hw27qcy96wxcg24hg8b5zr09";
-      name = "marble-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/marble-17.04.3.tar.xz";
+      sha256 = "0mlhngwscikcayi71kdsd6wbz2nj6gpzcib2gax32lnjdhx3zml3";
+      name = "marble-17.04.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/mbox-importer-17.04.2.tar.xz";
-      sha256 = "1mq3wbj9fcrcny4m9vs4gk0cw7xyxv1sbpby0wl6a63hb6r4nvca";
-      name = "mbox-importer-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/mbox-importer-17.04.3.tar.xz";
+      sha256 = "03mah1djrmks8zvqhzds9r6gx4z6z9ngqc0ki4524pf1yshg4bic";
+      name = "mbox-importer-17.04.3.tar.xz";
     };
   };
   messagelib = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/messagelib-17.04.2.tar.xz";
-      sha256 = "1fxajqxigfknl7ll755blz1ypy99idgr3gmi3p37ca3ld10f7ffv";
-      name = "messagelib-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/messagelib-17.04.3.tar.xz";
+      sha256 = "15jvx0f4dmkl7sp8qpijisamqvvz70x3xfk3q7n0cr81pdbc5s2k";
+      name = "messagelib-17.04.3.tar.xz";
     };
   };
   minuet = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/minuet-17.04.2.tar.xz";
-      sha256 = "0p2ii0wfqswliqf4fk04mx9z6nfhifa11l2w7bid4aj78b29138g";
-      name = "minuet-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/minuet-17.04.3.tar.xz";
+      sha256 = "16x4rbckwbiv77wvqyd60p34lds9pm5zhllzhzhlllz21m041z2p";
+      name = "minuet-17.04.3.tar.xz";
     };
   };
   okteta = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/okteta-17.04.2.tar.xz";
-      sha256 = "0w1xi3kd083dss69gnq4ghmhfr3w2cz42jbfjsaidzf4qcqlfr40";
-      name = "okteta-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/okteta-17.04.3.tar.xz";
+      sha256 = "01x9rp2h5ca85rriw8hz5qcmv4xm9isxvm8yc8b806kd08kwmhrv";
+      name = "okteta-17.04.3.tar.xz";
     };
   };
   okular = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/okular-17.04.2.tar.xz";
-      sha256 = "0rqc6h3zb48smrmp835zk4agvlwnmjwmzwv3rh3lgwfw9i3jq2zf";
-      name = "okular-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/okular-17.04.3.tar.xz";
+      sha256 = "0c05ma4yi6yhibxqfl26y32792cv21kvxdxs2yxbhm1xy3b397iv";
+      name = "okular-17.04.3.tar.xz";
     };
   };
   palapeli = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/palapeli-17.04.2.tar.xz";
-      sha256 = "0lcdkpvqmlsj73z88pi8v2hxd57bbbxlvf5yqj3zw33xb4nxw9bd";
-      name = "palapeli-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/palapeli-17.04.3.tar.xz";
+      sha256 = "1ixp23cp5qsil4dhvkq9q0d6cl3qyh6jard1zrd6qv3cz3586jsc";
+      name = "palapeli-17.04.3.tar.xz";
     };
   };
   parley = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/parley-17.04.2.tar.xz";
-      sha256 = "02pcyl8lnpxi936k6i7hah7vzlwzsag7lpsc0ly6q6q9rm4iwkqj";
-      name = "parley-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/parley-17.04.3.tar.xz";
+      sha256 = "1i4l18c5vndx6i3f4l6yyhgr4bmnvfwiqgjj01bicxzawnknv75m";
+      name = "parley-17.04.3.tar.xz";
     };
   };
   picmi = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/picmi-17.04.2.tar.xz";
-      sha256 = "0dqqaqfrqxwcp9daxfs8qmbf4kj6gn68v6l7dhj5r9mjvva0r4p5";
-      name = "picmi-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/picmi-17.04.3.tar.xz";
+      sha256 = "0n1wrbscjdqs4cks9igxdhqh583ksdqsi339cnlqdnazcpjrb96n";
+      name = "picmi-17.04.3.tar.xz";
     };
   };
   pimcommon = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/pimcommon-17.04.2.tar.xz";
-      sha256 = "1yvhf7hd2gm734i7k4smg57xq15wspbiq909crxs0ga82qx09hcg";
-      name = "pimcommon-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/pimcommon-17.04.3.tar.xz";
+      sha256 = "02wzindfacgj3f7a71h7wqa0jk0096xidw9bwdb5nvjnaigxxnx3";
+      name = "pimcommon-17.04.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/pim-data-exporter-17.04.2.tar.xz";
-      sha256 = "1q5qb4jbfdwp7h8d0drx0fyzmb7ffpcfrmirw22z8xk50r2r4v0i";
-      name = "pim-data-exporter-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/pim-data-exporter-17.04.3.tar.xz";
+      sha256 = "1q4vjynfbwrdn9j7ggxfsrilzb3g5s1yqr51siiw17jr11xca3cb";
+      name = "pim-data-exporter-17.04.3.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/pim-sieve-editor-17.04.2.tar.xz";
-      sha256 = "17aymflaqwci21h70s3lb8cfmh1qkynaswfkjqipravk58a302ni";
-      name = "pim-sieve-editor-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/pim-sieve-editor-17.04.3.tar.xz";
+      sha256 = "1dfksp7ric5na75i6hyj4q2sgzz7zdc9a0izpzhwzqbx86m56zd8";
+      name = "pim-sieve-editor-17.04.3.tar.xz";
     };
   };
   poxml = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/poxml-17.04.2.tar.xz";
-      sha256 = "1cv7k4xilpx75z07l6mpzwinxn1cdw6h1qglqhs5i35ii4cbbw40";
-      name = "poxml-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/poxml-17.04.3.tar.xz";
+      sha256 = "18rpy9l1blmgzjhl0pw3gjfngzjylwkqiwzilb2pdijs1121sjhv";
+      name = "poxml-17.04.3.tar.xz";
     };
   };
   print-manager = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/print-manager-17.04.2.tar.xz";
-      sha256 = "19hs25cgf54c6igm0sp5by4fayaz1w793drwz1szcl5b631sdywj";
-      name = "print-manager-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/print-manager-17.04.3.tar.xz";
+      sha256 = "0w51wkh2rlbwsna4amfiav0pi89si5cx8g0krfr12hiji05w4van";
+      name = "print-manager-17.04.3.tar.xz";
     };
   };
   rocs = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/rocs-17.04.2.tar.xz";
-      sha256 = "0ahrbxs675zvwb81fmlp55hz72xx8zlzwjgq01p03ih8jsq71s4j";
-      name = "rocs-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/rocs-17.04.3.tar.xz";
+      sha256 = "078451k2vx4pryxs93hry41jd6w6i8nd9lifwivgs8nrrbk4pf5b";
+      name = "rocs-17.04.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/signon-kwallet-extension-17.04.2.tar.xz";
-      sha256 = "1qcv8b5bmjd2dklbd4msp3cmh61qp6z6ml2ps6gzx4la1vp6qfmv";
-      name = "signon-kwallet-extension-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/signon-kwallet-extension-17.04.3.tar.xz";
+      sha256 = "0ahfzsr7xpnps14fwajc2fvgxd6jh18w9da40hc47pm5n8wwwbb0";
+      name = "signon-kwallet-extension-17.04.3.tar.xz";
     };
   };
   spectacle = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/spectacle-17.04.2.tar.xz";
-      sha256 = "1hab13wky0i7688jrzqy2m4kc49mz7fxjjk8z1rw2f4dxxaiymhf";
-      name = "spectacle-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/spectacle-17.04.3.tar.xz";
+      sha256 = "0xjclcvi5fq3aq0dz34cf4w6yvi9bjr3mwc0ywqfliw0j35r4iqv";
+      name = "spectacle-17.04.3.tar.xz";
     };
   };
   step = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/step-17.04.2.tar.xz";
-      sha256 = "16mhi1z5x403764k5csnr60zg2nwkjj7b3b39kqv1qb9540dmb2y";
-      name = "step-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/step-17.04.3.tar.xz";
+      sha256 = "111pqn908khirr66d9l4va2blcm2zcksb3w11lvwz7dfidag0bks";
+      name = "step-17.04.3.tar.xz";
     };
   };
   svgpart = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/svgpart-17.04.2.tar.xz";
-      sha256 = "1cns31z5pr78ilc1mhls31dchddwwzzwvbfddhygy2513067pca4";
-      name = "svgpart-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/svgpart-17.04.3.tar.xz";
+      sha256 = "101kll7q53qwhgjll4vrqdapag9bc5nwqnq14gxbmmyknpjpgxqh";
+      name = "svgpart-17.04.3.tar.xz";
     };
   };
   sweeper = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/sweeper-17.04.2.tar.xz";
-      sha256 = "0zarr01q1v3yq0ipb213i48q27qivrgcrhvynw7livs5s35mx844";
-      name = "sweeper-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/sweeper-17.04.3.tar.xz";
+      sha256 = "1ai6bhfq7g80y7w3jaqzhlq8z3krmpjjg9ap1p358485d6ja9i0k";
+      name = "sweeper-17.04.3.tar.xz";
     };
   };
   syndication = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/syndication-17.04.2.tar.xz";
-      sha256 = "19flj4f552yvvaih3wvw3i2p2nl60f5pgnl1ylimz5ga0c074vqq";
-      name = "syndication-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/syndication-17.04.3.tar.xz";
+      sha256 = "1d3nfzz2f0n31ivzrhld5gi1bk486i5dpp0v0b1wlnacm8z0ddy5";
+      name = "syndication-17.04.3.tar.xz";
     };
   };
   umbrello = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/umbrello-17.04.2.tar.xz";
-      sha256 = "0jhxifv8s9a0pg6g2vlla901fwral8gyzzhy1mxbah907mj912k1";
-      name = "umbrello-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/umbrello-17.04.3.tar.xz";
+      sha256 = "1v1694j5crffmy12qij1hrikrsn2irasjra11jcc4rx2klfhv2bs";
+      name = "umbrello-17.04.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.04.2";
+    version = "17.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.2/src/zeroconf-ioslave-17.04.2.tar.xz";
-      sha256 = "10fm62dik7a0pnram7mdraryrbk1sscsp9i46j6sp243ndd13015";
-      name = "zeroconf-ioslave-17.04.2.tar.xz";
+      url = "${mirror}/stable/applications/17.04.3/src/zeroconf-ioslave-17.04.3.tar.xz";
+      sha256 = "04k2mc2kl3raiirpfq150zdxb4w86cg5m70xcw711qddw1fv0g3y";
+      name = "zeroconf-ioslave-17.04.3.tar.xz";
     };
   };
 }

From 6292dc10a50f603eb07a32209a7760b34d2c0203 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 21 Jul 2017 10:10:43 +0800
Subject: [PATCH 0803/3246] kde-frameworks: 5.34 -> 5.36

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/kcodecs.nix      |   4 +-
 .../libraries/kde-frameworks/khtml.nix        |   4 +-
 .../libraries/kde-frameworks/srcs.nix         | 592 +++++++++---------
 4 files changed, 301 insertions(+), 301 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 480b11622c0..37aaeb29e7a 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.36/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index 90c9a963a60..6009b5ed73e 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, gperf }:
 
 mkDerivation {
   name = "kcodecs";
@@ -7,7 +7,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qttools ];
+  buildInputs = [ qttools gperf ];
   propagatedBuildInputs = [ qtbase ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix
index 3724d078aff..5bb3078ea86 100644
--- a/pkgs/development/libraries/kde-frameworks/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks/khtml.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, perl,
   giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs,
   knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem,
-  kxmlgui, phonon, qtx11extras, sonnet
+  kxmlgui, phonon, qtx11extras, sonnet, gperf
 }:
 
 mkDerivation {
@@ -13,7 +13,7 @@ mkDerivation {
   buildInputs = [
     giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications
     kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui phonon
-    qtx11extras sonnet
+    qtx11extras sonnet gperf
   ];
   propagatedBuildInputs = [ kjs ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 88a943c4fcd..ee6ece8fe27 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,595 +3,595 @@
 
 {
   attica = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/attica-5.34.0.tar.xz";
-      sha256 = "0l8gmsmpwzg6nzwwlnsdl6r6qkhnhirpmrkag9xpd2sbmy734x53";
-      name = "attica-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/attica-5.36.0.tar.xz";
+      sha256 = "12i5ky68aaxfxb0x6ixcjjqcdw87b435yf06qiz74pwvbj7rklld";
+      name = "attica-5.36.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/baloo-5.34.0.tar.xz";
-      sha256 = "0z53lnniq9xdk09d73z0p1xs1qmaf71m4znm4hmq956yg4yqa1ya";
-      name = "baloo-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/baloo-5.36.0.tar.xz";
+      sha256 = "1zrikrzg4v8mh3w1wln6dqx4jazjqkx0k3482gxf71g7gi9xj8gi";
+      name = "baloo-5.36.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/bluez-qt-5.34.0.tar.xz";
-      sha256 = "040gs2a1fx996gqdx2pwxh00szb1vb85055z946nqvqfn01921df";
-      name = "bluez-qt-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/bluez-qt-5.36.0.tar.xz";
+      sha256 = "1r3g5f2ll4flav9vjrxzh35y0w38h5fkg89h3s88pldshvgg208w";
+      name = "bluez-qt-5.36.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/breeze-icons-5.34.0.tar.xz";
-      sha256 = "1znzlggb6yrkw5rr2n75g7cfv9x5p9d55hss09c4i79lxrh1bk4a";
-      name = "breeze-icons-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/breeze-icons-5.36.0.tar.xz";
+      sha256 = "19b6jpy3zaawll53fg4cm50p93128bw483y1bjn82ghs7yqmp7f3";
+      name = "breeze-icons-5.36.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/extra-cmake-modules-5.34.0.tar.xz";
-      sha256 = "1r3dyvrv77xrpjlzpa6yazwkknirvx1ccvdyj9x0mlk4vfi05nh5";
-      name = "extra-cmake-modules-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/extra-cmake-modules-5.36.0.tar.xz";
+      sha256 = "1bsxdlk08zn98isbycm982xz67d40c63qsgghfambvqi0js0n4kf";
+      name = "extra-cmake-modules-5.36.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/frameworkintegration-5.34.0.tar.xz";
-      sha256 = "0hq1r2znjzy0wzm3nsclqmih1aia5300bsf87a2l4919q0ildb20";
-      name = "frameworkintegration-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/frameworkintegration-5.36.0.tar.xz";
+      sha256 = "1qa325fsdqk30v310qmira6j9cr5ij4bbj7yxyp4m1jzbp16sprl";
+      name = "frameworkintegration-5.36.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kactivities-5.34.0.tar.xz";
-      sha256 = "0dg6bkdxf4sicij4szmi55npn6chp0sfmw27qi1s582ymqzjgf5m";
-      name = "kactivities-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kactivities-5.36.0.tar.xz";
+      sha256 = "0h13jl5f35g24flwx19sxpknc7f5mx25nnwy0xdrhkbd6dknkss7";
+      name = "kactivities-5.36.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kactivities-stats-5.34.0.tar.xz";
-      sha256 = "1dfaq4hsd9wm1ka45dkxbl9wwr7s5ixbnnghqwxhl7a60imc680r";
-      name = "kactivities-stats-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kactivities-stats-5.36.0.tar.xz";
+      sha256 = "1hgpvga64244kh70ad0iwfl60bqpdly78db57hdh3b4as3mc7z8h";
+      name = "kactivities-stats-5.36.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kapidox-5.34.0.tar.xz";
-      sha256 = "190d5z6i71jrvfna6vnlim2p9rgc33s1fxl0zarn276683i1rwvg";
-      name = "kapidox-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kapidox-5.36.0.tar.xz";
+      sha256 = "181zgybsavvn2pdg9acyg7d2wspy8myf79qxbc8mb9zp5vnhb9br";
+      name = "kapidox-5.36.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/karchive-5.34.0.tar.xz";
-      sha256 = "0g8jskdar2znviwh9bs3kia093wgfnhl04x4jcg2rvh78ylkpvxw";
-      name = "karchive-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/karchive-5.36.0.tar.xz";
+      sha256 = "0l93ws6c09hm2qrhbc2r71qjgf27mv36ahnisygamfwh754n4700";
+      name = "karchive-5.36.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kauth-5.34.0.tar.xz";
-      sha256 = "06cw1bsp7inh5wglajm8aahy17p35ixgnijb7d74gjqzbj4cv93d";
-      name = "kauth-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kauth-5.36.0.tar.xz";
+      sha256 = "0a3xcl1wqb2ggw5lcll4i95jpi68zvmyyd7jb57qk1ags49l3yfk";
+      name = "kauth-5.36.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kbookmarks-5.34.0.tar.xz";
-      sha256 = "0ggn4rz8ch82ph64q6yik9fb1mp6kmsd7n33p769zl1lw7fldn0v";
-      name = "kbookmarks-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kbookmarks-5.36.0.tar.xz";
+      sha256 = "1176bily8w0q9l2k070rcgvki5mcjz8kh9nlvrgnch17bzqrwcsr";
+      name = "kbookmarks-5.36.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kcmutils-5.34.0.tar.xz";
-      sha256 = "1b52lwn7qjqrn06va7j1jswlzs6bx0drs90myf3607k52ffbf4hy";
-      name = "kcmutils-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kcmutils-5.36.0.tar.xz";
+      sha256 = "0rifncrndad2fr4b2imrshlhmzapw7zq05z52dyp0i5fdmznc8fz";
+      name = "kcmutils-5.36.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kcodecs-5.34.0.tar.xz";
-      sha256 = "0k51s4qlf0kq6i8f3wrsz5lrkzjqb1j26hrmlmg57vn91r58iash";
-      name = "kcodecs-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kcodecs-5.36.0.tar.xz";
+      sha256 = "0v5yv988ixdwbz0bbybia3f9y64k17ic935dr84kaqndz643xzvc";
+      name = "kcodecs-5.36.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kcompletion-5.34.0.tar.xz";
-      sha256 = "18hvdk5b1nkh6b3vx0jajri57rl266b0qjsiwirh5wmjc81xbpcw";
-      name = "kcompletion-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kcompletion-5.36.0.tar.xz";
+      sha256 = "1wi0fcrzxk27a1r0arrylxqyx4jpz1scj8pwf6whnpl56vmh6w9p";
+      name = "kcompletion-5.36.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kconfig-5.34.0.tar.xz";
-      sha256 = "0blbx6b3fk6p8cv2iywk2avn9w1411bb0g5wwv456a9ggi01988x";
-      name = "kconfig-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kconfig-5.36.0.tar.xz";
+      sha256 = "0m6n6dw4sgc1mr84dlg3lsbm080jqwrqd0mil15c33gsjn2kl7mk";
+      name = "kconfig-5.36.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kconfigwidgets-5.34.0.tar.xz";
-      sha256 = "0h4kappsffrp2qgg8wza1ybgah2dlcgpz591llfvaz31ldsml9hk";
-      name = "kconfigwidgets-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kconfigwidgets-5.36.0.tar.xz";
+      sha256 = "0siw3rhl8pjm6hnxis22rfdji28svp8q27991wsdmm7d5m284hx5";
+      name = "kconfigwidgets-5.36.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kcoreaddons-5.34.0.tar.xz";
-      sha256 = "1ybr4bv8rhp4cxpf8mfsc4dk0klzrfh1z8g2cw6zasmksxmmwi90";
-      name = "kcoreaddons-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kcoreaddons-5.36.0.tar.xz";
+      sha256 = "152mkf75bvn95viz3cz54cmssp1j89wp591sycvnqcni4azjcjwx";
+      name = "kcoreaddons-5.36.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kcrash-5.34.0.tar.xz";
-      sha256 = "1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3";
-      name = "kcrash-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kcrash-5.36.0.tar.xz";
+      sha256 = "0f6sbs91qykh0c4fs1lvdz89jn8rhnfg0v6dd3pkqm5q2fcdv3id";
+      name = "kcrash-5.36.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kdbusaddons-5.34.0.tar.xz";
-      sha256 = "1skblxfnjhbyiwavsfhksc2ybc2sikw3xr0js6mlfbpmvqzghn6h";
-      name = "kdbusaddons-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kdbusaddons-5.36.0.tar.xz";
+      sha256 = "012fbzdpzamc2nvbfhzv2270p4jsxiwa552mmmj16yxnrjrwycw4";
+      name = "kdbusaddons-5.36.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kdeclarative-5.34.0.tar.xz";
-      sha256 = "1mfj32p631zvwz9ldk8536ifb4n825zxbhx69bfllhw2vn1am7z2";
-      name = "kdeclarative-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kdeclarative-5.36.0.tar.xz";
+      sha256 = "0ljx1841490sl1qsi8304whczxgj4q4irm8z720bkjqh0c8i5pid";
+      name = "kdeclarative-5.36.0.tar.xz";
     };
   };
   kded = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kded-5.34.0.tar.xz";
-      sha256 = "0qy4w7bcg60gyf6y6c11kqcshnld55a8w4fzglpwgqfbliyi5yzq";
-      name = "kded-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kded-5.36.0.tar.xz";
+      sha256 = "0y44rgrxh47bj4ljpxs6gdib4fhzyz6pvi5l2hnacwr2l1vnfcs4";
+      name = "kded-5.36.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/portingAids/kdelibs4support-5.34.0.tar.xz";
-      sha256 = "0q9jjsjcvc43va4yvfay2xi40vb95lnqhgzavpqcndzjihixwmi0";
-      name = "kdelibs4support-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/portingAids/kdelibs4support-5.36.0.tar.xz";
+      sha256 = "041ygn0yd5r91j9ppv63xwj21c4ny56qlmkv2hmpanl05y94bpnq";
+      name = "kdelibs4support-5.36.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kdesignerplugin-5.34.0.tar.xz";
-      sha256 = "1jnarg7wrhdjfq73q4wplazxsz927mpf0l6m0i4akq4dlp1b7aah";
-      name = "kdesignerplugin-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kdesignerplugin-5.36.0.tar.xz";
+      sha256 = "1ksa8f6ivjlmm6rlm20vmrlqw58rf1k4ry3mk60b073fni2779hv";
+      name = "kdesignerplugin-5.36.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kdesu-5.34.0.tar.xz";
-      sha256 = "04mx0d6kf8slgkkgbna3cyv4c491jvlwcwqxc7zikz0i03l341id";
-      name = "kdesu-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kdesu-5.36.0.tar.xz";
+      sha256 = "01lg36m19qsa8ipwyx85jr38jh9ddcl6cvs4z3jmhg2nl467pwwa";
+      name = "kdesu-5.36.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kdewebkit-5.34.0.tar.xz";
-      sha256 = "155rn5bib4jq1ml35l4hll9cv30bp83wva4kgrhfc4y8cp46p9wk";
-      name = "kdewebkit-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kdewebkit-5.36.0.tar.xz";
+      sha256 = "1x53gzn1qyyvlx36qfjl6297v4862qqr8cmld32qaqxsgqc11b9s";
+      name = "kdewebkit-5.36.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kdnssd-5.34.0.tar.xz";
-      sha256 = "082mdim9wykdap4fmjfayk443rbarsk1p8cn3mspx2nw047yja80";
-      name = "kdnssd-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kdnssd-5.36.0.tar.xz";
+      sha256 = "07lfwbw546qsx2rss0ajblaqi9db2dz07s0vki1w9q17nf4lnl2p";
+      name = "kdnssd-5.36.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kdoctools-5.34.0.tar.xz";
-      sha256 = "145jjhsd0whmcj91zbjz2b1jyj4wasw60hbwyd4xvqds8cp0l02h";
-      name = "kdoctools-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kdoctools-5.36.0.tar.xz";
+      sha256 = "0sgvxp90141y11lz2vm8y78ymny8krq493w4xxaj9blzgfyr0yrj";
+      name = "kdoctools-5.36.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kemoticons-5.34.0.tar.xz";
-      sha256 = "02h12qy0w6mcgkczi3md1znnvp7r47l8h416nd080ljpsydalgx8";
-      name = "kemoticons-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kemoticons-5.36.0.tar.xz";
+      sha256 = "0bwag8x27dfshhd42340zr591l4nxhj58qlzdz64q4h3rhvibk5f";
+      name = "kemoticons-5.36.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kfilemetadata-5.34.0.tar.xz";
-      sha256 = "1rvlg6by8daiq5ff3qlxcw9k2iq4qicsj0c8a00xfy3w4h9ip9h5";
-      name = "kfilemetadata-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kfilemetadata-5.36.0.tar.xz";
+      sha256 = "17967dl9r2fipagdb3xknfv8p3cqi2mhxmpw1ghmw9mdid01y33m";
+      name = "kfilemetadata-5.36.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kglobalaccel-5.34.0.tar.xz";
-      sha256 = "1i32dq70qxjbfvlw0wqxvqvl6ysydmpg3zbiflff4z1qrmvmpw6a";
-      name = "kglobalaccel-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kglobalaccel-5.36.0.tar.xz";
+      sha256 = "1nkm2w38n8f5wq446g9kng8xy7vd4y0acfbsnlc9zshzmbf655bj";
+      name = "kglobalaccel-5.36.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kguiaddons-5.34.0.tar.xz";
-      sha256 = "1nmlwvy2jdmh0m6bmahvk68vl2rs9s28c10dkncpi6gvhsdkigqx";
-      name = "kguiaddons-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kguiaddons-5.36.0.tar.xz";
+      sha256 = "1xliia9zfg9kcgi78pkrlvb1nqj3h1cms7pccrnqgfgszm3j2y4c";
+      name = "kguiaddons-5.36.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/portingAids/khtml-5.34.0.tar.xz";
-      sha256 = "0j490jfnz8pbfl1i11wj514nw0skpnxr2fvi9pqpfql9lfhsanxv";
-      name = "khtml-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/portingAids/khtml-5.36.0.tar.xz";
+      sha256 = "15akih9pn3yzx4vskvq5vqrgq64vxfprvbfh00ir7bgl8rzrrngs";
+      name = "khtml-5.36.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/ki18n-5.34.0.tar.xz";
-      sha256 = "0glvmmy01mp6hnix79aichgwjq842kgf5q5zynkg6mch85y4ary7";
-      name = "ki18n-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/ki18n-5.36.0.tar.xz";
+      sha256 = "12sm340y2qvxlw7cac9mwq5ps4px4z607a9lx4q0ckaggix8gjf0";
+      name = "ki18n-5.36.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kiconthemes-5.34.0.tar.xz";
-      sha256 = "0hbl82r6qc8dh9v9n9xjkx966czkq5yjxx2rx7sbilj2p9v3saii";
-      name = "kiconthemes-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kiconthemes-5.36.0.tar.xz";
+      sha256 = "0a9dkn20siymgwy1fsnf98qbg14v0rfyrf96vrz1378vkyh37j2l";
+      name = "kiconthemes-5.36.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kidletime-5.34.0.tar.xz";
-      sha256 = "0z8x6iz52y2m8llsp2q4qayxswkzay7ksimzy47crfag442bw24g";
-      name = "kidletime-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kidletime-5.36.0.tar.xz";
+      sha256 = "1dhszas2fai5pv0lhk26w93ankp1x56nq8zlqdqs77z6fihmnc9l";
+      name = "kidletime-5.36.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kimageformats-5.34.0.tar.xz";
-      sha256 = "0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw";
-      name = "kimageformats-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kimageformats-5.36.0.tar.xz";
+      sha256 = "1j106d9m2z3dgz7ibff4cfzndann1yaf57c449s5l7gsdg229p89";
+      name = "kimageformats-5.36.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kinit-5.34.0.tar.xz";
-      sha256 = "08429kjihpaip73wszr3rsii8sdlwgm3kxx7g0hpjhkj9d2jq3m1";
-      name = "kinit-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kinit-5.36.0.tar.xz";
+      sha256 = "0499wjpjpba3kgprs2pvvrply1mbnvm7pppncv4jh7ynhqkjvm94";
+      name = "kinit-5.36.0.tar.xz";
     };
   };
   kio = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kio-5.34.0.tar.xz";
-      sha256 = "1i23ld5b9gafh2x3lv79jbggbd92xyhk7rg3n765w3bsfpg2ijva";
-      name = "kio-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kio-5.36.0.tar.xz";
+      sha256 = "1j23nxmsdivia5hrfdq42p4bdz5r0r739rr1px9dwmjiv3am33zi";
+      name = "kio-5.36.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kitemmodels-5.34.0.tar.xz";
-      sha256 = "1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5";
-      name = "kitemmodels-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kitemmodels-5.36.0.tar.xz";
+      sha256 = "08vbjardjnj7bz8ah089gpljc05h67q15g2xa7h5swkvh0pvq19a";
+      name = "kitemmodels-5.36.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kitemviews-5.34.0.tar.xz";
-      sha256 = "054accbis471zj1gbfxbc99062r2hvpb04i6w3r8fa4ml8s6brqk";
-      name = "kitemviews-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kitemviews-5.36.0.tar.xz";
+      sha256 = "01iayb6r8w4cnq3qpcs6c8cxmnjzp7mznk7s9d0djijplrcdgskl";
+      name = "kitemviews-5.36.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kjobwidgets-5.34.0.tar.xz";
-      sha256 = "0lrx761vf947mb2q1l2jgi0wgwj8cz2nn1xg0j38bh99sgddmzpf";
-      name = "kjobwidgets-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kjobwidgets-5.36.0.tar.xz";
+      sha256 = "1m4wsvpw4k7x7v32hxkk7dvs9gsnnwwzvgk81d86kvzdipkrbbcp";
+      name = "kjobwidgets-5.36.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/portingAids/kjs-5.34.0.tar.xz";
-      sha256 = "18b7k1hi73iqn06c1ryy9lcmvscr9d08q7n1wwkrn0l2xmy05xsq";
-      name = "kjs-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/portingAids/kjs-5.36.0.tar.xz";
+      sha256 = "06pzx7jajhk3yd01hxkia4lh85mdc9a5m2jd0bl1sk1q42hrm4n6";
+      name = "kjs-5.36.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/portingAids/kjsembed-5.34.0.tar.xz";
-      sha256 = "17w8i370pqks1fj3pcziz7j014chnc6yi7md7w2p4xprw54pbmbk";
-      name = "kjsembed-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/portingAids/kjsembed-5.36.0.tar.xz";
+      sha256 = "1045jfxky4hnld24lg3qy7j4v0aa0n9fgwa13fm7sz923ylh3gs9";
+      name = "kjsembed-5.36.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/portingAids/kmediaplayer-5.34.0.tar.xz";
-      sha256 = "1mq87qf86sdvwhas4w7rspd221qp4x9kds4nd0lpldiay4483k86";
-      name = "kmediaplayer-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/portingAids/kmediaplayer-5.36.0.tar.xz";
+      sha256 = "1pqg8ycsasn3sxh1r1wmrrz9431whylr77z8bvikj9x0w28fwnkm";
+      name = "kmediaplayer-5.36.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/knewstuff-5.34.0.tar.xz";
-      sha256 = "19d53ylwr92dzl9agk4j765zvb897rcm55z7pr6841aj58jk9b82";
-      name = "knewstuff-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/knewstuff-5.36.0.tar.xz";
+      sha256 = "0pfshizab7xkj71hjm69kqd63wvsmn4fpyhz7r1s9hsj136cjyzi";
+      name = "knewstuff-5.36.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/knotifications-5.34.0.tar.xz";
-      sha256 = "12z5hza0n5zr6mv3gkwhzb8zkrmk6dvgq8hrzwm8rzkgphjr6pi9";
-      name = "knotifications-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/knotifications-5.36.0.tar.xz";
+      sha256 = "1hlyllhfdd4pgj7q9k76wsf58h6m9vls1iz6ah20qivbkkwls074";
+      name = "knotifications-5.36.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/knotifyconfig-5.34.0.tar.xz";
-      sha256 = "0lwl22vq770jyp45j32s0ss8yiqdwbink6cdhkbapg3pzbiwklyk";
-      name = "knotifyconfig-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/knotifyconfig-5.36.0.tar.xz";
+      sha256 = "04cqyhbz6vfcwgd82jniwcc23sw7hzhrcfh5a3nlbx4yl0bifb3w";
+      name = "knotifyconfig-5.36.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kpackage-5.34.0.tar.xz";
-      sha256 = "0wdymhcrjggxb7andz36cfk9f240vvbq5yahlxyhfp9z69lriw5q";
-      name = "kpackage-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kpackage-5.36.0.tar.xz";
+      sha256 = "0bwa588wj0nwvbnblzfqx0qz1cc7a43p4dk1pc95rvzf00h8i1q8";
+      name = "kpackage-5.36.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kparts-5.34.0.tar.xz";
-      sha256 = "1a5n0f7ljdc2bm6vggzwbvpblyxjqn9m9pam70iab964pqqalgp7";
-      name = "kparts-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kparts-5.36.0.tar.xz";
+      sha256 = "0ph5g1chbzlwb1x4iwvdcq56ya8pp7j0n56r9h2n2g0ybg4mmrzk";
+      name = "kparts-5.36.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kpeople-5.34.0.tar.xz";
-      sha256 = "0krm74dl80s48nhiygga4dvkvqqimxdx4nczbk4qvj7j1g9p2rsh";
-      name = "kpeople-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kpeople-5.36.0.tar.xz";
+      sha256 = "0wifh4xp43h5q0iyb281pa50p6ww3ymnayq206675l07c84h021a";
+      name = "kpeople-5.36.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kplotting-5.34.0.tar.xz";
-      sha256 = "1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh";
-      name = "kplotting-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kplotting-5.36.0.tar.xz";
+      sha256 = "0gabk9x7mqql2cdafigcrp5ciyd8839arrrnxjq9gb02087v1rx7";
+      name = "kplotting-5.36.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kpty-5.34.0.tar.xz";
-      sha256 = "00k5hhz7nf3nf47xb003ni1chi03imyrfajap6ay4zp90l8fr950";
-      name = "kpty-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kpty-5.36.0.tar.xz";
+      sha256 = "1z5adph6i7wpwk1rlbrmmwczmfp41h8lj1ifzpnp082wj5a5khk4";
+      name = "kpty-5.36.0.tar.xz";
     };
   };
   kross = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/portingAids/kross-5.34.0.tar.xz";
-      sha256 = "092qz8vyiialv9fvk4wvn8mrfhz5i5hnbq0xnz6nvi1pk3db6bxq";
-      name = "kross-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/portingAids/kross-5.36.0.tar.xz";
+      sha256 = "0yhjzzkpwd406h265fczvlrnwddn2b24mw21gy6x8kcjmdl0ssjq";
+      name = "kross-5.36.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/krunner-5.34.0.tar.xz";
-      sha256 = "0n527p708k719zgmvvbmp20xmg72f85cll05q05p4h317g7wz6i5";
-      name = "krunner-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/krunner-5.36.0.tar.xz";
+      sha256 = "0r91wd8dc9798j2ghiyxa2b46xvk9ns2rzk3yjaavmnq5xxf2mhq";
+      name = "krunner-5.36.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kservice-5.34.0.tar.xz";
-      sha256 = "0sikwn49s2iq1nj518q55m2p0hvdvwm98cpf0dkjb1z1v6fgjc37";
-      name = "kservice-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kservice-5.36.0.tar.xz";
+      sha256 = "19hhvbs0f7494xhmk7nx72lmff1hpnhin0y1my1xbw03l3f0l4wh";
+      name = "kservice-5.36.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/ktexteditor-5.34.0.tar.xz";
-      sha256 = "182a0swfgdqr0faq3ksk6hlfvdi1afd0hpys5vayjjf263m19xxw";
-      name = "ktexteditor-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/ktexteditor-5.36.0.tar.xz";
+      sha256 = "02c6l6sl9ps1aly46p23wzfpgfc112fhjvhq53smw5qqzyd1187r";
+      name = "ktexteditor-5.36.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/ktextwidgets-5.34.0.tar.xz";
-      sha256 = "1hri34b373bww5gv14qli2nm77k05pk170nbb2vv2zvzv93g25gw";
-      name = "ktextwidgets-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/ktextwidgets-5.36.0.tar.xz";
+      sha256 = "0b8w0gym1mmbsy1xic6nc76yqa5rwk8nmcjln2z5ri7cg20nxywa";
+      name = "ktextwidgets-5.36.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kunitconversion-5.34.0.tar.xz";
-      sha256 = "0v4x0flbfavrzfiqh71mdkqgp1fzk4f52msvq6w60i2s3sz7hcsm";
-      name = "kunitconversion-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kunitconversion-5.36.0.tar.xz";
+      sha256 = "1xa2n3h13i6lrlxmhvvvgpmcdmr01gskim8wcy5gf0nl23v8bcmh";
+      name = "kunitconversion-5.36.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kwallet-5.34.0.tar.xz";
-      sha256 = "08z3ddsam5n5qn2svscp4hgksf6qd1h8lqw1v382p01nnmhxadz5";
-      name = "kwallet-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kwallet-5.36.0.tar.xz";
+      sha256 = "1fyaki8j43i4q0spmgqbzhgv17ziib9g3pcf9jl6gnkmipmwm0l7";
+      name = "kwallet-5.36.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kwayland-5.34.0.tar.xz";
-      sha256 = "1zxb9ram47vbiik8h0czyvacrdiijhnslkpcm61l4r1rb0ybb0ib";
-      name = "kwayland-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kwayland-5.36.0.tar.xz";
+      sha256 = "0h9k8m9vb1y1w5gvhgs2fj1iqg64fc9zl4rqnssqgz6fyp3p7i52";
+      name = "kwayland-5.36.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kwidgetsaddons-5.34.0.tar.xz";
-      sha256 = "0hw87iig75mfgl5p3ph6zkwap31h357bm7rlyv5d9nnp10bq0hfg";
-      name = "kwidgetsaddons-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kwidgetsaddons-5.36.0.tar.xz";
+      sha256 = "02x232rfagd7xv5m9jwyr5h0cr6g8ibr27s86240xpbb9z9656mw";
+      name = "kwidgetsaddons-5.36.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kwindowsystem-5.34.0.tar.xz";
-      sha256 = "1sp2x7afhw19vmhdp2qyrmljz8h0875xjk95n8c5gzypk7sr0l83";
-      name = "kwindowsystem-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kwindowsystem-5.36.0.tar.xz";
+      sha256 = "0whih8hhlrqsfadqmh6msw8xv7pmmlk6v4zahlhalkfpdvir26ca";
+      name = "kwindowsystem-5.36.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kxmlgui-5.34.0.tar.xz";
-      sha256 = "1v8m6qzjqg3ic14a5ki37bf13kifzcbhly68zcxgs5b92hr953iy";
-      name = "kxmlgui-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kxmlgui-5.36.0.tar.xz";
+      sha256 = "0c8fvawbcz4v2dcnb77vk7c49l9bd7v8jgg8r8763lwksdckyyz7";
+      name = "kxmlgui-5.36.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/kxmlrpcclient-5.34.0.tar.xz";
-      sha256 = "0kp3ab50m5jl2jgw883ip67s6gs0l3saprzrqa9r3hydn2c4s3md";
-      name = "kxmlrpcclient-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/kxmlrpcclient-5.36.0.tar.xz";
+      sha256 = "14x7xi2h1208wzj5jnxawz7frjvvkqargiv0v44p699s157bb0d1";
+      name = "kxmlrpcclient-5.36.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/modemmanager-qt-5.34.0.tar.xz";
-      sha256 = "1cf5nsc8h7djvr19fm5dphzplh1wm3asvn0a7r71spg0i7lzi89h";
-      name = "modemmanager-qt-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/modemmanager-qt-5.36.0.tar.xz";
+      sha256 = "0l9g374xwfhfjdniyrjyy8f3xkzdiiqzzpzwx2929h6jml0nr00f";
+      name = "modemmanager-qt-5.36.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/networkmanager-qt-5.34.0.tar.xz";
-      sha256 = "05s0irvkg0g57acriablyha2wb9c7w3xhq223vdddjqpcdx0pnkl";
-      name = "networkmanager-qt-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/networkmanager-qt-5.36.0.tar.xz";
+      sha256 = "1mii9qai7vkwj7x6g3yiqiqk5kzc7im27fg2dhzwgq95dgm4aa2x";
+      name = "networkmanager-qt-5.36.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/oxygen-icons5-5.34.0.tar.xz";
-      sha256 = "0cmxxssir5zbp5nlxq81h2xfd6wrxbbkydyw93dby7r56isl7ga5";
-      name = "oxygen-icons5-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/oxygen-icons5-5.36.0.tar.xz";
+      sha256 = "042ry8g1v71ifb4yhdi3k6x64sbc0lfyzinyjz78l2zf154l3d9g";
+      name = "oxygen-icons5-5.36.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/plasma-framework-5.34.0.tar.xz";
-      sha256 = "0waicqskfwc8xpmrym165hwlfv6nzbwc783sac5vrhbyk4bwk8x9";
-      name = "plasma-framework-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/plasma-framework-5.36.0.tar.xz";
+      sha256 = "05wzhnn78f5fi8wwpdrcvjfdv3p14868wlk714shmc5q3svfaq3h";
+      name = "plasma-framework-5.36.0.tar.xz";
     };
   };
   prison = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/prison-5.34.0.tar.xz";
-      sha256 = "00wj4yyfhhcq9b54civ5hy1grz70mmi676x50y12crcbbgkxm1lx";
-      name = "prison-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/prison-5.36.0.tar.xz";
+      sha256 = "0f52gmmvga0rd7d7m357dgbwxlwk7sq5mxakhjhwdgjgj1vjx0z3";
+      name = "prison-5.36.0.tar.xz";
     };
   };
   solid = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/solid-5.34.0.tar.xz";
-      sha256 = "02kz21p3p1s1rg7gf34fr6ynhji6x97yvsfdpvbfxbhijabbh4ib";
-      name = "solid-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/solid-5.36.0.tar.xz";
+      sha256 = "1b7g0gph6x353amnjskv40a037r7likanx9m52gdsc0z3dg3s3di";
+      name = "solid-5.36.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/sonnet-5.34.0.tar.xz";
-      sha256 = "06gxrh8rb75ydkqxk5dhlmwndnczp264jx588ryfwlf3vlnk99vs";
-      name = "sonnet-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/sonnet-5.36.0.tar.xz";
+      sha256 = "1vb6jccfh5pxjb3r43qrqig3h0z8cr0pw27sb116igssc4j0gkxc";
+      name = "sonnet-5.36.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/syntax-highlighting-5.34.0.tar.xz";
-      sha256 = "0ryfwblvzj9rd5jj7l8scmbb49ygzk77ng05hrznsipczin2cjw8";
-      name = "syntax-highlighting-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/syntax-highlighting-5.36.0.tar.xz";
+      sha256 = "1igxjkx8sphxaf4y07d78lnn2nad6q7siarsflh1f79srm2qhnlj";
+      name = "syntax-highlighting-5.36.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.34.0";
+    version = "5.36.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.34/threadweaver-5.34.0.tar.xz";
-      sha256 = "1gylpl283qf1jcfyib4q5xwnpdq13hnd2cp2i7xjazdw2jp40zhr";
-      name = "threadweaver-5.34.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.36/threadweaver-5.36.0.tar.xz";
+      sha256 = "19z97ddba9pkv4j5p2iyr02khqmlgizky306irhhlwdw3y0m4pm1";
+      name = "threadweaver-5.36.0.tar.xz";
     };
   };
 }

From 3bb5b83584c716a2d284fd1c0771250a9db0765f Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Thu, 20 Jul 2017 22:48:00 -0700
Subject: [PATCH 0804/3246] fzf: 0.16.8 -> 0.16.9

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 9d40077e0d6..21f8fa3c2ea 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.16.8";
+  version = "0.16.9";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "0d0fcv07pl2vvj9ql84rmy1kd0zg680chsfapm0iw3vssxqkm9zq";
+    sha256 = "17jq1g0x7vczng9h0ywdawqr5d2cnm4rzv3y75vfbddsfd28rlgs";
   };
 
   outputs = [ "bin" "out" "man" ];

From 19325558f154186d2bbaa3d327f19fedd743c339 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 21 Jul 2017 09:54:41 +0200
Subject: [PATCH 0805/3246] Fix docker packaging without sandbox

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 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 b811ab42ff2..c42b2a098f7 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -137,8 +137,8 @@ rec {
       echo "Generate man pages from cobra"
       cd ./components/cli
       mkdir -p ./man/man1
-      go build -o /tmp/gen-manpages github.com/docker/cli/man
-      /tmp/gen-manpages --root . --target ./man/man1
+      go build -o ./gen-manpages github.com/docker/cli/man
+      ./gen-manpages --root . --target ./man/man1
 
       # Generate legacy pages from markdown
       echo "Generate legacy manpages"

From 581637ba5a512e1179cdaf0108931fca32892b32 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Jul 2017 11:24:21 +0300
Subject: [PATCH 0806/3246] yle-dl: 2.17 -> 2.20

---
 pkgs/tools/misc/yle-dl/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 8da61ddc4af..7fc9589537f 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -1,28 +1,18 @@
 { stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages }:
 
-stdenv.mkDerivation rec {
+pythonPackages.buildPythonApplication rec {
   name = "yle-dl-${version}";
-  version = "2.17";
+  version = "2.20";
 
   src = fetchFromGitHub {
     owner = "aajanki";
     repo = "yle-dl";
     rev = version;
-    sha256 = "06szrcm1xlz6i736qkxzhhvrzg63shxzy2bww91bgxfccmkapa14";
+    sha256 = "06wzv230hfh3w9gs245kff8666bsfbax3ibr5zxj3h5z4qhhf9if";
   };
 
-  patchPhase = ''
-    substituteInPlace yle-dl --replace '/usr/local/share/' "$out/share/"
-  '';
-
-  buildInputs = [ pythonPackages.wrapPython ];
   pythonPath = [ rtmpdump php ] ++ (with pythonPackages; [ pycrypto ]);
 
-  installPhase = ''
-    make install prefix=$out
-    wrapPythonPrograms
-  '';
-
   meta = with stdenv.lib; {
     description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
     homepage = https://aajanki.github.io/yle-dl/;

From e879033c439847ee54935107a79a6228b8cdf3c3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Jul 2017 11:43:48 +0300
Subject: [PATCH 0807/3246] fio: 2.21 -> 2.99

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

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 3320f2abab3..7f05a7271bb 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
 let
-  version = "2.21";
-  sha256 = "0nvvnhmls9gbn093lzcgps1w8824ylgyz674af85768pw2bvczzy";
+  version = "2.99";
+  sha256 = "0fj8fk2w06ahcn35z8pj88sx12yrx1yfd38j6k5aigj4dfj3f3zy";
 in
 
 stdenv.mkDerivation rec {

From 77ebd344599063e35e81aae8ddb2e57211173dcd Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Fri, 21 Jul 2017 10:10:58 +0200
Subject: [PATCH 0808/3246] nodejs: 8.2.0 -> 8.2.1

---
 pkgs/development/web/nodejs/v8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 84f4e496070..593e9d1e562 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.2.0";
+    version = "8.2.1";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "10a72gl24kzdhf598wnlpvld1lz175h6l9fsr06bc3k3fr8rgs2c";
+      sha256 = "12wcmm2g1zlihja41my5r06sla0s6ygvycxds1ryl3jl2j4nvi02";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];

From 8a311374417f07c22bac27a9fbc4119e626eeafd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 21 Jul 2017 12:51:41 +0200
Subject: [PATCH 0809/3246] nixUnstable: 1.12pre5506_3162ad5f ->
 1.12pre5511_c94f3d55

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2c81b972f92..56324f4073d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -161,12 +161,12 @@ in rec {
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5506_3162ad5f";
+    suffix = "pre5511_c94f3d55";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "3162ad5ff497b92fc25cd3f397eaff01d67340cc";
-      sha256 = "0gs1fqqm2ghbq2svz1h4bna9f0zjw2cs8ha7cn27kwajb14qw8fk";
+      rev = "c94f3d5575d7af5403274d1e9e2f3c9d72989751";
+      sha256 = "1akfzzm4f07wj6l7za916xv5rnh71pk3vl8dphgradjfqb37bv18";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };

From 5181d7568f7410728013c6d0d06e28e58836950f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Jul 2017 07:23:12 -0400
Subject: [PATCH 0810/3246] linux: 4.4.77 -> 4.4.78

---
 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 76dc8f030cd..de98da0a48a 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.77";
+  version = "4.4.78";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1s5l5b3hpm691w94a3ddliy4gcxi2s9xm3hsazdwgzqrqdv70ysy";
+    sha256 = "14xnmcw0f2faizd6ylhgw929yyc30hglr82mc5c62yzgszsdngvw";
   };
 
   kernelPatches = args.kernelPatches;

From 232f497169c1fe306007a541aa56db21af9a069c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Jul 2017 07:25:50 -0400
Subject: [PATCH 0811/3246] linux: 4.9.38 -> 4.9.39

---
 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 260b776999d..59f349078ee 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.38";
+  version = "4.9.39";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0x4h2b6xapqyxgivj9ay5yclmyl434bjfmq9ikajy7fmgpc8kmvn";
+    sha256 = "0cgs3kprx73qffzy0vwd3wz0jdsxbb8b9p881mrcxa3gjfxzg33f";
   };
 
   kernelPatches = args.kernelPatches;

From 98ad0f4dab63d49a1eacc17fdd8f65ee5f826884 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Jul 2017 07:28:24 -0400
Subject: [PATCH 0812/3246] linux: 4.12.2 -> 4.12.3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index 4cb408d33cb..9b8c99e1bc4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.2";
+  version = "4.12.3";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1ql5y6bvb1bx9b2k5iksdzjgzxnq852rvq69kdnkwa98p8p8ayha";
+    sha256 = "05mz5rza2cn7pnn0cgd4pxal4xyjk74bl6h742v0xxlf4aqrvgcr";
   };
 
   kernelPatches = args.kernelPatches;

From ba9275da880915873251faadeaa97fcc6c8af739 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Jul 2017 07:33:14 -0400
Subject: [PATCH 0813/3246] linux: Remove 4.11

4.11.x has been EOL'd
---
 pkgs/os-specific/linux/kernel/linux-4.11.nix | 18 ------------------
 pkgs/top-level/all-packages.nix              | 17 -----------------
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.11.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
deleted file mode 100644
index 9bb4e85d3f9..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.11.11";
-  extraMeta.branch = "4.11";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1dvs1r3vq15akyv0yxvim6j09pqac5dagqbchvdlsw5yi4fnylc8";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b211df35ae..5d391c5d45a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12068,22 +12068,6 @@ with pkgs;
       ];
   };
 
-  linux_4_11 = callPackage ../os-specific/linux/kernel/linux-4.11.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        kernelPatches.p9_fixes
-        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
-        # when adding a new linux version
-        kernelPatches.cpu-cgroup-v2."4.11"
-        kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_4_12 = callPackage ../os-specific/linux/kernel/linux-4.12.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -12294,7 +12278,6 @@ with pkgs;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
-  linuxPackages_4_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_11);
   linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12);
   # Don't forget to update linuxPackages_latest!
 

From 3bccedb0819b6b54cc4fe5cfc22c810abd22aa05 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 21 Jul 2017 20:03:20 +0800
Subject: [PATCH 0814/3246] owl-lisp: init at 0.1.14

---
 .../compilers/owl-lisp/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/compilers/owl-lisp/default.nix

diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix
new file mode 100644
index 00000000000..b01914afc29
--- /dev/null
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, coreutils }:
+
+stdenv.mkDerivation rec {
+  name    = "owl-lisp-${version}";
+  version = "0.1.14";
+
+  src = fetchFromGitHub {
+    owner  = "aoh";
+    repo   = "owl-lisp";
+    rev    = "v${version}";
+    sha256 = "1rr0icprna3zs834q1pj4xy21cql3pcfknfkqipq01rhnl2893sz";
+  };
+
+  prePatch = ''
+    substituteInPlace Makefile --replace /usr $out
+
+    for f in tests/run tests/exec.sh ; do
+      substituteInPlace $f --replace /bin/echo ${coreutils}/bin/echo
+    done
+  '';
+
+  # tests are already run as part of the compilation process
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    descripton  = "A functional lisp";
+    homepage    = https://github.com/aoh/owl-lisp;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d391c5d45a..cca84222050 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -480,6 +480,8 @@ with pkgs;
 
   as31 = callPackage ../development/compilers/as31 {};
 
+  owl-lisp = callPackage ../development/compilers/owl-lisp {};
+
   ascii = callPackage ../tools/text/ascii { };
 
   asciinema = callPackage ../tools/misc/asciinema {};

From ce67c7c1aca192540ecccafe9c2d83cacec16817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 21 Jul 2017 14:10:05 +0100
Subject: [PATCH 0815/3246] pythonPackages.arrow: move to python-modules

---
 .../python-modules/arrow/default.nix          | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +---------------
 2 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/arrow/default.nix

diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix
new file mode 100644
index 00000000000..a85987a95b1
--- /dev/null
+++ b/pkgs/development/python-modules/arrow/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, nose, chai, simplejson
+, dateutil }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "arrow";
+  version = "0.10.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0";
+  };
+
+  checkPhase = ''
+    nosetests --cover-package=arrow
+  '';
+
+  buildInputs = [ nose chai simplejson ];
+  propagatedBuildInputs = [ dateutil ];
+
+  meta = with stdenv.lib; {
+    description = "Python library for date manipulation";
+    license     = "apache";
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf48a16aa9c..fd002ed74ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -763,28 +763,7 @@ in {
   };
 
 
-  arrow = buildPythonPackage rec {
-    name = "arrow-${version}";
-    version = "0.10.0";
-
-    src = pkgs.fetchurl {
-      url    = "mirror://pypi/a/arrow/${name}.tar.gz";
-      sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0";
-    };
-
-    checkPhase = ''
-      nosetests --cover-package=arrow
-    '';
-
-    buildInputs = with self; [ nose chai simplejson ];
-    propagatedBuildInputs = with self; [ dateutil ];
-
-    meta = {
-      description = "Python library for date manipulation";
-      license     = "apache";
-      maintainers = with maintainers; [ thoughtpolice ];
-    };
-  };
+  arrow = callPackage ../development/python-modules/arrow { };
 
   async = buildPythonPackage rec {
     name = "async-0.6.1";

From 3e68facc72db94224cf8955bfe6745537deaf1eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 21 Jul 2017 15:00:50 +0200
Subject: [PATCH 0816/3246] Revert "diffoscope: wrap executable and include
 tools in PATH"

This reverts commit 23ad77b9980fdd7f943da38cd745c4ccfdda15a7.

Double wrapper scripts considered harmful.
---
 pkgs/tools/misc/diffoscope/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 37af52f55b6..4f0a9ba12c1 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -5,13 +5,7 @@
 , enableBloat ? false
 }:
 
-    # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
-    # Also these libraries: python3-guestfs
-    # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
-let tools = [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
-              gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
-            ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ];
-in python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
   name = "${pname}-${version}";
   version = "77";
@@ -32,6 +26,14 @@ in python3.pkgs.buildPythonApplication rec {
     sed -i setup.py -e "/'rpm-python',/d"
   '';
 
+  # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
+  # Also these libraries: python3-guestfs
+  # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
+  buildInputs =
+    map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
+      gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
+    ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
+
   pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
@@ -39,7 +41,6 @@ in python3.pkgs.buildPythonApplication rec {
   postInstall = ''
     mkdir -p $out/share/man/man1
     ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
-    wrapProgram $out/bin/diffoscope --prefix PATH : ${lib.makeBinPath tools}
   '';
 
   meta = with stdenv.lib; {

From 91dc81156647c5d28e77dfd20d5c2f4b7253c742 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 21 Jul 2017 15:08:30 +0200
Subject: [PATCH 0817/3246] diffoscope: Move all required tools into pythonPath

Alternative fix for #27534 that prevents the use of a double wrapper
(creating even uglier script names than usual, like
..diffoscope-wrapped-wrapped).

This was my bad in 96d7f35e96f5b8baa249ce1d7b237a3f34ee87ab.
---
 pkgs/tools/misc/diffoscope/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 4f0a9ba12c1..9c0d51c4a85 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -29,12 +29,10 @@ python3.pkgs.buildPythonApplication rec {
   # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
-  buildInputs =
-    map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
+  pythonPath = with python3.pkgs;
+    [ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext
       gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
-    ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
-
-  pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ];
+    ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
 

From de0fb400bf8ed17ce8248da1615e2c2492fb35a1 Mon Sep 17 00:00:00 2001
From: Glenn Searby <glenn.searby@gmail.com>
Date: Fri, 21 Jul 2017 14:22:15 +0100
Subject: [PATCH 0818/3246] linode-api: init at 4.1.1b1

Added Linode's official Python library for their v4 API.

This should assist with adding Linode support to Nixops (see:
https://github.com/NixOS/nixops/issues/198).

Note that this API is still in beta and subject to changes.
---
 lib/maintainers.nix                           |  1 +
 .../python-modules/linode-api/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/linode-api/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e10136bf070..e9a4f23c8c1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -213,6 +213,7 @@
   gilligan = "Tobias Pflug <tobias.pflug@gmail.com>";
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
   gleber = "Gleb Peregud <gleber.p@gmail.com>";
+  glenns = "Glenn Searby <glenn.searby@gmail.com>";
   globin = "Robin Gloster <mail@glob.in>";
   gnidorah = "Alex Ivanov <yourbestfriend@opmbx.org>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
new file mode 100644
index 00000000000..b6e3de7357c
--- /dev/null
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -0,0 +1,34 @@
+{ stdenv,
+  buildPythonPackage,
+  fetchPypi,
+  isPy3k,
+  pythonOlder,
+  lib,
+  requests,
+  future,
+  enum34 }:
+
+buildPythonPackage rec {
+  pname = "linode-api";
+  version = "4.1.1b1";
+  name = "${pname}-${version}";
+
+  disabled = (pythonOlder "2.7");
+
+  buildInputs = [];
+  propagatedBuildInputs = [ requests ]
+                             ++ stdenv.lib.optionals (!isPy3k) [ future ]
+                             ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1psf4sknxrjqiz833x4nmh2pw7xi2rvcm7l9lv8jfdwxza63sny5";
+  };
+
+  meta = {
+    homepage = "https://github.com/linode/python-linode-api";
+    description = "The official python library for the Linode API v4 in python.";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ glenns ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 104dd5354e7..fb7befd63e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12589,6 +12589,8 @@ in {
     };
   };
 
+  linode-api = callPackage ../development/python-modules/linode-api { };
+
   livereload = buildPythonPackage rec {
     name = "livereload-${version}";
     version = "2.5.0";

From 4b42fc4b8a969dc4621c76d556309021591a17a2 Mon Sep 17 00:00:00 2001
From: Joel Thompson <joel@jthompson.io>
Date: Tue, 11 Jul 2017 10:56:58 -0400
Subject: [PATCH 0819/3246] exhibitor: init at 3.4.9

Initial Exhibitor nix package and nixos module for Netflix's Exhibitor,
which is a manager for Apache Zookeeper.
---
 nixos/modules/module-list.nix             |   1 +
 nixos/modules/services/misc/exhibitor.nix | 361 ++++++++++++++++++++++
 pkgs/servers/exhibitor/default.nix        |  54 ++++
 pkgs/servers/zookeeper/default.nix        |   7 +-
 pkgs/top-level/all-packages.nix           |   2 +
 5 files changed, 423 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/misc/exhibitor.nix
 create mode 100644 pkgs/servers/exhibitor/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8f78652fbfd..b97c3b0d816 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -287,6 +287,7 @@
   ./services/misc/emby.nix
   ./services/misc/errbot.nix
   ./services/misc/etcd.nix
+  ./services/misc/exhibitor.nix
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
   ./services/misc/fstrim.nix
diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix
new file mode 100644
index 00000000000..33580962bf7
--- /dev/null
+++ b/nixos/modules/services/misc/exhibitor.nix
@@ -0,0 +1,361 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.exhibitor;
+  exhibitor = cfg.package;
+  exhibitorConfig = ''
+    zookeeper-install-directory=${cfg.baseDir}/zookeeper
+    zookeeper-data-directory=${cfg.zkDataDir}
+    zookeeper-log-directory=${cfg.zkLogDir}
+    zoo-cfg-extra=${cfg.zkExtraCfg}
+    client-port=${toString cfg.zkClientPort}
+    connect-port=${toString cfg.zkConnectPort}
+    election-port=${toString cfg.zkElectionPort}
+    cleanup-period-ms=${toString cfg.zkCleanupPeriod}
+    servers-spec=${concatStringsSep "," cfg.zkServersSpec}
+    auto-manage-instances=${toString cfg.autoManageInstances}
+    ${cfg.extraConf}
+  '';
+  configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig;
+  cliOptionsCommon = {
+    configtype = cfg.configType;
+    defaultconfig = "${configDir}/exhibitor.properties";
+    port = toString cfg.port;
+    hostname = cfg.hostname;
+  };
+  s3CommonOptions = { s3region = cfg.s3Region; s3credentials = cfg.s3Credentials; };
+  cliOptionsPerConfig = {
+    s3 = {
+      s3config = "${cfg.s3Config.bucketName}:${cfg.s3Config.objectKey}";
+      s3configprefix = cfg.s3Config.configPrefix;
+    };
+    zookeeper = {
+      zkconfigconnect = concatStringsSep "," cfg.zkConfigConnect;
+      zkconfigexhibitorpath = cfg.zkConfigExhibitorPath;
+      zkconfigpollms = toString cfg.zkConfigPollMs;
+      zkconfigretry = "${toString cfg.zkConfigRetry.sleepMs}:${toString cfg.zkConfigRetry.retryQuantity}";
+      zkconfigzpath = cfg.zkConfigZPath;
+      zkconfigexhibitorport = toString cfg.zkConfigExhibitorPort; # NB: This might be null
+    };
+    file = {
+      fsconfigdir = cfg.fsConfigDir;
+      fsconfiglockprefix = cfg.fsConfigLockPrefix;
+      fsConfigName = fsConfigName;
+    };
+    none = {
+      noneconfigdir = configDir;
+    };
+  };
+  cliOptions = concatStringsSep " " (mapAttrsToList (k: v: "--${k} ${v}") (filterAttrs (k: v: v != null && v != "") (cliOptionsCommon //
+               cliOptionsPerConfig."${cfg.configType}" //
+               s3CommonOptions //
+               optionalAttrs cfg.s3Backup { s3backup = "true"; } //
+               optionalAttrs cfg.fileSystemBackup { filesystembackup = "true"; }
+               )));
+in
+{
+  options = {
+    services.exhibitor = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "
+          Whether to enable the exhibitor server.
+        ";
+      };
+      # See https://github.com/soabase/exhibitor/wiki/Running-Exhibitor for what these mean
+      # General options for any type of config
+      port = mkOption {
+        type = types.int;
+        default = 8080;
+        description = ''
+          The port for exhibitor to listen on and communicate with other exhibitors.
+        '';
+      };
+      baseDir = mkOption {
+        type = types.str;
+        default = "/var/exhibitor";
+        description = ''
+          Baseline directory for exhibitor runtime config.
+        '';
+      };
+      configType = mkOption {
+        type = types.enum [ "file" "s3" "zookeeper" "none" ];
+        description = ''
+          Which configuration type you want to use. Additional config will be
+          required depending on which type you are using.
+        '';
+      };
+      hostname = mkOption {
+        type = types.nullOr types.str;
+        description = ''
+          Hostname to use and advertise
+        '';
+        default = null;
+      };
+      autoManageInstances = mkOption {
+        type = types.bool;
+        description = ''
+          Automatically manage ZooKeeper instances in the ensemble
+        '';
+        default = false;
+      };
+      zkDataDir = mkOption {
+        type = types.str;
+        default = "${cfg.baseDir}/zkData";
+        description = ''
+          The Zookeeper data directory
+        '';
+      };
+      zkLogDir = mkOption {
+        type = types.path;
+        default = "${cfg.baseDir}/zkLogs";
+        description = ''
+          The Zookeeper logs directory
+        '';
+      };
+      extraConf = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Extra Exhibitor configuration to put in the ZooKeeper config file.
+        '';
+      };
+      zkExtraCfg = mkOption {
+        type = types.str;
+        default = ''initLimit=5&syncLimit=2&tickTime=2000'';
+        description = ''
+          Extra options to pass into Zookeeper
+        '';
+      };
+      zkClientPort = mkOption {
+        type = types.int;
+        default = 2181;
+        description = ''
+          Zookeeper client port
+        '';
+      };
+      zkConnectPort = mkOption {
+        type = types.int;
+        default = 2888;
+        description = ''
+          The port to use for followers to talk to each other.
+        '';
+      };
+      zkElectionPort = mkOption {
+        type = types.int;
+        default = 3888;
+        description = ''
+          The port for Zookeepers to use for leader election.
+        '';
+      };
+      zkCleanupPeriod = mkOption {
+        type = types.int;
+        default = 0;
+        description = ''
+          How often (in milliseconds) to run the Zookeeper log cleanup task.
+        '';
+      };
+      zkServersSpec = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Zookeeper server spec for all servers in the ensemble.
+        '';
+        example = [ "S:1:zk1.example.com" "S:2:zk2.example.com" "S:3:zk3.example.com" "O:4:zk-observer.example.com" ];
+      };
+
+      # Backup options
+      s3Backup = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable backups to S3
+        '';
+      };
+      fileSystemBackup = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enables file system backup of ZooKeeper log files
+        '';
+      };
+
+      # Options for using zookeeper configType
+      zkConfigConnect = mkOption {
+        type = types.listOf types.str;
+        description = ''
+          The initial connection string for ZooKeeper shared config storage
+        '';
+        example = ["host1:2181" "host2:2181"];
+      };
+      zkConfigExhibitorPath = mkOption {
+        type = types.string;
+        description = ''
+          If the ZooKeeper shared config is also running Exhibitor, the URI path for the REST call
+        '';
+        default = "/";
+      };
+      zkConfigExhibitorPort = mkOption {
+        type = types.nullOr types.int;
+        description = ''
+          If the ZooKeeper shared config is also running Exhibitor, the port that
+          Exhibitor is listening on. IMPORTANT: if this value is not set it implies
+          that Exhibitor is not being used on the ZooKeeper shared config.
+        '';
+      };
+      zkConfigPollMs = mkOption {
+        type = types.int;
+        description = ''
+          The period in ms to check for changes in the config ensemble
+        '';
+        default = 10000;
+      };
+      zkConfigRetry = mkOption {
+        type = types.submodule {
+          options = {
+            sleepMs = mkOption {
+              type = types.int;
+            };
+            retryQuantity = mkOption {
+              type = types.int;
+            };
+          };
+        };
+        description = ''
+          The retry values to use
+        '';
+        default = { sleepMs = 1000; retryQuantity = 3; };
+      };
+      zkConfigZPath = mkOption {
+        type = types.str;
+        description = ''
+          The base ZPath that Exhibitor should use
+        '';
+        example = "/exhibitor/config";
+      };
+
+      # Config options for s3 configType
+      s3Config = mkOption {
+        type = types.submodule {
+          options = {
+            bucketName = mkOption {
+              type = types.str;
+              description = ''
+                Bucket name to store config
+              '';
+            };
+            objectKey = mkOption {
+              type = types.str;
+              description = ''
+                S3 key name to store the config
+              '';
+            };
+            configPrefix = mkOption {
+              type = types.str;
+              description = ''
+                When using AWS S3 shared config files, the prefix to use for values such as locks
+              '';
+              default = "exhibitor-";
+            };
+          };
+        };
+      };
+
+      # The next two are used for either s3backup or s3 configType
+      s3Credentials = mkOption {
+        type = types.nullOr types.path;
+        description = ''
+          Optional credentials to use for s3backup or s3config. Argument is the path
+          to an AWS credential properties file with two properties:
+          com.netflix.exhibitor.s3.access-key-id and com.netflix.exhibitor.s3.access-secret-key
+        '';
+        default = null;
+      };
+      s3Region = mkOption {
+        type = types.nullOr types.str;
+        description = ''
+          Optional region for S3 calls
+        '';
+        default = null;
+      };
+
+      # Config options for file config type
+      fsConfigDir = mkOption {
+        type = types.path;
+        description = ''
+          Directory to store Exhibitor properties (cannot be used with s3config).
+          Exhibitor uses file system locks so you can specify a shared location
+          so as to enable complete ensemble management.
+        '';
+      };
+      fsConfigLockPrefix = mkOption {
+        type = types.str;
+        description = ''
+          A prefix for a locking mechanism used in conjunction with fsconfigdir
+        '';
+        default = "exhibitor-lock-";
+      };
+      fsConfigName = mkOption {
+        type = types.str;
+        description = ''
+          The name of the file to store config in
+        '';
+        default = "exhibitor.properties";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.exhibitor = {
+      description = "Exhibitor Daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      environment = {
+        ZOO_LOG_DIR = cfg.baseDir;
+      };
+      serviceConfig = {
+        /***
+          Exhibitor is a bit un-nixy. It wants to present to you a user interface in order to
+          mutate the configuration of both itself and ZooKeeper, and to coordinate changes
+          among the members of the Zookeeper ensemble. I'm going for a different approach here,
+          which is to manage all the configuration via nix and have it write out the configuration
+          files that exhibitor will use, and to reduce the amount of inter-exhibitor orchestration.
+        ***/
+        ExecStart = ''
+          ${pkgs.exhibitor}/bin/startExhibitor.sh ${cliOptions}
+        '';
+        User = "zookeeper";
+        PermissionsStartOnly = true;
+      };
+      # This is a bit wonky, but the reason for this is that Exhibitor tries to write to
+      # ${cfg.baseDir}/zookeeper/bin/../conf/zoo.cfg
+      # I want everything but the conf directory to be in the immutable nix store, and I want defaults
+      # from the nix store
+      # If I symlink the bin directory in, then bin/../ will resolve to the parent of the symlink in the
+      # immutable nix store. Bind mounting a writable conf over the existing conf might work, but it gets very
+      # messy with trying to copy the existing out into a mutable store.
+      # Another option is to try to patch upstream exhibitor, but the current package just pulls down the
+      # prebuild JARs off of Maven, rather than building them ourselves, as Maven support in Nix isn't
+      # very mature. So, it seems like a reasonable compromise is to just copy out of the immutable store
+      # just before starting the service, so we're running binaries from the immutable store, but we work around
+      # Exhibitor's desire to mutate its current installation.
+      preStart = ''
+        mkdir -m 0700 -p ${cfg.baseDir}/zookeeper
+        # Not doing a chown -R to keep the base ZK files owned by root
+        chown zookeeper ${cfg.baseDir} ${cfg.baseDir}/zookeeper
+        cp -Rf ${pkgs.zookeeper}/* ${cfg.baseDir}/zookeeper
+        chown -R zookeeper ${cfg.baseDir}/zookeeper/conf
+        chmod -R u+w ${cfg.baseDir}/zookeeper/conf
+      '';
+    };
+    users.extraUsers = singleton {
+      name = "zookeeper";
+      uid = config.ids.uids.zookeeper;
+      description = "Zookeeper daemon user";
+      home = cfg.baseDir;
+    };
+  };
+}
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
new file mode 100644
index 00000000000..445f52e360b
--- /dev/null
+++ b/pkgs/servers/exhibitor/default.nix
@@ -0,0 +1,54 @@
+{ fetchFromGitHub, buildMaven, maven, jdk, makeWrapper, stdenv, ... }:
+stdenv.mkDerivation rec {
+  name = "exhibitor-${version}";
+  version = "1.5.6";
+
+  src = fetchFromGitHub {
+    owner = "soabase";
+    repo = "exhibitor";
+    sha256 = "07vikhkldxy51jbpy3jgva6wz75jksch6bjd6dqkagfgqd6baw45";
+    rev = "5fcdb411d06e8638c2380f7acb72a8a6909739cd";
+  };
+  mavenDependenciesSha256 = "00r69n9hwvrn5cbhxklx7w00sjmqvcxs7gvhbm150ggy7bc865qv";
+  # This is adapted from https://github.com/volth/nixpkgs/blob/6aa470dfd57cae46758b62010a93c5ff115215d7/pkgs/applications/networking/cluster/hadoop/default.nix#L20-L32
+  fetchedMavenDeps = stdenv.mkDerivation {
+    name = "exhibitor-${version}-maven-deps";
+    inherit src nativeBuildInputs;
+    buildPhase = ''
+      cd $pomFileDir;
+      while timeout --kill-after=21m 20m mvn package -Dmaven.repo.local=$out/.m2; [ $? = 124 ]; do
+        echo "maven hangs while downloading :("
+      done
+    '';
+    installPhase = ''find $out/.m2 -type f \! -regex '.+\(pom\|jar\|xml\|sha1\)' -delete''; # delete files with lastModified timestamps inside
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = mavenDependenciesSha256;
+  };
+
+  # The purpose of this is to fetch the jar file out of public Maven and use Maven
+  # to build a monolithic, standalone jar, rather than build everything from source
+  # (given the state of Maven support in Nix). We're not actually building any java
+  # source here.
+  pomFileDir = "exhibitor-standalone/src/main/resources/buildscripts/standalone/maven";
+  nativeBuildInputs = [ maven ];
+  buildInputs = [ makeWrapper ];
+  buildPhase = ''
+      cd $pomFileDir
+      mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
+  '';
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/soabase/exhibitor";
+    description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/java
+    mv target/$name.jar $out/share/java/
+    makeWrapper ${jdk}/bin/java $out/bin/startExhibitor.sh --add-flags "-jar $out/share/java/$name.jar" --suffix PATH : ${stdenv.lib.makeBinPath [ jdk ]}
+  '';
+
+}
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 16807a6571c..b3a9ad44484 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper, bash }:
+{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "zookeeper-${version}";
@@ -17,12 +17,15 @@ stdenv.mkDerivation rec {
     mkdir -p $out
     cp -R conf docs lib ${name}.jar $out
     mkdir -p $out/bin
-    cp -R bin/{zkCli,zkCleanup,zkEnv}.sh $out/bin
+    cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin
     for i in $out/bin/{zkCli,zkCleanup}.sh; do
       wrapProgram $i \
         --set JAVA_HOME "${jre}" \
         --prefix PATH : "${bash}/bin"
     done
+    substituteInPlace $out/bin/zkServer.sh \
+        --replace /bin/echo ${coreutils}/bin/echo \
+        --replace "/usr/bin/env bash" ${bash}/bin/bash
     chmod -x $out/bin/zkEnv.sh
 
     mkdir -p $out/share/zooinspector
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cca84222050..dfbcf5d1f59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11048,6 +11048,8 @@ with pkgs;
 
   ejabberd = callPackage ../servers/xmpp/ejabberd { };
 
+  exhibitor = callPackage ../servers/exhibitor { };
+
   prosody = callPackage ../servers/xmpp/prosody {
     lua5 = lua5_1;
     inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib;

From 8e37e3b7f19ecb8f74a033843d0fbf6203c45a92 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 21 Jul 2017 08:50:13 -0400
Subject: [PATCH 0820/3246] openjdk: 8u131-b11 -> 8u141-b15

---
 pkgs/development/compilers/openjdk/8.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index da1332127eb..7c50872ebe5 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -21,42 +21,42 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "131";
-  build = "11";
+  update = "141";
+  build = "15";
   baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "1k401wsickbdy50yxjd26v8qm9519kxayaj3b103cr6ygp2rd9s6";
+             sha256 = "0b2nf1x2wcjn0ijyxhnrhcap4vq43sbblh5kf0qcqmx83cs3z6yh";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "1qj75bb17a9czvxz7rm246w97cavglrssx0l1mkbickx0i0wamm8";
+             sha256 = "1mirjjywv7mnirrxj5sx3zg6j2864vjvphkn9mxx1pad49by7157";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "0kh8rk5y3n4g3hyjzflc8nwc0kyakjivpwlpj1bncsm1sykw8lr8";
+             sha256 = "0hhvsrclx58i7ns2v7la2wncnndblppwjncniwcvhnhgl5zhpp31";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "0gqa58mwwyf6mbgp48j1akv1y8yq55zpwfziqrbdbpkcsaf603n7";
+             sha256 = "1brr72rlpaz70ihymdyp808vw433cr8b11l5qdc76aic2ywbwjyp";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "0ymvvi7srr9qkss20s1yg3x2mjw178bscrnxa6s8y82gsw02y820";
+             sha256 = "1d4q531jswzk00kdskzfkgr0f4qmxpc7pg9w8p1gq84yz93wz11k";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "0507mxvir4s536pdz45pvmahwa6s3h2yhg6rwdzrb568ab06asmi";
+             sha256 = "0haw5095p45w33m8pafnp5r5j2lif8c1271chad5sp4gbbk40ai4";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "0igbg8axk028kqs9q11m8hb5bg2fa0qcwffbpfbhilyw5gmf7cy8";
+             sha256 = "0pm2cccy31d9rnkgc2hcxbpjjhf4wbayx18qn736nncvwcwa76bj";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "0l63zm5a7ql3xvfxy5kzazq2184mpx0zyqzinjmq7v0q573g8xak";
+             sha256 = "1g05vfggjjg51dki28zby27pnd4z1b23fv9kyc3hdmc4bcj306x0";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";

From fbd3f8698af976b78bf7e5eae272ae9498c340ce Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 21 Jul 2017 16:25:34 +0200
Subject: [PATCH 0821/3246] lvm2: 2.02.140 -> 2.02.173

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

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index eb4d1ab0423..b7fa8e140e2 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -2,7 +2,7 @@
 , thin-provisioning-tools, enable_dmeventd ? false }:
 
 let
-  version = "2.02.140";
+  version = "2.02.173";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
-    sha256 = "1jd46diyv7074fw8kxwq7imn4pl76g01d8y7z4scq0lkxf8jmpai";
+    sha256 = "0r4dx87z7ggxmxligdzz43chgfrwn9lyj7vaz63z97h0gs61dfff";
   };
 
   configureFlags = [
@@ -27,10 +27,7 @@ stdenv.mkDerivation {
 
   preConfigure =
     ''
-      substituteInPlace scripts/lvmdump.sh \
-        --replace /usr/bin/tr ${coreutils}/bin/tr
       substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
-        --replace /usr/sbin/lvm $out/sbin/lvm \
         --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm
 
       sed -i /DEFAULT_SYS_DIR/d Makefile.in

From 1697684591492102ba8705f62fb2509b44ad1935 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 21 Jul 2017 16:53:50 +0200
Subject: [PATCH 0822/3246] docker module: fix autoPrune.enable description

cc #27503
---
 nixos/modules/virtualisation/docker.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 25274c440e6..5a8a0e27436 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -100,8 +100,9 @@ in
         type = types.bool;
         default = false;
         description = ''
-          Whether to periodically prune Docker resources. If enabled, a systemd timer will run
-          <literal>docker system prune -f</literal> once a day.
+          Whether to periodically prune Docker resources. If enabled, a
+          systemd timer will run <literal>docker system prune -f</literal>
+          as specified by the <literal>dates</literal> option.
         '';
       };
 

From 60091342d44b6e732a79a4caf7e9b0fee5b51903 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 21 Jul 2017 17:02:31 +0200
Subject: [PATCH 0823/3246] nano: 2.8.5 -> 2.8.6

See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00007.html
for release announcement
---
 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 f3527d85fd7..d924532eb34 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.8.5";
+  version = "2.8.6";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1hl9gni3qmblr062a7w6vz16gvxbswgc5c19c923ja0bk48vyhyb";
+    sha256 = "0xjpm2ka56x5ycrgjh06v110na13xlbm42bs8qibk7g578m9cils";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From 596e279979d3da1c510aa356a97231b1399ec2b8 Mon Sep 17 00:00:00 2001
From: k0ral <koral@mailoo.org>
Date: Fri, 21 Jul 2017 18:18:54 +0200
Subject: [PATCH 0824/3246] network-manager-l2tp: fix configure step (#27541)

* network-manager-l2tp: don't run ./configure twice

* network-manager-l2tp: remove automake/autoconf
---
 pkgs/tools/networking/network-manager/l2tp.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix
index 6a4f31e5e19..5d6be939887 100644
--- a/pkgs/tools/networking/network-manager/l2tp.nix
+++ b/pkgs/tools/networking/network-manager/l2tp.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool, intltool, pkgconfig
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
 , networkmanager, ppp, xl2tpd, strongswan, libsecret
 , withGnome ? true, gnome3, networkmanagerapplet }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ networkmanager ppp libsecret ]
     ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring networkmanagerapplet ];
 
-  nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ];
 
   postPatch = ''
     sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c
@@ -27,7 +27,9 @@ stdenv.mkDerivation rec {
       --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd
   '';
 
-  preConfigure = "./autogen.sh";
+  preConfigure = ''
+    intltoolize -f
+  '';
 
   configureFlags =
     if withGnome then "--with-gnome" else "--without-gnome";

From 7759b8c1ca4c2e136b4efb95b5c3c9f188e4c8dd Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 21 Jul 2017 11:51:28 -0700
Subject: [PATCH 0825/3246] fzf: 0.16.9 -> 0.16.10

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 21f8fa3c2ea..916ba99317e 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.16.9";
+  version = "0.16.10";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "17jq1g0x7vczng9h0ywdawqr5d2cnm4rzv3y75vfbddsfd28rlgs";
+    sha256 = "0c9c9x2pim5g2jwy6jkdws2s7b1mw2qlnba1q46a1izswm7ljfq7";
   };
 
   outputs = [ "bin" "out" "man" ];

From 9dc51dc00de33d27fed90faab6c1710655086d69 Mon Sep 17 00:00:00 2001
From: Joel Thompson <joel@jthompson.io>
Date: Fri, 21 Jul 2017 16:10:44 -0400
Subject: [PATCH 0826/3246] exhibitor: Fix bugs in previous package

The previous package didn't build properly due to a bug in the build
script, and the nixos module didn't evaluate due to missing descriptions
in the options. This fixes both issues.

It also adds missing command-line options that weren't able to be set
and properly converts bools to the strings exhibitor expects.
---
 nixos/modules/services/misc/exhibitor.nix | 130 +++++++++++++++-------
 pkgs/servers/exhibitor/default.nix        |   4 +-
 2 files changed, 94 insertions(+), 40 deletions(-)

diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix
index 33580962bf7..1db42275867 100644
--- a/nixos/modules/services/misc/exhibitor.nix
+++ b/nixos/modules/services/misc/exhibitor.nix
@@ -15,7 +15,7 @@ let
     election-port=${toString cfg.zkElectionPort}
     cleanup-period-ms=${toString cfg.zkCleanupPeriod}
     servers-spec=${concatStringsSep "," cfg.zkServersSpec}
-    auto-manage-instances=${toString cfg.autoManageInstances}
+    auto-manage-instances=${lib.boolToString cfg.autoManageInstances}
     ${cfg.extraConf}
   '';
   configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig;
@@ -24,6 +24,13 @@ let
     defaultconfig = "${configDir}/exhibitor.properties";
     port = toString cfg.port;
     hostname = cfg.hostname;
+    headingtext = if (cfg.headingText != null) then (lib.escapeShellArg cfg.headingText) else null;
+    nodemodification = lib.boolToString cfg.nodeModification;
+    configcheckms = toString cfg.configCheckMs;
+    jquerystyle = cfg.jqueryStyle;
+    loglines = toString cfg.logLines;
+    servo = lib.boolToString cfg.servo;
+    timeout = toString cfg.timeout;
   };
   s3CommonOptions = { s3region = cfg.s3Region; s3credentials = cfg.s3Credentials; };
   cliOptionsPerConfig = {
@@ -95,6 +102,57 @@ in
         '';
         default = null;
       };
+      nodeModification = mkOption {
+        type = types.bool;
+        description = ''
+          Whether the Explorer UI will allow nodes to be modified (use with caution).
+        '';
+        default = true;
+      };
+      configCheckMs = mkOption {
+        type = types.int;
+        description = ''
+          Period (ms) to check for shared config updates.
+        '';
+        default = 30000;
+      };
+      headingText = mkOption {
+        type = types.nullOr types.str;
+        description = ''
+          Extra text to display in UI header
+        '';
+        default = null;
+      };
+      jqueryStyle = mkOption {
+        type = types.enum [ "red" "black" "custom" ];
+        description = ''
+          Styling used for the JQuery-based UI.
+        '';
+        default = "red";
+      };
+      logLines = mkOption {
+        type = types.int;
+        description = ''
+        Max lines of logging to keep in memory for display.
+        '';
+        default = 1000;
+      };
+      servo = mkOption {
+        type = types.bool;
+        description = ''
+          ZooKeeper will be queried once a minute for its state via the 'mntr' four
+          letter word (this requires ZooKeeper 3.4.x+). Servo will be used to publish
+          this data via JMX.
+        '';
+        default = false;
+      };
+      timeout = mkOption {
+        type = types.int;
+        description = ''
+          Connection timeout (ms) for ZK connections.
+        '';
+        default = 30000;
+      };
       autoManageInstances = mkOption {
         type = types.bool;
         description = ''
@@ -213,21 +271,21 @@ in
         '';
         default = 10000;
       };
-      zkConfigRetry = mkOption {
-        type = types.submodule {
-          options = {
-            sleepMs = mkOption {
-              type = types.int;
-            };
-            retryQuantity = mkOption {
-              type = types.int;
-            };
-          };
+      zkConfigRetry = {
+        sleepMs = mkOption {
+          type = types.int;
+          default = 1000;
+          description = ''
+            Retry sleep time connecting to the ZooKeeper config
+          '';
+        };
+        retryQuantity = mkOption {
+          type = types.int;
+          default = 3;
+          description = ''
+            Retries connecting to the ZooKeeper config
+          '';
         };
-        description = ''
-          The retry values to use
-        '';
-        default = { sleepMs = 1000; retryQuantity = 3; };
       };
       zkConfigZPath = mkOption {
         type = types.str;
@@ -238,29 +296,25 @@ in
       };
 
       # Config options for s3 configType
-      s3Config = mkOption {
-        type = types.submodule {
-          options = {
-            bucketName = mkOption {
-              type = types.str;
-              description = ''
-                Bucket name to store config
-              '';
-            };
-            objectKey = mkOption {
-              type = types.str;
-              description = ''
-                S3 key name to store the config
-              '';
-            };
-            configPrefix = mkOption {
-              type = types.str;
-              description = ''
-                When using AWS S3 shared config files, the prefix to use for values such as locks
-              '';
-              default = "exhibitor-";
-            };
-          };
+      s3Config = {
+        bucketName = mkOption {
+          type = types.str;
+          description = ''
+            Bucket name to store config
+          '';
+        };
+        objectKey = mkOption {
+          type = types.str;
+          description = ''
+            S3 key name to store the config
+          '';
+        };
+        configPrefix = mkOption {
+          type = types.str;
+          description = ''
+            When using AWS S3 shared config files, the prefix to use for values such as locks
+          '';
+          default = "exhibitor-";
         };
       };
 
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
index 445f52e360b..369ef5a7369 100644
--- a/pkgs/servers/exhibitor/default.nix
+++ b/pkgs/servers/exhibitor/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     name = "exhibitor-${version}-maven-deps";
     inherit src nativeBuildInputs;
     buildPhase = ''
-      cd $pomFileDir;
+      cd ${pomFileDir};
       while timeout --kill-after=21m 20m mvn package -Dmaven.repo.local=$out/.m2; [ $? = 124 ]; do
         echo "maven hangs while downloading :("
       done
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ maven ];
   buildInputs = [ makeWrapper ];
   buildPhase = ''
-      cd $pomFileDir
+      cd ${pomFileDir}
       mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
   '';
   meta = with stdenv.lib; {

From 7d010ab5f4ae6f69339139165719bf071295536b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 19 Jul 2017 07:59:40 -0500
Subject: [PATCH 0827/3246] mdadm: unset STRIP

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98, sets the STRIP environment
variable by default, but this confuses the mdadm Makefile, which uses STRIP as a
flag to `install'.
---
 pkgs/os-specific/linux/mdadm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 589099c911c..0929bae991d 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
     "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
+    "STRIP="
   ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
     "CROSS_COMPILE=${stdenv.cc.prefix}"
   ];

From c1c314c36f849be027226a0c811370e9f076408a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 19 Jul 2017 08:44:55 -0500
Subject: [PATCH 0828/3246] openssh: unset LD

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98, sets the LD environment
variable by default, but this confuses the openssh Makefile because `configure'
does not respect it.
---
 pkgs/tools/networking/openssh/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index aaef2723da0..c0440e78a38 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -60,6 +60,12 @@ stdenv.mkDerivation rec {
     ++ optional withKerberos kerberos
     ++ optional hpnSupport autoreconfHook;
 
+  preConfigure = ''
+    # Setting LD causes `configure' and `make' to disagree about which linker
+    # to use: `configure' wants `gcc', but `make' wants `ld'.
+    unset LD
+  '';
+
   # I set --disable-strip because later we strip anyway. And it fails to strip
   # properly when cross building.
   configureFlags = [

From baad4134161ea4f61d1f88ec6eb55a8d0b03a974 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 19 Jul 2017 08:55:28 -0500
Subject: [PATCH 0829/3246] ppp: fix invalid use of substituteInPlace

substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
---
 pkgs/tools/networking/ppp/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 90a4b988c3f..d07770260ff 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -34,7 +34,9 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    substituteInPlace $out/bin/{pon,poff,plog} --replace "/usr/sbin" "$out/bin"
+    for tgt in pon poff plog; do
+      substituteInPlace "$out/bin/$tgt" --replace "/usr/sbin" "$out/bin"
+    done
   '';
 
   meta = {

From c25199f6973dff040a3d248a759636f8b981b02d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 20 Jul 2017 09:34:56 -0500
Subject: [PATCH 0830/3246] fetchurl: remove unpaired call to `stopNest'

Fixes #27406.

Commit 5d4efb2c816d2143f29cad8153faad1686557b2a added an assertion to `stopNest'
which requires it be correctly paired with `startNest'. `fetchurl' calls
`stopNest', but never calls `startNest'; the former calls are removed.
---
 pkgs/build-support/fetchurl/builder.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index c4fd18e46ca..7c2bdf260b4 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -39,7 +39,6 @@ tryDownload() {
           curlexit=$?;
        fi
     done
-    stopNest
 }
 
 
@@ -51,7 +50,6 @@ finish() {
     fi
 
     runHook postFetch
-    stopNest
     exit 0
 }
 

From 4a0a066f67b204315f8b3fa59e87f2634f26b7e9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 20 Jul 2017 10:42:58 -0500
Subject: [PATCH 0831/3246] newt: unset CPP

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 sets the CPP environment
variable by default, confusing the newt Makefile, which expects CPP=gcc for
computing dependencies.
---
 pkgs/development/libraries/newt/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index 9002d06693e..e00decca2ff 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lncurses";
 
+  preConfigure = ''
+    # If CPP is set explicitly, configure and make will not agree about which
+    # programs to use at different stages.
+    unset CPP
+  '';
+
   crossAttrs = {
     makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}";
   };

From aa11af8bbe5dc8dd9c580a5f392c6a6472cec371 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 20 Jul 2017 11:29:22 -0500
Subject: [PATCH 0832/3246] systemd: fix broken source hash

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7ea17855b09..89a08f14f9e 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "nixos";
     repo = "systemd";
     rev = "ba777535a890c2a2b7677dfacc63e12c578b9b3f";
-    sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rja1lbh4nkl5mcwpa";
+    sha256 = "1vb45fbqkrgczfwkb0y07ldnwhjqk2sh446hzfkdn8hrwl1lifg5";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];

From 15776462b22aa95c5c6ee029f9e6d030e99134ea Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 21 Jul 2017 06:33:56 -0500
Subject: [PATCH 0833/3246] libunistring: disable parallel building

Parallel building causes a test deadlock and has been disabled.
---
 pkgs/development/libraries/libunistring/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 20874f6f6a1..c4acc0627af 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
 
+  enableParallelBuilding = false;
+
   configureFlags = [
     "--with-libiconv-prefix=${libiconv}"
   ];

From 631f6b3e11c7d36bcdab2b11b5bb6ca7361a2e00 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 21 Jul 2017 06:34:26 -0500
Subject: [PATCH 0834/3246] systemd: unset RANLIB

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 sets the RANLIB environment
variable by default, causing `make' to invoke the wrong program.
---
 pkgs/os-specific/linux/systemd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 89a08f14f9e..8e303bee821 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
       autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
     ];
 
-
   configureFlags =
     [ "--localstatedir=/var"
       "--sysconfdir=/etc"
@@ -76,6 +75,8 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     ''
+      unset RANLIB
+
       ./autogen.sh
 
       # FIXME: patch this in systemd properly (and send upstream).

From 20321f66d7f8b434b84d4f3f4cb6353367256bc7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 21 Jul 2017 07:40:23 -0500
Subject: [PATCH 0835/3246] x264: unset AS

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 sets the environment variable
`AS' to the binutils assembler, but x264 needs yasm.
---
 pkgs/development/libraries/x264/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 6e4dc00b038..bf32969836c 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" ]; # leaving 52 kB of headers
 
+  preConfigure = ''
+    # `AS' is set to the binutils assembler, but we need yasm
+    unset AS
+  '';
+
   configureFlags = [ "--enable-shared" ]
     ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"
     ++ stdenv.lib.optional (enable10bit) "--bit-depth=10";

From b21defaf51daf002f94bb57bf0f5073b153247db Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 21 Jul 2017 08:09:02 -0500
Subject: [PATCH 0836/3246] zfs: fix invalid use of substituteInPlace

substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
---
 pkgs/os-specific/linux/zfs/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 414f2ba444a..9e8856fdcdc 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -44,7 +44,6 @@ let
         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"
@@ -54,6 +53,12 @@ let
         substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
         substituteInPlace ./etc/systemd/system/zfs-share.service.in \
           --replace "@bindir@/rm " "${coreutils}/bin/rm "
+
+        for f in ./udev/rules.d/*
+        do
+          substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
+        done
+
         ./autogen.sh
       '';
 

From 75290adaa91a75cea789ff1b849c005bc23412f3 Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stefan.siegl@mayflower.de>
Date: Fri, 21 Jul 2017 23:19:45 +0200
Subject: [PATCH 0837/3246] owncloud-client: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 207581ed29b..e0e8622e643 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "owncloud-client-${version}";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchurl {
     url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
-    sha256 = "051rky4rpm73flxxkhfdxqq23ncnk4ixhscbg74w82sa4d93f54k";
+    sha256 = "02az9wq0d1vsgcdipddipdjwj2faf7jag8hizwd0ha3sjlmrs6d1";
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];

From 5265d551a96e701387dc767ed62e3cbc9074fe90 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 21 Jul 2017 09:01:23 -0500
Subject: [PATCH 0838/3246] grub2: unset CPP

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 sets the environment variable
`CPP' by default, but this intereferes with dependency calculation.
---
 pkgs/tools/misc/grub/2.0x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 2bbeea8133e..634022e88e0 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -85,6 +85,8 @@ stdenv.mkDerivation rec {
        # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
        sed -i "tests/util/grub-shell.in" \
            -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
+
+      unset CPP # setting CPP intereferes with dependency calculation
     '';
 
   prePatch =

From fe800447c27f66ef73bd82823dde3dca8448bd9a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 21 Jul 2017 11:39:50 -0500
Subject: [PATCH 0839/3246] qemu: unset CPP

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 sets the environment variable
`CPP' by default, but this interferes with dependency calculation.
---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index d09926da7cd..8277261a150 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -59,6 +59,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "stackprotector" ];
 
+  preConfigure = ''
+    unset CPP # intereferes with dependency calculation
+  '';
+
   configureFlags =
     [ "--smbd=smbd" # use `smbd' from $PATH
       "--audio-drv-list=${audio}"

From 9aa4f09008ccada57264954ed773ad6a4537ecd2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 21 Jul 2017 12:15:09 -0500
Subject: [PATCH 0840/3246] qt4: unset LD

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 sets the `LD' environment
variable by default, interfering with the Makefile which uses gcc for linking.
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 1 +
 1 file changed, 1 insertion(+)

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 d3eaeed2f1e..1b87b1b0a27 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -114,6 +114,7 @@ stdenv.mkDerivation rec {
       -datadir $out/share/${name}
       -translationdir $out/share/${name}/translations
     "
+    unset LD # Makefile uses gcc for linking; setting LD interferes
   '' + optionalString stdenv.cc.isClang ''
     sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf
     sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf

From bec5797290754fa783b77a49149254417cde1344 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 21 Jul 2017 16:51:53 -0500
Subject: [PATCH 0841/3246] syslinux: fix invalid use of substituteInPlace

substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
---
 pkgs/os-specific/linux/syslinux/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index ce63d383c8e..37a237f57ac 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
   preBuild = ''
     substituteInPlace Makefile --replace /bin/pwd $(type -P pwd)
     substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
-    substituteInPlace utils/ppmtolss16 gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)
+    substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl)
+    substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)
   '';
 
   stripDebugList = "bin sbin share/syslinux/com32";

From 8537cf0f818a95073e93ac755e9fa17c30982caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 15 Jul 2017 16:32:01 +0200
Subject: [PATCH 0842/3246] CONTRIBUTING.md: suggest "nixos/<module>" prefix
 for NixOS changes

Suggest prefixing commit messages that touches NixOS code with
"nixos/<module>" instead of the current "<name> service" prefix.

"<name> service" is limiting in that NixOS code is more than the
services. It is also easier to spot NixOS changes with explicit
"nixos/..." prefix.
---
 .github/CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 14f60b936f8..b77ca7eefb9 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -15,7 +15,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
 * Format the commits in the following way:
 
   ```
-  (pkg-name | service-name): (from -> to | init at version | refactor | etc)
+  (pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
   
   (Motivation for change. Additional information.)
   ```
@@ -24,10 +24,10 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
 
   * nginx: init at 2.0.1
   * firefox: 3.0 -> 3.1.1
-  * hydra service: add bazBaz option
+  * nixos/hydra: add bazBaz option
   
     Dual baz behavior is needed to do foo.
-  * nginx service: refactor config generation
+  * nixos/nginx: refactor config generation
     
     The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
 

From d3be3606dfb4c6b9aa8bb0e8e75791e440732f39 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 22 Jul 2017 10:48:07 +0800
Subject: [PATCH 0843/3246] pythonPackages.substanced: Delete severly outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 943b6e75baf..8ca3ace2083 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8995,49 +8995,6 @@ in {
     };
   };
 
-  substanced = buildPythonPackage rec {
-    # no release yet
-    rev = "089818bc61c3dc5eca023254e37a280b041ea8cc";
-    name = "substanced-${rev}";
-
-    src = pkgs.fetchgit {
-      inherit rev;
-      url = "https://github.com/Pylons/substanced.git";
-      sha256 = "1fb8m5aylw8kig13fvldchgkxi4s2xlvwralrzinyma3imbznd3q";
-    };
-
-    buildInputs = with self; [ mock ];
-    patchPhase = ''
-      sed -i 's/assert_call(/assert_called_with(/' substanced/workflow/tests/test_workflow.py
-    '';
-
-    propagatedBuildInputs = with self; [
-      pyramid
-      pytz
-      zodb
-      venusian
-      colander
-      deform
-      python_magic
-      pyyaml
-      cryptacular
-      hypatia
-      zope_copy
-      zope_component
-      zope_deprecation
-      statsd
-      pyramid_zodbconn
-      pyramid_mailer
-      pyramid_chameleon
-      ZEO
-    ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
-
   svg-path = buildPythonPackage rec {
     name = "svg.path-${version}";
     version = "2.0b1";

From 66976bc6704efbe065f77559ab6b391e1300f8c3 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 22 Jul 2017 11:49:59 +0800
Subject: [PATCH 0844/3246] c-ares: 1.12.0 -> 1.13.0 for CVE-2017-1000381

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

diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 482cf9fdfad..025e11e0755 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "c-ares-1.12.0";
+  name = "c-ares-1.13.0";
 
   src = fetchurl {
     url = "http://c-ares.haxx.se/download/${name}.tar.gz";
-    sha256 = "1yv5ygkd813glz8hbagykgp1hlb6450chig061hr7pyw7i0gk4l6";
+    sha256 = "19qxhv9aiw903fr808y77r6l9js0fq9m3gcaqckan9jan7qhixq3";
   };
 
   meta = with stdenv.lib; {

From a6bcc158cf08addfddb9a72b5a74606ed3b54ee6 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 22 Jul 2017 13:29:23 +0900
Subject: [PATCH 0845/3246] blackbox: init at 1.20170611

---
 .../version-management/blackbox/default.nix   | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/version-management/blackbox/default.nix

diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
new file mode 100644
index 00000000000..569606d2fdb
--- /dev/null
+++ b/pkgs/applications/version-management/blackbox/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "1.20170611";
+  pname   = "blackbox";
+  name    = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "stackexchange";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "1jnzhlj54c0szw9l9wib07i2375pbm402bx9wagspcmwc0qw43p6";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin && cp -r bin/* $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Safely store secrets in a VCS repo";
+    maintainers = with maintainers; [ ericsagnes ];
+    license     = licenses.mit;
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d391c5d45a..ec9af2faddf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13463,6 +13463,8 @@ with pkgs;
     inherit (gnome2) zenity;
   };
 
+  blackbox = callPackage ../applications/version-management/blackbox { };
+
   bleachbit = callPackage ../applications/misc/bleachbit { };
 
   blender = callPackage  ../applications/misc/blender {

From 6589a83a8800555b981fad69f0354bb0b52f6401 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Sat, 22 Jul 2017 12:41:47 +0200
Subject: [PATCH 0846/3246] sauce-connect: 4.4.7 -> 4.4.8

---
 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 d32ea74cf7b..3caec9a75c1 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.7";
+  version = "4.4.8";
 
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
-      sha256 = "0n7x9mvv6sww0h77k3d8rms78vah0j48ndsv4vnxq9znwjiglmva";
+      sha256 = "1y6jmz0kdaz1fq9sirwxznzw52if6ypd0dp9mk7dkpipy0bx7pz6";
     } else if stdenv.system == "i686-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
-      sha256 = "1vwp8iqc5sk5kf7r86dld4767w4sm36hympnh1n2qza57ni7vy0g";
+      sha256 = "13nd2g1z4nvc3fa30xr3jnkqcy3fv4751s7ws4l93p7x6nc4aw1n";
     } else {
       url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
-      sha256 = "1dwjysj3kjydz096bm5x0s1g3jm4a7y0qkgbsc6bwl44vxz81f66";
+      sha256 = "0f8kcx7qd6bqbd74y6n83lb52zban9k631qkv1vyddvs9pjsxmpg";
     }
   );
 

From 138eba0bff16d31e62debeb67a4c90e64d28530a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 22 Jul 2017 18:04:19 +0200
Subject: [PATCH 0847/3246] Pull request template: clarify the purpose of the
 template

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4b9345b087e..3247b158342 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,6 +3,8 @@
 
 ###### Things done
 
+Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.
+
 - [ ] Tested using sandboxing
   ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,
     or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file)

From 22292c0462f20c7986d8ac60bbbd33af7a9f9ba3 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Wed, 19 Jul 2017 10:01:40 -0700
Subject: [PATCH 0848/3246] gnss-sdr: init at 0.0.9

I've tested the resulting build against the sample
"2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN" dataset linked from:

http://gnss-sdr.org/my-first-fix/

Many thanks to @knedlsepp for suggestions in #27505 that have
substantially improved this package!
---
 pkgs/applications/misc/gnss-sdr/default.nix | 67 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/applications/misc/gnss-sdr/default.nix

diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix
new file mode 100644
index 00000000000..68b49492791
--- /dev/null
+++ b/pkgs/applications/misc/gnss-sdr/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchFromGitHub
+, armadillo
+, boost
+, cmake
+, glog
+, gmock
+, openssl
+, google-gflags
+, gnuradio
+, orc
+, pkgconfig
+, pythonPackages
+, uhd
+}:
+
+stdenv.mkDerivation rec {
+  name = "gnss-sdr-${version}";
+  version = "0.0.9";
+
+  src = fetchFromGitHub {
+    owner = "gnss-sdr";
+    repo = "gnss-sdr";
+    rev = "v${version}";
+    sha256 = "0gis932ly3vk7d5qvznffp54pkmbw3m6v60mxjfdj5dd3r7vf975";
+  };
+
+  buildInputs = [
+    armadillo
+    boost.dev
+    cmake
+    glog
+    gmock
+    openssl.dev
+    google-gflags
+    gnuradio
+    orc
+    pkgconfig
+    pythonPackages.Mako
+
+    # UHD support is optional, but gnuradio is built with it, so there's
+    # nothing to be gained by leaving it out.
+    uhd
+  ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DGFlags_ROOT_DIR=${google-gflags}/lib"
+    "-DGLOG_INCLUDE_DIR=${glog}/include"
+
+    # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as
+    # armadillo is built using both, so skip checking for them.
+    "-DBLAS=YES"
+    "-DLAPACK=YES"
+
+    # Similarly, it doesn't actually use gfortran despite checking for
+    # its presence.
+    "-DGFORTRAN=YES"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "An open source Global Navigation Satellite Systems software-defined receiver";
+    homepage = http://gnss-sdr.org/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfbcf5d1f59..f6d6e4fff7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14130,6 +14130,8 @@ with pkgs;
 
   gksu = callPackage ../applications/misc/gksu { };
 
+  gnss-sdr = callPackage ../applications/misc/gnss-sdr { };
+
   gnuradio = callPackage ../applications/misc/gnuradio {
     inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
     fftw = fftwFloat;

From 66cd042802572a24cf861cd9c0ded3cb3fa112a8 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sat, 22 Jul 2017 17:29:35 -0400
Subject: [PATCH 0849/3246] gitkraken: 2.6.0 -> 2.7.0

---
 pkgs/applications/version-management/gitkraken/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 23a3ab7fa5e..c7f7a4b02e4 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "1msdwqp20pwaxv1a6maqb7wmaq00m8jpdga7fmbjcnpvkcdz49l7";
+    sha256 = "0088vdn47563f0v9zhk1vggn3c2cfg8rhmifc6nw4zbss49si5gp";
   };
 
   libPath = makeLibraryPath [

From 6df05b401b160b6c44524eabc6f07ea8988e053c Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sat, 22 Jul 2017 17:35:49 -0400
Subject: [PATCH 0850/3246] vscode: 1.14.0 -> 1.14.2

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index e5b7d1c65ee..18eb1803fd6 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.14.0";
+  version = "1.14.2";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "04xv9fr11j7k0yfb7aa2sdmq74hh43aarlvx8nxppzbn2k18dgb3";
-    "x86_64-linux" = "1m252cpj4pck40rxnrbp1wapn5d4grn15x7d3s059xb965kga4k7";
-    "x86_64-darwin" = "1hwjdrnrhvrmwbq935k4scgw68x817ms89gy471afbhpl65xmp8n";
+    "i686-linux" = "0ladqwgy37imq957mmbdfslaxcnx8gcl9nb1q5p8r91vldvf31zd";
+    "x86_64-linux" = "1nb9n6511v2p1nwcwh6kbpxgydfs66yn7q2nf1rmh42ha5yzqkja";
+    "x86_64-darwin" = "0yk2yd8rzhmsh276xfgywp1gjjkvxypgnjhs8jaxvrgsj7aw1s39";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 4b14212914faac8a4d0dd3a6e0ff66cf4a1e1484 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 22 Jul 2017 17:43:28 -0500
Subject: [PATCH 0851/3246] nixos/tests/keymap: use SLIM theme from
 nixos/tests/slim

---
 nixos/tests/keymap.nix | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix
index 55a0e760388..c431c1a3417 100644
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@@ -49,6 +49,38 @@ let
     machine.i18n.consoleKeyMap = mkOverride 900 layout;
     machine.services.xserver.layout = mkOverride 900 layout;
     machine.imports = [ ./common/x11.nix extraConfig ];
+    machine.services.xserver.displayManager.slim = {
+      enable = true;
+
+      # Use a custom theme in order to get best OCR results
+      theme = pkgs.runCommand "slim-theme-ocr" {
+        nativeBuildInputs = [ pkgs.imagemagick ];
+      } ''
+        mkdir "$out"
+        convert -size 1x1 xc:white "$out/background.jpg"
+        convert -size 200x100 xc:white "$out/panel.jpg"
+        cat > "$out/slim.theme" <<EOF
+        background_color #ffffff
+        background_style tile
+
+        input_fgcolor #000000
+        msg_color #000000
+
+        session_color #000000
+        session_font Verdana:size=16:bold
+
+        username_msg Username:
+        username_font Verdana:size=16:bold
+        username_color #000000
+        username_x 50%
+        username_y 40%
+
+        password_msg Password:
+        password_x 50%
+        password_y 40%
+        EOF
+      '';
+    };
 
     testScript = ''
       sub waitCatAndDelete ($) {

From 869bb2e486435254cde1b6696b24a89180024844 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 22 Jul 2017 19:08:02 -0400
Subject: [PATCH 0852/3246] linux-copperhead: 4.12.2.a -> 4.12.3.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 878f69dbaa5..abec37a268c 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.12.2";
+  version = "4.12.3";
   revision = "a";
-  sha256 = "0w3k5a30li2qz2msach9sg9qsvmjsc4mf9k3ad5dxd0667a0hygm";
+  sha256 = "0nxzpkh2ca47g6qykkfhf8qynpx3kr9vdkm9wixky159zxfj6s85";
 in
 
 import ./generic.nix (args // {

From 4f88ceff49792d1e57f8af269400e2b7a74d0db5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 22 Jul 2017 19:36:55 -0500
Subject: [PATCH 0853/3246] jam: unset AR

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 sets the AR environment variable
by default, but this causes the jam Makefile to use the wrong command.
---
 pkgs/development/tools/build-managers/jam/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index c0d152ee7a2..7314643530e 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ yacc ];
 
+  preConfigure = ''
+    unset AR
+  '';
+
   buildPhase = ''
     make jam0
     ./jam0 -j$NIX_BUILD_CORES -sBINDIR=$out/bin install

From 101e0998e14ee01f5fd1ff86fa705f6cfe31cf27 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 22 Jul 2017 19:54:57 -0500
Subject: [PATCH 0854/3246] argyllcms: unset AR

Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 sets the AR environment variable
by default, but this causes the argyllcms Makefile to use the wrong command.
---
 pkgs/tools/graphics/argyllcms/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 3c7af45f81d..3cdb4497baf 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -84,6 +84,8 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace "-j 3" "-j $NIX_BUILD_CORES"
     # Remove tiff, jpg and png to be sure the nixpkgs-provided ones are used
     rm -rf tiff jpg png
+
+    unset AR
   '';
 
   buildInputs = [

From 313b8b7e4bc232880b6732aa990b681eee45f628 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sun, 23 Jul 2017 03:17:38 +0200
Subject: [PATCH 0855/3246] scyther: Separated into two derivations

---
 .../science/programming/scyther/cli.nix       |  32 +++++
 .../science/programming/scyther/default.nix   | 123 +++++++++---------
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 93 insertions(+), 64 deletions(-)
 create mode 100644 pkgs/applications/science/programming/scyther/cli.nix

diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix
new file mode 100644
index 00000000000..152b7121774
--- /dev/null
+++ b/pkgs/applications/science/programming/scyther/cli.nix
@@ -0,0 +1,32 @@
+{ stdenv, glibc, flex, bison, cmake
+, version, src, meta }:
+stdenv.mkDerivation {
+  name = "scyther-cli-${version}";
+
+  inherit src meta;
+
+  buildInputs = [
+    cmake
+    glibc.static
+    flex
+    bison
+  ];
+
+  patchPhase = ''
+    # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work
+    printf "%s\n" "#define TAGVERSION \"${version}\"" > src/version.h
+  '';
+
+  configurePhase = ''
+    (cd src && cmakeConfigurePhase)
+  '';
+
+  dontUseCmakeBuildDir = true;
+  cmakeFlags = [ "-DCMAKE_C_FLAGS=-std=gnu89" ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mv src/scyther-linux "$out/bin/scyther-cli"
+    ln -s "$out/bin/scyther-cli" "$out/bin/scyther-linux"
+  '';
+}
diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix
index 6e009067e4e..beef26c6032 100644
--- a/pkgs/applications/science/programming/scyther/default.nix
+++ b/pkgs/applications/science/programming/scyther/default.nix
@@ -1,12 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, glibc, flex, bison, python27Packages, graphviz, cmake
+{ stdenv, lib, buildEnv, callPackage_i686, fetchFromGitHub, python27Packages, graphviz
 , includeGUI ? true
 , includeProtocols ? true
 }:
 let
   version = "1.1.3";
-in
-stdenv.mkDerivation {
-  name = "scyther-${version}";
+
   src = fetchFromGitHub {
     rev = "v${version}";
     sha256 = "0rb4ha5bnjxnwj4f3hciq7kyj96fhw14hqbwl5kr9cdw8q62mx0h";
@@ -14,64 +12,6 @@ stdenv.mkDerivation {
     repo = "scyther";
   };
 
-  buildInputs = [
-    cmake
-    glibc.static
-    flex
-    bison
-  ] ++ lib.optional includeGUI [
-    python27Packages.wrapPython
-  ];
-
-  patchPhase = ''
-    # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work
-    printf "%s\n" "#define TAGVERSION \"${version}\"" > src/version.h
-  '' + lib.optionalString includeGUI ''
-    file=gui/Scyther/Scyther.py
-    
-    # By default the scyther binary is looked for in the directory of the python script ($out/gui), but we want to have it look where our cli package is
-    substituteInPlace $file --replace "return getMyDir()" "return \"$out/bin\""
-
-    # Removes the Shebang from the file, as this would be wrapped wrongly
-    sed -i -e "1d" $file
-  '';
-
-  configurePhase = ''
-    (cd src && cmakeConfigurePhase)
-  '';
-
-  propagatedBuildInputs = lib.optional includeGUI [
-    python27Packages.wxPython
-    graphviz
-  ];
-  
-  dontUseCmakeBuildDir = true;
-  cmakeFlags = [ "-DCMAKE_C_FLAGS=-std=gnu89" ];
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    cp src/scyther-linux "$out/bin/scyther-cli"
-  '' + lib.optionalString includeGUI ''
-    mkdir -p "$out/gui"
-    cp -r gui/* "$out/gui"
-    ln -s ../gui/scyther-gui.py "$out/bin/scyther-gui"
-    ln -s ../bin/scyther-cli "$out/bin/scyther-linux"
-  '' + lib.optionalString includeProtocols (if includeGUI then ''
-      ln -s ./gui/Protocols "$out/protocols"
-    '' else ''
-      mkdir -p "$out/protocols"
-      cp -r gui/Protocols/* "$out/protocols"
-    '');
-
-  postFixup = lib.optionalString includeGUI ''
-    wrapPythonProgramsIn "$out/gui" "$out $pythonPath"
-  '';
-
-  doInstallCheck = includeGUI;
-  installCheckPhase = ''
-    "$out/gui/scyther.py" "$src/gui/Protocols/Demo/ns3.spdl"
-  '';
-
   meta = with lib; {
     description = "Scyther is a tool for the automatic verification of security protocols.";
     homepage = https://www.cs.ox.ac.uk/people/cas.cremers/scyther/;
@@ -79,4 +19,61 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ infinisil ];
     platforms = platforms.linux;
   };
-}
+
+  cli = callPackage_i686 ./cli.nix {
+    inherit version src meta;
+  };
+
+  gui = stdenv.mkDerivation {
+    name = "scyther-gui-${version}";
+    inherit src meta;
+    buildInputs = [
+      python27Packages.wrapPython
+    ];
+
+    patchPhase = ''
+      file=gui/Scyther/Scyther.py
+
+      # By default the scyther binary is looked for in the directory of the python script ($out/gui), but we want to have it look where our cli package is
+      substituteInPlace $file --replace "return getMyDir()" "return \"${cli}/bin\""
+
+      # Removes the Shebang from the file, as this would be wrapped wrongly
+      sed -i -e "1d" $file
+    '';
+
+    dontBuild = true;
+
+    propagatedBuildInputs = [
+      python27Packages.wxPython
+      graphviz
+    ];
+ 
+    installPhase = ''
+      mkdir -p "$out"/gui "$out"/bin
+      cp -r gui/* "$out"/gui
+      ln -s "$out"/gui/scyther-gui.py "$out/bin/scyther-gui"
+    '';
+
+    postFixup = ''
+      wrapPythonProgramsIn "$out/gui" "$out $pythonPath"
+    '';
+
+    doInstallCheck = true;
+    installCheckPhase = ''
+      "$out/gui/scyther.py" "$src/gui/Protocols/Demo/ns3.spdl"
+    '';
+  };
+in
+  buildEnv {
+    name = "scyther-${version}";
+    inherit meta;
+    paths = [ cli ] ++ lib.optional includeGUI gui;
+    pathsToLink = [ "/bin" ];
+
+    postBuild = ''
+      rm "$out/bin/scyther-linux"
+    '' + lib.optionalString includeProtocols ''
+      mkdir -p "$out/protocols"
+      cp -rv ${src}/protocols/* "$out/protocols"
+    '';
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c52320c83e..5f85bdc86c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17852,7 +17852,7 @@ with pkgs;
 
   plm = callPackage ../applications/science/programming/plm { };
 
-  scyther = callPackage_i686 ../applications/science/programming/scyther { };
+  scyther = callPackage ../applications/science/programming/scyther { };
 
   ### SCIENCE/LOGIC
 

From 6841f7b07df0c3a24e0b72b0348b4ff000c48b8d Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sat, 22 Jul 2017 21:29:21 -0400
Subject: [PATCH 0856/3246] rclone: 1.36 -> 1.37

---
 pkgs/applications/networking/sync/rclone/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 93b4fc76467..0888e0207a6 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.36";
+  version = "1.37";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,9 +10,15 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "1vx75ihg2j0chml8hwvngjkjw647cai9gicfy8ss6xsrm46w59b3";
+    sha256 = "0krmdwzl4c68vxpbycqy2xba8vvqbka7xh3k2q6ldxsd8y2rypym";
   };
 
+  outputs = [ "bin" "out" "man" ];
+
+  postInstall = ''
+    install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
+  '';
+
   meta = with stdenv.lib; {
     description = "Command line program to sync files and directories to and from major cloud storage";
     homepage = "http://rclone.org";

From 7e62e8d036c4673a76bd24ce1cf9425ec0c84869 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 23 Jul 2017 11:00:00 +0200
Subject: [PATCH 0857/3246] mpv: 0.25.0 -> 0.26.0

Add option for archive support and fix dvdread and dvdnav support.
---
 pkgs/applications/video/mpv/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 674d6f46690..d21a8ab6dcc 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -33,6 +33,7 @@
 , vaapiSupport       ? true,  libva         ? null
 , drmSupport         ? !stdenv.isDarwin,  libdrm        ? null
 , vapoursynthSupport ? false, vapoursynth   ? null
+, archiveSupport     ? false, libarchive    ? null
 , jackaudioSupport   ? false, libjack2      ? null
 
 # scripts you want to be loaded by default
@@ -65,6 +66,7 @@ assert libpngSupport      -> available libpng;
 assert youtubeSupport     -> available youtube-dl;
 assert vapoursynthSupport -> available vapoursynth;
 assert jackaudioSupport   -> available libjack2;
+assert archiveSupport     -> available libarchive;
 assert vaapiSupport       -> available libva;
 assert drmSupport         -> available libdrm;
 
@@ -79,13 +81,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "16r3fyq472hzxnh6g3gm520pmw1ybslaki3pqjm2d9jnd2md1pa5";
+    sha256 = "0d9pvsknjqmxj907y85fxh9xcbb5dafw2bh7rpwhgs9x4wdrbvv0";
   };
 
   patchPhase = ''
@@ -101,6 +103,9 @@ in stdenv.mkDerivation rec {
     "--disable-libmpv-static"
     "--disable-static-build"
     "--disable-build-date" # Purity
+    (enableFeature archiveSupport "libarchive")
+    (enableFeature dvdreadSupport "dvdread")
+    (enableFeature dvdnavSupport "dvdnav")
     (enableFeature vaapiSupport "vaapi")
     (enableFeature waylandSupport "wayland")
   ];
@@ -136,6 +141,7 @@ in stdenv.mkDerivation rec {
     ++ optional vaapiSupport       libva
     ++ optional drmSupport         libdrm
     ++ optional vapoursynthSupport vapoursynth
+    ++ optional archiveSupport     libarchive
     ++ optionals dvdnavSupport     [ libdvdnav libdvdnav.libdvdread ]
     ++ optionals x11Support        [ libX11 libXext mesa libXxf86vm ]
     ++ optionals waylandSupport    [ wayland libxkbcommon ];
@@ -154,7 +160,7 @@ in stdenv.mkDerivation rec {
     ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
     # Ensure youtube-dl is available in $PATH for MPV
     wrapProgram $out/bin/mpv \
-      --add-flags "--script=${concatStringsSep "," scripts}" \
+      --add-flags "--scripts=${concatStringsSep "," scripts}" \
   '' + optionalString youtubeSupport ''
       --prefix PATH : "${youtube-dl}/bin" \
   '' + optionalString vapoursynthSupport ''

From 9f61c7f947e256f12a2952e316007e3fbc74316c Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 23 Jul 2017 12:56:04 +0300
Subject: [PATCH 0858/3246] qt5ct module: expose qtstyleplugins

---
 nixos/modules/programs/qt5ct.nix          | 2 +-
 nixos/modules/services/misc/autorandr.nix | 1 +
 nixos/modules/services/misc/fstrim.nix    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/qt5ct.nix b/nixos/modules/programs/qt5ct.nix
index 550634e65be..aeb7fc50849 100644
--- a/nixos/modules/programs/qt5ct.nix
+++ b/nixos/modules/programs/qt5ct.nix
@@ -26,6 +26,6 @@ with lib;
   ###### implementation
   config = mkIf config.programs.qt5ct.enable {
     environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct";
-    environment.systemPackages = [ pkgs.qt5ct ];
+    environment.systemPackages = with pkgs; [ qt5ct libsForQt5.qtstyleplugins ];
   };
 }
diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix
index 792a4c8375d..3020130ad1f 100644
--- a/nixos/modules/services/misc/autorandr.nix
+++ b/nixos/modules/services/misc/autorandr.nix
@@ -30,4 +30,5 @@ in {
 
   };
 
+  meta.maintainers = with maintainers; [ gnidorah ];
 }
diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix
index e89366cbafe..15f283f093c 100644
--- a/nixos/modules/services/misc/fstrim.nix
+++ b/nixos/modules/services/misc/fstrim.nix
@@ -42,4 +42,5 @@ in {
 
   };
 
+  meta.maintainers = with maintainers; [ gnidorah ];
 }

From 2d8118604572d18a5ef6217c53b9a26294e28448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Jul 2017 11:22:58 +0100
Subject: [PATCH 0859/3246] linode-api: 4.1.1b1 -> 4.1.1b2

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

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index b6e3de7357c..ce46b6daaff 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "4.1.1b1";
+  version = "4.1.1b2";
   name = "${pname}-${version}";
 
   disabled = (pythonOlder "2.7");
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1psf4sknxrjqiz833x4nmh2pw7xi2rvcm7l9lv8jfdwxza63sny5";
+    sha256 = "1lfqsll3wv1wzn98ymmcbw0yawj8ab3mxniws6kaxf99jd4a0xp4";
   };
 
   meta = {

From 55af60a23f178459afd358bba3db9807c72a5a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Jul 2017 11:23:28 +0100
Subject: [PATCH 0860/3246] pythonPackages.linode-api: disable future/enum34 on
 newer python versions

---
 pkgs/development/python-modules/linode-api/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index ce46b6daaff..869d4d50ea4 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -15,11 +15,16 @@ buildPythonPackage rec {
 
   disabled = (pythonOlder "2.7");
 
-  buildInputs = [];
   propagatedBuildInputs = [ requests ]
                              ++ stdenv.lib.optionals (!isPy3k) [ future ]
                              ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
 
+  postPatch = (stdenv.lib.optionalString (isPy3k) ''
+    sed -i -e '/"future",/d' setup.py
+  '') + (stdenv.lib.optionalString (!pythonOlder "3.4") ''
+    sed -i -e '/"enum34",/d' setup.py
+  '');
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "1lfqsll3wv1wzn98ymmcbw0yawj8ab3mxniws6kaxf99jd4a0xp4";

From ef672008e18a6a8e029a00b066edd766b679fb9f Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Sat, 22 Jul 2017 15:11:06 +0200
Subject: [PATCH 0861/3246] spotify: 1.0.57.474.gca9c9538-30 ->
 1.0.49.125.g72ee7853-111 (downgrade) clarify note about stable and testing
 versions

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 266e221649e..ad0f7ee14c5 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -8,7 +8,8 @@ let
   # Please update the stable branch!
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
-  version = "1.0.57.474.gca9c9538-30";
+  # Be careful not to pick the testing version.
+  version = "1.0.49.125.g72ee7853-111";
 
   deps = [
     alsaLib
@@ -53,7 +54,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-    sha256 = "fe46f2084c45c756bee366f744d2821d79e82866b19942e30bb2a20c1e597437";
+    sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
   };
 
   buildInputs = [ dpkg makeWrapper ];

From 9e90d9e5a30238aedd92f3fcdc54658687cd9879 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 23 Jul 2017 12:47:30 +0200
Subject: [PATCH 0862/3246] gpsbabel: 1.5.3 -> 1.5.4

Also really use QT5 and switch download location to GitHub.
---
 pkgs/applications/misc/gpsbabel/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index ace89cd8a21..90ae1a87654 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "gpsbabel-${version}";
-  version = "1.5.3";
+  version = "1.5.4";
 
-  src = fetchurl {
-    # gpgbabel.org makes it hard to get the source tarball automatically, so
-    # get it from elsewhere.
-    url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz";
-    sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1";
+  src = fetchFromGitHub {
+    owner = "gpsbabel";
+    repo = "gpsbabel";
+    rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi";
   };
 
   patches = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs = [ zlib qt4 which ]
+  buildInputs = [ zlib qtbase which ]
     ++ lib.optionals stdenv.isDarwin [ IOKit ];
 
   /* FIXME: Building the documentation, with "make doc", requires this:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 395a8085745..fb048c04151 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14528,7 +14528,7 @@ with pkgs;
 
   gosmore = callPackage ../applications/misc/gosmore { };
 
-  gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
+  gpsbabel = libsForQt56.callPackage ../applications/misc/gpsbabel {
     inherit (darwin) IOKit;
   };
 

From aad2a2132c43554d0ec78279a471a57b9f9fdcfd Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Fri, 21 Jul 2017 02:15:36 -0400
Subject: [PATCH 0863/3246] nim: 0.16.0 -> 0.17.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 0cebd40afdb..101f8ab64ba 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.16.0";
+  version = "0.17.0";
 
   src = fetchurl {
     url = "http://nim-lang.org/download/${name}.tar.xz";
-    sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy";
+    sha256 = "16vsmk4rqnkg9lc9h9jk62ps0x778cdqg6qrs3k6fv2g73cqvq9n";
   };
 
   doCheck = true;

From a842fa34dd9efde2c356a7deea8472dc41ed3118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 23 Jul 2017 14:16:19 +0200
Subject: [PATCH 0864/3246] nixopsUnstable: add lowPrio

Or else nix-env updates the stable version to unstable.
---
 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 fb048c04151..6f03f81cd27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18666,7 +18666,7 @@ with pkgs;
 
   nixops = callPackage ../tools/package-management/nixops { };
 
-  nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { };
+  nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { });
 
   nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
 

From 887570883ed4ac5b3318565b585979eb1959c6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Jul 2017 15:16:11 +0100
Subject: [PATCH 0865/3246] perf: remove binutils patch by wrapper

starting with linux 4.12 our patch no longer applied. In order to
avoid having to maintain patches for different linux kernels it is
easier to use a wrapper instead.
---
 .../linux/kernel/perf-binutils-path.patch            | 12 ------------
 pkgs/os-specific/linux/kernel/perf.nix               | 11 +++++++----
 2 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/perf-binutils-path.patch

diff --git a/pkgs/os-specific/linux/kernel/perf-binutils-path.patch b/pkgs/os-specific/linux/kernel/perf-binutils-path.patch
deleted file mode 100644
index d20f2296ea3..00000000000
--- a/pkgs/os-specific/linux/kernel/perf-binutils-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' linux-4.9.31-orig/tools/perf/util/annotate.c linux-4.9.31/tools/perf/util/annotate.c
---- linux-4.9.31-orig/tools/perf/util/annotate.c	2017-06-07 12:08:04.000000000 +0200
-+++ linux-4.9.31/tools/perf/util/annotate.c	2017-06-12 13:10:08.811079574 +0200
-@@ -1350,7 +1350,7 @@
- 		 "%s %s%s --start-address=0x%016" PRIx64
- 		 " --stop-address=0x%016" PRIx64
- 		 " -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand",
--		 objdump_path ? objdump_path : "objdump",
-+		 objdump_path ? objdump_path : OBJDUMP_PATH,
- 		 disassembler_style ? "-M " : "",
- 		 disassembler_style ? disassembler_style : "",
- 		 map__rip_2objdump(map, sym->start),
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 3fbad924568..b6f1f7d9f8a 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto
+{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper
 , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
 , libiberty, libaudit
 , zlib, withGtk ? false, gtk2 ? null }:
@@ -13,8 +13,6 @@ stdenv.mkDerivation {
 
   inherit (kernel) src;
 
-  patches = kernel.patches ++ [ ./perf-binutils-path.patch ];
-
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
@@ -26,7 +24,7 @@ stdenv.mkDerivation {
   # perf refers both to newt and slang
   # binutils is required for libbfd.
   nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
-      flex bison libiberty libaudit ];
+      flex bison libiberty libaudit makeWrapper ];
   buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++
     stdenv.lib.optional withGtk gtk2;
 
@@ -45,6 +43,11 @@ stdenv.mkDerivation {
 
   installFlags = "install install-man ASCIIDOC8=1";
 
+  preFixup = ''
+    wrapProgram $out/bin/perf \
+      --prefix PATH : "${binutils}/bin"
+  '';
+
   crossAttrs = {
     /* I don't want cross-python or cross-perl -
        I don't know if cross-python even works */

From 407acb80fc0890e62597e170cc00d9e873e37e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 23 Jul 2017 16:35:32 +0200
Subject: [PATCH 0866/3246] ghc821: 8.2.1-rc3 -> 8.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 0901dd50a2ed0d12b2bee8fdb147fdce5c1c5d69)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/compilers/ghc/8.2.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix
index 92014200c61..91c66a7cb47 100644
--- a/pkgs/development/compilers/ghc/8.2.1.nix
+++ b/pkgs/development/compilers/ghc/8.2.1.nix
@@ -9,8 +9,8 @@
 
 let
   inherit (bootPkgs) ghc;
-  version = "8.2.1-rc3";
-  preReleaseName = "ghc-8.2.0.20170704";
+  version = "8.2.1";
+  preReleaseName = "ghc-8.2.1";
   commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
   commonPreConfigure =  ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
@@ -27,7 +27,7 @@ in stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz";
-    sha256 = "0ccfybbjrmd8yzqbfdqvb6clz2kd005wi8sx3mfjmbkmxv0l4jry";
+    sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng";
   };
 
   postPatch = "patchShebangs .";

From 6e00673e7fd1784256b5e72ca54598dd9de46dbf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 23 Jul 2017 10:47:13 -0400
Subject: [PATCH 0867/3246] accelio: Remove

---
 .../development/libraries/accelio/default.nix |  64 --
 .../libraries/accelio/fix-printfs.patch       | 615 ------------------
 pkgs/tools/filesystems/ceph/generic.nix       |  10 +-
 pkgs/top-level/all-packages.nix               |   4 -
 4 files changed, 1 insertion(+), 692 deletions(-)
 delete mode 100644 pkgs/development/libraries/accelio/default.nix
 delete mode 100644 pkgs/development/libraries/accelio/fix-printfs.patch

diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
deleted file mode 100644
index a1f229ca5fb..00000000000
--- a/pkgs/development/libraries/accelio/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libibverbs, librdmacm, libevent
-
-# Linux only deps
-, numactl, kernel ? null
-}:
-
-stdenv.mkDerivation rec {
-  name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
-  version = "1.5";
-
-  src = fetchFromGitHub {
-    owner = "accelio";
-    repo = "accelio";
-    rev = "v1.5";
-    sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7";
-  };
-
-  hardeningDisable = [ "format" "pic" ];
-
-  patches = [ ./fix-printfs.patch ];
-
-  postPatch = ''
-    # Don't build broken examples
-    sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac
-
-    # Allow the installation of xio kernel headers
-    sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in
-
-    # Don't install ldconfig entries
-    sed -i '\,/etc/ld.so.conf.d/libxio.conf,d' src/usr/Makefile.am
-    sed -i '\,/sbin/ldconfig,d' src/usr/Makefile.am
-  '';
-
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ libevent ];
-  propagatedBuildInputs = [ libibverbs librdmacm ]
-    ++ stdenv.lib.optional stdenv.isLinux numactl;
-
-  configureFlags = [
-    "--enable-rdma"
-    "--disable-raio-build"
-  ] ++ stdenv.lib.optionals (kernel != null) [
-    "--enable-kernel-module"
-    "--with-kernel=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-    "--with-kernel-build=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  INSTALL_MOD_PATH = "\${out}";
-
-  meta = with stdenv.lib; {
-    homepage = http://www.accelio.org/;
-    description = "High-performance messaging and RPC library";
-    longDescription = ''
-      A high-performance asynchronous reliable messaging and RPC library
-      optimized for hardware acceleration.
-    '';
-    license = licenses.bsd3;
-    platforms = with platforms; linux ++ freebsd;
-    maintainers = with maintainers; [ wkennington ];
-    # kernel 4.2 is the most recent supported kernel
-    broken = kernel != null &&
-      (builtins.compareVersions kernel.version "4.2" == 1);
-  };
-}
diff --git a/pkgs/development/libraries/accelio/fix-printfs.patch b/pkgs/development/libraries/accelio/fix-printfs.patch
deleted file mode 100644
index 23b2f40e42f..00000000000
--- a/pkgs/development/libraries/accelio/fix-printfs.patch
+++ /dev/null
@@ -1,615 +0,0 @@
-diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c
---- accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c	2015-09-03 19:36:25.610337514 -0400
-+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c	2015-09-03 19:59:13.258697472 -0400
-@@ -246,7 +246,7 @@ static void *worker_thread(void *data)
- 		} else {
- 			vmsg_sglist_set_nents(&msg->out, 0);
- 		}
--		msg->user_context = (void *)get_cycles();
-+		msg->user_context = (void *)(intptr_t)get_cycles();
- 		/* send first message */
- 		if (xio_send_request(tdata->conn, msg) == -1) {
- 			if (xio_errno() != EAGAIN)
-@@ -330,7 +330,7 @@ static int on_response(struct xio_sessio
- {
- 	struct thread_data  *tdata = (struct thread_data *)cb_user_context;
- 
--	cycles_t rtt = (get_cycles()-(cycles_t)msg->user_context);
-+	cycles_t rtt = (get_cycles()-(cycles_t)(intptr_t)msg->user_context);
- 
- 	if (tdata->do_stat) {
- 		if (rtt > tdata->stat.max_rtt)
-@@ -358,7 +358,7 @@ static int on_response(struct xio_sessio
- 	msg->in.header.iov_len = 0;
- 	vmsg_sglist_set_nents(&msg->in, 0);
- 
--	msg->user_context = (void *)get_cycles();
-+	msg->user_context = (void *)(intptr_t)get_cycles();
- 	if (xio_send_request(tdata->conn, msg) == -1) {
- 		if (xio_errno() != EAGAIN)
- 			printf("**** [%p] Error - xio_send_request " \
-@@ -559,7 +559,7 @@ int run_client_test(struct perf_paramete
- 		       sess_data.min_lat_us,
- 		       sess_data.max_lat_us);
- 		if (fd)
--			fprintf(fd, "%lu, %d, %lu, %.2lf, %.2lf\n",
-+			fprintf(fd, "%" PRIu64 ", %d, %" PRIu64 ", %.2lf, %.2lf\n",
- 				data_len,
- 				threads_iter,
- 				sess_data.tps,
-diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h
---- accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h	2015-09-03 19:36:25.610337514 -0400
-+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h	2015-09-03 19:57:30.856215123 -0400
-@@ -90,7 +90,7 @@ typedef enum { READ, WRITE} Verb;
- /* The format of the results */
- #define RESULT_FMT		" #bytes     #threads   #TPS       BW average[MBps]   Latency average[usecs]   Latency low[usecs]   Latency peak[usecs]\n"
- /* Result print format */
--#define REPORT_FMT		" %-7lu     %-2d         %-9.2lu	  %-9.2lf     %-9.2lf                  %-9.2lf              %-9.2lf\n"
-+#define REPORT_FMT		" %-7" PRIu64 "     %-2d         %-9.2" PRIu64 "	  %-9.2lf     %-9.2lf                  %-9.2lf              %-9.2lf\n"
- 
- 
- struct perf_parameters {
-diff -rup accelio/examples/usr/hello_world_iov/xio_client.c accelio.new/examples/usr/hello_world_iov/xio_client.c
---- accelio/examples/usr/hello_world_iov/xio_client.c	2015-09-03 19:36:25.611337519 -0400
-+++ accelio.new/examples/usr/hello_world_iov/xio_client.c	2015-09-03 19:42:19.983984370 -0400
-@@ -224,7 +224,7 @@ static void process_response(struct sess
- 				len = 64;
- 			tmp = str[len];
- 			str[len] = '\0';
--			printf("message header : [%lu] - %s\n",
-+			printf("message header : [%" PRIu64 "] - %s\n",
- 			       (rsp->request->sn + 1), str);
- 			str[len] = tmp;
- 		}
-@@ -236,7 +236,7 @@ static void process_response(struct sess
- 					len = 64;
- 				tmp = str[len];
- 				str[len] = '\0';
--				printf("message data: [%lu][%d][%zd] - %s\n",
-+				printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
- 				       (rsp->request->sn + 1), i, sglist[i].iov_len, str);
- 				str[len] = tmp;
- 			}
-diff -rup accelio/examples/usr/hello_world_iov/xio_server.c accelio.new/examples/usr/hello_world_iov/xio_server.c
---- accelio/examples/usr/hello_world_iov/xio_server.c	2015-09-03 19:36:25.611337519 -0400
-+++ accelio.new/examples/usr/hello_world_iov/xio_server.c	2015-09-03 19:43:07.353204184 -0400
-@@ -203,7 +203,7 @@ static void process_request(struct serve
- 				len = 64;
- 			tmp = str[len];
- 			str[len] = '\0';
--			printf("message header : [%lu] - %s\n",
-+			printf("message header : [%" PRIu64 "] - %s\n",
- 			       (req->sn + 1), str);
- 			str[len] = tmp;
- 		}
-@@ -215,7 +215,7 @@ static void process_request(struct serve
- 					len = 64;
- 				tmp = str[len];
- 				str[len] = '\0';
--				printf("message data: [%lu][%d][%zd] - %s\n",
-+				printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
- 				       (req->sn + 1), i, sglist[i].iov_len, str);
- 				str[len] = tmp;
- 			}
-@@ -360,11 +360,11 @@ static int on_msg_error(struct xio_sessi
- 	struct server_data *sdata = (struct server_data *)cb_user_context;
- 
- 	if (direction == XIO_MSG_DIRECTION_OUT) {
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 	} else {
- 		xio_release_response(msg);
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 	}
- 
-diff -rup accelio/examples/usr/hello_world_libevent/xio_client.c accelio.new/examples/usr/hello_world_libevent/xio_client.c
---- accelio/examples/usr/hello_world_libevent/xio_client.c	2015-09-03 19:36:25.612337524 -0400
-+++ accelio.new/examples/usr/hello_world_libevent/xio_client.c	2015-09-03 19:43:32.748322028 -0400
-@@ -87,7 +87,7 @@ static void process_response(struct sess
- {
- 	if (++session_data->cnt == PRINT_COUNTER) {
- 		((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
--		printf("message: [%lu] - %s\n",
-+		printf("message: [%" PRIu64 "] - %s\n",
- 		       (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
- 		session_data->cnt = 0;
- 	}
-diff -rup accelio/examples/usr/hello_world_libevent/xio_server.c accelio.new/examples/usr/hello_world_libevent/xio_server.c
---- accelio/examples/usr/hello_world_libevent/xio_server.c	2015-09-03 19:36:25.612337524 -0400
-+++ accelio.new/examples/usr/hello_world_libevent/xio_server.c	2015-09-03 19:43:50.556404665 -0400
-@@ -82,7 +82,7 @@ static void process_request(struct serve
- 				len = 64;
- 			tmp = str[len];
- 			str[len] = '\0';
--			printf("message header : [%lu] - %s\n",
-+			printf("message header : [%" PRIu64 "] - %s\n",
- 			       (req->sn + 1), str);
- 			str[len] = tmp;
- 		}
-@@ -94,7 +94,7 @@ static void process_request(struct serve
- 					len = 64;
- 				tmp = str[len];
- 				str[len] = '\0';
--				printf("message data: [%lu][%d][%d] - %s\n",
-+				printf("message data: [%" PRIu64 "][%d][%d] - %s\n",
- 				       (req->sn + 1), i, len, str);
- 				str[len] = tmp;
- 			}
-diff -rup accelio/examples/usr/hello_world_mt/xio_mt_client.c accelio.new/examples/usr/hello_world_mt/xio_mt_client.c
---- accelio/examples/usr/hello_world_mt/xio_mt_client.c	2015-09-03 19:36:25.611337519 -0400
-+++ accelio.new/examples/usr/hello_world_mt/xio_mt_client.c	2015-09-03 19:41:13.493675827 -0400
-@@ -40,6 +40,7 @@
- #include <string.h>
- #include <inttypes.h>
- #include <sched.h>
-+#include <inttypes.h>
- 
- #include "libxio.h"
- 
-@@ -133,7 +134,7 @@ static void process_response(struct thre
- {
- 	if (++tdata->cnt == PRINT_COUNTER) {
- 		((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
--		printf("thread [%d] - tid:%p  - message: [%lu] - %s\n",
-+		printf("thread [%d] - tid:%p  - message: [%" PRIu64 "] - %s\n",
- 		       tdata->affinity,
- 		      (void *)pthread_self(),
- 		       (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
-diff -rup accelio/examples/usr/hello_world_mt/xio_mt_server.c accelio.new/examples/usr/hello_world_mt/xio_mt_server.c
---- accelio/examples/usr/hello_world_mt/xio_mt_server.c	2015-09-03 19:36:25.611337519 -0400
-+++ accelio.new/examples/usr/hello_world_mt/xio_mt_server.c	2015-09-03 19:41:31.730760455 -0400
-@@ -104,7 +104,7 @@ static void process_request(struct threa
- 			    struct xio_msg *req)
- {
- 	if (++tdata->cnt == PRINT_COUNTER) {
--		printf("thread [%d] tid:%p - message: [%lu] - %s\n",
-+		printf("thread [%d] tid:%p - message: [%" PRIu64 "] - %s\n",
- 		       tdata->affinity,
- 		       (void *)pthread_self(),
- 		       (req->sn + 1), (char *)req->in.header.iov_base);
-diff -rup accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c
---- accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c	2015-09-03 19:36:25.603337482 -0400
-+++ accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c	2015-09-03 20:00:15.169989095 -0400
-@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
- 	struct thread_data	*tdata		= conn_entry->tdata;
- 
- 	if (direction == XIO_MSG_DIRECTION_OUT) {
--		DEBUG("**** [%p] message %lu failed. reason: %s\n",
-+		DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, req->sn, xio_strerror(error));
- 	} else {
- 		xio_release_response(req);
--		DEBUG("**** [%p] message %lu failed. reason: %s\n",
-+		DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, req->request->sn, xio_strerror(error));
- 	}
- 	obj_pool_put(tdata->req_pool, req);
-diff -rup accelio/src/tools/usr/xio_if_numa_cpus.c accelio.new/src/tools/usr/xio_if_numa_cpus.c
---- accelio/src/tools/usr/xio_if_numa_cpus.c	2015-09-03 19:36:25.603337482 -0400
-+++ accelio.new/src/tools/usr/xio_if_numa_cpus.c	2015-09-03 19:40:06.398364476 -0400
-@@ -43,6 +43,7 @@
- #include <net/if.h>
- #include <stdio.h>
- #include <numa.h>
-+#include <inttypes.h>
- 
- #define cpusmask_test_bit(nr, addr)	(*(addr) & (1ULL << (nr)))
- #define cpusmask_set_bit(nr, addr)	(*(addr) |=  (1ULL << (nr)))
-@@ -244,7 +245,7 @@ int main(int argc, char *argv[])
- 		}
- 		intf_cpusmask_str(cpusmask, cpusnum, cpus_str);
- 
--		printf("%-10s %-16s %-30s %-5d 0x%-8lx %-4s[%d] - %s\n",
-+		printf("%-10s %-16s %-30s %-5d 0x%-8" PRIx64 " %-4s[%d] - %s\n",
- 		       ifa->ifa_name, host, flags, numa_node, cpusmask,
- 		       "cpus",  cpusnum, cpus_str);
- 	}
-diff -rup accelio/src/tools/usr/xio_mem_usage.c accelio.new/src/tools/usr/xio_mem_usage.c
---- accelio/src/tools/usr/xio_mem_usage.c	2015-09-03 19:36:25.603337482 -0400
-+++ accelio.new/src/tools/usr/xio_mem_usage.c	2015-09-03 19:38:57.596044838 -0400
-@@ -73,7 +73,7 @@
- 	while (i++ < 48) { \
- 		printf("."); \
- 	} \
--	printf(" %6lu\n", sizeof(type)); \
-+	printf(" %zu\n", sizeof(type)); \
- }
- 
- int main(int argc, char **argv)
-diff -rup accelio/tests/portable/direct_rdma_test/xio_rdma_common.c accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c
---- accelio/tests/portable/direct_rdma_test/xio_rdma_common.c	2015-09-03 19:36:25.610337514 -0400
-+++ accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c	2015-09-03 19:56:25.521908028 -0400
-@@ -90,7 +90,7 @@ static int publish_our_buffer(struct xio
- 	 * this flag must be on */
- 	rsp->flags = XIO_MSG_FLAG_IMM_SEND_COMP;
- 
--	rdma_test_buf.addr = (uint64_t)rdma_reg_mem.addr;
-+	rdma_test_buf.addr = (intptr_t)rdma_reg_mem.addr;
- 	rdma_test_buf.length = rdma_reg_mem.length;
- 	rdma_test_buf.rkey = xio_lookup_rkey_by_response(&rdma_reg_mem, rsp);
- 
-diff -rup accelio/tests/usr/hello_test/xio_client.c accelio.new/tests/usr/hello_test/xio_client.c
---- accelio/tests/usr/hello_test/xio_client.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test/xio_client.c	2015-09-03 19:45:43.055926711 -0400
-@@ -181,13 +181,13 @@ static void process_response(struct test
- 
- 		double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
- 		double rxbw = (1.0*pps*test_params->stat.rxlen/ONE_MB);
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
- 		       pps, txbw, rxbw,
- 		       test_params->stat.txlen, test_params->stat.rxlen);
- 		get_time(timeb, 40);
- 
--		printf("**** [%s] - message [%zd] %s - %s\n",
-+		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
- 		       timeb, (rsp->request->sn + 1),
- 		       (char *)rsp->in.header.iov_base,
- 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
-@@ -212,8 +212,8 @@ static int on_session_event(struct xio_s
- 
- 	switch (event_data->event) {
- 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
--		printf("nsent:%lu, nrecv:%lu, " \
--		       "delta:%lu\n",
-+		printf("nsent:%" PRIu64 ", nrecv:%" PRIu64 ", " \
-+		       "delta:%" PRIu64 "\n",
- 		       test_params->nsent, test_params->nrecv,
- 		       test_params->nsent-test_params->nrecv);
- 
-@@ -370,11 +370,11 @@ static int on_msg_error(struct xio_sessi
- 	struct test_params *test_params = (struct test_params *)cb_user_context;
- 
- 	if (direction == XIO_MSG_DIRECTION_OUT) {
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 	} else {
- 		xio_release_response(msg);
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 	}
- 
-diff -rup accelio/tests/usr/hello_test/xio_server.c accelio.new/tests/usr/hello_test/xio_server.c
---- accelio/tests/usr/hello_test/xio_server.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test/xio_server.c	2015-09-03 19:46:35.777171360 -0400
-@@ -112,7 +112,7 @@ static void process_request(struct xio_m
- 	if (++cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("**** message [%lu] %s - %s\n",
-+		printf("**** message [%" PRIu64 "] %s - %s\n",
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -146,8 +146,8 @@ static int on_session_event(struct xio_s
- 		break;
- 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
- 		if (event_data->reason != XIO_E_SESSION_REJECTED) {
--			printf("last sent:%lu, last comp:%lu, " \
--			       "delta:%lu\n",
-+			printf("last sent:%" PRIu64 ", last comp:%" PRIu64 ", " \
-+			       "delta:%" PRIu64 "\n",
- 			       test_params->nsent,  test_params->ncomp,
- 			       test_params->nsent-test_params->ncomp);
- 			test_params->connection = NULL;
-@@ -257,7 +257,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	struct test_params *test_params = (struct test_params *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->request->sn, xio_strerror(error));
- 
- 	msg_pool_put(test_params->pool, msg);
-diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_client.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c
---- accelio/tests/usr/hello_test_bidi/xio_bidi_client.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c	2015-09-03 19:49:10.164887785 -0400
-@@ -114,7 +114,7 @@ static void process_request(struct xio_m
- 	if (++cnt == print_counter) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
- 
--		printf("**** request [%lu] %s - %s\n",
-+		printf("**** request [%" PRIu64 "] %s - %s\n",
- 		       (req->sn+1),
- 		       (char *)req->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -171,11 +171,11 @@ static void process_response(struct xio_
- 		double txbw = (1.0*pps*txlen/ONE_MB);
- 		double rxbw = (1.0*pps*rxlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
- 		       pps, txbw, rxbw, txlen, rxlen);
- 		get_time(timeb, 40);
--		printf("**** [%s] - response [%lu] %s - %s\n",
-+		printf("**** [%s] - response [%" PRIu64 "] %s - %s\n",
- 		       timeb, (rsp->request->sn + 1),
- 		       (char *)rsp->in.header.iov_base,
- 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
-@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	switch (msg->type) {
- 	case XIO_MSG_TYPE_REQ:
--		printf("**** [%p] message [%lu] failed. reason: %s\n",
-+		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 		msg_pool_put(pool, msg);
- 		switch (error) {
-@@ -369,7 +369,7 @@ static int on_msg_error(struct xio_sessi
- 		};
- 		break;
- 	case XIO_MSG_TYPE_RSP:
--		printf("**** [%p] message [%lu] failed. reason: %s\n",
-+		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 		/* message is no longer needed */
- 		switch (error) {
-diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_server.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c
---- accelio/tests/usr/hello_test_bidi/xio_bidi_server.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c	2015-09-03 19:49:52.860085909 -0400
-@@ -143,11 +143,11 @@ static void process_response(struct xio_
- 		double txbw = (1.0*pps*txlen/ONE_MB);
- 		double rxbw = (1.0*pps*rxlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
- 		       pps, txbw, rxbw, txlen, rxlen);
- 		get_time(timeb, 40);
--		printf("**** [%s] - response complete [%lu] %s - %s\n",
-+		printf("**** [%s] - response complete [%" PRIu64 "] %s - %s\n",
- 		       timeb, (rsp->request->sn + 1),
- 		       (char *)rsp->in.header.iov_base,
- 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
-@@ -171,7 +171,7 @@ static void process_request(struct xio_m
- 	if (++cnt == print_counter) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
- 
--		printf("**** request complete [%lu] %s - %s [%zd]\n",
-+		printf("**** request complete [%" PRIu64 "] %s - %s [%zd]\n",
- 		       (req->sn+1),
- 		       (char *)req->in.header.iov_base,
- 		       (char *)sglist[0].iov_base,
-@@ -409,7 +409,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	switch (msg->type) {
- 	case XIO_MSG_TYPE_REQ:
--		printf("**** [%p] message [%lu] failed. reason: %s\n",
-+		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 		msg_pool_put(pool, msg);
- 		switch (error) {
-@@ -422,7 +422,7 @@ static int on_msg_error(struct xio_sessi
- 		};
- 		break;
- 	case XIO_MSG_TYPE_RSP:
--		printf("**** [%p] message [%lu] failed. reason: %s\n",
-+		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 		/* message is no longer needed */
- 		switch (error) {
-diff -rup accelio/tests/usr/hello_test_lat/xio_lat_client.c accelio.new/tests/usr/hello_test_lat/xio_lat_client.c
---- accelio/tests/usr/hello_test_lat/xio_lat_client.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_lat/xio_lat_client.c	2015-09-03 19:50:51.111356220 -0400
-@@ -139,7 +139,7 @@ static void process_response(struct xio_
- 		double rxbw = (1.0*pps*rxlen/ONE_MB);
- 		double lat = (1000000.0/pps);
- 
--		printf("transactions per second: %lu, lat: %.2f us, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", lat: %.2f us, bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
- 		       pps, lat, txbw, rxbw, txlen, rxlen);
- 		get_time(timeb, 40);
-@@ -312,7 +312,7 @@ static int on_msg_error(struct xio_sessi
- 			struct xio_msg  *msg,
- 			void *cb_user_context)
- {
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(pool, msg);
-diff -rup accelio/tests/usr/hello_test_lat/xio_lat_server.c accelio.new/tests/usr/hello_test_lat/xio_lat_server.c
---- accelio/tests/usr/hello_test_lat/xio_lat_server.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_lat/xio_lat_server.c	2015-09-03 19:51:16.803475442 -0400
-@@ -103,7 +103,7 @@ static void process_request(struct xio_m
- 	if (++cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("**** message [%lu] %s - %s\n",
-+		printf("**** message [%" PRIu64 "] %s - %s\n",
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -209,7 +209,7 @@ static int on_msg_error(struct xio_sessi
- 			struct xio_msg  *msg,
- 			void *cb_user_context)
- {
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(pool, msg);
-diff -rup accelio/tests/usr/hello_test_mt/xio_mt_client.c accelio.new/tests/usr/hello_test_mt/xio_mt_client.c
---- accelio/tests/usr/hello_test_mt/xio_mt_client.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_mt/xio_mt_client.c	2015-09-03 19:47:39.218465755 -0400
-@@ -179,12 +179,12 @@ static void process_response(struct thre
- 		double txbw = (1.0*pps*tdata->stat.txlen/ONE_MB);
- 		double rxbw = (1.0*pps*tdata->stat.rxlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, " \
- 		       "RX: %zd B\n",
- 		       pps, txbw, rxbw, tdata->stat.txlen, tdata->stat.rxlen);
- 		get_time(timeb, 40);
--		printf("[%s] thread [%d] - tid:%p  - message [%lu] " \
-+		printf("[%s] thread [%d] - tid:%p  - message [%" PRIu64 "] " \
- 		       "%s - %s\n",
- 		       timeb,
- 		       tdata->affinity,
-@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
- 	struct thread_data  *tdata = (struct thread_data *)cb_user_context;
- 
- 	if (direction == XIO_MSG_DIRECTION_OUT) {
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 	} else {
- 		xio_release_response(msg);
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 	}
- 
-diff -rup accelio/tests/usr/hello_test_mt/xio_mt_server.c accelio.new/tests/usr/hello_test_mt/xio_mt_server.c
---- accelio/tests/usr/hello_test_mt/xio_mt_server.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_mt/xio_mt_server.c	2015-09-03 19:48:02.876575538 -0400
-@@ -171,7 +171,7 @@ static void process_request(struct threa
- 	if (++tdata->stat.cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("thread [%d] - message [%lu] %s - %s\n",
-+		printf("thread [%d] - message [%" PRIu64 "] %s - %s\n",
- 		       tdata->affinity,
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
-@@ -260,7 +260,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	struct thread_data	*tdata = (struct thread_data *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->request->sn, xio_strerror(error));
- 
- 	msg_pool_put(tdata->pool, msg);
-diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_client.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c
---- accelio/tests/usr/hello_test_oneway/xio_oneway_client.c	2015-09-03 19:36:25.609337510 -0400
-+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c	2015-09-03 19:54:18.142316932 -0400
-@@ -150,11 +150,11 @@ static void process_rx_message(struct ow
- 
- 		double rxbw = (1.0*pps*ow_params->rx_stat.xlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "RX: %.2f MB/s, RX: %zd B\n",
- 		       pps, rxbw, ow_params->rx_stat.xlen);
- 		get_time(timeb, 40);
--		printf("**** [%s] - message [%lu] %s - %s\n",
-+		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
- 		       timeb, (msg->sn + 1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
-@@ -202,11 +202,11 @@ static void process_tx_message(struct ow
- 
- 		double txbw = (1.0*pps*ow_params->tx_stat.xlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s,length: TX: %zd B\n",
- 		       pps, txbw, ow_params->tx_stat.xlen);
- 		get_time(timeb, 40);
--		printf("**** [%s] - message [%lu] %s - %s\n",
-+		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
- 		       timeb, (msg->sn + 1),
- 		       (char *)msg->out.header.iov_base,
- 		       (char *)(onents > 0 ? osglist[0].iov_base : NULL));
-@@ -349,7 +349,7 @@ static int on_msg_error(struct xio_sessi
- 	struct ow_test_params *ow_params =
- 				(struct ow_test_params *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(ow_params->pool, msg);
-diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_server.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c
---- accelio/tests/usr/hello_test_oneway/xio_oneway_server.c	2015-09-03 19:36:25.609337510 -0400
-+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c	2015-09-03 19:54:32.797384938 -0400
-@@ -112,7 +112,7 @@ static void process_request(struct xio_m
- 	if (++cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("**** message [%lu] %s - %s\n",
-+		printf("**** message [%" PRIu64 "] %s - %s\n",
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -299,7 +299,7 @@ static int on_msg_error(struct xio_sessi
- 	struct ow_test_params *ow_params =
- 				(struct ow_test_params *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(ow_params->pool, msg);
-diff -rup accelio/tests/usr/hello_test_ow/xio_ow_client.c accelio.new/tests/usr/hello_test_ow/xio_ow_client.c
---- accelio/tests/usr/hello_test_ow/xio_ow_client.c	2015-09-03 19:36:25.609337510 -0400
-+++ accelio.new/tests/usr/hello_test_ow/xio_ow_client.c	2015-09-03 19:52:24.905791466 -0400
-@@ -152,7 +152,7 @@ for (i = 0; i < onents; i++)
- 
- 		double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, length: TX: %zd B\n",
- 		       pps, txbw,
- 		       test_params->stat.txlen);
-@@ -181,8 +181,8 @@ static int on_session_event(struct xio_s
- 		test_params->closed = 1;
- 		break;
- 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
--		printf("nsent:%lu, ncomp:%lu, " \
--		       "delta:%lu\n",
-+		printf("nsent:%" PRIu64 ", ncomp:%" PRIu64 ", " \
-+		       "delta:%" PRIu64 "\n",
- 		       test_params->nsent, test_params->ncomp,
- 		       test_params->nsent-test_params->ncomp);
- 
-@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	struct test_params *test_params = (struct test_params *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(test_params->pool, msg);
-diff -rup accelio/tests/usr/hello_test_ow/xio_ow_server.c accelio.new/tests/usr/hello_test_ow/xio_ow_server.c
---- accelio/tests/usr/hello_test_ow/xio_ow_server.c	2015-09-03 19:36:25.609337510 -0400
-+++ accelio.new/tests/usr/hello_test_ow/xio_ow_server.c	2015-09-03 19:52:57.947944796 -0400
-@@ -110,7 +110,7 @@ static void process_request(struct xio_m
- 	if (++cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("**** message [%lu] %s - %s\n",
-+		printf("**** message [%" PRIu64 "] %s - %s\n",
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -145,7 +145,7 @@ static int on_session_event(struct xio_s
- 		xio_disconnect(event_data->conn);
- 		break;
- 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
--		printf("last recv:%lu\n",
-+		printf("last recv:%" PRIu64 "\n",
- 		       test_params->nrecv);
- 
- 		xio_connection_destroy(event_data->conn);
-@@ -215,7 +215,7 @@ static int on_msg_error(struct xio_sessi
- 			struct xio_msg  *msg,
- 			void *cb_user_context)
- {
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->request->sn, xio_strerror(error));
- 
- 	return 0;
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index e4c8b0f33bc..0af97dd3b54 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -4,7 +4,7 @@
 
 # Optional Dependencies
 , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
-, curl ? null, fuse ? null, accelio ? null, libibverbs ? null, librdmacm ? null
+, curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null
 , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null
 , rocksdb ? null, libs3 ? null
 
@@ -50,7 +50,6 @@ let
   optExpat = shouldUsePkg expat;
   optCurl = shouldUsePkg curl;
   optFuse = shouldUsePkg fuse;
-  optAccelio = shouldUsePkg accelio;
   optLibibverbs = shouldUsePkg libibverbs;
   optLibrdmacm = shouldUsePkg librdmacm;
   optLibedit = shouldUsePkg libedit;
@@ -76,10 +75,6 @@ let
   hasOsd = hasServer;
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
-  hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
-    versionAtLeast version "9.0.3" &&
-    optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
-
   hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
 
   # TODO: Reenable when kinetic support is fixed
@@ -128,8 +123,6 @@ stdenv.mkDerivation {
     optSnappy optLeveldb
   ] ++ optionals hasRadosgw [
     optFcgi optExpat optCurl optFuse optLibedit
-  ] ++ optionals hasXio [
-    optAccelio optLibibverbs optLibrdmacm
   ] ++ optionals hasRocksdb [
     optRocksdb
   ] ++ optionals hasKinetic [
@@ -192,7 +185,6 @@ stdenv.mkDerivation {
     (mkWith   (malloc == optGperftools)    "tcmalloc"             null)
     (mkEnable false                        "pgrefdebugging"       null)
     (mkEnable false                        "cephfs-java"          null)
-    (mkEnable hasXio                       "xio"                  null)
     (mkWith   (optLibatomic_ops != null)   "libatomic-ops"        null)
     (mkWith   true                         "ocf"                  null)
     (mkWith   hasKinetic                   "kinetic"              null)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3dc88a54e2..ee7f63e28a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7366,8 +7366,6 @@ with pkgs;
 
   aalib = callPackage ../development/libraries/aalib { };
 
-  accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; };
-
   accountsservice = callPackage ../development/libraries/accountsservice { };
 
   acl = callPackage ../development/libraries/acl { };
@@ -12135,8 +12133,6 @@ with pkgs;
 
     inherit kernel;
 
-    accelio = callPackage ../development/libraries/accelio { };
-
     acpi_call = callPackage ../os-specific/linux/acpi-call {};
 
     amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };

From fe101d0fb7c33f8ad28b4c0b3d47d4517c66fc5b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 23 Jul 2017 11:40:25 -0400
Subject: [PATCH 0868/3246] dpdk: 16.07.2 -> 17.05.1

---
 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 cd561df0ec4..47dc42fed5e 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.2";
+  version = "17.05.1";
 
   src = fetchurl {
     url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
-    sha256 = "1mzwazmzpq8mvwiham80y6h53qpvjpp76v0d58gz9bfiphbi9876";
+    sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld";
   };
 
   buildInputs = [ pkgconfig libvirt ];
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     install -m 0755 -d $out/${RTE_TARGET}/include
     install -m 0644 ${RTE_TARGET}/include/rte_config.h $out/${RTE_TARGET}/include
 
-    cp -pr mk scripts $out/
+    cp -pr mk $out/
 
     mkdir -p $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net
     cp ${RTE_TARGET}/kmod/*.ko $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net

From ebf5df03650968ebd36017b2f2b604aced1ddcde Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 23 Jul 2017 11:43:01 -0400
Subject: [PATCH 0869/3246] exfat-nofuse: 2017-01-03 -> 2017-06-19

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

diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index fa2939e947e..ee6249ce040 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -1,21 +1,18 @@
 { stdenv, lib, fetchFromGitHub, kernel }:
 
-# Upstream build for kernel > 4.10 is currently broken
-# Reference: https://github.com/dorimanx/exfat-nofuse/issues/103
-assert lib.versionOlder kernel.version "4.10";
 
 # Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working
 assert lib.versionAtLeast kernel.version  "4.2" || lib.versionOlder kernel.version "4.0";
 
 stdenv.mkDerivation rec {
   name = "exfat-nofuse-${version}-${kernel.version}";
-  version = "2017-01-03";
+  version = "2017-06-19";
 
   src = fetchFromGitHub {
     owner = "dorimanx";
     repo = "exfat-nofuse";
-    rev = "8d291f5";
-    sha256 = "0lg1mykglayswli2aliw8chsbr4g629v9chki5975avh43jn47w9";
+    rev = "de4c760bc9a05ead83bc3ec6eec6cf1fb106f523";
+    sha256 = "0v979d8sbcb70lakm4jal2ck3gspkdgq9108k127f7ph08vf8djm";
   };
 
   hardeningDisable = [ "pic" ];

From 7e2a478bad51bbd7c7cc0c231d7fa401c01b38f7 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 23 Jul 2017 13:30:21 -0300
Subject: [PATCH 0870/3246] jwm: 1594 -> 1600

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

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 40050a69025..85136cb9f97 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1594";
+  version = "1600";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "1608ws3867xipcbdl2gw6ybcxzk14vq24sr62m9l65m4g4m3wbd2";
+    sha256 = "0rfb67r6g873alvcbn9531415qlfmvfrdfm4xrsyhdgdwj7dv5kv";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];

From 2347e593bfb6f86689ee4c84e26caf28aadb9767 Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Sun, 23 Jul 2017 12:09:48 -0500
Subject: [PATCH 0871/3246] libextractor: 1.3 -> 1.4

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

diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 0f21180f691..a6fb4ec515a 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
 assert videoSupport -> ffmpeg != null && libmpeg2 != null;
 
 stdenv.mkDerivation rec {
-  name = "libextractor-1.3";
+  name = "libextractor-1.4";
 
   src = fetchurl {
     url = "mirror://gnu/libextractor/${name}.tar.gz";
-    sha256 = "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6";
+    sha256 = "0v7ns5jhsyp1wzvbaydfgxnva5zd63gkzm9djhckmam9liq824l4";
   };
 
   preConfigure =

From 0304177ced11eb95929ea3ed472c3c6b847b6511 Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Mon, 24 Jul 2017 05:38:06 +1000
Subject: [PATCH 0872/3246] setroot: 1.4.4 -> 2.0.1

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

diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix
index 81b888ccb78..2245f03ec7f 100644
--- a/pkgs/tools/X11/setroot/default.nix
+++ b/pkgs/tools/X11/setroot/default.nix
@@ -5,14 +5,14 @@
 assert enableXinerama -> libXinerama != null;
 
 stdenv.mkDerivation rec {
-  version = "1.4.4";
+  version = "2.0.1";
   name = "setroot-${version}";
 
   src = fetchFromGitHub {
     owner = "ttzhou";
     repo = "setroot";
     rev = "v${version}";
-    sha256 = "0vphma0as8pnqrakdw6gaiiz7xawb4y72sc9dna755kkclgbyl8m";
+    sha256 = "01krjfc3xpp0wbqz9nvf1n34gkpd41gysn289sj1wcjxia4n4gsi";
   };
 
   buildInputs = [ libX11 imlib2 ]
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     description = "Simple X background setter inspired by imlibsetroot and feh";
     homepage = https://github.com/ttzhou/setroot;
     license = licenses.gpl3Plus;
+    maintainers = maintainers.vyp;
     platforms = platforms.unix;
   };
 }

From c355fd85ed3b5b85f8bbf0d84e3e419d6d8142c0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 23 Jul 2017 11:02:42 -0400
Subject: [PATCH 0873/3246] cryptodev: 1.8 -> 1.9

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

diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
index 46b5fcb0bf9..4ffd8fadd12 100644
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -1,25 +1,27 @@
 { fetchurl, stdenv, kernel, onlyHeaders ? false }:
 
 stdenv.mkDerivation rec {
-  pname = "cryptodev-linux-1.8";
+  pname = "cryptodev-linux-1.9";
   name = "${pname}-${kernel.version}";
 
   src = fetchurl {
-    url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz";
-    sha256 = "0xhkhcdlds9aiz0hams93dv0zkgcn2abaiagdjlqdck7zglvvyk7";
+    urls = [
+      "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz"
+      "http://download.gna.org/cryptodev-linux/${pname}.tar.gz"
+    ];
+    sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z";
   };
 
   hardeningDisable = [ "pic" ];
 
   KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
   INSTALL_MOD_PATH = "\${out}";
-  PREFIX = "\${out}";
+  prefix = "\${out}";
 
   meta = {
     description = "Device that allows access to Linux kernel cryptographic drivers";
     homepage = http://home.gna.org/cryptodev-linux/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
-    broken = !stdenv.lib.versionOlder kernel.version "4.9";
   };
 }

From 63190540a894548249ff7550b964b2fbc709ef8b Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 23 Jul 2017 23:08:39 +0200
Subject: [PATCH 0874/3246] wireguard: sometimes module tries to re-add the
 default route, which fails - use replace to make it succeed

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

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index d5b21ef1a23..be832ea45d8 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -208,7 +208,7 @@ let
             "${ipCommand} link set up dev ${name}"
 
             (map (peer: (map (ip:
-            "${ipCommand} route add ${ip} dev ${name}"
+            "${ipCommand} route replace ${ip} dev ${name}"
             ) peer.allowedIPs)) values.peers)
 
             values.postSetup

From adf756d4f7816bf5144720e70782f5a357289c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 23 Jul 2017 23:05:31 +0200
Subject: [PATCH 0875/3246] rustRegistry: 2017-06-27 -> 2017-07-23

---
 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 5e280fb91c4..1caef26322d 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,13 +7,13 @@
 { stdenv, fetchFromGitHub, git }:
 
 stdenv.mkDerivation {
-  name = "rustRegistry-2017-07-17";
+  name = "rustRegistry-2017-07-23";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "crates.io-index";
-    rev = "14f1d497ede721229b23ad1e8b6122f34761f1a6";
-    sha256 = "1a9aav9yg7ffrilsnzlbaysxgzfzg455jfdh260n9y6wvpnpfvg9";
+    rev = "ed8e6a6761278861db046073cc69d6a5e7dd8c15";
+    sha256 = "1v72m0h31xcay2m64n2wil5wqnl8z4n4adxxpdllcpgj3pj5jai6";
   };
   phases = [ "unpackPhase" "installPhase" ];
   installPhase = ''

From 1d1735ce0f212ed634b5ab3b0d264f96aff2975d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 23 Jul 2017 23:09:54 +0200
Subject: [PATCH 0876/3246] nix-index: init at 0.1.0

---
 .../package-management/nix-index/default.nix  | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/package-management/nix-index/default.nix

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
new file mode 100644
index 00000000000..388942f6ad8
--- /dev/null
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -0,0 +1,32 @@
+{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "nix-index-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "bennofs";
+    repo = "nix-index";
+    rev = "v${version}";
+    sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5";
+  };
+  depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl";
+  buildInputs = [pkgconfig openssl curl];
+
+  postInstall = ''
+    mkdir -p $out/etc/profile.d
+    cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh
+    substituteInPlace $out/etc/profile.d/command-not-found.sh \
+      --replace "@out@" "$out"
+  '';
+
+  meta = with lib; {
+    description = "A files database for nixpkgs";
+    homepage = https://github.com/bennofs/nix-index;
+    license = with licenses; [ bsd3 ];
+    maintainers = [ maintainers.bennofs ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3dc88a54e2..45d78e33794 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18674,6 +18674,8 @@ with pkgs;
 
   nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; };
 
+  nix-index = callPackage ../tools/package-management/nix-index { };
+
   inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
     nix-prefetch-bzr
     nix-prefetch-cvs

From 97cc4fdd9ecd3329aabf579fb4f884badd39a7a4 Mon Sep 17 00:00:00 2001
From: David Asabina <vid@bina.me>
Date: Mon, 24 Jul 2017 00:57:21 +0200
Subject: [PATCH 0877/3246] qesteidutil: 3.12.2.1206 -> 3.12.5.1233

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

diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index e05dee4ef9a..e2b831f583c 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
 
-  version = "3.12.2.1206";
+  version = "3.12.5.1233";
   name = "qesteidutil-${version}";
   
   src = fetchurl {
-    url = "https://installer.id.ee/media/ubuntu/pool/main/q/qesteidutil/qesteidutil_3.12.2.1206.orig.tar.xz";
-    sha256 = "1v1i0jlycjjdg6wi4cpm1il5v1zn8dfj82mrfvsjy6j9rfzinkda";
+    url = "https://installer.id.ee/media/ubuntu/pool/main/q/qesteidutil/qesteidutil_${version}.orig.tar.xz";
+    sha256 = "b5f0361af1891cfab6f9113d6b2fab677cc4772fc18b62df7d6e997f13b97857";
   };
 
   unpackPhase = ''

From dcd6467936bfcebd6db6885562ffba0ef5cef7ea Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 23 Jul 2017 23:58:11 +0800
Subject: [PATCH 0878/3246] xxd: init at 8.0.0442

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

diff --git a/pkgs/tools/misc/xxd/default.nix b/pkgs/tools/misc/xxd/default.nix
new file mode 100644
index 00000000000..a4cfd4321ba
--- /dev/null
+++ b/pkgs/tools/misc/xxd/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, vim }:
+
+stdenv.mkDerivation rec {
+  name = "xxd-${version}";
+  inherit (vim) version;
+  phases = [ "installPhase" ];
+  installPhase = ''
+    mkdir -p $out/{bin,share/man/man1}
+    install -m755 ${stdenv.lib.getBin vim}/bin/xxd $out/bin/xxd
+    install -m644 ${stdenv.lib.getBin vim}/share/man/man1/xxd.1.gz $out/share/man/man1/xxd.1.gz
+  '';
+  meta = with stdenv.lib; {
+    description = "Make a hexdump or do the reverse.";
+    inherit (vim.meta) homepage license maintainers platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45d78e33794..4b9f9d7ae6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16443,6 +16443,8 @@ with pkgs;
     flags = [ "python" "X11" ]; # only flag "X11" by now
   });
 
+  xxd = callPackage ../tools/misc/xxd { };
+
   vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
 
   qpdfview = callPackage ../applications/misc/qpdfview {};

From 0345aed90c3d76e10aa0db6de9dab48f3ed9d3ca Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 24 Jul 2017 09:25:16 +0800
Subject: [PATCH 0879/3246] mfcj6510dwlpr: use new xxd package instead of vim

---
 pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index ee14e4a52db..228f56d47ae 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, vimNox
+{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, xxd
 , ghostscript, a2ps }:
 
 # Why:
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     ${utillinux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \
     sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a36353130647766756e63000000000000000000000000000000000000000000.' | \
     sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726D66636A3635313064777263000000000000000000000000000000000000000000.' | \
-    ${vimNox}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched
+    ${xxd}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched
     chmod +x $out/usr/bin/brprintconf_mfcj6510dw_patched
     #executing from current dir. segfaults if it's not r\w.
     mkdir -p $out/bin
@@ -79,11 +79,11 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.brother.com/;
-    description = "Brother MFC-J6510DW LPR driver";
-    license = with licenses; unfree;
-    platforms = with platforms; linux;
+    description  = "Brother MFC-J6510DW LPR driver";
     downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128;
-    maintainers = with maintainers; [ ramkromberg ];
+    homepage     = http://www.brother.com/;
+    license      = with licenses; unfree;
+    maintainers  = with maintainers; [ ramkromberg ];
+    platforms    = with platforms; linux;
   };
 }

From 45248be2aa15dc2fc450061dfbd7de88c0186eed Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 24 Jul 2017 09:25:27 +0800
Subject: [PATCH 0880/3246] cryptominisat: use new xxd package instead of vim

---
 .../science/logic/cryptominisat/default.nix     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index 26efbc5fe72..4d96339149a 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, vim }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd }:
 
 stdenv.mkDerivation rec {
   name = "cryptominisat-${version}";
   version = "5.0.1";
 
   src = fetchFromGitHub {
-    owner = "msoos";
-    repo = "cryptominisat";
-    rev = version;
+    owner  = "msoos";
+    repo   = "cryptominisat";
+    rev    = version;
     sha256 = "0cpw5d9vplxvv3aaplhnga55gz1hy29p7s4pkw1306knkbhlzvkb";
   };
 
-  # vim for xxd binary
-  buildInputs = [ python vim ];
+  buildInputs = [ python xxd ];
   nativeBuildInputs = [ cmake ];
 
   patches = [(fetchpatch rec {
@@ -23,9 +22,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An advanced SAT Solver";
+    homepage    = https://github.com/msoos/cryptominisat;
+    license     = licenses.mit;
     maintainers = with maintainers; [ mic92 ];
-    platforms = platforms.unix;
-    license = licenses.mit;
-    homepage = https://github.com/msoos/cryptominisat;
+    platforms   = platforms.unix;
   };
 }

From ee6edb8af5f0dcaf35b89ebf7a64ab6ae07605cf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 23 Jul 2017 17:33:11 -0400
Subject: [PATCH 0881/3246] virtualbox: 5.1.22 -> 5.1.24

---
 .../virtualization/virtualbox/default.nix     | 10 +--
 .../virtualbox/guest-additions/default.nix    |  5 +-
 .../virtualbox/linux-4.12.patch               | 80 -------------------
 3 files changed, 6 insertions(+), 89 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/virtualbox/linux-4.12.patch

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6675068bda9..a67663d56df 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,10 +18,10 @@ with stdenv.lib;
 let
   python = python2;
   buildType = "release";
-  extpack = "244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf";
-  extpackRev = "115126";
-  main = "fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899";
-  version = "5.1.22";
+  extpack = "1952ikz4xsjgdd0pzdx1riwaingyhkxp0ind31yzqc4d0hp8l6b5";
+  extpackRev = "117012";
+  main = "0q5vjsih4ndn1b0s9l1ppxng6dljld5bin5nqfrhvgr2ldlv2bgf";
+  version = "5.1.24";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
@@ -88,7 +88,7 @@ in stdenv.mkDerivation {
   '';
 
   patches = optional enableHardening ./hardened.patch
-    ++ [ ./qtx11extras.patch ./linux-4.12.patch ];
+    ++ [ ./qtx11extras.patch ];
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 8865022c23e..e19cb748607 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380";
+    sha256 = "0hxxv2707fb6x34m5cmjhj73sxwgmy2dgir7mbbdh9wivw07b9q1";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
@@ -62,9 +62,6 @@ stdenv.mkDerivation {
     for i in *
     do
         cd $i
-        # Files within the guest additions ISO are using DOS line endings
-        sed -re '/^(@@|---|\+\+\+)/!s/$/\r/' ${../linux-4.12.patch} \
-          | patch -d vboxguest -p4
         find . -type f | xargs sed 's/depmod -a/true/' -i
         make
         cd ..
diff --git a/pkgs/applications/virtualization/virtualbox/linux-4.12.patch b/pkgs/applications/virtualization/virtualbox/linux-4.12.patch
deleted file mode 100644
index 7157365466f..00000000000
--- a/pkgs/applications/virtualization/virtualbox/linux-4.12.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-commit 47fee9325e3b5feed0dbc4ba9e2de77c6d55e3bb
-Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date:   Wed May 17 09:42:23 2017 +0000
-
-    Runtime/r0drv: Linux 4.12 5-level page table adaptions
-    
-    
-    git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@66927 cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-index 28dc33f963..41ed058860 100644
---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -902,6 +902,9 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)
-     union
-     {
-         pgd_t       Global;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-+        p4d_t       Four;
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
-         pud_t       Upper;
- #endif
-@@ -917,12 +920,26 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)
-     u.Global = *pgd_offset(current->active_mm, ulAddr);
-     if (RT_UNLIKELY(pgd_none(u.Global)))
-         return NULL;
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-+    u.Four  = *p4d_offset(&u.Global, ulAddr);
-+    if (RT_UNLIKELY(p4d_none(u.Four)))
-+        return NULL;
-+    if (p4d_large(u.Four))
-+    {
-+        pPage = p4d_page(u.Four);
-+        AssertReturn(pPage, NULL);
-+        pfn   = page_to_pfn(pPage);      /* doing the safe way... */
-+        AssertCompile(P4D_SHIFT - PAGE_SHIFT < 31);
-+        pfn  += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (P4D_SHIFT - PAGE_SHIFT)) - 1);
-+        return pfn_to_page(pfn);
-+    }
-+    u.Upper = *pud_offset(&u.Four, ulAddr);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
-     u.Upper = *pud_offset(&u.Global, ulAddr);
-+#endif
-     if (RT_UNLIKELY(pud_none(u.Upper)))
-         return NULL;
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
-     if (pud_large(u.Upper))
-     {
-         pPage = pud_page(u.Upper);
-@@ -931,8 +948,8 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)
-         pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (PUD_SHIFT - PAGE_SHIFT)) - 1);
-         return pfn_to_page(pfn);
-     }
--# endif
--
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
-     u.Middle = *pmd_offset(&u.Upper, ulAddr);
- #else  /* < 2.6.11 */
-     u.Middle = *pmd_offset(&u.Global, ulAddr);
-diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-index 5afdee9e71..20aab0817f 100644
---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-@@ -159,6 +159,11 @@
- # include <asm/tlbflush.h>
- #endif
- 
-+/* for set_pages_x() */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-+# include <asm/set_memory.h>
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
- # include <asm/smap.h>
- #else

From f4a8e6ab7f4e1c6d7499a1660fbd5c655ad0a805 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 24 Jul 2017 04:10:47 +0200
Subject: [PATCH 0882/3246] znapzend: 0.15.7 -> 0.17.0

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

diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 311df908689..cacfb8287a3 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
 
 let
-  version = "0.15.7";
-  checksum = "1xb94kxfq9sm3g0s6wpyyz6h2aihgca5gyybg0a5r8sar7yz97j0";
+  version = "0.17.0";
+  checksum = "0cncwkiw0w2am7gwi01p6ln87zgg1x6blfyxx7n7x8m1mv6704hl";
 in
 stdenv.mkDerivation rec {
   name = "znapzend-${version}";

From b087618ac06256cb3c06278e7eaba45841f4ea91 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 24 Jul 2017 00:53:13 -0400
Subject: [PATCH 0883/3246] Revert "stdenv: Store one package per line in
 nix-support/propagated-*"

As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.

This reverts commit 3cb745d5a69018829ac15f7d5a508135f6bda123.

[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
---
 pkgs/build-support/cc-wrapper/default.nix     |  4 ++--
 pkgs/build-support/gcc-wrapper-old/builder.sh |  2 +-
 .../setup-hooks/multiple-outputs.sh           |  2 +-
 pkgs/build-support/trivial-builders.nix       |  2 +-
 .../desktops/kde-4.14/kde-package/default.nix |  2 +-
 .../compilers/openjdk-darwin/8.nix            |  2 +-
 .../compilers/openjdk-darwin/default.nix      |  2 +-
 pkgs/development/compilers/openjdk/7.nix      |  2 +-
 pkgs/development/compilers/openjdk/8.nix      |  2 +-
 .../compilers/oraclejdk/jdk-linux-base.nix    |  2 +-
 pkgs/development/compilers/zulu/default.nix   |  2 +-
 .../haskell-modules/generic-builder.nix       |  2 +-
 pkgs/misc/misc.nix                            |  2 +-
 pkgs/stdenv/generic/builder.sh                |  5 ++---
 pkgs/stdenv/generic/setup.sh                  | 20 ++++++-------------
 15 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 37d62891ecf..676fbd00688 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -275,9 +275,9 @@ stdenv.mkDerivation {
       # Propagate the wrapped cc so that if you install the wrapper,
       # you get tools like gcov, the manpages, etc. as well (including
       # for binutils and Glibc).
-      printLines ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
+      echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
 
-      printLines ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
+      echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
     ''
 
     + optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh
index 4f141f6b8f2..a8e8a370ec0 100644
--- a/pkgs/build-support/gcc-wrapper-old/builder.sh
+++ b/pkgs/build-support/gcc-wrapper-old/builder.sh
@@ -211,5 +211,5 @@ cp -p $utils $out/nix-support/utils.sh
 # tools like gcov, the manpages, etc. as well (including for binutils
 # and Glibc).
 if test -z "$nativeTools"; then
-    printLines $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages
+    echo $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages
 fi
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 9abf50f6ea4..62a6491b8dc 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -202,7 +202,7 @@ _multioutPropagateDev() {
 
     mkdir -p "${!propagaterOutput}"/nix-support
     for output in $propagatedBuildOutputs; do
-        echo "${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
+        echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
     done
 }
 
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 1ee1fe8298f..4debd963639 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -84,7 +84,7 @@ rec {
         mkdir -p $out/nix-support
         cp ${script} $out/nix-support/setup-hook
       '' + lib.optionalString (deps != []) ''
-        printLines ${toString deps} > $out/nix-support/propagated-native-build-inputs
+        echo ${toString deps} > $out/nix-support/propagated-native-build-inputs
       '' + lib.optionalString (substitutions != {}) ''
         substituteAll ${script} $out/nix-support/setup-hook
       '');
diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix
index 3637d9f89cb..d5de6f5f6bc 100644
--- a/pkgs/desktops/kde-4.14/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/default.nix
@@ -86,7 +86,7 @@ rec {
        };})
         ''
           mkdir -pv $out/nix-support
-          printLines ${toString list} | tee $out/nix-support/propagated-user-env-packages
+          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
         '';
 
   # Given manifest module data, return the module
diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
index 691829c7788..51effd2c784 100644
--- a/pkgs/development/compilers/openjdk-darwin/8.nix
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -33,7 +33,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $out/nix-support
-      printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
 
       install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
 
diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index 8ce0835fcb6..10a9eb2b366 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -23,7 +23,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $out/nix-support
-      printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
 
       install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
 
diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix
index 9ef7d26b2ef..6dcbb0a330f 100644
--- a/pkgs/development/compilers/openjdk/7.nix
+++ b/pkgs/development/compilers/openjdk/7.nix
@@ -190,7 +190,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $jre/nix-support
-      printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
+      echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
 
       # Set JAVA_HOME automatically.
       mkdir -p $out/nix-support
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 7c50872ebe5..7977881d5f6 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -202,7 +202,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $jre/nix-support
-      printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
+      echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
 
       # Set JAVA_HOME automatically.
       mkdir -p $out/nix-support
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 08fd724f773..6db0029730a 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -165,7 +165,7 @@ let result = stdenv.mkDerivation rec {
     ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
 
     mkdir -p $out/nix-support
-    printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
+    echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
 
     # Set JAVA_HOME automatically.
     cat <<EOF >> $out/nix-support/setup-hook
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 03be4ee8a0b..c4cdf70f14a 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
     find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
 
     mkdir -p $out/nix-support
-    printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
+    echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
 
     # Set JAVA_HOME automatically.
     cat <<EOF >> $out/nix-support/setup-hook
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index e097fd5af33..97a3adaf220 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -311,7 +311,7 @@ stdenv.mkDerivation ({
     ${optionalString isGhcjs ''
       for exeDir in "$out/bin/"*.jsexe; do
         exe="''${exeDir%.jsexe}"
-        printLines '#!${nodejs}/bin/node' > "$exe"
+        printf '%s\n' '#!${nodejs}/bin/node' > "$exe"
         cat "$exeDir/all.js" >> "$exe"
         chmod +x "$exe"
       done
diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix
index 6e8c6f4486f..6357c4e6f90 100644
--- a/pkgs/misc/misc.nix
+++ b/pkgs/misc/misc.nix
@@ -23,7 +23,7 @@ in
   */
   collection = {list, name} : runCommand "collection-${name}" {} ''
     mkdir -p $out/nix-support
-    printLines ${builtins.toString list} > $out/nix-support/propagated-user-env-packages
+    echo ${builtins.toString list} > $out/nix-support/propagated-user-env-packages
   '';
 
   /* creates a derivation symlinking references C/C++ libs into one include and lib directory called $out/cdt-envs/${name}
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index f8c0fd44ac7..a46c46c2db5 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -1,3 +1,4 @@
+export PATH=
 for i in $initialPath; do
     if [ "$i" = / ]; then i=; fi
     PATH=$PATH${PATH:+:}$i/bin
@@ -14,6 +15,4 @@ cat "$setup" >> $out/setup
 # Allow the user to install stdenv using nix-env and get the packages
 # in stdenv.
 mkdir $out/nix-support
-if [ "$propagatedUserEnvPkgs" ]; then
-    printf '%s\n' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
-fi
+echo $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index de94565ed6d..e5d2ba8682d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -215,11 +215,6 @@ isScript() {
     if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi
 }
 
-# printf unfortunately will print a trailing newline regardless
-printLines() {
-    [[ $# -gt 0 ]] || return 0
-    printf '%s\n' "$@"
-}
 
 ######################################################################
 # Initialisation.
@@ -305,12 +300,9 @@ findInputs() {
     fi
 
     if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then
-        local fd pkgNext
-        exec {fd}<"$pkg/nix-support/$propagatedBuildInputsFile"
-        while IFS= read -r -u $fd pkgNext; do
-            findInputs "$pkgNext" $var $propagatedBuildInputsFile
+        for i in $(cat "$pkg/nix-support/$propagatedBuildInputsFile"); do
+            findInputs "$i" $var $propagatedBuildInputsFile
         done
-        exec {fd}<&-
     fi
 }
 
@@ -802,17 +794,17 @@ fixupPhase() {
         fi
         if [ -n "$propagated" ]; then
             mkdir -p "${!outputDev}/nix-support"
-            printLines $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs"
+            echo "$propagated" > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     else
         if [ -n "$propagatedBuildInputs" ]; then
             mkdir -p "${!outputDev}/nix-support"
-            printLines $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"
+            echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs"
         fi
 
         if [ -n "$propagatedNativeBuildInputs" ]; then
             mkdir -p "${!outputDev}/nix-support"
-            printLines $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"
+            echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     fi
 
@@ -825,7 +817,7 @@ fixupPhase() {
 
     if [ -n "$propagatedUserEnvPkgs" ]; then
         mkdir -p "${!outputBin}/nix-support"
-        printLines $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
+        echo "$propagatedUserEnvPkgs" > "${!outputBin}/nix-support/propagated-user-env-packages"
     fi
 
     runHook postFixup

From 52deb4b46058b10a50af2b6dc04ff01c62f78c35 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 24 Jul 2017 13:19:45 +0300
Subject: [PATCH 0884/3246] maxx: 1.0.0 -> 1.1.0

---
 .../services/x11/desktop-managers/maxx.nix        |  2 +-
 pkgs/desktops/maxx/default.nix                    | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
index 258348ee749..bceb23c276e 100644
--- a/nixos/modules/services/x11/desktop-managers/maxx.nix
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -13,7 +13,7 @@ in {
     extraPackages = mkOption {
       type = with types; listOf package;
       default = with pkgs; [
-        xorg.xclock
+        xorg.xclock xsettingsd
       ];
       description = ''
         Extra packages visible to session.
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 95cbd617dc2..8cceb5a05d3 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl
 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
-, libXinerama, libXdamage, libICE, libXtst
-, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses5
+, libXinerama, libXdamage, libICE, libXtst, libXaw
+, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses
 , bash }:
 
 let
-  version = "Indy-1.0.0";
+  version = "Indy-1.1.0";
 
   deps = [
     libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
-    libXinerama libXdamage libICE libXtst
-    stdenv.cc.cc fontconfig pango cairo glib libxml2 atk gtk2 gdk_pixbuf mesa_noglu ncurses5
+    libXinerama libXdamage libICE libXtst libXaw
+    stdenv.cc.cc fontconfig pango cairo glib libxml2 atk gtk2 gdk_pixbuf mesa_noglu ncurses
   ];
 in stdenv.mkDerivation {
   name = "MaXX-${version}";
@@ -18,11 +18,11 @@ in stdenv.mkDerivation {
   srcs = [
     (fetchurl {
       url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-NO-ARCH.tar.gz";
-      sha256 = "004ia6xl8y2hmbq7j98ppgiwffjc62224x9q6w5z17sjibs8xcvx";
+      sha256 = "1d23j08wwrrn5cp7csv70pcz9jppcn0xb1894wkp0caaliy7g31y";
     })
     (fetchurl {
       url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-x86_64.tar.gz";
-      sha256 = "134z7hinh01w43m6xiqgh939w5w79860g4kzsd911rfcl3z353av";
+      sha256 = "156p2lra184wyvibrihisd7cr1ivqaygsf0zfm26a12gx23b7708";
     })
   ];
 
@@ -47,7 +47,6 @@ in stdenv.mkDerivation {
 
     mv -- ./* "$maxx"
     ln -s $maxx/share/icons $out/share
-    ln -s $maxx/share/themes $out/share
   '';
 
   meta = with stdenv.lib; {

From 29540286ec2781f81801163d0ccd12f0fdc0ebc6 Mon Sep 17 00:00:00 2001
From: Glenn Searby <glenn.searby@cse.org.uk>
Date: Mon, 24 Jul 2017 11:42:49 +0100
Subject: [PATCH 0885/3246] future module needs to be imported even if we are
 running under Python 3.

---
 pkgs/development/python-modules/linode-api/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index 869d4d50ea4..e754bf5d4a7 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -15,13 +15,10 @@ buildPythonPackage rec {
 
   disabled = (pythonOlder "2.7");
 
-  propagatedBuildInputs = [ requests ]
-                             ++ stdenv.lib.optionals (!isPy3k) [ future ]
+  propagatedBuildInputs = [ requests future ]
                              ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
 
-  postPatch = (stdenv.lib.optionalString (isPy3k) ''
-    sed -i -e '/"future",/d' setup.py
-  '') + (stdenv.lib.optionalString (!pythonOlder "3.4") ''
+  postPatch = (stdenv.lib.optionalString (!pythonOlder "3.4") ''
     sed -i -e '/"enum34",/d' setup.py
   '');
 

From 12855b3d17d1cf3303538212da22aad8538527a6 Mon Sep 17 00:00:00 2001
From: Glenn Searby <glenn.searby@cse.org.uk>
Date: Mon, 24 Jul 2017 12:21:08 +0100
Subject: [PATCH 0886/3246] Disabled tests (since there don't seem to be any).

---
 pkgs/development/python-modules/linode-api/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index e754bf5d4a7..a89596828f6 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "4.1.1b2";
+  version = "4.1.1b2"; # NOTE: this is a beta, and the API may change in future versions.
   name = "${pname}-${version}";
 
   disabled = (pythonOlder "2.7");
@@ -22,6 +22,8 @@ buildPythonPackage rec {
     sed -i -e '/"enum34",/d' setup.py
   '');
 
+  doCheck = false; # This library does not have any tests at this point.
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "1lfqsll3wv1wzn98ymmcbw0yawj8ab3mxniws6kaxf99jd4a0xp4";

From a3007a39c5b44109cc554af99624aa4f16005ff5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Jul 2017 13:39:24 +0200
Subject: [PATCH 0887/3246] mpg123: update to version 1.25.4

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

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 59012432caf..37717babce4 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mpg123-1.23.8";
+  name = "mpg123-1.25.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
-    sha256 = "13ngfzk84k4ks7ymanmq8f6707yrybra5h0mk3ir6mdnxk4068yy";
+    sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd";
   };
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

From 969d7b0451c0ac68a99dbb09f3e50a4710466f43 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Jul 2017 14:15:15 +0200
Subject: [PATCH 0888/3246] gnumake380: Remove

This hasn't been used in a long time.
---
 .../build-managers/gnumake/3.80/default.nix   |  18 ---
 .../build-managers/gnumake/3.80/log.patch     | 125 ------------------
 pkgs/top-level/all-packages.nix               |   1 -
 3 files changed, 144 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/3.80/default.nix
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/3.80/log.patch

diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix
deleted file mode 100644
index ad855df7353..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "gnumake-3.80";
-
-  src = fetchurl {
-    url = http://tarballs.nixos.org/make-3.80.tar.bz2;
-    sha256 = "06rgz6npynr8whmf7rxgkyvcz0clf3ggwf4cyhj3fcscn3kkk6x9";
-  };
-
-  patches = [./log.patch];
-
-  hardeningDisable = [ "format" ];
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/log.patch b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch
deleted file mode 100644
index fa90acfe8de..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/3.80/log.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -rc make-3.80-orig/job.c make-3.80/job.c
-*** make-3.80-orig/job.c	2002-08-10 03:27:17.000000000 +0200
---- make-3.80/job.c	2004-04-02 17:38:04.000000000 +0200
-***************
-*** 987,993 ****
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! 	   ? "%s" : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
---- 987,993 ----
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! 	   ? "\e[3s\e[a%s\e[b" : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
-diff -rc make-3.80-orig/main.c make-3.80/main.c
-*** make-3.80-orig/main.c	2002-08-10 03:27:17.000000000 +0200
---- make-3.80/main.c	2004-04-02 17:42:50.000000000 +0200
-***************
-*** 254,259 ****
---- 254,263 ----
-     they appear out of date or not.  */
-  
-  int always_make_flag = 0;
-+ 
-+ int logNestingStdout = 0;
-+ int logNestingStderr = 0;
-+ 
-  
-  /* The usage output.  We write it this way to make life easier for the
-     translators, especially those trying to translate to right-to-left
-***************
-*** 827,832 ****
---- 831,845 ----
-  }
-  
-  
-+ static void closeNesting()
-+ {
-+   while (logNestingStdout--)
-+     printf("\e[q");
-+   while (logNestingStderr--)
-+     fprintf(stderr, "\e[q");
-+ }
-+ 
-+ 
-  #ifndef _AMIGA
-  int
-  main (argc, argv, envp)
-***************
-*** 854,859 ****
---- 867,874 ----
-    no_default_sh_exe = 1;
-  #endif
-  
-+   atexit(closeNesting);
-+ 
-    default_goal_file = 0;
-    reading_file = 0;
-  
-***************
-*** 2782,2787 ****
---- 2797,2808 ----
-  
-    /* Use entire sentences to give the translators a fighting chance.  */
-  
-+   if (entering)
-+     {
-+       printf("\e[p");
-+       logNestingStdout++;
-+     }
-+   
-    if (makelevel == 0)
-      if (starting_directory == 0)
-        if (entering)
-***************
-*** 2810,2813 ****
---- 2831,2840 ----
-        else
-          printf (_("%s[%u]: Leaving directory `%s'\n"),
-                  program, makelevel, starting_directory);
-+ 
-+   if (!entering)
-+     {
-+       printf("\e[q");
-+       logNestingStdout--;
-+     }
-  }
-diff -rc make-3.80-orig/make.h make-3.80/make.h
-*** make-3.80-orig/make.h	2002-09-11 18:55:44.000000000 +0200
---- make-3.80/make.h	2004-04-02 17:42:15.000000000 +0200
-***************
-*** 559,562 ****
---- 559,567 ----
-  extern int atomic_stat PARAMS ((const char *file, struct stat *buf));
-  extern struct dirent *atomic_readdir PARAMS ((DIR *dir));
-  
-+ 
-  #endif
-+ 
-+ 
-+ extern int logNestingStdout;
-+ extern int logNestingStderr;
-diff -rc make-3.80-orig/remake.c make-3.80/remake.c
-*** make-3.80-orig/remake.c	2002-08-08 02:11:19.000000000 +0200
---- make-3.80/remake.c	2004-04-04 23:10:19.000000000 +0200
-***************
-*** 1049,1055 ****
---- 1049,1059 ----
-        /* The normal case: start some commands.  */
-        if (!touch_flag || file->cmds->any_recurse)
-  	{
-+           fprintf(stderr, "\e[pbuilding %s\n", file->name);
-+           logNestingStderr++;
-  	  execute_file_commands (file);
-+           fprintf(stderr, "\e[q");
-+           logNestingStderr--;
-  	  return;
-  	}
-  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08024b888ea..ece41e7cb81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6891,7 +6891,6 @@ with pkgs;
 
   gnum4 = callPackage ../development/tools/misc/gnum4 { };
 
-  gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
   gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
   gnumake3 = gnumake382;
   gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { };

From 8cfe77444bb73331f6766367c8c43bd8abd4b3e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Jul 2017 14:17:36 +0200
Subject: [PATCH 0889/3246] gnumake40: Remove unused version

---
 .../4.0/darwin-library_search-dylib.patch     | 17 -------
 .../build-managers/gnumake/4.0/default.nix    | 49 -------------------
 .../gnumake/4.0/impure-dirs.patch             | 34 -------------
 pkgs/top-level/all-packages.nix               |  1 -
 4 files changed, 101 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.0/default.nix
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch

diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch
deleted file mode 100644
index de7e4f61521..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixed default libpatttern on Darwin, imported from prefix overlay.
-Got merged upstream:
-https://savannah.gnu.org/bugs/?37197
---- default.c.orig	2009-05-02 12:25:24 +0200
-+++ default.c	2009-05-02 12:25:58 +0200
-@@ -509,7 +509,11 @@
- #ifdef __MSDOS__
-     ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
- #else
-+#ifdef __APPLE__
-+    ".LIBPATTERNS", "lib%.dylib lib%.a",
-+#else
-     ".LIBPATTERNS", "lib%.so lib%.a",
-+#endif
- #endif
- #endif
- 
diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix
deleted file mode 100644
index a4128ac854c..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{stdenv, fetchurl}:
-
-let version = "4.0"; in
-stdenv.mkDerivation {
-  name = "gnumake-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/make/make-${version}.tar.bz2";
-    sha256 = "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6";
-  };
-
-  /* On Darwin, there are 3 test failures that haven't been investigated
-     yet.  */
-  doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD;
-
-  patches =
-    [
-      # Purity: don't look for library dependencies (of the form
-      # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
-      # Likewise, when searching for included Makefiles, don't look in
-      # /usr/include and friends.
-      ./impure-dirs.patch
-
-      # a bunch of patches from Gentoo, mostly should be from upstream (unreleased)
-      ./darwin-library_search-dylib.patch
-    ];
-  patchFlags = "-p0";
-
-  meta = {
-    description = "GNU Make, a program controlling the generation of non-source files from sources";
-
-    longDescription =
-      '' Make is a tool which controls the generation of executables and
-         other non-source files of a program from the program's source files.
-
-         Make gets its knowledge of how to build your program from a file
-         called the makefile, which lists each of the non-source files and
-         how to compute it from other files. When you write a program, you
-         should write a makefile for it, so that it is possible to use Make
-         to build and install the program.
-      '';
-
-    homepage = http://www.gnu.org/software/make/;
-
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch
deleted file mode 100644
index f6646f1d012..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rc read.c read.c
-*** read.c	2006-03-17 15:24:20.000000000 +0100
---- read.c	2007-05-24 17:16:31.000000000 +0200
-***************
-*** 99,107 ****
---- 99,109 ----
-  #endif
-      INCLUDEDIR,
-  #ifndef _AMIGA
-+ #if 0    
-      "/usr/gnu/include",
-      "/usr/local/include",
-      "/usr/include",
-+ #endif    
-  #endif
-      0
-    };
-diff -rc reremake.c
-*** remake.c	2006-03-20 03:36:37.000000000 +0100
---- remake.c	2007-05-24 17:06:54.000000000 +0200
-***************
-*** 1452,1460 ****
---- 1452,1462 ----
-    static char *dirs[] =
-      {
-  #ifndef _AMIGA
-+ #if 0
-        "/lib",
-        "/usr/lib",
-  #endif
-+ #endif
-  #if defined(WINDOWS32) && !defined(LIBDIR)
-  /*
-   * This is completely up to the user at product install time. Just define
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ece41e7cb81..6d645e5540c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6893,7 +6893,6 @@ with pkgs;
 
   gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
   gnumake3 = gnumake382;
-  gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { };
   gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { };
   gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
   gnumake = gnumake42;

From 9f345ce2c7b2b9878ea2d520f04f82435c6e227d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Jul 2017 14:17:55 +0200
Subject: [PATCH 0890/3246] gnumake41: Remove unused version

---
 .../build-managers/gnumake/4.1/default.nix    | 45 ----------------
 .../gnumake/4.1/impure-dirs.patch             | 34 ------------
 .../gnumake/4.1/no-tty-name.patch             | 53 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 4 files changed, 133 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.1/default.nix
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch

diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix
deleted file mode 100644
index 7c45a6c8e67..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  version = "4.1";
-in
-stdenv.mkDerivation {
-  name = "gnumake-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/make/make-${version}.tar.bz2";
-    sha256 = "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb";
-  };
-
-  patchFlags = "-p0";
-  patches = [
-    # Purity: don't look for library dependencies (of the form `-lfoo') in /lib
-    # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for
-    # included Makefiles, don't look in /usr/include and friends.
-    ./impure-dirs.patch
-
-    # Don't segfault if we can't get a tty name.
-    ./no-tty-name.patch
-  ];
-
-  outputs = [ "out" "doc" ];
-
-  meta = {
-    homepage = http://www.gnu.org/software/make/;
-    description = "A tool to control the generation of non-source files from sources";
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    longDescription = ''
-      Make is a tool which controls the generation of executables and
-      other non-source files of a program from the program's source files.
-
-      Make gets its knowledge of how to build your program from a file
-      called the makefile, which lists each of the non-source files and
-      how to compute it from other files. When you write a program, you
-      should write a makefile for it, so that it is possible to use Make
-      to build and install the program.
-    '';
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch
deleted file mode 100644
index f6646f1d012..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rc read.c read.c
-*** read.c	2006-03-17 15:24:20.000000000 +0100
---- read.c	2007-05-24 17:16:31.000000000 +0200
-***************
-*** 99,107 ****
---- 99,109 ----
-  #endif
-      INCLUDEDIR,
-  #ifndef _AMIGA
-+ #if 0    
-      "/usr/gnu/include",
-      "/usr/local/include",
-      "/usr/include",
-+ #endif    
-  #endif
-      0
-    };
-diff -rc reremake.c
-*** remake.c	2006-03-20 03:36:37.000000000 +0100
---- remake.c	2007-05-24 17:06:54.000000000 +0200
-***************
-*** 1452,1460 ****
---- 1452,1462 ----
-    static char *dirs[] =
-      {
-  #ifndef _AMIGA
-+ #if 0
-        "/lib",
-        "/usr/lib",
-  #endif
-+ #endif
-  #if defined(WINDOWS32) && !defined(LIBDIR)
-  /*
-   * This is completely up to the user at product install time. Just define
diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch b/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch
deleted file mode 100644
index a84d7ab49d0..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001
-From: Paul Smith <psmith@gnu.org>
-Date: Mon, 20 Oct 2014 05:54:56 +0000
-Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname().
-
----
-diff --git main.c main.c
-index b2d169c..0cdb8a8 100644
---- main.c
-+++ main.c
-@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp)
- #ifdef HAVE_ISATTY
-     if (isatty (fileno (stdout)))
-       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT")))
--        define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)),
--                               o_default, 0)->export = v_export;
--
-+        {
-+          const char *tty = TTYNAME (fileno (stdout));
-+          define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME,
-+                                 o_default, 0)->export = v_export;
-+        }
-     if (isatty (fileno (stderr)))
-       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR")))
--        define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)),
--                               o_default, 0)->export = v_export;
-+        {
-+          const char *tty = TTYNAME (fileno (stderr));
-+          define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME,
-+                                 o_default, 0)->export = v_export;
-+        }
- #endif
- 
-   /* Reset in case the switches changed our minds.  */
-diff --git makeint.h makeint.h
-index 6223936..2009f41 100644
---- makeint.h
-+++ makeint.h
-@@ -436,10 +436,11 @@ extern struct rlimit stack_limit;
- /* The number of bytes needed to represent the largest integer as a string.  */
- #define INTSTR_LENGTH         CSTRLEN ("18446744073709551616")
- 
-+#define DEFAULT_TTYNAME "true"
- #ifdef HAVE_TTYNAME
- # define TTYNAME(_f) ttyname (_f)
- #else
--# define TTYNAME(_f) "true"
-+# define TTYNAME(_f) DEFAULT_TTYNAME
- #endif
- 
- 
---
-cgit v0.9.0.2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d645e5540c..b50193f27c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6893,7 +6893,6 @@ with pkgs;
 
   gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
   gnumake3 = gnumake382;
-  gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { };
   gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
   gnumake = gnumake42;
 

From 6669a3b47711dc967df0ea8ff93fa9857aad015d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Jul 2017 14:25:57 +0200
Subject: [PATCH 0891/3246] stdenv: Remove log nesting

Nix/Hydra no longer support pretty printing of logs, so this is no
longer useful.
---
 .../build-managers/gnumake/3.82/default.nix   |   4 -
 .../build-managers/gnumake/3.82/log.patch     | 125 ------------------
 pkgs/stdenv/generic/setup.sh                  |  36 +----
 3 files changed, 4 insertions(+), 161 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/log.patch

diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
index ce5eff878ea..87897017f86 100644
--- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
@@ -15,10 +15,6 @@ stdenv.mkDerivation {
 
   patches =
     [
-      # Provide nested log output for subsequent pretty-printing by
-      # nix-log2xml.
-      ./log.patch
-
       # Purity: don't look for library dependencies (of the form
       # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
       # Likewise, when searching for included Makefiles, don't look in
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/log.patch b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch
deleted file mode 100644
index e6197fd8e78..00000000000
--- a/pkgs/development/tools/build-managers/gnumake/3.82/log.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -rc job.c job.c
-*** job.c	2006-03-20 04:03:04.000000000 +0100
---- job.c	2009-01-19 19:37:28.000000000 +0100
-***************
-*** 1083,1089 ****
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! 	   ? "%s" : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
---- 1083,1089 ----
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-!           ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
-diff -rc main.c main.c
-*** main.c	2006-03-20 03:36:37.000000000 +0100
---- main.c	2009-01-19 19:41:41.000000000 +0100
-***************
-*** 886,891 ****
---- 886,900 ----
-  }
-  
-  
-+ static void close_nesting()
-+ {
-+   while (stdout_nesting_level--)
-+     printf("\e[q");
-+   while (stderr_nesting_level--)
-+     fprintf(stderr, "\e[q");
-+ }
-+ 
-+ 
-  #ifdef _AMIGA
-  int
-  main (int argc, char **argv)
-***************
-*** 931,936 ****
---- 940,950 ----
-    atexit (close_stdout);
-  #endif
-  
-+   atexit(close_nesting);
-+ 
-+   if (getenv("NIX_INDENT_MAKE"))
-+     enable_nested_output = 1;
-+ 
-    /* Needed for OS/2 */
-    initialize_main(&argc, &argv);
-  
-***************
-*** 3095,3100 ****
---- 3109,3120 ----
-  
-    /* Use entire sentences to give the translators a fighting chance.  */
-  
-+   if (entering && enable_nested_output)
-+     {
-+       printf("\e[p");
-+       stdout_nesting_level++;
-+     }
-+   
-    if (makelevel == 0)
-      if (starting_directory == 0)
-        if (entering)
-***************
-*** 3124,3129 ****
---- 3144,3159 ----
-          printf (_("%s[%u]: Leaving directory `%s'\n"),
-                  program, makelevel, starting_directory);
-  
-+   if (!entering && enable_nested_output)
-+     {
-+       printf("\e[q");
-+       stdout_nesting_level--;
-+     }
-+  
-    /* Flush stdout to be sure this comes before any stderr output.  */
-    fflush (stdout);
-  }
-+ 
-+ int enable_nested_output = 0;
-+ int stdout_nesting_level = 0;
-+ int stderr_nesting_level = 0;
-diff -rc make.h
-*** make.h	2006-02-16 00:54:43.000000000 +0100
---- make.h	2009-01-19 19:32:03.000000000 +0100
-***************
-*** 609,611 ****
---- 609,614 ----
-  
-  #define ENULLLOOP(_v,_c)   do { errno = 0; (_v) = _c; } \
-                             while((_v)==0 && errno==EINTR)
-+ extern int enable_nested_output;
-+ extern int stdout_nesting_level;
-+ extern int stderr_nesting_level;
-diff -rc reremake.c
-*** remake.c	2006-03-20 03:36:37.000000000 +0100
---- remake.c	2009-01-19 19:39:40.000000000 +0100
-***************
-*** 1120,1126 ****
---- 1120,1137 ----
-        /* The normal case: start some commands.  */
-        if (!touch_flag || file->cmds->any_recurse)
-  	{
-+           if (enable_nested_output) 
-+             {
-+               log_working_directory (1);
-+               fprintf(stderr, "\e[pbuilding %s\n", file->name);
-+               stderr_nesting_level++;
-+             }
-  	  execute_file_commands (file);
-+           if (enable_nested_output) 
-+             {
-+               fprintf(stderr, "\e[q");
-+               stderr_nesting_level--;
-+             }
-  	  return;
-  	}
-  
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 35fe8fd6950..8ee72c96256 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -77,32 +77,10 @@ _eval() {
 ######################################################################
 # Logging.
 
-nestingLevel=0
-
-startNest() {
-    # Assert natural as sanity check.
-    let nestingLevel+=1 "nestingLevel>=0"
-    echo -en "\033[$1p"
-}
-
-stopNest() {
-    # Assert natural as sanity check.
-    let nestingLevel-=1 "nestingLevel>=0"
-    echo -en "\033[q"
-}
-
-header() {
-    startNest "$2"
-    echo "$1"
-}
-
-# Make sure that even when we exit abnormally, the original nesting
-# level is properly restored.
-closeNest() {
-    while [ $nestingLevel -gt 0 ]; do
-        stopNest
-    done
-}
+# Obsolete.
+stopNest() { true; }
+header() { echo "$1"; }
+closeNest() { true; }
 
 # Prints a command such that all word splits are unambiguous. We need
 # to split the command in three parts because the middle format string
@@ -123,8 +101,6 @@ exitHandler() {
     exitCode=$?
     set +e
 
-    closeNest
-
     if [ -n "$showBuildStats" ]; then
         times > "$NIX_BUILD_TOP/.times"
         local -a times=($(cat "$NIX_BUILD_TOP/.times"))
@@ -593,7 +569,6 @@ unpackFile() {
         echo "do not know how to unpack source archive $curSrc"
         exit 1
     fi
-    stopNest
 }
 
 
@@ -688,7 +663,6 @@ patchPhase() {
         # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
         # shellcheck disable=SC2086
         $uncompress < "$i" 2>&1 | patch ${patchFlags:--p1}
-        stopNest
     done
 
     runHook postPatch
@@ -973,8 +947,6 @@ genericBuild() {
             echo
             echo "@ phase-succeeded $out $curPhase"
         fi
-
-        stopNest
     done
 }
 

From aa4a92d2df0eebde3e0d832d2c60071f50fe4e9f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Jul 2017 14:45:15 +0200
Subject: [PATCH 0892/3246] cc-wrapper/ld-wrapper: Minor speedup in string
 concatenation

There is still a O(n) pattern match in ld-wrapper, so we should
probably rewrite that code to use associative arrays.
---
 pkgs/build-support/cc-wrapper/cc-wrapper.sh | 6 +++---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 3ccdc34db5b..99eb63f40ed 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -55,7 +55,7 @@ while [ $n -lt ${#params[*]} ]; do
         nonFlagArgs=1
     elif [ "$p" = -m32 ]; then
         if [ -e @out@/nix-support/dynamic-linker-m32 ]; then
-            NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
+            NIX_LDFLAGS+=" -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
         fi
     fi
     n=$((n + 1))
@@ -111,9 +111,9 @@ fi
 
 if [[ "$isCpp" = 1 ]]; then
     if [[ "$cppInclude" = 1 ]]; then
-        NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}"
+        NIX_CFLAGS_COMPILE+=" ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}"
     fi
-    NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK"
+    NIX_CFLAGS_LINK+=" $NIX_CXXSTDLIB_LINK"
 fi
 
 LD=@ldPath@/ld
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 056cfa92053..4b3906a2e10 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -79,7 +79,7 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
         case $libPath in
             *\ $path\ *) return 0 ;;
         esac
-        libPath="$libPath $path "
+        libPath+=" $path "
     }
 
     addToRPath() {
@@ -90,12 +90,12 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
         case $rpath in
             *\ $1\ *) return 0 ;;
         esac
-        rpath="$rpath $1 "
+        rpath+=" $1 "
     }
 
     libs=""
     addToLibs() {
-        libs="$libs $1"
+        libs+=" $1"
     }
 
     rpath=""

From 1dd6e7dcbc4ea5ac71815e95b050b45c046d7745 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 24 Jul 2017 09:50:23 -0400
Subject: [PATCH 0893/3246] linux: 4.13-rc1 -> 4.13-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 c7a4ca30a7c..64b91cc677d 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13-rc1";
-  modDirVersion = "4.13.0-rc1";
+  version = "4.13-rc2";
+  modDirVersion = "4.13.0-rc2";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1pdbykp2336vk7ynrz0l95rwqags6kklbr08wjc7zpmdaad6yd6m";
+    sha256 = "1ni0z3v8zkqlmxn4czbw71yaipp6hbyh39vxdzpqy1dqn7zalmif";
   };
 
   features.iwlwifi = true;

From 34beeac70b01e23e8c021f26c52202072d3c561b Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Mon, 24 Jul 2017 16:39:53 +0100
Subject: [PATCH 0894/3246] fix haskellPackages.cuda and some tools dependent
 on cudatoolkit

---
 .../haskell-modules/configuration-nix.nix         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 7b9dbcdaa79..a0af66ea182 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -64,8 +64,19 @@ self: super: builtins.intersectAttrs super {
       "--extra-include-dirs=${pkgs.cudatoolkit}/include"
     ];
     preConfigure = ''
-      unset CC          # unconfuse the haskell-cuda configure script
-      sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure
+      export CUDA_PATH=${pkgs.cudatoolkit}
+    '';
+  });
+
+  nvvm = overrideCabal super.nvvm (drv: {
+    preConfigure = ''
+      export CUDA_PATH=${pkgs.cudatoolkit}
+    '';
+  });
+
+  cufft = overrideCabal super.cufft (drv: {
+    preConfigure = ''
+      export CUDA_PATH=${pkgs.cudatoolkit}
     '';
   });
 

From edef4459f64cdcf68e052f75c71a13661724458e Mon Sep 17 00:00:00 2001
From: Patrick Callahan <patrick.callahan@sigfig.com>
Date: Mon, 24 Jul 2017 09:17:28 -0700
Subject: [PATCH 0895/3246] html-tidy: 5.2.0 -> 5.4.0

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

diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index cc3283cf854..571dd41244b 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "html-tidy-${version}";
-  version = "5.2.0";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "htacg";
     repo = "tidy-html5";
     rev = version;
-    sha256 = "1yxp3kjsxd5zwwn4r5rpyq5ndyylbcnb9pisdyf7dxjqd47z64bc";
+    sha256 = "1q9ag2dh2j636fw9vyz6gg0kiss8p6lvj22h25nqsw0daan57c32";
   };
 
   nativeBuildInputs = [ cmake libxslt/*manpage*/ ];
@@ -33,4 +33,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ edwtjo ];
   };
 }
-

From c6e52bc4304276af04f31713e1b638a33000d727 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 24 Jul 2017 19:04:07 +0200
Subject: [PATCH 0896/3246] borgbackup: 1.0.10 -> 1.0.11

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

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 476c42504a2..dcea9c9435b 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.0.10";
+  version = "1.0.11";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "1sarmpzwr8dhbg0hsvaclcsjfax36ssb32d9klhhah4j8kqji3wp";
+    sha256 = "14fjk5dfwmjkn7nmkbhhbrk3g1wfrn8arvqd5r9jaij534nzsvpw";
   };
 
   nativeBuildInputs = with python3Packages; [

From 2829ea57cbf55cc92b5c1637296fc889985d6628 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 24 Jul 2017 13:09:32 -0400
Subject: [PATCH 0897/3246] stdenv/setup.sh: undo `local -n` change

It's better than the eval solution this is adding back, but until we can
rely on a particular version of bash in nix-shell, this just breaks too
much stuff.

See https://github.com/NixOS/nix/commit/c94f3d5575d7af5403274d1e9e2f3c9d72989751
and https://github.com/NixOS/nix/pull/1483 for the better long-term
solution.
---
 pkgs/stdenv/generic/setup.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index e5d2ba8682d..b48b49c0ad1 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -17,9 +17,10 @@ runHook() {
     shift
     local var="$hookName"
     if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
-    local -n var
+
+    eval "local -a dummy=(\"\${$var[@]}\")"
     local hook
-    for hook in "_callImplicitHook 0 $hookName" "${var[@]}"; do
+    for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do
         _eval "$hook" "$@"
     done
     return 0
@@ -33,9 +34,9 @@ runOneHook() {
     shift
     local var="$hookName"
     if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
-    local -n var
+    eval "local -a dummy=(\"\${$var[@]}\")"
     local hook
-    for hook in "_callImplicitHook 1 $hookName" "${var[@]}"; do
+    for hook in "_callImplicitHook 1 $hookName" "${dummy[@]}"; do
         if _eval "$hook" "$@"; then
             return 0
         fi

From 251043e89d5a40db541235e0d15c9d42c43ff0a6 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <patrick.callahan@sigfig.com>
Date: Mon, 24 Jul 2017 11:19:17 -0700
Subject: [PATCH 0898/3246] pythonPackages.yapf: 0.11.0 -> 0.16.3

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

diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index b7f9d713927..86ef792a437 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "yapf";
-  version = "0.11.0";
+  version = "0.16.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij";
+    sha256 = "1qxq41y65saljw0jk5fzinvynr9fhwzqcjsxxs8bn78in073x7a2";
   };
 
   meta = with stdenv.lib; {

From 269976c45a6932811c8f303cff61592d1b02b495 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Jul 2017 13:43:35 -0500
Subject: [PATCH 0899/3246] haproxy: 1.7.3 -> 1.7.8

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

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index dda4452f644..332edce45cd 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -10,13 +10,13 @@ assert usePcre -> pcre != null;
 stdenv.mkDerivation rec {
   pname = "haproxy";
   majorVersion = "1.7";
-  minorVersion = "3";
+  minorVersion = "8";
   version = "${majorVersion}.${minorVersion}";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz";
-    sha256 = "ebb31550a5261091034f1b6ac7f4a8b9d79a8ce2a3ddcd7be5b5eb355c35ba65";
+    sha256 = "0hp1k957idaphhmw4m0x8cdzdw9ga1mzgsnk2m0as86xrqy1b47c";
   };
 
   buildInputs = [ openssl zlib ]

From 662cf644bc5232a661d34d8ffe63d3b60b81c2a8 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 24 Jul 2017 23:22:08 +0200
Subject: [PATCH 0900/3246] hydra: 2017-06-22 -> 2017-07-24

hydra-2017-06-22 fails to build because of the nixUnstable upgrade.
hydra-2017-07-24 builds successfully.
---
 pkgs/development/tools/misc/hydra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index fe1bb771fca..d5423fea2be 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -62,15 +62,15 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2017-06-22";
+  version = "2017-07-24";
 
   inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "803833aba77e1082c14857aa26933fc7fe5ae190";
-    sha256 = "1cnxpsan8l6fnbr73n0qxxq1szlda1n3qfkk9k9ic8ijk7md4pvs";
+    rev = "a6d9201947aa1468d31ef5c2651251ceeefceb5c";
+    sha256 = "0hk5pxzn94ip3nyccxl91zc5n6wd1h2zcbhdq9p38wa4lrnnm5zv";
   };
 
   buildInputs =

From f2bfb459c412be96a145981b829882202d8f17d5 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 24 Jul 2017 22:27:38 +0000
Subject: [PATCH 0901/3246] nixos/zookeeper: escape cfg.extraCmdLineOptions

---
 nixos/modules/services/misc/zookeeper.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
index b7bca8b56b2..d85b5e4ec50 100644
--- a/nixos/modules/services/misc/zookeeper.nix
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.services.zookeeper;
-  
+
   zookeeperConfig = ''
     dataDir=${cfg.dataDir}
     clientPort=${toString cfg.port}
@@ -49,7 +49,7 @@ in {
       default = 1;
       type = types.int;
     };
- 
+
     extraConf = mkOption {
       description = "Extra configuration for Zookeeper.";
       type = types.lines;
@@ -119,7 +119,7 @@ in {
         ExecStart = ''
           ${pkgs.jre}/bin/java \
             -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \
-            ${toString cfg.extraCmdLineOptions} \
+            ${escapeShellArgs cfg.extraCmdLineOptions} \
             -Dzookeeper.datadir.autocreate=false \
             ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
             org.apache.zookeeper.server.quorum.QuorumPeerMain \

From dc21851707e8a515539f666816dcb85393622b2b Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 21:44:52 -0400
Subject: [PATCH 0902/3246] linenoise-ng: init at 1.0.1

---
 .../libraries/linenoise-ng/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/linenoise-ng/default.nix

diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
new file mode 100644
index 00000000000..b3333d58242
--- /dev/null
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "linenoise-ng-${version}";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "arangodb";
+    repo = "linenoise-ng";
+    rev = "v${version}";
+    sha256 = "176iz0kj0p8d8i3jqps4z8xkxwl3f1986q88i9xg5fvqgpzsxp20";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = "https://github.com/arangodb/linenoise-ng";
+    description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters";
+    maintainers = with stdenv.lib.maintainers; [ cstrahan ];
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e10d8143034..bb95941adf2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9227,6 +9227,8 @@ with pkgs;
 
   linenoise = callPackage ../development/libraries/linenoise { };
 
+  linenoise-ng = callPackage ../development/libraries/linenoise-ng { };
+
   lirc = callPackage ../development/libraries/lirc { };
 
   liquid-dsp = callPackage ../development/libraries/liquid-dsp { };

From 29d2fe4a1f2f192f5f28306fda34a537e017bc60 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 21:45:33 -0400
Subject: [PATCH 0903/3246] rocksdb: enable support for lite mode

See: https://github.com/facebook/rocksdb/blob/master/ROCKSDB_LITE.md
---
 pkgs/development/libraries/rocksdb/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 25aeb3a6da1..a791c899485 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -6,6 +6,8 @@
 
 # Malloc implementation
 , jemalloc ? null, gperftools ? null
+
+, enableLite ? false
 }:
 
 let
@@ -35,6 +37,9 @@ stdenv.mkDerivation rec {
   CMAKE_CXX_FLAGS = "-std=gnu++11";
   JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";
 
+  ${if enableLite then "LIBNAME" else null} = "librocksdb_lite";
+  ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1";
+
   buildFlags = [
     "DEBUG_LEVEL=0"
     "shared_lib"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb95941adf2..a015b2faa88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9969,6 +9969,8 @@ with pkgs;
 
   rocksdb = callPackage ../development/libraries/rocksdb { };
 
+  rocksdb_lite = rocksdb.override { enableLite = true; };
+
   rote = callPackage ../development/libraries/rote { };
 
   ronn = callPackage ../development/tools/ronn { };

From 53426f6cb93f3fbaa2ad974659da271d08ea0594 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 21:47:32 -0400
Subject: [PATCH 0904/3246] osquery: init at 2.5.2

---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/monitoring/osquery.nix |  91 +++++++++++++
 pkgs/tools/system/osquery/default.nix         |  76 +++++++++++
 pkgs/tools/system/osquery/misc.patch          | 126 ++++++++++++++++++
 .../tools/system/osquery/platform-nixos.patch |  22 +++
 pkgs/top-level/all-packages.nix               |   2 +
 6 files changed, 318 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/osquery.nix
 create mode 100644 pkgs/tools/system/osquery/default.nix
 create mode 100644 pkgs/tools/system/osquery/misc.patch
 create mode 100644 pkgs/tools/system/osquery/platform-nixos.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 59419a5e8c5..de3de20e771 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -350,6 +350,7 @@
   ./services/monitoring/munin.nix
   ./services/monitoring/nagios.nix
   ./services/monitoring/netdata.nix
+  ./services/monitoring/osquery.nix
   ./services/monitoring/prometheus/default.nix
   ./services/monitoring/prometheus/alertmanager.nix
   ./services/monitoring/prometheus/blackbox-exporter.nix
diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix
new file mode 100644
index 00000000000..ba0dc4c2176
--- /dev/null
+++ b/nixos/modules/services/monitoring/osquery.nix
@@ -0,0 +1,91 @@
+{ config, lib, pkgs, ... }:
+
+with builtins;
+with lib;
+
+let
+  cfg = config.services.osquery;
+
+in
+
+{
+
+  options = {
+
+    services.osquery = {
+
+      enable = mkEnableOption "osquery";
+
+      loggerPath = mkOption {
+        type = types.path;
+        description = "Base directory used for logging.";
+        default = "/var/log/osquery";
+      };
+
+      pidfile = mkOption {
+        type = types.path;
+        description = "Path used for pid file.";
+        default = "/var/osquery/osqueryd.pidfile";
+      };
+
+      utc = mkOption {
+        type = types.bool;
+        description = "Attempt to convert all UNIX calendar times to UTC.";
+        default = true;
+      };
+
+      databasePath = mkOption {
+        type = types.path;
+        description = "Path used for database file.";
+        default = "/var/osquery/osquery.db";
+      };
+
+      extraConfig = mkOption {
+        type = types.attrs // {
+          merge = loc: foldl' (res: def: recursiveUpdate res def.value) {};
+        };
+        description = "Extra config to be recursively merged into the JSON config file.";
+        default = { };
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.osquery ];
+
+    environment.etc."osquery/osquery.conf".text = toJSON (
+      recursiveUpdate {
+        options = {
+          config_plugin = "filesystem";
+          logger_plugin = "filesystem";
+          logger_path = cfg.loggerPath;
+          database_path = cfg.databasePath;
+          utc = cfg.utc;
+        };
+      } cfg.extraConfig
+    );
+
+    systemd.services.osqueryd = {
+      description = "The osquery Daemon";
+      after = [ "network.target" "syslog.service" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.osquery ];
+      preStart = ''
+        mkdir -p ${escapeShellArg cfg.loggerPath}
+        mkdir -p "$(dirname ${escapeShellArg cfg.pidfile})"
+        mkdir -p "$(dirname ${escapeShellArg cfg.databasePath})"
+      '';
+      serviceConfig = {
+        TimeoutStartSec = 0;
+        ExecStart = "${pkgs.osquery}/bin/osqueryd --logger_path ${escapeShellArg cfg.loggerPath} --pidfile ${escapeShellArg cfg.pidfile} --database_path ${escapeShellArg cfg.databasePath}";
+        KillMode = "process";
+        KillSignal = "SIGTERM";
+        Restart = "on-failure";
+      };
+    };
+
+  };
+
+}
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
new file mode 100644
index 00000000000..72d43354ff7
--- /dev/null
+++ b/pkgs/tools/system/osquery/default.nix
@@ -0,0 +1,76 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, pythonPackages
+, udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive
+, libgpgerror, libuuid, iptables, apt, dpkg, lzma, lz4, bzip2, rpm
+, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
+, thrift, boost, rocksdb_lite, cpp-netlib, glog, gbenchmark, snappy
+, openssl, linenoise-ng, file, doxygen, devicemapper
+}:
+
+let
+  thirdparty = fetchFromGitHub {
+    owner = "osquery";
+    repo = "third-party";
+    rev = "6919841175b2c9cb2dee8986e0cfe49191ecb868";
+    sha256 = "1kjxrky586jd1b2z1vs9cm7x1dxw51cizpys9kddiarapc2ih65j";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "osquery-${version}";
+  version = "2.5.2";
+
+  # this is what `osquery --help` will show as the version.
+  OSQUERY_BUILD_VERSION = version;
+
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "osquery";
+    rev = version;
+    sha256 = "16isplk66qpvhrf041l0lxb4z6k7wwd1sg7kpsw2q6kivkxpnk3z";
+  };
+
+  patches = [ ./misc.patch ] ++ lib.optional stdenv.isLinux ./platform-nixos.patch;
+
+  nativeBuildInputs = [
+    pkgconfig cmake pythonPackages.python pythonPackages.jinja2
+  ];
+
+  buildInputs = [
+    udev audit
+
+    (aws-sdk-cpp.override {
+      apis = [ "firehose" "kinesis" "sts" ];
+      customMemoryManagement = false;
+    })
+
+    lvm2 libgcrypt libarchive libgpgerror libuuid iptables.dev apt dpkg
+    lzma lz4 bzip2 rpm beecrypt augeas libxml2 sleuthkit
+    yara lldpd google-gflags thrift boost
+    cpp-netlib glog gbenchmark snappy openssl linenoise-ng
+    file doxygen devicemapper cryptsetup
+
+    # need to be consistent about the malloc implementation
+    (rocksdb_lite.override { jemalloc = null; gperftools = null; })
+  ];
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2 $NIX_CFLAGS_COMPILE"
+
+    cmakeFlagsArray+=(
+      -DCMAKE_LIBRARY_PATH=${cryptsetup}/lib
+      -DCMAKE_VERBOSE_MAKEFILE=ON
+    )
+
+    cp -r ${thirdparty}/* third-party
+    chmod +w -R third-party
+  '';
+
+  meta = with lib; {
+    description = "SQL powered operating system instrumentation, monitoring, and analytics";
+    homepage = "https://osquery.io/";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch
new file mode 100644
index 00000000000..bcd393e5e23
--- /dev/null
+++ b/pkgs/tools/system/osquery/misc.patch
@@ -0,0 +1,126 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a976a46d..73a95575 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -125,14 +125,13 @@ else()
+     set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libc++")
+   else()
+     set(LINUX TRUE)
+-    set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libstdc++")
++    set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14")
+   endif()
+   set(POSIX TRUE)
+ endif()
+ 
+ if(POSIX)
+   add_compile_options(
+-    -Qunused-arguments
+     -Wstrict-aliasing
+     -Wno-missing-field-initializers
+     -Wno-unused-local-typedef
+@@ -154,7 +153,6 @@ if(POSIX)
+   )
+   if(NOT FREEBSD)
+     add_compile_options(
+-      -Werror=shadow
+       -fvisibility=hidden
+       -fvisibility-inlines-hidden
+     )
+@@ -439,6 +437,8 @@ endif()
+ 
+ if(APPLE)
+   LOG_PLATFORM("OS X")
++elseif(OSQUERY_BUILD_PLATFORM STREQUAL "nixos")
++  LOG_PLATFORM("NixOS")
+ elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian")
+   LOG_PLATFORM("Debian")
+ elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu")
+diff --git a/include/osquery/core.h b/include/osquery/core.h
+index b597edee..b0628037 100644
+--- a/include/osquery/core.h
++++ b/include/osquery/core.h
+@@ -15,8 +15,9 @@
+ #include <string>
+ #include <vector>
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
+ #include <boost/thread/shared_mutex.hpp>
++#include <boost/thread/recursive_mutex.hpp>
+ #else
+ #include <shared_mutex>
+ #endif
+@@ -188,7 +189,7 @@ inline bool isPlatform(PlatformType a, const PlatformType& t = kPlatformType) {
+   return (static_cast<int>(t) & static_cast<int>(a)) != 0;
+ }
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
+ #define MUTEX_IMPL boost
+ #else
+ #define MUTEX_IMPL std
+@@ -204,10 +205,10 @@ using WriteLock = MUTEX_IMPL::unique_lock<Mutex>;
+ using ReadLock = MUTEX_IMPL::shared_lock<Mutex>;
+ 
+ /// Helper alias for defining recursive mutexes.
+-using RecursiveMutex = std::recursive_mutex;
++using RecursiveMutex = MUTEX_IMPL::recursive_mutex;
+ 
+ /// Helper alias for write locking a recursive mutex.
+-using RecursiveLock = std::lock_guard<std::recursive_mutex>;
++using RecursiveLock = MUTEX_IMPL::lock_guard<MUTEX_IMPL::recursive_mutex>;
+ }
+ 
+ /**
+diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt
+index 77913d31..c833c289 100644
+--- a/osquery/CMakeLists.txt
++++ b/osquery/CMakeLists.txt
+@@ -157,6 +157,7 @@ ADD_OSQUERY_LINK_ADDITIONAL("cppnetlib-client-connections${WO_KEY}")
+ ADD_OSQUERY_LINK_CORE("glog${WO_KEY}")
+ 
+ if(POSIX)
++  ADD_OSQUERY_LINK_ADDITIONAL("benchmark")
+   ADD_OSQUERY_LINK_ADDITIONAL("snappy")
+   ADD_OSQUERY_LINK_ADDITIONAL("ssl")
+   ADD_OSQUERY_LINK_ADDITIONAL("crypto")
+@@ -336,13 +337,6 @@ if(NOT OSQUERY_BUILD_SDK_ONLY)
+ 
+   install(DIRECTORY "${CMAKE_SOURCE_DIR}/packs/"
+     DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/packs" COMPONENT main)
+-  if(APPLE)
+-    install(FILES "${CMAKE_SOURCE_DIR}/tools/deployment/com.facebook.osqueryd.plist"
+-      DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/" COMPONENT main)
+-  else()
+-    install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/deployment/osqueryd.initd"
+-      DESTINATION "/etc/init.d/" RENAME "osqueryd" COMPONENT main)
+-  endif()
+ endif()
+ 
+ if(NOT SKIP_TESTS)
+diff --git a/osquery/tables/system/linux/tests/md_tables_tests.cpp b/osquery/tables/system/linux/tests/md_tables_tests.cpp
+index 126be362..119d361d 100644
+--- a/osquery/tables/system/linux/tests/md_tables_tests.cpp
++++ b/osquery/tables/system/linux/tests/md_tables_tests.cpp
+@@ -72,7 +72,7 @@ void GetDrivesForArrayTestHarness(std::string arrayName,
+   EXPECT_CALL(md, getArrayInfo(arrayDevPath, _))
+       .WillOnce(DoAll(SetArgReferee<1>(arrayInfo), Return(true)));
+ 
+-  Sequence::Sequence s1;
++  Sequence s1;
+   for (int i = 0; i < MD_SB_DISKS; i++) {
+     mdu_disk_info_t diskInfo;
+     diskInfo.number = i;
+diff --git a/specs/windows/services.table b/specs/windows/services.table
+index 4ac24ee9..657d8b99 100644
+--- a/specs/windows/services.table
++++ b/specs/windows/services.table
+@@ -12,7 +12,7 @@ schema([
+     Column("path", TEXT, "Path to Service Executable"),
+     Column("module_path", TEXT, "Path to ServiceDll"),
+     Column("description", TEXT, "Service Description"),
+-    Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\UserName. If the account belongs to the built-in domain, the name can be of the form .\UserName."),
++    Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\\UserName. If the account belongs to the built-in domain, the name can be of the form .\\UserName."),
+ ])
+ implementation("system/windows/services@genServices")
+ examples([
diff --git a/pkgs/tools/system/osquery/platform-nixos.patch b/pkgs/tools/system/osquery/platform-nixos.patch
new file mode 100644
index 00000000000..7e1afcb640b
--- /dev/null
+++ b/pkgs/tools/system/osquery/platform-nixos.patch
@@ -0,0 +1,22 @@
+diff --git a/tools/get_platform.py b/tools/get_platform.py
+index 3dd34516..f53ca83a 100644
+--- a/tools/get_platform.py
++++ b/tools/get_platform.py
+@@ -26,6 +26,8 @@ DEBIAN_VERSION = "/etc/debian_version"
+ GENTOO_RELEASE = "/etc/gentoo-release"
+ 
+ def _platform():
++    return ("nixos", "nixos")
++
+     osType, _, _, _, _, _ = platform.uname()
+ 
+     if osType == "Windows":
+@@ -75,6 +77,8 @@ def _platform():
+         return (None, osType.lower())
+ 
+ def _distro(osType):
++    return "unknown_version"
++
+     def getRedhatDistroVersion(pattern):
+         with open(SYSTEM_RELEASE, "r") as fd:
+             contents = fd.read()
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a015b2faa88..927b17419e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15340,6 +15340,8 @@ with pkgs;
 
   osmo = callPackage ../applications/office/osmo { };
 
+  osquery = callPackage ../tools/system/osquery { };
+
   palemoon = callPackage ../applications/networking/browsers/palemoon {
     # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146
     stdenv = overrideCC stdenv gcc49;

From 232c34b8f42a44ada8ded9d1022008e6537c4c27 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Thu, 13 Jul 2017 00:18:52 -0400
Subject: [PATCH 0905/3246] osquery: use packaged sqlite and gtest/gmock

---
 pkgs/tools/system/osquery/default.nix |  5 +-
 pkgs/tools/system/osquery/misc.patch  | 71 +++++++++++++++++++++++++--
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index 72d43354ff7..7924054b720 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -4,6 +4,7 @@
 , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
 , thrift, boost, rocksdb_lite, cpp-netlib, glog, gbenchmark, snappy
 , openssl, linenoise-ng, file, doxygen, devicemapper
+, gtest, sqlite
 }:
 
 let
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     yara lldpd google-gflags thrift boost
     cpp-netlib glog gbenchmark snappy openssl linenoise-ng
     file doxygen devicemapper cryptsetup
+    gtest sqlite
 
     # need to be consistent about the malloc implementation
     (rocksdb_lite.override { jemalloc = null; gperftools = null; })
@@ -59,11 +61,12 @@ stdenv.mkDerivation rec {
 
     cmakeFlagsArray+=(
       -DCMAKE_LIBRARY_PATH=${cryptsetup}/lib
-      -DCMAKE_VERBOSE_MAKEFILE=ON
+      -DCMAKE_VERBOSE_MAKEFILE=OFF
     )
 
     cp -r ${thirdparty}/* third-party
     chmod +w -R third-party
+    rm -r third-party/{googletest,sqlite3}
   '';
 
   meta = with lib; {
diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch
index bcd393e5e23..1a0ef267f0d 100644
--- a/pkgs/tools/system/osquery/misc.patch
+++ b/pkgs/tools/system/osquery/misc.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a976a46d..73a95575 100644
+index a976a46d..408ac308 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -125,14 +125,13 @@ else()
@@ -26,7 +26,20 @@ index a976a46d..73a95575 100644
        -fvisibility=hidden
        -fvisibility-inlines-hidden
      )
-@@ -439,6 +437,8 @@ endif()
+@@ -372,12 +370,6 @@ elseif(NOT FREEBSD)
+   endif()
+ endif()
+ 
+-if(NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/third-party/sqlite3")
+-  WARNING_LOG("Cannot find git submodule third-party/sqlite3 directory")
+-  WARNING_LOG("Please run: make deps or git submodule update --init")
+-  message(FATAL_ERROR "No sqlite3 directory")
+-endif()
+-
+ # Make sure deps were built before compiling (else show warning).
+ execute_process(
+   COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}"
+@@ -439,6 +431,8 @@ endif()
  
  if(APPLE)
    LOG_PLATFORM("OS X")
@@ -35,6 +48,36 @@ index a976a46d..73a95575 100644
  elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian")
    LOG_PLATFORM("Debian")
  elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu")
+@@ -477,7 +471,6 @@ if(POSIX)
+   include_directories("${BUILD_DEPS}/include/openssl")
+ endif()
+ 
+-include_directories("${CMAKE_SOURCE_DIR}/third-party/sqlite3")
+ include_directories("${CMAKE_SOURCE_DIR}/include")
+ include_directories("${CMAKE_SOURCE_DIR}")
+ 
+@@ -559,21 +552,10 @@ else()
+   set(GTEST_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=0")
+ endif()
+ 
+-set(GTEST_FLAGS
+-  ${GTEST_FLAGS}
+-  "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googletest/include"
+-  "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googlemock/include"
+-)
+-join("${GTEST_FLAGS}" " " GTEST_FLAGS)
+-
+ set(BUILD_GTEST TRUE)
+ 
+-add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest")
+-
+ include(Thrift)
+ 
+-add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/sqlite3")
+-
+ add_subdirectory(osquery)
+ add_subdirectory(tools/tests)
+ 
 diff --git a/include/osquery/core.h b/include/osquery/core.h
 index b597edee..b0628037 100644
 --- a/include/osquery/core.h
@@ -73,10 +116,28 @@ index b597edee..b0628037 100644
  
  /**
 diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt
-index 77913d31..c833c289 100644
+index 77913d31..671b20d4 100644
 --- a/osquery/CMakeLists.txt
 +++ b/osquery/CMakeLists.txt
-@@ -157,6 +157,7 @@ ADD_OSQUERY_LINK_ADDITIONAL("cppnetlib-client-connections${WO_KEY}")
+@@ -57,7 +57,7 @@ endif()
+ 
+ # Construct a set of all object files, starting with third-party and all
+ # of the osquery core objects (sources from ADD_CORE_LIBRARY macros).
+-set(OSQUERY_OBJECTS $<TARGET_OBJECTS:osquery_sqlite>)
++set(OSQUERY_OBJECTS "")
+ 
+ # Add subdirectories
+ add_subdirectory(config)
+@@ -138,6 +138,8 @@ elseif(FREEBSD)
+   ADD_OSQUERY_LINK_ADDITIONAL("rocksdb-lite")
+ endif()
+ 
++ADD_OSQUERY_LINK_CORE("sqlite3")
++
+ if(POSIX)
+   ADD_OSQUERY_LINK_CORE("boost_system")
+   ADD_OSQUERY_LINK_CORE("boost_filesystem")
+@@ -157,6 +159,7 @@ ADD_OSQUERY_LINK_ADDITIONAL("cppnetlib-client-connections${WO_KEY}")
  ADD_OSQUERY_LINK_CORE("glog${WO_KEY}")
  
  if(POSIX)
@@ -84,7 +145,7 @@ index 77913d31..c833c289 100644
    ADD_OSQUERY_LINK_ADDITIONAL("snappy")
    ADD_OSQUERY_LINK_ADDITIONAL("ssl")
    ADD_OSQUERY_LINK_ADDITIONAL("crypto")
-@@ -336,13 +337,6 @@ if(NOT OSQUERY_BUILD_SDK_ONLY)
+@@ -336,13 +339,6 @@ if(NOT OSQUERY_BUILD_SDK_ONLY)
  
    install(DIRECTORY "${CMAKE_SOURCE_DIR}/packs/"
      DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/packs" COMPONENT main)

From ace55359f16421d573b20d96b5306f6fd3e3c52f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 16 Jul 2017 09:49:06 +0000
Subject: [PATCH 0906/3246] gst_all_1.gst-libav: set meta.platforms to unix

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

diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index c67a3c708b3..441ca2e5571 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 
   src = fetchurl {

From efad0d5e3fe4380b5276f41e38831387de9d371f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 25 Jul 2017 07:05:07 +0000
Subject: [PATCH 0907/3246] julia: 0.5.1 -> 0.5.2

---
 pkgs/development/compilers/julia/0.5.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index 6e379091703..cfe3d59aba3 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl
+{ stdenv, fetchgit, fetchurl, fetchzip
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 , runCommand
@@ -54,12 +54,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.5.1";
+  version = "0.5.2";
   name = "${pname}-${version}";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1a9m7hzzrwk71gvwwrd1p45s64yid61i41n95gm5pzbry6p9fpl0";
+    sha256 = "1616f53dj7xc0g2iys8qfbzal6dx55nswnws5g5r44dlbf4hcl0h";
   };
   prePatch = ''
     mkdir deps/srccache
@@ -166,6 +166,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
     sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
   '';
 
   postInstall = ''

From e28d817c9a776ff35fbea12cdbbf3916199f1af4 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 25 Jul 2017 10:47:51 +0200
Subject: [PATCH 0908/3246] docker: lowercase image name and tag

The docker loading (docker 1.12.6) of an image with uppercase in the
name fails with the following message:
invalid reference format: repository name must be lowercase
---
 pkgs/build-support/docker/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 506ef7837a2..0d02897da74 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -409,8 +409,9 @@ rec {
         };
       result = runCommand "docker-image-${baseName}.tar.gz" {
         buildInputs = [ jshon pigz coreutils findutils ];
-        imageName = name;
-        imageTag = tag;
+        # Image name and tag must be lowercase
+        imageName = lib.toLower name;
+        imageTag = lib.toLower tag;
         inherit fromImage baseJson;
         layerClosure = writeReferencesToFile layer;
         passthru.buildArgs = args;

From dac08b2a9834b075ffc43dcb74b77bd5b93dc82b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Jul 2017 11:55:50 +0200
Subject: [PATCH 0909/3246] clucene-core: Fix build on gcc 6

http://hydra.nixos.org/build/56895322
---
 .../libraries/clucene-core/default.nix        |   4 +-
 .../libraries/clucene-core/gcc6.patch         | 146 ++++++++++++++++++
 2 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/clucene-core/gcc6.patch

diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index 90cfbb1865c..b65e794a92a 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/clucene/${name}.tar.bz2";
     sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317";
   };
-  
+
+  patches = [ ./gcc6.patch ];
+
   meta = {
     description = "Core library for full-featured text search engine";
     longDescription = ''
diff --git a/pkgs/development/libraries/clucene-core/gcc6.patch b/pkgs/development/libraries/clucene-core/gcc6.patch
new file mode 100644
index 00000000000..f78b26d24f6
--- /dev/null
+++ b/pkgs/development/libraries/clucene-core/gcc6.patch
@@ -0,0 +1,146 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=998477
+
+diff -up clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h
+--- clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48	2008-10-23 12:44:35.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h	2013-08-27 13:17:35.754234297 -0500
+@@ -58,7 +58,7 @@ public:
+ 		__cl_refcount--;
+ 		return __cl_refcount;
+ 	}
+-    virtual ~LuceneBase(){};
++    virtual ~LuceneBase() throw(CLuceneError&) {};
+ };
+ 
+ class LuceneVoidBase{
+diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp
+--- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48	2013-08-27 13:17:35.754234297 -0500
++++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp	2013-08-27 13:18:02.844949386 -0500
+@@ -94,7 +94,7 @@ CompoundFileReader::CompoundFileReader(D
+    )
+ }
+ 
+-CompoundFileReader::~CompoundFileReader(){
++CompoundFileReader::~CompoundFileReader() throw(CLuceneError&) {
+ 	close();
+ }
+ 
+diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h
+--- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48	2008-10-23 12:44:37.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h	2013-08-27 13:17:35.755234286 -0500
+@@ -95,7 +95,7 @@ protected:
+ 
+ public:
+ 	CompoundFileReader(CL_NS(store)::Directory* dir, char* name);
+-	~CompoundFileReader();
++	~CompoundFileReader() throw(CLuceneError&);
+ 	CL_NS(store)::Directory* getDirectory();
+ 	const char* getName() const;
+ 
+diff -up clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.cpp
+--- clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48	2008-10-23 12:44:37.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/index/Term.cpp	2013-08-27 13:17:35.755234286 -0500
+@@ -81,7 +81,7 @@ Term::Term(const TCHAR* fld, const TCHAR
+     set(fld,txt);
+ }
+ 
+-Term::~Term(){
++Term::~Term() throw (CLuceneError&) {
+ //Func - Destructor.
+ //Pre  - true
+ //Post - The instance has been destroyed. field and text have been deleted if pre(intrn) is false
+diff -up clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.h
+--- clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48	2008-10-23 12:44:37.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/index/Term.h	2013-08-27 13:17:35.755234286 -0500
+@@ -68,7 +68,7 @@ class Term:LUCENE_REFBASE {
+ 	Term(const TCHAR* fld, const TCHAR* txt);
+ 	
+ 	///Destructor.
+-	~Term();
++	~Term() throw(CLuceneError&);
+ 
+ 	///Returns the field of this term, an interned string. The field indicates
+ 	///the part of a document which this term came from. 
+diff -up clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/Directory.h
+--- clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48	2008-10-23 12:44:36.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/store/Directory.h	2013-08-27 13:17:35.756234276 -0500
+@@ -41,7 +41,7 @@ CL_NS_DEF(store)
+ 	public:
+ 		DEFINE_MUTEX(THIS_LOCK)
+ 	   
+-		virtual ~Directory(){ };
++		virtual ~Directory() throw(CLuceneError&) { };
+ 
+ 		// Returns an null terminated array of strings, one for each file in the directory. 
+ 		char** list() const{
+diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp
+--- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48	2008-10-23 13:01:52.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp	2013-08-27 13:17:35.756234276 -0500
+@@ -368,7 +368,7 @@ void FSDirectory::FSIndexInput::readInte
+       strcat(buffer,name);
+   }
+ 
+-  FSDirectory::~FSDirectory(){
++  FSDirectory::~FSDirectory() throw(CLuceneError&) {
+   }
+ 
+   void FSDirectory::list(vector<string>* names) const{ //todo: fix this, ugly!!!
+diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h
+--- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48	2008-10-23 13:00:43.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h	2013-08-27 13:17:35.756234276 -0500
+@@ -155,7 +155,7 @@
+ 	  ///Destructor - only call this if you are sure the directory
+ 	  ///is not being used anymore. Otherwise use the ref-counting
+ 	  ///facilities of _CLDECDELETE
+-		~FSDirectory();
++		~FSDirectory() throw(CLuceneError&);
+ 
+ 		/// Get a list of strings, one for each file in the directory. 
+ 		void list(vector<string>* names) const;
+diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp
+--- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48	2008-10-23 12:44:36.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp	2013-08-27 13:17:35.757234265 -0500
+@@ -219,7 +219,7 @@ CL_NS_DEF(store)
+   {
+   }
+   
+-  RAMDirectory::~RAMDirectory(){
++  RAMDirectory::~RAMDirectory() throw(CLuceneError&) {
+    //todo: should call close directory?
+   }
+ 
+diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h
+--- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48	2008-10-23 12:44:36.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h	2013-08-27 13:17:35.757234265 -0500
+@@ -131,7 +131,7 @@ CL_NS_DEF(store)
+ 	  ///Destructor - only call this if you are sure the directory
+ 	  ///is not being used anymore. Otherwise use the ref-counting
+ 	  ///facilities of dir->close
+-		virtual ~RAMDirectory();
++		virtual ~RAMDirectory() throw(CLuceneError&);
+ 		RAMDirectory(Directory* dir);
+ 		
+ 	  /**
+diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp
+--- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48	2008-10-23 12:44:36.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp	2013-08-27 13:17:35.757234265 -0500
+@@ -16,7 +16,7 @@ CL_NS_USE(util)
+   {
+     transOpen = false;
+   }
+-  TransactionalRAMDirectory::~TransactionalRAMDirectory(){
++  TransactionalRAMDirectory::~TransactionalRAMDirectory() throw(CLuceneError&) {
+   }
+ 
+   bool TransactionalRAMDirectory::archiveOrigFileIfNecessary(const char* name) {
+diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h
+--- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48	2008-10-23 12:44:36.000000000 -0500
++++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h	2013-08-27 13:17:35.757234265 -0500
+@@ -44,7 +44,7 @@ CL_NS_DEF(store)
+ 
+   public:
+     TransactionalRAMDirectory();
+-    virtual ~TransactionalRAMDirectory();
++    virtual ~TransactionalRAMDirectory() throw(CLuceneError&);
+ 
+     bool transIsOpen() const;
+     void transStart();

From 7d83f048e21c7b6d6fc5e863a0e0b0bf6ee6a02a Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 31 May 2017 20:57:08 +0200
Subject: [PATCH 0910/3246] cdemu: 3.0.x -> 3.1.0

fixes cdemu for kernel >= 4.11
fixes client by adding pygobject3
---
 pkgs/misc/emulators/cdemu/analyzer.nix  | 4 ++--
 pkgs/misc/emulators/cdemu/client.nix    | 7 ++++---
 pkgs/misc/emulators/cdemu/daemon.nix    | 8 ++++----
 pkgs/misc/emulators/cdemu/gui.nix       | 4 ++--
 pkgs/misc/emulators/cdemu/libmirage.nix | 8 ++++----
 pkgs/misc/emulators/cdemu/vhba.nix      | 4 ++--
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index e39e5285039..e0fe451ce24 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,8 +1,8 @@
 { callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }:
 let pkg = import ./base.nix {
-  version = "3.0.1";
+  version = "3.1.0";
   pkgName = "image-analyzer";
-  pkgSha256 = "19x5hx991pl55ddm2wjd2ylm2hiz9yvzgrwmpnsqr9zqc4lja682";
+  pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2";
 };
 in callPackage pkg {
   buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper
diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix
index 3a5850e10e9..ec4341a2945 100644
--- a/pkgs/misc/emulators/cdemu/client.nix
+++ b/pkgs/misc/emulators/cdemu/client.nix
@@ -1,11 +1,12 @@
 { callPackage, pythonPackages, intltool, makeWrapper }:
 let pkg = import ./base.nix {
-  version = "3.0.3";
+  version = "3.1.0";
   pkgName = "cdemu-client";
-  pkgSha256 = "1bfj7bc10z20isdg0h8sfdvnwbn6c49494mrmq6jwrfbqvby25x9";
+  pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik";
 };
 in callPackage pkg {
-  buildInputs = [ pythonPackages.python pythonPackages.dbus-python intltool makeWrapper ];
+  buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3
+                  intltool makeWrapper ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/cdemu \
diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix
index ef58ff7f58f..587224e71d7 100644
--- a/pkgs/misc/emulators/cdemu/daemon.nix
+++ b/pkgs/misc/emulators/cdemu/daemon.nix
@@ -1,9 +1,9 @@
-{ callPackage, glib, libao }:
+{ callPackage, glib, libao, intltool }:
 let pkg = import ./base.nix {
-  version = "3.0.5";
+  version = "3.1.0";
   pkgName = "cdemu-daemon";
-  pkgSha256 = "1cc0yxf1y5dxinv7md1cqhdjsbqb69v9jygrdq5c20mrkqaajz1i";
+  pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9";
 };
 in callPackage pkg {
-  buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ];
+  buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ];
 }
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index 835a690eb69..d6c85c53b42 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -1,9 +1,9 @@
 { callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }:
 let
   pkg = import ./base.nix {
-    version = "3.0.2";
+    version = "3.1.0";
     pkgName = "gcdemu";
-    pkgSha256 = "1kmcr2a0inaddx8wrjh3l1v5ymgwv3r6nv2w05lia51r1yzvb44p";
+    pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02";
   };
   inherit (pythonPackages) python pygobject3;
 in callPackage pkg {
diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix
index c9ba589cf2a..3813ceef611 100644
--- a/pkgs/misc/emulators/cdemu/libmirage.nix
+++ b/pkgs/misc/emulators/cdemu/libmirage.nix
@@ -1,9 +1,9 @@
-{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }:
+{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool }:
 let pkg = import ./base.nix {
-  version = "3.0.5";
+  version = "3.1.0";
   pkgName = "libmirage";
-  pkgSha256 = "01wfxlyviank7k3p27grl1r40rzm744rr80zr9lcjk3y8i5g8ni2";
+  pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn";
 };
 in callPackage pkg {
-  buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ];
+  buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ];
 }
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index c1692e1b9a8..2b3d9852815 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "vhba-${version}";
-  version = "20161009";
+  version = "20170610";
 
   src  = fetchurl {
     url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2";
-    sha256 = "1n9k3z8hppnl5b5vrn41b69wqwdpml6pm0rgc8vq3jqwss5js1nd";
+    sha256 = "1v6r0bgx0a65vlh36b1l2965xybngbpga6rp54k4z74xk0zwjw3r";
   };
 
   makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];

From fec79a9b15b146d19ceb1ee724efd416eac8862a Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 15 Jul 2017 12:51:46 +0200
Subject: [PATCH 0911/3246] pypy: 5.6 -> 5.8

this commit includes a patch, backported from master, to skip a
failing test
---
 .../pypy/2.7/2604-skip-urandom-fd-test.patch  | 21 +++++++++++++++
 .../interpreters/python/pypy/2.7/default.nix  | 27 +++++++++----------
 2 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/pypy/2.7/2604-skip-urandom-fd-test.patch

diff --git a/pkgs/development/interpreters/python/pypy/2.7/2604-skip-urandom-fd-test.patch b/pkgs/development/interpreters/python/pypy/2.7/2604-skip-urandom-fd-test.patch
new file mode 100644
index 00000000000..d7040501b13
--- /dev/null
+++ b/pkgs/development/interpreters/python/pypy/2.7/2604-skip-urandom-fd-test.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Armin Rigo <arigo@tunes.org>
+# Date 1500108588 -7200
+# Node ID 20f7723ff895430c2f45647e7d0c0ca56d93e40a
+# Parent  d135217574a6bd2e87a883e1d495f82c5e89bc8b
+(ronan, arigo)
+
+Issue #2604: skip this test (fails on some Linux because pypy uses the
+new getrandom() syscall)
+
+diff --git a/lib-python/2.7/test/test_os.py b/lib-python/2.7/test/test_os.py
+--- a/lib-python/2.7/test/test_os.py
++++ b/lib-python/2.7/test/test_os.py
+@@ -580,6 +580,7 @@
+                  "getentropy() does not use a file descriptor")
+ class URandomFDTests(unittest.TestCase):
+     @unittest.skipUnless(resource, "test requires the resource module")
++    @test_support.impl_detail(pypy=False)    # on Linux, may use getrandom()
+     def test_urandom_failure(self):
+         # Check urandom() failing when it is not able to open /dev/random.
+         # We spawn a new process to make the test more robust (if getrlimit()
diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 7552c6cd285..238cfabf615 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -3,13 +3,13 @@
 , makeWrapper, callPackage, self, gdbm, db
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, pkgs, pythonPackages, packageOverrides ? (self: super: {})
 }:
 
 assert zlibSupport -> zlib != null;
 
 let
-  majorVersion = "5.6";
+  majorVersion = "5.8";
   minorVersion = "0";
   minorVersionSuffix = "";
   pythonVersion = "2.7";
@@ -23,22 +23,20 @@ in stdenv.mkDerivation rec {
 
     src = fetchurl {
       url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
-      sha256 = "145a0kd5c0s1v2rpavw9ihncfb05s2x7chc70v8fssvyxq601911";
+      sha256 = "0dibf1bx4icrbi8zsqk7cfwgwsd3hfx6biz59k8j5rys3fx9z418";
     };
 
-   # http://bugs.python.org/issue27369
-    postPatch = let
-      expatch = fetchurl {
-        name = "tests-expat-2.2.0.patch";
-        url = "http://bugs.python.org/file43514/0001-Fix-Python-2.7.11-tests-for-Expat-2.2.0.patch";
-        sha256 = "1j3pa7ly9xrhp8jjwg5l77z7i3y68gx8f8jchqk6zc39d9glq3il";
-      };
-      in ''
-      patch lib-python/2.7/test/test_pyexpat.py < '${expatch}'
+    patches = [
+      # https://bitbucket.org/pypy/pypy/issues/2604/lib-python-27-test-test_ospy
+      ./2604-skip-urandom-fd-test.patch
+    ];
+
+    postPatch = ''
       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 ]
+      ++ (with pythonPackages; [ pycparser ])
       ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 
@@ -92,8 +90,7 @@ in stdenv.mkDerivation rec {
        # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com)
        # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure
        # disable test_zipfile64 because it causes ENOSPACE
-       # disable test_epoll because of invalid arg, should be fixed in as of version 5.1.2
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 or test_epoll )' lib-python
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 )' lib-python
     '';
 
     installPhase = ''
@@ -140,7 +137,7 @@ in stdenv.mkDerivation rec {
 
     meta = with stdenv.lib; {
       homepage = http://pypy.org/;
-      description = "Fast, compliant alternative implementation of the Python language (2.7.8)";
+      description = "Fast, compliant alternative implementation of the Python language (2.7.13)";
       license = licenses.mit;
       platforms = platforms.linux;
       maintainers = with maintainers; [ domenkozar ];

From ecaef62bd98cd99f495c83a0c039766fc7bed84a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Jul 2017 12:01:38 +0200
Subject: [PATCH 0912/3246] cdrdao: Fix build on gcc 6

http://hydra.nixos.org/build/56889707
---
 pkgs/tools/cd-dvd/cdrdao/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix
index caf37ccbe1d..95dd58a59b4 100644
--- a/pkgs/tools/cd-dvd/cdrdao/default.nix
+++ b/pkgs/tools/cd-dvd/cdrdao/default.nix
@@ -24,6 +24,9 @@ stdenv.mkDerivation {
     sed -i 's,linux/../,,g' dao/sg_err.h
   '';
 
+  # Needed on gcc >= 6.
+  NIX_CFLAGS_COMPILE = "-Wno-narrowing";
+
   meta = {
     description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode";
     homepage = http://cdrdao.sourceforge.net/;

From 8844c47c148546207e81be870ab08e41474c1519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Jul 2017 12:36:20 +0100
Subject: [PATCH 0913/3246] alacritty: 2017-07-08 -> 2017-07-25

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

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 3dda61d95ae..a00e0ec8a48 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -17,16 +17,16 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "alacritty-unstable-2017-07-08";
+  name = "alacritty-unstable-2017-07-25";
 
   src = fetchFromGitHub {
     owner = "jwilm";
     repo = "alacritty";
-    rev = "94849c4f2a19bd49337f5cf090f94ac6a940c414";
-    sha256 = "0cawrq0787pcfifn5awccq29a1ag85wfbmx1ccz7m33prk3ry9jp";
+    rev = "49c73f6d55e5a681a0e0f836cd3e9fe6af30788f";
+    sha256 = "0h5hrb2g0fpc6xn94hmvxjj21cqbj4vgqkznvd64jl84qbyh1xjl";
   };
 
-  depsSha256 = "0lb83aan6lgdsdcrd6zdrxhz5bi96cw4ygqqlpm43w42chwzz0xj";
+  depsSha256 = "1pbb0swgpsbd6x3avxz6fv3q31dg801li47jibz721a4n9c0rssx";
 
   buildInputs = [
     cmake

From b9c403c5310a61d7274f8490b9a06be8ccd1bc93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Jul 2017 14:19:31 +0200
Subject: [PATCH 0914/3246] stdenvLinux: Remove bootstrapTools from closure

The "expand-response-params" program had an unnecessary reference to
bootstrapTools, bloating the closure from 205 to 314 MiB.
---
 pkgs/build-support/cc-wrapper/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 676fbd00688..570bb6785df 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -130,6 +130,8 @@ let
       # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
       cp "$src" expand-response-params.c
       "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
+      strip -S $out
+      ${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"}
     '';
   } else "";
 

From cb9cb34c23caba6bc678bd975aedaa461d906ef2 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Sun, 25 Jun 2017 20:56:03 +0200
Subject: [PATCH 0915/3246] vivaldi: 1.10.867.38-1 -> 1.10.867.48-1

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 749fc855788..06dd6ec3b6b 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -12,11 +12,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi";
-  version = "1.10.867.38-1";
+  version = "1.10.867.48-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "1h3iygzvw3rb5kmn0pam6gqy9baq6l630yllff1vnvychdg8d9vi";
+    sha256 = "1han45swvv0y2i2kg7xhml1wj5zyrf2c2hc5b07kqsjkfg9iz1lc";
   };
 
   unpackPhase = ''

From d6f3cfecfbd442a1e1d27c444a47464c10939916 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Sun, 25 Jun 2017 14:00:05 +0200
Subject: [PATCH 0916/3246] vivaldi: add proprietaryCodecs option

Fix #26413
---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 06dd6ec3b6b..c3edc0f4d61 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -7,6 +7,7 @@
 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
 , nss, nspr
 , patchelf
+, proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
     atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
     freetype fontconfig libXrender libuuid expat glib nss nspr
     gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
-  ];
+  ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
 
   libPath = stdenv.lib.makeLibraryPath buildInputs
     + stdenv.lib.optionalString (stdenv.is64bit)
@@ -45,6 +46,10 @@ stdenv.mkDerivation rec {
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${libPath}" \
       opt/vivaldi/vivaldi-bin
+  '' + stdenv.lib.optionalString proprietaryCodecs ''
+    sed -i '/^VIVALDI_FFMPEG_FOUND/ a \
+    checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/vivaldi/vivaldi
+  '' + ''
     echo "Finished patching Vivaldi binaries"
   '';
 

From 93050a3120604757a5e0d0800d9e6b80317a539b Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Wed, 12 Jul 2017 11:53:53 +0200
Subject: [PATCH 0917/3246] vivaldi: fix file dialog crash

When trying to open or save a file using the file chooser GUI, Vivaldi
would crash with the message

   GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is
   not installed

This commit adds the GTK directory to XDG_DATA_DIRS which fixes the
crash.
---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index c3edc0f4d61..d5006eec3ab 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -6,7 +6,7 @@
 , gstreamer, gst-plugins-base, libxml2
 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
 , nss, nspr
-, patchelf
+, patchelf, makeWrapper
 , proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     tar -xvf data.tar.xz
   '';
 
-  nativeBuildInputs = [ patchelf ];
+  nativeBuildInputs = [ patchelf makeWrapper ];
 
   buildInputs = [
     stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
@@ -72,6 +72,8 @@ stdenv.mkDerivation rec {
         "$out"/opt/vivaldi/product_logo_''${d}.png \
         "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
     done
+    wrapProgram "$out/bin/vivaldi" \
+      --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
   '';
 
   meta = with stdenv.lib; {

From 74debc3945852d72f7e9fb3d1233c5dd4fc6f9d2 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Tue, 25 Jul 2017 14:21:21 +0200
Subject: [PATCH 0918/3246] vivaldi: Add update script

---
 .../networking/browsers/vivaldi/update.sh     | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100755 pkgs/applications/networking/browsers/vivaldi/update.sh

diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh
new file mode 100755
index 00000000000..6ef6206c4f4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/update.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p libarchive curl common-updater-scripts
+
+set -eu -o pipefail
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+root=../../../../..
+export NIXPKGS_ALLOW_UNFREE=1
+
+version() {
+	(cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"')
+}
+
+vivaldi_version_old=$(version vivaldi)
+vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p')
+
+if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then
+	echo "nothing to do, vivaldi $vivaldi_version is current"
+	exit
+fi
+
+# Download vivaldi and save hash and file path.
+url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}_amd64.deb"
+mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
+hash=${prefetch[0]}
+path=${prefetch[1]}
+
+echo "vivaldi: $vivaldi_version_old -> $vivaldi_version"
+(cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash")
+
+# Check vivaldi-ffmpeg-codecs version.
+chromium_version_old=$(version vivaldi-ffmpeg-codecs)
+chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep -A2 -i '^chrome\/' | grep '^[0-9]\+\.[0-9]\+\.[1-9][0-9]\+\.[0-9]\+')
+
+if [[ "$chromium_version" != "$chromium_version_old" ]]; then
+	echo "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version"
+	(cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version")
+fi

From fcf7b6761bf07a62a05d91b0920febc928905ced Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Tue, 25 Jul 2017 13:25:40 +0200
Subject: [PATCH 0919/3246] firejail: 0.9.44.10 -> 0.9.48

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 1bbe8dbb160..b20dcd34233 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.10";
+    version="0.9.48";
     name="${baseName}-${version}";
-    hash="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj";
-    url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.10.tar.xz";
-    sha256="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj";
+    hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
+    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz";
+    sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
   };
   buildInputs = [
     which
@@ -21,6 +21,13 @@ stdenv.mkDerivation {
     name = "${s.name}.tar.bz2";
   };
 
+  prePatch = ''
+    # Allow whitelisting ~/.nix-profile
+    substituteInPlace etc/firejail.config --replace \
+      '# follow-symlink-as-user yes' \
+      'follow-symlink-as-user no'
+  '';
+
   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 .)

From a7f4c879e53d0ab62b0de0b154d834fefc282ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Jul 2017 13:44:09 +0100
Subject: [PATCH 0920/3246] vim-plugins: update set

---
 pkgs/misc/vim-plugins/default.nix             | 242 +++++++++---------
 .../vim2nix/additional-nix-code/command-t     |   4 +-
 2 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 1523010b6d7..5f090a68e5b 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -224,11 +224,11 @@ rec {
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-06-30";
+    name = "The_NERD_tree-2017-07-17";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "2e43ad074bb3b7fafc77b9eea5098047d6fe6e90";
-      sha256 = "1mbj0qcjmrc4n0p9i96rm29qpi5j1shp69iv5kcv8sxiqgfrlqlm";
+      rev = "e2a9929bbea0ec2050f2ea44b7e7bae3ccac66e6";
+      sha256 = "03mygl8ic4awx4js04x0nw2l96kjv4vsldkgrdx0n43sh5i4z7nk";
     };
     dependencies = [];
 
@@ -284,11 +284,11 @@ rec {
   };
 
   clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clang_complete-2017-06-03";
+    name = "clang_complete-2017-07-15";
     src = fetchgit {
       url = "git://github.com/Rip-Rip/clang_complete";
-      rev = "c963df1cd10463166e1245445bff27f28e89f9f7";
-      sha256 = "1y7zx3ywir86mxgg86kb8z7xmxadcmv8ycc2i1y8s7jz6pv2v40l";
+      rev = "c41eea05317526a4ddd3bd389f3723390b196d4d";
+      sha256 = "0bfalbzhy3n1k8bsvnh6aykgj6d17n6qgi9ahp0d8plvbjjvfw6j";
     };
     dependencies = [];
     # In addition to the arguments you pass to your compiler, you also need to
@@ -375,11 +375,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2017-06-08";
+    name = "fugitive-2017-07-12";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "be2ff98db543990d7e59a90189733d7a779788fd";
-      sha256 = "1lkdypibsw2p45wrdcc8ambynszdcwiqyh50zhflf2slpd98iz3m";
+      rev = "913fff1cea3aa1a08a360a494fa05555e59147f5";
+      sha256 = "1qxzxk5szm25r7wi39n5s91fjnjgz5xib67risjcwhk6jdv0vzyd";
     };
     dependencies = [];
 
@@ -441,11 +441,11 @@ rec {
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-07-05";
+    name = "deoplete-nvim-2017-07-22";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "376b0c9bbdd30e51a253319ff63762165f30d41a";
-      sha256 = "0r6bwwsl9r40nv02hca1h00wgakmrjqzamz3whf7xnb0vx9p29n9";
+      rev = "5cef0e6b607d3acb742d1de07a4ddd3a5bfa3036";
+      sha256 = "0mh8zjaw369djffi1vzy124pwnrcxg4pbyjnhy3pq2j6k579znc2";
     };
     dependencies = [];
 
@@ -474,11 +474,11 @@ rec {
   };
 
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2017-07-04";
+    name = "vim-closetag-2017-07-24";
     src = fetchgit {
       url = "https://github.com/alvan/vim-closetag";
-      rev = "e15684e10eb456399fc496467cc9ece1e18a7ec8";
-      sha256 = "1rs1dlnn5syxny3qrgggyz8rc6anr8gkhkn19i72nmrvcbb40w0k";
+      rev = "2cacc501df30586c0f96f40f24d1a1239529198c";
+      sha256 = "00fayl6bnrf8b80xk73r1009z6hpzfc2jaih042hmnybx8k70byg";
     };
     dependencies = [];
 
@@ -496,11 +496,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-07-08";
+    name = "clighter8-2017-07-23";
     src = fetchgit {
       url = "https://github.com/bbchung/clighter8";
-      rev = "83ebf9e3961fcf1a4ccc557ab5f8c55cb813bc3b";
-      sha256 = "0rv16fbg0ga5csk9p2zczh100i55j1h70s0rcvdbgzfmbbmgsda7";
+      rev = "a75644681c3a25f9441c482fd0b1c983d12da7e1";
+      sha256 = "0hl14l8d0c0rwh7pv1d9bxkrvh1wjxdgjyi7cnhn75m7x9fd3ijh";
     };
     dependencies = [];
     preFixup = ''
@@ -510,11 +510,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-07-07";
+    name = "neomake-2017-07-25";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "79c7dba684e3b179d7416d84fc86fac38f8190fe";
-      sha256 = "039b76n7d2nbbzrd83y4j8g103dvnrmk1pa84is5r5qv33hdpc0x";
+      rev = "0d1f1508ce2c9cfcffbf74a6bdea9c5766301fd6";
+      sha256 = "0wc9b63s4j80f6irf2g6dmk2nx8w9il4dccbgmzirchmymndw4vh";
     };
     dependencies = [];
 
@@ -554,11 +554,11 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2017-06-20";
+    name = "vim-tmux-navigator-2017-07-07";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-tmux-navigator";
-      rev = "3e83ddc509c66ac86b0c2961613076f74f34a2b6";
-      sha256 = "0zp81qkaahcl85s60cphqh7rsw3hpvnlr98p5lwzp5dsbxxh0iby";
+      rev = "d724094e7128acd7375cc758008f1e1688130877";
+      sha256 = "1n0n26lx056a0f8nmzbjpf8a48971g4d0fzv8xmq8yy505gbq9iw";
     };
     dependencies = [];
 
@@ -576,22 +576,22 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2017-07-04";
+    name = "ctrlp-vim-2017-07-18";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "b9b334b7ee07f03bbbc46193bb544124bd430148";
-      sha256 = "1pzhffbbmw45x6izdhyi7zp6wy2x2r93g6jz03fdj0qmja0wk1b4";
+      rev = "3a048e85d3c2f72b1564e2dc43ed5b1d67bd59a9";
+      sha256 = "10i2lwjizd74b3zi1ahinz2h8qbd18jzw93xrpw0iswrynfsprjv";
     };
     dependencies = [];
 
   };
 
   agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "agda-vim-2017-03-18";
+    name = "agda-vim-2017-07-18";
     src = fetchgit {
       url = "https://github.com/derekelkins/agda-vim";
-      rev = "7f00093e485f07aa1daafa71e85306397c059402";
-      sha256 = "1yc1lhzir440jmv5aivhvn3bgxncz7p0vydla6mrf14gw6fqbp12";
+      rev = "d82c5da78780e866e1afd8eecba1aa9c661c2aa8";
+      sha256 = "1aq7wyi1an6znql814w3v30p96yzyd5xnypblzxvsi62jahysfwa";
     };
     dependencies = [];
 
@@ -642,11 +642,11 @@ rec {
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2017-06-17";
+    name = "neco-ghc-2017-07-22";
     src = fetchgit {
       url = "https://github.com/eagletmt/neco-ghc";
-      rev = "ea515ae60a0523539fe75680f07aa2a588de9a99";
-      sha256 = "1pj5a5v3x8vnkck60kc25ph9b5xx0d8ipa4f4llxpc0q8d2xzk6w";
+      rev = "1c7bf1b544f295d066863b9f193de709aec5bbad";
+      sha256 = "1vbl75s0zvbw6zvs790yla06rl8akpamm0p98s5mbj7mdnivkqhb";
     };
     dependencies = [];
 
@@ -675,22 +675,22 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-05-18";
+    name = "vim-elixir-2017-07-19";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "fe7daaaff030e217dffedf53cb5f426099281e3e";
-      sha256 = "09jqbymwf1m0c0wdsq93nryapzjw0fx0hwzzwxvwxygvnx3nvf22";
+      rev = "7c16ab889d12a32a7d15c54c36c0f47809b06e06";
+      sha256 = "0h9gqxqyl6p6ckknn8838wz71xz5v2jqkc2swjdkfbff2n9k1gwb";
     };
     dependencies = [];
 
   };
 
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2017-02-27";
+    name = "elm-vim-2017-07-09";
     src = fetchgit {
       url = "https://github.com/elmcast/elm-vim";
-      rev = "b47d013d1fdfecc9e19df8034439b8e379813696";
-      sha256 = "0ibmb02qal7q29brmq0jkd3rcnwp6yba9agza3av1x1ixvb61mlw";
+      rev = "ae5315396cd0f3958750f10a5f3ad9d34d33f40d";
+      sha256 = "0a85l0mcxgha4s5c9lzdv9y2c1ff942y9a5sfjihz6sph21c77xp";
     };
     dependencies = [];
 
@@ -741,11 +741,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-07-06";
+    name = "vim-go-2017-07-25";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "f08fcab5c51bee18174340405b773a950446e9f5";
-      sha256 = "1hsfaca9mhp7829b6kl7bmrwm03kjjhz9grmjzgr7v3arlpcv9sa";
+      rev = "76cd99db6a88e825f361df0043cbff777c4a14fb";
+      sha256 = "1pda9dmaacnzwm92a7vsly053dq2c1bcsqx99rwr41mkpzsk649l";
     };
     dependencies = [];
 
@@ -763,22 +763,22 @@ rec {
   };
 
   floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "floobits-neovim-2017-02-08";
+    name = "floobits-neovim-2017-07-25";
     src = fetchgit {
       url = "https://github.com/floobits/floobits-neovim";
-      rev = "9755412fcd68cfc76a36aa000682a84d96013650";
-      sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1";
+      rev = "5b83fc75e4241911649782fd5b87ac7da30e77bd";
+      sha256 = "05jrybkhg39v3z295l55aasb074wvm3pnyp7l38jqk7z4432gdc4";
     };
     dependencies = [];
 
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2017-07-05";
+    name = "psc-ide-vim-2017-07-14";
     src = fetchgit {
       url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "22813d6222766d773e77fadf36ee5eed4162ece4";
-      sha256 = "0261nkzj7412f55l6yxsr9xh2ynvnm5zb6ciasj809ynqapqvx2i";
+      rev = "0ff0c0a4e4087cb4444d0a19f2b2e436e723b186";
+      sha256 = "0kq8iqhv8flyc12m9ajmbrfk7k6zl3gnnxg5j8sw69aqy6pqvd0p";
     };
     dependencies = [];
 
@@ -829,11 +829,11 @@ rec {
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2017-07-02";
+    name = "calendar-vim-2017-07-08";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim";
-      rev = "1b4bff01dbcf81e9415c4181e702762f2c4f5638";
-      sha256 = "0lsyy7xn460sawpki2svc29b2dm7n6vi0r22jm4djk7n5y9y4xj4";
+      rev = "6d6be26b2ad1870658525e2a42046429c845516c";
+      sha256 = "0g4k7vn3r8y0ss0nl6apxgpkdi7ixi87a9g5xr66n70lxyn7m9pz";
     };
     dependencies = [];
 
@@ -972,11 +972,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2017-07-01";
+    name = "fzf-vim-2017-07-24";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "55f6bc83677235a7f6ffc35496ecae2e2a764417";
-      sha256 = "0yir125q9cgpk5b07ns9rg0s8f65g7jfka1jq9ir02w47090kgnb";
+      rev = "685f9aae97072a190a1230a5c79692e15b7f46c9";
+      sha256 = "1064qwypq8hl0dx65fhvx0aq4jp7hc60rzb0vy98zjr3sr4wshbh";
     };
     dependencies = [];
 
@@ -1049,22 +1049,22 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-07-06";
+    name = "vimtex-2017-07-25";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "b31b49f0dca7c7acff9b7256315c3dc3bcedac98";
-      sha256 = "1qbhypswa2pa61ksyqp987q9413wvwkhj0avcbvli2n3hn8scz5f";
+      rev = "1bba731f008a0905c1cf34e185c3f299d1f1759b";
+      sha256 = "0gcsfdc2rrdaylsqz6hn9smchndb4y22f4sm230ljdf1rda6v57v";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2017-04-27";
+    name = "vim-easymotion-2017-07-14";
     src = fetchgit {
       url = "https://github.com/lokaltog/vim-easymotion";
-      rev = "d55e7bf515eab93e0b49f6f762bf5b0bf808264d";
-      sha256 = "1dqx8nrw8jcpdnnqmca6yl1y0fdlc64rz9msbsmvp502v98wvhnh";
+      rev = "e4d71c7ba45baf860fdaaf8c06cd9faebdccbd50";
+      sha256 = "16ww4myvgh7is5fbwm67v87bbdyhldvr9d4vqkvnn8v9mbj7p7vd";
     };
     dependencies = [];
 
@@ -1207,11 +1207,11 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2017-04-03";
+    name = "haskell-vim-2017-07-18";
     src = fetchgit {
       url = "https://github.com/neovimhaskell/haskell-vim";
-      rev = "9811f3803317c4f39c868e71b3202b5559735aef";
-      sha256 = "02f87lfpr5lslh57cqimg91llflra8934jzy0g32l5zcm7fdljdk";
+      rev = "21c48768f1c5986d4f2351784b119eb9a5f925db";
+      sha256 = "1dd18plhahkdz782d7y8w8265di2wvs78w2q2hx2m68686abmn0h";
     };
     dependencies = [];
 
@@ -1284,11 +1284,11 @@ rec {
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2017-05-20";
+    name = "vim-racer-2017-07-19";
     src = fetchgit {
       url = "https://github.com/racer-rust/vim-racer";
-      rev = "92c3e2b57e60c3d4f0102d1d587ddc762e662f60";
-      sha256 = "0wf74ilkkqjm6s3r329i9w2jgnh5kd2jkswan3bvqc5g14a2ddhl";
+      rev = "c729b895885c9ef548ed4f9c1cec7c7c741b5869";
+      sha256 = "1r0idhc7yj5r4h2rfmbb5p0i1yckr3mckif3ijy6sm9rhwi242sw";
     };
     dependencies = [];
 
@@ -1328,33 +1328,33 @@ rec {
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2017-06-01";
+    name = "rust-vim-2017-07-14";
     src = fetchgit {
       url = "https://github.com/rust-lang/rust.vim";
-      rev = "b77ac8ecbd4baaa23cca612e1c9b3df5ea23da9b";
-      sha256 = "07qkyils4dgl81lqifx0pr075m3mdpzifp1w5d0zw4zkpvb0v8nk";
+      rev = "5a6133680ecf9e22eeba35c35e62ea6210225b02";
+      sha256 = "0mxzl8lghq7bnwp8qs3haxq83ds5q8s8br0ajn40a3c3ns2hkhla";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-07-06";
+    name = "neoformat-2017-07-22";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "0a4904771ee0df76f01146bdcbac5dde4f5a61af";
-      sha256 = "09i4ngih8cd3613mhsz0bbpwppbwsx723k7xx9ha6ybnfrmhx1ra";
+      rev = "a0c8e1f3c8b917afd175fc9ed9b2685ce5f952e9";
+      sha256 = "1w2m54ag1g1czfwa8y2vq4p05wysvb1qhgfnbzqvlwb1mn9sh2kf";
     };
     dependencies = [];
 
   };
 
   deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-rust-2017-06-28";
+    name = "deoplete-rust-2017-07-18";
     src = fetchgit {
       url = "https://github.com/sebastianmarkow/deoplete-rust";
-      rev = "505735576e29d30fee5074a9a49fdeb989c632b2";
-      sha256 = "0nqvk7f7asbfcfiv2lw3hinsaln648xc8k5jd630q0p4gyyxqpdm";
+      rev = "0a86e502113910c33448b337c4d50cabea120d25";
+      sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h";
     };
     dependencies = [];
 
@@ -1372,22 +1372,22 @@ rec {
   };
 
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-vim-2017-04-25";
+    name = "neco-vim-2017-07-23";
     src = fetchgit {
       url = "https://github.com/shougo/neco-vim";
-      rev = "2329ad0a20af61ac104a29d3653e5af24add7077";
-      sha256 = "1mf7xdlarwj2kfx3pbngrvfrzmbjp6k5f6bxl4n1wz9p7wdajap8";
+      rev = "7c188577ebf65bfb9e27affce8158e0f5af2ec3e";
+      sha256 = "1jb9vw2gkag2fg18vxqj3rc6y4zqgrn0kf6vb5z8kgkbsam0cybk";
     };
     dependencies = [];
 
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-06-24";
+    name = "neocomplete-vim-2017-07-23";
     src = fetchgit {
       url = "https://github.com/shougo/neocomplete.vim";
-      rev = "186881fc40d9b774766a81189af17826d27406c2";
-      sha256 = "0x9fmvliwxm49q8970byaqrnrffcxjf29z0y7xsfi56sv277lpl5";
+      rev = "d8caad4fc14fc1be5272bf6ebc12048212d67d2c";
+      sha256 = "1ab1p4w6187r15alb34mnvaq43mikk7ic05ysgilx4f4zz6dgz5y";
     };
     dependencies = [];
 
@@ -1405,11 +1405,11 @@ rec {
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-06-24";
+    name = "neosnippet-vim-2017-07-15";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "867149c56651f0958bfde1f56e203f90afba134d";
-      sha256 = "19cwpans16ahmmnjfqxz5x3zw89qn93c9sc80sscw76i4ih4skml";
+      rev = "4bf88a9e497dc7180e9fe58551ad340de0192f39";
+      sha256 = "0mj14cninszfw95zb0rwcmzf40851i49lj6vk8gz4iq9y0hxsnx7";
     };
     dependencies = [];
 
@@ -1427,11 +1427,11 @@ rec {
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2016-08-06";
+    name = "vimproc-vim-2017-07-22";
     src = fetchgit {
       url = "https://github.com/shougo/vimproc.vim";
-      rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0";
-      sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20";
+      rev = "03a38f283ca9e15784e8fea84e8afc5d633b9639";
+      sha256 = "0ypffp724f3qp0mryxmmmi1ci0bnz34nnr7yi3c893pd9mpkrjjr";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -1467,11 +1467,11 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2017-04-21";
+    name = "alchemist-vim-2017-07-23";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "12d9d8b9a8875d0edb75c3d91d4f8f04f3558fb7";
-      sha256 = "0xg1yixs8p4f2sghbh204p8b10m1zb3xxi4jwiqrrw4jhprh8g4f";
+      rev = "35b0e59b4ae45baeef7fc46b6faf9b96515d35cb";
+      sha256 = "021iwhnjjsfhmpbimm91jgmcrlj1hjh8rxcdqxwcwxc92h73wl58";
     };
     dependencies = [];
 
@@ -1533,11 +1533,11 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2017-06-23";
+    name = "vim-dispatch-2017-07-12";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "ca10dc106a5a3684573a3841560b167f4b86fde1";
-      sha256 = "1ad98k08i5zcyggjxcxygr4j513fg43di99gqg1jbi8xvyhgha69";
+      rev = "14a1695f844a320dd28a7706710325773d1046a8";
+      sha256 = "1whmqikg5ch523ffs2apkrd4clwl7s0y98gmxgaqq6gm2fa2wmfp";
     };
     dependencies = [];
 
@@ -1599,11 +1599,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-07-07";
+    name = "youcompleteme-2017-07-24";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "d299f9eb708ec83713f904dbb49c4260b6b22240";
-      sha256 = "0g2spq5c9sps0zql8pg0xbnxbcqn0aacy96jd1ixxh6dg9gijkp0";
+      rev = "998303e2fd5e762c3bc2aee8c23af1b388fb459c";
+      sha256 = "158wnxgnjir4n5p1jnpxqq4qwl6hapd9kpdd3gklihxvbj1zqskc";
     };
     dependencies = [];
     buildPhase = ''
@@ -1625,11 +1625,11 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2017-06-24";
+    name = "vim-airline-themes-2017-07-10";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "7865fd8ba435edd01ff7b59de06a9be73e01950d";
-      sha256 = "0fd4s8y6w5flbrikislcvj2a0jb77rd6gwg207qskxfqncxsbswn";
+      rev = "5d75d76ca2e17edd68f89ac4f547009d477570c6";
+      sha256 = "15vq8fjax69wi447vhirj7vzqxppxcpvq2v8dhi0pf39gbzcd229";
     };
     dependencies = [];
 
@@ -1790,11 +1790,11 @@ rec {
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2017-06-23";
+    name = "command-t-2017-07-11";
     src = fetchgit {
       url = "https://github.com/wincent/command-t";
-      rev = "29f2606a9665058a98b56f2d8062ba614a3f246e";
-      sha256 = "0q6kqjy88w1478k2q6vqyyid69whd72746i0cd33xnslgykwm2hn";
+      rev = "85949ce7a70a26abf6f9d355e38d1473facba022";
+      sha256 = "1q1vdzyfwqnm5z88n0rzgy47ycv74yn44885v57ws0qvm3bv8b8h";
     };
     dependencies = [];
     buildInputs = [ perl ruby git ];
@@ -1846,7 +1846,7 @@ rec {
       sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq";
     };
     dependencies = [];
-    buildInputs = [ python3 ]; 
+    buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -1856,11 +1856,11 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-06-11";
+    name = "deoplete-jedi-2017-07-16";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "b7e789ef8b45b207650adb1af5e2e7f188053fe1";
-      sha256 = "0xv7ggwyl332yr93rqmf1li0zz8rzhgb10cvd78jssdvlazi3mc8";
+      rev = "56528fd1238bbf2f9363f16710d0936703dc9eab";
+      sha256 = "1kwwbr1w3865rlqs04hpxrqv67a14mzyf85pa29djmryi2156wxb";
     };
     dependencies = [];
 
@@ -1966,11 +1966,11 @@ rec {
   };
 
   sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sleuth-2017-05-28";
+    name = "sleuth-2017-07-23";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sleuth";
-      rev = "fc5cf44466d50fada784530de933af80c6448db5";
-      sha256 = "10l6ins66g1wxwzgjcpwim0295yz9ni282f8n7vjafd5v486fxnw";
+      rev = "dfe0a33253c61dd8fac455baea4ec492e6cf0fe3";
+      sha256 = "0576k4l2wbzy9frvv268vdix4k6iz9pw6n6626ifvg8hk6gbc5g9";
     };
     dependencies = [];
 
@@ -2273,11 +2273,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-07-07";
+    name = "vim-airline-2017-07-21";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "e03afa1733c6296774ca95ef981bd8fd39bb1151";
-      sha256 = "0n8l4al4hicnz1xyhcbyb6iw3fxrjslmxk18zanyqcamhfj94vy3";
+      rev = "72e5f04f7c422e21cb6f6856c4e94cef25ea2288";
+      sha256 = "0pkdlmil0lqwwi7anzn7r1zxxqbip9zy1pbwri031yksff6v2096";
     };
     dependencies = [];
 
@@ -2339,11 +2339,11 @@ rec {
   };
 
   vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2017-06-22";
+    name = "vim-latex-live-preview-2017-07-19";
     src = fetchgit {
       url = "git://github.com/xuhdev/vim-latex-live-preview";
-      rev = "becc9d4f1a774e6deb7a96015200de35f1bec1a3";
-      sha256 = "0mqvzk94byiccm7v8kdk0hcbz05k9l69kv3ljg8djbvj5q6zzi2m";
+      rev = "172b03cd0677f1fe55abeab86fa4a4c484e4c3b5";
+      sha256 = "1wgnq1kbx80xqwm9rx3z4i9fldj965046s4hh62rdi5585hh6aps";
     };
     dependencies = [];
 
@@ -2372,11 +2372,11 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-06-06";
+    name = "vim-signify-2017-07-19";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "d9918a69bcff382569ddf5bda030aff412bfd790";
-      sha256 = "1kc7q8xsvg0hl9b3z5a6phfndx7a5pcfy1d3q7i02aaa8dw4ga7j";
+      rev = "748cb0ddab1b7e64bb81165c733a7b752b3d36e4";
+      sha256 = "0kc4nbf3a7ab0an4r1j37bvzjarr4135qqhkz348r7zdhmqkyyfm";
     };
     dependencies = [];
 
@@ -2416,11 +2416,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-04-15";
+    name = "vimwiki-2017-07-15";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "8cdc1c15388cc7f4edb827ff15dbc31d592a79af";
-      sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h";
+      rev = "976cbbcd23dcd19ddb5dc5544645da8a51dbdfe6";
+      sha256 = "1mna3qavwj1jcjnvmw8hngrfccpk5krj2z0v2grp97i9m2kmkifx";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
index 57aa35999dc..5c96e11de7a 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
@@ -1,6 +1,6 @@
-    buildInputs = [ perl ruby ];
+    buildInputs = [ perl ruby git ];
     buildPhase = ''
       pushd ruby/command-t
-      gem build command-t.gemspec
+      gem build ./command-t.gemspec
       popd
     '';

From aba21d99dad5641daf32c8051994cc8afd8ff3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Jul 2017 14:14:48 +0100
Subject: [PATCH 0921/3246] vimPlugins.command-t: 2017-07-11 -> 2017-06-23

https://github.com/NixOS/nixpkgs/commit/a7f4c879e53d0ab62b0de0b154d834fefc282ed9#commitcomment-23287795
---
 pkgs/misc/vim-plugins/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 5f090a68e5b..af77f5ae4fe 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1790,11 +1790,11 @@ rec {
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2017-07-11";
+    name = "command-t-2017-06-23";
     src = fetchgit {
       url = "https://github.com/wincent/command-t";
-      rev = "85949ce7a70a26abf6f9d355e38d1473facba022";
-      sha256 = "1q1vdzyfwqnm5z88n0rzgy47ycv74yn44885v57ws0qvm3bv8b8h";
+      rev = "29f2606a9665058a98b56f2d8062ba614a3f246e";
+      sha256 = "0q6kqjy88w1478k2q6vqyyid69whd72746i0cd33xnslgykwm2hn";
     };
     dependencies = [];
     buildInputs = [ perl ruby git ];

From b7709539b4ecbac08ebc826e8f150e2f91d4b587 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@gmail.com>
Date: Tue, 25 Jul 2017 09:42:50 -0400
Subject: [PATCH 0922/3246] elixir: 1.5.0-rc.2 -> 1.5.0

---
 pkgs/development/beam-modules/default.nix    | 4 ++--
 pkgs/development/interpreters/elixir/1.5.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 2 +-
 pkgs/top-level/beam-packages.nix             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index fa748da0031..3a165fd2f6a 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -37,9 +37,9 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = elixir_1_4;
+        elixir = elixir_1_5;
 
-        elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix {
+        elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index 0c3c0304a9b..23c4db804d3 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.5.0-rc.2";
-  sha256 = "0wfxsfz1qbb6iapg8j1qskva6j4mccxqvv79xbz08fzzb6n1wvxa";
+  version = "1.5.0";
+  sha256 = "1y8c0s0wfgv444vhpnz9v8z8rc39kqhzzzkzqjxsh576vd868pbz";
   minimumOTPVersion = "18";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90f95034b1a..1eea8a9853b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6093,7 +6093,7 @@ with pkgs;
 
   inherit (beam.interpreters)
     erlang erlang_odbc erlang_javac erlang_odbc_javac
-    elixir elixir_1_5_rc elixir_1_4 elixir_1_3
+    elixir elixir_1_5 elixir_1_4 elixir_1_3
     lfe lfe_1_2
     erlangR16 erlangR16_odbc
     erlang_basho_R16B02 erlang_basho_R16B02_odbc
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 62ffaec26f3..fd2a5569171 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -56,7 +56,7 @@ rec {
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR19.elixir`.
-    inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3;
+    inherit (packages.erlang) elixir elixir_1_5 elixir_1_4 elixir_1_3;
 
     inherit (packages.erlang) lfe lfe_1_2;
   };

From 70d4d22806a2dee5d5c50048742b57ec9dfab433 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Jul 2017 14:22:33 +0200
Subject: [PATCH 0923/3246] cc-wrapper: Add a "man" output

... and propagate cc.man from there.
---
 pkgs/build-support/cc-wrapper/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 570bb6785df..7df9615653f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -147,6 +147,7 @@ stdenv.mkDerivation {
   inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
   gnugrep_bin = if nativeTools then "" else gnugrep;
 
+  outputs = [ "out" "man" ];
 
   passthru = {
     inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
@@ -166,7 +167,7 @@ stdenv.mkDerivation {
 
   buildCommand =
     ''
-      mkdir -p $out/bin $out/nix-support
+      mkdir -p $out/bin $out/nix-support $man/nix-support
 
       wrap() {
         local dst="$1"
@@ -277,7 +278,8 @@ stdenv.mkDerivation {
       # Propagate the wrapped cc so that if you install the wrapper,
       # you get tools like gcov, the manpages, etc. as well (including
       # for binutils and Glibc).
-      echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
+      echo ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
+      echo ${cc.man or ""}  > $man/nix-support/propagated-user-env-packages
 
       echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
     ''

From b3b1ae67e58b7ea7a6cfa9f22e55d24bd003e3d9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 25 Jul 2017 14:24:25 +0300
Subject: [PATCH 0924/3246] quota: init at 4.03

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

diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix
new file mode 100644
index 00000000000..9ba138bf0e9
--- /dev/null
+++ b/pkgs/tools/misc/quota/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "4.03";
+  name = "quota-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz";
+    sha256 = "0jv7vhxhjp3gc4hwgmrhg448sbzzqib80gdas9nm0c5zwyd4sv4w";
+  };
+
+  outputs = [ "out" "dev" "doc" "man" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ e2fsprogs openldap ];
+
+  meta = with stdenv.lib; {
+    description = "Tools to manage kernel-level quotas in Linux";
+    homepage = http://sourceforge.net/projects/linuxquota/;
+    license = licenses.gpl2; # With some files being BSD as an exception
+    platforms = platforms.linux;
+    maintainers = [ maintainers.dezgeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90f95034b1a..110b79fce59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3918,6 +3918,8 @@ with pkgs;
 
   quilt = callPackage ../development/tools/quilt { };
 
+  quota = callPackage ../tools/misc/quota { };
+
   wiggle = callPackage ../development/tools/wiggle { };
 
   radamsa = callPackage ../tools/security/radamsa { };

From c1597af1f29be6eed8ae577c6bbd091b5f2131a2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 25 Jul 2017 14:25:50 +0300
Subject: [PATCH 0925/3246] dateutils: Fix whitespace

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

diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 40d729d063d..396d26a6cd1 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
   version = "0.4.1";
   name = "dateutils-${version}";
 
-  src =fetchurl {
+  src = fetchurl {
     url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
     sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c";
- 	};
+  };
 
   meta = with stdenv.lib; {
     description = "A bunch of tools that revolve around fiddling with dates and times in the command line";

From dd248fad87ea99a5f2f9e209df662f74cfa662f5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 25 Jul 2017 16:53:28 +0300
Subject: [PATCH 0926/3246] xfstests: 2017-03-26 -> 2017-07-16

---
 pkgs/tools/misc/xfstests/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index f312f4770b5..5b1bee92b08 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, acl, attr, autoreconfHook, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
-, lib, libaio, libcap, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su
+{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
+, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su
 , time, utillinux, which, writeScript, xfsprogs }:
 
 stdenv.mkDerivation {
-  name = "xfstests-2017-03-26";
+  name = "xfstests-2017-07-16";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";
-    rev = "7400c10e503fed20fe2d9f8b03b2157eba4ff3b8";
-    sha256 = "0m30mx8nv49ryijlkqffjmkw2g1xdxsrq868jh9crwh19055v7qp";
+    rev = "c3893c2dc623a07b1ace8e72ee4beb29f8bfae15";
+    sha256 = "1p42dakry4r2366hdgj4i1wcnjs4qk0bfmyr70r1n7s7ykvnvnrl";
   };
 
-  buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ];
+  nativeBuildInputs = [ autoconf automake libtool ];
+  buildInputs = [ acl attr gawk libaio libuuid libxfs openssl perl ];
 
   hardeningDisable = [ "format" ];
   enableParallelBuilding = true;
@@ -55,6 +56,8 @@ stdenv.mkDerivation {
     export MAKE=$(type -P make)
     export SED=$(type -P sed)
     export SORT=$(type -P sort)
+
+    make configure
   '';
 
   postInstall = ''

From 62cd492c82f5a6dc4c0956617b2490fdc1d2939c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 25 Jul 2017 16:47:26 +0300
Subject: [PATCH 0927/3246] xfstests: Use the newly added quota package

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

diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index 5b1bee92b08..a28614e2a26 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,5 +1,5 @@
 { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
-, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su
+, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su
 , time, utillinux, which, writeScript, xfsprogs }:
 
 stdenv.mkDerivation {
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
       ln -s @out@/lib/xfstests/$f $f
     done
 
-    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc utillinux which xfsprogs]}:$PATH
+    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH
     exec ./check "$@"
   '';
 

From a32441cb44126cb29c024128a1c0396e12029744 Mon Sep 17 00:00:00 2001
From: Martin Kreidenweis <martin.kreidenweis.extern@holidaycheck.com>
Date: Tue, 25 Jul 2017 17:37:28 +0200
Subject: [PATCH 0928/3246] chromedriver: 2.29 -> 2.31

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

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 26e820517c0..363cd0fc5e5 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,17 +6,17 @@ let
   allSpecs = {
     "i686-linux" = {
       system = "linux32";
-      sha256 = "70845d81304c5f5f0b7f65274216e613e867e621676a09790c8aa8ef81ea9766";
+      sha256 = "1qi49rcm7r4b8yqx4akmirilp4ifip89n7inji0pihdqzaw604d4";
     };
 
     "x86_64-linux" = {
       system = "linux64";
-      sha256 = "bb2cf08f2c213f061d6fbca9658fc44a367c1ba7e40b3ee1e3ae437be0f901c2";
+      sha256 = "1845nh7kj8scgn85yqwp4nsx7fabcb09w23jp8xa1cxyfvv2wdry";
     };
 
     "x86_64-darwin" = {
       system = "mac64";
-      sha256 = "6c30bba7693ec2d9af7cd9a54729e10aeae85c0953c816d9c4a40a1a72fd8be0";
+      sha256 = "0zyv8i4dbzyk58g4hr5143akgsfaaq9659bwj1m41jwi965grcxa";
     };
   };
 
@@ -25,7 +25,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
-  version = "2.29";
+  version = "2.31";
 
   src = fetchurl {
     url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From f338e99039ed4c85b6eae4c5c0e046c3115ffee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 25 Jul 2017 17:57:50 +0200
Subject: [PATCH 0929/3246] zstd: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 82ead0baa16..fb9301bf1ce 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
-    sha256 = "01b5w4yrwa8lgnjyi42zxjhw8cfyh8yfhdsjr04y5qsblz0hv0zl";
+    sha256 = "1rnxfhcmg8zsagyf70hiwm32mam60hq58pzgy7jn8c3iwv24mpz5";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";

From 099ce92082f026b491ee3a83fa286ad696a49ef5 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 24 Jul 2017 14:34:59 +0200
Subject: [PATCH 0930/3246] gpsbabel: remove failing tests for mac and aarch64

---
 pkgs/applications/misc/gpsbabel/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 90ae1a87654..0911fbace44 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -46,7 +46,9 @@ stdenv.mkDerivation rec {
     # The raymarine and gtm tests fail on i686 despite -ffloat-store.
   + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"
     # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572.
-  + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test";
+  + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test testo.d/classic-2.test"
+    # The arc-project test fails on aarch64.
+  + lib.optionalString stdenv.isAarch64 "rm -v testo.d/arc-project.test";
 
   meta = with stdenv.lib; {
     description = "Convert, upload and download data from GPS and Map programs";

From 1b882171393205e9b09178a53056cbc02d10f75d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 25 Jul 2017 18:09:31 +0200
Subject: [PATCH 0931/3246] perl-CryptX: 0.044 -> 0.050

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0bd8b0c5b0d..62a82ea7048 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2859,16 +2859,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptX = buildPerlPackage rec {
-    name = "CryptX-0.044";
+    name = "CryptX-0.050";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
-      sha256 = "15e5e6bd7b90af24c7e730751fec7b10d8e22ef4380d527bda242dee7dd20443";
+      sha256 = "c1de040779d9f5482d0a2f17a9a5aa6b069c7c58c07fbe26ab62bc689a5c9161";
     };
     propagatedBuildInputs = [ JSONMaybeXS ];
     meta = {
       description = "Crypto toolkit";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From 46383f48d435491e3c3f126668749ffffacc89d9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 25 Jul 2017 18:09:41 +0200
Subject: [PATCH 0932/3246] perl-Perl-Critic: 1.128 -> 1.130

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 62a82ea7048..70d85055c3b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10754,10 +10754,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PerlCritic = buildPerlModule rec {
-    name = "Perl-Critic-1.128";
+    name = "Perl-Critic-1.130";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "83ce563da0a950946367323214b6db30d72db7d006dce24c2a00a9ec13ddb9b4";
+      sha256 = "0662e8f02dd78e39ee9d5b01bdf5376a7cc70ce2b0edc9ca015be35e6cb61df6";
     };
     buildInputs = [ ModuleBuild TestDeep ];
     propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ];

From 97102f458066c3ef4bf290c9f267f085f7218b71 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 25 Jul 2017 18:09:59 +0200
Subject: [PATCH 0933/3246] perl-Unicode-CaseFold: 1.00 -> 1.01

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 70d85055c3b..e7234018508 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15010,16 +15010,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   UnicodeCaseFold = buildPerlModule rec {
-    name = "Unicode-CaseFold-1.00";
+    name = "Unicode-CaseFold-1.01";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz";
-      sha256 = "c489b5a440e84b0554e866d3fe4077fa1956eeed473e203588e0c24acce1f016";
+      sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d";
     };
+    buildInputs = [ ModuleBuild ];
     meta = {
       homepage = http://metacpan.org/release/Unicode-CaseFold;
       description = "Unicode case-folding for case-insensitive lookups";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ stdenv.lib.maintainers.rycee ];
     };
   };
 

From 47821f1cf0cd853d3d3dfea9259e02fea2766327 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Jul 2017 18:46:49 +0200
Subject: [PATCH 0934/3246] cc-wrapper: More quadratic performance fixes

This eliminates the slow lookup of whether we've already seen an rpath
/ library path entry.

Issue #27609.
---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 44 ++++++++++-----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 4b3906a2e10..240082b5dfd 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -64,7 +64,9 @@ extra+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN)
 # Add all used dynamic libraries to the rpath.
 if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
 
-    libPath=""
+    declare -A libDirsSeen
+    declare -a libDirs
+
     addToLibPath() {
         local path="$1"
         if [ "${path:0:1}" != / ]; then return 0; fi
@@ -76,29 +78,27 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
                 fi
                 ;;
         esac
-        case $libPath in
-            *\ $path\ *) return 0 ;;
-        esac
-        libPath+=" $path "
+        if [[ -z ${libDirsSeen[$path]} ]]; then
+            libDirs+=("$path")
+            libDirsSeen[$path]=1
+        fi
     }
 
+    declare -A rpathsSeen
+    declare -a rpaths
+
     addToRPath() {
         # If the path is not in the store, don't add it to the rpath.
         # This typically happens for libraries in /tmp that are later
         # copied to $out/lib.  If not, we're screwed.
         if [ "${1:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then return 0; fi
-        case $rpath in
-            *\ $1\ *) return 0 ;;
-        esac
-        rpath+=" $1 "
+        if [[ -z ${rpathsSeen[$1]} ]]; then
+            rpaths+=("$1")
+            rpathsSeen[$1]=1
+        fi
     }
 
-    libs=""
-    addToLibs() {
-        libs+=" $1"
-    }
-
-    rpath=""
+    declare -a libs
 
     # First, find all -L... switches.
     allParams=("${params[@]}" ${extra[@]})
@@ -112,10 +112,10 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
             addToLibPath ${p2}
             n=$((n + 1))
         elif [ "$p" = -l ]; then
-            addToLibs ${p2}
+            libs+=(${p2})
             n=$((n + 1))
         elif [ "${p:0:2}" = -l ]; then
-            addToLibs ${p:2}
+            libs+=(${p:2})
         elif [ "$p" = -dynamic-linker ]; then
             # Ignore the dynamic linker argument, or it
             # will get into the next 'elif'. We don't want
@@ -135,9 +135,8 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
     # so, add the directory to the rpath.
     # It's important to add the rpath in the order of -L..., so
     # the link time chosen objects will be those of runtime linking.
-
-    for i in $libPath; do
-        for j in $libs; do
+    for i in ${libDirs[@]}; do
+        for j in ${libs[@]}; do
             if [ -f "$i/lib$j.so" ]; then
                 addToRPath $i
                 break
@@ -145,10 +144,9 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
         done
     done
 
-
     # Finally, add `-rpath' switches.
-    for i in $rpath; do
-        extra+=(-rpath $i)
+    for i in ${rpaths[@]}; do
+        extra+=(-rpath "$i")
     done
 fi
 

From ea63fd4eb091087de5dedce1168972e2adebcdfe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Jul 2017 18:50:17 +0200
Subject: [PATCH 0935/3246] multi-ghc-travis: update to latest git version

I used an incorrect date for the version field in my last commit, so now I have
to date this slightly into the future to make sure the new version actually
looks newer to Nix, too.
---
 pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index ed6c7d73fdb..b3df9c605e0 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "multi-ghc-travis-${version}";
-  version = "git-2017-07-26";
+  version = "git-2017-07-27";
 
   buildInputs = [ ghc ];
 
   src = fetchFromGitHub {
     owner = "hvr";
     repo = "multi-ghc-travis";
-    rev = "800980d76f7a74f3cdfd76b3dff351d52d2c84ee";
-    sha256 = "03y8b4iz5ly9vkjc551c1bxalg1vl4k2sic327s3vh00jmjgvhz6";
+    rev = "f21804164cf646d682d7da668a625cdbd8baf05a";
+    sha256 = "07l3qzlc2hl7g5wbgqh8ld8ynl004i6m7p903667gbhs7sw03nbl";
   };
 
   installPhase = ''

From 6b286fa339abf5532b6cae4e65f3139272c66f68 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Tue, 25 Jul 2017 10:46:27 +0200
Subject: [PATCH 0936/3246] cups-filters: 0.14.0 -> 0.15.0

---
 pkgs/misc/cups/filters.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index fec0634ba68..375afcecf70 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "1v553wvr8qdwb1g04if7cw1mfm42vs6xfyg0cvzvbng6yr6jg93s";
+    sha256 = "0g6jmbzgvsq4dq6jaczr6fslpv3692v8yvvmqgw08sb3aly7kgd3";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From 0f536deb74ebacc092c92ab87b072c43bc4e5a4b Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 23 Jul 2017 21:21:58 +0200
Subject: [PATCH 0937/3246] vim-plugins: update

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index af77f5ae4fe..a4bb6f605f8 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -363,17 +363,6 @@ rec {
 
   };
 
-  forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "forms-2012-11-28";
-    src = fetchgit {
-      url = "git://github.com/megaannum/forms";
-      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
-      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
-    };
-    dependencies = ["self"];
-
-  };
-
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "fugitive-2017-07-12";
     src = fetchgit {
@@ -1129,6 +1118,28 @@ rec {
 
   };
 
+  forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "forms-2012-11-28";
+    src = fetchgit {
+      url = "https://github.com/megaannum/forms";
+      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
+      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
+    };
+    dependencies = ["self"];
+
+  };
+
+  self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "self-2014-05-28";
+    src = fetchgit {
+      url = "https://github.com/megaannum/self";
+      rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f";
+      sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn";
+    };
+    dependencies = [];
+
+  };
+
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-startify-2017-06-15";
     src = fetchgit {
@@ -1943,17 +1954,6 @@ rec {
 
   };
 
-  self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "self-2014-05-28";
-    src = fetchgit {
-      url = "git://github.com/megaannum/self";
-      rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f";
-      sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn";
-    };
-    dependencies = [];
-
-  };
-
   sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "sensible-2017-05-09";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index da5c1d62a2f..07ba2680480 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,7 +1,6 @@
 "CSApprox"
 "CheckAttach"
 "Gist"
-"gruvbox"
 "Hoogle"
 "Solarized"
 "Supertab"
@@ -16,8 +15,8 @@
 "YankRing"
 "clang_complete"
 "commentary"
-"ctrlp-py-matcher"
 "ctrlp-cmatcher"
+"ctrlp-py-matcher"
 "ctrlp-z"
 "extradite"
 "fugitive"
@@ -27,8 +26,8 @@
 "github:LnL7/vim-nix"
 "github:Quramy/tsuquyomi"
 "github:Shougo/deoplete.nvim"
-"github:albfan/nerdtree-git-plugin"
 "github:ajh17/Spacegray.vim"
+"github:albfan/nerdtree-git-plugin"
 "github:alvan/vim-closetag"
 "github:ap/vim-css-color"
 "github:bbchung/clighter8"
@@ -45,6 +44,7 @@
 "github:dleonard0/pony-vim-syntax"
 "github:dracula/vim"
 "github:eagletmt/neco-ghc"
+"github:editorconfig/editorconfig-vim"
 "github:eikenb/acp"
 "github:elixir-lang/vim-elixir"
 "github:elmcast/elm-vim"
@@ -57,6 +57,7 @@
 "github:floobits/floobits-neovim"
 "github:frigoeu/psc-ide-vim"
 "github:google/vim-jsonnet"
+"github:heavenshell/vim-jsdoc"
 "github:hecal3/vim-leader-guide"
 "github:idris-hackers/idris-vim"
 "github:itchyny/calendar.vim"
@@ -67,6 +68,7 @@
 "github:jceb/vim-orgmode"
 "github:jeetsukumaran/vim-buffergator"
 "github:jgdavey/tslime.vim"
+"github:jiangmiao/auto-pairs"
 "github:jistr/vim-nerdtree-tabs"
 "github:jnurmine/zenburn"
 "github:jonbri/vim-colorstepper"
@@ -85,6 +87,8 @@
 "github:lyokha/vim-xkbswitch"
 "github:machakann/vim-highlightedyank"
 "github:martinda/Jenkinsfile-vim-syntax"
+"github:megaannum/forms"
+"github:megaannum/self"
 "github:mhinz/vim-startify"
 "github:michaeljsmith/vim-indent-object"
 "github:mileszs/ack.vim"
@@ -93,6 +97,7 @@
 "github:nathanaelkane/vim-indent-guides"
 "github:nbouscal/vim-stylish-haskell"
 "github:neovimhaskell/haskell-vim"
+"github:nixprime/cpsm"
 "github:osyo-manga/shabadou.vim"
 "github:osyo-manga/vim-watchdogs"
 "github:plasticboy/vim-markdown"
@@ -102,8 +107,8 @@
 "github:rhysd/vim-grammarous"
 "github:rodjek/vim-puppet"
 "github:rust-lang/rust.vim"
-"github:sebastianmarkow/deoplete-rust"
 "github:sbdchd/neoformat"
+"github:sebastianmarkow/deoplete-rust"
 "github:sheerun/vim-polyglot"
 "github:shougo/neco-vim"
 "github:shougo/neocomplete.vim"
@@ -134,8 +139,8 @@
 "github:vim-scripts/Rename"
 "github:vim-scripts/ReplaceWithRegister"
 "github:vim-scripts/a.vim"
-"github:vim-scripts/argtextobj.vim"
 "github:vim-scripts/align"
+"github:vim-scripts/argtextobj.vim"
 "github:vim-scripts/changeColorScheme.vim"
 "github:vim-scripts/random.vim"
 "github:vim-scripts/tabmerge"
@@ -145,9 +150,10 @@
 "github:xolox/vim-easytags"
 "github:xolox/vim-misc"
 "github:zah/nim.vim"
-"github:zchee/deoplete-jedi"
 "github:zchee/deoplete-go"
+"github:zchee/deoplete-jedi"
 "goyo"
+"gruvbox"
 "matchit.zip"
 "pathogen"
 "quickfixstatus"
@@ -196,7 +202,3 @@
 "vimwiki"
 "vinegar"
 "vundle"
-"github:jiangmiao/auto-pairs"
-"github:editorconfig/editorconfig-vim"
-"github:heavenshell/vim-jsdoc"
-"github:nixprime/cpsm"

From f35140fafcb41fb515eba5e32f5b43db812f92a3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 23 Jul 2017 21:32:15 +0200
Subject: [PATCH 0938/3246] vim-plugins: add ale

---
 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 a4bb6f605f8..be22b71d2b2 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1789,6 +1789,17 @@ rec {
 
   };
 
+  ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ale-2017-07-23";
+    src = fetchgit {
+      url = "https://github.com/w0rp/ale";
+      rev = "a0059cfe0362e8ba55bad1f4fa8a310c74b55280";
+      sha256 = "0hjli8ww0i4yxa7gxiyvy9xgc9s8krr7vhdh8036nwwnrzrmcc5h";
+    };
+    dependencies = [];
+
+  };
+
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-wakatime-2017-07-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 07ba2680480..10630636b89 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -145,6 +145,7 @@
 "github:vim-scripts/random.vim"
 "github:vim-scripts/tabmerge"
 "github:vim-scripts/wombat256.vim"
+"github:w0rp/ale"
 "github:wakatime/vim-wakatime"
 "github:wincent/command-t"
 "github:xolox/vim-easytags"

From 98cff3f44679665ce0d1da474865db10a1de1439 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 25 Jul 2017 14:25:37 -0400
Subject: [PATCH 0939/3246] darwin stdenv: Ensure libSystem reexports the right
 libraries

The logic was made pure for the normal libSystem, but this change never
made it to the bootstrap tools. Deduplication the logic as the comment
suggests would have prevented this, but here's a stop-gap until we do
so.
---
 pkgs/stdenv/darwin/default.nix               | 2 ++
 pkgs/stdenv/darwin/unpack-bootstrap-tools.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index e7ce04b0a14..cac33a1bebb 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -50,6 +50,8 @@ in rec {
     args    = [ ./unpack-bootstrap-tools.sh ];
 
     inherit (bootstrapFiles) mkdir bzip2 cpio tarball;
+    reexportedLibrariesFile =
+      ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries;
 
     __sandboxProfile = binShClosure + libSystemProfile;
   };
diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
index 66c4e9ebeda..0da80ec5ce5 100644
--- a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
+++ b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
@@ -26,7 +26,7 @@ install_name_tool \
   $out/lib/system/libsystem_kernel.dylib
 
 # TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them!
-libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }')
+libs=$(cat $reexportedLibrariesFile | grep -v '^#')
 
 for i in $libs; do
   if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then

From 34c0ba498c47808695229c6299c8ef66a0de9649 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 16 Jul 2017 12:10:52 -0400
Subject: [PATCH 0940/3246] stdenv-setup: Add quotes that don't do anything for
 consistency.

@vcunat and others rightly point out that it's easier to quote always,
than learn Bash's idiosyncrasies enough to know when it doesn't make a
difference.

This reverts commit 2743078f664ae07c4bed06a96182c6a86bd7fa32, which
removes quotes that don't do anything, and then goes further adding
even more quotes.
---
 pkgs/stdenv/generic/setup.sh | 148 +++++++++++++++++------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 8ee72c96256..e0a33ca1c38 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -13,10 +13,10 @@ set -o pipefail
 # code). The hooks for <hookName> are the shell function or variable
 # <hookName>, and the values of the shell array ‘<hookName>Hooks’.
 runHook() {
-    local hookName=$1
+    local hookName="$1"
     shift
     local var="$hookName"
-    if [[ $hookName =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+    if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
     local -n var
     local hook
     for hook in "_callImplicitHook 0 $hookName" "${var[@]}"; do
@@ -29,10 +29,10 @@ runHook() {
 # Run all hooks with the specified name, until one succeeds (returns a
 # zero exit code). If none succeed, return a non-zero exit code.
 runOneHook() {
-    local hookName=$1
+    local hookName="$1"
     shift
     local var="$hookName"
-    if [[ $hookName =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+    if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
     local -n var
     local hook
     for hook in "_callImplicitHook 1 $hookName" "${var[@]}"; do
@@ -50,8 +50,8 @@ runOneHook() {
 # environment variables) and from shell scripts (as functions). If you
 # want to allow multiple hooks, use runHook instead.
 _callImplicitHook() {
-    local def=$1
-    local hookName=$2
+    local def="$1"
+    local hookName="$2"
     case "$(type -t "$hookName")" in
         (function|alias|builtin) "$hookName";;
         (file) source "$hookName";;
@@ -64,7 +64,7 @@ _callImplicitHook() {
 # A function wrapper around ‘eval’ that ensures that ‘return’ inside
 # hooks exits the hook, not the caller.
 _eval() {
-    local code=$1
+    local code="$1"
     shift
     if [ "$(type -t "$code")" = function ]; then
         eval "$code \"\$@\""
@@ -98,7 +98,7 @@ echoCmd() {
 # Error handling.
 
 exitHandler() {
-    exitCode=$?
+    exitCode="$?"
     set +e
 
     if [ -n "$showBuildStats" ]; then
@@ -112,7 +112,7 @@ exitHandler() {
         echo "build time elapsed: " "${times[@]}"
     fi
 
-    if [ $exitCode != 0 ]; then
+    if [ "$exitCode" != 0 ]; then
         runHook failureHook
 
         # If the builder had a non-zero exit code and
@@ -122,7 +122,7 @@ exitHandler() {
         if [ -n "$succeedOnFailure" ]; then
             echo "build failed with exit code $exitCode (ignored)"
             mkdir -p "$out/nix-support"
-            printf "%s" $exitCode > "$out/nix-support/failed"
+            printf "%s" "$exitCode" > "$out/nix-support/failed"
             exit 0
         fi
 
@@ -130,7 +130,7 @@ exitHandler() {
         runHook exitHook
     fi
 
-    exit $exitCode
+    exit "$exitCode"
 }
 
 trap "exitHandler" EXIT
@@ -141,11 +141,11 @@ trap "exitHandler" EXIT
 
 
 addToSearchPathWithCustomDelimiter() {
-    local delimiter=$1
-    local varName=$2
-    local dir=$3
+    local delimiter="$1"
+    local varName="$2"
+    local dir="$3"
     if [ -d "$dir" ]; then
-        eval export ${varName}=${!varName}${!varName:+$delimiter}${dir}
+        export "${varName}=${!varName}${!varName:+$delimiter}${dir}"
     fi
 }
 
@@ -182,31 +182,31 @@ _addRpathPrefix() {
 
 # Return success if the specified file is an ELF object.
 isELF() {
-    local fn=$1
+    local fn="$1"
     local fd
     local magic
     exec {fd}< "$fn"
-    read -r -n 4 -u $fd magic
+    read -r -n 4 -u "$fd" magic
     exec {fd}<&-
-    if [[ $magic =~ ELF ]]; then return 0; else return 1; fi
+    if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi
 }
 
 # Return success if the specified file is a script (i.e. starts with
 # "#!").
 isScript() {
-    local fn=$1
+    local fn="$1"
     local fd
     local magic
     if ! [ -x /bin/sh ]; then return 0; fi
     exec {fd}< "$fn"
-    read -r -n 2 -u $fd magic
+    read -r -n 2 -u "$fd" magic
     exec {fd}<&-
-    if [[ $magic =~ \#! ]]; then return 0; else return 1; fi
+    if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi
 }
 
 # printf unfortunately will print a trailing newline regardless
 printLines() {
-    [[ $# -gt 0 ]] || return 0
+    [[ "$#" -gt 0 ]] || return 0
     printf '%s\n' "$@"
 }
 
@@ -232,7 +232,7 @@ shopt -s nullglob
 PATH=
 for i in $initialPath; do
     if [ "$i" = / ]; then i=; fi
-    addToSearchPath PATH $i/bin
+    addToSearchPath PATH "$i/bin"
 done
 
 if [ "$NIX_DEBUG" = 1 ]; then
@@ -242,8 +242,8 @@ fi
 
 # Check that the pre-hook initialised SHELL.
 if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
-BASH=$SHELL
-export CONFIG_SHELL=$SHELL
+BASH="$SHELL"
+export CONFIG_SHELL="$SHELL"
 
 
 # Dummy implementation of the paxmark function. On Linux, this is
@@ -252,7 +252,7 @@ paxmark() { true; }
 
 
 # Execute the pre-hook.
-if [ -z "$shell" ]; then export shell=$SHELL; fi
+if [ -z "$shell" ]; then export shell="$SHELL"; fi
 runHook preHook
 
 
@@ -264,13 +264,13 @@ runHook addInputsHook
 
 # Recursively find all build inputs.
 findInputs() {
-    local pkg=$1
-    local var=$2
-    local -n varDeref=$var
-    local propagatedBuildInputsFile=$3
+    local pkg="$1"
+    local var="$2"
+    local -n varDeref="$var"
+    local propagatedBuildInputsFile="$3"
 
     # Stop if we've already added this one
-    [[ -z ${varDeref[$pkg]} ]] || return 0
+    [[ -z "${varDeref["$pkg"]}" ]] || return 0
     varDeref["$pkg"]=1
 
     if ! [ -e "$pkg" ]; then
@@ -294,7 +294,7 @@ findInputs() {
         local fd pkgNext
         exec {fd}<"$pkg/nix-support/$propagatedBuildInputsFile"
         while IFS= read -r -u $fd pkgNext; do
-            findInputs "$pkgNext" $var $propagatedBuildInputsFile
+            findInputs "$pkgNext" "$var" "$propagatedBuildInputsFile"
         done
         exec {fd}<&-
     fi
@@ -307,17 +307,17 @@ if [ -z "$crossConfig" ]; then
     for i in $nativeBuildInputs $buildInputs \
              $defaultNativeBuildInputs $defaultBuildInputs \
              $propagatedNativeBuildInputs $propagatedBuildInputs; do
-        findInputs $i nativePkgs propagated-native-build-inputs
+        findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 else
     declare -gA crossPkgs
     for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
-        findInputs $i crossPkgs propagated-build-inputs
+        findInputs "$i" crossPkgs propagated-build-inputs
     done
 
     declare -gA nativePkgs
     for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
-        findInputs $i nativePkgs propagated-native-build-inputs
+        findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 fi
 
@@ -325,25 +325,25 @@ fi
 # Set the relevant environment variables to point to the build inputs
 # found above.
 _addToNativeEnv() {
-    local pkg=$1
+    local pkg="$1"
 
     # Run the package-specific hooks set by the setup-hook scripts.
     runHook envHook "$pkg"
 }
 
 for i in "${!nativePkgs[@]}"; do
-    _addToNativeEnv $i
+    _addToNativeEnv "$i"
 done
 
 _addToCrossEnv() {
-    local pkg=$1
+    local pkg="$1"
 
     # Run the package-specific hooks set by the setup-hook scripts.
     runHook crossEnvHook "$pkg"
 }
 
 for i in "${!crossPkgs[@]}"; do
-    _addToCrossEnv $i
+    _addToCrossEnv "$i"
 done
 
 
@@ -360,7 +360,7 @@ export TZ=UTC
 # for instance if we just want to perform a test build/install to a
 # temporary location and write a build report to $out.
 if [ -z "$prefix" ]; then
-    prefix=$out;
+    prefix="$out";
 fi
 
 if [ "$useTempPrefix" = 1 ]; then
@@ -408,8 +408,8 @@ fi
 
 
 substitute() {
-    local input=$1
-    local output=$2
+    local input="$1"
+    local output="$2"
     shift 2
 
     if [ ! -f "$input" ]; then
@@ -427,28 +427,28 @@ substitute() {
     while (( "$#" )); do
         case "$1" in
             --replace)
-                pattern=$2
-                replacement=$3
+                pattern="$2"
+                replacement="$3"
                 shift 3
                 ;;
 
             --subst-var)
-                local varName=$2
+                local varName="$2"
                 shift 2
                 # check if the used nix attribute name is a valid bash name
-                if ! [[ $varName =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
+                if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
                     echo "${FUNCNAME[0]}(): WARNING: substitution variables should be valid bash names," >&2
                     echo "  \"$varName\" isn't and therefore was skipped; it might be caused" >&2
                     echo "  by multi-line phases in variables - see #14907 for details." >&2
                     continue
                 fi
-                pattern=@$varName@
-                replacement=${!varName}
+                pattern="@$varName@"
+                replacement="${!varName}"
                 ;;
 
             --subst-var-by)
-                pattern=@$2@
-                replacement=$3
+                pattern="@$2@"
+                replacement="$3"
                 shift 3
                 ;;
 
@@ -467,7 +467,7 @@ substitute() {
 
 
 substituteInPlace() {
-    local fileName=$1
+    local fileName="$1"
     shift
     substitute "$fileName" "$fileName" "$@"
 }
@@ -477,8 +477,8 @@ substituteInPlace() {
 # character or underscore. Note: other names that aren't bash-valid
 # will cause an error during `substitute --subst-var`.
 substituteAll() {
-    local input=$1
-    local output=$2
+    local input="$1"
+    local output="$2"
     local -a args=()
 
     # Select all environment variables that start with a lowercase character.
@@ -494,7 +494,7 @@ substituteAll() {
 
 
 substituteAllInPlace() {
-    local fileName=$1
+    local fileName="$1"
     shift
     substituteAll "$fileName" "$fileName" "$@"
 }
@@ -521,7 +521,7 @@ dumpVars() {
 stripHash() {
     local strippedName
     # On separate line for `set -e`
-    strippedName=$(basename "$1")
+    strippedName="$(basename "$1")"
     if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
         echo "$strippedName" | cut -c34-
     else
@@ -532,7 +532,7 @@ stripHash() {
 
 unpackCmdHooks+=(_defaultUnpack)
 _defaultUnpack() {
-    local fn=$1
+    local fn="$1"
 
     if [ -d "$fn" ]; then
 
@@ -563,7 +563,7 @@ _defaultUnpack() {
 
 
 unpackFile() {
-    curSrc=$1
+    curSrc="$1"
     header "unpacking source archive $curSrc" 3
     if ! runOneHook unpackCmd "$curSrc"; then
         echo "do not know how to unpack source archive $curSrc"
@@ -581,7 +581,7 @@ unpackPhase() {
             echo 'variable $src or $srcs should point to the source'
             exit 1
         fi
-        srcs=$src
+        srcs="$src"
     fi
 
     # To determine the source directory created by unpacking the
@@ -615,7 +615,7 @@ unpackPhase() {
                             echo "unpacker produced multiple directories"
                             exit 1
                         fi
-                        sourceRoot=$i
+                        sourceRoot="$i"
                         ;;
                 esac
             fi
@@ -677,7 +677,7 @@ fixLibtool() {
 configurePhase() {
     runHook preConfigure
 
-    if [[ -z $configureScript && -x ./configure ]]; then
+    if [[ -z "$configureScript" && -x ./configure ]]; then
         configureScript=./configure
     fi
 
@@ -689,7 +689,7 @@ configurePhase() {
         done
     fi
 
-    if [[ -z $dontAddPrefix && -n $prefix ]]; then
+    if [[ -z "$dontAddPrefix" && -n "$prefix" ]]; then
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
@@ -725,7 +725,7 @@ configurePhase() {
 buildPhase() {
     runHook preBuild
 
-    if [[ -z $makeFlags && ! ( -n $makefile || -e Makefile || -e makefile || -e GNUmakefile[[ ) ]]; then
+    if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile[[ ) ]]; then
         echo "no Makefile, doing nothing"
     else
         # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
@@ -770,7 +770,7 @@ installPhase() {
         mkdir -p "$prefix"
     fi
 
-    installTargets=${installTargets:-install}
+    installTargets="${installTargets:-install}"
 
     # shellcheck disable=SC2086
     local flagsArray=( $installTargets \
@@ -799,7 +799,7 @@ fixupPhase() {
     # Apply fixup to each output.
     local output
     for output in $outputs; do
-        prefix=${!output} runHook fixupOutput
+        prefix="${!output}" runHook fixupOutput
     done
 
 
@@ -879,7 +879,7 @@ distPhase() {
         # Note: don't quote $tarballs, since we explicitly permit
         # wildcards in there.
         # shellcheck disable=SC2086
-        cp -pvd ${tarballs:-*.tar.gz} $out/tarballs
+        cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs"
     fi
 
     runHook postDist
@@ -887,8 +887,8 @@ distPhase() {
 
 
 showPhaseHeader() {
-    local phase=$1
-    case $phase in
+    local phase="$1"
+    case "$phase" in
         unpackPhase) header "unpacking sources";;
         patchPhase) header "patching sources";;
         configurePhase) header "configuring";;
@@ -920,14 +920,14 @@ genericBuild() {
     fi
 
     for curPhase in $phases; do
-        if [[ $curPhase = buildPhase && -n $dontBuild ]]; then continue; fi
-        if [[ $curPhase = checkPhase && -z $doCheck ]]; then continue; fi
-        if [[ $curPhase = installPhase && -n $dontInstall ]]; then continue; fi
-        if [[ $curPhase = fixupPhase && -n $dontFixup ]]; then continue; fi
-        if [[ $curPhase = installCheckPhase && -z $doInstallCheck ]]; then continue; fi
-        if [[ $curPhase = distPhase && -z $doDist ]]; then continue; fi
+        if [[ "$curPhase" = buildPhase && -n "$dontBuild" ]]; then continue; fi
+        if [[ "$curPhase" = checkPhase && -z "$doCheck" ]]; then continue; fi
+        if [[ "$curPhase" = installPhase && -n "$dontInstall" ]]; then continue; fi
+        if [[ "$curPhase" = fixupPhase && -n "$dontFixup" ]]; then continue; fi
+        if [[ "$curPhase" = installCheckPhase && -z "$doInstallCheck" ]]; then continue; fi
+        if [[ "$curPhase" = distPhase && -z "$doDist" ]]; then continue; fi
 
-        if [[ -n $tracePhases ]]; then
+        if [[ -n "$tracePhases" ]]; then
             echo
             echo "@ phase-started $out $curPhase"
         fi

From b33b40036be24385c14850b2bd0eacfe1573cf11 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 25 Jul 2017 22:57:37 +0200
Subject: [PATCH 0941/3246] ddccontrol: disable bindnow hardening

Caused segfaults. Fixes #27612.
---
 pkgs/tools/misc/ddccontrol/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index b3aca778cd9..26c5a6b2139 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   patches = [ ./automake.patch ];
 
-  hardeningDisable = [ "format" ];
+  hardeningDisable = [ "format" "bindnow" ];
 
   prePatch = ''
       newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g")

From 00512470ec241949148b61e1c120fa76d685cf9a Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 21 Jul 2017 13:43:44 +0000
Subject: [PATCH 0942/3246] tinc service: add CLI tools to the $PATH

Now user can execute e.g. "sudo tinc.netname dump nodes"
---
 nixos/modules/services/networking/tinc.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 7376d2d24a0..42341b2d412 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -194,6 +194,19 @@ in
       })
     );
 
+    environment.systemPackages = let
+      cli-wrappers = pkgs.stdenv.mkDerivation {
+        name = "tinc-cli-wrappers";
+        buildInputs = [ pkgs.makeWrapper ];
+        buildCommand = ''
+          mkdir -p $out/bin
+          ${concatStringsSep "\n" (mapAttrsToList (network: data: ''
+              makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" --add-flags "--pidfile=/run/tinc.${network}.pid"
+            '') cfg.networks)}
+        '';
+      };
+    in [ cli-wrappers ];
+
     users.extraUsers = flip mapAttrs' cfg.networks (network: _:
       nameValuePair ("tinc.${network}") ({
         description = "Tinc daemon user for ${network}";

From 1ec964b327e6d5ac97367ba2166d319f9e21c13e Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Jul 2017 20:32:50 -0400
Subject: [PATCH 0943/3246] elpa-packages: 2017-07-25

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 7d8d01aafd6..da2eefd985a 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.90.2";
+        version = "11.91.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-11.90.2.tar";
-          sha256 = "1hid8srj64nwbxcjvdma1xy07bh0v8ndhhsi3nmx9vdi3167khz6";
+          url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar";
+          sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3";
         };
         packageRequires = [];
         meta = {
@@ -930,10 +930,10 @@
     hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "hydra";
-        version = "0.13.5";
+        version = "0.14.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/hydra-0.13.5.tar";
-          sha256 = "0vq1pjyq6ddbikbh0vzdigbs0zlldgwad0192s7v9npg8qlwi668";
+          url = "https://elpa.gnu.org/packages/hydra-0.14.0.tar";
+          sha256 = "1r2vl2cpzqzayfzc0bijigxc7c0mkgcv96g4p65gnw99jk8d78kb";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1023,10 +1023,10 @@
     js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "js2-mode";
-        version = "20170116";
+        version = "20170721";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/js2-mode-20170116.tar";
-          sha256 = "1z4k7710yz1fbm2w8m17q81yyp8sxllld0zmgfnc336iqrc07hmk";
+          url = "https://elpa.gnu.org/packages/js2-mode-20170721.tar";
+          sha256 = "02w2hgk8qbmwkksqf1dmslpr3xn9zjp3srl3qh8730w8r8s8czni";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1446,10 +1446,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170717";
+        version = "20170724";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170717.tar";
-          sha256 = "0jrkfclwlbfcdkf56awnmvyw5vb9qwbfyyf2z4ilwx29zps9mxnh";
+          url = "https://elpa.gnu.org/packages/org-20170724.tar";
+          sha256 = "1f1szds6642427hrzagxgkr05z66sf57n5l2acvmpgw4z358ms0n";
         };
         packageRequires = [];
         meta = {
@@ -1785,10 +1785,10 @@
       }) {};
     sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "sokoban";
-        version = "1.4.2";
+        version = "1.4.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sokoban-1.4.2.tar";
-          sha256 = "0sciv7rl1p1ar1jris1py2slrd8kr4q6a4plmb0jq6lv9dlqyvc6";
+          url = "https://elpa.gnu.org/packages/sokoban-1.4.4.tar";
+          sha256 = "0lz0qxgs71yh23iayv50rb6qgqvgbz2bg2sgfxcps8wag643ns20";
         };
         packageRequires = [];
         meta = {
@@ -2198,10 +2198,10 @@
     yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "yasnippet";
-        version = "0.11.0";
+        version = "0.12.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/yasnippet-0.11.0.tar";
-          sha256 = "1m0hchhianl69sb1iqa8av513qvz6krjg4b5ppwfx1sjlai9xj2y";
+          url = "https://elpa.gnu.org/packages/yasnippet-0.12.1.tar";
+          sha256 = "01q1hn3w8w63s7cvr9bq6l5n4nyirnk8qfba60ajp3j6ndi2964n";
         };
         packageRequires = [ cl-lib ];
         meta = {

From 187b67dd90ef052d840d3335c5c41ee811d81dc9 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Jul 2017 20:33:14 -0400
Subject: [PATCH 0944/3246] org-packages: 2017-07-25

---
 .../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 29b793825c4..9d7af37e514 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 = "20170717";
+        version = "20170724";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170717.tar";
-          sha256 = "1cbk01awnyan1jap184v2bxsk97k0p2qn19z7gnid6wiblybgs89";
+          url = "http://orgmode.org/elpa/org-20170724.tar";
+          sha256 = "07rpr8zf12c62sfbk9c9lvvfphs3ws136d3vlnq6j7gypdzyb32m";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170717";
+        version = "20170724";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170717.tar";
-          sha256 = "0710ba6gq04cg8d87b5wi7bz9gq9yqvqmkmgscawfm2ynfw2q8sa";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170724.tar";
+          sha256 = "12xgvdmpz6wnylcvfngh7lqvgs9wv1bdrm7l7fivakx8y3dyq7k7";
         };
         packageRequires = [];
         meta = {

From e533918024b58174c52b0899d355ae16572c1470 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Jul 2017 20:35:07 -0400
Subject: [PATCH 0945/3246] melpa-stable-packages: 2017-07-25

---
 .../emacs-modes/melpa-stable-generated.nix    | 387 +++++++++++++-----
 1 file changed, 288 insertions(+), 99 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 8f1bf8ff38d..0796c41d749 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -20,6 +20,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "a";
+        version = "0.1.0alpha4";
+        src = fetchFromGitHub {
+          owner = "plexus";
+          repo = "a.el";
+          rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
+          sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
+          sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886";
+          name = "a";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/a";
+          license = lib.licenses.free;
+        };
+      }) {};
     aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
     melpaBuild {
         pname = "aa-edit-mode";
@@ -590,12 +611,12 @@
     ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ac-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -2809,12 +2830,12 @@
     binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "binclock";
-        version = "1.10";
+        version = "1.11";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "binclock.el";
-          rev = "2e529ace67a04e6872a2328769782ef33b0e463a";
-          sha256 = "0ldyx90lrhfn7qypxsmaf2yhpamjiqzvsk0b0jlgg09ars1fvhns";
+          rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876";
+          sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
@@ -4132,12 +4153,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "0.14.0";
+        version = "0.15.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "f3c396ff8cf4baf331b0e19e18e33b795b66ee3e";
-          sha256 = "1np4bh7fxv6xkvdg1nyd596p2yjkrh5msw2wsfyidl0xb1jdnj9c";
+          rev = "e503f5628ef98bd768f08c698863e8e33a7af3b4";
+          sha256 = "1bb0l06af7k7zzsig8kmn71krbm9mwdj7dc0s17rbhnm84cdfc8b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -4606,12 +4627,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.9.0pre6";
+        version = "3.9.0";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "25b72e9097260d1faf254155a1199886c808a58f";
-          sha256 = "0rzy8fpagsqfln1x27mq89dh819jc8h2dlf7axmxq63g830c029q";
+          rev = "f15cfd891d1e01247ed285320ae32b6c3182ac8f";
+          sha256 = "0asp6kijrmf9bayg8jvhgkd1z2falzhyippkwgih9ygpa65qvqpq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5305,12 +5326,12 @@
     company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "company-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -5872,12 +5893,12 @@
     cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "cricbuzz";
-        version = "0.2.8";
+        version = "0.2.9";
         src = fetchFromGitHub {
           owner = "lepisma";
           repo = "cricbuzz.el";
-          rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45";
-          sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
+          rev = "05087b0f6d5a941b5ec18acc8bcf20efd6d71568";
+          sha256 = "1zin191dcr6qli2cwgf6jjz2dvlxiaranglpc5365bkkvwb5f250";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@@ -5977,16 +5998,16 @@
     csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
     melpaBuild {
         pname = "csound-mode";
-        version = "0.1";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "hlolli";
           repo = "csound-mode";
-          rev = "b0e74f149a15118e8d85bf073b2ff5e0dd3cba7f";
-          sha256 = "0c73xjhqgp1f7bplm47cgpssm8kpj3vda9n0fqcyq5i38ncfqwva";
+          rev = "e3fbb1fecd730fd66893cadf41c2cb8c2d9c1685";
+          sha256 = "105hhn5f5ml32i3iwrm2d2ikx9lb96m3lsg9v9i72713mayvkqan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
-          sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95ccfae76a2c0f627f6d218ca68072e79fcfd088/recipes/csound-mode";
+          sha256 = "15zmgsh1071cyd9a0d7cljq8k7d8l2gkjjpv8z22gnm0wfbb0yys";
           name = "csound-mode";
         };
         packageRequires = [ emacs multi shut-up ];
@@ -6166,12 +6187,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "0.26pre1";
+        version = "0.26";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "85a2dfe76a2bc28d4c8c1a760ef04e614f61be73";
-          sha256 = "0gcdwzw952kddvxxgzsj93rqlvh2gs8bghz605zgm97baadvrizy";
+          rev = "62f04f6766386893f5da6bee23d4de1e92a4148d";
+          sha256 = "0rw22qa67ifrw7kd58wjs2bnrjzkpr75k1rbhdgba526mm4s0q0x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -7302,6 +7323,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "docker-compose-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "meqif";
+          repo = "docker-compose-mode";
+          rev = "85cf81d2964c7b721a7f1317cf9efd5bf3a7f671";
+          sha256 = "1l0pcmjhvayfx1hn4125ilhr3lb4rzhrqrf91lnkh7m1rv3npcik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
+          sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
+          name = "docker-compose-mode";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/docker-compose-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "docker-tramp";
@@ -7808,12 +7850,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "1.0.0";
+        version = "1.3.1";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "226fa5c661391c7f8317a24c9f757396e1900371";
-          sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
+          rev = "468352a0a813c5ce8edba71c82f00e24b516d74c";
+          sha256 = "0sryibflylwy8pqp80xyxmdndk2idcgpgk9zxixwpim3mcwn78yl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -8457,12 +8499,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "1.1.2";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c";
-          sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp";
+          rev = "cc26f37e19ebc60ca75067115d3794cda88003c5";
+          sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -10599,12 +10641,12 @@
     evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-matchit";
-        version = "2.2.2";
+        version = "2.2.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "0b0e6d61a6462fc6fff7000b739ce5b31acd0d4c";
-          sha256 = "13qxsbvmi0dkzmf59j0xyjwwcspyhymm6swsagqy4b57ypis5hxh";
+          rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b";
+          sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -11522,12 +11564,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "5.3.2";
+        version = "5.4.0";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "99801cd730d579ed3b05d084ad254b6a73b259aa";
-          sha256 = "0pqg6iib5ns6k5is0bv8riwficadi64dinzdjibk94h8i7cmp54h";
+          rev = "2d3e8d095e0c36f927142e80c4330977be698568";
+          sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -11781,12 +11823,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "1.9.0";
+        version = "1.9.1";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "fdac635ecc57ac7743f74678147aca2e956561de";
-          sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1";
+          rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0";
+          sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -12348,12 +12390,12 @@
     flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "flycheck-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -13782,12 +13824,12 @@
     ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ghc";
-        version = "5.7.0.0";
+        version = "5.8.0.0";
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "c3d0a681a19261817cf928685f7b96878fe51e91";
-          sha256 = "1d2hsfmshh29g5bvd701py9n421hmz49hk0zjx5m09s8znjkvgx3";
+          rev = "35690941aadbe44d9401102ab44a39753e0bb2b5";
+          sha256 = "0fcaxj2lhkhkm2h91d9fdqas2b99wblwl74l2y6ckpf05hrc4w1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -16394,12 +16436,12 @@
     helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dash";
-        version = "1.2.0";
+        version = "1.3.0";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "a0f5d6539da873cd0c51d8ef714930c970a66aa0";
-          sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
+          rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe";
+          sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -17339,12 +17381,12 @@
     helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "helm-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -18305,12 +18347,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "0.13.6";
+        version = "0.14.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "91f8e7c13bcd9629ad1678588e58576ca6806b58";
-          sha256 = "1czdar4yv5c9996wvj887d0c1knlrpcjj0aq2dily2x074gdzh4j";
+          rev = "943636fe4a35298d9d234222bc4520dec9ef2305";
+          sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -19522,12 +19564,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.2.4";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "117369f882f81fb9cc88459a4072a2789138c136";
-          sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f";
+          rev = "acd6322571cb0820868a6febdc5326782a29b729";
+          sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -19627,12 +19669,12 @@
     ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ivy-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -20045,12 +20087,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170116";
+        version = "20170721";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236";
-          sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g";
+          rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc";
+          sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -20738,12 +20780,12 @@
     ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ksp-cfg-mode";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "lashtear";
           repo = "ksp-cfg-mode";
-          rev = "07a957512e66030e1b9f8ac0f259051386acb5b5";
-          sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr";
+          rev = "713a22ee28688e581ec3ad60228c853b516a14b6";
+          sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
@@ -21603,6 +21645,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mac-pseudo-daemon";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "osx-pseudo-daemon";
+          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon";
+          sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6";
+          name = "mac-pseudo-daemon";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/mac-pseudo-daemon";
+          license = lib.licenses.free;
+        };
+      }) {};
     macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "macro-math";
@@ -22481,12 +22544,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.8.2";
+        version = "0.8.3";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a";
-          sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7";
+          rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
+          sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22520,6 +22583,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "memoize";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacs-memoize";
+          rev = "636defefa9168f90bce6fc27431352ac7d01a890";
+          sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize";
+          sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
+          name = "memoize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/memoize";
+          license = lib.licenses.free;
+        };
+      }) {};
     mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
     melpaBuild {
         pname = "mentor";
@@ -22544,7 +22628,7 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "2.5.5";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
@@ -23971,12 +24055,12 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.12";
+        version = "1.11.13";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "04e071a5e4cdf7f5396a0e36874e0a023b7af232";
-          sha256 = "1hzp70sm4bwlbqnd7mmzan10wsgb03a1zfiqmwxnc61jgjxd5jva";
+          rev = "0ec723375bc6008a8a88024962b052c3fbbaf4b8";
+          sha256 = "1wg622s0qvgdzry4mb6a7jjpql7la58kwhzpif0akyd689xf9d9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -24055,12 +24139,12 @@
     nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nodejs-repl";
-        version = "0.1.1";
+        version = "0.1.6";
         src = fetchFromGitHub {
           owner = "abicky";
           repo = "nodejs-repl.el";
-          rev = "d821ef49a8eae0e405fd2a000246f0475542a575";
-          sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy";
+          rev = "16770656a4072f8fbbd29d0cace4893a3d5541b1";
+          sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -24769,8 +24853,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
-          sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
+          rev = "ad147956b936fd528d26ca88158a8af96ff5827a";
+          sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -26147,6 +26231,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-pseudo-daemon";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "osx-pseudo-daemon";
+          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon";
+          sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw";
+          name = "osx-pseudo-daemon";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/osx-pseudo-daemon";
+          license = lib.licenses.free;
+        };
+      }) {};
     osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-trash";
@@ -26570,12 +26675,12 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "2.22";
+        version = "2.23";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "b4e03ab345043fa7447dd59e59234dd33395e3cc";
-          sha256 = "08yxi878l1hibcsq0bb93g2rjwlc0xw415rgn1rzs3zib2hqj1qc";
+          rev = "58f893d54c0916ad832097a579288ef8ce405da5";
+          sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -29878,6 +29983,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rib-mode";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "blezek";
+          repo = "rib-mode";
+          rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866";
+          sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
+          sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587";
+          name = "rib-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/rib-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rich-minority";
@@ -30112,12 +30238,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -30172,6 +30298,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-electric";
+        version = "2.2.3";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "ruby-electric.el";
+          rev = "dfb4b448a63ae749c74edf6415ad569d52cab904";
+          sha256 = "0z3whvjmxbyk7lrxl3z2lj1skacwd050b5jvpnw6gcdm2hr8mfbs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
+          sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2";
+          name = "ruby-electric";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ruby-electric";
+          license = lib.licenses.free;
+        };
+      }) {};
     ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-end";
@@ -30698,12 +30845,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "1.6.6";
+        version = "1.7.1";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916";
-          sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7";
+          rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937";
+          sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -32039,6 +32186,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "solaire-mode";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-solaire-mode";
+          rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358";
+          sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
+          sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5";
+          name = "solaire-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/solaire-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
@@ -32567,12 +32735,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114";
-          sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij";
+          rev = "dbd8608551bc9e05280415b7b3937b1a151c7718";
+          sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -36057,8 +36225,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "f94ec5fed665";
-          sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n";
+          rev = "1ab8f296baeb";
+          sha256 = "02g34b7kp3lkv4sfgf1762vlmmsnxib37v8385lmv90ww24lwggg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -36113,6 +36281,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    melpaBuild {
+        pname = "with-simulated-input";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "with-simulated-input";
+          rev = "568bfb8e1d59a19cb309fd72a7ab0e9e51229e31";
+          sha256 = "1aa8ya5yzsijra7cf9rm80ffddv520kzm9rggw3nr3dj2sk03p8c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
+          sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk";
+          name = "with-simulated-input";
+        };
+        packageRequires = [ emacs s seq ];
+        meta = {
+          homepage = "https://melpa.org/#/with-simulated-input";
+          license = lib.licenses.free;
+        };
+      }) {};
     wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wn-mode";
@@ -36683,12 +36872,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "0.11.0";
+        version = "0.12.1";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "e6b865127783f498b61fa99ad0f5413200ac09d0";
-          sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9";
+          rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5";
+          sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -36727,8 +36916,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "e9299b77df1f";
-          sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm";
+          rev = "4f8551386af2";
+          sha256 = "0qvp54pzc6m52j5xkwp25nwdlik6v879halmfvcpn3z0grhrslbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";

From 6fcb5b708eae633a4ab1ffe6c42e18aacbbed558 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Jul 2017 20:42:18 -0400
Subject: [PATCH 0946/3246] melpa-packages: 2017-07-25

Removals:
 - bbdb-android: removed from github
 - bbdb-china: removed from github
 - bbdb-handy: removed from github
 - chinese-remote-input: removed from github
 - easy-lentic: removed from github
 - sql-mssql: removed from github
---
 .../editors/emacs-modes/melpa-generated.nix   | 1901 ++++++++++-------
 1 file changed, 1081 insertions(+), 820 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 53035f2415e..192306a059a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -82,6 +82,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "a";
+        version = "20170720.553";
+        src = fetchFromGitHub {
+          owner = "plexus";
+          repo = "a.el";
+          rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
+          sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
+          sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886";
+          name = "a";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/a";
+          license = lib.licenses.free;
+        };
+      }) {};
     aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
     melpaBuild {
         pname = "aa-edit-mode";
@@ -801,8 +822,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -923,12 +944,12 @@
     ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-buffer";
-        version = "20160229.1458";
+        version = "20170717.1148";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ace-jump-buffer";
-          rev = "9224e279a53fba06ed5561e22bf89ab94f74b9e7";
-          sha256 = "1y2rl4faj1nfjqbh393yp460cbv24simllak31ag1ischpcbqjy4";
+          rev = "9b1bb1a817c97cfa3853cc24474bd13e641f560d";
+          sha256 = "1qlm025jhxqsb5xcp1mcpm4djlah9xnsw3m26cfrk686b17x8l4l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
@@ -986,12 +1007,12 @@
     ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-zap";
-        version = "20150330.1342";
+        version = "20170717.1149";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ace-jump-zap";
-          rev = "c60af83a857955b68c568c274a3c80cbe93f3150";
-          sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4";
+          rev = "52b5d4c6c73bd0fc833a0dcb4e803a5287d8cae8";
+          sha256 = "1iw90mk6hdrbskxgv67xj27qd26w5dlh4s6a6xqqsj8ld56nzbvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap";
@@ -1178,8 +1199,8 @@
         src = fetchFromGitHub {
           owner = "nickmccurdy";
           repo = "add-hooks";
-          rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7";
-          sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82";
+          rev = "5e18cc3887477aeec41a34f608d9aa55bfa92d0e";
+          sha256 = "05a0ayqjldl53s3zmfgmdqq8jf1qw1m2a2sj4qzn2bci0dgsakcp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1428,8 +1449,8 @@
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "40cb03bbb56f09cfbfae07ff9ff97f3aaf8324be";
-          sha256 = "0pngxrs1zz0vr0m7sbrl11a5gnxsgbqk1kp9566nj79h02y81sd7";
+          rev = "0c0f8efbeaefa49ef04c0c4405b1ef79ecc5433e";
+          sha256 = "08hkx5wf9qyh4d5s5z4v57d43qkzw6p8zsqijw92wy4kngv1gl78";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes";
@@ -1634,12 +1655,12 @@
     all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons-gnus";
-        version = "20170711.241";
+        version = "20170718.2354";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "all-the-icons-gnus";
-          rev = "fe2080fe78c28b140be4ee2018cdf3c72b87fa31";
-          sha256 = "1lxq6fqrwxzd2cr8a7nvapaaf9pd1mfyqqk0rhg50fp3i16z5nkk";
+          rev = "8785d04f54b1692c04f4b665864f8f95425c20c6";
+          sha256 = "0zn9aq0ml39p2adjb9hpqk2iwb1dk5z5jdhabxszmhbs3zs53i52";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus";
@@ -2604,12 +2625,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20170418.1352";
+        version = "20170721.1400";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "98c548917bb696d541a58bfcf85f02572d8f7ebd";
-          sha256 = "0kr6p1kf0sb036w9pb20xlfs7ynw357fv0zifsb8g7q1va7m5vs7";
+          rev = "5727dd549d9cb95a6a18919f90428d7c5b860a99";
+          sha256 = "0a66s9lyi4anf4s6sxh66b4c4lsa9m3bqdqym4qhf53ywi55qal5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2641,22 +2662,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    arch-packer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "arch-packer";
-        version = "20170506.1005";
+        version = "20170723.430";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "arch-packer";
-          rev = "e195c4f30da2a756f6e14715f436ff22826b5e82";
-          sha256 = "0xxgnavpcimkb9adlbpcv96pp829x41nv744c8yl8rl8lb4f9xdl";
+          rev = "743b3dc5f239c77e9c5c3049b5a9701da1ae12ee";
+          sha256 = "0h5ajz5mcj9g1y9f5fyqcjmqss99403v6lbqngh20mj8pi6w9rr5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer";
           sha256 = "06gmkc63ys6diiwbhdjyn17yhvs91nxdhqkydmm18553pzsmcy72";
           name = "arch-packer";
         };
-        packageRequires = [ async emacs s ];
+        packageRequires = [ async dash emacs s ];
         meta = {
           homepage = "https://melpa.org/#/arch-packer";
           license = lib.licenses.free;
@@ -4424,12 +4445,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170713.1237";
+        version = "20170718.1307";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "f701a8e191ae9c0bd6ab93926ce993bb18a9e98c";
-          sha256 = "026a5frqvd2j09zzbf83mw3hmcj1ps7nsia87k0yn13sk62rd5bk";
+          rev = "06d54b58f2ea5c49507164d97e8837406484a274";
+          sha256 = "0a4xhq5y4vclv91zq83vb8irsvf0xly09y3zxvddyliy4bn3f8hi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4568,11 +4589,11 @@
       }) {};
     bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bbdb";
-        version = "20170129.2224";
+        version = "20170725.300";
         src = fetchgit {
           url = "https://git.savannah.nongnu.org/git/bbdb.git";
-          rev = "8998b3416b36873f4e49454879f2eed20c31b384";
-          sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn";
+          rev = "c951e15cd01d84193937ae5e347143321c3a2da9";
+          sha256 = "1m19f74zkyh0zyigv807rlznvf2l72kdg6gfizf8pan85qvk949l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
@@ -4606,48 +4627,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb-android = callPackage ({ bbdb-vcard, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "bbdb-android";
-        version = "20150705.2224";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "bbdb-android";
-          rev = "60641acf8b90e34b70f783b3d6e7789a4272f2b4";
-          sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1296e9ffe3a49022a9480b398fbfa311121a1020/recipes/bbdb-android";
-          sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3";
-          name = "bbdb-android";
-        };
-        packageRequires = [ bbdb-vcard ];
-        meta = {
-          homepage = "https://melpa.org/#/bbdb-android";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bbdb-china = callPackage ({ bbdb-vcard, chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "bbdb-china";
-        version = "20150615.1856";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "bbdb-china";
-          rev = "a64725ca6dbb5ec1825f3a9112df9aa54bb14f6c";
-          sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-china";
-          sha256 = "1clrl3gk036w8q3p2f189jp6wv1y3xv037v77rg87dyz0yjs61py";
-          name = "bbdb-china";
-        };
-        packageRequires = [ bbdb-vcard chinese-pyim ];
-        meta = {
-          homepage = "https://melpa.org/#/bbdb-china";
-          license = lib.licenses.free;
-        };
-      }) {};
     bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }:
     melpaBuild {
         pname = "bbdb-csv-import";
@@ -4690,27 +4669,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb-handy = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "bbdb-handy";
-        version = "20150707.1752";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "bbdb-handy";
-          rev = "67936204488b539fac9b4a7bfbf11546f3b13de2";
-          sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-handy";
-          sha256 = "16wjnsw4p7y21zmpa69vpwydsv5i479czk3y79cnn7s4ap69jmm8";
-          name = "bbdb-handy";
-        };
-        packageRequires = [ bbdb ];
-        meta = {
-          homepage = "https://melpa.org/#/bbdb-handy";
-          license = lib.licenses.free;
-        };
-      }) {};
     bbdb-vcard = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bbdb-vcard";
@@ -5132,12 +5090,12 @@
     binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "binclock";
-        version = "20170418.812";
+        version = "20170725.121";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "binclock.el";
-          rev = "38ef6531fed16eb2fa69824fbdafac998cf201ac";
-          sha256 = "13s4j04b60l44xs381v4padhdyqs8625ssqph24qral6iizwry8d";
+          rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876";
+          sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
@@ -5153,12 +5111,12 @@
     bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-chord";
-        version = "20160530.1042";
+        version = "20170717.1152";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "use-package-chords";
-          rev = "e8551ce8a514d865831d3a889acece79103fc627";
-          sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5";
+          rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
+          sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord";
@@ -5654,7 +5612,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170703.1431";
+        version = "20170719.2147";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
@@ -5884,12 +5842,12 @@
     browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "browse-at-remote";
-        version = "20170624.309";
+        version = "20170720.1518";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "e8b7533f6c37c4660e4ba97cd4856383f4e4ce32";
-          sha256 = "0650c2401qidw5zprgvnkvqbar9vs9yyj58njiwc394xf5xwzsmb";
+          rev = "b5cff7971ca8bbb966e3acd9b7e5c4c007f94215";
+          sha256 = "16ms9703m15dfxg6ap4mdw7msf8z5rzsdhba51dwivfpjxg7n52c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
@@ -6175,15 +6133,15 @@
     buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-sets";
-        version = "20170505.829";
+        version = "20170717.2040";
         src = fetchgit {
           url = "https://git.flintfam.org/swf-projects/buffer-sets.git";
-          rev = "dd47af82f6cd5c4bab304e41518d4dc06bd6e353";
-          sha256 = "1wsx7m9wmzc6yiiyvsjmlqzazcss4vaq8qcdm3r1gybli32llraw";
+          rev = "4a4ccb0d6916c3e9fba737bb7b48e8aac921954e";
+          sha256 = "1rg6iwswi82w8938pavwhvvr2z3ismb42asam2fkad47h2sgn0gz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets";
-          sha256 = "0r8mr53bd5cml5gsvq1hbl9894xsq0wwv4p1pp2q4zlcyxlwf4fl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5/recipes/buffer-sets";
+          sha256 = "1xj9fn2x4kbx8kp999wvz1j68znp7j81zl6rnbaipbx7hjpqrsin";
           name = "buffer-sets";
         };
         packageRequires = [ cl-lib ];
@@ -6424,12 +6382,12 @@
     busybee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "busybee-theme";
-        version = "20130920.942";
+        version = "20170719.228";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "busybee-theme";
-          rev = "70850d1781ff91c4ce125a31ed451d080f8da643";
-          sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx";
+          rev = "66b2315b030582d0ebee605cf455d386d8c30fcd";
+          sha256 = "1cvj5m45f5ky3w86khh6crvdqrdjxg2z6b34jlm32qpgmn0s5g45";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36e2089b998d98575aa6dd3cc79fb7f6847f7aa3/recipes/busybee-theme";
@@ -6947,12 +6905,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20170621.1316";
+        version = "20170725.248";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2";
-          sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd";
+          rev = "7a843c9209cf48c53e1f3dfd533c156d6c701501";
+          sha256 = "0xj0bqn3mc8kpihpki1y2wx9ydqvza9kbpz2di8wa768zj1xh6qz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -7370,8 +7328,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "28484409e8f64f976bf3d80f10081b18f7724cf5";
-          sha256 = "0zvxrbf30hy511jmlfvmqj5yiysfbs73x064w1px7ghavczdjvx5";
+          rev = "e14319ed4308647746027bd62131ef07692710b9";
+          sha256 = "1rpv8nl18wgijz3vh7anh1xvhqx8vbc8bajx0l2036v3k4mq3dc6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7410,7 +7368,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12270";
+          rev = "12277";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7739,22 +7697,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    chinese-fonts-setup = callPackage ({ cnfonts, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20170512.1";
+        version = "20170724.737";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "a88f45239ca73e95eb6bac923590f1d108b822ca";
-          sha256 = "1h0nwrnh0krn9p0x1cj67gjdlzr82xml76ycn6745f943sn6d5ah";
+          rev = "bb285b91da12ba9c5897a6aed9c893449000210d";
+          sha256 = "0dq745yjbwv1xb6i7m7372i4rb6brq9y4f70m01wcmacm6h85j14";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
           sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
           name = "chinese-fonts-setup";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cnfonts emacs ];
         meta = {
           homepage = "https://melpa.org/#/chinese-fonts-setup";
           license = lib.licenses.free;
@@ -7781,22 +7739,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
+    chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20170512.735";
+        version = "20170724.1618";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "d57d0fd47565dc087724a68c6b3abd16a58625ae";
-          sha256 = "10ir2452rj6f48qfgwps6y1mn5afrsa04z0xl2f31j5463j4b4mx";
+          rev = "dd034c6fb9473aed7ee856a366f3cac031e82209";
+          sha256 = "1clqz4yg86mm673pabzi54angc7qr41pikrz0x2ya0qhz88g0y9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
           sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
           name = "chinese-pyim";
         };
-        packageRequires = [ async chinese-pyim-basedict cl-lib popup pos-tip ];
+        packageRequires = [ pyim ];
         meta = {
           homepage = "https://melpa.org/#/chinese-pyim";
           license = lib.licenses.free;
@@ -7805,12 +7763,12 @@
     chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-pyim-basedict";
-        version = "20160723.438";
+        version = "20170724.1523";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim-basedict";
-          rev = "3bca2760d78fd1195dbd4c2d570db955023a5623";
-          sha256 = "07dd90bhmayacgvv5k6j079wk3zhlh83zw471rd37n2hmw8557mv";
+          rev = "6b6eea5375d2e0b4b6374fbf766ebb209ece86af";
+          sha256 = "0rx30m9ag3hbggm9jl0bpkn0svf5838nj6qsailcnxkyxq3cga2l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict";
@@ -7826,12 +7784,12 @@
     chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-pyim-greatdict";
-        version = "20170513.1833";
+        version = "20170724.1525";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim-greatdict";
-          rev = "8efd9321d21d5daabdb32cb3696bc7c7b83ce991";
-          sha256 = "05ap9d2kk9dyj85zm581nwizbdqx8fqa0yjswk4df0y6mgz4g0q9";
+          rev = "45fa4ff26f3444fb98c4dea460d84b740204d105";
+          sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict";
@@ -7844,45 +7802,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-pyim-wbdict = callPackage ({ chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    chinese-pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-pyim-wbdict";
-        version = "20170217.15";
+        version = "20170724.1527";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim-wbdict";
-          rev = "59856a7199dde278c33f6f8d8e21df4944ba996a";
-          sha256 = "1aahff6r0liil7nx1pprmkmb5c39kwywblj3n6zs80ikwy4759xb";
+          rev = "114489ed97e825ae11a8d09da6e873820cf23106";
+          sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict";
           sha256 = "0y9hwn9rjplb69vi4s9bvf6fkvns2rlpkqm0qvv44mxq7g61lm5c";
           name = "chinese-pyim-wbdict";
         };
-        packageRequires = [ chinese-pyim ];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-pyim-wbdict";
-          license = lib.licenses.free;
-        };
-      }) {};
-    chinese-remote-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "chinese-remote-input";
-        version = "20150110.2103";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "chinese-remote-input";
-          rev = "d05d0bd116421e6fd19f52e9e576431ee5de0858";
-          sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b639a9d3b258afe6637055e75a2939f2df18366a/recipes/chinese-remote-input";
-          sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag";
-          name = "chinese-remote-input";
-        };
         packageRequires = [];
         meta = {
-          homepage = "https://melpa.org/#/chinese-remote-input";
+          homepage = "https://melpa.org/#/chinese-pyim-wbdict";
           license = lib.licenses.free;
         };
       }) {};
@@ -8034,12 +7971,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170717.303";
+        version = "20170724.2248";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "7daf4e968de21e7eb7bb2dc1b6ca30ae4e990532";
-          sha256 = "00y8d8gz0nfqr9dfd1nrkm32ckaln4cg6l6k3jbjzc0la673ljfr";
+          rev = "ea6aa352f7e5b97e00ac2057c2d7579a9e6f411f";
+          sha256 = "000zgcb66hgh1sxcn48q6dp2ln90nakpknikp441z8h9yhaazh8f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8310,7 +8247,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "308172";
+          rev = "309006";
           sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
         };
         recipeFile = fetchurl {
@@ -8516,12 +8453,12 @@
     clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20170608.320";
+        version = "20170720.712";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "769eb06ac82dff8aa0239b9ca47cf3240ff0857f";
-          sha256 = "17g6rq30dvvhr3lljzn5gg6v9bdxw31fw6b20sgcp7gx4xspc42w";
+          rev = "f5295df68955c23fffd60718039fd386d13c77f5";
+          sha256 = "14lp3jxxpjfm31rbrf2rb988fzh4xfacqdcwp15b87pixziln08x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8952,8 +8889,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "2d5e494637f9dad13fd0206ac3420e7d26f8b778";
-          sha256 = "0wsljwpd0ld4c0qxfn1x1a7xvcq8ik5dmxcys94cb2cw8xxgzbz2";
+          rev = "d9a541eacbd0d3e833a93853f03e6be26b99dc37";
+          sha256 = "0fr4wml4ay4vi9wsn8jv566nakq1q68ylm3yacy7031fndq3ipvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8969,12 +8906,12 @@
     cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-project";
-        version = "20150720.1359";
+        version = "20170725.912";
         src = fetchFromGitHub {
           owner = "alamaison";
           repo = "emacs-cmake-project";
-          rev = "5212063b6276f8b9af8b48b4052e5ec97721c08b";
-          sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6";
+          rev = "ae763397663fbd35de0541a5d9f2de18a5de3305";
+          sha256 = "0ynxcbf0jbn6b4dxswhk9qhijmhp05q6v925nglq67j0xjm8bicw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project";
@@ -10500,8 +10437,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10668,8 +10605,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
-          sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
+          rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6";
+          sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10685,12 +10622,12 @@
     composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "composable";
-        version = "20170426.459";
+        version = "20170723.2347";
         src = fetchFromGitHub {
           owner = "paldepind";
           repo = "composable.el";
-          rev = "09020605ee7f4e52ff2fa2f6d68d826db1ee7565";
-          sha256 = "0vhvgn0ybdnh8c71sbjxh6bb05w5ivm3rmkj4f255zqfkjyddl7q";
+          rev = "ac981974f89607393cc61314aaa19672d45b0650";
+          sha256 = "0xg46r6ibga27cdycbysm80n2ayi8vmxcff1b6bqjjrsc0wbdnac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable";
@@ -10769,12 +10706,12 @@
     config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "config-general-mode";
-        version = "20170715.733";
+        version = "20170719.446";
         src = fetchFromGitHub {
           owner = "tlinden";
           repo = "config-general-mode";
-          rev = "dd018f96f631a3fc6230ce5011d6357cf9720ef1";
-          sha256 = "15xvp40b3sbwjf492j0abaknwc5f0cz0f7hydy7mdqdlha20qahs";
+          rev = "8927fd1c359275dc4236c5f48fea0e3ce8349bed";
+          sha256 = "04f6608ndhan6xmipzylzwzx2asx0bsqx8a9rnxfab3bza756c99";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode";
@@ -11041,12 +10978,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170710.1111";
+        version = "20170725.946";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
-          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
+          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11461,12 +11398,12 @@
     cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "cricbuzz";
-        version = "20161130.2036";
+        version = "20170724.2330";
         src = fetchFromGitHub {
           owner = "lepisma";
           repo = "cricbuzz.el";
-          rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45";
-          sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
+          rev = "049e9d3c0c67350e008e62bd15b263add8f3a403";
+          sha256 = "1vvaysvmpvdm4l20arzwgy0xhqy7lnav6wglq1x9ax7c7c0a3cdr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@@ -11649,16 +11586,16 @@
     csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
     melpaBuild {
         pname = "csound-mode";
-        version = "20170715.650";
+        version = "20170725.855";
         src = fetchFromGitHub {
           owner = "hlolli";
           repo = "csound-mode";
-          rev = "9c96406bbda815a4c8068d9c4a2a0dd5bd8f3325";
-          sha256 = "14k2qbdn4l47kal647b8fy1lrcnivydnk651m02y3d6w41vgp7pq";
+          rev = "14524d63a174c36a052c79025942f6a116a5f197";
+          sha256 = "1h5sfwl2mjy8w2hnb73w2am1p2glwzf5n53q3d0ri8in83nxjn59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
-          sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95ccfae76a2c0f627f6d218ca68072e79fcfd088/recipes/csound-mode";
+          sha256 = "15zmgsh1071cyd9a0d7cljq8k7d8l2gkjjpv8z22gnm0wfbb0yys";
           name = "csound-mode";
         };
         packageRequires = [ emacs multi shut-up ];
@@ -11979,12 +11916,12 @@
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
-        version = "20170712.2110";
+        version = "20170724.924";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "c5ad3a1815ba25b91aced8232b6f6268a10379d7";
-          sha256 = "1l8m5mk7qdvw9cc6ypqahrrzxfzdx7n5yp1j82dgli9gy0sq027v";
+          rev = "88eff8a42d6ed8ba7782ae003ec9597aed4fd019";
+          sha256 = "0pzdm5nbhykssc633injz6jw422ksy632fhz0szd03a6kfx49iby";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@@ -12124,12 +12061,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "20140705.1229";
+        version = "20170723.1342";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "a2db27bb85d0daa4cc4b4b7d65c0e6a7cda5ec2a";
-          sha256 = "101gdyvhkb5lzsa69slaq0l81sjmrr34sb5sxbjxrbx5pk5wh9gz";
+          rev = "fb5e92001fe31a49227378e90a77bc5f4e2a83ff";
+          sha256 = "0ym87yhmidxn25ba9si6hl76svgzm9mb8ar2qbbb9h7xcqscx6p0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12229,12 +12166,12 @@
     dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dakrone-light-theme";
-        version = "20170501.654";
+        version = "20170724.1403";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "dakrone-light-theme";
-          rev = "4b3f3ba8e2ffc35e537507894620245c96ff8965";
-          sha256 = "1191iyjc5pw6jy9kqmjgr1s4n88ndjdsys7hwzc8c18glv411r69";
+          rev = "5f1d506a8047cf8790ab50baf08b539645af6299";
+          sha256 = "1kadp8h97zz26d3br0y9bakwi90c7rwgjya9z46m0mx9jjlpx5yw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme";
@@ -13529,8 +13466,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13543,22 +13480,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-collapse = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-collapse";
-        version = "20170717.208";
+        version = "20170719.346";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
           sha256 = "1k8h5cl8r68rnr1a3jnbc0ydflzm5mad7v7f1q60wks5hv61dsd1";
           name = "dired-collapse";
         };
-        packageRequires = [ dash ];
+        packageRequires = [ dash f ];
         meta = {
           homepage = "https://melpa.org/#/dired-collapse";
           license = lib.licenses.free;
@@ -13711,12 +13648,12 @@
     dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-filter";
-        version = "20161009.530";
+        version = "20170718.1145";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13736,8 +13673,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13841,8 +13778,8 @@
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "dired-launch";
-          rev = "9dea31574dcf006d5247b488a1942faaac434362";
-          sha256 = "03dim1ca332882i08r19k4vjzw3hwwg132n2mrxhniyzgkk7g891";
+          rev = "75745f2e40d060cae909f9e6f6ca2e5f725180b8";
+          sha256 = "1amsqbbjzjw07s40v8c63iw59qf5r1x7rqq2iq1jiybwsrp9s7v0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13862,8 +13799,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13883,8 +13820,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13944,8 +13881,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13965,8 +13902,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -14065,8 +14002,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14145,12 +14082,12 @@
     direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "direnv";
-        version = "20170622.1128";
+        version = "20170717.1049";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-direnv";
-          rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa";
-          sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867";
+          rev = "d181475192138b256e124a42660ac60ae62d11d0";
+          sha256 = "09pcssxas9aqdnn2n9y61f016fip9qgxsr16nzljh66dk0lnbgrw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -14835,12 +14772,12 @@
     docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20170601.1345";
+        version = "20170718.303";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "d3bdb09af10c7aa466b25e0c65a3d21fdf44514e";
-          sha256 = "097nrhnc668yclvisq5hc3j8jgpk7w7k7clrlp5a1r1gd5472sj7";
+          rev = "8070936871e0fbb20fb04c28630288ebe314b8b9";
+          sha256 = "0gk4ykvsv8wgfiym0z635a3n3jaw4wnvfmf78ppfinrzybg85r76";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14882,6 +14819,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "docker-compose-mode";
+        version = "20170722.941";
+        src = fetchFromGitHub {
+          owner = "meqif";
+          repo = "docker-compose-mode";
+          rev = "c21c79aa0aac7175eb90913b2eaa1201c181bd01";
+          sha256 = "03w99zlhafypsw3rjf0skp5m963sq7ygd63ibknqaw3xghb0vxyz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
+          sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
+          name = "docker-compose-mode";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/docker-compose-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "docker-tramp";
@@ -15011,12 +14969,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170717.426";
+        version = "20170718.1137";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "a00ee6cc48179dfeb8836726d9faa9b4f119783a";
-          sha256 = "0f1szgr7xz2bg222x8b9h6kmi6diipc2r4j4yafjpsgkniv6c93c";
+          rev = "557ff5d129b8b79e48287e68c934d309070c0542";
+          sha256 = "1swwb3mkysn3rj9mbmbnyg0whx13k060cyi0phly5zssk4sj1n5i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15446,7 +15404,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1802135";
+          rev = "1802990";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15547,12 +15505,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170627.1309";
+        version = "20170721.49";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "0328d922da4b1bbbb8f41848585c920608f6e9d3";
-          sha256 = "1l3s42y90d2canslkjvfs4n5zlpdxp0h4b1yrip9825gh2k4fan7";
+          rev = "e1a6647fecdaf77f737c3d16e0b8e6cb3cab1cb2";
+          sha256 = "0bxfayqrp05fsic0nfk47iarfqgdlnqaahvbr9bx56js9s0fgm5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15607,6 +15565,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dut-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dut-mode";
+        version = "20170721.2214";
+        src = fetchFromGitHub {
+          owner = "dut-lang";
+          repo = "dut-mode";
+          rev = "affd16ad1e78799bb4ec99f80006271447d075f9";
+          sha256 = "16yp7s3m7bm4chmkzlbqix4cfv6x7mgcdcl7j55h782dm252zfcg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf49ceab8b25591fab2ed6574cba0e6634d1539/recipes/dut-mode";
+          sha256 = "0hlr5qvqcqdh2k1nyq621z6vq2yiflj4jy0pgg6lbiy3j6819mai";
+          name = "dut-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dut-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
@@ -15924,12 +15903,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170708.307";
+        version = "20170724.1123";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "226fa5c661391c7f8317a24c9f757396e1900371";
-          sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
+          rev = "ca215061068b2dec3dd98f0da3a1294fa2f77430";
+          sha256 = "06mihlh2zzgfkbss9gbhyd5f8wkmb4lxsxnxfndym63pgzsy2j0s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15984,27 +15963,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }:
-    melpaBuild {
-        pname = "easy-lentic";
-        version = "20170309.2143";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "easy-lentic";
-          rev = "d2b600cc3bd3166c3e4543435070b511ae9bf148";
-          sha256 = "1p99yf1nlial254dyy9i30lfx2v4jwpahvi9pfjm5sv64212vp33";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic";
-          sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg";
-          name = "easy-lentic";
-        };
-        packageRequires = [ cl-lib lentic ];
-        meta = {
-          homepage = "https://melpa.org/#/easy-lentic";
-          license = lib.licenses.free;
-        };
-      }) {};
     easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-repeat";
@@ -16510,12 +16468,12 @@
     edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edit-server";
-        version = "20141231.1358";
+        version = "20170725.859";
         src = fetchFromGitHub {
           owner = "stsquad";
           repo = "emacs_chrome";
-          rev = "f7cf37c3f605812d429fd90699d6d33f6ac9db8d";
-          sha256 = "1i4fvw7703pr505mzspkc7sphh3mbg4pvbpfcr847lrg66pdw419";
+          rev = "462c57be72b3a8652f705bde0d3b7cd2f79644fa";
+          sha256 = "0s4s90sbk82yp08my8jdmn4kn5cx8xc9cf02asrq4b4jvljynwvj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server";
@@ -16657,12 +16615,12 @@
     edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "edts";
-        version = "20170421.55";
+        version = "20170725.338";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
           repo = "edts";
-          rev = "3f90f4484ac03f06286b15b0c33ff0e5aeed2bb5";
-          sha256 = "0wpr7h7vl1pi05sxyivk1a22qhcm74iacnra9h1d2jcf6as1h5x4";
+          rev = "5b94473b7fe00edc50a001ff4eb55f54753d8742";
+          sha256 = "00yqmfic02f6082mndndnfcas16by3lav8w3z0hh618a8prmzhdm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16810,12 +16768,12 @@
     ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170714.1753";
+        version = "20170714.1910";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "08d2792d690cefb9ef2e00a14d3bbb1da55252a9";
-          sha256 = "0fw56v0xx4axw24wzy8rk69zy0nhajk4y3fqi1305acfgn6hnnvg";
+          rev = "cda6143270cf44d2c9e59904b2c7bbd225d226ee";
+          sha256 = "13h93cs69cz9rq56jncjiq3p0fkd3khniral828ky5vkvhihf2wv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16860,12 +16818,12 @@
     eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eink-theme";
-        version = "20161207.410";
+        version = "20170717.807";
         src = fetchFromGitHub {
           owner = "maio";
           repo = "eink-emacs";
-          rev = "40e7a7d31ee160175aa89583609d3f953fb066c6";
-          sha256 = "0701c7x8wwr99d5l50k8n2a6zx7dh067d702v032g5axh7lqsn2j";
+          rev = "4c990bb3428f725735fa1f733ef4c5ad61f632b0";
+          sha256 = "0jxs36qdsx58ni5185qyi1c7gchyla3dpv4v9drj1n072ls82ld4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme";
@@ -17015,12 +16973,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170706.936";
+        version = "20170723.19";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "979ea29884f54c5ac4a6a5b2873547c0964e3dd3";
-          sha256 = "021ld1cs7swmrlbvnakwwx6xlyg95g8cnc6d1vk03a81p7s897il";
+          rev = "cc26f37e19ebc60ca75067115d3794cda88003c5";
+          sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -17393,8 +17351,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "79077efc34aad25bb43cf46a28a69a308196c972";
-          sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
+          rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff";
+          sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17463,8 +17421,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "79077efc34aad25bb43cf46a28a69a308196c972";
-          sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
+          rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff";
+          sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17900,12 +17858,12 @@
     elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-mirror";
-        version = "20160917.10";
+        version = "20170722.422";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "elpa-mirror";
-          rev = "dcadffd331ac70c59e1960d34b7f998302c616d6";
-          sha256 = "08dz6zy9fqj7qd1g1igvr28q2znrd5pwxxqjlrkzs994ypfj1vzq";
+          rev = "5c793f6df944b7f1a68893438696c12240f0b930";
+          sha256 = "0p5q44p6jl306qns4xf7f03pq091zczvjnh9bjax6z6sx54yadsd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -18947,12 +18905,12 @@
     enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "enlive";
-        version = "20150824.549";
+        version = "20170725.717";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "enlive";
-          rev = "0f6646adda3974e7fe9a42339a4ec3daa532eda5";
-          sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh";
+          rev = "604a8ca272b6889f114e2b5a13adb5b1dc4bae86";
+          sha256 = "1iwfb5hxhnp4rl3rh5yayik0xl2lg82klxkvqf29536pk8ip710m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/388fa2580e687d9608b11cdc069841831b414b29/recipes/enlive";
@@ -19010,12 +18968,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170710.347";
+        version = "20170724.630";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "aaaa9e34f5ea023621bc8123064d3183b35339a7";
-          sha256 = "11nxhzy4qc4y1gfi0m5c78jv2ib5gpsqdr1p84q0yqkzdc9wvcmd";
+          rev = "c8e936ed3793fab0dcbfad797ff97aa5c91562e2";
+          sha256 = "0mj0k5wh6sndlnj8pcfhl0gwgas6433iyjrifpf0v5p7m5cizy5x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19123,12 +19081,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20170702.59";
+        version = "20170723.1240";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "d9c43561d8d50066c1774e3cf3df12e168c9fc92";
-          sha256 = "145zn11l9i0lmjr83zvn8snviqqn6kw24dm5ihlllgxycclsvcrm";
+          rev = "11e8cc60a4dcfa973fabb4085b35e5951def84ca";
+          sha256 = "1izgmlv52qgc8y29zx12q25bm1y3yzzz0sdy128bj2blc6j60wbd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19605,12 +19563,12 @@
     ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20170509.1202";
+        version = "20170723.1921";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "3e6fea941af18415b520f2fabc45349c4a148a8f";
-          sha256 = "1b0whc2llfff6wggiran0df7wrh06mygca0cqpps6ljfniqcxl5y";
+          rev = "7b0600620fc64cdb92bb9a69144c68eaa088db5b";
+          sha256 = "05ihafhhjlq7b4zs58jaqssgqdha5kqv65hvk7946ba7l845fi83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -19651,8 +19609,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "de5cfabdad61d45a112d95e24ac44e3f51a4bd18";
-          sha256 = "14mi9qj2q0h21jy9zj4gqjz2205013d5s5l02asq6iid747jhx3j";
+          rev = "72d994d7a6251e6ec72cf864b11309e01c50ba1f";
+          sha256 = "05bs7r01bm2zfldg3j4915rnm7px2hcr04p3yzsy8sz36hqcjm81";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19814,12 +19772,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170705.2002";
+        version = "20170724.1307";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "61a8bf7d6cc6881e5555922eb36eecc6733a2b87";
-          sha256 = "0anc7bdar2q5c41ilah3p04p4z3mxkqlv91nkky72i58sgrw6za6";
+          rev = "28f06589e07a22b7a1a1b19f79472c0bafb5fc32";
+          sha256 = "0413706dxmql9sl2rwi7y9pqdka73lnpqwn5cvl2y4r279hdppv3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -20234,12 +20192,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170710.118";
+        version = "20170725.59";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "064174931f0cbf91ad24fda883909a06eee10f6e";
-          sha256 = "0f6ikmgcakaa74p271nfkg55gbq2wxdjq978h8kp7x7vaczfjz0n";
+          rev = "a313565f97badfefb289672af45df6311060eef3";
+          sha256 = "15zy6hjfpwkacxc11ws76w7ynwl4m2qqlh84xq3nifg2zpl4cns6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20360,12 +20318,12 @@
     esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esup";
-        version = "20170508.1536";
+        version = "20170724.2348";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "esup";
-          rev = "efaf44d0739391aed48c77b5cd3013b50027ed36";
-          sha256 = "1ddff6scpnljl9h957zx7nahxd6si0gcznkg5da09sa7vpds0732";
+          rev = "86500014ccf9736a731038222d5d2727e428bb6c";
+          sha256 = "03kblqlh9q2i3zmlj97wi0m93df3c799njlb6gpjl7ml6qfj4qf7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -20381,12 +20339,12 @@
     esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esxml";
-        version = "20160703.1417";
+        version = "20170723.1503";
         src = fetchFromGitHub {
           owner = "tali713";
           repo = "esxml";
-          rev = "fd0f0185cd579b00c3d76d2c383cd33fe642bb93";
-          sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb";
+          rev = "c4646d3a5a274e21efe125ae9f87b9934014e6ad";
+          sha256 = "05r2jhcrzrjna5dnq95gnagjn11bx0ysgbcnn4rffwms09avbwvf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml";
@@ -20528,8 +20486,8 @@
         src = fetchFromGitHub {
           owner = "kaz-yos";
           repo = "eval-in-repl";
-          rev = "d96a134abe65c736bfaf0a78d1f899ea7cf0fee5";
-          sha256 = "00ilv46ybpw5arfqi3pk7gjabkac76siqpgj3ca47s6vlmz41anv";
+          rev = "b21c5f0da65973d542952ab86e001b777c5f3447";
+          sha256 = "15zd9vqjh89lhy9h6kbhrm5m5394zfzma3xdcfp1dmk8v7384py8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -20605,6 +20563,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eve-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, polymode }:
+    melpaBuild {
+        pname = "eve-mode";
+        version = "20170724.1408";
+        src = fetchFromGitHub {
+          owner = "witheve";
+          repo = "emacs-eve-mode";
+          rev = "16de9c42393f687446dd9ffd36fcc7428437bf7f";
+          sha256 = "0xpga18zw78v7wqxmfsv00s2r5rwil0khqjjkm867gk20954j7zh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e0f197adfe64ef88d90d24dfd6532bf52a5bce0d/recipes/eve-mode";
+          sha256 = "1ch50bm452g8k1xnqcbpmpwkmg8amzv7bq0hphk3y0kiqkwd1gdh";
+          name = "eve-mode";
+        };
+        packageRequires = [ emacs markdown-mode polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/eve-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
@@ -20612,8 +20591,8 @@
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "dc936936666595afdbdbb4cc44c1f82e74c6802c";
-          sha256 = "0l0sjrfpp5xk5c74gryh1sf9hpv8qkykdwg59vzsmn0w9ii217p5";
+          rev = "a0b6afcf3993f2edcce39052403220a10e74f362";
+          sha256 = "0qswzjxm91s34x32xa61ypwr2fc7cgjaj1wnlgqznxyzjqvdh709";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20692,12 +20671,12 @@
     evil-cleverparens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit, smartparens }:
     melpaBuild {
         pname = "evil-cleverparens";
-        version = "20160611.904";
+        version = "20170717.2113";
         src = fetchFromGitHub {
           owner = "luxbock";
           repo = "evil-cleverparens";
-          rev = "82c920ba04accfd31fa292e11c454d5112b4fd51";
-          sha256 = "0ajy5kp2asrg070vzyzgyqs9jnzglm7lvx8fqvgdhpmhzzfckhbi";
+          rev = "8c45879d49bfa6d4e414b6c1df700a4a51cbb869";
+          sha256 = "0lhnybpnk4n2yhlcnj9zxn0vi5hpjfaqfhvyfy7ckzz74g8v7iyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3b3637d6527b16ea0d606fd87b01004be446b09/recipes/evil-cleverparens";
@@ -20818,12 +20797,12 @@
     evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-ediff";
-        version = "20170623.707";
+        version = "20170724.1223";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-ediff";
-          rev = "862310e244d406751cdc7eae8e8c0d88414a48c7";
-          sha256 = "0088xgvzsy3rmdkw6r90vnxgsxr9mmqkwaw18m9bm4fivday75b0";
+          rev = "67b0e69f65c196eff5b39dacb7a9ec05bb919c74";
+          sha256 = "0f8g07fyzyc8pdwizyj62v0dy65ap885asph83529y0j8wnni8ps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-ediff";
@@ -20965,12 +20944,12 @@
     evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-goggles";
-        version = "20170710.724";
+        version = "20170724.211";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-goggles";
-          rev = "902270eea80594577d9af26298998406f79e59a0";
-          sha256 = "11v1zpi3jnsxdwhxv441rvbkyb6v1sg4zyk74aw14l5cf38f0d55";
+          rev = "879114abeaad8515937cb2a762d0438b6b7bb026";
+          sha256 = "0zia2z0nvsxmplg1d6dy45dj5pkvak2wqn7dw10yb9bj0shfhjmv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -21175,12 +21154,12 @@
     evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-matchit";
-        version = "20170713.647";
+        version = "20170719.702";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "2fc961d94b27e528df1fc4b88d297dd9af8ed6d6";
-          sha256 = "16fk050q8ibdp4n5fflcz2scsbky7dg1kf97c28f1gszixp6yng0";
+          rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b";
+          sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -21343,12 +21322,12 @@
     evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "evil-org";
-        version = "20170622.1310";
+        version = "20170724.752";
         src = fetchFromGitHub {
           owner = "Somelauw";
           repo = "evil-org-mode";
-          rev = "975109dc665f53cef221b3c668612664340b7940";
-          sha256 = "0fr0wxd53a0lv2akvayi844fncn8klj88hmld73x2d1igig38p4q";
+          rev = "fc21477b2ac12b570c8428808f334d467a617e86";
+          sha256 = "0fqk11mq4l7q7c5dv8049pmsggh3cmy4fhhq7c6h36dij02fkf01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -22840,12 +22819,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20170531.2054";
+        version = "20170725.133";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "a6e59891973f3e40ca2e414ca66799cc686d8626";
-          sha256 = "16wxw5bxb3nmw6glx2iqcfr75fsya1a9kxd6khv46zy5z85n1bng";
+          rev = "2d3e8d095e0c36f927142e80c4330977be698568";
+          sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -23470,12 +23449,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "20170416.1718";
+        version = "20170725.127";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "fdac635ecc57ac7743f74678147aca2e956561de";
-          sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1";
+          rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0";
+          sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -23596,12 +23575,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170715.1345";
+        version = "20170723.839";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "b78d5a6f48c2ebd4298cf33c3364c63d86ae32cc";
-          sha256 = "14mp95k9365869fikzsvxha74121kbcrwp0pavv17calf29ycxck";
+          rev = "35c0ce171dc7127d85a745d922b233544c41040b";
+          sha256 = "0084lk692l6lxz82k242v2gwp6bdv5yjv5xvn3ra43x2d7mx4zz1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23932,12 +23911,12 @@
     flycheck-cython = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-cython";
-        version = "20160327.1228";
+        version = "20170724.258";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-cython";
-          rev = "45097658a16eeabf2bd5e0464355f8f37a1aeffc";
-          sha256 = "0994346iyp7143476i3y6pc5m1n6z7g1r6n1rldivsj0qr4gjh01";
+          rev = "ecc4454d35ab5317ab66a04406f36f0c1dbc0b76";
+          sha256 = "1v17skw0wn7a7nkc1vrs0bbzihnjw0dwvyyd0lydsihzxl5z2r5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d963eb1b8f8f863b37a96803b00d395e9d85e94/recipes/flycheck-cython";
@@ -24713,8 +24692,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24923,8 +24902,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
-          sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
+          rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6";
+          sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -24940,12 +24919,12 @@
     flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-coffee";
-        version = "20140809.324";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-coffee";
-          rev = "325ab379592fdf9017d7c19625c7a978f6f3af3b";
-          sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7";
+          rev = "dee295acf30820ed15fe0de17137d50bc27fc80c";
+          sha256 = "0706jbi3jcmffxmcpvh8w3007q8sh48kgrcjip5c9hhfqpagayld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-coffee";
@@ -24982,12 +24961,12 @@
     flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-css";
-        version = "20121104.1104";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-css";
-          rev = "4649fc209836498d709bb627e8aa6e50189a06ec";
-          sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy";
+          rev = "de090163ba289910ceeb61b13368ce42d0f2dfd8";
+          sha256 = "18rqzah8p7mqwkddaav1d4r146amvn8jppazvsvc5vs01syj83m9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-css";
@@ -25129,12 +25108,12 @@
     flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-haml";
-        version = "20130324.351";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-haml";
-          rev = "3117d94ecad908710502e8def42dbae5748e9c1d";
-          sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l";
+          rev = "22a81e8484734552d461e7ae7305664dc244447e";
+          sha256 = "0pgp2gl3wdwrzcik5b5csn4qp8iv6pc51brx8p7jrwn7bz4lkb82";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-haml";
@@ -25150,12 +25129,12 @@
     flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-haskell-multi";
-        version = "20130620.422";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-haskell-multi";
-          rev = "6183620ffee429b33c886fffd6106b876245ea47";
-          sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd";
+          rev = "b564a94312259885b1380272eb867bf52a164020";
+          sha256 = "1h21hy5fjwa5qxl31rq3jjp3wwkipdwaliq0ci184rw48kw51xjh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e879eca5eb11b2ae77ee2cb8d8150d85e9e93ebd/recipes/flymake-haskell-multi";
@@ -25171,12 +25150,12 @@
     flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-hlint";
-        version = "20130309.145";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-hlint";
-          rev = "fae0c16f938129fb933e4c4625287816e8e160f0";
-          sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp";
+          rev = "f910736b26784efc9a2fa29503f45c1f1dd0aa38";
+          sha256 = "157f2l6hllwl12h8f502rq2kl33s202k9bcyfy2cmnn6vhky1b8s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17820f32d46e845cc44b237d0bfd5c2d898721de/recipes/flymake-hlint";
@@ -25213,12 +25192,12 @@
     flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-jslint";
-        version = "20130613.202";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-jslint";
-          rev = "68ca28a88cffdd317f50c712b09abd2ccda8d7bc";
-          sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls";
+          rev = "8edb82be605542b0ef62d38d818adcdde335eecb";
+          sha256 = "0i6bqpbibsbqhpqfy9zl0awiqkmddi3q8xlrslcjd429f0g5f1ad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-jslint";
@@ -25234,12 +25213,12 @@
     flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-json";
-        version = "20130423.2357";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-json";
-          rev = "36084b67830bdc6c226115ea8287ea88d14b05dd";
-          sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534";
+          rev = "d43e62fab69c4c39f54f1057c9801a3e645de619";
+          sha256 = "1zlhxl7x754p4bxipklvz0gjqlwg9c8fiyv7rxdkfaxdzpf9a6zm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acb0a4d29159aa6d74f754911f63152dac3425bd/recipes/flymake-json";
@@ -25318,12 +25297,12 @@
     flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-php";
-        version = "20121104.1102";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-php";
-          rev = "93abe12d62b13f1d035a0df01e53e4bacdac2c66";
-          sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4";
+          rev = "c045d01e002ba5e09b05f40e25bf5068d02126bc";
+          sha256 = "03fk8kzlwbs9k91ra91r7djxlpv5mhbha33dnyz50sqwa52cg8ck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-php";
@@ -25381,12 +25360,12 @@
     flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-python-pyflakes";
-        version = "20131127.6";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-python-pyflakes";
-          rev = "f09ec573d7580a69f8bd49778c26da9ab6d5ec5a";
-          sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp";
+          rev = "1d65c26bf65a5dcbd29fcd967e2feb90e1e7a33d";
+          sha256 = "0hsvw6rxg3k1ymrav0bf5q3siqr9v2jp4c4h1f98szrj2lp200fm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49091c0eca4158b80269b6ff5f7f3fc8e981420b/recipes/flymake-python-pyflakes";
@@ -25402,12 +25381,12 @@
     flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-ruby";
-        version = "20121104.1059";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-ruby";
-          rev = "8dc4ca44ec2acfaab25f5501fca1bd687fae94f2";
-          sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109";
+          rev = "6c320c6fb686c5223bf975cc35178ad6b195e073";
+          sha256 = "0hzyxhg6y1rknvgj2ycivwrlrw7fznw9jrin5n9z627mzpjpfcnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-ruby";
@@ -25444,12 +25423,12 @@
     flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-sass";
-        version = "20140308.325";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-sass";
-          rev = "748f13caa399c27c41ba797da9e214b814f5a30f";
-          sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1";
+          rev = "2de28148e92deb93bff3d55fe14e7c67ac476056";
+          sha256 = "05v83l05knqv2inharmhjvzmjskjlany7dnwp5dz44bvy0jhnm39";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-sass";
@@ -25465,12 +25444,12 @@
     flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-shell";
-        version = "20121104.1100";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-shell";
-          rev = "ec097bd77db5523a04ceb15a128e01689d36fb90";
-          sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
+          rev = "a16cf453056b9849cc7c912bb127fb0b08fc6dab";
+          sha256 = "1ki0zk5ijfkf4blavl62b55jnjzxw2b7blaxg51arpvvbflqmmlh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-shell";
@@ -26072,12 +26051,12 @@
     foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "foreman-mode";
-        version = "20160520.737";
+        version = "20170725.722";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "foreman-mode";
-          rev = "bc6e2aca5a66847b13200b85172f7d7a36807d32";
-          sha256 = "0pp68kqg2impar6rhlpifixx0lqgkcrj6ncjn5jlids6vfhq23nd";
+          rev = "22b3bb13134b617870ed1e888af739f4818be929";
+          sha256 = "01qanhif24czcmhpdfkcjs019ss4r79f7y2wfbzmj6w4z7g3rikk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edeeb2b52ac70f8bdad38d3af62a7e434853c504/recipes/foreman-mode";
@@ -26516,12 +26495,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170531.1958";
+        version = "20170725.829";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "c9a9d722848dfc3f37ac9e0e91603340e5f5df1e";
-          sha256 = "0faf8796vvfi2g4kmh7xsnc08m3iyldgcivslq0xy86ndh682f06";
+          rev = "9e2ddf0c32edb8c7726daf636876f01e1fd2f757";
+          sha256 = "170ffm6mybp0cs3962cpq281fg67vxcfx22nl9q9vrlk7rwlrqz0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26548,8 +26527,8 @@
         version = "20170709.139";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "9adddfc5e5666febc2f98b230e4a7d2b4c02ce0b";
-          sha256 = "1ya7ghnclgcwha2cgi37z627q257xxd8c3igfl12k22ix4l5wr37";
+          rev = "154de53470720c57da4f57a64f4adb6bf669b59c";
+          sha256 = "1wrc48xd2brqr97zphn11sikhlbalhi1fh59azi85ri47y1yvvij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26674,8 +26653,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "dbc4ae1b8c977435d5369b18e1b624a62f8e8b13";
-          sha256 = "0h7244567anfrfm2wpkvy0g6bnczisv03rz2ipr35pqm3gf7hyh8";
+          rev = "4e1a7ed0e47da1c33dc5a20ba22cb604ebdef0c7";
+          sha256 = "1wyk6fh58s675j3rr74lk358q3nlx9rlkq0bs8qkix11y93asp7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -27193,8 +27172,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "d867cd0fee3fdb4e93440d96506c522de743aec6";
-          sha256 = "0k615c7fvabs2y28kf0w3j8y3chqsbcdizv5z9jyf3519svb5sxn";
+          rev = "3d9a3398691cb4cf476896994ab0e5640c69742f";
+          sha256 = "0w53xj2hlr1nc4sahxgajjl23zsqjjcvsfpafhkhszgprbjdjh31";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27315,12 +27294,12 @@
     ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub";
-        version = "20170702.512";
+        version = "20170725.1200";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "ghub";
-          rev = "16c3300bb5d82b141aefa94c47ad9f97a58b0011";
-          sha256 = "1w1cqz32rx4i4hcjkz2znlchp5h4xg74znm9819k4anlf635lshd";
+          rev = "8f81a2aa0b2aaca55e92f7a78944f9d80296f405";
+          sha256 = "03rd2f5zs95ld56jzq70y6jb0r21q2qhkndi2jrbic1fknfviiqh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub";
@@ -27529,8 +27508,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
-          sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
+          rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3";
+          sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28110,6 +28089,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitpatch";
+        version = "20170721.2110";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "gitpatch";
+          rev = "577d5adf65c8133caa325c10e89e1e2fc323c907";
+          sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch";
+          sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1";
+          name = "gitpatch";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gitpatch";
+          license = lib.licenses.free;
+        };
+      }) {};
     gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "gitter";
@@ -28425,6 +28425,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gnus-select-account = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnus-select-account";
+        version = "20170721.2211";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "gnus-select-account";
+          rev = "ddc8c135eeaf90f5b6692a033af2badae36e68ce";
+          sha256 = "0csq8cqv028g3mrvk88l0nlj3dk5fh67c10hdjwvxbf7winv0391";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gnus-select-account";
+          sha256 = "1yini6kif7vp5msmhnnpfkab5m5px8y4wgvc0f0k79kdd17gvpsx";
+          name = "gnus-select-account";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/gnus-select-account";
+          license = lib.licenses.free;
+        };
+      }) {};
     gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "gnus-spotlight";
         version = "20130901.735";
@@ -28678,12 +28699,12 @@
     go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-guru";
-        version = "20170501.1058";
+        version = "20170718.1046";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21";
-          sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn";
+          rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd";
+          sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -28720,12 +28741,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20170308.1512";
+        version = "20170725.402";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21";
-          sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn";
+          rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd";
+          sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -28808,8 +28829,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21";
-          sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn";
+          rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd";
+          sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -29352,8 +29373,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "0b533caa1ca0c4412748bde65753fa8c55ba4511";
-          sha256 = "14lkhny4s6kmybx7w9hi11bnyvg7imyxnirdk28rb19krj2n7b36";
+          rev = "8ab1a62d9c0873b8a25404c52928be2358b78963";
+          sha256 = "0y86g43g2bngca7f3vznw4swwc778mcm0kfiqn3b18ibppvzrph7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29478,8 +29499,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c";
-          sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v";
+          rev = "85fb30df520f55e32aeb92af4e1d7c801300c99e";
+          sha256 = "1iz17qv561x6w67r222ya0ig1dplb17ygvy8r3hyh20ijjdq733n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29838,12 +29859,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170712.224";
+        version = "20170724.535";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c";
-          sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v";
+          rev = "85fb30df520f55e32aeb92af4e1d7c801300c99e";
+          sha256 = "1iz17qv561x6w67r222ya0ig1dplb17ygvy8r3hyh20ijjdq733n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29859,12 +29880,12 @@
     gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruber-darker-theme";
-        version = "20170716.647";
+        version = "20170719.2229";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "gruber-darker-theme";
-          rev = "3e5d5d67f8b004db288d6c2e1a0b02c3844ab5c5";
-          sha256 = "1az7fndm19wy8s3p6wxa0ps55amwmmpbschayzy3g3g26a4swcxi";
+          rev = "8e6bb26ce0abe20e6129ae8c8ad5c41e0832334e";
+          sha256 = "1dxlpyc4w6ys08ir2bivv9lhjpwfjlh3wczmr0r03pc1fqx0w2ap";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme";
@@ -29901,12 +29922,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20170712.1607";
+        version = "20170718.741";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "a3aafd33d9b027e6c0d5ef81ebb04a2bb8545cf2";
-          sha256 = "1d9330yd2lch7yqlfvpv7gxyy00p4w9h6f0imn7bgj3y7wab20dw";
+          rev = "21c1673622ba160bcf8cfdb0f066567b388b2960";
+          sha256 = "1bh04nvaxphvfq7fgd53zd5k00gg35hldbida1ikw42pwkch3zk8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -30069,12 +30090,12 @@
     gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gulp-task-runner";
-        version = "20161103.1523";
+        version = "20170718.1341";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "gulp-task-runner";
-          rev = "f13da9e619c1838571df0a0462c273ed6e76defc";
-          sha256 = "1xai81v7c58hy9rh63kxybzmlyfkv0m7qfdp7zia60ml5xhib31r";
+          rev = "877990e956b1d71e2d9c7c3e5a129ad199b9debb";
+          sha256 = "13qy4x4ap43qm5w2vrsy6w01z2s2kymfr9qvlj2yri4xk3r4vrps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner";
@@ -30821,12 +30842,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170714.3";
+        version = "20170724.2137";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "07f8f705f54506da537b1f615ee2e95e9033defb";
-          sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c";
+          rev = "9e803b5a4a431b386966ea1b2a303003d7869375";
+          sha256 = "0x797xy6p1b74zkqcdrf10kwp1ypjvkypayd070qh1sfjnrng4mf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31430,12 +31451,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170717.520";
+        version = "20170725.419";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "07f8f705f54506da537b1f615ee2e95e9033defb";
-          sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c";
+          rev = "9e803b5a4a431b386966ea1b2a303003d7869375";
+          sha256 = "0x797xy6p1b74zkqcdrf10kwp1ypjvkypayd070qh1sfjnrng4mf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31602,8 +31623,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-directory";
-          rev = "2c6d45404506ba744888dcdb65e9f63878f2da16";
-          sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h";
+          rev = "29f05c87046f9a04329f817e9d7489a290a2592a";
+          sha256 = "0dp9s5yicjn91mmrzb15hidf05c8lffpgk2sq23d9x6b9ddnlcl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory";
@@ -32186,12 +32207,12 @@
     helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-google";
-        version = "20170509.244";
+        version = "20170722.710";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "helm-google";
-          rev = "b24de3240b2a46fdf6124e91aa4f684b2370454b";
-          sha256 = "1w48ag2pd462hf238hkdl0i6csvchcsdf3021lnkdy41vwxj1rdg";
+          rev = "4530a375a46880d53e5d7e906028f71c040de946";
+          sha256 = "1xj3q6hyjcqbr3dglcba4impsdgb707zi9w7prpn1m735xhsis01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
@@ -32815,12 +32836,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170518.312";
+        version = "20170711.2354";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "61adb8ec3af0b7b87b2f9245510dc8b014d026ed";
-          sha256 = "05zqp6yifc87i22q0p37jl90cfyh5v1bq9ifhpkdy1rs3sgcmnif";
+          rev = "87e00cc5a47b6dae8040ad27d2883f4028cbcfc1";
+          sha256 = "0n7nwpc9wy5p81hbp2b8wzfr040k0xn4ksm9a1fjdl9fg8hvh0pc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -33319,12 +33340,12 @@
     helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "helm-rtags";
-        version = "20170522.2154";
+        version = "20170723.2050";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33760,12 +33781,12 @@
     helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-xref";
-        version = "20170425.1440";
+        version = "20170725.546";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "helm-xref";
-          rev = "cd458044be2cec95f31f0ac318b0f80f4b92785b";
-          sha256 = "0lx2xrkwrbzkbs26gwksdqpywcsfsi3d4g2mw1h8aabd12hnr4my";
+          rev = "3197a66a605afa42957781cc7f97f6c614ecf02a";
+          sha256 = "0nr4yg44qqr5ga8h1hc143953iyyswp2l9bfb5b5wwwzz42iz5cx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39f3d09a8f00d0358653631a8643b6dd71a9bd1/recipes/helm-xref";
@@ -33880,12 +33901,12 @@
     helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helpful";
-        version = "20170625.1441";
+        version = "20170722.522";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "da7d479c89090155996bf568bd89fa8a8859eac7";
-          sha256 = "1vpfb6n1k7j8wmzsn3j2a8g2hf6lxc8jp77xgzi3kd0wwdyjmqg2";
+          rev = "d167ee6fd4fbaadc46aa50a96529dc234a4c37c2";
+          sha256 = "04r090757jcaljr0bfvxjm45wf201cn04cr467ryh9k92gravlfj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -34702,12 +34723,12 @@
     hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hippie-expand-slime";
-        version = "20170317.0";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "hippie-expand-slime";
-          rev = "ed6c91a0600550788dc78a3ab32040ac28f7c8d4";
-          sha256 = "0nqrz1wmg84xk08mi5w8h9mrymr23v8i39s2kdqsrmn6qpw37fpl";
+          rev = "39bbae94896a62854d31754debdfae71d35fec62";
+          sha256 = "1l2j5k4jk8jpm1vdf0z5zwa287859afsgd3gda778sdsiy38l6r7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime";
@@ -34744,12 +34765,12 @@
     historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "historian";
-        version = "20170715.2142";
+        version = "20170722.1714";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa";
-          sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd";
+          rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
+          sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -35660,12 +35681,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20170325.815";
+        version = "20170722.818";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "38ce88a9c3be11b0431080078095159b2211ca7a";
-          sha256 = "0hja61lxhnkl0mpq3fj46pmd9pp85ncdzvgzc1dy82a48sib92dj";
+          rev = "943636fe4a35298d9d234222bc4520dec9ef2305";
+          sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -35763,12 +35784,12 @@
     ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "ibuffer-projectile";
-        version = "20170410.1452";
+        version = "20170721.1823";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ibuffer-projectile";
-          rev = "a004cd0121ab15a00311631289fc6a8c7a86a897";
-          sha256 = "013yx94q2ffhiqbx9dara7kq76yfmigj4y00zc48rdinclnzb6az";
+          rev = "d99fb0d918f13664856178402efe64b4b237648b";
+          sha256 = "1rlicnrjs8nmha90i9d4z4ps5dskry08rj5sa3ax2igxwbq1z4w5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile";
@@ -36053,12 +36074,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20170708.1116";
+        version = "20170719.119";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "7b7136532ee4af0380f667f19700b53853bbbd7a";
-          sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn";
+          rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9";
+          sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -36095,12 +36116,12 @@
     ido-exit-target = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-exit-target";
-        version = "20150904.737";
+        version = "20170717.1151";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ido-exit-target";
-          rev = "322520c665284ce6547eb9dcd3aa888a02a51489";
-          sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x";
+          rev = "e56fc6928649c87ccf39d56d84ab53ebaced1f73";
+          sha256 = "1a1bcvmihf22kr8rpv6kyp4b7x79hla5qdys48d6kl06m53gyckp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b815e7492eb0bd39c5d1be5a95784f9fe5612b62/recipes/ido-exit-target";
@@ -36368,12 +36389,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20170705.1656";
+        version = "20170718.1033";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "7b7136532ee4af0380f667f19700b53853bbbd7a";
-          sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn";
+          rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9";
+          sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -36452,12 +36473,12 @@
     idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
     melpaBuild {
         pname = "idris-mode";
-        version = "20170703.2038";
+        version = "20170722.1339";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "7de2809515cfb413a7be5fab71d6814d2699e1e3";
-          sha256 = "0v6as33dpqmggmprpimv5rrm7vpfakka5hszz5f5p2k5v212yvk8";
+          rev = "5c01039112a8c52a0275560575f1f542f3966cf5";
+          sha256 = "0r3fbp2c8qhmsnpd63r9fjz1vxjsa054x69d9716pbp1jk3qsjsv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -36991,12 +37012,12 @@
     indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
     melpaBuild {
         pname = "indent-tools";
-        version = "20170608.647";
+        version = "20170725.735";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "indent-tools";
-          rev = "8d2072eef1fdc87e35f7495adfbfa0beb9faf6b7";
-          sha256 = "1hrsmv25q9rpmj8paf3gggw7sp28z1m4gwlx50s64k5mxqa99iy8";
+          rev = "45aa1321674fc111b6cf4398e90c53c27f8274af";
+          sha256 = "1v1x43af69q6crky4l65j649rb35qdxw2gw1ivz6ihsdcwa4dywz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
@@ -37030,22 +37051,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
+    indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170626.312";
+        version = "20170725.1119";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "4747a94cf823deb5623368f71f2012f8c5fdc156";
-          sha256 = "11hsyqiy5lcvk721xrv1ihzp9ghdgk46n3qlaviy9alapl0v55d5";
+          rev = "a0feb67bfd035dc0d2f2b6eff12a1af050cb8b1b";
+          sha256 = "1h230lrq3pdmb26930n8ma2h1gqrz0zxzxy38h65khqqkcv37ldv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
           sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
           name = "indium";
         };
-        packageRequires = [ company emacs js2-mode seq websocket ];
+        packageRequires = [
+          company
+          emacs
+          js2-mode
+          memoize
+          seq
+          sourcemap
+          websocket
+        ];
         meta = {
           homepage = "https://melpa.org/#/indium";
           license = lib.licenses.free;
@@ -37075,12 +37104,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170710.708";
+        version = "20170720.2256";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "f7ec13ab2fbc36e99df196eb863a75baf3b92fd6";
-          sha256 = "01j4prrs78sq4w7cv15rdilxrqmjam2s1hrwijf6718c0s7dbpd0";
+          rev = "15963caac5791c2e9145cc99e4db8576807eb0ec";
+          sha256 = "088r68rj4ih3mlh4pv986zd4cgs0f32ar27550fxky6kr8197k46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -37308,8 +37337,8 @@
         src = fetchFromGitHub {
           owner = "emacs-jp";
           repo = "init-loader";
-          rev = "287da99eadfa3dd85492506db43d68324069b593";
-          sha256 = "03a655qzcwizv9hvfcp47466axsrq0h049fdd79xk6zmans5s6fj";
+          rev = "5d3cea1004c11ff96b33020e337b03b925c67c42";
+          sha256 = "17bg4s8yz7yz28m04fp2ff6ld0y01yl99wkn2k5rkg4j441xg3n2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46e6ec79ff4c76fc85e13321e6dabd5797c5f45/recipes/init-loader";
@@ -37597,12 +37626,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170711.1415";
+        version = "20170721.1851";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "d03b3cb0cbc8d059a223366c4f7a2be85672c22f";
-          sha256 = "0zga7p2hazcwxjyzgrvq77d3j6q9mz7wz7mkqk0hzf00sdb1gpg9";
+          rev = "aec455424105ddcf8e311acaf880078f7a6d92b3";
+          sha256 = "1a5shx3i7lhplcglrldzhway0w0rhq0h4wb9h835nzmjl2p6lprd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37825,6 +37854,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iqa";
+        version = "20170722.834";
+        src = fetchFromGitHub {
+          owner = "a13";
+          repo = "iqa.el";
+          rev = "08e3f70d0a3ed95a0c5675ae88e7966474ecc45a";
+          sha256 = "1n7ghcixk16n6x8p7128mqjfcsalxfyp3asydnijw7qp358l7f9r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a9bd2e952d98f7ac2dc823581b07b65e951e9e45/recipes/iqa";
+          sha256 = "02yrkizk4ssip44s6r62finsrf45hxj9cpil1xrvh8g4jbsmfsw4";
+          name = "iqa";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/iqa";
+          license = lib.licenses.free;
+        };
+      }) {};
     ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ir-black-theme";
@@ -37889,12 +37939,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170627.1045";
+        version = "20170725.1249";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "bf21cf4c442a930e6007b3ff5bd8af094318991f";
-          sha256 = "02fm2nwhglpb42qa5z2mrfkwqvwc3xvfdi0marlxbg3ramhn4s4i";
+          rev = "d47bc8d94748dbd87fed9bf92cea85e115a39031";
+          sha256 = "1hmrpz8fv8prw5jwipfy56m4fw2sbx14nm251wjva5503bim3lw5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -37951,10 +38001,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20170614.928";
+        version = "20170723.1826";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "19jk4c39bqbqbfwmhkiwqfij556nv82syy99g07s7gz1bqkrm7pl";
+          sha256 = "0d7xsr71iadqzg81mv17dqyd0bdzkmljxlrpdlpycjyaf3z59aqr";
           name = "isearch+.el";
         };
         recipeFile = fetchurl {
@@ -38179,12 +38229,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170716.1104";
+        version = "20170725.948";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
-          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
+          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38288,8 +38338,8 @@
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa";
-          sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd";
+          rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
+          sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -38309,8 +38359,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
-          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
+          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38393,8 +38443,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -39080,12 +39130,12 @@
     jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "jenkins";
-        version = "20170713.702";
+        version = "20170721.236";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "jenkins.el";
-          rev = "b30d4ef658963b913ca02726f99755c10736fd9d";
-          sha256 = "15yl1j3lrag19vy5k5qymmf6ij0myaiwl5k7z1ij0b70y2qmfx7k";
+          rev = "1ec967973db685c9d84133ec6a5e06489ce06b62";
+          sha256 = "1ai5adv46van2g029x9idj394ycczfacyhyv291sasf8mv9i7j4b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins";
@@ -39477,12 +39527,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170716.1313";
+        version = "20170721.602";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "b176925c4d8a21e0ed375e13cf6aa04cdf3b4a0e";
-          sha256 = "0ffr8wjqqs7p54hi8wgnd61dm4cs7112j56d8q9ycfmnw0fswyxk";
+          rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc";
+          sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39582,12 +39632,12 @@
     json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
     melpaBuild {
         pname = "json-mode";
-        version = "20170619.1701";
+        version = "20170719.2205";
         src = fetchFromGitHub {
           owner = "joshwnj";
           repo = "json-mode";
-          rev = "39ba450ba5dcc72e317e679a0b61d8aa94383966";
-          sha256 = "19qklwzad6qj27jbsms88bbnva4pvl64c89arpf66yjby3hnqbg3";
+          rev = "32d5a9b3319e6797c4d52e7d61a65e5638102ef4";
+          sha256 = "04n68ppxdga5r7mbahiqjkykf3i5simpx91aa8x9h197y5wwi4ww";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
@@ -40082,12 +40132,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170710.1014";
+        version = "20170725.514";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "f2df1b80dfef88d38c5fbf1b9fad96e2091126c3";
-          sha256 = "0anfz9npizaghhvpcvplxsymvv9q3sl7bpiis281p8c7yhrl93h5";
+          rev = "96619e8c330dcb5a0b45bde1fb2a6697729d3541";
+          sha256 = "1i8jk2l703ikmkqb1lf6mvrldb05kfp6gnak26lpc9s7pb4m8mhn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -40590,8 +40640,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "e4a8a4b17cb1ae073afc5df54d9fed9333f1cc72";
-          sha256 = "09z298s699jk76i6yrflplhvdc77flb2qfkzbb55ngmx0ajcf2h6";
+          rev = "c07f97179a02e1bddace948633e4b5b94ccc6ad4";
+          sha256 = "0ad3hkggdvd800cf0hwxa8v5j6c3dvkssy7lrs4yarwzpgaljyjv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40670,12 +40720,12 @@
     kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20170716.1331";
+        version = "20170719.1038";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "700ea18fdc471ce351d7e2a443572746e8b93496";
-          sha256 = "09qznjadbmspm8n56rk3giyxcf79sxfxpimgn3vkdv09la1mdbb2";
+          rev = "9a8472df0c89af867495541f1265cceccabb1eba";
+          sha256 = "0cw1lnclawc19ianjq0yhf1cnmcfcfv81158zjg9mnv4mgl6hzjl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -40838,12 +40888,12 @@
     ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ksp-cfg-mode";
-        version = "20160521.1333";
+        version = "20170724.1127";
         src = fetchFromGitHub {
           owner = "lashtear";
           repo = "ksp-cfg-mode";
-          rev = "07a957512e66030e1b9f8ac0f259051386acb5b5";
-          sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr";
+          rev = "713a22ee28688e581ec3ad60228c853b516a14b6";
+          sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
@@ -41546,6 +41596,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    letterbox-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "letterbox-mode";
+        version = "20170701.1825";
+        src = fetchFromGitHub {
+          owner = "pacha64";
+          repo = "letterbox-mode";
+          rev = "88c67a51d67216d569a28e8423200883fde096dd";
+          sha256 = "1xzzfr525pn2mj7x6xnvccxhls79bfpi5mqhl9ivisnlgj1bvdjw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1512e20962ea354e4311c0a2696a22576a099ba9/recipes/letterbox-mode";
+          sha256 = "117dj5xzf6givwjyqsciz6axhlcj7xbx0zj91ximm81kb5fswgda";
+          name = "letterbox-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/letterbox-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
@@ -41931,12 +42002,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170707.949";
+        version = "20170723.712";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "7cf7bda344f015750e89719209a49f5991bfdffa";
-          sha256 = "1h4129la499b3x3bz72s5c6bc8i7nvyh2kzxg7ff1h8xnwf1rcp1";
+          rev = "76db06252dbc45b70e55886e00f4efda6a100a8f";
+          sha256 = "1b6869ncq5lixndfyjffk3x4fjk5namxr21k3066q3lph4l26my5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41952,12 +42023,12 @@
     lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lispyscript-mode";
-        version = "20130828.719";
+        version = "20170720.1217";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "lispyscript-mode";
-          rev = "d0e67ee734919d7ff14c72712e909149cb9604bd";
-          sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf";
+          rev = "def632e3335b0c481fbcf5a17f18b0a8c58dd12f";
+          sha256 = "042nndsrv7kyq20v3lahrpr0x89xyayvhx59i0hx6pvkc9wgk5b6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf912fa20edc9cff12645381b303e37f2de14976/recipes/lispyscript-mode";
@@ -42374,8 +42445,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "325ccf1c3d92533f8bc5c48d741d3aa23a6b2542";
-          sha256 = "05cz8jwkidwkzggifccl51daw6vbcy1fgnlwm27ppy933y306xyy";
+          rev = "5b3e8fe6d9709fb676290385ab3861d291574dd4";
+          sha256 = "0jxxm2191in165bpqxm35shhfvcy8zjqakmvyrql0z4yb0ib2shm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -43038,6 +43109,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mac-pseudo-daemon";
+        version = "20170722.837";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "osx-pseudo-daemon";
+          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon";
+          sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6";
+          name = "mac-pseudo-daemon";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/mac-pseudo-daemon";
+          license = lib.licenses.free;
+        };
+      }) {};
     macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "macro-math";
@@ -43186,12 +43278,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170711.1307";
+        version = "20170725.1153";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
-          sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
+          rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3";
+          sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43337,6 +43429,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-imerge";
+        version = "20170724.2157";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-imerge";
+          rev = "b19e5b53553a4d057d944f9a17a2d44f71f20d62";
+          sha256 = "0i8nv28axp4nhh87lh7liimry398mgp038dm0v24b3ly1i4vf0gn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
+          sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4";
+          name = "magit-imerge";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-imerge";
+          license = lib.licenses.free;
+        };
+      }) {};
     magit-lfs = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-lfs";
@@ -43386,8 +43499,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
-          sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
+          rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3";
+          sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43466,12 +43579,12 @@
     magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-tbdiff";
-        version = "20170627.2023";
+        version = "20170724.2156";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-tbdiff";
-          rev = "c9522a98bcdafc2d8ef3f3beb9ebe05daa42e577";
-          sha256 = "1nv5a8wfrsh41rvgzi1clwjdr9nc0g5rpgcjs1rvgncn7pjd5pi9";
+          rev = "549b27375b2f834eb86eeae0a8ad5475425cafed";
+          sha256 = "1jhl9afkz4lcwdbp7698pl630259n677jfigaywin2nvv0klb1s7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
@@ -43673,22 +43786,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
+    makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "makefile-executor";
-        version = "20170626.533";
+        version = "20170721.13";
         src = fetchFromGitHub {
           owner = "thiderman";
           repo = "makefile-executor.el";
-          rev = "5502f07a13b7d6860715faf70966721a11506b22";
-          sha256 = "1727i7nmm1i0cc8i2c1912irhb9vvk82xb0ac3ypjzi0s22k2fnf";
+          rev = "105f76bce212bfe511eda191366fef9ee45fd1ab";
+          sha256 = "0p6vk0f3qpcpa7fa4q3r6w5a9d0v67gv4khf5jy9g2nc9bz9ai57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
           sha256 = "0889rq2a7ks2ynyq91xsa2kpzgd72kzbjxx0b34w8faknpj3b6hi";
           name = "makefile-executor";
         };
-        packageRequires = [ dash emacs f projectile s ];
+        packageRequires = [ dash emacs f s ];
         meta = {
           homepage = "https://melpa.org/#/makefile-executor";
           license = lib.licenses.free;
@@ -43739,12 +43852,12 @@
     malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
     melpaBuild {
         pname = "malinka";
-        version = "20170628.151";
+        version = "20170723.1635";
         src = fetchFromGitHub {
           owner = "LefterisJP";
           repo = "malinka";
-          rev = "b8ec090cb57a78265650586f71f00c4c9e054e27";
-          sha256 = "0wii0ylgdci69r1zjcrk7bh68dl25ry63cfwgdii9x217lmbn9qw";
+          rev = "8072d159dae04f0f1a87b117ff03f9f1eb33f6cb";
+          sha256 = "0s5dcm11nw88j1n4asqpm92z0csjv3jvh06f4qqghfvcym8qv44h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
@@ -44062,12 +44175,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170712.1703";
+        version = "20170724.2018";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "ea5549233b3ce1536dae3a4793df79971a3781da";
-          sha256 = "1gm76j4w0fv7194dkhky5pxrrwysi4n0n0v0dnl6wp079irc7kcj";
+          rev = "d29cea8534e80acf174ddb6fca7cfe071d84edd0";
+          sha256 = "0lg1cfk0rk6rx5zighr6xjsqga3mn290kll44hzrmaq4zzbfzfa9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44633,12 +44746,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170628.2045";
+        version = "20170723.1724";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a";
-          sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7";
+          rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
+          sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44738,12 +44851,12 @@
     memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "memoize";
-        version = "20130421.1234";
+        version = "20170720.1802";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacs-memoize";
-          rev = "b55eab0cb6ab05d941e07b8c01f1655c0cf1dd75";
-          sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw";
+          rev = "636defefa9168f90bce6fc27431352ac7d01a890";
+          sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize";
@@ -44800,10 +44913,10 @@
       }) {};
     menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "menu-bar-plus";
-        version = "20170618.1417";
+        version = "20170720.710";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
-          sha256 = "1ah2yjagpkvwahki81ixviq9pgwnjna8z893xad31rj0qmwr8bzw";
+          sha256 = "0yq995jyfw3a1dj49a4wnavfb29amw575dajps6nbv0g1q0rnwkf";
           name = "menu-bar+.el";
         };
         recipeFile = fetchurl {
@@ -44990,8 +45103,8 @@
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "7ea2baefff668263bf011c72879c2aa88125f2de";
-          sha256 = "1i7i600hj76ggn1jwlj8r60kf157pxj88a4wwp1lasz91wp6msdv";
+          rev = "36b36a154dab22e112cc19675cfd73478f2a5956";
+          sha256 = "01wqa5pf6zjxgsgzqw0pnp278vfd7livfgyqvc24xfqr519k2ifq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -45346,8 +45459,8 @@
         src = fetchFromGitHub {
           owner = "arthurnn";
           repo = "minitest-emacs";
-          rev = "e5c82aac7542c5648881bb612fa20fe2b99ffb15";
-          sha256 = "09iqbmmvi28sn5c6iaq6r6q4a4003cy6bb4zihajq0di55zls3aa";
+          rev = "1aadb7865c1dc69c201cecee275751ecec33a182";
+          sha256 = "1l18zqpdzbnqj2qawq8hj7z7pl8hr8z9d8ihy8jaiqma915hmhj1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest";
@@ -45480,6 +45593,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mixed-pitch";
+        version = "20170723.955";
+        src = fetchFromGitHub {
+          owner = "jabranham";
+          repo = "mixed-pitch";
+          rev = "6a4fbb9c48fc345d4d40228e8b686f6f2e585f8a";
+          sha256 = "14hpcx75rb41fya8i8qk6cg388wgkhhxnj64ywar3pycngm8jwl9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch";
+          sha256 = "1910x5mssxmzzdmllmbqd3ihx0x8s50qf5dx86wal7aja9rris1z";
+          name = "mixed-pitch";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mixed-pitch";
+          license = lib.licenses.free;
+        };
+      }) {};
     mkdown = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "mkdown";
@@ -45944,8 +46078,8 @@
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "monky";
-          rev = "190079ea4d22a4e875a3b2892e58737344cb2b26";
-          sha256 = "01d7mbpkkb36lk6g9gkxlj3b58c23nqfmh7m5qq7xz90kd42316g";
+          rev = "62fc907cb541aef1c253d6bcd60447156e6f064c";
+          sha256 = "1qxykx8ccm4k95ncnzy8pspqgmz29pvqha5dg8al4zq20bms98s5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky";
@@ -46003,12 +46137,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "20170705.1152";
+        version = "20170724.740";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "71bcced6da1033822ea52e4ac9f312f9d6b5e062";
-          sha256 = "1kwngvpih9q7wkdv6ayisi2c22xi9jh9jffd4qzc652p26yhmzq6";
+          rev = "b9be135bb01328ee7c1349c3eb81aecd045ea015";
+          sha256 = "01mzz1bdli0x4kgf089iy62d15y2gjxk51hybrlb9naddwl9zz89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -46503,12 +46637,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20170506.1701";
+        version = "20170722.823";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "55d493b2e4ad0d931659d1785bcdacc6f16bed07";
-          sha256 = "1fp9q094glk4m2l6hf51ryj1qi4g3q7134hf6qjf707xv2vjcihm";
+          rev = "a598b60c0f9a6a718ec712d6df5591d3cd7f23f3";
+          sha256 = "1pf6d2idq8sljkp7haxxqknvja4cj44i88difzs5wvkmdd2pvlh0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -46857,12 +46991,12 @@
     mustang-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mustang-theme";
-        version = "20141017.1623";
+        version = "20170719.246";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "mustang-theme";
-          rev = "79c3381dd50601775402fe2fddd16fffa9218837";
-          sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4";
+          rev = "dda6d04803f1c9b196b620ef564e7768fee15de2";
+          sha256 = "0pg3iay0iinf361v4ay8kizdxs5rm23ir556cwwgz3m3gbs0mgsh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed3691edd1cba6abc0c30d2aab732e2ba51bf00/recipes/mustang-theme";
@@ -47983,12 +48117,12 @@
     nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nimbus-theme";
-        version = "20170412.758";
+        version = "20170725.415";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "ce999b8d152b9b15d75f66fe22b84827167c8311";
-          sha256 = "08bfp2xm8ylkmb4rby15f6xx51qppd2g01i3mg2wwb8kvlwz6s4w";
+          rev = "524e0a632b0932f269839c34c08bfd894719a75b";
+          sha256 = "1m4lh6hwzv4hmnh3zlic39df2bwqy5mpfgi8himyg4v3k0bdfskc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -48050,8 +48184,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "4ec6eb1fdf513d93090d5898762d1186eb6feb0d";
-          sha256 = "01vfj61rgfk0cyh1c4ai0ys0wjnjaqz6hdbg3b1dcfk4b09ydyjx";
+          rev = "c94f3d5575d7af5403274d1e9e2f3c9d72989751";
+          sha256 = "1akfzzm4f07wj6l7za916xv5rnh71pk3vl8dphgradjfqb37bv18";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -48211,6 +48345,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    noaa = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "noaa";
+        version = "20170719.1136";
+        src = fetchFromGitHub {
+          owner = "thomp";
+          repo = "noaa";
+          rev = "1198eed7cf2960a5b91f8750a08c906c716b53ff";
+          sha256 = "1dvck23akkn6jffc86ddf951ksvq1w2nygji6qk5vkidcx5f4rnd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa";
+          sha256 = "11hzpmgapmf6dc5imvj5jvzcy7hfddyz74lqmrq8128i72q1sj0v";
+          name = "noaa";
+        };
+        packageRequires = [ cl-lib emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/noaa";
+          license = lib.licenses.free;
+        };
+      }) {};
     noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "noccur";
@@ -48298,12 +48453,12 @@
     nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nodejs-repl";
-        version = "20170607.1303";
+        version = "20170722.443";
         src = fetchFromGitHub {
           owner = "abicky";
           repo = "nodejs-repl.el";
-          rev = "f72a537700b08e14db28e6bcc1d6244bbeaefca4";
-          sha256 = "1wha680gklq974wl2si3q024qhcdkqgicr6x3qrb9fhfkfr1nbjx";
+          rev = "4a4104dbf2cd314e90f35d200f28bd93c34708d0";
+          sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -48879,12 +49034,12 @@
     ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-browser";
-        version = "20150101.710";
+        version = "20170720.1218";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "ob-browser";
-          rev = "9271453d28d0912093ab5f91807745ada69ada0c";
-          sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813";
+          rev = "a347d9df1c87b7eb660be8723982c7ad2563631a";
+          sha256 = "0q2amf2kh2gkn65132q9nvn87pws5mmnr3wm1ajk23c01kcjf29c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c51529213c15d42a7a7b76771f07dd73c036a51f/recipes/ob-browser";
@@ -48900,12 +49055,12 @@
     ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-coffee";
-        version = "20160415.2036";
+        version = "20170725.724";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-coffee";
-          rev = "dbfa5827df91ed1cdc5b0f3247da6b93fa632507";
-          sha256 = "01l8zvnfpc1vihnpqj75xlvjkk2hkvxpb1872jdzv2k1na2ajfxm";
+          rev = "7f0b330273e8af7777de87a75fe52a89798e4548";
+          sha256 = "1w3fw3ka46d7vcsdq03l0wlviwsk52asfjiy9zfk4qabhpqwj9mz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23d7f1d021b07053acb57e2668ece0eaed0f817/recipes/ob-coffee";
@@ -48921,12 +49076,12 @@
     ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-coffeescript";
-        version = "20170713.2356";
+        version = "20170719.121";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "ob-coffeescript";
-          rev = "6baabf3104e32ed151b0b9555db903a93a44db54";
-          sha256 = "08mmwy69h7dihi120c9agv8v5c6y6ghc94gmpb0rfxdjim1lrkmq";
+          rev = "219c83f6c44e3612a7718c996365df1de747127d";
+          sha256 = "14va23m0wab1jf6jc5m61y2c0kcmc8dha463vyci1mvs3p1psjr8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
@@ -48942,12 +49097,12 @@
     ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-cypher";
-        version = "20150224.1837";
+        version = "20170725.720";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-cypher";
-          rev = "b3511df05f175c1947996802e9e199432ea9ced8";
-          sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n";
+          rev = "114bdf6db20ee0ade060bb5df379ddee48ff4f26";
+          sha256 = "142d91jvf7nr7q2sj61njy5hv6ljhsq2qkvkdbkfqj07rgpwfgn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc05c833f64e7974cf5a2ad60a053a04267251cb/recipes/ob-cypher";
@@ -49005,12 +49160,12 @@
     ob-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-elixir";
-        version = "20151021.447";
+        version = "20170725.719";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-elixir";
-          rev = "d0e8007efa0b99ab7a6e4cb7160a87d6cb60d210";
-          sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk";
+          rev = "8990a8178b2f7bd93504a9ab136622aab6e82e32";
+          sha256 = "19awvfbjsnd5la14ad8cfd20pdwwlf3d2wxmz7kz6x6rf48x38za";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/287e4758f6f1df0152d68577abd91478c4a3f4ab/recipes/ob-elixir";
@@ -49110,12 +49265,12 @@
     ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-kotlin";
-        version = "20170624.2050";
+        version = "20170725.718";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-kotlin";
-          rev = "ebbd3fcd52a80c0579e896ad3cbb1484d0a55d00";
-          sha256 = "037msvgvw42nl2wi335q4pfi8bqh3d1a5a6rdvzvpm1vh2fwywab";
+          rev = "3b2f57e9944cfc36f2714dc550db42159904929a";
+          sha256 = "1fgfl4j0jgz56a1w8h2mvnzisz123c1xz7ga380bg1hmy44dbv5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aa74d349eb55aafddfc4327b6160ae2da80d689/recipes/ob-kotlin";
@@ -49131,12 +49286,12 @@
     ob-lfe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-lfe";
-        version = "20150701.655";
+        version = "20170725.720";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-lfe";
-          rev = "d50a5d76e389501504e060a7005f20b96c895594";
-          sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn";
+          rev = "f7780f58e650b4d29dfd834c662b1d354b620a8e";
+          sha256 = "1ricvb2wxsmsd4jr0301pk30mswx41msy07fjgwhsq8dimxzmngp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d595d3b93e6b25ece1cdffc9d1502e8a868eb538/recipes/ob-lfe";
@@ -49173,12 +49328,12 @@
     ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-mongo";
-        version = "20161130.152";
+        version = "20170720.1219";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "ob-mongo";
-          rev = "d64a507c2f9e2a1f8062acae50199541fc23be65";
-          sha256 = "0xlddh28z9afqj8j9brcncrbwsyqzmv432zayn9ajjj1vk1avsxg";
+          rev = "371bf19c7c10eab2f86424f8db8ab685997eb5aa";
+          sha256 = "02k4gvh1nqhn0h36h77vvms7xwwak8rdddibbidsrwwspbr4qr1s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo";
@@ -49446,12 +49601,12 @@
     ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-translate";
-        version = "20160411.124";
+        version = "20170720.1219";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "ob-translate";
-          rev = "bba3bd1e2dbb5c672543129460c2713f78b26120";
-          sha256 = "086z3smcfn5g599967vmxj3akppyqk9d64acm8zzj76zj29xfk1k";
+          rev = "9d9054a51bafd5a29a8135964069b4fa3a80b169";
+          sha256 = "143dq3wp3h1zzk8ihj8yjw9ydqnf48q7y8yxxa0ly7f2v1li84bc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d89e4006afc51bd44e23f87a1d1ef1140489ab3/recipes/ob-translate";
@@ -49572,12 +49727,12 @@
     obsidian-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "obsidian-theme";
-        version = "20140420.943";
+        version = "20170719.248";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "obsidian-theme";
-          rev = "0f92ce87245529d5c75d6e5f7862ebbc54bdbc92";
-          sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1";
+          rev = "f45efb2ebe9942466c1db6abbe2d0e6847b785ea";
+          sha256 = "1d36mdq8b1q1x84a2nb93bwnzlpdldiafh7q7qfjjm9dsgbij73b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90227252eb69d3eac81f5a6bd5e3a582d33f335/recipes/obsidian-theme";
@@ -49702,8 +49857,8 @@
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "d3f250b6029a7afec0d7ddd8770d9c4a7e5b9c7c";
-          sha256 = "1h8w7vcaykhgf4vmrkp1c7y566bzi7av4cfvkp4l01817chrhyaz";
+          rev = "cae4e8c9d0ff0c29e5fc32c8ac0cea539f8f6a13";
+          sha256 = "1wni1xrv6kr001spdz66lza4xajx1w0v3mfbf28x17l4is2108rn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -49992,12 +50147,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170716.926";
+        version = "20170721.946";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
-          sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
+          rev = "ad147956b936fd528d26ca88158a8af96ff5827a";
+          sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50187,6 +50342,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    opencc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "opencc";
+        version = "20170722.116";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "emacs-opencc";
+          rev = "8c539f72669ba9a99d8b5198db5ea930897ad1b9";
+          sha256 = "140s88z0rsiylm8g1mzgc50ai38x79j004advin6lil5zcggxq3i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc5476b3670a9f5c3d3682c2e7852fc6c5fe60/recipes/opencc";
+          sha256 = "1dd62x0h3imil4g3psndxykp45jf83fm4afxcvvyayj45z099f4r";
+          name = "opencc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/opencc";
+          license = lib.licenses.free;
+        };
+      }) {};
     opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "opencl-mode";
@@ -50356,12 +50532,12 @@
     org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-alert";
-        version = "20170701.1855";
+        version = "20170724.2116";
         src = fetchFromGitHub {
           owner = "groksteve";
           repo = "org-alert";
-          rev = "169acc082643b6b793aab17ab7e0de3694e74698";
-          sha256 = "0khk1jyy4vxsfalf27f53d1g9w41qq6i6c9xm670pj6xrf38hxj9";
+          rev = "3b7417ac12f2710e88f8dff538670621064ef8bc";
+          sha256 = "1hyl4b2r7wzdfr2m7x8pgpylia3z15fihn679xdiyc32rzy7k5vk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert";
@@ -50608,12 +50784,12 @@
     org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-cliplink";
-        version = "20160819.900";
+        version = "20170724.413";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "org-cliplink";
-          rev = "6c134fdda7bb56cc960af87d06a81a6885f6ab0e";
-          sha256 = "1x339lg1q1aq57jycfxwdmipl05wjb0d1b5psqbn37xvmkm3imgg";
+          rev = "16c2cad9c3bafb71fea70f70c1e584307a6dee01";
+          sha256 = "1k3vcr4fr290pg00gvb9q9wpvq1fk6pzgw95x12fdrig5lp48hih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink";
@@ -51261,8 +51437,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023";
-          sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv";
+          rev = "ed6849d18dd7831f3f7917970d2c24e771f75476";
+          sha256 = "0f3c0jj6479b3sxmsa9nd5h5gnl81xnrdhymh2rs7rjgcj58fbws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -51281,8 +51457,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023";
-          sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv";
+          rev = "ed6849d18dd7831f3f7917970d2c24e771f75476";
+          sha256 = "0f3c0jj6479b3sxmsa9nd5h5gnl81xnrdhymh2rs7rjgcj58fbws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51689,12 +51865,12 @@
     org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-recent-headings";
-        version = "20170703.1625";
+        version = "20170722.1507";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-recent-headings";
-          rev = "b3d6e3514b57aba7be4de676d1aa92c19e08cd42";
-          sha256 = "0367kkyxnkbgk3w0qvbl9xqxn5mbwpsj7qxf4s0c4jhdw2sk3k20";
+          rev = "56e52d65a03df0458bf79ceea5252f5efe432e3e";
+          sha256 = "10ymgycm7imigbisqnccd0rzvj9ihzmql4ipqj81iqwrssssqwyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -51731,12 +51907,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170714.808";
+        version = "20170724.1235";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "208a7beb0f8d4f7830d1d801776acd99c723e87d";
-          sha256 = "0vf75sk3ik9vfqbr30yn9fn8ab7rc60y5vaiipvx9p6mgh6vhcad";
+          rev = "5a59df1f9474103faed807fbc3448919cf7aa779";
+          sha256 = "15i8kqv5a18i19pcw1kcq4ricmgm1q1qlkfzaawwilfd45ipl6d6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51893,8 +52069,8 @@
         src = fetchFromGitHub {
           owner = "arbox";
           repo = "org-sync";
-          rev = "1e9045e38cd6f12dc0d60e2f7bd2d414a49a5722";
-          sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z";
+          rev = "7f02167ef805cd76def274be4d3bd0c6e41d9af8";
+          sha256 = "18v56lrscpzxq5prigd1pjkx990xf57pzf1d2yj6r1grqfz235yy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync";
@@ -52229,8 +52405,8 @@
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "e266ff4296661de520b73e6e18f201fb6378ba05";
-          sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461";
+          rev = "026629da7517dad6ffd9e005299874cf2163958e";
+          sha256 = "0dlrlm83i61zk6mvmfspcpakfjv5d7kfazk05f694ijfmqvmvfiw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -52309,12 +52485,12 @@
     organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "organic-green-theme";
-        version = "20170125.606";
+        version = "20170720.1111";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "organic-green-theme";
-          rev = "5f8ce452d16f1acbd18a6963f2c042851968dd8d";
-          sha256 = "0irkcjb6vxb7kf9fr4s4ap6lighhh7h6mwfamcwcacgwfvs4zs7y";
+          rev = "eea6b77b7ee26310fd6741b9affc3f2c43be2820";
+          sha256 = "1zaxvc1j6lfdg8wi80pfjywr6nfr7qc27j4ahzz59giba3bb7azp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme";
@@ -52687,16 +52863,16 @@
     osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-pseudo-daemon";
-        version = "20131026.1730";
+        version = "20170721.2307";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "osx-pseudo-daemon";
-          rev = "0b9f330a66b4e8d2ff9bcd57e09b8d304dfb5841";
-          sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk";
+          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/25a3562788b541e8682500911d7da89d209ab84f/recipes/osx-pseudo-daemon";
-          sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon";
+          sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw";
           name = "osx-pseudo-daemon";
         };
         packageRequires = [];
@@ -52813,12 +52989,12 @@
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
-        version = "20170414.1217";
+        version = "20170721.521";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "outshine";
-          rev = "399ccd20cd65c758bbbd5563bd804d2bccfd0279";
-          sha256 = "03jd3gyqrmrnykcv7p6fv53f32li7gkvd61zbhp483n8a8n3yy5j";
+          rev = "0fdd0cd619d20e71b3157f225bb117a7e21dc9b3";
+          sha256 = "1hhvbfpbixh5s2s4h06f44p4h0kqnmbm9mlqfas3msq5m6m77h2r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
@@ -52918,12 +53094,12 @@
     ox-bibtex-chinese = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-bibtex-chinese";
-        version = "20160510.506";
+        version = "20170722.2009";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ox-bibtex-chinese";
-          rev = "7771304977f921ff0596b17520289c984116f1a1";
-          sha256 = "1d463d7mdlr65yrq7x16nk9124fw1iphf5g238mlh4abbl6kz241";
+          rev = "2ad2364399229144110db7ef6365ad0461d6a38c";
+          sha256 = "06lp56na1fv87296hhaxgb6gfnzln39p4v245gfxhk0k27589vxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-bibtex-chinese";
@@ -52943,8 +53119,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "7ae7bc8bc84ffe0351e23a8a5dc72a18874bee61";
-          sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2";
+          rev = "7e3b7a8adf92e5166d98c35e54dccb88831e85dd";
+          sha256 = "1lsbgpdbry37wgy9p9zbd60cwfrvs9a2fr8b3mzv9i5w9f1wdjy8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -53753,6 +53929,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
+    melpaBuild {
+        pname = "pamparam";
+        version = "20170721.1905";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "pamparam";
+          rev = "0740cf4a5b5da561d5dbab96a6a34e2db28d24ed";
+          sha256 = "1h52zig64g2wdsvx1g590bl62zfg8l4bikfi6y25zx1gic9cifnk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
+          sha256 = "0xwz1il9ldkfprin3rva407m4wm7c48blwfn4mgaxmqafy4p0g9f";
+          name = "pamparam";
+        };
+        packageRequires = [ emacs hydra lispy worf ];
+        meta = {
+          homepage = "https://melpa.org/#/pamparam";
+          license = lib.licenses.free;
+        };
+      }) {};
     pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc";
@@ -53777,12 +53974,12 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "20170503.606";
+        version = "20170720.127";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "72aa0c2abad0ecca689adcf93dd4e9109c9fc737";
-          sha256 = "0hrnd46anfq8vzanax7qzq5fl9kdw26aprally9kjqbr5xdjik2h";
+          rev = "58f893d54c0916ad832097a579288ef8ce405da5";
+          sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -54111,12 +54308,12 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "20170717.145";
+        version = "20170725.34";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "888bd9593f9239f28adab6d93fcdeec69bdf63ed";
-          sha256 = "0z1j3cfsh8cksv6l5fbzp6f72d5874kmg7i6agmab9ixjvgg0izc";
+          rev = "42bfe9f471f19c9d801f15ffde658ea3f4655ac8";
+          sha256 = "12hajddf6bkg5fsi1w31rj1wrg0yr8idp7c1jn00824h0la2maf0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -54697,12 +54894,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20170417.150";
+        version = "20170721.718";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "f314597b2e391f6564e4f9e5cc3af0b4b53f19e9";
-          sha256 = "15m7x61m63zxz2jdz52brm9qjzmx1gy24rq8ilmc4drmb0vfmrr2";
+          rev = "804d9929ce354c60d91ab756735ffff8a6f30688";
+          sha256 = "1qfv9zmqw3s3j94kprr4g73cq0b9cqw0bihbm1pbw6pybivdry09";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -55494,12 +55691,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170621.2242";
+        version = "20170722.1205";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "3a9076b6f6146326c1314c580acddce9cbb5a290";
-          sha256 = "11ily856xk6i00hqfvfxwjch77sigb5lym10dj0zj689gp8jd0wc";
+          rev = "1728f36aaa7b44993495476a06e9c8be0140c51c";
+          sha256 = "1pk3lxg2fa7skz17qygjhvwbvcl34bs2as728i3nid6ghw71fk5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -55662,12 +55859,12 @@
     picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "picpocket";
-        version = "20170305.259";
+        version = "20170723.509";
         src = fetchFromGitHub {
           owner = "johanclaesson";
           repo = "picpocket";
-          rev = "3404de0e6ed1b46f3b873472e34ea9342445f43e";
-          sha256 = "044p26x76i5x0921f8b8zl51k0wfkygdwdiwyhqmmnxzb54qj74l";
+          rev = "ab40afe0e13dff43518233f16e889b44a8a3819b";
+          sha256 = "0snq5wdmdzpbxslixi1vzyi0sccqy9k7m3hwxn540352rsz8zxcz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
@@ -55872,12 +56069,12 @@
     pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pivotal-tracker";
-        version = "20161028.618";
+        version = "20170720.816";
         src = fetchFromGitHub {
           owner = "jxa";
           repo = "pivotal-tracker";
-          rev = "87b4e3cce343519b54a8ff4fef5d7b7745e27c3c";
-          sha256 = "08rj1nimxrz5g1gj231f9d6p8al1svvwv1782h8hyxi87fzmw9sw";
+          rev = "0311d117037c74512149a4a78b269c2e46d7dfba";
+          sha256 = "0g3xzh8jr9lbg6h2hk81cdyxkxx3l79qhxrp4g34rc0dml79rzf9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pivotal-tracker";
@@ -57515,12 +57712,12 @@
     projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20170416.148";
+        version = "20170725.1304";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "56e262dd3b5998d0dc6a590d06bc11058839c588";
-          sha256 = "0sq0w5fi4zrxccabnh78vjb7drw05ay2lpw7wvnrfv97xkywzr4z";
+          rev = "63dc5bcf0803ef81bc13ca499e60c61b8fea2fd6";
+          sha256 = "0lxs3k93jw9whbymbg3swk9c6gbix93vw7mqx9n84qdvijm3zrr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -57725,12 +57922,12 @@
     projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "projector";
-        version = "20170410.905";
+        version = "20170717.1151";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "projector.el";
-          rev = "bd9e5b5c4727c0facd9d45a4b6a46ffddaf6a131";
-          sha256 = "1fx5wg5lnb59z0y25bmysf6a2wld333iihrb9jhcab4hicdqsh9s";
+          rev = "ec63167ee21d537f410c0971f82e2ffdfd6fa008";
+          sha256 = "155wnks7i73c3kvgysnfy0379d1fp78qv2b8lhsaxwx7jh356dbm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector";
@@ -57939,8 +58136,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "c78dbd7c895b8c80cd2f2401d73acf890edf82c6";
-          sha256 = "136l13mq0yki95lra6bvzzq602vhp48nnvw741gf7x34rd4k5kwg";
+          rev = "bb8664419b7d0dd4a94cc1242a2d77bf5e8f567b";
+          sha256 = "1cca2vkpqysnswqawx4rgf7zsmnwvg13irs3jf6ipcld8wsnb17q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58197,12 +58394,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170614.2215";
+        version = "20170719.752";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "3ffc2de8416b4ea389d5800a4a05d0885d9a8608";
-          sha256 = "0dlss3brh4654avq361yma4xbxsv6q5s8qlhp7v470ix88wx4v8r";
+          rev = "2fdd31ff1ae1ab23eeb08d5af936b1bb9b3e51b6";
+          sha256 = "017f899qg3pdm18mb3i7v3x2j4gpqcinscxds8jwjq2ll5d5qf2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -58703,8 +58900,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "9f7797ae15bd5e4e5c4ad320afcc15eeb4cdae82";
-          sha256 = "0p3zmaq0vk5z4ia2i54rjdw4a1d4s9ljb28l48xbb82jmjlgniw7";
+          rev = "d41e49a18817997106ed9f1df20651e1f438222b";
+          sha256 = "0ygj6zzz4dzfwch7hgvmkm83y6rr5jhy789d7qnkdsjyfshkx5dp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -58846,12 +59043,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170716.1133";
+        version = "20170723.1213";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "4846252fb81c309eb5f7a6aa2dcc04804412c684";
-          sha256 = "0zcy7afvyzqmgsn88v5m73bkglnfavhqb4b7fviz355i3waiyfx5";
+          rev = "3ad3e8e0f98d90c634ff81f50776e70e75a98034";
+          sha256 = "0al6jvjrxcqrqkmx1akaqb2ill0crjawc2k7b43aysch3fx7caf2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -59077,12 +59274,12 @@
     quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
     melpaBuild {
         pname = "quelpa";
-        version = "20170620.2318";
+        version = "20170717.2225";
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa";
-          rev = "dbb57da3eba3b5a04ab9b5184634ec139d68ddcd";
-          sha256 = "1jszkgf9rkkjscfaijbz84kpbpw46p15zvlvfmvil30gs5vp2pk4";
+          rev = "eb93cf1ca9d1298a92c680a736dedbd1c3cbbb5a";
+          sha256 = "13wr46qwmi4dnx3i2py0sjhichl5kjai64jcywymp1mc52f6nyl0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -59560,12 +59757,12 @@
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "20170522.2331";
+        version = "20170703.2135";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "e371cdc2d6065099fe7c68583597b1d0abea792b";
-          sha256 = "1c0jlykxkl46qimr60crac4j7nvzr0jixjiv4m6zzk93pn12y3g1";
+          rev = "905bd8e17c48fc270e66b846e8ada81462623e81";
+          sha256 = "1h299kk8w162f9k588a4c4ikl3276y47si81p7jbda2fhf9s5lck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -60318,12 +60515,12 @@
     redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redprl";
-        version = "20170712.903";
+        version = "20170719.754";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "a2f8c5612a055882db5c01b8160c0ae1bd44f1e1";
-          sha256 = "0glnribgqg6hg3ghb5saf26hwydmsg51aq45wj8mdf5dfncimqq8";
+          rev = "bb149c75cb00cedbabc12dd497dce0ab5a7f5072";
+          sha256 = "1m18hnb1hnm6rr5bi2laq9i8djkm73sxp83mawbybydq5j0446bm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -60635,8 +60832,8 @@
         src = fetchFromGitHub {
           owner = "anler";
           repo = "remember-last-theme";
-          rev = "57e8e2a475ea89316dbb5c4d2ea047f56a2cbcdf";
-          sha256 = "0sb110rb6pnjnvyqn0kji19bhbn8mk4x32yps00aq2g2v9pc1jzr";
+          rev = "0973f1aa6b96355fa376fffe8b45733b6e963c51";
+          sha256 = "11kcqpw1wrhghbw2dx3pqndmq9a1rbqir3k71ggaj1x2y2arzvm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme";
@@ -61047,12 +61244,12 @@
     reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "reverse-im";
-        version = "20170623.640";
+        version = "20170721.940";
         src = fetchFromGitHub {
           owner = "a13";
           repo = "reverse-im.el";
-          rev = "da6a4d2fdc1019e7fcd050db6c5344fdad1e2286";
-          sha256 = "1vsfxy4scknn5142mn4v1hkj2qbphmwdj175prd1aj1gk8cbzw9v";
+          rev = "63fb1edee017177c44f8b663a707201b3dd78345";
+          sha256 = "1ha4ldfcnw57rg15mbxspymgs6b2b50f6s0fcb6d7k9xai5idmnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
@@ -61210,6 +61407,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rib-mode";
+        version = "20170722.356";
+        src = fetchFromGitHub {
+          owner = "blezek";
+          repo = "rib-mode";
+          rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866";
+          sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
+          sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587";
+          name = "rib-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/rib-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rich-minority";
@@ -61574,8 +61792,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61636,7 +61854,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59350";
+          rev = "59417";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -61711,18 +61929,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-electric = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }:
+    ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-electric";
-        version = "20150424.752";
-        src = fetchsvn {
-          url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59350";
-          sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
+        version = "20150713.752";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "ruby-electric.el";
+          rev = "35d04e90ef243c7090edf9aaad0142a5a77f0ebd";
+          sha256 = "0ksbm6cbqz7dx6qyq8nlpbx41b153jaww4fwnfwbx9rz993wjjkg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric";
-          sha256 = "0abi1hqjscz2wj4n5habjb6rksxkhwv0cvpw68irkj4fas92qhk8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
+          sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2";
           name = "ruby-electric";
         };
         packageRequires = [];
@@ -61902,12 +62121,12 @@
     rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rufo";
-        version = "20170712.824";
+        version = "20170718.716";
         src = fetchFromGitHub {
           owner = "danielma";
           repo = "rufo.el";
-          rev = "e827b44c8093715a204ed0e4a64ade34441f9355";
-          sha256 = "14qf3napgx8vycr0igrr8534yymgaqh2cb09iz7gbf65cmk86pq8";
+          rev = "85a6d80fb05fef396a8029b8f944c92a53faf8fe";
+          sha256 = "11klircrdc9z9jfksd6rjgwbb775mziss67mw74673b8iva8n1y7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo";
@@ -61986,12 +62205,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170712.1214";
+        version = "20170719.1308";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "60a1f36f4111e825d20d9c3aed561981c470806a";
-          sha256 = "0p09j3y90i0ninyr3alxra17r09ps4sj9klww638l9csk2cgw80f";
+          rev = "0985f5fde747f64b3fcff2661226aa4dad286e04";
+          sha256 = "10mvrdv8cbdsynn4kxv06xm4r6syarmi858pdj6r2bysbp4w6cs8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -62364,12 +62583,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170708.1211";
+        version = "20170725.1332";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "cee28b5e6121e6c85bb647b709c7a8c9e3883700";
-          sha256 = "1f5xkcr9kj5nwqh77hfxbs2i9zzsikbksa56lg9vw67pc78rs7vi";
+          rev = "3e8a75a5d48724ecd6c4171107e1b581100dfce1";
+          sha256 = "14ng4xxld7c3x92bmcww74x724h4c466jd70wrl7hpjhg1z8xhn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -63030,12 +63249,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "20170618.500";
+        version = "20170722.434";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "282bb04ed524ceff2a7a13cee118ec6df55b2323";
-          sha256 = "1g15lrx3ik6539vc5f8v3x0va6k02zz5l13jnqlzs1fl4inxk35v";
+          rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937";
+          sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -64473,12 +64692,12 @@
     skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "skewer-mode";
-        version = "20170709.939";
+        version = "20170722.1745";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "skewer-mode";
-          rev = "51f3bbeafea6701de78190a395f6376a9974f1e5";
-          sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr";
+          rev = "cf8115d4e1ab5c2f990fb6d02a6c75d7d6b82a9e";
+          sha256 = "1m0xbjbvfmy986isgxjm3kj4rzi6vsy4b1hlrbh4kpbjfj3p9sz0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
@@ -64557,12 +64776,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170712.2328";
+        version = "20170725.133";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "f89362f31d8c1ee752bfd9d3cc8a6b5766c94bd6";
-          sha256 = "0b2j0vvsm6psljdkyybjh5ki6drhvq98xwakifk0li220rsi3lkp";
+          rev = "2c756be071b8a8e69022daf606b849f53f211805";
+          sha256 = "003i3snyjh47ckjny15g9isc5k0zhng2dvwmjxazfm4q3ka7p6ir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -64683,12 +64902,12 @@
     slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
     melpaBuild {
         pname = "slime-docker";
-        version = "20160817.2344";
+        version = "20170718.1157";
         src = fetchFromGitHub {
           owner = "daewok";
           repo = "slime-docker";
-          rev = "f90fc274c2f764a5962a3cbcf0ea00622ee5bfe6";
-          sha256 = "0wknygb8gnr49xc5wyyalgs97zk0qj33wwcw1kcxah4nmvzgqg7f";
+          rev = "dc41f7c33de497bc622f037f33ea2a1ecfa1069f";
+          sha256 = "169vy9wjkf0vzqgdbm30rssl82xl2n73hipnaidncbw9sd8cpx1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker";
@@ -65331,12 +65550,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170716.1328";
+        version = "20170723.1205";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "d4445621b88f36a391fc8bfabbed4db08dc88f33";
-          sha256 = "0rsnc5b49n3s6k9a1vr1by1iq1ns9ba2l04k3siqr0hjr8jjwa7b";
+          rev = "25508600c0f715c9cba68b1902b537386b27b97c";
+          sha256 = "1r61pnf74x6faglyixfchzhpx8gp7k8aa1yq00vxpplj4flwyvpz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -65855,12 +66074,12 @@
     solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solaire-mode";
-        version = "20170610.442";
+        version = "20170718.1048";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-solaire-mode";
-          rev = "d2744f8d2d8e1af5d5784021bcb8772e163be800";
-          sha256 = "0zsm00lggvmps0krlhyb5vvs0m0kikzmamj9mq5hw3k372jv4djm";
+          rev = "4058f17c7ccd4eb192598ce493d2e2d2361ee2e0";
+          sha256 = "0vk5d3l2s0dxdv6yjdnwbhs0cdq71kd3l949a8w0qaypad8hg11i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -66261,12 +66480,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170711.102";
+        version = "20170719.131";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "88661813baefece9899588cb34c633eda606f2ac";
-          sha256 = "1qb26ya4f3qd3rh9cpdb02qyqqz6yhgv05b095i9fvwlcbvr4v51";
+          rev = "84ee6d37b8e6d50763ca2977133684143fc61cf3";
+          sha256 = "1w66rfp1kmhqhnqjz2j41i245fw6840q09bfhsaci6kbhvhd5fnm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -66286,8 +66505,8 @@
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "11d6958364271e11c920015c24d509f9bdcce6c9";
-          sha256 = "1z6l85459fbfyn266qdz09c57ns8d1650ksicl3li442ffh5s75i";
+          rev = "b26162e8974c532b3241a43c8f194a340636e9ea";
+          sha256 = "0wxn7diy0pw0iwf3pxvr1yg2h7svrkyna0pgpkyipz3z1chd6h49";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -66366,12 +66585,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20170619.255";
+        version = "20170718.329";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "c06eac2abae29ae55794e61ebd06890909edda7c";
-          sha256 = "08w88wv3yd1l87zzwlrfj586hh3l2k1xq80f1mzskr7vkzi2ailx";
+          rev = "b2216118167d9294ff43326b3b57fa72b20e1f76";
+          sha256 = "055lq7hc9i44w21j37a0p1bm4vd40vbp4yyliaw8v6a7vg9jwhs0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -67033,12 +67252,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170711.725";
+        version = "20170725.429";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "ec4661059109f25df41db1800cac7ffc168fdbbc";
-          sha256 = "1nqf8nwwb188mlyn8xy8v9qzq3xin2pz6synldf0yr8gac8b7bll";
+          rev = "dbd8608551bc9e05280415b7b3937b1a151c7718";
+          sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -68220,8 +68439,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
-          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
+          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -68279,12 +68498,12 @@
     switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "switch-window";
-        version = "20170701.246";
+        version = "20170718.1932";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "switch-window";
-          rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d";
-          sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c";
+          rev = "67113287ba61ce1951363a49f54148743dcea51e";
+          sha256 = "06s1zdy2mlw63w3rnyja9jkvq4m5b46mvi8qjwxcpgqjdihj6f6m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
@@ -68968,12 +69187,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170624.1300";
+        version = "20170718.2306";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "bf6d718955d56b7cf824f7a60803c94a676ccb95";
-          sha256 = "0hkni0dm4s7sgx7zzk88kls8qzmz47b5g1gskp3kxg88b1nbghcw";
+          rev = "321dad4278776b63f8dcd1e67ad387531c472ed4";
+          sha256 = "0w78ssd5qj5a1l3yhi2r2dhmls5jfw2p3ic1iinsqwimkwmvh8aa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -69952,8 +70171,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "0dd823580c78a79ae9696eb9b3650e400fff140f";
-          sha256 = "1j6pq0gxlfbcfkh9pmfgqpfvdmsd1q4jx384jib12y4g0maxnf2b";
+          rev = "5c302e02c40be558a21f3a82b53e527f7bec2ff2";
+          sha256 = "0vm97r6ldd138mjdgz8g92grswfq6a20qyh1pn9sg2liygprabb2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -70010,12 +70229,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170712.638";
+        version = "20170720.2101";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "329d4541b1aa5f90689e84c925562d3bda708755";
-          sha256 = "10rn2lxwir488x1d43bqvsg7la818si0w1qqsf59q79hllzjclg7";
+          rev = "1a1a378060a989589cb6129fa22cfbf3eeb5eab8";
+          sha256 = "0c0hvqpg5fgcxlqadz9dsaca9chmnlf19q366rwk0a6vlcwjgb3a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -70726,12 +70945,12 @@
     tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tql-mode";
-        version = "20170402.1846";
+        version = "20170723.1954";
         src = fetchFromGitHub {
           owner = "tiros-dev";
           repo = "tql-mode";
-          rev = "2c4827652b4b9b640f3c55e27e1b1856ec9e2018";
-          sha256 = "08vsg5y2bg9gxzfcm630vv95d9kwzxqhzz5dzbbi3g71nlgcclk2";
+          rev = "488add79eb3fc8ec02aedaa997fe1ed9e5c3e638";
+          sha256 = "09vkqr5n66w1q5f7m1vgiv0555v23wg6j46ri52lnnslsxpxhlyv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode";
@@ -70879,12 +71098,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170715.2304";
+        version = "20170723.1417";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "2c033fb7a2614a21920d1cb06665f590b97694da";
-          sha256 = "1ark2lcms43kk24352k1jbmgv5bcymmbfqhpbzrribagm5n9qr2h";
+          rev = "509eb326bf6c2e329fb083e116dab6b407be33b5";
+          sha256 = "1fzdk63qmkyah58hl4c9b1vksv8qijkmz326hzszldgm2zr9xnih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -70984,12 +71203,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170705.1153";
+        version = "20170724.445";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0";
-          sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq";
+          rev = "e550867a72359e4a6656b6055c5c3ea26a285499";
+          sha256 = "138hsm4qs1srz2fp26v16rr233qc580wl7ix7wphkr1k1mwmw313";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -71009,8 +71228,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0";
-          sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq";
+          rev = "e550867a72359e4a6656b6055c5c3ea26a285499";
+          sha256 = "138hsm4qs1srz2fp26v16rr233qc580wl7ix7wphkr1k1mwmw313";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71023,6 +71242,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "treepy";
+        version = "20170721.913";
+        src = fetchFromGitHub {
+          owner = "volrath";
+          repo = "treepy.el";
+          rev = "b2191139d67d024e4666b6039e39a23b15b1aba2";
+          sha256 = "170xgvwgnnqkr259d0wv6l4kcp62mb1y1wq6rnk8gp39djsqw01q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
+          sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72";
+          name = "treepy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/treepy";
+          license = lib.licenses.free;
+        };
+      }) {};
     trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }:
     melpaBuild {
         pname = "trident-mode";
@@ -71799,8 +72039,8 @@
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "underline-with-char";
-          rev = "f0d7fad3f5472909f52c7928192f137d2f52c255";
-          sha256 = "1qpqsspvvrfmzy93gj9h5zcj1gzf2fmw2kpl457cllvrks7yb8ry";
+          rev = "b792d4f822bceb0ab0ee63ddcaeddc2085ed3188";
+          sha256 = "0s2p2kjw00p3j9z6hj0d89z3bbwcs12z0h0hg5bjxcb1580dqxhq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char";
@@ -71878,12 +72118,12 @@
     unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "unfill";
-        version = "20160816.2300";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "unfill";
-          rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8";
-          sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc";
+          rev = "d1056ec5ce7bb18abe8933c1e4d5932fb98fb78e";
+          sha256 = "0qbcm7qf33xlbj7wx3164q8m6b8qzgv6w13pk8568nrmb1f8qna8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill";
@@ -72328,12 +72568,12 @@
     use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }:
     melpaBuild {
         pname = "use-package-chords";
-        version = "20170208.1035";
+        version = "20170717.1152";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "use-package-chords";
-          rev = "e8551ce8a514d865831d3a889acece79103fc627";
-          sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5";
+          rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
+          sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords";
@@ -74382,8 +74622,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "2b3ba6dcc3e99cea75d4bf2b4e6cf0898d9a2615";
-          sha256 = "0yga1vf54lf35my64ixw5ssq6jr6ph914afqv5r2gri007bi2zvw";
+          rev = "ec98973a39d32d7c5d908d61383def5c50fa867d";
+          sha256 = "1pf3sa1xfszaakfcjfllhqc624vmxxgy1g5mksbb36d7jjzx0jcb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -74647,12 +74887,12 @@
     window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "window-purpose";
-        version = "20161017.433";
+        version = "20170722.655";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "67ecaa2b52c113f92913c3beb9fb7f302bd50318";
-          sha256 = "0jvihc94iwrb2zxr1qg9yc5fypd1a028d2wfhvg68ipmngcf4q2g";
+          rev = "00ddafcf4802e7430ca709769b888656a6eb421b";
+          sha256 = "1c3jf1cxfvja1v323wkxkd67n9nwzb57c79x4m010h2700xim8vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
@@ -74755,8 +74995,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "f94ec5fed665";
-          sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n";
+          rev = "1ab8f296baeb";
+          sha256 = "02g34b7kp3lkv4sfgf1762vlmmsnxib37v8385lmv90ww24lwggg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -74772,12 +75012,12 @@
     wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wispjs-mode";
-        version = "20140103.1432";
+        version = "20170720.1219";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "wispjs-mode";
-          rev = "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f";
-          sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
+          rev = "60f9f5fd9d1556e2d008939f67eb1b1d0f325fa8";
+          sha256 = "1hhd8ixb2wr06vrd1kw0cd5jh08zm86h2clbvzv9wmqpawwxfm5f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a628330ee8deeab2bd5c2d4b61b33f119c4549d8/recipes/wispjs-mode";
@@ -74832,6 +75072,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    melpaBuild {
+        pname = "with-simulated-input";
+        version = "20170723.941";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "with-simulated-input";
+          rev = "f0dbf2fdd99c6afe7ab2af83c94a4028e4af9c1c";
+          sha256 = "03y3j0q2iy9mgm0yn4mnxkdwwda8jsy6rsm0qdzha8gq4cdcqrjj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
+          sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk";
+          name = "with-simulated-input";
+        };
+        packageRequires = [ emacs s seq ];
+        meta = {
+          homepage = "https://melpa.org/#/with-simulated-input";
+          license = lib.licenses.free;
+        };
+      }) {};
     wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wn-mode";
@@ -74982,12 +75243,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20170427.8";
+        version = "20170724.1132";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "8b0de0d0896aa82a31d13972baf15de56ca5516e";
-          sha256 = "14jk3sinxrb2685y5dslrik10cwjwjc76pgwj3w47h4s6ykarwn8";
+          rev = "e66659923bd53be40a0f0ee1d7fe8a14d22f6973";
+          sha256 = "155sz3hl2ly9m4i8nr2bxham5vzpa2bi9cvgna35gbkp1d34mm41";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -75339,12 +75600,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170713.629";
+        version = "20170725.420";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "e28f16121619f1a929803ef1274d2853d1b43656";
-          sha256 = "1l7yf3k5gdz7flm8qqzkcdpj3cx9q1kklbl2znkxiyb6rvgh7qf2";
+          rev = "4557ee44475b50061219653f0178efd9d832a79f";
+          sha256 = "06fx2mnyd7qs867m1hjzzj47wj06hhqz74bwif6rzhy5v4j7wdcr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -75381,12 +75642,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170713.626";
+        version = "20170725.1253";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "23dae1d6d14d238227e1ee0afeef6ef1561b0c31";
-          sha256 = "1mlqhmk9qpa34p30f8m0ylfajzyvq49qvl3hklgrzqgc9xx4yhxd";
+          rev = "7f884f13d01a5914e0201d58eef7275a6f884cae";
+          sha256 = "1sgh3mk7f1p92jmzcga67bcc4s6ciipc7ga1biav0r3nqfk087jy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -76036,8 +76297,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "1b6d6cc5651a02547415cd571658efcafd9d36fa";
-          sha256 = "0xzw5inzpd2djqx8q276vhiw5j19irkaygnmjn5m5kh2xpzb6aah";
+          rev = "d0671b315a8411ec299af63742813783e3eff04d";
+          sha256 = "1a9rc2k4rah80hmwwmk8ca8k0s2812qsigci072lvc8x49smylld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -76219,12 +76480,12 @@
     yara-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yara-mode";
-        version = "20170713.2206";
+        version = "20170719.2351";
         src = fetchFromGitHub {
           owner = "binjo";
           repo = "yara-mode";
-          rev = "e3eb352a2e295a8a0955bc3e853f1edfd93cbf81";
-          sha256 = "1dn2ssshwj94nmhd2pnvqdwj0za3iri9ky4kd4w50kj9jz18d1wz";
+          rev = "af5c05b34a29fc1bd73a6d21c82cc76320b33e5c";
+          sha256 = "1v8z3cwwla42d3r317091g5i7bj1hlbr9sd1p9s9b7y134gpd1xp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode";
@@ -76324,12 +76585,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170716.1223";
+        version = "20170723.1530";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "2a3a0cd2b18c21fc5f391273045f466c41da743c";
-          sha256 = "09s7ad3wl4rrmdyi0cxmn6vnpkcf97x0g0csy8a8lijsjnrvk4r9";
+          rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5";
+          sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -76365,11 +76626,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170611.1642";
+        version = "20170723.1909";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "e9299b77df1f";
-          sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm";
+          rev = "4f8551386af2";
+          sha256 = "0qvp54pzc6m52j5xkwp25nwdlik6v879halmfvcpn3z0grhrslbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -76427,12 +76688,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 = "20170710.103";
+        version = "20170723.1458";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
-          sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
+          rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6";
+          sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -76687,12 +76948,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20170709.1248";
+        version = "20170721.214";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "379df55b3ea6f217e0187fb8cb6df70d02236cec";
-          sha256 = "0nj7qvr0z3gq31db8r3jsdljj93r0cijssbwxgqscvm945jpxc6x";
+          rev = "b187aee9351f0ec94d87156223e5b434b58aa2a8";
+          sha256 = "1fidrmf2ljhzm9prk8a6y35djgzyj9bsla7pwacjknkqza3pjpbi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -77062,12 +77323,12 @@
     zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoutline";
-        version = "20160915.503";
+        version = "20170722.651";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "zoutline";
-          rev = "714c10a25112b3da62696585bea289c3f8e74158";
-          sha256 = "1z45p9i89lhqak993kq7rdji84rxrdcsnz1yz9xa2l758mnq5gp1";
+          rev = "e86e739b53a1c8a0a2cf6de43dffabb15d465507";
+          sha256 = "0ycri5d61pbwhwpwh9qx9m22mb4ab7bgniwgdbi9s8rzqs4q1p91";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";
@@ -77080,21 +77341,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
+    zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170710.2029";
+        version = "20170724.2249";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "96131375ac74";
-          sha256 = "1p19yy0xyf962rc0j3k4jxl9vyjjyd1ar61wmp6mf6jplj7sxyfl";
+          rev = "620afddbc133";
+          sha256 = "1cjnig9x8xsdjyxdp3wmc8dhp050xzqvi8ca0hrd1fgwzgvg0wvv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
           sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j";
           name = "zpresent";
         };
-        packageRequires = [ dash emacs org-parser ];
+        packageRequires = [ dash emacs org-parser request ];
         meta = {
           homepage = "https://melpa.org/#/zpresent";
           license = lib.licenses.free;

From 6c8871f9287479b92dd4184591adecd207962147 Mon Sep 17 00:00:00 2001
From: Sergey Volkov <volkov.sergey.e@gmail.com>
Date: Mon, 26 Jun 2017 15:31:08 +0500
Subject: [PATCH 0947/3246] docker-machine: 0.10.0 -> 0.12.0

---
 .../networking/cluster/docker-machine/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index b2d70b1f767..5016dc8fca3 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "machine-${version}";
-  version = "0.10.0";
+  version = "0.12.0";
 
   goPackagePath = "github.com/docker/machine";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "docker";
     repo = "machine";
-    sha256 = "1ik0jbp8zqzmg8w1fnf82gdlwrvw4nl40lmins7h8y0q6psrp6gc";
+    sha256 = "08y87d0whag9sy1q5s84xrz95k12c9crh3zmdcr1ylrwqnszrn2y";
   };
 
   postInstall = ''

From bbc5d15d0a77ba80820d44b8a7119fdccf524dd9 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 11 May 2017 22:33:34 +0200
Subject: [PATCH 0948/3246] mypy: 0.501 -> 0.511

---
 pkgs/development/tools/mypy/default.nix | 20 +++++++++++---------
 pkgs/top-level/all-packages.nix         |  4 +++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index eb6e50840a5..a68b29dee24 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, python35Packages }:
-python35Packages.buildPythonApplication rec {
-  name = "mypy-${version}";
-  version = "0.501";
+{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast }:
+
+buildPythonApplication rec {
+  name = "${pname}-${version}";
+  pname = "mypy";
+  version = "0.511";
 
   # Tests not included in pip package.
   doCheck = false;
 
-  src = fetchurl {
-    url = "mirror://pypi/m/mypy/${name}.tar.gz";
-    sha256 = "164g3dq2vzxa53n9lgvmbapg41qiwcxk1w9mvzmnqksvql5vm60h";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vmfyi6zh49mi7rmns5hjgpqshq7islxwsgp80j1izf82r8xgx1z";
   };
 
-  propagatedBuildInputs = with python35Packages; [ lxml typed-ast ];
+  propagatedBuildInputs = [ lxml typed-ast ];
 
   meta = with stdenv.lib; {
     description = "Optional static typing for Python";
     homepage    = "http://www.mypy-lang.org";
     license     = licenses.mit;
-    maintainers = with maintainers; [ martingms ];
+    maintainers = with maintainers; [ martingms lnl7 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c39bdda0bc..45ed837d299 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7361,7 +7361,9 @@ with pkgs;
 
   grabserial = callPackage ../development/tools/grabserial { };
 
-  mypy = callPackage ../development/tools/mypy { };
+  mypy = callPackage ../development/tools/mypy {
+    inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast;
+  };
 
 
   ### DEVELOPMENT / LIBRARIES

From 90acbe5449268dc4e1b344b420cbb3b820e4c37a Mon Sep 17 00:00:00 2001
From: 0xABAB <0xABAB@users.noreply.github.com>
Date: Thu, 27 Apr 2017 18:42:49 +0200
Subject: [PATCH 0949/3246] Cleanup tahoe module

- Remove useless escape of question mark
- Fix and quoting
- Add some '&&s' for correctness
- Add escapeShellArg
- Remove &&s in preStart

Edited by grahamc: fixed the ${} typo on line 246
---
 .../services/network-filesystems/tahoe.nix     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index 9815a5434ee..f70fbcc4975 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -237,13 +237,13 @@ in
               # arguments to $(tahoe start). The node directory must come first,
               # and arguments which alter Twisted's behavior come afterwards.
               ExecStart = ''
-                ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
+                ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile}
               '';
             };
             preStart = ''
-              if [ \! -d ${nodedir} ]; then
+              if [ ! -d ${lib.escapeShellArg nodedir} ]; then
                 mkdir -p /var/db/tahoe-lafs
-                tahoe create-introducer ${nodedir}
+                tahoe create-introducer "${lib.escapeShellArg nodedir}
               fi
 
               # Tahoe has created a predefined tahoe.cfg which we must now
@@ -252,7 +252,7 @@ in
               # we must do this on every prestart. Fixes welcome.
               # rm ${nodedir}/tahoe.cfg
               # ln -s /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg
-              cp /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg
+              cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
             '';
           });
         users.extraUsers = flip mapAttrs' cfg.introducers (node: _:
@@ -337,13 +337,13 @@ in
               # arguments to $(tahoe start). The node directory must come first,
               # and arguments which alter Twisted's behavior come afterwards.
               ExecStart = ''
-                ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
+                ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile}
               '';
             };
             preStart = ''
-              if [ \! -d ${nodedir} ]; then
+              if [ ! -d ${lib.escapeShellArg nodedir} ]; then
                 mkdir -p /var/db/tahoe-lafs
-                tahoe create-node --hostname=localhost ${nodedir}
+                tahoe create-node --hostname=localhost ${lib.escapeShellArg nodedir}
               fi
 
               # Tahoe has created a predefined tahoe.cfg which we must now
@@ -351,8 +351,8 @@ in
               # XXX I thought that a symlink would work here, but it doesn't, so
               # we must do this on every prestart. Fixes welcome.
               # rm ${nodedir}/tahoe.cfg
-              # ln -s /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg
-              cp /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg
+              # ln -s /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${nodedir}/tahoe.cfg
+              cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
             '';
           });
         users.extraUsers = flip mapAttrs' cfg.nodes (node: _:

From cadb42fafb40175896279122e80d4196a06f6601 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Tue, 25 Jul 2017 23:21:27 -0400
Subject: [PATCH 0950/3246] honcho: 0.6.6 -> 1.0.1

---
 pkgs/tools/system/honcho/default.nix | 48 +++++++++++++++++-----------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix
index 6946862422b..d42a6488c7f 100644
--- a/pkgs/tools/system/honcho/default.nix
+++ b/pkgs/tools/system/honcho/default.nix
@@ -1,25 +1,44 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-let honcho = pythonPackages.buildPythonApplication rec {
-  name = "honcho-${version}";
-  version = "0.6.6";
+let
+  inherit (pythonPackages) python;
+  pname = "honcho";
+
+in
+
+pythonPackages.buildPythonApplication rec {
+  name = "${pname}-${version}";
+  version = "1.0.1";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "nickstenning";
     repo = "honcho";
     rev = "v${version}";
-    sha256 = "0lawwcyrrsd9z9jcr94qn1yabl9bzc529jkpc51jq720fhdlfcr0";
+    sha256 = "11bd87474qpif20xdcn0ra1idj5k16ka51i658wfpxwc6nzsn92b";
   };
 
-  buildInputs = with pythonPackages; [ nose mock jinja2 ];
-  checkPhase = ''
-    runHook preCheck
-    nosetests
-    runHook postCheck
+  buildInputs = with pythonPackages; [ jinja2 pytest mock coverage ];
+
+  buildPhase = ''
+    ${python.interpreter} setup.py build
   '';
 
-  doCheck = false;
+  installPhase = ''
+    mkdir -p "$out/lib/${python.libPrefix}/site-packages"
+
+    export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+
+    ${python}/bin/${python.executable} setup.py install \
+      --install-lib=$out/lib/${python.libPrefix}/site-packages \
+      --prefix="$out"
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    PATH=$out/bin:$PATH coverage run -m pytest
+    runHook postCheck
+  '';
 
   meta = with stdenv.lib; {
     description = "A Python clone of Foreman, a tool for managing Procfile-based applications";
@@ -28,11 +47,4 @@ let honcho = pythonPackages.buildPythonApplication rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-};
-
-in
-
-# Some of honcho's tests require that honcho be installed in the environment in
-# order to work. This is a trick to build it without running tests, then pass
-# it to itself as a buildInput so the tests work.
-honcho.overrideDerivation (x: { buildInputs = [ honcho ]; doCheck = true; })
+}

From 998a0e818e6279f9e3916097c633fad8eb946465 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 26 Jul 2017 13:00:18 +0800
Subject: [PATCH 0951/3246] crudini: actually run tests and install docs/man

---
 pkgs/tools/misc/crudini/default.nix | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
index 856138f046a..7ca103062c1 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, fetchFromGitHub, python2Packages, help2man }:
 
 python2Packages.buildPythonApplication rec {
   name = "crudini-${version}";
@@ -11,10 +11,30 @@ python2Packages.buildPythonApplication rec {
     sha256 = "0x9z9lsygripj88gadag398pc9zky23m16wmh8vbgw7ld1nhkiav";
   };
 
+  nativeBuildInputs = [ help2man ];
   propagatedBuildInputs = with python2Packages; [ iniparse ];
 
-  checkPhase = ''
+  doCheck = true;
+
+  prePatch = ''
+    # make runs the unpatched version in src so we need to patch them in addition to tests
     patchShebangs .
+  '';
+
+  postBuild = ''
+    make all
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/{man/man1,doc/crudini}
+
+    cp README EXAMPLES $out/share/doc/crudini/
+    for f in *.1 ; do
+      gzip -c $f > $out/share/man/man1/$(basename $f).gz
+    done
+  '';
+
+  checkPhase = ''
     pushd tests >/dev/null
     ./test.sh
   '';

From 4244a16917ea3392b9360e57292e1fab603ed5ef Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Wed, 26 Jul 2017 02:28:49 -0400
Subject: [PATCH 0952/3246] gocode: update to f1eef9a6, fix stdlib completions

---
 pkgs/development/tools/gocode/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 5ec93462dec..fe6bfc711e6 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -2,14 +2,19 @@
 
 buildGoPackage rec {
   name = "gocode-${version}";
-  version = "20170219-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc";
-  
+  version = "20170530-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05";
+
   goPackagePath = "github.com/nsf/gocode";
 
+  # we must allow references to the original `go` package,
+  # because `gocode` needs to dig into $GOROOT to provide completions for the
+  # standard packages.
+  allowGoReference = true;
+
   src = fetchgit {
     inherit rev;
     url = "https://github.com/nsf/gocode";
-    sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks";
+    sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw";
   };
 }

From 10c6df2e3c2b9d208071447bcd76e4e28e4e12dc Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Wed, 5 Jul 2017 14:21:49 +0200
Subject: [PATCH 0953/3246] =?UTF-8?q?nixos/=E2=80=A6/swap.nix:=20don't=20c?=
 =?UTF-8?q?reate=20a=20LUKS=20header=20for=20randomEncryption?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Creating and then erasing the key relies on the disk erasing data
correctly, and otherwise allows attackers to simply decrypt swap just
using "secretkey". We don't actually need a LUKS header, so we can save
ourselves some pointless disk writes and identifiability.

In addition, I wouldn't have made the awful mistake of backing up my swap partition's LUKS header instead of my zpool's. May my data rest in peace.
---
 nixos/modules/config/swap.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index e57ed2565a1..5d47b09ded9 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -149,9 +149,7 @@ in
                   fi
                 ''}
                 ${optionalString sw.randomEncryption ''
-                  echo "secretkey" | cryptsetup luksFormat --batch-mode ${sw.device}
-                  echo "secretkey" | cryptsetup luksOpen ${sw.device} ${sw.deviceName}
-                  cryptsetup luksErase --batch-mode ${sw.device}
+                  cryptsetup open ${sw.device} ${sw.deviceName} --type plain --key-file /dev/urandom
                   mkswap ${sw.realDevice}
                 ''}
               '';

From a3e6df6ee2510857a6826759a084b6d79c4f1349 Mon Sep 17 00:00:00 2001
From: k0ral <koral@mailoo.org>
Date: Wed, 26 Jul 2017 08:54:42 +0200
Subject: [PATCH 0954/3246] environment.noXlibs: Disable gnome when noXLibs is
 set (#27567)

---
 nixos/modules/config/no-x-libs.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 13477337bda..4b778730252 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -26,7 +26,15 @@ with lib;
 
     fonts.fontconfig.enable = false;
 
-    nixpkgs.config.packageOverrides = pkgs:
-      { dbus = pkgs.dbus.override { x11Support = false; }; };
+    nixpkgs.config.packageOverrides = pkgs: {
+      dbus = pkgs.dbus.override { x11Support = false; };
+      networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; };
+      networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; };
+      networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; };
+      networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; };
+      networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
+      networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
+      pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; };
+    };
   };
 }

From b285b85754b73c00ef55e93488576756ec62dd44 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 25 Jul 2017 16:50:12 +0000
Subject: [PATCH 0955/3246] ocamlPackages.ocaml-migrate-parsetree: 0.7 -> 1.0

---
 .../ocaml-modules/ocaml-migrate-parsetree/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index 46cc922917e..dbfa05744e5 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -6,13 +6,13 @@ else
 
 stdenv.mkDerivation rec {
    name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
-   version = "0.7";
+   version = "1.0";
 
    src = fetchFromGitHub {
      owner = "let-def";
      repo = "ocaml-migrate-parsetree";
      rev = "v${version}";
-     sha256 = "142svvixhz153argd3khk7sr38dhiy4w6sck4766f8b48p41pp3m";
+     sha256 = "0j1d3scakny2b656gyz5z2h8987b5aqw7iwssxgfbhwcszn6sps4";
    };
 
    buildInputs = [ ocaml findlib ocamlbuild jbuilder ];

From e69c7f56419589c0d3296e81f47032fa813cca4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Jul 2017 20:54:10 +0200
Subject: [PATCH 0956/3246] haskell-generic-builder: include
 setupHaskellDepends in the generated "env" attribute

We achieve this by moving setupHaskellDepends from the buildInputs attribute
into "otherBuildInputs", which is the attribute the builder uses to construct
the build inputs in both the actual build as well as the "env" attribute.
---
 pkgs/development/haskell-modules/generic-builder.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 97a3adaf220..c972a2b36b7 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -144,9 +144,9 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends;
 
-  nativeBuildInputs = setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends;
+  nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
-  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
+  otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
                      # ghcjs's hsc2hs calls out to the native hsc2hs

From 27ca0cb3d40f157b18a44f66540473d4cb9dcdab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Jul 2017 20:57:24 +0200
Subject: [PATCH 0957/3246] haskell-generic-builder: fix syntax high-lightning
 in Emacs

---
 pkgs/development/haskell-modules/generic-builder.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index c972a2b36b7..8675d40fd23 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -231,11 +231,11 @@ stdenv.mkDerivation ({
     # libraries) from all the dependencies.
     local dynamicLinksDir="$out/lib/links"
     mkdir -p $dynamicLinksDir
-    for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
-      ln -s $d/*.dylib $dynamicLinksDir
+    for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'); do
+      ln -s "$d/"*.dylib $dynamicLinksDir
     done
     # Edit the local package DB to reference the links directory.
-    for f in $packageConfDir/*.conf; do
+    for f in "$packageConfDir/"*.conf; do
       sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f
     done
   '') + ''

From efa3ba8950d1ce664b2ea6ae2d6b937d29c2f13c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Jul 2017 08:40:56 +0200
Subject: [PATCH 0958/3246] haskell-diagrams-solve: disable failing test suite
 to fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8fa2cbcf713..4ad1d3b426c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -877,4 +877,7 @@ self: super: {
   # Has a dependency on outdated versions of directory.
   cautious-file = doJailbreak (dontCheck super.cautious-file);
 
+  # https://github.com/diagrams/diagrams-solve/issues/4
+  diagrams-solve = dontCheck super.diagrams-solve;
+
 }

From aafe3d29c1572b89aa0f4f8095ffd9a43c77229e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 23 Jul 2017 17:15:55 +0200
Subject: [PATCH 0959/3246] ghc: apply a patch to fix common gold linker
 problem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It would otherwise result into undefined referenecs for some functions
in the base when using the gold linker:

   error: undefined reference to 'sqrt'

Fixes https://github.com/bos/double-conversion/pull/17

Previously ghc option -optl=-lm was used for packages depending on
such functions, but that could result into

   fatal error: cannot mix -r with dynamic object /nix/store/7crrmih8c52r8fbnqb933dxrsp44md93-glibc-2.25/lib/libm.so.6

in some situations like profiling builds.

Patch was prepared by Michael Bishop and Niklas Hambüchen.

Closes https://github.com/NixOS/nixpkgs/pull/27584.
---
 pkgs/development/compilers/ghc/8.0.2.nix      |  2 +-
 pkgs/development/compilers/ghc/8.2.1.nix      |  2 +
 .../compilers/ghc/ghc-gold-linker.patch       | 54 +++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/ghc/ghc-gold-linker.patch

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index cc0b1d4eadd..7df72be2c81 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi";
   };
 
-  patches = []
+  patches = [ ./ghc-gold-linker.patch ]
     ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch;
 
diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix
index 91c66a7cb47..a046cd0b67d 100644
--- a/pkgs/development/compilers/ghc/8.2.1.nix
+++ b/pkgs/development/compilers/ghc/8.2.1.nix
@@ -32,6 +32,8 @@ in stdenv.mkDerivation (rec {
 
   postPatch = "patchShebangs .";
 
+  patches = [ ./ghc-gold-linker.patch ];
+
   preConfigure = commonPreConfigure;
 
   buildInputs = commonBuildInputs;
diff --git a/pkgs/development/compilers/ghc/ghc-gold-linker.patch b/pkgs/development/compilers/ghc/ghc-gold-linker.patch
new file mode 100644
index 00000000000..edce7ef3a17
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-gold-linker.patch
@@ -0,0 +1,54 @@
+From 46fe80ab7c0013a929d0934e61429820042a70a9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
+Date: Fri, 21 Jul 2017 20:09:11 +0200
+Subject: [PATCH 1/2] base: Add `extra-libraries: m` because base uses libm
+ functions.
+
+Linking with gold needs this because in contrast to ld, gold
+doesn't implicitly link libm.
+
+Found by Michael Bishop <cleverca22@gmail.com>.
+---
+ libraries/base/base.cabal | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
+index f00fb8768e5..fd91f268ffe 100644
+--- a/libraries/base/base.cabal
++++ b/libraries/base/base.cabal
+@@ -342,6 +342,10 @@ Library
+         WCsubst.h
+         consUtils.h
+ 
++    -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
++    -- Other linkers, like gold, don't, so we have to declare it explicitly.
++    extra-libraries: m
++
+     -- OS Specific
+     if os(windows)
+         -- Windows requires some extra libraries for linking because the RTS
+
+From 900a8f4931e9bc6d3219d9263cfecfc6af8fc766 Mon Sep 17 00:00:00 2001
+From: michael bishop <cleverca22@gmail.com>
+Date: Sat, 22 Jul 2017 13:12:39 -0300
+Subject: [PATCH 2/2] also add -lm to ghc-prim
+
+---
+ libraries/ghc-prim/ghc-prim.cabal | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
+index 00a029efedf..6db85dd69fc 100644
+--- a/libraries/ghc-prim/ghc-prim.cabal
++++ b/libraries/ghc-prim/ghc-prim.cabal
+@@ -42,6 +42,10 @@ Library
+         UnliftedFFITypes
+ 
+     build-depends: rts == 1.0.*
++    
++    -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
++    -- Other linkers, like gold, don't, so we have to declare it explicitly.
++    extra-libraries: m
+ 
+     exposed-modules:
+         GHC.CString

From 4664cf80798854b22a4d21799bfce8f993f7c618 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Jul 2017 12:33:31 +0200
Subject: [PATCH 0960/3246] hackage2nix: keep Cabal 1.24.x around for the time
 being

---
 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 204a23c6286..692d9fc02a7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2446,6 +2446,7 @@ extra-packages:
   - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
+  - Cabal == 1.24.*                     # required for jailbreak-cabal etc.
   - 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

From 8a3c0802370e1d50467a5c4c6f769b01f3c1ef9b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jul 2017 09:06:30 +0200
Subject: [PATCH 0961/3246] hackage2nix: drop old packages that were required
 for stack prior to version 1.5.x

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 --------
 .../haskell-modules/configuration-hackage2nix.yaml        | 3 ---
 2 files changed, 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4ad1d3b426c..eb3f25e6253 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -680,14 +680,6 @@ self: super: {
     then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
     else super.gtk;
 
-  # The stack people don't bother making their own code compile in an LTS-based
-  # environment: https://github.com/commercialhaskell/stack/issues/3001.
-  stack = super.stack.overrideScope (self: super: {
-    store-core = self.store-core_0_3;
-    store = self.store_0_3_1;
-    hpack = self.hpack_0_17_1;
-  });
-
   # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only.
   intero-nix-shim = self.callPackage ../tools/haskell/intero-nix-shim {};
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 692d9fc02a7..04e9a27d8d0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2457,7 +2457,6 @@ extra-packages:
   - haddock-api == 2.16.*               # required on GHC 7.10.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
   - haskell-src-exts == 1.18.*          # required by hoogle-5.0.4
-  - hpack < 0.18                        # required by stack-1.4.0
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
@@ -2467,8 +2466,6 @@ extra-packages:
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
-  - store < 0.4                         # needed by stack 1.4.0
-  - store-core < 0.4                    # needed by stack 1.4.0
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
   - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3

From fd6f0a2127d4a6bbe4aadc9c31c336026f5ec762 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jul 2017 09:07:33 +0200
Subject: [PATCH 0962/3246] hackage2nix: drop obsolete version of zlib

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 04e9a27d8d0..9233b91df16 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2469,7 +2469,6 @@ extra-packages:
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
   - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3
-  - zlib < 0.6                          # newer versions break cabal-install
 
 package-maintainers:
   peti:

From 1178136336989c99a89d4e3049a88c22013dcf0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jul 2017 09:59:55 +0200
Subject: [PATCH 0963/3246] hackage2nix: disable failing builds

---
 .../configuration-hackage2nix.yaml            | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 9233b91df16..78f123af0fe 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2701,6 +2701,7 @@ dont-distribute-packages:
   alex-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algebraic-classes:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlgorithmW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3053,6 +3054,7 @@ dont-distribute-packages:
   bits-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitspeak:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bit-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bittorrent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bit-vector:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3093,6 +3095,7 @@ dont-distribute-packages:
   bluetileutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   blunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   BNFC-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bno055-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell-compiler:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3294,6 +3297,7 @@ dont-distribute-packages:
   chatty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatty-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatty-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chatwork:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cheapskate-terminal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3408,6 +3412,7 @@ dont-distribute-packages:
   Codec-Image-DevIL:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-libevent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codec-rpm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   codemonitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   codepad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   codeworld-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3448,7 +3453,9 @@ dont-distribute-packages:
   comonad-random:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ComonadSheet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   compactable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compact:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-map:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compact-mutable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-socket:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-automata:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3476,6 +3483,7 @@ dont-distribute-packages:
   concraft-hr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft-pl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concrete-haskell-autogen:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-typerep:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Concurrential:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3539,6 +3547,7 @@ dont-distribute-packages:
   copilot:                                      [ 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-sbv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-theorem:                              [ 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 ]
@@ -3597,12 +3606,14 @@ dont-distribute-packages:
   criterion-to-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   criu-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   criu-rpc-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crjdt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   crocodile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cron-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cruncher-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crunghc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-cipher-benchmarks:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-classical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cryptoconditions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-enigma:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-multihash:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3749,6 +3760,7 @@ dont-distribute-packages:
   debug-me:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   decepticons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   decimal-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  decimal-literals:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DecisionTree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   decoder-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dedukti:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3834,6 +3846,7 @@ dont-distribute-packages:
   digitalocean-kzs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensional-codata:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DimensionalHash:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dimensions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-example:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-widgets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3935,6 +3948,7 @@ dont-distribute-packages:
   dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dumb-cas:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3964,6 +3978,7 @@ dont-distribute-packages:
   easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   easytensor:                                   [ i686-linux ]
+  easytensor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebeats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ec2-unikernel:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3996,6 +4011,7 @@ dont-distribute-packages:
   ekg-rrd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   electrum-mnemonic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eliminators:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   elocrypt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4191,6 +4207,7 @@ dont-distribute-packages:
   fishfood:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fitsio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fitspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-point:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-point-vector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-point-vector-space:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4402,6 +4419,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-compact:                                  [ 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 ]
@@ -4560,12 +4578,14 @@ dont-distribute-packages:
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-maps-geocoding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2-for-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2-jwt:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   googleplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   googlepolyline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleSB:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-static-maps:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleSuggest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleTranslate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4681,6 +4701,7 @@ dont-distribute-packages:
   gulcii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gyah-bin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2048:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h2c:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   habit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4719,6 +4740,7 @@ dont-distribute-packages:
   hack-middleware-jsonp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactors:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haddock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddocset:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-formats:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4880,6 +4902,7 @@ dont-distribute-packages:
   haskell-import-graph:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-kubernetes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-lsp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-mpfr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-neo4j-client:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5000,6 +5023,7 @@ dont-distribute-packages:
   HCL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcltest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcoap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hcom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcoord:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcron:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hCsound:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5187,6 +5211,7 @@ dont-distribute-packages:
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-iadd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-irr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5657,6 +5682,8 @@ dont-distribute-packages:
   incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-maps:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indentation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indentation-trifecta:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   indexed-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   IndexedList:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   indices:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5971,6 +5998,7 @@ dont-distribute-packages:
   language-lua2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-lua-qq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-mixal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-ninja:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-puppet:                              [ i686-linux, x86_64-darwin ]
@@ -6418,6 +6446,7 @@ dont-distribute-packages:
   monad-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-classes-logging:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCompose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-dijkstra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-exception:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-fork:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadiccp-gecode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6671,6 +6700,7 @@ dont-distribute-packages:
   n-m:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   nntp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  noether:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nofib-analyze:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   noise:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nomyx-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6706,6 +6736,7 @@ dont-distribute-packages:
   NumberTheory:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numeric-ode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ranges:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-range:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6748,6 +6779,7 @@ dont-distribute-packages:
   onama:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   one-liner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   oneormore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  online:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OnRmt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-classy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6887,6 +6919,7 @@ dont-distribute-packages:
   PCLT-DB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcre-light-extra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdfname:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdf-slave:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdf-slave-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdfsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6901,12 +6934,14 @@ dont-distribute-packages:
   penny-bin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  penrose:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   peparser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perceptron:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   peregrin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  perf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   period:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   periodic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6934,6 +6969,7 @@ dont-distribute-packages:
   pgdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-harness-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pg-recorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-store:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6993,6 +7029,7 @@ dont-distribute-packages:
   plailude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   planar-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   plat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  platinum-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlayingCards:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   playlists:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plist-buddy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7015,6 +7052,7 @@ dont-distribute-packages:
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokemon-go-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  poker-eval:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokitdok:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   polar-shader:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7119,6 +7157,7 @@ dont-distribute-packages:
   progression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   proj4-hs-bindings:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  project-m36:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog-graph-lib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7427,6 +7466,7 @@ dont-distribute-packages:
   req:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rerebase:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  resin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-effect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-embed:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7768,6 +7808,7 @@ dont-distribute-packages:
   simpleirc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-logging:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleLog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-log-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-neural-networks:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7974,6 +8015,7 @@ dont-distribute-packages:
   ssh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sssp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sstable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SSTG:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-heap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-marriage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7984,6 +8026,7 @@ dont-distribute-packages:
   stackage-curator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-bump:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-derive-topdown:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8033,6 +8076,7 @@ dont-distribute-packages:
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream-fusion:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-cassava:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8122,6 +8166,7 @@ dont-distribute-packages:
   system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-info:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-linux-proc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-locale:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   systemstats:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8212,6 +8257,7 @@ dont-distribute-packages:
   terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tersmu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  testbench:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TestExplode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8231,6 +8277,7 @@ dont-distribute-packages:
   test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TeX-my-math:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
@@ -8275,6 +8322,7 @@ dont-distribute-packages:
   th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-kinds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threadscope:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   threads-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-flexbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8423,6 +8471,7 @@ dont-distribute-packages:
   turing-machines:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tweet-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-graphics:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-trees:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-graphs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8540,6 +8589,7 @@ dont-distribute-packages:
   url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urn-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   urxml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-hid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8654,6 +8704,7 @@ dont-distribute-packages:
   wai-middleware-route:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-verbs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-routes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8755,6 +8806,7 @@ dont-distribute-packages:
   WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wordsearch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  word-wrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   workdays:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-osx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-pure:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8791,6 +8843,7 @@ dont-distribute-packages:
   X11-xdamage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xfixes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   x11-xinput:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  x509-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcffib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8870,6 +8923,7 @@ dont-distribute-packages:
   yampa2048:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa-glut:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yampa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   YampaSynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8893,6 +8947,7 @@ dont-distribute-packages:
   yesod-auth-kerberos:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap-mediocre:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-ldap-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-oauth2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-oauth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]

From 91a8ed37af2da06cd9808906440eadf3e9d3910f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Jul 2017 12:34:53 +0200
Subject: [PATCH 0964/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.3.1-23-g656c589 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/2b4eeaa78bcd11470222558d828edd51b98b94a0.
---
 .../haskell-modules/hackage-packages.nix      | 4752 ++++++++++++++---
 1 file changed, 3863 insertions(+), 889 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8c361341960..05b5678c074 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -478,7 +478,9 @@ self: {
      }) {};
 
   "ALUT" = callPackage
-    ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }:
+    ({ mkDerivation, base, freealut, OpenAL, pretty, StateVar
+     , transformers
+     }:
      mkDerivation {
        pname = "ALUT";
        version = "2.4.0.2";
@@ -487,6 +489,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base OpenAL StateVar transformers ];
        librarySystemDepends = [ freealut ];
+       executableHaskellDepends = [ base pretty ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -942,11 +945,12 @@ self: {
      }) {};
 
   "AppleScript" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "AppleScript";
        version = "0.2.0.1";
        sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr";
+       libraryHaskellDepends = [ base ];
        doHaddock = false;
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
@@ -2456,6 +2460,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Cabal_2_0_0_2" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, pretty, process, QuickCheck, tagged
+     , tar, tasty, tasty-hunit, tasty-quickcheck, time, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "2.0.0.2";
+       sha256 = "0chhl2113jbahd5gychx9rdqj1aw22h7dyj6z44871hzqxngx6bc";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         pretty process time unix
+       ];
+       testHaskellDepends = [
+         array base bytestring containers directory filepath pretty
+         QuickCheck tagged tar tasty tasty-hunit tasty-quickcheck
+       ];
+       doCheck = false;
+       homepage = "http://www.haskell.org/cabal/";
+       description = "A framework for packaging Haskell software";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Cabal-ide-backend" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
@@ -3489,14 +3517,21 @@ self: {
      }) {};
 
   "DMuCheck" = callPackage
-    ({ mkDerivation, base, MuCheck }:
+    ({ mkDerivation, base, binary, directory, distributed-process
+     , distributed-process-simplelocalnet, hint, MuCheck
+     , network-transport-tcp, unix
+     }:
      mkDerivation {
        pname = "DMuCheck";
        version = "0.3.0.2";
        sha256 = "00dhky0hnda85lvrs155jgwxnpqfm36cqakj3wp0yrn2xlz383ad";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base MuCheck ];
+       executableHaskellDepends = [
+         base binary directory distributed-process
+         distributed-process-simplelocalnet hint MuCheck
+         network-transport-tcp unix
+       ];
        homepage = "https://bitbucket.com/osu-testing/d-mucheck";
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
@@ -3550,7 +3585,7 @@ self: {
          regex-posix split syb time unix
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ array base bytestring HTF ];
        description = "Darcs Patch Manager";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4503,7 +4538,7 @@ self: {
 
   "Earley" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ListLike, parsec, tasty
-     , tasty-hunit, tasty-quickcheck
+     , tasty-hunit, tasty-quickcheck, unordered-containers
      }:
      mkDerivation {
        pname = "Earley";
@@ -4512,6 +4547,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
+       executableHaskellDepends = [ base unordered-containers ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        benchmarkHaskellDepends = [
          base criterion deepseq ListLike parsec
@@ -4523,6 +4559,7 @@ self: {
   "Earley_0_12_0_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers
      }:
      mkDerivation {
        pname = "Earley";
@@ -4531,6 +4568,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
+       executableHaskellDepends = [ base unordered-containers ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
@@ -5909,8 +5947,8 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, OpenGL, StateVar
-     , transformers
+    ({ mkDerivation, array, base, bytestring, containers, OpenGL
+     , OpenGLRaw, random, StateVar, transformers
      }:
      mkDerivation {
        pname = "GLUT";
@@ -5921,6 +5959,9 @@ self: {
        libraryHaskellDepends = [
          array base containers OpenGL StateVar transformers
        ];
+       executableHaskellDepends = [
+         array base bytestring OpenGLRaw random
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -8966,6 +9007,7 @@ self: {
          base containers HTTP hxt hxt-http mtl network network-uri parsec
          transformers
        ];
+       executableHaskellDepends = [ base hxt ];
        testHaskellDepends = [ base hspec hxt ];
        homepage = "https://github.com/egonSchiele/HandsomeSoup";
        description = "Work with HTML more easily in HXT";
@@ -9837,6 +9879,28 @@ self: {
        pname = "HsOpenSSL";
        version = "0.11.4.9";
        sha256 = "0y5khy8a1anisa8s1zysz763yg29mr6c9zcx4bjszaba5axyj3za";
+       revision = "1";
+       editedCabalFile = "0hxqmki50di5vkkfhb684kz3dvqx7gw7cxzdq2h3q10gdjki0avp";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         base bytestring integer-gmp network time
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/vshabanov/HsOpenSSL";
+       description = "Partial OpenSSL binding for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
+  "HsOpenSSL_0_11_4_10" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
+     , openssl, time
+     }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.4.10";
+       sha256 = "1jlyjyfv421k176y4mjdxgvj3cp2a05xqwy0qlihbf9j385fz0l7";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring integer-gmp network time
@@ -10440,6 +10504,10 @@ self: {
          attoparsec base bytestring bytestring-nums bytestring-trie
          containers utf8-string
        ];
+       executableHaskellDepends = [
+         attoparsec base bytestring bytestring-nums bytestring-trie
+         containers utf8-string
+       ];
        homepage = "http://github.com/solidsnack/JSONb/";
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
@@ -10968,6 +11036,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ lber openldap ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        testSystemDepends = [ lber openldap ];
        homepage = "https://github.com/ezyang/ldap-haskell";
@@ -11504,6 +11573,9 @@ self: {
          mtl multiset old-locale operational prefix-units pretty PSQueue
          sequential-index split stm time transformers void yjtools
        ];
+       executableHaskellDepends = [
+         base cereal cmdtheline containers transformers
+       ];
        testHaskellDepends = [
          base bytestring cereal composition containers data-ivar directory
          hslogger hslogger-template HUnit lens MonadCatchIO-transformers
@@ -11534,6 +11606,9 @@ self: {
          MonadCatchIO-transformers stm transformers
        ];
        librarySystemDepends = [ openmpi ];
+       executableHaskellDepends = [
+         base cereal cmdtheline hslogger LogicGrowsOnTrees
+       ];
        executableSystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -11557,6 +11632,9 @@ self: {
          hslogger-template lens LogicGrowsOnTrees MonadCatchIO-transformers
          mtl network pretty transformers
        ];
+       executableHaskellDepends = [
+         base cereal cmdtheline LogicGrowsOnTrees
+       ];
        testHaskellDepends = [
          base hslogger hslogger-template HUnit LogicGrowsOnTrees network
          random stm test-framework test-framework-hunit transformers
@@ -11583,6 +11661,9 @@ self: {
          hslogger hslogger-template LogicGrowsOnTrees
          MonadCatchIO-transformers process transformers
        ];
+       executableHaskellDepends = [
+         base cereal cmdtheline LogicGrowsOnTrees
+       ];
        testHaskellDepends = [
          base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees
          random test-framework test-framework-hunit transformers
@@ -11943,6 +12024,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base newtype-generics ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
@@ -12763,7 +12845,7 @@ self: {
      }) {};
 
   "NaturalSort" = callPackage
-    ({ mkDerivation, base, bytestring, strict }:
+    ({ mkDerivation, base, bytestring, QuickCheck, strict }:
      mkDerivation {
        pname = "NaturalSort";
        version = "0.2.1";
@@ -12771,6 +12853,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring strict ];
+       executableHaskellDepends = [ base bytestring QuickCheck strict ];
        homepage = "http://github.com/joachifm/natsort";
        description = "Natural sorting for strings";
        license = stdenv.lib.licenses.bsd3;
@@ -13456,6 +13539,7 @@ self: {
          base ObjectName OpenGL StateVar transformers
        ];
        librarySystemDepends = [ openal ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
@@ -13551,6 +13635,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mesa;};
 
+  "OpenGLRaw_3_2_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "3.2.5.0";
+       sha256 = "1drxviqsx25isrxdq5f5gr5hrpfpbqcs7pj632qibmvpaqp4s3xg";
+       libraryHaskellDepends = [
+         base bytestring containers fixed half text transformers
+       ];
+       librarySystemDepends = [ mesa ];
+       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) mesa;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -14196,6 +14298,7 @@ self: {
          data-default-class generic-accessors glib gtk3 lens text time
          transformers vector
        ];
+       executableHaskellDepends = [ base containers generic-accessors ];
        description = "Real-time line plotter for generic data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14693,8 +14796,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "QuickCheck-safe";
-       version = "0.1.0.2";
-       sha256 = "1y7qa29wxjkfjlx360k5s85gnppmz2qqdl9pfm49klq010k42vib";
+       version = "0.1.0.3";
+       sha256 = "0fwnywnmdws04f1y7qw0l8hawa2hn99x62g1mpjwcdx8dm4yal7f";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
@@ -15650,8 +15753,8 @@ self: {
      }) {};
 
   "SHA" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, QuickCheck
-     , test-framework, test-framework-quickcheck2
+    ({ mkDerivation, array, base, binary, bytestring, directory
+     , QuickCheck, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "SHA";
@@ -15660,6 +15763,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base binary bytestring ];
+       executableHaskellDepends = [ base bytestring directory ];
        testHaskellDepends = [
          array base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
@@ -15731,6 +15835,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SSTG" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-paths }:
+     mkDerivation {
+       pname = "SSTG";
+       version = "0.1.0.4";
+       sha256 = "0z61bv1mxmm1gq4b61gp3519fv0v7hb1cqcl4x8zp7cz5hgr8sr4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers ghc ghc-paths ];
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers ];
+       homepage = "https://github.com/AntonXue/SSTG#readme";
+       description = "STG Symbolic Execution";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "STL" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, text }:
      mkDerivation {
@@ -17277,6 +17397,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
+       executableHaskellDepends = [ base mtl old-time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17330,6 +17451,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "TeX-my-math" = callPackage
+    ({ mkDerivation, base, decimal-literals, directory, dumb-cas
+     , filepath, hashable, haskell-src-meta, HaTeX, process
+     , template-haskell, text, unordered-containers, vector-space, void
+     }:
+     mkDerivation {
+       pname = "TeX-my-math";
+       version = "0.201.0.0";
+       sha256 = "0lrv0wybagc1zka9nq78qrdaygl4wbhkllw3w79cnmk1bagslxs4";
+       libraryHaskellDepends = [
+         base decimal-literals dumb-cas hashable haskell-src-meta HaTeX
+         template-haskell text unordered-containers vector-space void
+       ];
+       testHaskellDepends = [
+         base directory dumb-cas filepath haskell-src-meta HaTeX process
+         template-haskell text
+       ];
+       homepage = "http://github.com/leftaroundabout/Symbolic-math-HaTeX";
+       description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio.";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "TeaHS" = callPackage
     ({ mkDerivation, array, base, containers, mtl, SDL, SDL-image
      , SDL-mixer, SFont, Sprig
@@ -18598,6 +18742,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers directory Win32 ];
+       executableHaskellDepends = [ base directory ];
        description = "A binding to part of the Win32 library for file notification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19161,6 +19306,8 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random vector-space ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/ony/Yampa-core";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -19400,6 +19547,7 @@ self: {
        ];
        librarySystemDepends = [ abc ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base base-compat ];
        testHaskellDepends = [
          aig base base-compat directory QuickCheck tasty tasty-ant-xml
          tasty-hunit tasty-quickcheck vector
@@ -20067,6 +20215,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "acid-state_0_14_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers
+     , criterion, directory, extensible-exceptions, filepath, mtl
+     , network, random, safecopy, stm, system-fileio, system-filepath
+     , template-haskell, unix
+     }:
+     mkDerivation {
+       pname = "acid-state";
+       version = "0.14.3";
+       sha256 = "1d8hq8cj6h4crfnkmds6mhrhhg7r1b1byb8fybaj8khfa99sj0nm";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers directory
+         extensible-exceptions filepath mtl network safecopy stm
+         template-haskell unix
+       ];
+       benchmarkHaskellDepends = [
+         base criterion directory mtl random system-fileio system-filepath
+       ];
+       homepage = "https://github.com/acid-state/acid-state";
+       description = "Add ACID guarantees to any serializable Haskell data structure";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "acid-state-dist" = callPackage
     ({ mkDerivation, acid-state, base, bytestring, cereal
      , concurrent-extra, containers, criterion, directory, filepath, mtl
@@ -21213,27 +21385,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson-compat_0_3_7" = callPackage
+  "aeson-compat_0_3_7_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
      , base-compat, base-orphans, bytestring, containers, exceptions
-     , hashable, nats, QuickCheck, quickcheck-instances, scientific
-     , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, time-locale-compat, unordered-containers, vector
+     , hashable, QuickCheck, quickcheck-instances, scientific, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , time-locale-compat, unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-compat";
-       version = "0.3.7";
-       sha256 = "053wa7j82pymr633vakpdandrddg083zcmv76g9sbawcsfiw5whv";
+       version = "0.3.7.1";
+       sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-iso8601 base base-compat bytestring
-         containers exceptions hashable nats scientific semigroups tagged
-         text time time-locale-compat unordered-containers vector
+         containers exceptions hashable scientific tagged text time
+         time-locale-compat unordered-containers vector
        ];
        testHaskellDepends = [
          aeson attoparsec base base-compat base-orphans bytestring
-         containers exceptions hashable nats QuickCheck quickcheck-instances
-         scientific semigroups tagged tasty tasty-hunit tasty-quickcheck
-         text time time-locale-compat unordered-containers vector
+         containers exceptions hashable QuickCheck quickcheck-instances
+         scientific tagged tasty tasty-hunit tasty-quickcheck text time
+         time-locale-compat unordered-containers vector
        ];
        homepage = "https://github.com/phadej/aeson-compat#readme";
        description = "Compatibility layer for aeson";
@@ -21299,6 +21471,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-extra_0_4_1_0" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, attoparsec
+     , attoparsec-iso8601, base, base-compat, bytestring, containers
+     , deepseq, exceptions, hashable, parsec, quickcheck-instances
+     , recursion-schemes, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, these, time
+     , time-parsers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-extra";
+       version = "0.4.1.0";
+       sha256 = "11chkybn96q39j9y4h2wmq5vs0a0sb24qvk0g1qq8kyaiahvsd8y";
+       libraryHaskellDepends = [
+         aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat
+         bytestring containers deepseq exceptions hashable parsec
+         recursion-schemes scientific template-haskell text these time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base containers quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck these time time-parsers unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/phadej/aeson-extra#readme";
+       description = "Extra goodies for aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-filthy" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, text
      , unordered-containers
@@ -21348,6 +21549,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-flowtyped" = callPackage
+    ({ mkDerivation, aeson, base, containers, free, recursion-schemes
+     , reflection, scientific, tasty, tasty-hunit, text, time
+     , unordered-containers, vector, wl-pprint
+     }:
+     mkDerivation {
+       pname = "aeson-flowtyped";
+       version = "0.7.1";
+       sha256 = "1b0dqscd7dz14flmjzinzdck99sqpjg4qnhy0wdl9bjajf7bfbhb";
+       libraryHaskellDepends = [
+         aeson base containers free recursion-schemes reflection scientific
+         text time unordered-containers vector wl-pprint
+       ];
+       testHaskellDepends = [
+         aeson base recursion-schemes tasty tasty-hunit text vector
+       ];
+       description = "Create Flow type definitions from Haskell data types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-generic-compat" = callPackage
     ({ mkDerivation, aeson, base }:
      mkDerivation {
@@ -21904,6 +22125,11 @@ self: {
          fclabels mtl network pipes pipes-concurrency pipes-network safe
          snmp time transformers unix
        ];
+       executableHaskellDepends = [
+         base binary bitwise bytestring containers data-default Diff
+         fclabels mtl network pipes pipes-concurrency pipes-network safe
+         snmp time transformers unix
+       ];
        description = "AgentX protocol for write SNMP subagents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22386,8 +22612,8 @@ self: {
     ({ mkDerivation, base, deepseq, template-haskell, text }:
      mkDerivation {
        pname = "alex-tools";
-       version = "0.2.0.0";
-       sha256 = "0vhqq8d138hgjas6697pwzij6wqc9pn8ix64bs17mhiyq3ygmyvg";
+       version = "0.2.0.1";
+       sha256 = "1szwa4cz9nx6rxfgg58d3j4q90zv80cvfzaq47bvlb3vb2pai4nh";
        libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
@@ -22519,12 +22745,13 @@ self: {
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
        pname = "algebraic-classes";
-       version = "0.7.1";
-       sha256 = "0w0p3qzvwyj3ijdggaaagcd1x9iwnzxk9yi9vqba63xdbzr18zrc";
+       version = "0.8";
+       sha256 = "1ihrxm3gn4558wlwlm8wagq133ipy04kc3d6wsx0an83wyrcnz1w";
        libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
        description = "Conversions between algebraic classes and F-algebras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic-graphs" = callPackage
@@ -22554,6 +22781,7 @@ self: {
        libraryHaskellDepends = [
          algebra base basic-prelude lens semigroups
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/konn/algebraic-prelude#readme";
        description = "Algebraically structured Prelude";
        license = stdenv.lib.licenses.bsd3;
@@ -25296,6 +25524,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -25310,6 +25539,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
+       executableHaskellDepends = [ ansi-terminal base ];
        homepage = "http://github.com/ekmett/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
        license = stdenv.lib.licenses.bsd3;
@@ -25510,6 +25740,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl ];
+       executableHaskellDepends = [ base containers MissingH mtl ];
        homepage = "http://software.complete.org/anydbm";
        description = "Interface for DBM-like database systems";
        license = "GPL";
@@ -26255,8 +26486,8 @@ self: {
      }:
      mkDerivation {
        pname = "apply-refact";
-       version = "0.4.0.0";
-       sha256 = "1s25nlkbfzjr6b5psii3n7hmwvg7lgvaljp1ilq5y82rq8sfyxps";
+       version = "0.4.1.0";
+       sha256 = "00hmfdwyrva90wnkww2n6jl7h6s24brz58cacqy8wkgacqrb73kw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27502,6 +27733,8 @@ self: {
        pname = "ast-monad";
        version = "0.1.0.0";
        sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i";
+       revision = "1";
+       editedCabalFile = "1rvdxx5gl22jp528z7b75fwm1dhfsdx2hhvwvfaw3wc59a66gmml";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/mkdag/ast-monad#readme";
@@ -27786,7 +28019,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "async-refresh-tokens_0_2_0_0" = callPackage
+  "async-refresh-tokens_0_3_0_0" = callPackage
     ({ mkDerivation, async-refresh, base, bytestring, criterion
      , formatting, HUnit, lifted-async, microlens, microlens-th
      , monad-control, monad-logger, safe-exceptions, stm, test-framework
@@ -27794,8 +28027,8 @@ self: {
      }:
      mkDerivation {
        pname = "async-refresh-tokens";
-       version = "0.2.0.0";
-       sha256 = "1inpl44hmk4g5y0p09wdg85k921174zz5f5kn0z69b13gfrhncw6";
+       version = "0.3.0.0";
+       sha256 = "11kwkqxxqipfl193wk1a441r8jr6h1lj50xrzmpjhqmacwr212nm";
        libraryHaskellDepends = [
          async-refresh base bytestring formatting lifted-async microlens
          microlens-th monad-control monad-logger safe-exceptions stm text
@@ -28806,6 +29039,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter_1_1_2" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "1.1.2";
+       sha256 = "1n7pzpxz3bb4l20hy53qdda4r1gwf6j47py08n9w568j7hygrklx";
+       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
@@ -30111,6 +30360,8 @@ self: {
        pname = "ballast";
        version = "0.1.0.0";
        sha256 = "1skzfj5l4j1jgpc0dlqmwpysa4bf9f9jpllz6zqb17zknicd77qf";
+       revision = "1";
+       editedCabalFile = "0lcxvxrpsbr5ibcwda6vrhrsc55grwabfikw34bc9r1rv293399i";
        libraryHaskellDepends = [
          aeson base bytestring either-unwrap hspec hspec-expectations
          http-client http-client-tls http-types text time transformers
@@ -30119,7 +30370,7 @@ self: {
        testHaskellDepends = [
          base bytestring either-unwrap hspec hspec-expectations text time
        ];
-       homepage = "https://github.com/bitemyapp/ballast#readme";
+       homepage = "https://github.com/alexeyzab/ballast#readme";
        description = "Shipwire API client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30247,8 +30498,8 @@ self: {
      }) {};
 
   "bamse" = callPackage
-    ({ mkDerivation, base, com, directory, filepath, old-time, pretty
-     , process, regex-compat
+    ({ mkDerivation, base, com, directory, filepath, HUnit, old-time
+     , pretty, process, QuickCheck, regex-compat
      }:
      mkDerivation {
        pname = "bamse";
@@ -30259,6 +30510,7 @@ self: {
        libraryHaskellDepends = [
          base com directory filepath old-time pretty process regex-compat
        ];
+       executableHaskellDepends = [ HUnit QuickCheck ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30436,17 +30688,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_9_1_0" = callPackage
-    ({ mkDerivation, ghc-prim, integer-gmp, rts }:
+  "base_4_10_0_0" = callPackage
+    ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.9.1.0";
-       sha256 = "0zpvf4yq52dkl9f30w6x4fv1lqcc175i57prhv56ky06by08anvs";
-       libraryHaskellDepends = [ ghc-prim integer-gmp rts ];
+       version = "4.10.0.0";
+       sha256 = "06sgjlf3v3yyp0rdyi3f7qlp5iqw7kg0zrwml9lmccdy93pahclv";
+       libraryHaskellDepends = [
+         ghc-prim invalid-cabal-flag-settings 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 }:
@@ -30511,6 +30766,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base-noprelude_4_10_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-noprelude";
+       version = "4.10.0.0";
+       sha256 = "1jc1szrja1651vf73kprsa0yq73w331i1g08p54w1znkilf7jalf";
+       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 {
@@ -33253,7 +33522,8 @@ self: {
 
   "bio" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup
+     , directory, mtl, old-time, parallel, parsec, process, QuickCheck
+     , random, tagsoup
      }:
      mkDerivation {
        pname = "bio";
@@ -33265,7 +33535,9 @@ self: {
          array base binary bytestring containers directory mtl parallel
          parsec QuickCheck tagsoup
        ];
-       executableHaskellDepends = [ base bytestring random ];
+       executableHaskellDepends = [
+         base bytestring containers old-time process QuickCheck random
+       ];
        homepage = "http://biohaskell.org/Libraries/Bio";
        description = "A bioinformatics library";
        license = "LGPL";
@@ -33514,6 +33786,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base vector ];
+       executableHaskellDepends = [ base vector ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
          vector
@@ -33522,6 +33795,7 @@ self: {
        homepage = "https://github.com/Bodigrim/bit-stream#readme";
        description = "Lazy, infinite, compact stream of 'Bool' with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bit-vector" = callPackage
@@ -34935,8 +35209,8 @@ self: {
      }:
      mkDerivation {
        pname = "bloodhound-amazonka-auth";
-       version = "0.1.1.0";
-       sha256 = "0145hn23jjk7kfcqj9dr2bk3my90nfdb3k805cpmbmg0w15s34ng";
+       version = "0.1.2.0";
+       sha256 = "1r9fj8zh9swdmy0f96112kpm1s50wlyf194w2km4rpq2hblcjlrm";
        libraryHaskellDepends = [
          amazonka-core amazonka-elasticsearch base bloodhound exceptions
          http-client http-types time transformers uri-bytestring
@@ -35168,6 +35442,7 @@ self: {
        homepage = "https://bitbucket.org/fmapE/bno055-haskell";
        description = "Library for communication with the Bosch BNO055 orientation sensor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "board-games" = callPackage
@@ -35655,7 +35930,7 @@ self: {
      }) {};
 
   "boring-window-switcher" = callPackage
-    ({ mkDerivation, base, gtk, transformers, X11 }:
+    ({ mkDerivation, base, gtk, hspec, transformers, X11 }:
      mkDerivation {
        pname = "boring-window-switcher";
        version = "0.1.0.4";
@@ -35664,6 +35939,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base gtk transformers X11 ];
        executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/debug-ito/boring-window-switcher";
        description = "A boring window switcher";
        license = stdenv.lib.licenses.bsd3;
@@ -36019,6 +36295,9 @@ self: {
          microlens-th stm template-haskell text text-zipper transformers
          vector vty
        ];
+       executableHaskellDepends = [
+         base microlens microlens-th text text-zipper vector vty
+       ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
@@ -36041,6 +36320,9 @@ self: {
          microlens-mtl microlens-th stm template-haskell text text-zipper
          transformers vector vty word-wrap
        ];
+       executableHaskellDepends = [
+         base microlens microlens-th text text-zipper vector vty
+       ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
@@ -36457,6 +36739,7 @@ self: {
          data-default http-conduit http-types iso8601-time resourcet text
          time transformers unordered-containers vector
        ];
+       executableHaskellDepends = [ base containers text time ];
        homepage = "https://github.com/sethfowler/hsbugzilla";
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
@@ -36484,6 +36767,8 @@ self: {
        pname = "buildbox";
        version = "2.1.9.3";
        sha256 = "1ffvf82qmf05vxzxi70jm1yq8apv5s62nms529n6x1p5lyrwwdr5";
+       revision = "1";
+       editedCabalFile = "0nqhdmkmgnqgfw8vkjnwbrzrj7lvrhc0gw23p8smxkppvh6y5zv3";
        libraryHaskellDepends = [
          base bytestring containers directory exceptions mtl old-locale
          pretty process stm temporary text time
@@ -36727,6 +37012,10 @@ self: {
          base bifunctors containers deque either extra free microlens
          microlens-th mtl multistate pretty transformers unsafe void
        ];
+       testHaskellDepends = [
+         base containers deque either extra free microlens microlens-th mtl
+         multistate pretty transformers unsafe
+       ];
        homepage = "https://github.com/lspitzner/butcher/";
        description = "Chops a command or program invocation into digestable pieces";
        license = stdenv.lib.licenses.bsd3;
@@ -36782,6 +37071,7 @@ self: {
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
@@ -36871,15 +37161,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bytestring_0_10_8_1" = callPackage
+  "bytestring_0_10_8_2" = callPackage
     ({ mkDerivation, base, byteorder, deepseq, directory, dlist
      , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "bytestring";
-       version = "0.10.8.1";
-       sha256 = "16zwb1p83z7vc5wlhvknpy80b5a2jxc5awx67rk52qnp9idmyq9d";
+       version = "0.10.8.2";
+       sha256 = "0fjc5ybxx67l0kh27l6vq4saf88hp1wnssj5ka90ii588y76cvys";
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        testHaskellDepends = [
          base byteorder deepseq directory dlist ghc-prim HUnit mtl
@@ -37691,6 +37981,10 @@ self: {
        executableHaskellDepends = [
          base Cabal debian lens mtl pretty Unixutils
        ];
+       testHaskellDepends = [
+         base Cabal containers debian Diff directory filepath hsemail HUnit
+         lens pretty process text
+       ];
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
@@ -39020,6 +39314,7 @@ self: {
          OpenGL OpenGLRaw random template-haskell text transformers vector
          WAVE
        ];
+       executableHaskellDepends = [ base lens ];
        homepage = "https://github.com/fumieval/call";
        description = "The call game engine";
        license = stdenv.lib.licenses.bsd3;
@@ -39465,6 +39760,8 @@ self: {
        pname = "carray";
        version = "0.1.6.7";
        sha256 = "0b5zabyfzi60llvimk2hfw93r38qfl3z5kjhp71rdgqj0alaxmx9";
+       revision = "1";
+       editedCabalFile = "0fbpqacz1n60bmvwnhhlz97b715060yr5xh3wzkpqnl4qq44vmgv";
        libraryHaskellDepends = [
          array base binary bytestring ix-shapable QuickCheck syb
        ];
@@ -39474,6 +39771,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "carray_0_1_6_8" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, ix-shapable
+     , QuickCheck, syb
+     }:
+     mkDerivation {
+       pname = "carray";
+       version = "0.1.6.8";
+       sha256 = "04qny61gcjblqjrz761wp4bdkxk6zbm31xn6h426iybw9kanf6cg";
+       libraryHaskellDepends = [
+         array base binary bytestring ix-shapable QuickCheck syb
+       ];
+       testHaskellDepends = [ array base ix-shapable QuickCheck ];
+       benchmarkHaskellDepends = [ array base ];
+       description = "A C-compatible array library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "carte" = callPackage
     ({ mkDerivation, base, filepath, mtl, network, optparse-applicative
      , random, semigroups, time, transformers, tuple
@@ -41036,6 +41351,7 @@ self: {
          array base binary bytestring Codec-Image-DevIL containers
          data-reify directory GLUT OpenGLRaw process time
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/ChalkBoard";
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
@@ -41197,16 +41513,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "chart-unit_0_3_2" = callPackage
-    ({ mkDerivation, ad, base, colour, diagrams-lib, diagrams-svg
-     , foldl, formatting, lens, linear, mwc-probability, mwc-random
-     , numhask, numhask-range, primitive, protolude, reflection, tasty
-     , tasty-hspec, tdigest, text
+  "chart-unit_0_4_1" = callPackage
+    ({ mkDerivation, ad, base, colour, diagrams-lib
+     , diagrams-rasterific, diagrams-svg, foldl, formatting, JuicyPixels
+     , lens, linear, mwc-probability, mwc-random, numhask, numhask-range
+     , primitive, protolude, reflection, tasty, tasty-hspec, tdigest
+     , text
      }:
      mkDerivation {
        pname = "chart-unit";
-       version = "0.3.2";
-       sha256 = "06yilm8ldkf59vxycydfhn990x6lmykgma2nwc87mxnqc6820a22";
+       version = "0.4.1";
+       sha256 = "0ry6j00rmkbv9z98d7i6zmj5sxh4ram4nyaw39k2kgaxkgfa1iag";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41214,12 +41531,13 @@ self: {
          numhask numhask-range text
        ];
        executableHaskellDepends = [
-         ad base foldl mwc-probability mwc-random numhask primitive
-         protolude reflection tdigest text
+         ad base diagrams-lib diagrams-rasterific foldl JuicyPixels
+         mwc-probability mwc-random numhask primitive protolude reflection
+         tdigest text
        ];
        testHaskellDepends = [ base numhask tasty tasty-hspec ];
        homepage = "https://github.com/tonyday567/chart-unit";
-       description = "A set of native haskell charts";
+       description = "Native haskell charts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -41348,11 +41666,13 @@ self: {
        homepage = "https://github.com/matsubara0507/chatwork#readme";
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cheapskate" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers
-     , data-default, mtl, syb, text, uniplate, xss-sanitize
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
+     , data-default, http-types, mtl, syb, text, uniplate, wai
+     , wai-extra, xss-sanitize
      }:
      mkDerivation {
        pname = "cheapskate";
@@ -41366,7 +41686,9 @@ self: {
          base blaze-html containers data-default mtl syb text uniplate
          xss-sanitize
        ];
-       executableHaskellDepends = [ base blaze-html bytestring text ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring http-types text wai wai-extra
+       ];
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
        license = stdenv.lib.licenses.bsd3;
@@ -41394,6 +41716,8 @@ self: {
        pname = "cheapskate-lucid";
        version = "0.1.0.0";
        sha256 = "0ibjfy5dbkizg8cw4avhwl62xpk735a1a7bc0nkhf9zxpq9fb0pm";
+       revision = "1";
+       editedCabalFile = "197nx95xw21i7zyvgzcgnr36ab6vrk17c66iz8ndwz61vp1jf6hc";
        libraryHaskellDepends = [ base blaze-html cheapskate lucid ];
        homepage = "http://github.com/aelve/cheapskate-lucid";
        description = "Use cheapskate with Lucid";
@@ -42418,8 +42742,8 @@ self: {
 
   "clang-pure" = callPackage
     ({ mkDerivation, base, bytestring, clang, containers, contravariant
-     , inline-c, microlens, microlens-contra, singletons, stm
-     , template-haskell, vector
+     , hashable, inline-c, lens, microlens, microlens-contra, singletons
+     , stm, template-haskell, unordered-containers, vector
      }:
      mkDerivation {
        pname = "clang-pure";
@@ -42432,6 +42756,9 @@ self: {
          microlens-contra singletons stm template-haskell vector
        ];
        librarySystemDepends = [ clang ];
+       executableHaskellDepends = [
+         base bytestring hashable lens unordered-containers
+       ];
        description = "Pure C++ code analysis with libclang";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42839,6 +43166,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "clckwrks_0_24_0_4" = callPackage
+    ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
+     , blaze-html, bytestring, cereal, containers, directory, filepath
+     , happstack-authenticate, happstack-hsp, happstack-jmacro
+     , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs
+     , ixset, jmacro, lens, mtl, network, network-uri, old-locale
+     , openssl, process, random, reform, reform-happstack, reform-hsp
+     , safecopy, stm, text, time, time-locale-compat
+     , unordered-containers, userid, utf8-string, uuid-orphans
+     , uuid-types, vector, web-plugins, web-routes, web-routes-happstack
+     , web-routes-hsp, web-routes-th, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "clckwrks";
+       version = "0.24.0.4";
+       sha256 = "0xpv3qb7w1bzszbnmzriai9dv9qfajnv1pv9y3jdaih4gj73c9ny";
+       libraryHaskellDepends = [
+         acid-state aeson aeson-qq attoparsec base blaze-html bytestring
+         cereal containers directory filepath happstack-authenticate
+         happstack-hsp happstack-jmacro happstack-server
+         happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl
+         network network-uri old-locale process random reform
+         reform-happstack reform-hsp safecopy stm text time
+         time-locale-compat unordered-containers userid utf8-string
+         uuid-orphans uuid-types vector web-plugins web-routes
+         web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
+       ];
+       librarySystemDepends = [ openssl ];
+       homepage = "http://www.clckwrks.com/";
+       description = "A secure, reliable content management system (CMS) and blogging platform";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "clckwrks-cli" = callPackage
     ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl
      , network, parsec
@@ -42916,8 +43277,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-ircbot";
-       version = "0.6.17.2";
-       sha256 = "0aqal0r72zbjximdkc9g3252f8iq1qz7sphp53s5z3w5cnwrsfv8";
+       version = "0.6.17.3";
+       sha256 = "1fk6jyjvkqs11khj8mriqbj56kz19ayhha3kq79cnhjm8c7184cb";
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html bytestring clckwrks
          containers directory filepath happstack-hsp happstack-server hsp
@@ -42931,6 +43292,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clckwrks-plugin-mailinglist" = callPackage
+    ({ mkDerivation, acid-state, attoparsec, base, bytestring, clckwrks
+     , containers, directory, filepath, happstack-authenticate
+     , happstack-hsp, happstack-server, hsp, HStringTemplate, hsx2hs
+     , html-email-validate, ixset, lens, mime-mail, mtl, network-uri
+     , reform, reform-happstack, reform-hsp, safecopy, text, time, uuid
+     , uuid-orphans, web-plugins, web-routes, web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-mailinglist";
+       version = "0.3.0.2";
+       sha256 = "1zhcqkzas3pcnviwka0v174spq8wn457kvmxk6nafcxkwf27p52m";
+       libraryHaskellDepends = [
+         acid-state attoparsec base bytestring clckwrks containers directory
+         filepath happstack-authenticate happstack-hsp happstack-server hsp
+         HStringTemplate hsx2hs html-email-validate ixset lens mime-mail mtl
+         network-uri reform reform-happstack reform-hsp safecopy text time
+         uuid uuid-orphans web-plugins web-routes web-routes-th
+       ];
+       homepage = "http://www.clckwrks.com/";
+       description = "mailing list plugin for clckwrks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "clckwrks-plugin-media" = callPackage
     ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
      , clckwrks, containers, directory, filepath, gd, happstack-server
@@ -42955,6 +43340,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clckwrks-plugin-media_0_6_16_4" = 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.4";
+       sha256 = "19fv38gqslg01ymj3nb838pnhir92gfkyl6kccik39brgcfd915b";
+       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-page" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
@@ -42981,6 +43390,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clckwrks-plugin-page_0_4_3_10" = callPackage
+    ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
+     , containers, directory, filepath, happstack-hsp, happstack-server
+     , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
+     , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell
+     , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins
+     , web-routes, web-routes-happstack, web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-page";
+       version = "0.4.3.10";
+       sha256 = "0ijwfl4wj0pjv6hfac6fbrvcg3all9p2wx2w1lirjvn5kgwjj5r2";
+       libraryHaskellDepends = [
+         acid-state aeson attoparsec base clckwrks containers directory
+         filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
+         old-locale random reform reform-happstack reform-hsp safecopy
+         tagsoup template-haskell text time time-locale-compat uuid
+         uuid-orphans web-plugins web-routes web-routes-happstack
+         web-routes-th
+       ];
+       homepage = "http://www.clckwrks.com/";
+       description = "support for CMS/Blogging in clckwrks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clckwrks-theme-bootstrap" = callPackage
     ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp
      , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins
@@ -43833,6 +44268,8 @@ self: {
        pname = "cmark-lucid";
        version = "0.1.0.0";
        sha256 = "00rwiax7dd01259vrdkv574zi58agr17p7jkzixgwchfxngpp4nj";
+       revision = "1";
+       editedCabalFile = "1mizbv18bl8qrgz27wlz7sb6cfhblmp7p7gh7dqq8g0r4djrvqg5";
        libraryHaskellDepends = [ base cmark lucid ];
        homepage = "http://github.com/aelve/cmark-lucid";
        description = "Use cmark with Lucid";
@@ -43922,6 +44359,9 @@ self: {
        libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
+       executableHaskellDepends = [
+         base filepath process template-haskell transformers
+       ];
        homepage = "https://github.com/ndmitchell/cmdargs#readme";
        description = "Command line argument processing";
        license = stdenv.lib.licenses.bsd3;
@@ -44206,6 +44646,7 @@ self: {
        homepage = "https://github.com/weldr/codec-rpm";
        description = "A library for manipulating RPM files";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codecov-haskell" = callPackage
@@ -45162,8 +45603,8 @@ self: {
        homepage = "https://github.com/ezyang/compact";
        description = "Non-GC'd, contiguous storage for immutable data structures";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {ghc-compact = null;};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
 
   "compact-map" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers }:
@@ -45197,8 +45638,8 @@ self: {
        homepage = "https://github.com/andrewthad/compact-mutable#readme";
        description = "Mutable arrays living on the compact heap";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {ghc-compact = null;};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
 
   "compact-socket" = callPackage
     ({ mkDerivation, base, binary, bytestring, compact, deepseq
@@ -45475,6 +45916,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "composable-associations" = callPackage
+    ({ mkDerivation, base, lens, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "composable-associations";
+       version = "0.1.0.0";
+       sha256 = "03l056yb6k8x5xrfdszsn4w2739zyiqzrl6q3ci19dg1gsy106lx";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base lens tasty tasty-hunit ];
+       homepage = "https://github.com/SamProtas/composable-associations#readme";
+       description = "Types and helpers for composing types into a single larger key-value type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "composable-associations-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, composable-associations
+     , doctest, tasty, tasty-hunit, tasty-quickcheck, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "composable-associations-aeson";
+       version = "0.1.0.0";
+       sha256 = "0kragi8wfd30yxrndxka5p3bivj1qi8svljcdkqnji32dpnm9myv";
+       libraryHaskellDepends = [
+         aeson base composable-associations text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring doctest tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/SamProtas/composable-associations#readme";
+       description = "Aeson ToJSON/FromJSON implementation for the types of composable-associations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "compose-ltr" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
@@ -45727,12 +46201,12 @@ self: {
      , constraints, containers, control-monad-loop, convertible
      , criterion, deepseq, 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, random, reflection, semigroups
-     , singletons, sized, smallcheck, tagged, template-haskell
-     , test-framework, test-framework-hunit, text, transformers
-     , type-natural, unamb, unordered-containers, vector
+     , hybrid-vectors, lazysmallcheck, lens, matrix, monad-loops
+     , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes
+     , process, QuickCheck, quickcheck-instances, random, reflection
+     , semigroups, singletons, sized, smallcheck, tagged
+     , template-haskell, test-framework, test-framework-hunit, text
+     , transformers, type-natural, unamb, unordered-containers, vector
      }:
      mkDerivation {
        pname = "computational-algebra";
@@ -45749,12 +46223,18 @@ self: {
          sized tagged template-haskell text type-natural unamb
          unordered-containers vector
        ];
+       executableHaskellDepends = [
+         algebra algebraic-prelude base constraints convertible criterion
+         deepseq equational-reasoning hmatrix lens matrix MonadRandom
+         parallel random reflection semigroups singletons sized type-natural
+         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
+         equational-reasoning hspec HUnit lazysmallcheck lens matrix
+         MonadRandom monomorphic process QuickCheck quickcheck-instances
+         reflection singletons sized smallcheck tagged test-framework
+         test-framework-hunit text transformers type-natural vector
        ];
        benchmarkHaskellDepends = [
          algebra base constraints containers criterion deepseq
@@ -45906,25 +46386,34 @@ self: {
      }) {};
 
   "concrete-haskell" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , directory, filepath, hashable, megaparsec, mtl
-     , optparse-applicative, process, QuickCheck, scientific, tar, text
-     , thrift, time, unordered-containers, uuid, vector, zlib
+    ({ mkDerivation, base, bytestring, bzlib, containers, directory
+     , filepath, hashable, megaparsec, mtl, network, optparse-generic
+     , path-io, process, QuickCheck, scientific, tar, text, thrift, time
+     , unordered-containers, uuid, vector, zip, zlib
      }:
      mkDerivation {
        pname = "concrete-haskell";
-       version = "0.1.0.8";
-       sha256 = "10pr4c48kdgbm365y4jjwk5ba3xvi90p1n8m94161y1j4bs1zzvm";
+       version = "0.1.0.11";
+       sha256 = "12kvwxngsnh3lhp1q415ga8apkadfb8cxzvrlmlvrjdk6p5aczza";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring containers directory filepath hashable
-         megaparsec mtl process QuickCheck scientific tar text thrift time
-         unordered-containers uuid vector zlib
+         base bytestring bzlib containers directory filepath hashable
+         megaparsec mtl network optparse-generic path-io process QuickCheck
+         scientific tar text thrift time unordered-containers uuid vector
+         zip zlib
        ];
        executableHaskellDepends = [
-         base bytestring containers directory filepath optparse-applicative
-         process text vector zlib
+         base bytestring bzlib containers directory filepath hashable
+         megaparsec mtl network optparse-generic path-io process QuickCheck
+         scientific tar text thrift time unordered-containers uuid vector
+         zip zlib
+       ];
+       testHaskellDepends = [
+         base bytestring bzlib containers directory filepath hashable
+         megaparsec mtl network optparse-generic path-io process QuickCheck
+         scientific tar text thrift time unordered-containers uuid vector
+         zip zlib
        ];
        homepage = "https://github.com/hltcoe";
        description = "Library for the Concrete data format";
@@ -45932,6 +46421,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "concrete-haskell-autogen" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hashable, QuickCheck
+     , text, thrift, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "concrete-haskell-autogen";
+       version = "0.0.0.1";
+       sha256 = "09y6jj0f7kaibn9imnk6wrhkn1yq1dpjxr8pqdizqqm5dwrwy94m";
+       libraryHaskellDepends = [
+         base bytestring containers hashable QuickCheck text thrift
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/hltcoe";
+       description = "Automatically generated Thrift definitions for the Concrete data format";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concrete-relaxng-parser" = callPackage
     ({ mkDerivation, base, cmdargs, containers, hxt, hxt-charproperties
      , hxt-curl, hxt-relaxng, hxt-tagsoup
@@ -46690,13 +47197,14 @@ self: {
      }:
      mkDerivation {
        pname = "config-ini";
-       version = "0.1.2.0";
-       sha256 = "05gfqyrqnvnn0hy145vf9g7iiyariqj7gqacckdib8zv8msvg8nk";
+       version = "0.1.2.1";
+       sha256 = "14yq2yssk13ip0iz7q7wl3gp9k575wcj3h7c603halkdqf17iibi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base megaparsec text transformers unordered-containers
        ];
+       executableHaskellDepends = [ base text ];
        testHaskellDepends = [
          base directory doctest ini microlens QuickCheck text
          unordered-containers
@@ -46791,7 +47299,7 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , case-insensitive, containers, directory, either, functor-infix
      , hspec, hspec-discover, mtl, pretty-show, QuickCheck, safe
-     , scientific, string-conversions, template-haskell
+     , scientific, string-conversions, template-haskell, text
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
@@ -46805,6 +47313,9 @@ self: {
          functor-infix mtl safe string-conversions template-haskell
          unordered-containers vector yaml
        ];
+       executableHaskellDepends = [
+         base bytestring mtl pretty-show string-conversions text yaml
+       ];
        testHaskellDepends = [
          aeson aeson-pretty base case-insensitive hspec hspec-discover mtl
          pretty-show QuickCheck scientific string-conversions
@@ -47268,18 +47779,16 @@ self: {
 
   "consumers" = callPackage
     ({ mkDerivation, base, containers, exceptions, hpqtypes
-     , lifted-base, lifted-threads, log, monad-control, mtl, stm, time
-     , transformers-base
+     , lifted-base, lifted-threads, log-base, monad-control, mtl, stm
+     , time, transformers-base
      }:
      mkDerivation {
        pname = "consumers";
-       version = "2.0";
-       sha256 = "15ar527x015hxbqwf49xfacg1w975zir61kaq5054pyfshgg0yj6";
-       revision = "1";
-       editedCabalFile = "1j4034gsibz22cwh3vqjb0lyvdibn2y3nkmj2bmzwdjw5s110x2z";
+       version = "2.0.0.1";
+       sha256 = "1hpqn3bd4d08is0lczn1cgr9kl0s5rz719p8a2n1qyjriibrh7k1";
        libraryHaskellDepends = [
-         base containers exceptions hpqtypes lifted-base lifted-threads log
-         monad-control mtl stm time transformers-base
+         base containers exceptions hpqtypes lifted-base lifted-threads
+         log-base monad-control mtl stm time transformers-base
        ];
        homepage = "https://github.com/scrive/consumers";
        description = "Concurrent PostgreSQL data consumers";
@@ -47478,8 +47987,10 @@ self: {
      }) {};
 
   "continuum" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, hyperleveldb
-     , mtl, nanomsg-haskell, time
+    ({ mkDerivation, base, bytestring, cereal, containers, data-default
+     , foldl, hyperleveldb, leveldb-haskell-fork, mtl, nanomsg-haskell
+     , parallel-io, resourcet, stm, suspend, time, timers, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "continuum";
@@ -47490,6 +48001,11 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
+       executableHaskellDepends = [
+         base bytestring cereal containers data-default foldl
+         leveldb-haskell-fork mtl nanomsg-haskell parallel-io resourcet stm
+         suspend time timers transformers transformers-base
+       ];
        executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48118,6 +48634,7 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -48439,16 +48956,16 @@ self: {
      }) {};
 
   "country" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, hashable, primitive
-     , text, unordered-containers
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, ghc-prim
+     , hashable, primitive, scientific, text, unordered-containers
      }:
      mkDerivation {
        pname = "country";
-       version = "0.1.1";
-       sha256 = "00fmbljb9s1nfhgcv52ka9mavfqp6ljx6nzw5jmy8f1j8rvx49l6";
+       version = "0.1.3";
+       sha256 = "0gn73gkfqn4iy9zjbkzf5x65pljg82hm6dvi7fb81hxswwm50qbs";
        libraryHaskellDepends = [
-         base bytestring ghc-prim hashable primitive text
-         unordered-containers
+         aeson attoparsec base bytestring ghc-prim hashable primitive
+         scientific text unordered-containers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/andrewthad/country#readme";
@@ -48457,7 +48974,9 @@ self: {
      }) {};
 
   "country-codes" = callPackage
-    ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }:
+    ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup
+     , text
+     }:
      mkDerivation {
        pname = "country-codes";
        version = "0.1.3";
@@ -48465,6 +48984,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base shakespeare text ];
+       executableHaskellDepends = [ base tagsoup text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
        homepage = "https://github.com/prowdsponsor/country-codes";
        description = "ISO 3166 country codes and i18n names";
@@ -49070,13 +49590,16 @@ self: {
      }:
      mkDerivation {
        pname = "crawlchain";
-       version = "0.1.2.0";
-       sha256 = "17rvn7yxcaz7zya358rnvw9imf0b660s4hnk8ds81c8pvshc65hh";
+       version = "0.2.0.0";
+       sha256 = "0fs8996lzwibnqcaq3j5zgw7alnq8y1k3xqylpdgcp06p7na744q";
        libraryHaskellDepends = [
          base bytestring directory http-streams network-uri split tagsoup
          text time
        ];
-       testHaskellDepends = [ base split tagsoup ];
+       testHaskellDepends = [
+         base bytestring directory http-streams network-uri split tagsoup
+         text time
+       ];
        description = "Simulation user crawl paths";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49531,6 +50054,7 @@ self: {
        homepage = "https://github.com/amarpotghan/crjdt-haskell#readme";
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crockford" = callPackage
@@ -50078,6 +50602,7 @@ self: {
        homepage = "https://github.com/libscott/cryptoconditions-hs";
        description = "Interledger Crypto-Conditions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptohash" = callPackage
@@ -50255,6 +50780,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptol_2_5_0" = callPackage
+    ({ mkDerivation, alex, ansi-terminal, array, async, base
+     , base-compat, bytestring, containers, criterion, deepseq
+     , directory, filepath, gitrev, GraphSCC, happy, haskeline, heredoc
+     , monad-control, monadLib, mtl, old-time, presburger, pretty
+     , process, QuickCheck, random, sbv, simple-smt, smtLib, syb
+     , template-haskell, text, tf-random, time, transformers
+     , transformers-base, utf8-string
+     }:
+     mkDerivation {
+       pname = "cryptol";
+       version = "2.5.0";
+       sha256 = "1w8w4srdvnd8dwjbip45bdqsgpg5xmw2nrw1asnk857bgdhjh2ci";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async base base-compat bytestring containers deepseq
+         directory filepath gitrev GraphSCC heredoc monad-control monadLib
+         mtl old-time presburger pretty process QuickCheck random sbv
+         simple-smt smtLib syb template-haskell text tf-random time
+         transformers transformers-base utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         ansi-terminal base base-compat containers deepseq directory
+         filepath haskeline monad-control monadLib process random sbv
+         tf-random transformers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq directory filepath sbv text
+       ];
+       homepage = "http://www.cryptol.net/";
+       description = "Cryptol: The Language of Cryptography";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptonite" = callPackage
     ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
      , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
@@ -50412,8 +50974,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-catalog";
-       version = "0.7.0";
-       sha256 = "1fxmfwc8ksyzjxjj64zbzgqgs0kk74a6rx6xqlyqg331drdrh00y";
+       version = "0.7.1";
+       sha256 = "117ih5cssflaa7mvg4a4vz5sfsylivb8n0ri90211pml3d5idwpf";
        libraryHaskellDepends = [
          base csound-expression csound-sampler sharc-timbre transformers
        ];
@@ -50431,8 +50993,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "5.2.1";
-       sha256 = "1an6m2090xjrraibmbxagbwlakmg83d1d0wasr7njv3cihms2dbq";
+       version = "5.2.2";
+       sha256 = "05vlyd3b2kkpspp6jmxrwhv0474rw6ij6ha7jajrbqyx42a4g8bl";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -50449,8 +51011,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-dynamic";
-       version = "0.3.0";
-       sha256 = "1x16h3zfxmmbkjc6l2w4q5j5q4v9b7x7p9dn8b8f113z73zc8djq";
+       version = "0.3.2";
+       sha256 = "1h827ijkwa5fyg1jphaa19fr4wxs5l76m89xl44989jnb7blbkcd";
        libraryHaskellDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          hashable transformers wl-pprint
@@ -50477,17 +51039,18 @@ self: {
 
   "csound-expression-typed" = callPackage
     ({ mkDerivation, base, Boolean, colour, containers
-     , csound-expression-dynamic, data-default, deepseq, ghc-prim
-     , hashable, NumInstances, temporal-media, transformers, wl-pprint
+     , csound-expression-dynamic, data-default, deepseq, directory
+     , filepath, ghc-prim, hashable, NumInstances, temporal-media
+     , transformers, wl-pprint
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.2.0.1";
-       sha256 = "1hihdgar789kbdb17a63h9cwsy4xz8mqlxq3919zj6cny87xl1af";
+       version = "0.2.0.2";
+       sha256 = "1fb3wayix991awxnns6y1a9kmb6kvnay7p4rx62nvj89qa513d82";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
-         data-default deepseq ghc-prim hashable NumInstances temporal-media
-         transformers wl-pprint
+         data-default deepseq directory filepath ghc-prim hashable
+         NumInstances temporal-media transformers wl-pprint
        ];
        homepage = "https://github.com/anton-k/csound-expression-typed";
        description = "typed core for the library csound-expression";
@@ -50498,8 +51061,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.8.0";
-       sha256 = "18igbiwn8rc6q5w2fddhqp2m823fagcx6d2d5ma05l8milci2j1r";
+       version = "0.0.8.1";
+       sha256 = "15k5in43w4ivkzi6qs5z19fh3pd2fg5ih1dyd1vk736lawlivx20";
        libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
@@ -50624,6 +51187,10 @@ self: {
          mtl primitive resourcet text transformers unordered-containers
          vector
        ];
+       executableHaskellDepends = [
+         base bytestring containers directory mtl primitive text
+         transformers vector
+       ];
        testHaskellDepends = [
          base bytestring containers directory HUnit mtl primitive
          test-framework test-framework-hunit text transformers vector
@@ -50776,6 +51343,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal containers STL ];
+       executableHaskellDepends = [
+         base bytestring cereal containers hspec STL
+       ];
        testHaskellDepends = [
          base bytestring cereal containers hspec STL
        ];
@@ -53188,6 +53758,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "http://ku-fpg.github.io/software/data-reify/";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
@@ -54657,6 +55228,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "decimal-literals" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "decimal-literals";
+       version = "0.1.0.0";
+       sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7";
+       revision = "1";
+       editedCabalFile = "14qc6k8bjsixk5bzqwir1lbs1kqnl0a1py7779a63civv2ph5g5v";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "https://github.com/leftaroundabout/decimal-literals";
+       description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "declarative" = callPackage
     ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens
      , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive
@@ -54787,17 +55374,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "deepseq_1_4_2_0" = callPackage
-    ({ mkDerivation, array, base, HUnit, test-framework
+  "deepseq_1_4_3_0" = callPackage
+    ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "deepseq";
-       version = "1.4.2.0";
-       sha256 = "0la9x4hvf1rbmxv8h9dk1qln21il3wydz6wbdviryh4h2wls22ny";
+       version = "1.4.3.0";
+       sha256 = "0fjdmsd8fqqv78m7111m10pdfswnxmn02zx1fsv2k26b5jckb0bd";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
-         array base HUnit test-framework test-framework-hunit
+         array base ghc-prim HUnit test-framework test-framework-hunit
        ];
        description = "Deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -55538,8 +56125,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "derive-storable";
-       version = "0.1.0.6";
-       sha256 = "04mhv66rjbr4dg9din9frhwgv5cx5jxs0v4z2p9m36lmw0lhyak9";
+       version = "0.1.1.0";
+       sha256 = "0yh998p0n89ma3698qiiw42yrchn2jp5h3jfjpsw0vs9jqh144l1";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://www.github.com/mkloczko/derive-storable/";
@@ -55840,27 +56427,25 @@ self: {
 
   "dhall" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive
-     , charset, containers, http-client, http-client-tls, lens
-     , neat-interpolation, optparse-generic, parsers, system-fileio
-     , system-filepath, tasty, tasty-hunit, text, text-format
-     , transformers, trifecta, unordered-containers, vector
+     , charset, containers, contravariant, http-client, http-client-tls
+     , lens, optparse-generic, parsers, system-fileio, system-filepath
+     , tasty, tasty-hunit, text, text-format, transformers, trifecta
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.4.2";
-       sha256 = "0wnfqm0478h9fqav13q6fqnj8fzbhigsndnasr0hbcjd3s3qvf0d";
+       version = "1.5.0";
+       sha256 = "13s98jjhibm9p0hd9y9fbj0a1il4mwcp2v9mi9j0zrpn6vr4h00p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring case-insensitive charset containers
-         http-client http-client-tls lens neat-interpolation parsers
+         contravariant http-client http-client-tls lens parsers
          system-fileio system-filepath text text-format transformers
          trifecta unordered-containers vector
        ];
        executableHaskellDepends = [ base optparse-generic text trifecta ];
-       testHaskellDepends = [
-         base neat-interpolation tasty tasty-hunit text vector
-       ];
+       testHaskellDepends = [ base tasty tasty-hunit text vector ];
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55872,8 +56457,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.2";
-       sha256 = "19nzf0wh7z3xjpkn48dmi66hqayjscwi3r2w0nkxpkwrcfagrkw2";
+       version = "1.0.3";
+       sha256 = "0hh0fvsvfqgq42yzmgr5ipyhf18iqqk54265pzsrfmanpbfwrycr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55912,8 +56497,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.3";
-       sha256 = "1q3b3vcvkpz5b79xcdh66p0vqqvjlnd52pvdanlf7vp819n2zsdy";
+       version = "1.0.4";
+       sha256 = "0kwr1sj9llkgj68b59ih2lp9p0mav31yk7wfk5m8cq4xp33qrl30";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55932,8 +56517,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.0.4";
-       sha256 = "19sv7n3fn7vkrclmcbjn141ypxi4ja78ahlndnmci6vbv40hm2vf";
+       version = "1.0.5";
+       sha256 = "0cg85n90fjayxqmgxvb54i8xz6c3x4dp6sgnq4gw3al6fnja8vl5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55950,8 +56535,8 @@ self: {
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.0";
-       sha256 = "1xbgzvmxd9y1f58nh9a495rqn3s7yfq93l61by5g9sd81vvbcgqd";
+       version = "1.0.1";
+       sha256 = "0w95diizcwdiass71gv61aim98vvy4648f038sk9sklxw95f0jfz";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base dhall optparse-generic text ];
@@ -56065,8 +56650,8 @@ self: {
        pname = "diagrams-builder";
        version = "0.8.0.1";
        sha256 = "072vzskwp20qb768rv87876ngn6gnj959m91vpzri9ls9jx0x6vf";
-       revision = "1";
-       editedCabalFile = "0r5w2n2y8w3ijzy5s603i8rcj8vl1ggzivw2nj2zbrginma27npc";
+       revision = "2";
+       editedCabalFile = "0hrpic80rh8xyld8fhblvwykkg82nlp7j9xmcf5403wnqgprna97";
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
@@ -56979,8 +57564,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.21";
-       sha256 = "0y2f60yyaj79a8y2bw1g6i6k0i9prj5ghk5q8ljqf3yjkgvlqa8z";
+       version = "1.1.22";
+       sha256 = "1gsvv8kgjjjq7nlpixq3gz6d1j90l83pmh2r3h18019369fcv3ip";
        libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -57065,8 +57650,8 @@ self: {
     ({ mkDerivation, base, digestive-functors, lucid, text }:
      mkDerivation {
        pname = "digestive-functors-lucid";
-       version = "0.0.0.4";
-       sha256 = "1q5h0zfz9x8zb08ayrxn0hd5cijrcqfgfihzg82vqiiaqygz9bi1";
+       version = "0.0.0.5";
+       sha256 = "176vc7gsm0379100imk1i8y8r2gx0l66dijgmxkqbq1qwkjfizs5";
        libraryHaskellDepends = [ base digestive-functors lucid text ];
        homepage = "https://github.com/athanclark/digestive-functors-lucid";
        description = "Lucid frontend for the digestive-functors library";
@@ -57233,6 +57818,7 @@ self: {
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Safe type-level dimensionality for multidimensional data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dingo-core" = callPackage
@@ -58196,6 +58782,7 @@ self: {
          base binary bytestring containers distributed-process mtl network
          network-transport network-transport-tcp
        ];
+       executableHaskellDepends = [ base distributed-process mtl ];
        homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -58424,6 +59011,7 @@ self: {
          base binary bytestring containers deepseq distributed-process hzk
          mtl network network-transport network-transport-tcp transformers
        ];
+       executableHaskellDepends = [ base distributed-process ];
        testHaskellDepends = [
          base bytestring deepseq distributed-process
          distributed-process-monad-control enclosed-exceptions hspec hzk
@@ -59108,6 +59696,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_12_0" = callPackage
+    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
+     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
+     , with-location
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.12.0";
+       sha256 = "13h549cpgcvb7c54c7wif28g5wak84dxc3ais0hlqhzk1q6la91a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         hspec HUnit mockery process QuickCheck setenv silently
+         stringbuilder syb transformers with-location
+       ];
+       homepage = "https://github.com/sol/doctest#readme";
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -59456,6 +60072,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/dotgen";
        description = "A simple interface for building .dot graph files.";
        license = stdenv.lib.licenses.bsd3;
@@ -60280,8 +60897,8 @@ self: {
      }:
      mkDerivation {
        pname = "duckling";
-       version = "0.1.1.0";
-       sha256 = "0c81cjah5iy3p2p9g4z1k0mxwg1256l93m53bnk7pr37439vwnx6";
+       version = "0.1.2.0";
+       sha256 = "1sqkygqx28srbpvnq05fyzqs9c9ixsfdfgivvzqr8yqkwvbxajxr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60290,9 +60907,9 @@ self: {
          time timezone-series unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base bytestring directory extra filepath haskell-src-exts
-         snap-core snap-server text text-show time timezone-olson
-         timezone-series unordered-containers
+         aeson base bytestring dependent-sum directory extra filepath
+         haskell-src-exts snap-core snap-server text text-show time
+         timezone-olson timezone-series unordered-containers
        ];
        testHaskellDepends = [
          aeson base tasty tasty-hunit text time unordered-containers
@@ -60302,6 +60919,26 @@ self: {
        license = "unknown";
      }) {};
 
+  "dumb-cas" = callPackage
+    ({ mkDerivation, base, containers, decimal-literals, hashable
+     , tasty, tasty-hunit, template-haskell, unordered-containers
+     }:
+     mkDerivation {
+       pname = "dumb-cas";
+       version = "0.1.0.0";
+       sha256 = "0jrxphgxm6f7wzrn8vzfz0i6scz2xz72yja5i2bmkf185gqvhpjz";
+       revision = "1";
+       editedCabalFile = "0wzq73i209fa8apj34lc851cgg6047kimxkl9ykv8l9nspg22faq";
+       libraryHaskellDepends = [
+         base containers decimal-literals hashable template-haskell
+         unordered-containers
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "A computer “algebra” system that knows nothing about algebra, at the core";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dump" = callPackage
     ({ mkDerivation, base, haskell-src-meta, hspec
      , interpolatedstring-perl6, QuickCheck, template-haskell, text
@@ -60779,13 +61416,15 @@ self: {
      }) {};
 
   "dynobud" = callPackage
-    ({ mkDerivation, aeson, base, binary, casadi-bindings
-     , casadi-bindings-core, cereal, containers, data-default-class
-     , directory, distributive, doctest, generic-accessors, hmatrix
-     , hmatrix-gsl, HUnit, jacobi-roots, lens, linear, mtl, mwc-random
-     , Plot-ho-matic, process, QuickCheck, reflection, spatial-math
+    ({ mkDerivation, aeson, base, binary, bytestring, casadi-bindings
+     , casadi-bindings-core, cereal, Chart, Chart-gtk, cmdargs, colour
+     , containers, data-default-class, directory, distributive, doctest
+     , generic-accessors, hmatrix, hmatrix-gsl, HUnit, jacobi-roots
+     , lens, linear, mtl, mwc-random, not-gloss, Plot-ho-matic, process
+     , QuickCheck, reflection, semigroups, spatial-math, stm
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , time, vector, vector-binary-instances
+     , time, unordered-containers, vector, vector-binary-instances
+     , zeromq4-haskell
      }:
      mkDerivation {
        pname = "dynobud";
@@ -60800,6 +61439,12 @@ self: {
          mwc-random Plot-ho-matic process reflection spatial-math time
          vector vector-binary-instances
        ];
+       executableHaskellDepends = [
+         base bytestring casadi-bindings casadi-bindings-core cereal Chart
+         Chart-gtk cmdargs colour containers data-default-class
+         generic-accessors lens linear mtl not-gloss Plot-ho-matic
+         semigroups stm time unordered-containers vector zeromq4-haskell
+       ];
        testHaskellDepends = [
          base binary casadi-bindings cereal containers doctest hmatrix
          hmatrix-gsl HUnit linear QuickCheck test-framework
@@ -61016,7 +61661,7 @@ self: {
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ebeats" = callPackage
@@ -61133,6 +61778,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/RyanGlScott/echo";
        description = "A cross-platform, cross-console way to handle echoing terminal input";
        license = stdenv.lib.licenses.bsd3;
@@ -61665,7 +62311,7 @@ self: {
 
   "ehs" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-meta, parsec
-     , template-haskell, text, transformers
+     , template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "ehs";
@@ -61679,6 +62325,7 @@ self: {
          base bytestring haskell-src-meta parsec template-haskell text
          transformers
        ];
+       executableHaskellDepends = [ base bytestring text time ];
        homepage = "http://github.com/minpou/ehs/";
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
@@ -61793,8 +62440,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.8";
-       sha256 = "0y0vfxlzsblb5vppxi5bda9z32y485rlhqsr6h78ww1f8ppb84la";
+       version = "1.0.9";
+       sha256 = "04j65wxdwbyfay0a40kfx0lnzph3k32jidaqks48g2nxjxqn8gvh";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -61810,8 +62457,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-carbon";
-       version = "1.0.7";
-       sha256 = "18shnh4synsnr2xl0ycnafg52k8zwkwa989g2l0sc1b3zb33vijd";
+       version = "1.0.8";
+       sha256 = "0n65c6yv43gckxlckl9bmmf0ags3pp055lvxpi5rbq1d95b29xqd";
        libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
@@ -61975,6 +62622,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring ekg-core text time unordered-containers
        ];
+       executableHaskellDepends = [ base ekg-core ];
        homepage = "https://github.com/adarqui/ekg-push";
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
        license = stdenv.lib.licenses.bsd3;
@@ -62128,16 +62776,21 @@ self: {
      }) {};
 
   "eliminators" = callPackage
-    ({ mkDerivation, base, hspec, singletons }:
+    ({ mkDerivation, base, extra, hspec, singletons, template-haskell
+     , th-abstraction, th-desugar
+     }:
      mkDerivation {
        pname = "eliminators";
-       version = "0.1";
-       sha256 = "0amd3gwnxhdbpg9afv2zs4c3lhc9s7ri66cpdp4x7vmp5xx6yi3n";
-       libraryHaskellDepends = [ base singletons ];
+       version = "0.2";
+       sha256 = "1flv7bmsx38wgb88kdvwncn55fkahfsi2gghc5jwy0j9036pr3h9";
+       libraryHaskellDepends = [
+         base extra singletons template-haskell th-abstraction th-desugar
+       ];
        testHaskellDepends = [ base hspec singletons ];
        homepage = "https://github.com/RyanGlScott/eliminators";
        description = "Dependently typed elimination functions using singletons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elision" = callPackage
@@ -62949,6 +63602,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "engine-io_1_2_17" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
+     , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay
+     , text, transformers, unordered-containers, vector, websockets
+     }:
+     mkDerivation {
+       pname = "engine-io";
+       version = "1.2.17";
+       sha256 = "0m5nr1qk15p332dhmiyrpfdm91cf3al2nah6rja55y6gpc2vvvbv";
+       libraryHaskellDepends = [
+         aeson async attoparsec base base64-bytestring bytestring either
+         free monad-loops mwc-random stm stm-delay text transformers
+         unordered-containers vector websockets
+       ];
+       homepage = "http://github.com/ocharles/engine.io";
+       description = "A Haskell implementation of Engine.IO";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "engine-io-growler" = callPackage
     ({ mkDerivation, base, bytestring, engine-io, growler, http-types
      , mtl, pipes, pipes-attoparsec, pipes-wai, socket-io, text
@@ -62976,8 +63649,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-snap";
-       version = "1.0.4";
-       sha256 = "1w3r8w1rwik3v5m8lrfll6izymf0c49sralhaxn1kcgc1bq26wv8";
+       version = "1.0.5";
+       sha256 = "03pbdc2pbhrabnbnxcrwlby3z84p7fn9k4h1l3pbx6969m6qn7xa";
        libraryHaskellDepends = [
          base bytestring containers engine-io io-streams lifted-base
          snap-core unordered-containers websockets websockets-snap
@@ -64967,7 +65640,9 @@ self: {
      }) {};
 
   "exact-cover" = callPackage
-    ({ mkDerivation, base, containers, tasty, tasty-hunit }:
+    ({ mkDerivation, base, boxes, containers, safe, tasty, tasty-hunit
+     , vector
+     }:
      mkDerivation {
        pname = "exact-cover";
        version = "0.1.0.0";
@@ -64975,6 +65650,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base boxes containers safe vector ];
        testHaskellDepends = [ base containers tasty tasty-hunit ];
        homepage = "https://github.com/arthurl/exact-cover";
        description = "Efficient exact cover solver";
@@ -65014,6 +65690,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exact-real-positional" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "exact-real-positional";
+       version = "0.0.0";
+       sha256 = "0qh1aqyi2k7djwqykj888hxjisip9ahg2ap43cj0xmdvfh9p0351";
+       libraryHaskellDepends = [ base ];
+       description = "Framework for Exact Real Arithmetic in the Positional Number System";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exception-hierarchy" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -65239,6 +65926,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exhaustive_1_1_5" = callPackage
+    ({ mkDerivation, base, generics-sop, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "exhaustive";
+       version = "1.1.5";
+       sha256 = "1qkv6ibdp0a7hi57dhxy3yfbwbs1asmjvqs5nh1p34awz7npvrh9";
+       libraryHaskellDepends = [
+         base generics-sop template-haskell transformers
+       ];
+       homepage = "http://github.com/ocharles/exhaustive";
+       description = "Compile time checks that a computation considers producing data through all possible constructors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exherbo-cabal" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal
      , containers, data-default, deepseq, directory, doctest, filepath
@@ -66307,6 +67010,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-mult" = callPackage
+    ({ mkDerivation, base, ghc-prim, integer-gmp, strict-base }:
+     mkDerivation {
+       pname = "fast-mult";
+       version = "0.1.0.0";
+       sha256 = "19ra4sl10qawn2ig97ls0ib2sfy2b891gkjl4k7nia5lqp69smjh";
+       libraryHaskellDepends = [ base ghc-prim integer-gmp strict-base ];
+       homepage = "https://github.com/clintonmead/fast-mult#readme";
+       description = "Numeric type with asymptotically faster multiplications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fast-nats" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -67372,7 +68087,7 @@ self: {
   "ffmpeg-light" = callPackage
     ({ mkDerivation, base, bytestring, either, exceptions, ffmpeg
      , JuicyPixels, libavcodec, libavdevice, libavformat, libswscale
-     , mtl, transformers, vector
+     , monad-loops, mtl, text, transformers, vector
      }:
      mkDerivation {
        pname = "ffmpeg-light";
@@ -67387,6 +68102,10 @@ self: {
        libraryPkgconfigDepends = [
          ffmpeg libavcodec libavdevice libavformat libswscale
        ];
+       executableHaskellDepends = [
+         base bytestring JuicyPixels monad-loops mtl text transformers
+         vector
+       ];
        homepage = "http://github.com/acowley/ffmpeg-light";
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
@@ -68282,6 +69001,7 @@ self: {
        homepage = "https://github.com/rudymatela/fitspec#readme";
        description = "refining property sets for testing Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fix-imports" = callPackage
@@ -69521,6 +70241,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce_0_2_0_6" = callPackage
+    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
+     , time
+     }:
+     mkDerivation {
+       pname = "fold-debounce";
+       version = "0.2.0.6";
+       sha256 = "133q81c6gvk6zgn3zv5wkvp5sa6b5fvzf9i4facs9s00l7y2nrgk";
+       libraryHaskellDepends = [
+         base data-default-class stm stm-delay time
+       ];
+       testHaskellDepends = [ base hspec stm time ];
+       homepage = "https://github.com/debug-ito/fold-debounce";
+       description = "Fold multiple events that happen in a given period of time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fold-debounce-conduit" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
@@ -70234,15 +70972,15 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "fortran-src_0_1_0_6" = callPackage
+  "fortran-src_0_2_0_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, fgl, filepath, GenericPretty, happy, hspec, mtl
      , pretty, text, uniplate
      }:
      mkDerivation {
        pname = "fortran-src";
-       version = "0.1.0.6";
-       sha256 = "1rmjcbhfh0j67ffrqg0qp4qsz7bv49k3iw40qy0kmwiivhkgbaxl";
+       version = "0.2.0.0";
+       sha256 = "0mmzr58rbanmml2mfawgg58s7v9v7gkw9maxpy96vyfkk4wjvnwc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70690,8 +71428,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.7.2";
-       sha256 = "08c1i6rm007382py0lkiivkaz4cd7s1mh7d0bh11nzp9ci0q76ny";
+       version = "0.8";
+       sha256 = "179q79l9pax6wqj5dn6i68fwskaf4kbrndpbnhp8d7ba5i3wywfy";
        libraryHaskellDepends = [
          algebraic-classes base bifunctors comonad constraints contravariant
          profunctors template-haskell transformers
@@ -71041,7 +71779,7 @@ self: {
      }) {};
 
   "freetype2" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "freetype2";
        version = "0.1.2";
@@ -71049,6 +71787,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ array base ];
        description = "Haskell binding for FreeType 2 library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71183,6 +71922,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "friendly-time_0_4_1" = callPackage
+    ({ mkDerivation, base, hspec, old-locale, time }:
+     mkDerivation {
+       pname = "friendly-time";
+       version = "0.4.1";
+       sha256 = "1j4k8fjmb10zmj9pvn42mgirv9bpbk0w7n0ys7sp3wn34wr49wws";
+       revision = "1";
+       editedCabalFile = "096nfaqxavi6xblqh4q5dxks824liz75b4rm2la2hlkkn5mhqdgs";
+       libraryHaskellDepends = [ base old-locale time ];
+       testHaskellDepends = [ base hspec old-locale time ];
+       description = "Print time information in friendly ways";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "frisby" = callPackage
     ({ mkDerivation, array, base, containers, mtl }:
      mkDerivation {
@@ -73920,9 +74674,9 @@ self: {
   "gf" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
      , containers, directory, exceptions, filepath, happy, haskeline
-     , HTF, httpd-shed, HUnit, json, mtl, network, network-uri
-     , old-locale, parallel, pretty, process, random, terminfo, time
-     , time-compat, unix, utf8-string
+     , HTF, httpd-shed, HUnit, json, lifted-base, mtl, network
+     , network-uri, old-locale, parallel, pretty, process, random
+     , terminfo, time, time-compat, unix, utf8-string
      }:
      mkDerivation {
        pname = "gf";
@@ -73937,7 +74691,7 @@ self: {
          utf8-string
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base containers lifted-base mtl ];
        testHaskellDepends = [
          base Cabal directory filepath HTF HUnit process
        ];
@@ -73987,14 +74741,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-boot_8_0_2" = callPackage
+  "ghc_8_2_1" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy
+     , hoopl, hpc, process, template-haskell, terminfo, time
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "ghc";
+       version = "8.2.1";
+       sha256 = "0b87bj9n2zsi0v9s5ssf5b9c4y4lji7jbxp9j8s93hb95zlmzq17";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         ghc-boot ghc-boot-th ghci hoopl hpc process template-haskell
+         terminfo time transformers unix
+       ];
+       libraryToolDepends = [ alex happy ];
+       homepage = "http://www.haskell.org/ghc/";
+       description = "The GHC API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ghc-boot_8_2_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , ghc-boot-th
      }:
      mkDerivation {
        pname = "ghc-boot";
-       version = "8.0.2";
-       sha256 = "0q446bcz38rql96k42yvfyhdg98lycijva1smw2izwv04hx200zp";
+       version = "8.2.1";
+       sha256 = "1v9cdbhxsx7pbig4c3gq5gdp46fwq0blq6zn89x4fpq1vl1kcr6h";
+       revision = "1";
+       editedCabalFile = "0826xd0ccr77v7zqjml266g067qj2bd3mb7d7d8mipqv42j7cy8y";
        libraryHaskellDepends = [
          base binary bytestring directory filepath ghc-boot-th
        ];
@@ -74003,18 +74781,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot-th_8_0_2" = callPackage
+  "ghc-boot-th_8_2_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-boot-th";
-       version = "8.0.2";
-       sha256 = "1w7qkgwpbp5h0hm8p2b5bbysyvnjrqbkqkfzd4ngz0yxy9qy402x";
+       version = "8.2.1";
+       sha256 = "18gmrfxyqqv0gchpn35bqsk66if1q8yy4amajdz2kh9v8jz4yfz4";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the @template-haskell@ library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-compact" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim }:
+     mkDerivation {
+       pname = "ghc-compact";
+       version = "0.1.0.0";
+       sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h";
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       description = "In memory storage of deeply evaluated data structure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-core" = callPackage
     ({ mkDerivation, base, colorize-haskell, directory, filepath
      , pcre-light, process
@@ -74137,7 +74927,7 @@ self: {
          array base binary bytestring containers
        ];
        executableHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base bytestring ];
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74213,15 +75003,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-exactprint_0_5_4_0" = callPackage
+  "ghc-exactprint_0_5_5_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.5.4.0";
-       sha256 = "1kpfk81iir3dn4420lczwal9bhs787z24g05vdd0g44jcp07d6nk";
+       version = "0.5.5.0";
+       sha256 = "0k3y39k1cwb3bs85333gj7fi6l5p9nr950vgzbyswgj13qb4g7b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74401,6 +75191,8 @@ self: {
        pname = "ghc-mod";
        version = "5.8.0.0";
        sha256 = "1yf4fkg1xj1b66jg6kikzc6djad1xi44y7ark7ghgif0ab0g6rn3";
+       revision = "1";
+       editedCabalFile = "11rccscsxv4x7xcdxaz83vjisyiadsiq48mn2v1hs8fylqx6dkdf";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [
@@ -74561,12 +75353,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-prim_0_5_0_0" = callPackage
+  "ghc-prim_0_5_1_0" = callPackage
     ({ mkDerivation, rts }:
      mkDerivation {
        pname = "ghc-prim";
-       version = "0.5.0.0";
-       sha256 = "1cnn5gcwnc711ngx5hac3x2s4f6dkdl7li5pc3c02lcghpqf9fs4";
+       version = "0.5.1.0";
+       sha256 = "13ypjfpz5b4zpbr2q8x37nbqjd0224l9g8xn62iv7mbqbgynkbf9";
        libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -74586,6 +75378,7 @@ self: {
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
+       executableHaskellDepends = [ base containers scientific text ];
        testHaskellDepends = [
          attoparsec base containers directory filepath process tasty
          tasty-hunit temporary text
@@ -74608,6 +75401,7 @@ self: {
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
+       executableHaskellDepends = [ base containers scientific text ];
        testHaskellDepends = [
          attoparsec base containers directory filepath process tasty
          tasty-hunit temporary text
@@ -74745,6 +75539,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base containers text time ];
+       executableHaskellDepends = [ attoparsec base containers text ];
        testHaskellDepends = [
          attoparsec base directory filepath process tasty tasty-hunit
          temporary text
@@ -74864,6 +75659,7 @@ self: {
          base equational-reasoning ghc ghc-tcplugins-extra presburger
          reflection
        ];
+       executableHaskellDepends = [ base equational-reasoning ];
        homepage = "https://github.com/konn/ghc-typelits-presburger#readme";
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -74903,17 +75699,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghci_8_0_2" = callPackage
+  "ghci_8_2_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, filepath, ghc-boot, template-haskell, transformers, unix
+     , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell
+     , transformers, unix
      }:
      mkDerivation {
        pname = "ghci";
-       version = "8.0.2";
-       sha256 = "0dg1vlv1qj003xm9klqkzhrdkdcwa1nbnhgl86dpq1z15a74svcq";
+       version = "8.2.1";
+       sha256 = "1nxcqnfnggpg8a04496nk59p4jmvxsjqi7425g6h970cinh2lm5f";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq filepath ghc-boot
-         template-haskell transformers unix
+         ghc-boot-th template-haskell transformers unix
        ];
        description = "The library supporting GHC's interactive interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -75100,7 +75897,7 @@ self: {
 
   "ghcjs-dom-hello" = callPackage
     ({ mkDerivation, base, ghcjs-dom, jsaddle, jsaddle-warp
-     , jsaddle-webkit2gtk, mtl
+     , jsaddle-webkit2gtk, jsaddle-wkwebview, mtl
      }:
      mkDerivation {
        pname = "ghcjs-dom-hello";
@@ -75112,7 +75909,8 @@ self: {
          base ghcjs-dom jsaddle jsaddle-warp mtl
        ];
        executableHaskellDepends = [
-         base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl
+         base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk jsaddle-wkwebview
+         mtl
        ];
        homepage = "https://github.com/ghcjs/ghcjs-dom-hello";
        description = "GHCJS DOM Hello World, an example package";
@@ -75134,11 +75932,16 @@ self: {
      }) {};
 
   "ghcjs-dom-jsffi" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, base, ghc-prim, ghcjs-base, ghcjs-prim, text
+     , transformers
+     }:
      mkDerivation {
        pname = "ghcjs-dom-jsffi";
        version = "0.9.1.1";
        sha256 = "1hx8w7x5j2gznkk32yplnnm657hyfk41lcxl4iinsjkm0lrlq54i";
+       libraryHaskellDepends = [
+         base ghc-prim ghcjs-base ghcjs-prim text transformers
+       ];
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75233,6 +76036,9 @@ self: {
          base containers ghc-prim ghcjs-base ghcjs-ffiqq ghcjs-prim split
          template-haskell
        ];
+       executableHaskellDepends = [
+         base containers ghcjs-base ghcjs-ffiqq
+       ];
        description = "Virtual-dom bindings for GHCJS";
        license = stdenv.lib.licenses.mit;
        broken = true;
@@ -76197,6 +77003,7 @@ self: {
          microlens microlens-th mtl network-uri servant servant-client text
          transformers
        ];
+       executableHaskellDepends = [ base network-uri text ];
        testHaskellDepends = [
          aeson base basic-prelude bytestring containers directory hspec lens
          network-uri text
@@ -76719,6 +77526,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "github_0_16_0" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, base-compat
+     , base16-bytestring, binary, binary-orphans, byteable, bytestring
+     , containers, cryptohash, deepseq, deepseq-generics, exceptions
+     , file-embed, hashable, hspec, http-client, http-client-tls
+     , http-link-header, http-types, iso8601-time, mtl, network-uri
+     , semigroups, text, time, tls, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "github";
+       version = "0.16.0";
+       sha256 = "0cr5cw3057sk86flb3annjn0yndbw4xz059vsigk52xwydjgxyqw";
+       libraryHaskellDepends = [
+         aeson aeson-compat base base-compat base16-bytestring binary
+         binary-orphans byteable bytestring containers cryptohash deepseq
+         deepseq-generics exceptions hashable http-client http-client-tls
+         http-link-header http-types iso8601-time mtl network-uri semigroups
+         text time tls transformers transformers-compat unordered-containers
+         vector vector-instances
+       ];
+       testHaskellDepends = [
+         aeson-compat base base-compat file-embed hspec unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/phadej/github";
+       description = "Access to the GitHub API, v3";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-backup" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , exceptions, filepath, git, github, hslogger, IfElse, MissingH
@@ -76788,6 +77626,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "github-release_1_0_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.0.4";
+       sha256 = "00iibn9fh0g8ch8v544v47jvjfar8p86kpaq85x1mvjp1f9m554c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -77615,6 +78475,8 @@ self: {
        pname = "glirc";
        version = "2.23";
        sha256 = "0iv4n6i63f1x1808a3dvrbxyibi7jd1c8barsqbf9h1bqwazgsah";
+       revision = "1";
+       editedCabalFile = "1grjnv2krrncm6swf53mkvfvsd5qwrn2ixpfzwqvkrfy17bjskp9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -81226,8 +82088,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-maps-geocoding";
-       version = "0.3.0.0";
-       sha256 = "1cirpv7ckxnly56ia7wd67djkas99yp9b9qb3cvi996jgwwl7d8i";
+       version = "0.4.0.0";
+       sha256 = "1n8zdmm9j8ghd73i0ph8llzbb4bmkni05r16zvs9rfs6ii126bg3";
        libraryHaskellDepends = [
          aeson base google-static-maps http-client servant servant-client
          text
@@ -81235,6 +82097,7 @@ self: {
        homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme";
        description = "Google Maps Geocoding API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-oauth2" = callPackage
@@ -81329,8 +82192,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-static-maps";
-       version = "0.4.0.0";
-       sha256 = "0r1ln013939vw6jqs1hdljyk2z7wxq2jjwr5v8pci2dcii9ryph1";
+       version = "0.5.0.0";
+       sha256 = "0iicdiai21wldza2nc1m71j6c923mwwfbhnhzw5p9l623dggjrib";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytedump bytestring cryptonite
          double-conversion http-client JuicyPixels memory MissingH
@@ -81340,6 +82203,7 @@ self: {
        homepage = "https://github.com/mpilgrem/google-static-maps#readme";
        description = "Bindings to the Google Static Maps API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-translate" = callPackage
@@ -81558,9 +82422,10 @@ self: {
      }) {};
 
   "gore-and-ash-lambdacube" = callPackage
-    ({ mkDerivation, base, containers, deepseq, exceptions
-     , gore-and-ash, hashable, lambdacube-compiler, lambdacube-gl, mtl
-     , text, unordered-containers
+    ({ mkDerivation, base, containers, deepseq, exceptions, GLFW-b
+     , gore-and-ash, gore-and-ash-glfw, hashable, JuicyPixels
+     , lambdacube-compiler, lambdacube-gl, lambdacube-ir, linear, mtl
+     , text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "gore-and-ash-lambdacube";
@@ -81572,6 +82437,11 @@ self: {
          base containers deepseq exceptions gore-and-ash hashable
          lambdacube-compiler lambdacube-gl mtl text unordered-containers
        ];
+       executableHaskellDepends = [
+         base containers deepseq exceptions GLFW-b gore-and-ash
+         gore-and-ash-glfw JuicyPixels lambdacube-compiler lambdacube-gl
+         lambdacube-ir linear mtl text transformers vector
+       ];
        homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme";
        description = "Core module for Gore&Ash engine that do something";
        license = stdenv.lib.licenses.bsd3;
@@ -82476,6 +83346,9 @@ self: {
          base bytestring colour containers directory dlist fgl filepath
          polyparse process temporary text transformers wl-pprint-text
        ];
+       executableHaskellDepends = [
+         base bytestring directory filepath text
+       ];
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
@@ -82501,6 +83374,9 @@ self: {
          base bytestring colour containers directory dlist fgl filepath
          polyparse process temporary text transformers wl-pprint-text
        ];
+       executableHaskellDepends = [
+         base bytestring directory filepath text
+       ];
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
@@ -83009,6 +83885,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog-th_0_8_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, groundhog
+     , template-haskell, text, time, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "groundhog-th";
+       version = "0.8.0.1";
+       sha256 = "00vk26qa7r6znyz848rh66nn4blybprpqvvyh53h22i9ibrk2b1s";
+       libraryHaskellDepends = [
+         aeson base bytestring containers groundhog template-haskell text
+         time unordered-containers yaml
+       ];
+       description = "Type-safe datatype-database mapping library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "group-by-date" = callPackage
     ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript
      , pathtype, time, transformers, unix-compat, utility-ht
@@ -83617,7 +84510,8 @@ self: {
 
   "gtk3" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
-     , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text
+     , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
+     , transformers
      }:
      mkDerivation {
        pname = "gtk3";
@@ -83630,6 +84524,9 @@ self: {
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
+       executableHaskellDepends = [
+         array base cairo text time transformers
+       ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -83928,6 +84825,7 @@ self: {
        homepage = "https://bitbucket.org/fmapE/h2c";
        description = "Bindings to Linux I2C with support for repeated-start transactions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hArduino" = callPackage
@@ -85062,8 +85960,8 @@ self: {
      }) {};
 
   "hackage-server" = callPackage
-    ({ mkDerivation, acid-state, aeson, alex, array, async, base
-     , base16-bytestring, base64-bytestring, binary, blaze-builder
+    ({ mkDerivation, acid-state, aeson, alex, array, async, attoparsec
+     , base, base16-bytestring, base64-bytestring, binary, blaze-builder
      , bytestring, Cabal, cereal, containers, crypto-api, csv, deepseq
      , directory, filepath, happstack-server, happy, HaXml, hscolour
      , hslogger, HStringTemplate, HTTP, lifted-base, mime-mail, mtl
@@ -85079,7 +85977,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         acid-state aeson array async base base16-bytestring
+         acid-state aeson array async attoparsec base base16-bytestring
          base64-bytestring binary blaze-builder bytestring Cabal cereal
          containers crypto-api csv deepseq directory filepath
          happstack-server HaXml hscolour hslogger HStringTemplate HTTP
@@ -85362,8 +86260,8 @@ self: {
     ({ mkDerivation, base, filepath, haddock-api, hspec }:
      mkDerivation {
        pname = "haddock";
-       version = "2.17.5";
-       sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql";
+       version = "2.18.1";
+       sha256 = "1gg1nl38f2h93xci4pa4zgb5wvcpwv0mab0balmzzgnd4amk3jgv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
@@ -85373,6 +86271,7 @@ self: {
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-api_2_15_0_2" = callPackage
@@ -85420,8 +86319,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.17.4";
-       sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss";
+       version = "2.18.1";
+       sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8";
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
@@ -85486,6 +86385,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haddock-library_1_4_4" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq
+     , hspec, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "haddock-library";
+       version = "1.4.4";
+       sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9";
+       libraryHaskellDepends = [
+         attoparsec base bytestring transformers
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat bytestring deepseq hspec QuickCheck
+         transformers
+       ];
+       homepage = "http://www.haskell.org/haddock/";
+       description = "Library exposing some functionality of Haddock";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haddock-test" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , process, syb, xhtml, xml
@@ -86967,7 +87887,7 @@ self: {
      }) {inherit (pkgs) libappindicator-gtk2;};
 
   "happindicator3" = callPackage
-    ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3 }:
+    ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3, text }:
      mkDerivation {
        pname = "happindicator3";
        version = "0.2.1";
@@ -86976,6 +87896,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
+       executableHaskellDepends = [ base gtk3 text ];
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
@@ -87117,6 +88038,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "happstack-authenticate_2_3_4_8" = 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.8";
+       sha256 = "006prds4bgqmj54j0syyf1y1yyqwfcj2a6mdxpcjj6qj3g3976l1";
+       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
@@ -87137,7 +88088,7 @@ self: {
   "happstack-contrib" = callPackage
     ({ mkDerivation, base, bytestring, directory, happstack-data
      , happstack-ixset, happstack-server, happstack-state
-     , happstack-util, HTTP, mtl, network, old-time, syb, unix
+     , happstack-util, HTTP, HUnit, mtl, network, old-time, syb, unix
      }:
      mkDerivation {
        pname = "happstack-contrib";
@@ -87150,6 +88101,7 @@ self: {
          happstack-server happstack-state happstack-util HTTP mtl network
          old-time syb unix
        ];
+       executableHaskellDepends = [ HUnit ];
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
@@ -87365,6 +88317,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "happstack-hsp_7_3_7_3" = callPackage
+    ({ mkDerivation, base, bytestring, happstack-server, harp, hsp
+     , hsx2hs, mtl, syb, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "happstack-hsp";
+       version = "7.3.7.3";
+       sha256 = "0m7psd6dg33xijshs3dxz2xrqghmpbs402h67b52pkqsk5nmy633";
+       libraryHaskellDepends = [
+         base bytestring happstack-server harp hsp hsx2hs mtl syb text
+         utf8-string
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Support for using HSP templates in Happstack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happstack-hstringtemplate" = callPackage
     ({ mkDerivation, base, bytestring, happstack-server, hslogger
      , HStringTemplate, mtl
@@ -87420,6 +88390,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "happstack-jmacro_7_0_12" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, cereal
+     , digest, happstack-server, jmacro, text, utf8-string
+     , wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "happstack-jmacro";
+       version = "7.0.12";
+       sha256 = "1bmffidqi784y1qwgqxncwcw6knklnkliznbdx66gjvkfccv9d5s";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring cereal digest happstack-server
+         jmacro text utf8-string wl-pprint-text
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Support for using JMacro with Happstack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happstack-lite" = callPackage
     ({ mkDerivation, base, bytestring, happstack-server, mtl, text }:
      mkDerivation {
@@ -87496,6 +88485,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "happstack-server_7_5_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
+     , containers, directory, exceptions, extensible-exceptions
+     , filepath, hslogger, html, HUnit, monad-control, mtl, network
+     , network-uri, old-locale, parsec, process, sendfile, syb
+     , system-filepath, template-haskell, text, threads, time
+     , time-compat, transformers, transformers-base, transformers-compat
+     , unix, utf8-string, xhtml, zlib
+     }:
+     mkDerivation {
+       pname = "happstack-server";
+       version = "7.5.0";
+       sha256 = "0ybwzb9w6mzw9mjr10rpih9hh1cs4v0wdaizl7p5l34xk441qaxw";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-html bytestring containers directory
+         exceptions extensible-exceptions filepath hslogger html
+         monad-control mtl network network-uri old-locale parsec process
+         sendfile syb system-filepath template-haskell text threads time
+         time-compat transformers transformers-base transformers-compat unix
+         utf8-string xhtml zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit parsec zlib
+       ];
+       homepage = "http://happstack.com";
+       description = "Web related tools and services";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happstack-server-tls" = callPackage
     ({ mkDerivation, base, bytestring, extensible-exceptions
      , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
@@ -87516,6 +88535,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "happstack-server-tls_7_1_6_3" = callPackage
+    ({ mkDerivation, base, bytestring, extensible-exceptions
+     , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "happstack-server-tls";
+       version = "7.1.6.3";
+       sha256 = "0bpa0clcfq0jgb6y8wm331411w5mryjj4aknnn0sb74dx122lhyz";
+       libraryHaskellDepends = [
+         base bytestring extensible-exceptions happstack-server hslogger
+         HsOpenSSL network sendfile time unix
+       ];
+       librarySystemDepends = [ openssl ];
+       homepage = "http://www.happstack.com/";
+       description = "extend happstack-server with https:// support (TLS/SSL)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "happstack-server-tls-cryptonite" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , extensible-exceptions, happstack-server, hslogger, network
@@ -89184,6 +90223,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-lsp" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec
+     , stm, text, time, transformers, unordered-containers, vector
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "haskell-lsp";
+       version = "0.1.0.0";
+       sha256 = "135f9xqzlvz01gwdqwxvdmxiwwqvka5j3iv13zczzzzn7vwfnbbd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hashable hslogger lens mtl parsec stm text time
+         unordered-containers yi-rope
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hslogger lens mtl parsec stm text time transformers
+         unordered-containers vector yi-rope
+       ];
+       testHaskellDepends = [
+         aeson base containers directory hashable hspec lens text yi-rope
+       ];
+       homepage = "https://github.com/alanz/haskell-lsp";
+       description = "Haskell library for the Microsoft Language Server Protocol";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-menu" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -91287,6 +92357,7 @@ self: {
          base data-accessor event-list haskore non-negative numeric-prelude
          random synthesizer-core synthesizer-filter utility-ht
        ];
+       executableHaskellDepends = [ base synthesizer-core utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Music rendering coded in Haskell";
        license = "GPL";
@@ -91854,10 +92925,12 @@ self: {
      }) {};
 
   "haste-compiler" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
-     , data-binary-ieee754, directory, filepath, ghc, ghc-paths
-     , ghc-prim, monads-tf, network, network-uri, process, random
-     , shellmate, transformers, utf8-string, websockets
+    ({ mkDerivation, array, base, bin-package-db, binary, blaze-builder
+     , bytestring, bzlib, Cabal, containers, data-binary-ieee754
+     , directory, either, filepath, ghc, ghc-paths, ghc-prim, ghc-simple
+     , HTTP, monads-tf, mtl, network, network-uri, process, random
+     , shellmate, system-fileio, tar, terminfo, transformers, unix
+     , utf8-string, websockets
      }:
      mkDerivation {
        pname = "haste-compiler";
@@ -91871,6 +92944,12 @@ self: {
          filepath ghc ghc-paths ghc-prim monads-tf network network-uri
          process random shellmate transformers utf8-string websockets
        ];
+       executableHaskellDepends = [
+         array base bin-package-db binary blaze-builder bytestring bzlib
+         Cabal containers directory either filepath ghc ghc-paths ghc-prim
+         ghc-simple HTTP mtl network network-uri process random shellmate
+         system-fileio tar terminfo transformers unix utf8-string
+       ];
        homepage = "http://haste-lang.org/";
        description = "Haskell To ECMAScript compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -92204,6 +93283,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haxl_0_5_1_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
+     , test-framework, test-framework-hunit, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haxl";
+       version = "0.5.1.0";
+       sha256 = "09x84igm35d60rg97bcm1q9ivin01i5x64n3hl1j3ls62q28bm29";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers deepseq exceptions filepath
+         ghc-prim hashable HUnit pretty text time transformers
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [ base hashable time ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers deepseq filepath hashable
+         HUnit test-framework test-framework-hunit text time
+         unordered-containers
+       ];
+       homepage = "https://github.com/facebook/Haxl";
+       description = "A Haskell library for efficient, concurrent, and concise data access";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haxl-amazonka" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, async, base, conduit
      , hashable, haxl, transformers
@@ -92732,6 +93840,7 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcoord" = callPackage
@@ -93301,14 +94410,14 @@ self: {
      }) {};
 
   "heapsort" = callPackage
-    ({ mkDerivation, array, base }:
+    ({ mkDerivation, array, base, QuickCheck }:
      mkDerivation {
        pname = "heapsort";
        version = "0.1.0";
        sha256 = "0fzws9fjhqsygsbwj7nvj786j16264vqvqzc97dr73y72538k9qa";
        isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [ array base ];
+       executableHaskellDepends = [ array base QuickCheck ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/heapsort";
        description = "Heapsort of MArrays as a demo of imperative programming";
        license = stdenv.lib.licenses.bsd3;
@@ -94736,6 +95845,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ doublefann ];
        libraryPkgconfigDepends = [ fann ];
+       executableHaskellDepends = [ base ];
        executableSystemDepends = [ doublefann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
@@ -94907,13 +96017,13 @@ self: {
 
   "hfsevents" = callPackage
     ({ mkDerivation, base, bytestring, cereal, Cocoa, CoreServices, mtl
-     , text
+     , text, unix
      }:
      mkDerivation {
        pname = "hfsevents";
        version = "0.1.6";
        sha256 = "019zbnvfd866ch49gax0c1c93zv92142saim1hrgypz5lprz7hvl";
-       libraryHaskellDepends = [ base bytestring cereal mtl text ];
+       libraryHaskellDepends = [ base bytestring cereal mtl text unix ];
        librarySystemDepends = [ Cocoa ];
        libraryToolDepends = [ CoreServices ];
        homepage = "http://github.com/luite/hfsevents";
@@ -95258,6 +96368,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ grib_api ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory hspec ];
        homepage = "https://github.com/mjakob/hgrib";
        description = "Unofficial bindings for GRIB API";
@@ -95411,6 +96522,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hidden-char_0_1_0_1" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "hidden-char";
+       version = "0.1.0.1";
+       sha256 = "17g9wbk34x8gkgrlvj3barhirq0jkshysqrxhs8nxp60hb2zpxip";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/rcook/hidden-char#readme";
+       description = "Provides getHiddenChar function";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hieraclus" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, multiset }:
      mkDerivation {
@@ -95705,13 +96830,16 @@ self: {
        libraryHaskellDepends = [
          base blaze-html bytestring filepath mtl pcre-light text
        ];
+       executableHaskellDepends = [
+         base blaze-html bytestring filepath mtl pcre-light text
+       ];
        description = "source code highlighting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "highlighter2" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
-     , mtl, pcre-light, text
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , containers, filepath, mtl, pcre-light, text
      }:
      mkDerivation {
        pname = "highlighter2";
@@ -95722,6 +96850,10 @@ self: {
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath mtl pcre-light text
        ];
+       executableHaskellDepends = [
+         base blaze-html blaze-markup bytestring containers filepath mtl
+         pcre-light text
+       ];
        description = "source code highlighting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95742,6 +96874,7 @@ self: {
          base blaze-html bytestring containers mtl parsec pcre-light
          utf8-string
        ];
+       executableHaskellDepends = [ base blaze-html containers filepath ];
        testHaskellDepends = [
          base blaze-html containers Diff directory filepath process
        ];
@@ -95756,8 +96889,8 @@ self: {
      }:
      mkDerivation {
        pname = "hills";
-       version = "0.1.2.5";
-       sha256 = "02zmjc056phi8xcdx8i86xms5204q1zkcg9c5dbd8phm11a5n3iz";
+       version = "0.1.2.6";
+       sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -96716,8 +97849,8 @@ self: {
 
   "hlatex" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, containers, derive
-     , directory, filepath, mtl, process, template-haskell, transformers
-     , uniplate, utf8-string
+     , directory, filepath, frquotes, mtl, process, template-haskell
+     , transformers, uniplate, utf8-string
      }:
      mkDerivation {
        pname = "hlatex";
@@ -96729,6 +97862,9 @@ self: {
          base base-unicode-symbols containers derive directory filepath mtl
          process template-haskell transformers uniplate utf8-string
        ];
+       executableHaskellDepends = [
+         base base-unicode-symbols containers frquotes mtl transformers
+       ];
        description = "A library to build valid LaTeX files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96897,8 +98033,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.9";
-       sha256 = "0ajjiz6jvm45j472f0ypxk33hc47rg0zs9ylkcrkvvk9992x7lnq";
+       version = "0.2.0.10";
+       sha256 = "1sslida2pl8r7lfab6lwkws0fq2a8h14rqq01qnxdg2pmfl6q69y";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -96939,6 +98075,7 @@ self: {
        homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
        description = "A terminal UI as drop-in replacement for hledger add";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-interest" = callPackage
@@ -97020,6 +98157,8 @@ self: {
        pname = "hledger-ui";
        version = "1.3";
        sha256 = "0bixkihc2hcf98xpnb9a8lnqi5rcg2pj6d78w4pzwzd83vkmr1rj";
+       revision = "1";
+       editedCabalFile = "0dc5nqc9g4s0h1si6pcymbhfw32hlxafzavpp8y1jg7c9brc7ln0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97272,6 +98411,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base stm transformers unix X11 ];
+       executableHaskellDepends = [ base stm transformers unix X11 ];
        homepage = "https://github.com/hpdeifel/hlwm-haskell";
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
@@ -97960,8 +99100,8 @@ self: {
      }) {};
 
   "hoauth2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
-     , text, unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
+     , http-types, text, unordered-containers, wai, warp
      }:
      mkDerivation {
        pname = "hoauth2";
@@ -97973,15 +99113,19 @@ self: {
          aeson base bytestring http-conduit http-types text
          unordered-containers
        ];
+       executableHaskellDepends = [
+         aeson base bytestring containers http-conduit http-types text wai
+         warp
+       ];
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hoauth2_1_3_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
-     , http-types, microlens, text, unordered-containers, uri-bytestring
-     , uri-bytestring-aeson
+    ({ mkDerivation, aeson, base, bytestring, containers, exceptions
+     , http-conduit, http-types, microlens, text, unordered-containers
+     , uri-bytestring, uri-bytestring-aeson, wai, warp
      }:
      mkDerivation {
        pname = "hoauth2";
@@ -97993,6 +99137,10 @@ self: {
          aeson base bytestring exceptions http-conduit http-types microlens
          text unordered-containers uri-bytestring uri-bytestring-aeson
        ];
+       executableHaskellDepends = [
+         aeson base bytestring containers http-conduit http-types text
+         uri-bytestring wai warp
+       ];
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
@@ -99448,37 +100596,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hpack_0_17_1" = callPackage
-    ({ 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.17.1";
-       sha256 = "0lxpjv5j3bg725n1kqjgpcq3rb3s7zc1w3j5snc92ayk8fxpbd3n";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring containers deepseq directory
-         filepath Glob text unordered-containers yaml
-       ];
-       executableHaskellDepends = [
-         aeson base base-compat bytestring containers deepseq directory
-         filepath Glob text unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         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";
-       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
@@ -99693,6 +100810,8 @@ self: {
        pname = "hpc";
        version = "0.6.0.3";
        sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn";
+       revision = "1";
+       editedCabalFile = "1bddfsgn48kh8qa72asgmx7z4ym00zkh09g3hqp6l6yl919drn2i";
        libraryHaskellDepends = [
          base containers directory filepath time
        ];
@@ -99927,22 +101046,22 @@ self: {
 
   "hpqtypes-extras" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, containers
-     , cryptohash, exceptions, fields-json, hpqtypes, lifted-base, log
-     , monad-control, mtl, safe, tasty, tasty-hunit, text, text-show
-     , transformers
+     , cryptohash, exceptions, fields-json, hpqtypes, lifted-base
+     , log-base, monad-control, mtl, safe, tasty, tasty-hunit, text
+     , text-show, transformers
      }:
      mkDerivation {
        pname = "hpqtypes-extras";
-       version = "1.3.0.0";
-       sha256 = "10n97i18g94j8xc7zayp03a3b59kzjyhxs1kg06cy1npgbn8kvlz";
+       version = "1.3.1.1";
+       sha256 = "01ckscym6lgb6k63n6g0q9972imabv4kncsxr2h37xkahfyh68hk";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash exceptions
-         fields-json hpqtypes lifted-base log monad-control mtl safe text
-         text-show
+         fields-json hpqtypes lifted-base log-base monad-control mtl safe
+         text text-show
        ];
        testHaskellDepends = [
-         base exceptions hpqtypes lifted-base log tasty tasty-hunit text
-         transformers
+         base exceptions hpqtypes lifted-base log-base monad-control tasty
+         tasty-hunit text transformers
        ];
        homepage = "https://github.com/scrive/hpqtypes-extras";
        description = "Extra utilities for hpqtypes library";
@@ -100010,7 +101129,7 @@ self: {
      }) {};
 
   "hps" = callPackage
-    ({ mkDerivation, base, hcg-minus }:
+    ({ mkDerivation, base, directory, filepath, hcg-minus, random }:
      mkDerivation {
        pname = "hps";
        version = "0.15";
@@ -100018,6 +101137,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hcg-minus ];
+       executableHaskellDepends = [
+         base directory filepath hcg-minus random
+       ];
        homepage = "http://rd.slavepianos.org/?t=hps";
        description = "Haskell Postscript";
        license = "GPL";
@@ -100270,6 +101392,27 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
+  "hruby_0_3_4_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
+     , ruby, scientific, stm, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hruby";
+       version = "0.3.4.4";
+       sha256 = "08997g32rnmwznzywf1k0bmki0kbcwss9s4lka6s501l54gp1ij9";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring scientific stm text
+         unordered-containers vector
+       ];
+       librarySystemDepends = [ ruby ];
+       testHaskellDepends = [
+         aeson attoparsec base QuickCheck text vector
+       ];
+       description = "Embed a Ruby intepreter in your Haskell program !";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) ruby;};
+
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
      mkDerivation {
@@ -100786,7 +101929,8 @@ self: {
      }) {};
 
   "hs-server-starter" = callPackage
-    ({ mkDerivation, base, directory, HUnit, network, temporary, unix
+    ({ mkDerivation, base, directory, http-types, HUnit, network
+     , temporary, unix, wai, warp
      }:
      mkDerivation {
        pname = "hs-server-starter";
@@ -100795,12 +101939,30 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory network ];
+       executableHaskellDepends = [ base http-types network wai warp ];
        testHaskellDepends = [ base HUnit network temporary unix ];
        homepage = "https://github.com/hiratara/hs-server-starter";
        description = "Write a server supporting Server::Starter's protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hs-snowtify" = callPackage
+    ({ mkDerivation, base, either, safe, safe-exceptions, text, turtle
+     }:
+     mkDerivation {
+       pname = "hs-snowtify";
+       version = "0.1.0.0";
+       sha256 = "124n8n6h1qrn359a9bhdxz4was9pc3n2d8r8zqvxaa2xqywjwfvf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base either safe safe-exceptions text turtle
+       ];
+       homepage = "https://github.com/aiya000/hs-snowtify#README.md";
+       description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hs-twitter" = callPackage
     ({ mkDerivation, base, HTTP, json, mime, network, old-locale
      , old-time, random, utf8-string
@@ -101262,9 +102424,10 @@ self: {
 
   "hsc3-graphs" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cairo, containers
-     , data-default, directory, filepath, hls, hmt, hosc, hps, hsc3
-     , hsc3-cairo, hsc3-lang, hsc3-sf, hsc3-unsafe, hsc3-utils, hsharc
-     , MonadRandom, primes, random, random-shuffle, sc3-rdu, she, split
+     , data-default, directory, filepath, hashable, hls, hmt, hosc, hps
+     , hsc3, hsc3-cairo, hsc3-lang, hsc3-sf, hsc3-unsafe, hsc3-utils
+     , hsharc, MonadRandom, primes, process, random, random-shuffle
+     , sc3-rdu, she, split
      }:
      mkDerivation {
        pname = "hsc3-graphs";
@@ -101278,7 +102441,12 @@ self: {
          hsc3-sf hsc3-unsafe hsc3-utils hsharc MonadRandom primes random
          random-shuffle sc3-rdu she split
        ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         array base binary bytestring cairo containers directory filepath
+         hashable hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang hsc3-sf
+         hsc3-unsafe hsharc MonadRandom primes process random random-shuffle
+         sc3-rdu split
+       ];
        homepage = "http://rd.slavepianos.org/t/hsc3-graphs";
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
@@ -101359,6 +102527,7 @@ self: {
          base bytestring containers data-default directory filepath hosc
          hsc3 process time time-compat transformers
        ];
+       executableHaskellDepends = [ base data-default hosc hsc3 ];
        homepage = "https://github.com/kaoskorobase/hsc3-process";
        description = "Create and control scsynth processes";
        license = "GPL";
@@ -101400,7 +102569,7 @@ self: {
      , failure, hashtables, hosc, hsc3, hsc3-process, lifted-base
      , ListZipper, monad-control, QuickCheck, random, resourcet
      , test-framework, test-framework-quickcheck2, transformers
-     , transformers-base
+     , transformers-base, unix
      }:
      mkDerivation {
        pname = "hsc3-server";
@@ -101413,6 +102582,9 @@ self: {
          hosc hsc3 hsc3-process lifted-base ListZipper monad-control
          resourcet transformers transformers-base
        ];
+       executableHaskellDepends = [
+         base hosc hsc3 random transformers unix
+       ];
        testHaskellDepends = [
          base failure QuickCheck random test-framework
          test-framework-quickcheck2 transformers
@@ -101764,6 +102936,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers network ];
        librarySystemDepends = [ adns ];
+       executableHaskellDepends = [ base network ];
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.lgpl3;
@@ -102190,7 +103363,7 @@ self: {
      }) {};
 
   "hslogger" = callPackage
-    ({ mkDerivation, base, containers, directory, mtl, network
+    ({ mkDerivation, base, containers, directory, HUnit, mtl, network
      , old-locale, process, time, unix
      }:
      mkDerivation {
@@ -102200,6 +103373,7 @@ self: {
        libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "http://software.complete.org/hslogger";
        description = "Versatile logging framework";
        license = stdenv.lib.licenses.bsd3;
@@ -102748,6 +103922,8 @@ self: {
        pname = "hspec-contrib";
        version = "0.4.0";
        sha256 = "05hchslqqg0k5ksrgy3n8gay0xxnr1zjp4zfj4zp4v0pxq0j57kg";
+       revision = "1";
+       editedCabalFile = "07p0pckzyih1zc56v2cnchxjsbx4w69b10j343c0yvicq6yjyrkb";
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
@@ -104351,6 +105527,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "htirage" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "htirage";
+       version = "1.20170723";
+       sha256 = "184z1bzzs00mkvmbr2p2xk0f5agxxv1xqmgbs0hq9yldpsa2nszc";
+       libraryHaskellDepends = [ base ];
+       description = "Equiprobable draw from publicly verifiable random data";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "htlset" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -105597,6 +106784,11 @@ self: {
          array base bytestring bytestring-builder case-insensitive
          containers psqueues stm
        ];
+       executableHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         case-insensitive containers directory filepath hex text
+         unordered-containers vector word8
+       ];
        testHaskellDepends = [
          aeson aeson-pretty array base bytestring bytestring-builder
          case-insensitive containers directory doctest filepath Glob hex
@@ -106323,6 +107515,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-balancedparens_0_1_0_2" = callPackage
+    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
+     , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector
+     }:
+     mkDerivation {
+       pname = "hw-balancedparens";
+       version = "0.1.0.2";
+       sha256 = "1s14dkwvm0ya75z6jqbhy3d8vyfh7dw33d3k9c3xgzwzvznbhq02";
+       libraryHaskellDepends = [
+         base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple
+         vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion hw-bits hw-prim vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
+       description = "Balanced parentheses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-bits" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
      , hw-prim, hw-string-parse, QuickCheck, safe, vector
@@ -106344,6 +107560,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-bits_0_5_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
+     , hw-prim, hw-string-parse, QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.5.0.2";
+       sha256 = "14szmh7wqbwzivc20bmavgcsp286n2kvxxz88qhl4mza5jxi6dhf";
+       libraryHaskellDepends = [
+         base bytestring hw-int hw-prim hw-string-parse safe vector
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hw-prim QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
+       homepage = "http://github.com/haskell-works/hw-bits#readme";
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
      , hw-bits, mmap, resourcet, vector, word8
@@ -106368,15 +107605,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hw-conduit_0_2_0_0" = callPackage
+  "hw-conduit_0_2_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
-     , mmap, vector, word8
+     , mmap, time, vector, word8
      }:
      mkDerivation {
        pname = "hw-conduit";
-       version = "0.2.0.0";
-       sha256 = "17b31pdxisv6ksvha6c5ydv549rjg9xy5q0zch8s5rg3a5f8az3j";
-       libraryHaskellDepends = [ array base bytestring conduit word8 ];
+       version = "0.2.0.1";
+       sha256 = "1zsh8dvafxxrzrgdfa3fl40bzlm6f4isimmmcbgfv3whzxnv15z1";
+       libraryHaskellDepends = [
+         array base bytestring conduit time word8
+       ];
        testHaskellDepends = [ base bytestring conduit hspec ];
        benchmarkHaskellDepends = [
          base bytestring conduit criterion mmap vector
@@ -106439,6 +107678,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-excess_0_1_0_1" = callPackage
+    ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
+     , QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-excess";
+       version = "0.1.0.1";
+       sha256 = "0q6mrmlii351iji1b0c4j7sck74zgs1hxfyj8cd3k5a6q8j3nkb1";
+       libraryHaskellDepends = [
+         base hw-bits hw-prim hw-rankselect-base safe vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-excess#readme";
+       description = "Excess";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-hspec-hedgehog" = callPackage
+    ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }:
+     mkDerivation {
+       pname = "hw-hspec-hedgehog";
+       version = "0.1.0.0";
+       sha256 = "1f1yqcjdn1jbqcpm6qxajqlkirhpyshvy5zi5ccd64anz691dqdw";
+       libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ];
+       testHaskellDepends = [ base hedgehog hspec ];
+       homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme";
+       description = "Interoperability between hspec and hedgehog";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-int" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -106529,6 +107801,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-kafka-avro" = callPackage
+    ({ mkDerivation, aeson, avro, base, binary, bytestring, cache
+     , containers, errors, hashable, hspec, http-client, mtl, pure-zlib
+     , QuickCheck, semigroups, servant, servant-client, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hw-kafka-avro";
+       version = "1.1.0";
+       sha256 = "0srp47c5s295qmf5vjfz4qfs19xn407c58iv51lij674c587vsvb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson avro base binary bytestring cache containers errors hashable
+         http-client mtl pure-zlib semigroups servant servant-client text
+         transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson avro base binary bytestring cache containers errors hashable
+         http-client mtl pure-zlib semigroups servant servant-client text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson avro base binary bytestring cache containers errors hashable
+         hspec http-client mtl pure-zlib QuickCheck semigroups servant
+         servant-client text transformers unordered-containers
+       ];
+       homepage = "https://github.com/haskell-works/hw-kafka-avro#readme";
+       description = "Avro support for Kafka infrastructure";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {avro = null;};
+
   "hw-kafka-client" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
      , either, hspec, monad-loops, rdkafka, regex-posix, temporary
@@ -106536,8 +107841,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "1.1.2";
-       sha256 = "0y5v1rprysd5d125kxcb2dnc74i647vi1ad94r2iq2m117xrqsnr";
+       version = "1.1.4";
+       sha256 = "1vh3nq6mv8aq5ws17kilkcmdgxg1i1v582ddydrwz3p42kpg1qi4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106565,8 +107870,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-conduit";
-       version = "1.1.2";
-       sha256 = "1krvd42qd4l95f69md7122mzqsb1ilj82w742ih2lgp8143na0da";
+       version = "1.1.4";
+       sha256 = "17rmal7kncddyqw7y3sa9kr5frv3gqcr4s85lb8k9iaj64wa2cfl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106580,8 +107885,8 @@ self: {
          base bifunctors bytestring conduit conduit-extra containers extra
          hspec hw-kafka-client mtl QuickCheck resourcet transformers
        ];
-       homepage = "https://github.com/haskell-works/hw-kafka-client-conduit";
-       description = "Conduit bindings for kafka-client";
+       homepage = "https://github.com/haskell-works/hw-kafka-conduit";
+       description = "Conduit bindings for hw-kafka-client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -106638,6 +107943,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-parser_0_0_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hw-prim
+     , mono-traversable, text
+     }:
+     mkDerivation {
+       pname = "hw-parser";
+       version = "0.0.0.2";
+       sha256 = "0c9ns631f3lmar3xqkqk6lgdrfzmpphcray2c32li7n2hj5bcdik";
+       libraryHaskellDepends = [
+         attoparsec base bytestring hw-prim mono-traversable text
+       ];
+       homepage = "http://github.com/haskell-works/hw-parser#readme";
+       description = "Simple parser support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
@@ -106671,6 +107993,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-rankselect_0_8_0_1" = callPackage
+    ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
+     , hw-rankselect-base, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-rankselect";
+       version = "0.8.0.1";
+       sha256 = "1m05w2x5nmja0k1li90vx9ifzs11h8xxbpi25rsk4zalghy8gn6g";
+       libraryHaskellDepends = [
+         base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-rankselect#readme";
+       description = "Rank-select";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-rankselect-base" = callPackage
     ({ mkDerivation, base, criterion, hspec, hw-bits, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
@@ -109576,6 +110918,8 @@ self: {
        pname = "inchworm";
        version = "1.0.2.1";
        sha256 = "19fx9nrx1jia4qz3rhjsdmmmas7bn5rl59b2y2lnzyyz6n83sfzc";
+       revision = "1";
+       editedCabalFile = "0yg8x27fk0kr99ways4h64a5wbxmnh59l8mis9xd0faqx7hadic7";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/DDCSF/inchworm";
        description = "Inchworm Lexer Framework";
@@ -109703,8 +111047,8 @@ self: {
      }:
      mkDerivation {
        pname = "indentation";
-       version = "0.3.1";
-       sha256 = "1lda5zya9nk2sgi074v5j5hj8dr25cayla40mgy3v0pnwgplsdsv";
+       version = "0.3.2";
+       sha256 = "1knazqvr6bk07j7q7835z2d2vs3zyd7i4hzir6aqcdxwhrqm5q7k";
        libraryHaskellDepends = [
          base indentation-core indentation-parsec indentation-trifecta mtl
          parsec parsers trifecta
@@ -109712,6 +111056,7 @@ self: {
        homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentation-core" = callPackage
@@ -109726,6 +111071,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indentation-core_0_0_0_1" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "indentation-core";
+       version = "0.0.0.1";
+       sha256 = "136skn3parvsyfii0ywm8cqfmsysi562944fbb0xsgckx0sq1dr1";
+       libraryHaskellDepends = [ base mtl ];
+       homepage = "https://bitbucket.org/adamsmd/indentation";
+       description = "Indentation sensitive parsing combinators core library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "indentation-parsec" = callPackage
     ({ mkDerivation, base, indentation-core, mtl, parsec, tasty
      , tasty-hunit
@@ -109741,14 +111099,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indentation-parsec_0_0_0_1" = callPackage
+    ({ mkDerivation, base, indentation-core, mtl, parsec, tasty
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "indentation-parsec";
+       version = "0.0.0.1";
+       sha256 = "12s7ic8i7l2g7knzzab0c6k1s59cjlcdsrwygzh8l6l9azvya5lp";
+       libraryHaskellDepends = [ base indentation-core mtl parsec ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit ];
+       homepage = "https://bitbucket.org/adamsmd/indentation";
+       description = "Indentation sensitive parsing combinators for Parsec";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "indentation-trifecta" = callPackage
     ({ mkDerivation, base, indentation-core, mtl, parsers, tasty
      , tasty-hunit, trifecta
      }:
      mkDerivation {
        pname = "indentation-trifecta";
-       version = "0.0.1";
-       sha256 = "1ap6z3gvc93y1bq9msx401bm8wa7js5g5gmzr161bq722rs7y7n7";
+       version = "0.0.2";
+       sha256 = "0d2mxd1cdcr0zfz618dh4grin4z2bjfv4659i2zsddxm9li0dqis";
        libraryHaskellDepends = [
          base indentation-core mtl parsers trifecta
        ];
@@ -109756,6 +111130,7 @@ self: {
        homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentparser" = callPackage
@@ -110046,9 +111421,9 @@ self: {
   "influxdb" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
      , containers, foldl, http-client, http-types, HUnit, lens, mtl
-     , network, optional-args, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, text, time, unordered-containers
-     , vector
+     , mwc-random, network, optional-args, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-th, text, time
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "influxdb";
@@ -110061,6 +111436,10 @@ self: {
          http-types lens network optional-args scientific text time
          unordered-containers vector
        ];
+       executableHaskellDepends = [
+         aeson base bytestring containers foldl http-client lens mwc-random
+         network optional-args text time vector
+       ];
        testHaskellDepends = [
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text vector
@@ -110208,6 +111587,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
+  "inline-c_0_6_0_2" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+     , containers, cryptohash, gsl, gslcblas, hashable, hspec, mtl
+     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
+     , template-haskell, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "inline-c";
+       version = "0.6.0.2";
+       sha256 = "0myrr8fh42ydzwkyw2mipa5g7hzr6lb593dl95vkika8v3nr2srk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base binary bytestring containers cryptohash
+         hashable mtl parsec parsers QuickCheck template-haskell
+         transformers unordered-containers vector
+       ];
+       executableSystemDepends = [ gsl gslcblas ];
+       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;
+     }) {inherit (pkgs) gsl; gslcblas = null;};
+
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
      mkDerivation {
@@ -110220,6 +111627,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c-cpp_0_2_0_2" = callPackage
+    ({ mkDerivation, base, inline-c, template-haskell }:
+     mkDerivation {
+       pname = "inline-c-cpp";
+       version = "0.2.0.2";
+       sha256 = "1zmqj47snxa0hxw3scz2mqgb1axfwqya5n1hi72x7abcx0nzfc2q";
+       libraryHaskellDepends = [ base inline-c template-haskell ];
+       testHaskellDepends = [ base ];
+       description = "Lets you embed C++ code into Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-win32" = callPackage
     ({ mkDerivation, base, containers, inline-c, template-haskell
      , Win32
@@ -110340,7 +111760,7 @@ self: {
          lucid-extras plotlyhs text time
        ];
        executableHaskellDepends = [ base text ];
-       testHaskellDepends = [ base text ];
+       testHaskellDepends = [ base text time ];
        homepage = "https://github.com/diffusionkinetics/open/inliterate";
        description = "Interactive literate programming";
        license = stdenv.lib.licenses.mit;
@@ -111193,12 +112613,21 @@ self: {
      }) {};
 
   "intset" = callPackage
-    ({ mkDerivation, base, bits-extras, bytestring, deepseq }:
+    ({ mkDerivation, base, bits-extras, bytestring, containers
+     , criterion, deepseq, QuickCheck, test-framework
+     , test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "intset";
        version = "0.1.1.0";
        sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0";
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
+       testHaskellDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq
+       ];
        homepage = "https://github.com/pxqr/intset";
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
@@ -111808,7 +113237,7 @@ self: {
 
   "ipython-kernel" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, process, SHA, temporary, text
+     , directory, filepath, mtl, parsec, process, SHA, temporary, text
      , transformers, unordered-containers, uuid, zeromq4-haskell
      }:
      mkDerivation {
@@ -111822,6 +113251,9 @@ self: {
          process SHA temporary text transformers unordered-containers uuid
          zeromq4-haskell
        ];
+       executableHaskellDepends = [
+         base filepath mtl parsec text transformers
+       ];
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
@@ -111876,6 +113308,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-client_0_4_4_2" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
+     , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
+     , time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "0.4.4.2";
+       sha256 = "07rijsr4sbh9hsj83kazgxrwl7vamxa3d6hd71bdsq485ghkkphq";
+       libraryHaskellDepends = [
+         base bytestring conduit connection irc-conduit irc-ctcp
+         network-conduit-tls old-locale stm stm-conduit text time tls
+         transformers x509 x509-store x509-validation
+       ];
+       homepage = "https://github.com/barrucadu/irc-client";
+       description = "An IRC client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -112546,6 +113998,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://inmachina.net/~jwlato/haskell/iteratee";
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
@@ -114012,8 +115465,9 @@ self: {
      }) {};
 
   "jsc" = callPackage
-    ({ mkDerivation, base, jmacro, lens, template-haskell, text
-     , transformers, webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, base, glib, gtk3, hslogger, jmacro, lens
+     , template-haskell, text, transformers, webkitgtk3
+     , webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsc";
@@ -114023,6 +115477,10 @@ self: {
          base jmacro lens template-haskell text transformers webkitgtk3
          webkitgtk3-javascriptcore
        ];
+       testHaskellDepends = [
+         base glib gtk3 hslogger jmacro lens template-haskell text
+         transformers webkitgtk3 webkitgtk3-javascriptcore
+       ];
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114679,8 +116137,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-tracer";
-       version = "0.0.1.2";
-       sha256 = "1687zjhc5d63qq7kzkq4kcn9qw9kwlb566kgfkh7yr8whp5rhgnd";
+       version = "0.0.2.0";
+       sha256 = "0fgyx2m0xnkwkqlvmbqmwjklfdif8gprz1bcwbcmmvyznsc6wngq";
        libraryHaskellDepends = [
          aeson base containers ghc-prim hashable microlens microlens-ghc mtl
          template-haskell text transformers unordered-containers
@@ -115208,8 +116666,9 @@ self: {
      }) {};
 
   "kafka-client" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec
-     , hspec-discover, network, QuickCheck, snappy, time, zlib
+    ({ mkDerivation, base, bytestring, cereal, containers, digest
+     , dlist, hspec, hspec-discover, network, process, QuickCheck
+     , snappy, temporary, time, zlib
      }:
      mkDerivation {
        pname = "kafka-client";
@@ -115219,7 +116678,8 @@ self: {
          base bytestring cereal digest dlist network snappy time zlib
        ];
        testHaskellDepends = [
-         base bytestring cereal hspec hspec-discover QuickCheck time
+         base bytestring cereal containers hspec hspec-discover network
+         process QuickCheck temporary time
        ];
        homepage = "https://github.com/abhinav/kafka-client";
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
@@ -115472,6 +116932,7 @@ self: {
          directory dotgen filepath netlist netlist-to-vhdl process random
          sized-types strict template-haskell
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "Kansas Lava is a hardware simulator and VHDL generator";
        license = stdenv.lib.licenses.bsd3;
@@ -115492,6 +116953,7 @@ self: {
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava network sized-types
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
@@ -115628,35 +117090,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "katip_0_4_1_0" = callPackage
+  "katip_0_5_0_0" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , bytestring, containers, criterion, deepseq, directory, either
-     , exceptions, hostname, microlens, microlens-th, monad-control, mtl
+     , filepath, hostname, microlens, microlens-th, monad-control, mtl
      , old-locale, quickcheck-instances, regex-tdfa, resourcet
-     , semigroups, string-conv, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time
-     , time-locale-compat, transformers, transformers-base
-     , transformers-compat, unagi-chan, unix, unordered-containers
+     , safe-exceptions, semigroups, stm, string-conv, tasty
+     , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, time, time-locale-compat, transformers, transformers-base
+     , transformers-compat, unix, unordered-containers
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.4.1.0";
-       sha256 = "0rhnp6qg19v180nazwghn2f4chc79fwn1g74wr3zdsqg0j211bnp";
+       version = "0.5.0.0";
+       sha256 = "0wqf5d4hjy6mc050g7hl2m3b66pi3fhyy37w0jwm7q7rrcplyncc";
        libraryHaskellDepends = [
-         aeson async auto-update base bytestring containers either
-         exceptions hostname microlens microlens-th monad-control mtl
-         old-locale resourcet semigroups string-conv template-haskell text
-         time transformers transformers-base transformers-compat unagi-chan
-         unix unordered-containers
+         aeson async auto-update base bytestring containers either hostname
+         microlens microlens-th monad-control mtl old-locale resourcet
+         safe-exceptions semigroups stm string-conv template-haskell text
+         time transformers transformers-base transformers-compat unix
+         unordered-containers
        ];
        testHaskellDepends = [
-         aeson base bytestring directory microlens quickcheck-instances
-         regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
-         template-haskell text time time-locale-compat unordered-containers
+         aeson base bytestring containers directory microlens
+         quickcheck-instances regex-tdfa safe-exceptions stm tasty
+         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
+         time time-locale-compat unordered-containers
        ];
        benchmarkHaskellDepends = [
-         aeson async base blaze-builder criterion deepseq text time
-         transformers unix
+         aeson async base blaze-builder criterion deepseq directory filepath
+         safe-exceptions text time transformers unix
        ];
        homepage = "https://github.com/Soostone/katip";
        description = "A structured logging framework";
@@ -115695,6 +117158,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "katip-elasticsearch_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bloodhound, bytestring
+     , containers, criterion, deepseq, enclosed-exceptions, exceptions
+     , http-client, http-types, katip, lens, lens-aeson
+     , quickcheck-instances, retry, rng-utils, scientific, stm
+     , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, transformers, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "katip-elasticsearch";
+       version = "0.4.0.0";
+       sha256 = "0ypss3ga6xcqwd03y3jbq9mi6ka4h6srlr7ybb8k38bk9ql0bfld";
+       libraryHaskellDepends = [
+         aeson async base bloodhound bytestring enclosed-exceptions
+         exceptions http-client http-types katip retry scientific stm
+         stm-chans text time transformers unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson base bloodhound bytestring containers http-client http-types
+         katip lens lens-aeson quickcheck-instances scientific stm tagged
+         tasty tasty-hunit tasty-quickcheck text time transformers
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bloodhound criterion deepseq rng-utils text
+         unordered-containers uuid
+       ];
+       description = "ElasticSearch scribe for the Katip logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "katt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers
      , directory, errors, filepath, lens, mtl, parsec, text, url, wreq
@@ -116367,6 +117862,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base udbus ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
@@ -117724,10 +119220,12 @@ self: {
      }) {};
 
   "lambdacube-compiler" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring
-     , containers, directory, exceptions, filepath, lambdacube-ir
-     , megaparsec, mtl, optparse-applicative, pretty-show, semigroups
-     , text, vector
+    ({ mkDerivation, aeson, ansi-wl-pprint, async, base
+     , base64-bytestring, bytestring, containers, deepseq, directory
+     , exceptions, filepath, JuicyPixels, lambdacube-ir, megaparsec
+     , monad-control, mtl, optparse-applicative, patience, pretty-show
+     , process, QuickCheck, semigroups, tasty, tasty-quickcheck, text
+     , time, vect, vector, websockets
      }:
      mkDerivation {
        pname = "lambdacube-compiler";
@@ -117740,7 +119238,11 @@ self: {
          lambdacube-ir megaparsec mtl pretty-show semigroups text vector
        ];
        executableHaskellDepends = [
-         aeson base bytestring filepath optparse-applicative
+         aeson ansi-wl-pprint async base base64-bytestring bytestring
+         containers deepseq directory exceptions filepath JuicyPixels
+         lambdacube-ir megaparsec monad-control mtl optparse-applicative
+         patience pretty-show process QuickCheck semigroups tasty
+         tasty-quickcheck text time vect vector websockets
        ];
        homepage = "http://lambdacube3d.com";
        description = "LambdaCube 3D is a DSL to program GPUs";
@@ -117822,8 +119324,10 @@ self: {
      }) {};
 
   "lambdacube-gl" = callPackage
-    ({ mkDerivation, base, bytestring, containers, JuicyPixels
-     , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , containers, exceptions, GLFW-b, JuicyPixels, lambdacube-ir, mtl
+     , network, OpenGLRaw, text, time, vector, vector-algorithms
+     , wavefront, websockets
      }:
      mkDerivation {
        pname = "lambdacube-gl";
@@ -117835,6 +119339,11 @@ self: {
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
        ];
+       executableHaskellDepends = [
+         aeson base base64-bytestring bytestring containers exceptions
+         GLFW-b JuicyPixels lambdacube-ir mtl network OpenGLRaw text time
+         vector wavefront websockets
+       ];
        homepage = "http://lambdacube3d.com";
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
@@ -118034,8 +119543,9 @@ self: {
      }) {};
 
   "language-boogie" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, lens
-     , mtl, parsec, pretty, random, stream-monad, time, transformers
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, filepath
+     , HUnit, lens, mtl, parsec, pretty, random, stream-monad, time
+     , transformers
      }:
      mkDerivation {
        pname = "language-boogie";
@@ -118048,8 +119558,8 @@ self: {
          transformers
        ];
        executableHaskellDepends = [
-         ansi-terminal base cmdargs containers lens mtl parsec pretty random
-         stream-monad time transformers
+         ansi-terminal base cmdargs containers filepath HUnit lens mtl
+         parsec pretty random stream-monad time transformers
        ];
        homepage = "https://bitbucket.org/nadiapolikarpova/boogaloo";
        description = "Interpreter and language infrastructure for Boogie";
@@ -118121,6 +119631,7 @@ self: {
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
        ];
+       testHaskellDepends = [ base language-c-quote ];
        homepage = "https://github.com/mchakravarty/language-c-inline/";
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
@@ -118154,7 +119665,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "language-c-quote_0_12" = callPackage
+  "language-c-quote_0_12_1" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , exception-mtl, exception-transformers, filepath, happy
      , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
@@ -118162,8 +119673,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-quote";
-       version = "0.12";
-       sha256 = "14wxbis9zm3zlc3q430is50nk5k2hqx4lracwm2ca7qlg854h2hj";
+       version = "0.12.1";
+       sha256 = "111mvmbr9m8np5zayj95mv8bjcrgwjafq4lskq5qjs20fvskfdgc";
        libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -118193,9 +119704,10 @@ self: {
      }) {};
 
   "language-conf" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, directory, filepath, hspec
-     , hspec-megaparsec, megaparsec, pretty, QuickCheck, scientific
-     , semigroups, text, transformers, unordered-containers, vector
+    ({ mkDerivation, aeson, base, bytestring, deepseq, directory
+     , filepath, hspec, hspec-megaparsec, megaparsec
+     , optparse-applicative, pretty, QuickCheck, scientific, semigroups
+     , text, transformers, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-conf";
@@ -118207,6 +119719,10 @@ self: {
          aeson base deepseq directory filepath megaparsec pretty scientific
          semigroups text unordered-containers vector
        ];
+       executableHaskellDepends = [
+         aeson base bytestring filepath megaparsec optparse-applicative
+         pretty text yaml
+       ];
        testHaskellDepends = [
          aeson base directory filepath hspec hspec-megaparsec megaparsec
          pretty QuickCheck semigroups text transformers
@@ -118259,6 +119775,11 @@ self: {
          pretty ShellCheck split template-haskell text th-lift
          th-lift-instances transformers unordered-containers yaml
        ];
+       executableHaskellDepends = [
+         aeson base bytestring directory filepath free Glob mtl parsec
+         pretty ShellCheck split template-haskell text th-lift
+         th-lift-instances transformers unordered-containers yaml
+       ];
        testHaskellDepends = [
          aeson base bytestring directory filepath free Glob hspec HUnit mtl
          parsec pretty process QuickCheck ShellCheck split template-haskell
@@ -118598,9 +120119,9 @@ self: {
 
   "language-lua2" = callPackage
     ({ mkDerivation, base, containers, deepseq, Earley
-     , lexer-applicative, microlens, QuickCheck, regex-applicative
-     , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck
-     , transformers, unordered-containers, wl-pprint
+     , lexer-applicative, microlens, optparse-applicative, QuickCheck
+     , regex-applicative, semigroups, srcloc, tasty, tasty-hunit
+     , tasty-quickcheck, transformers, unordered-containers, wl-pprint
      }:
      mkDerivation {
        pname = "language-lua2";
@@ -118613,6 +120134,9 @@ self: {
          regex-applicative semigroups srcloc transformers
          unordered-containers wl-pprint
        ];
+       executableHaskellDepends = [
+         base Earley lexer-applicative optparse-applicative srcloc wl-pprint
+       ];
        testHaskellDepends = [
          base deepseq lexer-applicative QuickCheck semigroups srcloc tasty
          tasty-hunit tasty-quickcheck unordered-containers
@@ -118639,6 +120163,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-ninja" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+     , cabal-doctest, containers, deepseq, doctest, flow, ghc
+     , haddock-api, haddock-library, hashable, intern, lens, megaparsec
+     , monad-mock, mtl, optparse-generic, QuickCheck
+     , quickcheck-instances, smallcheck, system-filepath, tasty
+     , tasty-html, tasty-hunit, tasty-lens, tasty-quickcheck
+     , tasty-smallcheck, template-haskell, text, transformers, turtle
+     , unordered-containers, versions
+     }:
+     mkDerivation {
+       pname = "language-ninja";
+       version = "0.1.0";
+       sha256 = "1bqf61q8mzglf1f3y2khy2vw4k3kfc0qd0rw984jyfxk10wqr27d";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq flow hashable intern lens
+         megaparsec mtl QuickCheck quickcheck-instances smallcheck
+         system-filepath text transformers unordered-containers versions
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base flow lens mtl optparse-generic text
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cabal-doctest containers doctest flow ghc
+         haddock-api haddock-library hashable lens monad-mock mtl QuickCheck
+         quickcheck-instances smallcheck system-filepath tasty tasty-html
+         tasty-hunit tasty-lens tasty-quickcheck tasty-smallcheck
+         template-haskell text transformers turtle unordered-containers
+         versions
+       ];
+       homepage = "https://github.com/awakesecurity/language-ninja";
+       description = "A library for dealing with the Ninja build language";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-nix" = callPackage
     ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens
      , pretty, QuickCheck
@@ -118760,6 +120324,50 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
+  "language-puppet_1_3_8_1" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , cryptonite, directory, either, exceptions, filecache, formatting
+     , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec
+     , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec
+     , memory, mtl, operational, optparse-applicative, parallel-io
+     , parsec, pcre-utils, process, random, regex-pcre-builtin
+     , scientific, semigroups, servant, servant-client, split, stm
+     , strict-base-types, temporary, text, time, transformers, unix
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "language-puppet";
+       version = "1.3.8.1";
+       sha256 = "0hk1fx574hkmm275rm4jv66vr9gixllaw2vqklhpx54rgjwpcclv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
+         case-insensitive containers cryptonite directory either exceptions
+         filecache formatting hashable hruby hslogger hspec http-api-data
+         http-client lens lens-aeson megaparsec memory mtl operational
+         parsec pcre-utils process random regex-pcre-builtin scientific
+         semigroups servant servant-client split stm strict-base-types text
+         time transformers unix unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers Glob hslogger http-client lens
+         megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin
+         servant-client strict-base-types text transformers
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
+         megaparsec mtl scientific strict-base-types temporary text
+         transformers unix unordered-containers vector
+       ];
+       homepage = "http://lpuppet.banquise.net/";
+       description = "Tools to parse and evaluate the Puppet DSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-python" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, monads-tf
      , pretty, transformers, utf8-string
@@ -119333,6 +120941,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lazy-hash" = callPackage
+    ({ mkDerivation, base, constrained-categories, hashable
+     , haskell-src-meta, tagged, template-haskell, vector-space
+     }:
+     mkDerivation {
+       pname = "lazy-hash";
+       version = "0.1.0.0";
+       sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa";
+       libraryHaskellDepends = [
+         base constrained-categories hashable haskell-src-meta tagged
+         template-haskell vector-space
+       ];
+       description = "Identifiers for not-yet-computed values";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "lazy-hash-cache" = callPackage
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring
+     , data-default-class, directory, filepath, hashable, lazy-hash
+     , microlens, microlens-th, temporary
+     }:
+     mkDerivation {
+       pname = "lazy-hash-cache";
+       version = "0.1.0.0";
+       sha256 = "1bdq2fbxpmlva1qbxbiznnjmz7yv7qzcr8wdgds0rdzwhjn97mp4";
+       libraryHaskellDepends = [
+         base base16-bytestring binary bytestring data-default-class
+         directory filepath hashable lazy-hash microlens microlens-th
+         temporary
+       ];
+       description = "Storing computed values for re-use when the same program runs again";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "lazy-io" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -119606,8 +121248,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
-       version = "0.6.2";
-       sha256 = "0xqkf9ijghbcdypsdfd4ji9aqh43sq736db49y0kilw2hfqxj8pl";
+       version = "0.6.3";
+       sha256 = "0qcmpm7x5fsiqvwnsih2xqy9liy23vv96i88460kjr19lvscglhj";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/rudymatela/leancheck#readme";
@@ -120388,7 +122030,7 @@ self: {
      }) {};
 
   "leveldb-haskell" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, directory
+    ({ mkDerivation, async, base, bytestring, data-default, directory
      , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty
      , tasty-quickcheck, temporary, transformers
      }:
@@ -120403,6 +122045,9 @@ self: {
          transformers
        ];
        librarySystemDepends = [ leveldb ];
+       executableHaskellDepends = [
+         async base bytestring data-default resourcet transformers
+       ];
        testHaskellDepends = [
          base bytestring data-default directory exceptions mtl QuickCheck
          tasty tasty-quickcheck temporary transformers
@@ -120413,9 +122058,9 @@ self: {
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, filepath, hspec
-     , hspec-expectations, leveldb, mtl, process, QuickCheck, resourcet
-     , transformers
+    ({ mkDerivation, async, base, bytestring, data-default, filepath
+     , hspec, hspec-expectations, leveldb, mtl, process, QuickCheck
+     , resourcet, transformers
      }:
      mkDerivation {
        pname = "leveldb-haskell-fork";
@@ -120427,6 +122072,9 @@ self: {
          base bytestring data-default filepath resourcet transformers
        ];
        librarySystemDepends = [ leveldb ];
+       executableHaskellDepends = [
+         async base bytestring data-default resourcet transformers
+       ];
        testHaskellDepends = [
          base bytestring data-default hspec hspec-expectations mtl process
          QuickCheck transformers
@@ -120451,7 +122099,8 @@ self: {
      }) {};
 
   "levmar-chart" = callPackage
-    ({ mkDerivation, base, Chart, colour, data-accessor, levmar }:
+    ({ mkDerivation, base, Chart, colour, data-accessor, levmar, random
+     }:
      mkDerivation {
        pname = "levmar-chart";
        version = "0.2";
@@ -120459,6 +122108,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
+       executableHaskellDepends = [
+         base Chart colour data-accessor levmar random
+       ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120558,13 +122210,26 @@ self: {
      }) {};
 
   "lhc" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+     , bytestring-trie, Cabal, containers, core, derive, digest
+     , directory, extensible-exceptions, filepath, haskell98, HUnit, mtl
+     , parallel, pretty, process, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck, time, unix
+     , xhtml
+     }:
      mkDerivation {
        pname = "lhc";
        version = "0.10";
        sha256 = "1x50k6lx9p36qxl0qn9zfyqlkgsq3wdzvcv7l6sn920hg5scvcr3";
        isLibrary = false;
        isExecutable = true;
+       executableHaskellDepends = [
+         ansi-wl-pprint base binary bytestring bytestring-trie Cabal
+         containers core derive digest directory extensible-exceptions
+         filepath haskell98 HUnit mtl parallel pretty process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck time
+         unix xhtml
+       ];
        homepage = "http://lhc.seize.it/";
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
@@ -120855,8 +122520,8 @@ self: {
   "liblastfm" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
      , cryptonite, hspec, hspec-expectations-lens, http-client
-     , http-client-tls, lens, lens-aeson, network-uri, profunctors
-     , semigroups, text, transformers, xml-conduit
+     , http-client-tls, HUnit, lens, lens-aeson, network-uri
+     , profunctors, semigroups, text, transformers, xml-conduit
      , xml-html-conduit-lens
      }:
      mkDerivation {
@@ -120870,8 +122535,8 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring cereal containers cryptonite hspec
-         hspec-expectations-lens http-client http-client-tls lens lens-aeson
-         network-uri profunctors text transformers xml-conduit
+         hspec-expectations-lens http-client http-client-tls HUnit lens
+         lens-aeson network-uri profunctors text transformers xml-conduit
          xml-html-conduit-lens
        ];
        description = "Lastfm API interface";
@@ -120940,6 +122605,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/mainland/libltdl";
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
@@ -121238,6 +122904,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {systemd = null;};
 
+  "libsystemd-journal_1_4_2" = callPackage
+    ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
+     , pipes-safe, systemd, text, transformers, uniplate
+     , unix-bytestring, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "libsystemd-journal";
+       version = "1.4.2";
+       sha256 = "0pdb4spffm4q7xxc3nd8zn4y91v5cf4xmdgb4zls3nnh579h1ygk";
+       libraryHaskellDepends = [
+         base bytestring hashable hsyslog pipes pipes-safe text transformers
+         uniplate unix-bytestring unordered-containers uuid vector
+       ];
+       libraryPkgconfigDepends = [ systemd ];
+       homepage = "http://github.com/ocharles/libsystemd-journal";
+       description = "Haskell bindings to libsystemd-journal";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {systemd = null;};
+
   "libtagc" = callPackage
     ({ mkDerivation, base, bytestring, glib, taglib }:
      mkDerivation {
@@ -121388,6 +123074,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "licensor_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers
+     , directory, http-conduit, process
+     }:
+     mkDerivation {
+       pname = "licensor";
+       version = "0.2.1";
+       sha256 = "1is281xsrfdh2vsank07j1gw634iadz0sp8ssabpfqgnb3a98rvz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory http-conduit process
+       ];
+       executableHaskellDepends = [
+         base Cabal cmdargs containers directory
+       ];
+       homepage = "https://github.com/jpvillaisaza/licensor";
+       description = "A license compatibility helper";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "life" = callPackage
     ({ mkDerivation, array, base, GLUT, OpenGL, random }:
      mkDerivation {
@@ -121559,7 +123267,8 @@ self: {
          transformers
        ];
        testHaskellDepends = [
-         aeson api-builder base bytestring hspec text transformers
+         aeson api-builder base bytestring hspec http-client http-client-tls
+         http-types network text transformers
        ];
        homepage = "https://github.com/cmoresid/lightning-haskell#readme";
        description = "Haskell client for lightning-viz REST API";
@@ -122547,8 +124256,8 @@ self: {
      }:
      mkDerivation {
        pname = "liquidhaskell";
-       version = "0.8.0.0";
-       sha256 = "1jwh46z9d7ll380fygdk90zic9br723aag82w1cgllc1r5m8kqib";
+       version = "0.8.0.1";
+       sha256 = "1rj6c46laylds149d11yyw79vn0nls9gmxnc9fakyl4qg0d97d75";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122676,6 +124385,9 @@ self: {
        libraryHaskellDepends = [
          ansi-terminal base data-default stm terminal-size vty
        ];
+       executableHaskellDepends = [
+         ansi-terminal base data-default stm terminal-size vty
+       ];
        testHaskellDepends = [
          ansi-terminal base data-default hspec stm terminal-size vty
        ];
@@ -123400,9 +125112,10 @@ self: {
      }) {};
 
   "llvm-pretty-bc-parser" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers
-     , directory, fgl, fgl-visualize, filepath, llvm-pretty, monadLib
-     , pretty, process
+    ({ mkDerivation, abstract-par, array, base, bytestring, cereal
+     , containers, deepseq, directory, fgl, fgl-visualize, filepath
+     , llvm-pretty, monad-par, monadLib, pretty, process, random
+     , temporary, time, transformers, xml
      }:
      mkDerivation {
        pname = "llvm-pretty-bc-parser";
@@ -123415,8 +125128,9 @@ self: {
          pretty
        ];
        executableHaskellDepends = [
-         array base bytestring cereal containers fgl fgl-visualize
-         llvm-pretty monadLib pretty
+         abstract-par array base bytestring cereal containers deepseq
+         directory fgl fgl-visualize filepath llvm-pretty monad-par monadLib
+         pretty process random temporary time transformers xml
        ];
        testHaskellDepends = [
          base bytestring directory filepath llvm-pretty process
@@ -123588,8 +125302,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, hedgehog, loc-test }:
      mkDerivation {
        pname = "loc";
-       version = "0.1.2.3";
-       sha256 = "064q3hyjnfpa2r2290604m9pcgh9l1g9fbap176d3n7xknn3lvcc";
+       version = "0.1.3.0";
+       sha256 = "09s0a8diav2gyva965m03z1j7dcb7r1r6y10c8c3n1qpqvmgmvym";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hedgehog loc-test ];
        homepage = "https://github.com/chris-martin/haskell-libraries";
@@ -123601,8 +125315,8 @@ self: {
     ({ mkDerivation, base, containers, hedgehog, loc }:
      mkDerivation {
        pname = "loc-test";
-       version = "0.1.2.1";
-       sha256 = "0l75qvhxhppg2vw90fx5g6rg98zy83dx0hd2v9ad799fp4mk6qai";
+       version = "0.1.3.0";
+       sha256 = "1ic60m2slsaqyd0k82hbm5pb58z15zlhy429hzaj40bj1yjblwyw";
        libraryHaskellDepends = [ base containers hedgehog loc ];
        homepage = "https://github.com/chris-martin/haskell-libraries";
        description = "Test-related utilities related to the /loc/ package";
@@ -123654,8 +125368,8 @@ self: {
     ({ mkDerivation, base, criterion }:
      mkDerivation {
        pname = "located-base";
-       version = "0.1.1.0";
-       sha256 = "17ym69bxjic63mj5g37ycp9vw7vy9x000wmddc5q5jbyr20n1ac3";
+       version = "0.1.1.1";
+       sha256 = "1f8k78p7nx7dbrjrkx6ff8d02a0zspg1pc1y3whqbxrhm0ynl1ay";
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/gridaphobe/located-base";
@@ -123972,20 +125686,20 @@ self: {
   "log-utils" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default
      , exceptions, hpqtypes, http-types, invariant, kontra-config
-     , lifted-base, log, monad-control, random, text, time, transformers
-     , transformers-base, unjson, vector, wai, warp
+     , lifted-base, log-base, monad-control, random, text, time
+     , transformers, transformers-base, unjson, vector, wai, warp
      }:
      mkDerivation {
        pname = "log-utils";
-       version = "0.2.2";
-       sha256 = "121nxm72jxixq71dm4yg6l896inhw97c6j7kdczv7svdqr827qbz";
+       version = "0.2.2.1";
+       sha256 = "151dgpkcc0hmsjw3vw13zzgqlww1mzh61k87hksfcd7dqvgcvmkj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base bytestring cmdargs data-default exceptions hpqtypes
-         http-types invariant kontra-config lifted-base log monad-control
-         random text time transformers transformers-base unjson vector wai
-         warp
+         http-types invariant kontra-config lifted-base log-base
+         monad-control random text time transformers transformers-base
+         unjson vector wai warp
        ];
        homepage = "https://github.com/scrive/log-utils";
        description = "Utils for working with logs";
@@ -124886,6 +126600,9 @@ self: {
          base containers FontyFruity gasp JuicyPixels lens linear
          lp-diagrams lucid-svg mtl optparse-applicative svg-tree text vector
        ];
+       executableHaskellDepends = [
+         base containers FontyFruity gasp lens lp-diagrams
+       ];
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125533,7 +127250,7 @@ self: {
        doHaddock = false;
        description = "liblzma C library and headers for use by LZMA bindings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       platforms = stdenv.lib.platforms.none;
      }) {};
 
   "lzma-conduit" = callPackage
@@ -127115,10 +128832,10 @@ self: {
      }) {};
 
   "marmalade-upload" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, directory
-     , exceptions, filepath, http-client, http-client-tls, http-types
-     , keyring, mtl, network, optparse-applicative, tasty, tasty-hunit
-     , text, transformers
+    ({ mkDerivation, aeson, base, bytestring, Cabal, data-default
+     , directory, exceptions, filepath, http-client, http-client-tls
+     , http-types, keyring, mtl, network, optparse-applicative, process
+     , shake, split, tasty, tasty-hunit, text, transformers, zip-archive
      }:
      mkDerivation {
        pname = "marmalade-upload";
@@ -127131,8 +128848,9 @@ self: {
          http-types mtl network text transformers
        ];
        executableHaskellDepends = [
-         aeson base bytestring data-default directory filepath keyring
-         optparse-applicative text transformers
+         aeson base bytestring Cabal data-default directory filepath keyring
+         optparse-applicative process shake split text transformers
+         zip-archive
        ];
        testHaskellDepends = [
          aeson base exceptions tasty tasty-hunit text transformers
@@ -127251,8 +128969,8 @@ self: {
 
   "marxup" = callPackage
     ({ mkDerivation, base, configurator, containers, directory, dlist
-     , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl
-     , parsek, pretty, process, text
+     , filepath, graphviz, haskell-src-exts, labeled-tree, lens
+     , lp-diagrams, mtl, parsek, pretty, process, text
      }:
      mkDerivation {
        pname = "marxup";
@@ -127265,7 +128983,7 @@ self: {
          lens lp-diagrams mtl process text
        ];
        executableHaskellDepends = [
-         base configurator dlist parsek pretty
+         base configurator dlist graphviz lens lp-diagrams parsek pretty
        ];
        description = "Markup language preprocessor for Haskell";
        license = stdenv.lib.licenses.gpl2;
@@ -127536,6 +129254,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matrices_0_4_5" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, primitive, tasty
+     , tasty-hunit, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "matrices";
+       version = "0.4.5";
+       sha256 = "15vkkd3jwfdp648lfhskzhnisb1bzqia3asw8fmanpk71l9nyf9d";
+       libraryHaskellDepends = [ base deepseq primitive vector ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "native matrix based on vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrix" = callPackage
     ({ mkDerivation, base, criterion, deepseq, loop, primitive
      , QuickCheck, tasty, tasty-quickcheck, vector
@@ -127667,6 +129403,9 @@ self: {
          memory microlens microlens-th network-uri pretty-show process stm
          template-haskell text time unordered-containers websockets
        ];
+       executableHaskellDepends = [
+         aeson base connection pretty-show process text unordered-containers
+       ];
        testHaskellDepends = [
          aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit
          text unordered-containers
@@ -127857,7 +129596,7 @@ self: {
 
   "mbox-tools" = callPackage
     ({ mkDerivation, base, bytestring, codec-mbox, containers, fclabels
-     , hsemail, mtl, parsec, process, pureMD5
+     , hsemail, mtl, parsec, process, pureMD5, random
      }:
      mkDerivation {
        pname = "mbox-tools";
@@ -127867,7 +129606,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring codec-mbox containers fclabels hsemail mtl parsec
-         process pureMD5
+         process pureMD5 random
        ];
        homepage = "https://github.com/np/mbox-tools";
        description = "A collection of tools to process mbox files";
@@ -127893,6 +129632,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mbtiles" = callPackage
+    ({ mkDerivation, base, bytestring, directory, HUnit, mtl
+     , sqlite-simple, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "mbtiles";
+       version = "0.3.0.0";
+       sha256 = "0v41lzh1pi105nw3kl0kg04q1xlf9mwkhrdyiyc877a2y01xg2np";
+       libraryHaskellDepends = [
+         base bytestring directory mtl sqlite-simple text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/caneroj1/mbtiles#readme";
+       description = "Haskell MBTiles client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mcl" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, criterion
      , deepseq, ghc-prim, gmpxx, groups, integer-gmp, mcl, openssl
@@ -127999,7 +129756,7 @@ self: {
      }) {};
 
   "mcpi" = callPackage
-    ({ mkDerivation, base, network, split, transformers }:
+    ({ mkDerivation, base, network, pipes, split, transformers }:
      mkDerivation {
        pname = "mcpi";
        version = "0.0.1.2";
@@ -128007,7 +129764,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network split transformers ];
-       executableHaskellDepends = [ base transformers ];
+       executableHaskellDepends = [ base network pipes transformers ];
        homepage = "https://github.com/DougBurke/hmcpi";
        description = "Connect to MineCraft running on a Raspberry PI";
        license = stdenv.lib.licenses.publicDomain;
@@ -128658,8 +130415,8 @@ self: {
 
   "memcache-conduit" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
-     , conduit, conduit-extra, memcache-haskell, mtl, network, resourcet
-     , split
+     , conduit, conduit-extra, containers, hashtables, memcache-haskell
+     , monad-control, mtl, network, resourcet, split, stm, transformers
      }:
      mkDerivation {
        pname = "memcache-conduit";
@@ -128671,13 +130428,19 @@ self: {
          attoparsec attoparsec-binary base bytestring conduit conduit-extra
          memcache-haskell mtl network resourcet split
        ];
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra containers hashtables
+         memcache-haskell monad-control mtl network resourcet stm
+         transformers
+       ];
        description = "Conduit library for memcache procotol";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "memcache-haskell" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit
-     , network, QuickCheck, split, test-framework, test-framework-hunit
+    ({ mkDerivation, attoparsec, base, bytestring, conduit-extra
+     , containers, hashable, hashtables, HUnit, mtl, network, QuickCheck
+     , resourcet, split, stm, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers
      }:
      mkDerivation {
@@ -128689,6 +130452,10 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring hashable network split transformers
        ];
+       executableHaskellDepends = [
+         base bytestring conduit-extra containers hashtables mtl resourcet
+         stm transformers
+       ];
        testHaskellDepends = [
          base bytestring HUnit network QuickCheck split test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
@@ -129500,8 +131267,8 @@ self: {
      }:
      mkDerivation {
        pname = "microstache";
-       version = "1";
-       sha256 = "0r3ia4hamyrij4vdaa6vnfwhgv40xr4g9wcigi6yhm4ymkz5p1z8";
+       version = "1.0.1.1";
+       sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath parsec
          text transformers unordered-containers vector
@@ -129811,17 +131578,19 @@ self: {
      }) {};
 
   "mikrokosmos" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, haskeline, HUnit
-     , mtl, multimap, parsec
+    ({ mkDerivation, ansi-terminal, base, containers, directory
+     , haskeline, HUnit, mtl, multimap, options, parsec, tasty
+     , tasty-hunit
      }:
      mkDerivation {
        pname = "mikrokosmos";
-       version = "0.2.0";
-       sha256 = "1ckmcdc161x7mgr5pjzvaw5p58llq4mnkc4by58gb6927wy4wfw5";
+       version = "0.3.0";
+       sha256 = "1qr0m4iy1xyprw714nrdpkxlr6lmvsb6f9d8m4z13z03njnz4vm6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base containers haskeline HUnit mtl multimap parsec
+         ansi-terminal base containers directory haskeline HUnit mtl
+         multimap options parsec tasty tasty-hunit
        ];
        homepage = "https://github.com/M42/mikrokosmos";
        description = "Lambda calculus interpreter";
@@ -129905,8 +131674,8 @@ self: {
        pname = "mime-mail";
        version = "0.4.13.1";
        sha256 = "05sri6sszmnyxsnrnk5j1wwqf0bawpfb179wjqfsp7bkj886g0cl";
-       revision = "4";
-       editedCabalFile = "129h3siph3pxiddvrr52dsla6jn0yqr55213zv0wamscjmzwwiy1";
+       revision = "6";
+       editedCabalFile = "0v9kc1p8lhg9zfh7c7x6x71rd7k7y6bpw4112ax9995w0aq09dk1";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -130148,6 +131917,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "minio-hs_0_3_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, case-insensitive, conduit
+     , conduit-combinators, conduit-extra, containers, cryptonite
+     , cryptonite-conduit, data-default, directory, exceptions, filepath
+     , http-client, http-conduit, http-types, lifted-async, lifted-base
+     , memory, monad-control, protolude, QuickCheck, resourcet, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text
+     , text-format, time, transformers, transformers-base, xml-conduit
+     }:
+     mkDerivation {
+       pname = "minio-hs";
+       version = "0.3.0";
+       sha256 = "0bnva7809g7ry31373j7qcmnfiamqfv4r50y6h1k0d7pnsck3bn5";
+       libraryHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude resourcet
+         text text-format time transformers transformers-base xml-conduit
+       ];
+       testHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         directory exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude QuickCheck
+         resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         temporary text text-format time transformers transformers-base
+         xml-conduit
+       ];
+       homepage = "https://github.com/minio/minio-hs#readme";
+       description = "A Minio client library, compatible with S3 like services";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "minions" = callPackage
     ({ mkDerivation, ansi-terminal, base, MissingH, process, time }:
      mkDerivation {
@@ -130384,16 +132188,17 @@ self: {
 
   "miso" = callPackage
     ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers
-     , lucid, text, vector
+     , lucid, servant, servant-lucid, text, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.2.1.0";
-       sha256 = "0z7gl1bxh1c6caxwqbf1cqpgrklx7z7f4qp06pipmvwciggcf30v";
+       version = "0.4.0.0";
+       sha256 = "1pfmmc14fsydv6km45sc5w0mgqnsww7l053qh0vrqmzb88zp8h7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base BoundedChan bytestring containers lucid text vector
+         aeson base BoundedChan bytestring containers lucid servant
+         servant-lucid text vector
        ];
        homepage = "http://github.com/dmjio/miso";
        description = "A tasty Haskell front-end framework";
@@ -131239,6 +133044,7 @@ self: {
        homepage = "https://github.com/ennocramer/monad-dijkstra";
        description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-exception" = callPackage
@@ -131824,6 +133630,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-skeleton_0_1_4" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "monad-skeleton";
+       version = "0.1.4";
+       sha256 = "1fz8x3lcxp1az4sdbndzkg1w0ik8rddf6p7wd4j4fkbxffvcllri";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/fumieval/monad-skeleton";
+       description = "Monads of program skeleta";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-st" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -132304,9 +134123,10 @@ self: {
      }) {};
 
   "monarch" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, doctest
-     , lifted-base, monad-control, mtl, network, pool-conduit, stm
-     , transformers, transformers-base
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , doctest, hspec, lifted-base, monad-control, mtl, network
+     , pool-conduit, stm, tokyotyrant-haskell, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "monarch";
@@ -132316,7 +134136,12 @@ self: {
          base binary bytestring containers lifted-base monad-control mtl
          network pool-conduit stm transformers transformers-base
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [
+         base bytestring doctest hspec transformers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion tokyotyrant-haskell
+       ];
        homepage = "https://github.com/notogawa/monarch";
        description = "Monadic interface for TokyoTyrant";
        license = stdenv.lib.licenses.bsd3;
@@ -134839,6 +136664,8 @@ self: {
        pname = "mwc-probability";
        version = "1.3.0";
        sha256 = "0vqzzsifar0q33ar1583c0g7250bi8fwpjpiwdq7gsigz8isd6qg";
+       revision = "1";
+       editedCabalFile = "1b1w504ycphpkcq279bjr2m1laxmv7xzhrbqaf6ayym265f75mnb";
        libraryHaskellDepends = [ base mwc-random primitive transformers ];
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
@@ -134846,7 +136673,10 @@ self: {
      }) {};
 
   "mwc-random" = callPackage
-    ({ mkDerivation, base, math-functions, primitive, time, vector }:
+    ({ mkDerivation, base, HUnit, math-functions, primitive, QuickCheck
+     , statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, time, vector
+     }:
      mkDerivation {
        pname = "mwc-random";
        version = "0.13.6.0";
@@ -134854,6 +136684,10 @@ self: {
        libraryHaskellDepends = [
          base math-functions primitive time vector
        ];
+       testHaskellDepends = [
+         base HUnit QuickCheck statistics test-framework
+         test-framework-hunit test-framework-quickcheck2 vector
+       ];
        doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
@@ -135660,14 +137494,14 @@ self: {
      }) {};
 
   "naqsha" = callPackage
-    ({ mkDerivation, base, data-default, groups, hspec, HUnit
-     , QuickCheck, vector
+    ({ mkDerivation, base, bytestring, groups, hspec, HUnit, QuickCheck
+     , vector
      }:
      mkDerivation {
        pname = "naqsha";
-       version = "0.1.0.0";
-       sha256 = "11n8vbpngwxj41vbvlp731anc5pzsbjc05czvpprvld8yxdx4vmf";
-       libraryHaskellDepends = [ base data-default groups vector ];
+       version = "0.2.0.1";
+       sha256 = "154wydlz7y6mic4d1670dwn9g1c7z92v6bydll0shn6z05324ha9";
+       libraryHaskellDepends = [ base bytestring groups vector ];
        testHaskellDepends = [ base groups hspec HUnit QuickCheck ];
        homepage = "http://github.com/naqsha/naqsha.git";
        description = "A library for working with geospatial data types";
@@ -136073,6 +137907,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "neko-obfs" = callPackage
+    ({ mkDerivation, async, attoparsec, base, binary, bytestring, lens
+     , network, network-simple, optparse-generic, pipes
+     , pipes-attoparsec, pipes-network, pipes-safe, random, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "neko-obfs";
+       version = "0.1.0.1";
+       sha256 = "1fv15fsdhy3crny3w7k944fsnpjv3vhkdvnj9s1dj64a1pnysi0b";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base binary bytestring lens network network-simple
+         optparse-generic pipes pipes-attoparsec pipes-network pipes-safe
+         random text transformers
+       ];
+       homepage = "http://github.com/nfjinjing/neko-obfs";
+       description = "a TCP tunnel with packet length obfuscation";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "nemesis" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, Glob, lens
      , mtl, process, time
@@ -136188,7 +138044,7 @@ self: {
      , pred-trie, regex-compat, semigroups, tasty, tasty-hspec, text
      , transformers, tries, unordered-containers
      , wai-middleware-content-type, wai-middleware-verbs
-     , wai-transformers
+     , wai-transformers, warp
      }:
      mkDerivation {
        pname = "nested-routes";
@@ -136202,6 +138058,13 @@ self: {
          semigroups text transformers tries unordered-containers
          wai-middleware-content-type wai-middleware-verbs wai-transformers
        ];
+       executableHaskellDepends = [
+         attoparsec base bytestring composition-extra errors exceptions
+         hashable hashtables HSet http-types mtl poly-arity pred-set
+         pred-trie regex-compat semigroups text transformers tries
+         unordered-containers wai-middleware-content-type
+         wai-middleware-verbs wai-transformers warp
+       ];
        testHaskellDepends = [
          attoparsec base bytestring composition-extra errors exceptions
          hashable hashtables HSet hspec hspec-wai http-types mtl poly-arity
@@ -136686,7 +138549,7 @@ self: {
      }) {};
 
   "network-address" = callPackage
-    ({ mkDerivation, base, Cabal, QuickCheck, test-framework
+    ({ mkDerivation, base, Cabal, criterion, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -136696,6 +138559,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal criterion ];
        testHaskellDepends = [
          base Cabal QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -136874,6 +138738,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-carbon_1_0_10" = callPackage
+    ({ mkDerivation, base, bytestring, network, text, time, vector }:
+     mkDerivation {
+       pname = "network-carbon";
+       version = "1.0.10";
+       sha256 = "0fl6dxsarfrj0da3a1ajzisrnrgcjfwpag1997b0byvvkw47kspc";
+       libraryHaskellDepends = [
+         base bytestring network text time vector
+       ];
+       homepage = "http://github.com/ocharles/network-carbon";
+       description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-conduit" = callPackage
     ({ mkDerivation, base, conduit }:
      mkDerivation {
@@ -137235,7 +139114,9 @@ self: {
      }) {};
 
   "network-service" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, network }:
+    ({ mkDerivation, base, base64-bytestring, bytestring, network
+     , network-simple
+     }:
      mkDerivation {
        pname = "network-service";
        version = "0.1.0.0";
@@ -137245,6 +139126,9 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring bytestring network
        ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring network network-simple
+       ];
        homepage = "https://github.com/angerman/network-service";
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
@@ -137372,14 +139256,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "network-transport_0_5_1" = callPackage
+  "network-transport_0_5_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, hashable
      , transformers
      }:
      mkDerivation {
        pname = "network-transport";
-       version = "0.5.1";
-       sha256 = "0ilbiksf1g4bg5h9ppd0a5z5a05miv850dyxayk916gjywqfgxi9";
+       version = "0.5.2";
+       sha256 = "0m4hixari440lymj43l9q4485gz6i9a768g7mnzwfynn8cmng5g7";
        libraryHaskellDepends = [
          base binary bytestring deepseq hashable transformers
        ];
@@ -137488,9 +139372,10 @@ self: {
 
   "network-transport-zeromq" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, containers
-     , criterion, data-accessor, distributed-process, exceptions
-     , network-transport, network-transport-tests, random, semigroups
-     , stm, stm-chans, tasty, tasty-hunit, transformers, zeromq4-haskell
+     , criterion, data-accessor, distributed-process
+     , distributed-process-tests, exceptions, network, network-transport
+     , network-transport-tests, random, semigroups, stm, stm-chans
+     , tasty, tasty-hunit, test-framework, transformers, zeromq4-haskell
      }:
      mkDerivation {
        pname = "network-transport-zeromq";
@@ -137503,9 +139388,13 @@ self: {
          network-transport random semigroups stm stm-chans transformers
          zeromq4-haskell
        ];
+       executableHaskellDepends = [
+         base binary bytestring criterion distributed-process
+       ];
        testHaskellDepends = [
-         base network-transport network-transport-tests tasty tasty-hunit
-         zeromq4-haskell
+         base bytestring containers distributed-process-tests network
+         network-transport network-transport-tests stm stm-chans tasty
+         tasty-hunit test-framework zeromq4-haskell
        ];
        benchmarkHaskellDepends = [
          base binary bytestring criterion distributed-process
@@ -137728,8 +139617,9 @@ self: {
 
   "newt" = callPackage
     ({ mkDerivation, array, base, bytestring, cmdargs, containers
-     , directory, filemanip, filepath, mtl, process, safe, text
-     , Unixutils
+     , directory, filemanip, filepath, HUnit, mtl, process, QuickCheck
+     , safe, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, Unixutils, uuid
      }:
      mkDerivation {
        pname = "newt";
@@ -137741,7 +139631,11 @@ self: {
          array base bytestring cmdargs containers directory filemanip
          filepath mtl process safe text Unixutils
        ];
-       executableHaskellDepends = [ base cmdargs containers mtl ];
+       executableHaskellDepends = [
+         base cmdargs containers directory filepath HUnit mtl process
+         QuickCheck safe test-framework test-framework-hunit
+         test-framework-quickcheck2 Unixutils uuid
+       ];
        description = "A trivially simple app to create things from simple templates";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137855,7 +139749,7 @@ self: {
      }) {};
 
   "nfc" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, nfc }:
+    ({ mkDerivation, base, base16-bytestring, bytestring, c2hs, nfc }:
      mkDerivation {
        pname = "nfc";
        version = "0.0.1";
@@ -137865,6 +139759,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nfc ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base base16-bytestring bytestring ];
        homepage = "https://github.com/centromere/nfc#readme";
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
@@ -137872,7 +139767,7 @@ self: {
      }) {nfc = null;};
 
   "nfc_0_1_0" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, nfc }:
+    ({ mkDerivation, base, base16-bytestring, bytestring, c2hs, nfc }:
      mkDerivation {
        pname = "nfc";
        version = "0.1.0";
@@ -137882,6 +139777,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nfc ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base base16-bytestring bytestring ];
        homepage = "https://github.com/centromere/nfc#readme";
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
@@ -138342,6 +140238,7 @@ self: {
        homepage = "https://github.com/mrkgnao/noether#readme";
        description = "Math in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nofib-analyse" = callPackage
@@ -138652,7 +140549,7 @@ self: {
      }) {};
 
   "nonlinear-optimization-ad" = callPackage
-    ({ mkDerivation, ad, base, nonlinear-optimization, primitive
+    ({ mkDerivation, ad, base, csv, nonlinear-optimization, primitive
      , reflection, vector
      }:
      mkDerivation {
@@ -138664,6 +140561,7 @@ self: {
        libraryHaskellDepends = [
          ad base nonlinear-optimization primitive reflection vector
        ];
+       executableHaskellDepends = [ base csv ];
        homepage = "https://github.com/msakai/nonlinear-optimization-ad";
        description = "Wrapper of nonlinear-optimization package for using with AD package";
        license = stdenv.lib.licenses.gpl3;
@@ -139215,6 +141113,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "numeric-ode" = callPackage
+    ({ mkDerivation, ad, base, Chart, Chart-cairo, colour
+     , data-accessor, data-default-class, diagrams-cairo, diagrams-lib
+     , diagrams-rasterific, foldl, JuicyPixels, lens, linear, mtl
+     , mwc-probability, mwc-random, numhask, parallel, parsec, plots
+     , primitive, protolude, reflection, tdigest, template-haskell, text
+     , vector, vector-space
+     }:
+     mkDerivation {
+       pname = "numeric-ode";
+       version = "0.0.0.0";
+       sha256 = "04296pcakc7nb2ydc84cq2vy1x7frqfdxc17slda1p325n8b4map";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ad base foldl lens linear mwc-probability mwc-random numhask
+         parallel parsec primitive protolude reflection tdigest
+         template-haskell text vector
+       ];
+       executableHaskellDepends = [
+         base Chart Chart-cairo colour data-accessor data-default-class
+         diagrams-cairo diagrams-lib diagrams-rasterific JuicyPixels linear
+         mtl plots vector vector-space
+       ];
+       homepage = "https://github.com/qnikst/numeric-ode";
+       description = "Ode solvers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "numeric-prelude" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, non-negative
      , parsec, QuickCheck, random, storable-record, utility-ht
@@ -139310,21 +141238,17 @@ self: {
      }) {};
 
   "numhask" = callPackage
-    ({ mkDerivation, adjunctions, base, distributive, doctest, HUnit
-     , protolude, QuickCheck, singletons, tasty, tasty-hunit
-     , tasty-quickcheck, vector
+    ({ mkDerivation, adjunctions, base, distributive, doctest
+     , protolude, QuickCheck, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "numhask";
-       version = "0.0.4";
-       sha256 = "0iyjx8yrbsalycy4qf13jm3q1gn1kpmk0l2r0j38zv2gr199p7df";
+       version = "0.0.8";
+       sha256 = "1mgknk4ilpk216hxclc3zc2gcrk2c9si52r77s6ijhkx398j2v11";
        libraryHaskellDepends = [
-         adjunctions base distributive protolude QuickCheck singletons
-         vector
-       ];
-       testHaskellDepends = [
-         base doctest HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+         adjunctions base distributive protolude QuickCheck vector
        ];
+       testHaskellDepends = [ base doctest tasty tasty-quickcheck ];
        homepage = "https://github.com/tonyday567/numhask";
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
@@ -139332,22 +141256,18 @@ self: {
      }) {};
 
   "numhask-range" = callPackage
-    ({ mkDerivation, base, containers, foldl, formatting, HUnit, lens
-     , linear, numhask, protolude, QuickCheck, smallcheck, tasty
-     , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+    ({ mkDerivation, base, containers, foldl, formatting, lens, linear
+     , numhask, protolude, QuickCheck, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.0.3";
-       sha256 = "0na22wnyhs30h2h6nfkpgfzxpbcan597l1gg9mayi3g41148cxvj";
+       version = "0.0.4";
+       sha256 = "06crxqgsryw7iixjm0rcsq49xgzirx6qm74iw6bx85a48f1snzqx";
        libraryHaskellDepends = [
          base containers foldl formatting lens linear numhask protolude
          QuickCheck
        ];
-       testHaskellDepends = [
-         base HUnit numhask protolude QuickCheck smallcheck tasty
-         tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck
-       ];
+       testHaskellDepends = [ base numhask tasty tasty-quickcheck ];
        homepage = "https://github.com/tonyday567/numhask-range";
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
@@ -139708,7 +141628,8 @@ self: {
 
   "oberon0" = callPackage
     ({ mkDerivation, array, AspectAG, base, containers, ghc-prim, HList
-     , mtl, murder, template-haskell, transformers, uu-parsinglib, uulib
+     , language-c, mtl, murder, template-haskell, transformers
+     , uu-parsinglib, uulib
      }:
      mkDerivation {
        pname = "oberon0";
@@ -139720,6 +141641,10 @@ self: {
          array AspectAG base containers ghc-prim HList mtl murder
          template-haskell transformers uu-parsinglib uulib
        ];
+       executableHaskellDepends = [
+         AspectAG base containers HList language-c murder uu-parsinglib
+         uulib
+       ];
        doHaddock = false;
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "Oberon0 Compiler";
@@ -140362,6 +142287,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "online" = callPackage
+    ({ mkDerivation, base, foldl, numhask, protolude, tdigest, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "online";
+       version = "0.2.0";
+       sha256 = "13vg34h09ds49r5j6dg8kqh90iqhbadr6jv57y0766h1pmr5i8kh";
+       libraryHaskellDepends = [
+         base foldl numhask protolude tdigest vector vector-algorithms
+       ];
+       homepage = "https://github.com/tonyday567/online";
+       description = "online statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "only" = callPackage
     ({ mkDerivation, base, parsec, regex-compat }:
      mkDerivation {
@@ -141752,6 +143694,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optparse-version" = callPackage
+    ({ mkDerivation, base, optparse-applicative }:
+     mkDerivation {
+       pname = "optparse-version";
+       version = "0.3.0.0";
+       sha256 = "08mv8ah4g5xs91245gpgh6r0mgdz6rk7ykk1ywr8gfwn3dx1zm7x";
+       libraryHaskellDepends = [ base optparse-applicative ];
+       homepage = "https://github.com/shmish111/optparse-version";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "orc" = callPackage
     ({ mkDerivation, base, deepseq, monadIO, mtl, process, random, stm
      }:
@@ -142070,6 +144023,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "orizentic" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec, jwt
+     , mtl, optparse-applicative, random, text, time, uuid
+     }:
+     mkDerivation {
+       pname = "orizentic";
+       version = "0.1.0.0";
+       sha256 = "0dyq7n1zxhz23l3jxbryrsvpqrb6yjnc30zph6ik1r0k6nfm2931";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers jwt mtl random text time uuid
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring jwt mtl optparse-applicative text time
+       ];
+       testHaskellDepends = [ base hspec jwt mtl time ];
+       homepage = "https://github.com/luminescent-dreams/orizentic#readme";
+       description = "Token-based authentication and authorization";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "os-release" = callPackage
     ({ mkDerivation, base, containers, hlint, hspec, parsec, process
      , regex-compat, temporary, transformers
@@ -142384,6 +144359,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "packdeps_0_4_4" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
+     , filepath, optparse-applicative, process, semigroups, split, tar
+     , text, time
+     }:
+     mkDerivation {
+       pname = "packdeps";
+       version = "0.4.4";
+       sha256 = "0zlbcbid9q1fyl9gqr2h3z1bmdip1xzxr14q6kgwgdjw785x9a2l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory filepath split tar text
+         time
+       ];
+       executableHaskellDepends = [
+         base Cabal containers optparse-applicative process semigroups
+       ];
+       homepage = "http://packdeps.haskellers.com/";
+       description = "Check your cabal packages for lagging dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "packed-dawg" = callPackage
     ({ mkDerivation, base, binary, criterion, deepseq, HUnit, mtl
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -142770,8 +144769,9 @@ self: {
          xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath mtl pandoc pandoc-types process syb temporary text vector
+         yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath mtl pandoc pandoc-types
@@ -142803,8 +144803,9 @@ self: {
          xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath mtl pandoc pandoc-types process syb temporary text vector
+         yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath mtl pandoc pandoc-types
@@ -143616,8 +145617,8 @@ self: {
      }:
      mkDerivation {
        pname = "papillon";
-       version = "0.1.0.3";
-       sha256 = "1y9xcy5fz28c08kv6y8qc52bzlpzyipf6dy2ij81xjsl22s7fwc2";
+       version = "0.1.0.4";
+       sha256 = "0g2kanpy8jqi6kmhwk0xy5bjpafnc21cgzp49xxw5zgmpn14amis";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143870,12 +145871,13 @@ self: {
      }) {};
 
   "parconc-examples" = callPackage
-    ({ mkDerivation, abstract-par, accelerate, array, async, base
-     , binary, bytestring, containers, deepseq, directory
+    ({ mkDerivation, abstract-par, accelerate, accelerate-io, array
+     , async, base, binary, bytestring, containers, deepseq, directory
      , distributed-process, distributed-process-simplelocalnet
-     , distributed-static, filepath, http-conduit, monad-par, network
-     , network-uri, normaldistribution, parallel, random, repa, stm
-     , template-haskell, time, transformers, utf8-string, vector, xml
+     , distributed-static, fclabels, filepath, http-conduit, monad-par
+     , network, network-uri, normaldistribution, parallel, random, repa
+     , stm, template-haskell, time, transformers, utf8-string, vector
+     , xml
      }:
      mkDerivation {
        pname = "parconc-examples";
@@ -143884,12 +145886,12 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         abstract-par accelerate array async base binary bytestring
-         containers deepseq directory distributed-process
-         distributed-process-simplelocalnet distributed-static filepath
-         http-conduit monad-par network network-uri normaldistribution
-         parallel random repa stm template-haskell time transformers
-         utf8-string vector xml
+         abstract-par accelerate accelerate-io array async base binary
+         bytestring containers deepseq directory distributed-process
+         distributed-process-simplelocalnet distributed-static fclabels
+         filepath http-conduit monad-par network network-uri
+         normaldistribution parallel random repa stm template-haskell time
+         transformers utf8-string vector xml
        ];
        homepage = "http://github.com/simonmar/parconc-examples";
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
@@ -145381,8 +147383,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdfname";
-       version = "0.1.3";
-       sha256 = "0zrjz46fkrad76bwvylwv2ai9ygvrvh0mcdla26ax31w80wx5hk8";
+       version = "0.2";
+       sha256 = "18ihz3vir5py6fbkqdnh8yjvsgjwavb7g601abdihrrp2p255lpn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145391,6 +147393,7 @@ self: {
        homepage = "https://github.com/asr/pdfname#readme";
        description = "Name a PDF file using information from the pdfinfo command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdfsplit" = callPackage
@@ -145535,6 +147538,7 @@ self: {
          base hashtables haskell-src-meta ListLike monad-control mtl
          template-haskell
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://tanakh.github.com/Peggy";
        description = "The Parser Generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -145680,6 +147684,7 @@ self: {
        homepage = "http://penrose.ink";
        description = "A system that automatically visualize mathematics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peparser" = callPackage
@@ -145755,6 +147760,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "perf" = callPackage
+    ({ mkDerivation, base, chart-unit, containers, foldl, formatting
+     , mwc-probability, optparse-generic, protolude, rdtsc, tdigest
+     , text, time, vector
+     }:
+     mkDerivation {
+       pname = "perf";
+       version = "0.1.2";
+       sha256 = "0ym5dy1zxbiaxf0jpwsf9ivf90lf5zhxznwvf4xynqvqkw602cmz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers foldl protolude rdtsc tdigest time
+       ];
+       executableHaskellDepends = [
+         base chart-unit foldl formatting mwc-probability optparse-generic
+         protolude tdigest text vector
+       ];
+       homepage = "https://github.com/tonyday567/perf";
+       description = "low-level performance statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "perfecthash" = callPackage
     ({ mkDerivation, array, base, bytestring, cmph, containers
      , criterion, deepseq, hspec, QuickCheck, random, time
@@ -145893,14 +147922,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistable-record_0_5_0_2" = callPackage
+  "persistable-record_0_5_1_1" = callPackage
     ({ mkDerivation, array, base, containers, dlist, names-th
      , quickcheck-simple, template-haskell, th-data-compat, transformers
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.5.0.2";
-       sha256 = "125zx0c1jccbb62azx5z36gr27fa8rxr5ydnq5w1wyqi0w4kxg02";
+       version = "0.5.1.1";
+       sha256 = "0n0ycgssq9aslbb024a59c3hgxbgwmd7cz8hz03ac07xdl7z9sc0";
        libraryHaskellDepends = [
          array base containers dlist names-th template-haskell
          th-data-compat transformers
@@ -146386,6 +148415,7 @@ self: {
          monad-logger old-locale persistent resource-pool resourcet text
          time transformers unordered-containers
        ];
+       executableHaskellDepends = [ base monad-logger ];
        testHaskellDepends = [
          base hspec persistent persistent-template temporary text time
          transformers
@@ -146641,6 +148671,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pg-recorder" = callPackage
+    ({ mkDerivation, base, bytestring, contravariant, either, hasql
+     , hasql-pool, hspec, optparse-applicative, optparse-text
+     , postgresql-libpq, protolude, resource-pool, stringsearch, text
+     }:
+     mkDerivation {
+       pname = "pg-recorder";
+       version = "0.2.0.0";
+       sha256 = "1584c355alhwar346ag7pd5q0vrpl40fiqj66fbildamiqchjmvd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring contravariant either hasql hasql-pool
+         optparse-applicative optparse-text postgresql-libpq protolude
+         resource-pool stringsearch text
+       ];
+       executableHaskellDepends = [ base protolude ];
+       testHaskellDepends = [
+         base hasql hasql-pool hspec postgresql-libpq protolude
+         resource-pool
+       ];
+       homepage = "https://github.com/githubuser/pg-recorder#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pg-store" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , hashable, haskell-src-meta, mtl, postgresql-libpq, QuickCheck
@@ -148474,6 +150531,9 @@ self: {
        libraryHaskellDepends = [
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
+       executableHaskellDepends = [
+         base bytestring pipes pipes-safe semigroups zeromq4-haskell
+       ];
        homepage = "https://github.com/peddie/pipes-zeromq4";
        description = "Pipes integration for ZeroMQ messaging";
        license = stdenv.lib.licenses.bsd3;
@@ -148779,6 +150839,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "platinum-parsing" = callPackage
+    ({ mkDerivation, base, binary, clock, containers, data-hash
+     , directory, fgl, hspec, HStringTemplate, mtl, optparse-applicative
+     , parsec, text, vector, yaml
+     }:
+     mkDerivation {
+       pname = "platinum-parsing";
+       version = "0.1.0.0";
+       sha256 = "1xngg7w238ngfwj2sz8rgkjnbhlqiz3lqnl6k3akfn9s6cdgk82y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary containers fgl HStringTemplate mtl parsec text vector
+       ];
+       executableHaskellDepends = [
+         base binary clock containers data-hash directory fgl mtl
+         optparse-applicative text vector yaml
+       ];
+       testHaskellDepends = [ base containers fgl hspec vector ];
+       homepage = "https://github.com/chlablak/platinum-parsing";
+       description = "General Framework for compiler development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "playlists" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, filepath
      , hspec, optparse-applicative, text, word8
@@ -148975,16 +151060,16 @@ self: {
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.2.1";
-       sha256 = "1zpmmwqvpf6xba6pc7b884glwg3f23hc64srjshmaaa4dv3fjf21";
+       version = "0.2.4";
+       sha256 = "0zwp8n9xx1ljh65as4s6lqj4a3nrz3hfg53x8zcba96ic9jkadn0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base blaze-svg colour palette scientific text time
+         attoparsec base blaze-svg colour palette scientific text time
        ];
        executableHaskellDepends = [
-         attoparsec attoparsec-time base blaze-svg colour scientific text
-         time
+         attoparsec attoparsec-time base blaze-svg colour palette scientific
+         text time
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/ocramz/plot-light";
@@ -149464,6 +151549,7 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) poker-eval;};
 
   "pokitdok" = callPackage
@@ -150681,27 +152767,18 @@ self: {
      }) {};
 
   "postgresql-simple-queue" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-ses, async, base
-     , bytestring, data-default, exceptions, hspec, hspec-discover
-     , hspec-expectations-lifted, hspec-pg-transact, lens, lifted-async
-     , lifted-base, monad-control, optparse-generic, pg-transact
-     , postgresql-simple, postgresql-simple-opts, random, resource-pool
-     , text, time, transformers, uuid
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
+     , hspec-discover, hspec-expectations-lifted, hspec-pg-transact
+     , monad-control, pg-transact, postgresql-simple, random, text, time
+     , transformers
      }:
      mkDerivation {
        pname = "postgresql-simple-queue";
-       version = "0.1.0.1";
-       sha256 = "1rwfv4ii4bdxq4ikvjrjrwbn9csr5q4qmmi7d5r0656a4qi9syh9";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.5.0.1";
+       sha256 = "0nzl7yknva09gwrmnvk4swlkgdksbcxw83bk4cacnmm2n42y3h8a";
        libraryHaskellDepends = [
-         aeson base bytestring data-default exceptions lifted-async
-         lifted-base monad-control optparse-generic pg-transact
-         postgresql-simple postgresql-simple-opts random resource-pool text
-         time transformers uuid
-       ];
-       executableHaskellDepends = [
-         aeson amazonka amazonka-ses base lens lifted-base text
+         aeson base bytestring exceptions monad-control pg-transact
+         postgresql-simple random text time transformers
        ];
        testHaskellDepends = [
          aeson async base bytestring hspec hspec-discover
@@ -150889,20 +152966,22 @@ self: {
      , base64-bytestring, bytestring, configurator, containers, either
      , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json
      , http-types, jwt, lens, lens-aeson, optparse-applicative
-     , postgresql-libpq, protolude, retry, stm, stm-containers, text
-     , time, transformers, unix, unordered-containers, wai
-     , wai-app-static, wai-extra, wai-websockets, warp, websockets
+     , postgresql-libpq, protolude, retry, stm, stm-containers
+     , stringsearch, text, time, transformers, unix
+     , unordered-containers, wai, wai-app-static, wai-extra
+     , wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "postgrest-ws";
-       version = "0.3.2.0";
-       sha256 = "04jj51fhssw4fa050qa8pk559m38kc8mharswidxph52vi6jv051";
+       version = "0.3.3.0";
+       sha256 = "0w1hgn0lg6p3zc5n43d2wqr18kwvbvvhp8al3ggf3jjx04sn3sih";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring either hasql hasql-pool http-types jwt lens
-         lens-aeson postgresql-libpq protolude retry stm stm-containers text
-         time unordered-containers wai wai-websockets websockets
+         lens-aeson postgresql-libpq protolude retry stm stm-containers
+         stringsearch text time unordered-containers wai wai-websockets
+         websockets
        ];
        executableHaskellDepends = [
          ansi-wl-pprint auto-update base base64-bytestring bytestring
@@ -150921,8 +153000,8 @@ self: {
 
   "postie" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cprng-aes
-     , data-default-class, mtl, network, pipes, pipes-parse
-     , stringsearch, tls, transformers, uuid
+     , data-default-class, mtl, network, pipes, pipes-bytestring
+     , pipes-parse, stringsearch, tls, transformers, uuid
      }:
      mkDerivation {
        pname = "postie";
@@ -150934,6 +153013,9 @@ self: {
          attoparsec base bytestring cprng-aes data-default-class mtl network
          pipes pipes-parse stringsearch tls transformers uuid
        ];
+       executableHaskellDepends = [
+         base bytestring data-default-class pipes pipes-bytestring tls
+       ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150953,6 +153035,7 @@ self: {
          aeson attoparsec base bytestring containers http-client-tls
          http-types network-api-support text
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "https://github.com/apiengine/postmark";
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
@@ -151180,12 +153263,13 @@ self: {
      }) {};
 
   "pqc" = callPackage
-    ({ mkDerivation, base, QuickCheck, random, stm }:
+    ({ mkDerivation, base, ChasingBottoms, QuickCheck, random, stm }:
      mkDerivation {
        pname = "pqc";
        version = "0.8";
        sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4";
        libraryHaskellDepends = [ base QuickCheck random stm ];
+       testHaskellDepends = [ base ChasingBottoms ];
        homepage = "http://hub.darcs.net/shelarcy/pqc";
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -151454,9 +153538,10 @@ self: {
      }) {};
 
   "prefork" = callPackage
-    ({ mkDerivation, base, cab, containers, data-default, directory
-     , filepath, hspec, process, stm, system-argv0, system-filepath
-     , unix
+    ({ mkDerivation, async, base, blaze-builder, bytestring, cab
+     , cmdargs, containers, data-default, directory, filepath, hspec
+     , http-types, network, process, stm, system-argv0, system-filepath
+     , unix, wai, warp
      }:
      mkDerivation {
        pname = "prefork";
@@ -151468,6 +153553,10 @@ self: {
          base containers data-default process stm system-argv0
          system-filepath unix
        ];
+       executableHaskellDepends = [
+         async base blaze-builder bytestring cmdargs containers http-types
+         network stm unix wai warp
+       ];
        testHaskellDepends = [
          base cab containers directory filepath hspec process stm unix
        ];
@@ -151852,8 +153941,8 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, criterion
-     , doctest, Glob, mtl, parsec, text, transformers
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
+     , criterion, doctest, Glob, mtl, parsec, text, transformers
      }:
      mkDerivation {
        pname = "pretty-simple";
@@ -151864,6 +153953,7 @@ self: {
        libraryHaskellDepends = [
          ansi-terminal base containers mtl parsec text transformers
        ];
+       executableHaskellDepends = [ aeson base bytestring text ];
        testHaskellDepends = [ base doctest Glob ];
        benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/cdepillabout/pretty-simple";
@@ -151932,7 +154022,8 @@ self: {
   "prettyprinter" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, criterion
      , doctest, mtl, pgp-wordlist, QuickCheck, random, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers
+     , tasty-hunit, tasty-quickcheck, template-haskell, text
+     , transformers
      }:
      mkDerivation {
        pname = "prettyprinter";
@@ -151943,6 +154034,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
+       executableHaskellDepends = [ base template-haskell text ];
        testHaskellDepends = [
          base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit
          tasty-quickcheck text
@@ -152398,14 +154490,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_6_0_0" = callPackage
+  "process_1_6_1_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.0.0";
-       sha256 = "02ysv3ygfa97w9yqr9m5ks8yg49rpjmwdx1hq8bl83cawjkwjd1m";
+       version = "1.6.1.0";
+       sha256 = "0lwaa9qfh1x8zgmq7panhsvrs1nwcc1fficcg391dxp995ga4pr4";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -152866,6 +154958,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base io-reactive ];
+       executableHaskellDepends = [ base ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152988,6 +155081,7 @@ self: {
        homepage = "https://github.com/agentm/project-m36";
        description = "Relational Algebra Engine";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "project-template" = callPackage
@@ -153270,8 +155364,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.4.0";
-       sha256 = "1rh8k1g8wpp898qh3g2k19v7qd95lv7l8vnb52dns350pgyswssx";
+       version = "4.5.2";
+       sha256 = "15bs8l7i7m4s0h3mb3cc1frq60s96qnfmmvb0blyvjk6ydsi5qrx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153368,7 +155462,7 @@ self: {
      }) {};
 
   "proteaaudio" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }:
+    ({ mkDerivation, base, bytestring, c2hs, filepath, libpulseaudio }:
      mkDerivation {
        pname = "proteaaudio";
        version = "0.7.0.1";
@@ -153378,6 +155472,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ libpulseaudio ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base bytestring filepath ];
        description = "Simple audio library for Windows, Linux, OSX";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153419,6 +155514,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-arbitrary_0_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens-family
+     , proto-lens, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-arbitrary";
+       version = "0.1.1.0";
+       sha256 = "0bqd6xfak7x5pvaa0znq57yr6a6iw2p97ssb87pcsmv34cfw0l16";
+       libraryHaskellDepends = [
+         base bytestring containers lens-family proto-lens QuickCheck text
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Arbitrary instances for proto-lens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-combinators" = callPackage
     ({ mkDerivation, base, Cabal, data-default-class, HUnit
      , lens-family, lens-family-core, proto-lens, proto-lens-protoc
@@ -154212,6 +156324,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers stm unix ];
        librarySystemDepends = [ libpulseaudio ];
+       executableHaskellDepends = [ base ];
        description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
        license = stdenv.lib.licenses.lgpl3;
      }) {inherit (pkgs) libpulseaudio;};
@@ -155480,6 +157593,7 @@ self: {
        libraryHaskellDepends = [
          ansi-terminal base readline terminal-size
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/yamadapc/haskell-questioner.git";
        description = "A package for prompting values from the command-line";
        license = stdenv.lib.licenses.mit;
@@ -155564,8 +157678,9 @@ self: {
 
   "quickbooks" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
-     , email-validate, fast-logger, http-client, http-client-tls
-     , http-types, interpolate, old-locale, text, thyme, yaml
+     , doctest, email-validate, fast-logger, http-client
+     , http-client-tls, http-types, interpolate, old-locale, text, thyme
+     , yaml
      }:
      mkDerivation {
        pname = "quickbooks";
@@ -155576,6 +157691,7 @@ self: {
          http-client http-client-tls http-types interpolate old-locale text
          thyme yaml
        ];
+       testHaskellDepends = [ base doctest ];
        description = "QuickBooks API binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155735,12 +157851,17 @@ self: {
      }) {};
 
   "quickcheck-property-monad" = callPackage
-    ({ mkDerivation, base, either, QuickCheck, transformers }:
+    ({ mkDerivation, base, directory, doctest, either, filepath
+     , QuickCheck, transformers
+     }:
      mkDerivation {
        pname = "quickcheck-property-monad";
        version = "0.2.4";
        sha256 = "0sp7592jfh6i8xsykl2lv8bspnp755fnpqvqa09dhwq6hm0r1r9c";
        libraryHaskellDepends = [ base either QuickCheck transformers ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "http://github.com/bennofs/quickcheck-property-monad/";
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
        license = stdenv.lib.licenses.bsd3;
@@ -155960,7 +158081,8 @@ self: {
      }) {};
 
   "quickpull" = callPackage
-    ({ mkDerivation, base, directory, filepath, QuickCheck }:
+    ({ mkDerivation, barecheck, base, directory, filepath, QuickCheck
+     }:
      mkDerivation {
        pname = "quickpull";
        version = "0.4.2.2";
@@ -155968,7 +158090,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath QuickCheck ];
-       executableHaskellDepends = [ base directory filepath QuickCheck ];
+       executableHaskellDepends = [
+         barecheck base directory filepath QuickCheck
+       ];
        testHaskellDepends = [ base directory filepath QuickCheck ];
        homepage = "http://www.github.com/massysett/quickpull";
        description = "Generate Main module with QuickCheck tests";
@@ -157498,6 +159622,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_3_4" = 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.4";
+       sha256 = "1j589qm8711h2ycy19s7i25sx217v5y5c1h4ks6x4dkpzk33c1hm";
+       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
@@ -157564,23 +159708,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rattletrap_2_5_0" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
-     , binary-bits, bytestring, containers, data-binary-ieee754
-     , filepath, hspec, template-haskell, temporary, text, vector
+  "rattletrap_2_5_2" = callPackage
+    ({ mkDerivation, aeson, base, bimap, binary, binary-bits
+     , bytestring, containers, data-binary-ieee754, filepath, hspec
+     , template-haskell, temporary, text, vector
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.5.0";
-       sha256 = "14ksxmwy53xpa9k5swz8254x3kgswkb91r7fnkx85pph5x09qwxd";
+       version = "2.5.2";
+       sha256 = "13l4gx7l0qniyny5llniwmymk8kbi7lak1gq68hyx9wnmjhbw585";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-casing base bimap binary binary-bits bytestring
-         containers data-binary-ieee754 template-haskell text vector
+         aeson base bimap binary binary-bits bytestring containers
+         data-binary-ieee754 template-haskell text vector
+       ];
+       executableHaskellDepends = [
+         aeson base bimap binary binary-bits bytestring containers
+         data-binary-ieee754 template-haskell text vector
+       ];
+       testHaskellDepends = [
+         aeson base bimap binary binary-bits bytestring containers
+         data-binary-ieee754 filepath hspec template-haskell temporary text
+         vector
        ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base bytestring filepath hspec temporary ];
        homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
@@ -157968,6 +160119,7 @@ self: {
          aeson base bytestring deepseq mtl template-haskell text time
          unordered-containers
        ];
+       executableHaskellDepends = [ aeson base deepseq text time ];
        homepage = "https://bitbucket.org/wuzzeb/react-flux";
        description = "A binding to React based on the Flux application architecture for GHCJS";
        license = stdenv.lib.licenses.bsd3;
@@ -159544,6 +161696,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reform-happstack_0_2_5_2" = callPackage
+    ({ mkDerivation, base, bytestring, happstack-server, mtl, random
+     , reform, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "reform-happstack";
+       version = "0.2.5.2";
+       sha256 = "0d6w500y47ghmiawlv116hqrknr1sx4k525c7arq340slzch03r6";
+       libraryHaskellDepends = [
+         base bytestring happstack-server mtl random reform text utf8-string
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Happstack support for reform";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reform-hsp" = callPackage
     ({ mkDerivation, base, hsp, hsx2hs, reform, text }:
      mkDerivation {
@@ -159565,6 +161734,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
+       executableHaskellDepends = [
+         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;
@@ -160554,7 +162726,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query_0_9_2_1" = callPackage
+  "relational-query_0_9_4_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, dlist
      , names-th, persistable-record, quickcheck-simple, sql-words
      , template-haskell, text, th-reify-compat, time, time-locale-compat
@@ -160562,8 +162734,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.9.2.1";
-       sha256 = "0sdmvbzfxbs7hk71zdn8bhbzdcw10h9apm5gn47cmiqkyiv5si5k";
+       version = "0.9.4.1";
+       sha256 = "05x6v4587qhv6a82r9kdgsg0bcpgvjfihv17iv2hn98cl2f0m2cc";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text th-reify-compat time
@@ -160598,7 +162770,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_6_2_1" = callPackage
+  "relational-query-HDBC_0_6_4_0" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
      , relational-schemas, template-haskell, th-data-compat
@@ -160606,8 +162778,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.2.1";
-       sha256 = "1slx0zh9487q77spajwibnxpc5xwcdqg6i98gzxfd1k3jfh2ylw2";
+       version = "0.6.4.0";
+       sha256 = "1mybp5nq0l4c9b4as16878c02z282ml3gxisnkrwb80y1xrgdfd2";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
@@ -160658,7 +162830,7 @@ self: {
   "relational-record-examples" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
      , persistable-record, relational-query, relational-query-HDBC
-     , relational-schemas, template-haskell
+     , relational-schemas, template-haskell, time
      }:
      mkDerivation {
        pname = "relational-record-examples";
@@ -160671,6 +162843,9 @@ self: {
          relational-query relational-query-HDBC relational-schemas
          template-haskell
        ];
+       executableHaskellDepends = [
+         base relational-query template-haskell time
+       ];
        description = "Examples of Haskell Relationa Record";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161287,6 +163462,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hsndfile repa ];
+       executableHaskellDepends = [
+         base hsndfile hsndfile-vector repa vector
+       ];
        testHaskellDepends = [
          base directory filepath hsndfile hsndfile-vector repa vector
        ];
@@ -161559,7 +163737,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "req_0_3_0" = callPackage
+  "req_0_3_1" = callPackage
     ({ 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
@@ -161568,8 +163746,8 @@ self: {
      }:
      mkDerivation {
        pname = "req";
-       version = "0.3.0";
-       sha256 = "1wmj2grzkdwhi2cksp4xzxlrb99y9wysjxzvbbfy75dz2pkkwz3m";
+       version = "0.3.1";
+       sha256 = "0qg2773h247ahicz1051zrpc6aqf6zdqyrlp8q274l3qg5q1l03a";
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
@@ -161730,15 +163908,16 @@ self: {
      }) {};
 
   "resin" = callPackage
-    ({ mkDerivation, base, ghc-prim, semigroupoids }:
+    ({ mkDerivation, base, ghc-prim, ralist, semigroupoids }:
      mkDerivation {
        pname = "resin";
-       version = "0.1.0.2";
-       sha256 = "1vhki81r2a4pbpl94zx45wr7hw950ibs6asim27pzh1nyakw9pbg";
-       libraryHaskellDepends = [ base ghc-prim semigroupoids ];
+       version = "0.2.0.2";
+       sha256 = "01cllvyxiyqd0a8kg2whwrgmhgfb4akxmb2nx88l2z8lxa5nfz2j";
+       libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
        homepage = "http://github.com/cartazio/resin";
        description = "High performance variable binders";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resistor-cube" = callPackage
@@ -162220,9 +164399,9 @@ self: {
      }) {};
 
   "rethinkdb" = callPackage
-    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
-     , bytestring, containers, criterion, data-default, doctest, mtl
-     , network, scientific, text, time, unordered-containers
+    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
+     , binary, bytestring, containers, criterion, data-default, doctest
+     , mtl, network, scientific, text, time, unordered-containers
      , utf8-string, vector
      }:
      mkDerivation {
@@ -162236,6 +164415,7 @@ self: {
          data-default mtl network scientific text time unordered-containers
          utf8-string vector
        ];
+       executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ aeson async base criterion text ];
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
@@ -162536,6 +164716,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
+       executableHaskellDepends = [ base bytestring containers ];
        description = "Simple unicode collation as per RFC5051";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164398,6 +166579,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec text ];
+       executableHaskellDepends = [ base containers parsec text ];
        testHaskellDepends = [ base parsec QuickCheck text ];
        homepage = "https://github.com/aisamanra/s-cargot";
        description = "A flexible, extensible s-expression library";
@@ -164586,8 +166768,8 @@ self: {
      }:
      mkDerivation {
        pname = "safe-money";
-       version = "0.2";
-       sha256 = "0dhncpfhirz7l5jincav8zyixb8387k85kkjh4y17bc9cp1yca63";
+       version = "0.3";
+       sha256 = "0whd73vlkxzfr9rb9xfimxms56xzm0f1ninny16b4w6fg91ccqp5";
        libraryHaskellDepends = [
          aeson base binary cereal constraints deepseq hashable store
        ];
@@ -164596,7 +166778,7 @@ self: {
          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";
+       description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -165039,7 +167221,9 @@ self: {
      }) {};
 
   "samtools" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }:
+    ({ mkDerivation, base, bytestring, c2hs, filepath, process, seqloc
+     , vector, zlib
+     }:
      mkDerivation {
        pname = "samtools";
        version = "0.2.4.3";
@@ -165049,6 +167233,9 @@ self: {
        libraryHaskellDepends = [ base bytestring seqloc vector ];
        librarySystemDepends = [ zlib ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bytestring filepath process seqloc vector
+       ];
        executableSystemDepends = [ zlib ];
        executableToolDepends = [ c2hs ];
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
@@ -165094,7 +167281,8 @@ self: {
      }) {};
 
   "samtools-iteratee" = callPackage
-    ({ mkDerivation, base, bytestring, iteratee, samtools, transformers
+    ({ mkDerivation, base, bytestring, iteratee, monads-tf, samtools
+     , transformers
      }:
      mkDerivation {
        pname = "samtools-iteratee";
@@ -165105,6 +167293,9 @@ self: {
        libraryHaskellDepends = [
          base bytestring iteratee samtools transformers
        ];
+       executableHaskellDepends = [
+         base bytestring iteratee monads-tf samtools transformers
+       ];
        description = "Iteratee interface to SamTools library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165386,8 +167577,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.2.8";
-       sha256 = "1rldqn584zmlxa42fqqnr2idw82rmma9cfad7jl5ih5mb3hyii5g";
+       version = "2.2.9";
+       sha256 = "0cs9gdb24s7yvrhphjwlazqbmcmc5f3a7rk39svdijh31aagd5aj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165457,27 +167648,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sbv_6_1" = 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
+  "sbv_7_0" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , crackNum, data-binary-ieee754, deepseq, directory, doctest
+     , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
+     , process, QuickCheck, random, syb, tasty, tasty-golden
+     , tasty-hunit, template-haskell, time
      }:
      mkDerivation {
        pname = "sbv";
-       version = "6.1";
-       sha256 = "1a8wa2pgzd6z5bnndb6adzxcxyq1b6qlxwh8apjynqzbrhhjspn5";
-       isLibrary = true;
-       isExecutable = true;
+       version = "7.0";
+       sha256 = "1jqgzqhmcx015ja8nwpswq6akw9vrabmhhf709vfirgd9q8pgnjc";
        libraryHaskellDepends = [
-         array async base base-compat containers crackNum
-         data-binary-ieee754 deepseq directory filepath ghc mtl old-time
-         pretty process QuickCheck random syb
-       ];
-       executableHaskellDepends = [
-         base data-binary-ieee754 directory filepath HUnit process syb
+         array async base containers crackNum data-binary-ieee754 deepseq
+         directory filepath generic-deriving ghc mtl pretty process
+         QuickCheck random syb template-haskell time
        ];
        testHaskellDepends = [
-         base data-binary-ieee754 directory filepath HUnit syb
+         base bytestring data-binary-ieee754 directory doctest filepath Glob
+         hlint mtl random syb tasty tasty-golden tasty-hunit
+         template-haskell
        ];
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
@@ -165492,8 +167682,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbvPlugin";
-       version = "0.8";
-       sha256 = "17zdx09aa4ikz7fmvdljq4130bx51wbkan97sn086nqqbkgm3v3i";
+       version = "0.9";
+       sha256 = "01fxnyi3jw952v7hlmf0isp88kv99jg6jll74cz2b04c461w1fhv";
        libraryHaskellDepends = [
          base containers ghc ghc-prim mtl sbv template-haskell
        ];
@@ -165915,8 +168105,9 @@ self: {
          split syb tagsoup text time vector xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath
-         scholdoc-types syb text yaml
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath process scholdoc scholdoc-types syb temporary text vector
+         yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath process scholdoc
@@ -165930,8 +168121,8 @@ self: {
 
   "scholdoc-texmath" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, parsec, process, scholdoc-types, split, syb, temporary, text
-     , utf8-string, xml
+     , mtl, network-uri, parsec, process, scholdoc-types, split, syb
+     , temporary, text, utf8-string, xml
      }:
      mkDerivation {
        pname = "scholdoc-texmath";
@@ -165942,6 +168133,7 @@ self: {
        libraryHaskellDepends = [
          base containers mtl parsec scholdoc-types syb xml
        ];
+       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -166900,8 +169092,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-tests";
-       version = "0.1.0.2";
-       sha256 = "0a9cbmwy1i3ij0nzgzm340klds4f4b4f7aqb4q7h7sl6j096zg3h";
+       version = "0.1.1.0";
+       sha256 = "01famrx8xvfd8byikhliyrfhml91j264bnq456sxxwkmzs7gpy1n";
        libraryHaskellDepends = [
          base bytestring free mtl recursion-schemes seakale
        ];
@@ -167506,7 +169698,10 @@ self: {
      }) {};
 
   "semiring" = callPackage
-    ({ mkDerivation, base, Boolean, containers, monoids }:
+    ({ mkDerivation, base, Boolean, containers, HUnit, monoids
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "semiring";
        version = "0.3";
@@ -167514,6 +169709,10 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Boolean containers monoids ];
+       executableHaskellDepends = [
+         base Boolean containers HUnit monoids QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
@@ -167665,17 +169864,18 @@ self: {
   "sensu-run" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, http-client
      , http-types, lens, network, optparse-applicative, process
-     , temporary, text, time, unix, vector, wreq
+     , temporary, text, time, unix, unix-compat, vector, wreq
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.2.0";
-       sha256 = "066pi6smcvffs7gsl1l45r2dshkw570p6h4s4nwsp5skf6k3568r";
+       version = "0.3.0";
+       sha256 = "0p22069kvfj1fl5s26l9lvijbxzvdf58rkj3bdfrrw76l941shwm";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base bytestring filepath http-client http-types lens network
-         optparse-applicative process temporary text time unix vector wreq
+         optparse-applicative process temporary text time unix unix-compat
+         vector wreq
        ];
        homepage = "https://github.com/maoe/sensu-run#readme";
        description = "A tool to send command execution results to Sensu";
@@ -167880,7 +170080,7 @@ self: {
          attoparsec base biocore bytestring cmdtheline conduit conduit-extra
          filepath hashable iteratee lifted-base monads-tf pretty QuickCheck
          random resourcet seqloc transformers transformers-base
-         unordered-containers
+         unordered-containers vector
        ];
        testHaskellDepends = [
          attoparsec base biocore bytestring conduit conduit-extra directory
@@ -167916,6 +170116,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers ghc transformers
        ];
+       executableHaskellDepends = [ base bytestring containers ];
        homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -168620,6 +170821,8 @@ self: {
        pname = "servant-cassava";
        version = "0.9";
        sha256 = "08g1yjrfx2q79r0ldjnxr05437bg889virfy52i3s66d5h69d9q3";
+       revision = "1";
+       editedCabalFile = "04rzz2a310q4jkr94j7j7scmyvc0ms7vw285jq2dv2r9g7gwdb3s";
        libraryHaskellDepends = [
          base base-compat bytestring cassava http-media servant vector
        ];
@@ -168631,9 +170834,10 @@ self: {
 
   "servant-checked-exceptions" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
-     , hspec-wai, http-media, profunctors, servant, servant-client
-     , servant-docs, servant-server, tagged, tasty, tasty-hspec
-     , tasty-hunit, text, wai
+     , hspec-wai, http-api-data, http-client, http-media
+     , natural-transformation, optparse-applicative, profunctors
+     , servant, servant-client, servant-docs, servant-server, tagged
+     , tasty, tasty-hspec, tasty-hunit, text, wai, warp
      }:
      mkDerivation {
        pname = "servant-checked-exceptions";
@@ -168645,6 +170849,11 @@ self: {
          aeson base bytestring deepseq http-media profunctors servant
          servant-client servant-docs servant-server tagged text
        ];
+       executableHaskellDepends = [
+         aeson base http-api-data http-client natural-transformation
+         optparse-applicative servant servant-client servant-docs
+         servant-server text wai warp
+       ];
        testHaskellDepends = [
          base bytestring doctest Glob hspec-wai servant servant-server tasty
          tasty-hspec tasty-hunit wai
@@ -168766,6 +170975,10 @@ self: {
          base bytestring containers postgresql-query postgresql-simple
          servant servant-db text
        ];
+       executableHaskellDepends = [
+         base bytestring monad-logger postgresql-query servant-db time
+         transformers-base
+       ];
        testHaskellDepends = [
          base bytestring derive hspec HUnit monad-logger
          optparse-applicative postgresql-query QuickCheck
@@ -168806,7 +171019,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
-  "servant-docs_0_10_0_1" = callPackage
+  "servant-docs_0_11" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, control-monad-omega, hashable, hspec
      , http-media, http-types, lens, servant, string-conversions, text
@@ -168814,8 +171027,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.10.0.1";
-       sha256 = "1lhfvlnpgliiv84pp0gjk1kzmrd66k9dsdxf1y7mwm4mq6r7qf7k";
+       version = "0.11";
+       sha256 = "02bzp1bcvc54cx0kcnnsqqiva7rwbrn46a7gdxzqqiqrmm0a0fm0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -168885,8 +171098,9 @@ self: {
      }) {};
 
   "servant-elm" = callPackage
-    ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens
-     , servant, servant-foreign, text, wl-pprint-text
+    ({ mkDerivation, aeson, base, Diff, directory, elm-export, hspec
+     , HUnit, interpolate, lens, mockery, process, servant
+     , servant-foreign, text, wl-pprint-text
      }:
      mkDerivation {
        pname = "servant-elm";
@@ -168897,8 +171111,10 @@ self: {
        libraryHaskellDepends = [
          base elm-export lens servant servant-foreign text wl-pprint-text
        ];
+       executableHaskellDepends = [ base elm-export servant text ];
        testHaskellDepends = [
-         aeson base Diff elm-export hspec HUnit servant text
+         aeson base Diff directory elm-export hspec HUnit interpolate
+         mockery process servant text
        ];
        homepage = "http://github.com/mattjbray/servant-elm#readme";
        description = "Automatically derive Elm functions to query servant webservices";
@@ -169041,8 +171257,9 @@ self: {
      }) {};
 
   "servant-jquery" = callPackage
-    ({ mkDerivation, base, charset, hspec, hspec-expectations
-     , language-ecmascript, lens, servant, text
+    ({ mkDerivation, aeson, base, charset, filepath, hspec
+     , hspec-expectations, language-ecmascript, lens, servant
+     , servant-server, stm, text, transformers, warp
      }:
      mkDerivation {
        pname = "servant-jquery";
@@ -169051,6 +171268,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base charset lens servant text ];
+       executableHaskellDepends = [
+         aeson base filepath servant servant-server stm transformers warp
+       ];
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
@@ -169061,9 +171281,10 @@ self: {
      }) {};
 
   "servant-js" = callPackage
-    ({ mkDerivation, base, base-compat, charset, hspec
+    ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec
      , hspec-expectations, language-ecmascript, lens, QuickCheck
-     , servant, servant-foreign, text
+     , servant, servant-foreign, servant-server, stm, text, transformers
+     , warp
      }:
      mkDerivation {
        pname = "servant-js";
@@ -169076,6 +171297,10 @@ self: {
        libraryHaskellDepends = [
          base base-compat charset lens servant servant-foreign text
        ];
+       executableHaskellDepends = [
+         aeson base filepath lens servant servant-server stm transformers
+         warp
+       ];
        testHaskellDepends = [
          base base-compat hspec hspec-expectations language-ecmascript lens
          QuickCheck servant text
@@ -169189,6 +171414,8 @@ self: {
        pname = "servant-multipart";
        version = "0.10.0.1";
        sha256 = "1wba440qlcjw6h6k8qiycsfq26snfkmy0p45d51li704s4m3idcv";
+       revision = "1";
+       editedCabalFile = "1li09340kh4ak1nnqk0qxnwx2yngqwk3fj1c0824yrib29c65973";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169241,16 +171468,17 @@ self: {
      }) {};
 
   "servant-pandoc" = callPackage
-    ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types
-     , servant-docs, text, unordered-containers
+    ({ mkDerivation, base, bytestring, case-insensitive, http-media
+     , lens, pandoc-types, servant-docs, string-conversions, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "servant-pandoc";
-       version = "0.4.1.2";
-       sha256 = "0dv25j7jz2pn5ykv9jihk2qrhqqdawx19637aa76k5rv93lc5379";
+       version = "0.4.1.4";
+       sha256 = "0hsmbrn7i6zbwfw5j2l8qppnjx1cl2g0iksim514ajga6zfjm96j";
        libraryHaskellDepends = [
-         base bytestring http-media lens pandoc-types servant-docs text
-         unordered-containers
+         base bytestring case-insensitive http-media lens pandoc-types
+         servant-docs string-conversions text unordered-containers
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
@@ -169360,9 +171588,10 @@ self: {
      }) {};
 
   "servant-py" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, charset
-     , hspec, hspec-expectations, lens, QuickCheck, servant
-     , servant-foreign, text
+    ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring
+     , charset, filepath, hspec, hspec-expectations, lens, QuickCheck
+     , servant, servant-blaze, servant-foreign, servant-server, stm
+     , text, wai, warp
      }:
      mkDerivation {
        pname = "servant-py";
@@ -169373,6 +171602,10 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring charset lens servant servant-foreign text
        ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring filepath servant servant-blaze
+         servant-foreign servant-server stm text wai warp
+       ];
        testHaskellDepends = [
          aeson base base-compat bytestring hspec hspec-expectations lens
          QuickCheck servant servant-foreign text
@@ -169623,7 +171856,7 @@ self: {
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , directory, doctest, filepath, Glob, hspec-wai, http-media
      , semigroups, servant, servant-blaze, servant-server, tasty
-     , tasty-hspec, tasty-hunit, template-haskell, text, wai
+     , tasty-hspec, tasty-hunit, template-haskell, text, wai, warp
      }:
      mkDerivation {
        pname = "servant-static-th";
@@ -169636,6 +171869,7 @@ self: {
          semigroups servant servant-blaze servant-server template-haskell
          text
        ];
+       executableHaskellDepends = [ base servant-server wai warp ];
        testHaskellDepends = [
          base blaze-html bytestring directory doctest filepath Glob
          hspec-wai servant servant-blaze servant-server tasty tasty-hspec
@@ -169646,6 +171880,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-static-th_0_1_0_4" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , directory, doctest, filepath, Glob, hspec-wai, http-media
+     , semigroups, servant, servant-blaze, servant-server, tasty
+     , tasty-hspec, tasty-hunit, template-haskell, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-static-th";
+       version = "0.1.0.4";
+       sha256 = "029xm7znkqd5sh7yhrblf9marwyd29iiqnar4kaf6awllxxkk1aq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html bytestring containers directory filepath http-media
+         semigroups servant servant-blaze servant-server template-haskell
+         text
+       ];
+       executableHaskellDepends = [ base servant-server wai warp ];
+       testHaskellDepends = [
+         base blaze-html bytestring directory doctest filepath Glob
+         hspec-wai servant servant-blaze servant-server tasty tasty-hspec
+         tasty-hunit wai
+       ];
+       homepage = "https://github.com/cdepillabout/servant-static-th";
+       description = "Embed a directory of static files in your Servant server";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-subscriber" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, filepath
@@ -169780,6 +172043,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-swagger-ui_0_2_4_3_0_20" = 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.4.3.0.20";
+       sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn";
+       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 lens servant servant-server servant-swagger
+         swagger2 text transformers transformers-compat wai 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-yaml" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
      , servant, servant-server, wai, warp, yaml
@@ -170433,7 +172723,9 @@ self: {
      }) {};
 
   "sexpr" = callPackage
-    ({ mkDerivation, base, base64-string, binary, bytestring, pretty }:
+    ({ mkDerivation, base, base64-string, binary, bytestring, pretty
+     , QuickCheck, random
+     }:
      mkDerivation {
        pname = "sexpr";
        version = "0.2.1";
@@ -170443,6 +172735,7 @@ self: {
        libraryHaskellDepends = [
          base base64-string binary bytestring pretty
        ];
+       executableHaskellDepends = [ QuickCheck random ];
        description = "S-expression printer and parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171046,7 +173339,6 @@ self: {
        homepage = "https://github.com/anton-k/sharc";
        description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra.";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
      }) {};
 
   "shared-buffer" = callPackage
@@ -172355,8 +174647,8 @@ self: {
     ({ mkDerivation, base, fast-logger, mtl, text }:
      mkDerivation {
        pname = "simple-logger";
-       version = "0.0.3";
-       sha256 = "1hay2v40bnxl5liayssgsg28z835xv833smc974smxpayay05c2z";
+       version = "0.0.4";
+       sha256 = "0550in9vkgf78rxfkzcrna40mihmaqhlixysfz8n0rz0rhw0z9gk";
        libraryHaskellDepends = [ base fast-logger mtl text ];
        homepage = "https://github.com/agrafix/simple-logger#readme";
        description = "A very simple but efficient logging framework";
@@ -172385,6 +174677,7 @@ self: {
        homepage = "https://gitlab.com/haskell-hr/logging";
        description = "Logging effect to plug into the simple-effects framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-money" = callPackage
@@ -172632,6 +174925,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
+       executableHaskellDepends = [ base mtl parsec pretty ];
        testHaskellDepends = [
          base HUnit mtl parsec pretty test-framework test-framework-hunit
        ];
@@ -173224,7 +175518,8 @@ self: {
      }) {};
 
   "sized-types" = callPackage
-    ({ mkDerivation, array, base, base-compat, containers, singletons
+    ({ mkDerivation, array, base, base-compat, containers, QuickCheck
+     , singletons
      }:
      mkDerivation {
        pname = "sized-types";
@@ -173237,6 +175532,8 @@ self: {
        libraryHaskellDepends = [
          array base base-compat containers singletons
        ];
+       executableHaskellDepends = [ base base-compat ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
@@ -173397,6 +175694,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "skip-list" = callPackage
+    ({ mkDerivation, base, criterion, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "skip-list";
+       version = "0.1.0.1";
+       sha256 = "1ndcrn0w7957n1sjcsziml1mgqbr6p4zvzh3nm2m8akaswi09dxh";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/gmalecha/skip-list#readme";
+       description = "An implementation of pure skip lists";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "skulk" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
@@ -173451,6 +175762,11 @@ self: {
          aeson base blaze-html bytestring case-insensitive containers
          directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
        ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring case-insensitive containers
+         directory filepath hxt pretty-show regex-pcre-builtin safe text
+         utf8-string
+       ];
        testHaskellDepends = [
          aeson base bytestring containers Diff directory filepath HUnit
          pretty-show random tasty tasty-golden tasty-hunit text
@@ -173482,6 +175798,11 @@ self: {
          containers directory filepath hxt mtl regex-pcre-builtin safe text
          utf8-string
        ];
+       executableHaskellDepends = [
+         aeson base binary blaze-html bytestring case-insensitive containers
+         directory filepath hxt pretty-show regex-pcre-builtin safe text
+         utf8-string
+       ];
        testHaskellDepends = [
          aeson base bytestring containers Diff directory filepath HUnit
          pretty-show random tasty tasty-golden tasty-hunit text
@@ -173797,6 +176118,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "slug_0_1_7" = callPackage
+    ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data
+     , path-pieces, persistent, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "slug";
+       version = "0.1.7";
+       sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp";
+       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 {
@@ -174489,8 +176831,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-error-collector";
-       version = "1.1.3";
-       sha256 = "1dbs1pww1xsfhfbddfxwxay5s3g4j0880hza83ck46n5kfgkm1rk";
+       version = "1.1.4";
+       sha256 = "0k9nddbqdd6c12vrl5pqsl02pv38bhcxk5j02sq8lx7pk05w0mam";
        libraryHaskellDepends = [
          async base containers lifted-base monad-loops snap stm time
          transformers
@@ -174647,6 +176989,13 @@ self: {
          io-streams-haproxy lifted-base mtl network old-locale
          openssl-streams snap-core text time unix unix-compat vector
        ];
+       executableHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         case-insensitive clock containers directory HsOpenSSL io-streams
+         io-streams-haproxy lifted-base mtl network old-locale
+         openssl-streams snap-core text time transformers unix unix-compat
+         vector
+       ];
        testHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder bytestring
          bytestring-builder case-insensitive clock containers deepseq
@@ -175830,6 +178179,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "snowtify" = callPackage
+    ({ mkDerivation, base, data-default, either, safe, safe-exceptions
+     , text, turtle
+     }:
+     mkDerivation {
+       pname = "snowtify";
+       version = "0.1.0.1";
+       sha256 = "1afwffg90fi91zb3srlynqjf3mbg6nm42mww4bhyrgsjjpjgxdc6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base data-default either safe safe-exceptions text turtle
+       ];
+       homepage = "https://github.com/aiya000/hs-snowtify#README.md";
+       description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "soap" = callPackage
     ({ mkDerivation, base, bytestring, conduit, configurator
      , data-default, exceptions, hspec, http-client, http-types, HUnit
@@ -175973,8 +178340,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.7";
-       sha256 = "02pg1w4xidjw1j10f8mdiiincg0h7qm39a1dpgk51s8icwm2vndv";
+       version = "1.3.8";
+       sha256 = "08zwn8p1nkizgs8spdkdmw1xkfsz6ryviv8shnbc8mnpxfs6wl7q";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -176906,8 +179273,8 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.2.4";
-       sha256 = "050ygn51z6bziv36j4y47j9rxq5wdcyrn1b2fppsv718d51bpbvw";
+       version = "0.2.5";
+       sha256 = "1galy8k0nvnq4xavm15f6v160ili1kmiq5p2rdhqmfciadrxzxqd";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base cmdargs containers leancheck ];
        benchmarkHaskellDepends = [ base cmdargs containers leancheck ];
@@ -178014,6 +180381,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base iproute text ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit iproute QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text unix
@@ -178245,44 +180613,47 @@ self: {
      , attoparsec, base, base-compat, base64-bytestring, binary
      , binary-tagged, blaze-builder, bytestring, Cabal, clock, conduit
      , conduit-extra, containers, cryptonite, cryptonite-conduit
-     , deepseq, directory, either, errors, exceptions, extra
+     , deepseq, directory, echo, either, errors, exceptions, extra
      , fast-logger, file-embed, filelock, filepath, fsnotify
-     , generic-deriving, gitrev, hackage-security, hashable, hastache
-     , hit, hpack, hpc, hspec, http-client, http-client-tls
+     , generic-deriving, ghc-prim, gitrev, hackage-security, hashable
+     , hastache, hpack, hpc, hspec, http-client, http-client-tls
      , http-conduit, http-types, lifted-async, lifted-base, memory
-     , microlens, microlens-mtl, monad-control, monad-logger
+     , microlens, microlens-mtl, mintty, monad-control, monad-logger
      , monad-unlift, mono-traversable, mtl, neat-interpolation
      , network-uri, open-browser, optparse-applicative, optparse-simple
      , path, path-io, persistent, persistent-sqlite, persistent-template
      , pid1, pretty, process, project-template, QuickCheck
      , regex-applicative-text, resourcet, retry, safe, safe-exceptions
-     , semigroups, smallcheck, split, stm, store, streaming-commons, tar
-     , template-haskell, temporary, text, text-binary, text-metrics
-     , th-reify-many, time, tls, transformers, transformers-base
-     , unicode-transforms, unix, unix-compat, unordered-containers
-     , vector, vector-binary-instances, yaml, zip-archive, zlib
+     , semigroups, smallcheck, split, stm, store, store-core
+     , streaming-commons, tar, template-haskell, temporary, text
+     , text-binary, text-metrics, th-reify-many, time, tls, transformers
+     , transformers-base, unicode-transforms, unix, unix-compat
+     , unordered-containers, vector, vector-binary-instances, yaml
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.4.0";
-       sha256 = "1dp8377a0wy8j7v9j3qb2lbic7y3p49glq8z7vd85rm0381ny3gi";
-       revision = "4";
-       editedCabalFile = "0hs3rlgbm088fjgi28h5fay3zl1s00ljnqhgd0xafcqk2asmqq0k";
+       version = "1.5.0";
+       sha256 = "1wx3p4n28mf6g4iydnsjvm87hn43kqsmn52npmsyym54wsl2vzx9";
+       revision = "1";
+       editedCabalFile = "161v9lsi6xacbz279bhclmhn0vmv24a0badawm17rqhq4w8lh4yq";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal async attoparsec base
          base-compat base64-bytestring binary binary-tagged blaze-builder
          bytestring Cabal clock conduit conduit-extra containers cryptonite
-         cryptonite-conduit deepseq directory either errors exceptions extra
-         fast-logger file-embed filelock filepath fsnotify generic-deriving
-         hackage-security hashable hastache hit hpack hpc http-client
-         http-client-tls http-conduit http-types lifted-async lifted-base
-         memory microlens microlens-mtl monad-control monad-logger
-         monad-unlift mtl network-uri open-browser optparse-applicative path
-         path-io persistent persistent-sqlite persistent-template pid1
-         pretty process project-template regex-applicative-text resourcet
-         retry safe safe-exceptions semigroups split stm store
+         cryptonite-conduit deepseq directory echo either errors exceptions
+         extra fast-logger file-embed filelock filepath fsnotify
+         generic-deriving ghc-prim hackage-security hashable hastache hpack
+         hpc http-client http-client-tls http-conduit http-types
+         lifted-async lifted-base memory microlens microlens-mtl mintty
+         monad-control monad-logger monad-unlift mtl network-uri
+         open-browser optparse-applicative path path-io persistent
+         persistent-sqlite persistent-template pid1 pretty process
+         project-template regex-applicative-text resourcet retry safe
+         safe-exceptions semigroups split stm store store-core
          streaming-commons tar template-haskell temporary text text-binary
          text-metrics time tls transformers transformers-base
          unicode-transforms unix unix-compat unordered-containers vector
@@ -178295,12 +180666,13 @@ self: {
          path path-io split text transformers
        ];
        testHaskellDepends = [
-         attoparsec base bytestring Cabal conduit conduit-extra containers
-         cryptonite directory exceptions filepath hashable hspec
+         async attoparsec base bytestring Cabal conduit conduit-extra
+         containers cryptonite directory exceptions filepath hashable hspec
          http-client-tls http-conduit monad-logger mono-traversable
-         neat-interpolation optparse-applicative path path-io QuickCheck
-         resourcet retry smallcheck store template-haskell temporary text
-         th-reify-many transformers unordered-containers vector yaml
+         neat-interpolation optparse-applicative path path-io process
+         QuickCheck resourcet retry smallcheck store template-haskell
+         temporary text th-reify-many transformers unix-compat
+         unordered-containers vector yaml
        ];
        doCheck = false;
        preCheck = "export HOME=$TMPDIR";
@@ -178337,6 +180709,7 @@ self: {
        homepage = "https://github.com/yamadapc/stack-bump";
        description = "Dead simple version bumping for hpack packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-hpc-coveralls" = callPackage
@@ -179309,7 +181682,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base bytestring Cabal filepath hspec QuickCheck semigroups text
+         base bytestring Cabal filepath hspec http-client http-client-tls
+         QuickCheck semigroups text
        ];
        homepage = "https://github.com/debug-ito/staversion";
        description = "What version is the package X in stackage lts-Y.ZZ?";
@@ -179494,8 +181868,8 @@ self: {
 
   "stgi" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
-     , deepseq, parsers, QuickCheck, semigroups, smallcheck, tasty
-     , tasty-html, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , deepseq, doctest, parsers, QuickCheck, semigroups, smallcheck
+     , tasty, tasty-html, tasty-hunit, tasty-quickcheck, tasty-rerun
      , tasty-smallcheck, template-haskell, text, th-lift, transformers
      , trifecta
      }:
@@ -179511,8 +181885,8 @@ self: {
        ];
        executableHaskellDepends = [ ansi-terminal base semigroups text ];
        testHaskellDepends = [
-         ansi-wl-pprint base containers deepseq QuickCheck semigroups
-         smallcheck tasty tasty-html tasty-hunit tasty-quickcheck
+         ansi-wl-pprint base containers deepseq doctest QuickCheck
+         semigroups smallcheck tasty tasty-html tasty-hunit tasty-quickcheck
          tasty-rerun tasty-smallcheck template-haskell text
        ];
        homepage = "https://github.com/quchen/stgi#readme";
@@ -180053,7 +182427,9 @@ self: {
      }) {};
 
   "storablevector-streamfusion" = callPackage
-    ({ mkDerivation, base, storablevector, stream-fusion, utility-ht }:
+    ({ mkDerivation, base, binary, bytestring, old-time, storablevector
+     , stream-fusion, utility-ht
+     }:
      mkDerivation {
        pname = "storablevector-streamfusion";
        version = "0.0";
@@ -180063,65 +182439,15 @@ self: {
        libraryHaskellDepends = [
          base storablevector stream-fusion utility-ht
        ];
+       executableHaskellDepends = [
+         base binary bytestring old-time stream-fusion
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "store_0_3_1" = callPackage
-    ({ mkDerivation, array, async, base, base-orphans
-     , base64-bytestring, bytestring, cereal, cereal-vector, conduit
-     , containers, contravariant, criterion, cryptohash, deepseq
-     , directory, filepath, free, ghc-prim, hashable, hspec
-     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
-     , mono-traversable, network, primitive, resourcet, safe, semigroups
-     , smallcheck, store-core, streaming-commons, syb, template-haskell
-     , text, th-lift, th-lift-instances, th-orphans, th-reify-many
-     , th-utilities, time, transformers, unordered-containers, vector
-     , vector-binary-instances, void, weigh
-     }:
-     mkDerivation {
-       pname = "store";
-       version = "0.3.1";
-       sha256 = "146srr30sb1p1zbc2sz0m3zlrjakcm0gh5b32vjzcd3kmzmha47c";
-       libraryHaskellDepends = [
-         array async base base-orphans base64-bytestring bytestring conduit
-         containers contravariant cryptohash deepseq directory filepath free
-         ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
-         monad-control mono-traversable network primitive resourcet safe
-         semigroups smallcheck store-core streaming-commons syb
-         template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       testHaskellDepends = [
-         array async base base-orphans base64-bytestring bytestring cereal
-         cereal-vector conduit containers contravariant criterion cryptohash
-         deepseq directory filepath free ghc-prim hashable hspec
-         hspec-smallcheck integer-gmp lifted-base monad-control
-         mono-traversable network primitive resourcet safe semigroups
-         smallcheck store-core streaming-commons syb template-haskell text
-         th-lift th-lift-instances th-orphans th-reify-many th-utilities
-         time transformers unordered-containers vector
-         vector-binary-instances void weigh
-       ];
-       benchmarkHaskellDepends = [
-         array async base base-orphans base64-bytestring bytestring conduit
-         containers contravariant criterion cryptohash deepseq directory
-         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
-         lifted-base monad-control mono-traversable network primitive
-         resourcet safe semigroups smallcheck store-core streaming-commons
-         syb template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       homepage = "https://github.com/fpco/store#readme";
-       description = "Fast binary serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "store" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bytestring, cereal, cereal-vector, conduit
@@ -180175,23 +182501,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "store-core_0_3" = callPackage
-    ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "store-core";
-       version = "0.3";
-       sha256 = "11vha2c3vlv640s8anfmvvsvg81ldzx7swlqvf8hlcaacc5j74w7";
-       libraryHaskellDepends = [
-         base bytestring fail ghc-prim primitive text transformers
-       ];
-       homepage = "https://github.com/fpco/store#readme";
-       description = "Fast and lightweight binary serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "store-core" = callPackage
     ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
      , transformers
@@ -180241,6 +182550,10 @@ self: {
          aeson aeson-pretty base bytestring hashable lens template-haskell
          text unordered-containers
        ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring hashable lens template-haskell
+         text unordered-containers
+       ];
        testHaskellDepends = [
          aeson aeson-pretty base bytestring directory hashable hlint lens
          tasty tasty-hspec template-haskell text unordered-containers
@@ -180250,6 +182563,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_7_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , hashable, hlint, hspec, hspec-discover, lens, template-haskell
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.7.0";
+       sha256 = "16x19sz4wq4kd12krdk1pmavma9l69x0yq4j2q657zqvmhy1izfh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring hashable lens template-haskell
+         text unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring hashable lens template-haskell
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring directory hashable hlint hspec
+         hspec-discover lens template-haskell text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -180505,6 +182847,7 @@ self: {
        ];
        description = "Cassava support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-commons" = callPackage
@@ -180633,6 +182976,29 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "streaming-osm" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, streaming, streaming-bytestring, streaming-utils
+     , tasty, tasty-hunit, text, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "streaming-osm";
+       version = "1.0.0";
+       sha256 = "1z1wpwmsgc4viy0w3zcmf5d88nylyynb359r1p2naajg65kbb46h";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers streaming
+         streaming-bytestring streaming-utils text transformers vector zlib
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring streaming tasty tasty-hunit vector zlib
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion streaming vector zlib
+       ];
+       description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-png" = callPackage
     ({ mkDerivation, base, bytestring, cereal, exceptions, JuicyPixels
      , mmorph, mtl, resourcet, streaming, streaming-bytestring
@@ -180661,8 +183027,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-postgresql-simple";
-       version = "0.2.0.0";
-       sha256 = "15aiddyi5rykg1m47a0y725yfxv1jyl9n07x5fbp3jgk3j75h01f";
+       version = "0.2.0.1";
+       sha256 = "1ffsxwgsaxqnf49n4lnyrh2zy6q9zc1i3ssd03m08ip813pk5j8k";
        libraryHaskellDepends = [
          base bytestring exceptions postgresql-libpq postgresql-simple
          resourcet safe-exceptions streaming transformers
@@ -181461,9 +183827,9 @@ self: {
     ({ mkDerivation, array, base, bytestring, containers, contravariant
      , criterion, deepseq, directory, doctest, filepath, free, ghc
      , ghc-prim, hashable, hlint, hybrid-vectors, lens, monad-st
-     , MonadRandom, parallel, primitive, QuickCheck, semigroups, tasty
-     , tasty-quickcheck, tasty-th, transformers, unordered-containers
-     , vector, vector-algorithms
+     , MonadRandom, mwc-random, parallel, primitive, QuickCheck
+     , semigroups, tasty, tasty-quickcheck, tasty-th, transformers
+     , unordered-containers, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "structures";
@@ -181480,7 +183846,7 @@ self: {
          unordered-containers
        ];
        benchmarkHaskellDepends = [
-         array base containers criterion deepseq MonadRandom
+         array base containers criterion deepseq MonadRandom mwc-random
          unordered-containers vector
        ];
        homepage = "http://github.com/ekmett/structures";
@@ -182543,8 +184909,8 @@ self: {
      }:
      mkDerivation {
        pname = "swish";
-       version = "0.9.1.8";
-       sha256 = "1jilcrb1r94kvlwwrj59y72qmvnvnwi1cbk5i5xafw5h4y5qx3s9";
+       version = "0.9.1.9";
+       sha256 = "173qvx46als9ar63j6hqynnwnkvs12pb2qv3gbfjm8mla5i7sjym";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183164,9 +185530,10 @@ self: {
 
   "synthesizer" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , event-list, filepath, gnuplot, non-negative, numeric-prelude
-     , numeric-quest, process, QuickCheck, random, sox, storable-record
-     , storablevector, transformers, utility-ht
+     , directory, event-list, filepath, gnuplot, non-negative
+     , numeric-prelude, numeric-quest, old-time, process, QuickCheck
+     , random, sox, storable-record, storablevector, transformers
+     , utility-ht
      }:
      mkDerivation {
        pname = "synthesizer";
@@ -183179,6 +185546,7 @@ self: {
          non-negative numeric-prelude numeric-quest process QuickCheck
          random sox storable-record storablevector transformers utility-ht
        ];
+       executableHaskellDepends = [ directory old-time ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
@@ -183571,6 +185939,7 @@ self: {
        homepage = "https://github.com/erikd/system-linux-proc";
        description = "A library for accessing the /proc filesystem in Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-locale" = callPackage
@@ -183696,6 +186065,10 @@ self: {
          template-haskell
        ];
        librarySystemDepends = [ libossp_uuid ];
+       executableHaskellDepends = [
+         base binary bytestring containers murmur-hash parsec
+         template-haskell
+       ];
        executableSystemDepends = [ libossp_uuid ];
        homepage = "http://github.com/solidsnack/system-uuid/";
        description = "Bindings to system UUID functions";
@@ -184089,6 +186462,7 @@ self: {
          base bytestring containers data-accessor explicit-exception
          non-empty transformers utility-ht xml-basic
        ];
+       executableHaskellDepends = [ base xml-basic ];
        testHaskellDepends = [ base xml-basic ];
        benchmarkHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
@@ -184551,7 +186925,9 @@ self: {
      }) {};
 
   "takusen-oracle" = callPackage
-    ({ mkDerivation, base, clntsh, mtl, old-time, time }:
+    ({ mkDerivation, base, clntsh, mtl, old-time, QuickCheck, random
+     , time
+     }:
      mkDerivation {
        pname = "takusen-oracle";
        version = "0.9.4.1";
@@ -184560,6 +186936,9 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        librarySystemDepends = [ clntsh ];
+       executableHaskellDepends = [
+         base mtl old-time QuickCheck random time
+       ];
        homepage = "https://github.com/paulrzcz/takusen-oracle.git";
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
@@ -184883,6 +187262,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_0_11_2_3" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers
+     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "0.11.2.3";
+       sha256 = "0rsi8k3snw37nc196d59spmsp2xnmhbfbiqdb475qdg7a2i922k1";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers deepseq mtl
+         optparse-applicative regex-tdfa stm tagged unbounded-delays
+       ];
+       homepage = "https://github.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
@@ -185332,6 +187730,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-rerun_1_1_7" = callPackage
+    ({ mkDerivation, base, containers, mtl, optparse-applicative
+     , reducers, split, stm, tagged, tasty, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-rerun";
+       version = "1.1.7";
+       sha256 = "18hz1xqinf59mzvd68ygj9333v0a32qxfcas7crn4iniq5zv71kj";
+       libraryHaskellDepends = [
+         base containers mtl optparse-applicative reducers split stm tagged
+         tasty transformers
+       ];
+       homepage = "http://github.com/ocharles/tasty-rerun";
+       description = "Run tests by filtering the test tree depending on the result of previous test runs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-silver" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
@@ -185563,15 +187979,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tcp-streams_1_0_0_0" = callPackage
+  "tcp-streams_1_0_1_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, directory
      , HUnit, io-streams, network, pem, test-framework
      , test-framework-hunit, tls, x509, x509-store, x509-system
      }:
      mkDerivation {
        pname = "tcp-streams";
-       version = "1.0.0.0";
-       sha256 = "1f00r9650pb90zkk7mv12i9s8gapwn00krb9b6zl3wcqm4gjaizb";
+       version = "1.0.1.0";
+       sha256 = "0qa8dvlxg6r7f6qxq46xj1fq5ksbvznjqs624v57ay2nvgji5n3p";
        libraryHaskellDepends = [
          base bytestring data-default-class io-streams network pem tls x509
          x509-store x509-system
@@ -185611,15 +188027,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tcp-streams-openssl_1_0_0_0" = callPackage
+  "tcp-streams-openssl_1_0_1_0" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system
      , HUnit, io-streams, network, tcp-streams, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "tcp-streams-openssl";
-       version = "1.0.0.0";
-       sha256 = "0irgybnlzi3a34252s3y3j2y8qddpisk1vadw271mmhzmifdx7bp";
+       version = "1.0.1.0";
+       sha256 = "1zka2hmx0659f6w9xnh13i53pfwhky833ifwm63sr3rlly5miry3";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network
          tcp-streams
@@ -185716,8 +188132,8 @@ self: {
      }:
      mkDerivation {
        pname = "tdoc";
-       version = "0.4.6";
-       sha256 = "0gslj3z3lnh2wl7ljg8rza6kmmgfmgv94hgla75nblirvyka8v48";
+       version = "0.4.7";
+       sha256 = "06f9cbl123g0k9xqmy73l3x468ni120faj9slc806ncwalhjn67s";
        libraryHaskellDepends = [
          base bytestring template-haskell transformers xhtml
        ];
@@ -185952,12 +188368,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "template-haskell_2_11_1_0" = callPackage
+  "template-haskell_2_12_0_0" = callPackage
     ({ mkDerivation, base, ghc-boot-th, pretty }:
      mkDerivation {
        pname = "template-haskell";
-       version = "2.11.1.0";
-       sha256 = "171ngdd93i9prp9d5a4ix0alp30ahw2dvdk7i8in9mzscnv41csz";
+       version = "2.12.0.0";
+       sha256 = "0lbmqagknkdrj9mwqdd5p12ay78wk0g509g75a243jrbm46i6dar";
        libraryHaskellDepends = [ base ghc-boot-th pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -187088,8 +189504,8 @@ self: {
      }) {};
 
   "testbench" = callPackage
-    ({ mkDerivation, base, bytestring, cassava, criterion, deepseq
-     , dlist, HUnit, optparse-applicative, process, resourcet
+    ({ mkDerivation, base, bytestring, cassava, containers, criterion
+     , deepseq, dlist, HUnit, optparse-applicative, process, resourcet
      , statistics, streaming, streaming-bytestring, streaming-cassava
      , temporary, transformers, weigh
      }:
@@ -187104,8 +189520,12 @@ self: {
          optparse-applicative process resourcet statistics streaming
          streaming-bytestring streaming-cassava temporary transformers weigh
        ];
+       executableHaskellDepends = [
+         base bytestring containers criterion HUnit
+       ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testing-feat" = callPackage
@@ -187233,8 +189653,8 @@ self: {
 
   "texmath" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
-     , utf8-string, xml
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
@@ -187245,6 +189665,7 @@ self: {
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
+       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -189119,6 +191540,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threads_0_5_1_5" = callPackage
+    ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm
+     , test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "threads";
+       version = "0.5.1.5";
+       sha256 = "0phbspm8k2k6w66hv6ldccvy3kc4rjnspj0jwabiwklinkv7wpd1";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
+         base concurrent-extra HUnit stm test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/basvandijk/threads";
+       description = "Fork threads and wait for their result";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threads-extras" = callPackage
     ({ mkDerivation, base, stm, threads }:
      mkDerivation {
@@ -189183,6 +191623,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threefish" = callPackage
@@ -189208,8 +191649,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.3.0";
-       sha256 = "090nhbb4yzjjmbbh1n48mi5i2kkky7s4kjwvmvbgf1694yjbb5ss";
+       version = "0.4.1";
+       sha256 = "1fzipaqzhayqg581r4p02byxxxql8ydsyxpwdhvqw738a46afqxg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -189245,7 +191686,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "threepenny-gui_0_8_0_0" = callPackage
+  "threepenny-gui_0_8_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, filepath, hashable
      , network-uri, safe, snap-core, snap-server, stm, template-haskell
@@ -189254,8 +191695,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.8.0.0";
-       sha256 = "1zlkmk0jf4njfc2zk61lvxmr0cy5pzlnrv7r5admy00ha04spnx1";
+       version = "0.8.0.1";
+       sha256 = "1jg18gmm4f3aamwz9vr3h8nc3axlxf2440zf0ff6h8dlp20al7zk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190092,14 +192533,14 @@ self: {
   "time-warp" = callPackage
     ({ 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
+     , containers, data-default, data-msgpack, deepseq, directory
+     , exceptions, extra, formatting, hashable, hslogger, hspec, lens
+     , lifted-base, log-warper, mmorph, monad-control, monad-loops
+     , MonadRandom, mtl, network, optparse-simple, pqueue, QuickCheck
+     , quickcheck-instances, random, resourcet, 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";
@@ -190117,6 +192558,14 @@ self: {
          streaming-commons template-haskell text text-format time time-units
          transformers transformers-base unordered-containers
        ];
+       executableHaskellDepends = [
+         async attoparsec base binary binary-conduit bytestring conduit
+         conduit-extra containers data-default data-msgpack directory
+         exceptions extra formatting hslogger hspec lens log-warper
+         monad-control monad-loops MonadRandom mtl optparse-simple
+         QuickCheck random resourcet serokell-util stm text text-format time
+         time-units transformers unordered-containers
+       ];
        testHaskellDepends = [
          async base data-default data-msgpack exceptions hspec lens
          log-warper mtl QuickCheck random serokell-util stm text text-format
@@ -190260,6 +192709,10 @@ self: {
          base containers focus hashable list-t stm stm-containers time
          unordered-containers
        ];
+       executableHaskellDepends = [
+         base containers focus hashable list-t stm stm-containers time
+         unordered-containers
+       ];
        testHaskellDepends = [
          base containers focus hashable list-t QuickCheck
          quickcheck-instances stm stm-containers tasty tasty-hunit
@@ -190800,12 +193253,12 @@ self: {
      }) {};
 
   "tkyprof" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs
-     , conduit, conduit-extra, containers, data-default, directory
-     , exceptions, filepath, http-types, mtl, resourcet, rosezipper
-     , shakespeare, stm, template-haskell, text, time, transformers
-     , unordered-containers, vector, wai, wai-extra, warp, web-routes
-     , yesod, yesod-core, yesod-form, yesod-static
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , cmdargs, conduit, conduit-extra, containers, data-default
+     , directory, exceptions, filepath, http-types, mtl, resourcet
+     , rosezipper, shakespeare, stm, template-haskell, text, time
+     , transformers, unordered-containers, vector, wai, wai-extra, warp
+     , web-routes, yesod, yesod-core, yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "tkyprof";
@@ -190814,11 +193267,12 @@ self: {
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson attoparsec base bytestring cmdargs conduit conduit-extra
-         containers data-default directory exceptions filepath http-types
-         mtl resourcet rosezipper shakespeare stm template-haskell text time
-         transformers unordered-containers vector wai wai-extra warp
-         web-routes yesod yesod-core yesod-form yesod-static
+         aeson attoparsec base blaze-builder bytestring cmdargs conduit
+         conduit-extra containers data-default directory exceptions filepath
+         http-types mtl resourcet rosezipper shakespeare stm
+         template-haskell text time transformers unordered-containers vector
+         wai wai-extra warp web-routes yesod yesod-core yesod-form
+         yesod-static
        ];
        homepage = "https://github.com/maoe/tkyprof";
        description = "A web-based visualizer for GHC Profiling Reports";
@@ -190945,6 +193399,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tls-session-manager_0_0_0_1" = callPackage
+    ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
+     mkDerivation {
+       pname = "tls-session-manager";
+       version = "0.0.0.1";
+       sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8";
+       libraryHaskellDepends = [ auto-update base clock psqueues tls ];
+       description = "In-memory TLS session manager";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tmapchan" = callPackage
     ({ mkDerivation, base, containers, hashable, stm
      , unordered-containers
@@ -190988,8 +193454,8 @@ self: {
      }:
      mkDerivation {
        pname = "tmp-postgres";
-       version = "0.1.0.7";
-       sha256 = "0cx0b0743fv2p651sf6s95aqhpq8rk20mxdk06dw8v8bgdyvncq2";
+       version = "0.1.0.8";
+       sha256 = "11cs5cq99gxkfj0x14kkcsn6mnh9c7d8hw1kdj598fy1gic5c94n";
        libraryHaskellDepends = [
          base directory network process temporary unix
        ];
@@ -191236,7 +193702,8 @@ self: {
      }) {};
 
   "toktok" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gf, haskell98, iconv
+    ({ mkDerivation, base, bytestring, containers, criterion, filepath
+     , gf, haskell98, HUnit, iconv, progression, QuickCheck
      }:
      mkDerivation {
        pname = "toktok";
@@ -191245,7 +193712,10 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers haskell98 ];
-       executableHaskellDepends = [ base bytestring gf iconv ];
+       executableHaskellDepends = [
+         base bytestring criterion filepath gf HUnit iconv progression
+         QuickCheck
+       ];
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -191537,11 +194007,11 @@ self: {
      , exceptions, extended-reals, filepath, finite-field, ghc-prim
      , hashable, haskeline, heaps, intern, loop, mtl, multiset
      , mwc-random, OptDir, parse-dimacs, parsec, prettyclass, primes
-     , process, pseudo-boolean, queue, QuickCheck, semigroups, sign, stm
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, template-haskell
-     , temporary, time, transformers, transformers-compat
-     , type-level-numbers, unbounded-delays, unordered-containers
-     , vector, vector-space
+     , process, pseudo-boolean, queue, QuickCheck, semigroups, sign
+     , split, stm, tasty, tasty-hunit, tasty-quickcheck, tasty-th
+     , template-haskell, temporary, time, transformers
+     , transformers-compat, type-level-numbers, unbounded-delays
+     , unordered-containers, vector, vector-space
      }:
      mkDerivation {
        pname = "toysolver";
@@ -191563,7 +194033,7 @@ self: {
        executableHaskellDepends = [
          array base bytestring containers data-default-class filepath
          haskeline mtl mwc-random OptDir parse-dimacs parsec process
-         pseudo-boolean time transformers transformers-compat
+         pseudo-boolean split time transformers transformers-compat
          unbounded-delays vector vector-space
        ];
        testHaskellDepends = [
@@ -192551,6 +195021,10 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
+       executableHaskellDepends = [
+         base containers mtl QuickCheck random
+       ];
+       testHaskellDepends = [ base containers mtl QuickCheck random ];
        homepage = "http://www.haskell.org/haskellwiki/Treeviz";
        description = "Visualization of computation decomposition trees";
        license = stdenv.lib.licenses.bsd3;
@@ -192943,8 +195417,8 @@ self: {
      }) {};
 
   "tsparse" = callPackage
-    ({ mkDerivation, base, Decimal, parsec, pretty, process, split
-     , time
+    ({ mkDerivation, base, Decimal, parsec, pretty, process, random
+     , split, time
      }:
      mkDerivation {
        pname = "tsparse";
@@ -192955,6 +195429,9 @@ self: {
        libraryHaskellDepends = [
          base Decimal parsec pretty process split time
        ];
+       executableHaskellDepends = [
+         base Decimal parsec pretty process random split time
+       ];
        homepage = "http://www.github.com/massysett/tsparse";
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
        license = stdenv.lib.licenses.bsd3;
@@ -193452,6 +195929,7 @@ self: {
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twentefp" = callPackage
@@ -195008,6 +197486,35 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "tz_0_1_3_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, thyme, time, timezone-olson, timezone-series
+     , tzdata, vector
+     }:
+     mkDerivation {
+       pname = "tz";
+       version = "0.1.3.0";
+       sha256 = "1h2w9pswfbnzpdm30xpgknhvfb1vs8ipyczpslrbsv6v6xhqh44p";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default deepseq
+         template-haskell time tzdata vector
+       ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th time tzdata
+       ];
+       benchmarkHaskellDepends = [
+         base criterion lens thyme time timezone-olson timezone-series
+       ];
+       preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
+       homepage = "https://github.com/nilcons/haskell-tz";
+       description = "Efficient time zone handling";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tzdata" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , test-framework, test-framework-hunit, test-framework-th, unix
@@ -195029,6 +197536,28 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "tzdata_0_1_20170320_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
+     , test-framework, test-framework-hunit, test-framework-th, unix
+     , vector
+     }:
+     mkDerivation {
+       pname = "tzdata";
+       version = "0.1.20170320.0";
+       sha256 = "11ffj8ipcvvsm811w1jm23ry7vrmvj2q487640ic4ghq39dx91is";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit
+         test-framework-th unix
+       ];
+       homepage = "https://github.com/nilcons/haskell-tzdata";
+       description = "Time zone database (as files and as a module)";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "u2f" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, asn1-types, base
      , base64-bytestring, binary, bytestring, cryptohash, cryptonite
@@ -195199,7 +197728,9 @@ self: {
      }) {};
 
   "udev" = callPackage
-    ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }:
+    ({ mkDerivation, base, bytestring, libudev, posix-paths, select
+     , unix
+     }:
      mkDerivation {
        pname = "udev";
        version = "0.1.0.0";
@@ -195208,6 +197739,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
        libraryPkgconfigDepends = [ libudev ];
+       executableHaskellDepends = [ base bytestring select ];
        homepage = "https://github.com/pxqr/udev";
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -195895,15 +198427,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "unicode-transforms_0_3_1" = callPackage
+  "unicode-transforms_0_3_2" = callPackage
     ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
      , filepath, getopt-generics, optparse-applicative, path, path-io
      , QuickCheck, split, text
      }:
      mkDerivation {
        pname = "unicode-transforms";
-       version = "0.3.1";
-       sha256 = "03n9s1pqgq9gl3q6xydwjlsvwq4al6khwd8lr137941263zxx0di";
+       version = "0.3.2";
+       sha256 = "15v5c0gn10k5im0x3b04z3hilwgafx6sk61hxmp0p36l1zqa5ch0";
        libraryHaskellDepends = [ base bitarray bytestring text ];
        testHaskellDepends = [
          base deepseq getopt-generics QuickCheck split text
@@ -196443,14 +198975,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "unix_2_7_2_1" = callPackage
+  "unix_2_7_2_2" = callPackage
     ({ mkDerivation, base, bytestring, time }:
      mkDerivation {
        pname = "unix";
-       version = "2.7.2.1";
-       sha256 = "1709ip8k1vahy00zi7v7qccw6rr22qrf3vk54h97jxrnjiakc1gw";
-       revision = "1";
-       editedCabalFile = "1m6gvvsb7ds25qws07wn6v3icksmh9g09qbrz726z8rnvvlbdc9x";
+       version = "2.7.2.2";
+       sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq";
        libraryHaskellDepends = [ base bytestring time ];
        homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
@@ -196485,7 +199015,7 @@ self: {
      }) {};
 
   "unix-fcntl" = callPackage
-    ({ mkDerivation, base, foreign-var }:
+    ({ mkDerivation, base, foreign-var, unix }:
      mkDerivation {
        pname = "unix-fcntl";
        version = "0.0.0";
@@ -196493,6 +199023,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base foreign-var ];
+       executableHaskellDepends = [ base foreign-var unix ];
        homepage = "https://github.com/maoe/unix-fcntl";
        description = "Comprehensive bindings to fcntl(2)";
        license = stdenv.lib.licenses.bsd3;
@@ -196820,6 +199351,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/konn/unsafely";
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
@@ -197219,6 +199751,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "uri-parse" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, data-default, hspec
+     , http-types, lens, text
+     }:
+     mkDerivation {
+       pname = "uri-parse";
+       version = "0.1.0.0";
+       sha256 = "0wkqlnbfnzzqr6pw2f934w2z9x8hgghg4cwf3l5kazbaj25cangx";
+       libraryHaskellDepends = [
+         attoparsec base bytestring data-default http-types lens text
+       ];
+       testHaskellDepends = [ base data-default hspec lens ];
+       homepage = "https://github.com/luminescent-dreams/uri-parse#readme";
+       description = "A simple library for parsing and generating URIs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "uri-template" = callPackage
     ({ mkDerivation, base, containers, utf8-string }:
      mkDerivation {
@@ -197410,6 +199959,7 @@ self: {
        homepage = "https://github.com/antalsz/urn-random";
        description = "A package for updatable discrete distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urxml" = callPackage
@@ -198881,8 +201431,8 @@ self: {
      }) {};
 
   "vector-algorithms" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primitive
-     , QuickCheck, vector
+    ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
+     , primitive, QuickCheck, vector
      }:
      mkDerivation {
        pname = "vector-algorithms";
@@ -198893,6 +201443,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
+       executableHaskellDepends = [ base mtl mwc-random vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
        ];
@@ -198973,8 +201524,8 @@ self: {
      }) {};
 
   "vector-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, directory, ghc-prim
-     , primitive, QuickCheck, random, vector
+    ({ mkDerivation, base, bytestring, criterion, deepseq, directory
+     , ghc-prim, primitive, QuickCheck, random, vector
      }:
      mkDerivation {
        pname = "vector-bytestring";
@@ -198985,6 +201536,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim primitive vector
        ];
+       executableHaskellDepends = [ base bytestring criterion deepseq ];
        testHaskellDepends = [ base directory QuickCheck random ];
        homepage = "https://github.com/basvandijk/vector-bytestring";
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
@@ -199347,6 +201899,7 @@ self: {
        libraryHaskellDepends = [
          aeson base containers text unordered-containers vector verdict
        ];
+       executableHaskellDepends = [ aeson base containers verdict ];
        testHaskellDepends = [
          aeson base containers hspec unordered-containers vector verdict
        ];
@@ -199507,14 +202060,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "viewprof_0_0_0_5" = callPackage
+  "viewprof_0_0_0_6" = callPackage
     ({ mkDerivation, base, brick, containers, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.5";
-       sha256 = "1i1rrr920dappcvj7gjs60bjcrznb4ny4aslvxxidv93lz9kv617";
+       version = "0.0.0.6";
+       sha256 = "0a9jbfa2sr3rvpp51kd9c3b9rax7b6wly4ly4dmn5k3z8fr0z31l";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -200088,6 +202641,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vty_5_16" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , deepseq, directory, filepath, hashable, HUnit, microlens
+     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
+     , quickcheck-assertions, random, smallcheck, stm, string-qq
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-smallcheck, text, transformers, unix, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "vty";
+       version = "5.16";
+       sha256 = "1zxjr4g7xl50zhjpbzk1a16cp2i1k75abpkna2q37hy1ss6sw637";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers deepseq directory filepath
+         hashable microlens microlens-mtl microlens-th mtl parallel parsec
+         stm terminfo text transformers unix utf8-string vector
+       ];
+       executableHaskellDepends = [
+         base containers microlens microlens-mtl mtl
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers deepseq HUnit
+         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+         smallcheck stm string-qq terminfo test-framework
+         test-framework-hunit test-framework-smallcheck text unix
+         utf8-string vector
+       ];
+       homepage = "https://github.com/jtdaugherty/vty";
+       description = "A simple terminal UI library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vty-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -200125,9 +202714,9 @@ self: {
      }) {};
 
   "vty-ui" = callPackage
-    ({ mkDerivation, array, base, containers, data-default, directory
-     , filepath, mtl, QuickCheck, random, regex-base, stm, text, unix
-     , vector, vty
+    ({ mkDerivation, array, base, bytestring, containers, data-default
+     , directory, filepath, mtl, QuickCheck, random, regex-base, stm
+     , text, time, unix, vector, vty
      }:
      mkDerivation {
        pname = "vty-ui";
@@ -200139,7 +202728,9 @@ self: {
          array base containers data-default directory filepath mtl
          regex-base stm text unix vector vty
        ];
-       executableHaskellDepends = [ base QuickCheck random text vty ];
+       executableHaskellDepends = [
+         base bytestring mtl QuickCheck random text time vty
+       ];
        homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
@@ -200937,7 +203528,8 @@ self: {
     ({ mkDerivation, async, base, base-prelude, bytestring, conduit
      , conduit-extra, consul-haskell, enclosed-exceptions, http-client
      , http-types, monad-control, monad-logger, network, process
-     , resourcet, text, transformers, void, wai, wai-conduit
+     , resourcet, text, transformers, void, wai, wai-app-static
+     , wai-conduit, wai-extra, warp
      }:
      mkDerivation {
        pname = "wai-middleware-consul";
@@ -200951,6 +203543,10 @@ self: {
          monad-control monad-logger network process resourcet text
          transformers void wai wai-conduit
        ];
+       executableHaskellDepends = [
+         async base base-prelude monad-logger transformers wai
+         wai-app-static wai-extra warp
+       ];
        homepage = "https://github.com/fpco/wai-middleware-consul";
        description = "Wai Middleware for Consul";
        license = stdenv.lib.licenses.mit;
@@ -201105,6 +203701,9 @@ self: {
          cryptohash http-client http-types mtl old-locale time transformers
          word8
        ];
+       executableHaskellDepends = [
+         base bytestring http-client transformers
+       ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201347,8 +203946,9 @@ self: {
 
   "wai-middleware-verbs" = callPackage
     ({ mkDerivation, base, errors, exceptions, hashable, http-types
-     , mmorph, monad-logger, mtl, resourcet, transformers
+     , mmorph, monad-logger, mtl, resourcet, text, transformers
      , transformers-base, unordered-containers, wai
+     , wai-middleware-content-type, wai-transformers, warp
      }:
      mkDerivation {
        pname = "wai-middleware-verbs";
@@ -201360,8 +203960,14 @@ self: {
          base errors exceptions hashable http-types mmorph monad-logger mtl
          resourcet transformers transformers-base unordered-containers wai
        ];
+       executableHaskellDepends = [
+         base errors exceptions hashable http-types mmorph monad-logger mtl
+         resourcet text transformers transformers-base unordered-containers
+         wai wai-middleware-content-type wai-transformers warp
+       ];
        description = "Route different middleware responses based on the incoming HTTP verb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-predicates" = callPackage
@@ -201823,7 +204429,7 @@ self: {
   "waitra" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , http-types, regex-applicative, tasty, tasty-hunit
-     , template-haskell, text, wai, wai-extra
+     , template-haskell, text, wai, wai-app-static, wai-extra, warp
      }:
      mkDerivation {
        pname = "waitra";
@@ -201837,6 +204443,7 @@ self: {
          aeson base bytestring directory filepath http-types
          regex-applicative template-haskell text wai
        ];
+       executableHaskellDepends = [ aeson base wai wai-app-static warp ];
        testHaskellDepends = [
          aeson base http-types tasty tasty-hunit wai wai-extra
        ];
@@ -202023,8 +204630,8 @@ self: {
 
   "warp-tls-uid" = callPackage
     ({ mkDerivation, base, bytestring, certificate, conduit
-     , crypto-random, network, network-conduit, pem, tls, tls-extra
-     , unix, wai, warp
+     , crypto-random, http-types, network, network-conduit, pem, tls
+     , tls-extra, unix, wai, warp
      }:
      mkDerivation {
        pname = "warp-tls-uid";
@@ -202036,6 +204643,10 @@ self: {
          base bytestring certificate conduit crypto-random network
          network-conduit pem tls tls-extra unix wai warp
        ];
+       executableHaskellDepends = [
+         base bytestring certificate conduit crypto-random http-types
+         network network-conduit pem tls tls-extra unix wai warp
+       ];
        description = "set group and user id before running server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202211,7 +204822,9 @@ self: {
      }) {};
 
   "wcwidth" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , setlocale, utf8-string
+     }:
      mkDerivation {
        pname = "wcwidth";
        version = "0.0.2";
@@ -202219,6 +204832,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers setlocale utf8-string
+       ];
        homepage = "http://github.com/solidsnack/wcwidth/";
        description = "Native wcwidth";
        license = stdenv.lib.licenses.bsd3;
@@ -202469,6 +205085,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-routes-happstack_0_23_11" = callPackage
+    ({ mkDerivation, base, bytestring, happstack-server, text
+     , web-routes
+     }:
+     mkDerivation {
+       pname = "web-routes-happstack";
+       version = "0.23.11";
+       sha256 = "0jzxcwh3g6y5y4whjbw86y94hfrl73iwnwhhm728l69z5knqry9y";
+       libraryHaskellDepends = [
+         base bytestring happstack-server text web-routes
+       ];
+       description = "Adds support for using web-routes with Happstack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "web-routes-hsp" = callPackage
     ({ mkDerivation, base, hsp, text, web-routes }:
      mkDerivation {
@@ -203030,6 +205662,10 @@ self: {
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy network random SHA text
        ];
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy network random SHA text
+       ];
        testHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy HUnit network QuickCheck random
@@ -203042,7 +205678,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets_0_11_2_0" = callPackage
+  "websockets_0_12_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers
      , criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -203051,8 +205687,10 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.11.2.0";
-       sha256 = "0bncy78zjyhb961lhiklg2d1zh6vh03xq1zjj9js8904p75kvbaq";
+       version = "0.12.1.0";
+       sha256 = "04c0bjzdz1l3n7hkfqhrxd16csnrlya2vjh96sgj9k6gwzj2cbsp";
+       revision = "1";
+       editedCabalFile = "1qnly23vdg76jm54d68jc7ssvlghkx4vi05a0vpmj4mi7b7mnxvq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -203060,6 +205698,10 @@ self: {
          case-insensitive containers entropy network random SHA
          streaming-commons text
        ];
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy network random SHA text
+       ];
        testHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy HUnit network QuickCheck random
@@ -203080,9 +205722,9 @@ self: {
 
   "websockets-rpc" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , exceptions, mtl, QuickCheck, quickcheck-instances, stm, tasty
-     , tasty-quickcheck, text, transformers, unordered-containers
-     , wai-transformers, websockets
+     , exceptions, MonadRandom, mtl, QuickCheck, quickcheck-instances
+     , stm, tasty, tasty-quickcheck, text, transformers
+     , unordered-containers, wai-transformers, websockets
      }:
      mkDerivation {
        pname = "websockets-rpc";
@@ -203095,6 +205737,10 @@ self: {
          stm text transformers unordered-containers wai-transformers
          websockets
        ];
+       executableHaskellDepends = [
+         aeson async base exceptions MonadRandom mtl wai-transformers
+         websockets
+       ];
        testHaskellDepends = [
          aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
        ];
@@ -203104,7 +205750,7 @@ self: {
 
   "websockets-rpc_0_6_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , exceptions, hashable, monad-control, mtl, QuickCheck
+     , exceptions, hashable, monad-control, MonadRandom, mtl, QuickCheck
      , quickcheck-instances, stm, tasty, tasty-quickcheck, text
      , transformers, unordered-containers, uuid, wai-transformers
      , websockets, websockets-simple
@@ -203121,6 +205767,10 @@ self: {
          unordered-containers uuid wai-transformers websockets
          websockets-simple
        ];
+       executableHaskellDepends = [
+         aeson async base exceptions MonadRandom mtl wai-transformers
+         websockets websockets-simple
+       ];
        testHaskellDepends = [
          aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
        ];
@@ -203166,6 +205816,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "websockets-snap_0_10_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
+     , mtl, snap-core, snap-server, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-snap";
+       version = "0.10.2.3";
+       sha256 = "0zdpim80yyw33k90r22jxac3g6h64jk2f831s3kw9z98l0m4gqlm";
+       libraryHaskellDepends = [
+         base bytestring bytestring-builder io-streams mtl snap-core
+         snap-server websockets
+       ];
+       description = "Snap integration for the websockets library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webwire" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , bytestring, case-insensitive, containers, cookie, cprng-aes
@@ -203240,8 +205907,9 @@ self: {
      }) {};
 
   "weigh" = callPackage
-    ({ mkDerivation, base, deepseq, mtl, process, split
-     , template-haskell, temporary
+    ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
+     , process, random, split, template-haskell, temporary
+     , unordered-containers
      }:
      mkDerivation {
        pname = "weigh";
@@ -203250,7 +205918,9 @@ self: {
        libraryHaskellDepends = [
          base deepseq mtl process split template-haskell temporary
        ];
-       testHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base bytestring-trie containers deepseq random unordered-containers
+       ];
        homepage = "https://github.com/fpco/weigh#readme";
        description = "Measure allocations of a Haskell functions/values";
        license = stdenv.lib.licenses.bsd3;
@@ -203565,6 +206235,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wikicfp-scraper_0_1_0_9" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
+     , scalpel-core, text, time
+     }:
+     mkDerivation {
+       pname = "wikicfp-scraper";
+       version = "0.1.0.9";
+       sha256 = "1qj28a53shcr4dq8i1fhyjbr4ybiyfb0kz3w0g439736mrnzsg4y";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scalpel-core text time
+       ];
+       testHaskellDepends = [ base bytestring filepath hspec time ];
+       homepage = "https://github.com/debug-ito/wikicfp-scraper";
+       description = "Scrape WikiCFP web site";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wikipedia4epub" = callPackage
     ({ mkDerivation, base, bytestring, directory, epub, filepath
      , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url
@@ -203653,6 +206341,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind-x11_0_1_0_7" = callPackage
+    ({ mkDerivation, base, containers, fold-debounce, hspec, QuickCheck
+     , stm, text, time, transformers, wild-bind, X11
+     }:
+     mkDerivation {
+       pname = "wild-bind-x11";
+       version = "0.1.0.7";
+       sha256 = "0vdhmjkpy09w21xqhrqaxc645ghyb0ify1yq37wrlabqdqqms08d";
+       libraryHaskellDepends = [
+         base containers fold-debounce stm text transformers wild-bind X11
+       ];
+       testHaskellDepends = [ base hspec QuickCheck time wild-bind X11 ];
+       homepage = "https://github.com/debug-ito/wild-bind";
+       description = "X11-specific implementation for WildBind";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "win-hp-path" = callPackage
     ({ mkDerivation, base, process, split }:
      mkDerivation {
@@ -204132,8 +206838,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.23";
-       sha256 = "0vj6195qqgx1ypv4h6jha3ayi73gcqxwwvcd7km12j4al68x6nvv";
+       version = "0.3.24";
+       sha256 = "13992gn3myjpdkmc4v2d1s2kmmsjzw8xzibs3iprlk72vacp70ja";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -204199,6 +206905,7 @@ self: {
        homepage = "https://github.com/jtdaugherty/word-wrap/";
        description = "A library for word-wrapping";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "word24" = callPackage
@@ -204449,13 +207156,18 @@ self: {
      }) {};
 
   "workflow-windows" = callPackage
-    ({ mkDerivation, base, doctest, hspec, QuickCheck }:
+    ({ mkDerivation, base, c-storable-deriving, doctest, free, hspec
+     , QuickCheck, StateVar, transformers, workflow-types
+     }:
      mkDerivation {
        pname = "workflow-windows";
        version = "0.0.0";
        sha256 = "14pzzm7c17sg76lmxjaw0d5avgpafgj4q66diqmh502mx8k2z4jc";
        isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         base c-storable-deriving free StateVar transformers workflow-types
+       ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        homepage = "http://github.com/sboosali/workflow-windows#readme";
@@ -204997,6 +207709,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.5";
+       sha256 = "0n7sixmvy084hggvagkd9nq06gxhisrklm1b8fahkjylahbzh2qd";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       homepage = "https://github.com/tfausak/wuss#readme";
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
@@ -205259,6 +207987,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509_1_7_1" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "x509";
+       version = "1.7.1";
+       sha256 = "0rz4z1gna5pqhvicsvfgvf7lk2f924hqvkzjapq4727gq6q6crgr";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-parse asn1-types base bytestring containers
+         cryptonite hourglass memory mtl pem
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cryptonite hourglass mtl tasty
+         tasty-quickcheck
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X509 reader and writer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-store" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, directory, filepath, mtl, pem, x509
@@ -205276,6 +208027,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-store_1_6_3" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
+     , containers, cryptonite, directory, filepath, mtl, pem, x509
+     }:
+     mkDerivation {
+       pname = "x509-store";
+       version = "1.6.3";
+       sha256 = "09adqiwhl85f2kj77v08dgqzizs4cf0ks01q5q793c39wfacy2fp";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base bytestring containers cryptonite
+         directory filepath mtl pem x509
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X.509 collection accessing and storing methods";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-system" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pem, process, x509, x509-store
@@ -205293,6 +208062,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-system_1_6_5" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pem, process, x509, x509-store
+     }:
+     mkDerivation {
+       pname = "x509-system";
+       version = "1.6.5";
+       sha256 = "0vrw8a63lh8d5nr4qc9ch97ng1r54n2ppnh7g1cnhrgnkbgkp1fa";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath mtl pem process x509
+         x509-store
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "Handle per-operating-system X.509 accessors and storage";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-util" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , cryptonite, directory, hourglass, pem, x509, x509-store
@@ -205300,8 +208087,8 @@ self: {
      }:
      mkDerivation {
        pname = "x509-util";
-       version = "1.6.1";
-       sha256 = "1387r62y1dj5bx9xvlacbcigsk8zz6cb99q61zxpsfv3ij6khd6m";
+       version = "1.6.3";
+       sha256 = "1ca68z6jvsf7xx1qx44k2cic3ijv44ah738rx755gdxx056s49sz";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -205311,6 +208098,7 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Utility for X509 certificate and chain";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-validation" = callPackage
@@ -205332,6 +208120,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-validation_1_6_8" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
+     , bytestring, containers, cryptonite, data-default-class, hourglass
+     , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
+     }:
+     mkDerivation {
+       pname = "x509-validation";
+       version = "1.6.8";
+       sha256 = "19ym8lj5r36f1fiq4x1f2pwxv4jplb3pwzy6hgfzva5s1vvyhj3s";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base byteable bytestring containers
+         cryptonite data-default-class hourglass memory mtl pem x509
+         x509-store
+       ];
+       testHaskellDepends = [
+         asn1-encoding asn1-types base bytestring cryptonite
+         data-default-class hourglass tasty tasty-hunit x509 x509-store
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X.509 Certificate and CRL validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x86-64bit" = callPackage
     ({ mkDerivation, base, deepseq, monads-tf, QuickCheck, tardis
      , vector
@@ -206944,6 +209756,7 @@ self: {
        libraryHaskellDepends = [
          base containers process transformers X11 xmonad xmonad-contrib
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec xmonad ];
        homepage = "https://hub.darcs.net/vmchale/xmonad-vanessa";
        description = "Custom xmonad, which builds with stack or cabal";
@@ -207494,14 +210307,14 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-combinators";
-       version = "1.0.1";
-       sha256 = "03y7z08ly3l5plh2c06i1p83c12s15fwshkl4nakqf1a6vb7bl48";
+       version = "1.1";
+       sha256 = "045zi5lipnjw161xz2awr5zwnzhiszsrrpwin64q4r5pxjkh7ala";
        libraryHaskellDepends = [
          aeson base bytestring generics-sop scientific text transformers
          unordered-containers vector yaml
        ];
        testHaskellDepends = [
-         aeson base doctest tasty tasty-hunit unordered-containers
+         aeson base doctest tasty tasty-hunit text unordered-containers
        ];
        homepage = "https://github.com/feuerbach/yaml-combinators";
        description = "YAML parsing combinators for improved validation and error reporting";
@@ -207677,7 +210490,7 @@ self: {
      }) {};
 
   "yampa-canvas" = callPackage
-    ({ mkDerivation, base, blank-canvas, stm, time, Yampa }:
+    ({ mkDerivation, base, blank-canvas, stm, text, time, Yampa }:
      mkDerivation {
        pname = "yampa-canvas";
        version = "0.2.2";
@@ -207687,6 +210500,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
+       executableHaskellDepends = [ base blank-canvas text Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207713,7 +210527,7 @@ self: {
 
   "yampa-glut" = callPackage
     ({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space
-     , Yampa-core
+     , vector-space-opengl, Yampa-core
      }:
      mkDerivation {
        pname = "yampa-glut";
@@ -207724,9 +210538,14 @@ self: {
        libraryHaskellDepends = [
          base GLUT newtype OpenGL vector-space Yampa-core
        ];
+       executableHaskellDepends = [
+         base GLUT newtype OpenGL vector-space vector-space-opengl
+         Yampa-core
+       ];
        homepage = "https://github.com/ony/yampa-glut";
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa2048" = callPackage
@@ -207746,8 +210565,8 @@ self: {
 
   "yandex-translate" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default-class
-     , exceptions, lens, lens-aeson, text, transformers
-     , unordered-containers, wreq
+     , exceptions, hspec, hspec-core, lens, lens-aeson, text
+     , transformers, unordered-containers, wreq
      }:
      mkDerivation {
        pname = "yandex-translate";
@@ -207757,6 +210576,9 @@ self: {
          aeson base bytestring data-default-class exceptions lens lens-aeson
          text transformers unordered-containers wreq
        ];
+       testHaskellDepends = [
+         base data-default-class hspec hspec-core lens text transformers
+       ];
        description = "Bindings to Yandex translate API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -208258,8 +211080,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-hmac-keccak";
-       version = "0.0.0.2";
-       sha256 = "005v6wr9xw6lm4w7nm9pbbyp5j458dcyshk8yh3vlpf7sj29cya6";
+       version = "0.0.0.3";
+       sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite mtl persistent random shakespeare
          text yesod-auth yesod-core yesod-form yesod-persistent yesod-static
@@ -208338,6 +211160,7 @@ self: {
        homepage = "http://github.com/mulderr/yesod-auth-ldap-native";
        description = "Yesod LDAP authentication plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-nopassword" = callPackage
@@ -208376,10 +211199,10 @@ self: {
      }) {};
 
   "yesod-auth-oauth2" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2
-     , hspec, http-client, http-conduit, http-types, lifted-base
-     , network-uri, random, text, transformers, vector, yesod-auth
-     , yesod-core, yesod-form
+    ({ mkDerivation, aeson, authenticate, base, bytestring, containers
+     , hoauth2, hspec, http-client, http-conduit, http-types
+     , lifted-base, load-env, network-uri, random, text, transformers
+     , vector, warp, yesod, yesod-auth, yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
@@ -208392,6 +211215,9 @@ self: {
          http-types lifted-base network-uri random text transformers vector
          yesod-auth yesod-core yesod-form
        ];
+       executableHaskellDepends = [
+         base containers http-conduit load-env text warp yesod yesod-auth
+       ];
        testHaskellDepends = [ base hspec ];
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
@@ -208629,6 +211455,50 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_4_35_1" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , criterion, data-default, deepseq, deepseq-generics, directory
+     , exceptions, fast-logger, hspec, hspec-expectations, http-types
+     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
+     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
+     , random, resourcet, safe, semigroups, shakespeare
+     , streaming-commons, template-haskell, text, time, transformers
+     , transformers-base, unix-compat, unordered-containers, vector, wai
+     , wai-extra, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.35.1";
+       sha256 = "0m91b4w3yixlsc9y07n0s8k4nzsqk8m8fz2gpxk1rhv6pp1k25cx";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq
+         deepseq-generics directory exceptions fast-logger http-types
+         lifted-base monad-control monad-logger mtl mwc-random old-locale
+         parsec path-pieces primitive random resourcet safe semigroups
+         shakespeare template-haskell text time transformers
+         transformers-base unix-compat unordered-containers vector wai
+         wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion shakespeare text transformers
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -208890,6 +211760,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_4_13" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.13";
+       sha256 = "0yq98rk81nilm39djpwl2kvr83j96yakc1ysyy3zgywb2k1ncvqk";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare
+         template-haskell text time transformers wai xss-sanitize yesod-core
+         yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-bootstrap4" = callPackage
     ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
      mkDerivation {
@@ -209005,9 +211900,11 @@ self: {
      }) {};
 
   "yesod-job-queue" = callPackage
-    ({ mkDerivation, aeson, api-field-json-th, base, bytestring, cron
-     , file-embed, hedis, lens, monad-control, monad-logger, stm, text
-     , time, transformers, uuid, yesod, yesod-core, yesod-persistent
+    ({ mkDerivation, aeson, api-field-json-th, base, bytestring
+     , classy-prelude-yesod, cron, file-embed, hedis, lens
+     , monad-control, monad-logger, persistent-sqlite, resourcet, stm
+     , text, time, transformers, uuid, yesod, yesod-core
+     , yesod-persistent
      }:
      mkDerivation {
        pname = "yesod-job-queue";
@@ -209020,6 +211917,10 @@ self: {
          monad-control monad-logger stm text time transformers uuid yesod
          yesod-core yesod-persistent
        ];
+       executableHaskellDepends = [
+         base classy-prelude-yesod hedis monad-logger persistent-sqlite
+         resourcet yesod yesod-core
+       ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
        description = "Background jobs library for Yesod";
@@ -209064,9 +211965,14 @@ self: {
      }) {};
 
   "yesod-mangopay" = callPackage
-    ({ mkDerivation, base, containers, http-conduit, http-types
-     , lifted-base, mangopay, persistent-template, text, time, yesod
-     , yesod-core
+    ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
+     , containers, country-codes, data-default, directory, fast-logger
+     , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay
+     , monad-control, monad-logger, persistent, persistent-postgresql
+     , persistent-template, resourcet, shakespeare, template-haskell
+     , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod
+     , yesod-auth, yesod-core, yesod-form, yesod-persistent
+     , yesod-static
      }:
      mkDerivation {
        pname = "yesod-mangopay";
@@ -209078,6 +211984,15 @@ self: {
          base containers http-conduit http-types lifted-base mangopay
          persistent-template text time yesod yesod-core
        ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit conduit-extra containers
+         country-codes data-default directory fast-logger hamlet hjsmin
+         http-conduit lifted-base mangopay monad-control monad-logger
+         persistent persistent-postgresql persistent-template resourcet
+         shakespeare template-haskell text time wai wai-extra wai-logger
+         warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent
+         yesod-static
+       ];
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
@@ -209172,7 +212087,8 @@ self: {
 
   "yesod-paginator" = callPackage
     ({ mkDerivation, base, data-default, hspec, persistent, resourcet
-     , text, transformers, wai-extra, yesod, yesod-core, yesod-test
+     , text, transformers, wai-extra, warp, yesod, yesod-core
+     , yesod-test
      }:
      mkDerivation {
        pname = "yesod-paginator";
@@ -209183,6 +212099,7 @@ self: {
        libraryHaskellDepends = [
          base persistent resourcet text transformers yesod
        ];
+       executableHaskellDepends = [ base warp yesod ];
        testHaskellDepends = [
          base data-default hspec wai-extra yesod-core yesod-test
        ];
@@ -209662,11 +212579,48 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-static_1_5_3_1" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptonite, cryptonite-conduit, css-text
+     , data-default, directory, exceptions, file-embed, filepath
+     , hashable, hjsmin, hspec, http-types, HUnit, memory, mime-types
+     , old-time, process, resourcet, template-haskell, text
+     , transformers, unix-compat, unordered-containers, wai
+     , wai-app-static, wai-extra, yesod-core, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-static";
+       version = "1.5.3.1";
+       sha256 = "0drrzg59k0jmbxdf2d7mlk0nr0nvdd8h164638nizjy8713ghjsl";
+       libraryHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder byteable
+         bytestring conduit conduit-extra containers cryptonite
+         cryptonite-conduit css-text data-default directory exceptions
+         file-embed filepath hashable hjsmin http-types memory mime-types
+         old-time process resourcet template-haskell text transformers
+         unix-compat unordered-containers wai wai-app-static yesod-core
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring byteable bytestring conduit
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         directory exceptions file-embed filepath hjsmin hspec http-types
+         HUnit memory mime-types old-time process resourcet template-haskell
+         text transformers unix-compat unordered-containers wai
+         wai-app-static wai-extra yesod-core yesod-test
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Static file serving subsite for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-static-angular" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
      , HUnit, language-javascript, mime-types, shakespeare
-     , template-haskell, text, yesod-core, yesod-static, yesod-test
+     , template-haskell, text, yesod, yesod-core, yesod-static
+     , yesod-test
      }:
      mkDerivation {
        pname = "yesod-static-angular";
@@ -209679,6 +212633,9 @@ self: {
          directory filepath hamlet language-javascript mime-types
          shakespeare template-haskell text yesod-core yesod-static
        ];
+       executableHaskellDepends = [
+         base data-default shakespeare yesod yesod-static
+       ];
        testHaskellDepends = [
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
@@ -209743,6 +212700,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_5_8" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, containers, cookie
+     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
+     , monad-control, network, persistent, pretty-show, text, time
+     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
+     , yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.5.8";
+       sha256 = "0rvbvr8pa60b9rvhnsd1wcbs0x49s2rhqc76nqzv2i0qry5aym7h";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive containers cookie hspec-core html-conduit
+         http-types HUnit monad-control network persistent pretty-show text
+         time transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit
+         lifted-base text wai xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -210841,6 +213826,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bindings-DSL ieee754 ];
+       executableHaskellDepends = [ base ];
        description = "Bindings to Facebook's Yoga layout library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211538,6 +214524,7 @@ self: {
          array base binary bytestring containers digest directory filepath
          mtl old-time pretty text time unix zlib
        ];
+       executableHaskellDepends = [ base bytestring directory ];
        testHaskellDepends = [
          base bytestring directory HUnit old-time process temporary time
          unix
@@ -211717,19 +214704,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "zlib_0_5_4_2" = callPackage
-    ({ mkDerivation, base, bytestring, zlib }:
-     mkDerivation {
-       pname = "zlib";
-       version = "0.5.4.2";
-       sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm";
-       libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ zlib ];
-       description = "Compression and decompression in the gzip and zlib formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) zlib;};
-
   "zlib" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, zlib

From a9111840faafdfacc946298efe3b9558f42d4688 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jul 2017 09:26:18 +0200
Subject: [PATCH 0965/3246] haskell: provide the name 'ghcjs-prim' (null) to
 fix evaluation errors

---
 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 eb3f25e6253..eaa3576c81e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -19,6 +19,7 @@ self: super: {
   # GHCJS package set. We provide a dummy version here to fix potential
   # evaluation errors.
   ghcjs-base = null;
+  ghcjs-prim = null;
 
   # Some packages need a non-core version of Cabal.
   cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; });

From 28c01703f051e7162773062e5a4b31287c39c836 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jul 2017 09:35:35 +0200
Subject: [PATCH 0966/3246] haskell: remove all code related to the "haste"
 compiler

These packages have been broken for a while and now they don't even evaluate
any more.
---
 doc/languages-frameworks/haskell.md           | 27 -----------
 .../haskell-modules/configuration-common.nix  |  5 --
 .../tools/haskell/haste/haste-Cabal.nix       | 35 --------------
 .../haskell/haste/haste-cabal-install.nix     | 46 -------------------
 .../tools/haskell/haste/haste-compiler.nix    | 33 -------------
 5 files changed, 146 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/haste/haste-Cabal.nix
 delete mode 100644 pkgs/development/tools/haskell/haste/haste-cabal-install.nix
 delete mode 100644 pkgs/development/tools/haskell/haste/haste-compiler.nix

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index ce2889f744f..68894994392 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -698,33 +698,6 @@ rm /nix/var/nix/manifests/*
 rm /nix/var/nix/channel-cache/*
 ```
 
-### How to use the Haste Haskell-to-Javascript transpiler
-
-Open a shell with `haste-compiler` and `haste-cabal-install` (you don't actually need
-`node`, but it can be useful to test stuff):
-```shell
-nix-shell \
-  -p "haskellPackages.ghcWithPackages (self: with self; [haste-cabal-install haste-compiler])" \
-  -p nodejs
-```
-You may not need the following step but if `haste-boot` fails to compile all the
-packages it needs, this might do the trick
-```shell
-haste-cabal update
-```
-`haste-boot` builds a set of core libraries so that they can be used from Javascript
-transpiled programs:
-```shell
-haste-boot
-```
-Transpile and run a "Hello world" program:
-```
-$ echo 'module Main where main = putStrLn "Hello world"' > hello-world.hs
-$ hastec --onexec hello-world.hs
-$ node hello-world.js
-Hello world
-```
-
 ### Builds on Darwin fail with `math.h` not found
 
 Users of GHC on Darwin have occasionally reported that builds fail, because the
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index eaa3576c81e..aeb09d4ad60 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -665,11 +665,6 @@ self: super: {
   # We get lots of strange compiler errors during the test suite run.
   jsaddle = dontCheck super.jsaddle;
 
-  # Haste stuff
-  haste-Cabal         = markBroken (self.callPackage ../tools/haskell/haste/haste-Cabal.nix {});
-  haste-cabal-install = markBroken (self.callPackage ../tools/haskell/haste/haste-cabal-install.nix { Cabal = self.haste-Cabal; });
-  haste-compiler      = markBroken (self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; });
-
   # tinc is a new build driver a la Stack that's not yet available from Hackage.
   tinc = self.callPackage ../tools/haskell/tinc { inherit (pkgs) cabal-install cabal2nix; };
 
diff --git a/pkgs/development/tools/haskell/haste/haste-Cabal.nix b/pkgs/development/tools/haskell/haste/haste-Cabal.nix
deleted file mode 100644
index 45a60172e39..00000000000
--- a/pkgs/development/tools/haskell/haste/haste-Cabal.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# Haste requires its own patched up version of Cabal that's not on hackage
-{ mkDerivation, array, base, binary, bytestring, containers
-, deepseq, directory, extensible-exceptions, filepath, old-time
-, pretty, process, QuickCheck, regex-posix, stdenv, tasty
-, tasty-hunit, tasty-quickcheck, time, unix
-, fetchFromGitHub
-}:
-
-mkDerivation {
-  pname = "Cabal";
-  version = "1.23.0.0";
-  src = fetchFromGitHub {
-    owner = "valderman";
-    repo = "cabal";
-    rev = "a1962987ba32d5e20090830f50c6afdc78dae005";
-    sha256 = "1gjmscfsikcvgkv6zricpfxvj23wxahndm784lg9cpxrc3pn5hvh";
-  };
-  libraryHaskellDepends = [
-    array base binary bytestring containers deepseq directory filepath
-      pretty process time unix
-  ];
-  testHaskellDepends = [
-    base bytestring containers directory extensible-exceptions filepath
-      old-time pretty process QuickCheck regex-posix tasty tasty-hunit
-      tasty-quickcheck unix
-  ];
-  prePatch = ''
-    rm -rf cabal-install
-    cd Cabal
-    '';
-  doCheck = false;
-  homepage = "http://www.haskell.org/cabal/";
-  description = "A framework for packaging Haskell software";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/tools/haskell/haste/haste-cabal-install.nix b/pkgs/development/tools/haskell/haste/haste-cabal-install.nix
deleted file mode 100644
index dd140409173..00000000000
--- a/pkgs/development/tools/haskell/haste/haste-cabal-install.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# Haste requires its own patched up version of cabal-install that's not on hackage
-{ mkDerivation, array, base, bytestring, Cabal, containers
-, directory, extensible-exceptions, filepath, HTTP, mtl, network
-, network-uri, pretty, process, QuickCheck, random, regex-posix
-, stdenv, stm, tagged, tasty, tasty-hunit, tasty-quickcheck, time
-, unix, zlib
-, fetchFromGitHub
-}:
-
-mkDerivation {
-  pname = "cabal-install";
-  version = "1.23.0.0";
-  src = fetchFromGitHub {
-    owner = "valderman";
-    repo = "cabal";
-    rev = "a1962987ba32d5e20090830f50c6afdc78dae005";
-    sha256 = "1gjmscfsikcvgkv6zricpfxvj23wxahndm784lg9cpxrc3pn5hvh";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    array base bytestring Cabal containers directory filepath HTTP mtl
-    network network-uri pretty process random stm time unix zlib
-  ];
-  testHaskellDepends = [
-    array base bytestring Cabal containers directory
-    extensible-exceptions filepath HTTP mtl network network-uri pretty
-    process QuickCheck random regex-posix stm tagged tasty tasty-hunit
-    tasty-quickcheck time unix zlib
-  ];
-  prePatch = ''
-    rm -rf Cabal
-    cd cabal-install
-  '';
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-
-    # Manually added by Nix maintainer
-    mv -v $out/etc/bash_completion.d/cabal $out/etc/bash_completion.d/haste-cabal
-  '';
-  doCheck = false;
-  homepage = "http://www.haskell.org/cabal/";
-  description = "The command-line interface for Cabal and Hackage";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/tools/haskell/haste/haste-compiler.nix b/pkgs/development/tools/haskell/haste/haste-compiler.nix
deleted file mode 100644
index f9aa5abae57..00000000000
--- a/pkgs/development/tools/haskell/haste/haste-compiler.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation
-, overrideCabal
-, super-haste-compiler
-}:
-
-overrideCabal super-haste-compiler (drv: {
-  configureFlags = [ "-f-portable" ];
-  prePatch = ''
-    # Get ghc libdir by invoking ghc and point to haste-cabal binary
-    substituteInPlace src/Haste/Environment.hs \
-      --replace \
-        'hasteGhcLibDir = hasteSysDir' \
-        'hasteGhcLibDir = head $ lines $ either (error . show) id $ unsafePerformIO $ shell $ run "ghc" ["--print-libdir"] ""' \
-      --replace \
-        'hasteCabalBinary = hasteBinDir </> "haste-cabal" ++ binaryExt' \
-        'hasteCabalBinary = "haste-cabal" ++ binaryExt'
-
-    # Don't try to download/install haste-cabal in haste-boot:
-    patch src/haste-boot.hs << EOF
-    @@ -178,10 +178,6 @@
-                             pkgSysLibDir, jsmodSysDir, pkgSysDir]
-
-           mkdir True (hasteCabalRootDir portableHaste)
-    -      case getHasteCabal cfg of
-    -        Download    -> installHasteCabal portableHaste tmpdir
-    -        Prebuilt fp -> copyHasteCabal portableHaste fp
-    -        Source mdir -> buildHasteCabal portableHaste (maybe "../cabal" id mdir)
-
-           -- Spawn off closure download in the background.
-           dir <- pwd -- use absolute path for closure to avoid dir changing race
-    EOF
-  '';
-})

From 9c6458214132e651bd6dc39096705b1c3bb0ab64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jul 2017 09:47:20 +0200
Subject: [PATCH 0967/3246] hedgewars: fix ambiguous use of the zlib variable

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

diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index b9316e2ca70..296687c5d92 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -6,7 +6,7 @@
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
           network vector utf8-string bytestring-show random hslogger
-          dataenc SHA entropy zlib_0_5_4_2
+          dataenc SHA entropy pkgs.zlib
         ]);
 in
 stdenv.mkDerivation rec {

From 175c3526aeae925ecae93002410a1fb9f255f6c0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jul 2017 10:09:05 +0200
Subject: [PATCH 0968/3246] haskell: provide the name 'bin-package-db' (null)
 to fix evaluation errors

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index aeb09d4ad60..3a3928f5618 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -15,6 +15,12 @@ with import ./lib.nix { inherit pkgs; };
 
 self: super: {
 
+  # This used to be a core package provided by GHC, but then the compiler
+  # dropped it. We define the name here to make sure that old packages which
+  # depend on this library still evaluate (even though they won't compile
+  # successfully with recent versions of the compiler).
+  bin-package-db = null;
+
   # Some Hackage packages reference this attribute, which exists only in the
   # GHCJS package set. We provide a dummy version here to fix potential
   # evaluation errors.

From b23b1345f728360986ce6c532c0c934c2c89da5b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 26 Jul 2017 16:31:52 +0800
Subject: [PATCH 0969/3246] lcdproc: init at 0.5.9

---
 pkgs/servers/monitoring/lcdproc/default.nix   | 47 +++++++++++++++++++
 .../monitoring/lcdproc/hardcode_mtab.patch    | 17 +++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 66 insertions(+)
 create mode 100644 pkgs/servers/monitoring/lcdproc/default.nix
 create mode 100644 pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch

diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix
new file mode 100644
index 00000000000..027e1090157
--- /dev/null
+++ b/pkgs/servers/monitoring/lcdproc/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig
+, doxygen, freetype, libX11, libftdi, libftdi1, libusb, libusb1, ncurses, perl }:
+
+stdenv.mkDerivation rec {
+  name = "lcdproc-${version}";
+  version = "0.5.9";
+
+  src = fetchFromGitHub {
+    owner  = "lcdproc";
+    repo   = "lcdproc";
+    rev    = "v${version}";
+    sha256 = "1r885zv1gsh88j43x6fvzbdgfkh712a227d369h4fdcbnnfd0kpm";
+  };
+
+  patches = [
+    ./hardcode_mtab.patch
+  ];
+
+  configureFlags = [
+    "--enable-lcdproc-menus"
+    "--enable-drivers=all"
+    "--with-pidfile-dir=/run"
+  ];
+
+  buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ];
+  nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ];
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    for f in $out/bin/*.pl ; do
+      substituteInPlace $f \
+        --replace /usr/bin/perl ${stdenv.lib.getBin perl}/bin/perl
+    done
+
+    # NixOS will not use this file anyway but at least we can now execute LCDd
+    substituteInPlace $out/etc/LCDd.conf \
+      --replace server/drivers/ $out/lib/lcdproc/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Client/server suite for controlling a wide variety of LCD devices";
+    homepage    = http://lcdproc.org/;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch b/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch
new file mode 100644
index 00000000000..33c4b8e83b2
--- /dev/null
+++ b/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch
@@ -0,0 +1,17 @@
+diff --git a/clients/lcdproc/machine_Linux.c b/clients/lcdproc/machine_Linux.c
+index 7bb7266..a629674 100644
+--- a/clients/lcdproc/machine_Linux.c
++++ b/clients/lcdproc/machine_Linux.c
+@@ -259,11 +259,7 @@ machine_get_fs(mounts_type fs[], int *cnt)
+	char line[256];
+	int x = 0, err;
+
+-#ifdef MTAB_FILE
+-	mtab_fd = fopen(MTAB_FILE, "r");
+-#else
+-#error "Can't find your mounted filesystem table file."
+-#endif
++	mtab_fd = fopen("/etc/mtab", "r");
+
+	/* Get rid of old, unmounted filesystems... */
+	memset(fs, 0, sizeof(mounts_type) * 256);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45ed837d299..c5b963a6a1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1069,6 +1069,8 @@ with pkgs;
 
   kapacitor = callPackage ../servers/monitoring/kapacitor { };
 
+  lcdproc = callPackage ../servers/monitoring/lcdproc { };
+
   languagetool = callPackage ../tools/text/languagetool {  };
 
   loccount = callPackage ../development/tools/misc/loccount { };

From 61764cbba4619307d0abf987bc67369112dfb7c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 26 Jul 2017 11:31:35 +0200
Subject: [PATCH 0970/3246] Revert "docbook-xsl: Install dbtoepub"

This reverts commit 4e32f5bda32cd580a7ec731beb381b14bbf2b528.

IMHO, it's not desirable to make docbook-xsl (and by extension a
gazillion packages that depend on it) pull in Ruby. (For example, I
just noticed that wget depends on ruby now...)
---
 .../data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index a527765688d..a955f5cf8a4 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ruby }:
+{ lib, stdenv, fetchurl }:
 
 let
 
@@ -10,8 +10,6 @@ let
       inherit sha256;
     };
 
-    buildInputs = [ ruby ];
-
     dontBuild = true;
 
     installPhase = ''
@@ -23,9 +21,6 @@ let
       # Backwards compatibility. Will remove eventually.
       mkdir -p $out/xml/xsl
       ln -s $dst $out/xml/xsl/docbook
-
-      ln -sv $dst/epub/bin $out
-      chmod +x $out/bin/dbtoepub
     '';
 
     meta = {

From 2b0315d7d0429698c66d9cee26f892a05ef62ed3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 26 Jul 2017 10:29:48 +0200
Subject: [PATCH 0971/3246] glpk: 4.62 -> 4.63

See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00011.html
for release information
---
 pkgs/development/libraries/glpk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index a4b0090296f..4ab61a2d282 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.62";
+  name = "glpk-4.63";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${name}.tar.gz";
-    sha256 = "0w7s3869ybwyq9a4490dikpib1qp3jnn5nqz1vvwqy1qz3ilnvh9";
+    sha256 = "1xp7nclmp8inp20968bvvfcwmz3mz03sbm0v3yjz8aqwlpqjfkci";
   };
 
   doCheck = true;

From 1ec5b7f1d370a15c9a4db20e4c3802e8e7eb7d18 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 23 Jul 2017 10:28:43 +0000
Subject: [PATCH 0972/3246] mailutils: 2.2 -> 3.2

---
 pkgs/tools/networking/mailutils/default.nix   | 72 ++++++++++++++-----
 .../mailutils/fix-build-mb-len-max.patch      | 14 ++++
 .../mailutils/fix-test-ali-awk.patch          | 16 +++++
 pkgs/tools/networking/mailutils/no-gets.patch | 14 ----
 .../networking/mailutils/path-to-cat.patch    | 49 +++++++++++--
 .../networking/mailutils/scm_c_string.patch   | 15 ----
 pkgs/top-level/all-packages.nix               |  1 +
 7 files changed, 131 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch
 create mode 100644 pkgs/tools/networking/mailutils/fix-test-ali-awk.patch
 delete mode 100644 pkgs/tools/networking/mailutils/no-gets.patch
 delete mode 100644 pkgs/tools/networking/mailutils/scm_c_string.patch

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index f83ea004db6..82d581650bb 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -1,36 +1,76 @@
-{ fetchurl, stdenv, gettext, gdbm, libtool, pam, readline
-, ncurses, gnutls, sasl, fribidi, gss , mysql, guile, texinfo,
-  gnum4, dejagnu, nettools }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, libtool, pkgconfig
+, gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
+, gss, mysql }:
 
+let
+  p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files";
+in
 stdenv.mkDerivation rec {
-  name = "mailutils-2.2";
+  name = "${project}-${version}";
+  project = "mailutils";
+  version = "3.2";
 
   src = fetchurl {
-    url = "mirror://gnu/mailutils/${name}.tar.bz2";
-    sha256 = "0szbqa12zqzldqyw97lxqax3ja2adis83i7brdfsxmrfw68iaf65";
+    url = "mirror://gnu/${project}/${name}.tar.xz";
+    sha256 = "0zh7xn8yvnw9zkc7gi5290i34viwxp1rn0g1q9nyvmckkvk59lwn";
   };
 
-  hardeningDisable = [ "format" ];
+  nativeBuildInputs = [
+    autoreconfHook gettext libtool pkgconfig
+  ] ++ stdenv.lib.optional doCheck dejagnu;
 
-  patches = [ ./path-to-cat.patch ./no-gets.patch ./scm_c_string.patch ];
+  buildInputs = [
+    gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
+    gss mysql.lib
+  ];
+
+  patches = [
+    (fetchpatch {
+      url = "${p}/mailutils-3.2-fix-build.patch";
+      sha256 = "0yzkfx3j1zkkb43fhchjqphw4xznbclj39bjzjggv32gppy6d1db";
+    })
+    ./fix-build-mb-len-max.patch
+    ./fix-test-ali-awk.patch
+    ./path-to-cat.patch
+  ];
+
+  readmsg-tests = stdenv.lib.optionals doCheck [
+    (fetchurl { url = "${p}/hdr.at"; sha256 = "0phpkqyhs26chn63wjns6ydx9468ng3ssbjbfhcvza8h78jlsd98"; })
+    (fetchurl { url = "${p}/nohdr.at"; sha256 = "1vkbkfkbqj6ml62s1am8i286hxwnpsmbhbnq0i2i0j1i7iwkk4b7"; })
+    (fetchurl { url = "${p}/twomsg.at"; sha256 = "15m29rg2xxa17xhx6jp4s2vwa9d4khw8092vpygqbwlhw68alk9g"; })
+    (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
+  ];
 
   postPatch = ''
+    sed -e '/AM_GNU_GETTEXT_VERSION/s/0.18/0.19/' -i configure.ac
     sed -i -e '/chown root:mail/d' \
            -e 's/chmod [24]755/chmod 0755/' \
-      */Makefile{,.in,.am}
+      */Makefile{.in,.am}
   '';
 
   configureFlags = [
-    "--with-gsasl"
-    "--with-gssapi=${gss}"
+    "--with-gssapi"
+    "--with-mysql"
   ];
 
-  buildInputs =
-   [ gettext gdbm libtool pam readline ncurses
-     gnutls mysql.lib guile texinfo gnum4 sasl fribidi gss nettools ]
-   ++ stdenv.lib.optional doCheck dejagnu;
+  preCheck = ''
+    # Add missing files.
+    cp ${builtins.toString readmsg-tests} readmsg/tests/
+    for f in hdr.at nohdr.at twomsg.at weed.at; do
+      mv readmsg/tests/*-$f readmsg/tests/$f
+    done
+    # Disable comsat tests that fail without tty in the sandbox.
+    tty -s || echo > comsat/tests/testsuite.at
+    # Disable mda tests that require /etc/passwd to contain root.
+    grep -qo '^root:' /etc/passwd || echo > maidag/tests/mda.at
+    # Provide libraries for mhn.
+    export LD_LIBRARY_PATH=$(pwd)/lib/.libs
+  '';
+  postCheck = "unset LD_LIBRARY_PATH";
 
   doCheck = true;
+  enableParallelBuilding = true;
+  hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
     description = "Rich and powerful protocol-independent mail framework";
@@ -60,7 +100,7 @@ stdenv.mkDerivation rec {
       gpl3Plus /* tools */
     ];
 
-    maintainers = with maintainers; [ vrthra ];
+    maintainers = with maintainers; [ orivej vrthra ];
 
     homepage = http://www.gnu.org/software/mailutils/;
 
diff --git a/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch b/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch
new file mode 100644
index 00000000000..b28dfc5d99c
--- /dev/null
+++ b/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch
@@ -0,0 +1,14 @@
+diff --git a/frm/frm.h b/frm/frm.h
+index 178b87d54..7931faada 100644
+--- a/frm/frm.h
++++ b/frm/frm.h
+@@ -34,6 +34,9 @@
+ #ifdef HAVE_ICONV_H
+ # include <iconv.h>
+ #endif
++#ifdef HAVE_LIMITS_H
++# include <limits.h>
++#endif
+ #ifndef MB_LEN_MAX
+ # define MB_LEN_MAX 4
+ #endif
diff --git a/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch b/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch
new file mode 100644
index 00000000000..3d301d530de
--- /dev/null
+++ b/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch
@@ -0,0 +1,16 @@
+diff --git a/mh/tests/ali.at b/mh/tests/ali.at
+index 28c0e5451..c76cf9363 100644
+--- a/mh/tests/ali.at
++++ b/mh/tests/ali.at
+@@ -85,9 +85,9 @@ ali -a ./mh_aliases korzen | tr -d ' '
+ [expout])
+ 
+ MH_CHECK([ali: group id],[ali05 ali-group-id ali-gid],[
+-cat /etc/passwd | awk -F : '/^#/ { next } $4==0 { print $1 }' > expout
++cat /etc/passwd | awk -F : '/^#/ { next } $4==0 { print $1; exit }' > expout
+ test -s expout || AT_SKIP_TEST
+-name=`awk -F : '/^#/ { next } $3==0 { print $1 }' /etc/group < /dev/null`
++name=`awk -F : '/^#/ { next } $3==0 { print $1; exit }' /etc/group < /dev/null`
+ test -z "$name" && AT_SKIP_TEST
+ 
+ echo "korzen: +$name" > mh_aliases
diff --git a/pkgs/tools/networking/mailutils/no-gets.patch b/pkgs/tools/networking/mailutils/no-gets.patch
deleted file mode 100644
index d72fa3f056c..00000000000
--- a/pkgs/tools/networking/mailutils/no-gets.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -138,8 +138,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
--#undef gets
-+#ifdef gets
-+# undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/pkgs/tools/networking/mailutils/path-to-cat.patch b/pkgs/tools/networking/mailutils/path-to-cat.patch
index a9ae7c5366d..698ee08f340 100644
--- a/pkgs/tools/networking/mailutils/path-to-cat.patch
+++ b/pkgs/tools/networking/mailutils/path-to-cat.patch
@@ -1,8 +1,47 @@
-Fix absolute path to `cat'.
-
---- mailutils-2.2/testsuite/lib/mailutils.exp	2010-09-10 13:39:58.000000000 +0200
-+++ mailutils-2.2/testsuite/lib/mailutils.exp	2010-09-10 13:40:00.000000000 +0200
-@@ -719,7 +719,7 @@ proc mu_test_file {args} {
+diff --git a/mh/show.c b/mh/show.c
+index a43afe10c..6985386ec 100644
+--- a/mh/show.c
++++ b/mh/show.c
+@@ -254,7 +254,7 @@ main (int argc, char **argv)
+   */
+ 
+   if (!use_showproc)
+-    showproc = "/bin/cat";
++    showproc = "cat";
+   else
+     showproc = mh_global_profile_get ("showproc", NULL);
+ 
+diff --git a/mh/tests/mhparam.at b/mh/tests/mhparam.at
+index 54b7fc06a..3abd5bf9b 100644
+--- a/mh/tests/mhparam.at
++++ b/mh/tests/mhparam.at
+@@ -28,7 +28,7 @@ mhparam -all | tr '\t' ' ' | sed 's/^Path:.*/Path: Mail/;s/^mhetcdir:.*/mhetcdir
+ [0],
+ [Path: Mail
+ mhetcdir: dir
+-moreproc: /bin/cat
++moreproc: cat
+ Sequence-Negation: not
+ Draft-Folder: Mail/drafts
+ Aliasfile: .mh_aliases
+diff --git a/mh/tests/testsuite.at b/mh/tests/testsuite.at
+index c6820843c..6675a4a9c 100644
+--- a/mh/tests/testsuite.at
++++ b/mh/tests/testsuite.at
+@@ -25,7 +25,7 @@ export MH
+ cat > $MH <<EOT
+ Path: $HOME/Mail
+ mhetcdir: $abs_top_srcdir/mh/etc
+-moreproc: /bin/cat
++moreproc: cat
+ EOT
+ MTSTAILOR=$HOME/mtstailor
+ export MTSTAILOR
+diff --git a/testsuite/lib/mailutils.exp b/testsuite/lib/mailutils.exp
+index d4691d922..c1b056933 100644
+--- a/testsuite/lib/mailutils.exp
++++ b/testsuite/lib/mailutils.exp
+@@ -728,7 +728,7 @@ proc mu_test_file {args} {
          set pattern [lrange $args 1 end]
      }
      
diff --git a/pkgs/tools/networking/mailutils/scm_c_string.patch b/pkgs/tools/networking/mailutils/scm_c_string.patch
deleted file mode 100644
index 367dd2d6406..00000000000
--- a/pkgs/tools/networking/mailutils/scm_c_string.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-See https://lists.gnu.org/archive/html/bug-mailutils/2010-10/msg00005.html
-
-diff -u mailutils-2.2/libmu_scm/mu_message.c mailutils-2.2.new/libmu_scm/mu_message.c
---- mailutils-2.2/libmu_scm/mu_message.c	2010-04-18 10:29:07.000000000 -0700
-+++ mailutils-2.2.new/libmu_scm/mu_message.c	2016-07-03 21:18:53.746185547 -0700
-@@ -510,8 +510,8 @@
-     {
-       SCM car = SCM_CAR (lst);
-       if (scm_is_string (car)
- 	  && mu_c_strncasecmp (scm_i_string_chars (car), name,
--			       scm_i_string_length (car)) == 0)
-+			       scm_c_string_length (car)) == 0)
- 	return 1;
-     }
-   return 0;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5b963a6a1c..07445e2fb84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3075,6 +3075,7 @@ with pkgs;
   mailpile = callPackage ../applications/networking/mailreaders/mailpile { };
 
   mailutils = callPackage ../tools/networking/mailutils {
+    guile = guile_2_0;  # compilation fails with guile 2.2
     sasl = gsasl;
   };
 

From 100107a3cd166da87b527eabf49f477ea2d18c9f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 26 Jul 2017 12:59:02 +0200
Subject: [PATCH 0973/3246] fetchpatch: add excludes parameter

---
 pkgs/build-support/fetchpatch/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index a6ddf132cd5..a9bfac320fb 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -5,7 +5,7 @@
 # stripLen acts as the -p parameter when applying a patch.
 
 { lib, fetchurl, patchutils }:
-{ stripLen ? 0, addPrefixes ? false, ... }@args:
+{ stripLen ? 0, addPrefixes ? false, excludes ? [], ... }@args:
 
 fetchurl ({
   postFetch = ''
@@ -21,7 +21,10 @@ fetchurl ({
            --addnewprefix=b/ \
         ''} \
         --clean "$out" > "$tmpfile"
-    mv "$tmpfile" "$out"
+    ${patchutils}/bin/filterdiff \
+      -p1 \
+      ${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \
+      "$tmpfile" > "$out"
     ${args.postFetch or ""}
   '';
-} // builtins.removeAttrs args ["stripLen" "addPrefixes"])
+} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes"])

From 4a787b292abe90c02975849b98c308ebb9b87ad8 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 26 Jul 2017 13:12:37 +0200
Subject: [PATCH 0974/3246] mailutils: clean up and fix last test

---
 pkgs/tools/networking/mailutils/default.nix | 29 ++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 82d581650bb..aee5302405a 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook gettext libtool pkgconfig
   ] ++ stdenv.lib.optional doCheck dejagnu;
-
   buildInputs = [
     gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
     gss mysql.lib
@@ -26,7 +25,8 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "${p}/mailutils-3.2-fix-build.patch";
+      url = "https://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=afbb33cf9ff";
+      excludes = [ "NEWS" ];
       sha256 = "0yzkfx3j1zkkb43fhchjqphw4xznbclj39bjzjggv32gppy6d1db";
     })
     ./fix-build-mb-len-max.patch
@@ -34,6 +34,16 @@ stdenv.mkDerivation rec {
     ./path-to-cat.patch
   ];
 
+  doCheck = true;
+  enableParallelBuilding = true;
+  hardeningDisable = [ "format" ];
+
+  configureFlags = [
+    "--with-gssapi"
+    "--with-gsasl"
+    "--with-mysql"
+  ];
+
   readmsg-tests = stdenv.lib.optionals doCheck [
     (fetchurl { url = "${p}/hdr.at"; sha256 = "0phpkqyhs26chn63wjns6ydx9468ng3ssbjbfhcvza8h78jlsd98"; })
     (fetchurl { url = "${p}/nohdr.at"; sha256 = "1vkbkfkbqj6ml62s1am8i286hxwnpsmbhbnq0i2i0j1i7iwkk4b7"; })
@@ -48,11 +58,6 @@ stdenv.mkDerivation rec {
       */Makefile{.in,.am}
   '';
 
-  configureFlags = [
-    "--with-gssapi"
-    "--with-mysql"
-  ];
-
   preCheck = ''
     # Add missing files.
     cp ${builtins.toString readmsg-tests} readmsg/tests/
@@ -61,16 +66,16 @@ stdenv.mkDerivation rec {
     done
     # Disable comsat tests that fail without tty in the sandbox.
     tty -s || echo > comsat/tests/testsuite.at
+    # Disable lmtp tests that require root spool.
+    echo > maidag/tests/lmtp.at
     # Disable mda tests that require /etc/passwd to contain root.
     grep -qo '^root:' /etc/passwd || echo > maidag/tests/mda.at
     # Provide libraries for mhn.
     export LD_LIBRARY_PATH=$(pwd)/lib/.libs
   '';
-  postCheck = "unset LD_LIBRARY_PATH";
-
-  doCheck = true;
-  enableParallelBuilding = true;
-  hardeningDisable = [ "format" ];
+  postCheck = ''
+    unset LD_LIBRARY_PATH
+  '';
 
   meta = with stdenv.lib; {
     description = "Rich and powerful protocol-independent mail framework";

From 358abce8373b52c6c8acd8d5416706c55cc72825 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 26 Jul 2017 15:24:42 +0300
Subject: [PATCH 0975/3246] autofs service: fix the manual

Fixes #27202.
---
 nixos/modules/services/misc/autofs.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
index 40b48f70f7e..f1742177326 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
@@ -20,10 +20,10 @@ in
 
       enable = mkOption {
         default = false;
-        description = "
+        description = ''
           Mount filesystems on demand. Unmount them automatically.
           You may also be interested in afuse.
-        ";
+        '';
       };
 
       autoMaster = mkOption {
@@ -45,10 +45,9 @@ in
             /auto file:''${mapConf}
           '''
         '';
-        description = "
-          file contents of /etc/auto.master. See man auto.master
-          See man 5 auto.master and man 5 autofs.
-        ";
+        description = ''
+          Contents of <literal>/etc/auto.master</literal> file. See <command>auto.master(5)</command> and <command>autofs(5)</command>.
+        '';
       };
 
       timeout = mkOption {
@@ -58,9 +57,9 @@ in
 
       debug = mkOption {
         default = false;
-        description = "
-        pass -d and -7 to automount and write log to /var/log/autofs
-        ";
+        description = ''
+          Pass -d and -7 to automount and write log to the system journal.
+        '';
       };
 
     };

From f6f40e3fe5fbb9721624a218faea1b520f9ec200 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 25 Jul 2017 18:48:47 -0400
Subject: [PATCH 0976/3246] stdenv-setup and misc pkgs: Revert to
 space-deliminated propagated-* files

We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
---
 pkgs/build-support/cc-wrapper/default.nix     |  6 +++---
 pkgs/build-support/gcc-wrapper-old/builder.sh |  2 +-
 pkgs/build-support/trivial-builders.nix       |  2 +-
 .../desktops/kde-4.14/kde-package/default.nix |  2 +-
 .../compilers/openjdk-darwin/8.nix            |  2 +-
 .../compilers/openjdk-darwin/default.nix      |  2 +-
 pkgs/development/compilers/openjdk/7.nix      |  2 +-
 pkgs/development/compilers/openjdk/8.nix      |  2 +-
 .../compilers/oraclejdk/jdk-linux-base.nix    |  2 +-
 pkgs/development/compilers/zulu/default.nix   |  2 +-
 .../haskell-modules/generic-builder.nix       |  2 +-
 pkgs/misc/misc.nix                            |  2 +-
 pkgs/stdenv/generic/builder.sh                |  2 +-
 pkgs/stdenv/generic/setup.sh                  | 19 +++++++++++--------
 14 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 1b52a0b8b12..09d1d4cd681 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation {
       # The dynamic linker is passed in `ldflagsBefore' to allow
       # explicit overrides of the dynamic linker by callers to gcc/ld
       # (the *last* value counts, so ours should come first).
-      printLines "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
+      printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
     '')
 
     + optionalString (libc != null) ''
@@ -258,9 +258,9 @@ stdenv.mkDerivation {
       # Propagate the wrapped cc so that if you install the wrapper,
       # you get tools like gcov, the manpages, etc. as well (including
       # for binutils and Glibc).
-      printLines ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
+      printWords ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
 
-      printLines ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
+      printWords ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
     ''
 
     + optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh
index 4f141f6b8f2..22e32814927 100644
--- a/pkgs/build-support/gcc-wrapper-old/builder.sh
+++ b/pkgs/build-support/gcc-wrapper-old/builder.sh
@@ -211,5 +211,5 @@ cp -p $utils $out/nix-support/utils.sh
 # tools like gcov, the manpages, etc. as well (including for binutils
 # and Glibc).
 if test -z "$nativeTools"; then
-    printLines $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages
+    printWords $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages
 fi
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 1ee1fe8298f..16bd4e8e405 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -84,7 +84,7 @@ rec {
         mkdir -p $out/nix-support
         cp ${script} $out/nix-support/setup-hook
       '' + lib.optionalString (deps != []) ''
-        printLines ${toString deps} > $out/nix-support/propagated-native-build-inputs
+        printWords ${toString deps} > $out/nix-support/propagated-native-build-inputs
       '' + lib.optionalString (substitutions != {}) ''
         substituteAll ${script} $out/nix-support/setup-hook
       '');
diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix
index 3637d9f89cb..94f878097de 100644
--- a/pkgs/desktops/kde-4.14/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/default.nix
@@ -86,7 +86,7 @@ rec {
        };})
         ''
           mkdir -pv $out/nix-support
-          printLines ${toString list} | tee $out/nix-support/propagated-user-env-packages
+          printWords ${toString list} | tee $out/nix-support/propagated-user-env-packages
         '';
 
   # Given manifest module data, return the module
diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
index 691829c7788..6234b63208c 100644
--- a/pkgs/development/compilers/openjdk-darwin/8.nix
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -33,7 +33,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $out/nix-support
-      printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
+      printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
 
       install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
 
diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index 8ce0835fcb6..1e8f88beea6 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -23,7 +23,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $out/nix-support
-      printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
+      printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
 
       install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
 
diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix
index 9ef7d26b2ef..72f0ba293ba 100644
--- a/pkgs/development/compilers/openjdk/7.nix
+++ b/pkgs/development/compilers/openjdk/7.nix
@@ -190,7 +190,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $jre/nix-support
-      printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
+      printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
 
       # Set JAVA_HOME automatically.
       mkdir -p $out/nix-support
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 7c50872ebe5..0f0b42640c5 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -202,7 +202,7 @@ let
       # any package that depends on the JRE has $CLASSPATH set up
       # properly.
       mkdir -p $jre/nix-support
-      printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
+      printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
 
       # Set JAVA_HOME automatically.
       mkdir -p $out/nix-support
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 08fd724f773..fec038199ad 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -165,7 +165,7 @@ let result = stdenv.mkDerivation rec {
     ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
 
     mkdir -p $out/nix-support
-    printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
+    printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
 
     # Set JAVA_HOME automatically.
     cat <<EOF >> $out/nix-support/setup-hook
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 03be4ee8a0b..f7638757ff7 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
     find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
 
     mkdir -p $out/nix-support
-    printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
+    printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
 
     # Set JAVA_HOME automatically.
     cat <<EOF >> $out/nix-support/setup-hook
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a8da63493a4..c7c54c959b5 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -311,7 +311,7 @@ stdenv.mkDerivation ({
     ${optionalString isGhcjs ''
       for exeDir in "$out/bin/"*.jsexe; do
         exe="''${exeDir%.jsexe}"
-        printLines '#!${nodejs}/bin/node' > "$exe"
+        printWords '#!${nodejs}/bin/node' > "$exe"
         cat "$exeDir/all.js" >> "$exe"
         chmod +x "$exe"
       done
diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix
index 6e8c6f4486f..a3c293beab3 100644
--- a/pkgs/misc/misc.nix
+++ b/pkgs/misc/misc.nix
@@ -23,7 +23,7 @@ in
   */
   collection = {list, name} : runCommand "collection-${name}" {} ''
     mkdir -p $out/nix-support
-    printLines ${builtins.toString list} > $out/nix-support/propagated-user-env-packages
+    printWords ${builtins.toString list} > $out/nix-support/propagated-user-env-packages
   '';
 
   /* creates a derivation symlinking references C/C++ libs into one include and lib directory called $out/cdt-envs/${name}
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index f8c0fd44ac7..686cb778ca7 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -15,5 +15,5 @@ cat "$setup" >> $out/setup
 # in stdenv.
 mkdir $out/nix-support
 if [ "$propagatedUserEnvPkgs" ]; then
-    printf '%s\n' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
+    printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
 fi
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index e0a33ca1c38..56ab8223296 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -210,6 +210,11 @@ printLines() {
     printf '%s\n' "$@"
 }
 
+printWords() {
+    [[ "$#" -gt 0 ]] || return 0
+    printf '%s ' "$@"
+}
+
 ######################################################################
 # Initialisation.
 
@@ -291,12 +296,10 @@ findInputs() {
     fi
 
     if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then
-        local fd pkgNext
-        exec {fd}<"$pkg/nix-support/$propagatedBuildInputsFile"
-        while IFS= read -r -u $fd pkgNext; do
+        local pkgNext
+        for pkgNext in $(< "$pkg/nix-support/$propagatedBuildInputsFile"); do
             findInputs "$pkgNext" "$var" "$propagatedBuildInputsFile"
         done
-        exec {fd}<&-
     fi
 }
 
@@ -814,19 +817,19 @@ fixupPhase() {
         if [ -n "$propagated" ]; then
             mkdir -p "${!outputDev}/nix-support"
             # shellcheck disable=SC2086
-            printLines $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs"
+            printWords $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     else
         if [ -n "$propagatedBuildInputs" ]; then
             mkdir -p "${!outputDev}/nix-support"
             # shellcheck disable=SC2086
-            printLines $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"
+            printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"
         fi
 
         if [ -n "$propagatedNativeBuildInputs" ]; then
             mkdir -p "${!outputDev}/nix-support"
             # shellcheck disable=SC2086
-            printLines $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"
+            printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     fi
 
@@ -840,7 +843,7 @@ fixupPhase() {
     if [ -n "$propagatedUserEnvPkgs" ]; then
         mkdir -p "${!outputBin}/nix-support"
         # shellcheck disable=SC2086
-        printLines $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
+        printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
     fi
 
     runHook postFixup

From ea7d13cf1acc60999a442b46b279460928165140 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 25 Jul 2017 17:48:50 -0400
Subject: [PATCH 0977/3246] stdenv-setup and misc hooks: Work with bash-3.4 for
 MacOS nix-shell

This is a temporary measure until this impurity is removed from Nix.
---
 pkgs/build-support/cc-wrapper/setup-hook.sh   |  2 +-
 .../haskell-modules/generic-builder.nix       |  2 +-
 pkgs/servers/x11/xorg/builder.sh              |  4 +-
 pkgs/stdenv/generic/setup.sh                  | 38 ++++++++++++-------
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 3e8494cf9c1..104b82425f2 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -54,7 +54,7 @@ do
     if
         PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null
     then
-        export "${ENV_PREFIX}${CMD^^}=@binPrefix@${CMD}";
+        export "${ENV_PREFIX}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}";
     fi
 done
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index c7c54c959b5..2ec77b0563a 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -211,7 +211,7 @@ stdenv.mkDerivation ({
     configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
 
     # nativePkgs defined in stdenv/setup.hs
-    for p in "''${!nativePkgs[@]}"; do
+    for p in "''${nativePkgs[@]}"; do
       if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
         cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
         continue
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 3a8cf6fa6c8..fae8bf5a8ce 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -18,14 +18,14 @@ postInstall() {
 
     for r in $requires; do
         if test -n "$crossConfig"; then
-            for p in "${!crossPkgs[@]}"; do
+            for p in "${crossPkgs[@]}"; do
                 if test -e $p/lib/pkgconfig/$r.pc; then
                     echo "  found requisite $r in $p"
                     propagatedBuildInputs="$propagatedBuildInputs $p"
                 fi
             done
         else
-            for p in "${!nativePkgs[@]}"; do
+            for p in "${nativePkgs[@]}"; do
                 if test -e $p/lib/pkgconfig/$r.pc; then
                     echo "  found requisite $r in $p"
                     propagatedNativeBuildInputs="$propagatedNativeBuildInputs $p"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 56ab8223296..1e8b5f57585 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -17,9 +17,10 @@ runHook() {
     shift
     local var="$hookName"
     if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
-    local -n var
+
+    local varRef="$var[@]"
     local hook
-    for hook in "_callImplicitHook 0 $hookName" "${var[@]}"; do
+    for hook in "_callImplicitHook 0 $hookName" "${!varRef}"; do
         _eval "$hook" "$@"
     done
     return 0
@@ -33,9 +34,10 @@ runOneHook() {
     shift
     local var="$hookName"
     if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
-    local -n var
+
+    local varRef="$var[@]"
     local hook
-    for hook in "_callImplicitHook 1 $hookName" "${var[@]}"; do
+    for hook in "_callImplicitHook 1 $hookName" "${!varRef}"; do
         if _eval "$hook" "$@"; then
             return 0
         fi
@@ -271,12 +273,22 @@ runHook addInputsHook
 findInputs() {
     local pkg="$1"
     local var="$2"
-    local -n varDeref="$var"
     local propagatedBuildInputsFile="$3"
 
-    # Stop if we've already added this one
-    [[ -z "${varDeref["$pkg"]}" ]] || return 0
-    varDeref["$pkg"]=1
+    # TODO(@Ericson2314): Restore using associative array once Darwin
+    # nix-shell doesn't use impure bash. This should replace the O(n)
+    # case with an O(1) hash map lookup, assuming bash is implemented
+    # well :D.
+    local varRef="$var[*]"
+
+    case "${!varRef}" in
+        *" $pkg "*) return 0 ;;
+    esac
+
+    # For some reason, bash gives us some (hopefully limited) eval
+    # "for free"! Everything is single-quoted except for `"$var"`
+    # so `var` is expanded first.
+    declare -g "$var"'=("${'"$var"'[@]}" "$pkg")'
 
     if ! [ -e "$pkg" ]; then
         echo "build input $pkg does not exist" >&2
@@ -306,19 +318,19 @@ findInputs() {
 if [ -z "$crossConfig" ]; then
     # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)
     # are handled identically to nativeBuildInputs
-    declare -gA nativePkgs
+    declare -ga nativePkgs
     for i in $nativeBuildInputs $buildInputs \
              $defaultNativeBuildInputs $defaultBuildInputs \
              $propagatedNativeBuildInputs $propagatedBuildInputs; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 else
-    declare -gA crossPkgs
+    declare -ga crossPkgs
     for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
         findInputs "$i" crossPkgs propagated-build-inputs
     done
 
-    declare -gA nativePkgs
+    declare -ga nativePkgs
     for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
@@ -334,7 +346,7 @@ _addToNativeEnv() {
     runHook envHook "$pkg"
 }
 
-for i in "${!nativePkgs[@]}"; do
+for i in "${nativePkgs[@]}"; do
     _addToNativeEnv "$i"
 done
 
@@ -345,7 +357,7 @@ _addToCrossEnv() {
     runHook crossEnvHook "$pkg"
 }
 
-for i in "${!crossPkgs[@]}"; do
+for i in "${crossPkgs[@]}"; do
     _addToCrossEnv "$i"
 done
 

From 820e4021d3474d6d11d8847be8b2ae9b24da72d8 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 25 Jul 2017 20:58:47 -0400
Subject: [PATCH 0978/3246] stdenv-setup: Remove any `declare -g`

This is invalid before bash-4.2, affecting bash used impurely in
nix-shell on MacOS.
---
 pkgs/stdenv/generic/setup.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 1e8b5f57585..dc3369f6611 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -285,10 +285,7 @@ findInputs() {
         *" $pkg "*) return 0 ;;
     esac
 
-    # For some reason, bash gives us some (hopefully limited) eval
-    # "for free"! Everything is single-quoted except for `"$var"`
-    # so `var` is expanded first.
-    declare -g "$var"'=("${'"$var"'[@]}" "$pkg")'
+    eval "$var"'+=("$pkg")'
 
     if ! [ -e "$pkg" ]; then
         echo "build input $pkg does not exist" >&2
@@ -318,19 +315,19 @@ findInputs() {
 if [ -z "$crossConfig" ]; then
     # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)
     # are handled identically to nativeBuildInputs
-    declare -ga nativePkgs
+    declare -a nativePkgs
     for i in $nativeBuildInputs $buildInputs \
              $defaultNativeBuildInputs $defaultBuildInputs \
              $propagatedNativeBuildInputs $propagatedBuildInputs; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 else
-    declare -ga crossPkgs
+    declare -a crossPkgs
     for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
         findInputs "$i" crossPkgs propagated-build-inputs
     done
 
-    declare -ga nativePkgs
+    declare -a nativePkgs
     for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done

From 868dd0f7c1c14b2eadf256d05ef10a23666440b3 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Wed, 26 Jul 2017 15:12:58 +0200
Subject: [PATCH 0979/3246] tup: 0.7.3 -> 0.7.5

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

diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix
index 872a65889df..828fe20ecc5 100644
--- a/pkgs/development/tools/build-managers/tup/default.nix
+++ b/pkgs/development/tools/build-managers/tup/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tup-${version}";
-  version = "0.7.3";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "gittup";
     repo = "tup";
     rev = "v${version}";
-    sha256 = "1x2grwmlf2izip4djb8cjwgl8p3x0bmfqwzjsc017mqi17qkijy8";
+    sha256 = "0jzp1llq6635ldb7j9qb29j2k0x5mblimdqg3179dvva1hv0ia23";
   };
 
   buildInputs = [ fuse pkgconfig ];

From e420be7ab5febf16a6e5612b0ce31b37d9587b98 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 26 Jul 2017 09:04:18 +0200
Subject: [PATCH 0980/3246] libidn2: 2.0.2 -> 2.0.3

See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00008.html
for release information
---
 pkgs/development/libraries/libidn2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 61926dad24d..e3e4e000773 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -1,21 +1,21 @@
-{ fetchurl, stdenv, libiconv, libunistring, help2man }:
+{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libidn2-${version}";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
-    sha256 = "1azfhz8zj1c27a5k2cspnkzkyfhcsqx2yc2sygh720dbn8l2imlc";
+    sha256 = "1k88acdf242a6lbznr0h6f02frsqyqw4smw1nznibim5wyf18da3";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];
 
   patches = optional stdenv.isDarwin ./fix-error-darwin.patch;
 
-  buildInputs = [ libunistring ]
+  buildInputs = [ libunistring ronn ]
     ++ optionals stdenv.isDarwin [ libiconv help2man ];
 
   meta = {

From fd43b508775dd9490cc1314c4239ab48265d4529 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 14 Feb 2017 15:43:03 +0100
Subject: [PATCH 0981/3246] kbd: 2.0.3 -> 2.0.4

---
 pkgs/os-specific/linux/kbd/console-fix.patch  | 18 -----
 pkgs/os-specific/linux/kbd/default.nix        | 17 +++-
 pkgs/os-specific/linux/kbd/search-paths.patch | 78 +++++++++----------
 3 files changed, 49 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kbd/console-fix.patch

diff --git a/pkgs/os-specific/linux/kbd/console-fix.patch b/pkgs/os-specific/linux/kbd/console-fix.patch
deleted file mode 100644
index aefc20ff914..00000000000
--- a/pkgs/os-specific/linux/kbd/console-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/loadkeys.c b/src/loadkeys.c
-index 6b23f68..adf65a0 100644
---- a/src/loadkeys.c
-+++ b/src/loadkeys.c
-@@ -166,10 +166,10 @@ main(int argc, char *argv[])
- 		exit(EXIT_FAILURE);
- 	}
- 
--	/* get console */
--	fd = getfd(console);
--
- 	if (!(options & OPT_M) && !(options & OPT_B)) {
-+		/* get console */
-+		fd = getfd(console);
-+
- 		/* check whether the keyboard is in Unicode mode */
- 		if (ioctl(fd, KDGKBMODE, &kbd_mode) ||
- 		    ioctl(fd, KDGETMODE, &kd_mode)) {
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index 6e8893cc37d..31fcdae6c80 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, flex, check, pam }:
+{ stdenv, fetchurl, autoreconfHook,
+  gzip, bzip2, pkgconfig, flex, check,
+  pam, coreutils
+}:
 
 stdenv.mkDerivation rec {
   name = "kbd-${version}";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz";
-    sha256 = "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs";
+    sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz";
   };
 
   configureFlags = [
@@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
     "--disable-nls"
   ];
 
-  patches = [ ./console-fix.patch ./search-paths.patch ];
+  patches = [ ./search-paths.patch ];
 
   postPatch =
     ''
@@ -34,6 +37,12 @@ stdenv.mkDerivation rec {
       ''}
     '';
 
+  postInstall = ''
+    substituteInPlace $out/bin/unicode_{start,stop} \
+      --replace /usr/bin/tty ${coreutils}/bin/tty
+  '';
+
+
   buildInputs = [ check pam ];
   nativeBuildInputs = [ autoreconfHook pkgconfig flex ];
 
diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/os-specific/linux/kbd/search-paths.patch
index 66a56041481..c9405a56721 100644
--- a/pkgs/os-specific/linux/kbd/search-paths.patch
+++ b/pkgs/os-specific/linux/kbd/search-paths.patch
@@ -1,77 +1,71 @@
-diff -ru3 kbd-2.0.3-old/src/libkeymap/analyze.l kbd-2.0.3/src/libkeymap/analyze.l
---- kbd-2.0.3-old/src/libkeymap/analyze.l	2016-07-03 02:31:28.258958092 +0300
-+++ kbd-2.0.3/src/libkeymap/analyze.l	2016-07-03 02:44:53.042592223 +0300
-@@ -99,6 +99,9 @@
+--- a/src/libkeymap/analyze.l
++++ b/src/libkeymap/analyze.l
+@@ -101,6 +101,9 @@ stack_pop(struct lk_ctx *ctx, void *scan
  static const char *const include_dirpath0[] = { "", 0 };
  static const char *const include_dirpath1[] = { "", "../include/", "../../include/", 0 };
  static const char *const include_dirpath3[] = {
-+	"/etc/kbd/" KEYMAPDIR "/include/",
-+	"/etc/kbd/" KEYMAPDIR "/i386/include/",
-+	"/etc/kbd/" KEYMAPDIR "/mac/include/",
++ 	"/etc/kbd/" KEYMAPDIR "/include/",
++ 	"/etc/kbd/" KEYMAPDIR "/i386/include/",
++ 	"/etc/kbd/" KEYMAPDIR "/mac/include/",
  	DATADIR "/" KEYMAPDIR "/include/",
  	DATADIR "/" KEYMAPDIR "/i386/include/",
  	DATADIR "/" KEYMAPDIR "/mac/include/", 0
-diff -ru3 kbd-2.0.3-old/src/loadkeys.c kbd-2.0.3/src/loadkeys.c
---- kbd-2.0.3-old/src/loadkeys.c	2016-07-03 02:31:28.260958091 +0300
-+++ kbd-2.0.3/src/loadkeys.c	2016-07-03 02:34:34.123871103 +0300
-@@ -26,7 +26,7 @@
+--- a/src/loadkeys.c
++++ b/src/loadkeys.c
+@@ -27,7 +27,7 @@
  #include "keymap.h"
  
- static const char *progname = NULL;
+ static const char *progname         = NULL;
 -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
 +static const char *const dirpath1[] = { "", "/etc/kbd/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", 0 };
  static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
  
- static void __attribute__ ((noreturn))
-diff -ru3 kbd-2.0.3-old/src/loadunimap.c kbd-2.0.3/src/loadunimap.c
---- kbd-2.0.3-old/src/loadunimap.c	2016-07-03 02:31:28.259958091 +0300
-+++ kbd-2.0.3/src/loadunimap.c	2016-07-03 02:33:06.803911971 +0300
-@@ -28,7 +28,7 @@
+ static void __attribute__((noreturn))
+--- a/src/loadunimap.c
++++ b/src/loadunimap.c
+@@ -30,7 +30,7 @@
  extern char *progname;
  extern int force;
  
--static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
-+static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 };
+-static const char *const unidirpath[]  = { "", DATADIR "/" UNIMAPDIR "/", 0 };
++static const char *const unidirpath[]  = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 };
  static const char *const unisuffixes[] = { "", ".uni", ".sfm", 0 };
  
  #ifdef MAIN
-diff -ru3 kbd-2.0.3-old/src/mapscrn.c kbd-2.0.3/src/mapscrn.c
---- kbd-2.0.3-old/src/mapscrn.c	2016-07-03 02:31:28.260958091 +0300
-+++ kbd-2.0.3/src/mapscrn.c	2016-07-03 02:33:21.119905270 +0300
-@@ -25,7 +25,7 @@
- static int ctoi (char *);
+--- a/src/mapscrn.c
++++ b/src/mapscrn.c
+@@ -27,7 +27,7 @@ void loadnewmap(int fd, char *mfil);
+ static int ctoi(char *);
  
  /* search for the map file in these directories (with trailing /) */
--static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
-+static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 };
+-static const char *const mapdirpath[]  = { "", DATADIR "/" TRANSDIR "/", 0 };
++static const char *const mapdirpath[]  = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 };
  static const char *const mapsuffixes[] = { "", ".trans", "_to_uni.trans", ".acm", 0 };
  
  #ifdef MAIN
-diff -ru3 kbd-2.0.3-old/src/resizecons.c kbd-2.0.3/src/resizecons.c
---- kbd-2.0.3-old/src/resizecons.c	2016-07-03 02:31:28.260958091 +0300
-+++ kbd-2.0.3/src/resizecons.c	2016-07-03 02:33:32.253900060 +0300
-@@ -100,7 +100,7 @@
+--- a/src/resizecons.c
++++ b/src/resizecons.c
+@@ -101,7 +101,7 @@ static int vga_get_fontheight(void);
  static void vga_set_cursor(int, int);
  static void vga_set_verticaldisplayend_lowbyte(int);
  
--const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0};
-+const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0};
+-const char *const dirpath[]  = { "", DATADIR "/" VIDEOMODEDIR "/", 0 };
++const char *const dirpath[]  = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0};
  const char *const suffixes[] = { "", 0 };
  
- int
-diff -ru3 kbd-2.0.3-old/src/setfont.c kbd-2.0.3/src/setfont.c
---- kbd-2.0.3-old/src/setfont.c	2016-07-03 02:31:28.260958091 +0300
-+++ kbd-2.0.3/src/setfont.c	2016-07-03 02:33:54.315889734 +0300
-@@ -51,10 +51,10 @@
- int debug = 0;
+ int main(int argc, char **argv)
+--- a/src/setfont.c
++++ b/src/setfont.c
+@@ -53,10 +53,10 @@ int force   = 0;
+ int debug   = 0;
  
  /* search for the font in these directories (with trailing /) */
--const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 };
-+const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 };
+-const char *const fontdirpath[]  = { "", DATADIR "/" FONTDIR "/", 0 };
++const char *const fontdirpath[]  = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 };
  const char *const fontsuffixes[] = { "", ".psfu", ".psf", ".cp", ".fnt", 0 };
  /* hide partial fonts a bit - loading a single one is a bad idea */
--const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
-+const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
+-const char *const partfontdirpath[]  = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
++const char *const partfontdirpath[]  = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
  const char *const partfontsuffixes[] = { "", 0 };
  
  static inline int

From c3a9f59513361b1acf30da241af95b29016f1dd9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 28 May 2017 14:04:21 +0300
Subject: [PATCH 0982/3246] mumble_git: 2017-04-16 -> 2017-05-25

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 696681dce27..1b87008bac7 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -119,14 +119,14 @@ let
   };
 
   gitSource = rec {
-    version = "2017-04-16";
+    version = "2017-05-25";
     qtVersion = 5;
 
     # Needs submodules
     src = fetchgit {
       url = "https://github.com/mumble-voip/mumble";
-      rev = "eb63d0b14a7bc19bfdf34f80921798f0a67cdedf";
-      sha256 = "1nirbx0fnvi1nl6s5hrm4b0v7s2i22yshkmqnfjhxyr0y272s7lh";
+      rev = "3754898ac94ed3f1e86408114917d1b4c06f17b3";
+      sha256 = "1qh49x3y7m0c0h0gcs6amkf8nb75p6g611zwn19mbplwmi7h9y8f";
     };
   };
 in {

From 0a7f2acb171db920aefa418334957e8d490aff35 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 14 Jun 2017 13:37:16 +0300
Subject: [PATCH 0983/3246] boost164: init at 1.64.0

---
 pkgs/development/libraries/boost/1.64.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/libraries/boost/1.64.nix

diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix
new file mode 100644
index 00000000000..1cf9bfa51f4
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.64.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.64.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_64_0.tar.bz2";
+    # SHA256 from http://www.boost.org/users/history/version_1_64_0.html
+    sha256 = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332";
+  };
+
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07445e2fb84..e673ecde6dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7470,6 +7470,7 @@ with pkgs;
   boost160 = callPackage ../development/libraries/boost/1.60.nix { };
   boost162 = callPackage ../development/libraries/boost/1.62.nix { };
   boost163 = callPackage ../development/libraries/boost/1.63.nix { };
+  boost164 = callPackage ../development/libraries/boost/1.64.nix { };
   boost = boost162;
 
   boost_process = callPackage ../development/libraries/boost-process { };

From 50ed470a504967a0b061d7e14b5169f5ddad5cc0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 25 Jun 2017 18:02:17 +0300
Subject: [PATCH 0984/3246] python.pkgs.PyChromecast: init at 0.8.1

---
 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 8ca3ace2083..3bc41528c26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -190,6 +190,26 @@ in {
 
   pycryptodome = callPackage ../development/python-modules/pycryptodome { };
 
+  PyChromecast = buildPythonPackage rec {
+    name    = "PyChromecast-${version}";
+    version = "0.8.1";
+
+    src = pkgs.fetchurl {
+      url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
+      sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6";
+    };
+
+    propagatedBuildInputs = with self; [ requests six zeroconf protobuf3_2 ];
+
+    meta = {
+      description = "Library for Python 2 and 3 to communicate with the Google Chromecast";
+      homepage    = "https://github.com/balloob/pychromecast";
+      license     = licenses.mit;
+      maintainers = with maintainers; [ abbradar ];
+      platforms   = platforms.linux;
+    };
+  };
+
   pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
 
   pygame = callPackage ../development/python-modules/pygame { };

From aa4d747ac9f04248564d039b6f8bde84298955b4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 3 Jul 2017 18:05:58 +0300
Subject: [PATCH 0985/3246] python.pkgs.hmmlearn: init at 0.2.0

---
 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 3bc41528c26..c2a48d09570 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11359,6 +11359,28 @@ in {
     propagatedBuildInputs = with self; [ requests webob ];
   };
 
+  hmmlearn = buildPythonPackage rec {
+    name = "hmmlearn-${version}";
+    version = "0.2.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
+      sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9";
+    };
+
+    propagatedBuildInputs = with self; [ numpy ];
+
+    doCheck = false;
+
+    meta = {
+      description = "Hidden Markov Models in Python with scikit-learn like API";
+      homepage    = "https://github.com/hmmlearn/hmmlearn";
+      license     = licenses.bsd3;
+      maintainers = with maintainers; [ abbradar ];
+      platforms   = platforms.unix;
+    };
+  };
+
   hcs_utils = buildPythonPackage rec {
     name = "hcs_utils-1.5";
 

From fe80dbaae04e291220052f5863960d22b17d62a6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 3 Jul 2017 18:06:13 +0300
Subject: [PATCH 0986/3246] python.pkgs.sphfile: init at 1.0.0

---
 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 c2a48d09570..ece6fc3961d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11381,6 +11381,28 @@ in {
     };
   };
 
+   sphfile = buildPythonPackage rec {
+    name = "sphfile-${version}";
+    version = "1.0.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/sphfile/${name}.tar.gz";
+      sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd";
+    };
+
+    propagatedBuildInputs = with self; [ numpy ];
+
+    doCheck = false;
+
+    meta = {
+      description = "Numpy-based NIST SPH audio-file reader";
+      homepage    = "https://github.com/mcfletch/sphfile";
+      license     = licenses.mit;
+      maintainers = with maintainers; [ abbradar ];
+      platforms   = platforms.unix;
+    };
+  }; 
+
   hcs_utils = buildPythonPackage rec {
     name = "hcs_utils-1.5";
 

From ac4c567c3603c5106862f144c21037f6ad76c0ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 26 Jul 2017 17:52:13 +0200
Subject: [PATCH 0987/3246] pythonPackages.augeas: init at 1.0.2

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

diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix
new file mode 100644
index 00000000000..8934e1b81a8
--- /dev/null
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }:
+buildPythonPackage rec {
+    name = "augeas-${version}";
+    version = "1.0.2";
+
+    src = fetchFromGitHub {
+      owner = "hercules-team";
+      repo = "python-augeas";
+      rev = "v${version}";
+      sha256 = "1xk51m58ym3qpf0z5y98kzxb5jw7s92rca0v1yflj422977najxh";
+    };
+
+    # TODO: not very nice!
+    postPatch =
+      let libname = if stdenv.isDarwin then "libaugeas.dylib" else "libaugeas.so";
+      in
+      ''
+        substituteInPlace augeas/ffi.py \
+          --replace 'ffi.dlopen("augeas")' \
+                    'ffi.dlopen("${lib.makeLibraryPath [augeas]}/${libname}")'
+      '';
+
+    propagatedBuildInputs = [ cffi augeas ];
+
+    doCheck = false;
+
+    meta = with lib; {
+      description = "Pure python bindings for augeas";
+      homepage = https://github.com/hercules-team/python-augeas;
+      license = licenses.lgpl2Plus;
+      platforms = platforms.unix;
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ece6fc3961d..b57a508433d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -106,6 +106,10 @@ in {
 
   astropy = callPackage ../development/python-modules/astropy {  };
 
+  augeas = callPackage ../development/python-modules/augeas {
+    inherit (pkgs) augeas;
+  };
+
   automat = callPackage ../development/python-modules/automat { };
 
   # packages defined elsewhere

From d79072ac2e63f5e5df089d2bfb873752ddf7a1ae Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 26 Jul 2017 18:21:27 +0200
Subject: [PATCH 0988/3246] bspwm: 0.9.2 -> 0.9.3

---
 .../window-managers/bspwm/default.nix         | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 8798d2b3832..dc9d2f35965 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -1,30 +1,27 @@
-{ stdenv, fetchurl, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
+{ stdenv, fetchFromGitHub, libxcb, libXinerama
+, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm
+}:
 
 stdenv.mkDerivation rec {
   name = "bspwm-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
 
-
-  src = fetchurl {
-    url = "https://github.com/baskerville/bspwm/archive/${version}.tar.gz";
-    sha256 = "1w6wxwgyb14w664xafp3b2ps6zzf9yw7cfhbh9229x2hil9rss1k";
+  src = fetchFromGitHub {
+    owner  = "baskerville";
+    repo   = "bspwm";
+    rev    = version;
+    sha256 = "144g0vg0jsy0lja2jv1qbdps8k05nk70pc7vslj3im61a21vnbis";
   };
 
   buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
 
-  buildPhase = ''
-    make PREFIX=$out
-  '';
+  PREFIX = "$out";
 
-  installPhase = ''
-    make PREFIX=$out install
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tiling window manager based on binary space partitioning";
     homepage = http://github.com/baskerville/bspwm;
-    maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ];
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ meisternu epitrochoid ];
+    license = licenses.bsd2;
+    platforms = platforms.linux;
   };
 }

From 2989324d60c04c82dd00153e0c9db6a7e8461c17 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 26 Jul 2017 17:13:57 +0100
Subject: [PATCH 0989/3246] aws-auth: init at unstable-2017-07-24

---
 pkgs/tools/admin/aws-auth/default.nix | 31 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/admin/aws-auth/default.nix

diff --git a/pkgs/tools/admin/aws-auth/default.nix b/pkgs/tools/admin/aws-auth/default.nix
new file mode 100644
index 00000000000..6d03a95d96a
--- /dev/null
+++ b/pkgs/tools/admin/aws-auth/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, makeWrapper, jq, awscli }:
+
+stdenv.mkDerivation rec {
+  version = "unstable-2017-07-24";
+  name = "aws-auth-${version}";
+
+  src = fetchFromGitHub {
+    owner = "alphagov";
+    repo = "aws-auth";
+    rev = "5a4c9673f9f00ebaa4bb538827e1c2f277c475e1";
+    sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  # copy script and set $PATH
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src/aws-auth.sh $out/bin/aws-auth
+    wrapProgram $out/bin/aws-auth --prefix PATH : ${awscli}/bin:${jq}/bin
+  '';
+
+  meta = {
+    homepage = https://github.com/alphagov/aws-auth;
+    description = "AWS authentication wrapper to handle MFA and IAM roles";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ ris ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e673ecde6dd..7c26ba7c826 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -511,6 +511,8 @@ with pkgs;
 
   awless = callPackage ../tools/virtualization/awless { };
 
+  aws-auth = callPackage ../tools/admin/aws-auth { };
+
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
   ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };

From 27800258e117249b40352acd1cc31af5c8374f61 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 26 Jul 2017 18:45:01 +0200
Subject: [PATCH 0990/3246] aws-auth: clean up

---
 pkgs/tools/admin/aws-auth/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/aws-auth/default.nix b/pkgs/tools/admin/aws-auth/default.nix
index 6d03a95d96a..9f36a6403a1 100644
--- a/pkgs/tools/admin/aws-auth/default.nix
+++ b/pkgs/tools/admin/aws-auth/default.nix
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  phases = [ "installPhase" ];
+  dontBuild = true;
 
   # copy script and set $PATH
   installPhase = ''
-    mkdir -p $out/bin
-    cp $src/aws-auth.sh $out/bin/aws-auth
-    wrapProgram $out/bin/aws-auth --prefix PATH : ${awscli}/bin:${jq}/bin
+    install -D $src/aws-auth.sh $out/bin/aws-auth
+    wrapProgram $out/bin/aws-auth \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ awscli jq ]}
   '';
 
   meta = {

From 40a568b395cd5ded4063abb753a5f4a0b7d018a4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 26 Jul 2017 18:53:34 +0200
Subject: [PATCH 0991/3246] android-studio-preview: 3.0.0.6 -> 3.0.0.7

---
 pkgs/applications/editors/android-studio/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 860f1e53297..1dab1d47206 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,12 +27,12 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.6";
-    build = "171.4182969";
+    version = "3.0.0.7"; # This is actually "Android Studio 3.0 Canary 8"
+    build = "171.4195411";
 
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
-      sha256 = "0s26k5qr0qg6az77yw2mvnhavwi4aza4ifvd45ljank8aqr6sp5i";
+      sha256 = "1yzhr845shjq2cd5hcanppxmnj34ky9ry755y4ywf5f1w5ha5xzj";
     };
 
     meta = stable.meta // {

From 44a18ddd317e47d7330b56077fef8be3f4a66c80 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 26 Jul 2017 20:32:29 +0300
Subject: [PATCH 0992/3246] python.pkgs: move my several packages to separate
 files

---
 .../python-modules/hmmlearn/default.nix       | 23 +++++++
 .../python-modules/pychromecast/default.nix   | 21 ++++++
 .../python-modules/sphfile/default.nix        | 23 +++++++
 pkgs/top-level/python-packages.nix            | 66 ++-----------------
 4 files changed, 72 insertions(+), 61 deletions(-)
 create mode 100644 pkgs/development/python-modules/hmmlearn/default.nix
 create mode 100644 pkgs/development/python-modules/pychromecast/default.nix
 create mode 100644 pkgs/development/python-modules/sphfile/default.nix

diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
new file mode 100644
index 00000000000..eeb04245215
--- /dev/null
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchurl, buildPythonPackage, numpy }:
+
+buildPythonPackage rec {
+  name = "hmmlearn-${version}";
+  version = "0.2.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
+    sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Hidden Markov Models in Python with scikit-learn like API";
+    homepage    = "https://github.com/hmmlearn/hmmlearn";
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ abbradar ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
new file mode 100644
index 00000000000..440a1aa7785
--- /dev/null
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -0,0 +1,21 @@
+{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }:
+
+buildPythonPackage rec {
+  name    = "PyChromecast-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
+    sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6";
+  };
+
+  propagatedBuildInputs = [ requests six zeroconf protobuf ];
+
+  meta = with lib; {
+    description = "Library for Python 2 and 3 to communicate with the Google Chromecast";
+    homepage    = "https://github.com/balloob/pychromecast";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ abbradar ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix
new file mode 100644
index 00000000000..8c2351c981e
--- /dev/null
+++ b/pkgs/development/python-modules/sphfile/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchurl, buildPythonPackage, numpy }:
+
+buildPythonPackage rec {
+  name = "sphfile-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/sphfile/${name}.tar.gz";
+    sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Numpy-based NIST SPH audio-file reader";
+    homepage    = "https://github.com/mcfletch/sphfile";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ abbradar ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b57a508433d..5a817b75292 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -194,24 +194,8 @@ in {
 
   pycryptodome = callPackage ../development/python-modules/pycryptodome { };
 
-  PyChromecast = buildPythonPackage rec {
-    name    = "PyChromecast-${version}";
-    version = "0.8.1";
-
-    src = pkgs.fetchurl {
-      url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
-      sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6";
-    };
-
-    propagatedBuildInputs = with self; [ requests six zeroconf protobuf3_2 ];
-
-    meta = {
-      description = "Library for Python 2 and 3 to communicate with the Google Chromecast";
-      homepage    = "https://github.com/balloob/pychromecast";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ abbradar ];
-      platforms   = platforms.linux;
-    };
+  PyChromecast = callPackage ../development/python-modules/pychromecast {
+    protobuf = self.protobuf3_2;
   };
 
   pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
@@ -11363,49 +11347,7 @@ in {
     propagatedBuildInputs = with self; [ requests webob ];
   };
 
-  hmmlearn = buildPythonPackage rec {
-    name = "hmmlearn-${version}";
-    version = "0.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
-      sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9";
-    };
-
-    propagatedBuildInputs = with self; [ numpy ];
-
-    doCheck = false;
-
-    meta = {
-      description = "Hidden Markov Models in Python with scikit-learn like API";
-      homepage    = "https://github.com/hmmlearn/hmmlearn";
-      license     = licenses.bsd3;
-      maintainers = with maintainers; [ abbradar ];
-      platforms   = platforms.unix;
-    };
-  };
-
-   sphfile = buildPythonPackage rec {
-    name = "sphfile-${version}";
-    version = "1.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sphfile/${name}.tar.gz";
-      sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd";
-    };
-
-    propagatedBuildInputs = with self; [ numpy ];
-
-    doCheck = false;
-
-    meta = {
-      description = "Numpy-based NIST SPH audio-file reader";
-      homepage    = "https://github.com/mcfletch/sphfile";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ abbradar ];
-      platforms   = platforms.unix;
-    };
-  }; 
+  hmmlearn = callPackage ../development/python-modules/hmmlearn { };
 
   hcs_utils = buildPythonPackage rec {
     name = "hcs_utils-1.5";
@@ -21967,6 +21909,8 @@ in {
     };
   };
 
+  sphfile = callPackage ../development/python-modules/sphfile { };
+
   sqlite3dbm = buildPythonPackage rec {
     name = "sqlite3dbm-0.1.4";
     disabled = isPy3k;

From d680c2352c7d7b12ef7f5b9404df494c068dd1f4 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Wed, 26 Jul 2017 10:41:39 -0700
Subject: [PATCH 0993/3246] jailbreak-cabal: specifically use ghc802 override
 in ghc821 config

Otherwise this will infinite loop when:

  pkgs.haskellPackages = pkgs.haskell.packages.ghc821
---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 8e18435c0c4..b29a1820d49 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -40,7 +40,7 @@ self: super: {
   cabal-install = super.cabal-install.override { Cabal = null; };
 
   # jailbreak-cabal doesn't seem to work right with the native Cabal version.
-  jailbreak-cabal = pkgs.haskellPackages.jailbreak-cabal;
+  jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {

From 77e9a04a2bc2a898b7236ec8c3a8ac9679c9d8ae Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Wed, 26 Jul 2017 10:44:12 -0700
Subject: [PATCH 0994/3246] maintainers: update my(jb55) email

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e10136bf070..a80b7c41a00 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -248,7 +248,7 @@
   jammerful = "jammerful <jammerful@gmail.com>";
   jansol = "Jan Solanti <jan.solanti@paivola.fi>";
   javaguirre = "Javier Aguirre <contacto@javaguirre.net>";
-  jb55 = "William Casarin <bill@casarin.me>";
+  jb55 = "William Casarin <jb55@jb55.com>";
   jbedo = "Justin Bedő <cu@cua0.org>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
   jdagilliland = "Jason Gilliland <jdagilliland@gmail.com>";

From c3d5cfdc3ca709a9c5081b1a11bca533bc4788af Mon Sep 17 00:00:00 2001
From: Martin Wohlert <martin@b-root-force.de>
Date: Mon, 22 May 2017 20:07:04 +0200
Subject: [PATCH 0995/3246] swap: extend randomEncryption to plainOpen and
 ability to select cipher

---
 nixos/modules/config/swap.nix         | 42 ++++++++++++++++++++-------
 nixos/modules/system/boot/stage-1.nix |  2 +-
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 5d47b09ded9..769029e1b04 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -45,7 +45,7 @@ let
         '';
       };
 
-      randomEncryption = mkOption {
+      randomEncryption.enable = mkOption {
         default = false;
         type = types.bool;
         description = ''
@@ -61,6 +61,26 @@ let
         '';
       };
 
+      randomEncryption.cipher = mkOption {
+        default = "aes-xts-plain64";
+        example = "serpent-xts-plain64";
+        type = types.str;
+        description = ''
+          Use specified cipher for randomEncryption.
+
+          Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine.
+        '';
+      };
+
+      randomEncryption.source = mkOption {
+        default = "/dev/urandom";
+        example = "/dev/random";
+        type = types.str;
+        description = ''
+          Define the source of randomness to obtain a random key for encryption.
+        '';
+      };
+
       deviceName = mkOption {
         type = types.str;
         internal = true;
@@ -77,7 +97,7 @@ let
       device = mkIf options.label.isDefined
         "/dev/disk/by-label/${config.label}";
       deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device);
-      realDevice = if config.randomEncryption then "/dev/mapper/${deviceName}" else config.device;
+      realDevice = if config.randomEncryption.enable then "/dev/mapper/${deviceName}" else config.device;
     };
 
   };
@@ -125,14 +145,14 @@ in
 
         createSwapDevice = sw:
           assert sw.device != "";
-          assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-uuid"  sw.device);
-          assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-label" sw.device);
+          assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-uuid"  sw.device);
+          assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-label" sw.device);
           let realDevice' = escapeSystemdPath sw.realDevice;
           in nameValuePair "mkswap-${sw.deviceName}"
           { description = "Initialisation of swap device ${sw.device}";
             wantedBy = [ "${realDevice'}.swap" ];
             before = [ "${realDevice'}.swap" ];
-            path = [ pkgs.utillinux ] ++ optional sw.randomEncryption pkgs.cryptsetup;
+            path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
 
             script =
               ''
@@ -145,11 +165,11 @@ in
                       truncate --size "${toString sw.size}M" "${sw.device}"
                     fi
                     chmod 0600 ${sw.device}
-                    ${optionalString (!sw.randomEncryption) "mkswap ${sw.realDevice}"}
+                    ${optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"}
                   fi
                 ''}
-                ${optionalString sw.randomEncryption ''
-                  cryptsetup open ${sw.device} ${sw.deviceName} --type plain --key-file /dev/urandom
+                ${optionalString sw.randomEncryption.enable ''
+                  cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName}
                   mkswap ${sw.realDevice}
                 ''}
               '';
@@ -157,12 +177,12 @@ in
             unitConfig.RequiresMountsFor = [ "${dirOf sw.device}" ];
             unitConfig.DefaultDependencies = false; # needed to prevent a cycle
             serviceConfig.Type = "oneshot";
-            serviceConfig.RemainAfterExit = sw.randomEncryption;
-            serviceConfig.ExecStop = optionalString sw.randomEncryption "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
+            serviceConfig.RemainAfterExit = sw.randomEncryption.enable;
+            serviceConfig.ExecStop = optionalString sw.randomEncryption.enable "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
             restartIfChanged = false;
           };
 
-      in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption) config.swapDevices));
+      in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption.enable) config.swapDevices));
 
   };
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 02870878c0f..d6e3e3a87d0 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -207,7 +207,7 @@ let
       preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules;
 
     resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
-                    (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption
+                    (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable
                              # Don't include zram devices
                              && !(hasPrefix "/dev/zram" sd.device)
                             ) config.swapDevices);

From 9be26f81caf167f32c6af5cb876f48d7fad7d2c3 Mon Sep 17 00:00:00 2001
From: Martin Wohlert <martin@b-root-force.de>
Date: Sun, 28 May 2017 14:46:18 +0200
Subject: [PATCH 0996/3246] change swap.randomEncryption config option to
 "coercedTo" for backwards compatibility

---
 nixos/modules/config/swap.nix | 77 +++++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 769029e1b04..fed3fa3bc7c 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -5,6 +5,52 @@ with lib;
 
 let
 
+  randomEncryptionCoerce = enable: { inherit enable; };
+
+  randomEncryptionOpts = { ... }: {
+
+    options = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Encrypt swap device with a random key. This way you won't have a persistent swap device.
+
+          WARNING: Don't try to hibernate when you have at least one swap partition with
+          this option enabled! We have no way to set the partition into which hibernation image
+          is saved, so if your image ends up on an encrypted one you would lose it!
+
+          WARNING #2: Do not use /dev/disk/by-uuid/… or /dev/disk/by-label/… as your swap device
+          when using randomEncryption as the UUIDs and labels will get erased on every boot when
+          the partition is encrypted. Best to use /dev/disk/by-partuuid/…
+        '';
+      };
+
+      cipher = mkOption {
+        default = "aes-xts-plain64";
+        example = "serpent-xts-plain64";
+        type = types.str;
+        description = ''
+          Use specified cipher for randomEncryption.
+
+          Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine.
+        '';
+      };
+
+      source = mkOption {
+        default = "/dev/urandom";
+        example = "/dev/random";
+        type = types.str;
+        description = ''
+          Define the source of randomness to obtain a random key for encryption.
+        '';
+      };
+
+    };
+
+  };
+
   swapCfg = {config, options, ...}: {
 
     options = {
@@ -45,12 +91,19 @@ let
         '';
       };
 
-      randomEncryption.enable = mkOption {
+      randomEncryption = mkOption {
         default = false;
-        type = types.bool;
+        example = {
+          enable = true;
+          cipher = "serpent-xts-plain64";
+          source = "/dev/random";
+        };
+        type = types.coercedTo types.bool randomEncryptionCoerce (types.submodule randomEncryptionOpts);
         description = ''
           Encrypt swap device with a random key. This way you won't have a persistent swap device.
 
+          HINT: run "cryptsetup benchmark" to test cipher performance on your machine.
+
           WARNING: Don't try to hibernate when you have at least one swap partition with
           this option enabled! We have no way to set the partition into which hibernation image
           is saved, so if your image ends up on an encrypted one you would lose it!
@@ -61,26 +114,6 @@ let
         '';
       };
 
-      randomEncryption.cipher = mkOption {
-        default = "aes-xts-plain64";
-        example = "serpent-xts-plain64";
-        type = types.str;
-        description = ''
-          Use specified cipher for randomEncryption.
-
-          Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine.
-        '';
-      };
-
-      randomEncryption.source = mkOption {
-        default = "/dev/urandom";
-        example = "/dev/random";
-        type = types.str;
-        description = ''
-          Define the source of randomness to obtain a random key for encryption.
-        '';
-      };
-
       deviceName = mkOption {
         type = types.str;
         internal = true;

From 0a4c43065c5fe4bd599399c02321bb6dd39421af Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 25 Jul 2017 11:24:49 +0200
Subject: [PATCH 0997/3246] docker: do not import configuration and manifest
 from the base image

Fix #27632.
---
 pkgs/build-support/docker/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 0d02897da74..0c85941b6a1 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -435,6 +435,9 @@ rec {
         if [[ -n "$fromImage" ]]; then
           echo "Unpacking base image..."
           tar -C image -xpf "$fromImage"
+          # Do not import the base image configuration and manifest
+          rm -f image/*.json
+          rm -f image/manifest.json
 
           if [[ -z "$fromImageName" ]]; then
             fromImageName=$(jshon -k < image/repositories|head -n1)

From a7c8f5e419ba07711c132bf81baaab0e74862cce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 26 Jul 2017 20:01:28 +0200
Subject: [PATCH 0998/3246] debian: 8.8 -> 8.9

---
 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 d5cfc419fc7..8ec82214964 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1954,22 +1954,22 @@ rec {
     };
 
     debian8i386 = {
-      name = "debian-8.8-jessie-i386";
-      fullName = "Debian 8.8 Jessie (i386)";
+      name = "debian-8.9-jessie-i386";
+      fullName = "Debian 8.9 Jessie (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "79dbf81e9698913c577333f47f5a56be78529fba265ec492880e8c369c478b58";
+        sha256 = "3c78bdf3b693f2f37737c52d6a7718b3a545956f2a853da79f04a2d15541e811";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian8x86_64 = {
-      name = "debian-8.8-jessie-amd64";
-      fullName = "Debian 8.8 Jessie (amd64)";
+      name = "debian-8.9-jessie-amd64";
+      fullName = "Debian 8.9 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "845fc80c9934d8c0f78ada6455c81c331a3359ef15c4c036b47e742fb1bb99c6";
+        sha256 = "0605589ae7a63c690f37bd2567dc12e02a2eb279d9dc200a7310072ad3593e53";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 8b3e9a1358d2343159689912e4a060840d47a340 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Jul 2017 14:19:01 -0400
Subject: [PATCH 0999/3246] gradle: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 24897232fbc..49fd080df45 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-4.0.1";
+    name = "gradle-4.0.2";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "1m2gnh1vs3f5acdqcxmc8d0pi65bzm3v1nliz29rhdfi01if85yp";
+      sha256 = "08ns3p1w258cbfk6yg3yy2mmy7wwma5riq04yjjgc4dx889l5b3r";
     };
   };
 

From 94f0a6793b2d5d4296ff9207bfc10efdb38bc5da Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 26 Jul 2017 19:22:19 +0000
Subject: [PATCH 1000/3246] disnix: 0.7.1 -> 0.7.2

---
 pkgs/tools/package-management/disnix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 534f8767a05..f260241fe6b 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.7.1";
+  name = "disnix-0.7.2";
   
   src = fetchurl {
-    url = https://github.com/svanderburg/disnix/releases/download/disnix-0.7.1/disnix-0.7.1.tar.gz;
-    sha256 = "0wxik73bk3hh4xjjj8jcgrwv1722m7cqgpiiwjsgxs346jvhrv2s";
+    url = https://github.com/svanderburg/disnix/releases/download/disnix-0.7.2/disnix-0.7.2.tar.gz;
+    sha256 = "1cgf7hgqrwsqgyc77sis0hr7cwgk3vx8cd4msgq11qbwywi3b6id";
   };
   
   buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];

From 8a431e13b5873295f7a6714fe63623f52daea743 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 26 Jul 2017 21:49:35 +0200
Subject: [PATCH 1001/3246] docker: Remove ./ pattern when packing an image

Elements in images tar.gz generated by docker don't start by './'.
---
 pkgs/build-support/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 0c85941b6a1..e2997028024 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -505,7 +505,7 @@ rec {
         chmod -R a-w image
 
         echo "Cooking the image..."
-        tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 -c . | pigz -nT > $out
+        tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
 
         echo "Finished."
       '';

From 9ee7e8b67ecdab5bf1cd41a73053f2e57c35c184 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 26 Jul 2017 21:53:35 +0200
Subject: [PATCH 1002/3246] docker: generate the image configuration and
 manifest

This is required to push images to the Docker registry v2.
---
 pkgs/build-support/docker/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index e2997028024..b6e342cf9b5 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -6,6 +6,7 @@
   findutils,
   go,
   jshon,
+  jq,
   lib,
   pkgs,
   pigz,
@@ -408,7 +409,7 @@ rec {
                   contents runAsRoot diskSize extraCommands;
         };
       result = runCommand "docker-image-${baseName}.tar.gz" {
-        buildInputs = [ jshon pigz coreutils findutils ];
+        buildInputs = [ jshon pigz coreutils findutils jq ];
         # Image name and tag must be lowercase
         imageName = lib.toLower name;
         imageTag = lib.toLower tag;
@@ -496,6 +497,17 @@ rec {
         # Use the temp folder we've been working on to create a new image.
         mv temp image/$layerID
 
+        # Create image configuration file (used by registry v2) by using
+        # the configuration of the last layer
+        SHA_ARRAY=$(find ./ -name layer.tar | xargs sha256sum | cut -d" " -f1 | xargs -I{} echo -n '"sha256:{}" ' | sed 's/" "/","/g' | awk '{ print "["$1"]" }')
+        jq ". + {\"rootfs\": {\"diff_ids\": $SHA_ARRAY, \"type\": \"layers\"}}" image/$layerID/json > config.json
+        CONFIG_SHA=$(sha256sum config.json | cut -d ' ' -f1)
+        mv config.json image/$CONFIG_SHA.json
+
+        # Create image manifest
+        LAYER_PATHS=$(find image/ -name layer.tar -printf '"%P" ' | sed 's/" "/","/g')
+        jq -n "[{\"Config\":\"$CONFIG_SHA.json\",\"RepoTags\":[\"$imageName:$imageTag\"],\"Layers\":[$LAYER_PATHS]}]" > image/manifest.json
+
         # Store the json under the name image/repositories.
         jshon -n object \
           -n object -s "$layerID" -i "$imageTag" \

From 02ceec53435090fef253f5ae1bf54eab0c2c07d7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 26 Jul 2017 21:58:59 +0200
Subject: [PATCH 1003/3246] geogebra: 5-0-369-0 -> 5-0-377-0

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

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index b6fdd6f58b9..ec3d265fb80 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-369-0";
+  version = "5-0-377-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "0b5015z1ff3ksnkmyn2hbfwvhqp1572pdn8llpws32k7w1lb0jnk";
+    sha256 = "0rvsjpf7pyz8z5yrqmc5ixzq7mnf1pyp00i914qd6wn5bx0apkxv";
   };
 
   srcIcon = fetchurl {

From 7cd9779488cf1d374142cf030f742cae4e13ba18 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 26 Jul 2017 23:24:49 +0200
Subject: [PATCH 1004/3246] upx: fix clang build

---
 pkgs/tools/compression/upx/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index 8c9f7433058..213d98a1ec1 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl}:
+{ stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl }:
 
 stdenv.mkDerivation rec {
   name = "upx-${version}";
@@ -8,21 +8,25 @@ stdenv.mkDerivation rec {
     sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1";
   };
 
+  CXXFLAGS = "-Wno-unused-command-line-argument";
+
   buildInputs = [ ucl zlib perl ];
 
-  preConfigure = "
+  preConfigure = ''
     export UPX_UCLDIR=${ucl}
-    cd src
-  ";
+  '';
 
-  makeFlags = [ "CHECK_WHITESPACE=true" ];
+  makeFlags = [ "-C" "src" "CHECK_WHITESPACE=true" ];
 
-  installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx";
+  installPhase = ''
+    mkdir -p $out/bin
+    cp src/upx.out $out/bin/upx
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://upx.github.io/;
     description = "The Ultimate Packer for eXecutables";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
   };
 }

From bfb7134db30cac27006970eed9b228d0f0d05605 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 26 Jul 2017 23:41:07 +0200
Subject: [PATCH 1005/3246] sakura: 3.3.4 -> 3.4.0

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

diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 66e40befe7c..17798bb01e2 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sakura-${version}";
-  version = "3.3.4";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "1fnkrkzf2ysav1ljgi4y4w8kvbwiwgmg1462xhizlla8jqa749r7";
+    sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04";
   };
 
   nativeBuildInputs = [ cmake perl pkgconfig ];

From d82fa7f915cfaa5300763208ac7b4d39afa6f347 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Wed, 26 Jul 2017 15:36:49 -0700
Subject: [PATCH 1006/3246] wineUnstable: 2.12 -> 2.13

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index e92c77462ca..ac27f0f1505 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.12";
+    version = "2.13";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "19qk880fk7xxzx9jcl6sjzilhzssn0csqlqr9vnfd1qlhjpi2v29";
+    sha256 = "1y3yb01lg90pi8a9qjmymg7kikwkmvpkjxi6bbk1q1lvs7fs7g3g";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "00qqpw5fmpwg4589q2dwlv3jrcyj0yzv4mk63w5ydhvmy5gq48wy";
+    sha256 = "1ivjx5pf0xqqmdc1k5skg9saxgqzh3x01vjgypls7czmnpp3aylb";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 72f85b9e072b946c95828c5e7e207ddc8d29d81a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Jul 2017 19:05:26 -0400
Subject: [PATCH 1007/3246] nixos/tahoe: fixup create-introducer, syntax
 regression from 90acbe5

---
 nixos/modules/services/network-filesystems/tahoe.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index f70fbcc4975..26c64f5f72f 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -243,7 +243,7 @@ in
             preStart = ''
               if [ ! -d ${lib.escapeShellArg nodedir} ]; then
                 mkdir -p /var/db/tahoe-lafs
-                tahoe create-introducer "${lib.escapeShellArg nodedir}
+                tahoe create-introducer "${lib.escapeShellArg nodedir}"
               fi
 
               # Tahoe has created a predefined tahoe.cfg which we must now

From d4ef5ac0e962bd6604dda38617c4b98c77a62949 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Jul 2017 19:13:21 -0400
Subject: [PATCH 1008/3246] nixos/tahoe: fixup create-introducer, syntax
 regression from 90acbe5, improperly patched in 72f85b9e072

---
 nixos/modules/services/network-filesystems/tahoe.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index 26c64f5f72f..80b34c48f1d 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -243,7 +243,7 @@ in
             preStart = ''
               if [ ! -d ${lib.escapeShellArg nodedir} ]; then
                 mkdir -p /var/db/tahoe-lafs
-                tahoe create-introducer "${lib.escapeShellArg nodedir}"
+                tahoe create-introducer ${lib.escapeShellArg nodedir}
               fi
 
               # Tahoe has created a predefined tahoe.cfg which we must now

From c6128d2feb842cf346de137086db73f08b21a46d Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 15 Jul 2017 22:17:53 +0000
Subject: [PATCH 1009/3246] nixos/varnish: made compatible with varnish 5.2.1,
 add modules

* nixos/varnish: command line compatible with varnish 5.2.1, fixes
https://github.com/NixOS/nixpkgs/issues/27409
* nixos/varnish: add support for modules (services.varnish.extraModules)
* varnish-modules: init at 0.10.2
* varnish-geoip: init at 1.0.2
* varnish-rtstatus: init at 1.2.0
* varnish-digest: init at 1.0.1
* added services.varnish.extraCommandLine option
---
 .../services/web-servers/varnish/default.nix  | 44 +++++++++++++++----
 pkgs/servers/varnish/digest.nix               | 31 +++++++++++++
 pkgs/servers/varnish/geoip.nix                | 31 +++++++++++++
 pkgs/servers/varnish/modules.nix              | 20 +++++++++
 pkgs/servers/varnish/rtstatus.nix             | 21 +++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 6 files changed, 143 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/servers/varnish/digest.nix
 create mode 100644 pkgs/servers/varnish/geoip.nix
 create mode 100644 pkgs/servers/varnish/modules.nix
 create mode 100644 pkgs/servers/varnish/rtstatus.nix

diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 5433db3b91c..c3bc065d465 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -7,14 +7,10 @@ with lib;
 {
   options = {
     services.varnish = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Enable the Varnish Server.
-        ";
-      };
+      enable = mkEnableOption "Varnish Server";
 
       http_address = mkOption {
+        type = types.str;
         default = "*:6081";
         description = "
           HTTP listen address and port.
@@ -22,17 +18,37 @@ with lib;
       };
 
       config = mkOption {
+        type = types.lines;
         description = "
           Verbatim default.vcl configuration.
         ";
       };
 
       stateDir = mkOption {
+        type = types.path;
         default = "/var/spool/varnish/${config.networking.hostName}";
         description = "
           Directory holding all state for Varnish to run.
         ";
       };
+
+      extraModules = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        example = literalExample "[ pkgs.varnish-geoip ]";
+        description = "
+          Varnish modules (except 'std').
+        ";
+      };
+
+      extraCommandLine = mkOption {
+        type = types.str;
+        default = "";
+        example = "-s malloc,256M";
+        description = "
+          Command line switches for varnishd (run 'varnishd -?' to get list of options)
+        ";
+      };
     };
 
   };
@@ -42,6 +58,7 @@ with lib;
     systemd.services.varnish = {
       description = "Varnish";
       wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
       preStart = ''
         mkdir -p ${cfg.stateDir}
         chown -R varnish:varnish ${cfg.stateDir}
@@ -49,8 +66,19 @@ with lib;
       postStop = ''
         rm -rf ${cfg.stateDir}
       '';
-      serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish";
-      serviceConfig.Type = "forking";
+      serviceConfig = {
+        Type = "simple";
+        PermissionsStartOnly = true;
+        ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -F ${cfg.extraCommandLine}"
+          + optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([pkgs.varnish] ++ cfg.extraModules)}' -r vmod_path";
+        Restart = "always";
+        RestartSec = "5s";
+        User = "varnish";
+        Group = "varnish";
+        AmbientCapabilities = "cap_net_bind_service";
+        NoNewPrivileges = true;
+        LimitNOFILE = 131072;
+      };
     };
 
     environment.systemPackages = [ pkgs.varnish ];
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
new file mode 100644
index 00000000000..530ae504771
--- /dev/null
+++ b/pkgs/servers/varnish/digest.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.1";
+  name = "varnish-digest-${version}";
+
+  src = fetchFromGitHub {
+    owner = "varnish";
+    repo = "libvmod-digest";
+    rev = "libvmod-digest-${version}";
+    sha256 = "0v18bqbsblhajpx5qvczic3psijhx5l2p2qlw1dkd6zl33hhppy7";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig docutils ];
+  buildInputs = [ varnish libmhash ];
+
+  postPatch = ''
+    substituteInPlace autogen.sh  --replace "-I \''${dataroot}/aclocal"                  ""
+    substituteInPlace Makefile.am --replace "-I \''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" ""
+  '';
+
+  configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Digest and HMAC vmod";
+    homepage = https://github.com/varnish/libvmod-digest;
+    inherit (varnish.meta) license platforms maintainers;
+  };
+}
diff --git a/pkgs/servers/varnish/geoip.nix b/pkgs/servers/varnish/geoip.nix
new file mode 100644
index 00000000000..7816b27b14f
--- /dev/null
+++ b/pkgs/servers/varnish/geoip.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, geoip, docutils }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "varnish-geoip-${version}";
+
+  src = fetchFromGitHub {
+    owner = "varnish";
+    repo = "libvmod-geoip";
+    rev = "libvmod-geoip-${version}";
+    sha256 = "1gmadayqh3dais14c4skvd47w8h4kyifg7kcw034i0777z5hfpyn";
+  };
+
+  patches = [
+    # IPv6 support
+    (fetchpatch {
+      url = https://github.com/volth/libvmod-geoip-1/commit/0966fe8.patch;
+      sha256 = "053im8h2y8qzs37g95ksr00sf625p23r5ps1j0a2h4lfg70vf4ry";
+    })
+  ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig docutils ];
+  buildInputs = [ varnish geoip ];
+  configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
+
+  meta = with stdenv.lib; {
+    description = "GeoIP Varnish module by Varnish Software";
+    homepage = https://github.com/varnish/libvmod-geoip;
+    inherit (varnish.meta) license platforms maintainers;
+  };
+}
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
new file mode 100644
index 00000000000..c37fae4ba3d
--- /dev/null
+++ b/pkgs/servers/varnish/modules.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }:
+
+stdenv.mkDerivation rec {
+  version = "0.10.2";
+  name = "varnish-modules-${version}";
+
+  src = fetchurl {
+    url = "https://download.varnish-software.com/varnish-modules/varnish-modules-${version}.tar.gz";
+    sha256 = "0inw76pm8kcidh0lq7gm3c3bh8v6yps0z7j6ar617b8wf730w1im";
+  };
+
+  nativeBuildInputs = [ pkgconfig docutils ];
+  buildInputs = [ varnish python ];
+
+  meta = with stdenv.lib; {
+    description = "Collection of Varnish Cache modules (vmods) by Varnish Software";
+    homepage = https://github.com/varnish/varnish-modules;
+    inherit (varnish.meta) license platforms maintainers;
+  };
+}
diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix
new file mode 100644
index 00000000000..1efa6d5e798
--- /dev/null
+++ b/pkgs/servers/varnish/rtstatus.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.0";
+  name = "varnish-rtstatus-${version}";
+
+  src = fetchurl {
+    url = "https://download.varnish-software.com/libvmod-rtstatus/libvmod-rtstatus-${version}.tar.gz";
+    sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly";
+  };
+
+  nativeBuildInputs = [ pkgconfig docutils ];
+  buildInputs = [ varnish python ];
+  configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
+
+  meta = with stdenv.lib; {
+    description = "Varnish realtime status page";
+    homepage = https://github.com/varnish/libvmod-rtstatus;
+    inherit (varnish.meta) license platforms maintainers;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07445e2fb84..86695fa88e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4839,6 +4839,10 @@ with pkgs;
   };
 
   varnish = callPackage ../servers/varnish { };
+  varnish-modules = callPackage ../servers/varnish/modules.nix { };
+  varnish-digest = callPackage ../servers/varnish/digest.nix { };
+  varnish-geoip = callPackage ../servers/varnish/geoip.nix { };
+  varnish-rtstatus = callPackage ../servers/varnish/rtstatus.nix { };
 
   venus = callPackage ../tools/misc/venus {
     python = python27;

From 70bbd5e84a01dcb25b277b518592f220fa922789 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Wed, 26 Jul 2017 21:03:51 -0400
Subject: [PATCH 1010/3246] opencv: Work around build failure with
 enableContrib & Python

---
 pkgs/development/libraries/opencv/3.x.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 85b4d562720..0443d00a258 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -90,9 +90,14 @@ stdenv.mkDerivation rec {
       done
     '');
 
-  # This prevents cmake from using libraries in impure paths (which causes build failure on non NixOS)
+  # This prevents cmake from using libraries in impure paths (which
+  # causes build failure on non NixOS)
+  # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
+  # what appears to be some stray headers in dnn/misc/tensorflow
+  # in contrib when generating the Python bindings:
   postPatch = ''
     sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
+    sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
   '';
 
   preConfigure =

From a912a6a291eaa5f6a2ad9143c9e276779c357a41 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 16 Jul 2017 18:20:27 +0200
Subject: [PATCH 1011/3246] nginx: make enabling SSL port-specific

---
 .../services/web-servers/nginx/default.nix    | 64 ++++++++++++++++---
 .../web-servers/nginx/vhost-options.nix       | 53 ++++++++++-----
 2 files changed, 91 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index f83413b4534..05843655b08 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -122,16 +122,32 @@ let
   '';
 
   vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost:
-      let
-        ssl = vhost.enableSSL || vhost.forceSSL;
-        defaultPort = if ssl then 443 else 80;
+    let
+        ssl = with vhost; addSSL || onlySSL || enableSSL;
 
-        listenString = { addr, port, ... }:
-          "listen ${addr}:${toString (if port != null then port else defaultPort)} "
+        defaultListen = with vhost;
+          if listen != [] then listen
+          else if onlySSL || enableSSL then
+               singleton                          { addr = "0.0.0.0"; port = 443; ssl = true;  }
+               ++ optional enableIPv6             { addr = "[::]";    port = 443; ssl = true;  }
+          else singleton                          { addr = "0.0.0.0"; port = 80;  ssl = false; }
+               ++ optional enableIPv6             { addr = "[::]";    port = 80;  ssl = false; }
+               ++ optional addSSL                 { addr = "0.0.0.0"; port = 443; ssl = true;  }
+               ++ optional (enableIPv6 && addSSL) { addr = "[::]";    port = 443; ssl = true;  };
+
+        hostListen =
+          if !vhost.forceSSL
+            then defaultListen
+            else filter (x: x.ssl) defaultListen;
+
+        listenString = { addr, port, ssl, ... }:
+          "listen ${addr}:${toString port} "
           + optionalString ssl "ssl http2 "
-          + optionalString vhost.default "default_server"
+          + optionalString vhost.default "default_server "
           + ";";
 
+        redirectListen = filter (x: !x.ssl) defaultListen;
+
         redirectListenString = { addr, ... }:
           "listen ${addr}:80 ${optionalString vhost.default "default_server"};";
 
@@ -152,7 +168,7 @@ let
       in ''
         ${optionalString vhost.forceSSL ''
           server {
-            ${concatMapStringsSep "\n" redirectListenString vhost.listen}
+            ${concatMapStringsSep "\n" redirectListenString redirectListen}
 
             server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
             ${optionalString vhost.enableACME acmeLocation}
@@ -163,7 +179,7 @@ let
         ''}
 
         server {
-          ${concatMapStringsSep "\n" listenString vhost.listen}
+          ${concatMapStringsSep "\n" listenString hostListen}
           server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
           ${optionalString vhost.enableACME acmeLocation}
           ${optionalString (vhost.root != null) "root ${vhost.root};"}
@@ -392,6 +408,7 @@ in
         example = literalExample ''
           {
             "hydra.example.com" = {
+              addSSL = true;
               forceSSL = true;
               enableACME = true;
               locations."/" = {
@@ -408,11 +425,40 @@ in
   config = mkIf cfg.enable {
     # TODO: test user supplied config file pases syntax test
 
-    assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [
+    warnings =
+    let
+      deprecatedSSL = name: config: optional config.enableSSL
+      ''
+        config.services.nginx.virtualHosts.<name>.enableSSL is deprecated,
+        use config.services.nginx.virtualHosts.<name>.onlySSL instead.
+      '';
+
+    in flatten (mapAttrsToList deprecatedSSL virtualHosts);
+
+    assertions =
+    let
+      hostOrAliasIsNull = l: l.root == null || l.alias == null;
+    in [
       {
         assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts);
         message = "Only one of nginx root or alias can be specified on a location.";
       }
+
+      {
+        assertion = all (conf: with conf; !(addSSL && (onlySSL || enableSSL))) (attrValues virtualHosts);
+        message = ''
+          Options services.nginx.service.virtualHosts.<name>.addSSL and
+          services.nginx.virtualHosts.<name>.onlySSL are mutually esclusive
+        '';
+      }
+
+      {
+        assertion = all (conf: with conf; forceSSL -> addSSL) (attrValues virtualHosts);
+        message = ''
+          Option services.nginx.virtualHosts.<name>.forceSSL requires
+          services.nginx.virtualHosts.<name>.addSSL set to true.
+        '';
+      }
     ];
 
     systemd.services.nginx = {
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 60260512bc2..362f8ee9052 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -27,25 +27,21 @@ with lib;
     };
 
     listen = mkOption {
-      type = with types; listOf (submodule {
-        options = {
-          addr = mkOption { type = str; description = "IP address."; };
-          port = mkOption { type = nullOr int; description = "Port number."; };
-        };
-      });
-      default =
-        [ { addr = "0.0.0.0"; port = null; } ]
-        ++ optional config.networking.enableIPv6
-          { addr = "[::]"; port = null; };
+      type = with types; listOf (submodule { options = {
+        addr = mkOption { type = str;  description = "IP address.";  };
+        port = mkOption { type = int;  description = "Port number."; default = 80; };
+        ssl  = mkOption { type = bool; description = "Enable SSL.";  default = false; };
+      }; });
+      default = [];
       example = [
-        { addr = "195.154.1.1"; port = 443; }
-        { addr = "192.168.1.2"; port = 443; }
+        { addr = "195.154.1.1"; port = 443; ssl = true;}
+        { addr = "192.154.1.1"; port = 80; }
       ];
       description = ''
         Listen addresses and ports for this virtual host.
         IPv6 addresses must be enclosed in square brackets.
-        Setting the port to <literal>null</literal> defaults
-        to 80 for http and 443 for https (i.e. when enableSSL is set).
+        Note: this option overrides <literal>addSSL</literal>
+        and <literal>onlySSL</literal>.
       '';
     };
 
@@ -70,16 +66,39 @@ with lib;
       '';
     };
 
-    enableSSL = mkOption {
+    addSSL = mkOption {
       type = types.bool;
       default = false;
-      description = "Whether to enable SSL (https) support.";
+      description = ''
+        Whether to enable HTTPS in addition to plain HTTP. This will set defaults for
+        <literal>listen</literal> to listen on all interfaces on the respective default
+        ports (80, 443).
+      '';
+    };
+
+    onlySSL = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable HTTPS and reject plain HTTP connections. This will set
+        defaults for <literal>listen</literal> to listen on all interfaces on port 443.
+      '';
+    };
+
+    enableSSL = mkOption {
+      type = types.bool;
+      visible = false;
+      default = false;
     };
 
     forceSSL = mkOption {
       type = types.bool;
       default = false;
-      description = "Whether to always redirect to https.";
+      description = ''
+        Whether to add a separate nginx server block that permanently redirects (301)
+        all plain HTTP traffic to HTTPS. This option needs <literal>addSSL</literal>
+        to be set to true.
+      '';
     };
 
     sslCertificate = mkOption {

From 354c979ea85d89e8269e71b5ab4d5d73d8b8bc3c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 27 Jul 2017 13:03:26 +0800
Subject: [PATCH 1012/3246] mcelog: 148 -> 153

---
 pkgs/os-specific/linux/mcelog/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 64b937390f1..a7f5ffaae4a 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "148";
+  version = "153";
 
   src = fetchFromGitHub {
-    sha256 = "04mzscvr38r2q9da9wmv3cxb99vrkxks1mzgvwsxk753xan3p42c";
-    rev = "v${version}";
-    repo = "mcelog";
-    owner = "andikleen";
+    owner  = "andikleen";
+    repo   = "mcelog";
+    rev    = "v${version}";
+    sha256 = "1wz55dzqdiam511d6p1958al6vzlhrhs73s7gly0mzm6kpji0gxa";
   };
 
   postPatch = ''
@@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ];
 
+  postInstall = ''
+    mkdir -p $out/lib/systemd/system
+    substitute mcelog.service $out/lib/systemd/system/mcelog.service \
+      --replace /usr/sbin $out/bin
+  '';
+
   meta = with stdenv.lib; {
     description = "Log x86 machine checks: memory, IO, and CPU hardware errors";
     longDescription = ''

From f5c0607f8d566a5aa2cf74346348bcdb492637e4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 27 Jul 2017 13:03:36 +0800
Subject: [PATCH 1013/3246] mcelog: use .service file from upstream

---
 nixos/modules/hardware/mcelog.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/hardware/mcelog.nix b/nixos/modules/hardware/mcelog.nix
index e4ac7d39053..13ad238870c 100644
--- a/nixos/modules/hardware/mcelog.nix
+++ b/nixos/modules/hardware/mcelog.nix
@@ -3,7 +3,7 @@
 with lib;
 
 {
-  meta.maintainers = [ maintainers.grahamc ];
+  meta.maintainers = with maintainers; [ grahamc ];
   options = {
 
     hardware.mcelog = {
@@ -19,19 +19,17 @@ with lib;
   };
 
   config = mkIf config.hardware.mcelog.enable {
-    systemd.services.mcelog = {
-      description = "Machine Check Exception Logging Daemon";
-      wantedBy = [ "multi-user.target" ];
+    systemd = {
+      packages = [ pkgs.mcelog ];
 
-      serviceConfig = {
-        ExecStart = "${pkgs.mcelog}/bin/mcelog --daemon --foreground";
-        SuccessExitStatus = [ 0 15 ];
-
-        ProtectHome = true;
-        PrivateNetwork = true;
-        PrivateTmp = true;
+      services.mcelog = {
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ProtectHome = true;
+          PrivateNetwork = true;
+          PrivateTmp = true;
+        };
       };
     };
   };
-
 }

From b602082e079c391cde7ab5ac1075e2630ce90863 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 27 Jul 2017 03:12:27 +0900
Subject: [PATCH 1014/3246] oraclejdk: 8u141 -> 8u144

---
 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 bc556bdfcad..7dc0d7158f1 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 = "141";
+  patchVersion = "144";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5";
-  sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784";
+  sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
+  sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
   sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index bc556bdfcad..7dc0d7158f1 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 = "141";
+  patchVersion = "144";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5";
-  sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784";
+  sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
+  sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
   sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;

From be63b1994d75e826eb2ba2b9e319f1f25be8b725 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Mon, 24 Jul 2017 22:22:19 -0300
Subject: [PATCH 1015/3246] enable split-output builds for all haskellPackages

---
 .../haskell-modules/configuration-common.nix  |  2 +-
 .../haskell-modules/generic-builder.nix       | 19 +++++++++++++++++--
 pkgs/development/haskell-modules/lib.nix      |  2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3a3928f5618..85a2d0f665e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -728,7 +728,7 @@ self: super: {
       };
     in overrideCabal super.servant (old: {
       postInstall = old.postInstall or "" + ''
-        ln -s ${docs} $out/share/doc/servant
+        ln -s ${docs} $doc/share/doc/servant
       '';
     });
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8675d40fd23..36e391183fa 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
-, jailbreak-cabal, hscolour, cpphs, nodejs, lib
+, jailbreak-cabal, hscolour, cpphs, nodejs, lib, removeReferencesTo
 }: let isCross = (ghc.cross or null) != null; in
 
 { pname
@@ -53,6 +53,8 @@
 , coreSetup ? false # Use only core packages to build Setup.hs.
 , useCpphs ? false
 , hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
+, enableSeparateDataOutput ? false
+, enableSeparateDocOutput ? doHaddock
 } @ args:
 
 assert editedCabalFile != null -> revision != null;
@@ -108,6 +110,8 @@ let
 
   defaultConfigureFlags = [
     "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
+    (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
+    (optionalString enableSeparateDocOutput "--docdir=$doc/share/doc")
     "--with-gcc=$CC" # Clang won't work without that extra information.
     "--package-db=$packageConfDir"
     (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
@@ -144,7 +148,7 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends;
 
-  nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends;
+  nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ];
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
@@ -173,6 +177,9 @@ assert allPkgconfigDepends != [] -> pkgconfig != null;
 stdenv.mkDerivation ({
   name = "${pname}-${version}";
 
+  outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"));
+  setOutputFlags = false;
+
   pos = builtins.unsafeGetAttrPos "pname" args;
 
   prePhases = ["setupCompilerEnvironmentPhase"];
@@ -323,6 +330,14 @@ stdenv.mkDerivation ({
       done
     ''}
 
+    ${optionalString enableSeparateDocOutput ''
+    for x in $doc/share/doc/html/src/*.html; do
+      remove-references-to -t $out $x
+    done
+    mkdir -p $doc
+    ''}
+    ${optionalString enableSeparateDataOutput "mkdir -p $data"}
+
     runHook postInstall
   '';
 
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 30d82d3efc9..81cf298e0e6 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -111,4 +111,6 @@ rec {
   overrideSrc = drv: { src, version ? drv.version }:
     overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
 
+  hasNoDataOutput = drv: overrideCabal drv (drv: { hasDataDir = false; });
+  hasNoDocOutput = drv: overrideCabal drv (drv: { hasDocDir = false; });
 }

From 2b0ce7aeab721bbb6207481bef630b512c94dcad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jul 2017 16:28:06 +0200
Subject: [PATCH 1016/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.3.1-25-ge9e9669 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8b34a74f811faf4550d5cebc7bf49a8fda3ae7b5.
---
 .../haskell-modules/hackage-packages.nix      | 1245 ++++++++++++++++-
 1 file changed, 1195 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 05b5678c074..3902e436a78 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -657,6 +657,7 @@ self: {
        sha256 = "08iblifpyi569zh55ha5bi0nfibz0zlqiibwaimx2k1nd6n6yv5a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
@@ -685,6 +686,7 @@ self: {
        pname = "AesonBson";
        version = "0.2.2";
        sha256 = "1p7636bjczcwwi2c0cdzvpj95vx2fr27qnmh8pcs8hqgmisagq8s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec base bson unordered-containers vector
        ];
@@ -728,6 +730,7 @@ self: {
        editedCabalFile = "1zxznr7n6yyyrr38nsa53nd1vhcssnhd5jha30dzwwkyq0mv3c2d";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary boxes bytestring containers data-hash deepseq
          directory EdisonCore edit-distance equivalence filepath
@@ -852,6 +855,7 @@ self: {
        sha256 = "1baqvfrg5qsrfzlg6para87vf11srk0dmi062fpzfv1x452wx6ja";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          async base containers enummapset-th filepath LambdaHack random
          template-haskell text zlib
@@ -1667,6 +1671,7 @@ self: {
        sha256 = "0jlcdd0slq7d5wr44h3h6lnfcp310h36cabd4r7l32xhcxns9k6h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bimaps binary bytes bytestring cereal cereal-vector
          containers csv deepseq file-embed hashable lens primitive
@@ -1770,6 +1775,7 @@ self: {
        sha256 = "09mpf3qwr38x0ljz4ziyhdcwl5j37i353wc2dkpc6hjki9p08rgl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory HaXml polyparse pretty wx wxcore
        ];
@@ -1841,6 +1847,7 @@ self: {
        sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal MissingH ];
        libraryHaskellDepends = [
          base containers MissingH network-uri parsec
@@ -1895,6 +1902,7 @@ self: {
        sha256 = "1a1g8ipppwrb42fvli27qi4i78vgdk3wwxsjhqy0p6pwpa0hvcaq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath pandoc pandoc-citeproc
          pandoc-types parseargs
@@ -2204,6 +2212,7 @@ self: {
        sha256 = "041bm02xar8g6ppz6g0fdgs4ywavlcn4pqkncydx0lw5wp9ygwwn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
@@ -2338,6 +2347,7 @@ self: {
        pname = "CTRex";
        version = "0.6";
        sha256 = "0cjinznkvdrswbqrsha49b6hch7sjv2qq9xllx780klf01kdahi6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers hashable mtl unordered-containers
        ];
@@ -2675,6 +2685,7 @@ self: {
        pname = "Chart-diagrams";
        version = "1.8.2";
        sha256 = "0hczp9dj9qs3g72hcgikym1bq3ki90graxfx068h5hds0kn1s66a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
@@ -2748,6 +2759,7 @@ self: {
        sha256 = "1pw6sssdmxpsjclkhsaf1b06vlimi4w11rxy65ccyj8c9zgs2g23";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers directory ];
        homepage = "http://cheatsheet.codeslower.com";
        description = "A Haskell cheat sheet in PDF and literate formats";
@@ -2933,6 +2945,7 @@ self: {
        sha256 = "0dx5pysxyk5c0fa33khjr86zgm43jz7nwhgl0w8jngyai8b1rbra";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array attoparsec base bytestring cereal containers deepseq
          directory filepath hopenssl hslogger HTTP HUnit mtl network
@@ -3383,6 +3396,7 @@ self: {
        sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base HUnit pretty QuickCheck random
        ];
@@ -3626,6 +3640,7 @@ self: {
        pname = "DRBG";
        version = "0.5.5";
        sha256 = "1z9vqc1nw0mf2sqgddcipmlkz6mckq9wnrzqqdy3rj3c90135pr1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal cipher-aes128 crypto-api
          cryptohash-cryptoapi entropy mtl parallel prettyclass tagged
@@ -3701,6 +3716,7 @@ self: {
        sha256 = "084yscqbwypkb32avjm2b92a7s4qpvps3pjfgpy14sligww3hifb";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers haskell98 network process unix
        ];
@@ -3963,6 +3979,7 @@ self: {
        sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary bytestring containers GLUT HTTP MaybeT mtl network
          peakachu random time utility-ht zlib
@@ -4017,6 +4034,7 @@ self: {
        pname = "Dflow";
        version = "0.0.1";
        sha256 = "00gzs5fdybfrvqidw4qzk6i69qzq4jaljzhb49ah2hsv3gqjr1iq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers QuickCheck stm time ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-quickcheck2
@@ -4148,6 +4166,7 @@ self: {
        sha256 = "0pnlk09jsallyparwdfcy7jmqjjiprp2pqlg9agp6xbw5xmnkzwb";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Cabal chunks containers directory filepath hinstaller
          old-locale parsec pretty process template-haskell time xhtml
@@ -4321,6 +4340,7 @@ self: {
        sha256 = "1w0wfmrjifidl2qz998ig07afd4p6yp890lwl8as57bay490nakl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [
          base filepath old-time process random
@@ -4339,6 +4359,7 @@ self: {
        sha256 = "0jk7qmlgjw69w38hm91bnyp8gyi1mjmrq4vyv7jv3y69rk0fi6wl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base old-time process random ];
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
@@ -4680,6 +4701,7 @@ self: {
        sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cheapskate cmdargs containers directory filepath highlighting-kate
@@ -4926,6 +4948,7 @@ self: {
        sha256 = "0kh1zjqr9cmx7xyfk2y3iwr3x3zvh3pb4ghfjz3xr2wwg2rmymxp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        homepage = "http://www.kryozahiro.org/eternal10/";
        description = "A 2-D shooting game";
@@ -5201,6 +5224,7 @@ self: {
        pname = "FenwickTree";
        version = "0.1.2.1";
        sha256 = "0g7hhkim16wsjf8l79hqkiv1lain6jm8wpiml1iycra3n9i2s5ww";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        testHaskellDepends = [ base QuickCheck template-haskell ];
        homepage = "https://github.com/mgajda/FenwickTree";
@@ -5353,6 +5377,7 @@ self: {
        sha256 = "00sv8dd323lwyw6597xyza12h8m1pdp63b2jlqfsjgnxn2rb60lm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
@@ -5455,6 +5480,7 @@ self: {
        sha256 = "1w25h3n3cnsl9dvr5s94jzf5qxyx0dl0v8dmqv2rkwwm7s2hdbl9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cgi containers directory haskell98 old-time parsec xhtml
        ];
@@ -5526,6 +5552,7 @@ self: {
        pname = "ForSyDe";
        version = "3.1.1";
        sha256 = "0ggwskyxpdrjny0rz61zdp20r5vzig8ggmqxf0qa8gljvvfp6bhp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers directory filepath mtl old-time
          parameterized-data pretty process random regex-posix
@@ -5722,6 +5749,7 @@ self: {
        sha256 = "10sivjxppn138805iwka54cfby59nc39ja30nx2w3762fybz71af";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -5736,6 +5764,7 @@ self: {
        sha256 = "1bal6v1ps8ha5hkz12i20vwypvbcb6s9ykr8yylh4w4ddnsdgh3r";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base-compat GLUT OpenGL random ];
        executableHaskellDepends = [ base GLUT OpenGL random ];
        homepage = "http://joyful.com/fungen";
@@ -5797,6 +5826,7 @@ self: {
        pname = "GHood";
        version = "0.0.6";
        sha256 = "0n9vp4y5d1fx45x6s5a84ylyvnjyaq44x9r46zyh0dkyrms3jsqi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
        description = "A graphical viewer for Hood";
@@ -5822,6 +5852,7 @@ self: {
        pname = "GLFW-OGL";
        version = "0.0";
        sha256 = "118hpgdp8rb0jlvlibxcaia4jjjdrn8xpzyvj109piw63g44n910";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl OGL ];
        librarySystemDepends = [ libX11 libXrandr ];
        homepage = "http://haskell.org/haskellwiki/GLFW-OGL";
@@ -6010,6 +6041,7 @@ self: {
        pname = "GPipe";
        version = "2.2.1";
        sha256 = "1g5712apfv1jzi12shpzfp16274gfbjgf7r49fp1dawxnj8j734g";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean containers exception-transformers gl hashtables linear
          transformers
@@ -6109,6 +6141,7 @@ self: {
        pname = "Gamgine";
        version = "0.5.1";
        sha256 = "07srdid5354y2za3hc76j2rjb84y77vjaz8gdhlp7qnbmfsnqipd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring composition cpphs data-lens directory
          filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show
@@ -6157,6 +6190,7 @@ self: {
        sha256 = "14shcs5wfkf4q473hsdgh7ky1fsrb59nf0g2ff4viyw1diyakw7x";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base directory random wx wxcore
        ];
@@ -6179,6 +6213,7 @@ self: {
        sha256 = "0gmig362ayxxqgj4m6g1r1i6q5zfg6j8bmvsd7i9kmqn12nl3l0p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring cabal-macosx containers deepseq directory
          errors filepath hslogger json mtl old-locale ordered parsec process
@@ -6333,6 +6368,7 @@ self: {
        pname = "GeocoderOpenCage";
        version = "0.1.0.1";
        sha256 = "1c5sww3lvwkijsxg37zj77rxx021wlwjwsadiknvci9xlzccnw5b";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
        homepage = "https://github.com/juergenhah/Haskell-Geocoder-OpenCage.git";
        description = "Geocoder and Reverse Geocoding Service Wrapper";
@@ -6397,6 +6433,7 @@ self: {
        sha256 = "030p4ihh3zdjy0f687ffpnsf1zjb7mhwih47718fj2pawi4hkksi";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath process temporary text
        ];
@@ -7035,6 +7072,7 @@ self: {
        sha256 = "0dzfnvdc1nm4f7q759xnq1lavi90axc7b6jd39sl898jbjg8wrrl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
        executableHaskellDepends = [
          base containers mtl QuickCheck random
@@ -7247,6 +7285,7 @@ self: {
        sha256 = "03v03adcqyf0ppbhx8jxmp1f4pzmqs5s43as21add2yl13rkwzm7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup MissingH mtl process random
          shakespeare template-haskell text uuid
@@ -7865,6 +7904,7 @@ self: {
        pname = "HList";
        version = "0.4.2.0";
        sha256 = "15bpglqj33n4y68mg8l2g0rllrcisg2f94wsl3n7rpy43md596fd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base base-orphans ghc-prim mtl profunctors tagged
          template-haskell
@@ -7931,6 +7971,7 @@ self: {
        pname = "HMap";
        version = "1.2.7";
        sha256 = "0xq5qr1v74z9bppcgl4g06cpnmyrqmc41kvcyx58272pw70vlv40";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base data-default hashable mtl unordered-containers
        ];
@@ -7968,6 +8009,7 @@ self: {
        sha256 = "04325gwmlrx4iy9609vzaw2dhs4kg3ydr4r6af6rllrf500f6w9j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory glib gtk haskell98 mtl process
          regex-posix unix
@@ -8111,6 +8153,7 @@ self: {
        sha256 = "0dzzq4ksny537b151g6c1jgj2ns143klhdjfbq84srs026pvpvzi";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base data-accessor data-accessor-template GLFW OpenGL
        ];
@@ -8247,6 +8290,7 @@ self: {
        sha256 = "0bg0b8260cd2l8q7ccijwqg1yz49mkifv1r0a5q1hrbsagvac4nf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base directory haskell98 ];
        homepage = "http://boegel.kejo.be/ELIS/Haskell/HRay/";
        description = "Haskell raytracer";
@@ -8369,6 +8413,7 @@ self: {
        pname = "HSmarty";
        version = "0.2.0.3";
        sha256 = "07m7xpwv565cf78qyqkd6babpl2b7jnq88psv55jclzdqlsvv0rq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-expr base HTTP mtl scientific text
          unordered-containers vector
@@ -8542,6 +8587,7 @@ self: {
        sha256 = "0c0igscng6gqhabmvvgappsbzbhkpybcx7vr8yd72pqh988ml4zv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs containers deepseq hylolib mtl strict
        ];
@@ -8560,6 +8606,7 @@ self: {
        sha256 = "0h3pr4lyx14zndwbas5ba8sg3s84sq19qhh6pcqpy4v2ajfyyfqc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base mtl random SDL SDL-image SDL-ttf
        ];
@@ -8683,6 +8730,7 @@ self: {
        pname = "HXQ";
        version = "0.20.1";
        sha256 = "1ba3b7a91h1qc5g9g9cw591mvsp711myijpzxr4c1wg6yapqbhxp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base haskeline HTTP mtl regex-base regex-compat
          template-haskell
@@ -8701,6 +8749,7 @@ self: {
        sha256 = "1mvxzcq42h823gq025w86z03jigk271fj20r7yfjydj7yvn24kjv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
        homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html";
        description = "HaLeX enables modelling, manipulation and visualization of regular languages";
@@ -8750,6 +8799,7 @@ self: {
        editedCabalFile = "1hwajkfskbnh3cn7jgiqp83vpfinnfn4pfzwkl6cwqi63iwy944p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cabal-helper containers directory filepath ghc ghc-exactprint
          ghc-mod ghc-syb-utils hslogger monad-control mtl
@@ -8785,6 +8835,7 @@ self: {
        sha256 = "16ld7lrdf6vjmxam4kfc6zyy2g4baw7mr9ha39nrxjq0p8d4hn3v";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cabal-helper containers directory filepath ghc ghc-exactprint
          ghc-mod ghc-syb-utils hslogger monad-control mtl
@@ -9003,6 +9054,7 @@ self: {
        sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers HTTP hxt hxt-http mtl network network-uri parsec
          transformers
@@ -9106,6 +9158,7 @@ self: {
        pname = "HasGP";
        version = "0.1";
        sha256 = "1sw5l74p2md4whq0c1xifcnwbb525i84n1razjxs7cpf8gicgggx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell98 hmatrix hmatrix-special mtl parsec random
        ];
@@ -9125,6 +9178,7 @@ self: {
        sha256 = "0jh506p0clwyb5wwrhlgbc5xp7w6smz5vky3lc8vhnwvwk324qcj";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base list-tries monad-loops mtl numbers parsec
        ];
@@ -9161,6 +9215,7 @@ self: {
        pname = "HaskRel";
        version = "0.1.0.2";
        sha256 = "19q7x459g9s6g7kd9bmhh8lj2khbbmaafmcmm3ggrf4ijxmh5kp7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory ghc-prim HList tagged
        ];
@@ -9230,6 +9285,7 @@ self: {
        pname = "HaskellNet-SSL";
        version = "0.3.3.0";
        sha256 = "1x6miw5ph4qndsy345yym209r5lxsjsmmgyap6x1xjwxjcmlcz8p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring connection data-default HaskellNet network tls
        ];
@@ -9250,6 +9306,7 @@ self: {
        sha256 = "0dy9irl085jw7wz6y50566rwsj05ymp8g2xp2444vg12ryd5dra1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cereal cml containers directory hopenssl hslogger
          HTTP HUnit mtl network parsec pretty QuickCheck random
@@ -9408,6 +9465,7 @@ self: {
        sha256 = "0z0sa658fngv68611k76ncf5j59v517xchhw2y84blj97fl6jkn9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base editline mtl parsec pretty process QuickCheck regex-posix
        ];
@@ -9427,6 +9485,7 @@ self: {
        pname = "HerbiePlugin";
        version = "0.2.0.0";
        sha256 = "1vrlx1b85fvdcbcjn2mfhkznvvqag3pxhvkqsk80pyqiwf8xfgw7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base deepseq directory ghc mtl process split sqlite-simple
          template-haskell text
@@ -9600,6 +9659,7 @@ self: {
        sha256 = "1nsiqcwx9xiz3774c0kv036v8pz53jzl9pfxyhm6ci8ag83za245";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring cereal containers directory filepath FPretty
          libgraph mtl process RBTree regex-posix template-haskell
@@ -9782,6 +9842,7 @@ self: {
        sha256 = "0yjkghshbdbajib35hy3qr8x608i9qi2pgffpi59118krcw6k8mn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath ghc haskell-src-exts old-locale random syb
          time
@@ -9863,6 +9924,7 @@ self: {
        pname = "HsJudy";
        version = "0.2";
        sha256 = "1ypdsjy7gn6b3ynn17fcpirgwq3017jahm3pj5fh4qr6zr1cljkh";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ Judy ];
        homepage = "http://www.pugscode.org/";
@@ -9932,6 +9994,7 @@ self: {
        pname = "HsParrot";
        version = "0.0.2.20150805";
        sha256 = "0d1xkfl5zbr2q60igl9092lr6zgh1jq10c0b7yd6i0jxs66d767a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring HsSyck pretty pugs-DrIFT
        ];
@@ -9970,6 +10033,7 @@ self: {
        pname = "HsSyck";
        version = "0.53";
        sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring hashtables syb utf8-string
        ];
@@ -10000,6 +10064,7 @@ self: {
        sha256 = "09v2gcazqlmw7j7sqzzzmsz1jr3mrnfy3p30w9hnp2g430w10r2a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring cmdargs data-accessor data-accessor-template
          data-accessor-transformers directory filepath Glob
@@ -10094,6 +10159,7 @@ self: {
        sha256 = "10n45j8ri1svxhplpfj88riqk4qigzl02cqxkk3mrsahhgn6bkmp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary directory HFitUI MissingH shakespeare yaml
        ];
@@ -10144,6 +10210,7 @@ self: {
        sha256 = "04il63xafq20jn3m4hahn93xxfrp6whrjvsz974zczxqm41ygb10";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory haskell98 HaXml polyparse pretty process
          wx wxcore
@@ -10160,6 +10227,7 @@ self: {
        pname = "IOR";
        version = "0.1";
        sha256 = "0iinsva0pwparpg4lkgx8mw8l49rnl1h3zzblp89nkqk5i7qhq8a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -10601,6 +10669,7 @@ self: {
        sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath mtl parsec pretty syb WebBits
          WebBits-Html
@@ -10673,6 +10742,7 @@ self: {
        pname = "JuicyPixels-extra";
        version = "0.1.1";
        sha256 = "1zdrh95b51566m2dh79vv92vivv2i4pknlimhd78mqc0fxz2ayyk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base JuicyPixels ];
        testHaskellDepends = [ base hspec JuicyPixels ];
        benchmarkHaskellDepends = [ base criterion JuicyPixels ];
@@ -10690,6 +10760,7 @@ self: {
        sha256 = "0lai831n9iak96l854fynpa1bf41rq8mg45397zjg0p25w0i1dka";
        revision = "1";
        editedCabalFile = "0f42a7jirsk3ciyd081wcb2pkss34yzfwhaiaclgf17yiav4zzv0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base JuicyPixels ];
        testHaskellDepends = [ base hspec JuicyPixels ];
        benchmarkHaskellDepends = [ base criterion JuicyPixels ];
@@ -10883,6 +10954,7 @@ self: {
        sha256 = "0z5ps5apr436dbm5wkfnpqksnqi3jsqmp2zkmy37crzzinlilzvn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers curry-frontend directory filepath network old-time
          process random syb unix
@@ -10908,6 +10980,7 @@ self: {
        sha256 = "1hvdqil8lfybcp2j04ig03270q5fy29cbmg8jmv38dpcgjsx6mk1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath haskell98 KiCS mtl readline syb
        ];
@@ -10928,6 +11001,7 @@ self: {
        sha256 = "0l278x2gavm0ndbm4k0197cwyvamz37vzy7nz35lb7n5sc5b2gsr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath KiCS ];
        executableHaskellDepends = [ base KiCS ];
        homepage = "http://curry-language.org";
@@ -11115,6 +11189,7 @@ self: {
        sha256 = "12bvsl4bshks02dqk09nzjz8jd8mspf408h88bmswsxyhq6r03gc";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          assert-failure async base base-compat binary bytestring containers
          deepseq directory enummapset-th filepath ghc-prim hashable hsini
@@ -11151,6 +11226,7 @@ self: {
        sha256 = "1hdl25dzv19gjr8dzpq1r267v3jj2c2yiskbg0kzdcrh4cj7jcwk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers GLFW GLFW-task monad-task mtl OpenGL transformers
          vector
@@ -11406,6 +11482,7 @@ self: {
        pname = "LinearSplit";
        version = "0.2.1";
        sha256 = "05rdlxsl5zpnczahaw2fdycqyryd3y7bccizjbn5sap23spwd7di";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base cmdargs haskell98 QuickCheck
        ];
@@ -11871,6 +11948,7 @@ self: {
        sha256 = "0vly79iqz8ax5wzwgbr3ygdqsi7bq5vki43kmz9zgz8vjqi7hisz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory ghc ghc-paths hashable
          haskell-src html mtl network network-uri pretty random syb
@@ -11956,6 +12034,7 @@ self: {
        sha256 = "041kqz5j8xaa2ciyrfnwz6p9gcx4il5s6f34kzv9kp0s07hmn1q2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory filepath HUnit mtl old-locale
          pretty random regex-posix time
@@ -12133,6 +12212,7 @@ self: {
        sha256 = "0s3xp18y4kcjd1qq87vbhijbbpi9d1p08dgxw7521xlr3gmxkqxw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers haskell-src-exts mtl pretty
        ];
@@ -12340,6 +12420,7 @@ self: {
        sha256 = "1p8xhxxjhwr93as98pvp1z25ypgj7arka8bw75r0q46948h7nxf7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base parsec template-haskell ];
        executableHaskellDepends = [ base haskell98 process ];
        homepage = "http://monadgarden.cs.missouri.edu/MonadLab";
@@ -12407,6 +12488,7 @@ self: {
        sha256 = "0jq59nnnydllqpvg3h2d1ylz3g58hwi0m08lmw2bv0ajzgn5mc8x";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
        homepage = "http://www.geocities.jp/takascience/haskell/monadius_en.html";
        description = "2-D arcade scroller";
@@ -12424,6 +12506,7 @@ self: {
        sha256 = "0myghw0w122n1czpaaqmpiyv0nragjkwnja8kb4agrwhcjfk3icb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory free free-game mtl
        ];
@@ -12994,6 +13077,7 @@ self: {
        sha256 = "0wz80cv7m7m4q6y6rd07y422b97hyhnb9yl6bj68pi1nxmjzcjhm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary bytestring containers filepath gloss network
          networked-game random
@@ -13083,6 +13167,7 @@ self: {
        pname = "Nomyx-Core";
        version = "0.7.6";
        sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson base blaze-html blaze-markup bytestring data-lens
          data-lens-fd data-lens-template DebugTraceHelpers deepseq directory
@@ -13106,6 +13191,7 @@ self: {
        pname = "Nomyx-Language";
        version = "0.7.6";
        sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean containers data-lens data-lens-fd data-lens-template
          DebugTraceHelpers ghc mtl old-locale random safe time
@@ -13125,6 +13211,7 @@ self: {
        pname = "Nomyx-Rules";
        version = "0.1.0";
        sha256 = "16kzpdvn57sdmpqkwswgixm6pnyi01vj44yvzczn9sy4azwd10q5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers ghc hint-server hslogger mtl old-locale safe stm
          time time-recurrence
@@ -13146,6 +13233,7 @@ self: {
        pname = "Nomyx-Web";
        version = "0.7.6";
        sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring data-lens data-lens-fd fb
          filepath happstack-authenticate happstack-server hscolour mtl
@@ -13440,6 +13528,7 @@ self: {
        sha256 = "061j03ld96zkx1pfg7caxkyknj91b3maijx52610zmc9kfcjg5jd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          async base brick bytestring conduit conduit-extra containers
          control-monad-loop data-default itemfield listsafe microlens mtl
@@ -13911,6 +14000,7 @@ self: {
        sha256 = "0pfd5y8plxicdchkbij0nqj6zwxw3fcy5cz1ji5bky9g3bmz9mhm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers mtl network network-uri xml
        ];
@@ -13995,6 +14085,7 @@ self: {
        sha256 = "1g39mxrfii8vm40cbb7vdfrx2rx9gm4s1xhp3zjkiyi7f979cbk0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          Agda base containers directory filepath mtl pandoc pandoc-types
          QuickCheck text time xhtml
@@ -14258,6 +14349,7 @@ self: {
        sha256 = "17avnaz6da80v5kgz0b3v0zq3y9p2d3mxxv5a09ggcmilbz4xwlg";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory mtl random regex-compat
        ];
@@ -14313,6 +14405,7 @@ self: {
        sha256 = "1kly1jfki4n9fhgkh2m9j9xj8182s92i7rsq81vcm6i3hd4fac94";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base directory filepath haskell98 old-locale old-time parsec
          process random
@@ -14530,6 +14623,7 @@ self: {
        sha256 = "0w7x4zgz00wzchqdhajpf1ir3h0jxw1vgh030g384k1qbbjv4la2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring containers control-timeout directory
          filepath FindBin hashable hashtables haskeline HsParrot HsSyck
@@ -14826,6 +14920,7 @@ self: {
        sha256 = "1d9zllxl8vyjmb9m9kdgrv9v9hwnspyiqhjnb5ds5kmby6r4r1h2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring haskell-src-meta parsec scientific
          snap snap-core template-haskell text vector websockets
@@ -15170,6 +15265,7 @@ self: {
        sha256 = "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers extensible-exceptions GLUT mtl OpenGL random sdl2
          sdl2-image sdl2-mixer time
@@ -15258,6 +15354,7 @@ self: {
        sha256 = "1df010121jdjbagc3gg906kydmwwpa7np1c0mx7w2v64mr7i2q1r";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base HTTP json network utf8-string XMPP
        ];
@@ -15278,6 +15375,7 @@ self: {
        sha256 = "1wk4bylydfdqdmzjybkpbmvp4znp9i26mvkl2541gp5vwv7blms6";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring cereal containers convertible directory
          filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa
@@ -15468,6 +15566,7 @@ self: {
        pname = "Rlang-QQ";
        version = "0.3.1.0";
        sha256 = "0rl3cmr7vfc8vk7132y40ib0l53v9yndw71bmp25zj24nkmha7hj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring Cabal containers data-binary-ieee754
          directory filepath haskell-src-meta HList lens mtl process repa SHA
@@ -15583,6 +15682,7 @@ self: {
        sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46";
        revision = "1";
        editedCabalFile = "0gj76j31i8rnlnvkf6hr8ljc6qmqqqcndy0bgrcppji78zg3ygi3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
@@ -15595,6 +15695,7 @@ self: {
        pname = "SDL-gfx";
        version = "0.6.0.2";
        sha256 = "1i8dfyi0cdhm2mad7fk2dd8qdc3lpbjw52s67vyxi4r1b8rka05b";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_gfx ];
        description = "Binding to libSDL_gfx";
@@ -15609,6 +15710,7 @@ self: {
        sha256 = "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281";
        revision = "1";
        editedCabalFile = "0syx3032z15mnvi2apqsml065xk1i5i9jixwv022a9mimlk710vy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_image ];
        description = "Binding to libSDL_image";
@@ -15623,6 +15725,7 @@ self: {
        sha256 = "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r";
        revision = "1";
        editedCabalFile = "193wigk1c7i4lxkwkj4kd2fzymwg586ky9h7fpsa1cqmz12sc5wz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_mixer ];
        description = "Binding to libSDL_mixer";
@@ -15635,6 +15738,7 @@ self: {
        pname = "SDL-mpeg";
        version = "0.0.1";
        sha256 = "0hx4977iynchnyd4b9ycbiw5qq07wk1a7dkisqx0a3x0ca4qirwj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
@@ -15647,6 +15751,7 @@ self: {
        pname = "SDL-ttf";
        version = "0.6.2.2";
        sha256 = "16blaa55jiyrailhv9cjrr7wrp8m6pssj0jfz2p6631g4vqy888n";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_ttf ];
        description = "Binding to libSDL_ttf";
@@ -15839,8 +15944,8 @@ self: {
     ({ mkDerivation, base, containers, ghc, ghc-paths }:
      mkDerivation {
        pname = "SSTG";
-       version = "0.1.0.4";
-       sha256 = "0z61bv1mxmm1gq4b61gp3519fv0v7hb1cqcl4x8zp7cz5hgr8sr4";
+       version = "0.1.0.7";
+       sha256 = "05hdjym88bmii19gbz2k6jfr0bxmll514ysazavdhcrgdjgf0r0f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ghc ghc-paths ];
@@ -15849,6 +15954,7 @@ self: {
        homepage = "https://github.com/AntonXue/SSTG#readme";
        description = "STG Symbolic Execution";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "STL" = callPackage
@@ -15906,6 +16012,7 @@ self: {
        pname = "SVGFonts";
        version = "1.6.0.1";
        sha256 = "1w6hh8anpb0psilzbp4k80rbavdmkmb5rn34x9m2s72rz0jfy9zp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg bytestring cereal
          cereal-vector containers data-default-class diagrams-core
@@ -16458,6 +16565,7 @@ self: {
        sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers data-lens-light mtl
        ];
@@ -16575,6 +16683,7 @@ self: {
        sha256 = "12dpvm8lzp8gllyrf7yzpljpdr0jdk42zhi7zrnzvjzryv6w268j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-unicode-symbols binary derive directory mtl process
          random zlib
@@ -16595,6 +16704,7 @@ self: {
        sha256 = "02j5ni8565ba7rvr6gw9z65qdfl7rd17586gqlkx2iz2v2bwkasf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-unicode-symbols binary GLUT OpenGL process random
          SoccerFun
@@ -16682,6 +16792,7 @@ self: {
        editedCabalFile = "1gv48zss4rw4z2n9grga090j1223ylzwi5pirqb0d1mdj9w617dm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers enummapset-th filepath LambdaHack template-haskell
          text
@@ -17039,6 +17150,7 @@ self: {
        sha256 = "0h73yj74pl0k3p7vamqhw1jz36pvh8kfpw58gkmskdmkh7j6wb30";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory haskell-src mtl pretty process Strafunski-ATermLib
          Strafunski-StrategyLib template-haskell
@@ -17106,6 +17218,7 @@ self: {
        pname = "StrictBench";
        version = "0.1.1";
        sha256 = "1l4l77rjhl5g9089kjyarsrvbvm43bk370ld50qp17dqhvisl73m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base benchpress parallel ];
        homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/";
        description = "Benchmarking code through strict evaluation";
@@ -17196,6 +17309,7 @@ self: {
        pname = "Sysmon";
        version = "0.1.2";
        sha256 = "1zyp333vicjarcmip2q52nzfv948yl2q6qr3k3glp4v4m8f75ap3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base ConfigFile filepath fingertree Glob MissingH mtl old-locale
          pretty statistics template-haskell time vector
@@ -17643,6 +17757,7 @@ self: {
        sha256 = "1ylf4kzyf947szgib0ivkvygbinmy97nvy77d0crryzxdmccrzbj";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers old-locale old-time random SDL SDL-gfx SDL-image
          SDL-ttf
@@ -17901,6 +18016,7 @@ self: {
        sha256 = "0crymgw91xx0hblbmz488x39i2qzf9c15kv5x950ljmpyrhy5jhv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers filepath random reactive-banana reactive-banana-sdl
          SDL SDL-ttf transformers
@@ -18261,6 +18377,7 @@ self: {
        sha256 = "1fig9zxxisd51v5vzcsapsp4qygikhwhpjzyagw7a3x6kv5qpipm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers matrix ];
        description = "A solver for the WordBrain game";
        license = stdenv.lib.licenses.mit;
@@ -18313,6 +18430,7 @@ self: {
        sha256 = "0974k5adxxa0jpi99wqq13lnav2rdb7qr40snvycsazk5mx1fd35";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base FindBin HDBC HDBC-sqlite3 mtl random split time
        ];
@@ -18423,6 +18541,7 @@ self: {
        pname = "WXDiffCtrl";
        version = "0.0.1";
        sha256 = "0vv8s483g3dkxyk833cjczj0a5zxiy9xh56kij6n0jjyzxb9bz0k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers wx wxcore ];
        homepage = "http://wewantarock.wordpress.com";
        description = "WXDiffCtrl";
@@ -18520,6 +18639,7 @@ self: {
        pname = "WebBits-multiplate";
        version = "0.0.0.1";
        sha256 = "1j3difi3f1w6bgbnsvqw9cv88aikin22myli0lx29pqn7xhqsbv3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base multiplate multiplate-simplified transformers WebBits
        ];
@@ -18817,6 +18937,7 @@ self: {
        pname = "Wired";
        version = "0.3";
        sha256 = "14zxf849r4k3mk5i5rakfjp2f216sz84ww4hfggq9cnr9w8j406j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base chalmers-lava2000 containers mtl QuickCheck
        ];
@@ -19083,6 +19204,7 @@ self: {
        pname = "XMMS";
        version = "0.1.1";
        sha256 = "08l53b0wp6v9wjfn53xfa1vlh64bnqidajc4lzlk8p31km1c09qx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        homepage = "http://kawais.org.ua/XMMS/";
@@ -19099,6 +19221,7 @@ self: {
        pname = "XMPP";
        version = "0.1.2";
        sha256 = "03gypa9kln2v3zqyxszn4k2x364g8wj0hppsy10ywmandghsvn7b";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell98 hsdns mtl network parsec random utf8-string
        ];
@@ -19198,6 +19321,7 @@ self: {
        sha256 = "1r2n1vbzq755p68fzb5f6fm1yjfq2c5jgx52ri9p5rlrwmfk3hw5";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base data-accessor-transformers fclabels monads-fd random SDL
          SDL-image SDL-mixer SDL-ttf transformers
@@ -19239,6 +19363,7 @@ self: {
        sha256 = "0qa7m9y3dclr2r2vpd2cmpc58nib158hnr49hrdjvk00ncd4lyvk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-builder blaze-html bytestring case-insensitive
          clientsession conduit containers data-default directory filepath
@@ -19323,6 +19448,7 @@ self: {
        sha256 = "028a7lrfyikvky52s19kffssnry1grnip3sm7z55bs5fazma1im1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers HCodecs Yampa
        ];
@@ -19404,6 +19530,7 @@ self: {
        pname = "ZFS";
        version = "0.0.2";
        sha256 = "1mwpcgkw1cci2grhb8vl081wykkgsmfbanwapp10mrzzp0df1yzr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base CC-delcont containers mtl network unix
        ];
@@ -19421,6 +19548,7 @@ self: {
        sha256 = "1s005k892z9651mr2jj0jdwpm8aa0y72vi405xi4h6czg52i4rb3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -19492,6 +19620,7 @@ self: {
        sha256 = "0jfnf0rq3rfic196zjwbaiamyis98zrr8d4zn2myjlgqlzhljzs0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base biofasta biopsl cmdargs containers directory process
        ];
@@ -19847,6 +19976,7 @@ self: {
        sha256 = "10mnsl5bclqf1k9yjadxy4zsj6pm4qbsx2hkrrhkjxfvhcba3wcb";
        revision = "3";
        editedCabalFile = "04w0gy775lxjgvvg1mbyrz0xzbdrc0dzbygy4vi52j0y9lygb4vm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          accelerate array base binary bytestring containers cryptohash cuda
          directory fclabels filepath hashable hashtables language-c-quote
@@ -20865,6 +20995,7 @@ self: {
        sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          activehs-base array base blaze-html bytestring cmdargs containers
          data-pprint deepseq dia-base dia-functions directory filepath
@@ -20910,6 +21041,7 @@ self: {
        pname = "actor";
        version = "0.1.1";
        sha256 = "1ic74yrfy6hk7217vh2ff6yacvf3dc5m1hjkcpfvxzdk5xhdv2b5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm time ];
        homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html";
        description = "Actors with multi-headed receive clauses";
@@ -20990,6 +21122,7 @@ self: {
        sha256 = "17ikb90zwz3vvs9yg3z83pzs442vy5nx0h44i64akn10aykw8hic";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base case-insensitive containers directory filepath http-conduit
          MissingH mtl network network-uri old-locale parsec
@@ -21800,6 +21933,7 @@ self: {
        sha256 = "1idw9bb1miw61vvyacrlnx98rl4p0wx750gnhc4blx4a07i5vs9h";
        revision = "1";
        editedCabalFile = "1rl9hm85r607iwigzg5y1rki8vl7943ws4j1zsz0hq8g3mcb5alf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -22002,6 +22136,7 @@ self: {
        pname = "afis";
        version = "0.1.2";
        sha256 = "0ppq3rbwszz3wczg0zgk8hjqplv2ck11bbq5xr8306s5n02ybcf9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base byteable bytestring crypto-random cryptohash packer
        ];
@@ -22059,6 +22194,7 @@ self: {
        sha256 = "070xszykrazkisp1lsh2q1ri1i64lhd8psz8g4blv37zm899fpga";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          Agda base cmdargs containers directory filepath HJavaScript mtl
          pandoc snap-core snap-server transformers utf8-string xhtml
@@ -22204,6 +22340,7 @@ self: {
        pname = "air-spec";
        version = "2013.7.1";
        sha256 = "0s4y2805nmfydzxgr5lnhmyzkb6rh9mx2kpvzqqgyh4jvccdnwfx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/nfjinjing/air-spec";
        description = "air spec helper";
@@ -22488,6 +22625,7 @@ self: {
        sha256 = "1x2rc0gyyg7idc07hi64fvkv5h5a652kmcrczfxqyzbiyx2fjphs";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers cpphs directory fgl
          filepath haskeline HsSyck mtl old-time pretty process random
@@ -22541,6 +22679,7 @@ self: {
        sha256 = "0kybz7q9gd0f35qmgnrg625z8kis308svingkjscn9ridwxz6g09";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base optparse-applicative random text
        ];
@@ -22650,6 +22789,7 @@ self: {
        sha256 = "1wi0x4750c525zaqk8hzin4n1k38219nmgynv85rdsxik5qm141y";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers exceptions haskeline hxt megaparsec mtl path
          QuickCheck random text tf-random transformers
@@ -22907,6 +23047,7 @@ self: {
        sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory editline fgl filepath HUnit
          incremental-sat-solver mtl network parsec pretty QuickCheck random
@@ -23043,6 +23184,7 @@ self: {
        sha256 = "1dmc336irhw6wdny6f2za9n3gnd83i3pcfr7qfkm8fzq6kzkkjy3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base event-list midi non-negative
        ];
@@ -24992,6 +25134,7 @@ self: {
        pname = "amby";
        version = "0.3.2";
        sha256 = "0sck0jjr1iwiy6lxd0lhv4cww004pcm7i9b9d8wikfvp2g170yzs";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cassava Chart Chart-cairo Chart-diagrams colour
          containers data-default data-default-class datasets either
@@ -25019,6 +25162,7 @@ self: {
        sha256 = "0i37ycyhks335gfby81mnjflk40ir66aprf4752sqnqs68wk6bpm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers csv directory filepath graphviz hashable
          HStringTemplate lens MissingH mtl old-locale old-time pandoc
@@ -25161,6 +25305,7 @@ self: {
        pname = "analyze";
        version = "0.1.0.0";
        sha256 = "0ia4dcqzq168qy5qh65dsp7bb94bxmxnpi2l9vzp7492wrhij9mg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring cassava exceptions foldl free hashable
          lucid text unordered-containers vector
@@ -25259,6 +25404,7 @@ self: {
        sha256 = "0xza3xfzzbix9xf0vwwk4qz02h4iil3hglqspgdymhjbxfl68714";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          atomo base blaze-html bytestring containers directory filepath
          hashable haskeline highlighter mtl parsec pretty pretty-show
@@ -25818,6 +25964,7 @@ self: {
        sha256 = "08a747p0dyjvgn5pjfvrb1hnh7vk2km8hbbyvjmnsxl89r5m992l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers deepseq directory filepath glib
          gtk HTTP mtl network process transformers tremulous-query
@@ -25875,6 +26022,7 @@ self: {
        pname = "api-opentheory-unicode";
        version = "1.2";
        sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring opentheory-unicode ];
        testHaskellDepends = [
          base bytestring directory opentheory-unicode
@@ -27577,6 +27725,7 @@ self: {
        editedCabalFile = "18qjn7asld26nlri6md4z3kmyvarvvg5wi7rwsg4ngrxw4gbqhqm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        homepage = "https://github.com/vincenthz/hs-asn1/tree/master/data";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
@@ -27636,6 +27785,7 @@ self: {
        sha256 = "05kdx00bkpp3f4x1i9j8kfbdnhsivx1njcfpcxxgw93jm5ng3lj7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          asn1-encoding asn1-types base bytestring pem
        ];
@@ -27707,6 +27857,7 @@ self: {
        pname = "assertions";
        version = "0.1.0.4";
        sha256 = "1b2p6b6brk0b1hq264i20bpdhdaq4xdzcqp7gzvfy1s5q3zwjzj8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ ansi-terminal base containers ];
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
@@ -27779,6 +27930,7 @@ self: {
        sha256 = "1zb265z6m1py2jxhxzrq2kb3arw2riagajhh3vs0m54rkrak6szs";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory MonadRandom mtl OpenGL random SDL
          SDL-image SDL-mixer SDL-ttf unix
@@ -27817,6 +27969,7 @@ self: {
        sha256 = "0lv4wbblv4r0vwfynswsxzyrl6qp45byjdmg4cs760qq3jj749zl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          astview-utils base bytestring containers directory filepath glade
          glib Glob gtk gtksourceview2 hint mtl process syb
@@ -28129,6 +28282,7 @@ self: {
        pname = "atlassian-connect-core";
        version = "0.8.0.0";
        sha256 = "1gja0q9bxr86wd4cwi6w4iv5bimb37jk7gy5bzc727fp2k75ja42";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson atlassian-connect-descriptor base base64-bytestring
          bytestring case-insensitive cipher-aes configurator containers
@@ -28409,6 +28563,7 @@ self: {
        sha256 = "0hby64jd9zi518rnfk46ilipnp3x0ynkgqk2n0brf1873y88mwx8";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory filepath hashable hint
          mtl parsec pretty regex-pcre template-haskell text time vector
@@ -28766,6 +28921,7 @@ self: {
        sha256 = "1wmfnvl39amyfzkvpd3gysshyf10fjjb91zibalkqbq9pbsnfzjk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base Cabal directory epic haskell98
        ];
@@ -28807,6 +28963,7 @@ self: {
        pname = "audiovisual";
        version = "0.0";
        sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base boundingboxes colors deepseq directory filepath free freetype2
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
@@ -28827,6 +28984,7 @@ self: {
        sha256 = "08z6l97hi6clv3b34mz9zjc5rns02jx1zx9iqdsmjl2p7hcn7rs5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring directory unix ];
        libraryPkgconfigDepends = [ augeas ];
        executableHaskellDepends = [ HUnit ];
@@ -29161,6 +29319,7 @@ self: {
        sha256 = "13z9c4j7f8smc441qawl7brljmgsgmfmp4dzq7914f7ycg24ck6g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process unix ];
        homepage = "https://github.com/dagit/autoproc";
        description = "EDSL for Procmail scripts";
@@ -30210,6 +30369,7 @@ self: {
        sha256 = "12cyn149dgd9wvnc7smqsfy15mzgyfg8l17y6qz0k4dyapp8fvhf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers random wx wxcore
        ];
@@ -30331,6 +30491,7 @@ self: {
        sha256 = "1xb05l5b94hdq65x24z1m4fhvsr977y912qa1c7wi8khc9xvbhqw";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cmdargs containers deepseq direct-sqlite
          directory disk-free-space extra filepath hashable HTTP http-client
@@ -30386,6 +30547,7 @@ self: {
        pname = "bamboo";
        version = "2010.2.25";
        sha256 = "0v96ync9vkq7xyc5jmm7k7vfxpy4m1l2370m99wa8qlrpcffhrmi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default directory filepath gravatar
          hack hack-contrib haskell98 mps mtl network old-locale old-time
@@ -30408,6 +30570,7 @@ self: {
        sha256 = "1xp2k33jxbkf0maj3p3grv93c9vnjg6fzy6l8gg5dhil18834vdd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          bamboo bamboo-theme-blueprint base bytestring data-default hack
          hack-contrib hack-handler-hyena haskell98 mps process
@@ -30426,6 +30589,7 @@ self: {
        pname = "bamboo-plugin-highlight";
        version = "2009.7.5";
        sha256 = "0f8hpampawv0csqsb504hg97r7mimkcs9irm9i2m2b13w5fciaqc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          bamboo base bytestring hack hack-contrib highlighting-kate hxt mps
          xhtml
@@ -30445,6 +30609,7 @@ self: {
        pname = "bamboo-plugin-photo";
        version = "2009.7.5";
        sha256 = "19ik80hcshmw8gpsb9gwngnwvriri10xx2v6xvrz0q25cxgwdjah";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default directory filepath hack hack-contrib
          haskell98 hxt mps utf8-string xhtml
@@ -30464,6 +30629,7 @@ self: {
        pname = "bamboo-theme-blueprint";
        version = "2010.2.25.1";
        sha256 = "1wchvz2nm4klg11wjk3yb5yvqpa26c9lg6xc65k0dwxhy0cyd2zx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          bamboo base bytestring containers data-default gravatar hack
          hack-contrib hcheat mps network rss utf8-string xhtml
@@ -30485,6 +30651,7 @@ self: {
        pname = "bamboo-theme-mini-html5";
        version = "2009.11.27";
        sha256 = "02zh9jqq46gg3hrsfjfq2skajr4jni3cisak4nd3shl6aqapw9d6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          bamboo base base64-string bytestring cgi containers data-default
          directory filepath gravatar hack hack-contrib haskell98 hcheat moe
@@ -30629,6 +30796,7 @@ self: {
        sha256 = "0igz39bxlw4p0fna1wf6g791pk7r1m7hfyib5rgmsdahzkkp7v2h";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers directory filepath ghc ghc-prim html
          plugins snap-core snap-server text transformers unix-compat
@@ -30663,6 +30831,7 @@ self: {
        editedCabalFile = "167akvi72l47gcqbq5609m24469pq0xmv0kjbmivnrxs796gh890";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-svg bytestring template-haskell text
          unordered-containers
@@ -30878,6 +31047,7 @@ self: {
        pname = "base32string";
        version = "0.9.1";
        sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -30930,6 +31100,7 @@ self: {
        pname = "base58string";
        version = "0.10.0";
        sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -31101,6 +31272,7 @@ self: {
        sha256 = "1vb74crz57i4qmjl8k3gxr2abz9rmpw7yl5sm1pggnlfy9wcm15l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers mtl parsec pretty unix
        ];
@@ -31321,6 +31493,7 @@ self: {
        sha256 = "1mwc7l1n2gnw8yx5zphxlkgi6bkcw56qwifpy34wpa55x2lf6n82";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base network text url ];
        executableHaskellDepends = [ aeson base network text url ];
        description = "Update CSS in the browser without reloading the page";
@@ -31477,6 +31650,7 @@ self: {
        sha256 = "1sq6z2a9bddqh0kys10g495bfj7pcyibsvhfxfl279z53va7d6ch";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers convertible Crypto directory filepath
          happstack-server happstack-util hdaemonize HDBC HDBC-postgresql
@@ -31836,6 +32010,7 @@ self: {
        sha256 = "0bclazwhg3ra7zv19xfx5rw2z3p8h8scw5r4m281524qzrkm9j6m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cgi containers directory hint mtl parsec pretty
          template-haskell unix utf8-string xhtml
@@ -32763,6 +32938,7 @@ self: {
        pname = "bindings-K8055";
        version = "0.1.2";
        sha256 = "0daga3vh9x9gih25qgcsl0hafi4hw8h5x64ba6wbmywa9z3hrr20";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ K8055D ];
        homepage = "https://github.com/jputcu/bindings-K8055";
@@ -33355,6 +33531,7 @@ self: {
        pname = "bindings-sc3";
        version = "0.4.1";
        sha256 = "07vp6hzjjrbh3j152mq8f1i6xh9m2r20a555y03p9fzdfrb5kixd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ scsynth ];
        homepage = "https://github.com/kaoskorobase/bindings-sc3/";
@@ -33531,6 +33708,7 @@ self: {
        sha256 = "1vby3nbqbwza65jg5d0bmzh22i5s20cjbqdgaq9zasza7ywgkj22";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers directory mtl parallel
          parsec QuickCheck tagsoup
@@ -33643,6 +33821,7 @@ self: {
        pname = "bioinformatics-toolkit";
        version = "0.3.1";
        sha256 = "0hymk1lk26mla5al22bbj582vg96bwky6vwyqfy9b97q64w50lzl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring bytestring-lexing
          case-insensitive clustering conduit-combinators containers
@@ -33751,6 +33930,7 @@ self: {
        sha256 = "0w380dcpk8gp5cx24nh6xlnibd6pw93wmxcajl26p4kd5cxbgfqz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default hack hack-handler-happstack
          haskell98 MissingH mtl parsec process rallod
@@ -33840,6 +34020,7 @@ self: {
        pname = "bitcoin-api";
        version = "0.12.1";
        sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base58string binary bitcoin-block bitcoin-script
          bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
@@ -33863,6 +34044,7 @@ self: {
        pname = "bitcoin-api-extra";
        version = "0.9.1";
        sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit
          lens stm stm-chans stm-conduit text transformers
@@ -33884,6 +34066,7 @@ self: {
        pname = "bitcoin-block";
        version = "0.13.1";
        sha256 = "0nkx86fwv65x9vz6ni6qgz61afnvcifw2g92bnwdli8hww7prxfp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bitcoin-tx bitcoin-types bytestring cryptohash
          hexstring largeword lens
@@ -33994,6 +34177,7 @@ self: {
        pname = "bitcoin-script";
        version = "0.11.1";
        sha256 = "0k3v35p6qpgh88gc5rqpcmh202xrn2rind9641dinwqqx631v31r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring text
        ];
@@ -34011,6 +34195,7 @@ self: {
        pname = "bitcoin-tx";
        version = "0.13.1";
        sha256 = "006c55l6q6cknxw0k0kzr8vkv8azapfb4mkax6ac6rih6mjq5f1v";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bitcoin-script bitcoin-types bytestring cryptohash
          hexstring lens
@@ -34031,6 +34216,7 @@ self: {
        pname = "bitcoin-types";
        version = "0.9.2";
        sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base58string binary bytestring hexstring text
        ];
@@ -34205,6 +34391,7 @@ self: {
        pname = "bitset";
        version = "1.4.8";
        sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        librarySystemDepends = [ gmp ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
@@ -34428,6 +34615,7 @@ self: {
        sha256 = "1zb076m4673jmvzazwjjmlw3nrnw0j22hiim6r90014sqcpb6xhp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 unix ];
        homepage = "http://github.com/nfjinjing/bla";
        description = "a stupid cron";
@@ -34544,6 +34732,7 @@ self: {
        sha256 = "1cs81ykw1y2q1kwkdni5w9jxa8bc31b118diaqzf870bqm7mq3ia";
        revision = "11";
        editedCabalFile = "1n5sf249kcrk276hdj68g7v6fmhfg6wfwaaibqx2am86iz8dvr06";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -34988,6 +35177,7 @@ self: {
        sha256 = "0c4m9ia92djr8lhp6n1zwwxskr344322m8g24ka4skbrp1vy3qnd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal containers d-bus data-default-class
          microlens microlens-ghc mtl random text transformers uuid
@@ -35132,6 +35322,7 @@ self: {
        sha256 = "0bdhcjiz2b4zavmixvrl5la91s9z5pra05xk52118cjk4dcfdzfg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory feed filepath higherorder highlighting-kate mtl
          old-locale pandoc regex-compat time utf8-string xhtml xml
@@ -35296,6 +35487,7 @@ self: {
        sha256 = "0cryvs5ia52dkc232cl2crhf0qq7ncir5c3zvrgsbzcc2hnmyrww";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
@@ -35331,6 +35523,7 @@ self: {
        sha256 = "12f594sl2c2hrxr95bpv911x0bdfpmaflp29mhw2yln2vh64nhj5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal containers random ];
        executableHaskellDepends = [
          base Cabal cereal containers data-default-class network pandoc
@@ -35369,6 +35562,7 @@ self: {
        sha256 = "13xfnx08xgbfppr4cqmrqj82w192ll4m1x4kmv5jdpk02yb4zqa2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile containers directory filepath glade gtk mtl process
          random regex-compat unix utf8-string X11 X11-xft xmonad
@@ -35595,6 +35789,7 @@ self: {
        pname = "bond-haskell";
        version = "0.1.5.0";
        sha256 = "01l6n6gx2qdwan1dx8vswvm13scp0dxbdvnv5j4w34iyj6qg0qnv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base binary bond-haskell-compiler bytestring containers
          deepseq extra hashable mtl scientific text unordered-containers
@@ -35814,6 +36009,7 @@ self: {
        sha256 = "0am2b5f6a47khka31mxynl9j2fisa6zyfk3ca8yna02hdkw3rlf6";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers descrilo directory filepath simtreelo
        ];
@@ -36252,6 +36448,7 @@ self: {
        sha256 = "1pkjiwxm8lkrjnyya14f6kmmyv9w5lx7328wdyf1w1871daw208p";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base binary blaze-html bytestring configurator cryptohash
          directory hashtables http-types mtl random Spock Spock-core text
@@ -36557,6 +36754,7 @@ self: {
        pname = "btree-concurrent";
        version = "0.1.5";
        sha256 = "1xgw3ki3vypyxxiyzfjajjx1vzavyn1v9445cgbqwrr0n0wpkqm6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base base64-bytestring bytestring cereal containers directory
          filepath hashable mtl random snappy stm time
@@ -36983,6 +37181,7 @@ self: {
        sha256 = "051z39s1xb86ab1a3v4yz8vv8k2kygpixzd878nb1p2pp6xjq74j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryPkgconfigDepends = [ system-glib ];
        executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
@@ -37032,6 +37231,7 @@ self: {
        sha256 = "0dgjjfd4lna6kvqbckx378ssxc5mm9xyvdkwd3r197199rmxq733";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [
          base bytestring gl-capture GLUT OpenGLRaw OpenGLRaw21 repa
@@ -37096,6 +37296,7 @@ self: {
        pname = "byteable";
        version = "0.1.1";
        sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-byteable";
        description = "Type class for sequence of bytes";
@@ -37110,6 +37311,7 @@ self: {
        sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-bytedump";
        description = "Flexible byte dump helpers for human readers";
@@ -37373,6 +37575,7 @@ self: {
        pname = "bytestring-progress";
        version = "1.0.7";
        sha256 = "0c1pz39jp9p8ppajnj3f2phph12nvhhjj7iz8sm580gzdl5rbc4p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring terminal-progress-bar time
        ];
@@ -37604,6 +37807,7 @@ self: {
        pname = "bzlib-conduit";
        version = "0.2.1.4";
        sha256 = "07gxnbr65pl70lssgcxbajc0id9x4p3p8mc0hfi9lgf8rh270w1d";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-DSL bytestring conduit conduit-extra data-default mtl
          resourcet
@@ -37746,6 +37950,7 @@ self: {
        sha256 = "1fsj0wx8nv19yavky6s47djyh9nxcj9bz968x5w10fpl5ks4xc4m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory dlist filepath
          language-c pretty process
@@ -37770,6 +37975,7 @@ self: {
        sha256 = "17hgj8s08lh7mjddbsahdgssk80wpkhc4qspfc34k7zyr9w185zl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory dlist filepath
          language-c pretty process
@@ -38018,6 +38224,7 @@ self: {
        sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal containers directory filepath HTTP mtl
          network pretty process setenv tar template-haskell transformers
@@ -38459,6 +38666,7 @@ self: {
        pname = "cabal-scripts";
        version = "0.1.1";
        sha256 = "1ajgx29hvcsdd6lwc78dyhsjm5ikx2zn0kdbwnzn1kggz2l08ls4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Shell scripts for support of Cabal maintenance";
@@ -38634,6 +38842,7 @@ self: {
        sha256 = "0sk10z9lj291rpidlaydp7nvgl7adbp7gyf2nvqqhrshxnlqpc8z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          archlinux base bytestring Cabal cmdargs containers directory
          filepath mtl pretty process
@@ -39065,6 +39274,7 @@ self: {
        pname = "cairo";
        version = "0.13.3.1";
        sha256 = "0nk77lixlf6j3a2870mbakcznigrf43m6ac1xn35d1v3dmy1kjm3";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring mtl text utf8-string
@@ -39083,6 +39293,7 @@ self: {
        sha256 = "1191j2587f1sy4d6z57df21xn00qdpv27clib7cyaqdy5jnv3zw2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo glib gtk ];
        description = "A template for building new GUI applications using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
@@ -39124,6 +39335,7 @@ self: {
        sha256 = "1f8vpm9a6rv7bgi9a8zarxa0jlph1p6hj1cdqzk5g81mr4dc4vkv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq directory filepath
          haskell-src-meta mime-types monadloc mtl parsec process syb
@@ -39182,6 +39394,7 @@ self: {
        sha256 = "1fj6v1dw1gyy6dx4ssiziahxf8j8vr4l35n3rm04g797wypswmw0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Examples for the Cal3d animation library";
@@ -39307,6 +39520,7 @@ self: {
        sha256 = "0q84q1821ilb0nh228jdpc6acxbbfngihir4mdklr8hywanz3s1g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-portaudio boundingboxes colors containers
          control-bool deepseq directory filepath free freetype2 GLFW-b
@@ -39385,16 +39599,17 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "camfort_0_902" = callPackage
+  "camfort_0_904" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
-     , happy, hmatrix, hspec, lattices, matrix, mtl, partial-order
-     , QuickCheck, sbv, syb, syz, text, transformers, uniplate, vector
+     , happy, hmatrix, hspec, lattices, matrix, mtl
+     , optparse-applicative, partial-order, QuickCheck, sbv, syb, syz
+     , text, transformers, uniplate, vector
      }:
      mkDerivation {
        pname = "camfort";
-       version = "0.902";
-       sha256 = "0pakm4zdygzxpfnvxmn88pc1y1dx33xw71lkg0hbxj1k4dn4651q";
+       version = "0.904";
+       sha256 = "0j1m9vc4fs7151s2bm1nl480c87mqfann6xv7bzcx6p76iqxvii8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39403,17 +39618,13 @@ self: {
          partial-order sbv syb syz text transformers uniplate vector
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         array base binary bytestring containers directory fgl filepath
-         fortran-src GenericPretty ghc-prim hmatrix lattices matrix mtl
-         partial-order QuickCheck sbv syb syz text transformers uniplate
-         vector
-       ];
+       executableHaskellDepends = [ base optparse-applicative ];
        testHaskellDepends = [
          array base binary bytestring containers directory filepath
          fortran-src hmatrix hspec lattices mtl partial-order QuickCheck sbv
          text uniplate
        ];
+       homepage = "https://camfort.github.io";
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39427,6 +39638,7 @@ self: {
        sha256 = "0r6wzn9kxwinfa383lbxsjlrpv4v2m72qzpsyc9gcigvd5h7zhzz";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bytestring Imlib terminfo ];
        homepage = "not yet available";
        description = "write image files onto 256(or 24bit) color terminals";
@@ -39596,6 +39808,7 @@ self: {
        sha256 = "0rmq22fiaadpszckbj5k5gi4sr1jipinyrx9hwc21k5d185vsakd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base cmdargs ConfigFile containers directory dlist filepath
          language-c mtl pretty process yices
@@ -39615,6 +39828,7 @@ self: {
        sha256 = "1492x5hy5ljf0h40c045jd3w26f7jwqplgncka3dnw4mx9kq4g15";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
@@ -39742,6 +39956,7 @@ self: {
        sha256 = "0k0zqi6c6cqhkxhdgn5n5cpq4pjlvv1m5wzxrsiw9aj23dk9bgxa";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cairo directory filepath gtk gtk2hs-buildtools hcwiid
          highlighting-kate mtl pandoc pango process text time
@@ -40077,6 +40292,7 @@ self: {
        pname = "cash";
        version = "0.1.0.1";
        sha256 = "0pwn33dpv5bgs74i8x6q47hsbl0jg68xwhjjiwyjdyl6sb3rfih7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base deepseq haskell98 HaXml network parallel pretty
        ];
@@ -40524,6 +40740,7 @@ self: {
        sha256 = "1vjhg9dxg23q0dqr07gbrg92h3m9r38d7jb3c4sxnw6gaj76f5gw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        homepage = "http://code.atnnn.com/projects/casui";
        description = "Equation Manipulator";
@@ -41377,6 +41594,7 @@ self: {
        pname = "chalmers-lava2000";
        version = "1.6.1";
        sha256 = "12cwp804z1grsn4pyygd2mffr5lm02g1rxibjill5wyd24k1brgb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process random ];
        homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf";
        description = "Hardware description EDSL";
@@ -41579,6 +41797,7 @@ self: {
        sha256 = "1q2jb2hycxqa9ka9q7yyl5ckvcc1mdiklwivms1mm4qylwaqmgy0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring cereal cereal-text containers deepseq
          directory filepath fullstop hashable mbox MonadRandom parsec
@@ -41895,6 +42114,7 @@ self: {
        sha256 = "0i94impyhsrj4kg7mdr1xawmgalsfr3nsazl4v9ykhn3jam4kczb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base digits either-unwrap generic-trie haskeline parsec
        ];
@@ -42116,6 +42336,7 @@ self: {
        pname = "chu2";
        version = "2012.11.20";
        sha256 = "01q34kzhisb8ani3k5dfjaixa7j1vqg0nh8mbmnya52hr7p4sdiz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default hack2 hack2-handler-snap-server
          utf8-string
@@ -42520,6 +42741,7 @@ self: {
        pname = "citation-resolve";
        version = "0.4.3";
        sha256 = "1x561l7shkz1nh43xh2nj83pb183rah1swi0ql9n0wr9ykq1mh1l";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring citeproc-hs containers curl data-default
          directory download-curl either lens mtl process safe text
@@ -42543,6 +42765,7 @@ self: {
        pname = "citeproc-hs";
        version = "0.3.10";
        sha256 = "1fb51v8hv8ik3a8grba2br6cfbj1b3y72lgjh4i75xh09i7xna0r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers directory filepath hexpat hs-bibutils
          HTTP json mtl network network-uri old-locale pandoc-types parsec
@@ -42623,6 +42846,7 @@ self: {
        pname = "cjk";
        version = "0.1.0.1";
        sha256 = "1r0rw33vqkhck0mfqz19plw9a71f56gdcjldrxl23178fps349vl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers text text-icu
        ];
@@ -42666,6 +42890,7 @@ self: {
        sha256 = "1llr7mnlh8msn9plgnnj73w3jqlcwn8v9k2m58520l9q2zfvf68b";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base bytestring cmdargs containers data-stringmap
          directory executable-path file-embed filepath HTTP json-builder
@@ -42700,6 +42925,7 @@ self: {
        sha256 = "1jv1bl9fzbahhk0g64n611h9hipkr4zcasj2dw5w5v2nqlwrwdjj";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base clafer containers data-stringmap directory
          executable-path filepath haskeline HaXml json-builder mtl
@@ -42729,6 +42955,7 @@ self: {
        pname = "claferwiki";
        version = "0.4.5";
        sha256 = "0rjppdxxzaf3898jklq4c0b7zjnkg6zcqr5nxbrabmvm2l53a4p0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clafer containers directory gitit MissingH mtl network
          network-uri process SHA split time transformers transformers-compat
@@ -42929,6 +43156,7 @@ self: {
        pname = "clash-prelude-quickcheck";
        version = "0.1.2.1";
        sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base clash-prelude QuickCheck ];
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
@@ -42943,6 +43171,7 @@ self: {
        pname = "clash-systemverilog";
        version = "0.7.2";
        sha256 = "056m8ynwq3y11zkkx9nkkmvamnm2m3337vk8lkx90pk96nvdiaiy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
@@ -42961,6 +43190,7 @@ self: {
        pname = "clash-verilog";
        version = "0.7.2";
        sha256 = "09bfrhhiml6m0qssvr18p38ypyxj1zp7vxgci974gd6k597ihi2k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
@@ -42979,6 +43209,7 @@ self: {
        pname = "clash-vhdl";
        version = "0.7.2";
        sha256 = "1c63m2gcifak0v38rsmv4j521br84jaspdb193a66957qisvfsvs";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
@@ -43148,6 +43379,7 @@ self: {
        pname = "clckwrks";
        version = "0.24.0.3";
        sha256 = "1c0y9aw48qq7zyg8958lk5kzmfaa8ndgw88ps92sx5aj4z0ggsmf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -43182,6 +43414,7 @@ self: {
        pname = "clckwrks";
        version = "0.24.0.4";
        sha256 = "0xpv3qb7w1bzszbnmzriai9dv9qfajnv1pv9y3jdaih4gj73c9ny";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -43254,6 +43487,7 @@ self: {
        pname = "clckwrks-plugin-bugs";
        version = "0.7.5";
        sha256 = "0la4ivk8sbh8wq1g2nhxx522ir2idffz5818bghjf8qffmqa47fv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base cereal clckwrks clckwrks-plugin-page
          containers directory filepath happstack-authenticate happstack-hsp
@@ -43279,6 +43513,7 @@ self: {
        pname = "clckwrks-plugin-ircbot";
        version = "0.6.17.3";
        sha256 = "1fk6jyjvkqs11khj8mriqbj56kz19ayhha3kq79cnhjm8c7184cb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html bytestring clckwrks
          containers directory filepath happstack-hsp happstack-server hsp
@@ -43304,6 +43539,7 @@ self: {
        pname = "clckwrks-plugin-mailinglist";
        version = "0.3.0.2";
        sha256 = "1zhcqkzas3pcnviwka0v174spq8wn457kvmxk6nafcxkwf27p52m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base bytestring clckwrks containers directory
          filepath happstack-authenticate happstack-hsp happstack-server hsp
@@ -43327,6 +43563,7 @@ self: {
        pname = "clckwrks-plugin-media";
        version = "0.6.16.3";
        sha256 = "1kslj1yvw6kn68grcr7drhrybb1b5d1id5plcaa4570yz8vp7xr6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
@@ -43351,6 +43588,7 @@ self: {
        pname = "clckwrks-plugin-media";
        version = "0.6.16.4";
        sha256 = "19fv38gqslg01ymj3nb838pnhir92gfkyl6kccik39brgcfd915b";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
@@ -43424,6 +43662,7 @@ self: {
        pname = "clckwrks-theme-bootstrap";
        version = "0.4.2.1";
        sha256 = "1mkqi3qx6k86d2xr4cyxg0ym5c71ip4ijgg6mg20gf3jkjjzvha4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
@@ -43442,6 +43681,7 @@ self: {
        pname = "clckwrks-theme-clckwrks";
        version = "0.5.2.1";
        sha256 = "14pksv77afppp43dfba5f4brnycqhca2kylvb1bpjdb61lni9sk7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
          web-plugins
@@ -43458,6 +43698,7 @@ self: {
        pname = "clckwrks-theme-geo-bootstrap";
        version = "0.1.1";
        sha256 = "1qxik7hdz300n5lfb5xzh2md44b4xwwlr0c92y9x2na2xz41da7k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base clckwrks hsp text ];
        homepage = "http://divshot.github.com/geo-bootstrap/";
        description = "geo bootstrap based template for clckwrks";
@@ -43488,6 +43729,7 @@ self: {
        sha256 = "1c6gn0rkb3c92hgc1blkbf21s62j1r7vqs2p8mmr6my5g52lvif1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs containers directory HSH IfElse
        ];
@@ -43715,6 +43957,7 @@ self: {
        sha256 = "1nsvhb7lbkclhqpbvs3ccwclpr4g8p6zmsyn072bc0d0icf4hql5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base data-default functor-infix old-locale parsec strptime time
        ];
@@ -43906,26 +44149,26 @@ self: {
      }) {};
 
   "cloud-seeder" = callPackage
-    ({ mkDerivation, amazonka, amazonka-cloudformation, amazonka-core
-     , base, bytestring, deepseq, exceptions, fast-logger, hspec, lens
-     , monad-control, monad-logger, monad-time, mtl
-     , optparse-applicative, text, transformers, transformers-base
+    ({ mkDerivation, aeson, amazonka, amazonka-cloudformation
+     , amazonka-core, base, bytestring, containers, deepseq, exceptions
+     , fast-logger, hspec, lens, monad-control, monad-logger, monad-mock
+     , mtl, optparse-applicative, text, transformers, transformers-base
+     , unordered-containers, uuid, yaml
      }:
      mkDerivation {
        pname = "cloud-seeder";
-       version = "0.0.0.0";
-       sha256 = "1nh0qmj1fdxkqa2db8xpv7anrlqyl7dcphjd25qgq86gjcdn27bb";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.0.0";
+       sha256 = "1jyxbk37xzx7dgxkgrmpn7nv7v494l26f4c5r1j665cd1d8x0m4f";
        libraryHaskellDepends = [
-         amazonka amazonka-cloudformation amazonka-core base deepseq
-         exceptions lens monad-control monad-logger monad-time mtl
+         aeson amazonka amazonka-cloudformation amazonka-core base
+         containers deepseq exceptions lens monad-control monad-logger mtl
          optparse-applicative text transformers transformers-base
+         unordered-containers uuid yaml
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         amazonka-cloudformation base bytestring deepseq fast-logger hspec
-         lens monad-logger mtl text transformers
+         amazonka-cloudformation base bytestring containers deepseq
+         fast-logger hspec lens monad-logger monad-mock mtl
+         optparse-applicative text transformers yaml
        ];
        homepage = "https://github.com/cjdev/cloud-seeder#readme";
        description = "A tool for interacting with AWS CloudFormation";
@@ -44186,6 +44429,7 @@ self: {
        sha256 = "0in6fqzr1aki2dhbkv3vlmw17vla5m39g6msaplk4vix5yjw7vkq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bio bytestring containers QuickCheck regex-compat simpleargs
        ];
@@ -44221,6 +44465,7 @@ self: {
        pname = "cmaes";
        version = "0.2.2.1";
        sha256 = "0r0z5rik19sd985hgdy7f00sfpqwlgzbsmkqsiywddi8nqg6qq7m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl process safe strict syb ];
        testHaskellDepends = [
          base doctest doctest-prop mtl process random syb vector
@@ -44377,6 +44622,7 @@ self: {
        sha256 = "1k0g2vh7sqkblzjsfvyhfiy1fcwkw0i10kgl4n2r68w7v52mmzd0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cmdargs directory filepath http-types process text
          transformers wai wai-handler-launch
@@ -44538,6 +44784,7 @@ self: {
        pname = "cndict";
        version = "0.8.2";
        sha256 = "0pc6rph99mxy5cbrxrysxq5q01vn2k2ax3c00pv9sw7inn4inh0p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base bytestring text ];
        homepage = "https://github.com/Lemmih/cndict";
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
@@ -44821,6 +45068,7 @@ self: {
        sha256 = "0076dvka5c0m3smppp58lklnf26ry9kibzyiy4yx1ygw5rn7m7pc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base binary bytestring containers directory filepath glib
          gtk3 lens monad-control monad-logger mtl persistent
@@ -45098,6 +45346,7 @@ self: {
        sha256 = "0vyzjv5r9jww4n35yp9qmq5bb8h7k6gmr7iw6igm08cnlwx9pirr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base colour containers data-default directory friday
          friday-devil split v4l2 vector vector-space yaml
@@ -45172,6 +45421,7 @@ self: {
        pname = "colour";
        version = "2.3.3";
        sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/haskellwiki/Colour";
        description = "A model for human colour/color perception";
@@ -46352,6 +46602,7 @@ self: {
        sha256 = "0q2l2yqxk210ycw1alcps9x7l2f60g9sb0wan7d1d2fkbfhq3z41";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring concraft containers double-conversion
          lazy-io moan network sgd split tagset-positional text
@@ -46374,6 +46625,7 @@ self: {
        sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring concraft containers lazy-io mtl
          network process sgd split tagset-positional text transformers
@@ -46449,6 +46701,7 @@ self: {
        sha256 = "1w4bg284fcnd15yg7097d8sh0rzxr76zlrr1bfj2dksw8ddy3jda";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs containers hxt hxt-charproperties hxt-curl hxt-relaxng
          hxt-tagsoup
@@ -47224,6 +47477,7 @@ self: {
        pname = "config-manager";
        version = "0.3.0.1";
        sha256 = "1qrj0x2s0vsxnqkkmchwqvsmziqchrffaxkda9hx0s0ahyw5w0lb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath parsec text time unordered-containers
        ];
@@ -47379,6 +47633,7 @@ self: {
        pname = "configurator";
        version = "0.3.0.0";
        sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring directory hashable text unix-compat
          unordered-containers
@@ -47420,6 +47675,7 @@ self: {
        pname = "configurator-ng";
        version = "0.0.0.1";
        sha256 = "0aq1iyvd3b2d26myp0scwi9vp97grfcrp2802s4xpg84vpapldis";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring critbit data-ordlist directory dlist
          fail hashable scientific text unix-compat unordered-containers
@@ -47486,6 +47742,7 @@ self: {
        sha256 = "02a33940rnwq5bzqx50fjy76q0z6nimsg2fk3q17ai4kvi0rw0p3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers filepath html HTTP mtl network
          old-time parsec pretty random stm unix
@@ -48737,6 +48994,7 @@ self: {
        sha256 = "10pfz4bw1wh55c2cizd8jiwh8bkaqw9p773976vl52f0jrhns1qg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers directory filepath
          filestore http-types monads-tf pandoc template-haskell text time
@@ -49026,6 +49284,7 @@ self: {
        sha256 = "1yv3lj86fkaf9mfxb97ic5v8hm4xx0vv3q4qj0c9n0ki21ymsa5z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring directory filepath old-locale
          optparse-applicative process stm text time unix
@@ -49136,6 +49395,7 @@ self: {
        pname = "cprng-aes";
        version = "0.6.1";
        sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base byteable bytestring cipher-aes crypto-random
        ];
@@ -49175,6 +49435,7 @@ self: {
        sha256 = "079v1k1m61n3hrmz6lkdg400r3nn9fq8bwmy477vjjnyjvm1j38f";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers parallel ];
        description = "Symbolic cryptographic protocol analyzer";
        license = stdenv.lib.licenses.bsd3;
@@ -49188,6 +49449,7 @@ self: {
        sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/vincenthz/hs-cpu";
        description = "Cpu information and properties helpers";
@@ -49465,6 +49727,7 @@ self: {
        sha256 = "107chyp8br2ryjqdf7100109k0wg3jawzva76wf4r6fndjr3gin1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs directory process shelly text transformers unix
        ];
@@ -49912,6 +50175,7 @@ self: {
        sha256 = "0xps7jm8g1bg7a2y4b6mj5nhg3b595k5ysprf4711lwyfpy478jk";
        revision = "1";
        editedCabalFile = "0hgy2rbrb0dg1sjdvqk2zivdq075fih4zlf51ffdmqzgcdj3i9b1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base binary bytestring cassava code-page
          containers deepseq directory filepath Glob hastache js-flot
@@ -49942,6 +50206,7 @@ self: {
        sha256 = "0hbhm6fcbvh38m8hazlzjh3z09adjrzcv5jq63792bvnm24bpx6r";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base-compat binary bytestring cassava
          code-page containers deepseq directory exceptions filepath Glob
@@ -49999,6 +50264,7 @@ self: {
        sha256 = "010x56czgipw3p1cfkx07mlcy4yj6advq3zzgrxpmjhrxzsa89xn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers filepath
        ];
@@ -50238,6 +50504,7 @@ self: {
        pname = "crypto-api-tests";
        version = "0.3";
        sha256 = "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api directory filepath HUnit
          QuickCheck test-framework test-framework-hunit
@@ -50295,6 +50562,7 @@ self: {
        pname = "crypto-cipher-types";
        version = "0.0.9";
        sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base byteable bytestring securemem ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher types";
@@ -50652,6 +50920,7 @@ self: {
        pname = "cryptohash-cryptoapi";
        version = "0.1.4";
        sha256 = "13h5f9pmcd0swa4asl7wzpf5lskpgjdqrmy1mqdc78gsxdj8cyki";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api cryptonite memory tagged
        ];
@@ -50761,6 +51030,7 @@ self: {
        editedCabalFile = "1waln79xzki1l2r1xziy2dd007q8yfsbihhp9qsxxpcpl6qmzvib";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base base-compat bytestring containers deepseq
          directory filepath gitrev GraphSCC heredoc monad-control monadLib
@@ -50795,6 +51065,7 @@ self: {
        sha256 = "1w8w4srdvnd8dwjbip45bdqsgpg5xmw2nrw1asnk857bgdhjh2ci";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base base-compat bytestring containers deepseq
          directory filepath gitrev GraphSCC heredoc monad-control monadLib
@@ -51047,6 +51318,7 @@ self: {
        pname = "csound-expression-typed";
        version = "0.2.0.2";
        sha256 = "1fb3wayix991awxnns6y1a9kmb6kvnay7p4rx62nvj89qa513d82";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq directory filepath ghc-prim hashable
@@ -51499,6 +51771,7 @@ self: {
        pname = "cue-sheet";
        version = "0.1.0";
        sha256 = "1w85vl2nkw3qy7sjpl3hafvsz79vbasgkr6w0s89p1dk7sdkckfb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class exceptions megaparsec
          mtl QuickCheck text
@@ -51521,6 +51794,7 @@ self: {
        pname = "cue-sheet";
        version = "0.1.1";
        sha256 = "1h0v7jzxavjs2c50p1z3bfvbn1r29z31qcr17mjmd7a9yskp4yhd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class exceptions megaparsec
          mtl QuickCheck text
@@ -51663,6 +51937,7 @@ self: {
        sha256 = "1igys4i7wwj1ildkf4is66gq22zsjg158kv3ald5xiilwkmvfc4h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ filepath ];
        executableHaskellDepends = [
          base containers curry-base mtl old-time pretty syb
@@ -51734,6 +52009,7 @@ self: {
        pname = "curves";
        version = "1.1.0.2";
        sha256 = "074gc55yf09949yqgal830plz2408zk86mdfx4n864xxdksklfda";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers filepath HaXml JuicyPixels QuickCheck
        ];
@@ -51908,6 +52184,7 @@ self: {
        pname = "daemonize-doublefork";
        version = "0.1.1";
        sha256 = "1g446qxff8ajv44341y0f9v39j8idmnn23lwi08gq3ps4qrz0py2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory unix ];
        homepage = "https://github.com/scvalex/daemonize-doublefork";
        description = "Start background daemons by double-forking";
@@ -51925,6 +52202,7 @@ self: {
        sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal data-default directory filepath ghc-prim
          network pipes transformers unix
@@ -52182,6 +52460,7 @@ self: {
        sha256 = "1lc1v30zmlcrp6i22d3arghqhy9pjncddr34df6zd8s0r9wsi61d";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory html HUnit mtl old-time
          parsec process QuickCheck regex-compat unix
@@ -52242,6 +52521,7 @@ self: {
        sha256 = "0rp6flaizbaxzr28fr82vaacl4wajh6zdqnwcbgyhwz5dj7rdanq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory HaXml mtl process
        ];
@@ -52257,6 +52537,7 @@ self: {
        pname = "darcs-scripts";
        version = "0.1.1";
        sha256 = "06gs18s89nc5qyicfpkj0hz999l5pf4glhlanm2yhyd6lxbfgkba";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Shell scripts for support of darcs workflow";
@@ -52322,6 +52603,7 @@ self: {
        sha256 = "1gl0wplzlhb6ynacq7bv38ijhazpwr642zc0a2dixbpibchgxksf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cgi concurrentoutput containers Crypto directory
          filepath HTTP mime-string mtl nano-md5 network old-locale old-time
@@ -54489,6 +54771,7 @@ self: {
        sha256 = "1zhvl6h32y9hd1drv0ipm13si0cqf83i9kxnyivp4j1l5h4b55dx";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator containers directory fgl filepath HDBC
          HUnit mtl random split template-haskell text time yaml-light
@@ -54783,6 +55066,7 @@ self: {
        pname = "ddc-code";
        version = "0.4.3.2";
        sha256 = "19ah5j1l84g06szyaf0qni89cqdnpygrlczppzx3qjl280q1qpzd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ];
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler base libraries";
@@ -55304,6 +55588,7 @@ self: {
        sha256 = "0b7328529m3xl8bj7sncv5rr13ld2aghgqkf55j4n15jagv6g72d";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ time unix ];
        executableHaskellDepends = [
          base bytestring containers directory filepath haskell-src-exts
@@ -55770,6 +56055,7 @@ self: {
        pname = "delimiter-separated";
        version = "0.1.0.0";
        sha256 = "17ff9ipsnqicjkwsfg7zfb5gm0k9scsb44dl82gmf8i0f0nnd0h6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base uhc-util uulib ];
        homepage = "https://github.com/atzedijkstra/delimiter-separated";
        description = "Library for dealing with tab and/or comma (or other) separated files";
@@ -55811,6 +56097,7 @@ self: {
        sha256 = "0ya0hgvpa9w41gswngg84yxhvll3fyr6b3h56p80yc5bldw700wg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers monad-atom nlp-scores text
        ];
@@ -55973,6 +56260,7 @@ self: {
        sha256 = "0qgqlnj7wkmjba5f2rql51g9jhak0ksx3xdmr25j3p6qwb43k5ih";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bio bytestring cmdargs directory process regex-compat
        ];
@@ -57035,6 +57323,7 @@ self: {
        pname = "diagrams-rasterific";
        version = "1.4";
        sha256 = "190mc32fjjf3770fjp1bmbh3zc8l5bhqhqy30vv48l0pypfjrsns";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
@@ -57162,6 +57451,7 @@ self: {
        pname = "dialog";
        version = "0.3.0.0";
        sha256 = "1lhsd48zb6d00jr7zdmpnhx8gkb3da8kr1qr09qpqais71mxhzz4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring filepath glib gtk3 open-browser text transformers
          webkitgtk3
@@ -57756,6 +58046,7 @@ self: {
        sha256 = "1ii93jmrqs8rlx27rhykq4gqybm92908hg7kzin9ln7fg5ldvmlk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base FontyFruity JuicyPixels Rasterific vector
        ];
@@ -59447,6 +59738,7 @@ self: {
        pname = "dnsrbl";
        version = "0.0.3";
        sha256 = "07xq52aqqmzq1f68m8spr7fyax0cqnpv9mh5m4x3klxm0iznv9xm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
        homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/";
        description = "Asynchronous DNS RBL lookup";
@@ -59495,6 +59787,7 @@ self: {
        sha256 = "0009gpm6hgjr78bsp0cd4skvhbms83j4j9axf6zns7pnfqvc6inf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base64-bytestring binary bytestring containers directory feed
          filepath haskell98 heist hexpat json MonadCatchIO-transformers
@@ -59583,6 +59876,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "docker-build-cacher" = callPackage
+    ({ mkDerivation, base, containers, foldl, language-dockerfile
+     , system-filepath, text, turtle
+     }:
+     mkDerivation {
+       pname = "docker-build-cacher";
+       version = "1.1";
+       sha256 = "0rc6i4s8iw1qbz9nicbcqjv2b0pr0vzkld8srs4ns41nq4brcdbn";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers foldl language-dockerfile system-filepath text
+         turtle
+       ];
+       description = "Builds a services with docker and caches all of its intermediate stages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dockercook" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base16-bytestring, bytestring, conduit, conduit-combinators
@@ -59638,6 +59949,7 @@ self: {
        pname = "docopt";
        version = "0.7.0.5";
        sha256 = "1vh5kn13z0c6k2ir6nyr453flyn0cfmz7h61903vysw9lh40hy8m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers parsec template-haskell th-lift
        ];
@@ -59659,6 +59971,7 @@ self: {
        pname = "doctemplates";
        version = "0.1.0.2";
        sha256 = "0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers parsec
          scientific text unordered-containers vector
@@ -60170,6 +60483,7 @@ self: {
        sha256 = "0capas1h8d8y8j5sd0zbzayf18jknh1w6q8jcwrx3dqgfd316dqp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base directory elerea GLFW mersenne-random OpenGL
        ];
@@ -60427,6 +60741,7 @@ self: {
        pname = "dpkg";
        version = "0.0.3";
        sha256 = "1bqrj1vqqjnv3qcs1s7lbwyzry95fzxrhi6340zqv0ibvyqnaz5k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-DSL bytestring monad-loops
        ];
@@ -60705,6 +61020,7 @@ self: {
        sha256 = "0wry1dwcf3dwd780aic3v6jlrdjplrsciw1rr582a78c7anasjr0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cmdargs ConfigFile dsmc gloss gloss-raster hslogger
          mtl repa strict transformers vector
@@ -60968,6 +61284,7 @@ self: {
        pname = "dump-core";
        version = "0.1.3";
        sha256 = "1innidrmxaqs093pb8g9q7hfmm3kv3przhi34py4sjl256gdwgq0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath ghc monadLib
          text
@@ -61115,6 +61432,7 @@ self: {
        pname = "dwarf";
        version = "0.23";
        sha256 = "0h6bzh628cz0qnbk4aiz5859r9va99q307scbwzvs1wn3nm6dszl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
@@ -61252,6 +61570,7 @@ self: {
        pname = "dynamic-graph";
        version = "0.1.0.9";
        sha256 = "0paa9y5h0pp4b44kq5yn8m43nir4wg9hgfmns2d76r8qjry617qp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo colour either GLFW-b GLUtil OpenGL pango pipes
          transformers
@@ -61283,6 +61602,7 @@ self: {
        pname = "dynamic-loader";
        version = "0.0.1";
        sha256 = "1ci7fcpgwf3v8rakypxi0l3l3aazwnf004ggpdr6vqqj5iav3a15";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory ghc-prim hashable hashtables time transformers
        ];
@@ -61743,6 +62063,7 @@ self: {
        pname = "eccrypto";
        version = "0.0.1";
        sha256 = "1jcwlwbcd77536ii0wxalbdslzbvv224b07g3801pgjvr38xljpx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api SHA vector
        ];
@@ -61885,6 +62206,7 @@ self: {
        pname = "ede";
        version = "0.2.8.7";
        sha256 = "02jy6v9w7vpzs3fikfvgd09p0dvfq9isxcag281naazgn1my8swb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
          double-conversion filepath free lens mtl parsers scientific
@@ -61935,6 +62257,7 @@ self: {
        sha256 = "0jkcva53vm8lm76z947xms8a2zkh9sn9951cwry8k7r132dmcn32";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring cairo containers directory filepath
          ghc-events-parallel gtk mtl text zip-archive
@@ -61955,6 +62278,7 @@ self: {
        sha256 = "0zvwkk7sdgi4h1gld4h4c0lznkp5nd9p3cxpfj2yq393x27jamc0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ALUT base cmdtheline containers gloss OpenAL random wraparound
        ];
@@ -62077,6 +62401,7 @@ self: {
        sha256 = "0raj0s8v72kz63hqpqhf58sx0a8mcwi4ania40spjirdrsdx3i9g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra directory process resourcet
          temporary transformers unix
@@ -62231,6 +62556,7 @@ self: {
        sha256 = "1fdlpk51y9ddwj5nky0k7shxm1z2nv0l3xfbfgmjcq44xc5wpzsn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers directory ghc ghc-paths haskeline mtl
          parallel parsec process random regex-tdfa text transformers
@@ -62423,6 +62749,7 @@ self: {
        pname = "ekg";
        version = "0.4.0.13";
        sha256 = "13xlggjcfmp8hr8sz74r0xms36rrfa86znazy2m6304dgscdbca4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath network snap-core
          snap-server text time transformers unordered-containers
@@ -62676,6 +63003,7 @@ self: {
        pname = "ekg-wai";
        version = "0.1.0.1";
        sha256 = "14vl5k7jq7p7fiwj9rbw3ng7j8cagydpw7zvf8qxbwxdz9xr655q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath http-types network
          text time transformers unordered-containers wai wai-app-static warp
@@ -62769,6 +63097,7 @@ self: {
        pname = "elf";
        version = "0.28";
        sha256 = "0mzikwgd3dnzjgj1xa69lgrs38pnvwffvblckrqnwf0h7fd149wy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "https://github.com/wangbj/elf";
        description = "Parser for ELF object format";
@@ -62992,6 +63321,7 @@ self: {
        sha256 = "0w0jn7qvxsfcqdr0r147qs6s2711m1xwp28ddzd60n9yn0gdpfi9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson aeson-pretty base base-unicode-symbols bytestring containers
          directory file-embed filepath process text time
@@ -63064,6 +63394,7 @@ self: {
        sha256 = "0j8md3cqg7wrcx85s5hj8g812zvrr3y4833n0wc3dvfa3wlblpga";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-html blaze-markup bytestring cmdargs containers
          directory elm-compiler filepath fsnotify HTTP mtl process snap-core
@@ -64041,6 +64372,7 @@ self: {
        sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base Cabal directory mtl process ];
        executableHaskellDepends = [
          array base Cabal directory mtl process
@@ -64071,6 +64403,7 @@ self: {
        pname = "eprocess";
        version = "1.7.2";
        sha256 = "190qgsqj41dbkphjrgljif7q0zjm9ddp8wawc9wx8qklb897jrvj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -64295,6 +64628,7 @@ self: {
        pname = "eros";
        version = "0.6.0.0";
        sha256 = "0nr0c2qq30ji50pyjrklrb6a73i6qkqws7ywbfpa4pcd176xwlrw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "A text censorship library";
        license = stdenv.lib.licenses.bsd3;
@@ -64311,6 +64645,7 @@ self: {
        sha256 = "15pi4khibvfpxni4v3kz6f92s8s34kmkx4q7kwq1rxk5gb6p8rcb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers eros text
        ];
@@ -64329,6 +64664,7 @@ self: {
        sha256 = "1c7bwszjvbb3qnbvpjm0vin2x2z6dylplhs10hbhszkq2ypjjxyk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base blaze-html bytestring eros http-types markdown text wai
          warp
@@ -64521,6 +64857,7 @@ self: {
        sha256 = "1h58g9lfhmww433z24vmi6wkaii5ik0hrmjprvypgw4bgibls0g9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers data-default lens mtl process
          temporary transformers unordered-containers
@@ -64546,6 +64883,7 @@ self: {
        sha256 = "173k73dvbv528q6072b8k7xy9q6558rlmz7llkiym4g1j2xi37cf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers data-default lens mtl
@@ -64727,6 +65065,7 @@ self: {
        sha256 = "100pqygnwclmpzjhzpz3j34y8v75d8ldxg76f9jys90gb41kggpi";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bio bytestring containers random
        ];
@@ -64745,6 +65084,7 @@ self: {
        pname = "etc";
        version = "0.0.0.2";
        sha256 = "1cbxanxm7qpbsj3q5f6q4sn2krvfi3bm5yxi2qcxrqpjrhq31j8i";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions hashable
          protolude text unordered-containers vector
@@ -64767,6 +65107,7 @@ self: {
        pname = "etc";
        version = "0.2.0.0";
        sha256 = "16l5ap8ag2l3ks6pjwr49wk4njgap44kbxsqb69yr9lr81wrj9fv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions hashable
          protolude text unordered-containers vector
@@ -65123,6 +65464,7 @@ self: {
        pname = "eurofxref";
        version = "0.2.1";
        sha256 = "0zjf3rky2ww2nq4ryyz0069cv3ps1h29nwrgr2sk127bsik868x9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring conduit containers failure hexpat http-conduit
          http-types monad-control mtl time
@@ -65894,6 +66236,7 @@ self: {
        editedCabalFile = "0mnc09lgfhpnwp0llvbr24xbszgr56k9nnjcww67khag74md7yg3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-orphans bifunctors containers deepseq deepseq-generics
          directory either hashable haskell-src-exts hood lens mmorph mtl
@@ -66357,6 +66700,7 @@ self: {
        pname = "extcore";
        version = "1.0.2";
        sha256 = "1dpn4dbbn5d3zqrhxkg8nvb97vp9pf61gwa46yf218nvwgqvx437";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory filepath mtl parsec
          pretty syb
@@ -66838,6 +67182,7 @@ self: {
        pname = "fair-predicates";
        version = "0.1.1";
        sha256 = "1z0c83gfmvwhzsj2iz422mxcyxc8jnic25i1vz6yp4xzv41ibmj6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://sebfisch.github.com/fair-predicates";
        description = "Fair Predicates";
@@ -66864,6 +67209,7 @@ self: {
        pname = "faker";
        version = "0.0.0.2";
        sha256 = "1wl0jx3adibf7z8k3jadnr90jvkmf3zhkq34qpsifcl18zip8skq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base gimlh random split ];
        homepage = "https://github.com/gazay/faker";
        description = "Pure Haskell library for generating fake data";
@@ -66880,6 +67226,7 @@ self: {
        sha256 = "035rjjjvwbjw4z6nlmiyxia5y91yiiw7902f9q6n5jimi5xk2hgk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base gloss gloss-raster JuicyPixels-repa QuickCheck random repa
          repa-algorithms vector
@@ -66900,6 +67247,7 @@ self: {
        sha256 = "18h5d33hd4cs6dc508mzl7c46pxwrk2q0daabvg8m4fiwk5wzlr0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers haskell98 SDL SDL-mixer SDL-ttf
        ];
@@ -67044,6 +67392,7 @@ self: {
        sha256 = "1pqz3r2dg0i462fd4fm3fz4p0m05878gic8xr1hxzk2f2ljsc7fq";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base bytestring containers cpphs deepseq directory
          filepath mtl text utf8-string
@@ -67256,10 +67605,11 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "0r4ac76mn7dykva0dz6ar2zfcij2kiz8kjfcywpgdg40g75zhvn4";
-       revision = "7";
-       editedCabalFile = "07iqrpg2hga3n8m08aq2zizvq27v8hyqzvx5sfz497whjxr9h358";
+       revision = "8";
+       editedCabalFile = "1ybc4vv0d3vya4a1xgr2sbq1zx1bzm82acxivs458i9pj56wp87j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat bytestring containers data-default
          data-lens-light directory filepath ghc-paths haskell-src-exts
@@ -67280,6 +67630,7 @@ self: {
        pname = "fay-base";
        version = "0.20.0.1";
        sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base fay ];
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
@@ -67309,6 +67660,7 @@ self: {
        pname = "fay-dom";
        version = "0.5.0.1";
        sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-dom";
        description = "DOM FFI wrapper library for Fay";
@@ -67321,6 +67673,7 @@ self: {
        pname = "fay-geoposition";
        version = "0.1.0.1";
        sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/victoredwardocallaghan/fay-geoposition";
        description = "W3C compliant implementation of GeoPosition API";
@@ -67333,6 +67686,7 @@ self: {
        pname = "fay-hsx";
        version = "0.2.0";
        sha256 = "1mzjna8yc7jczgggpcgh9i6akiy72d60jczvmzxngh778z3g5zmi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
        homepage = "http://www.happstack.com/";
        description = "Clientside HTML generation for fay";
@@ -67346,6 +67700,7 @@ self: {
        pname = "fay-jquery";
        version = "0.6.1.0";
        sha256 = "04vg018zynb5ckj7ca9a9a3lbs8kjx8a5k0l3k73yp2y27w7xx8g";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/faylang/fay-jquery";
        description = "jQuery bindings for Fay";
@@ -67358,6 +67713,7 @@ self: {
        pname = "fay-ref";
        version = "0.1.0.0";
        sha256 = "1dcifraih13zqwmm4xn57wfg63rdkiac81avyymid308r6p1x9cn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
@@ -67370,6 +67726,7 @@ self: {
        pname = "fay-simplejson";
        version = "0.1.3.0";
        sha256 = "0cw06vl39p7mflf8wfl8ql1h8bryv2d1kvvf4swqgda05jk13mxq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/Lupino/fay-simplejson";
        description = "SimpleJSON library for Fay";
@@ -67383,6 +67740,7 @@ self: {
        pname = "fay-text";
        version = "0.3.2.2";
        sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay fay-base text ];
        homepage = "https://github.com/faylang/fay-text";
        description = "Fay Text type represented as JavaScript strings";
@@ -67395,6 +67753,7 @@ self: {
        pname = "fay-uri";
        version = "0.2.0.0";
        sha256 = "1vv4jgkz9cx8inbn6g6sn3a0nf1ak81qlj5li21sk2isj0yws1nr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
@@ -67459,6 +67818,7 @@ self: {
        sha256 = "0dvjhgv3w13ygi4rfdvmc2m6f99v8d9dmjqp98vxrygcqskhgy4x";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive http-client http-media
          http-types mime-types servant servant-client string-conversions
@@ -67703,6 +68063,7 @@ self: {
        sha256 = "0hkrsinspg70bbm3hwqdrvivws6zya1hyk0a3awpaz82j4xnlbfc";
        revision = "2";
        editedCabalFile = "0ggpqv0i2k38dl8dqwn159n7ys0xr8shrsr3l838883rs8rrnf1j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -67725,6 +68086,7 @@ self: {
        sha256 = "0gql641jmbldx6vhk37i2v41j2nq22lrihm48f97wirrxw7yjn61";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory feed old-locale old-time time xml
        ];
@@ -67988,6 +68350,7 @@ self: {
        sha256 = "0sq4g0sdayk1lqzdhggwshl22gny5cjbv70cmr1p27q0wfwfbfff";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cairo gtk harp HaXml mtl template-haskell unix
        ];
@@ -68062,6 +68425,7 @@ self: {
        pname = "fficxx";
        version = "0.3.1";
        sha256 = "0y40li2465r1mf9lgswk9hcwbp528iblxwb9icv94p6nyq28z24k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring Cabal containers data-default directory either
          errors filepath hashable haskell-src-exts lens mtl process pureMD5
@@ -68606,6 +68970,7 @@ self: {
        pname = "filestore";
        version = "0.6.3.1";
        sha256 = "1pnqb816syl8j03wfk1p96vqlb64xkl45cxlkmqsriwi4ar0svw1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
@@ -69014,6 +69379,7 @@ self: {
        sha256 = "01fy2s94aq7mnnp24g5i8sxvlpb6arnmv8n2fr153lwmg3n2w1qb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers cpphs directory filepath haskell-src-exts process
          split text uniplate
@@ -69408,6 +69774,7 @@ self: {
        pname = "flac";
        version = "0.1.2";
        sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class directory exceptions
          filepath mtl text transformers vector wave
@@ -69431,6 +69798,7 @@ self: {
        pname = "flac-picture";
        version = "0.1.1";
        sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring flac JuicyPixels ];
        testHaskellDepends = [
          base bytestring data-default-class directory flac hspec JuicyPixels
@@ -70123,6 +70491,7 @@ self: {
        sha256 = "1bjkkd90mw1nbm5pyjh52dwhqa6xx3i3hhl2ys3qpk08mrw5r09l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory filepath mtl process Unixutils
        ];
@@ -70756,6 +71125,7 @@ self: {
        sha256 = "0z8a5a9w7mg69c1x6h8825bhkll63gz6j85lbc0w59w1ag2x8865";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal base bytestring containers directory file-embed HTTP
          indents interpolatedstring-perl6 jmacro MissingH mtl network pandoc
@@ -70862,6 +71232,7 @@ self: {
        sha256 = "1bqfw3h06mbznivg37840qnzjygflzp90wkyssnb1kjxi4bj1vbv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal base bytestring cereal containers directory
          file-embed ghc-prim GraphSCC hslogger HTTP indents
@@ -71213,6 +71584,7 @@ self: {
        sha256 = "0gbws8q7k2bv4i4v7km5nfjv8j42kmfjw4vhn1n6dr8xysrmbn3h";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base HUnit parsec parsec3-numbers QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -71291,6 +71663,7 @@ self: {
        sha256 = "1xgnp4cls8i61hyl4kcf3afri77jlcahwjvww498xl5d5frdiv90";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        homepage = "http://haskell.org/haskellwiki/Frag";
        description = "A 3-D First Person Shooter Game";
@@ -71579,6 +71952,7 @@ self: {
        sha256 = "1qxdfbzr52dw0qww03l86vpgmylznifqzvjarmgpkfr129szl7ba";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cgi csv dataenc directory filepath free-theorems
          process time xhtml
@@ -71633,6 +72007,7 @@ self: {
        sha256 = "1ybmffs05hgzn81szcd8nrz4f94qc64d9y2d2hkyq57djb87503j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring containers directory EdisonCore
          filepath FTGL haskell98 mtl OpenGL pngload random SDL
@@ -72013,6 +72388,7 @@ self: {
        pname = "frpnow";
        version = "0.18";
        sha256 = "1ixhcif2db8v6k8m4bgrpiivl0ygb83padnj18w4jyy5br6s1bqz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl transformers ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
@@ -72026,6 +72402,7 @@ self: {
        pname = "frpnow-gloss";
        version = "0.12";
        sha256 = "1xywqcif16r3x4qckz3n6k5mp2pya4vj35h0jrh4rd1sspnhi99i";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers frpnow gloss mtl transformers
        ];
@@ -72042,6 +72419,7 @@ self: {
        pname = "frpnow-gtk";
        version = "0.11";
        sha256 = "0yq9pgjlmzg5pzcky7z7n2ks82x92dp5pjacr6h3w8mdrhhhk80c";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers frpnow glib gtk mtl transformers
        ];
@@ -72153,6 +72531,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fsnotify_0_2_1_1" = callPackage
+    ({ mkDerivation, async, base, containers, directory, filepath
+     , hinotify, tasty, tasty-hunit, temporary, text, time, unix-compat
+     }:
+     mkDerivation {
+       pname = "fsnotify";
+       version = "0.2.1.1";
+       sha256 = "146wsblhfwnbclzffxk6m43bqap3sgw332gs67030z6h5ab7anhp";
+       libraryHaskellDepends = [
+         async base containers directory filepath hinotify text time
+         unix-compat
+       ];
+       testHaskellDepends = [
+         async base directory filepath tasty tasty-hunit temporary
+         unix-compat
+       ];
+       homepage = "https://github.com/haskell-fswatch/hfsnotify";
+       description = "Cross platform library for file change notification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fsnotify-conduit" = callPackage
     ({ mkDerivation, async, base, conduit, directory, filepath
      , fsnotify, hspec, resourcet, temporary, transformers
@@ -72360,6 +72760,7 @@ self: {
        sha256 = "1jrpb6dzq47xy6xvsisc7g1y53dc97s4l826f9sscxpdsrx3yp8r";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers free-theorems mtl pretty Shellac Shellac-readline
        ];
@@ -72522,6 +72923,7 @@ self: {
        pname = "funcmp";
        version = "1.8";
        sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath process ];
        homepage = "http://savannah.nongnu.org/projects/funcmp/";
        description = "Functional MetaPost";
@@ -73219,6 +73621,7 @@ self: {
        pname = "gconf";
        version = "0.13.1.0";
        sha256 = "1b8xl9jayr7x77af7cq4av82lf1r0j49pmbp1mz3gkadxw3adksp";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib text ];
        libraryPkgconfigDepends = [ GConf ];
@@ -73359,6 +73762,7 @@ self: {
        sha256 = "1951jw8la59c7qvjpx8x898l7hnwc51c4264mmw0h402ik233bp2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air base bytestring data-default geek hack2
          hack2-handler-snap-server pandoc text
@@ -73482,6 +73886,7 @@ self: {
        sha256 = "0sfl3729v03s5ykd8ijv4yrf8lzja5hyaphsfgk96gcx3zvd1a0q";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ attoparsec base text ];
        executableHaskellDepends = [ attoparsec base text ];
        homepage = "https://github.com/womfoo/gender";
@@ -73959,6 +74364,7 @@ self: {
        pname = "genericserialize";
        version = "0.1";
        sha256 = "0zpb5rq2zvfsb0wlp9q4cckjkz6sdrngpir49d0sr06pivh8s6cl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
@@ -74062,6 +74468,7 @@ self: {
        sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory filepath GenI
          geniserver HTTP http-streams io-streams json text
@@ -74085,6 +74492,7 @@ self: {
        sha256 = "0brnh6f8zdpn37fjdmnpbdvb75vmaf6iq7i9vpv4a8g7asc425wd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary containers GenI haskell98 HaXml HUnit mtl parsec
          QuickCheck utf8-string
@@ -74439,6 +74847,7 @@ self: {
        pname = "geo-uk";
        version = "0.1.0.2";
        sha256 = "1b97kzx4i0jjrmh6iyhxcs1ms4vbiyyywmhccx1a6q6ia82dgcpy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring bzlib template-haskell th-lift
        ];
@@ -74500,6 +74909,7 @@ self: {
        pname = "geodetics";
        version = "0.0.4";
        sha256 = "1zml9hpbj7shzsjv6hsyzv3p9yzm6cbvxp2cd79nd1fcsdss0zi3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base dimensional ];
        testHaskellDepends = [
          array base dimensional HUnit QuickCheck test-framework
@@ -74684,6 +75094,7 @@ self: {
        sha256 = "02ds6pm7lv5ijkjh1xikglibnnapk72rz78l5kv5ikzxahhgslbg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring cgi containers directory exceptions filepath
          haskeline httpd-shed json mtl network network-uri old-locale
@@ -74714,6 +75125,7 @@ self: {
        sha256 = "0k5in0r3lwjr5yn4ayw5ssdvinh7zwzsx6pfjdj246ngx1r7ydxj";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers parsec ];
        homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/";
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
@@ -74833,6 +75245,7 @@ self: {
        sha256 = "1yx22p9572zg2nvmlilbmraqjmws2x47hmin2l9xd0dnck5qhy35";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-html bytestring containers mtl parsec process
        ];
@@ -75062,6 +75475,7 @@ self: {
        pname = "ghc-heap-view";
        version = "0.5.9";
        sha256 = "1brjvyqd4bzzc1vhljbf5qv9lyf55myyvnz1zx9nngfwsh7a6cf6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers ghc template-haskell transformers
        ];
@@ -75154,6 +75568,7 @@ self: {
        editedCabalFile = "1qyijh62wny3vxs72caqfphj10ld11zcf929gdaqs3ip5ixjb61a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [
          base Cabal containers filepath process template-haskell
          transformers
@@ -75195,6 +75610,7 @@ self: {
        editedCabalFile = "11rccscsxv4x7xcdxaz83vjisyiadsiq48mn2v1hs8fylqx6dkdf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [
          base Cabal containers directory filepath process template-haskell
          transformers
@@ -75689,6 +76105,7 @@ self: {
        pname = "ghc-vis";
        version = "0.8";
        sha256 = "03c73ip8k92fjrafaaj3mykql222y2fjiwx13lwvm5jk2p00is78";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl
          svgcairo text transformers xdot
@@ -75874,6 +76291,7 @@ self: {
        pname = "ghcjs-codemirror";
        version = "0.0.0.1";
        sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ghcjs/CodeMirror";
        description = "Installs CodeMirror JavaScript files";
@@ -75905,6 +76323,7 @@ self: {
        sha256 = "16f69w53a3vcfnb805nyn257465gvyv2981gsggvpkzvyqklsp74";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base ghcjs-dom jsaddle jsaddle-warp mtl
        ];
@@ -76870,6 +77289,7 @@ self: {
        sha256 = "0g1jq12dw868x0s6l28kk0m9713zhwwfbw0n2n2dvbidrlvnpwi8";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath http-types mtl parsec
          safe scientific text time transformers unordered-containers
@@ -76902,6 +77322,7 @@ self: {
        sha256 = "049ys725scrrkxc2q4wx085hbzdnjpm1jd9wqraqg5fa23vpfy34";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath http-types mtl parsec
          safe scientific text time transformers unordered-containers
@@ -76934,6 +77355,7 @@ self: {
        sha256 = "061mwhxgxqqvlqznldjgqvs2z739q452shd6h72lahj5nm3v5m41";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array async base binary bytestring containers directory hashable
          hashtables mtl network old-locale old-time parsec pretty process
@@ -76953,6 +77375,7 @@ self: {
        pname = "gio";
        version = "0.13.3.1";
        sha256 = "09yq753qld2p5h7apg5wyzyh8z47xqkkyx8zvjwk21w044iz8qxc";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring containers glib mtl
@@ -77043,6 +77466,7 @@ self: {
        pname = "git";
        version = "0.2.0";
        sha256 = "1a4frn53qs31s6rqldw91zmc0i0gr33zm10y9ailqasbsgyxqwyp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base byteable bytestring containers cryptonite hourglass memory mtl
          patience random system-fileio system-filepath unix-compat
@@ -77162,6 +77586,7 @@ self: {
        sha256 = "1q4fbvpdjca5k530dcm6yspsgzy60dx7nimar2fkm8s086qsf662";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory filepath optparse-applicative parsec pretty process
        ];
@@ -77416,6 +77841,7 @@ self: {
        editedCabalFile = "00pqgbjdzzqf10201yv934llaq2xflad9djix21f05nk7qq62g0r";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath formatting optparse-applicative
          process split text transformers unix
@@ -77769,6 +78195,7 @@ self: {
        sha256 = "1x2kh1lsqiib7g4yp7g0yijsghl27k1axjx3zmhl7fwhkxc4w48m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring ConfigFile
          containers directory feed filepath filestore ghc ghc-paths
@@ -78140,6 +78567,7 @@ self: {
        pname = "glade";
        version = "0.13.1";
        sha256 = "0idyx4d2jw1209j4wk7ay5jrs2r6bn3qj4qgh70q6p08a8hcgfbb";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk ];
        libraryPkgconfigDepends = [ libglade ];
@@ -78458,6 +78886,7 @@ self: {
        sha256 = "1xgx02cxvpc8sv99wl44lpzbv9cc87nnihbpalmddb71mwrmj4ji";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ppm split ];
        description = "A simple ray tracer in an early stage of development";
        license = stdenv.lib.licenses.bsd3;
@@ -79151,6 +79580,7 @@ self: {
        sha256 = "1xz8prw9xjk0rsyrkp9bsmxykzrbhpv9qhhkdapy75mdbmgwjm7s";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq filepath process temporary time transformers utility-ht
@@ -79183,6 +79613,7 @@ self: {
        sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk";
        revision = "1";
        editedCabalFile = "0dq1406z7mh4hca15abizrzlc4v80qkc3r9jz9q21qi99hgvvqjs";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
@@ -79294,6 +79725,7 @@ self: {
        pname = "goatee";
        version = "0.3.1.2";
        sha256 = "1lz14w17yn92icdiz8i4435m4qli158infxq02ry6pap94kk78d9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers mtl parsec template-haskell
        ];
@@ -79314,6 +79746,7 @@ self: {
        sha256 = "0pgpdk1y140pcdsyry185k0bpdhyr87bqrzk24yv65kgvqs442zm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers directory filepath glib goatee gtk mtl parsec
        ];
@@ -82290,6 +82723,7 @@ self: {
        sha256 = "0kfg995ng54sf4lndz9grl5vxyxms0xxmcgq1xhcgmhis8bwr1cd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          attoparsec base bytestring directory errors http-types lucid
          mime-types network optparse-applicative text wai warp
@@ -82911,6 +83345,7 @@ self: {
        sha256 = "0rwycs3vnzy9awm081h836136s2wjyk9qyhsx9j6z7y3lgsb2cr0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
@@ -82950,6 +83385,7 @@ self: {
        sha256 = "0sz87nsn7ff0k63j54rdxp5v9xl926d47fkfa0jjnmdjg1xz2pn4";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout graph-rewriting-strategies IndentParser
@@ -82988,6 +83424,7 @@ self: {
        sha256 = "1ahwm3dlvy9aaara644m4y0s89xgjcgm2hpkc92z2wmdfydc05g6";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
@@ -83026,6 +83463,7 @@ self: {
        sha256 = "0wygasyj35sa05vvcmkk8ipdla3zms85pvq48jq1rl2gnk79f2jy";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols containers directory filepath GLUT
          graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL
@@ -83048,6 +83486,7 @@ self: {
        sha256 = "07fjl05w1lidmwh7iz9km3590ggxncq43rmrhzssn49as7basah8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout IndentParser OpenGL parsec
@@ -83249,6 +83688,7 @@ self: {
        pname = "graphql";
        version = "0.3";
        sha256 = "18hb8bwcwx98vrr9nzr8965i4c1y6dh10ilijksbldf10yaiq53z";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base tasty tasty-hunit text ];
        homepage = "https://github.com/jdnavarro/graphql-haskell";
@@ -83523,6 +83963,7 @@ self: {
        pname = "greencard-lib";
        version = "3.0.1";
        sha256 = "1a8h36kclb5db7kfy1pb4h2pwy6a6wwnjpm21xzvc9fjx9vj44kd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base containers greencard pretty ];
        homepage = "http://www.haskell.org/greencard/";
        description = "A foreign function interface pre-processor library for Haskell";
@@ -84025,6 +84466,7 @@ self: {
        sha256 = "02xspk67jy5bhdmbhgk924sqn565aprkvm0sfv1sgmc836qg625f";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ruff ];
        executableHaskellDepends = [
          base bytestring containers directory filepath FTGL gtk gtkglext mtl
@@ -84165,6 +84607,7 @@ self: {
        pname = "gstreamer";
        version = "0.12.8";
        sha256 = "1bb9rzgs3dkwwril97073aygrz46gxq039k9vn5d7my8hgcpwhzz";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring directory glib mtl
@@ -84186,6 +84629,7 @@ self: {
        sha256 = "1mkccxgnvgjxkbsdl6bcn61yv0zi20i8h9z11hqcfd3ibfnsw7bh";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers extensible-exceptions haskeline HTTP json mtl unix
          url utf8-string
@@ -84218,6 +84662,7 @@ self: {
        pname = "gtk";
        version = "0.14.6";
        sha256 = "09w3f2n2n9n44yf2li3ldlb3cxhbc0rml15j9xqamw5q1h90cybh";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
@@ -84280,6 +84725,7 @@ self: {
        pname = "gtk-mac-integration";
        version = "0.3.4.0";
        sha256 = "0irf8smnpsym2lkw6gslk31zibn7alp7g32cmq4062mgnlwlawn4";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
@@ -84297,6 +84743,7 @@ self: {
        pname = "gtk-serialized-event";
        version = "0.12.0";
        sha256 = "0gh8kwd9758ws941xbxhrm3144pmnqln0md5r6vjbq7s1x54bsrf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -84366,6 +84813,7 @@ self: {
        sha256 = "0jzvxlssqmd2dpnm35qpaq5xv5jk7hhy87594m74xv0ihygvbr65";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base Cabal containers directory filepath hashtables pretty
          process random
@@ -84519,6 +84967,7 @@ self: {
        sha256 = "0n223zgfjfv0p70wd7rh881fv8z00c9jmz7wm3vfa1jy3b2x7h7l";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
@@ -84540,6 +84989,7 @@ self: {
        pname = "gtk3-mac-integration";
        version = "0.3.4.0";
        sha256 = "0cdx0qzmwz3bbg374c9nvwqsxgvc5c2h8i6m0x6d0sm714d8l0ac";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
@@ -84557,6 +85007,7 @@ self: {
        pname = "gtkglext";
        version = "0.13.1.1";
        sha256 = "15v40f21xlg5r2zidh77cfiq6ink1dxljbl59mf5sqyq5pjbdw3h";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ gtkglext ];
@@ -84574,6 +85025,7 @@ self: {
        pname = "gtkimageview";
        version = "0.12.0";
        sha256 = "0sdfb7gmgqh4dkc0a39abx84x7j7zs5z1l62nfzz22wsx1h641j3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -84595,6 +85047,7 @@ self: {
        sha256 = "0z7mwgmjpbmj2949bfrragyjr6s38vv9sz8zpy63ss9h7b5xn4xw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base gconf glade gtk MissingH process regex-posix unix
        ];
@@ -84612,6 +85065,7 @@ self: {
        pname = "gtksourceview2";
        version = "0.13.3.1";
        sha256 = "0lzyqlbd0w825ag9iisiicrsb86gx7axxcr4sh4jhnxagz0fpid1";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base containers glib gtk mtl text
@@ -84630,6 +85084,7 @@ self: {
        pname = "gtksourceview3";
        version = "0.13.3.1";
        sha256 = "0yrv71r772h8h7x73xb5k868lg7lmh50r0vzxrl2clrxlpyi4zls";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base containers glib gtk3 mtl text
@@ -84687,6 +85142,7 @@ self: {
        sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo containers filepath gtk ];
        homepage = "http://code.mathr.co.uk/gulcii";
        description = "graphical untyped lambda calculus interactive interpreter";
@@ -84938,6 +85394,7 @@ self: {
        pname = "hF2";
        version = "0.2";
        sha256 = "1y0731fsay2dp9m4b94w15m054vqsnnafz4k8jjqjvvrmwyfgicz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -85203,6 +85660,7 @@ self: {
        pname = "hTalos";
        version = "0.2";
        sha256 = "05l9nlrwpb9gwgj8z48paxx46lkasa82naiq7armi98salk1a9ip";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/mgajda/hTalos";
@@ -85231,6 +85689,7 @@ self: {
        sha256 = "0r9a461k1rr0j9zgjfq1z37i6blv9rqf8pzb984h1nmlfqpnidnc";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base hmatrix ];
        executableSystemDepends = [ blas liblapack ];
        homepage = "http://dslsrv4.cs.missouri.edu/~qqbm9";
@@ -85351,6 +85810,7 @@ self: {
        pname = "hack";
        version = "2012.2.6";
        sha256 = "0wrfa9fa6skl985fi2a6iv4m8kchg87w9x3k37nf3l8vaz95jmdr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring data-default ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "a Haskell Webserver Interface";
@@ -85366,6 +85826,7 @@ self: {
        pname = "hack-contrib";
        version = "2010.9.28";
        sha256 = "1r0g8fcwz6r4vrsadjyb5awjmfbqsskmc1c8xkfwv0knak1qq2p1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring cgi containers data-default
          directory filepath hack haskell98 mps network old-locale old-time
@@ -85403,6 +85864,7 @@ self: {
        pname = "hack-frontend-happstack";
        version = "2009.6.24.1";
        sha256 = "1x4kaj4nk5lrgsm6pfxr6f8rvjyxhy0agqv9f810xh6s1r9pihw1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers hack happstack-server network
          utf8-string
@@ -85465,6 +85927,7 @@ self: {
        pname = "hack-handler-evhttp";
        version = "2009.8.4";
        sha256 = "1a09ls9jgakdx8ya6zd5z3ss2snb4pp0db1573hzmrhr37i2gklz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring bytestring-class containers data-default hack
          hack-contrib network
@@ -85498,6 +85961,7 @@ self: {
        pname = "hack-handler-happstack";
        version = "2009.12.20";
        sha256 = "10b3cp1gap59ialfl33dwhzw50nwrqg49zvv0v813q7rqk3nkhg4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cgi containers data-default hack happstack-server
          mtl network
@@ -85516,6 +85980,7 @@ self: {
        pname = "hack-handler-hyena";
        version = "2010.3.15";
        sha256 = "1p0zyki1iapz2xncq0l5bbas44pk5kb29kbb3bdxb4anb0m5jb2q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default hack hyena network
        ];
@@ -85531,6 +85996,7 @@ self: {
        pname = "hack-handler-kibro";
        version = "2009.5.27";
        sha256 = "0py30rp7r4hrazrfq3avpqcp1w8405pyfw1yxz7msb58yjppa792";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cgi data-default hack kibro network
        ];
@@ -85656,6 +86122,7 @@ self: {
        pname = "hack2-contrib-extra";
        version = "2014.12.20";
        sha256 = "1mxgvlr593cw523mknr5bcwf55544q04cz0nlpzgm5bg3336b5wl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air air-extra base bytestring cgi containers data-default directory
          filepath hack2 hack2-contrib network old-locale old-time time
@@ -85673,6 +86140,7 @@ self: {
        pname = "hack2-handler-happstack-server";
        version = "2011.6.20";
        sha256 = "115nrzf0626pc716n01qjhxs44c1awdd4q1c8kbax025cwac7kpx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cgi containers data-default enumerator hack2
          happstack-server mtl network
@@ -85693,6 +86161,7 @@ self: {
        pname = "hack2-handler-mongrel2-http";
        version = "2011.10.31";
        sha256 = "1pymar803n696yx3dwqpfwqlkg93ncff162p26mrs7iqn14v851w";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson air attoparsec base blaze-builder blaze-textual bytestring
          containers data-default directory enumerator hack2 mtl network safe
@@ -85732,6 +86201,7 @@ self: {
        pname = "hack2-handler-warp";
        version = "2012.5.25";
        sha256 = "1p0lkhf95xkllfpcb9yibpa1rkam90bccmzj2aa60shd7v9qx9r5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air base data-default hack2 hack2-interface-wai warp
        ];
@@ -85976,6 +86446,7 @@ self: {
        sha256 = "1xsy2clsg53rhxgkb9vlan7dw7xqphm8gr1ajl8kq5ymfahnyd1i";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          acid-state aeson array async attoparsec base base16-bytestring
          base64-bytestring binary blaze-builder bytestring Cabal cereal
@@ -86145,6 +86616,7 @@ self: {
        editedCabalFile = "1slyp8ncpiv204yxb2p7z0kwz4xhqv8czfrx4p78cbbhrlkmgnpm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/fgaz/hackertyper";
        description = "\"Hack\" like a programmer in movies and games!";
@@ -86283,6 +86755,7 @@ self: {
        pname = "haddock-api";
        version = "2.15.0.2";
        sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
@@ -86302,6 +86775,7 @@ self: {
        pname = "haddock-api";
        version = "2.16.1";
        sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
@@ -86321,6 +86795,7 @@ self: {
        pname = "haddock-api";
        version = "2.18.1";
        sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
@@ -86341,6 +86816,7 @@ self: {
        sha256 = "1a56nihkxybldk55g69v2aw6r4ipa9x86i0jr19fd23zxvancs8h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths pretty
        ];
@@ -86625,6 +87101,7 @@ self: {
        sha256 = "1nh76kk3bfnx802kc6afj6iw1xkj5s4sz07zwmhq32fvqbkmw889";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring directory filepath http-client lens lens-aeson
          netrc network-uri optparse-applicative parsec process text wreq
@@ -86884,6 +87361,7 @@ self: {
        sha256 = "1zy2328lj7k6j0h7nrcd998sk1hbcl67yzaiysaxyif5c60l05ab";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary blaze-html blaze-markup bytestring containers
          cryptohash data-default deepseq directory filepath fsnotify
@@ -86927,6 +87405,7 @@ self: {
        sha256 = "0jjy1j79vzkdpi2ksql5bzwv2bw3bk6h0jgi73ngj8lkrm6q80b3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary blaze-html blaze-markup bytestring containers
          cryptohash data-default deepseq directory filepath fsnotify
@@ -87007,6 +87486,7 @@ self: {
        sha256 = "0w23laiw6a5hxfq5hjq8vn3k7fx5l4yb9p8qcbm62zlycza1ci14";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hakyll pandoc ];
        executableHaskellDepends = [ base directory filepath hakyll ];
        homepage = "http://jaspervdj.be/hakyll";
@@ -87630,6 +88110,7 @@ self: {
        sha256 = "0x0ix66wcpv172rxk9daifirnrcbblkjlvlg762z4i7qhipjfi2n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers scientific
        ];
@@ -87723,6 +88204,7 @@ self: {
        sha256 = "0k86z27qiaz967hsdnb3sac5ybmnyzd4d2gxzvdngw8rcvcq3biy";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base mtl random utility-ht ];
        description = "Hangman implementation in Haskell written in two hours";
        license = stdenv.lib.licenses.mit;
@@ -87739,6 +88221,7 @@ self: {
        sha256 = "072f9zsfrs8g6nw83g6qzczzybngrhyrm1m2y7ha37vf0y9gdpn0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring directory formatting http-types lens
          lens-aeson process scotty text transformers unix-time wai-extra
@@ -87853,6 +88336,7 @@ self: {
        sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath mtl path process time transformers
        ];
@@ -87876,6 +88360,7 @@ self: {
        pname = "happindicator";
        version = "0.0.4";
        sha256 = "1d0ycpxmlz2ab8dzys7i6ihc3rbs43d0l5l2mxvshqbpj3j73643";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers glib gtk mtl
        ];
@@ -88024,6 +88509,7 @@ self: {
        pname = "happstack-authenticate";
        version = "2.3.4.7";
        sha256 = "01xn6j7pqc0czdflxwkmnj8hm6z0wwjqpjmal4qbcbzy16m86bbc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default email-validate filepath
@@ -88053,6 +88539,7 @@ self: {
        pname = "happstack-authenticate";
        version = "2.3.4.8";
        sha256 = "006prds4bgqmj54j0syyf1y1yyqwfcj2a6mdxpcjj6qj3g3976l1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default email-validate filepath
@@ -88217,6 +88704,7 @@ self: {
        pname = "happstack-fay-ajax";
        version = "0.2.0";
        sha256 = "0zdkvvmywnfvqg5jdvf29qczzxmprvspxj0r1vj46fd6vld53j4j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
        homepage = "http://www.happstack.com/";
        description = "Support for using Fay with Happstack";
@@ -88234,6 +88722,7 @@ self: {
        pname = "happstack-foundation";
        version = "0.5.9";
        sha256 = "0xn176m65wjvbfqcjhwvvm7imq01iiixap4jay1wn6qzk0qn5w5n";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state base happstack-hsp happstack-server hsp lifted-base
          monad-control mtl reform reform-happstack reform-hsp safecopy text
@@ -88645,6 +89134,7 @@ self: {
        pname = "happstack-yui";
        version = "7373.5.3";
        sha256 = "178r3jqxmrdp0glp9p4baw8x7zk0w8j4m5l173rjnz9yxn53nyni";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base boomerang bytestring containers directory happstack-jmacro
          happstack-server hsp interpolatedstring-perl6 jmacro mtl pretty
@@ -88867,6 +89357,7 @@ self: {
        sha256 = "1pf5vpyxrqsvrg1w5spzvwjkr7gdy2mp0sdxphcrwwj9n56klgj5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base BNFC containers derive directory hastache hslogger mtl
          process QuickCheck text
@@ -89556,6 +90047,7 @@ self: {
        sha256 = "1hw4ylwwsmp59ifw8s4w1394gv7p2xc6nvqajfmil0p8r8s6r1pf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base freenect hcwiid IfElse MissingH mtl SDL SDL-image SDL-mixer
          SDL-ttf transformers vector Yampa
@@ -90324,6 +90816,7 @@ self: {
        pname = "haskell-names";
        version = "0.8.0";
        sha256 = "127fjggbgxhpxdh5sdj4pdfgx9xadaw93n0ii07grz0jgbvj0fwn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-lens-light filepath
          haskell-src-exts mtl transformers traverse-with-class uniplate
@@ -91900,6 +92393,7 @@ self: {
        pname = "haskelzinc";
        version = "0.3.0.9";
        sha256 = "1vg5jxzn69y2pbpsw2qc6ida0p0v4dhgp68psn4rmpxxbjl7n10s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath parsec3 pretty process
        ];
@@ -91947,6 +92441,7 @@ self: {
        pname = "haskhol-core";
        version = "1.1.0";
        sha256 = "0vlzybbplqggvgnj61yl0g2rak2qbsp7hly9srgr6wd6qm9l1nxx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state base containers deepseq filepath ghc-prim hashable mtl
          parsec pretty safecopy shelly template-haskell text text-show
@@ -92939,6 +93434,7 @@ self: {
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 directory
          filepath ghc ghc-paths ghc-prim monads-tf network network-uri
@@ -93058,6 +93554,7 @@ self: {
        editedCabalFile = "1wspd2shxpp3x4p4ghgf82vqchlkxk6qhvsgn07ypzm2kfz3a9dh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory old-locale old-time process random
        ];
@@ -93217,6 +93714,7 @@ self: {
        sha256 = "10qg24qkh17l9zqn47g64cg6hp48x7bjbcwigj35zpqcq71s9dxc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base64-string bytestring clock containers gconf glade gtk
          hoauth HTTP json mtl network old-locale parsec regex-base
@@ -93484,6 +93982,7 @@ self: {
        sha256 = "01wx4dls0ccl0q09hvydjhj0lfpqfd32z76rjgc89p5889czkm5j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cairo filepath glade gtk haskell98 process svgcairo time unix
        ];
@@ -93505,6 +94004,7 @@ self: {
        sha256 = "1x8nwh3ba9qvrbcxd2fdb3lv9b94w6lkvdg4vrqm7vbns9yyk162";
        revision = "2";
        editedCabalFile = "19nclaq6y157gn8k4sl79rm30ws5gcykiq4zjmcnm7d5c1rm4dhn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary boxes containers directory filepath gamma HUnit
          mtl mwc-random parsec pretty QuickCheck random split statistics
@@ -93643,6 +94143,7 @@ self: {
        sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring chunked-data cond containers data-default-class
          directory dyre errors fast-logger filepath glib gtk3 lifted-async
@@ -93672,6 +94173,7 @@ self: {
        sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring chunked-data containers
          directory filepath glib gtk3 hbro microlens monad-control
@@ -93732,6 +94234,7 @@ self: {
        pname = "hcg-minus";
        version = "0.15";
        sha256 = "04g0f4sr7904w3ynyl0gnbyi2sl0z7ziv5q15mfb6c7h0zl25d5r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base colour ];
        homepage = "http://rd.slavepianos.org/t/hcg-minus";
        description = "haskell cg (minus)";
@@ -93746,6 +94249,7 @@ self: {
        pname = "hcg-minus-cairo";
        version = "0.15";
        sha256 = "002gh8adqzhcjfnqkbcnpzz8qiqbj9zkbk6jj11dnnxjigc4l2q9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo colour filepath hcg-minus utf8-string
        ];
@@ -93760,6 +94264,7 @@ self: {
        pname = "hcheat";
        version = "2010.1.16";
        sha256 = "1fwgnp15kha9qb7iagd8n5ahjjhg194wbva5i436mb57fn86pya2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mps ];
        homepage = "http://github.com/nfjinjing/hcheat/";
        description = "A collection of code cheatsheet";
@@ -93889,6 +94394,7 @@ self: {
        sha256 = "1h1g05a8wnk2q65mm4mwywxhygr7fs0150q8ml33ik59mcc5v7fr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory HaskellForMaths QuickCheck text
        ];
@@ -94156,6 +94662,7 @@ self: {
        pname = "hdf";
        version = "0.15";
        sha256 = "11nf9wlymdhydf0bhh9gdl0cdn0i4mbvx3hfdcmnxfvag5jmfbkk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory fgl fgl-visualize filepath hosc hsc3 murmur-hash
          process split transformers
@@ -94368,6 +94875,7 @@ self: {
        sha256 = "1hc1pmbj9452k4a71iiazxg6id7caf783m08lqnf3flf77cdjxpa";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath haskeline
          time
@@ -94466,6 +94974,7 @@ self: {
        pname = "hecc";
        version = "0.4.1.1";
        sha256 = "1p7h9mlap8i0w2inhq944r0dgr27rzwk44igylil7gv0dgf4hsyx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -94790,6 +95299,7 @@ self: {
        editedCabalFile = "11a3k59ig549dm3pg5wh2brrdiss1ln0yw3j0j4mgcvqi7kzzmd3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers mtl pretty QuickCheck
        ];
@@ -94868,6 +95378,7 @@ self: {
        sha256 = "0vwk8h5fwl63pjcydwndqgpikfjdm37w7gjmmgac95gl66fc5h5j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath lvmlib mtl network parsec
          process Top transformers wl-pprint
@@ -95527,6 +96038,7 @@ self: {
        sha256 = "0sj0grykzb7xq7iz0nj27c4fzhcr9f0yshfcq81xq2wdmg09j8yx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base hscurses old-time random ];
        executableSystemDepends = [ ncurses ];
        homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/";
@@ -95559,6 +96071,7 @@ self: {
        sha256 = "1ys7xqdrnvwn6z2vgmh49zhfxj73pdmscblqcjk6qrwmpb2xha2s";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cairo filepath haskell98
        ];
@@ -95577,6 +96090,7 @@ self: {
        sha256 = "0jsynxd33r7d5s5vn204z4wdgm4cq6qyjs7afa77p94ni5m2p3kb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cairo dph-seq filepath haskell98
        ];
@@ -95602,6 +96116,7 @@ self: {
        pname = "hexdump";
        version = "0.1";
        sha256 = "012hknn9qhwr3hn3dbyd9s7vvaz4i3bvimmxkb1jyfckw3wjcnhc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "A library for forming hexdumps";
        license = stdenv.lib.licenses.publicDomain;
@@ -95776,6 +96291,7 @@ self: {
        pname = "hexstring";
        version = "0.11.1";
        sha256 = "0509h2fhrpcsjf7gffychf700xca4a5l937jfgdzywpm4bzdpn20";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base16-bytestring binary bytestring text
        ];
@@ -95879,6 +96395,7 @@ self: {
        sha256 = "1jsq33cdpdd52yriky989vd8wlafi9dq1bxzild7sjw1mql69d71";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base eprocess mtl ];
        executableHaskellDepends = [ wx wxcore ];
        homepage = "http://github.com/elbrujohalcon/hfiar";
@@ -96199,6 +96716,7 @@ self: {
        pname = "hgeos";
        version = "0.1.8.0";
        sha256 = "14fqqabxnfky6x17508xr92dvd3jk6b53zqmy8h7f1dd4r7pm4z7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ geos_c ];
        testHaskellDepends = [ base MissingH ];
@@ -96318,6 +96836,7 @@ self: {
        sha256 = "0amdfdp1xmh506lgfbb4war2spfb4gqls864q18psmvshcwlpsmv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath mtl parsec wl-pprint
        ];
@@ -96453,6 +96972,7 @@ self: {
        sha256 = "1skzr5ipxz61zrndwifkngw70zdf2yh5f8qpbmfzaq0bscrzdxg5";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers haskell98 HUnit mtl parsec random
          readline time
@@ -96644,6 +97164,7 @@ self: {
        sha256 = "0zhraby44j5zjrvjmqj22sa15qsl5jxhfs07gkggc8zfahvg822d";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath mustache parsec process text unix
        ];
@@ -96663,6 +97184,7 @@ self: {
        sha256 = "1bwvhrzvrf004lypf0zrx6q6k6fn5qwvlk45vppmnv65v9vq519p";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ghc ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Memory usage statistics";
@@ -96979,6 +97501,7 @@ self: {
        sha256 = "1wjcgkgqcvr1q0b7dckhg12ai6zgmvvnv2b3zgfkyqy1h9qhj7wk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers exceptions haskell-src-exts monad-loops
          mtl text transformers utf8-string yaml
@@ -97069,6 +97592,7 @@ self: {
        pname = "hinduce-examples";
        version = "0.0.0.2";
        sha256 = "17jnrc8iji5byqbd08llwk0mw9yi1dq3biaszqp9jyinf50hcb4w";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers convertible csv hinduce-associations-apriori
          hinduce-classifier hinduce-classifier-decisiontree hinduce-missingh
@@ -97207,6 +97731,7 @@ self: {
        pname = "hint-server";
        version = "1.4.3";
        sha256 = "1pgz8m5aad8wx9ahnaxawry25rksfn2rnmm6l55ha5pj7zb7zjzy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base eprocess exceptions hint monad-loops mtl
        ];
@@ -97250,6 +97775,7 @@ self: {
        sha256 = "01v5szci7kbp3w2jsdcnzv9j3lbcl5bvn9ipcvp3v2xvfjik110h";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 random ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Space Invaders";
@@ -97612,6 +98138,7 @@ self: {
        sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base byteable bytestring containers cryptohash hourglass
          mtl parsec patience random system-fileio system-filepath
@@ -97681,6 +98208,7 @@ self: {
        sha256 = "0gk4misxbkc2x8hh7ynrj1ma91fs0h6q702w6r0kjq136fh48zhi";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory mtl parsec regex-compat
        ];
@@ -97900,6 +98428,7 @@ self: {
        sha256 = "14yqc02kfp2c9i22inma29cprqz9k8yx6c7m90kwimv4psv8766a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring haskell98 parallel
        ];
@@ -97952,6 +98481,7 @@ self: {
        sha256 = "0b9gaj68ykx1ak2v4kjif67kkwv1s8rf9nvcijs4garz98781sdd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base base-compat bytestring cmdargs containers csv
          data-default directory file-embed filepath hashable haskeline here
@@ -97998,6 +98528,7 @@ self: {
        sha256 = "0kl0sc11181bgpz65b5xg9l1hxdaai27icx13x15kwlc01jf9rcc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring containers Decimal docopt either hledger
          hledger-lib microlens microlens-platform safe servant-server
@@ -98087,6 +98618,7 @@ self: {
        sha256 = "19hdz6lj0kxy59vzkyqlwk20l8k08w618nz02xcfflwd9r7ka0ha";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base Cabal Decimal hledger-lib mtl text time
        ];
@@ -98127,6 +98659,7 @@ self: {
        pname = "hledger-lib";
        version = "1.3";
        sha256 = "052ynivzbyabp2yn7y2wfy9dvjly989rpbcla9kx8kvmqij5qdhm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory
@@ -98161,6 +98694,7 @@ self: {
        editedCabalFile = "0dc5nqc9g4s0h1si6pcymbhfw32hlxafzavpp8y1jg7c9brc7ln0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal async base base-compat brick cmdargs containers
          data-default directory filepath fsnotify hledger hledger-lib HUnit
@@ -98207,6 +98741,7 @@ self: {
        sha256 = "01y8djakr4r0jm5wyi6fbp911y3i82r1xmfi4gm9sgf27fi6a3i4";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat blaze-html blaze-markup bytestring clientsession
          cmdargs conduit-extra data-default directory filepath hjsmin
@@ -98322,6 +98857,7 @@ self: {
        sha256 = "1d1z14gfls87jgq0bm67aq81xmczhlbzjym60qplpx1ajpvrk4id";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base cmdargs containers cpphs directory extra
          filepath haskell-src-exts hscolour process refact transformers
@@ -98345,6 +98881,7 @@ self: {
        sha256 = "1bd5nizx1dbzhrfcr9mgpjvg4b6f6z73jvslkbialp7g9pkr6a95";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring cmdargs containers cpphs directory
          extra filepath haskell-src-exts hscolour process refact text
@@ -98394,6 +98931,7 @@ self: {
        pname = "hls";
        version = "0.15";
        sha256 = "0h32fyvnqkxx8c9vfpdjvnqaxkvr8b15myjavxmnm6kwh7v2796l";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hcg-minus hps ];
        homepage = "http://rd.slavepianos.org/t/hls";
        description = "Haskell Lindenmayer Systems";
@@ -98424,6 +98962,7 @@ self: {
        pname = "hly";
        version = "0.15";
        sha256 = "192szfq39g3fdcdsxj4bsi13bfha8gjbqbixav3iywmdsgxp1hj8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath hmt process ];
        homepage = "http://rd.slavepianos.org/t/hly";
        description = "Haskell LilyPond";
@@ -98736,6 +99275,7 @@ self: {
        sha256 = "1dnmvzy7vkx2rfbkkqapfpql8h0gm9sq0333r90hy5nsyl9hhbq8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring bytestring-lexing delimited-text gnuplot
          hmatrix hmeap hosc hsc3 parsec
@@ -98872,6 +99412,7 @@ self: {
        pname = "hmpfr";
        version = "0.4.2.1";
        sha256 = "048amh4w9vjrihahhb3rw0gbk3yp7qvjf6vcp9c5pq2kc3n7vcnc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base integer-gmp ];
        librarySystemDepends = [ mpfr ];
        homepage = "https://github.com/michalkonecny/hmpfr";
@@ -98889,6 +99430,7 @@ self: {
        pname = "hmt";
        version = "0.15";
        sha256 = "051kgsh9nl5f1nw8a24x7ds18g6ppzbhk3d9lf74nvvnccnzg3a9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring colour containers data-ordlist directory
          filepath lazy-csv logict multiset-comb parsec permutation primes
@@ -98907,6 +99449,7 @@ self: {
        pname = "hmt-diagrams";
        version = "0.15";
        sha256 = "1g64b31bz31x0kiivazn20s22y2w7dz9f2gw5cnfkcnjd20k7glm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo colour filepath hcg-minus hcg-minus-cairo hmt
          html-minimalist process xml
@@ -98947,6 +99490,7 @@ self: {
        sha256 = "15fpn895r2sa6n8pahv2frcp6qkxbpmam7hd03y4i65jhkf9vskh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers either errors filepath repa transformers vector
        ];
@@ -99158,6 +99702,7 @@ self: {
        sha256 = "1m2sxbw5il818g50b0650cm5vrb7njclk09m0na6i3amx3q10xjc";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath glib gtk-largeTreeStore gtk3
          gtksourceview3 mtl pango system-filepath text transformers vector
@@ -99352,6 +99897,7 @@ self: {
        sha256 = "10zq4qch5bs0aawvs0zg3yyz41lykg1jrna5jqxlrvbq0wfz2s5g";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hogre ];
        executableSystemDepends = [ OgreMain ];
        homepage = "http://github.com/anttisalonen/hogre-examples";
@@ -99448,6 +99994,7 @@ self: {
        sha256 = "05181blw3y9j2715rdm49y6mfcpgyihb6yjswhp231kr6x40zxmh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring directory filepath hastache
          http-conduit lens lens-aeson process random split syb text time
@@ -99662,6 +100209,7 @@ self: {
        sha256 = "1rhxmiqwmzmnaqw7qj77k9y8svyy0gknpn8di7q5r9w1bdl807q5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cmdargs configurator containers directory filepath hoodle-core
          mtl
@@ -99705,6 +100253,7 @@ self: {
        pname = "hoodle-core";
        version = "0.16.0";
        sha256 = "1v1y99x5rbkn85f91pdw19jfccwhcyfklg1qli0d7lq2c6aak4ka";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring binary
          bytestring cairo cereal configurator containers coroutine-object
@@ -99847,6 +100396,7 @@ self: {
        sha256 = "024knipmwl75gq56phjwpa61gzac8alw46k6lcgfg7v9dglz2dqx";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring cmdargs conduit conduit-extra
          connection containers deepseq directory extra filepath
@@ -100170,6 +100720,7 @@ self: {
        pname = "hoppy-std";
        version = "0.3.0";
        sha256 = "0rgvqkslhj6d9craiwb5g75217jh7s34980rpcbjbjba8pscpxjb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath haskell-src hoppy-generator
        ];
@@ -100191,6 +100742,7 @@ self: {
        sha256 = "16a1ygxv4isw5wiq5dhjn4xdlr67zy1ngn61mwilgwkvwj0cjxc3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal attoparsec base bytestring conduit
          conduit-extra containers deepseq directory filepath http-conduit
@@ -100222,6 +100774,7 @@ self: {
        sha256 = "0h9cq1qzai1kbzc77bjlm0dbkrasfj0d21ydrh86kv9jd6gr7gb7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bifunctors bytestring filepath mtl pretty readline void
        ];
@@ -100295,6 +100848,7 @@ self: {
        pname = "hosc";
        version = "0.15";
        sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary blaze-builder bytestring data-binary-ieee754 network
          time transformers
@@ -100317,6 +100871,7 @@ self: {
        pname = "hosc-json";
        version = "0.15";
        sha256 = "0sask4nr5njf9grzigldflrbp7460z55fsam1pc3wcnsa575hxhi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring hosc json text
          unordered-containers utf8-string vector
@@ -100337,6 +100892,7 @@ self: {
        sha256 = "0zk59ig52vqym4n47yl9jgv21gszcwwbc0qc9ff0080allp6ddml";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cgi haskeline hosc hosc-json hsc3 json text
          transformers utf8-string websockets www-minus
@@ -100554,6 +101110,7 @@ self: {
        sha256 = "143j3ylvzyq1s2l357vzqrwdcgg6rqhnmv0awb3nvm66c9smaarv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring cairo containers directory filepath glade
          glib gtk gtkglext hp2any-core hp2any-graph OpenGL time
@@ -100572,6 +101129,7 @@ self: {
        sha256 = "11v0w5406d9lql5jaj2kwrvdgai9y76kbdlwpjnn2wjn36b8hdwa";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers filepath ];
        description = "A tool for converting GHC heap-profiles to HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -100708,6 +101266,7 @@ self: {
        sha256 = "0sl2qh3l5vbijln2al7vmvxm4zhn3qsz8axvprs6jxjfbndmk78j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal cabal-macosx containers directory eprocess
          filepath FindBin haskell-src-exts hint hint-server monad-loops mtl
@@ -100885,6 +101444,7 @@ self: {
        pname = "hpdft";
        version = "0.1.0.4";
        sha256 = "1rxr2qfs6cvk0hyvvq7w0jsq8vjf8b84ay5jzfhqyk8qk73ppfji";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers directory file-embed
          parsec text utf8-string zlib
@@ -100966,6 +101526,7 @@ self: {
        sha256 = "01xkpsb8fjlifdz6fckwfawj1s5c4rs4slizcdr1hpij6mcdcg6y";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
@@ -101136,6 +101697,7 @@ self: {
        sha256 = "0kmmrjg93rr6cjmg5n821p00qr4m3q46nnyfhql2s2nf20p7kprh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hcg-minus ];
        executableHaskellDepends = [
          base directory filepath hcg-minus random
@@ -101153,6 +101715,7 @@ self: {
        sha256 = "1xyk0q6qiqcqd849km86jns4bcfmyrvikg0zw44929wlmlbf0hg7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk hps ];
        executableHaskellDepends = [ base cairo gtk hps random ];
        homepage = "http://slavepianos.org/rd/?t=hps-cairo";
@@ -101194,6 +101757,7 @@ self: {
        pname = "hpygments";
        version = "0.2.0";
        sha256 = "0f1cvkslvijlx8qlsc1vkv240ir30w4wq6h4pndzsqdj2y95ricj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring process process-extras
        ];
@@ -101622,6 +102186,7 @@ self: {
        pname = "hs-fltk";
        version = "0.2.5";
        sha256 = "0nbxfy219mz0k27d16r3ir7hk0j450gxba9wrvrz1j17mr3gvqzx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fltk fltk_images ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/";
@@ -101636,6 +102201,7 @@ self: {
        pname = "hs-gchart";
        version = "0.4.1";
        sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://github.com/deepakjois/hs-gchart";
        description = "Haskell wrapper for the Google Chart API";
@@ -101737,6 +102303,7 @@ self: {
        sha256 = "0ypr4jpc12f771g3gsahbj0yjzd0ns8mmwjl90knwg267d712i13";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs colour containers diagrams-core diagrams-lib
          diagrams-svg mtl parsec parsec-numbers random
@@ -101821,6 +102388,7 @@ self: {
        sha256 = "064sk0g8mzkqm80hfxg03qn6g1awydlw15ylikk3rs4wf7fclw30";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base MonadPrompt mtl random ];
        executableHaskellDepends = [
          array base directory glib gtk MonadPrompt mtl random
@@ -101987,6 +102555,7 @@ self: {
        sha256 = "077mc8dn2f6x3s29pm80qi7mj6s2crdhky0vygzfqd8v23gmhqcg";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
        homepage = "https://github.com/deepakjois/hs-twitterarchiver";
        description = "Commandline Twitter feed archiver";
@@ -102063,6 +102632,7 @@ self: {
        sha256 = "1lx0px0gicwry5i4rwgzz6jasjhp24f620w2iby9xpbvn6h3zflm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory filepath haskell-src mtl
        ];
@@ -102124,6 +102694,7 @@ self: {
        pname = "hsSqlite3";
        version = "0.1";
        sha256 = "0wmsswccwcz2zd3zap0wsapzbya72cxdyzhlcch4akvwqcl9hz6a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-sqlite3 bytestring mtl utf8-string
        ];
@@ -102176,6 +102747,7 @@ self: {
        sha256 = "0qar7y4190dfv63jmzx8saxqxzh73spc2q3i6pqywdbv7zb6zvrl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base Hclip HTTP process unix ];
        description = "(ab)Use Google Translate as a speech synthesiser";
        license = stdenv.lib.licenses.gpl3;
@@ -102305,6 +102877,7 @@ self: {
        sha256 = "061ns6ig52pcjwi9cgdcasya4cgm3zlb5s2mzq9p01vw4iy702gn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath process
        ];
@@ -102322,6 +102895,7 @@ self: {
        pname = "hsc3";
        version = "0.15.1";
        sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-default data-ordlist
          directory filepath hashable hosc network process random safe split
@@ -102339,6 +102913,7 @@ self: {
        pname = "hsc3-auditor";
        version = "0.15";
        sha256 = "02p4y06p08mizdrbvl52364szksrwnx28s992prw8b2ilav11563";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath hmt hosc hsc3 hsc3-sf-hsndfile
        ];
@@ -102353,6 +102928,7 @@ self: {
        pname = "hsc3-cairo";
        version = "0.14";
        sha256 = "1f62mfjssky7igbp1nx2zf1azbih76m65xydnf5akp8pim7nzmis";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        homepage = "http://rd.slavepianos.org/?t=hsc3-cairo";
        description = "haskell supercollider cairo drawing";
@@ -102368,6 +102944,7 @@ self: {
        pname = "hsc3-data";
        version = "0.15";
        sha256 = "0321rnajfiwldwwpns78im842hypykc1js7flnasld7al6m7487d";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bifunctors Glob hcg-minus hmt hsc3-lang hsc3-plot
          hsc3-sf-hsndfile safe split SVGPath xml
@@ -102384,6 +102961,7 @@ self: {
        pname = "hsc3-db";
        version = "0.15";
        sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 safe ];
        homepage = "http://rd.slavepianos.org/t/hsc3-db";
        description = "Haskell SuperCollider Unit Generator Database";
@@ -102396,6 +102974,7 @@ self: {
        pname = "hsc3-dot";
        version = "0.15";
        sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        homepage = "http://rd.slavepianos.org/t/hsc3-dot";
        description = "haskell supercollider graph drawing";
@@ -102412,6 +102991,7 @@ self: {
        sha256 = "0b3q6w1r12wv1fl05armkrprlkx2s7n08mimkxxndsd9kl6zl8lw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath hashable hosc hsc3 hsc3-db
          hsc3-dot mtl unix
@@ -102435,6 +103015,7 @@ self: {
        sha256 = "1d59gl0shwkwi9581j7x7yy1j63acns9ccpwin4y5lwk0k5x6s38";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring cairo containers data-default
          directory filepath hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang
@@ -102463,6 +103044,7 @@ self: {
        pname = "hsc3-lang";
        version = "0.15";
        sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bifunctors bytestring containers data-default
          data-ordlist dlist hashable hmatrix-special hosc hsc3 MonadRandom
@@ -102484,6 +103066,7 @@ self: {
        sha256 = "1k45ipivvlfymvh6rzxsv1kfvd11spsn3skmsswg2vd76bcgh20x";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath hashable hosc hsc3 hsc3-dot
          husk-scheme mtl safe unix
@@ -102502,6 +103085,7 @@ self: {
        pname = "hsc3-plot";
        version = "0.15";
        sha256 = "1v5n4k54qp8ifwka2bhrq9w1kfzd3ldzhqyhvkcgl0z46xcf7lk3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath hosc hsc3 hsc3-lang process split
          statistics vector
@@ -102539,6 +103123,7 @@ self: {
        pname = "hsc3-rec";
        version = "0.14.1";
        sha256 = "0m814vr41i0mm0c001vbih9i93048niljv3z8czaz32wysa8xpfl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 ];
        homepage = "http://rd.slavepianos.org/?t=hsc3-rec";
        description = "Haskell SuperCollider Record Variants";
@@ -102554,6 +103139,7 @@ self: {
        pname = "hsc3-rw";
        version = "0.15";
        sha256 = "1jcnw0a1nf4wwf5bz61bkpwd3jfgccfxmcqq06vy43pc98223z8p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory haskell-src-exts parsec polyparse split syb
          transformers
@@ -102601,6 +103187,7 @@ self: {
        pname = "hsc3-sf";
        version = "0.15";
        sha256 = "1dg3gqhvi2rshfqnw7i89bd4bvqjvbk4f9g17x18swyrvgkz9wr7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring hosc ];
        homepage = "http://rd.slavepianos.org/t/hsc3-sf";
        description = "Haskell SuperCollider SoundFile";
@@ -102615,6 +103202,7 @@ self: {
        pname = "hsc3-sf-hsndfile";
        version = "0.15";
        sha256 = "11ksss2g8a7lqpjqvdwj4j9y3kdc8algc9mhlyjmj38mgg4raa2i";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base hsc3-sf hsndfile hsndfile-vector vector
        ];
@@ -102629,6 +103217,7 @@ self: {
        pname = "hsc3-unsafe";
        version = "0.14";
        sha256 = "0kywqx7x10hqzhq8by0f62aznrnq4y3013cxkccx1r0naajpz3yj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 ];
        homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe";
        description = "Unsafe Haskell SuperCollider";
@@ -102646,6 +103235,7 @@ self: {
        sha256 = "1pvg2z6n2r7jhwgwx9rv4q94jdj2ql3kgjh4smjq4xafnzzlyrix";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath hashable hosc hsc3 hsc3-sf
        ];
@@ -102758,6 +103348,7 @@ self: {
        sha256 = "1j3rpzjygh3igvnd1n2xn63bq68rs047cjxr2qi6xyfnivgf6vz4";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
@@ -102832,6 +103423,7 @@ self: {
        sha256 = "0msf80475l3ncpnb1lcpnyscl1svmqg074ylb942rx7dbvck71bj";
        revision = "1";
        editedCabalFile = "0a65hmlhd668r8y7qcjsdy4fgs46j8rr9jbjryjddkma6r02jpqq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base exceptions mtl old-locale old-time unix
        ];
@@ -102904,6 +103496,7 @@ self: {
        pname = "hsdif";
        version = "0.14";
        sha256 = "1wxms6z8mpyf4l1qqxi6gvscls3mwlj5aq6g3ldashzrmb7pcimm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring hosc ];
        homepage = "http://rd.slavepianos.org/?t=hsdif";
        description = "Haskell SDIF";
@@ -102919,6 +103512,7 @@ self: {
        sha256 = "0hqwpcf2bcrj36wg02mxd2zdg07dqh4b5mv9yn295xp64snrdw84";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        homepage = "http://neugierig.org/software/darcs/hsdip/";
        description = "hsdip - a Diplomacy parser/renderer";
@@ -103008,6 +103602,7 @@ self: {
        pname = "hsemail-ns";
        version = "1.3.2";
        sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl old-time parsec ];
        homepage = "http://patch-tag.com/r/hsemail-ns/home";
        description = "Internet Message Parsers";
@@ -103026,6 +103621,7 @@ self: {
        sha256 = "1kjj9p8x6369g9ah9h86xlyvcm4jkahvlz2pvj1m73javbgyyf03";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal directory file-embed filepath http-streams
          io-streams mtl process safe split unix
@@ -103160,6 +103756,7 @@ self: {
        pname = "hsgsom";
        version = "0.2.0";
        sha256 = "1043lavrimaxmscayg4knx7ly0yc0gsb729pg72g897hc455r2dn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -103283,6 +103880,7 @@ self: {
        sha256 = "070sbjcb7vdl0dxx5jv1q1aiihb5q5malrdmxb6dcs0gc01qp13p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath ];
        executableHaskellDepends = [ base directory filepath ];
        description = "Install Haskell software";
@@ -103297,6 +103895,7 @@ self: {
        sha256 = "04f86mk2304q9kz37hr18b9jcz66wk04z747xzpxbnnwig390406";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath ];
        executableHaskellDepends = [ base directory filepath ];
        description = "Install Haskell software";
@@ -103339,6 +103938,7 @@ self: {
        pname = "hslibsvm";
        version = "2.89.0.1";
        sha256 = "00smw10j2ipw10133qc38famar5r6rkswj7bhvb9hdj2rrdyx6sf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
@@ -103522,6 +104122,7 @@ self: {
        pname = "hsmagick";
        version = "0.5";
        sha256 = "1bfzbwddss0m0z4jf7i0b06pmxy9rvknpqnzhf0v5jggv5nr442p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring directory filepath pretty process
        ];
@@ -103619,6 +104220,7 @@ self: {
        sha256 = "1hh4lyrd2ki79q6pfz62icp3igzyljwa5bz8ba9vk4kxxawrnbhw";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base parsec readline ];
        executableHaskellDepends = [ base parsec readline ];
        testHaskellDepends = [
@@ -103686,6 +104288,7 @@ self: {
        sha256 = "0pw5l6z1yjjvcxgw71i00gfnjdqcvg09bsacazq9ahvnwsn4aayd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base mtl network old-time random ];
        executableHaskellDepends = [ unix ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/util/";
@@ -104777,6 +105380,7 @@ self: {
        sha256 = "09lnd6am51z98j4kwwidj4jw0bcrx8904r526w50y38afngysqx6";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers hsqml MonadRandom text
        ];
@@ -104796,6 +105400,7 @@ self: {
        sha256 = "166r06yhnmg063d48dh7973wg85nfmvp1c5gmy79ilycc8xgvmhm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord text
        ];
@@ -104815,6 +105420,7 @@ self: {
        sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers hsqml sqlite-simple text transformers
        ];
@@ -104832,6 +105438,7 @@ self: {
        sha256 = "0y82caz4fb4cz4qfmdg7h5zr959yw2q162zz980jz179188a8pr2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML sample programs";
@@ -104849,6 +105456,7 @@ self: {
        sha256 = "1qisi1r8lljgkwc9v5p3nqq6b78vdn9wyydsp31dxqnbd1lyg5ax";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord tagged
        ];
@@ -105072,6 +105680,7 @@ self: {
        sha256 = "1d87s6f6qgq7sbqzdgidnn3gxz9panhdk2mfhd7263hb9mrq1k3c";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base containers hsqml network random safecopy socks
          tagged text
@@ -105167,6 +105776,7 @@ self: {
        sha256 = "0wfi468d08irw0s7dn6rmfsi1hrvh0in2fr655fmmwk6ngmnix51";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base cairo containers directory filepath glade gtk hashable
          mtl parallel QuickCheck random unordered-containers vector xml
@@ -105211,6 +105821,7 @@ self: {
        sha256 = "1sq498shkr9xvzrg7spwvsfrnp0d414vcb6iv6pcy7h1jsplrgaz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring gi-gtk HandsomeSoup haskell-gi-base http-client
          http-client-tls hxt text
@@ -105412,6 +106023,7 @@ self: {
        sha256 = "19s01g8inwmzbvbs1ph4rg2kaqipj7jc9lkg2y9y28gpdrgw48qb";
        revision = "1";
        editedCabalFile = "0z0jzhmrm77b3rl1h89wfgbwjg374n1mda73z7qrrdfc7ky99dmy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [ base directory filepath hspec ];
@@ -105428,6 +106040,7 @@ self: {
        pname = "htaglib";
        version = "1.1.1";
        sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring text transformers ];
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [ base directory filepath hspec ];
@@ -105639,6 +106252,7 @@ self: {
        pname = "html-minimalist";
        version = "0.15";
        sha256 = "06qhjb8c1x9wab77g493bbqqm068alkc4vn7c6dj810gdgxwgw5j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base xml ];
        homepage = "http://rd.slavepianos.org/t/html-minimalist";
        description = "Minimalist haskell html library";
@@ -105814,6 +106428,7 @@ self: {
        pname = "hts";
        version = "0.15";
        sha256 = "0l09skjsds4p9kdwrwrxg8hdd1ja7m2zmggf23dfimzm1jsij6y2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hmt xml ];
        homepage = "http://rd.slavepianos.org/t/hts";
        description = "Haskell Music Typesetting";
@@ -106847,6 +107462,7 @@ self: {
        pname = "https-everywhere-rules-raw";
        version = "4.0";
        sha256 = "0zm3znn42nzh9dlpjjn38nsz8rsb0gzl5rv6ngii1vfq534sddy6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath functor-infix text
        ];
@@ -106929,6 +107545,7 @@ self: {
        pname = "hubigraph";
        version = "0.3.2";
        sha256 = "19mxblqy3bchhrk725x4kmpa9hidjzj0d0sqhx34smqw7v36x814";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers haxr mtl ];
        homepage = "http://ooxo.org/hubigraph/";
        description = "A haskell wrap for Ubigraph";
@@ -107102,6 +107719,7 @@ self: {
        sha256 = "1wb9bn83lrn6cpp0gkpc7v40m9wlx8i8zqijm4dmd23zzmrlrxhr";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-builder bytestring case-insensitive ConfigFile
          containers directory filepath HaXml http-types hxt MissingH mtl
@@ -107170,6 +107788,7 @@ self: {
        sha256 = "0wzy2gjxpqr0j2cfnl88ixccm8dv3z9cql1zpzr4ph6g37dc9w60";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        homepage = "http://patch-tag.com/r/kwallmar/hunit_gui/home";
@@ -107383,6 +108002,7 @@ self: {
        sha256 = "0bb4iph3pp26rm9sdsjsshbig3misd1yr4waqblj8vr9fmrpx084";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory haskeline knob mtl
          parsec process time transformers utf8-string
@@ -108098,6 +108718,7 @@ self: {
        sha256 = "05bahk2fl2cp0dgx4v91dghzhsh1bclaj8z24j4s0p25xbi63zvr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array attoparsec base bytestring conduit containers
          hw-balancedparens hw-bits hw-conduit hw-parser hw-prim
@@ -108321,6 +108942,7 @@ self: {
        sha256 = "1fk4cgk4ncf5v7k8hankwb49ablfcxj1rcw64ka6pz3jrz4sablq";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cairo cmdargs configurator containers Diff
          directory double-conversion dyre fclabels filepath gtk
@@ -108644,6 +109266,7 @@ self: {
        sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base blaze-html bytestring cmdargs directory filepath
          highlighting-kate mtl pandoc regex-pcre-builtin text
@@ -108663,6 +109286,7 @@ self: {
        sha256 = "05v69csnz7g9ikymnrmzjqhdwlrfsb44pbv8mzddgk6my9ddlb9w";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers haskell98 mtl parsec
        ];
@@ -108763,6 +109387,7 @@ self: {
        sha256 = "03hz4z964zg1b5nzywymrd1m3ss081rq6nnbqwcgbwabx6wd209b";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base hydrogen-cli-args hydrogen-data hydrogen-multimap
          hydrogen-parsing hydrogen-prelude hydrogen-syntax
@@ -108941,6 +109566,7 @@ self: {
        sha256 = "0ryzhbmwrg173lmzyl8a77qnqp11maxcn72y1x0hn8mabj8js3hn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hylogen vector-space ];
        executableHaskellDepends = [
          aeson base bytestring filepath fsnotify hint http-types hylogen
@@ -108987,6 +109613,7 @@ self: {
        sha256 = "0xynx72xpb84g19gnsgq00gwj3ycfgk5qgd9j949b6k3fqr3n71w";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hylolib mtl ];
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hylotab.php";
        description = "Tableau based theorem prover for hybrid logics";
@@ -109173,6 +109800,7 @@ self: {
        pname = "hyphenation";
        version = "0.6";
        sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers unordered-containers zlib
        ];
@@ -109193,6 +109821,7 @@ self: {
        pname = "hyphenation";
        version = "0.7";
        sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring containers unordered-containers zlib
@@ -109511,6 +110140,7 @@ self: {
        editedCabalFile = "0bb6cg0yiadcwa7pdg5gan3lir3pxdakwimi0cp64hi76scy0xng";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          async attoparsec base binary bytestring Cabal-ide-backend
          containers data-accessor data-accessor-mtl directory filemanip
@@ -109658,6 +110288,7 @@ self: {
        sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n";
        revision = "1";
        editedCabalFile = "0jlm9cmw0ycbyifab7bzkmykj8w7vn2wyc6pfadfjrhb76zyvcxr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring JuicyPixels ];
        testHaskellDepends = [
          base bytestring hspec JuicyPixels QuickCheck
@@ -109706,6 +110337,7 @@ self: {
        sha256 = "11595aj56sjwk28grh6ldsbk5c6kgrirsc2xglfixw82vj7viw8h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor MissingH polyparse text
          utf8-string
@@ -109783,6 +110415,7 @@ self: {
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async
          base base64-bytestring binary blaze-html blaze-markup bytestring
@@ -109952,6 +110585,7 @@ self: {
        pname = "ige-mac-integration";
        version = "0.1.0.1";
        sha256 = "1949c5v3157xlwcmddawc79iagxlgy4l08skpkldi45amyy3jqn6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -110032,6 +110666,7 @@ self: {
        sha256 = "09vzwbxc8hnm7cwhs1nfpd6abwmlld495h304iwv1j653zrhjygp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cereal cmdargs containers
          directory filepath ghc ghc-parser ghc-paths haskeline
@@ -110521,6 +111156,7 @@ self: {
        sha256 = "0x31wjd6maqixr3rbangaph0s5skp18fmb8xgm1a6jsky8k367vz";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bibtex bytestring ConfigFile containers curl directory
          download-curl filepath glib gnomevfs gtk mtl parsec process split
@@ -110899,6 +111535,7 @@ self: {
        sha256 = "05f25yza05ib0xnkpfimhrb3nqyp5km85r1j9n6yh9k0cwdagndi";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers filepath IndentParser mtl parsec presburger pretty
        ];
@@ -112192,6 +112829,7 @@ self: {
        pname = "interlude";
        version = "0.1.2";
        sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/";
        description = "Replaces some Prelude functions for enhanced error reporting";
@@ -112242,6 +112880,7 @@ self: {
        sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base explicit-exception HPDF parsec process transformers utility-ht
        ];
@@ -112264,6 +112903,7 @@ self: {
        editedCabalFile = "1fgqd3qkws9yb3vj8ay695ym5cgifi082wryh68dp0qqh7agwkhl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory filepath ghc ghc-boot-th
          ghc-paths ghci haskeline process syb time transformers unix
@@ -112286,6 +112926,7 @@ self: {
        sha256 = "11awkl6rgy33yl4qcnf7ns464c87xjk9hqcf10z8shjjbaadbz43";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [
          base haskell-src-exts regex-posix syb
@@ -112346,6 +112987,7 @@ self: {
        pname = "interpolatedstring-perl6";
        version = "1.0.0";
        sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring haskell-src-meta template-haskell text
        ];
@@ -112360,6 +113002,7 @@ self: {
        pname = "interpolatedstring-qq";
        version = "0.2";
        sha256 = "1bqn9gqc43r158hyk35x8avsiqyd43vlpw2jkhpdfmr2wx29jprq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell-src-meta-mwotton template-haskell
        ];
@@ -112375,6 +113018,7 @@ self: {
        pname = "interpolatedstring-qq-mwotton";
        version = "0.1.1";
        sha256 = "1cwhy4jwbl50nglfw0wfmdr3rrg33dqskw0wq06prx14x22yshbk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell-src-meta-mwotton template-haskell
        ];
@@ -112491,6 +113135,7 @@ self: {
        sha256 = "05nz32z4gyjprh22dddwk3jb45nl2bm558d1sh09g4n2rvx0m4i7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring containers crypto-api
          crypto-pubkey-types cryptohash directory filepath hscurses mtl
@@ -112858,7 +113503,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "io-streams_1_4_0_0" = callPackage
+  "io-streams_1_4_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , deepseq, directory, filepath, HUnit, mtl, network, primitive
      , process, QuickCheck, test-framework, test-framework-hunit
@@ -112867,8 +113512,8 @@ self: {
      }:
      mkDerivation {
        pname = "io-streams";
-       version = "1.4.0.0";
-       sha256 = "03lk73smhqvw6lxp4j0kxlkd87vaxaz2avpy7k533fxv1jk3sfbd";
+       version = "1.4.1.0";
+       sha256 = "0d6m7hq6l3zabqm2kga9qs1742vh5rnhfsa76svpkyn32z8n1i1w";
        configureFlags = [ "-fnointeractivetests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -113246,6 +113891,7 @@ self: {
        sha256 = "0r426gbvr5k019v49gmw32fv0xnq5viizin4gb7wxcnm6ql84k5c";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cereal containers directory filepath mtl
          process SHA temporary text transformers unordered-containers uuid
@@ -113554,6 +114200,7 @@ self: {
        sha256 = "0xrmya03n4xpnn3c79r94x8dz8yn963v8js8rwyjcslr11gyx80q";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring Cabal containers extra foldl
          http-conduit lifted-base monad-control multistate process split
@@ -113871,6 +114518,7 @@ self: {
        sha256 = "049gj5c6z68yf7cmnp1kbjdg71n4rdwyb59hivdjajsdp9xay7hn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base brick data-default microlens text vty
        ];
@@ -113933,6 +114581,7 @@ self: {
        pname = "iterable";
        version = "3.0";
        sha256 = "194718jpjwkv3ynlpgjlpvf0iqnj7dkd3zmci363gsa425i3vlbc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base mtl tagged template-haskell vector
        ];
@@ -114075,6 +114724,7 @@ self: {
        sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych";
        revision = "1";
        editedCabalFile = "0d96j24n4v61q7ynrwaag96as2sl6q67kmypmb4wk42cw400g41j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers directory haskell98 mtl parsec
        ];
@@ -114132,6 +114782,7 @@ self: {
        sha256 = "0dg5408il1s9z1v69k8vw80ypmkbanvqfsw8a5gi8l3b9xinjzg0";
        revision = "3";
        editedCabalFile = "09r09jbbj6a3qm07gj64pbszs72kpvab0320flg6rq9ng2pswv49";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring containers directory filepath ivory
          ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib
@@ -114196,6 +114847,7 @@ self: {
        editedCabalFile = "0ffshn32fv3qwf7gq0ms0ay21b21xvy0gb97ymg89plan18n2gx8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-compat ivory ivory-backend-c ivory-opts ivory-stdlib
          monadLib pretty QuickCheck template-haskell
@@ -114212,6 +114864,7 @@ self: {
        pname = "ivory-hw";
        version = "0.1.0.5";
        sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        homepage = "http://ivorylang.org";
        description = "Ivory hardware model (STM32F4)";
@@ -114270,6 +114923,7 @@ self: {
        pname = "ivory-serialize";
        version = "0.1.0.5";
        sha256 = "16hsvfrcrvqwcj75d1xdpb9njh0j66wy7vf4yv7q6vk7papvrwsf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat filepath ivory ivory-artifact monadLib
        ];
@@ -114284,6 +114938,7 @@ self: {
        pname = "ivory-stdlib";
        version = "0.1.0.5";
        sha256 = "1sdbwy5sqa87zidfp7xmxwvfw3xx26kc8m68hgmhsxvs8j6xavmg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        homepage = "http://ivorylang.org";
        description = "Ivory standard library";
@@ -114632,6 +115287,7 @@ self: {
        sha256 = "0xlk07vcizp9rms5d28klidcf535ncffcx75rwixhvlii2qmyjn7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [
          base bytestring directory filepath process regex-tdfa temporary
@@ -114672,6 +115328,7 @@ self: {
        sha256 = "1p4j42nzsbd2dsag2gfnngvbdn5vx9cp8lmli6x05sdywabyckc7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base pretty ];
        executableToolDepends = [ alex happy ];
        homepage = "http://github.com/andreasabel/java-adt";
@@ -115097,6 +115754,7 @@ self: {
        pname = "join";
        version = "0.4";
        sha256 = "0bx9cvdhhw7z30qgxwpl0j23z18sx7xyin2y7bwxvg5ga737j8qx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html";
        description = "Parallel Join Patterns with Guards and Propagation";
@@ -115268,6 +115926,7 @@ self: {
        pname = "js-flot";
        version = "0.8.3";
        sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        homepage = "https://github.com/ndmitchell/js-flot#readme";
@@ -115294,6 +115953,7 @@ self: {
        pname = "js-jquery";
        version = "3.1.1";
        sha256 = "011adwcf0rx57ld6c75m9rw90zd2qj0d4pf7rmdnf7fp5gbnfbyp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        doCheck = false;
@@ -115308,6 +115968,7 @@ self: {
        pname = "js-jquery";
        version = "3.2.1";
        sha256 = "03qymiwnk24sigqjnl42i77rsx6vrgg5wjday0f2j0d6s213sl30";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        doCheck = false;
@@ -116396,6 +117057,7 @@ self: {
        sha256 = "060zq739i3xhr7w448p460r7x3jyyzf7pn61abp7f9g8vjn6vqw7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base64-bytestring bytestring data-default-class docopt entropy
          fast-logger http-types interpolatedstring-perl6 mtl mysql
@@ -116906,6 +117568,7 @@ self: {
        sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz";
        revision = "11";
        editedCabalFile = "0l56snbdxbcwrmh7gna4237873d366dfbwp59a4wq1s51clhmb4z";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -116927,6 +117590,7 @@ self: {
        sha256 = "0pbciwh79y1pzqlpd2f8pm5w8bjq5bs47slqw71q09f7jlgs0i7d";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cmdargs containers data-default data-reify
          directory dotgen filepath netlist netlist-to-vhdl process random
@@ -116949,6 +117613,7 @@ self: {
        sha256 = "076hd8c59hivdirpf4y5vgdlvhq74lfd5zm6np34y8hblq6jyl0m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava network sized-types
@@ -116969,6 +117634,7 @@ self: {
        pname = "kansas-lava-papilio";
        version = "0.3.1";
        sha256 = "0n8ffiygl72cbqza0whmkhsqyg6d7flfdz1jvr22g68x3005r00y";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava kansas-lava-cores netlist network sized-types
@@ -116984,6 +117650,7 @@ self: {
        pname = "kansas-lava-shake";
        version = "0.2.0";
        sha256 = "197nyj21r2z9a648ljmqkhzdbhy3syzw1rw4xfggn1rhk94px0rl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hastache kansas-lava shake text ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
@@ -117318,6 +117985,7 @@ self: {
        sha256 = "1skz1yllkwbpx4wd8w8q4zmqd3f62baaj5pja6dpqr2xviiv0j6g";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ];
        homepage = "http://tcana.info/rpoku";
        description = "Rpoku spoken word programming language";
@@ -117729,6 +118397,7 @@ self: {
        sha256 = "0kaka302qgax29583kvzhyl6fffzmywh3fk398xhzvixmza9k7sl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          allocated-processor base bytestring cmdargs containers
          cv-combinators directory filepath gio glib gtk gtk-helpers hgettext
@@ -117934,6 +118603,7 @@ self: {
        sha256 = "04lyrd78fkybh07y9xnbnk3ai1nsig55wr1i0p1c63v9sgzpria5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-wl-pprint api-tools asn1-encoding
          asn1-types base base64-bytestring byteable bytestring cipher-aes
@@ -118093,6 +118763,7 @@ self: {
        sha256 = "1d8abd4l8mcgcfqmm06zmd7yxvfls1kqkphx64bi6mmqzy8lcx3k";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cmdargs hostname old-time parsec twine
        ];
@@ -118937,6 +119608,7 @@ self: {
        sha256 = "195xm7ncqfpj51vipmv7di1yqba9iy6c38a0rqrkji0w13aprp14";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base lambdabot-core lambdabot-haskell-plugins lambdabot-irc-plugins
          lambdabot-misc-plugins lambdabot-novelty-plugins
@@ -119137,6 +119809,7 @@ self: {
        sha256 = "18m7z0lmi26ib1n1wrql96wb5i229k8fk3iw4vavs9j59b4pz1br";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cmdargs containers dyre glade gtk mtl network webkit
        ];
@@ -119233,6 +119906,7 @@ self: {
        sha256 = "1rylz8cxlf4llnakihphs7250bmvqqbz35aywjmh2vnghyc8dq28";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base containers directory exceptions filepath
          lambdacube-ir megaparsec mtl pretty-show semigroups text vector
@@ -119314,6 +119988,7 @@ self: {
        sha256 = "14l40ncbkblphmyn4prqiy2w70agcw830bpyawfdilf93bs340b9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base elerea GLFW-b lambdacube-engine mtl
        ];
@@ -119373,6 +120048,7 @@ self: {
        sha256 = "0zl9d524a81vg3h7f9cbfi34b0hw452bd30xmgvg9ayfwxa842d1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring bytestring-trie elerea GLFW-b lambdacube-core
          lambdacube-edsl lambdacube-gl mtl OpenGLRaw stb-image time vect
@@ -119475,6 +120151,7 @@ self: {
        pname = "lame";
        version = "0.1.1";
        sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default-class directory exceptions filepath
          text transformers wave
@@ -119611,6 +120288,7 @@ self: {
        pname = "language-c-comments";
        version = "0.3";
        sha256 = "1rmciff72zpcq7pvbbxlsg2339dbk00k18vxp35sz8haql0jnrf2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base language-c ];
        libraryToolDepends = [ alex ];
        homepage = "http://github.com/ghulette/language-c-comments";
@@ -119948,6 +120626,7 @@ self: {
        pname = "language-guess";
        version = "0.1.2";
        sha256 = "0gdnkc1hb0mcn494vk9r7fw19hvaba807brwh6fna0sxyh2nx3p0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
@@ -120298,6 +120977,7 @@ self: {
        sha256 = "1vjmb41hh47gmqv3g7f28rkb3lj8hqpdc7pvs6qa9f6pmqi98m4v";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
          case-insensitive containers cryptonite directory either exceptions
@@ -120342,6 +121022,7 @@ self: {
        sha256 = "0hk1fx574hkmm275rm4jv66vr9gixllaw2vqklhpx54rgjwpcclv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
          case-insensitive containers cryptonite directory either exceptions
@@ -120881,6 +121562,7 @@ self: {
        sha256 = "1k39264jwysaiyq9f40n332y2xckhwsbh8fpsz4l14qwlvj68vzx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs composition data-lens Gamgine GLFW-b ListZipper mtl
          OpenGLRaw pretty-show
@@ -121215,6 +121897,7 @@ self: {
        sha256 = "1czk4d2xa2g7djdz669h1q6ciflzwxm4n05m9jv3d3z7r6fcch6z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-html directory filepath pandoc split
        ];
@@ -121386,6 +122069,7 @@ self: {
        sha256 = "106pr7rlma67dqqyfhknh9fb6r37lsj00qjx1dq3xx7yxp368nvr";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers ];
        homepage = "http://github.com/phaazon/leetify";
        description = "Leetify text";
@@ -121506,6 +122190,7 @@ self: {
        editedCabalFile = "0iqg1qlfh6knmlq29ydzp2qs75aa6a2rpl5l5fzp1b1lcsh8njdm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base base-compat binary binary-shared blaze-html bytestring
          Cabal conduit containers cpphs deepseq directory executable-path
@@ -121545,6 +122230,7 @@ self: {
        sha256 = "0haj6pi593x0chkvkvvv6d523fmg8vd0hjzkj8sjf8h8ys0sg9k2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bin-package-db binary binary-shared bytestring
          Cabal conduit conduit-extra containers deepseq directory
@@ -122223,6 +122909,7 @@ self: {
        sha256 = "1x50k6lx9p36qxl0qn9zfyqlkgsq3wdzvcv7l6sn920hg5scvcr3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-wl-pprint base binary bytestring bytestring-trie Cabal
          containers core derive digest directory extensible-exceptions
@@ -122258,6 +122945,7 @@ self: {
        sha256 = "1mm6ikiv6zj025yh5abq3f8mqkw9302mfzd01xcihbh74bsdpi9l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs filepath haskell-src-exts syb uu-parsinglib
        ];
@@ -122275,6 +122963,7 @@ self: {
        sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath Glob ];
        description = "Compile lhs in bird style to md, html, hs";
        license = stdenv.lib.licenses.publicDomain;
@@ -122323,6 +123012,7 @@ self: {
        pname = "libGenI";
        version = "0.16.1";
        sha256 = "1n37pccmx0466425zcbdfpgivsrnqzwsm0nwcjv8lkg8jxjxrwmz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers HUnit mtl parsec process QuickCheck
        ];
@@ -122560,6 +123250,7 @@ self: {
        pname = "liblawless";
        version = "0.24.0";
        sha256 = "1dqz2d8zgwb8i176fhga5637y8mfxiq0vq1ws0lsy9ijlpyiikmp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
          concurrent-machines containers containers-unicode-symbols
@@ -122930,6 +123621,7 @@ self: {
        pname = "libtagc";
        version = "0.12.0";
        sha256 = "1f7r82cfrkxrqcrxk92y6zhk79qwpack2g67crww5q8hs7438vja";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring glib ];
        librarySystemDepends = [ taglib ];
        libraryPkgconfigDepends = [ taglib ];
@@ -123104,6 +123796,7 @@ self: {
        sha256 = "0drsv1d0318yr7a0aa2j6kvsiyl8jj8h4z6wpdnrcyxw6z4qlssq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        homepage = "http://github.com/sproingie/haskell-cells/";
        description = "Conway's Life cellular automaton";
@@ -123219,6 +123912,7 @@ self: {
        sha256 = "11c0j2mdrp4rvinl4iym9mfsqzh101yb5sf710vm8n7qih1fzcpc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bitmap bytestring directory filepath gloss mtl stb-image
        ];
@@ -123399,6 +124093,7 @@ self: {
        editedCabalFile = "0bvcyh2mryg78kd2yrxz0g67ry4bb23xvrg7pnl0jla49wzg8pjf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers deepseq delay
          exceptions filepath hashable hedis http-types lens monad-supply mtl
@@ -123641,6 +124336,7 @@ self: {
        sha256 = "0671px94wvqg2yyc8qhjcwrv5k2ifwp5mrj7fkcwlwvg8w1bp19k";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers HUnit ];
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
@@ -123795,6 +124491,7 @@ self: {
        sha256 = "0fzszn8nb5kglg4s5hk9k51vdkarlc08bdp67rbrj0cwfxpkn6wd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base gtk haskell98 popenhs regex-compat unix
        ];
@@ -123812,6 +124509,7 @@ self: {
        sha256 = "0m1jwqa3vbiyzcdrn1h63dm0709j5xijm00j2x7dpwgn8k92iq81";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers extcore filepath process
        ];
@@ -124036,6 +124734,7 @@ self: {
        sha256 = "18akjagbqw2fswrnp4ifzivwdwsbny28kvnm0hfc1ysyy9id8511";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers mtl pretty
        ];
@@ -124157,6 +124856,7 @@ self: {
        sha256 = "1nddiakk6b9biay6ijnc48dxcfgpi9vx4g6a8r9vz6cjh6mh0154";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit filepath http-types lio
          simple simple-templates text wai wai-extra warp
@@ -124260,6 +124960,7 @@ self: {
        sha256 = "1rj6c46laylds149d11yyw79vn0nls9gmxnc9fakyl4qg0d97d75";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base bifunctors binary bytestring Cabal cereal cmdargs
          containers data-default deepseq Diff directory exceptions filepath
@@ -124670,6 +125371,7 @@ self: {
        sha256 = "0gsbixz0cmy9cajqj4s8iaf8mjk42162sd39bpcdp4xqyxfj5g63";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base event-list non-negative ];
        executableHaskellDepends = [
          alsa-core alsa-seq base bytestring cgi concurrent-split containers
@@ -124820,6 +125522,7 @@ self: {
        pname = "llvm-base-types";
        version = "0.3.0";
        sha256 = "142xc7w250y0nx60qnm4gc5hrqjm1bxk0nhgsp669g5kvxqcd3bn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers deepseq dwarf failure GenericPretty graphviz
          hashable pretty regex-tdfa text transformers unordered-containers
@@ -125093,6 +125796,7 @@ self: {
        sha256 = "1ynxkdaanw3nxpsgfcjg6wsz6jgxszp239xhssyzasz59qhw64rr";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base Cabal explicit-exception process transformers utility-ht
        ];
@@ -125171,6 +125875,7 @@ self: {
        sha256 = "1nyp0sgdqsaa2f2v7xgmm3s8mf2a170mzz2h3wwsi163ggvxwvhd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory filemanip
          filepath graphviz llvm-analysis llvm-data-interop parallel-io xml
@@ -125343,6 +126048,7 @@ self: {
        pname = "local-search";
        version = "0.0.7";
        sha256 = "0xrp34m2qfbz458g7bxdkp2lvsm0hskwxfcrm1d8n8g150ddn2xf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base combinatorial-problems containers erf random
        ];
@@ -126316,6 +127022,7 @@ self: {
        pname = "loli";
        version = "2011.6.24";
        sha256 = "1m23dkxh2vah7d47arpqx5zdpwczm8k4jixzslmqbdizm9h933ja";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default hack hack-contrib mps mtl
          template utf8-string
@@ -126435,6 +127142,7 @@ self: {
        sha256 = "0kzvi4310mbz51zkgmm84qyxxpi4m5ww2bsrfkj73a45bn7z198j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal attoparsec-conduit base bytestring
          case-insensitive conduit conduit-extra data-default directory
@@ -126946,6 +127654,7 @@ self: {
        sha256 = "1dcvax756cqpqg6rrrjrd4sfr3ggvqdiwp42rb8fdrsi3v2skwrj";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base64-bytestring blaze-html bson bytestring
          compact-string-fix feed happstack happstack-server HTTP mongoDB mtl
@@ -127006,6 +127715,7 @@ self: {
        pname = "luka";
        version = "2012.8.29";
        sha256 = "00g7a80nlw1bgw6x2pqg1qn4786ra3bwbwbfm9b7iyhb101b7s9s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ air base bytestring libffi ];
        librarySystemDepends = [ objc ];
        homepage = "https://github.com/nfjinjing/luka";
@@ -127568,6 +128278,7 @@ self: {
        pname = "macho";
        version = "0.22";
        sha256 = "13i8bap38ha8j0259kw4gfx18jxc4860awp3s9rz16i4q2vik0v2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://github.com/erikcharlebois/macho";
        description = "Parser for Mach-O object format";
@@ -127679,6 +128390,7 @@ self: {
        sha256 = "0fknvy48sanvq7vg5pxwbjsahpiby1hba5wf8w6rq2g3d0a1cjwz";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base containers mtl random ];
        executableSystemDepends = [ ncurses ];
        homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz";
@@ -127772,6 +128484,7 @@ self: {
        sha256 = "0fmhms0415wawd539ipdj47gf27h2jjq2gpzhb0s21r6z63ayp7f";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile containers curl directory happstack-state MissingH
          mtl network old-time regex-posix tagsoup utf8-string XMPP
@@ -127793,6 +128506,7 @@ self: {
        sha256 = "1gss86263pzwvm14yx5lqzskrwc3z6521z9yp0mg8780qgr8h9sr";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          air air-th base bytestring containers data-default directory
          filepath hack2 hack2-contrib hack2-handler-snap-server moe process
@@ -127992,6 +128706,7 @@ self: {
        sha256 = "1502pggc0gcmsj6fhzkjcrbqydaxz4qivsmv57jm6cxpbypkyin3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          async base bytestring configurator containers directory filepath
          github haskeline lens lens-datetime mtl process text time
@@ -128134,6 +128849,7 @@ self: {
        sha256 = "01blfcfynfbshznrz4arn89j7s063s7xhlkqnzbv42wqk04i083h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          mtl stm text utf8-string webkit
@@ -128179,6 +128895,7 @@ self: {
        sha256 = "0v525dcg6cs8mfrcbaxk9vx86gnd37c2z8gp9q8fck11616vckvn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers curl dbus-client dbus-core derive
          directory filepath gio glib gtk manatee-core mtl network old-locale
@@ -128200,6 +128917,7 @@ self: {
        sha256 = "0rd6xjc1hmvfchwjh32ij4sa36z0v6b1k81gnx7278qqsscmgl9y";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
@@ -128220,6 +128938,7 @@ self: {
        sha256 = "06zrhycpsnfi8r3a071p6qlrqidddv004h10zcglb9ryhw0sh2p1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gio glib gtk
          manatee-core mtl old-locale old-time stm text utf8-string
@@ -128240,6 +128959,7 @@ self: {
        sha256 = "0yn32xsckvw96kxskfhgcqg98rffl07hkwfjzyd7cm221hwd9s0g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gio glib gtk
          gtkimageview manatee-core regex-tdfa stm text utf8-string
@@ -128262,6 +128982,7 @@ self: {
        sha256 = "0l14r4mw5bwyjzs5m49sp3vdi2lzfgyjwhsb0q94l3937wb4abgy";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring Cabal containers curl dbus-client
          dbus-core derive fastirc filepath ghc GoogleTranslate groom gtk
@@ -128284,6 +129005,7 @@ self: {
        sha256 = "1jg9ikshscpjyq73g125acqndd049ry8zw7h0gglsi63xbqpldz4";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gio gtk libtagc manatee-core process random regex-tdfa stm
@@ -128305,6 +129027,7 @@ self: {
        sha256 = "0k00drrk7mpbc8ak5cwzx245xf968186dkc12cxp7n2h2mccb456";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary cairo containers dbus-client derive filepath gtk
          manatee-core mtl poppler stm text utf8-string
@@ -128324,6 +129047,7 @@ self: {
        sha256 = "1zxkfil6anh2v692ky9l6gf40784y2czbx8853xmypnhnvgr95ll";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          proc stm text
@@ -128344,6 +129068,7 @@ self: {
        sha256 = "07zkjg1q3gdqiw1pp0325pyvh84740mxvlf8k6sc6l1l258zpk90";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers curl dbus-client derive download-curl feed
          filepath gtk manatee-core stm text utf8-string webkit
@@ -128383,6 +129108,7 @@ self: {
        sha256 = "1aj1pghad0jdm3biy9f4caahvpyby0ia3clrl8lg2rmp2j703wkd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          stm text unix vte
@@ -128460,6 +129186,7 @@ self: {
        sha256 = "1wrpzai3482c9g7zfacmjszi6h073ip00fbq17nyc22z2zw4908s";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory filepath GLUT hslua time
        ];
@@ -128605,6 +129332,7 @@ self: {
        sha256 = "0ic6jcdsx71qnclv1xvpk812n1fvwm1mvwlj7b2jx5qwvbibvpci";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base containers directory haskeline parsec
        ];
@@ -128822,6 +129550,7 @@ self: {
        sha256 = "09gfmh9hdzyjijkv2h5a6gfa9rfmba2642rhhh80wsw9y4rg8ns1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs directory glib gtk gtk2hs-buildtools MissingH mtl
          pandoc temporary text transformers webkit
@@ -128931,6 +129660,7 @@ self: {
        editedCabalFile = "1aszssi82ap0y6bkviv3vn6cdh3vb0pv1znvs2z5k52r4wwa8h55";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit configurator deepseq hashable
          haskeline http-client http-client-tls http-types irc-conduit lens
@@ -128978,6 +129708,7 @@ self: {
        sha256 = "0bszb1czqm7pvz8m24z06irzfrw4ch8bm8g59apdgvmp8y0yvp91";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath haskell-src-exts labeled-tree
          lens lp-diagrams mtl process text
@@ -129094,6 +129825,7 @@ self: {
        sha256 = "1mbbf0fljaiakw0hw72wsyc1isvylrr7q7wjcyac250lflbkg9dv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring ConfigFile containers data-default deepseq
          directory either filepath fsnotify HStringTemplate HTTP http-server
@@ -129307,6 +130039,7 @@ self: {
        pname = "matrix-market-attoparsec";
        version = "0.1.0.8";
        sha256 = "0xqa4q4wyjjh55lggsyjhsi0kb5rhk3afzk0qhnhdmnzmf0slhay";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring exceptions scientific
        ];
@@ -129340,6 +130073,7 @@ self: {
        sha256 = "15pjqyy9qs9bn2vfayl73h5maf01snv7rvq1acb3ly8pain36lh4";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile containers directory MissingH mtl network
          old-locale split time vty vty-ui XMPP
@@ -129362,8 +130096,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "31000.0.0";
-       sha256 = "0kkyalrqfaq851lnj8vbrffyg2yjbr5mhqrh8a2y4hkd8yx1ji36";
+       version = "40000.0.0";
+       sha256 = "1cr4mnqqdwf137v4r6mgc7p1b20hm4pdvm6qs61zrhlgimy9zmln";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -129387,21 +130121,22 @@ self: {
      }) {};
 
   "mattermost-api" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, connection, containers
-     , gitrev, hashable, HTTP, HUnit, memory, microlens, microlens-th
-     , mtl, network-uri, pretty-show, process, stm, tasty, tasty-hunit
-     , template-haskell, text, time, unordered-containers, websockets
+    ({ mkDerivation, aeson, base, binary, bytestring, connection
+     , containers, gitrev, hashable, HTTP, HUnit, memory, microlens
+     , microlens-th, mtl, network-uri, pretty-show, process, stm, tasty
+     , tasty-hunit, template-haskell, text, time, unordered-containers
+     , websockets
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "31000.0.0";
-       sha256 = "1v5m57qsd155rr6nz3y1yzvs2imia4ld3xb2ccha0cnbki6hw6wb";
+       version = "40000.0.0";
+       sha256 = "0c2c09hmq8n44na0i20hqj57cv5wr9yy4apvhdn0xvgfs155wgp9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring connection containers gitrev hashable HTTP
-         memory microlens microlens-th network-uri pretty-show process stm
-         template-haskell text time unordered-containers websockets
+         aeson base binary bytestring connection containers gitrev hashable
+         HTTP memory microlens microlens-th network-uri pretty-show process
+         stm template-haskell text time unordered-containers websockets
        ];
        executableHaskellDepends = [
          aeson base connection pretty-show process text unordered-containers
@@ -129421,8 +130156,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "31000.0.0";
-       sha256 = "1sjw31vg02ygxb61m2cvhl435zgsk6w5gnl4v34qd9ihbq4laa9r";
+       version = "40000.0.0";
+       sha256 = "0pnwzay7w9jmdrq26sj3in127c5dywbzhwi12vcf09q4mi43zqwb";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -129540,6 +130275,7 @@ self: {
        sha256 = "0vv4y1a0z2vsg7jakqphn9z4agyir8m3l90a680bm549zkw7blhw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols boxes containers
          containers-unicode-symbols fgl HaLeX indentparser mtl parsec
@@ -130290,6 +131026,7 @@ self: {
        pname = "meldable-heap";
        version = "2.0.3";
        sha256 = "1p75zjlls38sd1lma7w95mpmb9kdff19s2as6pz1ki1g20nnxdk3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/priority-queues/";
        description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues";
@@ -130675,6 +131412,7 @@ self: {
        sha256 = "1xcisngfsw5fd5h7idvni85fap2yh85q01615spfr4y4ia5kq05r";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskeline transformers ];
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/memscript";
        description = "Command line utility for memorizing scriptures or any other text";
@@ -131305,6 +132043,7 @@ self: {
        sha256 = "1xvmyjv72v2cd9h4qkq5vxa6ylzdnkf4pk7afs316mzvx68fab4h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers exceptions haskeline HCodecs megaparsec mtl
          QuickCheck random text tf-random transformers
@@ -131443,6 +132182,7 @@ self: {
        pname = "midi-utils";
        version = "0.1.0.0";
        sha256 = "1dlxihyjx1s1vj57j0fnalav8kq5yxlwlaz0ixmx4aj6glgzp8iz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring directory event-list midi parsec process
        ];
@@ -131500,6 +132240,7 @@ self: {
        sha256 = "0xl6x4755x8sz2igqfp3mr5n29q7hb4v5b1mycah9vffk1bhi0yf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring c10k directory filepath haskell98 hdaemonize
          hslogger network parsec time unix webserver
@@ -131525,6 +132266,7 @@ self: {
        sha256 = "1mfqpmvypr67f7kxlagbqydf45lji59zyvwmflyhwjmyc8kcf90g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async auto-update base blaze-builder byteorder bytestring
          case-insensitive conduit conduit-extra directory filepath http-date
@@ -131762,6 +132504,7 @@ self: {
        sha256 = "16s98hwskycl2bqv1n2bnivh8w8q3xhhj687hk8flcg9s9ny4s8k";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory mtl random ];
        homepage = "http://finder.homelinux.org/haskell/Mines";
        description = "Minesweeper simulation using neural networks";
@@ -131778,6 +132521,7 @@ self: {
        sha256 = "1cbw136wl9rdcl4vbbz9i5w1mw33qhr0gzbww0qf63zfz2lg4gs2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary binary-generic bytestring cairo containers directory
          filepath glade gtk random time
@@ -132176,6 +132920,7 @@ self: {
        sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal directory filepath knob random-fu semigroups
          text utf8-string vector
@@ -132306,6 +133051,7 @@ self: {
        sha256 = "1qzfmf92sx5vq5jxrqhln1a6y8kayrip36izf5m8hryymxd4dard";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
@@ -132787,6 +133533,7 @@ self: {
        sha256 = "1xkkkb1ili45icvlmz2r5i42qf1fib01ywqywgq4n53cyx1ncqa9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor directory
          explicit-exception filepath html HTTP network network-uri
@@ -132835,6 +133582,7 @@ self: {
        pname = "mollie-api-haskell";
        version = "0.2.0.0";
        sha256 = "1k2sx65d486dzb9xs2byi3p4ppacj2qjknhqx2kd0020zi7w9s5n";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-client http-client-openssl
          http-types mtl text time
@@ -133982,6 +134730,7 @@ self: {
        pname = "monadiccp";
        version = "0.7.6";
        sha256 = "083ppr53ac85r5ybndngsfwxgalj63giz32aa7wpcm629b9g4lxc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers mtl parsec pretty random
        ];
@@ -133999,6 +134748,7 @@ self: {
        pname = "monadiccp-gecode";
        version = "0.1.2";
        sha256 = "1ylyzklcb37khrq8a11fzlyd0sa1nrhpd7cv470m23v7l1hc1wg0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers monadiccp mtl ];
        librarySystemDepends = [
          gecodeint gecodekernel gecodesearch gecodeset gecodesupport
@@ -134437,6 +135187,7 @@ self: {
        pname = "monoid-owns";
        version = "2010.5.29";
        sha256 = "1n05f95yhn6jp7rdnlx686k1lsls4iilxdxnp41ds4afsypaclfk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/nfjinjing/monoid-owns";
        description = "a practical monoid implementation";
@@ -134712,6 +135463,7 @@ self: {
        sha256 = "064wgdk0yrrjh8b7xnpmhk541fwqh24pg7hq1rh28vf2fbv6blcy";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          pretty QuickCheck text utf8-string vector
@@ -134730,6 +135482,7 @@ self: {
        pname = "morfeusz";
        version = "0.4.2";
        sha256 = "1lzl5ks7px1xibfa6y0wnfv2mk2w39hscrrynqn7a3gjnca00sx0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers directory mtl text
        ];
@@ -134773,6 +135526,7 @@ self: {
        sha256 = "1a0s0hj09rhgixs09ay7fjk12d3wrlhm2w957md7pkan412vx200";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary containers deepseq Earley http-client
          http-client-tls microlens microlens-mtl pipes system-fileio
@@ -134873,6 +135627,7 @@ self: {
        editedCabalFile = "1cc85zdja69m16h32ii1jw1qkfz7jq3gp0m0m6pfaj146l8qcmwc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary bytestring ConfigFile daemons directory filepath glib
          gstreamer hgettext MissingH mtl network random setlocale text unix
@@ -135002,6 +135757,7 @@ self: {
        pname = "mps";
        version = "2010.11.28";
        sha256 = "1xhflvgwrjzj7qb69dn149lh32c7q9161zrzfs07ncs233y0w4lg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory filepath monoid-owns
          old-locale old-time parallel parsec regexpr template-haskell time
@@ -135023,6 +135779,7 @@ self: {
        sha256 = "1nmc03s8h3khmvajyhwaniczq0r4wrinq2sjjp1c6gyc2nggxzyx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory filepath gtk mtl process template-haskell unix
        ];
@@ -135575,6 +136332,7 @@ self: {
        sha256 = "1xqydvz8riz40d4q542akyxfhfq7hbhi306pcxdvbbpczyx8napp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Cabal containers directory extensible-exceptions filepath hint
          mtl process QuickCheck show simple-reflect unix
@@ -135835,6 +136593,7 @@ self: {
        pname = "multiplate";
        version = "0.0.3";
        sha256 = "1gsfmw7dzsxycixqqrh5wr1g3izn7rm2a4a20nh8pp6fgn21c01c";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://haskell.org/haskellwiki/Multiplate";
        description = "Lightweight generic library for mutually recursive data types";
@@ -135848,6 +136607,7 @@ self: {
        pname = "multiplate-simplified";
        version = "0.0.0.2";
        sha256 = "0xzjl3nsm6wgbqd6rjn0bf9jhiw6l6ql5gj5m8xqccv8363i5v2r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base multiplate transformers ];
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
@@ -135862,6 +136622,7 @@ self: {
        sha256 = "1y0v06qnpna8sa0aw24i4s29yc49m3a7d8yrl6xiv1jrgycjcafc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers fez-conf mtl process
        ];
@@ -135943,6 +136704,7 @@ self: {
        pname = "multisetrewrite";
        version = "0.6";
        sha256 = "1chgdikgp70rkzw2k3wy7i276j5vb435vq26yl37lkh0im1bg5ay";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm ];
        homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html";
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
@@ -136015,6 +136777,7 @@ self: {
        sha256 = "0s11xvhawwrcr31f0khp0q6fimwjps12n992z35ldnh0kk3dmk9z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-html ConfigFile directory Glob happstack-server
          HStringTemplate markdown MissingH process text
@@ -136158,6 +136921,7 @@ self: {
        pname = "music-diatonic";
        version = "0.1.2";
        sha256 = "0r4ha5hv0nvfp6r142fklfnqgf0vp77fxmj7z39690l7h1ckq634";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Implementation of basic western musical theory objects";
        license = stdenv.lib.licenses.bsd3;
@@ -136215,6 +136979,7 @@ self: {
        pname = "music-parts";
        version = "1.9.0";
        sha256 = "1kiz968kcwcyczxg5gl40c7bwgkn86l7qi0ak8p68bm4rmsw9id4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          adjunctions aeson base bytestring cassava containers data-default
          lens monadplus music-dynamics music-pitch roman-numerals semigroups
@@ -136379,6 +137144,7 @@ self: {
        sha256 = "10salrdl4vfdy3x26564i8kdv6lx8py697v5n8q9ywqsd05dcrv2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson amqp base ghc-prim mime-mail optparse-applicative text
        ];
@@ -136856,6 +137622,7 @@ self: {
        sha256 = "0lxzn8fn97f1j3fx97f46m16y25w7m1w84l59r75xisr662gc9lz";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring clientsession heist mtl mysnapsession snap
          snap-core snap-server text time
@@ -137071,6 +137838,7 @@ self: {
        sha256 = "1a7fqyn0pvnbxzn9fiaib4pj7hq5p2qgnbdwryg70lkgnjm4y0h4";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring ConfigFile data-default-class docopt
          fast-logger filepath http-types interpolatedstring-perl6 MissingH
@@ -137573,6 +138341,7 @@ self: {
        sha256 = "1bzccvp7g0z90jm7xd2vydjkha0960bv4s0p9w9vn7dgcc6mj63z";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring directory filepath process shelly text
        ];
@@ -137726,6 +138495,7 @@ self: {
        pname = "nbt";
        version = "0.6";
        sha256 = "0lcnxlj0cfrw840saay3lxyjmc00rxhksqa6ccyhg8119y20gcjd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base bytestring cereal text ];
        testHaskellDepends = [
          array base bytestring cereal HUnit QuickCheck test-framework
@@ -137866,6 +138636,7 @@ self: {
        sha256 = "00zll88gk44l22lqxv47v4j5ipfapy5599ld8fcsvhk57nfcm2r0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring cereal directory GLFW-b GLURaw OpenGLRaw
          random
@@ -137953,6 +138724,7 @@ self: {
        pname = "nemesis-titan";
        version = "2014.5.19";
        sha256 = "183m6wz52lrf5kfwxz11ad7v5zazv4gcf1c2rcylh2ys6zda4xmd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air air-th base bytestring directory filepath hspec HStringTemplate
          nemesis random uuid
@@ -138198,6 +138970,7 @@ self: {
        sha256 = "1dmaac0b22nycq4mar0grb2dzfff08rh9qk075h73r0an1vjh1d9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base base64-bytestring bytestring cryptonite
          data-default-class directory exceptions http-client http-client-tls
@@ -138501,6 +139274,7 @@ self: {
        sha256 = "16n03lpmvf715yi9kpf3nypllvipm58jq63lya619h45b2r8i5n9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory filepath GLFW-b GLUtil
          lens linear mtl netwire netwire-input netwire-input-glfw OpenGL
@@ -138578,6 +139352,7 @@ self: {
        pname = "network-anonymous-i2p";
        version = "0.10.0";
        sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring exceptions mtl network
          network-attoparsec network-simple text transformers uuid
@@ -138604,6 +139379,7 @@ self: {
        sha256 = "0jbm29795dznmrdkvl95v9xhj8pcmwgsdk2ngaj6zv5a9arybbj1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base base32string bytestring exceptions hexstring
          network network-attoparsec network-simple socks text transformers
@@ -138649,6 +139425,7 @@ self: {
        pname = "network-attoparsec";
        version = "0.12.2";
        sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring enclosed-exceptions exceptions
          lifted-base monad-control mtl network transformers
@@ -139691,6 +140468,7 @@ self: {
        pname = "newtype-th";
        version = "0.3.3";
        sha256 = "1slgphymjxzbxxgsilfijkhiwapfy2gkhkby2dxqj107v4s0788k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell-src-meta newtype syb template-haskell
        ];
@@ -140019,6 +140797,7 @@ self: {
        pname = "nix-eval";
        version = "0.3.3.0";
        sha256 = "1c8hg66s66hkn7f31ynw0km4bpdzhv0zdslzkpycvd36m3jm1wjb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hindent process strict ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "http://chriswarbo.net/git/nix-eval";
@@ -140056,6 +140835,7 @@ self: {
        sha256 = "1zjak2py3q59mafh68ds5b9yai425hylc7p0x9ccrhid0y3rpl5y";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson ansi-terminal base bytestring classy-prelude containers curl
          data-default data-fix directory hnix lifted-base MissingH
@@ -140331,6 +141111,7 @@ self: {
        pname = "nomyx-core";
        version = "1.0.0";
        sha256 = "0cdr4k2919a8bjmqm4agpiqp9jiijldwya28ql8bg345ypfh91d2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson base blaze-html blaze-markup bytestring
          DebugTraceHelpers deepseq directory either-unwrap exceptions
@@ -140356,6 +141137,7 @@ self: {
        pname = "nomyx-language";
        version = "1.0.0";
        sha256 = "1g9rg0h2nfyc4i1hvlmmnfchz3hhh0pax5x654yqkcdhqbsh04hk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean containers DebugTraceHelpers ghc imprevu lens
          monad-loops mtl old-locale random safe shortcut text time
@@ -140375,6 +141157,7 @@ self: {
        pname = "nomyx-library";
        version = "1.0.0";
        sha256 = "1sb47asxrqg510kgh9mxpkcmczwzcbzd90bm7nmbaas9cn1wxmql";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers ghc lens mtl nomyx-language old-locale safe
          shortcut time time-recurrence
@@ -140420,6 +141203,7 @@ self: {
        pname = "nomyx-web";
        version = "1.0.0";
        sha256 = "1nmckv3mv3zj14l7l3485lx8bw5g40psv8kn4ldg2grdsrf26z9q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state base blaze-html blaze-markup bytestring filepath
          happstack-authenticate happstack-server hscolour HTTP http-types
@@ -140731,6 +141515,7 @@ self: {
        sha256 = "1jjk3fhzhpf9wrgk980rgp55kji5zjzdl0xyi4wgz3xvn1k8hrhs";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder blaze-html
          blaze-markup bytestring case-insensitive conduit containers
@@ -140862,6 +141647,7 @@ self: {
        sha256 = "0gp7032dgchm3mwlzj66cpcdgndi0mj2l4xxq4k4ayflfpcwrg3a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers monad-loops mtl pretty z3
        ];
@@ -140934,6 +141720,7 @@ self: {
        pname = "null-canvas";
        version = "0.2.7";
        sha256 = "1i6krgxlbdmv5md1p3n5mcw3sk24f5sk6y7yiznx8glxncxmfdll";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers filepath scotty split stm text transformers
          wai-extra warp
@@ -141190,6 +141977,7 @@ self: {
        sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga";
        revision = "1";
        editedCabalFile = "0bh9zzya42dbpc5c7j7fnyphm5nndib1ycbmanplgx0b707x1sda";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base ];
        homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest";
        description = "Math and quantum mechanics";
@@ -141484,6 +142272,7 @@ self: {
        sha256 = "1nlnz7mvdkhcqp4v1fyfb6r6v18xpxi0ddqqp84dsqg6ahdypc13";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cairo containers glade glib gtk mtl parsec random
        ];
@@ -142099,6 +142888,7 @@ self: {
        sha256 = "0v11j2gz98g5ng9dsfbr7k3a2xhw2xqa1qi1q8ad53sx2yhjv0ly";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory filepath pretty time
        ];
@@ -142381,6 +143171,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye_0_5_3_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, case-insensitive, containers, contravariant, dotenv
+     , hspec, hspec-discover, multiset, postgresql-simple, pretty
+     , product-profunctors, profunctors, QuickCheck, semigroups, text
+     , time, time-locale-compat, transformers, uuid, void
+     }:
+     mkDerivation {
+       pname = "opaleye";
+       version = "0.5.3.1";
+       sha256 = "0hgkvvl3pn9bhiy21jxmcvvbzbsywpavwxcmvcwwnkkcdv679rvx";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring case-insensitive
+         contravariant postgresql-simple pretty product-profunctors
+         profunctors semigroups text time time-locale-compat transformers
+         uuid void
+       ];
+       testHaskellDepends = [
+         aeson base containers contravariant dotenv hspec hspec-discover
+         multiset postgresql-simple product-profunctors profunctors
+         QuickCheck semigroups text time transformers
+       ];
+       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
+       description = "An SQL-generating DSL targeting PostgreSQL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opaleye-classy" = callPackage
     ({ mkDerivation, base, bytestring, lens, mtl, opaleye
      , postgresql-simple, product-profunctors, transformers
@@ -142490,6 +143308,7 @@ self: {
        sha256 = "1k9d1r1z7q6lm8fha630rg2qfmwwnr9dv2ajvqwvrki2m6i9sczn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          HTTP mtl network old-time parsec pretty process syb texmath
@@ -143360,6 +144179,7 @@ self: {
        pname = "opml-conduit";
        version = "0.6.0.1";
        sha256 = "0mc3qymh6i8w79s6spm0dnndr7aydny6fy3krfxzfm6qch4nw3yb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base case-insensitive conduit conduit-combinators containers
          lens-simple mono-traversable monoid-subclasses safe-exceptions
@@ -143388,6 +144208,7 @@ self: {
        pname = "opml-conduit";
        version = "0.6.0.3";
        sha256 = "1flzv6v1mds7w9v3ap3g7gfwlvq54z0j1w7g2b07d17x334lyhgb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base case-insensitive conduit conduit-combinators containers
          lens-simple mono-traversable monoid-subclasses safe-exceptions
@@ -143756,6 +144577,7 @@ self: {
        pname = "orchid";
        version = "0.0.8";
        sha256 = "1d3cfhhsv1qpiiin4cs9wxx2a6vwcj0iad746z7l1qzyxrhg4dkm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers encoding extensible-exceptions fclabels
          filestore hscolour mtl nano-md5 parsec process QuickCheck salvia
@@ -143776,6 +144598,7 @@ self: {
        sha256 = "1gfjmakfx8244q1yqbgp2ji9bh45ll8ixvxbdd961my30j7gh29z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base extensible-exceptions mtl network orchid Pipe salvia
          salvia-extras stm
@@ -144179,6 +145002,7 @@ self: {
        pname = "osx-ar";
        version = "0.11";
        sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
        license = stdenv.lib.licenses.bsd3;
@@ -144392,6 +145216,7 @@ self: {
        pname = "packed-dawg";
        version = "0.2.0.8";
        sha256 = "1z6a75i0ma7cs8hsiqz9pqwycrw61ph4rvc1w6iczbjmmjgns13r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary deepseq mtl unordered-containers vector
          vector-binary-instances
@@ -144546,6 +145371,7 @@ self: {
        sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra directory process resourcet
          safe terminfo text transformers unix
@@ -144685,6 +145511,7 @@ self: {
        pname = "panda";
        version = "2009.4.1";
        sha256 = "0yn6ia1pql5fvj784a57ym74n5sd08n1g9djgapllw9lkf6r7hv7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cgi containers data-default directory filepath gravatar
          haskell98 hcheat kibro MissingH mps network old-locale old-time
@@ -144718,6 +145545,7 @@ self: {
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base base64-bytestring binary blaze-html blaze-markup
          bytestring cmark containers data-default deepseq directory
@@ -144762,6 +145590,7 @@ self: {
        editedCabalFile = "00cvvdiwpl8cw840smdfxbdnmmjf4m86nck344a797iv9rmvdq0j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
@@ -144796,6 +145625,7 @@ self: {
        sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
@@ -144847,6 +145677,7 @@ self: {
        sha256 = "14c4nbibx4qbi7pvycaf3q12hpj4s02wdg5pl23z2b4f8jz3pnfl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers data-accessor data-accessor-template
          data-accessor-transformers data-default directory filepath mtl
@@ -144872,6 +145703,7 @@ self: {
        sha256 = "12692c1lpp4pz08x1b9yxanpki5sxb5h9373vjp9af88rykqykl1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
        executableHaskellDepends = [ base csv pandoc pandoc-types ];
        homepage = "https://github.com/baig/pandoc-csv2table-filter";
@@ -144908,6 +145740,7 @@ self: {
        sha256 = "1hv8jw6aymlx6hvm1xq9ccsh2vi1y340xnhrysglpggvarim3dnd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory pandoc pandoc-types text
        ];
@@ -144982,6 +145815,7 @@ self: {
        sha256 = "0y8mz2jgnfzr8ib7w4bfwwdsljs3a2qpq3pxgvl2jwi7wdrcslai";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring explicit-exception http-conduit pandoc-types
          spreadsheet utf8-string
@@ -145098,6 +145932,7 @@ self: {
        sha256 = "0cnz4n2vywj4w9cnj7kh6jml6k29li9wnaifnwn69b6883043iwm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers IfElse mtl SDL SDL-gfx SDL-ttf
          transformers Yampa
@@ -145116,6 +145951,7 @@ self: {
        pname = "pango";
        version = "0.13.3.1";
        sha256 = "1frzcgqa1f1i3bk0q229vy8y6gsi423s8hfqvnr56h7ys8blysih";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base cairo containers directory glib mtl pretty process text
@@ -146481,6 +147317,7 @@ self: {
        pname = "passage";
        version = "0.1";
        sha256 = "11qrm27a1fn8p8z0q1400nd30sblm8pcn6znz4syg9jkmqhpn8ig";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers directory filepath GraphSCC monadLib
          mwc-random pretty primitive process random
@@ -146575,6 +147412,7 @@ self: {
        pname = "patch-combinators";
        version = "0.2.2";
        sha256 = "007bxr6xfqjmbx4b9k3n3qw7jmrn298v8cqxvycfhy5924l9jyi6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "A library for patching functions and data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -147077,6 +147915,7 @@ self: {
        pname = "pcf";
        version = "0.1.0.1";
        sha256 = "1dmp9afylsf4n7gxa23wn25w8h89lqyhjlxa5g7gshrbwxkx7c55";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bound c-dsl containers monad-gen mtl prelude-extras
          transformers void
@@ -147421,6 +148260,7 @@ self: {
        pname = "pdynload";
        version = "0.0.3";
        sha256 = "0949nzk85fp9vs6v90cd6kxgg52pcaz2mfahv7416qpgp65hpw93";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath ghc ghc-paths old-time process
        ];
@@ -147481,6 +148321,7 @@ self: {
        sha256 = "110i4y93gm6b76and12vra8nr5q2dz20dvgpbpdgic3sv2ds16k0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base Cabal cmdargs containers deepseq derive grm mtl shake
          syb uniplate wl-pprint
@@ -147500,6 +148341,7 @@ self: {
        pname = "pecoff";
        version = "0.11";
        sha256 = "0vb22jfl309k4a6b80015cyrs5cxls7vyf8faz7lrm7i0vj0vz1q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
        license = stdenv.lib.licenses.bsd3;
@@ -147573,6 +148415,7 @@ self: {
        pname = "pem";
        version = "0.2.2";
        sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring mtl ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -148549,6 +149392,7 @@ self: {
        sha256 = "12cwmjszbbqrd1f21jvwvp026ja3377c3p0wfrbrl34g23gnysgp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base process ];
        homepage = "http://www.cs.chalmers.se/~aarne/pesca/";
        description = "Proof Editor for Sequent Calculus";
@@ -148567,6 +149411,7 @@ self: {
        pname = "peyotls";
        version = "0.1.6.10";
        sha256 = "0x1qrh1nz3fr662701d8r7l23flwiv6az2wwcx48bp0vrk08lwww";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytable bytestring cipher-aes
          crypto-numbers crypto-pubkey crypto-pubkey-types crypto-random
@@ -148630,6 +149475,7 @@ self: {
        sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring HTTP ];
        executableHaskellDepends = [
          async base ini postgresql-simple random scotty text transformers
@@ -148662,6 +149508,7 @@ self: {
        sha256 = "0cfyjczs29qksh8kiyq256wv26yvw4ph7p0cvz5hnfjfjpj6r963";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          async base ini postgresql-simple random scotty text transformers
        ];
@@ -148934,6 +149781,7 @@ self: {
        sha256 = "0s2m9y7zb0219dz547z5d4plgrnaqvwzsbvm5cw7mv8dq043zdf3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal cmdargs conduit conduit-extra ConfigFile
          containers directory filepath gtk3 hslogger HStringTemplate
@@ -148973,6 +149821,7 @@ self: {
        pname = "phone-metadata";
        version = "0.0.1.5";
        sha256 = "0zn98kf23rn9ay9n4gd2v2jpafppz6r2kxk5m9na6xm437gx5xmb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hxt regex-pcre text ];
        testHaskellDepends = [ base hspec ];
        description = "Phonenumber Metadata - NOTE: this is now deprecated!";
@@ -149125,6 +149974,7 @@ self: {
        sha256 = "1w5krkss2qzzcqqmgqs369p5xnqyrm76vvsxd7mlhcdqaaj06n2q";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          AES base binary byteable bytestring containers cryptohash HTTP
          io-streams mtl network parsec RSA transformers
@@ -149170,6 +150020,7 @@ self: {
        sha256 = "0120zkza698ww8ng6svp54qywkrvn35pylvcgplfldw4ajln00vn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring clock deepseq text unix unordered-containers
        ];
@@ -149372,6 +150223,7 @@ self: {
        sha256 = "0rsc2anh20hlr2dfyh07dyrrfns0l1pibz6w129fp5l8m6h3xjin";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base mtl parsec text ];
        homepage = "http://www.mew.org/~kazu/proj/piki/";
        description = "Yet another text-to-html converter";
@@ -149466,6 +150318,7 @@ self: {
        sha256 = "1hmbhgnrq894jnm7gy6yc812nysvkrbjk6qqjmk7g7fsj46xpdfg";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring editor-open Hclip safe
        ];
@@ -149658,6 +150511,7 @@ self: {
        pname = "pipes-bzip";
        version = "0.2.0.4";
        sha256 = "12mhs3ylqqkp4dvir67lgwg3izma88j5xpi7fc7jlvlka24vbnkp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-DSL bytestring data-default mtl pipes pipes-safe
        ];
@@ -150572,6 +151426,7 @@ self: {
        sha256 = "1mz4cfhg8y7cv38ir2lzl7b2p1nfm8c4syvgzz4b9j98dxg694xz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers haskeline haskeline-class mpppc
          mtl parsec text utf8-string
@@ -150914,6 +151769,7 @@ self: {
        pname = "plist";
        version = "0.0.6";
        sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
@@ -151014,6 +151870,7 @@ self: {
        pname = "plot-gtk-ui";
        version = "0.3.0.2";
        sha256 = "1nhq0l687dhphnxkd0zh3z96551b91d7js625l4fyn40g5099s77";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
@@ -151045,6 +151902,7 @@ self: {
        sha256 = "1qa5mxq9j5m5zbvzsmrzg8jb9w9v8ik50c8w5ffddcrrqb9b8mcq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base colour gtk hmatrix plot text vector
        ];
@@ -151064,6 +151922,7 @@ self: {
        sha256 = "0zwp8n9xx1ljh65as4s6lqj4a3nrz3hfg53x8zcba96ic9jkadn0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-svg colour palette scientific text time
        ];
@@ -151272,6 +152131,7 @@ self: {
        pname = "pngload";
        version = "0.1";
        sha256 = "1j8zagi5xcb4spvq1r0wcnn211y2pryzf0r8z7h70ypqak7sy6ps";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring haskell98 mtl parsec zlib
        ];
@@ -151286,6 +152146,7 @@ self: {
        pname = "pngload-fixed";
        version = "1.0";
        sha256 = "02ikfn7kl8jx5iffa2pv0n1z1c75qcg9aq94nrccfdp532wxr7bx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
@@ -152083,6 +152944,7 @@ self: {
        pname = "pop3-client";
        version = "0.1.4";
        sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl network ];
        homepage = "https://github.com/tmrudick/haskell-pop3-client/";
        description = "POP3 Client Library";
@@ -152095,6 +152957,7 @@ self: {
        pname = "popenhs";
        version = "1.0.0";
        sha256 = "01pb8g5zl99zccnjnkwklfgaz1pqjp1xrgz5b3qy45nclyln0bm4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory haskell98 unix ];
        homepage = "http://www.haskell.org/~petersen/haskell/popenhs/";
        description = "popenhs is a popen-like library for Haskell";
@@ -152111,6 +152974,7 @@ self: {
        pname = "poppler";
        version = "0.14.1";
        sha256 = "1djx8qj68md11kdgcljd7mq3bidw6ynh9mwfxm9bj7kr2h57lmsv";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
@@ -152606,6 +153470,7 @@ self: {
        sha256 = "0kxg5z0s82ipcmynpxisq0a3rbhg630rk0xgyrqjcimxh7094n2y";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring bytestring-builder directory
          filepath ghc-prim mtl old-locale postgresql-simple process text
@@ -152663,6 +153528,7 @@ self: {
        sha256 = "1xhaqxc389dghf77hlz6zy6pa6phxv8by42lzs91ymjhvwhnb7bl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base basic-prelude postgresql-simple shelly text
        ];
@@ -153314,6 +154180,7 @@ self: {
        sha256 = "071arrk0wir2lwziw6p3cbq6ybjdf3gfc4d25sh21gpnk10ighp2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring data-default directory json mps
        ];
@@ -153930,6 +154797,7 @@ self: {
        sha256 = "1kbx72ybrpw0kh5zsd2kdw143qykbmd9lgmsvj57659y0k5l7fjm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base filepath ghc-prim haskell-lexer pretty
        ];
@@ -154242,6 +155110,7 @@ self: {
        sha256 = "0hh13i0idpwv509zavg92wwvp3s20vc1ivz7vfwa4kxp0h21phs9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile containers directory happstack happstack-helpers
          happstack-server happstack-state hsp MissingH mtl old-locale
@@ -154263,6 +155132,7 @@ self: {
        sha256 = "0j3xjlwvix81zxd38540jwb3vp438d72gmfxdhbypyi5f1qgx01x";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile directory HTTP mtl network parsec utf8-string XMPP
        ];
@@ -154431,6 +155301,7 @@ self: {
        pname = "probability";
        version = "0.2.5.1";
        sha256 = "0bgdyx562x91a3s79p293pz4qimwd2k35mfxap23ia6x6a5prrnk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers random transformers utility-ht
        ];
@@ -154834,6 +155705,7 @@ self: {
        sha256 = "104frg0czfk4rgjxyf0xz7100j3y9ndvf01jgv3yibaq98v2h64r";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers filepath haskell-src-exts semigroups uniplate zenc
        ];
@@ -154873,6 +155745,7 @@ self: {
        sha256 = "1swsy006axh06f1nwvfbvs3rsd1y1733n6b3xyncnc6vifnf7gz2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring containers filepath ghc-prof js-jquery
          scientific text unordered-containers vector
@@ -155364,8 +156237,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.5.2";
-       sha256 = "15bs8l7i7m4s0h3mb3cc1frq60s96qnfmmvb0blyvjk6ydsi5qrx";
+       version = "4.6.0";
+       sha256 = "1m5i9fbvckrrl26pirh776pfyg7a0ih42vrxqh6bsxyrfjqhzv11";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155722,6 +156595,7 @@ self: {
        pname = "protocol-buffers-descriptor";
        version = "2.4.2";
        sha256 = "0r7n1pnkabzksik9zrqif490g135hcjgvc40zm5c0b3dpq64r4lb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
        ];
@@ -155738,6 +156612,7 @@ self: {
        pname = "protocol-buffers-descriptor-fork";
        version = "2.0.16";
        sha256 = "1wn6yqs70n26j6z44yfmz4j4rwj2h1zfpysn56wzaq7bwsdb0bqb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers-fork
        ];
@@ -155806,6 +156681,7 @@ self: {
        pname = "proton-haskell";
        version = "0.7";
        sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers directory filepath ];
        testHaskellDepends = [
          base containers directory filepath HUnit test-framework
@@ -156041,6 +156917,7 @@ self: {
        sha256 = "1svyfvpqarmfy634s61l1pg7wc9y35bn753zq3vs1rvbw9lmxpj5";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring hedis optparse-generic pipes pipes-bytestring text
        ];
@@ -156187,6 +157064,7 @@ self: {
        sha256 = "0pqqcs3plrhq6474j29lnwvc6fhr1wskb0ph8x64gzv9ly52dc9i";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring containers directory MissingH
          random-fu safe text time vector
@@ -156233,6 +157111,7 @@ self: {
        sha256 = "0y1y2fbawbypzzrqdj66vh7f7xc6a9bb82bhdmrj5axmi6c5nn0h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers hashable hashtables HsSyck mtl old-time
          pretty random stm utf8-string
@@ -156252,6 +157131,7 @@ self: {
        pname = "pugs-HsSyck";
        version = "0.41";
        sha256 = "108dfhd83yzmlhbgff6j0a40r6vx9aq9dcdd8swk4yib9gbvsrp1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, lightweight YAML loader and dumper";
        license = "unknown";
@@ -156907,6 +157787,7 @@ self: {
        sha256 = "04sibf7rpr2dyxn943nbl8jzzy7zcf5ic0najgy1kmrl5n4v7p02";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers diagrams-lib diagrams-svg filepath hashable
          linear mtl optparse-applicative parsec SVGFonts text
@@ -157053,6 +157934,7 @@ self: {
        sha256 = "1q45l1grcja0mf1g90yxsdlr49gqrx27ycr6vln4hsqb5c0iqcfw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers mtl parsec ];
        homepage = "http://community.moertel.com/ss/space/PXSL";
        description = "Parsimonious XML Shorthand Language--to-XML compiler";
@@ -157167,6 +158049,7 @@ self: {
        pname = "qed";
        version = "0.0";
        sha256 = "1klsh6hvbvphhf3nr21856hqfcc4ysbrl6sz2z9rvvvpwbl24918";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base deepseq directory exceptions extra filepath haskell-src-exts
          transformers uniplate
@@ -157279,6 +158162,7 @@ self: {
        pname = "qrcode";
        version = "0.1.2";
        sha256 = "1wfnxlz6rqjcgnkaqq0wdn75jsh3b9hagb84c1ljnwqaw98n3a9d";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base containers mtl vector ];
        description = "QR Code library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -157510,6 +158394,7 @@ self: {
        sha256 = "16qk4m6jgf4phmc0zxw11as9rlvspxpqza5k318bra9f9ybn253y";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal ansigraph base bytestring directory
          http-conduit terminal-size text
@@ -157553,6 +158438,7 @@ self: {
        sha256 = "0zw15qym8r00m7kir9h9cys1rmszdqihfcvy6dw52f1pb6cp5vsx";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cmdargs cond containers directory iproute
          MissingH network safe scotty text transformers wai wai-extra
@@ -158427,6 +159313,7 @@ self: {
        sha256 = "1yha2rsphq2ar8c7p15dlg621d4ym46xgv70fga9mlq2r4zwy2lv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal async base bytestring containers directory dlist
          exceptions filepath hex mtl network network-simple parsec process
@@ -158638,6 +159525,7 @@ self: {
        sha256 = "0jjsa21a7f4hysbk9qvcxyyc2ncrmmjh02n7yyhjnfjgdp4sclwb";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers llvm-general llvm-general-pure mtl
        ];
@@ -158813,6 +159701,7 @@ self: {
        pname = "rallod";
        version = "0.0.1";
        sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://github.com/moonmaster9000/rallod";
        description = "'$' in reverse";
@@ -159944,6 +160833,7 @@ self: {
        sha256 = "0q7b990k3ijjjwhnm1283k9vzmvypyg7mhvbzagvi74q0sgwyac7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bio bytestring containers ];
        homepage = "http://malde.org/~ketil/";
        description = "Mask nucleotide (EST) sequences in Fasta format";
@@ -160145,6 +161035,7 @@ self: {
        pname = "react-haskell";
        version = "2.0.1";
        sha256 = "0kjbicrvriliy50gy82b7rsrfk5p3iv20wwnhiaq9i16mbh2zj8j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base deepseq lens-family monads-tf text transformers
          unordered-containers void
@@ -160322,6 +161213,7 @@ self: {
        sha256 = "1fb0bq7rcxsnga2hxh94h2rpp4kjh383z06qgk36m49pyvnbnl9a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using threepenny-gui";
@@ -160338,6 +161230,7 @@ self: {
        configureFlags = [ "-f-buildexamples" ];
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cabal-macosx reactive-banana wx wxcore
        ];
@@ -161407,6 +162300,7 @@ self: {
        pname = "reflection-without-remorse";
        version = "0.9.5";
        sha256 = "1iz4k42hc8f11a6kg2db847zmq5qpfiwns1448s62jswc2xm0x0r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base type-aligned ];
        homepage = "https://github.com/atzeus/reflection-without-remorse";
        description = "Efficient free and operational monads";
@@ -162105,6 +162999,7 @@ self: {
        sha256 = "0kcxsdn5lgmpfrkpkygr54jrnjqd93b12shb00n6j00rg7p755vx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers mtl regex-base regex-posix
        ];
@@ -162195,6 +163090,7 @@ self: {
        sha256 = "1b9cca3l46qxvc5ck3z27dg6w1888pabkk0q752bzjqr3fc4nidc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers mtl regex-base regex-tdfa
        ];
@@ -162291,6 +163187,7 @@ self: {
        sha256 = "0hjj4p44zhl4iazw8ivaxldvrghbdfqabkf8d6shb4mw4r0xdqbx";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers data-default parsec regex-base regexdot
          toolshed
@@ -162358,6 +163255,7 @@ self: {
        pname = "regexpr-symbolic";
        version = "0.5";
        sha256 = "1cpwvb5mmcaqwy617m6cr25pcb4v4yxwzxng82bcrwkhjfdklsdr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://sulzmann.blogspot.com/2008/12/equality-containment-and-intersection.html";
        description = "Regular expressions via symbolic manipulation";
@@ -162615,6 +163513,7 @@ self: {
        sha256 = "1bl4yv77i8c4w1y5lqr6b8xi1m4ym2phvdjwc9l95rx1vrxkqpk1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ghc ];
        executableHaskellDepends = [ base ghc ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
@@ -162929,6 +163828,7 @@ self: {
        editedCabalFile = "10d2p9pdplwhavfimsa893wzcps7fhfaxgcqwblrqm5xmybc3825";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base bytestring Cabal containers data-default directory
          filepath ghcid http-types mime-types process scotty text
@@ -163721,6 +164621,7 @@ self: {
        sha256 = "1g7b431hq6cqmckq3hlnf56qn1a9zbpid19c7vw6vh0y5xi5ckp6";
        revision = "3";
        editedCabalFile = "1lqspa275mq04chvz6pvjkrlxkd9gscaxy2rcsj5wy0123x1azxp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
@@ -163748,6 +164649,7 @@ self: {
        pname = "req";
        version = "0.3.1";
        sha256 = "0qg2773h247ahicz1051zrpc6aqf6zdqyrlp8q274l3qg5q1l03a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
@@ -164214,6 +165116,7 @@ self: {
        sha256 = "0hnmd37c6n61gkqi3assspkmh15q93id7yaq30vp65zr6rhliac1";
        revision = "8";
        editedCabalFile = "1x18sva575kcg9gg4brf17zbvvkzs0qi2rgkab5ijr4pnmhpwc62";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -164644,6 +165547,7 @@ self: {
        pname = "rex";
        version = "0.5.2";
        sha256 = "0xliw2glqyfr9cvi50rvb0frhmp3ysri9glx3c8x96rkf0xg27kf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers haskell-src-exts haskell-src-meta
          pcre-light template-haskell
@@ -164663,6 +165567,7 @@ self: {
        sha256 = "122hca6whzxqk3x7207k4clrrl2awy96pafq0gjwddqicny41jza";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers datetime HTTP json mtl nano-md5 xhtml
        ];
@@ -164731,6 +165636,7 @@ self: {
        sha256 = "08ddm1pxi7qdjz2mgvjvwdgxyskvac4ahi3jp2fd8z1sh68c7x7s";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base call containers lens mtl objective split
        ];
@@ -164813,6 +165719,7 @@ self: {
        pname = "ridley";
        version = "0.3.1.2";
        sha256 = "15hc1j0bkdb0wbivxl73rgrk4hl598d96yv0fhpsgls74alarniq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          async base containers ekg-core ekg-prometheus-adapter inline-c
          katip microlens microlens-th mtl process prometheus raw-strings-qq
@@ -165987,6 +166894,7 @@ self: {
        sha256 = "0x40j5rk8v61wzhcj730g75a97ikki7j22dfrh4z873b6mxwfh4k";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          appar base blaze-builder bytestring c10k containers dns domain-auth
          hslogger iproute parsec unix
@@ -166557,6 +167465,7 @@ self: {
        sha256 = "1ildbmnpdh8x25m6kjdc6506cjgngjmjhvrdfkrcwg5cdqcqs266";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base binary bytestring parsec ];
        testHaskellDepends = [
          base binary bytestring parsec QuickCheck test-framework
@@ -166751,6 +167660,7 @@ self: {
        pname = "safe-length";
        version = "0.1.0.0";
        sha256 = "0yc9q5p7w955ywglvz6mhbpgqd3d39j91v994y3k25xrlbj5a494";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec hspec-core QuickCheck should-not-typecheck
@@ -167092,6 +168002,7 @@ self: {
        sha256 = "0sfvx7hj0z2g57gs6l1s078z3a34hfgm4pfcb1qr1pvbc8lj3f1h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base c10k fclabels filestore monads-fd network salvia salvia-extras
          salvia-protocol salvia-sessions salvia-websocket stm threadmanager
@@ -167632,6 +168543,7 @@ self: {
        sha256 = "0zlf683rgpn8dcm1wrwy01s2i35px0rlhprw713jl5kic2wp3p4j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base base-compat containers crackNum
          data-binary-ieee754 deepseq directory filepath ghc mtl old-time
@@ -167659,6 +168571,7 @@ self: {
        pname = "sbv";
        version = "7.0";
        sha256 = "1jqgzqhmcx015ja8nwpswq6akw9vrabmhhf709vfirgd9q8pgnjc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
          directory filepath generic-deriving ghc mtl pretty process
@@ -167702,6 +168615,7 @@ self: {
        pname = "sc3-rdu";
        version = "0.15";
        sha256 = "0zrd9w3s535b2dpnmmrfg4i6jd9f4nh338x1cbggcw3pjyv8gk30";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
        homepage = "http://rd.slavepianos.org/t/sc3-rdu";
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
@@ -167873,6 +168787,7 @@ self: {
        sha256 = "0dh23v8kx2qnf392afznv3iixvwr4220my9nnlxgz1mhn77d51ln";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal base bytestring mtl optparse-applicative scrypt
          vector
@@ -168059,6 +168974,7 @@ self: {
        editedCabalFile = "0ddlmg6f7y70f1yi351q1d46mgxzs8h53969jmhdhj6al860grxv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring binary blaze-html blaze-markup
          bytestring containers data-default directory extensible-exceptions
@@ -168099,6 +169015,7 @@ self: {
        editedCabalFile = "065ij08gi9ymyqqa7lmj5d57zqk4rax72kzhm2qbvn00h3g6d81k";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hs-bibutils mtl old-locale parsec rfc5051 scholdoc scholdoc-types
@@ -168246,6 +169163,7 @@ self: {
        sha256 = "1ihq538ym6hh099p0h9p1ngjsq3a9h9k5ssnwyr4bqhlmv8xam0i";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths ghc-syb
          hslogger json multiset time uniplate
@@ -168339,6 +169257,7 @@ self: {
        sha256 = "0dhpyf0kh6qrrcyr3iwp3i3rkj5vcl7k7aa9qmxq2qq1f6dhw4p6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo gtk MonadCatchIO-transformers mtl old-locale scope time
          zoom-cache
@@ -168613,6 +169532,7 @@ self: {
        editedCabalFile = "0aasfcbs8cc729xvwnk8hgskv2sxg6c928gf8jifadgwgsqwahfr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base scotty text transformers ];
        executableHaskellDepends = [ base scotty text transformers ];
        license = stdenv.lib.licenses.mit;
@@ -168652,6 +169572,7 @@ self: {
        sha256 = "035jpwp58l70jd0dklx5rg0sm8b2bd5r1m726dbhhlv60w6bdfn3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary containers deepseq directory mtl packed-dawg
          parallel split
@@ -168788,6 +169709,7 @@ self: {
        sha256 = "0c4djdr2lq6kbi726zmjicscsc2ksj4l787pzyj5lfbl9c11fb6j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base cmdargs containers directory filepath json mtl parsec
          pretty process safe tagsoup time uniplate utf8-string
@@ -168845,6 +169767,7 @@ self: {
        sha256 = "1164g29vb77kn5xdl71fsv95kf1h59gq8jhszyj3jrckv3x86fjs";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring exceptions linear StateVar text transformers vector
        ];
@@ -168858,8 +169781,8 @@ self: {
     ({ mkDerivation, base, cairo, linear, mtl, random, sdl2, time }:
      mkDerivation {
        pname = "sdl2-cairo";
-       version = "0.1.0.2";
-       sha256 = "11jaf13wklxbd5ndbwpbimnjwgf8k4wd7dbc979ng4j3qb0asdp5";
+       version = "0.1.0.3";
+       sha256 = "1lw5d8hk97h26sxq1bq0ha56s1pi0zsyw60di41w92a4xrx8z2nf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
@@ -169194,6 +170117,7 @@ self: {
        sha256 = "0qrb2g7dfhh2m3hwp39xlimbc3kinww279a58pah738gqnhmayrs";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        homepage = "http://github.com/pgavin/secdh";
@@ -170099,6 +171023,7 @@ self: {
        pname = "sequence";
        version = "0.9.8";
        sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers transformers ];
        homepage = "https://github.com/atzeus/sequence";
        description = "A type class for sequences and various sequence data structures";
@@ -170145,6 +171070,7 @@ self: {
        sha256 = "1dcinp03kbj94kw1lkkyz0gh4k7nw96l9c9782v0sdq0v5i525j9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers mtl nlp-scores pretty split
          text vector
@@ -172664,6 +173590,7 @@ self: {
        sha256 = "19blk6nzbsm9syx45zzlmqxq1mi2prv0jq12cf83b4kf4pvwk32n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers dlist ghc-prim mtl vector
        ];
@@ -172927,6 +173854,7 @@ self: {
        sha256 = "0z43hlgzklynb0y9b6bz2qmr2590v5nfp241i8b3rq7flb5lhlmp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson async base binary bytestring conduit-combinators
          conduit-extra containers cryptohash HsOpenSSL iproute network
@@ -172991,6 +173919,7 @@ self: {
        sha256 = "1fxi4vl6fffq0h84rxd9cqik58mj8jk7gmspm9vkjmp97j1hslh5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring deepseq directory extra filepath hashable
          js-flot js-jquery process random time transformers unix
@@ -173287,6 +174216,7 @@ self: {
        pname = "shana";
        version = "2009.12.1";
        sha256 = "0fg16nbi0r0pdd3sfabzdz1f4595x3hz3b4pxfwy8l78p8lppv0y";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory regex-posix ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "treat haskell functions as unix pipes";
@@ -173528,6 +174458,7 @@ self: {
        sha256 = "0xyarxm2hs8yypmz8w4zbnjvv5xl9dd657j7j3a82gbghsb93vyy";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        homepage = "http://gnu.rtin.bz/directory/devel/prog/other/shell-haskell.html";
@@ -173948,6 +174879,7 @@ self: {
        sha256 = "1gpjb8lw5zmnsd8ic739j91iqsv9a707nd9j5mbnhq6gilk61nrh";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base glade gtk random ];
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
@@ -174108,6 +175040,7 @@ self: {
        sha256 = "1m0f5n2dz02mvd2hlsv3gdq8y4xqba7dmyqn2x123sbvm9yvj584";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers directory fgl filepath glib gtk hxt mtl
          parsec process text unix
@@ -174130,6 +175063,7 @@ self: {
        pname = "sifflet-lib";
        version = "2.2.1";
        sha256 = "1snaq0vlsk4r2lbg2sk389ppwnz22mqwhf1lgwjh3cg91ab905n4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers directory fgl filepath glib gtk hxt mtl
          parsec process unix
@@ -174286,6 +175220,7 @@ self: {
        sha256 = "05069qjgzm4j22p0q6i75qpsvzpw52b7bh2x2b6jcxnlvqp6flzg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring directory
          filepath http-types mime-types monad-control mtl simple-templates
@@ -175057,6 +175992,7 @@ self: {
        pname = "simpleargs";
        version = "0.2.1";
        sha256 = "1grjjpb3397wnr6sd0bn679k9pfg1zlm61350zd2gj5yq6pshl6p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/simpleargs";
        description = "Provides a more flexible getArgs function with better error reporting";
@@ -175222,6 +176158,7 @@ self: {
        sha256 = "0i60ksi5xc0d0rg5xzhbdjv2f3b5jr6rl9khn9i2b1n9sh1lv36m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bio bytestring random ];
        homepage = "http://malde.org/~ketil/";
        description = "Simulate sequencing with different models for priming and errors";
@@ -175379,6 +176316,7 @@ self: {
        sha256 = "1wq5dan30ggjgmravy92ylqjvjv1q7mxrmddr7zc8h6aqr0wx0fg";
        revision = "1";
        editedCabalFile = "1q2dy0ywngm9iv7k6d9gnf860m9hpf62q5qvdzmxw5s629gk4afn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cpu ];
        testHaskellDepends = [
          base bytestring QuickCheck test-framework
@@ -176341,6 +177279,7 @@ self: {
        sha256 = "0dxw4jgmwcz92n2rymdrfaz1v8lc2wknql9ca5p98jc14l8c2bl3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base haskell98 pretty unix utf8-string
        ];
@@ -176400,6 +177339,7 @@ self: {
        pname = "smoothie";
        version = "0.4.2.7";
        sha256 = "1cnyckmwqj0caw2vcbmvzha8hs1207pq11mlmwpk2w6qccs1qml4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base linear text vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
@@ -176858,6 +177798,7 @@ self: {
        sha256 = "15744qmp48qn67n8w2nxxqxfh5rjlg328psl58whb8q5m6grgv3n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
@@ -177071,6 +178012,7 @@ self: {
        pname = "snap-utils";
        version = "0.1.2";
        sha256 = "1kr09fj1jfs6sfmca51k0gwn4acya70s9irzay9yf5b9yyvka391";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring heist http-types MonadCatchIO-transformers mtl snap
          snap-core text xmlhtml
@@ -177125,6 +178067,7 @@ self: {
        pname = "snaplet-actionlog";
        version = "0.2.0.1";
        sha256 = "177a1b9fvlqh59hd9b5y92lq8yxv14jh79aadkyhxb4i0l5rl9vv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-builder bytestring digestive-functors
          digestive-functors-heist digestive-functors-snap errors heist
@@ -177146,6 +178089,7 @@ self: {
        pname = "snaplet-amqp";
        version = "1.1.0.0";
        sha256 = "01qw28paifysk402lpb7y8dyhf401ls1l0dcn6fiigvczwxzmk91";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          amqp base bytestring configurator lens monad-control mtl network
          resource-pool snap transformers
@@ -177185,6 +178129,7 @@ self: {
        pname = "snaplet-coffee";
        version = "0.1.0.2";
        sha256 = "1kxxnk8m9154sallhy3rf8nmz0qkvchh8m761jgzhfbnnwlznpnf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator directory filepath haskell-coffee mtl
          snap snap-core
@@ -177240,6 +178185,7 @@ self: {
        sha256 = "01s2mj5vml5k9q0x291snhzhdpilb37ksvhavxjf0fz0j3na7acp";
        revision = "1";
        editedCabalFile = "06c6psa499aiz4nqwps1q6nw6imgkbcn0vird2b20kzi79lj7wsq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -177275,6 +178221,7 @@ self: {
        pname = "snaplet-hasql";
        version = "1.0.2";
        sha256 = "08gx096vg0swjc7z10nzlqsnjlr43cp190q4krkf08jb54ln3kcv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring clientsession configurator hasql
          hasql-backend lens mtl snap text time
@@ -177332,6 +178279,7 @@ self: {
        pname = "snaplet-hslogger";
        version = "1.0.0.2";
        sha256 = "15cvpiz3p1qhb80sgz61mabvkb8h6j713jrny6mbg6qj945jbb0x";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base configurator hslogger mtl snap transformers
        ];
@@ -177375,6 +178323,7 @@ self: {
        pname = "snaplet-influxdb";
        version = "1.0.1.1";
        sha256 = "1dv800rclzl0b251bixksfl7jf28z82ql7nikf5dvginfpm71j7j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator http-client influxdb lens
          monad-control mtl network snap text transformers
@@ -177410,6 +178359,7 @@ self: {
        pname = "snaplet-mandrill";
        version = "0.1.0.3";
        sha256 = "0yyb0qbd14v6xw5vix08pv40w9l8p2vwvmh67sa9b4q9wkvwv962";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base configurator mandrill mtl network snap transformers
        ];
@@ -177465,6 +178415,7 @@ self: {
        pname = "snaplet-mysql-simple";
        version = "0.2.2.0";
        sha256 = "0n2hjchcr3hh7hb5cpz2ahsffsyhiavp3gizr19pjwslgmq484a3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring clientsession configurator containers errors lens
          MonadCatchIO-transformers mtl mysql mysql-simple
@@ -177514,6 +178465,7 @@ self: {
        pname = "snaplet-persistent";
        version = "0.5";
        sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring clientsession configurator errors heist lens
          monad-logger MonadCatchIO-transformers mtl persistent
@@ -177536,6 +178488,7 @@ self: {
        pname = "snaplet-postgresql-simple";
        version = "1.0.2.0";
        sha256 = "1agykln1mr08bh5yp8xf5nhjirbvwc9kgl4k3rkl700hfjhdpbb7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring clientsession configurator lens lifted-base
          monad-control mtl postgresql-simple resource-pool snap text
@@ -177555,6 +178508,7 @@ self: {
        pname = "snaplet-postmark";
        version = "0.2.0";
        sha256 = "0006i88ssgh6z9g967wlw0km8abxmxdjjs7aalsddzla6xdp8wnx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base configurator mtl postmark snap text transformers
        ];
@@ -177684,6 +178638,7 @@ self: {
        pname = "snaplet-sass";
        version = "0.1.2.0";
        sha256 = "1aiznsi54lxzwxnilckspvp6rdfmksxppa3964kqxh93a9gvkr9z";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator directory filepath mtl process snap
          snap-core transformers
@@ -177760,6 +178715,7 @@ self: {
        sha256 = "1mv0sfz2dqhl82wbsb11c5brw3jadh9sliinlj3xb5m7n42z84id";
        revision = "1";
        editedCabalFile = "0gj934nif3h3695ckwi457zjih2zfmbjsbsh884v3dp4qlfz6jcw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring clientsession configurator direct-sqlite lens
          lifted-base monad-control mtl snap sqlite-simple text transformers
@@ -177807,6 +178763,7 @@ self: {
        pname = "snaplet-stripe";
        version = "0.3.0";
        sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator heist lens-family-core mtl snap stripe
          text text-format transformers xmlhtml
@@ -178085,6 +179042,7 @@ self: {
        pname = "snow-white";
        version = "2009.12.1";
        sha256 = "007hzr8dpj0mhvmnpdg0gi296q3mlicnx36s6hmgifzmyaa8kssi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring mps ];
        homepage = "http://github.com/nfjinjing/snow-white";
        description = "encode any binary instance to white space";
@@ -178499,6 +179457,7 @@ self: {
        pname = "soegtk";
        version = "0.12.1";
        sha256 = "01f49hwxc5h85iwzgnddxlh1lmb3s27zddmghxrlq958gcrr2iar";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
@@ -178636,6 +179595,7 @@ self: {
        pname = "sort-by-pinyin";
        version = "2014.5.19";
        sha256 = "1ksfx5zhagg2y8virg8am1w8ljrzc9ddmf7xgvi5gx88zibi32fd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air air-extra air-th base bytestring containers text
        ];
@@ -178746,6 +179706,7 @@ self: {
        sha256 = "1934awipc837mdhkfa3ghmljxk0vb16wd4f31qdl4q9nxgwfv6c8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers curl data-default directory filepath
          hack hack-contrib hack-handler-happstack haskell98 HDBC
@@ -178980,6 +179941,7 @@ self: {
        sha256 = "1bygwg1kadfhlphlsh8r05lxsdb5lzz3z37lny2zd00llmc4i33p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring choice distributed-closure jni jvm
          jvm-streaming singletons streaming text vector
@@ -179004,6 +179966,7 @@ self: {
        sha256 = "0cyihfhxry3jrwyqrki14s6nw652w39m32ramg0nf1c85ahmhd3b";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring choice distributed-closure jni jvm
          jvm-streaming singletons streaming text vector
@@ -179073,6 +180036,7 @@ self: {
        pname = "sparse-linear-algebra";
        version = "0.2.9.7";
        sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers exceptions mtl transformers vector
          vector-algorithms vector-space
@@ -179133,6 +180097,7 @@ self: {
        pname = "spata";
        version = "2010.10.10";
        sha256 = "1cr0d82l2b96jvszca4yavdgwq450yzigcyrrlddrf9m9908kkzy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base dlist mps mtl ];
        homepage = "http://github.com/nfjinjing/spata";
        description = "brainless form validation";
@@ -179336,6 +180301,7 @@ self: {
        sha256 = "0n0b2lbvj3pjg841pdw7pb09cpkz2d186dd4pmabjnm6r6wabm2n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base edit-distance phonetic-code sqlite
        ];
@@ -179859,6 +180825,7 @@ self: {
        sha256 = "027vn7xqk7r15130hc6xikg2hyliqmg14y7n3wrrqaxvd4saa6qn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          data-default docopt entropy http-conduit http-kit http-types
@@ -179882,6 +180849,7 @@ self: {
        sha256 = "0jvkvk5yqp4gibg61q67iczaqvfszikxvvgf04fg6xs23gjkpihp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring data-default-class
          directory docopt fast-logger filepath http-types
@@ -180380,6 +181348,7 @@ self: {
        sha256 = "1zhhqam6y5ckh6i145mr0irm17dmlam2k730rpqiyw4mwgmcp4qa";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base iproute text ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -180422,6 +181391,7 @@ self: {
        sha256 = "0794vsv043ppydzyjxnh06m4l3gbnga7x8nwsamh8skrzjfwn6jq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers curl directory hdaemonize hslogger mtl process
          regex-compat stm unix
@@ -180591,6 +181561,7 @@ self: {
        sha256 = "0vmqfs956cziwb3q2v4nzn4b9d87062z9pixwfr7iiwd0ypmmiv6";
        revision = "2";
        editedCabalFile = "1bwdg0y98bw8p1857isjcg3f51d0nv52zbfc0s6f9syq70ahbhz9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -181235,6 +182206,7 @@ self: {
        sha256 = "0rdkxyhy62h87vdq08znqpjhg4wriwvbmn0pwak9nqsd5xk6slka";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring directory EdisonCore FTGL haskell98 mtl OpenGL
          random SDL
@@ -182212,6 +183184,7 @@ self: {
        pname = "stmcontrol";
        version = "0.1";
        sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 mtl stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html";
        description = "Control communication among retrying transactions";
@@ -183414,6 +184387,7 @@ self: {
        pname = "string-qq";
        version = "0.0.2";
        sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.publicDomain;
@@ -183425,6 +184399,7 @@ self: {
        pname = "string-quote";
        version = "0.0.1";
        sha256 = "1pfkd3lwdphvl00gly7zbpvsmlw6b2d5568rxyqmq2qw6vzf9134";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -183795,6 +184770,7 @@ self: {
        sha256 = "1d1qv9d8qifcxbxqb6a6j0fsi65lg8sndn7hn2s38hgnxdb7llf5";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base descriptive ghc-prim haskell-src-exts text
        ];
@@ -183905,6 +184881,7 @@ self: {
        sha256 = "075rbdhlrz88qkwx54jrmb4h4jq8q5wk4ncb858llaswcbsfgl8w";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary bullet bytestring containers directory elerea GLFW-b
          lambdacube-bullet lambdacube-engine mtl random vector
@@ -183954,6 +184931,7 @@ self: {
        sha256 = "1g011ip26yn9ixsa5bzb8gnjj58www2p0d8b7fj9b2brwqx682jp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath
          haskell-src-exts mtl syb yaml
@@ -183983,6 +184961,7 @@ self: {
        sha256 = "08qzplmzpnfyl8zaskimx91xij723mim11k552a7yl3p0i0cfmw7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath
          haskell-src-exts mtl syb yaml
@@ -184345,6 +185324,7 @@ self: {
        sha256 = "0bcxai3gq1akbcxqkkj0n52a43zqcnw865bnngy9b4z26b43kj5k";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base Boolean containers data-default directory filepath parallel-io
          process QuickCheck random semigroups shake stm sunroof-compiler
@@ -184699,6 +185679,7 @@ self: {
        pname = "svgcairo";
        version = "0.13.1.1";
        sha256 = "0kx5qc2snrpml2figrq1f74fzj81zbibv1x9dp8z2kh8z6n659nd";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base cairo glib mtl text ];
        libraryPkgconfigDepends = [ librsvg ];
@@ -184913,6 +185894,7 @@ self: {
        sha256 = "173qvx46als9ar63j6hqynnwnkvs12pb2qv3gbfjm8mla5i7sjym";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath hashable intern mtl network-uri
          old-locale polyparse semigroups text time
@@ -186326,6 +187308,7 @@ self: {
        pname = "tablestorage";
        version = "0.2.1.0";
        sha256 = "03j8cqq85i9wikw772swazbvyv1dcw0mnhmqq3slydl0axi12yr8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit crypto-api cryptohash
          HTTP http-conduit http-types mtl network old-locale resourcet SHA
@@ -186401,6 +187384,7 @@ self: {
        sha256 = "1xfaw32yq17a6wm6gzvpdnpabxfnskwbs541h1kk1lvrkm31h2b2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers dbus dyre enclosed-exceptions filepath gtk
          gtk-traymanager HStringTemplate HTTP mtl network network-uri
@@ -186458,6 +187442,7 @@ self: {
        sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
          non-empty transformers utility-ht xml-basic
@@ -186621,6 +187606,7 @@ self: {
        editedCabalFile = "02xmvs9m977szhf5cgy31rbadi662g194giq3djzvsd41c1sshq3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup text unordered-containers
          vector
@@ -186841,6 +187827,7 @@ self: {
        pname = "tai64";
        version = "0.2.0";
        sha256 = "0pk8qfla4iv8yryfxpz5nf2ijhdg7svbcikg3pik2psir6igj3sw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base base16-bytestring binary bytestring QuickCheck text
          time vector
@@ -186919,6 +187906,7 @@ self: {
        pname = "takahashi";
        version = "0.2.2.0";
        sha256 = "0flr87m1yjxcv1r64bvrx1gm9dpp6xvj2lj14pi99pipywgw4kgs";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
@@ -186977,6 +187965,7 @@ self: {
        sha256 = "1x2d3vlwwssdj0jhnvrm1h0qaajxyns25b9azhf9k8q8xqxi7r32";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson array base binary blaze-builder blaze-html bytestring cmdargs
          conduit containers deepseq derive directory dlist fclabels filepath
@@ -187528,6 +188517,7 @@ self: {
        pname = "tasty-html";
        version = "0.4.1.1";
        sha256 = "06hzb4y98aqmcn3zl6mr1gwmkkl73phqc4419fwsxwqyrygirshf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath generic-deriving mtl
          stm tagged tasty text transformers
@@ -187965,6 +188955,7 @@ self: {
        pname = "tcp-streams";
        version = "0.6.0.0";
        sha256 = "1g0g9r62gklsn99ncqkyxlk8qwmxd7iyhshq03k7ghdlsj9linfg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default-class io-streams network pem tls x509
          x509-store x509-system
@@ -187988,6 +188979,7 @@ self: {
        pname = "tcp-streams";
        version = "1.0.1.0";
        sha256 = "0qa8dvlxg6r7f6qxq46xj1fq5ksbvznjqs624v57ay2nvgji5n3p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default-class io-streams network pem tls x509
          x509-store x509-system
@@ -188217,6 +189209,7 @@ self: {
        pname = "telegram-api";
        version = "0.6.3.0";
        sha256 = "0fp8ryh9pdpfycyknd9d1r9z1v0p06r87nf19x7azv4i1yl5msia";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-client http-media
          http-types mime-types mtl servant servant-client string-conversions
@@ -188625,6 +189618,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "temporary_1_2_1_1" = callPackage
+    ({ mkDerivation, base, base-compat, directory, exceptions, filepath
+     , tasty, tasty-hunit, transformers, unix
+     }:
+     mkDerivation {
+       pname = "temporary";
+       version = "1.2.1.1";
+       sha256 = "1wq0rc71mp0lw7pkpcbhglf636ni46xnlpsmx6yz8acmwmqj8xsm";
+       libraryHaskellDepends = [
+         base directory exceptions filepath transformers unix
+       ];
+       testHaskellDepends = [
+         base base-compat directory filepath tasty tasty-hunit unix
+       ];
+       homepage = "https://github.com/feuerbach/temporary";
+       description = "Portable temporary file and directory support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "temporary-rc" = callPackage
     ({ mkDerivation, base, directory, exceptions, filepath
      , transformers, unix
@@ -188671,6 +189684,7 @@ self: {
        sha256 = "0hv5b09vly9zakjfgi4bnjx503ny334dhg13g5ma85rp3dbsjvsn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base directory executable-path filepath haskeline mtl
          uniplate utf8-string
@@ -189091,6 +190105,7 @@ self: {
        sha256 = "10bq2b3nhnpy566i1gbf8iz10nq0z0x4xdi4kr5nlbzrih86ih4n";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers mtl process syb transformers
        ];
@@ -189599,6 +190614,7 @@ self: {
        sha256 = "0a0kw5546z5jydk6dq2p16p2kpwv7fnmy1m907m3x6n580i1vh3l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base filepath gtk ];
        homepage = "http://code.haskell.org/~dons/code/testpattern";
        description = "Display a monitor test pattern";
@@ -189629,6 +190645,7 @@ self: {
        sha256 = "10wlw1frkaa3j8mb8lxgpvxcx87m8wdpca3mli9c5kirdm51vjgw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base GLUT random ];
        homepage = "http://d.hatena.ne.jp/mokehehe/20080921/tetris";
        description = "A 2-D clone of Tetris";
@@ -189941,6 +190958,7 @@ self: {
        pname = "text-icu-normalized";
        version = "0.4.1";
        sha256 = "0nwma8yvfkmy0zzl3kb9xwmpp3z74aj33mdp7kr036baqvxini04";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring lens text text-icu
        ];
@@ -190107,6 +191125,7 @@ self: {
        pname = "text-markup";
        version = "0.1";
        sha256 = "1nn0h61cvaydawrc4d0bizyqnssbhmgvsb0s59fvxcwk9zlw10xh";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [
          base QuickCheck quickcheck-text tasty tasty-quickcheck text
@@ -190587,6 +191606,7 @@ self: {
        pname = "text-zipper";
        version = "0.10";
        sha256 = "0vhp707irmyqdix4clnjphnly8zyph4brpjb41n05rxlaybn96n5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base deepseq text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        homepage = "https://github.com/jtdaugherty/text-zipper/";
@@ -191103,6 +192123,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-orphans_0_13_4" = callPackage
+    ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift
+     , th-lift-instances, th-reify-many
+     }:
+     mkDerivation {
+       pname = "th-orphans";
+       version = "0.13.4";
+       sha256 = "0cab6hmyii42p157jhm0sd5jzdlxms4ip2ncrmcmc47dl3pxk5gk";
+       libraryHaskellDepends = [
+         base mtl template-haskell th-lift th-lift-instances th-reify-many
+       ];
+       testHaskellDepends = [ base hspec template-haskell ];
+       description = "Orphan instances for TH datatypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-printf" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit
      , QuickCheck, template-haskell, text, transformers
@@ -191151,6 +192188,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-reify-many_0_1_8" = callPackage
+    ({ mkDerivation, base, containers, mtl, safe, template-haskell
+     , th-expand-syns
+     }:
+     mkDerivation {
+       pname = "th-reify-many";
+       version = "0.1.8";
+       sha256 = "0hzy6hvhvcd6i60vx5cp2b7ggmnnjh9rx4h8bm8xw4grglcaxjnf";
+       libraryHaskellDepends = [
+         base containers mtl safe template-haskell th-expand-syns
+       ];
+       testHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/mgsloan/th-reify-many";
+       description = "Recurseively reify template haskell datatype info";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-sccs" = callPackage
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
@@ -191423,6 +192478,7 @@ self: {
        sha256 = "0ir8z7al3fxjwq5nb05l136k7vp82ag6khcyf9bvjcymlra4cs0m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base pretty ];
        homepage = "http://web.cecs.pdx.edu/~mpj/thih/";
        description = "Typing Haskell In Haskell";
@@ -191440,6 +192496,7 @@ self: {
        sha256 = "1pjz6rnbm1llxgp47fasv40w2vg197z582vf9mm7rhm5qjp25zi0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base edit-distance parseargs phonetic-code sqlite
        ];
@@ -191616,6 +192673,7 @@ self: {
        sha256 = "067jwdh0xbv02mh9narwnw36wvz0d1v5wwhysmzbfc263l0iazn2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary cairo containers deepseq filepath ghc-events glib
          gtk mtl pango text time unix
@@ -191674,6 +192732,7 @@ self: {
        sha256 = "0yc4n9b3my7mfq4w28yk4pjh14wqg116gqgx3w8wr26j0yn3y8j0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          filepath hashable network-uri safe snap-core snap-server stm
@@ -191699,6 +192758,7 @@ self: {
        sha256 = "1jg18gmm4f3aamwz9vr3h8nc3axlxf2440zf0ff6h8dlp20al7zk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          exceptions filepath hashable network-uri safe snap-core snap-server
@@ -191932,6 +192992,7 @@ self: {
        sha256 = "1il31vwcl3lag1nz9a9j8i7g160djbdbfcd58qi7d9sw9mcjk361";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup dbus utf8-string xmonad xmonad-contrib
        ];
@@ -191983,6 +193044,7 @@ self: {
        sha256 = "0bdls2xz281zdxq5z6vbkahmf6bpiqr0ra823j21783jwiyh8j01";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base glade gtk haskell98 ];
        homepage = "http://ecks.homeunix.net";
        description = "Useful if reading \"Why FP matters\" by John Hughes";
@@ -192221,6 +193283,7 @@ self: {
        sha256 = "0x2yc57g9g5ii14l65xkly55rhx44nfjqnbl4bqf286mqsgz191j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring bzlib filepath haskell98 mtl pretty
        ];
@@ -193266,6 +194329,7 @@ self: {
        sha256 = "1xyy1aagbjyjs9d52jmf7xch0831v7hvsb0mfrxpahvqsdac6h7a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring cmdargs conduit
          conduit-extra containers data-default directory exceptions filepath
@@ -193845,6 +194909,7 @@ self: {
        sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ALUT array base filepath GLFW-b OpenAL OpenGL parseargs random
        ];
@@ -194694,6 +195759,7 @@ self: {
        pname = "translate";
        version = "2010.1.24";
        sha256 = "0vcqw0x7c9nb8yigvk35x72rds50kvma02rwkb757y1sk80q0mzf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base curl json network utf8-string ];
        homepage = "http://github.com/nfjinjing/translate";
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
@@ -194898,6 +195964,7 @@ self: {
        sha256 = "0g7x1jj3x58jgbg6zcakyakc5jskcas03jakj7v5pfwdmk8kbc4m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk process ];
        homepage = "http://projects.haskell.org/traypoweroff";
        description = "Tray Icon application to PowerOff / Reboot computer";
@@ -196221,6 +197288,7 @@ self: {
        pname = "twiml";
        version = "0.2.0.0";
        sha256 = "12vavc02rpdrgdcnbd1jzn9lllzx4fghczdrpjr2icn8bkrgkqi5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base data-default deepseq lens network-uri parsec template-haskell
          text void xml
@@ -196506,6 +197574,7 @@ self: {
        sha256 = "1wc1z7ps1rcbws2snci64hxddjd3bi3kbi4iwvbfaac0dz52085m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring directory filepath ghc process
        ];
@@ -196521,6 +197590,7 @@ self: {
        pname = "type-aligned";
        version = "0.9.6";
        sha256 = "0mfyd9w13kd3ha43220p9qabw828xv19sxywy9imadpwrdqp51qv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/type-aligned";
        description = "Various type-aligned sequence data structures";
@@ -197087,6 +198157,7 @@ self: {
        sha256 = "1s84bw7fxxsqixy03892zb1s261fc0c8h5srsifs5mzgvhxkn20l";
        revision = "1";
        editedCabalFile = "03lz4iprlfl2bnh4isa2k7ddv1wxz8mqb7x1nmhjqbx34apbqi11";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          applicative-numbers base constraints newtype ty vector-space
        ];
@@ -197524,6 +198595,7 @@ self: {
        pname = "tzdata";
        version = "0.1.20161123.0";
        sha256 = "1dnc9m3396bxps84xgxfzrx928yh7vxd8pdim63a5xrydcfp16fb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq vector
        ];
@@ -197545,6 +198617,7 @@ self: {
        pname = "tzdata";
        version = "0.1.20170320.0";
        sha256 = "11ffj8ipcvvsm811w1jm23ry7vrmvj2q487640ic4ghq39dx91is";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq vector
        ];
@@ -197588,6 +198661,7 @@ self: {
        sha256 = "01a1h6pflvid5zcd8wy3px7cz4pxwy5pw354v9rp8k7sx4q82am8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base BNFC-meta cmdargs containers mtl parsec pretty split
          transformers
@@ -197606,6 +198680,7 @@ self: {
        pname = "ua-parser";
        version = "0.7.4";
        sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light text yaml
        ];
@@ -197632,6 +198707,7 @@ self: {
        sha256 = "1ml02xap95vxvzwqlqp68hfk7yjncf3xc1h13gga0nlhby9rjv14";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath hslogger mtl network process
          regex-compat time time-locale-compat unix
@@ -197691,6 +198767,7 @@ self: {
        sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring cereal containers ghc-prim mtl network unix
          utf8-string
@@ -197786,6 +198863,7 @@ self: {
        sha256 = "07b8hvam9n801ldwrm6jjds691gxjw4yp33zsg4bbbv2mk6z7fpa";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers directory fgl filepath
          hashable mtl network old-locale primitive process syb transformers
@@ -198460,6 +199538,7 @@ self: {
        sha256 = "1974birppkd49jwq31x8bcbmgnximh233salnyq47ikgxfp6x4c6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base directory filepath text
        ];
@@ -198525,6 +199604,7 @@ self: {
        pname = "uniform-pair";
        version = "0.1.13";
        sha256 = "17dz0car02w2x5m23hlqlgjnpl86darc8vvr4axpsc9xim4sf7nk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base deepseq prelude-extras ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
@@ -198834,6 +199914,7 @@ self: {
        pname = "universal-binary";
        version = "0.11";
        sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
@@ -199060,6 +200141,7 @@ self: {
        pname = "unix-memory";
        version = "0.1.2";
        sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix
@@ -199324,6 +200406,7 @@ self: {
        pname = "unsafe";
        version = "0.0";
        sha256 = "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~thielema/unsafe/";
        description = "Unified interface to unsafe functions";
@@ -199364,6 +200447,7 @@ self: {
        pname = "unsafeperformst";
        version = "0.9.2";
        sha256 = "0l268mzlmswm0p9cybjvi6krsgic706av9kf90fx3ylyvhgzygvc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/unsafeperformst";
        description = "Like unsafeperformIO, but for the ST monad";
@@ -199380,6 +200464,7 @@ self: {
        sha256 = "1zlf9dw3yid6s9p0q837h3qs2wnd9wr9kh282j4j4m0gpv9dcrrf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base optparse-applicative stream-fusion unordered-containers
        ];
@@ -199434,6 +200519,7 @@ self: {
        sha256 = "1bs87ii03dydrcyx70drmbd1nrb5z1xj5bzrrqgbq2fzhh7rmb1n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring cassava containers directory
          file-embed filepath inflections megaparsec mtl parallel-io process
@@ -199612,6 +200698,7 @@ self: {
        sha256 = "0fnr3xskzwxxxk7iv5bmqa18zbr612pn27jjiac0l4wzv33lisik";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cake3 directory filepath language-javascript
          mime-types mtl optparse-applicative process syb text
@@ -200039,6 +201126,7 @@ self: {
        sha256 = "1ji6zrglmlkhv743w4d4lrqvhva4yl5kqxb420z44l1wymvgg1s1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring containers
          containers-unicode-symbols parsimony
@@ -200239,6 +201327,7 @@ self: {
        sha256 = "156kjn3da02z060srlsm8kqwbxzcscjzxdkp4lmv8zq5zscha5v6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base utf8-string ];
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
@@ -200453,6 +201542,7 @@ self: {
        sha256 = "1gcznzb8hr2x5mr5pgfqhnvjjrll96g855g4niacw5bd52wdvsla";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base blaze-html ];
        executableHaskellDepends = [ base process ];
        homepage = "https://github.com/matthijssteen/uuagd";
@@ -200984,6 +202074,7 @@ self: {
        sha256 = "16f1mdsyyfdgjcp3rzf3p1qj3d6la01i9y1yyp97m5nmd2jxsn1q";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base deepseq dlist fgl graphviz haskell-src-exts mtl uniplate
        ];
@@ -201284,6 +202375,7 @@ self: {
        sha256 = "1qf5insiqgl3p9bg6m1igl24lghzbb3y50acwxgcpbcbdcaw13z5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl
          process text vcswrapper
@@ -201308,6 +202400,7 @@ self: {
        sha256 = "0yzin613nzvnklkb3j29vzy4rfladb3cy3sy6ic0mi6lxhilan2n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath hxt mtl parsec process split
          text
@@ -201553,6 +202646,7 @@ self: {
        pname = "vector-clock";
        version = "0.2.2";
        sha256 = "0ndp25w61rcj4sadvhxlirrk1dhk7rmdzv9kha7kyqa41whr9629";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary ghc-prim hashable ];
        testHaskellDepends = [
          array base binary ghc-prim HUnit QuickCheck test-framework
@@ -202018,6 +203112,7 @@ self: {
        sha256 = "0z7a17j0rd06kvn3v4qr0fhxg0xw6n3579477y2lvx4mcc3qyrvw";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base byteable bytestring cereal cipher-aes cryptohash directory
          filepath mmap random storable-endian text time
@@ -202172,6 +203267,7 @@ self: {
        sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default deepseq directory filepath
          libmpd mtl old-locale process template-haskell time
@@ -202343,6 +203439,7 @@ self: {
        sha256 = "08z6dvhv4k6a71dvqhvcfl8s5aq7qcg8aj5xbym3931yykl0gxc2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal directory file-embed filepath mtl process
          safe split
@@ -202376,6 +203473,7 @@ self: {
        sha256 = "1235zclhg4nkd387df4gg3q88hvsqwsdj1j20lnfnclxfah0qxa2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory filepath glib gtk json
          MonadCatchIO-transformers mtl parsec PSQueue stm url utf8-string
@@ -202398,6 +203496,7 @@ self: {
        sha256 = "0myppx9bd8bfhii91lqdp00ckp20bq82754mr01s87l1d01gb4wp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers directory fgl glade graphviz gtk haskell-src
          ipprint isevaluated lazysmallcheck parallel pretty process
@@ -202578,6 +203677,7 @@ self: {
        pname = "vte";
        version = "0.13.1.1";
        sha256 = "0cajvmnbkbqvkm3kngp7zscrjnzyf287rk6x2lnbwixg4sk9k1n3";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ vte ];
@@ -202595,6 +203695,7 @@ self: {
        pname = "vtegtk3";
        version = "0.13.1.1";
        sha256 = "0rrhca2850dc84sg5gn8dghsn8yk02da1rj7xzjazpmd9lkgwqas";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk3 pango ];
        libraryPkgconfigDepends = [ vte ];
@@ -202724,6 +203825,7 @@ self: {
        sha256 = "1mvs2224slnkswcag6knnj9ydkfgvw6nhaiy71bijjd2wwln4fq2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers data-default directory filepath mtl
          regex-base stm text unix vector vty
@@ -202823,6 +203925,7 @@ self: {
        sha256 = "0x7yh4g4jprc34pr6i50c8xyx9w6rjl6i2y6zwnkzydv7msf0d76";
        revision = "1";
        editedCabalFile = "1kdszyxp0i4f8yi7831x7vc4q55677ab2rj4fign77m0xk6cnphl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base data-default-class kansas-comet natural-transformation
          remote-monad scotty semigroups stm text wai-middleware-static
@@ -202983,6 +204086,7 @@ self: {
        pname = "wai-cors";
        version = "0.2.5";
        sha256 = "0vkn5nws9vcjn809qv2jfhf9ckfcgvfhs1v3xx1b03iy0j59n215";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base base-unicode-symbols bytestring case-insensitive
          http-types mtl transformers wai
@@ -204467,6 +205571,7 @@ self: {
        sha256 = "0r0lqy3vqs3ypxf0v6xwyarj5rxjf9f19x6b48rhj32z8x9d0isq";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base blaze-builder browscap
          bytestring case-insensitive conduit conduit-extra deepseq directory
@@ -204733,6 +205838,7 @@ self: {
        pname = "wave";
        version = "0.1.5";
        sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal containers data-default-class transformers
        ];
@@ -205515,6 +206621,7 @@ self: {
        pname = "webkit";
        version = "0.14.2.1";
        sha256 = "0l7ml6pfx63fz3gaay9krbksz7y15zv6aq2zr1g29x6yv6kz43mq";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring cairo glib gtk mtl pango text transformers
@@ -205563,6 +206670,7 @@ self: {
        pname = "webkitgtk3";
        version = "0.14.2.1";
        sha256 = "1xml39120yng7pgdpaz114zc2vcq7kxi5v1gdlfarzdvxxsw8wba";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
@@ -206115,6 +207223,7 @@ self: {
        sha256 = "0fgasnviqmz8ifkb8ikvj721f9j1xzvix5va0jxi81gh6f400ij6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers GLUT mtl OpenGL process random X11
        ];
@@ -206144,6 +207253,7 @@ self: {
        sha256 = "1y89bayaccz8qqzsfmpr917dczgbn5srskja6f2dab3ipxhk24z9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ haskell98 random ];
        homepage = "https://github.com/haroldl/whitespace-nd";
        description = "Whitespace, an esoteric programming language";
@@ -206299,6 +207409,7 @@ self: {
        pname = "wild-bind-indicator";
        version = "0.1.0.1";
        sha256 = "0lvhczw0ah8kb1hd9k7rnjcs1pmn0qg1i2v0szvhh2ji8iznjznm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers gtk text transformers wild-bind
        ];
@@ -206723,6 +207834,7 @@ self: {
        pname = "wl-pprint-terminfo";
        version = "3.7.1.4";
        sha256 = "084d70plp3d9629aznrk5nxkg0hg7yr76iyi74gcby633xbvmniw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers nats semigroups terminfo text
          transformers wl-pprint-extras
@@ -207015,6 +208127,7 @@ self: {
        pname = "words";
        version = "0.1.2";
        sha256 = "0najaqi9fkqdkfks1c6w3fz4qf7dnr4h4brzgglg1h9ik8x5a910";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory text ];
        description = "Cross-platform access to a list of words";
        license = stdenv.lib.licenses.bsd3;
@@ -207379,6 +208492,7 @@ self: {
        pname = "wright";
        version = "0.1.0.2";
        sha256 = "180012vyslprj06npavh44fmii1813w22sws9zwxzlb4r4jdm4zi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bed-and-breakfast containers ];
        testHaskellDepends = [
          assertions base bed-and-breakfast containers filepath lens
@@ -207731,6 +208845,7 @@ self: {
        pname = "wx";
        version = "0.92.3.0";
        sha256 = "04ccw9g8a08ipp4r1282jzgmx0lvxsbwgiasxq7ivij133mspjxx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base stm time wxcore ];
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
@@ -207746,6 +208861,7 @@ self: {
        sha256 = "16rixql7ixcdmxcayzrqswc4fcj6wdq513cl8qr66hwqyq2k0525";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory random wx wxcore ];
        homepage = "https://wiki.haskell.org/WxAsteroids";
        description = "Try to avoid the asteroids with your space ship";
@@ -207853,6 +208969,7 @@ self: {
        sha256 = "10897yb7mkc9hy2037r9yb4192n65lz997fd5apksra1rifrazyp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base wx wxcore ];
        homepage = "http://github.com/elbrujohalcon/wxhnotepad";
        description = "An example of how to implement a basic notepad with wxHaskell";
@@ -208248,6 +209365,7 @@ self: {
        sha256 = "0rjpj6i4fn504m7s3hwqbydn0m0ryih0hw4xnc409338sval6xj6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath process unix ];
        executableHaskellDepends = [
          base directory filepath process unix
@@ -209221,6 +210339,7 @@ self: {
        pname = "xml-push";
        version = "0.0.0.18";
        sha256 = "1i8qmz7mr8rfspkn4wwyq7f7fi1grpggmqmfsmx6l7bjsjv15n3y";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring crypto-random handle-like monad-control monads-tf
          peyotls random sasl simple-pipe stm tighttp transformers-base uuid
@@ -209425,6 +210544,7 @@ self: {
        sha256 = "0cp21xzzqczb49mpnsxlgc4fyhmmgyy4mfczqnz85h383js5sbia";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bio bytestring containers directory xhtml
        ];
@@ -209487,6 +210607,7 @@ self: {
        sha256 = "15i0a28svafjsziz1h3px0qys81xw0bs5bpq66hcwzxdv3s15lv9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base old-locale time xml ];
        executableHaskellDepends = [
          base bytestring configurator filepath http-client network-uri
@@ -209570,6 +210691,7 @@ self: {
        sha256 = "1jh3lcs20qpna36fa5a0r174xqrsxhj10x1rm5vwf64zariipy7r";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers data-default directory extensible-exceptions
          filepath mtl process setlocale unix utf8-string X11
@@ -209580,8 +210702,9 @@ self: {
        ];
        postInstall = ''
          shopt -s globstar
-         mkdir -p $out/share/man/man1
-         mv "$out/"**"/man/"*.1 $out/share/man/man1/
+         mkdir -p $doc/share/man/man1
+         mv "$data/"**"/man/"*[0-9] $doc/share/man/man1/
+         rm "$data/"**"/man/"*
        '';
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
@@ -209598,6 +210721,7 @@ self: {
        sha256 = "1ymn56rc9kkzvdla9bpj3aq2z6rnz669xbj7n87z1b42aj74s8gn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory extensible-exceptions filepath mtl
          process unix X11
@@ -209843,6 +210967,7 @@ self: {
        pname = "xournal-builder";
        version = "0.1.1.1";
        sha256 = "0v7lfhyr28gmsbzizhbw4lddhhhv74y3vb8kb9z06b32lg5wm591";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-builder bytestring double-conversion strict
          xournal-types
@@ -209863,6 +210988,7 @@ self: {
        sha256 = "1vyykx5kbq8jja6cxy38j905b23ndj73xsg0hirz0sq4pw36shmi";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cairo cmdargs directory filepath HStringTemplate
          mtl xournal-parser xournal-render xournal-types
@@ -209902,6 +211028,7 @@ self: {
        pname = "xournal-render";
        version = "0.6.0";
        sha256 = "0fsijjzxizhb7dx1pc83rsini8xzqj21mmkqj1x0ysyzh78siaf3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cairo containers fclabels mtl poppler strict
          TypeCompose xournal-types
@@ -210033,6 +211160,7 @@ self: {
        pname = "xtc";
        version = "1.0.1";
        sha256 = "0jfs3qbcx5h26irkq73dyc2m84qyrlj5dvy6d1s6p6520vhnqfal";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base wx wxcore ];
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
@@ -210264,6 +211392,7 @@ self: {
        pname = "yamemo";
        version = "0.6.0";
        sha256 = "12qh9fi5dj4i5lprm24gc2b66qzc3mf59m22sxf93sx3dsf7rygn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl ];
        description = "Simple memoisation function";
        license = stdenv.lib.licenses.bsd3;
@@ -210434,6 +211563,7 @@ self: {
        sha256 = "1lmlrf3x4icx0ikl02k00hv1wibvy0n3lmxdgjrh0vbq89sbx55a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring directory filepath text unix
          unordered-containers vector yaml
@@ -210692,6 +211822,7 @@ self: {
        sha256 = "0h2gd0k8vbz8rl34j42ayvcqp0ksz6642k9pznrd28h145wk8gz5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base event-driven filepath monads-tf regexpr
        ];
@@ -210707,6 +211838,7 @@ self: {
        pname = "ycextra";
        version = "0.1";
        sha256 = "0aa0g2r7ck052wqkqqxzvkdqv9d7x3v7rqqd8iajwys9cvqny4m5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers csv mtl uniplate yhccore
        ];
@@ -211082,6 +212214,7 @@ self: {
        pname = "yesod-auth-hmac-keccak";
        version = "0.0.0.3";
        sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cryptonite mtl persistent random shakespeare
          text yesod-auth yesod-core yesod-form yesod-persistent yesod-static
@@ -211688,6 +212821,7 @@ self: {
        sha256 = "1z56y5l6mgwi7ghcn1ycxhgpzximg0fbs652jlaxdy03rzxizv29";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal base bytestring directory filepath fsnotify Glob
          optparse-applicative process pureMD5 stm system-filepath temporary
@@ -213098,6 +214232,7 @@ self: {
        pname = "yi-frontend-pango";
        version = "0.14.0";
        sha256 = "0zwpy1lbkw8lkxk4p162xs181n9xsp9x8h6yknklqd79lnxs4zd5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
          oo-prototypes pango pointedlist text transformers-base yi-core
@@ -213314,6 +214449,7 @@ self: {
        pname = "yi-keymap-vim";
        version = "0.13.7";
        sha256 = "0d91lpcrsbwwacqycmkdmxkwnx7rn116cj76ddb7wrnikaj6vv1j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -213343,6 +214479,7 @@ self: {
        pname = "yi-keymap-vim";
        version = "0.14.0";
        sha256 = "1hy36q69a0yhkg5v0n2f2gkmbf85a9y6k5b38gdg18kdnil974q4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -213689,6 +214826,7 @@ self: {
        pname = "yices";
        version = "0.0.0.12";
        sha256 = "1k3q789dapk0c311x72w4r008rnbfz3cvajahxq208gy8iyjx9iz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
@@ -213738,6 +214876,7 @@ self: {
        sha256 = "11iwz7mrx3f72i3d4l9zvqb8g0722aj00s7h7wa06y4l69rfnj6m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory ftphs haskeline mtl process unix
        ];
@@ -213872,6 +215011,7 @@ self: {
        sha256 = "1lb50xpz032nrxbcfihj08cwbw2cn22sf8f4xlpfqnp36jvn1rvx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bytestring process utility-ht ];
        description = "Upload video to YouTube via YouTube API";
        license = stdenv.lib.licenses.bsd3;
@@ -213917,6 +215057,7 @@ self: {
        sha256 = "1b33q6k76bwg5614b670mvls0iwyp2yqfdqc9r86m95x7ar7brq8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base containers csv directory filepath HDBC HDBC-sqlite3
          HStringTemplate lucid old-locale old-time pandoc parsec scientific
@@ -213950,6 +215091,7 @@ self: {
        sha256 = "01pf0mg6lgm34src1mfz3qj41vyhmvi50yjyv72zwamd0g7sx374";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers curl deepseq directory filepath
          haskell98 mtl network parsec
@@ -214149,6 +215291,7 @@ self: {
        sha256 = "03jwhgi9n9iv7zpn8nwkdyvsybsksnhsji8k2ma9rzayk36aba6v";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory ghc ghc-paths mtl parallel process
          random text transformers
@@ -214595,6 +215738,7 @@ self: {
        pname = "zipedit";
        version = "0.2.3";
        sha256 = "17msh3gwylmsiabyz5x05ir2xh8h904kbp5isnvbf0z4kzfv33cr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process ];
        homepage = "http://code.haskell.org/~byorgey/code/zipedit";
        description = "Create simple list editor interfaces";
@@ -214991,6 +216135,7 @@ self: {
        editedCabalFile = "04gsbs6fvwpjjg1f6g1j17dxlfzsci9vmirk7mwqwmm9ha0a4hxm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base monads-tf ];
        description = "Zot language";
        license = stdenv.lib.licenses.bsd3;

From 073b30563d42d767bc3403e02413305c26b1a49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 11 Jul 2017 14:44:41 +0200
Subject: [PATCH 1017/3246] ghc-mod: fix build to cope with new split-output
 work

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 85a2d0f665e..9026e3aa3a6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -594,10 +594,10 @@ self: super: {
     doCheck = false;            # https://github.com/kazu-yamamoto/ghc-mod/issues/335
     executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
     postInstall = ''
-      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
+      local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" )
       make -C $lispdir
-      mkdir -p $out/share/emacs/site-lisp
-      ln -s "$lispdir/"*.el{,c} $out/share/emacs/site-lisp/
+      mkdir -p $data/share/emacs/site-lisp
+      ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/
     '';
   });
 

From 529f8095646f5d51a3b444a5eaa40ebd726bf46c Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 27 Jul 2017 09:51:01 +0200
Subject: [PATCH 1018/3246] oraclejdk: updated arm checksums

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 2 +-
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 7dc0d7158f1..0d12b3ac89b 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -4,7 +4,7 @@ import ./jdk-linux-base.nix {
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
   sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
   sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
-  sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
+  sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
   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 7dc0d7158f1..0d12b3ac89b 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -4,7 +4,7 @@ import ./jdk-linux-base.nix {
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
   sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
   sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
-  sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
+  sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From 798ad28134868afeea8ce543af0153c8fb87be09 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 27 Jul 2017 10:31:50 +0200
Subject: [PATCH 1019/3246] gnuchess: 6.2.4 -> 6.2.5

See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00012.html
---
 pkgs/games/gnuchess/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index c61d46e9d33..62c5ee80304 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="gnuchess";
-    version="6.2.4";
+    version="6.2.5";
     name="${baseName}-${version}";
     url="mirror://gnu/chess/${name}.tar.gz";
-    sha256="1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw";
+    sha256="00j8s0npgfdi41a0mr5w9qbdxagdk2v41lcr42rwl1jp6miyk6cs";
   };
   buildInputs = [
     flex

From 128430cd3ea900111c1ad4af6b3152aabcb3e038 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 27 Jul 2017 11:21:48 +0200
Subject: [PATCH 1020/3246] pythonPackages.django_1_10: drop

Drop django_1_10 ahead of `release-17.09`[1] branch off. Django-1.10
will not be maintained for the entire lifetime of 17.09 so only the 1.8
and 1.11 branches are maintained (both are LTS versions[2]).

[1] https://groups.google.com/forum/#!topic/nix-devel/vILGXXbeCPg
[2] https://www.djangoproject.com/download/
---
 .../python-modules/django/1_10.nix            | 36 -------------------
 pkgs/top-level/python-packages.nix            |  7 ----
 2 files changed, 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/django/1_10.nix

diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix
deleted file mode 100644
index 52b62e8d8b8..00000000000
--- a/pkgs/development/python-modules/django/1_10.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, buildPythonPackage, fetchurl, substituteAll,
-  pythonOlder,
-  geos, gdal
-}:
-buildPythonPackage rec {
-  pname = "Django";
-  name = "${pname}-${version}";
-  version = "1.10.7";
-  disabled = pythonOlder "2.7";
-
-  src = fetchurl {
-    url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
-    sha256 = "1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar";
-  };
-
-  patches = [
-    (substituteAll {
-      src = ./1.10-gis-libs.template.patch;
-      geos = geos;
-      gdal = gdal;
-    })
-  ];
-
-  # patch only $out/bin to avoid problems with starter templates (see #3134)
-  postFixup = ''
-    wrapPythonProgramsIn $out/bin "$out $pythonPath"
-  '';
-
-  # too complicated to setup
-  doCheck = false;
-
-  meta = {
-    description = "A high-level Python Web framework";
-    homepage = https://www.djangoproject.com/;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a817b75292..8f0d061ed1c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9343,13 +9343,6 @@ in {
     gdal = self.gdal;
   };
 
-  # TODO: Django 1.10 will be maintained until the end of the year. Therefore,
-  # it will be dropped before 17.09.
-  # https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597
-  django_1_10 = callPackage ../development/python-modules/django/1_10.nix {
-    gdal = self.gdal;
-  };
-
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
     version = "1.8.18";

From 5a3c35cce5f80ee5421702266c4f6817203305eb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 12:43:28 +0300
Subject: [PATCH 1021/3246] beignet: 1.2.1 -> 1.3.1

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

diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 7f127522f05..5a17f379b01 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   name = "beignet-${version}";
-  version = "1.2.1";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "https://01.org/sites/default/files/${name}-source.tar.gz"; 
-    sha256 = "07y8ga545654jdbijmplga7a7j3jn04q5gfdjsl8cax16hsv0kmp";
+    sha256 = "07snrgjlhwl5fxz82dyqp632cnf5hp0gfqrjd2930jv79p37p6rr";
   };  
 
   patches = [ ./clang_llvm.patch ]; 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c26ba7c826..31175f3372e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7456,7 +7456,7 @@ with pkgs;
   beecrypt = callPackage ../development/libraries/beecrypt { };
 
   beignet = callPackage ../development/libraries/beignet {
-    inherit (llvmPackages) llvm clang-unwrapped;
+    inherit (llvmPackages_39) llvm clang-unwrapped;
   };
 
   belle-sip = callPackage ../development/libraries/belle-sip { };

From 94adf8d17dba9c67aba471fc781a53ec6905fe24 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 12:43:51 +0300
Subject: [PATCH 1022/3246] haskellPackages.threadscope: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9026e3aa3a6..6b9e7f071c5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -874,4 +874,7 @@ self: super: {
   # https://github.com/diagrams/diagrams-solve/issues/4
   diagrams-solve = dontCheck super.diagrams-solve;
 
+  # Needs a newer version of ghc-events.
+  threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; };
+
 }

From 519b987e7013e0f95628012d8d22e235a8b404ca Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 27 Jul 2017 13:21:59 +0100
Subject: [PATCH 1023/3246] jenkins: 2.66 -> 2.71

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

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 8be5c6ebe85..8f545df2d8b 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.66";
+  version = "2.71";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "05n03rm5vjzcz1f36829hwviw7i8l8d728nvr4cnf6mcl3rxciyl";
+    sha256 = "0b3mxbcv7afj8ksr2y33rvprj7003679j545igf5dsal82i7swhl";
   };
 
   buildCommand = ''

From 93d364f4f50ce54cd216361e4a4dd683c1933a10 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 1 Jun 2017 16:18:15 +0100
Subject: [PATCH 1024/3246] mongodb: we already set quiet in config

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

diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index c56564f57f3..78dbf0d784c 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -108,7 +108,7 @@ in
         after = [ "network.target" ];
 
         serviceConfig = {
-          ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}";
+          ExecStart = "${mongodb}/bin/mongod --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}";
           User = cfg.user;
           PIDFile = cfg.pidFile;
           Type = "forking";

From 86b230efd919c6713fe6cb36eb3d98d575934728 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Jul 2017 11:49:22 +0200
Subject: [PATCH 1025/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/3fd8431bf5d2767b4e99a2f0ec7d06f0cdd412d6.
---
 .../haskell-modules/hackage-packages.nix      | 142 ++++++++++--------
 1 file changed, 83 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3902e436a78..70362f3b093 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -21689,15 +21689,17 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-flowtyped";
-       version = "0.7.1";
-       sha256 = "1b0dqscd7dz14flmjzinzdck99sqpjg4qnhy0wdl9bjajf7bfbhb";
+       version = "0.7.2";
+       sha256 = "065iw6a6bbm36yzph1f5gg8xzkaj4kkfqcak74lsdp9a60grgv87";
        libraryHaskellDepends = [
          aeson base containers free recursion-schemes reflection scientific
          text time unordered-containers vector wl-pprint
        ];
        testHaskellDepends = [
-         aeson base recursion-schemes tasty tasty-hunit text vector
+         aeson base recursion-schemes tasty tasty-hunit text
+         unordered-containers vector
        ];
+       homepage = "https://github.com/mikeplus64/aeson-flowtyped#readme";
        description = "Create Flow type definitions from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33812,23 +33814,24 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , bytestring-lexing, case-insensitive, clustering, conduit
      , conduit-combinators, containers, criterion, data-default-class
-     , double-conversion, hexpat, HsHTSLib, http-conduit, IntervalMap
-     , math-functions, matrices, mtl, parallel, primitive, random, split
-     , statistics, tasty, tasty-golden, tasty-hunit, text, transformers
-     , unordered-containers, vector, vector-algorithms, word8
+     , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit
+     , IntervalMap, math-functions, matrices, mtl, parallel, primitive
+     , random, split, statistics, tasty, tasty-golden, tasty-hunit, text
+     , transformers, unordered-containers, vector, vector-algorithms
+     , word8
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.3.1";
-       sha256 = "0hymk1lk26mla5al22bbj582vg96bwky6vwyqfy9b97q64w50lzl";
+       version = "0.3.2";
+       sha256 = "1zgvn1zkajslg221fk345vfgbi9pi9lr5ki3m4qpwgr3pvlz2h10";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring bytestring-lexing
          case-insensitive clustering conduit-combinators containers
-         data-default-class double-conversion hexpat HsHTSLib http-conduit
-         IntervalMap math-functions matrices mtl parallel primitive split
-         statistics text transformers unordered-containers vector
-         vector-algorithms word8
+         data-default-class data-ordlist double-conversion hexpat HsHTSLib
+         http-conduit IntervalMap math-functions matrices mtl parallel
+         primitive split statistics text transformers unordered-containers
+         vector vector-algorithms word8
        ];
        testHaskellDepends = [
          base bytestring conduit conduit-combinators data-default-class
@@ -37170,29 +37173,29 @@ self: {
      }) {};
 
   "bustle" = callPackage
-    ({ mkDerivation, base, bytestring, cairo, containers, dbus
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
-     , parsec, pcap, process, QuickCheck, setlocale, system-glib
-     , test-framework, test-framework-hunit, text, time
+     , pcap, process, QuickCheck, setlocale, system-glib, test-framework
+     , test-framework-hunit, text, time
      }:
      mkDerivation {
        pname = "bustle";
-       version = "0.5.4";
-       sha256 = "051z39s1xb86ab1a3v4yz8vv8k2kygpixzd878nb1p2pp6xjq74j";
+       version = "0.6.1";
+       sha256 = "18qg8fwmdq0lrfz7gyyzv6f4ch24sm925ykxb68rr996wxnmlbm2";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryPkgconfigDepends = [ system-glib ];
        executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
-         gtk3 hgettext mtl pango parsec pcap process setlocale text time
+         gtk3 hgettext mtl pango pcap process setlocale text time
        ];
        testHaskellDepends = [
-         base bytestring cairo containers dbus directory filepath gtk3
-         hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
-         test-framework-hunit text
+         base bytestring cairo containers dbus directory filepath gtk3 HUnit
+         mtl pango pcap QuickCheck test-framework test-framework-hunit text
        ];
-       homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
+       homepage = "https://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38914,8 +38917,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.3.1";
-       sha256 = "0xi4mj8gyb2k9a43dp49wc84sbxpv9sfa8cmzfp0mkak0alwqahj";
+       version = "2.4";
+       sha256 = "0nmvfg1fdmkibr7c0jk68mbinvqjr91c0lh1xzrd0g1kz576y703";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -49968,10 +49971,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.16";
-       sha256 = "03ipmz55cw6d8d79zv0m7cg8r6izdgy2v50xc8s7hk1sln86qbmx";
-       revision = "1";
-       editedCabalFile = "0vna37j7y2bzvhizizi69gghqqpz32w0aasy9xdaxpwq4y8wc83c";
+       version = "5.9.17";
+       sha256 = "0nlbx1pp9hzy51v9q35gqnwpwkh6lmwzxp42mql6rddbx0svp1m6";
        libraryHaskellDepends = [
          array base bytestring cereal cond directory exceptions filepath
          gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
@@ -79522,8 +79523,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.2.10";
-       sha256 = "1x5libj6rwrf39m1ksz5gzqldd7xy07glgk47cvjlszs9l5cq5i2";
+       version = "0.3.3";
+       sha256 = "1rhy280c6dx5s31maia9la6j3y62v4fjwbwhr26n5cg4xl1n3p5g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130996,24 +130997,25 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_5_3_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , exceptions, hspec, hspec-expectations, mtl, QuickCheck
-     , scientific, text, transformers, weigh
+  "megaparsec_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , criterion, deepseq, hspec, hspec-expectations, mtl
+     , parser-combinators, QuickCheck, scientific, text, transformers
+     , weigh
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "5.3.1";
-       sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8";
+       version = "6.0.0";
+       sha256 = "182xvni3ambq6j7m377fpaj2cf6119dxxr5f0h88yc5jw8r9780c";
        libraryHaskellDepends = [
-         base bytestring containers deepseq exceptions mtl QuickCheck
-         scientific text transformers
+         base bytestring case-insensitive containers deepseq mtl
+         parser-combinators scientific text transformers
        ];
        testHaskellDepends = [
-         base bytestring containers exceptions hspec hspec-expectations mtl
-         QuickCheck scientific text transformers
+         base bytestring containers hspec hspec-expectations mtl QuickCheck
+         scientific text transformers
        ];
-       benchmarkHaskellDepends = [ base criterion deepseq weigh ];
+       benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
@@ -133996,6 +133998,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_25" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , conduit-extra, exceptions, fast-logger, lifted-base
+     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
+     , template-haskell, text, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.25";
+       sha256 = "1ai55mk3n72qcdh7b6n4sv8bh5wqf2nznpzldimrwxg3m2b6g88g";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra exceptions
+         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
+         stm-chans template-haskell text transformers transformers-base
+         transformers-compat
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -154897,8 +154922,8 @@ self: {
        pname = "prettyprinter";
        version = "1.1";
        sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y";
-       revision = "1";
-       editedCabalFile = "0b3f3b55h49pini9fv01km1ydqwp6l687qmy193y8lcmrygnzbdy";
+       revision = "2";
+       editedCabalFile = "0gfxgc3jrnxa54arih1ys1qbswyx7waxp06ib8ifd3rw64yjn16j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -167087,19 +167112,19 @@ self: {
   "rtcm" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-bits, binary-conduit, bytestring
-     , conduit, conduit-combinators, conduit-extra, lens, random
-     , resourcet, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , text, word24
+     , conduit, conduit-combinators, conduit-extra, lens, lens-aeson
+     , random, resourcet, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, word24
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.1.12";
-       sha256 = "1pscz3a7n8a3337zh4xh44gf00hd86d4dnh059sj60gx6dac7zxh";
+       version = "0.2.2";
+       sha256 = "1fh6hvz3isv8zzmw94lkr354lm7805pr8sg5rj859skh2h49mzbb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson array base base64-bytestring basic-prelude binary binary-bits
-         bytestring lens template-haskell text word24
+         bytestring lens lens-aeson template-haskell text word24
        ];
        executableHaskellDepends = [
          aeson base basic-prelude binary-conduit bytestring conduit
@@ -168481,25 +168506,24 @@ self: {
   "sbp" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-combinators, conduit-extra, data-binary-ieee754, lens
-     , monad-loops, QuickCheck, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, unordered-containers
-     , yaml
+     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
+     , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.2.9";
-       sha256 = "0cs9gdb24s7yvrhphjwlazqbmcmc5f3a7rk39svdijh31aagd5aj";
+       version = "2.2.11";
+       sha256 = "1fdwsqh3mr90w6k4f4y8cbshx8divhfwhc06cfbdh64k8wckl27x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson array base base64-bytestring basic-prelude binary bytestring
-         data-binary-ieee754 lens monad-loops template-haskell text
-         unordered-containers
+         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
+         text unordered-containers
        ];
        executableHaskellDepends = [
          aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-combinators conduit-extra resourcet yaml
+         conduit-extra resourcet yaml
        ];
        testHaskellDepends = [
          aeson base base64-bytestring basic-prelude bytestring QuickCheck

From 382db8a9ad01a933e6839fe5cab42dd6df91aac6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Jul 2017 12:54:18 +0200
Subject: [PATCH 1026/3246] cabal2nix: version 2.4 needs Cabal 2.x

---
 .../development/haskell-modules/configuration-ghc-8.0.x.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 83efa6b0b5a..bc72ec031ad 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -47,8 +47,6 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
-  ## GHC 8.0.2
-
   # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
   vector-algorithms = dontCheck super.vector-algorithms;
 
@@ -60,4 +58,8 @@ self: super: {
 
   # Newer versions require ghc>=8.2
   apply-refact = super.apply-refact_0_3_0_1;
+
+  # This builds needs the latest Cabal version.
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; });
+
 }

From 2647ef05d48ee3bef165dc1b221371fd67ffd41d Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Thu, 27 Jul 2017 07:05:05 -0700
Subject: [PATCH 1027/3246] factorio: 0.15.30 -> 0.15.31

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

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 5c24c3ec807..fc1e0ee535b 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de
 
 with stdenv.lib;
 let
-  version = if releaseType != "demo" then "0.15.30" else "0.15.25";
+  version = if releaseType != "demo" then "0.15.31" else "0.15.31";
 
   arch = if stdenv.system == "x86_64-linux" then {
     inUrl = "linux64";
@@ -26,9 +26,9 @@ let
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
     name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
     x64 = {
-      headless =           fetchurl { inherit name url; sha256 = "0nmr73i9acnqgphfmsps7f8jlw0f2gyal9l8pldlp4rk0cjgvszy"; };
-      alpha    = authenticatedFetch { inherit name url; sha256 = "1ydh44na2lbvdv4anrblym7d6wxwapfbwap40n3722llrsad0zsz"; };
-      demo     =           fetchurl { inherit name url; sha256 = "1qz6g8mf221ic663zk92l6rs77ggfydaw2d8g2s7wy0j9097qbsl"; };
+      headless =           fetchurl { inherit name url; sha256 = "1kbf6pj0rdiydx7g3xaqhnvvjr01g1afys2flw8x5myanffhql9x"; };
+      alpha    = authenticatedFetch { inherit name url; sha256 = "0mz7x0hc3kvs6l1isnryld08sfy8gkgq81vvmmssa3ayp5y67rh4"; };
+      demo     =           fetchurl { inherit name url; sha256 = "0zsjlgys96qlqs79m634wh36vx5d7faq4749i9lsxm88b6fylfaf"; };
     };
     i386 = {
       headless = abort "Factorio 32-bit headless binaries are not available for download.";

From bba6ba2bdd807183bc53cd799a64697fdb0feb35 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:49:32 +0300
Subject: [PATCH 1028/3246] svox: 2016-10-20 -> 2017-07-18

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

diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index d7072e96163..a1d80c9113b 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "svox-${version}";
-  version = "2016-10-20";
+  version = "2017-07-18";
 
   src = fetchgit {
     url = "https://android.googlesource.com/platform/external/svox";
-    rev = "2dd8f16e4436520b93e93aa72b92acad92c0127d";
-    sha256 = "064h3zb9bn1z6xbv15iy6l4rlxx8fqzy54s898qvafjhz6kawj9g";
+    rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb";
+    sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r";
   };
 
   postPatch = ''

From a14ebe50c1cabf40478b4ab62369210b646fbf10 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:50:07 +0300
Subject: [PATCH 1029/3246] python.pkgs.libarcus: 2.4.0 -> 2.6.1

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

diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index bfe3b7bbb66..1e9434e3193 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -7,13 +7,13 @@ else
 stdenv.mkDerivation rec {
   pname = "libarcus";
   name = "${pname}-${version}";
-  version = "2.4.0";
+  version = "2.6.1";
   
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
     rev = version;
-    sha256 = "07lf5d42pnx0h9lgldplfdj142rbcsxx23njdblnq04di7a4937h";
+    sha256 = "1arh0gkwcjv0j3arh1w04gbwkn5glrs7gbli0b1ak7dalnicmn7c";
   };
   
   propagatedBuildInputs = [ sip protobuf ];

From 85faf94cb9fe60f6a1104dd31a3c740c0d997a17 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:50:44 +0300
Subject: [PATCH 1030/3246] python.pkgs.uranium: 2.4.0 -> 2.6.1

---
 pkgs/development/python-modules/uranium/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index 066230d0a1f..a80a09f0e64 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus }:
+{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus, doxygen, gettext }:
 
 if lib.versionOlder python.version "3.5.0"
 then throw "Uranium not supported for interpreter ${python.executable}"
 else
 
 stdenv.mkDerivation rec {
-  version = "2.4.0";
+  version = "2.6.1";
   pname = "uranium";
   name = "${pname}-${version}";
   
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1jpl0ryk8xdppillk5wzr2415n50cpa09shn1xqj6y96fg22l2il";
+    sha256 = "1682xwxf6xs1d1cfv1s7xnabqv58jjdb6szz8624b3k9rsj5l2yq";
   };
   
-  buildInputs = [ python ];
+  buildInputs = [ python gettext ];
   propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake doxygen ];
 
   postPatch = ''
     sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt

From b16b8444c810d626543d098f8d1491dc5945a7c6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:50:53 +0300
Subject: [PATCH 1031/3246] curaengine: 2.4.0 -> 2.6.1

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

diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 08df0cc3e90..26cdb0ed3f9 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "curaengine-${version}";
-  version = "2.4.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
     rev = version;
-    sha256 = "1n587cqm310kzb2zbc31199x7ybgxzjq91hslb1zcb8qg8qqmixm";
+    sha256 = "1vixxxpwrprcrma0v5ckjvcy45pj32rkf5pk4w7rans9k2ig66ic";
   };
 
   nativeBuildInputs = [ cmake ];

From 3e1a1f86d1a6379c210297f856a828df256f5d99 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:00 +0300
Subject: [PATCH 1032/3246] cura: 2.4.0 -> 2.6.1

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

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index e33edfb0a44..a5b17d4be9a 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -2,20 +2,20 @@
 
 mkDerivation rec {
   name = "cura-${version}";
-  version = "2.4.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Cura";
     rev = version;
-    sha256 = "04iglmjg9rzmlfrll6g7bcckkla327938xh8qmbdfrh215aivdlp";
+    sha256 = "03rsw6nafg3y9if2dlnzsj6c9x3x7cv6gs4a1w84jaq4p1f8fcsd";
   };
 
   buildInputs = [ qtbase ];
   propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
   nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
 
-  cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ];
+  cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ];
 
   postPatch = ''
     sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt

From 6908d1ac7a4d10d42c6b9a15349c8d996127260c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:12 +0300
Subject: [PATCH 1033/3246] octoprint: 1.3.2 -> 1.3.4

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

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 45b704a5f47..c1c87a6db39 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -54,13 +54,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "OctoPrint-${version}";
-  version = "1.3.2";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "foosel";
     repo = "OctoPrint";
     rev = version;
-    sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk";
+    sha256 = "06l8khbq3waaaa4cqpv6056w1ziylkfgzlb28v30i1h234rlkknq";
   };
 
   # We need old Tornado
@@ -69,7 +69,7 @@ in pythonPackages.buildPythonApplication rec {
     semantic-version flask_principal werkzeug flaskbabel tornado
     psutil pyserial flask_login netaddr markdown sockjs-tornado
     pylru pyyaml sarge feedparser netifaces click websocket_client
-    scandir chainmap future
+    scandir chainmap future dateutil
   ];
 
   buildInputs = with pythonPackages; [ nose mock ddt ];
@@ -90,6 +90,7 @@ in pythonPackages.buildPythonApplication rec {
       -e 's,werkzeug>=[^"]*,werkzeug,g' \
       -e 's,psutil>=[^"]*,psutil,g' \
       -e 's,requests>=[^"]*,requests,g' \
+      -e 's,future>=[^"]*,future,g' \
       setup.py
   '';
 

From 61cdadb0a8afbe01d5132f2230b060630febeff1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:25 +0300
Subject: [PATCH 1034/3246] octoprint-plugins.m33-fio: 1.17 -> 1.20

---
 pkgs/applications/misc/octoprint/plugins.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 8bc4a22bc92..46875f617a5 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -12,22 +12,17 @@ let
 
     m33-fio = buildPlugin rec {
       name = "M33-Fio-${version}";
-      version = "1.17";
+      version = "1.20";
 
       src = fetchFromGitHub {
         owner = "donovan6000";
         repo = "M33-Fio";
         rev = "V${version}";
-        sha256 = "19r860hqax09a79s9bl181ab7jsgx0pa8fvnr62lbgkwhis7m8mh";
+        sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767";
       };
 
       patches = [
         ./m33-fio-one-library.patch
-        # Fix incompatibility with new OctoPrint
-        (fetchpatch {
-          url = "https://github.com/foosel/M33-Fio/commit/bdf2422dee3fb8e53b33f087f734956c3b209d72.patch";
-          sha256 = "0jm415sx6d3m0z4gfhbnxlasg08zf3f3mslaj4amn9wbvsik9s5d";
-        })
       ];
 
       postPatch = ''

From 86e80adebb4999cc3525db2301c7c11d33ac8c45 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:35 +0300
Subject: [PATCH 1035/3246] octoprint-plugins.stlviewer: 0.3.0 -> 0.4.1

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

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 46875f617a5..81b7445ad18 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -64,13 +64,13 @@ let
 
     stlviewer = buildPlugin rec {
       name = "OctoPrint-STLViewer-${version}";
-      version = "0.3.0";
+      version = "0.4.1";
 
       src = fetchFromGitHub {
         owner = "jneilliii";
         repo = "OctoPrint-STLViewer";
         rev = "v${version}";
-        sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi";
+        sha256 = "1f64s37g2d79g76v0vjnjrc2jp2gwrsnfgx7w3n0hkf1lz1pjkm0";
       };
 
       meta = with stdenv.lib; {

From 2803d0ddd7b9f5ac67acf32126a77bfb96e2762e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:47 +0300
Subject: [PATCH 1036/3246] avidemux: 2.6.18 -> 2.6.20

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

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 79e3cfbde1b..0caeed499f8 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -14,11 +14,11 @@
 }:
 
 let
-  version = "2.6.18";
+  version = "2.6.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
-    sha256 = "1zmacx8wdhbjc8hpf8hmdmbh2pbkdkcyb23cl3j1mx7vkw06c31l";
+    sha256 = "17zgqz6i0bcan04wqwksf7y4z73vxmabcpnd9y5nhx7br5zwpih3";
   };
 
   common = {
@@ -88,6 +88,8 @@ let
 
       fixupPhase
     '';
+
+    meta = common.meta // args.meta or {};
   });
 
 in {
@@ -114,6 +116,8 @@ in {
     pluginUi = "GTK";
     isUi = true;
     buildDirs = [ "avidemux/gtk" ];
+    # Code seems unmaintained.
+    meta.broken = true;
   };
 
   avidemux_common = buildPlugin {

From 77ebac7ba94359540ad8d9aef1f63f971414bccb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:02 +0300
Subject: [PATCH 1037/3246] zeromq: build with cmake

This way CMake config modules are installed.
---
 pkgs/development/libraries/zeromq/4.x.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 4352e7f05c2..a797960b2f0 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
+{ stdenv, fetchFromGitHub, cmake, asciidoc }:
 
 stdenv.mkDerivation rec {
   name = "zeromq-${version}";
   version = "4.2.2";
 
-  src = fetchurl {
-    url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0syzwsiqblimfjb32fr6hswhdvp3cmbk0pgm7ayxaigmkv5g88sv";
+  src = fetchFromGitHub {
+    owner = "zeromq";
+    repo = "libzmq";
+    rev = "v${version}";
+    sha256 = "09317g4zkalp3k11x6vbidcm4qf02ciml1wxgp3742lrlgcblgxy";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libuuid libsodium ];
+  nativeBuildInputs = [ cmake asciidoc ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    sed -i 's,''${PACKAGE_PREFIX_DIR}/,,g' ZeroMQConfig.cmake.in
+  '';
 
   meta = with stdenv.lib; {
     branch = "4";

From bf01fc7b35094c9a6595c05980928b46d4a2ebb4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:30 +0300
Subject: [PATCH 1038/3246] cppzmq: 2016-11-16 -> 4.2.1

---
 pkgs/development/libraries/cppzmq/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index b1860872df3..7361dc45db7 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, cmake, zeromq }:
 
 stdenv.mkDerivation rec {
   name = "cppzmq-${version}";
-  version = "2016-11-16";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "cppzmq";
-    rev = "8b52a6ffacce27bac9b81c852b81539a77b0a6e5";
-    sha256 = "12accjyjzfw1wqzbj1qn6q99bj5ba05flsvbanyzflr3b4971s4p";
+    rev = "v${version}";
+    sha256 = "0hy8yxb22siimq0pf6jq6kdp9lvi5f6al1xd12c9i1jyajhp1lhk";
   };
 
-  installPhase = ''
-    install -Dm644 zmq.hpp $out/include/zmq.hpp
-  '';
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zeromq ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/zeromq/cppzmq";

From 147d6f7ac3090ddfd07bde75cadc97336adfdd36 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:39 +0300
Subject: [PATCH 1039/3246] folly: 2016.12.19.00 -> 2017.07.24.00

---
 pkgs/development/libraries/folly/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 1e8d7ce543f..927e11dac9e 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,15 +3,23 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2016.12.19.00";
+  version = "2017.07.24.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "1q5nh84sxkdi4x0gwr0x7bgk33pq6071vxz5vnjkznwywhgw2hnn";
+    sha256 = "1cmqrm9yjxrw4xr1kcgzl0s7vcvp125wcgb0cz7whssgj11mf169";
   };
 
+  patches = [
+    # Fix compilation
+    (fetchpatch {
+      url = "https://github.com/facebook/folly/commit/9fc87c83d93f092859823ec32289ed1b6abeb683.patch";
+      sha256 = "0ix0grqlzm16hwa4rjbajjck8kr9lksh6c3gn7p3ihbbchsmlhvl";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];
   buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
 

From f0ed27264ee1e04d3dfcf99522d05d70dcf002b5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:47 +0300
Subject: [PATCH 1040/3246] gbenchmark: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index 8f532ae8e0b..cf216ffcc56 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gbenchmark-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "benchmark";
     rev = "v${version}";
-    sha256 = "1y7k73kyxx1jlph23csnhdac76px6ghhwwxbcf0133m4rg0wmpn5";
+    sha256 = "1gld3zdxgc0c0466qvnsi70h2ksx8qprjrx008rypdhzp6660m48";
   };
 
   buildInputs = [ cmake ];

From 908a2e44da7849d435079752378f0dae1c63bbd6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:54 +0300
Subject: [PATCH 1041/3246] libaacs: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index fc27f3a2c6b..ff184984f70 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name = "libaacs-${version}";
-  version  = "0.8.1";
+  version  = "0.9.0";
 
   src = fetchurl {
     url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2";
-    sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm";
+    sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27";
   };
 
   buildInputs = [ libgcrypt libgpgerror ];

From c719f8bf0957e29efa750793bad968901278ba1e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:04 +0300
Subject: [PATCH 1042/3246] libbluray: quote homepage

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

diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 8b67d52b875..68ea7f777a2 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
                  ;
 
   meta = with stdenv.lib; {
-    homepage = http://www.videolan.org/developers/libbluray.html;
+    homepage = "http://www.videolan.org/developers/libbluray.html";
     description = "Library to access Blu-Ray disks for video playback";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];

From bc578738f23feb683f572fba1f8e4c6d350ec2d5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:17 +0300
Subject: [PATCH 1043/3246] libfprint: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index aad6214f2d4..42044f050f2 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "libfprint-0.6.0";
+  name = "libfprint-0.7.0";
 
   src = fetchurl {
-    url = "http://people.freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5";
+    url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz";
+    sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6";
   };
 
   buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ];

From 5fdc1e763f7b94445d10c75f94b482646a16dcc0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:26 +0300
Subject: [PATCH 1044/3246] ipopt: 3.12.6 -> 2.12.8

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

diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 5e16fcb1b54..9b9f8104c95 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ipopt-${version}";
-  version = "3.12.6";
+  version = "3.12.8";
 
   src = fetchurl {
     url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
-    sha256 = "0lx09h1757s5jppwnxwblcjk0biqjxy7yaf3z4vfqbl4rl93avs0";
+    sha256 = "1lyhgashyk2wswv0z2qnkxng32pim80kzf9jfgxi07wl09x753w1";
   };
 
   CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

From 0c5c853dcbf1a4713441f40bfc71228f306a479c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:35 +0300
Subject: [PATCH 1045/3246] libtirpc: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 7a58f4c8cff..7bff890eb0b 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-1.0.1";
+  name = "libtirpc-1.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "17mqrdgsgp9m92pmq7bvr119svdg753prqqxmg4cnz5y657rfmji";
+    sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From a762ca75d3fc751498f0a037a55023bddf06f9e7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:43 +0300
Subject: [PATCH 1046/3246] vc: 1.3.0 -> 1.3.2

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

diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index c37ff733111..6bf4ab9bdab 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "Vc-${version}";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
     rev = version;
-    sha256 = "18vi92xxg0ly0fw4v06fwls11rahmg5z8xf65jxxrbgf37vc1wxi";
+    sha256 = "119sm0kldr5j163ff04fra35420cvpj040hs7n0mnfbcgyx4nxq9";
   };
 
   nativeBuildInputs = [ cmake ];

From 8655259bfe22b97686598345377062601480e615 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:54 +0300
Subject: [PATCH 1047/3246] python.pkgs.zeroconf: 0.18.0 -> 0.19.1

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

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 487f657680c..28e4b0435a5 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.18.0";
+  version = "0.19.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2";
+    sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";
   };
 
   propagatedBuildInputs = [ netifaces six enum-compat ];

From f4312a30241fd88c3b4bb38ba62999865073ad94 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:02 +0300
Subject: [PATCH 1048/3246] crawl: 0.19.0 -> 0.20.1

---
 pkgs/games/crawl/crawl_purify.patch | 22 ++++++++++++++--------
 pkgs/games/crawl/default.nix        |  4 ++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch
index 766b633057d..808a4109f7b 100644
--- a/pkgs/games/crawl/crawl_purify.patch
+++ b/pkgs/games/crawl/crawl_purify.patch
@@ -1,18 +1,24 @@
-diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile crawl-ref-0.19.1-src/crawl-ref/source/Makefile
---- crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile	1970-01-01 03:00:01.000000000 +0300
-+++ crawl-ref-0.19.1-src/crawl-ref/source/Makefile	2016-11-23 15:37:15.303077886 +0300
-@@ -285,7 +285,7 @@
+diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile
+--- crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile	1970-01-01 03:00:01.000000000 +0300
++++ crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile	2017-07-27 14:45:34.611221571 +0300
+@@ -286,13 +286,7 @@
  LIBZ := contrib/install/$(ARCH)/lib/libz.a
  
  ifndef CROSSHOST
--	SQLITE_INCLUDE_DIR := /usr/include
+-	# FreeBSD keeps all of its userland includes in /usr/local so
+-	# look there
+-	ifeq ($(uname_S),FreeBSD)
+-		SQLITE_INCLUDE_DIR := /usr/local/include
+-	else
+-		SQLITE_INCLUDE_DIR := /usr/include
+-	endif
 +	SQLITE_INCLUDE_DIR := ${sqlite}/include
  else
  	# This is totally wrong, works only with some old-style setups, and
  	# on some architectures of Debian/new FHS multiarch -- excluding, for
-diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/crawl-ref/source/util/find_font
---- crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font	1970-01-01 03:00:01.000000000 +0300
-+++ crawl-ref-0.19.1-src/crawl-ref/source/util/find_font	2016-11-23 15:39:04.044031141 +0300
+diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font
+--- crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font	1970-01-01 03:00:01.000000000 +0300
++++ crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font	2017-07-27 14:44:29.784235540 +0300
 @@ -1,6 +1,6 @@
  #! /bin/sh
  
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index b6259c033af..9d6f6b33e69 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
-  version = "0.19.3";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "crawl-ref";
     repo = "crawl-ref";
     rev = version;
-    sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7";
+    sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26";
   };
 
   patches = [ ./crawl_purify.patch ];

From 342b987b195a15819d0547239ece34cb421f48b3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:23 +0300
Subject: [PATCH 1049/3246] dwarf-fortress-packages.dfhack: 0.43.05-r1 ->
 0.43.05-r2

---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index ba9cd1e5805..0247d69bb56 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -5,14 +5,12 @@
 
 let
   dfVersion = "0.43.05";
-  # version = "${dfVersion}-r1";
-  # rev = "refs/tags/${version}";
-  version = "${dfVersion}-r1";
+  version = "${dfVersion}-r2";
   rev = "refs/tags/${version}";
-  sha256 = "1hw0miimzx52p36jm9bimsm5j68rb7dd9kw0yivcwbwixbajsi1w";
+  sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c";
 
   # revision of library/xml submodule
-  xmlRev = "a8e80088b9cc934da993dc244ece2d0ae14143da";
+  xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9";
 
   arch =
     if stdenv.system == "x86_64-linux" then "64"
@@ -51,6 +49,12 @@ in stdenv.mkDerivation rec {
   # We don't use system libraries because dfhack needs old C++ ABI.
   buildInputs = [ zlib ];
 
+  preConfigure = ''
+    # Trick build system into believing we have .git
+    mkdir -p .git/modules/library/xml
+    touch .git/index .git/modules/library/xml/index
+  '';
+
   preBuild = ''
     export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
   '';

From 679d7f563a2610e2b16a481ade3a308a655a04a3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:34 +0300
Subject: [PATCH 1050/3246] ioquake3-git: 2017-01-27 -> 2017-07-25

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

diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 734f9daa970..47dd6a130e8 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "ioquake3-git-${version}";
-  version = "2017-01-27";
+  version = "2017-07-25";
 
   src = fetchFromGitHub {
     owner = "ioquake";
     repo = "ioq3";
-    rev = "468da0fabca2f21b811a501c184b986e270c5113";
-    sha256 = "14mhkqn6h2mbmz90j4ns1wp72ca5w9481sbyw2ving8xpw376i58";
+    rev = "356ae10ef65d4401958d50f03288dcb22d957c96";
+    sha256 = "0dz4zqlb9n3skaicj0vfvq4nr3ig80s8nwj9m87b39wc9wq34c5j";
   };
 
   nativeBuildInputs = [ which pkgconfig ];

From 861a75a64cf308179d375b88ebe46872cb2f7a5e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:45 +0300
Subject: [PATCH 1051/3246] the-powder-toy: 91.5.330 -> 92.0.331

---
 pkgs/games/the-powder-toy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index f72307e0172..d28608be9c2 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "the-powder-toy-${version}";
-  version = "91.5.330";
+  version = "92.0.331";
 
   src = fetchFromGitHub {
     owner = "simtr";
     repo = "The-Powder-Toy";
     rev = "v${version}";
-    sha256 = "19m7jyg3pnppymvr6lz454mjiw18hvldpdhi33596m9ji3nrq8x7";
+    sha256 = "185zlg20qk6ic9llyf4xka923snqrpdazg568raz0jiafzzsirax";
   };
 
   patches = [ ./fix-env.patch ];

From 81bb5856eb961ebc8a3515741a8204e29786317a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:53 +0300
Subject: [PATCH 1052/3246] bbswitch: quote homepage

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

diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index 67b843fac4d..4489a94f1ed 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "A module for powering off hybrid GPUs";
     platforms = platforms.linux;
-    homepage = https://github.com/Bumblebee-Project/bbswitch;
+    homepage = "https://github.com/Bumblebee-Project/bbswitch";
     maintainers = with maintainers; [ abbradar ];
   };
 }

From e9520bab01623fa2ec83e7a5fe3ad9a919748ccc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:55:02 +0300
Subject: [PATCH 1053/3246] ejabberd: 17.01 -> 17.07

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

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index b898abc9778..2799241fa99 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -23,12 +23,12 @@ let
   ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
 
 in stdenv.mkDerivation rec {
-  version = "17.01";
+  version = "17.07";
   name = "ejabberd-${version}";
 
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "02y9f1zxqvqrhapfay3avkys0llpyjsag6rpz5vfig01zqjqzyky";
+    sha256 = "1p8ppp2czjgnq8xnhyksd82npvvx99fwr0g3rrq1wvnwh2vgb8km";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "0flybfhq6qv1ihsjfg9p7191bffip7gpizg29wdbf1x6qgxhpz5r";
+    outputHash = "1q9yzccn4zf5i4hibq1r0i34q4986a93ph4792l1ph07aiisc8p7";
   };
 
   configureFlags =

From 21ad2a163157f98ff12ede2584710ad89f9aa6dd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:55:12 +0300
Subject: [PATCH 1054/3246] virtualglLib: 2.5.1 -> 2.5.2

---
 pkgs/tools/X11/virtualgl/lib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index c9530a5cdd9..b0c1dd3c444 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "virtualgl-lib-${version}";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
-    sha256 = "0n9ngwji9k0hqy81ridndf7z4lwq5dzmqw66r6vxfz15aw0jwd6s";
+    sha256 = "0f1jp7r4vajiksbiq08hkxd5bjj0jxlw7dy5750s52djg1v3hhsg";
   };
 
   cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ];

From a90fb0f55087f99e104142610ccd1ea7de9e8e48 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:55:38 +0300
Subject: [PATCH 1055/3246] dropbear: 2016.74 -> 2017.75

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

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index a918aa6375f..2b50e320c38 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2016.74";
+  name = "dropbear-2017.75";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "14c8f4gzixf0j9fkx68jgl85q7b05852kk0vf09gi6h0xmafl817";
+    sha256 = "1309cm2aw62n9m3h38prvgsqr8bj85hfasgnvwkd42cp3k5ivg3c";
   };
 
   dontDisableStatic = enableStatic;

From 9ffdbe38531e539021f13c2242be562f2754d868 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:56:48 +0300
Subject: [PATCH 1056/3246] update-resolv-conf: 2016-09-30 -> 2017-06-21

---
 pkgs/tools/networking/openvpn/update-resolv-conf.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index 186d5109b94..2f9c0aae3b8 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
@@ -4,13 +4,13 @@ let
   binPath = lib.makeBinPath [ coreutils openresolv systemd ];
 
 in stdenv.mkDerivation rec {
-  name = "update-resolv-conf-2016-09-30";
+  name = "update-resolv-conf-2017-06-21";
 
   src = fetchFromGitHub {
     owner = "masterkorp";
     repo = "openvpn-update-resolv-conf";
-    rev = "09cb5ab5a50dfd6e77e852749d80bef52d7a6b34";
-    sha256 = "0s5cilph0p0wiixj7nlc7f3hqmr1mhvbfyapd0060n3y6xgps9y9";
+    rev = "43093c2f970bf84cd374e18ec05ac6d9cae444b8";
+    sha256 = "1lf66bsgv2w6nzg1iqf25zpjf4ckcr45adkpgdq9gvhkfnvlp8av";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From bc52bf2cfe3dd19fe65095f8b60dd880db38ca4d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:57:12 +0300
Subject: [PATCH 1057/3246] citra: init at 2017-07-26

---
 pkgs/misc/emulators/citra/default.nix | 33 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  4 ++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/misc/emulators/citra/default.nix

diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
new file mode 100644
index 00000000000..ae380f3cc54
--- /dev/null
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }:
+
+stdenv.mkDerivation rec { 
+  name = "citra-2017-07-26";
+
+  # Submodules
+  src = fetchgit {
+    url = "https://github.com/citra-emu/citra";
+    rev = "a724fb365787718f9e44adedc14e59d0854905a6";
+    sha256 = "0lkrwhxvq85c0smix27xvj8m463bxa67qhy8m8r43g39n0h8d5sf";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ SDL2 qtbase boost curl gtest ];
+  cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ];
+
+  preConfigure = ''
+    # Trick configure system.
+    sed -n 's,^ *path = \(.*\),\1,p' .gitmodules | while read path; do
+      mkdir "$path/.git"
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://citra-emu.org/";
+    description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
+    platforms = platforms.linux;
+    license = licenses.gpl20;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31175f3372e..532175fb161 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1331,6 +1331,10 @@ with pkgs;
 
   citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { };
 
+  citra = libsForQt5.callPackage ../misc/emulators/citra {
+    boost = boost163;
+  };
+
   cmst = libsForQt5.callPackage ../tools/networking/cmst { };
 
   colord = callPackage ../tools/misc/colord { };

From a91cb71a839ff7fa9f431ef0d34c2938d9309846 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:57:28 +0300
Subject: [PATCH 1058/3246] python.pkgs.python-axolotl: 0.1.35 -> 0.1.39

---
 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 8f0d061ed1c..dab241f6e8a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8201,11 +8201,11 @@ in {
 
   python-axolotl = buildPythonPackage rec {
     name = "python-axolotl-${version}";
-    version = "0.1.35";
+    version = "0.1.39";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/python-axolotl/${name}.tar.gz";
-      sha256 = "0ch2d5wqfgxy22dkbxwzilq91wkqy9ficrjy39qhal8g8rdc4jr0";
+      sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs";
     };
 
     propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ];
@@ -8231,7 +8231,7 @@ in {
     };
 
     meta = {
-      homepage = "https://github.com/tgalal/python-axolotl";
+      homepage = "https://github.com/tgalal/python-axolotl-curve25519";
       description = "Curve25519 with ed25519 signatures";
       maintainers = with maintainers; [ abbradar ];
       license = licenses.gpl3;

From 411fe648bdac72b7aaf85c1c1a2d5e2bd2006a0e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:57:52 +0300
Subject: [PATCH 1059/3246] python.pkgs.pydns: use py3dns 3.1.1a for python3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dab241f6e8a..73d35645ff0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22220,18 +22220,41 @@ in {
     doCheck = false;
   };
 
-  pydns = buildPythonPackage rec {
-    name = "pydns-2.3.6";
-    disabled = isPy3k;
+  pydns =
+    let
+      py3 = buildPythonPackage rec {
+        name = "${pname}-${version}";
+        pname = "py3dns";
+        version = "3.1.1a";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pydns/${name}.tar.gz";
-      sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi";
-    };
+        src = fetchPypi {
+          inherit pname version;
+          sha256 = "0z0qmx9j1ivpgg54gqqmh42ljnzxaychc5inz2gbgv0vls765smz";
+        };
 
-    doCheck = false;
+        preConfigure = ''
+          sed -i \
+            -e '/import DNS/d' \
+            -e 's/DNS.__version__/"${version}"/g' \
+            setup.py
+        '';
 
-  };
+        doCheck = false;
+      };
+
+      py2 = buildPythonPackage rec {
+        name = "${pname}-${version}";
+        pname = "pydns";
+        version = "2.3.6";
+
+        src = fetchPypi {
+          inherit pname version;
+          sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi";
+        };
+
+        doCheck = false;
+      };
+    in if isPy3k then py3 else py2;
 
   pythondaemon = buildPythonPackage rec {
     name = "python-daemon-${version}";

From c10cf27589669920f4c2a33e03fabc83d3fcb223 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:58:24 +0300
Subject: [PATCH 1060/3246] python.pkgs.ipaddr: 2.1.10 -> 2.1.11

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73d35645ff0..7783f23a38d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11846,12 +11846,13 @@ in {
   ipywidgets = callPackage ../development/python-modules/ipywidgets { };
 
   ipaddr = buildPythonPackage rec {
-    name = "ipaddr-2.1.10";
+    name = "ipaddr-${version}";
+    version = "2.1.11";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/i/ipaddr/${name}.tar.gz";
-      sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj";
+      sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v";
     };
 
     meta = {

From 53c3e5ee979ed71c5a6750b0880ddbfe9e179627 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:58:38 +0300
Subject: [PATCH 1061/3246] python.pkgs.netifaces: 0.10.5 -> 0.10.6

---
 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 7783f23a38d..a39249bab5f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14220,12 +14220,12 @@ in {
   };
 
   netifaces = buildPythonPackage rec {
-    version = "0.10.5";
+    version = "0.10.6";
     name = "netifaces-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/netifaces/${name}.tar.gz";
-      sha256 = "12v2bm77dgaqjm9vmb8in0zpip2hn98mf5sycfvgq5iivm9avn2r";
+      sha256 = "1q7bi5k2r955rlcpspx4salvkkpk28jky67fjbpz2dkdycisak8c";
     };
 
     meta = {

From 3a04b2c318be9133e6880732ce9c7d41ad6c5ea8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:59:00 +0300
Subject: [PATCH 1062/3246] python.pkgs.pypolicyd-spf: 1.3 -> 2.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 a39249bab5f..2087ec506f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8241,15 +8241,16 @@ in {
 
   pypolicyd-spf = buildPythonPackage rec {
     name = "pypolicyd-spf-${version}";
-    majorVersion = "1.3";
-    version = "${majorVersion}.2";
+    majorVersion = "2.0";
+    version = "${majorVersion}.1";
+    disabled = !isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz";
-      sha256 = "0ri9bdwn1k8xlyfhrgzns7wjvp5h08dq5fnxcq6mphy94rmc8x3i";
+      sha256 = "09yi8y7pij5vzzrkc9sdw01x8w5n758d0qg7wv5hxd1l6if8c94i";
     };
 
-    propagatedBuildInputs = with self; [ pyspf pydns ipaddr ];
+    propagatedBuildInputs = with self; [ pyspf ];
 
     preBuild = ''
       substituteInPlace setup.py --replace "'/etc'" "'$out/etc'"

From 4907e58a02a052f7b5f01bda54904ae6beafdc30 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:59:10 +0300
Subject: [PATCH 1063/3246] python.pkgs.pyspf: add pydns to 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 2087ec506f3..a34dfa5719d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8460,6 +8460,8 @@ in {
       sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la";
     };
 
+    propagatedBuildInputs = with self; [ pydns ];
+
     meta = {
       homepage = "http://bmsi.com/python/milter.html";
       description = "Python API for Sendmail Milters (SPF)";

From 732207f456fdf9b20771af01721abe7771ec2d60 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 17:28:13 +0300
Subject: [PATCH 1064/3246] citra: fix license field

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

diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index ae380f3cc54..669935c281c 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = "https://citra-emu.org/";
     description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
     platforms = platforms.linux;
-    license = licenses.gpl20;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
   };
 }

From d31e7ee1bdddde42fcc7f38b9c88b485a1760efb Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@openmailbox.org>
Date: Thu, 27 Jul 2017 21:06:01 +0700
Subject: [PATCH 1065/3246] nawk: init at 20121220

---
 lib/maintainers.nix              |  1 +
 pkgs/tools/text/nawk/default.nix | 41 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/text/nawk/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a80b7c41a00..fc558b64abd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -291,6 +291,7 @@
   kierdavis = "Kier Davis <kierdavis@gmail.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>";
+  konimex = "Muhammad Herdiansyah <herdiansyah@openmailbox.org>";
   koral = "Koral <koral@mailoo.org>";
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
   kragniz = "Louis Taylor <louis@kragniz.eu>";
diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix
new file mode 100644
index 00000000000..d3056735b8d
--- /dev/null
+++ b/pkgs/tools/text/nawk/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, yacc }:
+
+stdenv.mkDerivation rec {
+  name = "nawk-20121220";
+
+  src = fetchurl {
+    url = "https://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz";
+    sha256 = "10wvdn7xwc5bbp5h7l0b9fxby3bds21n8a34z54i8kjsbhb95h4d";
+  };
+
+  nativeBuildInputs = [ yacc ];
+
+  unpackPhase = ''
+    mkdir build
+    cd build
+    tar xvf ${src}
+  '';
+
+  patchPhase = ''
+    substituteInPlace ./makefile \
+    --replace "YACC = yacc -d -S" ""
+  '';
+
+  installPhase = ''
+    install -Dm755 a.out "$out/bin/nawk"
+    install -Dm644 awk.1 "$out/share/man/man1/nawk.1"
+  '';
+
+  meta = {
+    description = "The one, true implementation of AWK";
+    longDescription = ''
+       This is the version of awk described in "The AWK Programming
+       Language", by Al Aho, Brian Kernighan, and Peter Weinberger
+       (Addison-Wesley, 1988, ISBN 0-201-07981-X).
+    '';
+    homepage = https://www.cs.princeton.edu/~bwk/btl.mirror/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.konimex ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c26ba7c826..431b441b549 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3288,6 +3288,8 @@ with pkgs;
 
   nasty = callPackage ../tools/security/nasty { };
 
+  nawk = callPackage ../tools/text/nawk { };
+
   nbd = callPackage ../tools/networking/nbd { };
 
   ndjbdns = callPackage ../tools/networking/ndjbdns { };

From 4456076bc72c8be3e425a0349e4bd768e474130d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 27 Jul 2017 18:54:05 +0300
Subject: [PATCH 1066/3246] keyutils: 1.5.9 -> 1.5.10

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

diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index 2aba3ef9112..c7915ace7ca 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "keyutils-${version}";
-  version = "1.5.9";
+  version = "1.5.10";
 
   src = fetchurl {
     url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
-    sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd";
+    sha256 = "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i";
   };
 
   outputs = [ "out" "lib" "dev" ];

From 688dc4e4c3fd76cc77c75839082631d88c942794 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 27 Jul 2017 13:17:13 +0000
Subject: [PATCH 1067/3246] tinc_pre: avoid infinite loop with EBADFD on
 network restart

---
 nixos/modules/services/networking/tinc.nix |  3 ++-
 pkgs/tools/networking/tinc/pre.nix         | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 42341b2d412..31a588318f6 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -169,7 +169,8 @@ in
         serviceConfig = {
           Type = "simple";
           PIDFile = "/run/tinc.${network}.pid";
-          Restart = "on-failure";
+          Restart = "always";
+          RestartSec = "3";
         };
         preStart = ''
           mkdir -p /etc/tinc/${network}/hosts
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index c09c9a45756..1d80db68991 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
+{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
   name = "tinc-${version}";
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace UNKNOWN ${version}
   '';
 
+  patches = [
+    # Avoid infinite loop with "Error while reading from Linux tun/tap device (tun mode) /dev/net/tun: File descriptor in bad state" on network restart
+    (fetchpatch {
+      url = https://github.com/gsliepen/tinc/compare/acefa66...e4544db.patch;
+      sha256 = "1jz7anqqzk7j96l5ifggc2knp14fmbsjdzfrbncxx0qhb6ihdcvn";
+    })
+  ];
+
   postInstall = ''
     rm $out/bin/tinc-gui
   '';

From 2799a94963aaf37f059b5ed4c0d2b0cf98ba445e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 27 Jul 2017 19:00:54 +0200
Subject: [PATCH 1068/3246] zfs, spl: 0.6.5.11 -> 0.7.0

---
 nixos/doc/manual/release-notes/rl-1709.xml |   6 +
 nixos/modules/rename.nix                   |   1 +
 nixos/modules/tasks/filesystems/zfs.nix    |  19 +-
 pkgs/os-specific/linux/spl/default.nix     | 106 +++++-----
 pkgs/os-specific/linux/zfs/default.nix     | 214 +++++++++------------
 pkgs/top-level/all-packages.nix            |  18 +-
 6 files changed, 149 insertions(+), 215 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 72dfd60bedd..77ee9052fe5 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -157,6 +157,12 @@ rmdir /var/lib/ipfs/.ipfs
       module where user Fontconfig settings are available.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal>
+      have therefore been removed.
+    </para>
+  </listitem>
 
 </itemizedlist>
 
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index c3fb5758ede..08146d1f568 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -204,6 +204,7 @@ with lib;
       "Set the option `services.xserver.displayManager.sddm.package' instead.")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
+    (mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "0.7.0 is now the default")
 
     # ZSH
     (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 2de3a3d8a33..f300091b11e 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -24,11 +24,7 @@ let
 
   kernel = config.boot.kernelPackages;
 
-  packages = if config.boot.zfs.enableUnstable then {
-    spl = kernel.splUnstable;
-    zfs = kernel.zfsUnstable;
-    zfsUser = pkgs.zfsUnstable;
-  } else {
+  packages = {
     spl = kernel.spl;
     zfs = kernel.zfs;
     zfsUser = pkgs.zfs;
@@ -62,19 +58,6 @@ 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;
         default = [];
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 941bd8a8671..865be70f34d 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -6,67 +6,57 @@
 }:
 
 with stdenv.lib;
+
 let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
-
-  common = { version, sha256 } @ args : stdenv.mkDerivation rec {
-    name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
-
-    src = fetchFromGitHub {
-      owner = "zfsonlinux";
-      repo = "spl";
-      rev = "spl-${version}";
-      inherit sha256;
-    };
-
-    patches = [ ./const.patch ./install_prefix.patch ];
-
-    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.
-      '';
-
-      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.11";
-      sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5";
-    };
-    splUnstable = common {
-      version = "0.7.0-rc5";
-      sha256 = "17y25g02c9swi3n90lhjvazcnsr69nh50dz3b8g1c08zlz9n2akp";
-    };
-  }
+stdenv.mkDerivation rec {
+  name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "zfsonlinux";
+    repo = "spl";
+    rev = "spl-${version}";
+    sha256 = "05qqwhxc9nj94y28c97iwfz8gkjwicrhnkj425yb47gqa8rafazk";
+  };
+
+  patches = [ ./const.patch ./install_prefix.patch ];
+
+  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.
+    '';
+
+    homepage = http://zfsonlinux.org/;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
+  };
+}
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index f281e5b590e..45f1788bf63 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -12,145 +12,105 @@ with stdenv.lib;
 let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
+in stdenv.mkDerivation rec {
+  name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+  version = "0.7.0";
 
-  common = { version, sha256, extraPatches, spl, incompatibleKernelVersion ? null } @ args:
-    if buildKernel &&
-       (incompatibleKernelVersion != null) &&
-       versionAtLeast kernel.version incompatibleKernelVersion then
-      throw "Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."
-    else stdenv.mkDerivation rec {
-      name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+  src = fetchFromGitHub {
+    owner = "zfsonlinux";
+    repo = "zfs";
+    rev = "zfs-${version}";
+    sha256 = "16z0fl282rsmvgk608ii7n410swivkrisp112n2fhhjc1fs0zall";
+  };
 
-      src = fetchFromGitHub {
-        owner = "zfsonlinux";
-        repo = "zfs";
-        rev = "zfs-${version}";
-        inherit sha256;
-      };
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";
+      sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";
+    })
+  ];
 
-      patches = extraPatches;
+  buildInputs = [ autoreconfHook nukeReferences ]
+  ++ optionals buildKernel [ spl ]
+  ++ optionals buildUser [ zlib libuuid python attr ];
 
-      buildInputs = [ autoreconfHook nukeReferences ]
-      ++ optionals buildKernel [ spl ]
-      ++ optionals buildUser [ zlib libuuid python attr ];
+  # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
+  NIX_CFLAGS_LINK = "-lgcc_s";
 
-      # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
-      NIX_CFLAGS_LINK = "-lgcc_s";
+  hardeningDisable = [ "pic" ];
 
-      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
+  '';
 
-      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"
+  ];
 
-      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;
 
-      enableParallelBuilding = true;
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "DEFAULT_INITCONF_DIR=\${out}/default"
+  ];
 
-      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
 
-      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/*
 
-        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
 
-        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
 
-        # 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
+  '';
 
-        # 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
-      incompatibleKernelVersion = "4.12";
-
-      version = "0.6.5.11";
-
-      # this package should point to the latest release.
-      sha256 = "1wqz43cjr21m3f52ahcikl2798pbzj5sfy16zqxwiqpv7iy09kr3";
-      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
-      incompatibleKernelVersion = null;
-
-      version = "0.7.0-rc5";
-
-      # this package should point to a version / git revision compatible with the latest kernel release
-      sha256 = "1k0fl6lbi5winri58v26k7gngd560hbj0247rnwcbc6j01ixsr5n";
-      extraPatches = [
-        (fetchpatch {
-          url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";
-          sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";
-        })
-      ];
-      spl = splUnstable;
-    };
-  }
+  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 globin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aad6bdf26c8..a65f39cb8bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12250,12 +12250,10 @@ with pkgs;
 
     sch_cake = callPackage ../os-specific/linux/sch_cake { };
 
-    inherit (callPackage ../os-specific/linux/spl {
+    spl = callPackage ../os-specific/linux/spl {
       configFile = "kernel";
       inherit kernel;
-    }) splStable splUnstable;
-
-    spl = splStable;
+    };
 
     sysdig = callPackage ../os-specific/linux/sysdig {};
 
@@ -12279,12 +12277,10 @@ with pkgs;
 
     x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
 
-    inherit (callPackage ../os-specific/linux/zfs {
+    zfs = callPackage ../os-specific/linux/zfs {
       configFile = "kernel";
       inherit kernel spl;
-    }) zfsStable zfsUnstable;
-
-    zfs = zfsStable;
+    };
   });
 
   # The current default kernel / kernel modules.
@@ -12593,11 +12589,9 @@ with pkgs;
 
   statifier = callPackage ../os-specific/linux/statifier { };
 
-  inherit (callPackage ../os-specific/linux/spl {
+  spl = callPackage ../os-specific/linux/spl {
     configFile = "user";
-  }) splStable splUnstable;
-
-  spl = splStable;
+  };
 
   sysdig = callPackage ../os-specific/linux/sysdig {
     kernel = null;

From 63d7b6ee291999b257018950b11d530ae43ead4b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 27 Jul 2017 20:24:42 +0200
Subject: [PATCH 1069/3246] makeImageFromDebDist: Add extraDebs arguments

This allows adding packages that are not part of the distribution, e.g.g

  extraDebs = [
    (pkgs.fetchurl {
      name = "openjdk.deb";
      url = http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jdk-headless_8u111-b14-3~14.04.1_amd64.deb;
      sha256 = "1n5ibpkx9pjmc4nr052rls1yqbq7ckav2rabixjhd4yxbyhjl0ap";
    })
  ];
---
 pkgs/build-support/vm/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 8ec82214964..d886e9a56fa 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -750,6 +750,7 @@ rec {
     { name, fullName, size ? 4096, urlPrefix
     , packagesList ? "", packagesLists ? [packagesList]
     , packages, extraPackages ? [], postInstall ? ""
+    , extraDebs ? []
     , QEMU_OPTS ? "", memSize ? 512 }:
 
     let
@@ -760,7 +761,7 @@ rec {
     in
       (fillDiskWithDebs {
         inherit name fullName size postInstall QEMU_OPTS memSize;
-        debs = import expr {inherit fetchurl;};
+        debs = import expr {inherit fetchurl;} ++ extraDebs;
       }) // {inherit expr;};
 
 

From 664bbed4122ecd931d73ee12bde2c9001f7fe67c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Jul 2017 21:11:15 +0200
Subject: [PATCH 1070/3246] all-packages.nix: Fix evaluation error for zfs

Regression introduced by 2799a94963aaf37f059b5ed4c0d2b0cf98ba445e.

Attribute zfsStable and zfsUnstable are now gone for the package
expression itself.

The mentioned commit however only changed the reference in
all-packages.nix for the kernel module, but not the userland package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @globin
---
 pkgs/top-level/all-packages.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65f39cb8bc..8d4e407dde7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12796,11 +12796,9 @@ with pkgs;
 
   zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
 
-  inherit (callPackage ../os-specific/linux/zfs {
+  zfs = callPackage ../os-specific/linux/zfs {
     configFile = "user";
-  }) zfsStable zfsUnstable;
-
-  zfs = zfsStable;
+  };
 
   ### DATA
 

From 946cabd5a1932cdb6c481bf3a9b62abf0185de2f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Jul 2017 14:43:02 -0500
Subject: [PATCH 1071/3246] skype: Remove old Linux version, deprecated July
 1st 2017.

As reported on various news sites, and currently
on the skype linux download page it contains:

"Important notice: All Skype for Linux clients version 4.3 and older
will be retired on July 1, 2017. To keep chatting, please install the
latest version of Skype for Linux."
---
 .../instant-messengers/skype/default.nix      | 70 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 72 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/skype/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
deleted file mode 100644
index a84b9cbf31c..00000000000
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib
-, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
-, libpulseaudio, lib, ... }:
-
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation rec {
-  name = "skype-4.3.0.37";
-
-  src = fetchurl {
-    url = "http://download.skype.com/linux/${name}.tar.bz2";
-    sha256 = "0bc9kck99rcsqzxzw3j6vnw5byvr8c9wixrx609zp255g0wxr6cc";
-  };
-
-  buildInputs = [
-    stdenv.glibc
-    stdenv.cc.cc
-    libXv
-    libXext
-    libX11
-    qt4
-    libXScrnSaver
-    libSM
-    libICE
-    libXi
-    libXrender
-    libXrandr
-    libpulseaudio
-    freetype
-    fontconfig
-    zlib
-    glib
-  ];
-
-  phases = "unpackPhase installPhase";
-
-  installPhase = ''
-    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
-
-    cat > $out/bin/skype << EOF
-    #!${stdenv.shell}
-    export PULSE_LATENCY_MSEC=60  # workaround for pulseaudio glitches
-    exec $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
-    EOF
-
-    chmod +x $out/bin/skype
-
-    # Fixup desktop file
-    substituteInPlace skype.desktop --replace \
-      "Icon=skype.png" "Icon=$out/libexec/skype/icons/SkypeBlue_128x128.png"
-    substituteInPlace skype.desktop --replace \
-      "Terminal=0" "Terminal=false"
-    mkdir -p $out/share/applications
-    mv skype.desktop $out/share/applications
-  '';
-
-  meta = {
-    description = "A proprietary voice-over-IP (VoIP) client";
-    homepage = http://www.skype.com/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = [ "i686-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d4e407dde7..f628658c0ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15980,8 +15980,6 @@ with pkgs;
 
   siproxd = callPackage ../applications/networking/siproxd { };
 
-  skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
-
   skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { };
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };

From 916c64416e8f60e15a040905331fc92ce9ec0ecb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Jul 2017 14:57:46 -0500
Subject: [PATCH 1072/3246] aliases: add 'skype' -> 'skypeforlinux' for
 backwards compat

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

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c47e3fe325b..49ba2d0ccdf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -129,6 +129,7 @@ mapAliases (rec {
   saneFrontends = sane-frontends; # added 2016-01-02
   scim = sc-im; # added 2016-01-22
   skrooge2 = skrooge; # added 2017-02-18
+  skype = skypeforlinux; # added 2017-07-27
   spaceOrbit = space-orbit; # addewd 2016-05-23
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06

From efaec90f603762d10d658e80bbe9870badd51e76 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Thu, 27 Jul 2017 21:14:31 +0100
Subject: [PATCH 1073/3246] fetchbower: handle packages with slashes in their
 name

Packages from github repos have slashes in their name. Nix store names
shouldn't have slashes.

Fixes rvl/bower2nix#13
---
 pkgs/build-support/fetchbower/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix
index 835fbec6bf0..dd0bac49cb6 100644
--- a/pkgs/build-support/fetchbower/default.nix
+++ b/pkgs/build-support/fetchbower/default.nix
@@ -7,8 +7,10 @@ let
       ver = if builtins.length components == 1 then version else hash;
     in ver;
 
+  bowerName = name: lib.replaceStrings ["/"] ["-"] name;
+
   fetchbower = name: version: target: outputHash: stdenv.mkDerivation {
-    name = "${name}-${bowerVersion version}";
+    name = "${bowerName name}-${bowerVersion version}";
     SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
     buildCommand = ''
       fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}"

From 19425c78e2e2ab871187e2d52af372c5e781c7b4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:53:32 +0200
Subject: [PATCH 1074/3246] python-PyICU: 1.9.6 -> 1.9.7

---
 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 a34dfa5719d..fcc81d80663 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18810,14 +18810,16 @@ in {
   };
 
   PyICU = buildPythonPackage rec {
-    name = "PyICU-1.9.6";
+    name = "PyICU-1.9.7";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/P/PyICU/${name}.tar.gz";
-      sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5";
+      sha256 = "0qavhngmn7c90fz25a8a2k50wd5gzp3vwwjq8v2pkf2hq4fcs9yv";
     };
 
-    buildInputs = [ pkgs.icu ];
+    buildInputs = [ pkgs.icu self.pytest ];
+
+    propagatedBuildInputs = [ self.six ];
 
     meta = {
       homepage = https://pypi.python.org/pypi/PyICU/;

From 78815d0c5159d70db330fea66c0beb13ba3bc204 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:53:55 +0200
Subject: [PATCH 1075/3246] mimeo: 2017.2.9 -> 2017.6.6

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

diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix
index 2333a6576e4..81d6d29b2bf 100644
--- a/pkgs/tools/misc/mimeo/default.nix
+++ b/pkgs/tools/misc/mimeo/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "mimeo-${version}";
-  version = "2017.2.9";
+  version = "2017.6.6";
 
   src = fetchurl {
     url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
-    sha256 = "1xbhz08aanix4bibz5jla58cmi6rnf946pf64wb0ka3s8jx0l5a0";
+    sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z";
   };
 
   buildInputs = [ file desktop_file_utils ];

From fc75595236ec6791a905b5916afc627dd11fae6c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:54:53 +0200
Subject: [PATCH 1076/3246] gmic: remove myself as maintainer

---
 pkgs/tools/graphics/gmic/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index edcfc67ee29..6ac152cb7b8 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
     description = "G'MIC is an open and full-featured framework for image processing";
     homepage = http://gmic.eu/;
     license = licenses.cecill20;
-    maintainers = [ maintainers.rycee ];
     platforms = platforms.unix;
   };
 }

From dd108013b693e8c99f145d3783bd7926e38402ee Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:55:03 +0200
Subject: [PATCH 1077/3246] josm: 12275 -> 12450

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index b53a49d584d..2431e7b7cbb 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "12275";
+  version = "12450";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "14y8ga1g3s9234zcgan16sw6va19jlwhfq39z0ayqmzna0fxi88a";
+    sha256 = "1l817mclbzyin9yh16q9jcqi31cz0qy6yi31hc8jp5ablknk979j";
   };
 
   phases = [ "installPhase" ];

From 03f6edf75009d6992249a856cf3f4a2aa7479b99 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:57:14 +0200
Subject: [PATCH 1078/3246] eclipse-plugin-anyedittools: 2.6.0 -> 2.7.0

---
 pkgs/applications/editors/eclipse/plugins.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index c0c96d9e1a4..151f6045584 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -106,16 +106,16 @@ rec {
 
   anyedittools = buildEclipsePlugin rec {
     name = "anyedit-${version}";
-    version = "2.6.0.201511291145";
+    version = "2.7.0.201705171641";
 
     srcFeature = fetchurl {
       url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
-      sha256 = "1vllci75qcd28b6hn2jz29l6cabxx9ql5i6l9cwq9rxp49dhc96b";
+      sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
     };
 
     srcPlugin = fetchurl {
-      url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.6.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
-      sha256 = "0mgq0ylfa7srjf7azyx0kbahlsjf0sdpazqphzx4f0bfn1l328s4";
+      url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
+      sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
     };
 
     meta = with stdenv.lib; {

From 635ecd802fd1928db0b33b396744b620c7b82ffe Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Fri, 28 Jul 2017 00:15:17 +0300
Subject: [PATCH 1079/3246] Deprecation warning for networking.extraHosts

---
 nixos/modules/config/networking.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 3a643943d3d..055e45e4a51 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -199,6 +199,9 @@ in
 
   config = {
 
+    warnings = optional (cfg.extraHosts != "")
+      "networking.extraHosts is deprecated, please use networking.hosts instead";
+
     environment.etc =
       { # /etc/services: TCP/UDP port assignments.
         "services".source = pkgs.iana-etc + "/etc/services";

From 229b2492819ff01f1b758d485813b7ebc91914b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Jul 2017 18:08:22 +0100
Subject: [PATCH 1080/3246] sysdig: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index ed0e0849721..71a7acab0e1 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,23 +3,15 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "sysdig-${version}";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
     rev = version;
-    sha256 = "1h3f9nkc5fkvks6va0maq377m9qxnsf4q3f2dc14rdzfvnzidy06";
+    sha256 = "0xw4in2yb3ynpc8jwl95j92kbyr7fzda3mab8nyxcyld7gshrlvd";
   };
 
-  patches = [
-    (fetchpatch {
-       # Sysdig fails to run on linux kernels with unified cgroups enabled
-       url = https://github.com/draios/sysdig/files/909689/0001-Fix-for-linux-kernels-with-cgroup-v2-API-enabled.patch.txt;
-       sha256 = "10nmisifa500hzpa3899rs837bcal72pnqidxmrnr1js187z8j84";
-    })
-  ];
-
   buildInputs = [
     cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc
   ];

From 127b2624b75b34a2d0be4f29f17b6dfd8141d34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Jul 2017 14:05:23 +0100
Subject: [PATCH 1081/3246] vim-yapf: init at 2017-03-21

---
 pkgs/misc/vim-plugins/default.nix                  | 14 ++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names             |  1 +
 .../vim2nix/additional-nix-code/vim-yapf           |  4 ++++
 3 files changed, 19 insertions(+)
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index be22b71d2b2..598608420d4 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1173,6 +1173,20 @@ rec {
 
   };
 
+  vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-yapf-2017-03-21";
+    src = fetchgit {
+      url = "https://github.com/mindriot101/vim-yapf";
+      rev = "324380d77c9cf8e46e22b2e4391702273a53f563";
+      sha256 = "0vsd53k5k8absc60qka8nlj2ij6k4zgff2a65ixc7vqcmawxr3nw";
+    };
+    dependencies = [];
+    buildPhase = ''
+      substituteInPlace ftplugin/python_yapf.vim \
+        --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"'
+    '';
+  };
+
   lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "lushtags-2017-04-19";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 10630636b89..608e14ef946 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -92,6 +92,7 @@
 "github:mhinz/vim-startify"
 "github:michaeljsmith/vim-indent-object"
 "github:mileszs/ack.vim"
+"github:mindriot101/vim-yapf"
 "github:mkasa/lushtags"
 "github:mpickering/hlint-refactor-vim"
 "github:nathanaelkane/vim-indent-guides"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
new file mode 100644
index 00000000000..63b54b22e0e
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
@@ -0,0 +1,4 @@
+    buildPhase = ''
+      substituteInPlace ftplugin/python_yapf.vim \
+        --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"'
+    '';

From 147477b0480be42e1909e13b121b8c736bd9091a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 27 Jul 2017 22:14:17 -0400
Subject: [PATCH 1082/3246] virtualbox: 5.1.24 -> 5.1.26

Fix #27666
---
 pkgs/applications/virtualization/virtualbox/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index a67663d56df..fbc0cc5ded0 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,10 +18,11 @@ with stdenv.lib;
 let
   python = python2;
   buildType = "release";
-  extpack = "1952ikz4xsjgdd0pzdx1riwaingyhkxp0ind31yzqc4d0hp8l6b5";
-  extpackRev = "117012";
-  main = "0q5vjsih4ndn1b0s9l1ppxng6dljld5bin5nqfrhvgr2ldlv2bgf";
-  version = "5.1.24";
+  # Manually sha256sum the extensionPack file, must be hex!
+  extpack = "14f152228495a715f526eb74134d43c960919cc534d2bc67cfe34a63e6cf7721";
+  extpackRev = "117224";
+  main = "1af8h3d3sdpcxcp5g75qfq10z81l7m8gk0sz8zqix8c1wqsm0wdm";
+  version = "5.1.26";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {

From 80a0c5c2fe0f79bf3e0f77c3d09cf545b5f54d9f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 28 Jul 2017 05:55:35 +0200
Subject: [PATCH 1083/3246] bspwm: fix package

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

diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index dc9d2f35965..83e1ea3e88d 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
 
-  PREFIX = "$out";
+  makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A tiling window manager based on binary space partitioning";

From 8e1a2250e1d343fb8bf4e37f19be2f0b074876b0 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 13:25:36 +0700
Subject: [PATCH 1084/3246] python.pkgs.amqplib: move to separate expression

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

diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix
new file mode 100644
index 00000000000..7c4ef99b0a2
--- /dev/null
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "amqplib";
+  version = "0.6.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://code.google.com/p/py-amqplib/;
+    description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcc81d80663..3fc7871fbe6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -543,22 +543,7 @@ in {
   };
 
 
-  amqplib = buildPythonPackage rec {
-    name = "amqplib-0.6.1";
-
-    src = pkgs.fetchurl {
-      url = "http://py-amqplib.googlecode.com/files/${name}.tgz";
-      sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://code.google.com/p/py-amqplib/;
-      description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
-    };
-  };
+  amqplib = callPackage ../development/python-modules/amqplib {};
 
   ansible  = self.ansible2;
   ansible2 = self.ansible_2_3;

From 01c8e4fe81120a121432b24dc5bf46b814b7da64 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Jul 2017 06:36:59 +0000
Subject: [PATCH 1085/3246] mplayer: adds dvdread support

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

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 9ae1b99f86f..89ac0b91b44 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -10,6 +10,7 @@
 , vdpauSupport ? false, libvdpau ? null
 , cddaSupport ? !stdenv.isDarwin, cdparanoia ? null
 , dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null
+, dvdreadSupport ? true, libdvdread ? null
 , bluraySupport ? true, libbluray ? null
 , amrSupport ? false, amrnb ? null, amrwb ? null
 , cacaSupport ? true, libcaca ? null
@@ -39,6 +40,7 @@ assert screenSaverSupport -> libXScrnSaver != null;
 assert vdpauSupport -> libvdpau != null;
 assert cddaSupport -> cdparanoia != null;
 assert dvdnavSupport -> libdvdnav != null;
+assert dvdreadSupport -> libdvdread != null;
 assert bluraySupport -> libbluray != null;
 assert amrSupport -> (amrnb != null && amrwb != null);
 assert cacaSupport -> libcaca != null;
@@ -110,6 +112,7 @@ stdenv.mkDerivation rec {
     ++ optional cacaSupport libcaca
     ++ optional xineramaSupport libXinerama
     ++ optional dvdnavSupport libdvdnav
+    ++ optional dvdreadSupport libdvdread
     ++ optional bluraySupport libbluray
     ++ optional cddaSupport cdparanoia
     ++ optional jackaudioSupport libjack2

From 0f94ac9296a687f6c8cc2cacc14a99f2db8ae9c1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Jul 2017 06:45:31 +0000
Subject: [PATCH 1086/3246] coqPackages.autosubst: fix hash

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

diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
index d27ba005299..a27a247c9d0 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = git://github.com/uds-psl/autosubst.git;
     rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034";
-    sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0";
+    sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341";
   };
 
   propagatedBuildInputs = [ mathcomp ];

From e10d7655dcc1f4d6ddc97b740ba4de83d345d3bf Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Jul 2017 13:59:23 +0800
Subject: [PATCH 1087/3246] anydesk: init at 2.9.4

---
 .../networking/remote/anydesk/default.nix     | 59 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/applications/networking/remote/anydesk/default.nix

diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
new file mode 100644
index 00000000000..a6858a7b5fd
--- /dev/null
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, makeWrapper
+, cairo, gdk_pixbuf, glib, gnome2, gtk2, pango, xorg
+, lsb-release }:
+
+let
+  sha256 = {
+    "x86_64-linux" = "0g19sac4j3m1nf400vn6qcww7prqg2p4k4zsj74i109kk1396aa2";
+    "i686-linux"   = "1dd4ai2pclav9g872xil3x67bxy32gvz9pb3w76383pcsdh5zh45";
+  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+  arch = {
+    "x86_64-linux" = "amd64";
+    "i686-linux"   = "i686";
+  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+in stdenv.mkDerivation rec {
+  name = "anydesk-${version}";
+  version = "2.9.4";
+
+  src = fetchurl {
+    url = "https://download.anydesk.com/linux/${name}-${arch}.tar.gz";
+    inherit sha256;
+  };
+
+  libPath = stdenv.lib.makeLibraryPath ([
+    cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango
+    gnome2.gtkglext
+  ] ++ (with xorg; [
+    libxcb libX11 libXdamage libXext libXfixes libXi
+    libXrandr libXtst
+  ]));
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/icons/hicolor,share/doc/anydesk}
+    install -m755 anydesk $out/bin/anydesk
+    cp changelog copyright README $out/share/doc/anydesk
+    cp -r icons/* $out/share/icons/hicolor/
+  '';
+
+  postFixup = ''
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      --set-rpath "${libPath}" \
+      $out/bin/anydesk
+
+    wrapProgram $out/bin/anydesk \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Desktop sharing application, providing remote support and online meetings";
+    homepage = http://www.anydesk.com;
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f628658c0ef..7aaddf8a643 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1252,6 +1252,8 @@ with pkgs;
 
   ori = callPackage ../tools/backup/ori { };
 
+  anydesk = callPackage ../applications/networking/remote/anydesk { };
+
   atool = callPackage ../tools/archivers/atool { };
 
   bsc = callPackage ../tools/compression/bsc { };

From 1d72b7345fdd8ed9522535d0c61db9713019f5d6 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Fri, 28 Jul 2017 11:20:56 +0300
Subject: [PATCH 1088/3246] dosbox-unstable: init at 2017-07-02

As current stable version segfaults when playing HoMM2, as described at
https://www.reddit.com/r/linux_gaming/comments/4dxfei/dosbox_segmentation_fault_core_dumped/

Also some missing dependencies (compared to stable version) were added:
- SDL_sound - for mounting .cue files with compressed sound
- SDL_net - for IPX support
- libpng - for making screenshots
---
 lib/maintainers.nix                     |  1 +
 pkgs/misc/emulators/dosbox/unstable.nix | 39 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/misc/emulators/dosbox/unstable.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fc558b64abd..31299006083 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -75,6 +75,7 @@
   berdario = "Dario Bertini <berdario@gmail.com>";
   bergey = "Daniel Bergey <bergey@teallabs.org>";
   bhipple = "Benjamin Hipple <bhipple@protonmail.com>";
+  binarin = "Alexey Lebedeff <binarin@binarin.ru>";
   bjg = "Brian Gough <bjg@gnu.org>";
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix
new file mode 100644
index 00000000000..95d03c425e3
--- /dev/null
+++ b/pkgs/misc/emulators/dosbox/unstable.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }:
+
+let revision = "4025";
+    revisionDate = "2017-07-02";
+    revisionSha = "0hbghdlvm6qibp0df35qxq35km4nza3sm301x380ghamxq2vgy6a";
+in stdenv.mkDerivation rec {
+  name = "dosbox-unstable-${revisionDate}";
+
+  src = fetchsvn {
+    url = "https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
+    rev = revision;
+    sha256 = revisionSha;
+  };
+
+  hardeningDisable = [ "format" ];
+
+  buildInputs = [ SDL SDL_net SDL_sound libpng mesa autoreconfHook ];
+
+  desktopItem = makeDesktopItem {
+    name = "dosbox";
+    exec = "dosbox";
+    comment = "x86 emulator with internal DOS";
+    desktopName = "DOSBox (SVN)";
+    genericName = "DOS emulator";
+    categories = "Application;Emulator;";
+  };
+
+  postInstall = ''
+     mkdir -p $out/share/applications
+     cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+  meta = {
+    homepage = http://www.dosbox.com/;
+    description = "A DOS emulator";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ binarin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7aaddf8a643..e890a4ba197 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18537,6 +18537,7 @@ with pkgs;
   dell-530cdn = callPackage ../misc/drivers/dell-530cdn {};
 
   dosbox = callPackage ../misc/emulators/dosbox { };
+  dosbox-unstable = callPackage ../misc/emulators/dosbox/unstable.nix { };
 
   dpkg = callPackage ../tools/package-management/dpkg { };
 

From 4cae4418e9c3297a0ab8b707bd5ad408d5fc8056 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 13:35:30 +0700
Subject: [PATCH 1089/3246] python.pkgs.apipkg: move to separate expression

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

diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
new file mode 100644
index 00000000000..be86eddc2ae
--- /dev/null
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pytest }:
+
+buildPythonPackage rec {
+  pname = "apipkg";
+  version = "1.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
+  };
+
+  buildInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Namespace control and lazy-import mechanism";
+    homepage = "http://bitbucket.org/hpk42/apipkg";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3fc7871fbe6..127f5b16f0c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -552,26 +552,7 @@ in {
   ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {};
   ansible_2_3 = callPackage ../development/python-modules/ansible/2.3.nix {};
 
-  apipkg = buildPythonPackage rec {
-    name = "apipkg-1.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/apipkg/${name}.tar.gz";
-      sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
-    };
-
-    buildInputs = with self; [ pytest ];
-
-    checkPhase = ''
-      py.test
-    '';
-
-    meta = {
-      description = "Namespace control and lazy-import mechanism";
-      homepage = "http://bitbucket.org/hpk42/apipkg";
-      license = licenses.mit;
-    };
-  };
+  apipkg = callPackage ../development/python-modules/apipkg {};
 
   appdirs = callPackage ../development/python-modules/appdirs { };
 

From 6d09e0c9bea3944e9c7dfa4601d2454886afb257 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:05:23 +0700
Subject: [PATCH 1090/3246] python.pkgs.apsw: move to separate expression

---
 .../python-modules/apsw/default.nix           | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +--------------
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/apsw/default.nix

diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
new file mode 100644
index 00000000000..3e7e970da6c
--- /dev/null
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchurl
+, sqlite, isPyPy }:
+
+buildPythonPackage rec {
+  pname = "apsw";
+  version = "3.7.6.2-r1";
+  name = "${pname}-${version}";
+
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "http://apsw.googlecode.com/files/${name}.zip";
+    sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb";
+  };
+
+  buildInputs = [ sqlite ];
+
+  # python: double free or corruption (fasttop): 0x0000000002fd4660 ***
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A Python wrapper for the SQLite embedded relational database engine";
+    homepage = http://code.google.com/p/apsw/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 127f5b16f0c..34861b0289b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -588,25 +588,7 @@ in {
     };
   };
 
-  apsw = buildPythonPackage rec {
-    name = "apsw-3.7.6.2-r1";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "http://apsw.googlecode.com/files/${name}.zip";
-      sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb";
-    };
-
-    buildInputs = with self; [ pkgs.sqlite ];
-
-    # python: double free or corruption (fasttop): 0x0000000002fd4660 ***
-    doCheck = false;
-
-    meta = {
-      description = "A Python wrapper for the SQLite embedded relational database engine";
-      homepage = http://code.google.com/p/apsw/;
-    };
-  };
+  apsw = callPackage ../development/python-modules/apsw {};
 
   astor = buildPythonPackage rec {
     name = "astor-${version}";

From f970ee8e7e923b18c2bfe6f36594fbedaaaeaf70 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:26:20 +0700
Subject: [PATCH 1091/3246] python.pkgs.astor: move to separate expression

---
 .../python-modules/astor/default.nix          | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +----------------
 2 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/astor/default.nix

diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix
new file mode 100644
index 00000000000..965bf37d520
--- /dev/null
+++ b/pkgs/development/python-modules/astor/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "astor";
+  version = "0.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Library for reading, writing and rewriting python AST";
+    homepage = https://github.com/berkerpeksag/astor;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ nixy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34861b0289b..239579bb59e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -590,22 +590,7 @@ in {
 
   apsw = callPackage ../development/python-modules/apsw {};
 
-  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; {
-      description = "Library for reading, writing and rewriting python AST";
-      homepage = https://github.com/berkerpeksag/astor;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ nixy ];
-    };
-  };
+  astor = callPackage ../development/python-modules/astor {};
 
   asyncio = if (pythonAtLeast "3.3") then buildPythonPackage rec {
     name = "asyncio-${version}";

From e77f62df0fcbc118c539501a0b286d09e8bd8897 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:32:38 +0700
Subject: [PATCH 1092/3246] python.pkgs.funcsigs: move to separate expression

---
 .../python-modules/funcsigs/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +----------------
 2 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/funcsigs/default.nix

diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix
new file mode 100644
index 00000000000..67ee9779073
--- /dev/null
+++ b/pkgs/development/python-modules/funcsigs/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, unittest2 }:
+
+buildPythonPackage rec {
+  pname = "funcsigs";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
+  };
+
+  buildInputs = [ unittest2 ];
+
+  meta = with stdenv.lib; {
+    description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
+    homepage = "https://github.com/aliles/funcsigs";
+    maintainers = with maintainers; [ garbas ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 239579bb59e..e78698438f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -609,25 +609,7 @@ in {
     };
   } else null;
 
-  funcsigs = buildPythonPackage rec {
-    name = "funcsigs-1.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/funcsigs/${name}.tar.gz";
-      sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
-    };
-
-    buildInputs = with self; [
-      unittest2
-    ];
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
-      homepage = "https://github.com/aliles/funcsigs";
-      maintainers = with maintainers; [ garbas ];
-      license = licenses.asl20;
-    };
-  };
+  funcsigs = callPackage ../development/python-modules/funcsigs { };
 
   APScheduler = callPackage ../development/python-modules/APScheduler { };
 

From ff0e08c015ea3bf788ef2b2bb0a44df7fef445da Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:49:14 +0700
Subject: [PATCH 1093/3246] python.pkgs.args: move to separate expression

---
 .../development/python-modules/args/default.nix | 17 +++++++++++++++++
 pkgs/top-level/python-packages.nix              | 14 +-------------
 2 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/args/default.nix

diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix
new file mode 100644
index 00000000000..7431f4f478f
--- /dev/null
+++ b/pkgs/development/python-modules/args/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "args";
+  version = "0.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Command Arguments for Humans";
+    homepage = "https://github.com/kennethreitz/args";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e78698438f4..a9ac5fda804 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -613,19 +613,7 @@ in {
 
   APScheduler = callPackage ../development/python-modules/APScheduler { };
 
-  args = buildPythonPackage rec {
-    name = "args-0.1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/args/${name}.tar.gz";
-      sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
-    };
-
-    meta = {
-      description = "Command Arguments for Humans";
-      homepage = "https://github.com/kennethreitz/args";
-    };
-  };
+  args = callPackage ../development/python-modules/args { };
 
   argcomplete = callPackage ../development/python-modules/argcomplete { };
 

From 76c4ec75190c924e90fe6b28ba9bd0e4f00c9c31 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:59:17 +0700
Subject: [PATCH 1094/3246] python.pkgs.area53: move to separate expression

---
 .../python-modules/area53/default.nix          | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             | 15 +--------------
 2 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/area53/default.nix

diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix
new file mode 100644
index 00000000000..1f0b95d8785
--- /dev/null
+++ b/pkgs/development/python-modules/area53/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, boto }:
+
+buildPythonPackage rec {
+  pname = "Area53";
+  version = "0.94";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  propagatedBuildInputs = [ boto ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a9ac5fda804..3d38ff7b220 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -617,20 +617,7 @@ in {
 
   argcomplete = callPackage ../development/python-modules/argcomplete { };
 
-  area53 = buildPythonPackage (rec {
-    name = "Area53-0.94";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/A/Area53/${name}.tar.gz";
-      sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ self.boto ];
-
-  });
+  area53 = callPackage ../development/python-modules/area53 { };
 
   chai = buildPythonPackage rec {
     name = "chai-${version}";

From 3182658a4f3a225ecfaaabf41b73e0a0a13e0ef4 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 15:45:24 +0700
Subject: [PATCH 1095/3246] python.pkgs.chai: move to separate expression

---
 pkgs/development/python-modules/chai/default.nix | 16 ++++++++++++++++
 pkgs/top-level/python-packages.nix               | 14 +-------------
 2 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/chai/default.nix

diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix
new file mode 100644
index 00000000000..f5440004ebd
--- /dev/null
+++ b/pkgs/development/python-modules/chai/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "chai";
+  version = "1.1.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Mocking, stubbing and spying framework for python";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d38ff7b220..0ab149f0f88 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -619,19 +619,7 @@ in {
 
   area53 = callPackage ../development/python-modules/area53 { };
 
-  chai = buildPythonPackage rec {
-    name = "chai-${version}";
-    version = "1.1.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/chai/${name}.tar.gz";
-      sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
-    };
-
-    meta = {
-      description = "Mocking, stubbing and spying framework for python";
-    };
-  };
+  chai = callPackage ../development/python-modules/chai { };
 
   chainmap = buildPythonPackage rec {
     name = "chainmap-1.0.2";

From b01adce061a5e446549bddecb1c75d2e422867e7 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 15:51:59 +0700
Subject: [PATCH 1096/3246] python.pkgs.chainmap: move to separate expression

---
 .../python-modules/chainmap/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +---------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/chainmap/default.nix

diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix
new file mode 100644
index 00000000000..8eb18db08f9
--- /dev/null
+++ b/pkgs/development/python-modules/chainmap/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "chainmap";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0";
+  };
+
+  # Requires tox
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Backport/clone of ChainMap";
+    homepage = "https://bitbucket.org/jeunice/chainmap";
+    license = licenses.psfl;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ab149f0f88..d46838dddbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -621,24 +621,7 @@ in {
 
   chai = callPackage ../development/python-modules/chai { };
 
-  chainmap = buildPythonPackage rec {
-    name = "chainmap-1.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/chainmap/${name}.tar.gz";
-      sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0";
-    };
-
-    # Requires tox
-    doCheck = false;
-
-    meta = {
-      description = "Backport/clone of ChainMap";
-      homepage = "https://bitbucket.org/jeunice/chainmap";
-      license = licenses.psfl;
-      maintainers = with maintainers; [ abbradar ];
-    };
-  };
+  chainmap = callPackage ../development/python-modules/chainmap { };
 
   arelle = callPackage ../development/python-modules/arelle {
     gui = true;

From f1ef53286d4e06ee3c53316ece702f9f5f0a3feb Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 15:58:39 +0700
Subject: [PATCH 1097/3246] python.pkgs.asn1ate: move to separate expression

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

diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix
new file mode 100644
index 00000000000..ce07c237624
--- /dev/null
+++ b/pkgs/development/python-modules/asn1ate/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, pyparsing }:
+
+buildPythonPackage rec {
+  pname = "asn1ate";
+  date = "20160810";
+  name = "${pname}-unstable-${date}";
+
+  src = fetchFromGitHub {
+    sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w";
+    rev = "c56104e8912400135509b584d84423ee05a5af6b";
+    owner = "kimgr";
+    repo = pname;
+  };
+
+  propagatedBuildInputs = [ pyparsing ];
+
+  meta = with stdenv.lib; {
+    description = "Python library for translating ASN.1 into other forms";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ leenaars ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d46838dddbf..e87630212ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -650,27 +650,7 @@ in {
 
   async-timeout = callPackage ../development/python-modules/async_timeout { };
 
- asn1ate = buildPythonPackage rec {
-  pname = "asn1ate";
-  date = "20160810";
-  name = "${pname}-unstable-${date}";
-
-  src = pkgs.fetchFromGitHub {
-    sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w";
-    rev = "c56104e8912400135509b584d84423ee05a5af6b";
-    owner = "kimgr";
-    repo = pname;
-  };
-
-  propagatedBuildInputs = with self; [ pyparsing ];
-
-  meta = with stdenv.lib; {
-    description = "Python library for translating ASN.1 into other forms";
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ leenaars ];
-  };
-};
+  asn1ate = callPackage ../development/python-modules/asn1ate { };
 
   atomiclong = buildPythonPackage rec {
     version = "0.1.1";

From dbefaeaab2b25f9ec40be9cb3e4eb505ec1c3847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 28 Jul 2017 11:25:17 +0200
Subject: [PATCH 1098/3246] vim-yapf: fix evaluation

/cc @Mic92
---
 pkgs/misc/vim-plugins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 598608420d4..cd105793a9a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1183,7 +1183,7 @@ rec {
     dependencies = [];
     buildPhase = ''
       substituteInPlace ftplugin/python_yapf.vim \
-        --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"'
+        --replace '"yapf"' '"${pythonPackages.yapf}/bin/yapf"'
     '';
   };
 

From 159be2e4f576041a0553a0ddd8e98aa753832745 Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@openmailbox.org>
Date: Fri, 28 Jul 2017 01:04:56 +0700
Subject: [PATCH 1099/3246] bubblewrap: init at 0.1.8

---
 pkgs/tools/admin/bubblewrap/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/admin/bubblewrap/default.nix

diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
new file mode 100644
index 00000000000..5b75657e325
--- /dev/null
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libxslt, docbook_xsl, libcap }:
+
+stdenv.mkDerivation rec {
+  name = "bubblewrap-${version}";
+  version = "0.1.8";
+
+  src = fetchurl {
+    url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
+    sha256 = "1gyy7paqwdrfgxamxya991588ryj9q9c3rhdh31qldqyh9qpy72c";
+  };
+
+  nativeBuildInputs = [ libcap libxslt docbook_xsl ];
+
+  meta = with stdenv.lib; {
+    description = "Unprivileged sandboxing tool";
+    homepage = "https://github.com/projectatomic/bubblewrap";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ konimex ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65f39cb8bc..f1ffba57a0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -722,6 +722,8 @@ with pkgs;
 
   bochs = callPackage ../applications/virtualization/bochs { };
 
+  bubblewrap = callPackage ../tools/admin/bubblewrap { };
+
   borgbackup = callPackage ../tools/backup/borg {
     python3Packages = python34Packages;
   };

From 7723d9935f6a134ce8cc878eb566c6caa784318e Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Fri, 28 Jul 2017 12:42:28 +0300
Subject: [PATCH 1100/3246] fzf: add script for finding 'share' folder

So that helper scripts can be easily sourced in interactive shell
configuration. `autojump` package was already present and had the same
requirements for findind a `share` folders, so I took an inspiration
there.

I beleive this is a better alternative to:
- https://github.com/NixOS/nixpkgs/pull/25080
- https://github.com/NixOS/nixpkgs/pull/27058

Replacing `$out/share/shell` with `$bin/share/fzf` was necessary to
prevent dependency loop in produced derivations.
---
 doc/package-notes.xml           | 30 ++++++++++++++++++++++++------
 pkgs/tools/misc/fzf/default.nix | 10 +++++++++-
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 33a61f31938..230f0ec7b93 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -366,15 +366,33 @@ it. Place the resulting <filename>package.nix</filename> file into
 
 </section>
 
-<section xml:id="sec-autojump">
+<section xml:id="sec-shell-helpers">
 
-<title>Autojump</title>
+<title>Interactive shell helpers</title>
 
 <para>
-  autojump needs the shell integration to be useful but unlike other systems,
-  nix doesn't have a standard share directory location. This is why a
-  <command>autojump-share</command> script is shipped that prints the location
-  of the shared folder. This can then be used in the .bashrc like this:
+  Some packages provide the shell integration to be more useful. But
+  unlike other systems, nix doesn't have a standard share directory
+  location. This is why a bunch <command>PACKAGE-share</command>
+  scripts are shipped that print the location of the corresponding
+  shared folder.
+
+  Current list of such packages is as following:
+
+  <itemizedlist>
+    <listitem>
+      <para>
+        <literal>autojump</literal>: <command>autojump-share</command>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <literal>fzf</literal>: <command>fzf-share</command>
+      </para>
+    </listitem>
+  </itemizedlist>
+
+  E.g. <literal>autojump</literal> can then used in the .bashrc like this:
 <screen>
   source "$(autojump-share)/autojump.bash"
 </screen>
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 916ba99317e..11bc0ef4d11 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -39,7 +39,15 @@ buildGoPackage rec {
     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}
-    cp -R $src/shell $out/share/shell
+
+    cp -R $src/shell $bin/share/fzf
+    cat <<SCRIPT > $bin/bin/fzf-share
+    #!/bin/sh
+    # Run this script to find the fzf shared folder where all the shell
+    # integration scripts are living.
+    echo $bin/share/fzf
+    SCRIPT
+    chmod +x $bin/bin/fzf-share
   '';
 
   meta = with stdenv.lib; {

From 805467bb5a03db607145dd7aae2ef08e1c1ee746 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 28 Jul 2017 00:55:26 +0300
Subject: [PATCH 1101/3246] rustracer: 2.0.6 -> 2.0.9

---
 pkgs/development/tools/rust/racer/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index b79d7e0670d..89c384eb6ec 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -2,21 +2,21 @@
 
 rustPlatform.buildRustPackage rec {
   name = "racer-${version}";
-  version = "2.0.6";
+  version = "2.0.9";
 
   src = fetchFromGitHub {
-    owner = "phildawes";
+    owner = "racer-rust";
     repo = "racer";
     rev = version;
-    sha256 = "09wgfrb0z2d2icfk11f1jal5p93sqjv3jzmzcgw0pgw3zvffhni3";
+    sha256 = "06k50f2vj2w08afh3nrlhs0amcvw2i45bhfwr70sgs395xicjswp";
   };
 
-  depsSha256 = "0mnq7dk9wz2k9jhzciknybwc471sy8f71cd15m752b5ng6v1f5kn";
+  depsSha256 = "1gywnjbjl9jalbq6wkfmbczav4qbhgw2h8lyxkyppnhw9y4j0nc1";
 
   buildInputs = [ makeWrapper ];
 
   preCheck = ''
-    export RUST_SRC_PATH="${rustPlatform.rust.rustc.src}/src"
+    export RUST_SRC_PATH="${rustPlatform.rustcSrc}"
   '';
 
   doCheck = true;
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A utility intended to provide Rust code completion for editors and IDEs";
-    homepage = https://github.com/phildawes/racer;
+    homepage = https://github.com/racer-rust/racer;
     license = licenses.mit;
     maintainers = with maintainers; [ jagajaga globin ];
     platforms = platforms.all;

From 6c1849147087171d9ec6060023f2b268857f2416 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 28 Jul 2017 13:33:03 +0300
Subject: [PATCH 1102/3246] rust-bindgen: 0.26.1 -> 0.29.0

---
 pkgs/development/tools/rust/bindgen/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 8fb668df5b9..9be048257ce 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -4,13 +4,13 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.26.1";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
-    owner = "servo";
+    owner = "rust-lang-nursery";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "1w1vbfhmcrcl0vacxkivmavjp51cvpyq5lk75n9zs80q5x38ypna";
+    sha256 = "190nilbqch8w2hcdmzgkk2npgsn49a4y9c5r0mxa9d7nz7h0imxk";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,13 +24,13 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib"
   '';
 
-  depsSha256 = "0s1x4ygjwc14fbl2amz5g6n7lq07zy8b00mvwfw6vi6k4bq1g59i";
+  depsSha256 = "1y55xdqsk200hj5dhbigsgsx11w5cfxms84hhyl9y7w6jszbzxzw";
 
   doCheck = false; # A test fails because it can't find standard headers in NixOS
 
   meta = with stdenv.lib; {
-    description = "C binding generator";
-    homepage = https://github.com/servo/rust-bindgen;
+    description = "C and C++ binding generator";
+    homepage = https://github.com/rust-lang-nursery/rust-bindgen;
     license = with licenses; [ bsd3 ];
     maintainers = [ maintainers.ralith ];
   };

From 6e5d2f896365fa6737d0c336b7edbc6b6a15fcb9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Jul 2017 12:36:48 +0200
Subject: [PATCH 1103/3246] nixos/xserver: Properly validate XKB options

Checking the keyboard layout has been a long set of hurdles so far, with
several attempts. Originally, the checking was introduced by @lheckemann
in #23709.

The initial implementation just was trying to check whether the symbols/
directory contained the layout name.

Unfortunately, that wasn't enough and keyboard variants weren't
recognized, so if you set layout to eg. "dvorak" it will fail with an
error (#25526).

So my improvement on that was to use sed to filter rules/base.lst and
match the layout against that. I fucked up twice with this, first
because layout can be a comma-separated list which I didn't account for
and second because I ran into a Nix issue (NixOS/nix#1426).

After fixing this, it still wasn't enough (and this is btw. what
localectl also does), because we were *only* matching rules but not
symbols, so using "eu" as a layout won't work either.

I decided now it's the time to actually use libxkbcommon to try
compiling the keyboard options and see whether it succeeds. This comes
in the form of a helper tool called xkbvalidate.

IMHO this approach is a lot less error-prone and we can be sure that we
don't forget about anything because that's what the X server itself uses
to compile the keymap.

Another advantage of this is that we now validate the full set of XKB
options rather than just the layout.

Tested this against a variety of wrong and correct keyboard
configurations and against the "keymap" NixOS VM tests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lheckemann, @peti, @7c6f434c, @tohl, @vcunat, @lluchs
Fixes: #27597
---
 nixos/modules/services/x11/xserver.nix   |  48 +-------
 pkgs/tools/X11/xkbvalidate/default.nix   |  15 +++
 pkgs/tools/X11/xkbvalidate/xkbvalidate.c | 135 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |   2 +
 4 files changed, 156 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/tools/X11/xkbvalidate/default.nix
 create mode 100644 pkgs/tools/X11/xkbvalidate/xkbvalidate.c

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 638509e710b..3ce124d3da2 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -648,51 +648,11 @@ in
 
     services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
 
-    system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" {
-      inherit (cfg) layout xkbDir;
+    system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" {
+      inherit (cfg) xkbModel layout xkbVariant xkbOptions;
+      nativeBuildInputs = [ pkgs.xkbvalidate ];
     } ''
-      # We can use the default IFS here, because the layouts won't contain
-      # spaces or tabs and are ruled out by the sed expression below.
-      availableLayouts="$(
-        sed -n -e ':i /^! \(layout\|variant\) *$/ {
-          # Loop through all of the layouts/variants until we hit another ! at
-          # the start of the line or the line is empty ('t' branches only if
-          # the last substitution was successful, so if the line is empty the
-          # substition will fail).
-          :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl
-        }' "$xkbDir/rules/base.lst" | sort -u
-      )"
-
-      layoutNotFound() {
-        echo >&2
-        echo "The following layouts and variants are available:" >&2
-        echo >&2
-
-        # While an output width of 80 is more desirable for small terminals, we
-        # really don't know the amount of columns of the terminal from within
-        # the builder. The content in $availableLayouts however is pretty
-        # large, so let's opt for a larger width here, because it will print a
-        # smaller amount of lines on modern KMS/framebuffer terminals and won't
-        # lose information even in smaller terminals (it only will look a bit
-        # ugly).
-        echo "$availableLayouts" | ${pkgs.utillinux}/bin/column -c 150 >&2
-
-        echo >&2
-        echo "However, the keyboard layout definition in" \
-             "\`services.xserver.layout' contains the layout \`$1', which" \
-             "isn't a valid layout or variant." >&2
-        echo >&2
-        exit 1
-      }
-
-      # Again, we don't need to take care of IFS, see the comment for
-      # $availableLayouts.
-      for l in ''${layout//,/ }; do
-        if ! echo "$availableLayouts" | grep -qxF "$l"; then
-          layoutNotFound "$l"
-        fi
-      done
-
+      validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
       touch "$out"
     '');
 
diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/tools/X11/xkbvalidate/default.nix
new file mode 100644
index 00000000000..f5a26410835
--- /dev/null
+++ b/pkgs/tools/X11/xkbvalidate/default.nix
@@ -0,0 +1,15 @@
+{ lib, runCommandCC, libxkbcommon }:
+
+runCommandCC "xkbvalidate" {
+  buildInputs = [ libxkbcommon ];
+  meta = {
+    description = "NixOS tool to validate X keyboard configuration";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.aszlig ];
+  };
+} ''
+  mkdir -p "$out/bin"
+  gcc -std=gnu11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \
+    -o "$out/bin/validate"
+''
diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
new file mode 100644
index 00000000000..d9c9042467c
--- /dev/null
+++ b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
@@ -0,0 +1,135 @@
+#define _GNU_SOURCE
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <xkbcommon/xkbcommon.h>
+
+static char **log_buffer = NULL;
+static int log_buffer_size = 0;
+static bool log_alloc_success = true;
+
+static void add_log(struct xkb_context *ctx, enum xkb_log_level level,
+                    const char *fmt, va_list args)
+{
+    log_buffer_size++;
+
+    if (log_buffer == NULL)
+        log_buffer = malloc(sizeof(char *));
+    else
+        log_buffer = realloc(log_buffer, sizeof(char *) * log_buffer_size);
+
+    if (log_buffer == NULL) {
+        perror("buffer alloc");
+        log_alloc_success = false;
+        log_buffer_size--;
+        return;
+    }
+
+    if (vasprintf(&log_buffer[log_buffer_size - 1], fmt, args) == -1) {
+        perror("log line alloc");
+        log_alloc_success = false;
+        return;
+    }
+}
+
+static void print_logs(void)
+{
+    for (int i = 0; i < log_buffer_size; ++i)
+        fprintf(stderr, "    %s", log_buffer[i]);
+}
+
+static void free_logs(void)
+{
+    if (log_buffer == NULL)
+        return;
+    for (int i = 0; i < log_buffer_size; ++i)
+        free(log_buffer[i]);
+    free(log_buffer);
+    log_buffer = NULL;
+    log_buffer_size = 0;
+}
+
+static bool try_keymap(struct xkb_context *ctx, struct xkb_rule_names *rdef)
+{
+    struct xkb_keymap *keymap;
+    bool result = true;
+
+    if ((keymap = xkb_keymap_new_from_names(ctx, rdef, 0)) == NULL)
+        result = false;
+    else
+        xkb_keymap_unref(keymap);
+
+    return result;
+}
+
+static void print_error(const char *name, const char *value,
+                        const char *nixos_option)
+{
+    fprintf(stderr, "\nThe value `%s' for keyboard %s is invalid.\n\n"
+                    "Please check the definition in `services.xserver.%s'.\n",
+            value, name, nixos_option);
+    fputs("\nDetailed XKB compiler errors:\n\n", stderr);
+    print_logs();
+    putc('\n', stderr);
+}
+
+#define TRY_KEYMAP(name, value, nixos_option) \
+    *rdef = (struct xkb_rule_names) {0}; \
+    free_logs(); \
+    rdef->name = value; \
+    result = try_keymap(ctx, rdef); \
+    if (!log_alloc_success) \
+        goto out; \
+    if (!result) { \
+        print_error(#name, value, nixos_option); \
+        exit_code = EXIT_FAILURE; \
+        goto out; \
+    }
+
+int main(int argc, char **argv)
+{
+    int exit_code = EXIT_SUCCESS;
+    bool result;
+    struct xkb_context *ctx;
+    struct xkb_rule_names *rdef;
+
+    if (argc != 5) {
+        fprintf(stderr, "Usage: %s model layout variant options\n", argv[0]);
+        return EXIT_FAILURE;
+    }
+
+    ctx = xkb_context_new(XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
+    xkb_context_set_log_fn(ctx, add_log);
+
+    rdef = malloc(sizeof(struct xkb_rule_names));
+
+    TRY_KEYMAP(model,   argv[1], "xkbModel");
+    TRY_KEYMAP(layout,  argv[2], "layout");
+    TRY_KEYMAP(variant, argv[3], "xkbVariant");
+    TRY_KEYMAP(options, argv[4], "xkbOptions");
+
+    free_logs();
+    rdef->model = argv[1];
+    rdef->layout = argv[2];
+    rdef->variant = argv[3];
+    rdef->options = argv[4];
+
+    result = try_keymap(ctx, rdef);
+    if (!log_alloc_success)
+        goto out;
+
+    if (!result) {
+        fputs("The XKB keyboard definition failed to compile:\n", stderr);
+        print_logs();
+        exit_code = EXIT_FAILURE;
+    }
+
+out:
+    free_logs();
+    free(rdef);
+    xkb_context_unref(ctx);
+    return exit_code;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e890a4ba197..6fea60980f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4805,6 +4805,8 @@ with pkgs;
 
   xbrightness = callPackage ../tools/X11/xbrightness { };
 
+  xkbvalidate = callPackage ../tools/X11/xkbvalidate { };
+
   xfstests = callPackage ../tools/misc/xfstests { };
 
   xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {};

From 11e13306f7084c0b60a62dc5dd6a3cff92d41e79 Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Fri, 28 Jul 2017 11:50:47 +0100
Subject: [PATCH 1104/3246] ephemeralpg: init at 2.2

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

diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/applications/misc/ephemeralpg/default.nix
new file mode 100644
index 00000000000..104192f7e61
--- /dev/null
+++ b/pkgs/applications/misc/ephemeralpg/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, postgresql, makeWrapper }:
+stdenv.mkDerivation rec {
+  name = "ephemeralpg-${version}";
+  version = "2.2";
+  src = fetchurl {
+    url = "http://ephemeralpg.org/code/${name}.tar.gz";
+    sha256 = "1v48bcmc23zzqbha80p3spxd5l347qnjzs4z44wl80i2s8fdzlyz";
+  };
+  buildInputs = [ makeWrapper ];
+  installPhase = ''
+    mkdir -p $out
+    PREFIX=$out make install
+    wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fea60980f6..31471fee634 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -989,6 +989,8 @@ with pkgs;
 
   esptool-ck = callPackage ../tools/misc/esptool-ck { };
 
+  ephemeralpg = callPackage ../applications/misc/ephemeralpg {};
+
   f3 = callPackage ../tools/filesystems/f3 { };
 
   facter = callPackage ../tools/system/facter {

From 548033285c8f32a0a54a5bb4b3d6737d4c1e7097 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Fri, 28 Jul 2017 14:01:49 +0200
Subject: [PATCH 1105/3246] cups-filters: 0.15.0 -> 0.16.0

---
 pkgs/misc/cups/filters.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 375afcecf70..be788f9add4 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "0g6jmbzgvsq4dq6jaczr6fslpv3692v8yvvmqgw08sb3aly7kgd3";
+    sha256 = "1kcndzpbbcaxafnz1wa6acy3p3r5likfqmf057i5q0q6i176lz5k";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From 5414e2ae8d4c655e8b2fbae00bc2f61721db4fde Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 19 Jul 2017 14:19:37 +0200
Subject: [PATCH 1106/3246] CODEOWNERS file for review requests

Some time ago GitHub introduced the CODEOWNERS file. The file is similar
to the MAINTAINERS file that was proposed in
https://github.com/NixOS/nixpkgs/issues/13602. Code owners will
automatically receive a review request.
---
 .github/CODEOWNERS | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..268f2c032ad
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,20 @@
+# CODEOWNERS file
+#
+# This file is used to describe who owns what in this repository. This file does not
+# replace `meta.maintainers` but is instead used for other things than derivations
+# and modules, like documentation, package sets, and other assets.
+#
+# For documentation on this file, see https://help.github.com/articles/about-codeowners/
+# Mentioned users will get code review requests.
+
+# Python-related code and docs
+pkgs/top-level/python-packages.nix	@FRidh
+pkgs/development/interpreters/python/*	@FRidh
+pkgs/development/python-modules/*	@FRidh
+doc/languages-frameworks/python.md	@FRidh
+
+# Darwin-related
+pkgs/stdenv/darwin/*    @copumpkin @LnL7
+pkgs/os-specific/darwin/*   @LnL7
+pkgs/os-specific/darwin/apple-source-releases/* @copumpkin
+

From 2cd47a251ac08c8e3dc857d7ab8640318116d0cf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Jul 2017 15:05:23 +0200
Subject: [PATCH 1107/3246] Remove mention-bot

because it hasn't been functioning anymore for a while now.
---
 .mention-bot | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 .mention-bot

diff --git a/.mention-bot b/.mention-bot
deleted file mode 100644
index 33c7e41c1dc..00000000000
--- a/.mention-bot
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "userBlacklist": [
-    "civodul",
-    "jhasse",
-    "shlevy",
-    "bbenoist"
-  ],
-  "alwaysNotifyForPaths": [
-    { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },
-    { "name": "LnL7", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/*"] },
-    { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] }
-  ],
-  "fileBlacklist": ["pkgs/top-level/all-packages.nix"]
-}

From 69c67371dbfff4ad72cb2ae61eac78e978a2e9fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 28 Jul 2017 15:12:07 +0200
Subject: [PATCH 1108/3246] knot-dns: maintenance 2.5.2 -> 2.5.3

---
 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 f1ae382aa38..d9b47e06ae4 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "286671a4ee35a5207b2e45fd0812962b481b1b543bf3d5df3a8c319c26e2f5e9";
+    sha256 = "d78ae231a68ace264f5738c8e57481923bcad7413f3f440c06fa6cc0aded9d8e";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 62e4e3301b1e53d2873f3f2b3430262a232b458b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 28 Jul 2017 15:12:23 +0200
Subject: [PATCH 1109/3246] knot-resolver: maintenance 1.3.1 -> 1.3.2

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

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 441e1f1ab0f..383ad85cfa5 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117";
+    sha256 = "846b7496cb6273b831fd52eca09078c0454b06a8a6b792e2125c7b6818246edb";
   };
 
   outputs = [ "out" "dev" ];

From d2f45babe34de2b4da0056089b32bb086cca5989 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 28 Jul 2017 16:24:44 +0300
Subject: [PATCH 1110/3246] xfstests: Use keyutils

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

diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index a28614e2a26..c9ed6411c68 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
+{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk, keyutils
 , lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su
 , time, utillinux, which, writeScript, xfsprogs }:
 
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
       ln -s @out@/lib/xfstests/$f $f
     done
 
-    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH
+    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH
     exec ./check "$@"
   '';
 

From 20d2bfa4ff247a49f50fc0cf4d509fbd48723290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 28 Jul 2017 15:33:40 +0200
Subject: [PATCH 1111/3246] knot-resolver: remove unused inputs

---
 pkgs/servers/dns/knot-resolver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 383ad85cfa5..d4210c31eb8 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, utillinux, hexdump, which
+{ stdenv, fetchurl, pkgconfig, hexdump, which
 , knot-dns, luajit, libuv, lmdb
 , cmocka, systemd, hiredis, libmemcached
 , gnutls, nettle

From f43c4458242e74c1ae45e6521dcd8bf0755f60c4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jul 2017 09:55:48 -0400
Subject: [PATCH 1112/3246] linux: 4.12.3 -> 4.12.4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index 9b8c99e1bc4..51841031eff 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.3";
+  version = "4.12.4";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "05mz5rza2cn7pnn0cgd4pxal4xyjk74bl6h742v0xxlf4aqrvgcr";
+    sha256 = "1jasxw8ifkklyfmp0avh53zjymgqwybaz3cmh9l5ydss3xgxfw7l";
   };
 
   kernelPatches = args.kernelPatches;

From 88c0f67ded95fd6b5868230abf2ff7d8892343d6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jul 2017 10:00:25 -0400
Subject: [PATCH 1113/3246] linux: 4.9.39 -> 4.9.40

---
 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 59f349078ee..4ad4a5dfef7 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.39";
+  version = "4.9.40";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0cgs3kprx73qffzy0vwd3wz0jdsxbb8b9p881mrcxa3gjfxzg33f";
+    sha256 = "16rdcvqkgb8hfzkkzbkhznnab22z43prm56jbrxnqr9acprnfmq2";
   };
 
   kernelPatches = args.kernelPatches;

From 5a6b5b8dafa94a1a42a4600442719fc7a18a33b0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jul 2017 10:02:29 -0400
Subject: [PATCH 1114/3246] linux: 4.4.78 -> 4.4.79

---
 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 de98da0a48a..d421633553a 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.78";
+  version = "4.4.79";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14xnmcw0f2faizd6ylhgw929yyc30hglr82mc5c62yzgszsdngvw";
+    sha256 = "1a5wprjimsnx49sdg05ndmnx84m24fl48s64jvdpz58i3sss7g8d";
   };
 
   kernelPatches = args.kernelPatches;

From 00bf3a9dcaffedc4eaf244848a2a3f84e648bdba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Jul 2017 16:10:07 +0200
Subject: [PATCH 1115/3246] Revert "kbd: 2.0.3 -> 2.0.4"

This reverts commit fd43b508775dd9490cc1314c4239ab48265d4529.

```
substitute(): ERROR: Invalid command line argument: /nix/store/8f42syfzv3cpw3jjq96sdzvnclivi783-kbd-2.0.4/bin/unicode_stop
```

@rnhmjoj please check
---
 pkgs/os-specific/linux/kbd/console-fix.patch  | 18 +++++
 pkgs/os-specific/linux/kbd/default.nix        | 17 +---
 pkgs/os-specific/linux/kbd/search-paths.patch | 78 ++++++++++---------
 3 files changed, 64 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kbd/console-fix.patch

diff --git a/pkgs/os-specific/linux/kbd/console-fix.patch b/pkgs/os-specific/linux/kbd/console-fix.patch
new file mode 100644
index 00000000000..aefc20ff914
--- /dev/null
+++ b/pkgs/os-specific/linux/kbd/console-fix.patch
@@ -0,0 +1,18 @@
+diff --git a/src/loadkeys.c b/src/loadkeys.c
+index 6b23f68..adf65a0 100644
+--- a/src/loadkeys.c
++++ b/src/loadkeys.c
+@@ -166,10 +166,10 @@ main(int argc, char *argv[])
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+-	/* get console */
+-	fd = getfd(console);
+-
+ 	if (!(options & OPT_M) && !(options & OPT_B)) {
++		/* get console */
++		fd = getfd(console);
++
+ 		/* check whether the keyboard is in Unicode mode */
+ 		if (ioctl(fd, KDGKBMODE, &kbd_mode) ||
+ 		    ioctl(fd, KDGETMODE, &kd_mode)) {
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index 31fcdae6c80..6e8893cc37d 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -1,15 +1,12 @@
-{ stdenv, fetchurl, autoreconfHook,
-  gzip, bzip2, pkgconfig, flex, check,
-  pam, coreutils
-}:
+{ stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, flex, check, pam }:
 
 stdenv.mkDerivation rec {
   name = "kbd-${version}";
-  version = "2.0.4";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz";
-    sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz";
+    sha256 = "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs";
   };
 
   configureFlags = [
@@ -18,7 +15,7 @@ stdenv.mkDerivation rec {
     "--disable-nls"
   ];
 
-  patches = [ ./search-paths.patch ];
+  patches = [ ./console-fix.patch ./search-paths.patch ];
 
   postPatch =
     ''
@@ -37,12 +34,6 @@ stdenv.mkDerivation rec {
       ''}
     '';
 
-  postInstall = ''
-    substituteInPlace $out/bin/unicode_{start,stop} \
-      --replace /usr/bin/tty ${coreutils}/bin/tty
-  '';
-
-
   buildInputs = [ check pam ];
   nativeBuildInputs = [ autoreconfHook pkgconfig flex ];
 
diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/os-specific/linux/kbd/search-paths.patch
index c9405a56721..66a56041481 100644
--- a/pkgs/os-specific/linux/kbd/search-paths.patch
+++ b/pkgs/os-specific/linux/kbd/search-paths.patch
@@ -1,71 +1,77 @@
---- a/src/libkeymap/analyze.l
-+++ b/src/libkeymap/analyze.l
-@@ -101,6 +101,9 @@ stack_pop(struct lk_ctx *ctx, void *scan
+diff -ru3 kbd-2.0.3-old/src/libkeymap/analyze.l kbd-2.0.3/src/libkeymap/analyze.l
+--- kbd-2.0.3-old/src/libkeymap/analyze.l	2016-07-03 02:31:28.258958092 +0300
++++ kbd-2.0.3/src/libkeymap/analyze.l	2016-07-03 02:44:53.042592223 +0300
+@@ -99,6 +99,9 @@
  static const char *const include_dirpath0[] = { "", 0 };
  static const char *const include_dirpath1[] = { "", "../include/", "../../include/", 0 };
  static const char *const include_dirpath3[] = {
-+ 	"/etc/kbd/" KEYMAPDIR "/include/",
-+ 	"/etc/kbd/" KEYMAPDIR "/i386/include/",
-+ 	"/etc/kbd/" KEYMAPDIR "/mac/include/",
++	"/etc/kbd/" KEYMAPDIR "/include/",
++	"/etc/kbd/" KEYMAPDIR "/i386/include/",
++	"/etc/kbd/" KEYMAPDIR "/mac/include/",
  	DATADIR "/" KEYMAPDIR "/include/",
  	DATADIR "/" KEYMAPDIR "/i386/include/",
  	DATADIR "/" KEYMAPDIR "/mac/include/", 0
---- a/src/loadkeys.c
-+++ b/src/loadkeys.c
-@@ -27,7 +27,7 @@
+diff -ru3 kbd-2.0.3-old/src/loadkeys.c kbd-2.0.3/src/loadkeys.c
+--- kbd-2.0.3-old/src/loadkeys.c	2016-07-03 02:31:28.260958091 +0300
++++ kbd-2.0.3/src/loadkeys.c	2016-07-03 02:34:34.123871103 +0300
+@@ -26,7 +26,7 @@
  #include "keymap.h"
  
- static const char *progname         = NULL;
+ static const char *progname = NULL;
 -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
 +static const char *const dirpath1[] = { "", "/etc/kbd/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", 0 };
  static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
  
- static void __attribute__((noreturn))
---- a/src/loadunimap.c
-+++ b/src/loadunimap.c
-@@ -30,7 +30,7 @@
+ static void __attribute__ ((noreturn))
+diff -ru3 kbd-2.0.3-old/src/loadunimap.c kbd-2.0.3/src/loadunimap.c
+--- kbd-2.0.3-old/src/loadunimap.c	2016-07-03 02:31:28.259958091 +0300
++++ kbd-2.0.3/src/loadunimap.c	2016-07-03 02:33:06.803911971 +0300
+@@ -28,7 +28,7 @@
  extern char *progname;
  extern int force;
  
--static const char *const unidirpath[]  = { "", DATADIR "/" UNIMAPDIR "/", 0 };
-+static const char *const unidirpath[]  = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 };
+-static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
++static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 };
  static const char *const unisuffixes[] = { "", ".uni", ".sfm", 0 };
  
  #ifdef MAIN
---- a/src/mapscrn.c
-+++ b/src/mapscrn.c
-@@ -27,7 +27,7 @@ void loadnewmap(int fd, char *mfil);
- static int ctoi(char *);
+diff -ru3 kbd-2.0.3-old/src/mapscrn.c kbd-2.0.3/src/mapscrn.c
+--- kbd-2.0.3-old/src/mapscrn.c	2016-07-03 02:31:28.260958091 +0300
++++ kbd-2.0.3/src/mapscrn.c	2016-07-03 02:33:21.119905270 +0300
+@@ -25,7 +25,7 @@
+ static int ctoi (char *);
  
  /* search for the map file in these directories (with trailing /) */
--static const char *const mapdirpath[]  = { "", DATADIR "/" TRANSDIR "/", 0 };
-+static const char *const mapdirpath[]  = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 };
+-static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
++static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 };
  static const char *const mapsuffixes[] = { "", ".trans", "_to_uni.trans", ".acm", 0 };
  
  #ifdef MAIN
---- a/src/resizecons.c
-+++ b/src/resizecons.c
-@@ -101,7 +101,7 @@ static int vga_get_fontheight(void);
+diff -ru3 kbd-2.0.3-old/src/resizecons.c kbd-2.0.3/src/resizecons.c
+--- kbd-2.0.3-old/src/resizecons.c	2016-07-03 02:31:28.260958091 +0300
++++ kbd-2.0.3/src/resizecons.c	2016-07-03 02:33:32.253900060 +0300
+@@ -100,7 +100,7 @@
  static void vga_set_cursor(int, int);
  static void vga_set_verticaldisplayend_lowbyte(int);
  
--const char *const dirpath[]  = { "", DATADIR "/" VIDEOMODEDIR "/", 0 };
-+const char *const dirpath[]  = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0};
+-const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0};
++const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0};
  const char *const suffixes[] = { "", 0 };
  
- int main(int argc, char **argv)
---- a/src/setfont.c
-+++ b/src/setfont.c
-@@ -53,10 +53,10 @@ int force   = 0;
- int debug   = 0;
+ int
+diff -ru3 kbd-2.0.3-old/src/setfont.c kbd-2.0.3/src/setfont.c
+--- kbd-2.0.3-old/src/setfont.c	2016-07-03 02:31:28.260958091 +0300
++++ kbd-2.0.3/src/setfont.c	2016-07-03 02:33:54.315889734 +0300
+@@ -51,10 +51,10 @@
+ int debug = 0;
  
  /* search for the font in these directories (with trailing /) */
--const char *const fontdirpath[]  = { "", DATADIR "/" FONTDIR "/", 0 };
-+const char *const fontdirpath[]  = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 };
+-const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 };
++const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 };
  const char *const fontsuffixes[] = { "", ".psfu", ".psf", ".cp", ".fnt", 0 };
  /* hide partial fonts a bit - loading a single one is a bad idea */
--const char *const partfontdirpath[]  = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
-+const char *const partfontdirpath[]  = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
+-const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
++const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
  const char *const partfontsuffixes[] = { "", 0 };
  
  static inline int

From b5f436cf0ec148bed1f901a2bccabb366fc49753 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 22 Jul 2017 10:20:26 +0800
Subject: [PATCH 1116/3246] pythonPackages.zconfig: Add missing build-time only
 dependencies

---
 pkgs/development/python-modules/zconfig/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index aa90bf0ce1a..5e7c762d03a 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -2,6 +2,8 @@
 , fetchPypi
 , buildPythonPackage
 , zope_testrunner
+, manuel
+, docutils
 }:
 
 buildPythonPackage rec {
@@ -16,6 +18,7 @@ buildPythonPackage rec {
 
   patches = [ ./skip-broken-test.patch ];
 
+  buildInputs = [ manuel docutils ];
   propagatedBuildInputs = [ zope_testrunner ];
 
   meta = with stdenv.lib; {

From 1d6aa6581ade284c567575db14a09e0283b52f99 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 22 Jul 2017 10:20:45 +0800
Subject: [PATCH 1117/3246] pythonPackages.btrees: Add missing build-time only
 dependencies

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

diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 7cb10d96f90..7bfad0d4f5e 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -5,7 +5,8 @@ buildPythonPackage rec {
   version = "4.4.1";
   name = "${pname}-${version}";
 
-  propagatedBuildInputs = [ persistent zope_interface transaction ];
+  buildInputs = [ transaction ];
+  propagatedBuildInputs = [ persistent zope_interface ];
 
   src = fetchPypi {
     inherit pname version;

From 2e34c6d8a957df89d193025060f2f195e9452220 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 22 Jul 2017 10:23:02 +0800
Subject: [PATCH 1118/3246] pythonPackages.zc_lockfile: 1.0.2 -> 1.2.1

---
 .../python-modules/zc_lockfile/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +------------
 2 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/zc_lockfile/default.nix

diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix
new file mode 100644
index 00000000000..8a438fadcd7
--- /dev/null
+++ b/pkgs/development/python-modules/zc_lockfile/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage
+, fetchPypi
+, mock
+, zope_testing
+, stdenv
+}:
+
+buildPythonPackage rec {
+  pname = "zc.lockfile";
+  version = "1.2.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e";
+  };
+
+  buildInputs = [ mock ];
+  propagatedBuildInputs = [ zope_testing ];
+
+  meta = with stdenv.lib; {
+    description = "Inter-process locks";
+    homepage =  http://www.python.org/pypi/zc.lockfile;
+    license = licenses.zpt20;
+    maintainers = with maintainers; [ goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b97d88c045..86711d154bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24943,23 +24943,7 @@ EOF
   zconfig = callPackage ../development/python-modules/zconfig { };
 
 
-  zc_lockfile = buildPythonPackage rec {
-    name = "zc.lockfile-${version}";
-    version = "1.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zc.lockfile/${name}.tar.gz";
-      sha256 = "96bb2aa0438f3e29a31e4702316f832ec1482837daef729a92e28c202d8fba5c";
-    };
-
-    meta = {
-      description = "Inter-process locks";
-      homepage =  http://www.python.org/pypi/zc.lockfile;
-      license = licenses.zpt20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
+  zc_lockfile = callPackage ../development/python-modules/zc_lockfile { };
 
   zdaemon = buildPythonPackage rec {
     name = "zdaemon-${version}";

From 61e73427e00e0eb5419ebbdb2e96ccacc513532b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 22 Jul 2017 10:24:43 +0800
Subject: [PATCH 1119/3246] pythonPackages.zodbpickle: 0.5.2 -> 0.6.0

---
 .../python-modules/zodbpickle/default.nix     | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +-------------
 2 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/zodbpickle/default.nix

diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix
new file mode 100644
index 00000000000..f51b30ab51e
--- /dev/null
+++ b/pkgs/development/python-modules/zodbpickle/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage
+, isPyPy
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "zodbpickle";
+  version = "0.6.0";
+  name = "${pname}-${version}";
+  disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665";
+  };
+
+  # fails..
+  doCheck = false;
+
+  meta = {
+    homepage = http://pypi.python.org/pypi/zodbpickle;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86711d154bb..e4a7a349fa3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25045,22 +25045,7 @@ EOF
     };
   };
 
-  zodbpickle = self.buildPythonPackage rec {
-    name = "zodbpickle-0.5.2";
-    disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zodbpickle/${name}.tar.gz";
-      sha256 = "f65c00fbc13523fced63de6cc11747aa1a6343aeb2895c89838ed55a5ab12cca";
-    };
-
-    # fails..
-    doCheck = false;
-
-    meta = {
-      homepage = http://pypi.python.org/pypi/zodbpickle;
-    };
-  };
+  zodbpickle = callPackage ../development/python-modules/zodbpickle {};
 
   BTrees = callPackage ../development/python-modules/btrees {};
 

From 6bd2ac77075ec8b16094ef566b0b515faf8d0106 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 22 Jul 2017 10:26:28 +0800
Subject: [PATCH 1120/3246] pythonPackages.persistent: 4.0.8 -> 4.2.4.2

---
 .../python-modules/persistent/default.nix     | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +------------
 2 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/persistent/default.nix

diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
new file mode 100644
index 00000000000..4940a8b2e04
--- /dev/null
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage
+, fetchPypi
+, zope_interface
+, pkgs
+}:
+
+buildPythonPackage rec {
+  pname = "persistent";
+  version = "4.2.4.2";
+  name = "${pname}-${version}";
+
+  propagatedBuildInputs = [ zope_interface ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cf264cd55866c7ffbcbe1328f8d8b28fd042a5dd0c03a03f68c0887df3aa1964";
+  };
+
+  meta = {
+    description = "Automatic persistence for Python objects";
+    homepage = http://www.zope.org/Products/ZODB;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4a7a349fa3..276c2539926 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25049,21 +25049,7 @@ EOF
 
   BTrees = callPackage ../development/python-modules/btrees {};
 
-  persistent = self.buildPythonPackage rec {
-    name = "persistent-4.0.8";
-
-    propagatedBuildInputs = with self; [ zope_interface ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/persistent/${name}.tar.gz";
-      sha256 = "678902217c5370d33694c6dc95b89e1e6284b4dc41f04c056326194a3f6f3e22";
-    };
-
-    meta = {
-      description = "Automatic persistence for Python objects";
-      homepage = http://www.zope.org/Products/ZODB;
-    };
-  };
+  persistent = callPackage ../development/python-modules/persistent {};
 
   xdot = buildPythonPackage rec {
     name = "xdot-0.7";

From fcb6e72ddf7d3fe43df23998147164abba8b6e63 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 22 Jul 2017 10:28:43 +0800
Subject: [PATCH 1121/3246] vulnix: use zc_lockfile, zodbpickle and persistent
 from pythonPackages

---
 pkgs/tools/security/vulnix/requirements.nix | 96 ++++-----------------
 1 file changed, 16 insertions(+), 80 deletions(-)

diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
index 11faca44ef9..d44d49f12a9 100644
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -1,38 +1,6 @@
 { pythonPackages, fetchurl, stdenv }:
 
 rec {
-  BTrees = pythonPackages.buildPythonPackage {
-    name = "BTrees-4.3.1";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/24/76/cd6f225f2180c22af5cdb6656f51aec5fca45e45bdc4fa75c0a32f161a61/BTrees-4.3.1.tar.gz";
-      sha256 = "2565b7d35260dfc6b1e2934470fd0a2f9326c58c535a2b4cb396289d1c195a95";
-    };
-    propagatedBuildInputs = [
-      persistent
-      transaction
-    ] ++ (with pythonPackages; [ zope_interface coverage ]);
-
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.zpt21;
-      description = "Scalable persistent object containers";
-    };
-  };
-
-  ZConfig = pythonPackages.buildPythonPackage {
-    name = "ZConfig-3.1.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz";
-      sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e";
-    };
-    propagatedBuildInputs = with pythonPackages; [ zope_testrunner ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.zpt21;
-      description = "Structured Configuration Library";
-    };
-  };
-
   zodb = pythonPackages.buildPythonPackage {
     name = "ZODB-5.2.0";
     src = fetchurl {
@@ -41,13 +9,18 @@ rec {
     };
     doCheck = false;
     propagatedBuildInputs = [
-      BTrees
-      persistent
       transaction
-      ZConfig
-      zc.lockfile
+    ] ++ (with pythonPackages; [
+      six
+      wheel
+      zope_interface
       zodbpickle
-    ] ++ (with pythonPackages; [ six wheel zope_interface ]);
+      zconfig
+      persistent
+      zc_lockfile
+      BTrees
+    ]);
+
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
@@ -55,59 +28,22 @@ rec {
     };
   };
 
-  persistent = pythonPackages.buildPythonPackage {
-    name = "persistent-4.2.2";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz";
-      sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c";
-    };
-    propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ];
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.zpt21;
-      description = "Translucent persistent objects";
-    };
-  };
-
   transaction = pythonPackages.buildPythonPackage {
     name = "transaction-2.0.3";
     src = fetchurl {
       url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz";
       sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f";
     };
-    propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ];
+    propagatedBuildInputs = with pythonPackages; [
+      zope_interface
+      six
+      wheel
+      mock
+    ];
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
       description = "Transaction management for Python";
     };
   };
-
-  zc.lockfile = pythonPackages.buildPythonPackage {
-    name = "zc.lockfile-1.2.1";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/bd/84/0299bbabbc9d3f84f718ba1039cc068030d3ad723c08f82a64337edf901e/zc.lockfile-1.2.1.tar.gz";
-      sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e";
-    };
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.zpt21;
-      description = "Basic inter-process locks";
-    };
-  };
-
-  zodbpickle = pythonPackages.buildPythonPackage {
-    name = "zodbpickle-0.6.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/7a/fc/f6f437a5222b330735eaf8f1e67a6845bd1b600e9a9455e552d3c13c4902/zodbpickle-0.6.0.tar.gz";
-      sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665";
-    };
-    doCheck = false;
-
-    meta = with stdenv.lib; {
-      homepage = "";
-      license = licenses.zpt21;
-      description = "Fork of Python 3 pickle module.";
-    };
-  };
 }

From ee38a35f95d16b8cbf0d462aa3285448424098f5 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Sat, 8 Jul 2017 23:32:01 +0000
Subject: [PATCH 1122/3246] pythonPackages.dkimpy: 0.6.1 -> 0.6.2

---
 .../python-modules/dkimpy/default.nix         | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix
index df768f5d122..e32a9262f53 100644
--- a/pkgs/development/python-modules/dkimpy/default.nix
+++ b/pkgs/development/python-modules/dkimpy/default.nix
@@ -5,19 +5,24 @@ buildPythonApplication rec {
   name = "${pname}-${majorversion}.${minorversion}";
   pname = "dkimpy";
   majorversion = "0.6";
-  minorversion = "1";
+  minorversion = "2";
 
   src = fetchurl {
     url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz";
-    sha256 = "0zmvyw18ww1jqrbqws636w3xki59fyqva553r6s74q5c4jvy36v2";
+    sha256 = "1hagz8qk0v4ijfbcdq4z28bpgr2mkpr498z76i1vam2d50chmakl";
   };
 
   buildInputs = [ pytest ];
   propagatedBuildInputs =  [ openssl dns ];
 
-  patchPhase = ''substituteInPlace dknewkey.py --replace \
-     /usr/bin/openssl ${openssl}/bin/openssl
-     '';
+  patchPhase = ''
+    substituteInPlace dknewkey.py --replace \
+      /usr/bin/openssl ${openssl}/bin/openssl
+  '';
+
+  checkPhase = ''
+    python ./test.py
+  '';
 
   postInstall = ''
     mkdir -p $out/bin $out/libexec
@@ -27,15 +32,16 @@ buildPythonApplication rec {
     makeWrapper "$out/libexec/arcverify.py" $out/bin/arcverify
     makeWrapper "$out/libexec/arcsign.py" $out/bin/arcsign
     makeWrapper "$out/libexec/dknewkey.py" $out/bin/dknewkey
-   '';
+  '';
 
   meta = with stdenv.lib; {
     description = "DKIM + ARC email signing/verification tools + Python module";
-    longDescription = ''Python module that implements DKIM (DomainKeys Identified Mail)
-      email signing and verification. It also provides a number of convєnient tools
-      for command line signing and verification, as well as generating new DKIM records.
-      This version also supports the experimental Authenticated Received Chain (ARC)
-      protocol.
+    longDescription = ''
+      Python module that implements DKIM (DomainKeys Identified Mail) email
+      signing and verification. It also provides a number of convєnient tools
+      for command line signing and verification, as well as generating new DKIM
+      records. This version also supports the experimental Authenticated
+      Received Chain (ARC) protocol.
     '';
     homepage = "https://launchpad.net/dkimpy";
     license = licenses.bsd3;

From cecbb9fdf6a0b46a5714fd78c5a844d663fde3d7 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Sat, 8 Jul 2017 23:13:57 +0000
Subject: [PATCH 1123/3246] dnspython: 1.14.0 -> 1.15.0

---
 .../python-modules/dns/default.nix            | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +---------------
 2 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/dns/default.nix

diff --git a/pkgs/development/python-modules/dns/default.nix b/pkgs/development/python-modules/dns/default.nix
new file mode 100644
index 00000000000..0548c5a1098
--- /dev/null
+++ b/pkgs/development/python-modules/dns/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage, fetchPypi, lib }:
+
+buildPythonPackage rec {
+  pname = "dnspython";
+  version = "1.15.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "0z5d9vwf211v54bybrhm3qpxclys4dfdfsp7lk2hvf57yzhn7xa0";
+  };
+
+  # needs networking for some tests
+  doCheck = false;
+
+  meta = {
+    description = "A DNS toolkit for Python 3.x";
+    homepage = http://www.dnspython.org;
+    # BSD-like, check http://www.dnspython.org/LICENSE for details
+    license = lib.licenses.free;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 276c2539926..c5d685bbd30 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5321,25 +5321,7 @@ in {
     };
   };
 
-  dns = buildPythonPackage rec {
-    name = "dnspython-${version}";
-    version = "1.14.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dnspython/${name}.zip";
-      sha256 = "1p1i46fyhxfic8mfh3gfckpn2pn7282xqabhihiqymrp4sa8ni91";
-    };
-
-    # needs networking for some tests
-    doCheck = false;
-
-    meta = {
-      description = "A DNS toolkit for Python 3.x";
-      homepage = http://www.dnspython.org;
-      # BSD-like, check http://www.dnspython.org/LICENSE for details
-      license = licenses.free;
-    };
-  };
+  dns = callPackage ../development/python-modules/dns { };
 
   docker = callPackage ../development/python-modules/docker.nix {};
 

From cb77b9c2e9ece07ee7e966548bafd7fac88bbc72 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Sun, 9 Jul 2017 00:01:12 +0000
Subject: [PATCH 1124/3246] formencode: update for dnspython

---
 .../python-modules/FormEncode/default.nix     | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +--------------
 2 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/FormEncode/default.nix

diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix
new file mode 100644
index 00000000000..f0ccead6059
--- /dev/null
+++ b/pkgs/development/python-modules/FormEncode/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchPypi, dns, pycountry, nose }:
+
+buildPythonPackage rec {
+  pname = "FormEncode";
+  version = "1.3.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "0y5gywq0l79l85ylr55p4xy0h921zgmfw6zmrvlh83aa4j074xg6";
+  };
+
+  buildInputs = [ dns pycountry nose ];
+
+  patchPhase = ''
+    # dnspython3 has been superseded, see its PyPI page
+    substituteInPlace setup.py --replace dnspython3 dnspython
+  '';
+
+  preCheck = ''
+    # two tests require dns resolving
+    sed -i 's/test_cyrillic_email/noop/' formencode/tests/test_email.py
+    sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "FormEncode validates and converts nested structures";
+    homepage = "http://formencode.org";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c5d685bbd30..6a1b3365cc6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15957,30 +15957,7 @@ in {
     '';
   };
 
-  FormEncode = buildPythonPackage rec {
-    name = "FormEncode-${version}";
-    version = "1.3.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/FormEncode/${name}.zip";
-      sha256 = "0y5gywq0l79l85ylr55p4xy0h921zgmfw6zmrvlh83aa4j074xg6";
-    };
-
-    buildInputs = with self; [
-      dns pycountry nose
-    ];
-
-    preCheck = ''
-      # two tests require dns resolving
-      sed -i 's/test_cyrillic_email/noop/' formencode/tests/test_email.py
-      sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py
-    '';
-
-    meta = with stdenv.lib; {
-      description = "FormEncode validates and converts nested structures";
-      homepage = "http://formencode.org";
-    };
-  };
+  FormEncode = callPackage ../development/python-modules/FormEncode { };
 
   pycountry = buildPythonPackage rec {
     name = "pycountry-${version}";

From d2c0a46797cdb3d8fe337a8d77ae7870e3cc9fef Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Mon, 3 Jul 2017 23:30:58 +0000
Subject: [PATCH 1125/3246] email_validator: init at 1.0.2

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

diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix
new file mode 100644
index 00000000000..4fc78d8bd1e
--- /dev/null
+++ b/pkgs/development/python-modules/email-validator/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dns, idna, ipaddress }:
+
+buildPythonPackage rec {
+  pname = "email_validator";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ja9149l9ck5n45a72h3is7v476hjny5ybxbcamx1nw6iplsm7k6";
+  };
+
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    dns
+    idna
+  ] ++ (if isPy3k then [ ] else [ ipaddress ]);
+
+  meta = with lib; {
+    description = "A robust email syntax and deliverability validation library for Python 2.x/3.x.";
+    homepage    = https://github.com/JoshData/python-email-validator;
+    license     = licenses.cc0;
+    maintainers = with maintainers; [ siddharthist ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a1b3365cc6..475205d25d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -136,6 +136,8 @@ in {
 
   emcee = callPackage ../development/python-modules/emcee { };
 
+  email_validator = callPackage ../development/python-modules/email-validator { };
+
   dbus-python = callPackage ../development/python-modules/dbus {
     dbus = pkgs.dbus;
   };

From 822b09a5145c08e116451a9dfc248def12c5e90c Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Mon, 3 Jul 2017 23:31:49 +0000
Subject: [PATCH 1126/3246] ukpostcodeparser: init at 1.1.0

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

diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix
new file mode 100644
index 00000000000..6eae1f52456
--- /dev/null
+++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "UkPostcodeParser";
+  version = "1.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1v8k91xhg5fr6sk91am93abjarw950ray7b9q3w5j25agjsxgcsf";
+  };
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "UK Postcode parser";
+    homepage    = https://github.com/hamstah/ukpostcodeparser;
+    license     = licenses.publicDomain;
+    maintainers = with maintainers; [ siddharthist ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 475205d25d7..2bb2b161cce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24018,6 +24018,8 @@ in {
 
   u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { };
 
+  ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { };
+
   umalqurra = buildPythonPackage rec {
     name = "umalqurra-${version}";
     version = "0.2";

From 0dea2d20a74aa0a56f0d7044b43b66b423331177 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Mon, 3 Jul 2017 23:33:04 +0000
Subject: [PATCH 1127/3246] faker: 0.0.4 -> 0.7.17

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

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
new file mode 100644
index 00000000000..d5934f38b88
--- /dev/null
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, buildPythonPackage, fetchPypi,
+  # Build inputs
+  dateutil, six,
+  # Test inputs
+  email_validator, nose, mock, ukpostcodeparser }:
+
+buildPythonPackage rec {
+  pname = "Faker";
+  version = "0.7.17";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0n4achwr6dcf67n983ls5cbp5ic3jrwsbl92rzjlzb1xvz1s1js9";
+  };
+
+  checkInputs = [
+    email_validator
+    nose
+    mock
+    ukpostcodeparser
+  ];
+
+  propagatedBuildInputs = [
+    dateutil
+    six
+  ];
+
+  meta = with lib; {
+    description = "A Python library for generating fake user data";
+    homepage    = http://faker.rtfd.org;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2bb2b161cce..7cf16707d26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5960,22 +5960,7 @@ in {
     };
   };
 
-  faker = buildPythonPackage rec {
-    name = "faker-0.0.4";
-    disabled = isPy3k;
-    src = pkgs.fetchurl {
-      url = mirror://pypi/F/Faker/Faker-0.0.4.tar.gz;
-      sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1";
-    };
-    buildInputs = with self; [ nose ];
-    meta = {
-      description = "A Python library for generating fake user data";
-      homepage    = http://pypi.python.org/pypi/Faker;
-      license     = licenses.mit;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-  };
+  faker = callPackage ../development/python-modules/faker { };
 
   fake_factory = buildPythonPackage rec {
     name = "fake-factory-${version}";

From 8081ab6e5cb8a190dbe68803ee40157db5de8907 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Tue, 25 Jul 2017 21:35:53 +0000
Subject: [PATCH 1128/3246] pythonPackages.pysideShiboken: patch for Python 3.6

---
 pkgs/development/python-modules/pyside/shiboken.nix        | 4 ++--
 pkgs/development/python-modules/pyside/shiboken_py35.patch | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index cef78c21550..0864b641cdb 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }:
+{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36 }:
 
 # This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     substituteInPlace generator/CMakeLists.txt --replace \
       \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
   '';
-  patches = if isPy35 then [ ./shiboken_py35.patch ] else null;
+  patches = if (isPy35 || isPy36) then [ ./shiboken_py35.patch ] else null;
 
   cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;
 
diff --git a/pkgs/development/python-modules/pyside/shiboken_py35.patch b/pkgs/development/python-modules/pyside/shiboken_py35.patch
index 5642ddc594d..32088144ed7 100644
--- a/pkgs/development/python-modules/pyside/shiboken_py35.patch
+++ b/pkgs/development/python-modules/pyside/shiboken_py35.patch
@@ -6,7 +6,7 @@ diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs
  # CMAKE_FIND_FRAMEWORKS(Python)
  
 -FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0)
-+FOREACH(_CURRENT_VERSION 3.5 3.4 3.3 3.2 3.1 3.0)
++FOREACH(_CURRENT_VERSION 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
    IF(_CURRENT_VERSION GREATER 3.1)
        SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
    ELSE()

From f05fcb40a1a4f4772b2fc345619206850366907a Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Tue, 25 Jul 2017 21:49:54 +0000
Subject: [PATCH 1129/3246] pythonPackages.FormEncode: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix
index f0ccead6059..ff744fc1b8a 100644
--- a/pkgs/development/python-modules/FormEncode/default.nix
+++ b/pkgs/development/python-modules/FormEncode/default.nix
@@ -2,13 +2,12 @@
 
 buildPythonPackage rec {
   pname = "FormEncode";
-  version = "1.3.0";
+  version = "1.3.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    extension = "zip";
-    sha256 = "0y5gywq0l79l85ylr55p4xy0h921zgmfw6zmrvlh83aa4j074xg6";
+    sha256 = "1xm77h2mds2prlaz0z4nzkx13g61rx5c2v3vpgjq9d5ij8bzb8md";
   };
 
   buildInputs = [ dns pycountry nose ];

From e985aa5501f6ab6bf363cf5ffd555e10a4fe63c5 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Tue, 25 Jul 2017 21:50:16 +0000
Subject: [PATCH 1130/3246] pythonPackages.sqlobject: 3.0.0 -> 3.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7cf16707d26..0f66e2b24cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21662,14 +21662,23 @@ in {
   };
 
   sqlobject = buildPythonPackage rec {
-    version = "3.0.0";
-    name = "sqlobject-${version}";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/S/SQLObject/SQLObject-${version}.tar.gz";
-      sha256 = "15g3g7f4yiyplqf54px1dsnmrw3jb7xwx97z8qzgp9ijmm5vpr8r";
+    pname = "SQLObject";
+    version = "3.3.0";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0p2dxrxh7xrv5yys09v5z95d0z40w22aq3xc01ghdidd7hr79xy9";
     };
 
-    propagatedBuildInputs = with self; [ pydispatcher FormEncode ];
+    checkInputs = with self; [ pytest ];
+
+    propagatedBuildInputs = with self; [
+      FormEncode
+      PasteDeploy
+      paste
+      pydispatcher
+    ];
 
     meta = {
       description = "Object Relational Manager for providing an object interface to your database";

From 451ac7bc3fb789a8b16c572a4c89efcd6b5e8eed Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Jul 2017 15:57:07 +0200
Subject: [PATCH 1131/3246] python.pkgs.pytest_xdist: 1.16.0 -> 1.18.2

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

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index b3577908cf9..600c98925af 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-xdist";
-  version = "1.16.0";
+  version = "1.18.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "42e5a1e5da9d7cff3e74b07f8692598382f95624f234ff7e00a3b1237e0feba2";
+    sha256 = "10468377901b80255cf192c4603a94ffe8b1f071f5c912868da5f5cb91170dae";
   };
 
   buildInputs = [ pytest setuptools_scm ];

From 07ab4d257eb45fd63e5edeb942ad3000b6a8eff9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jul 2017 10:22:47 -0400
Subject: [PATCH 1132/3246] scala: 2.12.2 -> 2.12.3

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

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index e48fc63096e..d4d4a0f31bc 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.12.2";
+  name = "scala-2.12.3";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "1xd68q9h0vzqndar3r4mvabbd7naa25fbiciahkhxwgw8sr6hq8r";
+    sha256 = "133w4r2214ci7r4sg2yyk9lhn62ldm4ad0d89drwrvgvffvnly9b";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 5b0915289894e5312b9137ca9759d1fc9ccbe25e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Jul 2017 13:51:27 +0200
Subject: [PATCH 1133/3246] gdb: Look for .build-id files in
 NIX_DEBUG_INFO_DIRS

This allows us to provide a setup hook that makes debug outputs
findable by gdb.
---
 .../tools/misc/gdb/debug-info-from-env.patch  | 81 +++++++++++++++++++
 pkgs/development/tools/misc/gdb/default.nix   |  2 +
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/development/tools/misc/gdb/debug-info-from-env.patch

diff --git a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
new file mode 100644
index 00000000000..ad6dca6749e
--- /dev/null
+++ b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
@@ -0,0 +1,81 @@
+Look up .build-id files relative to the directories in the
+colon-separated environment variable NIX_DEBUG_INFO_DIRS, in addition
+to the existing debug-file-directory setting.
+
+diff -ru --exclude '*gcore' --exclude '*pdtrace' gdb-8.0-orig/gdb/build-id.c gdb-8.0/gdb/build-id.c
+--- gdb-8.0-orig/gdb/build-id.c	2017-06-04 17:51:26.000000000 +0200
++++ gdb-8.0/gdb/build-id.c	2017-07-28 13:18:10.797375927 +0200
+@@ -67,8 +67,8 @@
+ 
+ /* See build-id.h.  */
+ 
+-gdb_bfd_ref_ptr
+-build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
++static gdb_bfd_ref_ptr
++build_id_to_debug_bfd_in (const char *directories, size_t build_id_len, const bfd_byte *build_id)
+ {
+   char *link, *debugdir;
+   VEC (char_ptr) *debugdir_vec;
+@@ -78,7 +78,7 @@
+   int alloc_len;
+ 
+   /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
+-  alloc_len = (strlen (debug_file_directory)
++  alloc_len = (strlen (directories)
+ 	       + (sizeof "/.build-id/" - 1) + 1
+ 	       + 2 * build_id_len + (sizeof ".debug" - 1) + 1);
+   link = (char *) alloca (alloc_len);
+@@ -86,7 +86,7 @@
+   /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
+      cause "/.build-id/..." lookups.  */
+ 
+-  debugdir_vec = dirnames_to_char_ptr_vec (debug_file_directory);
++  debugdir_vec = dirnames_to_char_ptr_vec (directories);
+   back_to = make_cleanup_free_char_ptr_vec (debugdir_vec);
+ 
+   for (ix = 0; VEC_iterate (char_ptr, debugdir_vec, ix, debugdir); ++ix)
+@@ -137,6 +137,30 @@
+   return abfd;
+ }
+ 
++gdb_bfd_ref_ptr
++build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
++{
++  gdb_bfd_ref_ptr abfd = build_id_to_debug_bfd_in(debug_file_directory, build_id_len, build_id);
++
++  if (abfd != NULL)
++    return abfd;
++
++  static int init = 0;
++  static char *env_var;
++  if (!init)
++    {
++      env_var = getenv("NIX_DEBUG_INFO_DIRS");
++      init = 1;
++    }
++
++  if (env_var)
++    {
++      abfd = build_id_to_debug_bfd_in(env_var, build_id_len, build_id);
++    }
++
++  return abfd;
++}
++
+ /* See build-id.h.  */
+ 
+ char *
+diff -ru --exclude '*gcore' --exclude '*pdtrace' gdb-8.0-orig/gdb/symfile.c gdb-8.0/gdb/symfile.c
+--- gdb-8.0-orig/gdb/symfile.c	2017-06-04 17:51:27.000000000 +0200
++++ gdb-8.0/gdb/symfile.c	2017-07-28 12:54:05.401586174 +0200
+@@ -1415,8 +1415,8 @@
+ 			   struct cmd_list_element *c, const char *value)
+ {
+   fprintf_filtered (file,
+-		    _("The directory where separate debug "
+-		      "symbols are searched for is \"%s\".\n"),
++		    _("The directories where separate debug "
++		      "symbols are searched for are \"%s\".\n"),
+ 		    value);
+ }
+ 
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 78dd4a1e3f5..5d82e972ca6 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
     sha256 = "1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn";
   };
 
+  patches = [ ./debug-info-from-env.patch ];
+
   nativeBuildInputs = [ pkgconfig texinfo perl ]
     # TODO(@Ericson2314) not sure if should be host or target
     ++ stdenv.lib.optional targetPlatform.isHurd mig;

From 5c5b71df5e724a19a512c7c1264b439d93c90df7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Jul 2017 14:22:48 +0200
Subject: [PATCH 1134/3246] Add a setup hook to fill NIX_DEBUG_INFO_DIRS

This setup hook is propagated by gdb. Thus, a typical use is:

  $ nix-shell -p gdb nix nix.debug sqlite.debug ...

and gdb will be able find the debug symbols of nix etc. automatically.
---
 pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh | 5 +++++
 pkgs/development/tools/misc/gdb/default.nix             | 6 +++++-
 pkgs/top-level/all-packages.nix                         | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh

diff --git a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh
new file mode 100644
index 00000000000..2fd2a2d6da6
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh
@@ -0,0 +1,5 @@
+setupDebugInfoDirs () {
+    addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug
+}
+
+envHooks+=(setupDebugInfoDirs)
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 5d82e972ca6..02ff52155b1 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -11,6 +11,8 @@
 
 # Additional dependencies for GNU/Hurd.
 , mig ? null, hurd ? null
+
+, setupDebugInfoDirs
 }:
 
 let
@@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./debug-info-from-env.patch ];
 
-  nativeBuildInputs = [ pkgconfig texinfo perl ]
+  nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]
     # TODO(@Ericson2314) not sure if should be host or target
     ++ stdenv.lib.optional targetPlatform.isHurd mig;
 
@@ -43,6 +45,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional targetPlatform.isHurd hurd
     ++ stdenv.lib.optional doCheck dejagnu;
 
+  propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
+
   enableParallelBuilding = true;
 
   # darwin build fails with format hardening since v7.12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a8a3c2c7cc..9cbb0b15873 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -347,6 +347,8 @@ with pkgs;
 
   separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
 
+  setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh;
+
   useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh;
 
   iconConvTools = callPackage ../build-support/icon-conv-tools {};

From 340bd1ed2ebff4d6eddb850595ad5e14805f7117 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Jul 2017 15:19:51 +0200
Subject: [PATCH 1135/3246] elfutils: 0.168 -> 0.169

---
 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 6e80f0907bc..d8e54e47404 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,11 +3,11 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.168";
+  version = "0.169";
 
   src = fetchurl {
     url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
-    sha256 = "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq";
+    sha256 = "1hiv1yqig3292dwqhrwsxwk3qjalxp5fpl8yphwbfwh8ng3zl4ll";
   };
 
   hardeningDisable = [ "format" ];

From cc9bfd2cf8dd9aeb2f625ba2f4506e1e8c67d47c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Jul 2017 16:10:59 +0200
Subject: [PATCH 1136/3246] elfutils: Respect $NIX_DEBUG_INFO_DIRS

This makes eu-stack and eu-addr2line do the right thing in a
nix-shell (if the appropriate debug outputs are present).
---
 .../misc/elfutils/debug-info-from-env.patch   | 27 +++++++++++++++++++
 .../tools/misc/elfutils/default.nix           |  6 ++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/elfutils/debug-info-from-env.patch

diff --git a/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch b/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch
new file mode 100644
index 00000000000..409f1311c31
--- /dev/null
+++ b/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch
@@ -0,0 +1,27 @@
+Look up .build-id files relative to the directories in the
+colon-separated environment variable NIX_DEBUG_INFO_DIRS, unless
+overriden by --debuginfo-path.
+
+diff -ru elfutils-0.169-orig/libdwfl/argp-std.c elfutils-0.169/libdwfl/argp-std.c
+--- elfutils-0.169-orig/libdwfl/argp-std.c	2017-05-02 23:05:52.000000000 +0200
++++ elfutils-0.169/libdwfl/argp-std.c	2017-07-28 16:08:06.739558106 +0200
+@@ -376,5 +376,7 @@
+ const struct argp *
+ dwfl_standard_argp (void)
+ {
++  debuginfo_path = getenv("NIX_DEBUG_INFO_DIRS");
++
+   return &libdwfl_argp;
+ }
+diff -ru elfutils-0.169-orig/src/stack.c elfutils-0.169/src/stack.c
+--- elfutils-0.169-orig/src/stack.c	2017-02-24 11:55:28.000000000 +0100
++++ elfutils-0.169/src/stack.c	2017-07-28 15:50:06.743196696 +0200
+@@ -631,6 +631,8 @@
+   /* Set locale.  */
+   (void) setlocale (LC_ALL, "");
+ 
++  debuginfo_path = getenv("NIX_DEBUG_INFO_DIRS");
++
+   const struct argp_option options[] =
+     {
+       { NULL, 0, NULL, 0, N_("Input selection options:"), 0 },
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index d8e54e47404..591e263205c 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz }:
+{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs }:
 
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1hiv1yqig3292dwqhrwsxwk3qjalxp5fpl8yphwbfwh8ng3zl4ll";
   };
 
+  patches = ./debug-info-from-env.patch;
+
   hardeningDisable = [ "format" ];
 
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,
@@ -17,6 +19,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ m4 bison flex gettext bzip2 ];
   buildInputs = [ zlib bzip2 xz ];
 
+  propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
+
   configureFlags =
     [ "--program-prefix=eu-" # prevent collisions with binutils
       "--enable-deterministic-archives"

From 1e605e654f7a02b6d954b51401784992664e8582 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Jul 2017 16:47:39 +0200
Subject: [PATCH 1137/3246] python.pkgs.tornado: 4.4.2 -> 4.5.1

---
 .../python-modules/tornado/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +-----------
 2 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/tornado/default.nix

diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
new file mode 100644
index 00000000000..11078eb8562
--- /dev/null
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, python
+, buildPythonPackage
+, fetchPypi
+, backports_abc
+, backports_ssl_match_hostname
+, certifi
+, singledispatch
+}:
+
+buildPythonPackage rec {
+  pname = "tornado";
+  version = "4.5.1";
+  name = "${pname}-${version}";
+
+  propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ];
+
+  # We specify the name of the test files to prevent
+  # https://github.com/NixOS/nixpkgs/issues/14634
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover *_test.py
+  '';
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f66e2b24cf..48ced46476f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25537,23 +25537,7 @@ EOF
     };
   };
 
-  tornado = buildPythonPackage rec {
-    name = "tornado-${version}";
-    version = "4.4.2";
-
-    propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname certifi singledispatch ];
-
-    # We specify the name of the test files to prevent
-    # https://github.com/NixOS/nixpkgs/issues/14634
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover *_test.py
-    '';
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/tornado/${name}.tar.gz";
-      sha256 = "1k7d90afm5pivam90a37nqiz9wlmakvnsfymp3p43kcqz29gk618";
-    };
-  };
+  tornado = callPackage ../development/python-modules/tornado { };
 
   tokenlib = buildPythonPackage rec {
     name = "tokenlib-${version}";

From ac1ea28a5028e01782c04af9bdc9fdad5ccac446 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Jul 2017 16:49:08 +0200
Subject: [PATCH 1138/3246] python.pkgs: maintenance updates

---
 pkgs/development/python-modules/actdiag/default.nix          | 4 ++--
 pkgs/development/python-modules/alabaster/default.nix        | 4 ++--
 pkgs/development/python-modules/alembic/default.nix          | 4 ++--
 pkgs/development/python-modules/aniso8601/default.nix        | 4 ++--
 pkgs/development/python-modules/discid/default.nix           | 4 ++--
 pkgs/development/python-modules/faker/default.nix            | 4 ++--
 pkgs/development/python-modules/keras/default.nix            | 4 ++--
 pkgs/development/python-modules/ldap.nix                     | 4 ++--
 pkgs/development/python-modules/libagent/default.nix         | 4 ++--
 pkgs/development/python-modules/libnacl/default.nix          | 4 ++--
 pkgs/development/python-modules/m2r/default.nix              | 4 ++--
 pkgs/development/python-modules/plotly/default.nix           | 4 ++--
 pkgs/development/python-modules/pylint/default.nix           | 4 ++--
 pkgs/development/python-modules/pyroute2/default.nix         | 4 ++--
 pkgs/development/python-modules/sqlalchemy/default.nix       | 4 ++--
 pkgs/development/python-modules/trezor/default.nix           | 4 ++--
 pkgs/development/python-modules/ukpostcodeparser/default.nix | 4 ++--
 pkgs/development/python-modules/vine/default.nix             | 4 ++--
 18 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix
index 064e5e6c11a..36d49ad29af 100644
--- a/pkgs/development/python-modules/actdiag/default.nix
+++ b/pkgs/development/python-modules/actdiag/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "actdiag";
-  version = "0.5.3";
+  version = "0.5.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa";
+    sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af";
   };
 
   buildInputs = [ pep8 nose unittest2 docutils ];
diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix
index 69bcaa1fc06..fcd9a097800 100644
--- a/pkgs/development/python-modules/alabaster/default.nix
+++ b/pkgs/development/python-modules/alabaster/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "alabaster";
-  version = "0.7.7";
+  version = "0.7.10";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71";
+    sha256 = "37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0";
   };
 
   propagatedBuildInputs = [ pygments ];
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 0538e7cf416..d1262d8fab4 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "alembic";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0iw6wysm83hycvrycymf9b4mkji47536kl3x7grynfcbyjcvbdm2";
+    sha256 = "57f2ede554c0b18f1cf811cfbb3b02c586a5422df94922e3821883ba0b8c616c";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];
diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix
index bc49e991b4f..95eda37d3f2 100644
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "aniso8601";
-  version = "1.2.0";
+  version = "1.2.1";
   name = "${pname}-${version}";
 
   meta = with stdenv.lib; {
@@ -16,6 +16,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4";
+    sha256 = "e7ba4f42d3aea75909c79b1f4c4614768b4f13fbb98fc658a7b6061ddb0be47c";
   };
 }
diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix
index 167efe91425..d237f366fdf 100644
--- a/pkgs/development/python-modules/discid/default.nix
+++ b/pkgs/development/python-modules/discid/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "discid";
-  version = "1.1.0";
+  version = "1.1.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b39d443051b26d0230be7a6c616243daae93337a8711dd5d4119bb6a0e516fa8";
+    sha256 = "78a3bf6c8377fdbe3d85e914a209ff97aa43e35605779639847b510ced31f7b9";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index d5934f38b88..ce6887f3e06 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "0.7.17";
+  version = "0.7.18";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n4achwr6dcf67n983ls5cbp5ic3jrwsbl92rzjlzb1xvz1s1js9";
+    sha256 = "310b20f3c497a777622920dca314d90f774028d49c7ee7ccfa96ca4b9d9bf429";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 43e576b1b31..011954ae827 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.0.5";
+  version = "2.0.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cbce24758530e070fe1b403d6d21391cbea78c037b70bf6afc1ca9f1f8269eff";
+    sha256 = "0519480abe4ad18b2c2d1bc580eab75edd82c95083d341a1157952f4b00019bb";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index b583a2ae2d8..34a179f501b 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "python-ldap";
-  version = "2.4.39";
+  version = "2.4.41";
   name = "${pname}-${version}";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fb75108d27e8091de80dffa2ba3bf45c7a3bdc357e2959006aed52fa58bb2f3";
+    sha256 = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0";
   };
 
   # Needed by tests to setup a mockup ldap server.
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index 5192abf8200..4a3839537e3 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "libagent";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchPypi{
     inherit pname version;
-    sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc";
+    sha256 = "d6c6dccc0a7693fc966f5962604a69a800e044ac5add3dd030c34cfd4d64311f";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 7a96530912b..324740f17de 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libnacl";
-  version = "1.5.1";
+  version = "1.5.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e44e9436e7245b0d8b7322bef67750cb7757834d7ccdb7eb7b723b4813df84fb";
+    sha256 = "c58390b0d191db948fc9ab681f07fdfce2a573cd012356bada47d56795d00ee2";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index 74cc87d5d89..b79307a8084 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "m2r";
   name = "${pname}-${version}";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a26bc2e25e0ad3f8650385aea25cf734ac4fcd30e54faec92fd39675da75e527";
+    sha256 = "771631d051a52764fe5b660f97ad028df3aff90c9859d345ccfd17a4c7c2ab39";
   };
 
   propagatedBuildInputs = [ mistune docutils ];
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 383dbd1e08f..ed62a091281 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.0.10";
+  version = "2.0.12";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8c013a01bb11c4c269c38a7086ffb92d6a2827922c49706131842498a49b3b81";
+    sha256 = "0050da900e4420c15766f8dfb8d252510896511361bf485b9308bc0287f7add0";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 12871bd8f6c..8c82cb52910 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -4,11 +4,11 @@
   buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "pylint";
-    version = "1.7.1";
+    version = "1.7.2";
 
     src = fetchurl {
       url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a";
+      sha256 = "ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69";
     };
 
     buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index de1651ec2b0..2e60f6812e9 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.4.16";
+  version = "0.4.18";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-    sha256 = "5c692efd83369cb44086572b3e1e95ab11f1bc516a89c8ca2429795a789f32a9";
+    sha256 = "bdcff9f598ff4dda7420675ee387426cd9cc79d795ea73eb684a4314d4b00b9e";
   };
 
   # requires root priviledges
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 4cd522fe195..36b04692a9e 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.1.11";
+  version = "1.1.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211";
+    sha256 = "d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9";
   };
 
   checkInputs = [ pytest mock pytest_xdist ]
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 6a3f9c63890..72d73022cab 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "trezor";
-  version = "0.7.15";
+  version = "0.7.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f7e4f509263ca172532b4c0a440d164add7cdc021b4370a253d51eba5806b618";
+    sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314";
   };
 
   propagatedBuildInputs = [ protobuf3_2 hidapi requests ];
diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix
index 6eae1f52456..d7d56bed881 100644
--- a/pkgs/development/python-modules/ukpostcodeparser/default.nix
+++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "UkPostcodeParser";
-  version = "1.1.0";
+  version = "1.1.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v8k91xhg5fr6sk91am93abjarw950ray7b9q3w5j25agjsxgcsf";
+    sha256 = "b7a7ac19d48897637c7aaa2f2970288f1c260e4a99140bf04c6086cf65576c6b";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix
index 85b17f5119c..bf5a09a2418 100644
--- a/pkgs/development/python-modules/vine/default.nix
+++ b/pkgs/development/python-modules/vine/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "vine";
-  version = "1.1.3";
+  version = "1.1.4";
   name = "${pname}-${version}";
 
   disable = pythonOlder "2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7";
+    sha256 = "52116d59bc45392af9fdd3b75ed98ae48a93e822cee21e5fda249105c59a7a72";
   };
 
   buildInputs = [ case pytest ];

From 324197e60e02f5a210042d8debf1cfdd44072dd3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jul 2017 11:27:35 -0400
Subject: [PATCH 1139/3246] sbt: 0.13.15 -> 0.13.16

---
 pkgs/development/tools/build-managers/sbt/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index cf9b42abefd..8d121b28c95 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,11 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.15";
+  version = "0.13.16";
 
   src = fetchurl {
-    url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
-    sha256 = "1vvsxpg1fwfzv3mcin69gnj44v6p7kfx3z9cm761sx01qbbp7q5n";
+    urls = [
+      "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
+      "https://cocl.us/sbt01316tgz"
+    ];
+    sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2";
   };
 
   patchPhase = ''

From ec59e3b3f52003a90a977f539366de59d4067c06 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Jul 2017 18:08:06 +0200
Subject: [PATCH 1140/3246] openblas: 0.2.19 -> 0.2.20

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

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 6f3f78e5501..4d51d1ed02d 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -61,13 +61,13 @@ let
       then blas64_
       else hasPrefix "x86_64" stdenv.system;
 
-  version = "0.2.19";
+  version = "0.2.20";
 in
 stdenv.mkDerivation {
   name = "openblas-${version}";
   src = fetchurl {
     url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
-    sha256 = "0mw5ra1vjsqiba79zdhqfkqq6v3bla5a5c0wj7vca9qgjzjbah4w";
+    sha256 = "157kpkbpwlr57dkmqiwr3qp9fglfidagv7l6fibrhln6v4aqpwsy";
     name = "openblas-${version}.tar.gz";
   };
 

From 30fbeed254e063f88647b28467cebcd228542d33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Jul 2017 15:27:57 +0200
Subject: [PATCH 1141/3246] LTS Haskell 9.0

Minus the broken wai-middleware-prometheus-0.2.0 package.
---
 .../configuration-hackage2nix.yaml            | 1053 +++++++++--------
 1 file changed, 562 insertions(+), 491 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 78f123af0fe..e861ad6d53f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,20 +37,20 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 8.23
+  # LTS Haskell 9.0
   - abstract-deque ==0.3
+  - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
-  - accelerate ==0.15.1.0
+  - accelerate ==1.0.0.0
   - accuerr ==0.2.0.2
   - ace ==0.6
-  - acid-state ==0.14.2
   - action-permutations ==0.0.0.1
   - active ==0.2.0.13
   - ad ==4.3.3
   - adjunctions ==4.3
   - adler32 ==0.1.1.0
-  - aeson ==1.0.2.1
+  - aeson ==1.1.2.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
   - aeson-compat ==0.3.6
@@ -58,14 +58,20 @@ default-package-overrides:
   - aeson-extra ==0.4.0.0
   - aeson-generic-compat ==0.0.1.0
   - aeson-injector ==1.0.8.0
+  - aeson-lens ==0.5.0.0
   - aeson-pretty ==0.8.5
   - aeson-qq ==0.8.2
   - aeson-utils ==0.3.0.2
   - Agda ==2.5.2
   - airship ==0.6.0
   - alarmclock ==0.4.0.2
+  - alerta ==0.1.0.4
   - alex ==3.2.1
   - algebraic-graphs ==0.0.4
+  - alsa-core ==0.5.0.1
+  - alsa-mixer ==0.2.0.3
+  - alsa-pcm ==0.6.0.4
+  - alsa-seq ==0.6.0.7
   - alternators ==0.1.1.1
   - ALUT ==2.4.0.2
   - amazonka ==1.4.5
@@ -139,7 +145,7 @@ default-package-overrides:
   - amazonka-route53 ==1.4.5
   - amazonka-route53-domains ==1.4.5
   - amazonka-s3 ==1.4.5
-  - amazonka-s3-streaming ==0.1.0.4
+  - amazonka-s3-streaming ==0.2.0.3
   - amazonka-sdb ==1.4.5
   - amazonka-servicecatalog ==1.4.5
   - amazonka-ses ==1.4.5
@@ -158,20 +164,23 @@ default-package-overrides:
   - amazonka-waf ==1.4.5
   - amazonka-workspaces ==1.4.5
   - amazonka-xray ==1.4.5
-  - amqp ==0.14.1
+  - amqp ==0.15.1
   - annotated-wl-pprint ==0.7.0
   - anonymous-sums ==0.6.0.0
   - ansi-terminal ==0.6.3.1
   - ansi-wl-pprint ==0.6.7.3
   - ansigraph ==0.3.0.2
+  - api-field-json-th ==0.1.0.2
   - app-settings ==0.2.0.11
   - appar ==0.1.4
   - apportionment ==0.0.0.2
+  - approximate ==0.3
   - arbtt ==0.9.0.13
-  - arithmoi ==0.4.3.0
+  - arithmoi ==0.5.0.0
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - arrow-list ==0.7
+  - arrowp-qq ==0.1
   - ascii-progress ==0.3.3.0
   - asciidiagram ==1.3.3
   - asn1-encoding ==0.9.5
@@ -180,36 +189,40 @@ default-package-overrides:
   - astro ==0.4.2.0
   - async ==2.1.1.1
   - async-dejafu ==0.1.3.0
-  - async-extra ==0.1.0.0
+  - async-extra ==0.2.0.0
   - async-refresh ==0.2.0.2
-  - async-refresh-tokens ==0.1.0
+  - async-refresh-tokens ==0.3.0.0
+  - async-timer ==0.1.4.0
   - atom-basic ==0.2.5
-  - atom-conduit ==0.4.0.1
+  - atom-conduit ==0.4.0.3
   - atomic-primops ==0.8.0.4
   - atomic-write ==0.2.0.5
   - attoparsec ==0.13.1.0
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
   - attoparsec-iso8601 ==1.0.0.0
+  - attoparsec-time ==0.1.3.2
   - audacity ==0.0.1.2
   - authenticate ==1.3.3.2
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
   - auto-update ==0.1.4
-  - autoexporter ==1.0.0
+  - autoexporter ==1.1.1
   - avers ==0.0.17.1
   - avers-api ==0.0.18.0
   - avers-api-docs ==0.0.18.0
-  - avers-server ==0.0.18.0
+  - avers-server ==0.0.19.0
   - avwx ==0.3.0.2
+  - aws ==0.16
+  - axiom ==0.4.5
   - b9 ==0.5.32
   - backprop ==0.0.3.0
   - bake ==0.5
   - bank-holidays-england ==0.1.0.5
   - base-compat ==0.9.3
   - base-noprelude ==4.9.1.0
-  - base-orphans ==0.5.4
-  - base-prelude ==1.0.1.1
+  - base-orphans ==0.6
+  - base-prelude ==1.2.0.1
   - base-unicode-symbols ==0.2.2.4
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
@@ -232,7 +245,7 @@ default-package-overrides:
   - binary-ieee754 ==0.1.0.0
   - binary-list ==1.1.1.2
   - binary-orphans ==0.1.6.0
-  - binary-parser ==0.5.2
+  - binary-parser ==0.5.5
   - binary-parsers ==0.2.3.0
   - binary-search ==1.0.0.3
   - binary-tagged ==0.1.4.2
@@ -242,6 +255,7 @@ default-package-overrides:
   - bindings-libzip ==1.0.1
   - bioace ==0.0.1
   - bioalign ==0.0.5
+  - BiobaseNewick ==0.0.0.2
   - biocore ==0.3.1
   - biofasta ==0.0.3
   - biofastq ==0.1
@@ -261,15 +275,17 @@ default-package-overrides:
   - blastxml ==0.3.2
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.0.2
-  - blaze-html ==0.8.1.3
-  - blaze-markup ==0.7.1.1
+  - blaze-html ==0.9.0.1
+  - blaze-markup ==0.8.0.0
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
   - BlogLiterately ==0.8.4.3
   - BlogLiterately-diagrams ==0.2.0.5
-  - bloodhound ==0.12.1.0
+  - bloodhound ==0.14.0.0
+  - bloomfilter ==2.0.1.0
   - blosum ==0.1.1.4
   - bmp ==1.2.6.3
+  - bno055-haskell ==0.1.0
   - board-games ==0.1.0.6
   - boltzmann-samplers ==0.1.0.0
   - bookkeeping ==0.2.1.1
@@ -279,11 +295,12 @@ default-package-overrides:
   - boolsimplifier ==0.1.8
   - boomerang ==1.4.5.2
   - both ==0.1.1.0
+  - bound ==2
   - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.4
-  - brick ==0.17.2
+  - brick ==0.18
   - broadcast-chan ==0.1.1
   - bson ==0.3.2.3
   - bson-lens ==0.1.1
@@ -302,11 +319,11 @@ default-package-overrides:
   - bytestring-handle ==0.1.0.5
   - bytestring-lexing ==0.5.0.2
   - bytestring-progress ==1.0.7
+  - bytestring-strict-builder ==0.4.5
   - bytestring-tree-builder ==0.2.7.1
   - bytestring-trie ==0.2.4.1
-  - bzlib ==0.5.0.5
   - bzlib-conduit ==0.2.1.4
-  - c2hs ==0.28.1
+  - c2hs ==0.28.2
   - Cabal ==1.24.2.0
   - cabal-dependency-licenses ==0.2.0.0
   - cabal-doctest ==1.0.2
@@ -314,12 +331,11 @@ default-package-overrides:
   - cabal-helper ==0.7.3.0
   - cabal-rpm ==0.11.1
   - cache ==0.1.0.0
-  - cacophony ==0.9.2
+  - cacophony ==0.10.0
   - cairo ==0.13.3.1
   - calendar-recycling ==0.0
   - call-stack ==0.1.0
-  - camfort ==0.901
-  - carray ==0.1.6.7
+  - carray ==0.1.6.8
   - cartel ==0.18.0.2
   - case-insensitive ==1.2.0.10
   - cased ==0.1.0.0
@@ -327,7 +343,6 @@ default-package-overrides:
   - casing ==0.1.2.1
   - cassava ==0.4.5.1
   - cassava-conduit ==0.3.5.1
-  - cassava-megaparsec ==0.1.0
   - cassette ==0.1.0
   - cayley-client ==0.4.1
   - cereal ==0.5.4.0
@@ -341,8 +356,8 @@ default-package-overrides:
   - Chart ==1.8.2
   - Chart-cairo ==1.8.2
   - Chart-diagrams ==1.8.2
-  - chart-unit ==0.1.0.0
-  - ChasingBottoms ==1.3.1.2
+  - chart-unit ==0.4.1
+  - chaselev-deque ==0.5.0.5
   - cheapskate ==0.1.0.5
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
@@ -369,16 +384,14 @@ default-package-overrides:
   - classy-prelude-conduit ==1.2.0
   - classy-prelude-yesod ==1.2.0
   - clay ==0.12.2
-  - clckwrks ==0.24.0.3
-  - clckwrks-cli ==0.2.17.1
-  - clckwrks-plugin-media ==0.6.16.3
-  - clckwrks-plugin-page ==0.4.3.9
-  - clckwrks-theme-bootstrap ==0.4.2.1
   - cli ==0.1.2
   - clientsession ==0.9.1.2
   - Clipboard ==2.3.2.0
   - clock ==0.7.2
   - clock-extras ==0.1.0.2
+  - clr-host ==0.1.0.0
+  - clr-inline ==0.1.0.0
+  - clr-marshal ==0.1.0.0
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.2.1
   - clustering ==0.3.1
@@ -397,11 +410,12 @@ default-package-overrides:
   - comonad-transformers ==4.0
   - comonads-fd ==4.0
   - compactmap ==0.1.4.2
+  - compensated ==0.7.1
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
   - concise ==0.1.0.0
-  - concurrency ==1.0.0.0
-  - concurrent-output ==1.7.9
+  - concurrency ==1.1.2.1
+  - concurrent-output ==1.9.2
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - conduit ==1.2.11
@@ -426,11 +440,6 @@ default-package-overrides:
   - control-monad-free ==0.6.1
   - control-monad-loop ==0.1
   - control-monad-omega ==0.3.1
-  - conversion ==1.2.1
-  - conversion-bytestring ==1.0.1
-  - conversion-case-insensitive ==1.0.0.0
-  - conversion-text ==1.0.1
-  - convert-annotation ==0.5.0.1
   - convertible ==1.1.1.0
   - cookie ==0.4.2.1
   - countable ==1.0
@@ -441,16 +450,14 @@ default-package-overrides:
   - cpuinfo ==0.1.0.1
   - cql ==3.1.1
   - cql-io ==0.16.0
-  - crackNum ==1.9
   - criterion ==1.1.4.0
   - cron ==0.5.0
+  - crypt-sha512 ==0
   - crypto-api ==0.13.2
   - crypto-api-tests ==0.3
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
   - crypto-enigma ==0.0.2.8
-  - crypto-numbers ==0.2.7
-  - crypto-pubkey ==0.2.8
   - crypto-pubkey-types ==0.4.3
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
@@ -461,19 +468,19 @@ default-package-overrides:
   - cryptohash-md5 ==0.11.100.1
   - cryptohash-sha1 ==0.11.100.1
   - cryptohash-sha256 ==0.11.100.1
-  - cryptol ==2.4.0
-  - cryptonite ==0.21
+  - cryptohash-sha512 ==0.11.100.1
+  - cryptonite ==0.23
   - cryptonite-conduit ==0.2.0
-  - cryptonite-openssl ==0.5
+  - cryptonite-openssl ==0.6
   - csp ==1.3.1
   - css-syntax ==0.0.5
   - css-text ==0.1.2.2
   - csv ==0.1.2
   - csv-conduit ==0.6.7
   - ctrie ==0.1.1.0
-  - cubicbezier ==0.5.0.0
+  - cubicbezier ==0.6.0.3
   - cubicspline ==0.1.2
-  - cue-sheet ==0.1.0
+  - cue-sheet ==0.1.1
   - curl ==1.3.8
   - cutter ==0.0
   - darcs ==2.12.5
@@ -485,11 +492,14 @@ default-package-overrides:
   - data-bword ==0.1.0.1
   - data-check ==0.1.1
   - data-checked ==0.3
+  - data-clist ==0.1.2.0
   - data-default ==0.7.1.1
   - data-default-class ==0.1.2.0
   - data-default-instances-containers ==0.0.1
   - data-default-instances-dlist ==0.0.1
   - data-default-instances-old-locale ==0.0.1
+  - data-diverse ==0.8.1.0
+  - data-diverse-lens ==0.1.1.0
   - data-dword ==0.3.1.1
   - data-endian ==0.1.1
   - data-fix ==0.0.4
@@ -505,15 +515,15 @@ default-package-overrides:
   - data-reify ==0.6.1
   - data-serializer ==0.3
   - data-textual ==0.3.0.2
-  - datasets ==0.2.1
   - dataurl ==0.1.0.0
   - DAV ==1.3.1
   - dawg-ord ==0.5.1.0
+  - dbus ==0.10.13
   - debian-build ==0.10.1.0
   - Decimal ==0.4.2
   - declarative ==0.5.1
   - deepseq-generics ==0.2.0.0
-  - dejafu ==0.4.0.0
+  - dejafu ==0.7.0.2
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - derive ==2.6.2
@@ -523,7 +533,7 @@ default-package-overrides:
   - diagrams-builder ==0.8.0.1
   - diagrams-cairo ==1.4
   - diagrams-canvas ==1.4
-  - diagrams-contrib ==1.4.0.1
+  - diagrams-contrib ==1.4.1
   - diagrams-core ==1.4
   - diagrams-gtk ==1.4
   - diagrams-html5 ==1.4
@@ -532,8 +542,7 @@ default-package-overrides:
   - diagrams-rasterific ==1.4
   - diagrams-solve ==0.1.1
   - diagrams-svg ==1.4.1
-  - dice ==0.1
-  - dictionaries ==0.1.0.1
+  - dictionaries ==0.2.0.2
   - Diff ==0.3.4
   - diff3 ==0.3.0
   - digest ==0.0.1.2
@@ -541,21 +550,24 @@ default-package-overrides:
   - dimensional ==1.0.1.3
   - direct-sqlite ==2.3.20
   - directory-tree ==0.12.1
+  - discord-gateway ==0.2.2
+  - discord-hs ==0.4.2
+  - discord-rest ==0.2.2
+  - discord-types ==0.2.2
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
   - disposable ==0.2.0.4
   - distance ==0.1.0.0
   - distributed-closure ==0.3.4.0
-  - distributed-process ==0.6.6
-  - distributed-process-simplelocalnet ==0.2.3.3
   - distributed-static ==0.3.5.0
   - distribution ==1.1.1.0
   - distributive ==0.5.2
   - diversity ==0.8.0.2
   - djinn-ghc ==0.0.2.3
   - djinn-lib ==0.0.1.2
-  - dlist ==0.8.0.2
+  - dlist ==0.8.0.3
   - dlist-instances ==0.1.1.1
+  - dlist-nonempty ==0.1
   - dmenu ==0.3.1.1
   - dmenu-pkill ==0.1.0.1
   - dmenu-pmount ==0.1.0.1
@@ -565,7 +577,7 @@ default-package-overrides:
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
   - doctemplates ==0.1.0.2
-  - doctest ==0.11.3
+  - doctest ==0.11.4
   - doctest-discover ==0.1.0.7
   - dotenv ==0.3.4.0
   - dotnet-timespan ==0.0.1.0
@@ -581,7 +593,7 @@ default-package-overrides:
   - dvorak ==0.1.0.0
   - dynamic-state ==0.2.2.0
   - dyre ==0.8.12
-  - Earley ==0.11.0.1
+  - Earley ==0.12.0.0
   - easy-file ==0.2.1
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
@@ -606,11 +618,11 @@ default-package-overrides:
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - elm-export-persistent ==0.1.2
-  - email-validate ==2.2.1.1
+  - email-validate ==2.3
   - emailaddress ==0.2.0.0
   - enclosed-exceptions ==1.0.2
   - encoding-io ==0.0.1
-  - engine-io ==1.2.16
+  - engine-io ==1.2.17
   - engine-io-wai ==1.0.6
   - EntrezHTTP ==1.0.3
   - entropy ==0.3.8
@@ -625,16 +637,23 @@ default-package-overrides:
   - equal-files ==0.0.5.3
   - equivalence ==0.3.2
   - erf ==2.0.0.0
-  - errors ==2.1.3
-  - ersatz ==0.3.1
+  - errors ==2.2.1
+  - ersatz ==0.4
   - esqueleto ==2.5.3
-  - etc ==0.0.0.2
+  - etc ==0.2.0.0
   - etcd ==1.0.5
-  - ether ==0.4.2.0
+  - ether ==0.5.1.0
   - euphoria ==0.8.0.0
   - event ==0.1.4
   - event-list ==0.1.1.3
-  - eventstore ==0.14.0.2
+  - eventful-core ==0.1.3
+  - eventful-dynamodb ==0.1.3
+  - eventful-memory ==0.1.3
+  - eventful-postgresql ==0.1.3
+  - eventful-sql-common ==0.1.3
+  - eventful-sqlite ==0.1.3
+  - eventful-test-helpers ==0.1.3
+  - eventstore ==0.15.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.2
   - exception-mtl ==0.4.0.1
@@ -643,11 +662,11 @@ default-package-overrides:
   - exceptions ==0.8.3
   - executable-hash ==0.2.0.4
   - executable-path ==0.0.3.1
-  - exhaustive ==1.1.4
+  - exhaustive ==1.1.5
   - exp-pairs ==0.1.5.2
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9
-  - extensible ==0.3.7
+  - extensible ==0.4.2
   - extensible-effects ==1.11.1.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.5.3
@@ -659,14 +678,9 @@ default-package-overrides:
   - fast-logger ==2.4.10
   - fast-math ==1.0.2
   - fasta ==0.10.4.2
-  - fay ==0.23.1.16
-  - fay-base ==0.20.0.1
-  - fay-builder ==0.2.0.5
-  - fay-dom ==0.5.0.1
-  - fay-jquery ==0.6.1.0
-  - fay-text ==0.3.2.2
-  - fay-uri ==0.2.0.0
+  - fb ==1.1.1
   - fclabels ==2.0.3.2
+  - fdo-notify ==0.3.1
   - feature-flags ==0.1.0.1
   - feed ==0.3.12.0
   - FenwickTree ==0.1.2.1
@@ -678,6 +692,9 @@ default-package-overrides:
   - filecache ==0.2.9
   - filelock ==0.1.0.1
   - filemanip ==0.3.6.3
+  - fileplow ==0.1.0.0
+  - filter-logger ==0.6.0.0
+  - find-clumpiness ==0.2.1.3
   - fingertree ==0.1.1.0
   - fingertree-psqueue ==0.3
   - finite-typelits ==0.1.2.0
@@ -687,15 +704,17 @@ default-package-overrides:
   - fixed-vector-hetero ==0.3.1.1
   - flac ==0.1.2
   - flac-picture ==0.1.1
+  - flat ==0.3
   - flat-mcmc ==1.5.0
   - flexible-defaults ==0.0.1.2
-  - FloatingHex ==0.4
+  - floatshow ==0.2.4
   - flock ==0.3.1.8
   - flow ==1.0.7
   - fmlist ==0.9
+  - fmt ==0.3.0.0
   - fn ==0.3.0.1
   - focus ==0.1.5
-  - fold-debounce ==0.2.0.5
+  - fold-debounce ==0.2.0.6
   - fold-debounce-conduit ==0.1.0.5
   - foldl ==1.2.5
   - foldl-statistics ==0.1.4.6
@@ -703,9 +722,10 @@ default-package-overrides:
   - FontyFruity ==0.5.3.3
   - force-layout ==0.4.0.6
   - foreign-store ==0.2
+  - ForestStructures ==0.0.0.2
+  - forma ==0.2.0
   - format-numbers ==0.1.0.0
   - formatting ==6.2.4
-  - fortran-src ==0.1.0.4
   - foundation ==0.0.13
   - Frames ==0.1.9
   - free ==4.12.4
@@ -713,13 +733,15 @@ default-package-overrides:
   - freenect ==1.2.1
   - freer ==0.2.4.1
   - freer-effects ==0.3.0.1
-  - friendly-time ==0.4
+  - freetype2 ==0.1.2
+  - friendly-time ==0.4.1
   - frisby ==0.2
   - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
   - fsnotify ==0.2.1
   - fsnotify-conduit ==0.1.0.0
   - funcmp ==1.8
+  - functor-classes-compat ==1
   - fuzzcheck ==0.1.1
   - fuzzy ==0.1.0.0
   - gd ==3000.7.3
@@ -727,29 +749,26 @@ default-package-overrides:
   - general-games ==1.0.5
   - generic-aeson ==0.2.0.9
   - generic-deriving ==1.11.2
-  - generic-random ==0.4.1.0
+  - generic-random ==0.5.0.0
   - generic-xmlpickler ==0.1.0.5
-  - GenericPretty ==1.2.1
   - generics-eot ==0.2.1.1
-  - generics-sop ==0.2.5.0
+  - generics-sop ==0.3.1.0
   - generics-sop-lens ==0.1.2.1
   - geniplate-mirror ==0.7.5
   - getopt-generics ==0.13.0.1
-  - ghc-events ==0.4.4.0
-  - ghc-exactprint ==0.5.3.1
+  - ghc-events ==0.6.0
+  - ghc-exactprint ==0.5.5.0
   - ghc-heap-view ==0.5.9
-  - ghc-mod ==5.7.0.0
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.3.0.2
+  - ghc-prof ==1.4.0.1
   - ghc-syb-utils ==0.2.3.2
   - ghc-tcplugins-extra ==0.2
   - ghc-typelits-extra ==0.2.3
-  - ghc-typelits-knownnat ==0.2.4
+  - ghc-typelits-knownnat ==0.3
   - ghc-typelits-natnormalise ==0.5.3
   - ghcid ==0.6.6
   - ghcjs-base-stub ==0.1.0.2
   - ghcjs-codemirror ==0.0.0.1
-  - ghcjs-hplay ==0.3.4.2
   - ghcjs-perch ==0.3.3.2
   - gi-atk ==2.0.12
   - gi-cairo ==1.0.12
@@ -763,140 +782,143 @@ default-package-overrides:
   - gi-pango ==1.0.13
   - gi-soup ==2.4.12
   - gi-webkit ==3.0.12
-  - ginger ==0.3.9.1
+  - ginger ==0.5.3.0
   - gio ==0.13.3.1
-  - gipeda ==0.3.3.2
   - giphy-api ==0.5.2.0
   - git ==0.2.0
-  - github ==0.15.0
-  - github-release ==1.0.3
+  - git-annex ==6.20170520
+  - github ==0.16.0
+  - github-release ==1.0.4
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
   - gitlib ==3.1.1
   - gitlib-libgit2 ==3.1.1
   - gitlib-test ==3.1.0.3
-  - gitrev ==1.2.0
+  - gitrev ==1.3.1
   - gitson ==0.5.2
   - gl ==0.8.0
   - glabrous ==0.3.2
-  - glaze ==0.2.0.2
-  - glazier ==0.7.0.0
-  - glazier-pipes ==0.1.4.0
+  - glaze ==0.3.0.1
+  - glazier ==0.11.0.1
+  - glazier-pipes ==0.1.5.1
+  - glazier-react ==0.6.0.0
+  - glazier-react-widget ==0.6.0.0
   - GLFW-b ==1.4.8.1
   - glib ==0.13.4.1
-  - Glob ==0.7.14
+  - Glob ==0.8.0
   - glob-posix ==0.1.0.1
-  - gloss ==1.10.2.5
-  - gloss-rendering ==1.10.3.5
+  - gloss ==1.11.1.1
+  - gloss-rendering ==1.11.1.1
   - GLURaw ==2.0.0.3
   - GLUT ==2.7.0.12
+  - gluturtle ==0.0.58.1
   - gnuplot ==0.5.4.1
-  - gogol ==0.1.1
-  - gogol-adexchange-buyer ==0.1.1
-  - gogol-adexchange-seller ==0.1.1
-  - gogol-admin-datatransfer ==0.1.1
-  - gogol-admin-directory ==0.1.1
-  - gogol-admin-emailmigration ==0.1.1
-  - gogol-admin-reports ==0.1.1
-  - gogol-adsense ==0.1.1
-  - gogol-adsense-host ==0.1.1
-  - gogol-affiliates ==0.1.1
-  - gogol-analytics ==0.1.1
-  - gogol-android-enterprise ==0.1.1
-  - gogol-android-publisher ==0.1.1
-  - gogol-appengine ==0.1.1
-  - gogol-apps-activity ==0.1.1
-  - gogol-apps-calendar ==0.1.1
-  - gogol-apps-licensing ==0.1.1
-  - gogol-apps-reseller ==0.1.1
-  - gogol-apps-tasks ==0.1.1
-  - gogol-appstate ==0.1.1
-  - gogol-autoscaler ==0.1.1
-  - gogol-bigquery ==0.1.1
-  - gogol-billing ==0.1.1
-  - gogol-blogger ==0.1.1
-  - gogol-books ==0.1.1
-  - gogol-civicinfo ==0.1.1
-  - gogol-classroom ==0.1.1
-  - gogol-cloudmonitoring ==0.1.1
-  - gogol-cloudtrace ==0.1.1
-  - gogol-compute ==0.1.1
-  - gogol-container ==0.1.1
-  - gogol-core ==0.1.1
-  - gogol-customsearch ==0.1.1
-  - gogol-dataflow ==0.1.1
-  - gogol-dataproc ==0.1.1
-  - gogol-datastore ==0.1.1
-  - gogol-debugger ==0.1.1
-  - gogol-deploymentmanager ==0.1.1
-  - gogol-dfareporting ==0.1.1
-  - gogol-discovery ==0.1.1
-  - gogol-dns ==0.1.1
-  - gogol-doubleclick-bids ==0.1.1
-  - gogol-doubleclick-search ==0.1.1
-  - gogol-drive ==0.1.1
-  - gogol-firebase-rules ==0.1.1
-  - gogol-fitness ==0.1.1
-  - gogol-fonts ==0.1.1
-  - gogol-freebasesearch ==0.1.1
-  - gogol-fusiontables ==0.1.1
-  - gogol-games ==0.1.1
-  - gogol-games-configuration ==0.1.1
-  - gogol-games-management ==0.1.1
-  - gogol-genomics ==0.1.1
-  - gogol-gmail ==0.1.1
-  - gogol-groups-migration ==0.1.1
-  - gogol-groups-settings ==0.1.1
-  - gogol-identity-toolkit ==0.1.1
-  - gogol-kgsearch ==0.1.1
-  - gogol-latencytest ==0.1.1
-  - gogol-logging ==0.1.1
-  - gogol-maps-coordinate ==0.1.1
-  - gogol-maps-engine ==0.1.1
-  - gogol-mirror ==0.1.1
-  - gogol-monitoring ==0.1.1
-  - gogol-oauth2 ==0.1.1
-  - gogol-pagespeed ==0.1.1
-  - gogol-partners ==0.1.1
-  - gogol-people ==0.1.1
-  - gogol-play-moviespartner ==0.1.1
-  - gogol-plus ==0.1.1
-  - gogol-plus-domains ==0.1.1
-  - gogol-prediction ==0.1.1
-  - gogol-proximitybeacon ==0.1.1
-  - gogol-pubsub ==0.1.1
-  - gogol-qpxexpress ==0.1.1
-  - gogol-replicapool ==0.1.1
-  - gogol-replicapool-updater ==0.1.1
-  - gogol-resourcemanager ==0.1.1
-  - gogol-resourceviews ==0.1.1
-  - gogol-script ==0.1.1
-  - gogol-sheets ==0.1.1
-  - gogol-shopping-content ==0.1.1
-  - gogol-siteverification ==0.1.1
-  - gogol-spectrum ==0.1.1
-  - gogol-sqladmin ==0.1.1
-  - gogol-storage ==0.1.1
-  - gogol-storage-transfer ==0.1.1
-  - gogol-tagmanager ==0.1.1
-  - gogol-taskqueue ==0.1.1
-  - gogol-translate ==0.1.1
-  - gogol-urlshortener ==0.1.1
-  - gogol-useraccounts ==0.1.1
-  - gogol-vision ==0.1.1
-  - gogol-webmaster-tools ==0.1.1
-  - gogol-youtube ==0.1.1
-  - gogol-youtube-analytics ==0.1.1
-  - gogol-youtube-reporting ==0.1.1
+  - gogol ==0.3.0
+  - gogol-adexchange-buyer ==0.3.0
+  - gogol-adexchange-seller ==0.3.0
+  - gogol-admin-datatransfer ==0.3.0
+  - gogol-admin-directory ==0.3.0
+  - gogol-admin-emailmigration ==0.3.0
+  - gogol-admin-reports ==0.3.0
+  - gogol-adsense ==0.3.0
+  - gogol-adsense-host ==0.3.0
+  - gogol-affiliates ==0.3.0
+  - gogol-analytics ==0.3.0
+  - gogol-android-enterprise ==0.3.0
+  - gogol-android-publisher ==0.3.0
+  - gogol-appengine ==0.3.0
+  - gogol-apps-activity ==0.3.0
+  - gogol-apps-calendar ==0.3.0
+  - gogol-apps-licensing ==0.3.0
+  - gogol-apps-reseller ==0.3.0
+  - gogol-apps-tasks ==0.3.0
+  - gogol-appstate ==0.3.0
+  - gogol-autoscaler ==0.3.0
+  - gogol-bigquery ==0.3.0
+  - gogol-billing ==0.3.0
+  - gogol-blogger ==0.3.0
+  - gogol-books ==0.3.0
+  - gogol-civicinfo ==0.3.0
+  - gogol-classroom ==0.3.0
+  - gogol-cloudmonitoring ==0.3.0
+  - gogol-cloudtrace ==0.3.0
+  - gogol-compute ==0.3.0
+  - gogol-container ==0.3.0
+  - gogol-core ==0.3.0
+  - gogol-customsearch ==0.3.0
+  - gogol-dataflow ==0.3.0
+  - gogol-dataproc ==0.3.0
+  - gogol-datastore ==0.3.0
+  - gogol-debugger ==0.3.0
+  - gogol-deploymentmanager ==0.3.0
+  - gogol-dfareporting ==0.3.0
+  - gogol-discovery ==0.3.0
+  - gogol-dns ==0.3.0
+  - gogol-doubleclick-bids ==0.3.0
+  - gogol-doubleclick-search ==0.3.0
+  - gogol-drive ==0.3.0
+  - gogol-firebase-rules ==0.3.0
+  - gogol-fitness ==0.3.0
+  - gogol-fonts ==0.3.0
+  - gogol-freebasesearch ==0.3.0
+  - gogol-fusiontables ==0.3.0
+  - gogol-games ==0.3.0
+  - gogol-games-configuration ==0.3.0
+  - gogol-games-management ==0.3.0
+  - gogol-genomics ==0.3.0
+  - gogol-gmail ==0.3.0
+  - gogol-groups-migration ==0.3.0
+  - gogol-groups-settings ==0.3.0
+  - gogol-identity-toolkit ==0.3.0
+  - gogol-kgsearch ==0.3.0
+  - gogol-latencytest ==0.3.0
+  - gogol-logging ==0.3.0
+  - gogol-maps-coordinate ==0.3.0
+  - gogol-maps-engine ==0.3.0
+  - gogol-mirror ==0.3.0
+  - gogol-monitoring ==0.3.0
+  - gogol-oauth2 ==0.3.0
+  - gogol-pagespeed ==0.3.0
+  - gogol-partners ==0.3.0
+  - gogol-people ==0.3.0
+  - gogol-play-moviespartner ==0.3.0
+  - gogol-plus ==0.3.0
+  - gogol-plus-domains ==0.3.0
+  - gogol-prediction ==0.3.0
+  - gogol-proximitybeacon ==0.3.0
+  - gogol-pubsub ==0.3.0
+  - gogol-qpxexpress ==0.3.0
+  - gogol-replicapool ==0.3.0
+  - gogol-replicapool-updater ==0.3.0
+  - gogol-resourcemanager ==0.3.0
+  - gogol-resourceviews ==0.3.0
+  - gogol-script ==0.3.0
+  - gogol-sheets ==0.3.0
+  - gogol-shopping-content ==0.3.0
+  - gogol-siteverification ==0.3.0
+  - gogol-spectrum ==0.3.0
+  - gogol-sqladmin ==0.3.0
+  - gogol-storage ==0.3.0
+  - gogol-storage-transfer ==0.3.0
+  - gogol-tagmanager ==0.3.0
+  - gogol-taskqueue ==0.3.0
+  - gogol-translate ==0.3.0
+  - gogol-urlshortener ==0.3.0
+  - gogol-useraccounts ==0.3.0
+  - gogol-vision ==0.3.0
+  - gogol-webmaster-tools ==0.3.0
+  - gogol-youtube ==0.3.0
+  - gogol-youtube-analytics ==0.3.0
+  - gogol-youtube-reporting ==0.3.0
   - google-cloud ==0.0.4
-  - google-oauth2-jwt ==0.1.3
-  - google-translate ==0.3
+  - google-oauth2-jwt ==0.2.2
+  - GPipe ==2.2.1
+  - GPipe-GLFW ==1.4.1
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graph-wrapper ==0.2.5.1
   - graphs ==0.7
-  - GraphSCC ==1.0.4
   - graphviz ==2999.18.1.2
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
@@ -906,7 +928,8 @@ default-package-overrides:
   - groundhog-mysql ==0.8
   - groundhog-postgresql ==0.8.0.1
   - groundhog-sqlite ==0.8
-  - groundhog-th ==0.8
+  - groundhog-th ==0.8.0.1
+  - group-by-date ==0.1.0.1
   - grouped-list ==0.2.1.2
   - groupoids ==4.0
   - groups ==0.4.0.0
@@ -915,27 +938,29 @@ default-package-overrides:
   - gtk3 ==0.14.6
   - gtksourceview3 ==0.13.3.1
   - H ==0.9.0.1
+  - h2c ==1.0.0
   - hackage-db ==1.22
   - hackage-security ==0.5.2.2
-  - hackernews ==1.1.2.0
+  - hackernews ==1.2.0.0
+  - haddock ==2.17.4
+  - haddock-api ==2.17.4
   - haddock-library ==1.4.3
+  - haddock-test ==0.0.1
   - hailgun ==0.4.1.4
   - hailgun-simple ==0.1.0.0
-  - hakyll ==4.9.7.0
+  - hakyll ==4.9.8.0
+  - hakyll-favicon ==0.1.0
   - half ==0.2.2.3
   - hamilton ==0.1.0.0
   - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.2.1.2
-  - happstack-authenticate ==2.3.4.7
-  - happstack-clientsession ==7.3.1
-  - happstack-hsp ==7.3.7.2
-  - happstack-jmacro ==7.0.11
+  - hapistrano ==0.3.2.2
+  - happstack-hsp ==7.3.7.3
+  - happstack-jmacro ==7.0.12
   - happstack-server ==7.4.6.4
-  - happstack-server-tls ==7.1.6.2
+  - happstack-server-tls ==7.1.6.3
   - happy ==1.19.5
-  - HaRe ==0.8.4.0
   - harp ==0.4.2
   - hasbolt ==0.1.2.1
   - hashable ==1.2.6.1
@@ -947,32 +972,34 @@ default-package-overrides:
   - haskell-gi-base ==0.20.3
   - haskell-import-graph ==1.0.2
   - haskell-lexer ==1.0.1
-  - haskell-names ==0.8.0
+  - haskell-lsp ==0.1.0.0
   - haskell-neo4j-client ==0.3.2.4
   - haskell-packages ==0.5
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.2.0
   - haskell-src-exts ==1.18.2
   - haskell-src-exts-simple ==1.19.0.0
-  - haskell-src-meta ==0.7.0.1
-  - haskell-tools-ast ==0.5.0.0
-  - haskell-tools-backend-ghc ==0.5.0.0
-  - haskell-tools-cli ==0.5.0.0
-  - haskell-tools-daemon ==0.5.0.0
-  - haskell-tools-debug ==0.5.0.0
-  - haskell-tools-demo ==0.5.0.0
-  - haskell-tools-prettyprint ==0.5.0.0
-  - haskell-tools-refactor ==0.5.0.0
-  - haskell-tools-rewrite ==0.5.0.0
+  - haskell-src-meta ==0.8.0.1
+  - haskell-tools-ast ==0.8.0.0
+  - haskell-tools-backend-ghc ==0.8.0.0
+  - haskell-tools-cli ==0.8.0.0
+  - haskell-tools-daemon ==0.8.0.0
+  - haskell-tools-debug ==0.8.0.0
+  - haskell-tools-demo ==0.8.0.0
+  - haskell-tools-prettyprint ==0.8.0.0
+  - haskell-tools-refactor ==0.8.0.0
+  - haskell-tools-rewrite ==0.8.0.0
   - HaskellNet ==0.5.1
   - HaskellNet-SSL ==0.3.3.0
   - haskintex ==0.7.0.1
-  - hasql ==0.19.16
+  - hasmin ==0.3.2.2
+  - hasql ==0.19.18
   - hasql-migration ==0.1.3
+  - hasql-pool ==0.4.1
   - hasql-transaction ==0.5
   - hastache ==0.6.1
   - hasty-hamiltonian ==1.3.0
-  - HaTeX ==3.17.2.0
+  - HaTeX ==3.17.3.0
   - hatex-guide ==1.3.1.6
   - haxl ==0.5.0.0
   - haxl-amazonka ==0.1.1
@@ -981,14 +1008,18 @@ default-package-overrides:
   - hbeanstalk ==0.2.4
   - Hclip ==3.0.0.4
   - HCodecs ==0.5
-  - hdaemonize ==0.5.3
+  - hdaemonize ==0.5.4
   - HDBC ==2.4.0.1
   - HDBC-mysql ==0.7.1.0
-  - HDBC-session ==0.1.1.0
+  - HDBC-session ==0.1.1.1
   - hdevtools ==0.1.5.0
+  - hdocs ==0.5.2.0
   - heap ==1.0.3
   - heaps ==0.3.4.1
+  - heatshrink ==0.1.0.0
   - hebrew-time ==0.1.1
+  - hedgehog ==0.5
+  - hedgehog-quickcheck ==0.1
   - hedis ==0.9.8
   - here ==1.2.11
   - heredoc ==0.2.0.0
@@ -997,48 +1028,43 @@ default-package-overrides:
   - hexml ==0.3.2
   - hexpat ==0.20.13
   - hexstring ==0.11.1
-  - hflags ==0.4.2
-  - hformat ==0.1.0.1
+  - hformat ==0.3.0.0
   - hfsevents ==0.1.6
-  - hgal ==2.0.0.2
   - hid ==0.2.2
   - hidapi ==0.1.4
-  - hidden-char ==0.1.0.0
+  - hidden-char ==0.1.0.1
   - hierarchical-clustering ==0.4.6
   - highjson ==0.4.0.0
   - highjson-swagger ==0.4.0.0
   - highjson-th ==0.4.0.0
+  - highlight ==1.0.0.1
   - highlighting-kate ==0.6.4
   - hinotify ==0.3.9
-  - hint ==0.6.0
-  - hip ==1.5.3.0
+  - hint ==0.7.0
+  - hinterface ==0.5.0.2
   - histogram-fill ==0.8.5.0
   - hit ==0.6.3
-  - hjpath ==3.0.1
   - hjsmin ==0.2.0.2
-  - hjson ==1.3.2
-  - hjsonpointer ==1.1.1
-  - hjsonschema ==1.5.0.1
+  - hjsonpointer ==1.2.0
+  - hjsonschema ==1.6.3
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.6.0
-  - hlint ==1.9.41
+  - hlint ==2.0.9
   - hmatrix ==0.18.0.0
   - hmatrix-gsl ==0.18.0.1
   - hmatrix-gsl-stats ==0.4.1.6
-  - hmatrix-repa ==0.1.2.2
   - hmatrix-special ==0.4.0.1
   - hmpfr ==0.4.2.1
-  - hmt ==0.15
-  - hoauth2 ==0.5.7
+  - hoauth2 ==1.3.0
   - hocilib ==0.2.0
   - holy-project ==0.2.0.1
-  - hOpenPGP ==2.5.5
-  - hopenpgp-tools ==0.19.4
   - hopfli ==0.2.2.1
   - hosc ==0.15
   - hostname ==1.0
   - hostname-validate ==1.0.0
   - hourglass ==0.2.10
+  - hourglass-orphans ==0.1.0.0
+  - hp2pretty ==0.8.0.2
   - hpc-coveralls ==1.0.10
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
@@ -1048,13 +1074,15 @@ default-package-overrides:
   - hpqtypes ==1.5.1.1
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
-  - hruby ==0.3.4.3
+  - hreader-lens ==0.1.3.0
+  - hruby ==0.3.4.4
   - hs-bibutils ==5.5
   - hs-GeoIP ==0.3
   - hsass ==0.4.1
   - hsb2hs ==0.3.1
   - hscolour ==1.24.1
   - hscurses ==1.4.2.0
+  - hsdev ==0.2.5.0
   - hsdns ==1.7
   - hse-cpp ==0.2
   - hsebaysdk ==0.4.0.0
@@ -1063,7 +1091,7 @@ default-package-overrides:
   - hset ==2.2.0
   - hsexif ==0.6.1.1
   - hsignal ==0.2.7.5
-  - hsinstall ==1.5
+  - hsinstall ==1.6
   - hslogger ==1.2.10
   - hslua ==0.4.1
   - hslua-aeson ==0.1.0.4
@@ -1072,17 +1100,19 @@ default-package-overrides:
   - HsOpenSSL ==0.11.4.9
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.4.3
+  - hspec ==2.4.4
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.4.0
-  - hspec-core ==2.4.3
-  - hspec-discover ==2.4.3
+  - hspec-core ==2.4.4
+  - hspec-discover ==2.4.4
   - hspec-expectations ==0.8.2
+  - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.4
   - hspec-golden-aeson ==0.2.0.3
   - hspec-megaparsec ==0.3.1
-  - hspec-meta ==2.3.2
+  - hspec-meta ==2.4.4
+  - hspec-pg-transact ==0.1.0.2
   - hspec-setup ==0.2.1.0
   - hspec-smallcheck ==0.4.2
   - hspec-wai ==0.8.0
@@ -1094,8 +1124,8 @@ default-package-overrides:
   - HStringTemplate ==0.8.6
   - hsx-jmacro ==7.3.8
   - hsx2hs ==0.14.1
-  - hsyslog ==4
-  - htaglib ==1.0.4
+  - hsyslog ==5.0.1
+  - htaglib ==1.1.1
   - HTF ==0.13.1.0
   - html ==1.0.1.2
   - html-conduit ==1.2.1.1
@@ -1119,19 +1149,16 @@ default-package-overrides:
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.5.0.0
   - HUnit-approx ==1.1
-  - hunit-dejafu ==0.3.0.3
+  - hunit-dejafu ==0.6.0.0
   - hvect ==0.4.0.0
-  - hw-balancedparens ==0.1.0.0
-  - hw-bits ==0.5.0.0
-  - hw-conduit ==0.1.0.0
+  - hw-balancedparens ==0.1.0.2
+  - hw-bits ==0.5.0.2
   - hw-diagnostics ==0.0.0.5
-  - hw-excess ==0.1.0.0
+  - hw-excess ==0.1.0.1
   - hw-int ==0.0.0.1
-  - hw-json ==0.4.0.0
-  - hw-mquery ==0.1.0.1
-  - hw-parser ==0.0.0.1
+  - hw-parser ==0.0.0.2
   - hw-prim ==0.4.0.3
-  - hw-rankselect ==0.8.0.0
+  - hw-rankselect ==0.8.0.1
   - hw-rankselect-base ==0.2.0.0
   - hw-string-parse ==0.0.0.3
   - hw-succinct ==0.1.0.1
@@ -1140,12 +1167,16 @@ default-package-overrides:
   - hxt ==9.3.1.16
   - hxt-charproperties ==9.2.0.1
   - hxt-css ==0.1.0.3
+  - hxt-curl ==9.1.1.1
+  - hxt-expat ==9.1.1
   - hxt-http ==9.1.5.2
   - hxt-pickle-utils ==0.1.0.3
   - hxt-regex-xmlschema ==9.2.0.3
+  - hxt-tagsoup ==9.1.4
   - hxt-unicode ==9.0.2.4
   - hybrid-vectors ==0.2.1
-  - hyphenation ==0.6
+  - hyperloglog ==0.4.1
+  - hyphenation ==0.7
   - ical ==0.0.1
   - iconv ==0.4.1.3
   - identicon ==0.2.2
@@ -1155,32 +1186,34 @@ default-package-overrides:
   - IfElse ==0.85
   - iff ==0.0.6
   - ignore ==0.1.1.0
-  - ilist ==0.2.0.0
+  - ihs ==0.1.0.0
+  - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
-  - imm ==1.1.0.0
+  - Imlib ==0.1.2
+  - imm ==1.2.0.0
   - immortal ==0.2.2
   - include-file ==0.1.0.3
   - incremental-parser ==0.2.5.1
-  - indentation-core ==0.0
-  - indentation-parsec ==0.0
+  - indentation-core ==0.0.0.1
+  - indentation-parsec ==0.0.0.1
   - indents ==0.4.0.0
   - inflections ==0.3.0.0
   - ini ==0.3.5
   - inline-c ==0.5.6.1
   - inline-c-cpp ==0.1.0.0
-  - inline-java ==0.6.1
+  - inline-java ==0.6.5
   - inline-r ==0.9.0.1
   - insert-ordered-containers ==0.2.1.0
   - instance-control ==0.1.1.1
-  - integer-logarithms ==1.0.1
+  - integer-logarithms ==1.0.2
   - integration ==0.2.1
   - intero ==0.1.20
-  - interpolate ==0.1.0
+  - interpolate ==0.1.1
   - interpolatedstring-perl6 ==1.0.0
   - interpolation ==0.1.0.1
   - IntervalMap ==0.5.2.0
-  - intervals ==0.7.2
-  - intro ==0.1.0.10
+  - intervals ==0.8
+  - intro ==0.3.0.1
   - invariant ==0.4.2
   - invertible ==0.2.0.2
   - io-choice ==0.0.6
@@ -1189,13 +1222,14 @@ default-package-overrides:
   - io-memoize ==1.1.1.0
   - io-region ==0.1.1
   - io-storage ==0.3
-  - io-streams ==1.3.6.1
+  - io-streams ==1.4.0.0
   - io-streams-haproxy ==1.0.0.1
   - ip6addr ==0.5.3
   - iproute ==1.7.1
-  - IPv6Addr ==0.6.3
+  - IPv6Addr ==1.0.1
+  - IPv6DB ==0.2.1
   - irc ==0.6.1.0
-  - irc-client ==0.4.4.1
+  - irc-client ==0.4.4.2
   - irc-conduit ==0.2.2.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
@@ -1203,39 +1237,37 @@ default-package-overrides:
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.4
-  - isotope ==0.4.0.0
+  - isotope ==0.5.0.1
   - iterable ==3.0
   - ix-shapable ==0.1.0
-  - ixset ==1.0.7
   - ixset-typed ==0.3.1
+  - jack ==0.7.1.1
   - jailbreak-cabal ==1.3.2
   - javascript-extras ==0.3.1.0
   - jmacro ==0.6.14
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
-  - jni ==0.2.3
-  - jose ==0.5.0.4
+  - jni ==0.3.1
+  - jose ==0.6.0.3
   - jose-jwt ==0.7.6
   - js-flot ==0.8.3
-  - js-jquery ==3.1.1
+  - js-jquery ==3.2.1
   - json ==0.9.1
-  - json-ast ==0.3.1
   - json-builder ==0.3
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
   - json-stream ==0.4.1.3
   - JuicyPixels ==3.2.8.2
-  - JuicyPixels-extra ==0.1.1
+  - JuicyPixels-extra ==0.2.1
   - JuicyPixels-scale-dct ==0.1.1.2
-  - jvm ==0.1.2
-  - jvm-streaming ==0.1
+  - jvm ==0.2.2
+  - jvm-streaming ==0.2
   - jwt ==0.7.2
   - kan-extensions ==5.0.2
   - kansas-comet ==0.4
-  - katip ==0.3.1.5
-  - katip-elasticsearch ==0.3.1.0
-  - kawhi ==0.2.3
+  - katip ==0.5.0.0
+  - kawhi ==0.3.0
   - kdt ==0.2.4
   - keter ==1.4.3.2
   - keycode ==0.2.2
@@ -1247,28 +1279,28 @@ default-package-overrides:
   - l10n ==0.1.0.1
   - labels ==0.3.2
   - lackey ==0.4.3
-  - language-c ==0.5.0
-  - language-c-quote ==0.11.7.3
+  - lame ==0.1.1
+  - language-c ==0.6.1
+  - language-c-quote ==0.12
   - language-dockerfile ==0.3.6.0
   - language-ecmascript ==0.17.2.0
   - language-fortran ==0.5.1
-  - language-glsl ==0.2.0
+  - language-glsl ==0.2.1
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.8
   - language-javascript ==0.6.0.10
   - language-lua2 ==0.1.0.5
-  - language-puppet ==1.3.7
+  - language-puppet ==1.3.8.1
   - language-python ==0.5.4
   - language-thrift ==0.10.0.0
-  - large-hashable ==0.1.0.4
   - largeword ==1.2.5
   - latex ==0.1.0.3
   - lattices ==1.5.0
-  - lazy-csv ==0.5.1
   - lazyio ==0.1.0.4
   - lca ==0.3
+  - leancheck ==0.6.3
   - leapseconds-announced ==2017
-  - lens ==4.15.1
+  - lens ==4.15.3
   - lens-action ==0.2.1
   - lens-aeson ==1.0.1
   - lens-datetime ==0.3
@@ -1288,15 +1320,16 @@ default-package-overrides:
   - libmpd ==0.9.0.6
   - libnotify ==0.2
   - librato ==0.2.0.1
-  - libsystemd-journal ==1.4.1
+  - libsystemd-journal ==1.4.2
+  - libxml-sax ==0.7.5
   - LibZip ==1.0.1
-  - licensor ==0.2.0
+  - licensor ==0.2.1
   - lift-generics ==0.1.1
   - lifted-async ==0.9.3
   - lifted-base ==0.2.3.11
-  - line ==2.2.0
+  - line ==3.1.0
   - linear ==1.20.6
-  - linear-accelerate ==0.2
+  - linear-accelerate ==0.4
   - linked-list-with-iterator ==0.1.1.0
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.2.0
@@ -1305,18 +1338,21 @@ default-package-overrides:
   - list-prompt ==0.1.1.0
   - list-t ==1
   - ListLike ==4.5.1
-  - llvm-hs-pure ==4.0.0.0
+  - listsafe ==0.1.0.1
+  - llvm-hs ==4.2.0
+  - llvm-hs-pure ==4.1.0.0
   - lmdb ==0.2.5
   - loch-th ==0.2.1
-  - log ==0.7
+  - log ==0.9.0.1
   - log-base ==0.7.1.1
   - log-domain ==0.11.1
-  - log-elasticsearch ==0.7
+  - log-elasticsearch ==0.9.0.1
   - log-postgres ==0.7.0.1
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.1.3
-  - logging-facade ==0.1.1
+  - logging-effect ==1.2.0
+  - logging-facade ==0.3.0
+  - logging-facade-syslog ==1
   - logict ==0.6.0.2
   - loop ==0.3.0
   - lrucache ==1.2.0.0
@@ -1331,8 +1367,8 @@ default-package-overrides:
   - machines-process ==0.2.0.8
   - magic ==1.1
   - magicbane ==0.1.1
-  - mainland-pretty ==0.4.1.4
-  - makefile ==0.1.1.0
+  - mainland-pretty ==0.6.1
+  - makefile ==1.0.0.4
   - managed ==1.0.5
   - mandrill ==0.5.3.2
   - markdown ==0.1.16
@@ -1343,29 +1379,28 @@ default-package-overrides:
   - marvin-interpolate ==1.1.2
   - math-functions ==0.2.1.0
   - mathexpr ==0.3.0.0
-  - matplotlib ==0.4.5
-  - matrices ==0.4.4
+  - matplotlib ==0.5.0
+  - matrices ==0.4.5
   - matrix ==0.3.5.0
   - matrix-market-attoparsec ==0.1.0.8
   - maximal-cliques ==0.1.1
   - mbox ==0.3.3
   - mbox-utility ==0.0.1
   - mcmc-types ==1.0.3
-  - mediabus ==0.3.3.0
-  - mediabus-rtp ==0.3.2.1
+  - med-module ==0.1
+  - mediabus ==0.4.0.1
+  - mediabus-rtp ==0.4.0.1
   - median-stream ==0.7.0.0
   - mega-sdist ==0.3.0.2
-  - megaparsec ==5.2.0
+  - megaparsec ==5.3.1
   - memory ==0.14.6
   - MemoTrie ==0.6.8
-  - mersenne-random ==1.0.0.1
   - mersenne-random-pure64 ==0.2.2.0
   - messagepack ==0.5.4
   - messagepack-rpc ==0.5.1
   - metrics ==0.4.0.1
   - MFlow ==0.4.6.0
   - mfsolve ==0.3.2.0
-  - microbench ==0.1
   - microformats2-parser ==1.0.1.7
   - microlens ==0.4.8.0
   - microlens-aeson ==2.2.0.1
@@ -1374,23 +1409,25 @@ default-package-overrides:
   - microlens-mtl ==0.1.11.0
   - microlens-platform ==0.3.9.0
   - microlens-th ==0.4.1.1
+  - microstache ==1.0.1.1
   - midi ==0.2.2.1
   - midi-music-box ==0.0.0.4
   - mighty-metropolis ==1.2.0
   - mime-mail ==0.4.13.1
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
-  - minio-hs ==0.2.1
+  - minio-hs ==0.3.0
   - mintty ==0.1.1
-  - misfortune ==0.1.1.2
+  - miso ==0.4.0.0
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
-  - mixed-types-num ==0.1.0.1
+  - mixed-types-num ==0.2.0.1
   - mltool ==0.1.0.2
   - mmap ==0.5.9
   - mmorph ==1.0.9
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
+  - model ==0.3
   - modify-fasta ==0.8.2.3
   - monad-control ==1.0.2.1
   - monad-coroutine ==0.9.0.3
@@ -1407,21 +1444,19 @@ default-package-overrides:
   - monad-par-extras ==0.3.3
   - monad-parallel ==0.7.2.2
   - monad-peel ==0.2.1.2
-  - monad-primitive ==0.1
   - monad-products ==4.0.1
-  - monad-skeleton ==0.1.3.2
+  - monad-skeleton ==0.1.4
   - monad-time ==0.2
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.0
   - monadcryptorandom ==0.7.1
   - monadic-arrays ==0.2.2
-  - monadLib ==3.7.3
   - monadloc ==0.7.1
   - monadplus ==1.4.2
   - MonadPrompt ==1.0.0.5
   - MonadRandom ==0.5.1
   - monads-tf ==0.1.0.3
-  - mongoDB ==2.1.1.1
+  - mongoDB ==2.3.0
   - mono-traversable ==1.0.2
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
@@ -1438,32 +1473,29 @@ default-package-overrides:
   - multimap ==1.2.1
   - multipart ==0.1.2
   - multiset ==0.3.3
-  - multiset-comb ==0.2.4.1
   - multistate ==0.7.1.1
   - murmur-hash ==0.1.0.9
   - mushu ==0.1.1
-  - MusicBrainz ==0.2.4
-  - mustache ==2.1.4
+  - MusicBrainz ==0.3
+  - mustache ==2.2.3
   - mutable-containers ==0.3.3
   - mwc-probability ==1.3.0
   - mwc-random ==0.13.6.0
-  - mwc-random-monad ==0.7.3.1
   - mysql ==0.1.4
   - mysql-haskell ==0.8.0.0
   - mysql-haskell-openssl ==0.8.0.0
   - mysql-simple ==0.4.0.1
   - nagios-check ==0.3.2
-  - names-th ==0.2.0.2
+  - names-th ==0.2.0.3
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.1
-  - nationstates ==0.5.0.0
+  - naqsha ==0.2.0.1
   - nats ==1.1.1
   - natural-sort ==0.1.2
   - natural-transformation ==0.4
   - ndjson-conduit ==0.1.0.5
   - neat-interpolation ==0.3.2.1
   - netpbm ==1.0.2
-  - nettle ==0.2.0
   - netwire ==5.0.2
   - netwire-input ==0.0.6
   - netwire-input-glfw ==0.0.6
@@ -1471,7 +1503,7 @@ default-package-overrides:
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
-  - network-carbon ==1.0.9
+  - network-carbon ==1.0.10
   - network-conduit-tls ==1.2.2
   - network-house ==0.1.0.2
   - network-info ==0.2.0.8
@@ -1489,7 +1521,7 @@ default-package-overrides:
   - newtype ==0.2
   - newtype-generics ==0.5
   - next-ref ==0.1.0.2
-  - nfc ==0.0.1
+  - nfc ==0.1.0
   - nicify-lib ==1.0.1
   - NineP ==0.0.2.1
   - nix-paths ==1.0.0.1
@@ -1504,12 +1536,17 @@ default-package-overrides:
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.2
   - numeric-quest ==0.2.0.1
+  - numhask ==0.0.7
+  - numhask-range ==0.0.4
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
-  - oanda-rest-api ==0.3.0.0
+  - nvim-hs ==0.2.2
+  - nvim-hs-contrib ==0.2.0
+  - nvim-hs-ghcid ==0.2.0
+  - oanda-rest-api ==0.4.1
   - objective ==1.1.1
   - ObjectName ==1.1.0.1
-  - octane ==0.18.3
+  - octane ==0.20.0
   - Octree ==0.5.4.3
   - oeis ==0.3.9
   - ofx ==0.4.2.0
@@ -1518,6 +1555,7 @@ default-package-overrides:
   - once ==0.2
   - one-liner ==0.9.1
   - OneTuple ==0.2.1
+  - online ==0.2.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.5.3.0
@@ -1525,18 +1563,19 @@ default-package-overrides:
   - open-browser ==0.2.1.0
   - open-witness ==0.4
   - OpenAL ==1.7.0.4
+  - openexr-write ==0.1.0.1
   - OpenGL ==3.0.2.0
-  - OpenGLRaw ==3.2.4.0
+  - OpenGLRaw ==3.2.5.0
   - openpgp-asciiarmor ==0.1
   - opensource ==0.1.0.0
   - openssl-streams ==1.2.1.1
   - operational ==0.2.3.5
   - operational-class ==0.3.0.0
-  - opml-conduit ==0.6.0.1
+  - opml-conduit ==0.6.0.3
   - optional-args ==1.0.1
   - options ==1.2.1.1
   - optparse-applicative ==0.13.2.0
-  - optparse-generic ==1.1.5
+  - optparse-generic ==1.2.2
   - optparse-helper ==0.2.1.1
   - optparse-simple ==0.0.3
   - optparse-text ==0.1.1.0
@@ -1544,28 +1583,33 @@ default-package-overrides:
   - overloaded-records ==0.4.2.0
   - package-description-remote ==0.2.0.0
   - packdeps ==0.4.3
+  - packunused ==0.1.2
   - pager ==0.1.1.0
   - pagerduty ==0.0.8
-  - pagination ==0.1.1
+  - pagination ==0.2.0
   - palette ==0.1.0.4
   - pandoc ==1.19.2.1
-  - pandoc-citeproc ==0.10.4.1
+  - pandoc-citeproc ==0.10.5.1
   - pandoc-types ==1.17.0.5
   - pango ==0.13.3.1
+  - papillon ==0.1.0.4
   - parallel ==3.2.1.1
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.8
   - parsec ==3.1.11
   - parsec-numeric ==0.1.0.0
   - ParsecTools ==0.0.2.0
+  - parser-combinators ==0.1.0
   - parsers ==0.12.5
   - partial-handler ==1.0.2
   - partial-isomorphisms ==0.2.2.1
+  - partial-order ==0.1.2.1
   - patat ==0.5.2.2
   - path ==0.5.13
   - path-extra ==0.0.3
   - path-io ==1.2.2
   - path-pieces ==0.2.1
+  - pathtype ==0.8
   - pathwalk ==0.3.1.2
   - patience ==0.1.1
   - pattern-arrows ==0.0.2
@@ -1577,20 +1621,24 @@ default-package-overrides:
   - pdf-toolbox-document ==0.0.7.1
   - pdfinfo ==1.5.4
   - pem ==0.2.2
-  - permutation ==0.5.0.5
-  - persistable-record ==0.4.1.1
-  - persistable-types-HDBC-pg ==0.0.1.4
-  - persistent ==2.6.1
+  - perf ==0.1.2
+  - persistable-record ==0.5.1.1
+  - persistable-types-HDBC-pg ==0.0.1.5
+  - persistent ==2.7.0
+  - persistent-mongoDB ==2.6.0
   - persistent-mysql ==2.6.1
+  - persistent-mysql-haskell ==0.3.0.0
   - persistent-postgresql ==2.6.1
   - persistent-redis ==2.5.2
   - persistent-refs ==0.4
   - persistent-sqlite ==2.6.2
   - persistent-template ==2.5.2
+  - pg-transact ==0.1.0.1
   - pgp-wordlist ==0.1.0.2
   - phantom-state ==0.2.1.2
   - picedit ==0.2.3.0
   - picoparsec ==0.1.2.3
+  - picosat ==0.1.4
   - pid1 ==0.1.2.0
   - pinboard ==0.9.12.4
   - pinch ==0.3.2.0
@@ -1598,14 +1646,13 @@ default-package-overrides:
   - pipes ==4.3.4
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.6
-  - pipes-cacophony ==0.4.1
+  - pipes-cacophony ==0.5.0
   - pipes-category ==0.2.0.1
   - pipes-concurrency ==2.0.7
-  - pipes-csv ==1.4.3
   - pipes-extras ==1.0.10
   - pipes-fluid ==0.5.0.3
   - pipes-group ==1.0.6
-  - pipes-misc ==0.2.5.0
+  - pipes-misc ==0.3.0.0
   - pipes-mongodb ==0.1.0.0
   - pipes-parse ==3.0.8
   - pipes-random ==1.0.0.3
@@ -1620,11 +1667,13 @@ default-package-overrides:
   - plot-gtk ==0.2.0.4
   - plot-gtk-ui ==0.3.0.2
   - plot-gtk3 ==0.1.0.2
+  - plot-light ==0.2.4
   - point-octree ==0.5.5.3
   - pointed ==5
   - pointedlist ==0.6.1
   - pointful ==1.0.9
   - pointless-fun ==1.1.0.6
+  - poll ==0.0
   - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.12
@@ -1632,23 +1681,25 @@ default-package-overrides:
   - posix-paths ==0.2.1.1
   - posix-realtime ==0.0.0.4
   - post-mess-age ==0.2.1.0
-  - postgresql-binary ==0.9.3
+  - postgresql-binary ==0.12.1
   - postgresql-libpq ==0.9.3.1
   - postgresql-schema ==0.1.11
   - postgresql-simple ==0.5.3.0
   - postgresql-simple-migration ==0.1.9.0
+  - postgresql-simple-opts ==0.2.0.2
+  - postgresql-simple-queue ==0.5.0.0
   - postgresql-simple-url ==0.2.0.0
   - postgresql-transactional ==1.1.1
   - postgresql-typed ==0.5.1
   - pqueue ==1.3.2.2
   - pred-set ==0.0.1
+  - pred-trie ==0.5.1.2
   - prednote ==0.36.0.4
   - prefix-units ==0.2.0
   - prelude-compat ==0.0.0.1
   - prelude-extras ==0.4.0.3
   - prelude-safeenum ==0.1.1.2
   - preprocessor-tools ==1.0.1
-  - presburger ==1.3.1
   - present ==4.1.0
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.0
@@ -1662,50 +1713,51 @@ default-package-overrides:
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - primes ==0.2.1.0
-  - primitive ==0.6.1.0
+  - primitive ==0.6.2.0
   - printcess ==0.1.0.3
   - probability ==0.2.5.1
   - process-extras ==0.7.2
-  - product-profunctors ==0.7.1.0
+  - product-profunctors ==0.8.0.3
+  - profiterole ==0.1
   - profiteur ==0.4.3.0
   - profunctor-extras ==4.0
   - profunctors ==5.2
   - project-template ==0.2.0
   - projectroot ==0.2.0.1
-  - prometheus-client ==0.1.1
-  - prometheus-metrics-ghc ==0.1.1
+  - prometheus-client ==0.2.0
+  - prometheus-metrics-ghc ==0.2.0
   - prompt ==0.1.1.2
   - proto-lens ==0.2.1.0
-  - proto-lens-arbitrary ==0.1.0.3
+  - proto-lens-arbitrary ==0.1.1.0
   - proto-lens-combinators ==0.1.0.7
   - proto-lens-descriptors ==0.2.1.0
   - proto-lens-optparse ==0.1.0.3
+  - proto-lens-protobuf-types ==0.2.1.0
   - proto-lens-protoc ==0.2.1.0
   - protobuf ==0.2.1.1
   - protobuf-simple ==0.1.0.4
   - protocol-buffers ==2.4.2
   - protocol-buffers-descriptor ==2.4.2
   - protolude ==0.1.10
-  - proxied ==0.2
+  - proxied ==0.3
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
   - psqueues ==0.2.3.0
-  - publicsuffix ==0.20170109
-  - pure-cdb ==0.1.2
+  - publicsuffix ==0.20170508
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
-  - purescript-bridge ==0.10.1.0
-  - pusher-http-haskell ==1.1.0.4
+  - purescript-bridge ==0.11.0.0
+  - pusher-http-haskell ==1.2.0.1
   - pwstore-fast ==2.4.4
-  - pwstore-purehaskell ==2.1.4
   - QuasiText ==0.1.2.6
   - questioner ==0.1.1.0
   - quickbench ==1.0
   - QuickCheck ==2.9.2
   - quickcheck-arbitrary-adt ==0.2.0.0
   - quickcheck-assertions ==0.3.0
+  - quickcheck-combinators ==0.0.2
   - quickcheck-instances ==0.3.12
-  - quickcheck-io ==0.1.4
+  - quickcheck-io ==0.2.0
   - quickcheck-simple ==0.1.0.2
   - quickcheck-special ==0.1.0.5
   - quickcheck-text ==0.1.2.1
@@ -1725,16 +1777,17 @@ default-package-overrides:
   - rank1dynamic ==0.3.3.0
   - Rasterific ==0.7.2.1
   - rasterific-svg ==0.3.2.1
-  - ratel ==0.3.3
+  - ratel ==0.3.4
   - ratel-wai ==0.2.0
-  - rattletrap ==2.1.5
+  - rattletrap ==2.5.0
   - raw-strings-qq ==1.1
-  - rawfilepath ==0.1.1
+  - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
   - rdf ==0.1.0.1
   - rdtsc ==1.3.0.1
+  - reactive-banana ==1.1.0.1
   - read-editor ==0.1.0.2
-  - read-env-var ==0.1.0.1
+  - read-env-var ==1.0.0.0
   - readable ==0.3.1
   - ReadArgs ==1.2.3
   - readline ==1.0.3.0
@@ -1743,7 +1796,6 @@ default-package-overrides:
   - redis-io ==0.7.0
   - redis-resp ==0.4.0
   - reducers ==3.12.1
-  - reedsolomon ==0.0.4.3
   - ref-fd ==0.4.0.1
   - refact ==0.3.0.2
   - references ==0.3.2.1
@@ -1752,7 +1804,7 @@ default-package-overrides:
   - reform ==0.2.7.1
   - reform-blaze ==0.2.4.3
   - reform-hamlet ==0.0.5.3
-  - reform-happstack ==0.2.5.1
+  - reform-happstack ==0.2.5.2
   - reform-hsp ==0.2.7.1
   - RefSerialize ==0.4.0
   - regex ==1.0.1.3
@@ -1769,14 +1821,11 @@ default-package-overrides:
   - regex-tdfa-text ==1.0.0.3
   - regex-with-pcre ==1.0.1.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.8.4.0
-  - relational-query-HDBC ==0.6.0.3
-  - relational-record ==0.1.7.1
-  - relational-schemas ==0.1.3.1
+  - relational-query ==0.9.4.1
+  - relational-query-HDBC ==0.6.4.0
+  - relational-record ==0.1.8.0
+  - relational-schemas ==0.1.4.0
   - renderable ==0.2.0.1
-  - repa ==3.4.1.2
-  - repa-algorithms ==3.4.1.1
-  - repa-io ==3.4.1.1
   - RepLib ==0.5.4
   - repline ==0.1.6.0
   - req ==0.2.0
@@ -1800,15 +1849,12 @@ default-package-overrides:
   - retry ==0.7.4.2
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
-  - riak ==1.1.2.0
-  - riak-protobuf ==0.22.0.0
-  - RNAlien ==1.3.7
   - rng-utils ==0.2.1
   - rose-trees ==0.0.4.3
-  - rot13 ==0.1.0.2
+  - rot13 ==0.2.0.1
   - rotating-log ==0.4.2
-  - RSA ==2.2.0
-  - rss-conduit ==0.3.0.0
+  - RSA ==2.3.0
+  - rss-conduit ==0.3.1.1
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
@@ -1816,6 +1862,7 @@ default-package-overrides:
   - safe-exceptions ==0.1.6.0
   - safe-exceptions-checked ==0.1.0
   - safecopy ==0.9.3.2
+  - safeio ==0.0.2.0
   - SafeSemaphore ==0.10.1
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
@@ -1823,10 +1870,10 @@ default-package-overrides:
   - sandi ==0.4.0
   - sandman ==0.2.0.1
   - say ==0.1.0.0
-  - sbv ==5.14
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
+  - schematic ==0.1.4.0
   - scientific ==0.3.5.1
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.5
@@ -1835,41 +1882,45 @@ default-package-overrides:
   - sdl2-gfx ==0.2
   - sdl2-image ==2.0.0
   - sdl2-mixer ==0.1
-  - search-algorithms ==0.1.0
+  - sdl2-ttf ==1.0.0
+  - search-algorithms ==0.2.0
   - securemem ==0.1.9
   - SegmentTree ==0.3
+  - selda ==0.1.9.0
+  - selda-postgresql ==0.1.5.1
+  - selda-sqlite ==0.1.5.1
   - semigroupoid-extras ==5
-  - semigroupoids ==5.1
-  - semigroups ==0.18.2
+  - semigroupoids ==5.2
+  - semigroups ==0.18.3
   - semiring-simple ==1.0.0.1
   - semver ==0.3.3.1
   - sendfile ==0.7.9
+  - sensu-run ==0.2.0
   - seqalign ==0.2.0.4
   - seqloc ==0.6.1.1
   - serf ==0.1.1.0
-  - servant ==0.9.1.1
-  - servant-aeson-specs ==0.5.2.0
-  - servant-auth-cookie ==0.4.4
+  - servant ==0.11
+  - servant-auth-cookie ==0.5.0.5
   - servant-blaze ==0.7.1
-  - servant-cassava ==0.8
-  - servant-client ==0.9.1.1
-  - servant-docs ==0.9.1.1
+  - servant-cassava ==0.9
+  - servant-checked-exceptions ==0.4.0.0
+  - servant-client ==0.11
+  - servant-docs ==0.10.0.1
   - servant-elm ==0.4.0.1
-  - servant-foreign ==0.9.1.1
+  - servant-foreign ==0.10.1
   - servant-js ==0.9.3
   - servant-JuicyPixels ==0.3.0.3
   - servant-lucid ==0.7.1
-  - servant-mock ==0.8.1.1
-  - servant-purescript ==0.6.0.0
+  - servant-mock ==0.8.2
+  - servant-purescript ==0.8.0.0
   - servant-ruby ==0.2.1.0
-  - servant-server ==0.9.1.1
-  - servant-static-th ==0.1.0.3
-  - servant-subscriber ==0.5.0.3
-  - servant-swagger ==1.1.2
-  - servant-swagger-ui ==0.2.3.2.2.8
+  - servant-server ==0.11
+  - servant-static-th ==0.1.0.4
+  - servant-subscriber ==0.6.0.0
+  - servant-swagger ==1.1.3.1
+  - servant-swagger-ui ==0.2.4.3.0.20
   - servant-yaml ==0.1.0.0
   - serversession ==1.0.1
-  - serversession-backend-acid-state ==1.0.3
   - serversession-frontend-wai ==1.0
   - serversession-frontend-yesod ==1.0
   - servius ==1.2.0.2
@@ -1882,21 +1933,21 @@ default-package-overrides:
   - shake ==0.15.11
   - shake-language-c ==0.10.1
   - shakespeare ==2.0.13
-  - shell-conduit ==4.5.2
+  - shell-conduit ==4.6.1
   - shelly ==1.6.8.3
+  - shikensu ==0.3.7
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
-  - show-prettyprint ==0.1.2.1
+  - show-prettyprint ==0.2
   - sibe ==0.2.0.5
   - signal ==0.1.0.3
   - silently ==1.2.5
   - simple ==0.11.2
   - simple-download ==0.0.2
-  - simple-log ==0.5.1
+  - simple-log ==0.9.2
   - simple-reflect ==0.3.2
   - simple-sendfile ==0.2.25
   - simple-session ==0.10.1.1
-  - simple-smt ==0.6.0
   - simple-templates ==0.8.0.1
   - singleton-bool ==0.1.2.0
   - singletons ==2.2
@@ -1905,28 +1956,32 @@ default-package-overrides:
   - skeletons ==0.4.0
   - skylighting ==0.1.1.5
   - slave-thread ==1.0.2
-  - slug ==0.1.6
+  - slug ==0.1.7
   - smallcaps ==0.6.0.4
   - smallcheck ==1.1.1
+  - smallcheck-series ==0.6
   - smoothie ==0.4.2.7
-  - smtLib ==1.0.8
   - smtp-mail ==0.1.4.6
   - snap-blaze ==0.2.1.5
   - snap-core ==1.0.2.1
   - snap-server ==1.0.2.2
   - snowflake ==0.1.1.1
+  - snowtify ==0.1.0.0
   - soap ==0.2.3.5
   - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.2
-  - socket ==0.7.0.0
+  - socket ==0.8.0.1
   - socket-activation ==0.1.0.2
   - socks ==0.5.5
   - solga ==0.1.0.2
   - solga-swagger ==0.1.0.2
   - sort ==1.0.0.0
   - sorted-list ==0.2.0.0
+  - sound-collage ==0.2.0.1
   - sourcemap ==0.1.6
-  - sparkle ==0.4.0.2
+  - sox ==0.2.2.6
+  - soxlib ==0.0.3
+  - sparkle ==0.5.0.1
   - sparse-linear-algebra ==0.2.9.7
   - spdx ==0.2.2.0
   - speculation ==1.5.0.3
@@ -1935,16 +1990,17 @@ default-package-overrides:
   - Spintax ==0.3.2
   - splice ==0.6.1.1
   - split ==0.2.3.2
+  - split-record ==0.1.1.3
+  - splitmix ==0
   - Spock ==0.12.0.0
   - Spock-api ==0.12.0.0
   - Spock-api-server ==0.12.0.0
   - Spock-core ==0.12.0.0
-  - Spock-lucid ==0.3.0.0
+  - Spock-lucid ==0.4.0.0
   - Spock-worker ==0.3.1.0
   - spool ==0.1
-  - spoon ==0.3.1
   - spreadsheet ==0.1.3.5
-  - sql-words ==0.1.5.0
+  - sql-words ==0.1.5.1
   - sqlite-simple ==0.4.14.0
   - sqlite-simple-errors ==0.6.0.0
   - srcloc ==0.5.1.1
@@ -1954,14 +2010,12 @@ default-package-overrides:
   - stackage-curator ==0.14.5
   - stackage-query ==0.1.1
   - stackage-types ==1.2.0
-  - state-plus ==0.1.3
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.0.4
   - stateWriter ==0.2.8
   - static-canvas ==0.2.0.3
   - statistics ==0.13.3.0
-  - stb-image-redux ==0.2.1.0
   - stemmer ==0.5.2
   - stm ==2.4.4.1
   - stm-chans ==3.0.0.4
@@ -1983,8 +2037,9 @@ default-package-overrides:
   - store ==0.4.3.1
   - store-core ==0.4.1
   - Strafunski-StrategyLib ==5.0.0.10
-  - stratosphere ==0.4.4
+  - stratosphere ==0.6.0
   - streaming ==0.1.4.5
+  - streaming-binary ==0.3.0.1
   - streaming-bytestring ==0.1.4.6
   - streaming-commons ==0.1.17
   - streaming-utils ==0.1.4.7
@@ -2001,47 +2056,44 @@ default-package-overrides:
   - stringable ==0.1.3
   - stringbuilder ==0.5.0
   - stringsearch ==0.3.6.6
-  - stripe-core ==2.2.1
-  - stripe-haskell ==2.2.1
-  - stripe-http-streams ==2.2.1
-  - stripe-tests ==2.2.1
   - strive ==3.0.3
-  - stylish-haskell ==0.7.1.0
-  - success ==0.2.6
+  - stylish-haskell ==0.8.1.0
+  - sum-type-boilerplate ==0.1.0
   - sundown ==0.6
-  - superbuffer ==0.2.0.1
+  - superbuffer ==0.3.1.1
+  - superrecord ==0.3.0.0
   - svg-builder ==0.1.0.2
   - svg-tree ==0.6.1
   - SVGFonts ==1.6.0.1
   - swagger ==0.3.0
   - swagger2 ==2.1.4.1
-  - syb ==0.6
-  - syb-with-class ==0.6.1.7
+  - syb ==0.7
   - symbol ==0.2.4
   - symengine ==0.1.2.0
+  - synthesizer-core ==0.8.1
+  - synthesizer-dimensional ==0.8.0.2
+  - synthesizer-midi ==0.6.0.4
+  - sysinfo ==0.1.1
   - system-argv0 ==0.1.1
   - system-fileio ==0.3.16.3
   - system-filepath ==0.4.13.4
   - system-posix-redirect ==1.1.0.1
-  - syz ==0.2.0.0
   - tabular ==0.2.2.7
   - tagchup ==0.4.1
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.0
   - tagged-identity ==0.1.2
-  - taggy ==0.2.0
-  - taggy-lens ==0.1.2
   - tagshare ==0.0
   - tagsoup ==0.14.1
   - tagstream-conduit ==0.5.5.3
   - tar ==0.5.0.3
   - tar-conduit ==0.1.1
   - tardis ==0.4.1.0
-  - tasty ==0.11.2.2
-  - tasty-ant-xml ==1.0.5
-  - tasty-auto ==0.1.0.2
-  - tasty-dejafu ==0.3.0.2
-  - tasty-discover ==1.1.0
+  - tasty ==0.11.2.3
+  - tasty-ant-xml ==1.1.0
+  - tasty-auto ==0.2.0.0
+  - tasty-dejafu ==0.6.0.0
+  - tasty-discover ==3.0.2
   - tasty-expected-failure ==0.11.0.4
   - tasty-fail-fast ==0.0.2
   - tasty-golden ==2.3.1.1
@@ -2051,7 +2103,7 @@ default-package-overrides:
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.8.4
-  - tasty-rerun ==1.1.6
+  - tasty-rerun ==1.1.7
   - tasty-silver ==3.1.10
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.2
@@ -2064,10 +2116,16 @@ default-package-overrides:
   - tcp-streams-openssl ==0.6.0.0
   - tdigest ==0.1
   - tdigest-Chart ==0
-  - telegram-api ==0.6.3.0
+  - teardown ==0.1.0.1
   - template ==0.2.0.10
   - temporary ==1.2.1
   - temporary-rc ==1.2.0.3
+  - tensorflow ==0.1.0.2
+  - tensorflow-core-ops ==0.1.0.0
+  - tensorflow-opgen ==0.1.0.0
+  - tensorflow-ops ==0.1.0.0
+  - tensorflow-proto ==0.1.0.0
+  - tensorflow-test ==0.1.0.0
   - termcolor ==0.2.0.0
   - terminal-progress-bar ==0.1.1.1
   - terminal-size ==0.3.2.1
@@ -2078,12 +2136,10 @@ default-package-overrides:
   - test-framework-quickcheck2 ==0.3.0.4
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
-  - test-invariant ==0.4.5.0
-  - test-simple ==0.1.9
   - testing-feat ==0.4.0.3
   - texmath ==0.9.4.1
-  - text ==1.2.2.1
-  - text-all ==0.3.1.0
+  - text ==1.2.2.2
+  - text-all ==0.4.1.1
   - text-binary ==0.2.1.1
   - text-conversions ==0.3.0
   - text-format ==0.3.1.1
@@ -2092,12 +2148,12 @@ default-package-overrides:
   - text-latin1 ==0.3
   - text-ldap ==0.1.1.8
   - text-manipulate ==0.2.0.1
-  - text-metrics ==0.2.0
-  - text-postgresql ==0.0.2.2
+  - text-metrics ==0.3.0
+  - text-postgresql ==0.0.2.3
   - text-printer ==0.5
-  - text-region ==0.1.0.1
-  - text-show ==3.4.1.1
-  - text-show-instances ==3.5
+  - text-region ==0.3.0.0
+  - text-show ==3.6
+  - text-show-instances ==3.6
   - text-zipper ==0.10
   - textlocal ==0.1.0.5
   - tf-random ==0.5
@@ -2116,14 +2172,15 @@ default-package-overrides:
   - th-utilities ==0.2.0.1
   - these ==0.7.3
   - thread-local-storage ==0.1.1
-  - threads ==0.5.1.4
-  - threepenny-gui ==0.7.0.2
-  - threepenny-gui-flexbox ==0.3.0.2
+  - threads ==0.5.1.5
+  - threepenny-editors ==0.4.1
+  - threepenny-gui ==0.8.0.1
+  - threepenny-gui-flexbox ==0.4.2
   - through-text ==0.1.0.0
+  - throwable-exceptions ==0.1.0.8
   - thumbnail-plus ==1.0.5
   - thyme ==0.3.5.5
-  - tibetan-utils ==0.1.1.2
-  - tidal ==0.8.2
+  - tidal ==0.9.4
   - time-compat ==0.1.0.3
   - time-lens ==0.4.0.1
   - time-locale-compat ==0.1.1.3
@@ -2134,24 +2191,29 @@ default-package-overrides:
   - timerep ==2.0.0.2
   - timespan ==0.3.0.0
   - timezone-olson ==0.1.8
-  - timezone-series ==0.1.6.1
+  - timezone-series ==0.1.8
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
-  - titlecase ==0.1.0.3
+  - titlecase ==1.0.1
+  - tldr ==0.2.2
   - tls ==1.3.11
   - tls-debug ==0.4.4
-  - tls-session-manager ==0.0.0.0
+  - tls-session-manager ==0.0.0.1
+  - tmp-postgres ==0.1.0.8
   - token-bucket ==0.1.0.1
+  - torrent ==10000.1.1
   - tostring ==0.2.1.1
   - tracy ==0.1.4.0
   - transformers-base ==0.4.4
   - transformers-compat ==0.5.1.4
-  - transformers-lift ==0.1.0.1
-  - transient ==0.4.4.1
-  - transient-universe ==0.3.5.1
-  - traverse-with-class ==0.2.0.4
+  - transformers-lift ==0.2.0.1
+  - transient ==0.5.8
+  - transient-universe ==0.4.6
+  - traverse-with-class ==1.0.0.0
   - tree-fun ==0.8.1.0
+  - tries ==0.0.4.2
   - trifecta ==1.6.2.1
+  - triplesec ==0.1.2.0
   - true-name ==0.1.0.2
   - tsv2csv ==0.1.0.2
   - ttrie ==0.1.2.1
@@ -2161,13 +2223,13 @@ default-package-overrides:
   - tuples-homogenous-h98 ==0.1.1.0
   - turtle ==1.3.6
   - turtle-options ==0.1.0.4
+  - twitter-conduit ==0.2.2.1
   - twitter-feed ==0.2.0.11
   - twitter-types ==0.7.2.2
   - twitter-types-lens ==0.7.2
   - type-aligned ==0.9.6
   - type-assertions ==0.1.0.0
   - type-combinators ==0.2.4.3
-  - type-eq ==0.5
   - type-fun ==0.1.1
   - type-hint ==0.1
   - type-level-integers ==0.0.1
@@ -2184,7 +2246,6 @@ default-package-overrides:
   - tzdata ==0.1.20161123.0
   - ua-parser ==0.7.4
   - uglymemo ==0.1.0.1
-  - unagi-chan ==0.4.0.0
   - unbound ==0.5.1
   - unbound-generics ==0.3.1
   - unbounded-delays ==0.1.1.0
@@ -2194,7 +2255,7 @@ default-package-overrides:
   - unfoldable-restricted ==0.0.3
   - unicode ==0.0
   - unicode-show ==0.1.0.2
-  - unicode-transforms ==0.2.1
+  - unicode-transforms ==0.3.2
   - unification-fd ==0.10.0.1
   - union ==0.1.1.1
   - union-find ==0.2
@@ -2215,16 +2276,17 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.4.3.1
   - unix-time ==0.3.7
-  - Unixutils ==1.54.1
+  - unliftio ==0.1.0.0
+  - unliftio-core ==0.1.0.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.8.0
   - unsafe ==0.0
   - uri-bytestring ==0.2.3.3
+  - uri-bytestring-aeson ==0.1.0.1
   - uri-encode ==1.5.0.5
   - uri-templater ==0.2.1.0
   - url ==2.1.3
   - urlpath ==5.0.0.1
-  - userid ==0.1.2.8
   - users ==0.5.0.0
   - users-postgresql-simple ==0.5.0.2
   - users-test ==0.5.0.1
@@ -2234,34 +2296,34 @@ default-package-overrides:
   - uu-interleaved ==0.2.0.0
   - uu-parsinglib ==2.9.1.1
   - uuid ==1.3.13
-  - uuid-orphans ==1.4.1
   - uuid-types ==1.0.3
   - vado ==0.0.8
   - validate-input ==0.4.0.0
   - validation ==0.5.4
+  - validationt ==0.2.0.0
   - varying ==0.7.0.3
   - vault ==0.3.0.7
   - vcswrapper ==0.1.5
-  - vector ==0.11.0.0
+  - vector ==0.12.0.1
   - vector-algorithms ==0.7.0.1
   - vector-binary-instances ==0.2.3.5
   - vector-buffer ==0.4.1
-  - vector-fftw ==0.1.3.8
   - vector-instances ==3.4
+  - vector-mmap ==0.0.3
   - vector-sized ==0.5.1.0
   - vector-space ==0.10.4
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
   - vectortiles ==1.2.0.5
   - verbosity ==0.2.3.0
-  - versions ==3.0.2.1
+  - versions ==3.1.1
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.2
-  - viewprof ==0.0.0.1
+  - viewprof ==0.0.0.6
   - vinyl ==0.5.3
   - vinyl-utils ==0.3.0.0
   - void ==0.7.2
-  - vty ==5.15.1
+  - vty ==5.16
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
   - wai-cli ==0.1.1
@@ -2279,29 +2341,28 @@ default-package-overrides:
   - wai-middleware-content-type ==0.5.0.1
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.4
-  - wai-middleware-prometheus ==0.1.1
-  - wai-middleware-rollbar ==0.3.0
+  - wai-middleware-rollbar ==0.4.0
   - wai-middleware-static ==0.8.1
   - wai-middleware-throttle ==0.2.1.0
   - wai-middleware-verbs ==0.3.2
   - wai-predicates ==0.9.0
   - wai-route ==0.3.1.1
-  - wai-routes ==0.9.10
+  - wai-routes ==0.10.0
   - wai-routing ==0.13.0
   - wai-session ==0.3.2
   - wai-session-postgresql ==0.2.1.0
+  - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.1
   - waitra ==0.0.4.0
   - warp ==3.2.13
   - warp-tls ==3.2.4
   - wave ==0.1.5
-  - wavefront ==0.7.1
   - wavefront-obj ==0.1.0.1
   - web-plugins ==0.2.9
   - web-routes ==0.27.12
   - web-routes-boomerang ==0.28.4.2
-  - web-routes-happstack ==0.23.10
+  - web-routes-happstack ==0.23.11
   - web-routes-hsp ==0.24.6.1
   - web-routes-th ==0.22.6.1
   - web-routes-wai ==0.24.3
@@ -2312,14 +2373,16 @@ default-package-overrides:
   - webpage ==0.0.5
   - webrtc-vad ==0.1.0.3
   - websockets ==0.10.0.0
-  - websockets-rpc ==0.0.2
-  - websockets-snap ==0.10.2.2
+  - websockets-rpc ==0.4.0
+  - websockets-simple ==0.0.2
+  - websockets-snap ==0.10.2.3
+  - weeder ==0.1.6
   - weigh ==0.0.4
-  - wikicfp-scraper ==0.1.0.8
+  - wikicfp-scraper ==0.1.0.9
   - wild-bind ==0.1.0.3
   - wild-bind-indicator ==0.1.0.1
   - wild-bind-task-x11 ==0.1.0.1
-  - wild-bind-x11 ==0.1.0.6
+  - wild-bind-x11 ==0.1.0.7
   - Win32 ==2.3.1.1
   - Win32-extras ==0.2.0.1
   - Win32-notify ==0.3.0.1
@@ -2330,7 +2393,7 @@ default-package-overrides:
   - witness ==0.4
   - wizards ==1.0.2
   - wl-pprint ==1.2
-  - wl-pprint-annotated ==0.0.1.4
+  - wl-pprint-annotated ==0.1.0.0
   - wl-pprint-console ==0.1.0.1
   - wl-pprint-extras ==3.5.0.5
   - wl-pprint-terminfo ==3.7.1.4
@@ -2338,7 +2401,6 @@ default-package-overrides:
   - word-trie ==0.3.0
   - word24 ==2.0.1
   - word8 ==0.1.2
-  - wordpass ==1.0.0.7
   - Workflow ==0.8.3
   - wrap ==0.0.0
   - wreq ==0.5.0.1
@@ -2347,25 +2409,25 @@ default-package-overrides:
   - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.4
   - writer-cps-transformers ==0.1.1.3
-  - wuss ==1.1.4
+  - wuss ==1.1.5
   - X11 ==1.8
   - X11-xft ==0.3.1
-  - x509 ==1.6.5
-  - x509-store ==1.6.2
-  - x509-system ==1.6.4
-  - x509-validation ==1.6.5
+  - x11-xim ==0.0.9.0
+  - x509 ==1.7.1
+  - x509-store ==1.6.3
+  - x509-system ==1.6.5
+  - x509-validation ==1.6.8
   - Xauth ==0.1
   - xdcc ==1.1.4
   - xdg-basedir ==0.2.2
-  - xeno ==0.1
+  - xeno ==0.2
   - xenstore ==0.1.1
   - xhtml ==3000.2.2
-  - xlsior ==0.1.0.1
-  - xlsx ==0.4.3
+  - xlsx ==0.6.0
   - xlsx-tabular ==0.2.2
   - xml ==1.3.14
   - xml-basic ==0.1.2
-  - xml-conduit ==1.4.0.4
+  - xml-conduit ==1.5.1
   - xml-conduit-parse ==0.3.1.1
   - xml-conduit-writer ==0.1.1.1
   - xml-hamlet ==0.4.1
@@ -2373,13 +2435,15 @@ default-package-overrides:
   - xml-indexed-cursor ==0.1.1.0
   - xml-lens ==0.1.6.3
   - xml-picklers ==0.3.6
+  - xml-to-json ==2.0.1
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.6
   - xmlgen ==0.6.2.1
-  - xmlhtml ==0.2.4
   - xmonad ==0.13
   - xmonad-contrib ==0.13
+  - xmonad-extras ==0.13.0
   - xss-sanitize ==0.3.5.7
+  - xturtle ==0.2.0.0
   - yackage ==0.8.1
   - yahoo-finance-api ==0.2.0.2
   - yaml ==0.8.23.3
@@ -2390,37 +2454,43 @@ default-package-overrides:
   - yesod-auth ==1.4.17.2
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
+  - yesod-auth-fb ==1.8.1
   - yesod-auth-hashdb ==1.6.1
   - yesod-bin ==1.5.2.3
-  - yesod-core ==1.4.35
+  - yesod-core ==1.4.35.1
+  - yesod-default ==1.2.0
   - yesod-eventsource ==1.4.1
-  - yesod-fay ==0.8.0
-  - yesod-form ==1.4.12
+  - yesod-fb ==0.4.0
+  - yesod-form ==1.4.13
+  - yesod-form-bootstrap4 ==0.1.0.0
   - yesod-form-richtext ==0.1.0.1
   - yesod-gitrepo ==0.2.1.0
   - yesod-gitrev ==0.1.0.0
+  - yesod-job-queue ==0.3.0.4
   - yesod-markdown ==0.11.4
   - yesod-newsfeed ==1.6
   - yesod-persistent ==1.4.2
+  - yesod-recaptcha2 ==0.1.0.0
   - yesod-sitemap ==1.4.0.1
-  - yesod-static ==1.5.3
+  - yesod-static ==1.5.3.1
   - yesod-static-angular ==0.1.8
   - yesod-table ==2.0.3
-  - yesod-test ==1.5.7
+  - yesod-test ==1.5.8
   - yesod-websockets ==0.2.6
-  - yi-core ==0.13.7
-  - yi-frontend-vty ==0.13.7
-  - yi-fuzzy-open ==0.13.7
-  - yi-ireader ==0.13.7
-  - yi-keymap-cua ==0.13.7
-  - yi-keymap-emacs ==0.13.7
-  - yi-keymap-vim ==0.13.7
-  - yi-language ==0.13.7
-  - yi-misc-modes ==0.13.7
-  - yi-mode-haskell ==0.13.7
-  - yi-mode-javascript ==0.13.7
-  - yi-rope ==0.8
-  - yi-snippet ==0.13.7
+  - yi-core ==0.14.0
+  - yi-frontend-vty ==0.14.0
+  - yi-fuzzy-open ==0.14.0
+  - yi-ireader ==0.14.0
+  - yi-keymap-cua ==0.14.0
+  - yi-keymap-emacs ==0.14.0
+  - yi-keymap-vim ==0.14.0
+  - yi-language ==0.14.0
+  - yi-misc-modes ==0.14.0
+  - yi-mode-haskell ==0.14.0
+  - yi-mode-javascript ==0.14.0
+  - yi-rope ==0.9
+  - yi-snippet ==0.14.0
+  - yjsvg ==0.2.0.1
   - yjtools ==0.9.18
   - yoga ==0.0.0.1
   - youtube ==0.2.1
@@ -2434,6 +2504,7 @@ default-package-overrides:
   - zlib ==0.6.1.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
+  - zm ==0.2.4
   - zot ==0.0.3
   - ztail ==1.2
 

From f442bbcdec56ffa8cba22c31b9f611015880182c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Jul 2017 15:49:22 +0200
Subject: [PATCH 1142/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4-2-ge4f891e from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f72c20d338d4aa0062e833e4bc63813f0117c19f.
---
 .../haskell-modules/hackage-packages.nix      | 8261 ++---------------
 1 file changed, 628 insertions(+), 7633 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 70362f3b093..f5b5e42f065 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4558,26 +4558,6 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec, tasty
-     , tasty-hunit, tasty-quickcheck, unordered-containers
-     }:
-     mkDerivation {
-       pname = "Earley";
-       version = "0.11.0.1";
-       sha256 = "1cw575wk6zzkzqpps05ww33s4j98q81zr821avh9s2xv4q4s81y2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ListLike ];
-       executableHaskellDepends = [ base unordered-containers ];
-       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq ListLike parsec
-       ];
-       description = "Parsing all context-free grammars using Earley's algorithm";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Earley_0_12_0_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      , unordered-containers
@@ -4598,7 +4578,6 @@ self: {
        ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ebnf2ps" = callPackage
@@ -6459,29 +6438,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.14";
-       sha256 = "0aw43izg8vlvjl40ms6k92w7gxg7n3l6smdvzla47fp82s4vhdr8";
-       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_8_0" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, filepath
      , HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, transformers, transformers-compat
@@ -6502,7 +6458,6 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/glob/";
        description = "Globbing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GlomeTrace" = callPackage
@@ -7206,18 +7161,6 @@ self: {
      }) {};
 
   "HDBC-session" = callPackage
-    ({ mkDerivation, base, HDBC }:
-     mkDerivation {
-       pname = "HDBC-session";
-       version = "0.1.1.0";
-       sha256 = "1fc0zi9i3cba0rn6q8ibn1kdij7glm73qkzc97qg5f0pkmn7mlsa";
-       libraryHaskellDepends = [ base HDBC ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Bracketed connection for HDBC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HDBC-session_0_1_1_1" = callPackage
     ({ mkDerivation, base, HDBC }:
      mkDerivation {
        pname = "HDBC-session";
@@ -7227,7 +7170,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Bracketed connection for HDBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HDBC-sqlite3" = callPackage
@@ -8783,44 +8725,6 @@ self: {
      }) {};
 
   "HaRe" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, Cabal
-     , cabal-helper, case-insensitive, containers, conversion
-     , conversion-case-insensitive, conversion-text, Diff, directory
-     , filepath, foldl, ghc, ghc-exactprint, ghc-mod, ghc-syb-utils
-     , gitrev, hslogger, hspec, HUnit, monad-control, mtl
-     , optparse-applicative, optparse-simple, parsec
-     , Strafunski-StrategyLib, syb, syz, turtle
-     }:
-     mkDerivation {
-       pname = "HaRe";
-       version = "0.8.4.0";
-       sha256 = "1yqm2vwai3ss5r4brfgmx90kqifwvy5m8jrldb49b88aix3p4ckk";
-       revision = "2";
-       editedCabalFile = "1hwajkfskbnh3cn7jgiqp83vpfinnfn4pfzwkl6cwqi63iwy944p";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base cabal-helper containers directory filepath ghc ghc-exactprint
-         ghc-mod ghc-syb-utils hslogger monad-control mtl
-         Strafunski-StrategyLib syb syz
-       ];
-       executableHaskellDepends = [
-         base Cabal ghc-mod gitrev mtl optparse-applicative optparse-simple
-       ];
-       testHaskellDepends = [
-         attoparsec base base-prelude case-insensitive containers conversion
-         conversion-case-insensitive conversion-text Diff directory foldl
-         ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger hspec HUnit mtl
-         parsec turtle
-       ];
-       homepage = "https://github.com/RefactoringTools/HaRe/wiki";
-       description = "the Haskell Refactorer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "HaRe_0_8_4_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, Cabal
      , cabal-helper, case-insensitive, containers, conversion
      , conversion-case-insensitive, conversion-text, Diff, directory
@@ -8857,27 +8761,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.2.0";
-       sha256 = "14bbxhipxd18h0dpmbc1m7wggg1bqzz0cjr7l27xks2k35ccllw5";
-       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_3_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, hashable, matrix
      , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
      , wl-pprint-extras
@@ -8896,7 +8779,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
@@ -10264,27 +10146,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.3";
-       sha256 = "00hf8ypildbjmrhh010z4rarggq75m10pnmg1ilbwz1flwb767fm";
-       revision = "1";
-       editedCabalFile = "11dvmn6l2sicxmiy7hg0a7msi022gpzzaiyliclkdcnifs75lhjm";
-       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_1_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
      , network-info, random, test-framework, test-framework-hunit, text
      }:
@@ -10301,7 +10162,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;
      }) {};
 
   "IPv6DB" = callPackage
@@ -10737,22 +10597,6 @@ self: {
      }) {};
 
   "JuicyPixels-extra" = callPackage
-    ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
-     mkDerivation {
-       pname = "JuicyPixels-extra";
-       version = "0.1.1";
-       sha256 = "1zdrh95b51566m2dh79vv92vivv2i4pknlimhd78mqc0fxz2ayyk";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base JuicyPixels ];
-       testHaskellDepends = [ base hspec JuicyPixels ];
-       benchmarkHaskellDepends = [ base criterion JuicyPixels ];
-       homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
-       description = "Efficiently scale, crop, flip images with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "JuicyPixels-extra_0_2_1" = callPackage
     ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
      mkDerivation {
        pname = "JuicyPixels-extra";
@@ -12674,28 +12518,6 @@ self: {
      }) {};
 
   "MusicBrainz" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
-     , HTTP, http-conduit, http-types, monad-control, resourcet, text
-     , time, time-locale-compat, transformers, vector, xml-conduit
-     , xml-types
-     }:
-     mkDerivation {
-       pname = "MusicBrainz";
-       version = "0.2.4";
-       sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj";
-       revision = "1";
-       editedCabalFile = "1bnj0wq9q6y2pxjnl1rk5ybdj16g17g7qkzrfnjrwmm7iq8xbm62";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit conduit-extra HTTP http-conduit
-         http-types monad-control resourcet text time time-locale-compat
-         transformers vector xml-conduit xml-types
-       ];
-       homepage = "http://floss.scru.org/hMusicBrainz";
-       description = "interface to MusicBrainz XML2 web service";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "MusicBrainz_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
      , HTTP, http-conduit, http-types, monad-control, resourcet, text
      , time, time-locale-compat, transformers, vector, xml-conduit
@@ -12715,7 +12537,6 @@ self: {
        homepage = "http://floss.scru.org/hMusicBrainz";
        description = "interface to MusicBrainz XML2 web service";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MusicBrainz-libdiscid" = callPackage
@@ -13708,23 +13529,6 @@ self: {
      }) {};
 
   "OpenGLRaw" = callPackage
-    ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "OpenGLRaw";
-       version = "3.2.4.0";
-       sha256 = "0bnbgmf4jxz1vr7a2yjh3nqylsaqsnv2qnnv63gmydvbx45r3yg3";
-       libraryHaskellDepends = [
-         base bytestring containers fixed half text transformers
-       ];
-       librarySystemDepends = [ mesa ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) mesa;};
-
-  "OpenGLRaw_3_2_5_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
      , text, transformers
      }:
@@ -13739,7 +13543,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) mesa;};
 
   "OpenGLRaw21" = callPackage
@@ -15215,26 +15018,6 @@ self: {
      }) {};
 
   "RSA" = callPackage
-    ({ mkDerivation, base, binary, bytestring, crypto-api
-     , crypto-pubkey-types, DRBG, pureMD5, QuickCheck, SHA, tagged
-     , test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "RSA";
-       version = "2.2.0";
-       sha256 = "1mzjlkw9i9r7r5a7mja01pq3ihvik2ncgah1jmznswaj6ga5cc19";
-       libraryHaskellDepends = [
-         base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA
-       ];
-       testHaskellDepends = [
-         base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
-         QuickCheck SHA tagged test-framework test-framework-quickcheck2
-       ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "RSA_2_3_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, crypto-api
      , crypto-pubkey-types, DRBG, QuickCheck, SHA, tagged
      , test-framework, test-framework-quickcheck2
@@ -15252,7 +15035,6 @@ self: {
        ];
        description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Raincat" = callPackage
@@ -15944,8 +15726,8 @@ self: {
     ({ mkDerivation, base, containers, ghc, ghc-paths }:
      mkDerivation {
        pname = "SSTG";
-       version = "0.1.0.7";
-       sha256 = "05hdjym88bmii19gbz2k6jfr0bxmll514ysazavdhcrgdjgf0r0f";
+       version = "0.1.0.8";
+       sha256 = "1qnjskpwf4zxzcf443qq31zm7rc6p4ch46p1mh19vm4hq2bnkcfl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ghc ghc-paths ];
@@ -16961,20 +16743,6 @@ self: {
      }) {};
 
   "Spock-lucid" = callPackage
-    ({ mkDerivation, base, blaze-builder, lucid, Spock, transformers }:
-     mkDerivation {
-       pname = "Spock-lucid";
-       version = "0.3.0.0";
-       sha256 = "0g3zf2gxcybh4kdz1vykk6drzb9jirdlfcx6cdx81wa5bl8ck4cj";
-       libraryHaskellDepends = [
-         base blaze-builder lucid Spock transformers
-       ];
-       homepage = "http://github.com/aelve/Spock-lucid";
-       description = "Lucid support for Spock";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock-lucid_0_4_0_0" = callPackage
     ({ mkDerivation, base, lucid, Spock, transformers }:
      mkDerivation {
        pname = "Spock-lucid";
@@ -16984,7 +16752,6 @@ self: {
        homepage = "http://github.com/aelve/Spock-lucid";
        description = "Lucid support for Spock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-worker" = callPackage
@@ -17166,6 +16933,8 @@ self: {
        pname = "Strafunski-StrategyLib";
        version = "5.0.0.10";
        sha256 = "1hhcx0arzyrw8ij5ispnqysbipxyznbs5g9pkmy63fzn3l2im2ih";
+       revision = "1";
+       editedCabalFile = "031p57vf33vdhwk1p4d1jzpk8fcl2js8kzdg7gyhz9g11vl2n4j9";
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
@@ -19844,26 +19613,6 @@ self: {
      }) {};
 
   "accelerate" = callPackage
-    ({ mkDerivation, array, base, containers, fclabels, ghc-prim
-     , hashable, hashtables, pretty, template-haskell
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "accelerate";
-       version = "0.15.1.0";
-       sha256 = "07bbam9za0g15vm0h0p9dypblw2f709v4qmvc52jcvmsv1drl3yv";
-       revision = "1";
-       editedCabalFile = "0dgzfcc2yjxqq5llvm19lak16ymsqghalm33y0calgp07fwkp1hj";
-       libraryHaskellDepends = [
-         array base containers fclabels ghc-prim hashable hashtables pretty
-         template-haskell unordered-containers
-       ];
-       homepage = "https://github.com/AccelerateHS/accelerate/";
-       description = "An embedded language for accelerated array processing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate_1_0_0_0" = callPackage
     ({ mkDerivation, base, base-orphans, containers, deepseq, directory
      , exceptions, fclabels, filepath, ghc-prim, hashable, hashtables
      , mtl, pretty, template-haskell, time, transformers, unique, unix
@@ -19883,7 +19632,6 @@ self: {
        homepage = "https://github.com/AccelerateHS/accelerate/";
        description = "An embedded language for accelerated array processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-arithmetic" = callPackage
@@ -20323,29 +20071,6 @@ self: {
      }) {};
 
   "acid-state" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers
-     , criterion, directory, extensible-exceptions, filepath, mtl
-     , network, random, safecopy, stm, system-fileio, system-filepath
-     , template-haskell, unix
-     }:
-     mkDerivation {
-       pname = "acid-state";
-       version = "0.14.2";
-       sha256 = "1h75xc2xrxy3hfphni4l4s0cij1qiw1kwk3n6g1f2w28rfxixp46";
-       libraryHaskellDepends = [
-         array base bytestring cereal containers directory
-         extensible-exceptions filepath mtl network safecopy stm
-         template-haskell unix
-       ];
-       benchmarkHaskellDepends = [
-         base criterion directory mtl random system-fileio system-filepath
-       ];
-       homepage = "http://acid-state.seize.it/";
-       description = "Add ACID guarantees to any serializable Haskell data structure";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "acid-state_0_14_3" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , criterion, directory, extensible-exceptions, filepath, mtl
      , network, random, safecopy, stm, system-fileio, system-filepath
@@ -20366,7 +20091,6 @@ self: {
        homepage = "https://github.com/acid-state/acid-state";
        description = "Add ACID guarantees to any serializable Haskell data structure";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acid-state-dist" = callPackage
@@ -21349,31 +21073,32 @@ self: {
 
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
-     , base16-bytestring, bytestring, containers, deepseq, dlist
-     , 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, vector
+     , base16-bytestring, bytestring, containers, deepseq, directory
+     , dlist, filepath, generic-deriving, ghc-prim, hashable
+     , hashable-time, HUnit, integer-logarithms, 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.0.2.1";
-       sha256 = "0rlhr225vb6apxw1m0jpnjpbcwb2ij30n6r41qyhd5lr1ax6z9p0";
+       version = "1.1.2.0";
+       sha256 = "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p";
        revision = "1";
-       editedCabalFile = "1wfplxb4bppx2bqxbwprl09w9h9bfwn4ak97g8nrdrm30xfqv16g";
+       editedCabalFile = "06acsik1qcn5r1z1y3n7iw5h8x0h3hdcjii0bq9nf9ncvc71h1d4";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text time
-         time-locale-compat unordered-containers vector
+         time-locale-compat unordered-containers uuid-types vector
        ];
        testHaskellDepends = [
          attoparsec base base-compat base-orphans base16-bytestring
-         bytestring containers dlist 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 vector
+         bytestring containers directory dlist filepath generic-deriving
+         ghc-prim hashable hashable-time HUnit integer-logarithms 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";
@@ -21689,8 +21414,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-flowtyped";
-       version = "0.7.2";
-       sha256 = "065iw6a6bbm36yzph1f5gg8xzkaj4kkfqcak74lsdp9a60grgv87";
+       version = "0.7.5";
+       sha256 = "1hhg3fai44i506d7iphi8xl2lzqr14rbc1f96wc3gayyv96ia8az";
        libraryHaskellDepends = [
          aeson base containers free recursion-schemes reflection scientific
          text time unordered-containers vector wl-pprint
@@ -24737,31 +24462,6 @@ self: {
      }) {};
 
   "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 = "07c87lgmm3vs2q24km7lmsg2gwa4dd06zfi4cbljd8r4n3jxzl7c";
-       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;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "amazonka-s3-streaming_0_2_0_3" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
      , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions
      , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet
@@ -24785,7 +24485,7 @@ self: {
        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;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-sdb" = callPackage
@@ -25184,34 +24884,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.1";
-       sha256 = "02rh5pamzk89smww10bym3rkra8pz74s4nkwigh1f0brg396a12h";
-       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_15_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -25237,7 +24909,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
@@ -25706,6 +25377,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ansigraph_0_3_0_3" = callPackage
+    ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "ansigraph";
+       version = "0.3.0.3";
+       sha256 = "1f03lh9zf6kbimg2fsi8hgnz3kvhqls67j5y13f4j2rb7lynxvd3";
+       libraryHaskellDepends = [ ansi-terminal base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/BlackBrane/ansigraph";
+       description = "Terminal-based graphing via ANSI and Unicode";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "antagonist" = callPackage
     ({ mkDerivation, antisplice, base, chatty, chatty-utils, ironforge
      , mtl, shakespeare, text, time, time-locale-compat, yesod
@@ -27180,26 +26865,29 @@ self: {
      }) {};
 
   "arithmoi" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, ghc-prim
-     , integer-gmp, mtl, QuickCheck, random, smallcheck, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers
-     , transformers-compat
+    ({ mkDerivation, array, base, containers, criterion, exact-pi
+     , ghc-prim, integer-gmp, integer-logarithms, mtl, QuickCheck
+     , random, smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, transformers
      }:
      mkDerivation {
        pname = "arithmoi";
-       version = "0.4.3.0";
-       sha256 = "15nisn8m1kbaqqxrvil6ih4pac3giwccjhn5fj2hm7g19cyk98ys";
+       version = "0.5.0.0";
+       sha256 = "0gja9x6y2nprlg5d2wjycjvxgc7bb4p6y8d4fg3dxxzzwgqgrrab";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
-         array base containers ghc-prim integer-gmp mtl random
+         array base containers exact-pi ghc-prim integer-gmp
+         integer-logarithms mtl random
        ];
        testHaskellDepends = [
-         base containers QuickCheck smallcheck tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck transformers transformers-compat
+         base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck transformers
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion integer-logarithms random
        ];
-       benchmarkHaskellDepends = [ base containers criterion random ];
        homepage = "https://github.com/cartazio/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
+       description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -27448,6 +27136,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "arrowp-qq_0_1_1" = callPackage
+    ({ mkDerivation, array, base, containers, haskell-src
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "arrowp-qq";
+       version = "0.1.1";
+       sha256 = "1khs7xcc234i4xk6gwjakrzmn8gymaradar9inqikb6wkrs61r53";
+       libraryHaskellDepends = [
+         array base containers haskell-src template-haskell transformers
+       ];
+       homepage = "http://www.haskell.org/arrows/";
+       description = "quasiquoter translating arrow notation into Haskell 98";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "arrows" = callPackage
     ({ mkDerivation, base, Stream }:
      mkDerivation {
@@ -28039,18 +27744,6 @@ self: {
      }) {};
 
   "async-extra" = callPackage
-    ({ mkDerivation, async, base, containers, deepseq }:
-     mkDerivation {
-       pname = "async-extra";
-       version = "0.1.0.0";
-       sha256 = "0an0glhn5kvm1jzb6mp884jmn26f0968wmn45796q44xq2dm1ks7";
-       libraryHaskellDepends = [ async base containers deepseq ];
-       homepage = "https://github.com/agrafix/async-extra#readme";
-       description = "Useful concurrent combinators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "async-extra_0_2_0_0" = callPackage
     ({ mkDerivation, async, base, deepseq, split }:
      mkDerivation {
        pname = "async-extra";
@@ -28060,7 +27753,6 @@ self: {
        homepage = "https://github.com/agrafix/async-extra#readme";
        description = "Useful concurrent combinators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-extras" = callPackage
@@ -28152,29 +27844,6 @@ self: {
      }) {};
 
   "async-refresh-tokens" = callPackage
-    ({ mkDerivation, async-refresh, base, bytestring, criterion
-     , formatting, HUnit, lens, lifted-async, monad-control
-     , monad-logger, safe-exceptions, stm, test-framework
-     , test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "async-refresh-tokens";
-       version = "0.1.0";
-       sha256 = "0ghrqdw2cfw42x7dlq7r1hfv70gvp07wkpmbhkja23llzjf1wd1y";
-       libraryHaskellDepends = [
-         async-refresh base bytestring formatting lens lifted-async
-         monad-control monad-logger safe-exceptions stm text
-       ];
-       testHaskellDepends = [
-         base criterion HUnit monad-logger stm test-framework
-         test-framework-hunit
-       ];
-       homepage = "https://github.com/mtesseract/async-refresh-tokens#readme";
-       description = "Package implementing core logic for refreshing of expiring access tokens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "async-refresh-tokens_0_3_0_0" = callPackage
     ({ mkDerivation, async-refresh, base, bytestring, criterion
      , formatting, HUnit, lifted-async, microlens, microlens-th
      , monad-control, monad-logger, safe-exceptions, stm, test-framework
@@ -28195,7 +27864,6 @@ self: {
        homepage = "https://github.com/mtesseract/async-refresh-tokens#readme";
        description = "Package implementing core logic for refreshing of expiring access tokens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-timer" = callPackage
@@ -28413,32 +28081,6 @@ self: {
      }) {};
 
   "atom-conduit" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators
-     , data-default, hlint, lens-simple, mono-traversable, parsers
-     , quickcheck-instances, resourcet, safe-exceptions, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, timerep
-     , uri-bytestring, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "atom-conduit";
-       version = "0.4.0.1";
-       sha256 = "1kswbcic7s3j0fldnzi6xz01apmicjscwalal7yzxd69vad5p5k2";
-       libraryHaskellDepends = [
-         base blaze-builder conduit conduit-combinators lens-simple
-         mono-traversable parsers safe-exceptions text time timerep
-         uri-bytestring xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         base conduit data-default hlint lens-simple mono-traversable
-         parsers quickcheck-instances resourcet safe-exceptions tasty
-         tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit
-         xml-types
-       ];
-       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "atom-conduit_0_4_0_3" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators
      , data-default, hlint, lens-simple, mono-traversable, parsers
      , quickcheck-instances, resourcet, safe-exceptions, tasty
@@ -28462,7 +28104,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-msp430" = callPackage
@@ -29188,8 +28829,10 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
-       version = "1.0.0";
-       sha256 = "1wx0mdw0dqa9brgznfvnpcaf4pka87nbkrqxbyi94fhlpcdsz6s5";
+       version = "1.1.1";
+       sha256 = "004wbgdnyxdwrx9z6l9920m63s1xs61q5ilazyg4f2mqmm9svw6j";
+       revision = "1";
+       editedCabalFile = "0a4ffbggz52wc0ki44bvqdsiqpbydsbhh0cc9vjw8lhja1y8fpif";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -29379,8 +29022,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "12";
-       editedCabalFile = "0qkaww4mvkhc56vkfqi6a7i0hkdy6zwshlqyd0cnw2p1b6cv6zy1";
+       revision = "14";
+       editedCabalFile = "1xmpf1r6lm3j577svyg43520f3sv838p711s46xh7f6ch4qgdx0i";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -29443,32 +29086,6 @@ self: {
      }) {};
 
   "avers-server" = callPackage
-    ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
-     , bytestring, bytestring-conversion, containers, cookie, cryptonite
-     , either, http-types, memory, mtl, resource-pool
-     , rethinkdb-client-driver, servant, servant-server, stm, text, time
-     , transformers, wai, wai-websockets, websockets
-     }:
-     mkDerivation {
-       pname = "avers-server";
-       version = "0.0.18.0";
-       sha256 = "1xqwj124cgb88za7pdb3ggs435c7lk2g6c6ncc6awl93bzyigsj4";
-       revision = "1";
-       editedCabalFile = "0ngmb2w7yql2gix5hq5jk057xazdq8ffax39gw20pa68npfgg1g6";
-       libraryHaskellDepends = [
-         aeson avers avers-api base base64-bytestring bytestring
-         bytestring-conversion containers cookie cryptonite either
-         http-types memory mtl resource-pool rethinkdb-client-driver servant
-         servant-server stm text time transformers wai wai-websockets
-         websockets
-       ];
-       homepage = "http://github.com/wereHamster/avers-server";
-       description = "Server implementation of the Avers API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "avers-server_0_0_19_0" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
      , bytestring, bytestring-conversion, containers, cookie, cryptonite
      , either, http-types, memory, mtl, resource-pool
@@ -30952,19 +30569,6 @@ self: {
      }) {};
 
   "base-orphans" = callPackage
-    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "base-orphans";
-       version = "0.5.4";
-       sha256 = "0qv20n4yabg7sc3rs2dd46a53c7idnd88by7n3s36dkbc21m41q4";
-       libraryHaskellDepends = [ base ghc-prim ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/haskell-compat/base-orphans#readme";
-       description = "Backwards-compatible orphan instances for base";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-orphans_0_6" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
@@ -30975,22 +30579,9 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-prelude" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "base-prelude";
-       version = "1.0.1.1";
-       sha256 = "1d9iga5nj66h295j09q0wh246ahagjcqfv9br6x51ya57fd0mkyw";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nikita-volkov/base-prelude";
-       description = "The most complete prelude formed solely from the \"base\" package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-prelude_1_2_0_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-prelude";
@@ -31000,7 +30591,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed solely from the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-unicode-symbols" = callPackage
@@ -31683,6 +31273,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bench_1_0_6" = callPackage
+    ({ mkDerivation, base, criterion, optparse-applicative, silently
+     , text, turtle
+     }:
+     mkDerivation {
+       pname = "bench";
+       version = "1.0.6";
+       sha256 = "0ss5liap1f71i7igpszdpb6himl30gibydlknx9ka44dsrh7dhq9";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base criterion optparse-applicative silently text turtle
+       ];
+       homepage = "http://github.com/Gabriel439/bench";
+       description = "Command-line benchmark tool";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "benchmark-function" = callPackage
     ({ mkDerivation, base, process, random, time }:
      mkDerivation {
@@ -31710,6 +31319,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "benchpress_0_2_2_10" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, time }:
+     mkDerivation {
+       pname = "benchpress";
+       version = "0.2.2.10";
+       sha256 = "1irrdx2l6pj96cc983jvpkfnkg43zrz1rk1qnin8c2l8kvpwbc76";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl time ];
+       executableHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/WillSewell/benchpress";
+       description = "Micro-benchmarking with detailed statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bencode" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, parsec }:
      mkDerivation {
@@ -32548,22 +32173,6 @@ self: {
      }) {};
 
   "binary-parser" = callPackage
-    ({ mkDerivation, base-prelude, bytestring, success, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "binary-parser";
-       version = "0.5.2";
-       sha256 = "0iam4j4z560rnj69wjf0pbylizygk36daaz06x2708w4dzr30bbi";
-       libraryHaskellDepends = [
-         base-prelude bytestring success text transformers
-       ];
-       homepage = "https://github.com/nikita-volkov/binary-parser";
-       description = "A highly-efficient but limited parser API specialised for bytestrings";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "binary-parser_0_5_5" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, mtl
      , quickcheck-instances, rerebase, tasty, tasty-hunit
      , tasty-quickcheck, text, transformers
@@ -32583,7 +32192,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/binary-parser";
        description = "A highly-efficient but limited parser API specialised for bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-parsers" = callPackage
@@ -33788,20 +33396,20 @@ self: {
   "biohazard" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base-prelude
      , binary, bytestring, bytestring-mmap, containers, directory
-     , exceptions, filepath, hashable, ListLike, monad-control
-     , primitive, random, scientific, stm, text, transformers
-     , transformers-base, unix, unordered-containers, vector
-     , vector-algorithms, vector-th-unbox, zlib
+     , exceptions, filepath, hashable, monad-control, primitive, random
+     , scientific, stm, text, transformers, transformers-base, unix
+     , unordered-containers, vector, vector-algorithms, vector-th-unbox
+     , zlib
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "0.6.13";
-       sha256 = "0w9skla3h9a0l9aq8fyak72nsqh7ww91p5xlsza6jf1735903s55";
+       version = "0.6.15";
+       sha256 = "19w9rk0r835fzfk5k2fxfb54wa4fbyyfrppa4ifmc7z57bxii3gq";
        libraryHaskellDepends = [
          aeson async attoparsec base base-prelude binary bytestring
          bytestring-mmap containers directory exceptions filepath hashable
-         ListLike monad-control primitive random scientific stm text
-         transformers transformers-base unix unordered-containers vector
+         monad-control primitive random scientific stm text transformers
+         transformers-base unix unordered-containers vector
          vector-algorithms vector-th-unbox zlib
        ];
        homepage = "http://github.com/udo-stenzel/biohazard";
@@ -34921,28 +34529,6 @@ self: {
      }) {};
 
   "blaze-html" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
-     , containers, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-html";
-       version = "0.8.1.3";
-       sha256 = "0dyn6cj5av4apmc3wav6asfap53gxy4hzdb7rph83yakscbyf5lc";
-       libraryHaskellDepends = [
-         base blaze-builder blaze-markup bytestring text
-       ];
-       testHaskellDepends = [
-         base blaze-builder blaze-markup bytestring containers HUnit
-         QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       homepage = "http://jaspervdj.be/blaze";
-       description = "A blazingly fast HTML combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-html_0_9_0_1" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
      , containers, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text
@@ -34962,7 +34548,6 @@ self: {
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast HTML combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-html-contrib" = callPackage
@@ -35035,25 +34620,6 @@ self: {
      }) {};
 
   "blaze-markup" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-markup";
-       version = "0.7.1.1";
-       sha256 = "00s3qlkbq9gxgy6l5skbhnl5h81mjgzqcrw3yn3wqnyd9scab3b3";
-       libraryHaskellDepends = [ base blaze-builder bytestring text ];
-       testHaskellDepends = [
-         base blaze-builder bytestring containers HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-       ];
-       homepage = "http://jaspervdj.be/blaze";
-       description = "A blazingly fast markup combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-markup_0_8_0_0" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text
@@ -35070,7 +34636,6 @@ self: {
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast markup combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-shields" = callPackage
@@ -35337,35 +34902,6 @@ self: {
      }) {};
 
   "bloodhound" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
-     , data-default-class, directory, doctest, errors, exceptions
-     , filepath, generics-sop, hashable, hspec, http-client, http-types
-     , mtl, mtl-compat, network-uri, QuickCheck, quickcheck-properties
-     , scientific, semigroups, temporary, text, time, transformers, unix
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "bloodhound";
-       version = "0.12.1.0";
-       sha256 = "0v746ai757kqja600bixsn74n5kc5x95a4jcnk8w3ky93hyd4gns";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring containers data-default-class
-         exceptions hashable http-client http-types mtl mtl-compat
-         network-uri scientific semigroups text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory doctest errors
-         exceptions filepath generics-sop hspec http-client http-types mtl
-         network-uri QuickCheck quickcheck-properties semigroups temporary
-         text time unix unordered-containers vector
-       ];
-       homepage = "https://github.com/bitemyapp/bloodhound";
-       description = "ElasticSearch client library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bloodhound_0_14_0_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , data-default-class, errors, exceptions, generics-sop, hashable
      , hspec, http-client, http-types, mtl, mtl-compat, network-uri
@@ -35392,7 +34928,6 @@ self: {
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloodhound-amazonka-auth" = callPackage
@@ -36480,20 +36015,20 @@ self: {
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, containers, contravariant, deepseq, dlist
-     , microlens, microlens-mtl, microlens-th, stm, template-haskell
-     , text, text-zipper, transformers, vector, vty
+    ({ mkDerivation, base, containers, contravariant, data-clist
+     , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
+     , template-haskell, text, text-zipper, transformers, vector, vty
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.17.2";
-       sha256 = "0ahwmrchy3wk6fvi1rfawzfyn7p4fsw4bpi16rf093f3nhilw5dd";
+       version = "0.18";
+       sha256 = "1qk3ds8h1krqhl8gk3c6akblybq2zvs9686ispj14im88mzjma8r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers contravariant deepseq dlist microlens microlens-mtl
-         microlens-th stm template-haskell text text-zipper transformers
-         vector vty
+         base containers contravariant data-clist deepseq dlist microlens
+         microlens-mtl microlens-th stm template-haskell text text-zipper
+         transformers vector vty
        ];
        executableHaskellDepends = [
          base microlens microlens-th text text-zipper vector vty
@@ -37943,31 +37478,6 @@ self: {
      }) {};
 
   "c2hs" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, directory
-     , dlist, filepath, HUnit, language-c, pretty, process, shelly
-     , test-framework, test-framework-hunit, text, transformers
-     }:
-     mkDerivation {
-       pname = "c2hs";
-       version = "0.28.1";
-       sha256 = "1fsj0wx8nv19yavky6s47djyh9nxcj9bz968x5w10fpl5ks4xc4m";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         array base bytestring containers directory dlist filepath
-         language-c pretty process
-       ];
-       testHaskellDepends = [
-         base filepath HUnit shelly test-framework test-framework-hunit text
-         transformers
-       ];
-       homepage = "https://github.com/haskell/c2hs";
-       description = "C->Haskell FFI tool that gives some cross-language type safety";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "c2hs_0_28_2" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , dlist, filepath, HUnit, language-c, pretty, process, shelly
      , test-framework, test-framework-hunit, text, transformers
@@ -37990,7 +37500,6 @@ self: {
        homepage = "https://github.com/haskell/c2hs";
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "c2hs-extra" = callPackage
@@ -39167,36 +38676,6 @@ self: {
      }) {};
 
   "cacophony" = callPackage
-    ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
-     , criterion, cryptonite, deepseq, directory, exceptions, free
-     , hlint, lens, memory, monad-coroutine, mtl, safe-exceptions, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "cacophony";
-       version = "0.9.2";
-       sha256 = "05h30ixcw6m2ghy5m3cf1z4j8ips4h3ph6kgi78c3dp6491k6rpv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring cryptonite exceptions free lens memory
-         monad-coroutine mtl safe-exceptions transformers
-       ];
-       testHaskellDepends = [
-         aeson async base base16-bytestring bytestring directory free hlint
-         lens memory mtl text
-       ];
-       benchmarkHaskellDepends = [
-         async base base16-bytestring bytestring criterion deepseq lens
-         memory
-       ];
-       homepage = "https://github.com/centromere/cacophony";
-       description = "A library implementing the Noise protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cacophony_0_10_0" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
      , bytestring, criterion, cryptonite, deepseq, directory, exceptions
      , free, hlint, lens, memory, monad-coroutine, mtl, safe-exceptions
@@ -39572,37 +39051,6 @@ self: {
      }) {};
 
   "camfort" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
-     , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text
-     , transformers, uniplate, vector
-     }:
-     mkDerivation {
-       pname = "camfort";
-       version = "0.901";
-       sha256 = "0b4ryjyj4m65z96lnldasawhfiyd65nnxr7vp44y4jgn4z2rdbra";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bytestring containers directory fgl filepath fortran-src
-         GenericPretty ghc-prim hmatrix matrix mtl syb syz text transformers
-         uniplate vector
-       ];
-       libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         array base bytestring containers directory fgl filepath fortran-src
-         GenericPretty ghc-prim hmatrix matrix mtl QuickCheck syb syz text
-         transformers uniplate vector
-       ];
-       testHaskellDepends = [
-         array base bytestring containers directory filepath fortran-src
-         hmatrix hspec mtl QuickCheck text uniplate
-       ];
-       description = "CamFort - Cambridge Fortran infrastructure";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "camfort_0_904" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
      , happy, hmatrix, hspec, lattices, matrix, mtl
@@ -39630,7 +39078,6 @@ self: {
        homepage = "https://camfort.github.io";
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "camh" = callPackage
@@ -39971,25 +39418,6 @@ self: {
      }) {};
 
   "carray" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, ix-shapable
-     , QuickCheck, syb
-     }:
-     mkDerivation {
-       pname = "carray";
-       version = "0.1.6.7";
-       sha256 = "0b5zabyfzi60llvimk2hfw93r38qfl3z5kjhp71rdgqj0alaxmx9";
-       revision = "1";
-       editedCabalFile = "0fbpqacz1n60bmvwnhhlz97b715060yr5xh3wzkpqnl4qq44vmgv";
-       libraryHaskellDepends = [
-         array base binary bytestring ix-shapable QuickCheck syb
-       ];
-       testHaskellDepends = [ array base ix-shapable QuickCheck ];
-       benchmarkHaskellDepends = [ array base ];
-       description = "A C-compatible array library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "carray_0_1_6_8" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, ix-shapable
      , QuickCheck, syb
      }:
@@ -40004,7 +39432,6 @@ self: {
        benchmarkHaskellDepends = [ array base ];
        description = "A C-compatible array library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "carte" = callPackage
@@ -40635,10 +40062,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava-megaparsec";
-       version = "0.1.0";
-       sha256 = "00h7b5y8414nc4861mm3k4b7kjhwk2z3hl8l3viykidfcsbj4xwd";
-       revision = "4";
-       editedCabalFile = "17hi4p5bwpfpvh3va80xwp0icpspvg58g05w8ibh3mihdxr6sqff";
+       version = "1.0.0";
+       sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28";
        libraryHaskellDepends = [
          base bytestring cassava containers megaparsec unordered-containers
          vector
@@ -41709,32 +41134,6 @@ self: {
      }) {};
 
   "chart-unit" = callPackage
-    ({ mkDerivation, base, colour, containers, data-default, diagrams
-     , diagrams-core, diagrams-lib, diagrams-rasterific, diagrams-svg
-     , foldl, lens, primitive, protolude, random-fu, text
-     }:
-     mkDerivation {
-       pname = "chart-unit";
-       version = "0.1.0.0";
-       sha256 = "13jy5l4dqq4nbf6hhnxfhvk9sp3cv9vfkqarlrawrfj6p24mwgb2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base colour containers data-default diagrams diagrams-core
-         diagrams-lib diagrams-rasterific diagrams-svg foldl lens primitive
-         protolude text
-       ];
-       executableHaskellDepends = [
-         base containers diagrams diagrams-core diagrams-lib
-         diagrams-rasterific diagrams-svg foldl lens primitive protolude
-         random-fu text
-       ];
-       homepage = "https://github.com/tonyday567/chart-unit";
-       description = "A set of native haskell charts";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "chart-unit_0_4_1" = callPackage
     ({ mkDerivation, ad, base, colour, diagrams-lib
      , diagrams-rasterific, diagrams-svg, foldl, formatting, JuicyPixels
      , lens, linear, mwc-probability, mwc-random, numhask, numhask-range
@@ -41760,7 +41159,6 @@ self: {
        homepage = "https://github.com/tonyday567/chart-unit";
        description = "Native haskell charts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chaselev-deque" = callPackage
@@ -43367,41 +42765,6 @@ self: {
      }) {};
 
   "clckwrks" = callPackage
-    ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
-     , blaze-html, bytestring, cereal, containers, directory, filepath
-     , happstack-authenticate, happstack-hsp, happstack-jmacro
-     , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs
-     , ixset, jmacro, lens, mtl, network, network-uri, old-locale
-     , openssl, process, random, reform, reform-happstack, reform-hsp
-     , safecopy, stm, text, time, time-locale-compat
-     , unordered-containers, userid, utf8-string, uuid-orphans
-     , uuid-types, vector, web-plugins, web-routes, web-routes-happstack
-     , web-routes-hsp, web-routes-th, xss-sanitize
-     }:
-     mkDerivation {
-       pname = "clckwrks";
-       version = "0.24.0.3";
-       sha256 = "1c0y9aw48qq7zyg8958lk5kzmfaa8ndgw88ps92sx5aj4z0ggsmf";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         acid-state aeson aeson-qq attoparsec base blaze-html bytestring
-         cereal containers directory filepath happstack-authenticate
-         happstack-hsp happstack-jmacro happstack-server
-         happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl
-         network network-uri old-locale process random reform
-         reform-happstack reform-hsp safecopy stm text time
-         time-locale-compat unordered-containers userid utf8-string
-         uuid-orphans uuid-types vector web-plugins web-routes
-         web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
-       ];
-       librarySystemDepends = [ openssl ];
-       homepage = "http://www.clckwrks.com/";
-       description = "A secure, reliable content management system (CMS) and blogging platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "clckwrks_0_24_0_4" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
      , blaze-html, bytestring, cereal, containers, directory, filepath
      , happstack-authenticate, happstack-hsp, happstack-jmacro
@@ -43556,31 +42919,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.3";
-       sha256 = "1kslj1yvw6kn68grcr7drhrybb1b5d1id5plcaa4570yz8vp7xr6";
-       enableSeparateDataOutput = true;
-       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_4" = callPackage
     ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
      , clckwrks, containers, directory, filepath, gd, happstack-server
      , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
@@ -43606,32 +42944,6 @@ self: {
      }) {};
 
   "clckwrks-plugin-page" = callPackage
-    ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
-     , containers, directory, filepath, happstack-hsp, happstack-server
-     , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
-     , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell
-     , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins
-     , web-routes, web-routes-happstack, web-routes-th
-     }:
-     mkDerivation {
-       pname = "clckwrks-plugin-page";
-       version = "0.4.3.9";
-       sha256 = "1r239fmplhg787vimppax5nfs6asd8ssgakr8yvpqqlb3zqrac2f";
-       libraryHaskellDepends = [
-         acid-state aeson attoparsec base clckwrks containers directory
-         filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
-         old-locale random reform reform-happstack reform-hsp safecopy
-         tagsoup template-haskell text time time-locale-compat uuid
-         uuid-orphans web-plugins web-routes web-routes-happstack
-         web-routes-th
-       ];
-       homepage = "http://www.clckwrks.com/";
-       description = "support for CMS/Blogging in clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clckwrks-plugin-page_0_4_3_10" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
@@ -44282,6 +43594,8 @@ self: {
        pname = "clr-inline";
        version = "0.1.0.0";
        sha256 = "0f9ksnc072li1mpnj024pric8hr526rdnag3x1p30x3xffp92i5l";
+       revision = "1";
+       editedCabalFile = "104d1k1midcmxpzr9r8ng55d04b2zsrl9xqf1b58z4yd5zlfjsfk";
        libraryHaskellDepends = [
          base bytestring Cabal clr-host clr-marshal containers directory
          extra filepath here lens process template-haskell temporary text
@@ -45962,6 +45276,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "compactmap_0_1_4_2_1" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, vector }:
+     mkDerivation {
+       pname = "compactmap";
+       version = "0.1.4.2.1";
+       sha256 = "0x7ps0pnjnyfr2pyjk839z7dwidizkcqwi29zxy2pgvq5856w5i2";
+       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 {
@@ -46734,25 +46061,6 @@ self: {
      }) {};
 
   "concurrency" = callPackage
-    ({ mkDerivation, array, atomic-primops, base, exceptions
-     , monad-control, mtl, stm, transformers
-     }:
-     mkDerivation {
-       pname = "concurrency";
-       version = "1.0.0.0";
-       sha256 = "17giki6hz7ilyddlk8xs37izqb5nbxx0j54j7744wihq1irrw7sl";
-       revision = "1";
-       editedCabalFile = "140wmmhg9gxlw15h92jnqiq19wpdkj7dii16613bllc40kmzmq1x";
-       libraryHaskellDepends = [
-         array atomic-primops base exceptions monad-control mtl stm
-         transformers
-       ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Typeclasses, functions, and data types for concurrency and STM";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "concurrency_1_1_2_1" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
@@ -46767,7 +46075,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Typeclasses, functions, and data types for concurrency and STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -46850,8 +46157,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-output";
-       version = "1.7.9";
-       sha256 = "1m8h9qp0k3dacawf1r8hsk3dnrswvw03cp0zfqwbp5a7sa2rcg1l";
+       version = "1.9.2";
+       sha256 = "1wyrna3j4zg0qiyx8w5kfk6j3k33acrv2677g11f3njwvcx45hiv";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions process stm
          terminal-size text transformers unix
@@ -49971,12 +49278,12 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.17";
-       sha256 = "0nlbx1pp9hzy51v9q35gqnwpwkh6lmwzxp42mql6rddbx0svp1m6";
+       version = "5.9.18";
+       sha256 = "0w0vrgqiwpy3s3saqjwqy15vky3y1vvhb3ncq1sy52y4csszzmh5";
        libraryHaskellDepends = [
-         array base bytestring cereal cond directory exceptions filepath
-         gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
-         random split time transformers unix zlib
+         array base binary bytestring cereal cond directory exceptions
+         filepath gray-extended hdaemonize hsyslog MonadRandom mtl
+         old-locale process random split time transformers unix zlib
        ];
        testHaskellDepends = [
          array base binary cereal directory filepath hsyslog HUnit
@@ -51015,43 +50322,6 @@ self: {
      }) {};
 
   "cryptol" = callPackage
-    ({ mkDerivation, alex, ansi-terminal, array, async, base
-     , base-compat, bytestring, containers, criterion, deepseq
-     , directory, filepath, gitrev, GraphSCC, happy, haskeline, heredoc
-     , monad-control, monadLib, old-time, presburger, pretty, process
-     , QuickCheck, random, sbv, simple-smt, smtLib, syb
-     , template-haskell, text, tf-random, transformers
-     , transformers-base, utf8-string
-     }:
-     mkDerivation {
-       pname = "cryptol";
-       version = "2.4.0";
-       sha256 = "0k814z5y7aypbpvggsiy86l5fcgcf0rfc7575jsjb7226kvp2i6k";
-       revision = "1";
-       editedCabalFile = "1waln79xzki1l2r1xziy2dd007q8yfsbihhp9qsxxpcpl6qmzvib";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array async base base-compat bytestring containers deepseq
-         directory filepath gitrev GraphSCC heredoc monad-control monadLib
-         old-time presburger pretty process QuickCheck random sbv simple-smt
-         smtLib syb template-haskell text tf-random transformers
-         transformers-base utf8-string
-       ];
-       libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         ansi-terminal base base-compat containers deepseq directory
-         filepath haskeline monad-control monadLib process random sbv
-         tf-random transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion deepseq text ];
-       homepage = "http://www.cryptol.net/";
-       description = "Cryptol: The Language of Cryptography";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cryptol_2_5_0" = callPackage
     ({ mkDerivation, alex, ansi-terminal, array, async, base
      , base-compat, bytestring, containers, criterion, deepseq
      , directory, filepath, gitrev, GraphSCC, happy, haskeline, heredoc
@@ -51086,24 +50356,25 @@ self: {
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
-     , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
-     , tasty-quickcheck
+    ({ mkDerivation, base, bytestring, criterion, deepseq, foundation
+     , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
+     , tasty-kat, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.21";
-       sha256 = "1vk209rylnn3zmvf9p8sflpyk31bc4cx71hq3cb69yn3w6p6d6k3";
+       version = "0.23";
+       sha256 = "1680dxgmnjgj083jhsw3rlljwaw0zqi5099m59x6kwqkxhn1qjpf";
        libraryHaskellDepends = [
-         base bytestring deepseq ghc-prim integer-gmp memory
+         base bytestring deepseq foundation ghc-prim integer-gmp memory
        ];
        testHaskellDepends = [
-         base byteable bytestring memory tasty tasty-hunit tasty-kat
-         tasty-quickcheck
+         base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion memory random
        ];
        homepage = "https://github.com/haskell-crypto/cryptonite";
        description = "Cryptography Primitives sink";
@@ -51157,25 +50428,6 @@ self: {
      }) {};
 
   "cryptonite-openssl" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, memory, openssl
-     , tasty, tasty-hunit, tasty-kat, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cryptonite-openssl";
-       version = "0.5";
-       sha256 = "0p72kkf2cxb90mndqjlvmgjz2brr9iwkm1b20lcnqsfk1c1w42x1";
-       libraryHaskellDepends = [ base bytestring cryptonite memory ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [
-         base bytestring cryptonite tasty tasty-hunit tasty-kat
-         tasty-quickcheck
-       ];
-       homepage = "https://github.com/haskell-crypto/cryptonite-openssl";
-       description = "Crypto stuff using OpenSSL cryptographic library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) openssl;};
-
-  "cryptonite-openssl_0_6" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, memory, openssl
      , tasty, tasty-hunit, tasty-kat, tasty-quickcheck
      }:
@@ -51192,7 +50444,6 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite-openssl";
        description = "Crypto stuff using OpenSSL cryptographic library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "cryptsy-api" = callPackage
@@ -51646,25 +50897,6 @@ self: {
      }) {};
 
   "cubicbezier" = callPackage
-    ({ mkDerivation, base, containers, integration, matrices, microlens
-     , microlens-mtl, microlens-th, mtl, parsec, tasty, tasty-hunit
-     , vector
-     }:
-     mkDerivation {
-       pname = "cubicbezier";
-       version = "0.5.0.0";
-       sha256 = "0275g74bmmv0z89vx84v5r555ixlq6bsz1l889da905w0wkpkhln";
-       libraryHaskellDepends = [
-         base containers integration matrices microlens microlens-mtl
-         microlens-th mtl vector
-       ];
-       testHaskellDepends = [ base parsec tasty tasty-hunit ];
-       description = "Efficient manipulating of 2D cubic bezier curves";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cubicbezier_0_6_0_3" = callPackage
     ({ mkDerivation, base, containers, fast-math, integration, matrices
      , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty
      , tasty-hunit, vector, vector-space
@@ -51764,29 +50996,6 @@ self: {
      }) {cudd = null;};
 
   "cue-sheet" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default-class
-     , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck
-     , text
-     }:
-     mkDerivation {
-       pname = "cue-sheet";
-       version = "0.1.0";
-       sha256 = "1w85vl2nkw3qy7sjpl3hafvsz79vbasgkr6w0s89p1dk7sdkckfb";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers data-default-class exceptions megaparsec
-         mtl QuickCheck text
-       ];
-       testHaskellDepends = [
-         base bytestring exceptions hspec hspec-megaparsec QuickCheck text
-       ];
-       homepage = "https://github.com/mrkkrp/cue-sheet";
-       description = "Support for construction, rendering, and parsing of CUE sheets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cue-sheet_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck
      , text
@@ -54507,24 +53716,6 @@ self: {
      }) {};
 
   "datasets" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava, directory
-     , file-embed, filepath, hashable, HTTP, stringsearch, text, time
-     , vector
-     }:
-     mkDerivation {
-       pname = "datasets";
-       version = "0.2.1";
-       sha256 = "0xqjxgpdmbdmi28d5wr3sxz9n3km3i0s0i8668d9p2rmjf89wgdg";
-       libraryHaskellDepends = [
-         aeson base bytestring cassava directory file-embed filepath
-         hashable HTTP stringsearch text time vector
-       ];
-       homepage = "https://github.com/glutamate/datasets";
-       description = "Classical data sets for statistics and machine learning";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "datasets_0_2_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cassava
      , directory, file-embed, filepath, hashable, microlens
      , stringsearch, text, time, vector, wreq
@@ -54540,7 +53731,6 @@ self: {
        homepage = "https://github.com/filopodia/open/datasets";
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dataurl" = callPackage
@@ -55913,24 +55103,6 @@ self: {
      }) {};
 
   "dejafu" = callPackage
-    ({ mkDerivation, base, concurrency, containers, deepseq, dpor
-     , exceptions, monad-loops, mtl, ref-fd, semigroups, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "dejafu";
-       version = "0.4.0.0";
-       sha256 = "1m40vxsscrq6bwy80n9c6gxw5lifnisva6qac35p7rfcj32r4v47";
-       libraryHaskellDepends = [
-         base concurrency containers deepseq dpor exceptions monad-loops mtl
-         ref-fd semigroups transformers transformers-base
-       ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Systematic testing for Haskell concurrency";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dejafu_0_7_0_2" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , leancheck, mtl, random, ref-fd, semigroups, transformers
      , transformers-base
@@ -55946,7 +55118,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Systematic testing for Haskell concurrency";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deka" = callPackage
@@ -57004,35 +56175,6 @@ self: {
      }) {};
 
   "diagrams-contrib" = callPackage
-    ({ mkDerivation, base, circle-packing, colour, containers
-     , cubicbezier, data-default, data-default-class, diagrams-core
-     , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
-     , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat
-     , parsec, QuickCheck, random, semigroups, split, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "diagrams-contrib";
-       version = "1.4.0.1";
-       sha256 = "033mapl075nlp1pfjg8p3sskv5bqclx5phsn3kpn11iwn6dbx50i";
-       revision = "4";
-       editedCabalFile = "147khgcda2kxv9qd2l0866af43fxikb4nclv9c25gys888r1mc5k";
-       libraryHaskellDepends = [
-         base circle-packing colour containers cubicbezier data-default
-         data-default-class diagrams-core diagrams-lib diagrams-solve
-         force-layout hashable lens linear mfsolve MonadRandom monoid-extras
-         mtl mtl-compat parsec random semigroups split text
-       ];
-       testHaskellDepends = [
-         base containers diagrams-lib HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Collection of user contributions to diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-contrib_1_4_1" = callPackage
     ({ mkDerivation, base, circle-packing, colour, containers
      , cubicbezier, data-default, data-default-class, diagrams-core
      , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
@@ -57057,7 +56199,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-core" = callPackage
@@ -57546,24 +56687,6 @@ self: {
      }) {};
 
   "dictionaries" = callPackage
-    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
-     , data-default, directory, exceptions, filepath, text, time
-     , transformers, zlib
-     }:
-     mkDerivation {
-       pname = "dictionaries";
-       version = "0.1.0.1";
-       sha256 = "0ddyffg41vq23d3liaqgaxjkirgirj2zg11p3xkj5y8j09q2lwc9";
-       libraryHaskellDepends = [
-         attoparsec base binary bytestring containers data-default directory
-         exceptions filepath text time transformers zlib
-       ];
-       description = "Tools to handle StarDict dictionaries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "dictionaries_0_2_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
      , criterion, data-default, deepseq, directory, exceptions, filepath
      , hspec, QuickCheck, random, random-shuffle, tagged, text, time
@@ -59541,19 +58664,6 @@ self: {
      }) {};
 
   "dlist" = callPackage
-    ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "dlist";
-       version = "0.8.0.2";
-       sha256 = "1ca1hvl5kd4api4gjyhwwavdx8snq6gf1jr6ab0zmjx7p77pwfbp";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [ base Cabal QuickCheck ];
-       homepage = "https://github.com/spl/dlist";
-       description = "Difference lists";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dlist_0_8_0_3" = callPackage
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck
      , quickcheck-instances
      }:
@@ -59568,7 +58678,6 @@ self: {
        homepage = "https://github.com/spl/dlist";
        description = "Difference lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dlist-instances" = callPackage
@@ -59991,8 +59100,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctest";
-       version = "0.11.3";
-       sha256 = "0j3qbcvsc389g2y5k5xyln3cik7wfy8ii9c3jp665fywp28r1iys";
+       version = "0.11.4";
+       sha256 = "09a170wr13p2c0w085d7qbf2blrvj1qmg92j61xqi17rwdwkvyjs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63603,24 +62712,6 @@ self: {
      }) {};
 
   "email-validate" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "email-validate";
-       version = "2.2.1.1";
-       sha256 = "18q1n0x79mii4d3hdm671ziswh1283mwl1xj47vcvizz4mi6vhh7";
-       libraryHaskellDepends = [ attoparsec base bytestring ];
-       testHaskellDepends = [
-         base bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/Porges/email-validate-hs";
-       description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "email-validate_2_3" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
      , QuickCheck, template-haskell
      }:
@@ -63635,7 +62726,6 @@ self: {
        homepage = "https://github.com/Porges/email-validate-hs";
        description = "Email address validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate-json" = callPackage
@@ -63915,26 +63005,6 @@ self: {
      }) {};
 
   "engine-io" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
-     , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay
-     , text, transformers, unordered-containers, vector, websockets
-     }:
-     mkDerivation {
-       pname = "engine-io";
-       version = "1.2.16";
-       sha256 = "1h359zlxqz7px72lnl83pg6pqr0dpk8fqw4vw4hhpfvvqd35lw6y";
-       libraryHaskellDepends = [
-         aeson async attoparsec base base64-bytestring bytestring either
-         free monad-loops mwc-random stm stm-delay text transformers
-         unordered-containers vector websockets
-       ];
-       homepage = "http://github.com/ocharles/engine.io";
-       description = "A Haskell implementation of Engine.IO";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "engine-io_1_2_17" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
      , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay
      , text, transformers, unordered-containers, vector, websockets
@@ -64792,21 +63862,6 @@ self: {
      }) {};
 
   "errors" = callPackage
-    ({ mkDerivation, base, safe, transformers, transformers-compat
-     , unexceptionalio
-     }:
-     mkDerivation {
-       pname = "errors";
-       version = "2.1.3";
-       sha256 = "1wadhhl3hx7f1k7lda50ymifs6472dzy0ygb6kvxy5ms5yfis6i0";
-       libraryHaskellDepends = [
-         base safe transformers transformers-compat unexceptionalio
-       ];
-       description = "Simplified error-handling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "errors_2_2_1" = callPackage
     ({ mkDerivation, base, exceptions, safe, text, transformers
      , transformers-compat, unexceptionalio
      }:
@@ -64820,7 +63875,6 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersaconcat" = callPackage
@@ -64848,31 +63902,6 @@ self: {
      }) {};
 
   "ersatz" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, data-default
-     , directory, doctest, filepath, lens, mtl, parsec, process
-     , temporary, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ersatz";
-       version = "0.3.1";
-       sha256 = "1h58g9lfhmww433z24vmi6wkaii5ik0hrmjprvypgw4bgibls0g9";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base bytestring containers data-default lens mtl process
-         temporary transformers unordered-containers
-       ];
-       executableHaskellDepends = [
-         array base containers lens mtl parsec
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/ersatz";
-       description = "A monad for expressing SAT or QSAT problems using observable sharing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ersatz_0_4" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
      , cabal-doctest, containers, data-default, directory, doctest
      , filepath, lens, mtl, parsec, process, temporary, transformers
@@ -64897,7 +63926,6 @@ self: {
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersatz-toysat" = callPackage
@@ -65077,29 +64105,6 @@ self: {
      }) {};
 
   "etc" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun
-     , text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "etc";
-       version = "0.0.0.2";
-       sha256 = "1cbxanxm7qpbsj3q5f6q4sn2krvfi3bm5yxi2qcxrqpjrhq31j8i";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory exceptions hashable
-         protolude text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers protolude tasty tasty-hunit
-         tasty-rerun text unordered-containers vector
-       ];
-       homepage = "https://github.com/roman/Haskell-etc";
-       description = "Declarative configuration spec for Haskell projects";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "etc_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun
      , text, unordered-containers, vector
@@ -65120,7 +64125,6 @@ self: {
        homepage = "https://github.com/roman/Haskell-etc";
        description = "Declarative configuration spec for Haskell projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "etcd" = callPackage
@@ -65159,27 +64163,6 @@ self: {
      }) {};
 
   "ether" = callPackage
-    ({ mkDerivation, base, exceptions, mmorph, monad-control, mtl
-     , QuickCheck, tasty, tasty-quickcheck, template-haskell
-     , transformers, transformers-base, transformers-lift
-     }:
-     mkDerivation {
-       pname = "ether";
-       version = "0.4.2.0";
-       sha256 = "0pkr0sh6qd5in806gm8k2cgr8j4aaq4p4zk52b8g82kqjzwb20rf";
-       libraryHaskellDepends = [
-         base exceptions mmorph monad-control mtl template-haskell
-         transformers transformers-base transformers-lift
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck tasty tasty-quickcheck transformers
-       ];
-       homepage = "https://int-index.github.io/ether/";
-       description = "Monad transformers and classes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ether_0_5_1_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim
      , lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged
      , tasty, tasty-quickcheck, template-haskell, transformers
@@ -65204,7 +64187,6 @@ self: {
        homepage = "https://int-index.github.io/ether/";
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-analyzer" = callPackage
@@ -65847,32 +64829,6 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, array, base, cereal, classy-prelude
-     , connection, containers, dns, dotnet-timespan, http-client, mtl
-     , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time
-     , unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "0.14.0.2";
-       sha256 = "1wvnwxn358vlcvxsiph1cm3iwsmggi348ljv8kknwv4vk43zm0b6";
-       libraryHaskellDepends = [
-         aeson array base cereal classy-prelude connection containers dns
-         dotnet-timespan http-client mtl protobuf random semigroups stm time
-         unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson base classy-prelude connection dotnet-timespan stm tasty
-         tasty-hunit text time uuid
-       ];
-       homepage = "http://github.com/YoEight/eventstore";
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_0_15_0_1" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
      , ekg-core, exceptions, fast-logger, hashable, http-client
@@ -66255,22 +65211,6 @@ self: {
      }) {};
 
   "exhaustive" = callPackage
-    ({ mkDerivation, base, generics-sop, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "exhaustive";
-       version = "1.1.4";
-       sha256 = "02w75q9k2w5ggribz4ifbh23smznmdp1698d2mip0c2f8p4klskl";
-       libraryHaskellDepends = [
-         base generics-sop template-haskell transformers
-       ];
-       homepage = "http://github.com/ocharles/exhaustive";
-       description = "Compile time checks that a computation considers producing data through all possible constructors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "exhaustive_1_1_5" = callPackage
     ({ mkDerivation, base, generics-sop, template-haskell, transformers
      }:
      mkDerivation {
@@ -66771,23 +65711,6 @@ self: {
      }) {};
 
   "extensible" = callPackage
-    ({ mkDerivation, base, constraints, monad-skeleton, profunctors
-     , tagged, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "extensible";
-       version = "0.3.7";
-       sha256 = "13p369xfr09y7sdpvaci065j1mcz8c9ks0a4am2ppzk1jwr25bh5";
-       libraryHaskellDepends = [
-         base constraints monad-skeleton profunctors tagged template-haskell
-         transformers
-       ];
-       homepage = "https://github.com/fumieval/extensible";
-       description = "Extensible, efficient, optics-friendly data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extensible_0_4_2" = callPackage
     ({ mkDerivation, base, comonad, constraints, criterion, deepseq
      , effin, extensible-effects, freer, ghc-prim, lens, monad-skeleton
      , mtl, primitive, profunctors, semigroups, tagged, template-haskell
@@ -66809,7 +65732,6 @@ self: {
        homepage = "https://github.com/fumieval/extensible";
        description = "Extensible, efficient, optics-friendly data types and effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-data" = callPackage
@@ -70595,23 +69517,6 @@ self: {
      }) {};
 
   "fold-debounce" = callPackage
-    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
-     , time
-     }:
-     mkDerivation {
-       pname = "fold-debounce";
-       version = "0.2.0.5";
-       sha256 = "0karz81fj5gzjspdznlsb856qmji0fifgv4qsbxr74d6v1hgzh3q";
-       libraryHaskellDepends = [
-         base data-default-class stm stm-delay time
-       ];
-       testHaskellDepends = [ base hspec stm time ];
-       homepage = "https://github.com/debug-ito/fold-debounce";
-       description = "Fold multiple events that happen in a given period of time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fold-debounce_0_2_0_6" = callPackage
     ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
      , time
      }:
@@ -70626,7 +69531,6 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fold-debounce-conduit" = callPackage
@@ -71317,34 +70221,6 @@ self: {
      }) {};
 
   "fortran-src" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , directory, fgl, filepath, GenericPretty, happy, hspec, mtl
-     , pretty, text, uniplate
-     }:
-     mkDerivation {
-       pname = "fortran-src";
-       version = "0.1.0.4";
-       sha256 = "022pmk129zwqr5xlr3ymh85m3lqlcpv6z8g2nf6ajj24zzkzl82f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bytestring containers fgl GenericPretty mtl pretty text
-         uniplate
-       ];
-       libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         array base bytestring containers fgl GenericPretty mtl pretty text
-         uniplate
-       ];
-       testHaskellDepends = [
-         array base bytestring containers directory fgl filepath
-         GenericPretty hspec mtl pretty text uniplate
-       ];
-       description = "Parser and anlyses for Fortran standards 66, 77, 90";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "fortran-src_0_2_0_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, fgl, filepath, GenericPretty, happy, hspec, mtl
      , pretty, text, uniplate
@@ -71370,7 +70246,6 @@ self: {
        ];
        description = "Parser and anlyses for Fortran standards 66, 77, 90";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foscam-directory" = callPackage
@@ -72287,18 +71162,6 @@ self: {
      }) {};
 
   "friendly-time" = callPackage
-    ({ mkDerivation, base, hspec, old-locale, time }:
-     mkDerivation {
-       pname = "friendly-time";
-       version = "0.4";
-       sha256 = "1x73jk9smga912nfyxa77j6yz74kyx8zdr4q6xj3sirp46qm5nh5";
-       libraryHaskellDepends = [ base old-locale time ];
-       testHaskellDepends = [ base hspec old-locale time ];
-       description = "Print time information in friendly ways";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "friendly-time_0_4_1" = callPackage
     ({ mkDerivation, base, hspec, old-locale, time }:
      mkDerivation {
        pname = "friendly-time";
@@ -72310,7 +71173,6 @@ self: {
        testHaskellDepends = [ base hspec old-locale time ];
        description = "Print time information in friendly ways";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frisby" = callPackage
@@ -74012,6 +72874,8 @@ self: {
        pname = "generic-aeson";
        version = "0.2.0.9";
        sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l";
+       revision = "1";
+       editedCabalFile = "10dy6kdn48pfl6njdhv7zwfkb3qkwazl9238n2sz9gmw575gqnjn";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -74183,30 +73047,17 @@ self: {
      }) {};
 
   "generic-random" = callPackage
-    ({ mkDerivation, base, boltzmann-samplers, QuickCheck }:
-     mkDerivation {
-       pname = "generic-random";
-       version = "0.4.1.0";
-       sha256 = "1qif0cv7kzwvcmlldavbqih1mlzj65wrv80vgcavb1338f46zlfa";
-       libraryHaskellDepends = [ base boltzmann-samplers QuickCheck ];
-       homepage = "http://github.com/lysxia/generic-random";
-       description = "Generic random generators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "generic-random_0_5_0_0" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "generic-random";
        version = "0.5.0.0";
        sha256 = "00v514nadzm1g7pni1jqmxyzxs03v4vqj9p1qrxa46grk8ya3zsf";
-       revision = "1";
-       editedCabalFile = "1570wshlwb3ikws578zmrpfd560lpnd1idfx2w8plcb1znw7z7fj";
+       revision = "2";
+       editedCabalFile = "0h2gyf92p8afgsprb9wnfswh53kgrnlvkdixncmm5vm2dsi45xg5";
        libraryHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/lysxia/generic-random";
        description = "Generic random generators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-records" = callPackage
@@ -74291,8 +73142,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.5";
        sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym";
-       revision = "1";
-       editedCabalFile = "03rq9imjpwzxa9qibfz5dia6gprfqkmpagnrxjdkmwa263lma27b";
+       revision = "2";
+       editedCabalFile = "0knkxg05kasx08flzjzhkl1mb28wifsghz02812vwajxpp6rysm5";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -74321,18 +73172,6 @@ self: {
      }) {};
 
   "generics-sop" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "generics-sop";
-       version = "0.2.5.0";
-       sha256 = "1p2dsdjxl1ld40c890i4jagp48zxp3i2njr9jd9ma89ydkypr5zk";
-       libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Generic Programming using True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generics-sop_0_3_1_0" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generics-sop";
@@ -74342,7 +73181,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Generic Programming using True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-sop-lens" = callPackage
@@ -75306,30 +74144,6 @@ self: {
      }) {};
 
   "ghc-events" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers, mtl
-     }:
-     mkDerivation {
-       pname = "ghc-events";
-       version = "0.4.4.0";
-       sha256 = "0vagr03rivl5ymcnkxnzb1x5b4cr6xknnkwmfliqfrc1hhjgcaxb";
-       revision = "1";
-       editedCabalFile = "0rfwiy10mjl4vyv3gjsi6chz34ra4qicq3px2nm5vrzmlalla8d5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers mtl
-       ];
-       executableHaskellDepends = [
-         array base binary bytestring containers mtl
-       ];
-       testHaskellDepends = [
-         array base binary bytestring containers mtl
-       ];
-       description = "Library and tool for parsing .eventlog files from GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-events_0_6_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers }:
      mkDerivation {
        pname = "ghc-events";
@@ -75344,7 +74158,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-events-analyze" = callPackage
@@ -75395,29 +74208,6 @@ self: {
      }) {};
 
   "ghc-exactprint" = callPackage
-    ({ mkDerivation, base, bytestring, containers, Diff, directory
-     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
-     , silently, syb
-     }:
-     mkDerivation {
-       pname = "ghc-exactprint";
-       version = "0.5.3.1";
-       sha256 = "0wip93rawhzvbza8km925v43f7h271lj7byzwia5dqj3hqxbiwjl";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath free ghc ghc-boot
-         ghc-paths mtl syb
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff directory filemanip filepath ghc
-         ghc-boot ghc-paths HUnit mtl silently syb
-       ];
-       description = "ExactPrint for GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-exactprint_0_5_5_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
@@ -75438,7 +74228,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -75553,47 +74342,6 @@ self: {
      }) {};
 
   "ghc-mod" = 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 = "1jp5p6pjx3nzfx7xr3hgw9d4l9vlsijj0kpagj016rdbi4629ara";
-       revision = "1";
-       editedCabalFile = "1qyijh62wny3vxs72caqfphj10ld11zcf929gdaqs3ip5ixjb61a";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = 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;
-     }) {};
-
-  "ghc-mod_5_8_0_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
      , containers, criterion, deepseq, directory, djinn-ghc, doctest
      , extra, fclabels, filepath, ghc, ghc-boot, ghc-paths
@@ -75640,7 +74388,6 @@ self: {
        homepage = "https://github.com/DanielG/ghc-mod";
        description = "Happy Haskell Hacking";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {shelltest = null;};
 
   "ghc-mtl" = callPackage
@@ -75783,29 +74530,6 @@ self: {
      }) {};
 
   "ghc-prof" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
-       version = "1.3.0.2";
-       sha256 = "188gfhn8lisw2mi43g0bdx7kd8g4q68b01hj0w13r00jpxik98cr";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       executableHaskellDepends = [ base containers scientific text ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       homepage = "https://github.com/maoe/ghc-prof";
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
@@ -75826,7 +74550,6 @@ self: {
        homepage = "https://github.com/maoe/ghc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-flamegraph" = callPackage
@@ -76001,28 +74724,6 @@ self: {
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
-     , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
-       version = "0.2.4";
-       sha256 = "10iyngq3sqd01nrq5allc0q8s8zqvrp3j1yh02p3yyjijjnhm53n";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons
-         template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-natnormalise singletons tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       homepage = "http://clash-lang.org/";
-       description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-knownnat_0_3" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, transformers
@@ -76042,7 +74743,6 @@ 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
@@ -76383,24 +75083,6 @@ self: {
      }) {};
 
   "ghcjs-hplay" = callPackage
-    ({ mkDerivation, base, containers, ghcjs-perch, mtl, transformers
-     , transient, transient-universe
-     }:
-     mkDerivation {
-       pname = "ghcjs-hplay";
-       version = "0.3.4.2";
-       sha256 = "1ma9j7vxffnlac6mp3z6jl8s5sd6yjs9q1zgv5pzr4j7ic8fbnf3";
-       libraryHaskellDepends = [
-         base containers ghcjs-perch mtl transformers transient
-         transient-universe
-       ];
-       homepage = "https://github.com/agocorona/ghcjs-hplay";
-       description = "Client-side web EDSL for transient nodes running in the web browser";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ghcjs-hplay_0_4_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , ghcjs-perch, mtl, transformers, transient, transient-universe
      }:
@@ -77279,39 +75961,6 @@ self: {
      }) {};
 
   "ginger" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, filepath
-     , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, unordered-containers
-     , utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "ginger";
-       version = "0.3.9.1";
-       sha256 = "0g1jq12dw868x0s6l28kk0m9713zhwwfbw0n2n2dvbidrlvnpwi8";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring data-default filepath http-types mtl parsec
-         safe scientific text time transformers unordered-containers
-         utf8-string vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring data-default text transformers
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring data-default mtl tasty tasty-hunit
-         tasty-quickcheck text time transformers unordered-containers
-         utf8-string
-       ];
-       homepage = "https://bitbucket.org/tdammers/ginger";
-       description = "An implementation of the Jinja2 template language in Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ginger_0_5_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
      , tasty-quickcheck, text, time, transformers, unordered-containers
@@ -77921,39 +76570,6 @@ self: {
      }) {};
 
   "github" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, base-compat
-     , base16-bytestring, binary, binary-orphans, byteable, bytestring
-     , containers, cryptohash, deepseq, deepseq-generics, exceptions
-     , file-embed, hashable, hspec, http-client, http-client-tls
-     , http-link-header, http-types, iso8601-time, mtl, network-uri
-     , semigroups, text, time, tls, transformers, transformers-compat
-     , unordered-containers, vector, vector-instances
-     }:
-     mkDerivation {
-       pname = "github";
-       version = "0.15.0";
-       sha256 = "02fnxbz1in5fsacfsm39i7dgpk1waqqkhkdxa77bl6b68ifc74gh";
-       revision = "3";
-       editedCabalFile = "03x27qmqvs4xc9ic0219d69jhwpsk552nr7wdgzyi005l1jhs12h";
-       libraryHaskellDepends = [
-         aeson aeson-compat base base-compat base16-bytestring binary
-         binary-orphans byteable bytestring containers cryptohash deepseq
-         deepseq-generics exceptions hashable http-client http-client-tls
-         http-link-header http-types iso8601-time mtl network-uri semigroups
-         text time tls transformers transformers-compat unordered-containers
-         vector vector-instances
-       ];
-       testHaskellDepends = [
-         aeson-compat base base-compat file-embed hspec unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/phadej/github";
-       description = "Access to the GitHub API, v3";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "github_0_16_0" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat
      , base16-bytestring, binary, binary-orphans, byteable, bytestring
      , containers, cryptohash, deepseq, deepseq-generics, exceptions
@@ -78032,28 +76648,6 @@ self: {
      }) {};
 
   "github-release" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.0.3";
-       sha256 = "1jq69syllagq6g04wlsii2w2nqlck9g9dzs1dscwdbaal0907ck9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/github-release#readme";
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "github-release_1_0_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers, uri-templater
@@ -78392,22 +76986,6 @@ self: {
      }) {};
 
   "gitrev" = callPackage
-    ({ mkDerivation, base, directory, filepath, process
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "gitrev";
-       version = "1.2.0";
-       sha256 = "00ii00j5bnxnhnmzcsbqfin8kdj6n9ll7akg3j8apajwvd7f74a3";
-       libraryHaskellDepends = [
-         base directory filepath process template-haskell
-       ];
-       homepage = "https://github.com/acfoltzer/gitrev";
-       description = "Compile git revision info into Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "gitrev_1_3_1" = callPackage
     ({ mkDerivation, base, base-compat, directory, filepath, process
      , template-haskell
      }:
@@ -78421,7 +76999,6 @@ self: {
        homepage = "https://github.com/acfoltzer/gitrev";
        description = "Compile git revision info into Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitson" = callPackage
@@ -78647,18 +77224,6 @@ self: {
      }) {};
 
   "glaze" = callPackage
-    ({ mkDerivation, base, lens }:
-     mkDerivation {
-       pname = "glaze";
-       version = "0.2.0.2";
-       sha256 = "0b698imawd2dyy5n8c67xg14hpc5qvywpnz6913wgnn2ss0p1chn";
-       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;
-     }) {};
-
-  "glaze_0_3_0_1" = callPackage
     ({ mkDerivation, base, lens }:
      mkDerivation {
        pname = "glaze";
@@ -78668,26 +77233,9 @@ self: {
        homepage = "https://github.com/louispan/glaze#readme";
        description = "Framework for rendering things with metadata/headers and values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glazier" = callPackage
-    ({ mkDerivation, base, lens, mmorph, mtl, profunctors
-     , semigroupoids, transformers
-     }:
-     mkDerivation {
-       pname = "glazier";
-       version = "0.7.0.0";
-       sha256 = "0a5lga72ja5gg5ki3c4hqhii4rsnyk2fh0qqcyi3wpchvyhqisqk";
-       libraryHaskellDepends = [
-         base lens mmorph mtl profunctors semigroupoids transformers
-       ];
-       homepage = "https://github.com/louispan/glazier#readme";
-       description = "Composable widgets framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glazier_0_11_0_1" = callPackage
     ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids
      , transformers
      }:
@@ -78701,27 +77249,9 @@ self: {
        homepage = "https://github.com/louispan/glazier#readme";
        description = "Composable widgets framework with enhanced with transformers and lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glazier-pipes" = callPackage
-    ({ mkDerivation, base, glazier, lens, mmorph, mtl, pipes
-     , pipes-concurrency, pipes-misc, stm, stm-extras, transformers
-     }:
-     mkDerivation {
-       pname = "glazier-pipes";
-       version = "0.1.4.0";
-       sha256 = "1k46l388azr95njq008ibxk16fwvqxa2pswfdaxqrbckx018071m";
-       libraryHaskellDepends = [
-         base glazier lens mmorph mtl pipes pipes-concurrency pipes-misc stm
-         stm-extras transformers
-       ];
-       homepage = "https://github.com/louispan/glazier-pipes#readme";
-       description = "Converts Glazier widgets into a Pipe";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glazier-pipes_0_1_5_1" = callPackage
     ({ mkDerivation, base, glazier, mmorph, pipes, stm, stm-extras
      , transformers
      }:
@@ -78735,7 +77265,6 @@ self: {
        homepage = "https://github.com/louispan/glazier-pipes#readme";
        description = "A threaded rendering framework using glaizer and pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glazier-react" = callPackage
@@ -79068,22 +77597,6 @@ self: {
      }) {};
 
   "gloss" = callPackage
-    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
-     , gloss-rendering, GLUT, OpenGL
-     }:
-     mkDerivation {
-       pname = "gloss";
-       version = "1.10.2.5";
-       sha256 = "1ia2vifilk72j9xprqi5qfhf6bvhk0xygbdmcqlzfa98i52w7iz5";
-       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_11_1_1" = callPackage
     ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
      , gloss-rendering, GLUT, OpenGL
      }:
@@ -79097,7 +77610,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
@@ -79239,19 +77751,6 @@ self: {
      }) {};
 
   "gloss-rendering" = callPackage
-    ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
-     mkDerivation {
-       pname = "gloss-rendering";
-       version = "1.10.3.5";
-       sha256 = "0wqdm3k63x62hqlmp6in75wslpq631506f3j4n3g0qpbn8c8bih0";
-       libraryHaskellDepends = [
-         base bmp bytestring containers GLUT OpenGL
-       ];
-       description = "Gloss picture data types and rendering functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss-rendering_1_11_1_1" = callPackage
     ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
      mkDerivation {
        pname = "gloss-rendering";
@@ -79262,7 +77761,6 @@ self: {
        ];
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-sodium" = callPackage
@@ -79796,30 +78294,6 @@ self: {
      }) {};
 
   "gogol" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
-     , conduit-extra, cryptonite, directory, exceptions, filepath
-     , gogol-core, http-client, http-conduit, http-media, http-types
-     , lens, memory, mime-types, monad-control, mtl, resourcet, text
-     , time, transformers, transformers-base, unordered-containers, x509
-     , x509-store
-     }:
-     mkDerivation {
-       pname = "gogol";
-       version = "0.1.1";
-       sha256 = "1cjdhdsdrr1j8xbif9l293kfjx4n9vybsh12za59q8vckl36vvhx";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive conduit conduit-extra
-         cryptonite directory exceptions filepath gogol-core http-client
-         http-conduit http-media http-types lens memory mime-types
-         monad-control mtl resourcet text time transformers
-         transformers-base unordered-containers x509 x509-store
-       ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Comprehensive Google Services SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol_0_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
      , conduit-extra, cryptonite, directory, exceptions, filepath
      , gogol-core, http-client, http-conduit, http-media, http-types
@@ -79841,22 +78315,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Comprehensive Google Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adexchange-buyer" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adexchange-buyer";
-       version = "0.1.1";
-       sha256 = "0ncsijxs97v3gg0nynhjbysq1nj3zmdph274phm4pjl8k4acxjfl";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Ad Exchange Buyer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adexchange-buyer_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adexchange-buyer";
@@ -79866,22 +78327,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Buyer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adexchange-seller" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adexchange-seller";
-       version = "0.1.1";
-       sha256 = "02wjqpc0bzp0jwa2rmzk2gp2fkq2gsd67xviyg549jzkgq1z5dj3";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Ad Exchange Seller SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adexchange-seller_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adexchange-seller";
@@ -79891,22 +78339,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Seller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-datatransfer" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-datatransfer";
-       version = "0.1.1";
-       sha256 = "1a9p2n7n0mq4c8xiwqdfvkrgywq8yla0y34qqj27q5zd2rqn142c";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Admin Data Transfer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-datatransfer_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-datatransfer";
@@ -79916,22 +78351,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Data Transfer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-directory" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-directory";
-       version = "0.1.1";
-       sha256 = "1wkfrnh39s00n1raykajf8brvbqbsdkwwb3nflqvf6cnq7xcv63q";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Admin Directory SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-directory_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-directory";
@@ -79941,22 +78363,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Directory SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-emailmigration" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-emailmigration";
-       version = "0.1.1";
-       sha256 = "142rl4qrhppnpzv94fz14568liilqbbfjkvdvbwiyny976rcrsb1";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Email Migration API v2 SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-emailmigration_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-emailmigration";
@@ -79966,22 +78375,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Email Migration API v2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-reports" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-reports";
-       version = "0.1.1";
-       sha256 = "1kac74p7wk2inbb3qcg9l9np5dpmpd2ncmxvqp8dqr5qmsfyl8an";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Admin Reports SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-reports_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-reports";
@@ -79991,22 +78387,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Reports SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adsense" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adsense";
-       version = "0.1.1";
-       sha256 = "1g6idm6csvz2xl311fha2brf3x7s4mmj75vzin1gani1lxvxlpvj";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google AdSense Management SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adsense_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense";
@@ -80016,22 +78399,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adsense-host" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adsense-host";
-       version = "0.1.1";
-       sha256 = "04l1ay8xd6m42s6gdny74yr6y1lg2xagkfqfh4cwmg5kyrykypih";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google AdSense Host SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adsense-host_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense-host";
@@ -80041,22 +78411,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Host SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-affiliates" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-affiliates";
-       version = "0.1.1";
-       sha256 = "074s8rz6gky3sf7wqgkvba42l8rjkid5g1x31ycsrl7cc033c3dr";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Affiliate Network SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-affiliates_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-affiliates";
@@ -80066,22 +78423,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Affiliate Network SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-analytics" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-analytics";
-       version = "0.1.1";
-       sha256 = "08hrilw0lb42fr8yvp01nwcqnhia9mbaxblpp8s78sdkmc7pnmbs";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Analytics SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-analytics_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-analytics";
@@ -80091,22 +78435,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-android-enterprise" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-android-enterprise";
-       version = "0.1.1";
-       sha256 = "0971m9m5g3109igwv273cp1qh8l8rw0n37h9a8y8rqalwxqrlrmw";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play EMM SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-android-enterprise_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-android-enterprise";
@@ -80116,22 +78447,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play EMM SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-android-publisher" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-android-publisher";
-       version = "0.1.1";
-       sha256 = "1z0y7v0889q0hfqbgqqf3vyx4k3gq47s82pxhd0xcxk5nbzrs68f";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Developer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-android-publisher_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-android-publisher";
@@ -80141,22 +78459,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-appengine" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-appengine";
-       version = "0.1.1";
-       sha256 = "0qcmrlp8a8rmccwrymnm0n5936z0qdw0xjv0480j9fm99s2irwfb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google App Engine Admin SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-appengine_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-appengine";
@@ -80166,22 +78471,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App Engine Admin SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-activity" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-activity";
-       version = "0.1.1";
-       sha256 = "04zbl08x9pr2vzaa9cgjdpy61hiph3272blshpg6wn6wd3nnm75v";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Apps Activity SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-activity_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-activity";
@@ -80191,22 +78483,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Activity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-calendar" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-calendar";
-       version = "0.1.1";
-       sha256 = "0rxw2v523n97nz60zss9qki47paaidglh9qy6lv98ya5fdazgsyb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Calendar SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-calendar_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-calendar";
@@ -80216,22 +78495,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Calendar SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-licensing" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-licensing";
-       version = "0.1.1";
-       sha256 = "1jiv1hgw6dyn28d5xavs9hjnamkayhfarwfd76ihx68qz6z4ii6w";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Enterprise License Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-licensing_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-licensing";
@@ -80241,22 +78507,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise License Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-reseller" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-reseller";
-       version = "0.1.1";
-       sha256 = "0yzfrsvfli1s08w2w4c3n2gsqp6qpw8ddzb70yzi480n9xkq9pbh";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Enterprise Apps Reseller SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-reseller_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-reseller";
@@ -80266,22 +78519,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise Apps Reseller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-tasks" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-tasks";
-       version = "0.1.1";
-       sha256 = "1npyx72xpcd5xlsfczkd1ggslw2vz82hq8dg6m5lpwy97sryhs6w";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Tasks SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-tasks_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-tasks";
@@ -80291,22 +78531,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tasks SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-appstate" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-appstate";
-       version = "0.1.1";
-       sha256 = "1rgn57j9abfw89az9bjx8ffcv1h1hb0n962hf3sdnxh1ydppp728";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google App State SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-appstate_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-appstate";
@@ -80316,22 +78543,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App State SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-autoscaler" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-autoscaler";
-       version = "0.1.1";
-       sha256 = "1fb9mghck2fg2qxrrj0zhclw0hj2r6q58sh0kl0qlg9ankyqp7yb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Autoscaler SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-autoscaler_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-autoscaler";
@@ -80341,22 +78555,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Autoscaler SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-bigquery" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-bigquery";
-       version = "0.1.1";
-       sha256 = "1lx2gllxwkhi3r3z9k3kvfvv834yyfz1fv0m2fw2p4ypqc63fhq9";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google BigQuery SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-bigquery_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-bigquery";
@@ -80366,22 +78567,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google BigQuery SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-billing" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-billing";
-       version = "0.1.1";
-       sha256 = "1s59i7rd77a782wsw6av3xssh7byzfhgq9js6izaihz6nxvki409";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Billing SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-billing_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-billing";
@@ -80391,22 +78579,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Billing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-blogger" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-blogger";
-       version = "0.1.1";
-       sha256 = "0vijvnxbqg66wfz6v2b728m3bqqsnygfyhjfhlq0kky7hygaq7an";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Blogger SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-blogger_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-blogger";
@@ -80416,22 +78591,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Blogger SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-books" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-books";
-       version = "0.1.1";
-       sha256 = "09k96l9866ksvbvcayj9hbqm3qamzhpmiqgc0djvqxgkxhf9nvhd";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Books SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-books_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-books";
@@ -80441,22 +78603,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Books SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-civicinfo" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-civicinfo";
-       version = "0.1.1";
-       sha256 = "0hnlspkcb7zq9cb52pb3m89lwg3pawv8i8lx9y3c51ww474m9hsk";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Civic Information SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-civicinfo_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-civicinfo";
@@ -80466,22 +78615,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Civic Information SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-classroom" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-classroom";
-       version = "0.1.1";
-       sha256 = "16knr6rf9j3w9cvs240kbmf031fqjjfdrahfw23dyr0qbmra2qby";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Classroom SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-classroom_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-classroom";
@@ -80491,22 +78627,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Classroom SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-cloudmonitoring" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-cloudmonitoring";
-       version = "0.1.1";
-       sha256 = "1ajdqqshn2sbr3vs6r0gfc271ff7c542vkh6bwa9p39dfqicr46s";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Monitoring SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-cloudmonitoring_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-cloudmonitoring";
@@ -80516,22 +78639,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-cloudtrace" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-cloudtrace";
-       version = "0.1.1";
-       sha256 = "15ghx7r4l2k4ad0icw1rjsbdx5almg8z5x93mgd0kvdyc55ysxw9";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Trace SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-cloudtrace_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-cloudtrace";
@@ -80541,22 +78651,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Trace SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-compute" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-compute";
-       version = "0.1.1";
-       sha256 = "1ajizav80rp1kr277bkc0c1ii8v2dznjiv11cbgy68w9lk7dg14b";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-compute_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-compute";
@@ -80566,22 +78663,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-container" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-container";
-       version = "0.1.1";
-       sha256 = "1c9337c8iq3vrzf17kcikr0n0h18hwazvrzn7v1a3wrqjcisl3lv";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Container Engine SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-container_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-container";
@@ -80591,7 +78675,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Container Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-containerbuilder" = callPackage
@@ -80608,31 +78691,6 @@ self: {
      }) {};
 
   "gogol-core" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , case-insensitive, conduit, dlist, exceptions, hashable
-     , http-api-data, http-client, http-media, http-types, lens, memory
-     , resourcet, scientific, servant, tasty, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "gogol-core";
-       version = "0.1.1";
-       sha256 = "10ylycapx1a0w0vif56rqj4ljm35ar3lpv650v8cb0c2cpp7sv4g";
-       revision = "1";
-       editedCabalFile = "0dhldpvzdj8kcclzdyqg0b1p7df8jvxlwv244rkxgwd1fgqd7g2l";
-       libraryHaskellDepends = [
-         aeson attoparsec base bifunctors bytestring case-insensitive
-         conduit dlist exceptions hashable http-api-data http-client
-         http-media http-types lens memory resourcet scientific servant text
-         time unordered-containers
-       ];
-       testHaskellDepends = [ base tasty ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Core data types and functionality for Gogol libraries";
-       license = "unknown";
-     }) {};
-
-  "gogol-core_0_3_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, dlist, exceptions, hashable
      , http-api-data, http-client, http-media, http-types, lens
@@ -80653,22 +78711,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Core data types and functionality for Gogol libraries";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-customsearch" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-customsearch";
-       version = "0.1.1";
-       sha256 = "0ybqq6s51bf0nlc2pir6jfjgp3wmccy0fvnz4gm5viv7bn38q3gr";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google CustomSearch SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-customsearch_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-customsearch";
@@ -80678,23 +78723,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google CustomSearch SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dataflow" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dataflow";
-       version = "0.1.1";
-       sha256 = "0p5pysgfk5aihzyc7nhr78h075ja5spad3c6imvkpl4hki3km45p";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Dataflow SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "gogol-dataflow_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dataflow";
@@ -80708,18 +78739,6 @@ self: {
      }) {};
 
   "gogol-dataproc" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dataproc";
-       version = "0.1.1";
-       sha256 = "12sbvvfghg10rwwc32jswynh7hdjfiwwyf42akqj46xrw7lfbyir";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Dataproc SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dataproc_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dataproc";
@@ -80729,22 +78748,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Dataproc SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-datastore" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-datastore";
-       version = "0.1.1";
-       sha256 = "0xa12gc2ksgzpkzvlzjzx3l62yjv0zmj08sznqbkr97lqmyi7xdv";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Datastore SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-datastore_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-datastore";
@@ -80754,22 +78760,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Datastore SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-debugger" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-debugger";
-       version = "0.1.1";
-       sha256 = "18mwpx20can2ppa0pjgyydajwcsmwqd870wrfvl4nsppaxfyrvai";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Stackdriver Debugger SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-debugger_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-debugger";
@@ -80779,22 +78772,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Debugger SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-deploymentmanager" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-deploymentmanager";
-       version = "0.1.1";
-       sha256 = "00wv8fifmx95z8p2hyl5xzlb9nkm6z3xbcyzyr5n55bkb6jh9nkk";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Deployment Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-deploymentmanager_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-deploymentmanager";
@@ -80804,22 +78784,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Deployment Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dfareporting" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dfareporting";
-       version = "0.1.1";
-       sha256 = "08nmg3r2cvwfkff9maggi4rp4jzsv0qwjbqljfdf4gm4hljgl6i4";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google DCM/DFA Reporting And Trafficking SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dfareporting_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dfareporting";
@@ -80829,22 +78796,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DCM/DFA Reporting And Trafficking SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-discovery" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-discovery";
-       version = "0.1.1";
-       sha256 = "1zhvvpr119giy88k4gh7215rfzcq6hism125nvwh284nxaqxd3jv";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google APIs Discovery Service SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-discovery_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-discovery";
@@ -80854,22 +78808,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google APIs Discovery Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dns" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dns";
-       version = "0.1.1";
-       sha256 = "0dkiv4blk11vqvwxjzjnda2dlzl4lwjdphmxr6whlvl7bvk8ni3p";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud DNS SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dns_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dns";
@@ -80879,22 +78820,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud DNS SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-bids" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-doubleclick-bids";
-       version = "0.1.1";
-       sha256 = "0any741rgz8qcsj7x0z04777wbpv863j3gk812c8kpw9qpn9ks50";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google DoubleClick Bid Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-doubleclick-bids_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-bids";
@@ -80904,22 +78832,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Bid Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-search" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-doubleclick-search";
-       version = "0.1.1";
-       sha256 = "0q5gd4vxiq9awp0k5m6g1jg29n84r9y9k9xdhzbr4mbzw6rm9a8m";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google DoubleClick Search SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-doubleclick-search_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-search";
@@ -80929,22 +78844,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-drive" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-drive";
-       version = "0.1.1";
-       sha256 = "0v6lwq2hhknqdkff9iizsrsz17qn0vq4xa5bvhgliy0fjsxbaikf";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Drive SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-drive_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-drive";
@@ -80954,7 +78856,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Drive SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-firebase-dynamiclinks" = callPackage
@@ -80971,18 +78872,6 @@ self: {
      }) {};
 
   "gogol-firebase-rules" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-firebase-rules";
-       version = "0.1.1";
-       sha256 = "1hjzw98pk34bgnm1prgckgl7wl3xgkbwdndk7wqfnd8xjanr27wq";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Firebase Rules SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-firebase-rules_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-firebase-rules";
@@ -80992,22 +78881,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Rules SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fitness" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-fitness";
-       version = "0.1.1";
-       sha256 = "00anxkp5ck2d0j4my4pdhp8r2086ifwl9i1gsb00cwqqx90b29h8";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Fitness SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-fitness_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fitness";
@@ -81017,22 +78893,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fitness SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fonts" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-fonts";
-       version = "0.1.1";
-       sha256 = "0rs1125sb4bfp3yassvkdznclngm7m7h3qav6ph7yp83rwvybwsp";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Fonts Developer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-fonts_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fonts";
@@ -81042,22 +78905,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fonts Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-freebasesearch" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-freebasesearch";
-       version = "0.1.1";
-       sha256 = "073ma75h278zjgcw80kghl3mjqkn1ah71b8ip9606xlryj9kdhhb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Freebase Search SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-freebasesearch_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-freebasesearch";
@@ -81067,22 +78917,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Freebase Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fusiontables" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-fusiontables";
-       version = "0.1.1";
-       sha256 = "052agk6abqn70qyipn4xk4yhvjxczv94dw5cx2zy14yxi0gsp9fx";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Fusion Tables SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-fusiontables_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fusiontables";
@@ -81092,22 +78929,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fusion Tables SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-games";
-       version = "0.1.1";
-       sha256 = "1jp0562wjh2bw2lfgz37r0jdawigqlaabwgbc5g1579i32bvg4hj";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Game Services SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-games_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games";
@@ -81117,22 +78941,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games-configuration" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-games-configuration";
-       version = "0.1.1";
-       sha256 = "0pxkd0h6qka1sqb1b6dmil6rkwxymmj5nn553jsnc5k6xdlwbgis";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Game Services Publishing SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-games-configuration_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games-configuration";
@@ -81142,22 +78953,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Publishing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games-management" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-games-management";
-       version = "0.1.1";
-       sha256 = "0y2ys9nsz69zyv0hdj9222pl9402am0f5g3643sddrrn9qb4ilgb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Game Services Management SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-games-management_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games-management";
@@ -81167,22 +78965,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-genomics" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-genomics";
-       version = "0.1.1";
-       sha256 = "104cayngl7fmdkhifn332kcs02y5kw4pgl8n7adsqkskv5di9pws";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Genomics SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-genomics_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-genomics";
@@ -81192,22 +78977,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Genomics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-gmail" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-gmail";
-       version = "0.1.1";
-       sha256 = "1xc6g3gsxc036d60mh64rn9slaqcrwhniagx4wq2yn5yznmw8nbl";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Gmail SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-gmail_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-gmail";
@@ -81217,22 +78989,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Gmail SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-groups-migration" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-groups-migration";
-       version = "0.1.1";
-       sha256 = "1zc5wcvjghjanxih44zhg248gzabssh4z3wlzkb63b2c8a5ffw16";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Groups Migration SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-groups-migration_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-migration";
@@ -81242,22 +79001,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Migration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-groups-settings" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-groups-settings";
-       version = "0.1.1";
-       sha256 = "1vg1dkz0g5vx84blkyivw2fmhqpk5xx3y677xgjzns7rj7myzrf8";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Groups Settings SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-groups-settings_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-settings";
@@ -81267,7 +79013,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Settings SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-iam" = callPackage
@@ -81284,18 +79029,6 @@ self: {
      }) {};
 
   "gogol-identity-toolkit" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-identity-toolkit";
-       version = "0.1.1";
-       sha256 = "0nwiwy6zqr00kdamhnxdqf7gbgi1jg6jfly0jw1cfaanlvmwgr95";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Identity Toolkit SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-identity-toolkit_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-identity-toolkit";
@@ -81305,22 +79038,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity Toolkit SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-kgsearch" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-kgsearch";
-       version = "0.1.1";
-       sha256 = "0dzksn0ql6crsshw4ivabjsa7b7vlh1x2341vby18ff9ckkr24c5";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Knowledge Graph Search SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-kgsearch_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-kgsearch";
@@ -81330,7 +79050,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Knowledge Graph Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-language" = callPackage
@@ -81347,18 +79066,6 @@ self: {
      }) {};
 
   "gogol-latencytest" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-latencytest";
-       version = "0.1.1";
-       sha256 = "1kgkir9ql1s55wp3wh93skg3azc0ki2vl7d78m39l9sickjavjlh";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Network Performance Monitoring SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-latencytest_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-latencytest";
@@ -81368,22 +79075,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Network Performance Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-logging" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-logging";
-       version = "0.1.1";
-       sha256 = "0mj4hph5wyx6ljryjrhj0jcrkqi4fa8h5xrr1v5vvg9iw83ss813";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Stackdriver Logging SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-logging_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-logging";
@@ -81393,7 +79087,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Logging SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-manufacturers" = callPackage
@@ -81410,18 +79103,6 @@ self: {
      }) {};
 
   "gogol-maps-coordinate" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-maps-coordinate";
-       version = "0.1.1";
-       sha256 = "12cbbvgmfz4zd942byzlzy2pk71z2l4sl94p55z36hg7c8014q2v";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Maps Coordinate SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-maps-coordinate_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-coordinate";
@@ -81431,22 +79112,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Coordinate SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-maps-engine" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-maps-engine";
-       version = "0.1.1";
-       sha256 = "1x3fc5kaap9yf9ql19nqrc6ddil8hkr4ix42k1i1bnd2afs7w9pv";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Maps Engine SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-maps-engine_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-engine";
@@ -81456,22 +79124,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-mirror" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-mirror";
-       version = "0.1.1";
-       sha256 = "1vafyhl12h9fpl7p79pkf88s86i938kl9nfp0qvqs8qzsyw93f8g";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Mirror SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-mirror_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-mirror";
@@ -81481,7 +79136,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Mirror SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-ml" = callPackage
@@ -81498,18 +79152,6 @@ self: {
      }) {};
 
   "gogol-monitoring" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-monitoring";
-       version = "0.1.1";
-       sha256 = "0q9yr8ca4c88kd6jm5ncm245sqlipxhwli80nlrck0kwq4x52slh";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Stackdriver Monitoring SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-monitoring_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-monitoring";
@@ -81519,22 +79161,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-oauth2" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-oauth2";
-       version = "0.1.1";
-       sha256 = "01q2q4c9k8igngbmcff7cpi4bb1m8zjn0zfnh3wk4vbajz10vinj";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google OAuth2 SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-oauth2_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-oauth2";
@@ -81544,22 +79173,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google OAuth2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-pagespeed" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-pagespeed";
-       version = "0.1.1";
-       sha256 = "1l9dgj0l45iziq57wvk6dwjklhyz45fr9lgnzmphzs01j7mis1x2";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google PageSpeed Insights SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-pagespeed_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-pagespeed";
@@ -81569,22 +79185,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google PageSpeed Insights SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-partners" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-partners";
-       version = "0.1.1";
-       sha256 = "1g6890q7gl6yyl10jqr694j4ha4v80aiapkmbz1h0zma91kkb4m2";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Partners SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-partners_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-partners";
@@ -81594,22 +79197,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Partners SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-people" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-people";
-       version = "0.1.1";
-       sha256 = "0xmwb871sklaavh53bmhp2mgpvlaa6izfsgj435dscgnkm5hzfxd";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google People SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-people_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-people";
@@ -81619,22 +79209,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google People SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-play-moviespartner" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-play-moviespartner";
-       version = "0.1.1";
-       sha256 = "08r6apl5gg1ylpszhdqrfj5bi3wd7jar0cmriibh3ssdvdm1jx6n";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Movies Partner SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-play-moviespartner_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-play-moviespartner";
@@ -81644,22 +79221,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Movies Partner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-plus" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-plus";
-       version = "0.1.1";
-       sha256 = "1l966sf6wsdcx7nx7iy27yc3sbwpf9369dwj2m45aaqwicg7bwm8";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google + SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-plus_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus";
@@ -81669,22 +79233,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-plus-domains" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-plus-domains";
-       version = "0.1.1";
-       sha256 = "1smg96g30sdadyhlkx06vbc7jqifj7grj8csc92874vrximv9kvw";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google + Domains SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-plus-domains_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus-domains";
@@ -81694,22 +79245,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + Domains SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-prediction" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-prediction";
-       version = "0.1.1";
-       sha256 = "0n3yldshhf4h51sspqs3r7yvl83jm2jccaxljcg9f5qlji6j85vk";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Prediction SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-prediction_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-prediction";
@@ -81719,22 +79257,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Prediction SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-proximitybeacon" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-proximitybeacon";
-       version = "0.1.1";
-       sha256 = "1cjgsmwrad8bi4vyxgfsfjbw3ks0dh805vrcig8f156jg0l7zvwn";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Proximity Beacon SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-proximitybeacon_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-proximitybeacon";
@@ -81744,22 +79269,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Proximity Beacon SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-pubsub" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-pubsub";
-       version = "0.1.1";
-       sha256 = "060xssqkczhznl0lc1v9rg4pfpa03x857jgchz12qczdh33mkhgz";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Pub/Sub SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-pubsub_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-pubsub";
@@ -81769,22 +79281,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Pub/Sub SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-qpxexpress" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-qpxexpress";
-       version = "0.1.1";
-       sha256 = "1gi4rad5ajhw758r7bmkplghzx9q7dx3qpv1zwazcrvxh3w66s23";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google QPX Express SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-qpxexpress_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-qpxexpress";
@@ -81794,22 +79293,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google QPX Express SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-replicapool" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-replicapool";
-       version = "0.1.1";
-       sha256 = "0xavhjrd4xq4c33p7bj4qrpld5v0pddxhcyjwkp9bz0zvahad872";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Instance Group Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-replicapool_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-replicapool";
@@ -81819,22 +79305,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-replicapool-updater" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-replicapool-updater";
-       version = "0.1.1";
-       sha256 = "09qrqxvfcyb8sg20s4nc3wzbnfh0xz6lpj7rxgrfzj7jj67ngd1c";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Instance Group Updater SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-replicapool-updater_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-replicapool-updater";
@@ -81844,22 +79317,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Updater SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-resourcemanager" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-resourcemanager";
-       version = "0.1.1";
-       sha256 = "0xw5c54s1p2dlww5102b7nir6iis938038hb5k9k25nia5xx64di";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Resource Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-resourcemanager_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourcemanager";
@@ -81869,22 +79329,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Resource Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-resourceviews" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-resourceviews";
-       version = "0.1.1";
-       sha256 = "08xqb551fm797kdzb9vr8089ync4wcbichjymqrkc5vxb0b7hibn";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Instance Groups SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-resourceviews_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourceviews";
@@ -81894,7 +79341,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Groups SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-runtimeconfig" = callPackage
@@ -81924,18 +79370,6 @@ self: {
      }) {};
 
   "gogol-script" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-script";
-       version = "0.1.1";
-       sha256 = "03yxy43l0ydnafqwgdin69ydnrinppcq7slgzv5681fyi101rdih";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Apps Script Execution SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-script_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-script";
@@ -81945,7 +79379,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Script Execution SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-servicecontrol" = callPackage
@@ -81975,19 +79408,6 @@ self: {
      }) {};
 
   "gogol-sheets" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-sheets";
-       version = "0.1.1";
-       sha256 = "0y569mv2limjcg2k6rsvlxhk6nm8nmvmf2738crgmfxn6a1h5cs4";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Sheets SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "gogol-sheets_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-sheets";
@@ -82001,19 +79421,6 @@ self: {
      }) {};
 
   "gogol-shopping-content" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-shopping-content";
-       version = "0.1.1";
-       sha256 = "07smcny86lyc0x0f3lych8k0pwzjxmha9k8p6n9l7lli2pg7mir8";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Content API for Shopping SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "gogol-shopping-content_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-shopping-content";
@@ -82027,18 +79434,6 @@ self: {
      }) {};
 
   "gogol-siteverification" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-siteverification";
-       version = "0.1.1";
-       sha256 = "1qgv1j5wkz70yxysg8y3520qhbp1s5lwwxzdd7qql5imxgg7abgb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Site Verification SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-siteverification_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-siteverification";
@@ -82048,7 +79443,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Site Verification SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-slides" = callPackage
@@ -82065,18 +79459,6 @@ self: {
      }) {};
 
   "gogol-spectrum" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-spectrum";
-       version = "0.1.1";
-       sha256 = "1h9fz2g61sr76lps50w1srpby3hlcva08qn3q6dp4k9hwbhrycii";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Spectrum Database SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-spectrum_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-spectrum";
@@ -82086,22 +79468,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Spectrum Database SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-sqladmin" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-sqladmin";
-       version = "0.1.1";
-       sha256 = "1gs1qa1f7gbxyzw09x8gn5m6bv10r942ssd16322qvpy9lrslyvg";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud SQL Administration SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-sqladmin_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-sqladmin";
@@ -82111,22 +79480,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud SQL Administration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-storage" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-storage";
-       version = "0.1.1";
-       sha256 = "0wmahrs83qwpjjlj0brj6rvyrbq6b0i75a5nvzbvqyz3c12z7x3s";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Storage JSON SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-storage_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage";
@@ -82136,22 +79492,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Storage JSON SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-storage-transfer" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-storage-transfer";
-       version = "0.1.1";
-       sha256 = "0id7rjd6nlcy4hagcpmaqwsrskq00dfh3n3hdaad7dfka5ziackz";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Storage Transfer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-storage-transfer_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage-transfer";
@@ -82161,22 +79504,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Storage Transfer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-tagmanager" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-tagmanager";
-       version = "0.1.1";
-       sha256 = "1vi0wimdvd89nhk28916zjiks1nxj6gpq7g15a0wq0yzp40l1zld";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Tag Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-tagmanager_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-tagmanager";
@@ -82186,22 +79516,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tag Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-taskqueue" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-taskqueue";
-       version = "0.1.1";
-       sha256 = "076ya8j1g3lp1kpq3yk89i4hb36pd2qx4503vxzgr0pv72dv75s7";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google TaskQueue SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-taskqueue_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-taskqueue";
@@ -82211,22 +79528,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google TaskQueue SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-translate" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-translate";
-       version = "0.1.1";
-       sha256 = "1apdqj0wz5ipnk8488w0ymm86gx656wwwzm009ay7kv65zlzi310";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Translate SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-translate_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-translate";
@@ -82236,22 +79540,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Translate SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-urlshortener" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-urlshortener";
-       version = "0.1.1";
-       sha256 = "1y3wza0xfggjj5nd0d5pn9a0czx4m3hkm2dd2ckm25bbw2hcnn6r";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google URL Shortener SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-urlshortener_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-urlshortener";
@@ -82261,22 +79552,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google URL Shortener SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-useraccounts" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-useraccounts";
-       version = "0.1.1";
-       sha256 = "0iw6xx2s021vfyy7p7w81r53arv1paqkdzbldy60knx0rscssr20";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud User Accounts SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-useraccounts_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-useraccounts";
@@ -82286,22 +79564,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud User Accounts SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-vision" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-vision";
-       version = "0.1.1";
-       sha256 = "0rd5j18b02vvl9if9i5ldr9rxdcfcdx5frh3bh6yncf1sbh6q176";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Vision SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-vision_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-vision";
@@ -82311,22 +79576,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Vision SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-webmaster-tools" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-webmaster-tools";
-       version = "0.1.1";
-       sha256 = "024nzj4wh5dhzi5az1cgwl4m7jw2wx6xww5qjmhkyis3118qzryg";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Search Console SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-webmaster-tools_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-webmaster-tools";
@@ -82336,23 +79588,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Search Console SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-youtube";
-       version = "0.1.1";
-       sha256 = "12sg8200wmw4hcf4wxx6xds5fp0jk822v6nlxg7isgziprkv5ad9";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google YouTube Data SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "gogol-youtube_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube";
@@ -82366,18 +79604,6 @@ self: {
      }) {};
 
   "gogol-youtube-analytics" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-youtube-analytics";
-       version = "0.1.1";
-       sha256 = "06y9yxq2nqqhf8isrb54cjahyffq4j3qsk6d1pr71s2yc0hp0acq";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google YouTube Analytics SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-youtube-analytics_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube-analytics";
@@ -82387,22 +79613,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube-reporting" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-youtube-reporting";
-       version = "0.1.1";
-       sha256 = "0b2ywgm2wjilpa8yd5pn3g3bnmik3pnhf5701sgakvrh38avzlcn";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google YouTube Reporting SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-youtube-reporting_0_3_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube-reporting";
@@ -82412,7 +79625,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Reporting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gooey" = callPackage
@@ -82573,23 +79785,6 @@ self: {
      }) {};
 
   "google-oauth2-jwt" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
-     , RSA, text, unix-time
-     }:
-     mkDerivation {
-       pname = "google-oauth2-jwt";
-       version = "0.1.3";
-       sha256 = "02y0l4ylgx5dzx6bv1h90nk234mm5mdr1p8ifizaizh39mdmg5qm";
-       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_2_2" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
      , RSA, text, unix-time
      }:
@@ -82641,23 +79836,6 @@ self: {
      }) {};
 
   "google-translate" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-api-data
-     , http-client, servant, servant-client, text, transformers
-     }:
-     mkDerivation {
-       pname = "google-translate";
-       version = "0.3";
-       sha256 = "0r0zk8fv3jfcd65ac07s50i9qi38i5svcj2sycql73rszrhng75q";
-       libraryHaskellDepends = [
-         aeson base bytestring http-api-data http-client servant
-         servant-client text transformers
-       ];
-       description = "Google Translate API bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "google-translate_0_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-api-data
      , http-client, servant, servant-client, text, transformers
      }:
@@ -84311,23 +81489,6 @@ self: {
      }) {};
 
   "groundhog-th" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, groundhog
-     , template-haskell, text, time, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "groundhog-th";
-       version = "0.8";
-       sha256 = "1hrflzbsmfd8ixad1534ml34swxpdm356zhppzx13i70a2sikxyf";
-       libraryHaskellDepends = [
-         aeson base bytestring containers groundhog template-haskell text
-         time unordered-containers yaml
-       ];
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "groundhog-th_0_8_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, groundhog
      , template-haskell, text, time, unordered-containers, yaml
      }:
@@ -86558,31 +83719,6 @@ self: {
      }) {};
 
   "hackernews" = callPackage
-    ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
-     , http-types, QuickCheck, quickcheck-instances, servant
-     , servant-client, string-conversions, text
-     }:
-     mkDerivation {
-       pname = "hackernews";
-       version = "1.1.2.0";
-       sha256 = "07hsky158rgl3v70vrvfj1babvk9ad3pmasvx5sd932rkdwmz8g5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base http-client http-types QuickCheck quickcheck-instances
-         servant servant-client string-conversions text
-       ];
-       executableHaskellDepends = [ base http-client http-client-tls ];
-       testHaskellDepends = [
-         aeson base hspec http-client http-client-tls QuickCheck
-         quickcheck-instances
-       ];
-       description = "API for Hacker News";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hackernews_1_2_0_0" = callPackage
     ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
      , http-types, QuickCheck, quickcheck-instances, servant
      , servant-client, string-conversions, text
@@ -86730,6 +83866,24 @@ self: {
      }) {};
 
   "haddock" = callPackage
+    ({ mkDerivation, base, filepath, haddock-api, hspec }:
+     mkDerivation {
+       pname = "haddock";
+       version = "2.17.4";
+       sha256 = "1z3h3v7w84dzsm47iavdppc2w899mr4c1agq9fzghgz902i0a655";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base haddock-api ];
+       testHaskellDepends = [ base filepath hspec ];
+       doCheck = false;
+       preCheck = "unset GHC_PACKAGE_PATH";
+       homepage = "http://www.haskell.org/haddock/";
+       description = "A documentation-generation tool for Haskell libraries";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haddock_2_18_1" = callPackage
     ({ mkDerivation, base, filepath, haddock-api, hspec }:
      mkDerivation {
        pname = "haddock";
@@ -86788,6 +83942,26 @@ self: {
      }) {};
 
   "haddock-api" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths
+     , haddock-library, hspec, QuickCheck, transformers, xhtml
+     }:
+     mkDerivation {
+       pname = "haddock-api";
+       version = "2.17.4";
+       sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base bytestring Cabal containers deepseq directory filepath
+         ghc ghc-boot ghc-paths haddock-library transformers xhtml
+       ];
+       testHaskellDepends = [ base containers ghc hspec QuickCheck ];
+       homepage = "http://www.haskell.org/haddock/";
+       description = "A documentation-generation tool for Haskell libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "haddock-api_2_18_1" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths
      , haddock-library, hspec, QuickCheck, transformers, xhtml
@@ -86805,6 +83979,7 @@ self: {
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-leksah" = callPackage
@@ -87346,50 +84521,6 @@ self: {
      }) {};
 
   "hakyll" = callPackage
-    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
-     , containers, cryptohash, data-default, deepseq, directory
-     , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
-     , network, network-uri, optparse-applicative, pandoc
-     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
-     , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
-     , tasty, tasty-hunit, tasty-quickcheck, text, time
-     , time-locale-compat, unordered-containers, utillinux, vector, wai
-     , wai-app-static, warp, yaml
-     }:
-     mkDerivation {
-       pname = "hakyll";
-       version = "4.9.7.0";
-       sha256 = "1zy2328lj7k6j0h7nrcd998sk1hbcl67yzaiysaxyif5c60l05ab";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process random
-         regex-base regex-tdfa resourcet scientific system-filepath tagsoup
-         text time time-locale-compat unordered-containers vector wai
-         wai-app-static warp yaml
-       ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process
-         QuickCheck random regex-base regex-tdfa resourcet scientific
-         system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
-         time time-locale-compat unordered-containers vector wai
-         wai-app-static warp yaml
-       ];
-       testToolDepends = [ utillinux ];
-       homepage = "http://jaspervdj.be/hakyll";
-       description = "A static website compiler library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) utillinux;};
-
-  "hakyll_4_9_8_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , containers, cryptohash, data-default, deepseq, directory
      , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
@@ -87431,7 +84562,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
@@ -88303,30 +85433,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, base, base-compat, directory, either, filepath
-     , hspec, mtl, process, temporary, time, time-locale-compat
-     , transformers
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.2.1.2";
-       sha256 = "02gd8j5f006pv8xkrdyn3s6316ggn8nzqbxq37yxdyh26xx0pb93";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base either filepath mtl process time time-locale-compat
-         transformers
-       ];
-       executableHaskellDepends = [ base base-compat ];
-       testHaskellDepends = [
-         base directory either filepath hspec mtl process temporary
-       ];
-       homepage = "https://github.com/stackbuilders/hapistrano";
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_2_2" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath, hspec
      , mtl, optparse-applicative, path, path-io, process, stm, temporary
      , time, transformers, yaml
@@ -88350,7 +85456,6 @@ self: {
        homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -88496,36 +85601,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.7";
-       sha256 = "01xn6j7pqc0czdflxwkmnj8hm6z0wwjqpjmal4qbcbzy16m86bbc";
-       enableSeparateDataOutput = true;
-       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_8" = callPackage
     ({ mkDerivation, acid-state, aeson, authenticate, base
      , base64-bytestring, boomerang, bytestring, containers
      , data-default, email-validate, filepath, happstack-hsp
@@ -88553,7 +85628,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -88791,23 +85865,6 @@ self: {
      }) {};
 
   "happstack-hsp" = callPackage
-    ({ mkDerivation, base, bytestring, happstack-server, harp, hsp
-     , hsx2hs, mtl, syb, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "happstack-hsp";
-       version = "7.3.7.2";
-       sha256 = "1r4mlbzn1ca3q94ly81alz4741q3v6b3655k0kd5ysahq5yy6p9w";
-       libraryHaskellDepends = [
-         base bytestring happstack-server harp hsp hsx2hs mtl syb text
-         utf8-string
-       ];
-       homepage = "http://www.happstack.com/";
-       description = "Support for using HSP templates in Happstack";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "happstack-hsp_7_3_7_3" = callPackage
     ({ mkDerivation, base, bytestring, happstack-server, harp, hsp
      , hsx2hs, mtl, syb, text, utf8-string
      }:
@@ -88822,7 +85879,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using HSP templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-hstringtemplate" = callPackage
@@ -88863,24 +85919,6 @@ self: {
      }) {};
 
   "happstack-jmacro" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, cereal
-     , digest, happstack-server, jmacro, text, utf8-string
-     , wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "happstack-jmacro";
-       version = "7.0.11";
-       sha256 = "076zvc7kb68nanjrhgx1n37n9n83s862qcb4aa62idqzv52biii9";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring cereal digest happstack-server
-         jmacro text utf8-string wl-pprint-text
-       ];
-       homepage = "http://www.happstack.com/";
-       description = "Support for using JMacro with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "happstack-jmacro_7_0_12" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cereal
      , digest, happstack-server, jmacro, text, utf8-string
      , wl-pprint-text
@@ -88896,7 +85934,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using JMacro with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-lite" = callPackage
@@ -89006,26 +86043,6 @@ self: {
      }) {};
 
   "happstack-server-tls" = callPackage
-    ({ mkDerivation, base, bytestring, extensible-exceptions
-     , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
-     , time, unix
-     }:
-     mkDerivation {
-       pname = "happstack-server-tls";
-       version = "7.1.6.2";
-       sha256 = "1mghs9xsqmzlslry0hl8gv0cwk988lg41zwrw11a5wbii285lgmw";
-       libraryHaskellDepends = [
-         base bytestring extensible-exceptions happstack-server hslogger
-         HsOpenSSL network sendfile time unix
-       ];
-       librarySystemDepends = [ openssl ];
-       homepage = "http://www.happstack.com/";
-       description = "extend happstack-server with https:// support (TLS/SSL)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "happstack-server-tls_7_1_6_3" = callPackage
     ({ mkDerivation, base, bytestring, extensible-exceptions
      , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
      , time, unix
@@ -90726,6 +87743,8 @@ self: {
        pname = "haskell-lsp";
        version = "0.1.0.0";
        sha256 = "135f9xqzlvz01gwdqwxvdmxiwwqvka5j3iv13zczzzzn7vwfnbbd";
+       revision = "1";
+       editedCabalFile = "1xn4nlq0a48fcjngigmvwnadh94nxsvvi56wahghi83zgx28s0k1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91184,23 +88203,6 @@ self: {
      }) {};
 
   "haskell-src-meta" = callPackage
-    ({ mkDerivation, base, haskell-src-exts, pretty, syb
-     , template-haskell, th-orphans
-     }:
-     mkDerivation {
-       pname = "haskell-src-meta";
-       version = "0.7.0.1";
-       sha256 = "0fka53lw1xh6fa77s7bxcyaf888v3dr89yalrg4x8if6j0f5m3j2";
-       revision = "1";
-       editedCabalFile = "0g6jslwrz934hpq8x0b7r50rk2q96raw5a6s4mxanjx36g19rrgp";
-       libraryHaskellDepends = [
-         base haskell-src-exts pretty syb template-haskell th-orphans
-       ];
-       description = "Parse source to template-haskell abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-meta_0_8_0_1" = callPackage
     ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
      , template-haskell, test-framework, test-framework-hunit
      , th-orphans
@@ -91218,7 +88220,6 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-meta-mwotton" = callPackage
@@ -91277,23 +88278,6 @@ self: {
      }) {};
 
   "haskell-tools-ast" = callPackage
-    ({ mkDerivation, base, ghc, mtl, references, template-haskell
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-ast";
-       version = "0.5.0.0";
-       sha256 = "0xzfkmpd6s25kglpffd1rm53za2qlbkb1a8cgqpr9fzzyvmzxy39";
-       libraryHaskellDepends = [
-         base ghc mtl references template-haskell uniplate
-       ];
-       homepage = "https://github.com/nboldi/haskell-tools";
-       description = "Haskell AST for efficient tooling";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-ast_0_8_0_0" = callPackage
     ({ mkDerivation, base, ghc, mtl, references, template-haskell
      , uniplate
      }:
@@ -91365,25 +88349,6 @@ self: {
      }) {};
 
   "haskell-tools-backend-ghc" = callPackage
-    ({ mkDerivation, base, bytestring, containers, ghc
-     , haskell-tools-ast, mtl, references, safe, split, template-haskell
-     , transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-backend-ghc";
-       version = "0.5.0.0";
-       sha256 = "1s1gppknkxrp4blnaw4clcvnbnhkm36zrad2hcgqa382cwiqp3gb";
-       libraryHaskellDepends = [
-         base bytestring containers ghc haskell-tools-ast mtl references
-         safe split template-haskell transformers uniplate
-       ];
-       homepage = "https://github.com/nboldi/haskell-tools";
-       description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-backend-ghc_0_8_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
      , transformers, uniplate
@@ -91403,36 +88368,6 @@ self: {
      }) {};
 
   "haskell-tools-cli" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , directory, filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl
-     , process, references, split, tasty, tasty-hunit, time
-     }:
-     mkDerivation {
-       pname = "haskell-tools-cli";
-       version = "0.5.0.0";
-       sha256 = "051cgl8hy17dnc13y3a2w5l09jc25r2nlhrni7b9qv6h09nnly88";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filepath ghc ghc-paths haskell-tools-ast
-         haskell-tools-prettyprint haskell-tools-refactor mtl references
-         split
-       ];
-       executableHaskellDepends = [ base directory process split ];
-       testHaskellDepends = [
-         base bytestring directory filepath knob tasty tasty-hunit
-       ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring criterion directory filepath knob split time
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Command-line frontend for Haskell-tools Refact";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-cli_0_8_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl
@@ -91463,34 +88398,6 @@ self: {
      }) {};
 
   "haskell-tools-daemon" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl
-     , network, process, references, split, tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "haskell-tools-daemon";
-       version = "0.5.0.0";
-       sha256 = "0nljcpijmiw14amgbmj8zx5kq9637z21s49ldbbxc5ib95nzd3jq";
-       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 process references split
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath ghc 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";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-daemon_0_8_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, Diff
      , directory, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl
@@ -91519,28 +88426,6 @@ self: {
      }) {};
 
   "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.5.0.0";
-       sha256 = "09yw2jqyff607gzrdaijjyp8wp14cclb1mds5cfhbjwrjnlrc1xp";
-       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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-debug_0_8_0_0" = callPackage
     ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
      , haskell-tools-refactor, references, template-haskell
@@ -91564,37 +88449,6 @@ self: {
      }) {};
 
   "haskell-tools-demo" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-refactor, http-types, HUnit, mtl, network
-     , references, tasty, tasty-hunit, transformers, wai, wai-websockets
-     , warp, websockets
-     }:
-     mkDerivation {
-       pname = "haskell-tools-demo";
-       version = "0.5.0.0";
-       sha256 = "1331q9gg8i5rf3iikf7sdb8pv3y9rkd4i33ww14jld55whgd6pab";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor http-types mtl
-         references transformers wai wai-websockets warp websockets
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath HUnit network tasty
-         tasty-hunit websockets
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "A web-based demo for Haskell-tools Refactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-demo_0_8_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -91626,23 +88480,6 @@ self: {
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
-    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
-     , references, split, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-prettyprint";
-       version = "0.5.0.0";
-       sha256 = "0z1na6wm3y8xxpbf1hcp1r3qa73ks4npjkc5vm3kbmg2sifbk426";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast mtl references split uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Pretty printing of Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-prettyprint_0_8_0_0" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, text, uniplate
      }:
@@ -91661,37 +88498,6 @@ self: {
      }) {};
 
   "haskell-tools-refactor" = callPackage
-    ({ 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
-     }:
-     mkDerivation {
-       pname = "haskell-tools-refactor";
-       version = "0.5.0.0";
-       sha256 = "1y2xndnwfx6lc4ih95lans2gmmfpjqslf038fxrd2gv26flw3p21";
-       libraryHaskellDepends = [
-         base Cabal containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl references
-         split template-haskell transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
-         polyparse references split tasty tasty-hunit template-haskell time
-         transformers uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-refactor_0_8_0_0" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -91723,29 +88529,6 @@ self: {
      }) {};
 
   "haskell-tools-rewrite" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, ghc
-     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
-     , tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "haskell-tools-rewrite";
-       version = "0.5.0.0";
-       sha256 = "155w5m0vi3hpf0a1kgwz2s0n7l2smd3h80fsqqjzyvwvf3l7dgdb";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
-         references
-       ];
-       testHaskellDepends = [
-         base directory filepath haskell-tools-ast haskell-tools-prettyprint
-         tasty tasty-hunit
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-rewrite_0_8_0_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
      , tasty, tasty-hunit
@@ -93045,41 +89828,6 @@ self: {
      }) {inherit (pkgs) aspell;};
 
   "hasql" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , bytestring-tree-builder, contravariant, contravariant-extras
-     , criterion, data-default-class, deepseq, dlist, either, hashable
-     , hashtables, loch-th, mtl, placeholders, postgresql-binary
-     , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances
-     , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , uuid, vector
-     }:
-     mkDerivation {
-       pname = "hasql";
-       version = "0.19.16";
-       sha256 = "1h0iw0ms613s995n00b4g533bx4ykc2p52rkbcr8yyg0gmd1j1xj";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-prelude bytestring
-         bytestring-tree-builder contravariant contravariant-extras
-         data-default-class dlist either hashable hashtables loch-th mtl
-         placeholders postgresql-binary postgresql-libpq profunctors
-         scientific semigroups text time transformers uuid vector
-       ];
-       testHaskellDepends = [
-         data-default-class QuickCheck quickcheck-instances rebase rerebase
-         tasty tasty-hunit tasty-quickcheck tasty-smallcheck
-       ];
-       benchmarkHaskellDepends = [
-         base base-prelude bytestring contravariant contravariant-extras
-         criterion data-default-class deepseq dlist either hashable
-         profunctors scientific text time transformers uuid vector
-       ];
-       homepage = "https://github.com/nikita-volkov/hasql";
-       description = "An efficient PostgreSQL driver and a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hasql_0_19_18" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bytestring
      , bytestring-strict-builder, contravariant, contravariant-extras
      , criterion, data-default-class, deepseq, dlist, either, hashable
@@ -93111,7 +89859,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "An efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend" = callPackage
@@ -94422,22 +91169,6 @@ self: {
      }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize" = callPackage
-    ({ mkDerivation, base, bytestring, extensible-exceptions, filepath
-     , hsyslog, mtl, unix
-     }:
-     mkDerivation {
-       pname = "hdaemonize";
-       version = "0.5.3";
-       sha256 = "06311jjqwxrhgis638p03nlziprawjmzpnvn8xpvh4gd8is4r251";
-       libraryHaskellDepends = [
-         base bytestring extensible-exceptions filepath hsyslog mtl unix
-       ];
-       homepage = "http://github.com/greydot/hdaemonize";
-       description = "Library to handle the details of writing daemons for UNIX";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hdaemonize_0_5_4" = callPackage
     ({ mkDerivation, base, bytestring, extensible-exceptions, filepath
      , hsyslog, mtl, unix
      }:
@@ -94451,7 +91182,6 @@ self: {
        homepage = "http://github.com/greydot/hdaemonize";
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdaemonize-buildfix" = callPackage
@@ -96470,19 +93200,6 @@ self: {
      }) {};
 
   "hformat" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, hspec, text }:
-     mkDerivation {
-       pname = "hformat";
-       version = "0.1.0.1";
-       sha256 = "034ds3bcmyri1zfnf2jbv0739mklp1m2pan3x3zg4f6kny8hv0v2";
-       libraryHaskellDepends = [ base base-unicode-symbols text ];
-       testHaskellDepends = [ base base-unicode-symbols hspec text ];
-       homepage = "http://github.com/mvoidex/hformat";
-       description = "Simple Haskell formatting";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hformat_0_3_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec
      , text
      }:
@@ -96497,7 +93214,6 @@ self: {
        homepage = "http://github.com/mvoidex/hformat";
        description = "Simple Haskell formatting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfov" = callPackage
@@ -97031,19 +93747,6 @@ self: {
      }) {systemd = null;};
 
   "hidden-char" = callPackage
-    ({ mkDerivation, base, hspec }:
-     mkDerivation {
-       pname = "hidden-char";
-       version = "0.1.0.0";
-       sha256 = "1dy9sxc9nl1qdcpvgqwv6m54ccbqk31p806gfhiv7whr95zqwpc0";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/rcook/hidden-char#readme";
-       description = "Provides getHiddenChar function";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hidden-char_0_1_0_1" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "hidden-char";
@@ -97054,7 +93757,6 @@ self: {
        homepage = "https://github.com/rcook/hidden-char#readme";
        description = "Provides getHiddenChar function";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hieraclus" = callPackage
@@ -97687,25 +94389,6 @@ self: {
      }) {};
 
   "hint" = callPackage
-    ({ mkDerivation, base, directory, exceptions, extensible-exceptions
-     , filepath, ghc, ghc-paths, HUnit, mtl, random, unix
-     }:
-     mkDerivation {
-       pname = "hint";
-       version = "0.6.0";
-       sha256 = "1f8s8a2a8wgamfvq0pj4ivzc9ywkx86d2milr5djc0wfvq73lgfw";
-       libraryHaskellDepends = [
-         base directory exceptions filepath ghc ghc-paths mtl random unix
-       ];
-       testHaskellDepends = [
-         base directory exceptions extensible-exceptions filepath HUnit
-       ];
-       homepage = "https://github.com/mvdan/hint";
-       description = "Runtime Haskell interpreter (GHC API wrapper)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hint_0_7_0" = callPackage
     ({ mkDerivation, base, directory, exceptions, extensible-exceptions
      , filepath, ghc, ghc-paths, HUnit, mtl, random, unix
      }:
@@ -97722,7 +94405,6 @@ self: {
        homepage = "https://github.com/mvdan/hint";
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hint-server" = callPackage
@@ -98264,27 +94946,6 @@ self: {
      }) {};
 
   "hjsonpointer" = callPackage
-    ({ mkDerivation, aeson, base, hashable, hspec, http-types
-     , QuickCheck, semigroups, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hjsonpointer";
-       version = "1.1.1";
-       sha256 = "0pqdhi36xb4sj25kgrn77rnawg6bzk6snslwyr8nfgfg43j0vcg3";
-       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;
-     }) {};
-
-  "hjsonpointer_1_2_0" = callPackage
     ({ mkDerivation, aeson, base, hashable, hspec, http-types
      , QuickCheck, semigroups, text, unordered-containers, vector
      }:
@@ -98305,37 +94966,9 @@ self: {
        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, 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.5.0.1";
-       sha256 = "18w8wb87hx5vw7vd9bk7d1qxqn3smhbhynj49gx507326a7mrh8s";
-       libraryHaskellDepends = [
-         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 protolude QuickCheck semigroups text
-         unordered-containers vector wai-app-static warp
-       ];
-       homepage = "https://github.com/seagreen/hjsonschema";
-       description = "JSON Schema library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hjsonschema_1_6_3" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-types, pcre-heavy, profunctors, protolude
@@ -98360,7 +94993,6 @@ self: {
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hkdf" = callPackage
@@ -98578,22 +95210,22 @@ self: {
 
   "hledger-iadd" = callPackage
     ({ mkDerivation, base, brick, containers, directory, free
-     , hledger-lib, hspec, megaparsec, microlens, optparse-applicative
-     , QuickCheck, text, text-format, text-zipper, time, transformers
-     , unordered-containers, vector, vty, xdg-basedir
+     , hledger-lib, hspec, megaparsec, microlens, microlens-th
+     , optparse-applicative, QuickCheck, text, text-format, text-zipper
+     , time, transformers, unordered-containers, vector, vty
+     , xdg-basedir
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.2.2";
-       sha256 = "1d12fjqyrj0wy8iq096h8mq2v76j8ihc2d8j1xc5qckw2g29539a";
-       revision = "3";
-       editedCabalFile = "12ghp6d74iyd7h4hjnar7gfz3nal4f9z9lv8rwr5hy8a9xsinbfv";
+       version = "1.2.3";
+       sha256 = "1y2j2aiidp3y92wpx8wmr9r4wibg2cn0lws4s7ljrl6ghh57n4vq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base brick containers directory free hledger-lib megaparsec
-         microlens optparse-applicative text text-format text-zipper time
-         transformers unordered-containers vector vty xdg-basedir
+         microlens microlens-th optparse-applicative text text-format
+         text-zipper time transformers unordered-containers vector vty
+         xdg-basedir
        ];
        executableHaskellDepends = [
          base brick directory free hledger-lib megaparsec microlens
@@ -98848,29 +95480,6 @@ self: {
      }) {inherit (pkgs) libsass;};
 
   "hlint" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
-     , directory, extra, filepath, haskell-src-exts, hscolour, process
-     , refact, transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "hlint";
-       version = "1.9.41";
-       sha256 = "1d1z14gfls87jgq0bm67aq81xmczhlbzjym60qplpx1ajpvrk4id";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         ansi-terminal base cmdargs containers cpphs directory extra
-         filepath haskell-src-exts hscolour process refact transformers
-         uniplate
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ndmitchell/hlint#readme";
-       description = "Source code suggestions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hlint_2_0_9" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, directory, extra, filepath, haskell-src-exts
      , hscolour, process, refact, text, transformers, uniplate
@@ -98892,7 +95501,6 @@ self: {
        homepage = "https://github.com/ndmitchell/hlint#readme";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlogger" = callPackage
@@ -99645,29 +96253,6 @@ self: {
      }) {};
 
   "hoauth2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
-     , http-types, text, unordered-containers, wai, warp
-     }:
-     mkDerivation {
-       pname = "hoauth2";
-       version = "0.5.7";
-       sha256 = "1v5rx50hcnaqnvyg3n671sf7vhbn8jmzay9lxd5pq85qf15nw6bv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-conduit http-types text
-         unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers http-conduit http-types text wai
-         warp
-       ];
-       homepage = "https://github.com/freizl/hoauth2";
-       description = "Haskell OAuth2 authentication client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hoauth2_1_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, exceptions
      , http-conduit, http-types, microlens, text, unordered-containers
      , uri-bytestring, uri-bytestring-aeson, wai, warp
@@ -99689,7 +96274,6 @@ self: {
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hob" = callPackage
@@ -101811,6 +98395,8 @@ self: {
        pname = "hquantlib";
        version = "0.0.4.0";
        sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp";
+       revision = "1";
+       editedCabalFile = "02wp531cckdgj11sjamyafnij0cri7svrg4ddbvak9yki0xpm286";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101937,27 +98523,6 @@ self: {
      }) {};
 
   "hruby" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
-     , ruby, scientific, stm, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hruby";
-       version = "0.3.4.3";
-       sha256 = "1k7rmjdbgxsh8fp77mywhpdd5i10q1c6w58g5aqi5bpy1zi6izm1";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring scientific stm text
-         unordered-containers vector
-       ];
-       librarySystemDepends = [ ruby ];
-       testHaskellDepends = [
-         aeson attoparsec base QuickCheck text vector
-       ];
-       description = "Embed a Ruby intepreter in your Haskell program !";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
-     }) {inherit (pkgs) ruby;};
-
-  "hruby_0_3_4_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
      , ruby, scientific, stm, text, unordered-containers, vector
      }:
@@ -101975,7 +98540,7 @@ self: {
        ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -103874,21 +100439,6 @@ self: {
      }) {};
 
   "hsinstall" = callPackage
-    ({ mkDerivation, base, directory, filepath }:
-     mkDerivation {
-       pname = "hsinstall";
-       version = "1.5";
-       sha256 = "070sbjcb7vdl0dxx5jv1q1aiihb5q5malrdmxb6dcs0gc01qp13p";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       description = "Install Haskell software";
-       license = stdenv.lib.licenses.isc;
-     }) {};
-
-  "hsinstall_1_6" = callPackage
     ({ mkDerivation, base, directory, filepath }:
      mkDerivation {
        pname = "hsinstall";
@@ -103901,7 +100451,6 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "Install Haskell software";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hskeleton" = callPackage
@@ -104072,20 +100621,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) lua5_1;};
 
-  "hslua_0_5_0" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit
-     , lua5_1, QuickCheck, quickcheck-instances, text
+  "hslua_0_6_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, fail
+     , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty
+     , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "hslua";
-       version = "0.5.0";
-       sha256 = "06qp857wicgyl6k0mm4d0vfg5gi56yvx00377r26l176rha0l9vb";
+       version = "0.6.0";
+       sha256 = "1dbnvks02q2hayp9w5n3cj01y52lh7s7z9amhhi4fymrsb1d700l";
        configureFlags = [ "-fsystem-lua" ];
-       libraryHaskellDepends = [ base bytestring ];
+       libraryHaskellDepends = [
+         base bytestring containers exceptions fail mtl text
+       ];
        librarySystemDepends = [ lua5_1 ];
        testHaskellDepends = [
-         base bytestring hspec hspec-contrib HUnit QuickCheck
-         quickcheck-instances text
+         base bytestring containers QuickCheck quickcheck-instances tasty
+         tasty-expected-failure tasty-hunit tasty-quickcheck text
        ];
        description = "A Lua language interpreter embedding in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -104443,29 +100995,6 @@ self: {
      }) {};
 
   "hspec" = callPackage
-    ({ mkDerivation, base, call-stack, directory, hspec-core
-     , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
-     , stringbuilder, transformers
-     }:
-     mkDerivation {
-       pname = "hspec";
-       version = "2.4.3";
-       sha256 = "0dvfmzys2vcgaghmqdmq91j416vn556scdyx96gy0q8l8ziqhwrs";
-       libraryHaskellDepends = [
-         base call-stack hspec-core hspec-discover hspec-expectations HUnit
-         QuickCheck transformers
-       ];
-       testHaskellDepends = [
-         base call-stack directory hspec-core hspec-discover
-         hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
-         transformers
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec_2_4_4" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
@@ -104486,7 +101015,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -104536,34 +101064,6 @@ self: {
      }) {};
 
   "hspec-core" = callPackage
-    ({ mkDerivation, ansi-terminal, array, async, base, call-stack
-     , deepseq, directory, filepath, hspec-expectations, hspec-meta
-     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
-     , silently, temporary, tf-random, time, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-core";
-       version = "2.4.3";
-       sha256 = "0mg1144azwhrvk6224qnn7gbjyqlpq4kbxqns0hh4gwvg4s6z7bw";
-       revision = "1";
-       editedCabalFile = "0shqhsss67lhp2kn7spjn9ngfhlf6cnsrn66s6h1wk4f9k24lf5v";
-       libraryHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv tf-random time transformers
-       ];
-       testHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations hspec-meta HUnit process QuickCheck
-         quickcheck-io random setenv silently temporary tf-random time
-         transformers
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-core_2_4_4" = callPackage
     ({ mkDerivation, ansi-terminal, array, async, base, call-stack
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -104587,26 +101087,9 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-discover" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta }:
-     mkDerivation {
-       pname = "hspec-discover";
-       version = "2.4.3";
-       sha256 = "0kmld0l61xr3qyjx2b2c61n5w1axy53ybbxnvhh404yxj747agda";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [ base directory filepath hspec-meta ];
-       homepage = "http://hspec.github.io/";
-       description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-discover_2_4_4" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
@@ -104620,7 +101103,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations" = callPackage
@@ -104810,32 +101292,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hspec-meta" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq
-     , directory, filepath, hspec-expectations, HUnit, QuickCheck
-     , quickcheck-io, random, setenv, time, transformers
+  "hspec-megaparsec_1_0_0" = callPackage
+    ({ mkDerivation, base, containers, hspec, hspec-expectations
+     , megaparsec
      }:
      mkDerivation {
-       pname = "hspec-meta";
-       version = "2.3.2";
-       sha256 = "12waaw3g8v5cm4s6vrcld31k235ns2j0an9lxz6zshzl68zvmcar";
-       isLibrary = true;
-       isExecutable = true;
+       pname = "hspec-megaparsec";
+       version = "1.0.0";
+       sha256 = "1dafrbzjm7rzwvcpjpk3bsg7bd111xfij94n17sh8wfykzhim5hl";
        libraryHaskellDepends = [
-         ansi-terminal async base call-stack deepseq hspec-expectations
-         HUnit QuickCheck quickcheck-io random setenv time transformers
+         base containers hspec-expectations megaparsec
        ];
-       executableHaskellDepends = [
-         ansi-terminal async base call-stack deepseq directory filepath
-         hspec-expectations HUnit QuickCheck quickcheck-io random setenv
-         time transformers
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "A version of Hspec which is used to test Hspec itself";
-       license = stdenv.lib.licenses.mit;
+       testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
+       homepage = "https://github.com/mrkkrp/hspec-megaparsec";
+       description = "Utility functions for testing Megaparsec parsers with Hspec";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-meta_2_4_4" = callPackage
+  "hspec-meta" = callPackage
     ({ mkDerivation, ansi-terminal, array, async, base, call-stack
      , deepseq, directory, filepath, hspec-expectations, HUnit
      , QuickCheck, quickcheck-io, random, setenv, time, transformers
@@ -104859,7 +101334,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A version of Hspec which is used to test Hspec itself";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-monad-control" = callPackage
@@ -105952,20 +102426,6 @@ self: {
      }) {};
 
   "hsyslog" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck }:
-     mkDerivation {
-       pname = "hsyslog";
-       version = "4";
-       sha256 = "0j9s002vly1c43m7ik79zsf6az7fadgaz0cf4msid3xzdnkzrm9k";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ base bytestring QuickCheck ];
-       homepage = "http://github.com/peti/hsyslog";
-       description = "FFI interface to syslog(3) from POSIX.1-2001";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "hsyslog_5_0_1" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, doctest }:
      mkDerivation {
        pname = "hsyslog";
@@ -105979,7 +102439,6 @@ self: {
        homepage = "http://github.com/peti/hsyslog";
        description = "FFI interface to syslog(3) from POSIX.1-2001";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -106015,25 +102474,6 @@ self: {
      }) {com_err = null; zephyr = null;};
 
   "htaglib" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, hspec
-     , taglib, text
-     }:
-     mkDerivation {
-       pname = "htaglib";
-       version = "1.0.4";
-       sha256 = "19s01g8inwmzbvbs1ph4rg2kaqipj7jc9lkg2y9y28gpdrgw48qb";
-       revision = "1";
-       editedCabalFile = "0z0jzhmrm77b3rl1h89wfgbwjg374n1mda73z7qrrdfc7ky99dmy";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base bytestring text ];
-       librarySystemDepends = [ taglib ];
-       testHaskellDepends = [ base directory filepath hspec ];
-       homepage = "https://github.com/mrkkrp/htaglib";
-       description = "Bindings to TagLib, audio meta-data library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) taglib;};
-
-  "htaglib_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, hspec
      , taglib, text, transformers
      }:
@@ -106048,7 +102488,6 @@ self: {
        homepage = "https://github.com/mrkkrp/htaglib";
        description = "Bindings to TagLib, audio meta-data library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) taglib;};
 
   "htags" = callPackage
@@ -107757,18 +104196,6 @@ self: {
      }) {};
 
   "hunit-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
-     mkDerivation {
-       pname = "hunit-dejafu";
-       version = "0.3.0.3";
-       sha256 = "085i2k25vkh8lplnp1qgvp573v6dfcyx4rwbwz29dqhisrmzvbf9";
-       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the HUnit test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hunit-dejafu_0_6_0_0" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
@@ -107778,7 +104205,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-gui" = callPackage
@@ -108114,29 +104540,6 @@ self: {
      }) {};
 
   "hw-balancedparens" = callPackage
-    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
-     , hw-prim, hw-rankselect-base, QuickCheck, vector
-     }:
-     mkDerivation {
-       pname = "hw-balancedparens";
-       version = "0.1.0.0";
-       sha256 = "1zk9h51hmzckh1szjzlgx91mhlv4cn9wyqlk51agm6pmv1gc2vn5";
-       libraryHaskellDepends = [
-         base hw-bits hw-excess hw-prim hw-rankselect-base vector
-       ];
-       testHaskellDepends = [
-         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
-       ];
-       benchmarkHaskellDepends = [
-         base criterion hw-bits hw-prim vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
-       description = "Balanced parentheses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-balancedparens_0_1_0_2" = callPackage
     ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
      , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector
      }:
@@ -108161,27 +104564,6 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
-     , hw-prim, hw-string-parse, QuickCheck, safe, vector
-     }:
-     mkDerivation {
-       pname = "hw-bits";
-       version = "0.5.0.0";
-       sha256 = "0pr31aarxaaszknzljgax51m3550nrf49pvfp175d4c2vw1jcks1";
-       libraryHaskellDepends = [
-         base bytestring hw-int hw-prim hw-string-parse safe vector
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hw-prim QuickCheck vector
-       ];
-       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
-       homepage = "http://github.com/haskell-works/hw-bits#readme";
-       description = "Bit manipulation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-bits_0_5_0_2" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
      , hw-prim, hw-string-parse, QuickCheck, safe, vector
      }:
@@ -108203,30 +104585,6 @@ self: {
      }) {};
 
   "hw-conduit" = callPackage
-    ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
-     , hw-bits, mmap, resourcet, vector, word8
-     }:
-     mkDerivation {
-       pname = "hw-conduit";
-       version = "0.1.0.0";
-       sha256 = "06s906cs8glr4yfm9k1apl5rgkgrb9fzlhrifi1b8rjkbj37zg18";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bytestring conduit hw-bits resourcet word8
-       ];
-       executableHaskellDepends = [ base criterion ];
-       testHaskellDepends = [ base bytestring hspec ];
-       benchmarkHaskellDepends = [
-         base bytestring conduit criterion mmap vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-conduit#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-conduit_0_2_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
      , mmap, time, vector, word8
      }:
@@ -108280,26 +104638,6 @@ self: {
      }) {};
 
   "hw-excess" = callPackage
-    ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
-     , QuickCheck, safe, vector
-     }:
-     mkDerivation {
-       pname = "hw-excess";
-       version = "0.1.0.0";
-       sha256 = "1fs22xphm2kpbnmq0nc52k11ss9rxldaz6qy3zqn1b60r57b9x2d";
-       libraryHaskellDepends = [
-         base hw-bits hw-prim hw-rankselect-base safe vector
-       ];
-       testHaskellDepends = [
-         base hspec hw-bits hw-prim QuickCheck vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-excess#readme";
-       description = "Excess";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-excess_0_1_0_1" = callPackage
     ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
      , QuickCheck, safe, vector
      }:
@@ -108549,22 +104887,6 @@ self: {
      }) {};
 
   "hw-parser" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, hw-prim
-     , mono-traversable, text
-     }:
-     mkDerivation {
-       pname = "hw-parser";
-       version = "0.0.0.1";
-       sha256 = "09c02ajw5nx3mmydyi82464fkd6z8xf6a4z63alwmks16jyda24v";
-       libraryHaskellDepends = [
-         attoparsec base bytestring hw-prim mono-traversable text
-       ];
-       homepage = "http://github.com/haskell-works/hw-parser#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-parser_0_0_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hw-prim
      , mono-traversable, text
      }:
@@ -108578,7 +104900,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-parser#readme";
        description = "Simple parser support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim" = callPackage
@@ -108600,8 +104921,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.8.0.0";
-       sha256 = "1ddaxfv10hqfpcp9majy5c9wccl1ikq9l0dh49sqhkd4fxxl71fv";
+       version = "0.8.0.1";
+       sha256 = "1m05w2x5nmja0k1li90vx9ifzs11h8xxbpi25rsk4zalghy8gn6g";
        libraryHaskellDepends = [
          base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector
        ];
@@ -108614,14 +104935,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hw-rankselect_0_8_0_1" = callPackage
+  "hw-rankselect_0_8_0_2" = callPackage
     ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
      , hw-rankselect-base, QuickCheck, vector
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.8.0.1";
-       sha256 = "1m05w2x5nmja0k1li90vx9ifzs11h8xxbpi25rsk4zalghy8gn6g";
+       version = "0.8.0.2";
+       sha256 = "0b9ki066c5nypy81dqyj91ghj00p1y5glhg1jpf267q6r0mjkwcm";
        libraryHaskellDepends = [
          base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector
        ];
@@ -109114,8 +105435,8 @@ self: {
        pname = "hxt-pickle-utils";
        version = "0.1.0.3";
        sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx";
-       revision = "1";
-       editedCabalFile = "16dh3pj4bjalvahiwqcfxx3qasr3kqqy9bq7jfhp8hnn2fij0nvf";
+       revision = "2";
+       editedCabalFile = "109jh2iibhnllkwpqpiyfwdqjn3v06ap58fhyzikjdqzz0rzwgh5";
        libraryHaskellDepends = [ base hxt mtl ];
        homepage = "https://github.com/silkapp/hxt-pickle-utils";
        description = "Utility functions for using HXT picklers";
@@ -109794,27 +106115,6 @@ self: {
      }) {};
 
   "hyphenation" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, doctest
-     , filepath, unordered-containers, zlib
-     }:
-     mkDerivation {
-       pname = "hyphenation";
-       version = "0.6";
-       sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers unordered-containers zlib
-       ];
-       testHaskellDepends = [
-         base containers directory doctest filepath unordered-containers
-       ];
-       homepage = "http://github.com/ekmett/hyphenation";
-       description = "Configurable Knuth-Liang hyphenation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hyphenation_0_7" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers
      , doctest, unordered-containers, zlib
      }:
@@ -110952,23 +107252,6 @@ self: {
      }) {};
 
   "ilist" = callPackage
-    ({ mkDerivation, base, criterion, hspec, lens, transformers, vector
-     }:
-     mkDerivation {
-       pname = "ilist";
-       version = "0.2.0.0";
-       sha256 = "1vrww0w956rjyh6jrjfnbqbdd12hadvmvxx3r8v4n6p00i4apgzz";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec transformers ];
-       benchmarkHaskellDepends = [
-         base criterion lens transformers vector
-       ];
-       homepage = "http://github.com/aelve/ilist";
-       description = "Optimised list functions for doing index-related things";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ilist_0_3_1_0" = callPackage
     ({ mkDerivation, base, criterion, hspec, lens, loop, transformers
      , vector
      }:
@@ -110984,7 +107267,6 @@ self: {
        homepage = "http://github.com/aelve/ilist";
        description = "Optimised list functions for doing index-related things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "illuminate" = callPackage
@@ -111190,40 +107472,6 @@ self: {
      }) {};
 
   "imm" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
-     , blaze-html, blaze-markup, bytestring, case-insensitive
-     , chunked-data, comonad, conduit, conduit-combinators, connection
-     , containers, directory, dyre, fast-logger, filepath, free
-     , hashable, HaskellNet, HaskellNet-SSL, http-client
-     , http-client-tls, http-types, mime-mail, mono-traversable
-     , monoid-subclasses, network, opml-conduit, optparse-applicative
-     , rainbow, rainbox, rss-conduit, safe-exceptions, tagged, text
-     , time, timerep, tls, transformers, uri-bytestring, xml
-     , xml-conduit
-     }:
-     mkDerivation {
-       pname = "imm";
-       version = "1.1.0.0";
-       sha256 = "0mizq3b9n7qnb0g41dcp3x9ym91jylc40l470wn6sxbxrbm3g12j";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup
-         bytestring case-insensitive chunked-data comonad conduit
-         conduit-combinators connection containers directory dyre
-         fast-logger filepath free hashable HaskellNet HaskellNet-SSL
-         http-client http-client-tls http-types mime-mail mono-traversable
-         monoid-subclasses network opml-conduit optparse-applicative rainbow
-         rainbox rss-conduit safe-exceptions tagged text time timerep tls
-         transformers uri-bytestring xml xml-conduit
-       ];
-       executableHaskellDepends = [ base free ];
-       homepage = "https://github.com/k0ral/imm";
-       description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
-       license = "unknown";
-     }) {};
-
-  "imm_1_2_0_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
      , blaze-html, blaze-markup, bytestring, case-insensitive
      , chunked-data, comonad, conduit, conduit-combinators, connection
@@ -111255,7 +107503,6 @@ self: {
        homepage = "https://github.com/k0ral/imm";
        description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -111698,18 +107945,6 @@ self: {
      }) {};
 
   "indentation-core" = callPackage
-    ({ mkDerivation, base, mtl }:
-     mkDerivation {
-       pname = "indentation-core";
-       version = "0.0";
-       sha256 = "1nbqr8vac93cbxfaswcq21izpp8n0s1mwp8c13yvz6nfaqkz1ljg";
-       libraryHaskellDepends = [ base mtl ];
-       homepage = "https://bitbucket.org/adamsmd/indentation";
-       description = "Indentation sensitive parsing combinators core library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "indentation-core_0_0_0_1" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "indentation-core";
@@ -111719,25 +107954,9 @@ self: {
        homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators core library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentation-parsec" = callPackage
-    ({ mkDerivation, base, indentation-core, mtl, parsec, tasty
-     , tasty-hunit
-     }:
-     mkDerivation {
-       pname = "indentation-parsec";
-       version = "0.0";
-       sha256 = "0z6dklvb5nyyi9wabwbblc508f7s0w6srsg0wkygzmdj8y7bqlji";
-       libraryHaskellDepends = [ base indentation-core mtl parsec ];
-       testHaskellDepends = [ base parsec tasty tasty-hunit ];
-       homepage = "https://bitbucket.org/adamsmd/indentation";
-       description = "Indentation sensitive parsing combinators for Parsec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "indentation-parsec_0_0_0_1" = callPackage
     ({ mkDerivation, base, indentation-core, mtl, parsec, tasty
      , tasty-hunit
      }:
@@ -111750,7 +107969,6 @@ self: {
        homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentation-trifecta" = callPackage
@@ -112295,33 +108513,6 @@ self: {
      }) {};
 
   "inline-java" = callPackage
-    ({ mkDerivation, base, binary, bytestring, Cabal, containers
-     , directory, distributed-closure, filepath, ghc-heap-view, hspec
-     , inline-c, jni, jvm, language-java, process, singletons, syb
-     , template-haskell, temporary, text, thread-local-storage, vector
-     }:
-     mkDerivation {
-       pname = "inline-java";
-       version = "0.6.1";
-       sha256 = "0i90rrqsv9sr55cd81d6a9kswfnkyblf7ln56vwi57c38cxp68pp";
-       revision = "1";
-       editedCabalFile = "1kz51n1fbj9zv2109ciyd9myralrlbr2ym0c4kkgbdjkivp9lxy8";
-       libraryHaskellDepends = [
-         base binary bytestring Cabal containers directory
-         distributed-closure filepath ghc-heap-view inline-c jni jvm
-         language-java process singletons syb template-haskell temporary
-         text thread-local-storage vector
-       ];
-       testHaskellDepends = [
-         base bytestring hspec jni jvm singletons text
-       ];
-       homepage = "http://github.com/tweag/inline-java#readme";
-       description = "Java interop via inline Java code in Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "inline-java_0_6_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, containers
      , directory, distributed-closure, filepath, ghc-heap-view, hspec
      , inline-c, jni, jvm, language-java, process, singletons, syb
@@ -112679,28 +108870,6 @@ self: {
      }) {};
 
   "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.0.1";
-       sha256 = "0k3q79yjwln3fk0m1mwsxc3rypysx6ayl13xqgm254dip273yi8g";
-       revision = "1";
-       editedCabalFile = "1kk94f88qnmvwya9afpr4gqygvg02qc8m571hvd6fmwgsfvphv1y";
-       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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "integer-logarithms_1_0_2" = callPackage
     ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
      , smallcheck, tasty, tasty-hunit, tasty-quickcheck
      , tasty-smallcheck
@@ -112943,25 +109112,6 @@ self: {
      }) {};
 
   "interpolate" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
-     , QuickCheck, quickcheck-instances, template-haskell, text
-     }:
-     mkDerivation {
-       pname = "interpolate";
-       version = "0.1.0";
-       sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id";
-       revision = "1";
-       editedCabalFile = "0ld319k9phmp6dp8m87bdhqp5519dxggf8r2a5z8hkznyjpa131j";
-       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
-       testHaskellDepends = [
-         base bytestring haskell-src-meta hspec QuickCheck
-         quickcheck-instances template-haskell text
-       ];
-       description = "String interpolation done right";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "interpolate_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
      , QuickCheck, quickcheck-instances, template-haskell, text
      }:
@@ -112977,7 +109127,6 @@ self: {
        homepage = "https://github.com/sol/interpolate#readme";
        description = "String interpolation done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpolatedstring-perl6" = callPackage
@@ -113093,18 +109242,6 @@ self: {
      }) {};
 
   "intervals" = callPackage
-    ({ mkDerivation, array, base, distributive, ghc-prim }:
-     mkDerivation {
-       pname = "intervals";
-       version = "0.7.2";
-       sha256 = "0a7ysncmwkqh7q1d8y1h4lb5373k93xdly3bqrjb7ihazmylml0d";
-       libraryHaskellDepends = [ array base distributive ghc-prim ];
-       homepage = "http://github.com/ekmett/intervals";
-       description = "Interval Arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "intervals_0_8" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
      , distributive, doctest, filepath, ghc-prim, QuickCheck
      , template-haskell
@@ -113121,7 +109258,6 @@ self: {
        homepage = "http://github.com/ekmett/intervals";
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intricacy" = callPackage
@@ -113149,32 +109285,6 @@ self: {
      }) {};
 
   "intro" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, bytestring, containers
-     , deepseq, dlist, extra, hashable, lens, mtl, safe
-     , string-conversions, tagged, text, transformers
-     , unordered-containers, writer-cps-mtl
-     }:
-     mkDerivation {
-       pname = "intro";
-       version = "0.1.0.10";
-       sha256 = "1na12wh1fz0zjd6ibz5piq9bhj50q827mskcs88fn47zsrxnr30w";
-       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 = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "intro_0_3_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytestring, containers
      , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck, safe
      , text, transformers, unordered-containers, writer-cps-mtl
@@ -113487,8 +109597,8 @@ self: {
      }:
      mkDerivation {
        pname = "io-streams";
-       version = "1.3.6.1";
-       sha256 = "0a1nr29qg5z0fqjnivzzy69bfxv7r9aw9yf2i53alcmiqjmx9p18";
+       version = "1.4.0.0";
+       sha256 = "03lk73smhqvw6lxp4j0kxlkd87vaxaz2avpy7k533fxv1jk3sfbd";
        configureFlags = [ "-fnointeractivetests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -113937,25 +110047,6 @@ self: {
      }) {};
 
   "irc-client" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
-     , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
-     , time, tls, transformers, x509, x509-store, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-client";
-       version = "0.4.4.1";
-       sha256 = "1xpccg4bqflrf039953qjb721m38w8x6qn75x1xr7d4y8b6hbl9q";
-       libraryHaskellDepends = [
-         base bytestring conduit connection irc-conduit irc-ctcp
-         network-conduit-tls old-locale stm stm-conduit text time tls
-         transformers x509 x509-store x509-validation
-       ];
-       homepage = "https://github.com/barrucadu/irc-client";
-       description = "An IRC client library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-client_0_4_4_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
      , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
      , time, tls, transformers, x509, x509-store, x509-validation
@@ -113972,7 +110063,6 @@ self: {
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-colors" = callPackage
@@ -114439,26 +110529,6 @@ self: {
      }) {};
 
   "isotope" = callPackage
-    ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck
-     , template-haskell, th-lift
-     }:
-     mkDerivation {
-       pname = "isotope";
-       version = "0.4.0.0";
-       sha256 = "19wy290r1n7xkpr3qpw4samgbrnpdv5iljfx3cspix27gfmw0384";
-       libraryHaskellDepends = [
-         base containers megaparsec template-haskell th-lift
-       ];
-       testHaskellDepends = [
-         base containers hspec megaparsec QuickCheck
-       ];
-       homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md";
-       description = "Isotopic masses and relative abundances";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "isotope_0_5_0_1" = callPackage
     ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck
      , template-haskell, th-lift
      }:
@@ -115685,24 +111755,6 @@ self: {
      }) {};
 
   "jni" = callPackage
-    ({ mkDerivation, base, bytestring, containers, inline-c, jdk
-     , singletons, thread-local-storage
-     }:
-     mkDerivation {
-       pname = "jni";
-       version = "0.2.3";
-       sha256 = "0169fb4zd1kbjnkwc6qx43wcmg23h0j046ih45a2a1yy4g4cyj5s";
-       libraryHaskellDepends = [
-         base bytestring containers inline-c singletons thread-local-storage
-       ];
-       librarySystemDepends = [ jdk ];
-       homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
-       description = "Complete JNI raw bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) jdk;};
-
-  "jni_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, choice, containers, cpphs
      , inline-c, jdk, singletons, thread-local-storage
      }:
@@ -115822,38 +111874,6 @@ self: {
      }) {};
 
   "jose" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , byteable, bytestring, containers, cryptonite, hspec, lens, memory
-     , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
-     , safe, tasty, tasty-hspec, tasty-quickcheck, template-haskell
-     , text, time, unordered-containers, vector, x509
-     }:
-     mkDerivation {
-       pname = "jose";
-       version = "0.5.0.4";
-       sha256 = "164cgpz7a9yyd861y43ljw7wkjajvp7ylli4j2qyq4947v7ibxg9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring byteable bytestring
-         containers cryptonite lens memory monad-time mtl network-uri
-         QuickCheck quickcheck-instances safe template-haskell text time
-         unordered-containers vector x509
-       ];
-       executableHaskellDepends = [ aeson base bytestring lens mtl ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring byteable bytestring
-         containers cryptonite hspec lens memory monad-time mtl network-uri
-         QuickCheck quickcheck-instances safe tasty tasty-hspec
-         tasty-quickcheck template-haskell text time unordered-containers
-         vector x509
-       ];
-       homepage = "https://github.com/frasertweedale/hs-jose";
-       description = "Javascript Object Signing and Encryption and JSON Web Token library";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "jose_0_6_0_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, concise, containers, cryptonite, hspec, lens, memory
      , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
@@ -115883,7 +111903,6 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-jose";
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose-jwt" = callPackage
@@ -115949,21 +111968,6 @@ self: {
      }) {};
 
   "js-jquery" = callPackage
-    ({ mkDerivation, base, HTTP }:
-     mkDerivation {
-       pname = "js-jquery";
-       version = "3.1.1";
-       sha256 = "011adwcf0rx57ld6c75m9rw90zd2qj0d4pf7rmdnf7fp5gbnfbyp";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base HTTP ];
-       doCheck = false;
-       homepage = "https://github.com/ndmitchell/js-jquery#readme";
-       description = "Obtain minified jQuery code";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "js-jquery_3_2_1" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -115976,7 +111980,6 @@ self: {
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle" = callPackage
@@ -117185,24 +113188,6 @@ self: {
      }) {};
 
   "jvm" = callPackage
-    ({ mkDerivation, base, bytestring, distributed-closure, hspec, jni
-     , singletons, text, vector
-     }:
-     mkDerivation {
-       pname = "jvm";
-       version = "0.1.2";
-       sha256 = "0di1gv1c3zj06cr423sdnl9m5m6lc0xw37kfm75dxqsip54gq80d";
-       libraryHaskellDepends = [
-         base bytestring distributed-closure jni singletons text vector
-       ];
-       testHaskellDepends = [ base bytestring hspec text ];
-       homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
-       description = "Call JVM methods from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "jvm_0_2_2" = callPackage
     ({ mkDerivation, base, bytestring, choice, criterion
      , distributed-closure, hspec, jni, singletons, template-haskell
      , text, vector
@@ -117240,26 +113225,6 @@ self: {
      }) {};
 
   "jvm-streaming" = callPackage
-    ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni
-     , jvm, singletons, streaming
-     }:
-     mkDerivation {
-       pname = "jvm-streaming";
-       version = "0.1";
-       sha256 = "0mnjffsnv40aplbvm9wgwd0j75377iwg72g3pgf2rp2jqmhq8y25";
-       revision = "3";
-       editedCabalFile = "1hfjr9q08kvwdj828pl41zfig0c721sj1ni8p01rb9ck9pv97fap";
-       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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "jvm-streaming_0_2" = callPackage
     ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni
      , jvm, singletons, streaming
      }:
@@ -117723,42 +113688,6 @@ self: {
      }) {};
 
   "katip" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , bytestring, containers, criterion, deepseq, directory, either
-     , exceptions, hostname, microlens, microlens-th, monad-control, mtl
-     , old-locale, quickcheck-instances, regex-tdfa, resourcet
-     , semigroups, string-conv, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time
-     , time-locale-compat, transformers, transformers-base
-     , transformers-compat, unagi-chan, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "katip";
-       version = "0.3.1.5";
-       sha256 = "1mnrs6ji7bqh9lrb9bzcxb4c1a60mzf8xkzgk6yi8ijxxv5ch8zn";
-       libraryHaskellDepends = [
-         aeson async auto-update base bytestring containers either
-         exceptions hostname microlens microlens-th monad-control mtl
-         old-locale resourcet semigroups string-conv template-haskell text
-         time transformers transformers-base transformers-compat unagi-chan
-         unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory microlens quickcheck-instances
-         regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
-         template-haskell text time time-locale-compat unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         aeson async base blaze-builder criterion deepseq text time
-         transformers unix
-       ];
-       homepage = "https://github.com/Soostone/katip";
-       description = "A structured logging framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "katip_0_5_0_0" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , bytestring, containers, criterion, deepseq, directory, either
      , filepath, hostname, microlens, microlens-th, monad-control, mtl
@@ -117796,37 +113725,6 @@ self: {
      }) {};
 
   "katip-elasticsearch" = callPackage
-    ({ mkDerivation, aeson, async, base, bloodhound, containers
-     , criterion, deepseq, enclosed-exceptions, exceptions, http-client
-     , http-types, katip, lens, lens-aeson, quickcheck-instances, retry
-     , rng-utils, scientific, stm, stm-chans, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, unordered-containers
-     , uuid, vector
-     }:
-     mkDerivation {
-       pname = "katip-elasticsearch";
-       version = "0.3.1.0";
-       sha256 = "162ikrqpk0i8zh5gw3isc1lflg4a4bsqk3ci2rpirll0wf1dqgz9";
-       libraryHaskellDepends = [
-         aeson async base bloodhound enclosed-exceptions exceptions
-         http-client http-types katip retry scientific stm stm-chans text
-         time transformers unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson base bloodhound containers http-client http-types katip lens
-         lens-aeson quickcheck-instances scientific stm tasty tasty-hunit
-         tasty-quickcheck text time transformers unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         aeson base bloodhound criterion deepseq rng-utils text
-         unordered-containers uuid
-       ];
-       description = "ElasticSearch scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "katip-elasticsearch_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, bytestring
      , containers, criterion, deepseq, enclosed-exceptions, exceptions
      , http-client, http-types, katip, lens, lens-aeson
@@ -117909,29 +113807,6 @@ self: {
      }) {};
 
   "kawhi" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
-     , http-conduit, http-types, mtl, safe, scientific, smallcheck
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
-     }:
-     mkDerivation {
-       pname = "kawhi";
-       version = "0.2.3";
-       sha256 = "0in0z9hsl1kkgzx0ifrna6ddmxj4r138icf1liwl7awbiv4jn9n2";
-       libraryHaskellDepends = [
-         aeson base bytestring exceptions http-client http-conduit
-         http-types mtl safe scientific text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring exceptions http-client http-types mtl
-         scientific smallcheck tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text
-       ];
-       homepage = "https://github.com/thunky-monk/kawhi";
-       description = "stats.NBA.com library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "kawhi_0_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
      , http-conduit, http-types, mtl, safe, scientific, smallcheck
      , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
@@ -117952,7 +113827,6 @@ self: {
        homepage = "https://github.com/thunky-monk/kawhi";
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kazura-queue" = callPackage
@@ -120246,24 +116120,6 @@ self: {
      }) {};
 
   "language-c" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , directory, filepath, happy, pretty, process, syb
-     }:
-     mkDerivation {
-       pname = "language-c";
-       version = "0.5.0";
-       sha256 = "08i2bl7jmmymn2sldzlbz6ig7lx3wfwhlpadzibs3fx72z08pmc6";
-       libraryHaskellDepends = [
-         array base bytestring containers directory filepath pretty process
-         syb
-       ];
-       libraryToolDepends = [ alex happy ];
-       homepage = "http://visq.github.io/language-c/";
-       description = "Analysis and generation of C code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-c_0_6_1" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , directory, filepath, happy, pretty, process, syb
      }:
@@ -120280,7 +116136,6 @@ self: {
        homepage = "http://visq.github.io/language-c/";
        description = "Analysis and generation of C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c-comments" = callPackage
@@ -120325,10 +116180,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-quote";
-       version = "0.11.7.3";
-       sha256 = "0lj16igd9m3kgq41bbrs0f73m4vrys43787bizay6in1sxaxq6wf";
-       revision = "1";
-       editedCabalFile = "0p0ljjpgpfnj7f83cqx1pgqrdn5fkwfcca38qxv387nbq0b8zd1k";
+       version = "0.12";
+       sha256 = "14wxbis9zm3zlc3q430is50nk5k2hqx4lracwm2ca7qlg854h2hj";
        libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -120339,7 +116192,7 @@ self: {
          base bytestring HUnit mainland-pretty srcloc symbol test-framework
          test-framework-hunit
        ];
-       homepage = "http://www.drexel.edu/~mainland/";
+       homepage = "https://github.com/mainland/language-c-quote";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120571,25 +116424,6 @@ self: {
      }) {};
 
   "language-glsl" = callPackage
-    ({ mkDerivation, base, HUnit, parsec, prettyclass, test-framework
-     , test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "language-glsl";
-       version = "0.2.0";
-       sha256 = "1wmfzif1cc3a8sls3swms9x54hm9ic8y301zav6fg4mr7xa4hqr3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base parsec prettyclass ];
-       executableHaskellDepends = [ base parsec prettyclass ];
-       testHaskellDepends = [
-         base HUnit parsec prettyclass test-framework test-framework-hunit
-       ];
-       description = "GLSL abstract syntax tree, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-glsl_0_2_1" = callPackage
     ({ mkDerivation, base, HUnit, parsec, prettyclass, test-framework
      , test-framework-hunit
      }:
@@ -120606,7 +116440,6 @@ self: {
        ];
        description = "GLSL abstract syntax tree, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-go" = callPackage
@@ -120961,51 +116794,6 @@ self: {
      }) {};
 
   "language-puppet" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, directory, either, exceptions, filecache, formatting
-     , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec
-     , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec
-     , memory, mtl, operational, optparse-applicative, parallel-io
-     , parsec, pcre-utils, process, random, regex-pcre-builtin
-     , scientific, semigroups, servant, servant-client, split, stm
-     , strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "language-puppet";
-       version = "1.3.7";
-       sha256 = "1vjmb41hh47gmqv3g7f28rkb3lj8hqpdc7pvs6qa9f6pmqi98m4v";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptonite directory either exceptions
-         filecache formatting hashable hruby hslogger hspec http-api-data
-         http-client lens lens-aeson megaparsec memory mtl operational
-         parsec pcre-utils process random regex-pcre-builtin scientific
-         semigroups servant servant-client split stm strict-base-types text
-         time transformers unix unordered-containers vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers Glob hslogger http-client lens
-         megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin
-         servant-client strict-base-types text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
-         megaparsec mtl scientific strict-base-types temporary text
-         transformers unix unordered-containers vector
-       ];
-       homepage = "http://lpuppet.banquise.net/";
-       description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
-     }) {};
-
-  "language-puppet_1_3_8_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, either, exceptions, filecache, formatting
@@ -121047,7 +116835,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -122276,46 +118064,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , comonad, containers, contravariant, criterion, deepseq, directory
-     , distributive, doctest, exceptions, filepath, free
-     , generic-deriving, ghc-prim, hashable, hlint, HUnit
-     , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck
-     , reflection, semigroupoids, semigroups, simple-reflect, tagged
-     , template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text, transformers
-     , transformers-compat, unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.15.1";
-       sha256 = "19myn50qwr1f8g3cx4fvzajln428qb8iwyi4qa9p2y5rn56adyjw";
-       revision = "4";
-       editedCabalFile = "0f8mn6zgfclibdgy9v1ga550ysmh8biwbyvsjhi93grh5lddwmg0";
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring comonad containers
-         contravariant distributive exceptions filepath free ghc-prim
-         hashable kan-extensions mtl parallel profunctors reflection
-         semigroupoids semigroups tagged template-haskell text transformers
-         transformers-compat unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory doctest filepath
-         generic-deriving hlint HUnit mtl nats parallel QuickCheck
-         semigroups simple-reflect test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th text transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring comonad containers criterion deepseq
-         generic-deriving transformers unordered-containers vector
-       ];
-       homepage = "http://github.com/ekmett/lens/";
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens_4_15_3" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , Cabal, cabal-doctest, comonad, containers, contravariant
      , criterion, deepseq, directory, distributive, doctest, exceptions
@@ -122354,7 +118102,6 @@ self: {
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -123575,28 +119322,6 @@ self: {
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
-    ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
-     , pipes-safe, systemd, text, transformers, uniplate
-     , unix-bytestring, unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "libsystemd-journal";
-       version = "1.4.1";
-       sha256 = "06rsiqlal0617lr8cnqqci9gf8plhas17kjm940vpwkcpakx28vd";
-       revision = "1";
-       editedCabalFile = "0g4km425r803skih1a2r1wsmmhkw7nqr9sl080m82g8pyck5wxsw";
-       libraryHaskellDepends = [
-         base bytestring hashable hsyslog pipes pipes-safe text transformers
-         uniplate unix-bytestring unordered-containers uuid vector
-       ];
-       libraryPkgconfigDepends = [ systemd ];
-       homepage = "http://github.com/ocharles/libsystemd-journal";
-       description = "Haskell bindings to libsystemd-journal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {systemd = null;};
-
-  "libsystemd-journal_1_4_2" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
      , pipes-safe, systemd, text, transformers, uniplate
      , unix-bytestring, unordered-containers, uuid, vector
@@ -123747,27 +119472,6 @@ self: {
      }) {nvpair = null; inherit (pkgs) zfs;};
 
   "licensor" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers
-     , directory, http-conduit, process
-     }:
-     mkDerivation {
-       pname = "licensor";
-       version = "0.2.0";
-       sha256 = "1rbi61ficz67mifrjha02ry80s91nr6r1mzm9cfsbvz94ny4rv47";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring Cabal containers directory http-conduit process
-       ];
-       executableHaskellDepends = [
-         base Cabal cmdargs containers directory
-       ];
-       homepage = "https://github.com/jpvillaisaza/licensor";
-       description = "A license compatibility helper";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "licensor_0_2_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers
      , directory, http-conduit, process
      }:
@@ -123786,7 +119490,6 @@ self: {
        homepage = "https://github.com/jpvillaisaza/licensor";
        description = "A license compatibility helper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "life" = callPackage
@@ -124123,30 +119826,6 @@ self: {
      }) {};
 
   "line" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types
-     , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text
-     , time, transformers, wai
-     }:
-     mkDerivation {
-       pname = "line";
-       version = "2.2.0";
-       sha256 = "1a4pfrkx1szq5mg9m539waakkkavnv4yhhhs3akgman8rjfbn8mb";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring cryptohash-sha256
-         http-conduit http-types scotty text time transformers wai
-       ];
-       testHaskellDepends = [
-         aeson base base64-bytestring bytestring cryptohash-sha256 hspec
-         hspec-wai QuickCheck quickcheck-instances raw-strings-qq scotty
-         text time transformers
-       ];
-       homepage = "https://github.com/noraesae/line";
-       description = "Haskell SDK for the LINE API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "line_3_1_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
@@ -124168,7 +119847,6 @@ self: {
        homepage = "https://github.com/noraesae/line";
        description = "Haskell SDK for the LINE API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "line-break" = callPackage
@@ -124244,18 +119922,6 @@ self: {
      }) {};
 
   "linear-accelerate" = callPackage
-    ({ mkDerivation, accelerate, base, lens, linear }:
-     mkDerivation {
-       pname = "linear-accelerate";
-       version = "0.2";
-       sha256 = "0433mzw2cswk86nmj3gnygn3d07yq0sbmv2ylxbw8ri35yddjap6";
-       libraryHaskellDepends = [ accelerate base lens linear ];
-       homepage = "http://github.com/ekmett/linear-accelerate/";
-       description = "Instances to use linear vector spaces on accelerate backends";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "linear-accelerate_0_4" = callPackage
     ({ mkDerivation, accelerate, base, Cabal, cabal-doctest
      , distributive, doctest, lens, linear
      }:
@@ -124271,7 +119937,6 @@ self: {
        homepage = "http://github.com/ekmett/linear-accelerate/";
        description = "Lifting linear vector spaces into Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-algebra-cblas" = callPackage
@@ -125727,27 +121392,6 @@ self: {
      }) {llvm-config = null;};
 
   "llvm-hs-pure" = callPackage
-    ({ mkDerivation, base, containers, mtl, parsec, tasty, tasty-hunit
-     , template-haskell, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "llvm-hs-pure";
-       version = "4.0.0.0";
-       sha256 = "1z9r0qfzj738g0l8f5lbn5lx122p4gyg4gg9njpxjnwmmi532lkl";
-       libraryHaskellDepends = [
-         base containers mtl parsec template-haskell transformers
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         base containers mtl tasty tasty-hunit transformers
-         transformers-compat
-       ];
-       homepage = "http://github.com/llvm-hs/llvm-hs/";
-       description = "Pure Haskell LLVM functionality (no FFI)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "llvm-hs-pure_4_1_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, mtl
      , tasty, tasty-hunit, tasty-quickcheck, template-haskell
      , transformers, transformers-compat
@@ -125767,7 +121411,6 @@ self: {
        homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-ht" = callPackage
@@ -126214,31 +121857,6 @@ self: {
      }) {};
 
   "log" = callPackage
-    ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions
-     , http-client, http-types, log-base, log-elasticsearch
-     , log-postgres, process, random, tasty, tasty-hunit, text, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "log";
-       version = "0.7";
-       sha256 = "06z5fqixyvz4dj0g6ps00pbm7n4ix2cg2lxq5j7q7nbnrrkymnk7";
-       revision = "1";
-       editedCabalFile = "070i5xqgg6k09i8lsn0gbyh4j86wf6fd9x8fzvzyrhwbmz32s875";
-       libraryHaskellDepends = [
-         base log-base log-elasticsearch log-postgres
-       ];
-       testHaskellDepends = [
-         aeson base bloodhound bytestring exceptions http-client http-types
-         process random tasty tasty-hunit text time transformers
-       ];
-       homepage = "https://github.com/scrive/log";
-       description = "Structured logging solution with multiple backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "log_0_9_0_1" = callPackage
     ({ mkDerivation, aeson, base, bloodhound, bytestring, ekg
      , exceptions, hpqtypes, http-client, http-types, log-base
      , log-elasticsearch, log-postgres, process, random, tasty
@@ -126326,29 +121944,6 @@ self: {
      }) {};
 
   "log-elasticsearch" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , bloodhound, bytestring, deepseq, http-client, log-base
-     , semigroups, text, text-show, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "log-elasticsearch";
-       version = "0.7";
-       sha256 = "1drb28jdl9b4d62x5bprqv8ccs1zy31wwwrrai9295sl1jm2c8xz";
-       revision = "1";
-       editedCabalFile = "0ddiwm479a0l8mrr73ipl8db0valpfx2dppxd4w1pilbj1brzgdj";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring bloodhound bytestring
-         deepseq http-client log-base semigroups text text-show time
-         transformers unordered-containers vector
-       ];
-       homepage = "https://github.com/scrive/log";
-       description = "Structured logging solution (Elasticsearch back end)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "log-elasticsearch_0_9_0_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bloodhound, bytestring, deepseq, http-client, http-client-tls
      , log-base, semigroups, text, text-show, time, transformers
@@ -126551,29 +122146,6 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, exceptions
-     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
-     , semigroups, stm, stm-delay, text, time, transformers
-     , transformers-base, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect";
-       version = "1.1.3";
-       sha256 = "053rpry8fagfnf3c05gjidjk0r319d7v81n8qk5wgb3lj7n39ahf";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl semigroups stm
-         stm-delay text time transformers transformers-base wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion fast-logger lifted-async monad-logger
-         text time wl-pprint-text
-       ];
-       homepage = "https://github.com/ocharles/logging-effect";
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_2_0" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , semigroups, stm, stm-delay, text, time, transformers
@@ -126594,24 +122166,9 @@ self: {
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
-    ({ mkDerivation, base, hspec, template-haskell, transformers }:
-     mkDerivation {
-       pname = "logging-facade";
-       version = "0.1.1";
-       sha256 = "18ldv6rsff480rqpbs3iabjpvn1fhw0i2a0g80jnhxg9ajfz5yb0";
-       revision = "1";
-       editedCabalFile = "1cm2q8l033w1bwi30mzsz0knr8pqxcb4f5c38594rdm96r9h12gw";
-       libraryHaskellDepends = [ base template-haskell transformers ];
-       testHaskellDepends = [ base hspec ];
-       description = "Simple logging abstraction that allows multiple back-ends";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "logging-facade_0_3_0" = callPackage
     ({ mkDerivation, base, call-stack, hspec, transformers }:
      mkDerivation {
        pname = "logging-facade";
@@ -126622,7 +122179,6 @@ self: {
        homepage = "https://github.com/sol/logging-facade#readme";
        description = "Simple logging abstraction that allows multiple back-ends";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade-journald" = callPackage
@@ -128607,18 +124163,6 @@ self: {
      }) {};
 
   "mainland-pretty" = callPackage
-    ({ mkDerivation, base, containers, srcloc, text }:
-     mkDerivation {
-       pname = "mainland-pretty";
-       version = "0.4.1.4";
-       sha256 = "175gbycqnmnjiqx2mfr9x9gqafx4s2abg6n681kh0knqkl8nnlmn";
-       libraryHaskellDepends = [ base containers srcloc text ];
-       homepage = "http://www.cs.drexel.edu/~mainland/";
-       description = "Pretty printing designed for printing source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mainland-pretty_0_6_1" = callPackage
     ({ mkDerivation, base, containers, srcloc, text, transformers }:
      mkDerivation {
        pname = "mainland-pretty";
@@ -128630,7 +124174,6 @@ self: {
        homepage = "https://github.com/mainland/mainland-pretty";
        description = "Pretty printing designed for printing source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "majordomo" = callPackage
@@ -128732,19 +124275,6 @@ self: {
      }) {};
 
   "makefile" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }:
-     mkDerivation {
-       pname = "makefile";
-       version = "0.1.1.0";
-       sha256 = "0pij78vl506n7m65p8hg7rlinqmswh28bjlx1cwy884righb3jiw";
-       libraryHaskellDepends = [ attoparsec base bytestring ];
-       testHaskellDepends = [ attoparsec base bytestring doctest Glob ];
-       homepage = "http://github.com/nmattia/mask";
-       description = "Simple Makefile parser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "makefile_1_0_0_4" = callPackage
     ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, text
      }:
      mkDerivation {
@@ -128758,7 +124288,6 @@ self: {
        homepage = "http://github.com/nmattia/mask";
        description = "Simple Makefile parser and generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "managed" = callPackage
@@ -129927,28 +125456,6 @@ self: {
      }) {eng = null; mat = null; mx = null;};
 
   "matplotlib" = callPackage
-    ({ mkDerivation, ad, aeson, base, bytestring, containers, filepath
-     , process, random, raw-strings-qq, split, tasty
-     , tasty-expected-failure, tasty-golden, tasty-hunit, temporary
-     }:
-     mkDerivation {
-       pname = "matplotlib";
-       version = "0.4.5";
-       sha256 = "0f8bahj7i6nxdg5yyn1mn7vq9bw85bvikzvi21zzvijpicwyszz5";
-       libraryHaskellDepends = [
-         aeson base bytestring containers filepath process split temporary
-       ];
-       testHaskellDepends = [
-         ad base bytestring process random raw-strings-qq split tasty
-         tasty-expected-failure tasty-golden tasty-hunit temporary
-       ];
-       homepage = "https://github.com/abarbu/matplotlib-haskell";
-       description = "Bindings to Matplotlib; a Python plotting library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "matplotlib_0_5_0" = callPackage
     ({ mkDerivation, ad, aeson, base, bytestring, containers, filepath
      , process, random, raw-strings-qq, split, tasty
      , tasty-expected-failure, tasty-golden, tasty-hunit, temporary
@@ -129971,23 +125478,6 @@ self: {
      }) {};
 
   "matrices" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, primitive, tasty
-     , tasty-hunit, tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "matrices";
-       version = "0.4.4";
-       sha256 = "1virsmh7rwrb3kf9wrvkwj718dp989ji43xyvxx2bnvi3lr11wah";
-       libraryHaskellDepends = [ base deepseq primitive vector ];
-       testHaskellDepends = [
-         base tasty tasty-hunit tasty-quickcheck vector
-       ];
-       benchmarkHaskellDepends = [ base criterion vector ];
-       description = "native matrix based on vector";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "matrices_0_4_5" = callPackage
     ({ mkDerivation, base, criterion, deepseq, primitive, tasty
      , tasty-hunit, tasty-quickcheck, vector
      }:
@@ -130002,7 +125492,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "native matrix based on vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "matrix" = callPackage
@@ -130685,38 +126174,6 @@ self: {
      }) {};
 
   "mediabus" = callPackage
-    ({ mkDerivation, array, async, base, binary, bytestring, cereal
-     , conduit, conduit-combinators, conduit-extra, containers
-     , data-default, deepseq, hspec, lens, lifted-async, monad-control
-     , monad-logger, mtl, network, parallel, primitive, process
-     , QuickCheck, random, resourcet, singletons, spool, stm
-     , streaming-commons, tagged, template-haskell, text, time
-     , transformers, type-spec, vector
-     }:
-     mkDerivation {
-       pname = "mediabus";
-       version = "0.3.3.0";
-       sha256 = "1v1qjbz438hk978xa4zm6s4ydcnxlvwc00rczn6kvzk1mi8vlgn2";
-       libraryHaskellDepends = [
-         array async base bytestring cereal conduit conduit-combinators
-         conduit-extra containers data-default deepseq lens lifted-async
-         monad-control monad-logger mtl network parallel primitive process
-         QuickCheck random resourcet spool stm streaming-commons tagged text
-         time transformers vector
-       ];
-       testHaskellDepends = [
-         array async base binary bytestring conduit conduit-combinators
-         conduit-extra containers data-default deepseq hspec lens
-         monad-control mtl QuickCheck singletons spool stm tagged
-         template-haskell text time transformers type-spec vector
-       ];
-       homepage = "https://github.com/lindenbaum/mediabus";
-       description = "Multimedia streaming on top of Conduit";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "mediabus_0_4_0_1" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, cereal
      , conduit, conduit-combinators, conduit-extra, containers
      , data-default, deepseq, hspec, lens, lifted-async, monad-control
@@ -130745,7 +126202,7 @@ self: {
        homepage = "https://github.com/sheyll/mediabus";
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "mediabus-fdk-aac" = callPackage
@@ -130778,45 +126235,6 @@ self: {
      }) {fdk-aac = null;};
 
   "mediabus-rtp" = callPackage
-    ({ mkDerivation, array, async, base, binary, bytestring, cereal
-     , conduit, conduit-combinators, conduit-extra, containers
-     , data-default, deepseq, hspec, lens, lifted-async, mediabus
-     , monad-control, monad-logger, mtl, network, parallel, primitive
-     , process, QuickCheck, random, resourcet, singletons, spool, stm
-     , streaming-commons, tagged, template-haskell, text, time
-     , transformers, type-spec, vector
-     }:
-     mkDerivation {
-       pname = "mediabus-rtp";
-       version = "0.3.2.1";
-       sha256 = "0kb24cw7x4vxjq109ld9l2jb7hqc8aydri8hb3zj0ihsfb82sx85";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array async base bytestring cereal conduit conduit-combinators
-         conduit-extra containers data-default deepseq lens lifted-async
-         mediabus monad-control monad-logger mtl network parallel primitive
-         process QuickCheck random resourcet spool stm streaming-commons
-         tagged text time transformers vector
-       ];
-       executableHaskellDepends = [
-         async base conduit conduit-combinators conduit-extra data-default
-         lens lifted-async mediabus monad-control monad-logger mtl parallel
-         QuickCheck random stm streaming-commons tagged time vector
-       ];
-       testHaskellDepends = [
-         array async base binary bytestring conduit conduit-combinators
-         conduit-extra containers data-default deepseq hspec lens mediabus
-         monad-control monad-logger mtl QuickCheck singletons spool stm
-         tagged template-haskell text time transformers type-spec vector
-       ];
-       homepage = "https://github.com/lindenbaum/mediabus-rtp";
-       description = "Receive and Send RTP Packets";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "mediabus-rtp_0_4_0_1" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, cereal
      , conduit, conduit-combinators, conduit-extra, containers
      , data-default, deepseq, hspec, lens, lifted-async, mediabus
@@ -130852,7 +126270,7 @@ self: {
        homepage = "https://github.com/sheyll/mediabus-rtp";
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "median-stream" = callPackage
@@ -130979,10 +126397,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "5.2.0";
-       sha256 = "0204x5bklgvfydap1a2y76aicnjfs33jh786y7w6vsb54fpafl62";
-       revision = "1";
-       editedCabalFile = "1ah5r6jjz187l5g1mnzajsyiac5wdc8ijqwkapl0wa35mj3ybakg";
+       version = "5.3.1";
+       sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions mtl QuickCheck
          scientific text transformers
@@ -130997,7 +126413,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_6_0_0" = callPackage
+  "megaparsec_6_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -131005,8 +126421,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "6.0.0";
-       sha256 = "182xvni3ambq6j7m377fpaj2cf6119dxxr5f0h88yc5jw8r9780c";
+       version = "6.0.1";
+       sha256 = "1cj6ibzcvdq24k94xbx6fw2wxzh3dvxv9q2yapbdhimkx632g88w";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -132629,41 +128045,6 @@ self: {
      }) {};
 
   "minio-hs" = callPackage
-    ({ mkDerivation, async, base, bytestring, case-insensitive, conduit
-     , conduit-combinators, conduit-extra, containers, cryptonite
-     , cryptonite-conduit, data-default, directory, exceptions, filepath
-     , http-client, http-conduit, http-types, lifted-async, lifted-base
-     , memory, monad-control, protolude, QuickCheck, resourcet, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text
-     , text-format, time, transformers, transformers-base, xml-conduit
-     }:
-     mkDerivation {
-       pname = "minio-hs";
-       version = "0.2.1";
-       sha256 = "1h9ma1lgkirsmv8685m1l3m6k38zyx2kqk49s1x3gdbrsihpnjs8";
-       libraryHaskellDepends = [
-         async base bytestring case-insensitive conduit conduit-combinators
-         conduit-extra containers cryptonite cryptonite-conduit data-default
-         exceptions filepath http-client http-conduit http-types
-         lifted-async lifted-base memory monad-control protolude resourcet
-         text text-format time transformers transformers-base xml-conduit
-       ];
-       testHaskellDepends = [
-         async base bytestring case-insensitive conduit conduit-combinators
-         conduit-extra containers cryptonite cryptonite-conduit data-default
-         directory exceptions filepath http-client http-conduit http-types
-         lifted-async lifted-base memory monad-control protolude QuickCheck
-         resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck
-         temporary text text-format time transformers transformers-base
-         xml-conduit
-       ];
-       homepage = "https://github.com/minio/minio-hs#readme";
-       description = "A Minio client library, compatible with S3 like services";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "minio-hs_0_3_0" = callPackage
     ({ mkDerivation, async, base, bytestring, case-insensitive, conduit
      , conduit-combinators, conduit-extra, containers, cryptonite
      , cryptonite-conduit, data-default, directory, exceptions, filepath
@@ -133010,23 +128391,6 @@ self: {
      }) {};
 
   "mixed-types-num" = callPackage
-    ({ mkDerivation, base, convertible, hspec, hspec-smallcheck
-     , QuickCheck, smallcheck
-     }:
-     mkDerivation {
-       pname = "mixed-types-num";
-       version = "0.1.0.1";
-       sha256 = "13pp5c8ldccscf5q99zvzcjkn77f9gnqkn5rp6789cia72wyqhlw";
-       libraryHaskellDepends = [
-         base convertible hspec hspec-smallcheck QuickCheck smallcheck
-       ];
-       testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
-       homepage = "https://github.com/michalkonecny/mixed-types-num";
-       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mixed-types-num_0_2_0_1" = callPackage
     ({ mkDerivation, base, convertible, hspec, hspec-smallcheck
      , QuickCheck, smallcheck, template-haskell
      }:
@@ -133042,7 +128406,6 @@ self: {
        homepage = "https://github.com/michalkonecny/mixed-types-num";
        description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mkbndl" = callPackage
@@ -134392,18 +129755,6 @@ self: {
      }) {};
 
   "monad-skeleton" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "monad-skeleton";
-       version = "0.1.3.2";
-       sha256 = "1cc1rd2p15klff0r0ialbd46n3ny547as9fghh3fy3ag2ahz0r15";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/fumieval/monad-skeleton";
-       description = "Monads of program skeleta";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-skeleton_0_1_4" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "monad-skeleton";
@@ -134413,7 +129764,6 @@ self: {
        homepage = "https://github.com/fumieval/monad-skeleton";
        description = "Monads of program skeleta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-st" = callPackage
@@ -134974,36 +130324,6 @@ self: {
      }) {};
 
   "mongoDB" = callPackage
-    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
-     , binary, bson, bytestring, containers, criterion, cryptohash
-     , data-default-class, hashtables, hspec, lifted-base, monad-control
-     , mtl, network, nonce, old-locale, parsec, random, random-shuffle
-     , text, time, tls, transformers-base
-     }:
-     mkDerivation {
-       pname = "mongoDB";
-       version = "2.1.1.1";
-       sha256 = "0mww0caczsi2srhdzkrmlivd4nsqsyqla524j4dxnwfs4w1qbgz4";
-       libraryHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring containers cryptohash data-default-class hashtables
-         lifted-base monad-control mtl network nonce parsec random
-         random-shuffle text tls transformers-base
-       ];
-       testHaskellDepends = [ base hspec mtl old-locale text time ];
-       benchmarkHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring containers criterion cryptohash hashtables lifted-base
-         monad-control mtl network nonce parsec random random-shuffle text
-         transformers-base
-       ];
-       homepage = "https://github.com/mongodb-haskell/mongodb";
-       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "mongoDB_2_3_0" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , binary, bson, bytestring, conduit, conduit-extra, containers
      , criterion, cryptohash, data-default-class, hashtables, hspec
@@ -137225,37 +132545,6 @@ self: {
      }) {};
 
   "mustache" = callPackage
-    ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
-     , cmdargs, containers, directory, either, filepath, hspec, lens
-     , mtl, parsec, process, scientific, tar, template-haskell
-     , temporary, text, th-lift, unordered-containers, vector, wreq
-     , yaml, zlib
-     }:
-     mkDerivation {
-       pname = "mustache";
-       version = "2.1.4";
-       sha256 = "1nswy084v9vdl58v6zvvfj5j5hyd4qgr5n353pwsr8010yw4qmqw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory either filepath mtl
-         parsec scientific template-haskell text th-lift
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring cmdargs filepath text yaml
-       ];
-       testHaskellDepends = [
-         aeson base base-unicode-symbols bytestring directory filepath hspec
-         lens process tar temporary text unordered-containers wreq yaml zlib
-       ];
-       homepage = "https://github.com/JustusAdam/mustache";
-       description = "A mustache template parser library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "mustache_2_2_3" = callPackage
     ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
      , cmdargs, containers, directory, either, filepath, hspec, lens
      , mtl, parsec, process, scientific, tar, template-haskell
@@ -138059,18 +133348,6 @@ self: {
      }) {};
 
   "names-th" = callPackage
-    ({ mkDerivation, base, containers, template-haskell }:
-     mkDerivation {
-       pname = "names-th";
-       version = "0.2.0.2";
-       sha256 = "09mzb4ff45kn6gbbf40jvpk0pgnwlyyw7i3ncmmybx6i4mypv048";
-       libraryHaskellDepends = [ base containers template-haskell ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Manipulate name strings for TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "names-th_0_2_0_3" = callPackage
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "names-th";
@@ -138080,7 +133357,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Manipulate name strings for TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "namespace" = callPackage
@@ -139526,21 +134802,6 @@ self: {
      }) {};
 
   "network-carbon" = callPackage
-    ({ mkDerivation, base, bytestring, network, text, time, vector }:
-     mkDerivation {
-       pname = "network-carbon";
-       version = "1.0.9";
-       sha256 = "0d9v9a8ls8za2mgl7ff2nkgg2kjlcq2fm07gybl1x2nf9xr0v1kh";
-       libraryHaskellDepends = [
-         base bytestring network text time vector
-       ];
-       homepage = "http://github.com/ocharles/network-carbon";
-       description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "network-carbon_1_0_10" = callPackage
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
@@ -140300,28 +135561,30 @@ self: {
      }) {};
 
   "neural" = callPackage
-    ({ mkDerivation, ad, array, attoparsec, base, bytestring, criterion
-     , deepseq, directory, doctest, filepath, ghc-typelits-natnormalise
-     , Glob, hspec, JuicyPixels, kan-extensions, lens, monad-par
-     , monad-par-extras, MonadRandom, mtl, parallel, pipes
-     , pipes-bytestring, pipes-safe, pipes-zlib, profunctors, reflection
-     , STMonadTrans, text, transformers, typelits-witnesses, vector
+    ({ mkDerivation, ad, ansi-terminal, array, attoparsec, base
+     , bytestring, containers, criterion, deepseq, directory, doctest
+     , filepath, ghc-typelits-natnormalise, Glob, hspec, JuicyPixels
+     , kan-extensions, lens, monad-par, monad-par-extras, MonadRandom
+     , mtl, parallel, pipes, pipes-bytestring, pipes-safe, pipes-zlib
+     , profunctors, random, reflection, STMonadTrans, text, transformers
+     , typelits-witnesses, vector, vector-sized
      }:
      mkDerivation {
        pname = "neural";
-       version = "0.3.0.0";
-       sha256 = "10bix58l46067dqdggwpkpkcdd4g20vwnxk32v5r2wp31r1ky1gh";
+       version = "0.3.0.1";
+       sha256 = "0smv57gd2k24hmh7qj1kdd7x76mgc6bjbjl7cmrncxwibz98j41v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ad array base bytestring deepseq directory filepath
+         ad array base bytestring containers deepseq directory filepath
          ghc-typelits-natnormalise hspec kan-extensions lens monad-par
          monad-par-extras MonadRandom mtl parallel pipes pipes-bytestring
-         pipes-safe profunctors reflection STMonadTrans text transformers
-         typelits-witnesses vector
+         pipes-safe profunctors random reflection STMonadTrans text
+         transformers typelits-witnesses vector vector-sized
        ];
        executableHaskellDepends = [
-         array attoparsec base JuicyPixels MonadRandom pipes pipes-zlib text
+         ansi-terminal array attoparsec base JuicyPixels MonadRandom pipes
+         pipes-zlib text
        ];
        testHaskellDepends = [ base doctest Glob hspec MonadRandom ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -140552,24 +135815,6 @@ self: {
      }) {};
 
   "nfc" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, c2hs, nfc }:
-     mkDerivation {
-       pname = "nfc";
-       version = "0.0.1";
-       sha256 = "0cfp2784jfxa1694s59q6cmacym2x6qxgysqc36jdkxarki4cksj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ nfc ];
-       libraryToolDepends = [ c2hs ];
-       executableHaskellDepends = [ base base16-bytestring bytestring ];
-       homepage = "https://github.com/centromere/nfc#readme";
-       description = "libnfc bindings";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {nfc = null;};
-
-  "nfc_0_1_0" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, c2hs, nfc }:
      mkDerivation {
        pname = "nfc";
@@ -142051,6 +137296,24 @@ self: {
      }) {};
 
   "numhask" = callPackage
+    ({ mkDerivation, adjunctions, base, distributive, doctest
+     , protolude, QuickCheck, tasty, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "numhask";
+       version = "0.0.7";
+       sha256 = "03m6v5cy1hmrzv5c8vsbnx54bsi53cl63c7m1c8mxn4n3i1hl9n0";
+       libraryHaskellDepends = [
+         adjunctions base distributive protolude QuickCheck vector
+       ];
+       testHaskellDepends = [ base doctest tasty tasty-quickcheck ];
+       homepage = "https://github.com/tonyday567/numhask";
+       description = "A numeric prelude";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "numhask_0_0_8" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest
      , protolude, QuickCheck, tasty, tasty-quickcheck, vector
      }:
@@ -142307,30 +137570,6 @@ self: {
      }) {};
 
   "oanda-rest-api" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, Decimal
-     , hlint, hspec, http-conduit, HUnit, lens, old-locale, scientific
-     , text, thyme, vector
-     }:
-     mkDerivation {
-       pname = "oanda-rest-api";
-       version = "0.3.0.0";
-       sha256 = "00vnbyvqgfly7d72kr21yvd0fjjvw7pm12lc306v5qm29m53cmxy";
-       revision = "1";
-       editedCabalFile = "1mficg3gm6q9pf3344hs8k8c0azdq0cyximrq3ny3b4gl4j3kns4";
-       libraryHaskellDepends = [
-         aeson base bytestring containers Decimal http-conduit lens
-         old-locale scientific text thyme vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers Decimal hlint hspec http-conduit
-         HUnit lens old-locale scientific text thyme vector
-       ];
-       homepage = "https://github.com/jdreaver/oanda-rest-api#readme";
-       description = "Client to the OANDA REST API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "oanda-rest-api_0_4_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens
      , old-locale, resourcet, scientific, text, thyme, transformers
@@ -142353,7 +137592,6 @@ self: {
        homepage = "https://github.com/jdreaver/oanda-rest-api#readme";
        description = "Client to the OANDA REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oauth10a" = callPackage
@@ -142541,30 +137779,6 @@ self: {
      }) {};
 
   "octane" = 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.3";
-       sha256 = "05gljx1br9zk2i26rvz15dcl03x7n2xvrwmlz7917673068scm95";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bimap binary bytestring containers data-default-class
-         file-embed overloaded-records rattletrap text
-       ];
-       executableHaskellDepends = [
-         aeson base binary bytestring http-client http-client-tls
-       ];
-       homepage = "https://github.com/tfausak/octane#readme";
-       description = "Parse Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "octane_0_20_0" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
      , overloaded-records, rattletrap, text
@@ -142585,7 +137799,7 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "octohat" = callPackage
@@ -144193,35 +139407,6 @@ self: {
      }) {};
 
   "opml-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, conduit
-     , conduit-combinators, containers, data-default, hlint, lens-simple
-     , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck
-     , quickcheck-instances, resourcet, safe-exceptions, semigroups
-     , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep
-     , uri-bytestring, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "opml-conduit";
-       version = "0.6.0.1";
-       sha256 = "0mc3qymh6i8w79s6spm0dnndr7aydny6fy3krfxzfm6qch4nw3yb";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base case-insensitive conduit conduit-combinators containers
-         lens-simple mono-traversable monoid-subclasses safe-exceptions
-         semigroups text time timerep uri-bytestring xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-combinators containers data-default
-         hlint lens-simple mono-traversable mtl parsers QuickCheck
-         quickcheck-instances resourcet semigroups tasty tasty-hunit
-         tasty-quickcheck text time uri-bytestring xml-conduit
-       ];
-       homepage = "https://github.com/k0ral/opml-conduit";
-       description = "Streaming parser/renderer for the OPML 2.0 format.";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "opml-conduit_0_6_0_3" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, conduit
      , conduit-combinators, containers, data-default, hlint, lens-simple
      , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck
@@ -144248,7 +139433,6 @@ self: {
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -144467,22 +139651,6 @@ self: {
      }) {};
 
   "optparse-generic" = callPackage
-    ({ mkDerivation, base, bytestring, optparse-applicative, semigroups
-     , system-filepath, text, time, transformers, void
-     }:
-     mkDerivation {
-       pname = "optparse-generic";
-       version = "1.1.5";
-       sha256 = "1xg6c7h6h8q64gwskh7l4h7qn7w4y0ixf88grgk23xdficgmsyms";
-       libraryHaskellDepends = [
-         base bytestring optparse-applicative semigroups system-filepath
-         text time transformers void
-       ];
-       description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-generic_1_2_2" = callPackage
     ({ mkDerivation, base, bytestring, Only, optparse-applicative
      , semigroups, system-filepath, text, time, transformers, void
      }:
@@ -144496,7 +139664,6 @@ self: {
        ];
        description = "Auto-generate a command-line parser for your datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-helper" = callPackage
@@ -145432,19 +140599,6 @@ self: {
      }) {};
 
   "pagination" = callPackage
-    ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "pagination";
-       version = "0.1.1";
-       sha256 = "017bws1ws4zq6058p6wxkxk6fjhxjrc20vm2nb6pizks0227pi5s";
-       libraryHaskellDepends = [ base deepseq exceptions ];
-       testHaskellDepends = [ base exceptions hspec QuickCheck ];
-       homepage = "https://github.com/mrkkrp/pagination";
-       description = "Framework-agnostic pagination boilerplate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pagination_0_2_0" = callPackage
     ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }:
      mkDerivation {
        pname = "pagination";
@@ -145455,7 +140609,6 @@ self: {
        homepage = "https://github.com/mrkkrp/pagination";
        description = "Framework-agnostic pagination boilerplate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagure-hook-receiver" = callPackage
@@ -145601,43 +140754,6 @@ self: {
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , containers, data-default, directory, filepath, hs-bibutils, mtl
-     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time
-     , unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.10.4.1";
-       sha256 = "0lfyqz9pqi599p9invp6llk1dvlj2zzks3yw6fmbzy9im24hlsvf";
-       revision = "1";
-       editedCabalFile = "00cvvdiwpl8cw840smdfxbdnmmjf4m86nck344a797iv9rmvdq0j";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
-         setenv split syb tagsoup text time unordered-containers vector
-         xml-conduit yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers directory
-         filepath mtl pandoc pandoc-types process syb temporary text vector
-         yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath mtl pandoc pandoc-types
-         process temporary text yaml
-       ];
-       doCheck = false;
-       homepage = "https://github.com/jgm/pandoc-citeproc";
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-citeproc_0_10_5_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
      , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -145670,7 +140786,6 @@ self: {
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -148773,24 +143888,6 @@ self: {
      }) {};
 
   "persistable-record" = callPackage
-    ({ mkDerivation, array, base, containers, dlist, names-th
-     , quickcheck-simple, template-haskell, th-data-compat, transformers
-     }:
-     mkDerivation {
-       pname = "persistable-record";
-       version = "0.4.1.1";
-       sha256 = "1mjp9ha14i3llp8xvlhrcp0x2vjqphdbgzf2pgw29qndnbigsqnx";
-       libraryHaskellDepends = [
-         array base containers dlist names-th template-haskell
-         th-data-compat transformers
-       ];
-       testHaskellDepends = [ base quickcheck-simple ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Binding between SQL database values and haskell records";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "persistable-record_0_5_1_1" = callPackage
     ({ mkDerivation, array, base, containers, dlist, names-th
      , quickcheck-simple, template-haskell, th-data-compat, transformers
      }:
@@ -148806,27 +143903,9 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Binding between SQL database values and haskell records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistable-types-HDBC-pg" = callPackage
-    ({ mkDerivation, base, bytestring, convertible, HDBC
-     , persistable-record, relational-query-HDBC, text-postgresql
-     }:
-     mkDerivation {
-       pname = "persistable-types-HDBC-pg";
-       version = "0.0.1.4";
-       sha256 = "0nsnb4j6s2sjz66bagag039iv45ss6a3ggg25h3b7fnx2rcl7cnf";
-       libraryHaskellDepends = [
-         base bytestring convertible HDBC persistable-record
-         relational-query-HDBC text-postgresql
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "HDBC and Relational-Record instances of PostgreSQL extended types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "persistable-types-HDBC-pg_0_0_1_5" = callPackage
     ({ mkDerivation, base, bytestring, convertible, HDBC
      , persistable-record, relational-query-HDBC, text-postgresql
      }:
@@ -148841,44 +143920,9 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "HDBC and Relational-Record instances of PostgreSQL extended types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-html, blaze-markup, bytestring, conduit, containers
-     , exceptions, fast-logger, hspec, http-api-data, lifted-base
-     , monad-control, monad-logger, mtl, old-locale, path-pieces
-     , resource-pool, resourcet, scientific, silently, tagged
-     , template-haskell, text, time, transformers, transformers-base
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "persistent";
-       version = "2.6.1";
-       sha256 = "0zjz827cljka8y54gljmkjg0pyxqgvag2hf5qzhclzbjgdp0z7n7";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html blaze-markup
-         bytestring conduit containers exceptions fast-logger http-api-data
-         lifted-base monad-control monad-logger mtl old-locale path-pieces
-         resource-pool resourcet scientific silently tagged template-haskell
-         text time transformers transformers-base unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html bytestring
-         conduit containers fast-logger hspec http-api-data lifted-base
-         monad-control monad-logger mtl old-locale path-pieces resource-pool
-         resourcet scientific tagged template-haskell text time transformers
-         unordered-containers vector
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Type-safe, multi-backend data serialization";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent_2_7_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
      , exceptions, fast-logger, hspec, http-api-data, lifted-base
@@ -148909,7 +143953,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -150282,6 +145325,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pinboard_0_9_12_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , http-client, http-client-tls, http-types, monad-logger, mtl
+     , network, profunctors, QuickCheck, random, safe-exceptions
+     , semigroups, text, time, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "pinboard";
+       version = "0.9.12.5";
+       sha256 = "1gvq7slby26cm62203gh13s4blwphiy0chdhkp3vl4k3gjlbslam";
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-client http-client-tls
+         http-types monad-logger mtl network profunctors random
+         safe-exceptions text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec mtl QuickCheck
+         safe-exceptions semigroups text time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/jonschoning/pinboard";
+       description = "Access to the Pinboard API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinch" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
@@ -150552,23 +145622,6 @@ self: {
      }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony" = callPackage
-    ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes
-     }:
-     mkDerivation {
-       pname = "pipes-cacophony";
-       version = "0.4.1";
-       sha256 = "0q2k9kjl8fvqfkf20d5rr5ybh4p2vyaigi435v8ix5dfqj3m5wdw";
-       isLibrary = true;
-       isExecutable = true;
-       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-cacophony_0_5_0" = callPackage
     ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }:
      mkDerivation {
        pname = "pipes-cacophony";
@@ -150894,6 +145947,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-group_1_0_7" = callPackage
+    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
+     , pipes-parse, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-group";
+       version = "1.0.7";
+       sha256 = "0p0bfc91ij481bybk99jpfczkkcz3v7mcr0y03kvhxddf575jhw6";
+       libraryHaskellDepends = [
+         base free pipes pipes-parse transformers
+       ];
+       testHaskellDepends = [ base doctest lens-family-core ];
+       description = "Group streams into substreams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , pipes
@@ -151018,27 +146088,6 @@ self: {
      }) {};
 
   "pipes-misc" = callPackage
-    ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
-     , pipes, pipes-category, pipes-concurrency, semigroups, stm
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pipes-misc";
-       version = "0.2.5.0";
-       sha256 = "0s9nxpqhfybgh35308dj185zn6ah829gfaqfldsczvr1ri6rdkv9";
-       libraryHaskellDepends = [
-         base clock Decimal lens mmorph mtl pipes pipes-category
-         pipes-concurrency semigroups stm transformers
-       ];
-       testHaskellDepends = [
-         base hspec lens mmorph pipes pipes-concurrency stm transformers
-       ];
-       homepage = "https://github.com/louispan/pipes-misc#readme";
-       description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-misc_0_3_0_0" = callPackage
     ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
      , pipes, pipes-category, pipes-concurrency, semigroups, stm
      , transformers
@@ -151057,7 +146106,6 @@ self: {
        homepage = "https://github.com/louispan/pipes-misc#readme";
        description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-mongodb" = callPackage
@@ -153322,34 +148370,6 @@ self: {
      }) {};
 
   "postgresql-binary" = callPackage
-    ({ mkDerivation, aeson, base, base-prelude, binary-parser
-     , bytestring, conversion, conversion-bytestring, conversion-text
-     , criterion, foldl, json-ast, loch-th, placeholders
-     , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase
-     , scientific, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, text, time, transformers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-binary";
-       version = "0.9.3";
-       sha256 = "012xd34nq18vdlwccqypyjslhr1iqnah6ic9kprjfsawri60mhgx";
-       libraryHaskellDepends = [
-         aeson base base-prelude binary-parser bytestring foldl loch-th
-         placeholders scientific text time transformers uuid vector
-       ];
-       testHaskellDepends = [
-         aeson conversion conversion-bytestring conversion-text json-ast
-         loch-th placeholders postgresql-libpq QuickCheck
-         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck
-       ];
-       benchmarkHaskellDepends = [ criterion rerebase ];
-       homepage = "https://github.com/nikita-volkov/postgresql-binary";
-       description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "postgresql-binary_0_12_1" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, bytestring-strict-builder, containers, conversion
      , conversion-bytestring, conversion-text, criterion, json-ast
@@ -153378,7 +148398,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-config" = callPackage
@@ -153658,6 +148677,31 @@ self: {
      }) {};
 
   "postgresql-simple-queue" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
+     , hspec-discover, hspec-expectations-lifted, hspec-pg-transact
+     , monad-control, pg-transact, postgresql-simple, random, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-queue";
+       version = "0.5.0.0";
+       sha256 = "0yzzbx62sapj3ikym286g5ary1ha28ixcknn890kgbcb0f1xw5rh";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions monad-control pg-transact
+         postgresql-simple random text time transformers
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring hspec hspec-discover
+         hspec-expectations-lifted hspec-pg-transact pg-transact
+         postgresql-simple
+       ];
+       homepage = "https://github.com/jfischoff/postgresql-queue#readme";
+       description = "A PostgreSQL backed queue";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "postgresql-simple-queue_0_5_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
      , hspec-discover, hspec-expectations-lifted, hspec-pg-transact
      , monad-control, pg-transact, postgresql-simple, random, text, time
@@ -155078,21 +150122,6 @@ self: {
      }) {};
 
   "primitive" = callPackage
-    ({ mkDerivation, base, ghc-prim, transformers }:
-     mkDerivation {
-       pname = "primitive";
-       version = "0.6.1.0";
-       sha256 = "1j1q7l21rdm8kfs93vibr3xwkkhqis181w2k6klfhx5g5skiywwk";
-       revision = "1";
-       editedCabalFile = "0gb8lcn6bd6ilfln7ah9jmqq6324vgkrgdsnz1qvlyj3bi2w5ivf";
-       libraryHaskellDepends = [ base ghc-prim transformers ];
-       testHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/haskell/primitive";
-       description = "Primitive memory-related operations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "primitive_0_6_2_0" = callPackage
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "primitive";
@@ -155105,7 +150134,6 @@ self: {
        homepage = "https://github.com/haskell/primitive";
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primitive-simd" = callPackage
@@ -155667,25 +150695,6 @@ self: {
      }) {};
 
   "product-profunctors" = callPackage
-    ({ mkDerivation, base, contravariant, profunctors, tagged
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "product-profunctors";
-       version = "0.7.1.0";
-       sha256 = "0d6kp4dpdhi0jsmajdyp2c1bxgzrph8imb4jnq1jajrkv7ms004q";
-       revision = "1";
-       editedCabalFile = "1rds0bhac5f45nsa0riv3b730vmxqkmh0s305bic32a4mljd3ajn";
-       libraryHaskellDepends = [
-         base contravariant profunctors tagged template-haskell
-       ];
-       testHaskellDepends = [ base profunctors ];
-       homepage = "https://github.com/tomjaguarpaw/product-profunctors";
-       description = "product-profunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "product-profunctors_0_8_0_3" = callPackage
     ({ mkDerivation, base, contravariant, profunctors, tagged
      , template-haskell
      }:
@@ -155700,7 +150709,6 @@ self: {
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prof2dot" = callPackage
@@ -156120,31 +151128,6 @@ self: {
      }) {};
 
   "prometheus-client" = callPackage
-    ({ mkDerivation, atomic-primops, base, bytestring, containers
-     , criterion, doctest, hspec, mtl, QuickCheck, random
-     , random-shuffle, stm, time, transformers, utf8-string
-     }:
-     mkDerivation {
-       pname = "prometheus-client";
-       version = "0.1.1";
-       sha256 = "0jsa68r8flkhn29yk2qi9b9a3s5yqxzd1ivwydgzrm5izq96x34z";
-       libraryHaskellDepends = [
-         atomic-primops base bytestring containers mtl stm time transformers
-         utf8-string
-       ];
-       testHaskellDepends = [
-         atomic-primops base bytestring containers doctest hspec mtl
-         QuickCheck random-shuffle stm time transformers utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion random utf8-string
-       ];
-       homepage = "https://github.com/fimad/prometheus-haskell";
-       description = "Haskell client library for http://prometheus.io.";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "prometheus-client_0_2_0" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, clock
      , containers, criterion, doctest, hspec, mtl, QuickCheck, random
      , random-shuffle, stm, transformers, utf8-string
@@ -156167,23 +151150,9 @@ self: {
        homepage = "https://github.com/fimad/prometheus-haskell";
        description = "Haskell client library for http://prometheus.io.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prometheus-metrics-ghc" = callPackage
-    ({ mkDerivation, base, doctest, prometheus-client, utf8-string }:
-     mkDerivation {
-       pname = "prometheus-metrics-ghc";
-       version = "0.1.1";
-       sha256 = "1wkyd28g4dklah0g4sf0bp64nb5zr2n3ld9bgp573cbfjlkcyc4w";
-       libraryHaskellDepends = [ base prometheus-client utf8-string ];
-       testHaskellDepends = [ base doctest prometheus-client ];
-       homepage = "https://github.com/fimad/prometheus-haskell";
-       description = "Metrics exposing GHC runtime information for use with prometheus-client";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "prometheus-metrics-ghc_0_2_0" = callPackage
     ({ mkDerivation, base, doctest, prometheus-client, utf8-string }:
      mkDerivation {
        pname = "prometheus-metrics-ghc";
@@ -156194,7 +151163,6 @@ self: {
        homepage = "https://github.com/fimad/prometheus-haskell";
        description = "Metrics exposing GHC runtime information for use with prometheus-client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "promise" = callPackage
@@ -156262,8 +151230,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.6.0";
-       sha256 = "1m5i9fbvckrrl26pirh776pfyg7a0ih42vrxqh6bsxyrfjqhzv11";
+       version = "4.6.1";
+       sha256 = "1j8768v7al7fxvg8z71pd7lq89qcdkpmnnmz1f2y8zfjw8mcn7wp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156396,23 +151364,6 @@ self: {
      }) {};
 
   "proto-lens-arbitrary" = callPackage
-    ({ mkDerivation, base, bytestring, containers, lens-family
-     , proto-lens, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-arbitrary";
-       version = "0.1.0.3";
-       sha256 = "029liw55v5k9f5bsfpsadd85sgrriwvrhfk242d2wfp3fypafd39";
-       libraryHaskellDepends = [
-         base bytestring containers lens-family proto-lens QuickCheck text
-       ];
-       homepage = "https://github.com/google/proto-lens";
-       description = "Arbitrary instances for proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "proto-lens-arbitrary_0_1_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
      }:
@@ -156752,18 +151703,6 @@ self: {
      }) {};
 
   "proxied" = callPackage
-    ({ mkDerivation, base, generic-deriving, tagged }:
-     mkDerivation {
-       pname = "proxied";
-       version = "0.2";
-       sha256 = "02zf3ix122w1yxkv1hhxl9rf8b052yd3c0s2m933sdzmn9bs3wvn";
-       libraryHaskellDepends = [ base generic-deriving tagged ];
-       homepage = "https://github.com/RyanGlScott/proxied";
-       description = "Make functions consume Proxy instead of undefined";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proxied_0_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "proxied";
@@ -156773,7 +151712,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/proxied";
        description = "Make functions consume Proxy instead of undefined";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proxy-kindness" = callPackage
@@ -156952,22 +151890,6 @@ self: {
      }) {};
 
   "publicsuffix" = callPackage
-    ({ mkDerivation, base, criterion, filepath, hspec, random
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "publicsuffix";
-       version = "0.20170109";
-       sha256 = "0i0qkj8xjwksx5sf3px4a06jyay73ikpnsszixch8dmr9rn8p30v";
-       libraryHaskellDepends = [ base filepath template-haskell ];
-       testHaskellDepends = [ base hspec ];
-       benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
-       description = "The publicsuffix list exposed as proper Haskell types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "publicsuffix_0_20170508" = callPackage
     ({ mkDerivation, base, criterion, filepath, hspec, random
      , template-haskell
      }:
@@ -156981,7 +151903,6 @@ self: {
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -157475,26 +152396,6 @@ self: {
      }) {};
 
   "purescript-bridge" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
-     , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
-     , mtl, text, transformers
-     }:
-     mkDerivation {
-       pname = "purescript-bridge";
-       version = "0.10.1.0";
-       sha256 = "08v2b4n3zpbwdz8v41scjpvwha3xnk0g6vgd58ki98h1gyvr4pqs";
-       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;
-     }) {};
-
-  "purescript-bridge_0_11_0_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
      , mtl, text, transformers
@@ -157512,7 +152413,6 @@ self: {
        ];
        description = "Generate PureScript data types from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bundle-fast" = callPackage
@@ -157668,29 +152568,6 @@ self: {
      }) {};
 
   "pusher-http-haskell" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptohash, hashable, hspec, http-client, http-types, QuickCheck
-     , text, time, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "pusher-http-haskell";
-       version = "1.1.0.4";
-       sha256 = "0lbj13vi1g49xiaqsd492j6lrg7ddjf3w8hz5z48a9cy2w6wylkx";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptohash hashable
-         http-client http-types text time transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec http-client http-types QuickCheck text
-         transformers unordered-containers
-       ];
-       homepage = "https://github.com/pusher-community/pusher-http-haskell";
-       description = "Haskell client library for the Pusher HTTP API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "pusher-http-haskell_1_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , cryptohash, hashable, hspec, http-client, http-types, QuickCheck
      , text, time, transformers, unordered-containers
@@ -158696,18 +153573,6 @@ self: {
      }) {};
 
   "quickcheck-io" = callPackage
-    ({ mkDerivation, base, HUnit, QuickCheck }:
-     mkDerivation {
-       pname = "quickcheck-io";
-       version = "0.1.4";
-       sha256 = "179qcy15yxgllsjc2czm2jsxaryfd6mcsr07ac43kc3i11cm0dvb";
-       libraryHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "https://github.com/hspec/quickcheck-io#readme";
-       description = "Use HUnit assertions as QuickCheck properties";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "quickcheck-io_0_2_0" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-io";
@@ -158717,7 +153582,6 @@ self: {
        homepage = "https://github.com/hspec/quickcheck-io#readme";
        description = "Use HUnit assertions as QuickCheck properties";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-poly" = callPackage
@@ -160518,25 +155382,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.3";
-       sha256 = "1qny1ayb6qac1f6zbm76w4bgvwqiznbq9a96dqnpkyj33dd0s8f3";
-       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_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, http-client, http-client-tls, http-types, tasty
      , tasty-hspec, text, uuid
@@ -160553,7 +155398,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
@@ -160599,13 +155443,12 @@ self: {
   "rattletrap" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
      , binary-bits, bytestring, containers, data-binary-ieee754
-     , filepath, tasty, tasty-hspec, template-haskell, temporary, text
-     , vector
+     , filepath, hspec, template-haskell, temporary, text, vector
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.1.5";
-       sha256 = "1givs2mpphav0j33iv4jxyvsfhh05jly4jwdj1sbxm1hvw3p23gf";
+       version = "2.5.0";
+       sha256 = "14ksxmwy53xpa9k5swz8254x3kgswkb91r7fnkx85pph5x09qwxd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -160613,9 +155456,7 @@ self: {
          containers data-binary-ieee754 template-haskell text vector
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring filepath tasty tasty-hspec temporary
-       ];
+       testHaskellDepends = [ base bytestring filepath hspec temporary ];
        homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
@@ -160730,21 +155571,6 @@ self: {
      }) {};
 
   "rawfilepath" = callPackage
-    ({ mkDerivation, base, bytestring, unix }:
-     mkDerivation {
-       pname = "rawfilepath";
-       version = "0.1.1";
-       sha256 = "0rlck0lv1002y0q5cjdlc4msr2nr36q8ml32r6ffbv5bfxhhlp7w";
-       revision = "1";
-       editedCabalFile = "14y624s1l381hqzy3v47xwbjwbkhzn6kqrrj1lj8sp9q0z8pdi9r";
-       libraryHaskellDepends = [ base bytestring unix ];
-       testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/xtendo-org/rawfilepath#readme";
-       description = "Use RawFilePath instead of FilePath";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "rawfilepath_0_2_4" = callPackage
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
        pname = "rawfilepath";
@@ -160755,7 +155581,6 @@ self: {
        homepage = "https://github.com/xtendo-org/rawfilepath#readme";
        description = "Use RawFilePath instead of FilePath";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rawr" = callPackage
@@ -161445,19 +156270,6 @@ self: {
      }) {};
 
   "read-env-var" = callPackage
-    ({ mkDerivation, base, doctest, Glob }:
-     mkDerivation {
-       pname = "read-env-var";
-       version = "0.1.0.1";
-       sha256 = "1r9g1wfwzjwbg87imf3zjlnzyxkfqxn47wcjgp7vl4dfa752r5i1";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/read-env-var#readme";
-       description = "Functions for safely reading environment variables";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "read-env-var_1_0_0_0" = callPackage
     ({ mkDerivation, base, doctest, exceptions, Glob, transformers }:
      mkDerivation {
        pname = "read-env-var";
@@ -161468,7 +156280,6 @@ self: {
        homepage = "https://github.com/cdepillabout/read-env-var#readme";
        description = "Functions for safely reading environment variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "read-io" = callPackage
@@ -162600,22 +157411,6 @@ self: {
      }) {};
 
   "reform-happstack" = callPackage
-    ({ mkDerivation, base, bytestring, happstack-server, mtl, random
-     , reform, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "reform-happstack";
-       version = "0.2.5.1";
-       sha256 = "1ansv8d0qy4n7yfbld25bi4vgsgdd3j3smcaqdgbylbjq066z83g";
-       libraryHaskellDepends = [
-         base bytestring happstack-server mtl random reform text utf8-string
-       ];
-       homepage = "http://www.happstack.com/";
-       description = "Happstack support for reform";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "reform-happstack_0_2_5_2" = callPackage
     ({ mkDerivation, base, bytestring, happstack-server, mtl, random
      , reform, text, utf8-string
      }:
@@ -162629,7 +157424,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack support for reform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reform-hsp" = callPackage
@@ -163628,29 +158422,6 @@ self: {
      }) {};
 
   "relational-query" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, dlist
-     , names-th, persistable-record, quickcheck-simple, sql-words
-     , template-haskell, text, th-reify-compat, time, time-locale-compat
-     , transformers
-     }:
-     mkDerivation {
-       pname = "relational-query";
-       version = "0.8.4.0";
-       sha256 = "0bvh4g7k3k0fkgbk99l5prcvxbcsj3v518lg5gpzd6aifvzzyq3q";
-       libraryHaskellDepends = [
-         array base bytestring containers dlist names-th persistable-record
-         sql-words template-haskell text th-reify-compat time
-         time-locale-compat transformers
-       ];
-       testHaskellDepends = [
-         base containers quickcheck-simple transformers
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Typeful, Modular, Relational, algebraic query engine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-query_0_9_4_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, dlist
      , names-th, persistable-record, quickcheck-simple, sql-words
      , template-haskell, text, th-reify-compat, time, time-locale-compat
@@ -163671,30 +158442,9 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Typeful, Modular, Relational, algebraic query engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query-HDBC" = callPackage
-    ({ mkDerivation, base, containers, convertible, dlist, HDBC
-     , HDBC-session, names-th, persistable-record, relational-query
-     , relational-schemas, template-haskell, th-data-compat
-     , transformers
-     }:
-     mkDerivation {
-       pname = "relational-query-HDBC";
-       version = "0.6.0.3";
-       sha256 = "1z7lpkns3bllm8sjwhv7105np1gq5bfrv52gwkpm39kbiakh0h6s";
-       libraryHaskellDepends = [
-         base containers convertible dlist HDBC HDBC-session names-th
-         persistable-record relational-query relational-schemas
-         template-haskell th-data-compat transformers
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "HDBC instance of relational-query and typed query interface for HDBC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-query-HDBC_0_6_4_0" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
      , relational-schemas, template-haskell, th-data-compat
@@ -163712,27 +158462,9 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record" = callPackage
-    ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query
-     , relational-query-HDBC
-     }:
-     mkDerivation {
-       pname = "relational-record";
-       version = "0.1.7.1";
-       sha256 = "0b3srpwid2v8c43i6dzs91ir0wvnm5ic5kr11inhav4hvh90gyhq";
-       libraryHaskellDepends = [
-         base persistable-types-HDBC-pg relational-query
-         relational-query-HDBC
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Meta package of Relational Record";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-record_0_1_8_0" = callPackage
     ({ mkDerivation, base, persistable-record
      , persistable-types-HDBC-pg, relational-query
      , relational-query-HDBC
@@ -163748,7 +158480,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Meta package of Relational Record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record-examples" = callPackage
@@ -163776,25 +158507,6 @@ self: {
      }) {};
 
   "relational-schemas" = callPackage
-    ({ mkDerivation, base, bytestring, containers, persistable-record
-     , relational-query, template-haskell, time
-     }:
-     mkDerivation {
-       pname = "relational-schemas";
-       version = "0.1.3.1";
-       sha256 = "1gaif7af90wrkqf0dhikmd8mn3xwbbf5k5pg63fkmdr17xvkfcfi";
-       revision = "2";
-       editedCabalFile = "0m53lnymdd6w6zrlv3nlf7fn0ki7z164mph0r80fyl5abb0bns8g";
-       libraryHaskellDepends = [
-         base bytestring containers persistable-record relational-query
-         template-haskell time
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "RDBMSs' schema templates for relational-query";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-schemas_0_1_4_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, relational-query
      , template-haskell, time
      }:
@@ -163808,7 +158520,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "RDBMSs' schema templates for relational-query";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relative-date" = callPackage
@@ -165086,8 +159797,8 @@ self: {
        pname = "rest-core";
        version = "0.39";
        sha256 = "012l03am5hqhykn4apg5yhjaz4zv8mwqpq6x97crraf1gxad0q6p";
-       revision = "7";
-       editedCabalFile = "0fg93xwv8m86dp074kvihk3x2lywpmb4wsxrgd0g74vf00sb0y6n";
+       revision = "8";
+       editedCabalFile = "12ia5ic2cas82h3dksdy4hzmcw42f13wqwqw0ilbn50q85j2k4pf";
        libraryHaskellDepends = [
          aeson aeson-utils base base-compat bytestring case-insensitive
          errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -165156,6 +159867,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rest-gen_0_20_0_1" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
+     , code-builder, directory, fclabels, filepath, hashable
+     , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
+     , pretty, process, rest-core, safe, scientific, semigroups, split
+     , test-framework, test-framework-hunit, text, uniplate
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rest-gen";
+       version = "0.20.0.1";
+       sha256 = "0fa4mz7drfy60lcg1j73qajy00byvhy759x195prj4nvbrsn5x31";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base base-compat blaze-html Cabal code-builder directory
+         fclabels filepath hashable haskell-src-exts HStringTemplate hxt
+         json-schema pretty process rest-core safe scientific semigroups
+         split text uniplate unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base fclabels haskell-src-exts HUnit rest-core test-framework
+         test-framework-hunit
+       ];
+       description = "Documentation and client generation from rest definition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rest-happstack" = callPackage
     ({ mkDerivation, base, containers, happstack-server, mtl, rest-core
      , rest-gen, utf8-string
@@ -165164,8 +159903,8 @@ self: {
        pname = "rest-happstack";
        version = "0.3.1.1";
        sha256 = "1xjg745ydnw1mybkx2239wrj0jh9sy5mgx11gqwrbfcn5kmhckvr";
-       revision = "1";
-       editedCabalFile = "1b2f7y8zsxz5h6bjmm86fwfkz8yrjx9vbkkh2xmqg4409q7zvrm8";
+       revision = "2";
+       editedCabalFile = "0yr1407fds0h73ijw6iivqq15ybiz3n6s555vxgaay4j4k4pkax9";
        libraryHaskellDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
@@ -165200,8 +159939,8 @@ self: {
        pname = "rest-stringmap";
        version = "0.2.0.6";
        sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6";
-       revision = "6";
-       editedCabalFile = "12ynmj96mhqdp060zydyj3jma6zwv7jphg0x2ljk5402prlxagr1";
+       revision = "7";
+       editedCabalFile = "14jqqpxxs7vkrf6syycrg2ymh79gl83z13kq261alw5gy8yjnszv";
        libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -165219,8 +159958,8 @@ self: {
        pname = "rest-types";
        version = "1.14.1.1";
        sha256 = "16lnwd7rwjb67sqklrwl40bq4h8qhp3wj1893y4vs85fpdjqxq5p";
-       revision = "3";
-       editedCabalFile = "0psp44114ca8cmcg0gbn64j4q6vkiyagrvgc957j80mfcy93xz92";
+       revision = "4";
+       editedCabalFile = "04s5xcjycbw9fqhmpx0kmy5wmkpgcs84vam68w428rb7y64099mb";
        libraryHaskellDepends = [
          aeson base base-compat case-insensitive generic-aeson
          generic-xmlpickler hxt json-schema rest-stringmap text uuid
@@ -166676,19 +161415,6 @@ self: {
      }) {};
 
   "rot13" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "rot13";
-       version = "0.1.0.2";
-       sha256 = "0d9c0zfc92xfp5v5dp83w2897pg2gyz9n14xpggakwk6ynfmf6hd";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/kvanberendonck/codec-rot13";
-       description = "Fast ROT13 cipher for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rot13_0_2_0_1" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, text }:
      mkDerivation {
        pname = "rot13";
@@ -166699,7 +161425,6 @@ self: {
        homepage = "https://github.com/kvanberendonck/codec-rot13";
        description = "Fast ROT13 cipher for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rotating-log" = callPackage
@@ -167030,34 +161755,6 @@ self: {
      }) {};
 
   "rss-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
-     , conduit-extra, containers, data-default, hlint, lens-simple
-     , mono-traversable, QuickCheck, quickcheck-instances, resourcet
-     , safe, safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, timerep, uri-bytestring, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "rss-conduit";
-       version = "0.3.0.0";
-       sha256 = "0p2z6kijgja3kwz8avmfqmj7dj52p8g3h9scrsyz26ppdmy502ip";
-       revision = "1";
-       editedCabalFile = "19gpfrihchggkn8cxc002fgyl71n676mjh5xszhr1mh9idfzqmiz";
-       libraryHaskellDepends = [
-         base conduit conduit-combinators containers lens-simple
-         mono-traversable safe safe-exceptions text time timerep
-         uri-bytestring xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra data-default hlint
-         lens-simple mono-traversable QuickCheck quickcheck-instances
-         resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text
-         time uri-bytestring xml-conduit xml-types
-       ];
-       description = "Streaming parser/renderer for the RSS 2.0 standard.";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "rss-conduit_0_3_1_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , containers, data-default, hlint, lens-simple, mono-traversable
      , QuickCheck, quickcheck-instances, resourcet, safe
@@ -167081,7 +161778,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rss2irc" = callPackage
@@ -167961,8 +162657,8 @@ self: {
      }:
      mkDerivation {
        pname = "saltine";
-       version = "0.0.0.5";
-       sha256 = "07cmij425h4gp327kivvxj3j4i1xwn5mqvjlkh98i88y06nc5w64";
+       version = "0.0.1.0";
+       sha256 = "1vsanah757hvzs1yp36944gvhh6li3xmispk3xvjddmjzdlgzn0g";
        libraryHaskellDepends = [ base bytestring profunctors ];
        librarySystemDepends = [ libsodium ];
        testHaskellDepends = [
@@ -168557,39 +163253,11 @@ self: {
      }) {};
 
   "sbv" = 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.14";
-       sha256 = "0zlf683rgpn8dcm1wrwy01s2i35px0rlhprw713jl5kic2wp3p4j";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array async base base-compat containers crackNum
-         data-binary-ieee754 deepseq directory filepath ghc mtl old-time
-         pretty process QuickCheck random syb
-       ];
-       executableHaskellDepends = [
-         base data-binary-ieee754 directory filepath HUnit process syb
-       ];
-       testHaskellDepends = [
-         base data-binary-ieee754 directory filepath HUnit syb
-       ];
-       homepage = "http://leventerkok.github.com/sbv/";
-       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sbv_7_0" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
      , process, QuickCheck, random, syb, tasty, tasty-golden
-     , tasty-hunit, template-haskell, time
+     , tasty-hunit, template-haskell, time, z3
      }:
      mkDerivation {
        pname = "sbv";
@@ -168606,11 +163274,11 @@ self: {
          hlint mtl random syb tasty tasty-golden tasty-hunit
          template-haskell
        ];
+       testSystemDepends = [ z3 ];
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) z3;};
 
   "sbvPlugin" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
@@ -170078,19 +164746,6 @@ self: {
      }) {};
 
   "search-algorithms" = callPackage
-    ({ mkDerivation, base, containers, doctest, hspec }:
-     mkDerivation {
-       pname = "search-algorithms";
-       version = "0.1.0";
-       sha256 = "0sk3mgchhz885sbgyg4a7732jnlsqzv5c7mnx7pcpz5f8nhz14sc";
-       libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base containers doctest hspec ];
-       homepage = "https://github.com/devonhollowood/search-algorithms#readme";
-       description = "Common graph search algorithms";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "search-algorithms_0_2_0" = callPackage
     ({ mkDerivation, base, containers, doctest, hspec }:
      mkDerivation {
        pname = "search-algorithms";
@@ -170101,7 +164756,6 @@ self: {
        homepage = "https://github.com/devonhollowood/search-algorithms#readme";
        description = "Common graph search algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sec" = callPackage
@@ -170546,25 +165200,6 @@ self: {
      }) {};
 
   "semigroupoids" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, comonad
-     , containers, contravariant, directory, distributive, doctest
-     , filepath, semigroups, tagged, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "semigroupoids";
-       version = "5.1";
-       sha256 = "0dgqc59p4xx5cl8qkpm6sn4wd3n59rq7l6din76hf10bnklqrb0n";
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad containers contravariant
-         distributive semigroups tagged transformers transformers-compat
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/semigroupoids";
-       description = "Semigroupoids: Category sans id";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semigroupoids_5_2" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, Cabal
      , cabal-doctest, comonad, containers, contravariant, distributive
      , doctest, semigroups, tagged, transformers, transformers-compat
@@ -170582,7 +165217,6 @@ self: {
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoids-syntax" = callPackage
@@ -170608,18 +165242,6 @@ self: {
      }) {};
 
   "semigroups" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "semigroups";
-       version = "0.18.2";
-       sha256 = "1r6hsn3am3dpf4rprrj4m04d9318v9iq02bin0pl29dg4a3gzjax";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/ekmett/semigroups/";
-       description = "Anything that associates";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semigroups_0_18_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "semigroups";
@@ -170629,7 +165251,6 @@ self: {
        homepage = "http://github.com/ekmett/semigroups/";
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroups-actions" = callPackage
@@ -170810,6 +165431,26 @@ self: {
      }) {};
 
   "sensu-run" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, filepath, http-client
+     , http-types, lens, network, optparse-applicative, process
+     , temporary, text, time, unix, vector, wreq
+     }:
+     mkDerivation {
+       pname = "sensu-run";
+       version = "0.2.0";
+       sha256 = "066pi6smcvffs7gsl1l45r2dshkw570p6h4s4nwsp5skf6k3568r";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring filepath http-client http-types lens network
+         optparse-applicative process temporary text time unix vector wreq
+       ];
+       homepage = "https://github.com/maoe/sensu-run#readme";
+       description = "A tool to send command execution results to Sensu";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "sensu-run_0_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, http-client
      , http-types, lens, network, optparse-applicative, process
      , temporary, text, time, unix, unix-compat, vector, wreq
@@ -170828,6 +165469,7 @@ self: {
        homepage = "https://github.com/maoe/sensu-run#readme";
        description = "A tool to send command execution results to Sensu";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sentence-jp" = callPackage
@@ -171284,34 +165926,6 @@ self: {
      }) {};
 
   "servant" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , case-insensitive, directory, doctest, filemanip, filepath, hspec
-     , http-api-data, http-media, http-types, mmorph, mtl, network-uri
-     , QuickCheck, quickcheck-instances, string-conversions, text, url
-     , vault
-     }:
-     mkDerivation {
-       pname = "servant";
-       version = "0.9.1.1";
-       sha256 = "1yp5qj255ym64zl5lkabiwqlijcq7pid1k4m2smxy1xbfvv74czv";
-       revision = "1";
-       editedCabalFile = "0kfy554fwl2skdb6cagrpbypg7jv15rf6bspyivdqr34dvpr7gm9";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat bytestring case-insensitive
-         http-api-data http-media http-types mmorph mtl network-uri
-         string-conversions text vault
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base-compat bytestring directory doctest
-         filemanip filepath hspec QuickCheck quickcheck-instances
-         string-conversions text url
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "A family of combinators for defining webservices APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant_0_11" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
      , bytestring, Cabal, cabal-doctest, case-insensitive, directory
      , doctest, filemanip, filepath, hspec, http-api-data, http-media
@@ -171340,7 +165954,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -171429,35 +166042,6 @@ self: {
      }) {};
 
   "servant-auth-cookie" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
-     , cereal, cookie, criterion, cryptonite, data-default, deepseq
-     , exceptions, hspec, http-api-data, http-types, memory, mtl
-     , QuickCheck, servant, servant-server, tagged, time, transformers
-     , wai
-     }:
-     mkDerivation {
-       pname = "servant-auth-cookie";
-       version = "0.4.4";
-       sha256 = "1jnlbljv6d484jzx9vympirmzvvqi2b1638b4155868vnz8sfjby";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base64-bytestring blaze-builder bytestring cereal cookie
-         cryptonite data-default exceptions http-api-data http-types memory
-         mtl servant servant-server tagged time transformers wai
-       ];
-       testHaskellDepends = [
-         base bytestring cereal cryptonite data-default deepseq hspec
-         QuickCheck servant-server time
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion cryptonite servant-server
-       ];
-       description = "Authentication via encrypted cookies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-cookie_0_5_0_5" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , cereal, cookie, criterion, cryptonite, data-default, deepseq
      , exceptions, hspec, http-api-data, http-types, memory, mtl
@@ -171484,7 +166068,6 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -171750,20 +166333,6 @@ self: {
      }) {};
 
   "servant-cassava" = callPackage
-    ({ mkDerivation, base, cassava, http-media, servant, vector }:
-     mkDerivation {
-       pname = "servant-cassava";
-       version = "0.8";
-       sha256 = "1yz4vhj7b210mgk6wjkj0gg5vzz4092jxybvwizjri1gvkvqb6sx";
-       revision = "2";
-       editedCabalFile = "0yl56hhm4isxli1srv3jvisyzic3fj5j786mikbvx1q0vv946r2b";
-       libraryHaskellDepends = [ base cassava http-media servant vector ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Servant CSV content-type for cassava";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-cassava_0_9" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, cassava, http-media
      , servant, vector
      }:
@@ -171779,7 +166348,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Servant CSV content-type for cassava";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-checked-exceptions" = callPackage
@@ -171814,36 +166382,6 @@ self: {
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, deepseq, exceptions, hspec
-     , http-api-data, http-client, http-client-tls, http-media
-     , http-types, HUnit, mtl, network, network-uri, QuickCheck, safe
-     , servant, servant-server, string-conversions, text, transformers
-     , transformers-compat, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-client";
-       version = "0.9.1.1";
-       sha256 = "0967k5xnphiq6p7s9a8qxgvzzj77nsbipinyzxvb1jlf3am5y23f";
-       revision = "1";
-       editedCabalFile = "1ic2m9pm1id250dszlh4dy5pxf5kza7ps8vnc3wfpmhxn78p5b6k";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat base64-bytestring bytestring
-         exceptions http-api-data http-client http-client-tls http-media
-         http-types mtl network-uri safe servant string-conversions text
-         transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring deepseq hspec http-api-data
-         http-client http-media http-types HUnit network QuickCheck servant
-         servant-server text transformers transformers-compat wai warp
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "automatical derivation of querying functions for servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-client_0_11" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, deepseq, exceptions, generics-sop
      , hspec, http-api-data, http-client, http-client-tls, http-media
@@ -171874,7 +166412,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-csharp" = callPackage
@@ -171941,19 +166478,19 @@ self: {
      }) {};
 
   "servant-docs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring
+    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, control-monad-omega, hashable, hspec
      , http-media, http-types, lens, servant, string-conversions, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.9.1.1";
-       sha256 = "0ydwd3jqbhss0i0l67ib082pscsq7qn88qhy49an74mabk90ahkw";
+       version = "0.10.0.1";
+       sha256 = "1lhfvlnpgliiv84pp0gjk1kzmrd66k9dsdxf1y7mwm4mq6r7qf7k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring case-insensitive
+         aeson aeson-pretty base base-compat bytestring case-insensitive
          control-monad-omega hashable http-media http-types lens servant
          string-conversions text unordered-containers
        ];
@@ -172096,18 +166633,6 @@ self: {
      }) {};
 
   "servant-foreign" = callPackage
-    ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
-     mkDerivation {
-       pname = "servant-foreign";
-       version = "0.9.1.1";
-       sha256 = "1jn9lwyvv7iv2yg0qj9702f41271835d3j39k80g6gkvr53az6ys";
-       libraryHaskellDepends = [ base http-types lens servant text ];
-       testHaskellDepends = [ base hspec ];
-       description = "Helpers for generating clients for servant APIs in any programming language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-foreign_0_10_1" = callPackage
     ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
      mkDerivation {
        pname = "servant-foreign";
@@ -172117,7 +166642,6 @@ self: {
        testHaskellDepends = [ base hspec servant ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-generic" = callPackage
@@ -172296,36 +166820,6 @@ self: {
      }) {};
 
   "servant-mock" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
-     , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server
-     , transformers, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-mock";
-       version = "0.8.1.1";
-       sha256 = "0z8rsw995k8lkp4bpw4r8bcrnq7ljazznfh0dglcc2s6k5c1ldyp";
-       revision = "1";
-       editedCabalFile = "0kfv4nbzbny7wx5d7pgc3f2jgm9xq6zabldfdm8215bh5x3sfh90";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring http-types QuickCheck servant servant-server
-         transformers wai
-       ];
-       executableHaskellDepends = [
-         aeson base QuickCheck servant-server warp
-       ];
-       testHaskellDepends = [
-         aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
-         servant-server wai
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Derive a mock server for free from your servant API types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "servant-mock_0_8_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
      , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server
      , transformers, wai, warp
@@ -172469,31 +166963,6 @@ self: {
      }) {};
 
   "servant-purescript" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, http-types, lens, mainland-pretty, purescript-bridge
-     , servant, servant-foreign, servant-server, servant-subscriber
-     , text
-     }:
-     mkDerivation {
-       pname = "servant-purescript";
-       version = "0.6.0.0";
-       sha256 = "0p1811l1szdw5cb1pm1xkfgqm157yqkpva1p3g22dbj1kzjdjv76";
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath http-types lens
-         mainland-pretty purescript-bridge servant servant-foreign
-         servant-server servant-subscriber text
-       ];
-       testHaskellDepends = [
-         aeson base containers lens mainland-pretty purescript-bridge
-         servant servant-foreign servant-subscriber text
-       ];
-       homepage = "https://github.com/eskimor/servant-purescript#readme";
-       description = "Generate PureScript accessor functions for you servant API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "servant-purescript_0_8_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, http-types, lens, mainland-pretty, purescript-bridge
      , servant, servant-foreign, servant-server, servant-subscriber
@@ -172664,42 +167133,6 @@ self: {
      }) {};
 
   "servant-server" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, containers, directory, doctest
-     , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data
-     , http-types, mtl, network, network-uri, parsec, QuickCheck, safe
-     , servant, should-not-typecheck, split, string-conversions
-     , system-filepath, temporary, text, transformers
-     , transformers-compat, wai, wai-app-static, wai-extra, warp, word8
-     }:
-     mkDerivation {
-       pname = "servant-server";
-       version = "0.9.1.1";
-       sha256 = "1ldxj6653818gsk9az8mfwvphhnh3z6wgr8igf57l7yfgraq61hy";
-       revision = "1";
-       editedCabalFile = "0wcpfg1v36jp5flf82dr5z27avff4gml9ag1znkgahxbsix17m8g";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat base64-bytestring bytestring
-         containers filepath http-api-data http-types mtl network
-         network-uri safe servant split string-conversions system-filepath
-         text transformers transformers-compat wai wai-app-static warp word8
-       ];
-       executableHaskellDepends = [ aeson base servant text wai warp ];
-       testHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring directory
-         doctest exceptions filemanip filepath hspec hspec-wai http-types
-         mtl network parsec QuickCheck safe servant should-not-typecheck
-         string-conversions temporary text transformers transformers-compat
-         wai wai-extra warp
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "A family of combinators for defining webservices APIs and serving them";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-server_0_11" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, Cabal, cabal-doctest, containers
      , directory, doctest, exceptions, filemanip, filepath, hspec
@@ -172736,7 +167169,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -172803,34 +167235,6 @@ self: {
      }) {};
 
   "servant-static-th" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers
-     , directory, doctest, filepath, Glob, hspec-wai, http-media
-     , semigroups, servant, servant-blaze, servant-server, tasty
-     , tasty-hspec, tasty-hunit, template-haskell, text, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-static-th";
-       version = "0.1.0.3";
-       sha256 = "150y6pj4n85cmv3p3h5pkkyvgv85dv0kf4zmh6iddav340gg26wx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-html bytestring containers directory filepath http-media
-         semigroups servant servant-blaze servant-server template-haskell
-         text
-       ];
-       executableHaskellDepends = [ base servant-server wai warp ];
-       testHaskellDepends = [
-         base blaze-html bytestring directory doctest filepath Glob
-         hspec-wai servant servant-blaze servant-server tasty tasty-hspec
-         tasty-hunit wai
-       ];
-       homepage = "https://github.com/cdepillabout/servant-static-th";
-       description = "Embed a directory of static files in your Servant server";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-static-th_0_1_0_4" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , directory, doctest, filepath, Glob, hspec-wai, http-media
      , semigroups, servant, servant-blaze, servant-server, tasty
@@ -172856,7 +167260,6 @@ self: {
        homepage = "https://github.com/cdepillabout/servant-static-th";
        description = "Embed a directory of static files in your Servant server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -172869,8 +167272,10 @@ self: {
      }:
      mkDerivation {
        pname = "servant-subscriber";
-       version = "0.5.0.3";
-       sha256 = "0al40x2hiam4nv8zxw8ysc2vs5r5y72dqa604i2n44jwaryg8c05";
+       version = "0.6.0.0";
+       sha256 = "0pa0zwb8qqs6y2fcs8acwljym9jmha273gb2v5nyhhfyimdl8x8q";
+       revision = "1";
+       editedCabalFile = "16r1ry5zd67mj5f2mi2sv9ls3vvc6y78ryijp8fcw1rif7mynf7h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -172916,31 +167321,6 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, directory
-     , doctest, filepath, hspec, http-media, insert-ordered-containers
-     , lens, QuickCheck, servant, swagger2, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-swagger";
-       version = "1.1.2";
-       sha256 = "0zn4r325mp1aqcg6gq2lvwizvypaabqdsnsx5v8gx29117gmr98s";
-       revision = "2";
-       editedCabalFile = "10f0f010wkz3q834c9nfnv9dg0m4hbz21r3zy39dnvjm4zjyfk0v";
-       libraryHaskellDepends = [
-         aeson base bytestring hspec http-media insert-ordered-containers
-         lens QuickCheck servant swagger2 text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base directory doctest filepath hspec lens
-         QuickCheck servant swagger2 text time
-       ];
-       homepage = "https://github.com/haskell-servant/servant-swagger";
-       description = "Generate Swagger specification for your servant API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger_1_1_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
      , cabal-doctest, directory, doctest, filepath, hspec, http-media
      , insert-ordered-containers, lens, QuickCheck, servant, swagger2
@@ -172962,38 +167342,9 @@ self: {
        homepage = "https://github.com/haskell-servant/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "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.3.2.2.8";
-       sha256 = "0daqlhwy48098wp2hjsnam7d29fj6zqxmdckqfc8z0xfs07ppbg8";
-       revision = "1";
-       editedCabalFile = "0n2c7sn7ly5wwlvns1nfzig3a6hxs1qn6jih3amnp116avvjkk1k";
-       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 lens servant servant-server servant-swagger
-         swagger2 text transformers transformers-compat wai warp
-       ];
-       homepage = "https://github.com/phadej/servant-swagger-ui#readme";
-       description = "Servant swagger ui";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger-ui_0_2_4_3_0_20" = callPackage
     ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
      , directory, file-embed, filepath, http-media, lens, servant
      , servant-blaze, servant-server, servant-swagger, swagger2
@@ -173017,7 +167368,6 @@ self: {
        homepage = "https://github.com/phadej/servant-swagger-ui#readme";
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-yaml" = callPackage
@@ -174403,27 +168753,6 @@ self: {
      }) {};
 
   "shell-conduit" = callPackage
-    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
-     , control-monad-loop, directory, filepath, monad-control, monads-tf
-     , process, resourcet, semigroups, split, template-haskell, text
-     , transformers, transformers-base, unix
-     }:
-     mkDerivation {
-       pname = "shell-conduit";
-       version = "4.5.2";
-       sha256 = "04kc9gzlqbw3d2pj6qn13pnmmrlmx8nmmj5bvxn7zdmh25nw6ys2";
-       libraryHaskellDepends = [
-         async base bytestring conduit conduit-extra control-monad-loop
-         directory filepath monad-control monads-tf process resourcet
-         semigroups split template-haskell text transformers
-         transformers-base unix
-       ];
-       homepage = "https://github.com/chrisdone/shell-conduit";
-       description = "Write shell scripts with Conduit";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "shell-conduit_4_6_1" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , control-monad-loop, directory, filepath, hspec
      , hspec-expectations, monad-control, monads-tf, process, resourcet
@@ -174446,7 +168775,6 @@ self: {
        homepage = "https://github.com/psibi/shell-conduit";
        description = "Write shell scripts with Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-escape" = callPackage
@@ -174851,19 +169179,6 @@ self: {
      }) {};
 
   "show-prettyprint" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }:
-     mkDerivation {
-       pname = "show-prettyprint";
-       version = "0.1.2.1";
-       sha256 = "1zwvaa91r4scfxxlbqzfi335bqb3jrgbkkq38dysny52fg6mn565";
-       libraryHaskellDepends = [ ansi-wl-pprint base trifecta ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/quchen/show-prettyprint#readme";
-       description = "Robust prettyprinter for output of auto-generated Show instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "show-prettyprint_0_2" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
      , trifecta
      }:
@@ -174880,7 +169195,6 @@ self: {
        homepage = "https://github.com/quchen/show-prettyprint#readme";
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "show-type" = callPackage
@@ -175548,26 +169862,6 @@ self: {
      }) {};
 
   "simple-log" = callPackage
-    ({ mkDerivation, async, base, containers, deepseq, directory
-     , exceptions, filepath, mtl, SafeSemaphore, text, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "simple-log";
-       version = "0.5.1";
-       sha256 = "1xnv5vgi1an91fw32m2c8wcf85cqwc5bh41f6cw6b23pg0hcvdyi";
-       revision = "1";
-       editedCabalFile = "0xqzi65hhmazyqpvw2c7rzs49xdm4rah84kcz7w3c25zac9hbxl2";
-       libraryHaskellDepends = [
-         async base containers deepseq directory exceptions filepath mtl
-         SafeSemaphore text time transformers
-       ];
-       homepage = "http://github.com/mvoidex/simple-log";
-       description = "Simple log for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-log_0_9_2" = callPackage
     ({ mkDerivation, async, base, base-unicode-symbols, containers
      , data-default, deepseq, directory, exceptions, filepath, hformat
      , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
@@ -175586,7 +169880,6 @@ self: {
        homepage = "http://github.com/mvoidex/simple-log";
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-log-syslog" = callPackage
@@ -175851,17 +170144,6 @@ self: {
      }) {};
 
   "simple-smt" = callPackage
-    ({ mkDerivation, base, process }:
-     mkDerivation {
-       pname = "simple-smt";
-       version = "0.6.0";
-       sha256 = "15dnd6vjf8zl0bi5r4pczxdns8614rvdq1f44sgrmy8crc4x9d0c";
-       libraryHaskellDepends = [ base process ];
-       description = "A simple way to interact with an SMT solver process";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-smt_0_7_0" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "simple-smt";
@@ -175870,7 +170152,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-sql-parser" = callPackage
@@ -176236,6 +170517,8 @@ self: {
        pname = "singleton-bool";
        version = "0.1.2.0";
        sha256 = "17a49mka1h7cd5jmgd3wm0dr45pwmc5i76xjaq7jcqsk193d1frk";
+       revision = "1";
+       editedCabalFile = "13x8chqhrlmrsca0018p7z5by3przlr9921yhjc072c8433br586";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/phadej/singleton-bool#readme";
        description = "Type level booleans";
@@ -177059,28 +171342,6 @@ self: {
      }) {};
 
   "slug" = callPackage
-    ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data
-     , path-pieces, persistent, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "slug";
-       version = "0.1.6";
-       sha256 = "14j6fca3fan8iazhf1r5l18hg22z59jj86mzbpnqhivx1nrqkmf4";
-       revision = "1";
-       editedCabalFile = "1q5adw6i43d588kbhci086blj1cvldbxcils2k99p4hs8qlzymbj";
-       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;
-     }) {};
-
-  "slug_0_1_7" = callPackage
     ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data
      , path-pieces, persistent, QuickCheck, text
      }:
@@ -177098,7 +171359,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
@@ -179162,23 +173422,40 @@ self: {
      }) {};
 
   "snowtify" = callPackage
-    ({ mkDerivation, base, data-default, either, safe, safe-exceptions
-     , text, turtle
+    ({ mkDerivation, base, either, safe, safe-exceptions, text, turtle
      }:
      mkDerivation {
        pname = "snowtify";
-       version = "0.1.0.1";
-       sha256 = "1afwffg90fi91zb3srlynqjf3mbg6nm42mww4bhyrgsjjpjgxdc6";
+       version = "0.1.0.0";
+       sha256 = "1dfs4nghjxqdfpd3hpkbxg9yn5sgn2s0l3l70xxsrzpi5xz6lvrj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base data-default either safe safe-exceptions text turtle
+         base either safe safe-exceptions text turtle
        ];
        homepage = "https://github.com/aiya000/hs-snowtify#README.md";
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "snowtify_0_1_0_3" = callPackage
+    ({ mkDerivation, base, either, safe, safe-exceptions, text, turtle
+     }:
+     mkDerivation {
+       pname = "snowtify";
+       version = "0.1.0.3";
+       sha256 = "1l3x90mpxima1j95msshp3wpw3fn1vka9b0nk4dmavxj1s8qd32q";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base either safe safe-exceptions text turtle
+       ];
+       homepage = "https://github.com/aiya000/hs-snowtify#README.md";
+       description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "soap" = callPackage
     ({ mkDerivation, base, bytestring, conduit, configurator
      , data-default, exceptions, hspec, http-client, http-types, HUnit
@@ -179270,23 +173547,6 @@ self: {
      }) {};
 
   "socket" = callPackage
-    ({ mkDerivation, async, base, bytestring, QuickCheck, tasty
-     , tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "socket";
-       version = "0.7.0.0";
-       sha256 = "0ql9y2jnm385jc5hgcjxnnxy0pwfckdrci3cx2a22y9dzrbd3nl4";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [
-         async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       homepage = "https://github.com/lpeterse/haskell-socket";
-       description = "An extensible socket library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "socket_0_8_0_1" = callPackage
     ({ mkDerivation, async, base, bytestring, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -179301,7 +173561,6 @@ self: {
        homepage = "https://github.com/lpeterse/haskell-socket";
        description = "An extensible socket library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-activation" = callPackage
@@ -179955,31 +174214,6 @@ self: {
      }) {};
 
   "sparkle" = callPackage
-    ({ mkDerivation, base, binary, bytestring, choice
-     , distributed-closure, filepath, jni, jvm, jvm-streaming, process
-     , regex-tdfa, singletons, streaming, text, vector, zip-archive
-     }:
-     mkDerivation {
-       pname = "sparkle";
-       version = "0.4.0.2";
-       sha256 = "1bygwg1kadfhlphlsh8r05lxsdb5lzz3z37lny2zd00llmc4i33p";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary bytestring choice distributed-closure jni jvm
-         jvm-streaming singletons streaming text vector
-       ];
-       executableHaskellDepends = [
-         base bytestring filepath process regex-tdfa text zip-archive
-       ];
-       homepage = "http://github.com/tweag/sparkle#readme";
-       description = "Distributed Apache Spark applications in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "sparkle_0_5_0_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, choice
      , distributed-closure, filepath, jni, jvm, jvm-streaming, process
      , regex-tdfa, singletons, streaming, text, vector, zip-archive
@@ -181044,19 +175278,6 @@ self: {
      }) {};
 
   "sql-words" = callPackage
-    ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
-     mkDerivation {
-       pname = "sql-words";
-       version = "0.1.5.0";
-       sha256 = "164a4bls6sqp8dmwn63dqa4dxyd7nd7fr7n2996bhrq7h4dk0ydv";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "SQL keywords data constructors into OverloadedString";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sql-words_0_1_5_1" = callPackage
     ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
      mkDerivation {
        pname = "sql-words";
@@ -181067,7 +175288,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "SQL keywords data constructors into OverloadedString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlcipher" = callPackage
@@ -181603,6 +175823,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stache_1_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec
+     , megaparsec, mtl, template-haskell, text, unordered-containers
+     , vector, yaml
+     }:
+     mkDerivation {
+       pname = "stache";
+       version = "1.0.0";
+       sha256 = "1ms3jxsbny6gdqwq536xsdm1xj5hlyb77mxyf6q2s0q8skyc9kvr";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq directory filepath
+         megaparsec mtl template-haskell text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers file-embed hspec hspec-megaparsec
+         megaparsec text yaml
+       ];
+       benchmarkHaskellDepends = [
+         aeson base criterion deepseq megaparsec text
+       ];
+       homepage = "https://github.com/stackbuilders/stache";
+       description = "Mustache templates for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stack" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
      , attoparsec, base, base-compat, base64-bytestring, binary
@@ -183539,8 +177787,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.4.4";
-       sha256 = "1gaxlxy1mcdlc6q7va8l6qry52svd2cangdlpvgj32ag95vvpdpc";
+       version = "0.6.0";
+       sha256 = "0mv21ac8lnrrgmay4j4bfmw9k8r7cw4mh0i9145drl62p0zi26g2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183560,15 +177808,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_7_0" = callPackage
+  "stratosphere_0_7_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , hashable, hlint, hspec, hspec-discover, lens, template-haskell
      , text, unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.7.0";
-       sha256 = "16x19sz4wq4kd12krdk1pmavma9l69x0yq4j2q657zqvmhy1izfh";
+       version = "0.7.1";
+       sha256 = "1zmchhyfgjgnckpydn8jd8rz4wyiv5ddqi3i4c0hygf4g5swz2nz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184945,36 +179193,6 @@ self: {
      }) {};
 
   "stylish-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
-     , strict, syb, test-framework, test-framework-hunit, yaml
-     }:
-     mkDerivation {
-       pname = "stylish-haskell";
-       version = "0.7.1.0";
-       sha256 = "1g011ip26yn9ixsa5bzb8gnjj58www2p0d8b7fj9b2brwqx682jp";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl syb yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl optparse-applicative strict syb yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
-         yaml
-       ];
-       homepage = "https://github.com/jaspervdj/stylish-haskell";
-       description = "Haskell code prettifier";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stylish-haskell_0_8_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
      , strict, syb, test-framework, test-framework-hunit, yaml
@@ -185002,7 +179220,6 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylized" = callPackage
@@ -185427,24 +179644,6 @@ self: {
      }) {};
 
   "superbuffer" = callPackage
-    ({ mkDerivation, async, base, buffer-builder, bytestring, criterion
-     , HTF, QuickCheck
-     }:
-     mkDerivation {
-       pname = "superbuffer";
-       version = "0.2.0.1";
-       sha256 = "0rhinl9gr80rjbjylzc42d2vnisvkb9lh4ns50nl2qcnfbns1lnf";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ async base bytestring HTF QuickCheck ];
-       benchmarkHaskellDepends = [
-         async base buffer-builder bytestring criterion
-       ];
-       homepage = "https://github.com/agrafix/superbuffer#readme";
-       description = "Efficiently build a bytestring from smaller chunks";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "superbuffer_0_3_1_1" = callPackage
     ({ mkDerivation, async, base, buffer-builder, bytestring, criterion
      , HTF, QuickCheck
      }:
@@ -185460,7 +179659,6 @@ self: {
        homepage = "https://github.com/agrafix/superbuffer#readme";
        description = "Efficiently build a bytestring from smaller chunks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supercollider-ht" = callPackage
@@ -185972,21 +180170,6 @@ self: {
      }) {};
 
   "syb" = callPackage
-    ({ mkDerivation, base, containers, HUnit, mtl }:
-     mkDerivation {
-       pname = "syb";
-       version = "0.6";
-       sha256 = "1p3cnqjm13677r4a966zffzhi9b3a321aln8zs8ckqj0d9z1z3d3";
-       revision = "1";
-       editedCabalFile = "158ngdnlq9n1mil7cq2bzy4zkgx73zzms9q56wp6ll93m5mc4nlx";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base containers HUnit mtl ];
-       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-       description = "Scrap Your Boilerplate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "syb_0_7" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl }:
      mkDerivation {
        pname = "syb";
@@ -185997,7 +180180,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
        description = "Scrap Your Boilerplate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syb-extras" = callPackage
@@ -188258,24 +182440,6 @@ self: {
      }) {};
 
   "tasty" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, clock, containers
-     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
-     , unbounded-delays
-     }:
-     mkDerivation {
-       pname = "tasty";
-       version = "0.11.2.2";
-       sha256 = "006gnkr0s6id193j06g7zs1mdzdckbgc5vwclbk535xhrgr2gzk8";
-       libraryHaskellDepends = [
-         ansi-terminal async base clock containers deepseq mtl
-         optparse-applicative regex-tdfa stm tagged unbounded-delays
-       ];
-       homepage = "https://github.com/feuerbach/tasty";
-       description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty_0_11_2_3" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers
      , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
      , unbounded-delays
@@ -188291,28 +182455,9 @@ self: {
        homepage = "https://github.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
-     , xml
-     }:
-     mkDerivation {
-       pname = "tasty-ant-xml";
-       version = "1.0.5";
-       sha256 = "0djlj91bnhqq83hbm57ljwixf5zhqk94kb1kgmdh5i74rh7l8bb4";
-       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_1_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
      , xml
@@ -188328,32 +182473,9 @@ 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-auto" = callPackage
-    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-auto";
-       version = "0.1.0.2";
-       sha256 = "070s73vcb68lbw5yb5225zvmsskmscl2jq5la0xsiqfch2vpcq6p";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base directory filepath tasty tasty-hspec tasty-hunit
-         tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/minad/tasty-auto#readme";
-       description = "Auto discovery for Tasty with support for ingredients and test tree generation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "tasty-auto_0_2_0_0" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck
      }:
@@ -188376,18 +182498,6 @@ self: {
      }) {};
 
   "tasty-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-dejafu";
-       version = "0.3.0.2";
-       sha256 = "0p9gpsfm2xsbm63w2bb9yws26lqcyj0w87l76vh67ivnmnxjw78z";
-       libraryHaskellDepends = [ base dejafu tagged tasty ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-dejafu_0_6_0_0" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
@@ -188397,32 +182507,9 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-discover" = callPackage
-    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
-     , tasty-hunit, tasty-quickcheck, tasty-th
-     }:
-     mkDerivation {
-       pname = "tasty-discover";
-       version = "1.1.0";
-       sha256 = "1id3m1f67paxb4adab5w1ksifaldn1khc0y8svyrdd84khjnhd82";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base directory filepath tasty tasty-hspec tasty-hunit
-         tasty-quickcheck tasty-th
-       ];
-       executableHaskellDepends = [ base directory filepath tasty-th ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/lwm/tasty-discover/";
-       description = "Test discovery for the tasty framework";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "tasty-discover_3_0_2" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, tasty
      , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck
      }:
@@ -188728,23 +182815,6 @@ self: {
      }) {};
 
   "tasty-rerun" = callPackage
-    ({ mkDerivation, base, containers, mtl, optparse-applicative
-     , reducers, split, stm, tagged, tasty, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-rerun";
-       version = "1.1.6";
-       sha256 = "0ycxg7whabgcxyzy6gr536x8ykzx45whh1wrbsc7c58zi862fczd";
-       libraryHaskellDepends = [
-         base containers mtl optparse-applicative reducers split stm tagged
-         tasty transformers
-       ];
-       homepage = "http://github.com/ocharles/tasty-rerun";
-       description = "Run tests by filtering the test tree depending on the result of previous test runs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-rerun_1_1_7" = callPackage
     ({ mkDerivation, base, containers, mtl, optparse-applicative
      , reducers, split, stm, tagged, tasty, transformers
      }:
@@ -188759,7 +182829,6 @@ self: {
        homepage = "http://github.com/ocharles/tasty-rerun";
        description = "Run tests by filtering the test tree depending on the result of previous test runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-silver" = callPackage
@@ -189103,8 +183172,8 @@ self: {
        pname = "tdigest";
        version = "0.1";
        sha256 = "0jy57m7acda4sk0hkkcxbkb274bc6i39hmq8l79wwmk5pspb6dh0";
-       revision = "1";
-       editedCabalFile = "0xp8csvp7vqgzz677qgw1vlkhqhvnvjhyf75m4dizgzh3mw8jmqp";
+       revision = "2";
+       editedCabalFile = "0g54mzya141wllmsv977san1qz08lz2z36znkv6cqxh8z4vyfwdk";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-compat binary deepseq reducers semigroupoids semigroups
@@ -190160,6 +184229,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "test-fixture_0_5_0_2" = callPackage
+    ({ mkDerivation, base, data-default-class, haskell-src-exts
+     , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell
+     , th-orphans, transformers
+     }:
+     mkDerivation {
+       pname = "test-fixture";
+       version = "0.5.0.2";
+       sha256 = "1k4skkwswwh60cwcqai5j4k7x8ma24dqc9mnh5ia0yw8dam5vinz";
+       libraryHaskellDepends = [
+         base data-default-class haskell-src-exts haskell-src-meta mtl
+         template-haskell th-orphans
+       ];
+       testHaskellDepends = [
+         base hspec hspec-discover mtl template-haskell transformers
+       ];
+       homepage = "http://github.com/cjdev/test-fixture#readme";
+       description = "Test monadic side-effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "test-framework" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
      , hostname, old-locale, random, regex-posix, time, xml
@@ -190738,30 +184829,6 @@ self: {
      }) {};
 
   "text" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq
-     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
-     , quickcheck-unicode, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "text";
-       version = "1.2.2.1";
-       sha256 = "0nrrzx0ws7pv4dx9jbc6jm2734al1cr0m6iwcnbck4v2yfyv3p8s";
-       libraryHaskellDepends = [
-         array base binary bytestring deepseq ghc-prim integer-gmp
-       ];
-       testHaskellDepends = [
-         array base binary bytestring deepseq directory ghc-prim HUnit
-         integer-gmp QuickCheck quickcheck-unicode random test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       doCheck = false;
-       homepage = "https://github.com/bos/text";
-       description = "An efficient packed Unicode text type";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text_1_2_2_2" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq
      , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
      , quickcheck-unicode, random, test-framework, test-framework-hunit
@@ -190783,23 +184850,9 @@ self: {
        homepage = "https://github.com/bos/text";
        description = "An efficient packed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-all" = callPackage
-    ({ mkDerivation, base, text, text-format, text-show }:
-     mkDerivation {
-       pname = "text-all";
-       version = "0.3.1.0";
-       sha256 = "11326d2il1qv7l1cnyy6n93ik37aah4j1ajwyqyjdz9h3jvbziyy";
-       libraryHaskellDepends = [ base text text-format text-show ];
-       homepage = "http://github.com/aelve/text-all";
-       description = "Everything Data.Text related in one package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "text-all_0_4_1_1" = callPackage
     ({ mkDerivation, base, bytestring, text, text-format, utf8-string
      }:
      mkDerivation {
@@ -191161,23 +185214,6 @@ self: {
      }) {};
 
   "text-metrics" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "text-metrics";
-       version = "0.2.0";
-       sha256 = "0fp4zzmq14hwprxv3h8zbm7107drj1yj0l9zp75q4qdc2k7088q8";
-       revision = "1";
-       editedCabalFile = "1j3xzb7l2qd2340p4hzfpp26y5414h61nkvhpwpg4brmd041h7fh";
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [ base hspec QuickCheck text ];
-       benchmarkHaskellDepends = [ base criterion deepseq text ];
-       homepage = "https://github.com/mrkkrp/text-metrics";
-       description = "Calculate various string metrics efficiently";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-metrics_0_3_0" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, hspec
      , QuickCheck, text, vector, weigh
      }:
@@ -191191,7 +185227,6 @@ self: {
        homepage = "https://github.com/mrkkrp/text-metrics";
        description = "Calculate various string metrics efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-normal" = callPackage
@@ -191229,23 +185264,6 @@ self: {
      }) {};
 
   "text-postgresql" = callPackage
-    ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "text-postgresql";
-       version = "0.0.2.2";
-       sha256 = "0390ca2482i6v311rb2cjqd21gr87996cwcpfaiprvl3b94lwd4i";
-       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;
-     }) {};
-
-  "text-postgresql_0_0_2_3" = callPackage
     ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
      , transformers, transformers-compat
      }:
@@ -191260,7 +185278,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
@@ -191299,26 +185316,6 @@ self: {
      }) {};
 
   "text-region" = callPackage
-    ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
-     , containers, groups, hspec, lens, mtl, text
-     }:
-     mkDerivation {
-       pname = "text-region";
-       version = "0.1.0.1";
-       sha256 = "1w8vyr8m312kp8sfpi68rfjxc57jjd1bli2lbrhwm61qydxgy5sj";
-       libraryHaskellDepends = [
-         aeson base base-unicode-symbols bytestring containers groups lens
-         mtl text
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols containers hspec lens mtl text
-       ];
-       homepage = "https://github.com/mvoidex/text-region";
-       description = "Marking text regions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-region_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
      , groups, hspec, lens, text
      }:
@@ -191333,7 +185330,6 @@ self: {
        homepage = "https://github.com/mvoidex/text-region";
        description = "Marking text regions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-register-machine" = callPackage
@@ -191392,10 +185388,10 @@ self: {
      }:
      mkDerivation {
        pname = "text-show";
-       version = "3.4.1.1";
-       sha256 = "08cr9y2d4hpq15carwk928vscn3ygm7pcs5nc7ccmpl9fg5h9fph";
-       revision = "2";
-       editedCabalFile = "1282q12n11pzih3f86aj1jx60c471s1qz9ih6w7ridgymfdw2iyk";
+       version = "3.6";
+       sha256 = "0gvg1fpgvws75zhvxdkcg03m6sy5rv4m77fynjh8v6rakbiy7gb4";
+       revision = "1";
+       editedCabalFile = "052zp68y3fbwvg9xigngaqfv7afjw9prfns5qlx6s7mv3i8dc2mk";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers contravariant generic-deriving ghc-boot-th ghc-prim
@@ -191462,29 +185458,29 @@ self: {
     ({ 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
+     , process, 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 = "0hh3d52wkq7vbbikn9sznv2i4k23b4vsnxw7s3h0nij2cxpbyz8c";
+       version = "3.6";
+       sha256 = "111s9sw9j3pq0wdv6f4wbpf4wff6iiyj8ysq3k1d527f5ln7idmi";
        revision = "1";
-       editedCabalFile = "1jbqpmphh4zrbdbqrazqls099gd73zmri1maf1qssvm4drz0ffgn";
+       editedCabalFile = "1cw1zjkvfjjgmn8p20lqx5hly5zjlvp69gqp9xdf9zfs3fsgyp8r";
        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
+         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
+         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
+         old-locale old-time pretty process QuickCheck quickcheck-instances
+         random semigroups tagged template-haskell terminfo text text-show
          th-orphans time transformers transformers-compat unix
          unordered-containers vector xhtml
        ];
@@ -192605,23 +186601,6 @@ self: {
      }) {};
 
   "threads" = callPackage
-    ({ mkDerivation, base, concurrent-extra, HUnit, stm, test-framework
-     , test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "threads";
-       version = "0.5.1.4";
-       sha256 = "1ggyfrr00b24zjjrggf2srxpxl0spd2jy54v5b70nz6c8fvhbf6k";
-       libraryHaskellDepends = [ base stm ];
-       testHaskellDepends = [
-         base concurrent-extra HUnit stm test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/basvandijk/threads";
-       description = "Fork threads and wait for their result";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "threads_0_5_1_5" = callPackage
     ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm
      , test-framework, test-framework-hunit
      }:
@@ -192637,7 +186616,6 @@ self: {
        homepage = "https://github.com/basvandijk/threads";
        description = "Fork threads and wait for their result";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threads-extras" = callPackage
@@ -192745,31 +186723,6 @@ self: {
      }) {};
 
   "threepenny-gui" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, deepseq, filepath, hashable, network-uri, safe
-     , snap-core, snap-server, stm, template-haskell, text, transformers
-     , unordered-containers, vault, vector, websockets, websockets-snap
-     }:
-     mkDerivation {
-       pname = "threepenny-gui";
-       version = "0.7.0.2";
-       sha256 = "0yc4n9b3my7mfq4w28yk4pjh14wqg116gqgx3w8wr26j0yn3y8j0";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring containers data-default deepseq
-         filepath hashable network-uri safe snap-core snap-server stm
-         template-haskell text transformers unordered-containers vault
-         vector websockets websockets-snap
-       ];
-       homepage = "http://wiki.haskell.org/Threepenny-gui";
-       description = "GUI framework that uses the web browser as a display";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "threepenny-gui_0_8_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, filepath, hashable
      , network-uri, safe, snap-core, snap-server, stm, template-haskell
@@ -192812,22 +186765,6 @@ self: {
      }) {};
 
   "threepenny-gui-flexbox" = callPackage
-    ({ mkDerivation, base, clay, text, threepenny-gui }:
-     mkDerivation {
-       pname = "threepenny-gui-flexbox";
-       version = "0.3.0.2";
-       sha256 = "0bgd0267zsxjwcz03w07wivq25v30ph9770wxhcg9lvjfv5g6f6d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base clay text threepenny-gui ];
-       executableHaskellDepends = [ base threepenny-gui ];
-       homepage = "https://github.com/barischj/threepenny-gui-flexbox";
-       description = "Flexbox layouts for Threepenny-gui";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "threepenny-gui-flexbox_0_4_2" = callPackage
     ({ mkDerivation, base, clay, text, threepenny-gui }:
      mkDerivation {
        pname = "threepenny-gui-flexbox";
@@ -192910,8 +186847,8 @@ self: {
        pname = "through-text";
        version = "0.1.0.0";
        sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk";
-       revision = "1";
-       editedCabalFile = "0rd88blvc7dz6j64868dkgz1l7zpy5gfzx2m5kp3wjbbfmjrzh7h";
+       revision = "2";
+       editedCabalFile = "1qbzxll2zfc2y9r17yk2077lyq6f2dw1745kxn5f4r33970128k6";
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
        homepage = "https://www.github.com/bergmark/through-text";
        description = "Convert textual types through Text without needing O(n^2) instances";
@@ -193112,25 +187049,6 @@ self: {
      }) {};
 
   "tidal" = callPackage
-    ({ mkDerivation, base, binary, bytestring, colour, containers
-     , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec, process
-     , text, time, transformers, websockets
-     }:
-     mkDerivation {
-       pname = "tidal";
-       version = "0.8.2";
-       sha256 = "12rs8i44cx8hnik3q52l43zd5j3qfv1ljznjam0c4gmq83dm967p";
-       libraryHaskellDepends = [
-         base binary bytestring colour containers hashable hmt hosc
-         mersenne-random-pure64 mtl parsec process text time transformers
-         websockets
-       ];
-       homepage = "http://tidal.lurk.org/";
-       description = "Pattern language for improvised music";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "tidal_0_9_4" = callPackage
     ({ mkDerivation, base, colour, containers, hashable, hosc
      , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit
      , text, time, websockets
@@ -193147,7 +187065,6 @@ self: {
        homepage = "http://tidalcycles.org/";
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tidal-midi" = callPackage
@@ -194054,18 +187971,6 @@ self: {
      }) {};
 
   "timezone-series" = callPackage
-    ({ mkDerivation, base, time }:
-     mkDerivation {
-       pname = "timezone-series";
-       version = "0.1.6.1";
-       sha256 = "1hrcbh146lq3pl4jprdmqwpbnlqv6743m52ls7qs0hqi7f69msk5";
-       libraryHaskellDepends = [ base time ];
-       homepage = "http://projects.haskell.org/time-ng/";
-       description = "Enhanced timezone handling for Data.Time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "timezone-series_0_1_8" = callPackage
     ({ mkDerivation, base, deepseq, time }:
      mkDerivation {
        pname = "timezone-series";
@@ -194075,7 +187980,6 @@ self: {
        homepage = "http://projects.haskell.org/time-ng/";
        description = "Enhanced timezone handling for Data.Time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timezone-unix" = callPackage
@@ -194278,30 +188182,6 @@ self: {
      }) {};
 
   "titlecase" = callPackage
-    ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "titlecase";
-       version = "0.1.0.3";
-       sha256 = "08i22wcb0amrl3rl3bkdbvym6zcjz2msraj78px0l0ky3prc7fv7";
-       revision = "1";
-       editedCabalFile = "0p7f68d4v1rp9lf2zaa2bx195ylrsxrds5ybl8mhdr49p0y642qf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base blaze-markup semigroups text ];
-       executableHaskellDepends = [ base blaze-markup semigroups text ];
-       testHaskellDepends = [
-         base blaze-markup semigroups tasty tasty-hunit tasty-quickcheck
-         text
-       ];
-       homepage = "https://github.com/peti/titlecase#readme";
-       description = "Convert English words to title case";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "titlecase_1_0_1" = callPackage
     ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }:
      mkDerivation {
        pname = "titlecase";
@@ -194315,7 +188195,6 @@ self: {
        homepage = "https://github.com/peti/titlecase#readme";
        description = "Convert English Words to Title Case";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -194475,19 +188354,6 @@ self: {
      }) {};
 
   "tls-session-manager" = callPackage
-    ({ mkDerivation, auto-update, base, clock, psqueues, time, tls }:
-     mkDerivation {
-       pname = "tls-session-manager";
-       version = "0.0.0.0";
-       sha256 = "04bci0pcky2sc3d0nb5nc2hg03k0gg04iy5rhcr7698ig02x8wvn";
-       libraryHaskellDepends = [
-         auto-update base clock psqueues time tls
-       ];
-       description = "In-memory TLS session manager";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tls-session-manager_0_0_0_1" = callPackage
     ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
      mkDerivation {
        pname = "tls-session-manager";
@@ -194496,7 +188362,6 @@ self: {
        libraryHaskellDepends = [ auto-update base clock psqueues tls ];
        description = "In-memory TLS session manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tmapchan" = callPackage
@@ -195592,19 +189457,6 @@ self: {
      }) {};
 
   "transformers-lift" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "transformers-lift";
-       version = "0.1.0.1";
-       sha256 = "0x5a80c8inc89h7z85qkr892s3ybk2gqybqn3h0w3cmrizsi37f2";
-       revision = "1";
-       editedCabalFile = "0jk65y544gm09hi3wl0d599aay5a6d484wi3l9nwv2yml97x9inw";
-       libraryHaskellDepends = [ base transformers ];
-       description = "Ad-hoc type classes for lifting";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "transformers-lift_0_2_0_1" = callPackage
     ({ mkDerivation, base, transformers, writer-cps-transformers }:
      mkDerivation {
        pname = "transformers-lift";
@@ -195615,7 +189467,6 @@ self: {
        ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-runnable" = callPackage
@@ -195643,22 +189494,6 @@ self: {
      }) {};
 
   "transient" = callPackage
-    ({ mkDerivation, base, containers, directory, mtl, random, stm
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "transient";
-       version = "0.4.4.1";
-       sha256 = "1vfhd25bp6hvivjvdsji11qlnxpvbvrkfjxz98lls16lqfv39bgi";
-       libraryHaskellDepends = [
-         base containers directory mtl random stm time transformers
-       ];
-       homepage = "http://www.fpcomplete.com/user/agocorona";
-       description = "Making composable programs with multithreading, events and distributed computing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "transient_0_5_8" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , random, stm, time, transformers
      }:
@@ -195677,40 +189512,9 @@ self: {
        homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "composing programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transient-universe" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , directory, filepath, hashable, HTTP, iproute, mtl, network
-     , network-info, network-uri, process, random, stm, TCache, text
-     , time, transformers, transient, vector, websockets
-     }:
-     mkDerivation {
-       pname = "transient-universe";
-       version = "0.3.5.1";
-       sha256 = "11grgp63wy8nld3802l4i4dj909bg9xnhgvr94v444dik6dby4vn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers directory filepath
-         hashable HTTP iproute mtl network network-info network-uri process
-         random stm TCache text time transformers transient vector
-         websockets
-       ];
-       executableHaskellDepends = [ base transformers transient ];
-       testHaskellDepends = [
-         base bytestring case-insensitive containers directory filepath
-         hashable HTTP mtl network network-info network-uri process random
-         stm TCache text time transformers transient vector websockets
-       ];
-       homepage = "http://www.fpcomplete.com/user/agocorona";
-       description = "Remote execution and map-reduce: distributed computing for Transient";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "transient-universe_0_4_6" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, filepath, hashable, HTTP, iproute, mtl, network
      , network-info, network-uri, process, random, stm, TCache, text
@@ -195873,17 +189677,6 @@ self: {
      }) {};
 
   "traverse-with-class" = callPackage
-    ({ mkDerivation, base, template-haskell, transformers }:
-     mkDerivation {
-       pname = "traverse-with-class";
-       version = "0.2.0.4";
-       sha256 = "0wl741z4vnvl7ghbn66nnnrw62k3v4wl280nyqx2bw9pmk7fjm4x";
-       libraryHaskellDepends = [ base template-haskell transformers ];
-       description = "Generic applicative traversals";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "traverse-with-class_1_0_0_0" = callPackage
     ({ mkDerivation, base, tasty, tasty-hunit, template-haskell
      , transformers
      }:
@@ -195895,7 +189688,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Generic applicative traversals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "travis" = callPackage
@@ -196925,6 +190717,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_4_1" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , criterion, directory, doctest, foldl, hostname, managed
+     , optional-args, optparse-applicative, process, semigroups, stm
+     , system-fileio, system-filepath, temporary, text, time
+     , transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.4.1";
+       sha256 = "1frq36axmzbcya2623vcs2cpvr7zh7bk7nzjpdpvzmwqykkfm4lc";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock directory foldl hostname
+         managed optional-args optparse-applicative process semigroups stm
+         system-fileio system-filepath temporary text time transformers unix
+         unix-compat
+       ];
+       testHaskellDepends = [ base doctest system-filepath temporary ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -199508,28 +193324,6 @@ self: {
      }) {};
 
   "unicode-transforms" = callPackage
-    ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
-     , filepath, getopt-generics, optparse-applicative, path, path-io
-     , QuickCheck, split, text
-     }:
-     mkDerivation {
-       pname = "unicode-transforms";
-       version = "0.2.1";
-       sha256 = "1g1sgyl0csz8cs62aybx4nx9alvnygvn2sa73sm8b1n5wc6sm2qx";
-       libraryHaskellDepends = [ base bitarray bytestring text ];
-       testHaskellDepends = [
-         base deepseq getopt-generics QuickCheck split text
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq filepath optparse-applicative path path-io
-         text
-       ];
-       homepage = "http://github.com/harendra-kumar/unicode-transforms";
-       description = "Unicode normalization";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unicode-transforms_0_3_2" = callPackage
     ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
      , filepath, getopt-generics, optparse-applicative, path, path-io
      , QuickCheck, split, text
@@ -199549,7 +193343,6 @@ self: {
        homepage = "http://github.com/harendra-kumar/unicode-transforms";
        description = "Unicode normalization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicoder" = callPackage
@@ -202505,27 +196298,6 @@ self: {
      }) {};
 
   "vector" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
-     , random, template-haskell, test-framework
-     , test-framework-quickcheck2, transformers
-     }:
-     mkDerivation {
-       pname = "vector";
-       version = "0.11.0.0";
-       sha256 = "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa";
-       revision = "2";
-       editedCabalFile = "1kjafhgsyjqlvrpfv2vj17hipyv0zw56a2kbl6khzn5li9szvyib";
-       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
-       testHaskellDepends = [
-         base QuickCheck random template-haskell test-framework
-         test-framework-quickcheck2 transformers
-       ];
-       homepage = "https://github.com/haskell/vector";
-       description = "Efficient Arrays";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector_0_12_0_1" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive
      , QuickCheck, random, template-haskell, test-framework
      , test-framework-hunit, test-framework-quickcheck2, transformers
@@ -202544,7 +196316,6 @@ self: {
        homepage = "https://github.com/haskell/vector";
        description = "Efficient Arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-algorithms" = callPackage
@@ -203063,20 +196834,6 @@ self: {
      }) {};
 
   "versions" = callPackage
-    ({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit
-     , text
-     }:
-     mkDerivation {
-       pname = "versions";
-       version = "3.0.2.1";
-       sha256 = "1vq2jypv6zsfcf13lnj2hfm19ajg86ld991kbaqbvbxkg1s800jp";
-       libraryHaskellDepends = [ base megaparsec text ];
-       testHaskellDepends = [ base microlens tasty tasty-hunit text ];
-       description = "Types and parsers for software version numbers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "versions_3_1_1" = callPackage
     ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens
      , tasty, tasty-hunit, text
      }:
@@ -203088,6 +196845,20 @@ self: {
        testHaskellDepends = [ base microlens tasty tasty-hunit text ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "versions_3_2_0" = callPackage
+    ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens
+     , tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "versions";
+       version = "3.2.0";
+       sha256 = "0hvjcjjrdgxrrdm300mhbj2mbvad66ak04pcbvs23wgxkqrgmqml";
+       libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
+       testHaskellDepends = [ base microlens tasty tasty-hunit text ];
+       description = "Types and parsers for software version numbers";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -203162,24 +196933,6 @@ self: {
      }) {};
 
   "viewprof" = callPackage
-    ({ mkDerivation, base, brick, containers, ghc-prof, lens
-     , scientific, text, vector, vector-algorithms, vty
-     }:
-     mkDerivation {
-       pname = "viewprof";
-       version = "0.0.0.1";
-       sha256 = "1gpppkw528k59372qp5fbnqiph934rfgk2dv317330mmpb0rm29f";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base brick containers ghc-prof lens scientific text vector
-         vector-algorithms vty
-       ];
-       description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "viewprof_0_0_0_6" = callPackage
     ({ mkDerivation, base, brick, containers, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
@@ -203196,7 +196949,6 @@ self: {
        homepage = "https://github.com/maoe/viewprof";
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -203730,43 +197482,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , deepseq, directory, filepath, hashable, HUnit, microlens
-     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
-     , quickcheck-assertions, random, smallcheck, stm, string-qq
-     , terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.15.1";
-       sha256 = "0ba8qnb59ixg9czfj71ckh82p7kkwgnhwh6c69bkjhy0f7g36hr4";
-       revision = "1";
-       editedCabalFile = "0bcvqvhmsj8fbxs19nwy80acjdp1dsphgfzj2xkj8kkxaw08s2g8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers deepseq directory filepath
-         hashable microlens microlens-mtl microlens-th mtl parallel parsec
-         stm terminfo text transformers unix utf8-string vector
-       ];
-       executableHaskellDepends = [
-         base containers microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers deepseq HUnit
-         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
-         smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       homepage = "https://github.com/jtdaugherty/vty";
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_16" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -203799,7 +197514,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -204918,30 +198632,6 @@ self: {
      }) {};
 
   "wai-middleware-rollbar" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, hostname, http-client, http-conduit, http-types, lens
-     , lens-aeson, network, QuickCheck, text, time, unordered-containers
-     , uuid, wai
-     }:
-     mkDerivation {
-       pname = "wai-middleware-rollbar";
-       version = "0.3.0";
-       sha256 = "001j9hjgny8f8hxxfr71r4b84dc696x5dsr8a08yqmfkjqmn6zy9";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive hostname http-client
-         http-conduit http-types network text time unordered-containers uuid
-         wai
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive containers lens lens-aeson
-         QuickCheck text
-       ];
-       homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme";
-       description = "Middleware that communicates to Rollbar";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-middleware-rollbar_0_4_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, hostname, hspec, hspec-golden-aeson, http-client
      , http-conduit, http-types, lens, lens-aeson, network, QuickCheck
@@ -204963,7 +198653,6 @@ self: {
        homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme";
        description = "Middleware that communicates to Rollbar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-route" = callPackage
@@ -205186,32 +198875,6 @@ self: {
      }) {};
 
   "wai-routes" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , case-insensitive, containers, cookie, data-default-class
-     , filepath, hspec, hspec-wai, hspec-wai-json, http-types
-     , mime-types, monad-loops, mtl, path-pieces, random
-     , template-haskell, text, vault, wai, wai-app-static, wai-extra
-     }:
-     mkDerivation {
-       pname = "wai-routes";
-       version = "0.9.10";
-       sha256 = "0wjn4lz3vixdysizph7an4b23cz364minhp4qcd5qk7n46136wp8";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive containers
-         cookie data-default-class filepath http-types mime-types
-         monad-loops mtl path-pieces random template-haskell text vault wai
-         wai-app-static wai-extra
-       ];
-       testHaskellDepends = [
-         aeson base hspec hspec-wai hspec-wai-json text wai
-       ];
-       homepage = "https://ajnsit.github.io/wai-routes/";
-       description = "Typesafe URLs for Wai applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "wai-routes_0_10_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, data-default-class
      , filepath, hspec, hspec-wai, hspec-wai-json, http-types
@@ -206201,21 +199864,6 @@ self: {
      }) {};
 
   "web-routes-happstack" = callPackage
-    ({ mkDerivation, base, bytestring, happstack-server, text
-     , web-routes
-     }:
-     mkDerivation {
-       pname = "web-routes-happstack";
-       version = "0.23.10";
-       sha256 = "1vgvbbrnvqwh7caxsr4fszks2f7jvr75ly6i86zks6x9rqvz7fx7";
-       libraryHaskellDepends = [
-         base bytestring happstack-server text web-routes
-       ];
-       description = "Adds support for using web-routes with Happstack";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "web-routes-happstack_0_23_11" = callPackage
     ({ mkDerivation, base, bytestring, happstack-server, text
      , web-routes
      }:
@@ -206228,7 +199876,6 @@ self: {
        ];
        description = "Adds support for using web-routes with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-hsp" = callPackage
@@ -206854,20 +200501,22 @@ self: {
 
   "websockets-rpc" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , exceptions, MonadRandom, mtl, QuickCheck, quickcheck-instances
-     , stm, tasty, tasty-quickcheck, text, transformers
-     , unordered-containers, wai-transformers, websockets
+     , exceptions, hashable, monad-control, MonadRandom, mtl, QuickCheck
+     , quickcheck-instances, stm, tasty, tasty-quickcheck, text
+     , transformers, unordered-containers, uuid, wai-transformers
+     , websockets, websockets-simple
      }:
      mkDerivation {
        pname = "websockets-rpc";
-       version = "0.0.2";
-       sha256 = "04narwk3nxrbxjw7vlypg4bgb4z8pnymdqsc0c93hybfir00n43q";
+       version = "0.4.0";
+       sha256 = "13rvlh5yvznm8f6x8yiqghnrwn6gyr0xcqzvs338lvsaqanggg0p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring containers exceptions mtl QuickCheck
-         stm text transformers unordered-containers wai-transformers
-         websockets
+         aeson async base bytestring containers exceptions hashable
+         monad-control mtl QuickCheck stm text transformers
+         unordered-containers uuid wai-transformers websockets
+         websockets-simple
        ];
        executableHaskellDepends = [
          aeson async base exceptions MonadRandom mtl wai-transformers
@@ -206912,6 +200561,24 @@ self: {
      }) {};
 
   "websockets-simple" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions
+     , monad-control, stm, wai-transformers, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-simple";
+       version = "0.0.2";
+       sha256 = "1vkq7qp3gkhh9a7g3ickwnb68xdzynaxbbc2rpzpr1x6lik5vi8a";
+       libraryHaskellDepends = [
+         aeson async base bytestring exceptions monad-control stm
+         wai-transformers websockets
+       ];
+       homepage = "https://github.com/athanclark/websockets-simple#readme";
+       description = "Simpler interface to the websockets api";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "websockets-simple_0_0_6_3" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, every, exceptions
      , hspec, monad-control, stm, tasty, tasty-hspec, transformers
      , wai-transformers, websockets
@@ -206932,23 +200599,6 @@ self: {
      }) {};
 
   "websockets-snap" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
-     , mtl, snap-core, snap-server, websockets
-     }:
-     mkDerivation {
-       pname = "websockets-snap";
-       version = "0.10.2.2";
-       sha256 = "1n3qfrbkqnn4c9bdkq0wdpgs98drmqqxqv9vz18fsz3s26vvphxw";
-       libraryHaskellDepends = [
-         base bytestring bytestring-builder io-streams mtl snap-core
-         snap-server websockets
-       ];
-       description = "Snap integration for the websockets library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "websockets-snap_0_10_2_3" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
      , mtl, snap-core, snap-server, websockets
      }:
@@ -207353,23 +201003,6 @@ self: {
      }) {};
 
   "wikicfp-scraper" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
-     , scalpel-core, text, time
-     }:
-     mkDerivation {
-       pname = "wikicfp-scraper";
-       version = "0.1.0.8";
-       sha256 = "18wl7g42lmjjl1kfvmq3j8kxsrwrm6x64m09gggb9kmd19a7fl34";
-       libraryHaskellDepends = [
-         attoparsec base bytestring scalpel-core text time
-       ];
-       testHaskellDepends = [ base bytestring filepath hspec time ];
-       homepage = "https://github.com/debug-ito/wikicfp-scraper";
-       description = "Scrape WikiCFP web site";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wikicfp-scraper_0_1_0_9" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
      , scalpel-core, text, time
      }:
@@ -207384,7 +201017,6 @@ self: {
        homepage = "https://github.com/debug-ito/wikicfp-scraper";
        description = "Scrape WikiCFP web site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wikipedia4epub" = callPackage
@@ -207460,23 +201092,6 @@ self: {
      }) {};
 
   "wild-bind-x11" = callPackage
-    ({ mkDerivation, base, containers, fold-debounce, hspec, QuickCheck
-     , stm, text, time, transformers, wild-bind, X11
-     }:
-     mkDerivation {
-       pname = "wild-bind-x11";
-       version = "0.1.0.6";
-       sha256 = "1d74735cycjm6zbv273ndwc4flxway5v5cyaapd01vmc6cl4n50y";
-       libraryHaskellDepends = [
-         base containers fold-debounce stm text transformers wild-bind X11
-       ];
-       testHaskellDepends = [ base hspec QuickCheck time wild-bind X11 ];
-       homepage = "https://github.com/debug-ito/wild-bind";
-       description = "X11-specific implementation for WildBind";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind-x11_0_1_0_7" = callPackage
     ({ mkDerivation, base, containers, fold-debounce, hspec, QuickCheck
      , stm, text, time, transformers, wild-bind, X11
      }:
@@ -207491,7 +201106,6 @@ self: {
        homepage = "https://github.com/debug-ito/wild-bind";
        description = "X11-specific implementation for WildBind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "win-hp-path" = callPackage
@@ -207667,6 +201281,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "withdependencies_0_2_4_1" = callPackage
+    ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
+     , profunctors
+     }:
+     mkDerivation {
+       pname = "withdependencies";
+       version = "0.2.4.1";
+       sha256 = "16mxhm0as0598z4w4rhfqxbnasjnzlzsb5nj12b7m8hdg5cg3x6a";
+       libraryHaskellDepends = [
+         base conduit containers mtl profunctors
+       ];
+       testHaskellDepends = [ base conduit hspec HUnit mtl ];
+       homepage = "https://github.com/bartavelle/withdependencies";
+       description = "Run computations that depend on one or more elements in a stream";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "witherable" = callPackage
     ({ mkDerivation, base, base-orphans, containers, hashable
      , transformers, unordered-containers, vector
@@ -207759,24 +201391,6 @@ self: {
      }) {};
 
   "wl-pprint-annotated" = callPackage
-    ({ mkDerivation, base, containers, deepseq, HUnit, test-framework
-     , test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "wl-pprint-annotated";
-       version = "0.0.1.4";
-       sha256 = "1c28m1xww44wynyfpyqfh39y84dw69l1vi3pd3c1sxwlp2bwh689";
-       libraryHaskellDepends = [ base containers deepseq text ];
-       testHaskellDepends = [
-         base containers deepseq HUnit test-framework test-framework-hunit
-         text
-       ];
-       homepage = "https://github.com/minad/wl-pprint-annotated#readme";
-       description = "Wadler/Leijen pretty printer with annotations and slightly modernized API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wl-pprint-annotated_0_1_0_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit
      , text
      }:
@@ -207791,7 +201405,6 @@ self: {
        homepage = "https://github.com/minad/wl-pprint-annotated#readme";
        description = "Wadler/Leijen pretty printer with annotations and slightly modernized API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wl-pprint-ansiterm" = callPackage
@@ -208833,21 +202446,6 @@ self: {
      }) {};
 
   "wuss" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
-       version = "1.1.4";
-       sha256 = "0nzxbnab5gskgp9aixnpszhr9lw6yni64qqx4w5hab3mj6gindkm";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       homepage = "https://github.com/tfausak/wuss#readme";
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_5" = callPackage
     ({ mkDerivation, base, bytestring, connection, network, websockets
      }:
      mkDerivation {
@@ -208860,7 +202458,6 @@ self: {
        homepage = "https://github.com/tfausak/wuss#readme";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -209107,28 +202704,6 @@ self: {
      }) {inherit (pkgs.xorg) libXi;};
 
   "x509" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
-     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
-     , tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "x509";
-       version = "1.6.5";
-       sha256 = "10s77746vq3w06q66dy0pcis4dbvwf2wix59yaajgar39qhr8f5m";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-parse asn1-types base bytestring containers
-         cryptonite hourglass memory mtl pem
-       ];
-       testHaskellDepends = [
-         asn1-types base bytestring cryptonite hourglass mtl tasty
-         tasty-quickcheck
-       ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
-       description = "X509 reader and writer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "x509_1_7_1" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
      , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
      , tasty, tasty-quickcheck
@@ -209148,27 +202723,9 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X509 reader and writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-store" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
-     , containers, cryptonite, directory, filepath, mtl, pem, x509
-     }:
-     mkDerivation {
-       pname = "x509-store";
-       version = "1.6.2";
-       sha256 = "0yw09nwkvr324qz4sc27c0p28bz2h6gns6lkaz9mz92mgqf2dza9";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-types base bytestring containers cryptonite
-         directory filepath mtl pem x509
-       ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
-       description = "X.509 collection accessing and storing methods";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "x509-store_1_6_3" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, directory, filepath, mtl, pem, x509
      }:
@@ -209183,27 +202740,9 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 collection accessing and storing methods";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-system" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pem, process, x509, x509-store
-     }:
-     mkDerivation {
-       pname = "x509-system";
-       version = "1.6.4";
-       sha256 = "0k7zc0xp7r6kqmi39rpiicvq78xb0pr2cq6q5s3kmmsshllg13nr";
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath mtl pem process x509
-         x509-store
-       ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
-       description = "Handle per-operating-system X.509 accessors and storage";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "x509-system_1_6_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pem, process, x509, x509-store
      }:
@@ -209218,7 +202757,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Handle per-operating-system X.509 accessors and storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-util" = callPackage
@@ -209243,25 +202781,6 @@ self: {
      }) {};
 
   "x509-validation" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
-     , bytestring, containers, cryptonite, data-default-class, hourglass
-     , memory, mtl, pem, x509, x509-store
-     }:
-     mkDerivation {
-       pname = "x509-validation";
-       version = "1.6.5";
-       sha256 = "190w1sr3w6w49v3yvqz4grb0v09ym4gll3n8bxwijvbvcybk3xyi";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-types base byteable bytestring containers
-         cryptonite data-default-class hourglass memory mtl pem x509
-         x509-store
-       ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
-       description = "X.509 Certificate and CRL validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "x509-validation_1_6_8" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
      , bytestring, containers, cryptonite, data-default-class, hourglass
      , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
@@ -209282,7 +202801,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 Certificate and CRL validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x86-64bit" = callPackage
@@ -209490,27 +203008,6 @@ self: {
      }) {};
 
   "xeno" = callPackage
-    ({ mkDerivation, array, base, bytestring, criterion, deepseq
-     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
-     , weigh, xml
-     }:
-     mkDerivation {
-       pname = "xeno";
-       version = "0.1";
-       sha256 = "1mg2imqwdcyrayvn5593da36k10vgn0a91f7igdzqp8dkjirq7p6";
-       libraryHaskellDepends = [
-         array base bytestring deepseq mtl mutable-containers vector
-       ];
-       testHaskellDepends = [ base bytestring hexml hspec ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
-       ];
-       homepage = "https://github.com/ocramz/xeno";
-       description = "A fast event-based XML parser in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xeno_0_2" = callPackage
     ({ mkDerivation, array, base, bytestring, criterion, deepseq
      , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
      , weigh, xml
@@ -209529,7 +203026,6 @@ self: {
        homepage = "https://github.com/ocramz/xeno";
        description = "A fast event-based XML parser in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xenstore" = callPackage
@@ -209843,34 +203339,6 @@ self: {
      }) {};
 
   "xlsx" = 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
-     , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, text, time, transformers, vector, xml-conduit
-     , zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "xlsx";
-       version = "0.4.3";
-       sha256 = "184r0qg5zaw6jqsmr13rbd9svhd9b8smin30kihxim73ifkg2qhq";
-       libraryHaskellDepends = [
-         base base64-bytestring binary-search bytestring conduit containers
-         data-default errors extra filepath lens mtl mtl-compat network-uri
-         old-locale safe text time transformers vector xml-conduit
-         zip-archive zlib
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff groom lens mtl raw-strings-qq
-         smallcheck tasty tasty-hunit tasty-smallcheck text time vector
-         xml-conduit
-       ];
-       homepage = "https://github.com/qrilka/xlsx";
-       description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xlsx_0_6_0" = 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
@@ -209896,7 +203364,6 @@ self: {
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-tabular" = callPackage
@@ -209982,30 +203449,6 @@ self: {
      }) {};
 
   "xml-conduit" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, conduit, conduit-extra, containers
-     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
-     , text, transformers, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit";
-       version = "1.4.0.4";
-       sha256 = "1z2j5laqzppd9bakq1b1qiy1pz461x4zq9hxffsp2nppsdwq418i";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         conduit conduit-extra containers data-default deepseq monad-control
-         resourcet text transformers xml-types
-       ];
-       testHaskellDepends = [
-         base blaze-markup bytestring conduit containers hspec HUnit
-         resourcet text transformers xml-types
-       ];
-       homepage = "http://github.com/snoyberg/xml";
-       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xml-conduit_1_5_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default, deepseq, hspec, HUnit, monad-control, resourcet
@@ -210027,7 +203470,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -212568,51 +206010,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
-     , cereal, clientsession, conduit, conduit-extra, containers, cookie
-     , criterion, data-default, deepseq, deepseq-generics, directory
-     , exceptions, fast-logger, hspec, hspec-expectations, http-types
-     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
-     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
-     , random, resourcet, safe, semigroups, shakespeare
-     , streaming-commons, template-haskell, text, time, transformers
-     , transformers-base, unix-compat, unordered-containers, vector, wai
-     , wai-extra, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.4.35";
-       sha256 = "1wawpd2pwqn535zrs5wz43jvi0bca0q2kinml6waw5d4s7m0npby";
-       revision = "1";
-       editedCabalFile = "1cgizphqsjd6qmz7xa1flcg064rg5543shybqx6l2npyr21h67yk";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-builder blaze-html blaze-markup
-         byteable bytestring case-insensitive cereal clientsession conduit
-         conduit-extra containers cookie data-default deepseq
-         deepseq-generics directory exceptions fast-logger http-types
-         lifted-base monad-control monad-logger mtl mwc-random old-locale
-         parsec path-pieces primitive random resourcet safe semigroups
-         shakespeare template-haskell text time transformers
-         transformers-base unix-compat unordered-containers vector wai
-         wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring clientsession conduit
-         conduit-extra containers cookie hspec hspec-expectations http-types
-         HUnit lifted-base mwc-random network path-pieces QuickCheck random
-         resourcet shakespeare streaming-commons template-haskell text
-         transformers wai wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion shakespeare text transformers
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_4_35_1" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -212653,7 +206050,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-crud" = callPackage
@@ -212895,30 +206291,6 @@ self: {
      }) {};
 
   "yesod-form" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, template-haskell, text, time
-     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.4.12";
-       sha256 = "0lcakfc0x17ng5kk1ahmd9m8nlbzll8mxw7fzxw2y48vak0kh5kk";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare
-         template-haskell text time transformers wai xss-sanitize yesod-core
-         yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_4_13" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -212940,7 +206312,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
@@ -213703,41 +207074,6 @@ self: {
      }) {};
 
   "yesod-static" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , blaze-builder, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptohash, cryptohash-conduit, css-text
-     , data-default, directory, exceptions, file-embed, filepath
-     , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time
-     , process, resourcet, template-haskell, text, transformers
-     , unix-compat, unordered-containers, wai, wai-app-static, wai-extra
-     , yesod-core, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-static";
-       version = "1.5.3";
-       sha256 = "0raxbnr1xpxgirh2fhs3m277yzbklf6k3dijrrx4kh2bnaiax1ml";
-       libraryHaskellDepends = [
-         async attoparsec base base64-bytestring blaze-builder byteable
-         bytestring conduit conduit-extra containers cryptohash
-         cryptohash-conduit css-text data-default directory exceptions
-         file-embed filepath hashable hjsmin http-types mime-types old-time
-         process resourcet template-haskell text transformers unix-compat
-         unordered-containers wai wai-app-static yesod-core
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring byteable bytestring conduit
-         conduit-extra containers cryptohash cryptohash-conduit data-default
-         directory exceptions file-embed filepath hjsmin hspec http-types
-         HUnit mime-types old-time process resourcet template-haskell text
-         transformers unix-compat unordered-containers wai wai-app-static
-         wai-extra yesod-core yesod-test
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Static file serving subsite for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-static_1_5_3_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, byteable, bytestring, conduit, conduit-extra
      , containers, cryptonite, cryptonite-conduit, css-text
@@ -213770,7 +207106,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-static-angular" = callPackage
@@ -213832,33 +207167,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, containers, cookie
-     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
-     , monad-control, network, persistent, pretty-show, text, time
-     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
-     , yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.5.7";
-       sha256 = "04q1hp09wbr4y77v0296c9z9hp5rgaz5pvahw6p1hk3vfypjlss2";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive containers cookie hspec-core html-conduit
-         http-types HUnit monad-control network persistent pretty-show text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit
-         lifted-base text wai xml-conduit yesod-core yesod-form
-       ];
-       homepage = "http://www.yesodweb.com";
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_5_8" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, containers, cookie
      , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
@@ -213883,7 +207191,6 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -214128,52 +207435,6 @@ self: {
      }) {};
 
   "yi-core" = callPackage
-    ({ mkDerivation, array, attoparsec, base, binary, bytestring
-     , containers, criterion, data-default, deepseq, directory, dlist
-     , dynamic-state, dyre, exceptions, filepath, hashable, Hclip
-     , ListLike, microlens-platform, mtl, old-locale, oo-prototypes
-     , parsec, pointedlist, process, process-extras, quickcheck-text
-     , safe, semigroups, split, tasty, tasty-hunit, tasty-quickcheck
-     , text, text-icu, time, transformers-base, unix, unix-compat
-     , unordered-containers, word-trie, xdg-basedir, yi-language
-     , yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-core";
-       version = "0.13.7";
-       sha256 = "0i2n8jx15fic32kakppj9lz935dcm0090b736f8w711x6aib6nmg";
-       libraryHaskellDepends = [
-         array attoparsec base binary bytestring containers data-default
-         directory dlist dynamic-state dyre exceptions filepath hashable
-         Hclip ListLike microlens-platform mtl old-locale oo-prototypes
-         parsec pointedlist process process-extras safe semigroups split
-         text text-icu time transformers-base unix unix-compat
-         unordered-containers word-trie xdg-basedir yi-language yi-rope
-       ];
-       testHaskellDepends = [
-         array attoparsec base binary bytestring containers data-default
-         directory dlist dynamic-state dyre exceptions filepath hashable
-         Hclip ListLike microlens-platform mtl old-locale oo-prototypes
-         parsec pointedlist process process-extras quickcheck-text safe
-         semigroups split tasty tasty-hunit tasty-quickcheck text text-icu
-         time transformers-base unix unix-compat unordered-containers
-         word-trie xdg-basedir yi-language yi-rope
-       ];
-       benchmarkHaskellDepends = [
-         array attoparsec base binary bytestring containers criterion
-         data-default deepseq directory dlist dynamic-state dyre exceptions
-         filepath hashable Hclip ListLike microlens-platform mtl old-locale
-         oo-prototypes parsec pointedlist process process-extras safe
-         semigroups split text text-icu time transformers-base unix
-         unix-compat unordered-containers word-trie xdg-basedir yi-language
-         yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor core library";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-core_0_14_0" = callPackage
     ({ mkDerivation, array, attoparsec, base, binary, bytestring
      , containers, criterion, data-default, deepseq, directory, dlist
      , dynamic-state, dyre, filepath, hashable, ListLike
@@ -214214,7 +207475,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor core library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-dynamic-configuration" = callPackage
@@ -214268,24 +207528,6 @@ self: {
      }) {};
 
   "yi-frontend-vty" = callPackage
-    ({ mkDerivation, base, containers, data-default, dlist
-     , microlens-platform, pointedlist, stm, text, vty, yi-core
-     , yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-frontend-vty";
-       version = "0.13.7";
-       sha256 = "0sgk9cx6q7mxjc1w7396mrrlds0gbilky2w04j4cj7c57nq42n93";
-       libraryHaskellDepends = [
-         base containers data-default dlist microlens-platform pointedlist
-         stm text vty yi-core yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Vty frontend for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-frontend-vty_0_14_0" = callPackage
     ({ mkDerivation, base, containers, data-default, dlist
      , microlens-platform, pointedlist, stm, text, vty, yi-core
      , yi-language, yi-rope
@@ -214301,28 +207543,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Vty frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-fuzzy-open" = callPackage
-    ({ mkDerivation, base, binary, containers, data-default, directory
-     , filepath, mtl, text, transformers-base, vector, yi-core
-     , yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-fuzzy-open";
-       version = "0.13.7";
-       sha256 = "0gqab3cdl2mrdp7wymhn6gy63mnd438m6ax6wis22kq1xpc5hdqd";
-       libraryHaskellDepends = [
-         base binary containers data-default directory filepath mtl text
-         transformers-base vector yi-core yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Fuzzy open plugin for yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-fuzzy-open_0_14_0" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
      , yi-language, yi-rope
@@ -214338,7 +207561,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-gtk" = callPackage
@@ -214354,23 +207576,6 @@ self: {
      }) {};
 
   "yi-ireader" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, data-default
-     , microlens-platform, text, yi-core, yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-ireader";
-       version = "0.13.7";
-       sha256 = "1f4nj22nkk33s3w8gwa38cab50232laifkc4kd89ybaj4w9yawfj";
-       libraryHaskellDepends = [
-         base binary bytestring containers data-default microlens-platform
-         text yi-core yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor incremental reader";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-ireader_0_14_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, data-default
      , microlens-platform, text, yi-core, yi-language, yi-rope
      }:
@@ -214385,27 +207590,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor incremental reader";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-cua" = callPackage
-    ({ mkDerivation, base, microlens-platform, text, yi-core
-     , yi-keymap-emacs, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-keymap-cua";
-       version = "0.13.7";
-       sha256 = "0fm2kgafmzbn8fvksl0mx0c5r0aqvdmnh6pnp5ql5xr73k4n4pmf";
-       libraryHaskellDepends = [
-         base microlens-platform text yi-core yi-keymap-emacs yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Cua keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yi-keymap-cua_0_14_0" = callPackage
     ({ mkDerivation, base, microlens-platform, text, yi-core
      , yi-keymap-emacs, yi-rope
      }:
@@ -214423,26 +207610,6 @@ self: {
      }) {};
 
   "yi-keymap-emacs" = callPackage
-    ({ mkDerivation, base, containers, filepath, Hclip
-     , microlens-platform, mtl, oo-prototypes, semigroups, text
-     , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-keymap-emacs";
-       version = "0.13.7";
-       sha256 = "1whxh7jznfq27ps9wnqaarhc8dcmfx19i01m0h6pbh7zmlyl2ddn";
-       libraryHaskellDepends = [
-         base containers filepath Hclip microlens-platform mtl oo-prototypes
-         semigroups text transformers-base yi-core yi-language yi-misc-modes
-         yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Emacs keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yi-keymap-emacs_0_14_0" = callPackage
     ({ mkDerivation, base, containers, filepath, Hclip
      , microlens-platform, mtl, oo-prototypes, semigroups, text
      , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope
@@ -214463,36 +207630,6 @@ self: {
      }) {};
 
   "yi-keymap-vim" = callPackage
-    ({ mkDerivation, attoparsec, base, binary, containers, data-default
-     , directory, filepath, Hclip, microlens-platform, mtl
-     , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers-base
-     , unordered-containers, yi-core, yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-keymap-vim";
-       version = "0.13.7";
-       sha256 = "0d91lpcrsbwwacqycmkdmxkwnx7rn116cj76ddb7wrnikaj6vv1j";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base binary containers data-default directory filepath
-         Hclip microlens-platform mtl oo-prototypes pointedlist safe
-         semigroups text transformers-base unordered-containers yi-core
-         yi-language yi-rope
-       ];
-       testHaskellDepends = [
-         attoparsec base binary containers data-default directory filepath
-         Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck
-         safe semigroups tasty tasty-hunit tasty-quickcheck text
-         transformers-base unordered-containers yi-core yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Vim keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yi-keymap-vim_0_14_0" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, data-default
      , directory, filepath, Hclip, microlens-platform, mtl
      , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty
@@ -214523,34 +207660,6 @@ self: {
      }) {};
 
   "yi-language" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers
-     , data-default, hashable, microlens-platform, oo-prototypes
-     , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
-     , tasty-quickcheck, template-haskell, transformers-base
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "yi-language";
-       version = "0.13.7";
-       sha256 = "1cfa44fv2kvsk695ny9rvi3ih55d3gzak5873zmb35bdc64v2k66";
-       libraryHaskellDepends = [
-         array base binary containers data-default hashable
-         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
-         template-haskell transformers-base unordered-containers
-       ];
-       libraryToolDepends = [ alex ];
-       testHaskellDepends = [
-         array base binary containers data-default hashable
-         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
-         tasty tasty-hspec tasty-quickcheck template-haskell
-         transformers-base unordered-containers
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Collection of language-related Yi libraries";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-language_0_14_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
      , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -214576,30 +207685,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-misc-modes" = callPackage
-    ({ mkDerivation, alex, array, base, binary, data-default, filepath
-     , microlens-platform, semigroups, text, yi-core, yi-language
-     , yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-misc-modes";
-       version = "0.13.7";
-       sha256 = "0gyy7rg0wgblsilx83hrdb0fgc54skhljxw2csq41qdb5z756nqg";
-       libraryHaskellDepends = [
-         array base binary data-default filepath microlens-platform
-         semigroups text yi-core yi-language yi-rope
-       ];
-       libraryToolDepends = [ alex ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor miscellaneous modes";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yi-misc-modes_0_14_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, semigroups, text, yi-core, yi-language
      , yi-rope
@@ -214620,34 +207708,6 @@ self: {
      }) {};
 
   "yi-mode-haskell" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers
-     , data-default, filepath, hashable, hspec, microlens-platform
-     , pointedlist, QuickCheck, regex-base, regex-tdfa, template-haskell
-     , text, transformers-base, unordered-containers, yi-core
-     , yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-mode-haskell";
-       version = "0.13.7";
-       sha256 = "00p9hmvdd3llm0xnm0xrz8n9a74jh8lmazsm9ng4c3l0a5f3kxqq";
-       libraryHaskellDepends = [
-         array base binary data-default microlens-platform text yi-core
-         yi-language yi-rope
-       ];
-       libraryToolDepends = [ alex ];
-       testHaskellDepends = [
-         array base binary containers data-default filepath hashable hspec
-         microlens-platform pointedlist QuickCheck regex-base regex-tdfa
-         template-haskell text transformers-base unordered-containers
-         yi-core yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor haskell mode";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yi-mode-haskell_0_14_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, text, yi-core, yi-language, yi-rope
      }:
@@ -214667,26 +207727,6 @@ self: {
      }) {};
 
   "yi-mode-javascript" = callPackage
-    ({ mkDerivation, alex, array, base, binary, data-default, dlist
-     , filepath, microlens-platform, mtl, text, yi-core, yi-language
-     , yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-mode-javascript";
-       version = "0.13.7";
-       sha256 = "0fifk329g66r2k5a0j4jw8lcwlxc9v4r66sggrizgcqmcfxj895a";
-       libraryHaskellDepends = [
-         array base binary data-default dlist filepath microlens-platform
-         mtl text yi-core yi-language yi-rope
-       ];
-       libraryToolDepends = [ alex ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor javascript mode";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yi-mode-javascript_0_14_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, dlist
      , filepath, microlens-platform, mtl, text, yi-core, yi-language
      , yi-rope
@@ -214720,27 +207760,6 @@ self: {
      }) {};
 
   "yi-rope" = callPackage
-    ({ mkDerivation, base, binary, bytestring, charsetdetect-ae
-     , criterion, data-default, deepseq, fingertree, hspec, QuickCheck
-     , quickcheck-instances, text, text-icu
-     }:
-     mkDerivation {
-       pname = "yi-rope";
-       version = "0.8";
-       sha256 = "0khl687zd2rly3qfy256hix0hc55j982qknln8fm9vp31zhlbkza";
-       libraryHaskellDepends = [
-         base binary bytestring charsetdetect-ae data-default deepseq
-         fingertree text text-icu
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck quickcheck-instances text
-       ];
-       benchmarkHaskellDepends = [ base criterion deepseq text ];
-       description = "A rope data structure used by Yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-rope_0_9" = callPackage
     ({ mkDerivation, base, binary, bytestring, charsetdetect-ae
      , criterion, data-default, deepseq, fingertree, hspec, QuickCheck
      , quickcheck-instances, text, text-icu
@@ -214759,32 +207778,9 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-snippet" = callPackage
-    ({ mkDerivation, base, binary, containers, data-default, free
-     , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
-     , yi-core, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-snippet";
-       version = "0.13.7";
-       sha256 = "18h67vc2fb35jfmz4zq3sc7av5nrl5cqa8q5vhdywhhhp6bsvi00";
-       libraryHaskellDepends = [
-         base binary containers data-default free microlens-platform mtl
-         text vector yi-core yi-rope
-       ];
-       testHaskellDepends = [
-         base binary containers data-default free microlens-platform mtl
-         tasty-hunit tasty-th text vector yi-core yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Snippet support for yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-snippet_0_14_0" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, free
      , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
      , yi-core, yi-rope
@@ -214803,7 +207799,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Snippet support for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-solarized" = callPackage
@@ -216237,8 +209232,8 @@ self: {
        pname = "ztail";
        version = "1.2";
        sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk";
-       revision = "1";
-       editedCabalFile = "0hp1mhyys3qxlvr2iyj3mh3cb48zb8vcny6f51dhv6w2z8a86lkk";
+       revision = "2";
+       editedCabalFile = "0da9vwpn7nv37zznav18vp9h4knr0d433964dp3mvnh42ajb0490";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [

From cb1742e76d8a7254a5ffffbf86b2281b89984e2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Jul 2017 16:09:39 +0200
Subject: [PATCH 1143/3246] haskell: fix builds broken by LTS-9 update

---
 .../haskell-modules/configuration-common.nix   | 18 +++++++++---------
 .../configuration-ghc-8.2.x.nix                |  9 ---------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6b9e7f071c5..43270465775 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -702,12 +702,6 @@ self: super: {
   # broken test suite
   servant-server = dontCheck super.servant-server;
 
-  # Fix build for latest versions of servant and servant-client.
-  servant-client_0_11 = super.servant-client_0_11.overrideScope (self: super: {
-    servant-server = self.servant-server_0_11;
-    servant = self.servant_0_11;
-  });
-
   # build servant docs from the repository
   servant =
     let
@@ -865,9 +859,6 @@ self: super: {
     postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
   });
 
-  # Needs a newer version of hsyslog than lts-8.x provides.
-  logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5_0_1; };
-
   # Has a dependency on outdated versions of directory.
   cautious-file = doJailbreak (dontCheck super.cautious-file);
 
@@ -877,4 +868,13 @@ self: super: {
   # Needs a newer version of ghc-events.
   threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; };
 
+  # version 1.3.1.2 does not compile: syb >=0.1.0.2 && <0.7
+  ChasingBottoms = doJailbreak super.ChasingBottoms;
+
+  # test suite does not compile with recent versions of QuickCheck
+  integer-logarithms = dontCheck (super.integer-logarithms);
+
+  # https://github.com/vincenthz/hs-tls/issues/247
+  tls = dontCheck super.tls;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index b29a1820d49..6f4ced675b3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -59,15 +59,6 @@ self: super: {
   # https://github.com/nominolo/ghc-syb/issues/20
   ghc-syb-utils = dontCheck super.ghc-syb-utils;
 
-  # Older, LTS-8-based versions don't compile.
-  base-orphans = self.base-orphans_0_6;
-  hspec-meta = self.hspec-meta_2_4_4;
-  lens = self.lens_4_15_3;
-  primitive = self.primitive_0_6_2_0;
-  semigroupoids = self.semigroupoids_5_2;
-  syb = self.syb_0_7;
-  vector = super.vector_0_12_0_1;
-
   # Work around overly restrictive constraints on the version of 'base'.
   ChasingBottoms = doJailbreak super.ChasingBottoms;
   hashable = doJailbreak super.hashable;

From 9a2a8a58550987956399778f9e0cdfb2c1945c44 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Thu, 27 Jul 2017 18:29:39 -0700
Subject: [PATCH 1144/3246] java: fix dtrace detection

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

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 7977881d5f6..9ca28375c6b 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -97,6 +97,7 @@ let
       chmod +x configure
       substituteInPlace configure --replace /bin/bash "$shell"
       substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell"
+      substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
     '';
 
     configureFlags = [

From 5b99d539759ee927cdfd4c4a8cacfedc364b70b1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 27 Jul 2017 18:56:34 +0300
Subject: [PATCH 1145/3246] kernel: Build Tegra X1 USB support as a module

---
 lib/systems/platforms.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index ae4fc355c71..54ed8f3c12c 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -543,6 +543,10 @@ rec {
 
       # Cavium ThunderX stuff.
       PCI_HOST_THUNDER_ECAM y
+
+      # The default (=y) forces us to have the XHCI firmware available in initrd,
+      # which our initrd builder can't currently do easily.
+      USB_XHCI_TEGRA m
     '';
     uboot = null;
     kernelTarget = "Image";

From d460fd0f99b518f25adcb1b67e73b850aaa0a9c0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 28 Jul 2017 19:17:36 +0200
Subject: [PATCH 1146/3246] nodePackages.dhcp: init at 0.2.9

---
 .../node-packages/node-packages-v6.json       |  1 +
 .../node-packages/node-packages-v6.nix        | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 627f6bf4b88..b50b47ac0a9 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -8,6 +8,7 @@
 , "coffee-script"
 , "cordova"
 , "csslint"
+, "dhcp"
 , "dnschain"
 , "docker-registry-server"
 , "elasticdump"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index e241864f082..31e5dddd6fd 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -22688,6 +22688,25 @@ in
     };
     production = true;
   };
+  dhcp = nodeEnv.buildNodePackage {
+    name = "dhcp";
+    packageName = "dhcp";
+    version = "0.2.9";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.9.tgz";
+      sha1 = "204208be1cef2788d528744fb263f60a528363a2";
+    };
+    dependencies = [
+      sources."minimist-1.2.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A DHCP server written in JavaScript";
+      homepage = https://github.com/infusion/node-dhcp;
+      license = "MIT OR GPL-2.0";
+    };
+    production = true;
+  };
   dnschain = nodeEnv.buildNodePackage {
     name = "dnschain";
     packageName = "dnschain";

From 168fbde17a2f3d53b77afa9287afaac4dfde8b14 Mon Sep 17 00:00:00 2001
From: Joel Thompson <joel@jthompson.io>
Date: Thu, 27 Jul 2017 21:53:39 -0400
Subject: [PATCH 1147/3246] exhibitor: Fix bug with automatic instance
 management

Exhibitor tests the auto-manage-instances config value to see if it's a
non-zero integer, rather than a true/false string, which was getting
put into the config before. This now causes autoManageInstances to
behave correctly.
---
 nixos/modules/services/misc/exhibitor.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix
index 1db42275867..600bd780e7b 100644
--- a/nixos/modules/services/misc/exhibitor.nix
+++ b/nixos/modules/services/misc/exhibitor.nix
@@ -15,9 +15,12 @@ let
     election-port=${toString cfg.zkElectionPort}
     cleanup-period-ms=${toString cfg.zkCleanupPeriod}
     servers-spec=${concatStringsSep "," cfg.zkServersSpec}
-    auto-manage-instances=${lib.boolToString cfg.autoManageInstances}
+    auto-manage-instances=${toString cfg.autoManageInstances}
     ${cfg.extraConf}
   '';
+  # NB: toString rather than lib.boolToString on cfg.autoManageInstances is intended.
+  # Exhibitor tests if it's an integer not equal to 0, so the empty string (toString false)
+  # will operate in the same fashion as a 0.
   configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig;
   cliOptionsCommon = {
     configtype = cfg.configType;

From 6b473df9ccaac60e28c98ffb2ec8f83ca39e7f50 Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@openmailbox.org>
Date: Sat, 29 Jul 2017 03:28:06 +0700
Subject: [PATCH 1148/3246] ostree: 2016.11 -> 2017.9

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

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 4655331dbc1..82abb5c9bbc 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -7,18 +7,18 @@ let
   libglnx-src = fetchFromGitHub {
     owner  = "GNOME";
     repo   = "libglnx";
-    rev    = "36396b49ad6636c9959f3dfac5e04d41584b1a92";
-    sha256 = "146flrpzybm2s12wg05rnglnfd2f2jx3xzvns2pq28kvg09bgcfn";
+    rev    = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6";
+    sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs";
   };
 
   bsdiff-src = fetchFromGitHub {
     owner  = "mendsley";
     repo   = "bsdiff";
-    rev    = "1edf9f656850c0c64dae260960fabd8249ea9c60";
-    sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
+    rev    = "7d70d8f4ff48345bc76e314c9d98da91f78873fa";
+    sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws";
   };
 
-  version = "2016.11";
+  version = "2017.9";
 in stdenv.mkDerivation {
   name = "ostree-${version}";
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
     rev    = "v${version}";
     owner  = "ostreedev";
     repo   = "ostree";
-    sha256 = "19xmg01mxdykx74r9ra11hc15qd1fjqbxdn23jrn2pcvz8dw9zgc";
+    sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3";
   };
 
   nativeBuildInputs = [

From 4964b104b946e889587407e27fa11f9412e24c8b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 26 Jul 2017 09:30:00 +0000
Subject: [PATCH 1149/3246] ld-wrapper: Optimize expanding rpath

The time to expand rpath was proportional to the number of -L flags times the
number of -l flags.  Now it is proportional to their sum (assuming constant
number of files in each directory in an -L flag).

Issue reported by @nh2 at https://github.com/NixOS/nixpkgs/issues/27609#issuecomment-317916623
---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 189 +++++++++-----------
 1 file changed, 83 insertions(+), 106 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 240082b5dfd..283a6fb3ef9 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -1,4 +1,5 @@
 #! @shell@ -e
+shopt -s nullglob
 path_backup="$PATH"
 if [ -n "@coreutils_bin@" ]; then
   PATH="@coreutils_bin@/bin"
@@ -20,18 +21,19 @@ expandResponseParams "$@"
 if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \
         -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \) ]; then
     rest=()
-    n=0
-    while [ $n -lt ${#params[*]} ]; do
+    nParams=${#params[@]}
+    declare -i n=0
+    while [ $n -lt $nParams ]; do
         p=${params[n]}
         p2=${params[$((n+1))]}
         if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
-            skip $p
+            skip "${p:2}"
         elif [ "$p" = -L ] && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
+            n+=1; skip "$p2"
         elif [ "$p" = -rpath ] && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
+            n+=1; skip "$p2"
         elif [ "$p" = -dynamic-linker ] && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
+            n+=1; skip "$p2"
         elif [ "${p:0:1}" = / ] && badPath "$p"; then
             # We cannot skip this; barf.
             echo "impure path \`$p' used in link" >&2
@@ -40,9 +42,9 @@ if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \
             # Our ld is not built with sysroot support (Can we fix that?)
             :
         else
-            rest=("${rest[@]}" "$p")
+            rest+=("$p")
         fi
-        n=$((n + 1))
+        n+=1
     done
     params=("${rest[@]}")
 fi
@@ -50,7 +52,7 @@ fi
 LD=@prog@
 source @out@/nix-support/add-hardening.sh
 
-extra=(${hardeningLDFlags[@]})
+extra=("${hardeningLDFlags[@]}")
 extraBefore=()
 
 if [ -z "$NIX_LDFLAGS_SET" ]; then
@@ -60,122 +62,97 @@ fi
 
 extra+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN)
 
+declare -A rpaths
+declare -a libDirs
+declare -A libs
+relocatable=
+
+# Find all -L... switches for rpath, and relocatable flags for build id.
+if [ "$NIX_DONT_SET_RPATH" != 1 ] || [ "$NIX_SET_BUILD_ID" = 1 ]; then
+    prev=
+    for p in "${params[@]}" "${extra[@]}"; do
+        case "$prev" in
+            -L)
+                libDirs+=("$p")
+                ;;
+            -l)
+                libs["lib${p}.so"]=1
+                ;;
+            -dynamic-linker)
+                # Ignore the dynamic linker argument, or it
+                # will match *.so and be added to rpath.
+                ;;
+            *)
+                case "$p" in
+                    -L/*)
+                        libDirs+=("${p:2}")
+                        ;;
+                    -l?*)
+                        libs["lib${p:2}.so"]=1
+                        ;;
+                    "$NIX_STORE"/*.so | "$NIX_STORE"/*.so.*)
+                        # This is a direct reference to a shared library, so add
+                        # its directory to the rpath.
+                        dir="${p%/*}"
+                        if [ ! "${rpaths[$dir]}" ]; then
+                            rpaths["$dir"]=1
+                            extra+=(-rpath "$dir")
+                        fi
+                        ;;
+                    -r | --relocatable | -i)
+                        relocatable=1
+                esac
+                ;;
+        esac
+        prev="$p"
+    done
+fi
+
 
 # Add all used dynamic libraries to the rpath.
 if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
-
-    declare -A libDirsSeen
-    declare -a libDirs
-
-    addToLibPath() {
-        local path="$1"
-        if [ "${path:0:1}" != / ]; then return 0; fi
-        case "$path" in
-            *..*|*./*|*/.*|*//*)
-                local path2
-                if path2=$(readlink -f "$path"); then
-                    path="$path2"
-                fi
-                ;;
-        esac
-        if [[ -z ${libDirsSeen[$path]} ]]; then
-            libDirs+=("$path")
-            libDirsSeen[$path]=1
-        fi
-    }
-
-    declare -A rpathsSeen
-    declare -a rpaths
-
-    addToRPath() {
-        # If the path is not in the store, don't add it to the rpath.
-        # This typically happens for libraries in /tmp that are later
-        # copied to $out/lib.  If not, we're screwed.
-        if [ "${1:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then return 0; fi
-        if [[ -z ${rpathsSeen[$1]} ]]; then
-            rpaths+=("$1")
-            rpathsSeen[$1]=1
-        fi
-    }
-
-    declare -a libs
-
-    # First, find all -L... switches.
-    allParams=("${params[@]}" ${extra[@]})
-    n=0
-    while [ $n -lt ${#allParams[*]} ]; do
-        p=${allParams[n]}
-        p2=${allParams[$((n+1))]}
-        if [ "${p:0:3}" = -L/ ]; then
-            addToLibPath ${p:2}
-        elif [ "$p" = -L ]; then
-            addToLibPath ${p2}
-            n=$((n + 1))
-        elif [ "$p" = -l ]; then
-            libs+=(${p2})
-            n=$((n + 1))
-        elif [ "${p:0:2}" = -l ]; then
-            libs+=(${p:2})
-        elif [ "$p" = -dynamic-linker ]; then
-            # Ignore the dynamic linker argument, or it
-            # will get into the next 'elif'. We don't want
-            # the dynamic linker path rpath to go always first.
-            n=$((n + 1))
-        elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then
-            # This is a direct reference to a shared library, so add
-            # its directory to the rpath.
-            path="$(dirname "$p")";
-            addToRPath "${path}"
-        fi
-        n=$((n + 1))
-    done
-
-    # Second, for each directory in the library search path (-L...),
+    # For each directory in the library search path (-L...),
     # see if it contains a dynamic library used by a -l... flag.  If
     # so, add the directory to the rpath.
     # It's important to add the rpath in the order of -L..., so
     # the link time chosen objects will be those of runtime linking.
-    for i in ${libDirs[@]}; do
-        for j in ${libs[@]}; do
-            if [ -f "$i/lib$j.so" ]; then
-                addToRPath $i
-                break
+    for dir in "${libDirs[@]}"; do
+        if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then
+            dir="$dir2"
+        fi
+        if [ "${rpaths[$dir]}" ] || [[ "$dir" != "$NIX_STORE"/* ]]; then
+            # If the path is not in the store, don't add it to the rpath.
+            # This typically happens for libraries in /tmp that are later
+            # copied to $out/lib.  If not, we're screwed.
+            continue
+        fi
+        for path in "$dir"/lib*.so; do
+            file="${path##*/}"
+            if [ "${libs[$file]}" ]; then
+                libs["$file"]=
+                if [ ! "${rpaths[$dir]}" ]; then
+                    rpaths["$dir"]=1
+                    extra+=(-rpath "$dir")
+                fi
             fi
         done
     done
-
-    # Finally, add `-rpath' switches.
-    for i in ${rpaths[@]}; do
-        extra+=(-rpath "$i")
-    done
 fi
 
 
 # Only add --build-id if this is a final link. FIXME: should build gcc
 # with --enable-linker-build-id instead?
-if [ "$NIX_SET_BUILD_ID" = 1 ]; then
-    for p in "${params[@]}"; do
-        if [ "$p" = "-r" -o "$p" = "--relocatable" -o "$p" = "-i" ]; then
-            relocatable=1
-            break
-        fi
-    done
-    if [ -z "$relocatable" ]; then
-        extra+=(--build-id)
-    fi
+if [ "$NIX_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then
+    extra+=(--build-id)
 fi
 
 
 # Optionally print debug info.
 if [ -n "$NIX_DEBUG" ]; then
-  echo "original flags to @prog@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extra flags to @prog@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
+    echo "original flags to @prog@:" >&2
+    printf "  %q\n" "${params[@]}" >&2
+    echo "extra flags to @prog@:" >&2
+    printf "  %q\n" "${extraBefore[@]}" "${extra[@]}" >&2
 fi
 
 if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then
@@ -183,4 +160,4 @@ if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then
 fi
 
 PATH="$path_backup"
-exec @prog@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
+exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extra[@]}"

From 21d23fac355ab5249afff82c28d3f42cbf807e69 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 28 Jul 2017 19:09:55 +0200
Subject: [PATCH 1150/3246] nnn: 1.2 -> 1.3

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

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 1005006c402..dd27409742f 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nnn-${version}";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "nnn";
     rev = "v${version}";
-    sha256 = "1idrwm02218q7qd2pg2m8ld76bg32wbzl8y1h8ch7gzxihgn4559";
+    sha256 = "0w9i9vwyqgsi64b5mk4rhmr5gvnnb24c98321r0j5hb0ghdcp96s";
   };
 
   configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);

From a5e1860e142cc2244ebb04fed988f440da092244 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Sat, 22 Jul 2017 11:48:00 +0200
Subject: [PATCH 1151/3246] frei0r: 1.4 -> 1.6.1

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

diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix
index f3c9b95d6b4..9614762ef2a 100644
--- a/pkgs/development/libraries/frei0r/default.nix
+++ b/pkgs/development/libraries/frei0r/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "frei0r-plugins-${version}";
-  version = "1.4";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz";
-    sha256 = "0mxyhdp1p1a3ga8170ijygb870zwbww1dgp3kdr1nd4zvsmzqw44";
+    sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
   };
 
   buildInputs = [ autoconf cairo opencv pkgconfig ];

From 027323396b76b50794e63001b79c71087c0db179 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jul 2017 17:49:53 -0400
Subject: [PATCH 1152/3246] ammonite: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index feb6865566f..bd1be88bb32 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -5,12 +5,12 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "0d74b3aasgg4ap5ishzzm4jbf1k4dxv7gzd88d69miyapsaa4p0c";
+    sha256 = "1gfswia6wg1z8whzmca7zmrkbhkvianbyd15yimnbd08minm1z2d";
   };
 
   propagatedBuildInputs = [ jre ] ;

From a918521c1eaaeeb66b170ba27c46774442de0944 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Jul 2017 17:54:37 -0400
Subject: [PATCH 1153/3246] linux-copperhead: 4.12.3.a -> 4.12.4.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index abec37a268c..a46e48a3e11 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.12.3";
+  version = "4.12.4";
   revision = "a";
-  sha256 = "0nxzpkh2ca47g6qykkfhf8qynpx3kr9vdkm9wixky159zxfj6s85";
+  sha256 = "1c6fin95ppl7lj09vr3vxfwxgf3db15wyncvq07b675fpkdx0nnx";
 in
 
 import ./generic.nix (args // {

From 43f23e4dfff7f413687fedbfebf0a6abd50f610c Mon Sep 17 00:00:00 2001
From: hectorj <hector.jusforgues@gmail.com>
Date: Thu, 27 Jul 2017 19:36:05 +0200
Subject: [PATCH 1154/3246] nomad: 0.5.6 -> 0.6.0

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

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index ce33fca4475..f607bd9a614 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "nomad-${version}";
-  version = "0.5.6";
+  version = "0.6.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "nomad";
     inherit rev;
-    sha256 = "1ivxsrg8s5fcyhngf8wlrqw6j7s2iggbf9xkr8jnd80cxbcpnksl";
+    sha256 = "1qvpcf2hwrx280qk8gl7sfl23y44k8z7c2vwi0gnzx8vqh0l8ywm";
   };
 
   meta = with stdenv.lib; {

From 72239c3a22283eee64283c178717af2d49c9159d Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Fri, 28 Jul 2017 23:38:25 +0000
Subject: [PATCH 1155/3246] PULL_REQUEST_TEMPLATE.md: mereley -> merely

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3247b158342..e847c73a889 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 
 ###### Things done
 
-Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.
+Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.
 
 - [ ] Tested using sandboxing
   ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,

From 321438d786bb00009f1fdea349eaac4c799c9257 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Jul 2017 00:16:44 -0400
Subject: [PATCH 1156/3246] rkt: 1.27.0 -> 1.28.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 bca2e558b38..885ffde8a50 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.27.0";
+  version = "1.28.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     owner = "coreos";
     repo = "rkt";
     rev = "v${version}";
-    sha256 = "153nkl4mp2p0llv4bpdhdd6127qyaz27jsnxmjgvxhaia0ab79v2";
+    sha256 = "08bzi44rs4g8cxb44pxh7ln85zhkhmi40r8mb73kibnnzd008vg3";
   };
 
   stage1BaseImage = fetchurl {

From eccca05e2cc6d8a56ce0372d056f4e707f177822 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 29 Jul 2017 06:36:55 +0200
Subject: [PATCH 1157/3246] nixos-artwork: Fix URL to gnome-dark

---
 pkgs/data/misc/nixos-artwork/icons.nix      | 2 +-
 pkgs/data/misc/nixos-artwork/wallpapers.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix
index cee6e600cbe..1c14bcc9f98 100644
--- a/pkgs/data/misc/nixos-artwork/icons.nix
+++ b/pkgs/data/misc/nixos-artwork/icons.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "nixos-icons-2017-03-16";
   srcs = fetchFromGitHub {
-    owner = "nixos";
+    owner = "NixOS";
     repo = "nixos-artwork";
     rev = "783ca1249fc4cfe523ad4e541f37e2229891bc8b";
     sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a";
diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix
index 254f13825ab..2eebe61b142 100644
--- a/pkgs/data/misc/nixos-artwork/wallpapers.nix
+++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix
@@ -29,7 +29,7 @@ in
     name = "gnome-dark-2015-02-27";
     description = "Gnome Dark background for Nix";
     src = fetchurl {
-      url = https://raw.githubusercontent.com/Nix/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
+      url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
       sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";
     };
   };

From fd73721aed1169fe173299d1a668dd30de97576d Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 29 Jul 2017 08:27:14 +0000
Subject: [PATCH 1158/3246] Update default.nix

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

diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix
index 7c4ef99b0a2..1f539ef6d39 100644
--- a/pkgs/development/python-modules/amqplib/default.nix
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchurl }:
 
 buildPythonPackage rec {
   pname = "amqplib";
   version = "0.6.1";
   name = "${pname}-${version}";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
+  src = fetchurl {
+    url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz;
+    sha256 = "04nsn68wz9m24rvbssirkyighazbn20j60wjmi0r7jcpcf00sb3s";
   };
 
   # error: invalid command 'test'

From 47e3245691dc2a8430ac51d82f2504fc6c7d0da0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Jul 2017 12:38:30 +0200
Subject: [PATCH 1159/3246] haskell.lib: drop obsolete hasNoDataOutput and
 hasNoDocOutput functions

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

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 81cf298e0e6..30d82d3efc9 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -111,6 +111,4 @@ rec {
   overrideSrc = drv: { src, version ? drv.version }:
     overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
 
-  hasNoDataOutput = drv: overrideCabal drv (drv: { hasDataDir = false; });
-  hasNoDocOutput = drv: overrideCabal drv (drv: { hasDocDir = false; });
 }

From 369fde13a37d3b314a284339ad6353f308182643 Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sat, 29 Jul 2017 12:43:45 +0200
Subject: [PATCH 1160/3246] Update Geany 1.30.1 -> 1.31 (#27735)

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

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 89235514bb8..b2cf9c6d68d 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let
-  version = "1.30.1";
+  version = "1.31";
 in
 
 stdenv.mkDerivation rec {
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.geany.org/${name}.tar.bz2";
-    sha256 = "0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491";
+    sha256 = "30fdb906bb76c4251a8bcf83ee267db28c26ef6ab867668a782cec1164a3aba5";
   };
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-  
+
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [ gtk2 which file ];
 

From b714a38bba7ed15002b16f498dec52455f0c8950 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 11:39:56 +0200
Subject: [PATCH 1161/3246] python.pkgs.cycler: move expression

---
 .../python-modules/cycler/default.nix         | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +-------------
 2 files changed, 38 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/cycler/default.nix

diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix
new file mode 100644
index 00000000000..e182f55cdc0
--- /dev/null
+++ b/pkgs/development/python-modules/cycler/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, coverage
+, nose
+, six
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "cycler";
+  name = "${pname}-${version}";
+  version = "0.10.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8";
+  };
+
+  checkInputs = [ coverage nose ];
+  propagatedBuildInputs = [ six ];
+
+  checkPhase = ''
+    ${python.interpreter} run_tests.py
+  '';
+
+  # Tests were not included in release.
+  # https://github.com/matplotlib/cycler/issues/31
+  doCheck = false;
+
+  meta = {
+    description = "Composable style cycles";
+    homepage = http://github.com/matplotlib/cycler;
+    license = lib.licenses.bsd3;
+    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 e87630212ce..45c3b529dcc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1865,33 +1865,7 @@ in {
     };
   };
 
-  cycler = buildPythonPackage rec {
-    name = "cycler-${version}";
-    version = "0.10.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/C/Cycler/${name}.tar.gz";
-      sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8";
-    };
-
-    buildInputs = with self; [ coverage nose ];
-    propagatedBuildInputs = with self; [ six ];
-
-    checkPhase = ''
-      ${python.interpreter} run_tests.py
-    '';
-
-    # Tests were not included in release.
-    # https://github.com/matplotlib/cycler/issues/31
-    doCheck = false;
-
-    meta = {
-      description = "Composable style cycles";
-      homepage = http://github.com/matplotlib/cycler;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  cycler = callPackage ../development/python-modules/cycler { };
 
   datadog = buildPythonPackage rec {
     name = "${pname}-${version}";

From 25fa9f2f14ca36159cb25f0405558351e87b5292 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 11:55:11 +0200
Subject: [PATCH 1162/3246] python.pkgs.blaze: move expression

---
 .../python-modules/blaze/default.nix          | 75 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 50 +------------
 2 files changed, 76 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/development/python-modules/blaze/default.nix

diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix
new file mode 100644
index 00000000000..017b85cacc7
--- /dev/null
+++ b/pkgs/development/python-modules/blaze/default.nix
@@ -0,0 +1,75 @@
+{ lib
+, buildPythonPackage
+, fetchurl
+, pytest
+, contextlib2
+, cytoolz
+, dask
+, datashape
+, flask
+, flask-cors
+, h5py
+, multipledispatch
+, numba
+, numpy
+, odo
+, pandas
+, psutil
+, pymongo
+, pyyaml
+, requests
+, sqlalchemy
+, tables
+, toolz
+}:
+
+buildPythonPackage rec {
+  pname = "blaze";
+  version = "0.11.0";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/blaze/blaze/archive/${version}.tar.gz";
+    sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [
+    contextlib2
+    cytoolz
+    dask
+    datashape
+    flask
+    flask-cors
+    h5py
+    multipledispatch
+    numba
+    numpy
+    odo
+    pandas
+    psutil
+    pymongo
+    pyyaml
+    requests
+    sqlalchemy
+    tables
+    toolz
+  ];
+
+  # Failing test
+  # ERROR collecting blaze/tests/test_interactive.py
+  # E   networkx.exception.NetworkXNoPath: node <class 'list'> not
+  # reachable from <class 'dask.array.core.Array'>
+  doCheck = false;
+
+  checkPhase = ''
+    py.test blaze/tests
+  '';
+
+  meta = {
+    homepage = https://github.com/ContinuumIO/blaze;
+    description = "Allows Python users a familiar interface to query data living in other data storage systems";
+    license = lib.licenses.bsdOriginal;
+    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 45c3b529dcc..a127da66d84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2109,55 +2109,7 @@ in {
     };
   };
 
-  blaze = buildPythonPackage rec {
-    name = "blaze-${version}";
-    version = "0.11.0";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/blaze/blaze/archive/${version}.tar.gz";
-      sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [
-      contextlib2
-      cytoolz
-      dask
-      datashape
-      flask
-      flask-cors
-      h5py
-      multipledispatch
-      numba
-      numpy
-      odo
-      pandas
-      psutil
-      pymongo
-      pyyaml
-      requests
-      sqlalchemy
-      tables
-      toolz
-    ];
-
-    # Failing test
-    # ERROR collecting blaze/tests/test_interactive.py
-    # E   networkx.exception.NetworkXNoPath: node <class 'list'> not
-    # reachable from <class 'dask.array.core.Array'>
-    doCheck = false;
-
-    checkPhase = ''
-      py.test blaze/tests
-    '';
-
-    meta = {
-      homepage = https://github.com/ContinuumIO/blaze;
-      description = "Allows Python users a familiar interface to query data living in other data storage systems";
-      license = licenses.bsdOriginal;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  blaze = callPackage ../development/python-modules/blaze { };
 
   # Needed for FlexGet 1.2.337 and calibre 2.76.0
   html5lib_0_9999999 = self.html5lib.override rec {

From 4f296cbaeb91370a4ff226485e5d47f5ff082201 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 12:14:17 +0200
Subject: [PATCH 1163/3246] python.pkgs.cython: move expression

---
 .../python-modules/Cython/default.nix         | 57 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 45 +--------------
 2 files changed, 58 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/development/python-modules/Cython/default.nix

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
new file mode 100644
index 00000000000..9d09b93ed20
--- /dev/null
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, python
+, glibcLocales
+, pkgconfig
+, gdb
+, numpy
+, ncurses
+}:
+
+buildPythonPackage rec {
+  pname = "Cython";
+  name = "${pname}-${version}";
+  version = "0.25.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
+  };
+
+  # With Python 2.x on i686-linux or 32-bit ARM this test fails because the
+  # result is "3L" instead of "3", so let's fix it in-place.
+  #
+  # Upstream issue: https://github.com/cython/cython/issues/1548
+  postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) ''
+    sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \
+      tests/run/cpdef_enums.pyx
+  '';
+
+  buildInputs = [ glibcLocales pkgconfig gdb ];
+  # For testing
+  nativeBuildInputs = [ numpy ncurses ];
+
+  LC_ALL = "en_US.UTF-8";
+
+  # cython's testsuite is not working very well with libc++
+  # We are however optimistic about things outside of testsuite still working
+  checkPhase = ''
+    export HOME="$NIX_BUILD_TOP"
+    ${python.interpreter} runtests.py \
+      ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""}
+  '';
+
+  # Disable tests temporarily
+  # https://github.com/cython/cython/issues/1676
+  doCheck = false;
+
+  meta = {
+    description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
+    homepage = http://cython.org;
+    license = lib.licenses.asl20;
+    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 a127da66d84..53c4a139eea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3504,50 +3504,7 @@ in {
     };
   };
 
-  cython = buildPythonPackage rec {
-    name = "Cython-${version}";
-    version = "0.25.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/C/Cython/${name}.tar.gz";
-      sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
-    };
-
-    # With Python 2.x on i686-linux or 32-bit ARM this test fails because the
-    # result is "3L" instead of "3", so let's fix it in-place.
-    #
-    # Upstream issue: https://github.com/cython/cython/issues/1548
-    postPatch = optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) ''
-      sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \
-        tests/run/cpdef_enums.pyx
-    '';
-
-    buildInputs = with self; [ pkgs.glibcLocales pkgs.pkgconfig pkgs.gdb ];
-    # For testing
-    nativeBuildInputs = with self; [ numpy pkgs.ncurses ];
-
-    LC_ALL = "en_US.UTF-8";
-
-    # cython's testsuite is not working very well with libc++
-    # We are however optimistic about things outside of testsuite still working
-    checkPhase = ''
-      export HOME="$NIX_BUILD_TOP"
-      ${python.interpreter} runtests.py \
-        ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""}
-    '';
-
-    # Disable tests temporarily
-    # https://github.com/cython/cython/issues/1676
-    doCheck = false;
-
-    meta = {
-      description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
-      platforms = platforms.all;
-      homepage = http://cython.org;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  cython = callPackage ../development/python-modules/Cython { };
 
   cytoolz = buildPythonPackage rec {
     name = "cytoolz-${version}";

From 5ecc470b8c051960c660d8b4a351cc7a9daabc9b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 12:14:34 +0200
Subject: [PATCH 1164/3246] freecad: 0.16 -> 0.16.6712

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

diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index c58d9e0bda1..6b49f975b1b 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -5,11 +5,11 @@ let
   pythonPackages = python27Packages;
 in stdenv.mkDerivation rec {
   name = "freecad-${version}";
-  version = "0.16";
+  version = "0.16.6712";
 
   src = fetchurl {
     url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz";
-    sha256 = "02cfw5wlb04j0ymhk4skrm7rvbz13hpv995asf9v8q6wn2s1mivc";
+    sha256 = "14hs26gvv7gbg9misxq34v4nrds2sbxjhj4yyw5kq3zbvl517alp";
   };
 
   buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost

From 08f9183d7512fc5c61e54ab5bf20765d1c24976e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 12:22:07 +0200
Subject: [PATCH 1165/3246] python.pkgs.sounddevice: 0.3.6 -> 0.3.8

---
 .../python-modules/sounddevice/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +-------------
 2 files changed, 35 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/sounddevice/default.nix

diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
new file mode 100644
index 00000000000..0413366c550
--- /dev/null
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cffi
+, numpy
+, portaudio
+}:
+
+buildPythonPackage rec {
+  pname = "sounddevice";
+  name = "${pname}-${version}";
+  version = "0.3.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dc5ec8534c3831ab133c497721f3aaeed4f5084b0eda842f0c0ada09f2f066dc";
+  };
+
+  propagatedBuildInputs = [ cffi numpy portaudio ];
+
+  # No tests included nor upstream available.
+  doCheck = false;
+
+  prePatch = ''
+    substituteInPlace sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'"
+  '';
+
+  meta = {
+    description = "Play and Record Sound with Python";
+    homepage = http://python-sounddevice.rtfd.org/;
+    license = with lib.licenses; [ mit ];
+    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 53c4a139eea..588f9651b07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21773,31 +21773,7 @@ in {
     };
   };
 
-  sounddevice = buildPythonPackage rec {
-    name = "sounddevice-${version}";
-    version = "0.3.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sounddevice/${name}.tar.gz";
-      sha256 = "4ef39be2d13069fbad8c69ac259e018d96ce55c23b529a7e0be9bd9a76e2e8da";
-    };
-
-    propagatedBuildInputs = with self; [ cffi numpy pkgs.portaudio ];
-
-    # No tests included nor upstream available.
-    doCheck = false;
-
-    prePatch = ''
-      substituteInPlace sounddevice.py --replace "'portaudio'" "'${pkgs.portaudio}/lib/libportaudio.so.2'"
-    '';
-
-    meta = {
-      description = "Play and Record Sound with Python";
-      homepage = http://python-sounddevice.rtfd.org/;
-      license = with licenses; [ mit ];
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  sounddevice = callPackage ../development/python-modules/sounddevice { };
 
   stevedore = callPackage ../development/python-modules/stevedore {};
 

From 1c94c54c4a507ce326b0ef629f94b871f11acd34 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 13:03:07 +0200
Subject: [PATCH 1166/3246] cli53: fix build

---
 pkgs/tools/admin/cli53/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index 23c35dab57c..b9852ed587c 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -1,6 +1,6 @@
-{ lib, python2Packages, fetchurl }:
+{ lib, python2, fetchurl }:
 
-python2Packages.buildPythonApplication rec {
+python2.pkgs.buildPythonApplication rec {
   name = "cli53-${version}";
   version = "0.4.4";
 
@@ -9,7 +9,18 @@ python2Packages.buildPythonApplication rec {
     sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig";
   };
 
-  propagatedBuildInputs = with python2Packages; [
+  postPatch = ''
+    substituteInPlace setup.py --replace "'argparse', " ""
+  '';
+
+  checkPhase = ''
+    ${python2.interpreter} -m unittest discover -s tests
+  '';
+
+  # Tests do not function
+  doCheck = false;
+
+  propagatedBuildInputs = with python2.pkgs; [
     argparse
     boto
     dns

From b339e6e13fb0869f5ac5ba13e8c38ab535549231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 15 Jul 2017 13:55:49 +0200
Subject: [PATCH 1167/3246] nixos/lighttpd: update list of allowed module names

* mod_dirlisting is auto-loaded by lighttpd and should not be explicitly
  loaded in the configuration file.
* The rest comes from looking at "ls -1 $lighttpd/lib/*.so" when
  lighttpd is built with "enableMagnet" and "enableMysql".
---
 nixos/modules/services/web-servers/lighttpd/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 8c3f7b219ac..151b5ee1520 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -37,8 +37,10 @@ let
     "mod_rrdtool"
     "mod_accesslog"
     # Remaining list of modules, order assumed to be unimportant.
+    "mod_authn_file"
+    "mod_authn_mysql"
     "mod_cml"
-    "mod_dirlisting"
+    "mod_deflate"
     "mod_evasive"
     "mod_extforward"
     "mod_flv_streaming"
@@ -47,6 +49,7 @@ let
     "mod_scgi"
     "mod_setenv"
     "mod_trigger_b4_dl"
+    "mod_uploadprogress"
     "mod_webdav"
   ];
 

From a65d8d3af331afd444b20fb2a86ca72dd0c04858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 23 Apr 2017 19:20:43 +0200
Subject: [PATCH 1168/3246] lighttpd: install configuration examples

Place them in $out/share/lighttpd/doc/config/.

Most importantly, this includes a complete set of mime types in the
$out/share/lighttpd/doc/config/conf.d/mime.conf file. The plan is to use
that file in the NixOS lighttpd module.
---
 pkgs/servers/http/lighttpd/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 87efc41b1d6..e5f4ada3301 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -26,6 +26,15 @@ stdenv.mkDerivation rec {
     sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
   '';
 
+  postInstall = ''
+    mkdir -p "$out/share/lighttpd/doc/config"
+    cp -vr doc/config "$out/share/lighttpd/doc/"
+    # Remove files that references needless store paths (dependency bloat)
+    rm "$out/share/lighttpd/doc/config/Makefile"*
+    rm "$out/share/lighttpd/doc/config/conf.d/Makefile"*
+    rm "$out/share/lighttpd/doc/config/vhosts.d/Makefile"*
+  '';
+
   meta = with stdenv.lib; {
     description = "Lightweight high-performance web server";
     homepage = http://www.lighttpd.net/;

From aff0725a7d5171a99ff3baafc04b7cb2aa3722f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 15 Jul 2017 14:08:13 +0200
Subject: [PATCH 1169/3246] nixos/lighttpd: add enableUpstreamMimeTypes option

enableUpstreamMimeTypes controls whether to include the list of mime
types bundled with lighttpd (upstream). This option is enabled by
default and gives a much more complete mime type list than we currently
have. If you disable this, no mime types will be added by NixOS and you
will have to add your own mime types in services.lighttpd.extraConfig.
---
 .../services/web-servers/lighttpd/default.nix | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 151b5ee1520..45a65965112 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -89,14 +89,9 @@ let
       accesslog.use-syslog = "enable"
       server.errorlog-use-syslog = "enable"
 
-      mimetype.assign = (
-          ".html" => "text/html",
-          ".htm" => "text/html",
-          ".txt" => "text/plain",
-          ".jpg" => "image/jpeg",
-          ".png" => "image/png",
-          ".css" => "text/css"
-          )
+      ${lib.optionalString cfg.enableUpstreamMimeTypes ''
+      include "${pkgs.lighttpd}/share/lighttpd/doc/config/conf.d/mime.conf"
+      ''}
 
       static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" )
       index-file.names = ( "index.html" )
@@ -168,6 +163,17 @@ in
         '';
       };
 
+      enableUpstreamMimeTypes = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to include the list of mime types bundled with lighttpd
+          (upstream). If you disable this, no mime types will be added by
+          NixOS and you will have to add your own mime types in
+          <option>services.lighttpd.extraConfig</option>.
+        '';
+      };
+
       mod_status = mkOption {
         default = false;
         type = types.bool;

From 9aafecd28bfe93cb012d6274f001c8dedaa4d937 Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Sat, 29 Jul 2017 21:41:04 +1000
Subject: [PATCH 1170/3246] alacritty: use patchelf instead of LD_LIBRARY_PATH

If we use LD_LIBRARY_PATH then anything typed into Alacritty inherits it. This
breaks a lot of applications if the versions are different. For me this breaks
everything from Git to every program which uses Gtk.
---
 pkgs/applications/misc/alacritty/default.nix | 24 ++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index a00e0ec8a48..4f072c45144 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -16,6 +16,18 @@
 
 with rustPlatform;
 
+let
+  rpathLibs = [
+    expat
+    freetype
+    fontconfig
+    libX11
+    libXcursor
+    libXxf86vm
+    libXi
+  ];
+in
+
 buildRustPackage rec {
   name = "alacritty-unstable-2017-07-25";
 
@@ -31,25 +43,19 @@ buildRustPackage rec {
   buildInputs = [
     cmake
     makeWrapper
-    freetype
-    fontconfig
     xclip
     pkgconfig
-    expat
-    libX11
-    libXcursor
-    libXxf86vm
-    libXi
-  ];
+  ] ++ rpathLibs;
 
   installPhase = ''
     mkdir -p $out/bin
     for f in $(find target/release -maxdepth 1 -type f); do
       cp $f $out/bin
     done;
-    wrapProgram $out/bin/alacritty --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath buildInputs}"
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
   '';
 
+  dontPatchELF = true;
 
   meta = with stdenv.lib; {
     description = "GPU-accelerated terminal emulator";

From 16394293592efc71a5dc17f771a4be1ca8910fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Jul 2017 14:22:36 +0200
Subject: [PATCH 1171/3246] vim_configurable: add ".../after" plugin dirs to
 runtimepath

This fixes using e.g. CSApprox when installed with nix.
---
 pkgs/applications/editors/vim/configurable.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 3f588fdde58..97e430fded6 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -24,6 +24,10 @@ let
           let pluginname = substitute(d, ".*/", "", "")
           if !has_key(seen, pluginname)
             exec 'set runtimepath^='.d
+            let after = d."/after"
+            if isdirectory(after)
+              exec 'set runtimepath^='.after
+            endif
             let seen[pluginname] = 1
           endif
         endfor

From a444b34b52b13b1658875633f871b96456b1cd71 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 29 Jul 2017 15:04:34 +0200
Subject: [PATCH 1172/3246] facedetect: init at 0.1

---
 pkgs/tools/graphics/facedetect/default.nix | 37 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/graphics/facedetect/default.nix

diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix
new file mode 100644
index 00000000000..02a3a70fe51
--- /dev/null
+++ b/pkgs/tools/graphics/facedetect/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, python2Packages }:
+
+stdenv.mkDerivation rec {
+  name = "facedetect-${version}";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "wavexx";
+    repo = "facedetect";
+    rev = "v${version}";
+    sha256 = "0mddh71cjbsngpvjli406ndi2x613y39ydgb8bi4z1jp063865sd";
+  };
+
+  buildInputs = [ python2Packages.python python2Packages.wrapPython ];
+  pythonPath = [ python2Packages.numpy python2Packages.opencv ];
+
+  phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+
+  patchPhase = ''
+    substituteInPlace facedetect \
+      --replace /usr/share/opencv "${python2Packages.opencv}/share/OpenCV"
+  '';
+
+  installPhase = ''
+    install -v -m644 -D README.rst $out/share/doc/${name}/README.rst
+    install -v -m755 -D facedetect $out/bin/facedetect
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.thregr.org/~wavexx/software/facedetect/;
+    description = "A simple face detector for batch processing";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.rycee ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3c012b37a8..2d9dc0b694c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -997,6 +997,8 @@ with pkgs;
 
   f3 = callPackage ../tools/filesystems/f3 { };
 
+  facedetect = callPackage ../tools/graphics/facedetect { };
+
   facter = callPackage ../tools/system/facter {
     boost = boost160;
   };

From 47689bf70627c1f6ca74d79ee6a176f8aabece97 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sat, 29 Jul 2017 10:32:42 -0300
Subject: [PATCH 1173/3246] awesome: 4.1 -> 4.2 - update to version 4.2 -
 remove 1639.patch, which has been integrated in release

---
 .../window-managers/awesome/default.nix             | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 6f56ff98998..a441de5ed19 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
+{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, 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
@@ -9,13 +9,13 @@
 
 with luaPackages; stdenv.mkDerivation rec {
   name = "awesome-${version}";
-  version = "4.1";
+  version = "4.2";
   
   src = fetchFromGitHub {
     owner = "awesomewm";
     repo = "awesome";
     rev = "v${version}";
-    sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj";
+    sha256 = "1pcgagcvm6rdky8p8dd810j3ywaz0ncyk5xgaykslaixzrq60kff";
   };
 
   nativeBuildInputs = [
@@ -38,13 +38,6 @@ with luaPackages; stdenv.mkDerivation rec {
                   xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
                   xcbutilxrm ];
 
-  patches = [
-    (fetchurl {
-      url = "https://patch-diff.githubusercontent.com/raw/awesomeWM/awesome/pull/1639.patch";
-      sha256 = "00piynmbxajd2xbg960gmf0zlqn7m489f4ww482y49ravfy1jhsj";
-    })
-  ];
-
   #cmakeFlags = "-DGENERATE_MANPAGES=ON";
 
   LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";

From 72e99b69154b1c8d50b109237461e480cfeb40ce Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 25 Jul 2017 17:54:24 +0200
Subject: [PATCH 1174/3246] baudline: use jack2 instead of jack1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise it doesn't connect with the rest of the system.

[Bjørn: I think this is a symptom of jack1 packaging problem in nixpkgs.
The two libraries are _supposed_ to be interchangeable.]
---
 pkgs/applications/audio/baudline/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index e3cef30ccda..deaa3f98e52 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, jack
+{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, libjack2
 , makeWrapper
 }:
 
 let
   rpath = stdenv.lib.makeLibraryPath
-    [ libXmu libXt libX11 libXext libXxf86vm jack ];
+    [ libXmu libXt libX11 libXext libXxf86vm libjack2 ];
 in
 stdenv.mkDerivation rec {
   name = "baudline-${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d9dc0b694c..d008c727644 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13459,9 +13459,7 @@ with pkgs;
 
   batti = callPackage ../applications/misc/batti { };
 
-  baudline = callPackage ../applications/audio/baudline {
-    jack = jack1;
-  };
+  baudline = callPackage ../applications/audio/baudline { };
 
 
   bazaar = callPackage ../applications/version-management/bazaar { };

From 1ae9848fe1577011d19ccddeb4a9600ccb4cedef Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 29 Jul 2017 16:08:41 +0200
Subject: [PATCH 1175/3246] perl-Cpanel-JSON-XS: init at 3.0237

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e7234018508..0ce43937685 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2483,6 +2483,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CpanelJSONXS = buildPerlPackage rec {
+    name = "Cpanel-JSON-XS-3.0237";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
+      sha256 = "da86fffdbe6c1b7a023e95e2b8db7d6b45a08871c8312f23e45253c78e662d07";
+    };
+    meta = {
+      description = "CPanel fork of JSON::XS, fast and correct serializing";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   CPANChanges = buildPerlPackage rec {
     name = "CPAN-Changes-0.400002";
     src = fetchurl {

From 138dd4f9f194936fbeed67467124caa5de04fcf4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 29 Jul 2017 16:19:09 +0200
Subject: [PATCH 1176/3246] fgallery: 1.8 -> 1.8.2

---
 pkgs/tools/graphics/fgallery/default.nix | 11 +++++------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix
index 4b263b555d2..439a01584c3 100644
--- a/pkgs/tools/graphics/fgallery/default.nix
+++ b/pkgs/tools/graphics/fgallery/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool, JSON
-, coreutils, zip, imagemagick, pngcrush, lcms2, fbida
-}:
+{ stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool
+, CpanelJSONXS, coreutils, zip, imagemagick, pngcrush, lcms2, fbida }:
 
 # TODO: add optional dependencies (snippet from fgallery source):
 #
@@ -11,14 +10,14 @@
 #   fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)");
 
 stdenv.mkDerivation rec {
-  name = "fgallery-1.8";
+  name = "fgallery-1.8.2";
 
   src = fetchurl {
     url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip";
-    sha256 = "1n237sk7fm4yrpn69qaz9fwbjl6i94y664q7d16bhngrcil3bq1d";
+    sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf";
   };
 
-  buildInputs = [ unzip makeWrapper perl ImageExifTool JSON ];
+  buildInputs = [ unzip makeWrapper perl ImageExifTool CpanelJSONXS ];
 
   installPhase = ''
     mkdir -p "$out/bin"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d008c727644..05ff56aef28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1911,7 +1911,7 @@ with pkgs;
   ferm = callPackage ../tools/networking/ferm { };
 
   fgallery = callPackage ../tools/graphics/fgallery {
-    inherit (perlPackages) ImageExifTool JSON;
+    inherit (perlPackages) ImageExifTool CpanelJSONXS;
   };
 
   flannel = callPackage ../tools/networking/flannel { };

From 9d4d62923ae10de107a4e0693aa859c80710bb7b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 29 Jul 2017 16:22:54 +0200
Subject: [PATCH 1177/3246] fgallery: add support for facedetect

---
 pkgs/tools/graphics/fgallery/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix
index 439a01584c3..424cf5c1bdc 100644
--- a/pkgs/tools/graphics/fgallery/default.nix
+++ b/pkgs/tools/graphics/fgallery/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool
-, CpanelJSONXS, coreutils, zip, imagemagick, pngcrush, lcms2, fbida }:
+, CpanelJSONXS, coreutils, zip, imagemagick, pngcrush, lcms2
+, facedetect, fbida }:
 
 # TODO: add optional dependencies (snippet from fgallery source):
 #
 # if(system("jpegoptim -V >/dev/null 2>&1")) {
 #   $jpegoptim = 0;
 # }
-# if($facedet && system("facedetect -h >/dev/null 2>&1")) {
-#   fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)");
 
 stdenv.mkDerivation rec {
   name = "fgallery-1.8.2";
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/share/fgallery/fgallery" \
         --set PERL5LIB "$PERL5LIB" \
         --set PATH "${stdenv.lib.makeBinPath
-                     [ coreutils zip imagemagick pngcrush lcms2 fbida ]}"
+                     [ coreutils zip imagemagick pngcrush lcms2 facedetect fbida ]}"
   '';
 
   meta = with stdenv.lib; {

From fd1b6188528fcc67e0fee416b2dd94c51f1ef379 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 29 Jul 2017 15:16:19 +0000
Subject: [PATCH 1178/3246] xrdp: 0.9.2 -> 0.9.3 (#27742)

---
 .../networking/remote/xrdp/default.nix        | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index 8079a0aabe6..eff81e99857 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -3,13 +3,13 @@
 let
   xorgxrdp = stdenv.mkDerivation rec {
     name = "xorgxrdp-${version}";
-    version = "0.2.1";
-  
+    version = "0.2.3";
+
     src = fetchFromGitHub {
       owner = "neutrinolabs";
       repo = "xorgxrdp";
       rev = "v${version}";
-      sha256 = "13713qs1v79xa02iw6vaj9b2q62ix770a32z56ql05d6yvfdsfhi";
+      sha256 = "0l1b38j3q9mxyb8ffpdplbqs6rnabj92i8wngrwlkhfh2c88szn1";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@@ -34,16 +34,15 @@ let
   };
 
   xrdp = stdenv.mkDerivation rec {
-    version = "0.9.2";
-    rev = "48c26a3"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be fixed already
-    name = "xrdp-${version}.${rev}";
-  
+    version = "0.9.3";
+    name = "xrdp-${version}";
+
     src = fetchFromGitHub {
       owner = "volth";
       repo = "xrdp";
-      rev = rev;
+      rev = "refs/heads/runtime-cfg-path-${version}";  # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already
       fetchSubmodules = true;
-      sha256 = "0zs03amshmvy65d26vsv31n9jflkjf43vsjhg4crzifka3vz9p16";
+      sha256 = "0xqyg3m688fj442zgg9fqmbz7nnzvqpd7a9ki2cwh1hyibacpmz7";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
@@ -73,12 +72,12 @@ let
 
       # remove all session types except Xorg (they are not supported by this setup)
       ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini
-   
+
       # remove all session types and then add Xorg
       ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini
-   
+
       cat >> $out/etc/xrdp/sesman.ini <<EOF
-   
+
       [Xorg]
       param=${xorg.xorgserver}/bin/Xorg
       param=-modulepath

From 9d4d9630972afcebc70e5d5138a1216f2f344f02 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 29 Jul 2017 17:28:06 +0200
Subject: [PATCH 1179/3246] wireguard: 0.0.20170706 -> 0.0.20170726

---
 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 63e2e4ef493..ef6a538af79 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.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170706";
+  version = "0.0.20170726";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0cvc2iv1836l6f0c3v3kqn3zqrr80i123f1cz5kilhk5c91vjqsp";
+    sha256 = "1nq1h9k1kf6p28ykids5mmdq50q6zpj0ylhsf94q1hjydcmlb4fv";
   };
 
   meta = with stdenv.lib; {

From 311ee164e475c3ded1d526f53f33d6894bd11cf7 Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Fri, 28 Jul 2017 15:34:06 +0300
Subject: [PATCH 1180/3246] pg_repack: 1.3.4 -> 1.4.0.1

highlight: adds support for Amazon RDS (pg 9.6.3) when used as client
---
 pkgs/servers/sql/postgresql/pg_repack/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix
index 9a6410490c5..0a25b314506 100644
--- a/pkgs/servers/sql/postgresql/pg_repack/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix
@@ -1,16 +1,17 @@
 { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
 
 stdenv.mkDerivation rec {
-    name = "pg_repack-${version}";
-    version = "1.3.4";
+    name = "pg_repack-${version}.1";
+    version = "1.4.0";
+    rev = "ver_${version}.1";
 
     buildInputs = [ postgresql openssl zlib readline ];
 
     src = fetchFromGitHub {
       owner = "reorg";
       repo = "pg_repack";
-      rev = "ver_${version}";
-      sha256 = "1hig4x8iycchlp42q8565jzi6hkj8gpbhl9kpn73jvk7afl7z0c8";
+      inherit rev;
+      sha256 = "1ym2dlhgcizyy4p5dcfw7kadrq6g34pv3liyfx604irprzhw9k74";
     };
 
     installPhase = ''

From 65f9631b87b373aa3641d44ab3773b01f8cdd682 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 04:51:59 +0200
Subject: [PATCH 1181/3246] linuxPackages.acpi_call: add patch for 4.12 compat

---
 pkgs/os-specific/linux/acpi-call/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 65223a32bad..fe8c0b65bb7 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, kernel }:
+{ stdenv, fetchgit, fetchpatch, kernel }:
 
 stdenv.mkDerivation {
   name = "acpi-call-${kernel.version}";
@@ -9,6 +9,13 @@ stdenv.mkDerivation {
     sha256 = "0jl19irz9x9pxab2qp4z8c3jijv2m30zhmnzi6ygbrisqqlg4c75";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/mkottman/acpi_call/pull/67.patch";
+      sha256 = "0z07apvdl8nvl8iwfk1sl1iidfjyx12fc0345bmp2nq1537kpbri";
+    })
+  ];
+
   hardeningDisable = [ "pic" ];
 
   preBuild = ''

From 96a40ec635b6fb3ab6e44a4f49e7b41e9797944d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 03:03:34 +0200
Subject: [PATCH 1182/3246] atlassian-confluence: 6.2.2 -> 6.3.1

---
 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 20b7250d75d..3c1cdda8361 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.2.2";
+  version = "6.3.1";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
-    sha256 = "1fpn799382m8x7b0s3w4mxzlhy1s62ya287i622gbadqscprhagg";
+    sha256 = "0f7hc8q4sigvr9bdxx8phnp6bkfkz9bccwkrx0xqyrvvdc5x5690";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];

From e37274eb2f33d99a88c87580d734cb833486dd66 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 03:03:52 +0200
Subject: [PATCH 1183/3246] atlassian-jira: 7.3.7 -> 7.4.1

---
 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 48678804c56..bd044975f22 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.3.7";
+  version = "7.4.1";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "1ixnnw3yj2ip9ndr9pwxcmdy8gaixkmp517ahg3w8xzymr8wh2qp";
+    sha256 = "1ixkhc206z3zpiaj46v8z2gxmix24sxqs2d17fb64gkyml9s5gqb";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From 4d66de88fffada1f4970e5173be78c1ef30a8798 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 18:39:32 +0200
Subject: [PATCH 1184/3246] nixpkgs-manual: fix build, reindent

cc #25980
---
 doc/languages-frameworks/ruby.xml | 54 +++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 13 deletions(-)

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index eb1696ad224..4b48f7ffa1b 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -4,10 +4,14 @@
 
 <title>Ruby</title>
 
-  <para>There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a <filename>Gemfile</filename>, let bundler create a <filename>Gemfile.lock</filename>, and then convert
-  this into a nix expression that contains all Gem dependencies automatically.</para>
+<para>There currently is support to bundle applications that are packaged as
+Ruby gems. The utility "bundix" allows you to write a
+<filename>Gemfile</filename>, let bundler create a
+<filename>Gemfile.lock</filename>, and then convert this into a nix
+expression that contains all Gem dependencies automatically.
+</para>
 
-  <para>For example, to package sensu, we did:</para>
+<para>For example, to package sensu, we did:</para>
 
 <screen>
 <![CDATA[$ cd pkgs/servers/monitoring
@@ -38,14 +42,20 @@ bundlerEnv rec {
 }]]>
 </screen>
 
-<para>Please check in the <filename>Gemfile</filename>, <filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so future updates can be run easily.
+<para>Please check in the <filename>Gemfile</filename>,
+<filename>Gemfile.lock</filename> and the
+<filename>gemset.nix</filename> so future updates can be run easily.
 </para>
 
-<para>For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. <command>rake</command> at the command line, there is an alternative builder called <literal>bundlerApp</literal>. Set up the <filename>gemset.nix</filename> the same way, and then, for example:
+<para>For tools written in Ruby - i.e. where the desire is to install
+a package and then execute e.g. <command>rake</command> at the command
+line, there is an alternative builder called <literal>bundlerApp</literal>.
+Set up the <filename>gemset.nix</filename> the same way, and then, for
+example:
 </para>
 
 <screen>
-  <![CDATA[{ lib, bundlerApp }:
+<![CDATA[{ lib, bundlerApp }:
 
 bundlerApp {
   pname = "corundum";
@@ -60,15 +70,33 @@ bundlerApp {
     platforms   = platforms.unix;
   };
 }]]>
+</screen>
 
-<para>The chief advantage of <literal>bundlerApp</literal> over <literal>bundlerEnv</literal> is the executables introduced in the environment are precisely those selected in the <literal>exes</literal> list, as opposed to <literal>bundlerEnv</literal> which adds all the executables made available by gems in the gemset, which can mean e.g. <command>rspec</command> or <command>rake</command> in unpredictable versions available from various packages.
+<para>The chief advantage of <literal>bundlerApp</literal> over
+<literal>bundlerEnv</literal> is the executables introduced in the
+environment are precisely those selected in the <literal>exes</literal>
+list, as opposed to <literal>bundlerEnv</literal> which adds all the
+executables made available by gems in the gemset, which can mean e.g.
+<command>rspec</command> or <command>rake</command> in unpredictable
+versions available from various packages.
+</para>
 
-<para>Resulting derivations for both builders also have two helpful attributes, <literal>env</literal> and <literal>wrapper</literal>. The first one allows one to quickly drop into
-<command>nix-shell</command> with the specified environment present. E.g. <command>nix-shell -A sensu.env</command> would give you an environment with Ruby preset
-so it has all the libraries necessary for <literal>sensu</literal> in its paths. The second one can be used to make derivations from custom Ruby scripts which have
-<filename>Gemfile</filename>s with their dependencies specified. It is a derivation with <command>ruby</command> wrapped so it can find all the needed dependencies.
-For example, to make a derivation <literal>my-script</literal> for a <filename>my-script.rb</filename> (which should be placed in <filename>bin</filename>) you should
-run <command>bundix</command> as specified above and then use <literal>bundlerEnv</literal> like this:</para>
+<para>Resulting derivations for both builders also have two helpful
+attributes, <literal>env</literal> and <literal>wrapper</literal>.
+The first one allows one to quickly drop into
+<command>nix-shell</command> with the specified environment present.
+E.g. <command>nix-shell -A sensu.env</command> would give you an
+environment with Ruby preset so it has all the libraries necessary
+for <literal>sensu</literal> in its paths. The second one can be
+used to make derivations from custom Ruby scripts which have
+<filename>Gemfile</filename>s with their dependencies specified. It is
+a derivation with <command>ruby</command> wrapped so it can find all
+the needed dependencies. For example, to make a derivation
+<literal>my-script</literal> for a <filename>my-script.rb</filename>
+(which should be placed in <filename>bin</filename>) you should run
+<command>bundix</command> as specified above and then use
+<literal>bundlerEnv</literal> like this:
+</para>
 
 <programlisting>
 <![CDATA[let env = bundlerEnv {

From d50437ba3e366b96f32139615bd7742f980f0702 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 28 Jul 2017 20:17:18 +0000
Subject: [PATCH 1185/3246] flex_2_5_35: fix 404

---
 pkgs/development/tools/parsing/flex/2.5.35.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix
index 97ee871c87e..0a8da8b68f9 100644
--- a/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, bison, m4 }:
+{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }:
 
 stdenv.mkDerivation {
   name = "flex-2.5.35";
 
   src = fetchurl {
-    url = mirror://sourceforge/flex/flex-2.5.35.tar.bz2;
-    sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
+    url = https://github.com/westes/flex/archive/flex-2-5-35.tar.gz;
+    sha256 = "0wh06nix8bd4w1aq4k2fbbkdq5i30a9lxz3xczf3ff28yy0kfwzm";
   };
 
-  buildInputs = [ bison ];
+  nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ];
 
   propagatedNativeBuildInputs = [ m4 ];
 

From 733e20fee4a6700510f71fbe1a58ac23ea202f6a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Jul 2017 13:23:59 -0400
Subject: [PATCH 1186/3246] binutils: 2.28 -> 2.29

Binutils 2.29 no longer allows .semver symbols, which is why
we need to patch glibc to avoid them
---
 .../glibc/avoid-semver-on-common.patch        | 65 +++++++++++++++++++
 pkgs/development/libraries/glibc/common.nix   |  3 +
 .../tools/misc/binutils/default.nix           |  4 +-
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/glibc/avoid-semver-on-common.patch

diff --git a/pkgs/development/libraries/glibc/avoid-semver-on-common.patch b/pkgs/development/libraries/glibc/avoid-semver-on-common.patch
new file mode 100644
index 00000000000..966325d6f18
--- /dev/null
+++ b/pkgs/development/libraries/glibc/avoid-semver-on-common.patch
@@ -0,0 +1,65 @@
+From 0edeadc0d396aa713b808ae50a0058aca5d3837e Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 26 Jul 2017 10:08:46 -0700
+Subject: [PATCH] Avoid .symver on common symbols [BZ #21666]
+
+The .symver directive on common symbol just creates a new common symbol,
+not an alias and the newer assembler with the bug fix for
+
+https://sourceware.org/bugzilla/show_bug.cgi?id=21661
+
+will issue an error.  Before the fix, we got
+
+$ readelf -sW libc.so | grep "loc[12s]"
+  5109: 00000000003a0608     8 OBJECT  LOCAL  DEFAULT   36 loc1
+  5188: 00000000003a0610     8 OBJECT  LOCAL  DEFAULT   36 loc2
+  5455: 00000000003a0618     8 OBJECT  LOCAL  DEFAULT   36 locs
+  6575: 00000000003a05f0     8 OBJECT  GLOBAL DEFAULT   36 locs@GLIBC_2.2.5
+  7156: 00000000003a05f8     8 OBJECT  GLOBAL DEFAULT   36 loc1@GLIBC_2.2.5
+  7312: 00000000003a0600     8 OBJECT  GLOBAL DEFAULT   36 loc2@GLIBC_2.2.5
+
+in libc.so.  The versioned loc1, loc2 and locs have the wrong addresses.
+After the fix, we got
+
+$ readelf -sW libc.so | grep "loc[12s]"
+  6570: 000000000039e3b8     8 OBJECT  GLOBAL DEFAULT   34 locs@GLIBC_2.2.5
+  7151: 000000000039e3c8     8 OBJECT  GLOBAL DEFAULT   34 loc1@GLIBC_2.2.5
+  7307: 000000000039e3c0     8 OBJECT  GLOBAL DEFAULT   34 loc2@GLIBC_2.2.5
+
+	[BZ #21666]
+	* misc/regexp.c (loc1): Add __attribute__ ((nocommon));
+	(loc2): Likewise.
+	(locs): Likewise.
+
+(cherry picked from commit 388b4f1a02f3a801965028bbfcd48d905638b797)
+---
+ ChangeLog     | 7 +++++++
+ misc/regexp.c | 9 +++++----
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/misc/regexp.c b/misc/regexp.c
+index 19d76c0..eaea7c3 100644
+--- a/misc/regexp.c
++++ b/misc/regexp.c
+@@ -29,14 +29,15 @@
+
+ #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
+
+-/* Define the variables used for the interface.  */
+-char *loc1;
+-char *loc2;
++/* Define the variables used for the interface.  Avoid .symver on common
++   symbol, which just creates a new common symbol, not an alias.  */
++char *loc1 __attribute__ ((nocommon));
++char *loc2 __attribute__ ((nocommon));
+ compat_symbol (libc, loc1, loc1, GLIBC_2_0);
+ compat_symbol (libc, loc2, loc2, GLIBC_2_0);
+
+ /* Although we do not support the use we define this variable as well.  */
+-char *locs;
++char *locs __attribute__ ((nocommon));
+ compat_symbol (libc, locs, locs, GLIBC_2_0);
+
+
+--
+2.9.3
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 1b53acf12b1..d1c5446e807 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -64,6 +64,9 @@ stdenv.mkDerivation ({
       ./CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch
       ./CVE-2017-1000366-rtld-LD_PRELOAD.patch
       ./CVE-2017-1000366-rtld-LD_AUDIT.patch
+
+      /* https://sourceware.org/bugzilla/show_bug.cgi?id=21666 */
+      ./avoid-semver-on-common.patch
     ]
     ++ lib.optionals stdenv.isi686 [
       ./fix-i686-memchr.patch
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ae58c72b786..ac9ab141332 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "2.28";
+  version = "2.29";
   basename = "binutils-${version}";
   inherit (stdenv.lib) optional optionals optionalString;
   # The prefix prepended to binary names to allow multiple binuntils on the
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
-    sha256 = "0wiasgns7i8km8nrxas265sh2dfpsw93b3qw195ipc90w4z475v2";
+    sha256 = "1gqfyksdnj3iir5gzyvlp785mnk60g1pll6zbzbslfchhr4rb8i9";
   };
 
   patches = [

From 07b69a532547dbcbddc0a68e15c793fb92d2d870 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Jul 2017 13:32:58 -0400
Subject: [PATCH 1187/3246] feh: 2.19.0 -> 2.19.1

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 5de8e7892ab..aace37601b5 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.19";
+  version = "2.19.1";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "1sfhr6628xpj9p6bqihdq35y139x2gmrpydjlrwsl1rs77c2bgnf";
+    sha256 = "1d4ycmai3dpajl0bdr9i56646g4h5j1lb95jjn0nckwcddcj927c";
   };
 
   outputs = [ "out" "man" "doc" ];

From bde8a15019a21fff28cac8ad82a39c5f30964717 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Jul 2017 13:40:13 -0400
Subject: [PATCH 1188/3246] ImageMagick: 6.9.9-0 -> 6.9.9-3

---
 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 a9223749f39..169576f29bf 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -13,8 +13,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.9-0";
-    sha256 = "02xnvgjnmz2d4yv4iy1kh7an5w631p1s319jw23c8zpmqhfhk2ha";
+    version = "6.9.9-3";
+    sha256 = "1bfg334nxkxhsm6h0hb0vwd9aiz031qa0w8w8hmhdk8m4wawshrg";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.

From 5e26dbe7ad4d3939235d94bc519ce3a6f8a0f191 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Jul 2017 13:46:47 -0400
Subject: [PATCH 1189/3246] ImageMagick: 7.0.6-1 -> 7.0.6-4

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

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 1a854a82bf0..5524f12077f 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.6-1";
-    sha256 = "1i3gsc0ps7cbvfmnk6fbi5hng18jwh4x4dqbz90a45x85023w9vs";
+    version = "7.0.6-4";
+    sha256 = "0fvkx9lf8g0sa9bccd9s5qyhcy0g1mqnkbpqly55ryxyg1ywxqaz";
     patches = [];
   };
 in

From 5e08c4a2cdbd8d77b26e339af3ddd1fd1fcad436 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 19:14:47 +0200
Subject: [PATCH 1190/3246] flex: 2.6.3 -> 2.6.4

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

diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index 3bb34f5bc90..addf3b6197a 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "flex-${version}";
-  version = "2.6.3";
+  version = "2.6.4";
 
   src = fetchurl {
     url = "https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz";
-    sha256 = "1an2cn2z85mkpgqcinh1fhhcd7993qm2lil1yxic8iz76ci79ck8";
+    sha256 = "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8";
   };
 
   buildInputs = [ bison ];

From 42beae061803b6c81925601f69ac704b4f700a60 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 19:03:28 +0200
Subject: [PATCH 1191/3246] iptables: build with current flex

---
 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 21daf608d25..b9da5993556 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11936,9 +11936,7 @@ with pkgs;
     inherit (perlPackages) SGMLSpm;
   };
 
-  iptables = callPackage ../os-specific/linux/iptables {
-    flex = flex_2_5_35;
-  };
+  iptables = callPackage ../os-specific/linux/iptables { };
 
   iptstate = callPackage ../os-specific/linux/iptstate { } ;
 

From 7f69275f99359b140afe4e62d6095d2bf54113de Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 19:26:14 +0200
Subject: [PATCH 1192/3246] dtc: build with current flex

---
 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 b9da5993556..086e8bee32c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1695,7 +1695,7 @@ with pkgs;
 
   dtach = callPackage ../tools/misc/dtach { };
 
-  dtc = callPackage ../development/compilers/dtc { flex = flex_2_6_1; };
+  dtc = callPackage ../development/compilers/dtc { };
 
   dub = callPackage ../development/tools/build-managers/dub { };
 

From d3bfa0542c224f0c4001be964117acab5a2412d0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 19:26:42 +0200
Subject: [PATCH 1193/3246] intercal: build with current flex

---
 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 086e8bee32c..0c04cd24884 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5625,9 +5625,7 @@ with pkgs;
     inherit (haskellPackages) idris;
   };
 
-  intercal = callPackage ../development/compilers/intercal {
-    flex = flex_2_6_1; # Works with 2.5.35 too, but not 2.6.3
-  };
+  intercal = callPackage ../development/compilers/intercal { };
 
   irony-server = callPackage ../development/tools/irony-server/default.nix {
     # The repository of irony to use -- must match the version of the employed emacs

From 5d2f5e374f405953998286be66a0caf88aa8ab1c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 19:26:59 +0200
Subject: [PATCH 1194/3246] verilator: build with current flex

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

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index ed4a430198a..31c2d4f6475 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, flex_2_6_1, bison }:
+{ stdenv, fetchurl, perl, flex, bison }:
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  buildInputs = [ perl flex_2_6_1 bison ];
+  buildInputs = [ perl flex bison ];
 
   postInstall = ''
     sed -i -e '3a\#!/usr/bin/env perl' -e '1,3d' $out/bin/{verilator,verilator_coverage,verilator_profcfunc}

From 6f0ef6bb3259031ddf2a3a69905a5ec7a86a1067 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 29 Jul 2017 19:42:44 +0200
Subject: [PATCH 1195/3246] ispc: build with current flex

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

diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index f8413075ac8..6bc7f66ca29 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex_2_6_1, llvmPackages, clangWrapSelf,
+{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf,
 testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     m4
     python
     bison
-    flex_2_6_1
+    flex
     llvm
     llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped
   ];

From e1fd278759ac0d60065fe7f455eece0ea8f994dc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 29 Jul 2017 13:33:56 -0500
Subject: [PATCH 1196/3246] kfilemetadata: enable Qt Multimedia dependency

---
 .../libraries/kde-frameworks/kfilemetadata/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index 7f325c88049..ac209216828 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
-  attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
+  attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, qtmultimedia, taglib
 }:
 
 mkDerivation {
@@ -9,8 +9,8 @@ mkDerivation {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler taglib
+    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase qtmultimedia
+    taglib
   ];
-  propagatedBuildInputs = [ qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }

From 5e0c5c27df0fa03b67736c649b47e61b0b118891 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 29 Jul 2017 13:34:13 -0500
Subject: [PATCH 1197/3246] solid: include media-player-info during build

---
 pkgs/development/libraries/kde-frameworks/solid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index 24705d6c114..2a9b4fa1a5c 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -10,7 +10,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ bison extra-cmake-modules flex ];
+  nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ];
   buildInputs = [ qtdeclarative qttools ];
   propagatedBuildInputs = [ qtbase ];
   propagatedUserEnvPkgs = [ media-player-info ];

From 0a7e705f629c8dee29b06bb4c0be867e15c45059 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 20:40:35 +0200
Subject: [PATCH 1198/3246] python36: Don't use ldconfig and speed up uuid load

A Python 3.6 version of de1b4e71c1c8be30ad4ebc2ec6005928ba6cf280.
---
 .../python/cpython/3.6/default.nix            |   4 +
 .../python/cpython/3.6/no-ldconfig.patch      | 163 ++++++++++++++++++
 2 files changed, 167 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index bca717b919b..7e05a0ce61c 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -64,6 +64,10 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
+  patches = [
+    ./no-ldconfig.patch
+  ];
+
   postPatch = ''
     # Determinism
     substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
diff --git a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
new file mode 100644
index 00000000000..da6afe04d6e
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
@@ -0,0 +1,163 @@
+From a831df344ec1c883a0ef04d8cc8f5c53a942f6de Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Sat, 29 Jul 2017 20:17:40 +0200
+Subject: [PATCH] Don't use ldconfig and speed up uuid load
+
+---
+ Lib/ctypes/util.py | 70 ++----------------------------------------------------
+ Lib/uuid.py        | 51 ---------------------------------------
+ 2 files changed, 2 insertions(+), 119 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 339ae8aa8a..2944985c30 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -85,46 +85,7 @@ elif os.name == "posix":
+     import re, tempfile
+ 
+     def _findLib_gcc(name):
+-        # Run GCC's linker with the -t (aka --trace) option and examine the
+-        # library name it prints out. The GCC command will fail because we
+-        # haven't supplied a proper program with main(), but that does not
+-        # matter.
+-        expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
+-
+-        c_compiler = shutil.which('gcc')
+-        if not c_compiler:
+-            c_compiler = shutil.which('cc')
+-        if not c_compiler:
+-            # No C compiler available, give up
+-            return None
+-
+-        temp = tempfile.NamedTemporaryFile()
+-        try:
+-            args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
+-
+-            env = dict(os.environ)
+-            env['LC_ALL'] = 'C'
+-            env['LANG'] = 'C'
+-            try:
+-                proc = subprocess.Popen(args,
+-                                        stdout=subprocess.PIPE,
+-                                        stderr=subprocess.STDOUT,
+-                                        env=env)
+-            except OSError:  # E.g. bad executable
+-                return None
+-            with proc:
+-                trace = proc.stdout.read()
+-        finally:
+-            try:
+-                temp.close()
+-            except FileNotFoundError:
+-                # Raised if the file was already removed, which is the normal
+-                # behaviour of GCC if linking fails
+-                pass
+-        res = re.search(expr, trace)
+-        if not res:
+-            return None
+-        return os.fsdecode(res.group(0))
++        return None
+ 
+ 
+     if sys.platform == "sunos5":
+@@ -246,34 +207,7 @@ elif os.name == "posix":
+     else:
+ 
+         def _findSoname_ldconfig(name):
+-            import struct
+-            if struct.calcsize('l') == 4:
+-                machine = os.uname().machine + '-32'
+-            else:
+-                machine = os.uname().machine + '-64'
+-            mach_map = {
+-                'x86_64-64': 'libc6,x86-64',
+-                'ppc64-64': 'libc6,64bit',
+-                'sparc64-64': 'libc6,64bit',
+-                's390x-64': 'libc6,64bit',
+-                'ia64-64': 'libc6,IA-64',
+-                }
+-            abi_type = mach_map.get(machine, 'libc6')
+-
+-            # XXX assuming GLIBC's ldconfig (with option -p)
+-            regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
+-            regex = os.fsencode(regex % (re.escape(name), abi_type))
+-            try:
+-                with subprocess.Popen(['/sbin/ldconfig', '-p'],
+-                                      stdin=subprocess.DEVNULL,
+-                                      stderr=subprocess.DEVNULL,
+-                                      stdout=subprocess.PIPE,
+-                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+-                    res = re.search(regex, p.stdout.read())
+-                    if res:
+-                        return os.fsdecode(res.group(1))
+-            except OSError:
+-                pass
++            return None
+ 
+         def _findLib_ld(name):
+             # See issue #9998 for why this is needed
+diff --git a/Lib/uuid.py b/Lib/uuid.py
+index 200c800b34..a099ab4b4a 100644
+--- a/Lib/uuid.py
++++ b/Lib/uuid.py
+@@ -455,57 +455,6 @@ def _netbios_getnode():
+             continue
+         return int.from_bytes(bytes, 'big')
+ 
+-# 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.
+-# XXX This makes the module non-thread-safe!
+-_uuid_generate_time = _UuidCreate = None
+-try:
+-    import ctypes, ctypes.util
+-    import sys
+-
+-    # The uuid_generate_* routines are provided by libuuid on at least
+-    # Linux and FreeBSD, and provided by libc on Mac OS X.
+-    _libnames = ['uuid']
+-    if not sys.platform.startswith('win'):
+-        _libnames.append('c')
+-    for libname in _libnames:
+-        try:
+-            lib = ctypes.CDLL(ctypes.util.find_library(libname))
+-        except Exception:
+-            continue
+-        if hasattr(lib, 'uuid_generate_time'):
+-            _uuid_generate_time = lib.uuid_generate_time
+-            break
+-    del _libnames
+-
+-    # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
+-    # in issue #8621 the function generates the same sequence of values
+-    # in the parent process and all children created using fork (unless
+-    # those children use exec as well).
+-    #
+-    # Assume that the uuid_generate functions are broken from 10.5 onward,
+-    # the test can be adjusted when a later version is fixed.
+-    if sys.platform == 'darwin':
+-        if int(os.uname().release.split('.')[0]) >= 9:
+-            _uuid_generate_time = None
+-
+-    # On Windows prior to 2000, UuidCreate gives a UUID containing the
+-    # hardware address.  On Windows 2000 and later, UuidCreate makes a
+-    # random UUID and UuidCreateSequential gives a UUID containing the
+-    # hardware address.  These routines are provided by the RPC runtime.
+-    # NOTE:  at least on Tim's WinXP Pro SP2 desktop box, while the last
+-    # 6 bytes returned by UuidCreateSequential are fixed, they don't appear
+-    # to bear any relationship to the MAC address of any network device
+-    # on the box.
+-    try:
+-        lib = ctypes.windll.rpcrt4
+-    except:
+-        lib = None
+-    _UuidCreate = getattr(lib, 'UuidCreateSequential',
+-                          getattr(lib, 'UuidCreate', None))
+-except:
+-    pass
+ 
+ def _unixdll_getnode():
+     """Get the hardware address on Unix using ctypes."""
+-- 
+2.13.3
+

From d64e798c822343ab1bfe902c905f6fa460e61db7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 20:41:02 +0200
Subject: [PATCH 1199/3246] python35: Don't use ldconfig and speed up uuid load

A Python 3.5 version of de1b4e71c1c8be30ad4ebc2ec6005928ba6cf280.
---
 .../python/cpython/3.5/default.nix            |   1 +
 .../python/cpython/3.5/no-ldconfig.patch      | 164 ++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index a4aec241a1a..a47b10d1cbb 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -70,6 +70,7 @@ in stdenv.mkDerivation {
       url = https://github.com/python/cpython/commit/035ba5da3e53e.patch;
       sha256 = "1y74ir1w5cq542w27rgzgp70chhq2x047db9911mihpab8p2nj71";
     })
+    ./no-ldconfig.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
new file mode 100644
index 00000000000..c96de5d0e91
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
@@ -0,0 +1,164 @@
+From f0ed87f4066296b7aa3c095d04672c138506fa45 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Sat, 29 Jul 2017 20:33:56 +0200
+Subject: [PATCH] Don't use ldconfig and speed up uuid load
+
+---
+ Lib/ctypes/util.py | 70 ++----------------------------------------------------
+ Lib/uuid.py        | 52 ----------------------------------------
+ 2 files changed, 2 insertions(+), 120 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 7684eab81d..e9957d7951 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -95,46 +95,7 @@ elif os.name == "posix":
+     import re, tempfile
+ 
+     def _findLib_gcc(name):
+-        # Run GCC's linker with the -t (aka --trace) option and examine the
+-        # library name it prints out. The GCC command will fail because we
+-        # haven't supplied a proper program with main(), but that does not
+-        # matter.
+-        expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
+-
+-        c_compiler = shutil.which('gcc')
+-        if not c_compiler:
+-            c_compiler = shutil.which('cc')
+-        if not c_compiler:
+-            # No C compiler available, give up
+-            return None
+-
+-        temp = tempfile.NamedTemporaryFile()
+-        try:
+-            args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
+-
+-            env = dict(os.environ)
+-            env['LC_ALL'] = 'C'
+-            env['LANG'] = 'C'
+-            try:
+-                proc = subprocess.Popen(args,
+-                                        stdout=subprocess.PIPE,
+-                                        stderr=subprocess.STDOUT,
+-                                        env=env)
+-            except OSError:  # E.g. bad executable
+-                return None
+-            with proc:
+-                trace = proc.stdout.read()
+-        finally:
+-            try:
+-                temp.close()
+-            except FileNotFoundError:
+-                # Raised if the file was already removed, which is the normal
+-                # behaviour of GCC if linking fails
+-                pass
+-        res = re.search(expr, trace)
+-        if not res:
+-            return None
+-        return os.fsdecode(res.group(0))
++        return None
+ 
+ 
+     if sys.platform == "sunos5":
+@@ -256,34 +217,7 @@ elif os.name == "posix":
+     else:
+ 
+         def _findSoname_ldconfig(name):
+-            import struct
+-            if struct.calcsize('l') == 4:
+-                machine = os.uname().machine + '-32'
+-            else:
+-                machine = os.uname().machine + '-64'
+-            mach_map = {
+-                'x86_64-64': 'libc6,x86-64',
+-                'ppc64-64': 'libc6,64bit',
+-                'sparc64-64': 'libc6,64bit',
+-                's390x-64': 'libc6,64bit',
+-                'ia64-64': 'libc6,IA-64',
+-                }
+-            abi_type = mach_map.get(machine, 'libc6')
+-
+-            # XXX assuming GLIBC's ldconfig (with option -p)
+-            regex = os.fsencode(
+-                '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type))
+-            try:
+-                with subprocess.Popen(['/sbin/ldconfig', '-p'],
+-                                      stdin=subprocess.DEVNULL,
+-                                      stderr=subprocess.DEVNULL,
+-                                      stdout=subprocess.PIPE,
+-                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+-                    res = re.search(regex, p.stdout.read())
+-                    if res:
+-                        return os.fsdecode(res.group(1))
+-            except OSError:
+-                pass
++            return None
+ 
+         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 e96e7e034c..a099ab4b4a 100644
+--- a/Lib/uuid.py
++++ b/Lib/uuid.py
+@@ -455,58 +455,6 @@ def _netbios_getnode():
+             continue
+         return int.from_bytes(bytes, 'big')
+ 
+-# 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.
+-# XXX This makes the module non-thread-safe!
+-_uuid_generate_time = _UuidCreate = None
+-try:
+-    import ctypes, ctypes.util
+-    import sys
+-
+-    # The uuid_generate_* routines are provided by libuuid on at least
+-    # Linux and FreeBSD, and provided by libc on Mac OS X.
+-    _libnames = ['uuid']
+-    if not sys.platform.startswith('win'):
+-        _libnames.append('c')
+-    for libname in _libnames:
+-        try:
+-            lib = ctypes.CDLL(ctypes.util.find_library(libname))
+-        except Exception:
+-            continue
+-        if hasattr(lib, 'uuid_generate_time'):
+-            _uuid_generate_time = lib.uuid_generate_time
+-            break
+-    del _libnames
+-
+-    # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
+-    # in issue #8621 the function generates the same sequence of values
+-    # in the parent process and all children created using fork (unless
+-    # those children use exec as well).
+-    #
+-    # Assume that the uuid_generate functions are broken from 10.5 onward,
+-    # the test can be adjusted when a later version is fixed.
+-    if sys.platform == 'darwin':
+-        import os
+-        if int(os.uname().release.split('.')[0]) >= 9:
+-            _uuid_generate_time = None
+-
+-    # On Windows prior to 2000, UuidCreate gives a UUID containing the
+-    # hardware address.  On Windows 2000 and later, UuidCreate makes a
+-    # random UUID and UuidCreateSequential gives a UUID containing the
+-    # hardware address.  These routines are provided by the RPC runtime.
+-    # NOTE:  at least on Tim's WinXP Pro SP2 desktop box, while the last
+-    # 6 bytes returned by UuidCreateSequential are fixed, they don't appear
+-    # to bear any relationship to the MAC address of any network device
+-    # on the box.
+-    try:
+-        lib = ctypes.windll.rpcrt4
+-    except:
+-        lib = None
+-    _UuidCreate = getattr(lib, 'UuidCreateSequential',
+-                          getattr(lib, 'UuidCreate', None))
+-except:
+-    pass
+ 
+ def _unixdll_getnode():
+     """Get the hardware address on Unix using ctypes."""
+-- 
+2.13.3
+

From d387cac375a2da699d1feb160a775b4fbe46511a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 20:49:24 +0200
Subject: [PATCH 1200/3246] python33: end-of-life

Python 3.3 reaches end-of-life when we release 17.09.

https://mail.python.org/pipermail/python-dev/2017-July/148584.html
---
 doc/languages-frameworks/python.md            |   5 +-
 .../python/cpython/3.3/default.nix            | 160 ------------------
 .../python/cpython/docs/3.3-html.nix          |  18 --
 .../python/cpython/docs/3.3-pdf-a4.nix        |  18 --
 .../python/cpython/docs/3.3-pdf-letter.nix    |  18 --
 .../python/cpython/docs/3.3-text.nix          |  18 --
 .../python/cpython/docs/default.nix           |  12 --
 pkgs/top-level/all-packages.nix               |   7 -
 8 files changed, 2 insertions(+), 254 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.3/default.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/3.3-html.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/3.3-text.nix

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 3c9df2e6e82..a4af9aa80f0 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -423,7 +423,7 @@ and in this case the `python35` interpreter is automatically used.
 ### Interpreters
 
 Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as
-respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter
+respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
 is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
 `python35`. The default interpreter, `python`, maps to `python2`.
 The Nix expressions for the interpreters can be found in
@@ -469,7 +469,6 @@ sets are
 
 * `pkgs.python26Packages`
 * `pkgs.python27Packages`
-* `pkgs.python33Packages`
 * `pkgs.python34Packages`
 * `pkgs.python35Packages`
 * `pkgs.python36Packages`
@@ -622,7 +621,7 @@ attribute. The `shell.nix` file from the previous section can thus be also writt
 ```nix
 with import <nixpkgs> {};
 
-(python33.withPackages (ps: [ps.numpy ps.requests])).env
+(python36.withPackages (ps: [ps.numpy ps.requests])).env
 ```
 
 In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options
diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix
deleted file mode 100644
index 9ff8ec51efe..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.3/default.nix
+++ /dev/null
@@ -1,160 +0,0 @@
-{ stdenv, fetchurl
-, bzip2
-, gdbm
-, lzma
-, ncurses
-, openssl
-, readline
-, sqlite
-, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
-, zlib
-, callPackage
-, self
-, CF, configd
-, python-setup-hook
-# For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
-}:
-
-assert x11Support -> tcl != null
-                  && tk != null
-                  && xproto != null
-                  && libX11 != null;
-
-with stdenv.lib;
-
-let
-  majorVersion = "3.3";
-  minorVersion = "6";
-  minorVersionSuffix = "";
-  pythonVersion = majorVersion;
-  version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
-  libPrefix = "python${majorVersion}";
-  sitePackages = "lib/${libPrefix}/site-packages";
-
-  buildInputs = filter (p: p != null) [
-    zlib bzip2 lzma gdbm sqlite readline ncurses openssl ]
-    ++ optionals x11Support [ tcl tk libX11 xproto ]
-    ++ optionals stdenv.isDarwin [ CF configd ];
-
-in stdenv.mkDerivation {
-  name = "python3-${version}";
-  pythonVersion = majorVersion;
-  inherit majorVersion version;
-
-  inherit buildInputs;
-
-  src = fetchurl {
-    url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj";
-  };
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-
-  # Determinism: The interpreter is patched to write null timestamps when compiling python files.
-  # This way python doesn't try to update them when we freeze timestamps in nix store.
-  DETERMINISTIC_BUILD=1;
-  # Determinism: We fix the hashes of str, bytes and datetime objects.
-  PYTHONHASHSEED=0;
-
-  postPatch = ''
-    # Determinism
-    substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
-#     # We do not patch `Lib/importlib/_bootstrap_external.py` because it does not exist.
-  '' + 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
-    done
-    ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
-
-    configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
-                          LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
-                        )
-  '';
-
-  setupHook = python-setup-hook sitePackages;
-
-  postInstall = ''
-    # needed for some packages, especially packages that backport functionality
-    # to 2.x from 3.x
-    for item in $out/lib/python${majorVersion}/test/*; do
-      if [[ "$item" != */test_support.py* ]]; then
-        rm -rf "$item"
-      else
-        echo $item
-      fi
-    done
-    touch $out/lib/python${majorVersion}/test/__init__.py
-
-    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
-    paxmark E $out/bin/python${majorVersion}
-
-    # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
-    echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
-
-    # Determinism: Windows installers were not deterministic.
-    # We're also not interested in building Windows installers.
-    find "$out" -name 'wininst*.exe' | xargs -r rm -f
-
-    # Use Python3 as default python
-    ln -s "$out/bin/idle3" "$out/bin/idle"
-    ln -s "$out/bin/pip3" "$out/bin/pip"
-    ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
-    ln -s "$out/bin/python3" "$out/bin/python"
-    ln -s "$out/bin/python3-config" "$out/bin/python-config"
-    ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
-
-    # Get rid of retained dependencies on -dev packages, and remove
-    # some $TMPDIR references to improve binary reproducibility.
-    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
-    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
-      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
-    done
-
-    # Determinism: rebuild all bytecode
-    # We exclude lib2to3 because that's Python 2 code which fails
-    # We rebuild three times, once for each optimization level
-    find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i -
-    find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i -
-    find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
-  '';
-
-  passthru = let
-    pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
-  in rec {
-    inherit libPrefix sitePackages x11Support;
-    executable = "${libPrefix}m";
-    buildEnv = callPackage ../../wrapper.nix { python = self; };
-    withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
-    pkgs = pythonPackages;
-    isPy3 = true;
-    isPy33 = true;
-    is_py3k = true;  # deprecated
-    interpreter = "${self}/bin/${executable}";
-  };
-
-  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 = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ chaoflow cstrahan ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix
deleted file mode 100644
index 055224dd740..00000000000
--- a/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python33-docs-html-3.3.0";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-html.tar.bz2;
-    sha256 = "0vv24b9qi7gznv687ik0pa2w1rq9grqivy44znvj2ysjfg7mc2c1";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python33
-    cp -R ./ $out/share/doc/python33/html
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix
deleted file mode 100644
index 8c6b842d0b9..00000000000
--- a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python33-docs-pdf-a4-3.3.0";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-a4.tar.bz2;
-    sha256 = "1y6n13bxlw8a11khy3ynfbz8z0kpf2lvh32dvy8scyw3hrk6wdxp";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python33
-    cp -R ./ $out/share/doc/python33/pdf-a4
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix
deleted file mode 100644
index 046abe8f83d..00000000000
--- a/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python33-docs-pdf-letter-3.3.0";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-letter.tar.bz2;
-    sha256 = "0mcj1i47nx81fc9zk1cic4c4p139qjcqlzf4hnnkzvb3jcgy5z6k";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python33
-    cp -R ./ $out/share/doc/python33/pdf-letter
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix
deleted file mode 100644
index 4d99c25bf59..00000000000
--- a/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python33-docs-text-3.3.0";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-text.tar.bz2;
-    sha256 = "10vk2fixg1aglqmsf89kn98rlirrbhnrk1285vzfbynf2iavxw0n";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python33
-    cp -R ./ $out/share/doc/python33/text
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix
index 89e60f961f6..60e0a0bf1e6 100644
--- a/pkgs/development/interpreters/python/cpython/docs/default.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/default.nix
@@ -4,36 +4,24 @@ let
 pythonDocs = {
   html = {
     recurseForDerivations = true;
-    python33 = import ./3.3-html.nix {
-      inherit stdenv fetchurl lib;
-    };
     python27 = import ./2.7-html.nix {
       inherit stdenv fetchurl lib;
     };
   };
   pdf_a4 = {
     recurseForDerivations = true;
-    python33 = import ./3.3-pdf-a4.nix {
-      inherit stdenv fetchurl lib;
-    };
     python27 = import ./2.7-pdf-a4.nix {
       inherit stdenv fetchurl lib;
     };
   };
   pdf_letter = {
     recurseForDerivations = true;
-    python33 = import ./3.3-pdf-letter.nix {
-      inherit stdenv fetchurl lib;
-    };
     python27 = import ./2.7-pdf-letter.nix {
       inherit stdenv fetchurl lib;
     };
   };
   text = {
     recurseForDerivations = true;
-    python33 = import ./3.3-text.nix {
-      inherit stdenv fetchurl lib;
-    };
     python27 = import ./2.7-text.nix {
       inherit stdenv fetchurl lib;
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05ff56aef28..ab80bd6f809 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6327,7 +6327,6 @@ with pkgs;
   python2Full = python2.override{x11Support=true;};
   python27Full = python27.override{x11Support=true;};
   python3Full = python3.override{x11Support=true;};
-  python33Full = python33.override{x11Support=true;};
   python34Full = python34.override{x11Support=true;};
   python35Full = python35.override{x11Support=true;};
   python36Full = python36.override{x11Support=true;};
@@ -6341,10 +6340,6 @@ with pkgs;
     self = python27;
     inherit (darwin) CF configd;
   };
-  python33 = callPackage ../development/interpreters/python/cpython/3.3 {
-    self = python33;
-    inherit (darwin) CF configd;
-  };
   python34 = callPackage ../development/interpreters/python/cpython/3.4 {
     inherit (darwin) CF configd;
     self = python34;
@@ -10910,8 +10905,6 @@ with pkgs;
 
   python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
 
-  python33Packages = python33.pkgs;
-
   python34Packages = python34.pkgs;
 
   python35Packages = python35.pkgs;

From cdb18068cde28d53b0ce64e2a8f32b1a20b8717f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 21 Jul 2017 08:09:02 -0500
Subject: [PATCH 1201/3246] zfs: fix invalid use of substituteInPlace

substituteInPlace was invoked with multiple targets on the command line, which
is not supported.

(cherry picked from commit b21defaf51daf002f94bb57bf0f5073b153247db)

Re-applied due to bad merge in b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed.
---
 pkgs/os-specific/linux/zfs/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 1e28cfe000f..a47b43a1f0f 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -45,7 +45,6 @@ in stdenv.mkDerivation rec {
     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"
@@ -55,6 +54,12 @@ in stdenv.mkDerivation rec {
     substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
     substituteInPlace ./etc/systemd/system/zfs-share.service.in \
       --replace "@bindir@/rm " "${coreutils}/bin/rm "
+
+    for f in ./udev/rules.d/*
+    do
+      substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
+    done
+
     ./autogen.sh
   '';
 

From 1d72474df7fa361d72a04d2a3ec4589b286ab6f2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 29 Jul 2017 22:03:43 +0300
Subject: [PATCH 1202/3246] make-ext4-fs: Fix modification timestamps in image

Use '-f' to make timestamp calls to always return the same time. Also
Nix uses the timestamp of '1' instead of epoch directly.
---
 nixos/lib/make-ext4-fs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 23839ea487d..f06649e1991 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -33,7 +33,7 @@ pkgs.stdenv.mkDerivation {
       echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)"
 
       truncate -s $bytes $out
-      faketime "1970-01-01 00:00:00" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out
+      faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out
 
       # Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
       # For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
@@ -76,7 +76,7 @@ pkgs.stdenv.mkDerivation {
 
           echo sif $file gid 30000 # chgrp to nixbld
         done
-      ) | faketime "1970-01-01 00:00:00" debugfs -w $out -f /dev/stdin > errorlog 2>&1
+      ) | faketime -f "1970-01-01 00:00:01" debugfs -w $out -f /dev/stdin > errorlog 2>&1
 
       # The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually.
       if egrep -q 'Could not allocate|File not found' errorlog; then

From 820c7591f8c20496738eb4d697e7098054b791a5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Jul 2017 15:05:09 -0400
Subject: [PATCH 1203/3246] mariadb: 10.1.21 -> 10.1.25

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

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 1356915c1fa..3ede229931e 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -15,11 +15,11 @@ mariadb = everything // {
 };
 
 common = rec { # attributes common to both builds
-  version = "10.1.21";
+  version = "10.1.25";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";
-    sha256 = "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as";
+    sha256 = "1mm0n8sl6grajk5rbrx55333laz5dg2abyl8mlsn7h8vdymfq1bj";
     name   = "mariadb-${version}.tar.gz";
   };
 

From 3e69c650abf8bc1c0bcc2a60d97802c70c06c68e Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Thu, 27 Jul 2017 19:49:56 +0200
Subject: [PATCH 1204/3246] nixos/systemd-networkd: allow [Link] section in
 .network files

---
 nixos/modules/system/boot/networkd.nix | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index b151b568892..9d2cea3ad16 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -142,6 +142,18 @@ let
     (assertValueOneOf "EmitTimezone" boolValues)
   ];
 
+  # .network files have a [Link] section with different options than in .netlink files
+  checkNetworkLink = checkUnitConfig "Link" [
+    (assertOnlyFields [
+      "MACAddress" "MTUBytes" "ARP" "Unmanaged"
+    ])
+    (assertMacAddress "MACAddress")
+    (assertByteFormat "MTUBytes")
+    (assertValueOneOf "ARP" boolValues)
+    (assertValueOneOf "Unmanaged" boolValues)
+  ];
+
+
   commonNetworkOptions = {
 
     enable = mkOption {
@@ -371,6 +383,18 @@ let
       '';
     };
 
+    linkConfig = mkOption {
+      default = {};
+      example = { Unmanaged = true; };
+      type = types.addCheck (types.attrsOf unitOption) checkNetworkLink;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Link]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
     name = mkOption {
       type = types.nullOr types.str;
       default = null;
@@ -581,6 +605,12 @@ let
     { inherit (def) enable;
       text = commonMatchText def +
         ''
+          ${optionalString (def.linkConfig != { }) ''
+            [Link]
+            ${attrsToSection def.linkConfig}
+
+          ''}
+
           [Network]
           ${attrsToSection def.networkConfig}
           ${concatStringsSep "\n" (map (s: "Address=${s}") def.address)}

From c4e26aff2288f39e1a778f222a78bfdbe2be9215 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Jul 2017 21:29:14 +0200
Subject: [PATCH 1205/3246] hspellDicts: broken

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

diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix
index fd456ca6209..ec6b304dc3c 100644
--- a/pkgs/development/libraries/hspell/dicts.nix
+++ b/pkgs/development/libraries/hspell/dicts.nix
@@ -4,6 +4,7 @@ let
   dict = a: stdenv.mkDerivation ({
     inherit (hspell) src patchPhase nativeBuildInputs;
     meta = hspell.meta // {
+      broken = true;
       description = "${a.buildFlags} Hebrew dictionary";
     } // (if a ? meta then a.meta else {});
   } // (removeAttrs a ["meta"]));

From eaa2d27b907e30e42f456573218c72479d198f74 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 26 Jul 2017 14:46:24 +0000
Subject: [PATCH 1206/3246] nixos/tinc: remove restartTriggers

```restartTriggers``` pointed to the constant files in ```/nix/store/``` and had to effect.
---
 nixos/modules/services/networking/tinc.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 31a588318f6..be5bfaebf7d 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -164,8 +164,6 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
         path = [ data.package ];
-        restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ]
-          ++ mapAttrsToList (host: _ : config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts;
         serviceConfig = {
           Type = "simple";
           PIDFile = "/run/tinc.${network}.pid";

From 06bcac90bb156dd732e0f233e9aeea923fb67a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 29 Jul 2017 20:43:20 +0100
Subject: [PATCH 1207/3246] alacritty: only build on linux

the darwin build fails at the moment and since we are now using patchelf
it would not build anyway.
---
 pkgs/applications/misc/alacritty/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 4f072c45144..e84ee7ee16b 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -62,6 +62,6 @@ buildRustPackage rec {
     homepage = https://github.com/jwilm/alacritty;
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ mic92 ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }

From 06a513ee05b9ad7a85ec9680e137284ef68ba72a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Jul 2017 13:30:31 -0400
Subject: [PATCH 1208/3246] busybox: 1.27.0 -> 1.27.1

---
 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 5447f13abc4..2548e33bf4c 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -27,11 +27,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.27.0";
+  name = "busybox-1.27.1";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "1kcr0jvik0c31ls4f3li359xv7w0b60hv64fknj28bwlkdgbvpx5";
+    sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

From 0154d1b03fc19071b950d0fdaa1470211a03d333 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 30 Jul 2017 00:03:24 +0200
Subject: [PATCH 1209/3246] fix evaluation

cc @nyarly
---
 .../ruby-modules/bundled-common/default.nix           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 1bf6257f655..64a88d8f7b8 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -61,7 +61,7 @@ let
 
   copyIfBundledByPath = { bundledByPath ? false, ...}@main:
   (if bundledByPath then
-      assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/"
+      assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/
     else ""
   );
 
@@ -109,11 +109,10 @@ let
     meta = { platforms = ruby.meta.platforms; } // meta;
 
     passthru = rec {
-      inherit ruby bundler gems mainGem confFiles envPaths;
+      inherit ruby bundler gems confFiles envPaths;
 
-      wrappedRuby =
-      stdenv.mkDerivation {
-        name = "wrapped-ruby-${pname}";
+      wrappedRuby = stdenv.mkDerivation {
+        name = "wrapped-ruby-${pname'}";
         nativeBuildInputs = [ makeWrapper ];
         buildCommand = ''
           mkdir -p $out/bin
@@ -137,7 +136,7 @@ let
           require 'bundler/setup'
         '';
         in stdenv.mkDerivation {
-          name = "${pname}-interactive-environment";
+          name = "${pname'}-interactive-environment";
           nativeBuildInputs = [ wrappedRuby basicEnv ];
           shellHook = ''
             export OLD_IRBRC=$IRBRC

From 373a623daa80b3f1e18a084db4a6ebb206a0046d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 30 Jul 2017 01:21:44 +0300
Subject: [PATCH 1210/3246] Revert "Revert "kbd: 2.0.3 -> 2.0.4""

This reverts commit 00bf3a9dcaffedc4eaf244848a2a3f84e648bdba.
---
 pkgs/os-specific/linux/kbd/console-fix.patch  | 18 -----
 pkgs/os-specific/linux/kbd/default.nix        | 17 +++-
 pkgs/os-specific/linux/kbd/search-paths.patch | 78 +++++++++----------
 3 files changed, 49 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kbd/console-fix.patch

diff --git a/pkgs/os-specific/linux/kbd/console-fix.patch b/pkgs/os-specific/linux/kbd/console-fix.patch
deleted file mode 100644
index aefc20ff914..00000000000
--- a/pkgs/os-specific/linux/kbd/console-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/loadkeys.c b/src/loadkeys.c
-index 6b23f68..adf65a0 100644
---- a/src/loadkeys.c
-+++ b/src/loadkeys.c
-@@ -166,10 +166,10 @@ main(int argc, char *argv[])
- 		exit(EXIT_FAILURE);
- 	}
- 
--	/* get console */
--	fd = getfd(console);
--
- 	if (!(options & OPT_M) && !(options & OPT_B)) {
-+		/* get console */
-+		fd = getfd(console);
-+
- 		/* check whether the keyboard is in Unicode mode */
- 		if (ioctl(fd, KDGKBMODE, &kbd_mode) ||
- 		    ioctl(fd, KDGETMODE, &kd_mode)) {
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index 6e8893cc37d..31fcdae6c80 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, flex, check, pam }:
+{ stdenv, fetchurl, autoreconfHook,
+  gzip, bzip2, pkgconfig, flex, check,
+  pam, coreutils
+}:
 
 stdenv.mkDerivation rec {
   name = "kbd-${version}";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz";
-    sha256 = "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs";
+    sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz";
   };
 
   configureFlags = [
@@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
     "--disable-nls"
   ];
 
-  patches = [ ./console-fix.patch ./search-paths.patch ];
+  patches = [ ./search-paths.patch ];
 
   postPatch =
     ''
@@ -34,6 +37,12 @@ stdenv.mkDerivation rec {
       ''}
     '';
 
+  postInstall = ''
+    substituteInPlace $out/bin/unicode_{start,stop} \
+      --replace /usr/bin/tty ${coreutils}/bin/tty
+  '';
+
+
   buildInputs = [ check pam ];
   nativeBuildInputs = [ autoreconfHook pkgconfig flex ];
 
diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/os-specific/linux/kbd/search-paths.patch
index 66a56041481..c9405a56721 100644
--- a/pkgs/os-specific/linux/kbd/search-paths.patch
+++ b/pkgs/os-specific/linux/kbd/search-paths.patch
@@ -1,77 +1,71 @@
-diff -ru3 kbd-2.0.3-old/src/libkeymap/analyze.l kbd-2.0.3/src/libkeymap/analyze.l
---- kbd-2.0.3-old/src/libkeymap/analyze.l	2016-07-03 02:31:28.258958092 +0300
-+++ kbd-2.0.3/src/libkeymap/analyze.l	2016-07-03 02:44:53.042592223 +0300
-@@ -99,6 +99,9 @@
+--- a/src/libkeymap/analyze.l
++++ b/src/libkeymap/analyze.l
+@@ -101,6 +101,9 @@ stack_pop(struct lk_ctx *ctx, void *scan
  static const char *const include_dirpath0[] = { "", 0 };
  static const char *const include_dirpath1[] = { "", "../include/", "../../include/", 0 };
  static const char *const include_dirpath3[] = {
-+	"/etc/kbd/" KEYMAPDIR "/include/",
-+	"/etc/kbd/" KEYMAPDIR "/i386/include/",
-+	"/etc/kbd/" KEYMAPDIR "/mac/include/",
++ 	"/etc/kbd/" KEYMAPDIR "/include/",
++ 	"/etc/kbd/" KEYMAPDIR "/i386/include/",
++ 	"/etc/kbd/" KEYMAPDIR "/mac/include/",
  	DATADIR "/" KEYMAPDIR "/include/",
  	DATADIR "/" KEYMAPDIR "/i386/include/",
  	DATADIR "/" KEYMAPDIR "/mac/include/", 0
-diff -ru3 kbd-2.0.3-old/src/loadkeys.c kbd-2.0.3/src/loadkeys.c
---- kbd-2.0.3-old/src/loadkeys.c	2016-07-03 02:31:28.260958091 +0300
-+++ kbd-2.0.3/src/loadkeys.c	2016-07-03 02:34:34.123871103 +0300
-@@ -26,7 +26,7 @@
+--- a/src/loadkeys.c
++++ b/src/loadkeys.c
+@@ -27,7 +27,7 @@
  #include "keymap.h"
  
- static const char *progname = NULL;
+ static const char *progname         = NULL;
 -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
 +static const char *const dirpath1[] = { "", "/etc/kbd/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", 0 };
  static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
  
- static void __attribute__ ((noreturn))
-diff -ru3 kbd-2.0.3-old/src/loadunimap.c kbd-2.0.3/src/loadunimap.c
---- kbd-2.0.3-old/src/loadunimap.c	2016-07-03 02:31:28.259958091 +0300
-+++ kbd-2.0.3/src/loadunimap.c	2016-07-03 02:33:06.803911971 +0300
-@@ -28,7 +28,7 @@
+ static void __attribute__((noreturn))
+--- a/src/loadunimap.c
++++ b/src/loadunimap.c
+@@ -30,7 +30,7 @@
  extern char *progname;
  extern int force;
  
--static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
-+static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 };
+-static const char *const unidirpath[]  = { "", DATADIR "/" UNIMAPDIR "/", 0 };
++static const char *const unidirpath[]  = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 };
  static const char *const unisuffixes[] = { "", ".uni", ".sfm", 0 };
  
  #ifdef MAIN
-diff -ru3 kbd-2.0.3-old/src/mapscrn.c kbd-2.0.3/src/mapscrn.c
---- kbd-2.0.3-old/src/mapscrn.c	2016-07-03 02:31:28.260958091 +0300
-+++ kbd-2.0.3/src/mapscrn.c	2016-07-03 02:33:21.119905270 +0300
-@@ -25,7 +25,7 @@
- static int ctoi (char *);
+--- a/src/mapscrn.c
++++ b/src/mapscrn.c
+@@ -27,7 +27,7 @@ void loadnewmap(int fd, char *mfil);
+ static int ctoi(char *);
  
  /* search for the map file in these directories (with trailing /) */
--static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
-+static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 };
+-static const char *const mapdirpath[]  = { "", DATADIR "/" TRANSDIR "/", 0 };
++static const char *const mapdirpath[]  = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 };
  static const char *const mapsuffixes[] = { "", ".trans", "_to_uni.trans", ".acm", 0 };
  
  #ifdef MAIN
-diff -ru3 kbd-2.0.3-old/src/resizecons.c kbd-2.0.3/src/resizecons.c
---- kbd-2.0.3-old/src/resizecons.c	2016-07-03 02:31:28.260958091 +0300
-+++ kbd-2.0.3/src/resizecons.c	2016-07-03 02:33:32.253900060 +0300
-@@ -100,7 +100,7 @@
+--- a/src/resizecons.c
++++ b/src/resizecons.c
+@@ -101,7 +101,7 @@ static int vga_get_fontheight(void);
  static void vga_set_cursor(int, int);
  static void vga_set_verticaldisplayend_lowbyte(int);
  
--const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0};
-+const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0};
+-const char *const dirpath[]  = { "", DATADIR "/" VIDEOMODEDIR "/", 0 };
++const char *const dirpath[]  = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0};
  const char *const suffixes[] = { "", 0 };
  
- int
-diff -ru3 kbd-2.0.3-old/src/setfont.c kbd-2.0.3/src/setfont.c
---- kbd-2.0.3-old/src/setfont.c	2016-07-03 02:31:28.260958091 +0300
-+++ kbd-2.0.3/src/setfont.c	2016-07-03 02:33:54.315889734 +0300
-@@ -51,10 +51,10 @@
- int debug = 0;
+ int main(int argc, char **argv)
+--- a/src/setfont.c
++++ b/src/setfont.c
+@@ -53,10 +53,10 @@ int force   = 0;
+ int debug   = 0;
  
  /* search for the font in these directories (with trailing /) */
--const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 };
-+const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 };
+-const char *const fontdirpath[]  = { "", DATADIR "/" FONTDIR "/", 0 };
++const char *const fontdirpath[]  = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 };
  const char *const fontsuffixes[] = { "", ".psfu", ".psf", ".cp", ".fnt", 0 };
  /* hide partial fonts a bit - loading a single one is a bad idea */
--const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
-+const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
+-const char *const partfontdirpath[]  = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
++const char *const partfontdirpath[]  = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
  const char *const partfontsuffixes[] = { "", 0 };
  
  static inline int

From 69e24c044aba1c0a3dc4e70d0f988ec1f3e6fb73 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 30 Jul 2017 01:33:26 +0300
Subject: [PATCH 1211/3246] kbd: fix build

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

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index 31fcdae6c80..b97f48af414 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -38,8 +38,10 @@ stdenv.mkDerivation rec {
     '';
 
   postInstall = ''
-    substituteInPlace $out/bin/unicode_{start,stop} \
-      --replace /usr/bin/tty ${coreutils}/bin/tty
+    for i in $out/bin/unicode_{start,stop}; do
+      substituteInPlace "$i" \
+        --replace /usr/bin/tty ${coreutils}/bin/tty
+    done
   '';
 
 

From 6f2715e47de317aa196c81a31b3632c93cf54e8f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 30 Jul 2017 00:54:57 +0200
Subject: [PATCH 1212/3246] slop: 6.3.47 -> 6.3.48

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

diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index d2bf060edd0..570c2f260dd 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "slop-${version}";
-  version = "6.3.47";
+  version = "6.3.48";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "slop";
     rev = "v${version}";
-    sha256 = "05saxp5z2saq6b5hslxdc5kd7ln00svr5pazabcnchzydfhnkmsd";
+    sha256 = "152xnisdbwx2zh1wzspy8djm937d1cm9zvcz1x22z8ia50ajm107";
   };
 
   nativeBuildInputs = [ cmake ];

From faac018630b8d3f89c633c1235ae649498c938e8 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 21 Jul 2017 14:41:19 +0000
Subject: [PATCH 1213/3246] environment.etc: add user/group option

fixes #27546
---
 nixos/modules/config/users-groups.nix |  2 +-
 nixos/modules/system/etc/etc.nix      | 26 +++++++++++++++++++++++---
 nixos/modules/system/etc/make-etc.sh  | 10 +++++-----
 nixos/modules/system/etc/setup-etc.pl |  2 ++
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 0e7ffbd3c2e..a4715175cc9 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -527,7 +527,7 @@ in {
       input.gid = ids.gids.input;
     };
 
-    system.activationScripts.users = stringAfter [ "etc" ]
+    system.activationScripts.users = stringAfter [ "stdio" ]
       ''
         ${pkgs.perl}/bin/perl -w \
           -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \
diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index fd6e58cd5b4..7d43ba07ca5 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -20,8 +20,8 @@ let
     sources = map (x: x.source) etc';
     targets = map (x: x.target) etc';
     modes = map (x: x.mode) etc';
-    uids  = map (x: x.uid) etc';
-    gids  = map (x: x.gid) etc';
+    users  = map (x: x.user) etc';
+    groups  = map (x: x.group) etc';
   };
 
 in
@@ -108,6 +108,26 @@ in
               '';
             };
 
+            user = mkOption {
+              default = "+${toString config.uid}";
+              type = types.str;
+              description = ''
+                User name of created file.
+                Only takes affect when the file is copied (that is, the mode is not 'symlink').
+                Changing this option takes precedence over <literal>uid</literal>.
+              '';
+            };
+
+            group = mkOption {
+              default = "+${toString config.gid}";
+              type = types.str;
+              description = ''
+                Group name of created file.
+                Only takes affect when the file is copied (that is, the mode is not 'symlink').
+                Changing this option takes precedence over <literal>gid</literal>.
+              '';
+            };
+
           };
 
           config = {
@@ -130,7 +150,7 @@ in
 
     system.build.etc = etc;
 
-    system.activationScripts.etc = stringAfter [ "stdio" ]
+    system.activationScripts.etc = stringAfter [ "users" "groups" ]
       ''
         # Set up the statically computed bits of /etc.
         echo "setting up /etc..."
diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh
index 60d4ba1301a..1ca4c3046f0 100644
--- a/nixos/modules/system/etc/make-etc.sh
+++ b/nixos/modules/system/etc/make-etc.sh
@@ -6,8 +6,8 @@ set -f
 sources_=($sources)
 targets_=($targets)
 modes_=($modes)
-uids_=($uids)
-gids_=($gids)
+users_=($users)
+groups_=($groups)
 set +f
 
 for ((i = 0; i < ${#targets_[@]}; i++)); do
@@ -36,9 +36,9 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
         fi
         
         if test "${modes_[$i]}" != symlink; then
-            echo "${modes_[$i]}" > $out/etc/$target.mode
-            echo "${uids_[$i]}" > $out/etc/$target.uid
-            echo "${gids_[$i]}" > $out/etc/$target.gid
+            echo "${modes_[$i]}"  > $out/etc/$target.mode
+            echo "${users_[$i]}"  > $out/etc/$target.uid
+            echo "${groups_[$i]}" > $out/etc/$target.gid
         fi
         
     fi
diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl
index efda74161ff..eed20065087 100644
--- a/nixos/modules/system/etc/setup-etc.pl
+++ b/nixos/modules/system/etc/setup-etc.pl
@@ -108,6 +108,8 @@ sub link {
             my $uid = read_file("$_.uid"); chomp $uid;
             my $gid = read_file("$_.gid"); chomp $gid;
             copy "$static/$fn", "$target.tmp" or warn;
+            $uid = getpwnam $uid unless $uid =~ /^\+/;
+            $gid = getgrnam $gid unless $gid =~ /^\+/;
             chown int($uid), int($gid), "$target.tmp" or warn;
             chmod oct($mode), "$target.tmp" or warn;
             rename "$target.tmp", $target or warn;

From bc8b634072f77149a6441f9f448cdcecc915bb6c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 30 Jul 2017 00:56:20 +0200
Subject: [PATCH 1214/3246] maim: 5.4.64 -> 5.4.65

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

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index 39933e70e39..791f1bf09e1 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig
 , zlib, libpng, libjpeg
-, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop }:
+, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }:
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.4.64";
+  version = "5.4.65";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "16ipqs4s5hn7a7380n8w1ijj26d9n356bqwl1h8z5i1skbj4w7hj";
+    sha256 = "0jkvsqzwsb986bm424xpfj73d46afkvbimf1ipdss2vg2y77vmj3";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs =
     [ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr
-      libXcomposite slop ];
+      libXcomposite slop icu ];
 
   doCheck = false;
 

From 3b82d7db82de8c145de231faab4c953fa0eaca2e Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 15 Jul 2017 08:58:07 +0000
Subject: [PATCH 1215/3246] tinc: allow the daemon to write to files in
 /etc/tinc/${network}/hosts

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

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index be5bfaebf7d..b70e44ff542 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -131,7 +131,7 @@ in
       (flip mapAttrsToList cfg.networks (network: data:
         flip mapAttrs' data.hosts (host: text: nameValuePair
           ("tinc/${network}/hosts/${host}")
-          ({ mode = "0444"; inherit text; })
+          ({ mode = "0644"; user = "tinc.${network}"; inherit text; })
         ) // {
           "tinc/${network}/tinc.conf" = {
             mode = "0444";

From 26655f505ff7cc692321bc7d11821ec55c49da7c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 23 Jul 2017 09:22:33 +0200
Subject: [PATCH 1216/3246] programs.thefuck: support shells that don't use
 `/etc/profile`

---
 nixos/modules/programs/thefuck.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
index 433a0ca95fe..eb913477cf0 100644
--- a/nixos/modules/programs/thefuck.nix
+++ b/nixos/modules/programs/thefuck.nix
@@ -3,7 +3,12 @@
 with lib;
 
 let
-  cfg = config.programs.thefuck;
+  prg = config.programs;
+  cfg = prg.thefuck;
+
+  initScript = ''
+    eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
+  '';
 in
   {
     options = {
@@ -24,8 +29,11 @@ in
 
     config = mkIf cfg.enable {
       environment.systemPackages = with pkgs; [ thefuck ];
-      environment.shellInit = ''
-        eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
+      environment.shellInit = initScript;
+
+      programs.zsh.shellInit = mkIf prg.zsh.enable initScript;
+      programs.fish.shellInit = mkIf prg.fish.enable ''
+        ${pkgs.thefuck}/bin/thefuck --alias | source
       '';
     };
   }

From 6128dd4d5085780e5c4b5dd0d8a74085592ac434 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 30 Jul 2017 08:42:33 +0200
Subject: [PATCH 1217/3246] Python wrapper: undo change
 8d76effc178747f0c8f456fe619c1b014736a6af

because we would otherwise end up with broken wrappers because PATH and
PTYHONPATH weren't set.
---
 pkgs/development/interpreters/python/wrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh
index 4b9b2024981..1c74e612b55 100644
--- a/pkgs/development/interpreters/python/wrap.sh
+++ b/pkgs/development/interpreters/python/wrap.sh
@@ -86,7 +86,7 @@ wrapPythonProgramsIn() {
 _addToPythonPath() {
     local dir="$1"
     # Stop if we've already visited here.
-    [ -n "${pythonPathsSeen[$dir]}" ] || return 0
+    if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi
     pythonPathsSeen[$dir]=1
     # addToSearchPath is defined in stdenv/generic/setup.sh. It will have
     # the effect of calling `export program_X=$dir/...:$program_X`.

From c152e7c5d9db14495c28cfeb8073ea91880b5814 Mon Sep 17 00:00:00 2001
From: vinymeuh <vinymeuh@gmail.com>
Date: Sun, 30 Jul 2017 09:18:12 +0200
Subject: [PATCH 1218/3246] most supported on all unix, not only gnu

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

diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix
index 1c1def9b8a8..107aa094dd7 100644
--- a/pkgs/tools/misc/most/default.nix
+++ b/pkgs/tools/misc/most/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
       -e "s|/bin/cp|cp|"  \
       -e "s|/bin/rm|rm|"
   '';
-  
+
   configureFlags = "--with-slang=${slang.dev}";
 
   buildInputs = [ slang ncurses ];
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
     '';
     homepage = http://www.jedsoft.org/most/index.html;
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.gnu; # random choice
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 25c762f2bccab9d6c6d0d4cc11916f605cfeabcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Jul 2017 09:46:13 +0200
Subject: [PATCH 1219/3246] flex-2.5.35: switch source URL

---
 pkgs/development/tools/parsing/flex/2.5.35.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix
index 97ee871c87e..19bc9cf1b85 100644
--- a/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -1,10 +1,12 @@
 { stdenv, fetchurl, bison, m4 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "flex-2.5.35";
 
   src = fetchurl {
-    url = mirror://sourceforge/flex/flex-2.5.35.tar.bz2;
+    # Deleted from original SourceForge and GitHub only provides generated file.
+    # Note: binary cache still seems to serve it, too.
+    url = "http://downloads.openwrt.org/sources/${name}.tar.bz2";
     sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
   };
 

From 56fe3814905ee6b7740aeb0c8e97daa9badb8253 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 30 Jul 2017 10:18:47 +0200
Subject: [PATCH 1220/3246] gdal: enable parallel building

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

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 07f370b4210..eb8f17980c2 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -59,6 +59,8 @@ composableDerivation.composableDerivation {} (fixed: rec {
     wrapPythonPrograms
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = http://www.gdal.org/;

From 2c8960d85f6f5afc0a8204351380a495e6c1f064 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 30 Jul 2017 10:19:02 +0200
Subject: [PATCH 1221/3246] python.pkgs.numpy: enable parallel building

---
 pkgs/development/python-modules/numpy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 965dda8c43a..75b946b4051 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -21,6 +21,7 @@ buildPythonPackage rec {
 
   preConfigure = ''
     sed -i 's/-faltivec//' numpy/distutils/system_info.py
+    export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
   '';
 
   preBuild = ''
@@ -32,6 +33,8 @@ buildPythonPackage rec {
     EOF
   '';
 
+  enableParallelBuilding = true;
+
   checkPhase = ''
     runHook preCheck
     pushd dist

From 70cd310712fce9aa2322ff3ba0fe437d4890fe8a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 30 Jul 2017 10:19:15 +0200
Subject: [PATCH 1222/3246] python.pkgs.scipy: enable parallel building

---
 pkgs/development/python-modules/scipy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index ed4e205a2ae..f4e4518ef16 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -20,6 +20,7 @@ buildPythonPackage rec {
 
   preConfigure = ''
     sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
+    export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
   '';
 
   preBuild = ''
@@ -31,6 +32,8 @@ buildPythonPackage rec {
     EOF
   '';
 
+  enableParallelBuilding = true;
+
   checkPhase = ''
     runHook preCheck
     pushd dist

From e9a70ccfe996db0acfdb02da874f0583c7958df5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 30 Jul 2017 16:57:50 +0800
Subject: [PATCH 1223/3246] bundler: 1.15.1 -> 1.15.3

---
 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 53e47630fbb..8331440ab99 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.15.1";
-  sha256 = "1mq0n8g08vf2rnd7fvylx3f4sspx15abid49gycf9zzsjj7w8vps";
+  version = "1.15.3";
+  sha256 = "125amldnpzzrfw76mmr7mlx002k1k6xdyrqf5bdnzl5hajvn0s5f";
   dontPatchShebangs = true;
 
   postFixup = ''

From e79d11b623cc956053b9052ee6655d732d193567 Mon Sep 17 00:00:00 2001
From: sshisk <satoshi.shishiku@tuta.io>
Date: Sun, 30 Jul 2017 12:37:51 +0300
Subject: [PATCH 1224/3246] postfix service: fix extraMasterConf (#27755)

thanks
---
 nixos/modules/services/mail/postfix.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 845c6acc7fe..c22a552645a 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -267,7 +267,7 @@ let
       lines = [ sep (formatLine labels) (formatLine labelDefaults) sep ];
     in concatStringsSep "\n" lines;
 
-  in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n";
+  in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n" + cfg.extraMasterConf;
 
   headerCheckOptions = { ... }:
   {
@@ -839,5 +839,8 @@ in
     (mkIf (cfg.extraConfig != "") {
       warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ];
     })
+    (mkIf (cfg.extraMasterConf != "") {
+      warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ];
+    })
   ]);
 }

From b870e8485050c8458344f3e07dde573cfd559f8a Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 30 Jul 2017 12:51:57 +0300
Subject: [PATCH 1225/3246] qdirstat: init at 1.4

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

diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
new file mode 100644
index 00000000000..1923bd8d4ee
--- /dev/null
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchFromGitHub, qmake
+, coreutils, xdg_utils, bash, perl }:
+
+let
+  version = "1.4";
+in stdenv.mkDerivation {
+  name = "qdirstat-${version}";
+
+  src = fetchFromGitHub {
+    owner = "shundhammer";
+    repo = "qdirstat";
+    rev = "${version}";
+    sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh";
+  };
+
+  nativeBuildInputs = [ qmake ];
+
+  buildInputs = [ perl ];
+
+  preBuild = ''
+    substituteInPlace scripts/scripts.pro \
+      --replace /bin/true ${coreutils}/bin/true \
+      --replace /usr/bin $out/bin
+    substituteInPlace src/src.pro \
+      --replace /usr/bin $out/bin \
+      --replace /usr/share $out/share
+    for i in doc/doc.pro doc/stats/stats.pro
+    do
+      substituteInPlace $i \
+        --replace /usr/share $out/share
+    done
+
+    for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp                          
+    do                                    
+      substituteInPlace $i \
+        --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open                        
+    done
+    for i in src/Cleanup.cpp src/cleanup-config-page.ui
+    do
+      substituteInPlace $i \
+        --replace /bin/bash ${bash}/bin/bash \
+        --replace /bin/sh ${bash}/bin/sh
+    done
+    substituteInPlace src/StdCleanup.cpp \
+      --replace /bin/bash ${bash}/bin/bash
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Graphical disk usage analyzer";
+    homepage = src.meta.homepage;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a8a3c2c7cc..3ee483c19bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15740,6 +15740,8 @@ with pkgs;
     miniupnpc = miniupnpc_1;
   };
 
+  qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {};
+
   qemu = callPackage ../applications/virtualization/qemu {
     inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa;
     inherit (darwin.stubs) rez setfile;

From 9ac118a8a4a9636e006823107f982b954768732d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 30 Jul 2017 11:20:35 +0100
Subject: [PATCH 1226/3246] powerline-fonts: 2015-12-11 -> 2017-05-25

---
 pkgs/data/fonts/powerline-fonts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index dbfb49f1bed..3140be6d035 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "powerline-fonts-2015-12-11";
+  name = "powerline-fonts-2017-05-25";
 
   src = fetchFromGitHub {
     owner = "powerline";
     repo = "fonts";
-    rev = "a44abd0e742ad6e7fd8d8bc4c3cad5155c9f3a92";
-    sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn";
+    rev = "fe396ef6f6b9b315f30af7d7229ff21f67a66e12";
+    sha256 = "1l72kf0zqdp52hbnphky5cl0a1p9fghldvq7ppbnnrhmcwvavprs";
   };
 
   dontBuild = true;

From f8e5fd676984dd9670d8dae391c2bd8afad12652 Mon Sep 17 00:00:00 2001
From: vinymeuh <vinymeuh@gmail.com>
Date: Sat, 29 Jul 2017 19:33:36 +0200
Subject: [PATCH 1227/3246] libsass: 3.3.2 -> 3.4.5

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

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 9efe07c6567..75bc9668fca 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
-  version = "3.3.2";
+  version = "3.4.5";
 
   src = fetchurl {
     url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
-    sha256 = "affb7efaa7e152e576cc1d510c662ebe067b0b9e9228ad2937dcafdd4431b573";
+    sha256 = "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x";
   };
 
   patchPhase = ''

From 8ba4562324d362592b436d9450a9ef020be44b1d Mon Sep 17 00:00:00 2001
From: vinymeuh <vinymeuh@gmail.com>
Date: Sat, 29 Jul 2017 19:34:11 +0200
Subject: [PATCH 1228/3246] sassc: 3.3.2 -> 3.4.5

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

diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix
index 1e990b0e2e9..eb82cf84966 100644
--- a/pkgs/development/tools/sassc/default.nix
+++ b/pkgs/development/tools/sassc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sassc-${version}";
-  version = "3.3.2";
+  version = "3.4.5";
 
   src = fetchurl {
     url = "https://github.com/sass/sassc/archive/${version}.tar.gz";
-    sha256 = "15a2b2698639dfdc7bd6a5ba7a9ecdaf8ebb9f15503fb04dea1be3133308e41d";
+    sha256 = "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9";
   };
 
   patchPhase = ''

From 5dc5dfdefb9719b8567c13de691cf2ccdbde95a3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 17 Apr 2017 17:41:42 +0800
Subject: [PATCH 1229/3246] uchiwa: 0.22.1 -> 0.25.3-1

---
 .../monitoring/uchiwa/bower-packages.nix      | 26 ++++++-----
 pkgs/servers/monitoring/uchiwa/bower.json     |  6 ---
 pkgs/servers/monitoring/uchiwa/src.nix        |  4 +-
 pkgs/servers/monitoring/uchiwa/update.sh      | 45 ++++++++++++-------
 4 files changed, 44 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/uchiwa/bower.json

diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index 80e73d63235..8a4e0e571b1 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,23 +1,25 @@
 # Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "uchiwa-web" "0.22.1" "0.22.1" "09rhssb5bpwdahdl2fxkjmax8cqg2m51bbf0m3lhkcrcjfc2w8kj")
-  (fetchbower "angular" "1.4.14" "~1.4" "1j5d80bxqh9lgcbmd661bsk8xrhnf43ym77jsk9n845gqr02bdkl")
+  (fetchbower "uchiwa-web" "0.25.3" "0.25.3" "065qyrm1vyi8fp5d5b0b8q5nk8gwh0kcrckl2q1d30c6zlqshg0v")
+  (fetchbower "angular" "1.6.5" "~1.6.3" "0iy7crwr2akh6pmfslbnsrw8m91rffqjibjmzza78xmpk1f4hs73")
   (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7")
-  (fetchbower "angular-cookies" "1.4.14" "~1.4" "10z9azpd228jwdn8p767a93xhb5nrypwa0j6491kbcvm2q1k0g6a")
-  (fetchbower "angular-gravatar" "0.3.2" "~0.3.1" "17d2sc828dsnlkjc4b9irandpimqwan8hlvk9wlmlv8yiyi685p6")
-  (fetchbower "angular-mass-autocomplete-uchiwa" "0.4.1" "0.4.1" "1h2ypg35f6nd6gy6yznpiadql13lk1gyccq6qd4mvksbyb5va6l5")
-  (fetchbower "angular-moment" "0.9.2" "~0.9.0" "143vivplxqd03vg23ynad2yrlgn6dmad7avjmzh0ina2qx7zslgf")
-  (fetchbower "angular-resource" "1.4.14" "~1.4" "1ll2qd0kn39fl5aa49894n1bfcl8dgrfk0w154rkhg7k732q18bk")
-  (fetchbower "angular-route" "1.4.14" "~1.4" "0wfdgvvldgzf7c4lba3x8mw38l9zwkm0i9fg8ad7pvjkqz133sqs")
-  (fetchbower "angular-sanitize" "1.4.14" "~1.4" "072b8dcxjp4cjvcjqxsd0bxa8xd2nqvjb1v878qgfkhf0wz44x32")
+  (fetchbower "angular-cookies" "1.6.5" "~1.6.3" "135yipc576gl9svsk30q62mbf70yp9hy0mbsmvx4jrl9kais495p")
+  (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "19q40hsjhwz8y3phmyrrg27f20qpaknvw44cfx4gliin2zqwwsfk")
+  (fetchbower "angular-moment" "1.0.1" "~1.0.1" "1ydnilyf6nysxxjir51lhn92k7mjqii5277xxdqnpcvc376la244")
+  (fetchbower "angular-resource" "1.6.5" "~1.6.3" "02jiqnkn14kn69ybb74ajhaxxwh71fh5b1g67fajhirkiimpnmxy")
+  (fetchbower "angular-route" "1.6.5" "~1.6.3" "1n1q9a9khvqjas0jb277pzk44zjziblrflvh6w0s6im3ljcb6a7g")
+  (fetchbower "angular-sanitize" "1.6.5" "~1.6.3" "0jj56xwrlyslr3pi94xnbz7xy5g7pwg47p2pnbwhr1a1piwfzh87")
   (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1")
+  (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1rr7xf3a2l15g2nmd9svq8ijy1v0igc5jdpwp21kna1kzc65jg3m")
   (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z")
   (fetchbower "bootstrap" "3.1.1" "3.1.1" "036xbjpv4621p5r2l9vfm9zys6h1mhkvb0zhvk3irrmkzsl77hwh")
   (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "0rfmja15p8kxz6i3liwyqrmbm82azq61d3882w2vmp08vvv2c371")
   (fetchbower "fontawesome" "4.4.0" "~4.4.0" "1mbs0vhixvg11vj3n0l3jn3pb6s839rcs416zq2wzfqkbvsc3sf5")
   (fetchbower "highlightjs" "9.1.0" "~9.1.0" "1gz4q922sylbbqw1sawmjjq8nw0mk90wq0qq95ap0f31px7bfm3f")
-  (fetchbower "moment" "2.8.4" "~2.8.3" "1h30g5an2m9dja09m1s93hsfb25pzl0iah8mmab7nispl3mb585z")
-  (fetchbower "ua-parser-js" "0.7.12" "~0.7.12" "1hrhi7cdf5zd86jz7ipbb23qvkfplghfa92wa3aysca1rpg5zgpd")
-  (fetchbower "jquery" "3.1.1" ">= 1.9.0" "0rkp1hakimnjh3rvlzi30w7qx9x1j0gzjpaajgljn79kd082sgpd")
+  (fetchbower "moment" "2.16.0" "~2.16.0" "0g6zd465rnm3dhsank1iq9b5s4clc58lh3wrpg5sf8dd5zjlr2k2")
+  (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0lw31180v0yjlcah17kpgklcllz78bnrdiyvwhw14151xcyds4jm")
+  (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0z27b811xj09fh0gm72ah8425609gbj87jda3xap5l91alrwixz1")
+  (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "05rcd98z6wc2x5kiaq9dfbvynbkwbrbrcgivcs8bv66d1k747ph8")
+  (fetchbower "jquery" "3.2.1" ">= 1.9.0" "1h14hjhi3ydnl66wmr8w72syyfcvbz47g7bprz7cqw5qxf2n7sah")
 ]; }
diff --git a/pkgs/servers/monitoring/uchiwa/bower.json b/pkgs/servers/monitoring/uchiwa/bower.json
deleted file mode 100644
index 1eb94f73e6b..00000000000
--- a/pkgs/servers/monitoring/uchiwa/bower.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "uchiwa",
-  "dependencies": {
-    "uchiwa-web": "0.21.0"
-  }
-}
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index 68aaa4a5249..c0ddf9cb7a4 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-  version = "0.22.1";
-  sha256  = "15wa7zhchis2rh6jcqkindlidmbf3mryr3apnqnr27ydi2vlqn3g";
+  version = "0.25.3-1";
+  sha256  = "1sgr9fpjfx7qn7dbiaxhsw7iagcrqi39bjc0ba1lh1db5jh7ymks";
 }
diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh
index 2802037a4f5..33e3dacdda5 100755
--- a/pkgs/servers/monitoring/uchiwa/update.sh
+++ b/pkgs/servers/monitoring/uchiwa/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p nodePackages.bower2nix curl.bin git.out jq.out
+#!nix-shell -i bash -p curl.bin git.out jq.out nodePackages.bower2nix
 
 set -euo pipefail
 IFS=$'\n\t'
@@ -7,25 +7,36 @@ IFS=$'\n\t'
 # set -x
 
 REPO=sensu/uchiwa
+SHA="1111111111111111111111111111111111111111111111111111"
 
-VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
-
-t=$(mktemp)
-
-echo "Updating to: ${VERSION}"
-
-curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t
-bower2nix $t bower-packages.nix
-
-pushd $(git rev-parse --show-toplevel)
-sha=$(nix-prefetch-url -A uchiwa.src)
-popd
-
-cat <<_EOF > src.nix
+write_src() {
+  cat <<_EOF > src.nix
 {
   version = "${VERSION}";
-  sha256  = "${sha}";
+  sha256  = "${SHA}";
 }
 _EOF
+}
 
-rm $t
+t=$(mktemp -d)
+
+LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
+echo "Latest version: ${LATEST_VERSION}"
+
+VERSION=${1:-${LATEST_VERSION}}
+echo "Updating to: ${VERSION}"
+
+write_src
+
+curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t/bower.json
+bower2nix $t/bower.json $t/bower-packages.nix
+mv $t/bower-packages.nix .
+# sed -i 's@/@-@g' bower-packages.nix
+
+pushd $(git rev-parse --show-toplevel)
+SHA=$(nix-prefetch-url -A uchiwa.src)
+popd
+
+write_src
+
+rm -r $t

From f36323c81f1a9f599983da79aec020a21421bfe9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 30 Jul 2017 12:52:03 +0200
Subject: [PATCH 1230/3246] ffmpeg-full: fix path to frei0r filters

Fixes #27555.
---
 pkgs/development/libraries/ffmpeg-full/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 6246026e9ea..4a02c034cf3 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -241,6 +241,11 @@ stdenv.mkDerivation rec {
   patchPhase = ''patchShebangs .
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c
+  '' + stdenv.lib.optionalString (frei0r != null) ''
+    substituteInPlace libavfilter/vf_frei0r.c \
+      --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
+    substituteInPlace doc/filters.texi \
+      --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
   '';
 
   configureFlags = [

From bac6f599771de146a7473cd08a64eece888d9200 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 30 Jul 2017 12:58:00 +0200
Subject: [PATCH 1231/3246] python.pkgs.dosage: 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 588f9651b07..1333c071b3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1926,6 +1926,7 @@ in {
     meta = {
       description = "A comic strip downloader and archiver";
       homepage = http://dosage.rocks/;
+      broken = true; # ctypes error
     };
   };
 

From 88ca4724b2f94d2a4e2c9adcf7d247882e6233d6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 30 Jul 2017 13:29:57 +0200
Subject: [PATCH 1232/3246] virtualboxGuestAdditions: fix hash

---
 .../virtualization/virtualbox/guest-additions/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index e19cb748607..eb2e1ebf4a7 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "0hxxv2707fb6x34m5cmjhj73sxwgmy2dgir7mbbdh9wivw07b9q1";
+    sha256 = "0vxhavlh55fdlm4zhvi21fyxzdydbn56y499bq5aghvsdsmwiy3d";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

From a974ee0188a923d3c238a3a58777ef0867111244 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 30 Jul 2017 14:03:31 +0200
Subject: [PATCH 1233/3246] tcp_wrappers: fix weird use of STRINGS in the
 Makefile

---
 pkgs/os-specific/linux/tcp-wrappers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 526b1a86db1..6a400f1de22 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
     patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches"
   '';
 
-  makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
+  makeFlags = [ "STRINGS=" "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
 
   installPhase = ''
     mkdir -p "$out/bin"

From f0f55ac6cdad02d4d2682148994ef9456458bba4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 30 Jul 2017 14:06:39 +0200
Subject: [PATCH 1234/3246] Revert "uchiwa: 0.22.1 -> 0.25.3-1"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5dc5dfdefb9719b8567c13de691cf2ccdbde95a3.

This breaks evaluation:
error: invalid character ‘/’ in name ‘angular-tools/ng-jsoneditor-ea138469f157d8f2b54ec5b8dcf4b08a55b61459’

cc @peterhoeg
---
 .../monitoring/uchiwa/bower-packages.nix      | 26 ++++++-------
 pkgs/servers/monitoring/uchiwa/bower.json     |  6 +++
 pkgs/servers/monitoring/uchiwa/src.nix        |  4 +-
 pkgs/servers/monitoring/uchiwa/update.sh      | 37 +++++++------------
 4 files changed, 33 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/servers/monitoring/uchiwa/bower.json

diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index 8a4e0e571b1..80e73d63235 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,25 +1,23 @@
 # Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "uchiwa-web" "0.25.3" "0.25.3" "065qyrm1vyi8fp5d5b0b8q5nk8gwh0kcrckl2q1d30c6zlqshg0v")
-  (fetchbower "angular" "1.6.5" "~1.6.3" "0iy7crwr2akh6pmfslbnsrw8m91rffqjibjmzza78xmpk1f4hs73")
+  (fetchbower "uchiwa-web" "0.22.1" "0.22.1" "09rhssb5bpwdahdl2fxkjmax8cqg2m51bbf0m3lhkcrcjfc2w8kj")
+  (fetchbower "angular" "1.4.14" "~1.4" "1j5d80bxqh9lgcbmd661bsk8xrhnf43ym77jsk9n845gqr02bdkl")
   (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7")
-  (fetchbower "angular-cookies" "1.6.5" "~1.6.3" "135yipc576gl9svsk30q62mbf70yp9hy0mbsmvx4jrl9kais495p")
-  (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "19q40hsjhwz8y3phmyrrg27f20qpaknvw44cfx4gliin2zqwwsfk")
-  (fetchbower "angular-moment" "1.0.1" "~1.0.1" "1ydnilyf6nysxxjir51lhn92k7mjqii5277xxdqnpcvc376la244")
-  (fetchbower "angular-resource" "1.6.5" "~1.6.3" "02jiqnkn14kn69ybb74ajhaxxwh71fh5b1g67fajhirkiimpnmxy")
-  (fetchbower "angular-route" "1.6.5" "~1.6.3" "1n1q9a9khvqjas0jb277pzk44zjziblrflvh6w0s6im3ljcb6a7g")
-  (fetchbower "angular-sanitize" "1.6.5" "~1.6.3" "0jj56xwrlyslr3pi94xnbz7xy5g7pwg47p2pnbwhr1a1piwfzh87")
+  (fetchbower "angular-cookies" "1.4.14" "~1.4" "10z9azpd228jwdn8p767a93xhb5nrypwa0j6491kbcvm2q1k0g6a")
+  (fetchbower "angular-gravatar" "0.3.2" "~0.3.1" "17d2sc828dsnlkjc4b9irandpimqwan8hlvk9wlmlv8yiyi685p6")
+  (fetchbower "angular-mass-autocomplete-uchiwa" "0.4.1" "0.4.1" "1h2ypg35f6nd6gy6yznpiadql13lk1gyccq6qd4mvksbyb5va6l5")
+  (fetchbower "angular-moment" "0.9.2" "~0.9.0" "143vivplxqd03vg23ynad2yrlgn6dmad7avjmzh0ina2qx7zslgf")
+  (fetchbower "angular-resource" "1.4.14" "~1.4" "1ll2qd0kn39fl5aa49894n1bfcl8dgrfk0w154rkhg7k732q18bk")
+  (fetchbower "angular-route" "1.4.14" "~1.4" "0wfdgvvldgzf7c4lba3x8mw38l9zwkm0i9fg8ad7pvjkqz133sqs")
+  (fetchbower "angular-sanitize" "1.4.14" "~1.4" "072b8dcxjp4cjvcjqxsd0bxa8xd2nqvjb1v878qgfkhf0wz44x32")
   (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1")
-  (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1rr7xf3a2l15g2nmd9svq8ijy1v0igc5jdpwp21kna1kzc65jg3m")
   (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z")
   (fetchbower "bootstrap" "3.1.1" "3.1.1" "036xbjpv4621p5r2l9vfm9zys6h1mhkvb0zhvk3irrmkzsl77hwh")
   (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "0rfmja15p8kxz6i3liwyqrmbm82azq61d3882w2vmp08vvv2c371")
   (fetchbower "fontawesome" "4.4.0" "~4.4.0" "1mbs0vhixvg11vj3n0l3jn3pb6s839rcs416zq2wzfqkbvsc3sf5")
   (fetchbower "highlightjs" "9.1.0" "~9.1.0" "1gz4q922sylbbqw1sawmjjq8nw0mk90wq0qq95ap0f31px7bfm3f")
-  (fetchbower "moment" "2.16.0" "~2.16.0" "0g6zd465rnm3dhsank1iq9b5s4clc58lh3wrpg5sf8dd5zjlr2k2")
-  (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0lw31180v0yjlcah17kpgklcllz78bnrdiyvwhw14151xcyds4jm")
-  (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0z27b811xj09fh0gm72ah8425609gbj87jda3xap5l91alrwixz1")
-  (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "05rcd98z6wc2x5kiaq9dfbvynbkwbrbrcgivcs8bv66d1k747ph8")
-  (fetchbower "jquery" "3.2.1" ">= 1.9.0" "1h14hjhi3ydnl66wmr8w72syyfcvbz47g7bprz7cqw5qxf2n7sah")
+  (fetchbower "moment" "2.8.4" "~2.8.3" "1h30g5an2m9dja09m1s93hsfb25pzl0iah8mmab7nispl3mb585z")
+  (fetchbower "ua-parser-js" "0.7.12" "~0.7.12" "1hrhi7cdf5zd86jz7ipbb23qvkfplghfa92wa3aysca1rpg5zgpd")
+  (fetchbower "jquery" "3.1.1" ">= 1.9.0" "0rkp1hakimnjh3rvlzi30w7qx9x1j0gzjpaajgljn79kd082sgpd")
 ]; }
diff --git a/pkgs/servers/monitoring/uchiwa/bower.json b/pkgs/servers/monitoring/uchiwa/bower.json
new file mode 100644
index 00000000000..1eb94f73e6b
--- /dev/null
+++ b/pkgs/servers/monitoring/uchiwa/bower.json
@@ -0,0 +1,6 @@
+{
+  "name": "uchiwa",
+  "dependencies": {
+    "uchiwa-web": "0.21.0"
+  }
+}
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index c0ddf9cb7a4..68aaa4a5249 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-  version = "0.25.3-1";
-  sha256  = "1sgr9fpjfx7qn7dbiaxhsw7iagcrqi39bjc0ba1lh1db5jh7ymks";
+  version = "0.22.1";
+  sha256  = "15wa7zhchis2rh6jcqkindlidmbf3mryr3apnqnr27ydi2vlqn3g";
 }
diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh
index 33e3dacdda5..2802037a4f5 100755
--- a/pkgs/servers/monitoring/uchiwa/update.sh
+++ b/pkgs/servers/monitoring/uchiwa/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl.bin git.out jq.out nodePackages.bower2nix
+#!nix-shell -i bash -p nodePackages.bower2nix curl.bin git.out jq.out
 
 set -euo pipefail
 IFS=$'\n\t'
@@ -7,36 +7,25 @@ IFS=$'\n\t'
 # set -x
 
 REPO=sensu/uchiwa
-SHA="1111111111111111111111111111111111111111111111111111"
 
-write_src() {
-  cat <<_EOF > src.nix
-{
-  version = "${VERSION}";
-  sha256  = "${SHA}";
-}
-_EOF
-}
+VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
 
-t=$(mktemp -d)
+t=$(mktemp)
 
-LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
-echo "Latest version: ${LATEST_VERSION}"
-
-VERSION=${1:-${LATEST_VERSION}}
 echo "Updating to: ${VERSION}"
 
-write_src
-
-curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t/bower.json
-bower2nix $t/bower.json $t/bower-packages.nix
-mv $t/bower-packages.nix .
-# sed -i 's@/@-@g' bower-packages.nix
+curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t
+bower2nix $t bower-packages.nix
 
 pushd $(git rev-parse --show-toplevel)
-SHA=$(nix-prefetch-url -A uchiwa.src)
+sha=$(nix-prefetch-url -A uchiwa.src)
 popd
 
-write_src
+cat <<_EOF > src.nix
+{
+  version = "${VERSION}";
+  sha256  = "${sha}";
+}
+_EOF
 
-rm -r $t
+rm $t

From d298873d5387fd99a6349c13b1b8e989edbd97f9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 30 Jul 2017 14:16:02 +0200
Subject: [PATCH 1235/3246] qdirstat: fix evaluation

cc @Mic92 @gnidorah
---
 pkgs/applications/misc/qdirstat/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index 1923bd8d4ee..be252ed81ef 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -3,7 +3,7 @@
 
 let
   version = "1.4";
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "qdirstat-${version}";
 
   src = fetchFromGitHub {
@@ -30,10 +30,10 @@ in stdenv.mkDerivation {
         --replace /usr/share $out/share
     done
 
-    for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp                          
-    do                                    
+    for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp
+    do
       substituteInPlace $i \
-        --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open                        
+        --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open
     done
     for i in src/Cleanup.cpp src/cleanup-config-page.ui
     do

From ba68231273bea4cba01413fd2a0e56d68db9234c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Jul 2017 14:42:30 +0200
Subject: [PATCH 1236/3246] libpng: 1.6.30 -> 1.6.31

1.6.30 won't build for ARM.  Hydra has almost no binaries for current
staging, so let's update for all platforms
---
 pkgs/development/libraries/libpng/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 0ae40a76386..94a9aa37ad9 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -5,13 +5,12 @@
 assert zlib != null;
 
 let
-  version = "1.6.30";
-  patchVersion = "1.6.30";
-  # patchVersion = version;
-  sha256 = "0rin6la7q03vb7wsafhlvzqri1v9ky30g4ljsfcwa37pzwpk6z16";
+  version = "1.6.31";
+  patchVersion = "1.6.31";
+  sha256 = "0hcbxv9qf4f9q7brrk0ndag526glr8lii43grssv45j9w0nn0ai3";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
-    sha256 = "06nrcp2n77f563hch8g9gv62jg894mvya6zizj5fsmbqzaqmjqqs";
+    sha256 = "0f10ih658j514vpvsli0pk378vcmjn78g52cssyg92r4k1r19rla";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 

From e95352cfdd76f5236b037bd1d46875e0375913cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 30 Jul 2017 14:26:58 +0100
Subject: [PATCH 1237/3246] node-packages: update packaging guideline

---
 pkgs/development/node-packages/README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
index c1ed650f232..da822f9d468 100644
--- a/pkgs/development/node-packages/README.md
+++ b/pkgs/development/node-packages/README.md
@@ -2,12 +2,12 @@ Node.js packages
 ===============
 To add a package from [NPM](https://www.npmjs.com/) to nixpkgs:
 
- 1. Install node2nix: `nix-env -f '<nixpkgs>' -iA nodePackages.node2nix`.
- 2. Modify `pkgs/development/node-packages/node-packages.json`, to add, update,
-    or remove package entries.
- 3. Run the script: `cd pkgs/development/node-packages && sh generate.sh`.
- 4. Build your new package to test your changes: `cd /path/to/nixpkgs &&
-   nix-build -A nodePackages.<new-or-updated-package>`. To build against a
-   specific node.js version (e.g. 5.x): `nix-build -A
-   nodePackages_5_x.<new-or-updated-package>`
- 5. Add, commit, and share your changes!
+ 1. Modify `pkgs/development/node-packages/node-packages.json`, to add, update,
+    or remove package entries. (or `pkgs/development/node-packages/node-packages-v4.json`
+    for packagages depending on node.js 4.x)
+ 2. Run the script: `cd pkgs/development/node-packages && sh generate.sh`.
+ 3. Build your new package to test your changes:
+    `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
+    To build against a specific node.js version (e.g. 5.x):
+    `nix-build -A nodePackages_4_x.<new-or-updated-package>`
+ 4. Add and commit all modified and generated files.

From d3c0ade39a7ae2abf90ec4f2b19de01a75b151d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 30 Jul 2017 14:34:07 +0100
Subject: [PATCH 1238/3246] node-packages: wrong version number in packaging
 guideline

---
 pkgs/development/node-packages/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
index da822f9d468..8f14aadec14 100644
--- a/pkgs/development/node-packages/README.md
+++ b/pkgs/development/node-packages/README.md
@@ -8,6 +8,6 @@ To add a package from [NPM](https://www.npmjs.com/) to nixpkgs:
  2. Run the script: `cd pkgs/development/node-packages && sh generate.sh`.
  3. Build your new package to test your changes:
     `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
-    To build against a specific node.js version (e.g. 5.x):
+    To build against a specific node.js version (e.g. 4.x):
     `nix-build -A nodePackages_4_x.<new-or-updated-package>`
  4. Add and commit all modified and generated files.

From dd25d1a0a19235cbda77b6e21be46bb6a8f87925 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 30 Jul 2017 18:10:18 +0200
Subject: [PATCH 1239/3246] node-packages: Update the README

---
 pkgs/development/node-packages/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
index 8f14aadec14..b44394c696b 100644
--- a/pkgs/development/node-packages/README.md
+++ b/pkgs/development/node-packages/README.md
@@ -1,13 +1,13 @@
 Node.js packages
-===============
+================
 To add a package from [NPM](https://www.npmjs.com/) to nixpkgs:
 
- 1. Modify `pkgs/development/node-packages/node-packages.json`, to add, update,
-    or remove package entries. (or `pkgs/development/node-packages/node-packages-v4.json`
-    for packagages depending on node.js 4.x)
- 2. Run the script: `cd pkgs/development/node-packages && sh generate.sh`.
+ 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
+    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
+    for packagages depending on Node.js 4.x)
+ 2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`.
  3. Build your new package to test your changes:
     `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
-    To build against a specific node.js version (e.g. 4.x):
+    To build against a specific Node.js version (e.g. 4.x):
     `nix-build -A nodePackages_4_x.<new-or-updated-package>`
  4. Add and commit all modified and generated files.

From a2b2c1e4bdd9695b32b081b60e9630f10f44069c Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 30 Jul 2017 20:22:17 +0200
Subject: [PATCH 1240/3246] weechat: fix build (hack?)

---
 pkgs/applications/networking/irc/weechat/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 94ffda9fede..e1a9640bc23 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" ]; # "doc" was here but was not produced
 
   enableParallelBuilding = true;
   cmakeFlags = with stdenv.lib; [

From ace11d11b24dd64ef629da54f7ba76a5067745cb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 30 Jul 2017 20:32:04 +0200
Subject: [PATCH 1241/3246] android-studio: Fix the meta attributes

---
 .../editors/android-studio/common.nix         | 21 ++++++++++---------
 .../editors/android-studio/packages.nix       |  9 ++++++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index e74d04218f4..bd8e25fa41c 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -34,7 +34,7 @@
 
 let
   androidStudio = stdenv.mkDerivation {
-    inherit src meta;
+    inherit src;
     name = "${pname}";
     buildInputs = [
       makeWrapper
@@ -103,12 +103,13 @@ let
     name = "${pname}-fhs-env";
   };
 
-in writeTextFile {
-  name = "${pname}-${version}";
-  destination = "/bin/${pname}";
-  executable = true;
-  text = ''
-    #!${bash}/bin/bash
-    ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh
-  '';
-}
+in
+  writeTextFile {
+    name = "${pname}-${version}";
+    destination = "/bin/${pname}";
+    executable = true;
+    text = ''
+      #!${bash}/bin/bash
+      ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh
+    '';
+  } // { inherit meta; }
diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 1dab1d47206..da3e8b8b944 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -13,7 +13,11 @@ in rec {
     };
 
     meta = with stdenv.lib; {
-      description = "The Official IDE for Android";
+      description = "The Official IDE for Android (stable version)";
+      longDescription = ''
+        Android Studio is the official IDE for Android app development, based on
+        IntelliJ IDEA.
+      '';
       homepage = https://developer.android.com/studio/index.html;
       license = licenses.asl20;
       platforms = [ "x86_64-linux" ];
@@ -36,8 +40,9 @@ in rec {
     };
 
     meta = stable.meta // {
+      description = "The Official IDE for Android (preview version)";
       homepage = https://developer.android.com/studio/preview/index.html;
-      maintainers = with stdenv.lib.maintainers; [ tomsmeets ];
+      maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
     };
   } {
     fontsConf = makeFontsConf {

From f0ff1224f746c4f342331bac574cfd5e75aee5c4 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 30 Jul 2017 11:12:28 -0400
Subject: [PATCH 1242/3246] tarsnap: 1.0.38 -> 1.0.39

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

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 9fca48bde1b..3767a377cfc 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -8,11 +8,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "tarsnap-${version}";
-  version = "1.0.38";
+  version = "1.0.39";
 
   src = fetchurl {
     url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
-    sha256 = "0nyd722i7q8h81h5mvwxai0f3jmwd93r3ahjkmr12k55p8c0rvkn";
+    sha256 = "10i0whbmb345l2ggnf4vs66qjcyf6hmlr8f4nqqcfq0h5a5j24sn";
   };
 
   preConfigure = ''

From 0f14dcc1899bd2e536a3f3a665e05a73cecd7bb5 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 30 Jul 2017 17:30:03 +0200
Subject: [PATCH 1243/3246] mosh: 1.3.0 -> 1.3.2

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

diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index 5f3975a1df8..1f465bc4f8a 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -2,11 +2,11 @@
 , makeWrapper, perl, openssl, autoreconfHook, openssh }:
 
 stdenv.mkDerivation rec {
-  name = "mosh-1.3.0";
+  name = "mosh-1.3.2";
 
   src = fetchurl {
     url = "https://mosh.org/${name}.tar.gz";
-    sha256 = "0xikz40q873g9ihvz3x6bwkcb9hb8kcnp5wpcmb72pg5c7s143ij";
+    sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s";
   };
 
   buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];

From 3e6e05bf9869b8707eae03cfae9d693f71526194 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 30 Jul 2017 16:35:53 +0200
Subject: [PATCH 1244/3246] mawk: 1.3.4-20141206 -> 1.3.4-20161120

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

diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix
index 6698334791c..8840130dde5 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/pkgs/tools/text/mawk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mawk-1.3.4-20141206";
+  name = "mawk-1.3.4-20161120";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/mawk/${name}.tgz";
-    sha256 = "1j49ffl8gpfaq99hkylf3fjiygq74w1kpfp8f52xbpx57vn9587g";
+    sha256 = "07hc33g2ip7463dravsiz0zwfc8vy4y4jxqvp7rz3hb896xw27in";
   };
 
   meta = with stdenv.lib; {

From 70ee91508c0a63eb293efe7bd56dc71274e55d9f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 30 Jul 2017 17:14:46 +0200
Subject: [PATCH 1245/3246] shairport-sync: 2.3.6.5 -> 3.0.2

---
 pkgs/servers/shairport-sync/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 2ee5683a2ca..79f2012c7a9 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -2,23 +2,23 @@
 , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
 
 stdenv.mkDerivation rec {
-  version = "2.3.6.5";
+  version = "3.0.2";
   name = "shairport-sync-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1337y62pnch27s2gr47miip3na1am24xprlc5a27lbr764nr85s3";
+    sha256 = "1lpfl591lhk66a5jfp86j669iswjzj503x02hg9h3211vxv3h9pa";
     rev = version;
     repo = "shairport-sync";
     owner = "mikebrady";
   };
 
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
   buildInputs = [
-    autoreconfHook
     openssl
     avahi
     alsaLib
     libdaemon
-    pkgconfig
     popt
     libconfig
     libpulseaudio
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     description = "Airtunes server and emulator with multi-room capabilities";
     license = licenses.mit;
+    maintainers =  with maintainers; [ lnl7 ];
     platforms = platforms.unix;
   };
 }

From ab27dcab2cb4def6ee05a25e40eaec6153768b6b Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 30 Jul 2017 20:33:32 +0200
Subject: [PATCH 1246/3246] faac: 1.28 -> 1.29.3

---
 pkgs/development/libraries/faac/default.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index abbe07224b5..55433786002 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -8,27 +8,13 @@ assert mp4v2Support -> (mp4v2 != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "faac-${version}";
-  version = "1.28";
+  version = "1.29.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/faac/${name}.tar.gz";
-    sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565";
+    sha256 = "0gssrz2vq52mj8x2hvdqc9bwkp64s4f4g7yj7ac6dwxs8dw8kwnf";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "faac-mp4v2-1.9.patch";
-      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-1.9.patch?h=packages/faac";
-      sha256 = "1pja822zw9q3cg8bjkw5z0bpxsk4q92qix26zpiqbvi7vg314hyc";
-    })
-    (fetchpatch {
-      name = "faac-mp4v2-2.0.0.patch";
-      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-2.0.0.patch?h=packages/faac";
-      sha256 = "07kmkrl0600rs01xqpkkw9n8p1215n485xqf8hwimp60dw3vc0wn";
-      addPrefixes = true;
-    })
-  ];
-
   configureFlags = [ ]
     ++ optional mp4v2Support "--with-external-mp4v2"
     ++ optional drmSupport "--enable-drm";

From c9db19c6baa8b2348b2f358735f6f0114de5cb2d Mon Sep 17 00:00:00 2001
From: GRBurst <GRBurst@users.noreply.github.com>
Date: Sun, 30 Jul 2017 21:20:11 +0200
Subject: [PATCH 1247/3246] jbidwatcher: 2.5.2 -> 2.5.6

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

diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index d26ad94648a..a1b16e2a4d1 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jbidwatcher";
-  version = "2.5.2";
+  version = "2.5.6";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar";
-    sha256 = "07w75ryn8inm5i1829gabr8lifbycz40ynzsyaw22yzqk5if1n9l";
+    sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr";
   };
 
   buildInputs = [ java ];

From 1e049308c01f902f757d29b446026c1ff0f7cb5e Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 30 Jul 2017 17:43:55 +0200
Subject: [PATCH 1248/3246] parallel: 20170522 -> 20170722

---
 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 07326e7a8ed..648d09b4265 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-20170522";
+  name = "parallel-20170722";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1k5wlcc0dr2fxna0vi48s0l6pvbyl4pbclbih4103f1155im23ca";
+    sha256 = "117g50bx1kcbrqix0f1539z5rzhvgsni2wddjv939wcxkrdb1idx";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];

From 549d5f57df278af284f561bd71ab2617332bb4a5 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 30 Jul 2017 21:52:01 +0200
Subject: [PATCH 1249/3246] ponyc: 0.15.0 -> 0.16.1

pony-stable: unstable-2017-04-20 -> unstable-2017-07-26

https://github.com/ponylang/ponyc/issues/2101
---
 pkgs/development/compilers/ponyc/default.nix     | 4 ++--
 pkgs/development/compilers/ponyc/pony-stable.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 6e393426b7a..c3d9d988207 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.15.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "02hmn066jswaij2ib0faabm2i9cqz562z6s0vakgwnxyrk4qayif";
+    sha256 = "175yivc5vjwfdcqcpkdqmdfy72pn4k62n4j3qagfbwya7frq2car";
   };
 
   buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index c91d9d603d5..46d91fc36e0 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchFromGitHub, ponyc }:
 
 stdenv.mkDerivation {
-  name = "pony-stable-unstable-2017-04-20";
+  name = "pony-stable-unstable-2017-07-26";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "pony-stable";
-    rev = "b2ea566b02ec40480f888652b04eaa5f191a241e";
-    sha256 = "1bixkxccsrnyip3yp42r14rbhk832pvzwbkh6ash4ip2isxa6b19";
+    rev = "4016f9253a4e3114ee69100d3d02154ffd3fd7e4";
+    sha256 = "0xz5syjn2f8k31vny49k3jm8zisa15ly4hbcb3rh4jvq8jjp1ldr";
   };
 
   buildInputs = [ ponyc ];

From 031d627f6672a936a0148d0679d94a0e2830d97a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <benjamin.hipple@gmail.com>
Date: Sun, 30 Jul 2017 14:38:42 -0400
Subject: [PATCH 1250/3246] cryptop: init at 0.1.0

This commit adds the python application cryptop, which is a small curses
application for viewing cryptocurrency portfolio values.
---
 .../applications/altcoins/cryptop/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/altcoins/cryptop/default.nix

diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix
new file mode 100644
index 00000000000..33853f150cb
--- /dev/null
+++ b/pkgs/applications/altcoins/cryptop/default.nix
@@ -0,0 +1,24 @@
+{ lib, python2}:
+
+python2.pkgs.buildPythonApplication rec {
+  pname = "cryptop";
+  version = "0.1.0";
+  name = "${pname}-${version}";
+
+  src = python2.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh";
+  };
+
+  propagatedBuildInputs = [ python2.pkgs.requests ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    homepage = "http://github.com/huwwp/cryptop";
+    description = "Command line Cryptocurrency Portfolio";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ bhipple ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f48e16ccda..8c863e8cf32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13382,6 +13382,8 @@ with pkgs;
   bitcoin = altcoins.bitcoin;
   bitcoin-xt = altcoins.bitcoin-xt;
 
+  cryptop = callPackage ../applications/altcoins/cryptop { };
+
   libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix {
     secp256k1 = secp256k1.override { enableECDH = true; };
   };

From 9f5f5865fa4a6f8822e7c3b64266249560a6e040 Mon Sep 17 00:00:00 2001
From: vinymeuh <vinymeuh@gmail.com>
Date: Sun, 30 Jul 2017 15:08:59 +0200
Subject: [PATCH 1251/3246] srecord: runs on any flavor of Unix, not only Linux

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

diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix
index 9d0e2d7430e..94a452ce083 100644
--- a/pkgs/development/tools/misc/srecord/default.nix
+++ b/pkgs/development/tools/misc/srecord/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     homepage = http://srecord.sourceforge.net/;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.bjornfor ];
-    platforms = platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 925a4ba4605a7c5e8fd8e17aaabddff42a9750bc Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Sun, 30 Jul 2017 23:21:36 +0000
Subject: [PATCH 1252/3246] fd: init at 2.0.0

Add the package `fd`, a simpler alternative to `find`, at version
2.0.0.

I have tested this change per nixpkgs manual section 13.1 ("Making
patches").
---
 pkgs/tools/misc/fd/default.nix  | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/misc/fd/default.nix

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
new file mode 100644
index 00000000000..763ca668d18
--- /dev/null
+++ b/pkgs/tools/misc/fd/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "fd-${version}";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "sharkdp";
+    repo = "fd";
+    rev = "v${version}";
+    sha256 = "1xs4y9zf5m0ykl95787jv98xg0a60gkcyyh7kg7qg4xrcgf4qz4j";
+  };
+
+  depsSha256 = "1hxf3j4584jgpwrwykx6yil6q6ka9l81qvx6zrbprdxk3pslp049";
+
+  meta = {
+    description = "A simple, fast and user-friendly alternative to find";
+    longDescription = ''
+      `fd` is a simple, fast and user-friendly alternative to `find`.
+
+      While it does not seek to mirror all of `find`'s powerful functionality,
+      it provides sensible (opinionated) defaults for 80% of the use cases.
+    '';
+    homepage = "https://github.com/sharkdp/fd";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05ff56aef28..75c52aa433e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1011,6 +1011,8 @@ with pkgs;
     buildInputs = old.buildInputs ++ [phantomjs2];
   });
 
+  fd = callPackage ../tools/misc/fd { };
+
   filebench = callPackage ../tools/misc/filebench { };
 
   fsmon = callPackage ../tools/misc/fsmon { };

From 9d2da6ab3aa6e238a4b0370a224e3528f0592bc8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 31 Jul 2017 07:56:55 +0800
Subject: [PATCH 1253/3246] uchiwa: 0.22.1 -> 0.25.3-1

---
 .../monitoring/uchiwa/bower-packages.nix      | 26 ++++++-----
 pkgs/servers/monitoring/uchiwa/bower.json     |  6 ---
 pkgs/servers/monitoring/uchiwa/src.nix        |  4 +-
 pkgs/servers/monitoring/uchiwa/update.sh      | 45 ++++++++++++-------
 4 files changed, 44 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/uchiwa/bower.json

diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index 80e73d63235..8a4e0e571b1 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,23 +1,25 @@
 # Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "uchiwa-web" "0.22.1" "0.22.1" "09rhssb5bpwdahdl2fxkjmax8cqg2m51bbf0m3lhkcrcjfc2w8kj")
-  (fetchbower "angular" "1.4.14" "~1.4" "1j5d80bxqh9lgcbmd661bsk8xrhnf43ym77jsk9n845gqr02bdkl")
+  (fetchbower "uchiwa-web" "0.25.3" "0.25.3" "065qyrm1vyi8fp5d5b0b8q5nk8gwh0kcrckl2q1d30c6zlqshg0v")
+  (fetchbower "angular" "1.6.5" "~1.6.3" "0iy7crwr2akh6pmfslbnsrw8m91rffqjibjmzza78xmpk1f4hs73")
   (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7")
-  (fetchbower "angular-cookies" "1.4.14" "~1.4" "10z9azpd228jwdn8p767a93xhb5nrypwa0j6491kbcvm2q1k0g6a")
-  (fetchbower "angular-gravatar" "0.3.2" "~0.3.1" "17d2sc828dsnlkjc4b9irandpimqwan8hlvk9wlmlv8yiyi685p6")
-  (fetchbower "angular-mass-autocomplete-uchiwa" "0.4.1" "0.4.1" "1h2ypg35f6nd6gy6yznpiadql13lk1gyccq6qd4mvksbyb5va6l5")
-  (fetchbower "angular-moment" "0.9.2" "~0.9.0" "143vivplxqd03vg23ynad2yrlgn6dmad7avjmzh0ina2qx7zslgf")
-  (fetchbower "angular-resource" "1.4.14" "~1.4" "1ll2qd0kn39fl5aa49894n1bfcl8dgrfk0w154rkhg7k732q18bk")
-  (fetchbower "angular-route" "1.4.14" "~1.4" "0wfdgvvldgzf7c4lba3x8mw38l9zwkm0i9fg8ad7pvjkqz133sqs")
-  (fetchbower "angular-sanitize" "1.4.14" "~1.4" "072b8dcxjp4cjvcjqxsd0bxa8xd2nqvjb1v878qgfkhf0wz44x32")
+  (fetchbower "angular-cookies" "1.6.5" "~1.6.3" "135yipc576gl9svsk30q62mbf70yp9hy0mbsmvx4jrl9kais495p")
+  (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "19q40hsjhwz8y3phmyrrg27f20qpaknvw44cfx4gliin2zqwwsfk")
+  (fetchbower "angular-moment" "1.0.1" "~1.0.1" "1ydnilyf6nysxxjir51lhn92k7mjqii5277xxdqnpcvc376la244")
+  (fetchbower "angular-resource" "1.6.5" "~1.6.3" "02jiqnkn14kn69ybb74ajhaxxwh71fh5b1g67fajhirkiimpnmxy")
+  (fetchbower "angular-route" "1.6.5" "~1.6.3" "1n1q9a9khvqjas0jb277pzk44zjziblrflvh6w0s6im3ljcb6a7g")
+  (fetchbower "angular-sanitize" "1.6.5" "~1.6.3" "0jj56xwrlyslr3pi94xnbz7xy5g7pwg47p2pnbwhr1a1piwfzh87")
   (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1")
+  (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1rr7xf3a2l15g2nmd9svq8ijy1v0igc5jdpwp21kna1kzc65jg3m")
   (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z")
   (fetchbower "bootstrap" "3.1.1" "3.1.1" "036xbjpv4621p5r2l9vfm9zys6h1mhkvb0zhvk3irrmkzsl77hwh")
   (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "0rfmja15p8kxz6i3liwyqrmbm82azq61d3882w2vmp08vvv2c371")
   (fetchbower "fontawesome" "4.4.0" "~4.4.0" "1mbs0vhixvg11vj3n0l3jn3pb6s839rcs416zq2wzfqkbvsc3sf5")
   (fetchbower "highlightjs" "9.1.0" "~9.1.0" "1gz4q922sylbbqw1sawmjjq8nw0mk90wq0qq95ap0f31px7bfm3f")
-  (fetchbower "moment" "2.8.4" "~2.8.3" "1h30g5an2m9dja09m1s93hsfb25pzl0iah8mmab7nispl3mb585z")
-  (fetchbower "ua-parser-js" "0.7.12" "~0.7.12" "1hrhi7cdf5zd86jz7ipbb23qvkfplghfa92wa3aysca1rpg5zgpd")
-  (fetchbower "jquery" "3.1.1" ">= 1.9.0" "0rkp1hakimnjh3rvlzi30w7qx9x1j0gzjpaajgljn79kd082sgpd")
+  (fetchbower "moment" "2.16.0" "~2.16.0" "0g6zd465rnm3dhsank1iq9b5s4clc58lh3wrpg5sf8dd5zjlr2k2")
+  (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0lw31180v0yjlcah17kpgklcllz78bnrdiyvwhw14151xcyds4jm")
+  (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0z27b811xj09fh0gm72ah8425609gbj87jda3xap5l91alrwixz1")
+  (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "05rcd98z6wc2x5kiaq9dfbvynbkwbrbrcgivcs8bv66d1k747ph8")
+  (fetchbower "jquery" "3.2.1" ">= 1.9.0" "1h14hjhi3ydnl66wmr8w72syyfcvbz47g7bprz7cqw5qxf2n7sah")
 ]; }
diff --git a/pkgs/servers/monitoring/uchiwa/bower.json b/pkgs/servers/monitoring/uchiwa/bower.json
deleted file mode 100644
index 1eb94f73e6b..00000000000
--- a/pkgs/servers/monitoring/uchiwa/bower.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "uchiwa",
-  "dependencies": {
-    "uchiwa-web": "0.21.0"
-  }
-}
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index 68aaa4a5249..c0ddf9cb7a4 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-  version = "0.22.1";
-  sha256  = "15wa7zhchis2rh6jcqkindlidmbf3mryr3apnqnr27ydi2vlqn3g";
+  version = "0.25.3-1";
+  sha256  = "1sgr9fpjfx7qn7dbiaxhsw7iagcrqi39bjc0ba1lh1db5jh7ymks";
 }
diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh
index 2802037a4f5..33e3dacdda5 100755
--- a/pkgs/servers/monitoring/uchiwa/update.sh
+++ b/pkgs/servers/monitoring/uchiwa/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p nodePackages.bower2nix curl.bin git.out jq.out
+#!nix-shell -i bash -p curl.bin git.out jq.out nodePackages.bower2nix
 
 set -euo pipefail
 IFS=$'\n\t'
@@ -7,25 +7,36 @@ IFS=$'\n\t'
 # set -x
 
 REPO=sensu/uchiwa
+SHA="1111111111111111111111111111111111111111111111111111"
 
-VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
-
-t=$(mktemp)
-
-echo "Updating to: ${VERSION}"
-
-curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t
-bower2nix $t bower-packages.nix
-
-pushd $(git rev-parse --show-toplevel)
-sha=$(nix-prefetch-url -A uchiwa.src)
-popd
-
-cat <<_EOF > src.nix
+write_src() {
+  cat <<_EOF > src.nix
 {
   version = "${VERSION}";
-  sha256  = "${sha}";
+  sha256  = "${SHA}";
 }
 _EOF
+}
 
-rm $t
+t=$(mktemp -d)
+
+LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
+echo "Latest version: ${LATEST_VERSION}"
+
+VERSION=${1:-${LATEST_VERSION}}
+echo "Updating to: ${VERSION}"
+
+write_src
+
+curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t/bower.json
+bower2nix $t/bower.json $t/bower-packages.nix
+mv $t/bower-packages.nix .
+# sed -i 's@/@-@g' bower-packages.nix
+
+pushd $(git rev-parse --show-toplevel)
+SHA=$(nix-prefetch-url -A uchiwa.src)
+popd
+
+write_src
+
+rm -r $t

From fdbdccf1a71f930ab01e4ac3a87010dd8372bf9d Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 31 Jul 2017 00:42:56 +0000
Subject: [PATCH 1254/3246] xrdp: abs path to garbage directory

---
 pkgs/applications/networking/remote/xrdp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index eff81e99857..b6b1f6542af 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -58,7 +58,7 @@ let
       ./bootstrap
     '';
     dontDisableStatic = true;
-    configureFlags = [ "--with-systemdsystemunitdir=./do-not-install" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ];
+    configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ];
 
     installFlags = [ "DESTDIR=$(out)" "prefix=" ];
 

From 497e04a698458edaf45eb0e64c5615ffff79f58b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 31 Jul 2017 14:14:50 +0800
Subject: [PATCH 1255/3246] smartmontools: use slightly newer drive DB

---
 pkgs/tools/system/smartmontools/default.nix | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index c3f05edd9ad..26d84ae0320 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchurl, IOKit ? null , ApplicationServices ? null }:
+{ stdenv, fetchurl, autoreconfHook
+, IOKit ? null , ApplicationServices ? null }:
 
 let
-
   version = "6.5";
 
-  dbrev = "4391";
+  dbrev = "4394";
   drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
   driverdb = fetchurl {
     url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
-    sha256 = "1da99m81wr0rjdhcz2xx0sbbrqxkxffja2kllg4srmhih7fps5p1";
+    sha256 = "1kdpgbl1az0xhqn7j613cx366n7amra8xz3391jpzzrd3vlga393";
     name = "smartmontools-drivedb.h";
   };
 
-in
-
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   name = "smartmontools-${version}";
 
   src = fetchurl {
@@ -22,16 +20,18 @@ stdenv.mkDerivation rec {
     sha256 = "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49";
   };
 
-  buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices];
-
   patches = [ ./smartmontools.patch ];
   postPatch = "cp -v ${driverdb} drivedb.h";
 
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices];
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Tools for monitoring the health of hard drives";
-    homepage = http://smartmontools.sourceforge.net/;
-    license = licenses.gpl2Plus;
-    platforms = with platforms; linux ++ darwin;
-    maintainers = [ maintainers.peti ];
+    homepage    = http://smartmontools.sourceforge.net/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ peti ];
+    platforms   = with platforms; linux ++ darwin;
   };
 }

From 688ab1ed024747c79a0ca9221fd65926e22b1905 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 31 Jul 2017 14:22:50 +0800
Subject: [PATCH 1256/3246] terragrunt: 0.12.24 -> 0.12.25

---
 .../networking/cluster/terragrunt/default.nix |  4 +--
 .../networking/cluster/terragrunt/deps.nix    | 25 +++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index d7988267f2f..71d595cef6f 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.12.24";
+  version = "0.12.25";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "0rkbicvqjadb99qw65g3k7pqal5sn05png30qwy59cv4gjr9q9m4";
+    sha256 = "0j85abmkspbwdijf9dzm37x3ibqd3bhn01qs165433k74f9m500q";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index fc7da0a2a99..ac6bae69395 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 = "ae53883b2478fd8e2bdca2748367d5b5fa27ca22";
-      sha256 = "0sa5g69wpk6hbd6g52cc7l5c6zph9zyc5l9dy4288xn4hpb6c23q";
+      rev = "df374c20d53ed082b8cf0d0da52b1a181abf387b";
+      sha256 = "0my26kjx1inh0ajh85n34wrl18mizx627cl0xhxlhcyw01p24792";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-getter";
-      rev = "2814e6fb2ca5b3bd950c97eff22553ecb3c7f77b";
-      sha256 = "1pkqa5vdyc79iiw25b9vpl9f32nwv2pzh6f98l30678ypha0miqn";
+      rev = "6aae8e4e2dee8131187c6a54b52664796e5a02b0";
+      sha256 = "0hxjwph0ghx0732xq62bszk18wb18hdq6vzb6b6bdn3rsdva1d68";
     };
   }
   {
@@ -77,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/go-testing-interface";
-      rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8";
-      sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61";
+      rev = "9a441910b16872f7b8283682619b3761a9aa2222";
+      sha256 = "0gfi97m6sadrwbq56as3d368c3ipcn3wz8pxqkk7kkba0h5wjc7v";
     };
   }
   {
@@ -95,8 +95,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a";
-      sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9";
+      rev = "05e8a0eda380579888eb53c394909df027f06991";
+      sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv";
+    };
+  }
+  {
+    goPackagePath = "github.com/ulikunitz/xz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ulikunitz/xz";
+      rev = "0c6b41e72360850ca4f98dc341fd999726ea007f";
+      sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3";
     };
   }
   {

From 2a48a62b9cfe99140bfa9d45fca960be848f87fe Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 9 Mar 2017 15:31:26 +0800
Subject: [PATCH 1257/3246] sensu: 0.29.0 -> 1.0.2

Use NixOS's default ruby instead of 2.1 and add a few helpful plugins
---
 pkgs/servers/monitoring/sensu/Gemfile      |  11 +
 pkgs/servers/monitoring/sensu/Gemfile.lock |  70 +++++-
 pkgs/servers/monitoring/sensu/gemset.nix   | 259 ++++++++++++++++++++-
 pkgs/top-level/all-packages.nix            |   4 +-
 4 files changed, 327 insertions(+), 17 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu/Gemfile b/pkgs/servers/monitoring/sensu/Gemfile
index ebee9f25721..3f570024feb 100644
--- a/pkgs/servers/monitoring/sensu/Gemfile
+++ b/pkgs/servers/monitoring/sensu/Gemfile
@@ -1,2 +1,13 @@
 source 'https://rubygems.org'
+
 gem 'sensu'
+
+# integration
+gem 'sensu-plugins-influxdb'
+
+# checks
+gem 'sensu-plugins-http'
+gem 'sensu-plugins-disk-checks'
+gem 'sensu-plugins-logs'
+gem 'sensu-plugins-systemd'
+# gem 'sensu-plugins-process-checks'
diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock
index 0d01c227145..9e47e697c3b 100644
--- a/pkgs/servers/monitoring/sensu/Gemfile.lock
+++ b/pkgs/servers/monitoring/sensu/Gemfile.lock
@@ -5,17 +5,46 @@ GEM
     amqp (1.6.0)
       amq-protocol (>= 2.0.1)
       eventmachine
+    aws-sdk (2.10.19)
+      aws-sdk-resources (= 2.10.19)
+    aws-sdk-core (2.10.19)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.10.19)
+      aws-sdk-core (= 2.10.19)
+    aws-sigv4 (1.0.1)
+    cause (0.1)
     childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
+    dentaku (2.0.9)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
     em-http-server (0.1.8)
       eventmachine
     em-worker (0.0.2)
       eventmachine
     eventmachine (1.2.2)
     ffi (1.9.18)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    influxdb (0.3.13)
+      cause
+      json
+    jmespath (1.3.1)
+    json (1.8.6)
+    jsonpath (0.5.8)
+      multi_json
+    mime-types (2.99.3)
+    mixlib-cli (1.7.0)
+    multi_json (1.12.1)
+    netrc (0.11.0)
     oj (2.18.1)
     parse-cron (0.1.4)
-    sensu (0.29.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    sensu (1.0.2)
       em-http-server (= 0.1.8)
       eventmachine (= 1.2.2)
       parse-cron (= 0.1.4)
@@ -23,8 +52,8 @@ GEM
       sensu-extensions (= 1.9.0)
       sensu-json (= 2.1.0)
       sensu-logger (= 1.2.1)
-      sensu-redis (= 2.1.1)
-      sensu-settings (= 10.0.0)
+      sensu-redis (= 2.2.0)
+      sensu-settings (= 10.3.0)
       sensu-spawn (= 2.2.1)
       sensu-transport (= 7.0.2)
     sensu-extension (1.5.1)
@@ -57,9 +86,28 @@ GEM
     sensu-logger (1.2.1)
       eventmachine
       sensu-json
-    sensu-redis (2.1.1)
+    sensu-plugin (1.4.5)
+      json (< 2.0.0)
+      mixlib-cli (>= 1.5.0)
+    sensu-plugins-disk-checks (2.4.0)
+      sensu-plugin (~> 1.2)
+      sys-filesystem (= 1.1.7)
+    sensu-plugins-http (2.5.0)
+      aws-sdk (~> 2.3)
+      rest-client (= 1.8.0)
+      sensu-plugin (~> 1.2)
+    sensu-plugins-influxdb (1.2.0)
+      dentaku (= 2.0.9)
+      influxdb (= 0.3.13)
+      jsonpath (= 0.5.8)
+      sensu-plugin (~> 1.3)
+    sensu-plugins-logs (1.2.0)
+      sensu-plugin (~> 1.2)
+    sensu-plugins-systemd (0.0.5)
+      sensu-plugin (~> 1.2)
+    sensu-redis (2.2.0)
       eventmachine
-    sensu-settings (10.0.0)
+    sensu-settings (10.3.0)
       parse-cron
       sensu-json (>= 1.1.0)
     sensu-spawn (2.2.1)
@@ -71,12 +119,22 @@ GEM
       amqp (= 1.6.0)
       eventmachine
       sensu-redis (>= 1.0.0)
+    sys-filesystem (1.1.7)
+      ffi
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   sensu
+  sensu-plugins-disk-checks
+  sensu-plugins-http
+  sensu-plugins-influxdb
+  sensu-plugins-logs
+  sensu-plugins-systemd
 
 BUNDLED WITH
-   1.14.6
+   1.15.3
diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix
index 1df8d419cb6..36bef969c2a 100644
--- a/pkgs/servers/monitoring/sensu/gemset.nix
+++ b/pkgs/servers/monitoring/sensu/gemset.nix
@@ -8,6 +8,7 @@
     version = "2.0.1";
   };
   amqp = {
+    dependencies = ["amq-protocol" "eventmachine"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9";
@@ -15,7 +16,51 @@
     };
     version = "1.6.0";
   };
+  aws-sdk = {
+    dependencies = ["aws-sdk-resources"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04fgpkhjjmwxppb7b0jbsc6zykkw7hpkncld8mm1zamajf653sf6";
+      type = "gem";
+    };
+    version = "2.10.19";
+  };
+  aws-sdk-core = {
+    dependencies = ["aws-sigv4" "jmespath"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f0qq7h4bpmlvcsl1bncxdyw63zanz6jdxch9i457irc5l6z8sm0";
+      type = "gem";
+    };
+    version = "2.10.19";
+  };
+  aws-sdk-resources = {
+    dependencies = ["aws-sdk-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c107vlh475jph5i2szchmcwlsimpvdbd2cc0m5p39jmw8prkysa";
+      type = "gem";
+    };
+    version = "2.10.19";
+  };
+  aws-sigv4 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cxl0yvmyl8d0yj4cx3p75iki4fqk8ckb6ajfj7mr3g4ihp5mryp";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  cause = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00";
+      type = "gem";
+    };
+    version = "0.1";
+  };
   childprocess = {
+    dependencies = ["ffi"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0";
@@ -23,7 +68,25 @@
     };
     version = "0.5.8";
   };
+  dentaku = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11z4cw4lspx3rgmmd2hd4l1iikk6p17icxwn7xym92v1j825zpnr";
+      type = "gem";
+    };
+    version = "2.0.9";
+  };
+  domain_name = {
+    dependencies = ["unf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
+      type = "gem";
+    };
+    version = "0.5.20170404";
+  };
   em-http-server = {
+    dependencies = ["eventmachine"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5";
@@ -34,6 +97,7 @@
   em-worker = {
     dependencies = ["eventmachine"];
     source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
       type = "gem";
     };
@@ -55,6 +119,81 @@
     };
     version = "1.9.18";
   };
+  http-cookie = {
+    dependencies = ["domain_name"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  influxdb = {
+    dependencies = ["cause" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jikl3iylbffsdmb4vr09ysqvpwxk133y6m9ylwcd0931ngsf0ks";
+      type = "gem";
+    };
+    version = "0.3.13";
+  };
+  jmespath = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
+      type = "gem";
+    };
+    version = "1.8.6";
+  };
+  jsonpath = {
+    dependencies = ["multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gwhrd7xlysq537yy8ma69jc83lblwiccajl5zvyqpnwyjjc93df";
+      type = "gem";
+    };
+    version = "0.5.8";
+  };
+  mime-types = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
+      type = "gem";
+    };
+    version = "2.99.3";
+  };
+  mixlib-cli = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+      type = "gem";
+    };
+    version = "1.12.1";
+  };
+  netrc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
   oj = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -71,15 +210,26 @@
     };
     version = "0.1.4";
   };
-  sensu = {
+  rest-client = {
+    dependencies = ["http-cookie" "mime-types" "netrc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0931qccqhwmvqf4jj3jwip25xwkg7rf1yxxpkdhiyi2yndyfb8x7";
+      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
       type = "gem";
     };
-    version = "0.29.0";
+    version = "1.8.0";
+  };
+  sensu = {
+    dependencies = ["em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vk9bvxwh6ah8xkncf16f8r0bq84cnnx16ffc4k6sq73v8wpk116";
+      type = "gem";
+    };
+    version = "1.0.2";
   };
   sensu-extension = {
+    dependencies = ["eventmachine"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1lgmjxfbq11v4yi3qanf1qxv0sgm1a8a7wj7qyn1nkva6zmimss3";
@@ -88,6 +238,7 @@
     version = "1.5.1";
   };
   sensu-extensions = {
+    dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1r09mdbbnh5cg9yvqw78sxbhlb8xqld1vwbr4hsjw6k3x1xpnnr9";
@@ -96,6 +247,7 @@
     version = "1.9.0";
   };
   sensu-extensions-check-dependencies = {
+    dependencies = ["sensu-extension"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0clgvf2abvwz549f28ny3zd6q7z6y7m49i8pp91ll10jp1vsy4b2";
@@ -104,6 +256,7 @@
     version = "1.0.1";
   };
   sensu-extensions-debug = {
+    dependencies = ["sensu-extension"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp";
@@ -112,6 +265,7 @@
     version = "1.0.0";
   };
   sensu-extensions-json = {
+    dependencies = ["sensu-extension"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g";
@@ -120,6 +274,7 @@
     version = "1.0.0";
   };
   sensu-extensions-occurrences = {
+    dependencies = ["sensu-extension"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v";
@@ -128,6 +283,7 @@
     version = "1.2.0";
   };
   sensu-extensions-only-check-output = {
+    dependencies = ["sensu-extension"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3";
@@ -136,6 +292,7 @@
     version = "1.0.0";
   };
   sensu-extensions-ruby-hash = {
+    dependencies = ["sensu-extension"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3";
@@ -144,6 +301,7 @@
     version = "1.0.0";
   };
   sensu-json = {
+    dependencies = ["oj"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "02qkh86jddv7gha39vjx6g9hi7vkq7r433dr86bwmm9c7lqkgyl9";
@@ -152,6 +310,7 @@
     version = "2.1.0";
   };
   sensu-logger = {
+    dependencies = ["eventmachine" "sensu-json"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "03kicjqz8a594bxnwyg6bcd4fipy2vxjl1gbaip4gpixxki32dx0";
@@ -159,23 +318,80 @@
     };
     version = "1.2.1";
   };
-  sensu-redis = {
+  sensu-plugin = {
+    dependencies = ["json" "mixlib-cli"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nqk2046g6nldpiqy40f805gms8r856v2zxm53j0c8ni03sgz2a3";
+      sha256 = "0z18zk04l9klbjmqvjg6cpv3k4w5hi1by8wnpkiwdwa2jdv61jyb";
       type = "gem";
     };
-    version = "2.1.1";
+    version = "1.4.5";
+  };
+  sensu-plugins-disk-checks = {
+    dependencies = ["sensu-plugin" "sys-filesystem"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r7kzqp0kwhz7kk0s25r7lh2sw4yr99m5lr8cb99kq73fnsjqipq";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  sensu-plugins-http = {
+    dependencies = ["aws-sdk" "rest-client" "sensu-plugin"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13126hx2fgjsrfqnlh2hf2czn35pi8rkc5ql9yxf4y8x9a7dyksj";
+      type = "gem";
+    };
+    version = "2.5.0";
+  };
+  sensu-plugins-influxdb = {
+    dependencies = ["dentaku" "influxdb" "jsonpath" "sensu-plugin"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18nk7c451df46xcjk97r3h8yhaj8bz138ih5y0z26sdiha58brv7";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  sensu-plugins-logs = {
+    dependencies = ["sensu-plugin"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ycrf3967v5kavm58fj9db16l9wgyzac4h3r0f9hm32jy9qsxwq6";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  sensu-plugins-systemd = {
+    dependencies = ["sensu-plugin"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r7prvkf33j6qvvqq78186rn5g6wf0g3dqni34vnj8v1z287wkfh";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  sensu-redis = {
+    dependencies = ["eventmachine"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1drmychc04fg2gs7zsxx6aidfyxf7cn7k8k1jy7dnfbnlr5aln3n";
+      type = "gem";
+    };
+    version = "2.2.0";
   };
   sensu-settings = {
+    dependencies = ["parse-cron" "sensu-json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fb3wgqll5cq5akgmqhx6vgjvmcpcjyx68qqs8hb106b07gdpmli";
+      sha256 = "0y55bqvps06gk94zllamqr0fa5bc27q0k1b5sp5gxh1bkf4w8gb3";
       type = "gem";
     };
-    version = "10.0.0";
+    version = "10.3.0";
   };
   sensu-spawn = {
+    dependencies = ["childprocess" "em-worker" "eventmachine"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1vz5kbqk3ld0s16zjl8m38l1m1xwcvjlfc1g4nfm45qxdyfn7la7";
@@ -184,6 +400,7 @@
     version = "2.2.1";
   };
   sensu-transport = {
+    dependencies = ["amq-protocol" "amqp" "eventmachine" "sensu-redis"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15yib92hwyd8v04wcc0kaw0p8w2c2mwvi4ldya2jh3dqgs31mvhr";
@@ -191,4 +408,30 @@
     };
     version = "7.0.2";
   };
+  sys-filesystem = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10didky52nfapmybj6ipda18i8fcwf8bs9bbfbk5i7v1shzd36rf";
+      type = "gem";
+    };
+    version = "1.1.7";
+  };
+  unf = {
+    dependencies = ["unf_ext"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  unf_ext = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
+      type = "gem";
+    };
+    version = "0.0.7.4";
+  };
 }
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c863e8cf32..1923b6ad612 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11535,9 +11535,7 @@ with pkgs;
 
   ruby-zoom = callPackage ../tools/text/ruby-zoom { };
 
-  sensu = callPackage ../servers/monitoring/sensu {
-    ruby = ruby_2_1;
-  };
+  sensu = callPackage ../servers/monitoring/sensu { };
 
   uchiwa = callPackage ../servers/monitoring/uchiwa { };
 

From 979817d1535bf911d181be6685ad4879e4bdf37f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 31 Jul 2017 08:41:48 +0200
Subject: [PATCH 1258/3246] linux-testing: 4.13-rc2 -> 4.13-rc3

Tested via building the linux_testing attribute, but didn't test it at
runtime (yet).

Diffed unpacked tarball against my local git clone and the contents
match.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 64b91cc677d..5106aacbe61 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13-rc2";
-  modDirVersion = "4.13.0-rc2";
+  version = "4.13-rc3";
+  modDirVersion = "4.13.0-rc3";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1ni0z3v8zkqlmxn4czbw71yaipp6hbyh39vxdzpqy1dqn7zalmif";
+    sha256 = "07cxqf57hgs3wnbvkqixiwhjrwdf433pjwmh0hv1id0bk8wdrjjl";
   };
 
   features.iwlwifi = true;

From 701d2c89f909fba8d58e4dc342994031a4ec94cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Jul 2017 09:49:52 +0200
Subject: [PATCH 1259/3246] osc: update to version 0.159.0-4-g2d44589 (current
 git master)

---
 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 bbed8f76c76..4ae21516f7d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14927,13 +14927,13 @@ in {
   });
 
   osc = buildPythonPackage {
-    name = "osc-0.156.0-94-gd8ba394";
+    name = "osc-0.159.0-4-g2d44589";
     disabled = isPy3k;
     src = pkgs.fetchFromGitHub {
       owner = "openSUSE";
       repo = "osc";
-      rev = "d8ba39416bb193a15489cb2ae57847434adbf1c8";
-      sha256 = "0bxl1sjfpdrhyc0qljyqlkffyzn1iywjqgaz2z1y07zq59gc8wq0";
+      rev = "2d44589886845af7da911aaec9403344e396cd91";
+      sha256 = "0s8p7gkp64w6r5rnxpbvl2dgb5p85kq2skcqm6qxn5ddadhw2sfz";
     };
     buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper
     propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];

From a74c0c66526d824844ef45e5655415abe397f04f Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Mon, 31 Jul 2017 15:28:10 +0800
Subject: [PATCH 1260/3246] Removed deprecation warning for
 networking.extraHosts

---
 nixos/modules/config/networking.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 616f76f6f47..b3639037914 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -199,9 +199,6 @@ in
 
   config = {
 
-    warnings = optional (cfg.extraHosts != "")
-      "networking.extraHosts is deprecated, please use networking.hosts instead";
-
     environment.etc =
       { # /etc/services: TCP/UDP port assignments.
         "services".source = pkgs.iana-etc + "/etc/services";

From 9bcee1051a94d6ba2be64a19665f017542122b83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 31 Jul 2017 11:06:30 +0200
Subject: [PATCH 1261/3246] strigi: Build on gcc 6

https://hydra.nixos.org/build/56882669
---
 pkgs/development/libraries/strigi/default.nix |  4 +-
 pkgs/development/libraries/strigi/gcc6.patch  | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/strigi/gcc6.patch

diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 1961160cbc9..362881a2f42 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
   CLUCENE_HOME = clucene_core;
 
   buildInputs =
-    [ zlib bzip2 stdenv.cc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
+    [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
 
-  patches = [ ./export_bufferedstream.patch ];
+  patches = [ ./export_bufferedstream.patch ./gcc6.patch ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/strigi/gcc6.patch b/pkgs/development/libraries/strigi/gcc6.patch
new file mode 100644
index 00000000000..b46f6c52b82
--- /dev/null
+++ b/pkgs/development/libraries/strigi/gcc6.patch
@@ -0,0 +1,45 @@
+https://sourceforge.net/p/strigi/patches/4/
+
+and a fix for
+
+/tmp/nix-build-strigi-0.7.8.drv-0/strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp:325:37: error: no matching function for call to 'make_pair(std::__cxx11::string, std::__cxx11::string&)'
+             wchartoutf8(name), value));
+
+diff -Naur strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake
+--- strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake	2013-02-05 16:34:52.000000000 -0500
++++ strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake	2016-05-14 11:39:54.586260564 -0400
+@@ -15,7 +15,7 @@
+    # get the gcc version
+    exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
+ 
+-   string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++   string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+    # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
+    if (NOT _gcc_version)
+       string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")
+diff -Naur strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake
+--- strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake	2013-02-05 16:34:57.000000000 -0500
++++ strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake	2016-05-14 11:40:11.340134414 -0400
+@@ -15,7 +15,7 @@
+    # get the gcc version
+    exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
+ 
+-   string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++   string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+    # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
+    if (NOT _gcc_version)
+       string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")
+
+diff -ru strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
+--- strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp	2013-02-05 22:34:52.000000000 +0100
++++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp	2017-07-31 10:56:27.067902643 +0200
+@@ -321,8 +321,7 @@
+         string size = value;
+         doc.size = atoi(size.c_str());
+     } else {
+-        doc.properties.insert(make_pair<const string, string>(
+-            wchartoutf8(name), value));
++        doc.properties.emplace(wchartoutf8(name), value);
+     }
+ }
+ Variant

From b2d19a4d249e416f1fd2304f1fcda6781bca2001 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 31 Jul 2017 11:46:48 +0200
Subject: [PATCH 1262/3246] fbida: fix build failure

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

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index d06c3eb5ec1..2943b5ef94c 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff
    libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ];
   
-  makeFlags = [ "prefix=$(out)" "verbose=yes" ];
+  makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ];
 
   patchPhase =
     ''

From c40ac69ec3cdc1b720d3349cfa648c0476a18d84 Mon Sep 17 00:00:00 2001
From: Martin Wohlert <martin@b-root-force.de>
Date: Mon, 31 Jul 2017 09:35:32 +0200
Subject: [PATCH 1263/3246] gnupg: 2.1.21 -> 2.1.22
 https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000411.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 e74b0920f4a..9590ee746b8 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.21";
+  version = "2.1.22";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1p97limv29p01y79mgnzpwixa50lv53wgdl3ymk9idkmpaldisks";
+    sha256 = "1msazgy1q1pp7y2xr46z0il4pfzmzgzkp7v0hv5cz4hvkspnywa6";
   };
 
   buildInputs = [

From ee8df19a25bac9330abe037afe4c936ff319c5f2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 10:49:21 +0200
Subject: [PATCH 1264/3246] batman-adv: 2017.1 -> 2017.2

---
 pkgs/os-specific/linux/batman-adv/alfred.nix  | 4 ++--
 pkgs/os-specific/linux/batman-adv/batctl.nix  | 4 ++--
 pkgs/os-specific/linux/batman-adv/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 7b800fe6f4f..3a1407aae1f 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
 
 let
-  ver = "2017.1";
+  ver = "2017.2";
 in
 stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "1c6zq8j0nb1wm9zzlzc2bn8a500pvqbn2vv9hrv6nvq7il2silzq";
+    sha256 = "00sagxzkx0gqdkvc84w4bjy833l7n10hqalxdwkfxxwqwammclix";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index c34c7746b90..5f659eb9884 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2017.1";
+  ver = "2017.2";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "1imb59iaaw50y76595z6zvqnbpjgqkkp79gq4s7w7nj8wikiqcgq";
+    sha256 = "0v2k9ylmk8i85p69dh6gh134f081gm1clq1vnhn6x4831n8x0q64";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 8a96279c66b..4270f37594e 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, kernel }:
 
-let base = "batman-adv-2017.1"; in
+let base = "batman-adv-2017.2"; in
 
 stdenv.mkDerivation rec {
   name = "${base}-${kernel.version}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha256 = "05cck0mlg8xsvbra69x6i25xclsq1xc49dggxq81gi086c14h67c";
+    sha256 = "0krr6waxkmms23cacfzngddxy1vq577s54wy2fgx6lyb4579g1yl";
   };
 
   hardeningDisable = [ "pic" ];

From 55742a20445a13d2c7ea1cee7805422784f8a1be Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 12:24:55 +0200
Subject: [PATCH 1265/3246] cacert: fix unicode names in blacklist

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

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 5095fce8958..fbf9af36f27 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, nss, python
+{ stdenv, fetchurl, writeText, nss, python3
 , blacklist ? []
 , includeEmail ? false
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = nss.src;
 
-  nativeBuildInputs = [ python ];
+  nativeBuildInputs = [ python3 ];
 
   configurePhase = ''
     ln -s nss/lib/ckfw/builtins/certdata.txt

From 86eb01778d95ce7087490f5758d52cb04339b60c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 12:34:01 +0200
Subject: [PATCH 1266/3246] youtubeDL: 2017.07.09 -> 2017.07.30.1

---
 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 b730d45c9e2..bf05cd9bf5c 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.07.09";
+  version = "2017.07.30.1";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0phrfby2nk5y5x5173bbg3jcr2ajk849al3zji5y39z39dj36ba2";
+    sha256 = "1m1n5d06xh8hnild6kssiv9yaq2sm7vy0c8h506v3nff7i9wf0a7";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b68fdfb619bb97a4a7b3bc8f7c3c626d9b7cb4f0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 12:34:25 +0200
Subject: [PATCH 1267/3246] whois: 5.2.16 -> 5.2.17

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

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index fd1045d03d9..e6f25176864 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  version = "5.2.16";
+  version = "5.2.17";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "1axkj3xp8ryw94ml8lkqgpdqkv56aygbyv18kynf2bcglxildyvv";
+    sha256 = "15jnzk0js8wxiapz1bw7jnck0fl3mcli56f9635z9x7vk63ss68z";
   };
 
   buildInputs = [ perl gettext ];

From f645db1abf8adee9fa062ddd80d50b827e9d899f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 12:47:23 +0200
Subject: [PATCH 1268/3246] caddy: 0.10.4 -> 0.10.6

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

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 77c83630514..e221c67a2c0 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.10.4";
+  version = "0.10.6";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "0zch19a38487dflx84dlkwz67by9g4v2v8d7wrslqhs14a0sifhk";
+    sha256 = "17k8518mx1l0q5bjlx0c6f249ibr9qdrcgwn3wpwhd244cbg44gn";
   };
 
   buildFlagsArray = ''

From a67445509ba298d505c5d49dfe945839e39e37be Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 12:47:37 +0200
Subject: [PATCH 1269/3246] radvd: 2.16 -> 2.17

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

diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index a5008e91423..9ebce846e41 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "radvd-${version}";
-  version = "2.16";
+  version = "2.17";
 
   src = fetchurl {
     url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
-    sha256 = "1s3aqgn3db0wb4920b0mrvwb5isgijlb6izb1wliqhhashwffz1i";
+    sha256 = "1md6n63sg1n9x8yv0p7fwm1xxaiadj1q3mpadiqsvn14y1ddc2av";
   };
 
   nativeBuildInputs = [ pkgconfig bison flex check ];

From 85a0ab4b239148eecd88478a84db96721580538a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 31 Jul 2017 13:16:29 +0200
Subject: [PATCH 1270/3246] Python: disable user site-packages for programs and
 environments.

Python by default checks a `site-packages` folder in the user's home
folder. We do not want such an impurity and therefore disable it.
Fixes #26846.
---
 pkgs/development/interpreters/python/wrap.sh     | 4 +++-
 pkgs/development/interpreters/python/wrapper.nix | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh
index 1c74e612b55..37bd5b09739 100644
--- a/pkgs/development/interpreters/python/wrap.sh
+++ b/pkgs/development/interpreters/python/wrap.sh
@@ -66,7 +66,9 @@ wrapPythonProgramsIn() {
                     # above. The script will set PYTHONPATH and PATH variables.!
                     # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
                     local -a wrap_args=("$f"
-                                    --prefix PATH ':' "$program_PATH")
+                                    --prefix PATH ':' "$program_PATH"
+                                    --set PYTHONNOUSERSITE "true"
+                                    )
 
                     # Add any additional arguments provided by makeWrapperArgs
                     # argument to buildPythonPackage.
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index b4bd532dc1d..65b949661b0 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -29,7 +29,7 @@ let
           for prg in *; do
             if [ -f "$prg" ]; then
               rm -f "$out/bin/$prg"
-              makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out"
+              makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true"
             fi
           done
         fi

From 9de667042b7dd9badc9d0c645ca4ebc1af280369 Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Mon, 31 Jul 2017 12:16:48 +0100
Subject: [PATCH 1271/3246] ephemeralpg: Add meta

---
 pkgs/applications/misc/ephemeralpg/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/applications/misc/ephemeralpg/default.nix
index 104192f7e61..65df422599c 100644
--- a/pkgs/applications/misc/ephemeralpg/default.nix
+++ b/pkgs/applications/misc/ephemeralpg/default.nix
@@ -12,4 +12,9 @@ stdenv.mkDerivation rec {
     PREFIX=$out make install
     wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin
   '';
+  meta = {
+    description = ''Run tests on an isolated, temporary PostgreSQL database.'';
+    license = stdenv.lib.licenses.isc;
+    homepage = http://ephemeralpg.org/;
+  };
 }

From 9082b660965f8f57c1a2f61c0bdd4f6df7cf862b Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 31 Jul 2017 12:25:35 +0200
Subject: [PATCH 1272/3246] dockerTools: fix permissions on base image

If the base image has been built with nixpkgs.dockerTools, the image
configuration and manifest are readonly so we first need to change
their permissions before removing them.

Fix #27632.
---
 pkgs/build-support/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index b6e342cf9b5..160c3f85977 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -437,8 +437,8 @@ rec {
           echo "Unpacking base image..."
           tar -C image -xpf "$fromImage"
           # Do not import the base image configuration and manifest
+          chmod a+w image image/*.json
           rm -f image/*.json
-          rm -f image/manifest.json
 
           if [[ -z "$fromImageName" ]]; then
             fromImageName=$(jshon -k < image/repositories|head -n1)

From d30b2eb1c0458f5ede751956effe714f5c1a925b Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Mon, 31 Jul 2017 17:58:03 +0800
Subject: [PATCH 1273/3246] Removed networking.fqdn option

Adding it was a mistake which can only lead to problems and confusion.
---
 nixos/modules/config/networking.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index b3639037914..619f36cd515 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -20,15 +20,6 @@ in
 
   options = {
 
-    networking.fqdn = lib.mkOption {
-      type = types.nullOr types.str;
-      default = null;
-      example = "foo.example.com";
-      description = ''
-        Fully qualified domain name, if any.
-      '';
-    };
-
     networking.hosts = lib.mkOption {
       type = types.attrsOf ( types.listOf types.str );
       default = {};
@@ -220,12 +211,11 @@ in
                 ( builtins.hasAttr "::1" cfg.hosts )
                 ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
               otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
-              maybeFQDN = optionalString ( cfg.fqdn != null ) cfg.fqdn;
           in
           ''
-            127.0.0.1 ${maybeFQDN} ${userLocalHosts} localhost
+            127.0.0.1 ${userLocalHosts} localhost
             ${optionalString cfg.enableIPv6 ''
-              ::1 ${maybeFQDN} ${userLocalHosts6} localhost
+              ::1 ${userLocalHosts6} localhost
             ''}
             ${otherHosts}
             ${cfg.extraHosts}

From 499e36c0a0dce133f980f4899efab27cff560bcc Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 31 Jul 2017 17:06:34 +0300
Subject: [PATCH 1274/3246] qdirstat: add script dependency

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

diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index be252ed81ef..cbbac11424e 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, qmake
-, coreutils, xdg_utils, bash, perl }:
+, coreutils, xdg_utils, bash
+, perl, makeWrapper, perlPackages }:
 
 let
   version = "1.4";
@@ -13,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ qmake makeWrapper ];
 
   buildInputs = [ perl ];
 
@@ -45,6 +46,11 @@ in stdenv.mkDerivation rec {
       --replace /bin/bash ${bash}/bin/bash
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/qdirstat-cache-writer \
+      --set PERL5LIB "${stdenv.lib.makePerlPath [ perlPackages.URI ]}"
+  '';
+
   meta = with stdenv.lib; {
     description = "Graphical disk usage analyzer";
     homepage = src.meta.homepage;

From 53931c0443f1a4402f4b690459b9a5d4919fb431 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 27 Jul 2017 21:42:31 +0200
Subject: [PATCH 1275/3246] electrum: 2.8.3 -> 2.9.0

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

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 34f403fda89..4aaa5f1ff67 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.8.3";
+  version = "2.9.0";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "04jswalydzwm16iismbq1h2shj17iq9sqm0mz8p98sh3dwkacvn1";
+    sha256 = "1lida5phq0c1lxnk75d9jsps0vw4zy7saaxhv0q4kv76rk2b3fhv";
   };
 
   propagatedBuildInputs = with python2Packages; [

From 449946ef94edbffb352bf7bcac934af3b2cebf57 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 30 Jul 2017 18:46:18 -0400
Subject: [PATCH 1276/3246] torbrowser: 7.0.2 -> 7.0.3

Fixes a bug whereby visiting specially crafted urls could lead to
direct (non-tor) connections to the remote host[1]

[1]: https://blog.torproject.org/blog/tor-browser-703-released
---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 5bcf47a4905..423be7c33e7 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -84,7 +84,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.0.2";
+  version = "7.0.3";
 
   lang = "en-US";
 
@@ -94,7 +94,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0xdw8mvyxz9vaxikzsj4ygzp36m4jfhvhqfiyaiiywpf39rqpkqr";
+      sha256 = "1p91szx60xx3295bpap9w2ydgaibj0yn9lbdyhajal35bbhjxqhc";
     };
 
     "i686-linux" = fetchurl {
@@ -102,7 +102,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0m522i8zih5sj18dyzk9im7gmpmrbf96657v38m3pxn4ci38b83z";
+      sha256 = "0p51dxiq3qxyc5n7xvh1hq039pvp7z730f6dks4h5p3sfqw6isfp";
     };
   };
 in

From a0d464033c2bacffa9c05d27903fb03cd09ace46 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 31 Jul 2017 15:55:24 +0100
Subject: [PATCH 1277/3246] nixos/timezone: support imperative timezone
 configuration (#26608)

Fixes #26469.
---
 nixos/modules/config/timezone.nix | 20 ++++++++------
 nixos/tests/timezone.nix          | 45 +++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 nixos/tests/timezone.nix

diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 39a45042c6c..9f849c24c11 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -14,13 +14,16 @@ in
     time = {
 
       timeZone = mkOption {
-        default = "UTC";
-        type = types.str;
+        default = null;
+        type = types.nullOr types.str;
         example = "America/New_York";
         description = ''
           The time zone used when displaying times and dates. See <link
           xlink:href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"/>
           for a comprehensive list of possible values for this setting.
+
+          If null, the timezone will default to UTC and can be set imperatively
+          using timedatectl.
         '';
       };
 
@@ -40,13 +43,14 @@ in
     # This way services are restarted when tzdata changes.
     systemd.globalEnvironment.TZDIR = tzdir;
 
-    environment.etc.localtime =
-      { source = "/etc/zoneinfo/${config.time.timeZone}";
-        mode = "direct-symlink";
+    systemd.services.systemd-timedated.environment = lib.optionalAttrs (config.time.timeZone != null) { NIXOS_STATIC_TIMEZONE = "1"; };
+
+    environment.etc = {
+      zoneinfo.source = tzdir;
+    } // lib.optionalAttrs (config.time.timeZone == null) {
+        localtime.source = "/etc/zoneinfo/${config.time.timeZone}";
+        localtime.mode = "direct-symlink";
       };
-
-    environment.etc.zoneinfo.source = tzdir;
-
   };
 
 }
diff --git a/nixos/tests/timezone.nix b/nixos/tests/timezone.nix
new file mode 100644
index 00000000000..2204649a3fc
--- /dev/null
+++ b/nixos/tests/timezone.nix
@@ -0,0 +1,45 @@
+{
+  timezone-static = import ./make-test.nix ({ pkgs, ... }: {
+    name = "timezone-static";
+    meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ];
+
+    machine.time.timeZone = "Europe/Amsterdam";
+
+    testScript = ''
+      $machine->waitForUnit("dbus.socket");
+      $machine->fail("timedatectl set-timezone Asia/Tokyo");
+      my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
+      $dateResult[1] eq "1970-01-01 01:00:00\n" or die "Timezone seems to be wrong";
+    '';
+  });
+
+  timezone-imperative = import ./make-test.nix ({ pkgs, ... }: {
+    name = "timezone-imperative";
+    meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ];
+
+    machine.time.timeZone = null;
+
+    testScript = ''
+      $machine->waitForUnit("dbus.socket");
+
+      # Should default to UTC
+      my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
+      print $dateResult[1];
+      $dateResult[1] eq "1970-01-01 00:00:00\n" or die "Timezone seems to be wrong";
+
+      $machine->succeed("timedatectl set-timezone Asia/Tokyo");
+
+      # Adjustment should be taken into account
+      my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
+      print $dateResult[1];
+      $dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone was not adjusted";
+
+      # Adjustment should persist across a reboot
+      $machine->shutdown;
+      $machine->waitForUnit("dbus.socket");
+      my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
+      print $dateResult[1];
+      $dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone adjustment was not persisted";
+    '';
+  });
+}

From 4ed291b3037d18c97edaed35cbeb4f8ecc224e16 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgewhewell@users.noreply.github.com>
Date: Mon, 31 Jul 2017 16:11:37 +0100
Subject: [PATCH 1278/3246] {radarr,sonarr}: add libcurl to library search path
 (#27628)

---
 pkgs/servers/radarr/default.nix | 6 +++---
 pkgs/servers/sonarr/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 23969dc2a23..088eef0830b 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper }:
+{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "radarr-${version}";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
     makeWrapper "${mono}/bin/mono" $out/bin/Radarr \
       --add-flags "$out/share/${name}/Radarr.exe" \
-      --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \
-      --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib"
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
+          curl sqlite libmediainfo ]}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index bd921df6e52..3c096a0d52e 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper, ... }:
+{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }:
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
 
     makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \
       --add-flags "$out/bin/NzbDrone.exe" \
-      --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \
-      --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib"
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
+          curl sqlite libmediainfo ]}
   '';
 
   meta = {

From 4f901203e8d1a0ded90a73e2670ce493ed051299 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 31 Jul 2017 17:12:53 +0200
Subject: [PATCH 1279/3246] nixos/timezone: Fix evaluation error

Evaluation error introduced in a0d464033c2bacffa9c05d27903fb03cd09ace46.

If the value for timeZone is null it shouldn't be even tried to coerce
it into a string.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lheckemann, @joachifm
---
 nixos/modules/config/timezone.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 9f849c24c11..aa030a816d0 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -47,7 +47,7 @@ in
 
     environment.etc = {
       zoneinfo.source = tzdir;
-    } // lib.optionalAttrs (config.time.timeZone == null) {
+    } // lib.optionalAttrs (config.time.timeZone != null) {
         localtime.source = "/etc/zoneinfo/${config.time.timeZone}";
         localtime.mode = "direct-symlink";
       };

From b94da10c2727195e66f5c971be41c3280f01e69c Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 31 Jul 2017 16:29:18 +0100
Subject: [PATCH 1280/3246] libqalculate, qalculate-gtk: 0.9.9 -> 1.0.0

---
 .../science/math/qalculate-gtk/default.nix             | 10 ++++++++--
 pkgs/development/libraries/libqalculate/default.nix    |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 5f49b240fc0..cd89fbbe187 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "qalculate-gtk-${version}";
-  version = "0.9.9";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";
-    sha256 = "0v9ibycilygmi9zzi7cxif7si56c85lfzdvbqnbf32whg8ydqqkg";
+    sha256 = "08sg6kfcfdpxjsl538ba26ncm2cxzc63nlafj99ff4b46wxia57k";
   };
 
+  patchPhase = ''
+    for fn in src/interface.cc src/main.cc; do
+      substituteInPlace $fn --replace 'getPackageDataDir().c_str()' \"$out/share\"
+    done
+  '';
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ];
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index abc0eb4a228..2e748d26689 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libqalculate-${version}";
-  version = "0.9.10";
+  version = "1.0.0a";
 
   src = fetchurl {
     url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";
-    sha256 = "0whzc15nwsrib6bpw4lqsm59yr0pfk44hny9sivfbwhidk0177zi";
+    sha256 = "12igmd1rn6zwrsg0mmn5pwy2bqj2gmc08iry0vcdxgzi7jc9x7ix";
   };
 
   outputs = [ "out" "dev" "doc" ];

From 561c815ad7bf835accb14d1dffbb17e840bb0df4 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 31 Jul 2017 17:55:03 +0200
Subject: [PATCH 1281/3246] pythonPackages.daphne: 1.2.0 -> 1.3.0

---
 pkgs/development/python-modules/daphne/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 562b29cf062..c90fb61ce03 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchPypi,
   asgiref, autobahn, twisted, hypothesis
 }:
 buildPythonPackage rec {
   pname = "daphne";
   name = "${pname}-${version}";
-  version = "1.2.0";
+  version = "1.3.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/daphne/${name}.tar.gz";
-    sha256 = "084216isw7rwy693i62rbd8kvpqx418jvf1q72cplv833wz3in7l";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1xmmjp21m1w88ljsgnkf6cbzw5nxamh9cfmfgzxffpn4cdmvn96i";
   };
 
   buildInputs = [ hypothesis ];

From 8523ab5e8d64a34bbf271118858138ae15ad51b8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 30 Jul 2017 20:33:21 +0300
Subject: [PATCH 1282/3246] raspberrypifw: 1.20170427 -> 1.20170515

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

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 8a6dfff3470..123a7d9395d 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20170427";
+  version = "1.20170515";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "0n79nij0rlwjx3zqs4p3wcyrgrgg9gmsf1a526r91c689r5lpwvl";
+    sha256 = "0liy0p69p9yr5cqgrfc23d3n243xkrx889gc8yqd9m2jpns4s361";
   };
 
   dontStrip = true;    # Stripping breaks some of the binaries

From 3db9a2bdff0f969e491fca965b1f2863a2fec716 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 30 Jul 2017 20:33:41 +0300
Subject: [PATCH 1283/3246] linux_rpi: 1.20170427 -> 1.20170515

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

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 0e7f332e617..f1fabad24fb 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  modDirVersion = "4.9.24";
-  tag = "1.20170427";
+  modDirVersion = "4.9.28";
+  tag = "1.20170515";
 in
 stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
   version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
     owner = "raspberrypi";
     repo = "linux";
     rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "0f7p2jc3a9yvz7k1fig6fardgz2lvp5kawbb3rfsx2p53yjlhmf9";
+    sha256 = "19cjvns6zs53l319k3a2angffr93dh2j9g0022ww6rmi6niq4fkf";
   };
 
   features.iwlwifi = true;

From 310e597d4afab0fb0a1bf19e2da8fc512b7ed11b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 31 Jul 2017 17:12:27 +0000
Subject: [PATCH 1284/3246] ocamlPackages.gen: 0.4 -> 0.4.0.1

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

diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix
index 6cbbd4adc1b..d9a1fb4770f 100644
--- a/pkgs/development/ocaml-modules/gen/default.nix
+++ b/pkgs/development/ocaml-modules/gen/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
 
-let version = "0.4"; in
+let version = "0.4.0.1"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-gen-${version}";
+  name = "ocaml${ocaml.version}-gen-${version}";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "gen";
     rev = "${version}";
-    sha256 = "041dga300fh1y6fi8y0fkri2qda406lf2dmbrgllazw3rp07zkzj";
+    sha256 = "0gg94f5l899rni3r7s7wq8plgazmbsaw498xckp25kkgpmkk61ml";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ounit ];

From aac6eef54821d2aeddb5345fa3944c45bfe36440 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 31 Jul 2017 17:19:19 +0000
Subject: [PATCH 1285/3246] ocamlPackages.containers: 1.2 -> 1.3

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

diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index f44db615175..84ac3ae6133 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -6,18 +6,18 @@ let
   mkpath = p:
       "${p}/lib/ocaml/${ocaml.version}/site-lib";
 
-  version = "1.2";
+  version = "1.3";
 
 in
 
 stdenv.mkDerivation {
-  name = "ocaml-containers-${version}";
+  name = "ocaml${ocaml.version}-containers-${version}";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-containers";
     rev = "${version}";
-    sha256 = "0k1676bn12hhayjlpy8bxfc3sgq6wd7zkh0ca700zh8jxjrshjqk";
+    sha256 = "1gjs9d6759zpgp68djv296zwmvhdc6dqfb27aip7dhj6ic2bwgil";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ];

From 2a8c1a942ec269e83adec427a5c8ff722e4968fa Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 31 Jul 2017 11:58:24 -0700
Subject: [PATCH 1286/3246] dolphinEmuMaster: 20170705 -> 20170730

generally I only update this once a month or less, but the much awaited
ubershader branch landed
---
 pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index ed44ea59311..31e22240c3b 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -4,12 +4,12 @@
 , libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20170705";
+  name = "dolphin-emu-20170730";
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "29cc009706f133aac39ebaa7003d37555b926109";
-    sha256 = "0axd2z14lyqlaxrjssc0dkqnjdk3ccxh2fqrhya0jc2rsm8ighlz";
+    rev = "141fb0f03ca4e0d05f7ccbf3e020997097f60dbe";
+    sha256 = "1b4ygrfj1dpmyv7qqfnqrrvm96a3b68cwcnvv2pknrcpc17g52im";
   };
 
   cmakeFlags = ''

From 67890f73afc431166075491c7d4e5cc7f45eb67a Mon Sep 17 00:00:00 2001
From: Taeradan <Taeradan@users.noreply.github.com>
Date: Mon, 31 Jul 2017 21:05:03 +0200
Subject: [PATCH 1287/3246] postfix service: typo in transport filepath

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

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index c22a552645a..94db0ac0eea 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -76,7 +76,7 @@ let
   // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; }
   // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; }
   // optionalAttrs haveAliases { alias_maps = "${cfg.aliasMapType}:/etc/postfix/aliases"; }
-  // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfx/transport"; }
+  // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; }
   // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; }
   // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
   // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; }

From 01495787646a7b560e90c61e89f5fdad7bed7877 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 31 Jul 2017 22:07:36 +0200
Subject: [PATCH 1288/3246] sbcl: 1.3.19 -> 1.3.20

---
 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 3bd1982baa5..82859a0e429 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.19";
+  version = "1.3.20";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0660gw43myikpa6n2qjhjxz61ilqazva4v8shljgwymag99risxm";
+    sha256 = "0qhzrl2msdyzqp3165qlh9s6jrif5rddsmj9q50z0bxnaf0330jj";
   };
 
   patchPhase = ''

From 0c37778c2c17fb40407f6432ff009cd7ae5b17b1 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 17 Jul 2017 23:36:17 -0400
Subject: [PATCH 1289/3246] cc-wrapper: WIP linking hack for mac OS

Probably best to override Haskell packages set, or anything else
linking a lot of libraries, with this.
---
 pkgs/build-support/cc-wrapper/default.nix     |  20 ++-
 .../macos-sierra-reexport-hack.patch          | 140 ++++++++++++++++++
 pkgs/stdenv/darwin/default.nix                |   2 +-
 pkgs/test/macos-sierra-shared/default.nix     |  43 ++++++
 pkgs/top-level/all-packages.nix               |   6 +
 5 files changed, 208 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.patch
 create mode 100644 pkgs/test/macos-sierra-shared/default.nix

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 676fbd00688..c178204f9fb 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -12,6 +12,7 @@
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 , buildPackages ? {}, hostPlatform, targetPlatform
 , runCommand ? null
+, useMacosReexportHack ? false
 }:
 
 with stdenv.lib;
@@ -295,7 +296,20 @@ stdenv.mkDerivation {
         ln -s $ldPath/${prefix}as $out/bin/${prefix}as
       fi
 
-      wrap ${prefix}ld ${preWrap ./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld}
+      wrap ${prefix}ld ${if !useMacosReexportHack
+      then preWrap ./ld-wrapper.sh
+      else stdenv.mkDerivation {
+        name = "patched-ld-wrapper-src";
+        patches = [ ./macos-sierra-reexport-hack.patch ];
+        unpackPhase = ''
+          src=$PWD
+          cp ${./ld-wrapper.sh} ld-wrapper.sh
+        '';
+        buildPhase = "";
+        installPhase = ''
+          cp ld-wrapper.sh $out
+        '';
+      }} ''${ld:-$ldPath/${prefix}ld}
 
       if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then
         wrap ${prefix}ld.gold ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold
@@ -399,5 +413,7 @@ stdenv.mkDerivation {
     { description =
         stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_
         + " (wrapper script)";
-    };
+  } // optionalAttrs useMacosReexportHack {
+    platforms = stdenv.lib.platforms.darwin;
+  };
 }
diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.patch b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.patch
new file mode 100644
index 00000000000..031c5640f54
--- /dev/null
+++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.patch
@@ -0,0 +1,140 @@
+--- a/ld-wrapper.sh
++++ b/ld-wrapper.sh
+@@ -101,35 +101,115 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
+     rpath=""
+ 
+     # First, find all -L... switches.
+-    allParams=("${params[@]}" ${extra[@]})
++    declare -ar allParams=("${extraBefore[@]}" "${params[@]}" "${extra[@]}")
++    declare -a allParamsPost=() childrenLookup=() childrenLink=()
++
++    declare -r recurThreshold=300
++
++    declare overflowCount=0
++    for p in "${allParams[@]}"; do
++        case "$p" in
++            -o)
++                declare -r outputName="$p2"
++                ;;
++            (-l*)
++                let overflowCount+=1
++                ;;
++            *) ;;
++        esac
++    done
++
++    if (( "$overflowCount" > "$recurThreshold" )); then
++       declare -r linkIndirect="1"
++    else
++       declare -r linkIndirect=""
++    fi
++
++    function append_Ls() {
++        if [[ -n "$linkIndirect" ]]; then
++            childrenLookup+=("$@")
++        fi
++        allParamsPost+=("$@")
++    }
++
++    function append_ls() {
++        local p
++        if (( $# == 2 )); then p="$2"; else p="${1:2}"; fi
++        if [[ -n "$linkIndirect" && "$p" != "-lto_library" && "$p" != "-lSystem" ]]; then
++            childrenLink+=("$@")
++        else
++            allParamsPost+=("$@")
++        fi
++    }
++
+     n=0
+     while [ $n -lt ${#allParams[*]} ]; do
+         p=${allParams[n]}
+         p2=${allParams[$((n+1))]}
++
+         if [ "${p:0:3}" = -L/ ]; then
+             addToLibPath ${p:2}
++            append_Ls "$p"
+         elif [ "$p" = -L ]; then
+             addToLibPath ${p2}
++            append_Ls "$p" "$p2"
+             n=$((n + 1))
+         elif [ "$p" = -l ]; then
+             addToLibs ${p2}
++            append_ls "$p" "$p2"
+             n=$((n + 1))
+         elif [ "${p:0:2}" = -l ]; then
+             addToLibs ${p:2}
++            append_ls "$p"
+         elif [ "$p" = -dynamic-linker ]; then
+             # Ignore the dynamic linker argument, or it
+             # will get into the next 'elif'. We don't want
+             # the dynamic linker path rpath to go always first.
++            allParamsPost+=("$p" "$p2")
+             n=$((n + 1))
+         elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then
+             # This is a direct reference to a shared library, so add
+             # its directory to the rpath.
+             path="$(dirname "$p")";
+             addToRPath "${path}"
++            allParamsPost+=("$p")
++        else
++            allParamsPost+=("$p")
+         fi
++
+         n=$((n + 1))
+     done
+ 
++    if [[ "$linkIndirect" ]]; then
++        while (( $n < "${#childrenLink[@]}" )); do
++            childrenLink[n]="-reexport${childrenLink[n]}"
++        done
++        declare -r outputNameLibless=$(basename $(
++            if [[ "${outputName:0:3}" = lib ]]; then
++                echo "${outputName:3}"
++            else
++                echo "${outputName:-unnamed}"
++            fi))
++        declare -ra children=("$outputNameLibless-reexport-delegate-0" \
++                              "$outputNameLibless-reexport-delegate-1")
++
++        mkdir -p "$out/lib"
++
++        # first half of libs
++        "$0" -dylib -o "$out/lib/lib${children[0]}.dylib" \
++             -install_name "$out/lib/lib${children[0]}.dylib" \
++             "${childrenLookup[@]}" \
++             "${childrenLink[@]::$((${#childrenLink[@]} / 2 ))}"
++
++        # second half of libs
++        "$0" -dylib -o "$out/lib/lib${children[1]}.dylib" \
++             -install_name "$out/lib/lib${children[1]}.dylib" \
++             "${childrenLookup[@]}" \
++             "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}"
++
++        allParamsPost+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}")
++    fi
++
+     # Second, for each directory in the library search path (-L...),
+     # see if it contains a dynamic library used by a -l... flag.  If
+     # so, add the directory to the rpath.
+@@ -170,12 +243,8 @@ fi
+ 
+ # Optionally print debug info.
+ if [ -n "$NIX_DEBUG" ]; then
+-  echo "original flags to @prog@:" >&2
+-  for i in "${params[@]}"; do
+-      echo "  $i" >&2
+-  done
+-  echo "extra flags to @prog@:" >&2
+-  for i in ${extra[@]}; do
++  echo "flags to @prog@:" >&2
++  for i in "${allParamsPost[@]}"; do
+       echo "  $i" >&2
+   done
+ fi
+@@ -185,4 +254,4 @@ if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then
+ fi
+ 
+ PATH="$path_backup"
+-exec @prog@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
++exec @prog@ "${allParamsPost[@]}"
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index f6d9bcac510..ed114fa740c 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -297,7 +297,7 @@ in rec {
     initialPath = import ../common-path.nix { inherit pkgs; };
     shell       = "${pkgs.bash}/bin/bash";
 
-    cc = import ../../build-support/cc-wrapper {
+    cc = lib.callPackageWith {} ../../build-support/cc-wrapper {
       inherit (pkgs) stdenv;
       inherit shell;
       nativeTools = false;
diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
new file mode 100644
index 00000000000..8d7b9fc9384
--- /dev/null
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -0,0 +1,43 @@
+{ lib, clangStdenv, clang-sierraHack-stdenv }:
+
+let
+  makeBigExe = stdenv: prefix: rec {
+
+    sillyLibs = lib.genList (i: stdenv.mkDerivation rec {
+      name = "${prefix}-fluff-${toString i}";
+      unpackPhase = ''
+        src=$PWD
+        echo 'int asdf${toString i}(void) { return ${toString i}; }' > ${name}.c
+      '';
+      buildPhase = ''
+        $CC -shared ${name}.c -o lib${name}.dylib -Wl,-install_name,$out/lib/lib${name}.dylib
+      '';
+      installPhase = ''
+        mkdir -p "$out/lib"
+        mv lib${name}.dylib "$out/lib"
+      '';
+    }) 500
+    ;
+
+    finalExe = stdenv.mkDerivation rec {
+      name = "${prefix}-final-asdf";
+      unpackPhase = ''
+        src=$PWD
+        echo 'int main(int argc, char **argv) { return argc; }' > main.c;
+      '';
+      buildPhase = ''
+        $CC main.c ${toString (map (x: "-l${x.name}") sillyLibs)} -o asdf
+      '';
+      buildInputs = sillyLibs;
+      installPhase = ''
+        mkdir -p "$out/bin"
+        mv asdf "$out/bin"
+      '';
+    };
+
+  };
+
+in {
+  good = makeBigExe clang-sierraHack-stdenv "good";
+  bad  = makeBigExe clangStdenv             "bad";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c26ba7c826..85573b10321 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5162,6 +5162,11 @@ with pkgs;
 
   clang = llvmPackages.clang;
 
+  clang-sierraHack = clang.override {
+    name = "clang-wrapper-with-reexport-hack";
+    useMacosReexportHack = true;
+  };
+
   clang_4  = llvmPackages_4.clang;
   clang_39 = llvmPackages_39.clang;
   clang_38 = llvmPackages_38.clang;
@@ -5189,6 +5194,7 @@ with pkgs;
 
   #Use this instead of stdenv to build with clang
   clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv;
+  clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack;
   libcxxStdenv = lowPrio llvmPackages.libcxxStdenv;
 
   clean = callPackage ../development/compilers/clean { };

From 9242c8b331a3571debb04b6485b0783386371838 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 21 Jul 2017 13:29:47 -0400
Subject: [PATCH 1290/3246] cc-wrapper: Use two scripts instead of patch

---
 pkgs/build-support/cc-wrapper/default.nix     |  22 +--
 .../macos-sierra-reexport-hack.bash           |  95 ++++++++++++
 .../macos-sierra-reexport-hack.patch          | 140 ------------------
 3 files changed, 103 insertions(+), 154 deletions(-)
 create mode 100644 pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
 delete mode 100644 pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.patch

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index c178204f9fb..371db540b0a 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -296,20 +296,14 @@ stdenv.mkDerivation {
         ln -s $ldPath/${prefix}as $out/bin/${prefix}as
       fi
 
-      wrap ${prefix}ld ${if !useMacosReexportHack
-      then preWrap ./ld-wrapper.sh
-      else stdenv.mkDerivation {
-        name = "patched-ld-wrapper-src";
-        patches = [ ./macos-sierra-reexport-hack.patch ];
-        unpackPhase = ''
-          src=$PWD
-          cp ${./ld-wrapper.sh} ld-wrapper.sh
-        '';
-        buildPhase = "";
-        installPhase = ''
-          cp ld-wrapper.sh $out
-        '';
-      }} ''${ld:-$ldPath/${prefix}ld}
+    '' + (if !useMacosReexportHack then ''
+      wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld}
+    '' else ''
+      export ldWrapper="$out/bin/${prefix}ld" innerLd="${prefix}ld-reexport-delegate"
+      wrap "$innerLd" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld}
+      wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$innerLd"
+      unset ldWrapper
+    '') + ''
 
       if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then
         wrap ${prefix}ld.gold ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold
diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
new file mode 100644
index 00000000000..548be0c4dd4
--- /dev/null
+++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
@@ -0,0 +1,95 @@
+#! @shell@
+
+set -eu -o pipefail
+
+path_backup="$PATH"
+if [ -n "@coreutils_bin@" ]; then
+  PATH="@coreutils_bin@/bin"
+fi
+
+declare -r recurThreshold=300
+
+declare overflowCount=0
+for ((n=0; n < $#; ++n)); do
+    case "${!n}" in
+        -l*) let overflowCount+=1 ;;
+        -reexport-l*) let overflowCount+=1 ;;
+        *) ;;
+    esac
+done
+
+declare -a allArgs=()
+
+if (( "$overflowCount" <= "$recurThreshold" )); then
+    allArgs=("$@")
+else
+    declare -a childrenLookup=() childrenLink=()
+
+    while (( $# )); do
+        case "$1" in
+            -L/*)
+                childrenLookup+=("$1")
+                allArgs+=("$1")
+                ;;
+            -L)
+                echo "cctools LD does not support '-L foo' or '-l foo'" >&2
+                exit 1
+                ;;
+            -l)
+                echo "cctools LD does not support '-L foo' or '-l foo'" >&2
+                exit 1
+                ;;
+            -lto_library)  allArgs+=("$1") ;;
+                # We aren't linking any "to_library"
+            -lSystem)      allArgs+=("$1") ;;
+                # Special case as indirection seems like a bad idea for something
+                # so fundamental. Can be removed for simplicity.
+            -l?*)          childrenLink+=("$1") ;;
+            -reexport-l?*) childrenLink+=("$1") ;;
+            *)             allArgs+=("$1") ;;
+        esac
+
+        shift
+    done
+
+    declare n=0
+    while (( $n < "${#childrenLink[@]}" )); do
+        if [[ "${childrenLink[n]}" = -l* ]]; then
+            childrenLink[n]="-reexport${childrenLink[n]}"
+        fi
+        let ++n
+    done
+    unset n
+
+    declare -r outputNameLibless=$(basename $( \
+        if [[ -z "${outputName:+isUndefined}" ]]; then
+            echo unnamed
+        elif [[ "${outputName:0:3}" = lib ]]; then
+            echo "${outputName:3}"
+        else
+            echo "${outputName}"
+        fi))
+    declare -ra children=("$outputNameLibless-reexport-delegate-0" \
+                          "$outputNameLibless-reexport-delegate-1")
+
+    mkdir -p "$out/lib"
+
+    # first half of libs
+    @ldWrapper@ -macosx_version_min 10.10 -arch x86_64 -dylib \
+      -o "$out/lib/lib${children[0]}.dylib" \
+      -install_name "$out/lib/lib${children[0]}.dylib" \
+      "${childrenLookup[@]}" \
+      "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}"
+
+    # second half of libs
+    @ldWrapper@ -macosx_version_min 10.10 -arch x86_64 -dylib \
+      -o "$out/lib/lib${children[1]}.dylib" \
+      -install_name "$out/lib/lib${children[1]}.dylib" \
+      "${childrenLookup[@]}" \
+      "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}"
+
+    allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}")
+fi
+
+PATH="$path_backup"
+exec @prog@ "${allArgs[@]}"
diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.patch b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.patch
deleted file mode 100644
index 031c5640f54..00000000000
--- a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- a/ld-wrapper.sh
-+++ b/ld-wrapper.sh
-@@ -101,35 +101,115 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
-     rpath=""
- 
-     # First, find all -L... switches.
--    allParams=("${params[@]}" ${extra[@]})
-+    declare -ar allParams=("${extraBefore[@]}" "${params[@]}" "${extra[@]}")
-+    declare -a allParamsPost=() childrenLookup=() childrenLink=()
-+
-+    declare -r recurThreshold=300
-+
-+    declare overflowCount=0
-+    for p in "${allParams[@]}"; do
-+        case "$p" in
-+            -o)
-+                declare -r outputName="$p2"
-+                ;;
-+            (-l*)
-+                let overflowCount+=1
-+                ;;
-+            *) ;;
-+        esac
-+    done
-+
-+    if (( "$overflowCount" > "$recurThreshold" )); then
-+       declare -r linkIndirect="1"
-+    else
-+       declare -r linkIndirect=""
-+    fi
-+
-+    function append_Ls() {
-+        if [[ -n "$linkIndirect" ]]; then
-+            childrenLookup+=("$@")
-+        fi
-+        allParamsPost+=("$@")
-+    }
-+
-+    function append_ls() {
-+        local p
-+        if (( $# == 2 )); then p="$2"; else p="${1:2}"; fi
-+        if [[ -n "$linkIndirect" && "$p" != "-lto_library" && "$p" != "-lSystem" ]]; then
-+            childrenLink+=("$@")
-+        else
-+            allParamsPost+=("$@")
-+        fi
-+    }
-+
-     n=0
-     while [ $n -lt ${#allParams[*]} ]; do
-         p=${allParams[n]}
-         p2=${allParams[$((n+1))]}
-+
-         if [ "${p:0:3}" = -L/ ]; then
-             addToLibPath ${p:2}
-+            append_Ls "$p"
-         elif [ "$p" = -L ]; then
-             addToLibPath ${p2}
-+            append_Ls "$p" "$p2"
-             n=$((n + 1))
-         elif [ "$p" = -l ]; then
-             addToLibs ${p2}
-+            append_ls "$p" "$p2"
-             n=$((n + 1))
-         elif [ "${p:0:2}" = -l ]; then
-             addToLibs ${p:2}
-+            append_ls "$p"
-         elif [ "$p" = -dynamic-linker ]; then
-             # Ignore the dynamic linker argument, or it
-             # will get into the next 'elif'. We don't want
-             # the dynamic linker path rpath to go always first.
-+            allParamsPost+=("$p" "$p2")
-             n=$((n + 1))
-         elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then
-             # This is a direct reference to a shared library, so add
-             # its directory to the rpath.
-             path="$(dirname "$p")";
-             addToRPath "${path}"
-+            allParamsPost+=("$p")
-+        else
-+            allParamsPost+=("$p")
-         fi
-+
-         n=$((n + 1))
-     done
- 
-+    if [[ "$linkIndirect" ]]; then
-+        while (( $n < "${#childrenLink[@]}" )); do
-+            childrenLink[n]="-reexport${childrenLink[n]}"
-+        done
-+        declare -r outputNameLibless=$(basename $(
-+            if [[ "${outputName:0:3}" = lib ]]; then
-+                echo "${outputName:3}"
-+            else
-+                echo "${outputName:-unnamed}"
-+            fi))
-+        declare -ra children=("$outputNameLibless-reexport-delegate-0" \
-+                              "$outputNameLibless-reexport-delegate-1")
-+
-+        mkdir -p "$out/lib"
-+
-+        # first half of libs
-+        "$0" -dylib -o "$out/lib/lib${children[0]}.dylib" \
-+             -install_name "$out/lib/lib${children[0]}.dylib" \
-+             "${childrenLookup[@]}" \
-+             "${childrenLink[@]::$((${#childrenLink[@]} / 2 ))}"
-+
-+        # second half of libs
-+        "$0" -dylib -o "$out/lib/lib${children[1]}.dylib" \
-+             -install_name "$out/lib/lib${children[1]}.dylib" \
-+             "${childrenLookup[@]}" \
-+             "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}"
-+
-+        allParamsPost+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}")
-+    fi
-+
-     # Second, for each directory in the library search path (-L...),
-     # see if it contains a dynamic library used by a -l... flag.  If
-     # so, add the directory to the rpath.
-@@ -170,12 +243,8 @@ fi
- 
- # Optionally print debug info.
- if [ -n "$NIX_DEBUG" ]; then
--  echo "original flags to @prog@:" >&2
--  for i in "${params[@]}"; do
--      echo "  $i" >&2
--  done
--  echo "extra flags to @prog@:" >&2
--  for i in ${extra[@]}; do
-+  echo "flags to @prog@:" >&2
-+  for i in "${allParamsPost[@]}"; do
-       echo "  $i" >&2
-   done
- fi
-@@ -185,4 +254,4 @@ if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then
- fi
- 
- PATH="$path_backup"
--exec @prog@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
-+exec @prog@ "${allParamsPost[@]}"

From 1cd74ac70a69f60b826b20d2e31644f2a2be98ea Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 26 Jul 2017 20:26:57 -0400
Subject: [PATCH 1291/3246] cc-wrapper: Make sure symbol tables of child
 delegators is not empty

As described in https://github.com/NixOS/nixpkgs/issues/18461, MacOS no
longer accepts dylibs which only reexport other dylibs, because their
symbol tables are empty. To get around this, we define an object file
with a single "private extern" symbol, which hopefully won't clobber
anything.
---
 pkgs/build-support/cc-wrapper/default.nix        |  9 +++++----
 .../cc-wrapper/macos-sierra-reexport-hack.bash   | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 371db540b0a..43cf3b1cafe 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -299,10 +299,11 @@ stdenv.mkDerivation {
     '' + (if !useMacosReexportHack then ''
       wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld}
     '' else ''
-      export ldWrapper="$out/bin/${prefix}ld" innerLd="${prefix}ld-reexport-delegate"
-      wrap "$innerLd" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld}
-      wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$innerLd"
-      unset ldWrapper
+      export binPrefix=${prefix}
+      ldInner="${prefix}ld-reexport-delegate"
+      wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld}
+      wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner"
+      unset ldInner
     '') + ''
 
       if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then
diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
index 548be0c4dd4..ae920e4fdad 100644
--- a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
+++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
@@ -74,18 +74,26 @@ else
 
     mkdir -p "$out/lib"
 
+    PATH="$PATH:@out@/bin"
+
+    symbolBloatObject=$outputNameLibless-symbol-hack.o
+    if [[ ! -e $symbolBloatObject ]]; then
+        printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \
+            | @binPrefix@as -- -o $symbolBloatObject
+    fi
+
     # first half of libs
-    @ldWrapper@ -macosx_version_min 10.10 -arch x86_64 -dylib \
+    @binPrefix@ld -macosx_version_min 10.10 -arch x86_64 -dylib \
       -o "$out/lib/lib${children[0]}.dylib" \
       -install_name "$out/lib/lib${children[0]}.dylib" \
-      "${childrenLookup[@]}" \
+      "${childrenLookup[@]}" "$symbolBloatObject" \
       "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}"
 
     # second half of libs
-    @ldWrapper@ -macosx_version_min 10.10 -arch x86_64 -dylib \
+    @binPrefix@ld -macosx_version_min 10.10 -arch x86_64 -dylib \
       -o "$out/lib/lib${children[1]}.dylib" \
       -install_name "$out/lib/lib${children[1]}.dylib" \
-      "${childrenLookup[@]}" \
+      "${childrenLookup[@]}" "$symbolBloatObject" \
       "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}"
 
     allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}")

From f671b85fb2c082819ea419ea5b0f5914bc6f26b3 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 26 Jul 2017 23:28:36 -0400
Subject: [PATCH 1292/3246] cc-wrapper: Beef up sierra tests to actually use
 functions

---
 pkgs/test/macos-sierra-shared/default.nix | 34 +++++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
index 8d7b9fc9384..ebcf6c62c60 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -3,30 +3,52 @@
 let
   makeBigExe = stdenv: prefix: rec {
 
+    count = 500;
+
     sillyLibs = lib.genList (i: stdenv.mkDerivation rec {
       name = "${prefix}-fluff-${toString i}";
       unpackPhase = ''
         src=$PWD
-        echo 'int asdf${toString i}(void) { return ${toString i}; }' > ${name}.c
+        cat << 'EOF' > ${name}.c
+        unsigned int asdf_${toString i}(void) {
+          return ${toString i};
+        }
+        EOF
       '';
       buildPhase = ''
-        $CC -shared ${name}.c -o lib${name}.dylib -Wl,-install_name,$out/lib/lib${name}.dylib
+        $CC -std=c99 -shared ${name}.c -o lib${name}.dylib -Wl,-install_name,$out/lib/lib${name}.dylib
       '';
       installPhase = ''
         mkdir -p "$out/lib"
         mv lib${name}.dylib "$out/lib"
       '';
-    }) 500
-    ;
+    }) count;
 
     finalExe = stdenv.mkDerivation rec {
       name = "${prefix}-final-asdf";
       unpackPhase = ''
         src=$PWD
-        echo 'int main(int argc, char **argv) { return argc; }' > main.c;
+        cat << 'EOF' > main.cxx
+
+        #include <assert.h>
+
+        ${toString (lib.genList (i: "extern unsigned int asdf_${toString i}(void); ") count)}
+
+        unsigned int (*funs[])(void) = {
+          ${toString (lib.genList (i: "asdf_${toString i},") count)}
+        };
+
+        int main(int argc, char **argv) {
+          unsigned int i = 0;
+          for (auto f : funs) {
+            assert(f() == i++);
+          }
+          return 0;
+        }
+        EOF
       '';
       buildPhase = ''
-        $CC main.c ${toString (map (x: "-l${x.name}") sillyLibs)} -o asdf
+        $CC -std=c++11 main.cxx ${toString (map (x: "-l${x.name}") sillyLibs)} -o asdf
       '';
       buildInputs = sillyLibs;
       installPhase = ''

From 539dcb8e2760ee6cab990ce929a586b050496520 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 27 Jul 2017 14:15:10 -0400
Subject: [PATCH 1293/3246] cc-wrapper-test: Forgot to `extern "C"` now that
 main is C++

---
 pkgs/test/macos-sierra-shared/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
index ebcf6c62c60..2d52a02affa 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -32,7 +32,7 @@ let
 
         #include <assert.h>
 
-        ${toString (lib.genList (i: "extern unsigned int asdf_${toString i}(void); ") count)}
+        ${toString (lib.genList (i: "extern \"C\" unsigned int asdf_${toString i}(void); ") count)}
 
         unsigned int (*funs[])(void) = {
           ${toString (lib.genList (i: "asdf_${toString i},") count)}

From a9dd855894d426ecc1e32b1b8b72a9db7f8ed913 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 27 Jul 2017 14:37:24 -0400
Subject: [PATCH 1294/3246] cc-wrapper-test: Don't use assert

---
 pkgs/test/macos-sierra-shared/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
index 2d52a02affa..e96fdb34c05 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -30,7 +30,8 @@ let
         src=$PWD
         cat << 'EOF' > main.cxx
 
-        #include <assert.h>
+        #include <cstdlib>
+        #include <iostream>
 
         ${toString (lib.genList (i: "extern \"C\" unsigned int asdf_${toString i}(void); ") count)}
 
@@ -39,11 +40,15 @@ let
         };
 
         int main(int argc, char **argv) {
+          bool ret;
           unsigned int i = 0;
           for (auto f : funs) {
-            assert(f() == i++);
+            if (f() != i++) {
+              std::cerr << "Failed to get expected response from function #" << i << std::endl;
+              return EXIT_FAILURE;
+            }
           }
-          return 0;
+          return EXIT_SUCCESS;
         }
         EOF
       '';

From eeed1814dc84121f81fc6214a26f1adffc41581c Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 27 Jul 2017 15:36:51 -0400
Subject: [PATCH 1295/3246] cc-wrapper-test: Use `$CXX` else the C++ std lib
 won't be on the include path

---
 pkgs/test/macos-sierra-shared/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
index e96fdb34c05..690d09414fb 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -53,7 +53,7 @@ let
         EOF
       '';
       buildPhase = ''
-        $CC -std=c++11 main.cxx ${toString (map (x: "-l${x.name}") sillyLibs)} -o asdf
+        $CXX -std=c++11 main.cxx ${toString (map (x: "-l${x.name}") sillyLibs)} -o asdf
       '';
       buildInputs = sillyLibs;
       installPhase = ''

From 57b15422d9e4fa8fb180639ea56717a6fcbff3dd Mon Sep 17 00:00:00 2001
From: derchris <derchris@me.com>
Date: Mon, 31 Jul 2017 22:54:35 +0200
Subject: [PATCH 1296/3246] xtermcontrol: init at 3.3

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 31760c94eb0..e5286fa995e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -136,6 +136,7 @@
   dbrock = "Daniel Brockman <daniel@brockman.se>";
   deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>";
   demin-dmitriy = "Dmitriy Demin <demindf@gmail.com>";
+  derchris = "Christian Gerbrandt <derchris@me.com>";
   DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
   dermetfan = "Robin Stumm <serverkorken@gmail.com>";
   DerTim1 = "Tim Digel <tim.digel@active-group.de>";
diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix
new file mode 100644
index 00000000000..eae5240129a
--- /dev/null
+++ b/pkgs/applications/misc/xtermcontrol/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "3.3";
+  name = "xtermcontrol-${version}";
+
+  src = fetchurl {
+    url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz";
+    sha256 = "1v2c1cnx43apmspga7icssh5ndbhzy5h82y6vm8fda40flq9mxj5";
+  };
+
+  meta = {
+    description = "Enables dynamic control of xterm properties";
+    longDescription = ''
+      Enables dynamic control of xterm properties.
+      It makes it easy to change colors, title, font and geometry of a running xterm, as well as to report the current settings of these properties.
+      Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported.
+      To complete the feature set; xtermcontrol lets advanced users issue any xterm control sequence of their choosing.
+    '';
+    homepage = http://thrysoee.dk/xtermcontrol;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.derchris ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6ed1a6715e..c92b744edb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19224,4 +19224,6 @@ with pkgs;
   undaemonize = callPackage ../tools/system/undaemonize {};
 
   houdini = callPackage ../applications/misc/houdini {};
+
+  xtermcontrol = callPackage ../applications/misc/xtermcontrol {};
 }

From eaf1198f39b3987e0652614b65278641573cdcc9 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 31 Jul 2017 23:27:29 +0200
Subject: [PATCH 1297/3246] calc: 2.12.5.3 -> 2.12.6.1

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

diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index b8ed7ffac3c..ff8a1ff9584 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -12,11 +12,11 @@ in
 stdenv.mkDerivation rec {
 
   name = "calc-${version}";
-  version = "2.12.5.3";
+  version = "2.12.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/calc/${name}.tar.bz2";
-    sha256 = "14mnz6smhi3a0rgmwvddk9w3vdisi8khq67i8nqsl47vgs8n1kqg";
+    url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2";
+    sha256 = "1vy4jmhmpl3gzgpkpv0kqwjv8hn1cza8cn1g8c69gq3inqvr4fvd";
   };
 
   buildInputs = [ makeWrapper readline ncurses utillinux ];

From efb2b32bd73f362688436b9d6f38b89cf4b67698 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 00:10:16 +0200
Subject: [PATCH 1298/3246] gitAndTools.diff-so-fancy: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index b613898faaa..5878f3a8b74 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "diff-so-fancy-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "so-fancy";
     repo = "diff-so-fancy";
     rev = "v${version}";
-    sha256 = "0wd9npcfp41ggvddrbif8qr25pm7jlzxzd3xn5rlq0y0frwx5akj";
+    sha256 = "1hgppp8ngjbjzbi96529p36hzi0ysdndrh6d6m71gs21am8v4m9r";
   };
 
   # Perl is needed here for patchShebangs

From 5825724247dab11afefd375a2214f498329253ba Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 00:22:12 +0200
Subject: [PATCH 1299/3246] phpPackages.composer: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index c5e3ac0ac55..cec9674c8b5 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -235,11 +235,11 @@ let
 
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
-    version = "1.4.1";
+    version = "1.4.2";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "1g2wsnjcx1ysbw1ps2xwyhgcl8kl3yfzxgwcnh5rigjk6k67glmb";
+      sha256 = "1x467ngxb976ba2r9kqba7jpvm95a0db8nwaa2z14zs7xv1la6bb";
     };
 
     phases = [ "installPhase" ];

From af84611f0c4e205a516682b3a9dcd3d490a08068 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 00:25:40 +0200
Subject: [PATCH 1300/3246] moonlight-embedded: 2.2.3 -> 2.4.2

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

diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 391440f8622..894751571ec 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "moonlight-embedded-${version}";
-  version = "2.2.3";
+  version = "2.4.2";
 
   # fetchgit used to ensure submodules are available
   src = fetchgit {
     url = "git://github.com/irtimmer/moonlight-embedded";
     rev = "refs/tags/v${version}";
-    sha256 = "0m1114dsz44rvq402b4v5ib2cwj2vbasir0l8vi0q5iymwmsvxj4";
+    sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr";
   };
 
   outputs = [ "out" "doc" ];

From fc74a36672a6672c239a4ba8b55b2020728e5038 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 31 Jul 2017 18:45:26 -0400
Subject: [PATCH 1301/3246] alacritty: Don't use xclip from PATH

---
 pkgs/applications/misc/alacritty/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index e84ee7ee16b..6c9f9ee3ab0 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -47,6 +47,11 @@ buildRustPackage rec {
     pkgconfig
   ] ++ rpathLibs;
 
+  patchPhase = ''
+    substituteInPlace copypasta/src/x11.rs \
+      --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
+  '';
+
   installPhase = ''
     mkdir -p $out/bin
     for f in $(find target/release -maxdepth 1 -type f); do

From 9b10fcce2f1e23aefcb129179f8308153ee5a4a0 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@yahoo.com>
Date: Mon, 31 Jul 2017 19:38:16 -0400
Subject: [PATCH 1302/3246] Add myself to CODEOWNERS, and use tab consistently

---
 .github/CODEOWNERS | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 268f2c032ad..d77f064ed55 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,8 +13,11 @@ pkgs/development/interpreters/python/*	@FRidh
 pkgs/development/python-modules/*	@FRidh
 doc/languages-frameworks/python.md	@FRidh
 
-# Darwin-related
-pkgs/stdenv/darwin/*    @copumpkin @LnL7
-pkgs/os-specific/darwin/*   @LnL7
-pkgs/os-specific/darwin/apple-source-releases/* @copumpkin
+# Boostraping and core infra
+pkgs/stdenv/	@Ericson2314
+pkgs/build-support/cc-wrapper/	@Ericson2314
 
+# Darwin-related
+pkgs/stdenv/darwin/*	@copumpkin @LnL7
+pkgs/os-specific/darwin/*	@LnL7
+pkgs/os-specific/darwin/apple-source-releases/*	@copumpkin

From 6ddbe2e34c884792322eecabbb1799fd16d1d79e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 02:03:23 +0200
Subject: [PATCH 1303/3246] p11_kit: 0.23.2 -> 0.23.7

---
 .../development/libraries/p11-kit/default.nix | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 0888fba4eca..53c94ab874c 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,17 +1,25 @@
-{ stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv, libffi, libtasn1 }:
 
 stdenv.mkDerivation rec {
-  name = "p11-kit-0.23.2";
+  name = "p11-kit-${version}";
+  version = "0.23.7";
 
-  src = fetchurl {
-    url = "${meta.homepage}releases/${name}.tar.gz";
-    sha256 = "1w7szm190phlkg7qx05ychlj2dbvkgkhx9gw6dx4d5rw62l6wwms";
+  src = fetchFromGitHub {
+    owner = "p11-glue";
+    repo = "p11-kit";
+    rev = version;
+    sha256 = "1l8sg0g74k2mk0y6vz19hc103dzizxa0h579gdhvxifckglb01hy";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
-  buildInputs = [ pkgconfig libffi libtasn1 libiconv ];
+  nativeBuildInputs = [ autoreconfHook which pkgconfig ];
+  buildInputs = [ libffi libtasn1 libiconv ];
+
+  autoreconfPhase = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
 
   configureFlags = [
     "--sysconfdir=/etc"

From f3a54b014ce9cc3bbf2a65ab88291cbc3e3701b6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 31 Jul 2017 19:58:38 -0500
Subject: [PATCH 1304/3246] otfcc: init at 0.8.6

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

diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix
new file mode 100644
index 00000000000..ac64978bdd1
--- /dev/null
+++ b/pkgs/tools/misc/otfcc/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, premake5 }:
+
+let version = "0.8.6"; in
+
+let
+  arch =
+    {
+      "i686-linux" = "x86";
+      "x86_64-linux" = "x64";
+    }.${stdenv.system} or (throw "platform ${stdenv.system} is not supported");
+in
+
+stdenv.mkDerivation {
+  name = "otfcc-${version}";
+  src = fetchurl {
+    url = "https://github.com/caryll/otfcc/archive/v${version}.tar.gz";
+    sha256 = "0kap52bzrn21fmph8j2pc71f80f38ak1p2fcczzmrh0hb1r9c8dd";
+  };
+  nativeBuildInputs = [ premake5 ];
+  configurePhase = ''
+    runHook preConfigure
+    premake5 gmake
+    runHook postConfigure
+  '';
+  buildPhase = ''
+    runHook preBuild
+    cd build/gmake
+    make config=release_${arch}
+    cd ../..
+    runHook postBuild
+  '';
+  installPhase = ''
+    runHook preInstall
+    install -d "$out/lib"
+    install "bin/release-${arch}/"lib* "$out/lib"
+    install -d "$out/bin"
+    install "bin/release-${arch}/"otfcc* "$out/bin"
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c92b744edb7..97cd763bb22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3584,6 +3584,8 @@ with pkgs;
 
   ostree = callPackage ../tools/misc/ostree { };
 
+  otfcc = callPackage ../tools/misc/otfcc {};
+
   otpw = callPackage ../os-specific/linux/otpw { };
 
   owncloud = owncloud70;

From 14e05c30e85f0e8bd8f51b49a2ea622df7172ec2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 31 Jul 2017 21:02:20 -0400
Subject: [PATCH 1305/3246] macos-sierra-shared: Make live code and add to
 nascent Darwin channel

Also add appropriate `meta.platforms = ...` to each derivation.
---
 pkgs/test/macos-sierra-shared/default.nix | 27 +++++++++++++++++++----
 pkgs/top-level/all-packages.nix           |  5 +++++
 pkgs/top-level/release.nix                |  1 +
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
index 690d09414fb..51e8ae53736 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -1,4 +1,4 @@
-{ lib, clangStdenv, clang-sierraHack-stdenv }:
+{ lib, clangStdenv, clang-sierraHack-stdenv, stdenvNoCC }:
 
 let
   makeBigExe = stdenv: prefix: rec {
@@ -22,6 +22,7 @@ let
         mkdir -p "$out/lib"
         mv lib${name}.dylib "$out/lib"
       '';
+      meta.platforms = lib.platforms.darwin;
     }) count;
 
     finalExe = stdenv.mkDerivation rec {
@@ -53,18 +54,36 @@ let
         EOF
       '';
       buildPhase = ''
-        $CXX -std=c++11 main.cxx ${toString (map (x: "-l${x.name}") sillyLibs)} -o asdf
+        $CXX -std=c++11 main.cxx ${toString (map (x: "-l${x.name}") sillyLibs)} -o ${prefix}-asdf
       '';
       buildInputs = sillyLibs;
       installPhase = ''
         mkdir -p "$out/bin"
-        mv asdf "$out/bin"
+        mv ${prefix}-asdf "$out/bin"
       '';
+      meta.platforms = lib.platforms.darwin;
     };
 
   };
 
-in {
   good = makeBigExe clang-sierraHack-stdenv "good";
+
   bad  = makeBigExe clangStdenv             "bad";
+
+in stdenvNoCC.mkDerivation {
+  name = "macos-sierra-shared-test";
+  buildInputs = [ good.finalExe bad.finalExe ];
+  # TODO(@Ericson2314): Be impure or require exact MacOS version of builder?
+  buildCommand = ''
+    if bad-asdf
+    then echo "bad-asdf can succeed on non-sierra, OK" >&2
+    else echo "bad-asdf should fail on sierra, OK" >&2
+    fi
+
+    # Must succeed on all supported MacOS versions
+    good-asdf
+
+    touch $out
+  '';
+  meta.platforms = lib.platforms.darwin;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85573b10321..a1d83e31458 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19223,4 +19223,9 @@ with pkgs;
   undaemonize = callPackage ../tools/system/undaemonize {};
 
   houdini = callPackage ../applications/misc/houdini {};
+
+  # No `recurseIntoAttrs` because there's no need to nix-env these.
+  tests = {
+    macOSSierraShared = callPackage ../test/macos-sierra-shared {};
+  };
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index be57b40fca6..0c7c67a0d03 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -42,6 +42,7 @@ let
               jobs.python.x86_64-darwin
               jobs.rustc.x86_64-darwin
               jobs.go.x86_64-darwin
+              jobs.tests.macOSSierraShared
             ];
         };
 

From 9719e434946fb53dff1d0ffbbdc490b8af9e6964 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 00:31:12 +0200
Subject: [PATCH 1306/3246] jool: 3.5.3 -> 3.5.4

---
 pkgs/os-specific/linux/jool/cli.nix     |  6 +++---
 pkgs/os-specific/linux/jool/default.nix |  6 +++---
 pkgs/os-specific/linux/jool/source.nix  | 12 +++++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix
index c8775eee48c..6b79045ac67 100644
--- a/pkgs/os-specific/linux/jool/cli.nix
+++ b/pkgs/os-specific/linux/jool/cli.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchzip, autoreconfHook, pkgconfig, libnl }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl }:
 
 let
-  sourceAttrs = (import ./source.nix) { inherit fetchzip; };
+  sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = sourceAttrs.src;
 
-  sourceRoot = "Jool-${sourceAttrs.version}.zip/usr";
+  sourceRoot = "Jool-v${sourceAttrs.version}-src/usr";
 
   buildInputs = [ autoreconfHook pkgconfig libnl ];
 
diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix
index 824bc3f9a18..37dd4d727ec 100644
--- a/pkgs/os-specific/linux/jool/default.nix
+++ b/pkgs/os-specific/linux/jool/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchzip, kernel }:
+{ stdenv, fetchFromGitHub, kernel }:
 
-assert stdenv.lib.versionOlder kernel.version "4.11";
+assert stdenv.lib.versionOlder kernel.version "4.13";
 
 let
-  sourceAttrs = (import ./source.nix) { inherit fetchzip; };
+  sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index 2de2aeeff8f..ace103a92f9 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,9 +1,11 @@
-{ fetchzip }:
+{ fetchFromGitHub }:
 
 rec {
-  version = "3.5.3";
-  src = fetchzip {
-    url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip";
-    sha256 = "1dh8qcb3grjpsk7j5d8p5dncrh4fljkrfd9b8sxd2c3kirczckmp";
+  version = "3.5.4";
+  src = fetchFromGitHub {
+    owner = "NICMx";
+    repo = "Jool";
+    rev = "v${version}";
+    sha256 = "09b9zcxgmy59jb778lkdyslx777bpsl216kkivw0zwfwsgd4pyz5";
   };
 }

From d40f993073612d5f7c4fb7d51ec9ccb21ab44982 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 00:32:15 +0200
Subject: [PATCH 1307/3246] fail2ban: 0.9.6 -> 0.9.7

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

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index e7a052c90f1..31f2262cd9f 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, python, pythonPackages, gamin }:
 
-let version = "0.9.6"; in
+let version = "0.9.7"; in
 
 pythonPackages.buildPythonApplication {
   name = "fail2ban-${version}";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication {
     owner  = "fail2ban";
     repo   = "fail2ban";
     rev    = version;
-    sha256 = "1a75xjjqhn98zd9i51k15vjvcy0ql0gmcv9xf8pbd0bpvblgdah8";
+    sha256 = "07l5pz93mz1r3g59xiyyznlpjfpv2zgvh3h9w0cbn79v7njim8kb";
   };
 
   propagatedBuildInputs = [ gamin ]

From 694dbaeeb5e96afd7bbd6ff710805082524e6f82 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 00:52:22 +0200
Subject: [PATCH 1308/3246] libite: 1.8.3 -> 1.9.2

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

diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 72b4469058c..479deb7593d 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libite-${version}";
-  version = "1.8.3";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libite";
     rev = "v${version}";
-    sha256 = "040idgbjqr239rkd68rqzwhylryiaa0z3qkwj2l2mlscv0aq8v0j";
+    sha256 = "1y2iylsgs8am5br7an0xkrgshq6k2zkk8jfsaa7vdw2dh3qvc9pr";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 46a4fa9274669d5556242aac12afecaffc1fc2f8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 00:52:50 +0200
Subject: [PATCH 1309/3246] inadyn: 2.0 -> 2.1, fix build with libite 1.9

---
 pkgs/tools/networking/inadyn/default.nix      |  15 +-
 .../inadyn/remove-unused-macro.patch          | 242 ++++++++++++++++++
 2 files changed, 254 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/networking/inadyn/remove-unused-macro.patch

diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 4f9e8b045b0..3495d2d56f0 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -1,16 +1,25 @@
-{ stdenv, fetchurl, gnutls, autoreconfHook, pkgconfig, libite, libconfuse }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig
+, gnutls, libite, libconfuse }:
 
 let
-  version = "2.0";
+  version = "2.1";
 in
 stdenv.mkDerivation {
   name = "inadyn-${version}";
 
   src = fetchurl {
     url = "https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz";
-    sha256 = "16nmbxj337vkqkk6f7vx7fa8mczjv6dl3ybaxy16c23h486y0mzh";
+    sha256 = "1b5khr2y5q1x2mn08zrnjf9hsals4y403mhsc1s7016w3my9lqw7";
   };
 
+  patches = [
+    ./remove-unused-macro.patch
+    (fetchpatch {
+      url = "https://github.com/troglobit/inadyn/commit/ed3a7761015441b5d5cacd691b7aa114da048bef.patch";
+      sha256 = "1passghmjd7gmrfcqkfqw9lvg8l22s91nm65ys3n3rylzsgaaq8i";
+     })
+  ];
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ gnutls libite libconfuse ];
 
diff --git a/pkgs/tools/networking/inadyn/remove-unused-macro.patch b/pkgs/tools/networking/inadyn/remove-unused-macro.patch
new file mode 100644
index 00000000000..0ee6a5d7757
--- /dev/null
+++ b/pkgs/tools/networking/inadyn/remove-unused-macro.patch
@@ -0,0 +1,242 @@
+From b5c70461822003238784ff56f4c8eead10cfc2c1 Mon Sep 17 00:00:00 2001
+From: Joachim Nilsson <troglobit@gmail.com>
+Date: Sun, 2 Jul 2017 21:01:33 +0200
+Subject: [PATCH] Remove UNUSED() macro and disable the compiler warning
+ instead
+
+Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
+
+diff --git a/plugins/common.c b/plugins/common.c
+index 55c1ac3..9e7ba7b 100644
+--- a/plugins/common.c
++++ b/plugins/common.c
+@@ -64,7 +64,7 @@ int common_request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+  * DynDNS response validator -- common to many other DDNS providers as well
+  *  'good' or 'nochg' are the good answers,
+  */
+-int common_response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++int common_response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *body = trans->rsp_body;
+ 
+diff --git a/plugins/ddnss.c b/plugins/ddnss.c
+index fea41e9..5184db0 100644
+--- a/plugins/ddnss.c
++++ b/plugins/ddnss.c
+@@ -60,7 +60,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/dhis.c b/plugins/dhis.c
+index 11edd2c..b6e8e0b 100644
+--- a/plugins/dhis.c
++++ b/plugins/dhis.c
+@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias)
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *rsp = trans->rsp_body;
+ 
+diff --git a/plugins/dnsexit.c b/plugins/dnsexit.c
+index c456f38..4bf0a08 100644
+--- a/plugins/dnsexit.c
++++ b/plugins/dnsexit.c
+@@ -62,7 +62,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	int   code = -1;
+ 	char *tmp;
+diff --git a/plugins/dtdns.c b/plugins/dtdns.c
+index e7996fe..38f0977 100644
+--- a/plugins/dtdns.c
++++ b/plugins/dtdns.c
+@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/duckdns.c b/plugins/duckdns.c
+index 9ca46ae..66d9c25 100755
+--- a/plugins/duckdns.c
++++ b/plugins/duckdns.c
+@@ -78,7 +78,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/duiadns.c b/plugins/duiadns.c
+index 7c4ced3..7dc09c9 100644
+--- a/plugins/duiadns.c
++++ b/plugins/duiadns.c
+@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/dynv6-ipv4.c b/plugins/dynv6-ipv4.c
+index 5dab9f1..f37215a 100644
+--- a/plugins/dynv6-ipv4.c
++++ b/plugins/dynv6-ipv4.c
+@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/dynv6.c b/plugins/dynv6.c
+index 84b7c40..03b1b4c 100644
+--- a/plugins/dynv6.c
++++ b/plugins/dynv6.c
+@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/easydns.c b/plugins/easydns.c
+index c9d8059..7718c56 100644
+--- a/plugins/easydns.c
++++ b/plugins/easydns.c
+@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ /*
+  * NOERROR is the OK code here
+  */
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/freedns.c b/plugins/freedns.c
+index 2c56ca4..2a2991f 100644
+--- a/plugins/freedns.c
++++ b/plugins/freedns.c
+@@ -134,7 +134,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+     fail blabla and n.n.n.n
+     are the good answers. We search our own IP address in response and that's enough.
+ */
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias)
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/generic.c b/plugins/generic.c
+index 8f23de4..3cee1f2 100644
+--- a/plugins/generic.c
++++ b/plugins/generic.c
+@@ -238,7 +238,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 	return ret;
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 	size_t i;
+diff --git a/plugins/giradns.c b/plugins/giradns.c
+index 2d6043e..ea19f77 100644
+--- a/plugins/giradns.c
++++ b/plugins/giradns.c
+@@ -57,7 +57,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->server_name.name, info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/sitelutions.c b/plugins/sitelutions.c
+index c484a62..611c865 100644
+--- a/plugins/sitelutions.c
++++ b/plugins/sitelutions.c
+@@ -64,7 +64,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ 			info->user_agent);
+ }
+ 
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/tunnelbroker.c b/plugins/tunnelbroker.c
+index 1f58990..17eb2b9 100644
+--- a/plugins/tunnelbroker.c
++++ b/plugins/tunnelbroker.c
+@@ -77,7 +77,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+  * Hurricate Electric IPv6 tunnelbroker specific response validator
+  * Own IP address and 'already in use' are the good answers.
+  */
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias)
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *resp = trans->rsp_body;
+ 
+diff --git a/plugins/tzo.c b/plugins/tzo.c
+index 0a36e87..eba3da4 100644
+--- a/plugins/tzo.c
++++ b/plugins/tzo.c
+@@ -66,7 +66,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+ }
+ 
+ /* TZO specific response validator. */
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	int code = -1;
+ 
+diff --git a/plugins/zerigo.c b/plugins/zerigo.c
+index 4fb29ab..cc71348 100644
+--- a/plugins/zerigo.c
++++ b/plugins/zerigo.c
+@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+  * Server error
+  *  Status: 5xx
+  */
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	char *ptr, *rsp = trans->rsp_body;
+ 
+diff --git a/plugins/zoneedit.c b/plugins/zoneedit.c
+index 7178b9c..464ed66 100644
+--- a/plugins/zoneedit.c
++++ b/plugins/zoneedit.c
+@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
+  *  CODE=200, 201
+  *  CODE=707, for duplicated updates
+  */
+-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
+ {
+ 	int code = -1;
+ 

From aaee055daef3dafa91c23ab4bc6c9ecb321ce45c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 00:57:08 +0200
Subject: [PATCH 1310/3246] lxd: 2.14 -> 2.16

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

diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 1aec4209b4d..64ec5e9b418 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "lxd-${version}";
-  version = "2.14";
+  version = "2.16";
   rev = "lxd-${version}";
 
   goPackagePath = "github.com/lxc/lxd";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "lxc";
     repo = "lxd";
-    sha256 = "1jy60lb2m0497bnjj09qvflsj2rb0jjmlb8pm1xn5g4lpzibszjm";
+    sha256 = "0i2mq9m8k9kznwz1i0xb48plp1ffpzvbdrvqvagis4sm17yab3fn";
   };
 
   goDeps = ./deps.nix;

From 253a132f6c43a811d6e0cecca70fd836bbb51008 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 01:01:11 +0200
Subject: [PATCH 1311/3246] mbedtls_1_3: 1.3.19 -> 1.3.20

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

diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix
index e89fabb9fb3..764d50190b9 100644
--- a/pkgs/development/libraries/mbedtls/1.3.nix
+++ b/pkgs/development/libraries/mbedtls/1.3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-1.3.19";
+  name = "mbedtls-1.3.20";
 
   src = fetchurl {
     url = "https://tls.mbed.org/download/${name}-gpl.tgz";
-    sha256 = "03mhlh8s2378ph23m1173i7wkhrs5i6d03mk5wa7a1d3qn24jrar";
+    sha256 = "0vv69c1c5rr7jcwwivx06fbfixgig90pjznh2c6cn841hgwm9z00";
   };
 
   nativeBuildInputs = [ perl ];

From fac48cca7d1418b6065f0a37e4ec5e4574f97fdc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 01:01:31 +0200
Subject: [PATCH 1312/3246] mbedtls: 2.4.2 -> 2.5.1

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

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index c5eab3f74b5..b4500c8f6d6 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-2.4.2";
+  name = "mbedtls-2.5.1";
 
   src = fetchurl {
     url = "https://tls.mbed.org/download/${name}-gpl.tgz";
-    sha256 = "17r9qs585gqghcf5yavb1cnvsigl0f8r0k8rklr5a855hrajs7yh";
+    sha256 = "1qny1amp54vn84wp0aaj8zvblad60zcp73pdwgnykn7h0q004bri";
   };
 
   nativeBuildInputs = [ perl ];

From c217f48c358db05bd0ad7893e8e3ebabe4784cbe Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 01:11:36 +0200
Subject: [PATCH 1313/3246] searx: 0.11.0 -> 0.12.0

---
 nixos/modules/services/networking/searx.nix |  4 +--
 pkgs/servers/web-apps/searx/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 pkgs/top-level/python-packages.nix          | 36 ---------------------
 4 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/servers/web-apps/searx/default.nix

diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index e0eef9ed96f..c7a128ae212 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -33,8 +33,8 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.pythonPackages.searx;
-        defaultText = "pkgs.pythonPackages.searx";
+        default = pkgs.searx;
+        defaultText = "pkgs.searx";
         description = "searx package to use.";
       };
 
diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix
new file mode 100644
index 00000000000..551f3a015a1
--- /dev/null
+++ b/pkgs/servers/web-apps/searx/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "searx-${version}";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "asciimoo";
+    repo = "searx";
+    rev = "v${version}";
+    sha256 = "196lk8dpv8fsjgmwlqik6j6rabvfid41fir6lzqy03hv7ydcw1k0";
+  };
+
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace 'certifi==2017.1.23' 'certifi' \
+      --replace 'lxml==3.7.3' 'lxml' \
+      --replace 'pyopenssl==16.2.0' 'pyopenssl' \
+      --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0'
+  '';
+
+  propagatedBuildInputs = with pythonPackages; [
+    pyyaml lxml grequests flaskbabel flask requests
+    gevent speaklater Babel pytz dateutil pygments
+    pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/asciimoo/searx;
+    description = "A privacy-respecting, hackable metasearch engine";
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ matejc fpletz profpatsch ];
+  };
+ }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97cd763bb22..613de47709a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11580,6 +11580,8 @@ with pkgs;
 
   tt-rss = callPackage ../servers/tt-rss { };
 
+  searx = callPackages ../servers/web-apps/searx { };
+
   selfoss = callPackage ../servers/web-apps/selfoss { };
 
   shaarli = callPackage ../servers/web-apps/shaarli { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ae21516f7d..3ae2791beca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26379,42 +26379,6 @@ EOF
     };
   };
 
-  searx = buildPythonPackage rec {
-    name = "searx-${version}";
-    version = "0.11.0";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "asciimoo";
-      repo = "searx";
-      rev = "v${version}";
-      sha256 = "1m6q7yd45lfk19yp30x1jmisff6npa1y348wqc9ixa3ywvb28ky8";
-    };
-
-    postPatch = ''
-      substituteInPlace requirements.txt \
-        --replace 'certifi==2016.9.26' 'certifi' \
-        --replace 'pyyaml==3.11' 'pyyaml' \
-        --replace 'lxml==3.7.1' 'lxml' \
-        --replace 'pyopenssl==16.2.0' 'pyopenssl' \
-        --replace 'requests[socks]==2.12.4' 'requests[socks]' \
-        --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \
-        --replace 'python-dateutil==2.5.3' 'python-dateutil>=2.5,<3.0'
-    '';
-
-    propagatedBuildInputs = with self; [
-      pyyaml lxml grequests flaskbabel flask requests
-      gevent speaklater Babel pytz dateutil pygments
-      pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
-    ];
-
-    meta = {
-      homepage = https://github.com/asciimoo/searx;
-      description = "A privacy-respecting, hackable metasearch engine";
-      license = licenses.agpl3Plus;
-      maintainers = with maintainers; [ matejc fpletz profpatsch ];
-    };
-  };
-
   rpdb = buildPythonPackage rec {
     name = "rpdb-0.1.5";
 

From 1c5ab2f639e9d30f663f759f193c57ea58ac9038 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 06:34:56 +0200
Subject: [PATCH 1314/3246] avahi: 0.6.12 -> 0.7

---
 pkgs/development/libraries/avahi/default.nix              | 4 ++--
 .../libraries/avahi/no-mkdir-localstatedir.patch          | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 69f86e020c7..098378701d5 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -8,11 +8,11 @@ assert qt4Support -> qt4 != null;
 
 stdenv.mkDerivation rec {
   name = "avahi-${version}";
-  version = "0.6.32";
+  version = "0.7";
 
   src = fetchurl {
     url = "https://github.com/lathiat/avahi/releases/download/v${version}/avahi-${version}.tar.gz";
-    sha256 = "0m5l3ny9i2z1l27y4wm731c0zdkmfn6l1szbajx0ljjiblc92jfm";
+    sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap";
   };
 
   patches = [ ./no-mkdir-localstatedir.patch ];
diff --git a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
index a8a1878cc90..72965c9f028 100644
--- a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
+++ b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
@@ -1,12 +1,12 @@
 Don't "mkdir $(localstatedir)" since we can't do it (/var).
 
---- avahi-0.6.27/avahi-daemon/Makefile.in	2010-07-13 05:06:35.000000000 +0200
-+++ avahi-0.6.27/avahi-daemon/Makefile.in	2010-07-13 18:03:45.000000000 +0200
-@@ -1554,7 +1554,6 @@ xmllint:
+--- a/avahi-daemon/Makefile.in
++++ b/avahi-daemon/Makefile.in
+@@ -1625,7 +1625,6 @@ xmllint:
  	done
  
  install-data-local:
--	test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run"
+-	test -z "$(avahi_runtime_dir)" || $(MKDIR_P) "$(DESTDIR)$(avahi_runtime_dir)"
  
  update-systemd:
  	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c

From 523f343084bcf6a72aeaf821114cf0401a028488 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 01:32:29 +0200
Subject: [PATCH 1315/3246] pcsclite: 1.8.21 -> 1.8.22

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

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index e3aaca2e5b2..74bb5cc5819 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "pcsclite-${version}";
-  version = "1.8.21";
+  version = "1.8.22";
 
   src = fetchurl {
     # This URL changes in unpredictable ways, so it is not sensible
     # to put a version variable in there.
-    url = "https://alioth.debian.org/frs/download.php/file/4216/pcsc-lite-1.8.21.tar.bz2";
-    sha256 = "1b8kwl81f6s3y7qh68ahr8sp8a0w6m464v9b3s4zxq2cgpmnaczy";
+    url = "https://alioth.debian.org/frs/download.php/file/4225/pcsc-lite-1.8.22.tar.bz2";
+    sha256 = "01flkdyqs7kr6c63dv2qg8dwir3v9jlr9rzlw7vafrivxmhqydba";
   };
 
   patches = [ ./no-dropdir-literals.patch ];

From f3646678b9dee2af6f0440e0504b261dc7c161ed Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 01:32:59 +0200
Subject: [PATCH 1316/3246] urh: 1.5.5 -> 1.7.1

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

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index 9015bb9956b..faf373092d5 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "1.5.5";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "1f7hz2zs2dx3v6hpdyz7wyyq1xf641jhpljyhvmjr4zg5m035isa";
+    sha256 = "00l1zs3qw89z1hlylprzrpf6nf7h22h0nw43h97gv775vaqqgczv";
   };
 
   buildInputs = [ hackrf rtl-sdr ];

From 727ec59343614919c429270f5edd723ea2c62db3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 01:41:47 +0200
Subject: [PATCH 1317/3246] zziplib: 0.13.58 -> 0.13.66

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

diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 20070d8f717..98215aa0c74 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -1,11 +1,12 @@
 { fetchurl, stdenv, perl, python2, zip, xmlto, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "zziplib-0.13.58";
+  name = "zziplib-${version}";
+  version = "0.13.66";
 
   src = fetchurl {
-    url = "mirror://sourceforge/zziplib/${name}.tar.bz2";
-    sha256 = "13j9f6i8rx0qd5m96iwrcha78h34qpfk5qzi7cv098pms6gq022m";
+    url = "mirror://sourceforge/zziplib/zziplib13/${version}/${name}.tar.gz";
+    sha256 = "0zdx0s19slzv79xplnr6jx0xjb01dd71jzpscf6vlj6k9ry8rcar";
   };
 
   patchPhase = ''

From e5e556f19a3690999ed8418903913630322db07f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 01:50:48 +0200
Subject: [PATCH 1318/3246] irqbalance: 1.1.0 -> 1.2.0

---
 pkgs/os-specific/linux/irqbalance/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix
index 7c394753902..26cedf41a5a 100644
--- a/pkgs/os-specific/linux/irqbalance/default.nix
+++ b/pkgs/os-specific/linux/irqbalance/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig}:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }:
 
 stdenv.mkDerivation rec {
-  name = "irqbalance-1.1.0";
+  name = "irqbalance-${version}";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "irqbalance";
     repo = "irqbalance";
-    rev = "a23de3c455b88060620d102f6946b1d8be9e2680";
-    sha256 = "06yq5k5v9wiwajqcjkbkk46g212qx78x323bygnyqshc5s25mp2x";
+    rev = "v${version}";
+    sha256 = "1xznxjbjzg6sds3fymdq9rk3g4cgq7xj7rz3dwbqqjqvd3k2nxw6";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ glib ncurses libcap_ng ];
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  LDFLAGS = "-lncurses";
 
   meta = {
     homepage = https://github.com/Irqbalance/irqbalance;

From 8a08ee81abfb0aa79770e66a2545f05e31d08b33 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 01:51:12 +0200
Subject: [PATCH 1319/3246] zsh-completions: 0.25.0 -> 0.26.0

---
 pkgs/shells/zsh-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh-completions/default.nix
index a1f70822725..d2096ef811d 100644
--- a/pkgs/shells/zsh-completions/default.nix
+++ b/pkgs/shells/zsh-completions/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "zsh-completions-${version}";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-completions";
     rev = "${version}";
-    sha256 = "0hc56y0fvshzs05acbzxf4q37vqsk4q3zp4c7smh175v56wigy94";
+    sha256 = "16yhwf42a11v8bhnfb7nda0svxmglzph3c0cknvf8p5m6mkqj9s2";
   };
 
   installPhase= ''

From 3cdacdca2e5f18ed7ee2efbeb9f1626e1d828d37 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 01:51:40 +0200
Subject: [PATCH 1320/3246] zerofree: 1.0.4 -> 1.1.0

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

diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix
index 994777680db..593715b2068 100644
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/pkgs/tools/filesystems/zerofree/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "zerofree-${version}";
-  version = "1.0.4";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "http://frippery.org/uml/${name}.tgz";
-    sha256 = "0f38mvn3wfacapayl54q04qlz4in417pfm6gapgm7dhyjs9y5yd7";
+    sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf";
   };
 
   buildInputs = [ e2fsprogs ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 '';
 
   meta = {
-    homepage = http://frippery.org/uml/index.html;
+    homepage = https://frippery.org/uml/;
     description = "Zero free blocks from ext2, ext3 and ext4 file-systems";
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.theuni ];

From 426218231bbaee3556cfcef81c8abdff30784f72 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 02:13:33 +0200
Subject: [PATCH 1321/3246] openh264: 1.5.0 -> 1.7.0

---
 pkgs/development/libraries/openh264/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index 8232af3e789..0a0b4c8d549 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, nasm }:
+{ stdenv, fetchFromGitHub, nasm }:
 
 stdenv.mkDerivation rec {
-  name = "openh264-1.5.0";
+  name = "openh264-${version}";
+  version = "1.7.0";
 
-  src = fetchurl {
-    url = "https://github.com/cisco/openh264/archive/v1.5.0.tar.gz";
-    sha256 = "1d97dh5hzmy46jamfw03flvcz8md1hxp6y5n0b787h8ks7apn1wq";
+  src = fetchFromGitHub {
+    owner = "cisco";
+    repo = "openh264";
+    rev = "v${version}";
+    sha256 = "0ywrqni05bh925ws5fmd24bm6h9n6z2wp1q19v545v06biiwr46a";
   };
 
   buildInputs = [ nasm ];

From f520031ee6661e11e270198d2cd2d9950cfad5ba Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 02:13:54 +0200
Subject: [PATCH 1322/3246] packer: 1.0.0 -> 1.0.3

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

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index bcf08712ccb..40501a78b1e 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   name = "packer-${version}";
-  version = "1.0.0";
+  version = "1.0.3";
 
   goPackagePath = "github.com/mitchellh/packer";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "mitchellh";
     repo = "packer";
     rev = "v${version}";
-    sha256 = "16hdh3iwvdg1jk3pswa9r9lq4qkhds1lrqwl19vd1v2yz2r76kzi";
+    sha256 = "1bd0rv93pxlv58c0x1d4dsjq4pg5qwrm2p7qw83pca7izlncgvfr";
   };
 
   meta = with stdenv.lib; {

From 1a4ce79a0d3ba4669800cb1ecdf8fb6c94b11649 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 02:14:17 +0200
Subject: [PATCH 1323/3246] pam_ldap: 183 -> 186

---
 pkgs/os-specific/linux/pam_ldap/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix
index 1eee7dbdac2..e7f2c8278e1 100644
--- a/pkgs/os-specific/linux/pam_ldap/default.nix
+++ b/pkgs/os-specific/linux/pam_ldap/default.nix
@@ -1,18 +1,23 @@
-{stdenv, fetchurl, pam, openldap}:
-   
+{ stdenv, fetchurl, pam, openldap, perl }:
+
 stdenv.mkDerivation rec {
-  name = "pam_ldap-183";
-   
+  name = "pam_ldap-186";
+
   src = fetchurl {
     url = "http://www.padl.com/download/${name}.tar.gz";
-    sha256 = "1l0mlwvas9dnsfcgbszbzq3bzhdkibn1c3x15fczq3i82faf5g5a";
+    sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8";
   };
 
+  postPatch = ''
+    patchShebangs ./vers_string
+  '';
+
   preInstall = "
     substituteInPlace Makefile --replace '-o root -g root' ''
   ";
 
-  buildInputs = [pam openldap];
+  nativeBuildInputs = [ perl ];
+  buildInputs = [ pam openldap ];
 
   meta = {
     homepage = http://www.padl.com/OSS/pam_ldap.html;

From 1ece82dc95f14b611e575452e34619717bb02cc3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 02:14:45 +0200
Subject: [PATCH 1324/3246] openntpd: 6.0p1 -> 6.2p1

---
 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 6f3aab3082f..3ead2ef0f21 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "openntpd-${version}";
-  version = "6.0p1";
+  version = "6.2p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenNTPD/${name}.tar.gz";
-    sha256 = "1s3plmxmybwpfrimq6sc54wxnn6ca7rb2g5k2bdjm4c88w4q1axi";
+    sha256 = "1g6hi03ylhv47sbar3xxgsrar8schqfwn4glckh6m6lni67ndq85";
   };
 
   configureFlags = [

From fead9a62eb020b456046204790f96a7e710ad005 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 02:24:22 +0200
Subject: [PATCH 1325/3246] pdfgrep: 1.3.1 -> 2.0.1

---
 pkgs/tools/typesetting/pdfgrep/default.nix | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index 6e5f98d4a71..0c288ca02cc 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -1,26 +1,28 @@
-{ fetchurl, stdenv, pkgconfig, poppler, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }:
 
 stdenv.mkDerivation rec {
   name = "pdfgrep-${version}";
-  version = "1.3.1";
+  version = "2.0.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/pdfgrep/${version}/${name}.tar.gz";
-    sha256 = "6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437";
+    url = "https://pdfgrep.org/download/${name}.tar.gz";
+    sha256 = "07llkrkcfjwd3ybai9ad10ybhr0biffcplmy7lw4fb87nd2dfw03";
   };
 
-  buildInputs = [ pkgconfig poppler makeWrapper ];
-
-  patchPhase = ''
-    sed -i -e "s%cpp/poppler-document.h%poppler/cpp/poppler-document.h%" pdfgrep.cc
-    sed -i -e "s%cpp/poppler-page.h%poppler/cpp/poppler-page.h%" pdfgrep.cc
+  postPatch = ''
+    for i in ./src/search.h ./src/pdfgrep.cc ./src/search.cc; do
+      substituteInPlace $i --replace '<cpp/' '<'
+    done
   '';
 
+  nativeBuildInputs = [ pkgconfig asciidoc ];
+  buildInputs = [ poppler libgcrypt pcre ];
+
   meta = {
-    description = "A tool to search text in PDF files";
-    homepage = http://pdfgrep.sourceforge.net/;
-    license = stdenv.lib.licenses.free;
-    maintainers = with stdenv.lib.maintainers; [qknight];
+    description = "Commandline utility to search text in PDF files";
+    homepage = https://pdfgrep.org/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ qknight fpletz ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From 9dcc09c289d1954e449ae12318e0eb64b085da16 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 06:35:14 +0200
Subject: [PATCH 1326/3246] apktool: 2.2.2 -> 2.2.4

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

diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 4f87bcd1589..555cb313a62 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "apktool-${version}";
-  version = "2.2.2";
+  version = "2.2.4";
 
   src = fetchurl {
     url = "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar";
-    sha256 = "1a94jw0ml08xdwls1q9v5p1zak5qrbw2zyychnm5vch8znyws411";
+    sha256 = "0l9jxa393a52iiawh93v31vr1y6z2bwg6dqhpivqd6y0vip1h7qz";
   };
 
   phases = [ "installPhase" ];

From 481b4a77baef43ead163c315b76f7ac017e859a3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:27:55 +0200
Subject: [PATCH 1327/3246] vnstat: 1.15 -> 1.17

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

diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index 1c78f926fe7..c3424e2fc77 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "vnstat-${version}";
-  version = "1.15";
+  version = "1.17";
 
   src = fetchurl {
-    sha256 = "0fdw3nbrfm4acv48r0934ls6ld5lwkff3gyym2c72qlbm9dlp0f3";
+    sha256 = "0wbrmb4zapblb3b61180ryqy6i0c7gcacqz0y3r1x7nafqswbr0q";
     url = "http://humdi.net/vnstat/${name}.tar.gz";
   };
 

From a584fe1b7695730c61dc817e4d829bd6ce8788a3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:28:22 +0200
Subject: [PATCH 1328/3246] x264: 20160615 -> 20170731

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

diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index bf32969836c..06ed123c735 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, yasm, enable10bit ? false}:
 
 stdenv.mkDerivation rec {
-  version = "20160615-2245";
+  version = "20170731-2245";
   name = "x264-${version}";
 
   src = fetchurl {
     url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2";
-    sha256 = "0w5l77gm8bsmafzimzyc5s27kcw79r6nai3bpccqy0spyxhjsdc2";
+    sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z";
   };
 
   patchPhase = ''

From 38b404bd27e15f4d960a64569b1482ee3cc94591 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:28:43 +0200
Subject: [PATCH 1329/3246] x265: 1.9 -> 2.5

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

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index c485cb6a05a..29d7ddf1fdc 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -16,14 +16,14 @@ in
 
 stdenv.mkDerivation rec {
   name = "x265-${version}";
-  version = "1.9";
+  version = "2.5";
 
   src = fetchurl {
     urls = [
       "http://get.videolan.org/x265/x265_${version}.tar.gz"
       "https://github.com/videolan/x265/archive/${version}.tar.gz"
     ];
-    sha256 = "1j0mbcf10aj6zi1nxql45f9817jd2ndcpd7x123sjmyr7q9m8iiy";
+    sha256 = "05rxbnfcc8yl05q3xqkl1kk90k7zn5ih305r46dxnzjaa2djalrf";
   };
 
   enableParallelBuilding = true;

From 6b3760d9f20fe891acd8c38d1fb9a8553ee65e28 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:29:06 +0200
Subject: [PATCH 1330/3246] asterisk: 14.4.0 -> 14.6.0

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

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index e6102c84f13..8a25188d595 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -97,8 +97,8 @@ in
   };
 
   asterisk-stable = common {
-    version = "14.4.0";
-    sha256 = "095slnhl74hs1c36rgg378azan9zwgryp8him7py4am60lbk3n3w";
+    version = "14.6.0";
+    sha256 = "1d3jjdapfv169d8yhfi92j75iwk9726brv1rjjy288d47jn3sm26";
     externals = {
       "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26;
       "addons/mp3" = mp3-202;

From 93ef0b385210b9c38e746ec8855430143f606f51 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:29:27 +0200
Subject: [PATCH 1331/3246] brasero: 3.12.1 -> 3.12.2

---
 pkgs/tools/cd-dvd/brasero/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index d033371cbcd..d62f2c25623 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -6,7 +6,7 @@
 
 let
   major = "3.12";
-  minor = "1";
+  minor = "2";
   binpath = lib.makeBinPath [ dvdauthor vcdimager ];
 
 in stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz";
-    sha256 = "09vi2hyhl0bz7imv3ky6h7x5m3d546n968wcghydwrkvwm9ylpls";
+    sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8";
   };
 
   nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];

From 44d28369a34f05361d49764518929f014ee00790 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:29:49 +0200
Subject: [PATCH 1332/3246] speedtest-cli: 1.0.4 -> 1.0.6

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

diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 8ccc924d9f6..592a173df7e 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "speedtest-cli-${version}";
-  version = "1.0.4";
-  
+  version = "1.0.6";
+
   src = fetchFromGitHub {
     owner = "sivel";
     repo = "speedtest-cli";
     rev = "v${version}";
-    sha256 = "13i7bvhvwv8h2lxnz9pfxq6jv915lb948d6xjiy5p7rqbki40ng2";
+    sha256 = "008a0wymn06h93gdkxwlgxg8039ybdni96i4blhpayj52jkbflnv";
   };
 
   meta = with stdenv.lib; {

From 6d9bdb55fc47b37fba80a983f6cc87831486cff5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:30:39 +0200
Subject: [PATCH 1333/3246] wavemon: 0.7.6.20151001 -> 0.8.1

---
 pkgs/tools/networking/wavemon/default.nix | 34 +++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix
index ece252a9b6c..0457c1ce623 100644
--- a/pkgs/tools/networking/wavemon/default.nix
+++ b/pkgs/tools/networking/wavemon/default.nix
@@ -1,20 +1,26 @@
-{stdenv, fetchgit, ncurses, libnl, pkgconfig}:
+{ stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }:
+
 stdenv.mkDerivation rec {
-  version = "0.7.6.20151001";
-  baseName="wavemon";
-  name="${baseName}-${version}";
-  buildInputs = [ncurses libnl pkgconfig];
-  src = fetchgit {
-    url = https://github.com/uoaerg/wavemon.git ;
-    rev = "05753aed2ec5a786d602c7903c89fc6a230f8d42";
-    sha256 = "13y4bi4qz4596f11ng6zaqir5j234wv64z4670q3pzh3fqmzmpm4";
+  version = "0.8.1";
+  baseName = "wavemon";
+  name = "${baseName}-${version}";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses libnl ];
+
+  src = fetchFromGitHub {
+    owner = "uoaerg";
+    repo = "wavemon";
+    rev = "v${version}";
+    sha256 = "0mx61rzl8a66pmigv2fh75zgdalxx75a5s1b7ydbviz18ihhjyls";
   };
-  meta = {
+
+  meta = with stdenv.lib; {
     inherit version;
-    description = "WiFi state monitor";
-    license = stdenv.lib.licenses.gpl3Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
+    description = "Ncurses-based monitoring application for wireless network devices";
+    homepage = https://github.com/uoaerg/wavemon;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ raskin fpletz ];
     platforms = stdenv.lib.platforms.linux;
-    downloadPage = https://github.com/uoaerg/wavemon.git ;
   };
 }

From 8e5515bdcbf40fb20af78b2fea02defeca9f1e55 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:31:16 +0200
Subject: [PATCH 1334/3246] ipmiutil: 3.0.2 -> 3.0.5

---
 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 17477210726..90feb381ae5 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.2";
+  version = "3.0.5";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "0nw12v7w9gx2px3b081i5mm5gl4l9n3vxhhk5n18vj1bs2jsxf4d";
+    sha256 = "0ppfxh04c0aj9dxpkzj3xv1kylc17k1kvqabp8r7h70k6ljzgmxj";
   };
 
   buildInputs = [ openssl ];

From 77ca756c7a81a3495aa1830311ea4ab584a3b41b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:31:54 +0200
Subject: [PATCH 1335/3246] pythonPackages.supervisor: 3.1.1 -> 3.1.4
 (security)

Fixes CVE-2017-11610.
---
 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 3ae2791beca..f0fd99d1774 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22299,13 +22299,13 @@ in {
   };
 
   supervisor = buildPythonPackage rec {
-    name = "supervisor-3.1.1";
+    name = "supervisor-3.1.4";
 
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/supervisor/${name}.tar.gz";
-      sha256 = "e3c3b35804c24b6325b5ba462553ebee80d5f4d1766274737b5c532cd4a11d59";
+      sha256 = "0kk0sv7780m4dzmrcb2m284krz907jh8jp7khz5a79qryy4m1xw2";
     };
 
     buildInputs = with self; [ mock ];

From fd647dc0cf5b989aea84c14adcecff10d9dff536 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:34:24 +0200
Subject: [PATCH 1336/3246] hashcat3: 3.10 -> 3.6.0

Upstream switched versioning scheme.
---
 pkgs/tools/security/hashcat/hashcat3/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix
index c8a8acf907d..1cb028a1a33 100644
--- a/pkgs/tools/security/hashcat/hashcat3/default.nix
+++ b/pkgs/tools/security/hashcat/hashcat3/default.nix
@@ -4,15 +4,15 @@ assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   name    = "hashcat-${version}";
-  version = "3.10";
+  version = "3.6.0";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://hashcat.net/files_legacy/hashcat-${version}.tar.gz";
-    sha256 = "1sg30d9as6xsl7b0i7mz26igachbv0l0yimwb12nmarmgdgmwm9v";
+    url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
+    sha256 = "127hdvq6ikah7r5vch63jnnkcsj7y61f9h8x79c3w25x9w55bxry";
   };
 
-  buildInputs = [ opencl-headers makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ opencl-headers ];
 
   makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ];
 

From 1fb803c3677ad4423a68f1520b266c440d06bb23 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 09:18:07 +0200
Subject: [PATCH 1337/3246] libtasn1: 4.10 -> 4.12, fix CVE-2017-9310

---
 pkgs/development/libraries/libtasn1/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index dbd203b97cf..516005b874f 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-4.10";
+  name = "libtasn1-4.12";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8";
+    sha256 = "0ls7jdq3y5fnrwg0pzhq11m21r8pshac2705bczz6mqjc8pdllv7";
   };
 
   patches = [
     (fetchurl {
-      name = "CVE-2017-6891.patch";
-      url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=5520704d075802df25ce4ffccc010ba1641bd484";
-      sha256 = "000r6wb87zkx8yhzkf1c3h7p5akwhjw51cv8f1yjnplrqqrr7h2k";
+      name = "CVE-2017-9310.patch";
+      url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39";
+      sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i";
     })
   ];
 

From 283364a2fec0ed3510ed9ac8f5fc4bf60408eb1d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 1 Aug 2017 15:41:06 +0800
Subject: [PATCH 1338/3246] Revert "buildenv: read propagated-user-env-packages
 line-by-line"

This reverts commit dce958ac396e88c09d5b19c284f41eef68f54ce7.
---
 pkgs/build-support/buildenv/builder.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 7cc37d15673..678f5a3fe9e 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -141,11 +141,12 @@ sub addPkg {
     my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
     if (-e $propagatedFN) {
         open PROP, "<$propagatedFN" or die;
-        while (my $p = <PROP>) {
-            chomp $p;
+        my $propagated = <PROP>;
+        close PROP;
+        my @propagated = split ' ', $propagated;
+        foreach my $p (@propagated) {
             $postponed{$p} = 1 unless defined $done{$p};
         }
-        close PROP;
     }
 }
 

From 4afb3f4ade6f7811f8ef762b5c7ae24c6e4b4d9b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 08:48:46 +0200
Subject: [PATCH 1339/3246] ipsecTools: add patch to fix CVE-2016-10396

---
 pkgs/os-specific/linux/ipsec-tools/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
index 466ecb1efee..30bd51473b5 100644
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ b/pkgs/os-specific/linux/ipsec-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, linuxHeaders, readline, openssl, flex, kerberos, pam }:
+{ stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }:
 
 # TODO: These tools are supposed to work under NetBSD and FreeBSD as
 # well, so I guess it's not appropriate to place this expression in
@@ -16,8 +16,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline openssl flex kerberos pam ];
 
-  patches = [ ./dont-create-localstatedir-during-install.patch
-              ./CVE-2015-4047.patch ];
+  patches = [
+    ./dont-create-localstatedir-during-install.patch
+    ./CVE-2015-4047.patch
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/pkg-ipsec-tools/pkg-ipsec-tools.git/plain/debian/patches/CVE-2016-10396.patch?id=62ac12648a4eb7c5ba5dba0f81998d1acf310d8b";
+      sha256 = "1kf7j2pf1blni52z7q41n0yisqb7gvk01lvldr319zaxxg7rm84a";
+    })
+  ];
 
   # fix build with newer gcc versions
   preConfigure = ''substituteInPlace configure --replace "-Werror" "" '';

From 4b5ae11f66d6b594bc1fbd230ba0102882b1243f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 09:02:04 +0200
Subject: [PATCH 1340/3246] mysql55: 5.5.54 -> 5.5.57 for multiple CVEs

See:
  - https://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-56.html
  - https://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-56.html
  - https://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-55.html
  - http://www.oracle.com/technetwork/security-advisory/cpujul2017-3236622.html

Fixes: CVE-2017-3635 CVE-2017-3636 CVE-2017-3641 CVE-2017-3648 CVE-2017-3651
       CVE-2017-3652 CVE-2017-3653
---
 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 820c3fc9605..6a85d956a0c 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.54";
+  version = "5.5.57";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "1f0sg72vbhavj1cbay0gyyrrw0mjcf2k0nf30zmn2h68ik7wnfr7";
+    sha256 = "113kynpfj45fffr62xack2657pds8mkhsgg77zj94ksj3qrbvhn1";
   };
 
   patches = if stdenv.isCygwin then [

From 3621bc76fd51e975960210548f0e3d2963bb379d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 09:22:00 +0200
Subject: [PATCH 1341/3246] mysql57: 5.7.17 -> 5.7.19

---
 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 be4ab80f705..5598a792633 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.17";
+  version = "5.7.19";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
-    sha256 = "0lcn9cm36n14g22bcppq5vf4nxbrl3khvlsp9hsixqdfb3l27gyf";
+    sha256 = "1c8y54yk756179nx4dgg79dijmjdq5n8l057cnqsg70pjdpyfl9y";
   };
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''

From 5bfc47bbabf246390a6daf9555869903933294e0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 09:27:59 +0200
Subject: [PATCH 1342/3246] catdoc: add to patch fix CVE-2017-11110

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

diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index fb0309e7532..2a06b25b11d 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "catdoc-${version}";
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://anonscm.debian.org/git/collab-maint/catdoc.git/diff/debian/patches/05-CVE-2017-11110.patch?id=21dd5b29b11be04149587657dd90253f52dfef0b";
+      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+    })
+  ];
+
   configureFlags = "--disable-wordview";
 
   meta = with stdenv.lib; {

From 1f15b7c81b0b23d1da6a325d7104a60c0ef42e62 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 09:34:22 +0200
Subject: [PATCH 1343/3246] apacheHttpd: 2.4.26 -> 2.4.27 for multiple CVEs

Fixes: CVE-2017-9788 CVE-2017-9789

See https://httpd.apache.org/security/vulnerabilities_24.html
---
 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 568b0ee6c04..30f8fbef119 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.26";
+  version = "2.4.27";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "b10b0f569a0e5adfef61d8c7f0813d42046e399a";
+    sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc";
   };
 
   # FIXME: -dev depends on -doc

From 88526f279d20a7432631bb6693505bbf34738114 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 09:41:33 +0200
Subject: [PATCH 1344/3246] memcached: 1.4.33 -> 1.4.39 for CVE-2017-9951

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

diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 166c5cdbf52..fabd5b83724 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  name = "memcached-1.4.33";
+  name = "memcached-1.4.39";
 
   src = fetchurl {
     url = "http://memcached.org/files/${name}.tar.gz";
-    sha256 = "07bpd6xdhzw6q2ga6xc075bw4jd44nxjl1vk4dqmd315d26nqwl3";
+    sha256 = "0dfpmx0fqgp55j4vl06cz63fwx5kzhzipdm7n2kxjkvyg1ybzi13";
   };
 
   buildInputs = [cyrus_sasl libevent];

From a957761abd7c7c793cc7ad39bee5c51e1f817762 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 09:53:44 +0200
Subject: [PATCH 1345/3246] libheimdal: 2015-09-13 -> 7.4.0 for CVE-2017-11103

The git snapshot was based on 7.0 which is vulnerable.
---
 pkgs/development/libraries/kerberos/heimdal.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index f791f3a8d6e..81f878daaaa 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -11,13 +11,14 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "${type}heimdal-2015-09-13";
+  name = "${type}heimdal-${version}";
+  version = "7.4.0";
 
   src = fetchFromGitHub {
     owner = "heimdal";
     repo = "heimdal";
-    rev = "c81572ab5dcee3062e715b9e25ca7a20f6ec456b";
-    sha256 = "1r60i4v6y5lpll0l2qpn0ycp6q6f1xjg7k1csi547zls8k96yk9s";
+    rev = "heimdal-${version}";
+    sha256 = "01ch6kqjrxi9fki54yjj2fhxhdkxijz161w2inh5k8mcixlf67vp";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]

From cfbac7bbadb1601973fd06224aefa594c98a2193 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 1 Aug 2017 10:00:09 +0200
Subject: [PATCH 1346/3246] bind: 9.11.1-P2 -> 9.11.2 for multiple CVEs

See: https://kb.isc.org/article/AA-01522

Fixes: CVE-2017-3140 CVE-2017-3141 CVE-2017-3142 CVE-2017-3143
---
 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 45abcff2776..4534ccbe099 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -3,14 +3,14 @@
 
 assert enableSeccomp -> libseccomp != null;
 
-let version = "9.11.1-P2"; in
+let version = "9.11.2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "19gyh7yij6cpvk5b199ghhns5wmsz67d2rpgvl91dbkm2m1wclxz";
+    sha256 = "0yn7wgi2y8mpmvbjbkl4va7p0xsnn48m4yjx6ynb1hzp423asikz";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From 657bec468c412648fd59da693a2b761012b2a8f8 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 09:54:48 +0200
Subject: [PATCH 1347/3246] abook: 0.6.0pre2 -> 0.6.1

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

diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix
index 2c4bc0f2128..4c03b197b4a 100644
--- a/pkgs/applications/misc/abook/default.nix
+++ b/pkgs/applications/misc/abook/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "abook-0.6.0pre2";
+  name = "abook-0.6.1";
 
   src = fetchurl {
     url = "http://abook.sourceforge.net/devel/${name}.tar.gz";
-    sha256 = "11fkyq9bqw7s6jf38yglk8bsx0ar2wik0fq0ds0rdp8985849m2r";
+    sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh";
   };
 
   patches = [
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
      })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ ncurses readline ];
 
   meta = {

From ff8684a141b32978661a05545e5b2f1409939b0f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 10:10:54 +0200
Subject: [PATCH 1348/3246] zeroad: 0.0.21 -> 0.0.22

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

diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 68ef1fd5392..20dd30238fb 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "0ad-data-${version}";
-  version = "0.0.21";
+  version = "0.0.22";
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
-    sha256 = "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk";
+    sha256 = "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc";
   };
 
   installPhase = ''
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 3a50196456c..cd0647cdee1 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null;
 
 stdenv.mkDerivation rec {
   name = "0ad-${version}";
-  version = "0.0.21";
+  version = "0.0.22";
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
-    sha256 = "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln";
+    sha256 = "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx";
   };
 
   nativeBuildInputs = [ python2 perl pkgconfig ];

From c6be8c75fe37694139654c5c39bbe5ff8803d95f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 10:33:47 +0200
Subject: [PATCH 1349/3246] perlPackages.Mouse: 2.4.5 -> 2.4.10, fix 32bit

The package enables stackprotector and fails on 32bit.

Our default stackprotector has to be turned off, too..
---
 pkgs/top-level/perl-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0ce43937685..156be853ceb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9751,15 +9751,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   Mouse = buildPerlModule rec {
-    name = "Mouse-v2.4.5";
+    name = "Mouse-v2.4.10";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SY/SYOHEX/${name}.tar.gz";
-      sha256 = "1f4dps68f2w1fwqjfpr4kllbcbwd744v3h1r9rkpwc2fhvq3q8hl";
+      url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz";
+      sha256 = "053d28c4v8kj7llwfwj5hjkvc1kcs6mvcn24yg7vxklgj6hxv5dr";
     };
     buildInputs = [
       ModuleBuildXSUtil TestException TestLeakTrace TestRequires TestOutput
       TestFatal
     ];
+    NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector";
+    hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
   };
 
   MouseXNativeTraits = buildPerlPackage rec {

From 07674788d6932fe702117649b4cd16512d2da8a9 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 1 Aug 2017 08:27:50 +0000
Subject: [PATCH 1350/3246] Respect NIX_DONT_SET_RPATH when .so appears in the
 command line

Unified processing of command line arguments in ld-wrapper broke support for
`NIX_DONT_SET_RPATH` and revealed that ld-wrapper adds the directory of its
`-plugin` argument to runpath. This pull request fixes that. It treats
`dir/libname.so` as `-L dir -l name`, because this is how `ld.so` interprets
resulting binary: with `dir` in `RUNPATH` and the bare `libname.so` (without
`dir`) in `NEEDED`, it looks for `libname.so` in each `RUNPATH` and chooses the
first, even when the linker was invoked with an absolute path to `.so`.
---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 283a6fb3ef9..72c0be304ac 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -62,7 +62,6 @@ fi
 
 extra+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN)
 
-declare -A rpaths
 declare -a libDirs
 declare -A libs
 relocatable=
@@ -78,9 +77,8 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ] || [ "$NIX_SET_BUILD_ID" = 1 ]; then
             -l)
                 libs["lib${p}.so"]=1
                 ;;
-            -dynamic-linker)
-                # Ignore the dynamic linker argument, or it
-                # will match *.so and be added to rpath.
+            -dynamic-linker | -plugin)
+                # Ignore this argument, or it will match *.so and be added to rpath.
                 ;;
             *)
                 case "$p" in
@@ -91,13 +89,9 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ] || [ "$NIX_SET_BUILD_ID" = 1 ]; then
                         libs["lib${p:2}.so"]=1
                         ;;
                     "$NIX_STORE"/*.so | "$NIX_STORE"/*.so.*)
-                        # This is a direct reference to a shared library, so add
-                        # its directory to the rpath.
-                        dir="${p%/*}"
-                        if [ ! "${rpaths[$dir]}" ]; then
-                            rpaths["$dir"]=1
-                            extra+=(-rpath "$dir")
-                        fi
+                        # This is a direct reference to a shared library.
+                        libDirs+=("${p%/*}")
+                        libs["${p##*/}"]=1
                         ;;
                     -r | --relocatable | -i)
                         relocatable=1
@@ -116,6 +110,7 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
     # so, add the directory to the rpath.
     # It's important to add the rpath in the order of -L..., so
     # the link time chosen objects will be those of runtime linking.
+    declare -A rpaths
     for dir in "${libDirs[@]}"; do
         if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then
             dir="$dir2"

From 091d0c8298d0b553de17b46719f95d220516973d Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Tue, 1 Aug 2017 08:26:07 +0200
Subject: [PATCH 1351/3246] unifi: 5.5.19 -> 5.5.20

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

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 7237bbdcd96..ec3b255116b 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "unifi-controller-${version}";
-  version = "5.5.19";
+  version = "5.5.20";
 
   src = fetchurl {
     url = "https://www.ubnt.com/downloads/unifi/${version}/unifi_sysvinit_all.deb";
-    sha256 = "0bsfq48xjp230ir8pm9wpa5p4dh88zfy51lbi2xwpr454371ixcl";
+    sha256 = "14v38x46vgwm3wg28lzv4sz6kjgp6r1xkwxnxn6pzq2r7v6xkaz0";
   };
 
   buildInputs = [ dpkg ];

From 27d1d15ab9cc2f7065020cf3411f3b6cdbea107f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 10:49:43 +0200
Subject: [PATCH 1352/3246] afflib: 3.7.15 -> 3.7.16

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

diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index 8b7dddf0e15..7c697d3e60c 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -3,19 +3,18 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.7.15";
+  version = "3.7.16";
   name = "afflib-${version}";
 
   src = fetchFromGitHub {
     owner = "sshock";
     repo = "AFFLIBv3";
     rev = "v${version}";
-    sha256 = "0ckg49m15lz5cxg0k12z2ys6v4smjr6l8bbazrvsqlm649gwd2bw";
+    sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6";
   };
 
   buildInputs = [ zlib curl expat fuse openssl autoreconfHook python ];
 
-
   meta = {
     homepage = http://afflib.sourceforge.net/;
     description = "Advanced forensic format library";

From 3fb4c9e899e39510fe9ffa8f9dc2c3b5ddcc5464 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 11:25:37 +0200
Subject: [PATCH 1353/3246] allegro5: 5.2.1.1 -> 5.2.2.0

---
 pkgs/development/libraries/allegro/5.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 7efccfad243..f1402e4ad9e 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto
 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
 , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
 , xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac
@@ -9,11 +9,13 @@
 
 stdenv.mkDerivation rec {
   name = "allegro-${version}";
-  version = "5.2.1.1";
+  version = "5.2.2.0";
 
-  src = fetchurl {
-    url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
-    sha256 = "0waalic7lyaf6i33nikmkc29bndci5c5090c4ra2vmy67cqdzndm";
+  src = fetchFromGitHub {
+    owner = "liballeg";
+    repo = "allegro5";
+    rev = version;
+    sha256 = "1sf0dr0ahrzsy6gzzpvys9d7d9w0grayhak4cyymjv7w857hf51m";
   };
 
   buildInputs = [

From 63b6179f52fa05fa36bee5a98879cd77544d2d10 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 11:41:46 +0200
Subject: [PATCH 1354/3246] alpine: 2.00 -> 2.21

---
 .../networking/mailreaders/alpine/default.nix | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix
index 22859a4c25d..df930b93173 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/alpine/default.nix
@@ -3,34 +3,26 @@
 }:
 
 # NOTE: Please check if any changes here are applicable to ../realpine/ as well
-let
-  version = "2.00";
-  baseName = "alpine";
-in
-stdenv.mkDerivation {
-  name = "${baseName}-${version}";
+stdenv.mkDerivation rec {
+  name = "alpine-${version}";
+  version = "2.21";
 
   src = fetchurl {
-    url = "ftp://ftp.cac.washington.edu/alpine/alpine-${version}.tar.bz2";
-    sha256 = "19m2w21dqn55rhxbh5lr9qarc2fqa9wmpj204jx7a0zrb90bhpf8";
+    url = "http://alpine.freeiz.com/alpine/release/src/${name}.tar.xz";
+    sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30";
   };
 
   buildInputs = [
     ncurses tcl openssl pam kerberos openldap
   ];
 
-  hardeningDisable = [ "format" "fortify" ];
+  hardeningDisable = [ "format" ];
 
   configureFlags = [
     "--with-ssl-include-dir=${openssl.dev}/include/openssl"
-    "--with-tcl-lib=${tcl.libPrefix}"
     "--with-passfile=.pine-passfile"
   ];
 
-  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
-  '';
-
   meta = {
     description = "Console mail reader";
     license = stdenv.lib.licenses.asl20;

From a434da450bc31b4e12de660e959865e073c3ec94 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 11:51:30 +0200
Subject: [PATCH 1355/3246] altermime: 0.3.10 -> 0.3.11

---
 .../networking/altermime/debian-patches.nix    | 18 ------------------
 .../networking/altermime/debian-patches.txt    |  4 ----
 pkgs/tools/networking/altermime/default.nix    |  6 +++---
 3 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/tools/networking/altermime/debian-patches.nix
 delete mode 100644 pkgs/tools/networking/altermime/debian-patches.txt

diff --git a/pkgs/tools/networking/altermime/debian-patches.nix b/pkgs/tools/networking/altermime/debian-patches.nix
deleted file mode 100644
index cd0ae77511b..00000000000
--- a/pkgs/tools/networking/altermime/debian-patches.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by debian-patches.sh from debian-patches.txt
-let
-  prefix = "http://patch-tracker.debian.org/patch/series/dl/altermime/0.3.10-7";
-in
-[
-  {
-    url = "${prefix}/15_fix_snprintf.diff";
-    sha256 = "0fbi99s7pc2jvg9s2zldvg18i6g5ca3pcyaxy47kyabnz956dris";
-  }
-  {
-    url = "${prefix}/10_fix_printk_warnings.diff";
-    sha256 = "1fqsym07r3gv8zllg7c956g5a04gsxnr1ibbgkjr3yx6nm5ci1j7";
-  }
-  {
-    url = "${prefix}/20_fix-unused-but-set-variables.diff";
-    sha256 = "0ski67k44amrgg2g3gwdjzrlix2gjg60r5rs5wbjingvq1n7255r";
-  }
-]
diff --git a/pkgs/tools/networking/altermime/debian-patches.txt b/pkgs/tools/networking/altermime/debian-patches.txt
deleted file mode 100644
index 77cb0ff10c1..00000000000
--- a/pkgs/tools/networking/altermime/debian-patches.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-altermime/0.3.10-7
-15_fix_snprintf.diff
-10_fix_printk_warnings.diff
-20_fix-unused-but-set-variables.diff
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index e532739ecd4..f05669a4e50 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -3,14 +3,14 @@
 stdenv.mkDerivation rec {
   baseName = "altermime";
   name = "${baseName}-${version}";
-  version = "0.3.10";
+  version = "0.3.11";
 
   src = fetchurl {
     url = "http://www.pldaniels.com/${baseName}/${name}.tar.gz";
-    sha256 = "0vn3vmbcimv0n14khxr1782m76983zz9sf4j2kz5v86lammxld43";
+    sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7";
   };
 
-  patches = map fetchurl (import ./debian-patches.nix);
+  NIX_CFLAGS_COMPILE = "-Wno-error=format";
 
   postPatch = ''
     sed -i Makefile -e "s@/usr/local@$out@"

From f732d816410faff03783e2180ffba116478eafe0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 12:03:39 +0200
Subject: [PATCH 1356/3246] albert: 0.11.3 -> 0.12.0

---
 pkgs/applications/misc/albert/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 854408e6e3e..dd4858cfe2a 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, lib, fetchFromGitHub, qtbase, qtsvg, qtx11extras, muparser, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtsvg, qtx11extras, muparser, cmake }:
 
 mkDerivation rec {
   name    = "albert-${version}";
-  version = "0.11.3";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner  = "albertlauncher";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5";
+    sha256 = "120l7hli2l4qj2s126nawc4dsy4qvwvb0svc42hijry4l8imdhkq";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake makeWrapper ];
 
   buildInputs = [ qtbase qtsvg qtx11extras muparser ];
 
@@ -31,6 +31,11 @@ mkDerivation rec {
     rm "$out/lib"
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/albert \
+      --prefix XDG_DATA_DIRS : $out/share
+  '';
+
   meta = with lib; {
     homepage    = https://albertlauncher.github.io/;
     description = "Desktop agnostic launcher";

From c27f692de62e1762d51e4f3f5cc252a57bdf852d Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Wed, 28 Jun 2017 10:19:01 -0400
Subject: [PATCH 1357/3246] opencv: Add optional Tesseract support

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

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 0443d00a258..4a8614d578a 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -17,6 +17,7 @@
 , enableEigen     ? false, eigen
 , enableOpenblas  ? false, openblas
 , enableCuda      ? false, cudatoolkit, gcc5
+, enableTesseract ? false, tesseract, leptonica
 , AVFoundation, Cocoa, QTKit
 }:
 
@@ -44,6 +45,9 @@ let
     sha256 = "11dsq8dwh1k6f7zglbc26xwsjw184ggf2531mhf7v77kd72k19fm";
   };
 
+  # Contrib must be built in order to enable Tesseract support:
+  buildContrib = enableContrib || enableTesseract;
+
   vggFiles = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_3rdparty";
@@ -66,7 +70,7 @@ stdenv.mkDerivation rec {
   inherit version src;
 
   postUnpack =
-    (lib.optionalString enableContrib ''
+    (lib.optionalString buildContrib ''
       cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
 
       # This fixes the build on OS X.
@@ -118,7 +122,7 @@ stdenv.mkDerivation rec {
           ln -s "${ippicv}" "${dir}/${name}"
         ''
     ) +
-    (lib.optionalString enableContrib ''
+    (lib.optionalString buildContrib ''
       cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib")
     '');
 
@@ -137,8 +141,12 @@ stdenv.mkDerivation rec {
     ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
     ++ lib.optional enableEigen eigen
     ++ lib.optional enableOpenblas openblas
+    # There is seemingly no compile-time flag for Tesseract.  It's
+    # simply enabled automatically if contrib is built, and it detects
+    # tesseract & leptonica.
+    ++ lib.optionals enableTesseract [ tesseract leptonica ]
     ++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
-    ++ lib.optional enableContrib protobuf3_1
+    ++ lib.optional buildContrib protobuf3_1
     ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@@ -158,7 +166,7 @@ stdenv.mkDerivation rec {
     (opencvFlag "CUDA" enableCuda)
     (opencvFlag "CUBLAS" enableCuda)
   ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]
-    ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off"
+    ++ lib.optional buildContrib "-DBUILD_PROTOBUF=off"
     ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"];
 
   enableParallelBuilding = true;

From bded592a8ef7a3e9ab1940aeceb613b078ea9a7e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 1 Aug 2017 06:23:57 -0500
Subject: [PATCH 1358/3246] Revert "otfcc: init at 0.8.6"

This reverts commit f3a54b014ce9cc3bbf2a65ab88291cbc3e3701b6.
---
 pkgs/tools/misc/otfcc/default.nix | 40 -------------------------------
 pkgs/top-level/all-packages.nix   |  2 --
 2 files changed, 42 deletions(-)
 delete mode 100644 pkgs/tools/misc/otfcc/default.nix

diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix
deleted file mode 100644
index ac64978bdd1..00000000000
--- a/pkgs/tools/misc/otfcc/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, premake5 }:
-
-let version = "0.8.6"; in
-
-let
-  arch =
-    {
-      "i686-linux" = "x86";
-      "x86_64-linux" = "x64";
-    }.${stdenv.system} or (throw "platform ${stdenv.system} is not supported");
-in
-
-stdenv.mkDerivation {
-  name = "otfcc-${version}";
-  src = fetchurl {
-    url = "https://github.com/caryll/otfcc/archive/v${version}.tar.gz";
-    sha256 = "0kap52bzrn21fmph8j2pc71f80f38ak1p2fcczzmrh0hb1r9c8dd";
-  };
-  nativeBuildInputs = [ premake5 ];
-  configurePhase = ''
-    runHook preConfigure
-    premake5 gmake
-    runHook postConfigure
-  '';
-  buildPhase = ''
-    runHook preBuild
-    cd build/gmake
-    make config=release_${arch}
-    cd ../..
-    runHook postBuild
-  '';
-  installPhase = ''
-    runHook preInstall
-    install -d "$out/lib"
-    install "bin/release-${arch}/"lib* "$out/lib"
-    install -d "$out/bin"
-    install "bin/release-${arch}/"otfcc* "$out/bin"
-    runHook postInstall
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17306733136..21ee6afaf24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3586,8 +3586,6 @@ with pkgs;
 
   ostree = callPackage ../tools/misc/ostree { };
 
-  otfcc = callPackage ../tools/misc/otfcc {};
-
   otpw = callPackage ../os-specific/linux/otpw { };
 
   owncloud = owncloud70;

From 90d860832353803286b5b018a0d50d55b8112c3d Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 1 Aug 2017 11:40:53 +0200
Subject: [PATCH 1359/3246] wireshark: 2.2.7 -> 2.4.0

Fixes the following CVEs:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11409
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11406
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11407
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11408
---
 .../wireshark/add_missing_udpdump_pod.patch   | 132 ++++++++++++++++++
 .../networking/sniffers/wireshark/default.nix |  24 +++-
 2 files changed, 151 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch

diff --git a/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch b/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch
new file mode 100644
index 00000000000..a009057307b
--- /dev/null
+++ b/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch
@@ -0,0 +1,132 @@
+diff -Nur wireshark-2.4.0/doc/udpdump.pod wireshark-2.4.0-p/doc/udpdump.pod
+--- wireshark-2.4.0/doc/udpdump.pod	1970-01-01 01:00:00.000000000 +0100
++++ wireshark-2.4.0-p/doc/udpdump.pod	2017-08-01 10:48:40.551431319 +0200
+@@ -0,0 +1,128 @@
++
++=head1 NAME
++
++udpdump - Provide an UDP receiver that gets packets from network devices (like Aruba routers) and exports them in PCAP format.
++
++=head1 SYNOPSIS
++
++B<udpdump>
++S<[ B<--help> ]>
++S<[ B<--version> ]>
++S<[ B<--extcap-interfaces> ]>
++S<[ B<--extcap-dlts> ]>
++S<[ B<--extcap-interface>=E<lt>interfaceE<gt> ]>
++S<[ B<--extcap-config> ]>
++S<[ B<--capture> ]>
++S<[ B<--fifo>=E<lt>path to file or pipeE<gt> ]>
++S<[ B<--port>=E<lt>portE<gt> ]>
++S<[ B<--payload>=E<lt>typeE<gt> ]>
++
++=head1 DESCRIPTION
++
++B<udpdump> is a extcap tool that provides an UDP receiver that listens for exported datagrams coming from
++any source (like Aruba routers) and exports them in PCAP format. This provides the user two basic
++functionalities: the first one is to have a listener that prevents the localhost to send back an ICMP
++port-unreachable packet. The second one is to strip out the lower layers (layer 2, IP, UDP) that are useless
++(are used just as export vector). The format of the exported datagrams are EXPORTED_PDU, as specified in
++https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob;f=epan/exported_pdu.h;hb=refs/heads/master
++
++=head1 OPTIONS
++
++=over 4
++
++=item --help
++
++Print program arguments.
++
++=item --version
++
++Print program version.
++
++=item --extcap-interfaces
++
++List available interfaces.
++
++=item --extcap-interface=E<lt>interfaceE<gt>
++
++Use specified interfaces.
++
++=item --extcap-dlts
++
++List DLTs of specified interface.
++
++=item --extcap-config
++
++List configuration options of specified interface.
++
++=item --capture
++
++Start capturing from specified interface save saved it in place specified by --fifo.
++
++=item --fifo=E<lt>path to file or pipeE<gt>
++
++Save captured packet to file or send it through pipe.
++
++=item --port=E<lt>portE<gt>
++
++Set the listerner port. Port 5555 is the default.
++
++=item --payload=E<lt>typeE<gt>
++
++Set the payload of the exported PDU. Default: data.
++
++=back
++
++=head1 EXAMPLES
++
++To see program arguments:
++
++    udpdump --help
++
++To see program version:
++
++    udpdump --version
++
++To see interfaces:
++
++    udpdump --extcap-interfaces
++
++  Example output:
++    interface {value=udpdump}{display=UDP Listener remote capture}
++
++To see interface DLTs:
++
++    udpdump --extcap-interface=udpdump --extcap-dlts
++
++  Example output:
++    dlt {number=252}{name=udpdump}{display=Exported PDUs}
++
++To see interface configuration options:
++
++    udpdump --extcap-interface=udpdump --extcap-config
++
++  Example output:
++    arg {number=0}{call=--port}{display=Listen port}{type=unsigned}{range=1,65535}{default=5555}{tooltip=The port the receiver listens on}
++
++To capture:
++
++    udpdump --extcap-interface=randpkt --fifo=/tmp/randpkt.pcapng --capture
++
++NOTE: To stop capturing CTRL+C/kill/terminate application.
++
++=head1 SEE ALSO
++
++wireshark(1), tshark(1), dumpcap(1), extcap(4)
++
++=head1 NOTES
++
++B<udpdump> is part of the B<Wireshark> distribution.  The latest version
++of B<Wireshark> can be found at L<https://www.wireshark.org>.
++
++HTML versions of the Wireshark project man pages are available at:
++L<https://www.wireshark.org/docs/man-pages>.
++
++=head1 AUTHORS
++
++  Original Author
++  ---------------
++  Dario Lombardo             <lomato[AT]gmail.com>
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 326529d1e0f..ab93899518a 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
 , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
-, libssh, zlib, cmake, extra-cmake-modules
+, libssh, zlib, cmake, extra-cmake-modules, fetchpatch
 , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
 , withQt ? false, qt5 ? null
 , ApplicationServices, SystemConfiguration, gmp
@@ -12,17 +12,19 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.2.7";
+  version = "2.4.0";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
   name = "wireshark-${variant}-${version}";
 
   src = fetchurl {
-    url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
-    sha256 = "1dfvhra5v6xhzbp097qsxi0zvirw0srbasl4v1wjf58v49idz7b8";
+    url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
+    sha256 = "011vvrj76z1azkpvyy2j40b1x1z56ymld508zfc4xw3gh8dv82w9";
   };
 
+  cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";
+
   nativeBuildInputs = [
     bison cmake extra-cmake-modules flex
   ] ++ optional withGtk wrapGAppsHook;
@@ -35,7 +37,19 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
 
-  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
+  patches = [ ./wireshark-lookup-dumpcap-in-path.patch
+
+              # Backported from master. Will probably have to be dropped during next
+              # update.
+              (fetchpatch {
+                 name = "AUTHORS_add_newline_after_bracket";
+                 url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=patch;h=27c6b12626d6e7b8e4d7a11784c2c5e2bfb87fde";
+                 sha256 = "1x30rkrq7dzgdlwrjv2r5ibdpdgwnn5wzvki77rdf13b0547vcw3";
+               })
+              # A file is missing from distribution. This should be fixed in upcoming
+              # releases
+              ./add_missing_udpdump_pod.patch
+            ];
 
   postInstall = optionalString (withQt || withGtk) ''
     ${optionalString withGtk ''

From d06bd380e9b0882cfa651b0418956177a1c14c52 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Aug 2017 08:42:54 -0400
Subject: [PATCH 1360/3246] alacritty: Remove xclip with buildInput

---
 pkgs/applications/misc/alacritty/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 6c9f9ee3ab0..50af18ca1fc 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -43,7 +43,6 @@ buildRustPackage rec {
   buildInputs = [
     cmake
     makeWrapper
-    xclip
     pkgconfig
   ] ++ rpathLibs;
 

From b998d8e8b79d026e206f38ff9915829bcdb382f1 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 1 Aug 2017 12:42:58 +0000
Subject: [PATCH 1361/3246] nixos/hardware/raid/hpsa: init at 2.40

---
 nixos/modules/hardware/raid/hpsa.nix | 61 ++++++++++++++++++++++++++++
 nixos/modules/module-list.nix        |  1 +
 2 files changed, 62 insertions(+)
 create mode 100644 nixos/modules/hardware/raid/hpsa.nix

diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix
new file mode 100644
index 00000000000..1b4b1fa1954
--- /dev/null
+++ b/nixos/modules/hardware/raid/hpsa.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  hpssacli = pkgs.stdenv.mkDerivation rec {
+    name = "hpssacli-${version}";
+    version = "2.40-13.0";
+
+    src = pkgs.fetchurl {
+      url = "http://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
+      sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
+    };
+
+    nativeBuildInputs = [ pkgs.dpkg ];
+
+    unpackPhase = "dpkg -x $src ./";
+
+    installPhase = ''
+      mkdir -p $out/bin $out/share/doc $out/share/man
+      mv opt/hp/hpssacli/bld/{hpssascripting,hprmstr,hpssacli} $out/bin/
+      mv opt/hp/hpssacli/bld/*.{license,txt}                   $out/share/doc/
+      mv usr/man                                               $out/share/
+
+      for file in $out/bin/*; do
+        chmod +w $file
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                 --set-rpath ${lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]} \
+                 $file
+      done
+    '';
+
+    dontStrip = true;
+
+    meta = with lib; {
+      description = "HP Smart Array CLI";
+      homepage = http://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/;
+      license = licenses.unfreeRedistributable;
+      platforms = [ "x86_64-linux" ];
+      maintainers = with maintainers; [ volth ];
+    };
+  };
+in {
+  ###### interface
+
+  options = {
+    hardware.raid.HPSmartArray = {
+      enable = mkEnableOption "HP Smart Array kernel modules and CLI utility";
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf config.hardware.raid.HPSmartArray.enable {
+
+    boot.initrd.kernelModules = [ "sg" ]; /* hpssacli wants it */
+    boot.initrd.availableKernelModules = [ "hpsa" ];
+
+    environment.systemPackages = [ hpssacli ];
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7dea5cb9da..59849130707 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -43,6 +43,7 @@
   ./hardware/nitrokey.nix
   ./hardware/opengl.nix
   ./hardware/pcmcia.nix
+  ./hardware/raid/hpsa.nix
   ./hardware/usb-wwan.nix
   ./hardware/video/amdgpu.nix
   ./hardware/video/amdgpu-pro.nix

From ef6849ca63ffa01e10aa28ade7d8afff7a856922 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Aug 2017 15:24:20 +0200
Subject: [PATCH 1362/3246] structured-haskell-mode: fix location of the
 "site-lisp" symlink

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 43270465775..bacaa581a68 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -610,9 +610,9 @@ self: super: {
     # cannot easily byte-compile these files, unfortunately, because they
     # depend on a new version of haskell-mode that we don't have yet.
     postInstall = ''
-      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-"*"/elisp" )
-      mkdir -p $out/share/emacs
-      ln -s $lispdir $out/share/emacs/site-lisp
+      local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" )
+      mkdir -p $data/share/emacs
+      ln -s $lispdir $data/share/emacs/site-lisp
     '';
   })).override {
     haskell-src-exts = self.haskell-src-exts_1_19_1;

From 4fe328c6cac90d0e8500a1f489db8a1728af32e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Aug 2017 15:24:57 +0200
Subject: [PATCH 1363/3246] haskell-hindent: fix location of the "site-lisp"
 symlink

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bacaa581a68..9f24d348064 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -618,14 +618,14 @@ self: super: {
     haskell-src-exts = self.haskell-src-exts_1_19_1;
   };
 
-  # # Make elisp files available at a location where people expect it.
+  # Make elisp files available at a location where people expect it.
   hindent = (overrideCabal super.hindent (drv: {
     # We cannot easily byte-compile these files, unfortunately, because they
     # depend on a new version of haskell-mode that we don't have yet.
     postInstall = ''
-      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
-      mkdir -p $out/share/emacs
-      ln -s $lispdir $out/share/emacs/site-lisp
+      local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" )
+      mkdir -p $data/share/emacs
+      ln -s $lispdir $data/share/emacs/site-lisp
     '';
     doCheck = false; # https://github.com/chrisdone/hindent/issues/299
   })).override {

From 92031d6e01bd494a6e92d7dee08e7633256657c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Aug 2017 15:35:44 +0200
Subject: [PATCH 1364/3246] structured-haskell-mode: bump version to latest git
 head

Chris doesn't seem to make release any more.
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9f24d348064..317312823f9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -603,6 +603,14 @@ self: super: {
 
   # Fine-tune the build.
   structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: {
+    src = pkgs.fetchFromGitHub {
+      owner = "chrisdone";
+      repo = "structured-haskell-mode";
+      rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d";
+      sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c";
+    };
+    version = "20170523-git";
+    editedCabalFile = null;
     # Statically linked Haskell libraries make the tool start-up much faster,
     # which is important for use in Emacs.
     enableSharedExecutables = false;

From ea4121d225e6b3a7bebad1f6686d952a3e5f0e13 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 1 Aug 2017 16:25:53 +0200
Subject: [PATCH 1365/3246] python.buildEnv: fix passthru

Python envs did not pass through any of the properties the Python
interpreter has. That could be annoying, especially not having
`python.interpreter` which is the path to the interpreter. This commit
fixes the situation and inherit python.passthru.
---
 .../interpreters/python/wrapper.nix           | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 65b949661b0..71e9e614352 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -6,8 +6,7 @@
 # Create a python executable that knows about additional packages.
 let
   recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; };
-  env = (
-  let
+  env = let
     paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ;
   in buildEnv {
     name = "${python.name}-env";
@@ -36,19 +35,21 @@ let
       done
     '' + postBuild;
 
-    passthru.env = stdenv.mkDerivation {
-      name = "interactive-${python.name}-environment";
-      nativeBuildInputs = [ env ];
-
-      buildCommand = ''
-        echo >&2 ""
-        echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
-        echo >&2 ""
-        exit 1
-      '';
-    };
-  }) // {
-    inherit python;
     inherit (python) meta;
+
+    passthru = python.passthru // {
+      interpreter = "${env}/bin/${python.executable}";
+      env = stdenv.mkDerivation {
+        name = "interactive-${python.name}-environment";
+        nativeBuildInputs = [ env ];
+
+        buildCommand = ''
+          echo >&2 ""
+          echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+          echo >&2 ""
+          exit 1
+        '';
+    };
+    };
   };
 in env

From 7c690829b2351a991881ca186d354ab965e00ddf Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Tue, 1 Aug 2017 11:15:48 -0400
Subject: [PATCH 1366/3246] rtags: 2.10 -> 2.11

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

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 23ee6dec86a..85d14835a25 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "rtags-${version}";
-  version = "2.10";
+  version = "2.11";
 
   buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]
     ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
     url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "0rv5hz4cfc1adpxvp4j4227nfc0p0yrjdc6l9i32jj11p69a5401";
+    sha256 = "0965jn8zk3mh07yzw6jmwwp56xly1sihkn0vhv07izkh41mdkrvv";
     # unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation
     postFetch = ''

From 46c97397b7f8ce988d3eb1776f114662185b1478 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 1 Aug 2017 11:12:25 -0400
Subject: [PATCH 1367/3246] elpa-packages: 2017-08-01

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index da2eefd985a..b5c0d465368 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1446,10 +1446,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170724";
+        version = "20170731";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170724.tar";
-          sha256 = "1f1szds6642427hrzagxgkr05z66sf57n5l2acvmpgw4z358ms0n";
+          url = "https://elpa.gnu.org/packages/org-20170731.tar";
+          sha256 = "1vf91r4ifnjg5r82l5ikq0bwsxd5dsbgywzmwaspm6ckx49nksnl";
         };
         packageRequires = [];
         meta = {
@@ -1785,10 +1785,10 @@
       }) {};
     sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "sokoban";
-        version = "1.4.4";
+        version = "1.4.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sokoban-1.4.4.tar";
-          sha256 = "0lz0qxgs71yh23iayv50rb6qgqvgbz2bg2sgfxcps8wag643ns20";
+          url = "https://elpa.gnu.org/packages/sokoban-1.4.5.tar";
+          sha256 = "1hh35g1p2f5al88jsbgiz35bvhn7iw5sf9zhsjimiig5isv7khip";
         };
         packageRequires = [];
         meta = {

From 4ea23a09d97be5ef17c5571c88c19e2e1e0b08e2 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 1 Aug 2017 11:12:39 -0400
Subject: [PATCH 1368/3246] org-packages: 2017-08-01

---
 .../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 9d7af37e514..f51fec80075 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 = "20170724";
+        version = "20170731";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170724.tar";
-          sha256 = "07rpr8zf12c62sfbk9c9lvvfphs3ws136d3vlnq6j7gypdzyb32m";
+          url = "http://orgmode.org/elpa/org-20170731.tar";
+          sha256 = "0lphzjxmk5y9g6b9rnacc9z55hbws3xmycsqdvsz56xr3aawx255";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170724";
+        version = "20170731";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170724.tar";
-          sha256 = "12xgvdmpz6wnylcvfngh7lqvgs9wv1bdrm7l7fivakx8y3dyq7k7";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170731.tar";
+          sha256 = "1bba4m9r598f9l8wmr1j670d1qp4fcbbhzp9m4qd2md09rm3nsnw";
         };
         packageRequires = [];
         meta = {

From 8be846ef7ee28e71e2e377188b22dcf1e5956584 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 1 Aug 2017 11:19:42 -0400
Subject: [PATCH 1369/3246] melpa-stable-packages: 2017-08-01

Removals:
 - chinese-pyim-basedict: renamed to pyim-basedict
 - chinese-pyim-greatdict: renamed to pyim-greatdict
 - elscreen-persist: removed from melpa-stable
 - mic-paren: repository no longer exists
---
 .../emacs-modes/melpa-stable-generated.nix    | 561 ++++++++++++------
 1 file changed, 364 insertions(+), 197 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 0796c41d749..434e4384738 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -611,12 +611,12 @@
     ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ac-rtags";
-        version = "2.11";
+        version = "2.12";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
-          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -4030,13 +4030,13 @@
         version = "0.1";
         src = fetchFromGitHub {
           owner = "tumashu";
-          repo = "chinese-fonts-setup";
+          repo = "cnfonts";
           rev = "6f4423664e55d5470c4f239d04b88da5d6acb34d";
           sha256 = "0d9xx43ijxrp95j5bnxcsnfwn032ypy2c1lypak15772nk6i7s1w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
-          sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup";
+          sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1";
           name = "chinese-fonts-setup";
         };
         packageRequires = [ cl-lib ];
@@ -4045,69 +4045,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
+    chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "1.5.3";
+        version = "1.6.1";
         src = fetchFromGitHub {
           owner = "tumashu";
-          repo = "chinese-pyim";
-          rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1";
-          sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0";
+          repo = "pyim";
+          rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6";
+          sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
-          sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim";
+          sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn";
           name = "chinese-pyim";
         };
-        packageRequires = [ async chinese-pyim-basedict cl-lib popup pos-tip ];
+        packageRequires = [ pyim ];
         meta = {
           homepage = "https://melpa.org/#/chinese-pyim";
           license = lib.licenses.free;
         };
       }) {};
-    chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "chinese-pyim-basedict";
-        version = "0.1";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "chinese-pyim-basedict";
-          rev = "f13b6d20629a0b691ead626cca249b227622fa83";
-          sha256 = "1ddld5jkhqarm31p6qjdvdha36k6yqaz3jzg3lyzd0nkavcmdq57";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict";
-          sha256 = "1qmr71lnpn06mcbb6gfr3dh78pav0sk9mld956cvnkg82vg7nmpv";
-          name = "chinese-pyim-basedict";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-pyim-basedict";
-          license = lib.licenses.free;
-        };
-      }) {};
-    chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "chinese-pyim-greatdict";
-        version = "0.1";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "chinese-pyim-greatdict";
-          rev = "11cf5145710349e9d928eb9197bebb426025fd58";
-          sha256 = "1pza690b31ynyj31f1gp7y2d29ri3swcblpzd2pcpj3ynmnbsy3f";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict";
-          sha256 = "1xqr2fcsb45khavqx06ry2sm8db790zlggk61civbdyafvlz8ikc";
-          name = "chinese-pyim-greatdict";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-pyim-greatdict";
-          license = lib.licenses.free;
-        };
-      }) {};
     chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-word-at-point";
@@ -5326,12 +5284,12 @@
     company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "company-rtags";
-        version = "2.11";
+        version = "2.12";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
-          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -5893,12 +5851,12 @@
     cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "cricbuzz";
-        version = "0.2.9";
+        version = "0.2.10";
         src = fetchFromGitHub {
           owner = "lepisma";
           repo = "cricbuzz.el";
-          rev = "05087b0f6d5a941b5ec18acc8bcf20efd6d71568";
-          sha256 = "1zin191dcr6qli2cwgf6jjz2dvlxiaranglpc5365bkkvwb5f250";
+          rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69";
+          sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@@ -5998,16 +5956,16 @@
     csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
     melpaBuild {
         pname = "csound-mode";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "hlolli";
           repo = "csound-mode";
-          rev = "e3fbb1fecd730fd66893cadf41c2cb8c2d9c1685";
-          sha256 = "105hhn5f5ml32i3iwrm2d2ikx9lb96m3lsg9v9i72713mayvkqan";
+          rev = "877c7c9d5bdc6a2acf4ac1a10e9e24ba1bd3cc76";
+          sha256 = "1vsngs42n8xp72701ppvmwyy6b90vnj39fq12yvp7x9zqf29lmq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/95ccfae76a2c0f627f6d218ca68072e79fcfd088/recipes/csound-mode";
-          sha256 = "15zmgsh1071cyd9a0d7cljq8k7d8l2gkjjpv8z22gnm0wfbb0yys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
+          sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d";
           name = "csound-mode";
         };
         packageRequires = [ emacs multi shut-up ];
@@ -7323,22 +7281,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
     melpaBuild {
         pname = "docker-compose-mode";
-        version = "0.1";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "meqif";
           repo = "docker-compose-mode";
-          rev = "85cf81d2964c7b721a7f1317cf9efd5bf3a7f671";
-          sha256 = "1l0pcmjhvayfx1hn4125ilhr3lb4rzhrqrf91lnkh7m1rv3npcik";
+          rev = "a38b64aecd037556c91d9aef29f1d04496295f2b";
+          sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
           sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
           name = "docker-compose-mode";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ dash emacs yaml-mode ];
         meta = {
           homepage = "https://melpa.org/#/docker-compose-mode";
           license = lib.licenses.free;
@@ -7850,12 +7808,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "1.3.1";
+        version = "1.5.5";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "468352a0a813c5ce8edba71c82f00e24b516d74c";
-          sha256 = "0sryibflylwy8pqp80xyxmdndk2idcgpgk9zxixwpim3mcwn78yl";
+          rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19";
+          sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -8288,6 +8246,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eg";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "eg.el";
+          rev = "66c7bfd84151cac093090834919a615d5f824b42";
+          sha256 = "0pk8rvfdybkkrxb80yhj831gr3sj075gair9g7p60jfnyxwsgqw2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
+          sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7";
+          name = "eg";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/eg";
+          license = lib.licenses.free;
+        };
+      }) {};
     egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "egg";
@@ -8559,6 +8538,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el2org";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "el2org";
+          rev = "c85837d56ed8fe1b31927755294db49ac46f443e";
+          sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
+          sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh";
+          name = "el2org";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/el2org";
+          license = lib.licenses.free;
+        };
+      }) {};
     eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eldoc-eval";
@@ -8877,12 +8877,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "1.15.1";
+        version = "1.16.0";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "55ee3d57872c87cb640abd5d63ac1887f9e8dc5d";
-          sha256 = "0866l17sqq2p7bla2krg10y70wgsxf158kashcgschfr0h2f7r1i";
+          rev = "c33794ae03fa787c7f93b93cc9427d864b63e25f";
+          sha256 = "1q8zjsl9zbgwqcbvzkdlqy28z4h1qr0kkhhrq037vab0w0l0zi6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -8944,27 +8944,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }:
-    melpaBuild {
-        pname = "elscreen-persist";
-        version = "0.2.0";
-        src = fetchFromGitHub {
-          owner = "robario";
-          repo = "elscreen-persist";
-          rev = "652b4c738f92c518ead69343ebfcf66bc2a0254c";
-          sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c30ec71dcc29d1d0fd6c54de512c8c4636a7e0a6/recipes/elscreen-persist";
-          sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
-          name = "elscreen-persist";
-        };
-        packageRequires = [ elscreen revive ];
-        meta = {
-          homepage = "https://melpa.org/#/elscreen-persist";
-          license = lib.licenses.free;
-        };
-      }) {};
     elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elwm";
@@ -9823,12 +9802,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20.0.1";
+        version = "20.0.2";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a01de6873844ba510084090abec734c4166d71fa";
-          sha256 = "0bni9rchblp3n7lh07wq3rpf5xykh79jm6bl6f2dk2j24wwrhjqs";
+          rev = "6ede2da826335960037299d9f3b0e66d072ea5a0";
+          sha256 = "1zxfyd711l13n6xhspa8l0k4l7hb8aq1q1j2b2yrzw9k1hx2lfyj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -10263,12 +10242,12 @@
     esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esup";
-        version = "0.5";
+        version = "0.6";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "esup";
-          rev = "6faef1fe1b5ff2fb761722ef1972a16395d9a10b";
-          sha256 = "18igz3gcdp42wk89y59d4gxkbv0zvs8i4lg1b0qsrf90knasfjc9";
+          rev = "53355b13dc9f1636ba681ffff830162ebbd3b223";
+          sha256 = "1a4b8390azimlrr5ayxvaks1w7009vfbm56q11ybx00xxrd26v43";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -10326,12 +10305,12 @@
     eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "eval-in-repl";
-        version = "0.9.4";
+        version = "0.9.6";
         src = fetchFromGitHub {
           owner = "kaz-yos";
           repo = "eval-in-repl";
-          rev = "674873139ebde439fbeecaf0fb217d54f470bc14";
-          sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s";
+          rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60";
+          sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -12180,12 +12159,12 @@
     flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-julia";
-        version = "0.0.3";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "gdkrmr";
           repo = "flycheck-julia";
-          rev = "67cdef277741f06c884525636a1cf1349efebbb4";
-          sha256 = "1qn2i643nbvb94vgdwc94himwh3z984cmg2fklvmlw8xyyxm7ny2";
+          rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6";
+          sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia";
@@ -12366,6 +12345,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-pycheckers";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "msherry";
+          repo = "flycheck-pycheckers";
+          rev = "3c89f455472b5a77e28129825bb801b464d96ca1";
+          sha256 = "1fxbabxsdqm98vhs51k5z6prjkskjq2nsl9vsmlbwgjgyg4hx1xr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
+          sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq";
+          name = "flycheck-pycheckers";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-pycheckers";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-rebar3";
@@ -12390,12 +12390,12 @@
     flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "flycheck-rtags";
-        version = "2.11";
+        version = "2.12";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
-          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -13572,12 +13572,12 @@
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "0.8";
+        version = "1.0";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d";
-          sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m";
+          rev = "795b969346982b75e24b5c8619b46197982fbb4d";
+          sha256 = "0aha13vqj6ygyr7bflrxll837g4z6wrmrhh5rhcd0vphqg70frgn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode";
@@ -13889,14 +13889,14 @@
         pname = "ghub";
         version = "1.2.0";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "magit";
           repo = "ghub";
           rev = "da60fa2316bf829cab18676afd5a43088ac06b60";
           sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub";
-          sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
+          sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
           name = "ghub";
         };
         packageRequires = [ emacs ];
@@ -14493,6 +14493,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitpatch";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "gitpatch";
+          rev = "577d5adf65c8133caa325c10e89e1e2fc323c907";
+          sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch";
+          sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1";
+          name = "gitpatch";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gitpatch";
+          license = lib.licenses.free;
+        };
+      }) {};
     gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "gitter";
@@ -17381,12 +17402,12 @@
     helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "helm-rtags";
-        version = "2.11";
+        version = "2.12";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
-          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -18872,12 +18893,12 @@
     imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-list";
-        version = "0.7";
+        version = "0.8";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f";
-          sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7";
+          rev = "27170d27c9594989587c03c23f753a809f6a0e10";
+          sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
@@ -19669,12 +19690,12 @@
     ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ivy-rtags";
-        version = "2.11";
+        version = "2.12";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
-          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -21435,6 +21456,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lms";
+        version = "0.6";
+        src = fetchhg {
+          url = "https://bitbucket.com/inigoserna/lms.el";
+          rev = "5f20620f62a1";
+          sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms";
+          sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1";
+          name = "lms";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/lms";
+          license = lib.licenses.free;
+        };
+      }) {};
     load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "load-relative";
@@ -21582,22 +21623,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
     melpaBuild {
         pname = "love-minor-mode";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "love-minor-mode";
-          rev = "1634ff3a8b657c63a5cffd9a937812a289f2c954";
-          sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk";
+          rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a";
+          sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
-        packageRequires = [];
+        packageRequires = [ lua-mode ];
         meta = {
           homepage = "https://melpa.org/#/love-minor-mode";
           license = lib.licenses.free;
@@ -22628,12 +22669,12 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "3.0.0";
+        version = "3.0.1";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "957e551140587f0cd83d9186a06fba10a38c6084";
-          sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7";
+          rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537";
+          sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -22730,27 +22771,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "mic-paren";
-        version = "3.10";
-        src = fetchFromGitHub {
-          owner = "emacsmirror";
-          repo = "mic-paren";
-          rev = "e4cf6e1a0ee91e849a9d42ecdcd6ed0287f8a521";
-          sha256 = "1cdjpqrsv2vhpdmv67krsds7wz19z9ajkabawr3yhxqii4myl4ik";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mic-paren";
-          sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7";
-          name = "mic-paren";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/mic-paren";
-          license = lib.licenses.free;
-        };
-      }) {};
     migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "migemo";
@@ -24199,11 +24219,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.25pre0";
+        version = "0.25";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "952a0f0cda7d1a12432d1c9ad71b41401cb1615c";
-          sha256 = "1mj3946sg2lxamcz16jkys88scx1fyhky3amwxnl5iszd15lhvxz";
+          rev = "9f648dfbb8e253dab1bc4a0e761ad46cec405f4d";
+          sha256 = "17b2rwvfq5zqm4cw8zqqzns8jjld3bpb25ca4133ckgkwach4v1d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -24450,12 +24470,12 @@
     ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-blockdiag";
-        version = "20170501.112";
+        version = "20170728.113";
         src = fetchFromGitHub {
           owner = "corpix";
           repo = "ob-blockdiag.el";
-          rev = "e6532af46dcea8e79f3ad3cb2863cbbe516efbf6";
-          sha256 = "059jcl1qpfxwsykbj1sf7r1fpg7wix4fbdhhghrhbhgf5w165hsv";
+          rev = "634fcf64a4ae735afe7001d865b03f5d71e23046";
+          sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag";
@@ -25172,6 +25192,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-category-capture";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "org-projectile";
+          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
+          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
+          sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav";
+          name = "org-category-capture";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-category-capture";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-commentary";
@@ -25590,27 +25631,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
     melpaBuild {
         pname = "org-projectile";
-        version = "0.2.6";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92";
-          sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58";
+          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
+          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile";
-          sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
+          sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw";
           name = "org-projectile";
         };
-        packageRequires = [ dash emacs projectile ];
+        packageRequires = [ dash emacs org-category-capture projectile s ];
         meta = {
           homepage = "https://melpa.org/#/org-projectile";
           license = lib.licenses.free;
         };
       }) {};
+    org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
+    melpaBuild {
+        pname = "org-projectile-helm";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "org-projectile";
+          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
+          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
+          sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4";
+          name = "org-projectile-helm";
+        };
+        packageRequires = [ emacs helm org-projectile ];
+        meta = {
+          homepage = "https://melpa.org/#/org-projectile-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-protocol-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-protocol-jekyll";
@@ -26969,13 +27031,13 @@
         pname = "password-store";
         version = "1.7.1";
         src = fetchgit {
-          url = "http://git.zx2c4.com/password-store";
+          url = "https://git.zx2c4.com/password-store";
           rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf";
           sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
-          sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store";
+          sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65";
           name = "password-store";
         };
         packageRequires = [ f s ];
@@ -28912,6 +28974,90 @@
           license = lib.licenses.free;
         };
       }) {};
+    pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
+    melpaBuild {
+        pname = "pyim";
+        version = "1.6.1";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "pyim";
+          rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6";
+          sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
+          sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
+          name = "pyim";
+        };
+        packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ];
+        meta = {
+          homepage = "https://melpa.org/#/pyim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pyim-basedict";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "pyim-basedict";
+          rev = "f71d0ffd9d2421f2b51cd0ccb89fd9eb43c09585";
+          sha256 = "0576r8ap9gp91ycjf1d47pn13kxp0f9fysn09zlq44hr0s1y2y5d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict";
+          sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9";
+          name = "pyim-basedict";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/pyim-basedict";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pyim-greatdict";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "pyim-greatdict";
+          rev = "45fa4ff26f3444fb98c4dea460d84b740204d105";
+          sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-greatdict";
+          sha256 = "1bbindnklmmxdskv9vmjxhvlxxmaccgqn70prblhpg6n11bxjhl9";
+          name = "pyim-greatdict";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/pyim-greatdict";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
+    melpaBuild {
+        pname = "pyim-wbdict";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "pyim-wbdict";
+          rev = "114489ed97e825ae11a8d09da6e873820cf23106";
+          sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict";
+          sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i";
+          name = "pyim-wbdict";
+        };
+        packageRequires = [ pyim ];
+        meta = {
+          homepage = "https://melpa.org/#/pyim-wbdict";
+          license = lib.licenses.free;
+        };
+      }) {};
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pyimport";
@@ -30238,12 +30384,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.11";
+        version = "2.12";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
-          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -32165,6 +32311,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "snoopy";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "anmonteiro";
+          repo = "snoopy-mode";
+          rev = "8d2b7b1354414f261b237f2fed0d472803ba3909";
+          sha256 = "05q407dg6jppmqdxpp1ba8xs6yjilsa74hga46dbhcc9nzj9850a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
+          sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
+          name = "snoopy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/snoopy";
+          license = lib.licenses.free;
+        };
+      }) {};
     socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "socyl";
@@ -32441,12 +32608,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "2.0.1";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642";
-          sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s";
+          rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e";
+          sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -33110,12 +33277,12 @@
     suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "suomalainen-kalenteri";
-        version = "2015.11.29";
+        version = "2017.8.1";
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "suomalainen-kalenteri";
-          rev = "b7991cb35624ebc04a89bbe759d40f186c9c097e";
-          sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
+          rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3";
+          sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri";
@@ -34180,12 +34347,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "2.3.1";
+        version = "2.4.2";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "669ce39bcd93ca6353d24a72a358272d7b0e2268";
-          sha256 = "1sbvkgrdf6s8bkg38rfyj677dq3x4pry84hv30dgqhll7h8ja72w";
+          rev = "f8b4752dfe7fde7b90c65895c47943231af3237d";
+          sha256 = "1hy0jzk457nz9rz7s4hq6b5asv9g9wrrs1fdsisz7jzy6hzw4pqp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -34389,12 +34556,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "1.7.6";
+        version = "1.8";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
-          sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
+          rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4";
+          sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -34410,12 +34577,12 @@
     treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
     melpaBuild {
         pname = "treemacs-evil";
-        version = "1.7.6";
+        version = "1.8";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
-          sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
+          rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4";
+          sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -35319,12 +35486,12 @@
     vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vimish-fold";
-        version = "0.2.2";
+        version = "0.2.3";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "vimish-fold";
-          rev = "5c9ae8018002c10a034de60b527c42f3665f6b67";
-          sha256 = "01wxjvbq3i1ji9fpff7fbk20pzmr52z6fycqfi7malgwq05is1bm";
+          rev = "e631352fbf910f692807afe38a2b6a7882a403a8";
+          sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -36225,8 +36392,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "1ab8f296baeb";
-          sha256 = "02g34b7kp3lkv4sfgf1762vlmmsnxib37v8385lmv90ww24lwggg";
+          rev = "70b4ccc031bc";
+          sha256 = "1mbypvclk83lhwvdy6ancl4j9nysv47s8yp6baa8pi54zlc9w3i1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";

From 4a84b487fda193022e8ffbea56b9b234d805a6cf Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 1 Aug 2017 11:23:57 -0400
Subject: [PATCH 1370/3246] melpa-packages: 2017-08-01

Removals:
 - anything-project: removed from melpa
 - chinese-pyim-basedict: renamed to pyim-basedict
 - chinese-pyim-greatdict: renamed to pyim-greatdict
 - elscreen-persist: removed from melpa
 - mic-paren: repository no longer exists
 - mpg123: removed from melpa
 - mwe-log-commands: repository no longer exists
 - revive: removed from melpa
 - sql-mssql: removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 1847 +++++++++--------
 1 file changed, 1018 insertions(+), 829 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 192306a059a..8caa31c5dad 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -822,8 +822,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
-          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -881,12 +881,12 @@
     ac-sly = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
     melpaBuild {
         pname = "ac-sly";
-        version = "20150421.1322";
+        version = "20170728.327";
         src = fetchFromGitHub {
           owner = "qoocku";
           repo = "ac-sly";
-          rev = "b37a1ecfaab10a6d81c6d894417176d3bb4c5285";
-          sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a";
+          rev = "bf69c687c4ecf1994349d20c182e9b567399912e";
+          sha256 = "09g6v2yp3wl566488zsb79lklqpai9dgz6xwv1y5h6zkghxvkhpy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb26741e841d4886c14f0a059a52805732f179b1/recipes/ac-sly";
@@ -1613,12 +1613,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170713.146";
+        version = "20170726.140";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "84514026e342aa3cc98d8b6492175e1bdf788e5c";
-          sha256 = "0s5cll8sq5hg1jm7g1nkcpbcz0n6f84ax9drzghv9y0m86v819mq";
+          rev = "64fd8651fde0a25d55561517576d05c407373f8e";
+          sha256 = "0f57pym95bgb6s2mkwpk3jvsinwlz350k63xph6fkijygwzfkmwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1655,12 +1655,12 @@
     all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons-gnus";
-        version = "20170718.2354";
+        version = "20170726.619";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "all-the-icons-gnus";
-          rev = "8785d04f54b1692c04f4b665864f8f95425c20c6";
-          sha256 = "0zn9aq0ml39p2adjb9hpqk2iwb1dk5z5jdhabxszmhbs3zs53i52";
+          rev = "45560293e42d02c17c332894f3764dd624d25444";
+          sha256 = "1j0s3m54gyrl50bqss6xaijja1hdbm5285py750dn4ykrj5m3d3r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus";
@@ -2289,27 +2289,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    anything-project = callPackage ({ anything, fetchFromGitHub, fetchurl, imakado, lib, melpaBuild }:
-    melpaBuild {
-        pname = "anything-project";
-        version = "20141024.227";
-        src = fetchFromGitHub {
-          owner = "imakado";
-          repo = "anything-project";
-          rev = "9f6f04bc1911474e97e99faf52e204cf159add83";
-          sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e842d55882ec4d689d279fb80490db60a1f32fd6/recipes/anything-project";
-          sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr";
-          name = "anything-project";
-        };
-        packageRequires = [ anything imakado ];
-        meta = {
-          homepage = "https://melpa.org/#/anything-project";
-          license = lib.licenses.free;
-        };
-      }) {};
     anything-prosjekt = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }:
     melpaBuild {
         pname = "anything-prosjekt";
@@ -2625,12 +2604,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20170721.1400";
+        version = "20170726.1123";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "5727dd549d9cb95a6a18919f90428d7c5b860a99";
-          sha256 = "0a66s9lyi4anf4s6sxh66b4c4lsa9m3bqdqym4qhf53ywi55qal5";
+          rev = "4137ad1eed3fc2fe48c122e636f83580d1d04dd9";
+          sha256 = "1ydxwlv3v2whl4k77shlyjk0yyrm4cr6src9rsbzvw6in5cm483f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2665,12 +2644,12 @@
     arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "arch-packer";
-        version = "20170723.430";
+        version = "20170730.621";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "arch-packer";
-          rev = "743b3dc5f239c77e9c5c3049b5a9701da1ae12ee";
-          sha256 = "0h5ajz5mcj9g1y9f5fyqcjmqss99403v6lbqngh20mj8pi6w9rr5";
+          rev = "940e96f7d357c6570b675a0f942181c787f1bfd7";
+          sha256 = "0m80ka51m7a1797q6br41x96znvqfmpwzh3vk4mz66mdx2r4xk77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer";
@@ -2873,12 +2852,12 @@
     asn1-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "asn1-mode";
-        version = "20160626.2240";
+        version = "20170728.1926";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "asn1-mode";
-          rev = "c244717529229d7ecc2b2c160992f28dcb755d2c";
-          sha256 = "0r004sli3ggkhsdi61m8p32l227h5wligzph0mfhsy39fkhmva34";
+          rev = "d5d4a8259daf708411699bcea85d322f18beb972";
+          sha256 = "067khpi4ghzyifrk1vhi57n3alp67qks4k4km11hasiavi5gsjmp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b694baceceb54810be8f8c7152b2ac0b4063f01c/recipes/asn1-mode";
@@ -3150,8 +3129,8 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "e8d8733b1af67e4ea088d1ed015c554171feecb9";
-          sha256 = "05yzqrdk2d6mqyapgnfflfvm2pqifmb6fprf5si8n6wb8gmi2idw";
+          rev = "b9fb3ef8d4ebe7bef939a3cf574f9caa833347c9";
+          sha256 = "1rzqz560zqsymdpv84n1z17jyf7k75797y4bkzhk5grd3ry77x9j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -3225,22 +3204,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
+    auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
     melpaBuild {
         pname = "auto-compile";
-        version = "20170130.1017";
+        version = "20170728.942";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "auto-compile";
-          rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c";
-          sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7";
+          rev = "c9786234bdc32237e6c304e6a7c917504370358d";
+          sha256 = "0x9vmq9q3hkljv2dz57q97szsv60sbiyp6bbzp3272ykz6snpj76";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
-        packageRequires = [ dash emacs packed ];
+        packageRequires = [ emacs packed ];
         meta = {
           homepage = "https://melpa.org/#/auto-compile";
           license = lib.licenses.free;
@@ -4802,8 +4781,8 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd";
-          sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl";
+          rev = "6e489758708cf7797ab3619cfdccd7422615dcda";
+          sha256 = "0cjc9c2sr081b9nfspballb032h2809n1w3533v3ci8pcq82vq96";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -5612,7 +5591,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170719.2147";
+        version = "20170731.1658";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
@@ -5657,8 +5636,8 @@
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "2b7a41491df809e425b81a574fea64e9d6f7f011";
-          sha256 = "1haxw4xccalkwmrln5whd0lgfrq7lhdfyip2firlnrkaq8zw741w";
+          rev = "d45fecf0aca62f977ceb3b725aa7b7625ae82f33";
+          sha256 = "1ma40xnbxdpb49c9w1i65g2q1hl0b731c2vagqazxw21ng36mf71";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -6424,12 +6403,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20170701.429";
+        version = "20170729.609";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "b6deeffe032527696e32623b69bdf07b538a315e";
-          sha256 = "0ldc26wpgx01i1sfy9kc52dh3lmy53dr3pxxrn841rb37yc4h1rh";
+          rev = "ca090405d92d28bc9552ef4d5eab00e3d18a7d3c";
+          sha256 = "1ghpcz22i8dzdnxr8m5cl4g4l4bqc5z2h4f9chwhkc0csxlrvkal";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6905,12 +6884,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20170725.248";
+        version = "20170801.117";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "7a843c9209cf48c53e1f3dfd533c156d6c701501";
-          sha256 = "0xj0bqn3mc8kpihpki1y2wx9ydqvza9kbpz2di8wa768zj1xh6qz";
+          rev = "486d9a6aa6aac64a9c53555ec69980be5f3ad366";
+          sha256 = "03rc80v44slqh4r9fdyl95mljcx4gspn1bij4kc1wzrs5anf8dig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -7077,8 +7056,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "78798134af82a300e54a5d22d2f10c2885cd11ae";
-          sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs";
+          rev = "16d156562aef72f02ced58087335ed72d520d878";
+          sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -7119,8 +7098,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "78798134af82a300e54a5d22d2f10c2885cd11ae";
-          sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs";
+          rev = "16d156562aef72f02ced58087335ed72d520d878";
+          sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7328,8 +7307,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "e14319ed4308647746027bd62131ef07692710b9";
-          sha256 = "1rpv8nl18wgijz3vh7anh1xvhqx8vbc8bajx0l2036v3k4mq3dc6";
+          rev = "089803189dafa145564b37b2e9340da547ff7c0c";
+          sha256 = "07xd2pkz30nf09jv7vqb29n1vd3wc70p7j42f0zz22dcvx3iw2g3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7368,7 +7347,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12277";
+          rev = "12278";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7700,16 +7679,16 @@
     chinese-fonts-setup = callPackage ({ cnfonts, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20170724.737";
+        version = "20170726.1517";
         src = fetchFromGitHub {
           owner = "tumashu";
-          repo = "chinese-fonts-setup";
-          rev = "bb285b91da12ba9c5897a6aed9c893449000210d";
-          sha256 = "0dq745yjbwv1xb6i7m7372i4rb6brq9y4f70m01wcmacm6h85j14";
+          repo = "cnfonts";
+          rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182";
+          sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
-          sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup";
+          sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1";
           name = "chinese-fonts-setup";
         };
         packageRequires = [ cnfonts emacs ];
@@ -7742,16 +7721,16 @@
     chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20170724.1618";
+        version = "20170728.2242";
         src = fetchFromGitHub {
           owner = "tumashu";
-          repo = "chinese-pyim";
-          rev = "dd034c6fb9473aed7ee856a366f3cac031e82209";
-          sha256 = "1clqz4yg86mm673pabzi54angc7qr41pikrz0x2ya0qhz88g0y9s";
+          repo = "pyim";
+          rev = "88adc57d754c9aecc922fe8b29239148f2b6557c";
+          sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
-          sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim";
+          sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn";
           name = "chinese-pyim";
         };
         packageRequires = [ pyim ];
@@ -7760,69 +7739,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "chinese-pyim-basedict";
-        version = "20170724.1523";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "chinese-pyim-basedict";
-          rev = "6b6eea5375d2e0b4b6374fbf766ebb209ece86af";
-          sha256 = "0rx30m9ag3hbggm9jl0bpkn0svf5838nj6qsailcnxkyxq3cga2l";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict";
-          sha256 = "1qmr71lnpn06mcbb6gfr3dh78pav0sk9mld956cvnkg82vg7nmpv";
-          name = "chinese-pyim-basedict";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-pyim-basedict";
-          license = lib.licenses.free;
-        };
-      }) {};
-    chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "chinese-pyim-greatdict";
-        version = "20170724.1525";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "chinese-pyim-greatdict";
-          rev = "45fa4ff26f3444fb98c4dea460d84b740204d105";
-          sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict";
-          sha256 = "1xqr2fcsb45khavqx06ry2sm8db790zlggk61civbdyafvlz8ikc";
-          name = "chinese-pyim-greatdict";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-pyim-greatdict";
-          license = lib.licenses.free;
-        };
-      }) {};
-    chinese-pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "chinese-pyim-wbdict";
-        version = "20170724.1527";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "chinese-pyim-wbdict";
-          rev = "114489ed97e825ae11a8d09da6e873820cf23106";
-          sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict";
-          sha256 = "0y9hwn9rjplb69vi4s9bvf6fkvns2rlpkqm0qvv44mxq7g61lm5c";
-          name = "chinese-pyim-wbdict";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-pyim-wbdict";
-          license = lib.licenses.free;
-        };
-      }) {};
     chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-wbim";
@@ -7971,12 +7887,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170724.2248";
+        version = "20170729.133";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "ea6aa352f7e5b97e00ac2057c2d7579a9e6f411f";
-          sha256 = "000zgcb66hgh1sxcn48q6dp2ln90nakpknikp441z8h9yhaazh8f";
+          rev = "71f737d444da95c6175b513d500c56ae9711bbd0";
+          sha256 = "0z2djw2y0rzpm256jqihv19hn9q8b7x2mga3h5r2gwzw803134y9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8160,12 +8076,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20170528.731";
+        version = "20170728.638";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
-          sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
+          rev = "47bbcf4268602688f90c08ce64ec93226fc3f894";
+          sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -8247,7 +8163,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "309006";
+          rev = "309673";
           sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
         };
         recipeFile = fetchurl {
@@ -8549,12 +8465,12 @@
     cloc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cloc";
-        version = "20151007.201";
+        version = "20170728.1124";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
           repo = "cloc-emacs";
-          rev = "15e63b83dd6261f543d25aac4c72e764e3274d53";
-          sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v";
+          rev = "f30f0472e465cc8d433d2473e9d3b8dfe2c94491";
+          sha256 = "0g8hklc0914dsi3ks7g251w58ixa78qsh87dx914cc8sahpc0ws2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd7a641efd13aa0bd7509d8a5b0a28e3a0493c8/recipes/cloc";
@@ -8633,12 +8549,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170712.349";
+        version = "20170725.2307";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4";
-          sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd";
+          rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613";
+          sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8658,8 +8574,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4";
-          sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd";
+          rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613";
+          sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8717,12 +8633,12 @@
     clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "clomacs";
-        version = "20170705.719";
+        version = "20170726.436";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clomacs";
-          rev = "7af6fa717f08fda930641a27f3a07743c2042514";
-          sha256 = "1diavwmjgaz0jxjbkzhlca9klqd7kmpih98clp8wiavhms80ykds";
+          rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1";
+          sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
@@ -8738,12 +8654,12 @@
     closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "closql";
-        version = "20161130.925";
+        version = "20170629.921";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "closql";
-          rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3";
-          sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5";
+          rev = "73e68bcfbe076e152beed1b8e5f894ca438f9770";
+          sha256 = "0vj18784x6cdl39sbfpsksmxln5yj31ah250q5n7ivh54vk2hvjl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -8864,12 +8780,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20170712.809";
+        version = "20170730.546";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "a20bf1a6b3c0c70f3637f5a8f4280ff3479ec180";
-          sha256 = "07m1z36823pzlf4d0wf3v053svgyi2r8wk7rxjmnzrz717y6xj9h";
+          rev = "7747ab37dfd678c3349d13ab8bcb9e5cff93c637";
+          sha256 = "1p9vn3jnk3j0l2xm818dijfh5wm8l6y4ir2xiq6pqxf9v3qrp2lv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8889,8 +8805,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "d9a541eacbd0d3e833a93853f03e6be26b99dc37";
-          sha256 = "0fr4wml4ay4vi9wsn8jv566nakq1q68ylm3yacy7031fndq3ipvr";
+          rev = "748c192f8b8181f3df39ab4f6a07f25a45211c8f";
+          sha256 = "1l4xx4lbm9xlvkq80dij7sydh0vnaj97ad42qjll9afwp6galp2b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9006,6 +8922,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cnfonts";
+        version = "20170731.1611";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "cnfonts";
+          rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182";
+          sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
+          sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w";
+          name = "cnfonts";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/cnfonts";
+          license = lib.licenses.free;
+        };
+      }) {};
     cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cobra-mode";
@@ -9239,12 +9176,12 @@
     color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-identifiers-mode";
-        version = "20170615.1338";
+        version = "20170730.1852";
         src = fetchFromGitHub {
           owner = "ankurdave";
           repo = "color-identifiers-mode";
-          rev = "d57e162c2dcb926291ded21cbe46b98ad0ca32c8";
-          sha256 = "1n12z7qfwgsdvdzzi5gkgkmdaazbrg5064s08xsc6gsfs4rb5d17";
+          rev = "2091833fde5e3877f966e987ee8e30a85c8e31ac";
+          sha256 = "0q2il3df7hm4nn3fpn82b9mz911yhzybzcizvhv6dpsdadbhidjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
@@ -9385,12 +9322,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170626.1417";
+        version = "20170730.241";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "ffcec9177c8b4393f036acb5ca51b33b53916ea8";
-          sha256 = "0w59yfg7chx6srxpxsnwz7qrgyy35pdswv44j6lbh33hylxmclrh";
+          rev = "51c95e37f02bc075a3d0d7a795dc7083ab57128b";
+          sha256 = "16jbf9h0x0vw1mly4x0zrqvzs6wg16jplgy43kcnr8sc1xbj16xy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -10217,12 +10154,12 @@
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
-        version = "20170221.751";
+        version = "20170729.429";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "34b4b52f67e5c1ffaf807e4be1512fca4695eea8";
-          sha256 = "0xl2am7kwbdfaxysjamq0b9slcdmlqqprb23zf07i4b28qa72qca";
+          rev = "1ab4b8e582450a1b1780e69c823d63c4622b8a1e";
+          sha256 = "0i64qm7y0c93ca3fsydinab9l4mgr1kd4m0l06871583w3brjirf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -10437,8 +10374,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
-          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10978,12 +10915,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170725.946";
+        version = "20170728.855";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
-          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
+          rev = "fc275339b57690d4157160ed22b7672d5382cbe7";
+          sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11398,12 +11335,12 @@
     cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "cricbuzz";
-        version = "20170724.2330";
+        version = "20170726.504";
         src = fetchFromGitHub {
           owner = "lepisma";
           repo = "cricbuzz.el";
-          rev = "049e9d3c0c67350e008e62bd15b263add8f3a403";
-          sha256 = "1vvaysvmpvdm4l20arzwgy0xhqy7lnav6wglq1x9ax7c7c0a3cdr";
+          rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69";
+          sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@@ -11485,8 +11422,8 @@
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "e805ab780a4a1ce22a4436bde09b95e97d150e51";
-          sha256 = "007mhf60w8385ki2bqhsfjhhc4zq8k21ivgzpw15z83y641nyjp5";
+          rev = "11096b95d1119847e746e4aae36c9de6163e5472";
+          sha256 = "0ykm3cm6yrwp4a1b5rjjg9wzdp37w2rnjg1cyg2q33k31p49ywrf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -11586,16 +11523,16 @@
     csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
     melpaBuild {
         pname = "csound-mode";
-        version = "20170725.855";
+        version = "20170731.1504";
         src = fetchFromGitHub {
           owner = "hlolli";
           repo = "csound-mode";
-          rev = "14524d63a174c36a052c79025942f6a116a5f197";
-          sha256 = "1h5sfwl2mjy8w2hnb73w2am1p2glwzf5n53q3d0ri8in83nxjn59";
+          rev = "34d9499e8da475c491eac1158bd429bf0e10e7de";
+          sha256 = "1j7gykp16im5rlrlhrxk5svz9w543350q6lz41754ah0f7i8gc6m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/95ccfae76a2c0f627f6d218ca68072e79fcfd088/recipes/csound-mode";
-          sha256 = "15zmgsh1071cyd9a0d7cljq8k7d8l2gkjjpv8z22gnm0wfbb0yys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
+          sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d";
           name = "csound-mode";
         };
         packageRequires = [ emacs multi shut-up ];
@@ -11731,12 +11668,12 @@
     ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ctags-update";
-        version = "20170120.2313";
+        version = "20170728.58";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "ctags-update";
-          rev = "9c58084395bd5c62c3fe500cd56d62bfc1dcee51";
-          sha256 = "0cgq31ivhhr32pz17yfy7sja81bhxjh7fn502fa8mc9c3msgflwn";
+          rev = "783bf91eba1cd27cbb739067a24e15e5e04564e6";
+          sha256 = "1navj3cm5gmp0h8wyk281i1gjry1kj0i73wlz1fjwkqm6awxfz4w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update";
@@ -12065,8 +12002,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "fb5e92001fe31a49227378e90a77bc5f4e2a83ff";
-          sha256 = "0ym87yhmidxn25ba9si6hl76svgzm9mb8ar2qbbb9h7xcqscx6p0";
+          rev = "c95ca9f21a3524718a83c3415bb7102a508154be";
+          sha256 = "1d1hrd57k23gg5sbm49y17a1ly55d0d07if2sm467sa0b12zk45m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12226,22 +12163,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
+    dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dante";
-        version = "20170708.421";
+        version = "20170726.1140";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "bf5d2bfc9a1696b97b1658a8090fdf80b6e9a730";
-          sha256 = "0y5gg85sp73xzn6hj54w19di4d9x5w0nzl6h7lfp7l9kg94v0dsv";
+          rev = "ac13c74b76aaf646af2bec9d01fe29f1725baac6";
+          sha256 = "1k51pm10qkp2svbzlajswgsyghad8v91djir6iyfdjl54qjhk56y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
           sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
           name = "dante";
         };
-        packageRequires = [ dash emacs f flycheck s ];
+        packageRequires = [ dash emacs f flycheck haskell-mode s ];
         meta = {
           homepage = "https://melpa.org/#/dante";
           license = lib.licenses.free;
@@ -12397,12 +12334,12 @@
     darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darkokai-theme";
-        version = "20170711.403";
+        version = "20170728.339";
         src = fetchFromGitHub {
           owner = "sjrmanning";
           repo = "darkokai";
-          rev = "94f845d0194bfd45e6a3c17222bba19aece9dd63";
-          sha256 = "1zdzwjn3qcgxp7azz3sb5nfnmfd5mh9frvjlq5k013syy2p6xh44";
+          rev = "d881d51acf0a7f806ae68d48305e30941a741a0e";
+          sha256 = "008kn8gllhzlv49br0bs3469insjpcgr3r7iijz1frgy6wrpmdjp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme";
@@ -12460,12 +12397,12 @@
     dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dash";
-        version = "20170613.151";
+        version = "20170727.212";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "0468a3137c9e0d49121213f416fc7e2547d46a77";
-          sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg";
+          rev = "b4faa9397e06206b646f684a603e320f962674d1";
+          sha256 = "0cjh9g8xfzf2rb6dy313rpxwd40yl7n3hdl9a2k8fdwyaww97p6a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12506,8 +12443,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "0468a3137c9e0d49121213f416fc7e2547d46a77";
-          sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg";
+          rev = "b4faa9397e06206b646f684a603e320f962674d1";
+          sha256 = "0cjh9g8xfzf2rb6dy313rpxwd40yl7n3hdl9a2k8fdwyaww97p6a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12716,8 +12653,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "78798134af82a300e54a5d22d2f10c2885cd11ae";
-          sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs";
+          rev = "16d156562aef72f02ced58087335ed72d520d878";
+          sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -13128,12 +13065,12 @@
     devdocs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "devdocs";
-        version = "20160607.540";
+        version = "20170731.150";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "devdocs.el";
-          rev = "1bff4bd406fc71199d9dcac503269f7aa8fcebe6";
-          sha256 = "0qxy4i9438jmbxbj980civ8csh507gri3q3bszg3s1wv966k69rz";
+          rev = "a2d51e824f0cc48a9dd611cc740bc8b86143e611";
+          sha256 = "0nzh7pgvj4cs5d29lrrmbas29xdslgqzsqjmpapzqzbnrgprnbx8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a54ff5faeefabf484ef175433cfc2b8317993f74/recipes/devdocs";
@@ -13149,12 +13086,12 @@
     dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dfmt";
-        version = "20160911.228";
+        version = "20170728.323";
         src = fetchFromGitHub {
           owner = "qsimpleq";
           repo = "elisp-dfmt";
-          rev = "f07512fc8555ecd592d8a44722baf922f9f77aaf";
-          sha256 = "1ph8z4hazz71k8zsv4gfhpsbysj4d3rinb68fmhp842n00ds6fk4";
+          rev = "21b9094e907b7ac53f5ecb4ff4539613a9d12434";
+          sha256 = "11r1i8nlz98z49fqb447abg1pv6838q54ly19wyg82k52875ms7m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt";
@@ -14819,22 +14756,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
     melpaBuild {
         pname = "docker-compose-mode";
-        version = "20170722.941";
+        version = "20170730.1527";
         src = fetchFromGitHub {
           owner = "meqif";
           repo = "docker-compose-mode";
-          rev = "c21c79aa0aac7175eb90913b2eaa1201c181bd01";
-          sha256 = "03w99zlhafypsw3rjf0skp5m963sq7ygd63ibknqaw3xghb0vxyz";
+          rev = "a38b64aecd037556c91d9aef29f1d04496295f2b";
+          sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
           sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
           name = "docker-compose-mode";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ dash emacs yaml-mode ];
         meta = {
           homepage = "https://melpa.org/#/docker-compose-mode";
           license = lib.licenses.free;
@@ -14969,12 +14906,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170718.1137";
+        version = "20170727.1321";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "557ff5d129b8b79e48287e68c934d309070c0542";
-          sha256 = "1swwb3mkysn3rj9mbmbnyg0whx13k060cyi0phly5zssk4sj1n5i";
+          rev = "70e99c07e626774f52008cacb3f7fc18453d97ce";
+          sha256 = "160m5f05l32372i9qj611zmkf6bj5f7vnjprrkkx29ldz7f5pc0i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15404,7 +15341,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1802990";
+          rev = "1803635";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15505,12 +15442,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170721.49";
+        version = "20170725.1803";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "e1a6647fecdaf77f737c3d16e0b8e6cb3cab1cb2";
-          sha256 = "0bxfayqrp05fsic0nfk47iarfqgdlnqaahvbr9bx56js9s0fgm5p";
+          rev = "8fae9be1b630c57d5d40586bddda70024006701f";
+          sha256 = "18mq9anbw6l0d13lfbnghbc2iszibi36ds14zd1jvmfq2nbxq3bb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15568,12 +15505,12 @@
     dut-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dut-mode";
-        version = "20170721.2214";
+        version = "20170729.1411";
         src = fetchFromGitHub {
           owner = "dut-lang";
           repo = "dut-mode";
-          rev = "affd16ad1e78799bb4ec99f80006271447d075f9";
-          sha256 = "16yp7s3m7bm4chmkzlbqix4cfv6x7mgcdcl7j55h782dm252zfcg";
+          rev = "9235c7acaa6690942e9de8b7acd1e4be0c859dc1";
+          sha256 = "0fpqsm6y23anyx57gp4c6whzxrn8x03cp76iwx27c4gkq6ph1z8n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf49ceab8b25591fab2ed6574cba0e6634d1539/recipes/dut-mode";
@@ -15903,12 +15840,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170724.1123";
+        version = "20170730.2031";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "ca215061068b2dec3dd98f0da3a1294fa2f77430";
-          sha256 = "06mihlh2zzgfkbss9gbhyd5f8wkmb4lxsxnxfndym63pgzsy2j0s";
+          rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19";
+          sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -16050,12 +15987,12 @@
     ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ecb";
-        version = "20160101.933";
+        version = "20170728.1221";
         src = fetchFromGitHub {
           owner = "ecb-home";
           repo = "ecb";
-          rev = "661edbfcddcdb75331cf28870e6a5fb4ba9ca27f";
-          sha256 = "1ac9b6k10kniqkiadzfa7mjhy1nf6ypd3fl6yvmr8yigc2phszny";
+          rev = "1330a44cf3c171781083b0b926ab7622f64e6e81";
+          sha256 = "0nx1blkvnzrxd2l7ckdihm9fvq5vkcghf6qccagkjzk4zbdalz30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb";
@@ -16510,12 +16447,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20170607.713";
+        version = "20170725.1610";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "1543835ce00412c3cd34a61497af5f68ead250a6";
-          sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01";
+          rev = "1884ac61c2d8045bbb96465df7e29b2c740c48ed";
+          sha256 = "1c8h7vndcf4dwp5zlwsdnw3mkmxmjifn7m660pnpxj52s2da3801";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16615,12 +16552,12 @@
     edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "edts";
-        version = "20170725.338";
+        version = "20170729.659";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
           repo = "edts";
-          rev = "5b94473b7fe00edc50a001ff4eb55f54753d8742";
-          sha256 = "00yqmfic02f6082mndndnfcas16by3lav8w3z0hh618a8prmzhdm";
+          rev = "b3508bc998cebd4946b591d61b0bb4d5a56ef704";
+          sha256 = "0r6g8pzf94n3h56fz933hq8jxf7chpj3kbgykj3ffabxkjxfn2rg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16662,6 +16599,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eg";
+        version = "20170730.849";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "eg.el";
+          rev = "4d9fb8f2f4905c25aefd0759e89fa13cb994cdeb";
+          sha256 = "1d4lcf48m8ac2rmszx7l0nkmfr28fv2g3flwwpmb4zjkhz2k1gw0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
+          sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7";
+          name = "eg";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/eg";
+          license = lib.licenses.free;
+        };
+      }) {};
     egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "egg";
@@ -16765,15 +16723,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, skewer-mode, websocket }:
+    ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170714.1910";
+        version = "20170725.1457";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "cda6143270cf44d2c9e59904b2c7bbd225d226ee";
-          sha256 = "13h93cs69cz9rq56jncjiq3p0fkd3khniral828ky5vkvhihf2wv";
+          rev = "4f5f29d3516d687025ad9423dc98bcd202efed56";
+          sha256 = "17243a77m7y4abiwscf885wmci1mkln4axay49f44cyfcj3fk2i2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16786,6 +16744,7 @@
           dash
           deferred
           request
+          request-deferred
           skewer-mode
           websocket
         ];
@@ -16839,12 +16798,12 @@
     ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20170621.348";
+        version = "20170728.539";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "438e4f5995285d28fe7dddceacac212c2250dfe2";
-          sha256 = "01nxgv2yz9clbqr35kdl36zmip0nkqa45ab6b06npdxpcs4438nq";
+          rev = "c02d2f14e3e803094c47c5d605196af887a5d80f";
+          sha256 = "140s75sqlvgc7a00ankkb7892yc03vznk6gvilgdcccw76dki9l1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -17648,12 +17607,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20170714.1600";
+        version = "20170729.338";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "4155f4333545189901ce574601ef34dada07b672";
-          sha256 = "1q5qgjmmwnhgq4ckpkzy3wvmnj3cgzcggwm9q9jsdfmz0j1dgwn4";
+          rev = "e3fca6d8f5bc176de26d37fe9c1b3e129f79cab0";
+          sha256 = "1p30k2bws9r3j4dmdxin1dz31d751wyikqgyqs9wzcddk0cfrm46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -18030,27 +17989,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }:
-    melpaBuild {
-        pname = "elscreen-persist";
-        version = "20160505.1829";
-        src = fetchFromGitHub {
-          owner = "robario";
-          repo = "elscreen-persist";
-          rev = "79cb33909a9c66bb183432b956edffbc6b12ace3";
-          sha256 = "0p0zphl3ylrbs3mz12y40hphslxd1hlszk1pqi151xrfgc2r0pp8";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c30ec71dcc29d1d0fd6c54de512c8c4636a7e0a6/recipes/elscreen-persist";
-          sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
-          name = "elscreen-persist";
-        };
-        packageRequires = [ elscreen revive ];
-        meta = {
-          homepage = "https://melpa.org/#/elscreen-persist";
-          license = lib.licenses.free;
-        };
-      }) {};
     elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elscreen-separate-buffer-list";
@@ -18072,6 +18010,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elvish-mode";
+        version = "20170729.1702";
+        src = fetchFromGitHub {
+          owner = "ALSchwalm";
+          repo = "elvish-mode";
+          rev = "72ac8385c0dc923ce2385f1e8c4aee3f6ef99d1c";
+          sha256 = "0daw0wgd7rpdp78dsacw8kr2kcrhqg4082wdbzl14lyimpmzm4fy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode";
+          sha256 = "1f5pyadmbh2ldd51srvlhbjq2849f1f0s8qmpjnsz9bc986yga34";
+          name = "elvish-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/elvish-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elwm";
@@ -18121,8 +18080,8 @@
         src = fetchFromGitHub {
           owner = "echosa";
           repo = "emacs-setup";
-          rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2";
-          sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
+          rev = "c783ec13e3b39093fffb6f6d64dccdce8ce4d375";
+          sha256 = "1crpjcxwanbrd1yd4lbb5lmqwvx1mczya7ff2qr3phk497czpsqm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abb7101b2d48af56af09d1dc85c540300dba7b3c/recipes/emacs-setup";
@@ -18860,22 +18819,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    engine-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "engine-mode";
-        version = "20170508.828";
+        version = "20170731.1304";
         src = fetchFromGitHub {
           owner = "hrs";
           repo = "engine-mode";
-          rev = "59f1d463fada670895b00bab406160570fb8bc35";
-          sha256 = "1j8jym795k59lhsckvnh06mykz7b2f54v52n0dwvhyy2aaq0bnhl";
+          rev = "feb41a46e3a4cfcdea405db2bc3ea485776eaa7f";
+          sha256 = "0g5sxrbcbf5bv62szw7m9cfxj0lxa090pxj9s6i0v83ljxnra8sn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/engine-mode";
           license = lib.licenses.free;
@@ -18968,12 +18927,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170724.630";
+        version = "20170731.425";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "c8e936ed3793fab0dcbfad797ff97aa5c91562e2";
-          sha256 = "0mj0k5wh6sndlnj8pcfhl0gwgas6433iyjrifpf0v5p7m5cizy5x";
+          rev = "6f6978d41126803ee61f614c91e791e6b5a36e38";
+          sha256 = "1acqi07n3yncv2mz2qm6c46b2381j1fjmmrrlcg3yb72inqr73y7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19081,12 +19040,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20170723.1240";
+        version = "20170726.940";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "11e8cc60a4dcfa973fabb4085b35e5951def84ca";
-          sha256 = "1izgmlv52qgc8y29zx12q25bm1y3yzzz0sdy128bj2blc6j60wbd";
+          rev = "f0959ca39cdbcb72049b31cab6e7c449749bfefe";
+          sha256 = "1pblli8g6ahsxgjk55yyzpdhlriq44i54yl27wdyvcyv2fffbdab";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19609,8 +19568,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "72d994d7a6251e6ec72cf864b11309e01c50ba1f";
-          sha256 = "05bs7r01bm2zfldg3j4915rnm7px2hcr04p3yzsy8sz36hqcjm81";
+          rev = "e25f673d520342bfe7cd479ef6b850a57f8ab1ea";
+          sha256 = "11gx8rqgxxnadgb1hizv6rdj7s9ib9m7bg8rm0ncvgrmykfaq8wm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19877,12 +19836,12 @@
     esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esh-help";
-        version = "20170702.1912";
+        version = "20170730.2157";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "esh-help";
-          rev = "15994c0d1c36f6209547742690c6d8f2ef505393";
-          sha256 = "0a0n05mhgp8gvxkld0510k4kq4m81aq2jdrgmfyafm5am5abz6lp";
+          rev = "fdd62fb873e2a9a664314a45f91529cac00b8c47";
+          sha256 = "1z8gl8mwnr1g7n9jn9iw5a6c9jsr1gjbx3004k07rlw8dld59qd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
@@ -20192,12 +20151,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170725.59";
+        version = "20170728.238";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "a313565f97badfefb289672af45df6311060eef3";
-          sha256 = "15zy6hjfpwkacxc11ws76w7ynwl4m2qqlh84xq3nifg2zpl4cns6";
+          rev = "58c130a1bc13c8933bde229424d628ec2b6a6a97";
+          sha256 = "086isv62shvvf8sp5iicd45d3p1z071l5vik7445lbgind6wfbg5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20318,12 +20277,12 @@
     esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esup";
-        version = "20170724.2348";
+        version = "20170729.1742";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "esup";
-          rev = "86500014ccf9736a731038222d5d2727e428bb6c";
-          sha256 = "03kblqlh9q2i3zmlj97wi0m93df3c799njlb6gpjl7ml6qfj4qf7";
+          rev = "94e0d2bef2bcdbd9477e702f63148cc2de75ecb3";
+          sha256 = "0rz2a8ydr7jrsgz1mxgjk4wyf7rkz0w3qvx6jy8mygzhzhmniy24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -20440,12 +20399,12 @@
     euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "euslisp-mode";
-        version = "20170621.945";
+        version = "20170731.943";
         src = fetchFromGitHub {
           owner = "iory";
           repo = "euslisp-mode";
-          rev = "16ee25d6d84d0e0b1b153791c51acedafd8d572b";
-          sha256 = "1a496xzw6vs6rv7pp6yv3zmjdxbypjz132r6s6595gjcvwrfisr5";
+          rev = "e2c6506a4d333ceb99dc64c34944beb0b34431c8";
+          sha256 = "1knphaw3sw20wjvyqs9a1ppx0r04xif756ixxb2ymakhb8g0ifbh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode";
@@ -20482,12 +20441,12 @@
     eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "eval-in-repl";
-        version = "20170217.1432";
+        version = "20170730.1445";
         src = fetchFromGitHub {
           owner = "kaz-yos";
           repo = "eval-in-repl";
-          rev = "b21c5f0da65973d542952ab86e001b777c5f3447";
-          sha256 = "15zd9vqjh89lhy9h6kbhrm5m5394zfzma3xdcfp1dmk8v7384py8";
+          rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60";
+          sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -20587,12 +20546,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170712.2350";
+        version = "20170726.912";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "a0b6afcf3993f2edcce39052403220a10e74f362";
-          sha256 = "0qswzjxm91s34x32xa61ypwr2fc7cgjaj1wnlgqznxyzjqvdh709";
+          rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f";
+          sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -21154,12 +21113,12 @@
     evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-matchit";
-        version = "20170719.702";
+        version = "20170727.1741";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b";
-          sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp";
+          rev = "dbaae2b7537aadb2e44a8915745ee190768b4b2a";
+          sha256 = "1y386wjz23kqfqbbgrwg4fnv2ma21dzk5ppnqd0y5245v388q69n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -21550,22 +21509,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-swap-keys";
-        version = "20170221.444";
+        version = "20170726.1120";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-swap-keys";
-          rev = "6a2f4db944076439c2cb481c4e9e4e5d736a5ab8";
-          sha256 = "0ymxmlx6dfczxkdgsm8g8pz6dhdnb3ay74s2a70jgwqns8yaqv7k";
+          rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a";
+          sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys";
           sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6";
           name = "evil-swap-keys";
         };
-        packageRequires = [ emacs evil ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/evil-swap-keys";
           license = lib.licenses.free;
@@ -21613,6 +21572,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-test-helpers";
+        version = "20170719.1445";
+        src = fetchFromGitHub {
+          owner = "emacs-evil";
+          repo = "evil";
+          rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f";
+          sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
+          sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs";
+          name = "evil-test-helpers";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-test-helpers";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-text-object-python";
@@ -22161,12 +22141,12 @@
     f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "f3";
-        version = "20160628.1601";
+        version = "20170728.1120";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
           repo = "f3";
-          rev = "114fec094c4ea063724c05404a2ece53f510b3e3";
-          sha256 = "0fh69qhvdks1hclwhr9nv6bgbsjwdk0mwqhw3dmlv2jb5yip308m";
+          rev = "1ed0ac4368a9f631f6dfad7ad17e9f7434a42bd6";
+          sha256 = "03crpcb1jbbc12nz912qdkipmm94xlrpzr2cgckya0cj8sdgv9fz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3";
@@ -23470,12 +23450,12 @@
     flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flow-minor-mode";
-        version = "20170418.1253";
+        version = "20170729.1008";
         src = fetchFromGitHub {
           owner = "an-sh";
           repo = "flow-minor-mode";
-          rev = "b05d59f387133249e03004b79bf16d6fe6c38217";
-          sha256 = "0kw001kcdqjj3ymk9vn9giiv18icp3yrys8xdvszkhlby99y74h5";
+          rev = "75067baceed7d699dda43944da49dc58d22baeff";
+          sha256 = "0r1xs3vff3ng0h2w8nn7mxssdnipnrzwk9dh5f5v7prwk2q60byb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
@@ -23575,12 +23555,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170723.839";
+        version = "20170730.1740";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "35c0ce171dc7127d85a745d922b233544c41040b";
-          sha256 = "0084lk692l6lxz82k242v2gwp6bdv5yjv5xvn3ra43x2d7mx4zz1";
+          rev = "c451140ef785dd7853445121866f9ea45889255b";
+          sha256 = "0vnpnv7kcbgdrpnqw9mb3qn5lzi4493k8b5jwwl6rz5hrl84yrx3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24244,6 +24224,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-inline = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, inline-docs, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-inline";
+        version = "20170728.2328";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "flycheck-inline";
+          rev = "d24e3772b0ac6e40306ff25cebd7c6add696d54c";
+          sha256 = "0hgcgyjrbdqsgf54wa3j6mkq41nq28n2hyysdgfgnn4kd2jmri40";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6ad3925576719f34682f65867fd5bbbc97818870/recipes/flycheck-inline";
+          sha256 = "1yas4csz0xv0h61nzlywrp9z665gcmwr8vjrkm2psh04rfqhx3wg";
+          name = "flycheck-inline";
+        };
+        packageRequires = [ cl-lib emacs flycheck inline-docs ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-inline";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-irony";
@@ -24289,12 +24290,12 @@
     flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-julia";
-        version = "20170715.945";
+        version = "20170729.1441";
         src = fetchFromGitHub {
           owner = "gdkrmr";
           repo = "flycheck-julia";
-          rev = "0eaa3216dc35679d72c0d107127d48915516df08";
-          sha256 = "091zjabzrw1f194pmz60ij3ys8sw54dxj9q3vpl3sigr1jd1qq7v";
+          rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6";
+          sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia";
@@ -24478,12 +24479,12 @@
     flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
     melpaBuild {
         pname = "flycheck-ocaml";
-        version = "20151103.212";
+        version = "20170730.1453";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-ocaml";
-          rev = "e4412025f27850918762237fa80b33e285a63e7c";
-          sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94";
+          rev = "8707a7bf545a8639a6a5c600a98d9a2ea1487dc9";
+          sha256 = "13vzxkjq6v1f1i9zgxgjbwpiba04k9frkcl2wx6a9h3vgd7jyay0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ce9283eb1285953a2578eb7c4d280b4d98c801f/recipes/flycheck-ocaml";
@@ -24643,6 +24644,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-pycheckers";
+        version = "20170728.1103";
+        src = fetchFromGitHub {
+          owner = "msherry";
+          repo = "flycheck-pycheckers";
+          rev = "2fd53300525deb3c5ac903cc4cb89e3e5cce7b4e";
+          sha256 = "1nw6vifmpncnkhdbnn95khncdwjahri2l862c97q4ni5ikms7i7q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
+          sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq";
+          name = "flycheck-pycheckers";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-pycheckers";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-pyflakes";
@@ -24692,8 +24714,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
-          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24814,12 +24836,12 @@
     flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flycheck-tip";
-        version = "20160908.1953";
+        version = "20170729.1411";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "flycheck-tip";
-          rev = "53e812ae6d517e8d35907eed8ddcee95c2922e91";
-          sha256 = "180c9q273k8167kfkfkvgsadprr34irnmb4qx8ksr3dmg77ghpc8";
+          rev = "cbdff9a574fab1222ed50d7c1359ffb820f30934";
+          sha256 = "0ic9cdsi30mx5ldrbzc2i9y4q69fpa9s19zrdk10i3wxs6mmgl8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip";
@@ -25339,12 +25361,12 @@
     flymake-puppet = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-puppet";
-        version = "20141006.1855";
+        version = "20170731.2254";
         src = fetchFromGitHub {
           owner = "benprew";
           repo = "flymake-puppet";
-          rev = "fc4cd25aeac37ed5722bc586d5350fd06ee3067c";
-          sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m";
+          rev = "9579e5c736cb890195464fabf51df113313de88d";
+          sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet";
@@ -25402,12 +25424,12 @@
     flymake-rust = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-rust";
-        version = "20141004.1552";
+        version = "20170729.1439";
         src = fetchFromGitHub {
           owner = "jxs";
           repo = "flymake-rust";
-          rev = "72ec92c261670b7384ee2593d0f1946ea29f429a";
-          sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv";
+          rev = "2f42d1f2dad73ec9de460eda6176e3ab25c446f0";
+          sha256 = "02fgkv9hxwrv8n5h6izb5jyjcpazlf86pjjj4zkv1ycpa6gyzzwn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/flymake-rust";
@@ -25469,8 +25491,8 @@
         src = fetchFromGitHub {
           owner = "kootenpv";
           repo = "flymake-solidity";
-          rev = "07f33ed52aac5d958fc0f50026a9bf111e1a5308";
-          sha256 = "1rq47qhp3jdrw1n22cnhvhcxqzbi6v9r94kgf3200vrfp435rvkn";
+          rev = "b9a9aa78b84b2358c24a73a84fcd3d133a0423f1";
+          sha256 = "06ndpccsqrnfgxpgsywgq81ykkxchm2dp0q2617klbihwngfr8w4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b13f57b77f6648336a049a8dda37757d4dafd90/recipes/flymake-solidity";
@@ -26198,12 +26220,12 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "20161207.141";
+        version = "20170728.507";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "37289bb68f01dd49b1192032ade6b0741d024a54";
-          sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5";
+          rev = "be10ce90ede2d76b67abb5eff9c09294fe189f1e";
+          sha256 = "17zipwazcqqbbsb7p9j2jcid2m0knlah56vbw71yxqb3qbpq7fcz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -26495,12 +26517,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170725.829";
+        version = "20170730.1659";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "9e2ddf0c32edb8c7726daf636876f01e1fd2f757";
-          sha256 = "170ffm6mybp0cs3962cpq281fg67vxcfx22nl9q9vrlk7rwlrqz0";
+          rev = "f521a27332898aecf5b2ee710d67e1bcca380641";
+          sha256 = "07lbjdiqyazvylk4ddb9789kyrnlllhnf67c770lsaagxn69scks";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26527,8 +26549,8 @@
         version = "20170709.139";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "154de53470720c57da4f57a64f4adb6bf669b59c";
-          sha256 = "1wrc48xd2brqr97zphn11sikhlbalhi1fh59azi85ri47y1yvvij";
+          rev = "bfd830f6b4b4c01a64a287395ea62d8e671b0891";
+          sha256 = "1xnh1qp8gmn6g9sm0l1sh8k9j9x3y0vns8h5wh1i22bs420rl1w3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26653,8 +26675,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "4e1a7ed0e47da1c33dc5a20ba22cb604ebdef0c7";
-          sha256 = "1wyk6fh58s675j3rr74lk358q3nlx9rlkq0bs8qkix11y93asp7j";
+          rev = "68037c3af786aad0a605847278393babd0095203";
+          sha256 = "180hxfh1igkhfnwd5613gvnqk1rmsncfyi28yd0plqryi3495822";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26771,12 +26793,12 @@
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "20170125.228";
+        version = "20170728.1101";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d";
-          sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m";
+          rev = "18a603474abb5a786a8d9f20c283d5f7beed3540";
+          sha256 = "1yprlpxxh7bbxg8filgb00lqqlavbz03h7hqf4280aiypkwi0y86";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode";
@@ -27235,8 +27257,8 @@
         src = fetchFromGitHub {
           owner = "candera";
           repo = "gherkin-mode";
-          rev = "d84a2977a536f2f8bf4836aebc33a4e86925673d";
-          sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8";
+          rev = "ff9e47350c5ba319feb6b87fe20695519681fa64";
+          sha256 = "0dbdms3ddsfhscwy7jj0cfpn3jdxnzynrfz5jps2l91adx2g011y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode";
@@ -27294,16 +27316,16 @@
     ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub";
-        version = "20170725.1200";
+        version = "20170728.849";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "magit";
           repo = "ghub";
-          rev = "8f81a2aa0b2aaca55e92f7a78944f9d80296f405";
-          sha256 = "03rd2f5zs95ld56jzq70y6jb0r21q2qhkndi2jrbic1fknfviiqh";
+          rev = "e85479bf048e06740331234a67c07bcdb3e294c4";
+          sha256 = "1sh8cwaaxlg0ja59lg70hl1lyhl9i7bfkamq3qz7kl2913axnzw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub";
-          sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
+          sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
           name = "ghub";
         };
         packageRequires = [ emacs ];
@@ -27508,8 +27530,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3";
-          sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48";
+          rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4";
+          sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28365,12 +28387,12 @@
     gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gnuplot-mode";
-        version = "20151122.2339";
+        version = "20170727.1339";
         src = fetchFromGitHub {
           owner = "mkmcc";
           repo = "gnuplot-mode";
-          rev = "296ff8d263513cdfb8e85b06e2441c751565b793";
-          sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq";
+          rev = "eafa9395771a5ceace503cf5922efac1df0f5ec5";
+          sha256 = "03799c7gwblpwpinbahbp5l510lg6yi85cmpsahsncfvkwirp2rm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode";
@@ -28703,8 +28725,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd";
-          sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g";
+          rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
+          sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -28741,12 +28763,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20170725.402";
+        version = "20170726.555";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd";
-          sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g";
+          rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
+          sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -28829,8 +28851,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd";
-          sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g";
+          rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
+          sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -29102,8 +29124,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "d75bd35c8fd1c32aab86ea47e7ef4d3c776faa0a";
-          sha256 = "0s1q9qw6azzbzr7k4c58m6d83cbz3srn63mi73jlh5fmad1w8g4p";
+          rev = "6c8669edb20249cd5534c78cfb48e7cf0978dda3";
+          sha256 = "096jmch5wqzal8qd6f72bsh0wi1fwlmjsis4n888942mq84vk8jw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -29373,8 +29395,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "8ab1a62d9c0873b8a25404c52928be2358b78963";
-          sha256 = "0y86g43g2bngca7f3vznw4swwc778mcm0kfiqn3b18ibppvzrph7";
+          rev = "fb0cb14954e799dfa69d1aaf56e863db48c2c296";
+          sha256 = "076bdkswajjzxb1jhwq71rwz8pn9klxk68r2ldab3pk9wlih4adn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29499,8 +29521,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "85fb30df520f55e32aeb92af4e1d7c801300c99e";
-          sha256 = "1iz17qv561x6w67r222ya0ig1dplb17ygvy8r3hyh20ijjdq733n";
+          rev = "785067783c93278de73cf4abe7fbf29b59b1f686";
+          sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29859,12 +29881,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170724.535";
+        version = "20170731.150";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "85fb30df520f55e32aeb92af4e1d7c801300c99e";
-          sha256 = "1iz17qv561x6w67r222ya0ig1dplb17ygvy8r3hyh20ijjdq733n";
+          rev = "785067783c93278de73cf4abe7fbf29b59b1f686";
+          sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29922,12 +29944,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20170718.741";
+        version = "20170730.1820";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "21c1673622ba160bcf8cfdb0f066567b388b2960";
-          sha256 = "1bh04nvaxphvfq7fgd53zd5k00gg35hldbida1ikw42pwkch3zk8";
+          rev = "813a2165b993014d6a3d02abfd077d711f7372fe";
+          sha256 = "1hwv7jqmigwnwdq50dlbi1i8ddq33qi40jhfynh8855kz0c2gqh9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -30111,12 +30133,12 @@
     guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guru-mode";
-        version = "20160415.1921";
+        version = "20170730.31";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "guru-mode";
-          rev = "81db5611dd29f2c3d9ea91fb7f086a2cf9847553";
-          sha256 = "1jymhjjpn600svd5jbj42m3vnpaza838zby507ynbwc95nja29vs";
+          rev = "c180e05ebc1484764aad245c85b69de779826e4e";
+          sha256 = "0qb6yr6vbic0rh8ayrpbz5byq7jxmwm1fc9l4alpz7dhyb11z07v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e60af6ccb902d8ef00cfecbb13cafebbe3b00d89/recipes/guru-mode";
@@ -30573,12 +30595,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170704.1445";
+        version = "20170731.1629";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "00ca4d935e80707e18c17e40630ea9e36b39592c";
-          sha256 = "049q8igjx4y9jancqv0bibd2jhz02llm1v6xfl9379v5p6nkfm3b";
+          rev = "518701c157468659e393e40aed2bdc37bcb408db";
+          sha256 = "0646bk3ky0gv32dqiy7m40va82fcc5jpsbli7rz06zgg4nvh77h6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30842,12 +30864,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170724.2137";
+        version = "20170731.1225";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9e803b5a4a431b386966ea1b2a303003d7869375";
-          sha256 = "0x797xy6p1b74zkqcdrf10kwp1ypjvkypayd070qh1sfjnrng4mf";
+          rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de";
+          sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31052,12 +31074,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20170321.1306";
+        version = "20170801.157";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25";
-          sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4";
+          rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b";
+          sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -31451,12 +31473,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170725.419";
+        version = "20170727.1245";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9e803b5a4a431b386966ea1b2a303003d7869375";
-          sha256 = "0x797xy6p1b74zkqcdrf10kwp1ypjvkypayd070qh1sfjnrng4mf";
+          rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de";
+          sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -32585,11 +32607,11 @@
     helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ls-git";
-        version = "20170716.109";
+        version = "20170727.1238";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-ls-git";
-          rev = "47981a8d80e1d464a7cddde5a391b35626929f00";
+          rev = "d116bb96b6ea946f633ed7735fbf38a63e611a3a";
           sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg";
         };
         recipeFile = fetchurl {
@@ -32836,12 +32858,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170711.2354";
+        version = "20170726.1718";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "87e00cc5a47b6dae8040ad27d2883f4028cbcfc1";
-          sha256 = "0n7nwpc9wy5p81hbp2b8wzfr040k0xn4ksm9a1fjdl9fg8hvh0pc";
+          rev = "58690a15a06f7dc645175f1b34c9e099ac68f018";
+          sha256 = "14z0ivi69ja9zd0qjpf98jp1x8skdp3a7w9yy2h9ffjhm2c7pgaf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -33340,12 +33362,12 @@
     helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "helm-rtags";
-        version = "20170723.2050";
+        version = "20170730.1306";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
-          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -34212,8 +34234,8 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "3f5d0d932fb6d2152f4c269df10bcc435a5ac764";
-          sha256 = "1qj2sf3x2bq54n0xqllis3abikjgbp18qn1i4vff5cs6n2an69cb";
+          rev = "98ba6d3d7744d536aee714e1284ffecfe8f590cc";
+          sha256 = "1y8jj0xgj6hqqshcfr406216bpni5sj0bh9q52ds9mn5plmh4asa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -35032,12 +35054,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170716.116";
+        version = "20170729.742";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "2412435e53c4f739a7aa93c9b9d80d861a1aa764";
-          sha256 = "0l5fw1c1dilsiiw82a1lwaa2xjq4dlfm51rvnkf2iay1ndr7l11x";
+          rev = "ace6725f72efd50556f52c359f7b1836b956fa2b";
+          sha256 = "1r7vww10dvv843zgmg62wwv2b6fw8nx73lsqzj5j01pi3zxz74vm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35867,10 +35889,10 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170707.610";
+        version = "20170726.849";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1088";
-          sha256 = "0lckab25irgpm7y2wdg00v31514m6aw6n0wf9gz1v21zzc5ij6cz";
+          url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089";
+          sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz";
           name = "icicles.el";
         };
         recipeFile = fetchurl {
@@ -36763,12 +36785,12 @@
     imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-list";
-        version = "20170215.125";
+        version = "20170728.632";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f";
-          sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7";
+          rev = "27170d27c9594989587c03c23f753a809f6a0e10";
+          sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
@@ -37012,12 +37034,12 @@
     indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
     melpaBuild {
         pname = "indent-tools";
-        version = "20170725.735";
+        version = "20170728.546";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "indent-tools";
-          rev = "45aa1321674fc111b6cf4398e90c53c27f8274af";
-          sha256 = "1v1x43af69q6crky4l65j649rb35qdxw2gw1ivz6ihsdcwa4dywz";
+          rev = "565c0b984d19c62b7a85efd69ae195b592d62f7f";
+          sha256 = "0rqc1n4z2w5i48ma29mrbb90350kxfgzk0vf8wdnksa78ja87yyn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
@@ -37054,12 +37076,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170725.1119";
+        version = "20170728.1109";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "a0feb67bfd035dc0d2f2b6eff12a1af050cb8b1b";
-          sha256 = "1h230lrq3pdmb26930n8ma2h1gqrz0zxzxy38h65khqqkcv37ldv";
+          rev = "a64f1ffc81539d40df9e89802bbebf14a0d19f83";
+          sha256 = "0cmh6mv319m4i2y89rl63z2k3634d4ldg18yy3aal44ljxrbdslq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -37104,12 +37126,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170720.2256";
+        version = "20170730.119";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "15963caac5791c2e9145cc99e4db8576807eb0ec";
-          sha256 = "088r68rj4ih3mlh4pv986zd4cgs0f32ar27550fxky6kr8197k46";
+          rev = "aaaeef6a4b1f41ebc3ab11ff28d6fa5938f762d4";
+          sha256 = "19qjamjpm96wwv4ni2lbzwrb73d5xwfkrq6lvy32k6rav5r7lx1d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -37250,10 +37272,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20170303.1500";
+        version = "20170730.2148";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "0xpgry9bzjwmdj0j0pcsr2a37gp8yqbcpl06linv0hjxcwca9nsz";
+          sha256 = "0xg4cw8s5ildc7iyyvy6xxri3cy00g06b10022izlhbxy7crdgai";
           name = "info+.el";
         };
         recipeFile = fetchurl {
@@ -37626,12 +37648,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170721.1851";
+        version = "20170728.814";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "aec455424105ddcf8e311acaf880078f7a6d92b3";
-          sha256 = "1a5shx3i7lhplcglrldzhway0w0rhq0h4wb9h835nzmjl2p6lprd";
+          rev = "28271d50ca65c460cd0983cea13a2c4509b95583";
+          sha256 = "0b73cwr68sdi5vc486952x0iv95hwyw79gymp91kyi558wxdssp3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -38100,6 +38122,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "isortify";
+        version = "20170726.1254";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "isortify";
+          rev = "28699f29cfc0d9d78b636d0ecadcf9139173bc6f";
+          sha256 = "0r7hbvsnn590wfydwibvpdihcah5jj6ylqhqq7w1a1nljzwk6d4h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify";
+          sha256 = "0nlpjd6mrhv8iccdny0x5lb41dpyp6l7kiax4xqra0rb2vq0chcs";
+          name = "isortify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/isortify";
+          license = lib.licenses.free;
+        };
+      }) {};
     iss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iss-mode";
@@ -38229,12 +38272,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170725.948";
+        version = "20170728.1036";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
-          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
+          rev = "fc275339b57690d4157160ed22b7672d5382cbe7";
+          sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38250,12 +38293,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20170321.1306";
+        version = "20170801.157";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25";
-          sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4";
+          rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b";
+          sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -38359,8 +38402,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
-          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
+          rev = "fc275339b57690d4157160ed22b7672d5382cbe7";
+          sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38394,6 +38437,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, password-store }:
+    melpaBuild {
+        pname = "ivy-pass";
+        version = "20170730.2153";
+        src = fetchFromGitHub {
+          owner = "ecraven";
+          repo = "ivy-pass";
+          rev = "b2d9b66583107694e8816e4e51809ebe9ee31d81";
+          sha256 = "1jz7bbr94bv4ql3xhxgdlhd0azjmhqiisc6bzcpwsf4q9jq42vwj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7bfef855e071442d2b9d1e0ce9b5706937bffc53/recipes/ivy-pass";
+          sha256 = "1sb29q22fsjqfxqznf73xcqhzy132bjd45w7r27sfmf825vcysci";
+          name = "ivy-pass";
+        };
+        packageRequires = [ emacs ivy password-store ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-pass";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }:
     melpaBuild {
         pname = "ivy-purpose";
@@ -38443,8 +38507,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
-          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -39882,12 +39946,12 @@
     jumblr = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "jumblr";
-        version = "20140908.1352";
+        version = "20170727.1343";
         src = fetchFromGitHub {
           owner = "mkmcc";
           repo = "jumblr";
-          rev = "705c7286e09a307b2b7f60072a12ed45325657c0";
-          sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j";
+          rev = "34533dfb9db8538c005f4eaffafeff7ed193729f";
+          sha256 = "0nn2m27c70nykin4iakrna0c61qd1hr09czrfmfpk06k70iifjky";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b47000c35a181c03263e85e8955eb4b4c9e69e4d/recipes/jumblr";
@@ -40640,8 +40704,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "c07f97179a02e1bddace948633e4b5b94ccc6ad4";
-          sha256 = "0ad3hkggdvd800cf0hwxa8v5j6c3dvkssy7lrs4yarwzpgaljyjv";
+          rev = "22aa73f55b5943fb464c3335978bf9b38daa39e1";
+          sha256 = "1imb37jmnybimyjl1j3fqja2yxjl8h7cn0pzkmchl6gv3yyw3w01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -42002,12 +42066,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170723.712";
+        version = "20170731.842";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "76db06252dbc45b70e55886e00f4efda6a100a8f";
-          sha256 = "1b6869ncq5lixndfyjffk3x4fjk5namxr21k3066q3lph4l26my5";
+          rev = "3f7a041410a16bff68611a06f8d0bba766159f07";
+          sha256 = "165il7rpwwz2xc3cx49xshpkmd0zf8i97zj5p187hi62z7pi2xyn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -42341,8 +42405,8 @@
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "d4a0708e2bac6492355c675717e458f88b7fab63";
-          sha256 = "1fr8kwm6m3k57s55gfn3sjh6zb9hj57rqnygwq8klyvi5ydh9w9f";
+          rev = "cee63ee3591eb0f498ace801f1543a4bc6b58514";
+          sha256 = "1h6m8qixvl9mnj6lmkqwljvyv65c6yb683krxrrbs4nrsy41z6s3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -42445,8 +42509,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "5b3e8fe6d9709fb676290385ab3861d291574dd4";
-          sha256 = "0jxxm2191in165bpqxm35shhfvcy8zjqakmvyrql0z4yb0ib2shm";
+          rev = "ca05253041c3e241f3987b430771f5db8aa35806";
+          sha256 = "03w7w70hj7nrhr0hsrxfbi8hrmxrbbhi2rzmzzk6pv1r9l7krjbd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -42459,6 +42523,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lms";
+        version = "20170731.1219";
+        src = fetchhg {
+          url = "https://bitbucket.com/inigoserna/lms.el";
+          rev = "5f20620f62a1";
+          sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms";
+          sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1";
+          name = "lms";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/lms";
+          license = lib.licenses.free;
+        };
+      }) {};
     load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "load-relative";
@@ -42818,12 +42902,12 @@
     love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
     melpaBuild {
         pname = "love-minor-mode";
-        version = "20130429.1459";
+        version = "20170726.2236";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "love-minor-mode";
-          rev = "31c3fc1ecd31f72f0f736014a4ff905eb3742e74";
-          sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl";
+          rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a";
+          sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode";
@@ -43095,8 +43179,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "m-buffer-el";
-          rev = "e2d5a416ce47b36da10a9815ff5702f28c716d57";
-          sha256 = "0nm8ljciim7wjc4r021jv8xrsk7jffmagzbllbvd5cab4zxvs4ik";
+          rev = "8681342aaffa187e5c54945ab91b812965a96d19";
+          sha256 = "040g7l0r4bxz4ynp4zxy80jsa6x2f48z8rylc41fqxiblasmh0af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer";
@@ -43112,12 +43196,12 @@
     mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mac-pseudo-daemon";
-        version = "20170722.837";
+        version = "20170728.1240";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "osx-pseudo-daemon";
-          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
-          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+          rev = "d235680a72677f11925b912428ad1a57b664e3e8";
+          sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon";
@@ -43278,12 +43362,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170725.1153";
+        version = "20170731.914";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3";
-          sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48";
+          rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4";
+          sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43432,12 +43516,12 @@
     magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-imerge";
-        version = "20170724.2157";
+        version = "20170725.1850";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-imerge";
-          rev = "b19e5b53553a4d057d944f9a17a2d44f71f20d62";
-          sha256 = "0i8nv28axp4nhh87lh7liimry398mgp038dm0v24b3ly1i4vf0gn";
+          rev = "ea578e8adf1ba2f98934660bd9db01cfc074b334";
+          sha256 = "06w281ir0iwlmcad26b2zkk08ympw190znsll9pdlcdvzyrsl5nl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
@@ -43495,12 +43579,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170709.510";
+        version = "20170730.2139";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3";
-          sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48";
+          rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4";
+          sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43579,12 +43663,12 @@
     magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-tbdiff";
-        version = "20170724.2156";
+        version = "20170725.1850";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-tbdiff";
-          rev = "549b27375b2f834eb86eeae0a8ad5475425cafed";
-          sha256 = "1jhl9afkz4lcwdbp7698pl630259n677jfigaywin2nvv0klb1s7";
+          rev = "1d1333af9d76b9e832212e9da152397df65f7205";
+          sha256 = "1rhjqvdg43n0qa9qdq9rlq4v8msy48y912m9dcjdvsaw45hh8062";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
@@ -43621,12 +43705,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "magithub";
-        version = "20170516.612";
+        version = "20170730.723";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "7fd7343c3c87df56c7c7dd6c41a80b14291b1ac4";
-          sha256 = "0a0q94lvk0rzj4r7hchypp197rj561d2a28jfzrfvvhq6x9vb4im";
+          rev = "4ebcc6890ed53d789869da85a0bcb33c2b210801";
+          sha256 = "153pcx585hhinj10bsfa5hlzx6lr768dyrwsv3wm16wfli53p18v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -44175,12 +44259,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170724.2018";
+        version = "20170731.1713";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "d29cea8534e80acf174ddb6fca7cfe071d84edd0";
-          sha256 = "0lg1cfk0rk6rx5zighr6xjsqga3mn290kll44hzrmaq4zzbfzfa9";
+          rev = "884a72d9b69db4974e06d4a9c265b8fd607f7e31";
+          sha256 = "06hxl0bdc2pa3gzznczhxhrwzdk7p0abhsmg11yh1s6csw678qsm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44933,12 +45017,12 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "20170204.628";
+        version = "20170731.907";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "957e551140587f0cd83d9186a06fba10a38c6084";
-          sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7";
+          rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537";
+          sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -45159,27 +45243,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "mic-paren";
-        version = "20150110.1816";
-        src = fetchFromGitHub {
-          owner = "emacsmirror";
-          repo = "mic-paren";
-          rev = "d0332fae515af2fa461d19afa7f933588afc327f";
-          sha256 = "0l7xfana2cb894w5qi6wwx7w9k89c3i8k40fpsd93sm3hgi5ryii";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mic-paren";
-          sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7";
-          name = "mic-paren";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/mic-paren";
-          license = lib.licenses.free;
-        };
-      }) {};
     micgoline = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "micgoline";
@@ -45851,8 +45914,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "modalka";
-          rev = "f2b2e206105332620b97c1f3bfd6cb03469db98f";
-          sha256 = "09wg7hbigk3084nvjw0ikfs9hgdp1ip0spmrsx70iq18xgv5fm37";
+          rev = "70db2088c14884e9d93a1f987ee9bc2753ca5772";
+          sha256 = "07zqv6rm97kaxh0ii6n88yva7h3r3n8k6sssiy8hw6mf8817x44p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -46137,12 +46200,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "20170724.740";
+        version = "20170731.504";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "b9be135bb01328ee7c1349c3eb81aecd045ea015";
-          sha256 = "01mzz1bdli0x4kgf089iy62d15y2gjxk51hybrlb9naddwl9zz89";
+          rev = "623083f05c381761a8cf2fd923e493bfa8762c28";
+          sha256 = "02d759s4zh6a2yj2xq9cdfjyrsj3a3a5wngcwkl6bq0jgbjz5pvv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -46571,27 +46634,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    mpg123 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "mpg123";
-        version = "20170313.715";
-        src = fetchFromGitHub {
-          owner = "emacsmirror";
-          repo = "mpg123";
-          rev = "d1dd8c56428ae55df9e23ba26f102588001d55be";
-          sha256 = "1faqz3svh9l14617d39b8c7gfgf7kxf4q6d0k2q6y8whfljnbyvm";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/714d40891ab697b6303a3e25df2cb8adf04942f3/recipes/mpg123";
-          sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8";
-          name = "mpg123";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/mpg123";
-          license = lib.licenses.free;
-        };
-      }) {};
     mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }:
     melpaBuild {
         pname = "mpv";
@@ -46786,7 +46828,7 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "multi-line";
-          rev = "7e99fd560b15a6176a5ccfcac0af4ef9e8dd0656";
+          rev = "ca151864e7ff7ade0e530e8eb2c26291d37a56b6";
           sha256 = "01dsnpfwkycmq3kiy76hz92bm1hq4rqqg3kp56scy05sz9biqzkc";
         };
         recipeFile = fetchurl {
@@ -46911,8 +46953,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "c94566597a80c07a1782a75644fe1a2ca4f29bad";
-          sha256 = "0g4w3xcwazdm6f07n00jgdkv5blrd9aaqmwbx28lm1qq3v6w0xqp";
+          rev = "e14fdb77a1f65465a61e8f69180505095cc2b7dd";
+          sha256 = "0ahy9sv57wc0djaxi9740z37pnwjk3a436zgmabj85ib6ykmla1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -47091,27 +47133,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    mwe-log-commands = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "mwe-log-commands";
-        version = "20100703.541";
-        src = fetchFromGitHub {
-          owner = "emacsmirror";
-          repo = "mwe-log-commands";
-          rev = "8253f2a311f35b03f72a035744f0cbdd776ea17e";
-          sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mwe-log-commands";
-          sha256 = "1nf3rd5i4r61z64apkqi5wx60fpshx5px0y53jqf0rk86708l6wx";
-          name = "mwe-log-commands";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/mwe-log-commands";
-          license = lib.licenses.free;
-        };
-      }) {};
     mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mwim";
@@ -47220,12 +47241,12 @@
     mysql2sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mysql2sqlite";
-        version = "20151123.1339";
+        version = "20170725.1516";
         src = fetchFromGitHub {
           owner = "echosa";
           repo = "emacs-mysql2sqlite";
-          rev = "07415c5fcd895ebccf1b774d0eab175f2700652f";
-          sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i";
+          rev = "8e6e74451c942e2e92f90dc13222b95a7dbb285e";
+          sha256 = "18jriaj391n4wr0qiva68jf482yx9v9l4xagbzl9vw125lszkngb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9841d3cfd1ee954eb0ab9b2ca3a3f605eb0fd22a/recipes/mysql2sqlite";
@@ -47800,6 +47821,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "neato-graph-bar";
+        version = "20170731.2341";
+        src = fetchFromGitLab {
+          owner = "RobertCochran";
+          repo = "neato-graph-bar";
+          rev = "3ebd5168c9b8cc56cc4163206c03864b9b802f27";
+          sha256 = "133k1lwmb7ky91ij03nd4vipkivvx4bz56m4waf1pdmaynsidy6j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar";
+          sha256 = "1p4jmla75ny443cv7djk3nvl3ikchllnsivxx9yds14ynk4jxhgb";
+          name = "neato-graph-bar";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/neato-graph-bar";
+          license = lib.licenses.free;
+        };
+      }) {};
     nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nemerle";
@@ -48096,12 +48138,12 @@
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20170716.948";
+        version = "20170729.1816";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "05ac362f97874d50131ea38277cf95a5cfecb250";
-          sha256 = "0phxkvi1s49grc717iprg96dalb5w2jcj1dfyrh339xny11f2hqb";
+          rev = "91fc75e8ceebf850bd2ec07522e744eef0b89098";
+          sha256 = "0margf3d0zg6nk5lf7s7dgf7qhx664jhk27wlsjnysm79d6d98f7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -48184,8 +48226,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "c94f3d5575d7af5403274d1e9e2f3c9d72989751";
-          sha256 = "1akfzzm4f07wj6l7za916xv5rnh71pk3vl8dphgradjfqb37bv18";
+          rev = "a2778988f2b70a5f000202afa7213b553350c72e";
+          sha256 = "1iiy8sfdqqd2jz8lcccf0lpwxqaa5ppa47maic2gy2m7qxgw7418";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -48327,12 +48369,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170702.457";
+        version = "20170728.952";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82";
-          sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn";
+          rev = "c1b3aa13f5311e1a7778f9cccd25680bbbf04c5f";
+          sha256 = "0rd3cr63vgy1xbbszdi87p7g55ypnq59gjqkmzfc69z0fv05d2fv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -48534,11 +48576,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170715.511";
+        version = "20170720.301";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051";
-          sha256 = "145313a0krav6lcalbpq6skyf2iw96c97v6cd7s6bci5i93w0mp3";
+          rev = "4a101ec7aabef163ffbdafe1b0a732bb23b3b0bc";
+          sha256 = "172027wirk7gc4siy3f9zccm01iqjlfx0nk3s8pq7qg20cx0aa39";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48871,8 +48913,8 @@
         src = fetchFromGitHub {
           owner = "TeMPOraL";
           repo = "nyan-mode";
-          rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a";
-          sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7";
+          rev = "3447aa114575230cb230862ac0ac9b065f789ecd";
+          sha256 = "1nlsgkll6gagn4bs092ad1glkcihlcac9ai4cbj63l8x9x346yqg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode";
@@ -49013,12 +49055,12 @@
     ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-blockdiag";
-        version = "20170524.1605";
+        version = "20170727.1801";
         src = fetchFromGitHub {
           owner = "corpix";
           repo = "ob-blockdiag.el";
-          rev = "715e7d41124a98d3f1e38e430e3a7f31b52704e4";
-          sha256 = "0mqi9hm00apq43mmabai05x96q4x0l29n9gvdhphzjrhvjabmm6l";
+          rev = "634fcf64a4ae735afe7001d865b03f5d71e23046";
+          sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag";
@@ -49202,12 +49244,12 @@
     ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-go";
-        version = "20170324.932";
+        version = "20170731.1057";
         src = fetchFromGitHub {
           owner = "pope";
           repo = "ob-go";
-          rev = "28183e10581fa5fe0f5b5a885cbde32cb4b053ba";
-          sha256 = "1liggd9nbl90c6mc0iccchckwm1pw2lb23nn61y2p9c1hj9myhm8";
+          rev = "28a0250cd969974936e44dfdccb0265632d25f84";
+          sha256 = "1g595miqn7wdmphvgi06ijqzjy801nal226kbghk9p002s3xzzn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go";
@@ -49454,12 +49496,12 @@
     ob-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-rust";
-        version = "20170619.802";
+        version = "20170730.759";
         src = fetchFromGitHub {
           owner = "micanzhang";
           repo = "ob-rust";
-          rev = "126ee38c6f560cac2ea6bbef034f92ff948d2664";
-          sha256 = "1szayb60ibihjfd5ihij0cvjdmvcays1701h5ak0wpvqirdmyc60";
+          rev = "f23d93725c21ab95a44cb4d2c0c4ab0489bd55d9";
+          sha256 = "0indljqh6idfwza286gi9dkqwrndbnny4a5f7csz8gssmn0x3i30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/843affc2fd481647c5377bf9a96b636b39718034/recipes/ob-rust";
@@ -50760,6 +50802,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-category-capture";
+        version = "20170731.2235";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "org-projectile";
+          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
+          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
+          sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav";
+          name = "org-category-capture";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-category-capture";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-chinese-utils";
@@ -51437,8 +51500,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "ed6849d18dd7831f3f7917970d2c24e771f75476";
-          sha256 = "0f3c0jj6479b3sxmsa9nd5h5gnl81xnrdhymh2rs7rjgcj58fbws";
+          rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4";
+          sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -51457,8 +51520,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "ed6849d18dd7831f3f7917970d2c24e771f75476";
-          sha256 = "0f3c0jj6479b3sxmsa9nd5h5gnl81xnrdhymh2rs7rjgcj58fbws";
+          rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4";
+          sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51651,11 +51714,11 @@
     org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-parser";
-        version = "20170703.1738";
+        version = "20170728.2120";
         src = fetchhg {
           url = "https://bitbucket.com/zck/org-parser.el";
-          rev = "e8c81e633595";
-          sha256 = "1zwwn0xwpq8iscl0cznq3cxcr7kpwrxl6w9v2nrxjs3lffzyzl7a";
+          rev = "0febaec75eda";
+          sha256 = "1vvxpldjd2y95y3935z16g4v6agz02k1d9c0pb0pr41ms60q0b9w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -51772,27 +51835,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
     melpaBuild {
         pname = "org-projectile";
-        version = "20170520.2310";
+        version = "20170731.2333";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "0ca3b80a46d8c541d36f161506ac8d8dc36d8e80";
-          sha256 = "0r5h6ibq73b84w82382ld5dbihhvff4pj2bind68i5isam7pxlbh";
+          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
+          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile";
-          sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
+          sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw";
           name = "org-projectile";
         };
-        packageRequires = [ dash emacs projectile ];
+        packageRequires = [ dash emacs org-category-capture projectile s ];
         meta = {
           homepage = "https://melpa.org/#/org-projectile";
           license = lib.licenses.free;
         };
       }) {};
+    org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
+    melpaBuild {
+        pname = "org-projectile-helm";
+        version = "20170729.1153";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "org-projectile";
+          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
+          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
+          sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4";
+          name = "org-projectile-helm";
+        };
+        packageRequires = [ emacs helm org-projectile ];
+        meta = {
+          homepage = "https://melpa.org/#/org-projectile-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-protocol-jekyll";
@@ -51865,12 +51949,12 @@
     org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-recent-headings";
-        version = "20170722.1507";
+        version = "20170727.1633";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-recent-headings";
-          rev = "56e52d65a03df0458bf79ceea5252f5efe432e3e";
-          sha256 = "10ymgycm7imigbisqnccd0rzvj9ihzmql4ipqj81iqwrssssqwyb";
+          rev = "1b14f7f833f158f03461fb12d41a8c9f6ad4bd6a";
+          sha256 = "09jp7kfjkcaqlnnls80pzxgsga7fids7w495sd319sml36fa46m8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -51907,12 +51991,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170724.1235";
+        version = "20170727.1217";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "5a59df1f9474103faed807fbc3448919cf7aa779";
-          sha256 = "15i8kqv5a18i19pcw1kcq4ricmgm1q1qlkfzaawwilfd45ipl6d6";
+          rev = "30be4111d465b6d8fbdc9785e8c49dc0ce16bab0";
+          sha256 = "0zcv0np6hnq5jcblxxrvh99rd9zi7savpyhad29krqw7rhii1z71";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -52062,6 +52146,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+    melpaBuild {
+        pname = "org-super-agenda";
+        version = "20170801.156";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "org-super-agenda";
+          rev = "591ea418588a2ad0cd34146831d369b030cea188";
+          sha256 = "06jk5xp5x01123lwxv4srhcirjg8cwffz35x0kfndl0lq43g3mzi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
+          sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra";
+          name = "org-super-agenda";
+        };
+        packageRequires = [ dash emacs org s ];
+        meta = {
+          homepage = "https://melpa.org/#/org-super-agenda";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-sync";
@@ -52338,12 +52443,12 @@
     org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-wc";
-        version = "20160204.1715";
+        version = "20170727.1911";
         src = fetchFromGitHub {
           owner = "dato";
           repo = "org-wc";
-          rev = "7735d5111f779a84c40b1eb3783631e6048fb6fe";
-          sha256 = "08yww77697kck1ld9xcrcx8amqdh28rdc4fsavp5d3my78qk7rac";
+          rev = "d294ad7117c150445e6166fc0d88c14a8386f34e";
+          sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2f0d29fb0c046d9f7c32215ea58897147f3b291/recipes/org-wc";
@@ -52359,12 +52464,12 @@
     org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-webpage";
-        version = "20170318.450";
+        version = "20170730.50";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "org-webpage";
-          rev = "c71042f16bf33120d0d3d40e107f3f4de044ae53";
-          sha256 = "1jy55qapc8fqf6r3wz4v489iyw4pxzj2hadkwsgsv1m1ha1sdvyk";
+          rev = "e9bb72c7bf75243553f786193e7c9535777559f0";
+          sha256 = "0ak2210d9qx4zfgqzilxzla1rswwjgjnc15kh6drn6dfmj1krfnz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage";
@@ -52527,12 +52632,12 @@
     orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "orgit";
-        version = "20170403.1323";
+        version = "20170731.1003";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "c91e662ace7e3ce992269cbf755f378bc6742511";
-          sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16";
+          rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663";
+          sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@@ -52867,8 +52972,8 @@
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "osx-pseudo-daemon";
-          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
-          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+          rev = "d235680a72677f11925b912428ad1a57b664e3e8";
+          sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon";
@@ -53102,8 +53207,8 @@
           sha256 = "06lp56na1fv87296hhaxgb6gfnzln39p4v245gfxhk0k27589vxj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-bibtex-chinese";
-          sha256 = "0h02jlzk97rd3jmdni5mggbkij61d7zn1n1ibz1jg6zb0000cj7a";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6c09c708c4372451502923cd3cb756f4f98ba97b/recipes/ox-bibtex-chinese";
+          sha256 = "0f3xigrkhc86vv23f76fdd4rjsspsd2ck5c65biq2ds247f4gm61";
           name = "ox-bibtex-chinese";
         };
         packageRequires = [ emacs ];
@@ -53119,8 +53224,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "7e3b7a8adf92e5166d98c35e54dccb88831e85dd";
-          sha256 = "1lsbgpdbry37wgy9p9zbd60cwfrvs9a2fr8b3mzv9i5w9f1wdjy8";
+          rev = "4470f452f4219a53947da4c3d4ade188f978ad73";
+          sha256 = "1nz02plf1p73690z2czn95fpiy5hissq6xnhfj5gf3ykmyzn5wbc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -53644,8 +53749,8 @@
         src = fetchFromGitHub {
           owner = "milkypostman";
           repo = "package-filter";
-          rev = "c8e2531227c02c4c5e9d593f2cdb6a4ab4a6849b";
-          sha256 = "001h92jchz6x6pm8bj90law0yzc5xd84f703z7fcwan4k0g1iwl7";
+          rev = "bc73b41aea1d65ca44ef1593ca13126df9bbb39e";
+          sha256 = "0fq31zcz5j0n29p3zmx2k2w0xvay24zs34mbq8nb0y0jr7ycm184";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89312eaf69f3d7ac46647255c847fcb45415e78d/recipes/package-filter";
@@ -53932,12 +54037,12 @@
     pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
     melpaBuild {
         pname = "pamparam";
-        version = "20170721.1905";
+        version = "20170725.1345";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "pamparam";
-          rev = "0740cf4a5b5da561d5dbab96a6a34e2db28d24ed";
-          sha256 = "1h52zig64g2wdsvx1g590bl62zfg8l4bikfi6y25zx1gic9cifnk";
+          rev = "017df884700a9db27dc486f7047da4bc7639ee6e";
+          sha256 = "1b5gkmgqwibbavw3qfkgyaj1y3shr0nm3ksrl3ahhabylg3fj5as";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
@@ -54308,12 +54413,12 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "20170725.34";
+        version = "20170728.26";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "42bfe9f471f19c9d801f15ffde658ea3f4655ac8";
-          sha256 = "12hajddf6bkg5fsi1w31rj1wrg0yr8idp7c1jn00824h0la2maf0";
+          rev = "4dc3397caaa2fb3672cf7fbb2189927538c4642c";
+          sha256 = "1gxkx73avmv2j19qaszjwy6kasggh40ahnmayfxsvgjxxzd5c46s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -54410,21 +54515,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }:
+    password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }:
     melpaBuild {
         pname = "password-store";
-        version = "20151027.1449";
+        version = "20170726.2054";
         src = fetchgit {
-          url = "http://git.zx2c4.com/password-store";
-          rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf";
-          sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87";
+          url = "https://git.zx2c4.com/password-store";
+          rev = "8fa1be8cdff8f5278011616171d8095b8a46b287";
+          sha256 = "0i9iqsrg5y2w694kx9wa4fv3syijdshripjl6wi83c2xi4cp6p8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
-          sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store";
+          sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65";
           name = "password-store";
         };
-        packageRequires = [ f s ];
+        packageRequires = [ f s with-editor ];
         meta = {
           homepage = "https://melpa.org/#/password-store";
           license = lib.licenses.free;
@@ -55544,12 +55649,12 @@
     phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "phoenix-dark-mono-theme";
-        version = "20130306.1215";
+        version = "20170729.706";
         src = fetchFromGitHub {
           owner = "j0ni";
           repo = "phoenix-dark-mono";
-          rev = "dafb65c542605145d6b1702aae5b195b70f98285";
-          sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri";
+          rev = "a54f515d162148bcb38676980bc2316adb3d7b8b";
+          sha256 = "1zr334qsjrajd2vrrlc1rfm4b4kdw15jfh5d102vj5bp7z7ajhb4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-mono-theme";
@@ -55565,12 +55670,12 @@
     phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "phoenix-dark-pink-theme";
-        version = "20170324.1144";
+        version = "20170729.703";
         src = fetchFromGitHub {
           owner = "j0ni";
           repo = "phoenix-dark-pink";
-          rev = "219edf69adb7e911394c5849c310ca0f4201a917";
-          sha256 = "0i7m9iqnglirwfdibskz2alk8bzkffp8gaa38yqg6bxwb46x67nq";
+          rev = "4defbb76b00c1a29f060813898578152d6be623d";
+          sha256 = "03d7ak4ia3fifp0c8fm4qdydizsfsxvcvbzwfxlsk66s28p5wglc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme";
@@ -55691,12 +55796,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170722.1205";
+        version = "20170729.1258";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "1728f36aaa7b44993495476a06e9c8be0140c51c";
-          sha256 = "1pk3lxg2fa7skz17qygjhvwbvcl34bs2as728i3nid6ghw71fk5s";
+          rev = "151ae717b03d6d5fcc2bc86e349175840bfbe079";
+          sha256 = "00f2k41zmda299rj4lfpxisnrr9i5f0gg51cb8fri7lyjzrq829a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -55716,8 +55821,8 @@
         src = fetchFromGitHub {
           owner = "echosa";
           repo = "phpplus-mode";
-          rev = "963eb19c06a7237879ae7b7a111c83abcfe9ca36";
-          sha256 = "06ffbw66zw5ssavgbllcb9a0syi5asy6wq8yqxdyw66nj941kjbr";
+          rev = "8224e6aabc2e3d046d717b4c87c643aa98a8e203";
+          sha256 = "041xv3c2gwcxlj9bnjx6hlrm2k7s7fyzqbp4c583is6jx1adjfn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode";
@@ -56045,22 +56150,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    pippel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pippel";
-        version = "20170325.649";
+        version = "20170730.623";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "pippel";
-          rev = "764c8ec30ad14288accd05c7f8a1c9425d6aab7f";
-          sha256 = "0plpjjyhn1rz8pwyldshwa61r7pfz310j4qciw55smjizz4hfjx8";
+          rev = "3737d5934665b5059c1e858feeb4270262b37e53";
+          sha256 = "0k94y305c6abhxgq6birfvnrplsx5gadwsqwn8m87sh8ldsjnmgi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pippel";
           sha256 = "0w6qbjb1wpz8gn4gzifzzjbc3gckhgnqvrpszrrklqmd10rk5mrw";
           name = "pippel";
         };
-        packageRequires = [ emacs s ];
+        packageRequires = [ dash emacs s ];
         meta = {
           homepage = "https://melpa.org/#/pippel";
           license = lib.licenses.free;
@@ -57712,12 +57817,12 @@
     projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20170725.1304";
+        version = "20170727.2351";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "63dc5bcf0803ef81bc13ca499e60c61b8fea2fd6";
-          sha256 = "0lxs3k93jw9whbymbg3swk9c6gbix93vw7mqx9n84qdvijm3zrr4";
+          rev = "5e9249dd42245222b26779e50cf9d00cae80bcde";
+          sha256 = "04zvr24dxzi1z70z0vq218x14mva3z6s4my7wx6c6c9fwma1vbx4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -58136,8 +58241,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "bb8664419b7d0dd4a94cc1242a2d77bf5e8f567b";
-          sha256 = "1cca2vkpqysnswqawx4rgf7zsmnwvg13irs3jf6ipcld8wsnb17q";
+          rev = "072431452a365450c607e9503f51786be44ecf7f";
+          sha256 = "0yl003jbxd7k70a8ajs19256pq4g71fkx1nqg207mzvagmnp3iqp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58712,8 +58817,8 @@
         src = fetchFromGitHub {
           owner = "mattharrison";
           repo = "pycoverage.el";
-          rev = "dbc152a807efcaac4e50bedb64c026674009a279";
-          sha256 = "0qap6iz865l43mixga7541c2z9kdx8zkkdcgdlgn6n8pyv8iz7qs";
+          rev = "4f5451f4d6e1e2ddd5878fc7d18f5fc4fc92a83d";
+          sha256 = "0xhkzskxnj4lmf4152c3n1vp68l1xgwa277f3yg8sslg6ixkd2p0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb0310bbe8427abdcba2b30414ec26475b0b7440/recipes/pycoverage";
@@ -58851,6 +58956,111 @@
           license = lib.licenses.free;
         };
       }) {};
+    pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
+    melpaBuild {
+        pname = "pyim";
+        version = "20170730.1512";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "pyim";
+          rev = "88adc57d754c9aecc922fe8b29239148f2b6557c";
+          sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
+          sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
+          name = "pyim";
+        };
+        packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ];
+        meta = {
+          homepage = "https://melpa.org/#/pyim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pyim-basedict";
+        version = "20170726.1959";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "pyim-basedict";
+          rev = "3196cb210e056702c5a4ea1dac1d8e1e27740fab";
+          sha256 = "03jbjc5a1h22vpcybg0gmbyibaa85w2ml1pjk646qb28ljywd5aw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict";
+          sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9";
+          name = "pyim-basedict";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/pyim-basedict";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyim-cangjie5dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
+    melpaBuild {
+        pname = "pyim-cangjie5dict";
+        version = "20170729.1946";
+        src = fetchFromGitHub {
+          owner = "erstern";
+          repo = "pyim-cangjie5dict";
+          rev = "c8618590780b818db1a67a29bc47c5d25903517a";
+          sha256 = "0p49h2kn8wy3b51zahzyc1cy24h3b44cg5yjpmv4w23dhsr4zlz8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/27a58729115b038abe813601bf16bba1524cdb2c/recipes/pyim-cangjie5dict";
+          sha256 = "0k2nxdlrj3m09javv599ajwd8cd5mjz0hj1j51zpv4y0l1n801bn";
+          name = "pyim-cangjie5dict";
+        };
+        packageRequires = [ pyim ];
+        meta = {
+          homepage = "https://melpa.org/#/pyim-cangjie5dict";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pyim-greatdict";
+        version = "20170724.1525";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "pyim-greatdict";
+          rev = "45fa4ff26f3444fb98c4dea460d84b740204d105";
+          sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-greatdict";
+          sha256 = "1bbindnklmmxdskv9vmjxhvlxxmaccgqn70prblhpg6n11bxjhl9";
+          name = "pyim-greatdict";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/pyim-greatdict";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
+    melpaBuild {
+        pname = "pyim-wbdict";
+        version = "20170724.1527";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "pyim-wbdict";
+          rev = "114489ed97e825ae11a8d09da6e873820cf23106";
+          sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict";
+          sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i";
+          name = "pyim-wbdict";
+        };
+        packageRequires = [ pyim ];
+        meta = {
+          homepage = "https://melpa.org/#/pyim-wbdict";
+          license = lib.licenses.free;
+        };
+      }) {};
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "pyimport";
@@ -58900,8 +59110,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "d41e49a18817997106ed9f1df20651e1f438222b";
-          sha256 = "0ygj6zzz4dzfwch7hgvmkm83y6rr5jhy789d7qnkdsjyfshkx5dp";
+          rev = "7d6114fe71f1e6ab4a7c19546f380a7cb216eac9";
+          sha256 = "1dq3ihmqdh6nb1ybz29qrkgz1ka2jhv76izh5a1q0l19qgni8wqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -59043,12 +59253,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170723.1213";
+        version = "20170731.105";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "3ad3e8e0f98d90c634ff81f50776e70e75a98034";
-          sha256 = "0al6jvjrxcqrqkmx1akaqb2ill0crjawc2k7b43aysch3fx7caf2";
+          rev = "1d4cdc44c4fa1a15b0b1c4bb1774d0fc20d48616";
+          sha256 = "1xp4lzwc95qkam8b86pmz8y0zg3w579rvygh22y47g0dlblyxgsn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -59274,12 +59484,12 @@
     quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
     melpaBuild {
         pname = "quelpa";
-        version = "20170717.2225";
+        version = "20170727.557";
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa";
-          rev = "eb93cf1ca9d1298a92c680a736dedbd1c3cbbb5a";
-          sha256 = "13wr46qwmi4dnx3i2py0sjhichl5kjai64jcywymp1mc52f6nyl0";
+          rev = "c095fa14046c1313b97df4ec102bdea5a981ff1d";
+          sha256 = "159pkv7q0kz3slc34489gnfbyw07g3iphkx6mvzqkxql8k2iw0v7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -59946,12 +60156,12 @@
     rcirc-groups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rcirc-groups";
-        version = "20160115.431";
+        version = "20170731.1401";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "rcirc-groups";
-          rev = "e858084e5956ba32a84046616326c0903de6d59f";
-          sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh";
+          rev = "b68ece9d219b909244d4e3c0d8bf6a746d6fead7";
+          sha256 = "196x3qg22rhh917diml1q0hszqrqwg0klzp96q1c7c744mlq82fx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35b9c9e877c686df0ac9f96855d733a240063829/recipes/rcirc-groups";
@@ -60097,8 +60307,8 @@
         src = fetchFromGitHub {
           owner = "gromnitsky";
           repo = "read-aloud.el";
-          rev = "d5f80ab72054a957aed25224639c1779cae5f4d1";
-          sha256 = "1hbb6diz96jabajxrnancjfpyd9div8vzbwys1f5bddi9z8l2jyy";
+          rev = "c662366226abfb07204ab442b4f853ed85438d8a";
+          sha256 = "0wmfjbk3s45wj8j6xwfdldxwkrxsfcby2a242r2p88y3f8pp30i1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20452bf3112276a7e1c880bfab259150fc70b47a/recipes/read-aloud";
@@ -60288,12 +60498,12 @@
     rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rebecca-theme";
-        version = "20170406.2136";
+        version = "20170730.943";
         src = fetchFromGitHub {
           owner = "vic";
           repo = "rebecca-theme";
-          rev = "cf8c45993ed4e0a49dcbda71827dbe5835bda077";
-          sha256 = "15v688mnr0vg7pj8mcwqpwbw896xrfjpcbwhgfhq2bd0z0j0shbk";
+          rev = "ee0d8796eca831110b7084a2af96fb4184d0a418";
+          sha256 = "138hs6lgql40cn86p7v2xhb7ck2zcvz1vi6jd7fk55l0xgj5w61k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -60519,8 +60729,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "bb149c75cb00cedbabc12dd497dce0ab5a7f5072";
-          sha256 = "1m18hnb1hnm6rr5bi2laq9i8djkm73sxp83mawbybydq5j0446bm";
+          rev = "f5a1ad20cacba47193be6d40230519c28e3578fd";
+          sha256 = "07i5xa87wdyv9v0ib2j3bk9gv2dc8ah7jgi2agicfn4lxygf710b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -60932,10 +61142,10 @@
       }) {};
     replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "replace-plus";
-        version = "20170307.942";
+        version = "20170731.2148";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/replace+.el";
-          sha256 = "0bbqmgz4grbg9g4kd5c85wn1icfgqapdkb2v7jmqwg4mc8s7piv5";
+          sha256 = "0fj2kkvilgrz0ih08issdrq8wbswcxs8af1jv50zx7lfyjpix2s3";
           name = "replace+.el";
         };
         recipeFile = fetchurl {
@@ -61141,12 +61351,12 @@
     restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restclient";
-        version = "20170715.440";
+        version = "20170727.825";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c";
-          sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn";
+          rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518";
+          sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -61166,8 +61376,8 @@
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c";
-          sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn";
+          rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518";
+          sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -61304,27 +61514,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    revive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "revive";
-        version = "20150417.1555";
-        src = fetchFromGitHub {
-          owner = "emacsmirror";
-          repo = "revive";
-          rev = "16e1ac7cfa2fdccddf60d4a0e15731fc7448d818";
-          sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/965891688e94839e63fcc7c22dae317bb56d1ff6/recipes/revive";
-          sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5";
-          name = "revive";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/revive";
-          license = lib.licenses.free;
-        };
-      }) {};
     reykjavik-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "reykjavik-theme";
@@ -61410,12 +61599,12 @@
     rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rib-mode";
-        version = "20170722.356";
+        version = "20170726.748";
         src = fetchFromGitHub {
           owner = "blezek";
           repo = "rib-mode";
-          rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866";
-          sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram";
+          rev = "97470158784c3c212e22e2c20b8471ee65ba59af";
+          sha256 = "0hln0hympmxmsci82ivc2rw289j1bmgdxns96m1ng1bl668bwag7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
@@ -61788,12 +61977,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170714.1944";
+        version = "20170731.1057";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
-          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
+          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
+          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61854,7 +62043,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59417";
+          rev = "59459";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -62205,12 +62394,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170719.1308";
+        version = "20170728.1006";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "0985f5fde747f64b3fcff2661226aa4dad286e04";
-          sha256 = "10mvrdv8cbdsynn4kxv06xm4r6syarmi858pdj6r2bysbp4w6cs8";
+          rev = "09efc45dee786cb220c233426ddd82b26ad950eb";
+          sha256 = "0rga8whnzhnz6a0n13bimrdjardzmn5h38d71gmvrs40kbs0350h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -62583,12 +62772,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170725.1332";
+        version = "20170726.204";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "3e8a75a5d48724ecd6c4171107e1b581100dfce1";
-          sha256 = "14ng4xxld7c3x92bmcww74x724h4c466jd70wrl7hpjhg1z8xhn2";
+          rev = "137845bffe904145c927a7f564bc9d6906e155ce";
+          sha256 = "1q5d1ah178xq16945hni3gm8lp17hamnc2ac4jzshkj36gm1a9wq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -63021,12 +63210,12 @@
     scrooge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, thrift }:
     melpaBuild {
         pname = "scrooge";
-        version = "20160718.1735";
+        version = "20170728.1106";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
           repo = "emacs-scrooge";
-          rev = "5e8a301919ec88a7aa48a9c66cafb1bddd9f6100";
-          sha256 = "0ndv9j7n9z53f7q0w7cgb4wsh7vyb8f4bga723cm7j0gipx8fjnf";
+          rev = "fb55c64eb2ae4db57b14bc99d2e411d81b2c5c2a";
+          sha256 = "1hhbm7jmngv69l81vaj0fhpzkvw4sf7q5mdf9mm27mwd2jk70prl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e3623181fa771dc94a7026eb58ac81fe9d9fc68/recipes/scrooge";
@@ -63253,8 +63442,8 @@
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937";
-          sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c";
+          rev = "17884d02d8aaf2478590ea13542f2954d1dc203b";
+          sha256 = "04wqrkpihrgrw244baama1aaj1ih80w0001hw3xnbl6xnxsyvm4z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -64692,12 +64881,12 @@
     skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "skewer-mode";
-        version = "20170722.1745";
+        version = "20170730.1241";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "skewer-mode";
-          rev = "cf8115d4e1ab5c2f990fb6d02a6c75d7d6b82a9e";
-          sha256 = "1m0xbjbvfmy986isgxjm3kj4rzi6vsy4b1hlrbh4kpbjfj3p9sz0";
+          rev = "7df248a4b7ec2eb0f3cabcbdfb052593d1f86590";
+          sha256 = "07l90cqcngwy8vxx4yxx7i72lp10wzv44ypn07zwyrl69bcmf2q8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
@@ -64776,12 +64965,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170725.133";
+        version = "20170731.25";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "2c756be071b8a8e69022daf606b849f53f211805";
-          sha256 = "003i3snyjh47ckjny15g9isc5k0zhng2dvwmjxazfm4q3ka7p6ir";
+          rev = "5858bd60b4adadf2a52825aef9a49021eba89477";
+          sha256 = "1difrbzz0cfw48nabaglcqlpvsrd2zn24f6spfx0qh22rfhcz4qy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -64818,12 +65007,12 @@
     slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slim-mode";
-        version = "20140611.950";
+        version = "20170728.648";
         src = fetchFromGitHub {
           owner = "slim-template";
           repo = "emacs-slim";
-          rev = "869c84821cf3e556b380c5c35d8ad62287c4df58";
-          sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1";
+          rev = "3636d18ab1c8b316eea71c4732eb44743e2ded87";
+          sha256 = "1sqylm6ipmlh9249mmwfb16b4pv94cvzdwvi3zakdpz713phyjw5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a3b59bdbc53d7c0b4c4d6434689f7aab2546678/recipes/slim-mode";
@@ -65987,6 +66176,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "snoopy";
+        version = "20170730.1951";
+        src = fetchFromGitHub {
+          owner = "anmonteiro";
+          repo = "snoopy-mode";
+          rev = "8adce636376812df99bd79f3fbb3d9ec19a02351";
+          sha256 = "04sq37bpvg6lqsqmjvdm9jzwrq4xhbakfzl5b2rcm3mlhzwnhs88";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
+          sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
+          name = "snoopy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/snoopy";
+          license = lib.licenses.free;
+        };
+      }) {};
     socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "socyl";
@@ -66501,12 +66711,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170713.1156";
+        version = "20170731.845";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "b26162e8974c532b3241a43c8f194a340636e9ea";
-          sha256 = "0wxn7diy0pw0iwf3pxvr1yg2h7svrkyna0pgpkyipz3z1chd6h49";
+          rev = "5bcac14ab4b99bc3bef20fd62ef981c4590c4021";
+          sha256 = "0xx22mf4wskn9gv04farwyp3mpx2ab3lsmmxvd3k00x99637x6jq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -66585,12 +66795,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20170718.329";
+        version = "20170731.542";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "b2216118167d9294ff43326b3b57fa72b20e1f76";
-          sha256 = "055lq7hc9i44w21j37a0p1bm4vd40vbp4yyliaw8v6a7vg9jwhs0";
+          rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e";
+          sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -66625,12 +66835,12 @@
     speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "speech-tagger";
-        version = "20160224.2";
+        version = "20170728.1129";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
           repo = "speech-tagger";
-          rev = "60ce97b0fc34eb32f507957646679fff77b5f0fd";
-          sha256 = "0v4v2nr680zgljr9k7rgf7mhy49bv5ixc8ksba3g1bbrz0qv5ny6";
+          rev = "61955b40d4e8b09e66a3e8033e82893f81657c06";
+          sha256 = "07rgs1f9z2ayphv04jdjk9v1s2s47qvksf64z6qn1zss2alc0y0v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db80aa5d95846ee02a9d762aa68325ab5e37dcf7/recipes/speech-tagger";
@@ -67041,27 +67251,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    sql-mssql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "sql-mssql";
-        version = "20160512.137";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "sql-mssql";
-          rev = "f8a7f16720fbc7480a7ae83e21958860f66c1ccf";
-          sha256 = "02jsz69j1mi082s0xfk99qrm6wskdfz20na3jc7c35f564l493hs";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4df28e4f5fe01a7c4e02744c4a335047779fe1d/recipes/sql-mssql";
-          sha256 = "15z60d2244mxhigr52g332qzjj5ygqyl1i6c19q6vfv2z2vcvy7x";
-          name = "sql-mssql";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/sql-mssql";
-          license = lib.licenses.free;
-        };
-      }) {};
     sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sqlite";
@@ -68061,12 +68250,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "20170703.1433";
+        version = "20170730.306";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "59e140248a667127771aa7aa49ee0511c55e8817";
-          sha256 = "0j0lrphg97lvyxlchgws7l0n0c76hxh6sbm0c98dvsnki6jgfj72";
+          rev = "1c8a6ca6e135e7228d45247adee75f721f20ef64";
+          sha256 = "0ld6ivnkrhj3rdlr54sg90i4pdkgvyma9mhpr52ni6ab4053mpyj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -68164,12 +68353,12 @@
     suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "suomalainen-kalenteri";
-        version = "20170528.801";
+        version = "20170801.126";
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "suomalainen-kalenteri";
-          rev = "d380321ce7b7a5650847a7866bd98226af51d4b4";
-          sha256 = "1fcyh26zd7rpp0519kswgr9ps67flwwypw2ic3nwgjdhxb41kmzs";
+          rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3";
+          sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri";
@@ -68439,8 +68628,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
-          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
+          rev = "fc275339b57690d4157160ed22b7672d5382cbe7";
+          sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -70044,10 +70233,10 @@
     thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }:
     melpaBuild {
         pname = "thing-cmds";
-        version = "20170331.1338";
+        version = "20170726.1355";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=57";
-          sha256 = "0zi7hbdb5w0lry09rdsxmb0kqnfp6s72kn0z5npfhvwalkcpywbq";
+          url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=58";
+          sha256 = "07z49csdlrf08h8d8p9n8j492r22s7wgpzjwafppbsm4mvgshmq9";
           name = "thing-cmds.el";
         };
         recipeFile = fetchurl {
@@ -70171,8 +70360,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "5c302e02c40be558a21f3a82b53e527f7bec2ff2";
-          sha256 = "0vm97r6ldd138mjdgz8g92grswfq6a20qyh1pn9sg2liygprabb2";
+          rev = "ec2a252136cb864a9edb22ef895bd62ff29c53e1";
+          sha256 = "1avsnlxmr12zbjfv82mg69031s64c1rff7yfbk12hzba93rndnlp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -70229,12 +70418,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170720.2101";
+        version = "20170729.2113";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "1a1a378060a989589cb6129fa22cfbf3eeb5eab8";
-          sha256 = "0c0hvqpg5fgcxlqadz9dsaca9chmnlf19q366rwk0a6vlcwjgb3a";
+          rev = "6ad865937b7615652004ceca2e59c8ecfd737a9b";
+          sha256 = "1krl4h20sr2yk2napqap1b5lm88vzzdy5162i5rf7l53scjdc8vr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -70997,8 +71186,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
-          sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
+          rev = "47bbcf4268602688f90c08ce64ec93226fc3f894";
+          sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -71098,12 +71287,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170723.1417";
+        version = "20170730.2052";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "509eb326bf6c2e329fb083e116dab6b407be33b5";
-          sha256 = "1fzdk63qmkyah58hl4c9b1vksv8qijkmz326hzszldgm2zr9xnih";
+          rev = "7a1af3d62e0b27e032b9c9219b97289c11b332ab";
+          sha256 = "0sfq643pfdmfcidm8ji52fn987vf3zwk2v6drmw8p3qzjx2k1m7q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -71203,12 +71392,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170724.445";
+        version = "20170729.834";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "e550867a72359e4a6656b6055c5c3ea26a285499";
-          sha256 = "138hsm4qs1srz2fp26v16rr233qc580wl7ix7wphkr1k1mwmw313";
+          rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93";
+          sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -71228,8 +71417,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "e550867a72359e4a6656b6055c5c3ea26a285499";
-          sha256 = "138hsm4qs1srz2fp26v16rr233qc580wl7ix7wphkr1k1mwmw313";
+          rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93";
+          sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71457,8 +71646,8 @@
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "79bca7dc9254da190d821b504da4946df8c3d548";
-          sha256 = "02zjjq3nmmawmialhj95bz032a3ycyvzl5sgp7g37l7q3l0s63bc";
+          rev = "1af437337abe17afc95de7070fd242165529f556";
+          sha256 = "0jjlb4i1vp5390v9w0dg4cc0l46jrxqphvw6b3wn1zy511r9q1jm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -71936,8 +72125,8 @@
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "e3a343991c0175092f27665fce9474e240f3f1f7";
-          sha256 = "0wmyym7aj0wr80ya1wif1ywmsy4pln4khyzcnfhd0xrp62pya2cv";
+          rev = "3f9938f24d053ad21fbbc4773fc786f78a55d522";
+          sha256 = "1x1ay6qwgmj9294shi8l7xr6x7sjrpdwrxgdjynzf4wwgl2ydz4p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -73261,12 +73450,12 @@
     vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vimish-fold";
-        version = "20170606.539";
+        version = "20170730.2206";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "vimish-fold";
-          rev = "527a1d9b9e031713c29f12d1a82f1fdac50c5610";
-          sha256 = "1k8m7b0h3qb5w0wvvjz8047xz71ljfj7kj4z5sv26rhsh5bsdb2s";
+          rev = "e631352fbf910f692807afe38a2b6a7882a403a8";
+          sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -74622,8 +74811,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "ec98973a39d32d7c5d908d61383def5c50fa867d";
-          sha256 = "1pf3sa1xfszaakfcjfllhqc624vmxxgy1g5mksbb36d7jjzx0jcb";
+          rev = "e9e61170f98bfde12b49b750966a826c0c72f848";
+          sha256 = "1s9jysl6gql0fnngm4mwqclbw99502dkrvakz3wxh37c7mf5g9r2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -74826,12 +75015,12 @@
     window-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "window-number";
-        version = "20141106.1829";
+        version = "20170731.1851";
         src = fetchFromGitHub {
           owner = "nikolas";
           repo = "window-number";
-          rev = "1d222f0b48c8d51bad956c3000ff0635b883a355";
-          sha256 = "0n6a4kriwx7c8shvns3fcdp8l1i66bsca5mgd00p7nllnxvldhn3";
+          rev = "d41722de646ffeb3f70d26e4a86a5a1ba5c6be87";
+          sha256 = "1ifs7zp8c5m9da5dz0y4cq7pgqgdkz63v00ib07xdycnfjp4w17i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74523af6e22ebae2f5fe7c4da4e8af8fac5fa074/recipes/window-number";
@@ -74995,8 +75184,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "1ab8f296baeb";
-          sha256 = "02g34b7kp3lkv4sfgf1762vlmmsnxib37v8385lmv90ww24lwggg";
+          rev = "70b4ccc031bc";
+          sha256 = "1mbypvclk83lhwvdy6ancl4j9nysv47s8yp6baa8pi54zlc9w3i1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -75033,12 +75222,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20170707.1401";
+        version = "20170730.314";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "791f985f63abe7f10de3fbd6fd49f9efac05a285";
-          sha256 = "0nh12j3bf247q1ikb2apcpbx8nxvvi9rpj4fbsjbnrs0v65n0v4v";
+          rev = "5cddefaff6aa0fa8ce2a0fa23900687c07d87481";
+          sha256 = "11fsaam88xj8aambiacsmcgn1mjfkx3mm7y74lnnwcslbrmj977a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -75075,12 +75264,12 @@
     with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "with-simulated-input";
-        version = "20170723.941";
+        version = "20170729.1252";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "with-simulated-input";
-          rev = "f0dbf2fdd99c6afe7ab2af83c94a4028e4af9c1c";
-          sha256 = "03y3j0q2iy9mgm0yn4mnxkdwwda8jsy6rsm0qdzha8gq4cdcqrjj";
+          rev = "7f37451dcfbb1873f605e2a412d0585f5c3bed49";
+          sha256 = "0s40mpy10fbdr2b241qa239zdh54gmqk4j9pigqm1zlzi9d5msan";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
@@ -75205,8 +75394,8 @@
         src = fetchFromGitHub {
           owner = "gromnitsky";
           repo = "wordnut";
-          rev = "bcdb86f1f7ee91f721a427b19492ee9578ae74fc";
-          sha256 = "0p8nl5ccic8jx0dzy2976v5mkwb5sq4165qnhq4i26741qbalb62";
+          rev = "6e223dced5b865e9d38af6f9b7e57b3a56d362bb";
+          sha256 = "1w4037jplkl8sr6b7qj4cb5qcrjwz6vnfxfshdjimilwgc3ihs16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut";
@@ -75432,12 +75621,12 @@
     wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wsd-mode";
-        version = "20160930.236";
+        version = "20170731.837";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "wsd-mode";
-          rev = "cdbdf48f60900cedca2805a8b0875327a3a81f19";
-          sha256 = "1ms30d1vz4nd90q6nypz5vixw1s3x6c68lm3l9zgq2ls6bw3kz93";
+          rev = "566ae4b45b4a34b985f1b363d6cdbd463ab6aba6";
+          sha256 = "0k30i1gq6ljxwf97f6nlz8b6blh6hg0b4syfx64lzf0zc22di2l4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode";
@@ -75621,12 +75810,12 @@
     xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-find";
-        version = "20170713.624";
+        version = "20170729.1407";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "d5f12b6185af9674d236a758df16649bfafadf2c";
-          sha256 = "19cg18gh18pp1z862aykfhn44vhnbggr32rrs7smy33nq2h6q512";
+          rev = "5eaa02e28c4496bbf898271401005a694176a2d3";
+          sha256 = "0wdlc3d4ciyhc2nnnvfp0bdvar4486rcqfkj9czjb6v6jax3farx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
@@ -75642,12 +75831,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170725.1253";
+        version = "20170729.1310";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "7f884f13d01a5914e0201d58eef7275a6f884cae";
-          sha256 = "1sgh3mk7f1p92jmzcga67bcc4s6ciipc7ga1biav0r3nqfk087jy";
+          rev = "636d4be0adf234ace22ee236b66b7b9ce81cff54";
+          sha256 = "1kqy10y7bqza4y7fj5n0vg536hksjzjbd2r3n36dij27k8n996dm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -75873,12 +76062,12 @@
     xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xml-plus";
-        version = "20160210.1942";
+        version = "20170727.1651";
         src = fetchFromGitHub {
           owner = "bddean";
           repo = "xml-plus";
-          rev = "1b728dda31dd13506aa4e1220f925bb43c93847b";
-          sha256 = "0c30xh7qxg3y2p5jqkbssz5z53rx0yp64qqyy9f87qzgkcd2jd8k";
+          rev = "232fa863c08fc159b21dd58c39ea45dce3334895";
+          sha256 = "0b7v59dya346ds1wad0avrqhjimx5n9r3pcgqafagzf34hdcv3jy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/244388d158efda6fe8c1362a65b89b352c444422/recipes/xml+";
@@ -76297,8 +76486,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "d0671b315a8411ec299af63742813783e3eff04d";
-          sha256 = "1a9rc2k4rah80hmwwmk8ca8k0s2812qsigci072lvc8x49smylld";
+          rev = "69c4e154f9335750ab8658a00577952930138a79";
+          sha256 = "166zhipzsv2v2qlxglmxr8a0syi5aq2rrh8sxs6n4wmnpgcfglhg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -76335,12 +76524,12 @@
     yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yaml-mode";
-        version = "20170406.241";
+        version = "20170727.1531";
         src = fetchFromGitHub {
           owner = "yoshiki";
           repo = "yaml-mode";
-          rev = "64b28913bfe910b147d6ee16488dbaedb1452ca6";
-          sha256 = "0c4c9qa8avqnkd0qp88wdc1jpp674bghma4x0bvbi147g224ybp7";
+          rev = "28c34033194130d452d5c958b5241c88d42ca02b";
+          sha256 = "1m3fr19sfkr7d94qzqkl7x1jmhpar2hnhq6mjscd3lfcqkifh6kv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode";
@@ -77344,11 +77533,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170724.2249";
+        version = "20170730.2055";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "620afddbc133";
-          sha256 = "1cjnig9x8xsdjyxdp3wmc8dhp050xzqvi8ca0hrd1fgwzgvg0wvv";
+          rev = "bddebd64d652";
+          sha256 = "1q7rhcsxr66fmhwmpbw35y8gdvlbfisvjy4xmh455ajy3126zyp2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From f416d59ea48d31cea2b549795937cf09320417d7 Mon Sep 17 00:00:00 2001
From: Sauyon Lee <sauyonl@sauyon.com>
Date: Tue, 1 Aug 2017 17:12:08 +0100
Subject: [PATCH 1371/3246] numix-sx-gtk-theme: init at 2017-04-24

---
 lib/maintainers.nix                   |  1 +
 pkgs/misc/themes/numix-sx/default.nix | 30 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/misc/themes/numix-sx/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e5286fa995e..17629daea47 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -510,6 +510,7 @@
   samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   sargon = "Daniel Ehlers <danielehlers@mindeye.net>";
+  sauyon = "Sauyon Lee <s@uyon.co>";
   schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
   schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix
new file mode 100644
index 00000000000..a56f67b8df4
--- /dev/null
+++ b/pkgs/misc/themes/numix-sx/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  version = "2017-04-24";
+  name = "numix-sx-gtk-theme-${version}";
+
+  src = fetchurl {
+    url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz";
+    sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0";
+  };
+
+  buildInputs = [ gtk-engine-murrine ];
+
+  dontBuild = true;
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    install -dm 755 "$out/share/themes/"
+    cp -dr --no-preserve='ownership' Numix-SX-{Dark,FullDark,Light} "$out/share/themes/"
+  '';
+
+  meta = {
+    description = "Gray variation of Numix theme";
+    homepage = https://www.gnome-look.org/p/1117412/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.sauyon ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17306733136..5264bad26d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17801,6 +17801,8 @@ with pkgs;
 
   numix-gtk-theme = callPackage ../misc/themes/numix { };
 
+  numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { };
+
   theme-vertex = callPackage ../misc/themes/vertex { };
 
   rox-filer = callPackage ../desktops/rox/rox-filer {

From 93d80f19515867e3b215262532deb621e234c483 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 18:22:22 +0200
Subject: [PATCH 1372/3246] p11_kit: fix docs

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

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 53c94ab874c..7a7a6d9d23f 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv, libffi, libtasn1 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv
+, libffi, libtasn1, gtk_doc, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
   name = "p11-kit-${version}";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
-  nativeBuildInputs = [ autoreconfHook which pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook which pkgconfig gtk_doc libxslt docbook_xsl ];
   buildInputs = [ libffi libtasn1 libiconv ];
 
   autoreconfPhase = ''
@@ -25,6 +26,7 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--without-trust-paths"
+    "--enable-doc"
   ];
 
   installFlags = [ "exampledir=\${out}/etc/pkcs11" ];

From ac56b8db4a7ee600c49fba2916ceb3caa6f6ca61 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 1 Aug 2017 18:28:52 +0200
Subject: [PATCH 1373/3246] nano: remove darwin patch

---
 pkgs/applications/editors/nano/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 7b67610772e..3cb53a6116b 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -27,8 +27,6 @@ in stdenv.mkDerivation rec {
     sha256 = "0xjpm2ka56x5ycrgjh06v110na13xlbm42bs8qibk7g578m9cils";
   };
 
-  patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch;
-
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
   buildInputs = [ ncurses ];
 

From ea8798acc6475812e97631855bd98ce80618f5a6 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 1 Aug 2017 09:30:07 -0700
Subject: [PATCH 1374/3246] coq2html: New expression

---
 .../science/logic/coq2html/default.nix        | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/science/logic/coq2html/default.nix

diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix
new file mode 100644
index 00000000000..9687ac66ead
--- /dev/null
+++ b/pkgs/applications/science/logic/coq2html/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, lib, make, fetchgit, ocaml }:
+
+let 
+  version = "20170720";
+in
+
+stdenv.mkDerivation {
+  name = "coq2html-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/xavierleroy/coq2html";
+    rev = "e2b94093c6b9a877717f181765e30577de22439e";
+    sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610";
+  };
+
+  buildInputs = [ make ocaml ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp coq2html $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "coq2html is an HTML documentation generator for Coq source files";
+    longDescription = ''
+      coq2html is an HTML documentation generator for Coq source files. It is
+      an alternative to the standard coqdoc documentation generator
+      distributed along with Coq. The major feature of coq2html is its ability
+      to fold proof scripts: in the generated HTML, proof scripts are
+      initially hidden, but can be revealed one by one by clicking on the
+      "Proof" keyword.
+    '';
+    homepage = https://github.com/xavierleroy/coq2html;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21ee6afaf24..c4b2defc114 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18150,6 +18150,10 @@ with pkgs;
   coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
   coq = coqPackages.coq;
 
+  coq2html = callPackage ../applications/science/logic/coq2html {
+    make = pkgs.gnumake3;
+  };
+
   cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
 
   cubicle = callPackage ../applications/science/logic/cubicle { };

From 0396ca6150b26a95d733f38ea59b4535b206fba7 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 1 Aug 2017 09:34:50 -0700
Subject: [PATCH 1375/3246] ghc-events_0_6_0 no longer exists

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 317312823f9..2d0d0ec101d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -873,9 +873,6 @@ self: super: {
   # https://github.com/diagrams/diagrams-solve/issues/4
   diagrams-solve = dontCheck super.diagrams-solve;
 
-  # Needs a newer version of ghc-events.
-  threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; };
-
   # version 1.3.1.2 does not compile: syb >=0.1.0.2 && <0.7
   ChasingBottoms = doJailbreak super.ChasingBottoms;
 

From 161f0d33487a238b1c5a4319b4ec777a529f7827 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 2 Aug 2017 01:13:16 +0800
Subject: [PATCH 1376/3246] cantata: 2.0.1 -> 2.1.0

---
 pkgs/applications/audio/cantata/default.nix | 39 +++++++++++----------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 82a6d44f643..f09791d9aa1 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, vlc
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
 , withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtsvg, qttools
+, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools
 
 # Cantata doesn't build with cdparanoia enabled so we disable that
 # default for now until I (or someone else) figure it out.
@@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib;
 assert withReplaygain -> withTaglib;
 
 let
-  version = "2.0.1";
+  version = "2.1.0";
   pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
@@ -44,24 +44,27 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
-    owner = "CDrummond";
-    repo = "cantata";
-    rev = "v${version}";
-    sha256 = "18fiz3cav41dpap42qwj9hwxf2k9fmhyg2r34yggxqi2cjlsil36";
+    owner  = "CDrummond";
+    repo   = "cantata";
+    rev    = "v${version}";
+    sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh";
   };
 
-  buildInputs =
-    [ cmake vlc ]
-    ++ stdenv.lib.optional withQt4 qt4
-    ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ]
+  buildInputs = [ vlc ]
+    ++ stdenv.lib.optional  withQt4 qt4
+    ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ]
     ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
     ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
-    ++ stdenv.lib.optional withCdda cdparanoia
-    ++ stdenv.lib.optional withCddb libcddb
-    ++ stdenv.lib.optional withLame lame
-    ++ stdenv.lib.optional withMtp libmtp
-    ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
-    ++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
+    ++ stdenv.lib.optional  withCdda cdparanoia
+    ++ stdenv.lib.optional  withCddb libcddb
+    ++ stdenv.lib.optional  withLame lame
+    ++ stdenv.lib.optional  withMtp libmtp
+    ++ stdenv.lib.optional  withMusicbrainz libmusicbrainz5
+    ++ stdenv.lib.optional  (withTaglib && withDevices) udisks2;
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  enableParallelBuilding = true;
 
   cmakeFlags = stdenv.lib.flatten [
     (fstat withQt5 "QT5")
@@ -94,6 +97,6 @@ stdenv.mkDerivation rec {
     # Technically Cantata can run on Windows so if someone wants to
     # bother figuring that one out, be my guest.
     platforms = platforms.linux;
-    maintainers = [ maintainers.fuuzetsu ];
+    maintainers = with maintainers; [ fuuzetsu ];
   };
 }

From 4c85665bd283f611caf7e0230421978f67f8949f Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 20 Jul 2017 10:41:31 +0300
Subject: [PATCH 1377/3246] bullet: 2.83.7 -> 2.86.1

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

diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index a8d350d9e37..0c9f0903f14 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bullet-${version}";
-  version = "2.83.7";
+  version = "2.86.1";
 
   src = fetchFromGitHub {
     owner = "bulletphysics";
     repo = "bullet3";
     rev = version;
-    sha256 = "1zz3vs6i5975y9mgb1k1vxrjbf1028v0nc11p646dsvv2vplxx5r";
+    sha256 = "1k81hr5y9rs2nsal6711fal21rxp6h573cpmjjk8x8ji2crqbqlz";
   };
 
   buildInputs = [ cmake ] ++

From 5cb0ac3616ceef7224d5cc4863cb09813238b17f Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 24 Jul 2017 20:09:46 +0300
Subject: [PATCH 1378/3246] terra: fix building on master

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4b2defc114..9084db62c6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6002,7 +6002,9 @@ with pkgs;
   tbb = callPackage ../development/libraries/tbb { };
 
   terra = callPackage ../development/compilers/terra {
-    llvmPackages = llvmPackages_38;
+    llvmPackages = llvmPackages_38 // {
+      llvm = llvmPackages_38.llvm.override { enableSharedLibraries = false; };
+    };
     lua = lua5_1;
   };
 

From b5057f713dc84049a8c9c379973fbc87b7bf784a Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 1 Aug 2017 17:44:28 +0300
Subject: [PATCH 1379/3246] openmw-tes3mp: init at 0.6.0

abbradar:
openmw-tes3mp: make build parallel
openmw-tes3mp: install only needed files

Closes #27646.
---
 pkgs/games/openmw/tes3mp.nix    | 114 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |   4 ++
 2 files changed, 118 insertions(+)
 create mode 100644 pkgs/games/openmw/tes3mp.nix

diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix
new file mode 100644
index 00000000000..cb9e296cdd4
--- /dev/null
+++ b/pkgs/games/openmw/tes3mp.nix
@@ -0,0 +1,114 @@
+{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
+, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, mesa_noglu, terra }:
+
+let
+  mygui_ = mygui.override {
+    inherit stdenv;
+  };
+  terra_ = symlinkJoin {
+    name = "terra";
+    paths = [ terra.static terra.dev ];
+  };
+  TES3MP = fetchFromGitHub {
+    owner = "TES3MP";
+    repo = "openmw-tes3mp";
+    rev = "f61664ff6d521e10db761a550c97c6edce8f0046";
+    sha256 = "12h01kafyzq0h1cgf1c8d4mlvlplg5lvcnsc5m5h602r763pzgbb";
+  };
+  CallFF = fetchFromGitHub {
+    owner = "Koncord";
+    repo = "CallFF";
+    rev = "4aa5a31b7543a8f784852a5a109202b2783e93d9";
+    sha256 = "0cf7r8hfh79bsg4p4k1iwhxapyakkvi0hcwwvzg1ln0fqm2yqp57";
+  };
+  RakNet = fetchFromGitHub {
+    owner = "TES3MP";
+    repo = "RakNet";
+    rev = "9ace90a385f60e0b919bd84964a53fb1d42438ba";
+    sha256 = "0mkf5wx23w20fw9cmbiyfs86gmf0r11pdpd8y7qd4k4wl9c7n45q";
+  };
+  PluginExamples = fetchFromGitHub {
+    owner = "TES3MP";
+    repo = "PluginExamples";
+    rev = "213e72f315a8029eec71437e56de0eaeba5b3670";
+    sha256 = "1q0cvz1s0zyq982066wgplnylqbiszz0bmcv2prqv78vq9is1l6b";
+  };
+
+  fakegit = writeScriptBin "git" ''
+    #! ${stdenv.shell}
+    if [ "$*" = "rev-list --tags --max-count=1" ] ||
+       [ "$*" = "rev-parse HEAD" ]; then
+      echo "${TES3MP.rev}"
+    else
+      exit 1
+    fi
+  '';
+in stdenv.mkDerivation rec {
+  version = "0.6.0";
+  name = "tes3mp-${version}";
+
+  src = fetchFromGitHub {
+    owner = "GrimKriegor";
+    repo = "TES3MP-deploy";
+    rev = "ac2e862c3b96206d8e0678d422ece30f9f2d0f45";
+    sha256 = "0nysr6h7sa1j5ijyd52k6sw052vcdqdx4wjjmmy7p8wh1i0jkvv6";
+  };
+
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [ cmake makeWrapper fakegit ];
+  buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt
+    ncurses mesa_noglu ];
+
+  buildPhase = ''
+    mkdir dependencies keepers
+    cp --no-preserve=mode -r ${TES3MP} code
+    mkdir code/.git
+    cp --no-preserve=mode -r ${CallFF} dependencies/callff
+    cp --no-preserve=mode -r ${RakNet} dependencies/raknet
+    cp --no-preserve=mode -r ${PluginExamples} keepers/PluginExamples
+    ln -s ${terra_} dependencies/terra
+
+    substituteInPlace tes3mp-deploy.sh \
+      --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out"
+    patchShebangs tes3mp-deploy.sh
+    echo y | ./tes3mp-deploy.sh -i -c $NIX_BUILD_CORES
+  '';
+
+  installPhase = ''
+    prefix=$out/opt/tes3mp
+    mkdir -p $prefix/build $out/etc/openmw $out/bin
+    for i in build/*; do
+      if [ -f "$i" ] && [ -x "$i" ]; then
+        mv "$i" $prefix/build
+      fi
+    done
+    mv build/resources $prefix/build
+    mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw
+    mv keepers $prefix
+
+    for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh
+    do
+      bin="$out/bin/''${i%.sh}"
+      mv $i $bin
+      substituteInPlace $bin \
+        --replace build/ $prefix/build/
+      chmod +x $bin
+    done
+    ln -s $prefix/keepers/*.cfg $out/etc/openmw/
+
+    wrapProgram $out/bin/tes3mp-server \
+      --run "mkdir -p ~/.config/openmw" \
+      --run "cd ~/.config/openmw" \
+      --run "[ -d PluginExamples ] || cp --no-preserve=mode -r $prefix/keepers/PluginExamples ." \
+      --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/PluginExamples\" > tes3mp-server.cfg"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Multiplayer for TES3:Morrowind based on OpenMW";
+    homepage = "https://tes3mp.com/";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ gnidorah ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9084db62c6f..1b149b36bac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17380,6 +17380,10 @@ with pkgs;
 
   openmw = callPackage ../games/openmw { };
 
+  openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix {
+    stdenv = overrideCC stdenv gcc7;
+  };
+
   openra = callPackage ../games/openra { lua = lua5_1; };
 
   openrw = callPackage ../games/openrw { };

From bb82df6d1ced180b60bb470def19878913898209 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 1 Aug 2017 17:30:45 +0000
Subject: [PATCH 1380/3246] icewm: 1.3.12 -> 1.4.2

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

diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index ef3ad8fda25..ffd1d995e87 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -3,22 +3,22 @@
 , freetype, fontconfig, pkgconfig, gdk_pixbuf
 , mkfontdir, libX11, libXft, libXext, libXinerama
 , libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb
-, libpthreadstubs }:
+, libpthreadstubs, pcre }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "icewm-${version}";
-  version = "1.3.12";
+  version = "1.4.2";
 
   buildInputs =
   [ cmake gettext libjpeg libtiff libungif libpng imlib expat
     freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11
     libXft libXext libXinerama libXrandr libICE libSM libXpm
-    libXdmcp libxcb libpthreadstubs ];
+    libXdmcp libxcb libpthreadstubs pcre ];
 
   src = fetchurl {
     url = "https://github.com/bbidulock/icewm/archive/${version}.tar.gz";
-    sha256 = "0cmjnf0yvafwg73qy5wq7ghiknpn1jf1978c1yj7yabyn07zxq77";
+    sha256 = "05chzjjnb4n4j05ld2gmhhr07c887qb4j9inwg9izhvml51af1bw";
   };
 
   preConfigure = ''

From a263de3d3ea00a0ed1de1c17548546708692200f Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:41:26 +0200
Subject: [PATCH 1381/3246] libfilezilla: 0.9.2 -> 0.10.0

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index b0f1046aa59..679f6ba7902 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.9.2";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "1qrvddjqz5jv6920gcfqsrsjksi2845hn96g0z3vpcsm6nifhqn1";
+    sha256 = "10ik96s4r8kbgc5z4z5mqk8w1p3plakqavf6j86a48gl8in1f45x";
   };
 
   meta = with stdenv.lib; {

From 23aed92e42932469faa997f62151a72d2d4430ab Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:42:32 +0200
Subject: [PATCH 1382/3246] filezilla: 3.25.2 -> 3.27.0.1

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

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

From 20fb18bdbcdd266ebd4129fa807f18798029f7c8 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:46:31 +0200
Subject: [PATCH 1383/3246] igv: 2.3.89 -> 2.3.98

---
 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 3acf7d96527..917863d1ba1 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.89";
+  version = "2.3.98";
 
   src = fetchurl {
     url = "http://data.broadinstitute.org/igv/projects/downloads/IGV_${version}.zip";
-    sha256 = "06bmj9jsnk5010ipv0w4qlcvgw67dy8hsvgcx9l74v3s0zp5di3y";
+    sha256 = "1bjdsvx8jsbcry6v7yfclh3vrlsvaw38f3s9587lklj63zj638l2";
   };
 
   buildInputs = [ unzip jre ];

From bc563c59731810781097053ff5e2fddae2b01155 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:48:21 +0200
Subject: [PATCH 1384/3246] git-cola: 2.10 -> 2.11

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 2a9ea0715e0..8e3c6b8d9d0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -4,13 +4,13 @@ let
   inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
 in buildPythonApplication rec {
   name = "git-cola-${version}";
-  version = "2.10";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner = "git-cola";
     repo = "git-cola";
     rev = "v${version}";
-    sha256 = "067g0yya6718kxagf5qm59zizp0lizca4m3ih85y732i6rqpgwv8";
+    sha256 = "1prv8ib9jdkj5rgixj3hvkivwmbz5xvh8bmllrb1sb301yzi1s0g";
   };
 
   buildInputs = [ git gettext ];

From 5234545da83e9b8fd05ece6d1ef09467a30af3ac Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:49:48 +0200
Subject: [PATCH 1385/3246] git-hub: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 82549fd9a57..9ddcaea497d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "git-hub-${version}";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
-    sha256 = "1lpi373vzr6gda0gic7w37qhipfg7bjpn8nwjjgz44vf2vjlhf9k";
+    sha256 = "15449bqk7nyvbpin5j2hg862cqa7hb4zxkmr8mkqm5hz2jxmxspa";
     rev = "v${version}";
     repo = "git-hub";
     owner = "sociomantic-tsunami";

From d942615651cc644cb2f6468c91926c4143c01451 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:51:16 +0200
Subject: [PATCH 1386/3246] gitflow: 1.10.2 -> 1.11.0

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

diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 05659a68a52..698de486b5b 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -4,14 +4,14 @@ with pkgs.lib;
 
 stdenv.mkDerivation rec {
   pname = "gitflow";
-  version = "1.10.2";
+  version = "1.11.0";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "petervanderdoes";
     repo = pname;
     rev = version;
-    sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg";
+    sha256 = "0zk53g0wd5n1zlhkwlfp124i6agx8kl0cwvy0dia3jh1p51vsc1q";
   };
 
   buildInputs = [ pkgs.makeWrapper ];

From 2063f8ac8c697715daefdd5e656991388b3e8a10 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:53:10 +0200
Subject: [PATCH 1387/3246] shared-mime-info: 1.7 -> 1.8

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

diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 7e2eefd3f1c..484aa4e5a23 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
 , libxml2, glib}:
 
-let version = "1.7"; in
+let version = "1.8"; in
 stdenv.mkDerivation rec {
   name = "shared-mime-info-${version}";
 
   src = fetchurl {
     url = "http://freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "0bjd2j1rqrj150mr04j7ib71lfdlgbf235fg8d70g8mszqf7ik7a";
+    sha256 = "1sc96lv9dp1lkvs8dh3ngm3hbjb274d363dl9avhb61il3qmxx9a";
   };
 
   nativeBuildInputs = [

From c8b0f338a0fcf80dc3fa3c1d1014aacc672e0b22 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:54:47 +0200
Subject: [PATCH 1388/3246] swi-prolog: 7.2.3 -> 7.4.2

---
 pkgs/development/compilers/swi-prolog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 79f7e5256b2..0f84b8ba4cd 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "7.2.3";
+  version = "7.4.2";
 in
 stdenv.mkDerivation {
   name = "swi-prolog-${version}";
 
   src = fetchurl {
     url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz";
-    sha256 = "1da6sr8pz1zffs79nfa1d25a11ibhalm1vdwsb17p265nx8psra3";
+    sha256 = "12yzy3w2l1p9fv77lv20xbqq47d0zjw5rkz96mx1xg1lldyja5vz";
   };
 
   buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama

From 5f831b381cbe2819241ad2a6f27f08a2ba6de4df Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:56:09 +0200
Subject: [PATCH 1389/3246] groovy: 2.4.10 -> 2.4.12

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

diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 1928d51d3e5..e203a1d09f4 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.4.10";
+  version = "2.4.12";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "1a8pqcrm014h4x54gqqyxp7r1vkwhphqwrfa7gnqr6nzdqxzyk8w";
+    sha256 = "1dm7m221pqbgh3lp1q1nvv6qc0fpja3cgsd0mx3ghahcfsfa3fck";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 270bfa2ca37181b9634fd55ba35a56fdc4b4d65d Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:57:37 +0200
Subject: [PATCH 1390/3246] klavaro: 3.02 -> 3.03

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

diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index ea56c1f1ac2..83f8f1a8be7 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "klavaro-${version}";
-  version = "3.02";
+  version = "3.03";
 
   src = fetchurl {
     url = "mirror://sourceforge/klavaro/${name}.tar.bz2";
-    sha256 = "5f77730a8c1c8dfd4443ec8390c7226e3f82537df0882cd1222b140f0d0fcd6c";
+    sha256 = "1dc75jd5bx5w3rr4zaqyf2cci3vzgac18fia0h04fzsfwlhrz5g0";
   };
 
   buildInputs = [ makeWrapper pkgconfig intltool curl gtk3 ];

From 2a00ff4a1c5372c703df684de3e8666af02bb95e Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 1 Aug 2017 20:58:48 +0200
Subject: [PATCH 1391/3246] gnuplot: 5.0.3 -> 5.0.6

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

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 3b537fad91d..6100573153b 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -21,11 +21,11 @@ let
   withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
 in
 stdenv.mkDerivation rec {
-  name = "gnuplot-5.0.3";
+  name = "gnuplot-5.0.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
-    sha256 = "05f7p21d2b0r3h0af8i75bh2inx9pws1k4crx5c400927xgy6vjz";
+    sha256 = "0q5lr6nala3ln6f3yp6g17ziymb9r9gx9zylnw1y3hjmwl9lggjv";
   };
 
   buildInputs =

From 93965870a805e2f255b096d33ecb9cc31e43db21 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Tue, 1 Aug 2017 21:45:01 +0200
Subject: [PATCH 1392/3246] nixos/auditd: break ordering cycle (#27577)

auditd creates an ordering cycle by adding wantedBy = [ "basic.target" ],
because of this the job job systemd-update-utmp.service/start is deleted.

Adding unitConfig.DefaultDependencies = false; to the auditd service unbreaks the cycle.

See also #11864
---
 nixos/modules/security/auditd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index 319dce9a6c5..6abac244dac 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -13,6 +13,7 @@ with lib;
       unitConfig = {
         ConditionVirtualization = "!container";
         ConditionSecurity = [ "audit" ];
+        DefaultDependencies = false;
       };
 
       path = [ pkgs.audit ];

From f5fa5fa4d629a0dbc8033d86f1d5c6b2eb531f96 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 1 Aug 2017 22:03:30 +0200
Subject: [PATCH 1393/3246] pkgs: refactor needless quoting of homepage meta
 attribute (#27809)

* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
---
 pkgs/applications/altcoins/bitcoin-xt.nix     |  2 +-
 pkgs/applications/altcoins/bitcoin.nix        |  2 +-
 .../applications/altcoins/cryptop/default.nix |  2 +-
 .../altcoins/go-ethereum-classic/default.nix  |  2 +-
 pkgs/applications/altcoins/go-ethereum.nix    |  2 +-
 pkgs/applications/altcoins/hivemind.nix       |  2 +-
 pkgs/applications/altcoins/hsevm.nix          |  2 +-
 pkgs/applications/altcoins/memorycoin.nix     |  2 +-
 pkgs/applications/altcoins/zcash/default.nix  |  2 +-
 .../altcoins/zcash/librustzcash/default.nix   |  2 +-
 .../altcoins/zcash/libsnark/ate-pairing.nix   |  2 +-
 .../altcoins/zcash/libsnark/default.nix       |  2 +-
 .../altcoins/zcash/libsnark/mie.nix           |  2 +-
 .../altcoins/zcash/libsnark/xbyak.nix         |  2 +-
 pkgs/applications/audio/ario/default.nix      |  2 +-
 .../applications/audio/bs1770gain/default.nix |  2 +-
 .../applications/audio/clementine/default.nix |  6 ++--
 pkgs/applications/audio/deadbeef/default.nix  |  2 +-
 .../audio/deadbeef/plugins/mpris2.nix         |  2 +-
 pkgs/applications/audio/dirt/default.nix      |  2 +-
 pkgs/applications/audio/easytag/default.nix   |  2 +-
 pkgs/applications/audio/espeak-ng/default.nix |  2 +-
 .../audio/freewheeling/default.nix            |  2 +-
 pkgs/applications/audio/gpodder/default.nix   |  2 +-
 pkgs/applications/audio/gtklick/default.nix   |  2 +-
 pkgs/applications/audio/klick/default.nix     |  2 +-
 .../audio/lastfmsubmitd/default.nix           |  2 +-
 pkgs/applications/audio/lastwatch/default.nix |  2 +-
 pkgs/applications/audio/lmms/default.nix      |  2 +-
 .../audio/mopidy-iris/default.nix             |  2 +-
 .../audio/mopidy-local-images/default.nix     |  2 +-
 .../audio/mopidy-local-sqlite/default.nix     |  2 +-
 pkgs/applications/audio/paprefs/default.nix   |  2 +-
 .../audio/pavucontrol/default.nix             |  2 +-
 pkgs/applications/audio/pianobar/default.nix  |  2 +-
 pkgs/applications/audio/picard/default.nix    |  2 +-
 pkgs/applications/audio/ponymix/default.nix   |  2 +-
 pkgs/applications/audio/projectm/default.nix  |  2 +-
 .../audio/schismtracker/default.nix           |  2 +-
 pkgs/applications/audio/seq24/default.nix     |  2 +-
 pkgs/applications/audio/sonata/default.nix    |  2 +-
 .../audio/sooperlooper/default.nix            |  2 +-
 pkgs/applications/audio/ssrc/default.nix      |  2 +-
 pkgs/applications/audio/svox/default.nix      |  2 +-
 pkgs/applications/audio/tomahawk/default.nix  |  2 +-
 pkgs/applications/audio/yasr/default.nix      |  2 +-
 pkgs/applications/audio/ympd/default.nix      |  2 +-
 .../applications/backup/crashplan/default.nix |  2 +-
 .../display-managers/sddm/default.nix         |  2 +-
 pkgs/applications/editors/aewan/default.nix   |  2 +-
 .../applications/editors/aseprite/default.nix |  2 +-
 pkgs/applications/editors/eclipse/plugins.nix |  2 +-
 .../editors/emacs-modes/bbdb/3.nix            |  2 +-
 .../editors/emacs-modes/bbdb/default.nix      |  2 +-
 .../editors/emacs-modes/cask/default.nix      |  2 +-
 .../emacs-clang-complete-async/default.nix    |  2 +-
 .../editors/emacs-modes/erlang/default.nix    |  2 +-
 .../editors/emacs-modes/ess/default.nix       |  2 +-
 .../emacs-modes/graphviz-dot/default.nix      |  2 +-
 .../editors/emacs-modes/haskell/default.nix   |  2 +-
 .../editors/emacs-modes/icicles/default.nix   |  2 +-
 .../editors/emacs-modes/let-alist/default.nix |  2 +-
 .../editors/emacs-modes/prolog/default.nix    |  2 +-
 .../editors/emacs-modes/rudel/default.nix     |  2 +-
 .../editors/emacs-modes/sbt-mode/default.nix  |  2 +-
 .../editors/emacs-modes/scala-mode/v2.nix     |  2 +-
 pkgs/applications/editors/flpsed/default.nix  |  2 +-
 .../editors/focuswriter/default.nix           |  2 +-
 pkgs/applications/editors/heme/default.nix    |  2 +-
 .../applications/editors/hexcurse/default.nix |  2 +-
 pkgs/applications/editors/hexedit/default.nix |  2 +-
 pkgs/applications/editors/ht/default.nix      |  2 +-
 .../editors/jetbrains/default.nix             | 18 +++++------
 .../editors/notepadqq/default.nix             |  2 +-
 pkgs/applications/editors/nvpy/default.nix    |  2 +-
 pkgs/applications/editors/scite/default.nix   |  2 +-
 .../applications/editors/texmaker/default.nix |  2 +-
 pkgs/applications/editors/tweak/default.nix   |  2 +-
 pkgs/applications/editors/typora/default.nix  |  2 +-
 .../applications/editors/vbindiff/default.nix |  2 +-
 .../editors/wxhexeditor/default.nix           |  2 +-
 .../graphics/ahoviewer/default.nix            |  2 +-
 .../graphics/exrdisplay/default.nix           |  2 +-
 .../graphics/exrtools/default.nix             |  2 +-
 pkgs/applications/graphics/gocr/default.nix   |  2 +-
 .../applications/graphics/guetzli/default.nix |  2 +-
 .../graphics/imlibsetroot/default.nix         |  2 +-
 pkgs/applications/graphics/jbrout/default.nix |  2 +-
 pkgs/applications/graphics/krita/default.nix  |  2 +-
 .../applications/graphics/mtpaint/default.nix |  2 +-
 .../graphics/openscad/default.nix             |  2 +-
 .../graphics/paraview/default.nix             |  2 +-
 pkgs/applications/graphics/pbrt/default.nix   |  2 +-
 .../applications/graphics/photoqt/default.nix |  2 +-
 .../graphics/sane/backends/generic.nix        |  2 +-
 pkgs/applications/graphics/sane/frontends.nix |  2 +-
 .../graphics/smartdeblur/default.nix          |  2 +-
 pkgs/applications/graphics/sxiv/default.nix   |  2 +-
 .../graphics/unigine-valley/default.nix       |  2 +-
 pkgs/applications/graphics/vimiv/default.nix  |  2 +-
 .../graphics/xfractint/default.nix            |  2 +-
 pkgs/applications/graphics/yed/default.nix    |  2 +-
 pkgs/applications/inferno/default.nix         |  2 +-
 .../kde/build-support/application.nix         |  2 +-
 pkgs/applications/kde/kdelibs/default.nix     |  2 +-
 pkgs/applications/kde/okular.nix              |  2 +-
 pkgs/applications/misc/abook/default.nix      |  2 +-
 pkgs/applications/misc/antfs-cli/default.nix  |  2 +-
 pkgs/applications/misc/apvlv/default.nix      |  2 +-
 pkgs/applications/misc/bleachbit/default.nix  |  2 +-
 pkgs/applications/misc/cataract/build.nix     |  2 +-
 pkgs/applications/misc/cgminer/default.nix    |  2 +-
 pkgs/applications/misc/cheat/default.nix      |  2 +-
 .../misc/cli-visualizer/default.nix           |  2 +-
 pkgs/applications/misc/confclerk/default.nix  |  2 +-
 .../misc/cool-retro-term/default.nix          |  2 +-
 pkgs/applications/misc/ctodo/default.nix      |  2 +-
 pkgs/applications/misc/cura/default.nix       |  2 +-
 pkgs/applications/misc/curaengine/default.nix |  2 +-
 .../misc/deepin-terminal/default.nix          |  2 +-
 .../misc/dfilemanager/default.nix             |  2 +-
 pkgs/applications/misc/eaglemode/default.nix  |  2 +-
 pkgs/applications/misc/eterm/default.nix      |  2 +-
 pkgs/applications/misc/fetchmail/default.nix  |  2 +-
 pkgs/applications/misc/finalterm/default.nix  |  2 +-
 pkgs/applications/misc/flamerobin/default.nix |  2 +-
 pkgs/applications/misc/gammu/default.nix      |  2 +-
 pkgs/applications/misc/gksu/default.nix       |  2 +-
 pkgs/applications/misc/gmrun/default.nix      |  2 +-
 pkgs/applications/misc/gmtp/default.nix       |  2 +-
 pkgs/applications/misc/gnome15/default.nix    |  2 +-
 pkgs/applications/misc/gollum/default.nix     |  2 +-
 pkgs/applications/misc/grip/default.nix       |  2 +-
 pkgs/applications/misc/haxor-news/default.nix |  2 +-
 pkgs/applications/misc/houdini/runtime.nix    |  2 +-
 pkgs/applications/misc/hstr/default.nix       |  2 +-
 pkgs/applications/misc/ikiwiki/default.nix    |  2 +-
 .../applications/misc/jbidwatcher/default.nix |  2 +-
 pkgs/applications/misc/kanboard/default.nix   |  2 +-
 pkgs/applications/misc/lenmus/default.nix     |  2 +-
 pkgs/applications/misc/lyx/default.nix        |  2 +-
 .../applications/misc/multimon-ng/default.nix |  2 +-
 .../misc/netsurf/browser/default.nix          |  2 +-
 .../misc/netsurf/buildsystem/default.nix      |  2 +-
 .../misc/netsurf/libcss/default.nix           |  2 +-
 .../misc/netsurf/libdom/default.nix           |  2 +-
 .../misc/netsurf/libhubbub/default.nix        |  2 +-
 .../misc/netsurf/libnsbmp/default.nix         |  2 +-
 .../misc/netsurf/libnsfb/default.nix          |  2 +-
 .../misc/netsurf/libnsgif/default.nix         |  2 +-
 .../misc/netsurf/libnsutils/default.nix       |  2 +-
 .../misc/netsurf/libparserutils/default.nix   |  2 +-
 .../misc/netsurf/libutf8proc/default.nix      |  2 +-
 .../misc/netsurf/libwapcaplet/default.nix     |  2 +-
 .../misc/netsurf/nsgenbind/default.nix        |  2 +-
 pkgs/applications/misc/nix-tour/default.nix   |  2 +-
 pkgs/applications/misc/octoprint/default.nix  |  2 +-
 pkgs/applications/misc/octoprint/plugins.nix  |  6 ++--
 .../misc/openbox-menu/default.nix             |  2 +-
 pkgs/applications/misc/openbrf/default.nix    |  2 +-
 pkgs/applications/misc/opencpn/default.nix    |  2 +-
 pkgs/applications/misc/pcmanfm/default.nix    |  2 +-
 .../applications/misc/pcmanx-gtk2/default.nix |  2 +-
 pkgs/applications/misc/pdfmod/default.nix     |  2 +-
 pkgs/applications/misc/posterazor/default.nix |  2 +-
 pkgs/applications/misc/qpdfview/default.nix   |  2 +-
 pkgs/applications/misc/ranger/default.nix     |  2 +-
 .../misc/redis-desktop-manager/default.nix    |  2 +-
 pkgs/applications/misc/robomongo/default.nix  |  2 +-
 .../urxvt-font-size/default.nix               |  2 +-
 .../urxvt-perl/default.nix                    |  2 +-
 .../urxvt-perls/default.nix                   |  2 +-
 .../urxvt-tabbedex/default.nix                |  2 +-
 .../urxvt-theme-switch/default.nix            |  2 +-
 .../rxvt_unicode-plugins/urxvt-vtwheel.nix    |  2 +-
 .../misc/rxvt_unicode/default.nix             |  2 +-
 pkgs/applications/misc/sc-im/default.nix      |  2 +-
 pkgs/applications/misc/slade/default.nix      |  2 +-
 pkgs/applications/misc/st/xst.nix             |  2 +-
 pkgs/applications/misc/stag/default.nix       |  2 +-
 pkgs/applications/misc/stog/default.nix       |  2 +-
 .../misc/super_user_spark/default.nix         |  2 +-
 .../applications/misc/sweethome3d/default.nix |  2 +-
 .../applications/misc/sweethome3d/editors.nix |  2 +-
 pkgs/applications/misc/synergy/default.nix    |  2 +-
 .../misc/taskjuggler/2.x/default.nix          |  2 +-
 pkgs/applications/misc/tasknc/default.nix     |  2 +-
 pkgs/applications/misc/tilix/default.nix      |  2 +-
 pkgs/applications/misc/tomboy/default.nix     |  2 +-
 pkgs/applications/misc/twmn/default.nix       |  2 +-
 pkgs/applications/misc/vanitygen/default.nix  |  2 +-
 pkgs/applications/misc/vifm/default.nix       |  2 +-
 pkgs/applications/misc/volnoti/default.nix    |  2 +-
 pkgs/applications/misc/weather/default.nix    |  2 +-
 pkgs/applications/misc/wikicurses/default.nix |  2 +-
 pkgs/applications/misc/with-shell/default.nix |  2 +-
 pkgs/applications/misc/wmname/default.nix     |  2 +-
 pkgs/applications/misc/worker/default.nix     |  2 +-
 pkgs/applications/misc/xfe/default.nix        |  2 +-
 pkgs/applications/misc/xpdf/default.nix       |  2 +-
 pkgs/applications/misc/xxkb/default.nix       |  2 +-
 .../networking/browsers/midori/default.nix    |  2 +-
 .../esteidfirefoxplugin/default.nix           |  2 +-
 .../nspluginwrapper/default.nix               |  2 +-
 .../browsers/qutebrowser/default.nix          |  2 +-
 .../networking/browsers/vimb/default.nix      |  2 +-
 .../browsers/vimprobable2/default.nix         |  2 +-
 pkgs/applications/networking/c14/default.nix  |  2 +-
 .../networking/cluster/hadoop/default.nix     |  2 +-
 .../networking/cluster/pig/default.nix        |  2 +-
 .../networking/dropbox/default.nix            |  2 +-
 .../networking/feedreaders/rawdog/default.nix |  2 +-
 .../feedreaders/rss2email/default.nix         |  2 +-
 .../instant-messengers/baresip/default.nix    |  2 +-
 .../instant-messengers/discord/default.nix    |  2 +-
 .../instant-messengers/gajim/default.nix      |  2 +-
 .../instant-messengers/gale/default.nix       |  2 +-
 .../instant-messengers/mikutter/default.nix   |  2 +-
 .../pidgin-plugins/carbons/default.nix        |  2 +-
 .../pidgin-plugins/otr/default.nix            |  2 +-
 .../pidgin-plugins/pidgin-latex/default.nix   |  2 +-
 .../instant-messengers/ricochet/default.nix   |  2 +-
 .../instant-messengers/scudcloud/default.nix  |  2 +-
 .../skypeforlinux/default.nix                 |  2 +-
 .../instant-messengers/slack/default.nix      |  2 +-
 .../telegram/cutegram/default.nix             |  2 +-
 .../telegram/tdesktop/default.nix             |  2 +-
 .../instant-messengers/vacuum/default.nix     |  2 +-
 .../networking/irc/epic5/default.nix          |  2 +-
 .../irc/quassel-webserver/default.nix         |  2 +-
 .../networking/mailreaders/alpine/default.nix |  2 +-
 .../mailreaders/astroid/default.nix           |  2 +-
 .../networking/mailreaders/imapfilter.nix     |  2 +-
 .../mailreaders/realpine/default.nix          |  2 +-
 .../applications/networking/msmtp/default.nix |  2 +-
 .../networking/mumble/default.nix             |  2 +-
 .../applications/networking/ndppd/default.nix |  2 +-
 .../networking/netperf/default.nix            |  2 +-
 .../newsreaders/quiterss/default.nix          |  2 +-
 .../networking/offrss/default.nix             |  2 +-
 .../networking/p2p/twister/default.nix        |  2 +-
 .../networking/remote/remmina/default.nix     |  2 +-
 .../networking/remote/ssvnc/default.nix       |  2 +-
 .../networking/remote/teamviewer/default.nix  |  2 +-
 .../networking/seafile-client/default.nix     |  2 +-
 .../networking/spideroak/default.nix          |  2 +-
 .../networking/sync/rclone/default.nix        |  2 +-
 pkgs/applications/office/antiword/default.nix |  2 +-
 pkgs/applications/office/ledger/2.6.3.nix     |  2 +-
 pkgs/applications/office/ledger/default.nix   |  2 +-
 .../applications/office/paperwork/default.nix |  2 +-
 pkgs/applications/office/planner/default.nix  |  2 +-
 .../office/todo.txt-cli/default.nix           |  2 +-
 pkgs/applications/office/tudu/default.nix     |  2 +-
 pkgs/applications/office/zotero/default.nix   |  2 +-
 .../science/astronomy/celestia/default.nix    |  2 +-
 .../science/astronomy/gravit/default.nix      |  2 +-
 .../science/astronomy/stellarium/default.nix  |  2 +-
 .../science/biology/igv/default.nix           |  2 +-
 .../science/biology/plink-ng/default.nix      |  2 +-
 .../science/biology/plink/default.nix         |  2 +-
 .../science/chemistry/pymol/default.nix       |  2 +-
 .../science/electronics/kicad/default.nix     |  2 +-
 .../science/electronics/ngspice/default.nix   |  2 +-
 .../science/electronics/qfsm/default.nix      |  2 +-
 .../science/electronics/tkgate/1.x.nix        |  2 +-
 .../science/geometry/tetgen/1.4.nix           |  2 +-
 .../science/geometry/tetgen/default.nix       |  2 +-
 .../science/logic/acgtk/default.nix           |  2 +-
 pkgs/applications/science/logic/coq/8.3.nix   |  2 +-
 pkgs/applications/science/logic/coq/8.4.nix   |  2 +-
 pkgs/applications/science/logic/coq/HEAD.nix  |  2 +-
 .../science/logic/coq/default.nix             |  2 +-
 .../science/logic/cubicle/default.nix         |  2 +-
 .../science/logic/cvc3/default.nix            |  2 +-
 .../science/logic/hol/default.nix             |  2 +-
 .../science/logic/logisim/default.nix         |  2 +-
 .../science/logic/minisat/default.nix         |  2 +-
 .../science/logic/minisat/unstable.nix        |  2 +-
 .../science/logic/opensmt/default.nix         |  2 +-
 .../science/logic/prover9/default.nix         |  2 +-
 .../science/logic/redprl/default.nix          |  2 +-
 .../science/logic/satallax/default.nix        |  2 +-
 .../applications/science/math/LiE/default.nix |  2 +-
 pkgs/applications/science/math/R/default.nix  |  2 +-
 .../science/math/eukleides/default.nix        |  2 +-
 .../science/math/gfan/default.nix             |  2 +-
 .../science/math/mathematica/10.nix           |  2 +-
 .../science/math/mathematica/9.nix            |  2 +-
 .../science/math/mathematica/default.nix      |  2 +-
 .../science/math/maxima/default.nix           |  2 +-
 .../science/math/nauty/default.nix            |  2 +-
 .../science/math/perseus/default.nix          |  2 +-
 .../science/math/pssp/default.nix             |  2 +-
 .../science/math/ratpoints/default.nix        |  2 +-
 .../science/math/ripser/default.nix           |  2 +-
 .../science/math/sage/default.nix             |  2 +-
 .../science/math/scotch/default.nix           |  2 +-
 .../science/math/singular/default.nix         |  2 +-
 .../science/math/symmetrica/default.nix       |  2 +-
 .../science/math/weka/default.nix             |  2 +-
 .../science/medicine/aliza/default.nix        |  2 +-
 .../science/misc/cytoscape/default.nix        |  2 +-
 .../science/misc/root/default.nix             |  2 +-
 .../molecular-dynamics/lammps/default.nix     |  2 +-
 .../bugseverywhere/default.nix                |  2 +-
 .../cvs-fast-export/default.nix               |  2 +-
 .../version-management/cvs/default.nix        |  2 +-
 .../bfg-repo-cleaner/default.nix              |  2 +-
 .../git-and-tools/darcs-to-git/default.nix    |  2 +-
 .../git-and-tools/git-crypt/default.nix       |  2 +-
 .../git-and-tools/git-remote-hg/default.nix   |  2 +-
 .../git-and-tools/git2cl/default.nix          |  2 +-
 .../git-and-tools/stgit/default.nix           |  2 +-
 .../git-and-tools/tig/default.nix             |  2 +-
 .../git-and-tools/topgit/default.nix          |  2 +-
 .../version-management/git-repo/default.nix   |  2 +-
 .../version-management/git-review/default.nix |  2 +-
 .../version-management/gogs/default.nix       |  2 +-
 .../version-management/mercurial/default.nix  |  2 +-
 .../reposurgeon/default.nix                   |  2 +-
 .../version-management/srcml/default.nix      |  2 +-
 .../version-management/yadm/default.nix       |  2 +-
 pkgs/applications/video/avidemux/default.nix  |  2 +-
 pkgs/applications/video/bomi/default.nix      |  2 +-
 pkgs/applications/video/k9copy/default.nix    |  2 +-
 pkgs/applications/video/kodi/plugins.nix      |  8 ++---
 pkgs/applications/video/miro/default.nix      |  2 +-
 pkgs/applications/video/mplayer/default.nix   |  2 +-
 .../video/mpv/scripts/convert.nix             |  2 +-
 pkgs/applications/video/mythtv/default.nix    |  2 +-
 .../applications/video/obs-studio/default.nix |  2 +-
 pkgs/applications/video/p2pvc/default.nix     |  2 +-
 .../video/qstopmotion/default.nix             |  2 +-
 pkgs/applications/video/smplayer/default.nix  |  2 +-
 .../applications/video/vokoscreen/default.nix |  2 +-
 .../video/zdfmediathk/default.nix             |  2 +-
 .../driver/win-pvdrivers/default.nix          |  2 +-
 .../driver/win-qemu/default.nix               |  2 +-
 .../win-signed-gplpv-drivers/default.nix      |  2 +-
 .../driver/win-spice/default.nix              |  2 +-
 .../driver/win-virtio/default.nix             |  2 +-
 .../virtualization/open-vm-tools/default.nix  |  2 +-
 .../rancher-compose/default.nix               |  2 +-
 .../virtualization/xhyve/default.nix          |  2 +-
 .../window-managers/2bwm/default.nix          |  2 +-
 .../window-managers/compiz/default.nix        |  2 +-
 .../window-managers/compton/default.nix       |  2 +-
 .../window-managers/dwm/default.nix           |  2 +-
 .../window-managers/evilwm/default.nix        |  2 +-
 .../window-managers/fvwm/default.nix          |  2 +-
 .../window-managers/herbstluftwm/default.nix  |  2 +-
 .../window-managers/jwm/default.nix           |  2 +-
 .../window-managers/ratpoison/default.nix     |  2 +-
 .../windowmaker/dockapps/alsamixer.app.nix    |  2 +-
 .../windowmaker/dockapps/wmsm.app.nix         |  2 +-
 .../windowmaker/dockapps/wmsystemtray.nix     |  2 +-
 .../window-managers/wmii-hg/default.nix       |  2 +-
 .../xmonad-log-applet/default.nix             |  2 +-
 .../documentation/mustache-spec/default.nix   |  2 +-
 pkgs/data/documentation/zeal/default.nix      |  2 +-
 pkgs/data/fonts/baekmuk-ttf/default.nix       |  2 +-
 pkgs/data/fonts/corefonts/default.nix         |  2 +-
 pkgs/data/fonts/droid/default.nix             |  2 +-
 pkgs/data/fonts/emojione/default.nix          |  2 +-
 pkgs/data/fonts/font-awesome-ttf/default.nix  |  2 +-
 .../data/fonts/gentium-book-basic/default.nix |  2 +-
 pkgs/data/fonts/gentium/default.nix           |  2 +-
 pkgs/data/fonts/hasklig/default.nix           |  2 +-
 pkgs/data/fonts/iosevka/default.nix           |  2 +-
 pkgs/data/fonts/kawkab-mono/default.nix       |  2 +-
 .../fonts/league-of-moveable-type/default.nix |  2 +-
 pkgs/data/fonts/nafees/default.nix            |  2 +-
 pkgs/data/fonts/nerdfonts/default.nix         |  2 +-
 pkgs/data/fonts/norwester/default.nix         |  2 +-
 pkgs/data/fonts/opensans-ttf/default.nix      |  2 +-
 pkgs/data/fonts/orbitron/default.nix          |  2 +-
 pkgs/data/fonts/paratype-pt/mono.nix          |  2 +-
 pkgs/data/fonts/paratype-pt/sans.nix          |  2 +-
 pkgs/data/fonts/paratype-pt/serif.nix         |  2 +-
 pkgs/data/fonts/siji/default.nix              |  2 +-
 pkgs/data/fonts/source-code-pro/default.nix   |  2 +-
 pkgs/data/fonts/tewi/default.nix              |  2 +-
 pkgs/data/fonts/unscii/default.nix            |  2 +-
 pkgs/data/fonts/xits-math/default.nix         |  2 +-
 .../icons/elementary-icon-theme/default.nix   |  2 +-
 .../data/icons/papirus-icon-theme/default.nix |  2 +-
 pkgs/data/icons/vanilla-dmz/default.nix       |  2 +-
 pkgs/data/misc/ddccontrol-db/default.nix      |  2 +-
 pkgs/data/misc/media-player-info/default.nix  |  2 +-
 pkgs/data/soundfonts/fluid/default.nix        |  2 +-
 .../bindings/gnome-python-desktop/default.nix |  2 +-
 .../gnome-2/bindings/gnome-python/default.nix |  2 +-
 .../desktop/mail-notification/default.nix     |  2 +-
 .../gnome-3/3.22/core/gnome-menus/default.nix |  2 +-
 .../3.22/core/gtksourceviewmm/default.nix     |  2 +-
 .../gnome-3/3.22/core/libcroco/default.nix    |  2 +-
 .../gnome-3/3.22/core/libpeas/default.nix     |  2 +-
 .../gnome-3/3.22/devtools/nemiver/default.nix |  2 +-
 .../gnome-3/3.22/games/swell-foop/default.nix |  2 +-
 .../lxde/core/lxappearance/default.nix        |  2 +-
 pkgs/desktops/lxde/core/lxmenu-data.nix       |  2 +-
 pkgs/desktops/lxde/core/lxpanel/default.nix   |  2 +-
 pkgs/desktops/mate/atril/default.nix          |  2 +-
 pkgs/desktops/mate/caja/default.nix           |  2 +-
 pkgs/desktops/mate/mate-common/default.nix    |  2 +-
 pkgs/desktops/mate/mate-desktop/default.nix   |  2 +-
 .../mate/mate-icon-theme-faenza/default.nix   |  2 +-
 .../desktops/mate/mate-icon-theme/default.nix |  2 +-
 pkgs/desktops/mate/mate-terminal/default.nix  |  2 +-
 pkgs/desktops/mate/mate-themes/default.nix    |  2 +-
 pkgs/desktops/plasma-5/default.nix            |  2 +-
 pkgs/desktops/rox/rox-filer/default.nix       |  2 +-
 pkgs/development/beam-modules/hex/default.nix |  2 +-
 .../beam-modules/pgsql/default.nix            |  2 +-
 .../beam-modules/webdriver/default.nix        |  2 +-
 pkgs/development/compilers/abcl/default.nix   |  2 +-
 pkgs/development/compilers/aldor/default.nix  |  2 +-
 pkgs/development/compilers/as31/default.nix   |  2 +-
 .../development/compilers/crystal/default.nix |  2 +-
 .../compilers/cudatoolkit/default.nix         |  2 +-
 pkgs/development/compilers/dale/default.nix   |  2 +-
 .../compilers/elm/packages/elm-compiler.nix   |  2 +-
 .../compilers/elm/packages/elm-format.nix     |  2 +-
 .../compilers/elm/packages/elm-make.nix       |  2 +-
 .../compilers/elm/packages/elm-package.nix    |  2 +-
 .../compilers/elm/packages/elm-reactor.nix    |  2 +-
 .../compilers/elm/packages/elm-repl.nix       |  2 +-
 pkgs/development/compilers/fsharp/default.nix |  2 +-
 .../compilers/fsharp41/default.nix            |  2 +-
 pkgs/development/compilers/fstar/default.nix  |  2 +-
 .../development/compilers/gcc/4.5/default.nix |  2 +-
 .../compilers/ghc/6.10.2-binary.nix           |  2 +-
 pkgs/development/compilers/ghc/6.10.4.nix     |  2 +-
 pkgs/development/compilers/ghc/6.12.3.nix     |  2 +-
 pkgs/development/compilers/ghc/7.0.4.nix      |  2 +-
 pkgs/development/compilers/ghc/7.10.2.nix     |  2 +-
 pkgs/development/compilers/ghc/7.10.3.nix     |  2 +-
 pkgs/development/compilers/ghc/7.2.2.nix      |  2 +-
 pkgs/development/compilers/ghc/7.4.2.nix      |  2 +-
 pkgs/development/compilers/ghc/7.6.3.nix      |  2 +-
 pkgs/development/compilers/ghc/7.8.3.nix      |  2 +-
 pkgs/development/compilers/ghc/7.8.4.nix      |  2 +-
 pkgs/development/compilers/ghc/8.0.1.nix      |  2 +-
 pkgs/development/compilers/ghc/8.0.2.nix      |  2 +-
 pkgs/development/compilers/ghc/8.2.1.nix      |  2 +-
 pkgs/development/compilers/ghc/head.nix       |  2 +-
 pkgs/development/compilers/ghcjs/base.nix     |  2 +-
 .../compilers/ghcjs/head_stage2.nix           | 32 +++++++++----------
 pkgs/development/compilers/ghcjs/stage2.nix   | 28 ++++++++--------
 pkgs/development/compilers/ghdl/default.nix   |  2 +-
 .../development/compilers/gprolog/default.nix |  2 +-
 pkgs/development/compilers/halvm/2.4.0.nix    |  2 +-
 pkgs/development/compilers/jhc/default.nix    |  2 +-
 pkgs/development/compilers/julia/0.5.nix      |  2 +-
 pkgs/development/compilers/julia/default.nix  |  2 +-
 pkgs/development/compilers/julia/git.nix      |  2 +-
 pkgs/development/compilers/mcpp/default.nix   |  2 +-
 pkgs/development/compilers/mozart/binary.nix  |  2 +-
 pkgs/development/compilers/orc/default.nix    |  2 +-
 pkgs/development/compilers/pakcs/default.nix  |  6 ++--
 pkgs/development/compilers/rgbds/default.nix  |  2 +-
 pkgs/development/compilers/sbcl/bootstrap.nix |  2 +-
 pkgs/development/compilers/swift/default.nix  |  2 +-
 pkgs/development/compilers/uhc/default.nix    |  2 +-
 pkgs/development/compilers/vala/default.nix   |  2 +-
 pkgs/development/compilers/wla-dx/default.nix |  2 +-
 pkgs/development/compilers/yap/default.nix    |  2 +-
 .../guile-modules/guile-sdl2/default.nix      |  2 +-
 .../interpreters/chibi/default.nix            |  2 +-
 .../interpreters/clips/default.nix            |  2 +-
 .../development/interpreters/dart/default.nix |  2 +-
 pkgs/development/interpreters/eff/default.nix |  2 +-
 .../interpreters/elixir/generic-builder.nix   |  2 +-
 .../interpreters/erlang/R16B02-8-basho.nix    |  2 +-
 .../interpreters/erlang/generic-builder.nix   |  2 +-
 .../interpreters/gtk-server/default.nix       |  2 +-
 pkgs/development/interpreters/love/0.10.nix   |  2 +-
 pkgs/development/interpreters/love/0.7.nix    |  2 +-
 pkgs/development/interpreters/love/0.8.nix    |  2 +-
 pkgs/development/interpreters/love/0.9.nix    |  2 +-
 .../interpreters/lua-4/default.nix            |  2 +-
 pkgs/development/interpreters/lua-5/5.0.3.nix |  2 +-
 pkgs/development/interpreters/lua-5/5.1.nix   |  2 +-
 pkgs/development/interpreters/lua-5/5.2.nix   |  2 +-
 pkgs/development/interpreters/lua-5/5.3.nix   |  2 +-
 .../interpreters/lua-5/filesystem.nix         |  2 +-
 .../interpreters/lua-5/sockets.nix            |  2 +-
 pkgs/development/interpreters/lua-5/zip.nix   |  2 +-
 .../interpreters/maude/default.nix            |  2 +-
 .../interpreters/pixie/default.nix            |  2 +-
 .../interpreters/python/cpython/2.7/boot.nix  |  2 +-
 .../python/cpython/2.7/default.nix            |  2 +-
 .../interpreters/renpy/default.nix            |  2 +-
 .../interpreters/spidermonkey/38.nix          |  2 +-
 .../interpreters/supercollider/default.nix    |  2 +-
 pkgs/development/libraries/SDL2/default.nix   |  2 +-
 .../libraries/SDL2_gfx/default.nix            |  2 +-
 .../libraries/SDL2_image/default.nix          |  2 +-
 .../libraries/SDL2_mixer/default.nix          |  2 +-
 .../libraries/SDL2_net/default.nix            |  2 +-
 .../libraries/SDL2_ttf/default.nix            |  2 +-
 .../development/libraries/SDL_gfx/default.nix |  2 +-
 .../development/libraries/SDL_net/default.nix |  2 +-
 .../libraries/SDL_sound/default.nix           |  2 +-
 .../libraries/SDL_stretch/default.nix         |  2 +-
 .../development/libraries/SDL_ttf/default.nix |  2 +-
 .../libraries/accounts-qt/default.nix         |  2 +-
 pkgs/development/libraries/adns/default.nix   |  2 +-
 .../libraries/agda/Agda-Sheaves/default.nix   |  2 +-
 .../agda/TotalParserCombinators/default.nix   |  2 +-
 .../libraries/agda/agda-base/default.nix      |  2 +-
 .../agda/agda-iowa-stdlib/default.nix         |  2 +-
 .../libraries/agda/agda-prelude/default.nix   |  2 +-
 .../libraries/agda/agda-stdlib/default.nix    |  2 +-
 .../libraries/agda/bitvector/default.nix      |  2 +-
 .../libraries/agda/categories/default.nix     |  2 +-
 .../libraries/agda/pretty/default.nix         |  2 +-
 .../libraries/aqbanking/default.nix           |  2 +-
 .../libraries/aqbanking/gwenhywfar.nix        |  2 +-
 .../libraries/aqbanking/libchipcard.nix       |  2 +-
 .../libraries/audio/libbs2b/default.nix       |  2 +-
 .../libraries/audio/libgme/default.nix        |  2 +-
 .../audio/zita-alsa-pcmi/default.nix          |  2 +-
 .../audio/zita-convolver/default.nix          |  2 +-
 .../audio/zita-resampler/default.nix          |  2 +-
 .../development/libraries/beignet/default.nix |  2 +-
 .../libraries/boost-process/default.nix       |  2 +-
 pkgs/development/libraries/boost/generic.nix  |  2 +-
 pkgs/development/libraries/buddy/default.nix  |  2 +-
 .../development/libraries/bwidget/default.nix |  2 +-
 pkgs/development/libraries/catch/default.nix  |  2 +-
 pkgs/development/libraries/ccnx/default.nix   |  2 +-
 pkgs/development/libraries/ccrtp/1.8.nix      |  2 +-
 pkgs/development/libraries/cddlib/default.nix |  2 +-
 .../libraries/ceres-solver/default.nix        |  2 +-
 .../libraries/chromaprint/default.nix         |  2 +-
 pkgs/development/libraries/cppcms/default.nix |  2 +-
 pkgs/development/libraries/cppdb/default.nix  |  2 +-
 .../development/libraries/cppunit/default.nix |  2 +-
 .../libraries/cpputest/default.nix            |  2 +-
 pkgs/development/libraries/cppzmq/default.nix |  2 +-
 .../development/libraries/curlcpp/default.nix |  2 +-
 .../development/libraries/cxxtest/default.nix |  2 +-
 .../libraries/cxxtools/default.nix            |  2 +-
 .../libraries/cyrus-sasl/default.nix          |  2 +-
 pkgs/development/libraries/czmq/3.x.nix       |  2 +-
 pkgs/development/libraries/czmq/4.x.nix       |  2 +-
 pkgs/development/libraries/db/generic.nix     |  2 +-
 pkgs/development/libraries/dclxvi/default.nix |  2 +-
 pkgs/development/libraries/dee/default.nix    |  2 +-
 .../libraries/double-conversion/default.nix   |  2 +-
 .../development/libraries/eccodes/default.nix |  2 +-
 .../libraries/eventlog/default.nix            |  2 +-
 .../libraries/fastjson/default.nix            |  2 +-
 pkgs/development/libraries/fflas-ffpack/1.nix |  2 +-
 .../libraries/fflas-ffpack/default.nix        |  2 +-
 pkgs/development/libraries/flint/default.nix  |  2 +-
 pkgs/development/libraries/folly/default.nix  |  2 +-
 pkgs/development/libraries/fox/default.nix    |  2 +-
 pkgs/development/libraries/fox/fox-1.6.nix    |  2 +-
 pkgs/development/libraries/frame/default.nix  |  2 +-
 .../libraries/freealut/default.nix            |  2 +-
 .../development/libraries/freetds/default.nix |  2 +-
 pkgs/development/libraries/ftgl/2.1.2.nix     |  2 +-
 pkgs/development/libraries/ftgl/default.nix   |  2 +-
 .../libraries/gbenchmark/default.nix          |  2 +-
 pkgs/development/libraries/geoip/default.nix  |  2 +-
 pkgs/development/libraries/glfw/2.x.nix       |  2 +-
 pkgs/development/libraries/glfw/3.x.nix       |  2 +-
 pkgs/development/libraries/gmp/5.1.x.nix      |  2 +-
 pkgs/development/libraries/gmp/6.x.nix        |  2 +-
 pkgs/development/libraries/gpgme/default.nix  |  2 +-
 pkgs/development/libraries/grail/default.nix  |  2 +-
 .../libraries/grib-api/default.nix            |  2 +-
 pkgs/development/libraries/gsoap/default.nix  |  2 +-
 .../libraries/gstreamer/base/default.nix      |  2 +-
 .../libraries/gstreamer/core/default.nix      |  2 +-
 .../gstreamer/legacy/gnonlin/default.nix      |  2 +-
 .../gstreamer/legacy/gst-ffmpeg/default.nix   |  2 +-
 .../libraries/gstreamer/libav/default.nix     |  2 +-
 .../libraries/gstreamer/vaapi/default.nix     |  2 +-
 .../libraries/gstreamer/validate/default.nix  |  2 +-
 .../libraries/gtdialog/default.nix            |  2 +-
 pkgs/development/libraries/gtkd/default.nix   |  2 +-
 pkgs/development/libraries/gtkspell/3.nix     |  2 +-
 pkgs/development/libraries/hpx/default.nix    |  2 +-
 .../libraries/hunspell/dictionaries.nix       |  2 +-
 pkgs/development/libraries/ijs/default.nix    |  2 +-
 pkgs/development/libraries/iml/default.nix    |  2 +-
 .../libraries/indicator-application/gtk2.nix  |  2 +-
 .../libraries/indicator-application/gtk3.nix  |  2 +-
 .../development/libraries/jansson/default.nix |  2 +-
 .../libraries/java/jzmq/default.nix           |  2 +-
 .../development/libraries/jbigkit/default.nix |  2 +-
 .../libraries/kde-frameworks/default.nix      |  2 +-
 .../extra-cmake-modules/default.nix           |  2 +-
 pkgs/development/libraries/ldns/default.nix   |  2 +-
 .../development/libraries/leveldb/default.nix |  2 +-
 .../development/libraries/libaacs/default.nix |  2 +-
 .../libraries/libappindicator/default.nix     |  2 +-
 pkgs/development/libraries/libast/default.nix |  2 +-
 .../libraries/libbdplus/default.nix           |  2 +-
 .../libraries/libbluray/default.nix           |  2 +-
 .../development/libraries/libbson/default.nix |  2 +-
 .../development/libraries/libburn/default.nix |  2 +-
 pkgs/development/libraries/libcec/default.nix |  2 +-
 .../development/libraries/libcec/platform.nix |  2 +-
 .../libraries/libclxclient/default.nix        |  2 +-
 .../libraries/libcouchbase/default.nix        |  2 +-
 .../libraries/libdbusmenu-qt/qt-5.5.nix       |  2 +-
 .../libraries/libdbusmenu/default.nix         |  2 +-
 .../libraries/libdigidoc/default.nix          |  2 +-
 .../libraries/libdigidocpp/default.nix        |  2 +-
 .../libraries/libechonest/default.nix         |  2 +-
 pkgs/development/libraries/libee/default.nix  |  2 +-
 .../libraries/libevhtp/default.nix            |  2 +-
 .../development/libraries/libfann/default.nix |  2 +-
 pkgs/development/libraries/libfm/default.nix  |  2 +-
 .../libraries/libfprint/default.nix           |  2 +-
 pkgs/development/libraries/libgee/0.6.nix     |  2 +-
 pkgs/development/libraries/libgee/0.8.nix     |  2 +-
 .../development/libraries/libgksu/default.nix |  2 +-
 .../libraries/libglvnd/default.nix            |  2 +-
 .../libraries/libgpg-error/default.nix        |  2 +-
 .../libraries/libhdhomerun/default.nix        |  2 +-
 .../libraries/libindicate/default.nix         |  2 +-
 .../libraries/libindicator/default.nix        |  2 +-
 .../libraries/libisofs/default.nix            |  2 +-
 .../libraries/libivykis/default.nix           |  2 +-
 .../libraries/libjreen/default.nix            |  2 +-
 .../development/libraries/libjson/default.nix |  2 +-
 pkgs/development/libraries/libksi/default.nix |  2 +-
 .../libraries/libmatheval/default.nix         |  2 +-
 .../libraries/libmaxminddb/default.nix        |  2 +-
 .../libraries/libmpack/default.nix            |  2 +-
 .../libraries/libnetfilter_queue/default.nix  |  2 +-
 pkgs/development/libraries/libotr/default.nix |  2 +-
 .../libraries/libpaper/default.nix            |  2 +-
 .../libraries/libpipeline/default.nix         |  2 +-
 .../libraries/libproxy/default.nix            |  2 +-
 .../libraries/libpwquality/default.nix        |  2 +-
 .../libraries/libqrencode/default.nix         |  2 +-
 pkgs/development/libraries/librdf/raptor.nix  |  2 +-
 pkgs/development/libraries/librdf/raptor2.nix |  2 +-
 pkgs/development/libraries/librdf/rasqal.nix  |  2 +-
 pkgs/development/libraries/libre/default.nix  |  2 +-
 pkgs/development/libraries/librem/default.nix |  2 +-
 .../libraries/libscrypt/default.nix           |  2 +-
 .../libraries/libsearpc/default.nix           |  2 +-
 .../libraries/libsieve/default.nix            |  2 +-
 pkgs/development/libraries/libsmi/default.nix |  2 +-
 .../libraries/libspiro/default.nix            |  2 +-
 pkgs/development/libraries/libsvm/default.nix |  2 +-
 pkgs/development/libraries/libtap/default.nix |  2 +-
 .../libraries/libtelnet/default.nix           |  2 +-
 .../libraries/libtomcrypt/default.nix         |  2 +-
 pkgs/development/libraries/libtsm/default.nix |  2 +-
 .../libraries/libunity/default.nix            |  2 +-
 .../libraries/libusbmuxd/default.nix          |  2 +-
 .../libraries/libvdpau-va-gl/default.nix      |  2 +-
 .../libraries/libvisual/default.nix           |  2 +-
 .../libraries/libxcomp/default.nix            |  2 +-
 pkgs/development/libraries/libxls/default.nix |  2 +-
 .../libraries/libyubikey/default.nix          |  2 +-
 pkgs/development/libraries/libzmf/default.nix |  2 +-
 .../libraries/linenoise-ng/default.nix        |  2 +-
 .../libraries/log4cplus/default.nix           |  2 +-
 .../libraries/lucene++/default.nix            |  2 +-
 pkgs/development/libraries/mdds/default.nix   |  2 +-
 .../libraries/menu-cache/default.nix          |  2 +-
 pkgs/development/libraries/mongoc/default.nix |  2 +-
 pkgs/development/libraries/mpir/default.nix   |  2 +-
 .../development/libraries/ndn-cxx/default.nix |  2 +-
 .../libraries/netcdf-cxx4/default.nix         |  2 +-
 pkgs/development/libraries/nlopt/default.nix  |  2 +-
 .../libraries/nss_wrapper/default.nix         |  2 +-
 .../nvidia-texture-tools/default.nix          |  2 +-
 pkgs/development/libraries/olm/default.nix    |  2 +-
 .../libraries/opencl-clhpp/default.nix        |  2 +-
 .../libraries/opencl-headers/default.nix      |  2 +-
 .../development/libraries/opencsg/default.nix |  2 +-
 .../libraries/opendkim/default.nix            |  2 +-
 pkgs/development/libraries/openpa/default.nix |  2 +-
 .../development/libraries/openslp/default.nix |  2 +-
 .../libraries/pcaudiolib/default.nix          |  2 +-
 pkgs/development/libraries/pcg-c/default.nix  |  2 +-
 pkgs/development/libraries/pcre/default.nix   |  2 +-
 pkgs/development/libraries/pcre2/default.nix  |  2 +-
 pkgs/development/libraries/physfs/default.nix |  2 +-
 .../libraries/portmidi/default.nix            |  2 +-
 .../development/libraries/postgis/default.nix |  2 +-
 .../libraries/qmltermwidget/default.nix       |  2 +-
 pkgs/development/libraries/qpdf/default.nix   |  2 +-
 .../libraries/qtkeychain/default.nix          |  2 +-
 .../libraries/qtwebkit-plugins/default.nix    |  2 +-
 .../development/libraries/rdkafka/default.nix |  2 +-
 .../libraries/resolv_wrapper/default.nix      |  2 +-
 .../libraries/safefile/default.nix            |  2 +-
 .../libraries/schroedinger/default.nix        |  2 +-
 .../libraries/science/math/arpack/default.nix |  2 +-
 .../libraries/science/math/atlas/default.nix  |  2 +-
 .../libraries/science/math/blas/default.nix   |  2 +-
 .../science/math/cudnn/7.5-5.0/default.nix    |  2 +-
 .../science/math/cudnn/8.0-5.0/default.nix    |  2 +-
 .../science/math/cudnn/8.0-5.1/default.nix    |  2 +-
 .../libraries/science/math/cudnn/default.nix  |  2 +-
 .../libraries/science/math/ipopt/default.nix  |  2 +-
 .../science/math/liblapack/3.5.0.nix          |  2 +-
 .../science/math/liblapack/default.nix        |  2 +-
 .../libraries/science/math/magma/default.nix  |  2 +-
 .../science/math/openblas/default.nix         |  2 +-
 .../science/math/openlibm/default.nix         |  2 +-
 .../science/math/openspecfun/default.nix      |  2 +-
 pkgs/development/libraries/sfsexp/default.nix |  2 +-
 .../libraries/socket_wrapper/default.nix      |  2 +-
 pkgs/development/libraries/sonic/default.nix  |  2 +-
 .../development/libraries/spandsp/default.nix |  2 +-
 .../development/libraries/tachyon/default.nix |  2 +-
 pkgs/development/libraries/tbb/default.nix    |  2 +-
 pkgs/development/libraries/tcllib/default.nix |  2 +-
 pkgs/development/libraries/tcltls/default.nix |  2 +-
 pkgs/development/libraries/tecla/default.nix  |  2 +-
 pkgs/development/libraries/ti-rpc/default.nix |  2 +-
 pkgs/development/libraries/tinyxml/2.6.2.nix  |  2 +-
 pkgs/development/libraries/tntdb/default.nix  |  2 +-
 pkgs/development/libraries/tntnet/default.nix |  2 +-
 .../libraries/uid_wrapper/default.nix         |  2 +-
 .../libraries/unittest-cpp/default.nix        |  2 +-
 pkgs/development/libraries/vc/0.7.nix         |  2 +-
 pkgs/development/libraries/vc/default.nix     |  2 +-
 pkgs/development/libraries/vcg/default.nix    |  2 +-
 pkgs/development/libraries/webkitgtk/2.16.nix |  2 +-
 pkgs/development/libraries/webkitgtk/2.4.nix  |  2 +-
 .../libraries/websocket++/default.nix         |  2 +-
 pkgs/development/libraries/wt/default.nix     |  2 +-
 .../libraries/wxwidgets/2.8/default.nix       |  2 +-
 .../libraries/wxwidgets/2.9/default.nix       |  2 +-
 .../libraries/wxwidgets/3.0/default.nix       |  2 +-
 .../libraries/wxwidgets/3.0/mac.nix           |  2 +-
 .../development/libraries/xgboost/default.nix |  2 +-
 pkgs/development/libraries/xlslib/default.nix |  2 +-
 .../libraries/zeroc-ice/default.nix           |  2 +-
 pkgs/development/libraries/zeromq/3.x.nix     |  2 +-
 pkgs/development/libraries/zeromq/4.x.nix     |  2 +-
 .../libraries/zookeeper_mt/default.nix        |  2 +-
 pkgs/development/misc/loc/default.nix         |  2 +-
 pkgs/development/mobile/adb-sync/default.nix  |  2 +-
 pkgs/development/mobile/flashtool/default.nix |  2 +-
 .../ocaml-modules/ansiterminal/default.nix    |  2 +-
 .../ocaml-modules/bolt/default.nix            |  2 +-
 .../ocaml-modules/cryptokit/default.nix       |  2 +-
 .../ocaml-modules/estring/default.nix         |  2 +-
 .../ocaml-modules/higlo/default.nix           |  2 +-
 .../ocaml-modules/ocaml-cairo2/default.nix    |  2 +-
 .../ocaml-modules/ocaml-text/default.nix      |  2 +-
 .../ocaml-modules/ocamlfuse/default.nix       |  2 +-
 .../ocaml-modules/ocamlmake/default.nix       |  2 +-
 .../development/ocaml-modules/ocf/default.nix |  2 +-
 .../ocaml-modules/pcre/default.nix            |  2 +-
 .../ocaml-modules/ppx_blob/default.nix        |  2 +-
 .../ocaml-modules/pycaml/default.nix          |  2 +-
 .../ocaml-modules/sqlexpr/default.nix         |  2 +-
 .../ocaml-modules/type_conv/109.60.01.nix     |  2 +-
 .../ocaml-modules/type_conv/112.01.01.nix     |  2 +-
 .../ocaml-modules/xml-light/default.nix       |  2 +-
 .../ocaml-modules/xtmpl/default.nix           |  2 +-
 .../python-modules/FormEncode/default.nix     |  2 +-
 .../python-modules/Nikola/default.nix         |  2 +-
 .../python-modules/Pmw/default.nix            |  2 +-
 .../python-modules/PyLD/default.nix           |  2 +-
 .../python-modules/ansible/2.1.nix            |  2 +-
 .../python-modules/ansible/2.2.nix            |  2 +-
 .../python-modules/ansible/2.3.nix            |  2 +-
 .../python-modules/ansicolor/default.nix      |  2 +-
 .../python-modules/ansicolors/default.nix     |  2 +-
 .../python-modules/apipkg/default.nix         |  2 +-
 .../python-modules/argcomplete/default.nix    |  2 +-
 .../python-modules/args/default.nix           |  2 +-
 .../python-modules/astropy/default.nix        |  2 +-
 .../bitcoin-price-api/default.nix             |  2 +-
 .../python-modules/blivet/default.nix         |  2 +-
 .../browsermob-proxy/default.nix              |  2 +-
 .../python-modules/buildout-nix/default.nix   |  2 +-
 .../python-modules/chainmap/default.nix       |  2 +-
 .../confluent-kafka/default.nix               |  2 +-
 .../python-modules/dask/default.nix           |  2 +-
 .../django-polymorphic/default.nix            |  2 +-
 .../python-modules/dkimpy/default.nix         |  2 +-
 .../python-modules/docker_compose.nix         |  2 +-
 pkgs/development/python-modules/ds4drv.nix    |  2 +-
 .../python-modules/ecpy/default.nix           |  2 +-
 .../python-modules/ed25519/default.nix        |  2 +-
 .../python-modules/flask-login.nix            |  2 +-
 .../python-modules/flask-restplus/0.8.nix     |  2 +-
 .../python-modules/flask-restplus/default.nix |  2 +-
 .../python-modules/fonttools/default.nix      |  2 +-
 .../python-modules/funcsigs/default.nix       |  2 +-
 .../python-modules/gensim/default.nix         |  2 +-
 .../python-modules/grammalecte/default.nix    |  2 +-
 .../python-modules/h5py/default.nix           |  2 +-
 .../python-modules/keras/default.nix          |  2 +-
 .../python-modules/leather/default.nix        |  2 +-
 .../python-modules/ledgerblue/default.nix     |  2 +-
 .../python-modules/libagent/default.nix       |  2 +-
 .../python-modules/libarcus/default.nix       |  2 +-
 .../python-modules/libnacl/default.nix        |  2 +-
 .../python-modules/llvmlite/default.nix       |  2 +-
 .../python-modules/magic-wormhole/default.nix |  2 +-
 .../marionette-harness/default.nix            |  2 +-
 .../marionette-harness/manifestparser.nix     |  2 +-
 .../marionette-harness/marionette_driver.nix  |  2 +-
 .../marionette-harness/mozcrash.nix           |  2 +-
 .../marionette-harness/mozdevice.nix          |  2 +-
 .../marionette-harness/mozfile.nix            |  2 +-
 .../marionette-harness/mozhttpd.nix           |  2 +-
 .../marionette-harness/mozinfo.nix            |  2 +-
 .../marionette-harness/mozlog.nix             |  2 +-
 .../marionette-harness/moznetwork.nix         |  2 +-
 .../marionette-harness/mozprocess.nix         |  2 +-
 .../marionette-harness/mozprofile.nix         |  2 +-
 .../marionette-harness/mozrunner.nix          |  2 +-
 .../marionette-harness/moztest.nix            |  2 +-
 .../marionette-harness/mozversion.nix         |  2 +-
 .../python-modules/mccabe/default.nix         |  2 +-
 .../python-modules/mpi4py/default.nix         |  2 +-
 .../python-modules/nbformat/default.nix       |  2 +-
 .../python-modules/numpy/default.nix          |  2 +-
 .../python-modules/packaging/default.nix      |  2 +-
 .../python-modules/pandas/default.nix         |  2 +-
 .../python-modules/pbr/default.nix            |  2 +-
 .../python-modules/pelican/default.nix        |  2 +-
 .../python-modules/pika-pool/default.nix      |  2 +-
 .../python-modules/pillow/default.nix         |  2 +-
 .../python-modules/pyGithub/default.nix       |  2 +-
 .../python-modules/pycrypto/default.nix       |  2 +-
 .../python-modules/pycryptodome/default.nix   |  2 +-
 .../python-modules/pyext/default.nix          |  2 +-
 .../python-modules/pygame/default.nix         |  2 +-
 .../development/python-modules/pygame/git.nix |  2 +-
 .../python-modules/pylast/default.nix         |  2 +-
 .../python-modules/pypandoc/default.nix       |  2 +-
 pkgs/development/python-modules/pyrax.nix     |  2 +-
 .../python-modules/pyscard/default.nix        |  2 +-
 .../python-modules/pyside/apiextractor.nix    |  2 +-
 .../python-modules/pyside/default.nix         |  2 +-
 .../python-modules/pyside/generatorrunner.nix |  2 +-
 .../python-modules/pyside/shiboken.nix        |  2 +-
 .../python-modules/pyside/tools.nix           |  2 +-
 .../python-modules/pyslurm/default.nix        |  2 +-
 .../python-modules/python-editor/default.nix  |  2 +-
 .../python-modules/python-jose/default.nix    |  2 +-
 .../python-modules/python-stdnum/default.nix  |  2 +-
 .../python-modules/python-uinput/default.nix  |  2 +-
 pkgs/development/python-modules/pyudev.nix    |  2 +-
 .../python-modules/pywinrm/default.nix        |  2 +-
 .../python-modules/pyzufall/default.nix       |  2 +-
 .../python-modules/rebulk/default.nix         |  2 +-
 .../python-modules/rfc3986/default.nix        |  2 +-
 .../python-modules/ropper/default.nix         |  2 +-
 .../python-modules/scrapy/default.nix         |  2 +-
 .../python-modules/semver/default.nix         |  2 +-
 .../python-modules/simpleeval/default.nix     |  2 +-
 .../python-modules/snakeviz/default.nix       |  2 +-
 .../python-modules/spotipy/default.nix        |  2 +-
 .../python-modules/statsmodels/default.nix    |  2 +-
 .../python-modules/stevedore/default.nix      |  2 +-
 .../python-modules/stringtemplate/default.nix |  2 +-
 .../python-modules/stripe/default.nix         |  2 +-
 .../python-modules/tables/default.nix         |  2 +-
 .../python-modules/typed-ast/default.nix      |  2 +-
 .../python-modules/typeguard/default.nix      |  2 +-
 .../python-modules/uncertainties/default.nix  |  2 +-
 .../python-modules/uranium/default.nix        |  2 +-
 .../python-modules/wptserve/default.nix       |  2 +-
 .../python-modules/xmpppy/default.nix         |  2 +-
 .../python-modules/yamllint/default.nix       |  2 +-
 .../python-modules/yolk/default.nix           |  2 +-
 .../python-modules/zeep/default.nix           |  2 +-
 .../python-modules/zeroconf/default.nix       |  2 +-
 pkgs/development/qtcreator/default.nix        |  2 +-
 .../ruby-modules/bundix/default.nix           |  2 +-
 .../tools/analysis/cccc/default.nix           |  2 +-
 .../garcosim/tracefilegen/default.nix         |  2 +-
 .../garcosim/tracefilesim/default.nix         |  2 +-
 .../tools/analysis/hotspot/default.nix        |  2 +-
 .../tools/analysis/smatch/default.nix         |  2 +-
 .../tools/analysis/swarm/default.nix          |  2 +-
 pkgs/development/tools/boomerang/default.nix  |  2 +-
 .../tools/build-managers/doit/default.nix     |  2 +-
 .../tools/build-managers/kati/default.nix     |  2 +-
 .../tools/build-managers/rebar/default.nix    |  2 +-
 .../tools/build-managers/rebar3/default.nix   |  2 +-
 .../tools/build-managers/redo-sh/default.nix  |  2 +-
 .../tools/build-managers/scons/default.nix    |  2 +-
 .../tools/build-managers/shards/default.nix   |  2 +-
 .../gitlab-runner/default.nix                 |  2 +-
 .../gitlab-runner/v1.nix                      |  2 +-
 .../tools/database/liquibase/default.nix      |  2 +-
 .../tools/database/sqldeveloper/default.nix   |  2 +-
 .../tools/database/sqlitebrowser/default.nix  |  2 +-
 pkgs/development/tools/delve/default.nix      |  2 +-
 pkgs/development/tools/doctl/default.nix      |  2 +-
 .../tools/documentation/doxygen/default.nix   |  2 +-
 .../tools/erlang/cuter/default.nix            |  2 +-
 .../tools/erlang/relx-exe/default.nix         |  2 +-
 .../tools/github/cligh/default.nix            |  2 +-
 pkgs/development/tools/gnulib/default.nix     |  2 +-
 pkgs/development/tools/godef/default.nix      |  2 +-
 .../google-app-engine-go-sdk/default.nix      |  2 +-
 .../tools/haskell/intero-nix-shim/default.nix |  2 +-
 .../haskell/multi-ghc-travis/default.nix      |  2 +-
 pkgs/development/tools/heroku/default.nix     |  2 +-
 pkgs/development/tools/jmespath/default.nix   |  2 +-
 pkgs/development/tools/jp/default.nix         |  2 +-
 pkgs/development/tools/leaps/default.nix      |  2 +-
 pkgs/development/tools/minizinc/default.nix   |  2 +-
 .../development/tools/misc/astyle/default.nix |  2 +-
 .../tools/misc/automake/automake-1.13.x.nix   |  2 +-
 .../tools/misc/automake/automake-1.14.x.nix   |  2 +-
 .../tools/misc/automake/automake-1.15.x.nix   |  2 +-
 .../tools/misc/creduce/default.nix            |  2 +-
 .../development/tools/misc/csmith/default.nix |  2 +-
 .../development/tools/misc/distcc/default.nix |  2 +-
 .../tools/misc/elfkickers/default.nix         |  2 +-
 pkgs/development/tools/misc/gede/default.nix  |  2 +-
 pkgs/development/tools/misc/lit/default.nix   |  2 +-
 pkgs/development/tools/misc/ninka/default.nix |  2 +-
 .../tools/misc/rolespec/default.nix           |  2 +-
 pkgs/development/tools/misc/texinfo/5.2.nix   |  2 +-
 pkgs/development/tools/misc/texinfo/6.3.nix   |  2 +-
 .../tools/misc/unifdef/default.nix            |  2 +-
 .../tools/misc/universal-ctags/default.nix    |  2 +-
 .../tools/ocaml/merlin/default.nix            |  2 +-
 .../tools/ocaml/ocp-indent/1.5.2.nix          |  2 +-
 .../tools/ocaml/ocp-indent/default.nix        |  2 +-
 pkgs/development/tools/parsing/bison/2.x.nix  |  2 +-
 pkgs/development/tools/parsing/bison/3.x.nix  |  2 +-
 .../tools/postiats-utilities/default.nix      |  2 +-
 .../tools/profiling/gprof2dot/default.nix     |  2 +-
 .../development/tools/rust/racerd/default.nix |  2 +-
 pkgs/development/tools/skopeo/default.nix     |  2 +-
 pkgs/development/tools/sqsh/default.nix       |  2 +-
 pkgs/development/tools/vim-vint/default.nix   |  2 +-
 pkgs/development/tools/vndr/default.nix       |  2 +-
 pkgs/development/tools/vultr/default.nix      |  2 +-
 pkgs/games/0ad/data.nix                       |  2 +-
 pkgs/games/0ad/game.nix                       |  2 +-
 pkgs/games/armagetronad/default.nix           |  2 +-
 pkgs/games/arx-libertatis/default.nix         |  2 +-
 pkgs/games/bitsnbots/default.nix              |  2 +-
 pkgs/games/blobby/default.nix                 |  2 +-
 pkgs/games/bsdgames/default.nix               |  2 +-
 pkgs/games/commandergenius/default.nix        |  2 +-
 pkgs/games/crawl/default.nix                  |  2 +-
 pkgs/games/dwarf-fortress/dfhack/default.nix  |  2 +-
 .../dwarf-therapist/default.nix               |  2 +-
 pkgs/games/dwarf-fortress/game.nix            |  2 +-
 pkgs/games/dwarf-fortress/themes/cla.nix      |  2 +-
 pkgs/games/dwarf-fortress/themes/phoebus.nix  |  2 +-
 pkgs/games/dwarf-fortress/unfuck.nix          |  2 +-
 pkgs/games/endless-sky/default.nix            |  2 +-
 pkgs/games/ezquake/default.nix                |  2 +-
 pkgs/games/fairymax/default.nix               |  2 +-
 pkgs/games/fish-fillets-ng/default.nix        |  2 +-
 pkgs/games/freeorion/default.nix              |  2 +-
 pkgs/games/gcs/default.nix                    |  2 +-
 pkgs/games/gnugo/default.nix                  |  2 +-
 pkgs/games/gzdoom/default.nix                 |  2 +-
 pkgs/games/hawkthorne/default.nix             |  2 +-
 pkgs/games/ja2-stracciatella/default.nix      |  2 +-
 pkgs/games/lincity/default.nix                |  2 +-
 pkgs/games/liquidwar/default.nix              |  2 +-
 pkgs/games/megaglest/default.nix              |  2 +-
 pkgs/games/n2048/default.nix                  |  2 +-
 pkgs/games/nethack/default.nix                |  2 +-
 pkgs/games/nexuiz/default.nix                 |  2 +-
 pkgs/games/onscripter-en/default.nix          |  2 +-
 pkgs/games/openclonk/default.nix              |  2 +-
 pkgs/games/opendungeons/default.nix           |  2 +-
 pkgs/games/openmw/default.nix                 |  2 +-
 pkgs/games/pioneer/default.nix                |  2 +-
 pkgs/games/qgo/default.nix                    |  2 +-
 pkgs/games/quake3/ioquake/default.nix         |  2 +-
 pkgs/games/quakespasm/default.nix             |  2 +-
 pkgs/games/scid/default.nix                   |  2 +-
 pkgs/games/scorched3d/default.nix             |  2 +-
 pkgs/games/scrolls/default.nix                |  2 +-
 pkgs/games/sgt-puzzles/default.nix            |  2 +-
 pkgs/games/stepmania/default.nix              |  2 +-
 pkgs/games/stockfish/default.nix              |  2 +-
 pkgs/games/the-powder-toy/default.nix         |  2 +-
 pkgs/games/tibia/default.nix                  |  2 +-
 pkgs/games/tome4/default.nix                  |  2 +-
 pkgs/games/unnethack/default.nix              |  2 +-
 pkgs/games/ut2004/demo.nix                    |  2 +-
 pkgs/games/wesnoth/default.nix                |  2 +-
 pkgs/games/wesnoth/dev.nix                    |  2 +-
 pkgs/games/xpilot/bloodspilot-client.nix      |  2 +-
 pkgs/games/xpilot/default.nix                 |  2 +-
 pkgs/games/xsok/default.nix                   |  2 +-
 pkgs/games/zdoom/default.nix                  |  2 +-
 pkgs/games/zdoom/zdbsp.nix                    |  2 +-
 pkgs/misc/apulse/default.nix                  |  2 +-
 pkgs/misc/base16/default.nix                  |  2 +-
 pkgs/misc/cups/drivers/canon/default.nix      |  2 +-
 .../misc/cups/drivers/cnijfilter2/default.nix |  2 +-
 .../cups/drivers/cnijfilter_2_80/default.nix  |  2 +-
 pkgs/misc/cups/drivers/dymo/default.nix       |  2 +-
 .../drivers/mfcl2700dncupswrapper/default.nix |  2 +-
 .../cups/drivers/mfcl2700dnlpr/default.nix    |  2 +-
 pkgs/misc/drivers/epson-escpr/default.nix     |  2 +-
 pkgs/misc/drivers/m33-linux/default.nix       |  2 +-
 .../drivers/postscript-lexmark/default.nix    |  2 +-
 pkgs/misc/drivers/sundtek/default.nix         |  2 +-
 pkgs/misc/emulators/atari800/default.nix      |  2 +-
 pkgs/misc/emulators/bsod/default.nix          |  2 +-
 pkgs/misc/emulators/cdemu/vhba.nix            |  2 +-
 pkgs/misc/emulators/citra/default.nix         |  2 +-
 pkgs/misc/emulators/dlx/default.nix           |  2 +-
 .../emulators/emulationstation/default.nix    |  2 +-
 pkgs/misc/emulators/hatari/default.nix        |  2 +-
 pkgs/misc/emulators/ppsspp/default.nix        |  2 +-
 pkgs/misc/emulators/retroarch/cores.nix       |  2 +-
 pkgs/misc/emulators/wine/base.nix             |  2 +-
 pkgs/misc/ghostscript/default.nix             |  2 +-
 pkgs/misc/jackaudio/default.nix               |  2 +-
 pkgs/misc/jackaudio/jack1.nix                 |  2 +-
 .../screensavers/i3lock-pixeled/default.nix   |  2 +-
 pkgs/misc/screensavers/pipes/default.nix      |  2 +-
 .../screensavers/xscreensaver/default.nix     |  2 +-
 pkgs/misc/seafile-shared/default.nix          |  2 +-
 pkgs/misc/themes/adapta/default.nix           |  2 +-
 pkgs/misc/themes/arc/default.nix              |  2 +-
 pkgs/misc/themes/gnome-breeze/default.nix     |  2 +-
 pkgs/misc/themes/paper/default.nix            |  2 +-
 pkgs/misc/themes/zuki/default.nix             |  2 +-
 pkgs/misc/uboot/default.nix                   |  2 +-
 pkgs/os-specific/darwin/cctools/port.nix      |  2 +-
 pkgs/os-specific/darwin/maloader/default.nix  |  2 +-
 .../os-specific/darwin/opencflite/default.nix |  2 +-
 pkgs/os-specific/darwin/xcode/default.nix     |  2 +-
 pkgs/os-specific/linux/alienfx/default.nix    |  2 +-
 .../linux/android-udev-rules/default.nix      |  2 +-
 pkgs/os-specific/linux/audit/default.nix      |  2 +-
 pkgs/os-specific/linux/bbswitch/default.nix   |  2 +-
 pkgs/os-specific/linux/bcc/default.nix        |  2 +-
 .../linux/bridge-utils/default.nix            |  2 +-
 .../os-specific/linux/cachefilesd/default.nix |  2 +-
 pkgs/os-specific/linux/can-utils/default.nix  |  2 +-
 pkgs/os-specific/linux/devmem2/default.nix    |  2 +-
 .../os-specific/linux/displaylink/default.nix |  2 +-
 pkgs/os-specific/linux/e1000e/default.nix     |  2 +-
 pkgs/os-specific/linux/evdi/default.nix       |  2 +-
 pkgs/os-specific/linux/fanctl/default.nix     |  2 +-
 pkgs/os-specific/linux/firejail/default.nix   |  2 +-
 pkgs/os-specific/linux/hwdata/default.nix     |  2 +-
 pkgs/os-specific/linux/i810switch/default.nix |  2 +-
 .../linux/ima-evm-utils/default.nix           |  2 +-
 .../os-specific/linux/ipsec-tools/default.nix |  2 +-
 pkgs/os-specific/linux/jujuutils/default.nix  |  2 +-
 pkgs/os-specific/linux/kmscon/default.nix     |  2 +-
 pkgs/os-specific/linux/kmscube/default.nix    |  2 +-
 pkgs/os-specific/linux/libnl/default.nix      |  2 +-
 pkgs/os-specific/linux/libsmbios/default.nix  |  2 +-
 .../linux/libudev0-shim/default.nix           |  2 +-
 pkgs/os-specific/linux/lxc/default.nix        |  2 +-
 pkgs/os-specific/linux/mba6x_bl/default.nix   |  2 +-
 pkgs/os-specific/linux/mbpfan/default.nix     |  2 +-
 .../linux/mkinitcpio-nfs-utils/default.nix    |  2 +-
 pkgs/os-specific/linux/mxu11x0/default.nix    |  2 +-
 pkgs/os-specific/linux/nfs-utils/default.nix  |  2 +-
 .../linux/nvidia-x11/persistenced.nix         |  2 +-
 .../os-specific/linux/nvidia-x11/settings.nix |  2 +-
 .../os-specific/linux/openvswitch/default.nix |  2 +-
 pkgs/os-specific/linux/pam_ccreds/default.nix |  2 +-
 pkgs/os-specific/linux/pam_pgsql/default.nix  |  2 +-
 pkgs/os-specific/linux/pipework/default.nix   |  2 +-
 pkgs/os-specific/linux/rtl8723bs/default.nix  |  2 +-
 pkgs/os-specific/linux/rtl8812au/default.nix  |  2 +-
 pkgs/os-specific/linux/sch_cake/default.nix   |  2 +-
 pkgs/os-specific/linux/schedtool/default.nix  |  2 +-
 pkgs/os-specific/linux/setools/default.nix    |  2 +-
 pkgs/os-specific/linux/sinit/default.nix      |  2 +-
 pkgs/os-specific/linux/systemd/default.nix    |  2 +-
 pkgs/os-specific/linux/tp_smapi/default.nix   |  2 +-
 pkgs/os-specific/linux/upstart/default.nix    |  2 +-
 pkgs/servers/apache-kafka/default.nix         |  2 +-
 pkgs/servers/cayley/default.nix               |  2 +-
 pkgs/servers/computing/storm/default.nix      |  2 +-
 pkgs/servers/consul/default.nix               |  2 +-
 pkgs/servers/dns/bind/default.nix             |  2 +-
 pkgs/servers/exhibitor/default.nix            |  2 +-
 pkgs/servers/ftp/bftpd/default.nix            |  2 +-
 pkgs/servers/gotty/default.nix                |  2 +-
 .../apache-modules/mod_evasive/default.nix    |  2 +-
 .../apache-modules/mod_fastcgi/default.nix    |  2 +-
 pkgs/servers/http/couchdb/2.0.0.nix           |  2 +-
 pkgs/servers/http/couchdb/default.nix         |  2 +-
 pkgs/servers/http/hiawatha/default.nix        |  2 +-
 pkgs/servers/http/mini-httpd/default.nix      |  2 +-
 pkgs/servers/http/pshs/default.nix            |  2 +-
 pkgs/servers/http/thttpd/default.nix          |  2 +-
 pkgs/servers/inginious/default.nix            |  2 +-
 pkgs/servers/irc/ircd-hybrid/default.nix      |  2 +-
 pkgs/servers/irker/default.nix                |  2 +-
 pkgs/servers/mail/dovecot/default.nix         |  2 +-
 .../mail/dovecot/plugins/antispam/default.nix |  2 +-
 pkgs/servers/mail/dspam/default.nix           |  2 +-
 pkgs/servers/mail/mailhog/default.nix         |  2 +-
 pkgs/servers/mail/mailman/default.nix         |  2 +-
 pkgs/servers/mail/nullmailer/default.nix      |  2 +-
 pkgs/servers/mail/petidomo/default.nix        |  2 +-
 pkgs/servers/mail/popa3d/default.nix          |  2 +-
 pkgs/servers/mail/postfix/default.nix         |  2 +-
 pkgs/servers/mail/postfix/pflogsumm.nix       |  2 +-
 pkgs/servers/mail/postgrey/default.nix        |  2 +-
 pkgs/servers/mail/postsrsd/default.nix        |  2 +-
 pkgs/servers/mail/rmilter/default.nix         |  2 +-
 pkgs/servers/mail/rspamd/default.nix          |  2 +-
 pkgs/servers/mail/spamassassin/default.nix    |  2 +-
 pkgs/servers/mattermost/default.nix           |  2 +-
 pkgs/servers/meteor/default.nix               |  2 +-
 .../monitoring/prometheus/json-exporter.nix   |  2 +-
 .../prometheus/varnish-exporter.nix           |  2 +-
 pkgs/servers/news/leafnode/default.nix        |  2 +-
 pkgs/servers/nextcloud/news-updater.nix       |  2 +-
 pkgs/servers/nosql/apache-jena/binary.nix     |  2 +-
 .../nosql/apache-jena/fuseki-binary.nix       |  2 +-
 pkgs/servers/nosql/arangodb/default.nix       |  2 +-
 pkgs/servers/nosql/neo4j/default.nix          |  2 +-
 pkgs/servers/openpts/default.nix              |  2 +-
 pkgs/servers/openxpki/default.nix             |  2 +-
 pkgs/servers/restund/default.nix              |  2 +-
 pkgs/servers/rpcbind/default.nix              |  2 +-
 pkgs/servers/search/elasticsearch/plugins.nix |  6 ++--
 pkgs/servers/search/solr/default.nix          |  2 +-
 pkgs/servers/serf/default.nix                 |  2 +-
 pkgs/servers/smcroute/default.nix             |  2 +-
 pkgs/servers/sql/oracle-xe/default.nix        |  2 +-
 pkgs/servers/sql/percona/5.6.x.nix            |  2 +-
 pkgs/servers/squid/4.nix                      |  2 +-
 pkgs/servers/squid/default.nix                |  2 +-
 pkgs/servers/tvheadend/default.nix            |  2 +-
 pkgs/servers/uwsgi/default.nix                |  2 +-
 pkgs/servers/varnish/default.nix              |  2 +-
 pkgs/servers/zookeeper/default.nix            |  2 +-
 pkgs/shells/fish/default.nix                  |  2 +-
 pkgs/shells/lambda-mod-zsh-theme/default.nix  |  2 +-
 pkgs/shells/mksh/default.nix                  |  2 +-
 pkgs/shells/nix-zsh-completions/default.nix   |  2 +-
 pkgs/shells/rssh/default.nix                  |  2 +-
 pkgs/shells/xonsh/default.nix                 |  2 +-
 pkgs/shells/zsh-autosuggestions/default.nix   |  2 +-
 pkgs/shells/zsh-completions/default.nix       |  2 +-
 pkgs/shells/zsh-prezto/default.nix            |  2 +-
 .../zsh-syntax-highlighting/default.nix       |  2 +-
 pkgs/shells/zsh/default.nix                   |  2 +-
 pkgs/tools/X11/autocutsel/default.nix         |  2 +-
 pkgs/tools/X11/dragon-drop/default.nix        |  2 +-
 pkgs/tools/X11/obconf/default.nix             |  2 +-
 pkgs/tools/X11/oblogout/default.nix           |  2 +-
 pkgs/tools/X11/primus/lib.nix                 |  2 +-
 pkgs/tools/X11/ratmen/default.nix             |  2 +-
 pkgs/tools/X11/screen-message/default.nix     |  2 +-
 pkgs/tools/X11/sselp/default.nix              |  2 +-
 pkgs/tools/X11/virtualgl/lib.nix              |  2 +-
 pkgs/tools/X11/wayv/default.nix               |  2 +-
 pkgs/tools/X11/xannotate/default.nix          |  2 +-
 pkgs/tools/X11/xcape/default.nix              |  2 +-
 pkgs/tools/X11/xchainkeys/default.nix         |  2 +-
 pkgs/tools/admin/analog/default.nix           |  2 +-
 pkgs/tools/admin/bubblewrap/default.nix       |  2 +-
 pkgs/tools/admin/google-cloud-sdk/default.nix |  2 +-
 pkgs/tools/admin/nxproxy/default.nix          |  2 +-
 pkgs/tools/admin/sec/default.nix              |  2 +-
 pkgs/tools/admin/simp_le/default.nix          |  2 +-
 pkgs/tools/admin/tightvnc/default.nix         |  2 +-
 pkgs/tools/archivers/innoextract/default.nix  |  2 +-
 pkgs/tools/archivers/unshield/default.nix     |  2 +-
 .../audio/acoustid-fingerprinter/default.nix  |  2 +-
 .../tools/audio/beets/alternatives-plugin.nix |  2 +-
 .../audio/beets/copyartifacts-plugin.nix      |  2 +-
 pkgs/tools/audio/pasystray/default.nix        |  2 +-
 pkgs/tools/backup/bup/default.nix             |  2 +-
 pkgs/tools/backup/chunksync/default.nix       |  2 +-
 pkgs/tools/backup/httrack/default.nix         |  2 +-
 pkgs/tools/backup/s3ql/default.nix            |  2 +-
 pkgs/tools/backup/zbackup/default.nix         |  2 +-
 pkgs/tools/bluetooth/blueman/default.nix      |  2 +-
 pkgs/tools/cd-dvd/lsdvd/default.nix           |  2 +-
 pkgs/tools/compression/bzip2/default.nix      |  2 +-
 pkgs/tools/compression/dtrx/default.nix       |  2 +-
 pkgs/tools/compression/lbzip2/default.nix     |  2 +-
 pkgs/tools/compression/lzip/default.nix       |  2 +-
 pkgs/tools/compression/mozlz4a/default.nix    |  2 +-
 pkgs/tools/compression/pigz/default.nix       |  2 +-
 pkgs/tools/compression/pxz/default.nix        |  2 +-
 .../filesystems/bcachefs-tools/default.nix    |  2 +-
 pkgs/tools/filesystems/bonnie/default.nix     |  2 +-
 .../filesystems/btrfs-dedupe/default.nix      |  2 +-
 pkgs/tools/filesystems/chunkfs/default.nix    |  2 +-
 pkgs/tools/filesystems/davfs2/default.nix     |  2 +-
 pkgs/tools/filesystems/f2fs-tools/default.nix |  2 +-
 pkgs/tools/filesystems/genromfs/default.nix   |  2 +-
 pkgs/tools/filesystems/nixpart/0.4/blivet.nix |  2 +-
 .../filesystems/nixpart/0.4/pykickstart.nix   |  2 +-
 .../filesystems/nixpart/0.4/pyparted.nix      |  2 +-
 pkgs/tools/filesystems/wdfs/default.nix       |  2 +-
 pkgs/tools/graphics/dpic/default.nix          |  2 +-
 pkgs/tools/graphics/editres/default.nix       |  2 +-
 pkgs/tools/graphics/graphviz/2.32.nix         |  2 +-
 pkgs/tools/graphics/graphviz/default.nix      |  2 +-
 .../graphics/imgur-screenshot/default.nix     |  2 +-
 pkgs/tools/graphics/imgurbash2/default.nix    |  2 +-
 pkgs/tools/graphics/lprof/default.nix         |  2 +-
 pkgs/tools/graphics/pfstools/default.nix      |  2 +-
 pkgs/tools/graphics/zxing/default.nix         |  2 +-
 pkgs/tools/inputmethods/touchegg/default.nix  |  2 +-
 pkgs/tools/inputmethods/zinnia/default.nix    |  2 +-
 pkgs/tools/misc/appdata-tools/default.nix     |  2 +-
 pkgs/tools/misc/autorandr/default.nix         |  2 +-
 pkgs/tools/misc/bibutils/default.nix          |  2 +-
 pkgs/tools/misc/clac/default.nix              |  2 +-
 pkgs/tools/misc/colord-kde/default.nix        |  2 +-
 pkgs/tools/misc/cpulimit/default.nix          |  2 +-
 pkgs/tools/misc/dbus-map/default.nix          |  2 +-
 pkgs/tools/misc/ddccontrol/default.nix        |  2 +-
 pkgs/tools/misc/docbook2mdoc/default.nix      |  2 +-
 pkgs/tools/misc/emv/default.nix               |  2 +-
 pkgs/tools/misc/eot-utilities/default.nix     |  2 +-
 pkgs/tools/misc/file/default.nix              |  2 +-
 pkgs/tools/misc/fileschanged/default.nix      |  2 +-
 pkgs/tools/misc/flashrom/default.nix          |  2 +-
 pkgs/tools/misc/geteltorito/default.nix       |  2 +-
 pkgs/tools/misc/graylog/plugins.nix           | 20 ++++++------
 pkgs/tools/misc/grub4dos/default.nix          |  2 +-
 pkgs/tools/misc/hebcal/default.nix            |  2 +-
 pkgs/tools/misc/keychain/default.nix          |  2 +-
 pkgs/tools/misc/latex2html/default.nix        |  2 +-
 pkgs/tools/misc/lbdb/default.nix              |  2 +-
 pkgs/tools/misc/lf/default.nix                |  2 +-
 pkgs/tools/misc/lnav/default.nix              |  2 +-
 pkgs/tools/misc/loadlibrary/default.nix       |  2 +-
 pkgs/tools/misc/ltunify/default.nix           |  2 +-
 pkgs/tools/misc/makebootfat/default.nix       |  2 +-
 pkgs/tools/misc/man-db/default.nix            |  2 +-
 pkgs/tools/misc/mandoc/default.nix            |  2 +-
 pkgs/tools/misc/mmv/default.nix               |  2 +-
 pkgs/tools/misc/pipelight/default.nix         |  2 +-
 pkgs/tools/misc/pod2mdoc/default.nix          |  2 +-
 pkgs/tools/misc/sam-ba/default.nix            |  2 +-
 pkgs/tools/misc/scanmem/default.nix           |  2 +-
 pkgs/tools/misc/sdl-jstest/default.nix        |  2 +-
 pkgs/tools/misc/texi2mdoc/default.nix         |  2 +-
 pkgs/tools/misc/thefuck/default.nix           |  2 +-
 pkgs/tools/misc/tlp/default.nix               |  2 +-
 pkgs/tools/misc/tmuxp/default.nix             |  2 +-
 pkgs/tools/misc/togglesg-download/default.nix |  2 +-
 pkgs/tools/misc/toilet/default.nix            |  2 +-
 pkgs/tools/misc/ttf2pt1/default.nix           |  2 +-
 pkgs/tools/misc/ttylog/default.nix            |  2 +-
 pkgs/tools/misc/ttyrec/default.nix            |  2 +-
 pkgs/tools/misc/urjtag/default.nix            |  2 +-
 pkgs/tools/misc/venus/default.nix             |  2 +-
 pkgs/tools/misc/vimer/default.nix             |  2 +-
 pkgs/tools/misc/vmtouch/default.nix           |  2 +-
 pkgs/tools/misc/x11idle/default.nix           |  2 +-
 pkgs/tools/misc/xdo/default.nix               |  2 +-
 pkgs/tools/misc/xfstests/default.nix          |  2 +-
 pkgs/tools/misc/xiccd/default.nix             |  2 +-
 pkgs/tools/misc/xsel/default.nix              |  2 +-
 pkgs/tools/misc/yad/default.nix               |  2 +-
 pkgs/tools/misc/yank/default.nix              |  2 +-
 pkgs/tools/networking/ahcpd/default.nix       |  2 +-
 pkgs/tools/networking/babeld/default.nix      |  2 +-
 pkgs/tools/networking/burpsuite/default.nix   |  2 +-
 pkgs/tools/networking/bwm-ng/default.nix      |  2 +-
 pkgs/tools/networking/cmst/default.nix        |  2 +-
 pkgs/tools/networking/connmanui/default.nix   |  2 +-
 pkgs/tools/networking/dirb/default.nix        |  2 +-
 pkgs/tools/networking/dropbear/default.nix    |  2 +-
 pkgs/tools/networking/fdm/default.nix         |  2 +-
 pkgs/tools/networking/fping/default.nix       |  2 +-
 pkgs/tools/networking/getmail/default.nix     |  2 +-
 pkgs/tools/networking/gmvault/default.nix     |  2 +-
 pkgs/tools/networking/hping/default.nix       |  2 +-
 pkgs/tools/networking/http-prompt/default.nix |  2 +-
 pkgs/tools/networking/i2pd/default.nix        |  2 +-
 pkgs/tools/networking/ipcalc/default.nix      |  2 +-
 pkgs/tools/networking/iperf/2.nix             |  2 +-
 pkgs/tools/networking/libreswan/default.nix   |  2 +-
 pkgs/tools/networking/linkchecker/default.nix |  2 +-
 pkgs/tools/networking/lldpd/default.nix       |  2 +-
 .../networking/logmein-hamachi/default.nix    |  2 +-
 pkgs/tools/networking/mailsend/default.nix    |  2 +-
 pkgs/tools/networking/mitmproxy/default.nix   |  2 +-
 pkgs/tools/networking/mu/default.nix          |  2 +-
 pkgs/tools/networking/nbd/default.nix         |  2 +-
 .../networking/netcat-openbsd/default.nix     |  2 +-
 pkgs/tools/networking/netkit/tftp/default.nix |  2 +-
 pkgs/tools/networking/netrw/default.nix       |  2 +-
 .../tools/networking/network-manager/l2tp.nix |  2 +-
 pkgs/tools/networking/offlineimap/default.nix |  2 +-
 pkgs/tools/networking/openntpd/default.nix    |  2 +-
 pkgs/tools/networking/openssh/default.nix     |  2 +-
 .../networking/openvpn/update-resolv-conf.nix |  2 +-
 pkgs/tools/networking/pcapc/default.nix       |  2 +-
 pkgs/tools/networking/pcapfix/default.nix     |  2 +-
 pkgs/tools/networking/pdsh/default.nix        |  2 +-
 pkgs/tools/networking/quicktun/default.nix    |  2 +-
 pkgs/tools/networking/redir/default.nix       |  2 +-
 pkgs/tools/networking/sipcalc/default.nix     |  2 +-
 pkgs/tools/networking/smokeping/default.nix   |  2 +-
 pkgs/tools/networking/surfraw/default.nix     |  2 +-
 pkgs/tools/networking/swaks/default.nix       |  2 +-
 pkgs/tools/networking/ua/default.nix          |  2 +-
 pkgs/tools/networking/vpnc/default.nix        |  2 +-
 pkgs/tools/networking/wbox/default.nix        |  2 +-
 .../networking/x11-ssh-askpass/default.nix    |  2 +-
 pkgs/tools/networking/xl2tpd/default.nix      |  2 +-
 pkgs/tools/networking/zap/default.nix         |  2 +-
 pkgs/tools/package-management/apt/default.nix |  2 +-
 pkgs/tools/security/aide/default.nix          |  2 +-
 pkgs/tools/security/chaps/default.nix         |  2 +-
 pkgs/tools/security/fprint_demo/default.nix   |  2 +-
 pkgs/tools/security/fprintd/default.nix       |  2 +-
 pkgs/tools/security/fwknop/default.nix        |  2 +-
 pkgs/tools/security/gnupg/1.nix               |  2 +-
 pkgs/tools/security/gnupg/20.nix              |  2 +-
 pkgs/tools/security/gnupg/21.nix              |  2 +-
 pkgs/tools/security/kpcli/default.nix         |  2 +-
 pkgs/tools/security/paperkey/default.nix      |  2 +-
 .../tools/security/pcsc-cyberjack/default.nix |  2 +-
 pkgs/tools/security/pgpdump/default.nix       |  2 +-
 .../security/phrasendrescher/default.nix      |  2 +-
 pkgs/tools/security/pinentry-mac/default.nix  |  2 +-
 pkgs/tools/security/pinentry/default.nix      |  2 +-
 pkgs/tools/security/pinentry/qt5.nix          |  2 +-
 pkgs/tools/security/qdigidoc/default.nix      |  2 +-
 pkgs/tools/security/qesteidutil/default.nix   |  2 +-
 pkgs/tools/security/signing-party/default.nix |  2 +-
 pkgs/tools/security/srm/default.nix           |  2 +-
 pkgs/tools/security/vulnix/requirements.nix   |  2 --
 pkgs/tools/system/actkbd/default.nix          |  2 +-
 pkgs/tools/system/amtterm/default.nix         |  2 +-
 pkgs/tools/system/chase/default.nix           |  2 +-
 pkgs/tools/system/ctop/default.nix            |  2 +-
 pkgs/tools/system/dfc/default.nix             |  2 +-
 pkgs/tools/system/dog/default.nix             |  2 +-
 pkgs/tools/system/fio/default.nix             |  2 +-
 pkgs/tools/system/hardlink/default.nix        |  2 +-
 pkgs/tools/system/ior/default.nix             |  2 +-
 pkgs/tools/system/journalwatch/default.nix    |  2 +-
 pkgs/tools/system/lr/default.nix              |  2 +-
 pkgs/tools/system/nq/default.nix              |  2 +-
 pkgs/tools/system/opencl-info/default.nix     |  2 +-
 pkgs/tools/system/osquery/default.nix         |  2 +-
 pkgs/tools/system/plan9port/default.nix       |  2 +-
 pkgs/tools/system/psensor/default.nix         |  2 +-
 pkgs/tools/system/rsyslog/default.nix         |  2 +-
 pkgs/tools/system/runit/default.nix           |  2 +-
 .../system/syslog-ng-incubator/default.nix    |  2 +-
 pkgs/tools/system/syslog-ng/default.nix       |  2 +-
 pkgs/tools/system/thermald/default.nix        |  2 +-
 pkgs/tools/system/tm/default.nix              |  2 +-
 pkgs/tools/system/tree/default.nix            |  2 +-
 pkgs/tools/system/ts/default.nix              |  2 +-
 pkgs/tools/system/undaemonize/default.nix     |  2 +-
 pkgs/tools/system/xe/default.nix              |  2 +-
 pkgs/tools/text/agrep/default.nix             |  2 +-
 pkgs/tools/text/ascii/default.nix             |  2 +-
 pkgs/tools/text/codesearch/default.nix        |  2 +-
 pkgs/tools/text/discount/default.nix          |  2 +-
 pkgs/tools/text/ebook-tools/default.nix       |  2 +-
 pkgs/tools/text/fanficfare/default.nix        |  2 +-
 pkgs/tools/text/gist/default.nix              |  2 +-
 pkgs/tools/text/highlight/default.nix         |  2 +-
 pkgs/tools/text/languagetool/default.nix      |  2 +-
 pkgs/tools/text/nkf/default.nix               |  2 +-
 pkgs/tools/text/opencc/default.nix            |  2 +-
 pkgs/tools/text/qprint/default.nix            |  2 +-
 pkgs/tools/text/recode/default.nix            |  2 +-
 pkgs/tools/text/rst2html5/default.nix         |  2 +-
 pkgs/tools/text/sift/default.nix              |  2 +-
 pkgs/tools/text/staccato/default.nix          |  2 +-
 pkgs/tools/typesetting/asciidoc/default.nix   |  2 +-
 .../typesetting/multimarkdown/default.nix     |  2 +-
 pkgs/tools/typesetting/pdftk/default.nix      |  2 +-
 pkgs/tools/typesetting/tex/tex4ht/default.nix |  2 +-
 pkgs/tools/video/mjpegtools/default.nix       |  2 +-
 pkgs/tools/video/swfmill/default.nix          |  2 +-
 .../virtualization/cloudmonkey/default.nix    |  2 +-
 .../virtualization/linode-cli/default.nix     |  2 +-
 1394 files changed, 1449 insertions(+), 1451 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index be4ea1fd6b6..57a969825ba 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec{
       Core release, applying a series of patches, and then doing deterministic
       builds so anyone can check the downloads correspond to the source code. 
     '';
-    homepage = "https://bitcoinxt.software/";
+    homepage = https://bitcoinxt.software/;
     maintainers = with maintainers; [ jefdaj ];
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index ddbe7104f1d..9fb7df9fecd 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec{
       parties. Users hold the crypto keys to their own money and transact directly
       with each other, with the help of a P2P network to check for double-spending.
     '';
-    homepage = "http://www.bitcoin.org/";
+    homepage = http://www.bitcoin.org/;
     maintainers = with maintainers; [ roconnor AndersonTorres ];
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix
index 33853f150cb..a37ff5639d9 100644
--- a/pkgs/applications/altcoins/cryptop/default.nix
+++ b/pkgs/applications/altcoins/cryptop/default.nix
@@ -16,7 +16,7 @@ python2.pkgs.buildPythonApplication rec {
   doCheck = false;
 
   meta = {
-    homepage = "http://github.com/huwwp/cryptop";
+    homepage = http://github.com/huwwp/cryptop;
     description = "Command line Cryptocurrency Portfolio";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ bhipple ];
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
index b7585b2f109..3687905ae57 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = {
     description = "Golang implementation of Ethereum Classic";
-    homepage = "https://github.com/ethereumproject/go-ethereum";
+    homepage = https://github.com/ethereumproject/go-ethereum;
     license = with lib.licenses; [ lgpl3 gpl3 ];
   };
 }
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 7f7c3f304c2..ce58984c8b8 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
   };
 
   meta = {
-    homepage = "https://ethereum.github.io/go-ethereum/";
+    homepage = https://ethereum.github.io/go-ethereum/;
     description = "Official golang implementation of the Ethereum protocol";
     license = with lib.licenses; [ lgpl3 gpl3 ];
   };
diff --git a/pkgs/applications/altcoins/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix
index 1b2682f7d4c..208a2d3915f 100644
--- a/pkgs/applications/altcoins/hivemind.nix
+++ b/pkgs/applications/altcoins/hivemind.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       into a blockchain so that Bitcoin-users can speculate in Prediction
       Markets.
     '';
-    homepage = "https://bitcoinhivemind.com";
+    homepage = https://bitcoinhivemind.com;
     maintainers = with maintainers; [ canndrew ];
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hsevm.nix
index 6db55e9ab07..d68526e2cd9 100644
--- a/pkgs/applications/altcoins/hsevm.nix
+++ b/pkgs/applications/altcoins/hsevm.nix
@@ -44,7 +44,7 @@ lib.overrideDerivation (mkDerivation rec {
     tasty tasty-hunit tasty-quickcheck text vector
   ];
 
-  homepage = "https://github.com/dapphub/hsevm";
+  homepage = https://github.com/dapphub/hsevm;
   description = "Ethereum virtual machine evaluator";
   license = stdenv.lib.licenses.agpl3;
   maintainers = [stdenv.lib.maintainers.dbrock];
diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix
index 2723bf9dabd..b653ce82a67 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec{
       Memorycoin is based on the Bitcoin code, but with some key
       differences.
     '';
-    homepage = "http://www.bitcoin.org/";
+    homepage = http://www.bitcoin.org/;
     maintainers = with maintainers; [ AndersonTorres ];
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix
index 0146bad6f86..917e318c189 100644
--- a/pkgs/applications/altcoins/zcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec{
 
   meta = {
     description = "Peer-to-peer, anonymous electronic cash system";
-    homepage = "https://z.cash/";
+    homepage = https://z.cash/;
     maintainers = with maintainers; [ rht ];
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
index 4ce9a279d91..2b2094c8401 100644
--- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "Rust-language assets for Zcash";
-    homepage = "https://github.com/zcash/librustzcash";
+    homepage = https://github.com/zcash/librustzcash;
     maintainers = with maintainers; [ rht ];
     license = with licenses; [ mit asl20 ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
index c5a824cd17d..303b3bc171e 100644
--- a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
+++ b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Optimal Ate Pairing over Barreto-Naehrig Curves";
-    homepage = "https://github.com/herumi/ate-pairing";
+    homepage = https://github.com/herumi/ate-pairing;
     maintainers = with maintainers; [ rht ];
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/libsnark/default.nix b/pkgs/applications/altcoins/zcash/libsnark/default.nix
index 9dd3f6886c8..be885493dcd 100644
--- a/pkgs/applications/altcoins/zcash/libsnark/default.nix
+++ b/pkgs/applications/altcoins/zcash/libsnark/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec{
 
   meta = with stdenv.lib; {
     description = "a C++ library for zkSNARK proofs";
-    homepage = "https://github.com/zcash/libsnark";
+    homepage = https://github.com/zcash/libsnark;
     maintainers = with maintainers; [ rht ];
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/libsnark/mie.nix b/pkgs/applications/altcoins/zcash/libsnark/mie.nix
index c92c113a27a..a66ff128293 100644
--- a/pkgs/applications/altcoins/zcash/libsnark/mie.nix
+++ b/pkgs/applications/altcoins/zcash/libsnark/mie.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/herumi/mie";
+    homepage = https://github.com/herumi/mie;
     maintainers = with maintainers; [ rht ];
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
index c0b36ab9344..1e5d19b044a 100644
--- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
+++ b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "JIT assembler for x86, x64";
-    homepage = "https://github.com/herumi/xbyak";
+    homepage = https://github.com/herumi/xbyak;
     maintainers = with maintainers; [ rht ];
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix
index 3840d06dd46..29d0241fa02 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GTK2 client for MPD (Music player daemon)";
-    homepage = "http://ario-player.sourceforge.net/";
+    homepage = http://ario-player.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.garrison ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index 0241e38281b..2401a610156 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A audio/video loudness scanner implementing ITU-R BS.1770";
     license = licenses.gpl2Plus;
-    homepage = "http://bs1770gain.sourceforge.net/";
+    homepage = http://bs1770gain.sourceforge.net/;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 78841da46c5..c6e587b88a3 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -59,7 +59,7 @@ let
         -e 's,-Wno-unused-private-field,,g'
     '';
     meta = with stdenv.lib; {
-      homepage = "http://www.clementine-player.org";
+      homepage = http://www.clementine-player.org;
       description = "A multiplatform music player";
       license = licenses.gpl3Plus;
       platforms = platforms.linux;
@@ -84,7 +84,7 @@ let
     '';
     enableParallelBuilding = true;
     meta = with stdenv.lib; {
-      homepage = "http://www.clementine-player.org";
+      homepage = http://www.clementine-player.org;
       description = "Spotify integration for Clementine";
       # The blob itself is Apache-licensed, although libspotify is unfree.
       license = licenses.asl20;
@@ -104,7 +104,7 @@ runCommand "clementine-${version}"
   dontPatchELF = true;
   dontStrip = true;
   meta = {
-    homepage = "http://www.clementine-player.org";
+    homepage = http://www.clementine-player.org;
     description = "A multiplatform music player"
       + " (" + (optionalString withSpotify "with Spotify, ")
       + "with gstreamer plugins: "
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 07f9e565c2a..1552982cf1a 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Ultimate Music Player for GNU/Linux";
-    homepage = "http://deadbeef.sourceforge.net/";
+    homepage = http://deadbeef.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index 871621d3bb1..c6509b5f460 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "MPRISv2 plugin for the DeaDBeeF music player";
-    homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/";
+    homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index bb317ca7a40..740d6d8d7e0 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An unimpressive thingie for playing bits of samples with some level of accuracy";
-    homepage = "https://github.com/tidalcycles/Dirt";
+    homepage = https://github.com/tidalcycles/Dirt;
     license = licenses.gpl3;
     maintainers = with maintainers; [ anderspapitto ];
     platforms = with platforms; linux;
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index e9186cd3242..4b357f0c590 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "View and edit tags for various audio files";
-    homepage = "http://projects.gnome.org/easytag/";
+    homepage = http://projects.gnome.org/easytag/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ fuuzetsu ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index cb2e15bc5b2..889506deb76 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak";
-    homepage = "https://github.com/espeak-ng/espeak-ng";
+    homepage = https://github.com/espeak-ng/espeak-ng;
     license = licenses.gpl3;
     maintainers = with maintainers; [ aske ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index 6b4913d30dc..4633718b40c 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
         software, released under the GNU GPL license.
     '' ;
 
-    homepage = "http://freewheeling.sourceforge.net";
+    homepage = http://freewheeling.sourceforge.net;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.sepi ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 5a10d1262f4..f49962450a0 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -61,7 +61,7 @@ python2Packages.buildPythonApplication rec {
       gPodder downloads and manages free audio and video content (podcasts)
       for you. Listen directly on your computer or on your mobile devices.
     '';
-    homepage = "http://gpodder.org/";
+    homepage = http://gpodder.org/;
     license = licenses.gpl3;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ skeidel mic92 ];
diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
index c0a137d7de9..fae8d3e4b60 100644
--- a/pkgs/applications/audio/gtklick/default.nix
+++ b/pkgs/applications/audio/gtklick/default.nix
@@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   meta = {
-    homepage = "http://das.nasophon.de/gtklick/";
+    homepage = http://das.nasophon.de/gtklick/;
     description = "Simple metronome with an easy-to-use GTK interface";
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix
index 1b31eed0699..f8febbe2178 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/pkgs/applications/audio/klick/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   installPhase = "scons install";
 
   meta = {
-    homepage = "http://das.nasophon.de/klick/";
+    homepage = http://das.nasophon.de/klick/;
     description = "Advanced command-line metronome for JACK";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index ea182d73a5b..01b450ab7dd 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
   installCommand = "python setup.py install --prefix=$out";
 
   meta = {
-    homepage = "http://www.red-bean.com/decklin/lastfmsubmitd/";
+    homepage = http://www.red-bean.com/decklin/lastfmsubmitd/;
     description = "An last.fm audio scrobbler and daemon";
   };
 }
diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix
index 0e4e1a5a8a3..fff16649333 100644
--- a/pkgs/applications/audio/lastwatch/default.nix
+++ b/pkgs/applications/audio/lastwatch/default.nix
@@ -18,7 +18,7 @@ python2Packages.buildPythonApplication rec {
   ];
 
   meta = {
-    homepage = "https://github.com/aszlig/LastWatch";
+    homepage = https://github.com/aszlig/LastWatch;
     description = "An inotify-based last.fm audio scrobbler";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 5bd8068cd4c..7ba5bcc4ac4 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Linux MultiMedia Studio";
-    homepage = "http://lmms.sourceforge.net";
+    homepage = http://lmms.sourceforge.net;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index a39c6327763..88c95086c1a 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/jaedb/Iris";
+    homepage = https://github.com/jaedb/Iris;
     description = "A fully-functional Mopidy web client encompassing Spotify and many other backends";
     license = licenses.asl20;
     maintainers = [ maintainers.rvolosatovs ];
diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix
index e9538273568..b09db88bbcb 100644
--- a/pkgs/applications/audio/mopidy-local-images/default.nix
+++ b/pkgs/applications/audio/mopidy-local-images/default.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/mopidy/mopidy-local-images";
+    homepage = https://github.com/mopidy/mopidy-local-images;
     description = "Mopidy local library proxy extension for handling embedded album art";
     license = licenses.asl20;
     maintainers = [ maintainers.rvolosatovs ];
diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy-local-sqlite/default.nix
index 54501895e31..7aebc43dabb 100644
--- a/pkgs/applications/audio/mopidy-local-sqlite/default.nix
+++ b/pkgs/applications/audio/mopidy-local-sqlite/default.nix
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/mopidy/mopidy-local-sqlite";
+    homepage = https://github.com/mopidy/mopidy-local-sqlite;
     description = "Mopidy SQLite local library extension";
     license = licenses.asl20;
     maintainers = [ maintainers.rvolosatovs ];
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index 7cce08e733d..f21c171ef60 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       dialog for the PulseAudio sound server.
     '';
 
-    homepage = "http://freedesktop.org/software/pulseaudio/paprefs/";
+    homepage = http://freedesktop.org/software/pulseaudio/paprefs/;
 
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index f218767c55e..69db9d74ee3 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       easily control the volume of all clients, sinks, etc.
     '';
 
-    homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/";
+    homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/;
 
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index 87f79583c3b..7dc3e00ebf7 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A console front-end for Pandora.com";
-    homepage = "http://6xq.net/projects/pianobar/";
+    homepage = http://6xq.net/projects/pianobar/;
     platforms = platforms.linux;
     license = licenses.mit; # expat version
     maintainers = with maintainers; [ eduarrrd ];
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 886a77bb714..66f68c066c8 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
+    homepage = http://musicbrainz.org/doc/MusicBrainz_Picard;
     description = "The official MusicBrainz tagger";
     maintainers = with maintainers; [ ehmry ];
     license = licenses.gpl2;
diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix
index ced5262f5d2..ff688f7b3dc 100644
--- a/pkgs/applications/audio/ponymix/default.nix
+++ b/pkgs/applications/audio/ponymix/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "CLI PulseAudio Volume Control";
-    homepage = "http://github.com/falconindy/ponymix";
+    homepage = http://github.com/falconindy/ponymix;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ericsagnes ];
diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index 764ee629dbf..7b103286fe2 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/pkgs/applications/audio/projectm/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Music Visualizer";
-    homepage = "http://projectm.sourceforge.net/";
+    homepage = http://projectm.sourceforge.net/;
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index 1a448c74b47..2b2fd161ede 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Music tracker application, free reimplementation of Impulse Tracker";
-    homepage = "http://schismtracker.org/";
+    homepage = http://schismtracker.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ];
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix
index eafa0980b4b..ebeef301e10 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation  rec {
 
   meta = with stdenv.lib; {
     description = "Minimal loop based midi sequencer";
-    homepage = "http://www.filter24.org/seq24";
+    homepage = http://www.filter24.org/seq24;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ goibhniu nckx ];
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 2acafb0be63..9f8ad3e649b 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -62,7 +62,7 @@ in buildPythonApplication rec {
        - Commandline control
        - Available in 24 languages
     '';
-    homepage = "http://www.nongnu.org/sonata/";
+    homepage = http://www.nongnu.org/sonata/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.rvl ];
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index e4d9541673a..bf4d96c6fc4 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     '';
 
     version = "${version}";
-    homepage = "http://essej.net/sooperlooper/index.html";
+    homepage = http://essej.net/sooperlooper/index.html;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix
index fa2b54d0e8a..19386b47794 100644
--- a/pkgs/applications/audio/ssrc/default.nix
+++ b/pkgs/applications/audio/ssrc/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     '';
 
     version = "${version}";
-    homepage = "http://shibatch.sourceforge.net/";
+    homepage = http://shibatch.sourceforge.net/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ leenaars];
     platforms = with platforms; [ linux ] ;
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index a1d80c9113b..5e26b6c1cdb 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Text-to-speech engine";
-    homepage = "https://android.googlesource.com/platform/external/svox";
+    homepage = https://android.googlesource.com/platform/external/svox;
     platforms = platforms.linux;
     license = licenses.asl20;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index ca9f514eace..2787c65fc54 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A multi-source music player";
-    homepage = "http://tomahawk-player.org/";
+    homepage = http://tomahawk-player.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = [ maintainers.aszlig ];
diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix
index 1008d3e8e98..ca6d6240688 100644
--- a/pkgs/applications/audio/yasr/default.nix
+++ b/pkgs/applications/audio/yasr/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   ]; # taken from the debian yasr package
 
   meta = {
-    homepage = "http://yasr.sourceforge.net";
+    homepage = http://yasr.sourceforge.net;
     description = "A general-purpose console screen reader";
     longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems.";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index 54d07e71f42..672237a8462 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake pkgconfig mpd_clientlib openssl ];
 
   meta = {
-    homepage = "http://www.ympd.org";
+    homepage = http://www.ympd.org;
     description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS";
     maintainers = [ stdenv.lib.maintainers.siddharthist ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index 3bfee48b8cd..e840c6eeda0 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An online/offline backup solution";
-    homepage = "http://www.crashplan.org";
+    homepage = http://www.crashplan.org;
     license = licenses.unfree;
     maintainers = with maintainers; [ sztupi domenkozar jerith666 ];
   };
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index d54fb455fcb..dd9cae32ba4 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -65,7 +65,7 @@ in mkDerivation rec {
 
   meta = with lib; {
     description = "QML based X11 display manager";
-    homepage = "https://github.com/sddm/sddm";
+    homepage = https://github.com/sddm/sddm;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ttuegel ];
   };
diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix
index a46b52436a3..214b435429a 100644
--- a/pkgs/applications/editors/aewan/default.nix
+++ b/pkgs/applications/editors/aewan/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Ascii-art Editor Without A Name";
-    homepage = "http://aewan.sourceforge.net/";
+    homepage = http://aewan.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 15230a7a000..51a2a874f23 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Animated sprite editor & pixel art tool";
-    homepage = "http://www.aseprite.org/";
+    homepage = http://www.aseprite.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 151f6045584..44c1ebcecfd 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -416,7 +416,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = "http://scala-ide.org/";
+      homepage = http://scala-ide.org/;
       description = "The Scala IDE for Eclipse";
       license = licenses.bsd3;
       platforms = platforms.all;
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
index 556bf83fab7..44116fbac0c 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://savannah.nongnu.org/projects/bbdb/";
+    homepage = http://savannah.nongnu.org/projects/bbdb/;
     description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3";
     license = "GPL";
   };
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index ed96e689283..0ab11b5bf20 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://bbdb.sourceforge.net/";
+    homepage = http://bbdb.sourceforge.net/;
     description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
     license = "GPL";
   };
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
index 56ba5ba9710..673b590f56e 100644
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cask/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
         building, packaging and more. Cask can also be used to manage
         dependencies for your local Emacs configuration.
       '';
-    homepage = "https://github.com/cask/cask";
+    homepage = https://github.com/cask/cask;
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = [ maintainers.jgeerds ];
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
index 9849b65c8c5..9585f327821 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
@@ -23,7 +23,7 @@ clangStdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/Golevka/emacs-clang-complete-async";
+    homepage = https://github.com/Golevka/emacs-clang-complete-async;
     description = "An emacs plugin to complete C and C++ code using libclang";
     license = clangStdenv.lib.licenses.gpl3Plus;
   };
diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix
index 84a52d169a3..496c79543a9 100644
--- a/pkgs/applications/editors/emacs-modes/erlang/default.nix
+++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   # emacs highlighting */
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/erlang/otp";
+    homepage = http://github.com/erlang/otp;
     description = "Erlang mode for Emacs";
     license = licenses.asl20;
     platforms = platforms.unix;
diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix
index a2c73907115..ce335a5d482 100644
--- a/pkgs/applications/editors/emacs-modes/ess/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ess/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Emacs Speaks Statistics";
-    homepage = "http://ess.r-project.org/";
+    homepage = http://ess.r-project.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
index c1291126a1e..ce552257133 100644
--- a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
+++ b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.graphviz.org/";
+    homepage = http://www.graphviz.org/;
     description = "An emacs mode for the DOT Language, used by graphviz";
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index df34a47a6b3..30917a41bd4 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   installCheckTarget = "check";
 
   meta = {
-    homepage = "http://github.com/haskell/haskell-mode";
+    homepage = http://github.com/haskell/haskell-mode;
     description = "Haskell mode for Emacs";
 
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index d70b9955c98..11ccff3df01 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/";
 
   meta = {
-    homepage = "http://www.emacswiki.org/emacs/Icicles";
+    homepage = http://www.emacswiki.org/emacs/Icicles;
     description = "Enhance Emacs minibuffer input with cycling and powerful completion";
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/pkgs/applications/editors/emacs-modes/let-alist/default.nix
index e90d6cf210d..05ddfbf6c16 100644
--- a/pkgs/applications/editors/emacs-modes/let-alist/default.nix
+++ b/pkgs/applications/editors/emacs-modes/let-alist/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://elpa.gnu.org/packages/let-alist.html";
+    homepage = http://elpa.gnu.org/packages/let-alist.html;
     description = "Easily let-bind values of an assoc-list by their names";
     license = stdenv.lib.licenses.gpl3Plus;
   };
diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix
index 237b1ac1483..b01c526aa8e 100644
--- a/pkgs/applications/editors/emacs-modes/prolog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/";
+    homepage = http://bruda.ca/emacs/prolog_mode_for_emacs/;
     description = "Prolog mode for Emacs";
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix
index f830b16da98..0031ffee4d4 100644
--- a/pkgs/applications/editors/emacs-modes/rudel/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation
   '';
 
   meta = {
-    homepage = "http://rudel.sourceforge.net/";
+    homepage = http://rudel.sourceforge.net/;
     description = "A collaborative editing environment for GNU Emacs";
     license = "GPL";
   };
diff --git a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
index 092026aca88..835cf8081af 100644
--- a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/hvesalai/scala-mode2";
+    homepage = https://github.com/hvesalai/scala-mode2;
     description = "An Emacs mode for editing Scala code";
     license = "permissive";
   };
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
index ed3ac0e3da0..0a44deb8ced 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/hvesalai/scala-mode2";
+    homepage = https://github.com/hvesalai/scala-mode2;
     description = "An Emacs mode for editing Scala code";
     license = "permissive";
   };
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 9334b7820fa..bd00045bca9 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "WYSIWYG PostScript annotator";
-    homepage = "http://http://flpsed.org/flpsed.html";
+    homepage = http://http://flpsed.org/flpsed.html;
     license = licenses.gpl3;
     platforms = platforms.mesaPlatforms;
     maintainers = with maintainers; [ fuuzetsu ];
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index eedb674b472..6ad92b109dd 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.madjar ];
     platforms = stdenv.lib.platforms.all;
-    homepage = "http://gottcode.org/focuswriter/";
+    homepage = http://gottcode.org/focuswriter/;
   };
 }
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index c74e47a5243..dce02b56890 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     description = "Portable and fast console hex editor for unix operating systems";
-    homepage = "http://heme.sourceforge.net/";
+    homepage = http://heme.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 17bb9739b9b..5c0f2ee18e1 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   
   meta = with lib; {
     description = "ncurses-based console hexeditor written in C";
-    homepage = "https://github.com/LonnyGomes/hexcurse";
+    homepage = https://github.com/LonnyGomes/hexcurse;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix
index 24282b9ac8e..4671df77554 100644
--- a/pkgs/applications/editors/hexedit/default.nix
+++ b/pkgs/applications/editors/hexedit/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "View and edit files in hexadecimal or in ASCII";
-    homepage = "http://prigaux.chez.com/hexedit.html";
+    homepage = http://prigaux.chez.com/hexedit.html;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index 4455c70d71a..112eebfaf6f 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "File editor/viewer/analyzer for executables";
-    homepage = "http://hte.sourceforge.net";
+    homepage = http://hte.sourceforge.net;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 28a75befba8..50ecdc1d499 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -17,7 +17,7 @@ let
       inherit name version src wmClass jdk;
       product = "CLion";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/clion/";
+        homepage = https://www.jetbrains.com/clion/;
         inherit description license;
         longDescription = ''
           Enhancing productivity for every C and C++
@@ -62,7 +62,7 @@ let
       inherit name version src wmClass jdk;
       product = "DataGrip";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/datagrip/";
+        homepage = https://www.jetbrains.com/datagrip/;
         inherit description license;
         longDescription = ''
           DataGrip is a new IDE from JetBrains built for database admins.
@@ -79,7 +79,7 @@ let
       inherit name version src wmClass jdk;
       product = "Gogland";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/go/";
+        homepage = https://www.jetbrains.com/go/;
         inherit description license;
         longDescription = ''
           Gogland is the codename for a new commercial IDE by JetBrains
@@ -97,7 +97,7 @@ let
       inherit name version src wmClass jdk;
       product = "IDEA";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/idea/";
+        homepage = https://www.jetbrains.com/idea/;
         inherit description license;
         longDescription = ''
           IDE for Java SE, Groovy & Scala development Powerful
@@ -114,7 +114,7 @@ let
       inherit name version src wmClass jdk;
       product = "PhpStorm";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/phpstorm/";
+        homepage = https://www.jetbrains.com/phpstorm/;
         inherit description license;
         longDescription = ''
           PhpStorm provides an editor for PHP, HTML and JavaScript
@@ -131,7 +131,7 @@ let
       inherit name version src wmClass jdk;
       product = "PyCharm";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/pycharm/";
+        homepage = https://www.jetbrains.com/pycharm/;
         inherit description license;
         longDescription = ''
           Python IDE with complete set of tools for productive
@@ -158,7 +158,7 @@ let
       inherit name version src wmClass jdk;
       product = "Rider";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/rider/";
+        homepage = https://www.jetbrains.com/rider/;
         inherit description license;
         longDescription = ''
           JetBrains Rider is a new .NET IDE based on the IntelliJ
@@ -184,7 +184,7 @@ let
       inherit name version src wmClass jdk;
       product = "RubyMine";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/ruby/";
+        homepage = https://www.jetbrains.com/ruby/;
         inherit description license;
         longDescription = description;
         maintainers = with maintainers; [ edwtjo ];
@@ -197,7 +197,7 @@ let
       inherit name version src wmClass jdk;
       product = "WebStorm";
       meta = with stdenv.lib; {
-        homepage = "https://www.jetbrains.com/webstorm/";
+        homepage = https://www.jetbrains.com/webstorm/;
         inherit description license;
         longDescription = ''
           WebStorm provides an editor for HTML, JavaScript (incl. Node.js),
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index b553e09ed5e..9b3896e32d6 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://notepadqq.altervista.org/";
+    homepage = http://notepadqq.altervista.org/;
     description = "Notepad++-like editor for the Linux desktop";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix
index c9d86561fe2..0bcbad58b3a 100644
--- a/pkgs/applications/editors/nvpy/default.nix
+++ b/pkgs/applications/editors/nvpy/default.nix
@@ -30,7 +30,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = with pkgs.lib; {
     description = "A simplenote-syncing note-taking tool inspired by Notational Velocity";
-    homepage = "https://github.com/cpbotha/nvpy";
+    homepage = https://github.com/cpbotha/nvpy;
     platforms = platforms.linux;
     license = licenses.bsd3;
   };
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 05cf21fcc53..61b28e02949 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.scintilla.org/SciTE.html";
+    homepage = http://www.scintilla.org/SciTE.html;
     description = "SCIntilla based Text Editor";
     license = licenses.mit;
     platforms = platforms.linux;
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index eb6e1baccb5..76c8e4ae0e4 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 	LaTeX editing with completion, structure viewer, preview,
 	spell checking and support of any compilation chain.
 	'';
-    homepage = "http://www.xm1math.net/texmaker/";
+    homepage = http://www.xm1math.net/texmaker/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cfouche ];
diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix
index eb0be39e7c1..e55bcb48787 100644
--- a/pkgs/applications/editors/tweak/default.nix
+++ b/pkgs/applications/editors/tweak/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An efficient hex editor";
-    homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak";
+    homepage = http://www.chiark.greenend.org.uk/~sgtatham/tweak;
     license = licenses.mit;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 442a2e2224e..a40c22e8886 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A minimal Markdown reading & writing app";
-    homepage = "https://typora.io";
+    homepage = https://typora.io;
     license = licenses.free;
     maintainers = with stdenv.lib.maintainers; [ jensbin ];
     platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix
index 97bf0d5c237..becb5ccc29a 100644
--- a/pkgs/applications/editors/vbindiff/default.nix
+++ b/pkgs/applications/editors/vbindiff/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A terminal visual binary diff viewer";
-    homepage = "http://www.cjmweb.net/vbindiff/";
+    homepage = http://www.cjmweb.net/vbindiff/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index de423987c02..ad294480e60 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       a good reverse engineer tool like a good hex editor, you welcome.
       wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes.
     '';
-    homepage = "http://www.wxhexeditor.org/";
+    homepage = http://www.wxhexeditor.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index dc974aed057..986e16834f7 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/ahodesuka/ahoviewer";
+    homepage = https://github.com/ahodesuka/ahoviewer;
     description = "A GTK2 image viewer, manga reader, and booru browser";
     maintainers = [ maintainers.skrzyp ];
     license = licenses.mit;
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 4aeb7a4a567..f1573087474 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = { 
     description = "Application for viewing OpenEXR images on a display at various exposure settings";
-    homepage = "http://openexr.com";
+    homepage = http://openexr.com;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd3;
   };
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix
index 310f81961cb..d49110d0069 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/pkgs/applications/graphics/exrtools/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Collection of utilities for manipulating OpenEXR images";
-    homepage = "http://scanline.ca/exrtools";
+    homepage = http://scanline.ca/exrtools;
     platforms = platforms.linux;
     license = licenses.mit;
     maintainers = [ maintainers.juliendehos ];
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix
index 0a1059c6a47..4b45e44e22d 100644
--- a/pkgs/applications/graphics/gocr/default.nix
+++ b/pkgs/applications/graphics/gocr/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://jocr.sourceforge.net/";
+    homepage = http://jocr.sourceforge.net/;
     description = "GPL Optical Character Recognition";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix
index c96ddc98795..061dc2b69a6 100644
--- a/pkgs/applications/graphics/guetzli/default.nix
+++ b/pkgs/applications/graphics/guetzli/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Perceptual JPEG encoder";
     longDescription = "Guetzli is a JPEG encoder that aims for excellent compression density at high visual quality.";
-    homepage = "https://github.com/google/guetzli";
+    homepage = https://github.com/google/guetzli;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.x86_64;
     maintainers = [ stdenv.lib.maintainers.seppeljordan ];
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index 4fdfb87f134..90f8eec5993 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A Xinerama Aware Background Changer";
-    homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/";
+    homepage = http://robotmonkeys.net/2010/03/30/imlibsetroot/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ lucas8 ];
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index c9587b222d9..705d983c83a 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -34,7 +34,7 @@ in pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ];
 
   meta = {
-    homepage = "http://code.google.com/p/jbrout";
+    homepage = http://code.google.com/p/jbrout;
     description = "Photo manager";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index ccac9dd0ed1..c8fb295044a 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -37,7 +37,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "A free an open source painting application";
-    homepage = "https://krita.org/";
+    homepage = https://krita.org/;
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix
index e8c22b37638..51bfa603a05 100644
--- a/pkgs/applications/graphics/mtpaint/default.nix
+++ b/pkgs/applications/graphics/mtpaint/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       Due to its simplicity and lack of dependencies it runs well on
       GNU/Linux, Windows and older PC hardware.
     '';
-    homepage = "http://mtpaint.sourceforge.net/";
+    homepage = http://mtpaint.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.vklquevs ];
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index f3b16a30460..c2830b2df3d 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       machine parts but pretty sure is not what you are looking for when you are more
       interested in creating computer-animated movies.
     '';
-    homepage = "http://openscad.org/";
+    homepage = http://openscad.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; 
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 0973893bbec..8736721b43d 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ];
 
   meta = {
-    homepage = "http://www.paraview.org/";
+    homepage = http://www.paraview.org/;
     description = "3D Data analysis and visualization application";
     license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric guibert];
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
index 894667597d8..1c582df50de 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ git flex bison cmake zlib ];
 
   meta = with stdenv.lib; {
-    homepage = "http://pbrt.org";
+    homepage = http://pbrt.org;
     description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
     platforms = platforms.linux ;
     license = licenses.bsd2;
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index d6bcdee4137..22db78b8125 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://photoqt.org/";
+    homepage = http://photoqt.org/;
     description = "Simple, yet powerful and good looking image viewer";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 4bd80c01c93..ff3ebfad484 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
       video- and still-cameras, frame-grabbers, etc. For a list of supported
       scanners, see http://www.sane-project.org/sane-backends.html.
     '';
-    homepage = "http://www.sane-project.org/";
+    homepage = http://www.sane-project.org/;
     license = licenses.gpl2Plus;
 
     maintainers = with maintainers; [ nckx peti ];
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index bd19ef3c43b..a956db40052 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 	(if libusb != null then [libusb] else []);
 
   meta = {
-    homepage = "http://www.sane-project.org/";
+    homepage = http://www.sane-project.org/;
     description = "Scanner Access Now Easy";
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix
index 083fde35902..55c856c1912 100644
--- a/pkgs/applications/graphics/smartdeblur/default.nix
+++ b/pkgs/applications/graphics/smartdeblur/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = "-DUSE_SYSTEM_FFTW=ON";
 
   meta = {
-    homepage = "https://github.com/Y-Vladimir/SmartDeblur";
+    homepage = https://github.com/Y-Vladimir/SmartDeblur;
     description = "Tool for restoring blurry and defocused images";
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ viric ];
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 843352b2791..93bb5f151d9 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Simple X Image Viewer";
-    homepage = "https://github.com/muennich/sxiv";
+    homepage = https://github.com/muennich/sxiv;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with maintainers; [ jfrankenau fuuzetsu ];
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index dc896e0b0d9..31908dcfd9f 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -104,7 +104,7 @@ in
 
     meta = {
       description = "The Unigine Valley GPU benchmarking tool";
-      homepage = "http://unigine.com/products/benchmarks/valley/";
+      homepage = http://unigine.com/products/benchmarks/valley/;
       license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf
       maintainers = [ stdenv.lib.maintainers.kierdavis ];
       platforms = ["x86_64-linux" "i686-linux"];
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index 023008183ff..38f63bdb383 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec {
   postInstall = "make DESTDIR=\"$out\" install";
 
   meta = {
-    homepage = "https://github.com/karlch/vimiv";
+    homepage = https://github.com/karlch/vimiv;
     description = "An image viewer with Vim-like keybindings";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix
index 4b1040ce765..2269f1c18f1 100644
--- a/pkgs/applications/graphics/xfractint/default.nix
+++ b/pkgs/applications/graphics/xfractint/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.unfree;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://www.fractint.net/";
+    homepage = https://www.fractint.net/;
   };
 }
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 9af46f5cb35..fa85d44a498 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     license = licenses.unfree;
-    homepage = "http://www.yworks.com/en/products/yfiles/yed/";
+    homepage = http://www.yworks.com/en/products/yfiles/yed/;
     description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams";
     platforms = jre.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix
index b1574ea6963..3f3c2a32e68 100644
--- a/pkgs/applications/inferno/default.nix
+++ b/pkgs/applications/inferno/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A compact distributed operating system for building cross-platform distributed systems";
-    homepage = "http://inferno-os.org/";
+    homepage = http://inferno-os.org/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ doublec kovirobi ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix
index 892d82fb51e..087f355b4fa 100644
--- a/pkgs/applications/kde/build-support/application.nix
+++ b/pkgs/applications/kde/build-support/application.nix
@@ -15,6 +15,6 @@ mkDerivation (args // {
 
   meta = {
     platforms = lib.platforms.linux;
-    homepage = "http://www.kde.org";
+    homepage = http://www.kde.org;
   } // (args.meta or {});
 })
diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
index e3abe89eade..31e578e228a 100644
--- a/pkgs/applications/kde/kdelibs/default.nix
+++ b/pkgs/applications/kde/kdelibs/default.nix
@@ -42,7 +42,7 @@ mkDerivation {
 
   meta = {
     platforms = lib.platforms.linux;
-    homepage = "http://www.kde.org";
+    homepage = http://www.kde.org;
     license = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 99b69f45e1e..64511aabf7c 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -18,7 +18,7 @@ mkDerivation {
   ];
   meta = {
     platforms = lib.platforms.linux;
-    homepage = "http://www.kde.org";
+    homepage = http://www.kde.org;
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix
index 4c03b197b4a..f87bd4c11ec 100644
--- a/pkgs/applications/misc/abook/default.nix
+++ b/pkgs/applications/misc/abook/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ncurses readline ];
 
   meta = {
-    homepage = "http://abook.sourceforge.net/";
+    homepage = http://abook.sourceforge.net/;
     description = "Text-based addressbook program designed to use with mutt mail client";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix
index 556c1db3c83..30b8a435f90 100644
--- a/pkgs/applications/misc/antfs-cli/default.nix
+++ b/pkgs/applications/misc/antfs-cli/default.nix
@@ -4,7 +4,7 @@ pythonPackages.buildPythonApplication rec {
   name = "antfs-cli-unstable-2017-02-11";
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/Tigge/antfs-cli";
+    homepage = https://github.com/Tigge/antfs-cli;
     description = "Extracts FIT files from ANT-FS based sport watches";
     license = licenses.mit;
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index a07e0b6db61..350a64ba3e4 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://naihe2010.github.io/apvlv/";
+    homepage = http://naihe2010.github.io/apvlv/;
     description = "PDF viewer with Vim-like behaviour";
     longDescription = ''
       apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index e67480fb3c7..196db45d905 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [ pygtk ];
 
   meta = {
-    homepage = "http://bleachbit.sourceforge.net";
+    homepage = http://bleachbit.sourceforge.net;
     description = "A program to clean your computer";
     longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy.";
     license = stdenv.lib.licenses.gpl3;
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index 587a20b2704..05c058f8a83 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://cgg.bzatek.net/";
+    homepage = http://cgg.bzatek.net/;
     description = "a simple static web photo gallery, designed to be clean and easily usable";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 8f2d7c4f17f..d4884bb1709 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       monitoring, (over)clocking and fanspeed support for bitcoin and derivative
       coins. Do not use on multiple block chains at the same time!
     '';
-    homepage = "https://github.com/ckolivas/cgminer";
+    homepage = https://github.com/ckolivas/cgminer;
     license = licenses.gpl3;
     maintainers = [ maintainers.offline ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index e1ed03c428d..93d7717fa5c 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -17,6 +17,6 @@ python3Packages.buildPythonApplication rec {
     description = "cheat allows you to create and view interactive cheatsheets on the command-line";
     maintainers = with lib.maintainers; [ mic92 ];
     license = with lib.licenses; [gpl3 mit];
-    homepage = "https://github.com/chrisallenlane/cheat";
+    homepage = https://github.com/chrisallenlane/cheat;
   };
 }
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index cdde212275d..860a1d186f7 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://github.com/dpayne/cli-visualizer";
+    homepage = https://github.com/dpayne/cli-visualizer;
     description = "CLI based audio visualizer";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
index 08f654cdec4..de18a211c45 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Offline conference schedule viewer";
-    homepage = "http://www.toastfreeware.priv.at/confclerk";
+    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/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 48e08be5474..985a418e158 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       feel of the old cathode tube screens. It has been designed to be
       eye-candy, customizable, and reasonably lightweight.
     '';
-    homepage = "https://github.com/Swordifish90/cool-retro-term";
+    homepage = https://github.com/Swordifish90/cool-retro-term;
     license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix
index 6b22f3b27ee..fefa45760d5 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://ctodo.apakoh.dk/";
+    homepage = http://ctodo.apakoh.dk/;
     description = "A simple ncurses-based task list manager";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index a5b17d4be9a..3fb66907295 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -28,7 +28,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "3D printer / slicing GUI built on top of the Uranium framework";
-    homepage = "https://github.com/Ultimaker/Cura";
+    homepage = https://github.com/Ultimaker/Cura;
     license = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 26cdb0ed3f9..ce7109dd6fc 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
-    homepage = "https://github.com/Ultimaker/CuraEngine";
+    homepage = https://github.com/Ultimaker/CuraEngine;
     license = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix
index e145bbe22e7..1e024a16e81 100644
--- a/pkgs/applications/misc/deepin-terminal/default.nix
+++ b/pkgs/applications/misc/deepin-terminal/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
         Deepin terminal, it sharpens your focus in the world of command line!
         It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features.
      '';
-    homepage = "https://github.com/linuxdeepin/deepin-terminal/";
+    homepage = https://github.com/linuxdeepin/deepin-terminal/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 907c9d612b8..53344595f78 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   cmakeFlags = "-DQT5BUILD=true";
 
   meta = {
-    homepage = "http://dfilemanager.sourceforge.net/";
+    homepage = http://dfilemanager.sourceforge.net/;
     description = "File manager written in Qt/C++";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 95cae316a71..4b81bfd53f5 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://eaglemode.sourceforge.net";
+    homepage = http://eaglemode.sourceforge.net;
     description = "Zoomable User Interface";
     license = licenses.gpl3;
     maintainers = with maintainers; [ viric ];
diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix
index 386601f39bb..6344f40a291 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/pkgs/applications/misc/eterm/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Terminal emulator";
-    homepage = "http://www.eterm.org";
+    homepage = http://www.eterm.org;
     license = licenses.bsd2;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 88475dd761e..5cd8f572ad4 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   configureFlags = "--with-ssl=${openssl.dev}";
 
   meta = {
-    homepage = "http://www.fetchmail.info/";
+    homepage = http://www.fetchmail.info/;
     description = "A full-featured remote-mail retrieval and forwarding utility";
     longDescription = ''
       A full-featured, robust, well-documented remote-mail retrieval and
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index 053cdd05991..65e515dbb83 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://finalterm.org";
+    homepage = http://finalterm.org;
     description = "A new breed of terminal emulator";
     longDescription = ''
       Final Term is a new breed of terminal emulator.
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix
index 23d0d682176..f70042884a8 100644
--- a/pkgs/applications/misc/flamerobin/default.nix
+++ b/pkgs/applications/misc/flamerobin/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Database administration tool for Firebird RDBMS";
-    homepage = "https://github.com/mariuz/flamerobin";
+    homepage = https://github.com/mariuz/flamerobin;
     license = licenses.bsdOriginal;
     maintainers = with maintainers; [ uralbash ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 950ce210c06..10ce0c17758 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://wammu.eu/gammu/";
+    homepage = http://wammu.eu/gammu/;
     description = "Command line utility and library to control mobile phones";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index 0b6ebe06b88..509a54881cc 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
       programs that need to ask a user's password to run another program
       as another user.
     '';
-    homepage = "http://www.nongnu.org/gksu/";
+    homepage = http://www.nongnu.org/gksu/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.romildo ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 6c712db01a5..025be1e4564 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       Also, supports CTRL-R / CTRL-S / "!" for searching through history.
       Running commands in a terminal with CTRL-Enter. URL handlers.
     '';
-    homepage = "http://sourceforge.net/projects/gmrun/";
+    homepage = http://sourceforge.net/projects/gmrun/;
     license = "GPL";
     maintainers = [];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix
index a86cf268801..dfe61b57b43 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/pkgs/applications/misc/gmtp/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A simple MP3 and Media player client for UNIX and UNIX like systems.";
-    homepage = "https://gmtp.sourceforge.io";
+    homepage = https://gmtp.sourceforge.io;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.pbogdan ];
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix
index c4f8be88bb5..e2cf8245ce6 100644
--- a/pkgs/applications/misc/gnome15/default.nix
+++ b/pkgs/applications/misc/gnome15/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A set of tools for configuring the Logitech G15 keyboard";
     license = licenses.gpl3;
-    homepage = "https://gnome15.org/";
+    homepage = https://gnome15.org/;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 160b38463b6..4ad32c5fd7f 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A simple, Git-powered wiki";
-    homepage = "https://github.com/gollum/gollum";
+    homepage = https://github.com/gollum/gollum;
     license = licenses.mit;
     maintainers = with maintainers; [ jgillich primeos ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 5db5b25947e..85d95c7b3f9 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GTK+-based audio CD player/ripper";
-    homepage = "http://nostatic.org/grip";
+    homepage = http://nostatic.org/grip;
     license = stdenv.lib.licenses.gpl2;
 
     maintainers = with stdenv.lib.maintainers; [ marcweber peti ];
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index 481e2107951..dc771fc2d5e 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/donnemartin/haxor-news";
+    homepage = https://github.com/donnemartin/haxor-news;
     description = "Browse Hacker News like a haxor";
     license = licenses.asl20;
     maintainers = with maintainers; [ matthiasbeyer ];
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 3a91d27fc48..b3ce98895e6 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
   '';
   meta = {
     description = "3D animation application software";
-    homepage = "https://sidefx.com";
+    homepage = https://sidefx.com;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.canndrew ];
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 78f3c2f391b..ba04bd5c39d 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ncurses ];
 
   meta = {
-    homepage = "https://github.com/dvorka/hstr";
+    homepage = https://github.com/dvorka/hstr;
     description = "Shell history suggest box - easily view, navigate, search and use your command history";
     license = stdenv.lib.licenses.asl20;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index bce5b6cf589..e27b9dc43eb 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Wiki compiler, storing pages and history in a RCS";
-    homepage = "http://ikiwiki.info/";
+    homepage = http://ikiwiki.info/;
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index a1b16e2a4d1..ed8573b8850 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.jbidwatcher.com/";
+    homepage = http://www.jbidwatcher.com/;
     description = "Monitor and snipe Ebay auctions";
     license = "LGPL";
 
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index 2a4793bfe09..9c86b96f4c0 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Kanban project management software";
-    homepage = "https://kanboard.net";
+    homepage = https://kanboard.net;
     license = licenses.mit;
     maintainers = with maintainers; [ fpletz ];
   };
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix
index b537c378a71..f0c86fb67db 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       It allows you to focus on specific skills and exercises, on both theory and aural training.
       The different activities can be customized to meet your needs
     '';
-    homepage = "http://www.lenmus.org/";
+    homepage = http://www.lenmus.org/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers;  [ ramkromberg ];
     platforms = with platforms; linux;
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 0d5ee979087..964617e20f1 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "WYSIWYM frontend for LaTeX, DocBook";
-    homepage = "http://www.lyx.org";
+    homepage = http://www.lyx.org;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.vcunat ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix
index 8e39c258333..24a8b0c46a6 100644
--- a/pkgs/applications/misc/multimon-ng/default.nix
+++ b/pkgs/applications/misc/multimon-ng/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       AFSK2400 AFSK2400_2 AFSK2400_3 HAPN4800 FSK9600 DTMF ZVEI1 ZVEI2
       ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW
     '';
-    homepage = "https://github.com/EliasOenal/multimon-ng";
+    homepage = https://github.com/EliasOenal/multimon-ng;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ the-kenny ];
diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index 2acb15b6a0b..55cd17c2c0b 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "Free opensource web browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index f64fbe8528b..74e7c694ea4 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "Build system for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix
index 9db681bf5c1..536dbbe80d3 100644
--- a/pkgs/applications/misc/netsurf/libcss/default.nix
+++ b/pkgs/applications/misc/netsurf/libcss/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "Cascading Style Sheets library for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix
index 9287ee9a084..71445fd17a0 100644
--- a/pkgs/applications/misc/netsurf/libdom/default.nix
+++ b/pkgs/applications/misc/netsurf/libdom/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "Document Object Model library for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix
index ef319e95089..3e9210589ea 100644
--- a/pkgs/applications/misc/netsurf/libhubbub/default.nix
+++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "HTML5 parser library for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix
index 44f644e162b..040f1c55883 100644
--- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "BMP Decoder for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix
index 234bb43798e..c627a769bbb 100644
--- a/pkgs/applications/misc/netsurf/libnsfb/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "CSS parser and selection library for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix
index 09ec6c6ecc3..a834d77c8eb 100644
--- a/pkgs/applications/misc/netsurf/libnsgif/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "GIF Decoder for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix
index 9d931d6bea2..a18f91ba264 100644
--- a/pkgs/applications/misc/netsurf/libnsutils/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "Generalised utility library for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/misc/netsurf/libparserutils/default.nix
index 275c2cccaef..ed9433b9f57 100644
--- a/pkgs/applications/misc/netsurf/libparserutils/default.nix
+++ b/pkgs/applications/misc/netsurf/libparserutils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "Parser building library for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix
index b2057e1889f..63052e080a5 100644
--- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix
+++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "UTF8 Processing library for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
index edcc45ca0fa..509cbeb4503 100644
--- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
+++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "String internment library for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
index 0985a182520..971e16848ae 100644
--- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix
+++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.netsurf-browser.org/";
+    homepage = http://www.netsurf-browser.org/;
     description = "Generator for JavaScript bindings for netsurf browser";
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix
index a6bcff06626..04f10de3d27 100644
--- a/pkgs/applications/misc/nix-tour/default.nix
+++ b/pkgs/applications/misc/nix-tour/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "'the tour of nix' from nixcloud.io/tour as offline version";
-    homepage = "https://nixcloud.io/tour";
+    homepage = https://nixcloud.io/tour;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ qknight ];
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index c1c87a6db39..b7a11f988af 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -97,7 +97,7 @@ in pythonPackages.buildPythonApplication rec {
   checkPhase = "nosetests";
 
   meta = with stdenv.lib; {
-    homepage = "http://octoprint.org/";
+    homepage = http://octoprint.org/;
     description = "The snappy web interface for your 3D printer";
     license = licenses.agpl3;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 81b7445ad18..c09e8d2f5e6 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -34,7 +34,7 @@ let
       '';
 
       meta = with stdenv.lib; {
-        homepage = "https://github.com/donovan6000/M33-Fio";
+        homepage = https://github.com/donovan6000/M33-Fio;
         description = "OctoPrint plugin for the Micro 3D printer";
         platforms = platforms.all;
         license = licenses.gpl3;
@@ -54,7 +54,7 @@ let
       };
 
       meta = with stdenv.lib; {
-        homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus";
+        homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus;
         description = "Show printers status in window title";
         platforms = platforms.all;
         license = licenses.agpl3;
@@ -74,7 +74,7 @@ let
       };
 
       meta = with stdenv.lib; {
-        homepage = "https://github.com/jneilliii/Octoprint-STLViewer";
+        homepage = https://github.com/jneilliii/Octoprint-STLViewer;
         description = "A simple stl viewer tab for OctoPrint";
         platforms = platforms.all;
         license = licenses.agpl3;
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 1985b644884..000af950bf1 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   installPhase = "make install prefix=$out";
 
   meta = {
-    homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html";
+    homepage = http://fabrice.thiroux.free.fr/openbox-menu_en.html;
     description = "Dynamic XDG menu generator for Openbox";
     longDescription = ''
       Openbox-menu is a pipemenu for Openbox window manager. It provides a
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 5016acfff12..be355652ece 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A tool to edit resource files (BRF)";
-    homepage = "https://github.com/cfcohen/openbrf";
+    homepage = https://github.com/cfcohen/openbrf;
     maintainers = with stdenv.lib.maintainers; [ abbradar ];
     license = licenses.free;
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 696232c9f8d..01cebe95954 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.kragniz ];
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl2;
-    homepage = "http://opencpn.org/";
+    homepage = http://opencpn.org/;
   };
 }
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index aceeae87d08..137d68d8171 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ];
 
   meta = with stdenv.lib; {
-    homepage = "http://blog.lxde.org/?cat=28/";
+    homepage = http://blog.lxde.org/?cat=28/;
     license = licenses.gpl2Plus;
     description = "File manager with GTK+ interface";
     maintainers = [ maintainers.ttuegel ];
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 87c4df3446e..ad5a0b0ef0d 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://pcman.ptt.cc";
+    homepage = http://pcman.ptt.cc;
     license = licenses.gpl2;
     description = "Telnet BBS browser with GTK+ interface";
     maintainers = [ maintainers.mingchuan ];
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index 919935a41ee..ba4a57a191c 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Apps/PdfMod";
+    homepage = https://wiki.gnome.org/Apps/PdfMod;
     description = "A simple application for modifying PDF documents";
     platforms = platforms.all;
     maintainers = with maintainers; [ obadz ];
diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index b6d46cf9ed1..0cd0d29e2f3 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://posterazor.sourceforge.net/";
+    homepage = http://posterazor.sourceforge.net/;
     description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
     maintainers = [ stdenv.lib.maintainers.madjar ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 1a3f1399fe7..5cbf9411435 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://launchpad.net/qpdfview";
+    homepage = https://launchpad.net/qpdfview;
     updateWalker = true;
   };
 }
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index f378c352936..f3198085b9a 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "File manager with minimalistic curses interface";
-    homepage = "http://ranger.nongnu.org/";
+    homepage = http://ranger.nongnu.org/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 0ba850a3460..8bbfbaf7cf0 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -72,7 +72,7 @@ EOF
 
   meta = with lib; {
     description = "Cross-platform open source Redis DB management tool";
-    homepage = "http://redisdesktop.com/";
+    homepage = http://redisdesktop.com/;
     license = licenses.lgpl21;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index 64f4c1aab48..76593eba5fc 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://robomongo.org/";
+    homepage = https://robomongo.org/;
     description = "Query GUI for mongodb";
     platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64;
     license = stdenv.lib.licenses.gpl3;
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
index f81709b9739..4f4319af6cb 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Change the urxvt font size on the fly";
-    homepage = "https://github.com/majutsushi/urxvt-font-size";
+    homepage = https://github.com/majutsushi/urxvt-font-size;
     license = licenses.mit;
     maintainers = with maintainers; [ cstrahan ];
     platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
index 0c95acd7205..13e005014f1 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Perl extensions for the rxvt-unicode terminal emulator";
-    homepage = "https://github.com/effigies/urxvt-perl";
+    homepage = https://github.com/effigies/urxvt-perl;
     license = licenses.gpl3;
     maintainers = with maintainers; [ cstrahan ];
     platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index 82c4f310352..544789e865b 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Perl extensions for the rxvt-unicode terminal emulator";
-    homepage = "https://github.com/muennich/urxvt-perls";
+    homepage = https://github.com/muennich/urxvt-perls;
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
     platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index 194bb8397fb..68be8b738de 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)";
-    homepage = "https://github.com/mina86/urxvt-tabbedex";
+    homepage = https://github.com/mina86/urxvt-tabbedex;
     maintainers = with maintainers; [ abbradar ];
     platforms = with platforms; unix;
   };
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
index 8b9ffb2c8c8..f4a41a89e1c 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "urxvt plugin that allows to switch color themes during runtime";
-    homepage = "https://github.com/felixr/urxvt-theme-switch";
+    homepage = https://github.com/felixr/urxvt-theme-switch;
     license = "CCBYNC";
     maintainers = with maintainers; [ garbas ];
     platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
index 000828ddb7f..2f2c2055803 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)";
-    homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel";
+    homepage = https://aur.archlinux.org/packages/urxvt-vtwheel;
     license = licenses.mit;
     maintainers = with maintainers; [ danbst ];
     platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index f3939d3b6eb..281f2176833 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (rec {
 
   meta = with stdenv.lib; {
     inherit description;
-    homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
+    homepage = http://software.schmorp.de/pkg/rxvt-unicode.html;
     downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/";
     maintainers = [ maintainers.mornfall ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 19fc62d1238..1ed6e4d70c9 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/andmarti1424/sc-im";
+    homepage = https://github.com/andmarti1424/sc-im;
     description = "SC-IM - Spreadsheet Calculator Improvised - SC fork";
     license = licenses.bsdOriginal;
     maintainers = [ maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix
index 3bb97463e5d..712b5a7e750 100644
--- a/pkgs/applications/misc/slade/default.nix
+++ b/pkgs/applications/misc/slade/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Doom editor";
-    homepage = "http://slade.mancubus.net/";
+    homepage = http://slade.mancubus.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix
index 5aaf04bbfd8..05e34cc5c30 100644
--- a/pkgs/applications/misc/st/xst.nix
+++ b/pkgs/applications/misc/st/xst.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/neeasade/xst";
+    homepage = https://github.com/neeasade/xst;
     description = "Simple terminal fork that can load config from Xresources";
     license = licenses.mit;
     maintainers = maintainers.vyp;
diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix
index 0fe94b07450..ebb50e685da 100644
--- a/pkgs/applications/misc/stag/default.nix
+++ b/pkgs/applications/misc/stag/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/seenaburns/stag";
+    homepage = https://github.com/seenaburns/stag;
     description = "Terminal streaming bar graph passed through stdin";
     license = stdenv.lib.licenses.bsdOriginal;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
index fa160c51fe2..8be792c673c 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/pkgs/applications/misc/stog/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "XML documents and web site compiler";
-    homepage = "https://zoggy.github.io/stog/";
+    homepage = https://zoggy.github.io/stog/;
     license = licenses.lgpl3;
     platforms = ocaml.meta.platforms or [];
     maintainers = with maintainers; [ regnat ];
diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix
index dd1218282d8..8102375479b 100644
--- a/pkgs/applications/misc/super_user_spark/default.nix
+++ b/pkgs/applications/misc/super_user_spark/default.nix
@@ -27,6 +27,6 @@ mkDerivation {
   jailbreak = true;
   description = "Configure your dotfile deployment with a DSL";
   license = stdenv.lib.licenses.mit;
-  homepage = "https://github.com/NorfairKing/super-user-spark";
+  homepage = https://github.com/NorfairKing/super-user-spark;
   maintainers = [ stdenv.lib.maintainers.badi ];
 }
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 62e66e4ad38..009eb488d7b 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -61,7 +61,7 @@ let
     dontStrip = true;
 
     meta = {
-      homepage = "http://www.sweethome3d.com/index.jsp";
+      homepage = http://www.sweethome3d.com/index.jsp;
       inherit description;
       inherit license;
       maintainers = [ stdenv.lib.maintainers.edwtjo ];
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 7dbf1e8f2a3..37623caa1d4 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -50,7 +50,7 @@ let
     dontStrip = true;
 
     meta = {
-      homepage = "http://www.sweethome3d.com/index.jsp";
+      homepage = http://www.sweethome3d.com/index.jsp;
       inherit description;
       inherit license;
       maintainers = [ stdenv.lib.maintainers.edwtjo ];
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 9ae6bfae116..6c02a51367e 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Share one mouse and keyboard between multiple computers";
-    homepage = "http://synergy-project.org/";
+    homepage = http://synergy-project.org/;
     license = licenses.gpl2;
     maintainers = [ maintainers.aszlig ];
     platforms = platforms.all;
diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix
index 2a199843cb3..2b0573f2d2d 100644
--- a/pkgs/applications/misc/taskjuggler/2.x/default.nix
+++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     "kde_locale=\${out}/share/locale";
 
   meta = {
-    homepage = "http://www.taskjuggler.org";
+    homepage = http://www.taskjuggler.org;
     license = stdenv.lib.licenses.gpl2;
     description = "Project management tool";
     longDescription = ''
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index ae0b46d056f..1b3ca7dfc03 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ taskwarrior perl ncurses ];
 
   meta = {
-    homepage = "https://github.com/mjheagle8/tasknc";
+    homepage = https://github.com/mjheagle8/tasknc;
     description = "A ncurses wrapper around taskwarrior";
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
     platforms = stdenv.lib.platforms.linux; # Cannot test others
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index df253b3b4ce..63b3430cbe3 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tiling terminal emulator following the Gnome Human Interface Guidelines.";
-    homepage = "https://gnunn1.github.io/tilix-web";
+    homepage = https://gnunn1.github.io/tilix-web;
     licence = licenses.mpl20;
     maintainer = with maintainers; [ midchildan ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix
index 4464ab6a608..357713df384 100644
--- a/pkgs/applications/misc/tomboy/default.nix
+++ b/pkgs/applications/misc/tomboy/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Apps/Tomboy";
+    homepage = https://wiki.gnome.org/Apps/Tomboy;
     description = "A simple note-taking application with synchronization";
     platforms = platforms.linux;
     license = stdenv.lib.licenses.lgpl2;
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 7ec3d66f31c..297f3d0b599 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A notification system for tiling window managers";
-    homepage = "https://github.com/sboli/twmn";
+    homepage = https://github.com/sboli/twmn;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = [ stdenv.lib.maintainers.matejc ];
   };
diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix
index 6be2dc394cc..462b6d0e57b 100644
--- a/pkgs/applications/misc/vanitygen/default.nix
+++ b/pkgs/applications/misc/vanitygen/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
         the prefix is possible, will provide a difficulty estimate,
         and will run about 30% faster.
       '';
-      homepage = "https://github.com/samr7/vanitygen";
+      homepage = https://github.com/samr7/vanitygen;
       license = stdenv.lib.licenses.agpl3;
       platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index f0f5e8e2288..ffeca99cf9c 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2;
     downloadPage = "http://vifm.info/downloads.shtml";
-    homepage = "http://vifm.info/";
+    homepage = http://vifm.info/;
     inherit version;
     updateWalker = true;
   };
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix
index 836deb656a2..27b2a8f7134 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/pkgs/applications/misc/volnoti/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Lightweight volume notification for Linux";
-    homepage = "https://github.com/davidbrazdil/volnoti";
+    homepage = https://github.com/davidbrazdil/volnoti;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.gilligan ];
diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index a184d31233c..90fa0166154 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     '';
 
     meta = {
-        homepage = "http://fungi.yuggoth.org/weather";
+        homepage = http://fungi.yuggoth.org/weather;
         description = "Quick access to current weather conditions and forecasts";
         license = stdenv.lib.licenses.isc;
         maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index 2b11ccf5837..84f7d4fd291 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "A simple curses interface for MediaWiki sites such as Wikipedia";
-    homepage = "https://github.com/ids1024/wikicurses/";
+    homepage = https://github.com/ids1024/wikicurses/;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix
index d3b5541ac4d..6a5f7c17b20 100644
--- a/pkgs/applications/misc/with-shell/default.nix
+++ b/pkgs/applications/misc/with-shell/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     cp with $out/bin/with
   '';
   meta = {
-    homepage = "https://github.com/mchav/With";
+    homepage = https://github.com/mchav/With;
     description = "Command prefixing for continuous workflow using a single tool";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix
index 0861391294b..dfd3c487713 100644
--- a/pkgs/applications/misc/wmname/default.nix
+++ b/pkgs/applications/misc/wmname/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Prints or set the window manager name property of the root window";
-    homepage = "http://tools.suckless.org/wmname";
+    homepage = http://tools.suckless.org/wmname;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 00e42fdbba9..0d38f1b93e7 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A two-pane file manager with advanced file manipulation features";
-    homepage = "http://www.boomerangsworld.de/cms/worker/index.html";
+    homepage = http://www.boomerangsworld.de/cms/worker/index.html;
     license =  licenses.gpl2;
     maintainers = [ maintainers.ndowens ];
   };
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index b372cd5b2dd..ad642ecec5e 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov.
       Xfe aims to be the filemanager of choice for all the Unix addicts!
     '';
-    homepage = "http://sourceforge.net/projects/xfe/";
+    homepage = http://sourceforge.net/projects/xfe/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 739f1f0a975..d2283c32920 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.foolabs.com/xpdf/";
+    homepage = http://www.foolabs.com/xpdf/;
     description = "Viewer for Portable Document Format (PDF) files";
 
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix
index c4e7fb23b89..90e2723a906 100644
--- a/pkgs/applications/misc/xxkb/default.nix
+++ b/pkgs/applications/misc/xxkb/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A keyboard layout indicator and switcher";
-    homepage = "http://xxkb.sourceforge.net/";
+    homepage = http://xxkb.sourceforge.net/;
     license = stdenv.lib.licenses.artistic2;
     maintainers = with stdenv.lib.maintainers; [ rasendubi ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 1d287f4100c..ce9ac961c92 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Lightweight WebKitGTK+ web browser";
-    homepage = "http://midori-browser.org";
+    homepage = http://midori-browser.org;
     license = with licenses; [ lgpl21Plus ];
     platforms = with platforms; linux;
     maintainers = with maintainers; [ raskin ramkromberg ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
index 039d8bbe406..1a0752c33c6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Firefox ID card signing plugin";
-    homepage = "http://www.id.ee/";
+    homepage = http://www.id.ee/;
     license = licenses.lgpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.jagajaga ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index 85012f8f709..b3382ef0512 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = ''A wrapper to run browser plugins out-of-process'';
-    homepage = "http://nspluginwrapper.org/";
+    homepage = http://nspluginwrapper.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.raskin ];
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 5ec4340dba7..025e4522f06 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -78,7 +78,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 ];
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 55dfb05cb3e..28a4de16ea0 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       editor and also easily configurable during runtime. Vimb is mostly
       keyboard driven and does not detract you from your daily work.
     '';
-    homepage = "http://fanglingsu.github.io/vimb/";
+    homepage = http://fanglingsu.github.io/vimb/;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.rickynils ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index c98910cb08c..162ad8533bd 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       featureset might be considered "minimalistic", but not as minimalistic as
       being completely featureless.
     '';
-    homepage = "http://sourceforge.net/apps/trac/vimprobable";
+    homepage = http://sourceforge.net/apps/trac/vimprobable;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.aforemny ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix
index e7aa7bb6728..33a1e8a5c08 100644
--- a/pkgs/applications/networking/c14/default.nix
+++ b/pkgs/applications/networking/c14/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "C14 is designed for data archiving & long-term backups.";
-    homepage = "https://www.online.net/en/c14";
+    homepage = https://www.online.net/en/c14;
     license = licenses.mit;
     maintainers = with maintainers; [ apeyroux ];
   };
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 55ebb580f52..9af4cf3f0ed 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://hadoop.apache.org/";
+    homepage = http://hadoop.apache.org/;
     description = "Framework for distributed processing of large data sets across clusters of computers";
     license = stdenv.lib.licenses.asl20;
 
diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix
index c99643beb90..49c57b47028 100644
--- a/pkgs/applications/networking/cluster/pig/default.nix
+++ b/pkgs/applications/networking/cluster/pig/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://pig.apache.org/";
+    homepage = http://pig.apache.org/;
     description = "High-level language for Apache Hadoop";
     license = licenses.asl20;
 
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 155c8787430..e97bdd906c5 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -142,7 +142,7 @@ in mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.dropbox.com";
+    homepage = http://www.dropbox.com;
     description = "Online stored folders (daemon version)";
     maintainers = with lib.maintainers; [ ttuegel ];
     platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 4e22a95d4d8..41f578759df 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
   namePrefix = "";
 
   meta = with stdenv.lib; {
-    homepage = "http://offog.org/code/rawdog/";
+    homepage = http://offog.org/code/rawdog/;
     description = "RSS Aggregator Without Delusions Of Grandeur";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 6b92db9efa5..99517b478c3 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     description = "A tool that converts RSS/Atom newsfeeds to email.";
-    homepage = "https://pypi.python.org/pypi/rss2email";
+    homepage = https://pypi.python.org/pypi/rss2email;
     license = licenses.gpl2;
     maintainers = with maintainers; [ jb55 profpatsch ];
   };
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 90b2695f003..f5406d9fe62 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     -DHAVE_INTTYPES_H -D__GLIBC__
     -D__need_timeval -D__need_timespec -D__need_time_t '';
   meta = {
-    homepage = "http://www.creytiv.com/baresip.html";
+    homepage = http://www.creytiv.com/baresip.html;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 4085324a2aa..a1f9588d6c9 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
     meta = with stdenv.lib; {
         description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone";
-        homepage = "https://discordapp.com/";
+        homepage = https://discordapp.com/;
         downloadPage = "https://github.com/crmarsh/discord-linux-bugs";
         license = licenses.unfree;
         maintainers = [ maintainers.ldesgoui ];
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index a21a82848e0..b01c6497fb2 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://gajim.org/";
+    homepage = http://gajim.org/;
     description = "Jabber client written in PyGTK";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.raskin maintainers.aszlig ];
diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix
index 21f2afdde68..014ea093336 100644
--- a/pkgs/applications/networking/instant-messengers/gale/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gale/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   configureArgs = [ "--sysconfdir=/etc" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://gale.org/";
+    homepage = http://gale.org/;
     description = "Chat/messaging system (server and client)";
     platforms = platforms.all;
     license = licenses.gpl2Plus;
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 4d69c5501e6..1fa7a2fe7e9 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An extensible Twitter client";
-    homepage = "https://mikutter.hachune.net";
+    homepage = https://mikutter.hachune.net;
     maintainers = with maintainers; [ midchildan ];
     platforms = ruby.meta.platforms;
     license = licenses.mit;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
index 592ef325139..8bf94009335 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxml2 pidgin pkgconfig ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/gkdr/carbons";
+    homepage = https://github.com/gkdr/carbons;
     description = "XEP-0280: Message Carbons plugin for libpurple";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index bdc16d101f5..9f5c246ede6 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libotr pidgin intltool ];
 
   meta = with stdenv.lib; {
-    homepage = "https://otr.cypherpunks.ca/";
+    homepage = https://otr.cypherpunks.ca/;
     description = "Plugin for Pidgin 2.x which implements OTR Messaging";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index d4dba663e6d..4a53513061a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://sourceforge.net/projects/pidgin-latex/";
+    homepage = http://sourceforge.net/projects/pidgin-latex/;
     description = "LaTeX rendering plugin for Pidgin IM";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index b1dd7a4c90f..050eb776590 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Anonymous peer-to-peer instant messaging";
-    homepage = "https://ricochet.im";
+    homepage = https://ricochet.im;
     license = licenses.bsd3;
     maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index 9d2de536dbf..a388b77dab9 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -13,7 +13,7 @@ in python3Packages.buildPythonPackage {
 
   meta = with stdenv.lib; {
     description = "Non-official desktop client for Slack";
-    homepage = "https://github.com/raelgc/scudcloud";
+    homepage = https://github.com/raelgc/scudcloud;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ volhovm ];
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 9bad366b8ef..d476b9b35c4 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -92,7 +92,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Linux client for skype";
-    homepage = "https://www.skype.com";
+    homepage = https://www.skype.com;
     license = licenses.unfree;
     maintainers = with stdenv.lib.maintainers; [ panaeon ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index edd66bd900b..5a477b2a591 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -84,7 +84,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Desktop client for Slack";
-    homepage = "https://slack.com";
+    homepage = https://slack.com;
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index 67d1f55f2fe..29026ccdc5a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     version = "2.7.1";
     description = "Telegram client forked from sigram";
-    homepage = "http://aseman.co/en/products/cutegram/";
+    homepage = http://aseman.co/en/products/cutegram/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ profpatsch AndersonTorres ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 446156fbe4c..fed8dd223d6 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -103,7 +103,7 @@ mkDerivation rec {
     description = "Telegram Desktop messaging app";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    homepage = "https://desktop.telegram.org/";
+    homepage = https://desktop.telegram.org/;
     maintainers = with maintainers; [ abbradar garbas ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index e8c1f50164d..3e5a3fb87b6 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     license = licenses.gpl3;
-    homepage = "http://code.google.com/p/vacuum-im/";
+    homepage = http://code.google.com/p/vacuum-im/;
   };
 }
diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix
index 35e436eb715..8b30f6391a0 100644
--- a/pkgs/applications/networking/irc/epic5/default.nix
+++ b/pkgs/applications/networking/irc/epic5/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://epicsol.org";
+    homepage = http://epicsol.org;
     description = "A IRC client that offers a great ircII interface";
     license = licenses.bsd3;
     maintainers = [ maintainers.ndowens ];
diff --git a/pkgs/applications/networking/irc/quassel-webserver/default.nix b/pkgs/applications/networking/irc/quassel-webserver/default.nix
index 4ca3d619aa6..d198674ecc0 100644
--- a/pkgs/applications/networking/irc/quassel-webserver/default.nix
+++ b/pkgs/applications/networking/irc/quassel-webserver/default.nix
@@ -36,7 +36,7 @@ in nodePackages.buildNodePackage rec {
   meta = {
     description = "A web server/client for Quassel";
     license = licenses.mit;
-    homepage = "https://github.com/magne4000/quassel-webserver";
+    homepage = https://github.com/magne4000/quassel-webserver;
     maintainers = with maintainers; [ uwap ];
     platforms = platforms.unix;
   }; 
diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix
index df930b93173..3b45c2fd445 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/alpine/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.asl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://www.washington.edu/alpine/";
+    homepage = https://www.washington.edu/alpine/;
   };
 }
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index a7a66cf550b..8ba53b343f3 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   installPhase = "scons --propagate-environment --prefix=$out install";
 
   meta = {
-    homepage = "https://astroidmail.github.io/";
+    homepage = https://astroidmail.github.io/;
     description = "GTK+ frontend to the notmuch mail system";
     maintainers = [ stdenv.lib.maintainers.bdimcheff ];
     license = stdenv.lib.licenses.gpl3Plus;
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 0606ed86e13..0aa95ee9532 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ openssl pcre lua ];
 
   meta = {
-    homepage = "https://github.com/lefcha/imapfilter";
+    homepage = https://github.com/lefcha/imapfilter;
     description = "Mail filtering utility";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix
index c196ce777ff..728287f8c75 100644
--- a/pkgs/applications/networking/mailreaders/realpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/realpine/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.asl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://re-alpine.sf.net/";
+    homepage = http://re-alpine.sf.net/;
     downloadPage = "http://sourceforge.net/projects/re-alpine/files/";
   };
 }
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 156ea589388..85e5abdc9b6 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
-    homepage = "http://msmtp.sourceforge.net/";
+    homepage = http://msmtp.sourceforge.net/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ garbas peterhoeg ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 1b87008bac7..9f30d722fda 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -60,7 +60,7 @@ let
 
     meta = {
       description = "Low-latency, high quality voice chat software";
-      homepage = "http://mumble.sourceforge.net/";
+      homepage = http://mumble.sourceforge.net/;
       license = licenses.bsd3;
       maintainers = with maintainers; [ viric jgeerds wkennington ];
       platforms = platforms.linux;
diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix
index a15c441b9cc..5314d3668eb 100644
--- a/pkgs/applications/networking/ndppd/default.nix
+++ b/pkgs/applications/networking/ndppd/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces";
-    homepage = "https://github.com/DanielAdolfsson/ndppd";
+    homepage = https://github.com/DanielAdolfsson/ndppd;
     license = stdenv.lib.licenses.gpl3;
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index 9bad7a8b42a..3cea203a025 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Benchmark to measure the performance of many different types of networking";
-    homepage = "http://www.netperf.org/netperf/";
+    homepage = http://www.netperf.org/netperf/;
     license = "Hewlett-Packard BSD-like license";
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index e95963c695c..6c3fc4af272 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader
       written on Qt/C++
     '';
-    homepage = "https://quiterss.org";
+    homepage = https://quiterss.org;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];
diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix
index 1cae91dbf86..75ed084c285 100644
--- a/pkgs/applications/networking/offrss/default.nix
+++ b/pkgs/applications/networking/offrss/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss";
+    homepage = http://vicerveza.homeunix.net/~viric/cgi-bin/offrss;
     description = "Offline RSS/Atom reader";
     license="AGPLv3+";
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index b6f4d8b5b19..6cb2c7247d5 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://www.twister.net.co/";
+    homepage = http://www.twister.net.co/;
     description = "Peer-to-peer microblogging";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index c3eca16af01..66e0cef23f5 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -63,7 +63,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     license = stdenv.lib.licenses.gpl2;
-    homepage = "http://remmina.sourceforge.net/";
+    homepage = http://remmina.sourceforge.net/;
     description = "Remote desktop client written in GTK+";
     maintainers = [];
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix
index ed64629fe24..1d1d6f4e1e3 100644
--- a/pkgs/applications/networking/remote/ssvnc/default.nix
+++ b/pkgs/applications/networking/remote/ssvnc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "VNC viewer that adds encryption security to VNC connections";
-    homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html";
+    homepage = http://www.karlrunge.com/x11vnc/ssvnc.html;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index b28a9040532..d15d0afa63c 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.teamviewer.com";
+    homepage = http://www.teamviewer.com;
     license = licenses.unfree;
     description = "Desktop sharing application, providing remote support and online meetings";
     platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 7f718dfdbe2..9c6aefd8ced 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec
 
   meta =
   {
-    homepage = "https://github.com/haiwen/seafile-clients";
+    homepage = https://github.com/haiwen/seafile-clients;
     description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index bcdc3cd8342..b9d74bee83d 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -57,7 +57,7 @@ in stdenv.mkDerivation {
   buildInputs = [ patchelf makeWrapper ];
 
   meta = {
-    homepage = "https://spideroak.com";
+    homepage = https://spideroak.com;
     description = "Secure online backup and sychronization";
     license = stdenv.lib.licenses.unfree;
     maintainers = with stdenv.lib.maintainers; [ amorsillo ];
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 0888e0207a6..6dd6b5ebced 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -21,7 +21,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Command line program to sync files and directories to and from major cloud storage";
-    homepage = "http://rclone.org";
+    homepage = http://rclone.org;
     license = licenses.mit;
     maintainers = with maintainers; [ danielfullmer ];
     platforms = platforms.all;
diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix
index 4858a9f8bb9..96a518a7a28 100644
--- a/pkgs/applications/office/antiword/default.nix
+++ b/pkgs/applications/office/antiword/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   installTargets = "global_install";
 
   meta = {
-    homepage = "http://www.winfield.demon.nl/";
+    homepage = http://www.winfield.demon.nl/;
     description = "Convert MS Word documents to plain text or PostScript";
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix
index 7b15ec347a9..119fb6bb075 100644
--- a/pkgs/applications/office/ledger/2.6.3.nix
+++ b/pkgs/applications/office/ledger/2.6.3.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   meta = {
-    homepage = "http://ledger-cli.org/";
+    homepage = http://ledger-cli.org/;
     description = "A double-entry accounting system with a command-line reporting interface";
     license = "BSD";
 
diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 07726ba90a4..a459909764e 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://ledger-cli.org/";
+    homepage = http://ledger-cli.org/;
     description = "A double-entry accounting system with a command-line reporting interface";
     license = stdenv.lib.licenses.bsd3;
 
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index e24d96257b2..07a09fbfc0a 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "A personal document manager for scanned documents";
-    homepage = "https://github.com/jflesch/paperwork";
+    homepage = https://github.com/jflesch/paperwork;
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.aszlig ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index 869a88fe2ab..6a43f6ea24e 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Apps/Planner";
+    homepage = https://wiki.gnome.org/Apps/Planner;
     description = "Project management application for GNOME";
     longDescription = ''
       Planner is the GNOME project management tool.
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index 70d4a0bf888..faecc3f4227 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "Simple plaintext todo list manager";
-    homepage = "http://todotxt.com";
+    homepage = http://todotxt.com;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix
index e41b0e4683f..76ad47950c4 100644
--- a/pkgs/applications/office/tudu/default.nix
+++ b/pkgs/applications/office/tudu/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "ncurses-based hierarchical todo list manager with vim-like keybindings";
-    homepage = "http://code.meskio.net/tudu/";
+    homepage = http://code.meskio.net/tudu/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 0e9f2eba1d1..a4b15b6626e 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
   installCheckPhase = "$out/bin/zotero --version";
 
   meta = with stdenv.lib; {
-    homepage = "https://www.zotero.org";
+    homepage = https://www.zotero.org;
     description = "Collect, organize, cite, and share your research sources";
     license = licenses.agpl3;
     platforms = platforms.linux;
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index d28aa8e62a1..674aa666b7e 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Free space simulation";
-    homepage = "http://www.shatters.net/celestia/";
+    homepage = http://www.shatters.net/celestia/;
     license = stdenv.lib.licenses.gpl2;
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index eb5506e7490..02723530ba1 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   preConfigure = "./autogen.sh";
 
   meta = {
-    homepage = "http://gravit.slowchop.com";
+    homepage = http://gravit.slowchop.com;
     description = "Beautiful OpenGL-based gravity simulator";
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index da6aa38d746..886a98f2e6b 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "Free open-source planetarium";
-    homepage = "http://stellarium.org/";
+    homepage = http://stellarium.org/;
     license = licenses.gpl2;
 
     platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 917863d1ba1..a2a40f0acc8 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://www.broadinstitute.org/igv/";
+    homepage = https://www.broadinstitute.org/igv/;
     description = "A visualization tool for interactive exploration of genomic datasets";
     license = licenses.lgpl21;
     platforms = platforms.unix;
diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix
index eb4d2714a12..06fc1ef641b 100644
--- a/pkgs/applications/science/biology/plink-ng/default.nix
+++ b/pkgs/applications/science/biology/plink-ng/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A comprehensive update to the PLINK association analysis toolset";
-    homepage = "https://www.cog-genomics.org/plink2";
+    homepage = https://www.cog-genomics.org/plink2;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix
index 009e12aa02f..cc48a0cb13a 100644
--- a/pkgs/applications/science/biology/plink/default.nix
+++ b/pkgs/applications/science/biology/plink/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   
   meta = {
     description = "Whole genome association toolkit";
-    homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/";
+    homepage = http://pngu.mgh.harvard.edu/~purcell/plink/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
     broken = true;
diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index ed208014f7d..39c027706ee 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -45,7 +45,7 @@ python3Packages.buildPythonApplication {
 
   meta = {
     description = description;
-    homepage = "https://www.pymol.org/";
+    homepage = https://www.pymol.org/;
     license = licenses.psfl;
   };
 }
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index a7dcbb675f5..506cdcd4037 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Free Software EDA Suite";
-    homepage = "http://www.kicad-pcb.org/";
+    homepage = http://www.kicad-pcb.org/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index dfcdac20ae0..2588ee39add 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
-    homepage = "http://ngspice.sourceforge.net";
+    homepage = http://ngspice.sourceforge.net;
     license = with licenses; [ "BSD" gpl2 ];
     maintainers = with maintainers; [ viric rongcuid ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix
index 4b4d21aca00..56bc66eb3ca 100644
--- a/pkgs/applications/science/electronics/qfsm/default.nix
+++ b/pkgs/applications/science/electronics/qfsm/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Graphical editor for finite state machines";
-    homepage = "http://qfsm.sourceforge.net/";
+    homepage = http://qfsm.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix
index 2a3f17b670b..aca1f9a3589 100644
--- a/pkgs/applications/science/electronics/tkgate/1.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/1.x.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor";
-    homepage = "http://www.tkgate.org/";
+    homepage = http://www.tkgate.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.peti ];
     hydraPlatforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix
index 9dd25473683..3a2dbf180ee 100644
--- a/pkgs/applications/science/geometry/tetgen/1.4.nix
+++ b/pkgs/applications/science/geometry/tetgen/1.4.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
-    homepage = "http://tetgen.org/";
+    homepage = http://tetgen.org/;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix
index 904fb6c7d49..b655cc48c73 100644
--- a/pkgs/applications/science/geometry/tetgen/default.nix
+++ b/pkgs/applications/science/geometry/tetgen/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = {
     inherit version;
     description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
-    homepage = "http://tetgen.org/";
+    homepage = http://tetgen.org/;
     license = stdenv.lib.licenses.agpl3Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index 9c8ecd01639..94b292d6588 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
                  + " " + optionalString installEmacsMode "install-emacs";
 
   meta = with stdenv.lib; {
-    homepage = "http://www.loria.fr/equipes/calligramme/acg";
+    homepage = http://www.loria.fr/equipes/calligramme/acg;
     description = "A toolkit for developing ACG signatures and lexicon";
     license = licenses.cecill20;
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix
index ec4e530ae52..87b847087e3 100644
--- a/pkgs/applications/science/logic/coq/8.3.nix
+++ b/pkgs/applications/science/logic/coq/8.3.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
       together with an environment for semi-interactive development of
       machine-checked proofs.
     '';
-    homepage = "http://coq.inria.fr";
+    homepage = http://coq.inria.fr;
     license = licenses.lgpl21;
     branch = "8.3";
     maintainers = with maintainers; [ roconnor vbgl ];
diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix
index 32007ba45ce..34505192021 100644
--- a/pkgs/applications/science/logic/coq/8.4.nix
+++ b/pkgs/applications/science/logic/coq/8.4.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
       together with an environment for semi-interactive development of
       machine-checked proofs.
     '';
-    homepage = "http://coq.inria.fr";
+    homepage = http://coq.inria.fr;
     license = licenses.lgpl21;
     branch = coq-version;
     maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index 8d3fb19b263..209cba07c43 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
       together with an environment for semi-interactive development of
       machine-checked proofs.
     '';
-    homepage = "http://coq.inria.fr";
+    homepage = http://coq.inria.fr;
     license = licenses.lgpl21;
     branch = coq-version;
     maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index fd3655ce9e9..f93856e90e1 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -129,7 +129,7 @@ self = stdenv.mkDerivation {
       together with an environment for semi-interactive development of
       machine-checked proofs.
     '';
-    homepage = "http://coq.inria.fr";
+    homepage = http://coq.inria.fr;
     license = licenses.lgpl21;
     branch = coq-version;
     maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix
index 9bfbcc3f30d..65a0f72da5e 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/applications/science/logic/cubicle/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An open source model checker for verifying safety properties of array-based systems";
-    homepage = "http://cubicle.lri.fr/";
+    homepage = http://cubicle.lri.fr/;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ lucas8 ];
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix
index 505d09ef390..82fad1134bc 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/pkgs/applications/science/logic/cvc3/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       [ raskin ];
     platforms = platforms.linux;
     license = licenses.free;
-    homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html";
+    homepage = http://www.cs.nyu.edu/acsys/cvc3/index.html;
   };
   passthru = {
     updateInfo = {
diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix
index e931c6fcf9d..5eb33daefe8 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation {
       implementing combinations of deduction, execution and property
       checking.
     '';
-    homepage = "http://hol.sourceforge.net/";
+    homepage = http://hol.sourceforge.net/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ mudri ];
     platforms = with platforms; linux;
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
index 50ef1edf63e..db784237ea9 100644
--- a/pkgs/applications/science/logic/logisim/default.nix
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   '';
   
   meta = {
-    homepage = "http://ozark.hendrix.edu/~burch/logisim";
+    homepage = http://ozark.hendrix.edu/~burch/logisim;
     description = "Educational tool for designing and simulating digital logic circuits";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix
index d980afee7c4..4b2116680d5 100644
--- a/pkgs/applications/science/logic/minisat/default.nix
+++ b/pkgs/applications/science/logic/minisat/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ gebner raskin ];
     platforms = platforms.unix;
     license = licenses.mit;
-    homepage = "http://minisat.se/";
+    homepage = http://minisat.se/;
   };
 }
diff --git a/pkgs/applications/science/logic/minisat/unstable.nix b/pkgs/applications/science/logic/minisat/unstable.nix
index 9d63f32c544..f1a42f8215e 100644
--- a/pkgs/applications/science/logic/minisat/unstable.nix
+++ b/pkgs/applications/science/logic/minisat/unstable.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ mic92 ];
     platforms = platforms.unix;
     license = licenses.mit;
-    homepage = "http://minisat.se/";
+    homepage = http://minisat.se/;
   };
 }
diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix
index 6129eaadc89..f9f021b15f0 100644
--- a/pkgs/applications/science/logic/opensmt/default.nix
+++ b/pkgs/applications/science/logic/opensmt/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     license = licenses.gpl3;
-    homepage = "http://code.google.com/p/opensmt/";
+    homepage = http://code.google.com/p/opensmt/;
     broken = true;
     downloadPage = "http://code.google.com/p/opensmt/downloads/list";
   };
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix
index 43c2ae141b7..74e31d062f4 100644
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.cs.unm.edu/~mccune/mace4/";
+    homepage = http://www.cs.unm.edu/~mccune/mace4/;
     license = "GPL";
     description = "Automated theorem prover for first-order and equational logic";
     longDescription = ''
diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix
index 49245c73f2c..9da2647d113 100644
--- a/pkgs/applications/science/logic/redprl/default.nix
+++ b/pkgs/applications/science/logic/redprl/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   '';
   meta = {
     description = "A proof assistant for Nominal Computational Type Theory";
-    homepage = "http://www.redprl.org/";
+    homepage = http://www.redprl.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.acowley ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index 6f42ff15a22..c22bff9cdee 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
     downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php";
-    homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php";
+    homepage = http://www.ps.uni-saarland.de/~cebrown/satallax/index.php;
     updateWalker = true;
   };
 }
diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix
index 515b7e27289..e0b0bc11f05 100644
--- a/pkgs/applications/science/math/LiE/default.nix
+++ b/pkgs/applications/science/math/LiE/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A Computer algebra package for Lie group computations";
-    homepage = "http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/";
+    homepage = http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/;
     license = stdenv.lib.licenses.lgpl3; # see the website
 
     longDescription = ''
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index e75ae2222ae..5adece31370 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.r-project.org/";
+    homepage = http://www.r-project.org/;
     description = "Free software environment for statistical computing and graphics";
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix
index 879ad96a936..6d1c778d1e0 100644
--- a/pkgs/applications/science/math/eukleides/default.nix
+++ b/pkgs/applications/science/math/eukleides/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Geometry Drawing Language";
-    homepage = "http://www.eukleides.org/";
+    homepage = http://www.eukleides.org/;
     license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index dbd28cf9e8c..05f09e4aedb 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2 ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://home.math.au.dk/jensen/software/gfan/gfan.html";
+    homepage = http://home.math.au.dk/jensen/software/gfan/gfan.html;
   };
 }
diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix
index 4de4a0c261d..6a49976c86b 100644
--- a/pkgs/applications/science/math/mathematica/10.nix
+++ b/pkgs/applications/science/math/mathematica/10.nix
@@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Wolfram Mathematica computational software system";
-    homepage = "http://www.wolfram.com/mathematica/";
+    homepage = http://www.wolfram.com/mathematica/;
     license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
index 07a20b4ebe0..c4fd0c384c1 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Wolfram Mathematica computational software system";
-    homepage = "http://www.wolfram.com/mathematica/";
+    homepage = http://www.wolfram.com/mathematica/;
     license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 1a9adcd4782..f11a23def6a 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Wolfram Mathematica computational software system";
-    homepage = "http://www.wolfram.com/mathematica/";
+    homepage = http://www.wolfram.com/mathematica/;
     license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 5a19f73d9cf..0ba1212567f 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation ({
 
   meta = {
     description = "Computer algebra system";
-    homepage = "http://maxima.sourceforge.net";
+    homepage = http://maxima.sourceforge.net;
     license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 7503c50c6d2..36ac84ece25 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.asl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://pallini.di.uniroma1.it/";
+    homepage = http://pallini.di.uniroma1.it/;
   };
 }
diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix
index 55293e6c8a7..2d150d0c30e 100644
--- a/pkgs/applications/science/math/perseus/default.nix
+++ b/pkgs/applications/science/math/perseus/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
       around datasets arising from point samples, images, distance
       matrices and so forth.
     '';
-    homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html";
+    homepage = http://www.sas.upenn.edu/~vnanda/perseus/index.html;
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [erikryb];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix
index e74e17fa44f..02d24d601b1 100644
--- a/pkgs/applications/science/math/pssp/default.nix
+++ b/pkgs/applications/science/math/pssp/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://www.gnu.org/software/pspp/";
+    homepage = http://www.gnu.org/software/pspp/;
     description = "A free replacement for SPSS, a program for statistical analysis of sampled data";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix
index 1e99b8782a9..82a6836bd62 100644
--- a/pkgs/applications/science/math/ratpoints/default.nix
+++ b/pkgs/applications/science/math/ratpoints/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/";
+    homepage = http://www.mathe2.uni-bayreuth.de/stoll/programs/;
     updateWalker = true;
   };
 }
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix
index 7f94b7408a1..b7453ecb01d 100644
--- a/pkgs/applications/science/math/ripser/default.nix
+++ b/pkgs/applications/science/math/ripser/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A lean C++ code for the computation of Vietoris–Rips persistence barcodes";
-    homepage = "https://github.com/Ripser/ripser";
+    homepage = https://github.com/Ripser/ripser;
     license = stdenv.lib.licenses.lgpl3;
     maintainers = with stdenv.lib.maintainers; [erikryb];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index e6630815ba1..bf3c7fcea98 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   installPhase = ''DESTDIR=$out make install'';
 
   meta = {
-    homepage = "http://www.sagemath.org";
+    homepage = http://www.sagemath.org;
     description = "A free open source mathematics software system";
     license = stdenv.lib.licenses.gpl2Plus;
     broken = true;
diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix
index 2e928bc8f34..3b01c684d52 100644
--- a/pkgs/applications/science/math/scotch/default.nix
+++ b/pkgs/applications/science/math/scotch/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, 
       and sparse matrix ordering.
     '';
-    homepage = "http://www.labri.fr/perso/pelegrin/scotch";
+    homepage = http://www.labri.fr/perso/pelegrin/scotch;
     license = stdenv.lib.licenses.cecill-c;
     maintainers = [ stdenv.lib.maintainers.bzizou ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 3fe8b542995..b098da060e0 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin ];
     platforms = subtractLists platforms.i686 platforms.linux;
     license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
-    homepage = "http://www.singular.uni-kl.de/index.php";
+    homepage = http://www.singular.uni-kl.de/index.php;
     downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
   };
 }
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index 0c87beb22df..a7212299aa6 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.publicDomain;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://www.symmetrica.de/";
+    homepage = http://www.symmetrica.de/;
   };
 }
diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index cfc63a50165..18cb2689063 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.cs.waikato.ac.nz/ml/weka/";
+    homepage = http://www.cs.waikato.ac.nz/ml/weka/;
     description = "Collection of machine learning algorithms for data mining tasks";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainer = [stdenv.lib.maintainers.mimadrid];
diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix
index 7cdacc1738b..b0471b80e2f 100644
--- a/pkgs/applications/science/medicine/aliza/default.nix
+++ b/pkgs/applications/science/medicine/aliza/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Medical imaging software with 2D, 3D and 4D capabilities";
-    homepage = "http://www.aliza-dicom-viewer.com";
+    homepage = http://www.aliza-dicom-viewer.com;
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ mounium ];
   };
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index d36b0f0b4d9..d5ffe9cd9ba 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.cytoscape.org";
+    homepage = http://www.cytoscape.org;
     description = "A general platform for complex network analysis and visualization";
     license = stdenv.lib.licenses.lgpl21;
     maintainers = [stdenv.lib.maintainers.mimadrid];
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index c13169041aa..cc961c8d392 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    homepage = "https://root.cern.ch/";
+    homepage = https://root.cern.ch/;
     description = "A data analysis framework";
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ veprbl ];
diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
index 35ab5348368..9a89b88d7a5 100644
--- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       funding from the DOE. It is an open-source code, distributed freely
       under the terms of the GNU Public License (GPL).
       '';
-    homepage = "http://lammps.sandia.gov";
+    homepage = http://lammps.sandia.gov;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix
index cc4edd54b56..6301acdf134 100644
--- a/pkgs/applications/version-management/bugseverywhere/default.nix
+++ b/pkgs/applications/version-management/bugseverywhere/default.nix
@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
 
     meta = with stdenv.lib; {
         description = "Bugtracker supporting distributed revision control";
-        homepage = "http://www.bugseverywhere.org/";
+        homepage = http://www.bugseverywhere.org/;
         license = licenses.gpl2Plus;
         platforms = platforms.all;
         maintainers = [ maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index eae18c39dad..ed207a1e7d9 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -11,7 +11,7 @@ mkDerivation rec {
     description = "Export an RCS or CVS history as a fast-import stream";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ dfoxfranke ];
-    homepage = "http://www.catb.org/esr/cvs-fast-export/";
+    homepage = http://www.catb.org/esr/cvs-fast-export/;
     platforms = platforms.all;
   };
 
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 7ad3aac61d9..8c69517a750 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   buildInputs = [ nano ];
 
   meta = {
-    homepage = "http://cvs.nongnu.org";
+    homepage = http://cvs.nongnu.org;
     description = "Concurrent Versions System - a source control system";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
index b2324581244..b2a4bc66c69 100644
--- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
@@ -27,7 +27,7 @@ in
     '';
 
     meta = with stdenv.lib; {
-      homepage = "https://rtyley.github.io/bfg-repo-cleaner/";
+      homepage = https://rtyley.github.io/bfg-repo-cleaner/;
       # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner
       description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster";
       longDescription = ''
diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
index f7c6ef25b73..1af1870928b 100644
--- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Converts a Darcs repository into a Git repository";
-    homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git";
+    homepage = http://www.sanityinc.com/articles/converting-darcs-repositories-to-git;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index 517602bb633..e5e67605970 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://www.agwa.name/projects/git-crypt";
+    homepage = https://www.agwa.name/projects/git-crypt;
     description = "Transparent file encryption in git";
     longDescription = ''
       git-crypt enables transparent encryption and decryption of files in a git
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 547f5f997b9..f30813cf120 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/felipec/git-remote-hg";
+    homepage = https://github.com/felipec/git-remote-hg;
     description = "Semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones";
     license = licenses.gpl2;
     maintainers = [ maintainers.garbas ];
diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
index afb01ff4a89..044800fe73a 100644
--- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://josefsson.org/git2cl/";
+    homepage = http://josefsson.org/git2cl/;
     description = "Convert git logs to GNU style ChangeLog files";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 955fe90ff11..7130e057d97 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   checkTarget = "test";
 
   meta = {
-    homepage = "http://procode.org/stgit/";
+    homepage = http://procode.org/stgit/;
     description = "A patch manager implemented on top of Git";
     license = "GPL";
 
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 8a0cd898262..f5e5fddd3b7 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://jonas.github.io/tig/";
+    homepage = https://jonas.github.io/tig/;
     description = "Text-mode interface for git";
     maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ];
     license = licenses.gpl2;
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index 441c28bd45b..c183bbde7e6 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://github.com/greenrd/topgit";
+    homepage = https://github.com/greenrd/topgit;
     description = "TopGit manages large amount of interdependent topic branches";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 886efefa8bb..808e7b1850d 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       parts of the development workflow. Repo is not meant to replace Git, only
       to make it easier to work with Git.
     '';
-    homepage = "https://android.googlesource.com/tools/repo";
+    homepage = https://android.googlesource.com/tools/repo;
     license = licenses.asl20;
     maintainers = [ maintainers.primeos ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index 080894bc80e..a824b55fca8 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
   doCheck = false;
 
   meta = {
-    homepage = "https://github.com/openstack-infra/git-review";
+    homepage = https://github.com/openstack-infra/git-review;
     description = "Tool to submit code to Gerrit";
     license = stdenv.lib.licenses.asl20;
   };
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index c8af3fe63f9..49243a823ed 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -43,7 +43,7 @@ buildGoPackage rec {
 
   meta = {
     description = "A painless self-hosted Git service";
-    homepage = "https://gogs.io";
+    homepage = https://gogs.io;
     license = licenses.mit;
     maintainers = [ maintainers.schneefux ];
   };
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 244a95447a9..01d1a21f3a7 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -62,7 +62,7 @@ in python2Packages.buildPythonApplication {
   meta = {
     inherit version;
     description = "A fast, lightweight SCM system for very large distributed projects";
-    homepage = "http://mercurial.selenic.com/";
+    homepage = http://mercurial.selenic.com/;
     downloadPage = "http://mercurial.selenic.com/release/";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.eelco ];
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix
index 2408621b9cf..238d527ce38 100644
--- a/pkgs/applications/version-management/reposurgeon/default.nix
+++ b/pkgs/applications/version-management/reposurgeon/default.nix
@@ -13,7 +13,7 @@ in mkDerivation rec {
     description = "A tool for editing version-control repository history";
     version = "3.28";
     license = licenses.bsd3;
-    homepage = "http://www.catb.org/esr/reposurgeon/";
+    homepage = http://www.catb.org/esr/reposurgeon/;
     maintainers = with maintainers; [ dfoxfranke ];
     platforms = platforms.all;
   };
diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix
index 059c4fc344c..903932ccbec 100644
--- a/pkgs/applications/version-management/srcml/default.nix
+++ b/pkgs/applications/version-management/srcml/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Infrastructure for exploration, analysis, and manipulation of source code";
-    homepage = "http://www.srcml.org";
+    homepage = http://www.srcml.org;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ leenaars ];
   };
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 6587b25ef94..f0185e187bb 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/TheLocehiliosan/yadm";
+    homepage = https://github.com/TheLocehiliosan/yadm;
     description = "Yet Another Dotfiles Manager";
     longDescription = ''
     yadm is a dotfile management tool with 3 main features: Manages files across
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 0caeed499f8..5dae78a3e8c 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -43,7 +43,7 @@ let
                   ;
 
     meta = {
-      homepage = "http://fixounet.free.fr/avidemux/";
+      homepage = http://fixounet.free.fr/avidemux/;
       description = "Free video editor designed for simple video editing tasks";
       maintainers = with stdenv.lib.maintainers; [ viric abbradar ];
       platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index bffb038f653..a9e2654f731 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Powerful and easy-to-use multimedia player";
-    homepage = "https://bomi-player.github.io/";
+    homepage = https://bomi-player.github.io/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.abbradar ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index 047f2301185..7e87f03725f 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "DVD backup and DVD authoring program";
-    homepage = "http://k9copy-reloaded.sourceforge.net/";
+    homepage = http://k9copy-reloaded.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ flosse ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 51ff8fece63..6897f9df1a1 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -19,7 +19,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = "http://forum.kodi.tv/showthread.php?tid=85724";
+      homepage = http://forum.kodi.tv/showthread.php?tid=85724;
       description = "A program launcher for Kodi";
       longDescription = ''
         Advanced Launcher allows you to start any Linux, Windows and
@@ -49,7 +49,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = "http://forum.kodi.tv/showthread.php?tid=287826";
+      homepage = http://forum.kodi.tv/showthread.php?tid=287826;
       description = "A program launcher for Kodi";
       longDescription = ''
         Advanced Emulator Launcher is a multi-emulator front-end for Kodi
@@ -184,7 +184,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = "http://forum.kodi.tv/showthread.php?tid=67110";
+      homepage = http://forum.kodi.tv/showthread.php?tid=67110;
       description = "Watch content from SVT Play";
       longDescription = ''
         With this addon you can stream content from SVT Play
@@ -234,7 +234,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = "http://forum.kodi.tv/showthread.php?tid=157499";
+      homepage = http://forum.kodi.tv/showthread.php?tid=157499;
       description = "Launch Steam in Big Picture Mode from Kodi";
       longDescription = ''
         This add-on will close/minimise Kodi, launch Steam in Big
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 5ca530cfe9d..3a297abb15c 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -81,7 +81,7 @@ in buildPythonApplication rec {
   ] ++ optional enableBonjour avahi;
 
   meta = {
-    homepage = "http://www.getmiro.com/";
+    homepage = http://www.getmiro.com/;
     description = "Video and audio feed aggregator";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.aszlig ];
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 89ac0b91b44..8e28f77ffee 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -204,7 +204,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A movie player that supports many video formats";
-    homepage = "http://mplayerhq.hu";
+    homepage = http://mplayerhq.hu;
     license = "GPL";
     maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix
index 9e36f790c78..d8f18f97ad9 100644
--- a/pkgs/applications/video/mpv/scripts/convert.nix
+++ b/pkgs/applications/video/mpv/scripts/convert.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Convert parts of a video while you are watching it in mpv";
-    homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0";
+    homepage = https://gist.github.com/Zehkul/25ea7ae77b30af959be0;
     maintainers = [ lib.maintainers.profpatsch ];
     longDescription = ''
       When this script is loaded into mpv, you can hit Alt+W to mark the beginning
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 4320022192a..71bb0405111 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ];
 
   meta = with stdenv.lib; {
-    homepage = "https://www.mythtv.org/";
+    homepage = https://www.mythtv.org/;
     description = "Open Source DVR";
     license = licenses.gpl2;
     meta.platforms = platforms.linux;
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 0aebb4dcb64..cddd2af7ae2 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
       Software", software originally designed for recording and streaming live
       video content, efficiently
     '';
-    homepage = "https://obsproject.com";
+    homepage = https://obsproject.com;
     maintainers = with maintainers; [ jb55 MP2E ];
     license = licenses.gpl2;
     platforms = with platforms; linux;
diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix
index c9cffe3fa96..1244421210e 100644
--- a/pkgs/applications/video/p2pvc/default.nix
+++ b/pkgs/applications/video/p2pvc/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A point to point color terminal video chat";
-    homepage = "https://github.com/mofarrell/p2pvc";
+    homepage = https://github.com/mofarrell/p2pvc;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ trino ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index 310ac974fca..412cc1ad272 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig cmake gettext libgphoto2 gphoto2 libxml2 libv4l ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.qstopmotion.org";
+    homepage = http://www.qstopmotion.org;
     description = "Create stopmotion animation with a (web)camera";
     longDescription = ''
       Qstopmotion is a tool to create stopmotion
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index ea5af4ab118..187f869bcfa 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A complete front-end for MPlayer";
-    homepage = "http://smplayer.sourceforge.net/";
+    homepage = http://smplayer.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index b10495434b9..67905033ba1 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Simple GUI screencast recorder, using ffmpeg";
-    homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html";
+    homepage = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html;
     longDescription = ''
       vokoscreen is an easy to use screencast creator to record
       educational videos, live recordings of browser, installation,
diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix
index b7f95fccda3..d85e4df7434 100644
--- a/pkgs/applications/video/zdfmediathk/default.nix
+++ b/pkgs/applications/video/zdfmediathk/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
-    homepage = "https://github.com/xaverW/MediathekView/";
+    homepage = https://github.com/xaverW/MediathekView/;
     license = licenses.gpl3;
     maintainers = [ maintainers.flosse ];
     platforms = platforms.all;
diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
index faa1076e299..069d5836a42 100644
--- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
+++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation  {
 
   meta = with stdenv.lib; {
     description = "Xen Subproject: Windows PV Driver";
-    homepage = "http://xenproject.org/downloads/windows-pv-drivers.html";
+    homepage = http://xenproject.org/downloads/windows-pv-drivers.html;
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;
     license = licenses.bsd3;
diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix
index 97a1f0b3039..1fa3e76d18f 100644
--- a/pkgs/applications/virtualization/driver/win-qemu/default.nix
+++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation  {
 
   meta = with stdenv.lib; {
     description = "Windows QEMU Drivers";
-    homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers";
+    homepage = https://fedoraproject.org/wiki/Windows_Virtio_Drivers;
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
index c4684a20914..39ca93d4e1a 100644
--- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
+++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation  {
       The drivers are signed by Univention with a Software Publishers
       Certificate obtained from the VeriSign CA.
       '';
-    homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers";
+    homepage = http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers;
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix
index 689d36e7110..19a28410d5c 100644
--- a/pkgs/applications/virtualization/driver/win-spice/default.nix
+++ b/pkgs/applications/virtualization/driver/win-spice/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation  {
 
   meta = with stdenv.lib; {
     description = ''Windows SPICE Drivers'';
-    homepage = "http://www.spice-space.org";
+    homepage = http://www.spice-space.org;
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 5cf2e0a3062..f7a2f6e6f30 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation  {
 
   meta = with stdenv.lib; {
     description = "Windows VirtIO Drivers";
-    homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers";
+    homepage = https://fedoraproject.org/wiki/Windows_Virtio_Drivers;
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 4c0e0f11e7b..14aaef5709a 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/vmware/open-vm-tools";
+    homepage = https://github.com/vmware/open-vm-tools;
     description = "Set of tools for VMWare guests to improve host-guest interaction";
     longDescription = ''
       A set of services and modules that enable several features in VMware products for 
diff --git a/pkgs/applications/virtualization/rancher-compose/default.nix b/pkgs/applications/virtualization/rancher-compose/default.nix
index 5980141d8b9..57aa6809d6c 100644
--- a/pkgs/applications/virtualization/rancher-compose/default.nix
+++ b/pkgs/applications/virtualization/rancher-compose/default.nix
@@ -22,7 +22,7 @@ let
 
     meta = with lib; {
       description = "Docker compose compatible client to deploy to Rancher";
-      homepage = "https://docs.rancher.com/rancher/rancher-compose/";
+      homepage = https://docs.rancher.com/rancher/rancher-compose/;
       license = licenses.asl20;
       platforms = platforms.unix;
       maintainers = [maintainers.mic92];
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
index c519784a623..0e45b836b01 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Lightweight Virtualization on OS X Based on bhyve";
-    homepage = "https://github.com/mist64/xhyve";
+    homepage = https://github.com/mist64/xhyve;
     maintainers = [ lib.maintainers.lnl7 ];
     platforms = lib.platforms.darwin;
   };
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 50c342269c7..116180f5ec3 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   installPhase = "make install DESTDIR=$out PREFIX=\"\"";
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/venam/2bwm";
+    homepage = https://github.com/venam/2bwm;
     description = "A fast floating WM written over the XCB library and derived from mcwm";
     license = licenses.mit;
     maintainers =  [ maintainers.sternenseemann ];
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 240bc19dd45..dc6c30d00e4 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Compoziting window manager";
-    homepage = "http://launchpad.net/compiz/";
+    homepage = http://launchpad.net/compiz/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index 8388e387075..17baffbe8c7 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/chjj/compton/";
+    homepage = https://github.com/chjj/compton/;
     description = "A fork of XCompMgr, a sample compositing manager for X servers";
     longDescription = ''
       A fork of XCompMgr, which is a sample compositing manager for X
diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index c2f9bec33c2..9f6c8937518 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   buildPhase = " make ";
  
   meta = {
-    homepage = "http://suckless.org/";
+    homepage = http://suckless.org/;
     description = "Dynamic window manager for X";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix
index 27f80023bb3..56ae70dce08 100644
--- a/pkgs/applications/window-managers/evilwm/default.nix
+++ b/pkgs/applications/window-managers/evilwm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   inherit patches;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.6809.org.uk/evilwm/";
+    homepage = http://www.6809.org.uk/evilwm/;
     description = "Minimalist window manager for the X Window System";
 
     license = {
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index 75df68427aa..7587dcb490a 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional gestures libstroke;
 
   meta = {
-    homepage = "http://fvwm.org";
+    homepage = http://fvwm.org;
     description = "A multiple large virtual desktop window manager";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index 024c9e5c796..3bf089f8354 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A manual tiling window manager for X";
-    homepage = "http://herbstluftwm.org/";
+    homepage = http://herbstluftwm.org/;
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 85136cb9f97..892fe7ba4e7 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   preConfigure = "./autogen.sh";
 
   meta = {
-    homepage = "http://joewing.net/projects/jwm/";
+    homepage = http://joewing.net/projects/jwm/;
     description = "Joe's Window Manager is a light-weight X11 window manager";
     license = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index fec3ae63132..9879ffd64df 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.nongnu.org/ratpoison/";
+    homepage = http://www.nongnu.org/ratpoison/;
     description = "Simple mouse-free tiling window manager";
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
index 11e5460fecb..0102fb05d8e 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Alsa mixer application for Windowmaker";
-    homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app";
+    homepage = http://windowmaker.org/dockapps/?name=AlsaMixer.app;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.bstrik ];
   };
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
index 6fe49745fa7..e211abe0ea5 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "System monitor for Windowmaker";
-    homepage = "http://linux-bsd-unix.strefa.pl";
+    homepage = http://linux-bsd-unix.strefa.pl;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.bstrik ];
   };
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
index e7994eaf05f..80a24635f67 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Systemtray for Windowmaker";
-    homepage = "http://wmsystemtray.sourceforge.net";
+    homepage = http://wmsystemtray.sourceforge.net;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.bstrik ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index 0ca38b9b04e..bea7c99a511 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   makeFlags = "WMII_HGVERSION=hg${rev}";
 
   meta = {
-    homepage = "https://code.google.com/archive/p/wmii/";
+    homepage = https://code.google.com/archive/p/wmii/;
     description = "A small window manager controlled by a 9P filesystem";
     maintainers = with stdenv.lib.maintainers; [ kovirobi ];
     license = stdenv.lib.licenses.mit;
diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix
index b09dfebfd12..f27e7a953dd 100644
--- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   patches = [ ./fix-paths.patch ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/alexkay/xmonad-log-applet";
+    homepage = http://github.com/alexkay/xmonad-log-applet;
     license = licenses.bsd3;
     description = "An applet that will display XMonad log information (${desktopSupport} version)";
     platforms = platforms.linux;
diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix
index e41b26d41fb..5659cac6703 100644
--- a/pkgs/data/documentation/mustache-spec/default.nix
+++ b/pkgs/data/documentation/mustache-spec/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       For a list of implementations and tips, see ${homepage}.
     '';
 
-    homepage = "http://mustache.github.io/";
+    homepage = http://mustache.github.io/;
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ profpatsch ];
     platforms = lib.platforms.all;
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 36416c6f827..cd3fe3e2dd2 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       Zeal is a simple offline API documentation browser inspired by Dash (OS X
       app), available for Linux and Windows.
     '';
-    homepage = "http://zealdocs.org/";
+    homepage = http://zealdocs.org/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix
index f948a9642ff..ba1f21c186e 100644
--- a/pkgs/data/fonts/baekmuk-ttf/default.nix
+++ b/pkgs/data/fonts/baekmuk-ttf/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Korean font";
-    homepage = "http://kldp.net/projects/baekmuk/";
+    homepage = http://kldp.net/projects/baekmuk/;
     license = "BSD-like";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix
index 9bc04182264..c514f1ab7fb 100644
--- a/pkgs/data/fonts/corefonts/default.nix
+++ b/pkgs/data/fonts/corefonts/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://corefonts.sourceforge.net/";
+    homepage = http://corefonts.sourceforge.net/;
     description = "Microsoft's TrueType core fonts for the Web";
     platforms = platforms.all;
     license = licenses.unfreeRedistributable;
diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix
index fd32f478b71..70730a7d8b7 100644
--- a/pkgs/data/fonts/droid/default.nix
+++ b/pkgs/data/fonts/droid/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Droid Family fonts by Google Android";
-    homepage = "https://github.com/google/fonts";
+    homepage = https://github.com/google/fonts;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.all;
     maintainers = [];
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index d0bf8d34714..560aed970bb 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open source emoji set";
-    homepage = "http://emojione.com/";
+    homepage = http://emojione.com/;
     license = licenses.cc-by-40;
     platforms = platforms.all;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix
index 55995f6d11d..bc564a80d92 100644
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       Font Awesome gives you scalable vector icons that can instantly be customized.
       This package includes only the TTF font. For full CSS etc. see the project website.
     '';
-    homepage = "http://fortawesome.github.io/Font-Awesome/";
+    homepage = http://fortawesome.github.io/Font-Awesome/;
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ abaldeau ];
diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix
index 2c7b1eea577..c6812e39ef8 100644
--- a/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://software.sil.org/gentium/";
+    homepage = http://software.sil.org/gentium/;
     description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
     maintainers = with maintainers; [ ];
     license = licenses.ofl;
diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix
index 9e4a88ab770..975c4c72a9c 100644
--- a/pkgs/data/fonts/gentium/default.nix
+++ b/pkgs/data/fonts/gentium/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://software.sil.org/gentium/";
+    homepage = http://software.sil.org/gentium/;
     description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
     longDescription = ''
       Gentium is a typeface family designed to enable the diverse ethnic groups
diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix
index 3bca2437914..51d2b8b9c11 100644
--- a/pkgs/data/fonts/hasklig/default.nix
+++ b/pkgs/data/fonts/hasklig/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/i-tu/Hasklig";
+    homepage = https://github.com/i-tu/Hasklig;
     description = "A font with ligatures for Haskell code based off Source Code Pro";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 053a3ae76c1..78519ff8c9b 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://be5invis.github.io/Iosevka/";
+    homepage = http://be5invis.github.io/Iosevka/;
     downloadPage = "https://github.com/be5invis/Iosevka/releases";
     description = ''
       Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix
index 3680205e23b..7b990327286 100644
--- a/pkgs/data/fonts/kawkab-mono/default.nix
+++ b/pkgs/data/fonts/kawkab-mono/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An arab fixed-width font";
-    homepage = "http://makkuk.com/kawkab-mono/";
+    homepage = http://makkuk.com/kawkab-mono/;
     license = stdenv.lib.licenses.ofl;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix
index e02ee967b67..8f6d5ec8ad6 100644
--- a/pkgs/data/fonts/league-of-moveable-type/default.nix
+++ b/pkgs/data/fonts/league-of-moveable-type/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       well-made, free & open-source, @font-face ready fonts.
     '';
 
-    homepage = "https://www.theleagueofmoveabletype.com/";
+    homepage = https://www.theleagueofmoveabletype.com/;
 
     license = stdenv.lib.licenses.ofl;
 
diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix
index f90cb98b802..d75dcda6421 100644
--- a/pkgs/data/fonts/nafees/default.nix
+++ b/pkgs/data/fonts/nafees/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
       Al-Hussaini (Nafees Raqam) one of the finest calligraphers of
       Pakistan
     '';
-    homepage = "http://www.cle.org.pk/software/localization.htm";
+    homepage = http://www.cle.org.pk/software/localization.htm;
 
     # Used to be GPLv2.  The license distributed with the fonts looks
     # more like a modified BSD, but still contains the GPLv2 embedded
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index d0d831f8cc7..409dcce024b 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       number of additional glyphs from popular 'iconic fonts' such as Font
       Awesome, Devicons, Octicons, and others.
     '';
-    homepage = "https://github.com/ryanoasis/nerd-fonts";
+    homepage = https://github.com/ryanoasis/nerd-fonts;
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ];
     platforms = with platforms; unix;
diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix
index cc2a2617f34..9bd38409955 100644
--- a/pkgs/data/fonts/norwester/default.nix
+++ b/pkgs/data/fonts/norwester/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://jamiewilson.io/norwester";
+    homepage = http://jamiewilson.io/norwester;
     description = "A condensed geometric sans serif by Jamie Wilson";
     maintainers = with maintainers; [ leenaars ];
     license = licenses.ofl;
diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix
index c0d533ca620..dbcf84c9a74 100644
--- a/pkgs/data/fonts/opensans-ttf/default.nix
+++ b/pkgs/data/fonts/opensans-ttf/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       Open Sans is a humanist sans serif typeface designed by Steve Matteson,
       Type Director of Ascender Corp.
     '';
-    homepage = "http://en.wikipedia.org/wiki/Open_Sans";
+    homepage = http://en.wikipedia.org/wiki/Open_Sans;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix
index d68bf37f4da..fa34d9586c5 100644
--- a/pkgs/data/fonts/orbitron/default.nix
+++ b/pkgs/data/fonts/orbitron/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://www.theleagueofmoveabletype.com/orbitron";
+    homepage = https://www.theleagueofmoveabletype.com/orbitron;
     downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download";
     description = ''
      Geometric sans-serif for display purposes by Matt McInerney'';
diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix
index 7c7a8c530e2..1a9cf29c3e0 100644
--- a/pkgs/data/fonts/paratype-pt/mono.nix
+++ b/pkgs/data/fonts/paratype-pt/mono.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.paratype.ru/public/"; 
+    homepage = http://www.paratype.ru/public/; 
     description = "An open Paratype font";
 
     license = "Open Paratype license"; 
diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix
index fe9d3085470..89d9e9381e7 100644
--- a/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/pkgs/data/fonts/paratype-pt/sans.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.paratype.ru/public/"; 
+    homepage = http://www.paratype.ru/public/; 
     description = "An open Paratype font";
 
     license = "Open Paratype license"; 
diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix
index b0304c37386..323e10c8b7b 100644
--- a/pkgs/data/fonts/paratype-pt/serif.nix
+++ b/pkgs/data/fonts/paratype-pt/serif.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.paratype.ru/public/"; 
+    homepage = http://www.paratype.ru/public/; 
     description = "An open Paratype font";
 
     license = "Open Paratype license"; 
diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix
index c5ad1d1e1b6..382f3fa8f0f 100644
--- a/pkgs/data/fonts/siji/default.nix
+++ b/pkgs/data/fonts/siji/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://github.com/stark/siji";
+    homepage = https://github.com/stark/siji;
     description = "An iconic bitmap font based on Stlarch with additional glyphs";
     liscense = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index f5d065fd9c4..8679a8fd8ce 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "A set of monospaced OpenType fonts designed for coding environments";
     maintainers = with stdenv.lib.maintainers; [ relrod ];
     platforms = with stdenv.lib.platforms; all;
-    homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/";
+    homepage = http://blog.typekit.com/2012/09/24/source-code-pro/;
     license = stdenv.lib.licenses.ofl;
   };
 }
diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix
index 2b2a71bf7b4..cd83a96a72a 100644
--- a/pkgs/data/fonts/tewi/default.nix
+++ b/pkgs/data/fonts/tewi/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       particularily useful while programming, to fit a lot of code on your
       screen.
     '';
-    homepage = "https://github.com/lucy/tewi-font";
+    homepage = https://github.com/lucy/tewi-font;
     license = {
       fullName = "GNU General Public License with a font exception";
       url = "https://www.gnu.org/licenses/gpl-faq.html#FontException";
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
index d318f5db7a7..64e01124a67 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     license = http://unifoundry.com/LICENSE.txt;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://pelulamu.net/unscii/";
+    homepage = http://pelulamu.net/unscii/;
   };
 }
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix
index 12f8c1c741e..c3ba435cbbf 100644
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/khaledhosny/xits-math";
+    homepage = https://github.com/khaledhosny/xits-math;
     description = "OpenType implementation of STIX fonts with math support";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
index d1fa3654070..83cb2d749dd 100644
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Elementary icon theme";
-    homepage = "https://launchpad.net/elementaryicons";
+    homepage = https://launchpad.net/elementaryicons;
     license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = with maintainers; [ simonvandel ];
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 082fa29fa9d..6f9396d1b94 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Papirus icon theme for Linux";
-    homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme";
+    homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme;
     license = licenses.lgpl3;
     platforms = platforms.all;
   };
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix
index cf78a9f9901..b6def37def6 100644
--- a/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/pkgs/data/icons/vanilla-dmz/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     install -Dm644 DMZ-Black/index.theme $out/share/icons/Vanilla-DMZ-AA/index.theme
   '';
   meta = with lib; {
-    homepage = "http://jimmac.musichall.cz";
+    homepage = http://jimmac.musichall.cz;
     description = "A style neutral scalable cursor theme";
     platforms = platforms.all;
     license = licenses.cc-by-nc-sa-30;
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix
index 3db05bd4d51..1cbf5e2adaf 100644
--- a/pkgs/data/misc/ddccontrol-db/default.nix
+++ b/pkgs/data/misc/ddccontrol-db/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Monitor database for DDCcontrol";
-    homepage = "http://ddccontrol.sourceforge.net/";
+    homepage = http://ddccontrol.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ stdenv.lib.maintainers.pakhfn ];
diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix
index 2bdeb297764..4d824e6e8d7 100644
--- a/pkgs/data/misc/media-player-info/default.nix
+++ b/pkgs/data/misc/media-player-info/default.nix
@@ -25,7 +25,7 @@ in
 
     meta = with stdenv.lib; {
       description = "A repository of data files describing media player capabilities";
-      homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/";
+      homepage = http://www.freedesktop.org/wiki/Software/media-player-info/;
       license = licenses.bsd3;
       maintainers = with maintainers; [ ttuegel ];
       platforms = with platforms; linux;
diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix
index 578e0180ec3..7debe119aa1 100644
--- a/pkgs/data/soundfonts/fluid/default.nix
+++ b/pkgs/data/soundfonts/fluid/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Frank Wen's pro-quality GM/GS soundfont";
-    homepage = "http://www.hammersound.net/";
+    homepage = http://www.hammersound.net/;
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
index b33afb50e99..e7f687d9606 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.pygtk.org";
+    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/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index 9e099a17d27..f571cf8738f 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://pygtk.org/";
+    homepage = http://pygtk.org/;
     description = "Python wrapper for GNOME libraries";
     platforms = platforms.linux;
     license = licenses.lgpl2;
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index 36608f4294b..75db6255436 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tray status icon, which notifies us when new email arrives";
-    homepage = "http://www.nongnu.org/mailnotify/";
+    homepage = http://www.nongnu.org/mailnotify/;
     license = with licenses; [ gpl3 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.eleanor ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix
index 90209634fbf..ee8c3a902d5 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
 
   meta = {
-    homepage = "http://www.gnome.org";
+    homepage = http://www.gnome.org;
     description = "Gnome menu specification";
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix
index d0453ba8ebb..43e27cdb481 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    homepage = "https://developer.gnome.org/gtksourceviewmm/";
+    homepage = https://developer.gnome.org/gtksourceviewmm/;
     description = "C++ wrapper for gtksourceview";
     license = licenses.lgpl2;
     maintainers = [ maintainers.juliendehos ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
index 05344a33025..4141afeb821 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GNOME CSS2 parsing and manipulation toolkit";
-    homepage = "https://git.gnome.org/browse/libcroco";
+    homepage = https://git.gnome.org/browse/libcroco;
     license = licenses.lgpl2;
     platforms = platforms.unix;
   };
diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix
index 1ba143539d4..9f1f3096533 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A GObject-based plugins engine";
-    homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
+    homepage = http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
index bc42c900de9..cf200cb3292 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Apps/Nemiver";
+    homepage = https://wiki.gnome.org/Apps/Nemiver;
     description = "Easy to use standalone C/C++ debugger";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix
index 3d3e424d0da..a4cad01488d 100644
--- a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
+    homepage = https://wiki.gnome.org/Apps/Swell%20Foop;
     description = "Puzzle game, previously known as Same GNOME";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;
diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix
index 9793ff9c250..8c6eb596515 100644
--- a/pkgs/desktops/lxde/core/lxappearance/default.nix
+++ b/pkgs/desktops/lxde/core/lxappearance/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A lightweight program for configuring the theme and fonts of gtk applications";
-    homepage = "http://lxde.org/";
+    homepage = http://lxde.org/;
     maintainers = [ stdenv.lib.maintainers.hinton ];
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
index 27a5903a61b..b17ab4fda65 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool ];
 
   meta = {
-    homepage = "http://lxde.org/";
+    homepage = http://lxde.org/;
     license = stdenv.lib.licenses.gpl2;
     description = "Freedesktop.org desktop menus for LXDE";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index a05905547fd..1225f425b26 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Lightweight X11 desktop panel for LXDE";
-    homepage = "http://lxde.org/";
+    homepage = http://lxde.org/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.ryneeverett ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 197c5470d2b..089b54de15e 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   
   meta = {
     description = "A simple multi-page document viewer for the MATE desktop";
-    homepage = "http://mate-desktop.org";
+    homepage = http://mate-desktop.org;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index aea006fc486..d068f432ee9 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   
   meta = {
     description = "File manager for the MATE desktop";
-    homepage = "http://mate-desktop.org";
+    homepage = http://mate-desktop.org;
     license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index 7bd7a3f2770..a433104b1fa 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Common files for development of MATE packages";
-    homepage = "http://mate-desktop.org";
+    homepage = http://mate-desktop.org;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 2afd700d933..8854580a7ca 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library with common API for various MATE modules";
-    homepage = "http://mate-desktop.org";
+    homepage = http://mate-desktop.org;
     license = licenses.gpl2;
     platforms = platforms.unix;
   };
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index 3d820553b4a..ddc6d81499d 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   
   meta = {
     description = "Faenza icon theme from MATE";
-    homepage = "http://mate-desktop.org";
+    homepage = http://mate-desktop.org;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index ce0366b3669..3a2de515ba9 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Icon themes from MATE";
-    homepage = "http://mate-desktop.org";
+    homepage = http://mate-desktop.org;
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index fd907c56280..532e50c4549 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The MATE Terminal Emulator";
-    homepage = "http://mate-desktop.org";
+    homepage = http://mate-desktop.org;
     license = licenses.gpl3;
     platforms = platforms.unix;
   };
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 0a8b37b4e01..793c68e688a 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A set of themes from MATE";
-    homepage = "http://mate-desktop.org";
+    homepage = http://mate-desktop.org;
     license = stdenv.lib.licenses.lgpl21;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index a592a623510..e386f3a319a 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -90,7 +90,7 @@ let
               ];
               platforms = lib.platforms.linux;
               maintainers = with lib.maintainers; [ ttuegel ];
-              homepage = "http://www.kde.org";
+              homepage = http://www.kde.org;
             } // (args.meta or {});
           in
           mkDerivation (args // {
diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix
index e7edfd62151..8624cac09ed 100644
--- a/pkgs/desktops/rox/rox-filer/default.nix
+++ b/pkgs/desktops/rox/rox-filer/default.nix
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Fast, lightweight, gtk2 file manager";
-    homepage = "http://rox.sourceforge.net/desktop";
+    homepage = http://rox.sourceforge.net/desktop;
     license = with licenses; [ gpl2 lgpl2 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.eleanor ];
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index 69559a26c8f..4a1ec054361 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -46,7 +46,7 @@ let
     meta = {
       description = "Package manager for the Erlang VM https://hex.pm";
       license = stdenv.lib.licenses.mit;
-      homepage = "https://github.com/hexpm/hex";
+      homepage = https://github.com/hexpm/hex;
       maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
     };
 
diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix
index 6fc1587a38e..18abe1055b5 100644
--- a/pkgs/development/beam-modules/pgsql/default.nix
+++ b/pkgs/development/beam-modules/pgsql/default.nix
@@ -22,7 +22,7 @@ let
     meta = {
       description = "Erlang PostgreSQL Driver";
       license = stdenv.lib.licenses.mit;
-      homepage = "https://github.com/semiocast/pgsql";
+      homepage = https://github.com/semiocast/pgsql;
       maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
     };
 
diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix
index bf84ac286ba..61670d1f31c 100644
--- a/pkgs/development/beam-modules/webdriver/default.nix
+++ b/pkgs/development/beam-modules/webdriver/default.nix
@@ -28,7 +28,7 @@ let
     meta = {
       description = "WebDriver implementation in Erlang";
       license = stdenv.lib.licenses.mit;
-      homepage = "https://github.com/Quviq/webdrv";
+      homepage = https://github.com/Quviq/webdrv;
       maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
     };
 
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index c296f690fa5..678cdcc22cc 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3 ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://common-lisp.net/project/armedbear/";
+    homepage = https://common-lisp.net/project/armedbear/;
   };
 }
diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
index 09ccf9510bb..604838e8831 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   meta = {
     # Please become a maintainer to fix this package
     broken = true;
-    homepage = "http://www.aldor.org/";
+    homepage = http://www.aldor.org/;
     description = "Programming language with an expressive type system";
     license = stdenv.lib.licenses.asl20;
 
diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
index fa34b3afe51..93b251707e8 100644
--- a/pkgs/development/compilers/as31/default.nix
+++ b/pkgs/development/compilers/as31/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31";
+    homepage = http://wiki.erazor-zone.de/wiki:projects:linux:as31;
     description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats";
     maintainers = with maintainers; [ aneeshusa ];
     platforms = with platforms; unix;
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 115c686d7de..62a504ef966 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A compiled language with Ruby like syntax and type inference";
-    homepage = "https://crystal-lang.org/";
+    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/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 17965e20d24..0b219b80447 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -90,7 +90,7 @@ let
 
       meta = with stdenv.lib; {
         description = "A compiler for NVIDIA GPUs, math libraries, and tools";
-        homepage = "https://developer.nvidia.com/cuda-toolkit";
+        homepage = https://developer.nvidia.com/cuda-toolkit;
         platforms = platforms.linux;
         license = licenses.unfree;
       };
diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix
index 3538f85a75f..fae1c1d1b40 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/pkgs/development/compilers/dale/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
       Dale is a system (no GC) programming language that uses
       S-expressions for syntax and supports syntactic macros.
     '';
-    homepage = "https://github.com/tomhrr/dale";
+    homepage = https://github.com/tomhrr/dale;
     license = licenses.bsd3;
     maintainers = with maintainers; [ amiloradovsky ];
     platforms = with platforms; [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix
index b0943f1ece3..1242f556838 100644
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix
@@ -32,7 +32,7 @@ mkDerivation {
     test-framework-quickcheck2 text union-find
   ];
   jailbreak = true;
-  homepage = "http://elm-lang.org";
+  homepage = http://elm-lang.org;
   description = "Values to help with elm-package, elm-make, and elm-lang.org.";
   license = stdenv.lib.licenses.bsd3;
   # added manually since tests are not passing
diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index 6fb36d7cbfb..a9340fc94fe 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -32,7 +32,7 @@ mkDerivation {
   postInstall = ''
     ln -s $out/bin/elm-format-0.18 $out/bin/elm-format
   '';
-  homepage = "http://elm-lang.org";
+  homepage = http://elm-lang.org;
   description = "A source code formatter for Elm";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix
index dc1760e2958..98e57ac9b7c 100644
--- a/pkgs/development/compilers/elm/packages/elm-make.nix
+++ b/pkgs/development/compilers/elm/packages/elm-make.nix
@@ -20,7 +20,7 @@ mkDerivation {
     time
   ];
   jailbreak = true;
-  homepage = "http://elm-lang.org";
+  homepage = http://elm-lang.org;
   description = "A build tool for Elm projects";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix
index f93432dc0a3..4f1f2947931 100644
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ b/pkgs/development/compilers/elm/packages/elm-package.nix
@@ -29,7 +29,7 @@ mkDerivation {
     zip-archive
   ];
   jailbreak = true;
-  homepage = "http://github.com/elm-lang/elm-package";
+  homepage = http://github.com/elm-lang/elm-package;
   description = "Package manager for Elm libraries";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix
index 08bf5779b74..41611b3cdd0 100644
--- a/pkgs/development/compilers/elm/packages/elm-reactor.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix
@@ -22,7 +22,7 @@ mkDerivation {
     websockets-snap
   ];
   jailbreak = true;
-  homepage = "http://elm-lang.org";
+  homepage = http://elm-lang.org;
   description = "Interactive development tool for Elm programs";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix
index 64e29596099..8c168dedc75 100644
--- a/pkgs/development/compilers/elm/packages/elm-repl.nix
+++ b/pkgs/development/compilers/elm/packages/elm-repl.nix
@@ -24,7 +24,7 @@ mkDerivation {
     test-framework test-framework-hunit test-framework-quickcheck2
   ];
   jailbreak = true;
-  homepage = "https://github.com/elm-lang/elm-repl";
+  homepage = https://github.com/elm-lang/elm-repl;
   description = "a REPL for Elm";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 2971fd8a98b..751d44a38a4 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A functional CLI language";
-    homepage = "http://fsharp.org/";
+    homepage = http://fsharp.org/;
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
index 35e6749659e..488aaa228da 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A functional CLI language";
-    homepage = "http://fsharp.org/";
+    homepage = http://fsharp.org/;
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 51777f748e3..0887dd99252 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "ML-like functional programming language aimed at program verification";
-    homepage = "https://www.fstar-lang.org";
+    homepage = https://www.fstar-lang.org;
     license = licenses.asl20;
     platforms = with platforms; darwin ++ linux;
   };
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 69197b923c3..01ce4bde096 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -453,7 +453,7 @@ stdenv.mkDerivation ({
   '';
 
   meta = {
-    homepage = "http://ghdl.free.fr/";
+    homepage = http://ghdl.free.fr/;
     license = stdenv.lib.licenses.gpl2Plus;
     description = "Complete VHDL simulator, using the GCC technology (gcc ${version})";
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 5e5157215d3..60749a29b58 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
       '';
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     license = stdenv.lib.licenses.bsd3;
     platforms = ["x86_64-linux" "i686-linux"];
diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix
index 9a816797291..d2552b027ac 100644
--- a/pkgs/development/compilers/ghc/6.10.4.nix
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
     inherit (ghc.meta) license;
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
index 6ee447be650..a46ef66a8cb 100644
--- a/pkgs/development/compilers/ghc/6.12.3.nix
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   stripDebugFlags=["-S" "--keep-file-symbols"];
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix
index 099f1376c77..9d052ddb246 100644
--- a/pkgs/development/compilers/ghc/7.0.4.nix
+++ b/pkgs/development/compilers/ghc/7.0.4.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   stripDebugFlags=["-S" "--keep-file-symbols"];
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = [
       stdenv.lib.maintainers.marcweber
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index 521afbd88b4..863f904e4e9 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 5c6b62bee6f..eb8f1dddd19 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
index b3f672a8ef5..156ff56bd66 100644
--- a/pkgs/development/compilers/ghc/7.2.2.nix
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   stripDebugFlags=["-S" "--keep-file-symbols"];
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = [
       stdenv.lib.maintainers.marcweber
diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index 08b4f6f5471..e5bc4724c9e 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = [
       stdenv.lib.maintainers.marcweber
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index bdc0a20d3b4..5f951936046 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = [
       stdenv.lib.maintainers.marcweber
diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix
index 986ec98c6b3..50b0108861f 100644
--- a/pkgs/development/compilers/ghc/7.8.3.nix
+++ b/pkgs/development/compilers/ghc/7.8.3.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix
index 057b9f70fc7..5a380c75c69 100644
--- a/pkgs/development/compilers/ghc/7.8.4.nix
+++ b/pkgs/development/compilers/ghc/7.8.4.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (rec {
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index ae6edb739c9..6e47ee92630 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 7df72be2c81..354091fb646 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix
index a046cd0b67d..bce51f92c0b 100644
--- a/pkgs/development/compilers/ghc/8.2.1.nix
+++ b/pkgs/development/compilers/ghc/8.2.1.nix
@@ -82,7 +82,7 @@ in stdenv.mkDerivation (rec {
   };
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index f199048353c..5a505f39b1a 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -87,7 +87,7 @@ in stdenv.mkDerivation (rec {
   };
 
   meta = {
-    homepage = "http://haskell.org/ghc";
+    homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 4c9ae16a313..a7381fa1a14 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -186,7 +186,7 @@ in mkDerivation (rec {
     };
   };
 
-  homepage = "https://github.com/ghcjs/ghcjs";
+  homepage = https://github.com/ghcjs/ghcjs;
   description = "A Haskell to JavaScript compiler that uses the GHC API";
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix
index d4247f51b3e..aa19cfea971 100644
--- a/pkgs/development/compilers/ghcjs/head_stage2.nix
+++ b/pkgs/development/compilers/ghcjs/head_stage2.nix
@@ -15,7 +15,7 @@
          base HUnit test-framework test-framework-hunit
        ];
        jailbreak = true;
-       homepage = "https://github.com/simonmar/async";
+       homepage = https://github.com/simonmar/async;
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47,7 +47,7 @@
          time time-locale-compat unordered-containers uuid-types vector
        ];
        jailbreak = true;
-       homepage = "https://github.com/bos/aeson";
+       homepage = https://github.com/bos/aeson;
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76,7 +76,7 @@
          transformers unordered-containers vector
        ];
        jailbreak = true;
-       homepage = "https://github.com/bos/attoparsec";
+       homepage = https://github.com/bos/attoparsec;
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95,7 +95,7 @@
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        jailbreak = true;
-       homepage = "https://github.com/basvandijk/case-insensitive";
+       homepage = https://github.com/basvandijk/case-insensitive;
        description = "Case insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -109,7 +109,7 @@
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        jailbreak = true;
-       homepage = "https://github.com/spl/dlist";
+       homepage = https://github.com/spl/dlist;
        description = "Difference lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143,7 +143,7 @@
           test-framework-hunit test-framework-quickcheck2 text unix
         ];
         jailbreak = true;
-        homepage = "http://github.com/tibbe/hashable";
+        homepage = http://github.com/tibbe/hashable;
         description = "A class for types that can be converted to a hash value";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -156,7 +156,7 @@
         doCheck = false;
         libraryHaskellDepends = [ base transformers ];
         jailbreak = true;
-        homepage = "http://github.com/ekmett/mtl";
+        homepage = http://github.com/ekmett/mtl;
         description = "Monad classes, using functional dependencies";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -204,7 +204,7 @@
        ];
        benchmarkHaskellDepends = [ base criterion ];
        jailbreak = true;
-       homepage = "https://github.com/basvandijk/scientific";
+       homepage = https://github.com/basvandijk/scientific;
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -230,7 +230,7 @@
         libraryHaskellDepends = [ base ];
         testHaskellDepends = [ base containers HUnit mtl ];
         jailbreak = true;
-        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
+        homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB;
         description = "Scrap Your Boilerplate";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -247,7 +247,7 @@
          base deepseq template-haskell transformers transformers-compat
        ];
        jailbreak = true;
-       homepage = "http://github.com/ekmett/tagged";
+       homepage = http://github.com/ekmett/tagged;
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -271,7 +271,7 @@
           test-framework-hunit test-framework-quickcheck2
         ];
         jailbreak = true;
-        homepage = "https://github.com/bos/text";
+        homepage = https://github.com/bos/text;
         description = "An efficient packed Unicode text type";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -295,7 +295,7 @@
          hashable hashmap mtl random
        ];
        jailbreak = true;
-       homepage = "https://github.com/tibbe/unordered-containers";
+       homepage = https://github.com/tibbe/unordered-containers;
        description = "Efficient hashing-based container types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -318,7 +318,7 @@
          base bytestring containers criterion deepseq random
        ];
        jailbreak = true;
-       homepage = "https://github.com/aslatter/uuid";
+       homepage = https://github.com/aslatter/uuid;
        description = "Type definitions for Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -338,7 +338,7 @@
           test-framework-quickcheck2 transformers
         ];
         jailbreak = true;
-        homepage = "https://github.com/haskell/vector";
+        homepage = https://github.com/haskell/vector;
         description = "Efficient Arrays";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -366,7 +366,7 @@
           test-framework-hunit test-framework-quickcheck2 text
         ];
         jailbreak = true;
-        homepage = "http://github.com/ghcjs/ghcjs-base";
+        homepage = http://github.com/ghcjs/ghcjs-base;
         description = "Base library for GHCJS";
         license = stdenv.lib.licenses.mit;
       }) {};
@@ -392,7 +392,7 @@
           test-framework-hunit test-framework-quickcheck2 unix
         ];
         jailbreak = true;
-        homepage = "http://www.haskell.org/cabal/";
+        homepage = http://www.haskell.org/cabal/;
         description = "A framework for packaging Haskell software";
         license = stdenv.lib.licenses.bsd3;
       }) {};
diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix
index 8c68b6f15a6..4c4d9f4ff38 100644
--- a/pkgs/development/compilers/ghcjs/stage2.nix
+++ b/pkgs/development/compilers/ghcjs/stage2.nix
@@ -15,7 +15,7 @@
           base HUnit test-framework test-framework-hunit
         ];
         jailbreak = true;
-        homepage = "https://github.com/simonmar/async";
+        homepage = https://github.com/simonmar/async;
         description = "Run IO operations asynchronously and wait for their results";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -42,7 +42,7 @@
           test-framework-quickcheck2 text time unordered-containers vector
         ];
         jailbreak = true;
-        homepage = "https://github.com/bos/aeson";
+        homepage = https://github.com/bos/aeson;
         description = "Fast JSON parsing and encoding";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -67,7 +67,7 @@
           test-framework-quickcheck2 text transformers vector
         ];
         jailbreak = true;
-        homepage = "https://github.com/bos/attoparsec";
+        homepage = https://github.com/bos/attoparsec;
         description = "Fast combinator parsing for bytestrings and text";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -85,7 +85,7 @@
           base bytestring HUnit test-framework test-framework-hunit text
         ];
         jailbreak = true;
-        homepage = "https://github.com/basvandijk/case-insensitive";
+        homepage = https://github.com/basvandijk/case-insensitive;
         description = "Case insensitive string comparison";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -99,7 +99,7 @@
         libraryHaskellDepends = [ base deepseq ];
         testHaskellDepends = [ base Cabal QuickCheck ];
         jailbreak = true;
-        homepage = "https://github.com/spl/dlist";
+        homepage = https://github.com/spl/dlist;
         description = "Difference lists";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -133,7 +133,7 @@
           test-framework-hunit test-framework-quickcheck2 text unix
         ];
         jailbreak = true;
-        homepage = "http://github.com/tibbe/hashable";
+        homepage = http://github.com/tibbe/hashable;
         description = "A class for types that can be converted to a hash value";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -146,7 +146,7 @@
         doCheck = false;
         libraryHaskellDepends = [ base transformers ];
         jailbreak = true;
-        homepage = "http://github.com/ekmett/mtl";
+        homepage = http://github.com/ekmett/mtl;
         description = "Monad classes, using functional dependencies";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -193,7 +193,7 @@
           tasty-hunit tasty-quickcheck tasty-smallcheck text
         ];
         jailbreak = true;
-        homepage = "https://github.com/basvandijk/scientific";
+        homepage = https://github.com/basvandijk/scientific;
         description = "Numbers represented using scientific notation";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -219,7 +219,7 @@
         libraryHaskellDepends = [ base ];
         testHaskellDepends = [ base containers HUnit mtl ];
         jailbreak = true;
-        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
+        homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB;
         description = "Scrap Your Boilerplate";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -243,7 +243,7 @@
           test-framework-hunit test-framework-quickcheck2
         ];
         jailbreak = true;
-        homepage = "https://github.com/bos/text";
+        homepage = https://github.com/bos/text;
         description = "An efficient packed Unicode text type";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -263,7 +263,7 @@
           test-framework test-framework-hunit test-framework-quickcheck2
         ];
         jailbreak = true;
-        homepage = "https://github.com/tibbe/unordered-containers";
+        homepage = https://github.com/tibbe/unordered-containers;
         description = "Efficient hashing-based container types";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -283,7 +283,7 @@
           test-framework-quickcheck2 transformers
         ];
         jailbreak = true;
-        homepage = "https://github.com/haskell/vector";
+        homepage = https://github.com/haskell/vector;
         description = "Efficient Arrays";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -311,7 +311,7 @@
           test-framework-hunit test-framework-quickcheck2 text
         ];
         jailbreak = true;
-        homepage = "http://github.com/ghcjs/ghcjs-base";
+        homepage = http://github.com/ghcjs/ghcjs-base;
         description = "Base library for GHCJS";
         license = stdenv.lib.licenses.mit;
       }) {};
@@ -337,7 +337,7 @@
           test-framework-hunit test-framework-quickcheck2 unix
         ];
         jailbreak = true;
-        homepage = "http://www.haskell.org/cabal/";
+        homepage = http://www.haskell.org/cabal/;
         description = "A framework for packaging Haskell software";
         license = stdenv.lib.licenses.bsd3;
       }) {};
diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix
index ff772864e62..7d3b6860c6e 100644
--- a/pkgs/development/compilers/ghdl/default.nix
+++ b/pkgs/development/compilers/ghdl/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://sourceforge.net/p/ghdl-updates/wiki/Home/";
+    homepage = http://sourceforge.net/p/ghdl-updates/wiki/Home/;
     description = "Free VHDL simulator";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; (if flavour == "llvm" then [ "i686-linux" "x86_64-linux" ]
diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index 1465206484d..0e3eb88f537 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = "http://www.gnu.org/software/gprolog/";
+    homepage = http://www.gnu.org/software/gprolog/;
     description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
     license = stdenv.lib.licenses.lgpl3Plus;
 
diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index 5b241b31ee3..dd81d780838 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://github.com/GaloisInc/HaLVM";
+    homepage = http://github.com/GaloisInc/HaLVM;
     description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen";
     platforms = ["x86_64-linux"];       # other platforms don't have Xen
     maintainers = with stdenv.lib.maintainers; [ dmjio ];
diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
index 77e02f3a410..cfeff329fb5 100644
--- a/pkgs/development/compilers/jhc/default.nix
+++ b/pkgs/development/compilers/jhc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Whole-program, globally optimizing Haskell compiler";
-    homepage = "http://repetae.net/computer/jhc/";
+    homepage = http://repetae.net/computer/jhc/;
     license = stdenv.lib.licenses.bsd3;
     platforms = ["x86_64-linux"]; # 32 bit builds are broken
     maintainers = with stdenv.lib.maintainers; [ aforemny thoughtpolice ];
diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index cfe3d59aba3..2a7bf39c45c 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
-    homepage = "http://julialang.org/";
+    homepage = http://julialang.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index ebdd4c760d1..0df7da4a43f 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
-    homepage = "http://julialang.org/";
+    homepage = http://julialang.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 9cfa8895f74..4dfe5dc0dc3 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -171,7 +171,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
-    homepage = "http://julialang.org/";
+    homepage = http://julialang.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix
index 34cb63e783e..cdf201cec7a 100644
--- a/pkgs/development/compilers/mcpp/default.nix
+++ b/pkgs/development/compilers/mcpp/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-mcpplib" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://mcpp.sourceforge.net/";
+    homepage = http://mcpp.sourceforge.net/;
     description = "A portable c preprocessor";
     license = licenses.bsd2;
     platforms = platforms.unix;
diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index d802aa4fe2e..ebe562fcde3 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.mozart-oz.org/";
+    homepage = http://www.mozart-oz.org/;
     description = "Multiplatform implementation of the Oz programming language";
     longDescription = ''
       The Mozart Programming System combines ongoing research in
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index fa3c95c9e09..5e0cbb9d395 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The Oil Runtime Compiler";
-    homepage = "http://code.entropywave.com/orc/";
+    homepage = http://code.entropywave.com/orc/;
     # The source code implementing the Marsenne Twister algorithm is licensed
     # under the 3-clause BSD license. The rest is 2-clause BSD license.
     license = licenses.bsd3;
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 084a0941d24..d7590146e2a 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
         base containers directory either filepath mtl pretty syb time
       ];
       testHaskellDepends = [ base Cabal filepath mtl ];
-      homepage = "http://curry-language.org";
+      homepage = http://curry-language.org;
       description = "Functions for manipulating Curry programs";
       license = "unknown";
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
         process syb transformers
       ];
       testHaskellDepends = [ base Cabal curryBase filepath ];
-      homepage = "http://curry-language.org";
+      homepage = http://curry-language.org;
       description = "Compile the functional logic language Curry to several intermediate formats";
       license = "unknown";
 
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.informatik.uni-kiel.de/~pakcs/";
+    homepage = http://www.informatik.uni-kiel.de/~pakcs/;
     description = "An implementation of the multi-paradigm declarative language Curry";
     license = licenses.bsd3;
 
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index 7233cceca05..f883500eeb9 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   installFlags = "PREFIX=\${out}";
 
   meta = with stdenv.lib; {
-    homepage = "https://www.anjbe.name/rgbds/";
+    homepage = https://www.anjbe.name/rgbds/;
     description = "An assembler/linker package that produces Game Boy programs";
     license = licenses.free;
     maintainers = with maintainers; [ matthewbauer ];
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 1fe2bb90ad9..707f7966dd9 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Lisp compiler";
-    homepage = "http://www.sbcl.org";
+    homepage = http://www.sbcl.org;
     license = licenses.publicDomain; # and FreeBSD
     maintainers = [maintainers.raskin maintainers.tohl];
     platforms = attrNames options;
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 839ecdbeb65..96b22b630f4 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -258,7 +258,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The Swift Programming Language";
-    homepage = "https://github.com/apple/swift";
+    homepage = https://github.com/apple/swift;
     maintainers = with maintainers; [ jb55 dtzWill ];
     license = licenses.asl20;
     # Swift doesn't support 32bit Linux, unknown on other platforms.
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index d2005791680..79b22214ecc 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
   inherit clang;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.cs.uu.nl/wiki/UHC";
+    homepage = http://www.cs.uu.nl/wiki/UHC;
     description = "Utrecht Haskell Compiler";
     maintainers = [ maintainers.phile314 ];
 
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index b0153a75403..42b81a21a67 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -18,7 +18,7 @@ let
 
     meta = with stdenv.lib; {
       description = "Compiler for GObject type system";
-      homepage = "http://live.gnome.org/Vala";
+      homepage = http://live.gnome.org/Vala;
       license = licenses.lgpl21Plus;
       platforms = platforms.unix;
       maintainers = with maintainers; [ antono lethalman peterhoeg ];
diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix
index 2ea2faa3e09..78df2583140 100644
--- a/pkgs/development/compilers/wla-dx/default.nix
+++ b/pkgs/development/compilers/wla-dx/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.villehelin.com/wla.html";
+    homepage = http://www.villehelin.com/wla.html;
     description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package";
     license = licenses.gpl2;
     maintainers = with maintainers; [ matthewbauer ];
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 021efbba34c..8e37dc76441 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--enable-tabling=yes";
 
   meta = {
-    homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
+    homepage = http://www.dcc.fc.up.pt/~vsc/Yap/;
     description = "A ISO-compatible high-performance Prolog compiler";
     license = stdenv.lib.licenses.artistic2;
 
diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix
index 313580fe600..52dbd89232b 100644
--- a/pkgs/development/guile-modules/guile-sdl2/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl2/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   makeFlags = ["GUILE_AUTO_COMPILE=0"];
   meta = {
     description = "Bindings to SDL2 for GNU Guile";
-    homepage = "https://git.dthompson.us/guile-sdl2.git";
+    homepage = https://git.dthompson.us/guile-sdl2.git;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.seppeljordan ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix
index d1c8cf15fce..c2ae87582df 100644
--- a/pkgs/development/interpreters/chibi/default.nix
+++ b/pkgs/development/interpreters/chibi/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   inherit name;
 
   meta = {
-    homepage = "https://github.com/ashinn/chibi-scheme";
+    homepage = https://github.com/ashinn/chibi-scheme;
     description = "Small Footprint Scheme for use as a C Extension Language";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
index cf923d40917..b597ba6fe78 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "A Tool for Building Expert Systems";
-    homepage = "http://www.clipsrules.net/";
+    homepage = http://www.clipsrules.net/;
     longDescription = ''
       Developed at NASA's Johnson Space Center from 1985 to 1996,
       CLIPS is a rule-based programming language useful for creating
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index d32f415732b..3d19f7ba291 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   
   meta = {
     platforms = [ "i686-linux" "x86_64-linux" ];
-    homepage = "https://www.dartlang.org/";
+    homepage = https://www.dartlang.org/;
     description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps";
     longDescription = ''
       Dart is a class-based, single inheritance, object-oriented language
diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix
index 9fc25ad46fd..28ea05066c2 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/pkgs/development/interpreters/eff/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   checkTarget = "test";
 
   meta = with stdenv.lib; {
-    homepage = "http://www.eff-lang.org";
+    homepage = http://www.eff-lang.org;
     description = "A functional programming language based on algebraic effects and their handlers";
     longDescription = ''
       Eff is a functional language with handlers of not only exceptions,
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index ff63406aea3..3d779e665cd 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -59,7 +59,7 @@ in
     '';
 
     meta = with stdenv.lib; {
-      homepage = "http://elixir-lang.org/";
+      homepage = http://elixir-lang.org/;
       description = "A functional, meta-programming aware language built on top of the Erlang VM";
 
       longDescription = ''
diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
index 89c97f5a0eb..a5f79c197d6 100644
--- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
+++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
@@ -42,7 +42,7 @@ mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://github.com/basho/otp/";
+    homepage = https://github.com/basho/otp/;
     description = "Programming language used for massively scalable soft real-time systems, Basho fork";
 
     longDescription = ''
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 3434603f302..1fdfe4ca61d 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -102,7 +102,7 @@ in stdenv.mkDerivation ({
   setupHook = ./setup-hook.sh;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.erlang.org/";
+    homepage = http://www.erlang.org/;
     downloadPage = "http://www.erlang.org/download.html";
     description = "Programming language used for massively scalable soft real-time systems";
 
diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix
index 277912f7667..381144c68c2 100644
--- a/pkgs/development/interpreters/gtk-server/default.nix
+++ b/pkgs/development/interpreters/gtk-server/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "gtk-server for interpreted GUI programming";
-    homepage = "http://www.gtk-server.org/";
+    homepage = http://www.gtk-server.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.tohl];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index 854052edf05..a7be084991b 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
 
   meta = {
-    homepage = "http://love2d.org";
+    homepage = http://love2d.org;
     description = "A Lua-based 2D game engine/scripting language";
     license = stdenv.lib.licenses.zlib;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix
index 8053c82e90e..09f7e39196c 100644
--- a/pkgs/development/interpreters/love/0.7.nix
+++ b/pkgs/development/interpreters/love/0.7.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://love2d.org";
+    homepage = http://love2d.org;
     description = "A Lua-based 2D game engine/scripting language";
     license = stdenv.lib.licenses.zlib;
 
diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix
index e73f831156a..2b19f18b3ef 100644
--- a/pkgs/development/interpreters/love/0.8.nix
+++ b/pkgs/development/interpreters/love/0.8.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://love2d.org";
+    homepage = http://love2d.org;
     description = "A Lua-based 2D game engine/scripting language";
     license = stdenv.lib.licenses.zlib;
 
diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix
index da733ef29a8..9a9de2ad6f5 100644
--- a/pkgs/development/interpreters/love/0.9.nix
+++ b/pkgs/development/interpreters/love/0.9.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
 
   meta = {
-    homepage = "http://love2d.org";
+    homepage = http://love2d.org;
     description = "A Lua-based 2D game engine/scripting language";
     license = stdenv.lib.licenses.zlib;
 
diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix
index a89f4b1e5d7..1d94fd33a72 100644
--- a/pkgs/development/interpreters/lua-4/default.nix
+++ b/pkgs/development/interpreters/lua-4/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
 
   meta = {
-    homepage = "http://www.lua.org";
+    homepage = http://www.lua.org;
     description = "Powerful, fast, lightweight, embeddable scripting language";
     longDescription = ''
       Lua combines simple procedural syntax with powerful data
diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix
index 773883ef34a..a9e725f128b 100644
--- a/pkgs/development/interpreters/lua-5/5.0.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.0.3.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   installTargets = "install soinstall";
 
   meta = {
-    homepage = "http://www.lua.org";
+    homepage = http://www.lua.org;
     description = "Powerful, fast, lightweight, embeddable scripting language";
     longDescription = ''
       Lua combines simple procedural syntax with powerful data
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 9d9e104fb85..cdbb2324dc6 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.lua.org";
+    homepage = http://www.lua.org;
     description = "Powerful, fast, lightweight, embeddable scripting language";
     longDescription = ''
       Lua combines simple procedural syntax with powerful data
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 3bd92186084..43e289cd369 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://www.lua.org";
+    homepage = http://www.lua.org;
     description = "Powerful, fast, lightweight, embeddable scripting language";
     longDescription = ''
       Lua combines simple procedural syntax with powerful data
diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
index 8290bd05c59..c1d313a3656 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://www.lua.org";
+    homepage = http://www.lua.org;
     description = "Powerful, fast, lightweight, embeddable scripting language";
     longDescription = ''
       Lua combines simple procedural syntax with powerful data
diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix
index 0df5a6d3721..21f656044a3 100644
--- a/pkgs/development/interpreters/lua-5/filesystem.nix
+++ b/pkgs/development/interpreters/lua-5/filesystem.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://github.com/keplerproject/luafilesystem";
+    homepage = https://github.com/keplerproject/luafilesystem;
     hydraPlatforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.flosse ];
   };
diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix
index 018fb201bcd..b83b920497d 100644
--- a/pkgs/development/interpreters/lua-5/sockets.nix
+++ b/pkgs/development/interpreters/lua-5/sockets.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ lua5 ];
 
   meta = {
-    homepage = "http://w3.impa.br/~diego/software/luasocket/";
+    homepage = http://w3.impa.br/~diego/software/luasocket/;
     hydraPlatforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.mornfall ];
   };
diff --git a/pkgs/development/interpreters/lua-5/zip.nix b/pkgs/development/interpreters/lua-5/zip.nix
index f6460be1662..295f41aaa2b 100644
--- a/pkgs/development/interpreters/lua-5/zip.nix
+++ b/pkgs/development/interpreters/lua-5/zip.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   patches = [ ./zip.patch ];
 
   meta = {
-    homepage = "https://github.com/luaforge/luazip";
+    homepage = https://github.com/luaforge/luazip;
     hydraPlatforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.mit;
   };
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 17e545d95a7..9ead7176d4e 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://maude.cs.illinois.edu/";
+    homepage = http://maude.cs.illinois.edu/;
     description = "High-level specification language";
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index f4f52ec4ed3..08ed8f0d468 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -77,7 +77,7 @@ let
     '';
     meta = {
       description = "A clojure-like lisp, built with the pypy vm toolkit";
-      homepage = "https://github.com/pixie-lang/pixie";
+      homepage = https://github.com/pixie-lang/pixie;
       license = stdenv.lib.licenses.lgpl3;
       platforms = ["x86_64-linux" "i686-linux"];
     };
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 1fecdfdf560..79aa85def3c 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://python.org";
+    homepage = http://python.org;
     description = "A high-level dynamically-typed programming language";
     longDescription = ''
       Python is a remarkably powerful dynamic programming language that
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 34058c558af..fd3c63de1e7 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -210,7 +210,7 @@ in stdenv.mkDerivation {
     enableParallelBuilding = true;
 
     meta = {
-      homepage = "http://python.org";
+      homepage = http://python.org;
       description = "A high-level dynamically-typed programming language";
       longDescription = ''
         Python is a remarkably powerful dynamic programming language that
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 0d0cbbab2b5..c2eae32c5b6 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Ren'Py Visual Novel Engine";
-    homepage = "http://renpy.org/";
+    homepage = http://renpy.org/;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
     # This is an ancient version, last updated in 2014 (3d59f42ce); it fails to
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index e2a4ad2e302..b4823817d4b 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
-    homepage = "https://developer.mozilla.org/en/SpiderMonkey";
+    homepage = https://developer.mozilla.org/en/SpiderMonkey;
     # TODO: MPL/GPL/LGPL tri-license.
 
     maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index f8c98c727f4..642fd928f41 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Programming language for real time audio synthesis";
-    homepage = "http://supercollider.sourceforge.net/";
+    homepage = http://supercollider.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 719329bd528..877b10f69a3 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A cross-platform multimedia library";
-    homepage = "http://www.libsdl.org/";
+    homepage = http://www.libsdl.org/;
     license = licenses.zlib;
     platforms = platforms.all;
     maintainers = with maintainers; [ cpages ];
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index cee0a81ccfb..a7ef0290734 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       code. Its is written in plain C and can be used in C++ code.
     '';
 
-    homepage = "https://sourceforge.net/projects/sdlgfx/";
+    homepage = https://sourceforge.net/projects/sdlgfx/;
     license = licenses.zlib;
 
     maintainers = with maintainers; [ bjg ];
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index 22282e1a10c..78e0f4ed972 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "SDL image library";
-    homepage = "http://www.libsdl.org/projects/SDL_image/";
+    homepage = http://www.libsdl.org/projects/SDL_image/;
     platforms = platforms.linux;
     license = licenses.zlib;
   };
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 9fef76c799b..0203b8a1a8d 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "SDL multi-channel audio mixer library";
     platforms = platforms.linux;
-    homepage = "https://www.libsdl.org/projects/SDL_mixer/";
+    homepage = https://www.libsdl.org/projects/SDL_mixer/;
     maintainers = with maintainers; [ MP2E ];
     license = licenses.zlib;
   };
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
index 15a3305c7f4..cf81fc0cac8 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "SDL multiplatform networking library";
-    homepage = "https://www.libsdl.org/projects/SDL_net";
+    homepage = https://www.libsdl.org/projects/SDL_net;
     license = licenses.zlib;
     maintainers = with maintainers; [ MP2E ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix
index 71aeecb3a80..010ca46695a 100644
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "SDL TrueType library";
     platforms = platforms.linux;
     license = licenses.zlib;
-    homepage = "https://www.libsdl.org/projects/SDL_ttf/";
+    homepage = https://www.libsdl.org/projects/SDL_ttf/;
   };
 }
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index ff8c081af93..0f66f0afb17 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
          code. Its is written in plain C and can be used in C++ code.
        '';
 
-    homepage = "https://sourceforge.net/projects/sdlgfx/";
+    homepage = https://sourceforge.net/projects/sdlgfx/;
     license = licenses.zlib;
 
     maintainers = with maintainers; [ bjg ];
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index b151d0ee83e..a159a0691f4 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     description = "SDL networking library";
     platforms = platforms.unix;
     license = licenses.zlib;
-    homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html";
+    homepage = https://www.libsdl.org/projects/SDL_net/release-1.2.html;
   };
 }
diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix
index 8d088b6bbf4..e471c3cc556 100644
--- a/pkgs/development/libraries/SDL_sound/default.nix
+++ b/pkgs/development/libraries/SDL_sound/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "SDL sound library";
     platforms = platforms.linux;
     license = licenses.lgpl21;
-    homepage = "https://www.icculus.org/SDL_sound/";
+    homepage = https://www.icculus.org/SDL_sound/;
   };
 }
diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix
index 2a4ddac524c..7f276387c83 100644
--- a/pkgs/development/libraries/SDL_stretch/default.nix
+++ b/pkgs/development/libraries/SDL_stretch/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
      description = "Stretch Functions For SDL";
-     homepage = "http://sdl-stretch.sourceforge.net/";
+     homepage = http://sdl-stretch.sourceforge.net/;
      license = licenses.lgpl2;
      platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index 4875d9ab5a1..1f290bf7044 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "SDL TrueType library";
     license = licenses.zlib;
     platforms = platforms.all;
-    homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html";
+    homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index 883d0d65aa5..dc803bf1c37 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Qt library for accessing the online accounts database";
-    homepage = "http://code.google.com/p/accounts-sso/";
+    homepage = http://code.google.com/p/accounts-sso/;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ nckx ];
     platforms = with platforms; linux;
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 88c8a900570..3db15892a14 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
+    homepage = http://www.chiark.greenend.org.uk/~ian/adns/;
     description = "Asynchronous DNS Resolver Library";
     license = stdenv.lib.licenses.lgpl2;
 
diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
index a9c037edba7..6ab7455915c 100644
--- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
+++ b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
@@ -14,7 +14,7 @@ agda.mkDerivation (self: rec {
   sourceDirectories = [];
 
   meta = {
-    homepage = "https://github.com/jonsterling/Agda-Sheaves";
+    homepage = https://github.com/jonsterling/Agda-Sheaves;
     description = "Sheaves in Agda";
     license = stdenv.lib.licenses.cc-by-40;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
index 226a39890c2..ac9ce9dd84f 100644
--- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
@@ -16,7 +16,7 @@ agda.mkDerivation (self: rec {
   topSourceDirectories = [ "../$sourceRoot" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html";
+    homepage = http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html;
     description = "A monadic parser combinator library which guarantees termination of parsing";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix
index 40eef932822..146e44182ed 100644
--- a/pkgs/development/libraries/agda/agda-base/default.nix
+++ b/pkgs/development/libraries/agda/agda-base/default.nix
@@ -13,7 +13,7 @@ agda.mkDerivation (self: rec {
   everythingFile = "README.agda";
 
   meta = {
-    homepage = "https://github.com/pcapriotti/agda-base";
+    homepage = https://github.com/pcapriotti/agda-base;
     description = "Base library for HoTT in Agda";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
index cda2cd9bb05..ce25521ad2e 100644
--- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -17,7 +17,7 @@ agda.mkDerivation (self: rec {
   '';
 
   meta = {
-    homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/";
+    homepage = https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/;
     description = "Agda standard library developed at Iowa";
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix
index a2d29ff08dc..e3dcf765dfd 100644
--- a/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -14,7 +14,7 @@ agda.mkDerivation (self: rec {
   everythingFile = "src/Prelude.agda";
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/UlfNorell/agda-prelude";
+    homepage = https://github.com/UlfNorell/agda-prelude;
     description = "Programming library for Agda";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index eb2fa2927ca..866bccd3fd6 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -19,7 +19,7 @@ agda.mkDerivation (self: rec {
   topSourceDirectories = [ "src" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
+    homepage = http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary;
     description = "A standard library for use with the Agda compiler";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix
index b3b3cb5bbfe..6306bb89b5c 100644
--- a/pkgs/development/libraries/agda/bitvector/default.nix
+++ b/pkgs/development/libraries/agda/bitvector/default.nix
@@ -14,7 +14,7 @@ agda.mkDerivation (self: rec {
   sourceDirectories = [ "Data" ];
 
   meta = {
-    homepage = "https://github.com/copumpkin/bitvector";
+    homepage = https://github.com/copumpkin/bitvector;
     description = "Sequences of bits and common operations on them";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix
index b4ac4b79bf1..ea232f2853d 100644
--- a/pkgs/development/libraries/agda/categories/default.nix
+++ b/pkgs/development/libraries/agda/categories/default.nix
@@ -14,7 +14,7 @@ agda.mkDerivation (self: rec {
   sourceDirectories = [ "Categories" "Graphs" ];
 
   meta = {
-    homepage = "https://github.com/copumpkin/categories";
+    homepage = https://github.com/copumpkin/categories;
     description = "Categories parametrized by morphism equality, in Agda";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix
index 6aaaa44b00f..25e6ff6667f 100644
--- a/pkgs/development/libraries/agda/pretty/default.nix
+++ b/pkgs/development/libraries/agda/pretty/default.nix
@@ -16,7 +16,7 @@ agda.mkDerivation (self: rec {
   topSourceDirectories = [ "../$sourceRoot" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html";
+    homepage = http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html;
     description = "Correct-by-Construction Pretty-Printing";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index 4433a3df45d..ad930a705c5 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An interface to banking tasks, file formats and country information";
-    homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1";
+    homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1;
     hydraPlatforms = [];
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ goibhniu ];
diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index 9b6ba128512..28039cc0168 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "OS abstraction functions used by aqbanking and related tools";
-    homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1";
+    homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ goibhniu ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix
index f922aacf4d4..1ac00c3fe88 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library for access to chipcards";
-    homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=02&showall=1";
+    homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=02&showall=1;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ aszlig ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix
index b625bb18b88..a21f698fa89 100644
--- a/pkgs/development/libraries/audio/libbs2b/default.nix
+++ b/pkgs/development/libraries/audio/libbs2b/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = "http://bs2b.sourceforge.net/";
+    homepage = http://bs2b.sourceforge.net/;
     description = "Bauer stereophonic-to-binaural DSP library";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix
index 3bc048dd22f..9a87e31cbd2 100644
--- a/pkgs/development/libraries/audio/libgme/default.nix
+++ b/pkgs/development/libraries/audio/libgme/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A collection of video game music chip emulators";
-    homepage = "https://bitbucket.org/mpyne/game-music-emu/overview";
+    homepage = https://bitbucket.org/mpyne/game-music-emu/overview;
     license = licenses.lgpl21;
     platforms = platforms.all;
     maintainers = with maintainers; [ lheckemann ];
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index 2f5b9183f66..e3c0f039477 100644
--- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The successor of clalsadrv, provides easy access to ALSA PCM devices";
     version = "${version}";
-    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
index a15ae7dad40..578bc7f4a2d 100644
--- a/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Convolution library by Fons Adriaensen";
     version = "${version}";
-    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index 7aa7244e234..00a0a508213 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Resample library by Fons Adriaensen";
     version = "${version}";
-    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 5a17f379b01..18a15c70223 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
   };
 
   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/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix
index 92e02c6ca08..b90006a5e97 100644
--- a/pkgs/development/libraries/boost-process/default.nix
+++ b/pkgs/development/libraries/boost-process/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.highscore.de/boost/process0.5/";
+    homepage = http://www.highscore.de/boost/process0.5/;
     description = "Library to manage system processes";
     license = licenses.boost;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 9a6c5d7b413..22ef02023f8 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation {
   inherit src patches;
 
   meta = {
-    homepage = "http://boost.org/";
+    homepage = http://boost.org/;
     description = "Collection of C++ libraries";
     license = stdenv.lib.licenses.boost;
 
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index 12670ab711a..809d373233d 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = "http://sourceforge.net/projects/buddy/";
+    homepage = http://sourceforge.net/projects/buddy/;
     description = "Binary decision diagram package";
     license = "as-is";
 
diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index a3233c03712..6dc658c03e3 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ tcl ];
 
   meta = {
-    homepage = "http://tcl.activestate.com/software/tcllib/";
+    homepage = http://tcl.activestate.com/software/tcllib/;
     description = "High-level widget set for Tcl/Tk";
     license = stdenv.lib.licenses.tcltk;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 1c55aa7f834..66ced59c26d 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
-    homepage = "http://catch-lib.net";
+    homepage = http://catch-lib.net;
     license = licenses.boost;
     maintainers = with maintainers; [ edwtjo knedlsepp ];
     platforms = with platforms; unix;
diff --git a/pkgs/development/libraries/ccnx/default.nix b/pkgs/development/libraries/ccnx/default.nix
index 01812b7baa9..4634a80ade6 100644
--- a/pkgs/development/libraries/ccnx/default.nix
+++ b/pkgs/development/libraries/ccnx/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh"
   '';
   meta = with stdenv.lib; {
-    homepage = "http://www.ccnx.org/";
+    homepage = http://www.ccnx.org/;
     description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
     longDescription = ''
       To address the Internet’s modern-day requirements with a better
diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix
index 5574e18ffa0..0bdffc9d357 100644
--- a/pkgs/development/libraries/ccrtp/1.8.nix
+++ b/pkgs/development/libraries/ccrtp/1.8.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF";
-    homepage = "http://www.gnu.org/software/ccrtp/";
+    homepage = http://www.gnu.org/software/ccrtp/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index 550a660b966..818eb6db8c6 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html";
+    homepage = https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html;
   };
 }
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 673fb77f01a..77e0cb7735d 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "C++ library for modeling and solving large, complicated optimization problems";
     license = licenses.bsd3;
-    homepage = "http://ceres-solver.org";
+    homepage = http://ceres-solver.org;
     maintainers = with maintainers; [ giogadi ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index 09c5eeb611b..e1e4604e51f 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://acoustid.org/chromaprint";
+    homepage = http://acoustid.org/chromaprint;
     description = "AcoustID audio fingerprinting library";
     maintainers = with maintainers; [ ehmry ];
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix
index 063d07e3524..fcd37239e91 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/pkgs/development/libraries/cppcms/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://cppcms.com";
+    homepage = http://cppcms.com;
     description = "High Performance C++ Web Framework";
     platforms = platforms.linux ;
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix
index 68fcb2ba25b..72fa309b721 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/pkgs/development/libraries/cppdb/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "--no-warn-unused-cli" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://cppcms.com/sql/cppdb/";
+    homepage = http://cppcms.com/sql/cppdb/;
     description = "C++ Connectivity library that supports MySQL, PostgreSQL, Sqlite3 databases and generic ODBC drivers";
     platforms = platforms.linux ;
     license = licenses.boost;
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 4c64cb715e4..f97dd80d741 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    homepage = "http://sourceforge.net/apps/mediawiki/cppunit/";
+    homepage = http://sourceforge.net/apps/mediawiki/cppunit/;
     description = "C++ unit testing framework";
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix
index 56154c060d1..2dce60d4b2c 100644
--- a/pkgs/development/libraries/cpputest/default.nix
+++ b/pkgs/development/libraries/cpputest/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://cpputest.github.io/";
+    homepage = http://cpputest.github.io/;
     description = "Unit testing and mocking framework for C/C++";
     platforms = stdenv.lib.platforms.linux ;
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index 7361dc45db7..301b245a9f5 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zeromq ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/zeromq/cppzmq";
+    homepage = https://github.com/zeromq/cppzmq;
     license = licenses.bsd2;
     description = "C++ binding for 0MQ";
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix
index 9baa9aba480..c1579b71748 100644
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/pkgs/development/libraries/curlcpp/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake curl ];
 
   meta = with stdenv.lib; {
-    homepage = "http://josephp91.github.io/curlcpp/";
+    homepage = http://josephp91.github.io/curlcpp/;
     description = "Object oriented C++ wrapper for CURL";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index 91fb94ec048..c620777dc5b 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -16,7 +16,7 @@ in python2Packages.buildPythonApplication rec {
   sourceRoot = "${name}-src/python";
 
   meta = with stdenv.lib; {
-    homepage = "http://cxxtest.com";
+    homepage = http://cxxtest.com;
     description = "Unit testing framework for C++";
     platforms = platforms.unix ;
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix
index c677ae6d867..5dd48794f5e 100644
--- a/pkgs/development/libraries/cxxtools/default.nix
+++ b/pkgs/development/libraries/cxxtools/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://www.tntnet.org/cxxtools.html";
+    homepage = http://www.tntnet.org/cxxtools.html;
     description = "Comprehensive C++ class library for Unix and Linux";
     platforms = stdenv.lib.platforms.linux ;
     license = stdenv.lib.licenses.lgpl21;
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 3d6d1c22605..5dbf134cf45 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://cyrusimap.web.cmu.edu/";
+    homepage = http://cyrusimap.web.cmu.edu/;
     description = "Library for adding authentication support to connection-based protocols";
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix
index 69b64629bd8..0b4aeeb0801 100644
--- a/pkgs/development/libraries/czmq/3.x.nix
+++ b/pkgs/development/libraries/czmq/3.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ zeromq ];
 
   meta = with stdenv.lib; {
-    homepage = "http://czmq.zeromq.org/";
+    homepage = http://czmq.zeromq.org/;
     description = "High-level C Binding for ZeroMQ";
     license = licenses.mpl20;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix
index dd957d07340..971d15686ca 100644
--- a/pkgs/development/libraries/czmq/4.x.nix
+++ b/pkgs/development/libraries/czmq/4.x.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ zeromq ];
 
   meta = with stdenv.lib; {
-    homepage = "http://czmq.zeromq.org/";
+    homepage = http://czmq.zeromq.org/;
     description = "High-level C Binding for ZeroMQ";
     license = licenses.mpl20;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index c3204555901..4a11c2b9893 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
+    homepage = http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html;
     description = "Berkeley DB";
     license = license;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix
index f7d7eee91ed..47f3794f5ad 100644
--- a/pkgs/development/libraries/dclxvi/default.nix
+++ b/pkgs/development/libraries/dclxvi/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/agl/dclxvi";
+    homepage = https://github.com/agl/dclxvi;
     description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library";
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.x86_64;
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index e4d12de28fd..9b05d74a406 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus";
-    homepage = "https://launchpad.net/dee";
+    homepage = https://launchpad.net/dee;
     license = licenses.lgpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index c6f7684ecf3..47c165c1bad 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Binary-decimal and decimal-binary routines for IEEE doubles";
-    homepage = "https://github.com/google/double-conversion";
+    homepage = https://github.com/google/double-conversion;
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 2ba97af133e..672fed2f015 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://software.ecmwf.int/wiki/display/ECC/";
+    homepage = https://software.ecmwf.int/wiki/display/ECC/;
     license = licenses.asl20;
     maintainers = with maintainers; [ knedlsepp ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix
index 8825df657d2..b784088dc65 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/pkgs/development/libraries/eventlog/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
       Where you had a simple non-structrured string in syslog() you have a
       combination of description and tag/value pairs.
     '';
-    homepage = "http://www.balabit.com/support/community/products/";
+    homepage = http://www.balabit.com/support/community/products/;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
index 4c4ddc3ba57..6cedb4d555a 100644
--- a/pkgs/development/libraries/fastjson/default.nix
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A fast json library for C";
-    homepage = "https://github.com/rsyslog/libfastjson";
+    homepage = https://github.com/rsyslog/libfastjson;
     license = licenses.mit;
     maintainers = with maintainers; [ nequissimus ];
     platforms = with platforms; unix;
diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix
index 1222aef12f8..e5b0592daab 100644
--- a/pkgs/development/libraries/fflas-ffpack/1.nix
+++ b/pkgs/development/libraries/fflas-ffpack/1.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://linbox-team.github.io/fflas-ffpack/";
+    homepage = https://linbox-team.github.io/fflas-ffpack/;
   };
 }
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 7d0cb339a43..22f4b6ceef0 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://linbox-team.github.io/fflas-ffpack/";
+    homepage = https://linbox-team.github.io/fflas-ffpack/;
   };
 }
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index be158684b5b..94cc7688cc8 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://www.flintlib.org/";
+    homepage = http://www.flintlib.org/;
     downloadPage = "http://www.flintlib.org/downloads.html";
     updateWalker = true;
   };
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 927e11dac9e..286e4ac56b5 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An open-source C++ library developed and used at Facebook";
-    homepage = "https://github.com/facebook/folly";
+    homepage = https://github.com/facebook/folly;
     license = licenses.asl20;
     # 32bit is not supported: https://github.com/facebook/folly/issues/103
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 826a44989c5..8dd78c41b14 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
       Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
     '';
-    homepage = "http://fox-toolkit.org";
+    homepage = http://fox-toolkit.org;
     license = licenses.lgpl3;
     maintainers = [];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 87c6739e2e0..98becb8e2da 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
         Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
         Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
       '';
-    homepage = "http://fox-toolkit.org";
+    homepage = http://fox-toolkit.org;
     license = stdenv.lib.licenses.lgpl3;
     maintainers = [];
     platforms = stdenv.lib.platforms.mesaPlatforms;
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index 4e8be2a4f50..2f5374851d8 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optional enableX11 "--with-x11";
 
   meta = {
-    homepage = "https://launchpad.net/frame";
+    homepage = https://launchpad.net/frame;
     description = "Handles the buildup and synchronization of a set of simultaneous touches";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix
index 2c9a893284b..c6ea5bbd23b 100644
--- a/pkgs/development/libraries/freealut/default.nix
+++ b/pkgs/development/libraries/freealut/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   ;
 
   meta = {
-    homepage = "http://openal.org/";
+    homepage = http://openal.org/;
     description = "Free implementation of OpenAL's ALUT standard";
     license = stdenv.lib.licenses.lgpl2;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 3ed308a3492..2e06c3bbec7 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description =
       "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
-    homepage = "http://www.freetds.org";
+    homepage = http://www.freetds.org;
     license = "lgpl";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix
index 0a4a6e6b9b0..f33c889e56c 100644
--- a/pkgs/development/libraries/ftgl/2.1.2.nix
+++ b/pkgs/development/libraries/ftgl/2.1.2.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://sourceforge.net/apps/mediawiki/ftgl/";
+    homepage = http://sourceforge.net/apps/mediawiki/ftgl/;
     description = "Font rendering library for OpenGL applications";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index 8fc69ec7568..d303beeb4ea 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [freetype mesa];
 
   meta = {
-    homepage = "http://sourceforge.net/apps/mediawiki/ftgl/";
+    homepage = http://sourceforge.net/apps/mediawiki/ftgl/;
     description = "Font rendering library for OpenGL applications";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index cf216ffcc56..dd16ebd5c88 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A microbenchmark support library";
-    homepage = "https://github.com/google/benchmark";
+    homepage = https://github.com/google/benchmark;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 77ea6b6a016..bf671ebecd1 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     maintainers = [ stdenv.lib.maintainers.raskin ];
     license = stdenv.lib.licenses.lgpl21;
     platforms = stdenv.lib.platforms.unix;
-    homepage = "http://geolite.maxmind.com/";
+    homepage = http://geolite.maxmind.com/;
     downloadPage = "http://geolite.maxmind.com/download/";
   };
 }
diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix
index 9ba0cf081ce..00b9cff9576 100644
--- a/pkgs/development/libraries/glfw/2.x.nix
+++ b/pkgs/development/libraries/glfw/2.x.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; { 
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
-    homepage = "http://glfw.sourceforge.net/";
+    homepage = http://glfw.sourceforge.net/;
     license = licenses.zlib;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index ec3c2f5569d..52673061b72 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
-    homepage = "http://www.glfw.org/";
+    homepage = http://www.glfw.org/;
     license = licenses.zlib;
     maintainers = with maintainers; [ marcweber ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index 14104b30d12..9a69932d9bd 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -51,7 +51,7 @@ let self = stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://gmplib.org/";
+    homepage = http://gmplib.org/;
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 92dd602fc4d..34119a3f153 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -50,7 +50,7 @@ let self = stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://gmplib.org/";
+    homepage = http://gmplib.org/;
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 8ae88944dd1..aae24587302 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
 
   meta = with stdenv.lib; {
-    homepage = "https://gnupg.org/software/gpgme/index.html";
+    homepage = https://gnupg.org/software/gpgme/index.html;
     description = "Library for making GnuPG easier to use";
     longDescription = ''
       GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix
index 3464e229495..3a7ed879bff 100644
--- a/pkgs/development/libraries/grail/default.nix
+++ b/pkgs/development/libraries/grail/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optional enableX11 "--with-x11";
 
   meta = {
-    homepage = "https://launchpad.net/canonical-multitouch/grail";
+    homepage = https://launchpad.net/canonical-multitouch/grail;
     description = "Gesture Recognition And Instantiation Library";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 80e05b8d743..f091fedeb2d 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec{
 
 
   meta = with stdenv.lib; {
-    homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";
+    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";
diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index 07efe42b99d..7d44b8e2dbf 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C/C++ toolkit for SOAP web services and XML-based applications";
-    homepage = "http://www.cs.fsu.edu/~engelen/soap.html";
+    homepage = http://www.cs.fsu.edu/~engelen/soap.html;
     # gsoap is dual/triple licensed (see homepage for details):
     # 1. gSOAP Public License 1.3 (based on Mozilla Public License 1.1).
     #    Components NOT covered by the gSOAP Public License are:
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 960805cdcfc..70aa9101ad8 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Base plugins and helper libraries";
-    homepage = "http://gstreamer.freedesktop.org";
+    homepage = http://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 54ff189caef..4bd7fb5396a 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Open source multimedia framework";
-    homepage = "http://gstreamer.freedesktop.org";
+    homepage = http://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
index 0e8dfec65f4..9c5de42194e 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gst-plugins-base gstreamer pkgconfig ];
 
   meta = {
-    homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
+    homepage = http://gstreamer.freedesktop.org/modules/gnonlin.html;
     description = "Gstreamer Non-Linear Multimedia Editing Plugins";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
index 484075f73f7..3fbaa9ad4e8 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
 
   meta = {
-    homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg";
+    homepage = http://gstreamer.freedesktop.org/releases/gst-ffmpeg;
     description = "GStreamer's plug-in using FFmpeg";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 441ca2e5571..3e94016d057 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "gst-libav-1.10.4";
 
   meta = {
-    homepage = "http://gstreamer.freedesktop.org";
+    homepage = http://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index ae32c8f95ae..caca5440084 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0";
 
   meta = {
-    homepage = "http://gstreamer.freedesktop.org";
+    homepage = http://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index d973bc1f3b6..b537ad2897d 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Integration testing infrastructure for the GStreamer framework";
-    homepage = "http://gstreamer.freedesktop.org";
+    homepage = http://gstreamer.freedesktop.org;
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix
index b94cd88869b..8a023be5629 100644
--- a/pkgs/development/libraries/gtdialog/default.nix
+++ b/pkgs/development/libraries/gtdialog/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.mit ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://foicica.com/gtdialog";
+    homepage = http://foicica.com/gtdialog;
     downloadPage = "http://foicica.com/gtdialog/download";
   };
 }
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index 85550b5d528..ffbab3fce42 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "D binding and OO wrapper for GTK+";
-    homepage = "https://gtkd.org";
+    homepage = https://gtkd.org;
     licence = licenses.lgpl3Plus;
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index c6cc51b1e1f..5376482e58a 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ enchant ];
 
   meta = with stdenv.lib; {
-    homepage = "http://gtkspell.sourceforge.net/";
+    homepage = http://gtkspell.sourceforge.net/;
     description = "Word-processor-style highlighting GtkTextView widget";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index 452a159bb28..6b08a0fd86f 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "C++ standard library for concurrency and parallelism";
-    homepage = "https://github.com/STEllAR-GROUP/hpx";
+    homepage = https://github.com/STEllAR-GROUP/hpx;
     license = stdenv.lib.licenses.boost;
     platforms = [ "x86_64-linux" ]; # stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ bobakker ];
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 120b4176c19..497dfe2bb92 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -75,7 +75,7 @@ let
       meta = with stdenv.lib; {
         inherit longDescription;
         description = "Hunspell dictionary for ${shortDescription} from Dicollecte";
-        homepage = "http://www.dicollecte.org/home.php?prj=fr";
+        homepage = http://www.dicollecte.org/home.php?prj=fr;
         license = licenses.mpl20;
         maintainers = with maintainers; [ renzo ];
         platforms = platforms.all;
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index 4506d3c4104..ed500ca518f 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--disable-static" "--enable-shared" ];
 
   meta = with stdenv.lib; {
-    homepage = "https://www.openprinting.org/download/ijs/";
+    homepage = https://www.openprinting.org/download/ijs/;
     description = "Raster printer driver architecture";
 
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
index 2ae8aad5ffc..4af2bba9160 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/pkgs/development/libraries/iml/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html";
+    homepage = https://cs.uwaterloo.ca/~astorjoh/iml.html;
     updateWalker = true;
   };
 }
diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix
index 7db9b1a0e42..cbc66dd6ae6 100644
--- a/pkgs/development/libraries/indicator-application/gtk2.nix
+++ b/pkgs/development/libraries/indicator-application/gtk2.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Indicator to take menus from applications and place them in the panel (GTK+ 2 library for Xfce/LXDE)";
-    homepage = "https://launchpad.net/indicators-gtk2";
+    homepage = https://launchpad.net/indicators-gtk2;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.msteen ];
diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix
index 4847eba22ed..778997e5674 100644
--- a/pkgs/development/libraries/indicator-application/gtk3.nix
+++ b/pkgs/development/libraries/indicator-application/gtk3.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Indicator to take menus from applications and place them in the panel";
-    homepage = "https://launchpad.net/indicator-application";
+    homepage = https://launchpad.net/indicator-application;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.msteen ];
diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
index 5a3085ba728..70ed2d00fea 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/pkgs/development/libraries/jansson/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://www.digip.org/jansson/";
+    homepage = http://www.digip.org/jansson/;
     description = "C library for encoding, decoding and manipulating JSON data";
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index eb440657278..9a5527b5a13 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.zeromq.org";
+    homepage = http://www.zeromq.org;
     description = "Java bindings for ZeroMQ";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.lgpl3;
diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix
index 35eabdd3556..2bda74b4493 100644
--- a/pkgs/development/libraries/jbigkit/default.nix
+++ b/pkgs/development/libraries/jbigkit/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/";
+    homepage = http://www.cl.cam.ac.uk/~mgk25/jbigkit/;
     description = "A software implementation of the JBIG1 data compression standard";
     license = licenses.gpl2;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index d92e7d19c65..d5995459fd4 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -86,7 +86,7 @@ let
             setupHook = args.setupHook or defaultSetupHook;
 
             meta = {
-              homepage = "http://www.kde.org";
+              homepage = http://www.kde.org;
               license = with lib.licenses; [
                 lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
               ];
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index dfdb6a11803..86be0398e06 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
@@ -13,7 +13,7 @@ mkDerivation {
 
   meta = with lib; {
     platforms = platforms.linux ++ platforms.darwin;
-    homepage = "http://www.kde.org";
+    homepage = http://www.kde.org;
     license = licenses.bsd2;
     maintainers = [ maintainers.ttuegel ];
   };
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 816b850f100..88586cdabba 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Library with the aim of simplifying DNS programming in C";
     license = licenses.bsd3;
-    homepage = "http://www.nlnetlabs.nl/projects/ldns/";
+    homepage = http://www.nlnetlabs.nl/projects/ldns/;
     platforms = platforms.linux;
     maintainers = with maintainers; [ jgeerds ];
   };
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index c32372e841c..0057611ed0f 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ";
 
   meta = with stdenv.lib; {
-    homepage = "https://code.google.com/p/leveldb/";
+    homepage = https://code.google.com/p/leveldb/;
     description = "Fast and lightweight key/value database library by Google";
     license = licenses.bsd3;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index ff184984f70..0d67c6b4dcb 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ yacc flex ];
 
   meta = with stdenv.lib; {
-    homepage = "https://www.videolan.org/developers/libaacs.html";
+    homepage = https://www.videolan.org/developers/libaacs.html;
     description = "Library to access AACS protected Blu-Ray disks";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 0c1c51d6f47..8f005d6a5a4 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "A library to allow applications to export a menu into the Unity Menu bar";
-    homepage = "https://launchpad.net/libappindicator";
+    homepage = https://launchpad.net/libappindicator;
     license = with licenses; [ lgpl21 lgpl3 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.msteen ];
diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix
index ccc2af8c394..745736559ab 100644
--- a/pkgs/development/libraries/libast/default.nix
+++ b/pkgs/development/libraries/libast/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library of Assorted Spiffy Things";
-    homepage = "http://www.eterm.org";
+    homepage = http://www.eterm.org;
     license = licenses.bsd2;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 4531546f33f..83b9367f992 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.videolan.org/developers/libbdplus.html";
+    homepage = http://www.videolan.org/developers/libbdplus.html;
     description = "Library to access BD+ protected Blu-Ray disks";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 68ea7f777a2..8b67d52b875 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
                  ;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.videolan.org/developers/libbluray.html";
+    homepage = http://www.videolan.org/developers/libbluray.html;
     description = "Library to access Blu-Ray disks for video playback";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
index 02e4529b759..31a1b8b4bf5 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A C Library for parsing, editing, and creating BSON documents";
-    homepage = "https://github.com/mongodb/libbson";
+    homepage = https://github.com/mongodb/libbson;
     license = licenses.asl20;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix
index 5738245a0bd..f49c449f9ea 100644
--- a/pkgs/development/libraries/libburn/default.nix
+++ b/pkgs/development/libraries/libburn/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://libburnia-project.org/";
+    homepage = http://libburnia-project.org/;
     description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ abbradar vrthra ];
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 115ea663639..15c40b43040 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling";
-    homepage = "http://libcec.pulse-eight.com";
+    homepage = http://libcec.pulse-eight.com;
     repositories.git = "https://github.com/Pulse-Eight/libcec.git";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index d21f1b1404e..228dccea3e3 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Platform library for libcec and Kodi addons";
-    homepage = "https://github.com/Pulse-Eight/platform";
+    homepage = https://github.com/Pulse-Eight/platform;
     repositories.git = "https://github.com/Pulse-Eight/platform.git";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index 9fb01df930a..3386b081a10 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Zita X11 library";
-    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ magnetophon ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 24ec3d74d36..5f39e2f4971 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C client library for Couchbase";
-    homepage = "https://github.com/couchbase/libcouchbase";
+    homepage = https://github.com/couchbase/libcouchbase;
     license = licenses.asl20;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 46846e992f6..2222825433e 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   cmakeFlags = "-DWITH_DOC=OFF";
 
   meta = with stdenv.lib; {
-    homepage = "http://launchpad.net/libdbusmenu-qt";
+    homepage = http://launchpad.net/libdbusmenu-qt;
     description = "Provides a Qt implementation of the DBusMenu spec";
     maintainers = [ maintainers.ttuegel ];
     inherit (qtbase.meta) platforms;
diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix
index 90880fd4d52..5d697489638 100644
--- a/pkgs/development/libraries/libdbusmenu/default.nix
+++ b/pkgs/development/libraries/libdbusmenu/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A library for passing menu structures across DBus";
-    homepage = "https://launchpad.net/dbusmenu";
+    homepage = https://launchpad.net/dbusmenu;
     license = with licenses; [ gpl3 lgpl21 lgpl3 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.msteen ];
diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix
index e060f8c1d76..f8d896bda37 100644
--- a/pkgs/development/libraries/libdigidoc/default.nix
+++ b/pkgs/development/libraries/libdigidoc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; {
     description = "Library for creating DigiDoc signature files";
-    homepage = "http://www.id.ee/";
+    homepage = http://www.id.ee/;
     license = licenses.lgpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.jagajaga ];
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index 5ddc6303126..a8b2e4b3420 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; {
     description = "Library for creating DigiDoc signature files";
-    homepage = "http://www.id.ee/";
+    homepage = http://www.id.ee/;
     license = licenses.lgpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.jagajaga ];
diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix
index 0dae76243a8..be9f5e772d9 100644
--- a/pkgs/development/libraries/libechonest/default.nix
+++ b/pkgs/development/libraries/libechonest/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A C++/Qt wrapper around the Echo Nest API";
-    homepage = "http://projects.kde.org/projects/playground/libs/libechonest";
+    homepage = http://projects.kde.org/projects/playground/libs/libechonest;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix
index f5809b39197..a34ff5edbe2 100644
--- a/pkgs/development/libraries/libee/default.nix
+++ b/pkgs/development/libraries/libee/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig libestr];
 
   meta = {
-    homepage = "http://www.libee.org/";
+    homepage = http://www.libee.org/;
     description = "An Event Expression Library inspired by CEE";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix
index 4765f0b7d9a..fb92d6aa4ca 100644
--- a/pkgs/development/libraries/libevhtp/default.nix
+++ b/pkgs/development/libraries/libevhtp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A more flexible replacement for libevent's httpd API";
-    homepage = "https://github.com/ellzey/libevhtp";
+    homepage = https://github.com/ellzey/libevhtp;
     license = licenses.bsd3;
     maintainers = with maintainers; [ edwtjo ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix
index 4c637485086..5ac7a244df2 100644
--- a/pkgs/development/libraries/libfann/default.nix
+++ b/pkgs/development/libraries/libfann/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   meta = {
-    homepage = "http://leenissen.dk/fann/wp/";
+    homepage = http://leenissen.dk/fann/wp/;
     description = "Fast Artificial Neural Network Library";
     maintainers = with lib.maintainers; [ fpletz ];
     license = lib.licenses.lgpl21;
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index ad400a0aef6..c32866a0d26 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configureFlags = optional extraOnly "--with-extra-only";
 
   meta = with stdenv.lib; {
-    homepage = "http://blog.lxde.org/?cat=28/";
+    homepage = http://blog.lxde.org/?cat=28/;
     license = licenses.lgpl21Plus;
     description = "A glib-based library for file management";
     maintainers = [ maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index 42044f050f2..8b384a51f01 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.freedesktop.org/wiki/Software/fprint/libfprint/";
+    homepage = http://www.freedesktop.org/wiki/Software/fprint/libfprint/;
     description = "A library designed to make it easy to add support for consumer fingerprint readers";
     license = licenses.lgpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libgee/0.6.nix b/pkgs/development/libraries/libgee/0.6.nix
index e30641f0e76..51487b41573 100644
--- a/pkgs/development/libraries/libgee/0.6.nix
+++ b/pkgs/development/libraries/libgee/0.6.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
-    homepage = "http://live.gnome.org/Libgee";
+    homepage = http://live.gnome.org/Libgee;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/libgee/0.8.nix b/pkgs/development/libraries/libgee/0.8.nix
index aba06d86107..747cb9d4b23 100644
--- a/pkgs/development/libraries/libgee/0.8.nix
+++ b/pkgs/development/libraries/libgee/0.8.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
-    homepage = "http://live.gnome.org/Libgee";
+    homepage = http://live.gnome.org/Libgee;
     maintainers = with maintainers; [ sternenseemann ];
   };
 }
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index e96ef7329a2..7bd551e70d5 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
       user.  It provides X authentication facilities for running
       programs in an X session.
     '';
-    homepage = "http://www.nongnu.org/gksu/";
+    homepage = http://www.nongnu.org/gksu/;
     license = stdenv.lib.licenses.lgpl2;
     maintainers = [ stdenv.lib.maintainers.romildo ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
index 07d63c66b78..cc285979c6c 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The GL Vendor-Neutral Dispatch library";
-    homepage = "https://github.com/NVIDIA/libglvnd";
+    homepage = https://github.com/NVIDIA/libglvnd;
     license = licenses.bsd2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index c183a2c98ef..56bf9b177b5 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html";
+    homepage = https://www.gnupg.org/related_software/libgpg-error/index.html;
     description = "A small library that defines common error values for all GnuPG components";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix
index 08563ed53dd..273563b2a99 100644
--- a/pkgs/development/libraries/libhdhomerun/default.nix
+++ b/pkgs/development/libraries/libhdhomerun/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners";
-    homepage = "https://github.com/Silicondust/libhdhomerun";
+    homepage = https://github.com/Silicondust/libhdhomerun;
     repositories.git = "https://github.com/Silicondust/libhdhomerun.git";
     license = stdenv.lib.licenses.lgpl2;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
index 7094fa2534b..ba1f8913501 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/pkgs/development/libraries/libindicate/default.nix
@@ -56,7 +56,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "Library for raising indicators via DBus";
-    homepage = "https://launchpad.net/libindicate";
+    homepage = https://launchpad.net/libindicate;
     license = with licenses; [ lgpl21 lgpl3 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.msteen ];
diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix
index e696e778dae..1ebdcb365af 100644
--- a/pkgs/development/libraries/libindicator/default.nix
+++ b/pkgs/development/libraries/libindicator/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A set of symbols and convenience functions for Ayatana indicators";
-    homepage = "https://launchpad.net/libindicator";
+    homepage = https://launchpad.net/libindicator;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.msteen ];
diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix
index 8885092d0e7..a0205fb234c 100644
--- a/pkgs/development/libraries/libisofs/default.nix
+++ b/pkgs/development/libraries/libisofs/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ acl ];
 
   meta = with stdenv.lib; {
-    homepage = "http://libburnia-project.org/";
+    homepage = http://libburnia-project.org/;
     description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ abbradar vrthra ];
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index dbc5c1e2ae9..eac919612f0 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ file protobufc ];
 
   meta = with stdenv.lib; {
-    homepage = "http://libivykis.sourceforge.net/";
+    homepage = http://libivykis.sourceforge.net/;
     description = ''
       A thin wrapper over various OS'es implementation of I/O readiness
       notification facilities
diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix
index dec800da169..d539c61a4c9 100644
--- a/pkgs/development/libraries/libjreen/default.nix
+++ b/pkgs/development/libraries/libjreen/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "C++ Jabber library using Qt framework";
-    homepage = "https://qutim.org/jreen/";
+    homepage = https://qutim.org/jreen/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index bc23e1f2958..a53918fd5f7 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   makeFlags = [ "prefix=$(out)" ];
   preInstall = "mkdir -p $out/lib";
   meta = {
-    homepage = "http://libjson.sourceforge.net/";
+    homepage = http://libjson.sourceforge.net/;
     description = "A JSON reader and writer";
     longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language.";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix
index 39de886a0b7..a3c809c3bd6 100644
--- a/pkgs/development/libraries/libksi/default.nix
+++ b/pkgs/development/libraries/libksi/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/GuardTime/libksi";
+    homepage = https://github.com/GuardTime/libksi;
     description = "Keyless Signature Infrastructure API library";
     license = licenses.asl20;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix
index 467d707adee..1b17ff0dd43 100644
--- a/pkgs/development/libraries/libmatheval/default.nix
+++ b/pkgs/development/libraries/libmatheval/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       mathematical functions. In addition to parsing and evaluation, libmatheval can also compute 
       symbolic derivatives and output expressions to strings.
     '';
-    homepage = "https://www.gnu.org/software/libmatheval/";
+    homepage = https://www.gnu.org/software/libmatheval/;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.bzizou ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix
index 827f18d2ffc..9355c43642a 100644
--- a/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/pkgs/development/libraries/libmaxminddb/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C library for working with MaxMind geolocation DB files";
-    homepage = "https://github.com/maxmind/libmaxminddb";
+    homepage = https://github.com/maxmind/libmaxminddb;
     license = licenses.apsl20;
     platforms = platforms.all;
     maintainers = [ maintainers.vcunat ];
diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix
index 5ac5c9eee96..9375a381052 100644
--- a/pkgs/development/libraries/libmpack/default.nix
+++ b/pkgs/development/libraries/libmpack/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "Simple implementation of msgpack in C";
-    homepage = "https://github.com/tarruda/libmpack/";
+    homepage = https://github.com/tarruda/libmpack/;
     license = licenses.mit;
     maintainers = with maintainers; [ lovek323 garbas ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
index b1d26b81a8d..fa4a0f11ef4 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libmnl libnfnetlink ];
 
   meta = {
-    homepage = "http://www.netfilter.org/projects/libnetfilter_queue/";
+    homepage = http://www.netfilter.org/projects/libnetfilter_queue/;
     description = "Userspace API to packets queued by the kernel packet filter";
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index 0a01cd9825e..ba7a0af0bf5 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libgcrypt ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.cypherpunks.ca/otr/";
+    homepage = http://www.cypherpunks.ca/otr/;
     repositories.git = git://git.code.sf.net/p/otr/libotr;
     license = licenses.lgpl21;
     description = "Library for Off-The-Record Messaging";
diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix
index a423727b913..b4b72e5a36d 100644
--- a/pkgs/development/libraries/libpaper/default.nix
+++ b/pkgs/development/libraries/libpaper/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library for handling paper characteristics";
-    homepage = "http://packages.debian.org/unstable/source/libpaper";
+    homepage = http://packages.debian.org/unstable/source/libpaper;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
index 038556261a4..4da6a0b3cbc 100644
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
 
   meta = with stdenv.lib; {
-    homepage = "http://libpipeline.nongnu.org";
+    homepage = http://libpipeline.nongnu.org;
     description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way";
     platforms = platforms.unix;
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index cf3ad5f1ebb..c493dd678ad 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     license = licenses.lgpl21;
-    homepage = "http://libproxy.github.io/libproxy/";
+    homepage = http://libproxy.github.io/libproxy/;
     description = "A library that provides automatic proxy configuration management";
   };
 }
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index a5a428010b2..7d697ee10f1 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Password quality checking and random password generation library";
-    homepage = "https://github.com/libpwquality/libpwquality";
+    homepage = https://github.com/libpwquality/libpwquality;
     license = licenses.bsd3;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix
index 1d0463c090a..add0a5bc2bb 100644
--- a/pkgs/development/libraries/libqrencode/default.nix
+++ b/pkgs/development/libraries/libqrencode/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://fukuchi.org/works/qrencode/";
+    homepage = http://fukuchi.org/works/qrencode/;
     description = "A C library for encoding data in a QR Code symbol";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix
index ef194bb0b1e..14e3e1891ba 100644
--- a/pkgs/development/libraries/librdf/raptor.nix
+++ b/pkgs/development/libraries/librdf/raptor.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The RDF Parser Toolkit";
-    homepage = "http://librdf.org/raptor";
+    homepage = http://librdf.org/raptor;
     license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index 1271089060b..46a94e52595 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The RDF Parser Toolkit";
-    homepage = "http://librdf.org/raptor";
+    homepage = http://librdf.org/raptor;
     license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
     maintainers = with stdenv.lib.maintainers; [ marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 8a0ca6f000d..56272b31991 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library that handles Resource Description Framework (RDF)";
-    homepage = "http://librdf.org/rasqal";
+    homepage = http://librdf.org/rasqal;
     license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
     maintainers = with stdenv.lib.maintainers; [ marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 5bd18f72356..8bef305a0ec 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
   ;
   meta = {
-    homepage = "http://www.creytiv.com/re.html";
+    homepage = http://www.creytiv.com/re.html;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 5ad5f8d3848..a3e98d260ce 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
   ;
   meta = {
-    homepage = "http://www.creytiv.com/rem.html";
+    homepage = http://www.creytiv.com/rem.html;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix
index 882b3258b7d..479da52f8d9 100644
--- a/pkgs/development/libraries/libscrypt/default.nix
+++ b/pkgs/development/libraries/libscrypt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Shared library that implements scrypt() functionality";
-    homepage = "https://lolware.net/2014/04/29/libscrypt.html";
+    homepage = https://lolware.net/2014/04/29/libscrypt.html;
     license = licenses.bsd2;
     maintainers = with maintainers; [ davidak ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 49751629430..12922d4612d 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec
 
   meta =
   {
-    homepage = "https://github.com/haiwen/libsearpc";
+    homepage = https://github.com/haiwen/libsearpc;
     description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix
index 122ece574e6..2da5d68d117 100644
--- a/pkgs/development/libraries/libsieve/default.nix
+++ b/pkgs/development/libraries/libsieve/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An interpreter for RFC 3028 Sieve and various extensions";
-    homepage = "http://sodabrew.com/libsieve/";
+    homepage = http://sodabrew.com/libsieve/;
     license = licenses.lgpl21;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix
index 21b788efb89..25f2a1e0846 100644
--- a/pkgs/development/libraries/libsmi/default.nix
+++ b/pkgs/development/libraries/libsmi/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A Library to Access SMI MIB Information";
-    homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html";
+    homepage = https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html;
     license = licenses.free;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix
index dcec6b058fc..00579600cb7 100644
--- a/pkgs/development/libraries/libspiro/default.nix
+++ b/pkgs/development/libraries/libspiro/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library that simplifies the drawing of beautiful curves";
-    homepage = "https://github.com/fontforge/libspiro";
+    homepage = https://github.com/fontforge/libspiro;
     license = licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix
index 9b6e87bd57e..8b716d055a0 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/pkgs/development/libraries/libsvm/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library for support vector machines";
-    homepage = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/";
+    homepage = http://www.csie.ntu.edu.tw/~cjlin/libsvm/;
     license = licenses.bsd3;
     maintainers = [ maintainers.spwhitt ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
index 35d3d759ea8..b1dfa5ba7e4 100644
--- a/pkgs/development/libraries/libtap/default.nix
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec{
       C originally created by Nik Clayton. This is a maintenance
       branch by Shlomi Fish.
     '';
-    homepage = "http://www.shlomifish.org/open-source/projects/libtap/";
+    homepage = http://www.shlomifish.org/open-source/projects/libtap/;
     license = licenses.bsd3;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix
index 5f284d1a49a..0bc619051c6 100644
--- a/pkgs/development/libraries/libtelnet/default.nix
+++ b/pkgs/development/libraries/libtelnet/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Simple RFC-complient TELNET implementation as a C library";
-    homepage = "https://github.com/seanmiddleditch/libtelnet";
+    homepage = https://github.com/seanmiddleditch/libtelnet;
     license = stdenv.lib.licenses.publicDomain;
     maintainers = [ stdenv.lib.maintainers.tomberek ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index 0c53a3e3dad..13fa71e60dc 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/pkgs/development/libraries/libtomcrypt/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   makefile = "makefile.shared";
 
   meta = {
-    homepage = "http://libtom.org/?page=features&newsitems=5&whatfile=crypt";
+    homepage = http://libtom.org/?page=features&newsitems=5&whatfile=crypt;
     description = "A fairly comprehensive, modular and portable cryptographic toolkit";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index da8fe507540..dc9e1d01df4 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Terminal-emulator State Machine";
-    homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
+    homepage = http://www.freedesktop.org/wiki/Software/kmscon/libtsm/;
     license = licenses.mit;
     maintainers = with maintainers; [ cstrahan ];
     platforms = with platforms; unix;
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index bcbe15afdf8..66890f08ff3 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library for instrumenting- and integrating with all aspects of the Unity shell";
-    homepage = "https://launchpad.net/libunity";
+    homepage = https://launchpad.net/libunity;
     license = licenses.lgpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
index 478052dd536..3e8beef3c9d 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libplist ];
 
   meta = {
-    homepage = "http://www.libimobiledevice.org";
+    homepage = http://www.libimobiledevice.org;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index ae2492beba6..4285b05a625 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/i-rinat/libvdpau-va-gl";
+    homepage = https://github.com/i-rinat/libvdpau-va-gl;
     description = "VDPAU driver with OpenGL/VAAPI backend";
     license = licenses.lgpl3;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
index 50a1f5ac337..50a4c7c8f24 100644
--- a/pkgs/development/libraries/libvisual/default.nix
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An abstraction library for audio visualisations";
-    homepage = "http://sourceforge.net/projects/libvisual/";
+    homepage = http://sourceforge.net/projects/libvisual/;
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index 4ed3014fbe9..f38c7a90032 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "NX compression library";
-    homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
+    homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index 96e2ca87285..0d711514444 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/pkgs/development/libraries/libxls/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Extract Cell Data From Excel xls files";
-    homepage = "http://sourceforge.net/projects/libxls/";
+    homepage = http://sourceforge.net/projects/libxls/;
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix
index 8d3dd65adbf..aa2c8131392 100644
--- a/pkgs/development/libraries/libyubikey/default.nix
+++ b/pkgs/development/libraries/libyubikey/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://opensource.yubico.com/yubico-c/";
+    homepage = http://opensource.yubico.com/yubico-c/;
     description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
     license = licenses.bsd2;
     maintainers = with maintainers; [ calrama wkennington ];
diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix
index f4b7aaf3fe2..e20aa514aa2 100644
--- a/pkgs/development/libraries/libzmf/default.nix
+++ b/pkgs/development/libraries/libzmf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mpl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf";
+    homepage = https://wiki.documentfoundation.org/DLP/Libraries/libzmf;
     downloadPage = "http://dev-www.libreoffice.org/src/libzmf/";
     updateWalker = true;
   };
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
index b3333d58242..3f008744c1b 100644
--- a/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   meta = {
-    homepage = "https://github.com/arangodb/linenoise-ng";
+    homepage = https://github.com/arangodb/linenoise-ng;
     description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters";
     maintainers = with stdenv.lib.maintainers; [ cstrahan ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix
index 133bc13d1cc..3fdad73d9fa 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    homepage = "http://log4cplus.sourceforge.net/";
+    homepage = http://log4cplus.sourceforge.net/;
     description = "A port the log4j library from Java to C++";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix
index b4ec850b491..93c8a0474d9 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/pkgs/development/libraries/lucene++/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "C++ port of the popular Java Lucene search engine";
-    homepage = "https://github.com/luceneplusplus/LucenePlusPlus";
+    homepage = https://github.com/luceneplusplus/LucenePlusPlus;
     license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index aae3d0f9c8b..7b7c77659bd 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    homepage = "https://gitlab.com/mdds/mdds";
+    homepage = https://gitlab.com/mdds/mdds;
     description = "A collection of multi-dimensional data structure and indexing algorithm";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index b3c7daf990c..a490aa1e445 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ glib libfm-extra ];
 
   meta = with stdenv.lib; {
-    homepage = "http://blog.lxde.org/?tag=menu-cache";
+    homepage = http://blog.lxde.org/?tag=menu-cache;
     license = licenses.gpl2Plus;
     description = "Library to read freedesktop.org menu files";
     maintainers = [ maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 56f11396e71..5275f4ecb73 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The official C client library for MongoDB";
-    homepage = "https://github.com/mongodb/mongo-c-driver";
+    homepage = https://github.com/mongodb/mongo-c-driver;
     license = licenses.asl20;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index 4bfd4350831..cbcf83f1d32 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
     downloadPage = "http://mpir.org/downloads.html";
-    homepage = "http://mpir.org/";
+    homepage = http://mpir.org/;
     updateWalker = true;
   };
 }
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index 78312676883..8df9715a4f4 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     ./waf install
   '';
   meta = with stdenv.lib; {
-    homepage = "http://named-data.net/";
+    homepage = http://named-data.net/;
     description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
     longDescription = ''
       ndn-cxx is a C++ library, implementing Named Data Networking (NDN)
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index bf7b5397345..de9023a5710 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "C++ API to manipulate netcdf files";
-    homepage = "http://www.unidata.ucar.edu/software/netcdf/";
+    homepage = http://www.unidata.ucar.edu/software/netcdf/;
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 7561f3b322b..3696578b8e0 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
         "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct ");
 
   meta = {
-    homepage = "http://ab-initio.mit.edu/nlopt/";
+    homepage = http://ab-initio.mit.edu/nlopt/;
     description = "Free open-source library for nonlinear optimization";
     license = stdenv.lib.licenses.lgpl21Plus;
     hydraPlatforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index 278834190bb..8f3a313b21d 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A wrapper for the user, group and hosts NSS API";
-    homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary";
+    homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;";
     license = licenses.bsd3;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index a010ae9bd1a..034fbf34385 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A set of cuda-enabled texture tools and compressors";
-    homepage = "https://github.com/castano/nvidia-texture-tools";
+    homepage = https://github.com/castano/nvidia-texture-tools;
     license = licenses.mit;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index db4a8229064..e044a7bde42 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Implements double cryptographic ratchet and Megolm ratchet";
     license = stdenv.lib.licenses.asl20;
-    homepage = "https://matrix.org/git/olm/about";
+    homepage = https://matrix.org/git/olm/about;
   };
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix
index 20b7c9ba6df..613aeddd77b 100644
--- a/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "OpenCL Host API C++ bindings";
-    homepage = "http://github.khronos.org/OpenCL-CLHPP/";
+    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 58822b96b08..717bb5ad0ee 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -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;
   };
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 7f9c3803896..c5f79b8613e 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Constructive Solid Geometry library";
-    homepage = "http://www.opencsg.org/";
+    homepage = http://www.opencsg.org/;
     platforms = with stdenv.lib.platforms;
       linux;
     maintainers = with stdenv.lib.maintainers; 
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index f412346456c..71c2e56f541 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service";
-    homepage = "http://www.opendkim.org/";
+    homepage = http://www.opendkim.org/;
     maintainers = with maintainers; [ abbradar ];
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix
index fa147a9d9cc..ed646b9e221 100644
--- a/pkgs/development/libraries/openpa/default.nix
+++ b/pkgs/development/libraries/openpa/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Atomic primitives for high performance, concurrent software";
-    homepage = "https://trac.mpich.org/projects/openpa";
+    homepage = https://trac.mpich.org/projects/openpa;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ leenaars ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix
index 864e2dc7085..3ab3f68cde5 100644
--- a/pkgs/development/libraries/openslp/default.nix
+++ b/pkgs/development/libraries/openslp/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://openslp.org/";
+    homepage = http://openslp.org/;
     description = "An open-source implementation of the IETF Service Location Protocol";
     maintainers = with maintainers; [ ttuegel ];
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix
index ccb7d4179df..efaf2cfd429 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/pkgs/development/libraries/pcaudiolib/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Provides a C API to different audio devices";
-    homepage = "https://github.com/rhdunn/pcaudiolib";
+    homepage = https://github.com/rhdunn/pcaudiolib;
     license = licenses.gpl3;
     maintainers = with maintainers; [ aske ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix
index a165c539ae8..654698c1b32 100644
--- a/pkgs/development/libraries/pcg-c/default.nix
+++ b/pkgs/development/libraries/pcg-c/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A family of better random number generators";
-    homepage = "http://www.pcg-random.org/";
+    homepage = http://www.pcg-random.org/;
     license = stdenv.lib.licenses.asl20;
     longDescription = ''
       PCG is a family of simple fast space-efficient statistically good
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 93e32529592..d19410f735f 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.pcre.org/";
+    homepage = http://www.pcre.org/;
     description = "A library for Perl Compatible Regular Expressions";
     license = stdenv.lib.licenses.bsd3;
 
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 8df18530472..3b698ff74cf 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Perl Compatible Regular Expressions";
-    homepage = "http://www.pcre.org/";
+    homepage = http://www.pcre.org/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ ttuegel ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index a7551afd212..43bcef0f2d3 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://icculus.org/physfs/";
+    homepage = http://icculus.org/physfs/;
     description = "Library to provide abstract access to various archives";
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index 5318df44517..f790c62f5af 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = "http://portmedia.sourceforge.net/portmidi/";
+    homepage = http://portmedia.sourceforge.net/portmidi/;
     description = "Platform independent library for MIDI I/O";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index 44a66409d45..2ba5a262e22 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -68,7 +68,7 @@ let
 
     meta = {
       description = "Geographic Objects for PostgreSQL";
-      homepage = "http://postgis.refractions.net";
+      homepage = http://postgis.refractions.net;
       license = stdenv.lib.licenses.gpl2;
       maintainers = [stdenv.lib.maintainers.marcweber];
       platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index e8e0aba7a24..2057aee3e99 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A QML port of qtermwidget";
-    homepage = "https://github.com/Swordfish90/qmltermwidget";
+    homepage = https://github.com/Swordfish90/qmltermwidget;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 5aa1d0350fc..4cd5fb0f641 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://qpdf.sourceforge.net/";
+    homepage = http://qpdf.sourceforge.net/;
     description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
     license = licenses.artistic2;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index f0e7f958e40..ef0f5d4014e 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Platform-independent Qt API for storing passwords securely";
-    homepage = "https://github.com/frankosterfeld/qtkeychain";
+    homepage = https://github.com/frankosterfeld/qtkeychain;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index 201eb4e7ec9..e1155c4a3bc 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit";
-    homepage = "https://github.com/QupZilla/qtwebkit-plugins";
+    homepage = https://github.com/QupZilla/qtwebkit-plugins;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index cc7c7a31e1d..1bd7305867d 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "librdkafka - Apache Kafka C/C++ client library";
-    homepage = "https://github.com/edenhill/librdkafka";
+    homepage = https://github.com/edenhill/librdkafka;
     license = licenses.bsd2;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ boothead wkennington ];
diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix
index 90e1dfded6a..bc39b320c8e 100644
--- a/pkgs/development/libraries/resolv_wrapper/default.nix
+++ b/pkgs/development/libraries/resolv_wrapper/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A wrapper for the user, group and hosts NSS API";
-    homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary";
+    homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;";
     license = licenses.bsd3;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index 50f4d74d15c..5cef2576b71 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.asl20 ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://research.cs.wisc.edu/mist/safefile/";
+    homepage = http://research.cs.wisc.edu/mist/safefile/;
     updateWalker = true;
   };
 }
diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix
index c826123174b..d8e67baa13d 100644
--- a/pkgs/development/libraries/schroedinger/default.nix
+++ b/pkgs/development/libraries/schroedinger/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://diracvideo.org/";
+    homepage = http://diracvideo.org/;
     maintainers = [ maintainers.spwhitt ];
     license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 217bf4422e0..92fe4b4ab27 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://github.com/opencollab/arpack-ng";
+    homepage = http://github.com/opencollab/arpack-ng;
     description = ''
       A collection of Fortran77 subroutines to solve large scale eigenvalue
       problems.
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index e5870ce9c9b..c6797ef05ac 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://math-atlas.sourceforge.net/";
+    homepage = http://math-atlas.sourceforge.net/;
     description = "Automatically Tuned Linear Algebra Software (ATLAS)";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 6f729e8a0b2..e7c25435994 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Basic Linear Algebra Subprograms";
     license = stdenv.lib.licenses.publicDomain;
-    homepage = "http://www.netlib.org/blas/";
+    homepage = http://www.netlib.org/blas/;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix
index 920b77b223f..2e0b98496f3 100644
--- a/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
-    homepage = "https://developer.nvidia.com/cudnn";
+    homepage = https://developer.nvidia.com/cudnn;
     license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix
index 417e17e4bda..a0d8baae78f 100644
--- a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
-    homepage = "https://developer.nvidia.com/cudnn";
+    homepage = https://developer.nvidia.com/cudnn;
     license = stdenv.lib.licenses.unfree;
     maintainers = with maintainers; [ mdaiter ];
   };
diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
index cf00f780901..fd98001da82 100644
--- a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
-    homepage = "https://developer.nvidia.com/cudnn";
+    homepage = https://developer.nvidia.com/cudnn;
     license = stdenv.lib.licenses.unfree;
     maintainers = with maintainers; [ mdaiter ];
   };
diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index 87e9d929ed5..1e1a37af2f0 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
-    homepage = "https://developer.nvidia.com/cudnn";
+    homepage = https://developer.nvidia.com/cudnn;
     license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 9b9f8104c95..567ee7853f8 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A software package for large-scale nonlinear optimization";
-    homepage = "https://projects.coin-or.org/Ipopt";
+    homepage = https://projects.coin-or.org/Ipopt;
     license = licenses.epl10;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
index 3c91bf37329..61a45cbab94 100644
--- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
+++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     inherit version;
     description = "Linear Algebra PACKage";
-    homepage = "http://www.netlib.org/lapack/";
+    homepage = http://www.netlib.org/lapack/;
     license = licenses.bsd3;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index eea59164ffb..baf77696b16 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     inherit version;
     description = "Linear Algebra PACKage";
-    homepage = "http://www.netlib.org/lapack/";
+    homepage = http://www.netlib.org/lapack/;
     license = licenses.bsd3;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix
index 21805092c76..26ec501f1a7 100644
--- a/pkgs/development/libraries/science/math/magma/default.nix
+++ b/pkgs/development/libraries/science/math/magma/default.nix
@@ -39,7 +39,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Matrix Algebra on GPU and Multicore Architectures";
     license = licenses.bsd3;
-    homepage = "http://icl.cs.utk.edu/magma/index.html";
+    homepage = http://icl.cs.utk.edu/magma/index.html;
     platforms = platforms.unix;
     maintainers = with maintainers; [ ianwookim ];
   };
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 4d51d1ed02d..7edc39c11f5 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;
-    homepage = "https://github.com/xianyi/OpenBLAS";
+    homepage = https://github.com/xianyi/OpenBLAS;
     platforms = platforms.unix;
     maintainers = with maintainers; [ ttuegel ];
   };
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index f77ac7d89a3..6b229f31f16 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High quality system independent, portable, open source libm implementation";
-    homepage = "http://www.openlibm.org/";
+    homepage = http://www.openlibm.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix
index 1988c0c07af..989ad27055f 100644
--- a/pkgs/development/libraries/science/math/openspecfun/default.nix
+++ b/pkgs/development/libraries/science/math/openspecfun/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A collection of special mathematical functions";
-    homepage = "https://github.com/JuliaLang/openspecfun";
+    homepage = https://github.com/JuliaLang/openspecfun;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix
index a9bd719fdc2..1e9a8ba6a58 100644
--- a/pkgs/development/libraries/sfsexp/default.nix
+++ b/pkgs/development/libraries/sfsexp/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Small, fast s-expression library";
-    homepage = "http://sexpr.sourceforge.net/";
+    homepage = http://sexpr.sourceforge.net/;
     maintainers = with maintainers; [ jb55 ];
     license = licenses.gpl3;
     platforms = with platforms; unix;
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index b93312b0e8c..4db4a07b4e5 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library passing all socket communications through unix sockets";
-    homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary";
+    homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;";
     license = licenses.bsd3;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix
index f5927cb73e6..48ee1af0e30 100644
--- a/pkgs/development/libraries/sonic/default.nix
+++ b/pkgs/development/libraries/sonic/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple library to speed up or slow down speech";
-    homepage = "https://github.com/waywardgeek/sonic";
+    homepage = https://github.com/waywardgeek/sonic;
     license = licenses.asl20;
     maintainers = with maintainers; [ aske ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 16e7b09a0f2..ea3013c78bc 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = [];
   propagatedBuildInputs = [audiofile libtiff];
   meta = {
-    homepage = "http://www.creytiv.com/baresip.html";
+    homepage = http://www.creytiv.com/baresip.html;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index 838c30777fb..b1649da6459 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/";
+    homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/;
   };
 }
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 8a91086c5db..8dd96cdd003 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Intel Thread Building Blocks C++ Library";
-    homepage = "http://threadingbuildingblocks.org/";
+    homepage = http://threadingbuildingblocks.org/;
     license = stdenv.lib.licenses.lgpl3Plus;
     longDescription = ''
       Intel Threading Building Blocks offers a rich and complete approach to
diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 2c1e3a2dfc9..e0354bf01eb 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ tcl ];
 
   meta = {
-    homepage = "http://tcl.activestate.com/software/tcllib/";
+    homepage = http://tcl.activestate.com/software/tcllib/;
     description = "Tcl-only library of standard routines for Tcl";
     license = stdenv.lib.licenses.tcltk;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix
index 29c96bea421..4e1f0bcab03 100644
--- a/pkgs/development/libraries/tcltls/default.nix
+++ b/pkgs/development/libraries/tcltls/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://tls.sourceforge.net/";
+    homepage = http://tls.sourceforge.net/;
     description = "An OpenSSL / RSA-bsafe Tcl extension";
     license = stdenv.lib.licenses.tcltk;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix
index 93cf0670dc7..e835d1d86fd 100644
--- a/pkgs/development/libraries/tecla/default.nix
+++ b/pkgs/development/libraries/tecla/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://www.astro.caltech.edu/~mcs/tecla/";
+    homepage = http://www.astro.caltech.edu/~mcs/tecla/;
     description = "Command-line editing library";
     license = "as-is";
 
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 7bff890eb0b..d66b5d82ff5 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://sourceforge.net/projects/libtirpc/";
+    homepage = http://sourceforge.net/projects/libtirpc/;
     description = "The transport-independent Sun RPC implementation (TI-RPC)";
     license = licenses.bsd3;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index f885fc3f954..b208631eeaf 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "Simple, small, C++ XML parser that can be easily integrating into other programs";
-    homepage = "http://www.grinninglizard.com/tinyxml/index.html";
+    homepage = http://www.grinninglizard.com/tinyxml/index.html;
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix
index 31404e84d25..d11a5c344c9 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/pkgs/development/libraries/tntdb/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.tntnet.org/tntdb.html";
+    homepage = http://www.tntnet.org/tntdb.html;
     description = "C++ library which makes accessing SQL databases easy and robust";
     platforms = platforms.linux ;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix
index 93f4d43e6f6..cd4ba34b33c 100644
--- a/pkgs/development/libraries/tntnet/default.nix
+++ b/pkgs/development/libraries/tntnet/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.tntnet.org/tntnet.html";
+    homepage = http://www.tntnet.org/tntnet.html;
     description = "Web server which allows users to develop web applications using C++";
     platforms = platforms.linux ;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index d53941b5e2f..9a2f6eb203a 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A wrapper for the user, group and hosts NSS API";
-    homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary";
+    homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;";
     license = licenses.bsd3;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix
index cee71df4849..97cffbf0f75 100644
--- a/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/pkgs/development/libraries/unittest-cpp/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = {
-    homepage = "https://github.com/unittest-cpp/unittest-cpp";
+    homepage = https://github.com/unittest-cpp/unittest-cpp;
     description = "Lightweight unit testing framework for C++";
     license = licenses.mit;
     maintainers = [];
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
index 2beaa616f2d..1af70056d2e 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/pkgs/development/libraries/vc/0.7.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library for multiprecision complex arithmetic with exact rounding";
-    homepage = "https://github.com/VcDevel/Vc";
+    homepage = https://github.com/VcDevel/Vc;
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index 6bf4ab9bdab..6a72feed73f 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library for multiprecision complex arithmetic with exact rounding";
-    homepage = "https://github.com/VcDevel/Vc";
+    homepage = https://github.com/VcDevel/Vc;
     license = licenses.bsd3;
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix
index 6225fb18e28..b7249c8ee82 100644
--- a/pkgs/development/libraries/vcg/default.nix
+++ b/pkgs/development/libraries/vcg/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://vcg.isti.cnr.it/vcglib/install.html";
+    homepage = http://vcg.isti.cnr.it/vcglib/install.html;
     description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix
index b50d94b90a5..6231a59dbd1 100644
--- a/pkgs/development/libraries/webkitgtk/2.16.nix
+++ b/pkgs/development/libraries/webkitgtk/2.16.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
-    homepage = "http://webkitgtk.org/";
+    homepage = http://webkitgtk.org/;
     license = licenses.bsd2;
     platforms = with platforms; linux ++ darwin;
     hydraPlatforms = [];
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 603df0407ea..40b27f67fff 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Web content rendering engine, GTK+ port";
-    homepage = "http://webkitgtk.org/";
+    homepage = http://webkitgtk.org/;
     license = licenses.bsd2;
     platforms = with platforms; linux ++ darwin;
     maintainers = [];
diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix
index ebd9d51208a..2672d6efbec 100644
--- a/pkgs/development/libraries/websocket++/default.nix
+++ b/pkgs/development/libraries/websocket++/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake ];
 
   meta = {
-    homepage = "http://www.zaphoyd.com/websocketpp/";
+    homepage = http://www.zaphoyd.com/websocketpp/;
     description = "C++/Boost Asio based websocket client/server library";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index e25b23e84ed..be661d0d270 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   patches = [ ./cmake.patch ];  # fix a cmake warning; PR sent to upstream 
 
   meta = with stdenv.lib; {
-    homepage = "https://www.webtoolkit.eu/wt";
+    homepage = https://www.webtoolkit.eu/wt;
     description = "C++ library for developing web applications";
     platforms = platforms.linux ;
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index 15db4386e01..d9e84008b31 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   meta = {
     platforms = platforms.linux;
     license = licenses.wxWindows;
-    homepage = "https://www.wxwidgets.org/";
+    homepage = https://www.wxwidgets.org/;
     description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
     longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index af9dde75cf4..a42189331d0 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
   meta = {
     platforms = with platforms; darwin ++ linux;
     license = licenses.wxWindows;
-    homepage = "https://www.wxwidgets.org/";
+    homepage = https://www.wxwidgets.org/;
     description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
     longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index f7fcf8a2206..6e33f5580cd 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
   meta = {
     platforms = with platforms; darwin ++ linux;
     license = licenses.wxWindows;
-    homepage = "https://www.wxwidgets.org/";
+    homepage = https://www.wxwidgets.org/;
     description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
     longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index fc747268cab..0e246829439 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.darwin;
     license = licenses.wxWindows;
     maintainers = [ maintainers.lnl7 ];
-    homepage = "https://www.wxwidgets.org/";
+    homepage = https://www.wxwidgets.org/;
     description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
     longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index bdc21d72ac3..e37991367e6 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
-    homepage = "https://github.com/dmlc/xgboost";
+    homepage = https://github.com/dmlc/xgboost;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index 44f57cae7e1..b274bba9c12 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++/C library to construct Excel .xls files in code";
-    homepage = "http://sourceforge.net/projects/xlslib/";
+    homepage = http://sourceforge.net/projects/xlslib/;
     license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index 33c30a96251..e41dfbc6a72 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.zeroc.com/ice.html";
+    homepage = http://www.zeroc.com/ice.html;
     description = "The internet communications engine";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix
index 54265d2f095..2252f8fe43c 100644
--- a/pkgs/development/libraries/zeromq/3.x.nix
+++ b/pkgs/development/libraries/zeromq/3.x.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     branch = "3";
-    homepage = "http://www.zeromq.org";
+    homepage = http://www.zeromq.org;
     description = "The Intelligent Transport Layer";
     license = licenses.gpl3;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index a797960b2f0..030246db318 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     branch = "4";
-    homepage = "http://www.zeromq.org";
+    homepage = http://www.zeromq.org;
     description = "The Intelligent Transport Layer";
     license = licenses.gpl3;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix
index c22bb645be2..0ec24c828a6 100644
--- a/pkgs/development/libraries/zookeeper_mt/default.nix
+++ b/pkgs/development/libraries/zookeeper_mt/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    buildInputs = [ zookeeper bash ];
 
    meta = with stdenv.lib; {
-   	homepage = "http://zookeeper.apache.org";
+   	homepage = http://zookeeper.apache.org;
    	description = "Apache Zookeeper";
    	license = licenses.asl20;
    	maintainers = [ maintainers.boothead ];	
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index bc303429274..681e6fcc528 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -16,7 +16,7 @@ buildRustPackage rec {
   depsSha256 = "1xcfhbnz208dk7xb748v8kv28zbhyr7wqg9gsgbiw3lnvc2a3nn6";
 
   meta = {
-    homepage = "http://github.com/cgag/loc";
+    homepage = http://github.com/cgag/loc;
     description = "Count lines of code quickly";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix
index 834460748ca..68f7e6c49ce 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/pkgs/development/mobile/adb-sync/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tool to synchronise files between a PC and an Android devices using ADB (Android Debug Bridge)";
-    homepage = "https://github.com/google/adb-sync";
+    homepage = https://github.com/google/adb-sync;
     license = licenses.asl20;
     platforms = platforms.unix;
     hydraPlatforms = [];
diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
index 06d38c700dd..0c1bb5d4d42 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.flashtool.net/";
+    homepage = http://www.flashtool.net/;
     description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
     license = stdenv.lib.licenses.unfreeRedistributableFirmware;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix
index 7edd0ddda5e..ee25a47670e 100644
--- a/pkgs/development/ocaml-modules/ansiterminal/default.nix
+++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://forge.ocamlcore.org/projects/ansiterminal";
+    homepage = https://forge.ocamlcore.org/projects/ansiterminal;
     description = "A module allowing to use the colors and cursor movements on ANSI terminals";
     longDescription = ''
       ANSITerminal is a module allowing to use the colors and cursor
diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix
index fa9b353f4d6..121f484ce41 100644
--- a/pkgs/development/ocaml-modules/bolt/default.nix
+++ b/pkgs/development/ocaml-modules/bolt/default.nix
@@ -47,7 +47,7 @@ EOF
   checkTarget = "tests";
 
   meta = with stdenv.lib; {
-    homepage = "http://bolt.x9c.fr";
+    homepage = http://bolt.x9c.fr;
     description = "A logging tool for the OCaml language";
     longDescription = ''
       Bolt is a logging tool for the OCaml language. It is inspired by and
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 9ecd6dae294..58fbc813362 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/cryptokit";
 
   meta = {
-    homepage = "http://pauillac.inria.fr/~xleroy/software.html";
+    homepage = http://pauillac.inria.fr/~xleroy/software.html;
     description = "A library of cryptographic primitives for OCaml";
     platforms = ocaml.meta.platforms or [];
     maintainers = [
diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix
index 8bfab87fc39..c0c8eb51f71 100644
--- a/pkgs/development/ocaml-modules/estring/default.nix
+++ b/pkgs/development/ocaml-modules/estring/default.nix
@@ -10,7 +10,7 @@ buildOcaml rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://estring.forge.ocamlcore.org/";
+    homepage = http://estring.forge.ocamlcore.org/;
     description = "Extension for string literals";
     license = licenses.bsd3;
   };
diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix
index 1e3a9713406..e8d9267aa85 100644
--- a/pkgs/development/ocaml-modules/higlo/default.nix
+++ b/pkgs/development/ocaml-modules/higlo/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "OCaml library for syntax highlighting";
-    homepage = "https://zoggy.github.io/higlo/";
+    homepage = https://zoggy.github.io/higlo/;
     license = licenses.lgpl3;
     platforms = ocaml.meta.platforms or [];
     maintainers = with maintainers; [ regnat ];
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix
index 5b902afcb6d..a4e4bf8674f 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
   installPhase = "ocaml setup.ml -install";
 
   meta = with stdenv.lib; {
-    homepage = "http://forge.ocamlcore.org/projects/cairo";
+    homepage = http://forge.ocamlcore.org/projects/cairo;
     description = "Binding to Cairo, a 2D Vector Graphics Library";
     longDescription = ''
       This is a binding to Cairo, a 2D graphics library with support for
diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix
index d90fda954ba..10d8484e3ef 100644
--- a/pkgs/development/ocaml-modules/ocaml-text/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
 
   meta = {
-    homepage = "http://ocaml-text.forge.ocamlcore.org/";
+    homepage = http://ocaml-text.forge.ocamlcore.org/;
     description = "A library for convenient text manipulation";
     license = stdenv.lib.licenses.bsd3;
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 561d6ef0373..de69ce47228 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   createFindlibDestdir = true;
 
   meta = {
-    homepage = "http://sourceforge.net/projects/ocamlfuse";
+    homepage = http://sourceforge.net/projects/ocamlfuse;
     license = stdenv.lib.licenses.gpl2;
     description = "ocaml binding for fuse";
     maintainers = with stdenv.lib.maintainers; [ bennofs ];
diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix
index a7757d1eacd..3b904a09dad 100644
--- a/pkgs/development/ocaml-modules/ocamlmake/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    homepage = "http://www.ocaml.info/home/ocaml_sources.html";
+    homepage = http://www.ocaml.info/home/ocaml_sources.html;
     description = "Generic OCaml Makefile for GNU Make";
     license = "LGPL";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
index 4da9fb45d33..6117d30665f 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "OCaml library to read and write configuration options in JSON syntax";
-    homepage = "https://zoggy.github.io/ocf/";
+    homepage = https://zoggy.github.io/ocf/;
     license = licenses.lgpl3;
     platforms = ocaml.meta.platforms or [];
     maintainers = with maintainers; [ regnat ];
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index d2e0e0aa727..63696ad3e0c 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -19,7 +19,7 @@ buildOcaml {
   configurePhase = "true";	# Skip configure phase
 
   meta = with stdenv.lib; {
-    homepage = "https://bitbucket.org/mmottl/pcre-ocaml";
+    homepage = https://bitbucket.org/mmottl/pcre-ocaml;
     description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
     license = licenses.lgpl21;
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix
index 4775b2fe12e..9d5f4f4e669 100644
--- a/pkgs/development/ocaml-modules/ppx_blob/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix
@@ -12,7 +12,7 @@ buildOcaml rec {
   buildInputs = [ ppx_tools ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/johnwhitington/ppx_blob";
+    homepage = https://github.com/johnwhitington/ppx_blob;
     description = "OCaml ppx to include binary data from a file as a string";
     license = licenses.unlicense;
   };
diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix
index 403c39a465d..5a313ce4e1b 100644
--- a/pkgs/development/ocaml-modules/pycaml/default.nix
+++ b/pkgs/development/ocaml-modules/pycaml/default.nix
@@ -43,7 +43,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://github.com/chemoelectric/pycaml";
+    homepage = http://github.com/chemoelectric/pycaml;
     description = "Bindings for python and ocaml";
     license = "LGPL";
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix
index f5f32e9bc03..d0363abbf2c 100644
--- a/pkgs/development/ocaml-modules/sqlexpr/default.nix
+++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix
@@ -12,7 +12,7 @@ buildOcaml rec {
   propagatedBuildInputs = [ ocaml_batteries csv ocaml_lwt ocaml_sqlite3 estring ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/mfp/ocaml-sqlexpr";
+    homepage = http://github.com/mfp/ocaml-sqlexpr;
     description = "Type-safe, convenient SQLite database access";
     license = licenses.lgpl21;
   };
diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
index 5e6f5967d13..c54642afb41 100644
--- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
 
   meta = {
-    homepage = "http://forge.ocamlcore.org/projects/type-conv/";
+    homepage = http://forge.ocamlcore.org/projects/type-conv/;
     description = "Support library for OCaml preprocessor type conversions";
     license = stdenv.lib.licenses.lgpl21;
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
index e65306d1501..f10884d7203 100644
--- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
@@ -12,7 +12,7 @@ buildOcaml rec {
   };
 
   meta = {
-    homepage = "https://github.com/janestreet/type_conv/";
+    homepage = https://github.com/janestreet/type_conv/;
     description = "Support library for preprocessor type conversions";
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ z77z ericbmerritt ];
diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix
index 82f635afb68..83e4451e668 100644
--- a/pkgs/development/ocaml-modules/xml-light/default.nix
+++ b/pkgs/development/ocaml-modules/xml-light/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       entirely written in OCaml, hence it does not require additional C
       library.
     '';
-    homepage = "http://tech.motion-twin.com/xmllight.html";
+    homepage = http://tech.motion-twin.com/xmllight.html;
     license = stdenv.lib.licenses.lgpl21;
     maintainers = [ stdenv.lib.maintainers.romildo ];
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
index 86c9974c931..77569c44bec 100644
--- a/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Xml template library for OCaml";
-    homepage = "https://zoggy.github.io/xtmpl/";
+    homepage = https://zoggy.github.io/xtmpl/;
     license = licenses.lgpl3;
     platforms = ocaml.meta.platforms or [];
     maintainers = with maintainers; [ regnat ];
diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix
index ff744fc1b8a..2f72f7c16a7 100644
--- a/pkgs/development/python-modules/FormEncode/default.nix
+++ b/pkgs/development/python-modules/FormEncode/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "FormEncode validates and converts nested structures";
-    homepage = "http://formencode.org";
+    homepage = http://formencode.org;
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index 520a9c3a30b..fe8597f4d48 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   };
 
   meta = {
-    homepage = "https://getnikola.com/";
+    homepage = https://getnikola.com/;
     description = "A modular, fast, simple, static website and blog generator";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jluttine ];
diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix
index 893caa88d67..f9ce1fa026f 100644
--- a/pkgs/development/python-modules/Pmw/default.nix
+++ b/pkgs/development/python-modules/Pmw/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A toolkit for building high-level compound widgets in Python using the Tkinter module";
-    homepage = "http://pmw.sourceforge.net/";
+    homepage = http://pmw.sourceforge.net/;
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mounium ];
   };
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix
index e4edaf83a25..61964eb7b06 100644
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python implementation of the JSON-LD API";
-    homepage = "https://github.com/digitalbazaar/pyld";
+    homepage = https://github.com/digitalbazaar/pyld;
     license = licenses.bsd3;
     maintainers = with maintainers; [ apeschar ];
   };
diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/development/python-modules/ansible/2.1.nix
index 077bfa198aa..6c7f2090523 100644
--- a/pkgs/development/python-modules/ansible/2.1.nix
+++ b/pkgs/development/python-modules/ansible/2.1.nix
@@ -49,7 +49,7 @@ in buildPythonPackage rec {
     boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
 
   meta = {
-    homepage = "http://www.ansible.com";
+    homepage = http://www.ansible.com;
     description = "A simple automation tool";
     license = with lib.licenses; [ gpl3] ;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/development/python-modules/ansible/2.2.nix
index d62c1e74822..48e3be96695 100644
--- a/pkgs/development/python-modules/ansible/2.2.nix
+++ b/pkgs/development/python-modules/ansible/2.2.nix
@@ -50,7 +50,7 @@ in buildPythonPackage rec {
     boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
 
   meta = {
-    homepage = "http://www.ansible.com";
+    homepage = http://www.ansible.com;
     description = "A simple automation tool";
     license = with lib.licenses; [ gpl3] ;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/development/python-modules/ansible/2.3.nix b/pkgs/development/python-modules/ansible/2.3.nix
index e5152029f8f..36fb44498b5 100644
--- a/pkgs/development/python-modules/ansible/2.3.nix
+++ b/pkgs/development/python-modules/ansible/2.3.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
 
   meta = {
-    homepage = "http://www.ansible.com";
+    homepage = http://www.ansible.com;
     description = "A simple automation tool";
     license = with lib.licenses; [ gpl3] ;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix
index 3a45811ed9b..ca29b631f47 100644
--- a/pkgs/development/python-modules/ansicolor/default.nix
+++ b/pkgs/development/python-modules/ansicolor/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/numerodix/ansicolor/";
+    homepage = https://github.com/numerodix/ansicolor/;
     description = "A library to produce ansi color output and colored highlighting and diffing";
     license = licenses.asl20;
     maintainers = with maintainers; [ andsild ];
diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix
index bc070180654..9192186cd71 100644
--- a/pkgs/development/python-modules/ansicolors/default.nix
+++ b/pkgs/development/python-modules/ansicolors/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/verigak/colors/";
+    homepage = https://github.com/verigak/colors/;
     description = "ANSI colors for Python";
     license = licenses.isc;
     maintainers = with maintainers; [ copumpkin ];
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index be86eddc2ae..adefb06303c 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Namespace control and lazy-import mechanism";
-    homepage = "http://bitbucket.org/hpk42/apipkg";
+    homepage = http://bitbucket.org/hpk42/apipkg;
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index cd0cc47d9e7..228ffa7e521 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Bash tab completion for argparse";
-    homepage = "https://argcomplete.readthedocs.io";
+    homepage = https://argcomplete.readthedocs.io;
     maintainers = [ maintainers.womfoo ];
     license = [ licenses.asl20 ];
   };
diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix
index 7431f4f478f..cf7dea6cca7 100644
--- a/pkgs/development/python-modules/args/default.nix
+++ b/pkgs/development/python-modules/args/default.nix
@@ -12,6 +12,6 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Command Arguments for Humans";
-    homepage = "https://github.com/kennethreitz/args";
+    homepage = https://github.com/kennethreitz/args;
   };
 }
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 6e3e66167f1..836ce3addea 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Astronomy/Astrophysics library for Python";
-    homepage = "http://www.astropy.org";
+    homepage = http://www.astropy.org;
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ kentjames ];
diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix
index 3f43318f08a..9ff3b2adfd9 100644
--- a/pkgs/development/python-modules/bitcoin-price-api/default.nix
+++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = "http://github.com/dursk/bitcoin-price-api";
+    homepage = http://github.com/dursk/bitcoin-price-api;
     description = "Price APIs for bitcoin exchanges";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ bhipple ];
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 19acf7b49ef..b73bcfe8185 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -40,7 +40,7 @@ in buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "https://fedoraproject.org/wiki/Blivet";
+    homepage = https://fedoraproject.org/wiki/Blivet;
     description = "Module for management of a system's storage configuration";
     license = with licenses; [ gpl2Plus lgpl21Plus ];
     platforms = platforms.linux;
diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix
index 67dd0c8c9d7..cd419039f33 100644
--- a/pkgs/development/python-modules/browsermob-proxy/default.nix
+++ b/pkgs/development/python-modules/browsermob-proxy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A library for interacting with Browsermob Proxy";
-    homepage = "http://oss.theautomatedtester.co.uk/browsermob-proxy-py";
+    homepage = http://oss.theautomatedtester.co.uk/browsermob-proxy-py;
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 788c42ebf15..4267bbb7074 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage {
   postInstall = "mv $out/bin/buildout{,-nix}";
 
   meta = {
-    homepage = "http://www.buildout.org";
+    homepage = http://www.buildout.org;
     description = "A software build and configuration system";
     license = stdenv.lib.licenses.zpt21;
     maintainers = [ stdenv.lib.maintainers.goibhniu ];
diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix
index 8eb18db08f9..017088d2e33 100644
--- a/pkgs/development/python-modules/chainmap/default.nix
+++ b/pkgs/development/python-modules/chainmap/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Backport/clone of ChainMap";
-    homepage = "https://bitbucket.org/jeunice/chainmap";
+    homepage = https://bitbucket.org/jeunice/chainmap;
     license = licenses.psfl;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index bd5d8b7dca6..d26008231b0 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Confluent's Apache Kafka client for Python";
-    homepage = "https://github.com/confluentinc/confluent-kafka-python";
+    homepage = https://github.com/confluentinc/confluent-kafka-python;
     license = licenses.asl20;
     maintainers = with maintainers; [ mlieberman85 ];
   };
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 740b0644381..32d925f3648 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Minimal task scheduling abstraction";
-    homepage = "http://github.com/ContinuumIO/dask/";
+    homepage = http://github.com/ContinuumIO/dask/;
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
   };
diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index 2d06b41d2db..83e8f1c4d58 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ django ];
 
   meta = {
-    homepage = "https://github.com/django-polymorphic/django-polymorphic";
+    homepage = https://github.com/django-polymorphic/django-polymorphic;
     description = "Improved Django model inheritance with automatic downcasting";
     license = stdenv.lib.licenses.bsd3;
   };
diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix
index e32a9262f53..30baed39bd6 100644
--- a/pkgs/development/python-modules/dkimpy/default.nix
+++ b/pkgs/development/python-modules/dkimpy/default.nix
@@ -43,7 +43,7 @@ buildPythonApplication rec {
       records. This version also supports the experimental Authenticated
       Received Chain (ARC) protocol.
     '';
-    homepage = "https://launchpad.net/dkimpy";
+    homepage = https://launchpad.net/dkimpy;
     license = licenses.bsd3;
     maintainers = with maintainers; [ leenaars ];
   };
diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix
index 25435c396d7..8cfedb82f6c 100644
--- a/pkgs/development/python-modules/docker_compose.nix
+++ b/pkgs/development/python-modules/docker_compose.nix
@@ -38,7 +38,7 @@ buildPythonApplication rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://docs.docker.com/compose/";
+    homepage = https://docs.docker.com/compose/;
     description = "Multi-container orchestration for Docker";
     license = licenses.asl20;
     platforms = platforms.linux;
diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv.nix
index ba40b0b3f85..d2de9f9f15b 100644
--- a/pkgs/development/python-modules/ds4drv.nix
+++ b/pkgs/development/python-modules/ds4drv.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Userspace driver for the DualShock 4 controller";
-    homepage = "https://github.com/chrippa/ds4drv";
+    homepage = https://github.com/chrippa/ds4drv;
     license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index 57549792d21..6fd445a89f5 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Pure Pyhton Elliptic Curve Library";
-    homepage = "https://github.com/ubinity/ECPy";
+    homepage = https://github.com/ubinity/ECPy;
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix
index 1cdf85385e8..9cb09e8f720 100644
--- a/pkgs/development/python-modules/ed25519/default.nix
+++ b/pkgs/development/python-modules/ed25519/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Ed25519 public-key signatures";
-    homepage = "https://github.com/warner/python-ed25519";
+    homepage = https://github.com/warner/python-ed25519;
     license = licenses.mit;
     maintainers = with maintainers; [ np ];
   };
diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login.nix
index a463964b312..3c7731c30a8 100644
--- a/pkgs/development/python-modules/flask-login.nix
+++ b/pkgs/development/python-modules/flask-login.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   doCheck = pythonAtLeast "3.3";
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/maxcountryman/flask-login";
+    homepage = https://github.com/maxcountryman/flask-login;
     description = "User session management for Flask";
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/pkgs/development/python-modules/flask-restplus/0.8.nix b/pkgs/development/python-modules/flask-restplus/0.8.nix
index bd586aeb32f..2c415ec47e3 100644
--- a/pkgs/development/python-modules/flask-restplus/0.8.nix
+++ b/pkgs/development/python-modules/flask-restplus/0.8.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = "https://github.com/noirbizarre/flask-restplus";
+    homepage = https://github.com/noirbizarre/flask-restplus;
     description = "Fast, easy and documented API development with Flask";
     license = lib.licenses.mit;
   };
diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
index f14c9982b6d..a89f9979003 100644
--- a/pkgs/development/python-modules/flask-restplus/default.nix
+++ b/pkgs/development/python-modules/flask-restplus/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = "https://github.com/noirbizarre/flask-restplus";
+    homepage = https://github.com/noirbizarre/flask-restplus;
     description = "Fast, easy and documented API development with Flask";
     license = lib.licenses.mit;
   };
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 602fa50d00c..fbe83733404 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    homepage = "https://github.com/fonttools/fonttools";
+    homepage = https://github.com/fonttools/fonttools;
     description = "A library to manipulate font files from Python";
   };
 }
diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix
index 67ee9779073..5c188dc5a9f 100644
--- a/pkgs/development/python-modules/funcsigs/default.nix
+++ b/pkgs/development/python-modules/funcsigs/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
-    homepage = "https://github.com/aliles/funcsigs";
+    homepage = https://github.com/aliles/funcsigs;
     maintainers = with maintainers; [ garbas ];
     license = licenses.asl20;
   };
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 51794059b8e..3892ee105c4 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Topic-modelling library";
-    homepage = "https://radimrehurek.com/gensim/";
+    homepage = https://radimrehurek.com/gensim/;
     license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ jpbernardy ];
   };
diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix
index ac476f6bb6a..526073edd29 100644
--- a/pkgs/development/python-modules/grammalecte/default.nix
+++ b/pkgs/development/python-modules/grammalecte/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Grammalecte is an open source grammar checker for the French language";
-    homepage = "https://dicollecte.org/grammalecte/";
+    homepage = https://dicollecte.org/grammalecte/;
     license = with lib.licenses; [ gpl3 ];
     maintainers = with lib.maintainers; [ apeyroux ];
   };
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 7b517df0922..0bc8b969f5a 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -38,7 +38,7 @@ in buildPythonPackage rec {
   meta = {
     description =
       "Pythonic interface to the HDF5 binary data format";
-    homepage = "http://www.h5py.org/";
+    homepage = http://www.h5py.org/;
     license = stdenv.lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 011954ae827..b15b2d0817a 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Deep Learning library for Theano and TensorFlow";
-    homepage = "https://keras.io";
+    homepage = https://keras.io;
     license = licenses.mit;
     maintainers = with maintainers; [ NikolaMandic ];
   };
diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix
index e7c67819ed7..f6b12cae001 100644
--- a/pkgs/development/python-modules/leather/default.nix
+++ b/pkgs/development/python-modules/leather/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six ];
 
   meta = with stdenv.lib; {
-    homepage = "http://leather.rtfd.io";
+    homepage = http://leather.rtfd.io;
     description = "Python charting library";
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 9ed18190a8e..f8faab3fbb8 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python library to communicate with Ledger Blue/Nano S";
-    homepage = "https://github.com/LedgerHQ/blue-loader-python";
+    homepage = https://github.com/LedgerHQ/blue-loader-python;
     license = licenses.asl20;
     maintainers = with maintainers; [ np ];
   };
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index 4a3839537e3..5318142fe70 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Using hardware wallets as SSH/GPG agent";
-    homepage = "https://github.com/romanz/trezor-agent";
+    homepage = https://github.com/romanz/trezor-agent;
     license = licenses.gpl3;
     maintainers = with maintainers; [ np ];
   };
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index 1e9434e3193..47110ffe3ba 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Communication library between internal components for Ultimaker software";
-    homepage = "https://github.com/Ultimaker/libArcus";
+    homepage = https://github.com/Ultimaker/libArcus;
     license = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 324740f17de..f70c9a57e5f 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ xvapx ];
     description = "Python bindings for libsodium based on ctypes";
-    homepage = "https://pypi.python.org/pypi/libnacl";
+    homepage = https://pypi.python.org/pypi/libnacl;
     license = licenses.asl20;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index c08d05c0341..fa9c6ac18f3 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A lightweight LLVM python binding for writing JIT compilers";
-    homepage = "http://llvmlite.pydata.org/";
+    homepage = http://llvmlite.pydata.org/;
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ fridh ];
   };
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index a777094aea1..d4a356eaec4 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Securely transfer data between computers";
-    homepage = "https://github.com/warner/magic-wormhole";
+    homepage = https://github.com/warner/magic-wormhole;
     license = licenses.mit;
     maintainers = with maintainers; [ asymmetric ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix
index 8e8af34fcdc..5b81d3da8ec 100644
--- a/pkgs/development/python-modules/marionette-harness/default.nix
+++ b/pkgs/development/python-modules/marionette-harness/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mozilla Marionette protocol test automation harness";
-    homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette";
+    homepage = https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
index 9a3fe07680d..9e418af8a71 100644
--- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix
+++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mozilla test manifest handling";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
index ea72c0d0d18..27c4d1bcb61 100644
--- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
+++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mozilla Marionette driver";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Marionette";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Marionette;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
index d47cdd83976..0e404f69caa 100644
--- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Minidump stack trace extractor";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index 2dc0e9b860a..00329aa1d3f 100644
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mozilla-authored device management";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix
index eb627dcf243..d3273303691 100644
--- a/pkgs/development/python-modules/marionette-harness/mozfile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "File utilities for Mozilla testing";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
index 32580d7f772..ca489929d3a 100644
--- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Webserver for Mozilla testing";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
index 55670693094..d22e92876bf 100644
--- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "System information utilities for Mozilla testing";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
index 34a1fbf3aa0..7382425f240 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mozilla logging library";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
index 6a42ad0d872..45fba9761e5 100644
--- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix
+++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Network utilities for Mozilla testing";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
index db3c713acad..b6bea84aa23 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mozilla-authored process handling";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
index 3639d63e548..5e939d4f333 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mozilla application profile handling library";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
index 20942955c4c..b0c3f6d8bcf 100644
--- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mozilla application start/stop helpers";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix
index 0ac697ce35f..ad2be9b1923 100644
--- a/pkgs/development/python-modules/marionette-harness/moztest.nix
+++ b/pkgs/development/python-modules/marionette-harness/moztest.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Mozilla test result storage and output";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix
index 7d01767490c..62605a1d21d 100644
--- a/pkgs/development/python-modules/marionette-harness/mozversion.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Application version information library";
-    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix
index 472bba26eb6..63625b3e3b4 100644
--- a/pkgs/development/python-modules/mccabe/default.nix
+++ b/pkgs/development/python-modules/mccabe/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "McCabe checker, plugin for flake8";
-    homepage = "https://github.com/flintwork/mccabe";
+    homepage = https://github.com/flintwork/mccabe;
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ];
   };
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index a9ffe37a463..068162dd692 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = {
     description =
       "Python bindings for the Message Passing Interface standard";
-    homepage = "http://code.google.com/p/mpi4py/";
+    homepage = http://code.google.com/p/mpi4py/;
     license = stdenv.lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index 143c57321b6..81340923fde 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "The Jupyter Notebook format";
-    homepage = "http://jupyter.org/";
+    homepage = http://jupyter.org/;
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
   };
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 75b946b4051..19d135fc0e1 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Scientific tools for Python";
-    homepage = "http://numpy.scipy.org/";
+    homepage = http://numpy.scipy.org/;
     maintainers = with lib.maintainers; [ fridh ];
   };
 }
diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
index 776ec7ffc4b..4ba93bb57f2 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Core utilities for Python packages";
-    homepage = "https://github.com/pypa/packaging";
+    homepage = https://github.com/pypa/packaging;
     license = [ licenses.bsd2 licenses.asl20 ];
     maintainers = with maintainers; [ bennofs ];
   };
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index e9297676eaf..ca3f20d7ca3 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -85,7 +85,7 @@ in buildPythonPackage rec {
     # https://github.com/pandas-dev/pandas/issues/14866
     # pandas devs are no longer testing i686 so safer to assume it's broken
     broken = stdenv.isi686;
-    homepage = "http://pandas.pydata.org/";
+    homepage = http://pandas.pydata.org/;
     description = "Python Data Analysis Library";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ];
diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index 68a2ef484c5..2fa6c2b3930 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = "http://docs.openstack.org/developer/pbr/";
+    homepage = http://docs.openstack.org/developer/pbr/;
     license = stdenv.lib.licenses.asl20;
     description = "Python Build Reasonableness";
   };
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index b54bcc0ed1d..ea582afd96f 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A tool to generate a static blog from reStructuredText or Markdown input files";
-    homepage = "http://getpelican.com/";
+    homepage = http://getpelican.com/;
     license = licenses.agpl3;
     maintainers = with maintainers; [ offline prikhi garbas ];
   };
diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix
index 93933c43523..219ae4d7007 100644
--- a/pkgs/development/python-modules/pika-pool/default.nix
+++ b/pkgs/development/python-modules/pika-pool/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pika ];
   meta = with stdenv.lib; {
-    homepage = "https://github.com/bninja/pika-pool";
+    homepage = https://github.com/bninja/pika-pool;
     license = licenses.bsdOriginal;
     description = "Pools for pikas.";
   };
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 0fbb36b3c19..9161e8a43b6 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://python-pillow.github.io/";
+    homepage = https://python-pillow.github.io/;
     description = "Fork of The Python Imaging Library (PIL)";
     longDescription = ''
       The Python Imaging Library (PIL) adds image processing
diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix
index 75fb75f9318..45887bdc748 100644
--- a/pkgs/development/python-modules/pyGithub/default.nix
+++ b/pkgs/development/python-modules/pyGithub/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   '';
   propagatedBuildInputs = [ python-jose ];
   meta = with stdenv.lib; {
-    homepage = "https://github.com/PyGithub/PyGithub";
+    homepage = https://github.com/PyGithub/PyGithub;
     description = "A Python (2 and 3) library to access the GitHub API v3";
     platforms = platforms.all;
     license = licenses.gpl3;
diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index e3bd8e2b371..4669c05a7d5 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -23,7 +23,7 @@ in buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = "http://www.pycrypto.org/";
+    homepage = http://www.pycrypto.org/;
     description = "Python Cryptography Toolkit";
     platforms = pycryptodome.meta.platforms;
   };
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index 71b90d242f0..14822578761 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   meta = {
-    homepage = "https://www.pycryptodome.org/";
+    homepage = https://www.pycryptodome.org/;
     description = "Python Cryptography Toolkit";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix
index 563a3217e8c..55aaa59d6b2 100644
--- a/pkgs/development/python-modules/pyext/default.nix
+++ b/pkgs/development/python-modules/pyext/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
     meta = with stdenv.lib; {
       description = "Simple Python extensions.";
-      homepage = "https://github.com/kirbyfan64/PyExt";
+      homepage = https://github.com/kirbyfan64/PyExt;
       license = licenses.mit;
       maintainers = with maintainers; [ edwtjo ];
     };
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index a10c858c233..a33eefa48ec 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python library for games";
-    homepage = "http://www.pygame.org/";
+    homepage = http://www.pygame.org/;
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/python-modules/pygame/git.nix b/pkgs/development/python-modules/pygame/git.nix
index 3140f93aeb4..97f7b8b6c99 100644
--- a/pkgs/development/python-modules/pygame/git.nix
+++ b/pkgs/development/python-modules/pygame/git.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python library for games";
-    homepage = "http://www.pygame.org/";
+    homepage = http://www.pygame.org/;
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     broken = true;
diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
index aa0d1d5f575..c2c6ee211c9 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/pylast/pylast";
+    homepage = https://github.com/pylast/pylast;
     description = "A python interface to last.fm (and compatibles)";
     license = licenses.asl20;
     maintainers = with maintainers; [ rvolosatovs ];
diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index 8e06ba38ef9..cb7b9ed43fe 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Thin wrapper for pandoc";
-    homepage = "https://github.com/bebraw/pypandoc";
+    homepage = https://github.com/bebraw/pypandoc;
     license = licenses.mit;
     maintainers = with maintainers; [ bennofs kristoff3r ];
   };
diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix
index 7857f46e242..1337b3c32ad 100644
--- a/pkgs/development/python-modules/pyrax.nix
+++ b/pkgs/development/python-modules/pyrax.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = "https://github.com/rackspace/pyrax";
+    homepage = https://github.com/rackspace/pyrax;
     license = lib.licenses.asl20;
     description = "Python API to interface with Rackspace";
     maintainers = with lib.maintainers; [ teh ];
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 796bc88430a..c3d271caa32 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   buildInputs = [ swig ];
 
   meta = {
-    homepage = "https://pyscard.sourceforge.io/";
+    homepage = https://pyscard.sourceforge.io/;
     description = "Smartcard library for python";
     license = stdenv.lib.licenses.lgpl21;
     maintainers = with stdenv.lib.maintainers; [ layus ];
diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix
index e02f32f223d..62ff439afbb 100644
--- a/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/pkgs/development/python-modules/pyside/apiextractor.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
   meta = {
     description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
     license = stdenv.lib.licenses.gpl2;
-    homepage = "http://www.pyside.org/docs/apiextractor/";
+    homepage = http://www.pyside.org/docs/apiextractor/;
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 9d7f11b939d..226108ad5a5 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
     license = lib.licenses.lgpl21;
-    homepage = "http://www.pyside.org";
+    homepage = http://www.pyside.org;
     maintainers = [ lib.maintainers.chaoflow ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index 8ecf2734832..a6e0ce47f11 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
     license = stdenv.lib.licenses.gpl2;
-    homepage = "http://www.pyside.org/docs/generatorrunner/";
+    homepage = http://www.pyside.org/docs/generatorrunner/;
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 0864b641cdb..82a40c96f64 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
     license = lib.licenses.gpl2;
-    homepage = "http://www.pyside.org/docs/shiboken/";
+    homepage = http://www.pyside.org/docs/shiboken/;
     maintainers = [ lib.maintainers.chaoflow ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix
index 9d02a016e72..5acd33d07d2 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/pkgs/development/python-modules/pyside/tools.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   meta = {
     description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
     license = lib.licenses.gpl2;
-    homepage = "http://www.pyside.org";
+    homepage = http://www.pyside.org;
     maintainers = [ lib.maintainers.chaoflow ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 2acdef1b372..3a563e5d183 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ];
 
   meta = with lib; {
-    homepage = "https://github.com/PySlurm/pyslurm";
+    homepage = https://github.com/PySlurm/pyslurm;
     description = "Python bindings to Slurm";
     license = licenses.gpl2;
     maintainers = [ maintainers.veprbl ];
diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix
index 98ed980588e..bd429a67f24 100644
--- a/pkgs/development/python-modules/python-editor/default.nix
+++ b/pkgs/development/python-modules/python-editor/default.nix
@@ -12,6 +12,6 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A library that provides the `editor` module for programmatically";
-    homepage = "https://github.com/fmoo/python-editor";
+    homepage = https://github.com/fmoo/python-editor;
   };
 }
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index c1472bc66a8..8c78cfeacbd 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   ];
   propagatedBuildInputs = [ future six ecdsa pycryptodome ];
   meta = with stdenv.lib; {
-    homepage = "https://github.com/mpdavis/python-jose";
+    homepage = https://github.com/mpdavis/python-jose;
     description = "A JOSE implementation in Python";
     platforms = platforms.all;
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index 337577141c2..8e8fa61e9bc 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "157a0aef01b1e846ddd11252dc516637da6b3347e32f0130825b7fae1d8b4655";
   };
   meta = {
-    homepage = "http://arthurdejong.org/python-stdnum/";
+    homepage = http://arthurdejong.org/python-stdnum/;
     description = "Python module to handle standardized numbers and codes";
     maintainers = with lib.maintainers; [ johbo ];
     license = lib.licenses.lgpl2Plus;
diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix
index 93b67fe4782..326151a4843 100644
--- a/pkgs/development/python-modules/python-uinput/default.nix
+++ b/pkgs/development/python-modules/python-uinput/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Pythonic API to Linux uinput kernel module";
-    homepage = "http://tjjr.fi/sw/python-uinput/";
+    homepage = http://tjjr.fi/sw/python-uinput/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix
index 70950e4e927..046424af608 100644
--- a/pkgs/development/python-modules/pyudev.nix
+++ b/pkgs/development/python-modules/pyudev.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = "http://pyudev.readthedocs.org/";
+    homepage = http://pyudev.readthedocs.org/;
     description = "Pure Python libudev binding";
     license = lib.licenses.lgpl21Plus;
   };
diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix
index b2b5ba20801..f471c8b8730 100644
--- a/pkgs/development/python-modules/pywinrm/default.nix
+++ b/pkgs/development/python-modules/pywinrm/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python library for Windows Remote Management";
-    homepage = "http://github.com/diyan/pywinrm/";
+    homepage = http://github.com/diyan/pywinrm/;
     license = licenses.mit;
     maintainers = with maintainers; [ elasticdog ];
     platforms = platforms.all;
diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix
index 5777a6137ae..d22ba51fc3b 100644
--- a/pkgs/development/python-modules/pyzufall/default.nix
+++ b/pkgs/development/python-modules/pyzufall/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://pyzufall.readthedocs.io/de/latest/";
+    homepage = https://pyzufall.readthedocs.io/de/latest/;
     description = "Library for generating random data and sentences in german language";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ davidak ];
diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index 3dec364b292..cf15d8dbc1f 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six regex ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/Toilal/rebulk/";
+    homepage = https://github.com/Toilal/rebulk/;
     license = licenses.mit;
     description = "Advanced string matching from simple patterns";
   };
diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
index a8848fcac33..6ebcb741685 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://rfc3986.readthedocs.org";
+    homepage = https://rfc3986.readthedocs.org;
     license = licenses.asl20;
     description = "Validating URI References per RFC 3986";
   };
diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index c8958f9dd1f..f7ef16b02bb 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
   buildInputs = [pytest];
   propagatedBuildInputs = [ capstone filebytes ];
   meta = with stdenv.lib; {
-    homepage = "https://scoding.de/ropper/";
+    homepage = https://scoding.de/ropper/;
     license = licenses.gpl2;
     description = "Show information about files in different file formats";
     maintainers = with maintainers; [ bennofs ];
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 2fcc0659384..5b40c74a181 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
     meta = with lib; {
       description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
-      homepage = "http://scrapy.org/";
+      homepage = http://scrapy.org/;
       license = licenses.bsd3;
       maintainers = with maintainers; [ drewkett ];
       platforms = platforms.linux;
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index 285da546071..a34b2d2ccfa 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python package to work with Semantic Versioning (http://semver.org/)";
-    homepage = "https://github.com/k-bx/python-semver";
+    homepage = https://github.com/k-bx/python-semver;
     license = licenses.bsd3;
     maintainers = with maintainers; [ np ];
   };
diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
index 78dc82bc770..8e637a673b1 100644
--- a/pkgs/development/python-modules/simpleeval/default.nix
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0sda13bqg9l4j17iczmfanxbzsg6fm9aw8i3crzsjfxx51rwj1i3";
   };
   meta = {
-    homepage = "https://github.com/danthedeckie/simpleeval";
+    homepage = https://github.com/danthedeckie/simpleeval;
     description = "A simple, safe single expression evaluator library";
     maintainers = with lib.maintainers; [ johbo ];
     license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index 6754089ffce..64c68314753 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Browser based viewer for profiling data";
-    homepage = "https://jiffyclub.github.io/snakeviz";
+    homepage = https://jiffyclub.github.io/snakeviz;
     license = licenses.bsd3;
     maintainers = with maintainers; [ nixy ];
   };
diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
index 326975e7155..ec73485193a 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ requests ];
 
   meta = with stdenv.lib; {
-    homepage = "http://spotipy.readthedocs.org/";
+    homepage = http://spotipy.readthedocs.org/;
     description = "A light weight Python library for the Spotify Web API";
     license = licenses.mit;
     maintainers = [ maintainers.rvolosatovs ];
diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index 60e35d2ade4..2ef294d8d9f 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Statistical computations and models for use with SciPy";
-    homepage = "https://www.github.com/statsmodels/statsmodels";
+    homepage = https://www.github.com/statsmodels/statsmodels;
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
   };
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index c6ce6c0d922..1478de78bba 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Manage dynamic plugins for Python applications";
-    homepage = "https://pypi.python.org/pypi/stevedore";
+    homepage = https://pypi.python.org/pypi/stevedore;
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix
index cd7bb2b9507..1d3438032af 100644
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/pkgs/development/python-modules/stringtemplate/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = "http://www.stringtemplate.org/";
+    homepage = http://www.stringtemplate.org/;
     description = "Text Templating Library";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 5a1e114fb25..fc16d77b481 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Stripe Python bindings";
-    homepage = "https://github.com/stripe/stripe-python";
+    homepage = https://github.com/stripe/stripe-python;
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index f80dcdf74fd..2ae41832569 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Hierarchical datasets for Python";
-    homepage = "http://www.pytables.org/";
+    homepage = http://www.pytables.org/;
     license = stdenv.lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 45aea2de1a4..481ff67dd97 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # No tests in archive
   doCheck = false;
   meta = {
-    homepage = "https://pypi.python.org/pypi/typed-ast";
+    homepage = https://pypi.python.org/pypi/typed-ast;
     description = "a fork of Python 2 and 3 ast modules with type comment support";
     license = lib.licenses.asl20;
   };
diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index c099aba5b7a..b441ad8052c 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "This library provides run-time type checking for functions defined with argument type annotations";
-    homepage = "https://github.com/agronholm/typeguard";
+    homepage = https://github.com/agronholm/typeguard;
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index a0aa1478944..5151ee63848 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "http://pythonhosted.org/uncertainties/";
+    homepage = http://pythonhosted.org/uncertainties/;
     description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)";
     maintainer = with maintainers; [ rnhmjoj ];
     license = licenses.bsd3;
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index a80a09f0e64..36b8711d7c1 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A Python framework for building Desktop applications";
-    homepage = "https://github.com/Ultimaker/Uranium";
+    homepage = https://github.com/Ultimaker/Uranium;
     license = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix
index 1d454fc4a62..44f3480aec6 100644
--- a/pkgs/development/python-modules/wptserve/default.nix
+++ b/pkgs/development/python-modules/wptserve/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A webserver intended for web browser testing";
-    homepage = " http://wptserve.readthedocs.org/";
+    homepage =  http://wptserve.readthedocs.org/;
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ raskin ];
   };
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index 33adac52c90..944118870b6 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/";
+    homepage = http://xmpppy.sourceforge.net/;
     license = licenses.gpl3;
     maintainers = [ maintainers.mic92 ];
   };
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 6fbd6886b1a..1d4672312a2 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A linter for YAML files";
-    homepage = "https://github.com/adrienverge/yamllint";
+    homepage = https://github.com/adrienverge/yamllint;
     license = licenses.gpl3;
     maintainers = with maintainers; [ mikefaille ];
   };
diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix
index f6bbb8f4b86..5e8c412ce52 100644
--- a/pkgs/development/python-modules/yolk/default.nix
+++ b/pkgs/development/python-modules/yolk/default.nix
@@ -16,7 +16,7 @@ buildPythonApplication rec {
 
   meta = {
     description = "Command-line tool for querying PyPI and Python packages installed on your system";
-    homepage = "https://github.com/cakebread/yolk";
+    homepage = https://github.com/cakebread/yolk;
     maintainer = with maintainers; [ profpatsch ];
     license = licenses.bsd3;
   };
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 41418a99c8d..8d6670aa850 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -83,7 +83,7 @@ in buildPythonPackage {
   '';
 
   meta = with lib; {
-    homepage = "http://docs.python-zeep.org";
+    homepage = http://docs.python-zeep.org;
     license = licenses.mit;
     description = "A modern/fast Python SOAP client based on lxml / requests";
     maintainers = with maintainers; [ rvl ];
diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 28e4b0435a5..5502a8236da 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A pure python implementation of multicast DNS service discovery";
-    homepage = "https://github.com/jstasiak/python-zeroconf";
+    homepage = https://github.com/jstasiak/python-zeroconf;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index f3d8e746c22..a40a34052ca 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       tailored to the needs of Qt developers. It includes features such as an
       advanced code editor, a visual debugger and a GUI designer.
     '';
-    homepage = "https://wiki.qt.io/Category:Tools::QtCreator";
+    homepage = https://wiki.qt.io/Category:Tools::QtCreator;
     license = "LGPL";
     maintainers = [ maintainers.akaWolf ];
     platforms = platforms.all;
diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index 17f09724d18..4ac62da7f4a 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -36,7 +36,7 @@ buildRubyGem rec {
       The output is then usable by the bundlerEnv derivation to list all the
       dependencies of a ruby package.
     '';
-    homepage = "https://github.com/manveru/bundix";
+    homepage = https://github.com/manveru/bundix;
     license = "MIT";
     maintainers = with lib.maintainers; [ manveru zimbatm ];
     platforms = lib.platforms.all;
diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix
index 374331f3ac8..a46d7f9d953 100644
--- a/pkgs/development/tools/analysis/cccc/default.nix
+++ b/pkgs/development/tools/analysis/cccc/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
       on various metrics of the code. Metrics supported include lines of code, McCabe's
       complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura.
     '';
-    homepage = "http://cccc.sourceforge.net/";
+    homepage = http://cccc.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.linquize ];
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
index c290aefe31b..07e3a579d34 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
+++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Automatically generate all types of basic memory management operations and write into trace files";
-    homepage = "https://github.com/GarCoSim"; 
+    homepage = https://github.com/GarCoSim; 
     maintainers = [ maintainers.cmcdragonkai ];
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
index 7a6f3481d53..557fa838474 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
+++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques.";
-    homepage = "https://github.com/GarCoSim";
+    homepage = https://github.com/GarCoSim;
     maintainers = [ maintainers.cmcdragonkai ];
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix
index ee9fbb11196..6544046b16d 100644
--- a/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/pkgs/development/tools/analysis/hotspot/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
       It takes a perf.data file, parses and evaluates its contents and
       then displays the result in a graphical way.
     '';
-    homepage = "https://github.com/KDAB/hotspot";
+    homepage = https://github.com/KDAB/hotspot;
     license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ nh2 ];
diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index e2cb2c85b62..f5c5c616979 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A semantic analysis tool for C";
-    homepage = "http://smatch.sourceforge.net/";
+    homepage = http://smatch.sourceforge.net/;
     license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix
index 91d4155d093..a67d9b8d42e 100644
--- a/pkgs/development/tools/analysis/swarm/default.nix
+++ b/pkgs/development/tools/analysis/swarm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Verification script generator for Spin";
-    homepage = "http://spinroot.com/";
+    homepage = http://spinroot.com/;
     license = licenses.free;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index 1e84a05cc85..6b9dd6393cb 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://boomerang.sourceforge.net/";
+    homepage = http://boomerang.sourceforge.net/;
     license = stdenv.lib.licenses.bsd3;
     description = "A general, open source, retargetable decompiler";
   };
diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix
index 61f6a402cab..200ec6429a7 100644
--- a/pkgs/development/tools/build-managers/doit/default.nix
+++ b/pkgs/development/tools/build-managers/doit/default.nix
@@ -23,7 +23,7 @@ in python3Packages.buildPythonApplication {
   checkPhase = "py.test";
 
   meta = {
-    homepage = "http://pydoit.org/";
+    homepage = http://pydoit.org/;
     description = "A task management & automation tool";
     license = stdenv.lib.licenses.mit;
     longDescription = ''
diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix
index 7b5dc2b7937..8a72847be77 100644
--- a/pkgs/development/tools/build-managers/kati/default.nix
+++ b/pkgs/development/tools/build-managers/kati/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An experimental GNU make clone";
-    homepage = "https://github.com/google/kati";
+    homepage = https://github.com/google/kati;
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.asl20;
   };
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index d62ae35b854..b028534f3c8 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/rebar/rebar";
+    homepage = https://github.com/rebar/rebar;
     description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases";
 
     longDescription = ''
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index bfc6dce1e1a..c77dbfcf427 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/rebar/rebar3";
+    homepage = https://github.com/rebar/rebar3;
     description = "rebar 3.0 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases";
 
     longDescription = ''
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix
index 95a49dc167a..f81ff3b91d4 100644
--- a/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Redo implementation in Bourne Shell";
-    homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html";
+    homepage = http://news.dieweltistgarnichtso.net/bin/redo-sh.html;
     license  = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ sternenseemann ];
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 630dc4c751e..1b2a8220361 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -14,7 +14,7 @@ in python2Packages.buildPythonApplication {
   doCheck = false;
 
   meta = {
-    homepage = "http://scons.org/";
+    homepage = http://scons.org/;
     description = "An improved, cross-platform substitute for Make";
     license = stdenv.lib.licenses.mit;
     longDescription = ''
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 7db0d89e8b1..52c5417456c 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://crystal-lang.org/";
+    homepage = https://crystal-lang.org/;
     license = licenses.asl20;
     description = "Dependency manager for the Crystal language";
     maintainers = with maintainers; [ mingchuan ];
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 7e11cf53199..c371844d133 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -61,7 +61,7 @@ buildGoPackage rec {
   meta = with lib; {
     description = "GitLab Runner the continuous integration executor of GitLab";
     license = licenses.mit;
-    homepage = "https://about.gitlab.com/gitlab-ci/";
+    homepage = https://about.gitlab.com/gitlab-ci/;
     platforms = platforms.unix ++ platforms.darwin;
     maintainers = with maintainers; [ bachp zimbatm ];
   };
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
index a3e6a063596..33cbd23d062 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
@@ -61,7 +61,7 @@ buildGoPackage rec {
   meta = with lib; {
     description = "GitLab Runner the continuous integration executor of GitLab";
     license = licenses.mit;
-    homepage = "https://about.gitlab.com/gitlab-ci/";
+    homepage = https://about.gitlab.com/gitlab-ci/;
     platforms = platforms.unix;
     maintainers = [ lib.maintainers.bachp ];
   };
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index b49719ae0b9..22b83a7569e 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Version Control for your database";
-    homepage = "http://www.liquibase.org/";
+    homepage = http://www.liquibase.org/;
     license = licenses.asl20;
     maintainers = with maintainers; [ nequissimus profpatsch ];
     platforms = with platforms; unix;
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 7057d87a6bd..9f321ee3309 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       a reports interface, a complete data modeling solution, and a migration
       platform for moving your 3rd party databases to Oracle.
     '';
-    homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/";
+    homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/;
     license = licenses.unfree;
     maintainers = [ maintainers.ardumont ];
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index a43d3928980..6c40cd78910 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -24,7 +24,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "DB Browser for SQLite";
-    homepage = "http://sqlitebrowser.org/";
+    homepage = http://sqlitebrowser.org/;
     license = licenses.gpl3;
     maintainers = [ maintainers.matthiasbeyer ];
     platforms = platforms.linux; # can only test on linux
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index 9fe9c46816a..06b6a0993be 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = {
     description = "debugger for the Go programming language";
-    homepage = "https://github.com/derekparker/delve";
+    homepage = https://github.com/derekparker/delve;
     maintainers = with stdenv.lib.maintainers; [ vdemeester ];
     license = stdenv.lib.licenses.mit;
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 37517f306e8..a28e4a32168 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -26,7 +26,7 @@ buildGoPackage rec {
 
   meta = {
     description = "A command line tool for DigitalOcean services";
-    homepage = "https://github.com/digitalocean/doctl";
+    homepage = https://github.com/digitalocean/doctl;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.siddharthist ];
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index bf9fb4f3035..c803de9e024 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = "http://doxygen.org/";
+    homepage = http://doxygen.org/;
     description = "Source code documentation generator tool";
 
     longDescription = ''
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index b9682bead7d..fb84bbbf1df 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A concolic testing tool for the Erlang functional programming language";
     license = stdenv.lib.licenses.gpl3;
-    homepage = "https://github.com/aggelgian/cuter";
+    homepage = https://github.com/aggelgian/cuter;
     maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
     platforms = with stdenv.lib.platforms; unix;
   };
diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix
index 8b2bee8ad4f..7d505b20a05 100644
--- a/pkgs/development/tools/erlang/relx-exe/default.nix
+++ b/pkgs/development/tools/erlang/relx-exe/default.nix
@@ -31,7 +31,7 @@
     meta = {
       description = "Executable command for Relx";
       license = stdenv.lib.licenses.asl20;
-      homepage = "https://github.com/erlware/relx";
+      homepage = https://github.com/erlware/relx;
       maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
     };
 
diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index ded0aaa9242..f6fe24cc281 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [ pyxdg PyGithub ];
 
   meta = with stdenv.lib; {
-    homepage = "http://the-brannons.com/software/cligh.html";
+    homepage = http://the-brannons.com/software/cligh.html;
     description = "A simple command-line interface to the facilities of Github";
     longDescription = ''
         Cligh is a simple command-line interface to the facilities of GitHub.
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index e6a317a2f88..f11bb83a74a 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   installPhase = "mkdir -p $out; mv * $out/";
 
   meta = {
-    homepage = "http://www.gnu.org/software/gnulib/";
+    homepage = http://www.gnu.org/software/gnulib/;
     description = "Central location for code to be shared among GNU packages";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 837da4a09dc..fdb53dd288f 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = {
     description = "Print where symbols are defined in Go source code";
-    homepage = "https://github.com/rogpeppe/godef/";
+    homepage = https://github.com/rogpeppe/godef/;
     maintainers = with stdenv.lib.maintainers; [ vdemeester ];
     license = stdenv.lib.licenses.bsd3;
   };
diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index e6f36b6e32e..2041491cf80 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Google App Engine SDK for Go";
     version = version;
-    homepage = "https://cloud.google.com/appengine/docs/go/";
+    homepage = https://cloud.google.com/appengine/docs/go/;
     license = licenses.asl20;
     platforms = ["x86_64-linux" "x86_64-darwin"];
     maintainers = with maintainers; [ lufia ];
diff --git a/pkgs/development/tools/haskell/intero-nix-shim/default.nix b/pkgs/development/tools/haskell/intero-nix-shim/default.nix
index 7e82518c9b6..a7ea5b9d577 100644
--- a/pkgs/development/tools/haskell/intero-nix-shim/default.nix
+++ b/pkgs/development/tools/haskell/intero-nix-shim/default.nix
@@ -22,6 +22,6 @@ mkDerivation {
     ln -s ${cabal-install}/bin/cabal  $out/libexec
     ln -s ${intero       }/bin/intero $out/libexec
   '';
-  homepage = "https://github.com/michalrus/intero-nix-shim";
+  homepage = https://github.com/michalrus/intero-nix-shim;
   license = stdenv.lib.licenses.asl20;
 }
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index b3df9c605e0..90c9126c2b9 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Generate .travis.yml for multiple ghc versions";
-    homepage = "https://github.com/hvr/multi-ghc-travis";
+    homepage = https://github.com/hvr/multi-ghc-travis;
     license = licenses.bsd3;
     platforms = ghc.meta.platforms;
     maintainers = with maintainers; [ jb55 peti ];
diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 0e0a46c906e..9c5cbb1aa28 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   version = "3.43.16";
 
   meta = {
-    homepage = "https://toolbelt.heroku.com";
+    homepage = https://toolbelt.heroku.com;
     description = "Everything you need to get started using Heroku";
     maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
     license = licenses.mit;
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix
index aafb5f54144..dd0379e83a7 100644
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -15,7 +15,7 @@ buildGoPackage rec {
   };
   meta = with stdenv.lib; {
     description = "A JMESPath implementation in Go";
-    homepage = "https://github.com/jmespath/go-jmespath";
+    homepage = https://github.com/jmespath/go-jmespath;
     maintainers = with maintainers; [ cransom ];
     license = licenses.asl20;
   };
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
index 2cae6a7fcc8..d46f7b3e883 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -15,7 +15,7 @@ buildGoPackage rec {
   };
   meta = with stdenv.lib; {
     description = "A command line interface to the JMESPath expression language for JSON";
-    homepage = "https://github.com/jmespath/jp";
+    homepage = https://github.com/jmespath/jp;
     maintainers = with maintainers; [ cransom ];
     license = licenses.asl20;
   };
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index ecc690ead05..261d16367d4 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
   
   meta = {
     description = "A pair programming tool and library written in Golang";
-    homepage = "https://github.com/jeffail/leaps/";
+    homepage = https://github.com/jeffail/leaps/;
     license = "MIT";
     maintainers = with stdenv.lib.maintainers; [ qknight ];
     meta.platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index cd9bf94b904..00c2663e3a4 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   # meta is all the information about the package..
   meta = with stdenv.lib; {
-    homepage = "http://www.minizinc.org/";
+    homepage = http://www.minizinc.org/;
     description = "MiniZinc is a medium-level constraint modelling language.";
 
     longDescription = ''
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index fb1e4a8ca4b..9aea3510432 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   installFlags = "INSTALL=install prefix=$$out";
 
   meta = {
-    homepage = "http://astyle.sourceforge.net/";
+    homepage = http://astyle.sourceforge.net/;
     description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
index 77fe2b7b92c..54e697656d2 100644
--- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     branch = "1.13";
-    homepage = "http://www.gnu.org/software/automake/";
+    homepage = http://www.gnu.org/software/automake/;
     description = "GNU standard-compliant makefile generator";
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix
index fd074e6b96c..c797042885a 100644
--- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     branch = "1.14";
-    homepage = "http://www.gnu.org/software/automake/";
+    homepage = http://www.gnu.org/software/automake/;
     description = "GNU standard-compliant makefile generator";
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix
index 3c4a8d1189e..49978e9739d 100644
--- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     branch = "1.15";
-    homepage = "http://www.gnu.org/software/automake/";
+    homepage = http://www.gnu.org/software/automake/;
     description = "GNU standard-compliant makefile generator";
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index c8378e06df6..37ec63627b1 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A C program reducer";
-    homepage = "https://embed.cs.utah.edu/creduce";
+    homepage = https://embed.cs.utah.edu/creduce;
     # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING
     license = licenses.ncsa;
     longDescription = ''
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix
index 20d149f3efe..38772a4dd89 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/pkgs/development/tools/misc/csmith/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A random generator of C programs";
-    homepage = "https://embed.cs.utah.edu/csmith";
+    homepage = https://embed.cs.utah.edu/csmith;
     # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING
     license = licenses.bsd2;
     longDescription = ''
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index 32e212a0921..17ef6647050 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -71,7 +71,7 @@ let
 
     meta = {
       description = "A fast, free distributed C/C++ compiler";
-      homepage = "http://distcc.org";
+      homepage = http://distcc.org;
       license = "GPL";
 
       platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix
index 603f8c0bef6..905fa0d4093 100644
--- a/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/pkgs/development/tools/misc/elfkickers/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html";
+    homepage = http://www.muppetlabs.com/~breadbox/software/elfkickers.html;
     description = "A collection of programs that access and manipulate ELF files";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 24f099a1533..9e2f3587558 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Graphical frontend (GUI) to GDB";
-    homepage = "http://gede.acidron.com";
+    homepage = http://gede.acidron.com;
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ juliendehos ];
diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix
index adc5ba96758..af792c0c6b9 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/tools/misc/lit/default.nix
@@ -15,7 +15,7 @@ python2.pkgs.buildPythonApplication rec {
 
   meta = {
     description = "Portable tool for executing LLVM and Clang style test suites";
-    homepage = "http://llvm.org/docs/CommandGuide/lit.html";
+    homepage = http://llvm.org/docs/CommandGuide/lit.html;
     license = lib.licenses.ncsa;
     maintainers = with lib.maintainers; [ dtzWill ];
   };
diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix
index 08631fd0352..9cd1a56e68f 100644
--- a/pkgs/development/tools/misc/ninka/default.nix
+++ b/pkgs/development/tools/misc/ninka/default.nix
@@ -28,7 +28,7 @@ buildPerlPackage rec {
 
   meta = with stdenv.lib; {
     description = "A sentence based license detector";
-    homepage = "http://ninka.turingmachine.org/";
+    homepage = http://ninka.turingmachine.org/;
     license = licenses.gpl2;
     maintainers = [ maintainers.vrthra ];
     platforms = platforms.all;
diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix
index 6eb13bb242d..1e85e87c537 100644
--- a/pkgs/development/tools/misc/rolespec/default.nix
+++ b/pkgs/development/tools/misc/rolespec/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/nickjj/rolespec";
+    homepage = https://github.com/nickjj/rolespec;
     description = "A test library for testing Ansible roles";
     longDescription = ''
       A shell based test library for Ansible that works both locally and over
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
index d01a2f9cdd0..571af764fcf 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.isDarwin;
 
   meta = {
-    homepage = "http://www.gnu.org/software/texinfo/";
+    homepage = http://www.gnu.org/software/texinfo/;
     description = "The GNU documentation system";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
diff --git a/pkgs/development/tools/misc/texinfo/6.3.nix b/pkgs/development/tools/misc/texinfo/6.3.nix
index b75878b8d33..704611e315a 100644
--- a/pkgs/development/tools/misc/texinfo/6.3.nix
+++ b/pkgs/development/tools/misc/texinfo/6.3.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     && !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.gnu.org/software/texinfo/";
+    homepage = http://www.gnu.org/software/texinfo/;
     description = "The GNU documentation system";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix
index 19dd907b73b..8fc26842350 100644
--- a/pkgs/development/tools/misc/unifdef/default.nix
+++ b/pkgs/development/tools/misc/unifdef/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://dotat.at/prog/unifdef/";
+    homepage = http://dotat.at/prog/unifdef/;
     description = "Selectively remove C preprocessor conditionals";
     license = licenses.bsd2;
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index 903359f5c76..b0d5bcd28f7 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A maintained ctags implementation";
-    homepage = "https://ctags.io/";
+    homepage = https://ctags.io/;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     # universal-ctags is preferred over emacs's ctags
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 6f0d71d76b1..4680785ac7c 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "An editor-independent tool to ease the development of programs in OCaml";
-    homepage = "http://the-lambda-church.github.io/merlin/";
+    homepage = http://the-lambda-church.github.io/merlin/;
     license = licenses.mit;
     maintainers = [ maintainers.vbgl ];
   };
diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
index ee70a80b6af..bdc75766bbf 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://typerex.ocamlpro.com/ocp-indent.html";
+    homepage = http://typerex.ocamlpro.com/ocp-indent.html;
     description = "A customizable tool to indent OCaml code";
     license = licenses.gpl3;
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index 500002bed44..f96b7888db0 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://typerex.ocamlpro.com/ocp-indent.html";
+    homepage = http://typerex.ocamlpro.com/ocp-indent.html;
     description = "A customizable tool to indent OCaml code";
     license = licenses.gpl3;
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix
index 5d4da29e9b0..d760cec62a0 100644
--- a/pkgs/development/tools/parsing/bison/2.x.nix
+++ b/pkgs/development/tools/parsing/bison/2.x.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # M4 = "${m4}/bin/m4";
 
   meta = {
-    homepage = "http://www.gnu.org/software/bison/";
+    homepage = http://www.gnu.org/software/bison/;
     description = "Yacc-compatible parser generator";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 0369d7dabde..f4d02043066 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "stackprotector" ];
 
   meta = {
-    homepage = "http://www.gnu.org/software/bison/";
+    homepage = http://www.gnu.org/software/bison/;
     description = "Yacc-compatible parser generator";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix
index 4b6d230becd..40cd133032f 100644
--- a/pkgs/development/tools/postiats-utilities/default.nix
+++ b/pkgs/development/tools/postiats-utilities/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/Hibou57/PostiATS-Utilities";
+    homepage = https://github.com/Hibou57/PostiATS-Utilities;
     license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = [ maintainers.ttuegel ];
diff --git a/pkgs/development/tools/profiling/gprof2dot/default.nix b/pkgs/development/tools/profiling/gprof2dot/default.nix
index 154c0da93d4..2f0b03ab7e3 100644
--- a/pkgs/development/tools/profiling/gprof2dot/default.nix
+++ b/pkgs/development/tools/profiling/gprof2dot/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication {
   };
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/jrfonseca/gprof2dot";
+    homepage = https://github.com/jrfonseca/gprof2dot;
     description = "Python script to convert the output from many profilers into a dot graph";
     license = licenses.lgpl3Plus;
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index 166e3320d9c..b2340e01c1a 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -28,7 +28,7 @@ buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs";
-    homepage = "https://github.com/jwilm/racerd";
+    homepage = https://github.com/jwilm/racerd;
     license = licenses.asl20;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index f9c5ee1b7b9..9028a796381 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -35,7 +35,7 @@ buildGoPackage rec {
 
   meta = {
     description = "A command line utility for various operations on container images and image repositories";
-    homepage = "https://github.com/projectatomic/skopeo";
+    homepage = https://github.com/projectatomic/skopeo;
     maintainers = with stdenv.lib.maintainers; [ vdemeester ];
     license = stdenv.lib.licenses.asl20;
   };
diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index 7c9d70528d5..c55f76f9b7f 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       it is intended as a replacement for the venerable 'isql' program supplied
       by Sybase.
       '';
-    homepage = "http://www.cs.washington.edu/~rose/sqsh/sqsh.html";
+    homepage = http://www.cs.washington.edu/~rose/sqsh/sqsh.html;
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix
index cf21804ddde..f8134a88643 100644
--- a/pkgs/development/tools/vim-vint/default.nix
+++ b/pkgs/development/tools/vim-vint/default.nix
@@ -30,7 +30,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     description = "Fast and Highly Extensible Vim script Language Lint implemented by Python";
-    homepage = "https://github.com/Kuniwak/vint";
+    homepage = https://github.com/Kuniwak/vint;
     license = licenses.mit;
     maintainers = with maintainers; [ andsild ];
     platforms = platforms.all;
diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
index 426d52eba70..66fdb1841e4 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/pkgs/development/tools/vndr/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
 
   meta = {
     description = "Stupid golang vendoring tool, inspired by docker vendor script";
-    homepage = "https://github.com/LK4D4/vndr";
+    homepage = https://github.com/LK4D4/vndr;
     maintainers = with lib.maintainers; [ vdemeester ];
     license = lib.licenses.asl20;
   };
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix
index aac773b11e6..29fedde9080 100644
--- a/pkgs/development/tools/vultr/default.nix
+++ b/pkgs/development/tools/vultr/default.nix
@@ -14,7 +14,7 @@ buildGoPackage rec {
 
   meta = {
     description = "A command line tool for Vultr services, a provider for cloud virtual private servers";
-    homepage = "https://github.com/JamesClonk/vultr";
+    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/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 20dd30238fb..2c54d9ef828 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open-source game of ancient warfare -- data files";
-    homepage = "http://wildfiregames.com/0ad/";
+    homepage = http://wildfiregames.com/0ad/;
     license = licenses.cc-by-sa-30;
     platforms = platforms.linux;
     hydraPlatforms = [];
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index cd0647cdee1..35d6487f21e 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open-source game of ancient warfare";
-    homepage = "http://wildfiregames.com/0ad/";
+    homepage = http://wildfiregames.com/0ad/;
     license = with licenses; [
       gpl2 lgpl21 mit cc-by-sa-30
       licenses.zlib # otherwise masked by pkgs.zlib
diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index 0ff04098057..d24833a31be 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   buildInputs = [ SDL SDL_image libxml2 libjpeg libpng mesa zlib ];
 
   meta = with stdenv.lib; {
-    homepage = "http://armagetronad.org";
+    homepage = http://armagetronad.org;
     description = "An multiplayer networked arcade racing game in 3D similar to Tron";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index 0d8c22d6e7b..40b594a1952 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       first-person role-playing game / dungeon crawler
       developed by Arkane Studios.
     '';
-    homepage = "http://arx-libertatis.org/";
+    homepage = http://arx-libertatis.org/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ rnhmjoj ];
     platforms = platforms.linux;
diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix
index 82e5ddb06d4..95d6365b99d 100644
--- a/pkgs/games/bitsnbots/default.nix
+++ b/pkgs/games/bitsnbots/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Simple puzzle game with moving robots";
-    homepage = "http://moikmellah.org/blog/?page_id=19";
+    homepage = http://moikmellah.org/blog/?page_id=19;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index 03cd2e7ca26..77809f1095f 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    homepage = "http://blobby.sourceforge.net/";
+    homepage = http://blobby.sourceforge.net/;
     downloadPage = "http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/";
     inherit version;
   };
diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix
index 599588e6f0e..34d767bf310 100644
--- a/pkgs/games/bsdgames/default.nix
+++ b/pkgs/games/bsdgames/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.t2-project.org/packages/bsd-games.html";
+    homepage = http://www.t2-project.org/packages/bsd-games.html;
     description = "Ports of all the games from NetBSD-current that are free";
     license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index ee65bcf307e..9baa3877706 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       made for it. All of the original data files
       are required to do so
     '';
-    homepage = "https://github.com/gerstrong/Commander-Genius";
+    homepage = https://github.com/gerstrong/Commander-Genius;
     maintainers = with maintainers; [ hce ];
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 9d6f6b33e69..430da66c21c 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open-source, single-player, role-playing roguelike game";
-    homepage = "http://crawl.develz.org/";
+    homepage = http://crawl.develz.org/;
     longDescription = ''
       Open-source, single-player, role-playing roguelike game of exploration and
       treasure-hunting in dungeons filled with dangerous and unfriendly monsters
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 0247d69bb56..0df91bb8df0 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Memory hacking library for Dwarf Fortress and a set of tools that use it";
-    homepage = "https://github.com/DFHack/dfhack/";
+    homepage = https://github.com/DFHack/dfhack/;
     license = licenses.zlib;
     platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = with maintainers; [ robbinch a1russell abbradar ];
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 5be8c7d759e..bfdedcdd133 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ the-kenny abbradar ];
     license = licenses.mit;
     platforms = platforms.linux;
-    homepage = "https://github.com/splintermind/Dwarf-Therapist";
+    homepage = https://github.com/splintermind/Dwarf-Therapist;
   };
 }
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index cb56969578e..740125bf442 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A single-player fantasy game with a randomly generated adventure world";
-    homepage = "http://www.bay12games.com/dwarves";
+    homepage = http://www.bay12games.com/dwarves;
     license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];
diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix
index d5b6ac6c686..7d1f26e9aab 100644
--- a/pkgs/games/dwarf-fortress/themes/cla.nix
+++ b/pkgs/games/dwarf-fortress/themes/cla.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "CLA graphics set for Dwarf Fortress";
-    homepage = "http://www.bay12forums.com/smf/index.php?topic=105376.0";
+    homepage = http://www.bay12forums.com/smf/index.php?topic=105376.0;
     platforms = platforms.all;
     maintainers = with maintainers; [ abbradar ];
     license = licenses.free;
diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
index 57f00e89b99..07bbde9f148 100644
--- a/pkgs/games/dwarf-fortress/themes/phoebus.nix
+++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Phoebus graphics set for Dwarf Fortress";
-    homepage = "http://www.bay12forums.com/smf/index.php?topic=137096.0";
+    homepage = http://www.bay12forums.com/smf/index.php?topic=137096.0;
     platforms = platforms.all;
     maintainers = with maintainers; [ a1russell abbradar ];
     # https://github.com/fricy/Phoebus/issues/5
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 4b71b437705..105da5a5731 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Unfucked multimedia layer for Dwarf Fortress";
-    homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck";
+    homepage = https://github.com/svenstaro/dwarf_fortress_unfuck;
     license = licenses.free;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index 128cbe71b5d..f39e32eb752 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control";
-    homepage = "https://endless-sky.github.io/";
+    homepage = https://endless-sky.github.io/;
     license = with licenses; [
       gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain
     ];
diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix
index a1560fb1934..85def0596dc 100644
--- a/pkgs/games/ezquake/default.nix
+++ b/pkgs/games/ezquake/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://ezquake.github.io/";
+    homepage = http://ezquake.github.io/;
     description = "A modern QuakeWorld client focused on competitive online play.";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix
index 3ae4ee7f205..1aab0933b1b 100644
--- a/pkgs/games/fairymax/default.nix
+++ b/pkgs/games/fairymax/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.free ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html";
+    homepage = http://home.hccnet.nl/h.g.muller/dwnldpage.html;
   };
 }
diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix
index e9d6ce9655b..f5984806bd1 100644
--- a/pkgs/games/fish-fillets-ng/default.nix
+++ b/pkgs/games/fish-fillets-ng/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://fillets.sourceforge.net/";
+    homepage = http://fillets.sourceforge.net/;
   };
 }
diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index 91d4db32b68..438b01fe51a 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game";
-    homepage = "http://www.freeorion.org";
+    homepage = http://www.freeorion.org;
     license = [ licenses.gpl2 licenses.cc-by-sa-30 ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix
index 1d96d056a82..defee04e5c2 100644
--- a/pkgs/games/gcs/default.nix
+++ b/pkgs/games/gcs/default.nix
@@ -69,7 +69,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system";
-    homepage = "http://gurpscharactersheet.com/";
+    homepage = http://gurpscharactersheet.com/;
     license = licenses.mpl20;
     platforms = platforms.all;
     maintainers = with maintainers; [];
diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix
index 827388691af..6b053d9d53c 100644
--- a/pkgs/games/gnugo/default.nix
+++ b/pkgs/games/gnugo/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GNU Go - A computer go player";
-    homepage = "http://http://www.gnu.org/software/gnugo/";
+    homepage = http://http://www.gnu.org/software/gnugo/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index dc51a6f0cc0..2110dfee11e 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/coelckers/gzdoom";
+    homepage = https://github.com/coelckers/gzdoom;
     description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix
index 4c3d22571b1..8a91af9cd65 100644
--- a/pkgs/games/hawkthorne/default.nix
+++ b/pkgs/games/hawkthorne/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       to bring to life the video game used to determine the winner of Pierce
       Hawthorne's inheritance.
     '';
-    homepage = "http://www.reddit.com/r/hawkthorne";
+    homepage = http://www.reddit.com/r/hawkthorne;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ campadrenalin ];
     broken = true;
diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
index 682021eee69..134cb650fd2 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Jagged Alliance 2, with community fixes";
     license = "SFI Source Code license agreement";
-    homepage = "https://ja2-stracciatella.github.io/";
+    homepage = https://ja2-stracciatella.github.io/;
   };
 }
diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index 1c433965c78..6d8fddf3899 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "City simulation game";
     license = licenses.gpl2Plus;
-    homepage = "https://sourceforge.net/projects/lincity";
+    homepage = https://sourceforge.net/projects/lincity;
   };
 }
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 04640095ec0..b072fa942b8 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Quick tactics game";
-    homepage = "http://www.gnu.org/software/liquidwar6/";
+    homepage = http://www.gnu.org/software/liquidwar6/;
     maintainers = [ maintainers.raskin ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index b2a1fd499df..80769ab4f57 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   meta = {
     description = "MegaGlest is an entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game";
     license = stdenv.lib.licenses.gpl3;
-    homepage = "http://megaglest.org/";
+    homepage = http://megaglest.org/;
     maintainers = [ stdenv.lib.maintainers.matejc ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix
index f5ff0b4690e..ae086af184c 100644
--- a/pkgs/games/n2048/default.nix
+++ b/pkgs/games/n2048/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.bsd2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://www.dettus.net/n2048/";
+    homepage = http://www.dettus.net/n2048/;
   };
 }
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index bf9d01800f3..92d87697fb1 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -90,7 +90,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Rogue-like game";
-    homepage = "http://nethack.org/";
+    homepage = http://nethack.org/;
     license = "nethack";
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix
index 0bfebd510c9..bde567a1903 100644
--- a/pkgs/games/nexuiz/default.nix
+++ b/pkgs/games/nexuiz/default.nix
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "A free fast-paced first-person shooter";
-    homepage = "http://www.alientrap.org/games/nexuiz";
+    homepage = http://www.alientrap.org/games/nexuiz;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix
index ab60041aa30..cc337f58f73 100644
--- a/pkgs/games/onscripter-en/default.nix
+++ b/pkgs/games/onscripter-en/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Japanese visual novel scripting engine";
-    homepage = "http://unclemion.com/onscripter/";
+    homepage = http://unclemion.com/onscripter/;
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix
index 91b9b6fbb6d..0b0561afd24 100644
--- a/pkgs/games/openclonk/default.nix
+++ b/pkgs/games/openclonk/default.nix
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings";
-    homepage = "http://openclonk.org";
+    homepage = http://openclonk.org;
     license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc;
     platforms = platforms.all;
   };
diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix
index 94a44446b6c..7c2d168d6c3 100644
--- a/pkgs/games/opendungeons/default.nix
+++ b/pkgs/games/opendungeons/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius.";
-    homepage = "https://opendungeons.github.io";
+    homepage = https://opendungeons.github.io;
     license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index 8b3998aa619..c09790e0c66 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An unofficial open source engine reimplementation of the game Morrowind";
-    homepage = "http://openmw.org";
+    homepage = http://openmw.org;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix
index 38597f8df07..6aff7696995 100644
--- a/pkgs/games/pioneer/default.nix
+++ b/pkgs/games/pioneer/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century";
-    homepage = "http://pioneerspacesim.net";
+    homepage = http://pioneerspacesim.net;
     license = with licenses; [
         gpl3 cc-by-sa-30
     ];
diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
index b6a76001ad0..dea0fe547da 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/games/qgo/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       Go is an ancient Chinese board game. It's called "圍棋(Wei Qi)" in
       Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean.
     '';
-    homepage = "https://github.com/pzorin/qgo";
+    homepage = https://github.com/pzorin/qgo;
     license = licenses.gpl2;
     maintainers = with maintainers; [ zalakain ];
   };
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 47dd6a130e8..3be2d9757c0 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://ioquake3.org/";
+    homepage = http://ioquake3.org/;
     description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix
index cd7787604c2..be480009b8a 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/games/quakespasm/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   
   meta = {
     description = "An engine for iD software's Quake";
-    homepage = "http://quakespasm.sourceforge.net/";
+    homepage = http://quakespasm.sourceforge.net/;
     longDescription = ''
       QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake.
       It includes support for 64 bit CPUs and custom music playback, a new sound driver, 
diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix
index 0df7fae13c6..301991c1a6f 100644
--- a/pkgs/games/scid/default.nix
+++ b/pkgs/games/scid/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Chess database with play and training functionality";
-    homepage = "http://scid.sourceforge.net/";
+    homepage = http://scid.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index dd4069e1c11..be921bf1189 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = [ "-lopenal" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://scorched3d.co.uk/";
+    homepage = http://scorched3d.co.uk/;
     description = "3D Clone of the classic Scorched Earth";
     license = licenses.gpl2Plus;
     platforms = platforms.linux; # maybe more
diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix
index 5fa7410ef93..c2beeb13cad 100644
--- a/pkgs/games/scrolls/default.nix
+++ b/pkgs/games/scrolls/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A strategy collectible card game";
-    homepage = "https://scrolls.com/";
+    homepage = https://scrolls.com/;
     # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/
 
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index bb9772dae72..7e83b803246 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
-    homepage = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/";
+    homepage = http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
   };
 }
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index cd59f96037f..5ca0de6a773 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = "http://www.stepmania.com/";
+    homepage = http://www.stepmania.com/;
     description = "Free dance and rhythm game for Windows, Mac, and Linux";
     platforms = platforms.linux;
     license = licenses.mit; # expat version
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index c1f53ec7f8a..629d7b1ea82 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://stockfishchess.org/";
+    homepage = https://stockfishchess.org/;
     description = "Strong open source chess engine";
     longDescription = ''
       Stockfish is one of the strongest chess engines in the world. It is also
diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index d28608be9c2..ffbcd595cc3 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free 2D physics sandbox game";
-    homepage = "http://powdertoy.co.uk/";
+    homepage = http://powdertoy.co.uk/;
     platforms = platforms.unix;
     license = licenses.gpl3;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 4ce5aa5cf10..3594a04f03b 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Top-down MMORPG set in a fantasy world";
-    homepage = "http://tibia.com";
+    homepage = http://tibia.com;
     license = stdenv.lib.licenses.unfree;
     platforms = ["i686-linux"];
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
index f13190abdf7..ad9b5f7dc6c 100644
--- a/pkgs/games/tome4/default.nix
+++ b/pkgs/games/tome4/default.nix
@@ -34,7 +34,7 @@ EOF
     cp -r game $out/opt/tome4
   '';
   meta = with stdenv.lib; {
-    homepage = "http://te4.org/";
+    homepage = http://te4.org/;
     description = "Tales of Maj'eyal (rogue-like game)";
     maintainers = [ maintainers.chattered ];
     license = licenses.gpl3;
diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix
index ea0186323c0..57749c4f228 100644
--- a/pkgs/games/unnethack/default.nix
+++ b/pkgs/games/unnethack/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fork of NetHack";
-    homepage = "http://unnethack.wordpress.com/";
+    homepage = http://unnethack.wordpress.com/;
     license = "nethack";
     platforms = platforms.all;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix
index f5fcdc088c8..1a7ea2da75b 100644
--- a/pkgs/games/ut2004/demo.nix
+++ b/pkgs/games/ut2004/demo.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A first-person shooter video game developed by Epic Games and Digital Extreme -- demo version";
-    homepage = "http://www.unrealtournament2004.com";
+    homepage = http://www.unrealtournament2004.com;
     license = licenses.unfree;
     maintainers = with maintainers; [ abbradar ];
     platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 7e5cdae57fa..66833ceb210 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       adventures.
     '';
 
-    homepage = "http://www.wesnoth.org/";
+    homepage = http://www.wesnoth.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ kkallio abbradar ];
     platforms = platforms.linux;
diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix
index 315f9ea7a5e..95d49dd6375 100644
--- a/pkgs/games/wesnoth/dev.nix
+++ b/pkgs/games/wesnoth/dev.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       adventures.
     '';
 
-    homepage = "http://www.wesnoth.org/";
+    homepage = http://www.wesnoth.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.linux;
diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix
index c370f489d2c..90c1ad6f8eb 100644
--- a/pkgs/games/xpilot/bloodspilot-client.nix
+++ b/pkgs/games/xpilot/bloodspilot-client.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = ''A multiplayer space combat game (client part)'';
-    homepage = "http://bloodspilot.sf.net/";
+    homepage = http://bloodspilot.sf.net/;
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix
index 5cfec74d963..514dd2f41db 100644
--- a/pkgs/games/xpilot/default.nix
+++ b/pkgs/games/xpilot/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = ''A multiplayer X11 space combat game'';
-    homepage = "http://xpilot.sf.net/";
+    homepage = http://xpilot.sf.net/;
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix
index 57c2ca2dfd8..e683e96d206 100644
--- a/pkgs/games/xsok/default.nix
+++ b/pkgs/games/xsok/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://tracker.debian.org/pkg/xsok";
+    homepage = https://tracker.debian.org/pkg/xsok;
   };
 }
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index a217c7217b6..d2b94a14fe4 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://zdoom.org/";
+    homepage = http://zdoom.org/;
     description = "Enhanced port of the official DOOM source code";
     # Doom source license, MAME license
     license = licenses.unfreeRedistributable;
diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix
index e3453628ba9..fa2cafa298a 100644
--- a/pkgs/games/zdoom/zdbsp.nix
+++ b/pkgs/games/zdoom/zdbsp.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "ZDoom's internal node builder for DOOM maps";
-    homepage = "https://zdoom.org/wiki/ZDBSP";
+    homepage = https://zdoom.org/wiki/ZDBSP;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ertes];
     platforms = platforms.linux;
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix
index 4a902b640cb..12d774467c5 100644
--- a/pkgs/misc/apulse/default.nix
+++ b/pkgs/misc/apulse/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "PulseAudio emulation for ALSA";
-    homepage = "https://github.com/i-rinat/apulse";
+    homepage = https://github.com/i-rinat/apulse;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = [ maintainers.jagajaga ];
diff --git a/pkgs/misc/base16/default.nix b/pkgs/misc/base16/default.nix
index 9699065864a..569370a7944 100644
--- a/pkgs/misc/base16/default.nix
+++ b/pkgs/misc/base16/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Base16 provides carefully chosen syntax highlighting and a default set of sixteen colors suitable for a wide range of applications. Base16 is both a color scheme and a template.";
-    homepage = "https://github.com/chriskempson/base16";
+    homepage = https://github.com/chriskempson/base16;
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ];
     platforms = with platforms; unix;
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index 779cf965686..b79ffa1c9a1 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -214,7 +214,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "CUPS Linux drivers for Canon printers";
-    homepage = "http://www.canon.com/";
+    homepage = http://www.canon.com/;
     license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index adde818efce..3577f5b38b0 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series.";
-    homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html";
+    homepage = http://support-th.canon-asia.com/contents/TH/EN/0100712901.html;
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
index 0a0f5e3782f..27b86ab8919 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series.  (MP520 drivers also work for MX700.)";
-    homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html";
+    homepage = http://support-asia.canon-asia.com/content/EN/0100084101.html;
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = with maintainers; [ jerith666 ];
diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix
index 9c187a8f378..8abda27a5cf 100644
--- a/pkgs/misc/cups/drivers/dymo/default.nix
+++ b/pkgs/misc/cups/drivers/dymo/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "CUPS Linux drivers and SDK for DYMO printers";
-    homepage = "http://www.dymo.com/";
+    homepage = http://www.dymo.com/;
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ makefu ];
   };
diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
index 0378aac6d70..3b1d2e52881 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Brother MFC-L2700DN CUPS wrapper driver";
-    homepage = "http://www.brother.com/";
+    homepage = http://www.brother.com/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.tv ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
index 1be1351bb82..b0a03046934 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Brother MFC-L2700DN LPR driver";
-    homepage = "http://www.brother.com/";
+    homepage = http://www.brother.com/;
     license = stdenv.lib.licenses.unfree;
     maintainers = [ stdenv.lib.maintainers.tv ];
     platforms = [ "i686-linux" ];
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index 0ed6f5dfe19..60516190355 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -18,7 +18,7 @@ in
     buildInputs = [ cups ];
 
     meta = with stdenv.lib; {
-      homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
+      homepage = http://download.ebz.epson.net/dsc/search/01/search/;
       description = "ESC/P-R Driver (generic driver)";
       longDescription = ''
         Epson Inkjet Printer Driver (ESC/P-R) for Linux and the
diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix
index cb78bd3498a..492488f675f 100644
--- a/pkgs/misc/drivers/m33-linux/default.nix
+++ b/pkgs/misc/drivers/m33-linux/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/donovan6000/M3D-Linux";
+    homepage = https://github.com/donovan6000/M3D-Linux;
     description = "A Linux program that can communicate with the Micro 3D printer";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix
index 5b8f88218ff..f6ddc61b515 100644
--- a/pkgs/misc/drivers/postscript-lexmark/default.nix
+++ b/pkgs/misc/drivers/postscript-lexmark/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/";
+    homepage = http://www.openprinting.org/driver/Postscript-Lexmark/;
     description = "Lexmark Postscript Drivers";
     platforms = platforms.linux;
   };
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
index 6c1ee05b765..4dc0f2591d8 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -45,6 +45,6 @@ in
       maintainers = [ maintainers.simonvandel ];
       platforms = platforms.unix;
       license = licenses.unfree;
-      homepage = "http://support.sundtek.com/index.php/topic,1573.0.html";
+      homepage = http://support.sundtek.com/index.php/topic,1573.0.html;
     };
   }
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index 1cf52368d62..cc5d57ab6f9 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec{
   preConfigure = "cd src";
 
   meta = {
-    homepage = "http://atari800.sourceforge.net/";
+    homepage = http://atari800.sourceforge.net/;
     description = "An Atari 8-bit emulator";
     longDescription = ''
       Atari800 is the emulator of Atari 8-bit computer systems and
diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix
index 526ea25a04e..f4b4db497e2 100644
--- a/pkgs/misc/emulators/bsod/default.nix
+++ b/pkgs/misc/emulators/bsod/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
       microsoft windows experience.  Bsod displays the famous windows xp
       blue screen of death on the console.  Errors and drivers causing the
       error are selected randomly from a large set of examples.";
-    homepage = "http://www.vanheusden.com/bsod/";
+    homepage = http://www.vanheusden.com/bsod/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.antono ];
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 2b3d9852815..7ec83959e38 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Provides a Virtual (SCSI) HBA";
-    homepage = "http://cdemu.sourceforge.net/about/vhba/";
+    homepage = http://cdemu.sourceforge.net/about/vhba/;
     platforms = platforms.linux;
     licenses = licenses.gpl2Plus;
   };
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index 669935c281c..97f61e452ff 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://citra-emu.org/";
+    homepage = https://citra-emu.org/;
     description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix
index feb474a1376..561f14b5554 100644
--- a/pkgs/misc/emulators/dlx/default.nix
+++ b/pkgs/misc/emulators/dlx/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.davidviner.com/dlx.php";
+    homepage = http://www.davidviner.com/dlx.php;
     description = "DLX Simulator";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 57a5591f93a..9f33305ae14 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes";
-    homepage = "http://emulationstation.org";
+    homepage = http://emulationstation.org;
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix
index 1206bdefcb1..ed241de5b27 100644
--- a/pkgs/misc/emulators/hatari/default.nix
+++ b/pkgs/misc/emulators/hatari/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib SDL cmake ];
 
   meta = {
-    homepage = "http://hatari.tuxfamily.org/";
+    homepage = http://hatari.tuxfamily.org/;
     description = "Atari ST/STE/TT/Falcon emulator";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 611cc84325c..ac11b574ca1 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec{
   installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin";
 
   meta = {
-    homepage = "http://www.ppsspp.org/";
+    homepage = http://www.ppsspp.org/;
     description = "A PSP emulator, the Qt4 version";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ fuuzetsu AndersonTorres ];
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 7256120aa92..319003400d0 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -33,7 +33,7 @@ let
 
     meta = with stdenv.lib; {
       inherit description;
-      homepage = "http://www.libretro.com/";
+      homepage = http://www.libretro.com/;
       license = licenses.gpl3Plus;
       maintainers = with maintainers; [ edwtjo hrdinka MP2E ];
       platforms = platforms.linux;
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 348b52dd492..9fb90875b97 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   passthru = { inherit pkgArches; };
   meta = {
     inherit version platforms;
-    homepage = "http://www.winehq.org/";
+    homepage = http://www.winehq.org/;
     license = "LGPL";
     description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
     maintainers = with stdenv.lib.maintainers; [ avnik raskin ];
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 285a5b4ee49..c8edeaf93a1 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
   passthru = { inherit version; };
 
   meta = {
-    homepage = "http://www.ghostscript.com/";
+    homepage = http://www.ghostscript.com/;
     description = "PostScript interpreter (mainline version)";
 
     longDescription = ''
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 62c734859d5..52f288deba3 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "JACK audio connection kit, version 2 with jackdbus";
-    homepage = "http://jackaudio.org";
+    homepage = http://jackaudio.org;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [ goibhniu wkennington ];
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 4250efcb6a2..28ce85bd8a3 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; {
     description = "JACK audio connection kit";
-    homepage = "http://jackaudio.org";
+    homepage = http://jackaudio.org;
     license = "GPL";
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
index 048740bfed2..6c8b722fce9 100644
--- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix
+++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active.";
-    homepage = "https://github.com/Ma27/i3lock-pixeled";
+    homepage = https://github.com/Ma27/i3lock-pixeled;
     license = licenses.mit;
     platform = platforms.linux;
     maintainers = with maintainers; [ ma27 ];
diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix
index 9393a978b07..8539db5e002 100644
--- a/pkgs/misc/screensavers/pipes/default.nix
+++ b/pkgs/misc/screensavers/pipes/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/pipeseroni/pipes.sh";
+    homepage = https://github.com/pipeseroni/pipes.sh;
     description = "Animated pipes terminal screensaver";
     license = licenses.mit;
     maintainers = [ maintainers.matthiasbeyer ];
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index cd437bfe452..b69e3ab5faf 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   ;
 
   meta = {
-    homepage = "http://www.jwz.org/xscreensaver/";
+    homepage = http://www.jwz.org/xscreensaver/;
     description = "A set of screensavers";
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = with stdenv.lib.platforms; allBut cygwin;
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 4404d5d6fec..fba78132bb5 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec
 
   meta =
   {
-    homepage = "https://github.com/haiwen/seafile";
+    homepage = https://github.com/haiwen/seafile;
     description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index ff0e92d5b0e..e62707afb7c 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An adaptive GTK+ theme based on Material Design";
-    homepage = "https://github.com/tista500/Adapta";
+    homepage = https://github.com/tista500/Adapta;
     license = with licenses; [ gpl2 cc-by-sa-30 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];
diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index 523ac16bf6a..544642bc014 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell";
-    homepage = "https://github.com/horst3180/arc-theme";
+    homepage = https://github.com/horst3180/arc-theme;
     license = licenses.gpl3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ simonvandel romildo ];
diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix
index ac0fb2cfee7..73e9ea604d7 100644
--- a/pkgs/misc/themes/gnome-breeze/default.nix
+++ b/pkgs/misc/themes/gnome-breeze/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A GTK theme built to match KDE's breeze theme";
-    homepage = "https://github.com/dirruk1/gnome-breeze";
+    homepage = https://github.com/dirruk1/gnome-breeze;
     license = stdenv.lib.licenses.lgpl2;
     maintainers = with stdenv.lib.maintainers; [ bennofs ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix
index 32883127c06..3a337520d93 100644
--- a/pkgs/misc/themes/paper/default.nix
+++ b/pkgs/misc/themes/paper/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
-    homepage = "http://snwh.org/paper";
+    homepage = http://snwh.org/paper;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.simonvandel maintainers.romildo ];
diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
index 8fa6176f22e..cee45913499 100644
--- a/pkgs/misc/themes/zuki/default.nix
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A selection of themes for GTK3, gnome-shell and more";
-    homepage = "https://github.com/lassekongo83/zuki-themes";
+    homepage = https://github.com/lassekongo83/zuki-themes;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index a3e4f12cd89..a69bf2ceac7 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -51,7 +51,7 @@ let
     };
 
     meta = with stdenv.lib; {
-      homepage = "http://www.denx.de/wiki/U-Boot/";
+      homepage = http://www.denx.de/wiki/U-Boot/;
       description = "Boot loader for embedded systems";
       license = licenses.gpl2;
       maintainers = [ maintainers.dezgeg ];
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 9fdb00d66be..df318cd4f4f 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -108,7 +108,7 @@ let
     };
 
     meta = {
-      homepage = "http://www.opensource.apple.com/source/cctools/";
+      homepage = http://www.opensource.apple.com/source/cctools/;
       description = "Mac OS X Compiler Tools (cross-platform port)";
       license = stdenv.lib.licenses.apsl20;
     };
diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix
index f5bfe890735..1684c0e92ce 100644
--- a/pkgs/os-specific/darwin/maloader/default.nix
+++ b/pkgs/os-specific/darwin/maloader/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Mach-O loader for Linux";
-    homepage = "https://github.com/shinh/maloader";
+    homepage = https://github.com/shinh/maloader;
     license = stdenv.lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
index 1cd7f2bf9d6..7759d119d50 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Cross platform port of the OS X CoreFoundation";
-    homepage = "http://sourceforge.net/projects/opencflite/";
+    homepage = http://sourceforge.net/projects/opencflite/;
     license = stdenv.lib.licenses.apsl20;
   };
 }
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 2a48590154e..d3a9ec012eb 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://developer.apple.com/downloads/";
+    homepage = https://developer.apple.com/downloads/;
     description = "Apple's XCode SDK";
     license = stdenv.lib.licenses.unfree;
   };
diff --git a/pkgs/os-specific/linux/alienfx/default.nix b/pkgs/os-specific/linux/alienfx/default.nix
index 263ee167a95..d04e7b8fbeb 100644
--- a/pkgs/os-specific/linux/alienfx/default.nix
+++ b/pkgs/os-specific/linux/alienfx/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Controls AlienFX lighting";
-    homepage = "https://github.com/tibz/alienfx";
+    homepage = https://github.com/tibz/alienfx;
     maintainers = [stdenv.lib.maintainers.tomberek];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 55f62e6073f..562a46d2210 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/M0Rf30/android-udev-rules";
+    homepage = https://github.com/M0Rf30/android-udev-rules;
     description = "Android udev rules list aimed to be the most comprehensive on the net";
     platforms = platforms.linux;
     license = licenses.gpl3;
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 5d1f14bfec6..a912e6de965 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Audit Library";
-    homepage = "http://people.redhat.com/sgrubb/audit/";
+    homepage = http://people.redhat.com/sgrubb/audit/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index 4489a94f1ed..67b843fac4d 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "A module for powering off hybrid GPUs";
     platforms = platforms.linux;
-    homepage = "https://github.com/Bumblebee-Project/bbswitch";
+    homepage = https://github.com/Bumblebee-Project/bbswitch;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 88242df76d4..38f57e7663e 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Dynamic Tracing Tools for Linux";
-    homepage = "https://iovisor.github.io/bcc/";
+    homepage = https://iovisor.github.io/bcc/;
     license = licenses.asl20;
     maintainers = with maintainers; [ ragge ];
   };
diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix
index 4d4a51b984a..eb5d2a31e83 100644
--- a/pkgs/os-specific/linux/bridge-utils/default.nix
+++ b/pkgs/os-specific/linux/bridge-utils/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "http://sourceforge.net/projects/bridge/";
-    homepage = "http://www.linux-foundation.org/en/Net:Bridge/";
+    homepage = http://www.linux-foundation.org/en/Net:Bridge/;
     license = "GPL";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix
index 99cb7d264fe..6ef5476f8e8 100644
--- a/pkgs/os-specific/linux/cachefilesd/default.nix
+++ b/pkgs/os-specific/linux/cachefilesd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Local network file caching management daemon";
-    homepage = "https://people.redhat.com/dhowells/fscache/";
+    homepage = https://people.redhat.com/dhowells/fscache/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index 9da2b755fd5..78575899ff1 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "CAN userspace utilities and tools (for use with Linux SocketCAN)";
-    homepage = "https://github.com/linux-can/can-utils";
+    homepage = https://github.com/linux-can/can-utils;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix
index 17450f36daa..4cee9678a9b 100644
--- a/pkgs/os-specific/linux/devmem2/default.nix
+++ b/pkgs/os-specific/linux/devmem2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple program to read/write from/to any location in memory";
-    homepage = "http://lartmaker.nl/lartware/port/";
+    homepage = http://lartmaker.nl/lartware/port/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor ];
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 1f923b9567a..1f513786063 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -48,6 +48,6 @@ in stdenv.mkDerivation rec {
     description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
     platforms = [ "x86_64-linux" "i686-linux" ];
     license = licenses.unfree;
-    homepage = "http://www.displaylink.com/";
+    homepage = http://www.displaylink.com/;
   };
 }
diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix
index ea17c287a29..38ef803d8e5 100644
--- a/pkgs/os-specific/linux/e1000e/default.nix
+++ b/pkgs/os-specific/linux/e1000e/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)";
-    homepage = "http://e1000.sf.net/";
+    homepage = http://e1000.sf.net/;
     license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 150534c9b95..064af708427 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Extensible Virtual Display Interface";
     platforms = platforms.linux;
     license = licenses.gpl2;
-    homepage = "http://www.displaylink.com/";
+    homepage = http://www.displaylink.com/;
     broken = !versionAtLeast kernel.version "3.16";
   };
 }
diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix
index 5cc875f5c90..5fdcfa58382 100644
--- a/pkgs/os-specific/linux/fanctl/default.nix
+++ b/pkgs/os-specific/linux/fanctl/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Ubuntu FAN network support enablement";
-    homepage = "https://launchpad.net/ubuntu/+source/ubuntu-fan";
+    homepage = https://launchpad.net/ubuntu/+source/ubuntu-fan;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index b20dcd34233..e9af25809ed 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://l3net.wordpress.com/projects/firejail/";
+    homepage = http://l3net.wordpress.com/projects/firejail/;
     downloadPage = "http://sourceforge.net/projects/firejail/files/firejail/";
   };
 }
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index a330445634a..b058aa692f0 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--datadir=$(prefix)/data";
 
   meta = {
-    homepage = "https://github.com/vcrhonek/hwdata";
+    homepage = https://github.com/vcrhonek/hwdata;
     description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix
index 6b4841305b3..2f4511bcbc4 100644
--- a/pkgs/os-specific/linux/i810switch/default.nix
+++ b/pkgs/os-specific/linux/i810switch/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A utility for switching between the LCD and external VGA display on Intel graphics cards";
-    homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html";
+    homepage = http://www16.plala.or.jp/mano-a-mano/i810switch.html;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix
index a58f55abecf..014fe41afc8 100644
--- a/pkgs/os-specific/linux/ima-evm-utils/default.nix
+++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)";
-    homepage = "http://sourceforge.net/projects/linux-ima/";
+    homepage = http://sourceforge.net/projects/linux-ima/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
index 30bd51473b5..e27f380ac3e 100644
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ b/pkgs/os-specific/linux/ipsec-tools/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://ipsec-tools.sourceforge.net/";
+    homepage = http://ipsec-tools.sourceforge.net/;
     description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix
index 8ccaaa66304..8e9f29306e7 100644
--- a/pkgs/os-specific/linux/jujuutils/default.nix
+++ b/pkgs/os-specific/linux/jujuutils/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ linuxHeaders ];
 
   meta = {
-    homepage = "http://code.google.com/p/jujuutils/";
+    homepage = http://code.google.com/p/jujuutils/;
     description = "Utilities around FireWire devices connected to a Linux computer";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix
index f0419805913..850907d4f8a 100644
--- a/pkgs/os-specific/linux/kmscon/default.nix
+++ b/pkgs/os-specific/linux/kmscon/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "KMS/DRM based System Console";
-    homepage = "http://www.freedesktop.org/wiki/Software/kmscon/";
+    homepage = http://www.freedesktop.org/wiki/Software/kmscon/;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix
index 079bfb7c5be..c1389f30b05 100644
--- a/pkgs/os-specific/linux/kmscube/default.nix
+++ b/pkgs/os-specific/linux/kmscube/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Example OpenGL app using KMS/GBM";
-    homepage = "https://github.com/robclark/kmscube";
+    homepage = https://github.com/robclark/kmscube;
     license = licenses.mit;
     maintainers = with maintainers; [ dezgeg ];
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 8066eddd4f3..81a3af54628 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     inherit version;
-    homepage = "http://www.infradead.org/~tgr/libnl/";
+    homepage = http://www.infradead.org/~tgr/libnl/;
     description = "Linux Netlink interface library suite";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ fpletz ];
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index eaf6d98ba9d..9f911013f3b 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   preFixup = ''rm -rf "$(pwd)" '';
 
   meta = {
-    homepage = "http://linux.dell.com/libsmbios/main";
+    homepage = http://linux.dell.com/libsmbios/main;
     description = "A library to obtain BIOS information";
     license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix
index 203d1defa28..c0c6ad54579 100644
--- a/pkgs/os-specific/linux/libudev0-shim/default.nix
+++ b/pkgs/os-specific/linux/libudev0-shim/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Shim to preserve libudev.so.0 compatibility";
-    homepage = "https://github.com/archlinux/libudev0-shim";
+    homepage = https://github.com/archlinux/libudev0-shim;
     platforms = platforms.linux;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 1d432f9bbd9..c1f9425efc3 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://linuxcontainers.org/";
+    homepage = https://linuxcontainers.org/;
     description = "Userspace tools for Linux Containers, a lightweight virtualization system";
     license = licenses.lgpl21Plus;
 
diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix
index 350915c55b5..3116c50435a 100644
--- a/pkgs/os-specific/linux/mba6x_bl/default.nix
+++ b/pkgs/os-specific/linux/mba6x_bl/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "MacBook Air 6,1 and 6,2 (mid 2013) backlight driver";
-    homepage = "https://github.com/patjak/mba6x_bl";
+    homepage = https://github.com/patjak/mba6x_bl;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.simonvandel ];
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 4866c3d8132..08c7ef47b82 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     description = "Daemon that uses input from coretemp module and sets the fan speed using the applesmc module";
-    homepage = "https://github.com/dgraziotin/mbpfan";
+    homepage = https://github.com/dgraziotin/mbpfan;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
index 8887237b304..f4e7ad1f234 100644
--- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://archlinux.org/";
+    homepage = https://archlinux.org/;
     description = "ipconfig and nfsmount tools for root on NFS, ported from klibc";
     license = licenses.gpl2;
     platforms  = platforms.linux;
diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix
index ed88fc643fd..6f16debaedf 100644
--- a/pkgs/os-specific/linux/mxu11x0/default.nix
+++ b/pkgs/os-specific/linux/mxu11x0/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "MOXA UPort 11x0 USB to Serial Hub driver";
-    homepage = "https://github.com/ellysh/mxu11x0";
+    homepage = https://github.com/ellysh/mxu11x0;
     license = licenses.gpl1;
     maintainers = with maintainers; [ uralbash ];
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 2e410fec561..d28cf44bd67 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -78,7 +78,7 @@ in stdenv.mkDerivation rec {
       daemons.
     '';
 
-    homepage = "https://sourceforge.net/projects/nfs/";
+    homepage = https://sourceforge.net/projects/nfs/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 98d557261fa..22fd1242700 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.nvidia.com/object/unix.html";
+    homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index ddc190a08e6..e272ac14de0 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://www.nvidia.com/object/unix.html";
+    homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 9abb20a1c6a..58dc3a48173 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
       support distribution across multiple physical servers similar
       to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
       '';
-    homepage = "http://openvswitch.org/";
+    homepage = http://openvswitch.org/;
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix
index d2b52822a55..6026ac1d41a 100644
--- a/pkgs/os-specific/linux/pam_ccreds/default.nix
+++ b/pkgs/os-specific/linux/pam_ccreds/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   buildInputs = [pam openssl db];
   meta = {
-    homepage = "http://www.padl.com/OSS/pam_ccreds.html";
+    homepage = http://www.padl.com/OSS/pam_ccreds.html;
     description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix
index 10383a13e7e..10856bb52c9 100644
--- a/pkgs/os-specific/linux/pam_pgsql/default.nix
+++ b/pkgs/os-specific/linux/pam_pgsql/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Support to authenticate against PostgreSQL for PAM-enabled appliations";
-    homepage = "https://github.com/pam-pgsql/pam-pgsql";
+    homepage = https://github.com/pam-pgsql/pam-pgsql;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix
index a686bd5496d..57ef22083fe 100644
--- a/pkgs/os-specific/linux/pipework/default.nix
+++ b/pkgs/os-specific/linux/pipework/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     description = "Software-Defined Networking tools for LXC";
-    homepage = "https://github.com/jpetazzo/pipework";
+    homepage = https://github.com/jpetazzo/pipework;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix
index eb90ac30344..d14d0a233c2 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/pkgs/os-specific/linux/rtl8723bs/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Realtek SDIO Wi-Fi driver";
-    homepage = "https://github.com/hadess/rtl8723bs";
+    homepage = https://github.com/hadess/rtl8723bs;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     broken = (! versionAtLeast kernel.version "3.19");
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 93c8e5b7ae4..34fc7b5c759 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
-    homepage = "https://github.com/Grawp/rtl8812au_rtl8821au";
+    homepage = https://github.com/Grawp/rtl8812au_rtl8821au;
     license = stdenv.lib.licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix
index 390d6ee4703..72dfea082ef 100644
--- a/pkgs/os-specific/linux/sch_cake/default.nix
+++ b/pkgs/os-specific/linux/sch_cake/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "The cake qdisc scheduler";
-    homepage = "https://www.bufferbloat.net/projects/codel/wiki/Cake/";
+    homepage = https://www.bufferbloat.net/projects/codel/wiki/Cake/;
     license = with licenses; [ bsd3 gpl2 ];
     maintainers = with maintainers; [ fpletz ];
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix
index b2d85376c6a..f24996562d8 100644
--- a/pkgs/os-specific/linux/schedtool/default.nix
+++ b/pkgs/os-specific/linux/schedtool/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Query or alter a process' scheduling policy under Linux";
-    homepage = "http://freequaos.host.sk/schedtool/";
+    homepage = http://freequaos.host.sk/schedtool/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index 5f539b9a97e..8262c03e1e5 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "SELinux Tools";
-    homepage = "http://oss.tresys.com/projects/setools/";
+    homepage = http://oss.tresys.com/projects/setools/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix
index bf8367fcd45..9207a6b3511 100644
--- a/pkgs/os-specific/linux/sinit/default.nix
+++ b/pkgs/os-specific/linux/sinit/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.mit ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://tools.suckless.org/sinit";
+    homepage = http://tools.suckless.org/sinit;
     downloadPage = "http://git.suckless.org/sinit";
   };
 }
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 8e303bee821..c79343322d9 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -174,7 +174,7 @@ stdenv.mkDerivation rec {
   passthru.interfaceVersion = 2;
 
   meta = {
-    homepage = "http://www.freedesktop.org/wiki/Software/systemd";
+    homepage = http://www.freedesktop.org/wiki/Software/systemd;
     description = "A system and service manager for Linux";
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.eelco ];
diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index 765305d0fda..510f781e393 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "IBM ThinkPad hardware functions driver";
-    homepage = "https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41";
+    homepage = https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     # driver is only ment for linux thinkpads i think  bellow platforms should cover it.
diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix
index d5b9be34d9c..76ce2637ced 100644
--- a/pkgs/os-specific/linux/upstart/default.nix
+++ b/pkgs/os-specific/linux/upstart/default.nix
@@ -49,7 +49,7 @@ let
     '';
 
   meta = {
-    homepage = "http://upstart.ubuntu.com/";
+    homepage = http://upstart.ubuntu.com/;
     description = "An event-based replacement for the /sbin/init daemon";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index ceb6e8c86c0..cc68697756c 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://kafka.apache.org";
+    homepage = http://kafka.apache.org;
     description = "A high-throughput distributed messaging system";
     license = licenses.asl20;
     maintainers = [ maintainers.ragge ];
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
index 9249d7cc347..befa36edd9e 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/pkgs/servers/cayley/default.nix
@@ -21,7 +21,7 @@ buildGoPackage rec {
   '';
   
   meta = {
-    homepage = "https://cayley.io/";
+    homepage = https://cayley.io/;
     description = "A graph database inspired by Freebase and Knowledge Graph";
     maintainers = with stdenv.lib.maintainers; [ sigma ];
     license = stdenv.lib.licenses.asl20;
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 81d0f494955..0219a1bf7ec 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://storm.apache.org";
+    homepage = http://storm.apache.org;
     description = "Distributed realtime computation system";
     license = licenses.asl20;
     maintainers = with maintainers; [ edwtjo vizanto ];
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index cc566e712c2..86995f44004 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -23,7 +23,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Tool for service discovery, monitoring and configuration";
-    homepage = "https://www.consul.io/";
+    homepage = https://www.consul.io/;
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.mpl20;
     maintainers = with maintainers; [ pradeepchhetri ];
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 4534ccbe099..bf7a7266022 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.isc.org/software/bind";
+    homepage = http://www.isc.org/software/bind;
     description = "Domain name server";
     license = stdenv.lib.licenses.isc;
 
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
index 369ef5a7369..c1234606291 100644
--- a/pkgs/servers/exhibitor/default.nix
+++ b/pkgs/servers/exhibitor/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
   '';
   meta = with stdenv.lib; {
-    homepage = "https://github.com/soabase/exhibitor";
+    homepage = https://github.com/soabase/exhibitor;
     description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization";
     license = licenses.asl20;
     platforms = platforms.unix;
diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix
index ceabce82c71..cc1582eb9e9 100644
--- a/pkgs/servers/ftp/bftpd/default.nix
+++ b/pkgs/servers/ftp/bftpd/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://bftpd.sf.net/";
+    homepage = http://bftpd.sf.net/;
     downloadPage = "http://bftpd.sf.net/download.html";
   };
 }
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index ccab31ce225..e63e13a218e 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Share your terminal as a web application";
-    homepage = "https://github.com/yudai/gotty";
+    homepage = https://github.com/yudai/gotty;
     maintainers = with maintainers; [ matthiasbeyer ];
     license = licenses.mit;
   };
diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix
index c89e4100d38..2b8693f7379 100644
--- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.zdziarski.com/blog/?page_id=442";
+    homepage = http://www.zdziarski.com/blog/?page_id=442;
     description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index eef935f7374..64758962102 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.fastcgi.com/";
+    homepage = http://www.fastcgi.com/;
     description = "Provide support for the FastCGI protocol";
 
     longDescription = ''
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
index 0481ebb9b8d..1e56a2dac48 100644
--- a/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
-    homepage = "http://couchdb.apache.org";
+    homepage = http://couchdb.apache.org;
     license = licenses.asl20;
     platforms = platforms.all;
     maintainers = with maintainers; [ garbas ];
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 697c9d95884..5a988d22ecb 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
-    homepage = "http://couchdb.apache.org";
+    homepage = http://couchdb.apache.org;
     license = licenses.asl20;
     platforms = platforms.all;
     maintainers = with maintainers; [ garbas ];
diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index c5dd9f7a577..aa6f0e1f910 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "An advanced and secure webserver";
     license = licenses.gpl2;
-    homepage = "https://www.hiawatha-webserver.org";
+    homepage = https://www.hiawatha-webserver.org;
     maintainer = [ maintainers.ndowens ];
   };
 
diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index d5af6e43292..75ec8514e35 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://mini-httpd.nongnu.org/";
+    homepage = http://mini-httpd.nongnu.org/;
     description = "A minimalistic high-performance web server";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix
index 38ab4bd3187..4eb74c8cb53 100644
--- a/pkgs/servers/http/pshs/default.nix
+++ b/pkgs/servers/http/pshs/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Pretty small HTTP server - a command-line tool to share files";
-    homepage = "https://github.com/mgorny/pshs";
+    homepage = https://github.com/mgorny/pshs;
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.eduarrrd ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
index 96652515f7a..08e682aa716 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tiny/turbo/throttling HTTP server";
-    homepage = "http://www.acme.com/software/thttpd/";
+    homepage = http://www.acme.com/software/thttpd/;
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix
index e09a9f74098..0ffef616f37 100644
--- a/pkgs/servers/inginious/default.nix
+++ b/pkgs/servers/inginious/default.nix
@@ -66,7 +66,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "An intelligent grader that allows secured and automated testing of code made by students";
-    homepage = "https://github.com/UCL-INGI/INGInious";
+    homepage = https://github.com/UCL-INGI/INGInious;
     license = licenses.agpl3;
     maintainers = with maintainers; [ layus ];
   };
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index 82a571ca77c..c13a0ee3d89 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An IPv6-capable IRC server";
     platforms = stdenv.lib.platforms.unix;
-    homepage = "http://www.ircd-hybrid.org/";
+    homepage = http://www.ircd-hybrid.org/;
   };
 }
diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
index fb5d49849f8..6ad233593a3 100644
--- a/pkgs/servers/irker/default.nix
+++ b/pkgs/servers/irker/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "IRC client that runs as a daemon accepting notification requests";
-    homepage = "https://gitlab.com/esr/irker";
+    homepage = https://gitlab.com/esr/irker;
     license = licenses.bsd2;
     maintainers = with maintainers; [ dtzWill ];
     platforms = platforms.unix;
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 36d45672150..91b9ed972d8 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional withSQLite "--with-sqlite";
 
   meta = {
-    homepage = "http://dovecot.org/";
+    homepage = http://dovecot.org/;
     description = "Open source IMAP and POP3 email server written with security primarily in mind";
     maintainers = with stdenv.lib.maintainers; [viric peti rickynils];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
index b972192da7a..1a1ba1ad448 100644
--- a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://wiki2.dovecot.org/Plugins/Antispam";
+    homepage = http://wiki2.dovecot.org/Plugins/Antispam;
     description = "An antispam plugin for the Dovecot IMAP server";
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index 0c3ed84deff..623f0a2b0e2 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -99,7 +99,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://nuclearelephant.com/";
+    homepage = http://nuclearelephant.com/;
     description = "Community Driven Antispam Filter";
     license = licenses.agpl3;
     platforms = platforms.linux;
diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix
index 554634d5a79..019c84d2898 100644
--- a/pkgs/servers/mail/mailhog/default.nix
+++ b/pkgs/servers/mail/mailhog/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Web and API based SMTP testing";
-    homepage = "https://github.com/mailhog/MailHog";
+    homepage = https://github.com/mailhog/MailHog;
     maintainers = with maintainers; [ disassembler ];
     license = licenses.mit;
   };
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 3c028b1ac17..cc586dbbb92 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "DIRSETGID=:" ];
 
   meta = {
-    homepage = "http://www.gnu.org/software/mailman/";
+    homepage = http://www.gnu.org/software/mailman/;
     description = "Free software for managing electronic mail discussion and e-newsletter lists";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
index 44840c91b05..be923ff2305 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://untroubled.org/nullmailer/";
+    homepage = http://untroubled.org/nullmailer/;
     description = ''
       A sendmail/qmail/etc replacement MTA for hosts which relay to a fixed set of smart relays.
       It is designed to be simple to configure, secure, and easily extendable.
diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix
index 395f3ded7fd..8ccd783b6ad 100644
--- a/pkgs/servers/mail/petidomo/default.nix
+++ b/pkgs/servers/mail/petidomo/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = "http://petidomo.sourceforge.net/";
+    homepage = http://petidomo.sourceforge.net/;
     description = "A simple and easy to administer mailing list server";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix
index 998dce88286..e14b62a8597 100644
--- a/pkgs/servers/mail/popa3d/default.nix
+++ b/pkgs/servers/mail/popa3d/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"'';
 
   meta = {
-    homepage = "http://www.openwall.com/popa3d/";
+    homepage = http://www.openwall.com/popa3d/;
     description = "Tiny POP3 daemon with security as the primary goal";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index bfdea71c5d7..f3266046cb9 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.postfix.org/";
+    homepage = http://www.postfix.org/;
     description = "A fast, easy to administer, and secure mail server";
     license = lib.licenses.bsdOriginal;
     platforms = lib.platforms.linux;
diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix
index 978ccec503d..a9ec36f59ca 100644
--- a/pkgs/servers/mail/postfix/pflogsumm.nix
+++ b/pkgs/servers/mail/postfix/pflogsumm.nix
@@ -27,7 +27,7 @@ buildPerlPackage rec {
   '';
 
   meta = {
-    homepage = "http://jimsun.linxnet.com/postfix_contrib.html";
+    homepage = http://jimsun.linxnet.com/postfix_contrib.html;
     maintainers = with stdenv.lib.maintainers; [ schneefux ];
     description = "Postfix activity overview";
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix
index 7fdf0edb096..95f460e917b 100644
--- a/pkgs/servers/mail/postgrey/default.nix
+++ b/pkgs/servers/mail/postgrey/default.nix
@@ -17,7 +17,7 @@ in runCommand name {
   };
   meta = with stdenv.lib; {
     description = "A postfix policy server to provide greylisting";
-    homepage = "https://postgrey.schweikert.ch/";
+    homepage = https://postgrey.schweikert.ch/;
     platforms = postfix.meta.platforms;
     licenses = licenses.gpl2;
   };
diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
index 4eeb8009558..01eeeb15efa 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake help2man ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/roehling/postsrsd";
+    homepage = https://github.com/roehling/postsrsd;
     description = "Postfix Sender Rewriting Scheme daemon";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index e0e5fd45b7f..739270326e5 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/vstakhov/rmilter";
+    homepage = https://github.com/vstakhov/rmilter;
     license = licenses.asl20;
     description = ''
       Daemon to integrate rspamd and milter compatible MTA, for example
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 6283bed96c3..13834f95282 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/vstakhov/rspamd";
+    homepage = https://github.com/vstakhov/rspamd;
     license = licenses.asl20;
     description = "Advanced spam filtering system";
     maintainers = with maintainers; [ avnik fpletz ];
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index f4ab6a02995..acbc50fd42b 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -34,7 +34,7 @@ buildPerlPackage rec {
   '';
 
   meta = {
-    homepage = "http://spamassassin.apache.org/";
+    homepage = http://spamassassin.apache.org/;
     description = "Open-Source Spam Filter";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index a00eed26dbf..4668ac24096 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open-Source, self-hosted Slack-alternative";
-    homepage = "https://www.mattermost.org";
+    homepage = https://www.mattermost.org;
     license = with licenses; [ agpl3 asl20 ];
     maintainers = with maintainers; [ fpletz ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index 52596d6e079..0b82f1deef6 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Complete open source platform for building web and mobile apps in pure JavaScript";
-    homepage = "http://www.meteor.com";
+    homepage = http://www.meteor.com;
     license = licenses.mit;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index 465a85259f4..ea17c0b18b2 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
 
   meta = {
     description = "A prometheus exporter which scrapes remote JSON by JSONPath";
-    homepage = "https://github.com/kawamuray/prometheus-json-exporter";
+    homepage = https://github.com/kawamuray/prometheus-json-exporter;
     license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index 456e6904296..707b1014e22 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
   goDeps = ./varnish-exporter_deps.nix;
 
   meta = {
-    homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter";
+    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/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index 9a8a0a80e52..6d2bb9b9e94 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pcre];
 
   meta = {
-    homepage = "http://leafnode.sourceforge.net/";
+    homepage = http://leafnode.sourceforge.net/;
     description = "Leafnode implements a store & forward NNTP proxy";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix
index c2b913a5b37..0e99378c92c 100644
--- a/pkgs/servers/nextcloud/news-updater.nix
+++ b/pkgs/servers/nextcloud/news-updater.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Fast parallel feed updater for the Nextcloud news app";
-    homepage = "https://github.com/nextcloud/news-updater";
+    homepage = https://github.com/nextcloud/news-updater;
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ schneefux ];
   };
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 423bc807035..897ab3b4964 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.asl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://jena.apache.org";
+    homepage = http://jena.apache.org;
     downloadPage = "http://archive.apache.org/dist/jena/binaries/";
     updateWalker = true;
     downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$";
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index e3e748dc2b4..2cce6cff902 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.asl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://jena.apache.org";
+    homepage = http://jena.apache.org;
     downloadPage = "http://archive.apache.org/dist/jena/binaries/";
     downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$";
   };
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index c40b765d345..e7dc7ae9225 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/arangodb/arangodb";
+    homepage = https://github.com/arangodb/arangodb;
     description = "A native multi-model database with flexible data models for documents, graphs, and key-values";
     license = licenses.asl20;
     platforms = platforms.linux;
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index a2158c9b541..c907f081e22 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A highly scalable, robust (fully ACID) native graph database";
-    homepage = "http://www.neo4j.org/";
+    homepage = http://www.neo4j.org/;
     license = licenses.gpl3;
 
     maintainers = [ maintainers.offline ];
diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix
index 8b17da99b9a..b2126a69833 100644
--- a/pkgs/servers/openpts/default.nix
+++ b/pkgs/servers/openpts/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "TCG Platform Trust Service (PTS)";
-    homepage = "http://sourceforge.jp/projects/openpts";
+    homepage = http://sourceforge.jp/projects/openpts;
     license = stdenv.lib.licenses.cpl10;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix
index 5646afe8e21..111c2f02b99 100644
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@@ -72,7 +72,7 @@ buildPerlPackage {
   doCheck = false;
 
   meta = {
-    homepage = "http://www.openxpki.org";
+    homepage = http://www.openxpki.org;
     description = "Enterprise-grade PKI/Trustcenter software";
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix
index acca1af6055..f5b939d85bd 100644
--- a/pkgs/servers/restund/default.nix
+++ b/pkgs/servers/restund/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ;
   NIX_LDFLAGS='' -L${stdenv.lib.getLib mysql.client}/lib/mysql '';
   meta = {
-    homepage = "http://www.creytiv.com/restund.html";
+    homepage = http://www.creytiv.com/restund.html;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index cc5d7795e05..da59241bad3 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "ONC RPC portmapper";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    homepage = "http://sourceforge.net/projects/rpcbind/";
+    homepage = http://sourceforge.net/projects/rpcbind/;
     maintainers = with maintainers; [ abbradar ];
     longDescription = ''
       Universal addresses to RPC program number mapper.
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index 841ca530f32..ade2ea94453 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -30,7 +30,7 @@ in {
       sha256 = "1p75l3vcnb90ar4j3dci2xf8dqnqyy31kc1r075fa2xqlsxgigcp";
     };
     meta = {
-      homepage = "https://github.com/jprante/elasticsearch-river-jdbc";
+      homepage = https://github.com/jprante/elasticsearch-river-jdbc;
       description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch";
       license = licenses.asl20;
     };
@@ -45,7 +45,7 @@ in {
       sha256 = "bf7bf5ce3ccdd3afecd0e18cd6fce1ef56f824e41f4ef50553ae598caa5c366d";
     };
     meta = {
-      homepage = "https://github.com/vhyza/elasticsearch-analysis-lemmagen";
+      homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen;
       description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter";
       license = licenses.asl20;
     };
@@ -83,7 +83,7 @@ in {
     };
 
     meta = {
-      homepage = "https://github.com/elasticsearch/elasticsearch-river-twitter";
+      homepage = https://github.com/elasticsearch/elasticsearch-river-twitter;
       description = "Twitter River Plugin for ElasticSearch";
       license = licenses.asl20;
       maintainers = [ maintainers.edwtjo ];
diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index d4f9e1df884..0326784b2ac 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://lucene.apache.org/solr/";
+    homepage = https://lucene.apache.org/solr/;
     description = "Open source enterprise search platform from the Apache Lucene project";
     license = licenses.asl20;
     platforms = platforms.all;
diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
index 23daa99b3bc..4c5f71cb37d 100644
--- a/pkgs/servers/serf/default.nix
+++ b/pkgs/servers/serf/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Tool for service orchestration and management";
-    homepage = "https://www.serf.io/";
+    homepage = https://www.serf.io/;
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.mpl20;
     maintainers = with maintainers; [ pradeepchhetri ];
diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index db47dc99468..d9a4f4733f7 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Static multicast routing daemon";
-    homepage = "http://troglobit.com/smcroute.html";
+    homepage = http://troglobit.com/smcroute.html;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ fpletz ];
     platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd);
diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix
index cb150fc5fd4..e86406cd469 100644
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Oracle Database Express Edition";
-    homepage = "http://www.oracle.com/technetwork/products/express-edition/";
+    homepage = http://www.oracle.com/technetwork/products/express-edition/;
     license = licenses.unfree;
   };
 }
diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix
index a394d584536..fc6c54f82c9 100644
--- a/pkgs/servers/sql/percona/5.6.x.nix
+++ b/pkgs/servers/sql/percona/5.6.x.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   passthru.mysqlVersion = "5.6";
 
   meta = with stdenv.lib; {
-    homepage = "https://www.percona.com";
+    homepage = https://www.percona.com;
     description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
index f8c735d879b..af1a3f1eb0e 100644
--- a/pkgs/servers/squid/4.nix
+++ b/pkgs/servers/squid/4.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
-    homepage = "http://www.squid-cache.org";
+    homepage = http://www.squid-cache.org;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz raskin ];
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index eeec9048689..1133b697a25 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
-    homepage = "http://www.squid-cache.org";
+    homepage = http://www.squid-cache.org;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz ];
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index 09cb2cca628..8b963e58663 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 	Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android 
         supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources.
 	Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.'';
-    homepage = "https://tvheadend.org";
+    homepage = https://tvheadend.org;
     license = licenses.gpl3;
     platforms = platforms.unix;
     maintainers = [ maintainers.simonvandel ];
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index f871e6adf2b..d30129d93d9 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_LINK = [ "-lsystemd" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://uwsgi-docs.readthedocs.org/en/latest/";
+    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 schneefux ];
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index bf8e69bd989..01dec302081 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Web application accelerator also known as a caching HTTP reverse proxy";
-    homepage = "https://www.varnish-cache.org";
+    homepage = https://www.varnish-cache.org;
     license = licenses.bsd2;
     maintainers = with maintainers; [ garbas fpletz ];
     platforms = platforms.linux;
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index b3a9ad44484..f84515dad61 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://zookeeper.apache.org";
+    homepage = http://zookeeper.apache.org;
     description = "Apache Zookeeper";
     license = licenses.asl20;
     maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ];
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index b2a63e9532b..c328329bb26 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -158,7 +158,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Smart and user-friendly command line shell";
-    homepage = "http://fishshell.com/";
+    homepage = http://fishshell.com/;
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ ocharles ];
diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix
index 8e2a0950d19..8f50448b714 100644
--- a/pkgs/shells/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals";
-    homepage = "https://github.com/halfo/lambda-mod-zsh-theme/";
+    homepage = https://github.com/halfo/lambda-mod-zsh-theme/;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ma27 ];
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index e21c97c297c..23c7e2cc3a5 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       also to be readily available under other UNIX(R)-like operating
       systems.
     '';
-    homepage = "https://www.mirbsd.org/mksh.htm";
+    homepage = https://www.mirbsd.org/mksh.htm;
     license = licenses.bsd3;
     maintainers = with maintainers; [ AndersonTorres nckx joachifm ];
     platforms = platforms.unix;
diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix
index 1261a4429a4..eaae85990b2 100644
--- a/pkgs/shells/nix-zsh-completions/default.nix
+++ b/pkgs/shells/nix-zsh-completions/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://github.com/spwhitt/nix-zsh-completions";
+    homepage = http://github.com/spwhitt/nix-zsh-completions;
     description = "ZSH completions for Nix, NixOS, and NixOps";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix
index d3ce1ff1cc2..c58fda28db0 100644
--- a/pkgs/shells/rssh/default.nix
+++ b/pkgs/shells/rssh/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
       rssh also includes support for rsync and cvs. For example, if you have a server which you only want to allow users to copy files off of via scp, without providing shell access, you can use rssh to do that.
     '';
-    homepage = "http://www.pizzashack.org/rssh/";
+    homepage = http://www.pizzashack.org/rssh/;
     license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ arobyn ];
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index a2689fc64c1..598e6dbd946 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "A Python-ish, BASHwards-compatible shell";
-    homepage = "http://xonsh.org";
+    homepage = http://xonsh.org;
     license = licenses.bsd3;
     maintainers = with maintainers; [ spwhitt garbas vrthra ];
     platforms = platforms.all;
diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh-autosuggestions/default.nix
index fe7ed752f5e..22ea5414251 100644
--- a/pkgs/shells/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh-autosuggestions/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fish shell autosuggestions for Zsh";
-    homepage = "https://github.com/zsh-users/zsh-autosuggestions";
+    homepage = https://github.com/zsh-users/zsh-autosuggestions;
     license = licenses.mit;
     platforms = platforms.unix;
     maintainers = [ maintainers.loskutov ];
diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh-completions/default.nix
index d2096ef811d..4a5731b9152 100644
--- a/pkgs/shells/zsh-completions/default.nix
+++ b/pkgs/shells/zsh-completions/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Additional completion definitions for zsh";
-    homepage = "https://github.com/zsh-users/zsh-completions";
+    homepage = https://github.com/zsh-users/zsh-completions;
     license = stdenv.lib.licenses.free;
 
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh-prezto/default.nix
index 80886e1038b..c5f404bbd3f 100644
--- a/pkgs/shells/zsh-prezto/default.nix
+++ b/pkgs/shells/zsh-prezto/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes.";
-    homepage = "https://github.com/sorin-ionescu/prezto";
+    homepage = https://github.com/sorin-ionescu/prezto;
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ];
     platforms = with platforms; unix;
diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh-syntax-highlighting/default.nix
index 21911c8800c..a97251d8e56 100644
--- a/pkgs/shells/zsh-syntax-highlighting/default.nix
+++ b/pkgs/shells/zsh-syntax-highlighting/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fish shell like syntax highlighting for Zsh";
-    homepage = "https://github.com/zsh-users/zsh-syntax-highlighting";
+    homepage = https://github.com/zsh-users/zsh-syntax-highlighting;
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = [ maintainers.loskutov ];
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index c4814046200..8299bef691a 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -76,7 +76,7 @@ EOF
       a host of other features.
     '';
     license = "MIT-like";
-    homepage = "http://www.zsh.org/";
+    homepage = http://www.zsh.org/;
     maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix
index 8506c9f38f3..ae7daa1db10 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/pkgs/tools/X11/autocutsel/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    homepage = "http://www.nongnu.org/autocutsel/";
+    homepage = http://www.nongnu.org/autocutsel/;
     description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = with stdenv.lib.platforms; all;
diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix
index 7105b4742cb..3dfc7abbc77 100644
--- a/pkgs/tools/X11/dragon-drop/default.nix
+++ b/pkgs/tools/X11/dragon-drop/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple drag-and-drop source/sink for X";
-    homepage = "https://github.com/mwh/dragon";
+    homepage = https://github.com/mwh/dragon;
     maintainers = with maintainers; [ jb55 ];
     license = licenses.gpl3;
     platforms = with platforms; unix;
diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index 49bab143fc2..e25fa43f180 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GUI configuration tool for openbox";
-    homepage = "http://openbox.org/wiki/ObConf";
+    homepage = http://openbox.org/wiki/ObConf;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.lhvwb ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix
index 26bb32b17b0..33470beca2d 100644
--- a/pkgs/tools/X11/oblogout/default.nix
+++ b/pkgs/tools/X11/oblogout/default.nix
@@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Openbox logout script";
-    homepage = "https://launchpad.net/oblogout";
+    homepage = https://launchpad.net/oblogout;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix
index f3119a1a147..6aaaf83d975 100644
--- a/pkgs/tools/X11/primus/lib.nix
+++ b/pkgs/tools/X11/primus/lib.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Low-overhead client-side GPU offloading";
-    homepage = "https://github.com/amonakov/primus";
+    homepage = https://github.com/amonakov/primus;
     platforms = platforms.linux;
     license = licenses.bsd2;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix
index 19e5fe69da5..806a8388082 100644
--- a/pkgs/tools/X11/ratmen/default.nix
+++ b/pkgs/tools/X11/ratmen/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "http://www.update.uu.se/~zrajm/programs/";
+    homepage = http://www.update.uu.se/~zrajm/programs/;
     downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/";
     updateWalker = true;
   };
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index fd5cfe03ea3..5433035d221 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "execgamesdir=$(out)/bin" ];
 
   meta = {
-    homepage = "http://darcs.nomeata.de/cgi-bin/darcsweb.cgi?r=screen-message.debian";
+    homepage = http://darcs.nomeata.de/cgi-bin/darcsweb.cgi?r=screen-message.debian;
     description = "Displays a short text fullscreen in an X11 window";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.fpletz ];
diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix
index b0bf8a10169..33a0deedafa 100644
--- a/pkgs/tools/X11/sselp/default.nix
+++ b/pkgs/tools/X11/sselp/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://tools.suckless.org/sselp";
+    homepage = http://tools.suckless.org/sselp;
     description = "Prints the X selection to stdout, useful in scripts";
     license = stdenv.lib.licenses.mit;
     maintainers = [stdenv.lib.maintainers.magnetophon ];
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index b0c1dd3c444..ece08fd5cd4 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://www.virtualgl.org/";
+    homepage = http://www.virtualgl.org/;
     description = "X11 GL rendering in a remote computer with full 3D hw acceleration";
     license = licenses.free; # many parts under different free licenses
     platforms = platforms.linux;
diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix
index bb4435d56e7..a5a75c9df4f 100644
--- a/pkgs/tools/X11/wayv/default.nix
+++ b/pkgs/tools/X11/wayv/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://github.com/mikemb/wayV";
+    homepage = https://github.com/mikemb/wayV;
   };
 }
diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix
index 829d9b8ab2d..5a08cf5c817 100644
--- a/pkgs/tools/X11/xannotate/default.nix
+++ b/pkgs/tools/X11/xannotate/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://bitbucket.org/blais/xannotate";
+    homepage = https://bitbucket.org/blais/xannotate;
   };
 }
diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix
index 894f082a708..23e675bb59b 100644
--- a/pkgs/tools/X11/xcape/default.nix
+++ b/pkgs/tools/X11/xcape/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       is to generate the Escape key when Left Control is pressed and
       released on its own.
     '';
-    homepage = "https://github.com/alols/xcape";
+    homepage = https://github.com/alols/xcape;
     license = stdenv.lib.licenses.gpl3 ;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.raskin ];
diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix
index 238b8c7b2b2..f06b4cc6b37 100644
--- a/pkgs/tools/X11/xchainkeys/default.nix
+++ b/pkgs/tools/X11/xchainkeys/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 ];
 
   meta = {
-    homepage = "http://henning-bekel.de/xchainkeys/";
+    homepage = http://henning-bekel.de/xchainkeys/;
     description = "A standalone X11 program to create chained key bindings";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix
index a309ed3826e..a8b992db2b7 100644
--- a/pkgs/tools/admin/analog/default.nix
+++ b/pkgs/tools/admin/analog/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.analog.cx/";
+    homepage = http://www.analog.cx/;
     license = stdenv.lib.licenses.gpl2;
     description = "Powerful tool to generate web server statistics";
     maintainers = [ stdenv.lib.maintainers.peti ];
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index 5b75657e325..bda3cb83cf7 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Unprivileged sandboxing tool";
-    homepage = "https://github.com/projectatomic/bubblewrap";
+    homepage = https://github.com/projectatomic/bubblewrap;
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ konimex ];
   };
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 26e63283f8d..d31f3023c96 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     version = version;
     # This package contains vendored dependencies. All have free licenses.
     license = licenses.free;
-    homepage = "https://cloud.google.com/sdk/";
+    homepage = https://cloud.google.com/sdk/;
     maintainers = with maintainers; [stephenmw zimbatm];
     platforms = with platforms; linux ++ darwin;
   };
diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index 42bd284e73f..cebe90855fa 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "NX compression proxy";
-    homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
+    homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix
index 56da02cc8d0..9b3dee728eb 100644
--- a/pkgs/tools/admin/sec/default.nix
+++ b/pkgs/tools/admin/sec/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://simple-evcorr.sourceforge.net/";
+    homepage = http://simple-evcorr.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
     description = "Simple Event Correlator";
     maintainers = [ stdenv.lib.maintainers.tv ];
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 0dca16b7502..4eb0cacdea9 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/zenhack/simp_le";
+    homepage = https://github.com/zenhack/simp_le;
     description = "Simple Let's Encrypt client";
     license = licenses.gpl3;
     maintainers = with maintainers; [ gebner nckx ];
diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix
index e7164bf07b6..4027b3d531c 100644
--- a/pkgs/tools/admin/tightvnc/default.nix
+++ b/pkgs/tools/admin/tightvnc/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
 
   meta = {
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = "http://vnc-tight.sourceforge.net/";
+    homepage = http://vnc-tight.sourceforge.net/;
     description = "Improved version of VNC";
 
     longDescription = ''
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
index 1f27730b19a..0f6814d53c9 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tool to unpack installers created by Inno Setup";
-    homepage = "http://constexpr.org/innoextract/";
+    homepage = http://constexpr.org/innoextract/;
     platforms = platforms.linux;
     license = licenses.zlib;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix
index c47242503c9..0edb302b49c 100644
--- a/pkgs/tools/archivers/unshield/default.nix
+++ b/pkgs/tools/archivers/unshield/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tool and library to extract CAB files from InstallShield installers";
-    homepage = "https://github.com/twogood/unshield";
+    homepage = https://github.com/twogood/unshield;
     license = licenses.mit;
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index 80149fa98dd..b8341204e92 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   }) ];
 
   meta = with stdenv.lib; {
-    homepage = "http://acoustid.org/fingerprinter";
+    homepage = http://acoustid.org/fingerprinter;
     description = "Audio fingerprinting tool using chromaprint";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with maintainers; [ ehmry ];
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 273b5d94c9f..116281e0a05 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Beets plugin to manage external files";
-    homepage = "https://github.com/geigerzaehler/beets-alternatives";
+    homepage = https://github.com/geigerzaehler/beets-alternatives;
     license = stdenv.lib.licenses.mit;
   };
 }
diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
index fa00d64f673..fdd70db4e64 100644
--- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix
+++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Beets plugin to move non-music files during the import process";
-    homepage = "https://github.com/sbarakat/beets-copyartifacts";
+    homepage = https://github.com/sbarakat/beets-copyartifacts;
     license = stdenv.lib.licenses.mit;
   };
 }
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index c50805c578f..451424fb866 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "PulseAudio system tray";
-    homepage = "https://github.com/christophgysin/pasystray";
+    homepage = https://github.com/christophgysin/pasystray;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ exlevan kamilchm ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index ae8752aa7c1..d7c14a91efb 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://github.com/bup/bup";
+    homepage = https://github.com/bup/bup;
     description = "Efficient file backup system based on the git packfile format";
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix
index baa0d617016..e1d19a48971 100644
--- a/pkgs/tools/backup/chunksync/default.nix
+++ b/pkgs/tools/backup/chunksync/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Space-efficient incremental backups of large files or block devices";
-    homepage = "http://chunksync.florz.de/";
+    homepage = http://chunksync.florz.de/;
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 74544b9cd63..02265bbc683 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
   meta = {
-    homepage = "http://www.httrack.com";
+    homepage = http://www.httrack.com;
     description = "Easy-to-use offline browser utility";
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index 05bf38613ef..66480a2f13a 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "A full-featured file system for online data storage";
-    homepage = "https://bitbucket.org/nikratio/s3ql";
+    homepage = https://bitbucket.org/nikratio/s3ql;
     license = licenses.gpl3;
     maintainers = with maintainers; [ rushmorem ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
index 25bd7236e68..c9fb1c54726 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/pkgs/tools/backup/zbackup/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake protobufc ];
   meta = {
     description = "A versatile deduplicating backup tool";
-    homepage = "http://zbackup.org/";
+    homepage = http://zbackup.org/;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index db0c2c26d3c..bb2ed0c2c26 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/blueman-project/blueman";
+    homepage = https://github.com/blueman-project/blueman;
     description = "GTK+-based Bluetooth Manager";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix
index 6d8c3e1a3c2..7cec791ecc5 100644
--- a/pkgs/tools/cd-dvd/lsdvd/default.nix
+++ b/pkgs/tools/cd-dvd/lsdvd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = "http://sourceforge.net/projects/lsdvd/";
+    homepage = http://sourceforge.net/projects/lsdvd/;
     shortDescription = "Display information about audio, video, and subtitle tracks on a DVD";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 51f47811065..3a06a39dcad 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
 
   meta = {
-    homepage = "http://www.bzip.org";
+    homepage = http://www.bzip.org;
     description = "High-quality data compression program";
 
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 5198cb15a60..f7382997f16 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
-    homepage = "http://brettcsmith.org/2007/dtrx/";
+    homepage = http://brettcsmith.org/2007/dtrx/;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.spwhitt ];
     platforms = platforms.all;
diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix
index cc6453e801e..cf616a21e0a 100644
--- a/pkgs/tools/compression/lbzip2/default.nix
+++ b/pkgs/tools/compression/lbzip2/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://lbzip2.org/";
+    homepage = http://lbzip2.org/;
     description = "Parallel bzip2 compression utility";
     license = licenses.gpl3;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index 17bc24ab599..cee23934d0c 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = "http://www.nongnu.org/lzip/lzip.html";
+    homepage = http://www.nongnu.org/lzip/lzip.html;
     description = "A lossless data compressor based on the LZMA algorithm";
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix
index 29402b1bf79..16455fe3588 100644
--- a/pkgs/tools/compression/mozlz4a/default.nix
+++ b/pkgs/tools/compression/mozlz4a/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5";
+    homepage = https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5;
   };
 }
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 193f1d5cb0b..15269bbd6c7 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.zlib.net/pigz/";
+    homepage = http://www.zlib.net/pigz/;
     description = "A parallel implementation of gzip for multi-core machines";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix
index e731d91f6d6..f9ca3aa1857 100644
--- a/pkgs/tools/compression/pxz/default.nix
+++ b/pkgs/tools/compression/pxz/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://jnovy.fedorapeople.org/pxz/";
+    homepage = https://jnovy.fedorapeople.org/pxz/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [pashev];
     description = ''Parallel XZ is a compression utility that takes advantage of
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 42fe0b7ce34..56d132907a0 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tool for managing bcachefs filesystems";
-    homepage = "http://bcachefs.org/";
+    homepage = http://bcachefs.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ davidak ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix
index c120073866d..8fed366a3de 100644
--- a/pkgs/tools/filesystems/bonnie/default.nix
+++ b/pkgs/tools/filesystems/bonnie/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://www.coker.com.au/bonnie++/";
+    homepage = http://www.coker.com.au/bonnie++/;
     description = "Hard drive and file system benchmark suite";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
index a9e05686e40..4c22268a1c8 100644
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
@@ -17,7 +17,7 @@ buildRustPackage rec {
   buildInputs = [ lzo zlib ];
 
   meta = with stdenv.lib; {
-    homepage = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe";
+    homepage = https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe;
     description = "BTRFS deduplication utility";
     license = licenses.mit;
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix
index f8c6942bad0..e5b09cbbff3 100644
--- a/pkgs/tools/filesystems/chunkfs/default.nix
+++ b/pkgs/tools/filesystems/chunkfs/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa";
-    homepage = "http://chunkfs.florz.de/";
+    homepage = http://chunkfs.florz.de/;
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix
index b745652b15c..64934ccb469 100644
--- a/pkgs/tools/filesystems/davfs2/default.nix
+++ b/pkgs/tools/filesystems/davfs2/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   makeFlags = ["sbindir=$(out)/sbin" "ssbindir=$(out)/sbin"];
 
   meta = {
-    homepage = "http://savannah.nongnu.org/projects/davfs2";
+    homepage = http://savannah.nongnu.org/projects/davfs2;
     description = "Mount WebDAV shares like a typical filesystem";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index d56c5e2ed9a..fdad877d34c 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libselinux libuuid ];
 
   meta = with stdenv.lib; {
-    homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/";
+    homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/;
     description = "Userland tools for the f2fs filesystem";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix
index 7bf771803c6..6a3e280aae3 100644
--- a/pkgs/tools/filesystems/genromfs/default.nix
+++ b/pkgs/tools/filesystems/genromfs/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://romfs.sourceforge.net/";
+    homepage = http://romfs.sourceforge.net/;
     description = "Tool for creating romfs file system images";
     license = licenses.gpl2;
     maintainers = with maintainers; [ pxc ];
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index b207eeeb9c3..5879fd9d082 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -42,7 +42,7 @@ buildPythonApplication rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "https://fedoraproject.org/wiki/Blivet";
+    homepage = https://fedoraproject.org/wiki/Blivet;
     description = "Module for management of a system's storage configuration";
     license = with licenses; [ gpl2Plus lgpl21Plus ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
index f13ad14aded..1da01bc2e60 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
@@ -24,7 +24,7 @@ buildPythonApplication rec {
   '';
 
   meta = {
-    homepage = "http://fedoraproject.org/wiki/Pykickstart";
+    homepage = http://fedoraproject.org/wiki/Pykickstart;
     description = "Read and write Fedora kickstart files";
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
index 721e5185be3..0d3370c4b1e 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
@@ -34,7 +34,7 @@ buildPythonApplication rec {
   '';
 
   meta = {
-    homepage = "https://fedorahosted.org/pyparted/";
+    homepage = https://fedorahosted.org/pyparted/;
     description = "Python interface for libparted";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix
index 50f758bceba..a51f2d47172 100644
--- a/pkgs/tools/filesystems/wdfs/default.nix
+++ b/pkgs/tools/filesystems/wdfs/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec
   };
   buildInputs = [fuse glib neon pkgconfig];
   meta = {
-    homepage = "http://noedler.de/projekte/wdfs/";
+    homepage = http://noedler.de/projekte/wdfs/;
     description = "User-space filesystem that allows to mount a webdav share";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix
index ea73a0e95b9..33e94866337 100644
--- a/pkgs/tools/graphics/dpic/default.nix
+++ b/pkgs/tools/graphics/dpic/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/";
+    homepage = https://ece.uwaterloo.ca/~aplevich/dpic/;
     description = "An implementation of the pic little language for creating drawings";
     license = stdenv.lib.licenses.bsd2;
     maintainers = [ stdenv.lib.maintainers.aespinosa ];
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index a3d343cea57..95acb08fbf0 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = "http://cgit.freedesktop.org/xorg/app/editres/";
+    homepage = http://cgit.freedesktop.org/xorg/app/editres/;
     description = "A dynamic resource editor for X Toolkit applications";
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index c4a0981dbb3..fb8f0472ce3 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.graphviz.org/";
+    homepage = http://www.graphviz.org/;
     description = "Open source graph visualization software";
 
     longDescription = ''
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index b0ccc5428bb..ce864261c8b 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.graphviz.org/";
+    homepage = http://www.graphviz.org/;
     description = "Open source graph visualization software";
 
     longDescription = ''
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix
index 4eb46453055..69ae03d6750 100644
--- a/pkgs/tools/graphics/imgur-screenshot/default.nix
+++ b/pkgs/tools/graphics/imgur-screenshot/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tool for easy screencapping and uploading to imgur";
-    homepage = "https://https://github.com/jomo/imgur-screenshot/";
+    homepage = https://https://github.com/jomo/imgur-screenshot/;
     platforms = platforms.linux;
     license = licenses.mit;
     maintainers = with maintainers; [ lw ];
diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix
index 847b3b81749..5a655b9ff16 100644
--- a/pkgs/tools/graphics/imgurbash2/default.nix
+++ b/pkgs/tools/graphics/imgurbash2/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
-    homepage = "https://github.com/ram-on/imgurbash2";
+    homepage = https://github.com/ram-on/imgurbash2;
   };
 }
diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix
index cbce8bb61f7..6e09dc191ac 100644
--- a/pkgs/tools/graphics/lprof/default.nix
+++ b/pkgs/tools/graphics/lprof/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Little CMS ICC profile construction set";
-    homepage = "http://sourceforge.net/projects/lprof";
+    homepage = http://sourceforge.net/projects/lprof;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 076f20c95c4..53f77d097c5 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   patches = [ ./threads.patch ./pfstools.patch ];
 
   meta = with stdenv.lib; {
-    homepage = "http://pfstools.sourceforge.net/";
+    homepage = http://pfstools.sourceforge.net/;
     description = "Toolkit for manipulation of HDR images";
     platforms = platforms.linux;
     license = licenses.lgpl2;
diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix
index df85b4473bb..a760336cfa3 100644
--- a/pkgs/tools/graphics/zxing/default.nix
+++ b/pkgs/tools/graphics/zxing/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.asl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://github.com/zxing/zxing";
+    homepage = https://github.com/zxing/zxing;
   };
 }
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix
index 6ab53f9d763..b32d0c78a1b 100644
--- a/pkgs/tools/inputmethods/touchegg/default.nix
+++ b/pkgs/tools/inputmethods/touchegg/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://code.google.com/p/touchegg/";
+    homepage = https://code.google.com/p/touchegg/;
     description = "Macro binding for touch surfaces";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix
index fd8c9bd7c79..62e9f6798b1 100644
--- a/pkgs/tools/inputmethods/zinnia/default.nix
+++ b/pkgs/tools/inputmethods/zinnia/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Online hand recognition system with machine learning";
-    homepage = "http://taku910.github.io/zinnia/";
+    homepage = http://taku910.github.io/zinnia/;
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = [ maintainers.gebner ];
diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix
index acacc4db15f..cdb5abcf453 100644
--- a/pkgs/tools/misc/appdata-tools/default.nix
+++ b/pkgs/tools/misc/appdata-tools/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   configureScript = "./autogen.sh";
 
   meta = with stdenv.lib; {
-    homepage = "http://people.freedesktop.org/~hughsient/appdata";
+    homepage = http://people.freedesktop.org/~hughsient/appdata;
     description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index b885b5ed09d..43f69a82e7f 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -44,7 +44,7 @@ in
     };
 
     meta = {
-      homepage = "http://github.com/phillipberndt/autorandr/";
+      homepage = http://github.com/phillipberndt/autorandr/;
       description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr";
       license = stdenv.lib.licenses.gpl3Plus;
       maintainers = [ stdenv.lib.maintainers.coroa ];
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index 824021094b4..65a5b718e5f 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Bibliography format interconversion";
     longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters.";
-    homepage = "http://sourceforge.net/p/bibutils/home/Bibutils/";
+    homepage = http://sourceforge.net/p/bibutils/home/Bibutils/;
     license = licenses.gpl2;
     maintainers = [ maintainers.garrison ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix
index 55aa438226f..e4b3fab818b 100644
--- a/pkgs/tools/misc/clac/default.nix
+++ b/pkgs/tools/misc/clac/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.unix;
-    homepage = "https://github.com/soveran/clac";
+    homepage = https://github.com/soveran/clac;
   };
 }
diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
index 0c8e9d6bcee..a91cd627bda 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde";
+    homepage = https://projects.kde.org/projects/playground/graphics/colord-kde;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ttuegel ];
   };
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 15701d3c429..13c1202e1d3 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   installFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
-    homepage = "http://limitcpu.sourceforge.net/";
+    homepage = http://limitcpu.sourceforge.net/;
     description = "A tool to throttle the CPU usage of programs";
     platforms = with platforms; linux ++ freebsd;
     license = licenses.gpl2;
diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix
index 4e0790dded6..b6f483fb4ef 100644
--- a/pkgs/tools/misc/dbus-map/default.nix
+++ b/pkgs/tools/misc/dbus-map/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus";
-    homepage = "https://github.com/taviso/dbusmap";
+    homepage = https://github.com/taviso/dbusmap;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index 26c5a6b2139..db966959785 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A program used to control monitor parameters by software";
-    homepage = "http://ddccontrol.sourceforge.net/";
+    homepage = http://ddccontrol.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ stdenv.lib.maintainers.pakhfn ];
diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix
index fbe1cc22376..affcd310bea 100644
--- a/pkgs/tools/misc/docbook2mdoc/default.nix
+++ b/pkgs/tools/misc/docbook2mdoc/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://mdocml.bsd.lv/";
+    homepage = http://mdocml.bsd.lv/;
     description = "converter from DocBook V4.x and v5.x XML into mdoc";
     license = licenses.isc;
     platforms = platforms.all;
diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix
index 369ec81be8d..6f491ac9349 100644
--- a/pkgs/tools/misc/emv/default.nix
+++ b/pkgs/tools/misc/emv/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.i0i0.de/toolchest/emv";
+    homepage = http://www.i0i0.de/toolchest/emv;
     description = "Editor Move: Rename files with your favourite text editor";
     license = stdenv.lib.licenses.publicDomain;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix
index 922bd529fb8..f773ae6caac 100644
--- a/pkgs/tools/misc/eot-utilities/default.nix
+++ b/pkgs/tools/misc/eot-utilities/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = "http://www.w3.org/Tools/eot-utils/";
+    homepage = http://www.w3.org/Tools/eot-utils/;
     description = "Create Embedded Open Type from OpenType or TrueType font";
     license = stdenv.lib.licenses.w3c;
     maintainers = with stdenv.lib.maintainers; [ leenaars ];
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 232eb68c8a6..779256046e5 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
 
   meta = with stdenv.lib; {
-    homepage = "http://darwinsys.com/file";
+    homepage = http://darwinsys.com/file;
     description = "A program that shows the type of files";
     license = licenses.bsd2;
     platforms = platforms.all;
diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix
index 29d09ff09c9..260151f5bd2 100644
--- a/pkgs/tools/misc/fileschanged/default.nix
+++ b/pkgs/tools/misc/fileschanged/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = "http://www.nongnu.org/fileschanged/";
+    homepage = http://www.nongnu.org/fileschanged/;
     description = "A command-line utility that reports when files have been altered";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 9db6fbca6fa..2047b77144a 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   preConfigure = "export PREFIX=$out";
 
   meta = {
-    homepage = "http://www.flashrom.org";
+    homepage = http://www.flashrom.org;
     description = "Utility for reading, writing, erasing and verifying flash ROM chips";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.funfunctor ];
diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix
index ec011aaa007..3af8eda1d1b 100644
--- a/pkgs/tools/misc/geteltorito/default.nix
+++ b/pkgs/tools/misc/geteltorito/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Extract the initial/default boot image from a CD image if existent";
-    homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/";
+    homepage = https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/;
     maintainer = [ maintainers.profpatsch ];
     license = licenses.gpl2;
   };
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 02ec3ba5493..1c4e2c99283 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -31,7 +31,7 @@ in {
       sha256 = "0wvdf2rnjrhdw1vp7bc7008s45rggzq57lh8k6s3q35rppligaqd";
     };
     meta = {
-      homepage = "https://github.com/Graylog2/graylog-plugin-auth-sso";
+      homepage = https://github.com/Graylog2/graylog-plugin-auth-sso;
       description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies";
     };
   };
@@ -44,7 +44,7 @@ in {
       sha256 = "1abl7wwr59k9vvr2fmrlrx4ipsjjl8xryqy19fy5irxhpwp93ixl";
     };
     meta = {
-      homepage = "https://github.com/graylog-labs/graylog-plugin-internal-logs";
+      homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs;
       description = "Graylog plugin to record internal logs of Graylog efficiently instead of sending them over the network";
     };
   };
@@ -57,7 +57,7 @@ in {
       sha256 = "0hd66751hp97ddkn29s1cmjmc2h1nrp431bq7d2wq16iyxxlygri";
     };
     meta = {
-      homepage = "https://github.com/Graylog2/graylog-plugin-ipanonymizer";
+      homepage = https://github.com/Graylog2/graylog-plugin-ipanonymizer;
       description = "A graylog-server plugin that replaces the last octet of IP addresses in messages with xxx";
     };
   };
@@ -70,7 +70,7 @@ in {
       sha256 = "1r12hpjp2ggmhsapgrk829va94aw44qi2kqqkgf1fj9ih4k0c837";
     };
     meta = {
-      homepage = "https://github.com/Graylog2/graylog-plugin-jabber";
+      homepage = https://github.com/Graylog2/graylog-plugin-jabber;
       description = "Jabber Alarmcallback Plugin for Graylog";
     };
   };
@@ -83,7 +83,7 @@ in {
       sha256 = "1hadxyawdz234lal3dq5cy3zppl7ixxviw96iallyav83xyi23i8";
     };
     meta = {
-      homepage = "https://github.com/graylog-labs/graylog-plugin-mongodb-profiler";
+      homepage = https://github.com/graylog-labs/graylog-plugin-mongodb-profiler;
       description = "Graylog input plugin that reads MongoDB profiler data";
     };
   };
@@ -96,7 +96,7 @@ in {
       sha256 = "1pdv12f9dca1rxf62ds51n79cjhkkyj0gjny8kj1cq64vlayc9x9";
     };
     meta = {
-      homepage = "https://github.com/Graylog2/graylog-plugin-netflow";
+      homepage = https://github.com/Graylog2/graylog-plugin-netflow;
       description = "Graylog NetFlow plugin";
     };
   };
@@ -109,7 +109,7 @@ in {
       sha256 = "0hwz83m9gwx0fdapc63v3lr1q6acbphssqwp4qqzz78wg2w79xgi";
     };
     meta = {
-      homepage = "https://github.com/Graylog2/graylog-plugin-redis";
+      homepage = https://github.com/Graylog2/graylog-plugin-redis;
       description = "Redis plugin for Graylog";
     };
   };
@@ -122,7 +122,7 @@ in {
       sha256 = "1mwqy3fhyy4zdwyrzvbr565xwf96xs9d3l70l0khmrm848xf8wz4";
     };
     meta = {
-      homepage = "https://github.com/Graylog2/graylog-plugin-spaceweather";
+      homepage = https://github.com/Graylog2/graylog-plugin-spaceweather;
       description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate.";
     };
   };
@@ -135,7 +135,7 @@ in {
       sha256 = "0clg0vy8aipw122rfqww1lnjriazlnnh77pqiy5vnmv6ycjw0y4i";
     };
     meta = {
-      homepage = "https://github.com/Graylog2/graylog-plugin-threatintel";
+      homepage = https://github.com/Graylog2/graylog-plugin-threatintel;
       description = "Graylog Processing Pipeline functions to enrich log messages with IoC information from threat intelligence databases";
     };
   };
@@ -148,7 +148,7 @@ in {
       sha256 = "1pi34swy9nzq35a823zzvqrjhb6wsg302z31vk2y656sw6ljjxyh";
     };
     meta = {
-      homepage = "https://github.com/Graylog2/graylog-plugin-twitter";
+      homepage = https://github.com/Graylog2/graylog-plugin-twitter;
       description = "Graylog input plugin that reads Twitter messages based on keywords in realtime";
     };
   };
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index 054c7d39405..40d122242ff 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://grub4dos.chenall.net/";
+    homepage = http://grub4dos.chenall.net/;
     description = "GRUB for DOS is the dos extension of GRUB";
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix
index f7be5dbbbe4..fb6944c1cf3 100644
--- a/pkgs/tools/misc/hebcal/default.nix
+++ b/pkgs/tools/misc/hebcal/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://hebcal.github.io";
+    homepage = https://hebcal.github.io;
     description = "A perpetual Jewish Calendar";
     longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays.";
     license = licenses.gpl2;
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 9abfdea5f7b..f5b1b950c13 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Keychain management tool";
-    homepage = "http://www.funtoo.org/Keychain";
+    homepage = http://www.funtoo.org/Keychain;
     license = stdenv.lib.licenses.gpl2;
     # other platforms are untested (AFAIK)
     platforms =
diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix
index 596a72ee5ac..57d29437a21 100644
--- a/pkgs/tools/misc/latex2html/default.nix
+++ b/pkgs/tools/misc/latex2html/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       commands.
     '';
 
-    homepage = "https://www.ctan.org/pkg/latex2html";
+    homepage = https://www.ctan.org/pkg/latex2html;
 
     license = licenses.gpl2;
     platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index 39987a3b605..e81ad349874 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) finger_bsd;
 
   meta = {
-    homepage = "http://www.spinnaker.de/lbdb/";
+    homepage = http://www.spinnaker.de/lbdb/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
     description = "The Little Brother's Database";
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index a8bab014b9e..503f2494644 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -22,7 +22,7 @@ buildGoPackage rec {
       the missing features are deliberately omitted since it is better if they
       are handled by external tools.
     '';
-    homepage = "https://godoc.org/github.com/gokcehan/lf";
+    homepage = https://godoc.org/github.com/gokcehan/lf;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];
diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix
index 206fe987e62..136951cb7bc 100644
--- a/pkgs/tools/misc/lnav/default.nix
+++ b/pkgs/tools/misc/lnav/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/tstack/lnav";
+    homepage = https://github.com/tstack/lnav;
     description = "The Logfile Navigator";
     longDescription = ''
       The log file navigator, lnav, is an enhanced log file viewer that takes
diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix
index 6ebf86b06fa..8540a3f785a 100644
--- a/pkgs/tools/misc/loadlibrary/default.nix
+++ b/pkgs/tools/misc/loadlibrary/default.nix
@@ -22,7 +22,7 @@ stdenv_32bit.mkDerivation rec {
   '';
 
   meta = with stdenv_32bit.lib; {
-    homepage = "https://github.com/taviso/loadlibrary";
+    homepage = https://github.com/taviso/loadlibrary;
     description = "Porting Windows Dynamic Link Libraries to Linux";
     platforms = platforms.linux;
     maintainers = [ maintainers.eleanor ];
diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix
index 8066cdd9bc5..cf28fa05132 100644
--- a/pkgs/tools/misc/ltunify/default.nix
+++ b/pkgs/tools/misc/ltunify/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tool for working with Logitech Unifying receivers and devices";
-    homepage = "https://lekensteyn.nl/logitech-unifying.html";
+    homepage = https://lekensteyn.nl/logitech-unifying.html;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix
index dc66976720d..e23e12bcb30 100644
--- a/pkgs/tools/misc/makebootfat/default.nix
+++ b/pkgs/tools/misc/makebootfat/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Create bootable USB disks using the FAT filesystem and syslinux";
-    homepage = "http://advancemame.sourceforge.net/boot-readme.html";
+    homepage = http://advancemame.sourceforge.net/boot-readme.html;
     license = licenses.gpl2;
     maintainers = [ maintainers.ehmry ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 8685b89d6d0..f5a99ba1c71 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://man-db.nongnu.org";
+    homepage = http://man-db.nongnu.org;
     description = "An implementation of the standard Unix documentation system accessed using the man command";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix
index 297d6557f5e..8a62ccffa49 100644
--- a/pkgs/tools/misc/mandoc/default.nix
+++ b/pkgs/tools/misc/mandoc/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://mdocml.bsd.lv/";
+    homepage = http://mdocml.bsd.lv/;
     description = "suite of tools compiling mdoc and man";
     license = licenses.bsd3;
     platforms = platforms.all;
diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix
index 417583ecc9e..602c9c26c78 100644
--- a/pkgs/tools/misc/mmv/default.nix
+++ b/pkgs/tools/misc/mmv/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://linux.maruhn.com/sec/mmv.html";
+    homepage = http://linux.maruhn.com/sec/mmv.html;
     description = "Utility for wildcard renaming, copying, etc";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index 77fcb186ef1..16f50436990 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://pipelight.net/";
+    homepage = http://pipelight.net/;
     license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ];
     description = "A wrapper for using Windows plugins in Linux browsers";
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix
index 0c96908401b..0bd61c0fcdf 100644
--- a/pkgs/tools/misc/pod2mdoc/default.nix
+++ b/pkgs/tools/misc/pod2mdoc/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://mdocml.bsd.lv/";
+    homepage = http://mdocml.bsd.lv/;
     description = "converter from POD into mdoc";
     license = licenses.isc;
     platforms = platforms.all;
diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix
index cca18007c58..2d1db4eb64c 100644
--- a/pkgs/tools/misc/sam-ba/default.nix
+++ b/pkgs/tools/misc/sam-ba/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       Atmel SAM-BA software provides an open set of tools for programming the
       Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers.
     '';
-    homepage = "http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools";
+    homepage = http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools;
     # License in <source>/doc/readme.txt
     license = "BSD-like (partly binary-only)";  # according to Buildroot
     platforms = [ "x86_64-linux" ];  # patchelf fails on i686-linux
diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix
index 38b31311137..132012de123 100644
--- a/pkgs/tools/misc/scanmem/default.nix
+++ b/pkgs/tools/misc/scanmem/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
   meta = with stdenv.lib; {
-    homepage = "https://github.com/scanmem/scanmem";
+    homepage = https://github.com/scanmem/scanmem;
     description = "Memory scanner for finding and poking addresses in executing processes";
     maintainers = [ maintainers.chattered  ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
index 31cedd282a4..f15d3f7162b 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig docbook_xsl ];
   
   meta = with stdenv.lib; {
-    homepage = "https://github.com/Grumbel/sdl-jstest";
+    homepage = https://github.com/Grumbel/sdl-jstest;
     description = "Simple SDL joystick test application for the console";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix
index 2404ab9da89..47216838476 100644
--- a/pkgs/tools/misc/texi2mdoc/default.nix
+++ b/pkgs/tools/misc/texi2mdoc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://mdocml.bsd.lv/";
+    homepage = http://mdocml.bsd.lv/;
     description = "converter from Texinfo into mdoc";
     license = licenses.isc;
     platforms = platforms.all;
diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix
index 00fde7acafb..b399077bc5b 100644
--- a/pkgs/tools/misc/thefuck/default.nix
+++ b/pkgs/tools/misc/thefuck/default.nix
@@ -19,7 +19,7 @@ pkgs.pythonPackages.buildPythonPackage rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/nvbn/thefuck";
+    homepage = https://github.com/nvbn/thefuck;
     description = "Magnificent app which corrects your previous console command.";
     license = licenses.mit;
     maintainers = with maintainers; [ ma27 ];
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index ff69fb01cea..3614ec3bc68 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Advanced Power Management for Linux";
-    homepage = "http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html";
+    homepage = http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
     license = licenses.gpl2Plus;
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 03950d601d0..9faa36c13f0 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Manage tmux workspaces from JSON and YAML";
-    homepage = "http://tmuxp.readthedocs.io";
+    homepage = http://tmuxp.readthedocs.io;
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ jgeerds ];
diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix
index e945e560f1b..af56b09da9c 100644
--- a/pkgs/tools/misc/togglesg-download/default.nix
+++ b/pkgs/tools/misc/togglesg-download/default.nix
@@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/0x776b7364/toggle.sg-download";
+    homepage = https://github.com/0x776b7364/toggle.sg-download;
     description = "Command-line tool to download videos from toggle.sg written in Python";
     longDescription = ''
       toggle.sg requires SilverLight in order to view videos. This tool will
diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix
index 6ed479ac9c8..f9fee08d0dd 100644
--- a/pkgs/tools/misc/toilet/default.nix
+++ b/pkgs/tools/misc/toilet/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Display large colourful characters in text mode";
-    homepage = "http://caca.zoy.org/wiki/toilet";
+    homepage = http://caca.zoy.org/wiki/toilet;
     license = stdenv.lib.licenses.wtfpl;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix
index 63c6d4aea5a..7142d346336 100644
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/pkgs/tools/misc/ttf2pt1/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = { 
     description = "True Type to Postscript Type 3 converter, fpdf";
-    homepage = "http://ttf2pt1.sourceforge.net/index.html";
+    homepage = http://ttf2pt1.sourceforge.net/index.html;
     license = "ttf2pt1";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
index 45149cafc9d..99a648ef5bc 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
-    homepage = "http://ttylog.sourceforg.net";
+    homepage = http://ttylog.sourceforg.net;
     description = "Simple serial port logger";
     longDescription = ''
       A serial port logger which can be used to print everything to stdout
diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix
index 238d2d73d3b..c7cd71ffb6d 100644
--- a/pkgs/tools/misc/ttyrec/default.nix
+++ b/pkgs/tools/misc/ttyrec/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://0xcc.net/ttyrec/";
+    homepage = http://0xcc.net/ttyrec/;
     description = "Terminal interaction recorder and player";
     license = licenses.bsd3;
     platforms = platforms.all;
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 59153e68a56..8d9d0073b17 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
-    homepage = "http://urjtag.org/";
+    homepage = http://urjtag.org/;
     license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
     maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ];
diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix
index 9f2e4ce8eec..228747880d1 100644
--- a/pkgs/tools/misc/venus/default.nix
+++ b/pkgs/tools/misc/venus/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       feeds published by web sites and aggregates their content together into a
       single combined feed, latest news first.
     '';
-    homepage = "http://intertwingly.net/code/venus/docs/index.html";
+    homepage = http://intertwingly.net/code/venus/docs/index.html;
     license = stdenv.lib.licenses.psfl;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.garbas ];
diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix
index 231ee9ac157..a655aa9502e 100644
--- a/pkgs/tools/misc/vimer/default.nix
+++ b/pkgs/tools/misc/vimer/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/susam/vimer";
+    homepage = https://github.com/susam/vimer;
     description = ''
       A convenience wrapper for gvim/mvim --remote(-tab)-silent to open files
       in an existing instance of GVim or MacVim.
diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix
index ec2f9c63547..9fea1b85f6a 100644
--- a/pkgs/tools/misc/vmtouch/default.nix
+++ b/pkgs/tools/misc/vmtouch/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Portable file system cache diagnostics and control";
     longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems.";
-    homepage = "http://hoytech.com/vmtouch/";
+    homepage = http://hoytech.com/vmtouch/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.garrison ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix
index 5876cfb6b74..8ebc5047358 100644
--- a/pkgs/tools/misc/x11idle/default.nix
+++ b/pkgs/tools/misc/x11idle/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     longDescription = ''
       Idle time passes when the user does not act, i.e. when the user doesn't move the mouse or use the keyboard.
     '';
-    homepage = "http://orgmode.org/";
+    homepage = http://orgmode.org/;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.swflint ];
diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix
index a07c1507218..72b42cdc3b9 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/pkgs/tools/misc/xdo/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
    meta = with stdenv.lib; {
      description = "Small X utility to perform elementary actions on windows";
-     homepage = "https://github.com/baskerville/xdo";
+     homepage = https://github.com/baskerville/xdo;
      maintainers = with maintainers; [ meisternu ];
      license = licenses.bsd2;
      platforms = platforms.linux;
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index c9ed6411c68..6904f43d846 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Torture test suite for filesystems";
-    homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/";
+    homepage = https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/;
     license = licenses.gpl2;
     maintainers = [ maintainers.dezgeg ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix
index e4d5bf7abdd..b749274b523 100644
--- a/pkgs/tools/misc/xiccd/default.nix
+++ b/pkgs/tools/misc/xiccd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "X color profile daemon";
-    homepage = "https://github.com/agalakhov/xiccd";
+    homepage = https://github.com/agalakhov/xiccd;
     license = licenses.gpl3;
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index 0b78b9a0647..350cb89846a 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/pkgs/tools/misc/xsel/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Command-line program for getting and setting the contents of the X selection";
-    homepage = "http://www.kfish.org/software/xsel";
+    homepage = http://www.kfish.org/software/xsel;
     license = licenses.mit;
     maintainers = [ maintainers.cstrahan ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix
index 52d23d141fc..8dfd73ef20c 100644
--- a/pkgs/tools/misc/yad/default.nix
+++ b/pkgs/tools/misc/yad/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://yad-dialog.sourceforge.net/";
+    homepage = http://yad-dialog.sourceforge.net/;
     description = "GUI dialog tool for shell scripts";
     longDescription = ''
       Yad (yet another dialog) is a GUI dialog tool for shell scripts. It is a
diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix
index 6063dbf4f9a..3d0338febcd 100644
--- a/pkgs/tools/misc/yank/default.nix
+++ b/pkgs/tools/misc/yank/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "YANKCMD=${xsel}/bin/xsel" ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/mptre/yank";
+    homepage = https://github.com/mptre/yank;
     description = "Yank terminal output to clipboard";
     longDescription = ''
       Read input from stdin and display a selection interface that allows a
diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix
index 0789b37c65a..4b03c3cf278 100644
--- a/pkgs/tools/networking/ahcpd/default.nix
+++ b/pkgs/tools/networking/ahcpd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/";
+    homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/;
     description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index d3b99a9381e..69d36d36320 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/";
+    homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/babel/;
     description = "Loop-avoiding distance-vector routing protocol";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu fpletz ];
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 976285eeee7..9d2f83098b8 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
       initial mapping and analysis of an application's attack surface, through to finding and
       exploiting security vulnerabilities.
     '';
-    homepage = "https://portswigger.net/burp/";
+    homepage = https://portswigger.net/burp/;
     downloadPage = "https://portswigger.net/burp/freedownload";
     license = [ stdenv.lib.licenses.unfree ];
     preferLocalBuild = true;
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
index 353425108a2..cfcd051f281 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A small and simple console-based live network and disk io bandwidth monitor";
-    homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng";
+    homepage = http://www.gropp.org/?id=projects&sub=bwm-ng;
     license = licenses.gpl2;
     platforms = platforms.unix;
 
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index 8b99182242b..c7749e578d2 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "QT GUI for Connman with system tray icon";
-    homepage = "https://github.com/andrew-bibb/cmst";
+    homepage = https://github.com/andrew-bibb/cmst;
     maintainers = [ stdenv.lib.maintainers.matejc ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.mit;
diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix
index 3c2d86f3313..b5866c2ee13 100644
--- a/pkgs/tools/networking/connmanui/default.nix
+++ b/pkgs/tools/networking/connmanui/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A full-featured GTK based trayicon UI for ConnMan";
-    homepage = "https://github.com/tbursztyka/connman-ui";
+    homepage = https://github.com/tbursztyka/connman-ui;
     maintainers = [ stdenv.lib.maintainers.matejc ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix
index abb64d4d896..daad7993cfe 100644
--- a/pkgs/tools/networking/dirb/default.nix
+++ b/pkgs/tools/networking/dirb/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "A web content scanner";
-    homepage = "http://dirb.sourceforge.net/";
+    homepage = http://dirb.sourceforge.net/;
     maintainers = with stdenv.lib.maintainers; [ bennofs ];
     license = with stdenv.lib.licenses; [ gpl2 ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 2b50e320c38..709fb9540d1 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ];
 
   meta = with stdenv.lib; {
-    homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html";
+    homepage = http://matt.ucc.asn.au/dropbear/dropbear.html;
     description = "A small footprint implementation of the SSH 2 protocol";
     license = licenses.mit;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index 4384405dddc..0061620b58d 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     ];
     platforms = with stdenv.lib.platforms;
       linux;
-    homepage = "http://fdm.sourceforge.net/";
+    homepage = http://fdm.sourceforge.net/;
     inherit (sourceInfo) version;
     updateWalker = true;
   };
diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index e5764fa421d..8cdda4e35e3 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-ipv6" "--enable-ipv4" ];
 
   meta = {
-    homepage = "http://fping.org/";
+    homepage = http://fping.org/;
     description = "Send ICMP echo probes to network hosts";
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
     platforms = with stdenv.lib.platforms; all;
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 691b93844a0..b8bd9c0910a 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -23,7 +23,7 @@ python2Packages.buildPythonApplication rec {
     maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ];
     platforms = stdenv.lib.platforms.linux;
 
-    homepage = "http://pyropus.ca/software/getmail/";
+    homepage = http://pyropus.ca/software/getmail/;
     inherit version;
     updateWalker = true;
   };
diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index 72efc703b10..ba22d1d679c 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Backup and restore your gmail account";
-    homepage = "http://gmvault.org";
+    homepage = http://gmvault.org;
     license = pkgs.lib.licenses.agpl3Plus;
   };
 }
diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix
index 4b14c9db963..3fdebbf4966 100644
--- a/pkgs/tools/networking/hping/default.nix
+++ b/pkgs/tools/networking/hping/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A command-line oriented TCP/IP packet assembler/analyzer";
-    homepage = "http://www.hping.org/";
+    homepage = http://www.hping.org/;
     license = licenses.gpl2;
     platforms = platforms.all;
     broken = stdenv.isDarwin;
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index 6f2ca8fc5ba..2882a88b7d0 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting";
-    homepage = "https://github.com/eliangcs/http-prompt";
+    homepage = https://github.com/eliangcs/http-prompt;
     license = licenses.mit;
     maintainers = with maintainers; [ matthiasbeyer ];
     platforms = platforms.linux; # can only test on linux
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index fd78c52bc4f..8d2ac5ce9d7 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://i2pd.website";
+    homepage = https://i2pd.website;
     description = "Minimal I2P router written in C++";
     license = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo ];
diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix
index 10b1e93bde2..26c8d89b5d4 100644
--- a/pkgs/tools/networking/ipcalc/default.nix
+++ b/pkgs/tools/networking/ipcalc/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   '';
   meta = {
     description = "Simple IP network calculator";
-    homepage = "http://jodies.de/ipcalc";
+    homepage = http://jodies.de/ipcalc;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix
index c0fd6c973cd..fba6ae92b03 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/pkgs/tools/networking/iperf/2.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://sourceforge.net/projects/iperf/";
+    homepage = http://sourceforge.net/projects/iperf/;
     description = "Tool to measure IP bandwidth using UDP or TCP";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index 213051bdf8d..de7f38314fc 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = false;
 
   meta = {
-    homepage = "https://libreswan.org";
+    homepage = https://libreswan.org;
     description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange";
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd;
     maintainers = [ stdenv.lib.maintainers.afranchuk ];
diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix
index 78bdea475c4..686242aa067 100644
--- a/pkgs/tools/networking/linkchecker/default.nix
+++ b/pkgs/tools/networking/linkchecker/default.nix
@@ -35,7 +35,7 @@ python2Packages.buildPythonApplication rec {
 
   meta = {
     description = "Check websites for broken links";
-    homepage = "https://wummel.github.io/linkchecker/";
+    homepage = https://wummel.github.io/linkchecker/;
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ peterhoeg ];
   };
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 6b816fc8740..5a97f2219ce 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments";
-    homepage = "https://vincentbernat.github.io/lldpd/";
+    homepage = https://vincentbernat.github.io/lldpd/;
     license = licenses.isc;
     maintainers = with maintainers; [ fpletz ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix
index 74dd9131680..6808c5c0a42 100644
--- a/pkgs/tools/networking/logmein-hamachi/default.nix
+++ b/pkgs/tools/networking/logmein-hamachi/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams";
-    homepage = "https://secure.logmein.com/products/hamachi/";
+    homepage = https://secure.logmein.com/products/hamachi/;
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix
index 6f555278219..642fd739335 100644
--- a/pkgs/tools/networking/mailsend/default.nix
+++ b/pkgs/tools/networking/mailsend/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.bsd3 ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = "https://github.com/muquit/mailsend";
+    homepage = https://github.com/muquit/mailsend;
     downloadPage = "https://github.com/muquit/mailsend/releases";
   };
 }
diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index fc496b416ff..7d36b6b4ac7 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -34,7 +34,7 @@ python3Packages.buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Man-in-the-middle proxy";
-    homepage = "http://mitmproxy.org/";
+    homepage = http://mitmproxy.org/;
     license = licenses.mit;
     maintainers = with maintainers; [ fpletz ];
   };
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 595337906d0..d0fd7af1290 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A collection of utilties for indexing and searching Maildirs";
     license = licenses.gpl3Plus;
-    homepage = "http://www.djcbsoftware.nl/code/mu/";
+    homepage = http://www.djcbsoftware.nl/code/mu/;
     platforms = platforms.mesaPlatforms;
     maintainers = with maintainers; [ antono the-kenny peterhoeg ];
   };
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 4dea88190d4..bbd003a6256 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lrt -lpthread";
 
   meta = {
-    homepage = "http://nbd.sourceforge.net";
+    homepage = http://nbd.sourceforge.net;
     description = "Map arbitrary files as block devices over the network";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.peti ];
diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix
index ef539cbb51f..2ac9c5cf6e9 100644
--- a/pkgs/tools/networking/netcat-openbsd/default.nix
+++ b/pkgs/tools/networking/netcat-openbsd/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://packages.debian.org/netcat-openbsd";
+    homepage = http://packages.debian.org/netcat-openbsd;
     description = "TCP/IP swiss army knife, OpenBSD variant";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix
index 858683e3374..d84f87ed1ba 100644
--- a/pkgs/tools/networking/netkit/tftp/default.nix
+++ b/pkgs/tools/networking/netkit/tftp/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Netkit TFTP client and server";
-    homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/";
+    homepage = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/;
     license = stdenv.lib.licenses.bsdOriginal;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix
index 2bc521e8fed..e19b8ba7f64 100644
--- a/pkgs/tools/networking/netrw/default.nix
+++ b/pkgs/tools/networking/netrw/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Simple tool for transporting data over the network";
     license = stdenv.lib.licenses.gpl2;
-    homepage = "http://mamuti.net/netrw/index.en.html";
+    homepage = http://mamuti.net/netrw/index.en.html;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix
index 5d6be939887..91b4a5e8957 100644
--- a/pkgs/tools/networking/network-manager/l2tp.nix
+++ b/pkgs/tools/networking/network-manager/l2tp.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "L2TP plugin for NetworkManager";
     inherit (networkmanager.meta) platforms;
-    homepage = "https://github.com/seriyps/NetworkManager-l2tp";
+    homepage = https://github.com/seriyps/NetworkManager-l2tp;
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar obadz ];
   };
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index ae0318faaa7..8cf144140fa 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -31,7 +31,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
-    homepage = "http://offlineimap.org";
+    homepage = http://offlineimap.org;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.garbas ];
   };
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
index 3ead2ef0f21..2b2b441f2f9 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.openntpd.org/";
+    homepage = http://www.openntpd.org/;
     license = licenses.bsd3;
     description = "OpenBSD NTP daemon (Debian port)";
     platforms = platforms.all;
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index c0440e78a38..f358f47bcd6 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = "http://www.openssh.com/";
+    homepage = http://www.openssh.com/;
     description = "An implementation of the SSH protocol";
     license = stdenv.lib.licenses.bsd2;
     platforms = platforms.unix;
diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index 2f9c0aae3b8..e96aa25fede 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options";
-    homepage = "https://github.com/masterkorp/openvpn-update-resolv-conf/";
+    homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/;
     maintainers = with maintainers; [ abbradar ];
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix
index 552cda93bcc..28b1c961a3f 100644
--- a/pkgs/tools/networking/pcapc/default.nix
+++ b/pkgs/tools/networking/pcapc/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/pfactum/pcapc";
+    homepage = https://github.com/pfactum/pcapc;
     description = "Compile libpcap filter expressions into BPF opcodes";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix
index 5e815f6bfd6..ee47a6cb2ea 100644
--- a/pkgs/tools/networking/pcapfix/default.nix
+++ b/pkgs/tools/networking/pcapfix/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   postPatch = ''sed -i "s|/usr|$out|" Makefile'';
 
   meta = with stdenv.lib; {
-    homepage = "https://f00l.de/pcapfix/";
+    homepage = https://f00l.de/pcapfix/;
     description = "Repair your broken pcap and pcapng files";
     license = licenses.gpl3;
     maintainers = [ maintainers.ehmry ];
diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index b2f2e20493f..0c8ca56024b 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://code.google.com/p/pdsh/";
+    homepage = http://code.google.com/p/pdsh/;
     description = "High-performance, parallel remote shell utility";
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index 9a6784cc7f2..22c6331cb44 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Very simple, yet secure VPN software";
-    homepage = "http://wiki.ucis.nl/QuickTun";
+    homepage = http://wiki.ucis.nl/QuickTun;
     maintainers = [ maintainers.fpletz ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix
index 620e8d3dbba..a257cb713db 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/pkgs/tools/networking/redir/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A TCP port redirector for UNIX";
-    homepage = "https://github.com/troglobit/redir";
+    homepage = https://github.com/troglobit/redir;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ globin ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix
index 4ff383b1cf1..5b046c6eeab 100644
--- a/pkgs/tools/networking/sipcalc/default.nix
+++ b/pkgs/tools/networking/sipcalc/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   };
   meta = {
     description = "Advanced console ip subnet calculator";
-    homepage = "http://www.routemeister.net/projects/sipcalc/";
+    homepage = http://www.routemeister.net/projects/sipcalc/;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix
index 334a6feb8d5..2172efc63e3 100644
--- a/pkgs/tools/networking/smokeping/default.nix
+++ b/pkgs/tools/networking/smokeping/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
   meta = {
     description = "Network latency collector";
-    homepage = "http://oss.oetiker.ch/smokeping";
+    homepage = http://oss.oetiker.ch/smokeping;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix
index 401e252a294..8624efeb3f7 100644
--- a/pkgs/tools/networking/surfraw/default.nix
+++ b/pkgs/tools/networking/surfraw/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power";
-    homepage = "http://surfraw.alioth.debian.org";
+    homepage = http://surfraw.alioth.debian.org;
     maintainers = [];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
index 5d5b17c2b26..1b121335ac7 100644
--- a/pkgs/tools/networking/swaks/default.nix
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.jetmore.org/john/code/swaks/";
+    homepage = http://www.jetmore.org/john/code/swaks/;
     description = ''
       A featureful, flexible, scriptable, transaction-oriented SMTP test tool
     '';
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
index 3b5be589f33..56025dd88c6 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/pkgs/tools/networking/ua/default.nix
@@ -22,7 +22,7 @@ buildGoPackage rec {
   buildInputs = [ glib libxml2 ];
 
   meta = {
-    homepage = "https://github.com/sloonz/ua";
+    homepage = https://github.com/sloonz/ua;
     license = stdenv.lib.licenses.isc;
     shortDescription = "Universal Aggregator";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index b183b653d26..496c01c02fc 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/";
+    homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/;
     description = "Virtual private network (VPN) client for Cisco's VPN concentrators";
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix
index 375a9fe9980..0c97f20ee65 100644
--- a/pkgs/tools/networking/wbox/default.nix
+++ b/pkgs/tools/networking/wbox/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A simple HTTP benchmarking tool";
-    homepage = "http://www.hping.org/wbox/";
+    homepage = http://www.hping.org/wbox/;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix
index 88e7f1aec5a..1075e461618 100644
--- a/pkgs/tools/networking/x11-ssh-askpass/default.nix
+++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildInputs = [xlibsWrapper imake];
 
   meta = {
-    homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/";
+    homepage = http://www.jmknoble.net/software/x11-ssh-askpass/;
     description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH";
 
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix
index c9804caad4a..c032ee7dd6b 100644
--- a/pkgs/tools/networking/xl2tpd/default.nix
+++ b/pkgs/tools/networking/xl2tpd/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.xelerance.com/software/xl2tpd/";
+    homepage = http://www.xelerance.com/software/xl2tpd/;
     description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix
index 50418a1badc..6ee463cac13 100644
--- a/pkgs/tools/networking/zap/default.nix
+++ b/pkgs/tools/networking/zap/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://www.owasp.org/index.php/ZAP";
+    homepage = https://www.owasp.org/index.php/ZAP;
     description = "Java application for web penetration testing";
     maintainers = with maintainers; [ mog ]; 
     platforms = platforms.linux;
diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
index de1c2405076..8082565361b 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "";
-    homepage = "https://launchpad.net/ubuntu/+source/apt";
+    homepage = https://launchpad.net/ubuntu/+source/apt;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix
index 5779faec6b9..40cfcaf28fe 100644
--- a/pkgs/tools/security/aide/default.nix
+++ b/pkgs/tools/security/aide/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     ];
 
   meta = with stdenv.lib; {
-    homepage = "http://aide.sourceforge.net/";
+    homepage = http://aide.sourceforge.net/;
     description = "A file and directory integrity checker";
     license = licenses.free;
     maintainers = [ maintainers.tstrobel ];
diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix
index 2c6b3150089..6e9ad260aa9 100644
--- a/pkgs/tools/security/chaps/default.nix
+++ b/pkgs/tools/security/chaps/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "PKCS #11 implementation based on trusted platform module (TPM)";
-    homepage = "https://www.chromium.org/developers/design-documents/chaps-technical-design";
+    homepage = https://www.chromium.org/developers/design-documents/chaps-technical-design;
     maintainers = [ maintainers.tstrobel ];
     platforms = [ "x86_64-linux" ];
     license = licenses.bsd3;
diff --git a/pkgs/tools/security/fprint_demo/default.nix b/pkgs/tools/security/fprint_demo/default.nix
index 26e0d0e45e1..2179b2b7b03 100644
--- a/pkgs/tools/security/fprint_demo/default.nix
+++ b/pkgs/tools/security/fprint_demo/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.freedesktop.org/wiki/Software/fprint/fprint_demo/";
+    homepage = http://www.freedesktop.org/wiki/Software/fprint/fprint_demo/;
     description = "A simple GTK+ application to demonstrate and test libfprint's capabilities";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index e5bf5a08afc..727fc1ccb8e 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.freedesktop.org/wiki/Software/fprint/fprintd/";
+    homepage = http://www.freedesktop.org/wiki/Software/fprint/fprintd/;
     description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index 823bdbbffb5..04e6d12fe42 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
       fwknop stands for the "FireWall KNock OPerator", and implements an
       authorization scheme called Single Packet Authorization (SPA).
     '';
-    homepage = "https://www.cipherdyne.org/fwknop/";
+    homepage = https://www.cipherdyne.org/fwknop/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];
diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix
index 9c4f98a740b..6acaacd1467 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/pkgs/tools/security/gnupg/1.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://gnupg.org";
+    homepage = https://gnupg.org;
     description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
     license = licenses.gpl3Plus;
     longDescription = ''
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 6b011a00eb7..fdef447193d 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = "https://gnupg.org";
+    homepage = https://gnupg.org;
     description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
     license = licenses.gpl3Plus;
     longDescription = ''
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 9590ee746b8..2d43d3e977a 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://gnupg.org";
+    homepage = https://gnupg.org;
     description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
     license = licenses.gpl3Plus;
     longDescription = ''
diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index bc5b7c0e3f4..8d2ac2af010 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       Use this program to access and manage your KeePass 1.x or 2.x databases from a Unix-like command line.
     '';
     license = licenses.artistic1;
-    homepage = "http://kpcli.sourceforge.net";
+    homepage = http://kpcli.sourceforge.net;
     platforms = platforms.all;
     maintainers = [ maintainers.j-keck ];
   };
diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix
index 97a8c0af2c8..def98c9af4d 100644
--- a/pkgs/tools/security/paperkey/default.nix
+++ b/pkgs/tools/security/paperkey/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       retention qualities - far longer than the magnetic or optical means that
       are generally used to back up computer data.
     '';
-    homepage = "http://www.jabberwocky.com/software/paperkey/";
+    homepage = http://www.jabberwocky.com/software/paperkey/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ skeidel ];
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix
index 18c3af7924a..82b7110189c 100644
--- a/pkgs/tools/security/pcsc-cyberjack/default.nix
+++ b/pkgs/tools/security/pcsc-cyberjack/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "REINER SCT cyberJack USB chipcard reader user space driver";
-    homepage = "http://www.reiner-sct.com/";
+    homepage = http://www.reiner-sct.com/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ aszlig ];
diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index dfe4579aa58..93b53c3ad4a 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/pkgs/tools/security/pgpdump/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       pgpdump is a PGP packet visualizer which displays the packet format of
       OpenPGP (RFC 4880) and PGP version 2 (RFC 1991).
     '';
-    homepage = "http://www.mew.org/~kazu/proj/pgpdump/en/";
+    homepage = http://www.mew.org/~kazu/proj/pgpdump/en/;
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];
diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix
index 814bc0d8530..294e296ba6e 100644
--- a/pkgs/tools/security/phrasendrescher/default.nix
+++ b/pkgs/tools/security/phrasendrescher/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Cracking tool that finds passphrases of SSH keys";
-    homepage = "http://leidecker.info/projects/phrasendrescher.shtml";
+    homepage = http://leidecker.info/projects/phrasendrescher.shtml;
     license = licenses.gpl2Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ bjornfor ];
diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix
index 4cba1c7e617..cd0060cbcb9 100644
--- a/pkgs/tools/security/pinentry-mac/default.nix
+++ b/pkgs/tools/security/pinentry-mac/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Pinentry for GPG on Mac";
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = "https://github.com/GPGTools/pinentry-mac";
+    homepage = https://github.com/GPGTools/pinentry-mac;
     platforms = stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 25edec9efd4..67b0b8aa2e2 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = "http://gnupg.org/aegypten2/";
+    homepage = http://gnupg.org/aegypten2/;
     description = "GnuPG's interface to passphrase input";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/security/pinentry/qt5.nix b/pkgs/tools/security/pinentry/qt5.nix
index 375187a5146..6230529a733 100644
--- a/pkgs/tools/security/pinentry/qt5.nix
+++ b/pkgs/tools/security/pinentry/qt5.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = "http://gnupg.org/aegypten2/";
+    homepage = http://gnupg.org/aegypten2/;
     description = "GnuPG's interface to passphrase input";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index 9894b203800..e4141d1a61b 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; {
     description = "Qt based UI application for verifying and signing digital signatures";
-    homepage = "http://www.id.ee/";
+    homepage = http://www.id.ee/;
     license = licenses.lgpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.jagajaga ];
diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index e2b831f583c..04f6cbf6d11 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; {
     description = "UI application for managing smart card PIN/PUK codes and certificates";
-    homepage = "http://www.id.ee/";
+    homepage = http://www.id.ee/;
     license = licenses.lgpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.jagajaga ];
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index 7be136944c6..de70b27163a 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -194,7 +194,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://pgp-tools.alioth.debian.org/";
+    homepage = https://pgp-tools.alioth.debian.org/;
     description = "A collection of several projects relating to OpenPGP";
     longDescription = ''
       This is a collection of several projects relating to OpenPGP.
diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix
index a109e9ca6a6..fd81933fb58 100644
--- a/pkgs/tools/security/srm/default.nix
+++ b/pkgs/tools/security/srm/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       provide drop in security for users who wish to prevent recovery
       of deleted information, even if the machine is compromised.
     '';
-    homepage = "http://srm.sourceforge.net";
+    homepage = http://srm.sourceforge.net;
     license = licenses.mit;
     maintainers = with maintainers; [ edwtjo ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
index d44d49f12a9..ef33c289d13 100644
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -22,7 +22,6 @@ rec {
     ]);
 
     meta = with stdenv.lib; {
-      homepage = "";
       license = licenses.zpt21;
       description = "Zope Object Database: object database and persistence";
     };
@@ -41,7 +40,6 @@ rec {
       mock
     ];
     meta = with stdenv.lib; {
-      homepage = "";
       license = licenses.zpt21;
       description = "Transaction management for Python";
     };
diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix
index 706b3700a41..501311e9672 100644
--- a/pkgs/tools/system/actkbd/default.nix
+++ b/pkgs/tools/system/actkbd/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       release events.
     '';
     license = licenses.gpl2;
-    homepage = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/";
+    homepage = http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix
index 222cbde19e3..a4c29cd6a29 100644
--- a/pkgs/tools/system/amtterm/default.nix
+++ b/pkgs/tools/system/amtterm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib;
     { description = "Intel AMT® SoL client + tools";
-      homepage = "https://www.kraxel.org/cgit/amtterm/";
+      homepage = https://www.kraxel.org/cgit/amtterm/;
       license = licenses.gpl2;
       maintainers = [ maintainers.ehmry ];
       platforms = platforms.linux;
diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix
index ebad6933936..e1c163f4170 100644
--- a/pkgs/tools/system/chase/default.nix
+++ b/pkgs/tools/system/chase/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
     A commandline program that chases symbolic filesystems links to the original file
     '';
-    homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org";
+    homepage = https://qa.debian.org/developer.php?login=rotty%40debian.org;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.polyrod ];
     platforms = platforms.all;
diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix
index a0bda0c4335..5ff4e7220ab 100644
--- a/pkgs/tools/system/ctop/default.nix
+++ b/pkgs/tools/system/ctop/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Concise commandline monitoring for containers";
-    homepage = "http://ctop.sh/";
+    homepage = http://ctop.sh/;
     license = licenses.mit;
     maintainers = with maintainers; [ apeyroux ];
   };
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
index 1876bac496d..7b2ca93cc0d 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/pkgs/tools/system/dfc/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake gettext ];
 
   meta = {
-    homepage = "http://projects.gw-computing.net/projects/dfc";
+    homepage = http://projects.gw-computing.net/projects/dfc;
     description = "Displays file system space usage using graphs and colors";
     license="free";
     maintainers = with stdenv.lib.maintainers; [qknight];
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix
index a48c2678aa6..25f2673c0ac 100644
--- a/pkgs/tools/system/dog/default.nix
+++ b/pkgs/tools/system/dog/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://lwn.net/Articles/421072/";
+    homepage = http://lwn.net/Articles/421072/;
     description = "cat replacement";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ qknight ];
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 7f05a7271bb..e0c3fdfeec5 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://git.kernel.dk/?p=fio.git;a=summary";
+    homepage = "http://git.kernel.dk/?p=fio.git;a=summary;";
     description = "Flexible IO Tester - an IO benchmark tool";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index f464b7e9320..b85ad32ca37 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   buildInputs = [ unzip ];
 
   meta = {
-    homepage = "http://pkgs.fedoraproject.org/cgit/hardlink.git/";
+    homepage = http://pkgs.fedoraproject.org/cgit/hardlink.git/;
     description = "Consolidate duplicate files via hardlinks";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix
index 6b294931851..ead7970da86 100644
--- a/pkgs/tools/system/ior/default.nix
+++ b/pkgs/tools/system/ior/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   preConfigure = "./bootstrap";
 
   meta = with stdenv.lib; {
-    homepage = "http://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/";
+    homepage = http://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/;
     description = "Parallel file system I/O performance test";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix
index a424eb6c4b2..316b94befde 100644
--- a/pkgs/tools/system/journalwatch/default.nix
+++ b/pkgs/tools/system/journalwatch/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "journalwatch is a tool to find error messages in the systemd journal.";
-    homepage = "https://github.com/The-Compiler/journalwatch";
+    homepage = https://github.com/The-Compiler/journalwatch;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ florianjacob ];
   };
diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 36b84c21154..11f30f6f444 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   makeFlags = "PREFIX=$(out)";
 
   meta = {
-    homepage = "http://github.com/chneukirchen/lr";
+    homepage = http://github.com/chneukirchen/lr;
     description = "List files recursively";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix
index 2f34b354d52..e8e487694bd 100644
--- a/pkgs/tools/system/nq/default.nix
+++ b/pkgs/tools/system/nq/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     description = "Unix command line queue utility";
-    homepage = "https://github.com/chneukirchen/nq";
+    homepage = https://github.com/chneukirchen/nq;
     license = licenses.publicDomain;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix
index b4d9f699b05..60175d27f15 100644
--- a/pkgs/tools/system/opencl-info/default.nix
+++ b/pkgs/tools/system/opencl-info/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A tool to dump OpenCL platform/device information";
-    homepage = "https://github.com/marchv/opencl-info";
+    homepage = https://github.com/marchv/opencl-info;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index 7924054b720..c06ba8e541b 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "SQL powered operating system instrumentation, monitoring, and analytics";
-    homepage = "https://osquery.io/";
+    homepage = https://osquery.io/;
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index 798d6820cf4..dc588e54aea 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://swtch.com/plan9port/";
+    homepage = http://swtch.com/plan9port/;
     description = "Plan 9 from User Space";
     license = licenses.lpl-102;
     maintainers = with maintainers; [ ftrvxmtrx kovirobi ];
diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix
index b62bb92564c..4525343dcc1 100644
--- a/pkgs/tools/system/psensor/default.nix
+++ b/pkgs/tools/system/psensor/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Graphical hardware monitoring application for Linux";
-    homepage = "https://wpitchoune.net/psensor/";
+    homepage = https://wpitchoune.net/psensor/;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index f0495578f46..e642b91c3d9 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = "http://www.rsyslog.com/";
+    homepage = http://www.rsyslog.com/;
     description = "Enhanced syslog implementation";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 61c61226acd..7eced697373 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "UNIX init scheme with service supervision";
     license = licenses.bsd3;
-    homepage = "http://smarden.org/runit";
+    homepage = http://smarden.org/runit;
     maintainers = with maintainers; [ rickynils joachifm ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
index b72673167bc..3fd529b0a50 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/pkgs/tools/system/syslog-ng-incubator/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/balabit/syslog-ng-incubator";
+    homepage = https://github.com/balabit/syslog-ng-incubator;
     description = "A collection of tools and modules for syslog-ng";
     license = licenses.gpl2;
     maintainers = [ maintainers.rickynils ];
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 4e1fb671957..812fab65ef6 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "man" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.balabit.com/network-security/syslog-ng/";
+    homepage = http://www.balabit.com/network-security/syslog-ng/;
     description = "Next-generation syslogd with advanced networking and filtering capabilities";
     license = licenses.gpl2;
     maintainers = with maintainers; [ rickynils  fpletz ];
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 983c881d388..7c81a028810 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Thermal Daemon";
-    homepage = "https://01.org/linux-thermal-daemon";
+    homepage = https://01.org/linux-thermal-daemon;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix
index 3442dbb62b0..cbb1fd88669 100644
--- a/pkgs/tools/system/tm/default.nix
+++ b/pkgs/tools/system/tm/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://vicerveza.homeunix.net/~viric/soft/tm";
+    homepage = http://vicerveza.homeunix.net/~viric/soft/tm;
     description = "Terminal mixer - multiplexer for the i/o of terminal applications";
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index 00df3c45f4f..e34bd5f8e13 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://mama.indstate.edu/users/ice/tree/";
+    homepage = http://mama.indstate.edu/users/ice/tree/;
     description = "Command to produce a depth indented directory listing";
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index cce18b5d54b..0e51b061091 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://vicerveza.homeunix.net/~viric/soft/ts";
+    homepage = http://vicerveza.homeunix.net/~viric/soft/ts;
     description = "Task spooler - batch queue";
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/tools/system/undaemonize/default.nix
index e82ee18b831..0f33a8d34c3 100644
--- a/pkgs/tools/system/undaemonize/default.nix
+++ b/pkgs/tools/system/undaemonize/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   '';
   meta = {
     description = "Tiny helper utility to force programs which insist on daemonizing themselves to run in the foreground";
-    homepage = "https://github.com/nickstenning/undaemonize";
+    homepage = https://github.com/nickstenning/undaemonize;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.canndrew ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
index df8bb84a4f1..e0444fcfd9f 100644
--- a/pkgs/tools/system/xe/default.nix
+++ b/pkgs/tools/system/xe/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   
   meta = with lib; {
     description = "Simple xargs and apply replacement";
-    homepage = "https://github.com/chneukirchen/xe";
+    homepage = https://github.com/chneukirchen/xe;
     license = licenses.publicDomain;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ndowens ];
diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix
index 81c09840848..5d6eed458c0 100644
--- a/pkgs/tools/text/agrep/default.nix
+++ b/pkgs/tools/text/agrep/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Approximate grep for fast fuzzy string searching";
-    homepage = "https://www.tgries.de/agrep/";
+    homepage = https://www.tgries.de/agrep/;
     license = stdenv.lib.licenses.isc;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix
index 1dde1638b81..4cc03393855 100644
--- a/pkgs/tools/text/ascii/default.nix
+++ b/pkgs/tools/text/ascii/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Interactive ASCII name and synonym chart";
-    homepage = "http://www.catb.org/~esr/ascii/";
+    homepage = http://www.catb.org/~esr/ascii/;
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
index fc7d74804fe..62be30319cf 100644
--- a/pkgs/tools/text/codesearch/default.nix
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = {
     description = "Fast, indexed regexp search over large file trees";
-    homepage = "https://github.com/google/codesearch";
+    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/discount/default.nix b/pkgs/tools/text/discount/default.nix
index 1fe905c98f8..d3dcb662c49 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Implementation of Markdown markup language in C";
-    homepage = "http://www.pell.portland.or.us/~orc/Code/discount/";
+    homepage = http://www.pell.portland.or.us/~orc/Code/discount/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ shell ndowens ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix
index da246832b93..e9abae3ac84 100644
--- a/pkgs/tools/text/ebook-tools/default.nix
+++ b/pkgs/tools/text/ebook-tools/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = "http://ebook-tools.sourceforge.net";
+    homepage = http://ebook-tools.sourceforge.net;
     description = "Tools and library for dealing with various ebook file formats";
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index 38eadf40ae3..9e273d3c69b 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -14,7 +14,7 @@ python27Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "FanFicFare is a tool for making eBooks from fanfiction web sites";
-    homepage = "https://github.com/JimmXinu/FanFicFare";
+    homepage = https://github.com/JimmXinu/FanFicFare;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ lucas8 ];
diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
index 0eb64fe1d18..f0ab06066a5 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/pkgs/tools/text/gist/default.nix
@@ -19,7 +19,7 @@ buildRubyGem rec {
 
   meta = with lib; {
     description = "Upload code to https://gist.github.com (or github enterprise)";
-    homepage = "http://defunkt.io/gist/";
+    homepage = http://defunkt.io/gist/;
     license = licenses.mit;
     maintainers = with maintainers; [ zimbatm ];
     platforms = ruby.meta.platforms;
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 666dae1db9b..f452a98a4db 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Source code highlighting tool";
-    homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php";
+    homepage = http://www.andre-simon.de/doku/highlight/en/highlight.php;
     platforms = platforms.unix;
     maintainers = [ maintainers.ndowens ];
   };
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index e08a5941ba9..8aed674a644 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://languagetool.org";
+    homepage = https://languagetool.org;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [
       edwtjo
diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix
index eadb107d827..ae236cc2226 100644
--- a/pkgs/tools/text/nkf/default.nix
+++ b/pkgs/tools/text/nkf/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tool for converting encoding of Japanese text";
-    homepage = "http://sourceforge.jp/projects/nkf/";
+    homepage = http://sourceforge.jp/projects/nkf/;
     license = stdenv.lib.licenses.zlib;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.auntie ];
diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix
index 7fc84e6ec74..62206c6c791 100644
--- a/pkgs/tools/text/opencc/default.nix
+++ b/pkgs/tools/text/opencc/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/BYVoid/OpenCC";
+    homepage = https://github.com/BYVoid/OpenCC;
     license = licenses.asl20;
     description = "A project for conversion between Traditional and Simplified Chinese";
     longDescription = ''
diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix
index 2eae1256186..2f09c4dfbe3 100644
--- a/pkgs/tools/text/qprint/default.nix
+++ b/pkgs/tools/text/qprint/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.fourmilab.ch/webtools/qprint/";
+    homepage = http://www.fourmilab.ch/webtools/qprint/;
     license = stdenv.lib.licenses.publicDomain;
     description = "Encode and decode Quoted-Printable files";
     maintainers = [ stdenv.lib.maintainers.tv ];
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index 4ea2631bcb7..acf657d2292 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://www.gnu.org/software/recode/";
+    homepage = http://www.gnu.org/software/recode/;
     description = "Converts files between various character sets and usages";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix
index 3d8afd0540a..8db3d4eea2b 100644
--- a/pkgs/tools/text/rst2html5/default.nix
+++ b/pkgs/tools/text/rst2html5/default.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonPackage rec {
   [ docutils genshi pygments beautifulsoup4 ];
 
   meta = with stdenv.lib;{
-    homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5";
+    homepage = https://bitbucket.org/andre_felipe_dias/rst2html5;
     description = "Converts ReSTructuredText to (X)HTML5";
     license = licenses.mit;
     maintainers = with maintainers; [ AndersonTorres ];
diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix
index c6f7284d01e..1e688942a49 100644
--- a/pkgs/tools/text/sift/default.nix
+++ b/pkgs/tools/text/sift/default.nix
@@ -22,7 +22,7 @@ buildGoPackage rec {
 
   meta = with lib; {
     description = "sift is a fast and powerful alternative to grep";
-    homepage = "https://sift-tool.org";
+    homepage = https://sift-tool.org;
     maintainers = [ maintainers.carlsverre ];
     license = licenses.gpl3;
     platforms = platforms.all;
diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix
index bfddff938f9..34e1413150f 100644
--- a/pkgs/tools/text/staccato/default.nix
+++ b/pkgs/tools/text/staccato/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
       and standard deviation. It can also compute these things about some
       subset of the stream, for example the lower 95% of values.
     '';
-    homepage = "https://docs.rs/crate/staccato";
+    homepage = https://docs.rs/crate/staccato;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 89ed36231a2..9df89a8072a 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -269,7 +269,7 @@ stdenv.mkDerivation rec {
       the backend output markups (which can be almost any type of SGML/XML
       markup) can be customized and extended by the user.
     '';
-    homepage = "http://www.methods.co.nz/asciidoc/";
+    homepage = http://www.methods.co.nz/asciidoc/;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix
index 53e75ebd5ec..d7522969b4c 100644
--- a/pkgs/tools/typesetting/multimarkdown/default.nix
+++ b/pkgs/tools/typesetting/multimarkdown/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       glossary entries (LaTeX only)
       document metadata (e.g. title, author, date, etc.)
     '';
-    homepage = "http://fletcherpenney.net/multimarkdown/";
+    homepage = http://fletcherpenney.net/multimarkdown/;
     # licensed under GPLv2+ or MIT:
     # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE
     license = with stdenv.lib.licenses; [ gpl2Plus ];
diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix
index 73bf0b9e128..11baa176b88 100644
--- a/pkgs/tools/typesetting/pdftk/default.nix
+++ b/pkgs/tools/typesetting/pdftk/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Simple tool for doing everyday things with PDF documents";
-    homepage = "https://www.pdflabs.com/tools/pdftk-server/";
+    homepage = https://www.pdflabs.com/tools/pdftk-server/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric raskin];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix
index 6f387b5bf8b..dc2d3e052e8 100644
--- a/pkgs/tools/typesetting/tex/tex4ht/default.nix
+++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://tug.org/tex4ht/";
+    homepage = http://tug.org/tex4ht/;
     description = "A system to convert (La)TeX documents to HTML and various other formats";
     license = stdenv.lib.licenses.lppl12;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 1ab0a9ae273..3b02f0d3e2c 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A suite of programs for processing MPEG or MJPEG video";
-    homepage = "http://mjpeg.sourceforge.net/";
+    homepage = http://mjpeg.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix
index 83e57b2a128..4df4e3f5428 100644
--- a/pkgs/tools/video/swfmill/default.nix
+++ b/pkgs/tools/video/swfmill/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An xml2swf and swf2xml processor with import functionalities";
-    homepage = "http://swfmill.org";
+    homepage = http://swfmill.org;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix
index b133bc094f9..57742671211 100644
--- a/pkgs/tools/virtualization/cloudmonkey/default.nix
+++ b/pkgs/tools/virtualization/cloudmonkey/default.nix
@@ -19,7 +19,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     description = "CLI for Apache CloudStack.";
-    homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI";
+    homepage = https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI;
     license = [ licenses.asl20 ];
     maintainers = [ maintainers.womfoo ];
   };
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix
index f74492b7727..63b79cbc8d6 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -35,7 +35,7 @@ buildPerlPackage rec {
 
   meta = with stdenv.lib; {
     description = "Command-line interface to the Linode platform";
-    homepage = "https://github.com/linode/cli";
+    homepage = https://github.com/linode/cli;
     license = with licenses; [ artistic2 gpl2 ];
     maintainers = with maintainers; [ nixy ];
   };

From d9521c3418adc7d8883c6965c0083e8b9486543a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 22:47:03 +0200
Subject: [PATCH 1394/3246] gnome-tweak-tool: fix eval

---
 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
index 5a1baa5e330..6268eaa3388 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
                   gnome3.gnome_desktop wrapGAppsHook
                   python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
 
-  PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
+  PYTHONPATH = "$out/${python2Packages.python.sitePackages}";
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
 

From d690701ff75e25638ad67be7b09af47d15b04833 Mon Sep 17 00:00:00 2001
From: Dave Laing <dave.laing.80@gmail.com>
Date: Tue, 1 Aug 2017 09:23:02 +1000
Subject: [PATCH 1395/3246] nixos/piwik: clarifies setup documentation

The piwki setup documentation as it stands has two issues:
- the `ALTER USER root` line does not work with MariaDB or MySQL 5.5
- the auth plugin details vary between MariaDB and MySQL
---
 nixos/modules/services/web-apps/piwik-doc.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/piwik-doc.xml
index a1d8a5b7556..21342d4454f 100644
--- a/nixos/modules/services/web-apps/piwik-doc.xml
+++ b/nixos/modules/services/web-apps/piwik-doc.xml
@@ -23,16 +23,24 @@
       and enter those credentials in your browser.
       You can use passwordless database authentication via the UNIX_SOCKET authentication plugin
       with the following SQL commands:
+
       <programlisting>
+        # For MariaDB
         INSTALL PLUGIN unix_socket SONAME 'auth_socket';
-        ALTER USER root IDENTIFIED VIA unix_socket;
         CREATE DATABASE piwik;
-        CREATE USER 'piwik'@'localhost' IDENTIFIED VIA unix_socket;
+        CREATE USER 'piwik'@'localhost' IDENTIFIED WITH unix_socket;
+        GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost';
+
+        # For MySQL
+        INSTALL PLUGIN auth_socket SONAME 'auth_socket.so';
+        CREATE DATABASE piwik;
+        CREATE USER 'piwik'@'localhost' IDENTIFIED WITH auth_socket;
         GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost';
       </programlisting>
+
       Then fill in <literal>piwik</literal> as database user and database name, and leave the password field blank.
-      This works with MariaDB and MySQL. This authentication works by allowing only the <literal>piwik</literal> unix
-      user to authenticate as <literal>piwik</literal> database (without needing a password), but no other users.
+      This authentication works by allowing only the <literal>piwik</literal> unix user to authenticate as the 
+      <literal>piwik</literal> database user (without needing a password), but no other users.
       For more information on passwordless login, see
       <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
     </para>

From ae73a1704a0c2cc07e52f561973e5d80741330be Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 Aug 2017 18:41:14 -0400
Subject: [PATCH 1396/3246] git: 2.13.3 -> 2.13.4

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index c6082f71af8..aa8ab008403 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -12,7 +12,7 @@
 }:
 
 let
-  version = "2.13.3";
+  version = "2.13.4";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0qiy696pwqhbxcrvm3zhyjnfjrym541glhvgc4cynrwg8az27ali";
+    sha256 = "1nmg0n9l5ix876iqhcyhdnmiy7ihv0ybdijf1lssch6ja8m5j6ip";
   };
 
   hardeningDisable = [ "format" ];

From 40c2559851e5f96db3334873ee6a228131ae4ec6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 2 Aug 2017 01:49:22 +0200
Subject: [PATCH 1397/3246] slop: 6.3.48 -> 7.3.48

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

diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index 570c2f260dd..234ca22faa3 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "slop-${version}";
-  version = "6.3.48";
+  version = "7.3.48";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "slop";
     rev = "v${version}";
-    sha256 = "152xnisdbwx2zh1wzspy8djm937d1cm9zvcz1x22z8ia50ajm107";
+    sha256 = "17a070y186wa375l4z8j7xql92hgpang69fkdyksycdznih7jwk6";
   };
 
   nativeBuildInputs = [ cmake ];

From 4472928a1d2b11c9cd56ed679e5a82fe1daa81ae Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 2 Aug 2017 01:52:04 +0200
Subject: [PATCH 1398/3246] maim: 5.4.65 -> 5.4.66

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

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index 791f1bf09e1..fcb12239650 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.4.65";
+  version = "5.4.66";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "0jkvsqzwsb986bm424xpfj73d46afkvbimf1ipdss2vg2y77vmj3";
+    sha256 = "0aimci6n7dvfwa690rbcd6fdrsvcanxy53j752v3151x6gahw3gb";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 87b215d5f72cd51ea2b649e452c107c9e14f4abf Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 2 Aug 2017 02:12:11 +0200
Subject: [PATCH 1399/3246] android-studio-preview: 3.0.0.7 -> 3.0.0.8

This also contains some refactoring.
---
 .../editors/android-studio/common.nix         |  9 ++++--
 .../editors/android-studio/packages.nix       | 30 ++++++-------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index bd8e25fa41c..360d373f070 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -1,4 +1,4 @@
-{ pname, version, build, src, meta }:
+{ pname, version, build, sha256Hash, meta }:
 { bash
 , buildFHSUserEnv
 , coreutils
@@ -34,8 +34,13 @@
 
 let
   androidStudio = stdenv.mkDerivation {
-    inherit src;
     name = "${pname}";
+
+    src = fetchurl {
+      url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
+      sha256 = sha256Hash;
+    };
+
     buildInputs = [
       makeWrapper
       unzip
diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index da3e8b8b944..17f795ad68d 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -1,16 +1,16 @@
 {  stdenv, callPackage, fetchurl, makeFontsConf }:
 let
-  mkStudio = opts: callPackage (import ./common.nix opts);
+  mkStudio = opts: callPackage (import ./common.nix opts) {
+    fontsConf = makeFontsConf {
+      fontDirectories = [];
+    };
+  };
 in rec {
   stable = mkStudio rec {
     pname = "android-studio";
     version = "2.3.3.0";
     build = "162.4069837";
-
-    src = fetchurl {
-      url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
-      sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
-    };
+    sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
 
     meta = with stdenv.lib; {
       description = "The Official IDE for Android (stable version)";
@@ -23,30 +23,18 @@ in rec {
       platforms = [ "x86_64-linux" ];
       maintainers = with maintainers; [ primeos ];
     };
-  } {
-    fontsConf = makeFontsConf {
-      fontDirectories = [];
-    };
   };
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.7"; # This is actually "Android Studio 3.0 Canary 8"
-    build = "171.4195411";
-
-    src = fetchurl {
-      url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
-      sha256 = "1yzhr845shjq2cd5hcanppxmnj34ky9ry755y4ywf5f1w5ha5xzj";
-    };
+    version = "3.0.0.8"; # This is actually "Android Studio 3.0 Canary 9"
+    build = "171.4220116";
+    sha256Hash = "02aw1m65wb5cgjq1dxm86c5m6p8b41kgjcgsl5d0h93fb4clf64b";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";
       homepage = https://developer.android.com/studio/preview/index.html;
       maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
     };
-  } {
-    fontsConf = makeFontsConf {
-      fontDirectories = [];
-    };
   };
 }

From f49c2fbf7a0594717a16432295983512091fba26 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Thu, 28 Jan 2016 01:26:40 +0300
Subject: [PATCH 1400/3246] trivial-builders.nix: add writeShellScriptBin
 builder

---
 pkgs/build-support/trivial-builders.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 16bd4e8e405..14553c33e03 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -26,6 +26,7 @@ rec {
     , text
     , executable ? false # run chmod +x ?
     , destination ? ""   # relative path appended to $out eg "/bin/foo"
+    , checkPhase ? ""    # syntax checks, e.g. for scripts
     }:
     runCommand name
       { inherit text executable;
@@ -44,6 +45,8 @@ rec {
           echo -n "$text" > "$n"
         fi
 
+        ${checkPhase}
+
         (test -n "$executable" && chmod +x "$n") || true
       '';
 
@@ -54,6 +57,20 @@ rec {
   writeScript = name: text: writeTextFile {inherit name text; executable = true;};
   writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
 
+  # Create a Shell script, check its syntax
+  writeShellScriptBin = name : text :
+    writeTextFile {
+      inherit name;
+      executable = true;
+      destination = "/bin/${name}";
+      text = ''
+        #!${stdenv.shell}
+        ${text}
+        '';
+      checkPhase = ''
+        ${stdenv.shell} -n $out
+      '';
+    };
 
   # Create a forest of symlinks to the files in `paths'.
   symlinkJoin =

From adeaaf0f5421f89fbc09cc860bc1539a456d54b3 Mon Sep 17 00:00:00 2001
From: Brad Jensen <brad@bradjensen.net>
Date: Mon, 31 Jul 2017 19:29:53 -0700
Subject: [PATCH 1401/3246] Work around quicklisp not knowing all dependencies

---
 .../quicklisp-to-nix/ql-to-nix.lisp           | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index 141fb0f34eb..f408ceeb3f5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -49,6 +49,24 @@
         (#\. "_dot_")
         (t x)))))
 
+(defun system-depends-on (system-name)
+  (labels
+      ((decode (name)
+         (typecase name
+           (string
+            name)
+           (cons
+            (ecase (car name)
+              (:version (second name)))))))
+    (let* ((asdf-dependencies (asdf:system-depends-on (asdf:find-system system-name)))
+           (decoded-asdf-dependencies (mapcar #'decode asdf-dependencies))
+           (clean-asdf-dependencies (remove-if-not 'ql-dist:find-system decoded-asdf-dependencies))
+           (ql-dependencies (ql-dist:required-systems (ql-dist:find-system system-name)))
+           (all-dependencies (concatenate 'list clean-asdf-dependencies ql-dependencies))
+           (sorted-dependencies (sort all-dependencies #'string<))
+           (unique-dependencies (remove-duplicates sorted-dependencies :test #'equal)))
+      unique-dependencies)))
+
 (defun system-data (system)
   (let*
     ((asdf-system
@@ -69,7 +87,7 @@
          (nix-prefetch-url local-url)))
      (ideal-md5 (ql-dist:archive-md5 ql-release))
      (file-md5 (getf archive-data :md5))
-     (raw-dependencies (ql-dist:required-systems ql-system))
+     (raw-dependencies (system-depends-on system))
      (name (string-downcase (format nil "~a" system)))
      (ql-sibling-names
        (remove name (mapcar 'ql-dist:name ql-sibling-systems)

From 85b57b524db39416958c0ce7f9c26d5f69d4e9e2 Mon Sep 17 00:00:00 2001
From: Brad Jensen <brad@bradjensen.net>
Date: Mon, 31 Jul 2017 19:33:21 -0700
Subject: [PATCH 1402/3246] Use a more recent version of quicklisp

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

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 275a6d405c8..eaae4726751 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -34,7 +34,7 @@ let lispPackages = rec {
 
   quicklisp = buildLispPackage rec {
     baseName = "quicklisp";
-    version = "2016-01-21";
+    version = "2017-03-06";
 
     testSystems = [];
 
@@ -43,7 +43,7 @@ let lispPackages = rec {
     src = pkgs.fetchgit {
       url = "https://github.com/quicklisp/quicklisp-client/";
       rev = "refs/tags/version-${version}";
-      sha256 = "007r1ydbhrkh6ywqgpvzp0xg0yypgrfai3n4mn16gj5w2zz013lx";
+      sha256 = "11ywk7ggc1axivpbqvrd7m1lxsj4yp38d1h9w1d8i9qnn7zjpqj4";
     };
     overrides = x: rec {
       inherit clwrapper;

From e73e1aa64d66b1f8148c453e7ba755810adf6c2a Mon Sep 17 00:00:00 2001
From: Brad Jensen <brad@bradjensen.net>
Date: Mon, 31 Jul 2017 19:34:01 -0700
Subject: [PATCH 1403/3246] Add some new packages and regenerate
 quicklisp-to-nix

---
 .../quicklisp-to-nix-output/alexandria.nix    |  12 +-
 .../quicklisp-to-nix-output/array-utils.nix   |  12 +-
 .../quicklisp-to-nix-output/babel-streams.nix |  15 +-
 .../quicklisp-to-nix-output/babel.nix         |  15 +-
 .../quicklisp-to-nix-output/caveman.nix       |  12 +-
 .../quicklisp-to-nix-output/cffi-grovel.nix   |  12 +-
 .../quicklisp-to-nix-output/cffi.nix          |  12 +-
 .../quicklisp-to-nix-output/cl+ssl.nix        |  18 +-
 .../quicklisp-to-nix-output/cl-aa.nix         |  12 +-
 .../quicklisp-to-nix-output/cl-cli.nix        |  35 ++
 .../quicklisp-to-nix-output/cl-dbi.nix        |  12 +-
 .../quicklisp-to-nix-output/cl-emb.nix        |   4 +-
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |  15 +-
 .../cl-ppcre-template.nix                     |  14 +-
 .../quicklisp-to-nix-output/cl-unicode.nix    |   4 +-
 .../cl-unicode_slash_base.nix                 |  35 ++
 .../cl-unification.nix                        |  10 +-
 .../quicklisp-to-nix-output/cl-vectors.nix    |  12 +-
 .../quicklisp-to-nix-output/clack-socket.nix  |  39 ++
 .../clack-v1-compat.nix                       |  24 +-
 .../quicklisp-to-nix-output/clack.nix         |  16 +-
 .../quicklisp-to-nix-output/closer-mop.nix    |  10 +-
 .../quicklisp-to-nix-output/clss.nix          |  14 +-
 .../quicklisp-to-nix-output/clx.nix           |  12 +-
 .../quicklisp-to-nix-output/dbd-mysql.nix     |  12 +-
 .../quicklisp-to-nix-output/dbd-postgres.nix  |  12 +-
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   |  12 +-
 .../quicklisp-to-nix-output/dexador.nix       |  23 +-
 .../documentation-utils.nix                   |  15 +-
 .../quicklisp-to-nix-output/drakma.nix        |  12 +-
 .../quicklisp-to-nix-output/esrap.nix         |  14 +-
 .../quicklisp-to-nix-output/fast-http.nix     |  17 +-
 .../quicklisp-to-nix-output/fast-io.nix       |  16 +-
 .../quicklisp-to-nix-output/fiveam.nix        |  37 ++
 .../quicklisp-to-nix-output/form-fiddle.nix   |  14 +-
 .../quicklisp-to-nix-output/fset.nix          |  40 ++
 .../quicklisp-to-nix-output/hu.dwim.asdf.nix  |  36 --
 .../quicklisp-to-nix-output/hu.dwim.def.nix   |  37 --
 .../hu_dot_dwim_dot_asdf.nix                  |  14 +-
 .../hu_dot_dwim_dot_def.nix                   |  16 +-
 .../quicklisp-to-nix-output/hunchentoot.nix   |  12 +-
 .../quicklisp-to-nix-output/iolib.nix         |  16 +-
 .../iolib_slash_multiplex.nix                 |  36 ++
 .../iolib_slash_sockets.nix                   |  39 ++
 .../iolib_slash_streams.nix                   |  36 ++
 .../iolib_slash_syscalls.nix                  |  36 ++
 .../quicklisp-to-nix-output/ironclad.nix      |   8 +-
 .../quicklisp-to-nix-output/ixf.nix           |  16 +-
 .../quicklisp-to-nix-output/jonathan.nix      |  16 +-
 .../lack-middleware-backtrace.nix             |  39 ++
 .../quicklisp-to-nix-output/lack-util.nix     |  40 ++
 .../quicklisp-to-nix-output/lack.nix          |  12 +-
 .../lisp-namespace.nix                        |  36 ++
 .../quicklisp-to-nix-output/local-time.nix    |  14 +-
 .../quicklisp-to-nix-output/lquery.nix        |  15 +-
 .../quicklisp-to-nix-output/md5.nix           |  12 +-
 .../misc-extensions.nix                       |  35 ++
 .../quicklisp-to-nix-output/mssql.nix         |  12 +-
 .../quicklisp-to-nix-output/mt19937.nix       |  35 ++
 .../net_dot_didierverna_dot_asdf-flv.nix      |  36 ++
 .../quicklisp-to-nix-output/pgloader.nix      |  12 +-
 .../quicklisp-to-nix-output/plump.nix         |  12 +-
 .../py-configparser.nix                       |  12 +-
 .../quicklisp-to-nix-output/qmynd.nix         |  19 +-
 .../quicklisp-to-nix-output/stumpwm.nix       |  15 +-
 .../trivial-indent.nix                        |  12 +-
 .../quicklisp-to-nix-output/trivial-mimes.nix |  12 +-
 .../quicklisp-to-nix-output/uffi.nix          |  12 +-
 .../quicklisp-to-nix-output/uiop.nix          |   4 +-
 .../quicklisp-to-nix-output/woo.nix           |  20 +-
 .../quicklisp-to-nix-output/wookie.nix        |  10 +-
 .../lisp-modules/quicklisp-to-nix-systems.txt |  12 +
 .../lisp-modules/quicklisp-to-nix.nix         | 382 +++++++++++++++---
 73 files changed, 1275 insertions(+), 463 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 7f60d2dde20..52f0161aecb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''alexandria'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''Alexandria is a collection of portable public domain utilities.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz'';
-    sha256 = ''0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82'';
+    url = ''http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz'';
+    sha256 = ''1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis'';
   };
     
   packageName = "alexandria";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82
-    URL http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz MD5 9234737872493dd82d2da9cadf6a1484 NAME alexandria TESTNAME NIL
-    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (alexandria-tests)) */
+/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis
+    URL http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz MD5 ce5427881c909981192f870cb52ff59f NAME alexandria TESTNAME NIL
+    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (alexandria-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 80030739535..20763679a82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''array-utils'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''A few utilities for working with arrays.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz'';
-    sha256 = ''0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q'';
+    url = ''http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz'';
+    sha256 = ''1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb'';
   };
     
   packageName = "array-utils";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q URL
-    http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz MD5 c6e4ccbee8f5d72fb86493b419cd0f59 NAME array-utils TESTNAME NIL
-    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (array-utils-test)) */
+/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb URL
+    http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz MD5 550b37bc0eccfafa889de00b59c422dc NAME array-utils TESTNAME NIL
+    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (array-utils-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index adc5571a337..e85bb4f8f92 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''babel-streams'';
-  version = ''babel-20170516-git'';
+  version = ''babel-20170630-git'';
 
   description = ''Some useful streams based on Babel's encoding code'';
 
-  deps = [ ];
+  deps = [ args."trivial-gray-streams" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz'';
-    sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz'';
+    sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx'';
   };
     
   packageName = "babel-streams";
@@ -30,6 +30,7 @@ rec {
     '';
   };
 }
-/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL
-    http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel-streams TESTNAME NIL FILENAME
-    babel-streams DEPS NIL DEPENDENCIES NIL VERSION babel-20170516-git SIBLINGS (babel-tests babel)) */
+/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL
+    http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel-streams TESTNAME NIL FILENAME
+    babel-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (trivial-gray-streams alexandria) VERSION babel-20170630-git SIBLINGS (babel-tests babel)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index c9b98838862..e567b056b24 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''babel'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''Babel, a charset conversion library.'';
 
-  deps = [ ];
+  deps = [ args."trivial-features" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz'';
-    sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz'';
+    sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx'';
   };
     
   packageName = "babel";
@@ -30,6 +30,7 @@ rec {
     '';
   };
 }
-/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL
-    http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel TESTNAME NIL FILENAME babel DEPS
-    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (babel-streams babel-tests)) */
+/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL
+    http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel TESTNAME NIL FILENAME babel DEPS
+    ((NAME trivial-features FILENAME trivial-features) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (trivial-features alexandria) VERSION 20170630-git
+    SIBLINGS (babel-streams babel-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index 5b5d13bcec1..c01189a491e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''caveman'';
-  version = ''20161031-git'';
+  version = ''20170630-git'';
 
   description = ''Web Application Framework for Common Lisp'';
 
   deps = [ args."myway" args."local-time" args."do-urlencode" args."clack-v1-compat" args."cl-syntax-annot" args."cl-syntax" args."cl-project" args."cl-ppcre" args."cl-emb" args."anaphora" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz'';
-    sha256 = ''111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi'';
+    url = ''http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz'';
+    sha256 = ''0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2'';
   };
     
   packageName = "caveman";
@@ -30,11 +30,11 @@ rec {
     '';
   };
 }
-/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi URL
-    http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz MD5 a6700f14fd7c4bf8fdc573473ff5fab6 NAME caveman TESTNAME NIL FILENAME
+/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2 URL
+    http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz MD5 774f85fa78792bde012bad78efff4b53 NAME caveman TESTNAME NIL FILENAME
     caveman DEPS
     ((NAME myway FILENAME myway) (NAME local-time FILENAME local-time) (NAME do-urlencode FILENAME do-urlencode)
      (NAME clack-v1-compat FILENAME clack-v1-compat) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
      (NAME cl-project FILENAME cl-project) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-emb FILENAME cl-emb) (NAME anaphora FILENAME anaphora))
-    DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20161031-git SIBLINGS
+    DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20170630-git SIBLINGS
     (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index dba9bfcbc76..e5dd39df1cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cffi-grovel'';
-  version = ''cffi_0.18.0'';
+  version = ''cffi_0.19.0'';
 
   description = ''The CFFI Groveller'';
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
-    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz'';
+    sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
   };
     
   packageName = "cffi-grovel";
@@ -30,7 +30,7 @@ rec {
     '';
   };
 }
-/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
-    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel
-    DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS
+/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
+    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5 7589b6437fec19fdabc65892536c3dc3 NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel
+    DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.19.0 SIBLINGS
     (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 9f92871b712..7c09b2ec643 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cffi'';
-  version = ''cffi_0.18.0'';
+  version = ''cffi_0.19.0'';
 
   description = ''The Common Foreign Function Interface'';
 
   deps = [ args."uiop" args."trivial-features" args."babel" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
-    sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz'';
+    sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
   };
     
   packageName = "cffi";
@@ -30,8 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
-    http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi TESTNAME NIL FILENAME cffi DEPS
+/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
+    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5 7589b6437fec19fdabc65892536c3dc3 NAME cffi TESTNAME NIL FILENAME cffi DEPS
     ((NAME uiop FILENAME uiop) (NAME trivial-features FILENAME trivial-features) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS
+    DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.19.0 SIBLINGS
     (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
index bfe44d109d5..4f0c1a0421d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl+ssl'';
-  version = ''cl+ssl-20170403-git'';
+  version = ''cl+ssl-20170725-git'';
 
   description = ''Common Lisp interface to OpenSSL.'';
 
-  deps = [ args."uiop" args."trivial-gray-streams" args."trivial-garbage" args."flexi-streams" args."cffi" args."bordeaux-threads" ];
+  deps = [ args."uiop" args."trivial-gray-streams" args."trivial-garbage" args."trivial-features" args."flexi-streams" args."cffi" args."bordeaux-threads" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz'';
-    sha256 = ''1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s'';
+    url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz'';
+    sha256 = ''1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69'';
   };
     
   packageName = "cl+ssl";
@@ -30,9 +30,11 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s URL
-    http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz MD5 e6d22f98947384d0e0bb2eb18230f72d NAME cl+ssl TESTNAME NIL FILENAME cl+ssl
+/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69 URL
+    http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz MD5 3458c83f442395e0492c7e9b9720a1f2 NAME cl+ssl TESTNAME NIL FILENAME cl+ssl
     DEPS
     ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-garbage FILENAME trivial-garbage)
-     (NAME flexi-streams FILENAME flexi-streams) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads))
-    DEPENDENCIES (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */
+     (NAME trivial-features FILENAME trivial-features) (NAME flexi-streams FILENAME flexi-streams) (NAME cffi FILENAME cffi)
+     (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (uiop trivial-gray-streams trivial-garbage trivial-features flexi-streams cffi bordeaux-threads alexandria) VERSION cl+ssl-20170725-git
+    SIBLINGS (cl+ssl.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 5057ddbd9d1..ab800bc1780 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-aa'';
-  version = ''cl-vectors-20170516-git'';
+  version = ''cl-vectors-20170630-git'';
 
   description = ''cl-aa: polygon rasterizer'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
-    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
+    sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
   };
     
   packageName = "cl-aa";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-aa TESTNAME NIL FILENAME
-    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
+/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-aa TESTNAME NIL FILENAME
+    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170630-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
new file mode 100644
index 00000000000..f5bee7c03d2
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-cli'';
+  version = ''20151218-git'';
+
+  description = ''Command line parser'';
+
+  deps = [ args."split-sequence" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz'';
+    sha256 = ''0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay'';
+  };
+    
+  packageName = "cl-cli";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-cli[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-cli DESCRIPTION Command line parser SHA256 0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay URL
+    http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz MD5 820e5c7dde6800fcfa44b1fbc7a9d62b NAME cl-cli TESTNAME NIL FILENAME cl-cli
+    DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20151218-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 489147c881b..54f3380f490 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-dbi'';
-  version = ''20170124-git'';
+  version = ''20170725-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
-    sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
+    sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
   };
     
   packageName = "cl-dbi";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME cl-dbi TESTNAME NIL FILENAME cl-dbi
-    DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi)) */
+/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME cl-dbi TESTNAME NIL FILENAME cl-dbi
+    DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 067e09ab0e1..06a834ff145 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''A templating system for Common Lisp'';
 
-  deps = [ ];
+  deps = [ args."cl-ppcre" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz'';
@@ -32,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256 03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80 URL
     http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz MD5 01d850432cc2f8e920e50b4b36e42d42 NAME cl-emb TESTNAME NIL FILENAME cl-emb
-    DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
+    DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION 20170227-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index 964c94c95d5..27f4ef1b71a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-paths-ttf'';
-  version = ''cl-vectors-20170516-git'';
+  version = ''cl-vectors-20170630-git'';
 
   description = ''cl-paths-ttf: vectorial paths manipulation'';
 
-  deps = [ ];
+  deps = [ args."zpb-ttf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
-    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
+    sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
   };
     
   packageName = "cl-paths-ttf";
@@ -30,6 +30,7 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-paths-ttf TESTNAME NIL
-    FILENAME cl-paths-ttf DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */
+/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-paths-ttf TESTNAME NIL
+    FILENAME cl-paths-ttf DEPS ((NAME zpb-ttf FILENAME zpb-ttf)) DEPENDENCIES (zpb-ttf) VERSION cl-vectors-20170630-git SIBLINGS
+    (cl-aa-misc cl-aa cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index cf46246063f..6d1b67e28c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-ppcre-template'';
-  version = ''cl-unification-20170516-git'';
+  version = ''cl-unification-20170630-git'';
 
   description = ''A system used to conditionally load the CL-PPCRE Template.
 
@@ -9,11 +9,11 @@ This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.'';
 
-  deps = [ ];
+  deps = [ args."cl-ppcre" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz'';
-    sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz'';
+    sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz'';
   };
     
   packageName = "cl-ppcre-template";
@@ -39,6 +39,6 @@ REGULAR-EXPRESSION-TEMPLATE.'';
 This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.
-    SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz
-    MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS NIL DEPENDENCIES NIL VERSION
-    cl-unification-20170516-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
+    SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz
+    MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES
+    (cl-ppcre) VERSION cl-unification-20170630-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index 8b0d35253f4..95d8db3b0cf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Portable Unicode Library'';
 
-  deps = [ ];
+  deps = [ args."cl-unicode_slash_base" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz'';
@@ -32,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL
     http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode TESTNAME NIL FILENAME
-    cl-unicode DEPS NIL DEPENDENCIES NIL VERSION 0.1.5 SIBLINGS NIL) */
+    cl-unicode DEPS ((NAME cl-unicode/base FILENAME cl-unicode_slash_base)) DEPENDENCIES (cl-unicode/base) VERSION 0.1.5 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix
new file mode 100644
index 00000000000..50a4227fc40
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-unicode_slash_base'';
+  version = ''cl-unicode-0.1.5'';
+
+  description = '''';
+
+  deps = [ args."cl-ppcre" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz'';
+    sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n'';
+  };
+    
+  packageName = "cl-unicode/base";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unicode/base[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-unicode/base DESCRIPTION NIL SHA256 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL
+    http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode/base TESTNAME NIL
+    FILENAME cl-unicode_slash_base DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION cl-unicode-0.1.5 SIBLINGS (cl-unicode)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 7c5e16973ef..93d93b18010 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-unification'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''The CL-UNIFICATION system.
 
@@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.'';
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz'';
-    sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz'';
+    sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz'';
   };
     
   packageName = "cl-unification";
@@ -35,6 +35,6 @@ The system contains the definitions for the 'unification' machinery.'';
 /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system.
 
 The system contains the definitions for the 'unification' machinery.
-    SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz
-    MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
+    SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz
+    MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS
     (cl-unification-lib cl-unification-test cl-ppcre-template)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index fef996a845b..081bad6047e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-vectors'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''cl-paths: vectorial paths manipulation'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
-    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
+    sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
   };
     
   packageName = "cl-vectors";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-vectors TESTNAME NIL
-    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
+/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-vectors TESTNAME NIL
+    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
new file mode 100644
index 00000000000..94b763417d6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -0,0 +1,39 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clack-socket'';
+  version = ''clack-20170630-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
+    sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
+  };
+    
+  packageName = "clack-socket";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack-socket[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM clack-socket DESCRIPTION NIL SHA256 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
+    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-socket TESTNAME NIL FILENAME
+    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20170630-git SIBLINGS
+    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
+     t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
+     clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
+     t-clack-middleware-auth-basic t-clack-middleware-csrf)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index e00c430581f..98b706498dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20170516-git'';
+  version = ''clack-20170630-git'';
 
   description = '''';
 
-  deps = [ ];
+  deps = [ args."uiop" args."trivial-types" args."trivial-mimes" args."trivial-backtrace" args."split-sequence" args."quri" args."marshal" args."local-time" args."lack-util" args."lack" args."ironclad" args."http-body" args."flexi-streams" args."cl-syntax-annot" args."cl-ppcre" args."cl-base64" args."circular-streams" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz'';
-    sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
+    sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
   };
     
   packageName = "clack-v1-compat";
@@ -30,9 +30,19 @@ rec {
     '';
   };
 }
-/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL
-    http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack-v1-compat TESTNAME NIL FILENAME
-    clack-v1-compat DEPS NIL DEPENDENCIES NIL VERSION clack-20170516-git SIBLINGS
+/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
+    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-v1-compat TESTNAME NIL FILENAME
+    clack-v1-compat DEPS
+    ((NAME uiop FILENAME uiop) (NAME trivial-types FILENAME trivial-types) (NAME trivial-mimes FILENAME trivial-mimes)
+     (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME split-sequence FILENAME split-sequence) (NAME quri FILENAME quri)
+     (NAME marshal FILENAME marshal) (NAME local-time FILENAME local-time) (NAME lack-util FILENAME lack-util) (NAME lack FILENAME lack)
+     (NAME ironclad FILENAME ironclad) (NAME http-body FILENAME http-body) (NAME flexi-streams FILENAME flexi-streams)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-base64 FILENAME cl-base64)
+     (NAME circular-streams FILENAME circular-streams) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES
+    (uiop trivial-types trivial-mimes trivial-backtrace split-sequence quri marshal local-time lack-util lack ironclad http-body flexi-streams cl-syntax-annot
+     cl-ppcre cl-base64 circular-streams alexandria)
+    VERSION clack-20170630-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 43c75bdd6e8..bfd86a7b0de 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''Web application environment for Common Lisp'';
 
-  deps = [ ];
+  deps = [ args."uiop" args."lack-util" args."lack-middleware-backtrace" args."lack" args."bordeaux-threads" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz'';
-    sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
+    sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
   };
     
   packageName = "clack";
@@ -30,9 +30,11 @@ rec {
     '';
   };
 }
-/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL
-    http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack TESTNAME NIL FILENAME clack DEPS
-    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
+/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
+    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack TESTNAME NIL FILENAME clack DEPS
+    ((NAME uiop FILENAME uiop) (NAME lack-util FILENAME lack-util) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
+     (NAME lack FILENAME lack) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (uiop lack-util lack-middleware-backtrace lack bordeaux-threads alexandria) VERSION 20170630-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index d73de2e941c..4c1d85ec3be 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20170516-git'';
+  version = ''20170725-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz'';
-    sha256 = ''072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz'';
+    sha256 = ''0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc'';
   };
     
   packageName = "closer-mop";
@@ -32,5 +32,5 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w URL http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz MD5
-    169ba62f7f8f436e45f182cbe7dd8614 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+    SHA256 0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc URL http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz MD5
+    308f9e8e4ea4573c7b6820055b6f171d NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 81e50db852b..31ff76c0f09 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clss'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''A DOM tree searching engine based on CSS selectors.'';
 
-  deps = [ ];
+  deps = [ args."array-utils" args."plump" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz'';
-    sha256 = ''1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f'';
+    url = ''http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz'';
+    sha256 = ''0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0'';
   };
     
   packageName = "clss";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f URL
-    http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz MD5 2e69a5197694a9654c0e9c5fced4152f NAME clss TESTNAME NIL FILENAME clss DEPS NIL
-    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0 URL
+    http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz MD5 61bbadf22391940813bfc66dfd59d304 NAME clss TESTNAME NIL FILENAME clss DEPS
+    ((NAME array-utils FILENAME array-utils) (NAME plump FILENAME plump)) DEPENDENCIES (array-utils plump) VERSION 20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index b47a7cbd7d4..b85ccdd48f5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clx'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''An implementation of the X Window System protocol in Lisp.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz'';
-    sha256 = ''00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs'';
+    url = ''http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz'';
+    sha256 = ''0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7'';
   };
     
   packageName = "clx";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs URL
-    http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz MD5 1f5d7963802a503d7f7fcf73e1f42dd8 NAME clx TESTNAME NIL FILENAME clx DEPS NIL
-    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7 URL
+    http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz MD5 ccfec3f35979df3bead0b73adc1d798a NAME clx TESTNAME NIL FILENAME clx DEPS NIL
+    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 93d0e3d599b..7251da67498 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-mysql'';
-  version = ''cl-dbi-20170124-git'';
+  version = ''cl-dbi-20170725-git'';
 
   description = ''Database driver for MySQL.'';
 
   deps = [ args."cl-syntax-annot" args."cl-syntax" args."cl-mysql" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
-    sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
+    sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
   };
     
   packageName = "dbd-mysql";
@@ -30,7 +30,7 @@ rec {
     '';
   };
 }
-/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-mysql TESTNAME NIL FILENAME
+/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-mysql TESTNAME NIL FILENAME
     dbd-mysql DEPS ((NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-mysql FILENAME cl-mysql)) DEPENDENCIES
-    (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
+    (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170725-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 3c963b5141e..2d71945081c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-postgres'';
-  version = ''cl-dbi-20170124-git'';
+  version = ''cl-dbi-20170725-git'';
 
   description = ''Database driver for PostgreSQL.'';
 
   deps = [ args."trivial-garbage" args."cl-syntax-annot" args."cl-syntax" args."cl-postgres" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
-    sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
+    sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
   };
     
   packageName = "dbd-postgres";
@@ -30,9 +30,9 @@ rec {
     '';
   };
 }
-/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-postgres TESTNAME NIL FILENAME
+/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-postgres TESTNAME NIL FILENAME
     dbd-postgres DEPS
     ((NAME trivial-garbage FILENAME trivial-garbage) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
      (NAME cl-postgres FILENAME cl-postgres))
-    DEPENDENCIES (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
+    DEPENDENCIES (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170725-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index e19565fc277..42f5d82966e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-sqlite3'';
-  version = ''cl-dbi-20170124-git'';
+  version = ''cl-dbi-20170725-git'';
 
   description = ''Database driver for SQLite3.'';
 
   deps = [ args."uiop" args."sqlite" args."cl-syntax-annot" args."cl-syntax" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
-    sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
+    sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
   };
     
   packageName = "dbd-sqlite3";
@@ -30,8 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-sqlite3 TESTNAME NIL FILENAME
+/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-sqlite3 TESTNAME NIL FILENAME
     dbd-sqlite3 DEPS
     ((NAME uiop FILENAME uiop) (NAME sqlite FILENAME sqlite) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)) DEPENDENCIES
-    (uiop sqlite cl-syntax-annot cl-syntax) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
+    (uiop sqlite cl-syntax-annot cl-syntax) VERSION cl-dbi-20170725-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 54f1cf78e40..1eaeddd3118 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20170516-git'';
+  version = ''20170725-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
-  deps = [ ];
+  deps = [ args."usocket" args."trivial-mimes" args."trivial-gray-streams" args."quri" args."fast-io" args."fast-http" args."cl-reexport" args."cl-ppcre" args."cl-cookie" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" args."bordeaux-threads" args."babel" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz'';
-    sha256 = ''129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz'';
+    sha256 = ''1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl'';
   };
     
   packageName = "dexador";
@@ -30,6 +30,15 @@ rec {
     '';
   };
 }
-/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6 URL
-    http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz MD5 463972f0b98fd2a641ce2bfab4400dc7 NAME dexador TESTNAME NIL FILENAME
-    dexador DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (dexador-test)) */
+/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl URL
+    http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz MD5 1ab5cda1ba8d5c81859349e6a5b99b29 NAME dexador TESTNAME NIL FILENAME
+    dexador DEPS
+    ((NAME usocket FILENAME usocket) (NAME trivial-mimes FILENAME trivial-mimes) (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME quri FILENAME quri) (NAME fast-io FILENAME fast-io) (NAME fast-http FILENAME fast-http) (NAME cl-reexport FILENAME cl-reexport)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-cookie FILENAME cl-cookie) (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl)
+     (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME babel FILENAME babel)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES
+    (usocket trivial-mimes trivial-gray-streams quri fast-io fast-http cl-reexport cl-ppcre cl-cookie cl-base64 cl+ssl chunga chipz bordeaux-threads babel
+     alexandria)
+    VERSION 20170725-git SIBLINGS (dexador-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index d9bacd96af8..06710c9a4d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''documentation-utils'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''A few simple tools to help you with documenting your library.'';
 
-  deps = [ ];
+  deps = [ args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz'';
-    sha256 = ''0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1'';
+    url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz'';
+    sha256 = ''0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks'';
   };
     
   packageName = "documentation-utils";
@@ -31,6 +31,7 @@ rec {
   };
 }
 /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256
-    0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1 URL
-    http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz MD5 5e04421eb7fd48d8abe1757b5211e310 NAME
-    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+    0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks URL
+    http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz MD5 7c0541d4207ba221a251c8c3ec7a8cac NAME
+    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (trivial-indent) VERSION
+    20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index 16bbac4d03a..33d83765ed6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''drakma'';
-  version = ''2.0.2'';
+  version = ''v2.0.3'';
 
   description = ''Full-featured http/https client based on usocket'';
 
   deps = [ args."usocket" args."puri" args."flexi-streams" args."cl-ppcre" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz'';
-    sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z'';
+    url = ''http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz'';
+    sha256 = ''1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd'';
   };
     
   packageName = "drakma";
@@ -30,8 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z URL
-    http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz MD5 eb51e1417c02c912c2b43bd9605dfb50 NAME drakma TESTNAME NIL FILENAME drakma DEPS
+/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd URL
+    http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz MD5 3578c67b445cf982414ff78b2fb8d295 NAME drakma TESTNAME NIL FILENAME drakma DEPS
     ((NAME usocket FILENAME usocket) (NAME puri FILENAME puri) (NAME flexi-streams FILENAME flexi-streams) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl) (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz))
-    DEPENDENCIES (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */
+    DEPENDENCIES (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION v2.0.3 SIBLINGS (drakma-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 49c0ff6c8ce..1aeded93799 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''esrap'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
 
-  deps = [ ];
+  deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz'';
-    sha256 = ''06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8'';
+    url = ''http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz'';
+    sha256 = ''172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh'';
   };
     
   packageName = "esrap";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8 URL
-    http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz MD5 6116df281050ee58e6ba195727154ac0 NAME esrap TESTNAME NIL FILENAME esrap DEPS
-    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh URL
+    http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz MD5 bfabfebc5f5d49106df318ae2798ac45 NAME esrap TESTNAME NIL FILENAME esrap DEPS
+    ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 7b100d891b9..1d518e7b327 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fast-http'';
-  version = ''20170227-git'';
+  version = ''20170630-git'';
 
   description = ''A fast HTTP protocol parser in Common Lisp'';
 
-  deps = [ ];
+  deps = [ args."xsubseq" args."smart-buffer" args."proc-parse" args."cl-utilities" args."babel" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz'';
-    sha256 = ''0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx'';
+    url = ''http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz'';
+    sha256 = ''0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29'';
   };
     
   packageName = "fast-http";
@@ -30,6 +30,9 @@ rec {
     '';
   };
 }
-/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp SHA256 0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx URL
-    http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz MD5 5c5e2073702e7504a30c739e25c47c69 NAME fast-http TESTNAME NIL FILENAME
-    fast-http DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (fast-http-test)) */
+/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp SHA256 0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29 URL
+    http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz MD5 d117d59c1f71965e0c32b19e6790cf9a NAME fast-http TESTNAME NIL FILENAME
+    fast-http DEPS
+    ((NAME xsubseq FILENAME xsubseq) (NAME smart-buffer FILENAME smart-buffer) (NAME proc-parse FILENAME proc-parse) (NAME cl-utilities FILENAME cl-utilities)
+     (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (xsubseq smart-buffer proc-parse cl-utilities babel alexandria) VERSION 20170630-git SIBLINGS (fast-http-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 0e819493109..566b3d7bdc3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fast-io'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''Alternative I/O mechanism to a stream or vector'';
 
-  deps = [ ];
+  deps = [ args."trivial-gray-streams" args."static-vectors" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz'';
-    sha256 = ''1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1'';
+    url = ''http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz'';
+    sha256 = ''0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg'';
   };
     
   packageName = "fast-io";
@@ -30,6 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1 URL
-    http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz MD5 a9a96c0f6260271446fd43bf2e51e90f NAME fast-io TESTNAME NIL FILENAME
-    fast-io DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (fast-io-test)) */
+/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg URL
+    http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz MD5 34bfe5f306f2e0f6da128fe024ee242d NAME fast-io TESTNAME NIL FILENAME
+    fast-io DEPS
+    ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME static-vectors FILENAME static-vectors) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (trivial-gray-streams static-vectors alexandria) VERSION 20170630-git SIBLINGS (fast-io-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
new file mode 100644
index 00000000000..7f04b5eb893
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''fiveam'';
+  version = ''v1.3'';
+
+  description = ''A simple regression testing framework'';
+
+  deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz'';
+    sha256 = ''0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2'';
+  };
+    
+  packageName = "fiveam";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fiveam[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM fiveam DESCRIPTION A simple regression testing framework SHA256 0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2 URL
+    http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz MD5 bd03a588915f834031eeae9139c51aa4 NAME fiveam TESTNAME NIL FILENAME fiveam DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME net.didierverna.asdf-flv FILENAME net_dot_didierverna_dot_asdf-flv)
+     (NAME trivial-backtrace FILENAME trivial-backtrace))
+    DEPENDENCIES (alexandria net.didierverna.asdf-flv trivial-backtrace) VERSION v1.3 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 754d2f8c869..f2d5c3a64ba 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''form-fiddle'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''A collection of utilities to destructure lambda forms.'';
 
-  deps = [ ];
+  deps = [ args."documentation-utils" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz'';
-    sha256 = ''00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh'';
+    url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz'';
+    sha256 = ''0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf'';
   };
     
   packageName = "form-fiddle";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh URL
-    http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz MD5 8f0d8b920f6da0c7fd939b7096c30235 NAME form-fiddle TESTNAME NIL
-    FILENAME form-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf URL
+    http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz MD5 9c8eb18dfedebcf43718cc259c910aa1 NAME form-fiddle TESTNAME NIL
+    FILENAME form-fiddle DEPS ((NAME documentation-utils FILENAME documentation-utils)) DEPENDENCIES (documentation-utils) VERSION 20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
new file mode 100644
index 00000000000..c3900b7cd26
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
@@ -0,0 +1,40 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''fset'';
+  version = ''20150113-git'';
+
+  description = ''A functional set-theoretic collections library.
+See: http://www.ergy.com/FSet.html
+'';
+
+  deps = [ args."misc-extensions" args."mt19937" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz'';
+    sha256 = ''1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0'';
+  };
+    
+  packageName = "fset";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fset[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM fset DESCRIPTION A functional set-theoretic collections library.
+See: http://www.ergy.com/FSet.html
+
+    SHA256 1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0 URL http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz MD5
+    89f958cc900e712aed0750b336efbe15 NAME fset TESTNAME NIL FILENAME fset DEPS
+    ((NAME misc-extensions FILENAME misc-extensions) (NAME mt19937 FILENAME mt19937)) DEPENDENCIES (misc-extensions mt19937) VERSION 20150113-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
deleted file mode 100644
index f36b4e931ec..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''hu.dwim.asdf'';
-  version = ''20170516-darcs'';
-
-  description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz'';
-    sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw'';
-  };
-    
-  packageName = "hu.dwim.asdf";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
-    0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5
-    041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
-    (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
deleted file mode 100644
index 2aedd0f6704..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''hu.dwim.def'';
-  version = ''20170516-darcs'';
-
-  description = ''General purpose, homogenous, extensible definer macro.'';
-
-  deps = [ ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz'';
-    sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by'';
-  };
-    
-  packageName = "hu.dwim.def";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL
-    http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL
-    FILENAME hu.dwim.def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
-    (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
-     hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index b358ff0562d..b0c127e97e6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu_dot_dwim_dot_asdf'';
-  version = ''20170516-darcs'';
+  version = ''20170630-darcs'';
 
   description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
 
-  deps = [ ];
+  deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz'';
-    sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz'';
+    sha256 = ''151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb'';
   };
     
   packageName = "hu.dwim.asdf";
@@ -31,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
-    0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5
-    041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu_dot_dwim_dot_asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
-    (hu.dwim.asdf.documentation)) */
+    151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz MD5
+    b086cb36b6a88641497b20c39937c9d4 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION
+    20170630-darcs SIBLINGS (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
index 5e5e56be2e5..2dc7c45b39c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu_dot_dwim_dot_def'';
-  version = ''20170516-darcs'';
+  version = ''20170630-darcs'';
 
   description = ''General purpose, homogenous, extensible definer macro.'';
 
-  deps = [ ];
+  deps = [ args."metabang-bind" args."iterate" args."anaphora" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz'';
-    sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-06-30/hu.dwim.def-20170630-darcs.tgz'';
+    sha256 = ''0flqwj4lxwsl8yknhzzpa1jqr2iza3gnz3vxk645j4z81ynx1cjf'';
   };
     
   packageName = "hu.dwim.def";
@@ -30,8 +30,10 @@ rec {
     '';
   };
 }
-/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL
-    http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL
-    FILENAME hu_dot_dwim_dot_def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 0flqwj4lxwsl8yknhzzpa1jqr2iza3gnz3vxk645j4z81ynx1cjf URL
+    http://beta.quicklisp.org/archive/hu.dwim.def/2017-06-30/hu.dwim.def-20170630-darcs.tgz MD5 def7e4172cbf5ec86a5d51f644d71f81 NAME hu.dwim.def TESTNAME NIL
+    FILENAME hu_dot_dwim_dot_def DEPS
+    ((NAME metabang-bind FILENAME metabang-bind) (NAME iterate FILENAME iterate) (NAME anaphora FILENAME anaphora) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (metabang-bind iterate anaphora alexandria) VERSION 20170630-darcs SIBLINGS
     (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
      hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index e0a2d194f9e..320dcfb7a03 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hunchentoot'';
-  version = ''1.2.35'';
+  version = ''v1.2.37'';
 
   description = ''Hunchentoot is a HTTP server based on USOCKET and
   BORDEAUX-THREADS.  It supports HTTP 1.1, serves static files, has a
@@ -11,8 +11,8 @@ rec {
   deps = [ args."bordeaux-threads" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."flexi-streams" args."md5" args."rfc2388" args."trivial-backtrace" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz'';
-    sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74'';
+    url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz'';
+    sha256 = ''1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc'';
   };
     
   packageName = "hunchentoot";
@@ -37,9 +37,9 @@ rec {
   BORDEAUX-THREADS.  It supports HTTP 1.1, serves static files, has a
   simple framework for user-defined handlers and can be extended
   through subclassing.
-    SHA256 0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74 URL http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz MD5
-    d1ce17dec454cab119c0f263e8a176d1 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS
+    SHA256 1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc URL http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz MD5
+    3fd6a6c4dd0d32db7b71828b52494325 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS
     ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64)
      (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME md5 FILENAME md5)
      (NAME rfc2388 FILENAME rfc2388) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME usocket FILENAME usocket))
-    DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION 1.2.35 SIBLINGS NIL) */
+    DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION v1.2.37 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index 404c7a5dee9..ba7ed0ab7d7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''iolib'';
-  version = ''v0.8.2'';
+  version = ''v0.8.3'';
 
   description = ''I/O library.'';
 
-  deps = [ ];
+  deps = [ args."iolib_slash_streams" args."iolib_slash_sockets" args."iolib_slash_multiplex" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz'';
-    sha256 = ''1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
   };
     
   packageName = "iolib";
@@ -30,6 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr URL
-    http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz MD5 cd2d4d2893b7e6d0502d9a16e717a2e9 NAME iolib TESTNAME NIL FILENAME iolib DEPS NIL
-    DEPENDENCIES NIL VERSION v0.8.2 SIBLINGS (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
+/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib TESTNAME NIL FILENAME iolib DEPS
+    ((NAME iolib/streams FILENAME iolib_slash_streams) (NAME iolib/sockets FILENAME iolib_slash_sockets) (NAME iolib/multiplex FILENAME iolib_slash_multiplex))
+    DEPENDENCIES (iolib/streams iolib/sockets iolib/multiplex) VERSION v0.8.3 SIBLINGS
+    (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
new file mode 100644
index 00000000000..a0d26182a8e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_multiplex'';
+  version = ''iolib-v0.8.3'';
+
+  description = ''I/O multiplexing library.'';
+
+  deps = [ args."iolib_slash_syscalls" args."cffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+  };
+    
+  packageName = "iolib/multiplex";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/multiplex[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM iolib/multiplex DESCRIPTION I/O multiplexing library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/multiplex TESTNAME NIL FILENAME
+    iolib_slash_multiplex DEPS ((NAME iolib/syscalls FILENAME iolib_slash_syscalls) (NAME cffi FILENAME cffi)) DEPENDENCIES (iolib/syscalls cffi) VERSION
+    iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
new file mode 100644
index 00000000000..a6088dabf97
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
@@ -0,0 +1,39 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_sockets'';
+  version = ''iolib-v0.8.3'';
+
+  description = ''Socket library.'';
+
+  deps = [ args."swap-bytes" args."iolib_slash_syscalls" args."iolib_slash_streams" args."idna" args."cffi" args."bordeaux-threads" args."babel" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+  };
+    
+  packageName = "iolib/sockets";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/sockets[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM iolib/sockets DESCRIPTION Socket library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/sockets TESTNAME NIL FILENAME
+    iolib_slash_sockets DEPS
+    ((NAME swap-bytes FILENAME swap-bytes) (NAME iolib/syscalls FILENAME iolib_slash_syscalls) (NAME iolib/streams FILENAME iolib_slash_streams)
+     (NAME idna FILENAME idna) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME babel FILENAME babel))
+    DEPENDENCIES (swap-bytes iolib/syscalls iolib/streams idna cffi bordeaux-threads babel) VERSION iolib-v0.8.3 SIBLINGS
+    (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
new file mode 100644
index 00000000000..9caebf0db26
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_streams'';
+  version = ''iolib-v0.8.3'';
+
+  description = ''Gray streams.'';
+
+  deps = [ args."iolib_slash_multiplex" args."cffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+  };
+    
+  packageName = "iolib/streams";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/streams[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM iolib/streams DESCRIPTION Gray streams. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/streams TESTNAME NIL FILENAME
+    iolib_slash_streams DEPS ((NAME iolib/multiplex FILENAME iolib_slash_multiplex) (NAME cffi FILENAME cffi)) DEPENDENCIES (iolib/multiplex cffi) VERSION
+    iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
new file mode 100644
index 00000000000..0ef71a6a95c
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_slash_syscalls'';
+  version = ''iolib-v0.8.3'';
+
+  description = ''Syscalls and foreign types.'';
+
+  deps = [ args."trivial-features" args."cffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+  };
+    
+  packageName = "iolib/syscalls";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/syscalls[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM iolib/syscalls DESCRIPTION Syscalls and foreign types. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/syscalls TESTNAME NIL FILENAME
+    iolib_slash_syscalls DEPS ((NAME trivial-features FILENAME trivial-features) (NAME cffi FILENAME cffi)) DEPENDENCIES (trivial-features cffi) VERSION
+    iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 944781947fa..6d8e3c4fb0a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -5,10 +5,10 @@ rec {
 
   description = ''A cryptographic toolkit written in pure Common Lisp'';
 
-  deps = [ ];
+  deps = [ args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz'';
+    url = ''http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz'';
     sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0'';
   };
     
@@ -31,5 +31,5 @@ rec {
   };
 }
 /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL
-    http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad TESTNAME NIL FILENAME ironclad
-    DEPS NIL DEPENDENCIES NIL VERSION v0.34 SIBLINGS (ironclad-text)) */
+    http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad TESTNAME NIL FILENAME ironclad
+    DEPS ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.34 SIBLINGS (ironclad-text)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
index 3d2da3fa6bc..93e6782f163 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ixf'';
-  version = ''cl-20170516-git'';
+  version = ''cl-20170630-git'';
 
   description = ''Tools to handle IBM PC version of IXF file format'';
 
-  deps = [ ];
+  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."ieee-floats" args."local-time" args."md5" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz'';
-    sha256 = ''0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf'';
+    url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz'';
+    sha256 = ''1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2'';
   };
     
   packageName = "ixf";
@@ -30,6 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format SHA256 0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf URL
-    http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz MD5 1c4c5ff76bb6fa9c19fe47d064c512b9 NAME ixf TESTNAME NIL FILENAME ixf DEPS
-    NIL DEPENDENCIES NIL VERSION cl-20170516-git SIBLINGS NIL) */
+/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format SHA256 1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2 URL
+    http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz MD5 51db2caba094cac90982396cf552c847 NAME ixf TESTNAME NIL FILENAME ixf DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME ieee-floats FILENAME ieee-floats)
+     (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5) (NAME split-sequence FILENAME split-sequence))
+    DEPENDENCIES (alexandria babel cl-ppcre ieee-floats local-time md5 split-sequence) VERSION cl-20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 841c210a5ae..b86efb3d8ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''jonathan'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
 
-  deps = [ ];
+  deps = [ args."trivial-types" args."proc-parse" args."fast-io" args."cl-syntax-annot" args."cl-syntax" args."cl-ppcre" args."cl-annot" args."babel" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz'';
-    sha256 = ''00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q'';
+    url = ''http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz'';
+    sha256 = ''0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm'';
   };
     
   packageName = "jonathan";
@@ -31,5 +31,9 @@ rec {
   };
 }
 /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256
-    00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q URL http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz MD5
-    b05ccc0140e70636240f216fdc14e4d3 NAME jonathan TESTNAME NIL FILENAME jonathan DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (jonathan-test)) */
+    0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm URL http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz MD5
+    5d82723835164f4e3d9c4d031322eb98 NAME jonathan TESTNAME NIL FILENAME jonathan DEPS
+    ((NAME trivial-types FILENAME trivial-types) (NAME proc-parse FILENAME proc-parse) (NAME fast-io FILENAME fast-io)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-annot FILENAME cl-annot)
+     (NAME babel FILENAME babel))
+    DEPENDENCIES (trivial-types proc-parse fast-io cl-syntax-annot cl-syntax cl-ppcre cl-annot babel) VERSION 20170630-git SIBLINGS (jonathan-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
new file mode 100644
index 00000000000..5023dc63d42
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -0,0 +1,39 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lack-middleware-backtrace'';
+  version = ''lack-20170725-git'';
+
+  description = '''';
+
+  deps = [ args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz'';
+    sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp'';
+  };
+    
+  packageName = "lack-middleware-backtrace";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-middleware-backtrace[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
+    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 ab71d36ac49e4759806e9a2ace50ae53 NAME lack-middleware-backtrace TESTNAME NIL
+    FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION lack-20170725-git SIBLINGS
+    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session
+     lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util lack
+     t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
+     t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
new file mode 100644
index 00000000000..ea5ddc3f96b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -0,0 +1,40 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lack-util'';
+  version = ''lack-20170725-git'';
+
+  description = '''';
+
+  deps = [ args."ironclad" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz'';
+    sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp'';
+  };
+    
+  packageName = "lack-util";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-util[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM lack-util DESCRIPTION NIL SHA256 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
+    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 ab71d36ac49e4759806e9a2ace50ae53 NAME lack-util TESTNAME NIL FILENAME lack-util
+    DEPS ((NAME ironclad FILENAME ironclad)) DEPENDENCIES (ironclad) VERSION lack-20170725-git SIBLINGS
+    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
+     lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test
+     lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf
+     t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util
+     t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 2e8c2fe291f..0b1c36d7356 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack'';
-  version = ''20161204-git'';
+  version = ''20170725-git'';
 
   description = ''A minimal Clack'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
-    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
+    url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz'';
+    sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp'';
   };
     
   packageName = "lack";
@@ -30,9 +30,9 @@ rec {
     '';
   };
 }
-/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
-    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack TESTNAME NIL FILENAME lack DEPS NIL
-    DEPENDENCIES NIL VERSION 20161204-git SIBLINGS
+/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
+    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 ab71d36ac49e4759806e9a2ace50ae53 NAME lack TESTNAME NIL FILENAME lack DEPS NIL
+    DEPENDENCIES NIL VERSION 20170725-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test
      lack-util-writer-stream lack-util t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
new file mode 100644
index 00000000000..49ec6901fd9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lisp-namespace'';
+  version = ''20170630-git'';
+
+  description = ''Provides LISP-N --- extensible namespaces in Common Lisp.'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz'';
+    sha256 = ''06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n'';
+  };
+    
+  packageName = "lisp-namespace";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lisp-namespace[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM lisp-namespace DESCRIPTION Provides LISP-N --- extensible namespaces in Common Lisp. SHA256 06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n URL
+    http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz MD5 f3379a60f7cc896a7cff384ff25a1de5 NAME lisp-namespace
+    TESTNAME NIL FILENAME lisp-namespace DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170630-git SIBLINGS
+    (lisp-namespace.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 0740ec0779f..1291499be3d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''local-time'';
-  version = ''20170516-git'';
+  version = ''20170725-git'';
 
   description = ''A library for manipulating dates and times, based on a paper by Erik Naggum'';
 
-  deps = [ ];
+  deps = [ args."cl-fad" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz'';
-    sha256 = ''0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p'';
+    url = ''http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz'';
+    sha256 = ''05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9'';
   };
     
   packageName = "local-time";
@@ -31,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256
-    0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p URL http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz MD5
-    b2f5b94458f34f4b73cdd614e1304a9a NAME local-time TESTNAME NIL FILENAME local-time DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
-    (cl-postgres+local-time local-time.test)) */
+    05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9 URL http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz MD5
+    77a79ed1036bc3547f5174f2256c8e93 NAME local-time TESTNAME NIL FILENAME local-time DEPS ((NAME cl-fad FILENAME cl-fad)) DEPENDENCIES (cl-fad) VERSION
+    20170725-git SIBLINGS (cl-postgres+local-time local-time.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 51c8af197fc..e5224fff18c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lquery'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
 
-  deps = [ ];
+  deps = [ args."plump" args."form-fiddle" args."clss" args."array-utils" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz'';
-    sha256 = ''11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7'';
+    url = ''http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz'';
+    sha256 = ''19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm'';
   };
     
   packageName = "lquery";
@@ -30,6 +30,7 @@ rec {
     '';
   };
 }
-/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7 URL
-    http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz MD5 2190045b167685bfffdd01f5af9aa9a1 NAME lquery TESTNAME NIL FILENAME lquery
-    DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (lquery-test)) */
+/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm URL
+    http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz MD5 aeb03cb5174d682092683da488531a9c NAME lquery TESTNAME NIL FILENAME lquery
+    DEPS ((NAME plump FILENAME plump) (NAME form-fiddle FILENAME form-fiddle) (NAME clss FILENAME clss) (NAME array-utils FILENAME array-utils)) DEPENDENCIES
+    (plump form-fiddle clss array-utils) VERSION 20170630-git SIBLINGS (lquery-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 1384799d242..c5d86ebb703 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''md5'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''The MD5 Message-Digest Algorithm RFC 1321'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz'';
-    sha256 = ''1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv'';
+    url = ''http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz'';
+    sha256 = ''0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx'';
   };
     
   packageName = "md5";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv URL
-    http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz MD5 1c90df8ab2c6d57b7abaac84cae30ab3 NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
-    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx URL
+    http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz MD5 c6a5b3ca5a23fad3dfde23963db84910 NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
+    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
new file mode 100644
index 00000000000..044ce4d9358
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''misc-extensions'';
+  version = ''20150608-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz'';
+    sha256 = ''0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj'';
+  };
+    
+  packageName = "misc-extensions";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/misc-extensions[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM misc-extensions DESCRIPTION NIL SHA256 0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL
+    http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions
+    TESTNAME NIL FILENAME misc-extensions DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
index 3586d5cc21b..8d5450803ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''mssql'';
-  version = ''cl-20131003-git'';
+  version = ''cl-20170630-git'';
 
   description = '''';
 
   deps = [ args."cffi" args."garbage-pools" args."iterate" args."parse-number" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz'';
-    sha256 = ''1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk'';
+    url = ''http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz'';
+    sha256 = ''0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy'';
   };
     
   packageName = "mssql";
@@ -30,7 +30,7 @@ rec {
     '';
   };
 }
-/* (SYSTEM mssql DESCRIPTION NIL SHA256 1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk URL
-    http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz MD5 3e9d85a3b0ae7e000723a857ce7c2d44 NAME mssql TESTNAME NIL FILENAME mssql
+/* (SYSTEM mssql DESCRIPTION NIL SHA256 0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy URL
+    http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz MD5 88e65c72923896df603ecf20039ae305 NAME mssql TESTNAME NIL FILENAME mssql
     DEPS ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number))
-    DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION cl-20131003-git SIBLINGS NIL) */
+    DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION cl-20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
new file mode 100644
index 00000000000..9b581d4f1cc
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''mt19937'';
+  version = ''1.1.1'';
+
+  description = ''Portable MT19937 Mersenne Twister random number generator'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz'';
+    sha256 = ''1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv'';
+  };
+    
+  packageName = "mt19937";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/mt19937[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM mt19937 DESCRIPTION Portable MT19937 Mersenne Twister random number generator SHA256 1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv URL
+    http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz MD5 54c63977b6d77abd66ebe0227b77c143 NAME mt19937 TESTNAME NIL FILENAME mt19937 DEPS
+    NIL DEPENDENCIES NIL VERSION 1.1.1 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
new file mode 100644
index 00000000000..b289feae883
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''net_dot_didierverna_dot_asdf-flv'';
+  version = ''asdf-flv-version-2.1'';
+
+  description = ''ASDF extension to provide support for file-local variables.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz'';
+    sha256 = ''12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc'';
+  };
+    
+  packageName = "net.didierverna.asdf-flv";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/net.didierverna.asdf-flv[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM net.didierverna.asdf-flv DESCRIPTION ASDF extension to provide support for file-local variables. SHA256
+    12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc URL http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz MD5
+    2b74b721b7e5335d2230d6b95fc6be56 NAME net.didierverna.asdf-flv TESTNAME NIL FILENAME net_dot_didierverna_dot_asdf-flv DEPS NIL DEPENDENCIES NIL VERSION
+    asdf-flv-version-2.1 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
index d5ef8606f49..ca1ad414d75 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''pgloader'';
-  version = ''3.3.2'';
+  version = ''v3.4.1'';
 
   description = ''Load data into PostgreSQL'';
 
   deps = [ args."abnf" args."alexandria" args."cl-base64" args."cl-csv" args."cl-fad" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."command-line-arguments" args."db3" args."drakma" args."esrap" args."flexi-streams" args."ixf" args."local-time" args."lparallel" args."metabang-bind" args."mssql" args."postmodern" args."py-configparser" args."qmynd" args."quri" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."uiop" args."usocket" args."uuid" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz'';
-    sha256 = ''1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv'';
+    url = ''http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz'';
+    sha256 = ''1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v'';
   };
     
   packageName = "pgloader";
@@ -30,8 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv URL
-    http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz MD5 fb72ca0db46b80a74b7b31dc5b27e1b8 NAME pgloader TESTNAME NIL FILENAME pgloader
+/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v URL
+    http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz MD5 6741f8e7d2d416942d5c4a1971576d33 NAME pgloader TESTNAME NIL FILENAME pgloader
     DEPS
     ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME cl-base64 FILENAME cl-base64) (NAME cl-csv FILENAME cl-csv)
      (NAME cl-fad FILENAME cl-fad) (NAME cl-log FILENAME cl-log) (NAME cl-markdown FILENAME cl-markdown) (NAME cl-postgres FILENAME cl-postgres)
@@ -44,4 +44,4 @@ rec {
     DEPENDENCIES
     (abnf alexandria cl-base64 cl-csv cl-fad cl-log cl-markdown cl-postgres cl-ppcre command-line-arguments db3 drakma esrap flexi-streams ixf local-time
      lparallel metabang-bind mssql postmodern py-configparser qmynd quri simple-date split-sequence sqlite trivial-backtrace uiop usocket uuid)
-    VERSION 3.3.2 SIBLINGS NIL) */
+    VERSION v3.4.1 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index d89e25f8819..e25b89b2cf4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''plump'';
-  version = ''20170516-git'';
+  version = ''20170725-git'';
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz'';
-    sha256 = ''0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8'';
+    url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz'';
+    sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72'';
   };
     
   packageName = "plump";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8
-    URL http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz MD5 917a4f25691b3087ce24fd52ee42b4be NAME plump TESTNAME NIL FILENAME plump
-    DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
+/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72
+    URL http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz MD5 e5e92dd177711a14753ee86961710458 NAME plump TESTNAME NIL FILENAME plump
+    DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
index 868aae61f6b..96d09bc7dc3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''py-configparser'';
-  version = ''20131003-svn'';
+  version = ''20170725-svn'';
 
   description = ''Common Lisp implementation of the Python ConfigParser module'';
 
   deps = [ args."parse-number" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz'';
-    sha256 = ''10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx'';
+    url = ''http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz'';
+    sha256 = ''08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr'';
   };
     
   packageName = "py-configparser";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx
-    URL http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz MD5 da697259b68f536bcb6b77933b55a5d9 NAME py-configparser
-    TESTNAME NIL FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) DEPENDENCIES (parse-number) VERSION 20131003-svn SIBLINGS NIL) */
+/* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr
+    URL http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz MD5 3486092bb1d56be05dab16036f288a74 NAME py-configparser
+    TESTNAME NIL FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) DEPENDENCIES (parse-number) VERSION 20170725-svn SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
index b9871752e58..b57bb0d1623 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''qmynd'';
-  version = ''20160208-git'';
+  version = ''20170630-git'';
 
   description = ''MySQL Native Driver'';
 
-  deps = [ args."usocket" args."trivial-gray-streams" args."salza2" args."list-of" args."ironclad" args."flexi-streams" args."cl+ssl" args."chipz" args."babel" ];
+  deps = [ args."usocket" args."trivial-gray-streams" args."list-of" args."ironclad" args."flexi-streams" args."babel" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz'';
-    sha256 = ''0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq'';
+    url = ''http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz'';
+    sha256 = ''01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi'';
   };
     
   packageName = "qmynd";
@@ -30,9 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq URL
-    http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz MD5 9483ba5330a4240a9d5a8016c16a0084 NAME qmynd TESTNAME NIL FILENAME qmynd DEPS
-    ((NAME usocket FILENAME usocket) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME salza2 FILENAME salza2) (NAME list-of FILENAME list-of)
-     (NAME ironclad FILENAME ironclad) (NAME flexi-streams FILENAME flexi-streams) (NAME cl+ssl FILENAME cl+ssl) (NAME chipz FILENAME chipz)
-     (NAME babel FILENAME babel))
-    DEPENDENCIES (usocket trivial-gray-streams salza2 list-of ironclad flexi-streams cl+ssl chipz babel) VERSION 20160208-git SIBLINGS (qmynd-test)) */
+/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi URL
+    http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz MD5 64776472d1e0c4c0e41a1b4a2a24167e NAME qmynd TESTNAME NIL FILENAME qmynd DEPS
+    ((NAME usocket FILENAME usocket) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME list-of FILENAME list-of)
+     (NAME ironclad FILENAME ironclad) (NAME flexi-streams FILENAME flexi-streams) (NAME babel FILENAME babel))
+    DEPENDENCIES (usocket trivial-gray-streams list-of ironclad flexi-streams babel) VERSION 20170630-git SIBLINGS (qmynd-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 6aa42000e73..952b8686dab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20170516-git'';
+  version = ''20170725-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
-  deps = [ ];
+  deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz'';
-    sha256 = ''0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz'';
+    sha256 = ''1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5'';
   };
     
   packageName = "stumpwm";
@@ -30,6 +30,7 @@ rec {
     '';
   };
 }
-/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659 URL
-    http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz MD5 ed076f733ef138aca3b04b3c3ff748f0 NAME stumpwm TESTNAME NIL FILENAME
-    stumpwm DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5 URL
+    http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz MD5 a7fb260c6572273c05b828299c0610ce NAME stumpwm TESTNAME NIL FILENAME
+    stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) DEPENDENCIES (alexandria cl-ppcre clx)
+    VERSION 20170725-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 05631ab2b93..ea9b21d6eac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''A very simple library to allow indentation hints for SWANK.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz'';
-    sha256 = ''0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma'';
+    url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz'';
+    sha256 = ''18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7'';
   };
     
   packageName = "trivial-indent";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma
-    URL http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz MD5 6c8bde35ec010645c8d585c272ae01e8 NAME trivial-indent
-    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7
+    URL http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz MD5 9f11cc1014be3e3ae588a3cd07315be6 NAME trivial-indent
+    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index f4a84b5ceef..f31e1bb0a3d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-mimes'';
-  version = ''20170516-git'';
+  version = ''20170630-git'';
 
   description = ''Tiny library to detect mime types in files.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz'';
-    sha256 = ''1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2'';
+    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz'';
+    sha256 = ''0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx'';
   };
     
   packageName = "trivial-mimes";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2 URL
-    http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz MD5 b9cbba4147647ded4042949db3c00f1e NAME trivial-mimes TESTNAME
-    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
+/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx URL
+    http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz MD5 5aecea17e102bd2dab7e71fecd1f8e44 NAME trivial-mimes TESTNAME
+    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 78085ff1762..67897d46958 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''uffi'';
-  version = ''20150923-git'';
+  version = ''20170630-git'';
 
   description = ''Universal Foreign Function Library for Common Lisp'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz'';
-    sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy'';
+    url = ''http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz'';
+    sha256 = ''1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf'';
   };
     
   packageName = "uffi";
@@ -30,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp SHA256 1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy URL
-    http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz MD5 84babed7d1633cf01610e81f027024da NAME uffi TESTNAME NIL FILENAME uffi DEPS NIL
-    DEPENDENCIES NIL VERSION 20150923-git SIBLINGS (uffi-tests)) */
+/* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp SHA256 1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf URL
+    http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz MD5 8ac448122b79a41ec2b0647f06af7c12 NAME uffi TESTNAME NIL FILENAME uffi DEPS NIL
+    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (uffi-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 579ad469cda..5f3bd02f90a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -8,7 +8,7 @@ rec {
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz'';
+    url = ''http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz'';
     sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v'';
   };
     
@@ -31,5 +31,5 @@ rec {
   };
 }
 /* (SYSTEM uiop DESCRIPTION NIL SHA256 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL
-    http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz MD5 3e9ef02ecf9005240b66552d85719700 NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
+    http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz MD5 3e9ef02ecf9005240b66552d85719700 NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
     DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 086a374d6e7..c04540aaaba 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''woo'';
-  version = ''20170227-git'';
+  version = ''20170725-git'';
 
   description = ''An asynchronous HTTP server written in Common Lisp'';
 
-  deps = [ ];
+  deps = [ args."vom" args."uiop" args."trivial-utf-8" args."swap-bytes" args."static-vectors" args."smart-buffer" args."quri" args."lev" args."fast-io" args."fast-http" args."clack-socket" args."cffi-grovel" args."cffi" args."bordeaux-threads" args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz'';
-    sha256 = ''0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1'';
+    url = ''http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz'';
+    sha256 = ''11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg'';
   };
     
   packageName = "woo";
@@ -30,6 +30,12 @@ rec {
     '';
   };
 }
-/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp SHA256 0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1 URL
-    http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz MD5 cc37270ad408e093bd28c025466d8f64 NAME woo TESTNAME NIL FILENAME woo DEPS NIL
-    DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (clack-handler-woo woo-test)) */
+/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp SHA256 11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg URL
+    http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz MD5 bd901d8dfa7df3d19c6da73ea101f65b NAME woo TESTNAME NIL FILENAME woo DEPS
+    ((NAME vom FILENAME vom) (NAME uiop FILENAME uiop) (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME swap-bytes FILENAME swap-bytes)
+     (NAME static-vectors FILENAME static-vectors) (NAME smart-buffer FILENAME smart-buffer) (NAME quri FILENAME quri) (NAME lev FILENAME lev)
+     (NAME fast-io FILENAME fast-io) (NAME fast-http FILENAME fast-http) (NAME clack-socket FILENAME clack-socket) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES
+    (vom uiop trivial-utf-8 swap-bytes static-vectors smart-buffer quri lev fast-io fast-http clack-socket cffi-grovel cffi bordeaux-threads alexandria)
+    VERSION 20170725-git SIBLINGS (clack-handler-woo woo-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 46262fb78f4..3b78ba6f79e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''An evented webserver for Common Lisp.'';
 
-  deps = [ ];
+  deps = [ args."alexandria" args."babel" args."blackbird" args."chunga" args."cl-async" args."cl-async-ssl" args."cl-fad" args."cl-ppcre" args."do-urlencode" args."fast-http" args."fast-io" args."quri" args."vom" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz'';
@@ -32,4 +32,10 @@ rec {
 }
 /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0 URL
     http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz MD5 aeb084106facdc9c8dab100c97e05b92 NAME wookie TESTNAME NIL FILENAME wookie
-    DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
+    DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME blackbird FILENAME blackbird) (NAME chunga FILENAME chunga)
+     (NAME cl-async FILENAME cl-async) (NAME cl-async-ssl FILENAME cl-async-ssl) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME do-urlencode FILENAME do-urlencode) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME quri FILENAME quri)
+     (NAME vom FILENAME vom))
+    DEPENDENCIES (alexandria babel blackbird chunga cl-async cl-async-ssl cl-fad cl-ppcre do-urlencode fast-http fast-io quri vom) VERSION 20170227-git
+    SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 74946f07f07..07b069f8b7b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -1,20 +1,24 @@
 3bmd
 alexandria
 array-utils
+asdf-system-connections
 babel
 blackbird
 bordeaux-threads
 caveman
 cffi
+cffi-grovel
 chipz
 circular-streams
 clack
 clack-v1-compat
+cl-ansi-text
 cl-async
 cl-async-base
 cl-async-repl
 cl-async-ssl
 cl-base64
+cl-cli
 cl-colors
 cl-cookie
 cl-dbi
@@ -58,8 +62,10 @@ esrap
 external-program
 fast-http
 fast-io
+fiveam
 flexi-streams
 form-fiddle
+fset
 http-body
 hu.dwim.asdf
 hu.dwim.def
@@ -70,10 +76,14 @@ iolib
 ironclad
 iterate
 lack
+let-plus
 lev
+lisp-namespace
 local-time
 lquery
 marshal
+misc-extensions
+mt19937
 nibbles
 optima
 parenscript
@@ -82,6 +92,7 @@ pgloader
 plump
 proc-parse
 prove
+prove
 query-fs
 quri
 salza2
@@ -95,6 +106,7 @@ trivial-indent
 trivial-mimes
 trivial-types
 trivial-utf-8
+uffi
 usocket
 woo
 wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index c87b827112c..a257b7095cb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,14 +6,6 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
-  "asdf-system-connections" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."asdf-system-connections" or (x: {}))
-       (import ./quicklisp-to-nix-output/asdf-system-connections.nix {
-         inherit fetchurl;
-       }));
-
-
   "closure-common" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."closure-common" or (x: {}))
@@ -84,6 +76,16 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "iolib_slash_syscalls" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib_slash_syscalls" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_syscalls.nix {
+         inherit fetchurl;
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+
+
   "cxml-xml" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cxml-xml" or (x: {}))
@@ -100,6 +102,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel-streams" or (x: {}))
        (import ./quicklisp-to-nix-output/babel-streams.nix {
          inherit fetchurl;
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -111,13 +115,11 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl-ansi-text" = buildLispPackage
+  "clack-socket" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cl-ansi-text" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-ansi-text.nix {
+       (qlOverrides."clack-socket" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack-socket.nix {
          inherit fetchurl;
-           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -146,12 +148,9 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "usocket" = quicklisp-to-nix-packages."usocket";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "salza2" = quicklisp-to-nix-packages."salza2";
            "list-of" = quicklisp-to-nix-packages."list-of";
            "ironclad" = quicklisp-to-nix-packages."ironclad";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
-           "chipz" = quicklisp-to-nix-packages."chipz";
            "babel" = quicklisp-to-nix-packages."babel";
        }));
 
@@ -202,6 +201,13 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."ixf" or (x: {}))
        (import ./quicklisp-to-nix-output/ixf.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "ieee-floats" = quicklisp-to-nix-packages."ieee-floats";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
        }));
 
 
@@ -264,6 +270,41 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "iolib_slash_multiplex" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib_slash_multiplex" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_multiplex.nix {
+         inherit fetchurl;
+           "iolib_slash_syscalls" = quicklisp-to-nix-packages."iolib_slash_syscalls";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+
+
+  "iolib_slash_sockets" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib_slash_sockets" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_sockets.nix {
+         inherit fetchurl;
+           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
+           "iolib_slash_syscalls" = quicklisp-to-nix-packages."iolib_slash_syscalls";
+           "iolib_slash_streams" = quicklisp-to-nix-packages."iolib_slash_streams";
+           "idna" = quicklisp-to-nix-packages."idna";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "babel" = quicklisp-to-nix-packages."babel";
+       }));
+
+
+  "iolib_slash_streams" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib_slash_streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_slash_streams.nix {
+         inherit fetchurl;
+           "iolib_slash_multiplex" = quicklisp-to-nix-packages."iolib_slash_multiplex";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+
+
   "rfc2388" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."rfc2388" or (x: {}))
@@ -284,6 +325,30 @@ let quicklisp-to-nix-packages = rec {
     ((f: x: (x // (f x)))
        (qlOverrides."jonathan" or (x: {}))
        (import ./quicklisp-to-nix-output/jonathan.nix {
+         inherit fetchurl;
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "babel" = quicklisp-to-nix-packages."babel";
+       }));
+
+
+  "net_dot_didierverna_dot_asdf-flv" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {}))
+       (import ./quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix {
+         inherit fetchurl;
+       }));
+
+
+  "puri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."puri" or (x: {}))
+       (import ./quicklisp-to-nix-output/puri.nix {
          inherit fetchurl;
        }));
 
@@ -297,14 +362,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "puri" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."puri" or (x: {}))
-       (import ./quicklisp-to-nix-output/puri.nix {
-         inherit fetchurl;
-       }));
-
-
   "sqlite" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."sqlite" or (x: {}))
@@ -374,6 +431,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-paths-ttf" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-paths-ttf.nix {
          inherit fetchurl;
+           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
        }));
 
 
@@ -385,6 +443,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-unicode_slash_base" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-unicode_slash_base" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-unicode_slash_base.nix {
+         inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+       }));
+
+
   "cl-markup" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-markup" or (x: {}))
@@ -418,14 +485,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "uffi" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."uffi" or (x: {}))
-       (import ./quicklisp-to-nix-output/uffi.nix {
-         inherit fetchurl;
-       }));
-
-
   "metabang-bind" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."metabang-bind" or (x: {}))
@@ -452,25 +511,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cffi-grovel" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cffi-grovel" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi-grovel.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-       }));
-
-
-  "let-plus" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."let-plus" or (x: {}))
-       (import ./quicklisp-to-nix-output/let-plus.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-       }));
-
-
   "cl-async-util" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-async-util" or (x: {}))
@@ -485,6 +525,24 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "lack-middleware-backtrace" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-middleware-backtrace" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix {
+         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
+  "lack-util" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-util" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-util.nix {
+         inherit fetchurl;
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+       }));
+
+
   "trivial-gray-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-gray-streams" or (x: {}))
@@ -493,14 +551,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "trivial-features" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-features" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-features.nix {
-         inherit fetchurl;
-       }));
-
-
   "uiop" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."uiop" or (x: {}))
@@ -571,6 +621,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivial-features" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-features" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-features.nix {
+         inherit fetchurl;
+       }));
+
+
   "yason" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."yason" or (x: {}))
@@ -602,6 +660,19 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."wookie" or (x: {}))
        (import ./quicklisp-to-nix-output/wookie.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "blackbird" = quicklisp-to-nix-packages."blackbird";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "cl-async" = quicklisp-to-nix-packages."cl-async";
+           "cl-async-ssl" = quicklisp-to-nix-packages."cl-async-ssl";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "do-urlencode" = quicklisp-to-nix-packages."do-urlencode";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "vom" = quicklisp-to-nix-packages."vom";
        }));
 
 
@@ -610,6 +681,21 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."woo" or (x: {}))
        (import ./quicklisp-to-nix-output/woo.nix {
          inherit fetchurl;
+           "vom" = quicklisp-to-nix-packages."vom";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
+           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "lev" = quicklisp-to-nix-packages."lev";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "clack-socket" = quicklisp-to-nix-packages."clack-socket";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -622,6 +708,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "uffi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."uffi" or (x: {}))
+       (import ./quicklisp-to-nix-output/uffi.nix {
+         inherit fetchurl;
+       }));
+
+
   "trivial-utf-8" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-utf-8" or (x: {}))
@@ -676,6 +770,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."stumpwm" or (x: {}))
        (import ./quicklisp-to-nix-output/stumpwm.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "clx" = quicklisp-to-nix-packages."clx";
        }));
 
 
@@ -851,6 +948,22 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "mt19937" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."mt19937" or (x: {}))
+       (import ./quicklisp-to-nix-output/mt19937.nix {
+         inherit fetchurl;
+       }));
+
+
+  "misc-extensions" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."misc-extensions" or (x: {}))
+       (import ./quicklisp-to-nix-output/misc-extensions.nix {
+         inherit fetchurl;
+       }));
+
+
   "marshal" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."marshal" or (x: {}))
@@ -864,6 +977,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lquery" or (x: {}))
        (import ./quicklisp-to-nix-output/lquery.nix {
          inherit fetchurl;
+           "plump" = quicklisp-to-nix-packages."plump";
+           "form-fiddle" = quicklisp-to-nix-packages."form-fiddle";
+           "clss" = quicklisp-to-nix-packages."clss";
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
        }));
 
 
@@ -872,6 +989,16 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."local-time" or (x: {}))
        (import ./quicklisp-to-nix-output/local-time.nix {
          inherit fetchurl;
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+       }));
+
+
+  "lisp-namespace" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lisp-namespace" or (x: {}))
+       (import ./quicklisp-to-nix-output/lisp-namespace.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -884,6 +1011,16 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "let-plus" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."let-plus" or (x: {}))
+       (import ./quicklisp-to-nix-output/let-plus.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+       }));
+
+
   "lack" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."lack" or (x: {}))
@@ -905,6 +1042,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."ironclad" or (x: {}))
        (import ./quicklisp-to-nix-output/ironclad.nix {
          inherit fetchurl;
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
        }));
 
 
@@ -913,6 +1051,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."iolib" or (x: {}))
        (import ./quicklisp-to-nix-output/iolib.nix {
          inherit fetchurl;
+           "iolib_slash_streams" = quicklisp-to-nix-packages."iolib_slash_streams";
+           "iolib_slash_sockets" = quicklisp-to-nix-packages."iolib_slash_sockets";
+           "iolib_slash_multiplex" = quicklisp-to-nix-packages."iolib_slash_multiplex";
        }));
 
 
@@ -957,6 +1098,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."hu_dot_dwim_dot_def" or (x: {}))
        (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix {
          inherit fetchurl;
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -965,6 +1110,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."hu_dot_dwim_dot_asdf" or (x: {}))
        (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix {
          inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -984,11 +1130,22 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "fset" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."fset" or (x: {}))
+       (import ./quicklisp-to-nix-output/fset.nix {
+         inherit fetchurl;
+           "misc-extensions" = quicklisp-to-nix-packages."misc-extensions";
+           "mt19937" = quicklisp-to-nix-packages."mt19937";
+       }));
+
+
   "form-fiddle" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."form-fiddle" or (x: {}))
        (import ./quicklisp-to-nix-output/form-fiddle.nix {
          inherit fetchurl;
+           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
        }));
 
 
@@ -1001,11 +1158,25 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "fiveam" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."fiveam" or (x: {}))
+       (import ./quicklisp-to-nix-output/fiveam.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "net_dot_didierverna_dot_asdf-flv" = quicklisp-to-nix-packages."net_dot_didierverna_dot_asdf-flv";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+       }));
+
+
   "fast-io" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."fast-io" or (x: {}))
        (import ./quicklisp-to-nix-output/fast-io.nix {
          inherit fetchurl;
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1014,6 +1185,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."fast-http" or (x: {}))
        (import ./quicklisp-to-nix-output/fast-http.nix {
          inherit fetchurl;
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1031,6 +1208,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."esrap" or (x: {}))
        (import ./quicklisp-to-nix-output/esrap.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1055,6 +1233,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."documentation-utils" or (x: {}))
        (import ./quicklisp-to-nix-output/documentation-utils.nix {
          inherit fetchurl;
+           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
        }));
 
 
@@ -1063,6 +1242,22 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."dexador" or (x: {}))
        (import ./quicklisp-to-nix-output/dexador.nix {
          inherit fetchurl;
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1189,6 +1384,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-unicode" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-unicode.nix {
          inherit fetchurl;
+           "cl-unicode_slash_base" = quicklisp-to-nix-packages."cl-unicode_slash_base";
        }));
 
 
@@ -1235,9 +1431,11 @@ let quicklisp-to-nix-packages = rec {
            "uiop" = quicklisp-to-nix-packages."uiop";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1246,6 +1444,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clss" or (x: {}))
        (import ./quicklisp-to-nix-output/clss.nix {
          inherit fetchurl;
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
+           "plump" = quicklisp-to-nix-packages."plump";
        }));
 
 
@@ -1294,6 +1494,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-ppcre-template" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-ppcre-template.nix {
          inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
        }));
 
 
@@ -1391,6 +1592,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-emb" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-emb.nix {
          inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
        }));
 
 
@@ -1425,6 +1627,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-cli" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-cli" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-cli.nix {
+         inherit fetchurl;
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+       }));
+
+
   "cl-base64" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-base64" or (x: {}))
@@ -1481,11 +1692,39 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-ansi-text" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-ansi-text" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-ansi-text.nix {
+         inherit fetchurl;
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
   "clack-v1-compat" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clack-v1-compat" or (x: {}))
        (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
          inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "marshal" = quicklisp-to-nix-packages."marshal";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "http-body" = quicklisp-to-nix-packages."http-body";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1494,6 +1733,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack" or (x: {}))
        (import ./quicklisp-to-nix-output/clack.nix {
          inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1515,6 +1760,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cffi-grovel" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-grovel" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-grovel.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
   "cffi" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cffi" or (x: {}))
@@ -1567,6 +1821,16 @@ let quicklisp-to-nix-packages = rec {
     ((f: x: (x // (f x)))
        (qlOverrides."babel" or (x: {}))
        (import ./quicklisp-to-nix-output/babel.nix {
+         inherit fetchurl;
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "asdf-system-connections" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."asdf-system-connections" or (x: {}))
+       (import ./quicklisp-to-nix-output/asdf-system-connections.nix {
          inherit fetchurl;
        }));
 

From 42d93e97243fff340bab835f990cd06f06036f85 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Wed, 2 Aug 2017 08:12:55 +0200
Subject: [PATCH 1404/3246] restic: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 8f918dda59b..390727ec739 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "restic-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   goPackagePath = "github.com/restic/restic";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "1whzzma2c199i604qy1a807zhi8qgri1r9bbxl5l7wlfh7x0n6sd";
+    sha256 = "07614wp0b6kjl8lq3qir271g0s2h8wvpdh43wsz1k6bip60nmqbf";
   };
 
   buildPhase = ''

From bb6bbce00337a523a1b79194800c4622e8fabac7 Mon Sep 17 00:00:00 2001
From: Mark Cohen <m@mpc.sh>
Date: Wed, 2 Aug 2017 02:48:27 -0400
Subject: [PATCH 1405/3246] material-icons-ttf: init at 3.0.1

There was no package for this icon set, and now there is!
---
 lib/maintainers.nix                           |  1 +
 .../data/fonts/material-icons-ttf/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/data/fonts/material-icons-ttf/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e5286fa995e..f65420e93e9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -377,6 +377,7 @@
   MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>";
   mounium = "Katona László <muoniurn@gmail.com>";
   MP2E = "Cray Elliott <MP2E@archlinux.us>";
+  mpcsh = "Mark Cohen <m@mpc.sh>";
   mpscholten = "Marc Scholten <marc@mpscholten.de>";
   mpsyco = "Francis St-Amour <fr.st-amour@gmail.com>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
diff --git a/pkgs/data/fonts/material-icons-ttf/default.nix b/pkgs/data/fonts/material-icons-ttf/default.nix
new file mode 100644
index 00000000000..ea44c9c79b1
--- /dev/null
+++ b/pkgs/data/fonts/material-icons-ttf/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "material-icons-${version}";
+  version = "3.0.1";
+
+  src = fetchFromGitHub {
+    owner  = "google";
+    repo   = "material-design-icons";
+    rev    = "${version}";
+    sha256 = "17q5brcqyyc8gbjdgpv38p89s60cwxjlwy2ljnrvas5cj0s62np0";
+  };
+
+  buildCommand = ''
+    mkdir -p $out/share/fonts/truetype
+    cp $src/iconfont/*.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    description = "System status icons by Google, featuring material design";
+    homepage = https://material.io/icons;
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ mpcsh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dd9427c2ce..b74ee2cfd4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13034,6 +13034,8 @@ with pkgs;
 
   man-pages = callPackage ../data/documentation/man-pages { };
 
+  material-icons-ttf = callPackage ../data/fonts/material-icons-ttf { };
+
   meslo-lg = callPackage ../data/fonts/meslo-lg {};
 
   miscfiles = callPackage ../data/misc/miscfiles { };

From ce24f7f19238bb7cd447942217e64c0f6e408b87 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 2 Aug 2017 09:55:15 +0200
Subject: [PATCH 1406/3246] pythonPackages.django: 1.11.3 -> 1.11.4

This is a bugfix release.
See https://docs.djangoproject.com/en/1.11/releases/1.11.4/
---
 pkgs/development/python-modules/django/1_11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index 20f9d8505ab..cbdbb57181a 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -5,13 +5,13 @@
 buildPythonPackage rec {
   pname = "Django";
   name = "${pname}-${version}";
-  version = "1.11.3";
+  version = "1.11.4";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
-    sha256 = "0swgmwnfi6sa5fg5yxcs4k554cj9zp92w5n454xfsibjjl5dxycy";
+    sha256 = "1ckvq2sdlgpy2sqy6fwl84ms9dggvdbys9x76qapm2d9vmknxs5b";
   };
 
   patches = [

From 30f96ed2ba2bd78dd46d49177fad63097b41e60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Wed, 2 Aug 2017 10:56:16 +0200
Subject: [PATCH 1407/3246] gutenprint: 5.2.11 -> 5.2.13

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

diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index e53ddf7143b..430a5348398 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gutenprint-5.2.11";
+  name = "gutenprint-5.2.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/gimp-print/${name}.tar.bz2";
-    sha256 = "1yadw96rgp1z0jv1wxrz6cds36nb693w3xlv596xw9r5w394r8y1";
+    sha256 = "0hi7s0y59306p4kp06sankfa57k2805khbknkvl9d036hdfp9afr";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];

From 45fb1c94d776153ac94c0010afeeb7ced4e992fa Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Tue, 1 Aug 2017 20:32:17 -0700
Subject: [PATCH 1408/3246] fzf: 0.16.10 -> 0.16.11

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 11bc0ef4d11..5bf42fae9ea 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.16.10";
+  version = "0.16.11";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "0c9c9x2pim5g2jwy6jkdws2s7b1mw2qlnba1q46a1izswm7ljfq7";
+    sha256 = "1jm7v482ad85l627k7a265p2clzy2yk88hqqbjsihi53mj8agxa0";
   };
 
   outputs = [ "bin" "out" "man" ];

From 3906aac637e7e3c72cdd282564563ea0b4928edf Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 2 Aug 2017 12:48:05 +0000
Subject: [PATCH 1409/3246] varnish: Update to 5.1.2:
 https://varnish-cache.org/security/VSV00001.html

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

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 01dec302081..82bbe048e43 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -2,12 +2,12 @@
 , python, pythonPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "5.1.2";
+  version = "5.1.3";
   name = "varnish-${version}";
 
   src = fetchurl {
     url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
-    sha256 = "1qzwljdwp830l41nw4ils9hxly077zqn6wzhhmy8m516gq9min1r";
+    sha256 = "0km50hzjzi1kq85lr3hq519nrp261wb91ixq48vhyd41llycjfbl";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6e6271e82fba1e5aa0cd4649843c1c803af9115a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 2 Aug 2017 15:05:00 +0200
Subject: [PATCH 1410/3246] python.buildEnv: undo removal of passthru.python

---
 pkgs/development/interpreters/python/wrapper.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 71e9e614352..f95e51c82ee 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -39,6 +39,7 @@ let
 
     passthru = python.passthru // {
       interpreter = "${env}/bin/${python.executable}";
+      inherit python;
       env = stdenv.mkDerivation {
         name = "interactive-${python.name}-environment";
         nativeBuildInputs = [ env ];

From be0071c2d7053e994b30c6be373b87e9e8178b8e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Aug 2017 15:36:48 +0200
Subject: [PATCH 1411/3246] wiggle: fix build

After 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98, the environment variable STRIP
is defined to "strip" -- the path / name of the strip(1) executable -- , which
is not what wiggle's build system expects that variable to mean.
---
 pkgs/development/tools/wiggle/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix
index 5a97eb09e4b..ffa6d4aac0c 100644
--- a/pkgs/development/tools/wiggle/default.nix
+++ b/pkgs/development/tools/wiggle/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
 
   configurePhase = ''
     makeFlagsArray=( CFLAGS="-I. -O3"
+                     STRIP="-s"
                      INSTALL="install"
                      BINDIR="$out/bin"
                      MANDIR="$out/share/man"

From 5d91e806b9acca860a0e69c9a144e7a8618d0f2c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 2 Aug 2017 16:14:34 +0200
Subject: [PATCH 1412/3246] Revert "gnome-tweak-tool: fix eval"

This reverts commit d9521c3418adc7d8883c6965c0083e8b9486543a.

Cleaner fix in 6e6271e82fba1e5aa0cd4649843c1c803af9115a
---
 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
index 6268eaa3388..5a1baa5e330 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
                   gnome3.gnome_desktop wrapGAppsHook
                   python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
 
-  PYTHONPATH = "$out/${python2Packages.python.sitePackages}";
+  PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
 

From ed98241379758e6c739de089d5bfd0e76e343465 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 2 Aug 2017 18:07:39 +0200
Subject: [PATCH 1413/3246] libsodium: 1.0.12 -> 1.0.13

https://github.com/jedisct1/libsodium/releases/tag/1.0.13
---
 pkgs/development/libraries/libsodium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index b508b2fea0e..4fc1a5d2789 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.12";
+  name = "libsodium-1.0.13";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "159givfh5jgli3cifxgssivkklfyfq6lzyjgrx8h4jx5ncdqyr5q";
+    sha256 = "1z93wfg4k5svg8yck6cgdr6ysj91kbpn03nyzwxanncy3b5sq4ww";
   };
 
   outputs = [ "out" "dev" ];

From 0854c856783b1f7a84f9307ef0c812d27f43b518 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 2 Aug 2017 18:21:50 +0200
Subject: [PATCH 1414/3246] gnome3: Remove myself from maintainer list

---
 pkgs/desktops/gnome-3/3.22/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index e79b66bdedf..1944cc98cfb 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -14,7 +14,7 @@ let
   callPackage = pkgs.newScope self;
 
   version = "3.22";
-  maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ];
+  maintainers = with pkgs.lib.maintainers; [ lethalman ];
 
   corePackages = with gnome3; [
     pkgs.desktop_file_utils pkgs.ibus

From 4751fca48c2dd68d65dd6c60a4c13687b710d799 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 2 Aug 2017 19:24:14 +0200
Subject: [PATCH 1415/3246] tor: 0.3.0.9 -> 0.3.0.10

Fixes TPROXY on linux, fixes potential DOS on openbsd.
Otherwise mostly minor bugfixes.
---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 2555aeccea4..62438d1843b 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.3.0.9";
+  name = "tor-0.3.0.10";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "0hhyb1wil8japynqnm07r1f67w3wdnafdg9amzlrrcfcyq5qim28";
+    sha256 = "1cas30wk4bhcivi6l9dj7wwlz6pc2jj883x1vijax3b8l54nx3ls";
   };
 
   outputs = [ "out" "geoip" ];

From f64fb1cc0a9b561f9565ef112a193506697a3f46 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Aug 2017 02:39:41 +0300
Subject: [PATCH 1416/3246] mupdf: remove third-party libjpeg

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

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index a3e5f99eef6..914dc335145 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     # Don't remove mujs because upstream version is incompatible
-    rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+    rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
   '';
 
   postInstall = ''

From 0e7827e813a8bc332345ef816f8a6b91b4d34cd3 Mon Sep 17 00:00:00 2001
From: Joe Healy <joehealy@gmail.com>
Date: Thu, 3 Aug 2017 10:58:33 +1000
Subject: [PATCH 1417/3246] dropbox: 30.4.22 -> 31.4.24

Dropbox client required an update again.

Tested on x86_64, not tested on i686, but url fetched and updated.
---
 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 155c8787430..77b982d44c1 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -24,11 +24,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "30.4.22";
+  version = "31.4.24";
   sha256 =
     {
-      "x86_64-linux" = "0qc99j6hpd1k5bmvcll3rjglksrjw0mw2nrwj3s3kh55j6fy8a0r";
-      "i686-linux"   = "0zyl1q76cpwly4k7h4klnyrv50nyxi2wpz5sii1a00jbmr7snhab";
+      "x86_64-linux" = "195k8nq1ssrw6zxp78njclaj8a1cs73kika6b7pg58m5lr3qlqnm";
+      "i686-linux"   = "0rr4dxns9gkha42y0aqd7l657q9wxdzdkf3ckyiw9bh27y8jp36m";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 5d62d8775c77237b9d0917ff935d594abf3cd8b7 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 3 Aug 2017 03:05:36 +0200
Subject: [PATCH 1418/3246] modules/systemd: improve logind.extraConfig example

Since we have a .handleLidSwitch option now, give an other example.
---
 nixos/modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 46761fdc0e9..d12d0a06f44 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -593,7 +593,7 @@ in
     services.logind.extraConfig = mkOption {
       default = "";
       type = types.lines;
-      example = "HandleLidSwitch=ignore";
+      example = "IdleAction=lock";
       description = ''
         Extra config options for systemd-logind. See man logind.conf for
         available options.

From 72a64ea4f1f32d77b1fd34eb07efc904ae415f6b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 2 Aug 2017 16:16:42 +0800
Subject: [PATCH 1419/3246] nsswitch: add systemd module

In order for DynamicUser = true to work in services, we need the
nss-systemd module to be able to resolve the user and group names
generated dynamically.
---
 nixos/modules/config/nsswitch.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 16c43a99ad5..97278238dcd 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -28,7 +28,8 @@ let
   passwdArray = [ "files" ]
     ++ optional sssd "sss"
     ++ optionals ldap [ "ldap" ]
-    ++ optionals mymachines [ "mymachines" ];
+    ++ optionals mymachines [ "mymachines" ]
+    ++ [ "systemd" ];
 
   shadowArray = [ "files" ]
     ++ optional sssd "sss"

From cd4d0c72a8fccd1e943b66afc40225105bf63b47 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 3 Aug 2017 10:48:03 +0800
Subject: [PATCH 1420/3246] dropbox: 30.4.22 -> 31.4.24

---
 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 e97bdd906c5..f8766cca30b 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -24,11 +24,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "30.4.22";
+  version = "31.4.24";
   sha256 =
     {
-      "x86_64-linux" = "0qc99j6hpd1k5bmvcll3rjglksrjw0mw2nrwj3s3kh55j6fy8a0r";
-      "i686-linux"   = "0zyl1q76cpwly4k7h4klnyrv50nyxi2wpz5sii1a00jbmr7snhab";
+      "x86_64-linux" = "195k8nq1ssrw6zxp78njclaj8a1cs73kika6b7pg58m5lr3qlqnm";
+      "i686-linux"   = "0rr4dxns9gkha42y0aqd7l657q9wxdzdkf3ckyiw9bh27y8jp36m";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 0322f66307286f5377d4479938ed57fadaf8425a Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Wed, 2 Aug 2017 22:54:50 -0400
Subject: [PATCH 1421/3246] clementine: 1.2.3 -> 1.3.1

---
 .../clementine-1.2.1-include-paths.patch      | 14 --------
 .../clementine-dbus-namespace.patch           | 36 -------------------
 ...ntine-spotify-blob-remove-from-build.patch | 21 +++++++++++
 .../clementine/clementine-spotify-blob.patch  | 26 ++++----------
 .../applications/audio/clementine/default.nix | 36 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  3 +-
 6 files changed, 53 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch
 delete mode 100644 pkgs/applications/audio/clementine/clementine-dbus-namespace.patch
 create mode 100644 pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch

diff --git a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch b/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch
deleted file mode 100644
index 4c17846b99d..00000000000
--- a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt
---- clementine-1.2.1-a/CMakeLists.txt	2013-11-25 15:16:24.000000000 -0600
-+++ clementine-1.2.1-b/CMakeLists.txt	2013-12-30 17:01:48.470011058 -0600
-@@ -158,6 +158,10 @@
- include_directories(${TAGLIB_INCLUDE_DIRS})
- include_directories(${QJSON_INCLUDE_DIRS})
- include_directories(${GSTREAMER_INCLUDE_DIRS})
-+include_directories(${GSTREAMER_APP_INCLUDE_DIRS})
-+include_directories(${GSTREAMER_BASE_INCLUDE_DIRS})
-+include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS})
-+include_directories(${GSTREAMER_TAG_INCLUDE_DIRS})
- include_directories(${GLIB_INCLUDE_DIRS})
- include_directories(${GLIBCONFIG_INCLUDE_DIRS})
- include_directories(${LIBXML_INCLUDE_DIRS})
diff --git a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch b/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch
deleted file mode 100644
index 2240debd0e4..00000000000
--- a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
-From: Chocobozzz <florian.chocobo@gmail.com>
-Date: Wed, 16 Jul 2014 15:57:25 +0200
-Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
-
----
- src/CMakeLists.txt | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 650fa74..775b0a5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
- if(HAVE_DBUS)
-   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
- 
--  # Hack to get it to generate interfaces without namespaces - required
--  # because otherwise org::freedesktop::UDisks and
--  # org::freedesktop::UDisks::Device conflict.
--  list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
--
-   # MPRIS DBUS interfaces
-   qt4_add_dbus_adaptor(SOURCES
-       dbus/org.freedesktop.MediaPlayer.player.xml
-@@ -964,6 +959,10 @@ if(HAVE_DBUS)
- 
-   # DeviceKit DBUS interfaces
-   if(HAVE_DEVICEKIT)
-+    set_source_files_properties(dbus/org.freedesktop.UDisks.xml
-+        PROPERTIES NO_NAMESPACE dbus/udisks)
-+    set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
-+        PROPERTIES NO_NAMESPACE dbus/udisksdevice)
-     qt4_add_dbus_interface(SOURCES
-         dbus/org.freedesktop.UDisks.xml
-         dbus/udisks)
diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch
new file mode 100644
index 00000000000..226536a13ba
--- /dev/null
+++ b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23070d9..83b6772 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration"
+ optional_component(VISUALISATIONS ON "Visualisations")
+ 
+ if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
+-  message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
+-          "code must be compiled in")
+ elseif(CRYPTOPP_FOUND)
+   set(HAVE_CRYPTOPP ON)
+   set(HAVE_SPOTIFY_DOWNLOADER ON)
+@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD)
+ endif(HAVE_BREAKPAD)
+ 
+ if(HAVE_SPOTIFY_BLOB)
+-  add_subdirectory(ext/clementine-spotifyblob)
+ endif(HAVE_SPOTIFY_BLOB)
+ 
+ if(HAVE_MOODBAR)
diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
index d41720c9021..344fc31d70d 100644
--- a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
+++ b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
@@ -1,25 +1,13 @@
-From d9ebe7ec09a48b1ea505ccc33686b72642f083f4 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 4 May 2015 19:59:38 -0500
-Subject: [PATCH] Runtime selection of Spotify blob
-
----
- src/internet/spotifyservice.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotifyservice.cpp
-index 543744e..d987a36 100644
---- a/src/internet/spotifyservice.cpp
-+++ b/src/internet/spotifyservice.cpp
-@@ -65,7 +65,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)
+diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp
+index 88c7383..6e0893c 100644
+--- a/src/internet/spotify/spotifyservice.cpp
++++ b/src/internet/spotify/spotifyservice.cpp
+@@ -94,7 +94,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)
    system_blob_path_ = QCoreApplication::applicationDirPath() +
-       "/../PlugIns/clementine-spotifyblob";
+                       "/../PlugIns/clementine-spotifyblob";
  #else
 -  system_blob_path_ = QCoreApplication::applicationDirPath() +
 +  system_blob_path_ = qgetenv("CLEMENTINE_SPOTIFYBLOB") +
-       "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
+                       "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
  #endif
  
--- 
-2.3.6
-
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index c6e587b88a3..5b0d285f82d 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base
-, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
-, usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig
-, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
+{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
+, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
+, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, protobuf
+, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
 
 let
   withSpotify = config.clementine.spotify or false;
@@ -10,31 +10,36 @@ let
   withCD = config.clementine.cd or true;
   withCloud = config.clementine.cloud or true;
 
-  version = "1.2.3";
+  version = "1.3.1";
 
   exeName = "clementine";
 
   src = fetchurl {
-    url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;
-    sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
+    url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz;
+    sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq";
   };
 
   patches = [
-    ./clementine-1.2.1-include-paths.patch
-    ./clementine-dbus-namespace.patch
     ./clementine-spotify-blob.patch
+    # Required so as to avoid adding libspotify as a build dependency (as it is 
+    # unfree and thus would prevent us from having a free package).
+    ./clementine-spotify-blob-remove-from-build.patch
   ];
 
   buildInputs = [
     boost
     cmake
+    chromaprint
     fftw
     gettext
     glew
-    gst-plugins-base
-    gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
     gvfs
+    libechonest
     liblastfm
+    libpulseaudio
+    pcre
     pkgconfig
     protobuf
     qca2
@@ -71,7 +76,12 @@ let
   blob = stdenv.mkDerivation {
     name = "clementine-blob-${version}";
     # Use the same patches and sources as Clementine
-    inherit patches src;
+    inherit src;
+
+    patches = [
+      ./clementine-spotify-blob.patch
+    ];
+
     buildInputs = buildInputs ++ [ libspotify ];
     # Only build and install the Spotify blob
     preBuild = ''
@@ -119,7 +129,7 @@ runCommand "clementine-${version}"
   mkdir -p $out/bin
   makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \
       ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \
-      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
 
   mkdir -p $out/share
   for dir in applications icons kde4; do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dd9427c2ce..708d5b0e155 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1334,7 +1334,8 @@ with pkgs;
 
   clementine = callPackage ../applications/audio/clementine {
     boost = boost155;
-    gst_plugins = [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-ffmpeg ];
+    gst_plugins = 
+      with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ];
   };
 
   clementineFree = clementine.free;

From 7541f285e0cf66c55e7a9c2af6962a3c4d48f423 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 19:57:19 -0400
Subject: [PATCH 1422/3246] boringssl: 2016-03-08 -> 2017-02-23

Also, include libcrypto.a and libdecrepit.a.
---
 pkgs/development/libraries/boringssl/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index 3a537821298..ff48ffe67f0 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchgit, cmake, perl, go }:
 
+# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
 stdenv.mkDerivation rec {
   name = "boringssl-${version}";
-  version = "2016-03-08";
+  version = "2017-02-23";
 
   src = fetchgit {
     url    = "https://boringssl.googlesource.com/boringssl";
-    rev    = "bfb38b1a3c5e37d43188bbd02365a87bebc8d122";
-    sha256 = "0bm7vqg3bk716xmw2af99p44zizfhknq9z3cphf7klfdrr7ibqm5";
+    rev    = "be2ee342d3781ddb954f91f8a7e660c6f59e87e5";
+    sha256 = "022zq7wlkhrg6al7drr3555lam3zw5bb10ylf9mznp83s854f975";
   };
 
   buildInputs = [ cmake perl go ];
@@ -17,8 +18,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin $out/include $out/lib
 
-    mv tool/bssl    $out/bin
-    mv ssl/libssl.a $out/lib
+    mv tool/bssl $out/bin
+
+    mv ssl/libssl.a           $out/lib
+    mv crypto/libcrypto.a     $out/lib
+    mv decrepit/libdecrepit.a $out/lib
+
     mv ../include/openssl $out/include
   '';
 

From 3be19de8e4eba036d1c6ae81295beee1871a7fef Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 19:58:55 -0400
Subject: [PATCH 1423/3246] libevent: 2.0.22 -> 2.1.8

---
 .../libraries/libevent/default.nix            | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index d2ba84bb5dd..6fa0caa97e9 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,28 +1,14 @@
 { stdenv, fetchurl, openssl, findutils }:
 
-let version = "2.0.22"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libevent-${version}";
+  version = "2.1.8";
 
   src = fetchurl {
     url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz";
-    sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki";
+    sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n";
   };
 
-  prePatch = let
-      # https://lwn.net/Vulnerabilities/714581/
-      debian = fetchurl {
-        url = "http://http.debian.net/debian/pool/main/libe/libevent/"
-            + "libevent_2.0.21-stable-3.debian.tar.xz";
-        sha256 = "0b2syswiq3cvfbdvi4lbca15c31lilxnahax4a4b4qxi5fcab7h5";
-      };
-    in ''
-      tar xf '${debian}'
-      patches="$patches $(cat debian/patches/series | grep -v '^$\|^#' \
-                          | grep -v '^20d6d445.patch' \
-                          | grep -v '^dh-autoreconf' | sed 's|^|debian/patches/|')"
-    '';
-
   # libevent_openssl is moved into its own output, so that openssl isn't present
   # in the default closure.
   outputs = [ "out" "dev" "openssl" ];

From 958cdf37c1185447e5b1eecb26a700c78f4aa442 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 20:00:03 -0400
Subject: [PATCH 1424/3246] spdlog: 292bdc5eb492 -> 0.13.0

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

diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index 1c3952e7adf..a47eabe5d8d 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -2,14 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "spdlog-${version}";
-  version = stdenv.lib.strings.substring 0 7 rev;
-  rev = "292bdc5eb4929f183c78d2c67082b715306f81c9";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "gabime";
     repo = "spdlog";
-    inherit rev;
-    sha256 = "1b6b0c81a8hisaibqlzj5mrk3snrfl8p5sqa056q2f02i62zksbn";
+    rev = "v${version}";
+    sha256 = "0pfagrkq6afpkl269vbi1fd6ckakzpr5b5cbapb8rr7hgsrilxza";
   };
 
   buildInputs = [ cmake ];

From f281cfe76d30a3d1aa26c3c168d367900a995b58 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 20:02:16 -0400
Subject: [PATCH 1425/3246] backward: init at 1.3

A beautiful stack trace pretty printer for C++
---
 .../libraries/backward-cpp/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/backward-cpp/default.nix

diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix
new file mode 100644
index 00000000000..42621a1792c
--- /dev/null
+++ b/pkgs/development/libraries/backward-cpp/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "backward-${version}";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "bombela";
+    repo = "backward-cpp";
+    rev = "v${version}";
+    sha256 = "1nx77qamal53rq8qxsjzax6ljawb345a1v3cqmfwa0hx26srxcln";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/include
+    cp backward.hpp $out/include
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Beautiful stack trace pretty printer for C++";
+    homepage = "https://github.com/bombela/backward-cpp";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dd9427c2ce..3a659f97e3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7469,6 +7469,8 @@ with pkgs;
 
   babl = callPackage ../development/libraries/babl { };
 
+  backward-cpp = callPackage ../development/libraries/backward-cpp { };
+
   bctoolbox = callPackage ../development/libraries/bctoolbox {
     mbedtls = mbedtls_1_3;
   };

From cd2b6a94f779f2819b6345bc0718f6a780d84f1b Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 20:03:40 -0400
Subject: [PATCH 1426/3246] lightstep-tracer-cpp: init at 0.36

The LightStep distributed tracing library for C++.

See: http://lightstep.com
---
 .../lightstep-tracer-cpp/default.nix          | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/libraries/lightstep-tracer-cpp/default.nix

diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
new file mode 100644
index 00000000000..e13796229ce
--- /dev/null
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf3_2, automake
+, autoreconfHook, zlib
+, enableGrpc ? false
+}:
+
+let
+  # be sure to use the right revision based on the submodule!
+  common =
+    fetchFromGitHub {
+      owner = "lightstep";
+      repo = "lightstep-tracer-common";
+      rev = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded";
+      sha256 = "1qqpjxfrjmhnhs15nhbfv28fsgzi57vmfabxlzc99j4vl78h5iln";
+    };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "lightstep-tracer-cpp-${version}";
+  version = "0.36";
+
+  src = fetchFromGitHub {
+    owner = "lightstep";
+    repo = "lightstep-tracer-cpp";
+    rev = "v0_36";
+    sha256 = "1sfj91bn7gw7fga7xawag076c8j9l7kiwhm4x3zh17qhycmaqq16";
+  };
+
+  postUnpack = ''
+    cp -r ${common}/* $sourceRoot/lightstep-tracer-common
+  '';
+
+  preConfigure = lib.optionalString (!enableGrpc) ''
+    configureFlagsArray+=("--disable-grpc")
+  '';
+
+  nativeBuildInputs = [
+    pkgconfig automake autoreconfHook
+  ];
+
+  buildInputs = [
+    protobuf3_2 zlib
+  ];
+
+  meta = with lib; {
+    description = "Distributed tracing system built on top of the OpenTracing standard";
+    homepage = "http://lightstep.com/";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a659f97e3d..b3231c9954e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9381,6 +9381,8 @@ with pkgs;
 
   lightlocker = callPackage ../misc/screensavers/light-locker { };
 
+  lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { };
+
   linenoise = callPackage ../development/libraries/linenoise { };
 
   linenoise-ng = callPackage ../development/libraries/linenoise-ng { };

From 4fcc6da88957ca9311f252db95b6355fa3630c72 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 20:05:56 -0400
Subject: [PATCH 1427/3246] rapidjson: init at 1.1.0

A fast JSON parser/generator for C++ with both SAX/DOM style API.

See: http://rapidjson.org/
---
 .../libraries/rapidjson/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/rapidjson/default.nix

diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix
new file mode 100644
index 00000000000..5e9a11d4251
--- /dev/null
+++ b/pkgs/development/libraries/rapidjson/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "rapidjson-${version}";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "miloyip";
+    repo = "rapidjson";
+    rev = "v${version}";
+    sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab";
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  meta = with lib; {
+    description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";
+    homepage = "http://rapidjson.org/";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3231c9954e..b250b08d232 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10065,6 +10065,8 @@ with pkgs;
 
   rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {};
 
+  rapidjson = callPackage ../development/libraries/rapidjson {};
+
   raul = callPackage ../development/libraries/audio/raul { };
 
   readline = readline6;

From e50f3d37e9c30b1cea76344b0205d9376a3ab8a4 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 24 Jul 2017 20:06:52 -0400
Subject: [PATCH 1428/3246] envoy: init at 1.3.0

L7 proxy and communication bus designed for large modern service
oriented architectures.

See: https://lyft.github.io/envoy/
---
 pkgs/tools/networking/envoy/default.nix | 303 ++++++++++++++++++++++++
 pkgs/tools/networking/envoy/nixos.patch |  41 ++++
 pkgs/top-level/all-packages.nix         |   2 +
 3 files changed, 346 insertions(+)
 create mode 100644 pkgs/tools/networking/envoy/default.nix
 create mode 100644 pkgs/tools/networking/envoy/nixos.patch

diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix
new file mode 100644
index 00000000000..79a24ea1f8d
--- /dev/null
+++ b/pkgs/tools/networking/envoy/default.nix
@@ -0,0 +1,303 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, bazel, c-ares, backward-cpp
+, libevent, gtest, gperftools, http-parser, lightstep-tracer-cpp
+, nghttp2, protobuf3_2, tclap, rapidjson, spdlog, boringssl, buildEnv
+}:
+
+let
+  protobuf_bzl =
+    fetchFromGitHub {
+      owner = "htuch";
+      repo = "protobuf";
+      rev = "d490587268931da78c942a6372ef57bb53db80da";
+      sha256 = "100494s66xclw88bdnpb6d386vgw0gwz90sni37q7fqmi9w99z6v";
+    };
+
+  # Based on ci/prebuilt/BUILD
+  #
+  # The paths have been fixed up, and the static archives have been replaced
+  # with dynamic libraries where presently possible.
+  #
+  # At the moment, this doesn't _need_ to be a map that we dynamically create a
+  # BUILD file from (we could instead just include the contents directly);
+  # however, this sets us up to be ready if we (or upstream) decide to split
+  # things into multiple bazel repos, instead of one.
+  ccTargets = {
+    ares = {
+      pkg = c-ares;
+      srcs = ''["lib/libcares.so"]'';
+      hdrs = ''glob(["include/ares*.h"])'';
+      includes = ''["include"]'';
+    };
+
+    backward = {
+      pkg = backward-cpp;
+      hdrs = ''["include/backward.hpp"]'';
+      includes = ''["include"]'';
+    };
+
+    crypto = {
+      pkg = boringssl;
+      srcs = ''["lib/libcrypto.a"]'';
+      hdrs = ''glob(["include/openssl/**/*.h"])'';
+      includes = ''["include"]'';
+    };
+
+    event = {
+      pkg = libevent;
+      srcs = ''["lib/libevent.so"]'';
+      hdrs = ''glob(["include/event2/**/*.h"])'';
+      includes = ''["include"]'';
+    };
+
+    event_pthreads = {
+      pkg = libevent;
+      srcs = ''["lib/libevent_pthreads.so"]'';
+      deps = ''[":event"]'';
+    };
+
+    googletest = {
+      pkg = gtest;
+      srcs = ''[ "lib/libgmock.so", "lib/libgtest.so" ]'';
+      hdrs = ''glob(["include/gmock/**/*.h", "include/gtest/**/*.h"])'';
+      includes = ''["include"]'';
+    };
+
+    http_parser = {
+      pkg = http-parser;
+      srcs = ''["lib/libhttp_parser.so"]'';
+      hdrs = ''glob(["include/http_parser.h"])'';
+      includes = ''["include"]'';
+    };
+
+    lightstep = {
+      pkg = lightstep-tracer-cpp;
+      srcs = ''["lib/liblightstep_core_cxx11.a"]'';
+      hdrs = ''glob([ "include/lightstep/**/*.h", "include/mapbox_variant/**/*.hpp" ]) + [ "include/collector.pb.h", "include/lightstep_carrier.pb.h" ]'';
+      includes = ''["include"]'';
+      deps = ''[":protobuf"]'';
+    };
+
+    nghttp2 = {
+      pkg = nghttp2;
+      srcs = ''["lib/libnghttp2.so"]'';
+      hdrs = ''glob(["include/nghttp2/**/*.h"])'';
+      includes = ''["include"]'';
+    };
+
+    protobuf = {
+      pkg = protobuf3_2;
+      srcs = ''glob(["lib/libproto*.so"])'';
+      hdrs = ''glob(["include/google/protobuf/**/*.h"])'';
+      includes = ''["include"]'';
+    };
+
+    rapidjson = {
+      pkg = rapidjson;
+      hdrs = ''glob(["include/rapidjson/**/*.h"])'';
+      includes = ''["include"]'';
+    };
+
+    spdlog = {
+      pkg = spdlog;
+      name = "spdlog";
+      hdrs = ''glob([ "include/spdlog/**/*.cc", "include/spdlog/**/*.h" ])'';
+      includes = ''["include"]'';
+    };
+
+    ssl = {
+      pkg = boringssl;
+      srcs = ''["lib/libssl.a"]'';
+      deps = ''[":crypto"]'';
+    };
+
+    tclap = {
+      pkg = tclap;
+      hdrs = ''glob(["include/tclap/**/*.h"])'';
+      includes = ''["include"]'';
+    };
+
+    tcmalloc_and_profiler = {
+      pkg = gperftools;
+      srcs = ''["lib/libtcmalloc_and_profiler.so"]'';
+      hdrs = ''glob(["include/gperftools/**/*.h"])'';
+      strip_include_prefix = ''"include"'';
+    };
+  };
+
+  # Generate the BUILD file.
+  buildFile =
+    let field = name: attrs:
+      if attrs ? "${name}" then "    ${name} = ${attrs.${name}},\n" else "";
+    in
+    ''
+    licenses(["notice"])  # Apache 2
+
+    package(default_visibility = ["//visibility:public"])
+
+    '' +
+    lib.concatStringsSep "\n\n" (
+      lib.mapAttrsToList (name: value:
+          "cc_library(\n"
+        + "    name = \"${name}\",\n"
+        + field "srcs" value
+        + field "hdrs" value
+        + field "deps" value
+        + field "includes" value
+        + field "strip_include_prefix" value
+        + ")"
+      ) ccTargets
+    ) + ''
+
+    filegroup(
+        name = "protoc",
+        srcs = ["bin/protoc"],
+    )
+    '';
+
+  workspaceFile = 
+    ''
+    workspace(name = "nix")
+
+    load("//bazel:repositories.bzl", "envoy_dependencies")
+    load("//bazel:cc_configure.bzl", "cc_configure")
+
+    new_local_repository(
+        name = "nix_envoy_deps",
+        path = "${repoEnv}",
+        build_file = "nix_envoy_deps.BUILD"
+    )
+
+    envoy_dependencies(
+        path = "@nix_envoy_deps//",
+        skip_protobuf_bzl = True,
+    )
+
+    new_local_repository(
+        name = "protobuf_bzl",
+        path = "${protobuf_bzl}",
+        # We only want protobuf.bzl, so don't support building out of this repo.
+        build_file_content = "",
+    )
+
+    cc_configure()
+    '';
+
+  # The tree we'll use for our new_local_repository in our generated WORKSPACE.
+  repoEnv = buildEnv {
+    name = "repo-env";
+    paths = lib.concatMap (p:
+      lib.unique [(lib.getBin p) (lib.getLib p) (lib.getDev p)]
+    ) allDeps;
+  };
+
+  rpath = stdenv.lib.makeLibraryPath (allDeps ++ [ stdenv.cc.cc ]);
+
+  allDeps = [
+    c-ares
+    backward-cpp
+    libevent
+    gtest
+    gperftools
+    http-parser
+    lightstep-tracer-cpp
+    nghttp2
+    protobuf3_2
+    tclap
+    rapidjson
+    spdlog
+    boringssl
+  ];
+
+  # Envoy checks at runtime that the git sha is valid,
+  # so we really can't avoid putting some sort of sha here.
+  rev = "3afc7712a04907ffd25ed497626639febfe65735";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "envoy-${version}";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "lyft";
+    repo = "envoy";
+    rev = "v${version}";
+    sha256 = "0j1c9lyvncyhiq3kyhx91ckcjd2h68x56js7xb6ni6bzxinv6zb6";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig bazel
+  ];
+
+  buildInputs = allDeps;
+
+  patches = [ ./nixos.patch ];
+
+  hardeningDisable = "all";
+  dontPatchELF = true;
+  dontStrip = true;
+
+  # set up our workspace,
+  # and prevent an error where bazel/get_workspace_status tries to determine the
+  # version by invoking git.
+  postUnpack = ''
+    cat <<'EOF' > $sourceRoot/WORKSPACE
+    ${workspaceFile}
+    EOF
+
+    cat <<'EOF' > $sourceRoot/nix_envoy_deps.BUILD
+    ${buildFile}
+    EOF
+
+    cat <<'EOF' > $sourceRoot/bazel/get_workspace_status
+    #!${stdenv.shell}
+    echo "BUILD_SCM_REVISION ${rev}"
+    echo "BUILD_SCM_STATUS Modified"
+    EOF
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    mkdir .home
+    export HOME=$PWD/.home
+
+    BAZEL_OPTIONS="--package_path %workspace%:$PWD"
+    BAZEL_BUILD_OPTIONS="\
+      --strategy=Genrule=standalone \
+      --spawn_strategy=standalone \
+      --verbose_failures \
+      $BAZEL_OPTIONS \
+      --action_env=HOME \
+      --action_env=PYTHONUSERBASE \
+      --show_task_finish"
+
+    bazel \
+      --batch \
+      build \
+      -s --verbose_failures \
+      --experimental_ui \
+      $BAZEL_BUILD_OPTIONS \
+      -c opt \
+      //source/exe:envoy-static
+
+    exe=bazel-bin/source/exe/envoy-static
+    chmod +w $exe
+    patchelf --set-rpath ${rpath} $exe
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv $exe $out/bin/envoy
+  '';
+
+  meta = with lib; {
+    description = "L7 proxy and communication bus designed for large modern service oriented architectures";
+    homepage = "https://lyft.github.io/envoy/";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/networking/envoy/nixos.patch b/pkgs/tools/networking/envoy/nixos.patch
new file mode 100644
index 00000000000..04b63a2dde9
--- /dev/null
+++ b/pkgs/tools/networking/envoy/nixos.patch
@@ -0,0 +1,41 @@
+diff --git a/bazel/cc_configure.bzl b/bazel/cc_configure.bzl
+index 8a7a69c4f..75526520c 100644
+--- a/bazel/cc_configure.bzl
++++ b/bazel/cc_configure.bzl
+@@ -292,6 +292,8 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin):
+           "-fstack-protector",
+           # All warnings are enabled. Maybe enable -Werror as well?
+           "-Wall",
++
++          "-Wno-error=strict-aliasing"
+           # Enable a few more warnings that aren't part of -Wall.
+       ] + (["-Wthread-safety", "-Wself-assign"] if darwin else [
+           "-B" + str(repository_ctx.path(cc).dirname),
+@@ -365,10 +367,6 @@ def _opt_content(darwin):
+           # Profile first and / or use FDO if you need better performance than this.
+           "-O2",
+ 
+-          # Security hardening on by default.
+-          # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases.
+-          "-D_FORTIFY_SOURCE=1",
+-
+           # Disable assertions
+           "-DNDEBUG",
+ 
+diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl
+index f17671035..7938047bd 100644
+--- a/bazel/envoy_build_system.bzl
++++ b/bazel/envoy_build_system.bzl
+@@ -131,11 +131,9 @@ def envoy_cc_binary(name,
+             # --build-id and avoid doing the following.
+             '-Wl,--build-id=md5',
+             '-Wl,--hash-style=gnu',
+-            "-static-libstdc++",
+-            "-static-libgcc",
+         ],
+         testonly = testonly,
+-        linkstatic = 1,
++        linkstatic = 0,
+         visibility = visibility,
+         malloc = tcmalloc_external_dep(repository),
+         # See above comment on MD5 hash, this is another "force MD5 stamps" to make sure our
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b250b08d232..8a768a52306 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1816,6 +1816,8 @@ with pkgs;
 
   entr = callPackage ../tools/misc/entr { };
 
+  envoy = callPackage ../tools/networking/envoy { };
+
   eot_utilities = callPackage ../tools/misc/eot-utilities { };
 
   eplot = callPackage ../tools/graphics/eplot { };

From 4ca9f899b1a20325b6002cef27b22332cebf2837 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Wed, 2 Aug 2017 21:55:55 -0700
Subject: [PATCH 1429/3246] cucumber: init at 2.4.0

---
 pkgs/development/tools/cucumber/Gemfile      |  2 +
 pkgs/development/tools/cucumber/Gemfile.lock | 28 +++++++++
 pkgs/development/tools/cucumber/default.nix  | 19 ++++++
 pkgs/development/tools/cucumber/gemset.nix   | 66 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 5 files changed, 117 insertions(+)
 create mode 100644 pkgs/development/tools/cucumber/Gemfile
 create mode 100644 pkgs/development/tools/cucumber/Gemfile.lock
 create mode 100644 pkgs/development/tools/cucumber/default.nix
 create mode 100644 pkgs/development/tools/cucumber/gemset.nix

diff --git a/pkgs/development/tools/cucumber/Gemfile b/pkgs/development/tools/cucumber/Gemfile
new file mode 100644
index 00000000000..f738129eca4
--- /dev/null
+++ b/pkgs/development/tools/cucumber/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'cucumber'
diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock
new file mode 100644
index 00000000000..10c1235ae25
--- /dev/null
+++ b/pkgs/development/tools/cucumber/Gemfile.lock
@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.3)
+    cucumber (2.4.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 4.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-wire (0.0.1)
+    diff-lcs (1.3)
+    gherkin (4.1.3)
+    multi_json (1.12.1)
+    multi_test (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+
+BUNDLED WITH
+   1.14.4
diff --git a/pkgs/development/tools/cucumber/default.nix b/pkgs/development/tools/cucumber/default.nix
new file mode 100644
index 00000000000..d4ca66c70d7
--- /dev/null
+++ b/pkgs/development/tools/cucumber/default.nix
@@ -0,0 +1,19 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv rec {
+  name = "cucumber-${version}";
+
+  version = (import gemset).cucumber.version;
+  inherit ruby;
+  # expects Gemfile, Gemfile.lock and gemset.nix in the same directory
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "A tool for executable specifications";
+    homepage    = https://cucumber.io/;
+    license     = with licenses; mit;
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/cucumber/gemset.nix b/pkgs/development/tools/cucumber/gemset.nix
new file mode 100644
index 00000000000..07a80592dda
--- /dev/null
+++ b/pkgs/development/tools/cucumber/gemset.nix
@@ -0,0 +1,66 @@
+{
+  builder = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+      type = "gem";
+    };
+    version = "3.2.3";
+  };
+  cucumber = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k4j31a93r0zhvyq2mm2k8irppbvkzbsg44r3mf023959v18fzih";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  cucumber-core = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qj2fsqvp94nggnikbnrfvnmzr1pl6ifmdsxj69kdw1kkab30jjr";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  cucumber-wire = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09ymvqb0sbw2if1nxg8rcj33sf0va88ancq5nmp8g01dfwzwma2f";
+      type = "gem";
+    };
+    version = "0.0.1";
+  };
+  diff-lcs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
+      type = "gem";
+    };
+    version = "1.3";
+  };
+  gherkin = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d18r8mf2qyd9jbq9xxvca8adyysdzvwdy8v9c2s5hrd6p02kg79";
+      type = "gem";
+    };
+    version = "4.1.3";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+      type = "gem";
+    };
+    version = "1.12.1";
+  };
+  multi_test = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sx356q81plr67hg16jfwz9hcqvnk03bd9n75pmdw8pfxjfy1yxd";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dd9427c2ce..7587c5f5034 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -898,6 +898,8 @@ with pkgs;
 
   crudini = callPackage ../tools/misc/crudini { };
 
+  cucumber = callPackage ../development/tools/cucumber {};
+
   daemontools = callPackage ../tools/admin/daemontools { };
 
   dale = callPackage ../development/compilers/dale { };

From 881e2556f439f32fda31567a82c2366c8073046f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 3 Aug 2017 07:08:02 +0200
Subject: [PATCH 1430/3246] junicode: make description more concrete

---
 pkgs/data/fonts/junicode/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index 875d63ee8ce..a8b6c8853f3 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://junicode.sourceforge.net/;
-    description = "A Unicode font";
+    description = "A Unicode font for medievalists";
     platforms = stdenv.lib.platforms.unix;
   };
 }

From ef7cc032adcbbd62d7020bfafec39ecc6861da6c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 3 Aug 2017 09:08:42 +0200
Subject: [PATCH 1431/3246] lohit-fonts: add package description

---
 pkgs/data/fonts/lohit-fonts/default.nix | 37 +++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix
index c0454bc2730..12c4f67666d 100644
--- a/pkgs/data/fonts/lohit-fonts/default.nix
+++ b/pkgs/data/fonts/lohit-fonts/default.nix
@@ -1,28 +1,28 @@
 { stdenv, fetchurl, lib }:
 let
   fonts = {
-    assamese = { version = "2.91.3" ; sha256 = "0kbdvi8f7vbvsain9zmnj9h43a6bmdkhk5c2wzg15100w7wf6lpq"; };
-    bengali = { version = "2.91.3" ; sha256 = "1wdd2dkqaflf6nm5yc7llkfxin6g0zb2sbcd5g2xbrl0gwwcmkij"; };
-    devanagari = { version = "2.95.2" ; sha256 = "1ss0j0pcfrg1vsypnm0042y4bn7b84mi6lbfsvr6rs89lb5swvn2"; };
-    gujarati = { version = "2.92.2-and-4.2.2" ; sha256 = "1i27yjhn3x31a89x1hjs6rskdwp2kh0hibq1xiz3rgqil2m0jar6"; };
-    gurmukhi = { version = "2.91.0" ; sha256 = "0z8a30mnyhlfvqhnggfk0369hqg779ihqyhcmpxj0sf9dmb1i0mj"; }; # renamed from Punjabi
-    kannada = { version = "2.5.3" ; sha256 = "1x9fb5z1bwmfi0y1fdnzizzjxhbxp272wxznx36063kjf25bb9pi"; };
-    malayalam = { version = "2.92.0" ; sha256 = "1syv1irxh5xl0z0d5kwankhlmi7s2dg4wpp58nq0mkd3rhm5q8qw"; };
-    marathi = { version = "2.94.0" ; sha256 = "0y9sca6gbfbafv52v0n2r1xfs8rg6zmqs4vp9sjfc1c6yqhzagl4"; };
-    nepali = { version = "2.94.0" ; sha256 = "0c56141rpxc30581i3gisg8kfaadxhqjhgshni6g7a7rn6l4dx17"; };
-    odia = { version = "2.91.0" ; sha256 = "15iz9kdf9k5m8wcn2iqlqjm758ac3hvnk93va6kac06frxnhw9lp"; }; # renamed from Oriya
-    tamil-classical = { version = "2.5.3" ; sha256 = "0ci4gk8qhhysjza69nncgmqmal8s4n8829icamvlzbmjdd4s2pij"; };
-    tamil = { version = "2.91.1" ; sha256 = "1ir6kjl48apwk41xbpj0x458k108s7i61yzpkfhqcy1fkcr7cngj"; };
-    telugu = { version = "2.5.4" ; sha256 = "06gdba7690y20l7nsi8fnnimim5hlq7hik0mpk2fzw4w39hjybk9"; };
+    assamese = { label = "Assamese"; version = "2.91.3" ; sha256 = "0kbdvi8f7vbvsain9zmnj9h43a6bmdkhk5c2wzg15100w7wf6lpq"; };
+    bengali = { label = "Bengali"; version = "2.91.3" ; sha256 = "1wdd2dkqaflf6nm5yc7llkfxin6g0zb2sbcd5g2xbrl0gwwcmkij"; };
+    devanagari = { label = "Devanagari script"; version = "2.95.2" ; sha256 = "1ss0j0pcfrg1vsypnm0042y4bn7b84mi6lbfsvr6rs89lb5swvn2"; };
+    gujarati = { label = "Gujarati"; version = "2.92.2-and-4.2.2" ; sha256 = "1i27yjhn3x31a89x1hjs6rskdwp2kh0hibq1xiz3rgqil2m0jar6"; };
+    gurmukhi = { label = "Gurmukhi script"; version = "2.91.0" ; sha256 = "0z8a30mnyhlfvqhnggfk0369hqg779ihqyhcmpxj0sf9dmb1i0mj"; }; # renamed from Punjabi
+    kannada = { label = "Kannada"; version = "2.5.3" ; sha256 = "1x9fb5z1bwmfi0y1fdnzizzjxhbxp272wxznx36063kjf25bb9pi"; };
+    malayalam = { label = "Malayalam"; version = "2.92.0" ; sha256 = "1syv1irxh5xl0z0d5kwankhlmi7s2dg4wpp58nq0mkd3rhm5q8qw"; };
+    marathi = { label = "Marathi"; version = "2.94.0" ; sha256 = "0y9sca6gbfbafv52v0n2r1xfs8rg6zmqs4vp9sjfc1c6yqhzagl4"; };
+    nepali = { label = "Nepali"; version = "2.94.0" ; sha256 = "0c56141rpxc30581i3gisg8kfaadxhqjhgshni6g7a7rn6l4dx17"; };
+    odia = { label = "Odia"; version = "2.91.0" ; sha256 = "15iz9kdf9k5m8wcn2iqlqjm758ac3hvnk93va6kac06frxnhw9lp"; }; # renamed from Oriya
+    tamil-classical = { label = "Classical Tamil"; version = "2.5.3" ; sha256 = "0ci4gk8qhhysjza69nncgmqmal8s4n8829icamvlzbmjdd4s2pij"; };
+    tamil = { label = "Tamil"; version = "2.91.1" ; sha256 = "1ir6kjl48apwk41xbpj0x458k108s7i61yzpkfhqcy1fkcr7cngj"; };
+    telugu = { label = "Telugu"; version = "2.5.4" ; sha256 = "06gdba7690y20l7nsi8fnnimim5hlq7hik0mpk2fzw4w39hjybk9"; };
   };
   gplfonts = {
     # GPL fonts removed from later releases
-    kashmiri = { version = "2.4.3" ; sha256 = "0ax8xzv4pz17jnsjdklawncsm2qn7176wbxykswygpzdd5lr0gg9"; };
-    konkani = { version = "2.4.3" ; sha256 = "03zc27z26a60aaggrqx4d6l0jgggciq8p83v6vgg0k6l3apvcp45"; };
-    maithili = { version = "2.4.3" ; sha256 = "0aqwnhq1namvvb77f2vssahixqf4xay7ja4q8qc312wxkajdqh4a"; };
-    sindhi = { version = "2.4.3" ; sha256 = "00imfbn01yc2g5zdyydks9w3ndkawr66l9qk2idlvw3yz3sw2kf1"; };
+    kashmiri = { label = "Kashmiri"; version = "2.4.3" ; sha256 = "0ax8xzv4pz17jnsjdklawncsm2qn7176wbxykswygpzdd5lr0gg9"; };
+    konkani = { label = "Konkani"; version = "2.4.3" ; sha256 = "03zc27z26a60aaggrqx4d6l0jgggciq8p83v6vgg0k6l3apvcp45"; };
+    maithili = { label = "Maithili"; version = "2.4.3" ; sha256 = "0aqwnhq1namvvb77f2vssahixqf4xay7ja4q8qc312wxkajdqh4a"; };
+    sindhi = { label = "Sindhi"; version = "2.4.3" ; sha256 = "00imfbn01yc2g5zdyydks9w3ndkawr66l9qk2idlvw3yz3sw2kf1"; };
   };
-  mkpkg = license: name: {version, sha256}:
+  mkpkg = license: name: {label, version, sha256}:
     stdenv.mkDerivation {
       name = "lohit-${name}-${version}";
 
@@ -44,6 +44,7 @@ let
 
       meta = {
         inherit license;
+        description = "Free and open source fonts for Indian languages (" + label + ")";
         homepage = https://fedorahosted.org/lohit/;
         maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ];
         # Set a non-zero priority to allow easy overriding of the

From c41b81f0dac6b82deb97f1ae7667c306a774b689 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 3 Aug 2017 10:16:51 +0200
Subject: [PATCH 1432/3246] intltool: fix url

(cherry picked from commit 34aa9a6a40a81ca123d7c2818139d810cfac7ed1)
---
 pkgs/development/tools/misc/intltool/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index 3c5dacb6f65..537541e37bb 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   patches = [(fetchpatch {
     name = "perl-5.22.patch";
     url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool"
-      + "/debian/patches/perl5.22-regex-fixes.patch?revision=47258&view=co";
+      + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co&pathrev=47258";
     sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3";
   })];
 

From 55b80467c328d78329c8033d9284935c7e597301 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 3 Aug 2017 01:30:25 -0700
Subject: [PATCH 1433/3246] irony-server: supports darwin

Package should support all unix-like systems.
---
 pkgs/development/tools/irony-server/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index ac5495b98d9..0dcb74b803d 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "The server part of irony.";
     homepage = "https://melpa.org/#/irony";
     maintainers = [ stdenv.lib.maintainers.deepfire ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.free;
   };
 }

From 5b996f91257f69a0489b11844cc842de2e11cd0d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 3 Aug 2017 01:33:06 -0700
Subject: [PATCH 1434/3246] emscripten: 1.37.13 -> 1.37.16

---
 pkgs/development/compilers/emscripten-fastcomp/default.nix | 6 +++---
 pkgs/development/compilers/emscripten/default.nix          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index ae7a5ce87b2..f35ca26584f 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.37.13";
+  rev = "1.37.16";
   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 = "1r4f4d5dmhxqwmpf2psainx7sj1j26fdp5acifdwg4sbbpsv96az";
+    sha256 = "0wj9sc0gciaiidcjv6wb0qn6ks06xds7q34351masc7qpvd217by";
     inherit rev;
   };
 
   srcFL = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp-clang";
-    sha256 = "1p0108iz77vmzm7i1aa29sk93g5vd95xiwmags18qkr7x3fmfqsw";
+    sha256 = "1akdgxzxhzjbhp4d14ajcrp9jrf39x004a726ly2gynqc185l4j7";
     inherit rev;
   };
 
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index b39198f30a4..ae80ad6fc80 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  rev = "1.37.13";
+  rev = "1.37.16";
   appdir = "share/emscripten";
 in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "0xnr8nq431pksb346fwsbs5knqmcygb8mywzzl0c9nz3ims1vkx5";
+    sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy";
     inherit rev;
   };
 

From 86d9b09c9b2f0f76da0cfa5ea420ae476983d7a3 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Wed, 2 Aug 2017 19:27:19 +0200
Subject: [PATCH 1435/3246] dockerTools: fix image json and manifest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The image json is not exactly the same as the layer json, therefore I
changed the implementation to use the `baseJson` which doesn’t include
layer specific details like `id`, `size` or the checksum of the layer.

Also the `history` entry was missing in the image json. I’m not totally
sure if this field is required, but a I got an error from a docker
registry when I’ve tried to receive the distribution manifest of an
image without those `history` entry:

GET: `http://<registry-host>/v2/<imageName>/manifests/<imageTag>`

```json
{
  "errors": [
    {
      "code": "MANIFEST_INVALID",
      "message": "manifest invalid",
      "detail": {}
    }
  ]
}
```

I’ve also used a while loop to iterate over all layers which should make
sure that the order of the layers is correct. Previously `find` was
used and I’m not sure if the order was always correct.
---
 pkgs/build-support/docker/default.nix | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 160c3f85977..17d7f2da035 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -497,16 +497,23 @@ rec {
         # Use the temp folder we've been working on to create a new image.
         mv temp image/$layerID
 
-        # Create image configuration file (used by registry v2) by using
-        # the configuration of the last layer
-        SHA_ARRAY=$(find ./ -name layer.tar | xargs sha256sum | cut -d" " -f1 | xargs -I{} echo -n '"sha256:{}" ' | sed 's/" "/","/g' | awk '{ print "["$1"]" }')
-        jq ". + {\"rootfs\": {\"diff_ids\": $SHA_ARRAY, \"type\": \"layers\"}}" image/$layerID/json > config.json
-        CONFIG_SHA=$(sha256sum config.json | cut -d ' ' -f1)
-        mv config.json image/$CONFIG_SHA.json
+        # Create image json and image manifest
+        imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
+        manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
+        currentID=$layerID
+        while [[ -n "$currentID" ]]; do
+          layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1)
+          imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .")
+          imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
+          manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .")
 
-        # Create image manifest
-        LAYER_PATHS=$(find image/ -name layer.tar -printf '"%P" ' | sed 's/" "/","/g')
-        jq -n "[{\"Config\":\"$CONFIG_SHA.json\",\"RepoTags\":[\"$imageName:$imageTag\"],\"Layers\":[$LAYER_PATHS]}]" > image/manifest.json
+          currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true))
+        done
+
+        imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
+        echo "$imageJson" > "image/$imageJsonChecksum.json"
+        manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"")
+        echo "$manifestJson" > image/manifest.json
 
         # Store the json under the name image/repositories.
         jshon -n object \

From cd3d8529433f48ec2d17a6a6084de9d67a7e3d7e Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Wed, 2 Aug 2017 19:36:58 +0200
Subject: [PATCH 1436/3246] dockerTools: document image spec v1.2 compatibility

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

diff --git a/doc/functions.xml b/doc/functions.xml
index 4a9015602af..52bdf13eba9 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -358,8 +358,8 @@
 <para>
   <varname>pkgs.dockerTools</varname> is a set of functions for creating and
   manipulating Docker images according to the
-  <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#docker-image-specification-v100">
-  Docker Image Specification v1.0.0
+  <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120">
+  Docker Image Specification v1.2.0
   </link>. Docker itself is not used to perform any of the operations done by these
   functions.
 </para>
@@ -493,8 +493,8 @@
     <varname>config</varname> is used to specify the configuration of the
     containers that will be started off the built image in Docker.
     The available options are listed in the
-    <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#container-runconfig-field-descriptions">
-      Docker Image Specification v1.0.0
+    <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
+      Docker Image Specification v1.2.0
     </link>.
     </para>
   </callout>

From 09e0cc7cc79cd0e028a56907ddcf36f9bdef1540 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Wed, 2 Aug 2017 23:50:51 +0200
Subject: [PATCH 1437/3246] Update homepage attributes: http -> https Homepage
 link "http://.../" is a permanent redirect to "https://.../" and should be
 updated https://repology.org/repository/nix_stable/problems

---
 pkgs/applications/audio/flac/default.nix             |  2 +-
 pkgs/applications/audio/fldigi/default.nix           |  2 +-
 pkgs/applications/audio/iannix/default.nix           |  2 +-
 pkgs/applications/audio/mp3splt/default.nix          |  2 +-
 pkgs/applications/editors/aseprite/default.nix       |  2 +-
 pkgs/applications/editors/focuswriter/default.nix    |  2 +-
 pkgs/applications/graphics/fontmatrix/default.nix    |  2 +-
 pkgs/applications/graphics/freecad/default.nix       |  2 +-
 pkgs/applications/graphics/gimp/2.8.nix              |  2 +-
 pkgs/applications/misc/cdrtools/default.nix          |  2 +-
 pkgs/applications/misc/dockbarx/default.nix          |  2 +-
 pkgs/applications/misc/far2l/default.nix             |  2 +-
 pkgs/applications/misc/gammu/default.nix             |  2 +-
 pkgs/applications/misc/girara/default.nix            |  2 +-
 pkgs/applications/misc/gmrun/default.nix             |  2 +-
 pkgs/applications/misc/gpsprune/default.nix          |  2 +-
 pkgs/applications/misc/keepassx/2.0.nix              |  2 +-
 pkgs/applications/misc/keepassx/default.nix          |  2 +-
 .../networking/browsers/dillo/default.nix            |  2 +-
 .../networking/browsers/jumanji/default.nix          |  2 +-
 .../networking/feedreaders/canto-curses/default.nix  |  2 +-
 .../networking/feedreaders/canto-daemon/default.nix  |  2 +-
 pkgs/applications/networking/flexget/default.nix     |  2 +-
 .../networking/ftp/filezilla/default.nix             |  2 +-
 pkgs/applications/networking/ids/bro/default.nix     |  2 +-
 .../instant-messengers/bitlbee/default.nix           |  2 +-
 pkgs/applications/networking/irc/hexchat/default.nix |  2 +-
 pkgs/applications/networking/p2p/gnunet/default.nix  |  2 +-
 pkgs/applications/networking/p2p/gnunet/svn.nix      |  2 +-
 pkgs/applications/science/logic/alt-ergo/default.nix |  2 +-
 .../git-and-tools/cgit/default.nix                   |  2 +-
 .../version-management/git-and-tools/git/default.nix |  2 +-
 .../version-management/git-up/default.nix            |  2 +-
 pkgs/applications/video/coriander/default.nix        |  2 +-
 pkgs/applications/video/dvb-apps/default.nix         |  2 +-
 pkgs/applications/video/kodi/default.nix             |  2 +-
 pkgs/applications/video/kodi/plugins.nix             | 12 ++++++------
 pkgs/applications/virtualization/docker/default.nix  |  2 +-
 pkgs/applications/window-managers/bspwm/default.nix  |  2 +-
 pkgs/applications/window-managers/compiz/default.nix |  2 +-
 pkgs/applications/window-managers/i3/lock-color.nix  |  2 +-
 pkgs/applications/window-managers/i3/lock.nix        |  2 +-
 pkgs/build-support/fetchurl/mirrors.nix              |  2 +-
 pkgs/data/documentation/man-pages/default.nix        |  2 +-
 pkgs/data/fonts/anonymous-pro/default.nix            |  2 +-
 pkgs/data/fonts/iosevka/default.nix                  |  2 +-
 pkgs/data/fonts/kawkab-mono/default.nix              |  2 +-
 pkgs/data/fonts/open-dyslexic/default.nix            |  2 +-
 pkgs/data/fonts/opensans-ttf/default.nix             |  2 +-
 pkgs/data/fonts/source-code-pro/default.nix          |  2 +-
 pkgs/data/icons/hicolor-icon-theme/default.nix       |  2 +-
 pkgs/data/misc/cacert/default.nix                    |  2 +-
 pkgs/desktops/gnome-2/desktop/vte/default.nix        |  2 +-
 pkgs/desktops/gnome-2/platform/gtkglext/default.nix  |  2 +-
 pkgs/desktops/gnome-3/3.22/core/evince/default.nix   |  2 +-
 pkgs/desktops/gnome-3/3.22/core/gconf/default.nix    |  2 +-
 .../gnome-3/3.22/core/gnome-disk-utility/default.nix |  2 +-
 .../gnome-3/3.22/core/gnome-screenshot/default.nix   |  2 +-
 pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix         |  2 +-
 pkgs/desktops/gnome-3/3.22/core/vte/default.nix      |  2 +-
 pkgs/development/compilers/ccl/default.nix           |  2 +-
 pkgs/development/compilers/edk2/default.nix          |  2 +-
 .../compilers/elm/packages/elm-package.nix           |  2 +-
 pkgs/development/compilers/gnu-cobol/default.nix     |  2 +-
 pkgs/development/compilers/julia/0.5.nix             |  2 +-
 pkgs/development/compilers/julia/default.nix         |  2 +-
 pkgs/development/compilers/julia/git.nix             |  2 +-
 .../development/haskell-modules/hackage-packages.nix |  6 +++---
 pkgs/development/interpreters/clojure/default.nix    |  2 +-
 .../interpreters/elixir/generic-builder.nix          |  2 +-
 pkgs/development/libraries/blitz/default.nix         |  2 +-
 pkgs/development/libraries/buddy/default.nix         |  2 +-
 pkgs/development/libraries/cfitsio/default.nix       |  2 +-
 pkgs/development/libraries/chromaprint/default.nix   |  2 +-
 pkgs/development/libraries/cppunit/default.nix       |  2 +-
 pkgs/development/libraries/exempi/default.nix        |  2 +-
 pkgs/development/libraries/fdk-aac/default.nix       |  2 +-
 pkgs/development/libraries/ffms/default.nix          |  2 +-
 pkgs/development/libraries/ftgl/2.1.2.nix            |  2 +-
 pkgs/development/libraries/ftgl/default.nix          |  2 +-
 pkgs/development/libraries/git2/default.nix          |  2 +-
 pkgs/development/libraries/glib/default.nix          |  2 +-
 pkgs/development/libraries/glibmm/default.nix        |  2 +-
 pkgs/development/libraries/gmp/4.3.2.nix             |  2 +-
 pkgs/development/libraries/gmp/5.1.x.nix             |  2 +-
 pkgs/development/libraries/gmp/6.x.nix               |  2 +-
 pkgs/development/libraries/gnu-efi/default.nix       |  2 +-
 .../libraries/gstreamer/gstreamermm/default.nix      |  2 +-
 .../libraries/gstreamer/legacy/gnonlin/default.nix   |  2 +-
 .../gstreamer/legacy/gst-ffmpeg/default.nix          |  2 +-
 .../gstreamer/legacy/gstreamermm/default.nix         |  2 +-
 .../libraries/gstreamer/libav/default.nix            |  2 +-
 pkgs/development/libraries/gtk+/2.x.nix              |  2 +-
 pkgs/development/libraries/gtk+/3.x.nix              |  2 +-
 pkgs/development/libraries/gtkmm/2.x.nix             |  2 +-
 pkgs/development/libraries/gtkmm/3.x.nix             |  2 +-
 pkgs/development/libraries/gusb/default.nix          |  2 +-
 pkgs/development/libraries/hunspell/dictionaries.nix |  4 ++--
 pkgs/development/libraries/libao/default.nix         |  2 +-
 pkgs/development/libraries/libav/default.nix         |  2 +-
 pkgs/development/libraries/libavc1394/default.nix    |  2 +-
 pkgs/development/libraries/libbap/default.nix        |  2 +-
 pkgs/development/libraries/libbsd/default.nix        |  2 +-
 pkgs/development/libraries/libcue/default.nix        |  2 +-
 pkgs/development/libraries/libdap/default.nix        |  2 +-
 pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix |  2 +-
 pkgs/development/libraries/libdc1394/default.nix     |  2 +-
 pkgs/development/libraries/libdrm/default.nix        |  2 +-
 pkgs/development/libraries/libdv/default.nix         |  2 +-
 pkgs/development/libraries/libeatmydata/default.nix  |  2 +-
 pkgs/development/libraries/libebml/default.nix       |  2 +-
 pkgs/development/libraries/libewf/default.nix        |  2 +-
 pkgs/development/libraries/libffcall/default.nix     |  2 +-
 pkgs/development/libraries/libftdi/1.x.nix           |  2 +-
 pkgs/development/libraries/libftdi/default.nix       |  2 +-
 pkgs/development/libraries/libgeotiff/default.nix    |  2 +-
 pkgs/development/libraries/libgsf/default.nix        |  2 +-
 pkgs/development/libraries/libibmad/default.nix      |  2 +-
 pkgs/development/libraries/libibumad/default.nix     |  2 +-
 pkgs/development/libraries/liblastfm/default.nix     |  2 +-
 pkgs/development/libraries/libmad/default.nix        |  2 +-
 pkgs/development/libraries/libmatroska/default.nix   |  2 +-
 pkgs/development/libraries/libmesode/default.nix     |  2 +-
 pkgs/development/libraries/libmp3splt/default.nix    |  2 +-
 pkgs/development/libraries/libmspack/default.nix     |  2 +-
 pkgs/development/libraries/libnet/default.nix        |  2 +-
 pkgs/development/libraries/libnice/default.nix       |  2 +-
 pkgs/development/libraries/libogg/default.nix        |  2 +-
 pkgs/development/libraries/liboggz/default.nix       |  2 +-
 .../libraries/libomxil-bellagio/default.nix          |  2 +-
 pkgs/development/libraries/libplist/default.nix      |  2 +-
 pkgs/development/libraries/libqrencode/default.nix   |  2 +-
 pkgs/development/libraries/libraw/default.nix        |  2 +-
 pkgs/development/libraries/librdf/default.nix        |  2 +-
 pkgs/development/libraries/mesa-glu/default.nix      |  2 +-
 .../libraries/science/math/arpack/default.nix        |  2 +-
 pkgs/development/libraries/utf8proc/default.nix      |  2 +-
 .../tools/build-managers/bazel/default.nix           |  2 +-
 .../tools/build-managers/leiningen/default.nix       |  2 +-
 pkgs/development/tools/dcadec/default.nix            |  2 +-
 .../tools/documentation/gtk-doc/default.nix          |  2 +-
 pkgs/development/tools/misc/automoc4/default.nix     |  2 +-
 pkgs/development/tools/misc/avarice/default.nix      |  2 +-
 pkgs/development/tools/misc/cbrowser/default.nix     |  2 +-
 .../development/tools/misc/checkbashisms/default.nix |  2 +-
 pkgs/development/tools/misc/drush/default.nix        |  2 +-
 pkgs/development/tools/misc/eggdbus/default.nix      |  2 +-
 pkgs/development/tools/misc/intltool/default.nix     |  2 +-
 pkgs/development/web/grails/default.nix              |  2 +-
 pkgs/games/0ad/data.nix                              |  2 +-
 pkgs/games/0ad/game.nix                              |  2 +-
 pkgs/games/btanks/default.nix                        |  2 +-
 pkgs/games/extremetuxracer/default.nix               |  2 +-
 pkgs/games/quake3/ioquake/default.nix                |  2 +-
 pkgs/misc/drivers/gutenprint/default.nix             |  2 +-
 pkgs/misc/emulators/higan/default.nix                |  2 +-
 pkgs/misc/emulators/retroarch/cores.nix              |  2 +-
 pkgs/misc/ghostscript/default.nix                    |  2 +-
 pkgs/misc/themes/blackbird/default.nix               |  2 +-
 pkgs/os-specific/linux/acpi/default.nix              |  2 +-
 pkgs/os-specific/linux/batman-adv/alfred.nix         |  2 +-
 pkgs/os-specific/linux/batman-adv/batctl.nix         |  2 +-
 pkgs/os-specific/linux/batman-adv/default.nix        |  2 +-
 pkgs/os-specific/linux/busybox/default.nix           |  2 +-
 pkgs/os-specific/linux/edac-utils/default.nix        |  2 +-
 pkgs/os-specific/linux/eudev/default.nix             |  2 +-
 pkgs/os-specific/linux/firejail/default.nix          |  2 +-
 pkgs/os-specific/linux/hdparm/default.nix            |  2 +-
 pkgs/os-specific/linux/ima-evm-utils/default.nix     |  2 +-
 pkgs/os-specific/linux/jfbview/default.nix           |  2 +-
 pkgs/os-specific/linux/kernel/manual-config.nix      |  2 +-
 pkgs/os-specific/linux/kmod/default.nix              |  2 +-
 pkgs/os-specific/linux/v4l-utils/default.nix         |  2 +-
 pkgs/servers/brickd/default.nix                      |  2 +-
 pkgs/servers/consul/ui.nix                           |  2 +-
 pkgs/servers/emby/default.nix                        |  2 +-
 pkgs/servers/fleet/default.nix                       |  2 +-
 pkgs/servers/mpd/clientlib.nix                       |  2 +-
 pkgs/servers/sip/freeswitch/default.nix              |  2 +-
 pkgs/tools/X11/bumblebee/default.nix                 |  2 +-
 pkgs/tools/X11/hsetroot/default.nix                  |  2 +-
 pkgs/tools/archivers/cabextract/default.nix          |  2 +-
 pkgs/tools/audio/acoustid-fingerprinter/default.nix  |  2 +-
 pkgs/tools/compression/dtrx/default.nix              |  2 +-
 pkgs/tools/filesystems/bcache-tools/default.nix      |  2 +-
 pkgs/tools/filesystems/dosfstools/default.nix        |  2 +-
 pkgs/tools/graphics/briss/default.nix                |  2 +-
 pkgs/tools/graphics/cfdg/default.nix                 |  4 ++--
 pkgs/tools/graphics/cfdg/src-info-for-default.nix    |  2 +-
 pkgs/tools/graphics/editres/default.nix              |  2 +-
 pkgs/tools/graphics/pngtoico/default.nix             |  2 +-
 pkgs/tools/graphics/qrencode/default.nix             |  2 +-
 pkgs/tools/misc/aescrypt/default.nix                 |  2 +-
 pkgs/tools/misc/autorandr/default.nix                |  2 +-
 pkgs/tools/misc/fluentd/default.nix                  |  2 +-
 pkgs/tools/misc/hakuneko/default.nix                 |  2 +-
 pkgs/tools/misc/hdf5/default.nix                     |  2 +-
 pkgs/tools/misc/mstflint/default.nix                 |  2 +-
 pkgs/tools/networking/curl/default.nix               |  4 ++--
 pkgs/tools/networking/dhcpcd/default.nix             |  2 +-
 pkgs/tools/networking/email/default.nix              |  2 +-
 pkgs/tools/networking/httpie/default.nix             |  2 +-
 pkgs/tools/networking/hyenae/default.nix             |  2 +-
 pkgs/tools/networking/iperf/2.nix                    |  2 +-
 pkgs/tools/networking/tftp-hpa/default.nix           |  4 ++--
 pkgs/tools/package-management/dpkg/default.nix       |  2 +-
 pkgs/tools/security/hashcat/default.nix              |  2 +-
 pkgs/tools/security/hashcat/hashcat3/default.nix     |  2 +-
 pkgs/tools/system/at/default.nix                     |  2 +-
 pkgs/tools/system/datefudge/default.nix              |  2 +-
 pkgs/tools/system/dfc/default.nix                    |  2 +-
 pkgs/tools/text/colordiff/default.nix                |  2 +-
 pkgs/tools/typesetting/fop/default.nix               |  2 +-
 pkgs/tools/typesetting/halibut/default.nix           |  4 ++--
 pkgs/top-level/dotnet-packages.nix                   |  2 +-
 pkgs/top-level/python-packages.nix                   |  2 +-
 216 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 52e29e3da4c..9805232316e 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" "doc" ];
 
   meta = with stdenv.lib; {
-    homepage = http://xiph.org/flac/;
+    homepage = https://xiph.org/flac/;
     description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
     platforms = platforms.all;
     maintainers = [ maintainers.mornfall ];
diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index 2ee03a3f399..545e7c5047a 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Digital modem program";
-    homepage = http://sourceforge.net/projects/fldigi/;
+    homepage = https://sourceforge.net/projects/fldigi/;
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index d72a2b13c42..d56ac753405 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Graphical open-source sequencer,";
-    homepage = http://www.iannix.org/;
+    homepage = https://www.iannix.org/;
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.nico202 ];
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix
index 0fa9022f67b..f2922e7eecf 100644
--- a/pkgs/applications/audio/mp3splt/default.nix
+++ b/pkgs/applications/audio/mp3splt/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
-    homepage = http://sourceforge.net/projects/mp3splt/;
+    homepage = https://sourceforge.net/projects/mp3splt/;
     license = licenses.gpl2;
     maintainers = [ maintainers.bosu ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 51a2a874f23..9945fd53719 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Animated sprite editor & pixel art tool";
-    homepage = http://www.aseprite.org/;
+    homepage = https://www.aseprite.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 6ad92b109dd..28106cf876b 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.madjar ];
     platforms = stdenv.lib.platforms.all;
-    homepage = http://gottcode.org/focuswriter/;
+    homepage = https://gottcode.org/focuswriter/;
   };
 }
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index ced6a5f7258..8ca093b90c3 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
-    homepage = http://github.com/fontmatrix/fontmatrix;
+    homepage = https://github.com/fontmatrix/fontmatrix;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 6b49f975b1b..80f893e7c3c 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
-    homepage = http://www.freecadweb.org/;
+    homepage = https://www.freecadweb.org/;
     license = licenses.lgpl2Plus;
     maintainers = [ maintainers.viric ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 47004a02500..ff87b70a0c1 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "The GNU Image Manipulation Program";
-    homepage = http://www.gimp.org/;
+    homepage = https://www.gimp.org/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index be6989b7e33..a46565eb76b 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/cdrtools/;
+    homepage = https://sourceforge.net/projects/cdrtools/;
     description = "Highly portable CD/DVD/BluRay command line recording software";
     license = with licenses; [ gpl2 lgpl2 cddl ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix
index 60bd5134e8a..cfe76701ceb 100644
--- a/pkgs/applications/misc/dockbarx/default.nix
+++ b/pkgs/applications/misc/dockbarx/default.nix
@@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
     ++ [ keybinder ];
 
   meta = with stdenv.lib; {
-    homepage = http://launchpad.net/dockbar/;
+    homepage = https://launchpad.net/dockbar/;
     description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 87709ec102b..7f5b7a89358 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An orthodox file manager";
-    homepage = http://github.com/elfmz/far2l;
+    homepage = https://github.com/elfmz/far2l;
     license = licenses.gpl2;
     maintainers = [ maintainers.volth ];
     platforms = platforms.all;
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 10ce0c17758..939b38ca29f 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://wammu.eu/gammu/;
+    homepage = https://wammu.eu/gammu/;
     description = "Command line utility and library to control mobile phones";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 7585ef6710a..cef8640d958 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://pwmt.org/projects/girara/;
+    homepage = https://pwmt.org/projects/girara/;
     description = "User interface library";
     longDescription = ''
       girara is a library that implements a GTK+ based VIM-like user interface
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 025be1e4564..3be2704896e 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       Also, supports CTRL-R / CTRL-S / "!" for searching through history.
       Running commands in a terminal with CTRL-Enter. URL handlers.
     '';
-    homepage = http://sourceforge.net/projects/gmrun/;
+    homepage = https://sourceforge.net/projects/gmrun/;
     license = "GPL";
     maintainers = [];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 07fcf31ed26..a51ec8c1b04 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Application for viewing, editing and converting GPS coordinate data";
-    homepage = http://activityworkshop.net/software/gpsprune/;
+    homepage = https://activityworkshop.net/software/gpsprune/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
     platforms = platforms.all;
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index 030b1d326e1..f6814119b5a 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Qt password manager compatible with its Win32 and Pocket PC versions";
-    homepage = http://www.keepassx.org/;
+    homepage = https://www.keepassx.org/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
index d0bddbc1610..ed706b138cc 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/pkgs/applications/misc/keepassx/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Qt password manager compatible with its Win32 and Pocket PC versions";
-    homepage = http://www.keepassx.org/;
+    homepage = https://www.keepassx.org/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index a54e5e0c370..b056bdedb41 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configureFlags =  "--enable-ssl";
 
   meta = with stdenv.lib; {
-    homepage = http://www.dillo.org/;
+    homepage = https://www.dillo.org/;
     description = "A fast graphical web browser with a small footprint";
     longDescription = ''
       Dillo is a small, fast web browser, tailored for older machines.
diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix
index b1d77afa8f1..7383e0ec044 100644
--- a/pkgs/applications/networking/browsers/jumanji/default.nix
+++ b/pkgs/applications/networking/browsers/jumanji/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Minimal web browser";
-    homepage = http://pwmt.org/projects/jumanji/;
+    homepage = https://pwmt.org/projects/jumanji/;
     platforms = platforms.all;
     maintainers = [ maintainers.koral ];
   };
diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 3db20d3de4c..438efdc813c 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -24,7 +24,7 @@ python34Packages.buildPythonApplication rec {
       unreadable white text. An interface with almost infinite customization
       and extensibility using the excellent Python programming language.
     '';
-    homepage = http://codezen.org/canto-ng/;
+    homepage = https://codezen.org/canto-ng/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.devhell ];
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index 18837299e93..c50647ac7b0 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -24,7 +24,7 @@ python34Packages.buildPythonApplication rec {
       unreadable white text. An interface with almost infinite customization
       and extensibility using the excellent Python programming language.
     '';
-    homepage = http://codezen.org/canto-ng/;
+    homepage = https://codezen.org/canto-ng/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.devhell ];
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 6c3731b82a4..814f6bb5548 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -53,7 +53,7 @@ buildPythonApplication rec {
   ++ lib.optional (transmission != null) transmissionrpc;
 
   meta = {
-    homepage = http://flexget.com/;
+    homepage = https://flexget.com/;
     description = "Multipurpose automation tool for content like torrents";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ domenkozar tari ];
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index dcd143a5156..37dcd00fd02 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     pugixml libfilezilla nettle ];
 
   meta = with stdenv.lib; {
-    homepage = http://filezilla-project.org/;
+    homepage = https://filezilla-project.org/;
     description = "Graphical FTP, FTPS and SFTP client";
     license = licenses.gpl2;
     longDescription = ''
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 946d0dedba0..4117d409b93 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Powerful network analysis framework that is much different from the typical IDS you may know";
-    homepage = http://www.bro.org/;
+    homepage = https://www.bro.org/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; linux;
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index abb0a117297..fa1c64ba0ad 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
       Messenger, AIM and ICQ.
     '';
 
-    homepage = http://www.bitlbee.org/;
+    homepage = https://www.bitlbee.org/;
     license = licenses.gpl2Plus;
 
     maintainers = with maintainers; [ wkennington pSub ];
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index f8acc180700..baa0b10fd75 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A popular and easy to use graphical IRC (chat) client";
-    homepage = http://hexchat.github.io/;
+    homepage = https://hexchat.github.io/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo jgeerds ];
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 6b91956e5e3..d1834217724 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
       network are rewarded with better service.
     '';
 
-    homepage = http://gnunet.org/;
+    homepage = https://gnunet.org/;
 
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
index be385c5bc8b..8c8d95169c8 100644
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
       network are rewarded with better service.
     '';
 
-    homepage = http://gnunet.org/;
+    homepage = https://gnunet.org/;
 
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 7cf0aeb203d..b2495a4a593 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-performance theorem prover and SMT solver";
-    homepage    = "http://alt-ergo.ocamlpro.com/";
+    homepage    = "https://alt-ergo.ocamlpro.com/";
     license     = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
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 e7511e10d40..518db7708b7 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://git.zx2c4.com/cgit/about/;
+    homepage = https://git.zx2c4.com/cgit/about/;
     repositories.git = git://git.zx2c4.com/cgit;
     description = "Web frontend for git repositories";
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index aa8ab008403..7219b4781ae 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -198,7 +198,7 @@ EOF
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://git-scm.com/;
+    homepage = https://git-scm.com/;
     description = "Distributed version control system";
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index c93ee924466..4b6ba9398b4 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -26,7 +26,7 @@ python2Packages.buildPythonApplication rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/msiemens/PyGitUp;
+    homepage = https://github.com/msiemens/PyGitUp;
     description = "A git pull replacement that rebases all local branches when pulling.";
     license = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix
index 6eb9e94e969..60c31cf07f9 100644
--- a/pkgs/applications/video/coriander/default.nix
+++ b/pkgs/applications/video/coriander/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ];
   
   meta = {
-    homepage = http://damien.douxchamps.net/ieee1394/coriander/;
+    homepage = https://damien.douxchamps.net/ieee1394/coriander/;
     description = "GUI for controlling a Digital Camera through the IEEE1394 bus";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix
index 5e8e63564f4..8ceb7875be4 100644
--- a/pkgs/applications/video/dvb-apps/default.nix
+++ b/pkgs/applications/video/dvb-apps/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Linux DVB API applications and utilities";
-    homepage = http://linuxtv.org/;
+    homepage = https://linuxtv.org/;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 33e64c65cf4..09cdf20ace0 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -138,7 +138,7 @@ in stdenv.mkDerivation rec {
     '';
 
     meta = with stdenv.lib; {
-      homepage = http://kodi.tv/;
+      homepage = https://kodi.tv/;
       description = "Media center";
       license = licenses.gpl2;
       platforms = platforms.linux;
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 6897f9df1a1..0500fc14586 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -19,7 +19,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=85724;
+      homepage = https://forum.kodi.tv/showthread.php?tid=85724;
       description = "A program launcher for Kodi";
       longDescription = ''
         Advanced Launcher allows you to start any Linux, Windows and
@@ -49,7 +49,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=287826;
+      homepage = https://forum.kodi.tv/showthread.php?tid=287826;
       description = "A program launcher for Kodi";
       longDescription = ''
         Advanced Emulator Launcher is a multi-emulator front-end for Kodi
@@ -129,7 +129,7 @@ rec {
       sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
     };
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=258159;
+      homepage = https://forum.kodi.tv/showthread.php?tid=258159;
       description = "A ROM launcher for Kodi that uses HyperSpin assets.";
       maintainers = with maintainers; [ edwtjo ];
     };
@@ -184,7 +184,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=67110;
+      homepage = https://forum.kodi.tv/showthread.php?tid=67110;
       description = "Watch content from SVT Play";
       longDescription = ''
         With this addon you can stream content from SVT Play
@@ -234,7 +234,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=157499;
+      homepage = https://forum.kodi.tv/showthread.php?tid=157499;
       description = "Launch Steam in Big Picture Mode from Kodi";
       longDescription = ''
         This add-on will close/minimise Kodi, launch Steam in Big
@@ -263,7 +263,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=187421;
+      homepage = https://forum.kodi.tv/showthread.php?tid=187421;
       descritpion = "A comic book reader";
       maintainers = with maintainers; [ edwtjo ];
     };
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c42b2a098f7..719762b9d17 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -161,7 +161,7 @@ rec {
     '';
 
     meta = {
-      homepage = http://www.docker.com/;
+      homepage = https://www.docker.com/;
       description = "An open source project to pack, ship and run any application as a lightweight container";
       license = licenses.asl20;
       maintainers = with maintainers; [ offline tailhook vdemeester ];
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 83e1ea3e88d..16c624b09cc 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tiling window manager based on binary space partitioning";
-    homepage = http://github.com/baskerville/bspwm;
+    homepage = https://github.com/baskerville/bspwm;
     maintainers = with maintainers; [ meisternu epitrochoid ];
     license = licenses.bsd2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index dc6c30d00e4..412cdf91e0b 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Compoziting window manager";
-    homepage = http://launchpad.net/compiz/;
+    homepage = https://launchpad.net/compiz/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index ade6182ec7b..fd47a104326 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "A simple screen locker like slock";
-    homepage = http://i3wm.org/i3lock/;
+    homepage = https://i3wm.org/i3lock/;
     maintainers = with maintainers; [ garbas malyn ];
     license = licenses.bsd3;
     platforms = platforms.all;
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 9d7b4502565..a979797d080 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A simple screen locker like slock";
-    homepage = http://i3wm.org/i3lock/;
+    homepage = https://i3wm.org/i3lock/;
     maintainers = with maintainers; [ garbas malyn domenkozar ];
     license = licenses.bsd3;
     platforms = platforms.all;
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 41bfc84c247..4861d4b7c35 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -132,7 +132,7 @@ rec {
     http://ftp.riken.jp/net/samba
   ];
 
-  # BitlBee mirrors, see http://www.bitlbee.org/main.php/mirrors.html .
+  # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html .
   bitlbee = [
     http://get.bitlbee.org/
     http://get.bitlbee.be/
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 6ced5785ecf..79faf7c7baa 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Linux development manual pages";
-    homepage = http://www.kernel.org/doc/man-pages/;
+    homepage = https://www.kernel.org/doc/man-pages/;
     repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
     maintainers = with maintainers; [ nckx ];
     platforms = with platforms; unix;
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index da34a2f43aa..02479378983 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.marksimonson.com/fonts/view/anonymous-pro;
+    homepage = https://www.marksimonson.com/fonts/view/anonymous-pro;
     description = "TrueType font set intended for source code";
     longDescription = ''
       Anonymous Pro (2009) is a family of four fixed-width fonts
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 78519ff8c9b..73f675b6159 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://be5invis.github.io/Iosevka/;
+    homepage = https://be5invis.github.io/Iosevka/;
     downloadPage = "https://github.com/be5invis/Iosevka/releases";
     description = ''
       Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix
index 7b990327286..bbb1981957b 100644
--- a/pkgs/data/fonts/kawkab-mono/default.nix
+++ b/pkgs/data/fonts/kawkab-mono/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An arab fixed-width font";
-    homepage = http://makkuk.com/kawkab-mono/;
+    homepage = https://makkuk.com/kawkab-mono/;
     license = stdenv.lib.licenses.ofl;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix
index 5d9bb584360..9d241654b12 100644
--- a/pkgs/data/fonts/open-dyslexic/default.nix
+++ b/pkgs/data/fonts/open-dyslexic/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://opendyslexic.org/;
     description = "Font created to increase readability for readers with dyslexia";
-    license = "Bitstream Vera License (http://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)";
+    license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)";
     platforms = platforms.all;
     maintainers = [maintainers.rycee];
   };
diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix
index dbcf84c9a74..16e2d54f130 100644
--- a/pkgs/data/fonts/opensans-ttf/default.nix
+++ b/pkgs/data/fonts/opensans-ttf/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       Open Sans is a humanist sans serif typeface designed by Steve Matteson,
       Type Director of Ascender Corp.
     '';
-    homepage = http://en.wikipedia.org/wiki/Open_Sans;
+    homepage = https://en.wikipedia.org/wiki/Open_Sans;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index 8679a8fd8ce..5dc522aac2c 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "A set of monospaced OpenType fonts designed for coding environments";
     maintainers = with stdenv.lib.maintainers; [ relrod ];
     platforms = with stdenv.lib.platforms; all;
-    homepage = http://blog.typekit.com/2012/09/24/source-code-pro/;
+    homepage = https://blog.typekit.com/2012/09/24/source-code-pro/;
     license = stdenv.lib.licenses.ofl;
   };
 }
diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix
index 083ea80a69d..e5a3faf7742 100644
--- a/pkgs/data/icons/hicolor-icon-theme/default.nix
+++ b/pkgs/data/icons/hicolor-icon-theme/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Default fallback theme used by implementations of the icon theme specification";
-    homepage = http://icon-theme.freedesktop.org/releases/;
+    homepage = https://icon-theme.freedesktop.org/releases/;
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index fbf9af36f27..3b34b664d5d 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://curl.haxx.se/docs/caextract.html;
+    homepage = https://curl.haxx.se/docs/caextract.html;
     description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington fpletz ];
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index 7b23d91e549..dc8181414ce 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.gnome.org/;
+    homepage = https://www.gnome.org/;
     description = "A library implementing a terminal emulator widget for GTK+";
     longDescription = ''
       VTE is a library (libvte) implementing a terminal emulator widget for
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index de06c671e72..d5be7137c8f 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   CPPFLAGS = "-UGTK_DISABLE_DEPRECATED";
 
   meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gtkglext/;
+    homepage = https://projects.gnome.org/gtkglext/;
     description = "GtkGLExt, an OpenGL extension to GTK+";
     longDescription =
       '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
index 340825cd666..559e9b8575a 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # would need pythonPackages.dogTail, which is missing
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/projects/evince/;
+    homepage = https://www.gnome.org/projects/evince/;
     description = "GNOME's document viewer";
 
     longDescription = ''
diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
index d3b2d814b16..1729ec06623 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gconf/;
+    homepage = https://projects.gnome.org/gconf/;
     description = "A system for storing application preferences";
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
index c329d68674a..f22f4665c14 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
+    homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
     description = "A udisks graphical front-end";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
index 29ebe8b0ca6..8d3e15d0035 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
+    homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot;
     description = "Utility used in the GNOME desktop environment for taking screenshots";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
index cbb52c9aaa1..4f56439311e 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
+    homepage = https://www.gnome.org/;
     description = "A library implementing a terminal emulator widget for GTK+";
     longDescription = ''
       VTE is a library (libvte) implementing a terminal emulator widget for
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
index 3181348d843..09b83e14923 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
+    homepage = https://www.gnome.org/;
     description = "A library implementing a terminal emulator widget for GTK+";
     longDescription = ''
       VTE is a library (libvte) implementing a terminal emulator widget for
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 76caf12ffd3..7ece0ffda53 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Clozure Common Lisp";
-    homepage    = http://ccl.clozure.com/;
+    homepage    = https://ccl.clozure.com/;
     maintainers = with maintainers; [ raskin muflax tohl ];
     platforms   = attrNames options;
     license     = licenses.lgpl21;
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index f51e3af25ee..1e6e0e8c1f6 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -34,7 +34,7 @@ edk2 = stdenv.mkDerivation {
 
   meta = {
     description = "Intel EFI development kit";
-    homepage = http://sourceforge.net/projects/edk2/;
+    homepage = https://sourceforge.net/projects/edk2/;
     license = stdenv.lib.licenses.bsd2;
     platforms = ["x86_64-linux" "i686-linux"];
   };
diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix
index 4f1f2947931..4a60b3dfb38 100644
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ b/pkgs/development/compilers/elm/packages/elm-package.nix
@@ -29,7 +29,7 @@ mkDerivation {
     zip-archive
   ];
   jailbreak = true;
-  homepage = http://github.com/elm-lang/elm-package;
+  homepage = https://github.com/elm-lang/elm-package;
   description = "Package manager for Elm libraries";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix
index e5ec3659f0b..f82fc17634d 100644
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/pkgs/development/compilers/gnu-cobol/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An open-source COBOL compiler";
-    homepage = http://sourceforge.net/projects/open-cobol/;
+    homepage = https://sourceforge.net/projects/open-cobol/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ ericsagnes ];
     platforms = platforms.linux;
diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index 2a7bf39c45c..1ce60d40716 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
-    homepage = http://julialang.org/;
+    homepage = https://julialang.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 0df7da4a43f..63252084b5d 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
-    homepage = http://julialang.org/;
+    homepage = https://julialang.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 4dfe5dc0dc3..cfddb862f59 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -171,7 +171,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
-    homepage = http://julialang.org/;
+    homepage = https://julialang.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f5b5e42f065..1b8b00a10ad 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -31267,7 +31267,7 @@ self: {
        executableHaskellDepends = [
          base criterion optparse-applicative silently text turtle
        ];
-       homepage = "http://github.com/Gabriel439/bench";
+       homepage = "https://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31286,7 +31286,7 @@ self: {
        executableHaskellDepends = [
          base criterion optparse-applicative silently text turtle
        ];
-       homepage = "http://github.com/Gabriel439/bench";
+       homepage = "https://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62486,7 +62486,7 @@ self: {
          http-types mtl network optparse-applicative pretty process text
          time unordered-containers vector zip-archive
        ];
-       homepage = "http://github.com/elm-lang/elm-package";
+       homepage = "https://github.com/elm-lang/elm-package";
        description = "Package manager for Elm libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index c088f02ed69..8c724577359 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A Lisp dialect for the JVM";
-    homepage = http://clojure.org/;
+    homepage = https://clojure.org/;
     license = stdenv.lib.licenses.bsd3;
     longDescription = ''
       Clojure is a dynamic programming language that targets the Java
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 3d779e665cd..8f83a338484 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -59,7 +59,7 @@ in
     '';
 
     meta = with stdenv.lib; {
-      homepage = http://elixir-lang.org/;
+      homepage = https://elixir-lang.org/;
       description = "A functional, meta-programming aware language built on top of the Erlang VM";
 
       longDescription = ''
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index 96b53e1ad63..4ae47d338a6 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Fast multi-dimensional array library for C++";
-    homepage = http://sourceforge.net/projects/blitz/;
+    homepage = https://sourceforge.net/projects/blitz/;
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.aherrmann ];
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index 809d373233d..313ac086726 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = http://sourceforge.net/projects/buddy/;
+    homepage = https://sourceforge.net/projects/buddy/;
     description = "Binary decision diagram package";
     license = "as-is";
 
diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index d49bd7eac1b..93c187ec35e 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -14,7 +14,7 @@
    '';
 
   meta = with stdenv.lib; {
-    homepage = http://heasarc.gsfc.nasa.gov/fitsio/;
+    homepage = https://heasarc.gsfc.nasa.gov/fitsio/;
     description = "Library for reading and writing FITS data files";
     longDescription =
       '' CFITSIO is a library of C and Fortran subroutines for reading and
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index e1e4604e51f..41bde5374e8 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ];
 
   meta = with stdenv.lib; {
-    homepage = http://acoustid.org/chromaprint;
+    homepage = https://acoustid.org/chromaprint;
     description = "AcoustID audio fingerprinting library";
     maintainers = with maintainers; [ ehmry ];
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index f97dd80d741..8d2c4bb7dd3 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    homepage = http://sourceforge.net/apps/mediawiki/cppunit/;
+    homepage = https://sourceforge.net/apps/mediawiki/cppunit/;
     description = "C++ unit testing framework";
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index ed6728482aa..b486a327466 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
 
   meta = with stdenv.lib; {
-    homepage = http://libopenraw.freedesktop.org/wiki/Exempi/;
+    homepage = https://libopenraw.freedesktop.org/wiki/Exempi/;
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd3;
   };
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 43a5eb2103d..59dc4721812 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A high-quality implementation of the AAC codec from Android";
-    homepage    = http://sourceforge.net/projects/opencore-amr/;
+    homepage    = https://sourceforge.net/projects/opencore-amr/;
     license     = licenses.asl20;
     maintainers = with maintainers; [ codyopel ];
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 5aa62a638fe..6b95d0f1692 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib ffmpeg ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/FFMS/ffms2/;
+    homepage = https://github.com/FFMS/ffms2/;
     description = "Libav/ffmpeg based source library for easy frame accurate access";
     license = licenses.mit;
     maintainers = with maintainers; [ fuuzetsu ];
diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix
index f33c889e56c..d4afc7ad481 100644
--- a/pkgs/development/libraries/ftgl/2.1.2.nix
+++ b/pkgs/development/libraries/ftgl/2.1.2.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/apps/mediawiki/ftgl/;
+    homepage = https://sourceforge.net/apps/mediawiki/ftgl/;
     description = "Font rendering library for OpenGL applications";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index d303beeb4ea..5e94618376b 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [freetype mesa];
 
   meta = {
-    homepage = http://sourceforge.net/apps/mediawiki/ftgl/;
+    homepage = https://sourceforge.net/apps/mediawiki/ftgl/;
     description = "Font rendering library for OpenGL applications";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index cf27249064f..0d53d00737b 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     description = "The Git linkable library";
-    homepage = http://libgit2.github.com/;
+    homepage = https://libgit2.github.com/;
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
   };
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 84c04468277..071941d66c3 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C library of programming buildings blocks";
-    homepage    = http://www.gtk.org/;
+    homepage    = https://www.gtk.org/;
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 0b966c65f38..5c318c9b46a 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "C++ interface to the GLib library";
 
-    homepage = http://gtkmm.org/;
+    homepage = https://gtkmm.org/;
 
     license = licenses.lgpl2Plus;
 
diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix
index 1cb7fd42cce..36067cc0786 100644
--- a/pkgs/development/libraries/gmp/4.3.2.nix
+++ b/pkgs/development/libraries/gmp/4.3.2.nix
@@ -60,7 +60,7 @@ let self = stdenv.mkDerivation rec {
          asymptotically faster algorithms.
       '';
 
-    homepage = http://gmplib.org/;
+    homepage = https://gmplib.org/;
     license = stdenv.lib.licenses.lgpl3Plus;
 
     maintainers = [ ];
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index 9a69932d9bd..b39b56ec116 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -51,7 +51,7 @@ let self = stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://gmplib.org/;
+    homepage = https://gmplib.org/;
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 34119a3f153..e3bacc86d58 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -50,7 +50,7 @@ let self = stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://gmplib.org/;
+    homepage = https://gmplib.org/;
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index c6240c40578..e3b345b31ee 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GNU EFI development toolchain";
-    homepage = http://sourceforge.net/projects/gnu-efi/;
+    homepage = https://sourceforge.net/projects/gnu-efi/;
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index a1e28efbff4..a4169565511 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++ interface for GStreamer";
-    homepage = http://gstreamer.freedesktop.org/bindings/cplusplus.html;
+    homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ romildo ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
index 9c5de42194e..16882c8a57d 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gst-plugins-base gstreamer pkgconfig ];
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org/modules/gnonlin.html;
+    homepage = https://gstreamer.freedesktop.org/modules/gnonlin.html;
     description = "Gstreamer Non-Linear Multimedia Editing Plugins";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
index 3fbaa9ad4e8..953f8900ade 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org/releases/gst-ffmpeg;
+    homepage = https://gstreamer.freedesktop.org/releases/gst-ffmpeg;
     description = "GStreamer's plug-in using FFmpeg";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index f181aa029bd..8acaefcedf4 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++ bindings for the GStreamer streaming multimedia library";
-    homepage = http://www.gtkmm.org/;
+    homepage = https://www.gtkmm.org/;
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ plcplc ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 3e94016d057..f312a14de24 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -4,7 +4,7 @@
 }:
 
 # Note that since gst-libav-1.6, libav is actually ffmpeg. See
-# http://gstreamer.freedesktop.org/releases/1.6/ for more info.
+# https://gstreamer.freedesktop.org/releases/1.6/ for more info.
 
 assert withSystemLibav -> libav != null;
 
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index f6e718d82e9..45222b7d7fc 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A multi-platform toolkit for creating graphical user interfaces";
-    homepage    = http://www.gtk.org/;
+    homepage    = https://www.gtk.org/;
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index cf888641b94..82df6e135d0 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
       royalties.
     '';
 
-    homepage = http://www.gtk.org/;
+    homepage = https://www.gtk.org/;
 
     license = licenses.lgpl2Plus;
 
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 1ec2a7cd6f0..469c6adc6f7 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       tutorial.
     '';
 
-    homepage = http://gtkmm.org/;
+    homepage = https://gtkmm.org/;
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 49055f6b4a9..89230fab658 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       tutorial.
     '';
 
-    homepage = http://gtkmm.org/;
+    homepage = https://gtkmm.org/;
 
     license = licenses.lgpl2Plus;
 
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 5116e39562c..0157fa1762c 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GLib libusb wrapper";
-    homepage = http://people.freedesktop.org/~hughsient/releases/;
+    homepage = https://people.freedesktop.org/~hughsient/releases/;
     license = stdenv.lib.licenses.lgpl21;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 497dfe2bb92..37c00f3e2aa 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -75,7 +75,7 @@ let
       meta = with stdenv.lib; {
         inherit longDescription;
         description = "Hunspell dictionary for ${shortDescription} from Dicollecte";
-        homepage = http://www.dicollecte.org/home.php?prj=fr;
+        homepage = https://www.dicollecte.org/home.php?prj=fr;
         license = licenses.mpl20;
         maintainers = with maintainers; [ renzo ];
         platforms = platforms.all;
@@ -118,7 +118,7 @@ let
       name = "hunspell-dict-${shortName}-linguistico-${version}";
       readmeFile = dictFileName + "_README.txt";
       meta = with stdenv.lib; {
-        homepage = http://sourceforge.net/projects/linguistico/;
+        homepage = https://sourceforge.net/projects/linguistico/;
         license = licenses.gpl3;
         maintainers = with maintainers; [ renzo ];
         platforms = platforms.all;
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index d3cb1283331..de4aaf9fdee 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       programs to output audio using a simple API on a wide variety of
       platforms.
     '';
-    homepage = http://xiph.org/ao/;
+    homepage = https://xiph.org/ao/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 28d435fbb9c..94ebaed9c2a 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -118,7 +118,7 @@ let
     passthru = { inherit vdpauSupport; };
 
     meta = with stdenv.lib; {
-      homepage = http://libav.org/;
+      homepage = https://libav.org/;
       description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)";
       license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not?
         else if enableGPL then gpl2Plus else lgpl21Plus;
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 51f62b9bd5f..ab8b507e98b 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = { 
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
-    homepage = http://sourceforge.net/projects/libavc1394/;
+    homepage = https://sourceforge.net/projects/libavc1394/;
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 83bd81456c0..a427bd99dd5 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://github.com/binaryanalysisplatform/bap-bindings;
+    homepage = https://github.com/binaryanalysisplatform/bap-bindings;
     description = "A C library for interacting with BAP";
     maintainers = [ stdenv.lib.maintainers.maurer ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 792a29eb1fb..5e906c7ac5d 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";
-    homepage = http://libbsd.freedesktop.org/;
+    homepage = https://libbsd.freedesktop.org/;
     license = licenses.bsd3;
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index 22bda89c603..e217f5d96db 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       a file pointer. For handling of the parsed data a convenient API is
       available.
     '';
-    homepage = http://sourceforge.net/projects/libcue/;
+    homepage = https://sourceforge.net/projects/libcue/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ astsmtl ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index e20b1c95a19..57b56c37233 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A C++ SDK which contains an implementation of DAP";
-    homepage = http://www.opendap.org/download/libdap;
+    homepage = https://www.opendap.org/download/libdap;
     license = licenses.lgpl2;
     maintainers = [ maintainers.bzizou ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 2222825433e..75cf69035cb 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   cmakeFlags = "-DWITH_DOC=OFF";
 
   meta = with stdenv.lib; {
-    homepage = http://launchpad.net/libdbusmenu-qt;
+    homepage = https://launchpad.net/libdbusmenu-qt;
     description = "Provides a Qt implementation of the DBusMenu spec";
     maintainers = [ maintainers.ttuegel ];
     inherit (qtbase.meta) platforms;
diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index 036adcef74c..be7852e6cdd 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch;
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/libdc1394/;
+    homepage = https://sourceforge.net/projects/libdc1394/;
     description = "Capture and control API for IIDC compliant cameras";
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.viric ];
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index a8cf2864807..17d09366a9d 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
 
   meta = {
-    homepage = http://dri.freedesktop.org/libdrm/;
+    homepage = https://dri.freedesktop.org/libdrm/;
     description = "Library for accessing the kernel's Direct Rendering Manager";
     license = "bsd";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index e8c374297d3..a5058de597e 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
-    homepage = http://sourceforge.net/projects/libdv/;
+    homepage = https://sourceforge.net/projects/libdv/;
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index f40f45d0e41..5f422f7018b 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.flamingspork.com/projects/libeatmydata/;
+    homepage = https://www.flamingspork.com/projects/libeatmydata/;
     license = stdenv.lib.licenses.gpl3Plus;
     description = "Small LD_PRELOAD library to disable fsync and friends";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index 7b7f880ab9e..40d80329291 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Extensible Binary Meta Language library";
     license = licenses.lgpl21;
-    homepage = http://dl.matroska.org/downloads/libebml/;
+    homepage = https://dl.matroska.org/downloads/libebml/;
     maintainers = [ maintainers.spwhitt ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index 06f0bc89c2b..ec53b50b5af 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library for support of the Expert Witness Compression Format";
-    homepage = http://sourceforge.net/projects/libewf/;
+    homepage = https://sourceforge.net/projects/libewf/;
     license = stdenv.lib.licenses.lgpl3;
     maintainers = [ stdenv.lib.maintainers.raskin ] ;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 47814ef2f25..9639f4008f5 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Foreign function call library";
-    homepage = http://www.haible.de/bruno/packages-ffcall.html;
+    homepage = https://www.haible.de/bruno/packages-ffcall.html;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index 180aab09188..17cf93473d6 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library to talk to FTDI chips using libusb";
-    homepage = http://www.intra2net.com/en/developer/libftdi/;
+    homepage = https://www.intra2net.com/en/developer/libftdi/;
     license = with licenses; [ lgpl2 gpl2 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
index f0d05c0b263..2f499d3af87 100644
--- a/pkgs/development/libraries/libftdi/default.nix
+++ b/pkgs/development/libraries/libftdi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A library to talk to FTDI chips using libusb";
-    homepage = http://www.intra2net.com/en/developer/libftdi/;
+    homepage = https://www.intra2net.com/en/developer/libftdi/;
     license = stdenv.lib.licenses.lgpl21;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 389f899e3ef..3d49fa06450 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
-    homepage = http://www.remotesensing.org/geotiff/geotiff.html;
+    homepage = https://www.remotesensing.org/geotiff/geotiff.html;
     license = stdenv.lib.licenses.mit;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index f2f062785b6..6e036522b1c 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GNOME's Structured File Library";
-    homepage    = http://www.gnome.org/projects/libgsf;
+    homepage    = https://www.gnome.org/projects/libgsf;
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix
index 6a8af9ccac6..970cb8a530f 100644
--- a/pkgs/development/libraries/libibmad/default.nix
+++ b/pkgs/development/libraries/libibmad/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libibumad ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.openfabrics.org/;
+    homepage = https://www.openfabrics.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix
index 2f6a574c989..a7950de3aef 100644
--- a/pkgs/development/libraries/libibumad/default.nix
+++ b/pkgs/development/libraries/libibumad/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://www.openfabrics.org/;
+    homepage = https://www.openfabrics.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index aa76505c3a0..331422dd892 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
 
   meta = {
-    homepage = http://github.com/lastfm/liblastfm;
+    homepage = https://github.com/lastfm/liblastfm;
     repositories.git = git://github.com/lastfm/liblastfm.git;
     description = "Official LastFM library";
     inherit (qt4.meta) platforms;
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 37823af12e9..f6df090e8b5 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://sourceforge.net/projects/mad/;
+    homepage    = https://sourceforge.net/projects/mad/;
     description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index 81fa9011e30..9ad959ae22e 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library to parse Matroska files";
-    homepage = http://matroska.org/;
+    homepage = https://matroska.org/;
     license = licenses.lgpl21;
     maintainers = [ maintainers.spwhitt ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
index 8e684f7af1f..d36d483b92c 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       Whilst Profanity will run against libstrophe, libmesode provides extra
       TLS functionality such as manual SSL certificate verification.
     '';
-    homepage = http://github.com/boothj5/libmesode/;
+    homepage = https://github.com/boothj5/libmesode/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.devhell ];
diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix
index 54cef0c4f5c..7e5ac2a2297 100644
--- a/pkgs/development/libraries/libmp3splt/default.nix
+++ b/pkgs/development/libraries/libmp3splt/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-pcre";
 
   meta = with stdenv.lib; {
-    homepage    = http://sourceforge.net/projects/mp3splt/;
+    homepage    = https://sourceforge.net/projects/mp3splt/;
     description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
     maintainers = with maintainers; [ bosu ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index 09d41c8bbe9..67aec7fc974 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A de/compression library for various Microsoft formats";
-    homepage = http://www.cabextract.org.uk/libmspack;
+    homepage = https://www.cabextract.org.uk/libmspack;
     license = stdenv.lib.licenses.lgpl2;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix
index 1e445b20f68..a93c16d784d 100644
--- a/pkgs/development/libraries/libnet/default.nix
+++ b/pkgs/development/libraries/libnet/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/sam-github/libnet;
+    homepage = https://github.com/sam-github/libnet;
     description = "Portable framework for low-level network packet construction";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index 09be1b41353..7e9ae1608d2 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ glib gupnp_igd ];
 
   meta = {
-    homepage = http://nice.freedesktop.org/wiki/;
+    homepage = https://nice.freedesktop.org/wiki/;
     description = "The GLib ICE implementation";
     longDescription = ''
       Libnice is an implementation of the IETF's Interactice Connectivity
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 15f58135040..c5cb85d91ba 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "doc" ];
 
   meta = with stdenv.lib; {
-    homepage = http://xiph.org/ogg/;
+    homepage = https://xiph.org/ogg/;
     license = licenses.bsd3;
     maintainers = [ maintainers.ehmry ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix
index 83bb80cc320..ed46919f26c 100644
--- a/pkgs/development/libraries/liboggz/default.nix
+++ b/pkgs/development/libraries/liboggz/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = http://xiph.org/oggz/;
+    homepage = https://xiph.org/oggz/;
     description = "A C library and tools for manipulating with Ogg files and streams";
     longDescription = ''
       Oggz comprises liboggz and the tool oggz, which provides commands to
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index 6328494c17e..5140402eacb 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   patches = [ ./fedora-fixes.patch ];
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/omxil/;
+    homepage = https://sourceforge.net/projects/omxil/;
     description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
     license = licenses.lgpl21;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index f1c421b4bf7..98853d08cfe 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = http://github.com/JonathanBeck/libplist;
+    homepage = https://github.com/JonathanBeck/libplist;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
   };
diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix
index add0a5bc2bb..a5e4c4410c0 100644
--- a/pkgs/development/libraries/libqrencode/default.nix
+++ b/pkgs/development/libraries/libqrencode/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = http://fukuchi.org/works/qrencode/;
+    homepage = https://fukuchi.org/works/qrencode/;
     description = "A C library for encoding data in a QR Code symbol";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 0047f30aad2..63a6b697eb2 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
-    homepage = http://www.libraw.org/;
+    homepage = https://www.libraw.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index 88666310158..945e11d1bce 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Lightweight RDF library with special support for LADSPA plugins";
-    homepage = http://sourceforge.net/projects/lrdf/;
+    homepage = https://sourceforge.net/projects/lrdf/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix
index b6f7411a1c2..06d9994a529 100644
--- a/pkgs/development/libraries/mesa-glu/default.nix
+++ b/pkgs/development/libraries/mesa-glu/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "OpenGL utility library";
-    homepage = http://cgit.freedesktop.org/mesa/glu/;
+    homepage = https://cgit.freedesktop.org/mesa/glu/;
     license = stdenv.lib.licenses.sgi-b-20;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 92fe4b4ab27..fe90d41ccb2 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://github.com/opencollab/arpack-ng;
+    homepage = https://github.com/opencollab/arpack-ng;
     description = ''
       A collection of Fortran77 subroutines to solve large scale eigenvalue
       problems.
diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index 4a40806c4eb..48c2428bbcd 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A clean C library for processing UTF-8 Unicode data";
-    homepage = http://julialang.org/utf8proc;
+    homepage = https://julialang.org/utf8proc;
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = [ maintainers.ftrvxmtrx ];
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index dcdc55f0aef..989d8bc7003 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.4.5";
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/bazelbuild/bazel/;
+    homepage = https://github.com/bazelbuild/bazel/;
     description = "Build tool that builds code quickly and reliably";
     license = licenses.asl20;
     maintainers = [ maintainers.philandstuff ];
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 1e5fb8458e5..05bf8e76db7 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://leiningen.org/;
+    homepage = https://leiningen.org/;
     description = "Project automation for Clojure";
     license = stdenv.lib.licenses.epl10;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
index 439e224c455..95f992e490f 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "DTS Coherent Acoustics decoder with support for HD extensions";
     maintainers = with maintainers; [ edwtjo ];
-    homepage = http://github.com/foo86/dcadec;
+    homepage = https://github.com/foo86/dcadec;
     license = licenses.lgpl21;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index b46b0be748a..50668408834 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.gtk.org/gtk-doc;
+    homepage = https://www.gtk.org/gtk-doc;
     description = "Tools to extract documentation embedded in GTK+ and GNOME source code";
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix
index e6c7dcbd362..c2bf7e0a831 100644
--- a/pkgs/development/tools/misc/automoc4/default.nix
+++ b/pkgs/development/tools/misc/automoc4/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake qt4 ];
   
   meta = with stdenv.lib; {
-    homepage = http://techbase.kde.org/Development/Tools/Automoc4;
+    homepage = https://techbase.kde.org/Development/Tools/Automoc4;
     description = "KDE Meta Object Compiler";
     license = licenses.bsd2;
     maintainers = [ maintainers.sander ];
diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix
index eb81b7136f3..77cb8676669 100644
--- a/pkgs/development/tools/misc/avarice/default.nix
+++ b/pkgs/development/tools/misc/avarice/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     license = stdenv.lib.licenses.gpl2;
     description = "Translator between GDB's remote debug protocol and the AVR JTAG ICE protocol";
-    homepage = http://sourceforge.net/projects/avarice/files/avarice/;
+    homepage = https://sourceforge.net/projects/avarice/files/avarice/;
     maintainers = [ stdenv.lib.maintainers.smironov ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
index 2cc8e640631..51610349c45 100644
--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    homepage = http://sourceforge.net/projects/cbrowser/;
+    homepage = https://sourceforge.net/projects/cbrowser/;
 
     maintainers = with stdenv.lib.maintainers; [viric];
 
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index 563d7693088..2564b42731b 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/projects/checkbaskisms/;
+    homepage = https://sourceforge.net/projects/checkbaskisms/;
     description = "Check shell scripts for non-portable syntax";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index e7c6b108cdd..f9a640d4703 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Command-line shell and Unix scripting interface for Drupal";
-    homepage    = http://github.com/drush-ops/drush;
+    homepage    = https://github.com/drush-ops/drush;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
index 30cbc0daab9..a6de652f900 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib dbus dbus_glib ];
 
   meta = {
-    homepage = http://hal.freedesktop.org/releases/;
+    homepage = https://hal.freedesktop.org/releases/;
     description = "D-Bus bindings for GObject";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index 3c5dacb6f65..3e48192d00e 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Translation helper tool";
-    homepage = http://launchpad.net/intltool/;
+    homepage = https://launchpad.net/intltool/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.unix;
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index ef8ac133b2c..f3f137da757 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       over configuration to provide a productive and stream-lined development
       experience.
     '';
-    homepage = http://grails.org/;
+    homepage = https://grails.org/;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 2c54d9ef828..f61b8bc1dcf 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open-source game of ancient warfare -- data files";
-    homepage = http://wildfiregames.com/0ad/;
+    homepage = https://wildfiregames.com/0ad/;
     license = licenses.cc-by-sa-30;
     platforms = platforms.linux;
     hydraPlatforms = [];
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 35d6487f21e..c1b69eb3120 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open-source game of ancient warfare";
-    homepage = http://wildfiregames.com/0ad/;
+    homepage = https://wildfiregames.com/0ad/;
     license = with licenses; [
       gpl2 lgpl21 mit cc-by-sa-30
       licenses.zlib # otherwise masked by pkgs.zlib
diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix
index 93f341298a8..3f490b2976c 100644
--- a/pkgs/games/btanks/default.nix
+++ b/pkgs/games/btanks/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/projects/btanks/;
+    homepage = https://sourceforge.net/projects/btanks/;
     description = "Fast 2d tank arcade game";
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index 0a94a1c433d..41110195509 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes.
     '';
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://sourceforge.net/projects/extremetuxracer/;
+    homepage = https://sourceforge.net/projects/extremetuxracer/;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 3be2d9757c0..d94a1f9a8d4 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://ioquake3.org/;
+    homepage = https://ioquake3.org/;
     description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 430a5348398..0bd40721c4e 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Ghostscript and cups printer drivers";
-    homepage = http://sourceforge.net/projects/gimp-print/;
+    homepage = https://sourceforge.net/projects/gimp-print/;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index b1495987e61..ea794c3f06b 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
         - NEC's PC Engine, SuperGrafx;
         - Bandai' WonderSwan, WonderSwan Color.
     '';
-    homepage = http://byuu.org/higan/;
+    homepage = https://byuu.org/higan/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = with platforms; unix;
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 319003400d0..c2ec16081e8 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -33,7 +33,7 @@ let
 
     meta = with stdenv.lib; {
       inherit description;
-      homepage = http://www.libretro.com/;
+      homepage = https://www.libretro.com/;
       license = licenses.gpl3Plus;
       maintainers = with maintainers; [ edwtjo hrdinka MP2E ];
       platforms = platforms.linux;
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index c8edeaf93a1..57c87b57731 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
   passthru = { inherit version; };
 
   meta = {
-    homepage = http://www.ghostscript.com/;
+    homepage = https://www.ghostscript.com/;
     description = "PostScript interpreter (mainline version)";
 
     longDescription = ''
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
index 17aa60162ad..dbc0beb1872 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/pkgs/misc/themes/blackbird/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Dark Desktop Suite for Gtk, Xfce and Metacity";
-    homepage = http://github.com/shimmerproject/Blackbird;
+    homepage = https://github.com/shimmerproject/Blackbird;
     license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index b815cd778fa..6dae0f6bb38 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       the "old" `apm' command on ACPI systems.  It includes
       battery and thermal information.
     '';
-    homepage = http://sourceforge.net/projects/acpiclient/;
+    homepage = https://sourceforge.net/projects/acpiclient/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.mornfall ];
diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 3a1407aae1f..9105f635ae9 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
+    homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
     description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, information distribution tool";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ fpletz ];
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 5f659eb9884..7ea8cf6d1bf 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
+    homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
     description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 4270f37594e..4514e18f44f 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
+    homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
     description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 2548e33bf4c..bab8c5502de 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tiny versions of common UNIX utilities in a single small executable";
-    homepage = http://busybox.net/;
+    homepage = https://busybox.net/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix
index b24099f9599..7532f8bfc27 100644
--- a/pkgs/os-specific/linux/edac-utils/default.nix
+++ b/pkgs/os-specific/linux/edac-utils/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/grondo/edac-utils;
+    homepage = https://github.com/grondo/edac-utils;
     description = "Handles the reporting of hardware-related memory errors";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index 54ca7d9e324..9e61c377ecf 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = ''http://www.gentoo.org/proj/en/eudev/'';
+    homepage = ''https://www.gentoo.org/proj/en/eudev/'';
     downloadPage = ''http://dev.gentoo.org/~blueness/eudev/'';
     updateWalker = true;
   };
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index e9af25809ed..9230e6920f9 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = http://l3net.wordpress.com/projects/firejail/;
+    homepage = https://l3net.wordpress.com/projects/firejail/;
     downloadPage = "http://sourceforge.net/projects/firejail/files/firejail/";
   };
 }
diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index fa63cddfcdb..0f0eab1fa20 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tool to get/set ATA/SATA drive parameters under Linux";
-    homepage = http://sourceforge.net/projects/hdparm/;
+    homepage = https://sourceforge.net/projects/hdparm/;
     platforms = platforms.linux;
     license = licenses.bsd2;
     maintainers = [ maintainers.fuuzetsu ];
diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix
index 014fe41afc8..c3730dd8de5 100644
--- a/pkgs/os-specific/linux/ima-evm-utils/default.nix
+++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)";
-    homepage = http://sourceforge.net/projects/linux-ima/;
+    homepage = https://sourceforge.net/projects/linux-ima/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 0700191e7a8..6a070610662 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       - Asynchronous background rendering of the next page
       - Customizable multi-threaded caching
     '';
-    homepage = http://seasonofcode.com/pages/jfbview.html;
+    homepage = https://seasonofcode.com/pages/jfbview.html;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index c295293fa2c..70544ff9294 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -207,7 +207,7 @@ let
             + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches))
             + ")");
         license = stdenv.lib.licenses.gpl2;
-        homepage = http://www.kernel.org/;
+        homepage = https://www.kernel.org/;
         repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;
         maintainers = [
           maintainers.thoughtpolice
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 5d0dca7b6be..c55ebffa829 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/;
+    homepage = https://www.kernel.org/pub/linux/utils/kernel/kmod/;
     description = "Tools for loading and managing Linux kernel modules";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 622bf4fbd5c..3adedf8c1dd 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "V4L utils and libv4l, provide common image formats regardless of the v4l device";
-    homepage = http://linuxtv.org/projects.php;
+    homepage = https://linuxtv.org/projects.php;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ codyopel viric ];
     platforms = platforms.linux;
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index 8478804a7b0..d83e32bcb39 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.tinkerforge.com/;
+    homepage = https://www.tinkerforge.com/;
     description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages";
     maintainers = [ stdenv.lib.maintainers.qknight ];
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
index caf3792e983..b4cbca22c30 100644
--- a/pkgs/servers/consul/ui.nix
+++ b/pkgs/servers/consul/ui.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://www.consul.io/;
+    homepage    = https://www.consul.io/;
     description = "A tool for service discovery, monitoring and configuration";
     maintainers = with maintainers; [ cstrahan wkennington ];
     license     = licenses.mpl20 ;
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 7e4c69e3862..f88b7e74ffd 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "MediaBrowser - Bring together your videos, music, photos, and live television";
-    homepage = http://emby.media/;
+    homepage = https://emby.media/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.fadenb ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix
index 3e097c0ebd4..3f600b5a122 100644
--- a/pkgs/servers/fleet/default.nix
+++ b/pkgs/servers/fleet/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A distributed init system";
-    homepage = http://coreos.com/using-coreos/clustering/;
+    homepage = https://coreos.com/using-coreos/clustering/;
     license = licenses.asl20;
     maintainers = with maintainers; [
       cstrahan
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index 5c72ac97bc0..a48ee83755b 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Client library for MPD (music player daemon)";
-    homepage = http://www.musicpd.org/libs/libmpdclient/;
+    homepage = https://www.musicpd.org/libs/libmpdclient/;
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ mornfall ehmry ];
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 5c9737660c4..97e7a9daf65 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
-    homepage = http://freeswitch.org/;
+    homepage = https://freeswitch.org/;
     license = stdenv.lib.licenses.mpl11;
     maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 7b725bfeb57..7868c2726ec 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/Bumblebee-Project/Bumblebee;
+    homepage = https://github.com/Bumblebee-Project/Bumblebee;
     description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)";
     platforms = platforms.linux;
     license = licenses.gpl3;
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
index eeaf5dac7c6..9de29da9b44 100644
--- a/pkgs/tools/X11/hsetroot/default.nix
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Allows you to compose wallpapers ('root pixmaps') for X";
-    homepage = http://thegraveyard.org/hsetroot.html;
+    homepage = https://thegraveyard.org/hsetroot.html;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.henrytill ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix
index 7a1eec92bbe..2e9d8cafdc0 100644
--- a/pkgs/tools/archivers/cabextract/default.nix
+++ b/pkgs/tools/archivers/cabextract/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://www.cabextract.org.uk/;
+    homepage = https://www.cabextract.org.uk/;
     description = "Free Software for extracting Microsoft cabinet files";
     platforms = platforms.all;
     license = licenses.gpl3;
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index b8341204e92..b14364c2b79 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   }) ];
 
   meta = with stdenv.lib; {
-    homepage = http://acoustid.org/fingerprinter;
+    homepage = https://acoustid.org/fingerprinter;
     description = "Audio fingerprinting tool using chromaprint";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with maintainers; [ ehmry ];
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index f7382997f16..91f7637e1bc 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
-    homepage = http://brettcsmith.org/2007/dtrx/;
+    homepage = https://brettcsmith.org/2007/dtrx/;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.spwhitt ];
     platforms = platforms.all;
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index 1eedff5c011..61c7f26db1e 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       User documentation is in Documentation/bcache.txt in the Linux kernel
       tree.
     '';
-    homepage = http://bcache.evilpiepirate.org/;
+    homepage = https://bcache.evilpiepirate.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 2eeb2003a19..dc6bcca597b 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Utilities for creating and checking FAT and VFAT file systems";
     repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git;
-    homepage = http://www.daniel-baumann.ch/software/dosfstools/;
+    homepage = https://www.daniel-baumann.ch/software/dosfstools/;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix
index ba28b67d75b..a5045f97b45 100644
--- a/pkgs/tools/graphics/briss/default.nix
+++ b/pkgs/tools/graphics/briss/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/projects/briss/;
+    homepage = https://sourceforge.net/projects/briss/;
     description = "Java application for cropping PDF files";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index 2b88ada21aa..8c53882ff1b 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Context-free design grammar - a tool for graphics generation";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
-    homepage = http://contextfreeart.org/;
-    downloadPage = "http://contextfreeart.org/mediawiki/index.php/Download_page";
+    homepage = https://contextfreeart.org/;
+    downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page";
   };
 }
diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/tools/graphics/cfdg/src-info-for-default.nix
index 42295c82216..0e2018b6bfd 100644
--- a/pkgs/tools/graphics/cfdg/src-info-for-default.nix
+++ b/pkgs/tools/graphics/cfdg/src-info-for-default.nix
@@ -1,5 +1,5 @@
 {
-  downloadPage = "http://contextfreeart.org/mediawiki/index.php/Download_page";
+  downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page";
   baseName = "cfdg";
   sourceRegexp = ''.*[.]tgz'';
   versionExtractorSedScript = ''s/[^0-9]*([0-9.]*)[.]tgz/\1/'';
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index 95acb08fbf0..86848f95883 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = http://cgit.freedesktop.org/xorg/app/editres/;
+    homepage = https://cgit.freedesktop.org/xorg/app/editres/;
     description = "A dynamic resource editor for X Toolkit applications";
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix
index fe01a9459ec..e4163cd93a8 100644
--- a/pkgs/tools/graphics/pngtoico/default.nix
+++ b/pkgs/tools/graphics/pngtoico/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpng ];
 
   meta = {
-    homepage = http://www.kernel.org/pub/software/graphics/pngtoico/;
+    homepage = https://www.kernel.org/pub/software/graphics/pngtoico/;
     description = "Small utility to convert a set of PNG images to Microsoft ICO format";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 40f61253306..104e423bd72 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = http://fukuchi.org/works/qrencode/;
+    homepage = https://fukuchi.org/works/qrencode/;
     description = "QR code encoder";
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 53aec187bb7..a18fabcb4e5 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Encrypt files with Advanced Encryption Standard (AES)";
-    homepage    = http://www.aescrypt.com/;
+    homepage    = https://www.aescrypt.com/;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 qknight ];
     platforms   = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 43f69a82e7f..dc67c96ca1a 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -44,7 +44,7 @@ in
     };
 
     meta = {
-      homepage = http://github.com/phillipberndt/autorandr/;
+      homepage = https://github.com/phillipberndt/autorandr/;
       description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr";
       license = stdenv.lib.licenses.gpl3Plus;
       maintainers = [ stdenv.lib.maintainers.coroa ];
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix
index 25e083b6bf5..8219d110f2e 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/pkgs/tools/misc/fluentd/default.nix
@@ -8,7 +8,7 @@ bundlerEnv {
 
   meta = with lib; {
     description = "A data collector";
-    homepage    = http://www.fluentd.org/;
+    homepage    = https://www.fluentd.org/;
     license     = licenses.asl20;
     maintainers = with maintainers; [ offline ];
     platforms   = platforms.unix;
diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix
index 2a4de41332e..e50df02a118 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/pkgs/tools/misc/hakuneko/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Manga downloader";
-    homepage = http://sourceforge.net/projects/hakuneko/;
+    homepage = https://sourceforge.net/projects/hakuneko/;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 192da26b452..ea71def3619 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
       applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and 
       applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
     '';
-    homepage = http://www.hdfgroup.org/HDF5/;
+    homepage = https://www.hdfgroup.org/HDF5/;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix
index 1d1ff991f3b..9706e3f0288 100644
--- a/pkgs/tools/misc/mstflint/default.nix
+++ b/pkgs/tools/misc/mstflint/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib libibmad ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.openfabrics.org/;
+    homepage = https://www.openfabrics.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index daf5a19b01c..b2f64aca2d3 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     optional gnutlsSupport gnutls ++
     optional scpSupport libssh2;
 
-  # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
+  # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html
   preConfigure = ''
     sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
     rm src/tool_hugehelp.c
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A command line tool for transferring files with URL syntax";
-    homepage    = http://curl.haxx.se/;
+    homepage    = https://curl.haxx.se/;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index beffb0c05e8..7204ddd5e06 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
-    homepage = http://roy.marples.name/projects/dhcpcd;
+    homepage = https://roy.marples.name/projects/dhcpcd;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ eelco fpletz ];
   };
diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix
index c7a6fbcfd7c..d8c60882cd4 100644
--- a/pkgs/tools/networking/email/default.nix
+++ b/pkgs/tools/networking/email/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Command line SMTP client";
     license = with lib.licenses; [ gpl2 ];
-    homepage = http://deanproxy.com/code;
+    homepage = https://deanproxy.com/code;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index 84420aa3efb..b445dd93c4c 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "A command line HTTP client whose goal is to make CLI human-friendly";
-    homepage = http://httpie.org/;
+    homepage = https://httpie.org/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ];
   };
diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix
index 557fce6d94b..a7d42b77317 100644
--- a/pkgs/tools/networking/hyenae/default.nix
+++ b/pkgs/tools/networking/hyenae/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "";
-    homepage = http://sourceforge.net/projects/hyenae/;
+    homepage = https://sourceforge.net/projects/hyenae/;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix
index fba6ae92b03..6f2ca96d120 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/pkgs/tools/networking/iperf/2.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/iperf/;
+    homepage = https://sourceforge.net/projects/iperf/;
     description = "Tool to measure IP bandwidth using UDP or TCP";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index e95cba18e10..b9abba2cd0d 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     license = licenses.bsd3;
-    homepage = http://www.kernel.org/pub/software/network/tftp/;
+    homepage = https://www.kernel.org/pub/software/network/tftp/;
   };
 
   passthru = {
     updateInfo = {
-      downloadPage = "http://www.kernel.org/pub/software/network/tftp/";
+      downloadPage = "https://www.kernel.org/pub/software/network/tftp/";
     };
   };
 }
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 0d7a5449d6e..d262253a51f 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The Debian package manager";
-    homepage = http://wiki.debian.org/Teams/Dpkg;
+    homepage = https://wiki.debian.org/Teams/Dpkg;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [ mornfall nckx ];
diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix
index fdd49cc3c27..298dd336be1 100644
--- a/pkgs/tools/security/hashcat/default.nix
+++ b/pkgs/tools/security/hashcat/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Fast password cracker";
-    homepage    = "http://hashcat.net/hashcat/";
+    homepage    = "https://hashcat.net/hashcat/";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix
index 1cb028a1a33..7a0d7241bbf 100644
--- a/pkgs/tools/security/hashcat/hashcat3/default.nix
+++ b/pkgs/tools/security/hashcat/hashcat3/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Fast password cracker";
-    homepage    = http://hashcat.net/hashcat/;
+    homepage    = https://hashcat.net/hashcat/;
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.kierdavis ];
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 185645763fd..4c1a5431f3e 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   meta = {
     description = ''The classical Unix `at' job scheduling command'';
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://packages.qa.debian.org/at;
+    homepage = https://packages.qa.debian.org/at;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index d2d14ddd110..13c2938f63b 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       different by pre-loading a small library which modifies the time,
       gettimeofday and clock_gettime system calls.
     '';
-    homepage = http://packages.qa.debian.org/d/datefudge.html;
+    homepage = https://packages.qa.debian.org/d/datefudge.html;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ leenaars ];
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
index 7b2ca93cc0d..80d6f6a42f8 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/pkgs/tools/system/dfc/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake gettext ];
 
   meta = {
-    homepage = http://projects.gw-computing.net/projects/dfc;
+    homepage = https://projects.gw-computing.net/projects/dfc;
     description = "Displays file system space usage using graphs and colors";
     license="free";
     maintainers = with stdenv.lib.maintainers; [qknight];
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index 7661db22cc1..381dc8dd457 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting";
-    homepage = http://www.colordiff.org/;
+    homepage = https://www.colordiff.org/;
     license = licenses.gpl3;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix
index aff11fd6127..5f926f771c5 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/pkgs/tools/typesetting/fop/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
       This package contains the fop command line tool.
     '';
-    homepage = http://xmlgraphics.apache.org/fop/;
+    homepage = https://xmlgraphics.apache.org/fop/;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor ndowens ];
diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix
index 84cd2cf921a..f0ed44351a2 100644
--- a/pkgs/tools/typesetting/halibut/default.nix
+++ b/pkgs/tools/typesetting/halibut/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "halibut-1.2";
 
   src = fetchurl {
-    url = "http://www.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz";
+    url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz";
     sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s";
   };
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Documentation production system for software manuals";
-    homepage = http://www.chiark.greenend.org.uk/~sgtatham/halibut/;
+    homepage = https://www.chiark.greenend.org.uk/~sgtatham/halibut/;
     license = licenses.mit;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; unix;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index ac4c5eaac64..fe3f89ef804 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -443,7 +443,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
     meta = {
       description = "Excel-DNA is an independent project to integrate .NET into Excel";
-      homepage = "http://excel-dna.net/";
+      homepage = "https://excel-dna.net/";
       license = stdenv.lib.licenses.mit;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
       platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0fd99d1774..aa3723dcb40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3376,7 +3376,7 @@ in {
     doCheck = false;
 
     meta = {
-      description = "Python client for Consul (http://www.consul.io/)";
+      description = "Python client for Consul (https://www.consul.io/)";
       homepage = https://github.com/cablehead/python-consul;
       license = licenses.mit;
       maintainers = with maintainers; [ desiderius ];

From a1c953dfc77f603ed8a6c7e992f11dc7c9b4131e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 3 Aug 2017 11:05:21 +0100
Subject: [PATCH 1438/3246] terraform: 0.9.11 -> 0.10.0

---
 pkgs/applications/networking/cluster/terraform/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                            | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 92b043cfdbd..0e3ceef9348 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -54,4 +54,9 @@ in {
     # checks are failing again
     doCheck = false;
   };
+
+  terraform_0_10_0 = generic {
+    version = "0.10.0";
+    sha256 = "1z6pmyfh4z5w8k2j46ancc0m9lsiq6d0m56nxj1kawb3n5q9dgds";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 042d8f56bf1..5e9f6246d01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18918,11 +18918,13 @@ with pkgs;
   inherit (callPackage ../applications/networking/cluster/terraform {})
     terraform_0_8_5
     terraform_0_8_8
-    terraform_0_9_11;
+    terraform_0_9_11
+    terraform_0_10_0;
 
   terraform_0_8 = terraform_0_8_8;
   terraform_0_9 = terraform_0_9_11;
-  terraform = terraform_0_9;
+  terraform_0_10 = terraform_0_10_0;
+  terraform = terraform_0_10;
 
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
 

From a2825a3c6f445175d4ad8dc52b8c02af3c629571 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Jul 2017 03:00:45 +0200
Subject: [PATCH 1439/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4-2-ge4f891e from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c54ab27c33d1eb1f42219d89a8e87582754b0330.
---
 .../haskell-modules/hackage-packages.nix      | 4858 +++++++++++++++--
 1 file changed, 4436 insertions(+), 422 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f5b5e42f065..3b2d9594d98 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3552,6 +3552,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "DOH" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
+     , filepath, http-client, http-client-tls, http-types
+     , interpolatedstring-perl6, lens, mtl, QuickCheck
+     , quickcheck-instances, text, time, unordered-containers, uri
+     }:
+     mkDerivation {
+       pname = "DOH";
+       version = "0.1.1.1";
+       sha256 = "14wj5jdj0s3ygxqz46622j241hxz0h5apmnq7w407xk590c74z64";
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring containers filepath http-client
+         http-client-tls http-types lens mtl text time unordered-containers
+         uri
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing base bytestring containers filepath http-client
+         http-client-tls http-types interpolatedstring-perl6 lens mtl
+         QuickCheck quickcheck-instances text time unordered-containers uri
+       ];
+       description = "Complete API bindings for DigitalOcean API V2";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "DOM" = callPackage
     ({ mkDerivation, base, mtl, WebBits }:
      mkDerivation {
@@ -4580,6 +4604,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Earley_0_12_0_1" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.12.0.1";
+       sha256 = "1cfmarpbldayhdynahw5gkxspsgi4kkjcybisk4kzhdj40yaj9pw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ListLike ];
+       executableHaskellDepends = [ base unordered-containers ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ListLike parsec
+       ];
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Ebnf2ps" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy
      , old-time, unix
@@ -5705,6 +5753,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Frames_0_2_1" = callPackage
+    ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml
+     , HUnit, pipes, pretty, primitive, readable, regex-applicative
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector, vinyl
+     }:
+     mkDerivation {
+       pname = "Frames";
+       version = "0.2.1";
+       sha256 = "1mj2s4afj5wlpg3893j2nd5z98vcxqxi83s1z82lknaq6i7n805q";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ghc-prim pipes primitive readable template-haskell text
+         transformers vector vinyl
+       ];
+       testHaskellDepends = [
+         base directory hspec htoml HUnit pipes pretty regex-applicative
+         template-haskell temporary text unordered-containers
+       ];
+       benchmarkHaskellDepends = [ base criterion pipes transformers ];
+       description = "Data frames For working with tabular data files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Frank" = callPackage
     ({ mkDerivation, base, mtl, newtype, she, void }:
      mkDerivation {
@@ -6118,8 +6192,8 @@ self: {
      }:
      mkDerivation {
        pname = "Gamgine";
-       version = "0.5.1";
-       sha256 = "07srdid5354y2za3hc76j2rjb84y77vjaz8gdhlp7qnbmfsnqipd";
+       version = "0.5.2";
+       sha256 = "0kry2ni9ba3sf2dpsjz0dq4dwnbgjicr1lwl7q4r8w6my94gkas0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring composition cpphs data-lens directory
@@ -9176,6 +9250,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HaskellNet-SSL_0_3_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, connection, data-default
+     , HaskellNet, network, tls
+     }:
+     mkDerivation {
+       pname = "HaskellNet-SSL";
+       version = "0.3.4.0";
+       sha256 = "03q48g4gzmhjl4a5wwn0q3man8s44pn028a0fidjpmfmgxa95bl3";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring connection data-default HaskellNet network tls
+       ];
+       homepage = "https://github.com/dpwright/HaskellNet-SSL";
+       description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HaskellTorrent" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cml, containers
      , directory, hopenssl, hslogger, HTTP, HUnit, mtl, network, parsec
@@ -10635,6 +10727,8 @@ self: {
        pname = "JuicyPixels-scale-dct";
        version = "0.1.1.2";
        sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs";
+       revision = "1";
+       editedCabalFile = "08myhf2912c5hd7hhiq58lsylfpj2zwhak5kmhhcffc7zsvhcl24";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -11220,17 +11314,20 @@ self: {
      }) {};
 
   "Lazy-Pbkdf2" = callPackage
-    ({ mkDerivation, base, base16-bytestring, binary, bytestring
-     , cryptonite, memory
+    ({ mkDerivation, base, base16-bytestring, binary, byteable
+     , bytestring, criterion, cryptonite, memory
      }:
      mkDerivation {
        pname = "Lazy-Pbkdf2";
-       version = "2.1.2";
-       sha256 = "18x1md6ljxksqfp2336bk8l7fhw2rgafa0kqg8x1lskml9xkjfca";
+       version = "3.0.0";
+       sha256 = "0rcbsjypr4k5s8jsw1wchl9y3v7b9nvy92046hvzah69rd2hcqj1";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [
          base base16-bytestring binary bytestring cryptonite memory
        ];
+       benchmarkHaskellDepends = [
+         base binary byteable bytestring criterion cryptonite memory
+       ];
        description = "Lazy PBKDF2 generator";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -15726,8 +15823,8 @@ self: {
     ({ mkDerivation, base, containers, ghc, ghc-paths }:
      mkDerivation {
        pname = "SSTG";
-       version = "0.1.0.8";
-       sha256 = "1qnjskpwf4zxzcf443qq31zm7rc6p4ch46p1mh19vm4hq2bnkcfl";
+       version = "0.1.1.2";
+       sha256 = "1vf5c5k6b5nww2acm0r17imcpsl2p6xbg4qqzwdalpj7xhd3bvi9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ghc ghc-paths ];
@@ -20706,26 +20803,28 @@ self: {
      }) {};
 
   "activehs" = callPackage
-    ({ mkDerivation, activehs-base, array, base, blaze-html, bytestring
-     , cmdargs, containers, data-pprint, deepseq, dia-base
-     , dia-functions, directory, filepath, haskell-src-exts
-     , highlighting-kate, hint, hoogle, mtl, old-locale, old-time
-     , pandoc, process, pureMD5, QuickCheck, simple-reflect, snap-core
-     , snap-server, split, syb, text, time, utf8-string, xhtml
+    ({ mkDerivation, activehs-base, array, base, blaze-html
+     , blaze-markup, bytestring, cmdargs, containers, data-pprint
+     , deepseq, dia-base, dia-functions, directory, exceptions, filepath
+     , haskell-src-exts, highlighting-kate, hint, hoogle, mtl
+     , old-locale, old-time, pandoc, process, pureMD5, QuickCheck
+     , simple-reflect, snap-core, snap-server, split, syb, text, time
+     , utf8-string, xhtml
      }:
      mkDerivation {
        pname = "activehs";
-       version = "0.3.1";
-       sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc";
+       version = "0.3.2";
+       sha256 = "0n5bb5bdigf3b0016ljv5r3bki3fq6j5dv7csvkdq7pdvghzw3gp";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         activehs-base array base blaze-html bytestring cmdargs containers
-         data-pprint deepseq dia-base dia-functions directory filepath
-         haskell-src-exts highlighting-kate hint hoogle mtl old-locale
-         old-time pandoc process pureMD5 QuickCheck simple-reflect snap-core
-         snap-server split syb text time utf8-string xhtml
+         activehs-base array base blaze-html blaze-markup bytestring cmdargs
+         containers data-pprint deepseq dia-base dia-functions directory
+         exceptions filepath haskell-src-exts highlighting-kate hint hoogle
+         mtl old-locale old-time pandoc process pureMD5 QuickCheck
+         simple-reflect snap-core snap-server split syb text time
+         utf8-string xhtml
        ];
        description = "Haskell code presentation tool";
        license = stdenv.lib.licenses.bsd3;
@@ -20738,6 +20837,8 @@ self: {
        pname = "activehs-base";
        version = "0.3.0.4";
        sha256 = "0gmixyawdl0kk351k8n5g7k3cfxv1qlbish750kv5kip6xc1dmcj";
+       revision = "1";
+       editedCabalFile = "1v2sw9n9kiqc7cy0v1923ld645dykmk57bgdrgdgfv6qkfp6ghdd";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
@@ -20794,6 +20895,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ad_4_3_4" = callPackage
+    ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad
+     , containers, criterion, data-reify, directory, doctest, erf
+     , filepath, free, nats, reflection, transformers
+     }:
+     mkDerivation {
+       pname = "ad";
+       version = "4.3.4";
+       sha256 = "0r3qixsj624q5c88xlr444fn7z5c36m32ciyxz732lngg06pvwdz";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array base comonad containers data-reify erf free nats reflection
+         transformers
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       benchmarkHaskellDepends = [ base criterion erf ];
+       homepage = "http://github.com/ekmett/ad";
+       description = "Automatic Differentiation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "adaptive-containers" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -21410,18 +21533,18 @@ self: {
   "aeson-flowtyped" = callPackage
     ({ mkDerivation, aeson, base, containers, free, recursion-schemes
      , reflection, scientific, tasty, tasty-hunit, text, time
-     , unordered-containers, vector, wl-pprint
+     , transformers, unordered-containers, vector, wl-pprint
      }:
      mkDerivation {
        pname = "aeson-flowtyped";
-       version = "0.7.5";
-       sha256 = "1hhg3fai44i506d7iphi8xl2lzqr14rbc1f96wc3gayyv96ia8az";
+       version = "0.9.0";
+       sha256 = "1j593x15bm8b4l59cbzgcg6vgwibjfa4nilsj6dl1y8cfbqwj4aa";
        libraryHaskellDepends = [
          aeson base containers free recursion-schemes reflection scientific
-         text time unordered-containers vector wl-pprint
+         text time transformers unordered-containers vector wl-pprint
        ];
        testHaskellDepends = [
-         aeson base recursion-schemes tasty tasty-hunit text
+         aeson base containers recursion-schemes tasty tasty-hunit text
          unordered-containers vector
        ];
        homepage = "https://github.com/mikeplus64/aeson-flowtyped#readme";
@@ -22398,6 +22521,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alarmclock_0_4_0_3" = callPackage
+    ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }:
+     mkDerivation {
+       pname = "alarmclock";
+       version = "0.4.0.3";
+       sha256 = "0phgcmji4jrmyia6w05wqllrdl2hnsyxfkbh68dlgi7gn0c5nvxn";
+       libraryHaskellDepends = [
+         async base clock stm time unbounded-delays
+       ];
+       homepage = "https://bitbucket.org/davecturner/alarmclock";
+       description = "Wake up and perform an action at a certain time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alea" = callPackage
     ({ mkDerivation, base, optparse-applicative, random, text }:
      mkDerivation {
@@ -22637,6 +22775,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "algebraic-graphs_0_0_5" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, extra
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "algebraic-graphs";
+       version = "0.0.5";
+       sha256 = "046507r77wn4f6grxzrh2n90rnllp1inhdvn4fg9ki36k5qgqyzx";
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [ base containers extra QuickCheck ];
+       benchmarkHaskellDepends = [ base containers criterion ];
+       homepage = "https://github.com/snowleopard/alga";
+       description = "A library for algebraic graph construction and transformation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "algebraic-prelude" = callPackage
     ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
      mkDerivation {
@@ -26412,6 +26567,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "approximate_0_3_1" = callPackage
+    ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
+     , comonad, deepseq, directory, doctest, filepath, ghc-prim
+     , hashable, lens, log-domain, pointed, safecopy, semigroupoids
+     , semigroups, simple-reflect, vector
+     }:
+     mkDerivation {
+       pname = "approximate";
+       version = "0.3.1";
+       sha256 = "18ifmp1c2km3ssp51m94vxqzx7yx6c21ychp7ajnhgg7v4bgfdyq";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base binary bytes cereal comonad deepseq ghc-prim hashable lens
+         log-domain pointed safecopy semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath semigroups simple-reflect
+       ];
+       homepage = "http://github.com/analytics/approximate/";
+       description = "Approximate discrete values and numbers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "approximate-equality" = callPackage
     ({ mkDerivation, base, type-level-natural-number }:
      mkDerivation {
@@ -28143,6 +28322,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "atomic-primops_0_8_1" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive }:
+     mkDerivation {
+       pname = "atomic-primops";
+       version = "0.8.1";
+       sha256 = "0zqbx0sfgl0hi8bqavvwjxsczayxrhwjqxymaawrvn44xr9g35c1";
+       libraryHaskellDepends = [ base ghc-prim primitive ];
+       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
+       description = "A safe approach to CAS and other atomic ops in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "atomic-primops-foreign" = callPackage
     ({ mkDerivation, base, bits-atomic, HUnit, test-framework
      , test-framework-hunit, time
@@ -28336,6 +28528,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec_0_13_2_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive
+     , containers, criterion, deepseq, directory, filepath, ghc-prim
+     , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
+     , tasty, tasty-quickcheck, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "attoparsec";
+       version = "0.13.2.0";
+       sha256 = "1wrwj359r0kgrcc2kw1yl9cpvkihhq0qm3i12kw39707s6m2x0pd";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq scientific text
+         transformers
+       ];
+       testHaskellDepends = [
+         array base bytestring deepseq QuickCheck quickcheck-unicode
+         scientific tasty tasty-quickcheck text transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         array base bytestring case-insensitive containers criterion deepseq
+         directory filepath ghc-prim http-types parsec scientific text
+         transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/bos/attoparsec";
+       description = "Fast combinator parsing for bytestrings and text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "attoparsec-arff" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -30342,6 +30564,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bank-holidays-england_0_1_0_6" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "bank-holidays-england";
+       version = "0.1.0.6";
+       sha256 = "1arlyjaaq8df2q121r9lc23wacn02ncdx5b7s8yszp6szx5jivap";
+       libraryHaskellDepends = [ base containers time ];
+       testHaskellDepends = [ base containers hspec QuickCheck time ];
+       homepage = "https://bitbucket.org/davecturner/bank-holidays-england";
+       description = "Calculation of bank holidays in England and Wales";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "banwords" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit
      , test-framework, test-framework-hunit, text, vector
@@ -32272,6 +32508,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-serialise-cbor" = callPackage
+    ({ mkDerivation, base, bytestring, cborg, serialise }:
+     mkDerivation {
+       pname = "binary-serialise-cbor";
+       version = "0.1.1.0";
+       sha256 = "0wrf9skl99aalf9pbb8a43i80r8vimn6vih4sidw615cw3k4yapg";
+       libraryHaskellDepends = [ base bytestring cborg serialise ];
+       description = "Yet Another Binary Serialisation Library (compatibility shim)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "binary-shared" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, mtl }:
      mkDerivation {
@@ -32391,6 +32638,8 @@ self: {
        pname = "binary-typed";
        version = "1.0";
        sha256 = "02ans3vny69qfsmwlgri7v31rpff0h3mdp2zpikclay50a471ww5";
+       revision = "1";
+       editedCabalFile = "1jnmdi3bnyiyvqlmgh5k8cdcbnl594yq3wrs6cjipw0ik06ar0y2";
        libraryHaskellDepends = [ base binary bytestring murmur-hash ];
        testHaskellDepends = [
          base binary bytestring tasty tasty-hunit tasty-quickcheck
@@ -33906,6 +34155,8 @@ self: {
        pname = "bits";
        version = "0.5.1";
        sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5";
+       revision = "1";
+       editedCabalFile = "06gsbm787kanng2p37sfkpzh9s630bcxgncayn3alxk3y5q5yi7l";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base doctest ];
@@ -35425,6 +35676,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bookkeeping_0_2_1_4" = callPackage
+    ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }:
+     mkDerivation {
+       pname = "bookkeeping";
+       version = "0.2.1.4";
+       sha256 = "1r17x9a5fapqn8ldvyr19l5g5qfxmvzqc5d3rp6rjg60r7k98hpz";
+       libraryHaskellDepends = [ base dlist mtl text time ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
+       description = "A module for bookkeeping by double entry";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bookkeeping-jp" = callPackage
     ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable
      , text, time
@@ -35745,6 +36010,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bound_2_0_1" = callPackage
+    ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
+     , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest
+     , functor-classes-compat, hashable, mmorph, profunctors
+     , template-haskell, transformers, transformers-compat, vector, void
+     }:
+     mkDerivation {
+       pname = "bound";
+       version = "2.0.1";
+       sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base bifunctors binary bytes cereal comonad deepseq hashable mmorph
+         profunctors template-haskell transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base deriving-compat doctest functor-classes-compat transformers
+         transformers-compat vector void
+       ];
+       homepage = "http://github.com/ekmett/bound/";
+       description = "Making de Bruijn Succ Less";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bound-gen" = callPackage
     ({ mkDerivation, base, bound, monad-gen, mtl }:
      mkDerivation {
@@ -36743,8 +37033,8 @@ self: {
      }:
      mkDerivation {
        pname = "butcher";
-       version = "1.1.0.0";
-       sha256 = "0z80gkx1b69742a784d95864rf9kqww702xcg9hfl8ra1ah45d96";
+       version = "1.1.0.1";
+       sha256 = "0j2qknsgq11nc3n0hjx9ck76014sg7if0d75vjjsw1kjlr3rykn5";
        libraryHaskellDepends = [
          base bifunctors containers deque either extra free microlens
          microlens-th mtl multistate pretty transformers unsafe void
@@ -36878,6 +37168,8 @@ self: {
        pname = "bytes";
        version = "0.15.3";
        sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q";
+       revision = "1";
+       editedCabalFile = "1fnv8vlbv8m5k9n5rik6pq693n0nfi9bkx2d8f7y5vvfly5bbkpw";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytestring cereal containers hashable mtl scientific
@@ -37599,8 +37891,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "1.1.0";
-       sha256 = "12p5k0b4q66lbcsc59nvn7pnvwf627hfyrnl1p5nymirwkb4w4bl";
+       version = "1.2.0";
+       sha256 = "1lbkfz5sw292br1zcki2r3qpzc1q5hk3h40xkbbhflqmw3m1h0fj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37623,8 +37915,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.7.11";
-       sha256 = "0xvjnl59zx424wyqcknzsma467a8bgg9588smqifk3qa390l838n";
+       version = "0.7.12";
+       sha256 = "18d0sky1h4n41j4hib34ji51jh3ikm68gdc60qv361i7pwrmi1mk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38172,6 +38464,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "cabal-rpm_0_11_2" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
+     , process, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "0.11.2";
+       sha256 = "18k9dbjz97d6nhnjjr0xqs7z49qcisia3l9h0rg58s5xqkjvzq89";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal directory filepath old-locale process time unix
+       ];
+       homepage = "https://github.com/juhp/cabal-rpm";
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -38685,6 +38996,8 @@ self: {
        pname = "cacophony";
        version = "0.10.0";
        sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv";
+       revision = "1";
+       editedCabalFile = "0j73lknyxlj5zs36sjm3z1z4azqi2zzm5aas6c635k6bqpn4wac6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40140,6 +40453,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cast" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "cast";
+       version = "0.1.0.2";
+       sha256 = "14dwsy80v1k0d9ksxb83h5lrz311d3nsgzcxxvivcdj4jzjlbm94";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/haskell-patterns/cast#readme";
+       description = "Abstact cast pattern";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "castle" = callPackage
     ({ mkDerivation, base, containers, optparse-applicative, shelly
      , system-fileio, system-filepath, text
@@ -40372,6 +40697,61 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cbor-tool" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cborg
+     , cborg-json, filepath, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "cbor-tool";
+       version = "0.1.0.0";
+       sha256 = "1jx51l75hm76fsk9wsc7jhqg857n77s8xb8bcjbkr698qwfbf14m";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring cborg cborg-json filepath
+         scientific text unordered-containers vector
+       ];
+       homepage = "https://github.com/well-typed/cborg";
+       description = "A tool for manipulating CBOR";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "cborg" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, ghc-prim
+     , half, integer-gmp, primitive, text
+     }:
+     mkDerivation {
+       pname = "cborg";
+       version = "0.1.1.0";
+       sha256 = "120ljrwm15zl49nlsn9wb702sb97d2p300mzbpx8wxr2zdzlffpj";
+       revision = "1";
+       editedCabalFile = "0qqg1gfjf869ynrh20fbrpfhjf2yh6v3i5s6w327sirbhw9ajk6v";
+       libraryHaskellDepends = [
+         array base bytestring containers ghc-prim half integer-gmp
+         primitive text
+       ];
+       description = "Concise Binary Object Representation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "cborg-json" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, cborg, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cborg-json";
+       version = "0.1.0.0";
+       sha256 = "1dx7ap8ks8g3c68jdkni958v2g04swphfi0nkyjznyz0dl6vs9mz";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base cborg scientific text unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/well-typed/cborg";
+       description = "A library for encoding JSON as CBOR";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cci" = callPackage
     ({ mkDerivation, base, binary, bytestring, cci, cmdargs, containers
      , filepath, mtl, pretty, process, random, time
@@ -41272,12 +41652,18 @@ self: {
      }:
      mkDerivation {
        pname = "chatwork";
-       version = "0.1.1.0";
-       sha256 = "0xslzn94qhzidayv0nd8rfm9jvfi38dygvwd1lj7vwjgd4yrxy1m";
+       version = "0.1.1.1";
+       sha256 = "0b4pa4hbx8a4cs2yhad0kwm784w5vra858ixmjfk5jis5xxq279x";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring connection data-default-class
          http-api-data http-client http-client-tls http-types req text
        ];
+       executableHaskellDepends = [
+         aeson aeson-casing base bytestring connection data-default-class
+         http-api-data http-client http-client-tls http-types req text
+       ];
        testHaskellDepends = [
          aeson aeson-casing base bytestring connection data-default-class
          hspec http-api-data http-client http-client-tls http-types req
@@ -41314,6 +41700,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cheapskate_0_1_1" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "cheapskate";
+       version = "0.1.1";
+       sha256 = "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html containers data-default deepseq mtl syb text
+         uniplate xss-sanitize
+       ];
+       executableHaskellDepends = [ base blaze-html bytestring text ];
+       homepage = "http://github.com/jgm/cheapskate";
+       description = "Experimental markdown processor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cheapskate-highlight" = callPackage
     ({ mkDerivation, base, blaze-html, cheapskate, highlighting-kate
      , text
@@ -44794,6 +45201,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "columbia" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, contravariant
+     , data-endian, directory, filelock, invariant, mmap, mmorph
+     , monad-loops, mtl, parallel, pointless-haskell, syb-with-class
+     , transformers
+     }:
+     mkDerivation {
+       pname = "columbia";
+       version = "0.1.0.2";
+       sha256 = "152f43s2dm81amag28kav9a1gfyg97rxhd2dm3ivip98j8p1d6j0";
+       libraryHaskellDepends = [
+         array base bytestring containers contravariant data-endian
+         directory filelock invariant mmap mmorph monad-loops mtl parallel
+         pointless-haskell syb-with-class transformers
+       ];
+       description = "Enhanced serialization for media that support seeking";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "com" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -45102,6 +45528,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "comonad_5_0_2" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, containers
+     , contravariant, distributive, doctest, semigroups, tagged
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "comonad";
+       version = "5.0.2";
+       sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base containers contravariant distributive semigroups tagged
+         transformers transformers-compat
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/ekmett/comonad/";
+       description = "Comonads";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "comonad-extras" = callPackage
     ({ mkDerivation, array, base, comonad, containers, distributive
      , semigroupoids, transformers
@@ -45412,6 +45859,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "compensated_0_7_2" = callPackage
+    ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
+     , cabal-doctest, cereal, comonad, deepseq, distributive, doctest
+     , generic-deriving, hashable, lens, log-domain, safecopy
+     , semigroupoids, semigroups, simple-reflect, vector
+     }:
+     mkDerivation {
+       pname = "compensated";
+       version = "0.7.2";
+       sha256 = "1qna4g1zcc89r1ambswrq65pql6k6g3dv0ivlgnhswl6lm3vzyf7";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base bifunctors binary bytes cereal comonad deepseq distributive
+         hashable lens log-domain safecopy semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base doctest generic-deriving semigroups simple-reflect
+       ];
+       homepage = "http://github.com/analytics/compensated/";
+       description = "Compensated floating-point arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "competition" = callPackage
     ({ mkDerivation, base, filepath, parsec }:
      mkDerivation {
@@ -45563,8 +46034,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson";
-       version = "0.4.2.0";
-       sha256 = "06zaji95znvy5v9qmyczdncqgdmp2jkibqimchziayjs1vcmb8bg";
+       version = "0.5.0.0";
+       sha256 = "1h8kn3isnxx1qqd50h5af8rk9i88nfb7iiqjfy1kwszvjq6qap3p";
        libraryHaskellDepends = [
          aeson aeson-better-errors base composite-base containers
          contravariant generic-deriving hashable lens mmorph mtl profunctors
@@ -45589,8 +46060,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson-refined";
-       version = "0.4.2.0";
-       sha256 = "1zzqrjvlk6yy2zsx1v325mbwl9qjjwj6qvc42y61acag9n08asv5";
+       version = "0.5.0.0";
+       sha256 = "0s09qmr6rjkm28jz78cg9bz1zqhv0mlp7g5wpy9c7cblwz5wf4qd";
        libraryHaskellDepends = [
          aeson-better-errors base composite-aeson mtl refined
        ];
@@ -45607,8 +46078,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-base";
-       version = "0.4.2.0";
-       sha256 = "0mfz7xpkl3lxg3pfk83mba7kb9phpcc4cnvimpphfcbwpzx8qcqw";
+       version = "0.5.0.0";
+       sha256 = "18fqmawlh5i4j04vj5kfqhb7cqlzfvv9326fqs3m4yzwh7zrmiqk";
        libraryHaskellDepends = [
          base exceptions lens monad-control mtl profunctors template-haskell
          text transformers transformers-base vinyl
@@ -45629,8 +46100,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-ekg";
-       version = "0.4.2.0";
-       sha256 = "06lb5djs1w9gby7f192wssxwbik2lpigzsfv25z5pchf8iab4f9d";
+       version = "0.5.0.0";
+       sha256 = "0q74j2jnzdj79srziz1ldpjs4xcysjr1dp9b8fsg4bghwfnkc7sc";
        libraryHaskellDepends = [
          base composite-base ekg ekg-core lens text vinyl
        ];
@@ -45641,18 +46112,23 @@ self: {
      }) {};
 
   "composite-opaleye" = callPackage
-    ({ mkDerivation, base, bytestring, composite-base, lens, opaleye
-     , postgresql-simple, product-profunctors, profunctors
-     , template-haskell, text, vinyl
+    ({ mkDerivation, base, bytestring, composite-base, hspec, lens
+     , opaleye, postgresql-simple, product-profunctors, profunctors
+     , QuickCheck, template-haskell, text, vinyl
      }:
      mkDerivation {
        pname = "composite-opaleye";
-       version = "0.4.2.0";
-       sha256 = "0id817bwss3haskvfpn86bqsva8a0ahwbgbzh5zbyiwc5vqksnkx";
+       version = "0.5.0.0";
+       sha256 = "0s9nf2nyz7knpcx0x1y0ck8x1cjxdmsdrc1nvqyb1264lkd863cj";
        libraryHaskellDepends = [
          base bytestring composite-base lens opaleye postgresql-simple
          product-profunctors profunctors template-haskell text vinyl
        ];
+       testHaskellDepends = [
+         base bytestring composite-base hspec lens opaleye postgresql-simple
+         product-profunctors profunctors QuickCheck template-haskell text
+         vinyl
+       ];
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Opaleye SQL for Frames records";
        license = stdenv.lib.licenses.bsd3;
@@ -45968,34 +46444,42 @@ self: {
      }) {};
 
   "concrete-haskell" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib, containers, directory
-     , filepath, hashable, megaparsec, mtl, network, optparse-generic
-     , path-io, process, QuickCheck, scientific, tar, text, thrift, time
-     , unordered-containers, uuid, vector, zip, zlib
+    ({ mkDerivation, base, binary, bytestring, bzlib
+     , concrete-haskell-autogen, containers, directory, filepath
+     , hashable, megaparsec, monad-extras, mtl, network
+     , optparse-generic, path, path-io, process, QuickCheck, scientific
+     , tar, text, thrift, time, unordered-containers, uuid, vector, zip
+     , zlib
      }:
      mkDerivation {
        pname = "concrete-haskell";
-       version = "0.1.0.11";
-       sha256 = "12kvwxngsnh3lhp1q415ga8apkadfb8cxzvrlmlvrjdk6p5aczza";
+       version = "0.1.0.13";
+       sha256 = "1vhwph94v6wspfk4bxafv9zq0l6x5s3lz7rrz9xc99pqwz3dhj2l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring bzlib containers directory filepath hashable
-         megaparsec mtl network optparse-generic path-io process QuickCheck
-         scientific tar text thrift time unordered-containers uuid vector
-         zip zlib
+         base binary bytestring bzlib concrete-haskell-autogen containers
+         directory filepath hashable megaparsec monad-extras mtl network
+         optparse-generic path path-io process QuickCheck scientific tar
+         text thrift time unordered-containers uuid vector zip zlib
        ];
        executableHaskellDepends = [
-         base bytestring bzlib containers directory filepath hashable
-         megaparsec mtl network optparse-generic path-io process QuickCheck
-         scientific tar text thrift time unordered-containers uuid vector
-         zip zlib
+         base binary bytestring bzlib concrete-haskell-autogen containers
+         directory filepath hashable megaparsec monad-extras mtl network
+         optparse-generic path path-io process QuickCheck scientific tar
+         text thrift time unordered-containers uuid vector zip zlib
        ];
        testHaskellDepends = [
-         base bytestring bzlib containers directory filepath hashable
-         megaparsec mtl network optparse-generic path-io process QuickCheck
-         scientific tar text thrift time unordered-containers uuid vector
-         zip zlib
+         base binary bytestring bzlib concrete-haskell-autogen containers
+         directory filepath hashable megaparsec monad-extras mtl network
+         optparse-generic path path-io process QuickCheck scientific tar
+         text thrift time unordered-containers uuid vector zip zlib
+       ];
+       benchmarkHaskellDepends = [
+         base binary bytestring bzlib concrete-haskell-autogen containers
+         directory filepath hashable megaparsec monad-extras mtl network
+         optparse-generic path path-io process QuickCheck scientific tar
+         text thrift time unordered-containers uuid vector zip zlib
        ];
        homepage = "https://github.com/hltcoe";
        description = "Library for the Concrete data format";
@@ -46091,21 +46575,22 @@ self: {
 
   "concurrent-dns-cache" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers, dns
-     , hashable, hspec, iproute, network, stm, time
+     , hspec, iproute, lifted-base, monad-control, network, psqueues
+     , stm, time, transformers
      }:
      mkDerivation {
        pname = "concurrent-dns-cache";
-       version = "0.0.1";
-       sha256 = "0awba7ar4iky211psq5d44snd5j75ddvl6klalriic4i5w41dhv2";
+       version = "0.1.0";
+       sha256 = "0bi3mlv2gi8adgh8zmh51idrnbsap15f2kybligccf9b6pcvpljr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array async base bytestring containers dns hashable iproute network
-         stm time
+         array async base bytestring containers dns iproute lifted-base
+         monad-control network psqueues stm time transformers
        ];
        executableHaskellDepends = [
-         array async base bytestring containers dns hashable iproute network
-         stm time
+         array async base bytestring containers dns iproute lifted-base
+         monad-control network psqueues stm time transformers
        ];
        testHaskellDepends = [ async base dns hspec ];
        description = "Concurrent DNS cache";
@@ -47005,8 +47490,8 @@ self: {
      }:
      mkDerivation {
        pname = "confsolve";
-       version = "0.5.5";
-       sha256 = "0wwrjrjp3biai2sg8aylqbw7nv2sd41xnqy6826i2knmjj3inqrg";
+       version = "0.5.6";
+       sha256 = "0bsribar35vrq1q22nijxgnymkbrfa49vyvfa60ink8wj7q47jzp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -49928,8 +50413,8 @@ self: {
        pname = "crypto-enigma";
        version = "0.0.2.8";
        sha256 = "0dz8qr4afl360vc8mhcxsqm48y4pf1rvwxhzbvsgwhwjscvass3q";
-       revision = "1";
-       editedCabalFile = "0zm90nv4asr28pbwl2x96hbr50v0d4y3zjsmlz80gsm7cqj6hz3s";
+       revision = "4";
+       editedCabalFile = "1rvcphwavb3ns46fankpdlkz8rwl3rn591zlkmx0zdy3vygpwsfg";
        libraryHaskellDepends = [ base containers MissingH mtl split ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "https://github.com/orome/crypto-enigma-hs";
@@ -51018,6 +51503,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cue-sheet_1_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck
+     , text
+     }:
+     mkDerivation {
+       pname = "cue-sheet";
+       version = "1.0.0";
+       sha256 = "05fj4iqg0ixrs8076p9jcl5my0qx4hgzcprnaymfkkr0n9x06sz1";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class exceptions megaparsec
+         mtl QuickCheck text
+       ];
+       testHaskellDepends = [
+         base bytestring exceptions hspec hspec-megaparsec megaparsec
+         QuickCheck text
+       ];
+       homepage = "https://github.com/mrkkrp/cue-sheet";
+       description = "Support for construction, rendering, and parsing of CUE sheets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cufft" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath
      , template-haskell
@@ -51315,6 +51824,8 @@ self: {
        pname = "czipwith";
        version = "1.0.0.0";
        sha256 = "1q9cgig8zvycbfryb1ax35yq1x66qpc6a91qijbbfk1zsw7sz8j5";
+       revision = "1";
+       editedCabalFile = "1vz6nrmxhl2rrwcg16dpp09q64pk9z9j0ka97lqhxdzpvqm0fg88";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base transformers ];
        homepage = "https://github.com/lspitzner/czipwith/";
@@ -52024,6 +52535,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-accessor-template_0_2_1_14" = callPackage
+    ({ mkDerivation, base, data-accessor, template-haskell, utility-ht
+     }:
+     mkDerivation {
+       pname = "data-accessor-template";
+       version = "0.2.1.14";
+       sha256 = "0r8vb3z40172jy17w131ydg5v1pvi121rgwxyq0cgxx0zwzhnvy4";
+       libraryHaskellDepends = [
+         base data-accessor template-haskell utility-ht
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Record_access";
+       description = "Utilities for accessing and manipulating fields of records";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-accessor-transformers" = callPackage
     ({ mkDerivation, base, data-accessor, transformers }:
      mkDerivation {
@@ -52473,6 +53000,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-diverse_0_9_0_0" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
+     , hspec, tagged
+     }:
+     mkDerivation {
+       pname = "data-diverse";
+       version = "0.9.0.0";
+       sha256 = "0mx348pl32jycbcdhb9p199hzqg8yrh8ckw85vvgxg5n4251nd9p";
+       libraryHaskellDepends = [
+         base containers deepseq ghc-prim tagged
+       ];
+       testHaskellDepends = [ base hspec tagged ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/louispan/data-diverse#readme";
+       description = "Extensible records and polymorphic variants";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-diverse-lens" = callPackage
     ({ mkDerivation, base, data-diverse, hspec, lens, tagged }:
      mkDerivation {
@@ -52709,8 +53255,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "data-flags";
-       version = "0.0.3.3";
-       sha256 = "1aps6v8kl168k211gm96mm7i07zkmm5j9j4kl7wwaicblpb91qx1";
+       version = "0.0.3.4";
+       sha256 = "183h2dzqrp9wl4sg59sijlhqw5pgi10xgw7cx8vz1s86rkia3hj8";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/mvv/data-flags";
        description = "A package for working with bit masks and flags in general";
@@ -53190,6 +53736,8 @@ self: {
        pname = "data-pprint";
        version = "0.2.4.1";
        sha256 = "10qg7sa64l7sjm6f9xx00nqddmxccj4h1apv4wwqhh8y7vlal1hc";
+       revision = "1";
+       editedCabalFile = "0gk2x4z7m0816gq6p22y5y8r1iydi4154xbn474i9nsbk56kp2by";
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
@@ -53449,8 +53997,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-sword";
-       version = "0.2.0.1";
-       sha256 = "1l84ygal3zr9s8g8jshckgn922fjn06n9191v5k4hj2sa798wd6j";
+       version = "0.2.0.2";
+       sha256 = "1m14vxfx5raiy5b6w3602hkqywc0gj4yv38mjbwncbic86g6rgn2";
        libraryHaskellDepends = [
          base data-bword hashable template-haskell
        ];
@@ -53526,6 +54074,8 @@ self: {
        pname = "data-tree-print";
        version = "0.1.0.0";
        sha256 = "0dymdf7bv98f0xkdm49yxdn5nlbp7ahrfsadx69wzy8si537fnk5";
+       revision = "1";
+       editedCabalFile = "0ilk496yh0fdw2qisappr91d1s4xwl6hqaf2bnv3l7ah4qv74436";
        libraryHaskellDepends = [ base pretty syb ];
        homepage = "https://github.com/lspitzner/data-tree-print";
        description = "Print Data instances as a nested tree";
@@ -53722,13 +54272,13 @@ self: {
      }:
      mkDerivation {
        pname = "datasets";
-       version = "0.2.4";
-       sha256 = "1l5djdv1fvqymkc5q10zwzhjwphxpw1wpr5d8rqf3z2kym3k0h2r";
+       version = "0.2.5";
+       sha256 = "1fpxk5wv12wyb1zr35mhinkbkmczgzny2903lszjn41n149kk4cs";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cassava directory file-embed
          filepath hashable microlens stringsearch text time vector wreq
        ];
-       homepage = "https://github.com/filopodia/open/datasets";
+       homepage = "https://github.com/diffusionkinetics/open/datasets";
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53887,8 +54437,8 @@ self: {
     ({ mkDerivation, base, hspec, postgresql-simple, text }:
      mkDerivation {
        pname = "dbcleaner";
-       version = "0.1.1";
-       sha256 = "1n4al0fd577ldvaxca6nz181lp0b29z4slrjldx3m51nkxy1ficc";
+       version = "0.1.2";
+       sha256 = "0ida0rqx66b5sajic1y2k89mlx9039s3m8xalqadsybij29yfmjr";
        libraryHaskellDepends = [ base postgresql-simple text ];
        testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
@@ -55516,6 +56066,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "derive_2_6_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , haskell-src-exts, pretty, process, syb, template-haskell
+     , transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "derive";
+       version = "2.6.3";
+       sha256 = "06m3m1jsvms1nvgm6b83p28ma61h8ldagl7a3fsjp8hswpr0hgpj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath haskell-src-exts
+         pretty process syb template-haskell transformers uniplate
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ndmitchell/derive#readme";
+       description = "A program and library to derive instances for data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "derive-IG" = callPackage
     ({ mkDerivation, base, instant-generics, template-haskell }:
      mkDerivation {
@@ -56047,6 +56619,8 @@ self: {
        pname = "dia-base";
        version = "0.1.1.4";
        sha256 = "09lyzl0ppgk7izmsb3hq86dfmyb31w866h582vazpphbyvrbpihz";
+       revision = "1";
+       editedCabalFile = "0jp6vxj2m984dl7gnphs7119zxs8pplhq73nnicvbhjcliixyl6w";
        libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
@@ -56060,6 +56634,8 @@ self: {
        pname = "dia-functions";
        version = "0.2.1.5";
        sha256 = "1q9jywy6rmh5wkd8z5rw9rkilbh9jxd4py2w4xxqz93rzz2gzy5g";
+       revision = "1";
+       editedCabalFile = "0zyg7mrnp8qp9v0hm1188n4xqp223g6wqdnz43dw3dchqs2qpwbx";
        libraryHaskellDepends = [
          base containers data-pprint deepseq dia-base mtl xhtml
        ];
@@ -56715,6 +57291,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dictionaries_0_2_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+     , criterion, data-default, deepseq, directory, exceptions, filepath
+     , hspec, QuickCheck, random, random-shuffle, tagged, text, time
+     , transformers, zlib
+     }:
+     mkDerivation {
+       pname = "dictionaries";
+       version = "0.2.0.3";
+       sha256 = "0a8d20vfd5gcxrfhsa0530fnzb9fqh47qsjbyhf7pnh0f0p0qbi6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring containers data-default deepseq
+         directory exceptions filepath tagged text time transformers zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers criterion deepseq directory exceptions
+         filepath random random-shuffle tagged text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory filepath hspec QuickCheck
+         random tagged text time
+       ];
+       description = "Tools to handle StarDict dictionaries";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dictionary-sharing" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -58527,6 +59132,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributive_0_5_3" = callPackage
+    ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest
+     , generic-deriving, hspec, tagged, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "distributive";
+       version = "0.5.3";
+       sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base base-orphans tagged transformers transformers-compat
+       ];
+       testHaskellDepends = [ base doctest generic-deriving hspec ];
+       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
@@ -58701,6 +59326,8 @@ self: {
        pname = "dlist-nonempty";
        version = "0.1";
        sha256 = "13nkf2kgm8pd1vicd2lm2z99m04bs65pm1kjn4k4a2259h3hd0m8";
+       revision = "1";
+       editedCabalFile = "1nvxf1dyqvanx7vfr4q7li2jj5vr543lc2fkkwajsm0z75vcibz4";
        libraryHaskellDepends = [
          base base-compat deepseq dlist semigroupoids
        ];
@@ -58715,6 +59342,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dlist-nonempty_0_1_1" = callPackage
+    ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq
+     , dlist, dlist-instances, QuickCheck, quickcheck-instances
+     , semigroupoids
+     }:
+     mkDerivation {
+       pname = "dlist-nonempty";
+       version = "0.1.1";
+       sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
+       libraryHaskellDepends = [
+         base base-compat deepseq dlist semigroupoids
+       ];
+       testHaskellDepends = [
+         base Cabal QuickCheck quickcheck-instances
+       ];
+       benchmarkHaskellDepends = [
+         base base-compat criterion dlist dlist-instances
+       ];
+       homepage = "https://github.com/phadej/dlist-nonempty";
+       description = "Non-empty difference lists";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dmc" = callPackage
     ({ mkDerivation, base, hspec, process, QuickCheck }:
      mkDerivation {
@@ -59119,34 +59770,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "doctest_0_12_0" = callPackage
-    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
-     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
-     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
-     , with-location
-     }:
-     mkDerivation {
-       pname = "doctest";
-       version = "0.12.0";
-       sha256 = "13h549cpgcvb7c54c7wif28g5wak84dxc3ais0hlqhzk1q6la91a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         process syb transformers
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         hspec HUnit mockery process QuickCheck setenv silently
-         stringbuilder syb transformers with-location
-       ];
-       homepage = "https://github.com/sol/doctest#readme";
-       description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -60816,6 +61439,22 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "dynamic-state_0_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hashable
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "dynamic-state";
+       version = "0.3";
+       sha256 = "0aa97yv9p0mw1g7nk5jaayfl70bkp2i4kcybvp4a30gr12dpjqmv";
+       libraryHaskellDepends = [
+         base binary bytestring hashable unordered-containers
+       ];
+       description = "Optionally serializable dynamic state keyed by type";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dynamodb-simple" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
      , base, bytestring, conduit, containers, double-conversion
@@ -61870,6 +62509,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ekg_0_4_0_14" = 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.14";
+       sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd";
+       revision = "1";
+       editedCabalFile = "152b4w3qld6jmwir3a06h6sc1girahla8cc1y2g23bwv6nnhxapp";
+       enableSeparateDataOutput = true;
+       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
@@ -61944,6 +62605,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-core_0_1_1_2" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg-core";
+       version = "0.1.1.2";
+       sha256 = "01gqg5lpn67gc2rsvil4k54c1w9cz9avyxzlvmi2baxbrpj7isrm";
+       libraryHaskellDepends = [
+         base containers ghc-prim text unordered-containers
+       ];
+       benchmarkHaskellDepends = [ base ];
+       homepage = "https://github.com/tibbe/ekg-core";
+       description = "Tracking of system metrics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ekg-elastic" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname
      , http-client, lens, text, time, unordered-containers, wreq
@@ -62010,6 +62689,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-json_0_1_0_6" = callPackage
+    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg-json";
+       version = "0.1.0.6";
+       sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy";
+       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
@@ -62104,6 +62799,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-statsd_0_2_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, ekg-core, network, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg-statsd";
+       version = "0.2.1.1";
+       sha256 = "1r0x26aqj0nbdl9nrj26xsb5np20bg6mihams394a0c41pv85j6k";
+       libraryHaskellDepends = [
+         base bytestring ekg-core network text time unordered-containers
+       ];
+       homepage = "https://github.com/tibbe/ekg-statsd";
+       description = "Push metrics to statsd";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ekg-wai" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, http-types, network, text, time, transformers
@@ -62728,6 +63440,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "email-validate_2_3_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "email-validate";
+       version = "2.3.1";
+       sha256 = "0fzbaxshhlg97pm66yjhz7fxxq9j1m3k0sqslzngh36r8aw9l66j";
+       libraryHaskellDepends = [
+         attoparsec base bytestring template-haskell
+       ];
+       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+       homepage = "https://github.com/Porges/email-validate-hs";
+       description = "Email address validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "email-validate-json" = callPackage
     ({ mkDerivation, aeson, base, email-validate, text }:
      mkDerivation {
@@ -62955,17 +63685,22 @@ self: {
      }) {};
 
   "encoding" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , extensible-exceptions, ghc-prim, HaXml, mtl, regex-compat
+    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
+     , extensible-exceptions, filepath, ghc-prim, HaXml, HUnit, mtl
+     , QuickCheck, regex-compat
      }:
      mkDerivation {
        pname = "encoding";
-       version = "0.8.1";
-       sha256 = "1fddj2m3xv8zfz6bmgks3ynib6hk7bzq2j3bsazr71m769a9hvyr";
+       version = "0.8.2";
+       sha256 = "1lfh5pyc4f73870xz6dydksp5nspnzbkj4fvinhwdknhc5ii8353";
+       setupHaskellDepends = [
+         base Cabal containers filepath ghc-prim HaXml
+       ];
        libraryHaskellDepends = [
          array base binary bytestring containers extensible-exceptions
-         ghc-prim HaXml mtl regex-compat
+         ghc-prim mtl regex-compat
        ];
+       testHaskellDepends = [ base bytestring HUnit QuickCheck ];
        homepage = "http://code.haskell.org/encoding/";
        description = "A library for various character encodings";
        license = stdenv.lib.licenses.bsd3;
@@ -63928,6 +64663,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ersatz_0_4_1" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, containers, data-default, directory, doctest
+     , filepath, lens, mtl, parsec, process, temporary, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "ersatz";
+       version = "0.4.1";
+       sha256 = "0na9i2jc5assjis12pfpi08ykf90b79ydsvv1lqsbgsbij9w2w91";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array attoparsec base bytestring containers data-default lens mtl
+         process temporary transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         array base containers lens mtl parsec
+       ];
+       testHaskellDepends = [ array base directory doctest filepath mtl ];
+       homepage = "http://github.com/ekmett/ersatz";
+       description = "A monad for expressing SAT or QSAT problems using observable sharing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersatz-toysat" = callPackage
     ({ mkDerivation, array, base, containers, ersatz, toysolver
      , transformers
@@ -64589,6 +65352,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "eventful-core_0_2_0" = callPackage
+    ({ mkDerivation, aeson, base, containers, contravariant, hspec
+     , http-api-data, HUnit, path-pieces, sum-type-boilerplate
+     , template-haskell, text, transformers, uuid
+     }:
+     mkDerivation {
+       pname = "eventful-core";
+       version = "0.2.0";
+       sha256 = "06chbjrxfxk0fr9lgdic6bmylnv3kz398l9drqr85r6qk1s5xxg0";
+       libraryHaskellDepends = [
+         aeson base containers contravariant http-api-data path-pieces
+         sum-type-boilerplate template-haskell text transformers uuid
+       ];
+       testHaskellDepends = [
+         aeson base containers contravariant hspec http-api-data HUnit
+         path-pieces sum-type-boilerplate template-haskell text transformers
+         uuid
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Core module for eventful";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "eventful-dynamodb" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base
      , bytestring, conduit, eventful-core, eventful-test-helpers, hlint
@@ -64615,6 +65402,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventful-dynamodb_0_2_0" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base
+     , bytestring, conduit, eventful-core, eventful-test-helpers, hspec
+     , HUnit, lens, QuickCheck, quickcheck-instances, safe, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "eventful-dynamodb";
+       version = "0.2.0";
+       sha256 = "17ip1dr1jqrzy0hg5yjnv4a8qkgsab02jcbswlxfd3q7xx3d473b";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-dynamodb base bytestring conduit
+         eventful-core lens safe text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson amazonka amazonka-dynamodb base bytestring conduit
+         eventful-core eventful-test-helpers hspec HUnit lens QuickCheck
+         quickcheck-instances safe text unordered-containers vector
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Library for eventful DynamoDB event stores";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "eventful-memory" = callPackage
     ({ mkDerivation, base, containers, eventful-core
      , eventful-test-helpers, hlint, hspec, HUnit, mtl, safe, stm
@@ -64635,6 +65447,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "eventful-memory_0_2_0" = callPackage
+    ({ mkDerivation, base, containers, eventful-core
+     , eventful-test-helpers, hspec, HUnit, mtl, safe, stm
+     }:
+     mkDerivation {
+       pname = "eventful-memory";
+       version = "0.2.0";
+       sha256 = "1fdd2z13lnk1zxhylriwblz96x90v4504abrj9rfbi732853wz3a";
+       libraryHaskellDepends = [
+         base containers eventful-core mtl safe stm
+       ];
+       testHaskellDepends = [
+         base containers eventful-core eventful-test-helpers hspec HUnit mtl
+         safe stm
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "In-memory implementations for eventful";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "eventful-postgresql" = callPackage
     ({ mkDerivation, aeson, base, bytestring, eventful-core
      , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit
@@ -64659,6 +65492,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventful-postgresql_0_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, eventful-core
+     , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl
+     , persistent, persistent-postgresql, text
+     }:
+     mkDerivation {
+       pname = "eventful-postgresql";
+       version = "0.2.0";
+       sha256 = "05syf8ychcnyl4q1q3afn4nqp4sw38y4c3p97b1h5gdanbsnis3b";
+       libraryHaskellDepends = [
+         aeson base bytestring eventful-core eventful-sql-common mtl
+         persistent text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring eventful-core eventful-sql-common
+         eventful-test-helpers hspec HUnit mtl persistent
+         persistent-postgresql text
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Postgres implementations for eventful";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "eventful-sql-common" = callPackage
     ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl
      , persistent, persistent-template, text, uuid
@@ -64676,6 +65533,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "eventful-sql-common_0_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl
+     , persistent, persistent-template, text, uuid
+     }:
+     mkDerivation {
+       pname = "eventful-sql-common";
+       version = "0.2.0";
+       sha256 = "1g5f6rvb14hi81dby2hdcq444zhv2vl76ql4lsrh9gdmpf6a2vm4";
+       libraryHaskellDepends = [
+         aeson base bytestring eventful-core mtl persistent
+         persistent-template text uuid
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Common library for SQL event stores";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "eventful-sqlite" = callPackage
     ({ mkDerivation, aeson, base, bytestring, eventful-core
      , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit
@@ -64699,6 +65574,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "eventful-sqlite_0_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, eventful-core
+     , eventful-sql-common, eventful-test-helpers, hspec, HUnit, mtl
+     , persistent, persistent-sqlite, text, uuid
+     }:
+     mkDerivation {
+       pname = "eventful-sqlite";
+       version = "0.2.0";
+       sha256 = "1vyz8401n63gqwgl1fa9dw1ar1dgki4hy6ably8lh2hzpl7fmfy0";
+       libraryHaskellDepends = [
+         aeson base bytestring eventful-core eventful-sql-common mtl
+         persistent text uuid
+       ];
+       testHaskellDepends = [
+         aeson base bytestring eventful-core eventful-sql-common
+         eventful-test-helpers hspec HUnit mtl persistent persistent-sqlite
+         text uuid
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "SQLite implementations for eventful";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "eventful-test-helpers" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra
      , hspec, monad-logger, text
@@ -64715,6 +65614,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "eventful-test-helpers_0_2_0" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra
+     , hspec, monad-logger, text
+     }:
+     mkDerivation {
+       pname = "eventful-test-helpers";
+       version = "0.2.0";
+       sha256 = "1q5z9rf5hxwpsyvm28hfnkr72zfsg7h5kz648bass9irvq69v7x9";
+       libraryHaskellDepends = [
+         aeson aeson-casing base eventful-core extra hspec monad-logger text
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Common module used for eventful tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "eventloop" = callPackage
     ({ mkDerivation, aeson, base, bytestring, concurrent-utilities
      , deepseq, network, stm, suspend, text, timers, websockets
@@ -65189,8 +66105,8 @@ self: {
        pname = "exference";
        version = "1.6.0.0";
        sha256 = "1lnalnsn3zjcwhl8p1035ckjgp4kpjv6kfai4dqqji2rpbm1sgrh";
-       revision = "3";
-       editedCabalFile = "0mnc09lgfhpnwp0llvbr24xbszgr56k9nnjcww67khag74md7yg3";
+       revision = "4";
+       editedCabalFile = "1yrc2p8p48cx8qjpyvfqpbvs8dcv2m5k5x89s04jk9ic26wdwk9k";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -65917,6 +66833,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extrapolate" = callPackage
+    ({ mkDerivation, base, leancheck, speculate, template-haskell }:
+     mkDerivation {
+       pname = "extrapolate";
+       version = "0.0.1";
+       sha256 = "07yh1w3vbhrb621nbwp7zvjj92b16i6jc69qflzvp8jn9w7f71h5";
+       libraryHaskellDepends = [
+         base leancheck speculate template-haskell
+       ];
+       testHaskellDepends = [ base leancheck speculate template-haskell ];
+       homepage = "https://github.com/rudymatela/extrapolate#readme";
+       description = "generalize counter-examples of test properties";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ez-couch" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
      , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit
@@ -66448,18 +67379,18 @@ self: {
 
   "fastparser" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, containers
-     , microlens, thyme, vector-space
+     , criterion, kan-extensions, microlens, thyme, transformers
+     , vector-space
      }:
      mkDerivation {
        pname = "fastparser";
-       version = "0.3.0";
-       sha256 = "1dg7nsyn2qrf37x1512kzxhg2ldwkfngsy0jc4y2szd37i4iqqb4";
-       revision = "1";
-       editedCabalFile = "1qg6bbar66qxhnh3mdv41m9zrvggwnjszzr42z9x4gybx6anqzfi";
+       version = "0.3.0.1";
+       sha256 = "05ag040bw5ca05yl9l4nqdmsh9my1b2jnf5qc9kbwk5i8zqkfv15";
        libraryHaskellDepends = [
-         base bytestring bytestring-lexing containers microlens thyme
-         vector-space
+         base bytestring bytestring-lexing containers kan-extensions
+         microlens thyme transformers vector-space
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/bartavelle/fastparser#readme";
        description = "A fast, but bare bones, bytestring parser combinators library";
        license = stdenv.lib.licenses.bsd3;
@@ -69096,6 +70027,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow_1_0_8" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.8";
+       sha256 = "13cfwc67r38kx30yixizcifcgijm7ak2swr3qikdb44fjm5y0zas";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       homepage = "https://github.com/tfausak/flow#readme";
+       description = "Write more understandable Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flow-er" = callPackage
     ({ mkDerivation, base, doctest, flow, QuickCheck }:
      mkDerivation {
@@ -69275,8 +70220,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.3.4";
-       sha256 = "066czbpbjk893q3npghmz94w9pqd0k89p8xxrmgd4g8gqqr1fii6";
+       version = "0.5.3.5";
+       sha256 = "1p2vmnyydq5f888q26gni1y4bpmhn3m4hr6123aq4d5zhy1x9cyv";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -69516,6 +70461,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "focus_0_1_5_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "focus";
+       version = "0.1.5.2";
+       sha256 = "1dswf4l7d6z3rrv1d00fr3vcpawnvxhj3q741fh62s5wq948v662";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nikita-volkov/focus";
+       description = "A general abstraction for manipulating elements of container data structures";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fold-debounce" = callPackage
     ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
      , time
@@ -69712,6 +70670,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "folds_0_7_4" = callPackage
+    ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal
+     , cabal-doctest, comonad, constraints, contravariant, data-reify
+     , deepseq, directory, distributive, doctest, filepath, lens, mtl
+     , pointed, profunctors, reflection, semigroupoids, semigroups
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "folds";
+       version = "0.7.4";
+       sha256 = "0wj5fd3icj05w3lziv4rmqahsh42kzckxybjacyvwb45kiy6yvjw";
+       configureFlags = [ "-f-test-hlint" ];
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         adjunctions base bifunctors comonad constraints contravariant
+         data-reify distributive lens mtl pointed profunctors reflection
+         semigroupoids transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring deepseq directory doctest filepath mtl semigroups
+       ];
+       homepage = "http://github.com/ekmett/folds";
+       description = "Beautiful Folding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "folds-common" = callPackage
     ({ mkDerivation, base, containers, folds, tasty, tasty-quickcheck
      }:
@@ -70248,6 +71233,18 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "forward-chan" = callPackage
+    ({ mkDerivation, base, SafeSemaphore, stm, unagi-chan }:
+     mkDerivation {
+       pname = "forward-chan";
+       version = "0.0.0.0";
+       sha256 = "0q11h91mlbaflxl35sya5r4h9r5d18v5ib0hplrzcnsgwchdcd3f";
+       libraryHaskellDepends = [ base SafeSemaphore stm unagi-chan ];
+       homepage = "http://github.com/mmirman/forward-chan";
+       description = "Concurrent channels with a forwarding primitive";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "foscam-directory" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath
      , foscam-filename, lens, pretty, QuickCheck, template-haskell
@@ -72420,8 +73417,8 @@ self: {
      }:
      mkDerivation {
        pname = "gc";
-       version = "0.0.1";
-       sha256 = "15jz191njpd1jfx2x2xvqpvsz81mifspj37xhgqsxlk6vb2a3xb1";
+       version = "0.0.2";
+       sha256 = "03637njk3pqbqvng7zf370ykykm3nnsxvmp09qcfp6iihz45mk1r";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -72981,12 +73978,18 @@ self: {
      }) {};
 
   "generic-lens" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion, deepseq, hspec, lens, profunctors
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "generic-lens";
-       version = "0.2.0.0";
-       sha256 = "05p53pqx0an32zdjj9x7dj4l04yh0p8rww32i8hh2ymg3h616apl";
-       libraryHaskellDepends = [ base ];
+       version = "0.3.0.0";
+       sha256 = "0zsxf8v8j1dw0x913iin69r01mynmzyxnq778wqh5id7lz8fb69s";
+       libraryHaskellDepends = [ base profunctors ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq lens QuickCheck
+       ];
        homepage = "https://github.com/kcsongor/generic-lens";
        description = "Generic data-structure operations exposed as lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -73444,6 +74447,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-aeson" = callPackage
+    ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
+     , genvalidity-scientific, genvalidity-text
+     , genvalidity-unordered-containers, genvalidity-vector, hspec
+     , QuickCheck, validity, validity-aeson
+     }:
+     mkDerivation {
+       pname = "genvalidity-aeson";
+       version = "0.0.0.0";
+       sha256 = "0pb84fg17vwmy95naaw1bl77pjvs9rzwgqnp8p0abh04qr9bxgh2";
+       libraryHaskellDepends = [
+         aeson base genvalidity genvalidity-scientific genvalidity-text
+         genvalidity-unordered-containers genvalidity-vector QuickCheck
+         validity validity-aeson
+       ];
+       testHaskellDepends = [
+         aeson base genvalidity genvalidity-hspec hspec
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for aeson";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "genvalidity-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-bytestring
@@ -73616,6 +74642,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-scientific" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, scientific, validity, validity-scientific
+     }:
+     mkDerivation {
+       pname = "genvalidity-scientific";
+       version = "0.0.0.0";
+       sha256 = "1s4gca2nkfhs5yzp0xnjy0fbadg4bphfd533z8zachh2ycwi69kh";
+       libraryHaskellDepends = [
+         base genvalidity QuickCheck scientific validity validity-scientific
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec QuickCheck scientific
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for Scientific";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "genvalidity-text" = callPackage
     ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, text, validity, validity-text
@@ -73654,6 +74699,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-unordered-containers" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
+     , hspec, QuickCheck, unordered-containers, validity
+     , validity-unordered-containers
+     }:
+     mkDerivation {
+       pname = "genvalidity-unordered-containers";
+       version = "0.0.0.0";
+       sha256 = "1yvav983wq3rff5k9fpjw6m8hsn3jxymfqklw4vc5m0g5v4al8f9";
+       libraryHaskellDepends = [
+         base genvalidity hashable QuickCheck unordered-containers validity
+         validity-unordered-containers
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec unordered-containers
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for unordered-containers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "genvalidity-vector" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, validity, validity-vector, vector
+     }:
+     mkDerivation {
+       pname = "genvalidity-vector";
+       version = "0.0.0.0";
+       sha256 = "032dkx4wzla7aap31122f0cw31h8f5j36dq7xmvd2q9ssrcr39h7";
+       libraryHaskellDepends = [
+         base genvalidity QuickCheck validity validity-vector vector
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec vector
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for vector";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "geo-resolver" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, http-conduit, http-types, HUnit, QuickCheck
@@ -74552,6 +75637,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.0.2";
+       sha256 = "0qcz4283gm9hxnqx462rdn1r3q9jmad19b3y8n0z4lsrpfziynq1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       executableHaskellDepends = [ base containers scientific text ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       homepage = "https://github.com/maoe/ghc-prof";
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-flamegraph" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -75263,6 +76372,28 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
+  "gi-atk_2_0_14" = callPackage
+    ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-atk";
+       version = "2.0.14";
+       sha256 = "0fp5shf2hilziw4rlzbc2hzf43b2gi1cwm3vlr2ggdkw29ic0c7m";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ atk ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Atk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) atk;};
+
   "gi-cairo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, text, transformers
@@ -75287,6 +76418,32 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo;};
 
+  "gi-cairo_1_0_14" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-cairo";
+       version = "1.0.14";
+       sha256 = "0414qhjgh94pvkxrrcnkxg8hac35ykrqnhr5nrn63l66wigp1fxb";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ cairo ];
+       doHaddock = false;
+       preCompileBuildDriver = ''
+         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
+         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
+       '';
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Cairo bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) cairo;};
+
   "gi-gdk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
@@ -75309,6 +76466,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
+  "gi-gdk_3_0_14" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-gdk";
+       version = "3.0.14";
+       sha256 = "0ds8h0sjl4jf8y5vjfl18gsbarhy6pxl6if7nd4lqaznbribw4jl";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
+         gi-gobject gi-pango haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Gdk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {gtk3 = pkgs.gnome3.gtk;};
+
   "gi-gdkpixbuf" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text
@@ -75330,6 +76511,28 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gdk_pixbuf;};
 
+  "gi-gdkpixbuf_2_0_14" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
+     , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gdkpixbuf";
+       version = "2.0.14";
+       sha256 = "1p8sksyg9jrva2mm0ipqxv10df0hnmzmiv2rs05ayl1ris366h2q";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gdk_pixbuf ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GdkPixbuf bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gdk_pixbuf;};
+
   "gi-gio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers
@@ -75350,19 +76553,41 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-gio_2_0_14" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, glib, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gio";
+       version = "2.0.14";
+       sha256 = "0dwy8zd66b04jbn0g7c5n511nl2xxjvchzf56bmw8cfcm384r66d";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Gio bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "gi-girepository" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
+     , gobjectIntrospection, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.12";
-       sha256 = "1fbyr65pc1i264f0cn43g1cbdzkvc5m0cdd997m2sx77nlc481m8";
+       version = "1.0.14";
+       sha256 = "1pains4g8a4yxacggx6jama3d1rdky684kcm758m6kiigsplkfkp";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject haskell-gi haskell-gi-base
-         text transformers
+         haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gobjectIntrospection ];
        doHaddock = false;
@@ -75392,6 +76617,28 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-glib_2_0_14" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, glib
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-glib";
+       version = "2.0.14";
+       sha256 = "09bmrrppbjcy90f66qdhsj2hz3x7ci80mrdgryajzqrin4zs7aqx";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GLib bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "gi-gobject" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, text, transformers
@@ -75412,19 +76659,41 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-gst" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text
+  "gi-gobject_2_0_14" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
+     mkDerivation {
+       pname = "gi-gobject";
+       version = "2.0.14";
+       sha256 = "12w4fph341b6gxp6bd6xnrc4cs8bxhwkz33z4ndlkrb75a0289lg";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GObject bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
+  "gi-gst" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gstreamer, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.12";
-       sha256 = "08131f3smycwdpgpx2gkyb3aq3hi1g9gr4zx3isqi2pff7z2qrnb";
+       version = "1.0.14";
+       sha256 = "1yjimqcaqq9ah9nkyd1rq0bvs2sp4vbicfw6d5d0s6pcavqzxhpg";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
+         haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gstreamer ];
        doHaddock = false;
@@ -75437,16 +76706,16 @@ self: {
   "gi-gstaudio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi
-     , haskell-gi-base, text, transformers
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstaudio";
-       version = "1.0.12";
-       sha256 = "1aidn8kc3i81hdh1xpiyv0nh4n0ncwdfyigv5n64jdf9j7faqp3z";
+       version = "1.0.14";
+       sha256 = "1l3cldq3i5anb8cmwya33gfpwj9njbhk3f40nz0772sa29j4311h";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
-         haskell-gi haskell-gi-base text transformers
+         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
@@ -75459,16 +76728,16 @@ self: {
   "gi-gstbase" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base
-     , text, transformers
+     , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.13";
-       sha256 = "1s3x30d65yl908hwy67mb9a7c55lrypiaxjq13j7fhl99clppy6b";
+       version = "1.0.15";
+       sha256 = "1gb7q5gxdrpblc8xfbrvv4072vfz910v3fg0h38ixda8p30fh30j";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
-         haskell-gi-base text transformers
+         haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
@@ -75481,17 +76750,18 @@ self: {
   "gi-gstpbutils" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstaudio, gi-gsttag, gi-gstvideo
-     , gstreamer-pbutils, haskell-gi, haskell-gi-base, text
-     , transformers
+     , gstreamer-pbutils, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstpbutils";
-       version = "1.0.12";
-       sha256 = "1skbvijcnjd2nqic2q2ggqfbz1amrxpy7gkbmvsgv4qzxgywsyv3";
+       version = "1.0.14";
+       sha256 = "0pjjxqsfrl06v88mz3aacwy5812i752m4h979gw1qn8h431kgg4y";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio
-         gi-gsttag gi-gstvideo haskell-gi haskell-gi-base text transformers
+         gi-gsttag gi-gstvideo haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gstreamer-pbutils ];
        doHaddock = false;
@@ -75504,16 +76774,16 @@ self: {
   "gi-gsttag" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gstreamer-tag, haskell-gi
-     , haskell-gi-base, text, transformers
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gsttag";
-       version = "1.0.12";
-       sha256 = "1xn4aav9gz08wakgsspm385iv7gvd9v1xkisgnl64lwlgah7rkh2";
+       version = "1.0.14";
+       sha256 = "056wbkkjds3gk2x0wm4abskpqqw5f8gyhwscl3ih5j90w78d0a28";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
-         haskell-gi haskell-gi-base text transformers
+         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gstreamer-tag ];
        doHaddock = false;
@@ -75526,16 +76796,16 @@ self: {
   "gi-gstvideo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi
-     , haskell-gi-base, text, transformers
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.12";
-       sha256 = "0vi9c6bbqdl0x58nykmqyiffdvcs2mcgnd02kdpb2a7x2plfnvxs";
+       version = "1.0.14";
+       sha256 = "1hr20yf43zgcmpmygca5vdn1qb2fhhqqbh8s24kwjfy7bwl8zly1";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
-         haskell-gi haskell-gi-base text transformers
+         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
@@ -75568,6 +76838,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
+  "gi-gtk_3_0_17" = 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
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gtk";
+       version = "3.0.17";
+       sha256 = "1rplvhn3lbss66yps6jrhd9f9m6znj8ybss0rpik3dxwgmac3rw3";
+       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 haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Gtk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {gtk3 = pkgs.gnome3.gtk;};
+
   "gi-gtk-hs" = callPackage
     ({ mkDerivation, base, base-compat, containers, gi-gdk
      , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
@@ -75590,16 +76884,16 @@ self: {
   "gi-gtkosxapplication" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
      , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi
-     , haskell-gi-base, text, transformers
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gtkosxapplication";
-       version = "2.0.12";
-       sha256 = "0agqq13nc73c8m0cbk0c3gx5jdgmwv6kzpmiai33qyhyva7jn2jx";
+       version = "2.0.14";
+       sha256 = "1hx01rr99kw8ja1py7s8fzzxy7psaarsyk9g773rijf25xq4b53f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
-         haskell-gi haskell-gi-base text transformers
+         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        doHaddock = false;
@@ -75613,17 +76907,17 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base
-     , text, transformers
+     , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.13";
-       sha256 = "0fg6pzrs1r43gfcsmah7rm3p03pry84nryjv1p0ckd5g083pln6z";
+       version = "3.0.15";
+       sha256 = "09vfxh75wbg3012mbzy39bczlvwyxndiy9wqmhwvhgh3iq0yk2fd";
        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
-         haskell-gi-base text transformers
+         haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gtksourceview3 ];
        doHaddock = false;
@@ -75654,18 +76948,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
-  "gi-javascriptcore_4_0_12" = callPackage
+  "gi-javascriptcore_4_0_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, text, transformers, webkitgtk
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
+     , webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "4.0.12";
-       sha256 = "1wwpapn0w461njr13raws2i7aazkrsw1254aim0a2lc6h0xapbg3";
+       version = "4.0.14";
+       sha256 = "00mlnzdi6syay6dl20xz3s32bxsl32gwjhv3y1lbfzmzj7i7f914";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base text
-         transformers
+         base bytestring containers haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        doHaddock = false;
@@ -75677,17 +76972,17 @@ self: {
 
   "gi-notify" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libnotify, text
-     , transformers
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, libnotify, text, transformers
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.7.12";
-       sha256 = "0rc9frrg43blwsxpjyqjrrrjgq10p1hpnfrp1vd6jq3prbh0pp36";
+       version = "0.7.14";
+       sha256 = "12ahyx3pn2pf63n22pa8qkwgh36yrdza2hw3n6khqws814g2f0ay";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
-         haskell-gi haskell-gi-base text transformers
+         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ libnotify ];
        doHaddock = false;
@@ -75699,17 +76994,17 @@ self: {
 
   "gi-ostree" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, ostree, text
-     , transformers
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, ostree, text, transformers
      }:
      mkDerivation {
        pname = "gi-ostree";
-       version = "1.0.3";
-       sha256 = "0b9x7w6v8w62wbvwc2p3fk5q2mar7db9ch1a0idf8s667jhmzdfj";
+       version = "1.0.5";
+       sha256 = "1w9x0jn2k8wny7925zw2lsmvs18i6j15ijizr515brqff3gyi5fs";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
+         haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ ostree ];
        doHaddock = false;
@@ -75745,19 +77040,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
+  "gi-pango_1_0_15" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, pango, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-pango";
+       version = "1.0.15";
+       sha256 = "0ymwbbm5ga31fj6i2mc75743ndqfb7p900576yv5y2p9d8cgp5j1";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ cairo pango ];
+       doHaddock = false;
+       preCompileBuildDriver = ''
+         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
+         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
+       '';
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Pango bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
+
   "gi-pangocairo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi
-     , haskell-gi-base, pango, text, transformers
+     , haskell-gi-base, haskell-gi-overloading, pango, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.13";
-       sha256 = "0gs9cpd1a8imkqcd995hp6kjk6v8ai6mlqc9rm5jv0hvicjr948g";
+       version = "1.0.15";
+       sha256 = "0vy5fg2867dda19myyjbkxnrrbwgp3n7yqnfwqc67m5n8ziha2sb";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
-         haskell-gi haskell-gi-base text transformers
+         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ cairo pango ];
        doHaddock = false;
@@ -75773,17 +77095,17 @@ self: {
 
   "gi-poppler" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
-     , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, poppler
-     , text, transformers
+     , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, poppler, text, transformers
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.18.12";
-       sha256 = "04dza9hh8bbn5i6qhk5140ii5nxd9xpz6xfcfd8a08r0bsav35zp";
+       version = "0.18.14";
+       sha256 = "03dgkaqiy7y808x7g1xmmns1m19xc94f4kg0vjhyb1f1xr7k7hzj";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
-         haskell-gi haskell-gi-base text transformers
+         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ poppler ];
        doHaddock = false;
@@ -75795,17 +77117,17 @@ self: {
 
   "gi-secret" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsecret, text
-     , transformers
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, libsecret, text, transformers
      }:
      mkDerivation {
        pname = "gi-secret";
-       version = "0.0.2";
-       sha256 = "18f2nyx79bk9mixmi5xbzmvylb4q1gxgqzynl2y77zhd3q3fcgzc";
+       version = "0.0.4";
+       sha256 = "12kvdnxvsaj4mljkjhnma7n0d6qav6k9a4laca881ww50hdbwid2";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
+         haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ libsecret ];
        doHaddock = false;
@@ -75835,19 +77157,42 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) libsoup;};
 
+  "gi-soup_2_4_14" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, libsoup, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-soup";
+       version = "2.4.14";
+       sha256 = "1z0cxhyadampjdibsrvqi6rw3kmcvq0q3mf4gk33ss2xb0f86m75";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ libsoup ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Libsoup bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.gnome2) libsoup;};
+
   "gi-vte" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
-     , haskell-gi-base, text, transformers, vte
+     , haskell-gi-base, haskell-gi-overloading, text, transformers, vte
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.14";
-       sha256 = "1xvv91q99918rbbkk3q2vy8sg22dh835ih51mibmz994r4pgh82s";
+       version = "2.91.16";
+       sha256 = "0gv1ab2an6gfk83d5ryjpfz92rwrll2jyl41i48ql6fagbxx0n18";
        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 haskell-gi-base text transformers
+         gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading
+         text transformers
        ];
        libraryPkgconfigDepends = [ vte ];
        doHaddock = false;
@@ -75881,21 +77226,45 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
+  "gi-webkit_3_0_14" = 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
+     , haskell-gi-overloading, text, transformers, webkitgtk24x-gtk3
+     }:
+     mkDerivation {
+       pname = "gi-webkit";
+       version = "3.0.14";
+       sha256 = "006jja6hr7bsqff2yxgzjrdnhbccym32fcr9vd7dscyj4wqw1ng1";
+       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 haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "WebKit bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) webkitgtk24x-gtk3;};
+
   "gi-webkit2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
-     , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text
-     , transformers, webkitgtk
+     , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.12";
-       sha256 = "1c392g4gk8mzrkr6d4rw6nbriyqc41nzl8svwpg0xa2bwpakz33z";
+       version = "4.0.14";
+       sha256 = "15r5kq0vq5gc4rsi0icw2f5zbqjw7kgdwpa3fbzn6jx7xmbl39kp";
        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
-         haskell-gi-base text transformers
+         haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        doHaddock = false;
@@ -75908,16 +77277,18 @@ self: {
   "gi-webkit2webextension" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
      , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
-     , text, transformers, webkitgtk-web-extension
+     , haskell-gi-overloading, text, transformers
+     , webkitgtk-web-extension
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.12";
-       sha256 = "0xyaxm0b9kijzpxf3dn0x6s9k0shkj7la7nyc4f5a04nkndv0gsi";
+       version = "4.0.14";
+       sha256 = "098p54q8rrfd9syzh10q5rcb70lihjkwx7amj7s5y8wix38f372k";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject gi-gtk gi-javascriptcore
-         gi-soup haskell-gi haskell-gi-base text transformers
+         gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text
+         transformers
        ];
        libraryPkgconfigDepends = [ webkitgtk-web-extension ];
        doHaddock = false;
@@ -78089,6 +79460,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gnuplot_0_5_4_2" = callPackage
+    ({ mkDerivation, array, base, containers, data-accessor
+     , data-accessor-transformers, deepseq, filepath, process, temporary
+     , time, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "gnuplot";
+       version = "0.5.4.2";
+       sha256 = "0s7z8a7cqnmfrs551wyqaj557hslhkw401z35nfb7shx6wrdvpq5";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base containers data-accessor data-accessor-transformers
+         deepseq filepath process temporary time transformers utility-ht
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
+       description = "2D and 3D plots using gnuplot";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gnutls" = callPackage
     ({ mkDerivation, base, bytestring, gnutls, monads-tf, transformers
      }:
@@ -79841,8 +81234,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-translate";
-       version = "0.4";
-       sha256 = "0aa9prwp3sdai75dbywsq4qb96crz9dk6dkp7vl7ixbl2q1zxldc";
+       version = "0.4.1";
+       sha256 = "0xpi3qss2cnv0dxgiwffzk6isgfgb95hfd5j62vc5jkjgkyzfqxn";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-client servant
          servant-client text transformers
@@ -80145,6 +81538,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gotta-go-fast" = callPackage
+    ({ mkDerivation, base, brick, cmdargs, directory, random, time, vty
+     }:
+     mkDerivation {
+       pname = "gotta-go-fast";
+       version = "0.1.2.0";
+       sha256 = "124zk4zcfpr72xgck104n338p9aid9p1q89vcs7h16zvhai3bc4f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick cmdargs directory random time vty
+       ];
+       homepage = "https://github.com/hot-leaf-juice/gotta-go-fast";
+       description = "A command line utility for practicing typing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gpah" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers, csv
      , deepseq, directory, filepath, haskell-src-exts, hint, HTTP
@@ -81432,6 +82842,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog-inspector_0_8_0_2" = callPackage
+    ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
+     , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
+     , regex-compat, syb, template-haskell, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "groundhog-inspector";
+       version = "0.8.0.2";
+       sha256 = "1wbsx0qjbhliglwk4yhh44ra54i34cypvki9zvw28khpc8mxdfmz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson-pretty base bytestring containers groundhog groundhog-th
+         regex-compat syb template-haskell text time transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs containers groundhog groundhog-sqlite
+         groundhog-th mtl
+       ];
+       homepage = "http://github.com/lykahb/groundhog";
+       description = "Type-safe datatype-database mapping library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groundhog-mysql" = callPackage
     ({ mkDerivation, base, bytestring, containers, groundhog
      , monad-control, monad-logger, mysql, mysql-simple, resource-pool
@@ -83950,6 +85385,8 @@ self: {
        pname = "haddock-api";
        version = "2.17.4";
        sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss";
+       revision = "1";
+       editedCabalFile = "0saa5ksmvxyvwi2nrzh7m4ha1kwh31pkpa79yrppvw7sm39klpyw";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
@@ -83970,6 +85407,8 @@ self: {
        pname = "haddock-api";
        version = "2.18.1";
        sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8";
+       revision = "1";
+       editedCabalFile = "0ncxba7bppgap3vaxv07cyq2q4wsb860xv83znj4dgksvr64xl7y";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
@@ -84037,14 +85476,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haddock-library_1_4_4" = callPackage
+  "haddock-library_1_4_5" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq
      , hspec, QuickCheck, transformers
      }:
      mkDerivation {
        pname = "haddock-library";
-       version = "1.4.4";
-       sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9";
+       version = "1.4.5";
+       sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9";
        libraryHaskellDepends = [
          attoparsec base bytestring transformers
        ];
@@ -84306,6 +85745,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, email-validate
+     , exceptions, filepath, http-client, http-client-tls, http-types
+     , tagsoup, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hailgun";
+       version = "0.4.1.5";
+       sha256 = "0hi9a8aa10n14ipk4g8ksrf175z92kkwk0d9n3qzn835fkj5kkyr";
+       libraryHaskellDepends = [
+         aeson base bytestring email-validate exceptions filepath
+         http-client http-client-tls http-types tagsoup text time
+         transformers
+       ];
+       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
+       description = "Mailgun REST api interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -87380,6 +88839,22 @@ self: {
        broken = true;
      }) {booleanlist = null;};
 
+  "haskell-conll" = callPackage
+    ({ mkDerivation, base, containers, lens, pretty-show, protolude
+     , split, text
+     }:
+     mkDerivation {
+       pname = "haskell-conll";
+       version = "0.1.0.1";
+       sha256 = "09lgj70lk2xh75rq4gdmfacmb465r0xn03v8cnk82bx52c7jwiga";
+       libraryHaskellDepends = [
+         base containers lens pretty-show protolude split text
+       ];
+       homepage = "https://github.com/mgajda/haskell-conll#readme";
+       description = "Core Types for NLP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-course-preludes" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -87596,6 +89071,34 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
+  "haskell-gi_0_20_3" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
+     , directory, doctest, filepath, glib, gobjectIntrospection
+     , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
+     , text, transformers, xdg-basedir, xml-conduit
+     }:
+     mkDerivation {
+       pname = "haskell-gi";
+       version = "0.20.3";
+       sha256 = "0429dz3dn9l9nbrx8cd18j3f34cp6cc8zxb34jsvfpvdmafjin8q";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring Cabal containers directory filepath
+         haskell-gi-base mtl pretty-show process regex-tdfa safe text
+         transformers xdg-basedir xml-conduit
+       ];
+       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+       executableHaskellDepends = [
+         base containers directory filepath haskell-gi-base pretty-show text
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Generate Haskell bindings for GObject Introspection capable libraries";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
@@ -87609,6 +89112,32 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "haskell-gi-base_0_20_4" = callPackage
+    ({ mkDerivation, base, bytestring, containers, glib, text }:
+     mkDerivation {
+       pname = "haskell-gi-base";
+       version = "0.20.4";
+       sha256 = "00kpn7rxg91im26109q1m3g6hyp8v46v50j3dddz002sj2zycifq";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       libraryPkgconfigDepends = [ glib ];
+       homepage = "https://github.com/haskell-gi/haskell-gi-base";
+       description = "Foundation for libraries generated by haskell-gi";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
+  "haskell-gi-overloading" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "haskell-gi-overloading";
+       version = "1.0";
+       sha256 = "0ak8f79ia9zlk94zr02sq8bqi5n5pd8ria8w1dj3adcdvpw9gmry";
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Overloading support for haskell-gi";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-go-checkers" = callPackage
     ({ mkDerivation, base, containers, gloss }:
      mkDerivation {
@@ -88294,6 +89823,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-ast_0_8_1_0" = callPackage
+    ({ mkDerivation, base, ghc, mtl, references, template-haskell
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-ast";
+       version = "0.8.1.0";
+       sha256 = "0ryny34zlbyy15m18f5539gaqwghbk1msz5ijv3x04n1c87vj7h4";
+       libraryHaskellDepends = [
+         base ghc mtl references template-haskell uniplate
+       ];
+       homepage = "https://github.com/nboldi/haskell-tools";
+       description = "Haskell AST for efficient tooling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-ast-fromghc" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
@@ -88367,6 +89913,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-backend-ghc_0_8_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
+     , haskell-tools-ast, mtl, references, safe, split, template-haskell
+     , transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-backend-ghc";
+       version = "0.8.1.0";
+       sha256 = "1abbqgv43rbkwabnhm0p7i39sgiq952hg5xy7bc8g3jbnaallaaf";
+       libraryHaskellDepends = [
+         base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
+         references safe split template-haskell transformers uniplate
+       ];
+       homepage = "https://github.com/nboldi/haskell-tools";
+       description = "Creating the Haskell-Tools AST from GHC's representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, haskell-tools-ast
@@ -88425,6 +89990,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-daemon_0_8_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, Diff
+     , directory, filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl
+     , network, process, references, split, strict, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "haskell-tools-daemon";
+       version = "0.8.1.0";
+       sha256 = "1h5xh235b68kfjq8hkrmr0zhj6csaslm7qwkaqs3ygxkkrq152ic";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers Diff directory filepath ghc
+         ghc-paths haskell-tools-ast haskell-tools-prettyprint
+         haskell-tools-refactor mtl network process references split strict
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath ghc 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";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-debug" = callPackage
     ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -88448,6 +90041,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-debug_0_8_1_0" = callPackage
+    ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-refactor, references, template-haskell
+     }:
+     mkDerivation {
+       pname = "haskell-tools-debug";
+       version = "0.8.1.0";
+       sha256 = "1c6apmv2x4wrjh22nm7v151hy4r2sksrbcwin80dc8ya4zc3fqr6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath ghc ghc-paths haskell-tools-ast
+         haskell-tools-backend-ghc haskell-tools-prettyprint
+         haskell-tools-refactor references template-haskell
+       ];
+       executableHaskellDepends = [ base ];
+       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
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -88479,6 +90095,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-demo_0_8_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-refactor, http-types, HUnit, mtl, network
+     , references, tasty, tasty-hunit, transformers, wai, wai-websockets
+     , warp, websockets
+     }:
+     mkDerivation {
+       pname = "haskell-tools-demo";
+       version = "0.8.1.0";
+       sha256 = "011p9xdqgr93qxwvhcf8k2xr2ycgfjf0d60g8yfgjkgy9zx6fsma";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-refactor http-types mtl
+         references transformers wai wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath HUnit network tasty
+         tasty-hunit websockets
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "A web-based demo for Haskell-tools Refactor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-prettyprint" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, text, uniplate
@@ -88497,6 +90144,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-prettyprint_0_8_1_0" = callPackage
+    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
+     , references, split, text, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-prettyprint";
+       version = "0.8.1.0";
+       sha256 = "1zcxg6drw3zfc93awmamhh8mqfyrp1pyrnk137yc0dz4293z9rdw";
+       libraryHaskellDepends = [
+         base containers ghc haskell-tools-ast mtl references split text
+         uniplate
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Pretty printing of Haskell-Tools AST";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-refactor" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -88528,6 +90193,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-refactor_0_8_1_0" = callPackage
+    ({ 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
+     }:
+     mkDerivation {
+       pname = "haskell-tools-refactor";
+       version = "0.8.1.0";
+       sha256 = "04jx9qq04krk8wk7v5b6xv7gi8cd1sgzwraw916a11cgn0p52grr";
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-rewrite mtl references
+         split template-haskell transformers uniplate
+       ];
+       testHaskellDepends = [
+         base Cabal containers directory either filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
+         polyparse references split tasty tasty-hunit template-haskell time
+         transformers uniplate
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Refactoring Tool for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-rewrite" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
@@ -88551,6 +90247,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-rewrite_0_8_1_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, ghc
+     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
+     , tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "haskell-tools-rewrite";
+       version = "0.8.1.0";
+       sha256 = "1ckn103f5jg3yqpf2ki8n62a663hj5q2zyd5mzx6n4nlkr47bc57";
+       libraryHaskellDepends = [
+         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
+         references
+       ];
+       testHaskellDepends = [
+         base directory filepath haskell-tools-ast haskell-tools-prettyprint
+         tasty tasty-hunit
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Facilities for generating new parts of the Haskell-Tools AST";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tor" = callPackage
     ({ mkDerivation, array, asn1-encoding, asn1-types, async
      , attoparsec, base, base64-bytestring, binary, bytestring, cereal
@@ -89801,6 +91520,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasmin_0_3_2_3" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, directory, doctest, doctest-discover, gitrev, hopfli
+     , hspec, hspec-attoparsec, matrix, mtl, numbers
+     , optparse-applicative, parsers, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasmin";
+       version = "0.3.2.3";
+       sha256 = "0qk551j27rc36gmrfdhlvz3kzn8yj8alzc2n86jgyx480gj354gg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers matrix mtl numbers parsers
+         text
+       ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers gitrev hopfli matrix mtl
+         numbers optparse-applicative parsers text
+       ];
+       testHaskellDepends = [
+         attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
+         QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion directory text ];
+       homepage = "https://github.com/contivero/hasmin#readme";
+       description = "CSS Minifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasparql-client" = callPackage
     ({ mkDerivation, base, HTTP, monads-fd, network, xml }:
      mkDerivation {
@@ -89861,6 +91611,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_0_19_18_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
+     , bytestring-strict-builder, contravariant, contravariant-extras
+     , criterion, data-default-class, dlist, either, hashable
+     , hashtables, loch-th, mtl, placeholders, postgresql-binary
+     , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances
+     , rebase, rerebase, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.18.1";
+       sha256 = "1cmr3l9gb639spqdw8if1da23qhlifr4jyxgfmy61l81mm42zjfb";
+       libraryHaskellDepends = [
+         attoparsec base base-prelude bytestring bytestring-strict-builder
+         contravariant contravariant-extras data-default-class dlist either
+         hashable hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors semigroups text transformers vector
+       ];
+       testHaskellDepends = [
+         bug data-default-class QuickCheck quickcheck-instances rebase
+         rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       benchmarkHaskellDepends = [ bug criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "An efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, either, free
      , list-t, text, transformers, vector
@@ -91648,6 +93428,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "heaps_0_3_5" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest
+     , filepath
+     }:
+     mkDerivation {
+       pname = "heaps";
+       version = "0.3.5";
+       sha256 = "1p1nsglsf8hric63cn3n1iw1nlbiv3lgk3n5gq0znajj7j7s64qv";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/heaps/";
+       description = "Asymptotically optimal Brodal/Okasaki heaps";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heapsort" = callPackage
     ({ mkDerivation, array, base, QuickCheck }:
      mkDerivation {
@@ -95211,21 +97008,21 @@ self: {
   "hledger-iadd" = callPackage
     ({ mkDerivation, base, brick, containers, directory, free
      , hledger-lib, hspec, megaparsec, microlens, microlens-th
-     , optparse-applicative, QuickCheck, text, text-format, text-zipper
-     , time, transformers, unordered-containers, vector, vty
-     , xdg-basedir
+     , optparse-applicative, QuickCheck, semigroups, text, text-format
+     , text-zipper, time, transformers, unordered-containers, vector
+     , vty, xdg-basedir
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.2.3";
-       sha256 = "1y2j2aiidp3y92wpx8wmr9r4wibg2cn0lws4s7ljrl6ghh57n4vq";
+       version = "1.2.4";
+       sha256 = "17bzjmdcirf32fic6sx246x30p02gnq0c50bia0lq088hdfxn6yr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base brick containers directory free hledger-lib megaparsec
-         microlens microlens-th optparse-applicative text text-format
-         text-zipper time transformers unordered-containers vector vty
-         xdg-basedir
+         microlens microlens-th optparse-applicative semigroups text
+         text-format text-zipper time transformers unordered-containers
+         vector vty xdg-basedir
        ];
        executableHaskellDepends = [
          base brick directory free hledger-lib megaparsec microlens
@@ -96977,8 +98774,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.12";
-       sha256 = "024knipmwl75gq56phjwpa61gzac8alw46k6lcgfg7v9dglz2dqx";
+       version = "5.0.13";
+       sha256 = "1wxdzkifgm3bnpzr45sf49dyqwnb8bnc5wmqbv5yhxv19gmjk8kn";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -98159,6 +99956,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpp_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-trie, directory
+     , filepath, ghc-prim, time, transformers
+     }:
+     mkDerivation {
+       pname = "hpp";
+       version = "0.4.1";
+       sha256 = "0va60lvxgy52i064i62hln7kca55xk5f494khiax74bsn8iin7pq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring bytestring-trie directory filepath ghc-prim time
+         transformers
+       ];
+       executableHaskellDepends = [ base directory filepath time ];
+       homepage = "https://github.com/acowley/hpp";
+       description = "A Haskell pre-processor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hpqtypes" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , data-default-class, exceptions, HUnit, lifted-base, monad-control
@@ -100244,6 +102062,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsexif_0_6_1_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
+     , iconv, text, time
+     }:
+     mkDerivation {
+       pname = "hsexif";
+       version = "0.6.1.2";
+       sha256 = "1i6h4gpjlrb9jadm52ygs9i1430lik2kljv86bpq6wz9zmq25d0s";
+       libraryHaskellDepends = [
+         base binary bytestring containers iconv text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers hspec HUnit iconv text time
+       ];
+       homepage = "https://github.com/emmanueltouzery/hsexif";
+       description = "EXIF handling library in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsfacter" = callPackage
     ({ mkDerivation, base, containers, language-puppet, text }:
      mkDerivation {
@@ -100404,8 +102242,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsimport";
-       version = "0.8.3";
-       sha256 = "1hfhni85518hqvq3gzllc2mj83z1fwqlsfh2ida5pn8lg2j9ix2b";
+       version = "0.8.4";
+       sha256 = "1xngy3qnk6nr0yvvkq7cqay0kkhnp0v4ah27w8r5v3q4malraa1l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102655,15 +104493,17 @@ self: {
      }) {};
 
   "html-entities" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest
-     , filepath, text, unordered-containers
+    ({ mkDerivation, attoparsec, base, base-prelude, Cabal
+     , cabal-doctest, directory, doctest, filepath, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "html-entities";
-       version = "1.1.4";
-       sha256 = "1h4jjy1fqzfcj49q99iprnz4ifaznacxnryq9bx8abxqsss22p0d";
+       version = "1.1.4.1";
+       sha256 = "1x6z5fv1sdhdmhwd10kwahvjjkhrza3dm7xzk9ypfkkmyi1piwpi";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         attoparsec base-prelude text unordered-containers
+         attoparsec base base-prelude text unordered-containers
        ];
        testHaskellDepends = [
          base base-prelude directory doctest filepath
@@ -104657,6 +106497,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-hedgehog" = callPackage
+    ({ mkDerivation, base, hedgehog, vector }:
+     mkDerivation {
+       pname = "hw-hedgehog";
+       version = "0.1.0.1";
+       sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6";
+       libraryHaskellDepends = [ base hedgehog vector ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/githubuser/hw-hedgehog#readme";
+       description = "Extra hedgehog functionality";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-hspec-hedgehog" = callPackage
     ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }:
      mkDerivation {
@@ -106067,6 +107920,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hyperloglog_0_4_2" = callPackage
+    ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal
+     , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory
+     , distributive, doctest, filepath, generic-deriving, hashable, lens
+     , reflection, safecopy, semigroupoids, semigroups, simple-reflect
+     , siphash, tagged, vector
+     }:
+     mkDerivation {
+       pname = "hyperloglog";
+       version = "0.4.2";
+       sha256 = "0j0hbzpap3f92kvywsxjahxmqrdj51275jdv0h7f9lf9qby3rf7m";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         approximate base binary bits bytes cereal cereal-vector comonad
+         deepseq distributive hashable lens reflection safecopy
+         semigroupoids semigroups siphash tagged vector
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath generic-deriving semigroups
+         simple-reflect
+       ];
+       homepage = "http://github.com/analytics/hyperloglog";
+       description = "An approximate streaming (constant space) unique object counter";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hyperloglogplus" = callPackage
     ({ mkDerivation, base, bits, containers, HUnit, murmur-hash
      , semigroups, tasty, tasty-hunit, vector
@@ -106122,6 +108002,8 @@ self: {
        pname = "hyphenation";
        version = "0.7";
        sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s";
+       revision = "1";
+       editedCabalFile = "0r3a79cg3dabcm4px3vq26hc5yj4sagws4fa3ic00d28qb6y4b4w";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
@@ -106741,6 +108623,51 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
+  "idris_1_1_0" = callPackage
+    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal
+     , ansi-wl-pprint, array, async, base, base64-bytestring, binary
+     , blaze-html, blaze-markup, bytestring, cheapskate, code-page
+     , containers, deepseq, directory, filepath, fingertree, fsnotify
+     , gmp, haskeline, ieee754, libffi, mtl, network
+     , optparse-applicative, parsers, pretty, process, regex-tdfa, safe
+     , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size
+     , text, time, transformers, transformers-compat, trifecta, uniplate
+     , unix, unordered-containers, utf8-string, vector
+     , vector-binary-instances, zip-archive
+     }:
+     mkDerivation {
+       pname = "idris";
+       version = "1.1.0";
+       sha256 = "1d68jz9irqcya90a1s3hvn955lqq3zd64y5d7mkx84r1gsxsmskk";
+       configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async
+         base base64-bytestring binary blaze-html blaze-markup bytestring
+         cheapskate code-page containers deepseq directory filepath
+         fingertree fsnotify haskeline ieee754 libffi mtl network
+         optparse-applicative parsers pretty process regex-tdfa safe split
+         terminal-size text time transformers transformers-compat trifecta
+         uniplate unix unordered-containers utf8-string vector
+         vector-binary-instances zip-archive
+       ];
+       librarySystemDepends = [ gmp ];
+       executableHaskellDepends = [
+         base directory filepath haskeline transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory filepath haskeline
+         optparse-applicative process tagged tasty tasty-golden tasty-rerun
+         time transformers
+       ];
+       homepage = "http://www.idris-lang.org/";
+       description = "Functional Programming Language with Dependent Types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gmp;};
+
   "ieee" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -107232,6 +109159,21 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "ihs_0_1_0_1" = callPackage
+    ({ mkDerivation, base, process }:
+     mkDerivation {
+       pname = "ihs";
+       version = "0.1.0.1";
+       sha256 = "0q7wa5pgf4ga7pmjwjxacqmdbhqricsv9xkzfrcg314lag8wvdgb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base process ];
+       homepage = "https://github.com/minad/ihs";
+       description = "Interpolated Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ihttp" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , contstuff, enumerator, netlines, network
@@ -109260,6 +111202,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "intervals_0_8_1" = callPackage
+    ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
+     , distributive, doctest, filepath, ghc-prim, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "intervals";
+       version = "0.8.1";
+       sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ array base distributive ghc-prim ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "http://github.com/ekmett/intervals";
+       description = "Interval Arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "intricacy" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath
@@ -109411,6 +111373,30 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "invariant_0_4_3" = callPackage
+    ({ mkDerivation, array, base, bifunctors, comonad, containers
+     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
+     , semigroups, StateVar, stm, tagged, template-haskell
+     , th-abstraction, transformers, transformers-compat
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "invariant";
+       version = "0.4.3";
+       sha256 = "17nfm5w6hp4ajg7gslvdvzj4nkds8zk8yp1zi6pi6lax71613rz0";
+       libraryHaskellDepends = [
+         array base bifunctors comonad containers contravariant ghc-prim
+         profunctors semigroups StateVar stm tagged template-haskell
+         th-abstraction transformers transformers-compat
+         unordered-containers
+       ];
+       testHaskellDepends = [ base hspec QuickCheck template-haskell ];
+       homepage = "https://github.com/nfrisby/invariant-functors";
+       description = "Haskell98 invariant functors";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "invertible" = callPackage
     ({ mkDerivation, base, haskell-src-meta, invariant, lens
      , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
@@ -110065,6 +112051,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-client_0_4_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
+     , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
+     , time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "0.4.4.3";
+       sha256 = "0m85swb00hkpj13rk413vd7zxwsqps20kqnjwzwi14288awigjd1";
+       libraryHaskellDepends = [
+         base bytestring conduit connection irc-conduit irc-ctcp
+         network-conduit-tls old-locale stm stm-conduit text time tls
+         transformers x509 x509-store x509-validation
+       ];
+       homepage = "https://github.com/barrucadu/irc-client";
+       description = "An IRC client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -110095,6 +112101,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-conduit_0_2_2_2" = 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.2";
+       sha256 = "0glgq9wbx0i42ry7ribp8r54lsx39qjvvd9dhx1cnv5bb5jwihas";
+       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
@@ -112945,6 +114971,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jsons-to-schema" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit
+     , conduit-combinators, containers, Glob, hjsonschema, hspec
+     , neat-interpolation, optparse-applicative, protolude, QuickCheck
+     , quickcheck-instances, safe, scientific, semigroups, text
+     , uniplate, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "jsons-to-schema";
+       version = "0.1.0.0";
+       sha256 = "0agnvc8x2yvl2m0lz5hcflmi44gscyb349zn0xbrlk9arq7ha8nc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hjsonschema protolude
+         QuickCheck safe scientific semigroups text unordered-containers
+         vector
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit conduit-combinators Glob hjsonschema
+         optparse-applicative protolude
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hjsonschema hspec
+         neat-interpolation protolude QuickCheck quickcheck-instances
+         scientific text uniplate unordered-containers vector
+       ];
+       homepage = "https://github.com/garetht/jsons-to-schema/README.md";
+       description = "JSON to JSON Schema";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "jsonschema-gen" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, process
      , scientific, tagged, text, time, unordered-containers, vector
@@ -113187,6 +115245,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "justified-containers" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "justified-containers";
+       version = "0.1.1.1";
+       sha256 = "1grihhshn1dprg6cll742bdqkywnlz8zzcyf2m49kbpyzrcaywqg";
+       libraryHaskellDepends = [ base containers ];
+       homepage = "https://github.com/matt-noonan/justified-containers";
+       description = "Keyed container types with type-checked proofs of key presence";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "jvm" = callPackage
     ({ mkDerivation, base, bytestring, choice, criterion
      , distributed-closure, hspec, jni, singletons, template-haskell
@@ -116159,8 +118229,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-inline";
-       version = "0.7.10.0";
-       sha256 = "152bh73gr6a7iahi2vsn2z4vjgbk2rd5qsmrd5wc7jrb67485n6i";
+       version = "0.7.11.0";
+       sha256 = "1f31yk4h507d3gl0crjrjxhc2c313i8l04sacw79m2vyvy7fqrzw";
        libraryHaskellDepends = [
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
@@ -116681,22 +118751,22 @@ self: {
      , cabal-doctest, containers, deepseq, doctest, flow, ghc
      , haddock-api, haddock-library, hashable, intern, lens, megaparsec
      , monad-mock, mtl, optparse-generic, QuickCheck
-     , quickcheck-instances, smallcheck, system-filepath, tasty
-     , tasty-html, tasty-hunit, tasty-lens, tasty-quickcheck
+     , quickcheck-instances, semigroups, smallcheck, system-filepath
+     , tasty, tasty-html, tasty-hunit, tasty-lens, tasty-quickcheck
      , tasty-smallcheck, template-haskell, text, transformers, turtle
      , unordered-containers, versions
      }:
      mkDerivation {
        pname = "language-ninja";
-       version = "0.1.0";
-       sha256 = "1bqf61q8mzglf1f3y2khy2vw4k3kfc0qd0rw984jyfxk10wqr27d";
+       version = "0.2.0";
+       sha256 = "08lzkvq0v3b8grji7gcfg2m714xql85k18b5wg3h0nh38wkh6m8d";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq flow hashable intern lens
-         megaparsec mtl QuickCheck quickcheck-instances smallcheck
-         system-filepath text transformers unordered-containers versions
+         megaparsec mtl QuickCheck semigroups smallcheck system-filepath
+         text transformers unordered-containers versions
        ];
        executableHaskellDepends = [
          aeson aeson-pretty base flow lens mtl optparse-generic text
@@ -116705,8 +118775,8 @@ self: {
        testHaskellDepends = [
          aeson base bytestring cabal-doctest containers doctest flow ghc
          haddock-api haddock-library hashable lens monad-mock mtl QuickCheck
-         quickcheck-instances smallcheck system-filepath tasty tasty-html
-         tasty-hunit tasty-lens tasty-quickcheck tasty-smallcheck
+         quickcheck-instances semigroups smallcheck system-filepath tasty
+         tasty-html tasty-hunit tasty-lens tasty-quickcheck tasty-smallcheck
          template-haskell text transformers turtle unordered-containers
          versions
        ];
@@ -116838,6 +118908,51 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
+  "language-puppet_1_3_9" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , cryptonite, directory, exceptions, filecache, formatting, Glob
+     , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
+     , http-client, HUnit, lens, lens-aeson, megaparsec, memory, mtl
+     , operational, optparse-applicative, parallel-io, parsec
+     , pcre-utils, process, random, regex-pcre-builtin, scientific
+     , semigroups, servant, servant-client, split, stm
+     , strict-base-types, temporary, text, time, transformers, unix
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "language-puppet";
+       version = "1.3.9";
+       sha256 = "13sap5qqpinbn0cvi38kbvlny0vp1pi4xjvx8kjjwkrl30av2rx8";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
+         case-insensitive containers cryptonite directory exceptions
+         filecache formatting hashable hruby hslogger hspec http-api-data
+         http-client lens lens-aeson megaparsec memory mtl operational
+         parsec pcre-utils process random regex-pcre-builtin scientific
+         semigroups servant servant-client split stm strict-base-types text
+         time transformers unix unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers Glob hslogger http-client lens
+         megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin
+         servant-client strict-base-types text transformers
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
+         megaparsec mtl scientific strict-base-types temporary text
+         transformers unix unordered-containers vector
+       ];
+       homepage = "http://lpuppet.banquise.net/";
+       description = "Tools to parse and evaluate the Puppet DSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-python" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, monads-tf
      , pretty, transformers, utf8-string
@@ -116911,8 +119026,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-sally";
-       version = "0.1.1.0";
-       sha256 = "10ddikcavh7ppmm5issii7mv9nagrs0841cngz3alfw0sw6bw47v";
+       version = "0.1.2.0";
+       sha256 = "053lswpcscsx74lyfjm6g5yzckfd5fc2bvj34ps8470d8dhbphkb";
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring containers text
        ];
@@ -117769,12 +119884,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "leapseconds-announced_2017_1" = callPackage
+  "leapseconds-announced_2017_1_0_1" = callPackage
     ({ mkDerivation, base, QuickCheck, time }:
      mkDerivation {
        pname = "leapseconds-announced";
-       version = "2017.1";
-       sha256 = "06gn0y1nkg2wr3rnfm7f5drjfjxgaq16qayanhhdy59hdpfim70g";
+       version = "2017.1.0.1";
+       sha256 = "1mm8j994106gyx9p3widkydczn8wcj79m2kiymg9fjkhmxyb4fyd";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base QuickCheck time ];
        homepage = "https://github.com/bjornbm/leapseconds-announced";
@@ -118136,6 +120251,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-action_0_2_2" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant
+     , directory, doctest, filepath, lens, mtl, profunctors
+     , semigroupoids, semigroups, transformers
+     }:
+     mkDerivation {
+       pname = "lens-action";
+       version = "0.2.2";
+       sha256 = "1skhczbl774sb0202b8allm96b67wqsl5fd7jdr9i6a20hyx1gqr";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base comonad contravariant lens mtl profunctors semigroupoids
+         semigroups transformers
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/lens-action/";
+       description = "Monadic Getters and Folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, doctest, generic-deriving, lens, scientific
@@ -118158,6 +120294,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lens-aeson_1_0_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, doctest, generic-deriving, lens, scientific
+     , semigroups, simple-reflect, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "lens-aeson";
+       version = "1.0.2";
+       sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring lens scientific text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base doctest generic-deriving semigroups simple-reflect
+       ];
+       homepage = "http://github.com/lens/lens-aeson/";
+       description = "Law-abiding lenses for aeson";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-datetime" = callPackage
     ({ mkDerivation, base, lens, time }:
      mkDerivation {
@@ -118220,6 +120379,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-labels_0_1_0_2" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "lens-labels";
+       version = "0.1.0.2";
+       sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1";
+       libraryHaskellDepends = [ base ghc-prim ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Integration of lenses with OverloadedLabels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-prelude" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, contravariant
      , either, hashable, lens, mtl, text, time, transformers
@@ -118331,8 +120503,8 @@ self: {
     ({ mkDerivation, base, doctest, lens }:
      mkDerivation {
        pname = "lens-tutorial";
-       version = "1.0.2";
-       sha256 = "1dg1s44gqip77bqb76f8yyq9x20rhicdw2y2mlamzczvkgv3h9pg";
+       version = "1.0.3";
+       sha256 = "1x6lbmylfp1gbik32ssfq643nmkhvhliryz70fsvcmscscm0chxp";
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base doctest ];
        description = "Tutorial for the lens library";
@@ -119222,13 +121394,13 @@ self: {
      }:
      mkDerivation {
        pname = "libravatar";
-       version = "0.4";
-       sha256 = "0b0zyavlxmh0qcfiksyshrhxrnynz3wwbg13vd64gs0i9abdxjij";
+       version = "0.4.0.1";
+       sha256 = "0ki2xw3m0iq4n25ylv8am26j8s517v1l6b6avca6ymgn5qxq79kp";
        libraryHaskellDepends = [
          base bytestring cryptonite data-default-class dns memory random
          text uri-bytestring url
        ];
-       homepage = "http://rel4tion.org/projects/libravatar/";
+       homepage = "https://rel4.seek-together.space/projects/libravatar/";
        description = "Use Libravatar, the decentralized avatar delivery service";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -119921,6 +122093,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "linear_1_20_7" = callPackage
+    ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
+     , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq
+     , distributive, doctest, ghc-prim, hashable, HUnit, lens
+     , reflection, semigroupoids, semigroups, simple-reflect, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , transformers, transformers-compat, unordered-containers, vector
+     , void
+     }:
+     mkDerivation {
+       pname = "linear";
+       version = "1.20.7";
+       sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         adjunctions base base-orphans binary bytes cereal containers
+         deepseq distributive ghc-prim hashable lens reflection
+         semigroupoids semigroups tagged template-haskell transformers
+         transformers-compat unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base binary bytestring deepseq doctest HUnit lens reflection
+         simple-reflect test-framework test-framework-hunit vector
+       ];
+       homepage = "http://github.com/ekmett/linear/";
+       description = "Linear Algebra";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "linear-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, Cabal, cabal-doctest
      , distributive, doctest, lens, linear
@@ -119939,6 +122141,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "linear-accelerate_0_4_1" = callPackage
+    ({ mkDerivation, accelerate, base, Cabal, cabal-doctest
+     , distributive, doctest, lens, linear
+     }:
+     mkDerivation {
+       pname = "linear-accelerate";
+       version = "0.4.1";
+       sha256 = "1hhmn446ggm66r3aibg8dyc923lw68fmkb1y8q37jsw13s1lkdlp";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         accelerate base distributive lens linear
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/ekmett/linear-accelerate/";
+       description = "Lifting linear vector spaces into Accelerate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "linear-algebra-cblas" = callPackage
     ({ mkDerivation, base, ieee754, QuickCheck, storable-complex
      , test-framework, test-framework-quickcheck2, vector
@@ -120807,6 +123028,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "list-t_1_0_0_1" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
+     , mtl, mtl-prelude, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "list-t";
+       version = "1.0.0.1";
+       sha256 = "00gpz0fn91cj3chf13r1y83y5ifwj4b55j1c0zc2ss9yffrjjjaa";
+       libraryHaskellDepends = [
+         base base-prelude mmorph monad-control mtl transformers
+         transformers-base
+       ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       homepage = "https://github.com/nikita-volkov/list-t";
+       description = "ListT done right";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "list-t-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
      , list-t-text, text, transformers
@@ -121570,6 +123810,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lmdb-simple" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec, lmdb
+     , QuickCheck, serialise
+     }:
+     mkDerivation {
+       pname = "lmdb-simple";
+       version = "0.3.0.0";
+       sha256 = "1sin30ddq206f86br9snidskn02m4s6wwaaylvpmxzhay40b2f6i";
+       libraryHaskellDepends = [ base bytestring lmdb serialise ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/verement/lmdb-simple#readme";
+       description = "Simple API for LMDB";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lmonad" = callPackage
     ({ mkDerivation, base, containers, exceptions, HUnit, monad-control
      , transformers, transformers-base
@@ -121926,6 +124182,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "log-domain_0_11_2" = callPackage
+    ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
+     , comonad, deepseq, distributive, doctest, generic-deriving
+     , hashable, safecopy, semigroupoids, semigroups, simple-reflect
+     , vector
+     }:
+     mkDerivation {
+       pname = "log-domain";
+       version = "0.11.2";
+       sha256 = "0cywq1zv57p30419hdg6s7srd14g6r2kixnk8gmj72h0rx7fc2cd";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base binary bytes cereal comonad deepseq distributive hashable
+         safecopy semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base doctest generic-deriving semigroups simple-reflect
+       ];
+       homepage = "http://github.com/ekmett/log-domain/";
+       description = "Log-domain arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, fast-logger
      , time
@@ -122804,8 +125084,8 @@ self: {
      }:
      mkDerivation {
        pname = "loup";
-       version = "0.0.13";
-       sha256 = "03ibb8ddrd7k9mhb8axg3jrbrn68kwi94sz7wnxr21ixiz2cb122";
+       version = "0.0.14";
+       sha256 = "0j700rms8g1k8lz2anwh9j6pq8f4yqxmcvkn1ssxx2k5dvbq7q80";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123721,6 +126001,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "machines_0_6_3" = callPackage
+    ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
+     , conduit, conduit-combinators, containers, criterion, distributive
+     , doctest, mtl, pipes, pointed, profunctors, semigroupoids
+     , semigroups, transformers, transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "machines";
+       version = "0.6.3";
+       sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         adjunctions base comonad containers distributive mtl pointed
+         profunctors semigroupoids semigroups transformers
+         transformers-compat void
+       ];
+       testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [
+         base conduit conduit-combinators criterion mtl pipes
+       ];
+       homepage = "http://github.com/ekmett/machines/";
+       description = "Networked stream transducers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "machines-amazonka" = callPackage
     ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core
      , amazonka-ec2, amazonka-s3, amazonka-sts, base
@@ -125586,8 +127892,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "40000.0.0";
-       sha256 = "1cr4mnqqdwf137v4r6mgc7p1b20hm4pdvm6qs61zrhlgimy9zmln";
+       version = "40000.0.1";
+       sha256 = "08khf3s38gvxn5w6jv21h0zc1g6p3ddjs8lbzziyh416w0qq9b9y";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125619,8 +127925,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "40000.0.0";
-       sha256 = "0c2c09hmq8n44na0i20hqj57cv5wr9yy4apvhdn0xvgfs155wgp9";
+       version = "40000.0.1";
+       sha256 = "0phykn8h08yprmpds92cp6snraxg66hbh553b8da5v47dn06y8mv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125646,8 +127952,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "40000.0.0";
-       sha256 = "0pnwzay7w9jmdrq26sj3in127c5dywbzhwi12vcf09q4mi43zqwb";
+       version = "40000.0.1";
+       sha256 = "0444m1349gpyffpjlvf9faz4sia5kfsry9q174n6b60ch85w1ilg";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -126413,7 +128719,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_6_0_1" = callPackage
+  "megaparsec_6_0_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -126421,8 +128727,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "6.0.1";
-       sha256 = "1cj6ibzcvdq24k94xbx6fw2wxzh3dvxv9q2yapbdhimkx632g88w";
+       version = "6.0.2";
+       sha256 = "0j056smq8k0pal765vanjzg51aw7wxv0qihsipirb6d7ik03didf";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -126814,6 +129120,8 @@ self: {
        pname = "memorypool";
        version = "0.1.0.0";
        sha256 = "0w3ssdffsnaxgs8a22sbclsyss4bvmzhb6bww252dcrgpcmn1dkh";
+       revision = "1";
+       editedCabalFile = "1jv5zba8jldkic64dmrafq45dwaa0ayc2ihvbg0ff87n5i3sh5z0";
        libraryHaskellDepends = [
          base containers transformers unsafe vector
        ];
@@ -127744,8 +130052,8 @@ self: {
      }:
      mkDerivation {
        pname = "mikrokosmos";
-       version = "0.3.0";
-       sha256 = "1qr0m4iy1xyprw714nrdpkxlr6lmvsb6f9d8m4z13z03njnz4vm6";
+       version = "0.5.0";
+       sha256 = "04hm0bz3hhxb11x1cfk129sv8x9dqjyvbagpr250cha47wws3sal";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128408,6 +130716,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mixed-types-num_0_3_0_1" = callPackage
+    ({ mkDerivation, base, convertible, hspec, hspec-smallcheck
+     , QuickCheck, smallcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "mixed-types-num";
+       version = "0.3.0.1";
+       sha256 = "00qvb1himrrdpasfc44bblydgc1hmhnbfmcprq6yzdz7lb1f8x6x";
+       libraryHaskellDepends = [
+         base convertible hspec hspec-smallcheck QuickCheck smallcheck
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
+       homepage = "https://github.com/michalkonecny/mixed-types-num";
+       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mkbndl" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell98 }:
      mkDerivation {
@@ -129243,8 +131570,8 @@ self: {
        pname = "monad-http";
        version = "0.1.0.0";
        sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3";
-       revision = "4";
-       editedCabalFile = "00xzkxsqz34gc8vf1zanrmqszkbfigcl7dz1xwhab4p55lddvhhl";
+       revision = "5";
+       editedCabalFile = "1w12fd8jy7infcgahlg9zim518vvb2g3j0s2w6qdql86i629xjdg";
        libraryHaskellDepends = [
          base base-compat bytestring exceptions http-client http-client-tls
          http-types monad-logger monadcryptorandom MonadRandom mtl text
@@ -129543,8 +131870,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-mock";
-       version = "0.1.1.1";
-       sha256 = "1ja9s1z4y1vrk01bgav83cj95hzp8mrwil74b7lmc4fmdmr7a5y3";
+       version = "0.1.1.2";
+       sha256 = "029c8jcw7y3hd1llvfnm85fwxvfh7mlhr7dxnfsx6x8zq1qda12f";
        libraryHaskellDepends = [
          base constraints exceptions haskell-src-exts haskell-src-meta
          monad-control mtl template-haskell th-orphans transformers-base
@@ -130469,6 +132796,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable_1_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, foldl
+     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
+     , text, transformers, unordered-containers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "1.0.2.1";
+       sha256 = "0smirpwika7d5a98h20jr9jqg41n7vqfy7k31crmn449qfig9ljf";
+       libraryHaskellDepends = [
+         base bytestring containers hashable split text transformers
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mono-traversable-instances" = callPackage
     ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
      , mono-traversable, semigroupoids, semigroups, transformers
@@ -130610,6 +132962,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoidal-containers_0_3_0_2" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "monoidal-containers";
+       version = "0.3.0.2";
+       sha256 = "1ivjf0wi77kf07jq6q8mf01bi8zr29qjkvsi2sqpm34kl7hlhsij";
+       libraryHaskellDepends = [
+         base containers deepseq hashable lens newtype unordered-containers
+       ];
+       homepage = "http://github.com/bgamari/monoidal-containers";
+       description = "Containers with monoidal accumulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoidplus" = callPackage
     ({ mkDerivation, base, contravariant, semigroups, transformers }:
      mkDerivation {
@@ -132079,6 +134448,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "multistate_0_7_1_2" = callPackage
+    ({ mkDerivation, base, hspec, monad-control, mtl, tagged
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "multistate";
+       version = "0.7.1.2";
+       sha256 = "1mcl0gp2l9wvscq942mz6p0pwlaf4i8li9kp20bp608kahy332ci";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base monad-control mtl tagged transformers transformers-base
+       ];
+       testHaskellDepends = [ base hspec transformers ];
+       homepage = "https://github.com/lspitzner/multistate";
+       description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "multivariant" = callPackage
     ({ mkDerivation, base, containers, free, HUnit, invertible
      , MonadRandom, profunctors, QuickCheck, semigroupoids, tasty
@@ -135013,6 +137402,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-ip_0_3_0_2" = callPackage
+    ({ mkDerivation, base, data-default-class, data-dword, data-endian
+     , data-serializer, data-textual, hashable, parsers, tasty
+     , tasty-quickcheck, text-printer, type-hint
+     }:
+     mkDerivation {
+       pname = "network-ip";
+       version = "0.3.0.2";
+       sha256 = "1zjy232pamkd3977cyaq5w5r6ksbpqpgzzlds15zrahjccirs9gf";
+       libraryHaskellDepends = [
+         base data-default-class data-dword data-endian data-serializer
+         data-textual hashable parsers text-printer type-hint
+       ];
+       testHaskellDepends = [
+         base data-dword data-textual parsers tasty tasty-quickcheck
+         text-printer
+       ];
+       homepage = "https://github.com/mvv/network-ip";
+       description = "Internet Protocol data structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-metrics" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-default, network
      , random, time
@@ -136539,6 +138951,20 @@ self: {
        license = "GPL";
      }) {};
 
+  "non-negative_0_1_1_2" = callPackage
+    ({ mkDerivation, base, QuickCheck, utility-ht }:
+     mkDerivation {
+       pname = "non-negative";
+       version = "0.1.1.2";
+       sha256 = "1y5ayazrbw614g61ihilm8vn468dia1cphvsxwm8s0x3iw9gljs6";
+       libraryHaskellDepends = [ base QuickCheck utility-ht ];
+       testHaskellDepends = [ base QuickCheck utility-ht ];
+       homepage = "http://code.haskell.org/~thielema/non-negative/";
+       description = "Non-negative numbers";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nonce" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
      , transformers
@@ -137458,6 +139884,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nvim-hs_0_2_4" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
+     , cereal-conduit, conduit, conduit-extra, containers, data-default
+     , deepseq, directory, dyre, exceptions, filepath, foreign-store
+     , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec
+     , messagepack, monad-control, mtl, network, optparse-applicative
+     , process, QuickCheck, resourcet, setenv, stm, streaming-commons
+     , template-haskell, text, time, time-locale-compat, transformers
+     , transformers-base, utf8-string
+     }:
+     mkDerivation {
+       pname = "nvim-hs";
+       version = "0.2.4";
+       sha256 = "16zfaps34r6dbjrvrj1a08sndv8nxqhnwy4vgl1flnc6q6xbi7f5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
+         conduit-extra containers data-default deepseq directory dyre
+         exceptions filepath foreign-store hslogger lifted-base megaparsec
+         messagepack monad-control mtl network optparse-applicative process
+         resourcet setenv stm streaming-commons template-haskell text time
+         time-locale-compat transformers transformers-base utf8-string
+       ];
+       executableHaskellDepends = [ base data-default ];
+       testHaskellDepends = [
+         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
+         conduit-extra containers data-default directory dyre exceptions
+         filepath foreign-store hslogger hspec hspec-discover HUnit
+         lifted-base megaparsec messagepack mtl network optparse-applicative
+         process QuickCheck resourcet setenv stm streaming-commons
+         template-haskell text time time-locale-compat transformers
+         transformers-base utf8-string
+       ];
+       homepage = "https://github.com/neovimhaskell/nvim-hs";
+       description = "Haskell plugin backend for neovim";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nvim-hs-contrib" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, data-default
      , directory, exceptions, filepath, hspec, hspec-discover
@@ -137802,6 +140268,30 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "octane_0_20_1" = 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.20.1";
+       sha256 = "0gaynwg4r5rjdbppcs0cdqq7fbl51y8bqm149bynkgwrbgs4dbfm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bimap binary bytestring containers data-default-class
+         file-embed overloaded-records rattletrap text
+       ];
+       executableHaskellDepends = [
+         aeson base binary bytestring http-client http-client-tls
+       ];
+       homepage = "https://github.com/tfausak/octane#readme";
+       description = "Parse Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -138410,7 +140900,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "opaleye_0_5_3_1" = callPackage
+  "opaleye_0_5_4_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, case-insensitive, containers, contravariant, dotenv
      , hspec, hspec-discover, multiset, postgresql-simple, pretty
@@ -138419,8 +140909,8 @@ self: {
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.5.3.1";
-       sha256 = "0hgkvvl3pn9bhiy21jxmcvvbzbsywpavwxcmvcwwnkkcdv679rvx";
+       version = "0.5.4.0";
+       sha256 = "0dyvaci8dpd5rnr40ib1al2mw2ivza02wbsdz1m5qc7hn30374yv";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -140611,6 +143101,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pagination_0_2_1" = callPackage
+    ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "pagination";
+       version = "0.2.1";
+       sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48";
+       libraryHaskellDepends = [ base deepseq exceptions ];
+       testHaskellDepends = [ base exceptions hspec QuickCheck ];
+       homepage = "https://github.com/mrkkrp/pagination";
+       description = "Framework-agnostic pagination boilerplate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pagure-hook-receiver" = callPackage
     ({ mkDerivation, base, containers, scotty, shelly, text
      , transformers, unix
@@ -140815,6 +143319,8 @@ self: {
        pname = "pandoc-crossref";
        version = "0.2.5.0";
        sha256 = "14c4nbibx4qbi7pvycaf3q12hpj4s02wdg5pl23z2b4f8jz3pnfl";
+       revision = "1";
+       editedCabalFile = "1l1nbijrw2brj9b849agm9cyzn9iwn25kmj1m2xyyyyd1bk95nqr";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -142204,6 +144710,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parser-combinators_0_2_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "parser-combinators";
+       version = "0.2.0";
+       sha256 = "1gz3kh56471924y12vvmrc5w4bx85a53qrp2j8fp33nn78bvx8v8";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mrkkrp/parser-combinators";
+       description = "Lightweight package providing commonly useful parser combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parser-helper" = callPackage
     ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }:
      mkDerivation {
@@ -142282,6 +144801,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parsers_0_12_6" = callPackage
+    ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal
+     , cabal-doctest, charset, containers, directory, doctest, filepath
+     , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "parsers";
+       version = "0.12.6";
+       sha256 = "1jyffc1i9vihhxk5r69qmrnhsjsw2g7r0yxh3svvy1wrcz1vfcik";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         attoparsec base base-orphans charset containers mtl parsec
+         scientific text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers directory doctest filepath
+         parsec QuickCheck quickcheck-instances
+       ];
+       homepage = "http://github.com/ekmett/parsers/";
+       description = "Parsing combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parsestar" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, bytestring-mmap
      , bytestring-nums, bytestring-show, containers, deepseq, derive
@@ -142675,20 +145219,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "path-io_1_3_2" = callPackage
+  "path-io_1_3_3" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, exceptions
      , filepath, hspec, path, temporary, time, transformers, unix-compat
      }:
      mkDerivation {
        pname = "path-io";
-       version = "1.3.2";
-       sha256 = "031y6dypf6wnwx7fnjyvn2sb5y1lxfibx0jnwc19h93harm3lfyp";
+       version = "1.3.3";
+       sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a";
        libraryHaskellDepends = [
          base containers directory dlist exceptions filepath path temporary
          time transformers unix-compat
        ];
        testHaskellDepends = [
-         base exceptions hspec path transformers unix-compat
+         base directory exceptions hspec path transformers unix-compat
        ];
        homepage = "https://github.com/mrkkrp/path-io";
        description = "Interface to ‘directory’ package for users of ‘path’";
@@ -143170,6 +145714,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pcre-utils_0_1_8_1_1" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, HUnit, mtl
+     , regex-pcre-builtin, vector
+     }:
+     mkDerivation {
+       pname = "pcre-utils";
+       version = "0.1.8.1.1";
+       sha256 = "1x3db1hab0qwpw9m4564x86qibzg8jl6cj2k88jii3ihcg580ahz";
+       libraryHaskellDepends = [
+         array attoparsec base bytestring mtl regex-pcre-builtin vector
+       ];
+       testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ];
+       homepage = "https://github.com/bartavelle/pcre-utils";
+       description = "Perl-like substitute and split for PCRE regexps";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pdf-slave" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , containers, directory, exceptions, haskintex, HaTeX
@@ -143362,8 +145924,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdfname";
-       version = "0.2";
-       sha256 = "18ihz3vir5py6fbkqdnh8yjvsgjwavb7g601abdihrrp2p255lpn";
+       version = "0.3";
+       sha256 = "01xy5rg2n1x2fpqwhnbrmxqqma40zxr8ac0mv06qnyidyggrsggz";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -144897,19 +147459,20 @@ self: {
      }) {};
 
   "phone-numbers" = callPackage
-    ({ mkDerivation, base, bytestring, phonenumber }:
+    ({ mkDerivation, base, bytestring, c2hs, phonenumber, protobuf }:
      mkDerivation {
        pname = "phone-numbers";
-       version = "0.1.0";
-       sha256 = "10afhnlphgyxsmkv576c5gf5b78d3j2qs46s2crlgfav1y9crv0f";
+       version = "0.1.1";
+       sha256 = "09b5qp7c059wah6wddn71hk6ciijj07qylxh3xcff0qyvjqd18ya";
        libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ phonenumber ];
+       librarySystemDepends = [ phonenumber protobuf ];
+       libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/christian-marie/phone-numbers";
        description = "Haskell bindings to the libphonenumber library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {phonenumber = null;};
+     }) {phonenumber = null; inherit (pkgs) protobuf;};
 
   "phone-push" = callPackage
     ({ mkDerivation, base, base16-bytestring, binary, bytestring
@@ -145627,6 +148190,8 @@ self: {
        pname = "pipes-cacophony";
        version = "0.5.0";
        sha256 = "1p6vb1abyzifczn537iabd87g2x7mnhvr4sx1j6ay51zvvn5vh20";
+       revision = "1";
+       editedCabalFile = "1qv6h09y5pca3agkmn12lg9vlbm5j8s3dnrn98w9agj62jrvymzm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cacophony pipes ];
@@ -147009,6 +149574,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "plot-light_0_2_6" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg
+     , colour, hspec, mtl, palette, QuickCheck, scientific, text, time
+     }:
+     mkDerivation {
+       pname = "plot-light";
+       version = "0.2.6";
+       sha256 = "1zwf3gmimbpzji9dyn5a93pc07ymcp6xc48zfq5lxchajnilchwc";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         attoparsec base blaze-svg colour mtl palette scientific text time
+       ];
+       executableHaskellDepends = [
+         attoparsec attoparsec-time base blaze-svg colour palette scientific
+         text time
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/ocramz/plot-light";
+       description = "A lightweight plotting library, exporting to SVG";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "plotfont" = callPackage
     ({ mkDerivation, base, containers, tasty, tasty-hunit }:
      mkDerivation {
@@ -148655,6 +151245,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-simple-migration_0_1_10_1" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
+     , directory, hspec, postgresql-simple, text, time
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-migration";
+       version = "0.1.10.1";
+       sha256 = "0g7xf0cl6ld7qs94qsv67rxln4hpibgy7jfgvbaq1br6pwa1w68s";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple time
+       ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple text time
+       ];
+       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
+       homepage = "https://github.com/ameingast/postgresql-simple-migration";
+       description = "PostgreSQL Schema Migrations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-simple-opts" = callPackage
     ({ mkDerivation, base, bytestring, data-default, either, hspec
      , optparse-applicative, optparse-generic, postgresql-simple
@@ -148898,25 +151513,25 @@ self: {
 
   "postgrest-ws" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, auto-update, base
-     , base64-bytestring, bytestring, configurator, containers, either
-     , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json
-     , http-types, jwt, lens, lens-aeson, optparse-applicative
-     , postgresql-libpq, protolude, retry, stm, stm-containers
-     , stringsearch, text, time, transformers, unix
+     , base64-bytestring, bytestring, configurator, containers
+     , contravariant, either, hasql, hasql-pool, heredoc, hspec
+     , hspec-wai, hspec-wai-json, http-types, jwt, lens, lens-aeson
+     , optparse-applicative, postgresql-libpq, protolude, retry, stm
+     , stm-containers, stringsearch, text, time, transformers, unix
      , unordered-containers, wai, wai-app-static, wai-extra
      , wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "postgrest-ws";
-       version = "0.3.3.0";
-       sha256 = "0w1hgn0lg6p3zc5n43d2wqr18kwvbvvhp8al3ggf3jjx04sn3sih";
+       version = "0.4.0.0";
+       sha256 = "0wimvx66lzp0p5apymbxcj5f4d10wx8n7gpqslkvwi7c09p453l6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring either hasql hasql-pool http-types jwt lens
-         lens-aeson postgresql-libpq protolude retry stm stm-containers
-         stringsearch text time unordered-containers wai wai-websockets
-         websockets
+         aeson base bytestring contravariant either hasql hasql-pool
+         http-types jwt lens lens-aeson postgresql-libpq protolude retry stm
+         stm-containers stringsearch text time unordered-containers wai
+         wai-websockets websockets
        ];
        executableHaskellDepends = [
          ansi-wl-pprint auto-update base base64-bytestring bytestring
@@ -149223,6 +151838,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pqueue_1_3_2_3" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "pqueue";
+       version = "1.3.2.3";
+       sha256 = "062l0vm4yymlm7vahczczpm29awgaksv0sdy532g7jlspi78nara";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       description = "Reliable, persistent, fast priority queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pqueue-mtl" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl
      , stateful-mtl, uvector
@@ -149290,8 +151918,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.47";
-       sha256 = "1qjlw42xyynbwp72s2xx9kavvbqj13y603fpwf27hvab2ypyyg8w";
+       version = "0.0.48";
+       sha256 = "14gdi3md3mr12dp9hi83bqzis9x90bf0cqknrzdi2xfb9wb1jdl5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149793,12 +152421,18 @@ self: {
      }) {};
 
   "pretty-compact" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+     , criterion, deepseq, pretty, text, unordered-containers, wl-pprint
+     }:
      mkDerivation {
        pname = "pretty-compact";
-       version = "2.0";
-       sha256 = "09nyx24b15qgk6cn71m05q56kfcvm2582wywf8b9d1h0k4bhic0k";
-       libraryHaskellDepends = [ base containers ];
+       version = "2.1";
+       sha256 = "0723zp6577vwfrhr2hnn439hc90h6qh6sgrshywhd5yks673vgf5";
+       libraryHaskellDepends = [ base base-compat containers ];
+       benchmarkHaskellDepends = [
+         aeson base base-compat bytestring criterion deepseq pretty text
+         unordered-containers wl-pprint
+       ];
        description = "Pretty-printing library";
        license = "GPL";
      }) {};
@@ -149966,8 +152600,8 @@ self: {
        pname = "prettyprinter";
        version = "1.1";
        sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y";
-       revision = "2";
-       editedCabalFile = "0gfxgc3jrnxa54arih1ys1qbswyx7waxp06ib8ifd3rw64yjn16j";
+       revision = "3";
+       editedCabalFile = "0y6qhf5bxbwxpy4xma05h806mxfn52kvf5f29r1hdpm2xlcab5hx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -150820,6 +153454,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "profunctors_5_2_1" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, comonad
+     , contravariant, distributive, tagged, transformers
+     }:
+     mkDerivation {
+       pname = "profunctors";
+       version = "5.2.1";
+       sha256 = "0pcwjp813d3mrzb7qf7dzkspf85xnfj1m2snhjgnvwx6vw07w877";
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad contravariant distributive
+         tagged transformers
+       ];
+       homepage = "http://github.com/ekmett/profunctors/";
+       description = "Profunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "progress" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -151230,8 +153882,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.6.1";
-       sha256 = "1j8768v7al7fxvg8z71pd7lq89qcdkpmnnmz1f2y8zfjw8mcn7wp";
+       version = "4.7.6";
+       sha256 = "0nqhhgrcjq8zbnvarrgn2ijk7pmyb2blzh1896jxij828zq9rddd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -151363,6 +154015,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens_0_2_2_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default-class, lens-family, parsec, pretty, text
+     , transformers, void
+     }:
+     mkDerivation {
+       pname = "proto-lens";
+       version = "0.2.2.0";
+       sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers data-default-class
+         lens-family parsec pretty text transformers void
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "A lens-based implementation of protocol buffers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-arbitrary" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
@@ -151380,6 +154051,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-arbitrary_0_1_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens-family
+     , proto-lens, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-arbitrary";
+       version = "0.1.1.1";
+       sha256 = "1jdp2axwvmdifssqq1i4ik1dv7zn0sdvj6jy45bi0nxyr5mqzhlm";
+       libraryHaskellDepends = [
+         base bytestring containers lens-family proto-lens QuickCheck text
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Arbitrary instances for proto-lens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-combinators" = callPackage
     ({ mkDerivation, base, Cabal, data-default-class, HUnit
      , lens-family, lens-family-core, proto-lens, proto-lens-protoc
@@ -151404,6 +154092,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-combinators_0_1_0_8" = callPackage
+    ({ mkDerivation, base, Cabal, data-default-class, HUnit
+     , lens-family, lens-family-core, proto-lens, proto-lens-protoc
+     , test-framework, test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "proto-lens-combinators";
+       version = "0.1.0.8";
+       sha256 = "0byz61d1xd1khksvh170q7a7qvziigxf76ngcsd650fahqaardzz";
+       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       libraryHaskellDepends = [
+         base data-default-class lens-family proto-lens proto-lens-protoc
+         transformers
+       ];
+       testHaskellDepends = [
+         base HUnit lens-family lens-family-core proto-lens
+         proto-lens-protoc test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Utilities functions to proto-lens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-descriptors" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , lens-family, lens-labels, proto-lens, text
@@ -151420,6 +154132,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-descriptors_0_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , lens-family, lens-labels, proto-lens, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-descriptors";
+       version = "0.2.2.0";
+       sha256 = "1vjvr931ylnmpclizbrhqsx0x5jbmcbir0s53zpvm0f0vnwlwgqb";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class lens-family
+         lens-labels proto-lens text
+       ];
+       description = "Protocol buffers for describing the definitions of messages";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-optparse" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
@@ -151435,6 +154164,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-optparse_0_1_0_4" = callPackage
+    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
+     mkDerivation {
+       pname = "proto-lens-optparse";
+       version = "0.1.0.4";
+       sha256 = "1wywg2jzc35483qlqxy1a4ms6v6cb08d10z4pgwb50ljv5hqlwwb";
+       libraryHaskellDepends = [
+         base optparse-applicative proto-lens text
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Adapting proto-lens to optparse-applicative ReadMs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-protobuf-types" = callPackage
     ({ mkDerivation, base, Cabal, proto-lens-protoc }:
      mkDerivation {
@@ -151449,6 +154193,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-protobuf-types_0_2_2_0" = callPackage
+    ({ mkDerivation, base, Cabal, lens-family, proto-lens
+     , proto-lens-protoc, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-protobuf-types";
+       version = "0.2.2.0";
+       sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72";
+       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       libraryHaskellDepends = [
+         base lens-family proto-lens proto-lens-protoc text
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Basic protocol buffer message types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-protoc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, directory, filepath, haskell-src-exts
@@ -151475,6 +154237,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-protoc_0_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers
+     , data-default-class, directory, filepath, haskell-src-exts
+     , lens-family, lens-labels, process, proto-lens
+     , proto-lens-descriptors, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-protoc";
+       version = "0.2.2.0";
+       sha256 = "1h6rlgk36a5wbcqwqs5n53rh37alcj0l5yq666gcawda0zwb0ys2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers data-default-class directory
+         filepath haskell-src-exts lens-family lens-labels process
+         proto-lens proto-lens-descriptors text
+       ];
+       executableHaskellDepends = [
+         base bytestring containers data-default-class filepath
+         haskell-src-exts lens-family proto-lens proto-lens-descriptors text
+       ];
+       description = "Protocol buffer compiler for the proto-lens library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protobuf" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
      , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
@@ -152539,8 +155327,8 @@ self: {
      }:
      mkDerivation {
        pname = "pushbullet-types";
-       version = "0.2.0.0";
-       sha256 = "1r57l48xzfraa85lrkx9i8dmlrjicavz0fxr8l6c28iisj6db8js";
+       version = "0.4.0.0";
+       sha256 = "0fds6lhkmyfs8hrnaq29fbglcmampa4n8j93x1jkynxbp1in66z6";
        libraryHaskellDepends = [
          aeson base http-api-data microlens microlens-th scientific text
          time unordered-containers
@@ -152590,6 +155378,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pusher-http-haskell_1_3_0_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptohash, hashable, hspec, http-client, http-types, QuickCheck
+     , text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pusher-http-haskell";
+       version = "1.3.0.0";
+       sha256 = "1pppzhr6507y1fl2w3w876bhwbbm5mvss4qfavrbhzi9ycqk2hrp";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptohash hashable
+         http-client http-types text time transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec http-client http-types QuickCheck text
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/pusher-community/pusher-http-haskell";
+       description = "Haskell client library for the Pusher HTTP API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pusher-ws" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -152750,28 +155561,26 @@ self: {
 
   "pvss" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptonite
-     , cryptonite-openssl, deepseq, hourglass, integer-gmp, memory
-     , tasty, tasty-quickcheck
+     , cryptonite-openssl, deepseq, foundation, hourglass, integer-gmp
+     , memory, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "pvss";
-       version = "0.1";
-       sha256 = "16gwq23d7p34n23ydi82lxz7cjvwdc684s36915fb2hm8k60n57s";
-       revision = "1";
-       editedCabalFile = "03nx4w2b6i2wn4x4ggbizc4k9y5bkjq4ihli5ln8bs60slz84srd";
+       version = "0.2.0";
+       sha256 = "130249k3gly9msd8x514qlq0gjqi60hjps2176j83ifa0d818h74";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring cryptonite cryptonite-openssl deepseq
-         integer-gmp memory
+         foundation integer-gmp memory
        ];
        executableHaskellDepends = [
-         base cryptonite deepseq hourglass memory
+         base cryptonite deepseq hourglass memory vector
        ];
        testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ];
        homepage = "https://github.com/input-output-hk/pvss-haskell#readme";
        description = "Public Verifiable Secret Sharing";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "pwstore-cli" = callPackage
@@ -155400,6 +158209,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_3_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, filepath, http-client, http-client-tls, http-types
+     , tasty, tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.3.5";
+       sha256 = "0mw59q5wbj5mbhznqd4szc5ps7d1r7gf490vdjqfblb5sqncy510";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base filepath tasty tasty-hspec ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -155416,6 +158245,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel-wai_0_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-client, ratel, wai
+     }:
+     mkDerivation {
+       pname = "ratel-wai";
+       version = "0.3.1";
+       sha256 = "13p5ny1x752l9xqiyxdxvjfjqggsb0g9hpqqcmdr828lvr9qxi6s";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-client ratel wai
+       ];
+       homepage = "https://github.com/tfausak/ratel-wai#readme";
+       description = "Notify Honeybadger about exceptions via a WAI middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rating-systems" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -155714,8 +158560,8 @@ self: {
      }:
      mkDerivation {
        pname = "rcu";
-       version = "0.2";
-       sha256 = "0i88w7yg1q6fbkqfkvmnxxg9wg90sxv6c0shb8hvx0afz1mfhrz3";
+       version = "0.2.1";
+       sha256 = "114w0nhlcg6wd9v6xg0ax74y5xbwb408b37hdkra863xr7dibdp0";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -156464,6 +159310,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rebase_1_1" = callPackage
+    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+     , containers, contravariant, contravariant-extras, deepseq, dlist
+     , either, fail, hashable, mtl, profunctors, scientific
+     , semigroupoids, semigroups, stm, text, time, transformers
+     , unordered-containers, uuid, vector, void
+     }:
+     mkDerivation {
+       pname = "rebase";
+       version = "1.1";
+       sha256 = "1qkhnpcc4g2vd6jmbf3b6psqkan6hyawqzrwzqdd931hsb02l6ia";
+       libraryHaskellDepends = [
+         base base-prelude bifunctors bytestring containers contravariant
+         contravariant-extras deepseq dlist either fail hashable mtl
+         profunctors scientific semigroupoids semigroups stm text time
+         transformers unordered-containers uuid vector void
+       ];
+       homepage = "https://github.com/nikita-volkov/rebase";
+       description = "A more progressive alternative to the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rebindable" = callPackage
     ({ mkDerivation, base, data-default-class, indexed }:
      mkDerivation {
@@ -157071,6 +159940,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "references_0_3_2_2" = callPackage
+    ({ mkDerivation, array, base, containers, directory, either
+     , filepath, HUnit, instance-control, lens, mtl, template-haskell
+     , text, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "references";
+       version = "0.3.2.2";
+       sha256 = "1p7ygqdycx1zm4fpilb7db0g66kyss50fddkc007812y2ih4vary";
+       libraryHaskellDepends = [
+         array base containers directory either filepath instance-control
+         mtl template-haskell text transformers uniplate
+       ];
+       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";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "refh" = callPackage
     ({ mkDerivation, base, clippard, cmdargs, directory, filepath
      , haskheap, network
@@ -159429,14 +162322,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "req-conduit_0_2_0" = callPackage
+  "req-conduit_0_2_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
      , http-client, req, resourcet, temporary, transformers, weigh
      }:
      mkDerivation {
        pname = "req-conduit";
-       version = "0.2.0";
-       sha256 = "0yf5lmmf3fv4lfxyrk0kpzk8p0pzhfany05d7ny8l11mr99grpwg";
+       version = "0.2.1";
+       sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c";
        libraryHaskellDepends = [
          base bytestring conduit http-client req resourcet transformers
        ];
@@ -159497,6 +162390,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rerebase_1_1" = callPackage
+    ({ mkDerivation, rebase }:
+     mkDerivation {
+       pname = "rerebase";
+       version = "1.1";
+       sha256 = "17x606gm0mfy7xgfy1dby8gxs4jzspnrlchv1d93rjqklr2wsyyv";
+       libraryHaskellDepends = [ rebase ];
+       homepage = "https://github.com/nikita-volkov/rerebase";
+       description = "Reexports from \"base\" with a bunch of other standard libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reroute" = callPackage
     ({ mkDerivation, base, criterion, deepseq, graph-core, hashable
      , hspec, http-api-data, hvect, mtl, random, regex-compat, text
@@ -162556,6 +165462,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "safeio_0_0_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , directory, filepath, HUnit, resourcet, test-framework
+     , test-framework-hunit, test-framework-th, unix
+     }:
+     mkDerivation {
+       pname = "safeio";
+       version = "0.0.3.0";
+       sha256 = "0rknn8rlxyj32a0vrx0wjfma9w0zhs3vg1jyksn71drxch7jvwqs";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-combinators directory filepath
+         resourcet unix
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators directory filepath
+         HUnit resourcet test-framework test-framework-hunit
+         test-framework-th unix
+       ];
+       description = "Write output to disk atomically";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safepath" = callPackage
     ({ mkDerivation, base, doctest, text, validity }:
      mkDerivation {
@@ -163261,8 +166190,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.0";
-       sha256 = "1jqgzqhmcx015ja8nwpswq6akw9vrabmhhf709vfirgd9q8pgnjc";
+       version = "7.1";
+       sha256 = "0gxx84b7dzhymizwna8fzaaz2gimzch650jk1xssn5da2gqfan7g";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -163287,8 +166216,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbvPlugin";
-       version = "0.9";
-       sha256 = "01fxnyi3jw952v7hlmf0isp88kv99jg6jll74cz2b04c461w1fhv";
+       version = "0.10";
+       sha256 = "0yvvwkhvdfhy1i09br6ci8m4nchmmvn83glnqxd8s2zdmhmxsr54";
        libraryHaskellDepends = [
          base containers ghc ghc-prim mtl sbv template-haskell
        ];
@@ -165004,6 +167933,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda_0_1_10_0" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
+     , psqueues, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "selda";
+       version = "0.1.10.0";
+       sha256 = "107wj74yxw5nz6pzvn9k6inn5x4vcrjv80416a2kr8nl25x1ixgs";
+       libraryHaskellDepends = [
+         base bytestring exceptions hashable mtl psqueues text time
+         unordered-containers
+       ];
+       homepage = "https://selda.link";
+       description = "Type-safe, high-level EDSL for interacting with relational databases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "selda-postgresql" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
      , selda, text
@@ -165020,6 +167967,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda-postgresql_0_1_6_0" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
+     , selda, text
+     }:
+     mkDerivation {
+       pname = "selda-postgresql";
+       version = "0.1.6.0";
+       sha256 = "0zf77mavhxn64mag6cgf6xch54qknl1yhack5nylf5xlwhpmrgsx";
+       libraryHaskellDepends = [
+         base bytestring exceptions postgresql-libpq selda text
+       ];
+       homepage = "https://github.com/valderman/selda";
+       description = "PostgreSQL backend for the Selda database EDSL";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "selda-sqlite" = callPackage
     ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda
      , text
@@ -165036,6 +168000,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda-sqlite_0_1_6_0" = callPackage
+    ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda
+     , text
+     }:
+     mkDerivation {
+       pname = "selda-sqlite";
+       version = "0.1.6.0";
+       sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6";
+       libraryHaskellDepends = [
+         base direct-sqlite directory exceptions selda text
+       ];
+       homepage = "https://github.com/valderman/selda";
+       description = "SQLite backend for the Selda database EDSL";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "select" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -165219,6 +168200,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semigroupoids_5_2_1" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, Cabal
+     , cabal-doctest, comonad, containers, contravariant, distributive
+     , doctest, hashable, semigroups, tagged, transformers
+     , transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "semigroupoids";
+       version = "5.2.1";
+       sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad containers contravariant
+         distributive hashable semigroups tagged transformers
+         transformers-compat unordered-containers
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/ekmett/semigroupoids";
+       description = "Semigroupoids: Category sans id";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semigroupoids-syntax" = callPackage
     ({ mkDerivation, base, comonad, containers, contravariant
      , directory, distributive, doctest, filepath, QuickCheck
@@ -165798,6 +168802,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "serialise" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring
+     , base64-bytestring, binary, bytestring, cborg, cereal
+     , cereal-vector, containers, criterion, deepseq, directory
+     , filepath, ghc-prim, half, hashable, old-locale, pretty, primitive
+     , QuickCheck, quickcheck-instances, scientific, store, tar, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, unordered-containers
+     , vector, zlib
+     }:
+     mkDerivation {
+       pname = "serialise";
+       version = "0.1.0.0";
+       sha256 = "1a28rhnhfgpkpgr9a5c5fvpfj28mfx716kb6rlhziwkm1y675iw3";
+       libraryHaskellDepends = [
+         array base bytestring cborg containers ghc-prim half hashable
+         old-locale primitive text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring base64-bytestring binary
+         bytestring cborg containers deepseq directory filepath ghc-prim
+         half hashable QuickCheck quickcheck-instances scientific tasty
+         tasty-hunit tasty-quickcheck text time unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson array base binary bytestring cborg cereal cereal-vector
+         containers criterion deepseq directory filepath ghc-prim half
+         old-locale pretty store tar text time vector zlib
+       ];
+       homepage = "https://github.com/well-typed/cborg";
+       description = "A binary serialisation library for Haskell values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "serialize-instances" = callPackage
     ({ mkDerivation, base, cereal, hashable, semigroups
      , unordered-containers
@@ -165832,8 +168869,8 @@ self: {
     ({ mkDerivation, acid-state, aeson, aeson-extra, ansi-terminal
      , base, base16-bytestring, base64-bytestring, binary
      , binary-orphans, bytestring, cereal, cereal-vector, clock
-     , containers, data-msgpack, deepseq, directory, either, exceptions
-     , extra, filepath, formatting, hashable, hspec, lens, log-warper
+     , containers, deepseq, directory, either, exceptions, extra
+     , 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
@@ -165841,20 +168878,20 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.5.3";
-       sha256 = "05iwdmwq6fg4bq1nmmi19dax3rnjjxwbn6l5ff9fbs794qzmb704";
+       version = "0.2.0.0";
+       sha256 = "13jna9mpi4dlw7hrdp2cv1p145hbri5a7ch3ly8a4j4apnx2s4qc";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra ansi-terminal 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
-         log-warper monad-control mtl optparse-applicative parsec QuickCheck
-         quickcheck-instances safecopy scientific semigroups stm
-         template-haskell text text-format time-units transformers universum
-         unordered-containers vector yaml
+         cereal-vector clock containers deepseq directory either exceptions
+         extra filepath formatting hashable lens log-warper monad-control
+         mtl optparse-applicative parsec QuickCheck quickcheck-instances
+         safecopy scientific semigroups stm template-haskell text
+         text-format time-units transformers universum unordered-containers
+         vector yaml
        ];
        testHaskellDepends = [
-         aeson base binary bytestring cereal data-msgpack hspec QuickCheck
+         aeson base binary bytestring cereal hspec QuickCheck
          quickcheck-instances safecopy scientific text text-format
          unordered-containers vector
        ];
@@ -166995,8 +170032,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-pushbullet-client";
-       version = "0.2.0.0";
-       sha256 = "1701mcr99hg4zlsh95ri4nrx1iws1ns2f9gi55dzbyay429czlfg";
+       version = "0.4.0.0";
+       sha256 = "0v2mkriwh7lara66w02kkzwlnr5y8ahb6djpsnhvch1asa5klsnk";
        libraryHaskellDepends = [
          aeson base http-api-data http-client http-client-tls microlens
          microlens-th pushbullet-types scientific servant servant-client
@@ -167112,6 +170149,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-ruby_0_3_0_0" = callPackage
+    ({ mkDerivation, base, casing, doctest, lens, QuickCheck
+     , servant-foreign, text
+     }:
+     mkDerivation {
+       pname = "servant-ruby";
+       version = "0.3.0.0";
+       sha256 = "14azm41iwj09ra8yyr0xvpirw8yxl3bs1fhgnpkk3538dz6n005s";
+       libraryHaskellDepends = [ base casing lens servant-foreign text ];
+       testHaskellDepends = [ base doctest QuickCheck ];
+       homepage = "https://github.com/joneshf/servant-ruby#readme";
+       description = "Generate a Ruby client from a Servant API with Net::HTTP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-scotty" = callPackage
     ({ mkDerivation, aeson, base, http-types, scotty, servant
      , servant-response, text, transformers
@@ -168457,14 +171510,18 @@ self: {
      }) {};
 
   "shakers" = callPackage
-    ({ mkDerivation, base, basic-prelude, directory, shake }:
+    ({ mkDerivation, base, basic-prelude, deepseq, directory
+     , regex-compat, shake
+     }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.27";
-       sha256 = "0mlh6vzq7gdpyxm05y36fwjx0vjhbkk23qn2ajvc28l6d6d3p5ym";
+       version = "0.0.30";
+       sha256 = "0yy820lwl890p96d61n8h7wm6g9ykgldjm29yrp60kzxfjbicpnc";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base basic-prelude directory shake ];
+       libraryHaskellDepends = [
+         base basic-prelude deepseq directory regex-compat shake
+       ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/swift-nav/shakers";
        description = "Shake helpers";
@@ -170568,15 +173625,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "singletons_2_3" = callPackage
+  "singletons_2_3_1" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl
      , process, syb, tasty, tasty-golden, template-haskell, text
      , th-desugar
      }:
      mkDerivation {
        pname = "singletons";
-       version = "2.3";
-       sha256 = "022747kp55yf2hzsqk03wcbmvqn47nbvhiqjam06c9hkcj3gixf5";
+       version = "2.3.1";
+       sha256 = "1i5fmz2fqk3ijcv38ig1wmbjlva5r4imlwgindir63nmhpgy93fa";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell text th-desugar
        ];
@@ -171867,8 +174924,8 @@ self: {
        pname = "snap";
        version = "1.0.0.1";
        sha256 = "1f1d69900rdvsi323cc23pfgacmvgclbdaw57lfi54s7830icgr9";
-       revision = "4";
-       editedCabalFile = "1bcfw4g6wqkssp0l7n6115d513y70b8zb7cdz5hrlaxyq5pah6hk";
+       revision = "5";
+       editedCabalFile = "0kka00b4xvskfcfva1zvbd7sp2sa5mplvgaihcagjsim96124bsp";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist filepath hashable heist
@@ -174063,6 +177120,25 @@ self: {
        license = "GPL";
      }) {};
 
+  "sox_0_2_2_7" = callPackage
+    ({ mkDerivation, base, containers, explicit-exception
+     , extensible-exceptions, process, sample-frame, transformers, unix
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "sox";
+       version = "0.2.2.7";
+       sha256 = "1z6jqrn7n66583pf5gafblh50j82s72w1mx31rj0ii8x70lggkbx";
+       libraryHaskellDepends = [
+         base containers explicit-exception extensible-exceptions process
+         sample-frame transformers unix utility-ht
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Sox";
+       description = "Play, write, read, convert audio signals using Sox";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "soxlib" = callPackage
     ({ mkDerivation, base, bytestring, containers, explicit-exception
      , extensible-exceptions, sample-frame, sox, storablevector
@@ -176579,6 +179655,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stateWriter_0_2_8_2" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, dlist, free
+     , hspec, lens, mtl, QuickCheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "stateWriter";
+       version = "0.2.8.2";
+       sha256 = "1y8580n66hif4pp2b6gsqssafcqf1vysf63209i2rcjr0dsgnjgz";
+       libraryHaskellDepends = [ base mtl transformers ];
+       testHaskellDepends = [ base free hspec mtl QuickCheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq dlist lens mtl transformers
+         vector
+       ];
+       description = "A faster variant of the RWS monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "statechart" = callPackage
     ({ mkDerivation, base, polyparse }:
      mkDerivation {
@@ -176914,8 +180009,8 @@ self: {
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.2.1.0";
-       sha256 = "120w7kpgv2nsp7c36w1w6aglfh8sx72b3gmhrg5g790596f81797";
+       version = "0.2.1.2";
+       sha256 = "01ag624x240ybnapc49vcsiw5kz4n1v3csn1572phdav6dlpap35";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177659,6 +180754,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "storablevector_0_2_12_1" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, non-negative
+     , QuickCheck, random, sample-frame, syb, transformers, unsafe
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "storablevector";
+       version = "0.2.12.1";
+       sha256 = "0y855kfwksrxspd18ppj7x1zyhbi3ackf4p01wsjal84b8ml1qd2";
+       libraryHaskellDepends = [
+         base deepseq non-negative QuickCheck syb transformers unsafe
+         utility-ht
+       ];
+       testHaskellDepends = [
+         base bytestring QuickCheck random utility-ht
+       ];
+       benchmarkHaskellDepends = [
+         base deepseq sample-frame unsafe utility-ht
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
+       description = "Fast, packed, strict storable arrays with a list interface like ByteString";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "storablevector-carray" = callPackage
     ({ mkDerivation, base, carray, storablevector, utility-ht }:
      mkDerivation {
@@ -177808,15 +180928,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_7_1" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , hashable, hlint, hspec, hspec-discover, lens, template-haskell
-     , text, unordered-containers
+  "stratosphere_0_8_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable
+     , hspec, hspec-discover, lens, template-haskell, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.7.1";
-       sha256 = "1zmchhyfgjgnckpydn8jd8rz4wyiv5ddqi3i4c0hygf4g5swz2nz";
+       version = "0.8.0";
+       sha256 = "0wv4anpxf6fmhhyw38wb7s3jbbhyn9vvhs912kls786gxs8xdlg5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177828,8 +180948,8 @@ self: {
          text unordered-containers
        ];
        testHaskellDepends = [
-         aeson aeson-pretty base bytestring directory hashable hlint hspec
-         hspec-discover lens template-haskell text unordered-containers
+         aeson aeson-pretty base bytestring hashable hspec hspec-discover
+         lens template-haskell text unordered-containers
        ];
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
@@ -178866,8 +181986,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-core";
-       version = "2.2.1";
-       sha256 = "0vbc6ddp15yh7ddz9rrr7cmdqb9b5xzl4lh2h2sqf7wy8yldd58w";
+       version = "2.2.2";
+       sha256 = "1w2f5ynilzdzszga468lcy4fzl8cm2i9mcvb7hzzpg2gjykbi55s";
        libraryHaskellDepends = [
          aeson base bytestring mtl text time transformers
          unordered-containers
@@ -178881,8 +182001,8 @@ self: {
     ({ mkDerivation, base, stripe-core, stripe-http-streams }:
      mkDerivation {
        pname = "stripe-haskell";
-       version = "2.2.1";
-       sha256 = "1gyhms7vhmqj9fjs8lfa022r9h43c5m0y5cz5xfbx3v71id9kq5a";
+       version = "2.2.2";
+       sha256 = "08jksi6swwb15sib5y5ms0m4k6m24v7xg4zany34x2zbas30qlp4";
        libraryHaskellDepends = [ base stripe-core stripe-http-streams ];
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
@@ -178896,8 +182016,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-http-streams";
-       version = "2.2.1";
-       sha256 = "0qk6jys2ijg9fy22rhg58ahj4c3mzfcjmpk7rfh09q3y2vrg1rsx";
+       version = "2.2.2";
+       sha256 = "1s6rj46m2pmcvagwm02z2qf4z4b44y14kjdi397b6s4cva7sdf84";
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
          text
@@ -178918,8 +182038,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-tests";
-       version = "2.2.1";
-       sha256 = "1sg3gixaar1lcipdyzlcgcnfsc9vdip49zpfzh7a6pcw242vcw71";
+       version = "2.2.2";
+       sha256 = "1jccj0ic1v1vpdp3s8vb0a5w2rzr1zcqm6xqkjf1012ljxkvdq3f";
        libraryHaskellDepends = [
          aeson base bytestring free hspec hspec-core mtl random stripe-core
          text time transformers unordered-containers
@@ -178963,6 +182083,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "strive_3_0_4" = 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.4";
+       sha256 = "0bd2zq2v9fl97vadzs78h9v5ib4a7laqlqxaqgfk5y6hh42yvcyk";
+       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 {
@@ -178981,8 +182121,8 @@ self: {
      }:
      mkDerivation {
        pname = "structs";
-       version = "0.1";
-       sha256 = "0haghcp365rfmh53hpkv4xydc2yfyai45r053q60lspd7gj202hz";
+       version = "0.1.1";
+       sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base deepseq ghc-prim primitive template-haskell
@@ -179488,6 +182628,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "sum-type-boilerplate_0_1_1" = callPackage
+    ({ mkDerivation, base, hspec, template-haskell }:
+     mkDerivation {
+       pname = "sum-type-boilerplate";
+       version = "0.1.1";
+       sha256 = "17xby0mqdsbax0afrfr3p8c6cj5r94byy8gprgyrmq84qqadls9i";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hspec template-haskell ];
+       homepage = "https://github.com/jdreaver/sum-type-boilerplate#readme";
+       description = "Library for reducing the boilerplate involved with sum types";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sump" = callPackage
     ({ mkDerivation, base, bytestring, data-default, lens, serialport
      , transformers, vector
@@ -180716,6 +183870,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "syntaxnet-haskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, containers
+     , data-default, haskell-conll, hspec, lens, protolude, safe, split
+     , text, text-format, vector
+     }:
+     mkDerivation {
+       pname = "syntaxnet-haskell";
+       version = "0.1.1.0";
+       sha256 = "0lcgn91kbsjkpnbw7fczqsjmzvhrx5fixhgzjzmjaiwndw09b5z5";
+       libraryHaskellDepends = [
+         aeson base bytestring cassava containers data-default haskell-conll
+         lens protolude safe split text text-format vector
+       ];
+       testHaskellDepends = [ aeson base cassava haskell-conll hspec ];
+       homepage = "https://github.com/mgajda/syntaxnet-haskell#readme";
+       description = "Working with Google's SyntaxNet output files - CoNLL, Tree";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "synthesizer" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, event-list, filepath, gnuplot, non-negative
@@ -180798,6 +183971,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "synthesizer-core_0_8_1_1" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, event-list, explicit-exception, filepath
+     , non-empty, non-negative, numeric-prelude, numeric-quest, old-time
+     , process, QuickCheck, random, sample-frame-np, sox
+     , storable-record, storable-tuple, storablevector, timeit
+     , transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "synthesizer-core";
+       version = "0.8.1.1";
+       sha256 = "0drh5lmia3bvmdc7f7zl8y3ls43dl7mvb11383k49xlh0adlllka";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq event-list
+         explicit-exception filepath non-empty non-negative numeric-prelude
+         numeric-quest process QuickCheck random sample-frame-np sox
+         storable-record storable-tuple storablevector transformers
+         utility-ht
+       ];
+       testHaskellDepends = [
+         base containers event-list non-empty non-negative numeric-prelude
+         QuickCheck random storable-tuple storablevector utility-ht
+       ];
+       benchmarkHaskellDepends = [
+         array base binary bytestring directory numeric-prelude old-time
+         storable-tuple storablevector timeit utility-ht
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
+       description = "Audio signal processing coded in Haskell: Low level part";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "synthesizer-dimensional" = callPackage
     ({ mkDerivation, base, bytestring, event-list, non-negative
      , numeric-prelude, random, sox, storable-record, storablevector
@@ -181013,6 +184219,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "system-extra" = callPackage
+    ({ mkDerivation, base, bytestring, directory, hspec, process
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "system-extra";
+       version = "0.1.0";
+       sha256 = "0x4xikvlj61r0sl8b98nccijkp99jalz0qkc6z5l48p81bj3qrl1";
+       libraryHaskellDepends = [ base bytestring directory process ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       description = "A bunch of system utilities used by other projects";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "system-fileio" = callPackage
     ({ mkDerivation, base, bytestring, chell, system-filepath
      , temporary, text, time, transformers, unix
@@ -181063,12 +184283,12 @@ self: {
      }) {};
 
   "system-info" = callPackage
-    ({ mkDerivation, base, process, regex }:
+    ({ mkDerivation, base, process, regex, regex-with-pcre }:
      mkDerivation {
        pname = "system-info";
-       version = "0.1.0.7";
-       sha256 = "0nj490pjlzvsjnxpfkg63x7makhh0y6difqm9iysrqf37qnir5zx";
-       libraryHaskellDepends = [ base process regex ];
+       version = "0.1.0.8";
+       sha256 = "0pv4f5yrzybm2r1zi02ranq1ag1akkpzzc8w3qjpwliv2ahy4516";
+       libraryHaskellDepends = [ base process regex regex-with-pcre ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ChaosGroup/system-info";
        description = "Get information about CPUs, memory, etc";
@@ -181693,6 +184913,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tagged-binary_0_2_0_1" = callPackage
+    ({ mkDerivation, base, base-compat, binary, bytestring, pureMD5 }:
+     mkDerivation {
+       pname = "tagged-binary";
+       version = "0.2.0.1";
+       sha256 = "0nv41x5ijw5wdb2nyfgxyspbgmk9qisp32fs1izzp3c3jl4smkvj";
+       libraryHaskellDepends = [
+         base base-compat binary bytestring pureMD5
+       ];
+       description = "Provides tools for serializing data tagged with type information";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tagged-exception-core" = callPackage
     ({ mkDerivation, base, exceptions, mmorph, mtl, transformers }:
      mkDerivation {
@@ -182883,6 +186117,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-stats_0_2_0_3" = callPackage
+    ({ mkDerivation, base, containers, directory, process, stm, tagged
+     , tasty, time
+     }:
+     mkDerivation {
+       pname = "tasty-stats";
+       version = "0.2.0.3";
+       sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b";
+       libraryHaskellDepends = [
+         base containers directory process stm tagged tasty time
+       ];
+       homepage = "https://github.com/minad/tasty-stats#readme";
+       description = "Collect statistics of your Tasty testsuite in a CSV file";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-tap" = callPackage
     ({ mkDerivation, base, containers, directory, stm, tasty
      , tasty-golden, tasty-hunit
@@ -185145,8 +188396,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-lips";
-       version = "0.1";
-       sha256 = "0cwrbl8d2dpiz9q8vvrl04vpdiiw4gx0cv1rmlk4zryn3ja38y8n";
+       version = "0.1.0.1";
+       sha256 = "1sm7sy11yc2rfjrpq5in7fqv3gh7zcfli8vw4b2mdlh6nxrh7k89";
        libraryHaskellDepends = [
          base containers parsers text text-loc transformers
        ];
@@ -185844,6 +189095,22 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "th-abstraction_0_2_4_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-abstraction";
+       version = "0.2.4.0";
+       sha256 = "0d2dwf0szxw2vxhdir5xvkgl49qwnm15c7m0a4r7fc1qrnwyvf8r";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base containers template-haskell ];
+       homepage = "https://github.com/glguy/th-abstraction";
+       description = "Nicer interface for reified information about data types";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-alpha" = callPackage
     ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -186068,12 +189335,17 @@ self: {
      }) {};
 
   "th-kinds" = callPackage
-    ({ mkDerivation, base, containers, mtl, template-haskell }:
+    ({ mkDerivation, base, containers, mtl, template-haskell
+     , th-orphans
+     }:
      mkDerivation {
        pname = "th-kinds";
-       version = "0.1.1";
-       sha256 = "0d8n0wnygdyi9qhkr7418f0227r3dcjwvmfhpw0kslryz0vqyf5b";
-       libraryHaskellDepends = [ base containers mtl template-haskell ];
+       version = "0.2";
+       sha256 = "1jajj3fmhwvkla5ngvg6qb3hl2hmhgj6c1ldnz79b66ys62m6fs6";
+       libraryHaskellDepends = [
+         base containers mtl template-haskell th-orphans
+       ];
+       homepage = "https://github.com/ddssff/th-kinds";
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186244,6 +189516,8 @@ self: {
        pname = "th-to-exp";
        version = "0.0.1.0";
        sha256 = "0mmz37jlkzpw47gsjzfr182kiwwdwxdl19bpiw28m944m75ksa1h";
+       revision = "1";
+       editedCabalFile = "0lnknwrvaj8q2i68g09rakg8rdyi5860xia5p5jb2r1z0ggwbbwi";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
        homepage = "https://github.com/lexi-lambda/th-to-exp#readme";
@@ -186251,6 +189525,20 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "th-to-exp_0_0_1_1" = callPackage
+    ({ mkDerivation, base, hspec, template-haskell }:
+     mkDerivation {
+       pname = "th-to-exp";
+       version = "0.0.1.1";
+       sha256 = "09aqjrvgarygcbry01f6kmwbf7lzsbravmwz4277jdzdhwwj2zw6";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hspec template-haskell ];
+       homepage = "https://github.com/lexi-lambda/th-to-exp#readme";
+       description = "Provides a way to persist data from compile-time to runtime";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-traced" = callPackage
     ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
@@ -186722,6 +190010,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threepenny-editors_0_5_1" = callPackage
+    ({ mkDerivation, base, bifunctors, casing, containers, data-default
+     , generics-sop, lens, profunctors, threepenny-gui
+     }:
+     mkDerivation {
+       pname = "threepenny-editors";
+       version = "0.5.1";
+       sha256 = "07vg5xzrw7ll5kvbgi2masgbzicp0gfvzm7yrxhdkchdrlkrp1cv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bifunctors casing containers data-default generics-sop lens
+         profunctors threepenny-gui
+       ];
+       homepage = "https://github.com/pepeiborra/threepenny-editors";
+       description = "Composable algebraic editors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threepenny-gui" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, filepath, hashable
@@ -188312,6 +191620,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tls_1_4_0" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
+     , cereal, criterion, cryptonite, data-default-class, hourglass
+     , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
+     , transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "tls";
+       version = "1.4.0";
+       sha256 = "1fhpyimmvhwfv6k4k00rlnc5lmk9bw3sckmfsdkv20q4cjb0hac3";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types async base bytestring cereal cryptonite
+         data-default-class memory mtl network transformers x509 x509-store
+         x509-validation
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cereal cryptonite data-default-class
+         hourglass mtl QuickCheck tasty tasty-quickcheck x509
+         x509-validation
+       ];
+       benchmarkHaskellDepends = [
+         asn1-types base bytestring criterion cryptonite data-default-class
+         hourglass mtl QuickCheck 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tls-debug" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, pem, time, tls, x509, x509-store, x509-system
@@ -188332,6 +191670,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tls-debug_0_4_5" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
+     , network, pem, time, tls, x509, x509-store, x509-system
+     , x509-validation
+     }:
+     mkDerivation {
+       pname = "tls-debug";
+       version = "0.4.5";
+       sha256 = "16zb4dray3l6sdckixyd2a5hbf6s0svy5f5bfffq48zr7f3c8id3";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring cryptonite data-default-class network pem time tls
+         x509 x509-store x509-system x509-validation
+       ];
+       homepage = "http://github.com/vincenthz/hs-tls";
+       description = "Set of programs for TLS testing and debugging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tls-extra" = callPackage
     ({ mkDerivation, base, bytestring, certificate, cipher-aes
      , cipher-rc4, crypto-pubkey, crypto-random, cryptohash, mtl
@@ -188359,6 +191718,8 @@ self: {
        pname = "tls-session-manager";
        version = "0.0.0.1";
        sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8";
+       revision = "1";
+       editedCabalFile = "0hnhxfqmvkkhf37rr2ir52xyd59070jjm6s6al0alsanid2m4p01";
        libraryHaskellDepends = [ auto-update base clock psqueues tls ];
        description = "In-memory TLS session manager";
        license = stdenv.lib.licenses.bsd3;
@@ -189043,23 +192404,25 @@ self: {
      }) {};
 
   "tpb" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, boxes, bytestring
-     , directory, filepath, free, http-client, http-client-tls
-     , libnotify, microlens, mtl, optparse-applicative, pushbullet-types
-     , servant, servant-client, servant-pushbullet-client, text, time
+    ({ mkDerivation, aeson, ansi-wl-pprint, async, base, boxes
+     , bytestring, containers, directory, filepath, free, http-client
+     , http-client-tls, libnotify, microlens, mtl, optparse-applicative
+     , pushbullet-types, servant, servant-client
+     , servant-pushbullet-client, servant-server, text, time, wai, warp
      , websockets, wuss
      }:
      mkDerivation {
        pname = "tpb";
-       version = "0.1.1.1";
-       sha256 = "0w2wzv52lmnp80amwrzmxm3lacvp03wpkcx1i9f9b1qr060h6v41";
+       version = "0.4.0.0";
+       sha256 = "0d90vbyma5yhai0nlxa035pibn928jak879wbs6xx9ssyshcfwgy";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson ansi-wl-pprint base boxes bytestring directory filepath free
-         http-client http-client-tls libnotify microlens mtl
-         optparse-applicative pushbullet-types servant servant-client
-         servant-pushbullet-client text time websockets wuss
+         aeson ansi-wl-pprint async base boxes bytestring containers
+         directory filepath free http-client http-client-tls libnotify
+         microlens mtl optparse-applicative pushbullet-types servant
+         servant-client servant-pushbullet-client servant-server text time
+         wai warp websockets wuss
        ];
        description = "Applications for interacting with the Pushbullet API";
        license = stdenv.lib.licenses.gpl3;
@@ -190010,7 +193373,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "trifecta_1_7" = callPackage
+  "trifecta_1_7_1" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base
      , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal
      , cabal-doctest, charset, comonad, containers, deepseq, doctest
@@ -190020,8 +193383,8 @@ self: {
      }:
      mkDerivation {
        pname = "trifecta";
-       version = "1.7";
-       sha256 = "0hsm6k0af5hrx768kq4nww56x7hmvp993659asck6r00i9gyk0pq";
+       version = "1.7.1";
+       sha256 = "1fnf3riihg3nglrwl9sy093ppklgnjz4shc1p2184m30ckwmk945";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -193345,6 +196708,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unicode-transforms_0_3_3" = callPackage
+    ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
+     , filepath, getopt-generics, optparse-applicative, path, path-io
+     , QuickCheck, split, text
+     }:
+     mkDerivation {
+       pname = "unicode-transforms";
+       version = "0.3.3";
+       sha256 = "04ga6dhsz9x279w3ik2sjphgmr8s6y0wd0bpg37ymn5mxp68lx2r";
+       libraryHaskellDepends = [ base bitarray bytestring text ];
+       testHaskellDepends = [
+         base deepseq getopt-generics QuickCheck split text
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq filepath optparse-applicative path path-io
+         text
+       ];
+       homepage = "http://github.com/harendra-kumar/unicode-transforms";
+       description = "Unicode normalization";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unicoder" = callPackage
     ({ mkDerivation, attoparsec, base, data-default, directory
      , filepath, text, twitch
@@ -193436,8 +196822,8 @@ self: {
        pname = "union";
        version = "0.1.1.1";
        sha256 = "1x24raarjj62z3afmf443kkcdslskz554sky8rcfkkb1j11mg7l1";
-       revision = "1";
-       editedCabalFile = "03ac6fnvqhlzngyaz5qd14gb5niybw73iimr4mafyqq3swi27q49";
+       revision = "2";
+       editedCabalFile = "0wxjv55bbjknyfn9489s77b22r31qwab6v16687mfj24a1cliad8";
        libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
@@ -193861,8 +197247,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.5";
-       sha256 = "0i444yzxn4g8khjj8m2n4507qwvdvsypsb4qkylkz23214c6qax4";
+       version = "0.5.1";
+       sha256 = "1fqf9xqapzff8105p9ya65qjy6b1vmg9gvcm37gzv1i3bz7c7z8l";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions ghc-prim hashable
          microlens microlens-mtl mtl safe stm text text-format transformers
@@ -193904,8 +197290,8 @@ self: {
        pname = "unix-compat";
        version = "0.4.3.1";
        sha256 = "09vykw89x981fywy0w1pci2v8zy3ajyjwh9z2n610vjacmd1v03j";
-       revision = "1";
-       editedCabalFile = "02li6r77ingmhd2887qkrj4rrkl7w86bz5kjqix875ib6aji86bc";
+       revision = "2";
+       editedCabalFile = "0b5jicn8nm53yxxzwlvfcv4xp5rrqp98x5wwqh234wn9x44z54d2";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/jystic/unix-compat";
        description = "Portable POSIX-compatibility layer";
@@ -195667,6 +199053,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "vado_0_0_9" = callPackage
+    ({ mkDerivation, attoparsec, base, directory, filepath, process
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "vado";
+       version = "0.0.9";
+       sha256 = "0y48niwv78xydjnz26rfja509blp0km279mypr2yzwm0xdif3s2s";
+       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 {
@@ -195808,6 +199219,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-aeson" = callPackage
+    ({ mkDerivation, aeson, base, validity, validity-scientific
+     , validity-text, validity-unordered-containers, validity-vector
+     }:
+     mkDerivation {
+       pname = "validity-aeson";
+       version = "0.0.0.0";
+       sha256 = "1a7yh87vlngd4f6j5al7zrfy5pkgfgpbjr00fbpaqk56z87328nh";
+       libraryHaskellDepends = [
+         aeson base validity validity-scientific validity-text
+         validity-unordered-containers validity-vector
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for aeson";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "validity-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
@@ -195844,6 +199272,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-scientific" = callPackage
+    ({ mkDerivation, base, scientific, validity }:
+     mkDerivation {
+       pname = "validity-scientific";
+       version = "0.0.0.0";
+       sha256 = "1k68lp33z0w1ari6i2wdcgypv9viynya5bi8bqs7ybic7h7cs3i5";
+       libraryHaskellDepends = [ base scientific validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for scientific";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "validity-text" = callPackage
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
@@ -195870,6 +199310,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-unordered-containers" = callPackage
+    ({ mkDerivation, base, hashable, unordered-containers, validity }:
+     mkDerivation {
+       pname = "validity-unordered-containers";
+       version = "0.0.0.0";
+       sha256 = "162xv4mip8awj214gdybhp2m3skjs0pg10gf9abj3h017wf046vd";
+       libraryHaskellDepends = [
+         base hashable unordered-containers validity
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for unordered-containers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "validity-vector" = callPackage
+    ({ mkDerivation, base, hashable, validity, vector }:
+     mkDerivation {
+       pname = "validity-vector";
+       version = "0.0.0.0";
+       sha256 = "0iz3qxk73k4ci337h4y9n94vahs9pfl060pdkx4bkg9wpar6fqr1";
+       libraryHaskellDepends = [ base hashable validity vector ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for vector";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "value-supply" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -196611,6 +200077,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-space_0_11" = callPackage
+    ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
+     mkDerivation {
+       pname = "vector-space";
+       version = "0.11";
+       sha256 = "154d09f2a27ph38xgfdwg65bif9rgb9k92avgfjrylk649zpwi4h";
+       libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
+       description = "Vector & affine spaces, linear maps, and derivatives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-space-map" = callPackage
     ({ mkDerivation, base, containers, doctest, vector-space }:
      mkDerivation {
@@ -196951,6 +200429,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_7" = callPackage
+    ({ mkDerivation, base, brick, containers, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.7";
+       sha256 = "11q6p9faav8j6s8qqhvdij6jzd3v3pbgm5q94ksrn5sr2h4p10k8";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick containers ghc-prof lens scientific text vector
+         vector-algorithms vty
+       ];
+       homepage = "https://github.com/maoe/viewprof";
+       description = "Text-based interactive GHC .prof viewer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "views" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -197098,6 +200596,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "vinyl_0_6_0" = callPackage
+    ({ mkDerivation, base, criterion, doctest, ghc-prim, hspec, lens
+     , linear, mwc-random, primitive, should-not-typecheck, singletons
+     , vector
+     }:
+     mkDerivation {
+       pname = "vinyl";
+       version = "0.6.0";
+       sha256 = "1gig8ki9v4spxy4x8irhfvjb55shsd9a7a9g37v2r0hfl6k3yc4b";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
+         base doctest hspec lens should-not-typecheck singletons
+       ];
+       benchmarkHaskellDepends = [
+         base criterion lens linear mwc-random primitive vector
+       ];
+       description = "Extensible Records";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vinyl-gl" = callPackage
     ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL
      , tagged, test-framework, test-framework-hunit, transformers
@@ -197105,8 +200624,8 @@ self: {
      }:
      mkDerivation {
        pname = "vinyl-gl";
-       version = "0.3.0.1";
-       sha256 = "182ipz8znzk5fi7mpy3m1nbsyqq54p8y0hqycnnbmaxqsmhy6z5a";
+       version = "0.3.1";
+       sha256 = "0rnwsz9ad7sxpk68qfmav05d6pkv8w2wg7ax31v090nd9bgwhv6a";
        libraryHaskellDepends = [
          base containers GLUtil linear OpenGL tagged transformers vector
          vinyl
@@ -198861,6 +202380,26 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "wai-route_0_3_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck
+     , tasty, tasty-quickcheck, unordered-containers, wai
+     }:
+     mkDerivation {
+       pname = "wai-route";
+       version = "0.3.1.2";
+       sha256 = "1biiq5p8aa7icsafslgnnnv5n43v7gizz69y1snyxph5n0n7sl81";
+       libraryHaskellDepends = [
+         base bytestring http-types unordered-containers wai
+       ];
+       testHaskellDepends = [
+         base bytestring http-types mtl QuickCheck tasty tasty-quickcheck
+         wai
+       ];
+       description = "Minimalistic, efficient routing for WAI";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-router" = callPackage
     ({ mkDerivation, base, text, wai }:
      mkDerivation {
@@ -200457,7 +203996,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets_0_12_1_0" = callPackage
+  "websockets_0_12_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers
      , criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -200466,10 +204005,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.12.1.0";
-       sha256 = "04c0bjzdz1l3n7hkfqhrxd16csnrlya2vjh96sgj9k6gwzj2cbsp";
-       revision = "1";
-       editedCabalFile = "1qnly23vdg76jm54d68jc7ssvlghkx4vi05a0vpmj4mi7b7mnxvq";
+       version = "0.12.2.0";
+       sha256 = "1jjb3qp6kniddn7jf4vv25v3fqainiclw0f3iyk4shq49clllki1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -201587,8 +205124,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.24";
-       sha256 = "13992gn3myjpdkmc4v2d1s2kmmsjzw8xzibs3iprlk72vacp70ja";
+       version = "0.3.25";
+       sha256 = "1sd087mf1gr9glx8fa775fp1zf8jyka1cfcqb6jn682bl021xz7p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -201647,8 +205184,8 @@ self: {
     ({ mkDerivation, base, hspec, text }:
      mkDerivation {
        pname = "word-wrap";
-       version = "0.1";
-       sha256 = "1znkvh6nzx64v5kbfvr06r85idazxjx9qsbqgidrr5vnz0wccj76";
+       version = "0.1.2";
+       sha256 = "0bpjylmfy8dkqgyrngllvplqfrnljz6c8p8mqsim1xy8fikmqp21";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/jtdaugherty/word-wrap/";
@@ -201689,6 +205226,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "word8_0_1_3" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec }:
+     mkDerivation {
+       pname = "word8";
+       version = "0.1.3";
+       sha256 = "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       description = "Word8 library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wordchoice" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams
      , containers, criterion, Glob, lens, optparse-applicative, pandoc
@@ -202712,6 +206263,8 @@ self: {
        pname = "x509";
        version = "1.7.1";
        sha256 = "0rz4z1gna5pqhvicsvfgvf7lk2f924hqvkzjapq4727gq6q6crgr";
+       revision = "1";
+       editedCabalFile = "0hmq9gb6c2cid7kpblxax631mcqxj3p2j8br4n1fqn1jdp832y8v";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          cryptonite hourglass memory mtl pem
@@ -202725,6 +206278,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509_1_7_2" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "x509";
+       version = "1.7.2";
+       sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-parse asn1-types base bytestring containers
+         cryptonite hourglass memory mtl pem
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cryptonite hourglass mtl tasty
+         tasty-quickcheck
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X509 reader and writer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-store" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, directory, filepath, mtl, pem, x509
@@ -202742,6 +206318,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-store_1_6_4" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
+     , containers, cryptonite, directory, filepath, mtl, pem, tasty
+     , tasty-hunit, x509
+     }:
+     mkDerivation {
+       pname = "x509-store";
+       version = "1.6.4";
+       sha256 = "089hpq1qbn19rbrvi91pn3v6681dkbm5hmkvg6cwqr868cj4yn79";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base bytestring containers cryptonite
+         directory filepath mtl pem x509
+       ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X.509 collection accessing and storing methods";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-system" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pem, process, x509, x509-store
@@ -202759,6 +206355,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-system_1_6_6" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pem, process, x509, x509-store
+     }:
+     mkDerivation {
+       pname = "x509-system";
+       version = "1.6.6";
+       sha256 = "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath mtl pem process x509
+         x509-store
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "Handle per-operating-system X.509 accessors and storage";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-util" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , cryptonite, directory, hourglass, pem, x509, x509-store
@@ -202766,8 +206380,8 @@ self: {
      }:
      mkDerivation {
        pname = "x509-util";
-       version = "1.6.3";
-       sha256 = "1ca68z6jvsf7xx1qx44k2cic3ijv44ah738rx755gdxx056s49sz";
+       version = "1.6.4";
+       sha256 = "0qv33r1p1mdl8yskl0hzy3s989y929lk2q23i9qb9fb6w63g6nfb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -202803,6 +206417,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-validation_1_6_9" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
+     , bytestring, containers, cryptonite, data-default-class, hourglass
+     , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
+     }:
+     mkDerivation {
+       pname = "x509-validation";
+       version = "1.6.9";
+       sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base byteable bytestring containers
+         cryptonite data-default-class hourglass memory mtl pem x509
+         x509-store
+       ];
+       testHaskellDepends = [
+         asn1-encoding asn1-types base bytestring cryptonite
+         data-default-class hourglass tasty tasty-hunit x509 x509-store
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X.509 Certificate and CRL validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x86-64bit" = callPackage
     ({ mkDerivation, base, deepseq, monads-tf, QuickCheck, tardis
      , vector
@@ -205912,6 +209550,41 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-bin_1_5_2_4" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
+     , containers, data-default-class, deepseq, directory, file-embed
+     , filepath, fsnotify, http-client, http-client-tls
+     , http-reverse-proxy, http-types, lifted-base, network
+     , optparse-applicative, parsec, process, project-template
+     , resourcet, safe-exceptions, say, shakespeare, split, stm
+     , streaming-commons, tar, template-haskell, text, time
+     , transformers, transformers-compat, typed-process, unix-compat
+     , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.5.2.4";
+       sha256 = "0kgrhpz2g9pj8llf9akbvjv1w76y82pk2pqm4hpqaaj6219pzznm";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder bytestring
+         Cabal conduit conduit-extra containers data-default-class deepseq
+         directory file-embed filepath fsnotify http-client http-client-tls
+         http-reverse-proxy http-types lifted-base network
+         optparse-applicative parsec process project-template resourcet
+         safe-exceptions say shakespeare split stm streaming-commons tar
+         template-haskell text time transformers transformers-compat
+         typed-process unix-compat unordered-containers wai wai-extra warp
+         warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-bootstrap" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types
      , shakespeare, text, transformers, yesod-core, yesod-elements
@@ -206326,6 +209999,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form-bootstrap4_0_1_0_1" = callPackage
+    ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
+     mkDerivation {
+       pname = "yesod-form-bootstrap4";
+       version = "0.1.0.1";
+       sha256 = "0z555456ryfgs3ir0h139cfap61hmshywbd8wq7xsc4kf52yl44a";
+       libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ];
+       homepage = "https://github.com/ncaq/yesod-form-bootstrap4.git#readme";
+       description = "renderBootstrap4";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, yesod-core, yesod-form
@@ -206359,6 +210045,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form-richtext_0_1_0_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text
+     , xss-sanitize, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-form-richtext";
+       version = "0.1.0.2";
+       sha256 = "0im3yfy0sdx60hn5cynh8pxp1fq2f64xgaizhxk0rd824i34lycn";
+       libraryHaskellDepends = [
+         base blaze-builder blaze-html shakespeare text xss-sanitize
+         yesod-core yesod-form
+       ];
+       homepage = "http://github.com/geraldus/yesod-form-richtext#readme";
+       description = "Various rich-text WYSIWYG editors for Yesod forms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-gitrepo" = callPackage
     ({ mkDerivation, base, directory, enclosed-exceptions, http-types
      , lifted-base, process, temporary, text, wai, yesod-core
@@ -207398,8 +211102,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.14.0";
-       sha256 = "0hdwcsv8yy1dfb2grj1haix1by8lp63mvi4vws733q2q9p9yrali";
+       version = "0.14.1";
+       sha256 = "0l42knqinklyavsg4ygrdikziflal0x2l4j218rrq7yvr5qll4n5";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = false;
        isExecutable = true;
@@ -207477,14 +211181,58 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-core_0_14_1" = callPackage
+    ({ mkDerivation, array, attoparsec, base, binary, bytestring
+     , containers, criterion, data-default, deepseq, directory, dlist
+     , dynamic-state, filepath, hashable, ListLike, microlens-platform
+     , mtl, old-locale, oo-prototypes, parsec, pointedlist, process
+     , process-extras, quickcheck-text, semigroups, split, tasty
+     , tasty-hunit, tasty-quickcheck, text, text-icu, time
+     , transformers-base, unix, unix-compat, unordered-containers
+     , xdg-basedir, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-core";
+       version = "0.14.1";
+       sha256 = "0lhx476whdsz9f6p996p12ys3vi7rz14rb3rgfw0qi12czc61hav";
+       libraryHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state filepath hashable ListLike
+         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
+         process process-extras semigroups split text text-icu time
+         transformers-base unix unix-compat unordered-containers xdg-basedir
+         yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state filepath hashable ListLike
+         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
+         process process-extras quickcheck-text split tasty tasty-hunit
+         tasty-quickcheck text text-icu time transformers-base unix
+         unix-compat unordered-containers xdg-basedir yi-language yi-rope
+       ];
+       benchmarkHaskellDepends = [
+         array attoparsec base binary bytestring containers criterion
+         data-default deepseq directory dlist dynamic-state filepath
+         hashable ListLike microlens-platform mtl old-locale oo-prototypes
+         parsec pointedlist process process-extras split text text-icu time
+         transformers-base unix unix-compat unordered-containers xdg-basedir
+         yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor core library";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-dynamic-configuration" = callPackage
     ({ mkDerivation, base, dyre, microlens-platform, mtl, text
      , transformers-base, yi-core, yi-rope
      }:
      mkDerivation {
        pname = "yi-dynamic-configuration";
-       version = "0.14.0";
-       sha256 = "06gad5vi55hjbb5ifvkprnbbpd68n2y0sbjm0z0x0zaqg2srjmls";
+       version = "0.14.1";
+       sha256 = "0dpkp554s8hk09x74krix34g0iw2p77xqp23xrpcsn2yrd38i0bw";
        libraryHaskellDepends = [
          base dyre microlens-platform mtl text transformers-base yi-core
          yi-rope
@@ -207514,8 +211262,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-pango";
-       version = "0.14.0";
-       sha256 = "0zwpy1lbkw8lkxk4p162xs181n9xsp9x8h6yknklqd79lnxs4zd5";
+       version = "0.14.1";
+       sha256 = "1rppsmwinczvjlji38cwz11g3h1xzqdjxvz7pimbzfsbccl2wjj3";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
@@ -207545,6 +211293,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-frontend-vty_0_14_1" = callPackage
+    ({ mkDerivation, base, containers, data-default, dlist
+     , microlens-platform, pointedlist, stm, text, vty, yi-core
+     , yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-frontend-vty";
+       version = "0.14.1";
+       sha256 = "1ahiq7pf5dm6r6x7zpkrn9dbdqf4p1wr8g1zlffjncywk81h34f3";
+       libraryHaskellDepends = [
+         base containers data-default dlist microlens-platform pointedlist
+         stm text vty yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vty frontend for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-fuzzy-open" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
@@ -207563,6 +211330,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-fuzzy-open_0_14_1" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default, directory
+     , filepath, mtl, text, transformers-base, vector, yi-core
+     , yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-fuzzy-open";
+       version = "0.14.1";
+       sha256 = "0qj8dlxdmsbas68zzmb99m5kw5jwp2vfj983s66a379z23zrg7wx";
+       libraryHaskellDepends = [
+         base binary containers data-default directory filepath mtl text
+         transformers-base vector yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Fuzzy open plugin for yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-gtk" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -207592,6 +211378,24 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-ireader_0_14_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, data-default
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-ireader";
+       version = "0.14.1";
+       sha256 = "0r10g7gw889snclv0jdrg8k6db9hm9zlkaxqvm7f22fj1ddb5kbi";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default microlens-platform
+         text yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor incremental reader";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-cua" = callPackage
     ({ mkDerivation, base, microlens-platform, text, yi-core
      , yi-keymap-emacs, yi-rope
@@ -207609,6 +211413,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-keymap-cua_0_14_1" = callPackage
+    ({ mkDerivation, base, microlens-platform, text, yi-core
+     , yi-keymap-emacs, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-cua";
+       version = "0.14.1";
+       sha256 = "1s1nh2h1v4zhgklhzlzix1plfg1z458yhl6y77xbq5r81ammpr5v";
+       libraryHaskellDepends = [
+         base microlens-platform text yi-core yi-keymap-emacs yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Cua keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-emacs" = callPackage
     ({ mkDerivation, base, containers, filepath, Hclip
      , microlens-platform, mtl, oo-prototypes, semigroups, text
@@ -207629,6 +211450,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-keymap-emacs_0_14_1" = callPackage
+    ({ mkDerivation, base, containers, filepath, Hclip
+     , microlens-platform, mtl, oo-prototypes, semigroups, text
+     , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-emacs";
+       version = "0.14.1";
+       sha256 = "17fx1vhj4sdgbvih6ha6jqp74bfq0bcxilxlgm1vwlcafvc2vyfl";
+       libraryHaskellDepends = [
+         base containers filepath Hclip microlens-platform mtl oo-prototypes
+         semigroups text transformers-base yi-core yi-language yi-misc-modes
+         yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Emacs keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-vim" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, data-default
      , directory, filepath, Hclip, microlens-platform, mtl
@@ -207659,6 +211500,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-keymap-vim_0_14_1" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, containers, data-default
+     , directory, filepath, Hclip, microlens-platform, mtl
+     , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers-base
+     , unordered-containers, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-vim";
+       version = "0.14.1";
+       sha256 = "19wdfhsvzy90jm9pskla40q94kvil5hvmx9r6a2frsbqjlbjk5ja";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist safe
+         semigroups text transformers-base unordered-containers yi-core
+         yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck
+         safe semigroups tasty tasty-hunit tasty-quickcheck text
+         transformers-base unordered-containers yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vim keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-language" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
@@ -207687,6 +211558,35 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-language_0_14_1" = callPackage
+    ({ mkDerivation, alex, array, base, binary, containers
+     , data-default, hashable, microlens-platform, oo-prototypes
+     , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
+     , tasty-quickcheck, template-haskell, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "yi-language";
+       version = "0.14.1";
+       sha256 = "1miszrvls06k5q78w5aswc7z5pbq8b1qvdxkhnfp0zw0vbs7wmgm";
+       libraryHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
+         template-haskell transformers-base unordered-containers
+       ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform pointedlist regex-base regex-tdfa tasty
+         tasty-hspec tasty-quickcheck template-haskell transformers-base
+         unordered-containers
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Collection of language-related Yi libraries";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-misc-modes" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, semigroups, text, yi-core, yi-language
@@ -207707,6 +211607,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-misc-modes_0_14_1" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, filepath
+     , microlens-platform, semigroups, text, yi-core, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-misc-modes";
+       version = "0.14.1";
+       sha256 = "1ivpp0yyyvybs05h6i4x4jgdpakwis5wvj9bp8273bskw128sw1c";
+       libraryHaskellDepends = [
+         array base binary data-default filepath microlens-platform
+         semigroups text yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor miscellaneous modes";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-mode-haskell" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, text, yi-core, yi-language, yi-rope
@@ -207726,6 +211646,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-mode-haskell_0_14_1" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, filepath
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-haskell";
+       version = "0.14.1";
+       sha256 = "1z119jwpdj2i4dxvl7imhlpxjd03mxxxnvcha5jp3rxjlbsdp7zs";
+       libraryHaskellDepends = [
+         array base binary data-default filepath microlens-platform text
+         yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor haskell mode";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-mode-javascript" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, dlist
      , filepath, microlens-platform, mtl, text, yi-core, yi-language
@@ -207746,6 +211685,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-mode-javascript_0_14_1" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, dlist
+     , filepath, microlens-platform, mtl, text, yi-core, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-javascript";
+       version = "0.14.1";
+       sha256 = "182bs6pnn2v2vvp0vl4sjpfdqcas1d35zf7ky00dyz9g24h8l2f5";
+       libraryHaskellDepends = [
+         array base binary data-default dlist filepath microlens-platform
+         mtl text yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor javascript mode";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-monokai" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {
@@ -207801,6 +211760,28 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-snippet_0_14_1" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default, free
+     , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
+     , yi-core, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-snippet";
+       version = "0.14.1";
+       sha256 = "14319na0hn21qrkkcfrqh5qvlx10f7462m466hhpfhq7rka8b28h";
+       libraryHaskellDepends = [
+         base binary containers data-default free microlens-platform mtl
+         text vector yi-core yi-rope
+       ];
+       testHaskellDepends = [
+         base containers tasty-hunit tasty-th yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Snippet support for yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-solarized" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {
@@ -208036,6 +212017,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "youtube_0_2_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, process, utility-ht }:
+     mkDerivation {
+       pname = "youtube";
+       version = "0.2.1.1";
+       sha256 = "098fhkyw70sxb58bj9hbshg12j57s23qrv9r1r7m13rxbxw6lf9f";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [ base bytestring process utility-ht ];
+       description = "Upload video to YouTube via YouTube API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yql" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , containers, cryptohash, data-default, ecma262, exceptions
@@ -208812,6 +212808,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zippers_0_2_4" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest
+     , lens, profunctors, semigroupoids
+     }:
+     mkDerivation {
+       pname = "zippers";
+       version = "0.2.4";
+       sha256 = "1nzjs1s0lb0gr0n2qib4pdp24k7q707261n8icxzg81f0c04yafb";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base lens profunctors semigroupoids ];
+       testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ base criterion lens ];
+       homepage = "http://github.com/ekmett/zippers/";
+       description = "Traversal based zippers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zippo" = callPackage
     ({ mkDerivation, base, mtl, yall }:
      mkDerivation {

From 74f5fe50681003f075bf0b1ff811d0c0cd7c64f3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 1 Aug 2017 12:44:08 -0400
Subject: [PATCH 1440/3246] haskell infra: Misc cleanups

 - The haskell lib is very close to not relying on Nixpkgs. I think
   this is good---simpler to think about and matches Nixpkgs's lib.

 - The haskell lib is only imported once

 - stdenv is exposed more shallowly so it can be overriden more easily.
   I'll eventually use this on Darwin to avoid the Sierra shared
   library problems (unless changes are to be made system-wide).

Closes https://github.com/NixOS/nixpkgs/pull/27840.
---
 .../haskell-modules/configuration-common.nix  |  4 +-
 .../configuration-ghc-6.12.x.nix              |  4 +-
 .../configuration-ghc-7.0.x.nix               |  4 +-
 .../configuration-ghc-7.10.x.nix              |  4 +-
 .../configuration-ghc-7.2.x.nix               |  4 +-
 .../configuration-ghc-7.4.x.nix               |  4 +-
 .../configuration-ghc-7.6.x.nix               |  4 +-
 .../configuration-ghc-7.8.x.nix               |  4 +-
 .../configuration-ghc-8.0.x.nix               |  4 +-
 .../configuration-ghc-8.2.x.nix               |  4 +-
 .../configuration-ghc-head.nix                |  4 +-
 .../haskell-modules/configuration-ghcjs.nix   |  4 +-
 .../configuration-halvm-2.4.0.nix             |  4 +-
 .../haskell-modules/configuration-nix.nix     |  4 +-
 pkgs/development/haskell-modules/default.nix  | 14 +++---
 pkgs/development/haskell-modules/lib.nix      | 17 +++----
 .../haskell-modules/make-package-set.nix      | 30 ++++++++----
 .../tools/haskell/lambdabot/default.nix       |  4 +-
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/haskell-packages.nix           | 46 +++++++++++--------
 20 files changed, 96 insertions(+), 73 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2d0d0ec101d..634d46597b9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -9,9 +9,9 @@
 #
 # See comment at the top of configuration-nix.nix for more information about this
 # distinction.
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 6be7ae16572..387754d674e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index c2a7e001405..3edbc0d398b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
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 7f561133b64..4a09b142d2e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 911fb8640f4..75e0c9c0bcb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 8a6d22bcc7e..1b15f4f105b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
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 43ec45bf821..a096dc9ce8c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
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 a97cbfde4fc..f82bcb4e646 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
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 bc72ec031ad..a24d2bcd4c1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 6f4ced675b3..d1e22d881c3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 6a9d15d402e..4b7fc3d8360 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 7efb75c3329..0f17f5ce707 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -2,14 +2,14 @@
 #
 # Please insert new packages *alphabetically*
 # in the OTHER PACKAGES section.
-{ pkgs }:
+{ pkgs, haskellLib }:
 
 let
   removeLibraryHaskellDepends = pnames: depends:
     builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends;
 in
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super:
 
diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
index cd7857e23de..be90794f58d 100644
--- a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 7b9dbcdaa79..4dce5d59d4a 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -25,9 +25,9 @@
 # * enabling/disabling certain features in packages
 #
 # If you have an override of this kind, see configuration-common.nix instead.
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 # All of the overrides in this set should look like:
 #
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 32fa46f111d..1658ce79393 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, ghc, all-cabal-hashes
+{ pkgs, stdenv, lib, haskellLib, ghc, all-cabal-hashes
 , compilerConfig ? (self: super: {})
 , packageSetConfig ? (self: super: {})
 , overrides ? (self: super: {})
@@ -9,16 +9,16 @@
 
 let
 
-  inherit (stdenv.lib) extends makeExtensible;
-  inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet;
+  inherit (lib) extends makeExtensible;
+  inherit (haskellLib) overrideCabal makePackageSet;
 
-  haskellPackages = makePackageSet {
+  haskellPackages = pkgs.callPackage makePackageSet {
     package-set = initialPackages;
-    inherit ghc extensible-self;
+    inherit stdenv haskellLib ghc extensible-self;
   };
 
-  commonConfiguration = configurationCommon { inherit pkgs; };
-  nixConfiguration = configurationNix { inherit pkgs; };
+  commonConfiguration = configurationCommon { inherit pkgs haskellLib; };
+  nixConfiguration = configurationNix { inherit pkgs haskellLib; };
 
   extensible-self = makeExtensible
     (extends overrides
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 30d82d3efc9..c67b61acd78 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -1,7 +1,9 @@
-{ pkgs }:
+# TODO(@Ericson2314): Remove `pkgs` param, which is only used for
+# `buildStackProject` and `justStaticExecutables`
+{ pkgs, lib }:
 
 rec {
-  makePackageSet = pkgs.callPackage ./make-package-set.nix {};
+  makePackageSet = import ./make-package-set.nix;
 
   overrideCabal = drv: f: (drv.override (args: args // {
     mkDerivation = drv: (args.mkDerivation drv).override f;
@@ -25,7 +27,7 @@ rec {
   dontDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = []; });
 
   appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; });
-  removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = pkgs.stdenv.lib.remove x (drv.configureFlags or []); });
+  removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = lib.remove x (drv.configureFlags or []); });
 
   addBuildTool = drv: x: addBuildTools drv [x];
   addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; });
@@ -71,7 +73,7 @@ rec {
 
   disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; });
 
-  sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: {
+  sdistTarball = pkg: lib.overrideDerivation pkg (drv: {
     name = "${drv.pname}-source-${drv.version}";
     buildPhase = "./Setup sdist";
     haddockPhase = ":";
@@ -89,12 +91,11 @@ rec {
     isLibrary = false;
     doHaddock = false;
     postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
-  } // (if pkgs.stdenv.isDarwin then {
+  } // lib.optionalAttrs (pkgs.hostPlatform.isDarwin) {
     configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"];
-  } else {})
-  );
+  });
 
-  buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: {
+  buildFromSdist = pkg: lib.overrideDerivation pkg (drv: {
     unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in ''
       echo "Source tarball is at ${src}/${tarname}.tar.gz"
       tar xf ${src}/${tarname}.tar.gz
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 6ed8d0864ca..87f3a04ebf5 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -1,20 +1,34 @@
 # This expression takes a file like `hackage-packages.nix` and constructs
 # a full package set out of that.
 
-# required dependencies:
-{ pkgs, stdenv, all-cabal-hashes }:
+{ # package-set used for non-haskell dependencies (all of nixpkgs)
+  pkgs
 
-# arguments:
-#  * ghc package to use
-#  * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second
-#  * extensible-self: the final, fully overriden package set usable with the nixpkgs fixpoint overriding functionality
-{ ghc, package-set, extensible-self }:
+, # stdenv to use for building haskell packages
+  stdenv
+
+, haskellLib
+
+, # hashes for downloading Hackage packages
+  all-cabal-hashes
+
+, # compiler to use
+  ghc
+
+, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and `self`
+  # as second, and returns a set of haskell packages
+  package-set
+
+, # The final, fully overriden package set usable with the nixpkgs fixpoint
+  # overriding functionality
+  extensible-self
+}:
 
 # return value: a function from self to the package set
 self: let
 
   inherit (stdenv.lib) fix' extends makeOverridable;
-  inherit (import ./lib.nix { inherit pkgs; }) overrideCabal;
+  inherit (haskellLib) overrideCabal;
 
   mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
     inherit stdenv;
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix
index 85d4bfc93b6..7282fb4970e 100644
--- a/pkgs/development/tools/haskell/lambdabot/default.nix
+++ b/pkgs/development/tools/haskell/lambdabot/default.nix
@@ -1,4 +1,4 @@
-{ lib, haskell-lib, fetchpatch, makeWrapper, haskellPackages
+{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages
 , mueval
 , withDjinn ? true
 , aspell ? null
@@ -25,7 +25,7 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ pac
     modulesStr = lib.replaceChars ["\n"] [" "] modules;
     configStr = lib.replaceChars ["\n"] [" "] configuration;
 
-in haskell-lib.overrideCabal haskellPackages.lambdabot (self: {
+in haskellLib.overrideCabal haskellPackages.lambdabot (self: {
   patches = (self.patches or []) ++ [ ./custom-config.patch ];
   postPatch = (self.postPatch or "") + ''
     substituteInPlace src/Main.hs \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e9f6246d01..eb59deba7e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10085,7 +10085,7 @@ with pkgs;
   readosm = callPackage ../development/libraries/readosm { };
 
   lambdabot = callPackage ../development/tools/haskell/lambdabot {
-    haskell-lib = haskell.lib;
+    haskellLib = haskell.lib;
   };
 
   lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 099e45f1022..81a32e1219f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,24 +1,32 @@
-{ pkgs, callPackage, stdenv, buildPlatform, targetPlatform }:
+{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform }:
+
+let
+  # These are attributes in compiler and packages that don't support integer-simple.
+  integerSimpleExcludes = [
+    "ghc6102Binary"
+    "ghc704Binary"
+    "ghc742Binary"
+    "ghc6104"
+    "ghc6123"
+    "ghc704"
+    "ghc763"
+    "ghcjs"
+    "ghcjsHEAD"
+    "ghcCross"
+    "jhc"
+    "uhc"
+    "integer-simple"
+  ];
+
+  haskellLib = import ../development/haskell-modules/lib.nix {
+    inherit (pkgs) lib;
+    inherit pkgs;
+  };
+
+  callPackage = newScope { inherit haskellLib; };
 
-let # These are attributes in compiler and packages that don't support integer-simple.
-    integerSimpleExcludes = [
-      "ghc6102Binary"
-      "ghc704Binary"
-      "ghc742Binary"
-      "ghc6104"
-      "ghc6123"
-      "ghc704"
-      "ghc763"
-      "ghcjs"
-      "ghcjsHEAD"
-      "ghcCross"
-      "jhc"
-      "uhc"
-      "integer-simple"
-    ];
 in rec {
-
-  lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
+  lib = haskellLib;
 
   compiler = {
 

From caaa79f246fd2dde1b33dea6901d8f4a014c4b21 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Wed, 2 Aug 2017 21:17:19 -0400
Subject: [PATCH 1441/3246] nixos/pulseaudio: Fix for missing zeroconf module

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

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index b12ef2fe861..8b9c3570476 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -224,7 +224,7 @@ in {
       # Allow PulseAudio to get realtime priority using rtkit.
       security.rtkit.enable = true;
 
-      systemd.packages = [ cfg.package ];
+      systemd.packages = [ overriddenPackage ];
     })
 
     (mkIf hasZeroconf {

From 84a6a3683b7e10122d7a2c00a150cc1b1c02c4bb Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 2 Aug 2017 01:18:57 +0000
Subject: [PATCH 1442/3246] libvirt: 3.5.0 -> 3.6.0

---
 nixos/modules/virtualisation/libvirtd.nix     | 34 +++++++------------
 .../development/libraries/libvirt/default.nix | 15 ++++++--
 pkgs/top-level/python-packages.nix            |  4 +--
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index b24ea0f33c9..e07fb0f8fe4 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -15,7 +15,7 @@ let
   '';
   qemuConfigFile = pkgs.writeText "qemu.conf" ''
     ${optionalString cfg.qemuOvmf ''
-      nvram = ["${pkgs.OVMF.fd}/FV/OVMF_CODE.fd:${pkgs.OVMF.fd}/FV/OVMF_VARS.fd"]
+      nvram = ["/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd"]
     ''}
     ${cfg.qemuVerbatimConfig}
   '';
@@ -102,9 +102,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = with pkgs;
-      [ libvirt netcat-openbsd ]
-       ++ optional cfg.enableKVM qemu_kvm;
+    environment.systemPackages = with pkgs; [ libvirt netcat-openbsd ];
 
     boot.kernelModules = [ "tun" ];
 
@@ -129,7 +127,6 @@ in {
           dnsmasq
           ebtables
         ]
-        ++ optional cfg.enableKVM qemu_kvm
         ++ optional vswitch.enable vswitch.package;
 
       preStart = ''
@@ -155,23 +152,18 @@ in {
         # Copy generated qemu config to libvirt directory
         cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf
 
-        # libvirtd puts the full path of the emulator binary in the machine
-        # config file. But this path can unfortunately be garbage collected
-        # while still being used by the virtual machine. So update the
-        # emulator path on each startup to something valid (re-scan $PATH).
-        for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do
-            test -f "$file" || continue
-            # get (old) emulator path from config file
-            emulator=$("${pkgs.xmlstarlet}/bin/xmlstarlet" select --template --value-of "/domain/devices/emulator" "$file")
-            # get a (definitely) working emulator path by re-scanning $PATH
-            new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator"))
-            # write back
-            "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/devices/emulator" -v "$new_emulator" "$file"
+        # stable (not GC'able as in /nix/store) paths for using in <emulator> section of xml configs
+        mkdir -p /run/libvirt/nix-emulators
+        ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/
+        ${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"}
+        ${optionalString cfg.enableKVM         "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm        /run/libvirt/nix-emulators/"}
 
-            # Also refresh the OVMF path. Files with no matches are ignored.
-            "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/os/loader" -v "${pkgs.OVMF.fd}/FV/OVMF_CODE.fd" "$file"
-        done
-      ''; # */
+        ${optionalString cfg.qemuOvmf ''
+            mkdir -p /run/libvirt/nix-ovmf
+            ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/libvirt/nix-ovmf/
+            ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/libvirt/nix-ovmf/
+        ''}
+      '';
 
       serviceConfig = {
         Type = "notify";
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 805a4c0b63d..b3066c4eed8 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch
 , pkgconfig, makeWrapper
-, libxml2, gnutls, devicemapper, perl, python2, attr
+, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
@@ -12,11 +12,11 @@ with stdenv.lib;
 # if you update, also bump pythonPackages.libvirt or it will break
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.xz";
-    sha256 = "05mm4xdw6g960rwvc9189nhxpm1vrilnmpl4h4m1lha11pivlqr9";
+    sha256 = "0gcyql5dp6j370kvik9hjhxirrg89m7l1q52yq0g75h7jpv9fb1s";
   };
 
   patches = [ ./build-on-bsd.patch ];
@@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
     PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH
     substituteInPlace configure \
       --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
+
+    # the path to qemu-kvm will be stored in VM's .xml and .save files
+    # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
+    substituteInPlace src/qemu/qemu_capabilities.c \
+      --replace '"/usr/libexec/qemu-kvm"' '"/run/libvirt/nix-emulators/${if stdenv.isAarch64 then "qemu-system-aarch64" else "qemu-kvm"}"'
+    substituteInPlace src/lxc/lxc_conf.c \
+      --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
   '' + ''
     PATH=${dnsmasq}/bin:$PATH
     patchShebangs . # fixes /usr/bin/python references
@@ -77,6 +84,8 @@ stdenv.mkDerivation rec {
       --replace "lock/subsys" "lock"
     sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \
         -i "$out/libexec/libvirt-guests.sh"
+
+    substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
   '' + optionalString stdenv.isLinux ''
     rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
     wrapProgram $out/sbin/libvirtd \
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1333c071b3e..e8ee822bb58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26512,13 +26512,13 @@ EOF
   };
 
   libvirt = let
-    version = "3.5.0";
+    version = "3.6.0";
   in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "06mc0cm4k90z8vxaslk3ifpajg8w8dvm0m2mxwcd6fdzps8fwpsw";
+      sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc";
     };
 
     buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From 31870ae18d454504d02e6aa674885a292ee7c4e2 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Thu, 3 Aug 2017 16:37:04 +0200
Subject: [PATCH 1443/3246] restic: enable darwin builds

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

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 390727ec739..bc5755628d2 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -26,7 +26,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     homepage = https://restic.github.io;
     description = "A backup program that is fast, efficient and secure";
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd2;
     maintainers = [ maintainers.mbrgm ];
   };

From aa8cbedf37a44fb5c2039fd5982d3fc4d663a643 Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Thu, 3 Aug 2017 18:48:04 +0200
Subject: [PATCH 1444/3246] packer: add missing go dependency

---
 pkgs/development/tools/packer/default.nix |  2 ++
 pkgs/development/tools/packer/deps.nix    | 11 +++++++++++
 2 files changed, 13 insertions(+)
 create 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 40501a78b1e..e1b52102907 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -14,6 +14,8 @@ buildGoPackage rec {
     sha256 = "1bd0rv93pxlv58c0x1d4dsjq4pg5qwrm2p7qw83pca7izlncgvfr";
   };
 
+  goDeps = ./deps.nix;
+
   meta = with stdenv.lib; {
     description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
     homepage    = http://www.packer.io;
diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix
new file mode 100644
index 00000000000..544facda015
--- /dev/null
+++ b/pkgs/development/tools/packer/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "github.com/hashicorp/packer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/packer";
+      rev = "07decf99adc272a386e3a013846248810d9aa690";
+      sha256 = "17rrzrlr48spadb9fymn1a0blqggs2mfmqbwfxs0pnw66mhd0fzz";
+    };
+  }
+]

From 36f6e4c16764aa548841d40b57e68b8e9f435ce5 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Thu, 3 Aug 2017 20:24:23 +0200
Subject: [PATCH 1445/3246] sqlite: 3.19.3 -> 3.20.0

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

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 21d89c49e7c..6dc09ddd39f 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.19.3";
+  name = "sqlite-3.20.0";
 
   src = fetchurl {
-    url = "http://sqlite.org/2017/sqlite-autoconf-3190300.tar.gz";
-    sha256 = "00b3l2qglpl1inx21fckiwxnfq5xf6441flc79rqg7zdvh1rq4h6";
+    url = "http://sqlite.org/2017/sqlite-autoconf-3200000.tar.gz";
+    sha256 = "1876dapm1xx5aqd2d8l7ymmkd2z9rybh99rp5f5rd4zz57vcc51q";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 53d2f0980d7b66fefbaeb405bd11789fb816f137 Mon Sep 17 00:00:00 2001
From: Markus Mueller <john.subscriber@markus.institute>
Date: Thu, 3 Aug 2017 17:41:07 +0000
Subject: [PATCH 1446/3246] nat: always flush nixos nat rules on firewall
 start/reload

Fixes #27510
---
 nixos/modules/services/networking/nat.nix | 61 ++++++++++++-----------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 08ba2fdb164..41e0a8c8474 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -151,38 +151,41 @@ in
 
   ###### implementation
 
-  config = mkIf config.networking.nat.enable {
+  config = mkMerge [
+    { networking.firewall.extraCommands = mkBefore flushNat; }
+    (mkIf config.networking.nat.enable {
 
-    environment.systemPackages = [ pkgs.iptables ];
+      environment.systemPackages = [ pkgs.iptables ];
 
-    boot = {
-      kernelModules = [ "nf_nat_ftp" ];
-      kernel.sysctl = {
-        "net.ipv4.conf.all.forwarding" = mkOverride 99 true;
-        "net.ipv4.conf.default.forwarding" = mkOverride 99 true;
-      };
-    };
-
-    networking.firewall = mkIf config.networking.firewall.enable {
-      extraCommands = mkMerge [ (mkBefore flushNat) setupNat ];
-      extraStopCommands = flushNat;
-    };
-
-    systemd.services = mkIf (!config.networking.firewall.enable) { nat = {
-      description = "Network Address Translation";
-      wantedBy = [ "network.target" ];
-      after = [ "network-pre.target" "systemd-modules-load.service" ];
-      path = [ pkgs.iptables ];
-      unitConfig.ConditionCapability = "CAP_NET_ADMIN";
-
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
+      boot = {
+        kernelModules = [ "nf_nat_ftp" ];
+        kernel.sysctl = {
+          "net.ipv4.conf.all.forwarding" = mkOverride 99 true;
+          "net.ipv4.conf.default.forwarding" = mkOverride 99 true;
+        };
       };
 
-      script = flushNat + setupNat;
+      networking.firewall = mkIf config.networking.firewall.enable {
+        extraCommands = setupNat;
+        extraStopCommands = flushNat;
+      };
 
-      postStop = flushNat;
-    }; };
-  };
+      systemd.services = mkIf (!config.networking.firewall.enable) { nat = {
+        description = "Network Address Translation";
+        wantedBy = [ "network.target" ];
+        after = [ "network-pre.target" "systemd-modules-load.service" ];
+        path = [ pkgs.iptables ];
+        unitConfig.ConditionCapability = "CAP_NET_ADMIN";
+
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+        };
+
+        script = flushNat + setupNat;
+
+        postStop = flushNat;
+      }; };
+    })
+  ];
 }

From 1793c96be2f732af04fb78008a5c35d2630f9edd Mon Sep 17 00:00:00 2001
From: Markus Mueller <john.subscriber@markus.institute>
Date: Thu, 3 Aug 2017 17:57:43 +0000
Subject: [PATCH 1447/3246] tests/nat: Use switch-to-configuration in test case

---
 nixos/tests/nat.nix | 59 ++++++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 74e20bff8d8..f1097cdfc49 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -6,6 +6,20 @@
 import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }:
   let
     unit = if withFirewall then "firewall" else "nat";
+
+    routerBase =
+      lib.mkMerge [
+        { virtualisation.vlans = [ 2 1 ];
+          networking.firewall.enable = withFirewall;
+          networking.firewall.allowPing = true;
+          networking.nat.internalIPs = [ "192.168.1.0/24" ];
+          networking.nat.externalInterface = "eth1";
+        }
+        (lib.optionalAttrs withConntrackHelpers {
+          networking.firewall.connectionTrackingModules = [ "ftp" ];
+          networking.firewall.autoLoadConntrackHelpers = true;
+        })
+      ];
   in
   {
     name = "nat" + (if withFirewall then "WithFirewall" else "Standalone")
@@ -30,20 +44,16 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
           ];
 
         router =
-          { config, pkgs, ... }:
-          lib.mkMerge [
-            { virtualisation.vlans = [ 2 1 ];
-              networking.firewall.enable = withFirewall;
-              networking.firewall.allowPing = true;
-              networking.nat.enable = true;
-              networking.nat.internalIPs = [ "192.168.1.0/24" ];
-              networking.nat.externalInterface = "eth1";
-            }
-            (lib.optionalAttrs withConntrackHelpers {
-              networking.firewall.connectionTrackingModules = [ "ftp" ];
-              networking.firewall.autoLoadConntrackHelpers = true;
-            })
-          ];
+        { config, pkgs, ... }: lib.mkMerge [
+          routerBase
+          { networking.nat.enable = true; }
+        ];
+
+        routerDummyNoNat =
+        { config, pkgs, ... }: lib.mkMerge [
+          routerBase
+          { networking.nat.enable = false; }
+        ];
 
         server =
           { config, pkgs, ... }:
@@ -57,9 +67,13 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
       };
 
     testScript =
-      { nodes, ... }:
-      ''
-        startAll;
+      { nodes, ... }: let
+        routerDummyNoNatClosure = nodes.routerDummyNoNat.config.system.build.toplevel;
+        routerClosure = nodes.router.config.system.build.toplevel;
+      in ''
+        $client->start;
+        $router->start;
+        $server->start;
 
         # The router should have access to the server.
         $server->waitForUnit("network.target");
@@ -87,13 +101,18 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
         $router->succeed("ping -c 1 client >&2");
 
         # If we turn off NAT, the client shouldn't be able to reach the server.
-        $router->succeed("iptables -t nat -D PREROUTING -j nixos-nat-pre");
-        $router->succeed("iptables -t nat -D POSTROUTING -j nixos-nat-post");
+        $router->succeed("${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1");
+        # FIXME: this should not be necessary, but nat.service is not started because
+        #        network.target is not triggered
+        #        (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359)
+        ${lib.optional (!withFirewall) ''
+          $router->succeed("systemctl start nat.service");
+        ''}
         $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
         $client->fail("ping -c 1 server >&2");
 
         # And make sure that reloading the NAT job works.
-        $router->succeed("systemctl restart ${unit}");
+        $router->succeed("${routerClosure}/bin/switch-to-configuration test 2>&1");
         $client->succeed("curl --fail http://server/ >&2");
         $client->succeed("ping -c 1 server >&2");
       '';

From eaf9faef60ad4e927e5c9dc18550eb59fb2904ea Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 3 Aug 2017 21:22:30 +0200
Subject: [PATCH 1448/3246] erlang: remove explicit gcc dependency

---
 pkgs/development/interpreters/erlang/generic-builder.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 1fdfe4ca61d..897f84f94ad 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -1,5 +1,5 @@
 { pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
-, libxml2, libxslt, ncurses, openssl, perl, gcc, autoreconfHook
+, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook
 , openjdk ? null # javacSupport
 , unixODBC ? null # odbcSupport
 , mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
@@ -47,9 +47,9 @@ in stdenv.mkDerivation ({
 
   inherit src version;
 
-  buildInputs =
-   [ perl gnum4 ncurses openssl autoreconfHook libxslt libxml2 makeWrapper gcc
-   ]
+  nativeBuildInputs = [ autoreconfHook makeWrapper perl ];
+
+  buildInputs = [ gnum4 ncurses openssl autoreconfHook libxslt libxml2 ]
     ++ optionals wxSupport wxPackages2
     ++ optionals odbcSupport odbcPackages
     ++ optionals javacSupport javacPackages

From 0b96f1d6d3cdb125fa448e8def235a11c22b3c0d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 3 Aug 2017 21:50:50 +0200
Subject: [PATCH 1449/3246] bsdgames: fix weird Makefile use of STRIP

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

diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix
index 34d767bf310..ef30a3d350c 100644
--- a/pkgs/games/bsdgames/default.nix
+++ b/pkgs/games/bsdgames/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles}:
+{ stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles }:
 
 stdenv.mkDerivation {
   name = "bsd-games-2.17";
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
+  makeFlags = [ "STRIP=" ];
+
   preConfigure = ''
     cat > config.params << EOF
     bsd_games_cfg_man6dir=$out/share/man/man6

From 189bba047e0415e95916222933b7ecab87d988bc Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 1 Aug 2017 00:46:26 +0200
Subject: [PATCH 1450/3246] pypy: use pycparser from passed python

---
 .../development/interpreters/python/pypy/2.7/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 238cfabf615..0ea70cc022d 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -3,7 +3,7 @@
 , makeWrapper, callPackage, self, gdbm, db
 , python-setup-hook
 # For the Python package set
-, pkgs, pythonPackages, packageOverrides ? (self: super: {})
+, pkgs, packageOverrides ? (self: super: {})
 }:
 
 assert zlibSupport -> zlib != null;
@@ -17,6 +17,8 @@ let
   libPrefix = "pypy${majorVersion}";
   sitePackages = "site-packages";
 
+  pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]);
+
 in stdenv.mkDerivation rec {
     name = "pypy-${version}";
     inherit majorVersion version pythonVersion;
@@ -35,8 +37,7 @@ in stdenv.mkDerivation rec {
       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 ]
-      ++ (with pythonPackages; [ pycparser ])
+    buildInputs = [ bzip2 openssl pkgconfig pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ]
       ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 
@@ -64,7 +65,7 @@ in stdenv.mkDerivation rec {
     '';
 
     buildPhase = ''
-      ${python.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing
+      ${pythonForPypy.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing
     '';
 
     setupHook = python-setup-hook sitePackages;

From 4a93ce179dc0026b5c021b9fe6aa89b93527bba5 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Thu, 3 Aug 2017 22:17:37 +0200
Subject: [PATCH 1451/3246] journalbeat: 5.4.1 -> 5.5.0

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

diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix
index 4b8ea62219e..de4687a6a57 100644
--- a/pkgs/tools/system/journalbeat/default.nix
+++ b/pkgs/tools/system/journalbeat/default.nix
@@ -7,7 +7,7 @@ let
 in buildGoPackage rec {
 
   name = "journalbeat-${version}";
-  version = "5.4.1";
+  version = "5.5.0";
 
   goPackagePath = "github.com/mheese/journalbeat";
 
@@ -22,7 +22,7 @@ in buildGoPackage rec {
     owner = "mheese";
     repo = "journalbeat";
     rev = "v${version}";
-    sha256 = "14mhx3gqg19ljcr07ahbry9k5hkbj2mjji4qsjrbc7jknis6frz4";
+    sha256 = "134n1kg6nx5yycn2cyldiayaqm8zps94hz4zfz9klp2jzq68m35y";
   };
 
   meta = with lib; {

From 2e61d8b71cb2f24fd71bb811f8a504451366f2e2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 1 Aug 2017 16:31:38 -0400
Subject: [PATCH 1452/3246] cc-wrapper: Handle more -l.... gotchas

---
 .../cc-wrapper/macos-sierra-reexport-hack.bash    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
index ae920e4fdad..9829179a97c 100644
--- a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
+++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
@@ -39,14 +39,17 @@ else
                 echo "cctools LD does not support '-L foo' or '-l foo'" >&2
                 exit 1
                 ;;
-            -lto_library)  allArgs+=("$1") ;;
-                # We aren't linking any "to_library"
-            -lSystem)      allArgs+=("$1") ;;
+            -lazy_library | -lazy_framework | -lto_library)
+                # We aren't linking any "azy_library", "to_library", etc.
+                allArgs+=("$1")
+                ;;
+            -lazy-l | -weak-l)    allArgs+=("$1") ;;
+                # We can't so easily prevent header issues from these.
+            -lSystem)             allArgs+=("$1") ;;
                 # Special case as indirection seems like a bad idea for something
                 # so fundamental. Can be removed for simplicity.
-            -l?*)          childrenLink+=("$1") ;;
-            -reexport-l?*) childrenLink+=("$1") ;;
-            *)             allArgs+=("$1") ;;
+            -l?* | -reexport-l?*) childrenLink+=("$1") ;;
+            *)                    allArgs+=("$1") ;;
         esac
 
         shift

From cd6c452ade3a309050f56c36c27d41b0abb0eef7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 1 Aug 2017 16:31:38 -0400
Subject: [PATCH 1453/3246] cc-wrapper: Don't hardcode MacOS min version for
 delegates

---
 pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
index 9829179a97c..b7aa7ea5c09 100644
--- a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
+++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
@@ -86,14 +86,14 @@ else
     fi
 
     # first half of libs
-    @binPrefix@ld -macosx_version_min 10.10 -arch x86_64 -dylib \
+    @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
       -o "$out/lib/lib${children[0]}.dylib" \
       -install_name "$out/lib/lib${children[0]}.dylib" \
       "${childrenLookup[@]}" "$symbolBloatObject" \
       "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}"
 
     # second half of libs
-    @binPrefix@ld -macosx_version_min 10.10 -arch x86_64 -dylib \
+    @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
       -o "$out/lib/lib${children[1]}.dylib" \
       -install_name "$out/lib/lib${children[1]}.dylib" \
       "${childrenLookup[@]}" "$symbolBloatObject" \

From 475c303e9155e385178a2baec0e88a7e27b3f39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 19:55:07 +0200
Subject: [PATCH 1454/3246] a2jmidid: fix download URL

gna.org is dead, so the homepage is also now longer valid. According to
openhub repo.or.cz seems to be the most relevant repo currently.
---
 pkgs/applications/audio/a2jmidid/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index ddd34f1bfeb..efb69d4c481 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -8,8 +8,8 @@ in stdenv.mkDerivation rec {
   version = "8";
 
   src = fetchurl {
-    url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
-    sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
+    url = "http://repo.or.cz/a2jmidid.git/snapshot/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz";
+    sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7";
   };
 
   buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ];
@@ -24,7 +24,6 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://home.gna.org/a2jmidid;
     description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];

From 8fb5217cf736e0f5bd08dc4b1705592e5918bad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 20:34:18 +0200
Subject: [PATCH 1455/3246] blender metadata: fix homepage

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

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 335d0031b32..b831924d9cd 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "3D Creation/Animation/Publishing System";
-    homepage = http://www.blender.org;
+    homepage = https://www.blender.org;
     # They comment two licenses: GPLv2 and Blender License, but they
     # say: "We've decided to cancel the BL offering for an indefinite period."
     license = licenses.gpl2Plus;

From 8a1328facb5e1e361f7c7b483e56366dbbb13322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:03:58 +0200
Subject: [PATCH 1456/3246] chromedriver: update homepage

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

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 26e820517c0..bdf71f7d218 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/chromedriver/;
+    homepage = https://sites.google.com/a/chromium.org/chromedriver;
     description = "A WebDriver server for running Selenium tests on Chrome";
     license = licenses.bsd3;
     maintainers = [ maintainers.goibhniu ];

From 4b960e2ce26621983f909db6636bc310fb810f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:20:39 +0200
Subject: [PATCH 1457/3246] drumgizmo: fix homepage

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

diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index 7a2e2a6da45..c42d290c599 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An LV2 sample based drum plugin";
-    homepage = http://www.drumgizmo.org;
+    homepage = https://www.drumgizmo.org;
     license = licenses.lgpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu maintainers.nico202 ];

From 7c17925aaea7821f7cac182fee85bf6b4b52429c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:27:28 +0200
Subject: [PATCH 1458/3246] key-mon: fix download and homepage URLs

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

diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
index b36b539176e..bc6cd015b86 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/pkgs/applications/video/key-mon/default.nix
@@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://key-mon.googlecode.com/files/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz";
     sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q";
   };
 
@@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/key-mon;
+    homepage = https://code.google.com/archive/p/key-mon;
     description = "Utility to show live keyboard and mouse status for teaching and screencasts";
     license = licenses.asl20;
     maintainers = [ maintainers.goibhniu ];

From 52ebfd6bc67632c8b3f25ade893ce6e6af7e2c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:28:31 +0200
Subject: [PATCH 1459/3246] mixxx: fix homepage

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

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index d7cdfcf0d08..33265e1b3e8 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://mixxx.org;
+    homepage = https://mixxx.org;
     description = "Digital DJ mixing software";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.aszlig maintainers.goibhniu ];

From 5c7edf239fb665cdae923576f01012d4d49e1e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:30:51 +0200
Subject: [PATCH 1460/3246] mlt: fix homepage

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

diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 15a62f26414..168b94495a9 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open source multimedia framework, designed for television broadcasting";
-    homepage = http://www.mltframework.org/;
+    homepage = https://www.mltframework.org;
     license = licenses.gpl3;
     maintainers = [ maintainers.tohl ];
     platforms = platforms.linux;

From 09f2e20a796edfbf7b3803ef4d72376fccacad5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:33:52 +0200
Subject: [PATCH 1461/3246] movit: fix homepage

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

diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index 907e628b767..fa765a6b107 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "High-performance, high-quality video filters for the GPU";
-    homepage = http://movits.sesse.net;
+    homepage = http://movit.sesse.net;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;

From feb7d844f836c4a83e822aa1637deb829d604c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:35:49 +0200
Subject: [PATCH 1462/3246] processing: fix homepage

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

diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index a66e9163142..12ff5c77240 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A language and IDE for electronic arts";
-    homepage = http://processing.org;
+    homepage = https://processing.org;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;

From f68a45fc22fc5f64f4e5e423cc71228a8406347b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:38:05 +0200
Subject: [PATCH 1463/3246] yaws: fix homepage

---
 pkgs/servers/http/yaws/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix
index 871b3524f42..67172edfd36 100644
--- a/pkgs/servers/http/yaws/default.nix
+++ b/pkgs/servers/http/yaws/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A high performance HTTP 1.1 server in Erlang";
-    homepage = http://http://yaws.hyber.org;
+    homepage = http://yaws.hyber.org;
     license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ goibhniu the-kenny ];

From 847fbea0987ff3243ba285fb6d2023b4cc4e4129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:40:04 +0200
Subject: [PATCH 1464/3246] ttfautohint: fix homepage

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

diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index 1042c5794bd..c302bd15c41 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       new font where all glyphs are bytecode hinted using the
       information given by FreeType’s auto-hinting module.
     '';
-    homepage = http://www.freetype.org/ttfautohint/;
+    homepage = https://www.freetype.org/ttfautohint;
     license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
     maintainers = with maintainers; [ goibhniu ndowens ];
     platforms = platforms.linux;

From 2244b1815d8e29435f3658159f7a92aa937acbd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 3 Aug 2017 21:42:37 +0200
Subject: [PATCH 1465/3246] shotcut: fix homepage

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

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 4ca31916965..72dbf87fdef 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       nixpkgs maintainer(s). If you wish to report any bugs upstream,
       please use the official build from shotcut.org instead.
     '';
-    homepage = http://shotcut.org;
+    homepage = https://shotcut.org;
     license = licenses.gpl3;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;

From 264d6641ecc7c0bea4ae0758a43c446fe52b4cd3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 3 Aug 2017 23:17:30 +0200
Subject: [PATCH 1466/3246] privoxy: fix weird use of STRIP in the Makefile

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

diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 12744456cc4..48a803268be 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec{
   nativeBuildInputs = [ autoreconfHook w3m man ];
   buildInputs = [ zlib pcre ];
 
+  makeFlags = [ "STRIP="];
+
   postInstall = ''
     rm -rf $out/var
   '';

From 8f141b2a07c86181907b15e5b8598297b36436bc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Aug 2017 00:04:29 +0200
Subject: [PATCH 1467/3246] androidenv: Update all packages using fetch.sh

---
 pkgs/development/mobile/androidenv/addon.xml  |  26 +--
 pkgs/development/mobile/androidenv/addons.nix |   4 +-
 .../mobile/androidenv/platforms-linux.nix     |   4 +-
 .../mobile/androidenv/platforms-macosx.nix    |   4 +-
 .../mobile/androidenv/repository-11.xml       |  80 +++++++---
 .../development/mobile/androidenv/sys-img.xml | 150 +++++++++---------
 .../mobile/androidenv/sysimages.nix           |  38 ++---
 7 files changed, 169 insertions(+), 137 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index d9b47826648..05b54542033 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2017-06-07 21:05:03.785544 with ADRT.-->
+	<!--Generated on 2017-07-26 17:22:37.387749 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -1317,16 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>m2repository</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:158324354, branch:perforce-->
+		<!--Generated from bid:163087974, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>53</sdk:major>
+			<sdk:major>57</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 15:15:19 2017.-->
-				<sdk:size>194148491</sdk:size>
-				<sdk:checksum type="sha1">9008082eb1e6ff5a78d32a1fed6915f266fc5013</sdk:checksum>
-				<sdk:url>google_m2repository_gms_v11_1_rc16_wear_2_0_3_rc1.zip</sdk:url>
+				<!--Built on: Tue Jul 25 14:44:09 2017.-->
+				<sdk:size>214565802</sdk:size>
+				<sdk:checksum type="sha1">4bc48d6d4d39944cf2b061e3f618cd9d447c75bb</sdk:checksum>
+				<sdk:url>google_m2repository_gms_v11_3_rc05_wear_2_0_4.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1401,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>google_play_services_froyo</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:158051086, branch:perforce-->
+		<!--Generated from bid:163088463, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>41</sdk:major>
+			<sdk:major>43</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Jun  6 11:50:00 2017.-->
-				<sdk:size>13165315</sdk:size>
-				<sdk:checksum type="sha1">55be81c50041f6a8f62947418f74f683369c971f</sdk:checksum>
-				<sdk:url>google_play_services_v11_rc16.zip</sdk:url>
+				<!--Built on: Tue Jul 25 14:44:00 2017.-->
+				<sdk:size>21391284</sdk:size>
+				<sdk:checksum type="sha1">6b072d5b96fb8726405d363ccdbb4d26bec0b54f</sdk:checksum>
+				<sdk:url>google_play_services_v11_3_rc05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index 06be6515ee5..71ce2c3d079 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -296,8 +296,8 @@ in
   google_play_services = buildGoogleApis {
     name = "google_play_services";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/google_play_services_v11_rc16.zip;
-      sha1 = "55be81c50041f6a8f62947418f74f683369c971f";
+      url = https://dl.google.com/android/repository/google_play_services_v11_3_rc05.zip;
+      sha1 = "6b072d5b96fb8726405d363ccdbb4d26bec0b54f";
     };
     meta = {
       description = "Google Play services client library and sample code";
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index 1caa6cebb14..e24a9c43160 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -307,8 +307,8 @@ in
   platform_26 = buildPlatform {
     name = "android-platform-8.0.0";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-26_r01.zip;
-      sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a";
+      url = https://dl.google.com/android/repository/platform-26_r02.zip;
+      sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef";
     };
     meta = {
       description = "Android SDK Platform 26";
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index a4903cd0d40..3775872514c 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -307,8 +307,8 @@ in
   platform_26 = buildPlatform {
     name = "android-platform-8.0.0";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-26_r01.zip;
-      sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a";
+      url = https://dl.google.com/android/repository/platform-26_r02.zip;
+      sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef";
     };
     meta = {
       description = "Android SDK Platform 26";
diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml
index 9f46af93a88..6d2c87178a6 100644
--- a/pkgs/development/mobile/androidenv/repository-11.xml
+++ b/pkgs/development/mobile/androidenv/repository-11.xml
@@ -15,7 +15,7 @@
  * limitations under the License.
 -->
 <sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2017-06-07 21:04:43.441919 with ADRT.-->
+	<!--Generated on 2017-07-26 17:22:12.162164 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -296,39 +296,39 @@ This is the Android SDK Preview License Agreement (the &quot;License Agreement&q
 
 June 2014.</sdk:license>
 	<sdk:ndk>
-		<!--Generated from bid:4075724, branch:aosp-ndk-r15-release-->
+		<!--Generated from bid:4119039, branch:aosp-ndk-r15-release-->
 		<sdk:description>NDK</sdk:description>
 		<sdk:revision>15</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 14:50:43 2017.-->
-				<sdk:size>959176682</sdk:size>
-				<sdk:checksum type="sha1">9dd0ff18d177ec75797b021a3ebd294362e8a41e</sdk:checksum>
-				<sdk:url>android-ndk-r15-darwin-x86_64.zip</sdk:url>
+				<!--Built on: Wed Jun 21 12:06:49 2017.-->
+				<sdk:size>959321525</sdk:size>
+				<sdk:checksum type="sha1">05e3eec7e9ce1d09bb5401b41cf778a2ec19c819</sdk:checksum>
+				<sdk:url>android-ndk-r15b-darwin-x86_64.zip</sdk:url>
 				<sdk:host-os>macosx</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 14:51:08 2017.-->
-				<sdk:size>973898016</sdk:size>
-				<sdk:checksum type="sha1">32b3115357ed798a8a48d7d589ffcb901693c745</sdk:checksum>
-				<sdk:url>android-ndk-r15-linux-x86_64.zip</sdk:url>
+				<!--Built on: Wed Jun 21 12:07:17 2017.-->
+				<sdk:size>974035125</sdk:size>
+				<sdk:checksum type="sha1">2690d416e54f88f7fa52d0dcb5f539056a357b3b</sdk:checksum>
+				<sdk:url>android-ndk-r15b-linux-x86_64.zip</sdk:url>
 				<sdk:host-os>linux</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 14:49:52 2017.-->
-				<sdk:size>783705009</sdk:size>
-				<sdk:checksum type="sha1">bf869b624f6d4778065d5d4703815b0c689069e1</sdk:checksum>
-				<sdk:url>android-ndk-r15-windows-x86.zip</sdk:url>
+				<!--Built on: Wed Jun 21 12:05:55 2017.-->
+				<sdk:size>783838327</sdk:size>
+				<sdk:checksum type="sha1">74e45891d0cc99b077b3951aeba87d9c91df20a8</sdk:checksum>
+				<sdk:url>android-ndk-r15b-windows-x86.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>32</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Jun  7 14:50:17 2017.-->
-				<sdk:size>848657615</sdk:size>
-				<sdk:checksum type="sha1">45d310443ceb5ff19a0dde139ee9b3404908c178</sdk:checksum>
-				<sdk:url>android-ndk-r15-windows-x86_64.zip</sdk:url>
+				<!--Built on: Wed Jun 21 12:06:20 2017.-->
+				<sdk:size>848796389</sdk:size>
+				<sdk:checksum type="sha1">126a1cd8985132c0383ab96579feed09ba402e22</sdk:checksum>
+				<sdk:url>android-ndk-r15b-windows-x86_64.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
@@ -336,17 +336,17 @@ June 2014.</sdk:license>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:ndk>
 	<sdk:platform>
-		<!--Generated from bid:4062713, branch:git_oc-preview3-sdk-->
+		<!--Generated from bid:4187382, branch:git_oc-release-->
 		<sdk:version>8.0.0</sdk:version>
 		<sdk:api-level>26</sdk:api-level>
 		<sdk:description>Android SDK Platform 26</sdk:description>
-		<sdk:revision>1</sdk:revision>
+		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Jun  2 13:22:35 2017.-->
-				<sdk:size>63467872</sdk:size>
-				<sdk:checksum type="sha1">33a4f9788bfd7123e712906b2d7e5d54a729e14a</sdk:checksum>
-				<sdk:url>platform-26_r01.zip</sdk:url>
+				<!--Built on: Tue Jul 18 10:38:38 2017.-->
+				<sdk:size>63623734</sdk:size>
+				<sdk:checksum type="sha1">e4ae5d7aa557a3c827135838ee400da8443ac4ef</sdk:checksum>
+				<sdk:url>platform-26_r02.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1169,6 +1169,38 @@ June 2014.</sdk:license>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:source>
+	<sdk:build-tool>
+		<!--Generated from bid:4187382, branch:git_oc-release-->
+		<sdk:revision>
+			<sdk:major>26</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>1</sdk:micro>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Tue Jul 18 10:38:26 2017.-->
+				<sdk:size>54113329</sdk:size>
+				<sdk:checksum type="sha1">5378c2c78091b414d0eac40a6bd37f2faa31a365</sdk:checksum>
+				<sdk:url>build-tools_r26.0.1-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Tue Jul 18 10:38:23 2017.-->
+				<sdk:size>53266653</sdk:size>
+				<sdk:checksum type="sha1">cbde59de198916b390777dd0227921bfa2120832</sdk:checksum>
+				<sdk:url>build-tools_r26.0.1-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Tue Jul 18 10:38:21 2017.-->
+				<sdk:size>54936185</sdk:size>
+				<sdk:checksum type="sha1">02494c80ffbe65bfff0aaa7463c9692693327b7d</sdk:checksum>
+				<sdk:url>build-tools_r26.0.1-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+	</sdk:build-tool>
 	<sdk:build-tool>
 		<!--Generated from bid:4062713, branch:git_oc-preview3-sdk-->
 		<sdk:revision>
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index 8ea0cfb5b80..06754b25076 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2017-06-07 21:04:43.770481 with ADRT.-->
+	<!--Generated on 2017-07-26 17:22:12.517198 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -746,16 +746,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3462041, branch:git_klp-emu-release-->
+		<!--Generated from bid:4174703, branch:git_klp-emu-release-->
 		<sdk:api-level>19</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>5</sdk:revision>
+		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:21:38 2016.-->
-				<sdk:size>183968605</sdk:size>
-				<sdk:checksum type="sha1">1d98426467580abfd03c724c5344450f5d0df379</sdk:checksum>
-				<sdk:url>x86-19_r05.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:41:20 2017.-->
+				<sdk:size>185886274</sdk:size>
+				<sdk:checksum type="sha1">2ac82153aae97f7eae4c5a0761224fe04321d03d</sdk:checksum>
+				<sdk:url>x86-19_r06.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -763,33 +763,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
+		<!--Generated from bid:4174711, branch:git_lmp-emu-release-->
 		<sdk:api-level>21</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:12:20 2016.-->
-				<sdk:size>206305926</sdk:size>
-				<sdk:checksum type="sha1">c7732f45c931c0eaa064e57e8c054bce86c30e54</sdk:checksum>
-				<sdk:url>x86-21_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3079158, branch:git_lmp-mr1-emu-release-->
-		<sdk:api-level>22</sdk:api-level>
-		<sdk:description>Intel x86 Atom System Image</sdk:description>
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:12:40 2016.-->
-				<sdk:size>212327460</sdk:size>
-				<sdk:checksum type="sha1">7e2c93891ea9efec07dccccf6b9ab051a014dbdf</sdk:checksum>
-				<sdk:url>x86-22_r05.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:42:18 2017.-->
+				<sdk:size>208212529</sdk:size>
+				<sdk:checksum type="sha1">00f0eb0a1003efe3316347f762e20a85d8749cff</sdk:checksum>
+				<sdk:url>x86-21_r05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -797,16 +780,33 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079352, branch:git_mnc-emu-release-->
+		<!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release-->
+		<sdk:api-level>22</sdk:api-level>
+		<sdk:description>Intel x86 Atom System Image</sdk:description>
+		<sdk:revision>6</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Thu Jul 13 12:43:18 2017.-->
+				<sdk:size>214268954</sdk:size>
+				<sdk:checksum type="sha1">e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e</sdk:checksum>
+				<sdk:url>x86-22_r06.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:abi>x86</sdk:abi>
+		<sdk:tag-id>default</sdk:tag-id>
+	</sdk:system-image>
+	<sdk:system-image>
+		<!--Generated from bid:4174734, branch:git_mnc-emu-release-->
 		<sdk:api-level>23</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>9</sdk:revision>
+		<sdk:revision>10</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:13:52 2016.-->
-				<sdk:size>260241399</sdk:size>
-				<sdk:checksum type="sha1">d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1</sdk:checksum>
-				<sdk:url>x86-23_r09.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:44:25 2017.-->
+				<sdk:size>260804863</sdk:size>
+				<sdk:checksum type="sha1">f6c3e3dd7bd951454795aa75c3a145fd05ac25bb</sdk:checksum>
+				<sdk:url>x86-23_r10.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -814,16 +814,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3245079, branch:git_nyc-emu-release-->
+		<!--Generated from bid:4174735, branch:git_nyc-emu-release-->
 		<sdk:api-level>24</sdk:api-level>
 		<sdk:description>Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>7</sdk:revision>
+		<sdk:revision>8</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Sep  6 08:29:27 2016.-->
-				<sdk:size>302213276</sdk:size>
-				<sdk:checksum type="sha1">566fdee283a907854bfa3c174265bc31f396eabd</sdk:checksum>
-				<sdk:url>x86-24_r07.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:45:47 2017.-->
+				<sdk:size>313489224</sdk:size>
+				<sdk:checksum type="sha1">c1cae7634b0216c0b5990f2c144eb8ca948e3511</sdk:checksum>
+				<sdk:url>x86-24_r08.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -831,33 +831,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
+		<!--Generated from bid:4174711, branch:git_lmp-emu-release-->
 		<sdk:api-level>21</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>4</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:08:22 2016.-->
-				<sdk:size>290608820</sdk:size>
-				<sdk:checksum type="sha1">9b2d64a69a72fa596c386899a742a404308f2c92</sdk:checksum>
-				<sdk:url>x86_64-21_r04.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>default</sdk:tag-id>
-	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3079158, branch:git_lmp_mr1-emu-release-->
-		<sdk:api-level>22</sdk:api-level>
-		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:08:46 2016.-->
-				<sdk:size>297850561</sdk:size>
-				<sdk:checksum type="sha1">99d1d6c77e92284b4210640edf6c81eceb28520d</sdk:checksum>
-				<sdk:url>x86_64-22_r05.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:46:57 2017.-->
+				<sdk:size>292623982</sdk:size>
+				<sdk:checksum type="sha1">9078a095825a69e5e215713f0866c83cef65a342</sdk:checksum>
+				<sdk:url>x86_64-21_r05.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -865,16 +848,33 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3079352, branch:git_mnc-emu-release-->
+		<!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release-->
+		<sdk:api-level>22</sdk:api-level>
+		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
+		<sdk:revision>6</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Thu Jul 13 12:48:15 2017.-->
+				<sdk:size>299976630</sdk:size>
+				<sdk:checksum type="sha1">5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4</sdk:checksum>
+				<sdk:url>x86_64-22_r06.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:abi>x86_64</sdk:abi>
+		<sdk:tag-id>default</sdk:tag-id>
+	</sdk:system-image>
+	<sdk:system-image>
+		<!--Generated from bid:4174734, branch:git_mnc-emu-release-->
 		<sdk:api-level>23</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>9</sdk:revision>
+		<sdk:revision>10</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:09:15 2016.-->
-				<sdk:size>363794271</sdk:size>
-				<sdk:checksum type="sha1">84cc076eacec043c8e88382c6ab391b0cd5c0695</sdk:checksum>
-				<sdk:url>x86_64-23_r09.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:49:37 2017.-->
+				<sdk:size>365009313</sdk:size>
+				<sdk:checksum type="sha1">7cbc291483ca07dc67b71268c5f08a5755f50f51</sdk:checksum>
+				<sdk:url>x86_64-23_r10.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -882,16 +882,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3245079, branch:git_nyc-emu-release-->
+		<!--Generated from bid:4174735, branch:git_nyc-emu-release-->
 		<sdk:api-level>24</sdk:api-level>
 		<sdk:description>Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>7</sdk:revision>
+		<sdk:revision>8</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Sep  6 08:29:51 2016.-->
-				<sdk:size>407148033</sdk:size>
-				<sdk:checksum type="sha1">a379932395ced0a8f572b39c396d86e08827a9ba</sdk:checksum>
-				<sdk:url>x86_64-24_r07.zip</sdk:url>
+				<!--Built on: Thu Jul 13 12:51:15 2017.-->
+				<sdk:size>419261998</sdk:size>
+				<sdk:checksum type="sha1">f6559e1949a5879f31a9662f4f0e50ad60181684</sdk:checksum>
+				<sdk:url>x86_64-24_r08.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index 89c48e5fb59..c5d075d6307 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -138,8 +138,8 @@ in
   sysimg_x86_19 = buildSystemImage {
     name = "sysimg-x86-19";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-19_r05.zip;
-      sha1 = "1d98426467580abfd03c724c5344450f5d0df379";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip;
+      sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d";
     };
   };
 
@@ -154,16 +154,16 @@ in
   sysimg_x86_21 = buildSystemImage {
     name = "sysimg-x86-21";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-21_r04.zip;
-      sha1 = "c7732f45c931c0eaa064e57e8c054bce86c30e54";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip;
+      sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff";
     };
   };
 
   sysimg_x86_64_21 = buildSystemImage {
     name = "sysimg-x86_64-21";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r04.zip;
-      sha1 = "9b2d64a69a72fa596c386899a742a404308f2c92";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip;
+      sha1 = "9078a095825a69e5e215713f0866c83cef65a342";
     };
   };
 
@@ -178,16 +178,16 @@ in
   sysimg_x86_22 = buildSystemImage {
     name = "sysimg-x86-22";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-22_r05.zip;
-      sha1 = "7e2c93891ea9efec07dccccf6b9ab051a014dbdf";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip;
+      sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e";
     };
   };
 
   sysimg_x86_64_22 = buildSystemImage {
     name = "sysimg-x86_64-22";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r05.zip;
-      sha1 = "99d1d6c77e92284b4210640edf6c81eceb28520d";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip;
+      sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4";
     };
   };
 
@@ -202,16 +202,16 @@ in
   sysimg_x86_23 = buildSystemImage {
     name = "sysimg-x86-23";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip;
-      sha1 = "d7ee1118a73eb5c3e803d4dd3b96a124ac909ee1";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip;
+      sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb";
     };
   };
 
   sysimg_x86_64_23 = buildSystemImage {
     name = "sysimg-x86_64-23";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r09.zip;
-      sha1 = "84cc076eacec043c8e88382c6ab391b0cd5c0695";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip;
+      sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51";
     };
   };
 
@@ -234,16 +234,16 @@ in
   sysimg_x86_24 = buildSystemImage {
     name = "sysimg-x86-24";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-24_r07.zip;
-      sha1 = "566fdee283a907854bfa3c174265bc31f396eabd";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip;
+      sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511";
     };
   };
 
   sysimg_x86_64_24 = buildSystemImage {
     name = "sysimg-x86_64-24";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r07.zip;
-      sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba";
+      url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip;
+      sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684";
     };
   };
 
@@ -263,4 +263,4 @@ in
     };
   };
 }
- 
+

From 8b024834f2836a9135b0a67828e7163a5450966a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 3 Aug 2017 18:18:59 -0400
Subject: [PATCH 1468/3246] darwin-test-channel: I broke it a bit adding
 macos-sierra-shared

This doesn't completely unbreak it, but gets it closer.
---
 pkgs/top-level/all-packages.nix | 4 ++--
 pkgs/top-level/release.nix      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 103906a39d0..ab84e4307c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19261,8 +19261,8 @@ with pkgs;
 
   xtermcontrol = callPackage ../applications/misc/xtermcontrol {};
 
-  # No `recurseIntoAttrs` because there's no need to nix-env these.
-  tests = {
+  # `recurseIntoAttrs` for sake of hydra, not nix-env
+  tests = recurseIntoAttrs {
     macOSSierraShared = callPackage ../test/macos-sierra-shared {};
   };
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 0c7c67a0d03..f9c2acb43d9 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -42,7 +42,7 @@ let
               jobs.python.x86_64-darwin
               jobs.rustc.x86_64-darwin
               jobs.go.x86_64-darwin
-              jobs.tests.macOSSierraShared
+              jobs.tests.macOSSierraShared.x86_64-darwin
             ];
         };
 

From 1ad0eae36e99f78298c4f4d4b51405edf958eff3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 3 Aug 2017 18:46:40 -0400
Subject: [PATCH 1469/3246] darwin-tested channel: Fix eval

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f9c2acb43d9..9e4c204c25d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -130,6 +130,8 @@ let
         scikitlearn = unix;
       };
 
+      # hack around broken eval of non-linux packages for now.
+      tests.macOSSierraShared = darwin;
     } ));
 
 in jobs

From 5b3e403eca517a090f1d98c4cd504762257276a8 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 19 Jul 2017 19:00:38 +0200
Subject: [PATCH 1470/3246] ola: init at 0.10.4

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

diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
new file mode 100644
index 00000000000..b6d2a1cd20b
--- /dev/null
+++ b/pkgs/applications/misc/ola/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
+, libuuid, cppunit, protobuf, zlib, avahi, libmicrohttpd
+, perl, python3, python3Packages
+}:
+
+stdenv.mkDerivation rec {
+  name = "ola-${version}";
+  version = "0.10.4";
+
+  src = fetchFromGitHub {
+    owner = "OpenLightingProject";
+    repo = "ola";
+    rev = version;
+    sha256 = "1skb3dwpmsfdr8mp3rs80jmsr1bf78270d9bnd8h0pv8bkb8zvim";
+  };
+
+  nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
+  buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ];
+  propagatedBuildInputs = with python3Packages; [ protobuf3_2 numpy ];
+
+  configureFlags = [ "--enable-python-libs" ];
+
+  meta = with stdenv.lib; {
+    description = "A framework for controlling entertainment lighting equipment.";
+    maintainers = [ maintainers.globin ];
+    licenses = with licenses; [ lgpl21 gpl2Plus ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab84e4307c7..0e7ebedbc13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3507,6 +3507,8 @@ with pkgs;
 
   oh-my-zsh = callPackage ../shells/oh-my-zsh { };
 
+  ola = callPackage ../applications/misc/ola { };
+
   opencc = callPackage ../tools/text/opencc { };
 
   opencl-info = callPackage ../tools/system/opencl-info { };

From 32e7904624d1d79faf4ba0d3389d1834614c986c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Jul 2017 01:24:13 +0200
Subject: [PATCH 1471/3246] gnupg agent module: fix ssh agent assertion logic

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

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index 8af55f38992..addc9dcca87 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -92,7 +92,7 @@ in
     '');
 
     assertions = [
-      { assertion = cfg.agent.enableSSHSupport && !config.programs.ssh.startAgent;
+      { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent;
         message = "You can't use ssh-agent and GnuPG agent with SSH support enabled at the same time!";
       }
     ];

From 3b472d78a846b7ae029bb5192f1be9b5d870f4af Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 12 Jul 2017 14:23:15 +0200
Subject: [PATCH 1472/3246] avahi-daemon service: add cacheEntriesMax option

---
 nixos/modules/services/networking/avahi-daemon.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index f4d0fc822de..9ccdacb20e9 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -22,6 +22,7 @@ let
     ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"}
     ${optionalString (domainName!=null) "domain-name=${domainName}"}
     allow-point-to-point=${yesNo allowPointToPoint}
+    ${optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"}
 
     [wide-area]
     enable-wide-area=${yesNo wideArea}
@@ -166,6 +167,15 @@ in
         '';
       };
 
+      cacheEntriesMax = mkOption {
+        default = null;
+        type = types.nullOr types.int;
+        description = ''
+          Number of resource records to be cached per interface. Use 0 to
+          disable caching. Avahi daemon defaults to 4096 if not set.
+        '';
+      };
+
     };
 
   };

From 1075919413bcaa1a0ed01ea9b9028276ba0cb313 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Mon, 26 Jun 2017 13:15:03 +0200
Subject: [PATCH 1473/3246] unifi: add options to control JVM heap size

Our controller was acting very sluggish at times and increasing
available RAM for the JVM fixes this.
---
 nixos/modules/services/networking/unifi.nix | 31 +++++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index a8cff638d3b..8e5f0bfc070 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -3,7 +3,12 @@ with lib;
 let
   cfg = config.services.unifi;
   stateDir = "/var/lib/unifi";
-  cmd = "@${pkgs.jre}/bin/java java -jar ${stateDir}/lib/ace.jar";
+  cmd = ''
+    @${pkgs.jre}/bin/java java \
+        ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
+        ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
+        -jar ${stateDir}/lib/ace.jar
+  '';
   mountPoints = [
     {
       what = "${pkgs.unifi}/dl";
@@ -58,6 +63,26 @@ in
       '';
     };
 
+    services.unifi.initialJavaHeapSize = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      example = 1024;
+      description = ''
+        Set the initial heap size for the JVM in MB. If this option isn't set, the
+        JVM will decide this value at runtime.
+      '';
+    };
+
+    services.unifi.maximumJavaHeapSize = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      example = 4096;
+      description = ''
+        Set the maximimum heap size for the JVM in MB. If this option isn't set, the
+        JVM will decide this value at runtime.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {
@@ -121,8 +146,8 @@ in
 
       serviceConfig = {
         Type = "simple";
-        ExecStart = "${cmd} start";
-        ExecStop = "${cmd} stop";
+        ExecStart = "${(removeSuffix "\n" cmd)} start";
+        ExecStop = "${(removeSuffix "\n" cmd)} stop";
         User = "unifi";
         PermissionsStartOnly = true;
         UMask = "0077";

From 02791ced3472116e07845c8181370b9e6ff755e2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 18:32:00 +0200
Subject: [PATCH 1474/3246] atlassian-{jira,confluence}: add crowd sso support

---
 .../web-apps/atlassian/confluence.nix         | 53 ++++++++++++++++++-
 .../services/web-apps/atlassian/jira.nix      | 51 +++++++++++++++++-
 pkgs/servers/atlassian/confluence.nix         | 13 ++++-
 pkgs/servers/atlassian/jira.nix               | 13 ++++-
 4 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
index c1d7d4ea06d..33ba444d097 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -6,7 +6,22 @@ let
 
   cfg = config.services.confluence;
 
-  pkg = pkgs.atlassian-confluence;
+  pkg = pkgs.atlassian-confluence.override {
+    enableSSO = cfg.sso.enable;
+    crowdProperties = ''
+      application.name                        ${cfg.sso.applicationName}
+      application.password                    ${cfg.sso.applicationPassword}
+      application.login.url                   ${cfg.sso.crowd}/console/
+
+      crowd.server.url                        ${cfg.sso.crowd}/services/
+      crowd.base.url                          ${cfg.sso.crowd}/
+
+      session.isauthenticated                 session.isauthenticated
+      session.tokenkey                        session.tokenkey
+      session.validationinterval              ${toString cfg.sso.validationInterval}
+      session.lastvalidation                  session.lastvalidation
+    '';
+  };
 
 in
 
@@ -76,6 +91,42 @@ in
         };
       };
 
+      sso = {
+        enable = mkEnableOption "SSO with Atlassian Crowd";
+
+        crowd = mkOption {
+          type = types.str;
+          example = "http://localhost:8095/crowd";
+          description = "Crowd Base URL without trailing slash";
+        };
+
+        applicationName = mkOption {
+          type = types.str;
+          example = "jira";
+          description = "Exact name of this Confluence instance in Crowd";
+        };
+
+        applicationPassword = mkOption {
+          type = types.str;
+          description = "Application password of this Confluence instance in Crowd";
+        };
+
+        validationInterval = mkOption {
+          type = types.int;
+          default = 2;
+          example = 0;
+          description = ''
+            Set to 0, if you want authentication checks to occur on each
+            request. Otherwise set to the number of minutes between request
+            to validate if the user is logged in or out of the Crowd SSO
+            server. Setting this value to 1 or higher will increase the
+            performance of Crowd's integration.
+          '';
+        };
+      };
+
+
+
       jrePackage = let
         jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
       in mkOption {
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index 0ab94d95eee..19b6a8d3085 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -6,7 +6,22 @@ let
 
   cfg = config.services.jira;
 
-  pkg = pkgs.atlassian-jira;
+  pkg = pkgs.atlassian-jira.override {
+    enableSSO = cfg.sso.enable;
+    crowdProperties = ''
+      application.name                        ${cfg.sso.applicationName}
+      application.password                    ${cfg.sso.applicationPassword}
+      application.login.url                   ${cfg.sso.crowd}/console/
+
+      crowd.server.url                        ${cfg.sso.crowd}/services/
+      crowd.base.url                          ${cfg.sso.crowd}/
+
+      session.isauthenticated                 session.isauthenticated
+      session.tokenkey                        session.tokenkey
+      session.validationinterval              ${toString cfg.sso.validationInterval}
+      session.lastvalidation                  session.lastvalidation
+    '';
+  };
 
 in
 
@@ -82,6 +97,40 @@ in
         };
       };
 
+      sso = {
+        enable = mkEnableOption "SSO with Atlassian Crowd";
+
+        crowd = mkOption {
+          type = types.str;
+          example = "http://localhost:8095/crowd";
+          description = "Crowd Base URL without trailing slash";
+        };
+
+        applicationName = mkOption {
+          type = types.str;
+          example = "jira";
+          description = "Exact name of this JIRA instance in Crowd";
+        };
+
+        applicationPassword = mkOption {
+          type = types.str;
+          description = "Application password of this JIRA instance in Crowd";
+        };
+
+        validationInterval = mkOption {
+          type = types.int;
+          default = 2;
+          example = 0;
+          description = ''
+            Set to 0, if you want authentication checks to occur on each
+            request. Otherwise set to the number of minutes between request
+            to validate if the user is logged in or out of the Crowd SSO
+            server. Setting this value to 1 or higher will increase the
+            performance of Crowd's integration.
+          '';
+        };
+      };
+
       jrePackage = let
         jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
       in mkOption {
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 3c1cdda8361..ea8d2651836 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl }:
+{ stdenv, lib, fetchurl
+, enableSSO ? false
+, crowdProperties ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "atlassian-confluence-${version}";
@@ -19,6 +22,14 @@ stdenv.mkDerivation rec {
     rm -r logs; ln -sf /run/confluence/logs/ .
     rm -r work; ln -sf /run/confluence/work/ .
     rm -r temp; ln -sf /run/confluence/temp/ .
+  '' + lib.optionalString enableSSO ''
+    substituteInPlace confluence/WEB-INF/classes/seraph-config.xml \
+      --replace com.atlassian.confluence.user.ConfluenceAuthenticator\
+                com.atlassian.confluence.user.ConfluenceCrowdSSOAuthenticator
+  '' + lib.optionalString (crowdProperties != null) ''
+    cat <<EOF > confluence/WEB-INF/classes/crowd.properties
+    ${crowdProperties}
+    EOF
   '';
 
   installPhase = ''
diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index bd044975f22..0013286c03c 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl }:
+{ stdenv, lib, fetchurl
+, enableSSO ? false
+, crowdProperties ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
@@ -17,6 +20,14 @@ stdenv.mkDerivation rec {
     rm -r logs; ln -sf /run/atlassian-jira/logs/ .
     rm -r work; ln -sf /run/atlassian-jira/work/ .
     rm -r temp; ln -sf /run/atlassian-jira/temp/ .
+  '' + lib.optionalString enableSSO ''
+    substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \
+      --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \
+                com.atlassian.jira.security.login.SSOSeraphAuthenticator
+  '' + lib.optionalString (crowdProperties != null) ''
+    cat <<EOF > atlassian-jira/WEB-INF/classes/crowd.properties
+    ${crowdProperties}
+    EOF
   '';
 
   installPhase = ''

From c678fc385ea296b6ffc65f837bccf34eaad195a5 Mon Sep 17 00:00:00 2001
From: Markus Mueller <john.subscriber@markus.institute>
Date: Sun, 18 Jun 2017 04:09:31 +0000
Subject: [PATCH 1475/3246] confluence: fix optional sso

---
 nixos/modules/services/web-apps/atlassian/confluence.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
index 33ba444d097..2344b9922d0 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.services.confluence;
 
-  pkg = pkgs.atlassian-confluence.override {
+  pkg = pkgs.atlassian-confluence.override (optionalAttrs cfg.sso.enable {
     enableSSO = cfg.sso.enable;
     crowdProperties = ''
       application.name                        ${cfg.sso.applicationName}
@@ -21,7 +21,7 @@ let
       session.validationinterval              ${toString cfg.sso.validationInterval}
       session.lastvalidation                  session.lastvalidation
     '';
-  };
+  });
 
 in
 

From 75bbcd421570f5dfbaaab5d2b986709a9cb8b7d5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 3 Jul 2017 01:03:38 +0200
Subject: [PATCH 1476/3246] nginx module: include uwsgi_params

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

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 2310912d0fd..c5ba8eb147c 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -36,6 +36,7 @@ let
     http {
       include ${cfg.package}/conf/mime.types;
       include ${cfg.package}/conf/fastcgi.conf;
+      include ${cfg.package}/conf/uwsgi_params;
 
       ${optionalString (cfg.recommendedOptimisation) ''
         # optimisation
@@ -116,6 +117,7 @@ let
     http {
       include ${cfg.package}/conf/mime.types;
       include ${cfg.package}/conf/fastcgi.conf;
+      include ${cfg.package}/conf/uwsgi_params;
       ${cfg.httpConfig}
     }''}
 

From 94a2cba8d9a89036965089e4d9eb963d422ff93c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 15 Apr 2017 15:09:18 +0200
Subject: [PATCH 1477/3246] nginx module: add resolver config

---
 .../services/web-servers/nginx/default.nix    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index c5ba8eb147c..2f691b0e9df 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -38,6 +38,10 @@ let
       include ${cfg.package}/conf/fastcgi.conf;
       include ${cfg.package}/conf/uwsgi_params;
 
+      ${optionalString (cfg.resolver.addresses != []) ''
+        resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"};
+      ''}
+
       ${optionalString (cfg.recommendedOptimisation) ''
         # optimisation
         sendfile on;
@@ -385,6 +389,32 @@ in
         description = "Path to DH parameters file.";
       };
 
+      resolver = mkOption {
+        type = types.submodule {
+          options = {
+            addresses = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              example = literalExample ''[ "[::1]" "127.0.0.1:5353" ]'';
+              description = "List of resolvers to use";
+            };
+            valid = mkOption {
+              type = types.str;
+              default = "";
+              example = "30s";
+              description = ''
+                By default, nginx caches answers using the TTL value of a response.
+                An optional valid parameter allows overriding it
+              '';
+            };
+          };
+        };
+        description = ''
+          Configures name servers used to resolve names of upstream servers into addresses
+        '';
+        default = {};
+      };
+
       virtualHosts = mkOption {
         type = types.attrsOf (types.submodule (import ./vhost-options.nix {
           inherit config lib;

From 485a8fef731e1f73f473d052c27f9b5af64d2256 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 9 Oct 2016 01:41:01 +0200
Subject: [PATCH 1478/3246] modules: specify some types

---
 nixos/modules/system/activation/top-level.nix | 1 +
 nixos/modules/virtualisation/xen-dom0.nix     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index e9897cc01b6..67cb2264e3f 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -141,6 +141,7 @@ in
     system.build = mkOption {
       internal = true;
       default = {};
+      type = types.attrs;
       description = ''
         Attribute set of derivations used to setup the system.
       '';
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 5239652d407..c7656bc309c 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -16,6 +16,7 @@ in
     virtualisation.xen.enable =
       mkOption {
         default = false;
+        type = types.bool;
         description =
           ''
             Setting this option enables the Xen hypervisor, a

From 500791cd336d4f627411ddccd6c0f0448d736c69 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 26 Jul 2017 19:01:42 +0200
Subject: [PATCH 1479/3246] hackrf: 2015.07.2 -> 2017.02.1

---
 pkgs/applications/misc/hackrf/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index e92cd4cdacc..cb009368739 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchgit, cmake, pkgconfig, libusb }:
+{ stdenv, fetchgit, cmake, pkgconfig, libusb, fftwSinglePrec }:
 
 stdenv.mkDerivation rec {
   name = "hackrf-${version}";
-  version = "2015.07.2";
+  version = "2017.02.1";
 
   src = fetchgit {
     url = "git://github.com/mossmann/hackrf";
     rev = "refs/tags/v${version}";
-    sha256 = "1mn11yz6hbkmvrbxj5vnp78m5dsny96821a9ffpvbdcwx3s2p23m";
+    sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv";
   };
 
   buildInputs = [
-    cmake pkgconfig libusb
+    cmake pkgconfig libusb fftwSinglePrec
   ];
-  
+
   preConfigure = ''
-    cd host  
+    cd host
   '';
-  
+
   meta = with stdenv.lib; {
     description = "An open source SDR platform";
     homepage = http://greatscottgadgets.com/hackrf/;

From be28c4cc48d4c408ff61138a4b59c8a2216a2dcd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 26 Jul 2017 19:11:58 +0200
Subject: [PATCH 1480/3246] hackrf: fix udev rule detection impurity

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

diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index cb009368739..1b8257ca5e5 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     cmake pkgconfig libusb fftwSinglePrec
   ];
 
+  cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ];
+
   preConfigure = ''
     cd host
   '';

From a4647bc33fba969b8091b0772272414ba4ecac30 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 17:34:57 +0200
Subject: [PATCH 1481/3246] tlsdate: remove

Dead and does not build with openssl 1.1.
Debian has removed it, too.
---
 nixos/doc/manual/release-notes/rl-1709.xml    |   6 +
 nixos/modules/module-list.nix                 |   1 -
 .../modules/services/networking/tlsdated.nix  | 111 ------------------
 pkgs/tools/networking/tlsdate/default.nix     |  51 --------
 pkgs/top-level/all-packages.nix               |   2 -
 5 files changed, 6 insertions(+), 165 deletions(-)
 delete mode 100644 nixos/modules/services/networking/tlsdated.nix
 delete mode 100644 pkgs/tools/networking/tlsdate/default.nix

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 77ee9052fe5..14161532a16 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -130,6 +130,12 @@ rmdir /var/lib/ipfs/.ipfs
       instead. Refer to the description of the options for more details.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      <literal>tlsdate</literal> package and module were removed. This is due to the project
+      being dead and not building with openssl 1.1.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7dea5cb9da..f707f038dd7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -517,7 +517,6 @@
   ./services/networking/teamspeak3.nix
   ./services/networking/tinc.nix
   ./services/networking/tftpd.nix
-  ./services/networking/tlsdated.nix
   ./services/networking/tox-bootstrapd.nix
   ./services/networking/toxvpn.nix
   ./services/networking/tvheadend.nix
diff --git a/nixos/modules/services/networking/tlsdated.nix b/nixos/modules/services/networking/tlsdated.nix
deleted file mode 100644
index 757cce28760..00000000000
--- a/nixos/modules/services/networking/tlsdated.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  inherit (pkgs) coreutils tlsdate;
-
-  cfg = config.services.tlsdated;
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.tlsdated = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enable tlsdated daemon.
-        '';
-      };
-
-      extraOptions = mkOption {
-        type = types.string;
-        default = "";
-        description = ''
-          Additional command line arguments to pass to tlsdated.
-        '';
-      };
-
-      sources = mkOption {
-        type = types.listOf (types.submodule {
-          options = {
-            host = mkOption {
-              type = types.string;
-              description = ''
-                Remote hostname.
-              '';
-            };
-            port = mkOption {
-              type = types.int;
-              description = ''
-                Remote port.
-              '';
-            };
-            proxy = mkOption {
-              type = types.nullOr types.string;
-              default = null;
-              description = ''
-                The proxy argument expects HTTP, SOCKS4A or SOCKS5 formatted as followed:
-
-                 http://127.0.0.1:8118
-                 socks4a://127.0.0.1:9050
-                 socks5://127.0.0.1:9050
-
-                The proxy support should not leak DNS requests and is suitable for use with Tor.
-              '';
-            };
-          };
-        });
-        default = [
-          {
-            host = "encrypted.google.com";
-            port = 443;
-            proxy = null;
-          }
-        ];
-        description = ''
-          You can list one or more sources to fetch time from.
-        '';
-      };
-
-    };
-
-  };
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    # Make tools such as tlsdate available in the system path
-    environment.systemPackages = [ tlsdate ];
-
-    systemd.services.tlsdated = {
-      description = "tlsdated daemon";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        # XXX because pkgs.tlsdate is compiled to run as nobody:nogroup, we
-        # hard-code base-path to /tmp and use PrivateTmp.
-        ExecStart = "${tlsdate}/bin/tlsdated -f ${pkgs.writeText "tlsdated.confg" ''
-          base-path /tmp
-
-          ${concatMapStrings (src: ''
-          source
-              host    ${src.host}
-              port    ${toString src.port}
-              proxy   ${if src.proxy == null then "none" else src.proxy}
-          end
-          '') cfg.sources}
-        ''} ${cfg.extraOptions}";
-        PrivateTmp = "yes";
-      };
-    };
-
-  };
-
-}
diff --git a/pkgs/tools/networking/tlsdate/default.nix b/pkgs/tools/networking/tlsdate/default.nix
deleted file mode 100644
index efea10eaa4d..00000000000
--- a/pkgs/tools/networking/tlsdate/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchpatch
-, autoconf
-, automake
-, libevent
-, libtool
-, pkgconfig
-, openssl
-}:
-
-stdenv.mkDerivation rec {
-  version = "0.0.13";
-  name = "tlsdate-${version}";
-
-  src = fetchFromGitHub {
-    owner = "ioerror";
-    repo = "tlsdate";
-    rev = name;
-    sha256 = "0w3v63qmbhpqlxjsvf4k3zp90k6mdzi8cdpgshan9iphy1f44xgl";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "tlsdate-no_sslv3.patch";
-      url = "https://github.com/ioerror/tlsdate/commit/f9d3cba7536d1679e98172ccbddad32bc9ae490c.patch";
-      sha256 = "0prv46vxvb4paxaswmc6ix0kd5sp0552i5msdldnhg9fysbac8s0";
-    })
-  ];
-
-  buildInputs = [
-    autoconf
-    automake
-    libevent
-    libtool
-    pkgconfig
-    openssl
-  ];
-
-  preConfigure = ''
-    export COMPILE_DATE=0
-    ./autogen.sh
-  '';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "Secure parasitic rdate replacement";
-    homepage = https://github.com/ioerror/tlsdate;
-    maintainers = with maintainers; [ tv fpletz ];
-    platforms = platforms.allBut platforms.darwin;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e7ebedbc13..afacaba3e25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4476,8 +4476,6 @@ with pkgs;
 
   tiny8086 = callPackage ../applications/virtualization/8086tiny { };
 
-  tlsdate = callPackage ../tools/networking/tlsdate { };
-
   tldr = callPackage ../tools/misc/tldr { };
 
   tlspool = callPackage ../tools/networking/tlspool { };

From dc13376ee2849e0802b6e10c1e568a803d9bd5b5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 23:38:48 +0200
Subject: [PATCH 1482/3246] wvdial: remove

---
 nixos/doc/manual/release-notes/rl-1709.xml |  6 ++
 nixos/modules/module-list.nix              |  1 -
 nixos/modules/programs/wvdial.nix          | 71 ----------------------
 pkgs/os-specific/linux/wvdial/default.nix  | 29 ---------
 pkgs/top-level/all-packages.nix            |  2 -
 5 files changed, 6 insertions(+), 103 deletions(-)
 delete mode 100644 nixos/modules/programs/wvdial.nix
 delete mode 100644 pkgs/os-specific/linux/wvdial/default.nix

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 14161532a16..9cf86ac29bd 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -136,6 +136,12 @@ rmdir /var/lib/ipfs/.ipfs
       being dead and not building with openssl 1.1.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      <literal>wvdial</literal> package and module were removed. This is due to the project
+      being dead and not building with openssl 1.1.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f707f038dd7..6062bf623e7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -105,7 +105,6 @@
   ./programs/venus.nix
   ./programs/vim.nix
   ./programs/wireshark.nix
-  ./programs/wvdial.nix
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
   ./programs/zsh/oh-my-zsh.nix
diff --git a/nixos/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix
deleted file mode 100644
index 1ed929ed4af..00000000000
--- a/nixos/modules/programs/wvdial.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-# Global configuration for wvdial.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  configFile = ''
-    [Dialer Defaults]
-    PPPD PATH = ${pkgs.ppp}/sbin/pppd
-    ${config.environment.wvdial.dialerDefaults}
-  '';
-
-  cfg = config.environment.wvdial;
-
-in
-{
-  ###### interface
-
-  options = {
-
-    environment.wvdial = {
-
-      dialerDefaults = mkOption {
-        default = "";
-        type = types.str;
-        example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"'';
-        description = ''
-          Contents of the "Dialer Defaults" section of
-          <filename>/etc/wvdial.conf</filename>.
-        '';
-      };
-
-      pppDefaults = mkOption {
-        default = ''
-          noipdefault
-          usepeerdns
-          defaultroute
-          persist
-          noauth
-        '';
-        type = types.str;
-        description = "Default ppp settings for wvdial.";
-      };
-
-    };
-
-  };
-
-  ###### implementation
-
-  config = mkIf (cfg.dialerDefaults != "") {
-
-    environment = {
-
-      etc =
-      [
-        { source = pkgs.writeText "wvdial.conf" configFile;
-          target = "wvdial.conf";
-        }
-        { source = pkgs.writeText "wvdial" cfg.pppDefaults;
-          target = "ppp/peers/wvdial";
-        }
-      ];
-
-    };
-
-  };
-
-}
diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix
deleted file mode 100644
index 7decd42b376..00000000000
--- a/pkgs/os-specific/linux/wvdial/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, wvstreams, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "wvdial-1.61";
-
-  src = fetchurl {
-    url = "http://wvstreams.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg";
-  };
-
-  buildInputs = [ wvstreams pkgconfig ];
-
-  preConfigure = ''
-    find -type f | xargs sed -i 's@/bin/bash@bash@g'
-    export makeFlags="prefix=$out"
-    # not sure about this line
-    sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in
-
-    sed -e '1i#include <unistd.h>' -i $(find . -name '*.cc')
-  '';
-
-  meta = {
-    description = "A dialer that automatically recognises the modem";
-    homepage = http://alumnit.ca/wiki/index.php?page=WvDial;
-    license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afacaba3e25..6136e12a12a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14254,8 +14254,6 @@ with pkgs;
   wireshark-qt = wireshark-cli.override { withQt = true; };
   wireshark = wireshark-qt;
 
-  wvdial = callPackage ../os-specific/linux/wvdial { };
-
   fbida = callPackage ../applications/graphics/fbida { };
 
   fdupes = callPackage ../tools/misc/fdupes { };

From 011a46eba68dbe71b4d41f592e473dea3b4ebc74 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 19 Jul 2017 19:01:13 +0200
Subject: [PATCH 1483/3246] qlcplus: init at 4.11.0

---
 pkgs/applications/misc/qlcplus/default.nix | 38 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/qlcplus/default.nix

diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
new file mode 100644
index 00000000000..0cd85f5e93a
--- /dev/null
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev
+, qtmultimedia, qtscript, alsaLib, ola, libftdi, libusb
+, libsndfile, libmad
+}:
+
+mkDerivation rec {
+  name = "qlcplus-${version}";
+  version = "4.11.0";
+
+  src = fetchFromGitHub {
+    owner = "mcallegari";
+    repo = "qlcplus";
+    rev = "QLC+_${version}";
+    sha256 = "0a45ww341yjx9k54j5s8b5wj83rgbwxkdvgy0v5jbbdf9m78ifrg";
+  };
+
+  nativeBuildInputs = [ qmake pkgconfig ];
+  buildInputs = [
+    udev qtmultimedia qtscript alsaLib ola libftdi libusb libsndfile libmad
+  ];
+
+  qmakeFlags = [ "INSTALLROOT=$(out)" ];
+
+  postPatch = ''
+    patchShebangs .
+    sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \
+            -e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \
+            -e "s@/etc/udev/rules.d@''${out}/lib/udev@" \
+      variables.pri
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc.";
+    maintainers = [ maintainers.globin ];
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6136e12a12a..801a420cb35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3910,7 +3910,9 @@ with pkgs;
 
   qarte = callPackage ../applications/video/qarte { };
 
-  qnial = callPackage ../development/interpreters/qnial {};
+  qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
+
+  qnial = callPackage ../development/interpreters/qnial { };
 
   ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { };
 

From d0aca4cba1a3a31e5f7ef4af2453f9b7d953e5fd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 21 Jul 2017 17:23:50 +0200
Subject: [PATCH 1484/3246] qlcplus: needs libftdi1

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

diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index 0cd85f5e93a..60a8cf2c6cd 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev
-, qtmultimedia, qtscript, alsaLib, ola, libftdi, libusb
+, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb
 , libsndfile, libmad
 }:
 
@@ -16,7 +16,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [
-    udev qtmultimedia qtscript alsaLib ola libftdi libusb libsndfile libmad
+    udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad
   ];
 
   qmakeFlags = [ "INSTALLROOT=$(out)" ];

From 3d90c689cfa3a0d508c26659a86d8fca6ddbbc22 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 22 Jul 2017 19:42:26 +0200
Subject: [PATCH 1485/3246] synergy: add patch to build with openssl 1.1

---
 pkgs/applications/misc/synergy/default.nix     |  4 +++-
 .../misc/synergy/openssl-1.1.patch             | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/synergy/openssl-1.1.patch

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 6c02a51367e..89d493bcd01 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
 , xinput, curl, openssl, unzip }:
 
 with stdenv.lib;
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
   };
 
+  patches = [ ./openssl-1.1.patch ];
+
   postPatch = ''
     ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
     ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
diff --git a/pkgs/applications/misc/synergy/openssl-1.1.patch b/pkgs/applications/misc/synergy/openssl-1.1.patch
new file mode 100644
index 00000000000..56dc6112844
--- /dev/null
+++ b/pkgs/applications/misc/synergy/openssl-1.1.patch
@@ -0,0 +1,18 @@
+--- a/src/lib/net/SecureSocket.cpp	2017-07-22 19:33:22.442645291 +0200
++++ b/src/lib/net/SecureSocket.cpp	2017-07-22 19:36:25.632595581 +0200
+@@ -805,9 +805,14 @@
+ 		showCipherStackDesc(sStack);
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	// m_ssl->m_ssl->session->ciphers is not forward compatable, In future release
+-	// of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
++	// of OpenSSL, it's not visible
+ 	STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
++#else
++	// Use SSL_get_client_ciphers() for newer versions
++	STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
++#endif
+ 		if (cStack == NULL) {
+ 		LOG((CLOG_DEBUG1 "remote cipher list not available"));
+ 	}

From 17cef2c5f39e55e94048331e470f10d6f32a96cd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 5 May 2017 18:49:06 +0200
Subject: [PATCH 1486/3246] vanitygen: remove

unmaintained and doesn't build with openssl 1.1
---
 pkgs/applications/misc/vanitygen/default.nix | 39 --------------------
 pkgs/top-level/all-packages.nix              |  2 -
 2 files changed, 41 deletions(-)
 delete mode 100644 pkgs/applications/misc/vanitygen/default.nix

diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix
deleted file mode 100644
index 462b6d0e57b..00000000000
--- a/pkgs/applications/misc/vanitygen/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ fetchgit, stdenv, openssl, pcre }:
-
-stdenv.mkDerivation rec {
-  version = "0.21";
-  name = "vanitygen-${version}";
-
-  src = fetchgit {
-    url = "https://github.com/samr7/vanitygen";
-    rev = "refs/tags/${version}";
-    sha256  = "1vzfv74hhiyrrpvjca8paydx1ashgbgn5plzrx4swyzxy1xkamah";
-  };
-
-  buildInputs = [ openssl pcre ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp vanitygen $out/bin
-    cp keyconv $out/bin/vanitygen-keyconv
-  '';
-
-  meta = {
-      description = "Bitcoin vanity address generator";
-      longDescription= ''
-        Vanitygen can search for exact prefixes or regular expression
-        matches, so you can generate Bitcoin addresses that starts
-        with the needed mnemonic.
-
-        Vanitygen can generate regular bitcoin addresses, namecoin
-        addresses, and testnet addresses.
-
-        When searching for exact prefixes, vanitygen will ensure that
-        the prefix is possible, will provide a difficulty estimate,
-        and will run about 30% faster.
-      '';
-      homepage = https://github.com/samr7/vanitygen;
-      license = stdenv.lib.licenses.agpl3;
-      platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 801a420cb35..fb153423d31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16445,8 +16445,6 @@ with pkgs;
 
   utox = callPackage ../applications/networking/instant-messengers/utox { };
 
-  vanitygen = callPackage ../applications/misc/vanitygen { };
-
   vanubi = callPackage ../applications/editors/vanubi { };
 
   vbindiff = callPackage ../applications/editors/vbindiff { };

From 3f7d95982b56abdfe94d72d8b680ec67857d9c51 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 5 May 2017 18:44:36 +0200
Subject: [PATCH 1487/3246] gale: remove

unmaintained and doesn't build with openssl 1.1
---
 .../instant-messengers/gale/default.nix       |  31 --
 .../gale/gale-install.in.patch                | 339 ------------------
 pkgs/top-level/all-packages.nix               |   2 -
 3 files changed, 372 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/gale/default.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch

diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix
deleted file mode 100644
index 014ea093336..00000000000
--- a/pkgs/applications/networking/instant-messengers/gale/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, adns, boehmgc, openssl, automake, m4, autoconf
-, libtool, pkgconfig }:
-
-stdenv.mkDerivation {
-  name = "gale-1.1happy";
-
-  src = fetchFromGitHub {
-    owner = "grawity";
-    repo = "gale";
-    rev = "b34a67288e8bd6f0b51b60abb704858172a3665c";
-    sha256 = "19mcisxxqx70m059rqwv7wpmp94fgyckzjwywpmdqd7iwvppnsqf";
-  };
-
-  nativeBuildInputs = [ m4 libtool automake autoconf ];
-  buildInputs = [ boehmgc openssl adns pkgconfig ];
-
-  patches = [ ./gale-install.in.patch ];
-
-  preConfigure = ''
-    substituteInPlace configure.ac --replace \$\{sysconfdir\} /etc
-    ./bootstrap
-  '';
-  configureArgs = [ "--sysconfdir=/etc" ];
-
-  meta = with stdenv.lib; {
-    homepage = http://gale.org/;
-    description = "Chat/messaging system (server and client)";
-    platforms = platforms.all;
-    license = licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
deleted file mode 100644
index 33e3e09a96d..00000000000
--- a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-diff --git a/gale-install.in b/gale-install.in
-index 50e8ad8..eec0ed2 100644
---- a/gale-install.in
-+++ b/gale-install.in
-@@ -29,22 +29,78 @@ testkey_stdin() {
- 	gkinfo -x 2>/dev/null | qgrep "^Public key: <$1>"
- }
- 
--if [ -n "$GALE_SYS_DIR" ]; then
--	SYS_DIR="$GALE_SYS_DIR"
--elif [ -n "$sysconfdir" ]; then
--	SYS_DIR="$sysconfdir/gale"
-+INST_SYS_DIR="$sysconfdir/gale"
-+
-+if [ `id -u` -eq 0 ]; then
-+	is_root=yes
-+	SYS_DIR=/etc/gale
-+else
-+	is_root=no
-+	SYS_DIR="$HOME/.gale"
-+fi
-+
-+if [ -f /etc/NIXOS ]; then
-+	is_nixos=yes
-+else
-+	is_nixos=no
-+fi
-+
-+if [ -u /run/wrappers/bin/gksign ]; then
-+	cat <<EOM
-+
-+Gale appears to have already been set up via the NixOS module system (check
-+/etc/nixos/configuration.nix).
-+
-+EOM
-+
-+	exit 0
-+fi
-+
-+if [ $is_root = yes ]; then
-+	cat <<EOM
-+
-+You are running gale-install as root, so I'm going to assume you want to set up
-+Gale for system-wide use.  Unfortunately, Gale expects to be able to run the
-+"gksign" program via setuid, and we can't change gksign's permissions once it's
-+already been installed because the Nix store is immutable by design.
-+
-+EOM
-+
-+	if [ $is_nixos = no ]; then
-+		cat <<EOM
-+
-+This isn't a NixOS system.  Gale can only be installed for a single user on
-+non-NixOS systems.  If you want a system-wide installation, you'll have to
-+install Gale the old-fashioned way.  Sorry.
-+
-+EOM
-+
-+		exit 1
-+	fi
-+	cat <<EOM
-+
-+This script will generate a domain key for you, and after you get it signed, you
-+can finish the setup process by configuring Gale via the NixOS module system
-+(i.e. /etc/nixos/configuration.nix).
-+
-+EOM
-+
- else
--	echo "Error: cannot locate Gale system configuration directory."
--	exit 1
-+	cat <<EOM
-+
-+Hi.  You are running gale-install as a normal user, so I'm going to assume you
-+want to set up Gale for your own (i.e. non-system-wide) use.
-+
-+EOM
-+
- fi
- 
--CONF="$SYS_DIR/conf"
- umask 022
--PATH="$bindir:$sbindir:$PATH:/usr/ucb"
-+PATH="$bindir:$sbindir:$PATH"
- export PATH
- 
--if [ -f "$CONF" ]; then
--	exec 3<"$CONF"
-+if [ -n "$SYS_DIR" ] && [ -f "$SYS_DIR/conf" ]; then
-+	exec 3<"$SYS_DIR/conf"
- 
- 	while read var value <&3 ; do
- 		case "$var" in
-@@ -58,52 +114,14 @@ if [ -f "$CONF" ]; then
- 	exec 3<&-
- fi
- 
--USER="`whoami`"
--if [ -z "$USER" ]; then
--	echo "Error: cannot determine your username."
--	exit 1
--fi
--
--# -----------------------------------------------------------------------------
--# check directory structure
--
--if [ ! -d "$SYS_DIR" ]; then
--	echo "Error: Invalid SYS_DIR: \"$SYS_DIR\"."
--	exit 1
--fi
--
- # -----------------------------------------------------------------------------
--# get settings for important variables: user, domain, server
-+# get settings for important variables: domain, server
- 
--[ -n "$CONF_GALE_USER" ] && GALE_USER="$CONF_GALE_USER"
- [ -n "$CONF_GALE_DOMAIN" ] && GALE_DOMAIN="$CONF_GALE_DOMAIN"
- [ -n "$CONF_GALE_SERVER" ] && GALE_SERVER="$CONF_GALE_SERVER"
- 
--if [ -z "$GALE_USER" ]; then
--cat << EOM
--
--Hi.  You need to denote a user to own the Gale domain secret key.  You must
--trust this user with Gale authentication for your domain; the "gksign" program
--will run as this user.  I recommend using a special "gale" user; if you don't
--have administrative privileges here, you'll probably have to use your own
--account.  I do not recommend the use of "root".
--
--No harm done if you stop this script now to set up such a user.
--
--EOM
--
--	printf "Enter the Gale username: "
--	read GALE_USER
--	if [ -z "$GALE_USER" ]; then
--		echo "Error: Invalid username or no home dir: \"$GALE_USER\"."
--		exit 1
--	fi
--else
--	echo "Using \"$GALE_USER\" as the Gale owner."
--fi
--
- if [ -z "$GALE_DOMAIN" ] ; then
--cat << EOM
-+	cat << EOM
- 
- You need to identify the name of your Gale domain for two purposes:
- 
-@@ -140,97 +158,56 @@ else
- fi
- 
- # -----------------------------------------------------------------------------
--# create configuration file
--
--if [ ! -f "$CONF" ]; then
--cat > "$CONF" <<EOM
--# $CONF -- created by Gale installer; edit to suit.
--EOM
-+# create configuration file (if this is a single-user setup)
-+
-+if [ $is_root = no ]; then
-+	CONF="$SYS_DIR/conf"
-+
-+	if [ ! -d "$SYS_DIR" ]; then
-+		run mkdir -m 0700 -p "$SYS_DIR"
-+		run mkdir -m 0700 -p "$SYS_DIR/auth"
-+		run mkdir -m 0755 -p "$SYS_DIR/auth/trusted"
-+		run cp -f "$INST_SYS_DIR/auth/trusted/ROOT" "$SYS_DIR/auth/trusted"
-+		run mkdir -m 0700 -p "$SYS_DIR/auth/private"
-+		run mkdir -p "$SYS_DIR/auth/local" "$SYS_DIR/auth/cache"
-+	fi
- 
--cat <<EOM
-+	if [ ! -f "$CONF" ]; then
-+		cat <<EOM
- 
- *** Creating "$CONF".
- Examine and edit this file to your taste and local needs.
- If you want to recreate it from scratch, remove it and re-run this.
--EOM
--fi
--
--[ -n "$CONF_GALE_USER" ] || cat >> "$CONF" <<EOM
- 
--# The user who owns the domain secret key.  (Used in installation and upgrade)
--GALE_USER $GALE_USER
- EOM
- 
--[ -n "$CONF_GALE_DOMAIN" ] || cat >> "$CONF" << EOM
-+		cat > "$CONF" <<EOF
-+# $CONF -- created by Gale installer; edit to suit.
- 
- # The authentication domain to use.  (Mandatory)
- GALE_DOMAIN $GALE_DOMAIN
--EOM
--
--# -----------------------------------------------------------------------------
--# make gksign setuid
-+EOF
- 
--gksign="$sbindir/gksign"
--readlink="`which readlink 2>/dev/null`"
--[ -x "$readlink" ] && gksignlink="`"$readlink" "$gksign" 2>/dev/null`"
--[ -f "$gksignlink" ] && gksign="$gksignlink"
--
--echo ""
--if copy chown "$GALE_USER" "$gksign" ; then
--	:
--else
--	echo "*** We need to chown $GALE_USER '$gksign'."
--	echo "    Please run this script as a user that can do so,"
--	echo "    or do so yourself and re-run this script."
--	exit 1
-+	fi
- fi
--run chmod 4755 "$gksign"
- 
--# -----------------------------------------------------------------------------
--# create a domain, if necessary
-+if [ $is_root = no ]; then
-+	GALE_SYS_DIR="$SYS_DIR"
-+	export GALE_SYS_DIR
- 
--echo ""
--if test -u "$gksign" || copy chmod u+s "$gksign" ; then
--	:
-+	testkey "$GALE_DOMAIN" && exit 0
-+	echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"."
-+	GALE="$SYS_DIR"
- else
--	echo "*** We need to chmod u+s '$gksign'."
--	echo "    Please run this script as a user that can do so,"
--	echo "    or do so yourself and re-run this script."
--	exit 1
--fi
--
--testkey "$GALE_DOMAIN" && exit 0
--echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"."
--
--if [ "x$GALE_USER" != "x$USER" ]; then
--cat <<EOM
--Become user "$GALE_USER" (you are now "$USER") and run this script again
--to create a new domain; contact your domain administrator if you wish to 
--become part of an existing domain.
--EOM
--	exit 1
--fi
--
--if [ -z "$HOME" ]; then
--	cd
--	HOME="`pwd`"
--	echo "Warning: \$HOME not set, assuming \"$HOME\"."
--fi
--
--GALE="$HOME/.gale"
--mkdir -p "$GALE"
--if [ ! -w "$GALE" ]; then
--	echo "Error: Cannot create \"$GALE\"."
--	exit 1
-+	GALE="`pwd`"
- fi
- 
- unsigned="$GALE/$GALE_DOMAIN.unsigned"
- signer="`echo "$GALE_DOMAIN" | sed 's%^[^.@:/]*[.@:/]%%'`"
- [ -z "$signer" ] && signer="ROOT"
- 
--if [ -f "$unsigned" ]; then
--
--cat << EOM
-+if [ $is_root = no ] && [ -f "$unsigned" ]; then
-+	cat << EOM
- 
- Okay, so we've already been here.  Last time, I created the file
- "$unsigned" for you to have signed.
-@@ -275,16 +252,12 @@ EOM
- 		exit 1
- 	fi
- 
--cat << EOM
--
--The domain should be properly configured now.  Assuming users can access a
--version of "gksign" setuid to "$GALE_USER" (this user), they should be
--able to start running clients and generating IDs for themselves.
-+	cat << EOM
- 
--The installation process is complete!
-+The domain should be properly configured now.  The installation process is
-+complete!
- 
- EOM
--
- 	exit 0
- fi
- 
-@@ -300,7 +273,10 @@ printf "Enter the description: "
- read descr
- 
- echo "We will generate the key now.  Have patience."
--gkgen -r "$GALE/auth/private/$GALE_DOMAIN.gpri" \
-+if [ $is_root = no ]; then
-+	install_gpri=auth/private/
-+fi
-+gkgen -r "$GALE/${install_gpri}$GALE_DOMAIN.gpri" \
-       -u "$unsigned" "$GALE_DOMAIN" /"$descr" || exit 1
- 
- cat << EOM
-@@ -311,8 +284,29 @@ the owner of the "$signer" domain through appropriate means.
- Take care to preseve the file's binary data; you may need to uuencode it.
- 
- Assuming they trust you with your subdomain, they should pass the key through
--"gksign" as a filter, returning the signed output to you.  When you have this
--signed key file available, re-run this script, and we will move on to the
--next step.
-+"gksign" as a filter, returning the signed output to you.
-+
-+EOM
-+
-+if [ $is_nixos = yes ]; then
-+	cat <<EOM
-+
-+When you have this signed key file available, you can finish the setup process
-+by placing the private key and signed public key in a directory (they will be
-+copied) and setting "services.gale.keyPath" in /etc/nixos/configuration.nix.
- 
- EOM
-+else
-+	cat <<EOM
-+
-+When you have this signed key file available, re-run this script, and we will
-+move on to the next step.
-+
-+*** IMPORTANT ***
-+You must set GALE_SYS_DIR="$GALE_SYS_DIR" in your environment before re-running
-+this script and before running any Gale programs once setup is finished!  Make
-+sure to set it now, and consider setting it via your shell initialization files
-+so that you don't forget to do it next login.
-+
-+EOM
-+fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb153423d31..44760e4bd77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18629,8 +18629,6 @@ with pkgs;
 
   gajim = callPackage ../applications/networking/instant-messengers/gajim { };
 
-  gale = callPackage ../applications/networking/instant-messengers/gale { };
-
   gammu = callPackage ../applications/misc/gammu { };
 
   gensgs = callPackage_i686 ../misc/emulators/gens-gs { };

From c7e74ff726c4231d9b82de0f7b396450571238d6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 May 2017 17:36:50 +0200
Subject: [PATCH 1488/3246] bip: add upstream patch to build with openssl 1.1

---
 .../networking/irc/bip/default.nix            | 40 ++++++++-----------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix
index e391f0074c5..a79df085e6b 100644
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@@ -1,45 +1,37 @@
-{ stdenv, fetchurl, bison, flex, autoconf, automake, openssl }:
+{ stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }:
 
-let
-
-  version = "0.8.9";
-  sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w";
-
-  # fetches patches from a gentoo mirror
-  fetchPatch =
-    { file, sha256 }:
-    fetchurl {
-      url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/${file}";
-      inherit sha256;
-    };
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "bip-${version}";
+  version = "0.8.9";
 
   # fetch sources from debian, because the creator's website provides
   # the files only via https but with an untrusted certificate.
   src = fetchurl {
     url = "mirror://debian/pool/main/b/bip/bip_${version}.orig.tar.gz";
-    inherit sha256;
+    sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w";
   };
 
+  buildInputs = [ bison flex autoconf automake openssl ];
+
   # includes an important security patch
-  patches = map fetchPatch [
-    { file = "bip-freenode.patch";
-      sha256 = "a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f";
-    }
+  patches = [
+    (fetchpatch {
+      url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/bip-freenode.patch";
+      sha256 = "05qy7a62p16f5knrsdv2lkhc07al18qq32ciq3k4r0lq1wbahj2y";
+    })
+    (fetchpatch {
+      url = "https://projects.duckcorp.org/projects/bip/repository/revisions/39414f8ff9df63c8bc2e4eee34f09f829a5bf8f5/diff/src/connection.c?format=diff";
+      sha256 = "1hvg58vci6invh0z19wf04jjvnm8w6f6v4c4nk1j5hc3ymxdp1rb";
+    })
   ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
 
-  buildInputs = [ bison flex autoconf automake openssl ];
-
   meta = {
     description = "An IRC proxy (bouncer)";
     homepage = http://bip.milkypond.org/;
     license = stdenv.lib.licenses.gpl2;
-    downloadPage= "https://projects.duckcorp.org/projects/bip/files";
-    inherit version;
+    downloadPage = "https://projects.duckcorp.org/projects/bip/files";
     platforms = stdenv.lib.platforms.linux;
   };
 }

From b703df2d4cc31325a180ecf7b778c5525e17544a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 29 Apr 2017 12:30:22 +0200
Subject: [PATCH 1489/3246] epic5: add patch for openssl 1.1

---
 pkgs/applications/networking/irc/epic5/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix
index 8b30f6391a0..0b52515228b 100644
--- a/pkgs/applications/networking/irc/epic5/default.nix
+++ b/pkgs/applications/networking/irc/epic5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils }:
+{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "epic5-${version}";
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ncurses ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv tcl ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/e/epic5/2.0.1-1/debian/patches/openssl-1.1.patch";
+      sha256 = "03bpsyv1sr5icajs2qkdvv8nnn6rz6yvvj7pgiq8gz9sbp6siyfv";
+    })
+  ];
+
   configureFlags = [ "--disable-debug" "--with-ipv6" ];
 
   postConfigure = ''

From b51528671451cabac8600c1b0f2ba8d929ed921c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 29 Jul 2017 00:22:06 +0200
Subject: [PATCH 1490/3246] eiskaltdcpp: 2.2.9 -> 2.2.10, add upstream openssl
 patches

---
 .../networking/p2p/eiskaltdcpp/default.nix    | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 6b6f66e24d0..8c7958ecaaa 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -1,15 +1,42 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qt4, boost, bzip2, libX11, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11
+, fetchpatch, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "eiskaltdcpp-2.2.9";
+  name = "eiskaltdcpp-${version}";
+  version = "2.2.10";
 
-  src = fetchurl {
-    url = "https://eiskaltdc.googlecode.com/files/${name}.tar.xz";
-    sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf";
+  src = fetchFromGitHub {
+    owner = "eiskaltdcpp";
+    repo = "eiskaltdcpp";
+    rev = "v${version}";
+    sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682";
   };
 
   buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b7b56bd7060b426b1f1bfded392ae6853644e2e.patch";
+      sha256 = "1rqjdsvirn3ks9w9qn893fb73mz84xm04wl13fvsvj8p42i5cjas";
+    })
+    (fetchpatch {
+      url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/bb9eb364a943fe2a67b3ea52ec6a3f9e911f07dc.patch";
+      sha256 = "1hjhf9a9j4z8v24g5qh5mcg3n0540lbn85y7kvxsh3khc5v3cywx";
+    })
+    (fetchpatch {
+      url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/ef4426f1f9a8255e335b0862234e6cc28befef5e.patch";
+      sha256 = "13j018c499n4b5as2n39ws64yj0cf4fskxbqab309vmnjkirxv6x";
+    })
+    (fetchpatch {
+      url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/a9c136c8707280d0eeb66be6b289d9718287c55c.patch";
+      sha256 = "0w8v4mbrzk7pmzc475ff96mzzwlh8a0p62kk7p829m5yqdwj4sc9";
+    })
+    (fetchpatch {
+      url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b9c502ff5c98856d4f8fdb7ed3c6ef34448bfb7.patch";
+      sha256 = "0fjwaq0wd9a164k5ysdjy89hx0ixnxc6q7cvyn1ba28snm0pgxb8";
+    })
+  ];
+
   cmakeFlags = ''
     -DUSE_ASPELL=ON
     -DUSE_QT_QML=ON

From c7864745bdc1fe7aeec3f3b61703d02a32a4d141 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Thu, 3 Aug 2017 19:29:26 -0400
Subject: [PATCH 1491/3246] glslviewer: init at 1.2

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

diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
new file mode 100644
index 00000000000..1cca6a096fe
--- /dev/null
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage,
+  libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi,
+  libX11, mesa_glu }:
+
+stdenv.mkDerivation rec {
+  name = "glslviewer-${version}";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "patriciogonzalezvivo";
+    repo = "glslViewer";
+    rev = version;
+    sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw";
+  };
+
+  # Makefile has /usr/local/bin hard-coded for 'make install'
+  preConfigure = ''
+    sed s,/usr/local,$out, -i Makefile
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+  
+  buildInputs = [ glfw mesa_glu pkgconfig glfw libXrandr libXdamage
+                  libXext libXrender libXinerama libXcursor libXxf86vm
+                  libXi libX11 ];
+  
+  meta = with stdenv.lib; {
+    description = "Live GLSL coding renderer";
+    homepage = http://patriciogonzalezvivo.com/2015/glslViewer/;
+    license = licenses.bsd3;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = [ maintainers.hodapp ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e7ebedbc13..a338405b76c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1051,6 +1051,8 @@ with pkgs;
 
   glock = callPackage ../development/tools/glock { };
 
+  glslviewer = callPackage ../development/tools/glslviewer { };
+  
   gmic = callPackage ../tools/graphics/gmic { };
 
   goa = callPackage ../development/tools/goa { };

From 7fa034de560aed5526af74f493107e694843772c Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <remygoldschmidt@awakenetworks.com>
Date: Thu, 3 Aug 2017 14:42:08 -0700
Subject: [PATCH 1492/3246] Improved nixos-option manpage

---
 nixos/doc/manual/man-nixos-option.xml | 48 +++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index 6be8bc780f1..d2b2d5b7965 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -17,11 +17,16 @@
 <refsynopsisdiv>
   <cmdsynopsis>
     <command>nixos-option</command>
-    <arg choice='plain'><replaceable>option.name</replaceable></arg>
+    <arg>
+      <option>-I</option>
+      <replaceable>path</replaceable>
+    </arg>
+    <arg><option>--verbose</option></arg>
+    <arg><option>--xml</option></arg>
+    <arg choice="plain"><replaceable>option.name</replaceable></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
-
 <refsection><title>Description</title>
 
 <para>This command evaluates the configuration specified in
@@ -33,6 +38,45 @@ attributes contained in the attribute set.</para>
 
 </refsection>
 
+<refsection><title>Options</title>
+
+<para>This command accepts the following options:</para>
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>-I</option> <replaceable>path</replaceable></term>
+    <listitem>
+      <para>
+        This option is passed to the underlying
+        <command>nix-instantiate</command> invocation.
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--verbose</option></term>
+    <listitem>
+      <para>
+        This option enables verbose mode, which currently is just
+        the Bash <command>set</command> <option>-x</option> debug mode.
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--xml</option></term>
+    <listitem>
+      <para>
+        This option causes the output to be rendered as XML.
+      </para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</refsection>
+
 <refsection><title>Environment</title>
 
 <variablelist>

From a37dd362b6116fc8e9622e927d2fec41e950f1b9 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 3 Aug 2017 02:31:38 +0200
Subject: [PATCH 1493/3246] python2-pythondialog: fix --replace on
 substituteInPlace

---
 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 f0fd99d1774..df15a5c207d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10200,7 +10200,7 @@ in {
     };
 
     patchPhase = ''
-      substituteInPlace dialog.py ":/bin:/usr/bin" ":$out/bin"
+      substituteInPlace dialog.py --replace ":/bin:/usr/bin" ":$out/bin"
     '';
 
     meta = with stdenv.lib; {

From 14bd516fa683fdc14522187ea567323a276ea3cb Mon Sep 17 00:00:00 2001
From: Carter Charbonneau <zcarterc@gmail.com>
Date: Thu, 3 Aug 2017 13:01:27 -0600
Subject: [PATCH 1494/3246] xf86-video-intel: build intel-virtual-output

---
 pkgs/servers/x11/xorg/default.nix   | 1 -
 pkgs/servers/x11/xorg/overrides.nix | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index eb08986e702..7c052d8ef49 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1821,7 +1821,6 @@ let
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
     meta.platforms = stdenv.lib.platforms.unix;
-    configureFlags = "--with-default-dri=3";
   }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};
 
   xf86videomach64 = (mkDerivation "xf86videomach64" {
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 09f75b436da..8317bd7ce6f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -565,8 +565,9 @@ in
   };
 
   xf86videointel = attrs: attrs // {
-    buildInputs = attrs.buildInputs ++ [xorg.libXfixes];
+    buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman];
     nativeBuildInputs = [args.autoreconfHook xorg.utilmacros];
+    configureFlags = "--with-default-dri=3 --enable-tools";
   };
 
   xf86videoxgi = attrs: attrs // {

From 1b7ec57d065f1872e1e8de24726ee503c5e16507 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Thu, 3 Aug 2017 20:23:07 +0200
Subject: [PATCH 1495/3246] sqlite3_analyzer: 3.19.2 -> 3.20.0

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

diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
index e5fffc076f7..f6a96df3eb6 100644
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.19.2";
+  name = "sqlite3_analyzer-3.20.0";
 
   src = fetchurl {
-    url = "https://www.sqlite.org/2017/sqlite-src-3190200.zip";
-    sha256 = "1hdbs41mdyyy641gix87pllsd29p8dim7gj4qvmiyfra2q5kg749";
+    url = "https://www.sqlite.org/2017/sqlite-src-3200000.zip";
+    sha256 = "1vjbc5i95wildrdfzalrsgai1ziz4m4gbah4wm8qc4jxm1vqwdab";
   };
 
   nativeBuildInputs = [ unzip ];

From 2062c9355aebc9f246d8d49add5035463383774b Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Wed, 2 Aug 2017 21:09:34 -0700
Subject: [PATCH 1496/3246] zoom-us: update homepage

zoom.us uses HTTPS now.
---
 .../networking/instant-messengers/zoom-us/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index d77cf347e5a..1d3a5801760 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -92,7 +92,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://zoom.us;
+    homepage = https://zoom.us/;
     description = "zoom.us video conferencing application";
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;

From 57f9bfbd48a759676ba310f069124d63e7082e6c Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Wed, 2 Aug 2017 20:53:46 -0700
Subject: [PATCH 1497/3246] zoom-us: only support known platforms

This package does not work on arbitrary Linux systems, only on platforms
for which upstream has provided prebuilt binaries. Fortunately, we have
a list of the platforms we know how to get binaries for: it's exactly
the ones in the `srcs` set.
---
 .../networking/instant-messengers/zoom-us/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 1d3a5801760..aa34866b2af 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -95,7 +95,7 @@ in stdenv.mkDerivation {
     homepage = https://zoom.us/;
     description = "zoom.us video conferencing application";
     license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = builtins.attrNames srcs;
     maintainers = with stdenv.lib.maintainers; [ danbst ];
   };
 

From 3b289ec99672445a7face0e9d395bc3074eb5484 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Wed, 2 Aug 2017 21:07:19 -0700
Subject: [PATCH 1498/3246] zoom-us: use makeWrapper instead of wrapProgram

Since the program to be wrapped is already in a different path than
$out/bin, we don't need the complicated dance that wrapProgram uses to
put the wrapper in the same location as the original program. Just tell
makeWrapper to put the wrapper in the final desired output location
instead.
---
 .../networking/instant-messengers/zoom-us/default.nix          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index aa34866b2af..33ad9981b35 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -75,13 +75,12 @@ in stdenv.mkDerivation {
     #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about?
 
     # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it
-    wrapProgram $packagePath/zoom \
+    makeWrapper $packagePath/zoom $out/bin/zoom-us \
         --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \
         --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \
         --set QT_PLUGIN_PATH "$packagePath/platforms" \
         --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
         --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
-    ln -s "$packagePath/zoom" "$out/bin/zoom-us"
 
     cat > $packagePath/qt.conf <<EOF
     [Paths]

From de761128dad49a9148a102b6db527d12d4619463 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Wed, 2 Aug 2017 20:56:36 -0700
Subject: [PATCH 1499/3246] zoom-us: 2.0.91373.0502 -> 2.0.98253.0707

---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 33ad9981b35..91c77fc9d7c 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -4,11 +4,11 @@
 
 let
 
-  version = "2.0.91373.0502";
+  version = "2.0.98253.0707";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "0gcbfsvybkvnyklm82irgz19x3jl0hz9bwf2l9jga188057pfj7a";
+      sha256 = "1znw7459pzfl2jzmj9akfwq3z10sndfb1swdr1p3rrjpiwqh3p7r";
     };
   };
 

From 99be19c3c66639fb5a5ab7c177380c5fe55b3fec Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 3 Aug 2017 04:25:11 +0200
Subject: [PATCH 1500/3246] bashSnippets: 1.12.0 -> 1.17.3

---
 pkgs/applications/misc/bashSnippets/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix
index 542450080fe..acd5ae7dd73 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/pkgs/applications/misc/bashSnippets/default.nix
@@ -1,10 +1,9 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper
-, curl, netcat, mpv, python, bind, iproute, bc, gitMinimal }:
+, curl, netcat, python, bind, iproute, bc, gitMinimal }:
 let
-  version = "1.12.0";
+  version = "1.17.3";
   deps = lib.makeBinPath [
     curl
-    mpv
     python
     bind.dnsutils
     iproute
@@ -19,7 +18,7 @@ stdenv.mkDerivation {
     owner = "alexanderepstein";
     repo = "Bash-Snippets";
     rev = "v${version}";
-    sha256 = "0kx2a8z3jbmmardw9z8fpghbw5mrbz4knb3wdihq35iarcbrddrg";
+    sha256 = "1xdjk8bjh7l6h7gdqrra1dh4wdq89wmd0jsirsvqa3bmcsb2wz1r";
   };
 
   buildInputs = [ makeWrapper ];
@@ -32,7 +31,7 @@ stdenv.mkDerivation {
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p "$out"/bin "$out"/man/man1
+    mkdir -p "$out"/bin "$out"/share/man/man1
     ./install.sh all
     for file in "$out"/bin/*; do
       wrapProgram "$file" --prefix PATH : "${deps}"

From b794459727278a3a67a06dfc7736c7560bbb4dd6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 21:09:52 +0200
Subject: [PATCH 1501/3246] ldcpp: remove, old and abandoned

Latest release from 2011 and needs patching to build with openssl 1.1.
---
 .../networking/p2p/ldcpp/default.nix          | 29 -------------------
 pkgs/top-level/all-packages.nix               |  4 ---
 2 files changed, 33 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/ldcpp/default.nix

diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix
deleted file mode 100644
index b540ffd0967..00000000000
--- a/pkgs/applications/networking/p2p/ldcpp/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, scons, pkgconfig, gtk2, bzip2, libglade, openssl
-, libX11, boost, zlib, libnotify }:
-
-stdenv.mkDerivation rec {
-  name = "ldcpp-1.1.0";
-  src = fetchurl {
-    url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2;
-    sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6";
-  };
-  buildInputs = [ scons pkgconfig gtk2 bzip2 libglade openssl libX11 boost libnotify ];
-
-  installPhase = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
-
-    touch gettext xgettext msgfmt msgcat
-    chmod +x gettext xgettext msgfmt msgcat
-    export PATH=$PATH:$PWD
-
-    mkdir -p $out
-    scons PREFIX=$out
-    scons PREFIX=$out install
-  '';
-
-  meta = {
-    description = "Direct Connect client";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44760e4bd77..98e5bdaa359 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14975,10 +14975,6 @@ with pkgs;
 
   lci = callPackage ../applications/science/logic/lci {};
 
-  ldcpp = callPackage ../applications/networking/p2p/ldcpp {
-    inherit (gnome2) libglade;
-  };
-
   lemonbar = callPackage ../applications/window-managers/lemonbar { };
 
   lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };

From c1ca5acf191ac514578570b3d09f103cc82c7ee5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 26 Jul 2017 22:02:45 +0200
Subject: [PATCH 1502/3246] retroshare: 0.5.5c -> 0.6.2

---
 .../networking/p2p/retroshare/0.6.nix         | 62 -------------------
 .../networking/p2p/retroshare/default.nix     | 46 +++++++-------
 pkgs/top-level/all-packages.nix               |  5 +-
 3 files changed, 27 insertions(+), 86 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/retroshare/0.6.nix

diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix
deleted file mode 100644
index 4b881445323..00000000000
--- a/pkgs/applications/networking/p2p/retroshare/0.6.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
-, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }:
-
-stdenv.mkDerivation {
-  name = "retroshare-0.6-git-fabc3a3";
-
-  src = fetchFromGitHub {
-    owner = "RetroShare";
-    repo = "RetroShare";
-    rev = "fabc3a398536565efe77fb1b1ef37bd484dc7d4a";
-    sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x";
-  };
-
-  NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ];
-
-  patchPhase = ''
-    # Fix build error
-    sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \
-      libretroshare/src/upnp/UPnPBase.cpp
-    # Extensions get installed 
-    sed -i "s,/usr/lib/retroshare/extensions6/,$out/share/retroshare," \
-      libretroshare/src/rsserver/rsinit.cc
-    # Where to find the bootstrap DHT bdboot.txt
-    sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \
-      libretroshare/src/rsserver/rsaccounts.cc
-  '';
-
-  #  sed -i "s,LIBS +=.*sqlcipher.*,LIBS += -lsqlcipher," \
-  #    retroshare-gui/src/retroshare-gui.pro \
-  #    retroshare-nogui/src/retroshare-nogui.pro
-
-  buildInputs = [ speex qt4 libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig qmake4Hook
-                  protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ];
-
-  preConfigure = ''
-    qmakeFlags="$qmakeFlags DESTDIR=$out"
-  '';
-
-  # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory
-  enableParallelBuilding = false;
-
-  postInstall = ''
-    mkdir -p $out/bin
-    mv $out/retroshare-nogui $out/bin
-    mv $out/RetroShare $out/bin
-
-    # plugins
-    mkdir -p $out/share/retroshare
-    mv $out/lib* $out/share/retroshare
-
-    # BT DHT bootstrap
-    cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare
-  '';
-
-  meta = with stdenv.lib; {
-    description = "";
-    homepage = http://retroshare.sourceforge.net/;
-    #license = licenses.bsd2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.domenkozar ];
-  };
-}
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index cb6dad20ce0..0d7a41735ea 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -1,40 +1,44 @@
-{ stdenv, fetchurl, cmake, qt4, qmake4Hook, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
-, libXScrnSaver, speex, curl, libxml2, libxslt }:
+{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
+, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg
+, qtmultimedia, qtx11extras, qttools }:
 
-stdenv.mkDerivation {
-  name = "retroshare-0.5.5c";
+stdenv.mkDerivation rec {
+  name = "retroshare-${version}";
+  version = "0.6.2";
 
-  src = fetchurl {
-    url = mirror://sourceforge/project/retroshare/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz;
-    sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp";
+  src = fetchFromGitHub {
+    owner = "RetroShare";
+    repo = "RetroShare";
+    rev = "v${version}";
+    sha256 = "0hly2x87wdvqzzwf3wjzi7092bj8fk4xs6302rkm8gp9bkkmiiw8";
   };
 
-  NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" ];
+  # NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ];
 
   patchPhase = ''
+    # Fix build error
     sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \
       libretroshare/src/upnp/UPnPBase.cpp
-    # Extensions get installed 
-    sed -i "s,/usr/lib/retroshare/extensions/,$out/share/retroshare," \
-      libretroshare/src/rsserver/rsinit.cc
-    # For bdboot.txt
-    sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \
-      libretroshare/src/rsserver/rsinit.cc
   '';
 
-  buildInputs = [ speex qt4 qmake4Hook libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig
-                  protobuf bzip2 libXScrnSaver curl libxml2 libxslt ];
-
-  sourceRoot = "retroshare-0.5.5/src";
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [
+    speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools
+    protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg
+  ];
 
   preConfigure = ''
     qmakeFlags="$qmakeFlags DESTDIR=$out"
   '';
 
+  # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory
+  enableParallelBuilding = false;
+
   postInstall = ''
     mkdir -p $out/bin
-    mv $out/retroshare-nogui $out/bin
-    mv $out/RetroShare $out/bin
+    mv $out/RetroShare06-nogui $out/bin/RetroShare-nogui
+    mv $out/RetroShare06 $out/bin/Retroshare
+    ln -s $out/bin/RetroShare-nogui $out/bin/retroshare-nogui
 
     # plugins
     mkdir -p $out/share/retroshare
@@ -47,7 +51,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "";
     homepage = http://retroshare.sourceforge.net/;
-    #license = licenses.bsd2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.domenkozar ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98e5bdaa359..2f17916f5b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15898,9 +15898,8 @@ with pkgs;
 
   remotebox = callPackage ../applications/virtualization/remotebox { };
 
-  retroshare = callPackage ../applications/networking/p2p/retroshare { };
-
-  retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { });
+  retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
+  retroshare06 = retroshare;
 
   ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { };
 

From 82d4963ab5ff7f1975a8e0ca1070a14505face14 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 5 May 2017 18:52:05 +0200
Subject: [PATCH 1503/3246] umurmur: 0.2.16a -> 0.2.17

fixes build with openssl 1.1.0
---
 pkgs/applications/networking/umurmur/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index 19a077d1589..550445f7306 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "umurmur-${version}";
-  version = "0.2.16a";
+  version = "0.2.17";
 
   src = fetchFromGitHub {
-    owner = "fatbob313";
+    owner = "umurmur";
     repo = "umurmur";
     rev = version;
-    sha256 = "1xv1knrivy2i0ggwrczw60y0ayww9df9k6sif7klgzq556xk47d1";
+    sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl";
   };
 
   buildInputs = [ autoreconfHook openssl protobufc libconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Minimalistic Murmur (Mumble server)";
     license = licenses.bsd3;
-    homepage = http://code.google.com/p/umurmur/;
+    homepage = https://github.com/umurmur/umurmur;
     platforms = platforms.all;
   };
 }

From 07106fb5084f3e3e9e5e3b7d3682a3ddbe245d7e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 25 Apr 2017 14:06:51 +0200
Subject: [PATCH 1504/3246] mpv: bump waf version to 1.9.8

The bootstrap.py file from mpv downloads this exact version.
---
 pkgs/applications/video/mpv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index d21a8ab6dcc..27ce61eec6d 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -73,11 +73,11 @@ assert drmSupport         -> available libdrm;
 let
   # Purity: Waf is normally downloaded by bootstrap.py, but
   # for purity reasons this behavior should be avoided.
-  wafVersion = "1.8.12";
+  wafVersion = "1.9.8";
   waf = fetchurl {
     urls = [ "http://waf.io/waf-${wafVersion}"
              "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ];
-    sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1";
+    sha256 = "1gsd3zza1wixv2vhvq3inp4vb71i41a1kbwqnwixhnvdmcmw8z8n";
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";

From a97d46e727b0fa7ab1d8fa9b9db8f726bee1fd59 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 7 Jul 2017 00:07:01 +0200
Subject: [PATCH 1505/3246] aws-sdk-cpp: 1.0.153 -> 1.1.7

---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++--
 1 file 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 9f97b18b4d7..c52276ed7a7 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -14,13 +14,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.0.153";
+  version = "1.1.7";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "0mglg9a6klmsam8r9va7y5x2s8xylhljwcg93sr8152rvhxnjv08";
+    sha256 = "1wyhrh2y1c5nmrh4xmvpx9vlsj8bxw1idxq2jalswcdblh16mgnx";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

From 329eec441bcb92e22395d3493168b8f8ecba1148 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 26 Jul 2017 21:27:37 +0200
Subject: [PATCH 1506/3246] aws-sdk-cpp: 1.1.7 -> 1.1.18

---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++--
 1 file 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 c52276ed7a7..fe06bcfab6d 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -14,13 +14,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.1.7";
+  version = "1.1.18";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "1wyhrh2y1c5nmrh4xmvpx9vlsj8bxw1idxq2jalswcdblh16mgnx";
+    sha256 = "1i85zpns3gj5by45ppg4rfk9csix8mjazpyj6dqic40b2wshnw8c";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

From 7786767beafcf8d249b36976501d62f00c0cd354 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 29 Apr 2017 12:22:11 +0200
Subject: [PATCH 1507/3246] ccnx: remove

upstream has been replaced by another project, doesn't build with
openssl 1.1 and is not used elsewhere in nixpkgs

See https://github.com/ProjectCCNx/ccnx
---
 pkgs/development/libraries/ccnx/default.nix | 38 ---------------------
 pkgs/top-level/all-packages.nix             |  2 --
 2 files changed, 40 deletions(-)
 delete mode 100644 pkgs/development/libraries/ccnx/default.nix

diff --git a/pkgs/development/libraries/ccnx/default.nix b/pkgs/development/libraries/ccnx/default.nix
deleted file mode 100644
index 4634a80ade6..00000000000
--- a/pkgs/development/libraries/ccnx/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, openssl, expat, libpcap }:
-let
-  version = "0.8.2";
-in
-stdenv.mkDerivation {
-  name = "ccnx-${version}";
-  src = fetchurl {
-    url = "https://github.com/ProjectCCNx/ccnx/archive/ccnx-${version}.tar.gz";
-    sha256 = "1jyk7i8529821aassxbvzlxnvl5ly0na1qcn3v1jpxhdd0qqpg00";
-  };
-  buildInputs = [ openssl expat libpcap ];
-  preConfigure = ''
-    mkdir -p $out/include
-    mkdir -p $out/lib
-    mkdir -p $out/bin
-    substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh"
-  '';
-  meta = with stdenv.lib; {
-    homepage = http://www.ccnx.org/;
-    description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
-    longDescription = ''
-      To address the Internet’s modern-day requirements with a better
-      fitting model, PARC has created a new networking architecture
-      called Content-Centric Networking (CCN), which operates by addressing
-      and delivering Content Objects directly by Name instead of merely
-      addressing network end-points. In addition, the CCN security model
-      explicitly secures individual Content Objects rather than securing
-      the connection or “pipe”. Named and secured content resides in
-      distributed caches automatically populated on demand or selectively
-      pre-populated. When requested by name, CCN delivers named content to
-      the user from the nearest cache, thereby traversing fewer network hops,
-      eliminating redundant requests, and consuming less resources overall.
-    '';
-    license = licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ maintainers.sjmackenzie ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f17916f5b4..cc8b614f90b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7529,8 +7529,6 @@ with pkgs;
 
   capnproto = callPackage ../development/libraries/capnproto { };
 
-  ccnx = callPackage ../development/libraries/ccnx { };
-
   ndn-cxx = callPackage ../development/libraries/ndn-cxx { };
 
   cddlib = callPackage ../development/libraries/cddlib {};

From 750b78301c7a1b5f6c843f4be0fc377c345241f1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 29 Apr 2017 12:39:06 +0200
Subject: [PATCH 1508/3246] libexosip_3: remove unused, old version

---
 pkgs/development/libraries/exosip/3.x.nix | 18 ------------------
 pkgs/top-level/all-packages.nix           |  4 ----
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/exosip/3.x.nix

diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix
deleted file mode 100644
index aa55a7f0d1d..00000000000
--- a/pkgs/development/libraries/exosip/3.x.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, libosip, openssl, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  version = "3.6.0";
-  src = fetchurl {
-    url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz";
-    sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli";
-  };
-  name = "libexosip2-${version}";
-
-  buildInputs = [ libosip openssl pkgconfig ];
-      
-  meta = {
-    license = stdenv.lib.licenses.gpl2Plus;
-    description = "Library that hides the complexity of using the SIP protocol";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc8b614f90b..f1f86cbf83d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8759,10 +8759,6 @@ with pkgs;
 
   libexosip = callPackage ../development/libraries/exosip {};
 
-  libexosip_3 = callPackage ../development/libraries/exosip/3.x.nix {
-    libosip = libosip_3;
-  };
-
   libextractor = callPackage ../development/libraries/libextractor {
     libmpeg2 = mpeg2dec;
   };

From a8e4f34f40711dabcb20da032058901014e79bb6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Aug 2017 04:20:44 +0200
Subject: [PATCH 1509/3246] indicator-application: fix substituteInPlace usage

---
 pkgs/development/libraries/indicator-application/gtk2.nix | 6 ++++--
 pkgs/development/libraries/indicator-application/gtk3.nix | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix
index cbc66dd6ae6..b4fea7c1fa4 100644
--- a/pkgs/development/libraries/indicator-application/gtk2.nix
+++ b/pkgs/development/libraries/indicator-application/gtk2.nix
@@ -26,8 +26,10 @@ stdenv.mkDerivation rec {
       --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \
                 "DBUSSERVICEDIR=$out/share/dbus-1/services"
     autoconf
-    substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \
-      --replace /usr/bin/file ${file}/bin/file
+    for f in {configure,ltmain.sh,m4/libtool.m4}; do
+      substituteInPlace $f \
+        --replace /usr/bin/file ${file}/bin/file
+    done
     substituteInPlace src/Makefile.in \
       --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib"
   '';
diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix
index 778997e5674..03afd6f1e87 100644
--- a/pkgs/development/libraries/indicator-application/gtk3.nix
+++ b/pkgs/development/libraries/indicator-application/gtk3.nix
@@ -28,8 +28,10 @@ stdenv.mkDerivation rec {
       --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \
                 "DBUSSERVICEDIR=$out/share/dbus-1/services"
     autoconf
-    substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \
-      --replace /usr/bin/file ${file}/bin/file
+    for f in {configure,ltmain.sh,m4/libtool.m4}; do
+      substituteInPlace $f \
+        --replace /usr/bin/file ${file}/bin/file
+    done
     substituteInPlace src/Makefile.in \
       --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib"
   '';

From e75b2f03d06a3c169cd154875a3a5ba99f489ec0 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Wed, 2 Aug 2017 18:16:05 +0200
Subject: [PATCH 1510/3246] libappindicator: fix substituteInPlace usage

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

diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 8f005d6a5a4..3a26dd407e4 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -43,8 +43,10 @@ in stdenv.mkDerivation rec {
     substituteInPlace configure.ac \
       --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
     autoconf
-    substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \
-      --replace /usr/bin/file ${file}/bin/file
+    for f in {configure,ltmain.sh,m4/libtool.m4}; do
+      substituteInPlace $f \
+        --replace /usr/bin/file ${file}/bin/file
+    done
   '';
 
   configureFlags = [

From e10e0c47077158a0f0dc5af635ad11938fac981d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 2 Aug 2017 17:48:33 +0200
Subject: [PATCH 1511/3246] libdbusmenu: fix substituteInPlace usage

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

diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix
index 5d697489638..96e9c0624f2 100644
--- a/pkgs/development/libraries/libdbusmenu/default.nix
+++ b/pkgs/development/libraries/libdbusmenu/default.nix
@@ -26,8 +26,10 @@ stdenv.mkDerivation rec {
   ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
 
   postPatch = ''
-    substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \
-      --replace /usr/bin/file ${file}/bin/file
+    for f in {configure,ltmain.sh,m4/libtool.m4}; do
+      substituteInPlace $f \
+        --replace /usr/bin/file ${file}/bin/file
+    done
   '';
 
   # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/libdbusmenu

From d8284f5ea6082f89549434a1a1983c426817a570 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 21:05:44 +0200
Subject: [PATCH 1512/3246] libevhtp: remove, abandoned and build fail

No reverse dependencies in nixpkgs. The author deleted the repository.

Is was added for certificate-transparency but isn't used in that expression
anymore.
---
 .../libraries/libevhtp/default.nix            | 25 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/libevhtp/default.nix

diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix
deleted file mode 100644
index fb92d6aa4ca..00000000000
--- a/pkgs/development/libraries/libevhtp/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, openssl, libevent }:
-
-stdenv.mkDerivation rec {
-  name = "libevhtp-${version}";
-  version = "1.2.11";
-
-  src = fetchFromGitHub {
-    owner = "ellzey";
-    repo = "libevhtp";
-    rev = version;
-    sha256 = "1rlxdp8w4alcy5ryr7pmw5wi6hv7d64885wwbk1zxhvi64s4x4rg";
-  };
-
-  buildInputs = [ cmake openssl libevent ];
-
-  buildPhase = "cmake";
-
-  meta = with stdenv.lib; {
-    description = "A more flexible replacement for libevent's httpd API";
-    homepage = https://github.com/ellzey/libevhtp;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ edwtjo ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1f86cbf83d..efb6c910815 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2964,8 +2964,6 @@ with pkgs;
 
   libevdev = callPackage ../development/libraries/libevdev { };
 
-  libevhtp = callPackage ../development/libraries/libevhtp { };
-
   libfann = callPackage ../development/libraries/libfann { };
 
   libircclient = callPackage ../development/libraries/libircclient { };

From 3bd60616516bcec3fe3d5f81ef20d0fd8dc5f27e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 29 Jul 2017 01:44:00 +0200
Subject: [PATCH 1513/3246] libgnurl: 7.48.0 -> 7.54.1

---
 pkgs/development/libraries/libgnurl/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 2495c1505f0..e46da4dc9fb 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, perl, zlib, gnutls, gss, openssl, libssh2, libidn, libpsl, openldap }:
+{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl
+, libssh2, libidn, libpsl, openldap }:
 
 stdenv.mkDerivation rec {
-  version = "7.48.0";
+  version = "7.54.1";
 
   name = "libgnurl-${version}";
 
   src = fetchurl {
-    url = "https://gnunet.org/sites/default/files/gnurl-7_48_0.tar.bz2";
-    sha256 = "14gch4rdibrc8qs4mijsczxvl45dsclf234g17dk6c8nc2s4bm0a";
+    url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2";
+    sha256 = "0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ perl gnutls gss openssl zlib libidn libssh2 libpsl openldap ];
 
   preConfigure = ''

From c806501a6df1732e88f855740250b31b60ac11b0 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Wed, 2 Aug 2017 18:29:00 +0200
Subject: [PATCH 1514/3246] libindicate: fix substituteInPlace usage

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

diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
index ba1f8913501..9f75f17caee 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/pkgs/development/libraries/libindicate/default.nix
@@ -38,8 +38,10 @@ in stdenv.mkDerivation rec {
       --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' \
       --replace 'pyglib-2.0-python$PYTHON_VERSION' 'pyglib-2.0-python'
     autoconf
-    substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \
-      --replace /usr/bin/file ${file}/bin/file
+    for f in {configure,ltmain.sh,m4/libtool.m4}; do
+      substituteInPlace $f \
+        --replace /usr/bin/file ${file}/bin/file
+    done
   '';
 
   configureFlags = [

From d10d76f4874865abc3c620c007ad6a17fb322b01 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Wed, 2 Aug 2017 18:16:23 +0200
Subject: [PATCH 1515/3246] libindicator: fix substituteInPlace usage

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

diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix
index 1ebdcb365af..67936fecdf4 100644
--- a/pkgs/development/libraries/libindicator/default.nix
+++ b/pkgs/development/libraries/libindicator/default.nix
@@ -22,8 +22,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace configure \
       --replace 'LIBINDICATOR_LIBS+="$LIBM"' 'LIBINDICATOR_LIBS+=" $LIBM"'
-    substituteInPlace {build-aux/ltmain.sh,configure,m4/libtool.m4} \
-      --replace /usr/bin/file ${file}/bin/file
+    for f in {build-aux/ltmain.sh,configure,m4/libtool.m4}; do
+      substituteInPlace $f\
+        --replace /usr/bin/file ${file}/bin/file
+    done
   '';
 
   configureFlags = [

From 6b62b566a175ee4c011662b599323d43e5b0d251 Mon Sep 17 00:00:00 2001
From: Carl Sverre <accounts@carlsverre.com>
Date: Tue, 13 Dec 2016 11:39:14 -0800
Subject: [PATCH 1516/3246] wpa_supplicant: Enable BGSCAN module

Compile wpa_supplicant with the BGSCAN module enabled. This allows the
user to configure an SSID to use the bgscan module.  This module causes
wpa_supplicant to periodically perform a background scan for additional
access points and switch to the one with the highest signal.  This scan
can be kicked off when the current connection drops below a target
threshold signal strength.
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 1cac0911b24..1530d20667e 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
     CONFIG_HS20=y
     CONFIG_P2P=y
     CONFIG_TDLS=y
+    CONFIG_BGSCAN_SIMPLE=y
   '' + optionalString (pcsclite != null) ''
     CONFIG_EAP_SIM=y
     CONFIG_EAP_AKA=y

From 2c6571fe1259217badce011e11d39f4faad73f42 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 3 Aug 2017 18:36:40 +0000
Subject: [PATCH 1517/3246] ocamlPackages.git: 1.11.0 -> 1.11.1

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

diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index 13b85c0c570..e3b4b4333e1 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-	version = "1.11.0";
+	version = "1.11.1";
 	name = "ocaml${ocaml.version}-git-${version}";
 
 	src = fetchFromGitHub {
 		owner = "mirage";
 		repo = "ocaml-git";
 		rev = version;
-		sha256 = "1gsvp783g4jb54ccvvpyjpxjmp0pjvlq0cicygk4z4rxs0crd6kw";
+		sha256 = "04az2bpbhgdhh7y6pagqx4wf3jbmqrm8w20dgimpbj5h3hnak744";
 	};
 
 	buildInputs = [ ocaml findlib jbuilder ];

From da378ce8edd13bb346852caaa079a2b6f2017018 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 3 Aug 2017 18:38:06 +0000
Subject: [PATCH 1518/3246] ocamlPackages.process: init at 0.2.1

process makes it easy to use commands like functions.

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

diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix
new file mode 100644
index 00000000000..92fb1837803
--- /dev/null
+++ b/pkgs/development/ocaml-modules/process/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-process-${version}";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "dsheets";
+    repo = "ocaml-process";
+    rev = version;
+    sha256 = "0m1ldah5r9gcq09d9jh8lhvr77910dygx5m309k1jm60ah9mdcab";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Easy process control in OCaml";
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bc5253328cf..a50f996b7cc 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -552,6 +552,8 @@ let
 
     ppx_tools_versioned = callPackage ../development/ocaml-modules/ppx_tools_versioned { };
 
+    process = callPackage ../development/ocaml-modules/process { };
+
     ptmap = callPackage ../development/ocaml-modules/ptmap { };
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };

From 90c9897ff6130e55d5a0a6eaf7f9d1cc74208c28 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 3 Aug 2017 18:39:25 +0000
Subject: [PATCH 1519/3246] =?UTF-8?q?ocamlPackages.ppx=5Fderiving:=20mark?=
 =?UTF-8?q?=20as=20broken=20with=20OCaml=20=E2=89=A5=204.05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index a1255b2dbc1..57a423a8037 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchzip
+{ stdenv, buildOcaml, ocaml, fetchzip
 , cppo, ppx_tools, result, ounit
 }:
 
@@ -25,5 +25,6 @@ buildOcaml rec {
     description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02.";
     maintainers = [ maintainers.maurer ];
     license = licenses.mit;
+    broken = versionAtLeast ocaml.version "4.05";
   };
 }

From 83d14b7b50b10bf538bd6381c18267c2262c5d14 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 3 Aug 2017 18:40:07 +0000
Subject: [PATCH 1520/3246] ocamlPackages.wasm: init at 0.13

wasm is an OCaml library to read and write Web Assembly (wasm) files and
manipulate their AST.
---
 .../ocaml-modules/wasm/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/wasm/default.nix

diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix
new file mode 100644
index 00000000000..03ea4a29330
--- /dev/null
+++ b/pkgs/development/ocaml-modules/wasm/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "wasm is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-wasm-${version}";
+  version = "0.13";
+
+  src = fetchFromGitHub {
+    owner = "WebAssembly";
+    repo = "spec";
+    rev = "v${version}";
+    sha256 = "0l67w1dmhgzrhmw3pw2w35h54imax0zdpa9yyqppzzbagxgn87kn";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild ];
+
+  makeFlags = [ "-C" "interpreter" ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "An OCaml library to read and write Web Assembly (wasm) files and manipulate their AST";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a50f996b7cc..492b22c0552 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -612,6 +612,8 @@ let
 
     vg = callPackage ../development/ocaml-modules/vg { };
 
+    wasm = callPackage ../development/ocaml-modules/wasm { };
+
     x509 = callPackage ../development/ocaml-modules/x509 { };
 
     xmlm = callPackage ../development/ocaml-modules/xmlm { };

From ef7f980954d3f33eeeac15b76f82298e42830738 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Aug 2017 05:46:07 +0000
Subject: [PATCH 1521/3246] obelisk: init at 0.2.0

Obelisk is a simple tool which produces pretty-printed output from a Menhir
parser file (.mly).

Homepage: https://github.com/Lelio-Brun/Obelisk
---
 .../tools/ocaml/obelisk/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/obelisk/default.nix

diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
new file mode 100644
index 00000000000..193ecd75f57
--- /dev/null
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, ocamlPackages }:
+
+stdenv.mkDerivation rec {
+	name = "obelisk-${version}";
+	version = "0.2.0";
+	src = fetchFromGitHub {
+		owner = "Lelio-Brun";
+		repo = "Obelisk";
+		rev = "v${version}";
+		sha256 = "0qkxnv25rmqj7qhnw1fav88kr73ax9fjbzvkrwximz5477gjxx3p";
+	};
+
+	buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ];
+
+	installFlags = [ "BINDIR=$(out)/bin" ];
+
+	meta = {
+		description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
+		license = stdenv.lib.licenses.mit;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (src.meta) homepage;
+		inherit (ocamlPackages.ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cdec3e53db..524ce4ce212 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7113,6 +7113,10 @@ with pkgs;
   noweb = callPackage ../development/tools/literate-programming/noweb { };
   nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; };
 
+  obelisk = callPackage ../development/tools/ocaml/obelisk {
+    ocamlPackages = ocaml-ng.ocamlPackages_4_03;
+  };
+
   obuild = callPackage ../development/tools/ocaml/obuild { };
 
   omake = callPackage ../development/tools/ocaml/omake {

From da7755b75cd2cbcaf14b65b1a3e6b88cff1e0d04 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 4 Aug 2017 13:50:06 +0800
Subject: [PATCH 1522/3246] networkmanager service: use unbound if enabled

---
 nixos/modules/services/networking/networkmanager.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index ab161b7e772..2b7086afe7e 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -12,6 +12,7 @@ let
   dns =
     if cfg.useDnsmasq then "dnsmasq"
     else if config.services.resolved.enable then "systemd-resolved"
+    else if config.services.unbound.enable then "unbound"
     else "default";
 
   configFile = writeText "NetworkManager.conf" ''

From 2d64d1e601126efbf19be94575f0a642aaf2b4eb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Aug 2017 08:22:04 +0200
Subject: [PATCH 1523/3246] fetchurlBoot: add name attr

---
 pkgs/build-support/fetchurl/boot.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/boot.nix b/pkgs/build-support/fetchurl/boot.nix
index 722fd2566ef..bd71f93c529 100644
--- a/pkgs/build-support/fetchurl/boot.nix
+++ b/pkgs/build-support/fetchurl/boot.nix
@@ -5,10 +5,11 @@ let mirrors = import ./mirrors.nix; in
 { url ? builtins.head urls
 , urls ? []
 , sha256
+, name ? baseNameOf (toString url)
 }:
 
 import <nix/fetchurl.nix> {
-  inherit system sha256;
+  inherit system sha256 name;
 
   url =
     # Handle mirror:// URIs. Since <nix/fetchurl.nix> currently

From 0e18f28cecdc53191c6c9db1f4c86fe22b3bdfb5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Aug 2017 08:22:20 +0200
Subject: [PATCH 1524/3246] binutils: patch bugs in 2.29

All are upstream patches, the last two added by handy to work around
them not applying on the changelog.

2.29.1/2.30 will contain the fixes, too.
---
 pkgs/development/tools/misc/binutils/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ac9ab141332..04911e4cc56 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -45,6 +45,15 @@ stdenv.mkDerivation rec {
     # there) and causes a cycle between the lib and bin outputs, so
     # get rid of it.
     ./no-plugins.patch
+
+    # remove after 2.29.1/2.30
+    (fetchurl {
+      url = "https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=c6b78c965a96fb152fbd58926edccb5dee2707a5";
+      sha256 = "0rkbq5pf7ffgcggfk4czkxin1091bqjj92an9wxnqkgqwq6cx5yr";
+      name = "readelf-empty-sections.patch";
+    })
+    ./elf-check-orphan-input.patch
+    ./elf-check-orphan-placement.patch
   ];
 
   # TODO: all outputs on all platform

From f1802d8398f9f08cf165608aa2b43763382acc5f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 21:00:29 +0200
Subject: [PATCH 1525/3246] libmsn: remove, build fails and obsolete

libmsn provides access to the MSN network, which was officially
shut down in October 2014. No packages depends on libmsn.
---
 pkgs/development/libraries/libmsn/default.nix    | 15 ---------------
 .../libraries/libmsn/fix-ftbfs-gcc4.7.diff       | 16 ----------------
 pkgs/top-level/all-packages.nix                  |  2 --
 3 files changed, 33 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmsn/default.nix
 delete mode 100644 pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff

diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix
deleted file mode 100644
index 703c5e36b8b..00000000000
--- a/pkgs/development/libraries/libmsn/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, cmake, openssl}:
-
-stdenv.mkDerivation rec {
-  name = "libmsn-4.2.1";
-  src = fetchurl {
-    url = "mirror://sourceforge/libmsn/${name}.tar.bz2";
-    sha256 = "338369c7455b123e84b9a7a858ac0ed2b1dc32e6529f460fdc01d28869a20fde";
-  };
-  patches = [ ./fix-ftbfs-gcc4.7.diff ];
-  buildInputs = [ cmake openssl ];
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff b/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff
deleted file mode 100644
index 46aeab31c84..00000000000
--- a/pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix g++ 4.7 build failure
-
-Kudos to Matthias Klose for the patch
-
-Index: libmsn-4.2/msn/util.cpp
-===================================================================
---- libmsn-4.2.orig/msn/util.cpp	2009-07-22 19:57:10.000000000 +0000
-+++ libmsn-4.2/msn/util.cpp	2012-04-16 20:52:18.068767213 +0000
-@@ -25,6 +25,7 @@
- #include <msn/util.h>
- #include <sstream>
- #include <errno.h>
-+#include <unistd.h>
- #include <cctype>
- #include <fstream>
- #include <openssl/rand.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 524ce4ce212..81fc44f33b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9041,8 +9041,6 @@ with pkgs;
 
   libmrss = callPackage ../development/libraries/libmrss { };
 
-  libmsn = callPackage ../development/libraries/libmsn { };
-
   libmspack = callPackage ../development/libraries/libmspack { };
 
   libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { };

From 7dc34607641cc8f1815e89340897613c164d3deb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Aug 2017 23:39:33 +0200
Subject: [PATCH 1526/3246] wvstreams: remove

---
 .../libraries/wvstreams/compile.patch         | 43 -------------------
 .../libraries/wvstreams/default.nix           | 28 ------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 73 deletions(-)
 delete mode 100644 pkgs/development/libraries/wvstreams/compile.patch
 delete mode 100644 pkgs/development/libraries/wvstreams/default.nix

diff --git a/pkgs/development/libraries/wvstreams/compile.patch b/pkgs/development/libraries/wvstreams/compile.patch
deleted file mode 100644
index c71e7396e91..00000000000
--- a/pkgs/development/libraries/wvstreams/compile.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Debian's patch to build with fresher GCC
-
-Index: wvstreams-4.6.1/crypto/wvx509.cc
-===================================================================
---- wvstreams-4.6.1.orig/crypto/wvx509.cc	2011-05-20 00:02:38.119136584 +0200
-+++ wvstreams-4.6.1/crypto/wvx509.cc	2011-05-20 00:02:26.035136589 +0200
-@@ -1157,7 +1157,7 @@
-         
-         if (ext)
-         {
--            X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+            X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext);
-             if (!method)
-             {
-                 WvDynBuf buf;
-Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc
-===================================================================
---- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc	2011-05-20 00:02:38.391136584 +0200
-+++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc	2011-05-20 00:02:35.283136585 +0200
-@@ -1,8 +1,6 @@
- #include "wvunixdgsocket.h"
--#ifdef MACOS
- #include <sys/types.h>
- #include <sys/stat.h>
--#endif
- 
- WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
-     : socketfile(filename)
-Index: wvstreams-4.6.1/streams/wvatomicfile.cc
-===================================================================
---- wvstreams-4.6.1.orig/streams/wvatomicfile.cc	2011-05-20 00:02:38.223136584 +0200
-+++ wvstreams-4.6.1/streams/wvatomicfile.cc	2011-05-20 00:02:31.619136587 +0200
-@@ -10,10 +10,7 @@
- #include "wvatomicfile.h"
- #include "wvfileutils.h"
- #include "wvstrutils.h"
--
--#ifdef MACOS
- #include <sys/stat.h>
--#endif
- 
- WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode)
-     : tmp_file(WvString::null)
diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix
deleted file mode 100644
index ecfc9b88a0e..00000000000
--- a/pkgs/development/libraries/wvstreams/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
-
-stdenv.mkDerivation {
-  name = "wvstreams-4.6.1";
-
-  src = fetchurl {
-    url = http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz;
-    sha256 = "0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4";
-  };
-
-  patches = [ ./compile.patch ];
-
-  preConfigure = ''
-    find -type f | xargs sed -i 's@/bin/bash@bash@g'
-
-    sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cc')
-  '';
-
-  buildInputs = [ qt4 dbus zlib openssl readline perl ];
-
-  meta = {
-    description = "Network programming library in C++";
-    homepage = http://alumnit.ca/wiki/index.php?page=WvStreams;
-    license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81fc44f33b5..5011736d23a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10585,8 +10585,6 @@ with pkgs;
 
   wt = callPackage ../development/libraries/wt { };
 
-  wvstreams = callPackage ../development/libraries/wvstreams { };
-
   wxGTK = wxGTK28;
 
   wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {

From 2b4811887a76f485e49a8b053710b3fc5d5e0603 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 12 Jul 2017 01:36:20 +0200
Subject: [PATCH 1527/3246] kernel: add IP_NF_TARGET_REDIRECT

---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 9700373c852..5e2b1d610e7 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -167,6 +167,7 @@ with stdenv.lib;
   BONDING m
   NET_L3_MASTER_DEV? y
   NET_FOU_IP_TUNNELS? y
+  IP_NF_TARGET_REDIRECT m
 
   # Wireless networking.
   CFG80211_WEXT? y # Without it, ipw2200 drivers don't build

From e54031d323297c6aaefa31b224d3271a1af7fca5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 10:44:31 +0200
Subject: [PATCH 1528/3246] prometheus-openvpn-exporter: init at 2017-05-15

---
 .../prometheus/openvpn-exporter-deps.nix      | 66 +++++++++++++++++++
 .../prometheus/openvpn-exporter.nix           | 24 +++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 91 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/openvpn-exporter.nix

diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix
new file mode 100644
index 00000000000..93aae1b867e
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix
@@ -0,0 +1,66 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    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 = "748d386b5c1ea99658fd69fe9f03991ce86a90c1";
+      sha256 = "0xm0is6sj6r634vrfx85ir0gd9h1xxk25fgc5z07zrjp19f5wqp5";
+    };
+  }
+  {
+    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 = "94ff84a9a6ebb5e6eb9172897c221a64df3443bc";
+      sha256 = "188xwc13ml51i29fhp8bz4a7ncmk0lvdw3nnwr56k2l36pp1swil";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
+      sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "3e6a7635bac6573d43f49f97b47eb9bda195dba8";
+      sha256 = "1q4nwm9lf4jd90z08s6gz8j1zzrk2jn9vpw49xdb8mwxmhv13xgm";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2";
+      sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np";
+    };
+  }
+]
diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
new file mode 100644
index 00000000000..a52b9ac343b
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "openvpn_exporter-unstable-${version}";
+  version = "2017-05-15";
+  rev = "a2a179a222144fa9a10030367045f075375a2803";
+
+  goPackagePath = "github.com/kumina/openvpn_exporter";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/kumina/openvpn_exporter";
+    sha256 = "1cjx7ascf532a20wwzrsx3qqs6dr04jyf700s3jvlvhhhx43l8m4";
+  };
+
+  goDeps = ./openvpn-exporter-deps.nix;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Prometheus exporter for OpenVPN";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5011736d23a..6ec261f3ec6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11440,6 +11440,7 @@ with pkgs;
   prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
   prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
   prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { };
+  prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-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 { };

From ceee4003d081d9df629133efecd657eba03c0373 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Aug 2017 01:59:54 +0200
Subject: [PATCH 1529/3246] prometheus-openvpn-exporter: use fetchFromGitHub to
 fix meta

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

diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
index a52b9ac343b..eac962f7560 100644
--- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "openvpn_exporter-unstable-${version}";
@@ -7,9 +7,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/kumina/openvpn_exporter";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
+    owner = "kumina";
+    repo = "openvpn_exporter";
     inherit rev;
-    url = "https://github.com/kumina/openvpn_exporter";
     sha256 = "1cjx7ascf532a20wwzrsx3qqs6dr04jyf700s3jvlvhhhx43l8m4";
   };
 

From 068feb65c9d5a29771ee19a9df7a82b9894701ed Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 11 Apr 2017 18:02:23 +0200
Subject: [PATCH 1530/3246] prometeus-snmp-exporter: 0.1.0 -> 0.3.0

---
 pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index a52e1abad87..6915877ef4f 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }:
 
 buildGoPackage rec {
   name = "snmp_exporter-${version}";
-  version = "0.1.0";
+  version = "0.3.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/snmp_exporter";
@@ -11,9 +11,11 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "snmp_exporter";
-    sha256 = "1faa1gla5nqkhf1kq60v22bcph41qix3dn9db0w0fh2pkxpdxvrp";
+    sha256 = "1cklsi3cpalmnp0qjkgb7xbgbkr014hk2z54gfynzvzqjmsbxk6a";
   };
 
+  buildInputs = [ net_snmp ];
+
   doCheck = true;
 
   meta = with stdenv.lib; {

From b129c994c87a3a74a72ed5aa3582536f035120ba Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 23:35:19 +0200
Subject: [PATCH 1531/3246] irods: 4.2.0 -> 4.2.1

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

diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index db69fa64c84..b5f178d59fc 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -13,13 +13,13 @@ in rec {
 
   # irods: libs and server package
   irods = stdenv.mkDerivation (common // rec {
-    version = "4.2.0";
+    version = "4.2.1";
     prefix = "irods";
     name = "${prefix}-${version}";
 
     src = fetchurl {
       url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz";
-      sha256 = "b5c0d7209219629da139058ce462a237ecc22ad4dae613413a428961e4ff9d3e";
+      sha256 = "07yj5g1mwra4sankhqx967mk4z28kc40rir5cb85x23ljql74abq";
     };
 
     # Patches:

From 33b9e68b1a38816fd2fab87641801572026e92db Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Wed, 2 Aug 2017 19:05:20 +0200
Subject: [PATCH 1532/3246] kea: fix substituteInPlace usage

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

diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index 8a474812e19..e1829bcaf7d 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   patches = [ ./dont-create-var.patch ];
 
   postPatch = ''
-    substituteInPlace ./src/bin/keactrl/Makefile.am '@sysconfdir@' "$out/etc"
-    substituteInPlace ./src/bin/keactrl/Makefile.am '@(sysconfdir)@' "$out/etc"
+    substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc"
+    substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@(sysconfdir)@' "$out/etc"
   '';
 
   configureFlags = [

From a038866c974525ced1853e8668adf4e2711d0599 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 23:30:59 +0200
Subject: [PATCH 1533/3246] facter: 3.6.4 -> 3.6.6

---
 pkgs/tools/system/facter/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index b66cd7d6112..55bf93608e8 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,15 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.6.4";
+  version = "3.6.6";
 
   src = fetchFromGitHub {
-    sha256 = "177mmg5a4s4q2p76df4z6c51nfnr73qya1pvvj6fcs1gld01xjr6";
+    sha256 = "07jphvwfmvrq28f8k15k16kz090zvb11nn6bd895fz5axag01ins";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";
   };
 
+  CXXFLAGS = "-fpermissive";
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];
 
   # since we cant expand $out in cmakeFlags
@@ -18,6 +21,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost cmake cpp-hocon curl leatherman libyamlcpp openssl ruby utillinux ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/puppetlabs/facter;
     description = "A system inventory tool";

From ad83979e5986fa3bb0d254c2be9482c12a8743b9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Aug 2017 08:36:44 +0200
Subject: [PATCH 1534/3246] binutils: add missing patches...

---
 .../binutils/elf-check-orphan-input.patch     |  99 +++++++++++
 .../binutils/elf-check-orphan-placement.patch | 161 ++++++++++++++++++
 2 files changed, 260 insertions(+)
 create mode 100644 pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch
 create mode 100644 pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch

diff --git a/pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch b/pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch
new file mode 100644
index 00000000000..2ec90128347
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch
@@ -0,0 +1,99 @@
+From a388b7afeffad6411686d39dc1c62294da48a814 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 2 Aug 2017 05:10:29 -0700
+Subject: [PATCH] Check ELF section header only for ELF output
+
+When placing an orphan input section, check ELF section header only for
+ELF output.
+
+	PR ld/21884
+	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Check
+	ELF section header only for ELF output.
+	* testsuite/ld-elf/pr21884.d: New test.
+	* testsuite/ld-elf/pr21884.t: Likewise.
+	* testsuite/ld-elf/pr21884a.s: Likewise.
+	* testsuite/ld-elf/pr21884b.s: Likewise.
+
+(cherry picked from commit db99ecc08f5b66fbe9cb72e90352c7f77ec71a6e)
+---
+ ld/ChangeLog                   | 10 ++++++++++
+ ld/emultempl/elf32.em          |  3 ++-
+ ld/testsuite/ld-elf/pr21884.d  | 11 +++++++++++
+ ld/testsuite/ld-elf/pr21884.t  |  7 +++++++
+ ld/testsuite/ld-elf/pr21884a.s |  5 +++++
+ ld/testsuite/ld-elf/pr21884b.s |  5 +++++
+ 6 files changed, 40 insertions(+), 1 deletion(-)
+ create mode 100644 ld/testsuite/ld-elf/pr21884.d
+ create mode 100644 ld/testsuite/ld-elf/pr21884.t
+ create mode 100644 ld/testsuite/ld-elf/pr21884a.s
+ create mode 100644 ld/testsuite/ld-elf/pr21884b.s
+
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index d2551b6..75ded12 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -2136,7 +2136,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+     }
+ 
+   /* Look through the script to see where to place this section.  */
+-  if (constraint == 0)
++  if (constraint == 0
++      && link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour)
+     for (os = lang_output_section_find (secname);
+ 	 os != NULL;
+ 	 os = next_matching_output_section_statement (os, 0))
+diff --git a/ld/testsuite/ld-elf/pr21884.d b/ld/testsuite/ld-elf/pr21884.d
+new file mode 100644
+index 0000000..52cd2c1
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr21884.d
+@@ -0,0 +1,11 @@
++#source: pr21884a.s
++#source: pr21884b.s
++#ld: -T pr21884.t
++#objdump: -b binary -s
++#notarget: aarch64*-*-* arm*-*-* nds32*-*-*
++# Skip targets which can't change output format to binary.
++
++.*:     file format binary
++
++Contents of section .data:
++#pass
+diff --git a/ld/testsuite/ld-elf/pr21884.t b/ld/testsuite/ld-elf/pr21884.t
+new file mode 100644
+index 0000000..d483911
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr21884.t
+@@ -0,0 +1,7 @@
++OUTPUT_FORMAT("binary")
++
++ENTRY(_main);
++SECTIONS {
++	. = 0;
++	.setup : { *(.setup) }
++}
+diff --git a/ld/testsuite/ld-elf/pr21884a.s b/ld/testsuite/ld-elf/pr21884a.s
+new file mode 100644
+index 0000000..a3361b2
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr21884a.s
+@@ -0,0 +1,5 @@
++	.text
++	.globl	_main
++	.type _main,%function
++_main:
++	.dc.a bar
+diff --git a/ld/testsuite/ld-elf/pr21884b.s b/ld/testsuite/ld-elf/pr21884b.s
+new file mode 100644
+index 0000000..e533837
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr21884b.s
+@@ -0,0 +1,5 @@
++	.text
++	.globl	bar
++	.type bar,%function
++bar:
++	.byte 0
+-- 
+2.9.3
+
diff --git a/pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch b/pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch
new file mode 100644
index 00000000000..7e7566aec43
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch
@@ -0,0 +1,161 @@
+From 36088682f447540fd8666a2c437fa232064044a7 Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Thu, 3 Aug 2017 14:01:34 +0930
+Subject: [PATCH] ELF checks for orphan placement
+
+The loop checking for previous orphan placement should run even when
+the output is non-ELF.
+
+	PR ld/21884
+	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Revert
+	last change.  Rename iself to elfinput.  Expand comments.  Condition
+	ELF checks on having both input and output ELF files.  Extract..
+	(elf_orphan_compatible): ..this new function.
+---
+ ld/ChangeLog          |  8 ++++++
+ ld/emultempl/elf32.em | 76 +++++++++++++++++++++++++++++++--------------------
+ 2 files changed, 55 insertions(+), 29 deletions(-)
+
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index 75ded12..9ac1840 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -2008,6 +2008,29 @@ output_rel_find (asection *sec, int isdyn)
+   return last;
+ }
+ 
++/* Return whether IN is suitable to be part of OUT.  */
++
++static bfd_boolean
++elf_orphan_compatible (asection *in, asection *out)
++{
++  /* Non-zero sh_info implies a section with SHF_INFO_LINK with
++     unknown semantics for the generic linker, or a SHT_REL/SHT_RELA
++     section where sh_info specifies a symbol table.  (We won't see
++     SHT_GROUP, SHT_SYMTAB or SHT_DYNSYM sections here.)  We clearly
++     can't merge SHT_REL/SHT_RELA using differing symbol tables, and
++     shouldn't merge sections with differing unknown semantics.  */
++  if (elf_section_data (out)->this_hdr.sh_info
++      != elf_section_data (in)->this_hdr.sh_info)
++    return FALSE;
++  /* We can't merge two sections with differing SHF_EXCLUDE when doing
++     a relocatable link.  */
++  if (bfd_link_relocatable (&link_info)
++      && ((elf_section_flags (out) ^ elf_section_flags (in)) & SHF_EXCLUDE) != 0)
++    return FALSE;
++  return _bfd_elf_match_sections_by_type (link_info.output_bfd, out,
++					  in->owner, in);
++}
++
+ /* Place an orphan section.  We use this to put random SHF_ALLOC
+    sections in the right segment.  */
+ 
+@@ -2064,8 +2087,9 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+   lang_output_section_statement_type *os;
+   lang_output_section_statement_type *match_by_name = NULL;
+   int isdyn = 0;
+-  int iself = s->owner->xvec->flavour == bfd_target_elf_flavour;
+-  unsigned int sh_type = iself ? elf_section_type (s) : SHT_NULL;
++  int elfinput = s->owner->xvec->flavour == bfd_target_elf_flavour;
++  int elfoutput = link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour;
++  unsigned int sh_type = elfinput ? elf_section_type (s) : SHT_NULL;
+   flagword flags;
+   asection *nexts;
+ 
+@@ -2073,7 +2097,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+       && link_info.combreloc
+       && (s->flags & SEC_ALLOC))
+     {
+-      if (iself)
++      if (elfinput)
+ 	switch (sh_type)
+ 	  {
+ 	  case SHT_RELA:
+@@ -2095,6 +2119,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+     }
+ 
+   if (!bfd_link_relocatable (&link_info)
++      && elfinput
++      && elfoutput
+       && (s->flags & SEC_ALLOC) != 0
+       && (elf_section_flags (s) & SHF_GNU_MBIND) != 0)
+     {
+@@ -2135,9 +2161,11 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+ 	secname = ".mbind.text";
+     }
+ 
+-  /* Look through the script to see where to place this section.  */
+-  if (constraint == 0
+-      && link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour)
++  /* Look through the script to see where to place this section.  The
++     script includes entries added by previous lang_insert_orphan
++     calls, so this loop puts multiple compatible orphans of the same
++     name into a single output section.  */
++  if (constraint == 0)
+     for (os = lang_output_section_find (secname);
+ 	 os != NULL;
+ 	 os = next_matching_output_section_statement (os, 0))
+@@ -2146,29 +2174,19 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+ 	   lang_insert_orphan to create a new output section.  */
+ 	constraint = SPECIAL;
+ 
+-	/* SEC_EXCLUDE is cleared when doing a relocatable link.  But
+-	   we can't merge 2 input sections with the same name when only
+-	   one of them has SHF_EXCLUDE.  Don't merge 2 sections with
+-	   different sh_info.  */
++	/* Check to see if we already have an output section statement
++	   with this name, and its bfd section has compatible flags.
++	   If the section already exists but does not have any flags
++	   set, then it has been created by the linker, possibly as a
++	   result of a --section-start command line switch.  */
+ 	if (os->bfd_section != NULL
+-	    && (elf_section_data (os->bfd_section)->this_hdr.sh_info
+-		== elf_section_data (s)->this_hdr.sh_info)
+ 	    && (os->bfd_section->flags == 0
+-		|| ((!bfd_link_relocatable (&link_info)
+-		     || (iself && (((elf_section_flags (s)
+-				     ^ elf_section_flags (os->bfd_section))
+-				    & SHF_EXCLUDE) == 0)))
+-		    && ((s->flags ^ os->bfd_section->flags)
++		|| (((s->flags ^ os->bfd_section->flags)
+ 		     & (SEC_LOAD | SEC_ALLOC)) == 0
+-		    && _bfd_elf_match_sections_by_type (link_info.output_bfd,
+-							os->bfd_section,
+-							s->owner, s))))
++		    && (!elfinput
++			|| !elfoutput
++			|| elf_orphan_compatible (s, os->bfd_section)))))
+ 	  {
+-	    /* We already have an output section statement with this
+-	       name, and its bfd section has compatible flags.
+-	       If the section already exists but does not have any flags
+-	       set, then it has been created by the linker, probably as a
+-	       result of a --section-start command line switch.  */
+ 	    lang_add_section (&os->children, s, NULL, os);
+ 	    return os;
+ 	  }
+@@ -2244,8 +2262,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+   else if ((flags & SEC_ALLOC) == 0)
+     ;
+   else if ((flags & SEC_LOAD) != 0
+-	   && ((iself && sh_type == SHT_NOTE)
+-	       || (!iself && CONST_STRNEQ (secname, ".note"))))
++	   && ((elfinput && sh_type == SHT_NOTE)
++	       || (!elfinput && CONST_STRNEQ (secname, ".note"))))
+     place = &hold[orphan_interp];
+   else if ((flags & (SEC_LOAD | SEC_HAS_CONTENTS | SEC_THREAD_LOCAL)) == 0)
+     place = &hold[orphan_bss];
+@@ -2255,8 +2273,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+     place = &hold[orphan_tdata];
+   else if ((flags & SEC_READONLY) == 0)
+     place = &hold[orphan_data];
+-  else if (((iself && (sh_type == SHT_RELA || sh_type == SHT_REL))
+-	    || (!iself && CONST_STRNEQ (secname, ".rel")))
++  else if (((elfinput && (sh_type == SHT_RELA || sh_type == SHT_REL))
++	    || (!elfinput && CONST_STRNEQ (secname, ".rel")))
+ 	   && (flags & SEC_LOAD) != 0)
+     place = &hold[orphan_rel];
+   else if ((flags & SEC_CODE) == 0)
+-- 
+2.9.3
+

From 305b3fed04417fce1af74974d814987dfd3ecaf0 Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Fri, 4 Aug 2017 10:38:50 +0200
Subject: [PATCH 1535/3246] idea-community: 2017.2.0 -> 2017.2.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 50ecdc1d499..186f9d2c23b 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -268,12 +268,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2017.2";
+    version = "2017.2.1";
     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 = "0z5abj41f5l9ilznr34lm4fsivrl2yjdxb2kdcis5abij6zl0g3f";
+      sha256 = "1z8gp209jpjzvllnrpxzmbhgaxkklxw8nkm3g2drb7nal2hhs113";
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";

From 629becb54446ff498dc716d9690daf7e6cb73570 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 4 Aug 2017 11:30:04 +0200
Subject: [PATCH 1536/3246] expat: 2.2.2 -> 2.2.3

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

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 205faa845fe..36c610cb040 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.2";
+  name = "expat-2.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "0ik0r39ala9c6hj4kxrk933klgwkzlkbrfhvhaykx8l1rwgr2xj3";
+    sha256 = "0pyfma0sv4vif17kfv7xh2l2hl6skgw266a9cwm00p7q0bxr065k";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers

From dc50dcf9c8ca3ee929c82166b1828bd6e4cc8d30 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 4 Aug 2017 11:12:27 +0100
Subject: [PATCH 1537/3246] terraform: keep the 0.9.x series as the default for
 now

0.9.10 is still missing some testing
---
 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 6ec261f3ec6..454b7ac98c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18916,7 +18916,7 @@ with pkgs;
   terraform_0_8 = terraform_0_8_8;
   terraform_0_9 = terraform_0_9_11;
   terraform_0_10 = terraform_0_10_0;
-  terraform = terraform_0_10;
+  terraform = terraform_0_9;
 
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
 

From e0a848fb16244109f700f28bfb1b32c13be3d465 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 4 Aug 2017 11:50:44 +0100
Subject: [PATCH 1538/3246] terraform_0_10_0: tune build

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

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 0e3ceef9348..a04cbed9610 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -58,5 +58,12 @@ in {
   terraform_0_10_0 = generic {
     version = "0.10.0";
     sha256 = "1z6pmyfh4z5w8k2j46ancc0m9lsiq6d0m56nxj1kawb3n5q9dgds";
+    # remove debugging and the -dev postfix in the version
+    preBuild = ''
+      buildFlagsArray=(
+        -ldflags
+        "-X github.com/hashicorp/terraform/terraform.VersionPrerelease= -s -w"
+      )
+    '';
   };
 }

From ef5ba4d5b29e329ab4240120870ef4d860ebd54e Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 3 Aug 2017 20:24:55 -0400
Subject: [PATCH 1539/3246] Fix emacs wrapper expression to honor bash array
 use

In 8d76eff, @Ericson2314 changed the representation of the value that
`findInputs` generated from a whitespace-separated bunch strings to an
actual array of strings.

Expressions that *consume* that value, however, also needed to be
changed to iterate over all the contents of the array, else they would
only select the first value, which turns out to be somewhat limiting.

Fixes #27873
---
 pkgs/build-support/emacs/wrapper.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index e41b1fd6a21..bd733f1b9ba 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -80,7 +80,8 @@ stdenv.mkDerivation {
        linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
      }
 
-     for pkg in $requires; do
+     # Iterate over the array of inputs (avoiding nix's own interpolation)
+     for pkg in "''${requires[@]}"; do
        linkEmacsPackage $pkg
      done
 

From 5fc9a604b441e5fae80f0fb1891b6c984fb3693e Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 4 Aug 2017 10:57:19 +0300
Subject: [PATCH 1540/3246] k3b: remove unused wrapper file

---
 pkgs/applications/misc/k3b/wrapper.nix | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 pkgs/applications/misc/k3b/wrapper.nix

diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix
deleted file mode 100644
index 486d3fb7ddf..00000000000
--- a/pkgs/applications/misc/k3b/wrapper.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }:
-
-let
-  binPath = lib.makeBinPath [ cdrtools ];
-in symlinkJoin {
-  name = "k3b-${k3b-original.version}";
-
-  paths = [ k3b-original ];
-  buildInputs = [ makeWrapper ];
-
-  postBuild = ''
-    wrapProgram $out/bin/k3b \
-      --prefix PATH ':' ${binPath}
-  '';
-}

From ce78756ad8c6b0822555f936e521ed7b21e2c169 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 4 Aug 2017 11:52:01 +0300
Subject: [PATCH 1541/3246] gwenview, spectacle: propagate libkipi

---
 pkgs/applications/kde/gwenview.nix  | 2 +-
 pkgs/applications/kde/spectacle.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 233566c1bda..60adb104bdd 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -17,5 +17,5 @@ mkDerivation {
     baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon
     qtimageformats qtsvg qtx11extras
   ];
-  propagatedUserEnvPkgs = [ kipi-plugins ];
+  propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
 }
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index db1bf2aee65..1be07fe6fe8 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -16,5 +16,5 @@ mkDerivation {
     kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
     kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras
   ];
-  propagatedUserEnvPkgs = [ kipi-plugins ];
+  propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
 }

From 0b2be5ad900e0e3a3fb57feac8aaf7decd9c242f Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 4 Aug 2017 09:38:26 -0300
Subject: [PATCH 1542/3246] jwm: 1600 -> 1621

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

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 892fe7ba4e7..83c4e6828e1 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1600";
+  version = "1621";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "0rfb67r6g873alvcbn9531415qlfmvfrdfm4xrsyhdgdwj7dv5kv";
+    sha256 = "1cxi9yd3wwzhh06f6myk15cav7ayvzxdaxhvqb3570nwj21zlnsm";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];

From 4f277bd92056d74c5608be0e508283b09ec49cce Mon Sep 17 00:00:00 2001
From: Phil <phil@grmr.de>
Date: Fri, 4 Aug 2017 16:25:28 +0200
Subject: [PATCH 1543/3246] nixos/networking/nat: add option for protocol

This commit adds an option to allow udp port forwarding (see #24894).
---
 nixos/modules/services/networking/nat.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 41e0a8c8474..366bb2ed7a8 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -48,7 +48,7 @@ let
     # NAT from external ports to internal ports.
     ${concatMapStrings (fwd: ''
       iptables -w -t nat -A nixos-nat-pre \
-        -i ${cfg.externalInterface} -p tcp \
+        -i ${cfg.externalInterface} -p ${fwd.proto} \
         --dport ${builtins.toString fwd.sourcePort} \
         -j DNAT --to-destination ${fwd.destination}
     '') cfg.forwardPorts}
@@ -133,12 +133,19 @@ in
           destination = mkOption {
             type = types.str;
             example = "10.0.0.1:80";
-            description = "Forward tcp connection to destination ip:port";
+            description = "Forward connection to destination ip:port";
+          };
+
+          proto = mkOption {
+            type = types.str;
+            default = "tcp";
+            example = "udp";
+            description = "Protocol of forwarded connection";
           };
         };
       });
       default = [];
-      example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ];
+      example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; proto = "tcp"; } ];
       description =
         ''
           List of forwarded ports from the external interface to

From 688f066da293b32399f414b3dd85e1888afd0244 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Aug 2017 17:04:03 +0200
Subject: [PATCH 1544/3246] haskellPackages.servant: fix hash

---
 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 634d46597b9..c3670613387 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -720,7 +720,7 @@ self: super: {
           owner = "haskell-servant";
           repo = "servant";
           rev = "v${ver}";
-          sha256 = "09kjinnarf9q9l8irs46gcrai8bprq39n8pj43bmdv47hl38csa0";
+          sha256 = "0bwd5dy3crn08dijn06dr3mdsww98kqxfp8v5mvrdws5glvcxdsg";
         }}/doc";
         buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
         makeFlags = "html";

From 1da02642bcfc46f91bbc3d72dc3e84ded328b9c8 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Aug 2017 17:14:55 +0200
Subject: [PATCH 1545/3246] logrotate: 3.9.1 -> 3.12.3, fix build

closes #27916
---
 pkgs/tools/system/logrotate/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index af7e4543579..1c8b386fc8c 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -1,23 +1,28 @@
-{ stdenv, fetchurl, gzip, popt }:
+{ stdenv, fetchFromGitHub, mailutils, gzip, popt, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "logrotate-3.9.1";
+  name = "logrotate-${version}";
+  version = "3.12.3";
 
-  src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz";
-    sha256 = "0i95qnacv5wf7kfkcpi38ys3i14fr01ifhm8b4ari04c53inj9q2";
+  src = fetchFromGitHub {
+    owner = "logrotate";
+    repo = "logrotate";
+    rev = version;
+    sha256 = "04ygb709fj4ai8m2f1c6imzcmkdvr3ib5zf5qw2lif4fsb30jvyi";
   };
 
   # Logrotate wants to access the 'mail' program; to be done.
   patchPhase = ''
     sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \
-           -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' config.h
+           -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' \
+           -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac
   '';
 
-  preBuild = ''
-    makeFlags="BASEDIR=$out"
+  autoreconfPhase = ''
+    ./autogen.sh
   '';
 
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ popt ];
 
   meta = {
@@ -27,5 +32,4 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.viric ];
     platforms = stdenv.lib.platforms.all;
   };
-
 }

From b18b70c74d5a2eadde6985ee9b2fac3411374eb5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Aug 2017 17:52:42 +0200
Subject: [PATCH 1546/3246] nixos.tests.nat: fix

---
 nixos/tests/nat.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index f1097cdfc49..a12b7645bc2 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -102,17 +102,17 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
 
         # If we turn off NAT, the client shouldn't be able to reach the server.
         $router->succeed("${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1");
-        # FIXME: this should not be necessary, but nat.service is not started because
-        #        network.target is not triggered
-        #        (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359)
-        ${lib.optional (!withFirewall) ''
-          $router->succeed("systemctl start nat.service");
-        ''}
         $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
         $client->fail("ping -c 1 server >&2");
 
         # And make sure that reloading the NAT job works.
         $router->succeed("${routerClosure}/bin/switch-to-configuration test 2>&1");
+        # FIXME: this should not be necessary, but nat.service is not started because
+        #        network.target is not triggered
+        #        (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359)
+        ${lib.optionalString (!withFirewall) ''
+          $router->succeed("systemctl start nat.service");
+        ''}
         $client->succeed("curl --fail http://server/ >&2");
         $client->succeed("ping -c 1 server >&2");
       '';

From 92461b8f9c0d4f12b2d91f646bd62e23aa0af50f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 4 Aug 2017 12:06:00 -0400
Subject: [PATCH 1547/3246] rkt: 1.28.0 -> 1.28.1

---
 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 885ffde8a50..a23537847a1 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.28.0";
+  version = "1.28.1";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     owner = "coreos";
     repo = "rkt";
     rev = "v${version}";
-    sha256 = "08bzi44rs4g8cxb44pxh7ln85zhkhmi40r8mb73kibnnzd008vg3";
+    sha256 = "1xn2cz30gq0500gmp5aml03hmk066fq9i04jizb5sc0j41fmsgja";
   };
 
   stage1BaseImage = fetchurl {

From 2a9ef2fafc7b58618620fe3d9e41184783e7f68b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Aug 2017 16:13:21 +0000
Subject: [PATCH 1548/3246] ocamlPackages.cryptokit: 1.11 -> 1.13

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

diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 58fbc813362..41214624427 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -5,9 +5,9 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12";
 let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.02"
   then {
-    version = "1.11";
-    url = http://forge.ocamlcore.org/frs/download.php/1618/cryptokit-1.11.tar.gz;
-    sha256 = "1c1vn15lf2b5a8nfa2v2brxm7bwby540nf6q0vkndgkq5qcw96j8";
+    version = "1.13";
+    url = https://github.com/xavierleroy/cryptokit/archive/release113.tar.gz;
+    sha256 = "1f4jjnp2a911nqw0hbijyv9vygkk6kw5zx75qs49hfm3by6ij8rq";
     inherit zarith;
   } else {
     version = "1.10";

From 53bd6cf417c82203d67e2a25611b05c119dc6d16 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Aug 2017 16:14:41 +0000
Subject: [PATCH 1549/3246] =?UTF-8?q?ocamlPackages.ocamlnet:=20mark=20as?=
 =?UTF-8?q?=20broken=20with=20OCaml=20=E2=89=A5=204.05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index fc7640cc0c9..82747b7a876 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation {
     maintainers = [
       stdenv.lib.maintainers.z77z
     ];
+    broken = stdenv.lib.versionAtLeast ocaml.version "4.05";
   };
 }

From e355f7044d7efaa49761bc4d4f43e94b0f2f3ab2 Mon Sep 17 00:00:00 2001
From: evujumenuk <evujumenuk@mailinator.com>
Date: Fri, 4 Aug 2017 18:30:53 +0200
Subject: [PATCH 1550/3246] wireguard: add per-peer routing table option

This adds a convenient per-peer option to set the routing table that associated routes are added to. This functionality is very useful for isolating interfaces from the kernel's global routing and forcing all traffic of a virtual interface (or a group of processes, via e.g. "ip rule add uidrange 10000-10009 lookup 42") through Wireguard.
---
 .../modules/services/networking/wireguard.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index be832ea45d8..f76909af4ca 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -160,6 +160,14 @@ let
         interval of 25 seconds; however, most users will not need this.'';
       };
 
+      table = mkOption {
+        default = "main";
+        type = types.str;
+        description = ''The kernel routing table to add this peer's associated
+        routes to. Setting this is useful for e.g. policy routing ("ip rule")
+        or virtual routing and forwarding ("ip vrf"). Both numeric table IDs
+        and table names (/etc/rt_tables) can be used. Defaults to "main".'';
+      };
     };
 
   };
@@ -207,9 +215,11 @@ let
 
             "${ipCommand} link set up dev ${name}"
 
-            (map (peer: (map (ip:
-            "${ipCommand} route replace ${ip} dev ${name}"
-            ) peer.allowedIPs)) values.peers)
+            (map (peer:
+            (map (allowedIP:
+            "${ipCommand} route replace ${allowedIP} dev ${name} table ${peer.table}"
+            ) peer.allowedIPs)
+            ) values.peers)
 
             values.postSetup
           ]);
@@ -240,7 +250,8 @@ in
             peers = [
               { allowedIPs = [ "192.168.20.1/32" ];
                 publicKey  = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
-                endpoint   = "demo.wireguard.io:12913"; }
+                endpoint   = "demo.wireguard.io:12913";
+                table      = "42"; }
             ];
           };
         };

From 6463fd3d7e9b0131ba22603a764b4b35ab215e66 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 2 Aug 2017 12:48:51 -0400
Subject: [PATCH 1551/3246] cc-wrapper: Pass shellcheck and other cleanups

In many cases, this involved taking @orivej's and @edolstra's recent
ld-wrapper improvements, and applying then elsewhere.
---
 pkgs/build-support/cc-wrapper/add-flags.sh    | 21 +++--
 .../build-support/cc-wrapper/add-hardening.sh | 30 +++++--
 pkgs/build-support/cc-wrapper/cc-wrapper.sh   | 82 ++++++++++---------
 pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 81 +++++++++---------
 .../cc-wrapper/gnatlink-wrapper.sh            | 40 +++++----
 .../cc-wrapper/ld-solaris-wrapper.sh          | 35 +++-----
 pkgs/build-support/cc-wrapper/ld-wrapper.sh   | 38 +++++----
 pkgs/build-support/cc-wrapper/setup-hook.sh   | 23 ++++--
 pkgs/build-support/cc-wrapper/utils.sh        |  6 +-
 9 files changed, 195 insertions(+), 161 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 5634c82aa28..1edfe8bfc75 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -1,28 +1,37 @@
 # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
 export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"
 
+# Export and assign separately in order that a failing $(..) will fail
+# the script.
+
 if [ -e @out@/nix-support/libc-cflags ]; then
-    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
+    export NIX_CFLAGS_COMPILE
+    NIX_CFLAGS_COMPILE="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
 fi
 
 if [ -e @out@/nix-support/cc-cflags ]; then
-    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE"
+    export NIX_CFLAGS_COMPILE
+    NIX_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE"
 fi
 
 if [ -e @out@/nix-support/gnat-cflags ]; then
-    export NIX_GNATFLAGS_COMPILE="$(cat @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE"
+    export NIX_GNATFLAGS_COMPILE
+    NIX_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE"
 fi
 
 if [ -e @out@/nix-support/libc-ldflags ]; then
-    export NIX_LDFLAGS+=" $(cat @out@/nix-support/libc-ldflags)"
+    export NIX_LDFLAGS
+    NIX_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)"
 fi
 
 if [ -e @out@/nix-support/cc-ldflags ]; then
-    export NIX_LDFLAGS+=" $(cat @out@/nix-support/cc-ldflags)"
+    export NIX_LDFLAGS
+    NIX_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)"
 fi
 
 if [ -e @out@/nix-support/libc-ldflags-before ]; then
-    export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"
+    export NIX_LDFLAGS_BEFORE
+    NIX_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"
 fi
 
 export NIX_CC_WRAPPER_FLAGS_SET=1
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index b98833b3513..c91ff0a9d0b 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -1,18 +1,32 @@
 hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow)
-hardeningFlags+=("${hardeningEnable[@]}")
+# Intentionally word-split in case 'hardeningEnable' is defined in Nix.
+hardeningFlags+=(${hardeningEnable[@]})
 hardeningCFlags=()
 hardeningLDFlags=()
-hardeningDisable=${hardeningDisable:-""}
 
-hardeningDisable+=" @hardening_unsupported_flags@"
+declare -A hardeningDisableMap
 
-if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: Value of '$hardeningDisable': $hardeningDisable >&2; fi
+# Intentionally word-split in case 'hardeningDisable' is defined in Nix. The
+# array expansion also prevents undefined variables from causing trouble with
+# `set -u`.
+for flag in ${hardeningDisable[@]} @hardening_unsupported_flags@
+do
+  hardeningDisableMap[$flag]=1
+done
 
-if [[ ! $hardeningDisable =~ "all" ]]; then
-  if [[ -n "$NIX_DEBUG" ]]; then echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; fi
+if [[ -n "$NIX_DEBUG" ]]; then
+  printf 'HARDENING: disabled flags:' >&2
+  (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2
+  echo >&2
+fi
+
+if [[ -z "${hardeningDisableMap[all]}" ]]; then
+  if [[ -n "$NIX_DEBUG" ]]; then
+    echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2;
+  fi
   for flag in "${hardeningFlags[@]}"
   do
-    if [[ ! "${hardeningDisable}" =~ "$flag" ]]; then
+    if [[ -z "${hardeningDisableMap[$flag]}" ]]; then
       case $flag in
         fortify)
           if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling fortify >&2; fi
@@ -20,7 +34,7 @@ if [[ ! $hardeningDisable =~ "all" ]]; then
           ;;
         stackprotector)
           if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling stackprotector >&2; fi
-          hardeningCFlags+=('-fstack-protector-strong' '--param ssp-buffer-size=4')
+          hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
           ;;
         pie)
           if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 99eb63f40ed..96655656607 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -1,7 +1,14 @@
-#! @shell@ -e
+#! @shell@
+set -e -o pipefail
+shopt -s nullglob
+
 path_backup="$PATH"
-if [ -n "@coreutils_bin@" ]; then
-  PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
+
+# That @-vars are substituted separately from bash evaluation makes
+# shellcheck think this, and others like it, are useless conditionals.
+# shellcheck disable=SC2157
+if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then
+    PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
 fi
 
 if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then
@@ -19,16 +26,17 @@ source @out@/nix-support/utils.sh
 # For instance, figure out if linker flags should be passed.
 # GCC prints annoying warnings when they are not needed.
 dontLink=0
-getVersion=0
 nonFlagArgs=0
+# shellcheck disable=SC2193
 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0
 cppInclude=1
 
 expandResponseParams "$@"
-n=0
-while [ $n -lt ${#params[*]} ]; do
+declare -i n=0
+nParams=${#params[@]}
+while [ "$n" -lt "$nParams" ]; do
     p=${params[n]}
-    p2=${params[$((n+1))]}
+    p2=${params[n+1]}
     if [ "$p" = -c ]; then
         dontLink=1
     elif [ "$p" = -S ]; then
@@ -55,10 +63,10 @@ while [ $n -lt ${#params[*]} ]; do
         nonFlagArgs=1
     elif [ "$p" = -m32 ]; then
         if [ -e @out@/nix-support/dynamic-linker-m32 ]; then
-            NIX_LDFLAGS+=" -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
+            NIX_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)"
         fi
     fi
-    n=$((n + 1))
+    n+=1
 done
 
 # If we pass a flag like -Wl, then gcc will call the linker unless it
@@ -71,26 +79,27 @@ if [ "$nonFlagArgs" = 0 ]; then
 fi
 
 # Optionally filter out paths not refering to the store.
-if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then
+if [[ "$NIX_ENFORCE_PURITY" = 1 && -n "$NIX_STORE" ]]; then
     rest=()
-    n=0
-    while [ $n -lt ${#params[*]} ]; do
+    nParams=${#params[@]}
+    declare -i n=0
+    while [ "$n" -lt "$nParams" ]; do
         p=${params[n]}
-        p2=${params[$((n+1))]}
+        p2=${params[n+1]}
         if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
-            skip $p
+            skip "${p:2}"
         elif [ "$p" = -L ] && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
+            n+=1; skip "$p2"
         elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then
-            skip $p
+            skip "${p:2}"
         elif [ "$p" = -I ] && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
+            n+=1; skip "$p2"
         elif [ "$p" = -isystem ] && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
+            n+=1; skip "$p2"
         else
             rest+=("$p")
         fi
-        n=$((n + 1))
+        n+=1
     done
     params=("${rest[@]}")
 fi
@@ -99,11 +108,11 @@ fi
 # Clear march/mtune=native -- they bring impurity.
 if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then
     rest=()
-    for i in "${params[@]}"; do
-        if [[ "$i" = -m*=native ]]; then
-            skip $i
+    for p in "${params[@]}"; do
+        if [[ "$p" = -m*=native ]]; then
+            skip "$p"
         else
-            rest+=("$i")
+            rest+=("$p")
         fi
     done
     params=("${rest[@]}")
@@ -116,23 +125,22 @@ if [[ "$isCpp" = 1 ]]; then
     NIX_CFLAGS_LINK+=" $NIX_CXXSTDLIB_LINK"
 fi
 
-LD=@ldPath@/ld
 source @out@/nix-support/add-hardening.sh
 
 # Add the flags for the C compiler proper.
-extraAfter=($NIX_CFLAGS_COMPILE ${hardeningCFlags[@]})
+extraAfter=($NIX_CFLAGS_COMPILE "${hardeningCFlags[@]}")
 extraBefore=()
 
 if [ "$dontLink" != 1 ]; then
 
     # Add the flags that should only be passed to the compiler when
     # linking.
-    extraAfter+=($NIX_CFLAGS_LINK ${hardeningLDFlags[@]})
+    extraAfter+=($NIX_CFLAGS_LINK "${hardeningLDFlags[@]}")
 
     # Add the flags that should be passed to the linker (and prevent
     # `ld-wrapper' from adding NIX_LDFLAGS again).
     for i in $NIX_LDFLAGS_BEFORE; do
-        extraBefore=(${extraBefore[@]} "-Wl,$i")
+        extraBefore+=("-Wl,$i")
     done
     for i in $NIX_LDFLAGS; do
         if [ "${i:0:3}" = -L/ ]; then
@@ -155,18 +163,12 @@ fi
 
 # Optionally print debug info.
 if [ -n "$NIX_DEBUG" ]; then
-  echo "original flags to @prog@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @prog@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @prog@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
+    echo "extra flags before to @prog@:" >&2
+    printf "  %q\n" "${extraBefore[@]}"  >&2
+    echo "original flags to @prog@:" >&2
+    printf "  %q\n" "${params[@]}" >&2
+    echo "extra flags after to @prog@:" >&2
+    printf "  %q\n" "${extraAfter[@]}" >&2
 fi
 
 if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then
@@ -174,4 +176,4 @@ if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then
 fi
 
 PATH="$path_backup"
-exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}"
+exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index 0d74527dd8a..dd97a07bd19 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -1,7 +1,13 @@
-#! @shell@ -e
+#! @shell@
+set -e -o pipefail
+shopt -s nullglob
+
 path_backup="$PATH"
+
+# phase separation makes this look useless
+# shellcheck disable=SC2157
 if [ -n "@coreutils_bin@" ]; then
-  PATH="@coreutils_bin@/bin"
+    PATH="@coreutils_bin@/bin"
 fi
 
 if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then
@@ -18,7 +24,6 @@ source @out@/nix-support/utils.sh
 # Figure out if linker flags should be passed.  GCC prints annoying
 # warnings when they are not needed.
 dontLink=0
-getVersion=0
 nonFlagArgs=0
 
 for i in "$@"; do
@@ -30,7 +35,7 @@ for i in "$@"; do
         nonFlagArgs=1
     elif [ "$i" = -m32 ]; then
         if [ -e @out@/nix-support/dynamic-linker-m32 ]; then
-            NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
+            NIX_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)"
         fi
     fi
 done
@@ -47,24 +52,20 @@ fi
 
 # Optionally filter out paths not refering to the store.
 params=("$@")
-if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then
+if [[ "$NIX_ENFORCE_PURITY" = 1 && -n "$NIX_STORE" ]]; then
     rest=()
-    n=0
-    while [ $n -lt ${#params[*]} ]; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
+    for p in "${params[@]}"; do
         if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
-            skip $p
+            skip "${p:2}"
         elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then
-            skip $p
+            skip "${p:2}"
         elif [ "${p:0:4}" = -aI/ ] && badPath "${p:3}"; then
-            skip $p
+            skip "${p:2}"
         elif [ "${p:0:4}" = -aO/ ] && badPath "${p:3}"; then
-            skip $p
+            skip "${p:2}"
         else
             rest+=("$p")
         fi
-        n=$((n + 1))
     done
     params=("${rest[@]}")
 fi
@@ -73,11 +74,11 @@ fi
 # Clear march/mtune=native -- they bring impurity.
 if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then
     rest=()
-    for i in "${params[@]}"; do
-        if [[ "$i" = -m*=native ]]; then
-            skip $i
+    for p in "${params[@]}"; do
+        if [[ "$p" = -m*=native ]]; then
+            skip "$p"
         else
-            rest+=("$i")
+            rest+=("$p")
         fi
     done
     params=("${rest[@]}")
@@ -88,30 +89,34 @@ fi
 extraAfter=($NIX_GNATFLAGS_COMPILE)
 extraBefore=()
 
-if [ "`basename $0`x" = "gnatmakex" ]; then
-  extraBefore=("--GNATBIND=@out@/bin/gnatbind --GNATLINK=@out@/bin/gnatlink ")
+if [ "$(basename "$0")x" = "gnatmakex" ]; then
+  extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink ")
 fi
 
-# Add the flags that should be passed to the linker (and prevent
-# `ld-wrapper' from adding NIX_LDFLAGS again).
-#for i in $NIX_LDFLAGS_BEFORE; do
-#    extraBefore=(${extraBefore[@]} "-largs $i")
-#done
+#if [ "$dontLink" != 1 ]; then
+#    # Add the flags that should be passed to the linker (and prevent
+#    # `ld-wrapper' from adding NIX_LDFLAGS again).
+#    for i in $NIX_LDFLAGS_BEFORE; do
+#        extraBefore+=("-largs" "$i")
+#    done
+#    for i in $NIX_LDFLAGS; do
+#        if [ "${i:0:3}" = -L/ ]; then
+#            extraAfter+=("$i")
+#        else
+#            extraAfter+=("-largs" "$i")
+#        fi
+#    done
+#    export NIX_LDFLAGS_SET=1
+#fi
 
 # Optionally print debug info.
 if [ -n "$NIX_DEBUG" ]; then
-  echo "original flags to @prog@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @prog@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @prog@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
+    echo "extra flags before to @prog@:" >&2
+    printf "  %q\n" "${extraBefore[@]}"  >&2
+    echo "original flags to @prog@:" >&2
+    printf "  %q\n" "${params[@]}" >&2
+    echo "extra flags after to @prog@:" >&2
+    printf "  %q\n" "${extraAfter[@]}" >&2
 fi
 
 if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then
@@ -119,4 +124,4 @@ if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then
 fi
 
 PATH="$path_backup"
-exec @prog@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
+exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
index c9958dbbb41..3c1a805c3fa 100644
--- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
@@ -1,33 +1,37 @@
-#! @shell@ -e
+#! @shell@
+set -e -o pipefail
+shopt -s nullglob
 
 # Add the flags for the GNAT compiler proper.
-extraAfter="--GCC=@out@/bin/gcc"
+extraAfter=("--GCC=@out@/bin/gcc")
 extraBefore=()
 
-# Add the flags that should be passed to the linker (and prevent
-# `ld-wrapper' from adding NIX_LDFLAGS again).
+## Add the flags that should be passed to the linker (and prevent
+## `ld-wrapper' from adding NIX_LDFLAGS again).
 #for i in $NIX_LDFLAGS_BEFORE; do
-#    extraBefore=(${extraBefore[@]} "-largs $i")
+#    extraBefore+=("-largs" "$i")
 #done
+#for i in $NIX_LDFLAGS; do
+#    if [ "${i:0:3}" = -L/ ]; then
+#        extraAfter+=("$i")
+#    else
+#        extraAfter+=("-largs" "$i")
+#    fi
+#done
+#export NIX_LDFLAGS_SET=1
 
 # Optionally print debug info.
 if [ -n "$NIX_DEBUG" ]; then
-  echo "original flags to @prog@:" >&2
-  for i in "$@"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @prog@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @prog@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
+    echo "extra flags before to @prog@:" >&2
+    printf "  %q\n" "${extraBefore[@]}"  >&2
+    echo "original flags to @prog@:" >&2
+    printf "  %q\n" "$@" >&2
+    echo "extra flags after to @prog@:" >&2
+    printf "  %q\n" "${extraAfter[@]}" >&2
 fi
 
 if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then
     source "$NIX_GNAT_WRAPPER_EXEC_HOOK"
 fi
 
-exec @prog@ ${extraBefore[@]} "$@" ${extraAfter[@]}
+exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
index 263ea5408e9..72c999ff8bc 100755
--- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
@@ -1,40 +1,25 @@
 #!@shell@
+set -eu -o pipefail
+shopt -s nullglob
 
-set -e
-set -u
-
+declare -a args=("$@")
 # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'(
 # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3
 #   but still no success.
-cmd="@ld@ -z ignore"
-
-args=("$@");
+declare -a argsBefore=(-z ignore) argsAfter=()
 
 # This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library.
 # GNU binutils does not have this problem:
 #   http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter
-i=0;
-while [[ $i -lt $# ]]; do
+while (( $# )); do
     case "${args[$i]}" in
-        -L)  cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;;
-        -L*) cmd="$cmd ${args[$i]}" ;;
-        *)   ;;
+        -L)   argsBefore+=("$1" "$2"); shift ;;
+        -L?*) argsBefore+=("$1") ;;
+        *)    argsAfter+=("$1") ;;
     esac
-    i=($i+1);
-done
-
-i=0;
-while [[ $i -lt $# ]]; do
-    case "${args[$i]}" in
-        -L)  i=($i+1); ;;
-        -L*) ;;
-        *)   cmd="$cmd ${args[$i]}" ;;
-    esac
-    i=($i+1);
+    shift
 done
 
 # Trace:
 set -x
-exec $cmd
-
-exit 0
+exec "@ld@" "${argsBefore[@]}" "${argsAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 72c0be304ac..6ee66b0e3f2 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -1,8 +1,13 @@
-#! @shell@ -e
+#! @shell@
+set -e -o pipefail
 shopt -s nullglob
+
 path_backup="$PATH"
+
+# phase separation makes this look useless
+# shellcheck disable=SC2157
 if [ -n "@coreutils_bin@" ]; then
-  PATH="@coreutils_bin@/bin"
+    PATH="@coreutils_bin@/bin"
 fi
 
 if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then
@@ -18,14 +23,14 @@ source @out@/nix-support/utils.sh
 
 # Optionally filter out paths not refering to the store.
 expandResponseParams "$@"
-if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \
-        -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \) ]; then
+if [[ "$NIX_ENFORCE_PURITY" = 1 && -n "$NIX_STORE"
+        && ( -z "$NIX_IGNORE_LD_THROUGH_GCC" || -z "$NIX_LDFLAGS_SET" ) ]]; then
     rest=()
     nParams=${#params[@]}
     declare -i n=0
-    while [ $n -lt $nParams ]; do
+    while [ "$n" -lt "$nParams" ]; do
         p=${params[n]}
-        p2=${params[$((n+1))]}
+        p2=${params[n+1]}
         if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
             skip "${p:2}"
         elif [ "$p" = -L ] && badPath "$p2"; then
@@ -49,18 +54,17 @@ if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \
     params=("${rest[@]}")
 fi
 
-LD=@prog@
 source @out@/nix-support/add-hardening.sh
 
-extra=("${hardeningLDFlags[@]}")
+extraAfter=("${hardeningLDFlags[@]}")
 extraBefore=()
 
 if [ -z "$NIX_LDFLAGS_SET" ]; then
-    extra+=($NIX_LDFLAGS)
+    extraAfter+=($NIX_LDFLAGS)
     extraBefore+=($NIX_LDFLAGS_BEFORE)
 fi
 
-extra+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN)
+extraAfter+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN)
 
 declare -a libDirs
 declare -A libs
@@ -69,7 +73,7 @@ relocatable=
 # Find all -L... switches for rpath, and relocatable flags for build id.
 if [ "$NIX_DONT_SET_RPATH" != 1 ] || [ "$NIX_SET_BUILD_ID" = 1 ]; then
     prev=
-    for p in "${params[@]}" "${extra[@]}"; do
+    for p in "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"; do
         case "$prev" in
             -L)
                 libDirs+=("$p")
@@ -127,7 +131,7 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
                 libs["$file"]=
                 if [ ! "${rpaths[$dir]}" ]; then
                     rpaths["$dir"]=1
-                    extra+=(-rpath "$dir")
+                    extraAfter+=(-rpath "$dir")
                 fi
             fi
         done
@@ -138,16 +142,18 @@ fi
 # Only add --build-id if this is a final link. FIXME: should build gcc
 # with --enable-linker-build-id instead?
 if [ "$NIX_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then
-    extra+=(--build-id)
+    extraAfter+=(--build-id)
 fi
 
 
 # Optionally print debug info.
 if [ -n "$NIX_DEBUG" ]; then
+    echo "extra flags before to @prog@:" >&2
+    printf "  %q\n" "${extraBefore[@]}"  >&2
     echo "original flags to @prog@:" >&2
     printf "  %q\n" "${params[@]}" >&2
-    echo "extra flags to @prog@:" >&2
-    printf "  %q\n" "${extraBefore[@]}" "${extra[@]}" >&2
+    echo "extra flags after to @prog@:" >&2
+    printf "  %q\n" "${extraAfter[@]}" >&2
 fi
 
 if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then
@@ -155,4 +161,4 @@ if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then
 fi
 
 PATH="$path_backup"
-exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extra[@]}"
+exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 104b82425f2..2bf507ce8df 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -1,45 +1,50 @@
 addCVars () {
-    if [ -d $1/include ]; then
+    if [[ -d "$1/include" ]]; then
         export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
     fi
 
-    if [ -d $1/lib64 -a ! -L $1/lib64 ]; then
+    if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
         export NIX_LDFLAGS+=" -L$1/lib64"
     fi
 
-    if [ -d $1/lib ]; then
+    if [[ -d "$1/lib" ]]; then
         export NIX_LDFLAGS+=" -L$1/lib"
     fi
 
-    if test -d $1/Library/Frameworks; then
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -F$1/Library/Frameworks"
+    if [[ -d "$1/Library/Frameworks" ]]; then
+        export NIX_CFLAGS_COMPILE+=" -F$1/Library/Frameworks"
     fi
 }
 
 envHooks+=(addCVars)
 
-# Note: these come *after* $out in the PATH (see setup.sh).
+# Note 1: these come *after* $out in the PATH (see setup.sh).
+# Note 2: phase separation makes this look useless to shellcheck.
 
+# shellcheck disable=SC2157
 if [ -n "@cc@" ]; then
     addToSearchPath _PATH @cc@/bin
 fi
 
+# shellcheck disable=SC2157
 if [ -n "@binutils_bin@" ]; then
     addToSearchPath _PATH @binutils_bin@/bin
 fi
 
+# shellcheck disable=SC2157
 if [ -n "@libc_bin@" ]; then
     addToSearchPath _PATH @libc_bin@/bin
 fi
 
+# shellcheck disable=SC2157
 if [ -n "@coreutils_bin@" ]; then
     addToSearchPath _PATH @coreutils_bin@/bin
 fi
 
-if [ -z "$crossConfig" ]; then
-  ENV_PREFIX=""
+if [ -z "${crossConfig:-}" ]; then
+    ENV_PREFIX=""
 else
-  ENV_PREFIX="BUILD_"
+    ENV_PREFIX="BUILD_"
 fi
 
 export NIX_${ENV_PREFIX}CC=@out@
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 87e48da9c8d..267044b2c4f 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -24,11 +24,15 @@ badPath() {
 }
 
 expandResponseParams() {
-    params=("$@")
+    declare -g params=("$@")
     local arg
     for arg in "$@"; do
         if [[ "$arg" == @* ]]; then
+            # phase separation makes this look useless
+            # shellcheck disable=SC2157
             if [ -n "@expandResponseParams@" ]; then
+                # params is used by caller
+                #shellcheck disable=SC2034
                 readarray -d '' params < <("@expandResponseParams@" "$@")
                 return 0
             else

From a753f2fef7be730c64b812ba88ba813545ab4d40 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 4 Aug 2017 13:38:19 -0400
Subject: [PATCH 1552/3246] 17.09 release-notes: New breaking change:
 cc-wrapper exports more env vars

---
 nixos/doc/manual/release-notes/rl-1709.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 9cf86ac29bd..2046081cc2f 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -142,6 +142,18 @@ rmdir /var/lib/ipfs/.ipfs
       being dead and not building with openssl 1.1.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      <literal>cc-wrapper</literal>'s setup-hook now exports a number of
+      environment variables corresponding to binutils binaries,
+      (e.g. <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>,
+      etc). This is done to prevent packages' build systems guessing, which is
+      harder to predict, especially when cross-compiling. However, some packages
+      have broken due to this—their build systems either not supporting, or
+      claiming to support without adequate testing, taking such environment
+      variables as parameters.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>

From 5215ed6b216fedb37bfd241666048d9a4126b2b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Fri, 4 Aug 2017 19:46:16 +0200
Subject: [PATCH 1553/3246] compcert: fix breakage on linux after f130ecd

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb59deba7e8..9f72b84f182 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5221,13 +5221,9 @@ with pkgs;
 
   cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
 
-  compcert = callPackage ../development/compilers/compcert ((
-    if system == "x86_64-linux"
-    then { tools = pkgsi686Linux.stdenv.cc; }
-    else {}
-  ) // {
+  compcert = callPackage ../development/compilers/compcert {
     coq = coq_8_6;
-  });
+  };
 
 
   # Users installing via `nix-env` will likely be using the REPL,

From c0dca2fb00a4e94f995b2752c78f4e67a6c6e7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Fri, 4 Aug 2017 19:46:16 +0200
Subject: [PATCH 1554/3246] coq: 8.6 -> 8.6.1

---
 pkgs/applications/science/logic/coq/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix                 | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index f93856e90e1..284175d2b4c 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -9,7 +9,7 @@
 , ocamlPackages, ncurses
 , buildIde ? true
 , csdp ? null
-, version ? "8.6"
+, version ? "8.6.1"
 }:
 
 let
@@ -18,6 +18,7 @@ let
    "8.5pl2"	= "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3";
    "8.5pl3"	= "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh";
    "8.6"	= "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f";
+   "8.6.1"      = "17cg2c40y9lskkiqfhngavp8yw3shpqgkpihh30xx0rlhn9amy1j";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
   camlp5 = ocamlPackages.camlp5_transitional;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f72b84f182..d93baafaa8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5222,7 +5222,8 @@ with pkgs;
   cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
 
   compcert = callPackage ../development/compilers/compcert {
-    coq = coq_8_6;
+    # Pin the version of coq used in compcert to 8.6 until the next release
+    coq = callPackage ../applications/science/logic/coq { version = "8.6"; };
   };
 
 

From b25d65e0513b59a7767ca627ab61ed84c3ea0768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Fri, 4 Aug 2017 19:46:16 +0200
Subject: [PATCH 1555/3246] coq: use camlp5_strict

The versions of Coq available through this expression do not actually
require camlp5_transitional. We drop this dependency to see if, in the
future, the package camlp5_transitional can be removed from nixpkgs.
---
 pkgs/applications/science/logic/coq/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 284175d2b4c..3f4be58c266 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -21,7 +21,7 @@ let
    "8.6.1"      = "17cg2c40y9lskkiqfhngavp8yw3shpqgkpihh30xx0rlhn9amy1j";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
-  camlp5 = ocamlPackages.camlp5_transitional;
+  camlp5 = ocamlPackages.camlp5_strict;
   ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   csdpPatch = if csdp != null then ''
     substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"

From 057ffcf0ddb3f94b8cc6899b6d5bfe7f93f1014e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Fri, 4 Aug 2017 19:46:16 +0200
Subject: [PATCH 1556/3246] coq: adding myself to the maintainers

---
 lib/maintainers.nix                             | 1 +
 pkgs/applications/science/logic/coq/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 17629daea47..c0a8f3f3231 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -632,6 +632,7 @@
   zauberpony = "Elmar Athmer <elmar@athmer.org>";
   zef = "Zef Hemel <zef@zef.me>";
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
+  Zimmi48 = "Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>";
   zohl = "Al Zohali <zohl@fmap.me>";
   zoomulator = "Kim Simmons <zoomulator@gmail.com>";
   zraexy = "David Mell <zraexy@gmail.com>";
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 3f4be58c266..9620140dde4 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -133,7 +133,7 @@ self = stdenv.mkDerivation {
     homepage = http://coq.inria.fr;
     license = licenses.lgpl21;
     branch = coq-version;
-    maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
+    maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ];
     platforms = platforms.unix;
   };
 }; in self

From 0d631365bb413f21af68a3270ea0486201ac2a71 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Fri, 4 Aug 2017 18:18:02 +0000
Subject: [PATCH 1557/3246] bitwig-studio: 2.0 -> 2.1.3, fix desktop file

---
 pkgs/applications/audio/bitwig-studio/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix
index af0d2bbd0e9..c597e42eaa6 100644
--- a/pkgs/applications/audio/bitwig-studio/default.nix
+++ b/pkgs/applications/audio/bitwig-studio/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "bitwig-studio-${version}";
-  version = "2.0";
+  version = "2.1.3";
 
   src = fetchurl {
     url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
-    sha256 = "1m7wdr0f9xi9s7q8vd66hy7fj1k0j3y5ln2yqbjwr76r9g6gkzas";
+    sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];
@@ -80,6 +80,9 @@ stdenv.mkDerivation rec {
     ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio
 
     cp -r usr/share $out/share
+    substitute usr/share/applications/bitwig-studio.desktop \
+      $out/share/applications/bitwig-studio.desktop \
+      --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio
   '';
 
   meta = with stdenv.lib; {

From 6070d91e93c29dc53a2d71c7a9505255f1a48459 Mon Sep 17 00:00:00 2001
From: evujumenuk <evujumenuk@mailinator.com>
Date: Fri, 4 Aug 2017 21:00:45 +0200
Subject: [PATCH 1558/3246] wireguard: remove "table" option from example

Most users will be served well by the default "table" setting ("main").
---
 nixos/modules/services/networking/wireguard.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index f76909af4ca..5aa4f13d452 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -250,8 +250,7 @@ in
             peers = [
               { allowedIPs = [ "192.168.20.1/32" ];
                 publicKey  = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
-                endpoint   = "demo.wireguard.io:12913";
-                table      = "42"; }
+                endpoint   = "demo.wireguard.io:12913"; }
             ];
           };
         };

From 5bf36ca473ad9446a9d700f190f0163089301983 Mon Sep 17 00:00:00 2001
From: Mark Cohen <m@mpc.sh>
Date: Fri, 4 Aug 2017 16:14:26 -0400
Subject: [PATCH 1559/3246] material-icons-ttf -> material-icons

---
 .../fonts/{material-icons-ttf => material-icons}/default.nix    | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/data/fonts/{material-icons-ttf => material-icons}/default.nix (100%)

diff --git a/pkgs/data/fonts/material-icons-ttf/default.nix b/pkgs/data/fonts/material-icons/default.nix
similarity index 100%
rename from pkgs/data/fonts/material-icons-ttf/default.nix
rename to pkgs/data/fonts/material-icons/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b74ee2cfd4e..4e159ee0173 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13034,7 +13034,7 @@ with pkgs;
 
   man-pages = callPackage ../data/documentation/man-pages { };
 
-  material-icons-ttf = callPackage ../data/fonts/material-icons-ttf { };
+  material-icons = callPackage ../data/fonts/material-icons { };
 
   meslo-lg = callPackage ../data/fonts/meslo-lg {};
 

From 268374cafe7469aeeb20fa3892061169220bd0c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 4 Aug 2017 22:59:20 +0200
Subject: [PATCH 1560/3246] docker: update runc commit

This updates to the new runc as was also done upstream:

https://github.com/docker/docker-ce/commit/f3ef17e47ddd86d84e07bd182a7fef9b0af88ded

In particular, it fixes an issue where output of interactive docker containers
would not reset correctly to the beginning of a line.
---
 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 c42b2a098f7..74feae05b41 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -173,8 +173,8 @@ rec {
     version = "17.06.0-ce";
     rev = "02c1d876176546b5f069dae758d6a7d2ead6bd48"; # git commit
     sha256 = "0wrg4ygcq4c7f2bwa7pgc7y33idg0hijavx40588jaglz4k8sqpm";
-    runcRev = "992a5be178a62e026f4069f443c6164912adbf09";
-    runcSha256 = "0ylkbn5rprw5cgxazvrwj7balikpfm8vlybwdbfpwnsqk3gc6p8k";
+    runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4";
+    runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq";
     containerdRev = "cfb82a876ecc11b5ca0977d1733adbe58599088a";
     containerdSha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552";
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";

From dc74b1a86d585648441933d556ac465372e9d950 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 4 Aug 2017 23:58:45 +0200
Subject: [PATCH 1561/3246] git: 2.13.4 -> 2.14.0

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index aa8ab008403..0b93ae1f203 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -12,7 +12,7 @@
 }:
 
 let
-  version = "2.13.4";
+  version = "2.14.0";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1nmg0n9l5ix876iqhcyhdnmiy7ihv0ybdijf1lssch6ja8m5j6ip";
+    sha256 = "0xarcp0m7jbncic0g3ahz8l2d6b27h0g9ndgrhy9abkx61m6wgpr";
   };
 
   hardeningDisable = [ "format" ];

From acf05ea777a4ac57de1f64bc437c64c3f8ca7284 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 4 Aug 2017 19:54:13 -0500
Subject: [PATCH 1562/3246] dropbox: 31.4.24 -> 31.4.25

---
 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 f8766cca30b..af4ec08ff00 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -24,11 +24,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "31.4.24";
+  version = "31.4.25";
   sha256 =
     {
-      "x86_64-linux" = "195k8nq1ssrw6zxp78njclaj8a1cs73kika6b7pg58m5lr3qlqnm";
-      "i686-linux"   = "0rr4dxns9gkha42y0aqd7l657q9wxdzdkf3ckyiw9bh27y8jp36m";
+      "x86_64-linux" = "02qla89gf7zawfk0kxd3xzr7vb91khj3p83bvh456ap51h0z5wzv";
+      "i686-linux"   = "0sfh24qyc91q6ssn8lrzfdsv4jjy0hvgizcq3y3fk46zaa7jjxr2";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From eb7312ca7d00cd4d8d424b8f79e1c37c1b4991bf Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 5 Aug 2017 10:48:50 +0200
Subject: [PATCH 1563/3246] maxima: 5.39.0 -> 5.40.0

---
 pkgs/applications/science/math/maxima/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 0ba1212567f..8a84ed78b78 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.39.0";
+  version = "5.40.0";
 
   searchPath =
     stdenv.lib.makeBinPath
@@ -15,7 +15,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "1cvignn5y6qzrby6qb885yc8zdcdqdr1d50vcvc3gapw2f0gk3zm";
+    sha256 = "15pp35ayglv723bjbqc60gcdv2bm54s6pywsm4i4cwbjsf64dzkl";
   };
 
   buildInputs = stdenv.lib.filter (x: x != null)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8671c1c8ec..bd030f917ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18331,7 +18331,6 @@ with pkgs;
   geogebra = callPackage ../applications/science/math/geogebra { };
 
   maxima = callPackage ../applications/science/math/maxima {
-    sbcl = sbcl_1_3_12;
     ecl = null;
   };
   maxima-ecl = callPackage ../applications/science/math/maxima {

From 7d0b001d4a5653ce87f6e10475fba8e3c55d2af8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 3 Aug 2017 08:09:30 -0400
Subject: [PATCH 1564/3246] nixos,nixpkgs: only build essentials on i686

---
 nixos/release-combined.nix       | 22 ++++++++++++++++------
 nixos/release.nix                |  2 +-
 pkgs/top-level/release-small.nix |  2 +-
 pkgs/top-level/release.nix       | 32 ++++++++++++++------------------
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ecbd317cb9a..26e689a7c92 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -4,7 +4,8 @@
 
 { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
+, supportedSystems ? [ "x86_64-linux" ]
+, limitedSupportedSystems ? [ "i686-linux" ]
 }:
 
 let
@@ -19,10 +20,16 @@ let
       else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
     else set;
 
+  allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
+    supportedSystems = supportedSystems ++ limitedSupportedSystems;
+    nixpkgs = nixpkgsSrc;
+  })) [ "unstable" ];
+
 in rec {
 
   nixos = removeMaintainers (import ./release.nix {
-    inherit stableBranch supportedSystems;
+    inherit stableBranch;
+    supportedSystems = supportedSystems ++ limitedSupportedSystems;
     nixpkgs = nixpkgsSrc;
   });
 
@@ -38,8 +45,11 @@ in rec {
       maintainers = [ pkgs.lib.maintainers.eelco ];
     };
     constituents =
-      let all = x: map (system: x.${system}) supportedSystems; in
-      [ nixos.channel
+      let
+        all = x: map (system: x.${system})
+          (supportedSystems ++ limitedSupportedSystems);
+      in [
+        nixos.channel
         (all nixos.dummy)
         (all nixos.manual)
 
@@ -106,8 +116,8 @@ in rec {
         (all nixos.tests.xfce)
 
         nixpkgs.tarball
-        (all nixpkgs.emacs)
-        (all nixpkgs.jdk)
+        (all allSupportedNixpkgs.emacs)
+        (all allSupportedNixpkgs.jdk)
       ];
   });
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 0dbdadf9781..9604da5a4d7 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,6 +1,6 @@
 { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
+, supportedSystems ? [ "x86_64-linux" ]
 }:
 
 with import ../lib;
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index f329f2460d7..40218a2b702 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -2,7 +2,7 @@
    the load on Hydra when testing the `stdenv-updates' branch. */
 
 { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
-, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
+, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
 }:
 
 with import ./release-lib.nix { inherit supportedSystems; };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 9e4c204c25d..3b45035d114 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -8,20 +8,23 @@
 
    $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
 */
-
 { 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" "aarch64-linux" ]
-, # Strip most of attributes when evaluating to spare memory usage
-  scrubJobs ? true
-, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
-  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
+  # The platforms for which we build Nixpkgs.
+, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarchh64-linux" ]
+, limitedSupportedSystems ? [ "i686-linux" ]
+  # Strip most of attributes when evaluating to spare memory usage
+,  scrubJobs ? true
+  # Attributes passed to nixpkgs. Don't build packages marked as unfree.
+,  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
 }:
 
 with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
 
 let
+
+  systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems;
+
   jobs =
     { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
 
@@ -55,43 +58,36 @@ let
               jobs.manual
               jobs.lib-tests
               jobs.stdenv.x86_64-linux
-              jobs.stdenv.i686-linux
               jobs.stdenv.x86_64-darwin
               jobs.linux.x86_64-linux
-              jobs.linux.i686-linux
               jobs.python.x86_64-linux
-              jobs.python.i686-linux
               jobs.python.x86_64-darwin
               jobs.python3.x86_64-linux
-              jobs.python3.i686-linux
               jobs.python3.x86_64-darwin
               # Many developers use nix-repl
               jobs.nix-repl.x86_64-linux
-              jobs.nix-repl.i686-linux
               jobs.nix-repl.x86_64-darwin
               # Needed by travis-ci to test PRs
-              jobs.nox.i686-linux
               jobs.nox.x86_64-linux
               jobs.nox.x86_64-darwin
               # Ensure that X11/GTK+ are in order.
               jobs.thunderbird.x86_64-linux
-              jobs.thunderbird.i686-linux
               # Ensure that basic stuff works on darwin
               jobs.git.x86_64-darwin
               jobs.mysql.x86_64-darwin
               jobs.vim.x86_64-darwin
             ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
         };
-    } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) {
+    } // (lib.optionalAttrs (builtins.elem "i686-linux" systemsWithAnySupport) {
       stdenvBootstrapTools.i686-linux =
         { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; };
-    }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) {
+    }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" systemsWithAnySupport) {
       stdenvBootstrapTools.x86_64-linux =
         { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
-    }) // (lib.optionalAttrs (builtins.elem "aarch64-linux" supportedSystems) {
+    }) // (lib.optionalAttrs (builtins.elem "aarch64-linux" systemsWithAnySupport) {
       stdenvBootstrapTools.aarch64-linux =
         { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; };
-    }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) {
+    }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {
       stdenvBootstrapTools.x86_64-darwin =
         let
           bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };

From 0e192d5d4f33ab06ce6f815adabf93949001220e Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Fri, 26 May 2017 16:00:58 +0900
Subject: [PATCH 1565/3246] gnome: Fix the issue `Using the 'memory' GSettings
 backend issue`

---
 .../gnome-3/3.22/apps/evolution/default.nix       |  4 ++++
 .../gnome-3/3.22/apps/seahorse/default.nix        | 13 +++++++------
 .../gnome-3/3.22/core/gnome-contacts/default.nix  | 15 +++++++--------
 .../3.22/core/gnome-control-center/default.nix    |  6 +++++-
 .../3.22/core/gnome-settings-daemon/default.nix   |  6 +++++-
 .../gnome-3/3.22/core/gnome-shell/default.nix     |  4 +++-
 .../gnome-3/3.22/core/tracker/default.nix         | 15 +++++++--------
 7 files changed, 38 insertions(+), 25 deletions(-)

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 c802f9636eb..ed2857d9115 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
@@ -32,6 +32,10 @@ in stdenv.mkDerivation rec {
   configureFlags = [ "--disable-pst-import" "--disable-autoar"
                      "--disable-libcryptui" "--with-openldap"];
 
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES "${dconf}/lib/gio/modules")
+  '';
+
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
index e59df06f8a0..0b64e8af63c 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, vala_0_32
 , pkgconfig, gtk3, glib
-, makeWrapper, itstool, gnupg, libsoup
+, wrapGAppsHook, itstool, gnupg, libsoup
 , gnome3, librsvg, gdk_pixbuf, gpgme
 , libsecret, avahi, p11_kit, openssh }:
 
@@ -14,15 +14,16 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
-                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg
                   gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
-                  libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr
+                  libsecret avahi libsoup p11_kit vala_0_32 gnome3.dconf
                   openssh ];
 
   preFixup = ''
-    wrapProgram "$out/bin/seahorse" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    gappsWrapperArgs+=(
+      --prefix GIO_EXTRA_MODULES "${gnome3.dconf}/lib/gio/modules"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
+    )
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
index 8097cf32ba6..7f58cec9ab7 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, evolution_data_server, db
 , pkgconfig, gtk3, glib, libsecret
 , libchamplain, clutter_gtk, geocode_glib
-, bash, makeWrapper, itstool, folks, libnotify, libxml2
+, bash, wrapGAppsHook, itstool, folks, libnotify, libxml2
 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
 , libsoup, vala_0_32, dbus_glib, automake115x, autoconf }:
 
@@ -18,19 +18,18 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
-                  gnome3.gsettings_desktop_schemas makeWrapper file libnotify
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify
                   folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.dconf
                   libchamplain clutter_gtk geocode_glib
                   vala_0_32 automake115x autoconf db ];
 
   preFixup = ''
-    for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
+    gappsWrapperArgs+=(
+      --prefix GIO_EXTRA_MODULES "${gnome3.dconf}/lib/gio/modules"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
+    )
   '';
 
   patches = [ ./gio_unix.patch ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
index 23d32cdbac3..70869e0ce75 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
-      gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook
+      gnome3.dconf gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook
       networkmanager modemmanager gnome3.gnome-bluetooth grilo tracker
       cracklib ];
 
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = with gnome3; ''
+    gappsWrapperArgs+=(
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share/gnome-control-center"
+    )
     for i in $out/share/applications/*; do
       substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
     done
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
index ff5670935bd..0ecce988463 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
@@ -11,11 +11,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
-      libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
+      dconf libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
       libcanberra_gtk3 upower colord libgweather xkeyboard_config
       polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
       libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ];
 
+  preFixup = with gnome3; ''
+    gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules")
+  '';
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
index 8f77b7e5e3b..3f097d97588 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
       libgweather # not declared at build time, but typelib is needed at runtime
       gnome3.gnome-clocks # schemas needed
       at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon
-      pythonEnv gobjectIntrospection ];
+      pythonEnv gobjectIntrospection dconf ];
 
   installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
 
@@ -39,11 +39,13 @@ in stdenv.mkDerivation rec {
     wrapProgram "$out/bin/gnome-shell" \
       --prefix PATH : "${unzip}/bin" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
       --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
       --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
 
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
+      --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
 
     echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
index 72ebd543e90..9486fd00e94 100644
--- a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, libxml2, upower
 , pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt
+, bash, wrapGAppsHook, itstool, vala_0_32, sqlite, libxslt
 , gnome3, librsvg, gdk_pixbuf, file, libnotify
 , evolution_data_server, gst_all_1, poppler
 , icu, taglib, libjpeg, libtiff, giflib, libcue
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2
                   bzip2 gnome3.totem-pl-parser libxslt
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
+                  gnome3.gsettings_desktop_schemas gnome3.dconf wrapGAppsHook
+                  file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
                   upower libnotify evolution_data_server gnome3.libgee
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
                   poppler icu taglib libjpeg libtiff giflib libvorbis
@@ -31,11 +31,10 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
+    gappsWrapperArgs+=(
+      --prefix GIO_EXTRA_MODULES "${gnome3.dconf}/lib/gio/modules"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
+    )
   '';
 
   meta = with stdenv.lib; {

From c9d419a22bc42f79acfdf766b9d5908cf12ccdbc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Jul 2017 06:24:11 +0200
Subject: [PATCH 1566/3246] gnome: Further fixes for `Using the 'memory'
 GSettings backend issue`

---
 .../modules/services/x11/desktop-managers/gnome3.nix |  2 +-
 pkgs/applications/audio/audio-recorder/default.nix   |  4 ++--
 pkgs/applications/audio/easytag/default.nix          |  4 ++--
 pkgs/applications/audio/sound-juicer/default.nix     |  4 ++--
 pkgs/applications/misc/finalterm/default.nix         |  2 +-
 .../applications/networking/browsers/dwb/default.nix |  2 +-
 .../instant-messengers/telepathy/idle/default.nix    |  9 +++++++--
 .../instant-messengers/telepathy/logger/default.nix  | 12 +++++++++---
 .../telepathy/mission-control/default.nix            |  3 ++-
 pkgs/applications/office/gnucash/2.6.nix             |  2 +-
 .../desktops/gnome-3/3.22/apps/evolution/default.nix |  8 ++------
 pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix |  3 +--
 .../3.22/core/evolution-data-server/default.nix      |  8 +++++---
 .../gnome-3/3.22/core/gnome-contacts/default.nix     |  3 +--
 .../3.22/core/gnome-control-center/default.nix       |  5 ++---
 .../gnome-3/3.22/core/gnome-font-viewer/default.nix  | 10 +++++-----
 .../gnome-3/3.22/core/gnome-screenshot/default.nix   | 10 +++++-----
 .../3.22/core/gnome-settings-daemon/default.nix      |  6 +-----
 .../gnome-3/3.22/core/gnome-shell/default.nix        |  6 +++---
 .../gnome-3/3.22/core/gnome-system-log/default.nix   | 10 +++++-----
 .../3.22/core/gnome-system-monitor/default.nix       | 10 +++++-----
 pkgs/desktops/gnome-3/3.22/core/tracker/default.nix  |  3 +--
 pkgs/desktops/xfce/applications/mousepad.nix         |  2 +-
 pkgs/development/libraries/gvfs/default.nix          |  7 +++++--
 pkgs/tools/inputmethods/ibus/wrapper.nix             |  4 ++--
 pkgs/tools/networking/uget/default.nix               |  4 ++--
 26 files changed, 74 insertions(+), 69 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index c043884f8e0..2434aa1654a 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -176,7 +176,7 @@ in {
 
     services.xserver.updateDbusEnvironment = true;
 
-    environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
+    environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib gnome3.dconf}/lib/gio/modules"
                                                 "${gnome3.glib_networking.out}/lib/gio/modules"
                                                 "${gnome3.gvfs}/lib/gio/modules" ];
     environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath
diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
index e6addd6c4fd..283d4c7d493 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   patches = [ ./icon-names.diff ];
 
   buildInputs = with gst_all_1; [
-    glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 gnome3.dconf
+    glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 (stdenv.lib.getLib gnome3.dconf)
     gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
   ] ++ optional pulseaudioSupport libpulseaudio;
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"'
       '--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"'
-      '--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"')
+      '--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"')
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index 4b357f0c590..f9c9dc2faef 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram $out/bin/easytag \
       --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
-      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
   '';
 
   NIX_LDFLAGS = "-lid3tag -lz";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper pkgconfig intltool ];
   buildInputs = [
     gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
-    itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf
+    itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index 02a97dde4e2..ba550580cba 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
                   gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes
-                  makeWrapper gnome3.dconf
+                  makeWrapper (stdenv.lib.getLib gnome3.dconf)
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
                   gst_all_1.gst-libav
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
       wrapProgram "$f" \
         --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
         --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+        --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
     done
   '';
 
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index 65e515dbb83..add46f8871d 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   postFixup = ''
     wrapProgram "$out/bin/finalterm" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index bd5f757738d..0aacbd2565b 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   preFixup=''
     wrapProgram "$out/bin/dwb" \
-     --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${dconf}/lib/gio/modules" \
+     --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \
      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
     wrapProgram "$out/bin/dwbem" \
      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules"
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index c29c6def2f6..05ea0fda835 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig, dbus_glib, telepathy_glib, libxslt }:
+{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus_glib, telepathy_glib, libxslt, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "telepathy-idle";
@@ -10,7 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
   };
 
-  buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python ];
+  buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/libexec/telepathy-idle" \
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
+  '';
 
   meta = {
     description = "IRC connection manager for the Telepathy framework";
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 4cf0d2a0449..37d5ea2e17b 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig
-, intltool, libxslt, gobjectIntrospection, dbus_libs }:
+, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }:
 
 stdenv.mkDerivation rec {
   project = "telepathy-logger";
@@ -12,13 +12,19 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
 
-  buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
-                  gobjectIntrospection dbus_libs telepathy_glib.python ];
+  buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool makeWrapper
+                  gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ];
 
   nativeBuildInputs = [ libxslt ];
 
   configureFlags = "--enable-call";
 
+  preFixup = ''
+    wrapProgram "$out/libexec/telepathy-logger" \
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
   meta = {
     description = "Logger service for Telepathy framework";
     homepage = http://telepathy.freedesktop.org/wiki/Logger ;
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index a8fc9477707..87ae0210bda 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper, upower }:
+{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-5.16.3";
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/libexec/mission-control-5" \
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index ef824f57a35..50daf38978a 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
         --prefix PERL5LIB ":" "$PERL5LIB"                               \
         --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
         --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
-        --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"  \
+        --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"  \
         --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
     done
 
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 ed2857d9115..8da7fab9037 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib, libnotify, gtkspell3
 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
 , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf, openldap}:
+, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap}:
 
 let
   majVer = gnome3.version;
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
                   libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
                   nss nspr libnotify procps highlight gnome3.libgweather
-                  gnome3.gsettings_desktop_schemas dconf
+                  gnome3.gsettings_desktop_schemas
                   gnome3.libgnome_keyring gnome3.glib_networking openldap ];
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
@@ -32,10 +32,6 @@ in stdenv.mkDerivation rec {
   configureFlags = [ "--disable-pst-import" "--disable-autoar"
                      "--disable-libcryptui" "--with-openldap"];
 
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES "${dconf}/lib/gio/modules")
-  '';
-
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
index 0b64e8af63c..58d5a5b8cdc 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
@@ -16,12 +16,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
                   gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg
                   gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
-                  libsecret avahi libsoup p11_kit vala_0_32 gnome3.dconf
+                  libsecret avahi libsoup p11_kit vala_0_32
                   openssh ];
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix GIO_EXTRA_MODULES "${gnome3.dconf}/lib/gio/modules"
       --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
     )
   '';
diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
index b67795ea59c..a8c3f724b85 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python
+{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf
 , intltool, libsoup, libxml2, libsecret, icu, sqlite
 , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }:
 
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = with gnome3;
-    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
+    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts (stdenv.lib.getLib dconf)
       gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
     ++ stdenv.lib.optional valaSupport vala_0_32;
 
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+      wrapProgram "$f" \
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+        --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
     done
   '';
 
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
index 7f58cec9ab7..34cea5141ba 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
@@ -21,13 +21,12 @@ stdenv.mkDerivation rec {
                   gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify
                   folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.dconf
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   libchamplain clutter_gtk geocode_glib
                   vala_0_32 automake115x autoconf db ];
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix GIO_EXTRA_MODULES "${gnome3.dconf}/lib/gio/modules"
       --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
     )
   '';
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
index 70869e0ce75..b116c2902da 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
-      gnome3.dconf gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook
+      gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook
       networkmanager modemmanager gnome3.gnome-bluetooth grilo tracker
       cracklib ];
 
@@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
 
   preFixup = with gnome3; ''
     gappsWrapperArgs+=(
-      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share/gnome-control-center"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share"
     )
     for i in $out/share/applications/*; do
       substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix
index d0ec2307a85..16d7151ea09 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl
 , pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool
+, bash, wrapGAppsHook, itstool
 , gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook ];
 
   preFixup = ''
-    wrapProgram "$out/bin/gnome-font-viewer" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
+    )
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
index 29ebe8b0ca6..7daf9a7a310 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-, bash, gtk3, glib, makeWrapper
+, bash, gtk3, glib, wrapGAppsHook
 , itstool, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook ];
 
   preFixup = ''
-    wrapProgram "$out/bin/gnome-screenshot" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share"
+    )
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
index 0ecce988463..ff5670935bd 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
@@ -11,15 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
-      dconf libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
+      libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
       libcanberra_gtk3 upower colord libgweather xkeyboard_config
       polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
       libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ];
 
-  preFixup = with gnome3; ''
-    gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules")
-  '';
-
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
index 3f097d97588..2ce3f9e3927 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
       libgweather # not declared at build time, but typelib is needed at runtime
       gnome3.gnome-clocks # schemas needed
       at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon
-      pythonEnv gobjectIntrospection dconf ];
+      pythonEnv gobjectIntrospection (stdenv.lib.getLib dconf) ];
 
   installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
 
@@ -39,13 +39,13 @@ in stdenv.mkDerivation rec {
     wrapProgram "$out/bin/gnome-shell" \
       --prefix PATH : "${unzip}/bin" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
       --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
       --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
 
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
-      --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
 
     echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix
index 50ee229cfa4..aa6f48ac420 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, makeWrapper
+, bash, gtk3, glib, wrapGAppsHook
 , itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
 
 stdenv.mkDerivation rec {
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];
 
   preFixup = ''
-    wrapProgram "$out/bin/gnome-system-log" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share"
+    )
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
index bdbdefecf22..8c3bf86edcf 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
-, bash, gtk3, glib, makeWrapper
+, bash, gtk3, glib, wrapGAppsHook
 , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
 
 stdenv.mkDerivation rec {
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
-                  gtkmm3 libgtop makeWrapper
+                  gtkmm3 libgtop wrapGAppsHook
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gsettings_desktop_schemas ];
 
   preFixup = ''
-    wrapProgram "$out/bin/gnome-system-monitor" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share"
+    )
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
index 9486fd00e94..b086e386059 100644
--- a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2
                   bzip2 gnome3.totem-pl-parser libxslt
-                  gnome3.gsettings_desktop_schemas gnome3.dconf wrapGAppsHook
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook
                   file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
                   upower libnotify evolution_data_server gnome3.libgee
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix GIO_EXTRA_MODULES "${gnome3.dconf}/lib/gio/modules"
       --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
     )
   '';
diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix
index 475b48343a5..c15ab310f47 100644
--- a/pkgs/desktops/xfce/applications/mousepad.nix
+++ b/pkgs/desktops/xfce/applications/mousepad.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/mousepad" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \
-      --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index f225f34c336..11c3134e10b 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -32,9 +32,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # ToDo: one probably should specify schemas for samba and others here
   preFixup = ''
-    wrapProgram $out/libexec/gvfsd --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    for f in $out/libexec/*; do
+      wrapProgram $f \
+        ${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : \"${stdenv.lib.getLib gnome.dconf}/lib/gio/modules\""} \
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index f38705cc9d1..13035698827 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -25,7 +25,7 @@ let
         wrapProgram "$out/bin/$prog" \
           --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
-          --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
+          --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
           --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \
           --set IBUS_DATAROOTDIR "$out/share" \
           --set IBUS_LIBEXECDIR "$out/libexec" \
@@ -44,7 +44,7 @@ let
         wrapProgram "$out/bin/$prog" \
           --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
-          --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
+          --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
           --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \
           --set IBUS_DATAROOTDIR "$out/share" \
           --set IBUS_LIBEXECDIR "$out/libexec" \
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index b5119bc594b..d3877260450 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   
   buildInputs = [
     openssl curl libnotify gstreamer gst-plugins-base gst-plugins-good
-    gnome3.gtk gnome3.dconf
+    gnome3.gtk (stdenv.lib.getLib gnome3.dconf)
   ]
   ++ (stdenv.lib.optional (aria2 != null) aria2);
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       ${stdenv.lib.optionalString (aria2 != null) ''--suffix PATH : "${aria2}/bin"''} \
       --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
-      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
   '';
 
   meta = with stdenv.lib; {

From 2dddc6dcf6711fb3c1264a520262d00f4a3e04da Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 29 May 2017 18:03:07 +0200
Subject: [PATCH 1567/3246] libvirt: don't suspend and resume on change

---
 nixos/modules/virtualisation/libvirtd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index e07fb0f8fe4..57178e05e5c 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -175,6 +175,7 @@ in {
     systemd.services.libvirt-guests = {
       wantedBy = [ "multi-user.target" ];
       path = with pkgs; [ coreutils libvirt gawk ];
+      restartIfChanged = false;
     };
 
     systemd.sockets.virtlogd = {

From 0abf9d2b124cb2f57116ff21dd1d0f16e51a08ba Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 5 Aug 2017 12:05:38 +0100
Subject: [PATCH 1568/3246] Document timezone changes in release notes

---
 nixos/doc/manual/release-notes/rl-1709.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 2046081cc2f..10a36549669 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -187,6 +187,17 @@ rmdir /var/lib/ipfs/.ipfs
       have therefore been removed.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <option>time.timeZone</option> option now allows the value
+      <literal>null</literal> in addition to timezone strings, which sets the
+      timezone to UTC by default and allows changing it imperatively using
+      <command>timedatectl set-timezone</command>. This is additionally now the
+      default value for the option, which means that systems where the option
+      has not been set explicitly will continue to use UTC but allow imperative
+      timezone adjustments now.
+    </para>
+  </listitem>
 
 </itemizedlist>
 

From 28b0a79c040549afa99900780892d36a7ffe992c Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Sat, 5 Aug 2017 13:17:50 +0200
Subject: [PATCH 1569/3246] nodejs: remove version 7_x

nodejs v7 reached its end of life in June 2017.
---
 pkgs/development/web/nodejs/v7.nix | 21 ---------------------
 pkgs/top-level/all-packages.nix    | 11 +----------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/v7.nix

diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
deleted file mode 100644
index 86d4fed8eab..00000000000
--- a/pkgs/development/web/nodejs/v7.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool, fetchpatch
-, callPackage
-, darwin ? null
-, enableNpm ? true
-}@args:
-
-let
-  nodejs = import ./nodejs.nix args;
-  baseName = if enableNpm then "nodejs" else "nodejs-slim";
-in
-  stdenv.mkDerivation (nodejs // rec {
-    version = "7.10.1";
-    name = "${baseName}-${version}";
-    src = fetchurl {
-      url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "654db852149a1cc59ece68ec573b0486907e8febe8353cee097dd29ea5a56cfa";
-    };
-
-    patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
-  })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd030f917ae..27948043471 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1052,7 +1052,7 @@ with pkgs;
   glock = callPackage ../development/tools/glock { };
 
   glslviewer = callPackage ../development/tools/glslviewer { };
-  
+
   gmic = callPackage ../tools/graphics/gmic { };
 
   goa = callPackage ../development/tools/goa { };
@@ -2901,15 +2901,6 @@ with pkgs;
     enableNpm = false;
   };
 
-  nodejs-7_x = callPackage ../development/web/nodejs/v7.nix {
-    libtool = darwin.cctools;
-  };
-
-  nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix {
-    libtool = darwin.cctools;
-    enableNpm = false;
-  };
-
   nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {
     libtool = darwin.cctools;
   };

From 0a142d311210d0898c538533e377a2696e3e33df Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 30 Jul 2017 04:15:26 +0200
Subject: [PATCH 1570/3246] wrap-gapps-hook: also wrap symlinks to executables

Some programs store the executable in a different place and link it
from the `bin` directory. For example, Polari links `$out/bin/polari`
to `$out/share/polari/org.gnome.Polari`. `wrapGAppsHook` did not follow
symlinks so it was not able to wrap Polari, making it unable to access
GObject introspection definitions required for running the program.

I made the wrapping script follow symlinks to fix this corner case.
---
 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 9891128a623..79b8d5b73fa 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -39,7 +39,7 @@ wrapGAppsHook() {
     targetDirs=( "${prefix}/bin" "${prefix}/libexec" )
     for targetDir in "${targetDirs[@]}"; do
       if [[ -d "${targetDir}" ]]; then
-        find "${targetDir}" -type f -executable -print0 \
+        find -L "${targetDir}" -type f -executable -print0 \
           | while IFS= read -r -d '' file; do
           echo "Wrapping program ${file}"
           wrapProgram "${file}" "${gappsWrapperArgs[@]}"

From ec6f8320f4070d82b89c44bc7f9b52484853ee98 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 30 Jul 2017 04:20:59 +0200
Subject: [PATCH 1571/3246] polari: unbreak

The build was failing due to missing telepathy_logger dependency,
I added it. Additionally, the connection to server was failing due to
telepathy executables not having an access to dconf, which was fixed
in #26113. Lastly, when I tried running Polari directly, it terminated
with SIGTRAP and the following error:

    (org.gnome.Polari:22998): GLib-GIO-ERROR **: Settings schema 'org.gnome.desktop.interface' is not installed

adding `gnome3.gsettings_desktop_schemas` as a buildInput fixed that.
---
 pkgs/desktops/gnome-3/3.22/apps/polari/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
index a827831c801..f14a1ef3c47 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
@@ -1,15 +1,15 @@
 { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
 , telepathy_glib, gjs, itstool, telepathy_idle, libxml2
 , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup
-, gnome3, wrapGAppsHook }:
+, gnome3, wrapGAppsHook, telepathy_logger }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  propagatedUserEnvPkgs = [ telepathy_idle ];
+  propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook
-                  telepathy_glib gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ];
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
+                  telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ];
 
   enableParallelBuilding = true;
 
@@ -19,6 +19,5 @@ stdenv.mkDerivation rec {
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    broken = true;
   };
 }

From c7c24740a94a701d7667566f63e61a60a08a2aac Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 5 Aug 2017 13:29:00 +0200
Subject: [PATCH 1572/3246] obelisk: fix hash

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

diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index 193ecd75f57..1ec0fef49d3 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 		owner = "Lelio-Brun";
 		repo = "Obelisk";
 		rev = "v${version}";
-		sha256 = "0qkxnv25rmqj7qhnw1fav88kr73ax9fjbzvkrwximz5477gjxx3p";
+		sha256 = "0kbadib53x7mzqri9asd8fmhl4xfgk4ajgzd7rlq3irf2j3bmcqp";
 	};
 
 	buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ];

From e19a7068ba1c2ff766fcc54c4f8492e2e9b8878e Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Sat, 5 Aug 2017 14:22:18 +0200
Subject: [PATCH 1573/3246] git-lfs: 2.0.2 -> 2.2.1

---
 pkgs/applications/version-management/git-lfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 6543f40c4da..bf089a03fa0 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
-  version = "2.0.2";
-  rev = "85e2aec4d949517b4a7a53e4f745689331952b6c";
+  version = "2.2.1";
+  rev = "621d1f821f73efcedc829dda43fd9c1fcf07c6ab";
 
   goPackagePath = "github.com/git-lfs/git-lfs";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "git-lfs";
     repo = "git-lfs";
-    sha256 = "0cvs17rd4qgaqj9vz6pwx9y3ni8c99gzykc3as92x37962nmq5cy";
+    sha256 = "00wc4gjs4yy2qld1m4yar37jkw9fdi2h8xp25hy2y80cnyiafn7s";
   };
 
   preBuild = ''

From 5a9109fffa0ae5fc5c46167a29a97aba4ad462ff Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Fri, 28 Jul 2017 17:43:11 +0200
Subject: [PATCH 1574/3246] mopidy-iris: 3.0.5 -> 3.1.3

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

diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index 88c95086c1a..cca2e1730f3 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-iris-${version}";
-  version = "3.0.5";
+  version = "3.1.3";
 
   src = pythonPackages.fetchPypi {
     inherit version;
     pname = "Mopidy-Iris";
-    sha256 = "0rabpzmiis13z4qz3vqlsfc9xjkwracafckahnq2cq97qawyq9y9";
+    sha256 = "144q83cfgdwlj5gv9wyi902xfjybsaa9n7d5azs14jpbnmmbj61f";
   };
 
   propagatedBuildInputs = [

From 07796ccb578e44b8545133bb7dc2a73537d94c59 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 5 Aug 2017 15:20:13 +0200
Subject: [PATCH 1575/3246] libgcrypt: fix clang build

Fixes #27906

Because #pragma GCC optimize ("O0") doesn't work for clang and
NIX_CFLAGS_COMPILE bypasses the fixup done by the makefiles everything
gets compiled with -O2.
The build still uses optimisation for everything else.
---
 pkgs/development/libraries/libgcrypt/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index ed742bee874..5bcb8c5fe98 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
+{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
 
 assert enableCapabilities -> stdenv.isLinux;
 
@@ -14,9 +14,13 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "info" ];
   outputBin = "dev";
 
-  buildInputs =
-    [ libgpgerror ]
-    ++ lib.optional enableCapabilities libcap;
+  # The CPU Jitter random number generator must not be compiled with
+  # optimizations and the optimize -O0 pragma only works for gcc.
+  # The build enables -O2 by default for everything else.
+  hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
+
+  buildInputs = [ libgpgerror ]
+    ++ stdenv.lib.optional enableCapabilities libcap;
 
   # Make sure libraries are correct for .pc and .la files
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config

From 53301fcd635c21a2f23c88c9b446b92b04676e58 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 5 Aug 2017 22:22:18 +0900
Subject: [PATCH 1576/3246] android-sdk: 25.2.3 -> 25.2.5

---
 pkgs/development/mobile/androidenv/androidsdk.nix  |  6 +++---
 pkgs/development/mobile/androidenv/build-tools.nix |  6 +++---
 pkgs/development/mobile/androidenv/default.nix     | 14 ++++++++++++++
 .../mobile/androidenv/platform-tools.nix           |  8 ++++----
 .../mobile/androidenv/support-repository.nix       |  4 ++--
 pkgs/top-level/all-packages.nix                    |  4 ++--
 6 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 7587fb3e0c4..7c4792f560d 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -11,16 +11,16 @@ let inherit (stdenv.lib) makeLibraryPath; in
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
-  version = "25.2.3";
+  version = "25.2.5";
 
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip";
-      sha256 = "0q5m8lqhj07c6izhc0b0d73820ma0flvrj30ckznss4s9swvqd8v";
+      sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip";
-      sha256 = "1ihxd2a37ald3sdd04i4yk85prw81h6gnch0bmq65cbsrba48dar";
+      sha256 = "0yg7wjmyw70xsh8k4hgbqb5rilam2a94yc8dwbh7fjwqcmpxgwqb";
     }
     else throw "platform not ${stdenv.system} supported!";
 
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index c09d643146b..c09fd614270 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,16 +1,16 @@
 {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}:
 
 stdenv.mkDerivation rec {
-  version = "25.0.1";
+  version = "26.0.1";
   name = "android-build-tools-r${version}";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip";
-      sha256 = "0kyrazmcckikn6jiz9hwy6nlqjssf95h5iq7alswg1mryl04w6v7";
+      sha256 = "1sp0ir1d88ffw0gz78zlbvnxalz02fsaxwdcvjfynanylwjpyqf8";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
       url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip";
-      sha256 = "116i5xxbwz229m9z98n6bfkjk2xf3kbhdnqhbbnaagjsjzqdirki";
+      sha256 = "1ns6c8361l18s3a5x0jc2m3qr06glsb6ak7csrrw6dkzlv8cj5dk";
     }
     else throw "System ${stdenv.system} not supported!";
 
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index a233333986a..56c810dfc54 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -195,6 +195,20 @@ rec {
     useGooglePlayServices = true;
   };
 
+  androidsdk_8_0 = androidsdk {
+    platformVersions = [ "26" ];
+    abiVersions = [ "x86" "x86_64"];
+    useGoogleAPIs = true;
+  };
+
+  androidsdk_8_0_extras = androidsdk {
+    platformVersions = [ "26" ];
+    abiVersions = [ "x86" "x86_64"];
+    useGoogleAPIs = true;
+    useExtraSupportLibs = true;
+    useGooglePlayServices = true;
+  };
+
   androidndk = import ./androidndk.nix {
     inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
     inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 6205b98eee1..bc99837d27a 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,16 +1,16 @@
 {stdenv, zlib, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  version = "25.0.1";
+  version = "26.0.0";
   name = "android-platform-tools-r${version}";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
       url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip";
-      sha256 = "0r8ix3jjqpk6wyxm8f6az9r4z5a1lnb3b9hzh8ay4ayidwhn8isx";
+      sha256 = "02z5fxxdwd6359wmqdag9vvszdq49sm78cvfskqap18xa83q484h";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
-      sha256 = "18pzwpr6fbxlw782j65clwz9kvdgvb04jpr2z12bbwyd8wqc4yln";
+      url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip";
+      sha256 = "13mcyi9l0mmmjr056z1i3rhpb4641iv0a5ky7ij0v8hwsb5r5lwq";
     }
     else throw "System ${stdenv.system} not supported!";
 
diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix
index 84ebee5a75f..55c1b60e965 100644
--- a/pkgs/development/mobile/androidenv/support-repository.nix
+++ b/pkgs/development/mobile/androidenv/support-repository.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  version = "40";
+  version = "47";
   name = "android-support-repository-r${version}";
   src = fetchurl {
     url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip";
-    sha1 = "782e7233f18c890463e8602571d304e680ce354c";
+    sha256 = "1l13a6myff6i8x99h1ky2j5sglwy8wc0rsbxfcbif375vh41iyd3";
   };
 
   buildCommand = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd030f917ae..3d6e1af8283 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -611,9 +611,9 @@ with pkgs;
 
   inherit (androidenv) androidndk;
 
-  androidsdk = androidenv.androidsdk_7_1_1;
+  androidsdk = androidenv.androidsdk_8_0;
 
-  androidsdk_extras = self.androidenv.androidsdk_7_1_1_extras;
+  androidsdk_extras = self.androidenv.androidsdk_8_0_extras;
 
   arc-theme = callPackage ../misc/themes/arc { };
 

From 0b21848e772d82f822a2050205ce00475517be25 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 5 Aug 2017 07:39:48 -0700
Subject: [PATCH 1577/3246] zsnes: remove $STRIP from compiler options

In ab70693 @viric says zsnes works better without stripping. But the
build expression kept the $STRIP in the compiler options, so if it is
set to something it will show up in there. For example:

g++  -pipe -I. -I/usr/local/include -I/usr/include -D__UNIXSDL__ -I/nix/store/04qgmdpmalgsy92zgs2z896jx073hcn2-SDL-1.2.15-dev/include/SDL -I/nix/store/04qgmdpmalgsy92zgs2z896jx073hcn2-SDL-1.2.15-dev/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  -DNCURSES -D__OPENGL__ -march=native -O3 -fomit-frame-pointer -fprefetch-loop-arrays -fforce-addr strip -D__RELEASE__ -fno-rtti -o tools/fileutil.o -c tools/fileutil.cpp

g++: error: strip: No such file or directory

This commit removes that reference to $STRIP too.
---
 pkgs/misc/emulators/zsnes/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index ae94c3de41b..6f3957379e5 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -34,6 +34,7 @@ in stdenv.mkDerivation {
   preConfigure = ''
     cd src
     sed -i "/^STRIP/d" configure
+    sed -i "/\$STRIP/d" configure
   '';
 
   configureFlags = [ "--enable-release" ];

From 731a08730f5c56ac60a7477425f5aeacef437169 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Aug 2017 14:36:00 -0400
Subject: [PATCH 1578/3246] atom: Add paxmark

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 39fe8fcb77e..9f0c97ce154 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
       $out/share/atom/resources/app/apm/bin/node
 
     find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
+
+    paxmark m $out/share/atom/atom
+    paxmark m $out/share/atom/resources/app/apm/bin/node
   '';
 
   meta = with stdenv.lib; {

From b7290a283aec78fb3bc4d9e0124b16801bb506b6 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 5 Aug 2017 22:14:24 +0200
Subject: [PATCH 1579/3246] fish: fix the fish_config tool

It requires a python interpreter to work.
---
 pkgs/shells/fish/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index c328329bb26..9da7e407e16 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, coreutils, utillinux,
   nettools, kbd, bc, which, gnused, gnugrep,
   groff, man-db, glibc, libiconv, pcre2,
-  gettext, ncurses, python
+  gettext, ncurses, python3
 
   , writeText
 
   , useOperatingSystemEtc ? true
-  
+
 }:
 
 with stdenv.lib;
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
   # Python: Autocompletion generated from manpages and config editing
   propagatedBuildInputs = [
     coreutils gnugrep gnused bc
-    python groff gettext
+    python3 groff gettext
   ] ++ optional (!stdenv.isDarwin) man-db;
 
   postInstall = ''
@@ -132,8 +132,10 @@ stdenv.mkDerivation rec {
            "$out/share/fish/functions/__fish_print_help.fish"
     sed -i "s|/sbin /usr/sbin||" \
            "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
-    sed -e "s|clear;|${ncurses.out}/bin/clear;|" \
-        -i "$out/share/fish/functions/fish_default_key_bindings.fish" \
+    sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \
+        -i "$out/share/fish/functions/fish_default_key_bindings.fish"
+    sed -e "s|python3|${getBin python3}/bin/python3|" \
+        -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish}
 
   '' + optionalString stdenv.isLinux ''
     sed -e "s| ul| ${utillinux}/bin/ul|" \

From 46eb0e2cd143883856ab9b2768b2fd5b82aee029 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 5 Aug 2017 22:23:49 +0200
Subject: [PATCH 1580/3246] fish: add fish_config tests

Checks whether the fish_config script does run.
Cannot check running the web server though (since that requires a port).
---
 pkgs/shells/fish/default.nix | 182 ++++++++++++++++++++---------------
 1 file changed, 106 insertions(+), 76 deletions(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 9da7e407e16..5832c8ef891 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -85,88 +85,118 @@ let
         $__extra_confdir
     end
   '';
-in
 
-stdenv.mkDerivation rec {
-  name = "fish-${version}";
-  version = "2.6.0";
+  fish = stdenv.mkDerivation rec {
+    name = "fish-${version}";
+    version = "2.6.0";
 
-  etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
+    etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
 
-  src = fetchurl {
-    url = "http://fishshell.com/files/${version}/${name}.tar.gz";
-    sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby";
+    src = fetchurl {
+      url = "http://fishshell.com/files/${version}/${name}.tar.gz";
+      sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby";
+    };
+
+    buildInputs = [ ncurses libiconv pcre2 ];
+    configureFlags = [ "--without-included-pcre2" ];
+
+    # Required binaries during execution
+    # Python: Autocompletion generated from manpages and config editing
+    propagatedBuildInputs = [
+      coreutils gnugrep gnused bc
+      python3 groff gettext
+    ] ++ optional (!stdenv.isDarwin) man-db;
+
+    postInstall = ''
+      sed -r "s|command grep|command ${gnugrep}/bin/grep|" \
+          -i "$out/share/fish/functions/grep.fish"
+      sed -e "s|bc|${bc}/bin/bc|"                          \
+          -e "s|/usr/bin/seq|${coreutils}/bin/seq|"        \
+          -i "$out/share/fish/functions/seq.fish"          \
+            "$out/share/fish/functions/math.fish"
+      sed -i "s|which |${which}/bin/which |"               \
+              "$out/share/fish/functions/type.fish"
+      sed -e "s|\|cut|\|${coreutils}/bin/cut|"             \
+          -i "$out/share/fish/functions/fish_prompt.fish"
+      sed -e "s|gettext |${gettext}/bin/gettext |"         \
+          -e "s|which |${which}/bin/which |"               \
+          -i "$out/share/fish/functions/_.fish"
+      sed -e "s|uname|${coreutils}/bin/uname|"             \
+          -i "$out/share/fish/functions/__fish_pwd.fish"   \
+            "$out/share/fish/functions/prompt_pwd.fish"
+      sed -e "s|sed |${gnused}/bin/sed |"                  \
+          -i "$out/share/fish/functions/alias.fish"        \
+            "$out/share/fish/functions/prompt_pwd.fish"
+      sed -i "s|nroff |${groff}/bin/nroff |"               \
+            "$out/share/fish/functions/__fish_print_help.fish"
+      sed -i "s|/sbin /usr/sbin||" \
+            "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
+      sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \
+          -i "$out/share/fish/functions/fish_default_key_bindings.fish"
+      sed -e "s|python3|${getBin python3}/bin/python3|" \
+          -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish}
+
+    '' + optionalString stdenv.isLinux ''
+      sed -e "s| ul| ${utillinux}/bin/ul|" \
+          -i "$out/share/fish/functions/__fish_print_help.fish"
+      for cur in $out/share/fish/functions/*.fish; do
+        sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \
+            -i "$cur"
+      done
+
+    '' + optionalString (!stdenv.isDarwin) ''
+      sed -i "s|(hostname\||(${nettools}/bin/hostname\||"           \
+            "$out/share/fish/functions/fish_prompt.fish"
+      sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \
+              "$out/share/fish/tools/create_manpage_completions.py"
+      sed -i "s|command manpath|command ${man-db}/bin/manpath|"     \
+              "$out/share/fish/functions/man.fish"
+    '' + optionalString useOperatingSystemEtc ''
+      tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)}
+    '' + ''
+      tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)}
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Smart and user-friendly command line shell";
+      homepage = http://fishshell.com/;
+      license = licenses.gpl2;
+      platforms = platforms.unix;
+      maintainers = with maintainers; [ ocharles ];
+    };
+
+    passthru = {
+      shellPath = "/bin/fish";
+    };
   };
 
-  buildInputs = [ ncurses libiconv pcre2 ];
-  configureFlags = [ "--without-included-pcre2" ];
+  tests = {
 
-  # Required binaries during execution
-  # Python: Autocompletion generated from manpages and config editing
-  propagatedBuildInputs = [
-    coreutils gnugrep gnused bc
-    python3 groff gettext
-  ] ++ optional (!stdenv.isDarwin) man-db;
+    # Test the fish_config tool by checking the generated splash page.
+    # Since the webserver requires a port to run, it is not started.
+    fishConfig =
+      let fishScript = writeText "test.fish" ''
+        set -x __fish_bin_dir ${fish}/bin
+        echo $__fish_bin_dir
+        cp -r ${fish}/share/fish/tools/web_config/* .
+        chmod -R +w *
+        # we delete everything after the fileurl is assigned
+        sed -e '/fileurl =/q' -i webconfig.py
+        echo "print(fileurl)" >> webconfig.py
+        # and check whether the message appears on the page
+        cat (${python3}/bin/python ./webconfig.py \
+          | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \
+        ) | grep 'a href="http://localhost.*Start the Fish Web config'
 
-  postInstall = ''
-    sed -r "s|command grep|command ${gnugrep}/bin/grep|" \
-        -i "$out/share/fish/functions/grep.fish"
-    sed -e "s|bc|${bc}/bin/bc|"                          \
-        -e "s|/usr/bin/seq|${coreutils}/bin/seq|"        \
-        -i "$out/share/fish/functions/seq.fish"          \
-           "$out/share/fish/functions/math.fish"
-    sed -i "s|which |${which}/bin/which |"               \
-            "$out/share/fish/functions/type.fish"
-    sed -e "s|\|cut|\|${coreutils}/bin/cut|"             \
-        -i "$out/share/fish/functions/fish_prompt.fish"
-    sed -e "s|gettext |${gettext}/bin/gettext |"         \
-        -e "s|which |${which}/bin/which |"               \
-        -i "$out/share/fish/functions/_.fish"
-    sed -e "s|uname|${coreutils}/bin/uname|"             \
-        -i "$out/share/fish/functions/__fish_pwd.fish"   \
-           "$out/share/fish/functions/prompt_pwd.fish"
-    sed -e "s|sed |${gnused}/bin/sed |"                  \
-        -i "$out/share/fish/functions/alias.fish"        \
-           "$out/share/fish/functions/prompt_pwd.fish"
-    sed -i "s|nroff |${groff}/bin/nroff |"               \
-           "$out/share/fish/functions/__fish_print_help.fish"
-    sed -i "s|/sbin /usr/sbin||" \
-           "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
-    sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \
-        -i "$out/share/fish/functions/fish_default_key_bindings.fish"
-    sed -e "s|python3|${getBin python3}/bin/python3|" \
-        -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish}
-
-  '' + optionalString stdenv.isLinux ''
-    sed -e "s| ul| ${utillinux}/bin/ul|" \
-        -i "$out/share/fish/functions/__fish_print_help.fish"
-    for cur in $out/share/fish/functions/*.fish; do
-      sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \
-          -i "$cur"
-    done
-
-  '' + optionalString (!stdenv.isDarwin) ''
-    sed -i "s|(hostname\||(${nettools}/bin/hostname\||"           \
-           "$out/share/fish/functions/fish_prompt.fish"
-    sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \
-            "$out/share/fish/tools/create_manpage_completions.py"
-    sed -i "s|command manpath|command ${man-db}/bin/manpath|"     \
-            "$out/share/fish/functions/man.fish"
-  '' + optionalString useOperatingSystemEtc ''
-    tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)}
-  '' + ''
-    tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)}
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Smart and user-friendly command line shell";
-    homepage = http://fishshell.com/;
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ocharles ];
+        # cannot test the http server because it needs a localhost port
+      '';
+      in ''
+        HOME=$(mktemp -d)
+        ${fish}/bin/fish ${fishScript}
+      '';
   };
 
-  passthru = {
-    shellPath = "/bin/fish";
-  };
-}
+  # FIXME(Profpatsch) replace withTests stub
+  withTests = flip const;
+
+in withTests tests fish

From 872d8fc5c9f4f8b5d31cb5a2a886e986dc0abd52 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 3 Aug 2017 14:43:15 +0200
Subject: [PATCH 1581/3246] flockit: init at 2012-08-11

The flockit library and tool exists solely because rsync doesn't have file
locking.

It's not used like a normal library; you don't link against it, and you don't
have to patch your source code to use it. It's inserted between your program and
its libraries by use of LD_PRELOAD.

For example:

  $ env LD_PRELOAD=$(nix-build -A pkgs.flockit)/lib/libflockit.so FLOCKIT_FILE_PREFIX=test rsync SRC DEST

Besides the library a handy executable is provided which can simplify the above to:

  $ $(nix-build -A pkgs.flockit)/bin/flockit test rsync SRC DEST

Also see the following blog post:
https://www.swiftstack.com/blog/2012/08/15/old-school-monkeypatching/
---
 pkgs/tools/backup/flockit/default.nix | 51 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/tools/backup/flockit/default.nix

diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix
new file mode 100644
index 00000000000..e569d9b6d59
--- /dev/null
+++ b/pkgs/tools/backup/flockit/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "flockit-${version}";
+  version = "2012-08-11";
+
+  src = fetchFromGitHub {
+    owner  = "smerritt";
+    repo   = "flockit";
+    rev    = "5c2b2092f8edcc8e3e2eb6ef66c968675dbfa686";
+    sha256 = "0vajck9q2677gpn9a4flkyz7mw69ql1647cjwqh834nrcr2b5164";
+  };
+
+  installPhase = ''
+    mkdir -p $out/lib $out/bin
+    cp ./libflockit.so $out/lib
+
+    (cat <<EOI
+    #!/bin/sh
+    env LD_PRELOAD="$out/lib/libflockit.so" FLOCKIT_FILE_PREFIX=\$1 \''${@:2}
+    EOI
+    ) > $out/bin/flockit
+    chmod +x $out/bin/flockit
+  '';
+
+  meta = with stdenv.lib; {
+    description = "LD_PRELOAD shim to add file locking to programs that don't do it (I'm looking at you, rsync!)";
+    longDescription = ''
+      This library and tool exists solely because rsync doesn't have file locking.
+
+      It's not used like a normal library; you don't link against it, and you
+      don't have to patch your source code to use it. It's inserted between your
+      program and its libraries by use of LD_PRELOAD.
+
+      For example:
+
+        $ env LD_PRELOAD=$(nix-build -A pkgs.flockit)/lib/libflockit.so FLOCKIT_FILE_PREFIX=test rsync SRC DEST
+
+      Besides the library a handy executable is provided which can simplify the above to:
+
+        $ $(nix-build -A pkgs.flockit)/bin/flockit test rsync SRC DEST
+
+      Also see the following blog post:
+      https://www.swiftstack.com/blog/2012/08/15/old-school-monkeypatching/
+    '';
+    homepage = https://github.com/smerritt/flockit;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.basvandijk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb59deba7e8..7ff5f20767f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18615,6 +18615,8 @@ with pkgs;
 
   flat-plat = callPackage ../misc/themes/flat-plat { };
 
+  flockit = callPackage ../tools/backup/flockit { };
+
   foldingathome = callPackage ../misc/foldingathome { };
 
   foo2zjs = callPackage ../misc/drivers/foo2zjs {};

From acb9ca300620e38e0be1256834e0b5b5675473cd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 6 Aug 2017 01:50:43 +0200
Subject: [PATCH 1582/3246] gns3-gui: init at 2.0.3

---
 pkgs/applications/networking/gns3/gui.nix | 34 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 pkgs/top-level/python-packages.nix        |  6 ++--
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/networking/gns3/gui.nix

diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
new file mode 100644
index 00000000000..284c4f8cee1
--- /dev/null
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -0,0 +1,34 @@
+{ stdenv, python34Packages, fetchFromGitHub }:
+
+# TODO: Python 3.6 was failing
+python34Packages.buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "gns3-gui";
+  version = "2.0.3";
+
+  src = fetchFromGitHub {
+    owner = "GNS3";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "10qp6430md8d0h2wamgfaq7pai59mqmcw6sw3i1gvb20m0avvsvb";
+  };
+
+  propagatedBuildInputs = with python34Packages; [
+    raven psutil jsonschema # tox for check
+    # Runtime dependencies
+    sip pyqt5
+  ];
+
+  doCheck = false; # Failing
+
+  meta = with stdenv.lib; {
+    description = "Graphical Network Simulator";
+    #longDescription = ''
+    #  ...
+    #'';
+    homepage = "https://www.gns3.com/";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca37b460002..3b449ad3fd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8038,6 +8038,8 @@ with pkgs;
   # A GMP fork
   mpir = callPackage ../development/libraries/mpir {};
 
+  gns3-gui = callPackage ../applications/networking/gns3/gui.nix { };
+
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
     nixStoreDir = config.nix.storeDir or builtins.storeDir;
     inherit (darwin) cctools;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0205fc8e70e..1764b4b743b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8229,11 +8229,11 @@ in {
   };
 
   raven = buildPythonPackage rec {
-    name = "raven-3.4.1";
+    name = "raven-6.1.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/raven/${name}.tar.gz";
-      sha256 = "c27e40ab3ccf37f30a9f77acb4917370d9341e25abda8e94b9bd48c7127f7d48";
+      sha256 = "1158fsjjl8byzl9nw52jhhdssjl6n7l0hjaxm5hdi69v2zxvzjh2";
     };
 
     # way too many dependencies to run tests
@@ -8241,7 +8241,7 @@ in {
     doCheck = false;
 
     meta = {
-      maintainers = with maintainers; [ domenkozar ];
+      maintainers = with maintainers; [ primeos ];
     };
   };
 

From b769a941533f3b69490f160b6b464c4dbc0e4832 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Sat, 5 Aug 2017 22:28:19 -0400
Subject: [PATCH 1583/3246] urweb: 20170105 -> 20170720

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

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index c1e1e2ece7a..7145a8f2fa0 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "urweb-${version}";
-  version = "20170105";
+  version = "20170720";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "2ad3aea2c4851c9b18f752d38c7127af8293fbbbbdb3dd06b73a4603fe399b67";
+    sha256 = "17qh9mcmlhbv6r52yij8l9ik7j7x6x7c09lf6pznnbdh4sf8p5wb";
   };
 
   buildInputs = [ openssl mlton mysql.client postgresql sqlite ];

From 7cc0ef89377bc1cd4eb44be17f56cebdafa28ec3 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 6 Aug 2017 09:06:24 +0200
Subject: [PATCH 1584/3246] goldendict: fix build by upgrading to qt 5.9

---
 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 3b449ad3fd9..62e293b3c08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1338,7 +1338,7 @@ with pkgs;
 
   clementine = callPackage ../applications/audio/clementine {
     boost = boost155;
-    gst_plugins = 
+    gst_plugins =
       with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ];
   };
 
@@ -14186,7 +14186,7 @@ with pkgs;
 
   gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
 
-  goldendict = libsForQt56.callPackage ../applications/misc/goldendict { };
+  goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
 
   inherit (ocamlPackages) google-drive-ocamlfuse;
 

From e619ace733fee725da5a1b84e5cce68d610ba35e Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 6 Aug 2017 09:28:02 +0200
Subject: [PATCH 1585/3246] perlPackages.TextBibTeX: fix build

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 156be853ceb..8601f266186 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14183,12 +14183,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextBibTeX = buildPerlModule rec {
-    name = "Text-BibTeX-0.72";
+    name = "Text-BibTeX-0.81";
     buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ];
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz";
-      sha256 = "0vfnj9ygdjympc8hsf38nc4a1lq45qbq7v6z6mrnfgr3k198b6gw";
+      sha256 = "0dig1zlglm8rwm8fhnz087lx6gixj9jx10kxn1fx3swdkfblhsmf";
     };
+    perlPreHook = "export LD=gcc";
     meta = {
       description = "Interface to read and parse BibTeX files";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From dcf651b468fc960d381033743302c1ddcd85a826 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sun, 6 Aug 2017 10:18:36 +0200
Subject: [PATCH 1586/3246] docs: fix error in nix expression

---
 doc/languages-frameworks/python.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 3c9df2e6e82..6f09962094d 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -340,7 +340,7 @@ other packages we like to have in the environment, all specified with `propagate
 Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`.
 
 ```nix
-with import <nixpkgs>;
+with import <nixpkgs> {};
 with pkgs.python35Packages;
 
 buildPythonPackage rec {

From 8e16cee25630e8a1f953d10d7537d2ce5e7b0880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 6 Aug 2017 10:38:44 +0200
Subject: [PATCH 1587/3246] double-conversion: remove patch superseeded by ghc
 patch

https://github.com/NixOS/nixpkgs/pull/27584
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c3670613387..9f8eceff0a0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -182,13 +182,7 @@ self: super: {
     else dontCheck super.fsnotify;
 
   double-conversion = if !pkgs.stdenv.isDarwin
-    then addExtraLibrary
-           # https://github.com/bos/double-conversion/pull/17
-           (appendPatch super.double-conversion (pkgs.fetchpatch {
-              url = "https://github.com/basvandijk/double-conversion/commit/0927e347d53dbd96d1949930e728cc2471dd4b14.patch";
-              sha256 = "042yqbq5p6nc9nymmbz9hgp51dlc5asaj9bf91kw5fph6dw2hwg9";
-           }))
-           pkgs.stdenv.cc.cc.lib
+    then super.double-conversion
     else addExtraLibrary (overrideCabal super.double-conversion (drv:
       {
         postPatch = ''

From 71bebd52547f4486816fd320bb3dc6314f139e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 6 Aug 2017 10:41:23 +0200
Subject: [PATCH 1588/3246] {fs,h}notify: move to configuration-nix.nix

---
 .../haskell-modules/configuration-common.nix          | 11 -----------
 .../development/haskell-modules/configuration-nix.nix | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9f8eceff0a0..0d2f235862f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -170,17 +170,6 @@ self: super: {
     # https://github.com/jaspervdj/hakyll/issues/491
     else dontCheck super.hakyll;
 
-  # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
-  # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
-  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
-
-  # FSEvents API is very buggy and tests are unreliable. See
-  # http://openradar.appspot.com/10207999 and similar issues.
-  # https://github.com/haskell-fswatch/hfsnotify/issues/62
-  fsnotify = if pkgs.stdenv.isDarwin
-    then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
-    else dontCheck super.fsnotify;
-
   double-conversion = if !pkgs.stdenv.isDarwin
     then super.double-conversion
     else addExtraLibrary (overrideCabal super.double-conversion (drv:
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 4dce5d59d4a..196e8f01d4d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -408,6 +408,17 @@ self: super: builtins.intersectAttrs super {
     testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ];
   });
 
+  # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
+  # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
+  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
+
+  # FSEvents API is very buggy and tests are unreliable. See
+  # http://openradar.appspot.com/10207999 and similar issues.
+  # https://github.com/haskell-fswatch/hfsnotify/issues/62
+  fsnotify = if pkgs.stdenv.isDarwin
+    then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
+    else dontCheck super.fsnotify;
+
   hidapi = addExtraLibrary super.hidapi pkgs.libudev;
 
   hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };

From a5e135ef7c227427578f997b741940ef1c19f166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 6 Aug 2017 10:53:26 +0200
Subject: [PATCH 1589/3246] release.nix: fix a typo from #27923, build stdenv

The typo removed also all aarch64-linux on Hydra.
---
 pkgs/top-level/release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3b45035d114..90f1c92d8e0 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -11,7 +11,7 @@
 { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
   # The platforms for which we build Nixpkgs.
-, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarchh64-linux" ]
+, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
 , limitedSupportedSystems ? [ "i686-linux" ]
   # Strip most of attributes when evaluating to spare memory usage
 ,  scrubJobs ? true
@@ -58,6 +58,7 @@ let
               jobs.manual
               jobs.lib-tests
               jobs.stdenv.x86_64-linux
+              jobs.stdenv.i686-linux # most basic sanity check
               jobs.stdenv.x86_64-darwin
               jobs.linux.x86_64-linux
               jobs.python.x86_64-linux

From 2bbfac7b97e9ff72ac0ae7d1ab150802c254c157 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 6 Aug 2017 11:24:12 +0200
Subject: [PATCH 1590/3246] expat: fix build on aarch

---
 pkgs/development/libraries/expat/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 36c610cb040..0a2deab796b 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchpatch, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "expat-2.2.3";
@@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ]; # TODO: fix referrers
   outputBin = "dev";
 
+  patches = [
+    (fetchpatch {
+      name = "fix-aarch-build.patch";
+      url = "https://github.com/libexpat/libexpat/commit/d98d4399174fd6f71d70e7bd89993a0e7346753d.patch";
+      sha256 = "0z89wb4mzyf7vvl6kbflk5w1z7yc39jwvs3mkznin5agj34x063w";
+      stripLen = 1;
+      excludes = [ "coverage.sh" ];
+    })
+  ];
+
   configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   outputMan = "dev"; # tiny page for a dev tool

From 771c80d216bbb4e70563cd22d9b26250fdbbd06c Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 4 Aug 2017 11:58:44 +0300
Subject: [PATCH 1591/3246] gwenview, k3b, konsole: propagate kinit

---
 pkgs/applications/kde/gwenview.nix | 4 ++--
 pkgs/applications/kde/k3b.nix      | 3 ++-
 pkgs/applications/kde/konsole.nix  | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 60adb104bdd..3d03d1dea3e 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   exiv2, lcms2,
   baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
-  phonon, qtimageformats, qtsvg, qtx11extras
+  phonon, qtimageformats, qtsvg, qtx11extras, kinit
 }:
 
 mkDerivation {
@@ -17,5 +17,5 @@ mkDerivation {
     baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon
     qtimageformats qtsvg qtx11extras
   ];
-  propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
+  propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
 }
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index 79806dc93fb..cfe7327ac72 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -5,7 +5,7 @@
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info
+, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info, kinit
 }:
 
 mkDerivation {
@@ -30,6 +30,7 @@ mkDerivation {
     # others
     ffmpeg libmusicbrainz2 shared_mime_info
   ];
+  propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
   postFixup =
     let k3bPath = lib.makeBinPath [
           cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index bd026c6f039..d2d60adda2c 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -20,4 +20,5 @@ mkDerivation {
     kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty
     kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
   ];
+  propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
 }

From 0e28d3af1dfdbf510dfd0f91905085f6dfdcfd2a Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 4 Aug 2017 11:39:47 +0300
Subject: [PATCH 1592/3246] nixos: add pathes for KDE applications

---
 nixos/modules/config/system-path.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index cf3cc2f2262..5d339eaea48 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -118,6 +118,9 @@ in
         "/share/themes"
         "/share/vim-plugins"
         "/share/vulkan"
+        "/share/kservices5"
+        "/share/kservicetypes5"
+        "/share/kxmlgui5"
       ];
 
     system.path = pkgs.buildEnv {

From 332a60cbd18d2414a8719e4aed33c708817d2b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 6 Aug 2017 12:35:34 +0200
Subject: [PATCH 1593/3246] release.nix: resurrect stdenvBootstrapTools

13d6681ce7 crippled it unintentionally.
Also remove the incorrect/non-existing stdenv.i686-linux;
building the bootstrap tools should be a good-enough test anyway.
---
 pkgs/top-level/release.nix | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 90f1c92d8e0..f59b2debe86 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -58,7 +58,6 @@ let
               jobs.manual
               jobs.lib-tests
               jobs.stdenv.x86_64-linux
-              jobs.stdenv.i686-linux # most basic sanity check
               jobs.stdenv.x86_64-darwin
               jobs.linux.x86_64-linux
               jobs.python.x86_64-linux
@@ -79,26 +78,27 @@ let
               jobs.vim.x86_64-darwin
             ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
         };
-    } // (lib.optionalAttrs (builtins.elem "i686-linux" systemsWithAnySupport) {
-      stdenvBootstrapTools.i686-linux =
-        { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; };
-    }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" systemsWithAnySupport) {
-      stdenvBootstrapTools.x86_64-linux =
-        { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
-    }) // (lib.optionalAttrs (builtins.elem "aarch64-linux" systemsWithAnySupport) {
-      stdenvBootstrapTools.aarch64-linux =
-        { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; };
-    }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {
-      stdenvBootstrapTools.x86_64-darwin =
-        let
-          bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
-        in {
-          # Lightweight distribution and test
-          inherit (bootstrap) dist test;
-          # Test a full stdenv bootstrap from the bootstrap tools definition
-          inherit (bootstrap.test-pkgs) stdenv;
-        };
-    }) // (mapTestOn ((packagePlatforms pkgs) // rec {
+
+      stdenvBootstrapTools = with lib;
+        genAttrs systemsWithAnySupport
+          (system: {
+            inherit (import ../stdenv/linux/make-bootstrap-tools.nix { inherit system; })
+              dist test;
+          })
+        # darwin is special in this
+        // optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {
+          x86_64-darwin =
+            let
+              bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
+            in {
+              # Lightweight distribution and test
+              inherit (bootstrap) dist test;
+              # Test a full stdenv bootstrap from the bootstrap tools definition
+              inherit (bootstrap.test-pkgs) stdenv;
+            };
+          };
+
+    } // (mapTestOn ((packagePlatforms pkgs) // rec {
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
       haskellPackages = packagePlatforms pkgs.haskellPackages;
 

From 7960bbff1484f507b18099076c1ade088cb3d429 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 6 Aug 2017 13:01:37 +0200
Subject: [PATCH 1594/3246] gnutls: fix darwin build

---
 pkgs/development/libraries/gnutls/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 2a73682a746..0b633f0a2f1 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,7 +1,7 @@
 { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv
 , tpmSupport ? false, trousers, which, nettools, libunistring
-, unbound, dns-root-data
+, unbound, dns-root-data, gettext
 
 # Version dependent args
 , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
@@ -41,6 +41,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ]
     ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
+    ++ lib.optional stdenv.isDarwin gettext
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ lib.optional guileBindings guile
     ++ buildInputs;

From 4b0afc169d836f4d6c133853617c04a98a91f5a6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 6 Aug 2017 13:49:18 +0200
Subject: [PATCH 1595/3246] zpl*: Fix the attribute name of the license

This was simply a typo since the license was added in 2013.
---
 lib/licenses.nix                              |  4 ++--
 .../python-modules/btrees/default.nix         |  2 +-
 .../python-modules/buildout-nix/default.nix   |  2 +-
 .../python-modules/setuptools/default.nix     |  2 +-
 .../python-modules/zc_lockfile/default.nix    |  2 +-
 .../python-modules/zconfig/default.nix        |  2 +-
 .../python-modules/zope_interface/default.nix |  2 +-
 .../zope_testrunner/default.nix               |  2 +-
 pkgs/tools/security/vulnix/requirements.nix   |  4 ++--
 pkgs/top-level/python-packages.nix            | 24 +++++++++----------
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 8dd1c210b7f..552874325d4 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -546,12 +546,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "zlib License";
   };
 
-  zpt20 = spdx { # FIXME: why zpt* instead of zpl*
+  zpl20 = spdx {
     spdxId = "ZPL-2.0";
     fullName = "Zope Public License 2.0";
   };
 
-  zpt21 = spdx {
+  zpl21 = spdx {
     spdxId = "ZPL-2.1";
     fullName = "Zope Public License 2.1";
   };
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 7bfad0d4f5e..8af103cb999 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -16,6 +16,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Scalable persistent components";
     homepage = http://packages.python.org/BTrees;
-    license = licenses.zpt21;
+    license = licenses.zpl21;
   };
 }
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 4267bbb7074..9ff8df02ac9 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage {
   meta = {
     homepage = http://www.buildout.org;
     description = "A software build and configuration system";
-    license = stdenv.lib.licenses.zpt21;
+    license = stdenv.lib.licenses.zpl21;
     maintainers = [ stdenv.lib.maintainers.goibhniu ];
   };
 }
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 59fe5f14839..fa2b810964f 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = http://pypi.python.org/pypi/setuptools;
-    license = with licenses; [ psfl zpt20 ];
+    license = with licenses; [ psfl zpl20 ];
     platforms = platforms.all;
     priority = 10;
   };
diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix
index 8a438fadcd7..4ffd0e94c61 100644
--- a/pkgs/development/python-modules/zc_lockfile/default.nix
+++ b/pkgs/development/python-modules/zc_lockfile/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Inter-process locks";
     homepage =  http://www.python.org/pypi/zc.lockfile;
-    license = licenses.zpt20;
+    license = licenses.zpl20;
     maintainers = with maintainers; [ goibhniu ];
   };
 }
diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index 5e7c762d03a..fa6a7a61332 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Structured Configuration Library";
     homepage = http://pypi.python.org/pypi/ZConfig;
-    license = licenses.zpt20;
+    license = licenses.zpl20;
     maintainers = [ maintainers.goibhniu ];
   };
 }
diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix
index bfde1f0a215..7af2d11e25c 100644
--- a/pkgs/development/python-modules/zope_interface/default.nix
+++ b/pkgs/development/python-modules/zope_interface/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Zope.Interface";
     homepage = http://zope.org/Products/ZopeInterface;
-    license = licenses.zpt20;
+    license = licenses.zpl20;
     maintainers = [ maintainers.goibhniu ];
   };
 }
diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index fc1a3c4c902..6d4d8be4856 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "A flexible test runner with layer support";
     homepage = http://pypi.python.org/pypi/zope.testrunner;
-    license = licenses.zpt20;
+    license = licenses.zpl20;
     maintainers = [ maintainers.goibhniu ];
   };
 }
diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
index ef33c289d13..716b0aac51e 100644
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -22,7 +22,7 @@ rec {
     ]);
 
     meta = with stdenv.lib; {
-      license = licenses.zpt21;
+      license = licenses.zpl21;
       description = "Zope Object Database: object database and persistence";
     };
   };
@@ -40,7 +40,7 @@ rec {
       mock
     ];
     meta = with stdenv.lib; {
-      license = licenses.zpt21;
+      license = licenses.zpl21;
       description = "Transaction management for Python";
     };
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1764b4b743b..48e408771c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2582,7 +2582,7 @@ in {
    meta = {
       homepage = "http://www.buildout.org";
       description = "A software build and configuration system";
-      license = licenses.zpt21;
+      license = licenses.zpl21;
       maintainers = with maintainers; [ garbas ];
     };
   };
@@ -12551,7 +12551,7 @@ in {
     meta = {
       description = "A documentation builder";
       homepage = http://pypi.python.org/pypi/manuel;
-      license = licenses.zpt20;
+      license = licenses.zpl20;
     };
   };
 
@@ -17273,7 +17273,7 @@ in {
     doCheck = false;
     meta = {
       description = "PostgreSQL database adapter for the Python programming language";
-      license = with licenses; [ gpl2 zpt20 ];
+      license = with licenses; [ gpl2 zpl20 ];
     };
   };
 
@@ -21323,7 +21323,7 @@ in {
     meta = {
       description = "Simple generic functions";
       homepage = http://cheeseshop.python.org/pypi/simplegeneric;
-      license = licenses.zpt21;
+      license = licenses.zpl21;
     };
   };
 
@@ -23573,7 +23573,7 @@ in {
     meta = {
       description = "Transaction management";
       homepage = http://pypi.python.org/pypi/transaction;
-      license = licenses.zpt20;
+      license = licenses.zpl20;
     };
   };
 
@@ -23611,7 +23611,7 @@ in {
      meta = {
        description = "A tool which computes a dependency graph between active Python eggs";
        homepage = http://thomas-lotze.de/en/software/eggdeps/;
-       license = licenses.zpt20;
+       license = licenses.zpl20;
      };
    };
 
@@ -24781,7 +24781,7 @@ EOF
     meta = {
       description = "A daemon process control library and tools for Unix-based systems";
       homepage = http://pypi.python.org/pypi/zdaemon;
-      license = licenses.zpt20;
+      license = licenses.zpl20;
       maintainers = with maintainers; [ goibhniu ];
     };
   };
@@ -24832,7 +24832,7 @@ EOF
     meta = {
       description = "An object-oriented database for Python";
       homepage = http://pypi.python.org/pypi/ZODB3;
-      license = licenses.zpt20;
+      license = licenses.zpl20;
       maintainers = with maintainers; [ goibhniu ];
     };
   };
@@ -24859,7 +24859,7 @@ EOF
     meta = {
       description = "An object-oriented database for Python";
       homepage = http://pypi.python.org/pypi/ZODB;
-      license = licenses.zpt20;
+      license = licenses.zpl20;
       maintainers = with maintainers; [ goibhniu ];
     };
   };
@@ -25065,7 +25065,7 @@ EOF
     meta = {
       description = "An event publishing system";
       homepage = http://pypi.python.org/pypi/zope.event;
-      license = licenses.zpt20;
+      license = licenses.zpl20;
       maintainers = with maintainers; [ goibhniu ];
     };
   };
@@ -25088,7 +25088,7 @@ EOF
      meta = {
        description = "Exception interfaces and implementations";
        homepage = http://pypi.python.org/pypi/zope.exceptions;
-       license = licenses.zpt20;
+       license = licenses.zpl20;
        maintainers = with maintainers; [ goibhniu ];
      };
    };
@@ -25308,7 +25308,7 @@ EOF
     meta = {
       description = "Zope testing helpers";
       homepage =  http://pypi.python.org/pypi/zope.testing;
-      license = licenses.zpt20;
+      license = licenses.zpl20;
       maintainers = with maintainers; [ goibhniu ];
     };
   };

From b0a2ea01c52c86c4c07304f79dc9a28f714fc122 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 6 Aug 2017 14:45:52 +0200
Subject: [PATCH 1596/3246] python3Packages.zodb: Fix the build

Side note: Not sure if it makes sense that zodb3 depends on zodb (zodb4)
via ZEO.
---
 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 48e408771c9..97487d237e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24854,6 +24854,7 @@ EOF
     preCheck = if isPy3k then ''
       # test failure on py3.4
       rm src/ZODB/tests/testDB.py
+      rm src/ZODB/tests/test_fsdump.py # Error with Python 3.6
     '' else "";
 
     meta = {

From c8e96826ae2d897a79127e4c9c0679098fec6d82 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 6 Aug 2017 14:49:22 +0200
Subject: [PATCH 1597/3246] influxdb module: collectd.port is now called
 bind-address

with the influxdb release we have packaged (and newer releases)
collectd.port has been streamlined to bind-address which takes a string
instead of a number.

ref: https://github.com/influxdata/influxdb/blob/master/services/collectd/README.md
---
 nixos/modules/services/databases/influxdb.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index dd88624f406..25daf972b58 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -70,7 +70,7 @@ let
       enabled = false;
       typesdb = "${pkgs.collectd}/share/collectd/types.db";
       database = "collectd_db";
-      port = 25826;
+      bind-address = ":25826";
     }];
 
     opentsdb = [{

From aec9f1b9d8acffc9bb69418b7f2c46a1e7bd8896 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 6 Aug 2017 14:48:24 +0200
Subject: [PATCH 1598/3246] par2cmdline: 0.6.13 -> 0.7.3

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

diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index e29c72fd0b9..aa9e5483408 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   name    = "par2cmdline-${version}";
-  version = "0.6.13";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "Parchive";
     repo = "par2cmdline";
     rev = "v${version}";
-    sha256 = "0jxixkc8vid933nph2mvhgz58my42kwjlzbir38hml2xrzq00d8f";
+    sha256 = "1hkb1brz70p79rv7dlzhnl1invjmkll81rcpnhwvafv1yriklfai";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/BlackIkeEagle/par2cmdline;
+    homepage = https://github.com/Parchive/par2cmdline;
     description = "PAR 2.0 compatible file verification and repair tool";
     longDescription = ''
       par2cmdline is a program for creating and using PAR2 files to detect

From 0f4179aed20358d7f46137417ac2bc75cb53fd08 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 6 Aug 2017 15:16:57 +0200
Subject: [PATCH 1599/3246] fixup! reword

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

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 10a36549669..a32f9963d1c 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -190,12 +190,10 @@ rmdir /var/lib/ipfs/.ipfs
   <listitem>
     <para>
       The <option>time.timeZone</option> option now allows the value
-      <literal>null</literal> in addition to timezone strings, which sets the
-      timezone to UTC by default and allows changing it imperatively using
-      <command>timedatectl set-timezone</command>. This is additionally now the
-      default value for the option, which means that systems where the option
-      has not been set explicitly will continue to use UTC but allow imperative
-      timezone adjustments now.
+      <literal>null</literal> in addition to timezone strings. This value
+      allows changing the timezone of a system imperatively using
+      <command>timedatectl set-timezone</command>. The default timezone
+      is still UTC.
     </para>
   </listitem>
 

From e3629d05cbf1f3bbf5e3b73a6e7bfa53a37b42a0 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 6 Aug 2017 10:29:29 -0300
Subject: [PATCH 1600/3246] mate-icon-theme: 1.18.1 -> 1.18.2

---
 pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 3a2de515ba9..239a01c759a 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "1";
+  minor-ver = "2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1217nza3ilmy6x3b9i1b75lpq7lpvhs18s0c2n3j6zhxdqy61nlm";
+    sha256 = "0si3li3kza7s45zhasjvqn5f85zpkn0x8i4kq1dlnqvjjqzkg4ch";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];

From 1048cefa7afa4a66b5d1e446494c93519c637d65 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 6 Aug 2017 10:31:59 -0300
Subject: [PATCH 1601/3246] mate-icon-theme-faenza: 1.18.0 -> 1.18.1

---
 pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index ddc6d81499d..05edfc1dd6d 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-icon-theme-faenza-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "0";
+  minor-ver = "1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v";
+    sha256 = "0vc3wg9l5yrxm0xmligz4lw2g3nqj1dz8fwv90xvym8pbjds2849";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 2f1ae93e43dab9c21a25e226a7a7f8a2555bf49a Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 6 Aug 2017 10:32:48 -0300
Subject: [PATCH 1602/3246] mate-themes: 3.20.19 -> 3.20.22, 3.22.10 -> 3.22.13

---
 pkgs/desktops/mate/mate-themes/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 793c68e688a..45be1d8710d 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -6,15 +6,15 @@ stdenv.mkDerivation rec {
   version = "${major-ver}.${minor-ver}";
   major-ver = gnome3.version;
   minor-ver = {
-    "3.20" = "19";
-    "3.22" = "10";
+    "3.20" = "22";
+    "3.22" = "13";
   }."${major-ver}";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
     sha256 = {
-      "3.20" = "11b8g374dkjhbs7x7khpriabvkip4dmfkma5myzfv6m54qlj3b8g";
-      "3.22" = "03ficjfxa4qpx4vcshhk2zxryivckxpw7wcjgbn8xqnjk3lgzjcb";
+      "3.20" = "1yjj5w7zvyjyg0k21nwk438jjsnj0qklsf0z5pmmp1jff1vxyck4";
+      "3.22" = "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i";
     }."${major-ver}";
   };
 

From 357b93e1b1ae9b8a5141042fdd502a98ccc84313 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 6 Aug 2017 15:33:50 +0200
Subject: [PATCH 1603/3246] anki: 2.0.36 -> 2.0.46

---
 pkgs/games/anki/default.nix     | 9 +++++----
 pkgs/games/anki/fix-paths.patch | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 17d80f2e298..c5bac4db8e5 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-    version = "2.0.36";
+    version = "2.0.46";
     inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4;
     qt4 = pyqt4.qt;
 in
@@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
     name = "anki-${version}";
     src = fetchurl {
       urls = [
-        "http://ankisrs.net/download/mirror/${name}.tgz"
-        "http://ankisrs.net/download/mirror/archive/${name}.tgz"
+        "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
+        # "http://ankisrs.net/download/mirror/${name}.tgz"
+        # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
       ];
-      sha256 = "070p0jmx6cy7kp9bfcgpgkzpyqkcj81wy8gmacns03n5rlq8487v";
+      sha256 = "01h51rbnj0r6lmjnn2vzxzaf7mxkc0azmg1v4mvf4pkpsp50a7hr";
     };
 
     pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]
diff --git a/pkgs/games/anki/fix-paths.patch b/pkgs/games/anki/fix-paths.patch
index cfd3424f799..9b2fd53783e 100644
--- a/pkgs/games/anki/fix-paths.patch
+++ b/pkgs/games/anki/fix-paths.patch
@@ -1,7 +1,6 @@
-diff -Nurp anki-2.0.33.orig/anki/lang.py anki-2.0.33/anki/lang.py
---- anki-2.0.33.orig/anki/lang.py	2015-12-27 11:23:02.334908723 +0100
-+++ anki-2.0.33/anki/lang.py	2015-12-27 14:06:00.688003103 +0100
-@@ -71,13 +71,7 @@ def ngettext(single, plural, n):
+--- anki-2.0.46/anki/lang.py.orig	2017-08-06 15:30:10.781419237 +0200
++++ anki-2.0.46/anki/lang.py	2017-08-06 15:31:33.023043036 +0200
+@@ -71,15 +71,7 @@
      return localTranslation().ungettext(single, plural, n)
  
  def langDir():
@@ -11,6 +10,8 @@ diff -Nurp anki-2.0.33.orig/anki/lang.py anki-2.0.33/anki/lang.py
 -        dir = os.path.join(os.path.dirname(sys.argv[0]), "locale")
 -    if not os.path.isdir(dir):
 -        dir = "/usr/share/anki/locale"
+-    if not os.path.isdir(dir):
+-        dir = "/usr/local/share/anki/bin/locale"
 -    return dir
 +    return "@anki@/share/locale"
  

From eb70dfb1305c807d3b0019dd0a34e183964885f0 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 6 Aug 2017 10:35:11 -0300
Subject: [PATCH 1604/3246] caja: 1.18.0 -> 1.18.3

---
 pkgs/desktops/mate/caja/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index d068f432ee9..07c7d0662a9 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "caja-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "0";
+  minor-ver = "3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606";
+    sha256 = "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm";
   };
 
   nativeBuildInputs = [

From 8ba81342dc8c43b7c1fb63478048ccb77d0258ef Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 6 Aug 2017 10:36:42 -0300
Subject: [PATCH 1605/3246] mate-terminal: 1.18.0 -> 1.18.1

---
 pkgs/desktops/mate/mate-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index 532e50c4549..9d620b28301 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-terminal-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "0";
+  minor-ver = "1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92";
+    sha256 = "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1";
   };
 
   buildInputs = [

From ff10bafd00520510f5c8a9dec4060321477c47d5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Aug 2017 15:38:17 -0400
Subject: [PATCH 1606/3246] linux: Expand hardened config

Based on latest recommendations at
http://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings
---
 .../linux/kernel/hardened-config.nix          | 111 ++++++++++++------
 .../kernel/linux-hardened-copperhead.nix      |   2 +-
 pkgs/os-specific/linux/kernel/patches.nix     |   5 +
 .../linux/kernel/tag-hardened.patch           |   7 ++
 pkgs/top-level/all-packages.nix               |   5 +-
 5 files changed, 91 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/tag-hardened.patch

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index ba5e538c493..7c5593a4df2 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -13,42 +13,8 @@ with stdenv.lib;
 assert (versionAtLeast version "4.9");
 
 ''
-GCC_PLUGINS y # Enable gcc plugin options
-
-${optionalString (versionAtLeast version "4.11") ''
-  GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
-''}
-
-DEBUG_WX y # A one-time check for W+X mappings at boot; doesn't do anything beyond printing a warning
-
-${optionalString (versionAtLeast version "4.10") ''
-  BUG_ON_DATA_CORRUPTION y # BUG if kernel struct validation detects corruption
-''}
-
-# Additional validation of commonly targetted structures
-DEBUG_CREDENTIALS y
-DEBUG_NOTIFIERS y
-DEBUG_LIST y
-DEBUG_SG y
-
-HARDENED_USERCOPY y # Bounds check usercopy
-
-# Wipe on free with page_poison=1
-PAGE_POISONING y
-PAGE_POISONING_NO_SANITY y
-PAGE_POISONING_ZERO y
-
-CC_STACKPROTECTOR_REGULAR n
-CC_STACKPROTECTOR_STRONG y
-
-# Stricter /dev/mem
-STRICT_DEVMEM y
-IO_STRICT_DEVMEM y
-
-# Disable various dangerous settings
-ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory
-PROC_KCORE n # Exposes kernel text image layout
-INET_DIAG n # Has been used for heap based attacks in the past
+# Report BUG() conditions and kill the offending process.
+BUG y
 
 ${optionalString (stdenv.system == "x86_64-linux") ''
   DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory
@@ -56,8 +22,81 @@ ${optionalString (stdenv.system == "x86_64-linux") ''
   # Reduce attack surface by disabling various emulations
   IA32_EMULATION n
   X86_X32 n
+  MODIFY_LDT_SYSCALL n
 
   VMAP_STACK y # Catch kernel stack overflows
+
+  # Randomize position of kernel and memory.
+  RANDOMIZE_BASE y
+  RANDOMIZE_MEMORY y
+
+  # Modern libc no longer needs a fixed-position mapping in userspace, remove it as a possible target.
+  LEGACY_VSYSCALL_NONE y
 ''}
 
+# Make sure kernel page tables have safe permissions.
+DEBUG_KERNEL y
+
+${optionalString (versionOlder version "4.11") ''
+  DEBUG_RODATA y
+  DEBUG_SET_MODULE_RONX y
+''}
+
+${optionalString (versionAtLeast version "4.11") ''
+  GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
+''}
+
+# Report any dangerous memory permissions (not available on all archs).
+DEBUG_WX y
+
+# Do not allow direct physical memory access (but if you must have it, at least enable STRICT mode...)
+# DEVMEM is not set
+STRICT_DEVMEM y
+IO_STRICT_DEVMEM y
+
+# Perform additional validation of various commonly targeted structures.
+DEBUG_CREDENTIALS y
+DEBUG_NOTIFIERS y
+DEBUG_LIST y
+DEBUG_SG y
+BUG_ON_DATA_CORRUPTION y
+SCHED_STACK_END_CHECK y
+
+# Provide userspace with seccomp BPF API for syscall attack surface reduction.
+SECCOMP y
+SECCOMP_FILTER y
+
+# Provide userspace with ptrace ancestry protections.
+SECURITY y
+SECURITY_YAMA y
+
+# Perform usercopy bounds checking.
+HARDENED_USERCOPY y
+
+# Randomize allocator freelists.
+SLAB_FREELIST_RANDOM y
+
+# Wipe higher-level memory allocations when they are freed (needs "page_poison 1" command line below).
+# (If you can afford even more performance penalty, leave PAGE_POISONING_NO_SANITY n)
+PAGE_POISONING y
+PAGE_POISONING_NO_SANITY y
+PAGE_POISONING_ZERO y
+
+# Reboot devices immediately if kernel experiences an Oops.
+PANIC_ON_OOPS y
+PANIC_TIMEOUT -1
+
+# Keep root from altering kernel memory via loadable modules.
+# MODULES is not set
+
+GCC_PLUGINS y # Enable gcc plugin options
+
+# Disable various dangerous settings
+ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory
+PROC_KCORE n # Exposes kernel text image layout
+INET_DIAG n # Has been used for heap based attacks in the past
+
+# Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage.
+CC_STACKPROTECTOR_REGULAR n
+CC_STACKPROTECTOR_STRONG y
 ''
diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index a46e48a3e11..fe18319dec0 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -9,7 +9,7 @@ in
 import ./generic.nix (args // {
   version = "${version}-${revision}";
   extraMeta.branch = "4.12";
-  modDirVersion = "${version}";
+  modDirVersion = "${version}-hardened";
 
   src = fetchFromGitHub {
     inherit sha256;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 1747d34fe11..4c78928a99a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -156,4 +156,9 @@ rec {
         sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
       };
     };
+
+  tag_hardened = rec {
+    name = "tag-hardened";
+    patch = ./tag-hardened.patch;
+  };
 }
diff --git a/pkgs/os-specific/linux/kernel/tag-hardened.patch b/pkgs/os-specific/linux/kernel/tag-hardened.patch
new file mode 100644
index 00000000000..ff8a3a12797
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/tag-hardened.patch
@@ -0,0 +1,7 @@
+diff --git a/localversion-hardened b/localversion-hardened
+new file mode 100644
+index 0000000000..e578045860
+--- /dev/null
++++ b/localversion-hardened
+@@ -0,0 +1 @@
++-hardened
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9275d075af7..e388941e5d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1338,7 +1338,7 @@ with pkgs;
 
   clementine = callPackage ../applications/audio/clementine {
     boost = boost155;
-    gst_plugins = 
+    gst_plugins =
       with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ];
   };
 
@@ -12040,10 +12040,11 @@ with pkgs;
       kernelPatches.p9_fixes
       kernelPatches.modinst_arg_list_too_long
       kernelPatches.cpu-cgroup-v2."4.11"
+      kernelPatches.tag_hardened
     ];
     extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
       inherit stdenv;
-      inherit (linux) version;
+      inherit (linux_hardened_copperhead) version;
     };
   };
 

From 2700b62168ddf813aa3f8c8471c505d23ac09dbd Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@users.noreply.github.com>
Date: Sun, 6 Aug 2017 15:58:38 +0200
Subject: [PATCH 1607/3246] grml-zsh-config: 0.12.4 -> 0.14.2 (#27961)

* grml-zsh-config: 0.12.4 -> 0.14.2

* grml-zsh-config: fix typo
---
 pkgs/shells/grml-zsh-config/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/grml-zsh-config/default.nix
index 5da96adaabd..a5482ce93cc 100644
--- a/pkgs/shells/grml-zsh-config/default.nix
+++ b/pkgs/shells/grml-zsh-config/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, lib
+{ stdenv, fetchFromGitHub, lib
 , zsh, coreutils, inetutils, procps, txt2tags }:
 
 with lib;
 
 stdenv.mkDerivation rec {
   name = "grml-zsh-config-${version}";
-  version = "0.12.4";
+  version = "0.14.2";
 
-  src = fetchurl {
-    url = "http://deb.grml.org/pool/main/g/grml-etc-core/grml-etc-core_${version}.tar.gz";
-    sha256 = "1cbedc41e32787c37c2ed546355a26376dacf2ae1fab9551c9ace3e46d236b72";
+  src = fetchFromGitHub {
+    owner = "grml";
+    repo = "grml-etc-core";
+    rev = "v${version}";
+    sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm";
   };
 
   buildInputs = [ zsh coreutils inetutils procps txt2tags ];
@@ -33,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = http://grml.org/zsh/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.msteen ];
+    maintainers = with maintainers; [ msteen rvolosatovs ];
   };
 }

From d3107e4508ae2821c482db20c8a0e8c49f28b5a1 Mon Sep 17 00:00:00 2001
From: Heitham Omar <hhomar@gmail.com>
Date: Sun, 6 Aug 2017 16:29:09 +0100
Subject: [PATCH 1608/3246] openelec-dvb-firmware: init at 0.0.51

---
 .../openelec-dvb-firmware/default.nix         | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix

diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
new file mode 100644
index 00000000000..b60ce6f1b4a
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "openelec-dvb-firmware-${version}";
+  version = "0.0.51";
+
+  src = fetchurl {
+    url = "https://github.com/OpenELEC/dvb-firmware/archive/${version}.tar.gz";
+    sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    DESTDIR="$out" ./install
+    find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm
+  '';
+
+  meta = with stdenv.lib; {
+    description = "DVB firmware from OpenELEC";
+    homepage = https://github.com/OpenELEC/dvb-firmware;
+    license = licenses.unfreeRedistributableFirmware;
+    platforms = platforms.linux;
+    priority = 7;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60f5378a662..62af809b16e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11991,6 +11991,8 @@ with pkgs;
 
   linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
 
+  openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { };
+
   openiscsi = callPackage ../os-specific/linux/open-iscsi { };
 
   openisns = callPackage ../os-specific/linux/open-isns { };

From c6207abe9cc2f984402d31244c34bcaeef97c366 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 6 Aug 2017 12:40:13 -0300
Subject: [PATCH 1609/3246] pluma: init at 1.18.2

---
 pkgs/desktops/mate/default.nix       |  1 +
 pkgs/desktops/mate/pluma/default.nix | 38 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/mate/pluma/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 528f792a600..014afc5fbb5 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -2,6 +2,7 @@
 rec {
   atril = callPackage ./atril { };
   caja = callPackage ./caja { };
+  pluma = callPackage ./pluma { };
   mate-common = callPackage ./mate-common { };
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
new file mode 100644
index 00000000000..29df4fc475a
--- /dev/null
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "pluma-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1z0938yiygxipj2a77n9dv8v4253snrc5gbbnarcnim9xba2j3zz";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    isocodes
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    enchant
+    libxml2
+    python
+    gnome3.gtksourceview
+    gnome3.libpeas
+    mate.mate-desktop
+  ];
+
+  meta = {
+    description = "Powerful text editor for the MATE desktop";
+    homepage = http://mate-desktop.org;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}

From 15bf0f68c31d804d630ec17f080c0e4e7fbc1109 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 6 Aug 2017 16:26:06 +0200
Subject: [PATCH 1610/3246] pythonPackages.aiohttp-cors: init at 0.5.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 97487d237e0..784765bec98 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -315,6 +315,31 @@ in {
     };
   };
 
+  aiohttp-cors = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "aiohttp-cors";
+    # 0.5.3 is the current version but gns3-server requires 0.5.1
+    version = "0.5.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/a/${pname}/${name}.tar.gz";
+      sha256 = "0szma27ri25fq4nwwvs36myddggw3jz4pyzmq63yz4xpw0jjdxck";
+    };
+
+    # Requires network access
+    doCheck = false;
+
+    propagatedBuildInputs = with self; [ zodb3 aiohttp ]
+      ++ optional (pythonOlder "3.5") typing;
+
+    meta = {
+      description = "CORS support for aiohttp";
+      homepage = "https://github.com/aio-libs/aiohttp-cors";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ primeos ];
+    };
+  };
+
   alabaster = callPackage ../development/python-modules/alabaster {};
 
   alembic = callPackage ../development/python-modules/alembic {};

From f17cadadd3279fd3dfb7c6ad17b83e1056b72638 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 6 Aug 2017 16:34:45 +0200
Subject: [PATCH 1611/3246] pythonPackages.zipstream: init at 1.1.4

---
 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 784765bec98..37896dff8e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24842,6 +24842,26 @@ EOF
     };
   });
 
+  zipstream = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "zipstream";
+    version = "1.1.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/z/${pname}/${name}.tar.gz";
+      sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif";
+    };
+
+    buildInputs = with self; [ nose ];
+
+    meta = {
+      description = "A zip archive generator";
+      homepage = "https://github.com/allanlei/python-zipstream";
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [ primeos ];
+    };
+  };
+
   zodb3 = buildPythonPackage rec {
     name = "zodb3-${version}";
     version = "3.11.0";

From 2bc92695bf0ad20ff5f77d383fbb4b1f689157a4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 6 Aug 2017 17:18:44 +0200
Subject: [PATCH 1612/3246] pythonPackages.aiohttp: 1.1.6 -> 1.3.5

---
 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 37896dff8e4..bb5aef27f13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -292,13 +292,23 @@ in {
 
   aiofiles = callPackage ../development/python-modules/aiofiles { };
 
-  aiohttp = buildPythonPackage rec {
+  aiohttp =
+  let yarl_0_9_8 = self.yarl.overrideAttrs (old: rec {
+    pname = "yarl";
+    version = "0.9.8";
+    name = "${pname}-${version}";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7";
+    };
+  });
+  in buildPythonPackage rec {
     name = "aiohttp-${version}";
-    version = "1.1.6";
+    version = "1.3.5";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/aiohttp/${name}.tar.gz";
-      sha256 = "0742feb9759a5832aa4a30abf64e53055e139ed41e26f79b9558d08e05c74d60";
+      sha256 = "0hpqdiaifgyfqmxkyzwypwvrnvz5rqzgzylzhihfidc5ldfs856d";
     };
 
     disabled = pythonOlder "3.4";
@@ -306,10 +316,10 @@ in {
     doCheck = false; # Too many tests fail.
 
     buildInputs = with self; [ pytest gunicorn pytest-raisesregexp ];
-    propagatedBuildInputs = with self; [ async-timeout chardet multidict yarl ];
+    propagatedBuildInputs = with self; [ async-timeout chardet multidict yarl_0_9_8 ];
 
     meta = {
-      description = "http client/server for asyncio";
+      description = "Http client/server for asyncio";
       license = with licenses; [ asl20 ];
       homepage = https://github.com/KeepSafe/aiohttp/;
     };

From 953b23238528939baca2330b8cbc17bb1a7ceab5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 6 Aug 2017 17:21:43 +0200
Subject: [PATCH 1613/3246] gns3-server: init at 2.0.3

---
 pkgs/applications/networking/gns3/server.nix | 37 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/networking/gns3/server.nix

diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
new file mode 100644
index 00000000000..067d636f137
--- /dev/null
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -0,0 +1,37 @@
+{ stdenv, python34Packages, fetchFromGitHub }:
+
+python34Packages.buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "gns3-server";
+  version = "2.0.3";
+
+  src = fetchFromGitHub {
+    owner = "GNS3";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1c7mzj1r2zh90a7vs3s17jakfp9s43b8nnj29rpamqxvl3qhbdy7";
+  };
+
+  propagatedBuildInputs = with python34Packages; [
+    aiohttp jinja2 psutil zipstream aiohttp-cors raven jsonschema
+  ];
+
+  # Requires network access
+  doCheck = false;
+
+  postInstall = ''
+    rm $out/bin/gns3loopback # For windows only
+  '';
+  meta = with stdenv.lib; {
+    description = "Graphical Network Simulator 3 server";
+    longDescription = ''
+      The GNS3 server manages emulators such as Dynamips, VirtualBox or
+      Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST
+      API.
+    '';
+    homepage = "https://www.gns3.com/";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60f5378a662..a8d2e04c772 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8039,6 +8039,7 @@ with pkgs;
   mpir = callPackage ../development/libraries/mpir {};
 
   gns3-gui = callPackage ../applications/networking/gns3/gui.nix { };
+  gns3-server = callPackage ../applications/networking/gns3/server.nix { };
 
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
     nixStoreDir = config.nix.storeDir or builtins.storeDir;

From dad7b6bb40792834d82ca5f942980d179c6c79ee Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 6 Aug 2017 13:42:57 -0300
Subject: [PATCH 1614/3246] elementary-icon-theme: 4.1.0 -> 4.2.0

---
 pkgs/data/icons/elementary-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
index 83cb2d749dd..0a0ff4263ec 100644
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.0";
+  version = "4.2.0";
 
   package-name = "elementary-icon-theme";
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz";
-    sha256 = "08pkk4299dj442dby15lwxwz7bax5d3828v1f81mbll084k7vssm";
+    sha256 = "0w1l9hlih4ddkdjpha5lsyf6iagv436nhm4aphak8w8jyycg81bm";
   };
 
   dontBuild = true;

From 147cd29fff3b08d596748c5d7c33bf633aacb428 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 6 Aug 2017 19:00:58 +0200
Subject: [PATCH 1615/3246] rustc: remove gdb dependency for darwin

---
 pkgs/development/compilers/rust/rustc.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 28863e450a7..c5767541a02 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -114,8 +114,12 @@ stdenv.mkDerivation {
   dontUseCmakeConfigure = true;
 
   # ps is needed for one of the test cases
-  nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git cmake
-    which libffi gdb ];
+  nativeBuildInputs =
+    [ file python2 procps rustPlatform.rust.rustc git cmake
+      which libffi
+    ]
+    # Only needed for the debuginfo tests
+    ++ optional (!stdenv.isDarwin) gdb;
 
   buildInputs = [ ncurses ] ++ targetToolchains
     ++ optional (!forceBundledLLVM) llvmShared;

From 434d3700d3cfc3acebd1a829c086b58e6d91603c Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 6 Aug 2017 18:17:00 +0100
Subject: [PATCH 1616/3246] oil: init at 0.0.0

---
 pkgs/shells/oil/default.nix     | 36 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/shells/oil/default.nix

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
new file mode 100644
index 00000000000..eebbc6d1b86
--- /dev/null
+++ b/pkgs/shells/oil/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, coreutils }:
+let
+  version = "0.0.0";
+in
+stdenv.mkDerivation {
+  name = "oil-${version}";
+
+  src = fetchurl {
+    url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
+    sha256 = "1mvyvvzw149piwa7xdl3byyn7h31p4cnrf3w9dxr5qfd9vc4gmsm";
+  };
+
+  postPatch = ''
+    patchShebangs build
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  # Stripping breaks the bundles by removing the zip file from the end.
+  dontStrip = true;
+
+  meta = {
+    homepage = https://www.oilshell.org/;
+
+    description = "A new unix shell, still in its early stages";
+
+    license = with lib.licenses; [
+      psfl # Includes a portion of the python interpreter and standard library
+      asl20 # Licence for Oil itself
+    ];
+
+    maintainers = with lib.maintainers; [ lheckemann ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8d2e04c772..814d91d6a4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5106,6 +5106,8 @@ with pkgs;
 
   oh = callPackage ../shells/oh { };
 
+  oil = callPackage ../shells/oil { };
+
   pash = callPackage ../shells/pash { };
 
   tcsh = callPackage ../shells/tcsh { };

From 1ff2c65acfb7361423ed877c1b066ca4543e0c4a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 4 Aug 2017 11:44:14 +0200
Subject: [PATCH 1617/3246] phantomjs2: don't use bundled qt

---
 pkgs/development/tools/phantomjs2/default.nix | 89 ++++++++++---------
 .../tools/phantomjs2/system-qtbase.patch      | 13 +++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 61 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/development/tools/phantomjs2/system-qtbase.patch

diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index 88fd2b55984..8c03c32655a 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchgit,
-  bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite,
-  darwin, writeScriptBin, cups
+{ stdenv, fetchFromGitHub, fetchpatch
+, bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg
+, libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase
+, darwin, writeScriptBin, cups
 }:
 
 let
@@ -35,54 +36,54 @@ in stdenv.mkDerivation rec {
   name = "phantomjs-${version}";
   version = "2.1.1";
 
-  # needs git submodules, so can't use fetchFromGitHub
-  src = fetchgit {
-    rev = "refs/tags/${version}";
-    url = "https://github.com/ariya/phantomjs.git";
-    sha256 = "1gyc8qxn8v4vm4lgd9njrprz46fg1j5ziq0mm888q8ms0p7jy2pi";
+  src = fetchFromGitHub {
+    owner = "ariya";
+    repo = "phantomjs";
+    rev = version;
+    sha256 = "1zsbpk1sgh9a16f1a5nx3qvk77ibjn812wqkxqck8n6fia85m5iq";
   };
 
-  buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ]
-    ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-      AGL ApplicationServices AppKit Cocoa OpenGL
-      darwin.libobjc fakeClang cups
-    ]);
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [
+    bison2 flex fontconfig freetype gperf icu openssl
+    libjpeg libpng perl python ruby sqlite qtwebkit qtbase
+  ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+    AGL ApplicationServices AppKit Cocoa OpenGL
+    darwin.libobjc fakeClang cups
+  ]);
 
+  patches = [
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-hardening.patch?id=42c9154d8c87c9fe434908259b0eddde4d892ca3";
+      sha256 = "1qs1r76w90qgpw742i7lf0y3b7m9zh5wxcbrhrak6mq1kqaphqb5";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt-components.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3";
+      sha256 = "1fw2q59aqcks3abvwkqg9903yif6aivdsznc0h6frhhjvpp19vsb";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-evaluateJavaScript.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3";
+      sha256 = "1avig9cfny8kv3s4mf3mdzvf3xlzgyh351yzwc4bkpnjvzv4fmq6";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-no-websecurity.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3";
+      sha256 = "1nykqpxa7lcf9iarz5lywgg3v3b1h19iwvjdg4kgq0ai6idhcab8";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-print.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3";
+      sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw";
+    })
+    ./system-qtbase.patch
+  ];
 
-  patchPhase = ''
+  postPatch = ''
     patchShebangs .
-    sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure
-    touch src/qt/{qtbase,qtwebkit,3rdparty}/.git
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i 's,-licucore,/usr/lib/libicucore.dylib,' src/qt/qtwebkit/Source/WTF/WTF.pri
-    substituteInPlace src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.pri \
-      --replace "ENABLE_3D_RENDERING=1" "ENABLE_3D_RENDERING=0"
-    sed -i 88d src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.prf
-    echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/api.pri
-    echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/widgetsapi.pri
-    pushd src/qt
-
-      substituteInPlace qtbase/configure \
-        --replace /usr/bin/xcode-select true \
-        --replace '/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null' 'echo /var/empty' \
-        --replace '/usr/bin/xcrun -sdk $sdk -find' 'type -P'
-      substituteInPlace qtbase/mkspecs/features/mac/default_pre.prf \
-        --replace '/usr/bin/xcode-select --print-path 2>/dev/null' "echo ${stdenv.libc}" \
-        --replace '/usr/bin/xcrun -find xcrun 2>/dev/null' 'echo success' \
-        --replace '/usr/bin/xcodebuild -version' 'echo Xcode 7.2; echo Build version 7C68' \
-        --replace 'sdk rez' ""
-      for file in $(grep -rl /usr/bin/xcrun .); do
-        substituteInPlace "$file" --replace "/usr/bin/xcrun" ${fakeXcrun}/bin/xcrun
-      done
-      substituteInPlace qtbase/src/tools/qlalr/lalr.cpp --replace _Nullable Nullable
-
-    popd
+    substituteInPlace src/phantomjs.pro \
+      --replace "QT_MINOR_VERSION, 5" "QT_MINOR_VERSION, 9"
   '';
 
   __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
 
-  buildPhase = "./build.py --confirm -j$NIX_BUILD_CORES";
-
   enableParallelBuilding = true;
 
   installPhase = ''
@@ -99,6 +100,10 @@ in stdenv.mkDerivation rec {
     $out/bin/phantomjs
   '';
 
+  preFixup = ''
+    rm -r ../__nix_qt5__
+  '';
+
   meta = with stdenv.lib; {
     description = "Headless WebKit with JavaScript API";
     longDescription = ''
diff --git a/pkgs/development/tools/phantomjs2/system-qtbase.patch b/pkgs/development/tools/phantomjs2/system-qtbase.patch
new file mode 100644
index 00000000000..743372b0f0b
--- /dev/null
+++ b/pkgs/development/tools/phantomjs2/system-qtbase.patch
@@ -0,0 +1,13 @@
+--- a/build.py
++++ b/build.py
+@@ -80,9 +80,9 @@
+ def qmakePath():
+     exe = "qmake"
+     if platform.system() == "Windows":
+         exe += ".exe"
+-    return os.path.abspath("src/qt/qtbase/bin/" + exe)
++    return os.path.abspath("@qtbase@" + exe)
+ 
+ # returns paths for 3rd party libraries (Windows only)
+ def findThirdPartyDeps():
+     include_dirs = []
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8d2e04c772..505307845c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7140,7 +7140,7 @@ with pkgs;
 
   phantomjs = callPackage ../development/tools/phantomjs { };
 
-  phantomjs2 = callPackage ../development/tools/phantomjs2 { };
+  phantomjs2 = libsForQt5.callPackage ../development/tools/phantomjs2 { };
 
   pmccabe = callPackage ../development/tools/misc/pmccabe { };
 

From f14c27d178c9b806ef693fb0a6079ccf378d8e21 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 6 Aug 2017 20:34:14 +0200
Subject: [PATCH 1618/3246] cmus: fix build

fixes #27966
---
 pkgs/applications/audio/cmus/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index c9346248438..633ba3832c2 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
     ++ concatMap (a: a.deps) opts;
 
+  makeFlags = [ "LD=$(CC)" ];
+
   meta = with stdenv.lib; {
     description = "Small, fast and powerful console music player for Linux and *BSD";
     homepage = https://cmus.github.io/;

From e85a855d2c0b2f231863131fc2aa10e50ad3c497 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Sun, 6 Aug 2017 13:54:48 +0100
Subject: [PATCH 1619/3246] openssl 1_1_0: fix build on aarch64

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index c0296f42406..394eab6c9db 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -48,7 +48,8 @@ let
     ] ++ stdenv.lib.optionals withCryptodev [
       "-DHAVE_CRYPTODEV"
       "-DUSE_CRYPTODEV_DIGESTS"
-    ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2";
+    ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
+      ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.isAarch64) "no-afalgeng";
 
     makeFlags = [ "MANDIR=$(man)/share/man" ];
 

From 5ac00265a8ef7dd2f3e1bd00aa1b17b5779b8633 Mon Sep 17 00:00:00 2001
From: Heitham Omar <hhomar@gmail.com>
Date: Sun, 6 Aug 2017 16:15:30 +0100
Subject: [PATCH 1620/3246] linux-common-config: add CONFIG_HOTPLUG_PCI_ACPI

---
 pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5e2b1d610e7..c0ee75ae9f8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -450,8 +450,11 @@ with stdenv.lib;
   X86_CHECK_BIOS_CORRUPTION y
   X86_MCE y
 
-  # PCI-Expresscard hotplug support
-  ${optionalString (versionAtLeast version "3.12") "HOTPLUG_PCI_PCIE y"}
+  ${optionalString (versionAtLeast version "3.12") ''
+    HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI
+    HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support
+  ''}
+
 
   # Linux containers.
   NAMESPACES? y #  Required by 'unshare' used by 'nixos-install'

From 41492abf4d0cf6f5e8bc0258f8b84f7540da9c07 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 6 Aug 2017 21:14:13 +0200
Subject: [PATCH 1621/3246] qt56.qtbase: fix build

---
 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
index 4e7c7ea5456..2092ae5309a 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -111,6 +111,8 @@ stdenv.mkDerivation {
 
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\""
+
+    unset LD
   '';
 
   prefixKey = "-prefix ";

From 19c64b57d576ba21504521cfaa17784b3fe47c74 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 6 Aug 2017 20:18:58 +0100
Subject: [PATCH 1622/3246] minikube: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 5cdb30b3f00..081811ecd64 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,15 +14,15 @@ let
   # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
   # currently https://storage.googleapis.com/minikube/k8s_releases.json
 
-  localkube-version = "1.6.3";
+  localkube-version = "1.7.0";
   localkube-binary = fetchurl {
     url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
-    sha256 = "1fmxxjv1bxrfngc4ykfgg76b79dh8pq0k1gsbzhiy3hhrppfqylm";
+    sha256 = "1pp5bi0bpxxzrshvkv47hqs20jfx3gp1i1p3pw1rvzm5n1fn2q1a";
   };
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.20.0";
+  version = "0.21.0";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -30,7 +30,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "0bly2phy67x4ckcg46g6r4kqfdpjfs1cb3588a900m8b4xyavvvb";
+    sha256 = "1y72kdrpbxwfzxs9jslcrb2l3xw83z4i7raf5c7sky4wf2nx8vis";
   };
 
   # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly

From b679e148bd0f13df4b11208f43a5148d7d292f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 6 Aug 2017 12:35:34 +0200
Subject: [PATCH 1623/3246] release.nix: resurrect stdenvBootstrapTools

13d6681ce7 crippled it unintentionally.
Also remove the incorrect/non-existing stdenv.i686-linux;
building the bootstrap tools should be a good-enough test anyway.
---
 pkgs/top-level/release.nix | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 90f1c92d8e0..f59b2debe86 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -58,7 +58,6 @@ let
               jobs.manual
               jobs.lib-tests
               jobs.stdenv.x86_64-linux
-              jobs.stdenv.i686-linux # most basic sanity check
               jobs.stdenv.x86_64-darwin
               jobs.linux.x86_64-linux
               jobs.python.x86_64-linux
@@ -79,26 +78,27 @@ let
               jobs.vim.x86_64-darwin
             ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
         };
-    } // (lib.optionalAttrs (builtins.elem "i686-linux" systemsWithAnySupport) {
-      stdenvBootstrapTools.i686-linux =
-        { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; };
-    }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" systemsWithAnySupport) {
-      stdenvBootstrapTools.x86_64-linux =
-        { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
-    }) // (lib.optionalAttrs (builtins.elem "aarch64-linux" systemsWithAnySupport) {
-      stdenvBootstrapTools.aarch64-linux =
-        { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; };
-    }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {
-      stdenvBootstrapTools.x86_64-darwin =
-        let
-          bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
-        in {
-          # Lightweight distribution and test
-          inherit (bootstrap) dist test;
-          # Test a full stdenv bootstrap from the bootstrap tools definition
-          inherit (bootstrap.test-pkgs) stdenv;
-        };
-    }) // (mapTestOn ((packagePlatforms pkgs) // rec {
+
+      stdenvBootstrapTools = with lib;
+        genAttrs systemsWithAnySupport
+          (system: {
+            inherit (import ../stdenv/linux/make-bootstrap-tools.nix { inherit system; })
+              dist test;
+          })
+        # darwin is special in this
+        // optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {
+          x86_64-darwin =
+            let
+              bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
+            in {
+              # Lightweight distribution and test
+              inherit (bootstrap) dist test;
+              # Test a full stdenv bootstrap from the bootstrap tools definition
+              inherit (bootstrap.test-pkgs) stdenv;
+            };
+          };
+
+    } // (mapTestOn ((packagePlatforms pkgs) // rec {
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
       haskellPackages = packagePlatforms pkgs.haskellPackages;
 

From 4e6c41e7fa8b415951208d7dd7e99211316f59ec Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 6 Aug 2017 21:46:22 +0200
Subject: [PATCH 1624/3246] pkgs/haskell-modules: fix hoogleLocal docstring

---
 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 0d2f235862f..15c06bcfd93 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -34,7 +34,7 @@ self: super: {
   jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; };
 
   # enable using a local hoogle with extra packagages in the database
-  # nix-shell -p "haskellPackages.hoogleLocal (with haskellPackages; [ mtl lens ])"
+  # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
   # $ hoogle server
   hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; };
 

From 3f27a3691224fe0485ca1dda39fa7789b4a3892d Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 6 Aug 2017 21:46:49 +0200
Subject: [PATCH 1625/3246] pkgs/haskell-modules: two small vanity fixes

---
 pkgs/development/haskell-modules/generic-builder.nix  | 3 ++-
 pkgs/development/haskell-modules/make-package-set.nix | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 7e99300a41e..de90184ac09 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
 , jailbreak-cabal, hscolour, cpphs, nodejs, lib, removeReferencesTo
-}: let isCross = (ghc.cross or null) != null; in
+}:
+let isCross = (ghc.cross or null) != null; in
 
 { pname
 , dontStrip ? (ghc.isGhcjs or false)
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 87f3a04ebf5..5215fe4a552 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -25,7 +25,9 @@
 }:
 
 # return value: a function from self to the package set
-self: let
+self:
+
+let
 
   inherit (stdenv.lib) fix' extends makeOverridable;
   inherit (haskellLib) overrideCabal;

From e9e25ec5fe773ef6bae9363e8f87fd0909f3ee56 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 6 Aug 2017 21:48:22 +0200
Subject: [PATCH 1626/3246] pkgs/haskell-modules: expose haddockDir as passthru
 variable

WIP

If the `hoogle.nix` file wants to have any sane chance of finding haddock
outputs, the packages need to export the haddock folders as an identifier.

A few TODOs still stand, like passing self to the package instead of needing to
pass it to `haddockDir`. Maybe the exported identifier should be integrated into
the fixpoint somehow instead of using `passthru`?
---
 .../haskell-modules/generic-builder.nix          | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index de90184ac09..e12babbd414 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -79,6 +79,9 @@ let
                         then "package-db"
                         else "package-conf";
 
+  # the target dir for haddock documentation
+  docdir = docoutput: docoutput + "/share/doc";
+
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
     url = newCabalFileUrl;
@@ -112,7 +115,7 @@ let
   defaultConfigureFlags = [
     "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
     (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
-    (optionalString enableSeparateDocOutput "--docdir=$doc/share/doc")
+    (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
     "--with-gcc=$CC" # Clang won't work without that extra information.
     "--package-db=$packageConfDir"
     (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
@@ -332,7 +335,7 @@ stdenv.mkDerivation ({
     ''}
 
     ${optionalString enableSeparateDocOutput ''
-    for x in $doc/share/doc/html/src/*.html; do
+    for x in ${docdir "$doc"}/html/src/*.html; do
       remove-references-to -t $out $x
     done
     mkdir -p $doc
@@ -348,6 +351,14 @@ stdenv.mkDerivation ({
 
     isHaskellLibrary = hasActiveLibrary;
 
+    # TODO: ask why the split outputs are configurable at all?
+    # TODO: include tests for split if possible
+    # Given the haskell package, returns
+    # the directory containing the haddock documentation.
+    # `null' if no haddock documentation was built.
+    # TODO: fetch the self from the fixpoint instead
+    haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null;
+
     env = stdenv.mkDerivation {
       name = "interactive-${pname}-${version}-environment";
       nativeBuildInputs = [ ghcEnv systemBuildInputs ]
@@ -357,6 +368,7 @@ stdenv.mkDerivation ({
       shellHook = ''
         export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
         export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
+        # TODO: is this still valid?
         export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
         export LD_LIBRARY_PATH="''${LD_LIBRARY_PATH:+''${LD_LIBRARY_PATH}:}${
           makeLibraryPath (filter (x: !isNull x) systemBuildInputs)

From 4a8efae000a0a9f8e61abfc76189259077b4a3ea Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 6 Aug 2017 22:02:50 +0200
Subject: [PATCH 1627/3246] pkgs/haskell-modules/hoogle.nix: find haddocks by
 `haddockDir`

Previously a few clumsy shell globs were used to find haddock output, which
broke every time something in `generic-builder.nix` changed.
Use the new `haddockDir` identifier exported by haskell packages.
---
 pkgs/development/haskell-modules/hoogle.nix | 27 ++++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index b6063f6ef97..65124d4c700 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -52,7 +52,10 @@ let
       This index includes documentation for many Haskell modules.
     '';
 
-  docPackages = lib.closePropagation packages;
+  # TODO: closePropagation is deprecated; replace
+  docPackages = lib.closePropagation
+    # we grab the doc outputs
+    (map (lib.getOutput "doc") packages);
 
 in
 stdenv.mkDerivation {
@@ -64,6 +67,10 @@ stdenv.mkDerivation {
   inherit docPackages;
 
   buildPhase = ''
+    ${lib.optionalString (packages != [] -> docPackages == [])
+       ("echo WARNING: localHoogle package list empty, even though"
+       + " the following were specified: "
+       + lib.concatMapStringsSep ", " (p: p.name) packages)}
     mkdir -p $out/share/doc/hoogle
 
     echo importing builtin packages
@@ -76,17 +83,13 @@ stdenv.mkDerivation {
     done
 
     echo importing other packages
-    for i in $docPackages; do
-      if [[ ! $i == $out ]]; then
-        for docdir in $i/share/doc/*-${ghcName}-*/* $i/share/doc/*; do
-          name="$(basename $docdir)"
-          docdir=$docdir/html
-          if [[ -d $docdir ]]; then
-            ln -sfn $docdir $out/share/doc/hoogle/$name
-          fi
-        done
-      fi
-    done
+    ${lib.concatMapStringsSep "\n" (el: ''
+        ln -sfn ${el.haddockDir} "$out/share/doc/hoogle/${el.name}"
+      '')
+      (lib.filter (el: el.haddockDir != null)
+        (builtins.map (p: { haddockDir = p.haddockDir p;
+                            name = p.pname; })
+          docPackages))}
 
     echo building hoogle database
     hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle

From f963014829a20c61968ec9ae90e8b112cb065380 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 6 Aug 2017 20:27:52 +0200
Subject: [PATCH 1628/3246] linux-hardened-config: various fixups

Note
- the kernel config parser ignores "# foo is unset" comments so they
  have no effect; disabling kernel modules would break *everything* and so
  is ill-suited for a general-purpose kernel anyway --- the hardened nixos
  profile provides a more flexible solution
- removed some overlap with the common config (SECCOMP is *required* by systemd;
  YAMA is enabled by default).
- MODIFY_LDT_SYSCALL is guarded by EXPERT on vanilla so setting it to y breaks
  the build; fix by making it optional
- restored some original comments which I feel are clearer
---
 .../linux/kernel/hardened-config.nix          | 46 ++++++++-----------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 7c5593a4df2..579fb2947ec 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -5,6 +5,8 @@
 # Dangerous features that can be permanently (for the boot session) disabled at
 # boot via sysctl or kernel cmdline are left enabled here, for improved
 # flexibility.
+#
+# See also <nixos/modules/profiles/hardened.nix>
 
 { stdenv, version }:
 
@@ -22,7 +24,7 @@ ${optionalString (stdenv.system == "x86_64-linux") ''
   # Reduce attack surface by disabling various emulations
   IA32_EMULATION n
   X86_X32 n
-  MODIFY_LDT_SYSCALL n
+  MODIFY_LDT_SYSCALL? n
 
   VMAP_STACK y # Catch kernel stack overflows
 
@@ -30,45 +32,33 @@ ${optionalString (stdenv.system == "x86_64-linux") ''
   RANDOMIZE_BASE y
   RANDOMIZE_MEMORY y
 
-  # Modern libc no longer needs a fixed-position mapping in userspace, remove it as a possible target.
+  # Disable legacy virtual syscalls by default (modern glibc use vDSO instead).
+  #
+  # Note that the vanilla default is to *emulate* the legacy vsyscall mechanism,
+  # which is supposed to be safer than the native variant (wrt. ret2libc), so
+  # disabling it mainly helps reduce surface.
   LEGACY_VSYSCALL_NONE y
 ''}
 
-# Make sure kernel page tables have safe permissions.
-DEBUG_KERNEL y
-
+# Safer page access permissions (wrt. code injection).  Default on >=4.11.
 ${optionalString (versionOlder version "4.11") ''
   DEBUG_RODATA y
   DEBUG_SET_MODULE_RONX y
 ''}
 
-${optionalString (versionAtLeast version "4.11") ''
-  GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
-''}
+DEBUG_WX y # boot-time warning on RWX mappings
 
-# Report any dangerous memory permissions (not available on all archs).
-DEBUG_WX y
-
-# Do not allow direct physical memory access (but if you must have it, at least enable STRICT mode...)
-# DEVMEM is not set
+# Stricter /dev/mem
 STRICT_DEVMEM y
 IO_STRICT_DEVMEM y
 
-# Perform additional validation of various commonly targeted structures.
+# Perform additional validation of commonly targeted structures.
 DEBUG_CREDENTIALS y
 DEBUG_NOTIFIERS y
 DEBUG_LIST y
 DEBUG_SG y
-BUG_ON_DATA_CORRUPTION y
 SCHED_STACK_END_CHECK y
-
-# Provide userspace with seccomp BPF API for syscall attack surface reduction.
-SECCOMP y
-SECCOMP_FILTER y
-
-# Provide userspace with ptrace ancestry protections.
-SECURITY y
-SECURITY_YAMA y
+BUG_ON_DATA_CORRUPTION y
 
 # Perform usercopy bounds checking.
 HARDENED_USERCOPY y
@@ -76,8 +66,7 @@ HARDENED_USERCOPY y
 # Randomize allocator freelists.
 SLAB_FREELIST_RANDOM y
 
-# Wipe higher-level memory allocations when they are freed (needs "page_poison 1" command line below).
-# (If you can afford even more performance penalty, leave PAGE_POISONING_NO_SANITY n)
+# Wipe higher-level memory allocations on free() with page_poison=1
 PAGE_POISONING y
 PAGE_POISONING_NO_SANITY y
 PAGE_POISONING_ZERO y
@@ -86,11 +75,12 @@ PAGE_POISONING_ZERO y
 PANIC_ON_OOPS y
 PANIC_TIMEOUT -1
 
-# Keep root from altering kernel memory via loadable modules.
-# MODULES is not set
-
 GCC_PLUGINS y # Enable gcc plugin options
 
+${optionalString (versionAtLeast version "4.11") ''
+  GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
+''}
+
 # Disable various dangerous settings
 ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory
 PROC_KCORE n # Exposes kernel text image layout

From 4a65f9ef5f7248244e089eaacff77eb6001a38f4 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 6 Aug 2017 19:10:06 +0200
Subject: [PATCH 1629/3246] dnscrypt-proxy: enable parallel building

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

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index fd7289ec42e..5edeee715c2 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8";
   };
 
+  enableParallelBuilding = true;
+
   configureFlags = optional stdenv.isLinux "--with-systemd";
 
   nativeBuildInputs = [ pkgconfig ];

From d56361f036739d737d0c55291b183571769a4fdd Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 6 Aug 2017 23:29:51 +0200
Subject: [PATCH 1630/3246] pigz: 2.3.3 -> 2.3.4

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

diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 15269bbd6c7..c1f3232e187 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, zlib, utillinux }:
 
 let name = "pigz";
-    version = "2.3.3";
+    version = "2.3.4";
 in
 stdenv.mkDerivation {
   name = name + "-" + version;
 
   src = fetchurl {
     url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz";
-    sha256 = "172hdf26k4zmm7z8md7nl0dph2a7mhf3x7slb9bhfyff6as6g2sf";
+    sha256 = "16lgbjzzfx0k4a1znsw8kq3lnkx17gw93zq2sn01sny11fj1y0vg";
   };
 
   buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;

From a40bf20a1d648521cef7f56eb987c4c732a2b4ea Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 6 Aug 2017 23:32:21 +0200
Subject: [PATCH 1631/3246] pigz: enable parallel building

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

diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index c1f3232e187..76704c254bd 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation {
     sha256 = "16lgbjzzfx0k4a1znsw8kq3lnkx17gw93zq2sn01sny11fj1y0vg";
   };
 
+  enableParallelBuilding = true;
+
   buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
 
   doCheck = stdenv.isLinux;

From 541377e5f0189819cfa50dacbb7569e26c06a3c0 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Fri, 21 Jul 2017 19:14:03 +0100
Subject: [PATCH 1632/3246] rsync service: modernize config file generation

---
 .../services/network-filesystems/rsyncd.nix   | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix
index 2018bfa14a5..a52fec4c407 100644
--- a/nixos/modules/services/network-filesystems/rsyncd.nix
+++ b/nixos/modules/services/network-filesystems/rsyncd.nix
@@ -8,22 +8,21 @@ let
 
   motdFile = builtins.toFile "rsyncd-motd" cfg.motd;
 
-  moduleConfig = name:
-    let module = getAttr name cfg.modules; in
-    "[${name}]\n " + (toString (
-       map
-         (key: "${key} = ${toString (getAttr key module)}\n")
-         (attrNames module)
-    ));
+  foreach = attrs: f:
+    concatStringsSep "\n" (mapAttrsToList f attrs);
 
-  cfgFile = builtins.toFile "rsyncd.conf"
-    ''
+  cfgFile = ''
     ${optionalString (cfg.motd != "") "motd file = ${motdFile}"}
     ${optionalString (cfg.address != "") "address = ${cfg.address}"}
     ${optionalString (cfg.port != 873) "port = ${toString cfg.port}"}
     ${cfg.extraConfig}
-    ${toString (map moduleConfig (attrNames cfg.modules))}
-    '';
+    ${foreach cfg.modules (name: module: ''
+      [${name}]
+      ${foreach module (k: v:
+        "${k} = ${v}"
+      )}
+    '')}
+  '';
 in
 
 {
@@ -91,10 +90,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.etc = singleton {
-      source = cfgFile;
-      target = "rsyncd.conf";
-    };
+    environment.etc."rsyncd.conf".text = cfgFile;
 
     systemd.services.rsyncd = {
       description = "Rsync daemon";

From 94fc613cc7b2be6fb92ddfd5f2c1649b27459be0 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Fri, 21 Jul 2017 19:14:21 +0100
Subject: [PATCH 1633/3246] rsync service: restart service on configuration
 change

---
 nixos/modules/services/network-filesystems/rsyncd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix
index a52fec4c407..0759fcc2a3b 100644
--- a/nixos/modules/services/network-filesystems/rsyncd.nix
+++ b/nixos/modules/services/network-filesystems/rsyncd.nix
@@ -95,6 +95,7 @@ in
     systemd.services.rsyncd = {
       description = "Rsync daemon";
       wantedBy = [ "multi-user.target" ];
+      restartTriggers = [ config.environment.etc."rsyncd.conf".source ];
       serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach";
     };
 

From a4d07290cba3208a2ff930c8cfb594ff809ec7ad Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Fri, 21 Jul 2017 20:15:27 +0100
Subject: [PATCH 1634/3246] rsync service: allow running as not root

---
 .../services/network-filesystems/rsyncd.nix   | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix
index 0759fcc2a3b..054057d52ab 100644
--- a/nixos/modules/services/network-filesystems/rsyncd.nix
+++ b/nixos/modules/services/network-filesystems/rsyncd.nix
@@ -83,6 +83,24 @@ in
           };
       };
 
+      user = mkOption {
+        type = types.str;
+        default = "root";
+        description = ''
+          The user to run the daemon as.
+          By default the daemon runs as root.
+        '';
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "root";
+        description = ''
+          The group to run the daemon as.
+          By default the daemon runs as root.
+        '';
+      };
+
     };
   };
 
@@ -96,8 +114,11 @@ in
       description = "Rsync daemon";
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [ config.environment.etc."rsyncd.conf".source ];
-      serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach";
+      serviceConfig = {
+        ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach";
+        User = cfg.user;
+        Group = cfg.group;
+      };
     };
-
   };
 }

From b27d8c5d0af76a512fd85c4e3d83833a4b514bc8 Mon Sep 17 00:00:00 2001
From: Richard Larocque <richard.larocque@gmail.com>
Date: Sun, 6 Aug 2017 15:54:36 -0700
Subject: [PATCH 1635/3246] nixos/mosquitto: Fix instructions for password gen

Fixes https://github.com/NixOS/nixpkgs/issues/27996.

Updates instructions for generating hashes passwords for use in a
Mosquitto password file.  Using `mosquitto_passwd` to generate these
hashes is a little less convenient, but the results are more likely to
be compatible with the mosquitto daemon.

As far as I can tell, the hashes generated with `mkpassd` did not work
as intended.  But this may have been hidden by another bug:
https://github.com/NixOS/nixpkgs/issues/27130.
---
 nixos/modules/services/networking/mosquitto.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 5451500b56f..81915b5a2ef 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -125,8 +125,8 @@ in
               description = ''
                 Specifies the hashed password for the MQTT User.
                 <option>hashedPassword</option> overrides <option>password</option>.
-                To generate hashed password install <literal>mkpasswd</literal>
-                package and run <literal>mkpasswd -m sha-512</literal>.
+                To generate hashed password install <literal>mosquitto</literal>
+                package and use <literal>mosquitto_passwd</literal>.
               '';
             };
 

From 0cf0d7186a5259ae59b852c109f31ab09af56cec Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 4 Aug 2017 22:08:46 -0400
Subject: [PATCH 1636/3246] linux-common-config: Refactor, clean up

---
 .../linux/kernel/common-config.nix            | 1169 ++++++++---------
 1 file changed, 552 insertions(+), 617 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index c0ee75ae9f8..df18c60130d 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -3,11 +3,14 @@
   WARNING/NOTE: whenever you want to add an option here you need to
   either
 
-  * mark it as an optional one with `?` suffix,
-  * or make sure it works for all the versions in nixpkgs,
+  * make sure it works for all the versions in nixpkgs,
   * or check for which kernel versions it will work (using kernel
     changelog, google or whatever) and mark it with `versionOlder` or
-    `versionAtLeast`.
+    `versionAtLeast`
+
+  This file has a fairly obvious structure, follow it!
+  Do not duplicate predicates, sort options alphabetically, comment if
+  the option's functionality is non-obvious.
 
   Then do test your change by building all the kernels (or at least
   their configs) in Nixpkgs or else you will guarantee lots and lots
@@ -21,703 +24,635 @@
 with stdenv.lib;
 
 ''
-  # Compress kernel modules for a sizable disk space savings.
-  ${optionalString (versionAtLeast version "3.18") ''
-    MODULE_COMPRESS y
-    MODULE_COMPRESS_XZ y
-  ''}
+# Globally applicable
 
-  KERNEL_XZ y
-
-  # Debugging.
-  DEBUG_KERNEL y
-  DYNAMIC_DEBUG y
-  BACKTRACE_SELF_TEST n
-  DEBUG_DEVRES n
-  DEBUG_STACK_USAGE n
-  DEBUG_STACKOVERFLOW n
-  SCHEDSTATS n
-  DETECT_HUNG_TASK y
-
-  ${optionalString (versionOlder version "4.4") ''
-    CPU_NOTIFIER_ERROR_INJECT? n
-  ''}
-
-  ${optionalString (versionOlder version "4.11") ''
-    TIMER_STATS y
-    DEBUG_NX_TEST n
-  ''}
-
-  # Bump the maximum number of CPUs to support systems like EC2 x1.*
-  # instances and Xeon Phi.
-  ${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") ''
-    NR_CPUS 384
-  ''}
-
-  # Unix domain sockets.
-  UNIX y
-
-  # Power management.
-  ${optionalString (versionOlder version "3.19") ''
-    PM_RUNTIME y
-  ''}
-  PM_ADVANCED_DEBUG y
-  ${optionalString (versionAtLeast version "3.11") ''
-    X86_INTEL_LPSS y
-  ''}
-  ${optionalString (versionAtLeast version "3.10") ''
-    X86_INTEL_PSTATE y
-  ''}
-  INTEL_IDLE y
-  CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
-  ${optionalString (versionOlder version "3.10") ''
-    USB_SUSPEND y
-  ''}
-  PM_WAKELOCKS y
-
-  # Support drivers that need external firmware.
-  STANDALONE n
-
-  # Make /proc/config.gz available.
-  IKCONFIG y
-  IKCONFIG_PROC y
-
-  # Optimize with -O2, not -Os.
-  CC_OPTIMIZE_FOR_SIZE n
-
-  # Enable the kernel's built-in memory tester.
-  MEMTEST y
-
-  # Include the CFQ I/O scheduler in the kernel, rather than as a
-  # module, so that the initrd gets a good I/O scheduler.
-  IOSCHED_CFQ y
-  BLK_CGROUP y # required by CFQ
-  IOSCHED_DEADLINE y
-  ${optionalString (versionAtLeast version "4.11") ''
-    MQ_IOSCHED_DEADLINE y
-  ''}
-  ${optionalString (versionAtLeast version "4.12") ''
-    MQ_IOSCHED_KYBER y
-    IOSCHED_BFQ m
-  ''}
-
-  # Enable NUMA.
-  NUMA? y
-
-  # Disable some expensive (?) features.
-  PM_TRACE_RTC n
-
-  # Enable initrd support.
-  BLK_DEV_RAM y
-  BLK_DEV_INITRD y
-
-  # Enable various subsystems.
-  ACCESSIBILITY y # Accessibility support
-  AUXDISPLAY y # Auxiliary Display support
-  DONGLE y # Serial dongle support
-  HIPPI y
-  MTD_COMPLEX_MAPPINGS y # needed for many devices
-  SCSI_LOWLEVEL y # enable lots of SCSI devices
-  SCSI_LOWLEVEL_PCMCIA y
-  SCSI_SAS_ATA y  # added to enable detection of hard drive
-  SPI y # needed for many devices
-  SPI_MASTER y
-  WAN y
-
-  # Networking options.
-  NET y
-  IP_PNP n
-  ${optionalString (versionOlder version "3.13") ''
-    IPV6_PRIVACY y
-  ''}
-  NETFILTER y
-  NETFILTER_ADVANCED y
-  IP_ROUTE_VERBOSE y
-  IP_MROUTE_MULTIPLE_TABLES y
-  IP_VS_PROTO_TCP y
-  IP_VS_PROTO_UDP y
-  IP_VS_PROTO_ESP y
-  IP_VS_PROTO_AH y
-  IP_DCCP_CCID3 n # experimental
-  IP_MULTICAST y
-  IPV6_ROUTER_PREF y
-  IPV6_ROUTE_INFO y
-  IPV6_OPTIMISTIC_DAD y
-  IPV6_MULTIPLE_TABLES y
-  IPV6_SUBTREES y
-  IPV6_MROUTE y
-  IPV6_MROUTE_MULTIPLE_TABLES y
-  IPV6_PIMSM_V2 y
-  ${optionalString (versionAtLeast version "4.7") ''
-    IPV6_FOU_TUNNEL m
-  ''}
-  CLS_U32_PERF y
-  CLS_U32_MARK y
-  ${optionalString (stdenv.system == "x86_64-linux") ''
-    BPF_JIT y
-  ''}
-  ${optionalString (versionAtLeast version "4.4") ''
-    NET_CLS_BPF m
-    NET_ACT_BPF m
-  ''}
-  L2TP_V3 y
-  L2TP_IP m
-  L2TP_ETH m
-  BRIDGE_VLAN_FILTERING y
-  BONDING m
-  NET_L3_MASTER_DEV? y
-  NET_FOU_IP_TUNNELS? y
-  IP_NF_TARGET_REDIRECT m
-
-  # Wireless networking.
-  CFG80211_WEXT? y # Without it, ipw2200 drivers don't build
-  IPW2100_MONITOR? y # support promiscuous mode
-  IPW2200_MONITOR? y # support promiscuous mode
-  HOSTAP_FIRMWARE? y # Support downloading firmware images with Host AP driver
-  HOSTAP_FIRMWARE_NVRAM? y
-  ATH9K_PCI? y # Detect Atheros AR9xxx cards on PCI(e) bus
-  ATH9K_AHB? y # Ditto, AHB bus
-  B43_PHY_HT? y
-  BCMA_HOST_PCI? y
-
-  # Enable various FB devices.
-  FB y
-  FB_EFI y
-  FB_NVIDIA_I2C y # Enable DDC Support
-  FB_RIVA_I2C y
-  FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
-  FB_ATY_GX y # Mach64 GX support
-  FB_SAVAGE_I2C y
-  FB_SAVAGE_ACCEL y
-  FB_SIS_300 y
-  FB_SIS_315 y
-  FB_3DFX_ACCEL y
-  FB_VESA y
-  FRAMEBUFFER_CONSOLE y
-  FRAMEBUFFER_CONSOLE_ROTATION y
-  ${optionalString (stdenv.system == "i686-linux") ''
-    FB_GEODE y
-  ''}
-
-  # Video configuration.
-  # Enable KMS for devices whose X.org driver supports it.
-  ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) ''
-    DRM_I915_KMS y
-  ''}
-  # Allow specifying custom EDID on the kernel command line
-  DRM_LOAD_EDID_FIRMWARE y
-  VGA_SWITCHEROO y # Hybrid graphics support
-  DRM_GMA600 y
-  DRM_GMA3600 y
-  ${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
-  SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
-  SND_HDA_INPUT_BEEP y # Support digital beep via input layer
-  SND_HDA_RECONFIG y # Support reconfiguration of jack functions
-  SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot
-  SND_USB_CAIAQ_INPUT y
-  ${optionalString (versionOlder version "4.12") ''
-    PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-  ''}
-
-  # USB serial devices.
-  USB_SERIAL_GENERIC y # USB Generic Serial Driver
-  USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
-  USB_SERIAL_KEYSPAN_USA28 y
-  USB_SERIAL_KEYSPAN_USA28X y
-  USB_SERIAL_KEYSPAN_USA28XA y
-  USB_SERIAL_KEYSPAN_USA28XB y
-  USB_SERIAL_KEYSPAN_USA19 y
-  USB_SERIAL_KEYSPAN_USA18X y
-  USB_SERIAL_KEYSPAN_USA19W y
-  USB_SERIAL_KEYSPAN_USA19QW y
-  USB_SERIAL_KEYSPAN_USA19QI y
-  USB_SERIAL_KEYSPAN_USA49W y
-  USB_SERIAL_KEYSPAN_USA49WLC y
-
-  # Filesystem options - in particular, enable extended attributes and
-  # ACLs for all filesystems that support them.
-  FANOTIFY y
-  TMPFS y
-  TMPFS_POSIX_ACL y
-  ${optionalString (versionAtLeast version "4.9") ''
-    FS_ENCRYPTION? m
-  ''}
-  EXT2_FS_XATTR y
-  EXT2_FS_POSIX_ACL y
-  EXT2_FS_SECURITY y
-  ${optionalString (versionOlder version "4.0") ''
-    EXT2_FS_XIP y # Ext2 execute in place support
-  ''}
-  EXT3_FS_POSIX_ACL y
-  EXT3_FS_SECURITY y
-  EXT4_FS_POSIX_ACL y
-  EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"}
-  EXT4_FS_SECURITY y
-  REISERFS_FS_XATTR? y
-  REISERFS_FS_POSIX_ACL? y
-  REISERFS_FS_SECURITY? y
-  JFS_POSIX_ACL? y
-  JFS_SECURITY? y
-  XFS_QUOTA? y
-  XFS_POSIX_ACL? y
-  XFS_RT? y # XFS Realtime subvolume support
-  OCFS2_DEBUG_MASKLOG? n
-  BTRFS_FS_POSIX_ACL y
-  UBIFS_FS_ADVANCED_COMPR? y
-  F2FS_FS m
-  F2FS_FS_SECURITY? y
-  F2FS_FS_ENCRYPTION? y
-  UDF_FS m
-  ${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") ''
-    NFSD_PNFS y
-  ''}
-  NFSD_V2_ACL y
-  NFSD_V3 y
-  NFSD_V3_ACL y
-  NFSD_V4 y
-  ${optionalString (versionAtLeast version "3.11") ''
-    NFSD_V4_SECURITY_LABEL y
-  ''}
-  NFS_FSCACHE y
-  NFS_SWAP y
-  NFS_V3_ACL y
-  ${optionalString (versionAtLeast version "3.11") ''
-    NFS_V4_1 y  # NFSv4.1 client support
-    NFS_V4_2 y
-    NFS_V4_SECURITY_LABEL y
-  ''}
-  CIFS_XATTR y
-  CIFS_POSIX y
-  CIFS_FSCACHE y
-  CIFS_STATS y
-  CIFS_WEAK_PW_HASH y
-  CIFS_UPCALL y
-  CIFS_ACL y
-  CIFS_DFS_UPCALL y
-  ${optionalString (versionOlder version "4.13") ''
-    CIFS_SMB2 y
-  ''}
-  ${optionalString (versionAtLeast version "3.12") ''
-    CEPH_FSCACHE y
-  ''}
-  ${optionalString (versionAtLeast version "3.14") ''
-    CEPH_FS_POSIX_ACL y
-  ''}
-  ${optionalString (versionAtLeast version "3.13") ''
-    SQUASHFS_FILE_DIRECT y
-    SQUASHFS_DECOMP_MULTI_PERCPU y
-  ''}
-  SQUASHFS_XATTR y
-  SQUASHFS_ZLIB y
-  SQUASHFS_LZO y
-  SQUASHFS_XZ y
-  ${optionalString (versionAtLeast version "3.19") ''
-    SQUASHFS_LZ4 y
-  ''}
-
-  # Native Language Support modules, needed by some filesystems
-  NLS y
-  NLS_DEFAULT utf8
-  NLS_UTF8 m
-  NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option
-  NLS_ISO8859_1 m    # VFAT default for the iocharset= mount option
-
-  # Runtime security tests
-  ${optionalString (versionOlder version "4.11") ''
-    DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages
-  ''}
-
-  # Security related features.
-  RANDOMIZE_BASE? y
-  STRICT_DEVMEM y # Filter access to /dev/mem
-  SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
-  SECURITY_YAMA? y # Prevent processes from ptracing non-children processes
-  DEVKMEM n # Disable /dev/kmem
-  ${if versionOlder version "3.14" then ''
-    CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
-  '' else ''
-    CC_STACKPROTECTOR_REGULAR? y
-  ''}
-  ${optionalString (versionAtLeast version "3.12") ''
-    USER_NS y # Support for user namespaces
-  ''}
-
-  # AppArmor support
-  SECURITY_APPARMOR y
-  DEFAULT_SECURITY_APPARMOR y
-
-  # Microcode loading support
-  MICROCODE y
-  MICROCODE_INTEL y
-  MICROCODE_AMD y
-  ${optionalString (versionAtLeast version "3.11" && versionOlder version "4.4") ''
-    MICROCODE_EARLY y
-    MICROCODE_INTEL_EARLY y
-    MICROCODE_AMD_EARLY y
-  ''}
-
-  # Misc. options.
   8139TOO_8129 y
   8139TOO_PIO n # PIO is slower
+  9P_FS_POSIX_ACL y
+  9P_FSCACHE y
+  ACCESSIBILITY y # Accessibility support
   AIC79XX_DEBUG_ENABLE n
   AIC7XXX_DEBUG_ENABLE n
   AIC94XX_DEBUG n
-  ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") ''
-    AUDIT_LOGINUID_IMMUTABLE y
-  ''}
-  ${optionalString (versionOlder version "4.4") ''
-    B43_PCMCIA? y
-  ''}
-  BLK_DEV_INITRD y
+  ASYNC_RAID6_TEST n
+  ATH9K_AHB y # Ditto, AHB bus
+  ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
+  ATOMIC64_SELFTEST n
+  AUXDISPLAY y # Auxiliary Display support
+  B43_PHY_HT y
+  BACKTRACE_SELF_TEST n
+  BACKTRACE_SELF_TEST n
+  BCMA_HOST_PCI y
+  BINFMT_MISC y
+  BINFMT_SCRIPT y # Our initrd init uses shebang scripts, so can't be modular.
+  BLK_CGROUP y # required by CFQ
+  BLK_DEV_INITRD y # Enable initrd support
   BLK_DEV_INTEGRITY y
+  BLK_DEV_RAM y # Enable initrd support
+  BLK_DEV_THROTTLING y
+  BONDING m
+  BRCMFMAC_USB y
+  BRIDGE_VLAN_FILTERING y
   BSD_PROCESS_ACCT_V3 y
-  BT_HCIUART_BCSP? y
-  BT_HCIUART_H4? y # UART (H4) protocol support
-  BT_HCIUART_LL? y
-  BT_RFCOMM_TTY? y # RFCOMM TTY support
-  CLEANCACHE? y
-  CRASH_DUMP? n
-  DVB_DYNAMIC_MINORS? y # we use udev
-  EFI_STUB y # EFI bootloader in the bzImage itself
+  BT_HCIUART_BCSP y
+  BT_HCIUART_H4 y # UART (H4) protocol support
+  BT_HCIUART_LL y
+  BT_RFCOMM_TTY y # RFCOMM TTY support
+  BTRFS_FS_POSIX_ACL y
+  CC_OPTIMIZE_FOR_SIZE n # Optimize with -O2
+  CFG80211_WEXT y # Without it, ipw2200 drivers don't build
+  CFQ_GROUP_IOSCHED y
+  CGROUP_DEVICE y
   CGROUPS y # used by systemd
+  CIFS_ACL y
+  CIFS_DFS_UPCALL y
+  CIFS_FSCACHE y
+  CIFS_POSIX y
+  CIFS_STATS y
+  CIFS_UPCALL y
+  CIFS_WEAK_PW_HASH y
+  CIFS_XATTR y
+  CLEANCACHE y
+  CLS_U32_MARK y
+  CLS_U32_PERF y
+  CONNECTOR y # PROC_EVENTS requires that the netlink connector is not built as a module
+  CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
+  CRASH_DUMP n
+  CRC32_SELFTEST n
+  CRYPTO_TEST n
+  DEBUG_DEVRES n
+  DEBUG_KERNEL y
+  DEBUG_STACK_USAGE n
+  DEBUG_STACKOVERFLOW n
+  DEFAULT_SECURITY_APPARMOR y
+  DETECT_HUNG_TASK y
+  DEVTMPFS y
+  DONGLE y # Serial dongle support
+  DRM_GMA3600 y
+  DRM_GMA600 y
+  DRM_LOAD_EDID_FIRMWARE y
+  DVB_DYNAMIC_MINORS y # we use udev
+  EFI_STUB y # EFI bootloader in the bzImage itself
+  EXT2_FS_POSIX_ACL y
+  EXT2_FS_SECURITY y
+  EXT2_FS_XATTR y
+  EXT3_FS_POSIX_ACL y
+  EXT3_FS_SECURITY y
+  EXT4_FS_POSIX_ACL y
+  EXT4_FS_SECURITY y
+  F2FS_FS m
+  FANOTIFY y
+  FB y
+  FB_3DFX_ACCEL y
+  FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+  FB_ATY_GX y # Mach64 GX support
+  FB_EFI y
+  FB_NVIDIA_I2C y # Enable DDC Support
+  FB_RIVA_I2C y
+  FB_SAVAGE_ACCEL y
+  FB_SAVAGE_I2C y
+  FB_SIS_300 y
+  FB_SIS_315 y
+  FB_VESA y
   FHANDLE y # used by systemd
-  SECCOMP y # used by systemd >= 231
-  SECCOMP_FILTER y # ditto
-  POSIX_MQUEUE y
+  FRAMEBUFFER_CONSOLE y
+  FRAMEBUFFER_CONSOLE_ROTATION y
   FRONTSWAP y
   FUSION y # Fusion MPT device support
-  IDE n # deprecated IDE support
-  ${optionalString (versionAtLeast version "4.3") ''
-    IDLE_PAGE_TRACKING y
-  ''}
-  IRDA_ULTRA y # Ultra (connectionless) protocol
-  JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels
-  JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels
-  JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support
-  JOYSTICK_XPAD_LEDS? y # LED Support for Xbox360 controller 'BigX' LED
-  KEXEC_FILE? y
-  KEXEC_JUMP? y
+  HIPPI y
+  HOSTAP_FIRMWARE_NVRAM y
+  HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+  HWMON y
+  HYPERVISOR_GUEST y
+  IDE n # deprecated IDE supportIRDA_ULTRA y # Ultra (connectionless) protocol
+  IKCONFIG y # Make /proc/config.gz available
+  IKCONFIG_PROC y # Make /proc/config.gz available
+  INTEL_IDLE y
+  INTERVAL_TREE_TEST n
+  IOSCHED_CFQ y # Include the CFQ I/O scheduler in the kernel, rather than as a module, so that the initrd gets a good I/O scheduler
+  IOSCHED_DEADLINE y
+  IP_DCCP_CCID3 n # experimental
+  IP_MROUTE_MULTIPLE_TABLES y
+  IP_MULTICAST y
+  IP_NF_TARGET_REDIRECT m
+  IP_PNP n
+  IP_ROUTE_VERBOSE y
+  IP_VS_PROTO_AH y
+  IP_VS_PROTO_ESP y
+  IP_VS_PROTO_TCP y
+  IP_VS_PROTO_UDP y
+  IPV6_MROUTE y
+  IPV6_MROUTE_MULTIPLE_TABLES y
+  IPV6_MULTIPLE_TABLES y
+  IPV6_OPTIMISTIC_DAD y
+  IPV6_PIMSM_V2 y
+  IPV6_ROUTE_INFO y
+  IPV6_ROUTER_PREF y
+  IPV6_SUBTREES y
+  IPW2100_MONITOR y # support promiscuous mode
+  IPW2200_MONITOR y # support promiscuous mode
+  JFS_POSIX_ACL y
+  JFS_SECURITY y
+  JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+  JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+  JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+  JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+  KERNEL_XZ y
+  KEXEC_JUMP y
+  KPROBES y
+  KSM y
+  KVM_ASYNC_PF y
+  KVM_GUEST y
+  KVM_MMIO y
+  L2TP_ETH m
+  L2TP_IP m
+  L2TP_V3 y
   LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
   LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
   LOGO n # not needed
   MEDIA_ATTACH y
+  MEDIA_CAMERA_SUPPORT y
+  MEDIA_DIGITAL_TV_SUPPORT y
+  MEDIA_RC_SUPPORT y
+  MEDIA_USB_SUPPORT y
   MEGARAID_NEWGEN y
-  ${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") ''
-    MLX4_EN_VXLAN y
-  ''}
-  ${optionalString (versionOlder version "4.9") ''
-    MODVERSIONS y
-  ''}
-  MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
-  MTRR_SANITIZER y
-  NET_FC y # Fibre Channel driver support
-  ${optionalString (versionAtLeast version "3.11") ''
-    PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
-  ''}
+  MEMCG y
+  MEMCG_SWAP y
+  MEMTEST y # Enable the kernel's built-in memory tester
+  MICROCODE y
+  MICROCODE_AMD y
+  MICROCODE_INTEL y
   MMC_BLOCK_MINORS 32 # 8 is default. Modern gpt tables on eMMC may go far beyond 8.
-  PPP_MULTILINK y # PPP multilink support
+  MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+  MTD_COMPLEX_MAPPINGS y # needed for many devices
+  MTD_TESTS n
+  MTRR_SANITIZER y
+  NAMESPACES y #  Required by 'unshare' used by 'nixos-install'
+  NET y
+  NET_FC y # Fibre Channel driver support
+  NETFILTER y
+  NETFILTER_ADVANCED y
+  NFS_FSCACHE y
+  NFS_SWAP y
+  NFS_V3_ACL y
+  NFSD_V2_ACL y
+  NFSD_V3 y
+  NFSD_V3_ACL y
+  NFSD_V4 y
+  NLS y
+  NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option
+  NLS_DEFAULT utf8
+  NLS_ISO8859_1 m    # VFAT default for the iocharset= mount option
+  NLS_UTF8 m
+  NOTIFIER_ERROR_INJECTION n
+  NUMA y
+  OCFS2_DEBUG_MASKLOG n
+  PARAVIRT_SPINLOCKS y
+  PARAVIRT y
+  PM_ADVANCED_DEBUG y
+  PM_TRACE_RTC n # Disable some expensive () features
+  PM_WAKELOCKS y
+  POSIX_MQUEUE y
   PPP_FILTER y
+  PPP_MULTILINK y # PPP multilink support
+  PROC_EVENTS y
+  RBTREE_TEST n
+  RC_DEVICES y # Enable IR devices
+  RCU_TORTURE_TEST n
   REGULATOR y # Voltage and Current Regulator Support
-  RC_DEVICES? y # Enable IR devices
+  REISERFS_FS_POSIX_ACL y
+  REISERFS_FS_SECURITY y
+  REISERFS_FS_XATTR y
+  RT_GROUP_SCHED n
   RT2800USB_RT55XX y
   SCHED_AUTOGROUP y
+  SCHEDSTATS n
   SCSI_LOGGING y # SCSI logging facility
+  SCSI_LOWLEVEL y # enable lots of SCSI devices
+  SCSI_LOWLEVEL_PCMCIA y
+  SCSI_SAS_ATA y  # added to enable detection of hard drive
+  SECCOMP y # used by systemd >= 231
+  SECCOMP_FILTER y # ditto
+  SECURITY_APPARMOR y
+  SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
   SERIAL_8250 y # 8250/16550 and compatible serial support
   SLIP_COMPRESSED y # CSLIP compressed headers
   SLIP_SMART y
-  HWMON y
+  SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+  SND_DYNAMIC_MINORS y
+  SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+  SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot
+  SND_HDA_RECONFIG y # Support reconfiguration of jack functions
+  SND_USB_CAIAQ_INPUT y
+  SPI y # needed for many devices
+  SPI_MASTER y
+  SQUASHFS_LZO y
+  SQUASHFS_XATTR y
+  SQUASHFS_XZ y
+  SQUASHFS_ZLIB y
+  STAGING y
+  STANDALONE n # Support drivers that need external firmware.
+  STRICT_DEVMEM y # Filter access to /dev/mem
+  TEST_KSTRTOX n
+  TEST_LIST_SORT n
+  TEST_STRING_HELPERS n
   THERMAL_HWMON y # Hardware monitoring support
-  ${optionalString (versionAtLeast version "3.15") ''
-    UEVENT_HELPER n
-  ''}
-  ${optionalString (versionOlder version "3.15") ''
-    USB_DEBUG? n
-  ''}
+  TMPFS y
+  TMPFS_POSIX_ACL y
+  TRANSPARENT_HUGEPAGE_ALWAYS n
+  TRANSPARENT_HUGEPAGE_MADVISE y
+  TRANSPARENT_HUGEPAGE y
+  UBIFS_FS_ADVANCED_COMPR y
+  UDF_FS m
+  UNIX y
   USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
   USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-  ${optionalString (versionAtLeast version "4.3") ''
-    USERFAULTFD y
-  ''}
+  USB_SERIAL_GENERIC y # USB Generic Serial Driver
+  USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
+  USB_SERIAL_KEYSPAN_USA18X y
+  USB_SERIAL_KEYSPAN_USA19 y
+  USB_SERIAL_KEYSPAN_USA19QI y
+  USB_SERIAL_KEYSPAN_USA19QW y
+  USB_SERIAL_KEYSPAN_USA19W y
+  USB_SERIAL_KEYSPAN_USA28 y
+  USB_SERIAL_KEYSPAN_USA28X y
+  USB_SERIAL_KEYSPAN_USA28XA y
+  USB_SERIAL_KEYSPAN_USA28XB y
+  USB_SERIAL_KEYSPAN_USA49W y
+  USB_SERIAL_KEYSPAN_USA49WLC y
+  VGA_SWITCHEROO y # Hybrid graphics support
+  VIRT_DRIVERS y
+  WAN y
   X86_CHECK_BIOS_CORRUPTION y
   X86_MCE y
+  XFS_POSIX_ACL y
+  XFS_QUOTA y
+  XFS_RT y # XFS Realtime subvolume support
+  XZ_DEC_TEST n
+  ZRAM m
+
+# Architecture dependent
+
+  ${optionalString (stdenv.isx86_64 || stdenv.isi686) ''
+    XEN y
+    XEN_DOM0 y
+    ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false))  ''
+      HVC_XEN_FRONTEND y
+      HVC_XEN y
+      PCI_XEN y
+      SWIOTLB_XEN y
+      XEN_BACKEND y
+      XEN_BALLOON_MEMORY_HOTPLUG y
+      XEN_BALLOON y
+      XEN_EFI y
+      XEN_HAVE_PVMMU y
+      XEN_MCE_LOG y
+      XEN_PVH y
+      XEN_PVHVM y
+      XEN_SAVE_RESTORE y
+      XEN_SCRUB_PAGES y
+      XEN_SELFBALLOONING y
+      XEN_STUB y
+      XEN_SYS_HYPERVISOR y
+      XEN_TMEM y
+    ''}
+  ''}
+
+  ${optionalString (!stdenv.is64bit) ''
+    HIGHMEM64G y # We need 64 GB (PAE) support for Xen guest support.
+  ''}
+
+  ${optionalString (stdenv.is64bit) ''
+    IRQ_REMAP y
+    VFIO_PCI_VGA y
+    X86_X2APIC y
+  ''}
+
+  ${optionalString (stdenv.system == "i686-linux") ''
+    FB_GEODE y
+  ''}
+
+  ${optionalString (stdenv.system == "x86_64-linux") ''
+    BPF_JIT y
+  ''}
+
+  ${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") ''
+    NR_CPUS 384
+  ''}
+
+# Kernel version dependent
+
+  ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") ''
+    AUDIT_LOGINUID_IMMUTABLE y
+  ''}
+
+  ${optionalString (versionOlder version "3.10") ''
+    ARM_KPROBES_TEST n
+    CPU_NOTIFIER_ERROR_INJECT n
+    EFI_TEST n
+    RCU_PERF_TEST n
+    TEST_ASYNC_DRIVER_PROBE n
+    TEST_BITMAP n
+    TEST_HASH n
+    TEST_UUID n
+    USB_SUSPEND y
+  ''}
+
+  ${optionalString (versionAtLeast version "3.10") ''
+    X86_INTEL_PSTATE y
+  ''}
+
+  ${optionalString (versionAtLeast version "3.11") ''
+    NFS_V4_1 y  # NFSv4.1 client support
+    NFS_V4_2 y
+    NFS_V4_SECURITY_LABEL y
+    NFSD_V4_SECURITY_LABEL y
+    PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
+    X86_INTEL_LPSS y
+
+    ${optionalString (versionOlder version "4.4") ''
+      MICROCODE_AMD_EARLY y
+      MICROCODE_EARLY y
+      MICROCODE_INTEL_EARLY y
+    ''}
+  ''}
 
   ${optionalString (versionAtLeast version "3.12") ''
+    CEPH_FSCACHE y
     HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI
     HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support
+    USER_NS y # Support for user namespaces
   ''}
 
+  ${optionalString (versionOlder version "3.13") ''
+    IPV6_PRIVACY y
+  ''}
+
+  ${optionalString (versionAtLeast version "3.13") ''
+    KVM_VFIO y
+    SQUASHFS_DECOMP_MULTI_PERCPU y
+    SQUASHFS_FILE_DIRECT y
+  ''}
+
+  ${optionalString (versionOlder version "3.14") ''
+    CC_STACKPROTECTOR y # Detect buffer overflows on the stack
+  ''}
+
+  ${optionalString (versionAtLeast version "3.14") ''
+    CC_STACKPROTECTOR_REGULAR y # Detect buffer overflows on the stack
+    CEPH_FS_POSIX_ACL y
+  ''}
+
+  ${optionalString (versionOlder version "3.15") ''
+    USB_DEBUG n
+  ''}
+
+  ${optionalString (versionAtLeast version "3.15") ''
+    UEVENT_HELPER n
+
+    ${optionalString (versionOlder version "4.8") ''
+      MLX4_EN_VXLAN y
+    ''}
+  ''}
+
+  ${optionalString (versionOlder version "3.18") ''
+    ZSMALLOC y
+  ''}
+
+  ${optionalString (versionAtLeast version "3.18") ''
+    MODULE_COMPRESS y # Compress kernel modules for a sizable disk space savings
+    MODULE_COMPRESS_XZ y
+    ZSMALLOC m
+  ''}
+
+  ${optionalString (versionOlder version "3.19") ''
+    PM_RUNTIME y # Power management
+  ''}
+
+  ${optionalString (versionAtLeast version "3.19") ''
+    SQUASHFS_LZ4 y
+  ''}
+
+  ${optionalString (versionOlder version "4.0") ''
+    EXT2_FS_XIP y # Ext2 execute in place support
+  ''}
+
+  ${optionalString (versionAtLeast version "4.0") ''
+    KVM_GENERIC_DIRTYLOG_READ_PROTECT y
+
+    ${optionalString (versionOlder version "4.6") ''
+      NFSD_PNFS y
+    ''}
+
+    ${optionalString (versionOlder version "4.12") ''
+      KVM_COMPAT y
+    ''}
+  ''}
+
+  ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) ''
+    DRM_I915_KMS y
+  ''}
 
-  # Linux containers.
-  NAMESPACES? y #  Required by 'unshare' used by 'nixos-install'
-  RT_GROUP_SCHED n
-  CGROUP_DEVICE? y
-  MEMCG y
-  MEMCG_SWAP y
-  ${optionalString (versionOlder version "4.7") "DEVPTS_MULTIPLE_INSTANCES y"}
-  BLK_DEV_THROTTLING y
-  CFQ_GROUP_IOSCHED y
   ${optionalString (versionAtLeast version "4.3") ''
     CGROUP_PIDS y
+    IDLE_PAGE_TRACKING y
+
+    ${optionalString (!features.grsecurity or false) ''
+      USERFAULTFD y
+    ''}
   ''}
 
-  # Enable staging drivers.  These are somewhat experimental, but
-  # they generally don't hurt.
-  STAGING y
-
-  # PROC_EVENTS requires that the netlink connector is not built
-  # as a module.  This is required by libcgroup's cgrulesengd.
-  CONNECTOR y
-  PROC_EVENTS y
-
-  # Tracing.
-  FTRACE y
-  KPROBES y
-  FUNCTION_TRACER y
-  FTRACE_SYSCALLS y
-  SCHED_TRACER y
-  STACK_TRACER y
-
-  ${if versionOlder version "4.11" then ''
-    UPROBE_EVENT? y
-  '' else ''
-    UPROBE_EVENTS? y
+  ${optionalString (versionOlder version "4.4") ''
+    B43_PCMCIA y
   ''}
 
   ${optionalString (versionAtLeast version "4.4") ''
     BPF_SYSCALL y
-    BPF_EVENTS y
-  ''}
-  FUNCTION_PROFILER y
-  RING_BUFFER_BENCHMARK n
+    BRCMFMAC_PCIE y
+    F2FS_FS_ENCRYPTION y
+    F2FS_FS_SECURITY y
+    FW_LOADER_USER_HELPER_FALLBACK n
+    GLOB_SELFTEST n
+    KEXEC_FILE y
+    LNET_SELFTEST n
+    LOCK_TORTURE_TEST n
+    NET_ACT_BPF m
+    NET_CLS_BPF m
+    NET_FOU_IP_TUNNELS y
+    NET_L3_MASTER_DEV y
+    PERCPU_TEST n
+    TEST_BPF n
+    TEST_FIRMWARE n
+    TEST_HEXDUMP n
+    TEST_PRINTF n
+    TEST_RHASHTABLE n
+    TEST_STATIC_KEYS n
+    TEST_UDELAY n
+    TEST_USER_COPY n
+    ZBUD y
+    ZSWAP y
 
-  # Devtmpfs support.
-  DEVTMPFS y
+    ${optionalString (versionOlder version "4.13") ''
+      TEST_LKM n
+    ''}
 
-  # Easier debugging of NFS issues.
-  SUNRPC_DEBUG y
-
-  # Virtualisation.
-  PARAVIRT? y
-  HYPERVISOR_GUEST y
-  PARAVIRT_SPINLOCKS? y
-  ${optionalString (versionOlder version "4.8") ''
-    KVM_APIC_ARCHITECTURE y
-  ''}
-  KVM_ASYNC_PF y
-  ${optionalString ((versionAtLeast version "4.0") && (versionOlder version "4.12")) ''
-    KVM_COMPAT? y
-  ''}
-  ${optionalString (versionOlder version "4.12") ''
-    KVM_DEVICE_ASSIGNMENT? y
-  ''}
-  ${optionalString (versionAtLeast version "4.0") ''
-    KVM_GENERIC_DIRTYLOG_READ_PROTECT y
-  ''}
-  KVM_GUEST y
-  KVM_MMIO y
-  ${optionalString (versionAtLeast version "3.13") ''
-    KVM_VFIO y
-  ''}
-  ${optionalString (stdenv.isx86_64 || stdenv.isi686) ''
-    XEN? y
-    XEN_DOM0? y
-    ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false))  ''
-      PCI_XEN? y
-      HVC_XEN? y
-      HVC_XEN_FRONTEND? y
-      XEN_SYS_HYPERVISOR? y
-      SWIOTLB_XEN? y
-      XEN_BACKEND? y
-      XEN_BALLOON? y
-      XEN_BALLOON_MEMORY_HOTPLUG? y
-      XEN_EFI? y
-      XEN_HAVE_PVMMU? y
-      XEN_MCE_LOG? y
-      XEN_PVH? y
-      XEN_PVHVM? y
-      XEN_SAVE_RESTORE? y
-      XEN_SCRUB_PAGES? y
-      XEN_SELFBALLOONING? y
-      XEN_STUB? y
-      XEN_TMEM? y
+    ${optionalString (!features.grsecurity or false) ''
+      BPF_EVENTS y
+      RANDOMIZE_BASE y
     ''}
   ''}
-  KSM y
-  ${optionalString (!stdenv.is64bit) ''
-    HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support.
-  ''}
-  ${optionalString (stdenv.is64bit) ''
-    VFIO_PCI_VGA y
-  ''}
-  VIRT_DRIVERS y
 
-  # Media support.
-  MEDIA_DIGITAL_TV_SUPPORT y
-  MEDIA_CAMERA_SUPPORT y
-  MEDIA_RC_SUPPORT y
-  MEDIA_USB_SUPPORT y
+  ${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) ''
+    DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
+  ''}
+
+  ${optionalString (versionOlder version "4.7") ''
+    DEVPTS_MULTIPLE_INSTANCES y # Linux containers
+  ''}
+
+  ${optionalString (versionAtLeast version "4.7") ''
+    IPV6_FOU_TUNNEL m
+  ''}
+
+  ${optionalString (versionOlder version "4.8") ''
+    KVM_APIC_ARCHITECTURE y
+
+    ${optionalString (versionAtLeast version "4.4") ''
+      EXT4_ENCRYPTION m
+    ''}
+  ''}
+
+  ${optionalString (versionAtLeast version "4.8") ''
+    EXT4_ENCRYPTION y
+  ''}
+
+  ${optionalString (versionAtLeast version "4.9") ''
+    DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets
+    DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets
+    FS_ENCRYPTION m
+    MODVERSIONS y
+  ''}
+
+  ${optionalString (versionOlder version "4.11") ''
+    DEBUG_NX_TEST n
+    TIMER_STATS y
+    UPROBE_EVENT y
+
+    ${optionalString (!features.grsecurity or false) ''
+      DEBUG_SET_MODULE_RONX y # Detect writes to read-only module pages
+    ''}
+  ''}
+
+  ${optionalString (versionAtLeast version "4.11") ''
+    DRM_DEBUG_MM_SELFTEST n
+    MQ_IOSCHED_DEADLINE y
+    TEST_PARMAN n
+    TEST_SORT n
+    UPROBE_EVENTS y
+    WW_MUTEX_SELFTEST n
+  ''}
+
+  ${optionalString (versionOlder version "4.12") ''
+    KVM_DEVICE_ASSIGNMENT y
+    PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+  ''}
+
+  ${optionalString (versionAtLeast version "4.12") ''
+    IOSCHED_BFQ m
+    MQ_IOSCHED_KYBER y
+  ''}
+
+  ${optionalString (versionOlder version "4.13") ''
+    CIFS_SMB2 y
+  ''}
+
+  ${optionalString (versionAtLeast version "4.13") ''
+    TEST_LKM m
+  ''}
+
+# Feature dependent
+
+  ${optionalString (!features.grsecurity or false) ''
+    DEVKMEM n # Disable /dev/kmem
+    DYNAMIC_DEBUG y
+    FTRACE y
+    FTRACE_SYSCALLS y
+    FUNCTION_PROFILER y
+    FUNCTION_TRACER y
+    RING_BUFFER_BENCHMARK n
+    SCHED_TRACER y
+    SECURITY_YAMA y # Prevent processes from ptracing non-children processes
+    STACK_TRACER y
+    SUNRPC_DEBUG y # Easier debugging of NFS issues
+  ''}
+
   ${optionalString (!(features.chromiumos or false)) ''
     MEDIA_PCI_SUPPORT y
   ''}
 
-  # Our initrd init uses shebang scripts, so can't be modular.
-  BINFMT_SCRIPT y
-
-  # For systemd-binfmt
-  BINFMT_MISC? y
-
-  # Enable the 9P cache to speed up NixOS VM tests.
-  9P_FSCACHE? y
-  9P_FS_POSIX_ACL? y
-
-  # Enable transparent support for huge pages.
-  TRANSPARENT_HUGEPAGE? y
-  TRANSPARENT_HUGEPAGE_ALWAYS? n
-  TRANSPARENT_HUGEPAGE_MADVISE? y
-
-  # zram support (e.g for in-memory compressed swap).
-  ZRAM m
-  ZSWAP? y
-  ZBUD? y
-  ${optionalString (versionOlder version "3.18") ''
-    ZSMALLOC y
-  ''}
-  ${optionalString (versionAtLeast version "3.18") ''
-    ZSMALLOC m
-  ''}
-
-  # Enable PCIe and USB for the brcmfmac driver
-  BRCMFMAC_USB? y
-  BRCMFMAC_PCIE? y
-
-  # Support x2APIC (which requires IRQ remapping).
-  ${optionalString (stdenv.system == "x86_64-linux") ''
-    X86_X2APIC y
-    IRQ_REMAP y
-  ''}
-
-  # Disable the firmware helper fallback, udev doesn't implement it any more
-  FW_LOADER_USER_HELPER_FALLBACK? n
-
-  # Disable various self-test modules that have no use in a production system
-  ${optionalString (versionOlder version "4.4") ''
-    ARM_KPROBES_TEST? n
-  ''}
-
-  ASYNC_RAID6_TEST? n
-  ATOMIC64_SELFTEST? n
-  BACKTRACE_SELF_TEST? n
-  CRC32_SELFTEST? n
-  CRYPTO_TEST? n
-  GLOB_SELFTEST? n
-  INTERVAL_TREE_TEST? n
-  LNET_SELFTEST? n
-  LOCK_TORTURE_TEST? n
-  MTD_TESTS? n
-  NOTIFIER_ERROR_INJECTION? n
-  PERCPU_TEST? n
-  RBTREE_TEST? n
-  RCU_TORTURE_TEST? n
-  TEST_BPF? n
-  TEST_FIRMWARE? n
-  TEST_HEXDUMP? n
-  TEST_KSTRTOX? n
-  TEST_LIST_SORT? n
-  TEST_LKM? n
-  TEST_PRINTF? n
-  TEST_RHASHTABLE? n
-  TEST_STATIC_KEYS? n
-  TEST_STRING_HELPERS? n
-  TEST_UDELAY? n
-  TEST_USER_COPY? n
-  XZ_DEC_TEST? n
-
-  ${optionalString (versionOlder version "4.4") ''
-    EFI_TEST? n
-    RCU_PERF_TEST? n
-    TEST_ASYNC_DRIVER_PROBE? n
-    TEST_BITMAP? n
-    TEST_HASH? n
-    TEST_UUID? n
-  ''}
-
-  ${optionalString (versionAtLeast version "4.11") ''
-    DRM_DEBUG_MM_SELFTEST? n
-    TEST_PARMAN? n
-    TEST_SORT? n
-    WW_MUTEX_SELFTEST? n
-  ''}
-
   # ChromiumOS support
   ${optionalString (features.chromiumos or false) ''
-    CHROME_PLATFORMS y
-    VGA_SWITCHEROO n
-    MMC_SDHCI_PXAV2 n
-    NET_IPVTI n
-    IPV6_VTI n
-    REGULATOR_FIXED_VOLTAGE n
-    TPS6105X n
-    CPU_FREQ_STAT y
-    IPV6 y
-    MFD_CROS_EC y
-    MFD_CROS_EC_LPC y
-    MFD_CROS_EC_DEV y
-    CHARGER_CROS_USB_PD y
-    I2C y
-    MEDIA_SUBDRV_AUTOSELECT n
-    VIDEO_IR_I2C n
-    BLK_DEV_DM y
     ANDROID_PARANOID_NETWORK n
+    BLK_DEV_DM y
+    CHARGER_CROS_USB_PD y
+    CHROME_PLATFORMS y
+    CPU_FREQ_GOV_INTERACTIVE n
+    CPU_FREQ_STAT y
+    DM_BOOTCACHE n
     DM_VERITY n
     DRM_VGEM n
-    CPU_FREQ_GOV_INTERACTIVE n
+    I2C y
     INPUT_KEYRESET n
-    DM_BOOTCACHE n
+    IPV6 y
+    IPV6_VTI n
+    MEDIA_SUBDRV_AUTOSELECT n
+    MFD_CROS_EC y
+    MFD_CROS_EC_DEV y
+    MFD_CROS_EC_LPC y
+    MMC_SDHCI_PXAV2 n
+    NET_IPVTI n
+    REGULATOR_FIXED_VOLTAGE n
+    TPS6105X n
     UID_CPUTIME n
+    VGA_SWITCHEROO n
+    VIDEO_IR_I2C n
 
     ${optionalString (versionAtLeast version "3.18") ''
-      CPUFREQ_DT n
-      EXTCON_CROS_EC n
-      DRM_POWERVR_ROGUE n
-      CHROMEOS_OF_FIRMWARE y
-      TEST_RHASHTABLE n
       BCMDHD n
+      CHROMEOS_OF_FIRMWARE y
+      CPUFREQ_DT n
+      DRM_POWERVR_ROGUE n
+      EXTCON_CROS_EC n
+      TEST_RHASHTABLE n
       TRUSTY n
     ''}
 
     ${optionalString (versionOlder version "3.18") ''
-      MALI_MIDGARD n
-      DVB_USB_DIB0700 n
-      DVB_USB_DW2102 n
-      DVB_USB_PCTV452E n
-      DVB_USB_TTUSB2 n
       DVB_USB_AF9015 n
       DVB_USB_AF9035 n
       DVB_USB_ANYSEE n
       DVB_USB_AZ6007 n
+      DVB_USB_DIB0700 n
+      DVB_USB_DW2102 n
       DVB_USB_IT913X n
       DVB_USB_LME2510 n
+      DVB_USB_PCTV452E n
       DVB_USB_RTL28XXU n
+      DVB_USB_TTUSB2 n
+      MALI_MIDGARD n
+      SPEAKUP n
+      USB_DWC2 n
+      USB_GADGET n
+      USB_GSPCA n
       USB_S2255 n
       VIDEO_EM28XX n
       VIDEO_TM6000 n
-      USB_DWC2 n
-      USB_GSPCA n
-      SPEAKUP n
       XO15_EBOOK n
-      USB_GADGET n
     ''}
   ''}
 
+# Extra configuration
+
   ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}
 ''

From ff9479cd543545899cfd6cc20bb446e5a6bf4603 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 6 Aug 2017 19:22:15 -0400
Subject: [PATCH 1637/3246] linux: 4.12.4 -> 4.12.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index 51841031eff..97072a2ce74 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.4";
+  version = "4.12.5";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1jasxw8ifkklyfmp0avh53zjymgqwybaz3cmh9l5ydss3xgxfw7l";
+    sha256 = "1833ibdb13dbg5xmf500bxkin8ng4yav3l5qvfilj0v4ygjlhlbi";
   };
 
   kernelPatches = args.kernelPatches;

From 1ec7242bc2786b2672e30104176bf82388ce312b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 6 Aug 2017 22:04:46 -0400
Subject: [PATCH 1638/3246] linux-copperhead: 4.12.4.a -> 4.12.5.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index fe18319dec0..adbc5602163 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.12.4";
+  version = "4.12.5";
   revision = "a";
-  sha256 = "1c6fin95ppl7lj09vr3vxfwxgf3db15wyncvq07b675fpkdx0nnx";
+  sha256 = "03cyh9fsbd95gdd477k1jmk3f9aj5dnw5wr8041y51v8f63vzbpk";
 in
 
 import ./generic.nix (args // {

From 989514f38b19b20061b0a90e62cd7d49762750db Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 6 Aug 2017 23:13:26 -0400
Subject: [PATCH 1639/3246] jsonnet: 0.8.9 -> 0.9.4 (#27989)

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

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index adca825b201..cc19f7afe34 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, emscripten }:
 
-let version = "0.8.9"; in
+let version = "0.9.4"; in
 
 stdenv.mkDerivation {
   name = "jsonnet-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "0phk8dzby5v60r7fwd1qf4as2jdpmdmksjw3g4p3mkkr7sc81119";
+    sha256 = "1bh9x8d3mxnic31b6gh4drn5l6qpyqfgsn2l48sv0jknhinm1a7l";
   };
 
   buildInputs = [ emscripten ];

From f152749c9940cda448153aa4d36dcaea538af8b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Aug 2017 13:15:07 +0200
Subject: [PATCH 1640/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/cfa51cac76b0f2cad7d564e5ba9cb5293f67e23f.
---
 .../haskell-modules/hackage-packages.nix      | 1982 ++++++++++++++---
 1 file changed, 1731 insertions(+), 251 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3b2d9594d98..d2ce7185c0a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -726,8 +726,8 @@ self: {
        pname = "Agda";
        version = "2.5.2";
        sha256 = "0f8ld7sqkfhirhs886kp090iaq70qxsj8ms8farc80vzpz1ww4nq";
-       revision = "2";
-       editedCabalFile = "1zxznr7n6yyyrr38nsa53nd1vhcssnhd5jha30dzwwkyq0mv3c2d";
+       revision = "3";
+       editedCabalFile = "10j2hf2g9vv2xibywgd8s96x05clfxr4wli00011vkhblr4p9br8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -3560,8 +3560,8 @@ self: {
      }:
      mkDerivation {
        pname = "DOH";
-       version = "0.1.1.1";
-       sha256 = "14wj5jdj0s3ygxqz46622j241hxz0h5apmnq7w407xk590c74z64";
+       version = "0.1.2.0";
+       sha256 = "1l70h2213lmpy8mkac4iy9wfcqiqcsp1dvgx9lby470hn77jmg3w";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring containers filepath http-client
          http-client-tls http-types lens mtl text time unordered-containers
@@ -3979,16 +3979,17 @@ self: {
      }) {};
 
   "DeepDarkFantasy" = callPackage
-    ({ mkDerivation, base, bimap, constraints, containers, mtl, random
+    ({ mkDerivation, base, bimap, constraints, containers, mtl
+     , QuickCheck, random, recursion-schemes
      }:
      mkDerivation {
        pname = "DeepDarkFantasy";
-       version = "0.2017.4.19";
-       sha256 = "19fr67fkn4z47a27nbcqh1a24jh2ir32d6fzvjdmj7d0maman2rz";
+       version = "0.2017.8.4";
+       sha256 = "0sf1vbzfps2hi3da1b7wh23xhg69xshw8qf7i7iw3w819qlz0f5j";
        libraryHaskellDepends = [
-         base bimap constraints containers mtl random
+         base bimap constraints containers mtl random recursion-schemes
        ];
-       testHaskellDepends = [ base constraints mtl random ];
+       testHaskellDepends = [ base constraints mtl QuickCheck random ];
        description = "A DSL for creating neural network";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -8557,6 +8558,40 @@ self: {
        license = "LGPL";
      }) {};
 
+  "HTF_0_13_2_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base
+     , base64-bytestring, bytestring, containers, cpphs, Diff, directory
+     , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl
+     , old-time, pretty, process, QuickCheck, random, regex-compat
+     , template-haskell, temporary, text, time, unix
+     , unordered-containers, vector, xmlgen
+     }:
+     mkDerivation {
+       pname = "HTF";
+       version = "0.13.2.2";
+       sha256 = "1fn3w53rylaqmkhwi801phiwlkl7yp9mnj79dbwfb6b6g5mrzd0x";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring bytestring containers cpphs Diff
+         directory haskell-src HUnit lifted-base monad-control mtl old-time
+         pretty process QuickCheck random regex-compat text time unix vector
+         xmlgen
+       ];
+       executableHaskellDepends = [
+         array base cpphs directory HUnit mtl old-time random text
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring directory filepath HUnit mtl
+         process random regex-compat template-haskell temporary text
+         unordered-containers
+       ];
+       homepage = "https://github.com/skogsbaer/HTF/";
+       description = "The Haskell Test Framework";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HTTP" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
@@ -9852,8 +9887,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsHTSLib";
-       version = "1.3.2.0";
-       sha256 = "0mambd3iimll6v2wv616qdai31r4kcj12401afq148h47fq2qk6m";
+       version = "1.3.2.1";
+       sha256 = "03qxsld5rw3j5wqm9zqfb51msyw22976ga0zibmaxc9slm684lyk";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing conduit-combinators containers
          inline-c mtl template-haskell
@@ -11885,8 +11920,8 @@ self: {
      }:
      mkDerivation {
        pname = "MagicHaskeller";
-       version = "0.9.6.6.1";
-       sha256 = "0vly79iqz8ax5wzwgbr3ygdqsi7bq5vki43kmz9zgz8vjqi7hisz";
+       version = "0.9.6.7";
+       sha256 = "0cl0lq45x8pxsbdiqg9sx39jvs8h2h32mni5zq2jb61ac7wim9g1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -15823,8 +15858,8 @@ self: {
     ({ mkDerivation, base, containers, ghc, ghc-paths }:
      mkDerivation {
        pname = "SSTG";
-       version = "0.1.1.2";
-       sha256 = "1vf5c5k6b5nww2acm0r17imcpsl2p6xbg4qqzwdalpj7xhd3bvi9";
+       version = "0.1.1.5";
+       sha256 = "06rc050abq6vfgn0ylfrycp6m3631ji0mq9jwz5cnlhnrhpzfn5j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ghc ghc-paths ];
@@ -16851,6 +16886,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spock-lucid_0_4_0_1" = callPackage
+    ({ mkDerivation, base, lucid, Spock, transformers }:
+     mkDerivation {
+       pname = "Spock-lucid";
+       version = "0.4.0.1";
+       sha256 = "15r3vk78vbhqi09liq0a3zabya845zfmblqahgw6r2jjx49da9ii";
+       libraryHaskellDepends = [ base lucid Spock transformers ];
+       homepage = "http://github.com/aelve/Spock-lucid";
+       description = "Lucid support for Spock";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Spock-worker" = callPackage
     ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl
      , Spock, stm, text, time, transformers, vector
@@ -20904,6 +20952,8 @@ self: {
        pname = "ad";
        version = "4.3.4";
        sha256 = "0r3qixsj624q5c88xlr444fn7z5c36m32ciyxz732lngg06pvwdz";
+       revision = "1";
+       editedCabalFile = "0rfxjifhaxvq8nv1n1l8wf49gh13ailcnyachffk7y55nqr0zqdf";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array base comonad containers data-reify erf free nats reflection
@@ -22540,8 +22590,8 @@ self: {
     ({ mkDerivation, base, optparse-applicative, random, text }:
      mkDerivation {
        pname = "alea";
-       version = "0.5.2.0";
-       sha256 = "0kybz7q9gd0f35qmgnrg625z8kis308svingkjscn9ridwxz6g09";
+       version = "0.5.3.0";
+       sha256 = "0b8b7ncdn9as8y2m4dk4wwk7gjh79yvr9q3jlw6khdsqh266jq1q";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -25066,6 +25116,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "amqp_0_16_0" = 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.16.0";
+       sha256 = "100krph1yaazxcs74r6v5785l50886rsbip98w8p4rzqgcya311a";
+       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
@@ -25519,6 +25598,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-wl-pprint_0_6_8" = callPackage
+    ({ mkDerivation, ansi-terminal, base }:
+     mkDerivation {
+       pname = "ansi-wl-pprint";
+       version = "0.6.8";
+       sha256 = "114ga28xa2wkdf4azyhffwjh94zxa62q2z0cn58xhnca1y2b3xjx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ ansi-terminal base ];
+       executableHaskellDepends = [ ansi-terminal base ];
+       homepage = "http://github.com/ekmett/ansi-wl-pprint";
+       description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ansigraph" = callPackage
     ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
      mkDerivation {
@@ -29388,6 +29483,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "avro" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, binary
+     , bytestring, containers, data-binary-ieee754, entropy, extra, fail
+     , hashable, hspec, mtl, pure-zlib, QuickCheck, scientific
+     , semigroups, tagged, template-haskell, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "avro";
+       version = "0.1.0.1";
+       sha256 = "0pn3pll7yjkfiqllndsn5mcm07my6mgjzd7amncvl3pykw75w0jq";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring binary bytestring containers
+         data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
+         semigroups tagged template-haskell text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring binary bytestring containers
+         entropy extra fail hashable hspec mtl pure-zlib QuickCheck
+         scientific semigroups tagged template-haskell text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/GaloisInc/avro.git";
+       description = "Avro serialization support for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "avwx" = callPackage
     ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
      , parsers, pretty-show, text
@@ -31009,6 +31131,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "basement" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "basement";
+       version = "0.0.0";
+       sha256 = "1agqj5yp0nf7117qx62xp5mncans5szscbp6gz6ifhhsl6lng3k1";
+       libraryHaskellDepends = [ base ghc-prim ];
+       homepage = "https://github.com/haskell-foundation/foundation";
+       description = "Foundation scrap box of array & string";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "basex-client" = callPackage
     ({ mkDerivation, base, network, pureMD5, utf8-string }:
      mkDerivation {
@@ -32222,6 +32356,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "binary-conduit_1_2_5" = callPackage
+    ({ mkDerivation, base, binary, bytestring, conduit, hspec
+     , QuickCheck, quickcheck-assertions, resourcet, vector
+     }:
+     mkDerivation {
+       pname = "binary-conduit";
+       version = "1.2.5";
+       sha256 = "06sbs5kib5jdfxn0fj2yx2wjysgr7g0alnjg1v6iwi7rw2m1gm11";
+       libraryHaskellDepends = [
+         base binary bytestring conduit resourcet vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring conduit hspec QuickCheck
+         quickcheck-assertions resourcet
+       ];
+       homepage = "http://github.com/qnikst/binary-conduit/";
+       description = "data serialization/deserialization conduit library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary-derive" = callPackage
     ({ mkDerivation, base, binary, ghc-prim }:
      mkDerivation {
@@ -33138,6 +33293,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;};
 
+  "bindings-libg15" = callPackage
+    ({ mkDerivation, base, bindings-DSL, g15 }:
+     mkDerivation {
+       pname = "bindings-libg15";
+       version = "0.1.0.0";
+       sha256 = "0vaayi9vnis9d35yrym67ihghfqyz4d13h86m3b27znwk7fqsz0d";
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ g15 ];
+       homepage = "https://github.com/Xandaros/bindings-libg15#readme";
+       description = "Bindings to libg15";
+       license = stdenv.lib.licenses.bsd3;
+     }) {g15 = null;};
+
   "bindings-librrd" = callPackage
     ({ mkDerivation, base, bindings-DSL, librrd }:
      mkDerivation {
@@ -33581,6 +33749,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bio-sequence" = callPackage
+    ({ mkDerivation, array, base, bytestring, hspec, parsec, QuickCheck
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "bio-sequence";
+       version = "0.1.0.0";
+       sha256 = "0x9il05qdzmj6ka0pr8nbjg8zi073f52lpfd0dhzxy2f15zdralc";
+       libraryHaskellDepends = [
+         array base bytestring parsec template-haskell text
+       ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       homepage = "https://github.com/biocad/bio-sequence";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bioace" = callPackage
     ({ mkDerivation, base, bioalign, biocore, bytestring, parsec }:
      mkDerivation {
@@ -33816,16 +34001,16 @@ self: {
      }) {};
 
   "bit-stream" = callPackage
-    ({ mkDerivation, base, criterion, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, vector
+    ({ mkDerivation, base, criterion, ghc-prim, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector
      }:
      mkDerivation {
        pname = "bit-stream";
-       version = "0.1.0.0";
-       sha256 = "1nn7yb15a1nlqjjmz0i4r53gh5wravp07faygn0hrvzvhwghgx1s";
+       version = "0.1.0.1";
+       sha256 = "0qza9w01qwrbfa35dzhfzxxd8ss1aww332s48sbpdjq3ywkjgk81";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base vector ];
+       libraryHaskellDepends = [ base ghc-prim vector ];
        executableHaskellDepends = [ base vector ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
@@ -33833,7 +34018,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/Bodigrim/bit-stream#readme";
-       description = "Lazy, infinite, compact stream of 'Bool' with O(1) indexing";
+       description = "Lazy, infinite, compact stream of Bool with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -34155,8 +34340,8 @@ self: {
        pname = "bits";
        version = "0.5.1";
        sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5";
-       revision = "1";
-       editedCabalFile = "06gsbm787kanng2p37sfkpzh9s630bcxgncayn3alxk3y5q5yi7l";
+       revision = "2";
+       editedCabalFile = "1c209vyxxafr1pf1zqcydy85w9v5gvfjy64i5i6v9asfld6jppig";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base doctest ];
@@ -34376,10 +34561,12 @@ self: {
        pname = "bitwise";
        version = "0.1.1.1";
        sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d";
+       revision = "1";
+       editedCabalFile = "10v3wkjc3y9435kn1rywrp6z0h71pkjcs51p8wl30g9pbpscw5pq";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
-       homepage = "http://code.mathr.co.uk/bitwise";
+       homepage = "https://code.mathr.co.uk/bitwise";
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36020,6 +36207,8 @@ self: {
        pname = "bound";
        version = "2.0.1";
        sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9";
+       revision = "1";
+       editedCabalFile = "0hqs7k5xyfpfcrfms342jj81gzrgxkrkvrl68061nkmsc5xrm4ix";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq hashable mmorph
@@ -36328,7 +36517,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_20_1" = callPackage
+  "brick_0_23" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-clist
      , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
      , template-haskell, text, text-zipper, transformers, vector, vty
@@ -36336,8 +36525,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.20.1";
-       sha256 = "1yhxs2p83nrv9b5lw9cd21f6r735sjxkamhmc2vv8d63z2fncz0f";
+       version = "0.23";
+       sha256 = "1izw1gj38z6d8wnakpdqvsqx49gpgg5wm95hkbc75fvxshngxiwm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36346,7 +36535,7 @@ self: {
          transformers vector vty word-wrap
        ];
        executableHaskellDepends = [
-         base microlens microlens-th text text-zipper vector vty
+         base microlens microlens-th text text-zipper vector vty word-wrap
        ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
@@ -36375,6 +36564,48 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "brittany" = callPackage
+    ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
+     , containers, czipwith, data-tree-print, deepseq, directory, either
+     , extra, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths
+     , hspec, monad-memo, mtl, multistate, neat-interpolation, parsec
+     , pretty, safe, semigroups, strict, syb, text, transformers
+     , uniplate, unsafe, yaml
+     }:
+     mkDerivation {
+       pname = "brittany";
+       version = "0.8.0.2";
+       sha256 = "001nfcdj366avjcjz199s630v3z6r9mrj22b16qcixnwm3pzpxr7";
+       revision = "1";
+       editedCabalFile = "16ks5wxyjlgh7krvkr072pkhj4f5sa8bpnw1y15swx5d8xinp40w";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory either extra ghc ghc-boot-th
+         ghc-exactprint ghc-paths monad-memo mtl multistate
+         neat-interpolation pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       executableHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory either extra filepath ghc
+         ghc-boot-th ghc-exactprint ghc-paths hspec monad-memo mtl
+         multistate neat-interpolation pretty safe semigroups strict syb
+         text transformers uniplate unsafe yaml
+       ];
+       testHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory either extra ghc ghc-boot-th
+         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+         neat-interpolation parsec pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       homepage = "https://github.com/lspitzner/brittany/";
+       description = "Haskell source code formatter";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "broadcast-chan" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -37168,8 +37399,8 @@ self: {
        pname = "bytes";
        version = "0.15.3";
        sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q";
-       revision = "1";
-       editedCabalFile = "1fnv8vlbv8m5k9n5rik6pq693n0nfi9bkx2d8f7y5vvfly5bbkpw";
+       revision = "2";
+       editedCabalFile = "07j20bmhysp4dawy8am1j4lhg21s5c2i8ckqby0iykmfgrlsrcv0";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytestring cereal containers hashable mtl scientific
@@ -37915,8 +38146,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.7.12";
-       sha256 = "18d0sky1h4n41j4hib34ji51jh3ikm68gdc60qv361i7pwrmi1mk";
+       version = "0.8.1";
+       sha256 = "0xzzxzh41k8h6sf04b6j49b44c68gvghh0slifywj171ip4zv5g3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38619,8 +38850,8 @@ self: {
     ({ mkDerivation, base, Cabal, QuickCheck }:
      mkDerivation {
        pname = "cabal-test-quickcheck";
-       version = "0.1.8";
-       sha256 = "11i7726z7ic7xb3ssx69938ipanqasrdl055ym2swm9s2jmc9k6x";
+       version = "0.1.8.1";
+       sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
@@ -38737,8 +38968,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.4";
-       sha256 = "0nmvfg1fdmkibr7c0jk68mbinvqjr91c0lh1xzrd0g1kz576y703";
+       version = "2.4.1";
+       sha256 = "0dplmm32kckb5mk2gfkw63qkakzbgz7f4j0scaj74ncga4vjkzxg";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -39331,19 +39562,19 @@ self: {
      }) {};
 
   "call-haskell-from-anything" = callPackage
-    ({ mkDerivation, base, bytestring, msgpack, mtl, template-haskell
-     , vector
+    ({ mkDerivation, base, bytestring, data-msgpack, mtl
+     , storable-endian, template-haskell
      }:
      mkDerivation {
        pname = "call-haskell-from-anything";
-       version = "1.0.1.0";
-       sha256 = "1z5zyyara0g6inyjqhq26zvln926kln29avvllsg94agdwdbqcqs";
+       version = "1.1.0.0";
+       sha256 = "1ys5xjf1jvrr2nybv5lw36x59n4jnxwqfkf3hdmrdz770y08gp0r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring msgpack mtl template-haskell vector
+         base bytestring data-msgpack mtl storable-endian template-haskell
        ];
-       executableHaskellDepends = [ base bytestring msgpack mtl ];
+       executableHaskellDepends = [ base bytestring data-msgpack mtl ];
        homepage = "https://github.com/nh2/call-haskell-from-anything";
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
@@ -41729,6 +41960,8 @@ self: {
        pname = "cheapskate-highlight";
        version = "0.1.0.0";
        sha256 = "0w6k694gmnx7h8ix79z8scsdl65zbilxni1vjr90ka2fdfrazxss";
+       revision = "1";
+       editedCabalFile = "1c8kxqdqf0j962xjdrrjfcbjsl0c1kax31rjykymv7w16d6hmlj4";
        libraryHaskellDepends = [
          base blaze-html cheapskate highlighting-kate text
        ];
@@ -43959,8 +44192,8 @@ self: {
      }:
      mkDerivation {
        pname = "clr-bindings";
-       version = "0.1.0.0";
-       sha256 = "1rqj81bzqhfz32sf6yningzpd4xp32myknnv0c1vbzkz19cklma1";
+       version = "0.2.0";
+       sha256 = "1q2s4bg4lilcn9pfp14vj11m67l4f3lpqr5h1j17mklzp5cbhv85";
        libraryHaskellDepends = [
          base clr-host clr-marshal clr-typed pipes template-haskell text
        ];
@@ -43992,6 +44225,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
+  "clr-host_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory
+     , file-embed, filepath, glib, mono, text, transformers
+     }:
+     mkDerivation {
+       pname = "clr-host";
+       version = "0.2.0";
+       sha256 = "0x40zbdzj6zkb3k41z1ncdphnny4wyxlbw9n734h4qdqw093vcvv";
+       setupHaskellDepends = [
+         base Cabal directory filepath transformers
+       ];
+       libraryHaskellDepends = [
+         base bytestring clr-marshal file-embed text
+       ];
+       librarySystemDepends = [ glib mono ];
+       testHaskellDepends = [ base ];
+       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host";
+       description = "Hosting the Common Language Runtime";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
+
   "clr-inline" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, clr-host, clr-marshal
      , containers, criterion, directory, extra, filepath, here, hspec
@@ -44016,6 +44271,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clr-inline_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, case-insensitive
+     , clr-host, clr-marshal, containers, criterion, directory, extra
+     , filepath, here, hspec, lens, parsec, process, split
+     , template-haskell, temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "clr-inline";
+       version = "0.2.0";
+       sha256 = "0s9f2y5ykfsq3sw52mxmvwih946ah9gv48pqma8nql9k0xx905ww";
+       libraryHaskellDepends = [
+         base bytestring Cabal case-insensitive clr-host clr-marshal
+         containers directory extra filepath here lens parsec process split
+         template-haskell temporary text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal case-insensitive clr-host clr-marshal
+         containers directory extra filepath here hspec lens parsec process
+         split template-haskell temporary text transformers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring Cabal case-insensitive clr-host clr-marshal
+         containers criterion directory extra filepath here lens parsec
+         process split template-haskell temporary text transformers
+       ];
+       homepage = "https://gitlab.com/tim-m89/clr-haskell";
+       description = "Quasiquoters for inline C# and F#";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clr-marshal" = callPackage
     ({ mkDerivation, base, clr-host, text }:
      mkDerivation {
@@ -44028,16 +44314,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "clr-marshal_0_2_0_0" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "clr-marshal";
+       version = "0.2.0.0";
+       sha256 = "1mnwxfmhz548bb1g17bddhmvd6lzl66bfi1a7f0j3phh7lgna4s1";
+       libraryHaskellDepends = [ base text ];
+       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-marshal";
+       description = "Marshaling for the clr";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clr-typed" = callPackage
-    ({ mkDerivation, base, clr-marshal, ghc-prim, text, tuple }:
+    ({ mkDerivation, base, clr-marshal, ghc-prim, hspec, text, tuple }:
      mkDerivation {
        pname = "clr-typed";
-       version = "0.1.0.0";
-       sha256 = "07qi8g7lh8h9lph088p5zx4qjp6na1239pwjr5s8lgiq069gmn99";
-       revision = "1";
-       editedCabalFile = "02fsha9hir0yqnn9b9dgpg345313n660j9mhdmsya0r3k8fhmn2b";
+       version = "0.2.0";
+       sha256 = "1ay3970fccvr4hbmv5dah2qdxv51q09n1v3m9wkj62mbpsp3zk2y";
        libraryHaskellDepends = [ base clr-marshal ghc-prim text tuple ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base clr-marshal hspec text ];
        homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-typed";
        description = "A strongly typed Haskell interface to the CLR type system";
        license = stdenv.lib.licenses.bsd3;
@@ -44216,6 +44513,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cmark_0_5_6" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, cheapskate
+     , criterion, discount, HUnit, markdown, sundown, text
+     }:
+     mkDerivation {
+       pname = "cmark";
+       version = "0.5.6";
+       sha256 = "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base HUnit text ];
+       benchmarkHaskellDepends = [
+         base blaze-html cheapskate criterion discount markdown sundown text
+       ];
+       homepage = "https://github.com/jgm/cmark-hs";
+       description = "Fast, accurate CommonMark (Markdown) parser and renderer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cmark-gfm" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, cheapskate
+     , criterion, discount, HUnit, markdown, sundown, text
+     }:
+     mkDerivation {
+       pname = "cmark-gfm";
+       version = "0.1.0";
+       sha256 = "14x8mq06lhx85z413m2aabp5mwrkzhk5mv2hryf972hiv6pv9r0k";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base HUnit text ];
+       benchmarkHaskellDepends = [
+         base blaze-html cheapskate criterion discount markdown sundown text
+       ];
+       homepage = "https://github.com/kivikakk/cmark-gfm-hs";
+       description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cmark-highlight" = callPackage
     ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text
      }:
@@ -44223,6 +44557,8 @@ self: {
        pname = "cmark-highlight";
        version = "0.2.0.0";
        sha256 = "0aw1y0bl7ddvm4ai66x7apdijw6mza272ir8jkbdbz6k0gbrqxny";
+       revision = "1";
+       editedCabalFile = "1zdxr3bfj9bn2yclm5m17aa7wid6zwhvg6mj245wd2y34p696znw";
        libraryHaskellDepends = [
          base blaze-html cmark highlighting-kate text
        ];
@@ -44972,14 +45308,20 @@ self: {
      }) {};
 
   "collection-json" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, text }:
+    ({ mkDerivation, aeson, base, network-uri, QuickCheck
+     , quickcheck-instances, test-invariant, text
+     }:
      mkDerivation {
        pname = "collection-json";
-       version = "0.1.0.0";
-       sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc";
-       libraryHaskellDepends = [ aeson base bytestring text ];
-       homepage = "https://github.com/danchoi/collection-json.hs";
-       description = "Collection+JSON hypermedia type tools";
+       version = "1.0.0.0";
+       sha256 = "0v068wayi1f22infgccflpfg78zcwqdga3q6980jxs7irng9xsjv";
+       libraryHaskellDepends = [ aeson base network-uri text ];
+       testHaskellDepends = [
+         aeson base network-uri QuickCheck quickcheck-instances
+         test-invariant text
+       ];
+       homepage = "https://github.com/alunduil/collection-json.hs";
+       description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -45537,6 +45879,8 @@ self: {
        pname = "comonad";
        version = "5.0.2";
        sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v";
+       revision = "1";
+       editedCabalFile = "1lnsnx8p3wlfhd1xfc68za3b00vq77z2m6b0vqiw2laqmpj9akcw";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base containers contravariant distributive semigroups tagged
@@ -45931,6 +46275,8 @@ self: {
        pname = "complex-generic";
        version = "0.1.1.1";
        sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz";
+       revision = "1";
+       editedCabalFile = "0jf2mq26m0asgl5l0b1c1va30qj61ddvwxyl5xq29d3lpgnlby27";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://code.mathr.co.uk/complex-generic";
        description = "complex numbers with non-mandatory RealFloat";
@@ -47419,6 +47765,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "configuration-tools_0_3_0" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+     , base-unicode-symbols, base64-bytestring, bytestring, Cabal
+     , case-insensitive, connection, data-default, deepseq, directory
+     , dlist, enclosed-exceptions, filepath, http-client
+     , http-client-tls, http-types, monad-control, mtl, network-uri
+     , optparse-applicative, process, profunctors, text, tls
+     , transformers, unordered-containers, wai, warp, warp-tls, x509
+     , x509-system, x509-validation, yaml
+     }:
+     mkDerivation {
+       pname = "configuration-tools";
+       version = "0.3.0";
+       sha256 = "0kpjmnmc7vzdarqczk4z1hxizm9fsnbvhazb6xg4y1a7j8ps99wz";
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base-unicode-symbols
+         base64-bytestring bytestring Cabal case-insensitive connection
+         data-default deepseq directory dlist enclosed-exceptions filepath
+         http-client http-client-tls http-types monad-control mtl
+         network-uri optparse-applicative process profunctors text tls
+         transformers unordered-containers x509 x509-system x509-validation
+         yaml
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols bytestring Cabal enclosed-exceptions
+         http-types monad-control mtl text transformers unordered-containers
+         wai warp warp-tls yaml
+       ];
+       homepage = "https://github.com/alephcloud/hs-configuration-tools";
+       description = "Tools for specifying and parsing configurations";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "configurator" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , hashable, HUnit, test-framework, test-framework-hunit, text
@@ -48746,8 +49126,8 @@ self: {
      }:
      mkDerivation {
        pname = "core-compiler";
-       version = "0.1.0.1";
-       sha256 = "0qyrqarqf35z9kp2znaq3qvfpkjlvyahkvarr1jhl2z12alfvzns";
+       version = "0.1.0.2";
+       sha256 = "1bz7lxklbsw12y0v89nvrcyy7m35zb0cldn0wzyxz4h5szx5cji6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49984,7 +50364,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "criterion_1_2_1_0" = callPackage
+  "criterion_1_2_2_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary
      , bytestring, cassava, code-page, containers, deepseq, directory
      , exceptions, filepath, Glob, HUnit, js-flot, js-jquery
@@ -49995,8 +50375,8 @@ self: {
      }:
      mkDerivation {
        pname = "criterion";
-       version = "1.2.1.0";
-       sha256 = "0hbhm6fcbvh38m8hazlzjh3z09adjrzcv5jq63792bvnm24bpx6r";
+       version = "1.2.2.0";
+       sha256 = "0cc95hp5l7srjs5471lpdvx9hihvvi5rabrqqpy6blnrhpf9jwfz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -51143,6 +51523,8 @@ self: {
        pname = "css-syntax";
        version = "0.0.5";
        sha256 = "17hbwnhwz9c6xdw508chygq684h7hrrv16yyrmqdj7f8hfzy0s9r";
+       revision = "1";
+       editedCabalFile = "15s7q21kahh1gmm7i3jd937d5pq5khn9a6sq8kdhs6bx11cfa5ap";
        libraryHaskellDepends = [
          attoparsec base bytestring scientific text
        ];
@@ -53000,14 +53382,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse_0_9_0_0" = callPackage
+  "data-diverse_0_9_0_1" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
      , hspec, tagged
      }:
      mkDerivation {
        pname = "data-diverse";
-       version = "0.9.0.0";
-       sha256 = "0mx348pl32jycbcdhb9p199hzqg8yrh8ckw85vvgxg5n4251nd9p";
+       version = "0.9.0.1";
+       sha256 = "155zq4pn68wxw096i7w6k68rpaxhcyjqjhhc89yvky22nvv67yq4";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim tagged
        ];
@@ -54437,8 +54819,8 @@ self: {
     ({ mkDerivation, base, hspec, postgresql-simple, text }:
      mkDerivation {
        pname = "dbcleaner";
-       version = "0.1.2";
-       sha256 = "0ida0rqx66b5sajic1y2k89mlx9039s3m8xalqadsybij29yfmjr";
+       version = "0.1.3";
+       sha256 = "0d8ghd4i7qq3zp1vmxvsx7s66ip3qqfzacfnb2n4i3cdd7hv05q8";
        libraryHaskellDepends = [ base postgresql-simple text ];
        testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
@@ -56466,8 +56848,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.5.0";
-       sha256 = "13s98jjhibm9p0hd9y9fbj0a1il4mwcp2v9mi9j0zrpn6vr4h00p";
+       version = "1.5.1";
+       sha256 = "0hrxrchcs7853gys85niqmngvpd3fla59ca11npw5h0aznbj6ymk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59141,6 +59523,8 @@ self: {
        pname = "distributive";
        version = "0.5.3";
        sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
+       revision = "1";
+       editedCabalFile = "0hsq03i0qa0jvw7kaaqic40zvfkzhkd25dgvbdg6hjzylf1k1gax";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans tagged transformers transformers-compat
@@ -59474,6 +59858,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dns_2_0_12" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring
+     , bytestring-builder, conduit, conduit-extra, containers, doctest
+     , hspec, iproute, mtl, network, random, resourcet, safe, word8
+     }:
+     mkDerivation {
+       pname = "dns";
+       version = "2.0.12";
+       sha256 = "0c5w2s8cvid9nk9ldd759k0p54pnb10ld3iin1w1b4lqi08cnnwk";
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring conduit conduit-extra containers
+         iproute mtl network random resourcet safe
+       ];
+       testHaskellDepends = [
+         attoparsec base binary bytestring bytestring-builder conduit
+         conduit-extra containers doctest hspec iproute mtl network random
+         resourcet safe word8
+       ];
+       testTarget = "spec";
+       description = "DNS library in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dnscache" = callPackage
     ({ mkDerivation, base, bytestring, containers, contstuff, dns
      , iproute, time
@@ -59770,6 +60178,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_13_0" = callPackage
+    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
+     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
+     , with-location
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.13.0";
+       sha256 = "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         hspec HUnit mockery process QuickCheck setenv silently
+         stringbuilder syb transformers with-location
+       ];
+       homepage = "https://github.com/sol/doctest#readme";
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -60076,6 +60512,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dotenv_0_4_0_0" = callPackage
+    ({ mkDerivation, base, base-compat, exceptions, hspec
+     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "dotenv";
+       version = "0.4.0.0";
+       sha256 = "0f9c5p1nm7zdwz55wlgm56fb2xvyra0f4i37rfj7bb5kdhncqphg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat exceptions megaparsec text transformers
+       ];
+       executableHaskellDepends = [
+         base base-compat megaparsec optparse-applicative process text
+         transformers
+       ];
+       testHaskellDepends = [
+         base base-compat exceptions hspec hspec-megaparsec megaparsec text
+         transformers
+       ];
+       homepage = "https://github.com/stackbuilders/dotenv-hs";
+       description = "Loads environment variables from dotenv files";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dotfs" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src, HFuse, HUnit, parsec, process, QuickCheck
@@ -62292,6 +62756,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "effin_0_3_0_3" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "effin";
+       version = "0.3.0.3";
+       sha256 = "1kq5n25m7bzw4zrz35b5zc8r4q0p0ai801hdf7r537fim0ia973x";
+       libraryHaskellDepends = [ base mtl ];
+       homepage = "https://github.com/YellPika/effin";
+       description = "A Typeable-free implementation of extensible effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "egison" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit, mtl
@@ -66315,8 +66792,10 @@ self: {
        pname = "exp-extended";
        version = "0.1.1.2";
        sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r";
+       revision = "1";
+       editedCabalFile = "1bxlaagjvlhnbf9hh0n46b05gm1vmdrgzzgrc3kbz8mg87j91vyr";
        libraryHaskellDepends = [ base compensated log-domain ];
-       homepage = "http://code.mathr.co.uk/exp-extended";
+       homepage = "https://code.mathr.co.uk/exp-extended";
        description = "floating point with extended exponent range";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66650,6 +67129,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible_0_4_3" = callPackage
+    ({ mkDerivation, base, comonad, constraints, criterion, deepseq
+     , effin, extensible-effects, freer-effects, ghc-prim, lens
+     , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar
+     , tagged, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "extensible";
+       version = "0.4.3";
+       sha256 = "0ix1dran0s17jpdzcwai79snfmls8al7a34b0sysgkp75g8lrgca";
+       libraryHaskellDepends = [
+         base comonad constraints deepseq ghc-prim monad-skeleton mtl
+         primitive profunctors semigroups StateVar tagged template-haskell
+         transformers
+       ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [
+         base criterion effin extensible-effects freer-effects lens mtl
+       ];
+       homepage = "https://github.com/fumieval/extensible";
+       description = "Extensible, efficient, optics-friendly data types and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-data" = callPackage
     ({ mkDerivation, base, data-lens, hashable, template-haskell
      , unordered-containers
@@ -66837,8 +67341,8 @@ self: {
     ({ mkDerivation, base, leancheck, speculate, template-haskell }:
      mkDerivation {
        pname = "extrapolate";
-       version = "0.0.1";
-       sha256 = "07yh1w3vbhrb621nbwp7zvjj92b16i6jc69qflzvp8jn9w7f71h5";
+       version = "0.1.0";
+       sha256 = "1y9mk8g9sfvp8cyjqfy91qrhkn76clx2lp5kbaa3q2kyhiqifg63";
        libraryHaskellDepends = [
          base leancheck speculate template-haskell
        ];
@@ -67482,8 +67986,8 @@ self: {
     ({ mkDerivation, base, fay }:
      mkDerivation {
        pname = "fay-base";
-       version = "0.20.0.1";
-       sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr";
+       version = "0.21.0.0";
+       sha256 = "1sj6baw63xzv6hcqmka29hvack00fal3zlp5b97qca56lbh7yhbf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base fay ];
        homepage = "https://github.com/faylang/fay/";
@@ -68728,6 +69232,20 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "filelock_0_1_1_2" = callPackage
+    ({ mkDerivation, async, base, process, unix }:
+     mkDerivation {
+       pname = "filelock";
+       version = "0.1.1.2";
+       sha256 = "0g90wgm4bcfr5j44sc5s2jlcd7ggk092lph3jqjgf6f67sqxrw8g";
+       libraryHaskellDepends = [ base unix ];
+       testHaskellDepends = [ async base process ];
+       homepage = "http://github.com/takano-akio/filelock";
+       description = "Portable interface to file locking (flock / LockFileEx)";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "filemanip" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, mtl
      , unix-compat
@@ -69428,6 +69946,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fixed-vector-hetero_0_3_1_2" = callPackage
+    ({ mkDerivation, base, deepseq, fixed-vector, ghc-prim, primitive
+     , transformers
+     }:
+     mkDerivation {
+       pname = "fixed-vector-hetero";
+       version = "0.3.1.2";
+       sha256 = "0l8vphi8ijyzyk372r9i7imq8r6ki1w774gid69c8d2a2b63gvdd";
+       libraryHaskellDepends = [
+         base deepseq fixed-vector ghc-prim primitive transformers
+       ];
+       homepage = "http://github.org/Shimuuar/fixed-vector-hetero";
+       description = "Generic heterogeneous vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fixed-width" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -70220,8 +70755,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.3.5";
-       sha256 = "1p2vmnyydq5f888q26gni1y4bpmhn3m4hr6123aq4d5zhy1x9cyv";
+       version = "0.5.3.7";
+       sha256 = "0wa1g5rfnlblhsp7bkwqksakid6pgb9zyigvr00kpy264z2fm50q";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -73983,8 +74518,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-lens";
-       version = "0.3.0.0";
-       sha256 = "0zsxf8v8j1dw0x913iin69r01mynmzyxnq778wqh5id7lz8fb69s";
+       version = "0.3.0.1";
+       sha256 = "0wkshjzwvlpmxbfr96l1c485rwn21zfgcngkchj2c04amq1fiqs8";
        libraryHaskellDepends = [ base profunctors ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [
@@ -76533,6 +77068,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gdk_pixbuf;};
 
+  "gi-ggit" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, libgit2-glib, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-ggit";
+       version = "1.0.1";
+       sha256 = "08jfsfjvdbyd1m1si2r50frc4s3x5x9710r2np6wl1p0y3pk20cf";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ libgit2-glib ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "libgit2-glib bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs.gnome3) libgit2-glib;};
+
   "gi-gio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers
@@ -78100,6 +78656,8 @@ self: {
        pname = "github-webhook-handler";
        version = "0.0.8";
        sha256 = "1sjgnc1zl3xsv25nc71bw0dmj8z7iacf6b8cf8vc50v6c1a8i40x";
+       revision = "1";
+       editedCabalFile = "1nhwindcplcyyffvzw0cig1p0m8165laq3hv94s596rsi3b5pgqr";
        libraryHaskellDepends = [
          aeson base bytestring cryptohash github-types text transformers
          uuid vector
@@ -78116,6 +78674,8 @@ self: {
        pname = "github-webhook-handler-snap";
        version = "0.0.7";
        sha256 = "149c40rp2r7ib6x256rpnfg56hhp1kxznmglppciq33s0bs2dxfl";
+       revision = "1";
+       editedCabalFile = "1l0c2xn41pylap7vw33r67pmmcafr1fdm04l9b8h206c270bsinm";
        libraryHaskellDepends = [
          base bytestring case-insensitive github-types
          github-webhook-handler snap-core uuid
@@ -78975,6 +79535,8 @@ self: {
        pname = "gloss";
        version = "1.11.1.1";
        sha256 = "0lyns4jzh4najgbavlhalix6br1dc0smqrakj46ls30jp909bq0l";
+       revision = "1";
+       editedCabalFile = "1bxdf2kmdcqndg25jgh0l1bmr39795gxrcx0rgzcich4n8l88pvb";
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
@@ -79044,6 +79606,8 @@ self: {
        pname = "gloss-examples";
        version = "1.11.1.1";
        sha256 = "0m5xyr5q6kfb2h5pfd5nj4x39nhhsnr7h8vxghvhvw1khsbh5gj1";
+       revision = "1";
+       editedCabalFile = "1l7hkyrl535wmw8afafsq3hj6b02zmm4skv1739h8wbpdc6255al";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -79096,6 +79660,8 @@ self: {
        pname = "gloss-raster";
        version = "1.11.1.1";
        sha256 = "0ikwg3ckq82qysbc3jisvxylcq13x7cnwyci6gi6dys64vmrfy17";
+       revision = "1";
+       editedCabalFile = "1kx0n4kwy5xdg4b5b79a815y8yqcsld8s5p784qhgg92s0cmnsjf";
        libraryHaskellDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
@@ -79318,8 +79884,8 @@ self: {
      }:
      mkDerivation {
        pname = "gmndl";
-       version = "0.4.0.2";
-       sha256 = "04r7n24jnqgggi19d4l1lj1ag5jrh3zk2pvxwm5xfb7imlg37zm8";
+       version = "0.4.0.4";
+       sha256 = "041g7mlgwk6yb3814cy93yvwfhk5gzdkms7d8dg312vnpykp2kl1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -79392,14 +79958,13 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.3.3";
-       sha256 = "1rhy280c6dx5s31maia9la6j3y62v4fjwbwhr26n5cg4xl1n3p5g";
+       version = "0.3.6";
+       sha256 = "16kprvn242i05pravy5x04dsnkr5ifb4y427nb0588v5ljhbab0s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base basic-prelude conduit-extra exceptions extra lens
-         monad-control mtl resourcet rtcm sbp time transformers-base
-         unordered-containers
+         base basic-prelude exceptions extra lens monad-control mtl
+         resourcet rtcm sbp time transformers-base
        ];
        executableHaskellDepends = [
          base basic-prelude binary-conduit conduit conduit-extra resourcet
@@ -81041,6 +81606,8 @@ self: {
        pname = "google-cloud";
        version = "0.0.4";
        sha256 = "16pv4iiladfsq92xnpj46xa91x5svk6qsmz5szwwb83fhkk7r9q9";
+       revision = "1";
+       editedCabalFile = "0512swl7ydlcjdbvcb2xm59q97yr3wxgh3sfdsz3zdm1y88qi18c";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls http-types mtl
          random scientific stm text time unordered-containers
@@ -81543,8 +82110,8 @@ self: {
      }:
      mkDerivation {
        pname = "gotta-go-fast";
-       version = "0.1.2.0";
-       sha256 = "124zk4zcfpr72xgck104n338p9aid9p1q89vcs7h16zvhai3bc4f";
+       version = "0.1.3.1";
+       sha256 = "1fid0xshpimxq0n73741ywm4a34vscw289bw93jd4gmnihyp9bgs";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84371,18 +84938,19 @@ self: {
   "hablog" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup
      , bytestring, containers, directory, filepath, markdown, mime-types
-     , mtl, optparse-applicative, scotty, scotty-tls, text, transformers
+     , mtl, network-uri, optparse-applicative, rss, scotty, scotty-tls
+     , text, time, transformers
      }:
      mkDerivation {
        pname = "hablog";
-       version = "0.5.1";
-       sha256 = "178j0jv38yi5hq2lb9sq8rjxbpvb1y8anqal2mgh7crxkch3llqs";
+       version = "0.6.0";
+       sha256 = "0373kjd67iivrrr6kcjrhcqkk2wrxfx9zz3qn58mhycp8w78biaq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bifunctors blaze-html blaze-markup bytestring containers
-         directory filepath markdown mime-types mtl scotty scotty-tls text
-         transformers
+         directory filepath markdown mime-types mtl network-uri rss scotty
+         scotty-tls text time transformers
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A blog system";
@@ -90977,6 +91545,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskintex_0_8_0_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "haskintex";
+       version = "0.8.0.0";
+       sha256 = "1n6xbk8mc4n7a7w9hw2q21ya784jd2wqfvx54iqz9fik5w8p8jcx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers directory filepath
+         haskell-src-exts HaTeX hint parsec process text transformers
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "http://daniel-diaz.github.io/projects/haskintex";
+       description = "Haskell Evaluation inside of LaTeX code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskmon" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-streams
      , io-streams, time, vector
@@ -93436,6 +94026,8 @@ self: {
        pname = "heaps";
        version = "0.3.5";
        sha256 = "1p1nsglsf8hric63cn3n1iw1nlbiv3lgk3n5gq0znajj7j7s64qv";
+       revision = "1";
+       editedCabalFile = "05avm1b16gj3rlm9sjqkxb0flq055r6gqhnacp7yzw4j1bghm5j7";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory doctest filepath ];
@@ -94676,6 +95268,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hexml-lens" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, foundation, hexml, lens
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hexml-lens";
+       version = "0.1.0.0";
+       sha256 = "11v137m91asl52srb82xfvxjl3cyiw2213mjyy1lbqzdriz6k9lc";
+       libraryHaskellDepends = [
+         base bytestring foundation hexml lens text
+       ];
+       testHaskellDepends = [
+         base bytestring doctest foundation hexml lens QuickCheck text
+       ];
+       homepage = "https://github.com/pepeiborra/hexml-lens#readme";
+       description = "Lenses for the hexml package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hexpat" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, expat, List
      , text, transformers, utf8-string
@@ -95333,6 +95944,8 @@ self: {
        pname = "hgmp";
        version = "0.1.0.1";
        sha256 = "0fkcp3l34si7v286dza3yhw2bjpx6vpwqnkqnp9lv18jwxak7xji";
+       revision = "1";
+       editedCabalFile = "0fmzm7m0z1jzpi7c1k8gk843d9jqljrkrb25yzs1kpbrg0ylpi3c";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "https://code.mathr.co.uk/hgmp";
@@ -97014,8 +97627,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.2.4";
-       sha256 = "17bzjmdcirf32fic6sx246x30p02gnq0c50bia0lq088hdfxn6yr";
+       version = "1.2.5";
+       sha256 = "1va5a1j4pa6yvzhk0y4pxs0q80ph3yr8jdbgy422mkvbmczxynna";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97276,6 +97889,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsass;};
 
+  "hlibsass_0_1_6_1" = callPackage
+    ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
+     mkDerivation {
+       pname = "hlibsass";
+       version = "0.1.6.1";
+       sha256 = "0j88b1fm0al8w7h6sdw89jpsfs8aplj9q050k41gaib44r7hl4iy";
+       configureFlags = [ "-fexternallibsass" ];
+       setupHaskellDepends = [ base Cabal directory ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ libsass ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/jakubfijalkowski/hlibsass";
+       description = "Low-level bindings to Libsass";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libsass;};
+
   "hlint" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, directory, extra, filepath, haskell-src-exts
@@ -103870,8 +104500,8 @@ self: {
      }:
      mkDerivation {
        pname = "hssqlppp";
-       version = "0.6.0";
-       sha256 = "1g0c9rvk9pn23bnja46vw67q7k3yvik3bvlzk43ghl8jzcyd0lkh";
+       version = "0.6.1";
+       sha256 = "06rqf8gkz2f1ay1vd3ba0nzv9n1098vxm9sc9ls4dk2ismab7cgz";
        libraryHaskellDepends = [
          base containers mtl parsec pretty pretty-show syb text transformers
          uniplate
@@ -103892,8 +104522,8 @@ self: {
      }:
      mkDerivation {
        pname = "hssqlppp-th";
-       version = "0.6.0";
-       sha256 = "11apcd3l77zifip70mvkhncfrs5ahmfw26cdqxyqwykkgrx92vjl";
+       version = "0.6.1";
+       sha256 = "09mxb2pmnk43bvdl7f58r8wxaw3h372sy174p42k8pphlss9amkg";
        libraryHaskellDepends = [
          base hssqlppp syb template-haskell text
        ];
@@ -105310,15 +105940,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "http-media_0_7_1" = callPackage
+  "http-media_0_7_1_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , QuickCheck, test-framework, test-framework-quickcheck2
      , utf8-string
      }:
      mkDerivation {
        pname = "http-media";
-       version = "0.7.1";
-       sha256 = "06b921qchv3avras2i7x0n7fy3rj7lr2dwm82b62fgzhy6riskh6";
+       version = "0.7.1.1";
+       sha256 = "0k58368im14jwsd4wpyw9kl166zbi14ccl3adjigx8yf8k61n7zz";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers utf8-string
        ];
@@ -106424,6 +107054,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-bits_0_5_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
+     , hw-prim, hw-string-parse, QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.5.0.3";
+       sha256 = "1xkzxfz25ah7p4zybdm0c1081kkca7515jh1d7vjysxs34w8h1yn";
+       libraryHaskellDepends = [
+         base bytestring hw-int hw-prim hw-string-parse safe vector
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hw-prim QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
+       homepage = "http://github.com/haskell-works/hw-bits#readme";
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
      , mmap, time, vector, word8
@@ -106643,8 +107294,7 @@ self: {
        homepage = "https://github.com/haskell-works/hw-kafka-avro#readme";
        description = "Avro support for Kafka infrastructure";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {avro = null;};
+     }) {};
 
   "hw-kafka-client" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
@@ -107816,8 +108466,8 @@ self: {
     ({ mkDerivation, base, blaze-html, deepseq, text }:
      mkDerivation {
        pname = "hyper";
-       version = "0.1.0.1";
-       sha256 = "0jzfij3wqnyj7yf4ip8a8y0kz8zj9ci8gsjxf4m4hr5zsh90bas4";
+       version = "0.1.0.2";
+       sha256 = "1lp9mlg2ky1ph508xiwvn2f5ycxv0w7lyl0rl7wnlhm5wcp6793r";
        libraryHaskellDepends = [ base blaze-html deepseq text ];
        description = "Display class for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -107829,8 +108479,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyper-extra";
-       version = "0.1.0.1";
-       sha256 = "1ffbp3qqplfys3yhy3mm8k76xnfzkmyk1zsgmcw4hn4phmqbkdvc";
+       version = "0.1.0.2";
+       sha256 = "032ccqrpjqqlgg416x2igg5dycd2ddgl0mfh2yywg9fmigs0zxdd";
        libraryHaskellDepends = [
          base diagrams-lib diagrams-svg hyper svg-builder text
        ];
@@ -107845,8 +108495,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyper-haskell-server";
-       version = "0.1.0.1";
-       sha256 = "147jwzv9jym0bimlvaxgwyf0081vw0zb4sw7xs5c783ci5qdgc23";
+       version = "0.1.0.2";
+       sha256 = "0ljkh1n4lh877gxcy15pv9bybl9rnhi7ycxvzw9m97r80hyxidm1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108002,8 +108652,8 @@ self: {
        pname = "hyphenation";
        version = "0.7";
        sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s";
-       revision = "1";
-       editedCabalFile = "0r3a79cg3dabcm4px3vq26hc5yj4sagws4fa3ic00d28qb6y4b4w";
+       revision = "2";
+       editedCabalFile = "0bf147dfnp8lw4kmscgkmd4pnawzv0yc63hhjr7sjvk5xyyvb5mq";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
@@ -108623,12 +109273,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
-  "idris_1_1_0" = callPackage
+  "idris_1_1_1" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal
      , ansi-wl-pprint, array, async, base, base64-bytestring, binary
-     , blaze-html, blaze-markup, bytestring, cheapskate, code-page
-     , containers, deepseq, directory, filepath, fingertree, fsnotify
-     , gmp, haskeline, ieee754, libffi, mtl, network
+     , blaze-html, blaze-markup, bytestring, Cabal, cheapskate
+     , code-page, containers, deepseq, directory, filepath, fingertree
+     , fsnotify, gmp, haskeline, ieee754, libffi, mtl, network
      , optparse-applicative, parsers, pretty, process, regex-tdfa, safe
      , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size
      , text, time, transformers, transformers-compat, trifecta, uniplate
@@ -108637,12 +109287,13 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "1.1.0";
-       sha256 = "1d68jz9irqcya90a1s3hvn955lqq3zd64y5d7mkx84r1gsxsmskk";
+       version = "1.1.1";
+       sha256 = "0rq43i3mf7b4yiwzrzzpyh3ldka3j514ms9cf31vsfpy0jn3bvkp";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async
          base base64-bytestring binary blaze-html blaze-markup bytestring
@@ -110202,6 +110853,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inflections_0_4_0_0" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec
+     , hspec-megaparsec, megaparsec, QuickCheck, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "inflections";
+       version = "0.4.0.0";
+       sha256 = "1m42sigx621yzd6sznaas6917skyw8lf5ynfcjd87jybhv2r9g2k";
+       libraryHaskellDepends = [
+         base exceptions megaparsec text unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers 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 {
@@ -110385,22 +111057,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
-  "inline-c_0_6_0_2" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
-     , containers, cryptohash, gsl, gslcblas, hashable, hspec, mtl
-     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
-     , template-haskell, transformers, unordered-containers, vector
+  "inline-c_0_6_0_4" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, gsl
+     , gslcblas, hashable, hspec, mtl, parsec, parsers, QuickCheck
+     , raw-strings-qq, regex-posix, template-haskell, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.6.0.2";
-       sha256 = "0myrr8fh42ydzwkyw2mipa5g7hzr6lb593dl95vkika8v3nr2srk";
+       version = "0.6.0.4";
+       sha256 = "0ram4gixghck1ydqjfymm0ks7yfig2cn3iq40iid2ppvam5kmsgc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base binary bytestring containers cryptohash
-         hashable mtl parsec parsers QuickCheck template-haskell
-         transformers unordered-containers vector
+         ansi-wl-pprint base bytestring containers hashable mtl parsec
+         parsers template-haskell transformers unordered-containers vector
        ];
        executableSystemDepends = [ gsl gslcblas ];
        testHaskellDepends = [
@@ -111211,6 +111882,8 @@ self: {
        pname = "intervals";
        version = "0.8.1";
        sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww";
+       revision = "1";
+       editedCabalFile = "0im2m4acx6g638h7yz0x3qyaipfmri59q4zdq1w7n608r3i406dj";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ array base distributive ghc-prim ];
        testHaskellDepends = [
@@ -112313,8 +112986,8 @@ self: {
      }:
      mkDerivation {
        pname = "iridium";
-       version = "0.1.5.6";
-       sha256 = "0xrmya03n4xpnn3c79r94x8dz8yn963v8js8rwyjcslr11gyx80q";
+       version = "0.1.5.7";
+       sha256 = "0jfsz8j9dq0nfr536wp78k02ffg8xgjm3zqgjgfdm1i0zwi5dcbp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -112368,6 +113041,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "irt" = callPackage
+    ({ mkDerivation, ad, base, data-default-class, statistics }:
+     mkDerivation {
+       pname = "irt";
+       version = "0.2.0.1";
+       sha256 = "05a1k70cj4rlaz7yx84m7riz6zhsb588vfyzkza2gr4i5wlhjr6c";
+       libraryHaskellDepends = [ ad base data-default-class statistics ];
+       homepage = "https://github.com/argiopetech/irt";
+       description = "Item Response Theory functions for use in computerized adaptive testing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "is" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -115249,8 +115934,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "justified-containers";
-       version = "0.1.1.1";
-       sha256 = "1grihhshn1dprg6cll742bdqkywnlz8zzcyf2m49kbpyzrcaywqg";
+       version = "0.1.2.0";
+       sha256 = "1rzphablg1wpx2b33zgdyslb9ch436g0wi59vy6gk06572najvz4";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/matt-noonan/justified-containers";
        description = "Keyed container types with type-checked proofs of key presence";
@@ -116995,8 +117680,8 @@ self: {
        pname = "kraken";
        version = "0.0.3";
        sha256 = "178y3d9gxfv03as4p3f5hdf4csnc3dfkpabwbyc38m0m8p2y20a0";
-       revision = "1";
-       editedCabalFile = "0dm107c8nxdh544pswj7saxmaz1jbzwphdzgpyk857l33sdmy203";
+       revision = "2";
+       editedCabalFile = "0w8w1frkx54ldyhxp09ddm2y1l7q72xfl1p6py7y6ywxnq23lr4h";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls mtl
        ];
@@ -119844,6 +120529,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "leancheck_0_6_4" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "leancheck";
+       version = "0.6.4";
+       sha256 = "0vvqzcl53d18axi3p6n9chggb2g7i2ip3wq8z5cbklkm9vb8qirc";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
+       homepage = "https://github.com/rudymatela/leancheck#readme";
+       description = "Cholesterol-free property-based testing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "leankit-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
      mkDerivation {
@@ -120219,6 +120918,48 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "lens_4_15_4" = callPackage
+    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
+     , Cabal, cabal-doctest, call-stack, comonad, containers
+     , contravariant, criterion, deepseq, directory, distributive
+     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
+     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
+     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
+     , tagged, template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, text
+     , th-abstraction, transformers, transformers-compat
+     , unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "lens";
+       version = "4.15.4";
+       sha256 = "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl";
+       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
+       libraryHaskellDepends = [
+         array base base-orphans bifunctors bytestring call-stack comonad
+         containers contravariant distributive exceptions filepath free
+         ghc-prim hashable kan-extensions mtl parallel profunctors
+         reflection semigroupoids semigroups tagged template-haskell text
+         th-abstraction transformers transformers-compat
+         unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory doctest filepath
+         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
+         simple-reflect test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring comonad containers criterion deepseq
+         generic-deriving transformers unordered-containers vector
+       ];
+       homepage = "http://github.com/ekmett/lens/";
+       description = "Lenses, Folds and Traversals";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, lens }:
      mkDerivation {
@@ -120303,6 +121044,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.2";
        sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3";
+       revision = "1";
+       editedCabalFile = "1xkxncl218ni4idq90g6bdd7vnwxshcpa1xk11fd3kc3i3j90pqs";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
@@ -120367,6 +121110,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-family-th_0_5_0_1" = callPackage
+    ({ mkDerivation, base, hspec, lens-family, template-haskell }:
+     mkDerivation {
+       pname = "lens-family-th";
+       version = "0.5.0.1";
+       sha256 = "00rpx75hh8p2991m36jp1cb91m048xjn8f02kj2zqsfwfhimfdzs";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hspec lens-family template-haskell ];
+       homepage = "http://github.com/DanBurton/lens-family-th#readme";
+       description = "Generate lens-family style lenses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-labels" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -121090,6 +121847,8 @@ self: {
        pname = "libinfluxdb";
        version = "0.0.4";
        sha256 = "0gzgcczw1jz0cns9x9na8rnyrapwml2ih9x0dv28pqf9fk1bpd95";
+       revision = "1";
+       editedCabalFile = "17ddlql04hgah7pr0zi8zvpza17ig7a0m27wr2c47gdzy7k0nr2v";
        libraryHaskellDepends = [
          base bytestring clock containers http-client http-client-tls
          http-types resource-pool stm text
@@ -121278,6 +122037,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "libmpd_0_9_0_7" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default-class, filepath, hspec, mtl, network, old-locale
+     , QuickCheck, text, time, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "libmpd";
+       version = "0.9.0.7";
+       sha256 = "08i6v4i8xbv0vv4w0yqqh2pp7z0fb5dc9chgwyclkrvy480g5w0p";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers data-default-class filepath
+         mtl network old-locale text time utf8-string
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers data-default-class filepath
+         hspec mtl network old-locale QuickCheck text time unix utf8-string
+       ];
+       homepage = "http://github.com/vimus/libmpd-haskell#readme";
+       description = "An MPD client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "libnotify" = callPackage
     ({ mkDerivation, base, bytestring, glib, gtk, libnotify }:
      mkDerivation {
@@ -122106,6 +122888,8 @@ self: {
        pname = "linear";
        version = "1.20.7";
        sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b";
+       revision = "1";
+       editedCabalFile = "0ghmlkk5cy0pylx47rwr37p403ml7x6sg0sapz9c7534nzzhxq0g";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base base-orphans binary bytes cereal containers
@@ -122141,14 +122925,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "linear-accelerate_0_4_1" = callPackage
+  "linear-accelerate_0_5" = callPackage
     ({ mkDerivation, accelerate, base, Cabal, cabal-doctest
      , distributive, doctest, lens, linear
      }:
      mkDerivation {
        pname = "linear-accelerate";
-       version = "0.4.1";
-       sha256 = "1hhmn446ggm66r3aibg8dyc923lw68fmkb1y8q37jsw13s1lkdlp";
+       version = "0.5";
+       sha256 = "1whgf5bxl8knh04n7brgy7a7awdsxkyvkrqqpskyiii5bya21q7r";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          accelerate base distributive lens linear
@@ -122345,8 +123129,8 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "linguistic-ordinals";
-       version = "0.1.0.1";
-       sha256 = "02sl3jbfpbb77a6g4g9gj7a6mba804fqjx5d21ix8c8rzakavh38";
+       version = "0.1.0.2";
+       sha256 = "11f01j9qak8rhaj84gkx27qhfc334cj9pchi7qcb6brpqbwgdsik";
        libraryHaskellDepends = [ base text ];
        homepage = "http://github.com/argiopetech/linguistic-ordinals";
        description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)";
@@ -124192,6 +124976,8 @@ self: {
        pname = "log-domain";
        version = "0.11.2";
        sha256 = "0cywq1zv57p30419hdg6s7srd14g6r2kixnk8gmj72h0rx7fc2cd";
+       revision = "1";
+       editedCabalFile = "0frl4vwwlkfvz73pkiay4qh1vm576z4kj2gsbbq1za6b6pya4qhw";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
@@ -126011,6 +126797,8 @@ self: {
        pname = "machines";
        version = "0.6.3";
        sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz";
+       revision = "1";
+       editedCabalFile = "045qh0qwjiyrwcfsfw9galhqr6w7c96zpg7fnib3jaw8509d53x5";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base comonad containers distributive mtl pointed
@@ -127892,8 +128680,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "40000.0.1";
-       sha256 = "08khf3s38gvxn5w6jv21h0zc1g6p3ddjs8lbzziyh416w0qq9b9y";
+       version = "40000.0.2";
+       sha256 = "1lsxadkhvk8bylpc0sh1pmkldv8m17fpi96zkihdpchpwhw1i8jn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128165,16 +128953,17 @@ self: {
      }) {};
 
   "mbtiles" = callPackage
-    ({ mkDerivation, base, bytestring, directory, HUnit, mtl
-     , sqlite-simple, text, transformers, unordered-containers
+    ({ mkDerivation, base, bytestring, directory, HUnit, monad-control
+     , mtl, resource-pool, sqlite-simple, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "mbtiles";
-       version = "0.3.0.0";
-       sha256 = "0v41lzh1pi105nw3kl0kg04q1xlf9mwkhrdyiyc877a2y01xg2np";
+       version = "0.4.0.0";
+       sha256 = "03d1wmn974ic0dfapyrf881xnily0g6asqss1raaad9g03kwxcxr";
        libraryHaskellDepends = [
-         base bytestring directory mtl sqlite-simple text transformers
-         unordered-containers
+         base bytestring directory monad-control mtl resource-pool
+         sqlite-simple text transformers unordered-containers
        ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/caneroj1/mbtiles#readme";
@@ -128479,6 +129268,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "med-module_0_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, storable-endian, transformers
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "med-module";
+       version = "0.1.1";
+       sha256 = "1qzffgcg29gjc6j0dl9ablgzad3lry28n9kv55kp5lgqm3xp92gp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring storable-endian transformers utility-ht
+       ];
+       description = "Parse song module files from Amiga MED and OctaMED";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mediabus" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, cereal
      , conduit, conduit-combinators, conduit-extra, containers
@@ -129399,6 +130206,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "metrics_0_4_1_0" = 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.1.0";
+       sha256 = "0d4pp1f2ag7bmsxb57p1h6c2qxf1svda9vdlrg8p8111nim5miar";
+       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 {
@@ -130641,6 +131471,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miso_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers
+     , lucid, servant, servant-lucid, text, vector
+     }:
+     mkDerivation {
+       pname = "miso";
+       version = "0.6.0.0";
+       sha256 = "14pzfqzrakiw1xfmzkynjjg2h1d1ab4ndwy4fyl1wffrb0dnjqxg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base BoundedChan bytestring containers lucid servant
+         servant-lucid text vector
+       ];
+       homepage = "http://github.com/dmjio/miso";
+       description = "A tasty Haskell front-end framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "missing-foreign" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -131249,6 +132099,8 @@ self: {
        pname = "mole";
        version = "0.0.5";
        sha256 = "14vqa4mszb37rlpimlqir4g39lv66bfvg9jp4hcqzj5gsny3a1qb";
+       revision = "4";
+       editedCabalFile = "1565y432g3xy8q9db5sg4nsrb4pn25sxjlb0d6psgfhajb0qlh3l";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131439,6 +132291,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-control_1_0_2_2" = callPackage
+    ({ mkDerivation, base, stm, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-control";
+       version = "1.0.2.2";
+       sha256 = "0cz4ww3vp96crdqrh7w86rzrs7gs8c1z7rq84yxxhbiz28fs4d0y";
+       libraryHaskellDepends = [
+         base stm transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/basvandijk/monad-control";
+       description = "Lift control operations, like exception catching, through monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-control-aligned" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
@@ -132093,6 +132962,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-skeleton_0_1_5" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "monad-skeleton";
+       version = "0.1.5";
+       sha256 = "17jm69pwysx2kbx06n80iy396nbj5dys9iwdivargfzx7xql0s59";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/fumieval/monad-skeleton";
+       description = "Monads of program skeleta";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-st" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -132935,6 +133817,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoid-subclasses_0_4_4" = callPackage
+    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "monoid-subclasses";
+       version = "0.4.4";
+       sha256 = "1ycrcrw3gnsb8zxx8hvrfclj1skfapkvxp37r2j4j31wjhv3fycp";
+       libraryHaskellDepends = [
+         base bytestring containers primes text vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers primes QuickCheck quickcheck-instances
+         tasty tasty-quickcheck text vector
+       ];
+       homepage = "https://github.com/blamario/monoid-subclasses/";
+       description = "Subclasses of Monoid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-transformer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -139082,10 +139985,8 @@ self: {
      }:
      mkDerivation {
        pname = "normalization-insensitive";
-       version = "2.0.0.1";
-       sha256 = "178hipiqlkqjp88wivid1jyg718mb38i5731zggfp9misbpj5y8p";
-       revision = "1";
-       editedCabalFile = "0hp6v44slmxa3i6cs68ffa5wlkd4bj695l1fh058mhi64bhvql8x";
+       version = "2.0.1";
+       sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v";
        libraryHaskellDepends = [
          base bytestring deepseq hashable text unicode-transforms
        ];
@@ -139739,14 +140640,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask_0_0_8" = callPackage
+  "numhask_0_0_9" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest
      , protolude, QuickCheck, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "numhask";
-       version = "0.0.8";
-       sha256 = "1mgknk4ilpk216hxclc3zc2gcrk2c9si52r77s6ijhkx398j2v11";
+       version = "0.0.9";
+       sha256 = "16ss7lqwvmsgwgrj1smvdr5zzj33svi1mj1k5lhik1mm6dhd1c9x";
        libraryHaskellDepends = [
          adjunctions base distributive protolude QuickCheck vector
        ];
@@ -139776,6 +140677,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "numhask-range_0_1_0" = callPackage
+    ({ mkDerivation, adjunctions, base, containers, distributive
+     , doctest, formatting, numhask, protolude, QuickCheck
+     , semigroupoids, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "numhask-range";
+       version = "0.1.0";
+       sha256 = "1z5h7vmbq0jx8rcvxd8b9y1w1lnh3hv9mcykajwddjmrk2rxynnp";
+       libraryHaskellDepends = [
+         adjunctions base containers distributive formatting numhask
+         protolude QuickCheck semigroupoids
+       ];
+       testHaskellDepends = [
+         base doctest numhask tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/tonyday567/numhask-range";
+       description = "Numbers that are range representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nums" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -141126,6 +142049,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "open-witness_0_4_0_1" = callPackage
+    ({ mkDerivation, base, constraints, hashable, mtl, random, tasty
+     , tasty-hunit, template-haskell, transformers, witness
+     }:
+     mkDerivation {
+       pname = "open-witness";
+       version = "0.4.0.1";
+       sha256 = "04a10cv0iddnvp5my4h00bmmpc2mxz6c5gih5p4iyc7bdq6m0w07";
+       libraryHaskellDepends = [
+         base constraints hashable random template-haskell transformers
+         witness
+       ];
+       testHaskellDepends = [ base mtl tasty tasty-hunit witness ];
+       homepage = "https://github.com/AshleyYakeley/open-witness";
+       description = "open witnesses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opench-meteo" = callPackage
     ({ mkDerivation, aeson, base, data-default, text, time }:
      mkDerivation {
@@ -142712,6 +143654,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "otp-authenticator" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, binary, bytestring
+     , containers, cryptonite, dependent-sum, filepath, h-gpgme
+     , haskeline, microlens, one-time-password, optparse-applicative
+     , sandi, singletons, text, time, transformers, trifecta
+     , type-combinators, unix, uri-encode, witherable, yaml
+     }:
+     mkDerivation {
+       pname = "otp-authenticator";
+       version = "0.1.0.1";
+       sha256 = "1f30mr512rwbx58wkfqk3cyw471mw1lyz0jmcjj4lhknhf0agvhm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bifunctors binary bytestring containers cryptonite
+         dependent-sum filepath h-gpgme haskeline microlens
+         one-time-password optparse-applicative sandi singletons text time
+         transformers trifecta type-combinators unix uri-encode witherable
+         yaml
+       ];
+       executableHaskellDepends = [
+         aeson base binary bytestring h-gpgme text yaml
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/mstksg/otp-authenticator";
+       description = "OTP Authenticator (a la google) command line client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ottparse-pretty" = callPackage
     ({ mkDerivation, base, containers, parsec, split, uniplate }:
      mkDerivation {
@@ -144115,6 +145086,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "papillon_0_1_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, monads-tf
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "papillon";
+       version = "0.1.0.5";
+       sha256 = "1c42mmhgwgdz2adpby9134cyzgp8nfyxl0671d1fs3ybsl2zz17k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring monads-tf template-haskell transformers
+       ];
+       executableHaskellDepends = [
+         base directory filepath monads-tf template-haskell transformers
+       ];
+       homepage = "https://skami.iocikun.jp/haskell/packages/papillon";
+       description = "packrat parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pappy" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -145993,8 +146986,8 @@ self: {
        pname = "peano";
        version = "0.1.0.1";
        sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i";
-       revision = "1";
-       editedCabalFile = "0sf4iv77bgkr4n50ap27cxy9gkdx030dbg3f6wxk0rwa7sxdjkal";
+       revision = "2";
+       editedCabalFile = "10b0vjc7lnfkscg2c8hhqbvf1xdvgbr3njrs9b4ick91n44vjbhk";
        libraryHaskellDepends = [ base ];
        description = "Peano numbers";
        license = "unknown";
@@ -147234,6 +148227,8 @@ self: {
        pname = "pgdl";
        version = "10.9";
        sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z";
+       revision = "2";
+       editedCabalFile = "11p3bcr82rm4pry1dqxgnzsgi50qiwma8bvfbm13fq7jy2qj51vq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -149574,14 +150569,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "plot-light_0_2_6" = callPackage
+  "plot-light_0_2_7" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg
      , colour, hspec, mtl, palette, QuickCheck, scientific, text, time
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.2.6";
-       sha256 = "1zwf3gmimbpzji9dyn5a93pc07ymcp6xc48zfq5lxchajnilchwc";
+       version = "0.2.7";
+       sha256 = "0w1mbhws7fs0kld61fd9f9xyvfpzsjhh6ic6ny89gka4421p002s";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -152618,6 +153613,34 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "prettyprinter_1_1_0_1" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+     , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
+     , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "prettyprinter";
+       version = "1.1.0.1";
+       sha256 = "0pfvh90gya175bdfmkzq53f4i3mvgybqhd4sw86y0vvfg8zpc38n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base text ];
+       executableHaskellDepends = [ base template-haskell text ];
+       testHaskellDepends = [
+         base bytestring doctest pgp-wordlist tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       benchmarkHaskellDepends = [
+         ansi-wl-pprint base containers criterion deepseq mtl QuickCheck
+         random text transformers
+       ];
+       homepage = "http://github.com/quchen/prettyprinter";
+       description = "A modern, easy to use, well-documented, extensible prettyprinter";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "prettyprinter-ansi-terminal" = callPackage
     ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text
      }:
@@ -152632,6 +153655,21 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "prettyprinter-ansi-terminal_1_1_1_1" = callPackage
+    ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text
+     }:
+     mkDerivation {
+       pname = "prettyprinter-ansi-terminal";
+       version = "1.1.1.1";
+       sha256 = "1d3sr74c0bd1nzp0cy4ip6mk85cp1v8svh6yhggsd89r0wzkb6nl";
+       libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/quchen/prettyprinter";
+       description = "ANSI terminal backend for the »prettyprinter« package";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "prettyprinter-compat-annotated-wl-pprint" = callPackage
     ({ mkDerivation, base, prettyprinter, text }:
      mkDerivation {
@@ -152676,6 +153714,26 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "prettyprinter-convert-ansi-wl-pprint" = callPackage
+    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest
+     , prettyprinter, prettyprinter-ansi-terminal, text
+     }:
+     mkDerivation {
+       pname = "prettyprinter-convert-ansi-wl-pprint";
+       version = "1.1";
+       sha256 = "03565w1qvqgdr1g2nwj3d2xpqbx04xm45pjfkb9d6jb2fww2v65q";
+       revision = "1";
+       editedCabalFile = "1c4zcscmvq0vbdgnp7n0avv8si5jshl4kw2qd1lqmhr28kj8x45f";
+       libraryHaskellDepends = [
+         ansi-terminal ansi-wl-pprint base prettyprinter
+         prettyprinter-ansi-terminal text
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/quchen/prettyprinter";
+       description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "prettyprinter-vty" = callPackage
     ({ mkDerivation, base, prettyprinter, vty }:
      mkDerivation {
@@ -152688,6 +153746,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "preview" = callPackage
+    ({ mkDerivation, base, containers, pretty, strict-data, text
+     , util-plus
+     }:
+     mkDerivation {
+       pname = "preview";
+       version = "0.1.0.4";
+       sha256 = "0z8dz0frc43jnm65iybvpcn2689c3q2iy3zdqjs623clwsvrmh3b";
+       libraryHaskellDepends = [
+         base containers pretty strict-data text util-plus
+       ];
+       homepage = "https://github.com/factisresearch/opensource-mono#readme";
+       description = "The method of previewing data (instead of wholly show-ing it)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prim-array" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive }:
      mkDerivation {
@@ -154237,7 +155311,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "proto-lens-protoc_0_2_2_0" = callPackage
+  "proto-lens-protoc_0_2_2_2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, directory, filepath, haskell-src-exts
      , lens-family, lens-labels, process, proto-lens
@@ -154245,8 +155319,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.2.2.0";
-       sha256 = "1h6rlgk36a5wbcqwqs5n53rh37alcj0l5yq666gcawda0zwb0ys2";
+       version = "0.2.2.2";
+       sha256 = "1hkx0yqj4jfmq0b3pqwy9jadipazsfcb9fncxqkm9z57a5qa8khn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -154693,6 +155767,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "publicsuffix_0_20170802" = callPackage
+    ({ mkDerivation, base, criterion, filepath, hspec, random
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "publicsuffix";
+       version = "0.20170802";
+       sha256 = "0a2cfvf7ahaic62jn80sazmraqny20mcfsr6j8bji9fcgxjj150w";
+       libraryHaskellDepends = [ base filepath template-haskell ];
+       testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion random ];
+       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
+       description = "The publicsuffix list exposed as proper Haskell types";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "publicsuffixlist" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, data-default
      , HUnit, idna, text, utf8-string
@@ -155409,8 +156500,8 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-ws";
-       version = "0.1.0.0";
-       sha256 = "0gdbxrvcnhr0y229i9k5rc9fp73fvrnvsj77mw8pibnq2djfqx5s";
+       version = "0.1.0.1";
+       sha256 = "0i5659wljhaindimm8b6khibr8mcmcr5iaags2a33zjb67gjbsd7";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq hashable http-conduit lens
          lens-aeson network scientific stm text time transformers
@@ -155727,6 +156818,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "qchas" = callPackage
+    ({ mkDerivation, base, hmatrix, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "qchas";
+       version = "1.0.0";
+       sha256 = "0zjhhk6i60svp4p17xjg7pyc5hinj32r7jrcg7z7jibqmm5d3mds";
+       libraryHaskellDepends = [ base hmatrix ];
+       testHaskellDepends = [ base hmatrix tasty tasty-hunit ];
+       homepage = "https://github.com/ardeleanasm/qchas#readme";
+       description = "A library for implementing Quantum Algorithms";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "qd" = callPackage
     ({ mkDerivation, base, floatshow, qd }:
      mkDerivation {
@@ -157872,8 +158976,8 @@ self: {
     ({ mkDerivation, base, doctest, template-haskell, transformers }:
      mkDerivation {
        pname = "rank2classes";
-       version = "0.1";
-       sha256 = "1izr3nrbrrcf4496m0p5fpvd9h6gzgirb6q76kvn4chd4p45j0iz";
+       version = "0.2";
+       sha256 = "017vz33qafc1synzccl3p3cws010vg03l13i5y5igfs8f1rf5l80";
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/blamario/grampa/tree/master/rank2classes";
@@ -158562,6 +159666,8 @@ self: {
        pname = "rcu";
        version = "0.2.1";
        sha256 = "114w0nhlcg6wd9v6xg0ax74y5xbwb408b37hdkra863xr7dibdp0";
+       revision = "1";
+       editedCabalFile = "138vbjy6z2lh4x4icdssh0xz0rcwiw4lczcb3w375cnyjjn3b6ly";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -163026,6 +164132,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rethinkdb-client-driver_0_0_24" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , criterion, hashable, hspec, hspec-smallcheck, mtl, network
+     , old-locale, scientific, smallcheck, stm, template-haskell, text
+     , time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rethinkdb-client-driver";
+       version = "0.0.24";
+       sha256 = "06fhrip547mgv0nqjsiilbdhc0nphqqwy3qacxw36macvg6mhsbb";
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers hashable mtl network
+         old-locale scientific stm template-haskell text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base hspec hspec-smallcheck smallcheck text time
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion text time unordered-containers vector
+       ];
+       homepage = "https://github.com/wereHamster/rethinkdb-client-driver";
+       description = "Client driver for RethinkDB";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rethinkdb-model" = callPackage
     ({ mkDerivation, aeson, base, mtl, rethinkdb, text, transformers
      , unordered-containers
@@ -164031,17 +165165,17 @@ self: {
 
   "rollbar" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, http-conduit
-     , monad-control, network, text, vector
+     , monad-control, network, resourcet, text, vector
      }:
      mkDerivation {
        pname = "rollbar";
-       version = "0.3.1";
-       sha256 = "0hv9i38c0c1bv36xy4inq6dghn79bmjw1x0xgi5mlwf5lzzp2fv1";
+       version = "0.4.1";
+       sha256 = "0gl1q1f8n2xngb665hkqncqj1ymm7kymhhgp0qwdhdi3gnm8kymp";
        libraryHaskellDepends = [
-         aeson base basic-prelude http-conduit monad-control network text
-         vector
+         aeson base basic-prelude http-conduit monad-control network
+         resourcet text vector
        ];
-       homepage = "https://github.com/docmunch/rollbar-haskell";
+       homepage = "https://github.com/azara/rollbar-haskell";
        description = "error tracking through rollbar.com";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167402,8 +168536,8 @@ self: {
     ({ mkDerivation, base, cairo, linear, mtl, random, sdl2, time }:
      mkDerivation {
        pname = "sdl2-cairo";
-       version = "0.1.0.3";
-       sha256 = "1lw5d8hk97h26sxq1bq0ha56s1pi0zsyw60di41w92a4xrx8z2nf";
+       version = "0.1.1.0";
+       sha256 = "08i7vbibak0y760j2cibwdn2yhgkp2xv2j325mimvdqcp44x0rz0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
@@ -168029,6 +169163,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "selections" = callPackage
+    ({ mkDerivation, base, bifunctors, comonad, mtl }:
+     mkDerivation {
+       pname = "selections";
+       version = "0.1.0.0";
+       sha256 = "0wl8jy0c3sm384qr4q143d0wiy2984mdyxhwd78mnq4glsipkwyc";
+       libraryHaskellDepends = [ base bifunctors comonad mtl ];
+       homepage = "https://github.com/ChrisPenner/selections#readme";
+       description = "Combinators for operating with selections over an underlying functor";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "selectors" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy
      , template-haskell, text, xml-conduit
@@ -168210,6 +169356,8 @@ self: {
        pname = "semigroupoids";
        version = "5.2.1";
        sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r";
+       revision = "1";
+       editedCabalFile = "1lb59k2hdz9kbhmpw7bzc0n9pb5x3b9ysglp69dn4yf5xxjw03wx";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
@@ -168454,15 +169602,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sensu-run_0_3_0" = callPackage
+  "sensu-run_0_4_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, http-client
      , http-types, lens, network, optparse-applicative, process
      , temporary, text, time, unix, unix-compat, vector, wreq
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.3.0";
-       sha256 = "0p22069kvfj1fl5s26l9lvijbxzvdf58rkj3bdfrrw76l941shwm";
+       version = "0.4.0";
+       sha256 = "0wsrm7l12yfm89yfd5y1w8xypfg29d2s1afy7m8dpcdypmrxrghw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -168526,20 +169674,20 @@ self: {
 
   "separated" = callPackage
     ({ mkDerivation, base, bifunctors, directory, doctest, filepath
-     , lens, papa, parsec, QuickCheck, semigroupoids, semigroups
+     , lens, parsec, QuickCheck, semigroupoids, semigroups
      , template-haskell
      }:
      mkDerivation {
        pname = "separated";
-       version = "0.1.2";
-       sha256 = "0hq4b6pvhwgqxskylyqg2952gj8nblbx7zcgj4rds10qlkaxhp4m";
+       version = "0.2.2";
+       sha256 = "137s8rzpppnyg3l794m17pndix0nja66qcancwjjqhhfdhmc2pv4";
        libraryHaskellDepends = [
-         base bifunctors lens papa semigroupoids semigroups
+         base bifunctors lens semigroupoids semigroups
        ];
        testHaskellDepends = [
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/separated";
+       homepage = "https://github.com/qfpl/separated";
        description = "A data type with elements separated by values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168866,34 +170014,31 @@ self: {
      }) {};
 
   "serokell-util" = callPackage
-    ({ mkDerivation, acid-state, aeson, aeson-extra, ansi-terminal
-     , base, base16-bytestring, base64-bytestring, binary
-     , binary-orphans, bytestring, cereal, cereal-vector, clock
-     , containers, deepseq, directory, either, exceptions, extra
-     , 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
-     , universum, unordered-containers, vector, yaml
+    ({ mkDerivation, acid-state, aeson, ansi-terminal, base
+     , base16-bytestring, base64-bytestring, bytestring, clock
+     , containers, deepseq, directory, exceptions, extra, 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, universum
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.2.0.0";
-       sha256 = "13jna9mpi4dlw7hrdp2cv1p145hbri5a7ch3ly8a4j4apnx2s4qc";
+       version = "0.3";
+       sha256 = "1crcc9vsg713cnsrpha54rki4a9pnls8sw4m9hz3pikmyqg01jsh";
        libraryHaskellDepends = [
-         acid-state aeson aeson-extra ansi-terminal base base16-bytestring
-         base64-bytestring binary binary-orphans bytestring cereal
-         cereal-vector clock containers deepseq directory either exceptions
-         extra filepath formatting hashable lens log-warper monad-control
-         mtl optparse-applicative parsec QuickCheck quickcheck-instances
-         safecopy scientific semigroups stm template-haskell text
-         text-format time-units transformers universum unordered-containers
-         vector yaml
+         acid-state aeson ansi-terminal base base16-bytestring
+         base64-bytestring bytestring clock containers deepseq directory
+         exceptions extra filepath formatting hashable lens log-warper
+         monad-control mtl optparse-applicative parsec QuickCheck
+         quickcheck-instances safecopy scientific semigroups stm
+         template-haskell text text-format time-units transformers universum
+         unordered-containers vector yaml
        ];
        testHaskellDepends = [
-         aeson base binary bytestring cereal hspec QuickCheck
-         quickcheck-instances safecopy scientific text text-format
-         unordered-containers vector
+         aeson base bytestring hspec QuickCheck quickcheck-instances
+         safecopy scientific text text-format unordered-containers vector
        ];
        homepage = "https://github.com/serokell/serokell-util";
        description = "General-purpose functions by Serokell";
@@ -169717,17 +170862,18 @@ self: {
      }) {};
 
   "servant-github-webhook" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto
-     , github, http-types, servant, servant-server, string-conversions
-     , text, transformers, wai, warp
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptonite, github, http-types, memory, servant, servant-server
+     , string-conversions, text, transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-github-webhook";
-       version = "0.3.0.2";
-       sha256 = "1fbrc1i76hllrl61j262yxbibgsd6fkwcwl588mhxf48j0cfpp06";
+       version = "0.3.1.0";
+       sha256 = "0px2pxw6piqjh2vawf0mkhcf96pqk2rm0izvbsy5xcd011qlvfhq";
        libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring Crypto github http-types
-         servant servant-server string-conversions text transformers wai
+         aeson base base16-bytestring bytestring cryptonite github
+         http-types memory servant servant-server string-conversions text
+         transformers wai
        ];
        testHaskellDepends = [
          aeson base bytestring servant-server transformers wai warp
@@ -173217,8 +174363,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-sql-parser";
-       version = "0.4.2";
-       sha256 = "013vxh1l1q44s566d7mizhf810sl6r87nkkpl687md421kjhswms";
+       version = "0.4.3";
+       sha256 = "125k5vz05spmyd5gws1sfrqamp4pnbpyim21mvz1vx8avj548xi8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -173226,7 +174372,7 @@ self: {
        testHaskellDepends = [
          base HUnit mtl parsec pretty test-framework test-framework-hunit
        ];
-       homepage = "http://jakewheat.github.io/simple-sql-parser/";
+       homepage = "http://jakewheat.github.io/simple-sql-parser/latest";
        description = "A parser for SQL queries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175137,6 +176283,8 @@ self: {
        pname = "snap-extras";
        version = "0.12.0.0";
        sha256 = "15744qmp48qn67n8w2nxxqxfh5rjlg328psl58whb8q5m6grgv3n";
+       revision = "2";
+       editedCabalFile = "1zm93m5x6h63nagjlfzsq4cgx2600hm16zj5pjxvfh0d0vgq0yjp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -177572,8 +178720,8 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.2.5";
-       sha256 = "1galy8k0nvnq4xavm15f6v160ili1kmiq5p2rdhqmfciadrxzxqd";
+       version = "0.2.6";
+       sha256 = "0dc1ahgqwykiscm1bhkf07kijpn4sm4w4sfg88vvdyq8swil5kyz";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base cmdargs containers leancheck ];
        benchmarkHaskellDepends = [ base cmdargs containers leancheck ];
@@ -178207,8 +179355,8 @@ self: {
      }:
      mkDerivation {
        pname = "sproxy2";
-       version = "1.95.0";
-       sha256 = "16m0sqmp85p8zkpdh1pnzhja7j774cpfppwc5d6rq5palikwd88c";
+       version = "1.96.0";
+       sha256 = "0wzkh312d7h957vkf2qqsbnf9xm98vm8y5kzray87rn6rdc5k5x6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -178899,7 +180047,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "stache_1_0_0" = callPackage
+  "stache_1_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec
      , megaparsec, mtl, template-haskell, text, unordered-containers
@@ -178907,8 +180055,8 @@ self: {
      }:
      mkDerivation {
        pname = "stache";
-       version = "1.0.0";
-       sha256 = "1ms3jxsbny6gdqwq536xsdm1xj5hlyb77mxyf6q2s0q8skyc9kvr";
+       version = "1.1.1";
+       sha256 = "1gjmv1yqm5hkgap60w1ci6ng1l7kfhmz97wdhnqawcm8q7lir1nx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -178952,10 +180100,10 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.5.0";
-       sha256 = "1wx3p4n28mf6g4iydnsjvm87hn43kqsmn52npmsyym54wsl2vzx9";
+       version = "1.5.1";
+       sha256 = "1hw8lwk4dxfzw27l64g2z7gscpnp7adw5cc8kplldazj0y2cnf6x";
        revision = "1";
-       editedCabalFile = "161v9lsi6xacbz279bhclmhn0vmv24a0badawm17rqhq4w8lh4yq";
+       editedCabalFile = "1ywghpdjnwzk1m67fg5hzz16hxf7pqf5wayyzk1xjbnnl989gll6";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -180365,6 +181513,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stm-containers_0_2_16" = callPackage
+    ({ mkDerivation, async, base, base-prelude, containers, criterion
+     , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl
+     , mtl-prelude, mwc-random, mwc-random-monad, placeholders
+     , primitive, QuickCheck, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "stm-containers";
+       version = "0.2.16";
+       sha256 = "0bsha98j8ryzcrcs3n1iyrvx7b37ipc66f7qxkhnkp3wch32y139";
+       libraryHaskellDepends = [
+         base base-prelude focus hashable list-t primitive transformers
+       ];
+       testHaskellDepends = [
+         base base-prelude focus free hashable HTF list-t loch-th mtl
+         mtl-prelude placeholders primitive QuickCheck transformers
+         unordered-containers
+       ];
+       benchmarkHaskellDepends = [
+         async base base-prelude containers criterion focus free hashable
+         hashtables list-t loch-th mtl mtl-prelude mwc-random
+         mwc-random-monad placeholders text unordered-containers vector
+       ];
+       homepage = "https://github.com/nikita-volkov/stm-containers";
+       description = "Containers for STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stm-delay" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -181600,14 +182778,27 @@ self: {
      }) {};
 
   "strict-data" = callPackage
-    ({ mkDerivation, aeson, base, deepseq }:
+    ({ mkDerivation, aeson, base, containers, deepseq, doctest
+     , exceptions, fail, hashable, HTF, monad-control, mtl, pretty
+     , QuickCheck, resourcet, strict, text, transformers
+     , transformers-base, unordered-containers, util-plus, vector
+     , vector-algorithms
+     }:
      mkDerivation {
        pname = "strict-data";
-       version = "0.1.1.0";
-       sha256 = "1by3icfp0b0im2g87rmaclh7iwwwz564gl3x6yyn840rgc9k4xnr";
-       libraryHaskellDepends = [ aeson base deepseq ];
+       version = "0.2.0.2";
+       sha256 = "1xr1qd707grip4kan9d2nh5flqc61m2m3z8kf4wzgdd3m42zdg7q";
+       libraryHaskellDepends = [
+         aeson base containers deepseq exceptions fail hashable
+         monad-control mtl pretty QuickCheck resourcet strict text
+         transformers transformers-base unordered-containers util-plus
+         vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base containers deepseq doctest hashable HTF vector
+       ];
        homepage = "https://github.com/agrafix/strict-data#readme";
-       description = "Verious useful strict data structures";
+       description = "A collection of commonly used strict data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -183011,6 +184202,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "svg-builder-fork" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, hashable, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "svg-builder-fork";
+       version = "0.1.0.3";
+       sha256 = "16y8azlayb5925aybm2780aqbq4qhqpv9c96k22h3ci7ybb9zk92";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring hashable text unordered-containers
+       ];
+       homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git";
+       description = "DSL for building SVG";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "svg-tree" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , JuicyPixels, lens, linear, mtl, scientific, text, transformers
@@ -188498,6 +189705,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-plus" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, HTF, pretty, QuickCheck
+     , strict-data, text, util-plus
+     }:
+     mkDerivation {
+       pname = "text-plus";
+       version = "0.1.0.1";
+       sha256 = "1i93dk0i7zn81iw0q6g8ygr0bxwil09826mx1kw544n153yw9g7x";
+       libraryHaskellDepends = [
+         base bytestring pretty QuickCheck strict-data text util-plus
+       ];
+       testHaskellDepends = [ base doctest HTF text ];
+       homepage = "https://github.com/factisresearch/opensource-mono#readme";
+       description = "Utils for text";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "text-position" = callPackage
     ({ mkDerivation, base, QuickCheck, regex-applicative }:
      mkDerivation {
@@ -190543,14 +191767,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "time_1_8_0_2" = callPackage
+  "time_1_8_0_3" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck, random, tasty
      , tasty-hunit, tasty-quickcheck, unix
      }:
      mkDerivation {
        pname = "time";
-       version = "1.8.0.2";
-       sha256 = "158hy4klkdwm1vvqnfibziqac6h6ms42x0gha24w3a5cbjb2sr20";
+       version = "1.8.0.3";
+       sha256 = "0mbz76v74q938ramsgipgsvk8hvnplcnffplaq439z202zkyar1h";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck
@@ -192877,6 +194101,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "transient_0_5_9" = callPackage
+    ({ mkDerivation, atomic-primops, base, bytestring, containers
+     , directory, mtl, random, stm, time, transformers
+     }:
+     mkDerivation {
+       pname = "transient";
+       version = "0.5.9";
+       sha256 = "0y06x24x9jy6y6wqmq4smz9mkpy2yk53llaajlhdqysxwmhlpxag";
+       libraryHaskellDepends = [
+         atomic-primops base bytestring containers directory mtl random stm
+         time
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory mtl random stm time
+         transformers
+       ];
+       homepage = "http://www.fpcomplete.com/user/agocorona";
+       description = "composing programs with multithreading, events and distributed computing";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "transient-universe" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, filepath, hashable, HTTP, iproute, mtl, network
@@ -193373,7 +194619,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "trifecta_1_7_1" = callPackage
+  "trifecta_1_7_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base
      , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal
      , cabal-doctest, charset, comonad, containers, deepseq, doctest
@@ -193383,8 +194629,8 @@ self: {
      }:
      mkDerivation {
        pname = "trifecta";
-       version = "1.7.1";
-       sha256 = "1fnf3riihg3nglrwl9sy093ppklgnjz4shc1p2184m30ckwmk945";
+       version = "1.7.1.1";
+       sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -195200,6 +196446,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "type-of-html" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, criterion, hspec
+     , text
+     }:
+     mkDerivation {
+       pname = "type-of-html";
+       version = "0.2.1.1";
+       sha256 = "1dvmpi1bal10vr5l4phllwxij9yw5lgjyx7aimb1yalri2dapipk";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base hspec text ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion text
+       ];
+       homepage = "https://github.com/knupfer/type-of-html";
+       description = "High performance type driven html generation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "type-operators" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -196830,6 +198094,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "union_0_1_1_2" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, lens, profunctors
+     , tagged, vinyl
+     }:
+     mkDerivation {
+       pname = "union";
+       version = "0.1.1.2";
+       sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw";
+       revision = "1";
+       editedCabalFile = "17n6f3bpw7zwa9kgfpk6sa9bwg0gsi840kkzifwmp9lakykjf0cw";
+       libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
+       benchmarkHaskellDepends = [ base criterion deepseq lens ];
+       description = "Extensible type-safe unions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "union-find" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
@@ -197057,6 +198338,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "units-parser_0_1_0_1" = callPackage
+    ({ mkDerivation, base, containers, mtl, multimap, parsec, syb
+     , tasty, tasty-hunit, template-haskell
+     }:
+     mkDerivation {
+       pname = "units-parser";
+       version = "0.1.0.1";
+       sha256 = "1kmac80hnb2dric6d5ll7cdyhs8s4qqkk5vmd8gq9zjdyl6zxmrp";
+       libraryHaskellDepends = [ base containers mtl multimap parsec ];
+       testHaskellDepends = [
+         base containers mtl multimap parsec syb tasty tasty-hunit
+         template-haskell
+       ];
+       description = "A parser for units of measure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unittyped" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -197968,6 +199267,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring-aeson_0_1_0_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
+     mkDerivation {
+       pname = "uri-bytestring-aeson";
+       version = "0.1.0.2";
+       sha256 = "1i62sr28fxc3k045j8l2iak4f46nf8ygzqafc2k1pa0grm4l7ipa";
+       libraryHaskellDepends = [
+         aeson base bytestring text uri-bytestring
+       ];
+       homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
+       description = "Aeson instances for URI Bytestring";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uri-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, deepseq
      , failure, monad-control, network, system-fileio, system-filepath
@@ -198551,6 +199865,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "util-plus" = callPackage
+    ({ mkDerivation, array, base, containers, hashable, HTF, QuickCheck
+     , safe, unordered-containers
+     }:
+     mkDerivation {
+       pname = "util-plus";
+       version = "0.1.0.0";
+       sha256 = "062xs84zgqvxwvydbb2ivyhsfsmqk6wxl41pd4v7pyyqhdq588wm";
+       libraryHaskellDepends = [
+         array base containers hashable safe unordered-containers
+       ];
+       testHaskellDepends = [ base containers HTF QuickCheck ];
+       homepage = "https://github.com/factisresearch/opensource-mono#readme";
+       description = "A collection of commonly used utils";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "utility-ht" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -200066,6 +201397,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-sized_0_6_1_0" = callPackage
+    ({ mkDerivation, base, deepseq, finite-typelits, vector }:
+     mkDerivation {
+       pname = "vector-sized";
+       version = "0.6.1.0";
+       sha256 = "08bqyvkxs2bbbm5ljsymj178iiqp6izzbchlzav7hmwmj893wvjd";
+       libraryHaskellDepends = [ base deepseq finite-typelits vector ];
+       homepage = "http://github.com/expipiplus1/vector-sized#readme";
+       description = "Size tagged vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-space" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
@@ -200560,19 +201904,21 @@ self: {
      }) {inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
-    ({ mkDerivation, array, base, directory, filepath, HUnit, mtl
-     , parsec, process, random, regex-base, regex-posix, time
+    ({ mkDerivation, array, base, directory, filepath, hashable
+     , hashtables, HUnit, mtl, parsec, process, random, regex-base
+     , regex-posix, time
      }:
      mkDerivation {
        pname = "vintage-basic";
-       version = "1.0.1";
-       sha256 = "0hmnkmg6sz702nplh7indlzmv7bb36fmaglf9lw0fziabaj9kk25";
+       version = "1.0.3";
+       sha256 = "1wv7gz4yw4vd2xqcjx8sq0s7cd9h6z6zn7s5lxb10akv7kf52xb8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base directory filepath HUnit mtl parsec process random
-         regex-base regex-posix time
+         array base directory filepath hashable hashtables HUnit mtl parsec
+         process random regex-base regex-posix time
        ];
+       testHaskellDepends = [ base ];
        homepage = "http://www.vintage-basic.net";
        description = "Interpreter for microcomputer-era BASIC";
        license = stdenv.lib.licenses.bsd3;
@@ -202329,6 +203675,30 @@ self: {
        license = "unknown";
      }) {};
 
+  "wai-predicates_0_10_0" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , bytestring-conversion, case-insensitive, cookie, http-types
+     , singletons, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers, vault, vector, wai
+     }:
+     mkDerivation {
+       pname = "wai-predicates";
+       version = "0.10.0";
+       sha256 = "1hnpzf7zwizx67ql4fwpqj7xlgkn6c2ms8w4kjapmgxv8z8zdcxp";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-conversion case-insensitive
+         cookie http-types singletons text transformers vault vector wai
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive http-types tasty
+         tasty-hunit tasty-quickcheck wai
+       ];
+       homepage = "https://gitlab.com/twittner/wai-predicates/";
+       description = "WAI request predicates";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-request-spec" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, http-types, text, wai
@@ -204245,6 +205615,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weigh_0_0_5" = callPackage
+    ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
+     , process, random, split, template-haskell, temporary
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "weigh";
+       version = "0.0.5";
+       sha256 = "0s4bk2bglc5bf569zrbap7h6svd96sfgmvmrx57xwyinard7jfz9";
+       libraryHaskellDepends = [
+         base deepseq mtl process split template-haskell temporary
+       ];
+       testHaskellDepends = [
+         base bytestring-trie containers deepseq random unordered-containers
+       ];
+       homepage = "https://github.com/fpco/weigh#readme";
+       description = "Measure allocations of a Haskell functions/values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "weighted" = callPackage
     ({ mkDerivation, base, mtl, semiring-num, transformers }:
      mkDerivation {
@@ -205184,8 +206575,10 @@ self: {
     ({ mkDerivation, base, hspec, text }:
      mkDerivation {
        pname = "word-wrap";
-       version = "0.1.2";
-       sha256 = "0bpjylmfy8dkqgyrngllvplqfrnljz6c8p8mqsim1xy8fikmqp21";
+       version = "0.3.3";
+       sha256 = "1qc6v556mynqjk86ba958rdwbmvfy5marria8ybjpjdsrn2zmdm6";
+       revision = "1";
+       editedCabalFile = "1637bnmg2zm26ik3ql4203yk10jjjj50wyyzzhk210jcrvp8a27g";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/jtdaugherty/word-wrap/";
@@ -205621,6 +207014,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wreq_0_5_1_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec
+     , authenticate-oauth, base, base16-bytestring, base64-bytestring
+     , byteable, bytestring, case-insensitive, containers, cryptohash
+     , directory, doctest, exceptions, filepath, ghc-prim, hashable
+     , http-client, http-client-tls, http-types, HUnit, lens, lens-aeson
+     , mime-types, network-info, psqueues, QuickCheck, snap-core
+     , snap-server, template-haskell, temporary, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , time-locale-compat, transformers, unix-compat
+     , unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "wreq";
+       version = "0.5.1.0";
+       sha256 = "1p8cn9yzm2ggb3kac17xc3if6sdxjdh544k730imvvhm0szx4j76";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec authenticate-oauth base base16-bytestring byteable
+         bytestring case-insensitive containers cryptohash exceptions
+         ghc-prim hashable http-client http-client-tls http-types lens
+         lens-aeson mime-types psqueues template-haskell text time
+         time-locale-compat unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring bytestring
+         case-insensitive containers directory doctest filepath hashable
+         http-client http-types HUnit lens lens-aeson network-info
+         QuickCheck snap-core snap-server temporary test-framework
+         test-framework-hunit test-framework-quickcheck2 text time
+         transformers unix-compat unordered-containers uuid vector
+       ];
+       homepage = "http://www.serpentine.com/wreq";
+       description = "An easy-to-use HTTP client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wreq-sb" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec
      , authenticate-oauth, base, base16-bytestring, base64-bytestring
@@ -206318,15 +207750,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "x509-store_1_6_4" = callPackage
+  "x509-store_1_6_5" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, directory, filepath, mtl, pem, tasty
      , tasty-hunit, x509
      }:
      mkDerivation {
        pname = "x509-store";
-       version = "1.6.4";
-       sha256 = "089hpq1qbn19rbrvi91pn3v6681dkbm5hmkvg6cwqr868cj4yn79";
+       version = "1.6.5";
+       sha256 = "1lg9gy0bmzjmlk4gfnzx2prfar1qha4hfjsw8yvjg33zm0fv3ahs";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytestring containers cryptonite
          directory filepath mtl pem x509
@@ -209443,8 +210875,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.2.2";
-       sha256 = "0cswp2kkw14g64axbzncnckrlfxnvdjgppjwwm60i4n9y2zg6xk2";
+       version = "0.2.4";
+       sha256 = "1gpyra5j6hi25r0hrjifjmkar8yb0f74cln4rygdjsvczllkri9a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -209550,7 +210982,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod-bin_1_5_2_4" = callPackage
+  "yesod-bin_1_5_2_5" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -209564,8 +210996,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.5.2.4";
-       sha256 = "0kgrhpz2g9pj8llf9akbvjv1w76y82pk2pqm4hpqaaj6219pzznm";
+       version = "1.5.2.5";
+       sha256 = "0jwnjxfb6s2gcx66am74hpq38fv3svgp1a08yf4610g6fskhkx4n";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -209725,6 +211157,50 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_4_36" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , criterion, data-default, deepseq, deepseq-generics, directory
+     , exceptions, fast-logger, hspec, hspec-expectations, http-types
+     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
+     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
+     , random, resourcet, safe, semigroups, shakespeare
+     , streaming-commons, template-haskell, text, time, transformers
+     , transformers-base, unix-compat, unordered-containers, vector, wai
+     , wai-extra, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.36";
+       sha256 = "0pjhpqqsgkkccg269i5q8xngzk1lh945acnlfdjd429xjrpcmfir";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq
+         deepseq-generics directory exceptions fast-logger http-types
+         lifted-base monad-control monad-logger mtl mwc-random old-locale
+         parsec path-pieces primitive random resourcet safe semigroups
+         shakespeare template-haskell text time transformers
+         transformers-base unix-compat unordered-containers vector wai
+         wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion shakespeare text transformers
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -211949,6 +213425,8 @@ self: {
        pname = "yoctoparsec";
        version = "0.1.0.0";
        sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp";
+       revision = "1";
+       editedCabalFile = "12qzdi2dx22kvfmvsj8yy82fgl29m15ys9myra3jrq4fqr5n0br9";
        libraryHaskellDepends = [ base free mtl ];
        homepage = "https://github.com/mniip/yoctoparsec";
        description = "A truly tiny monadic parsing library";
@@ -212816,6 +214294,8 @@ self: {
        pname = "zippers";
        version = "0.2.4";
        sha256 = "1nzjs1s0lb0gr0n2qib4pdp24k7q707261n8icxzg81f0c04yafb";
+       revision = "1";
+       editedCabalFile = "18a7wlklxvl9fhk8j7njf8ifn2781vfiqz0vxk6ljx30f1p7plq1";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base lens profunctors semigroupoids ];
        testHaskellDepends = [ base doctest ];

From 5ba3972addac3dd56518da294d088c92a6fb9798 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 00:43:06 -0400
Subject: [PATCH 1641/3246] cc-wrapper: Stop preWrapping

This is an ugly temp hack for cross compilation, but now we have something better on the way.

Bind `infixSalt` as an environment variable as it will be used in it.
---
 pkgs/build-support/cc-wrapper/default.nix | 89 ++++++++---------------
 1 file changed, 30 insertions(+), 59 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index e0cc1fc2669..01d1bbd7a5d 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -53,42 +53,13 @@ let
     "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
 
   dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config;
-  # TODO(@Ericson2314) Make unconditional
-  infixSalt  = stdenv.lib.optionalString (targetPlatform != hostPlatform) dashlessTarget;
-  infixSalt_ = stdenv.lib.optionalString (targetPlatform != hostPlatform) (dashlessTarget + "_");
-  _infixSalt = stdenv.lib.optionalString (targetPlatform != hostPlatform) ("_" + dashlessTarget);
 
-  # We want to prefix all NIX_ flags with the target triple
-  preWrap = textFile:
-    # TODO: Do even when not cross on next mass-rebuild
-    # TODO: use @target_tripple@ for consistency
-    if targetPlatform == hostPlatform
-    then textFile
-    else runCommand "sed-nix-env-vars" {} (''
-      cp --no-preserve=mode ${textFile} $out
-
-      sed -i $out \
-        -e 's^NIX_^NIX_${infixSalt_}^g' \
-        -e 's^addCVars^addCVars${_infixSalt}^g' \
-        -e 's^\[ -z "\$crossConfig" \]^\[\[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" \]\]^g'
-
-      # NIX_ things which we don't both use and define, we revert them
-      #asymmetric=$(
-      #  for pre in "" "\\$"
-      #  do
-      #    grep -E -ho $pre'NIX_[a-zA-Z_]*' ./* | sed 's/\$//' | sort | uniq
-      #  done | sort | uniq -c | sort -nr | sed -n 's/^1 NIX_//gp')
-
-      # hard-code for now
-      asymmetric=("CXXSTDLIB_COMPILE" "CC")
-
-      # The ([^a-zA-Z_]|$) bussiness is to ensure environment variables that
-      # begin with `NIX_CC` don't also get blacklisted.
-      for var in "''${asymmetric[@]}"
-      do
-        sed -i $out -E -e "s~NIX_${infixSalt_}$var([^a-zA-Z_]|$)~NIX_$var\1~g"
-      done
-    '');
+  # The "infix salt" is a arbitrary string added in the middle of env vars
+  # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used
+  # without interfering. For the moment, it is defined as the target triple,
+  # adjusted to be a valid bash identifier. This should be considered an
+  # unstable implementation detail, however.
+  infixSalt = dashlessTarget;
 
   # The dynamic linker has different names on different platforms. This is a
   # shell glob that ought to match it.
@@ -129,20 +100,21 @@ stdenv.mkDerivation {
   gnugrep_bin = if nativeTools then "" else gnugrep;
 
   binPrefix = prefix;
+  inherit infixSalt;
 
   passthru = {
     inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
-            prefix infixSalt infixSalt_ _infixSalt;
+            prefix;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
       (mapc (lambda (arg)
         (when (file-directory-p (concat arg "/include"))
-          (setenv "NIX_${infixSalt_}CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt_}CFLAGS_COMPILE") " -isystem " arg "/include")))
+          (setenv "NIX_${infixSalt}_CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt}_CFLAGS_COMPILE") " -isystem " arg "/include")))
         (when (file-directory-p (concat arg "/lib"))
-          (setenv "NIX_${infixSalt_}LDFLAGS" (concat (getenv "NIX_${infixSalt_}LDFLAGS") " -L" arg "/lib")))
+          (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib")))
         (when (file-directory-p (concat arg "/lib64"))
-          (setenv "NIX_${infixSalt_}LDFLAGS" (concat (getenv "NIX_${infixSalt_}LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
+          (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
     '';
   };
 
@@ -268,7 +240,7 @@ stdenv.mkDerivation {
       # Solaris needs an additional ld wrapper.
       ldPath="${nativePrefix}/bin"
       exec="$ldPath/${prefix}ld"
-      wrap ld-solaris ${preWrap ./ld-solaris-wrapper.sh}
+      wrap ld-solaris ${./ld-solaris-wrapper.sh}
     '')
 
     + ''
@@ -282,7 +254,6 @@ stdenv.mkDerivation {
     '' + (if !useMacosReexportHack then ''
       wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld}
     '' else ''
-      export binPrefix=${prefix}
       ldInner="${prefix}ld-reexport-delegate"
       wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld}
       wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner"
@@ -290,11 +261,11 @@ stdenv.mkDerivation {
     '') + ''
 
       if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then
-        wrap ${prefix}ld.gold ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold
+        wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold
       fi
 
       if [ -e ${binutils_bin}/bin/ld.bfd ]; then
-        wrap ${prefix}ld.bfd ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd
+        wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd
       fi
 
       # We export environment variables pointing to the wrapped nonstandard
@@ -306,49 +277,49 @@ stdenv.mkDerivation {
       export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}"
 
       if [ -e $ccPath/${prefix}gcc ]; then
-        wrap ${prefix}gcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcc
+        wrap ${prefix}gcc ${./cc-wrapper.sh} $ccPath/${prefix}gcc
         ln -s ${prefix}gcc $out/bin/${prefix}cc
         export named_cc=${prefix}gcc
         export named_cxx=${prefix}g++
       elif [ -e $ccPath/clang ]; then
-        wrap ${prefix}clang ${preWrap ./cc-wrapper.sh} $ccPath/clang
+        wrap ${prefix}clang ${./cc-wrapper.sh} $ccPath/clang
         ln -s ${prefix}clang $out/bin/${prefix}cc
         export named_cc=${prefix}clang
         export named_cxx=${prefix}clang++
       fi
 
       if [ -e $ccPath/${prefix}g++ ]; then
-        wrap ${prefix}g++ ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}g++
+        wrap ${prefix}g++ ${./cc-wrapper.sh} $ccPath/${prefix}g++
         ln -s ${prefix}g++ $out/bin/${prefix}c++
       elif [ -e $ccPath/clang++ ]; then
-        wrap ${prefix}clang++ ${preWrap ./cc-wrapper.sh} $ccPath/clang++
+        wrap ${prefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++
         ln -s ${prefix}clang++ $out/bin/${prefix}c++
       fi
 
       if [ -e $ccPath/cpp ]; then
-        wrap ${prefix}cpp ${preWrap ./cc-wrapper.sh} $ccPath/cpp
+        wrap ${prefix}cpp ${./cc-wrapper.sh} $ccPath/cpp
       fi
     ''
 
     + optionalString cc.langFortran or false ''
-      wrap ${prefix}gfortran ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gfortran
+      wrap ${prefix}gfortran ${./cc-wrapper.sh} $ccPath/${prefix}gfortran
       ln -sv ${prefix}gfortran $out/bin/${prefix}g77
       ln -sv ${prefix}gfortran $out/bin/${prefix}f77
     ''
 
     + optionalString cc.langJava or false ''
-      wrap ${prefix}gcj ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcj
+      wrap ${prefix}gcj ${./cc-wrapper.sh} $ccPath/${prefix}gcj
     ''
 
     + optionalString cc.langGo or false ''
-      wrap ${prefix}gccgo ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gccgo
+      wrap ${prefix}gccgo ${./cc-wrapper.sh} $ccPath/${prefix}gccgo
     ''
 
     + optionalString cc.langAda or false ''
-      wrap ${prefix}gnatgcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gnatgcc
-      wrap ${prefix}gnatmake ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatmake
-      wrap ${prefix}gnatbind ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatbind
-      wrap ${prefix}gnatlink ${preWrap ./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink
+      wrap ${prefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${prefix}gnatgcc
+      wrap ${prefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${prefix}gnatmake
+      wrap ${prefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${prefix}gnatbind
+      wrap ${prefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink
     ''
 
     + optionalString cc.langVhdl or false ''
@@ -356,7 +327,7 @@ stdenv.mkDerivation {
     ''
 
     + ''
-      substituteAll ${preWrap ./setup-hook.sh} $out/nix-support/setup-hook.tmp
+      substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp
       cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook
       rm $out/nix-support/setup-hook.tmp
 
@@ -375,9 +346,9 @@ stdenv.mkDerivation {
     ''
 
     + ''
-      substituteAll ${preWrap ./add-flags.sh} $out/nix-support/add-flags.sh
-      substituteAll ${preWrap ./add-hardening.sh} $out/nix-support/add-hardening.sh
-      substituteAll ${preWrap ./utils.sh} $out/nix-support/utils.sh
+      substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
+      substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
+      substituteAll ${./utils.sh} $out/nix-support/utils.sh
     ''
     + extraBuildCommands;
 

From 9f1e009975dc2d58541de435c74a26afe011542a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 00:43:06 -0400
Subject: [PATCH 1642/3246] cc-wrapper: Unconditionally use @infixSalt@ accross
 the board

This is basically a sed job, in preparation of the next commit. The
rules are more or less:

  - s"NIX_(.._WRAPPER_)?([a-zA-Z0-9@]*)"NIX_\1@infixSalt@_\2"g

  - except for non-cc-wrapper-specific vars like `NIX_DEBUG`
---
 pkgs/build-support/cc-wrapper/add-flags.sh    | 28 ++++++++---------
 pkgs/build-support/cc-wrapper/cc-wrapper.sh   | 30 +++++++++----------
 pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 24 +++++++--------
 .../cc-wrapper/gnatlink-wrapper.sh            | 12 ++++----
 pkgs/build-support/cc-wrapper/ld-wrapper.sh   | 28 ++++++++---------
 pkgs/build-support/cc-wrapper/setup-hook.sh   |  4 +--
 6 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 1edfe8bfc75..37b3b4cae86 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -1,37 +1,37 @@
 # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
-export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"
+export NIX_@infixSalt@_CFLAGS_COMPILE="-B@out@/bin/ $NIX_@infixSalt@_CFLAGS_COMPILE"
 
 # Export and assign separately in order that a failing $(..) will fail
 # the script.
 
 if [ -e @out@/nix-support/libc-cflags ]; then
-    export NIX_CFLAGS_COMPILE
-    NIX_CFLAGS_COMPILE="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
+    export NIX_@infixSalt@_CFLAGS_COMPILE
+    NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/libc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE"
 fi
 
 if [ -e @out@/nix-support/cc-cflags ]; then
-    export NIX_CFLAGS_COMPILE
-    NIX_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE"
+    export NIX_@infixSalt@_CFLAGS_COMPILE
+    NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE"
 fi
 
 if [ -e @out@/nix-support/gnat-cflags ]; then
-    export NIX_GNATFLAGS_COMPILE
-    NIX_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE"
+    export NIX_@infixSalt@_GNATFLAGS_COMPILE
+    NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE"
 fi
 
 if [ -e @out@/nix-support/libc-ldflags ]; then
-    export NIX_LDFLAGS
-    NIX_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)"
+    export NIX_@infixSalt@_LDFLAGS
+    NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)"
 fi
 
 if [ -e @out@/nix-support/cc-ldflags ]; then
-    export NIX_LDFLAGS
-    NIX_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)"
+    export NIX_@infixSalt@_LDFLAGS
+    NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)"
 fi
 
 if [ -e @out@/nix-support/libc-ldflags-before ]; then
-    export NIX_LDFLAGS_BEFORE
-    NIX_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"
+    export NIX_@infixSalt@_LDFLAGS_BEFORE
+    NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE"
 fi
 
-export NIX_CC_WRAPPER_FLAGS_SET=1
+export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 96655656607..ef9df4f968d 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -11,11 +11,11 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then
     PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
 fi
 
-if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then
-    source "$NIX_CC_WRAPPER_START_HOOK"
+if [ -n "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" ]; then
+    source "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK"
 fi
 
-if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then
+if [ -z "$NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET" ]; then
     source @out@/nix-support/add-flags.sh
 fi
 
@@ -63,7 +63,7 @@ while [ "$n" -lt "$nParams" ]; do
         nonFlagArgs=1
     elif [ "$p" = -m32 ]; then
         if [ -e @out@/nix-support/dynamic-linker-m32 ]; then
-            NIX_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)"
+            NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)"
         fi
     fi
     n+=1
@@ -106,7 +106,7 @@ fi
 
 
 # Clear march/mtune=native -- they bring impurity.
-if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then
+if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then
     rest=()
     for p in "${params[@]}"; do
         if [[ "$p" = -m*=native ]]; then
@@ -120,36 +120,36 @@ fi
 
 if [[ "$isCpp" = 1 ]]; then
     if [[ "$cppInclude" = 1 ]]; then
-        NIX_CFLAGS_COMPILE+=" ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}"
+        NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}"
     fi
-    NIX_CFLAGS_LINK+=" $NIX_CXXSTDLIB_LINK"
+    NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK"
 fi
 
 source @out@/nix-support/add-hardening.sh
 
 # Add the flags for the C compiler proper.
-extraAfter=($NIX_CFLAGS_COMPILE "${hardeningCFlags[@]}")
+extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE "${hardeningCFlags[@]}")
 extraBefore=()
 
 if [ "$dontLink" != 1 ]; then
 
     # Add the flags that should only be passed to the compiler when
     # linking.
-    extraAfter+=($NIX_CFLAGS_LINK "${hardeningLDFlags[@]}")
+    extraAfter+=($NIX_@infixSalt@_CFLAGS_LINK "${hardeningLDFlags[@]}")
 
     # Add the flags that should be passed to the linker (and prevent
-    # `ld-wrapper' from adding NIX_LDFLAGS again).
-    for i in $NIX_LDFLAGS_BEFORE; do
+    # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again).
+    for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do
         extraBefore+=("-Wl,$i")
     done
-    for i in $NIX_LDFLAGS; do
+    for i in $NIX_@infixSalt@_LDFLAGS; do
         if [ "${i:0:3}" = -L/ ]; then
             extraAfter+=("$i")
         else
             extraAfter+=("-Wl,$i")
         fi
     done
-    export NIX_LDFLAGS_SET=1
+    export NIX_@infixSalt@_LDFLAGS_SET=1
 fi
 
 # As a very special hack, if the arguments are just `-v', then don't
@@ -171,8 +171,8 @@ if [ -n "$NIX_DEBUG" ]; then
     printf "  %q\n" "${extraAfter[@]}" >&2
 fi
 
-if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then
-    source "$NIX_CC_WRAPPER_EXEC_HOOK"
+if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
+    source "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK"
 fi
 
 PATH="$path_backup"
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index dd97a07bd19..33272ba5345 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -10,11 +10,11 @@ if [ -n "@coreutils_bin@" ]; then
     PATH="@coreutils_bin@/bin"
 fi
 
-if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then
-    source "$NIX_GNAT_WRAPPER_START_HOOK"
+if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" ]; then
+    source "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK"
 fi
 
-if [ -z "$NIX_GNAT_WRAPPER_FLAGS_SET" ]; then
+if [ -z "$NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET" ]; then
     source @out@/nix-support/add-flags.sh
 fi
 
@@ -35,7 +35,7 @@ for i in "$@"; do
         nonFlagArgs=1
     elif [ "$i" = -m32 ]; then
         if [ -e @out@/nix-support/dynamic-linker-m32 ]; then
-            NIX_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)"
+            NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)"
         fi
     fi
 done
@@ -72,7 +72,7 @@ fi
 
 
 # Clear march/mtune=native -- they bring impurity.
-if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then
+if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then
     rest=()
     for p in "${params[@]}"; do
         if [[ "$p" = -m*=native ]]; then
@@ -86,7 +86,7 @@ fi
 
 
 # Add the flags for the GNAT compiler proper.
-extraAfter=($NIX_GNATFLAGS_COMPILE)
+extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE)
 extraBefore=()
 
 if [ "$(basename "$0")x" = "gnatmakex" ]; then
@@ -95,18 +95,18 @@ fi
 
 #if [ "$dontLink" != 1 ]; then
 #    # Add the flags that should be passed to the linker (and prevent
-#    # `ld-wrapper' from adding NIX_LDFLAGS again).
-#    for i in $NIX_LDFLAGS_BEFORE; do
+#    # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again).
+#    for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do
 #        extraBefore+=("-largs" "$i")
 #    done
-#    for i in $NIX_LDFLAGS; do
+#    for i in $NIX_@infixSalt@_LDFLAGS; do
 #        if [ "${i:0:3}" = -L/ ]; then
 #            extraAfter+=("$i")
 #        else
 #            extraAfter+=("-largs" "$i")
 #        fi
 #    done
-#    export NIX_LDFLAGS_SET=1
+#    export NIX_@infixSalt@_LDFLAGS_SET=1
 #fi
 
 # Optionally print debug info.
@@ -119,8 +119,8 @@ if [ -n "$NIX_DEBUG" ]; then
     printf "  %q\n" "${extraAfter[@]}" >&2
 fi
 
-if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then
-    source "$NIX_GNAT_WRAPPER_EXEC_HOOK"
+if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then
+    source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK"
 fi
 
 PATH="$path_backup"
diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
index 3c1a805c3fa..c8493302852 100644
--- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
@@ -7,18 +7,18 @@ extraAfter=("--GCC=@out@/bin/gcc")
 extraBefore=()
 
 ## Add the flags that should be passed to the linker (and prevent
-## `ld-wrapper' from adding NIX_LDFLAGS again).
-#for i in $NIX_LDFLAGS_BEFORE; do
+## `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again).
+#for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do
 #    extraBefore+=("-largs" "$i")
 #done
-#for i in $NIX_LDFLAGS; do
+#for i in $NIX_@infixSalt@_LDFLAGS; do
 #    if [ "${i:0:3}" = -L/ ]; then
 #        extraAfter+=("$i")
 #    else
 #        extraAfter+=("-largs" "$i")
 #    fi
 #done
-#export NIX_LDFLAGS_SET=1
+#export NIX_@infixSalt@_LDFLAGS_SET=1
 
 # Optionally print debug info.
 if [ -n "$NIX_DEBUG" ]; then
@@ -30,8 +30,8 @@ if [ -n "$NIX_DEBUG" ]; then
     printf "  %q\n" "${extraAfter[@]}" >&2
 fi
 
-if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then
-    source "$NIX_GNAT_WRAPPER_EXEC_HOOK"
+if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then
+    source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK"
 fi
 
 exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 6ee66b0e3f2..fa8875e00b6 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -1,5 +1,5 @@
 #! @shell@
-set -e -o pipefail
+set -eu -o pipefail
 shopt -s nullglob
 
 path_backup="$PATH"
@@ -10,11 +10,11 @@ if [ -n "@coreutils_bin@" ]; then
     PATH="@coreutils_bin@/bin"
 fi
 
-if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then
-    source "$NIX_LD_WRAPPER_START_HOOK"
+if [ -n "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" ]; then
+    source "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK"
 fi
 
-if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then
+if [ -z "$NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET" ]; then
     source @out@/nix-support/add-flags.sh
 fi
 
@@ -24,7 +24,7 @@ source @out@/nix-support/utils.sh
 # Optionally filter out paths not refering to the store.
 expandResponseParams "$@"
 if [[ "$NIX_ENFORCE_PURITY" = 1 && -n "$NIX_STORE"
-        && ( -z "$NIX_IGNORE_LD_THROUGH_GCC" || -z "$NIX_LDFLAGS_SET" ) ]]; then
+        && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "$NIX_@infixSalt@_LDFLAGS_SET" ) ]]; then
     rest=()
     nParams=${#params[@]}
     declare -i n=0
@@ -59,19 +59,19 @@ source @out@/nix-support/add-hardening.sh
 extraAfter=("${hardeningLDFlags[@]}")
 extraBefore=()
 
-if [ -z "$NIX_LDFLAGS_SET" ]; then
-    extraAfter+=($NIX_LDFLAGS)
-    extraBefore+=($NIX_LDFLAGS_BEFORE)
+if [ -z "$NIX_@infixSalt@_LDFLAGS_SET" ]; then
+    extraAfter+=($NIX_@infixSalt@_LDFLAGS)
+    extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE)
 fi
 
-extraAfter+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN)
+extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER $NIX_@infixSalt@_LDFLAGS_HARDEN)
 
 declare -a libDirs
 declare -A libs
 relocatable=
 
 # Find all -L... switches for rpath, and relocatable flags for build id.
-if [ "$NIX_DONT_SET_RPATH" != 1 ] || [ "$NIX_SET_BUILD_ID" = 1 ]; then
+if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then
     prev=
     for p in "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"; do
         case "$prev" in
@@ -108,7 +108,7 @@ fi
 
 
 # Add all used dynamic libraries to the rpath.
-if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
+if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
     # For each directory in the library search path (-L...),
     # see if it contains a dynamic library used by a -l... flag.  If
     # so, add the directory to the rpath.
@@ -141,7 +141,7 @@ fi
 
 # Only add --build-id if this is a final link. FIXME: should build gcc
 # with --enable-linker-build-id instead?
-if [ "$NIX_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then
+if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then
     extraAfter+=(--build-id)
 fi
 
@@ -156,8 +156,8 @@ if [ -n "$NIX_DEBUG" ]; then
     printf "  %q\n" "${extraAfter[@]}" >&2
 fi
 
-if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then
-    source "$NIX_LD_WRAPPER_EXEC_HOOK"
+if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
+    source "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK"
 fi
 
 PATH="$path_backup"
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 2bf507ce8df..360a667a3a5 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -1,4 +1,4 @@
-addCVars () {
+ccWrapper_addCVars () {
     if [[ -d "$1/include" ]]; then
         export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
     fi
@@ -16,7 +16,7 @@ addCVars () {
     fi
 }
 
-envHooks+=(addCVars)
+envHooks+=(ccWrapper_addCVars)
 
 # Note 1: these come *after* $out in the PATH (see setup.sh).
 # Note 2: phase separation makes this look useless to shellcheck.

From 42f35503b56e293759685e9fb2a66ba75a55c339 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 6 Jul 2017 17:19:53 -0400
Subject: [PATCH 1643/3246] cc-wrapper: Make hygienic

See the added comments for what exactly has been done.
---
 pkgs/build-support/cc-wrapper/add-flags.sh  |  75 +++++++++++++
 pkgs/build-support/cc-wrapper/setup-hook.sh | 116 +++++++++++++++++---
 pkgs/stdenv/generic/setup.sh                |  13 +++
 3 files changed, 189 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 37b3b4cae86..b3a765d38e3 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -1,3 +1,77 @@
+# N.B. It may be a surprise that the derivation-specific variables are exported,
+# since this is just sourced by the wrapped binaries---the end consumers. This
+# is because one wrapper binary may invoke another (e.g. cc invoking ld). In
+# that case, it is cheaper/better to not repeat this step and let the forked
+# wrapped binary just inherit the work of the forker's wrapper script.
+
+# Accumulate prefixes for taking in the right input parameters. See setup-hook
+# for details.
+declare -a role_prefixes=()
+if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]]; then
+    role_prefixes+=(_BUILD)
+fi
+if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]]; then
+    role_prefixes+=('')
+fi
+if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]]; then
+    role_prefixes+=(_TARGET)
+fi
+
+# For each role we serve, we accumulate the input parameters into our own
+# cc-wrapper-derivation-specific environment variables.
+for pre in "${role_prefixes[@]}"; do
+    # We need to mangle names for hygiene, but also take parameters/overrides
+    # from the environment.
+    slurpUnsalted () {
+        case "$1" in
+            CC_WRAPPER_*)
+                local firstPre=NIX_CC_WRAPPER_
+                local varname="${1#CC_WRAPPER_}"
+                ;;
+            LD_WRAPPER_*)
+                local firstPre=NIX_LD_WRAPPER_
+                local varname="${1#LD_WRAPPER_}"
+                ;;
+            *)
+                local firstPre=NIX_
+                local varname="$1"
+                ;;
+        esac
+        local inputVar="${firstPre}${pre}${varname}"
+        local outputVar="${firstPre}@infixSalt@_${varname}"
+        local delimiter=''
+        if [[ -n "${!outputVar:-}" && -n "${!inputVar:-}" ]]; then
+            delimiter=' '
+        fi
+        # Easiest to just do this to deal with either the input or (old) output.
+        set +u
+        export ${outputVar}+="${delimiter}${!inputVar}"
+        set -u
+    }
+
+    slurpUnsalted CC_WRAPPER_START_HOOK
+    slurpUnsalted CC_WRAPPER_EXEC_HOOK
+    slurpUnsalted LD_WRAPPER_START_HOOK
+    slurpUnsalted LD_WRAPPER_EXEC_HOOK
+
+    slurpUnsalted CFLAGS_COMPILE
+    slurpUnsalted CFLAGS_LINK
+    slurpUnsalted CXXSTDLIB_COMPILE
+    slurpUnsalted CXXSTDLIB_LINK
+    slurpUnsalted DONT_SET_RPATH
+    slurpUnsalted GNATFLAGS_COMPILE
+    slurpUnsalted IGNORE_LD_THROUGH_GCC
+    slurpUnsalted LDFLAGS
+    slurpUnsalted LDFLAGS_BEFORE
+    slurpUnsalted LDFLAGS_AFTER
+    slurpUnsalted LDFLAGS_HARDEN
+
+    slurpUnsalted SET_BUILD_ID
+    slurpUnsalted DONT_SET_RPATH
+    slurpUnsalted ENFORCE_NO_NATIVE
+done
+unset -f slurpUnsalted
+
 # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
 export NIX_@infixSalt@_CFLAGS_COMPILE="-B@out@/bin/ $NIX_@infixSalt@_CFLAGS_COMPILE"
 
@@ -34,4 +108,5 @@ if [ -e @out@/nix-support/libc-ldflags-before ]; then
     NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE"
 fi
 
+# That way forked processes don't againt extend these environment variables
 export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 360a667a3a5..c6abd6281d2 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -1,21 +1,111 @@
+# CC Wrapper hygiene
+#
+# For at least cross compilation, we need to depend on multiple cc-wrappers at
+# once---specifically up to one per sort of dependency. This follows from having
+# different tools targeting different platforms, and different flags for those
+# tools. For example:
+#
+#   # Flags for compiling (whether or not linking) C code for the...
+#   NIX_BUILD_CFLAGS_COMPILE  # ...build platform
+#   NIX_CFLAGS_COMPILE        # ...host platform
+#   NIX_TARGET_CFLAGS_COMPILE # ...target platform
+#
+# Notice that these platforms are the 3 *relative* to the package using
+# cc-wrapper, not absolute like `x86_64-pc-linux-gnu`.
+#
+# The simplest solution would be to have separate cc-wrappers per (3 intended
+# use-cases * n absolute concrete platforms). For the use-case axis, we would
+# @-splice in 'BUILD_' '' 'TARGET_' to use the write environment variables when
+# building the cc-wrapper, and likewise prefix the binaries' names so they didn't
+# clobber each other on the PATH. But the need for 3x cc-wrappers, along with
+# non-standard name prefixes, is annoying and liable to break packages' build
+# systems.
+#
+# Instead, we opt to have just one cc-wrapper per absolute platform. Matching
+# convention, the binaries' names can just be prefixed with their target
+# platform. On the other hand, that means packages will depend on not just
+# multiple cc-wrappers, but the exact same cc-wrapper derivation multiple ways.
+# That means the exact same cc-wrapper derivation must be able to avoid
+# conflicting with itself, despite the fact that `setup-hook.sh`, the `addCvars`
+# function, and `add-flags.sh` are all communicating with each other with
+# environment variables. Yuck.
+#
+# The basic strategy is:
+#
+#  - Everyone exclusively *adds information* to relative-platform-specific
+#    environment variables, like `NIX_TARGET_CFLAGS_COMPILE`, to communicate
+#    with the wrapped binaries.
+#
+#  - The wrapped binaries will exclusively *read* cc-wrapper-derivation-specific
+#    environment variables distinguished with with `infixSalt`, like
+#    `NIX_@infixSalt@_CFLAGS_COMPILE`.
+#
+#  - `add-flags`, beyond its old task of reading extra flags stuck inside the
+#    cc-wrapper derivation, will convert the relative-platform-specific
+#    variables to cc-wrapper-derivation-specific variables. This conversion is
+#    the only time all but one of the cc-wrapper-derivation-specific variables
+#    are set.
+#
+# This ensures the flow of information is exclusive from
+# relative-platform-specific variables to cc-wrapper-derivation-specific
+# variables. This allows us to support the general case of a many--many relation
+# between relative platforms and cc-wrapper derivations.
+#
+# For more details, read the individual files where the mechanisms used to
+# accomplish this will be individually documented.
+
+
+# It's fine that any other cc-wrapper will redefine this. Bash functions close
+# over no state, and there's no @-substitutions within, so any redefined
+# function is guaranteed to be exactly the same.
 ccWrapper_addCVars () {
+    # The `depOffset` describes how the platforms of the dependencies are slid
+    # relative to the depending package. It is brought into scope of the
+    # environment hook defined as the role of the dependency being applied.
+    case $depOffset in
+        -1) local role='BUILD_' ;;
+        0)  local role='' ;;
+        1)  local role='TARGET_' ;;
+        *)  echo "cc-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2;
+            return 1 ;;
+    esac
+
     if [[ -d "$1/include" ]]; then
-        export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
+        export NIX_${role}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
     fi
 
     if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
-        export NIX_LDFLAGS+=" -L$1/lib64"
+        export NIX_${role}LDFLAGS+=" -L$1/lib64"
     fi
 
     if [[ -d "$1/lib" ]]; then
-        export NIX_LDFLAGS+=" -L$1/lib"
+        export NIX_${role}LDFLAGS+=" -L$1/lib"
     fi
 
     if [[ -d "$1/Library/Frameworks" ]]; then
-        export NIX_CFLAGS_COMPILE+=" -F$1/Library/Frameworks"
+        export NIX_${role}CFLAGS_COMPILE+=" -F$1/Library/Frameworks"
     fi
 }
 
+# Since the same cc-wrapper derivation can be depend on in multiple ways, we
+# need to accumulate *each* role (i.e. target platform relative the depending
+# derivation) in which the cc-wrapper derivation is used.
+# `NIX_CC_WRAPPER_@infixSalt@_TARGET_*` tracks this (needs to be an exported env
+# var so can't use fancier data structures).
+#
+# We also need to worry about what role is being added on *this* invocation of
+# setup-hook, which `role` tracks.
+if [ -n "${crossConfig:-}" ]; then
+    export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1
+    role="BUILD_"
+else
+    export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1
+    role=""
+fi
+
+# Eventually the exact sort of env-hook we create will depend on the role. This
+# is because based on what relative platform we are targeting, we use different
+# dependencies.
 envHooks+=(ccWrapper_addCVars)
 
 # Note 1: these come *after* $out in the PATH (see setup.sh).
@@ -41,16 +131,12 @@ if [ -n "@coreutils_bin@" ]; then
     addToSearchPath _PATH @coreutils_bin@/bin
 fi
 
-if [ -z "${crossConfig:-}" ]; then
-    ENV_PREFIX=""
-else
-    ENV_PREFIX="BUILD_"
-fi
+# Export tool environment variables so various build systems use the right ones.
 
-export NIX_${ENV_PREFIX}CC=@out@
+export NIX_${role}CC=@out@
 
-export ${ENV_PREFIX}CC=@named_cc@
-export ${ENV_PREFIX}CXX=@named_cxx@
+export ${role}CC=@named_cc@
+export ${role}CXX=@named_cxx@
 
 for CMD in \
     cpp \
@@ -59,9 +145,9 @@ do
     if
         PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null
     then
-        export "${ENV_PREFIX}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}";
+        export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}";
     fi
 done
 
-# No local scope available for sourced files
-unset ENV_PREFIX
+# No local scope in sourced file
+unset role
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index dc3369f6611..81ed1c635e1 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -336,8 +336,20 @@ fi
 
 # Set the relevant environment variables to point to the build inputs
 # found above.
+#
+# These `depOffset`s tell the env hook what sort of dependency
+# (ignoring propagatedness) is being passed to the env hook. In a real
+# language, we'd append a closure with this information to the
+# relevant env hook array, but bash doesn't have closures, so it's
+# easier to just pass this in.
+
 _addToNativeEnv() {
     local pkg="$1"
+    if [[ -n "${crossConfig:-}" ]]; then
+        local -i depOffset=-1
+    else
+        local -i depOffset=0
+    fi
 
     # Run the package-specific hooks set by the setup-hook scripts.
     runHook envHook "$pkg"
@@ -349,6 +361,7 @@ done
 
 _addToCrossEnv() {
     local pkg="$1"
+    local -i depOffset=0
 
     # Run the package-specific hooks set by the setup-hook scripts.
     runHook crossEnvHook "$pkg"

From a8bd415fa06a100b29297db86aadb6f00da70bbf Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 3 Aug 2017 11:29:15 -0400
Subject: [PATCH 1644/3246] unzip: cc-wrapper has been fixed so don't need to
 be so clever

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

diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index a35e473ec36..7c4bb988b62 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
 
   makefile = "unix/Makefile";
 
-  ${"NIX_${stdenv.cc.infixSalt_}LDFLAGS"} = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec";
+  NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec";
 
   buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2";
 

From 2493454e13c25ff990d06deb38b1024e4a0a99f8 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 3 Aug 2017 15:34:23 -0400
Subject: [PATCH 1645/3246] cc-wrapper: Use `set -u` throughout

Now is an opportune time to do this, as the infixSalt conversion in
`add-flags.sh` ensures that all the relevant `NIX_*` vars will be
defined even if empty.
---
 .../build-support/cc-wrapper/add-hardening.sh | 40 ++++++++++---------
 pkgs/build-support/cc-wrapper/cc-wrapper.sh   | 21 +++++-----
 pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 17 ++++----
 .../cc-wrapper/gnatlink-wrapper.sh            |  7 +++-
 pkgs/build-support/cc-wrapper/ld-wrapper.sh   | 31 ++++++++------
 pkgs/build-support/cc-wrapper/utils.sh        |  2 +-
 6 files changed, 68 insertions(+), 50 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index c91ff0a9d0b..aa8eb720486 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -1,67 +1,69 @@
 hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow)
-# Intentionally word-split in case 'hardeningEnable' is defined in Nix.
-hardeningFlags+=(${hardeningEnable[@]})
+# Intentionally word-split in case 'hardeningEnable' is defined in
+# Nix. Also, our bootstrap tools version of bash is old enough that
+# undefined arrays trip `set -u`.
+if [[ -v hardeningEnable[@] ]]; then
+  hardeningFlags+=(${hardeningEnable[@]})
+fi
 hardeningCFlags=()
 hardeningLDFlags=()
 
 declare -A hardeningDisableMap
 
-# Intentionally word-split in case 'hardeningDisable' is defined in Nix. The
-# array expansion also prevents undefined variables from causing trouble with
-# `set -u`.
-for flag in ${hardeningDisable[@]} @hardening_unsupported_flags@
+# Intentionally word-split in case 'hardeningDisable' is defined in Nix.
+for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@
 do
   hardeningDisableMap[$flag]=1
 done
 
-if [[ -n "$NIX_DEBUG" ]]; then
+if [[ -n "${NIX_DEBUG:-}" ]]; then
   printf 'HARDENING: disabled flags:' >&2
   (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2
   echo >&2
 fi
 
-if [[ -z "${hardeningDisableMap[all]}" ]]; then
-  if [[ -n "$NIX_DEBUG" ]]; then
+if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
+  if [[ -n "${NIX_DEBUG:-}" ]]; then
     echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2;
   fi
   for flag in "${hardeningFlags[@]}"
   do
-    if [[ -z "${hardeningDisableMap[$flag]}" ]]; then
+    if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then
       case $flag in
         fortify)
-          if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling fortify >&2; fi
+          if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling fortify >&2; fi
           hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2')
           ;;
         stackprotector)
-          if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling stackprotector >&2; fi
+          if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling stackprotector >&2; fi
           hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
           ;;
         pie)
-          if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi
+          if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling CFlags -fPIE >&2; fi
           hardeningCFlags+=('-fPIE')
           if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
-            if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi
+            if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi
             hardeningLDFlags+=('-pie')
           fi
           ;;
         pic)
-          if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling pic >&2; fi
+          if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling pic >&2; fi
           hardeningCFlags+=('-fPIC')
           ;;
         strictoverflow)
-          if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling strictoverflow >&2; fi
+          if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling strictoverflow >&2; fi
           hardeningCFlags+=('-fno-strict-overflow')
           ;;
         format)
-          if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling format >&2; fi
+          if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling format >&2; fi
           hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security')
           ;;
         relro)
-          if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling relro >&2; fi
+          if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling relro >&2; fi
           hardeningLDFlags+=('-z' 'relro')
           ;;
         bindnow)
-          if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling bindnow >&2; fi
+          if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling bindnow >&2; fi
           hardeningLDFlags+=('-z' 'now')
           ;;
         *)
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index ef9df4f968d..e5a3a581851 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -1,5 +1,5 @@
 #! @shell@
-set -e -o pipefail
+set -eu -o pipefail
 shopt -s nullglob
 
 path_backup="$PATH"
@@ -11,12 +11,12 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then
     PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
 fi
 
-if [ -n "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" ]; then
-    source "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK"
+if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
+    source @out@/nix-support/add-flags.sh
 fi
 
-if [ -z "$NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET" ]; then
-    source @out@/nix-support/add-flags.sh
+if [ -n "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" ]; then
+    source "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK"
 fi
 
 source @out@/nix-support/utils.sh
@@ -36,7 +36,7 @@ declare -i n=0
 nParams=${#params[@]}
 while [ "$n" -lt "$nParams" ]; do
     p=${params[n]}
-    p2=${params[n+1]}
+    p2=${params[n+1]:-} # handle `p` being last one
     if [ "$p" = -c ]; then
         dontLink=1
     elif [ "$p" = -S ]; then
@@ -79,13 +79,13 @@ if [ "$nonFlagArgs" = 0 ]; then
 fi
 
 # Optionally filter out paths not refering to the store.
-if [[ "$NIX_ENFORCE_PURITY" = 1 && -n "$NIX_STORE" ]]; then
+if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then
     rest=()
     nParams=${#params[@]}
     declare -i n=0
     while [ "$n" -lt "$nParams" ]; do
         p=${params[n]}
-        p2=${params[n+1]}
+        p2=${params[n+1]:-} # handle `p` being last one
         if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
             skip "${p:2}"
         elif [ "$p" = -L ] && badPath "$p2"; then
@@ -162,13 +162,15 @@ if [ "$*" = -v ]; then
 fi
 
 # Optionally print debug info.
-if [ -n "$NIX_DEBUG" ]; then
+if [ -n "${NIX_DEBUG:-}" ]; then
+    set +u # Old bash workaround, see ld-wrapper for explanation.
     echo "extra flags before to @prog@:" >&2
     printf "  %q\n" "${extraBefore[@]}"  >&2
     echo "original flags to @prog@:" >&2
     printf "  %q\n" "${params[@]}" >&2
     echo "extra flags after to @prog@:" >&2
     printf "  %q\n" "${extraAfter[@]}" >&2
+    set -u
 fi
 
 if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
@@ -176,4 +178,5 @@ if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
 fi
 
 PATH="$path_backup"
+set +u # Old bash workaround, see above.
 exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index 33272ba5345..1a09f484109 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -1,7 +1,10 @@
 #! @shell@
-set -e -o pipefail
+set -eu -o pipefail
 shopt -s nullglob
 
+# N.B. Gnat is not used during bootstrapping, so we don't need to
+# worry about the old bash empty array `set -u` workarounds.
+
 path_backup="$PATH"
 
 # phase separation makes this look useless
@@ -10,12 +13,12 @@ if [ -n "@coreutils_bin@" ]; then
     PATH="@coreutils_bin@/bin"
 fi
 
-if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" ]; then
-    source "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK"
+if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then
+    source @out@/nix-support/add-flags.sh
 fi
 
-if [ -z "$NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET" ]; then
-    source @out@/nix-support/add-flags.sh
+if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" ]; then
+    source "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK"
 fi
 
 source @out@/nix-support/utils.sh
@@ -52,7 +55,7 @@ fi
 
 # Optionally filter out paths not refering to the store.
 params=("$@")
-if [[ "$NIX_ENFORCE_PURITY" = 1 && -n "$NIX_STORE" ]]; then
+if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then
     rest=()
     for p in "${params[@]}"; do
         if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
@@ -110,7 +113,7 @@ fi
 #fi
 
 # Optionally print debug info.
-if [ -n "$NIX_DEBUG" ]; then
+if [ -n "${NIX_DEBUG:-}" ]; then
     echo "extra flags before to @prog@:" >&2
     printf "  %q\n" "${extraBefore[@]}"  >&2
     echo "original flags to @prog@:" >&2
diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
index c8493302852..ee973d3270f 100644
--- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
@@ -1,7 +1,10 @@
 #! @shell@
-set -e -o pipefail
+set -eu -o pipefail
 shopt -s nullglob
 
+# N.B. Gnat is not used during bootstrapping, so we don't need to
+# worry about the old bash empty array `set -u` workarounds.
+
 # Add the flags for the GNAT compiler proper.
 extraAfter=("--GCC=@out@/bin/gcc")
 extraBefore=()
@@ -21,7 +24,7 @@ extraBefore=()
 #export NIX_@infixSalt@_LDFLAGS_SET=1
 
 # Optionally print debug info.
-if [ -n "$NIX_DEBUG" ]; then
+if [ -n "${NIX_DEBUG:-}" ]; then
     echo "extra flags before to @prog@:" >&2
     printf "  %q\n" "${extraBefore[@]}"  >&2
     echo "original flags to @prog@:" >&2
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index fa8875e00b6..e47a6bfec86 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -10,12 +10,12 @@ if [ -n "@coreutils_bin@" ]; then
     PATH="@coreutils_bin@/bin"
 fi
 
-if [ -n "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" ]; then
-    source "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK"
+if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
+    source @out@/nix-support/add-flags.sh
 fi
 
-if [ -z "$NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET" ]; then
-    source @out@/nix-support/add-flags.sh
+if [ -n "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" ]; then
+    source "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK"
 fi
 
 source @out@/nix-support/utils.sh
@@ -23,14 +23,14 @@ source @out@/nix-support/utils.sh
 
 # Optionally filter out paths not refering to the store.
 expandResponseParams "$@"
-if [[ "$NIX_ENFORCE_PURITY" = 1 && -n "$NIX_STORE"
-        && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "$NIX_@infixSalt@_LDFLAGS_SET" ) ]]; then
+if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE"
+        && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ) ]]; then
     rest=()
     nParams=${#params[@]}
     declare -i n=0
     while [ "$n" -lt "$nParams" ]; do
         p=${params[n]}
-        p2=${params[n+1]}
+        p2=${params[n+1]:-} # handle `p` being last one
         if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
             skip "${p:2}"
         elif [ "$p" = -L ] && badPath "$p2"; then
@@ -59,7 +59,7 @@ source @out@/nix-support/add-hardening.sh
 extraAfter=("${hardeningLDFlags[@]}")
 extraBefore=()
 
-if [ -z "$NIX_@infixSalt@_LDFLAGS_SET" ]; then
+if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then
     extraAfter+=($NIX_@infixSalt@_LDFLAGS)
     extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE)
 fi
@@ -73,7 +73,11 @@ relocatable=
 # Find all -L... switches for rpath, and relocatable flags for build id.
 if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then
     prev=
+    # Old bash thinks empty arrays are undefined, ugh, so temporarily disable
+    # `set -u`.
+    set +u
     for p in "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"; do
+        set -u
         case "$prev" in
             -L)
                 libDirs+=("$p")
@@ -119,7 +123,7 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
         if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then
             dir="$dir2"
         fi
-        if [ "${rpaths[$dir]}" ] || [[ "$dir" != "$NIX_STORE"/* ]]; then
+        if [ -n "${rpaths[$dir]:-}" ] || [[ "$dir" != "$NIX_STORE"/* ]]; then
             # If the path is not in the store, don't add it to the rpath.
             # This typically happens for libraries in /tmp that are later
             # copied to $out/lib.  If not, we're screwed.
@@ -127,9 +131,9 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
         fi
         for path in "$dir"/lib*.so; do
             file="${path##*/}"
-            if [ "${libs[$file]}" ]; then
+            if [ "${libs[$file]:-}" ]; then
                 libs["$file"]=
-                if [ ! "${rpaths[$dir]}" ]; then
+                if [ -z "${rpaths[$dir]:-}" ]; then
                     rpaths["$dir"]=1
                     extraAfter+=(-rpath "$dir")
                 fi
@@ -147,13 +151,15 @@ fi
 
 
 # Optionally print debug info.
-if [ -n "$NIX_DEBUG" ]; then
+if [ -n "${NIX_DEBUG:-}" ]; then
+    set +u # Old bash workaround, see above.
     echo "extra flags before to @prog@:" >&2
     printf "  %q\n" "${extraBefore[@]}"  >&2
     echo "original flags to @prog@:" >&2
     printf "  %q\n" "${params[@]}" >&2
     echo "extra flags after to @prog@:" >&2
     printf "  %q\n" "${extraAfter[@]}" >&2
+    set -u
 fi
 
 if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
@@ -161,4 +167,5 @@ if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
 fi
 
 PATH="$path_backup"
+set +u # Old bash workaround, see above.
 exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 267044b2c4f..5a70c2d9ccf 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -1,5 +1,5 @@
 skip () {
-    if [ -n "$NIX_DEBUG" ]; then
+    if [ -n "${NIX_DEBUG:-}" ]; then
         echo "skipping impure path $1" >&2
     fi
 }

From dc21f1ad65a8c0bcaed70771de33c26f5586ad0e Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 7 Aug 2017 10:12:21 +0300
Subject: [PATCH 1646/3246] linux: BFQ Group Scheduling support

---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index df18c60130d..c15839f7dfe 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -558,6 +558,7 @@ with stdenv.lib;
   ''}
 
   ${optionalString (versionAtLeast version "4.12") ''
+    BFQ_GROUP_IOSCHED y
     IOSCHED_BFQ m
     MQ_IOSCHED_KYBER y
   ''}

From cc7777f5f81c33b8f9c2eea37a6f86ffb415ef3e Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 7 Aug 2017 10:37:11 +0200
Subject: [PATCH 1647/3246] ponyc: 0.16.1 -> 0.17.0

https://github.com/ponylang/ponyc/issues/2135
---
 pkgs/development/compilers/ponyc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index c3d9d988207..ab7881a2151 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.16.1";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "175yivc5vjwfdcqcpkdqmdfy72pn4k62n4j3qagfbwya7frq2car";
+    sha256 = "06g811x7vc275ypn3laqcsq7lmp2w8al6ipkpknhpq9c6lf7dvcp";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From 0053bf6d472475cdd924e1edc606639472bc34f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 4 Aug 2017 18:50:23 +0200
Subject: [PATCH 1648/3246] QT5.6: Fixes compile error with wrong LD env
 variable

QT uses -Wl linker flags and these flags only work with gcc/g++
and not with LD directly.
---
 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
index 4e7c7ea5456..c8fa628d1ea 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -103,6 +103,8 @@ stdenv.mkDerivation {
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
+    # We need to set LD to CXX or otherwise we get nasty compile errors
+    export LD=$CXX
 
     configureFlags+="\
         -plugindir $out/$qtPluginPrefix \

From 71203503f9c3b69ae75b1c612d9e4665f9b37b5e Mon Sep 17 00:00:00 2001
From: moesasji <miyamoto.31b@gmail.com>
Date: Mon, 7 Aug 2017 09:36:05 +0100
Subject: [PATCH 1649/3246] xfce4-session: fix lock screen not working with
 light-locker

---
 pkgs/desktops/xfce/core/xfce4-light-locker.patch | 16 ++++++++++++++++
 pkgs/desktops/xfce/core/xfce4-session.nix        |  5 +++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/desktops/xfce/core/xfce4-light-locker.patch

diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/pkgs/desktops/xfce/core/xfce4-light-locker.patch
new file mode 100644
index 00000000000..4e1dcc1efa7
--- /dev/null
+++ b/pkgs/desktops/xfce/core/xfce4-light-locker.patch
@@ -0,0 +1,16 @@
+--- ./scripts/xflock4.orig	2017-08-06 23:05:53.807688995 +0100
++++ ./scripts/xflock4	2017-08-06 23:09:06.171789989 +0100
+@@ -24,10 +24,11 @@
+ PATH=/bin:/usr/bin
+ export PATH
+
+-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
++# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective daemon is running
+ for lock_cmd in \
+     "xscreensaver-command -lock" \
+-    "gnome-screensaver-command --lock"
++    "gnome-screensaver-command --lock" \
++    "light-locker-command -l"
+ do
+     $lock_cmd >/dev/null 2>&1 && exit
+ done
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix
index a0568b0dd39..edc810d3897 100644
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
     sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd";
   };
 
+  patches = [
+    # Fix "lock screen" not working for light-locker
+    ./xfce4-light-locker.patch
+  ];
+
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
       xfconf xfce4panel libglade xorg.iceauth xorg.libSM

From 22ba421a0801f5e11ca53c5e57c113f2dd07223e Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 7 Aug 2017 06:37:11 -0300
Subject: [PATCH 1650/3246] adapta-gtk-theme: 3.90.0.125 -> 3.91.1.47

---
 pkgs/misc/themes/adapta/default.nix | 46 ++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index e62707afb7c..acce5ccac21 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -1,31 +1,49 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.90.0.125";
-
-  meta = with stdenv.lib; {
-    description = "An adaptive GTK+ theme based on Material Design";
-    homepage = https://github.com/tista500/Adapta;
-    license = with licenses; [ gpl2 cc-by-sa-30 ];
-    platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
-  };
+  version = "3.91.1.47";
 
   src = fetchFromGitHub {
     owner = "tista500";
     repo = "Adapta";
     rev = version;
-    sha256 = "0abww5rcbn478w2kdhjlf68bfj8yf8i02nlmrjpp7j1v14r32xr0";
+    sha256 = "1w41xwhb93p999g0835cmlax55a5fyz9j4m5nn6nss2d6g6nrxap";
   };
 
   preferLocalBuild = true;
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig parallel sassc inkscape libxml2 glib.dev ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+    parallel
+    sassc
+    inkscape
+    libxml2
+    glib.dev
+    gnome3.gnome_shell
+  ];
 
-  buildInputs = [ gdk_pixbuf librsvg gtk-engine-murrine ];
+  buildInputs = [
+    gdk_pixbuf
+    librsvg
+    gtk-engine-murrine
+  ];
 
   postPatch = "patchShebangs .";
 
-  configureFlags = "--disable-unity";
+  configureFlags = [
+    "--disable-gtk_legacy"
+    "--disable-gtk_next"
+    "--disable-unity"
+    "--disable-parallel" # parallel build is not finishing
+  ];
+
+  meta = with stdenv.lib; {
+    description = "An adaptive Gtk+ theme based on Material Design";
+    homepage = https://github.com/tista500/Adapta;
+    license = with licenses; [ gpl2 cc-by-sa-30 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
 }

From a0a4bea2a6a5ccf4c367e7f71df824c44b2d547b Mon Sep 17 00:00:00 2001
From: Alexander Gall <alexander.gall@gmail.com>
Date: Mon, 7 Aug 2017 12:27:55 +0200
Subject: [PATCH 1651/3246] nixos/cloud-image: add module

The module creates an image for an openstack-based cloud using the
cloud-init package.
---
 nixos/modules/virtualisation/cloud-image.nix | 44 ++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 nixos/modules/virtualisation/cloud-image.nix

diff --git a/nixos/modules/virtualisation/cloud-image.nix b/nixos/modules/virtualisation/cloud-image.nix
new file mode 100644
index 00000000000..0f0141abfb1
--- /dev/null
+++ b/nixos/modules/virtualisation/cloud-image.nix
@@ -0,0 +1,44 @@
+# Usage:
+# $ NIX_PATH=`pwd`:nixos-config=`pwd`/nixpkgs/nixos/modules/virtualisation/cloud-image.nix nix-build '<nixpkgs/nixos>' -A config.system.build.cloudImage
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  system.build.cloudImage = import ../../lib/make-disk-image.nix {
+    inherit pkgs lib config;
+    partitioned = true;
+    diskSize = 1 * 1024;
+    configFile = pkgs.writeText "configuration.nix"
+      ''
+        { config, lib, pkgs, ... }:
+
+        with lib;
+
+        {
+          imports = [ <nixpkgs/nixos/modules/virtualisation/cloud-image.nix> ];
+        }
+      '';
+  };
+
+  imports = [ ../profiles/qemu-guest.nix ];
+
+  fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+  boot = {
+    kernelParams = [ "console=ttyS0" ];
+    loader.grub.device = "/dev/vda";
+    loader.timeout = 0;
+  };
+
+  networking.hostName = mkDefault "";
+
+  services.openssh = {
+    enable = true;
+    permitRootLogin = "without-password";
+    passwordAuthentication = mkDefault false;
+  };
+
+  services.cloud-init.enable = true;
+}

From 311a7ca32902639fc9756b950653ebdc4d48f656 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 7 Aug 2017 21:12:44 +0900
Subject: [PATCH 1652/3246] firefox-bin: 54.0.1 -> 55.0

---
 .../browsers/firefox-bin/release_sources.nix  | 764 +++++++++---------
 1 file changed, 387 insertions(+), 377 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 33591b5365a..5a34d305af7 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,945 +1,955 @@
 {
-  version = "54.0.1";
+  version = "55.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ach/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ach/firefox-55.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "60057e48d8bda98dc63597aa795899ca1fa856f8a9f9380a8de91d0ca0641dd291a3fb27bd1f69b1effebc5288575c0a0661199e8e8e95ef8d924fad25831678";
+      sha512 = "0ce9a2852a86553f96018e8873e966996f5386204065200f0b24dd0b939aa815efda0fde06133974d79ae4f944c5a77ef4d91929baddc6d72a5a457203ef7784";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/af/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/af/firefox-55.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "08a2cb7ee7bfdd4a5c205a38e1d966bbf8c67a3a5abf52bdfc73dcb527cf0dbe361bec4996d52e33321180f5c1778e8304f1b377bce04e62fca7457df8ee69b5";
+      sha512 = "97c01c8794e2ffe0cc25e6352ba4c6155ea1e1dfc8bcec669036ffda1aec943326ac38c43eb8260a55d46a264858144bdf0cceb9912c4f2d0d373d4d0d4256b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/an/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/an/firefox-55.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "200f10de4f714afb10a9c6d1b4ac8488d5bdc18673b8db9aae51b8d0e8b14fc3f5f6211447abd10e13704b07499fc1a273d9ee060329d8337cc413d7ed6d19b3";
+      sha512 = "f30070803ac80d00e4fb248f0c1e871b51bb4c78f8c3b12923d6b96c9686ea22768aeb9204da880647893524aa68e44576be4092d44a6b189b5cf01f493f9c82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ar/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ar/firefox-55.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "564c72c485c593342c7056bec7dfa7a0cafbfb26eff278e08b0938194b311633b3e3275fd0eeaabc63eace36712efb194ecb700f61957bf0553b79a71977132f";
+      sha512 = "213d73338a3087f925a5137432e84f1c0f881d37c33c109d9ab6e2744556341697e56c7efcd7f4d5011cdb6fec03de072afbf14c34a30770456f71c8971d4b6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/as/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/as/firefox-55.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "84d14f6152bbc17caaf4ac8d421835032da45dfbb34dd198ea5ec65d972e10a774aeba830eba5256933f3df395b5aef71aede2e334fb35aee8f9f27771d65dce";
+      sha512 = "1d33b5602db1a326be0ac9ed726e38b5e871904685e6586211caf6b330417d33c717399663d94d725d4f8784591c5b7eaf4b4ecb867b8d99e2c85671b31f5877";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ast/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ast/firefox-55.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "f5851e28972b5e87b48e8498a01c685790e4ace5e3d0f4c286953d6fe417495a9fb26ca3bd962d1f798a178115d2bb60367c48057c55b2e601dcf208ad146cb4";
+      sha512 = "93a08c86dac4a81fee72cd4c35f39f578222ef11e28e503851c9a7ad7cffec3e3324c32374ed851094b8ae91c642a2d726b98cade60fb4511a935320ba790faa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/az/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/az/firefox-55.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "6ed4bb73da6362ed4598d5c6de8b072e919894778ecdec49b2e8e406d0c68b88c32f0b208a546834cba7ebbbee9a09595a67473e29a5c11bc2390d3a1721aa42";
+      sha512 = "4661628ea83c2101481bf08c1484952a30c27b9cd1d169bacd96fb6416ef77321e7e606e989521189c5135c63b2b82b7fbd3e85d0f50919f6c9c277176aa34df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bg/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/be/firefox-55.0.tar.bz2";
+      locale = "be";
+      arch = "linux-x86_64";
+      sha512 = "7062919a385600ed74972b1851ab7bd20a46003c37e058b93cf8fdb853ebb890b173aa6cc572d2f51661b571d3efbc189d04abff4dbbd9e93398ad5a55015e7f";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bg/firefox-55.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "bbcd618c9bf86c7ee49a3ee1a3aa799c72ffb048d694ba0e97ca8c4a9341d1ee109265529aeb23f578aaf66d34ef3a81a7031033421933c0f6d5d0ce136c3d68";
+      sha512 = "d58389193c33aa24aac09ad286b83f0f808116f20907506d2d37a3cc45ae43223784fc12face495cbba34be24358584e38add83048b477a27a93f8934c86c82e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-BD/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bn-BD/firefox-55.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "9c3114291cac3b6df9bb92b398ed644f4851baaf99b6db9959e5fa841dd535da39cd3aae343226ae5fd713ab872efb4d4902f4a4f85e836372c67a416134c03c";
+      sha512 = "9d552eec9497565bcd71faba474338e97465d1902280972a04f4f7e5fae88cdeac144b12fd1bc80d079b8c16b0c7e5a4dd5da6e56486e688820653cff35ae517";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-IN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bn-IN/firefox-55.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "5662dc48972153cc67034b148d96e120c802ade4d7ef532fb2964f8ffcbec30878489c81d758e729135488d39123bd404ab53e1ae1389b0c4e22303096c7e3cb";
+      sha512 = "4f150944cc42c829fc619e3a20fbca9f5116180b5c2e160d48c8b9f42325898847abbc0bb0724343527e97cbb74b7286dd8b7901c0ee9ce83559198994486505";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/br/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/br/firefox-55.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "166dca485d947bb42b1b5ac9781d48104d876f952cd8ceb4006f7e0f79773aa2f285413088cc535610e6209538c03bbeb63f91255712466a50a12cddf747f0bd";
+      sha512 = "18f0d851b249c7bb8979499b146756efbad587ce48ded72a58bbfa2dd1fe951d5ee6d1188f6e659c760aa4e60095b481921feb016e69f78e439de18f7ecc0bcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bs/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bs/firefox-55.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "81226d4550310d61d2198298bbc859406ee7f14e98ccab326b83bd51c8c33305771e9353d0609477eb381083f1e0f1a8bc0c0bbd085a738cfe00697877051516";
+      sha512 = "b0b838026b932d558ff3af52bca708e3f60929c2928c17c956b1d4f2e023edd45d98d65b7ea268c2ae04299944d26cf19d9a9deecabfe447c8548cd8afe98b28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ca/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ca/firefox-55.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "833096d35ca517d21b45e78d895bd4f535a55fff7a9990e22c684fba8549d2207317a715e2a42b7ecebf1ab474df262f2c25c9e44863cf167dad70f191ad39c5";
+      sha512 = "fd700550d5983f53d80330d08754c84e7683f965316f738e9ca5d45176d7fd42ec57a02aaef3e82358d8c7913cce9284e04299d32cac443063184c41e5c7b0a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cak/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cak/firefox-55.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "5b05bf2b0a256e135e7d687520b901caaedd66593ca3cb458c01f8ddf85149144f75c24f8b0fd4bbe2d9cbeafedbb569f080970601c40895db96e7a14aa3c5d4";
+      sha512 = "4cfc69ef47fee1a8a2127be92cef59d2dfb40c99ac172eb78de978e7cd7aced093a7c1da91fdf518a0c9b23a81f393919c44c353b52fcb71b53b41ffe88fa22f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cs/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cs/firefox-55.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "63ea3c524c3e91504fe1b0d5cd1b74fbfe9b22cbfb18d9aec73569452a2766b90f29e2793f6bd235d68854d16b8862f46bf3ead132cd693866bd70502e0b8b39";
+      sha512 = "33c912c591e8856bad1130281db996c82df28fff10d7f7031ababeb7acd385df6ef14165c491b48edd285cd8086071dbf41e3448431f028364d62810b3fe4a34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cy/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cy/firefox-55.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "c804908472ab1a59b6a24e448b9bf37ded669dbf2d0a4fe0993ff2dba666e804b0fb846efe6c7f1923e4472a3735f9f33876dc015826b03790f4c445ab6215e5";
+      sha512 = "5cdc13b0317d7b0998c534a92e094374ffedea9f430e0f27c97b972985ca050abb7ddecff60f87ccc0d6c240db453b335fba12eec3e8448f0f830b402dfa6171";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/da/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/da/firefox-55.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "c289354eb5443b9f5e3027e80974af9aa9a5da045034ee147cf75d52de16a1e35328027fdcde149f2ef1d3a72213e3837668fdab4b610949b36e180aaa1dac56";
+      sha512 = "c0cfc7e4a398d5004c1a3f1afb3ee5c32502e7929cd7ff7cbdced2f9104452a6754db8c22764cdaa90885698cdf40379016f866595f98adf1498f48576a1fc86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/de/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/de/firefox-55.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "99f214b83822243530a8194edbf50284bb703ba07695c1c5f7bd3cfe87fce64477806cbff852af92ad6eef16c85329c1b04608490fda12bac27300daef23778a";
+      sha512 = "544e6069c5f2c92b80f804d105d4a198ca360415701d9a9ebb08044cd877a2e0793b03381bdab55e31649b021a1343647ae8f21844915096347fdc2e8280ed45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/dsb/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/dsb/firefox-55.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "96682d6d27e4d2c57930059a6cabe2649d4a52e006eddcfd4f940ed816f448e3d476488ab23de6a1106c66007268aaaea21ce3f621ce7e21aabca1ec00a5f0bd";
+      sha512 = "53e7bbac4a479e06a14dc91313b66f28c5731b88faea2254c0e72e40ef4eb772c61bf494557474f03e1b52d3d85f8cfd2785085b4d7324907107080342899a56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/el/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/el/firefox-55.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "122c72046a3cc621da62432fbaea9ef690a5e1930e8ca3214333fd05cc397419eeb8e7f46e7998fd12f2fa17fa780d7a0df0cebd50ab81a677a363855f4dd818";
+      sha512 = "304085e04c30b73476ffc84da692d9e08c3edfebb31e7e9777afa7a1e12ee0d15c5d9bc4124edade6701833de02813c0549d8a731a58e824b00e483f4965f49c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-GB/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-GB/firefox-55.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "bfcde5aefcfbbf6021f6c3085f27a5c9b88cb11b33a132d0a05c6b6f39a32aae8e140b3e73d2e09d6719d00fbb9c9998a27cd6897bb7e2e5c01f37190522320f";
+      sha512 = "237cc95b7c83b2e76627fcd2f417d21868d62398dd5477bcb9355bc0c73f53e9e595e95bf9de0597c15f7eec836aa9e3f9b1fab29309599cd4ec1c7b69b938d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-US/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-US/firefox-55.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "59416ec212626d225db0f12037eb68c98f564252c5f62743ec884af259d705a9310d9758bfd37bfb33c792eebb37d07824a197aff1261aa0496896482f6539cb";
+      sha512 = "1d86223b3f56266eb83307e92c4d39c0d765b94015b089bef8eec5730e0a8e4aeb7cd06e4cbd43b445ac4d24cccabebfae02f003b791d1be03dbec3c9a46c9ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-ZA/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-ZA/firefox-55.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "a03e96de441a3f390c96b1bf2484dde6d423fe1f0b9d7e518d8d6d99a6e61d6e44dca2cdd212a74f935c8e94aee00c3bd48b7fba9624ff17cfbcceea70802637";
+      sha512 = "8411248503638d44933c38bc105874befc160e90f2323764c7bc02667c634456c7c79cc8a7931e10ccdbaf4e20e3b2d5098b9b87ec63f75ffa56b6c62aa5b746";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eo/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/eo/firefox-55.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "e54744f4d412f2db9f78f518479cd457953f9a29c6ce0fd32aead8c04951337b72c6fb149c0d90ec3dd1e93bb6dbfff57d46c29dd526e1b9c406a3018677a65e";
+      sha512 = "fe376d69e5a8100e3ae70036d875019b04ff2c8d62d7caf32adf528fa90f78a0d16c986b7077c61c38be5331f3413777028a853681b090d42bb3e09475a5b5ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-AR/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-AR/firefox-55.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "d9d3cdd8c38605f0738ff95f5f2cd2188f1058709fc63f21d06c14f6e593150918b793c8f3c291c8d208afb398efbfc7ffc2509f5f47091abcb804fc7b47df5d";
+      sha512 = "7ee72d922075b528dbef56bcf784690bb54582094a113c9ff0dec0f8ef64ec214f2ee16e930f8ba7963c4bffb4a8d5fd23e5cd76ad8557d70b1632a6124ca6f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-CL/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-CL/firefox-55.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "ceaa8bc10238996fdbc0552e4eda3edbfbb5e89b70166393e638cf4267d8077df0179213e1e692cb5798e6fb77f590f151535d2e40b4c278cccee9df8a776057";
+      sha512 = "d03c2d4fb96b2d64c263fea62ac3cd643648baeadc4091238fff87cbc2fc37cad3069e1e4fe949a4ff7162fedc85dfaeafe49326aa5de780c96a0160e91ee9f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-ES/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-ES/firefox-55.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "a75745381f0ff97fb298923a6c2c83a734ae1ab7b873e22e9d840cd5854ab8af01269214b844d0fbe1cb1ae4cd083c2c4e02779088280e82310535d9359a83de";
+      sha512 = "6893e72c09cea00bf2b7e05f0e170e97967868675d8d9752c18bae61a5f147b60db5ef165138a3355b0221515838d526b14f09cc1f99ee893b7c9cfc618ddfe0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-MX/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-MX/firefox-55.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "381ae266297cfc6fd0d05785b2a6c945da20d368754521cf358ae4c4e7dda3a473086bf9a2679716f2b15b01413574ed413fd7f610a795a3536baadaabc926d4";
+      sha512 = "ba8469977b4f61df8165b09d333fa6ffb718d7e3710f62a459bd0da3a80a63b947ef1cac26704b5c4e9f4eb2380b2047e500fae372a82808cc7e5fa4ab9b0e62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/et/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/et/firefox-55.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "7c0151ada40b55e96ea2c36a98ef6de954287e2ee808e0387080816fec1329313e0e8ae5b613300c806c17f6b31752443e7f1f4ca6782b96826af23d3173abe7";
+      sha512 = "07f6ac8fab7a73fde5c607b31be1630fc2c01778808259f0f1472ad3bde56dfcdbaa584de0f9fe1fba6a540fbea6709d124daf64bdd89f755ae98884c971cfc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eu/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/eu/firefox-55.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "a080119cbd5c60499c7e9fcd55275f37d771ac4a352ef48088352b59bf86858b3cf70a5f6ef5b1b0e9e90ad9058e548393e9739cbfadbce1eaa95b39240c0a76";
+      sha512 = "4f26a97eef55cb6cb4b236fb69dab897b9263ace1de3ac9fca099118b7f96db41e5b8f1dc371e636715ab2aa078d2e5e76c88fb907234d7a206e8a96f8dc9a21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fa/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fa/firefox-55.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "aa537898df126eb699dd91146e579afceaa9283c15d7b4d436f2078363a7b9b7dd63e0278d197d8efe004ea81fb0401653395f8d7550da884d0af80c32baa981";
+      sha512 = "86a1accb6903fc0f2cf49cc86920e5e4b4a20a610c6a212864ae83e2bece1d818be515fcf9823bcb1c31ae748776514ce54fe6a1a57c728d1745d67c45856a66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ff/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ff/firefox-55.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "2998dcbead43b03d7e1b2cb9e6318aef185425de3401f89c875736fb124af2d126d482bdabb81535e5b5a46d68213574515d55410a6c6d9a60fe71afff64efe3";
+      sha512 = "b33df9a1488989cefb5bc849d44c5194c25874c679e48634673ccf8cd32cee3274b6417de6b58bdc45a68c58adbeb3e0fe36dffd9b0526b9c79a902cb7b5077c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fi/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fi/firefox-55.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "9ab8eeceb5f22e138550ef149cbd8c46e0c09bbf32e07ebc0b5abd3e5a460bf5f58608fa8e92401f68e915de7e83bfc592b5e3680f779a5b514fe4c71be56cfb";
+      sha512 = "c03b784f3d13078fdc760f07f5bdc2352e5e3ea2d8d49931f6ca6a9ce91b787d85624cb1f2d6bcb624cab6a3c018669c1f47443e2a32fc0472d2139623275885";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fr/firefox-55.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "bddc6e30f0d210009aa5d2d76ea15d9dd429c1b027f1d6104a51a69f364c8d9e985c33816daacaf2712c34c6743ea14197ea28934eb37340ccda21e2c3bfcf4f";
+      sha512 = "d9f0baca6f54ec4bd60c33ec87bc7bb307054c5214182ba7c14ddbfba6748e77f87914b6373d288f8514361dc2627ca75cba9bb97038f183787dca07ecc629a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fy-NL/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fy-NL/firefox-55.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "9fbc84c8aa485f55319138518eba1bd020870193432cafd0ed01e08663298ec29b21a571b808fcb90d73ed052554defb11796d1fb1dec016472ebb79afd78e17";
+      sha512 = "8452dfef5134afe2184cb8d2589d95fc75bb9bd487a2451fbbcb873f72b3612f7eb552772e4b9957060d506274d2655505838628d468efcc1b534697734466d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ga-IE/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ga-IE/firefox-55.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "4188f5c0eb666cccccb3e343cd3e4921bb168107e63727d67aa040b002f544724fba25a17d787cf8e1377f5947ba8fc124512e651ef3acf8157c072f5f02a4fa";
+      sha512 = "ca465448eb5ca014579e73c5e9aa09129f7ac3725f90e6ba8bc96f67ee74e5bf916050d968ed91d52b60cd8f291f5553bd66ab4373af6537c43fce4e8a526c5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gd/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gd/firefox-55.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "2e3407d0d1c22f4b451b1c56a871f94deee43d0d4aed22ad90dd0643dd75b7d512c58a6245b51dde6a19330ee154304e6b577b82f01869d222bf89fb8cd6b9b2";
+      sha512 = "c79b3c9c3970cc3eb8d0de8004479e1d6832d8b1c40640112e508ddc3db36a318f620c519a11914d5a103e01d8227016e4a57c41474aae346af15cdd5d5754e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gl/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gl/firefox-55.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "5fc10425d2f8bb1d53d2e5f9b9d65f0ffb01609c018a06b850195f01f8feb200e15ac36fb2e03031bc776453220fd2af200ce26a21c9a30eb4b4f54caaa6de34";
+      sha512 = "ed98aef69f2aa9de72508e6860935b4465777cf26252c4a4233a4809e1e5f91e44d737bfa13d2705bae2e0c250cd9b4a92711cb022d84c109dbcf61a47286a85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gn/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gn/firefox-55.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "92f46e7931cbc8a7d4786800838fa9f4af9baae2d8a4aecef82034a9875b8f16fc813781146dabd7c31ea1e0a3505bf3b2040ed305bee17a3dac9a00eb3560ff";
+      sha512 = "0c6eb876fa8ab4c0896d96cf87e52eb43f0ded62c93770ad3f59ed7c2e81bb7a231d4d698e83aead3f557e7c3443cb105860b2f98998804ae14e49c3ab3bafc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gu-IN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gu-IN/firefox-55.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e1e41c981d4f690c0b239917e06b1405a796e43d5ea419287cd353ee2bb0f8bbe04f0f7c94ea4b3a600e362577dfeefb12f286c311becbaef1ff840b20fd766b";
+      sha512 = "3a57b1adba2f9fe33f91ac645665ab8301b1adc5a22f2f1a04d1a3c3947c25499b9d14a3e00b8f147ecc2664a3ef5ee1c4f5b397283c5fad454dcde94c261932";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/he/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/he/firefox-55.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "11545bc832cec83171a00c7500a220fb64815e514cce017fb6e60e549e43472aff8914e19818401aca20730fd8d063a05051fd53ecaffc790b982ac9bd63463e";
+      sha512 = "46002542fa8baec217d26a1b246e2e2403cbe3af1a471da0fcb936c67e63bdf547577bb9655d1df414bfba8a16d2abd29954697dc967328f77678d08196ead3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hi-IN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hi-IN/firefox-55.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "63507d0994eb52893daedfa3fadcdc9ae1ca27608149d51132fda86616a45aaf4d114936fb6305ce12d75a9aa5ee5779db6def3866a8037c18e055734b0ddda6";
+      sha512 = "c905d2044a685dda24288c3729261f58e1d896c71a8d437471dca5457676e9a77d2a112252f2482ffd744c08f6c8090541c53f8c27f85a609557603ddd114025";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hr/firefox-55.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "8274ba4fd8bb881bbb788cd402a3fa49cdbec8d777e003c63dd425ba8693fd8e26a88533dc7c839f0bfbc47d16a72105e4099e67c0473e6b8c6aa29ce75a6b83";
+      sha512 = "f4a0084786f61e6586f0cf4f534c4402b66c82654d95db92fadadeb743766a976a4c349097633a536aad8f5dafb25127c4366ed002cdcf93f0a963ed431d827b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hsb/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hsb/firefox-55.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "c956043fdde6ff492a687447c01ab15e874756d6c249c7751d4255f99ad60b21bb898c1472eaea73c91a1467e6a6b239ff60a36333da1fee21bb3dc5d2da1a37";
+      sha512 = "d1366512fbb61a283f363a29ebf8e8570844ebe29bc0068a68837261181f44aca5e8fb5c3ade82d930b624e1ae7dc2cf30a0e6e0d830a60c529f6fa9d2bae1b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hu/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hu/firefox-55.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "28efaf842c1afd6ccd7882dd257ee9234015e641091c39c1b954d458a543fd9e0d6ac472d23953948fca69f5a62583b5120093f7186d1cc36a345adb166b4d17";
+      sha512 = "d76a3a892c22efa04e84ae9c66ee76494709b1185f8d1033fc3bffbe67e433607edd152277218501ca94d5cfc88f8e9de356176c7ac2204ceab18eddf51cac75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hy-AM/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hy-AM/firefox-55.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "2aba8bced1431caee4d9d70d515027e3d08a7175b1d28b9f743e63d25983a52a8934e7e3155a5b220d0cbfdd61c76438bde56ed2c29ff2eaa46afcef6db75117";
+      sha512 = "f771b69e18434a8f9a5fe5e381702e078e37c87c4bc1cc4e0fa30be0c46f3eaf36462e6d4dfc1e12d5896ac6a5597f5987477fb8aaa5a5a5f0648c92d159cbe8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/id/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/id/firefox-55.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "e2925f40f632aa14ba25bc40246a9c06b833062bf30d5e9666c87c22db436229f2b36730f6330a77fad58ec05a1589efd8353c2000cae45c7b322b32d1823559";
+      sha512 = "6fb40ff190d292d18da43a769aa679da1ed6510f185023ba08e749af46b4b0fecb3d305d9dface2ea1c2096bd8176add235daebcfde6bfae767407d57e040ba5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/is/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/is/firefox-55.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "0e56ab6054de54804a1f094f81c9180c58116e6786de47306f000e69f656e039aacd447d74f2119836c0f4d4d65e6841f94e527f8524ab7529461ab35b0e55c5";
+      sha512 = "47f51627d21b803477b237b8f3599cb02efe107687fc25ca14c82a7d1413a0b49f3f47cadd42a937e10142ec0db6e538f2fd17ec1fabbb868e0db45011ce1365";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/it/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/it/firefox-55.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "449bdbc26af56503bc1a480baa7a98d4de9f745e85c443d2d0726bed16a676f4ba8bcf738c94aab42d4e79c96f1dc9de7b1117d72a953bafa9bb24f87fcef25c";
+      sha512 = "5707b17aac678c28ebfef28b062799f4683c2f2192de7b305b8699ed788de54aead0012c1a41c999a2270a30e368dbf25d53bc887f5249279220ffcff143dab4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ja/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ja/firefox-55.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "47b417a6683be3329218c0b0894086acf588eb15a979e65f7102540d51e59b744878d2b5802036f5bc4534f8b253e26b6a947fa49a18e6f659122f2f193e18e4";
+      sha512 = "9290d777a33e434c587c19b5193a32c2130662c0c74917dc1c298b0f906aa3ccfd8631dfc3c396ec771efbddb254fe603ea9adf42524e72c9b607a7eaa81485f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ka/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ka/firefox-55.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "4796dacf4b8d180e0995b1b743d8d076d68c23031407f8d475107bc79c7773734e80c37d870c38f60de4115873fb872bbcf7e7862526aa5101c3b1a6d8e720f2";
+      sha512 = "4ffddb53f2f9ed891aa75ff92dee070fbed1570585bdd8d1517af6cb604fef9ef98e4efa0ff5672a911e2934e91b8e74ef808826b6f4a7c08ffba45bc1e2df1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kab/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kab/firefox-55.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "674b955f5f474c2d76efae044d1ff95069315447d370cad182e09b0a2b5360efaa1eeeb33e59adfc7754619538ec6acac661f61c805e04b94c5092999f68edd9";
+      sha512 = "6cf1f5f445a99a90bb509e9f962f63c3674d1f621c469b354044f2ecf30f756599d1c920b34e4665412694da7d6f85729608522b5f7e6c3c0b02ae23b0b12fc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kk/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kk/firefox-55.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "a647e65b76c203a42a8edd47c67b849877f2ea4cee467ee3203554cf02de5787b72cc245e4f83ba0bc8011b26bfc6991326c2593973b746cdb69762e35fcd5da";
+      sha512 = "0b5810e34c15a1152524e4a437399e627edce29bf9edad54cb4731f23ff3fe06fa94fd750f35398ee2577dbb0abf94d9f965c90520e1cc24bfcb97aa5bc2696d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/km/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/km/firefox-55.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "c644399b50b16ecc3b021fcd8325a18f7fe293155187d59ed99768756f9e493c51e54e5b77ab38485f4479b09af396355340ebb2e597cda9d9780532b7a5ebd4";
+      sha512 = "86ffecf5a046d4084bb991e527e3fa009dc4a228f4f9595fa594967652fa926ac3c126b9848002b856b9c7a0295d757311b4475a88f42f6e9087df6dd29886cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kn/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kn/firefox-55.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "7991b8118e773c1adc0473ed2b08ae50fcac57c9ca3b5bee67779f64c8034bca64500db90efa052547a05866d5f5f6f5156db18d3ee84a54cf8562187bb3fbc0";
+      sha512 = "ada203b9d3edcb87fa87f421509738dd023c0be9444ecdb411c66d6f3dce567a1720b1bf013fbaa259628b399f117e20d365ab6d2e5a2b02d1ac93d7b857a0e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ko/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ko/firefox-55.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "98bc9ef98c94c9e4c7746fcbb8f45c5e24bd01280c2573e2a0019ccbfcadb4689b93c183abd8afdecd97f490342295c278282beb0b2d3fb2bc14d988fc5048a1";
+      sha512 = "ea8aef83aab3b5f8c6d1add9c7be91f883253c2042312daedccace4254e64cc352f45b1ff0b18c1f20fcce852bf3a203e579660acd9c15f90a27b6002670c626";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lij/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lij/firefox-55.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "f7e82f1ea02935eabf2b9f525f89d14bace88069bc5f3572202c2795cfda4bff25d2edc89c31ae0edce7d16ec127941a64f362f8899bbabadd5a7d871447bd47";
+      sha512 = "43a44b2f0c0626399593b386c8ecd278248bf63ce2646dcb1a2bd28c3da32d99bb7fecfddf42097f7f89966bbbc78094f04b0ce2771f2319f83d19f1e0aa6e44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lt/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lt/firefox-55.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "8b19b7e8134772186a14f0880f96f4af407dd6c081f9995d032c66cf1c9776529b5d5a08cd3a0f2a42f63cedb5b2ef94da0414fd194c19d6976f3ac4e22d0470";
+      sha512 = "959869c39df29073c5a10ea314884d474b77c0c40832651083932785db629b0dc7dec8554da33306bd8db588c1a54cd042443970fa7c8aef26ef7f218ec49719";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lv/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lv/firefox-55.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "3e4f978cb253014cf3a46747c11606a2be484f5e4866ce26a979329a4c5f9256135d40e0596d1a9c23bd6fe51a27019d23599a8535c71a1e0ec3e9a26eee95e8";
+      sha512 = "594a01d1b5dfc77082696b754065e4b6b5543ed5e4d356dd38255d323b8c1803447734ea631b5d5e5a9b4f8611167c3bd6527e076d546731f9a8b406c8afbc23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mai/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mai/firefox-55.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "9a1205743ad46b39e6e05860d6152004fe6c5995d2817416020574b706ce194ff44414c7e5ea5c3c2b39f62fcc6d17b2bd2f85b249aea9803b1a1722b9d91c2f";
+      sha512 = "90d6997dc57a5986d62760d6d163c0a56460959964f0c2e9acda5570cb768e95be04b5b8648437df9845169262954d2b411656d3a054e2fec408f71453928c21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mk/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mk/firefox-55.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "96bae83111abc01ac9a20a1f55a990f3c856fdc5f4302215e861457e737e2ba5de40af76a2024fa6878c129a3864b0c689fbdf5e6c2c67c0a1e06fb594997f96";
+      sha512 = "06c3a0a722059ef6db6cdd5cb38875c1916dfa2a8bf7c27b0eca2e9ae893348cd935f208dc1e09c7760dfe3dd63428e83b1f8b2a364394507188cdc4eb86763d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ml/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ml/firefox-55.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "b55f6b4eae279811e461a84cbd32c78827090f8950af4327c0fa31056c04b7105757f6cbd70034c6c12887a0e60a326ae6635179c289ee0890446dd8404136a1";
+      sha512 = "8d51b7daa4fc768752dc9a48ca9c38c62e0dd35925518ac4f4d80ff6178789205a7c2c8935b5336751106d8504900bfcd2af8aff2f977c7b35d1295071581c87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mr/firefox-55.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "3b3f98606d66e68a4d45f5029eae89d7a1e838c6f0bfdef5a551d11b9fc28c64455b28d742705bdce8748844cb869fab21c5b2164bd441a78998bdd1efe9d6fb";
+      sha512 = "f9aec2aa02c336c8699b4420abe7e7a94e0d376529275e24a57e8158c99e472e3fb78d757782ab9510abe6e0272a66865e7e84ab599e3d5477c2af91f079bb0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ms/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ms/firefox-55.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "6619ffd4aa274511a7b10c6c3d869045f1b394b286001cad53f3f8f7fbf797a1d0d3e1c099e9cd95edf678c4e2f49251a5eecb94b6c0821d84ba075f04d1574b";
+      sha512 = "3e6879f56f8e4b85c306c73a5c59ef463ed287793ff2bca0834b2640070eff9417d4c59bdad4963229d3c3e38fde67386531ac69abcd3164adfabc668d68003b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/my/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/my/firefox-55.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "ee500522c7fcbf4b8e9b86162c869c6238978b0b9e68b3588d79f1030f304c5d56a37db0775b9aa5edc40e1571d10245ee805bb8a90fff2dab436742676dd4f9";
+      sha512 = "64c34b420d5e9e0cee53486947dd634ef015a2c043601e3ff040b08a840375755390ed6b2898e8024f9c6a87e367d7dadfe04f26bb6c500c391056100eb01fc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nb-NO/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nb-NO/firefox-55.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "780dcdee5c19295e367d659820e59a9f60fc712c00214f9d8caa64647cf399411cb74460b88ac521a1c23738357770cad1def1c1bf840a3676db5819272ed8c9";
+      sha512 = "17e1ea276a3000105018046f53752c0b4498d701844aa29ad7cfe5857ada0c3ecfe29f9bc11bf09801db35b0c58be030069229096e01eddbc702e6f8917b5167";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nl/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nl/firefox-55.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "487685f711257e285bf1f8a508d4167e6bdfd081ea30f560a5700b9ca487e110463ae6d8d607cfdff9349d7c1f2dd3c8e57e8fb30b49200e17754a596d2716f3";
+      sha512 = "70fe41e9c3f6bb8d5fc3be480a469bde02197036c763839021ff38c25050be3a4b0f15f71b16ddd4c0827fbc635be81751e1d679e6445f509b2b8cc30d70a5a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nn-NO/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nn-NO/firefox-55.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "5db13d9e1db3331943c19be06849dee993726e99e519e1c03f8e3db9e44f9a4d2d8ef7c82e77c814654e66991352c94979754ef4f8b18295fe9c4ef0bf965bbd";
+      sha512 = "803390f1850a286531046e3d3d9499050680f8ec8d8f727f0755b69af833fef7aa1bc841566809d38dfdbff0433b20853e4cd64ff0648789279b1cf9181e64fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/or/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/or/firefox-55.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "98c90abd9abb1d34816fcd98ba96bb9f4fdec070d9a37b536bca1f7fbd75f95c7b0e58b7a02725e4f8b3a1b545e6da54cb7ff0b716319bb25e4ca64da616fe6b";
+      sha512 = "79d474b2c0e3dd1b09f42895370ac7cccaa7ce71f1d1154665865114dc6db2a165e099de03f064ad6603e7fba967f85865070184ae7d478940d250c0579a8b14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pa-IN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pa-IN/firefox-55.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "01e67b60bf6d2b7a8ab6dbba92678af6102173443ee938ca3f236403169b90d00aa3696af2ae445d0a21f25695e768968bd4f7769c9b63dd5c2ec06b7320459c";
+      sha512 = "958cf459da7c99979c2684bce55f47ba5bfcc3ba908bf11f3c981bec565406aedeeef2ab691e28bd35b7763695fe1cccb9ed76de9442612c99e01960925758a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pl/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pl/firefox-55.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "af44cadc8a4032c5ec6e6cb2d502e59f11d43a474806c4f7b98259023ceac8d196633f4a6f6c6f247a042eabcf204ac4310b885d0d47a42e58cf91d81626f3b4";
+      sha512 = "a3c0c0b388ab02a2014a7a1ba18d373557e1828f449fd5ed713c8ea2ed110e3450fca2efe093a0e9ba0893fc447e5189ae7afdc77ba3eb1b7c5eb416b4efc50d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-BR/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pt-BR/firefox-55.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "24d95447c5d4d117b1ccdd415157015b473e01489cc768403edb794eb409fbeba0e35ed74f2d6c5668d9853ada5ea04bb94fc2240d01252f7f51c3982896601f";
+      sha512 = "5ea81d1719cfbb161ce4a27a72bef3d579850bc26f911729bfc46cf495d680898746361fd3e73d0096b962c498ed9cf7706d6fd940f04d1f6a2b81f0790001b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-PT/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pt-PT/firefox-55.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "7d6871788279c9ccb54a62a8eac5a6dcd69481a993a8c76dd3a31bf94e2cd5e8c4abeafee5bc6e0f0724419d7a38d6680720bb9ba8c68c8dbccd2dff46be6fcb";
+      sha512 = "460393c862a11816d7b3bbbaeb3fef4c566c1fb4c479ddbafa4edadc1f085e00bf8e9b01e5d5342058fa384512701e48745015d3a56d98a8e954679e0258c703";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/rm/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/rm/firefox-55.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "be2420b9cb9956a7c8145bbb5ec0fa841621cb0672141ddc0c8c0c3135c9372e7e5b82387a2a123c5f838393bf5e22e14edf127325e6767461e758a4aee6fb36";
+      sha512 = "0dd87197bf700923f771fe96bbabddd209f5022ca6248599beaec3f32d86559b560342989d24612977c30f61797a02d453e0e36259496128314a87f8a8b3aab1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ro/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ro/firefox-55.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "65dd955dec8460892869e3fcc555e153bc51af059fafaa1cd7a250441f166ad2c5aac2cfbb573f7320badde424c84007d121b88bbcff09ca2f474db84524de53";
+      sha512 = "60f1d69e881aabb32b40566f907560eb17d5b700fede8ecc1b5c8d198041cefa774b953dceb69e30c0d5ee57ef32b27b9cb4f43d550452b43414a8d712943c8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ru/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ru/firefox-55.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "ebb48f14805236b8cd36de37e514b0738f7d49b93713d536b1f2deafc1abdb67ebfce74629c131304eb440032563f17260ee319be133f0fdeadbae5bd93cd2ea";
+      sha512 = "fe4c0ada1acf61cf784ecd6975d3c49a897285f2f816d60c33b82f8c4f0cdcc221bfc5032381488202454ecfef5bda99de12eca7336ea1028c2c13f2c2d052bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/si/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/si/firefox-55.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "5be8bfe9ef8f1096983d087c1e61ec197c2b1cf0388175724480898ab48ea0511127356a041045ddef7afc61d65e568b8c19bc5041a06b575f76338c88d1130c";
+      sha512 = "ee52d9a71535bb8df0101a91b414e5a60b2f4d3db9e2ef65a1dc737d2f81d20bce6813968c5f8d25db40b14dd253149fd7511505ac43f2bdede7363df8e1f594";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sk/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sk/firefox-55.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "b70627c2fa4d5b4bb90b919cf1324b3463e28ebf918b000a64ffb0ac64c997a370042d8e7029dd2fa749206645a381126ec5d24a952226c876d788d0af6f9cb3";
+      sha512 = "be8e5677c9e244ef4f8c660380f3e2c141b80534685079c8a76f6d74a12defe5517de04a2504dbf5c4027dfcf76e4c80414320f36dac8701c8baf16ca75740bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sl/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sl/firefox-55.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "a0ba640ba12ad5b0477942e4eb91c9e9ee1f602d5e51999ced88be2f150311b15e72d70d0de2295916b82ea577d8e07cc33b7ff4a8425a886ea4dc3a6f6634bb";
+      sha512 = "cc693f834b5017fac4c2655b3b362cf54a0920dd25194a5c1fbd8af8c68a9d130d0dd055eaa9fb4c4348b0bd479da517e6b3546190f83222f2ac2fcbf411f19f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/son/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/son/firefox-55.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "e2dfc2ff732a3ded0465ae50879e4ac6c180040a24391b8e7e879051edd7b67c4022eaf03d5abbb21d0baccec795ca10b811fb14a5ffc823d860255871265873";
+      sha512 = "39618b1e8d08c7ef70ee7873daccfbcc41d0ede0a3a39dd861bd3155e82f1104b72d4ee7193fc30b4f53aa9f6ca12209a68b68470bb319189c5dffd7a9db4d1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sq/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sq/firefox-55.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "3e56f0d47c77c6cfc65f40088cad10bf513369a78b1d2a1ceff7e92e798f136f93333dcec4bf780598b3e8ce47a55cdd47696f20337d27ad2e2908bb6c047052";
+      sha512 = "e518cbd7d40c96dd2ce6171bbfa76b946cf4d397790b4b9ae8f00691cdeaa95d3104bf174900b18115eb07c8ac5d6158ab5aa01533f9bf06d435ebccc1a034a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sr/firefox-55.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "aae94358f83f888c3ff8fab2a55e4239d2f280813534d21f199f89b8fd95cd7a37b2862becfb7e1c14a9b180cf1844df59689fe818df8ae490786a5dd65921f8";
+      sha512 = "9ac9d605aaf3982ce6ff4d76ce54b30bce251e9739061607377483663b1654805b818d08b29a636b8a9f8b83bed38d8f91d2d48f29e39b4caf03fc895b7ea605";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sv-SE/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sv-SE/firefox-55.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "5c672bc0ea10b65eb93077e0f23e52fa081b49e12760e2d9167026d8d208710916b38b56dc24c5a78378e3f7646dffb77b3cef49923028889324ec7da39bd842";
+      sha512 = "7bad9194fa09f4785317488b430b1cfc3add9b460d340756477631b8f2d05b9ade9326cacd735f804fd26f702152906cbab844d9b7abc7ee7f68a7e52e6d60a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ta/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ta/firefox-55.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "6649f6153c6b173d13dfa5f6bf7017102645b54d9c847bdc01d155ac005fa2ee5c997eeec13fe7897b55468912b70105c449e51947af270ceb44fa1ad02fb1f6";
+      sha512 = "501093bddb36797bc4e6b97e5101dcb5f7c630aad13db5c8b4c3cf8db3d8182a4b9c68c43835c9366db72ea4dd6cef2b1d3c429c28d104a107e969bf852ea318";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/te/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/te/firefox-55.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "5c0836df0350d5b282420d96ea2886c2343641c3ecb2daf91a81b67dcdda6145532f2efd480fbc7be412bb8332247a49ef48958157b33c33c444c55ce85c06a6";
+      sha512 = "d3bb8e779529649794daa3efc52fca016195da4afba374500951d87dbe74f4ad2856e7549c959eef4e5711e7b1d1f66e04f6e7e622ba9a3c27b2f7e769f00496";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/th/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/th/firefox-55.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "6c0a888749580afef4946b4037d722d736d654f2748827af42794ae452c6ba4eed6b0889dd20435201e19f629d5104389f42a384b637d6241fc9c0b8f22935d3";
+      sha512 = "7fd54688fd6fcfe3042d02b4204d82ebf11391784c36be3f479f41a32f1e7fde704773345f16a562044da5bac02302722ae248aaac5a4b2cb8add484939c8d51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/tr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/tr/firefox-55.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1301f85151378f74a7de1a33c42373feebca433f1cd6d0aa5daae229271741561bef2bbb214a104195d93664f802fc8b233d5b60913f901583eee68827643537";
+      sha512 = "1d4fcec068163b55461d082f87c070a4a04db04e0b9d292a29e41baaeb3a44415f60338174a7589876bb98ff271bd0b4e1fe58a794053d534e27bffc522ad599";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uk/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/uk/firefox-55.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "d178ac2bd9b3c7a29b14effb005d046f43e78867e560ae38be3f5f55c39447d100d18958aeb9c4894579fce4a46849d7dd8a5c4951ee1bbcc4ccf4fa269da744";
+      sha512 = "2f048f195269c652e642250014ba6b3012ef0e212ea794a989ecbafedc6fee27976869b807c87411896da344fcc81b3803f226a70f881f2d66dd517c86f98511";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ur/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ur/firefox-55.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "2de7c4b29a6f897fe2df48e070164b2963a8117c1628f233d6ab93b1dc32660d957ba557f78344ab1588acb5144460068d34e4c804475813e9a39f4fed6780dd";
+      sha512 = "0700f646fb81bb96a7aafe0c8246fab8cc39200e34fda0b89535d026e6ea71d3216679f13867a8fd6f43c2efa23902e926f68ec15ec65aa1d5f67373ea3b7341";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uz/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/uz/firefox-55.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "a3b720e1c50bfded6d44dab4044fe283b1f718e600879663658d5d99fdc5ca36a996b79149434c71dfb951523525b59757b84dcb383ee7673c3e6e2d719048ac";
+      sha512 = "17c0be62adaa2f3a930e727910f0ffd9dae03eb53ef6fb72ce3fcbf9b6facf49e12164632acd8446c24560f2d8a233ee946ffdbcb270c815b9beee146e93875b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/vi/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/vi/firefox-55.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "6e53d4418ce4d325e705e32ca215e12c97daecb81ae5a2bd0531ae4043878a9c2fab006652f08e0eaf8ddb2893fdf4aef8b0157f04e6b9be4b63e5e191028f24";
+      sha512 = "8b120d1ec2fdbcd7b0276975842604c41f840e59739166f32c35a8ec93805b6220e3570fa6c5cbea66dc988e354d4fb5f900b5a359a784279f1ee78a32a7ae15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/xh/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/xh/firefox-55.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "fec4dd19fd5e109d1fcbb62538d1a0b9ad7867b111effba8fa4ca09921cc0d3d224e33016a60056e2d556c2cac4127587fcd379f8b023749355eb47ca92dc337";
+      sha512 = "9b981b60acc1d5fb66208279a3dc5ed113c3b1cf8c2169d5ad7ea258654b311f2338afdf9fae38c88b1c575cbe0f00b2359f928beb90288ad5b456e9f956c19b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-CN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/zh-CN/firefox-55.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "78c162de2ecd7e698ae59f7d814f333885fdb4d5bbce2890f493008c709a3057524f098a36f437ffce0ffd7856ce5ca527bd2c03265abbf76c106ac8446d4442";
+      sha512 = "5148d542265e62ba50129526bed91f15ae06018e097fe0afcea228d183b38521a6025e83ac7325f8db991c3517ec38b4590b6065028abcce011cb1ff3f89e8bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-TW/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/zh-TW/firefox-55.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "2e6e0084a37129adbafd524f0a8353ff0e26c4a59726be90a7c8bbedcba84d20a72d3c66c21335e302d929c5ed5aae9b67134a840a31c887c45363f957172f1e";
+      sha512 = "466f5e6edf90c6e2864d234cad8271cc9e278dce0748054b109fad9f0c2f5df75ae6b50098a4130a55355dc7cf65556a3cd1a1b3d62e6fc5551317b86b464263";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ach/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ach/firefox-55.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "2710b4a940c3df0eb4f4a5a00e857b030ea4126bfd1d1154f169865e31597ef0f17c8e328d87bc68afbdc19a0dfd980464c1254df15dc69eed952da2c57f947d";
+      sha512 = "c0fecaed3198f68ff1504be584fc74d6c4efa3ed785eeb330c65ff2f8a4c3979efb01ddf9e6dca047db6efbcdcdb51720bc2612ea0954b340e20c5d9f90cde04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/af/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/af/firefox-55.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "aae3f0465180bb14983d6fcbcf29d2f361e4c9703f37806889c35e60d7645dfd344aaf33a2fbac276ced63d906eb29452303ded125d86878d6c3492077d8868f";
+      sha512 = "b9a1ba9d7b48997fa4ed799276da18cfadcaa29a206c135c7c7d74bf677f5f40621feb50fe258bd341fa57840dcd3d5144ddc5385f408a6200e8f5ddbc5c02eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/an/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/an/firefox-55.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "7f02c46293d5c6baeb75b80f3d5fdeeba5112ea350c5b04dc5750f5410be39fe4d0b9f03d21e8855922b97e1a6684b90f6eccd06d198c9f9b259b42fc51d9e46";
+      sha512 = "205d0f8893cd5d90eb0b5bd34341bfd7857c88089685d7560a57e6a46e65e03bbd447e8b3b9471f1bb2f0a69c2abbb9ee96d0aacd5d544053dd7f33842402e7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ar/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ar/firefox-55.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "7c4fc8f0276029deab6756a6442cc29d75e8a31a0d62d045023c68c4f80878b920a34faee8a3e40f823de67015aca6f32567b6cf57f9a593aa1ce6ed5fbabae4";
+      sha512 = "3db4dae2cd2a4fc51792f8bb398b47c91e13fc5dfeeb8ad14c7bc101b55d14f1d75e719d5ce03e96d29245805471ce0ad2f38663b3dc837d83a16a365bc1de05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/as/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/as/firefox-55.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "e6825cbb7d228a1b8354b6030724f9e3407b7e5a33f1fe59e7b19fc71f0c28bab2db649314edff5bfab3c37b154ba9847b77fbe8e0038a7a3565c3136115862e";
+      sha512 = "5b06bd9944c38dfc8c5c92930e2d3c2470d8cadcb11cb97d1ac98426624e4082fb0f61ce27a70572967525166b1343d84ae4cf9c46c4aba9c9afb4e4513c74fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ast/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ast/firefox-55.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "8a1e64a1afe3b22349b1cad0d51ec299e02c5a9ed330792d4820bd0be4ab33cff6f05d03ce4441e2b2b757f45d23e6760d2bc370fb13d8dd1417cf562e82f331";
+      sha512 = "5653c855893160419dedf857b6568f9c1bd122da27593f749e81389aef248eb4f1d57b85de70c2a122ba2d941a8da3cb320975ffbb9b56d7647e5bfc18ea7c0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/az/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/az/firefox-55.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "cf72d9045c2dd9e9c6da619ccf9fe537ae4823b3623e9873bb8ea12ba1881fdff3b05264908fa5738e0c2ee0d119ebb5799b32c90ae37186284a60cacd75b7b5";
+      sha512 = "dd6b4c7ff6362710dd631f40a33b5c97f3e3cdd245443ae9a8ba03e31335ff73c9ab695addea10b83733bbc6b65dc68ffa54315c50602661ab447a25cf58912d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bg/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/be/firefox-55.0.tar.bz2";
+      locale = "be";
+      arch = "linux-i686";
+      sha512 = "3688df68952a358e7005ccd64c2b0912d9b113dc146ecce19739043ccfd37f92fc2b470d47c2723a24c8b53d113f705afe56d1fdc3c1b7304c3ed4546b9d347f";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bg/firefox-55.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "686ca0b866d1e9504f21adec227396ebb6c6957b6d4aa9a3a74249d4ac8c23f1556bd1282f54abd82ffedf89e2852794014c5bf7bc46bd1d0df4dd5352e34725";
+      sha512 = "b3ef5094491445ba3544a8a4880f8474cd9d7092cd67184acbebf4e3768b6a0bd43e03938120f3d67ac519e86f3c538c26458963c1c32ed3bd89e9f8019cb5e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-BD/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bn-BD/firefox-55.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "f0e7bc6ae6297cf9e83cbdb8366def1885b96ff64a855b312d31346e9fc476f4f80877f9251520c77845fe1f695f39a757dbab2411a42e694de27f1772cba085";
+      sha512 = "3584ed2d1eb05f217cd475edaaf1869ae3e564af8738cfeca7d0484dee12abb4040c56d4e7c20cf15c983cb2245fd84e9ba1561b27f4dee57a50549fa07c20ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-IN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bn-IN/firefox-55.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "6caf0d5f71c1135272072439c0e2c84bdcd967cb23c51d980c47d3c6a3748e90e041e89eeaa88a42063dfa0d3369597c8eface6593d91ba1d604882e16b4cd5b";
+      sha512 = "0632856baad0891c3d22454146e64e884828d7aaabb58c1f1fb3c45314eec95765df9bf6bcf68e1edbc5873c93d0d99135f71f7ffe979ff656c2748df1305edd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/br/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/br/firefox-55.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "10cc66d62e68346b896c0fa081f8d8c1ebbfbfa364a52bbef5c7f368aa854afb7e968cfc344378707b93b2cf478fd74d4ee97f9b7bd160199533f26df222ea66";
+      sha512 = "dae7d1bdd93492303adf1ebe37b92fb3400437911ee0c8bda33840c5cd1fd0307d631a65300dcade93c116fcd3c85d04c518d2aa2ca792eaf20a7d10d99ce3d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bs/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bs/firefox-55.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "6c87de221bbda9639d5751f8e8ea2f4aa5be191dce18f0b4f038f8a2fec989eb4cd3ae3b2ff36ca13c168a8ce92b6ac6a60b46ec6cb022ce6a95e921856973b6";
+      sha512 = "d9fbb02a07176a8063c8317f795859e2bce1ec56f63742cbbe88fce9b07f03ad3b536ba459a1d655b50f3a867e84f8f56dc041a9f57ee93eebd14f174b938d6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ca/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ca/firefox-55.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "67ca5ea84b6243bc8869b96fb9dcecbc0a8e7018e256101874791444d57b5fd61a69d7ed064df41faf9ef3cc9059777412fa86ed445e9e40a3570d030f776d68";
+      sha512 = "cd93cc44280eb61b2958e745ce27b94fe583535ccb7dc7788f0f74c625a0189db6515328f479224dd3899beaf9a878969ea945da053f2819510b1a9584ced229";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cak/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cak/firefox-55.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "b343dea962cd69bcec30b5a274a118e6ed2740120cd09d8155d0ad32e55730d9bc223a213df447ae50ec6bab67f5be2b910feebb73b4b57b30ecef49a3b0803c";
+      sha512 = "14c43245c2f91db0d7ccaf010572fad29f29687156ae21abaf98bcdac578d49673342fb4ba7143aa5d6268c03d37169d7fcf95dfaf48cb494ea721657f66d0b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cs/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cs/firefox-55.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "e4f55216ef51ba1232e15b1b842c3964a49aa31a9bff2cf292bb7cb913891057ab4cb3e351ceb57d3024f2854defd693a75aeb23431a7b7e8fb82c41f500507d";
+      sha512 = "40c11bc35d1d781cc8c76f7bf42997a0781627c0385fc67b0562edcac04d8bf6f2a4217702ef4ea681f4e39147afbc814a89e23df46b561b1a4f5149404fc955";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cy/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cy/firefox-55.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "4d4340737549368855b21f11a27073c60112cfb7aa0b5e1329b27402ffcdd222eb009bb13e81a8403a72ed67b57d2ba2ff349fe0255d1cf11f32f4f32a73986d";
+      sha512 = "9a946b301e70e7afccbb599e4d4c4d43645cfee27d3e3afbf5862ebb36436c66e0a59a5136ab9729e9d2e01f752feaa2ea341726b41fa03e91d7e909b0dd0b95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/da/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/da/firefox-55.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "4ab3cd2e39cd13608331c13bf788ebb5a75600cdc3e5bcced2adeaee3d1c70fde0b57e93be9d8ecc72bedcf14560129246baa8b6fe5549de5614dcd14bbd76a7";
+      sha512 = "cf42e36971c0d743daca66b5355ccfeff994094bda6ad3526af76c89818f8335af49d0dfb520d2b58d40da64587f85588cd4c61eafdd12a0763ce1034bf44fb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/de/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/de/firefox-55.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "5b4ec879e8bab2bb4233da0745a4e905736d98816377458333d0d5a9b8a72e6cec8f450e8a4ed49f69d75b3a5b1c223bfe96844cadad2919044c637d78a13f04";
+      sha512 = "7cec9410debcbf95489e3d9a8129a53507de27fce635cff7a60b7f977f6407f7396d03ee5570528eb4524901a1703b2ce7798a637711c9166d3789e95e4b6d35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/dsb/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/dsb/firefox-55.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "0ff0443ec9dcd3cb11978bf8689d41ef69db93d8b50b6dd53f4d31fcbdab2e459aa93427bce476ec989e907d743fd392add82426c002aa604fbe251ae438e912";
+      sha512 = "387ccb1bea5c49115a89c6b64399647e9df08c3b4c2997c9aee761ca73bdacb6a3a05a594453f44aae119512cd5dc62a1adda94ee1974a8809fd9ac6907a5562";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/el/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/el/firefox-55.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "5cc24ec6bd4823e5360b56ce78a97319e15c8f2a47f7138033dbc52e7df001d09577de3d9e8cac6314cb7809da0e7674faf8845e4610d6ea08e47cbc9fde7f03";
+      sha512 = "b894fcd577e94288d785eaf058707a456841b2a50786de9a8e9324008e76e29bcd83960f4e292d046f304d90b1d95c941e126d701417b58708a68a85c0f25496";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-GB/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-GB/firefox-55.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0b8a1576ce8b112ae35ef388191d2308aa2c7222f575bf354d3d6654c05f073429af8ec9b1a1a77a268b9191d2fb8b758a38609c6432dbe827b739b3ba25ec61";
+      sha512 = "74b06f6c1d61ea89994df6ed8716b72e9b8cb256bc4420e6011600aee9f161287250baa9f39ad7f8b806fdecfc60c4d7e5bd31e6b02a2f2fbd20fda09c2da2ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-US/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-US/firefox-55.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "9b28b30e136b9bd89b4b374a9a6c8e6efef936354b7eaaecfaee2efca6381abec646627c57856f64b96ba5a8f771a411c4164f3a54b783a8e3e197c0a78d1622";
+      sha512 = "d40f8913e3a280f846c8507ef55d934b5e183ad16e01c27d05767ab660235673a4615a8a10f52d5562912f4e88d4c0d4be3ee6a3ab13508a0bf9a8768a06743a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-ZA/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-ZA/firefox-55.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "360a4048ea81b10b5b834f3c2ef21776cfbaf372f3a329ec9da016728e1b83f956476ec98295e70ae3a9fe63a5f4f87b6be8d47627d6f36eff9b2909073fa70a";
+      sha512 = "eeab81e4954ac3ad4ecb1d973d592f137c59fbb62190e6128c6728c78a3ffbcd0ab053a31529bf6a4b2c59787c25e3c62b41e6de682cad7530a40bfe34f83f86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eo/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/eo/firefox-55.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "23e95684f5bbf6b209a3077e173c3212b77e89dd64f22fd378ddbb8eaa43682c50f4021e743e25189b2d1cc6754bce6d0c8604d3884ec1b32cd7c51c0dee5f0c";
+      sha512 = "471b7b8ade86cc0584d3354e074acbdcdfb1afd048e6b6532e10c664668fd3d42d3c57412befa7905d9eec60b4aa2e484982e72e3f2d1c10c4a2f8025083c8db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-AR/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-AR/firefox-55.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "88b7085fa2b4b1013a7242ca293197d0d26916f2ffbe1f1a4e8a1d2000e45705301ee83b0de8daa271111f586c3e5fad54c8e241da17f3f8cb9912b50e61538d";
+      sha512 = "7f8ba4fdfa1114c52dafc0b20aae6decdaf79d273494f9a758172d0a66f38b77a1eac6470afbf5f1bdca0844ac43be6b59d70ad24992146959c358e6732b4400";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-CL/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-CL/firefox-55.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "990214ab2abaee7b607ac0a46fadc7c8be0fa12ecc5c0819f58324175381309742e0972ba54c144ad1dbbe0ceca076621aee0480e9e954f593c841d58f1a174f";
+      sha512 = "85705a9875897c45fcf0ec1edc87cd3b7f68d4bdc271a9a998609d71ea49e58ab5440913ba33e09153d7095d4303572be84c01f1d7ea1d08251c5194b983de34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-ES/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-ES/firefox-55.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "7dce1007e0c52e048d441405a1a6c02863da24b8b8c4b7f3afd61f2c866ee6b19f29c82dd6efe34badf52df9a66c76fd56e788d047c3eac0503e3a74e41240a5";
+      sha512 = "5d900419effda0612c0f45a0c8023938f2d8b60cd240d71f5b334b2f903e3c4fad8c7ee548431bb85f3868af844b7214ef67ccd9b7a3775f8bbbe0cddcd53ebe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-MX/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-MX/firefox-55.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "80b3ebb80a3682b6588175fee7243bbed87312463ea4bfa02d52be21b1e889208e8aedded74e9a94968969a2ede82fe63c83f742ed7c5754984f38b3f83a379f";
+      sha512 = "054cf514419b9b30fee31554ea08aa58d8d36b6b1b51c1bb91cb2436dd26db349b31a1ee807906b113536d94a73c352430f3044b32a0e582c0ff328ac10d518f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/et/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/et/firefox-55.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "0d31b34100214a588fc2ce5a217fde7a41f484344662e3402b69daca937e73213ae7ecfcd081437f3f4afd4bb8ad2f3810ee9e6cc160c24d81b81e20013176dd";
+      sha512 = "af38aefbf277b85fff536a35a4138354ce12ac8b3536f7c0cf5a1a3d5ecf79f138adbcdda1f68cfefcf137c1aa1581fe34749d1d005ffcf369db8561bf2ae536";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eu/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/eu/firefox-55.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b8ee5dc7124e8115af11d58770562d51bf7356992e84c443e4974b096dbe2e47f4f57f90ad238a68d712d9fc7c27c399719a8c4f8a4726fafb9220e448ee69ad";
+      sha512 = "04176bc464fa903a4a04c9e3ded80dd909d5820ef75bd2bd9ecdcb703cdb19675430d9561e2bc49338ca59eac1be1cdfda9d4acbc4ca5ff61893d32882161dba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fa/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fa/firefox-55.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "5bf7b9f0db610f5e1033f38e65bc86308b26c1dd6f51b0ba01064b9a0e0debc288aa5f34e7346aa68bb8eec6b81d104ee84d475968cb0a3946767f311dd85332";
+      sha512 = "ef46e0a4b523b3ba883e07b79ebbb343caaec7675b5f6aa456b13b3e362c17069a563c18ce0692fb7854e2f6c72ca880130bf9ae0671177262027564803f971c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ff/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ff/firefox-55.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "f7d57a36612a82f94aaa5a05ee6764863ecc7c769880aceffe572ddb738cc899cfdfc68aa15cffbbe687d0413d38cd87483e78711f075eaac063d7f5f0b2d29b";
+      sha512 = "fbeb3f00058cece9df5181aac388f57a60dc9bfb2c5971af6d96e2fa876e7d55a43aed82e56eab302e470c67831c84785dce08ba926e1649c13e0641675bb325";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fi/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fi/firefox-55.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "9f58c3a937ea4d7eaca80c63c2ec822511335f27c254fd086ab2583a55e457dd1da98fc1e2bb8d299010e59c982b54441cf157afe3aefb9778877d25f43f545b";
+      sha512 = "4af7d213d3fe7e30940adeaa5ac59d1c7b20bd243935684a83ce746576ea68347c41cb897fee50636852402f05aab757208db03a7c746025212dd028b43b7f4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fr/firefox-55.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "8179c3840850a6c353834f052fd8d4529423311385fc39d0d73d6c97082573c5035cf7714a167bb3d9f0c77e64c9fbecac30bf53a03f6c01c338ac538a23e0f4";
+      sha512 = "09c81a787cfde2292b88960a7b95a2e5c18e9f0c40a5972f18580c27fe3d2140c4295282e8b8ac2b3ec1b1dcafe1244b7392832805878d7231e1531ddf1c923c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fy-NL/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fy-NL/firefox-55.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "819d140b832ea5820804b0d888f96b82737926a08854c4e93d133636c633a52433e8246a0ce187cfbfa56ab4bf09a4b4c000efea697c0d50f22edb02ef756f87";
+      sha512 = "e495c0b559da6d9173786af68760a4fb0b25f4e5d504a9a8e58b21e37903336e4eb15c4beed8a5a791f8c25da0d46ba95256cf5edd31fdcc2acb47ffa85a1b87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ga-IE/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ga-IE/firefox-55.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "c71d04d8ec3e7dc07eb909192c176b456daae54cc105199f675fd8e612c0f6527cda0635c0e1aa6221e2d5ef3f6c8168491b02571054ab0d4b7beab59ef692f4";
+      sha512 = "29b28a8c717660ff3b0f07b330ee377927b17deaa887802615e447544b88279871e72a4c73441d9bb76eb6a60e85907ca94ac8375c0125eeaed2500e815f9a6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gd/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gd/firefox-55.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "98bc4b44b2075d615e682b7649a0a0cc696013b908aaef11a60bb299881e0ba243e70ec2e6e9205c965d31c68c6a8a66e9826fdb711676aa0cc3c8f4c44935d5";
+      sha512 = "2e3d7902773255a69990d1f5176637aa45753eac4d6c903bd8dfdea505f2a07d714181bb4662bae4591b4155fb04a87e09d65eb19476ce2c4d0143b7f8f2641d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gl/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gl/firefox-55.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "034b22ffe1a16ee330a8c85c18975d541b27d5ae1e5e3cba3796307c641af14797b329162a6e3f4f642de711a9f0ffe5b2fd274a90a396190ba176c5c26790e5";
+      sha512 = "5af911b6e1bacef308491b10b21592f06539f4360a84d126d0f78fb43196029ec352f8aeb9fa6180899f5d74334ae002602aa70e1b4112ed4cbe79b00bc4a929";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gn/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gn/firefox-55.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "85ba634e0b991b582ad0795c368d5df28d5e2fe773525792ab071752ac773d0d81dd3991996d6e9db7745707cbea8ccf86784b6a8f117d97e08b5ac88902d5bd";
+      sha512 = "721330e35f1632969c92cb732af6a1873c0516292f58e04db3d0c7a96d1cca2ffdcbbacdfb65ff3a958f8757fbf788dd7e667e3037f3b1505a1cb5c34114e02d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gu-IN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gu-IN/firefox-55.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "92561dd2d270c01d9e2a1568fa9fa0e75bed2d5ac2ea49d965fa2aed6f32bfa8639cd57d564d310198796621fc1696444f976e12a26fa96b55aa7b445f81afe1";
+      sha512 = "c56f1f632cf4bc89c5f2ae69c375878d9f4aadb3ace0c228f36ab42311ea41eb2aaa4b858596e820729a7474a568c57f6a259a2745902243c5cd21b94ea59fa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/he/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/he/firefox-55.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "d1f67f3e34bd67f993177ea9cc62ba432eebdd1169ded1b6ef58e9cb07a62a0ce38afecf001680b8ff6a401950ce9c13834345d7481301d59d024572fd2b8ed3";
+      sha512 = "69336ba52a347549bf684bb5238ab14dda633d485de617262fc9377572b7c77cfd024cae9f299ff58425d95984939b95cd02f2a3a23ee07879ebc5455a7f7adc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hi-IN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hi-IN/firefox-55.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "8a10d69c6baebd21b2988a42979ec675e6ca29c96299407bd307a33c0bda11b6626cbb69bd6ab64a55f347be30d5fbbc64078b6e33209c26139efa050050541c";
+      sha512 = "a141064e138094b02989aec9c3801dfbb6dd70869e3fd590325e6fa4b84968d73270a6559156e774ed27f42062b0fa5f78f0c0a373bfa2a02ae2525d3b516781";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hr/firefox-55.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "667411553ac3e00e7040ff2b6f350a6586498a38409380d5c822bd1bdf2989e2e34b9b83ac2ffb00c7d3cbd57d2cae4450cd208ca1fb89480d91df1981d2802f";
+      sha512 = "1547872d6d1535cd106b0627830c093d33622f42ff01a419695422af5c030a54996c8b9c95e89589c8ec75eed68485e3ae78bc7cfc0a3b09d303e3a1c0bbbe76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hsb/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hsb/firefox-55.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "8becf0d2f7a0c208ac38d390be0114159d208931da07b996e1f05138fa06f07f027c1ea429153823c580217a5d3e855f50570a5c5c2e4f264164d59b0f5cc9bf";
+      sha512 = "796500589c98757a7986158bd08f12ff76ccc09aa4d6132b78c011cb58ecd4d5d0798d780e6178a0597bf5c921e6168e606df56106c8ddbc49262991e10233b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hu/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hu/firefox-55.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "494144c9c2a3d06d4bc8126e106e74d72b3ec5992dbbd47a4b618a1a30905ef59e550bb4bf8a698c69d4dac09a1bb7c78b5580f77d00f103918d6d58ae74be73";
+      sha512 = "7801da792cca62683a7d1ab812fb831ea80d90994b18a151623c05d2f30979d557cc1a6aa0a7ecd44f440c76e71cec9a4749fdd4c49442ea151c1720a7a5d988";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hy-AM/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hy-AM/firefox-55.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "4d8160d109ccd6fdd407673c855b445eb287aaaf09c55e11b277249b54129721c60596139860cd578b297415383ebc83a9f95feec3b5deb229e5f5834df5f94a";
+      sha512 = "d47fccbc883ca137200c613aa96899e356cfb09190952805c20d36653d3477abee4db49471a1416ce13455ad5bb6836a7217ae51fce77dd0fb12f1187e11bae9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/id/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/id/firefox-55.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "faf8df37c2b7ff621d9dc73fa225ffeb9263a6de05ce540fa4f7482b26df153c75cad46e395cd4c3994598dd42943eae7e552836d3afdb1fab56bd55e73f7207";
+      sha512 = "41e111080bed45b7783cd50e7069811b17b35eb0268a92f901531dc1e0a7e7fe07b94ac325f5b5b436b71ceffc1d329837c74875a32e13d3205537b750fbee58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/is/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/is/firefox-55.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "a0a5fdfa889d61365c9da182ab7364f3eef51ce7bfe75273a9cc50b948cb5b979629972171dfa3812edeafba76ab71b3780f11265b2026cbb70fb8c2e1bbc7a8";
+      sha512 = "9172c69ae72fa83a05f0926cbf87ed4694653395027b91f441ab976790c581b9383dbe62bfc74a425279ef68f8c6f6d2ef003b20aa241be6269c34bbab147150";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/it/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/it/firefox-55.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "59530850ea817f7bcf0ebe8813aa9b653fca3127139e8b97ba7f9fcca16848c272681b59409c0dfd1b10a1e75ae6b1d0bb46bae628fb0c95daeb198189c8a173";
+      sha512 = "daaade14d2dafbb76e021f87773a535783e533474138652fcb0b25bc41a1ad4f13d7cf65119730fed56c43116a3392f3adc435a7f8e8326ee8ea4d9e9cf19ef9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ja/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ja/firefox-55.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "67501fac457e820f2e731a77095f37817e8a44693d740cfb540d48dda8e1b10d93eb578b7d94c5efb0812688728745cbb508f497c02bc74b50fb514f8da4551b";
+      sha512 = "6741bb18a17559482f8b95c1fc6acfce6b0e31e474e5d88905bdf3b939967c0ba625cea7e1f1b2f2ce6e77f3128f1f85069e946e7e6a16fbf4a637cac7e79565";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ka/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ka/firefox-55.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "dd9dc48dd50cce43b48dd1a17aef95c89dbdda8e4b670044c422085ceaebca7410c24b157213acf4592c007ada45e6fdb154e690f6ba626b81ec3f8a099f205d";
+      sha512 = "c1849ec6d69ffc87918515a7de95e0405a14b1cc268e68dfa11f8c832ced907e73a021b5c9b5f1839e99d692c13fd3f33197eb91de98f588f5750de03fe098f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kab/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kab/firefox-55.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "51dd94346d62fe810208e6bcfb930880ef14fafe2b859af80da4b494563db38b4226ad43b602ac86f426c6a731cb135ac674ef65bdb2039e0aaccde0956c616f";
+      sha512 = "aaa9a9d415f39dc957ec59becf3b649c650cce619417dd5182835190aa8bf361bfd048ff647099320cbda296c9a992927de9c6a90e84dace4a1e5cbed0b9758a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kk/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kk/firefox-55.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "604b59670103ce78e3ef4db5a209d68981e1168415ca4512a1edf15fb4b2554b9f655985b2a0921cca44a4c51742155822b0b6514e91b1a5fec43be57b36bc44";
+      sha512 = "e7f47f9270c909135dcaea2e4a47e1e16a6a0d3b886ef9f4ff0e3e750cd8b6b253eb7944c6f7155df6e91c838bc84544c2880f9c75eff12c97f68ef8da098575";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/km/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/km/firefox-55.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "a81f6b44bbc9669af09b212d1960ca93e70ac085d20c37db52a474b81072a06165312207567ca4351bd110ee7e4125fbfd67981996c08b0a19c7c6669db16cb6";
+      sha512 = "3e46f8ffba4f93450dcc2aadd010ce0b181e1461902a517c4d6030baaf6814debd2280202308980b3e02879d23144aa186af5c9af6e53e8d6b8d5e5b430bfc26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kn/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kn/firefox-55.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "7a54f78285290d3a9062d71a5b1de69a3a98ea95a1593b5a0a0c2b69098c55ec054c8575361bd5cfb67b7558b411b8b83861ecd5605906b15a06311f477bb0c6";
+      sha512 = "8de3d801bfe8a1b87719715982cc9eba3b39158a8933b26379884d795bd2eecd43578197165a97f514c50286713bb83c06e200818c2e4ff2714baea72b8a3dc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ko/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ko/firefox-55.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "6a97670f62f70422f0d5d02091fa6ccda700705a248831d55c95034a1a63bced1bd0f282e938855a751eedf0f897be71f7257aa5ab3f8f7162ec756511f15830";
+      sha512 = "5991b9223486acba78015b19d6d0e32dc28aa0e341b4b11928a9f28b1a6f4d366c38690d311ee15ceb607933887cbd8c93940ef0dbab8fb129c94868a5a5d27d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lij/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lij/firefox-55.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c4b4bd74169731d6909acc76c40ceaaddd853e03eefad27233c05dc869ab66a208f072dfe538f1f8e2323feba021f6b3aef73d81d02ff69d31feab688838424b";
+      sha512 = "c5ce8dbb363667ef0b037c5022404b756a360272505d756593860598e8d08a04bebb45edd9a27ebc279547658f142ec1e65798c2e2d13ebbfdfee56cd30e20c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lt/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lt/firefox-55.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "319bb6442b6dfa25551dfcb5704241de8b248659cfdbcfa0124c6332ff828e793ddc007f3be57d51033e334c3bf504d0a1330b1cc539e8a5a0d2587bf14604cd";
+      sha512 = "131d67e7bfcaba8ff55d7fbde587aaa1039cb73980e728b29a445acb4bc8f2f17f97802e03a400ef3d6933c2475fe35e7a3acb1b30f949ad71dc054b8d496c36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lv/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lv/firefox-55.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "cd255f0922a1cd2c13baddb350082b3ef7fa130e28cf5bb1811345bce3a9d4e65aeba188304c8fdc8336b5e35c280d2a298bea39567d5309fa37e35d191ac18c";
+      sha512 = "7e9b614dbb86ef76fd752180c5b633345d37d24e731eeb10ded7694278903d42f5beaab8a17c5a6472401754b582687595f34233058bacca00dbf3d1f774a5d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mai/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mai/firefox-55.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "5f44ecbd0dc239f3ed77871d548a894996192398dd845882a7c6cdaeeeb18dfde369b2e8e6d0b56883b494f537f5e0b115665d1411c1de4295c5cacb07021c54";
+      sha512 = "cdf641eadf20fa21c5384377183c7797d199c3232f55dc1377d52e330d1ca2d0b1478e3301fef696726a4094284a94d77257462d4a5447ec2ea6b99e2d009e67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mk/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mk/firefox-55.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "de8a9ea6a75a4d597442e0116c70de5342f7270b2f41e9a889c7f71a44f41753d1fd0d1c029cb86a5958f8a2642ad8bd8943c30f5f3534d38d0428c83697a351";
+      sha512 = "ed8d29a7a6a0c255a24be9c6c670677b2cb081129b36490ff59eceae374e2da3911cc279975c55b5ecc8fe7988364b069145b16633ab6c4c945f35c91772c484";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ml/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ml/firefox-55.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "86f7a299f66f4d5c074b59f5512571c78fe924792815a0dc2ecb9b2f5e1c0a10d798bbb16c03f912051ab014c102b8e428f98ca29eeff2c30ce72962b50109f5";
+      sha512 = "a4a4758635913dc8a4b5d55df97fc9e1141a7120541a0a962aa4b2c566d0985a6500bd25319b0a5f81821c22ee3745e12603499d8f996276db9df07033741f0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mr/firefox-55.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "a3e79a8f6b03e63f91c69232467704e91c73e1a4b6085a0b979f15bfb67b63bac7637130783d47755b50179a15f894223b76f572941464963bfd61e073ed1886";
+      sha512 = "59144a70caf75fcdb3b7b4898899e0e3f48449d2b0ae0a92ac5cb022ba8a72e076b53c59bc7dab61dbad17561930b0e1182e47081712bbee66f5beaaef84206e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ms/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ms/firefox-55.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "65ca4ef417722cf12b3c7dc7081b374caa3626ddaef5ff2a0b929fd5d1b6716c4e020ac8eab9cdd4dd161d990d0bb3633757c03995426e18e0d23b1e20e0e21b";
+      sha512 = "833f8d447913836f26588aa0e5054658cc38b986b72385486cce8a2c9e7e7519615149e7a4da4eee64f83bacd24c924a4cbb5c7f5b8450b75070f28fc558dcb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/my/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/my/firefox-55.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "200008b97d3a811533d97e96cdbe8b7f1ce30ea5b7cebe3a77f58269d2ee871b8591907f2975377e655fb01bf267e69851ec3b3680de2796183b3ceccec8f471";
+      sha512 = "d44980bbf4e9498eba7cc0170a558a0ed1a6e3fb9d4e55cbe4250d35e9a06c1a7e221f2f81e51733e28662ddb64a5de9833e78068390087d42ff8a7a10e3527a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nb-NO/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nb-NO/firefox-55.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "03d502600bf3edd8890a6d3bb394acd4c2f310d762870784192e3515b9908f14c2db4b7e5762a323b73b4c68c13cdcee9bb952fc503421f41b59f9d2bdd3e617";
+      sha512 = "757b17a9e585bfdedfa6d72860903e7b6430a434a747cfe590f3886f846e03f5f584b62b4e6caa73840260a82d7a9709f99b2a321bfe872f4a81859ae1d3f5e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nl/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nl/firefox-55.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "4bbdc99d32f2d576db66e2aa5a12d568e17f3d544e5ef613286e2d3620d4f833ed4b7385a9091fbb72e8bbc423e8e383c9b4e616f562a83c2dbfc606056f97ac";
+      sha512 = "7c4289a63586f2420609f525b28a01ce19943afd8b9417583a51afc50bf741439cfc8a2aa706c6d2230f45c6603a86a595a1525dc1abddef1496737bb321b01d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nn-NO/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nn-NO/firefox-55.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "e0267e22ed0041d8a436bb38b9641481889b716632cdeb50bc1761bceda8d0dc6065937d15be56622cee5d4c73ba3e6f96c7fc00ceeef85ea9d852954ebf2d16";
+      sha512 = "5508f9dd6102f45694c2a7145b9b58f35ba2f0d2703f9e8bbb84094b81f384a2c7cad6df4de245dd87b1dee379d7fc202a66b46be8cad50de94f37afc1e51e63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/or/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/or/firefox-55.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "faef925bcd51fa0851e2583e590bfe6c194c8f64f8d13a3a3f13f2129571ba7d9a403c0caefd933e94e1d312b39d1d051c5e2a1e6bdcf4b7a1962080d3874dae";
+      sha512 = "a5acda036bfaeb2c06c9b8f2e74475f67624416cb41069654b5dd104e353d2f84ee9a51a036a828355aaf6bdfa9f8f3f9495a287f2c237dd9b15e06d2a774272";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pa-IN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pa-IN/firefox-55.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e95ba361380a8061fdcb4fd336fc5bd906666873f4ea84af6b5d21c05fa1691fa395bd0fe4529778d91e5d500aa162da09660854867ccf4734c737b0b4ccbd55";
+      sha512 = "a3e807fe14653a8d55925f2c7ca8e963534b14fd5163b1eb168aa9de31f39da90b1a01c2510cd91117e3949b90bdded0666397d7383c4ea20a70fece438ab7ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pl/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pl/firefox-55.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "780079a117734ed5528b8efea3d0a7914cb8e8e1e81aaef33f877317bc18fafea8ce2433ffb69bccff01fa75e97e40048ed22805bcf781216116a76472f3260d";
+      sha512 = "5f256d8ad06ad7dcb8898ad5b7abac13c01ad34f94a2c1a457199a61e94e5b89f76f271f17d90d9686eb49055ef14dc222773d33fd3f53617b2a2f51577bd9db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-BR/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pt-BR/firefox-55.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "d0243251d0793d5e3202e45e596eecde6362af25d95b8640fc5d69d3983ac4899249da9a1d5099522fbae9fd5ccb08d024ecab018fac8f0858a4f1bf201e00f0";
+      sha512 = "e36673066bc2d6c68b0c4eb1b6e493d5d5f7f14c29c3c117c76057168f35bc5b7d5966d9f310930e1f8172baa8ca2ed3f04afefa9a752648867c3a3dce48fff1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-PT/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pt-PT/firefox-55.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "337c792cd35fcc6bde89fbba2da9a42846af371b741c79e1226adbdfa801914bc39323b0ba2e600ebe1b12191f746b524421c8ea6e5a03f1875cf4ba24369d9a";
+      sha512 = "d57456e2da3f1c0287554cf2a1aca6b19e99a08c34423711e13176ac8d47da25f2856cab56ad0daa99c60ed0fce417af2447fed1d94c2d0daf4b35f22a9b889b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/rm/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/rm/firefox-55.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "e316df164058d8f380274958b17a3812a6e31d9da6eb2fd0373e7bf2befc45a668a572ad4f8f8c33a7aafb5d1f8b7331fca00e12d7ef511017b1a002811040e4";
+      sha512 = "036a41157ba884430046fdcead68a37fe254447016cef723754f70cfd88f2fd385ac7c374e82adb06556c541f0ae82ee5f739d1a190ba06a1cf04405e4669b1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ro/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ro/firefox-55.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "04717cd979c8440639b407e919bf2d61814d24ea9969438397fa56fc73b5a8104d8a448c40cb0b3923ece0a61b5d232a8b94eab456f1b89fb4e24bcb0a525b64";
+      sha512 = "ac349bd51e8fd251f9581ba96c4ca6c69e24e736e44d28c9661e5163a3893ec9ae42c437a0a5b465266a35b966bff0bed8ae081fc93b56d59134fec4ff38cda3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ru/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ru/firefox-55.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e0f76ebbe996f9989b00faabc08931873490c4048453ed4f32f0461c6ee977cbcf4b2ff4ff650a39e1a536f7bb214c6821c099a1f212cb4600187c698130bb2d";
+      sha512 = "dde58da3b6789ab33fdd8982d328412ac9c6821fd59268dca2fae0bc8dfb8558dfaec4a1d3c9802b33e2c10f7cb0bdf5480dcbbb1fe8e6b8be1774064ca5b85d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/si/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/si/firefox-55.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "f98a42fa1faee4be0a141d2dcd5e88641e89baae55d70440c1fc7f92cd12bf9f3d7954c23b42b16c02052f79f9451f76074c1a7aa0993ff84bde64ae12267e68";
+      sha512 = "41b96f0c5c4dea98296f791e121e2421545b04995d92326176561f0c034c261e19bb2a7db9e72df52a9285ad5d1ff96a4e38559a386212c7267ccf475764b281";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sk/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sk/firefox-55.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "fad8a8c70e8f354e87b19fa9387c81b685c79b133ab03dad937e84e2c927d814844d281e39c45016a51056bca56cfca357ec10250035dc07b831a4e4c83ff147";
+      sha512 = "c19fb32205523afb74ac7edf29f3e55a9ffef4e24d18c47cca493b38d5e1bab8fda308f6c5889a64b8a8ed266c8795a67bbfd690bc381c02405be1ff6cb5e9e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sl/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sl/firefox-55.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "39f8670cbcf942210336477cb153b7b2b39a7692103a76a476a820f2b8b9809da65351e02b4f80da7ccae3e9cd18ecb7fa1af292f507e9920f50261ab67b81d1";
+      sha512 = "490c0174c5d6bb8cdf0619eaf00b87fd15d5365b40680786943cc7c775ba14cadd21e5aa6948b82f0f45bbf17d747f0217ec43b3da8c523b1acff60c3a6c7c63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/son/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/son/firefox-55.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7eb79e3638c0820b1db421e13f71805d24e2147ebe78f48497ff574058a3da91f9afb40d050801711550283b692972f4b973ea8579376bea03059d70557c20f9";
+      sha512 = "b0e9ad5e3b2c0c274d70a048855c2a923304be5464ddc7066f64cd20833929702c413816f466c98693fab9c7167f4343a12a7d528bd499d3c4d7fd3b268c4a49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sq/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sq/firefox-55.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "84c410d7f7dc4524c4e8a7ff3fc186afcf922d8ca843bd81de83c1ce1d22aa2c07fdd57d1594a49aab014b07f1902c929bb9aa8d55b00b323f06ee70907b4a08";
+      sha512 = "285224e3a62ad4c93f63c24757e4d3d973a2c599baa7cb8729c3e4446e7ca054b38f80dcfec26b52491631f04aa10406b4fe25bd9e9d60174609ff6c446036f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sr/firefox-55.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "9f91c5c33e3d0f01ab28601fa41c02a048a3ef3899481c6ff5858a176b72e05f8113c2fa2dfff2527ad3477a7d2bc7df5fbaa1096b1765113da855da710d7abc";
+      sha512 = "3a4b5082d7f9afe834ff3236304b6a50a5b2262f9024ba8477bf6b2d25908d0aa440432b093a5e2d6a7c698a683e00ac299ffb1913d28298005dbbc38c8c1515";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sv-SE/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sv-SE/firefox-55.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "35c8fd0980cc641fd7bd4fd084f3d308840279ece55a33243396bbd0a3d9e500a3aab797fda63ff5d551acd82e21e48c152ff218e1a97ab395b009bea124df43";
+      sha512 = "dcad45f1cfa03e12c594665666d715310d29f0984ef4af446356c9d030decd9551782a1b591fad218c2421edafe7f2262200a2e6a1672ac41d7f16a9664ebd7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ta/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ta/firefox-55.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "037257799dd7cd3383a35c334ec99f53be8682ac14020c7f96426a7885d9257519e3d5ab8643045e97df703a4bc63424db9dfa29cd65d6291402a034000fcf21";
+      sha512 = "a351f1850772b6086a70d6c8f6edc5b0906b8b5a9dbb8c05dea8a75f4ebeb46b1e9077f2c145b5b557acf3e7382d72f94949a1a0420c5c04d9e7b17292ef5d63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/te/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/te/firefox-55.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "f0216fd72eba20ae094c54a4654356947441564661f6ecf5de399f55f05f7cb60370ac0072b2721d74cb40cf4c938cd3736cbd9b3a93cd641e3ef1a9089b4502";
+      sha512 = "8f1a725b309eff87d1ba130d02e6807a7202d91f0d7cee73672e6dd0dcc90b92b5a7aa73150d9c69140e9c27140b364557d289a644c1131c57d19a34d96acecd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/th/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/th/firefox-55.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "ff62cc5280928c0d9aad58c3b7fc52435f09e08d65e89ab0b7fb7280f3e61289d513f893dca2746e913121753c0f15e5a34c675c4074a0ff159e790d2bfad0f0";
+      sha512 = "95f20d59433954c0b26a709378a853f6297028126ffaf2beabbe0332acc9df3089dfbc0095f3aac503a04b0cdfce9f79199eed9ca04b810f213f5692a1fc4cad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/tr/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/tr/firefox-55.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "fc7f8d5120fb3b3c3699f13870fadf265ce7a43a1adadee89457a7df863d6da0f4d64b7f0b633d3526da39d825f30fbec3b9f1ae09bffb4c61681f4105bb5db7";
+      sha512 = "6eb68dc198c1106d48ea93b924dc961aaa10a7e89a74f7ffcd219f1de4952c403b19062bd23fa625f82cc9cdad0506f777aa57da6fb106050e962deffa79cc76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uk/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/uk/firefox-55.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "f0fb3de841925f81c64877efbc8b151cec744bd0b4997bdb9a086413e7106cf05c1dca49ee797dbd2d80bd1603554e006f47b21217e60d390ae91c6a1badac47";
+      sha512 = "c43f597db5027f6c1ba76e4308a7e733a78f1d3711a4529b5cc8f51eebe7bd2a55007975f248be698485fecb91ecbc43a141a94869e41445a07f90fa81d70cb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ur/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ur/firefox-55.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "3480fca8ef85b5db62b471c2986f124b92bd17c5682d57276b3f30fe0d3fde02f3d2a6e044f6c5157fc2bd3ab882e235f264aaeb319e09d234492c1aed674b92";
+      sha512 = "2d7af1f97cf035519c43e57ba4be3f95f64e2da816d01c924e82dd4c442d767098247f1bd7535f3d5c658254ba7a9ade752f97ca4951a6a0989f6303cfeb3354";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uz/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/uz/firefox-55.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "2460a419db6406542279daae938882fcc3ac29446b88a6315f3f7626925b906aed2d8a6250dfcc50c7eb87da3d57d231e4fcb5659a0fdc84ac188d4bbaf436aa";
+      sha512 = "f5173c595187661731aa3e4edb3fa35f3be9c0f494882a06e765142e193488e50538b1558ae094b8a0c462758601a89dc9105ecee6ed485435083f5c9ea67f6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/vi/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/vi/firefox-55.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "0e54d8a00a734b4fee5ef7cc2a831453c732573d53477e53bb202311de5524839ed2290f5ed6d93a20d5b63da765f7a621d8bafaf0150d522c755347ca49ff6f";
+      sha512 = "2b30eea824bf032526033203798ad34337e7151c45cc055ad7eba9def8f46b6108de2730ae5dea45627b65ed7ec617ca15b5372f23e3e4a33a303bb51ac4983b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/xh/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/xh/firefox-55.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "67950de9da98ae7bf867079f831cdcdcb5aca1f9caf951813f394e1e266787d90777e95fb33f46351086b25927ef108ee78f34b8152084410f8727ad7f3579ae";
+      sha512 = "2d098f192bfee274dd9c4cd806bf35bd311c50eb73a45e23eb5e497e636617e020c518f131520f5f0ba3d23864c97f09b4d9b46db9cc4d55c63be3731e990aa6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-CN/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/zh-CN/firefox-55.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "56b6bf4bdb5994f2550a47a0d6a6e5bf4eb5d456fc30e3472adb3efa909aeea17b86e24d799bc5eea11e60046afcb0eac61fe601c6e1c795ebb5a5440fc32738";
+      sha512 = "f89e61ad4c1b44d48e0e0e7be3dcd80df548e5f0d0932b915a2c37b36bd882cfd4d19c2d2261b64266a8317acb066b2c48db0348dbe37c14b748d5832f6c0e84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-TW/firefox-54.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/zh-TW/firefox-55.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "22fff4e32f6451b4378b45007c0fa7a1170a6897d13dfa1b0f814ac0ec9f48ea4dd5439a14aa7e9b1dabea19d0dbacd22f23dc431c38e023958692c5073147fb";
+      sha512 = "c8547fe1196a6b0ef8644edf69cdd68b74e208260c7e51f51a03d854374b0ed8623ebfb1e7c6e6c4d05edbc13e7862d0fdf260d77b7f2e125379258c4b3d44c6";
     }
     ];
 }

From 39e6dfe2f600cc1fff763008a7e7fdd8761f6273 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 7 Aug 2017 21:14:31 +0900
Subject: [PATCH 1653/3246] firefox: 54.0.1 -> 55.0

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 11d9324c042..359b959b94a 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,10 +6,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "54.0.1";
+    version = "55.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2";
+      sha512 = "b3ca0a926faedfc12c859965629330489ac6c05730a0dc38748704a1a25e876decfba78a3d665e22a6773b0a3bfed3109cd624be77d130785b4097d6d9f9c94b";
     };
 
     meta = {

From 5021ed9dd2e65778c6420d67d3d264f507f5f991 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 7 Aug 2017 21:14:34 +0900
Subject: [PATCH 1654/3246] firefox-esr: 52.2.1esr -> 52.3.0esr

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 359b959b94a..19dfba0b0eb 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -25,10 +25,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.2.1esr";
+    version = "52.3.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "1d79e6e4625cf7994f6d6bbdf227e483fc407bcdb20e0296ea604969e701f551b5df32f578d4669cf654b65927328c8eb0f717c7a12399bf1b02a6ac7a0cd1d3";
+      sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9";
     };
 
     meta = firefox.meta // {

From 95bbe17a048edc87606d5f3e652c17a58922b962 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 5 Aug 2017 16:39:33 +0200
Subject: [PATCH 1655/3246] git: add pcre2 support

---
 .../version-management/git-and-tools/git/default.nix      | 8 ++++++--
 pkgs/top-level/all-packages.nix                           | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 0b93ae1f203..54bb7719f29 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -1,12 +1,13 @@
 { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio
 , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
-, gzip, openssh
+, gzip, openssh, pcre2
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
 , libxslt, tcl, tk, makeWrapper, libiconv
 , svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs
 , guiSupport
 , withManual ? true
 , pythonSupport ? true
+, withpcre2 ? true
 , sendEmailSupport
 , darwin
 }:
@@ -44,6 +45,7 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
          docbook_xsl docbook_xml_dtd_45 libxslt ]
     ++ stdenv.lib.optionals guiSupport [tcl tk]
+    ++ stdenv.lib.optionals withpcre2 [ pcre2 ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
 
 
@@ -70,7 +72,9 @@ stdenv.mkDerivation {
   # so that `SPARSE_FLAGS' corresponds to the current architecture...
   #doCheck = true;
 
-  installFlags = "NO_INSTALL_HARDLINKS=1";
+  installFlags = "NO_INSTALL_HARDLINKS=1"
+    + (if withpcre2 then " USE_LIBPCRE2=1" else "");
+
 
   preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a56efb3e674..f03e7d75ddd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14425,6 +14425,7 @@ with pkgs;
   gitMinimal = git.override {
     withManual = false;
     pythonSupport = false;
+    withpcre2 = false;
   };
 
   gitRepo = callPackage ../applications/version-management/git-repo {

From f37972588db25ef22f5071fab64ab1a3e3a86c0a Mon Sep 17 00:00:00 2001
From: nonsequitur <cornelius.mika@gmail.com>
Date: Mon, 7 Aug 2017 15:42:16 +0200
Subject: [PATCH 1656/3246] ruby docs: fix text and example (#28006)

1. 'wrapper' has been renamed to 'wrappedRuby', so use this instead.
2. mkDerivation isn't called with a 'src' attribute, so skip the 'unpackPhase' to avoid an error.
3. Simplify the build command. 'mkdir' and 'patchShebangs' don't need to be called explicitly.
---
 doc/languages-frameworks/ruby.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index 4b48f7ffa1b..89b7a8986c3 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -82,7 +82,7 @@ versions available from various packages.
 </para>
 
 <para>Resulting derivations for both builders also have two helpful
-attributes, <literal>env</literal> and <literal>wrapper</literal>.
+attributes, <literal>env</literal> and <literal>wrappedRuby</literal>.
 The first one allows one to quickly drop into
 <command>nix-shell</command> with the specified environment present.
 E.g. <command>nix-shell -A sensu.env</command> would give you an
@@ -110,15 +110,11 @@ the needed dependencies. For example, to make a derivation
 
 in stdenv.mkDerivation {
   name = "my-script";
-
-  buildInputs = [ env.wrapper ];
-
+  buildInputs = [ env.wrappedRuby ];
+  phases = [ "installPhase" "fixupPhase" ];
   script = ./my-script.rb;
-
   buildCommand = ''
-    mkdir -p $out/bin
     install -D -m755 $script $out/bin/my-script
-    patchShebangs $out/bin/my-script
   '';
 }]]>
 </programlisting>

From 5261c449d82732f15d9570cf11958f40f2b8a5f6 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Tue, 1 Aug 2017 01:08:15 +0100
Subject: [PATCH 1657/3246] urxvt_autocomplete_all_the_things: init at 1.6.0

---
 .../default.nix                               | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix

diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
new file mode 100644
index 00000000000..f872e800836
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "urxvt-autocomplete-all-the-things-${version}";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "Vifon";
+    repo = "autocomplete-ALL-the-things";
+    rev = version;
+    sha256 = "06xd59c6gd9rglwq4km93n2p078k7v4x300lqrg1f32vvnjvs7sr";
+  };
+
+  installPhase = ''
+    mkdir -p $out/lib/urxvt/perl
+    cp autocomplete-ALL-the-things $out/lib/urxvt/perl
+  '';
+
+  meta = with stdenv.lib; {
+    description = "urxvt plugin allowing user to easily complete arbitrary text";
+    homepage = "https://github.com/Vifon/autocomplete-ALL-the-things";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ nickhu ];
+    platforms = with platforms; unix;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c92b744edb7..8e078e10f30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15925,6 +15925,7 @@ with pkgs;
 
   rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix {
     plugins = [
+      urxvt_autocomplete_all_the_things
       urxvt_perl
       urxvt_perls
       urxvt_tabbedex
@@ -15935,6 +15936,7 @@ with pkgs;
   };
 
   # urxvt plugins
+  urxvt_autocomplete_all_the_things = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things { };
   urxvt_perl = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perl { };
   urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { };
   urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { };

From b416579af4f20e4d7431faf12d37239002f0faf4 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 8 Aug 2017 00:32:36 +1000
Subject: [PATCH 1658/3246] leatherman: 0.11.2 -> 1.0.0

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

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index d45a616606d..a9c7a9b70bb 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "leatherman-${version}";
-  version = "0.11.2";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
-    sha256 = "1rnk204mvzc44i69b8gfb1fjj5r4qby7ymal782rdplnlbm065r8";
+    sha256 = "15kg6vdr1iav5x3pzwvrdsi54lbl8zh2xwqlp03gaq4n3kg5wj3y";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffca1ff4fb1..d75cf86744b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2942,9 +2942,7 @@ with pkgs;
 
   leafpad = callPackage ../applications/editors/leafpad { };
 
-  leatherman = callPackage ../development/libraries/leatherman {
-    boost = boost160;
-  };
+  leatherman = callPackage ../development/libraries/leatherman { };
 
   leela = callPackage ../tools/graphics/leela { };
 

From b99f162e40d9dfb3b8620da51d152add3ca3c644 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 8 Aug 2017 00:33:43 +1000
Subject: [PATCH 1659/3246] facter: 3.6.6 -> 3.7.1

---
 pkgs/tools/system/facter/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix      | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 55bf93608e8..56ac33ba23c 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.6.6";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
-    sha256 = "07jphvwfmvrq28f8k15k16kz090zvb11nn6bd895fz5axag01ins";
+    sha256 = "0v5g7qlqqixgvc2hf9440a8sfh8jvgzynwk5ipcb505hi00ddq7a";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   CXXFLAGS = "-fpermissive";
   NIX_CFLAGS_COMPILE = "-Wno-error";
+  NIX_LDFLAGS = "-lblkid";
 
   cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d75cf86744b..284d9901a4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1001,9 +1001,7 @@ with pkgs;
 
   facedetect = callPackage ../tools/graphics/facedetect { };
 
-  facter = callPackage ../tools/system/facter {
-    boost = boost160;
-  };
+  facter = callPackage ../tools/system/facter { };
 
   fasd = callPackage ../tools/misc/fasd { };
 

From a852d39ddafd461d6ae049ec41024c8ebdc029aa Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 8 Aug 2017 01:02:38 +1000
Subject: [PATCH 1660/3246] zabbix-cli: 1.6.1 -> 1.7.0

---
 pkgs/tools/misc/zabbix-cli/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix
index 77c06ea1911..f56f680c9eb 100644
--- a/pkgs/tools/misc/zabbix-cli/default.nix
+++ b/pkgs/tools/misc/zabbix-cli/default.nix
@@ -4,15 +4,20 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "zabbix-cli-${version}";
-  version = "1.6.1";
+  version = "1.7.0";
 
-  propagatedBuildInputs = with pythonPackages; [ argparse requests ];
+  propagatedBuildInputs = with pythonPackages; [ ipaddr requests ];
+
+  # argparse is part of the standardlib
+  prePatch = ''
+    substituteInPlace setup.py --replace "'argparse'," ""
+  '';
 
   src = fetchFromGitHub {
     owner = "usit-gd";
     repo = "zabbix-cli";
     rev = version;
-    sha256 = "17ip3s8ifgj264zwxrr857wk02xmzmlsjrr613mdhkgdwizqbcs3";
+    sha256 = "0z33mv8xk0h72rn0iz1qrrkyz63w6cln8d5hqqddcvkxwnq0z6kx";
   };
 
   meta = with lib; {

From 810fb0c9682053dcaa3eadfff4f52128f9cb5c4f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 7 Aug 2017 11:04:19 -0400
Subject: [PATCH 1661/3246] cc-wrapper: Don't slurp `NIX_DONT_SET_RPATH` twice

Otherwise we end with a definition like `1 1`, which doesn't trigger the right
conditional.
---
 pkgs/build-support/cc-wrapper/add-flags.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index b3a765d38e3..3d01dba6476 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -58,7 +58,6 @@ for pre in "${role_prefixes[@]}"; do
     slurpUnsalted CFLAGS_LINK
     slurpUnsalted CXXSTDLIB_COMPILE
     slurpUnsalted CXXSTDLIB_LINK
-    slurpUnsalted DONT_SET_RPATH
     slurpUnsalted GNATFLAGS_COMPILE
     slurpUnsalted IGNORE_LD_THROUGH_GCC
     slurpUnsalted LDFLAGS

From 795c00335989c3721895dd170eb26cf2d3d70e56 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 7 Aug 2017 17:21:08 +0200
Subject: [PATCH 1662/3246] isabelle: use polyml 5.6

Isabelle 2016 does not work with newer PolyML versions.
---
 pkgs/development/compilers/polyml/5.6.nix | 33 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/compilers/polyml/5.6.nix

diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
new file mode 100644
index 00000000000..8b5d14e7f5f
--- /dev/null
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, autoreconfHook}:
+
+let
+  version = "5.6";
+in
+
+stdenv.mkDerivation {
+  name = "polyml-${version}";
+
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure.ac --replace stdc++ c++
+  '';
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
+    sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0";
+  };
+
+  meta = {
+    description = "Standard ML compiler and interpreter";
+    longDescription = ''
+      Poly/ML is a full implementation of Standard ML.
+    '';
+    homepage = http://www.polyml.org/;
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = [ #Add your name here!
+      stdenv.lib.maintainers.z77z
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffca1ff4fb1..e6b6bfe112f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6314,6 +6314,7 @@ with pkgs;
   pltScheme = racket; # just to be sure
 
   polyml = callPackage ../development/compilers/polyml { };
+  polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
 
   pure = callPackage ../development/interpreters/pure {
     llvm = llvm_35;
@@ -18198,6 +18199,7 @@ with pkgs;
   tini = callPackage ../applications/virtualization/tini {};
 
   isabelle = callPackage ../applications/science/logic/isabelle {
+    polyml = polyml56;
     java = if stdenv.isLinux then jre else jdk;
   };
 

From bcc285848527cb12be9b14b125552afa84389e7b Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 8 Aug 2017 01:21:56 +1000
Subject: [PATCH 1663/3246] pick: 1.6.1 -> 1.7.0

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

diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix
index 075949f47e1..5fda26bacad 100644
--- a/pkgs/tools/misc/pick/default.nix
+++ b/pkgs/tools/misc/pick/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pick-${version}";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
-    owner = "thoughtbot";
+    owner = "calleerlandsson";
     repo = "pick";
     rev = "v${version}";
-    sha256 = "0iw3yqwg8j0pg56xx52xwn7n95vxlqbqh71zrc934v4mq971qlhd";
+    sha256 = "1x7ql530rj4yj50dzp8526mz92g4hhqxnig1qgiq3h3k815p31qb";
   };
 
   buildInputs = [ ncurses ];

From 4825e4818b092571ce91a48272bb0f718b161ce7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Aug 2017 11:32:26 -0400
Subject: [PATCH 1664/3246] linux: 4.9.40 -> 4.9.41

---
 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 4ad4a5dfef7..fb7440a04ae 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.40";
+  version = "4.9.41";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "16rdcvqkgb8hfzkkzbkhznnab22z43prm56jbrxnqr9acprnfmq2";
+    sha256 = "11y6q0mmi3z6pg4h0prv67pr1a78rvrzw75ygg6720dz0jzvnnmd";
   };
 
   kernelPatches = args.kernelPatches;

From ea2a10e143b83538c68864338752396dbc36424c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Aug 2017 11:35:42 -0400
Subject: [PATCH 1665/3246] linux: 4.4.79 -> 4.4.80

---
 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 d421633553a..16699dcdf43 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.79";
+  version = "4.4.80";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1a5wprjimsnx49sdg05ndmnx84m24fl48s64jvdpz58i3sss7g8d";
+    sha256 = "1hs07k49sbpi8yw2mdwn1967i82x4wn6kg0lbjvv5l1pv3alky1l";
   };
 
   kernelPatches = args.kernelPatches;

From 06af1df85731837b16002c4ec8dc185059a2aa85 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Aug 2017 11:40:01 -0400
Subject: [PATCH 1666/3246] linux: 4.13-rc3 -> 4.13-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 5106aacbe61..281cc7186b6 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13-rc3";
-  modDirVersion = "4.13.0-rc3";
+  version = "4.13-rc4";
+  modDirVersion = "4.13.0-rc4";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "07cxqf57hgs3wnbvkqixiwhjrwdf433pjwmh0hv1id0bk8wdrjjl";
+    sha256 = "00yiihmgifvl4bas861p87166nb1mf59b6nm5jsfk2zr27pszlyx";
   };
 
   features.iwlwifi = true;

From 4edcfa3eb72203d6170fffcac7e9fe8d577e9831 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Aug 2017 11:44:35 -0400
Subject: [PATCH 1667/3246] gradle: 4.0.2 -> 4.1

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 49fd080df45..45a4d8a8358 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-4.0.2";
+    name = "gradle-4.1";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "08ns3p1w258cbfk6yg3yy2mmy7wwma5riq04yjjgc4dx889l5b3r";
+      sha256 = "0hzdz5cy5dmyqz73qy80q74aiy87jl5vnxcy3imahgaszffglpfm";
     };
   };
 

From ca64eaadf87d19c444e619b006c8436e9521dcf6 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 31 Jul 2017 12:40:41 +0200
Subject: [PATCH 1668/3246] postage: init at 3.2.17 & add NixOS module

---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/databases/postage.nix | 205 +++++++++++++++++++
 pkgs/applications/misc/postage/default.nix   |  27 +++
 pkgs/top-level/all-packages.nix              |   2 +
 4 files changed, 235 insertions(+)
 create mode 100644 nixos/modules/services/databases/postage.nix
 create mode 100644 pkgs/applications/misc/postage/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7dea5cb9da..a1dce1e8b44 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -186,6 +186,7 @@
   ./services/databases/neo4j.nix
   ./services/databases/openldap.nix
   ./services/databases/opentsdb.nix
+  ./services/databases/postage.nix
   ./services/databases/postgresql.nix
   ./services/databases/redis.nix
   ./services/databases/riak.nix
diff --git a/nixos/modules/services/databases/postage.nix b/nixos/modules/services/databases/postage.nix
new file mode 100644
index 00000000000..d49c9a83a46
--- /dev/null
+++ b/nixos/modules/services/databases/postage.nix
@@ -0,0 +1,205 @@
+{ lib, pkgs, config, ... } :
+
+with lib;
+
+let
+  cfg = config.services.postage;
+
+  confFile = pkgs.writeTextFile {
+    name = "postage.conf";
+    text =  ''
+      connection_file = ${postageConnectionsFile}
+
+      allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections}
+
+      postage_port = ${toString cfg.port}
+
+      super_only = ${builtins.toJSON cfg.superOnly}
+
+      ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"}
+
+      login_timeout = ${toString cfg.loginTimeout}
+
+      web_root = ${cfg.package}/etc/postage/web_root
+
+      data_root = ${cfg.dataRoot}
+
+      ${optionalString (!isNull cfg.tls) ''
+      tls_cert = ${cfg.tls.cert}
+      tls_key = ${cfg.tls.key}
+      ''}
+
+      log_level = ${cfg.logLevel}
+    '';
+  };
+
+  postageConnectionsFile = pkgs.writeTextFile {
+    name = "postage-connections.conf";
+    text = concatStringsSep "\n"
+      (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections);
+  };
+
+  postage = "postage";
+in {
+
+  options.services.postage = {
+    enable = mkEnableOption "PostgreSQL Administration for the web";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.postage;
+      defaultText = "pkgs.postage";
+      description = ''
+        The postage package to use.
+      '';
+    };
+
+    connections = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      example = {
+        "nuc-server"  = "hostaddr=192.168.0.100 port=5432 dbname=postgres";
+        "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
+      };
+      description = ''
+        Postage requires at least one PostgreSQL server be defined.
+        </para><para>
+        Detailed information about PostgreSQL connection strings is available at:
+        <link xlink:href="http://www.postgresql.org/docs/current/static/libpq-connect.html"/>
+        </para><para>
+        Note that you should not specify your user name or password. That
+        information will be entered on the login screen. If you specify a
+        username or password, it will be removed by Postage before attempting to
+        connect to a database.
+      '';
+    };
+
+    allowCustomConnections = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        This tells Postage whether or not to allow anyone to use a custom
+        connection from the login screen.
+      '';
+    };
+
+    port = mkOption {
+      type = types.int;
+      default = 8080;
+      description = ''
+        This tells Postage what port to listen on for browser requests.
+      '';
+    };
+
+    localOnly = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        This tells Postage whether or not to set the listening socket to local
+        addresses only.
+      '';
+    };
+
+    superOnly = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        This tells Postage whether or not to only allow super users to
+        login. The recommended value is true and will restrict users who are not
+        super users from logging in to any PostgreSQL instance through
+        Postage. Note that a connection will be made to PostgreSQL in order to
+        test if the user is a superuser.
+      '';
+    };
+
+    loginGroup = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        This tells Postage to only allow users in a certain PostgreSQL group to
+        login to Postage. Note that a connection will be made to PostgreSQL in
+        order to test if the user is a member of the login group.
+      '';
+    };
+
+    loginTimeout = mkOption {
+      type = types.int;
+      default = 3600;
+      description = ''
+        Number of seconds of inactivity before user is automatically logged
+        out.
+      '';
+    };
+
+    dataRoot = mkOption {
+      type = types.str;
+      default = "/var/lib/postage";
+      description = ''
+        This tells Postage where to put the SQL file history. All tabs are saved
+        to this location so that if you get disconnected from Postage you
+        don't lose your work.
+      '';
+    };
+
+    tls = mkOption {
+      type = types.nullOr (types.submodule {
+        options = {
+          cert = mkOption {
+            type = types.str;
+            description = "TLS certificate";
+          };
+          key = mkOption {
+            type = types.str;
+            description = "TLS key";
+          };
+        };
+      });
+      default = null;
+      description = ''
+        These options tell Postage where the TLS Certificate and Key files
+        reside. If you use these options then you'll only be able to access
+        Postage through a secure TLS connection. These options are only
+        necessary if you wish to connect directly to Postage using a secure TLS
+        connection. As an alternative, you can set up Postage in a reverse proxy
+        configuration. This allows your web server to terminate the secure
+        connection and pass on the request to Postage. You can find help to set
+        up this configuration in:
+        <link xlink:href="https://github.com/workflowproducts/postage/blob/master/INSTALL_NGINX.md"/>
+      '';
+    };
+
+    logLevel = mkOption {
+      type = types.enum ["error" "warn" "notice" "info"];
+      default = "error";
+      description = ''
+        Verbosity of logs
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.postage = {
+      description = "postage - PostgreSQL Administration for the web";
+      wants    = [ "postgresql.service" ];
+      after    = [ "postgresql.service" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User         = postage;
+        Group        = postage;
+        ExecStart    = "${pkgs.postage}/sbin/postage -c ${confFile}" +
+                       optionalString cfg.localOnly " --local-only=true";
+      };
+    };
+    users = {
+      users."${postage}" = {
+        name  = postage;
+        group = postage;
+        home  = cfg.dataRoot;
+        createHome = true;
+      };
+      groups."${postage}" = {
+        name = postage;
+      };
+    };
+  };
+}
diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/postage/default.nix
new file mode 100644
index 00000000000..17f718182e2
--- /dev/null
+++ b/pkgs/applications/misc/postage/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
+
+stdenv.mkDerivation rec {
+  name = "postage-${version}";
+  version = "3.2.17";
+
+  src = fetchFromGitHub {
+    owner  = "workflowproducts";
+    repo   = "postage";
+    rev    = "eV${version}";
+    sha256 = "1c9ss5vx8s05cgw68z7y224qq8z8kz8rxfgcayd2ny200kqyn5bl";
+  };
+
+  buildInputs = [ postgresql openssl ];
+
+  meta = with stdenv.lib; {
+    description = "A fast replacement for PGAdmin";
+    longDescription = ''
+      At the heart of Postage is a modern, fast, event-based C-binary, built in
+      the style of NGINX and Node.js. This heart makes Postage as fast as any
+      PostgreSQL interface can hope to be.
+    '';
+    homepage = http://www.workflowproducts.com/postage.html;
+    license = licenses.asl20;
+    maintainers = [ maintainers.basvandijk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6ed1a6715e..46cf5eb2c1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18769,6 +18769,8 @@ with pkgs;
 
   opkg-utils = callPackage ../tools/package-management/opkg-utils { };
 
+  postage = callPackage ../applications/misc/postage { };
+
   pgadmin = callPackage ../applications/misc/pgadmin { };
 
   pgf = pgf2;

From 3270aa896bc78ee261c34137035d2705aba78440 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Mon, 7 Aug 2017 00:05:18 +0200
Subject: [PATCH 1669/3246] replace "Mac OS X" and "OS X" with "macOS"

as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
---
 doc/languages-frameworks/haskell.md           |  2 +-
 .../manual/installation/installing-usb.xml    |  2 +-
 nixos/modules/services/editors/emacs.xml      |  4 ++--
 .../audio/freewheeling/default.nix            |  2 +-
 .../editors/jetbrains/default.nix             |  2 +-
 .../applications/editors/vim/configurable.nix |  2 +-
 pkgs/applications/editors/vim/macvim.nix      |  2 +-
 pkgs/applications/editors/vim/qvim.nix        |  2 +-
 pkgs/applications/editors/vscode/default.nix  |  4 ++--
 .../graphics/openscad/default.nix             |  2 +-
 pkgs/applications/misc/gqrx/default.nix       |  2 +-
 .../misc/qsyncthingtray/default.nix           |  2 +-
 pkgs/applications/misc/sequelpro/default.nix  |  2 +-
 pkgs/applications/misc/truecrypt/default.nix  |  6 +++---
 .../networking/ftp/filezilla/default.nix      |  2 +-
 .../messenger-for-desktop/default.nix         |  2 +-
 .../networking/sniffers/wireshark/default.nix |  2 +-
 pkgs/applications/office/gnucash/2.6.nix      |  2 +-
 pkgs/applications/office/gnucash/default.nix  |  2 +-
 .../science/astronomy/gravit/default.nix      |  2 +-
 pkgs/applications/video/kodi/plugins.nix      |  2 +-
 .../video/mediathekview/default.nix           |  2 +-
 .../virtualization/xhyve/default.nix          |  2 +-
 .../setup-hooks/fix-darwin-dylib-names.sh     |  2 +-
 .../setup-hooks/fix-darwin-frameworks.sh      |  2 +-
 pkgs/data/documentation/zeal/default.nix      |  2 +-
 .../development/compilers/chicken/default.nix |  2 +-
 pkgs/development/compilers/llvm/3.8/llvm.nix  |  2 +-
 .../compilers/ocaml/configure-3.08.0          |  2 +-
 .../haskell-modules/generic-builder.nix       |  4 ++--
 .../haskell-modules/hackage-packages.nix      | 20 +++++++++----------
 .../haskell-modules/with-packages-wrapper.nix |  2 +-
 .../libraries/freenect/default.nix            |  2 +-
 .../libraries/hunspell/default.nix            |  4 ++--
 .../libraries/libmemcached/default.nix        |  2 +-
 .../libraries/libserialport/default.nix       |  2 +-
 .../libraries/libsndfile/default.nix          |  2 +-
 pkgs/development/libraries/opencv/3.x.nix     |  4 ++--
 .../libraries/wxwidgets/2.8/default.nix       |  2 +-
 .../libraries/wxwidgets/2.9/default.nix       |  2 +-
 .../libraries/wxwidgets/3.0/default.nix       |  2 +-
 .../libraries/wxwidgets/3.0/mac.nix           |  2 +-
 .../mobile/titaniumenv/build-app.nix          |  4 ++--
 .../ocaml-modules/ocamlnat/default.nix        |  2 +-
 pkgs/development/pharo/vm/build-vm.nix        |  2 +-
 pkgs/development/python-modules/pyqt/4.x.nix  |  2 +-
 .../tools/gtk-mac-bundler/default.nix         |  2 +-
 pkgs/games/tintin/default.nix                 |  2 +-
 pkgs/games/unvanquished/default.nix           |  2 +-
 pkgs/games/warsow/default.nix                 |  2 +-
 pkgs/games/xonotic/default.nix                |  2 +-
 pkgs/os-specific/darwin/cctools/port.nix      |  2 +-
 .../os-specific/darwin/opencflite/default.nix |  2 +-
 .../darwin/security-tool/default.nix          |  2 +-
 .../darwin/usr-include/default.nix            |  2 +-
 .../servers/cloud-print-connector/default.nix |  4 ++--
 .../tools/filesystems/darling-dmg/default.nix |  2 +-
 pkgs/tools/misc/diffoscope/default.nix        |  2 +-
 pkgs/tools/misc/umlet/default.nix             |  2 +-
 pkgs/tools/text/gnugrep/default.nix           |  2 +-
 pkgs/tools/text/popfile/default.nix           |  2 +-
 pkgs/top-level/python-packages.nix            |  6 +++---
 62 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 68894994392..930bd261615 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -827,7 +827,7 @@ the work to be licensed" under the terms of the LGPL (including for free).
 
 The LGPL licensing for GMP is a problem for the overall licensing of binary
 programs compiled with GHC because most distributions (and builds) of GHC use
-static libraries. (Dynamic libraries are currently distributed only for OS X.)
+static libraries. (Dynamic libraries are currently distributed only for macOS.)
 The LGPL licensing situation may be worse: even though
 [The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license)
 is essentially a "free software" license (BSD3), according to
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 4a74e406b14..b97f989d902 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -11,7 +11,7 @@ a USB stick. You can use the <command>dd</command> utility to write the image:
 <command>dd if=<replaceable>path-to-image</replaceable>
 of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the
 correct drive; you can use the <command>lsblk</command> command to get a list of
-block devices. If you're on OS X you can run <command>diskutil list</command>
+block devices. If you're on macOS you can run <command>diskutil list</command>
 to see the list of devices; the device you'll use for the USB must be ejected
 before writing the image.</para>
 
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 9d6395ebd74..dd66bac442c 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -24,7 +24,7 @@
   <para>
     Emacs runs within a graphical desktop environment using the X
     Window System, but works equally well on a text terminal. Under
-    <productname>OS X</productname>, a "Mac port" edition is
+    <productname>macOS</productname>, a "Mac port" edition is
     available, which uses Apple's native GUI frameworks.
   </para>
 
@@ -84,7 +84,7 @@
             <listitem>
               <para>
                 Emacs 25 with the "Mac port" patches, providing a more
-                native look and feel under OS X.
+                native look and feel under macOS.
               </para>
             </listitem>
           </varlistentry>
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index 4633718b40c..f37b44f9231 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
         improv. We leave mice and menus, and dive into our own process
         of making sound.
 
-        Freewheeling runs under Mac OS X and Linux, and is open source
+        Freewheeling runs under macOS and Linux, and is open source
         software, released under the GNU GPL license.
     '' ;
 
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 186f9d2c23b..6416184f2e2 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -21,7 +21,7 @@ let
         inherit description license;
         longDescription = ''
           Enhancing productivity for every C and C++
-          developer on Linux, OS X and Windows.
+          developer on Linux, macOS and Windows.
         '';
         maintainers = with maintainers; [ edwtjo mic92 ];
         platforms = platforms.linux;
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 97e430fded6..0f81b0bdd64 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -89,7 +89,7 @@ composableDerivation {
           NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
             "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
         };
-      } #Disable Darwin (Mac OS X) support.
+      } #Disable Darwin (macOS) support.
       // edf { name = "xsmp"; } #Disable XSMP session management
       // edf { name = "xsmp_interact"; } #Disable XSMP interaction
       // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter.
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index a688170b8ad..bb265e90b77 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Vim - the text editor - for Mac OS X";
+    description = "Vim - the text editor - for macOS";
     homepage    = https://github.com/b4winckler/macvim;
     license = licenses.vim;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index 5e98b3c9a78..c23bf360daf 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -43,7 +43,7 @@ composableDerivation {
           '';
         };
       }
-      // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support.
+      // edf { name = "darwin"; } #Disable Darwin (macOS) support.
       // edf { name = "xsmp"; } #Disable XSMP session management
       // edf { name = "xsmp_interact"; } #Disable XSMP interaction
       // edf { name = "mzscheme"; } #Include MzScheme interpreter.
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 18eb1803fd6..45a734216cf 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -77,11 +77,11 @@ in
     meta = with stdenv.lib; {
       description = ''
         Open source source code editor developed by Microsoft for Windows,
-        Linux and OS X
+        Linux and macOS
       '';
       longDescription = ''
         Open source source code editor developed by Microsoft for Windows,
-        Linux and OS X. It includes support for debugging, embedded Git
+        Linux and macOS. It includes support for debugging, embedded Git
         control, syntax highlighting, intelligent code completion, snippets,
         and code refactoring. It is also customizable, so users can change the
         editor's theme, keyboard shortcuts, and preferences
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index c2830b2df3d..e7a05c522ca 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "3D parametric model compiler";
     longDescription = ''
       OpenSCAD is a software for creating solid 3D CAD objects. It is free
-      software and available for Linux/UNIX, MS Windows and Mac OS X.
+      software and available for Linux/UNIX, MS Windows and macOS.
 
       Unlike most free software for creating 3D models (such as the famous
       application Blender) it does not focus on the artistic aspects of 3D
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 3fda4d8881a..5ad03c88c64 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     # Some of the code comes from the Cutesdr project, with a BSD license, but
     # it's currently unknown which version of the BSD license that is.
     license = licenses.gpl3Plus;
-    platforms = platforms.linux;  # should work on Darwin / OS X too
+    platforms = platforms.linux;  # should work on Darwin / macOS too
     maintainers = with maintainers; [ bjornfor the-kenny fpletz ];
   };
 }
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index e8ab85121da..f283c250b5b 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -49,7 +49,7 @@ mkDerivation rec {
     description = "A Traybar Application for Syncthing written in C++";
     longDescription = ''
         A cross-platform status bar for Syncthing.
-        Currently supports OS X, Windows and Linux.
+        Currently supports macOS, Windows and Linux.
         Written in C++ with Qt.
     '';
     license = licenses.lgpl3;
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix
index 4908769bef6..fc63745ebb8 100644
--- a/pkgs/applications/misc/sequelpro/default.nix
+++ b/pkgs/applications/misc/sequelpro/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "MySQL database management for Mac OS X";
+    description = "MySQL database management for macOS";
     homepage = http://www.sequelpro.com/;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.darwin;
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
index bc15b084cd9..2b66dd41a2a 100644
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ b/pkgs/applications/misc/truecrypt/default.nix
@@ -1,17 +1,17 @@
 /*
-Requirements for Building TrueCrypt for Linux and Mac OS X:
+Requirements for Building TrueCrypt for Linux and macOS:
 -----------------------------------------------------------
 
 - GNU Make
 - GNU C++ Compiler 4.0 or compatible
-- Apple XCode (Mac OS X only)
+- Apple XCode (macOS only)
 - pkg-config
 - wxWidgets 2.8 library source code (available at http://www.wxwidgets.org)
 - FUSE library (available at http://fuse.sourceforge.net and
   http://code.google.com/p/macfuse)
 
 
-Instructions for Building TrueCrypt for Linux and Mac OS X:
+Instructions for Building TrueCrypt for Linux and macOS:
 -----------------------------------------------------------
 
 1) Change the current directory to the root of the TrueCrypt source code.
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index dcd143a5156..e64561bc4c9 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     longDescription = ''
       FileZilla Client is a free, open source FTP client. It supports
       FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available
-      under many platforms, binaries for Windows, Linux and Mac OS X are
+      under many platforms, binaries for Windows, Linux and macOS are
       provided.
     '';
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
index f12a14c5c92..37a3746669b 100644
--- a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
@@ -89,7 +89,7 @@ in stdenv.mkDerivation {
     description = "Bring messenger.com to your Linux desktop.";
     longDescription = ''
       A simple & beautiful desktop client for Facebook Messenger. Chat without
-      distractions on OS X, Windows and Linux. Not affiliated with Facebook.
+      distractions on macOS, Windows and Linux. Not affiliated with Facebook.
       This is NOT an official product.
     '';
     homepage = https://messengerfordesktop.org;
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 326529d1e0f..aa59e035f1f 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -61,7 +61,7 @@ in stdenv.mkDerivation {
     longDescription = ''
       Wireshark (formerly known as "Ethereal") is a powerful network
       protocol analyzer developed by an international team of networking
-      experts. It runs on UNIX, OS X and Windows.
+      experts. It runs on UNIX, macOS and Windows.
     '';
 
     platforms = platforms.unix;
diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index 50daf38978a..3421abc557f 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
       GnuCash is personal and small-business financial-accounting software,
       freely licensed under the GNU GPL and available for GNU/Linux, BSD,
-      Solaris, Mac OS X and Microsoft Windows.
+      Solaris, macOS and Microsoft Windows.
 
       Designed to be easy to use, yet powerful and flexible, GnuCash allows
       you to track bank accounts, stocks, income and expenses.  As quick and
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 1eedf1f313b..4ed15081312 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
       GnuCash is personal and small-business financial-accounting software,
       freely licensed under the GNU GPL and available for GNU/Linux, BSD,
-      Solaris, Mac OS X and Microsoft Windows.
+      Solaris, macOS and Microsoft Windows.
 
       Designed to be easy to use, yet powerful and flexible, GnuCash allows
       you to track bank accounts, stocks, income and expenses.  As quick and
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index 02723530ba1..5903edd337d 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
     longDescription = ''
       Gravit is a gravity simulator which runs under Linux, Windows and
-      Mac OS X. It uses Newtonian physics using the Barnes-Hut N-body
+      macOS. It uses Newtonian physics using the Barnes-Hut N-body
       algorithm. Although the main goal of Gravit is to be as accurate
       as possible, it also creates beautiful looking gravity patterns.
       It records the history of each particle so it can animate and
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 6897f9df1a1..c5ad331987b 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -23,7 +23,7 @@ rec {
       description = "A program launcher for Kodi";
       longDescription = ''
         Advanced Launcher allows you to start any Linux, Windows and
-        OS X external applications (with command line support or not)
+        macOS external applications (with command line support or not)
         directly from the Kodi GUI. Advanced Launcher also give you
         the possibility to edit, download (from Internet resources)
         and manage all the meta-data (informations and images) related
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index be4363c8314..93a8d207054 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
     homepage = http://zdfmediathk.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ maintainers.chaoflow ];
-    platforms = platforms.linux;  #  also OS X and cygwin, but not investigated, yet
+    platforms = platforms.linux;  #  also macOS and cygwin, but not investigated, yet
   };
 }
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
index 0e45b836b01..2a685c590fa 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Lightweight Virtualization on OS X Based on bhyve";
+    description = "Lightweight Virtualization on macOS Based on bhyve";
     homepage = https://github.com/mist64/xhyve;
     maintainers = [ lib.maintainers.lnl7 ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
index 8fe66102677..1b36f5f555d 100644
--- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
+++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
@@ -1,4 +1,4 @@
-# On Mac OS X, binaries refer to dynamic library dependencies using
+# On macOS, binaries refer to dynamic library dependencies using
 # either relative paths (e.g. "libicudata.dylib", searched relative to
 # $DYLD_LIBRARY_PATH) or absolute paths
 # (e.g. "/nix/store/.../lib/libicudata.dylib").  In Nix, the latter is
diff --git a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh
index e3a08b2598d..cf8416c0838 100644
--- a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh
+++ b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh
@@ -1,4 +1,4 @@
-# On Mac OS X, frameworks are linked to the system CoreFoundation but
+# On macOS, frameworks are linked to the system CoreFoundation but
 # dynamic libraries built with nix use a pure version of CF this
 # causes segfaults for binaries that depend on it at runtime.  This
 # can be solved in two ways.
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index cd3fe3e2dd2..cf138abee88 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A simple offline API documentation browser";
     longDescription = ''
-      Zeal is a simple offline API documentation browser inspired by Dash (OS X
+      Zeal is a simple offline API documentation browser inspired by Dash (macOS
       app), available for Linux and Windows.
     '';
     homepage = http://zealdocs.org/;
diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index 24d583ed886..792ecc739a5 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
       CHICKEN is a compiler for the Scheme programming language.
       CHICKEN produces portable and efficient C, supports almost all
       of the R5RS Scheme language standard, and includes many
-      enhancements and extensions. CHICKEN runs on Linux, MacOS X,
+      enhancements and extensions. CHICKEN runs on Linux, macOS,
       Windows, and many Unix flavours.
     '';
   };
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index ee0a50c9397..a3f652d783b 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   patches = [ ./D17533-1.patch ] ++
     stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch];
 
-  # hacky fix: New LLVM releases require a newer OS X SDK than
+  # hacky fix: New LLVM releases require a newer macOS SDK than
   # 10.9. This is a temporary measure until nixpkgs darwin support is
   # updated.
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/ocaml/configure-3.08.0 b/pkgs/development/compilers/ocaml/configure-3.08.0
index c62da78ab9f..9c870585512 100755
--- a/pkgs/development/compilers/ocaml/configure-3.08.0
+++ b/pkgs/development/compilers/ocaml/configure-3.08.0
@@ -45,7 +45,7 @@ gcc_warnings="-Wall"
 unset LANG
 unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME 
 
-# Turn off some MacOS X debugging stuff, same reason
+# Turn off some macOS debugging stuff, same reason
 unset RC_TRACE_ARCHIVES RC_TRACE_DYLIBS RC_TRACE_PREBINDING_DISABLED
 
 # Parse command-line arguments
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 7e99300a41e..9c1e75232d7 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -231,10 +231,10 @@ stdenv.mkDerivation ({
       fi
     done
   '' + (optionalString stdenv.isDarwin ''
-    # Work around a limit in the Mac OS X Sierra linker on the number of paths
+    # Work around a limit in the macOS Sierra linker on the number of paths
     # referenced by any one dynamic library:
     #
-    # Create a local directory with symlinks of the *.dylib (Mac OS X shared
+    # Create a local directory with symlinks of the *.dylib (macOS shared
     # libraries) from all the dependencies.
     local dynamicLinksDir="$out/lib/links"
     mkdir -p $dynamicLinksDir
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3b2d9594d98..b8ae7c4016e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -83327,7 +83327,7 @@ self: {
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
        homepage = "http://www.haskell.org/gtk2hs/";
-       description = "Bindings for the Gtk/OS X integration library";
+       description = "Bindings for the Gtk/macOS integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk-mac-integration-gtk2 = null;};
@@ -83591,7 +83591,7 @@ self: {
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        homepage = "http://www.haskell.org/gtk2hs/";
-       description = "Bindings for the Gtk/OS X integration library";
+       description = "Bindings for the Gtk/macOS integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk-mac-integration-gtk3 = null;};
@@ -95058,7 +95058,7 @@ self: {
        librarySystemDepends = [ Cocoa ];
        libraryToolDepends = [ CoreServices ];
        homepage = "http://github.com/luite/hfsevents";
-       description = "File/folder watching for OS X";
+       description = "File/folder watching for macOS";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" ];
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108820,7 +108820,7 @@ self: {
        libraryPkgconfigDepends = [ ige-mac-integration ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
-       description = "Bindings for the Gtk/OS X integration library";
+       description = "Bindings for the Gtk/macOS integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {ige-mac-integration = null;};
@@ -130347,7 +130347,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT haskell98 unix ];
-       description = "Shows how to run grabber on Mac OS X";
+       description = "Shows how to run grabber on macOS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -130745,7 +130745,7 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath haskell98 ];
-       description = "Makes an OS X .app bundle from a binary.";
+       description = "Makes an macOS .app bundle from a binary.";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -142686,7 +142686,7 @@ self: {
        sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
-       description = "Parser for OS X static archive format";
+       description = "Parser for macOS static archive format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -149409,7 +149409,7 @@ self: {
        sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
-       description = "Generate and parse Mac OS X property list format";
+       description = "Generate and parse macOS property list format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -178266,7 +178266,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time unix
        ];
        homepage = "https://bitbucket.org/ssaasen/spy";
-       description = "A compact file system watcher for Mac OS X, Linux and Windows";
+       description = "A compact file system watcher for macOS, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -197119,7 +197119,7 @@ self: {
        sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
-       description = "Parser for OS X Universal Binary format";
+       description = "Parser for macOS Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 147a021ff53..ec7d961581a 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -97,7 +97,7 @@ symlinkJoin {
       fi
     done
   '' + (lib.optionalString stdenv.isDarwin ''
-    # Work around a linker limit in Mac OS X Sierra (see generic-builder.nix):
+    # Work around a linker limit in macOS Sierra (see generic-builder.nix):
     local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
     local dynamicLinksDir="$out/lib/links"
     mkdir -p $dynamicLinksDir
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 136f18b0614..c77c3b3640b 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = {
-    description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X";
+    description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
     inherit version;
     homepage = http://openkinect.org;
     license = with stdenv.lib.licenses; [ gpl2 asl20 ];
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 952050f0e8f..dfb45aa598d 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla
       Firefox 3 & Thunderbird, Google Chrome, and it is also used by
-      proprietary software packages, like Mac OS X, InDesign, memoQ, Opera and
+      proprietary software packages, like macOS, InDesign, memoQ, Opera and
       SDL Trados.
 
       Main features:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       * C++ library under GPL/LGPL/MPL tri-license.
       * Interfaces and ports:
         * Enchant (Generic spelling library from the Abiword project),
-        * XSpell (Mac OS X port, but Hunspell is part of the OS X from version 10.6 (Snow Leopard), and
+        * XSpell (macOS port, but Hunspell is part of the macOS from version 10.6 (Snow Leopard), and
             now it is enough to place Hunspell dictionary files into
             ~/Library/Spelling or /Library/Spelling for spell checking),
         * Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO.
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index a0e3bb52dfe..086ba8f32d2 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   # Fix linking against libpthread (patch from Fedora)
   # https://bugzilla.redhat.com/show_bug.cgi?id=1037707
   # https://bugs.launchpad.net/libmemcached/+bug/1281907
-  # Fix building on OS X (patch from Homebrew)
+  # Fix building on macOS (patch from Homebrew)
   # https://bugs.launchpad.net/libmemcached/+bug/1245562
   patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
     ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix
index e7ee188c29f..ab10e34e230 100644
--- a/pkgs/development/libraries/libserialport/default.nix
+++ b/pkgs/development/libraries/libserialport/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     description = "Cross-platform shared library for serial port access";
     homepage = http://sigrok.org/;
     license = licenses.gpl3Plus;
-    # Mac OS X, Windows and Android is also supported (according to upstream).
+    # macOS, Windows and Android is also supported (according to upstream).
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index bd5d0fd733c..180d217ddf1 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       code format under the GNU Lesser General Public License.
 
       The library was written to compile and run on a Linux system but
-      should compile and run on just about any Unix (including MacOS X).
+      should compile and run on just about any Unix (including macOS).
       There are also pre-compiled binaries available for 32 and 64 bit
       windows.
 
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 0443d00a258..29d0a1a3a4c 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -37,7 +37,7 @@ let
     sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj";
   };
 
-  # This fixes the build on OS X.
+  # This fixes the build on macOS.
   # See: https://github.com/opencv/opencv_contrib/pull/926
   contribOSXFix = fetchpatch {
     url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch";
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     (lib.optionalString enableContrib ''
       cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
 
-      # This fixes the build on OS X.
+      # This fixes the build on macOS.
       patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}"
 
       for name in vgg_generated_48.i \
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index d9e84008b31..9ce8e95d9e9 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.wxWindows;
     homepage = https://www.wxwidgets.org/;
-    description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
+    description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
     longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
 }
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index a42189331d0..56080841ca3 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
     platforms = with platforms; darwin ++ linux;
     license = licenses.wxWindows;
     homepage = https://www.wxwidgets.org/;
-    description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
+    description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
     longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
 }
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 6e33f5580cd..35300ed9419 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
     platforms = with platforms; darwin ++ linux;
     license = licenses.wxWindows;
     homepage = https://www.wxwidgets.org/;
-    description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
+    description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
     longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
 }
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index 0e246829439..9c307b2d15a 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
     license = licenses.wxWindows;
     maintainers = [ maintainers.lnl7 ];
     homepage = https://www.wxwidgets.org/;
-    description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base";
+    description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
     longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
   };
 }
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index cf699c34e2b..0c9c3e3f42c 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -21,7 +21,7 @@ let
     security delete-keychain $keychainName
   '';
   
-  # On Mac OS X, the java executable shows an -unoffical postfix in the version
+  # On macOS, the java executable shows an -unoffical postfix in the version
   # number. This confuses the build script's version detector.
   # We fix this by creating a wrapper that strips it out of the output.
   
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
     ${if target == "android" then
         ''
           ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-            # Hack to make version detection work with OpenJDK on Mac OS X
+            # Hack to make version detection work with OpenJDK on macOS
             export PATH=${javaVersionFixWrapper}/bin:$PATH
             export JAVA_HOME=${javaVersionFixWrapper}
             javac -version
diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix
index 29ee6535624..9c4c2e21edd 100644
--- a/pkgs/development/ocaml-modules/ocamlnat/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       but up to 100 times faster. It is based on the optimizing native code
       compiler, the native runtime and an earlier prototype by Alain
       Frisch. It is build upon Just-In-Time techniques and currently
-      supports Unix-like systems (i.e. Linux, BSD or Mac OS X) running on
+      supports Unix-like systems (i.e. Linux, BSD or macOS) running on
       x86 or x86-64 processors. Support for additional architectures and
       operating systems is planned, but not yet available.
     '';
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 1f9e82f866e..c855919f802 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
     maintainers = [ ];
-    # Pharo VM sources are packaged separately for darwin (OS X)
+    # Pharo VM sources are packaged separately for darwin (macOS)
     platforms = with stdenv.lib;
                   intersectLists
                     platforms.mesaPlatforms
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index a5ae0aaa137..cf1e17d3141 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -19,7 +19,7 @@ in buildPythonPackage {
 
     export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
     ${stdenv.lib.optionalString stdenv.isDarwin ''
-      export QMAKESPEC="unsupported/macx-clang-libc++" # OS X target after bootstrapping phase \
+      export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \
     ''}
 
     substituteInPlace configure.py \
diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix
index 6a16a0372c1..833b41ae985 100644
--- a/pkgs/development/tools/gtk-mac-bundler/default.nix
+++ b/pkgs/development/tools/gtk-mac-bundler/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "a helper script that creates application bundles form GTK+ executables for Mac OS X";
+    description = "a helper script that creates application bundles form GTK+ executables for macOS";
     maintainers = [ maintainers.matthewbauer ];
     platforms = platforms.darwin;
     homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling;
diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix
index deb283c57c4..4514735bb70 100644
--- a/pkgs/games/tintin/default.nix
+++ b/pkgs/games/tintin/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A free MUD client for Mac OS X, Linux and Windows";
+    description = "A free MUD client for macOS, Linux and Windows";
     homepage    = http://tintin.sourceforge.net;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix
index 9ba3a442eb7..af50759fd2f 100644
--- a/pkgs/games/unvanquished/default.nix
+++ b/pkgs/games/unvanquished/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Unvanquished is a free, open-source first-person shooter
       combining real-time strategy elements with a futuristic, sci-fi
-      setting. It is available for Windows, Linux, and Mac OS X.
+      setting. It is available for Windows, Linux, and macOS.
 
       Features:
 
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index ef0e4640c39..f83c5ac360a 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
       Set in a futuristic cartoon-like world where rocketlauncher-wielding
       pigs and lasergun-carrying cyberpunks roam the streets, Warsow is a
       completely free fast-paced first-person shooter (FPS) for Windows, Linux
-      and Mac OS X.
+      and macOS.
     '';
     homepage = http://www.warsow.net;
     # Engine is under GPLv2, everything else is under
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index b6009ee72fd..531560fd309 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     description = "A free fast-paced first-person shooter";
     longDescription = ''
       Xonotic is a free, fast-paced first-person shooter that works on
-      Windows, OS X and Linux. The project is geared towards providing
+      Windows, macOS and Linux. The project is geared towards providing
       addictive arena shooter gameplay which is all spawned and driven
       by the community itself. Xonotic is a direct successor of the
       Nexuiz project with years of development between them, and it
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index df318cd4f4f..51547100752 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -109,7 +109,7 @@ let
 
     meta = {
       homepage = http://www.opensource.apple.com/source/cctools/;
-      description = "Mac OS X Compiler Tools (cross-platform port)";
+      description = "MacOS Compiler Tools (cross-platform port)";
       license = stdenv.lib.licenses.apsl20;
     };
   };
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
index 7759d119d50..4b32697c6ae 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "Cross platform port of the OS X CoreFoundation";
+    description = "Cross platform port of the macOS CoreFoundation";
     homepage = http://sourceforge.net/projects/opencflite/;
     license = stdenv.lib.licenses.apsl20;
   };
diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
index 6944d2b8b43..5a89940c9da 100644
--- a/pkgs/os-specific/darwin/security-tool/default.nix
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Command line interface to Mac OS X keychains and Security framework";
+    description = "Command line interface to macOS keychains and Security framework";
     maintainers = with maintainers; [
       copumpkin
       joelteon
diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix
index c5f7e3acce7..f0af0f6ba55 100644
--- a/pkgs/os-specific/darwin/usr-include/default.nix
+++ b/pkgs/os-specific/darwin/usr-include/default.nix
@@ -4,7 +4,7 @@
  * This is needed to build GCC on Darwin.
  *
  * These are the collection of headers that would normally be available under
- * /usr/include in OS X machines with command line tools installed. They need
+ * /usr/include in macOS machines with command line tools installed. They need
  * to be in one folder for gcc to use them correctly.
  */
 
diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix
index 3a28368cc81..3db3d932703 100644
--- a/pkgs/servers/cloud-print-connector/default.nix
+++ b/pkgs/servers/cloud-print-connector/default.nix
@@ -24,11 +24,11 @@ buildGoPackage rec {
   buildInputs = [ avahi cups ];
 
   meta = with stdenv.lib; {
-    description = "Share printers from your Windows, Linux, FreeBSD or OS X computer with ChromeOS and Android devices, using the Cloud Print Connector";
+    description = "Share printers from your Windows, Linux, FreeBSD or macOS computer with ChromeOS and Android devices, using the Cloud Print Connector";
     homepage = https://github.com/google/cloud-print-connector;
     license = licenses.bsd3;
     maintainers = with maintainers; [ hodapp ];
-    # TODO: Fix broken build on OS X.  The GitHub presently lists the
+    # TODO: Fix broken build on macOS.  The GitHub presently lists the
     # FreeBSD build as broken too, but this may change in the future.
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 7931df2cc57..9e640b18a92 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.darlinghq.org/;
-    description = "Darling lets you open OS X dmgs on Linux";
+    description = "Darling lets you open macOS dmgs on Linux";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3;
   };
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 9c0d51c4a85..6472f1ea09c 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
     sed -i setup.py -e "/'rpm-python',/d"
   '';
 
-  # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
+  # Still missing these tools: enjarify, otool & lipo (maybe macOS only), showttf
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
   pythonPath = with python3.pkgs;
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix
index 918ff2f3179..b7f08f90836 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       draw UML diagrams fast, produce sequence and activity diagrams from
       plain text, export diagrams to eps, pdf, jpg, svg, and clipboard,
       share diagrams using Eclipse, and create new, custom UML elements.
-      UMLet runs stand-alone or as Eclipse plug-in on Windows, OS X and
+      UMLet runs stand-alone or as Eclipse plug-in on Windows, macOS and
       Linux.
     '';
     homepage = http://www.umlet.com;
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 0db140c7891..089f3094b54 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   #doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD;
   doCheck = false;
 
-  # On Mac OS X, force use of mkdir -p, since Grep's fallback
+  # On macOS, force use of mkdir -p, since Grep's fallback
   # (./install-sh) is broken.
   preConfigure = ''
     export MKDIR_P="mkdir -p"
diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix
index 4048093a395..bda38297d66 100644
--- a/pkgs/tools/text/popfile/default.nix
+++ b/pkgs/tools/text/popfile/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     homepage = http://getpopfile.org;
     license = stdenv.lib.licenses.gpl2;
 
-    # Should work on OS X, but havent tested it.
+    # Should work on macOS, but havent tested it.
     # Windows support is more complicated.
     # http://getpopfile.org/docs/faq:systemrequirements
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb5aef27f13..4520a00c88d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -618,7 +618,7 @@ in {
     };
 
     meta = {
-      description = "Disable App Nap on OS X";
+      description = "Disable App Nap on macOS";
       homepage    = https://pypi.python.org/pypi/appnope;
       platforms   = platforms.darwin;
       license     = licenses.bsd3;
@@ -756,7 +756,7 @@ in {
       sha256 = "136f2ec0f94ec77ff2990830feee965d608cab1e8922370e3abdded383d52001";
     };
 
-    # Mac OS X needs clang for testing
+    # macOS needs clang for testing
     buildInputs = with self; [ pytest hypothesis zope_interface
     pympler coverage ]
      ++ optionals (stdenv.isDarwin) [ pkgs.clang ];
@@ -28416,7 +28416,7 @@ EOF
     doCheck = false;
 
     meta = {
-      description = "Send file to trash natively under Mac OS X, Windows and Linux";
+      description = "Send file to trash natively under macOS, Windows and Linux";
       homepage = https://github.com/hsoft/send2trash;
       license = licenses.bsd3;
     };

From 2f9724e804188bfbdf184631795fb130930cb0ec Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 7 Aug 2017 12:53:48 -0700
Subject: [PATCH 1670/3246] ffmpeg, ffmpeg-full: 3.3.2 -> 3.3.3

---
 pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/3.3.nix          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 4a02c034cf3..c0c9cfa2749 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -231,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
-    sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r";
+    sha256 = "07is8msrhxr1dk6vgwa192k2pl2a0in1h9w8f9cknlvbvhn01afj";
   };
 
   patchPhase = ''patchShebangs .
diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix
index 34213755313..bf414e0865d 100644
--- a/pkgs/development/libraries/ffmpeg/3.3.nix
+++ b/pkgs/development/libraries/ffmpeg/3.3.nix
@@ -6,7 +6,7 @@
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}";
-  branch = "3.3.2";
-  sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91";
+  branch = "3.3.3";
+  sha256 = "0wx421d7vp4nz8kgp0kg16sswikj8ff1pd18x9mmcbpmqy7sqs8h";
   darwinFrameworks = [ Cocoa CoreMedia ];
 })

From f46f98ad31e60d512732fb56c3230ab916a9f64b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Aug 2017 17:34:10 -0400
Subject: [PATCH 1671/3246] Revert 0cf0d7186a5259ae59b852c109f31ab09af56cec

Order common kernel config by functionality
See #27949
---
 .../linux/kernel/common-config.nix            | 1135 +++++++++--------
 1 file changed, 600 insertions(+), 535 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index c15839f7dfe..deb1d81775b 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -3,14 +3,11 @@
   WARNING/NOTE: whenever you want to add an option here you need to
   either
 
-  * make sure it works for all the versions in nixpkgs,
+  * mark it as an optional one with `?` suffix,
+  * or make sure it works for all the versions in nixpkgs,
   * or check for which kernel versions it will work (using kernel
     changelog, google or whatever) and mark it with `versionOlder` or
-    `versionAtLeast`
-
-  This file has a fairly obvious structure, follow it!
-  Do not duplicate predicates, sort options alphabetically, comment if
-  the option's functionality is non-obvious.
+    `versionAtLeast`.
 
   Then do test your change by building all the kernels (or at least
   their configs) in Nixpkgs or else you will guarantee lots and lots
@@ -24,636 +21,704 @@
 with stdenv.lib;
 
 ''
-# Globally applicable
+  # Compress kernel modules for a sizable disk space savings.
+  ${optionalString (versionAtLeast version "3.18") ''
+    MODULE_COMPRESS y
+    MODULE_COMPRESS_XZ y
+  ''}
 
-  8139TOO_8129 y
-  8139TOO_PIO n # PIO is slower
-  9P_FS_POSIX_ACL y
-  9P_FSCACHE y
-  ACCESSIBILITY y # Accessibility support
-  AIC79XX_DEBUG_ENABLE n
-  AIC7XXX_DEBUG_ENABLE n
-  AIC94XX_DEBUG n
-  ASYNC_RAID6_TEST n
-  ATH9K_AHB y # Ditto, AHB bus
-  ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
-  ATOMIC64_SELFTEST n
-  AUXDISPLAY y # Auxiliary Display support
-  B43_PHY_HT y
-  BACKTRACE_SELF_TEST n
-  BACKTRACE_SELF_TEST n
-  BCMA_HOST_PCI y
-  BINFMT_MISC y
-  BINFMT_SCRIPT y # Our initrd init uses shebang scripts, so can't be modular.
-  BLK_CGROUP y # required by CFQ
-  BLK_DEV_INITRD y # Enable initrd support
-  BLK_DEV_INTEGRITY y
-  BLK_DEV_RAM y # Enable initrd support
-  BLK_DEV_THROTTLING y
-  BONDING m
-  BRCMFMAC_USB y
-  BRIDGE_VLAN_FILTERING y
-  BSD_PROCESS_ACCT_V3 y
-  BT_HCIUART_BCSP y
-  BT_HCIUART_H4 y # UART (H4) protocol support
-  BT_HCIUART_LL y
-  BT_RFCOMM_TTY y # RFCOMM TTY support
-  BTRFS_FS_POSIX_ACL y
-  CC_OPTIMIZE_FOR_SIZE n # Optimize with -O2
-  CFG80211_WEXT y # Without it, ipw2200 drivers don't build
-  CFQ_GROUP_IOSCHED y
-  CGROUP_DEVICE y
-  CGROUPS y # used by systemd
-  CIFS_ACL y
-  CIFS_DFS_UPCALL y
-  CIFS_FSCACHE y
-  CIFS_POSIX y
-  CIFS_STATS y
-  CIFS_UPCALL y
-  CIFS_WEAK_PW_HASH y
-  CIFS_XATTR y
-  CLEANCACHE y
-  CLS_U32_MARK y
-  CLS_U32_PERF y
-  CONNECTOR y # PROC_EVENTS requires that the netlink connector is not built as a module
-  CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
-  CRASH_DUMP n
-  CRC32_SELFTEST n
-  CRYPTO_TEST n
-  DEBUG_DEVRES n
+  KERNEL_XZ y
+
+  # Debugging.
   DEBUG_KERNEL y
+  DYNAMIC_DEBUG y
+  BACKTRACE_SELF_TEST n
+  DEBUG_DEVRES n
   DEBUG_STACK_USAGE n
   DEBUG_STACKOVERFLOW n
-  DEFAULT_SECURITY_APPARMOR y
-  DETECT_HUNG_TASK y
-  DEVTMPFS y
-  DONGLE y # Serial dongle support
-  DRM_GMA3600 y
-  DRM_GMA600 y
-  DRM_LOAD_EDID_FIRMWARE y
-  DVB_DYNAMIC_MINORS y # we use udev
-  EFI_STUB y # EFI bootloader in the bzImage itself
-  EXT2_FS_POSIX_ACL y
-  EXT2_FS_SECURITY y
-  EXT2_FS_XATTR y
-  EXT3_FS_POSIX_ACL y
-  EXT3_FS_SECURITY y
-  EXT4_FS_POSIX_ACL y
-  EXT4_FS_SECURITY y
-  F2FS_FS m
-  FANOTIFY y
-  FB y
-  FB_3DFX_ACCEL y
-  FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
-  FB_ATY_GX y # Mach64 GX support
-  FB_EFI y
-  FB_NVIDIA_I2C y # Enable DDC Support
-  FB_RIVA_I2C y
-  FB_SAVAGE_ACCEL y
-  FB_SAVAGE_I2C y
-  FB_SIS_300 y
-  FB_SIS_315 y
-  FB_VESA y
-  FHANDLE y # used by systemd
-  FRAMEBUFFER_CONSOLE y
-  FRAMEBUFFER_CONSOLE_ROTATION y
-  FRONTSWAP y
-  FUSION y # Fusion MPT device support
-  HIPPI y
-  HOSTAP_FIRMWARE_NVRAM y
-  HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-  HWMON y
-  HYPERVISOR_GUEST y
-  IDE n # deprecated IDE supportIRDA_ULTRA y # Ultra (connectionless) protocol
-  IKCONFIG y # Make /proc/config.gz available
-  IKCONFIG_PROC y # Make /proc/config.gz available
-  INTEL_IDLE y
-  INTERVAL_TREE_TEST n
-  IOSCHED_CFQ y # Include the CFQ I/O scheduler in the kernel, rather than as a module, so that the initrd gets a good I/O scheduler
-  IOSCHED_DEADLINE y
-  IP_DCCP_CCID3 n # experimental
-  IP_MROUTE_MULTIPLE_TABLES y
-  IP_MULTICAST y
-  IP_NF_TARGET_REDIRECT m
-  IP_PNP n
-  IP_ROUTE_VERBOSE y
-  IP_VS_PROTO_AH y
-  IP_VS_PROTO_ESP y
-  IP_VS_PROTO_TCP y
-  IP_VS_PROTO_UDP y
-  IPV6_MROUTE y
-  IPV6_MROUTE_MULTIPLE_TABLES y
-  IPV6_MULTIPLE_TABLES y
-  IPV6_OPTIMISTIC_DAD y
-  IPV6_PIMSM_V2 y
-  IPV6_ROUTE_INFO y
-  IPV6_ROUTER_PREF y
-  IPV6_SUBTREES y
-  IPW2100_MONITOR y # support promiscuous mode
-  IPW2200_MONITOR y # support promiscuous mode
-  JFS_POSIX_ACL y
-  JFS_SECURITY y
-  JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
-  JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
-  JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
-  JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
-  KERNEL_XZ y
-  KEXEC_JUMP y
-  KPROBES y
-  KSM y
-  KVM_ASYNC_PF y
-  KVM_GUEST y
-  KVM_MMIO y
-  L2TP_ETH m
-  L2TP_IP m
-  L2TP_V3 y
-  LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
-  LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
-  LOGO n # not needed
-  MEDIA_ATTACH y
-  MEDIA_CAMERA_SUPPORT y
-  MEDIA_DIGITAL_TV_SUPPORT y
-  MEDIA_RC_SUPPORT y
-  MEDIA_USB_SUPPORT y
-  MEGARAID_NEWGEN y
-  MEMCG y
-  MEMCG_SWAP y
-  MEMTEST y # Enable the kernel's built-in memory tester
-  MICROCODE y
-  MICROCODE_AMD y
-  MICROCODE_INTEL y
-  MMC_BLOCK_MINORS 32 # 8 is default. Modern gpt tables on eMMC may go far beyond 8.
-  MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
-  MTD_COMPLEX_MAPPINGS y # needed for many devices
-  MTD_TESTS n
-  MTRR_SANITIZER y
-  NAMESPACES y #  Required by 'unshare' used by 'nixos-install'
-  NET y
-  NET_FC y # Fibre Channel driver support
-  NETFILTER y
-  NETFILTER_ADVANCED y
-  NFS_FSCACHE y
-  NFS_SWAP y
-  NFS_V3_ACL y
-  NFSD_V2_ACL y
-  NFSD_V3 y
-  NFSD_V3_ACL y
-  NFSD_V4 y
-  NLS y
-  NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option
-  NLS_DEFAULT utf8
-  NLS_ISO8859_1 m    # VFAT default for the iocharset= mount option
-  NLS_UTF8 m
-  NOTIFIER_ERROR_INJECTION n
-  NUMA y
-  OCFS2_DEBUG_MASKLOG n
-  PARAVIRT_SPINLOCKS y
-  PARAVIRT y
-  PM_ADVANCED_DEBUG y
-  PM_TRACE_RTC n # Disable some expensive () features
-  PM_WAKELOCKS y
-  POSIX_MQUEUE y
-  PPP_FILTER y
-  PPP_MULTILINK y # PPP multilink support
-  PROC_EVENTS y
-  RBTREE_TEST n
-  RC_DEVICES y # Enable IR devices
-  RCU_TORTURE_TEST n
-  REGULATOR y # Voltage and Current Regulator Support
-  REISERFS_FS_POSIX_ACL y
-  REISERFS_FS_SECURITY y
-  REISERFS_FS_XATTR y
-  RT_GROUP_SCHED n
-  RT2800USB_RT55XX y
-  SCHED_AUTOGROUP y
   SCHEDSTATS n
-  SCSI_LOGGING y # SCSI logging facility
-  SCSI_LOWLEVEL y # enable lots of SCSI devices
-  SCSI_LOWLEVEL_PCMCIA y
-  SCSI_SAS_ATA y  # added to enable detection of hard drive
-  SECCOMP y # used by systemd >= 231
-  SECCOMP_FILTER y # ditto
-  SECURITY_APPARMOR y
-  SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
-  SERIAL_8250 y # 8250/16550 and compatible serial support
-  SLIP_COMPRESSED y # CSLIP compressed headers
-  SLIP_SMART y
-  SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
-  SND_DYNAMIC_MINORS y
-  SND_HDA_INPUT_BEEP y # Support digital beep via input layer
-  SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot
-  SND_HDA_RECONFIG y # Support reconfiguration of jack functions
-  SND_USB_CAIAQ_INPUT y
-  SPI y # needed for many devices
-  SPI_MASTER y
-  SQUASHFS_LZO y
-  SQUASHFS_XATTR y
-  SQUASHFS_XZ y
-  SQUASHFS_ZLIB y
-  STAGING y
-  STANDALONE n # Support drivers that need external firmware.
-  STRICT_DEVMEM y # Filter access to /dev/mem
-  TEST_KSTRTOX n
-  TEST_LIST_SORT n
-  TEST_STRING_HELPERS n
-  THERMAL_HWMON y # Hardware monitoring support
-  TMPFS y
-  TMPFS_POSIX_ACL y
-  TRANSPARENT_HUGEPAGE_ALWAYS n
-  TRANSPARENT_HUGEPAGE_MADVISE y
-  TRANSPARENT_HUGEPAGE y
-  UBIFS_FS_ADVANCED_COMPR y
-  UDF_FS m
-  UNIX y
-  USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
-  USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-  USB_SERIAL_GENERIC y # USB Generic Serial Driver
-  USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
-  USB_SERIAL_KEYSPAN_USA18X y
-  USB_SERIAL_KEYSPAN_USA19 y
-  USB_SERIAL_KEYSPAN_USA19QI y
-  USB_SERIAL_KEYSPAN_USA19QW y
-  USB_SERIAL_KEYSPAN_USA19W y
-  USB_SERIAL_KEYSPAN_USA28 y
-  USB_SERIAL_KEYSPAN_USA28X y
-  USB_SERIAL_KEYSPAN_USA28XA y
-  USB_SERIAL_KEYSPAN_USA28XB y
-  USB_SERIAL_KEYSPAN_USA49W y
-  USB_SERIAL_KEYSPAN_USA49WLC y
-  VGA_SWITCHEROO y # Hybrid graphics support
-  VIRT_DRIVERS y
-  WAN y
-  X86_CHECK_BIOS_CORRUPTION y
-  X86_MCE y
-  XFS_POSIX_ACL y
-  XFS_QUOTA y
-  XFS_RT y # XFS Realtime subvolume support
-  XZ_DEC_TEST n
-  ZRAM m
+  DETECT_HUNG_TASK y
 
-# Architecture dependent
-
-  ${optionalString (stdenv.isx86_64 || stdenv.isi686) ''
-    XEN y
-    XEN_DOM0 y
-    ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false))  ''
-      HVC_XEN_FRONTEND y
-      HVC_XEN y
-      PCI_XEN y
-      SWIOTLB_XEN y
-      XEN_BACKEND y
-      XEN_BALLOON_MEMORY_HOTPLUG y
-      XEN_BALLOON y
-      XEN_EFI y
-      XEN_HAVE_PVMMU y
-      XEN_MCE_LOG y
-      XEN_PVH y
-      XEN_PVHVM y
-      XEN_SAVE_RESTORE y
-      XEN_SCRUB_PAGES y
-      XEN_SELFBALLOONING y
-      XEN_STUB y
-      XEN_SYS_HYPERVISOR y
-      XEN_TMEM y
-    ''}
+  ${optionalString (versionOlder version "4.4") ''
+    CPU_NOTIFIER_ERROR_INJECT? n
   ''}
 
-  ${optionalString (!stdenv.is64bit) ''
-    HIGHMEM64G y # We need 64 GB (PAE) support for Xen guest support.
-  ''}
-
-  ${optionalString (stdenv.is64bit) ''
-    IRQ_REMAP y
-    VFIO_PCI_VGA y
-    X86_X2APIC y
-  ''}
-
-  ${optionalString (stdenv.system == "i686-linux") ''
-    FB_GEODE y
-  ''}
-
-  ${optionalString (stdenv.system == "x86_64-linux") ''
-    BPF_JIT y
+  ${optionalString (versionOlder version "4.11") ''
+    TIMER_STATS y
+    DEBUG_NX_TEST n
   ''}
 
+  # Bump the maximum number of CPUs to support systems like EC2 x1.*
+  # instances and Xeon Phi.
   ${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") ''
     NR_CPUS 384
   ''}
 
-# Kernel version dependent
+  # Unix domain sockets.
+  UNIX y
 
-  ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") ''
-    AUDIT_LOGINUID_IMMUTABLE y
+  # Power management.
+  ${optionalString (versionOlder version "3.19") ''
+    PM_RUNTIME y
   ''}
-
-  ${optionalString (versionOlder version "3.10") ''
-    ARM_KPROBES_TEST n
-    CPU_NOTIFIER_ERROR_INJECT n
-    EFI_TEST n
-    RCU_PERF_TEST n
-    TEST_ASYNC_DRIVER_PROBE n
-    TEST_BITMAP n
-    TEST_HASH n
-    TEST_UUID n
-    USB_SUSPEND y
+  PM_ADVANCED_DEBUG y
+  ${optionalString (versionAtLeast version "3.11") ''
+    X86_INTEL_LPSS y
   ''}
-
   ${optionalString (versionAtLeast version "3.10") ''
     X86_INTEL_PSTATE y
   ''}
+  INTEL_IDLE y
+  CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
+  ${optionalString (versionOlder version "3.10") ''
+    USB_SUSPEND y
+  ''}
+  PM_WAKELOCKS y
 
+  # Support drivers that need external firmware.
+  STANDALONE n
+
+  # Make /proc/config.gz available.
+  IKCONFIG y
+  IKCONFIG_PROC y
+
+  # Optimize with -O2, not -Os.
+  CC_OPTIMIZE_FOR_SIZE n
+
+  # Enable the kernel's built-in memory tester.
+  MEMTEST y
+
+  # Include the CFQ I/O scheduler in the kernel, rather than as a
+  # module, so that the initrd gets a good I/O scheduler.
+  IOSCHED_CFQ y
+  BLK_CGROUP y # required by CFQ
+  IOSCHED_DEADLINE y
+  ${optionalString (versionAtLeast version "4.11") ''
+    MQ_IOSCHED_DEADLINE y
+  ''}
+  ${optionalString (versionAtLeast version "4.12") ''
+    BFQ_GROUP_IOSCHED y
+    MQ_IOSCHED_KYBER y
+    IOSCHED_BFQ m
+  ''}
+
+  # Enable NUMA.
+  NUMA? y
+
+  # Disable some expensive (?) features.
+  PM_TRACE_RTC n
+
+  # Enable initrd support.
+  BLK_DEV_RAM y
+  BLK_DEV_INITRD y
+
+  # Enable various subsystems.
+  ACCESSIBILITY y # Accessibility support
+  AUXDISPLAY y # Auxiliary Display support
+  DONGLE y # Serial dongle support
+  HIPPI y
+  MTD_COMPLEX_MAPPINGS y # needed for many devices
+  SCSI_LOWLEVEL y # enable lots of SCSI devices
+  SCSI_LOWLEVEL_PCMCIA y
+  SCSI_SAS_ATA y  # added to enable detection of hard drive
+  SPI y # needed for many devices
+  SPI_MASTER y
+  WAN y
+
+  # Networking options.
+  NET y
+  IP_PNP n
+  ${optionalString (versionOlder version "3.13") ''
+    IPV6_PRIVACY y
+  ''}
+  NETFILTER y
+  NETFILTER_ADVANCED y
+  IP_ROUTE_VERBOSE y
+  IP_MROUTE_MULTIPLE_TABLES y
+  IP_VS_PROTO_TCP y
+  IP_VS_PROTO_UDP y
+  IP_VS_PROTO_ESP y
+  IP_VS_PROTO_AH y
+  IP_DCCP_CCID3 n # experimental
+  IP_MULTICAST y
+  IPV6_ROUTER_PREF y
+  IPV6_ROUTE_INFO y
+  IPV6_OPTIMISTIC_DAD y
+  IPV6_MULTIPLE_TABLES y
+  IPV6_SUBTREES y
+  IPV6_MROUTE y
+  IPV6_MROUTE_MULTIPLE_TABLES y
+  IPV6_PIMSM_V2 y
+  ${optionalString (versionAtLeast version "4.7") ''
+    IPV6_FOU_TUNNEL m
+  ''}
+  CLS_U32_PERF y
+  CLS_U32_MARK y
+  ${optionalString (stdenv.system == "x86_64-linux") ''
+    BPF_JIT y
+  ''}
+  ${optionalString (versionAtLeast version "4.4") ''
+    NET_CLS_BPF m
+    NET_ACT_BPF m
+  ''}
+  L2TP_V3 y
+  L2TP_IP m
+  L2TP_ETH m
+  BRIDGE_VLAN_FILTERING y
+  BONDING m
+  NET_L3_MASTER_DEV? y
+  NET_FOU_IP_TUNNELS? y
+  IP_NF_TARGET_REDIRECT m
+
+  # Wireless networking.
+  CFG80211_WEXT? y # Without it, ipw2200 drivers don't build
+  IPW2100_MONITOR? y # support promiscuous mode
+  IPW2200_MONITOR? y # support promiscuous mode
+  HOSTAP_FIRMWARE? y # Support downloading firmware images with Host AP driver
+  HOSTAP_FIRMWARE_NVRAM? y
+  ATH9K_PCI? y # Detect Atheros AR9xxx cards on PCI(e) bus
+  ATH9K_AHB? y # Ditto, AHB bus
+  B43_PHY_HT? y
+  BCMA_HOST_PCI? y
+
+  # Enable various FB devices.
+  FB y
+  FB_EFI y
+  FB_NVIDIA_I2C y # Enable DDC Support
+  FB_RIVA_I2C y
+  FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+  FB_ATY_GX y # Mach64 GX support
+  FB_SAVAGE_I2C y
+  FB_SAVAGE_ACCEL y
+  FB_SIS_300 y
+  FB_SIS_315 y
+  FB_3DFX_ACCEL y
+  FB_VESA y
+  FRAMEBUFFER_CONSOLE y
+  FRAMEBUFFER_CONSOLE_ROTATION y
+  ${optionalString (stdenv.system == "i686-linux") ''
+    FB_GEODE y
+  ''}
+
+  # Video configuration.
+  # Enable KMS for devices whose X.org driver supports it.
+  ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) ''
+    DRM_I915_KMS y
+  ''}
+  # Allow specifying custom EDID on the kernel command line
+  DRM_LOAD_EDID_FIRMWARE y
+  VGA_SWITCHEROO y # Hybrid graphics support
+  DRM_GMA600 y
+  DRM_GMA3600 y
+  ${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
+  SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+  SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+  SND_HDA_RECONFIG y # Support reconfiguration of jack functions
+  SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot
+  SND_USB_CAIAQ_INPUT y
+  ${optionalString (versionOlder version "4.12") ''
+    PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+  ''}
+
+  # USB serial devices.
+  USB_SERIAL_GENERIC y # USB Generic Serial Driver
+  USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
+  USB_SERIAL_KEYSPAN_USA28 y
+  USB_SERIAL_KEYSPAN_USA28X y
+  USB_SERIAL_KEYSPAN_USA28XA y
+  USB_SERIAL_KEYSPAN_USA28XB y
+  USB_SERIAL_KEYSPAN_USA19 y
+  USB_SERIAL_KEYSPAN_USA18X y
+  USB_SERIAL_KEYSPAN_USA19W y
+  USB_SERIAL_KEYSPAN_USA19QW y
+  USB_SERIAL_KEYSPAN_USA19QI y
+  USB_SERIAL_KEYSPAN_USA49W y
+  USB_SERIAL_KEYSPAN_USA49WLC y
+
+  # Filesystem options - in particular, enable extended attributes and
+  # ACLs for all filesystems that support them.
+  FANOTIFY y
+  TMPFS y
+  TMPFS_POSIX_ACL y
+  ${optionalString (versionAtLeast version "4.9") ''
+    FS_ENCRYPTION? m
+  ''}
+  EXT2_FS_XATTR y
+  EXT2_FS_POSIX_ACL y
+  EXT2_FS_SECURITY y
+  ${optionalString (versionOlder version "4.0") ''
+    EXT2_FS_XIP y # Ext2 execute in place support
+  ''}
+  EXT3_FS_POSIX_ACL y
+  EXT3_FS_SECURITY y
+  EXT4_FS_POSIX_ACL y
+  EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"}
+  EXT4_FS_SECURITY y
+  REISERFS_FS_XATTR? y
+  REISERFS_FS_POSIX_ACL? y
+  REISERFS_FS_SECURITY? y
+  JFS_POSIX_ACL? y
+  JFS_SECURITY? y
+  XFS_QUOTA? y
+  XFS_POSIX_ACL? y
+  XFS_RT? y # XFS Realtime subvolume support
+  OCFS2_DEBUG_MASKLOG? n
+  BTRFS_FS_POSIX_ACL y
+  UBIFS_FS_ADVANCED_COMPR? y
+  F2FS_FS m
+  F2FS_FS_SECURITY? y
+  F2FS_FS_ENCRYPTION? y
+  UDF_FS m
+  ${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") ''
+    NFSD_PNFS y
+  ''}
+  NFSD_V2_ACL y
+  NFSD_V3 y
+  NFSD_V3_ACL y
+  NFSD_V4 y
+  ${optionalString (versionAtLeast version "3.11") ''
+    NFSD_V4_SECURITY_LABEL y
+  ''}
+  NFS_FSCACHE y
+  NFS_SWAP y
+  NFS_V3_ACL y
   ${optionalString (versionAtLeast version "3.11") ''
     NFS_V4_1 y  # NFSv4.1 client support
     NFS_V4_2 y
     NFS_V4_SECURITY_LABEL y
-    NFSD_V4_SECURITY_LABEL y
-    PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
-    X86_INTEL_LPSS y
-
-    ${optionalString (versionOlder version "4.4") ''
-      MICROCODE_AMD_EARLY y
-      MICROCODE_EARLY y
-      MICROCODE_INTEL_EARLY y
-    ''}
   ''}
-
+  CIFS_XATTR y
+  CIFS_POSIX y
+  CIFS_FSCACHE y
+  CIFS_STATS y
+  CIFS_WEAK_PW_HASH y
+  CIFS_UPCALL y
+  CIFS_ACL y
+  CIFS_DFS_UPCALL y
+  ${optionalString (versionOlder version "4.13") ''
+    CIFS_SMB2 y
+  ''}
   ${optionalString (versionAtLeast version "3.12") ''
     CEPH_FSCACHE y
-    HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI
-    HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support
-    USER_NS y # Support for user namespaces
   ''}
-
-  ${optionalString (versionOlder version "3.13") ''
-    IPV6_PRIVACY y
-  ''}
-
-  ${optionalString (versionAtLeast version "3.13") ''
-    KVM_VFIO y
-    SQUASHFS_DECOMP_MULTI_PERCPU y
-    SQUASHFS_FILE_DIRECT y
-  ''}
-
-  ${optionalString (versionOlder version "3.14") ''
-    CC_STACKPROTECTOR y # Detect buffer overflows on the stack
-  ''}
-
   ${optionalString (versionAtLeast version "3.14") ''
-    CC_STACKPROTECTOR_REGULAR y # Detect buffer overflows on the stack
     CEPH_FS_POSIX_ACL y
   ''}
-
-  ${optionalString (versionOlder version "3.15") ''
-    USB_DEBUG n
+  ${optionalString (versionAtLeast version "3.13") ''
+    SQUASHFS_FILE_DIRECT y
+    SQUASHFS_DECOMP_MULTI_PERCPU y
   ''}
-
-  ${optionalString (versionAtLeast version "3.15") ''
-    UEVENT_HELPER n
-
-    ${optionalString (versionOlder version "4.8") ''
-      MLX4_EN_VXLAN y
-    ''}
-  ''}
-
-  ${optionalString (versionOlder version "3.18") ''
-    ZSMALLOC y
-  ''}
-
-  ${optionalString (versionAtLeast version "3.18") ''
-    MODULE_COMPRESS y # Compress kernel modules for a sizable disk space savings
-    MODULE_COMPRESS_XZ y
-    ZSMALLOC m
-  ''}
-
-  ${optionalString (versionOlder version "3.19") ''
-    PM_RUNTIME y # Power management
-  ''}
-
+  SQUASHFS_XATTR y
+  SQUASHFS_ZLIB y
+  SQUASHFS_LZO y
+  SQUASHFS_XZ y
   ${optionalString (versionAtLeast version "3.19") ''
     SQUASHFS_LZ4 y
   ''}
 
-  ${optionalString (versionOlder version "4.0") ''
-    EXT2_FS_XIP y # Ext2 execute in place support
+  # Native Language Support modules, needed by some filesystems
+  NLS y
+  NLS_DEFAULT utf8
+  NLS_UTF8 m
+  NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option
+  NLS_ISO8859_1 m    # VFAT default for the iocharset= mount option
+
+  # Runtime security tests
+  ${optionalString (versionOlder version "4.11") ''
+    DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages
   ''}
 
-  ${optionalString (versionAtLeast version "4.0") ''
-    KVM_GENERIC_DIRTYLOG_READ_PROTECT y
-
-    ${optionalString (versionOlder version "4.6") ''
-      NFSD_PNFS y
-    ''}
-
-    ${optionalString (versionOlder version "4.12") ''
-      KVM_COMPAT y
-    ''}
+  # Security related features.
+  RANDOMIZE_BASE? y
+  STRICT_DEVMEM y # Filter access to /dev/mem
+  SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
+  SECURITY_YAMA? y # Prevent processes from ptracing non-children processes
+  DEVKMEM n # Disable /dev/kmem
+  ${if versionOlder version "3.14" then ''
+    CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
+  '' else ''
+    CC_STACKPROTECTOR_REGULAR? y
+  ''}
+  ${optionalString (versionAtLeast version "3.12") ''
+    USER_NS y # Support for user namespaces
   ''}
 
-  ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) ''
-    DRM_I915_KMS y
+  # AppArmor support
+  SECURITY_APPARMOR y
+  DEFAULT_SECURITY_APPARMOR y
+
+  # Microcode loading support
+  MICROCODE y
+  MICROCODE_INTEL y
+  MICROCODE_AMD y
+  ${optionalString (versionAtLeast version "3.11" && versionOlder version "4.4") ''
+    MICROCODE_EARLY y
+    MICROCODE_INTEL_EARLY y
+    MICROCODE_AMD_EARLY y
   ''}
 
+  # Misc. options.
+  8139TOO_8129 y
+  8139TOO_PIO n # PIO is slower
+  AIC79XX_DEBUG_ENABLE n
+  AIC7XXX_DEBUG_ENABLE n
+  AIC94XX_DEBUG n
+  ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") ''
+    AUDIT_LOGINUID_IMMUTABLE y
+  ''}
+  ${optionalString (versionOlder version "4.4") ''
+    B43_PCMCIA? y
+  ''}
+  BLK_DEV_INITRD y
+  BLK_DEV_INTEGRITY y
+  BSD_PROCESS_ACCT_V3 y
+  BT_HCIUART_BCSP? y
+  BT_HCIUART_H4? y # UART (H4) protocol support
+  BT_HCIUART_LL? y
+  BT_RFCOMM_TTY? y # RFCOMM TTY support
+  CLEANCACHE? y
+  CRASH_DUMP? n
+  DVB_DYNAMIC_MINORS? y # we use udev
+  EFI_STUB y # EFI bootloader in the bzImage itself
+  CGROUPS y # used by systemd
+  FHANDLE y # used by systemd
+  SECCOMP y # used by systemd >= 231
+  SECCOMP_FILTER y # ditto
+  POSIX_MQUEUE y
+  FRONTSWAP y
+  FUSION y # Fusion MPT device support
+  IDE n # deprecated IDE support
+  ${optionalString (versionAtLeast version "4.3") ''
+    IDLE_PAGE_TRACKING y
+  ''}
+  IRDA_ULTRA y # Ultra (connectionless) protocol
+  JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels
+  JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels
+  JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support
+  JOYSTICK_XPAD_LEDS? y # LED Support for Xbox360 controller 'BigX' LED
+  KEXEC_FILE? y
+  KEXEC_JUMP? y
+  LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+  LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+  LOGO n # not needed
+  MEDIA_ATTACH y
+  MEGARAID_NEWGEN y
+  ${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") ''
+    MLX4_EN_VXLAN y
+  ''}
+  ${optionalString (versionOlder version "4.9") ''
+    MODVERSIONS y
+  ''}
+  MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+  MTRR_SANITIZER y
+  NET_FC y # Fibre Channel driver support
+  ${optionalString (versionAtLeast version "3.11") ''
+    PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
+  ''}
+  MMC_BLOCK_MINORS 32 # 8 is default. Modern gpt tables on eMMC may go far beyond 8.
+  PPP_MULTILINK y # PPP multilink support
+  PPP_FILTER y
+  REGULATOR y # Voltage and Current Regulator Support
+  RC_DEVICES? y # Enable IR devices
+  RT2800USB_RT55XX y
+  SCHED_AUTOGROUP y
+  SCSI_LOGGING y # SCSI logging facility
+  SERIAL_8250 y # 8250/16550 and compatible serial support
+  SLIP_COMPRESSED y # CSLIP compressed headers
+  SLIP_SMART y
+  HWMON y
+  THERMAL_HWMON y # Hardware monitoring support
+  ${optionalString (versionAtLeast version "3.15") ''
+    UEVENT_HELPER n
+  ''}
+  ${optionalString (versionOlder version "3.15") ''
+    USB_DEBUG? n
+  ''}
+  USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
+  USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
+  ${optionalString (versionAtLeast version "4.3") ''
+    USERFAULTFD y
+  ''}
+  X86_CHECK_BIOS_CORRUPTION y
+  X86_MCE y
+
+  ${optionalString (versionAtLeast version "3.12") ''
+    HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI
+    HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support
+  ''}
+
+
+  # Linux containers.
+  NAMESPACES? y #  Required by 'unshare' used by 'nixos-install'
+  RT_GROUP_SCHED n
+  CGROUP_DEVICE? y
+  MEMCG y
+  MEMCG_SWAP y
+  ${optionalString (versionOlder version "4.7") "DEVPTS_MULTIPLE_INSTANCES y"}
+  BLK_DEV_THROTTLING y
+  CFQ_GROUP_IOSCHED y
   ${optionalString (versionAtLeast version "4.3") ''
     CGROUP_PIDS y
-    IDLE_PAGE_TRACKING y
-
-    ${optionalString (!features.grsecurity or false) ''
-      USERFAULTFD y
-    ''}
   ''}
 
-  ${optionalString (versionOlder version "4.4") ''
-    B43_PCMCIA y
+  # Enable staging drivers.  These are somewhat experimental, but
+  # they generally don't hurt.
+  STAGING y
+
+  # PROC_EVENTS requires that the netlink connector is not built
+  # as a module.  This is required by libcgroup's cgrulesengd.
+  CONNECTOR y
+  PROC_EVENTS y
+
+  # Tracing.
+  FTRACE y
+  KPROBES y
+  FUNCTION_TRACER y
+  FTRACE_SYSCALLS y
+  SCHED_TRACER y
+  STACK_TRACER y
+
+  ${if versionOlder version "4.11" then ''
+    UPROBE_EVENT? y
+  '' else ''
+    UPROBE_EVENTS? y
   ''}
 
   ${optionalString (versionAtLeast version "4.4") ''
     BPF_SYSCALL y
-    BRCMFMAC_PCIE y
-    F2FS_FS_ENCRYPTION y
-    F2FS_FS_SECURITY y
-    FW_LOADER_USER_HELPER_FALLBACK n
-    GLOB_SELFTEST n
-    KEXEC_FILE y
-    LNET_SELFTEST n
-    LOCK_TORTURE_TEST n
-    NET_ACT_BPF m
-    NET_CLS_BPF m
-    NET_FOU_IP_TUNNELS y
-    NET_L3_MASTER_DEV y
-    PERCPU_TEST n
-    TEST_BPF n
-    TEST_FIRMWARE n
-    TEST_HEXDUMP n
-    TEST_PRINTF n
-    TEST_RHASHTABLE n
-    TEST_STATIC_KEYS n
-    TEST_UDELAY n
-    TEST_USER_COPY n
-    ZBUD y
-    ZSWAP y
-
-    ${optionalString (versionOlder version "4.13") ''
-      TEST_LKM n
-    ''}
-
-    ${optionalString (!features.grsecurity or false) ''
-      BPF_EVENTS y
-      RANDOMIZE_BASE y
-    ''}
+    BPF_EVENTS y
   ''}
+  FUNCTION_PROFILER y
+  RING_BUFFER_BENCHMARK n
 
-  ${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) ''
-    DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
-  ''}
+  # Devtmpfs support.
+  DEVTMPFS y
 
-  ${optionalString (versionOlder version "4.7") ''
-    DEVPTS_MULTIPLE_INSTANCES y # Linux containers
-  ''}
-
-  ${optionalString (versionAtLeast version "4.7") ''
-    IPV6_FOU_TUNNEL m
-  ''}
+  # Easier debugging of NFS issues.
+  SUNRPC_DEBUG y
 
+  # Virtualisation.
+  PARAVIRT? y
+  HYPERVISOR_GUEST y
+  PARAVIRT_SPINLOCKS? y
   ${optionalString (versionOlder version "4.8") ''
     KVM_APIC_ARCHITECTURE y
-
-    ${optionalString (versionAtLeast version "4.4") ''
-      EXT4_ENCRYPTION m
-    ''}
   ''}
-
-  ${optionalString (versionAtLeast version "4.8") ''
-    EXT4_ENCRYPTION y
+  KVM_ASYNC_PF y
+  ${optionalString ((versionAtLeast version "4.0") && (versionOlder version "4.12")) ''
+    KVM_COMPAT? y
   ''}
-
-  ${optionalString (versionAtLeast version "4.9") ''
-    DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets
-    DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets
-    FS_ENCRYPTION m
-    MODVERSIONS y
-  ''}
-
-  ${optionalString (versionOlder version "4.11") ''
-    DEBUG_NX_TEST n
-    TIMER_STATS y
-    UPROBE_EVENT y
-
-    ${optionalString (!features.grsecurity or false) ''
-      DEBUG_SET_MODULE_RONX y # Detect writes to read-only module pages
-    ''}
-  ''}
-
-  ${optionalString (versionAtLeast version "4.11") ''
-    DRM_DEBUG_MM_SELFTEST n
-    MQ_IOSCHED_DEADLINE y
-    TEST_PARMAN n
-    TEST_SORT n
-    UPROBE_EVENTS y
-    WW_MUTEX_SELFTEST n
-  ''}
-
   ${optionalString (versionOlder version "4.12") ''
-    KVM_DEVICE_ASSIGNMENT y
-    PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+    KVM_DEVICE_ASSIGNMENT? y
   ''}
-
-  ${optionalString (versionAtLeast version "4.12") ''
-    BFQ_GROUP_IOSCHED y
-    IOSCHED_BFQ m
-    MQ_IOSCHED_KYBER y
+  ${optionalString (versionAtLeast version "4.0") ''
+    KVM_GENERIC_DIRTYLOG_READ_PROTECT y
   ''}
-
-  ${optionalString (versionOlder version "4.13") ''
-    CIFS_SMB2 y
+  KVM_GUEST y
+  KVM_MMIO y
+  ${optionalString (versionAtLeast version "3.13") ''
+    KVM_VFIO y
   ''}
-
-  ${optionalString (versionAtLeast version "4.13") ''
-    TEST_LKM m
+  ${optionalString (stdenv.isx86_64 || stdenv.isi686) ''
+    XEN? y
+    XEN_DOM0? y
+    ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false))  ''
+      PCI_XEN? y
+      HVC_XEN? y
+      HVC_XEN_FRONTEND? y
+      XEN_SYS_HYPERVISOR? y
+      SWIOTLB_XEN? y
+      XEN_BACKEND? y
+      XEN_BALLOON? y
+      XEN_BALLOON_MEMORY_HOTPLUG? y
+      XEN_EFI? y
+      XEN_HAVE_PVMMU? y
+      XEN_MCE_LOG? y
+      XEN_PVH? y
+      XEN_PVHVM? y
+      XEN_SAVE_RESTORE? y
+      XEN_SCRUB_PAGES? y
+      XEN_SELFBALLOONING? y
+      XEN_STUB? y
+      XEN_TMEM? y
+    ''}
   ''}
-
-# Feature dependent
-
-  ${optionalString (!features.grsecurity or false) ''
-    DEVKMEM n # Disable /dev/kmem
-    DYNAMIC_DEBUG y
-    FTRACE y
-    FTRACE_SYSCALLS y
-    FUNCTION_PROFILER y
-    FUNCTION_TRACER y
-    RING_BUFFER_BENCHMARK n
-    SCHED_TRACER y
-    SECURITY_YAMA y # Prevent processes from ptracing non-children processes
-    STACK_TRACER y
-    SUNRPC_DEBUG y # Easier debugging of NFS issues
+  KSM y
+  ${optionalString (!stdenv.is64bit) ''
+    HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support.
   ''}
+  ${optionalString (stdenv.is64bit) ''
+    VFIO_PCI_VGA y
+  ''}
+  VIRT_DRIVERS y
 
+  # Media support.
+  MEDIA_DIGITAL_TV_SUPPORT y
+  MEDIA_CAMERA_SUPPORT y
+  MEDIA_RC_SUPPORT y
+  MEDIA_USB_SUPPORT y
   ${optionalString (!(features.chromiumos or false)) ''
     MEDIA_PCI_SUPPORT y
   ''}
 
+  # Our initrd init uses shebang scripts, so can't be modular.
+  BINFMT_SCRIPT y
+
+  # For systemd-binfmt
+  BINFMT_MISC? y
+
+  # Enable the 9P cache to speed up NixOS VM tests.
+  9P_FSCACHE? y
+  9P_FS_POSIX_ACL? y
+
+  # Enable transparent support for huge pages.
+  TRANSPARENT_HUGEPAGE? y
+  TRANSPARENT_HUGEPAGE_ALWAYS? n
+  TRANSPARENT_HUGEPAGE_MADVISE? y
+
+  # zram support (e.g for in-memory compressed swap).
+  ZRAM m
+  ZSWAP? y
+  ZBUD? y
+  ${optionalString (versionOlder version "3.18") ''
+    ZSMALLOC y
+  ''}
+  ${optionalString (versionAtLeast version "3.18") ''
+    ZSMALLOC m
+  ''}
+
+  # Enable PCIe and USB for the brcmfmac driver
+  BRCMFMAC_USB? y
+  BRCMFMAC_PCIE? y
+
+  # Support x2APIC (which requires IRQ remapping).
+  ${optionalString (stdenv.system == "x86_64-linux") ''
+    X86_X2APIC y
+    IRQ_REMAP y
+  ''}
+
+  # Disable the firmware helper fallback, udev doesn't implement it any more
+  FW_LOADER_USER_HELPER_FALLBACK? n
+
+  # Disable various self-test modules that have no use in a production system
+  ${optionalString (versionOlder version "4.4") ''
+    ARM_KPROBES_TEST? n
+  ''}
+
+  ASYNC_RAID6_TEST? n
+  ATOMIC64_SELFTEST? n
+  BACKTRACE_SELF_TEST? n
+  CRC32_SELFTEST? n
+  CRYPTO_TEST? n
+  GLOB_SELFTEST? n
+  INTERVAL_TREE_TEST? n
+  LNET_SELFTEST? n
+  LOCK_TORTURE_TEST? n
+  MTD_TESTS? n
+  NOTIFIER_ERROR_INJECTION? n
+  PERCPU_TEST? n
+  RBTREE_TEST? n
+  RCU_TORTURE_TEST? n
+  TEST_BPF? n
+  TEST_FIRMWARE? n
+  TEST_HEXDUMP? n
+  TEST_KSTRTOX? n
+  TEST_LIST_SORT? n
+  TEST_LKM? n
+  TEST_PRINTF? n
+  TEST_RHASHTABLE? n
+  TEST_STATIC_KEYS? n
+  TEST_STRING_HELPERS? n
+  TEST_UDELAY? n
+  TEST_USER_COPY? n
+  XZ_DEC_TEST? n
+
+  ${optionalString (versionOlder version "4.4") ''
+    EFI_TEST? n
+    RCU_PERF_TEST? n
+    TEST_ASYNC_DRIVER_PROBE? n
+    TEST_BITMAP? n
+    TEST_HASH? n
+    TEST_UUID? n
+  ''}
+
+  ${optionalString (versionAtLeast version "4.11") ''
+    DRM_DEBUG_MM_SELFTEST? n
+    TEST_PARMAN? n
+    TEST_SORT? n
+    WW_MUTEX_SELFTEST? n
+  ''}
+
   # ChromiumOS support
   ${optionalString (features.chromiumos or false) ''
-    ANDROID_PARANOID_NETWORK n
-    BLK_DEV_DM y
-    CHARGER_CROS_USB_PD y
     CHROME_PLATFORMS y
-    CPU_FREQ_GOV_INTERACTIVE n
-    CPU_FREQ_STAT y
-    DM_BOOTCACHE n
-    DM_VERITY n
-    DRM_VGEM n
-    I2C y
-    INPUT_KEYRESET n
-    IPV6 y
-    IPV6_VTI n
-    MEDIA_SUBDRV_AUTOSELECT n
-    MFD_CROS_EC y
-    MFD_CROS_EC_DEV y
-    MFD_CROS_EC_LPC y
+    VGA_SWITCHEROO n
     MMC_SDHCI_PXAV2 n
     NET_IPVTI n
+    IPV6_VTI n
     REGULATOR_FIXED_VOLTAGE n
     TPS6105X n
-    UID_CPUTIME n
-    VGA_SWITCHEROO n
+    CPU_FREQ_STAT y
+    IPV6 y
+    MFD_CROS_EC y
+    MFD_CROS_EC_LPC y
+    MFD_CROS_EC_DEV y
+    CHARGER_CROS_USB_PD y
+    I2C y
+    MEDIA_SUBDRV_AUTOSELECT n
     VIDEO_IR_I2C n
+    BLK_DEV_DM y
+    ANDROID_PARANOID_NETWORK n
+    DM_VERITY n
+    DRM_VGEM n
+    CPU_FREQ_GOV_INTERACTIVE n
+    INPUT_KEYRESET n
+    DM_BOOTCACHE n
+    UID_CPUTIME n
 
     ${optionalString (versionAtLeast version "3.18") ''
-      BCMDHD n
-      CHROMEOS_OF_FIRMWARE y
       CPUFREQ_DT n
-      DRM_POWERVR_ROGUE n
       EXTCON_CROS_EC n
+      DRM_POWERVR_ROGUE n
+      CHROMEOS_OF_FIRMWARE y
       TEST_RHASHTABLE n
+      BCMDHD n
       TRUSTY n
     ''}
 
     ${optionalString (versionOlder version "3.18") ''
+      MALI_MIDGARD n
+      DVB_USB_DIB0700 n
+      DVB_USB_DW2102 n
+      DVB_USB_PCTV452E n
+      DVB_USB_TTUSB2 n
       DVB_USB_AF9015 n
       DVB_USB_AF9035 n
       DVB_USB_ANYSEE n
       DVB_USB_AZ6007 n
-      DVB_USB_DIB0700 n
-      DVB_USB_DW2102 n
       DVB_USB_IT913X n
       DVB_USB_LME2510 n
-      DVB_USB_PCTV452E n
       DVB_USB_RTL28XXU n
-      DVB_USB_TTUSB2 n
-      MALI_MIDGARD n
-      SPEAKUP n
-      USB_DWC2 n
-      USB_GADGET n
-      USB_GSPCA n
       USB_S2255 n
       VIDEO_EM28XX n
       VIDEO_TM6000 n
+      USB_DWC2 n
+      USB_GSPCA n
+      SPEAKUP n
       XO15_EBOOK n
+      USB_GADGET n
     ''}
   ''}
 
-# Extra configuration
-
   ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}
 ''

From 7bc42a89713b0e8824ea47218ba14e75e0b2d921 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 8 Aug 2017 01:14:58 +0200
Subject: [PATCH 1672/3246] xmonad service: add defaultText to extraPackages to
 fix rendering in docs

---
 nixos/modules/services/x11/window-managers/xmonad.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index e25a8ae2282..43de746ab1f 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -29,6 +29,7 @@ in
 
       extraPackages = mkOption {
         default = self: [];
+        defaultText = "self: []";
         example = literalExample ''
           haskellPackages: [
             haskellPackages.xmonad-contrib

From a809cf409a772f15ba4f71ec86ac35dc91a13ddb Mon Sep 17 00:00:00 2001
From: Michal Rus <m@michalrus.com>
Date: Tue, 8 Aug 2017 01:28:12 +0200
Subject: [PATCH 1673/3246] geekbench: init at 4.1.1

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

diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
new file mode 100644
index 00000000000..9172c13636a
--- /dev/null
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "geekbench-${version}";
+  version = "4.1.1";
+
+  src = fetchurl {
+    url = "http://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz";
+    sha256 = "1n9jyzf0a0w37hb30ip76hz73bvim76jd2fgd6131hh0shp1s4v6";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r dist/Geekbench-${version}-Linux/. $out/bin
+    rm $out/bin/geekbench_x86_32
+
+    for f in geekbench4 geekbench_x86_64 ; do
+      patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f
+      wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Cross-platform benchmark";
+    homepage = http://geekbench.com/;
+    license = licenses.unfree;
+    maintainers = [ maintainers.michalrus ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c26ba7c826..f039113e3bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1031,6 +1031,8 @@ with pkgs;
 
   go-dependency-manager = callPackage ../development/tools/gdm { };
 
+  geekbench = callPackage ../tools/misc/geekbench { };
+
   gencfsm = callPackage ../tools/security/gencfsm { };
 
   genromfs = callPackage ../tools/filesystems/genromfs { };

From eaab02b94f729c8e230c6b7f52ad83091f6fc0d6 Mon Sep 17 00:00:00 2001
From: evujumenuk <evujumenuk@mailinator.com>
Date: Tue, 8 Aug 2017 01:45:19 +0200
Subject: [PATCH 1674/3246] wireguard: convert "table" to an interface option

Do the right thing, and use multiple interfaces for policy routing. For example, WireGuard interfaces do not allow multiple routes for the same CIDR range.
---
 .../modules/services/networking/wireguard.nix | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 5aa4f13d452..4f54b45639f 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -79,6 +79,16 @@ let
         description = "A list of commands called after shutting down the interface.";
       };
 
+      table = mkOption {
+        default = "main";
+        type = types.str;
+        description = ''The kernel routing table to add this interface's
+        associated routes to. Setting this is useful for e.g. policy routing
+        ("ip rule") or virtual routing and forwarding ("ip vrf"). Both numeric
+        table IDs and table names (/etc/rt_tables) can be used. Defaults to
+        "main".'';
+      };
+
       peers = mkOption {
         default = [];
         description = "Peers linked to the interface.";
@@ -160,14 +170,6 @@ let
         interval of 25 seconds; however, most users will not need this.'';
       };
 
-      table = mkOption {
-        default = "main";
-        type = types.str;
-        description = ''The kernel routing table to add this peer's associated
-        routes to. Setting this is useful for e.g. policy routing ("ip rule")
-        or virtual routing and forwarding ("ip vrf"). Both numeric table IDs
-        and table names (/etc/rt_tables) can be used. Defaults to "main".'';
-      };
     };
 
   };
@@ -217,7 +219,7 @@ let
 
             (map (peer:
             (map (allowedIP:
-            "${ipCommand} route replace ${allowedIP} dev ${name} table ${peer.table}"
+            "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}"
             ) peer.allowedIPs)
             ) values.peers)
 

From b32a1199f88e64ec3191b0322017b11379c36d90 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 7 Aug 2017 21:58:01 +0000
Subject: [PATCH 1675/3246] orackejdk: untie from gnome2

Nothing should change unless you override ```gtk2``` or ```gnome2.gtk``` so they become different
---
 pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index fec038199ad..2a00cf5f2d2 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -27,7 +27,8 @@
 , mesa_noglu
 , freetype
 , fontconfig
-, gnome2
+, gtk2
+, pango
 , cairo
 , alsaLib
 , atk
@@ -196,7 +197,7 @@ let result = stdenv.mkDerivation rec {
    * libXt is only needed on amd64
    */
   libraries =
-    [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk] ++
+    [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++
     (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
 
   rpath = stdenv.lib.strings.makeLibraryPath libraries;

From 50d165c78507f700d638b6776655f30ea4422eb0 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 8 Aug 2017 01:38:25 +0000
Subject: [PATCH 1676/3246] zookeeper: 3.4.9 -> 3.4.10

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

diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index b3a9ad44484..5e4cf8fc23b 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "zookeeper-${version}";
-  version = "3.4.9";
+  version = "3.4.10";
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
-    sha256 = "0dgmja1lm7qn92x2xfmz5qj2k6sj2f6yzyj3a55r7iv1590l1wz7";
+    sha256 = "09rz4ac31932yxyyc8gqrnq1zxb9ahibrq51wbz13b24w0a58zvz";
   };
 
   buildInputs = [ makeWrapper jre ];

From 260bab6c7f5445f08c1c6200479251b10af7e426 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 7 Aug 2017 22:50:31 -0300
Subject: [PATCH 1677/3246] higan: 102 -> 103

---
 pkgs/misc/emulators/higan/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index b1495987e61..be9a39e47e0 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -10,12 +10,12 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "higan-${version}";
-  version = "102";
+  version = "103";
   sourceName = "higan_v${version}-source";
 
   src = fetchurl {
     urls = [ "http://download.byuu.org/${sourceName}.7z" ];
-    sha256 = "1wcr2sxk0n4rngnf9g2qcjcv70s8rf5cqj195sav1yjwxkrdrnjj";
+    sha256 = "0xj2k5g1zyl71hk3kwaixk1axbi6s9kqq31c702rl7qkljv6lfp6";
     curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
   };
 
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
     make compiler=c++ -C higan
   '';
 
+  # Now the cheats file will be distributed separately
   installPhase = ''
     install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps
     install -m 755 icarus/out/icarus $out/bin/
@@ -42,8 +43,6 @@ stdenv.mkDerivation rec {
     install -m 644 higan/data/higan.desktop $out/share/applications/
     install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png
     install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png
-    cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \
-      higan/data/cheats.bml  $out/share/higan/
     cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \
       higan/systems/* $out/share/higan/
   '';
@@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
     cat <<EOF > $out/bin/higan-init.sh
     #!${stdenv.shell}
 
-    cp --update $out/share/higan/cheats.bml \$HOME/.config/
     cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/
 
     EOF
@@ -68,7 +66,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An open-source, cycle-accurate Nintendo multi-system emulator";
     longDescription = ''
-      Higan (formerly bsnes) is a Nintendo multi-system emulator.
+      Higan (formerly bsnes) is a multi-system game console emulator.
       It currently supports the following systems:
         - Nintendo's Famicom, Super Famicom (with subsystems: 
           Super Game Boy, BS-X Satellaview, Sufami Turbo); 

From edf6176d8adba4681540514f3bff8e2b3c89cec3 Mon Sep 17 00:00:00 2001
From: Sebastian Hagen <sh_c_git@memespace.net>
Date: Tue, 8 Aug 2017 04:06:55 +0100
Subject: [PATCH 1678/3246] libtiff: Fix debian patch tarball URL

The tiff debian tarball URL has disappeared (since debian updated their current
version), which renders this package unbuildable.

Change it to a debian snapshot URL, which should be around indefinitely.
---
 pkgs/development/libraries/libtiff/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 595ec9d01cc..7f6faa996bd 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   prePatch =let
       debian = fetchurl {
-        url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz;
+        url = http://snapshot.debian.org/archive/debian-debug/20170602T031313Z/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz;
         sha256 = "1ssjh6vn9rvl2jwm34i3p89g8lj0c7fj3cziva9rj4vasfps58ng";
       };
     in ''

From 12354b8eb55fd76db73df6efab82aa083c7cfae4 Mon Sep 17 00:00:00 2001
From: Taahir Ahmed <ahmed.taahir@gmail.com>
Date: Thu, 13 Apr 2017 02:43:50 -0500
Subject: [PATCH 1679/3246] dieHook: Add `die` utility function

Calling `die "Error message"` causes the current script to exit with
an error, printing a backtrace
---
 pkgs/build-support/setup-hooks/die.sh | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/build-support/setup-hooks/die.sh

diff --git a/pkgs/build-support/setup-hooks/die.sh b/pkgs/build-support/setup-hooks/die.sh
new file mode 100644
index 00000000000..0db41e030f4
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/die.sh
@@ -0,0 +1,21 @@
+# Exit with backtrace and error message
+#
+# Usage: die "Error message"
+die() {
+    # Let us be a little sloppy with errors, because otherwise the final
+    # invocation of `caller` below will cause the script to exit.
+    set +e
+
+    # Print our error message
+    printf "\nBuilder called die: %b\n" "$*"
+    printf "Backtrace:\n"
+
+    # Print a backtrace.
+    local frame=0
+    while caller $frame; do
+        ((frame++));
+    done
+    printf "\n"
+
+    exit 1
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 971c939957a..8235f494c6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -100,6 +100,8 @@ with pkgs;
 
   diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
 
+  dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
+
   dockerTools = callPackage ../build-support/docker { };
 
   docker_compose = pythonPackages.docker_compose;
@@ -287,7 +289,8 @@ with pkgs;
       inherit contents compressor prepend;
     };
 
-  makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
+  makeWrapper = makeSetupHook { deps = [ dieHook ]; }
+                              ../build-support/setup-hooks/make-wrapper.sh;
 
   makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
     callPackage ../build-support/kernel/modules-closure.nix {

From ece5387b09704be1335c9c32279507a76fcf23c1 Mon Sep 17 00:00:00 2001
From: Taahir Ahmed <ahmed.taahir@gmail.com>
Date: Thu, 13 Apr 2017 22:49:05 -0500
Subject: [PATCH 1680/3246] makeWrapper: Die on unsupported arguments

Previously, makeWrapper would accept arguments it didn't recognize,
potentially allowing argument misspellings or broken callers.

Now, makeWrapper dies with a backtrace if it is called incorrectly.

Also changes `wrapProgram` so that it doesn't pass through the first
argument twice --- this was tripping up the argument checking.
---
 .../build-support/setup-hooks/make-wrapper.sh | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index eebde886a88..ec32cd800e0 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -32,26 +32,20 @@ makeWrapper() {
     for ((n = 2; n < ${#params[*]}; n += 1)); do
         p="${params[$n]}"
 
-        if test "$p" = "--set"; then
+        if [[ "$p" == "--set" ]]; then
             varName="${params[$((n + 1))]}"
             value="${params[$((n + 2))]}"
             n=$((n + 2))
             echo "export $varName=\"$value\"" >> "$wrapper"
-        fi
-
-        if test "$p" = "--unset"; then
+        elif [[ "$p" == "--unset" ]]; then
             varName="${params[$((n + 1))]}"
             n=$((n + 1))
             echo "unset $varName" >> "$wrapper"
-        fi
-
-        if test "$p" = "--run"; then
+        elif [[ "$p" == "--run" ]]; then
             command="${params[$((n + 1))]}"
             n=$((n + 1))
             echo "$command" >> "$wrapper"
-        fi
-
-        if test "$p" = "--suffix" -o "$p" = "--prefix"; then
+        elif [[ ("$p" == "--suffix") || ("$p" == "--prefix") ]]; then
             varName="${params[$((n + 1))]}"
             separator="${params[$((n + 2))]}"
             value="${params[$((n + 3))]}"
@@ -63,9 +57,7 @@ makeWrapper() {
                     echo "export $varName=$value\${$varName:+$separator}\$$varName" >> "$wrapper"
                 fi
             fi
-        fi
-
-        if test "$p" = "--suffix-each"; then
+        elif [[ "$p" == "--suffix-each" ]]; then
             varName="${params[$((n + 1))]}"
             separator="${params[$((n + 2))]}"
             values="${params[$((n + 3))]}"
@@ -73,9 +65,7 @@ makeWrapper() {
             for value in $values; do
                 echo "export $varName=\$$varName\${$varName:+$separator}$value" >> "$wrapper"
             done
-        fi
-
-        if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then
+        elif [[ ("$p" == "--suffix-contents") || ("$p" == "--prefix-contents") ]]; then
             varName="${params[$((n + 1))]}"
             separator="${params[$((n + 2))]}"
             fileNames="${params[$((n + 3))]}"
@@ -87,17 +77,15 @@ makeWrapper() {
                     echo "export $varName=$(cat "$fileName")\${$varName:+$separator}\$$varName" >> "$wrapper"
                 fi
             done
-        fi
-
-        if test "$p" = "--add-flags"; then
+        elif [[ "$p" == "--add-flags" ]]; then
             flags="${params[$((n + 1))]}"
             n=$((n + 1))
             flagsBefore="$flagsBefore $flags"
-        fi
-
-        if test "$p" = "--argv0"; then
+        elif [[ "$p" == "--argv0" ]]; then
             argv0="${params[$((n + 1))]}"
             n=$((n + 1))
+        else
+            die "makeWrapper doesn't understand the arg $p"
         fi
     done
 
@@ -138,5 +126,5 @@ wrapProgram() {
     mv "$prog" "$hidden"
     # Silence warning about unexpanded $0:
     # shellcheck disable=SC2016
-    makeWrapper "$hidden" "$prog" --argv0 '$0' "$@"
+    makeWrapper "$hidden" "$prog" --argv0 '$0' "${@:2}"
 }

From 739b4b42e634c9b1004c4f6332281bcf53c196f5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 8 Aug 2017 08:40:26 +0200
Subject: [PATCH 1681/3246] searx: fix typo, fixes #28015

---
 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 b31eefc9f8a..1f32cc4cee3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11588,7 +11588,7 @@ with pkgs;
 
   tt-rss = callPackage ../servers/tt-rss { };
 
-  searx = callPackages ../servers/web-apps/searx { };
+  searx = callPackage ../servers/web-apps/searx { };
 
   selfoss = callPackage ../servers/web-apps/selfoss { };
 

From ea4d01b8574c125c6ac98fb4d241c95c7e8a6495 Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Tue, 8 Aug 2017 07:50:38 +0100
Subject: [PATCH 1682/3246] Added libopencore support

---
 pkgs/development/libraries/libopencore/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 pkgs/development/libraries/libopencore/default.nix

diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/libopencore/default.nix
new file mode 100644
index 00000000000..1d64c36a144
--- /dev/null
+++ b/pkgs/development/libraries/libopencore/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "opencore-amr";
+  src = fetchurl {
+    url = https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-0.1.5.tar.gz;
+    sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
+  };
+
+}

From 2141086af83455aabc1f62dc63459d918e010e8a Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Mon, 7 Aug 2017 20:14:53 -0700
Subject: [PATCH 1683/3246] python.pkgs.feedgen: init at 0.5.1

---
 lib/maintainers.nix                           |  1 +
 .../python-modules/feedgen/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/feedgen/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 048d8c4760e..2acf014eed6 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -94,6 +94,7 @@
   campadrenalin = "Philip Horger <campadrenalin@gmail.com>";
   canndrew = "Andrew Cann <shum@canndrew.org>";
   carlsverre = "Carl Sverre <accounts@carlsverre.com>";
+  casey = "Casey Rodarmor <casey@rodarmor.net>";
   cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>";
   cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
   changlinli = "Changlin Li <mail@changlinli.com>";
diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix
new file mode 100644
index 00000000000..9ad28e52baa
--- /dev/null
+++ b/pkgs/development/python-modules/feedgen/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }:
+
+buildPythonPackage rec {
+  pname = "feedgen";
+  version = "0.5.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3a344b5e3662e9012d095a081a7f216f188dccf3a8f44ad7882960fef05e6787";
+  };
+
+  propagatedBuildInputs = [ dateutil lxml ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Python module to generate ATOM feeds, RSS feeds and Podcasts.";
+    downloadPage = https://github.com/lkiesow/python-feedgen/releases;
+    homepage = https://github.com/lkiesow/python-feedgen;
+    license = with licenses; [ bsd2 lgpl3 ];
+    maintainers = with maintainers; [ casey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb5aef27f13..6df0af98295 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9795,6 +9795,8 @@ in {
     };
   };
 
+  feedgen = callPackage ../development/python-modules/feedgen { };
+
   feedgenerator = callPackage ../development/python-modules/feedgenerator {
     inherit (pkgs) glibcLocales;
   };

From 21b6e9cc050385508c147cb2a553b63935fdef9e Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Tue, 8 Aug 2017 08:07:55 +0100
Subject: [PATCH 1684/3246] Add kiloreux as maintainer

---
 lib/maintainers.nix                                | 1 +
 pkgs/development/libraries/libopencore/default.nix | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 048d8c4760e..4c94ab39619 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -292,6 +292,7 @@
   khumba = "Bryan Gardiner <bog@khumba.net>";
   KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
   kierdavis = "Kier Davis <kierdavis@gmail.com>";
+  kilourex = "Kiloreux Emperex <kiloreux@gmail.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>";
   konimex = "Muhammad Herdiansyah <herdiansyah@openmailbox.org>";
diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/libopencore/default.nix
index 1d64c36a144..6eacfdb6371 100644
--- a/pkgs/development/libraries/libopencore/default.nix
+++ b/pkgs/development/libraries/libopencore/default.nix
@@ -6,5 +6,11 @@ stdenv.mkDerivation {
     url = https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-0.1.5.tar.gz;
     sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
   };
-
+  meta = {
+    homepage = https://opencore-amr.sourceforge.io/;
+    description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. 
+    Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.kiloreux ];
+  };
 }

From 142df088252bb148135f8866cca12d36b0bedb13 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Aug 2017 09:01:48 +0200
Subject: [PATCH 1685/3246] hackage2nix: update list of broken packages

---
 .../configuration-hackage2nix.yaml            | 1127 +++--------------
 1 file changed, 177 insertions(+), 950 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e861ad6d53f..30ff85aed82 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2638,7 +2638,7 @@ dont-distribute-packages:
   XInput:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmobar:                                       [ x86_64-darwin ]
 
-  # Depens on shine, which is a ghcjs project.
+  # Depends on shine, which is a ghcjs project.
   shine-varying:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
 
   # these packages depend on software with an unfree license
@@ -2662,12 +2662,54 @@ dont-distribute-packages:
   yices-easy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yices-painless:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
 
+  # these packages don't evaluate because they have broken dependencies
+  diagrams-reflex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dialog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fltkhs-demos:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fltkhs-fluid-demos:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom-hello:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-javascriptcore:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-webkit2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-webkit2webextension:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-webkit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gsmenu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hbro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imprevu-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsaddle-webkit2gtk:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsaddle-webkitgtk:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdacat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  leksah:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-all:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-reader:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markup-preview:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nomyx-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nomyx-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nomyx-language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nomyx-library:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nomyx-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-dom-colonnade:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-dom-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-dom-helpers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-dom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-jsx:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spike:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tianbar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trasa-reflex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-browser-in-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkitgtk3:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkitgtk3-javascriptcore:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  websnap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+
   # soft restrictions because of build errors
   3dmodels:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   4Blocks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   AAI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   abacate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  abcBridge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   abcnotation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   abeson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   AbortT-monadstf:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2679,7 +2721,6 @@ dont-distribute-packages:
   accelerate-arithmetic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fftw:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-io:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-llvm:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-llvm-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-random:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2713,7 +2754,6 @@ dont-distribute-packages:
   AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ActionKid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  activehs-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   activehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   activitystreams-aeson:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   actor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2727,7 +2767,6 @@ dont-distribute-packages:
   adhoc-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   adict:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adobe-swatch-exchange:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ADPfusion:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Advgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2741,11 +2780,7 @@ dont-distribute-packages:
   aeson-applicative:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-filthy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-flat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-injector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-flowtyped:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-quick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2759,18 +2794,14 @@ dont-distribute-packages:
   Agata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agda-executable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   agda-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  agda-snippets-hakyll:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  agda-snippets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   agentx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   AGI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AhoCorasick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   airbrake:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   air-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aivika-distributed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlanDeniseEricLauren:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alerta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alex-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic-classes:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2794,31 +2825,6 @@ dont-distribute-packages:
   alure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-emailer-client-snap:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-apigateway:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-appstream:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-budgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-codebuild:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ec2:                                 [ i686-linux ]
-  amazonka-elbv2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-health:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-kinesis-analytics:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-lambda:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-lightsail:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-opsworks-cm:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-pinpoint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-polly:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-rds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-rekognition:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-s3:                                  [ i686-linux ]
-  amazonka-s3-streaming:                        [ i686-linux ]
-  amazonka-servicecatalog:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-shield:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-sms:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-snowball:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-sqs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-stepfunctions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-swf:                                 [ i686-linux ]
-  amazonka-xray:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amby:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AMI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2839,7 +2845,6 @@ dont-distribute-packages:
   antagonist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   antfarm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   anticiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antigate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   antimirov:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   antisplice:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   antlrc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2870,18 +2875,14 @@ dont-distribute-packages:
   AppleScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-fail:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-parsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  applicative-quoters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-splice:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  approximate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arbtt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  archnews:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   arff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arghwxhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   argon2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2891,8 +2892,6 @@ dont-distribute-packages:
   ariadne:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arith-encode:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arithmetic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arithmoi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   armada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2915,7 +2914,6 @@ dont-distribute-packages:
   assimp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  async-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2936,7 +2934,6 @@ dont-distribute-packages:
   attosplit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Attrac:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atuin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  audacity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   audiovisual:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   augeas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   augur:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2955,6 +2952,7 @@ dont-distribute-packages:
   avers-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   avl-static:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AvlTree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  avro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   avr-shake:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesome-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesomium-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2976,15 +2974,11 @@ dont-distribute-packages:
   aws-sdk-text-converter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk-xml-unordered:                        [ 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 ]
-  axiom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azubi:                                        [ 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 ]
-  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 ]
   backward-state:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3006,14 +3000,11 @@ dont-distribute-packages:
   barley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Barracuda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barrier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  basic-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  basic-sop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   baskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   batchd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   battlenet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3021,7 +3012,6 @@ dont-distribute-packages:
   battleships:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bdd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3030,7 +3020,6 @@ dont-distribute-packages:
   beeminder-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Befunge93:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bein:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bench:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   BenchmarkHistory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bencoding:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   berkeleydb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3041,8 +3030,6 @@ dont-distribute-packages:
   betacode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bff-mono:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bgmax:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bgzf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bibdb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bidirectionalization-combined:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3053,7 +3040,6 @@ dont-distribute-packages:
   billeksah-main:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   billeksah-pane:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   billeksah-services:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bimaps:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-communicator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3077,38 +3063,31 @@ dont-distribute-packages:
   bindings-gts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-levmar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libftdi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-libg15:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-librrd:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libstemmer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libv4l2:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-linux-videodev2:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-monetdb-mapi:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-sane:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sipc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-wlc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binding-wx:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindynamic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed-example:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseBlast:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseDotP:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseFasta:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseFR3D:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Biobase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseInfernal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseMAF:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseNewick:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseTrainingData:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseTurner:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseTypes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   bio:                                          [ 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 ]
@@ -3117,7 +3096,6 @@ dont-distribute-packages:
   bird:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   BirdPP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bit-array:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitcoin-payment-channel:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitcoin-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitly-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bitly:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3128,11 +3106,7 @@ dont-distribute-packages:
   bit-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bittorrent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bit-vector:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitwise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bkr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  black-jewel:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blacktip:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bla:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   blakesum-demo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   blakesum:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3144,6 +3118,7 @@ dont-distribute-packages:
   blaze-colonnade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-hexpat:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blaze-html-truncate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-textual-native:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ble:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3154,11 +3129,7 @@ dont-distribute-packages:
   blockhash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blogdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BlogLiterately-diagrams:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BlogLiterately:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bloodhound-amazonka-auth:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloomfilter-redis:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blosum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3167,8 +3138,8 @@ dont-distribute-packages:
   blunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   BNFC-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bno055-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bolt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell-compiler:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3177,34 +3148,28 @@ dont-distribute-packages:
   Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-list:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  boomange:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bound-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bound:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  braid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bravo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  break:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  breve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   brillig:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brittany:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   broccoli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   broker-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bsd-sysctl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bson-generic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree:                                        [ 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 ]
   bugzilla:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buildbox:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildbox-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildwrapper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bullet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3217,40 +3182,32 @@ dont-distribute-packages:
   bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   butcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  byline:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestringparser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-progress:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-read:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-strict-builder:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-typenats:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c2hsc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2spec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-audit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-bounds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-cargs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-db:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-debian:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-dev:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghc-dynflags:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-graphdeps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalgraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cabal-ide-backend:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-info:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc72:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc74:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-macosx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalmdvrpm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-mon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-nirvana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3262,15 +3219,11 @@ dont-distribute-packages:
   cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-sort:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-test-quickcheck:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalvchk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabocha:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cached-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cacophony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   caffegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cake:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3280,9 +3233,9 @@ dont-distribute-packages:
   caldims:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   call-haskell-from-anything:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   call:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  camfort:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   campfire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   canonical-filepath:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  canteven-http:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-listen-http:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-parsedate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cantor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3291,7 +3244,6 @@ dont-distribute-packages:
   cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   carboncopy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  carettah:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   carte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cartesian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3303,7 +3255,6 @@ dont-distribute-packages:
   casadi-bindings-snopt-interface:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cascade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cascading:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cases:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3312,6 +3263,8 @@ dont-distribute-packages:
   casr-logbook-reports-meta-html:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-cql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-thrift:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cassava-megaparsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cassava-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   castle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   casui:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3322,7 +3275,6 @@ dont-distribute-packages:
   category-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-traced:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   catnplus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cautious-file:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cblrepo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3341,13 +3293,13 @@ dont-distribute-packages:
   cef3-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ceilometer-common:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cellrenderer-cairo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  celtchar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cerberus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-ieee754:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-io-streams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-plus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cereal-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   certificate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cfipu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3360,14 +3312,11 @@ dont-distribute-packages:
   chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   chalkboard-viewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   charade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  charsetdetect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Chart-gtk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chart-histogram:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chart-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chart-unit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chatty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatty-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chatty-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatwork:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cheapskate-terminal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3410,33 +3359,22 @@ dont-distribute-packages:
   clanki:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clarifai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CLASE:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash-ghc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash:                                        [ 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:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash-systemverilog:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash-verilog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash-vhdl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-parallel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  classy-prelude-conduit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  classy-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  classy-prelude-yesod:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-dot-com:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-bugs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-ircbot:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-plugin-mailinglist:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-media:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-page:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-bootstrap:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-clckwrks:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-geo-bootstrap:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clean-home:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Clean:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clean-unions:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cless:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3449,7 +3387,7 @@ dont-distribute-packages:
   clippard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippings:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloben:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clocked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clogparse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3458,6 +3396,7 @@ dont-distribute-packages:
   cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloud-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloud-seeder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clr-bindings:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clr-inline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3479,15 +3418,12 @@ dont-distribute-packages:
   cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cndict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codec:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Codec-Image-DevIL:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-libevent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-rpm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   codemonitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   codepad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   codeworld-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codex:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cognimeta-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   coin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3502,28 +3438,22 @@ dont-distribute-packages:
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   colonnade:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   color-counter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  colour-accelerate:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   colour-space:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  columbia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinator-interactive:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   combobuffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comfort-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   commander:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Commando:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  commodities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   commsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   commsec-keyexchange:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   commutative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   comonad-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   comonad-random:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ComonadSheet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compactable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-map:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-mutable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3533,18 +3463,11 @@ dont-distribute-packages:
   compdata-dags:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-param:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compensated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   competition:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compilation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  complex-generic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   complexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   compose-ltr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compose-trans:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  composite-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  composite-aeson-refined:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  composite-base:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  composite-ekg:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  composite-opaleye:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   composition-tree:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   compressed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   compression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3564,6 +3487,7 @@ dont-distribute-packages:
   condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   conductive-hsc3:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-lame:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-samplerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-find:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3584,10 +3508,8 @@ dont-distribute-packages:
   consistent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   console-program:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  constrained-categories:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-monads:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  constructible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   consul-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Consumer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3618,12 +3540,10 @@ dont-distribute-packages:
   copilot:                                      [ 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-sbv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-theorem:                              [ 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 ]
   corebot-bliki:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core-compiler:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreDump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreErlang:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreFoundation:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3646,8 +3566,6 @@ dont-distribute-packages:
   cplusplus-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cprng-aes-effect:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cpuperf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cql-io:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-memory:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3686,15 +3604,11 @@ dont-distribute-packages:
   crypto-classical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptoconditions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crypto-enigma:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crypto-multihash:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptsy-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   crystalfontz:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  csound-catalog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  csp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-cspm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-FiringRules:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3703,14 +3617,11 @@ dont-distribute-packages:
   CSPM-ToProlog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cspretty:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   css:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  csv-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctemplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctkl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctpl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cubicbezier:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cuboid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cue-sheet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   currency-convert:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3720,7 +3631,6 @@ dont-distribute-packages:
   curves:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   custom-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cyclotomic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   d3js:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3753,18 +3663,10 @@ dont-distribute-packages:
   data-concurrent-queue:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-construction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-cycle:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-default-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-default-instances-bytestring:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-default-instances-case-insensitive:      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-default-instances-new-base:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-default-instances-text:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-default-instances-unordered-containers:  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-default-instances-vector:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-dispersal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   datadog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-easy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-embed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dataenc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-filepath:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-fin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-fin-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3773,15 +3675,16 @@ dont-distribute-packages:
   data-ivar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-kiln:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-layer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-lens-fd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-lens-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-map-multikey:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-msgpack:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-nat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-pprint:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-quotientref:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-repr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-result:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3791,6 +3694,7 @@ dont-distribute-packages:
   data-rtuple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-spacepart:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-store:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-structure-inferrer:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   DataTreeView:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   datetime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3799,7 +3703,6 @@ dont-distribute-packages:
   dbcleaner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbjava:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DBlimited:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbmigrations:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbmigrations-mysql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbmigrations-postgresql:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3809,6 +3712,7 @@ dont-distribute-packages:
   dbus-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-th-introspection:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dclabel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dcpu16:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-build:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-babel:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3827,7 +3731,6 @@ dont-distribute-packages:
   ddc-war:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-code-detection:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-simple-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  debian-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug-me:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   decepticons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   decimal-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3865,7 +3768,6 @@ dont-distribute-packages:
   derive-enumerable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-gadt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-IG:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-monoid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-storable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-storable-plugin:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-topdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3878,41 +3780,32 @@ dont-distribute-packages:
   dfsbuild:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dgim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dgs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dhall-bash:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-check:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dhall-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dhall-nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dhall-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhcp-lease-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dia-functions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-boolean:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-builder:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-haddock:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-contrib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-hsqml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pandoc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pdf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-pgf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-qrcode:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-reflex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-rubiks-cube:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-tikz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-wx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dialog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice-entropy-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dictionaries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   diffcabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferenceLogic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferentialEvolution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-bootstrap:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-foundation-lucid:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-aeson:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-blaze:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-happstack:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-heist:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-hsp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-lucid:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-scotty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-snap:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   DigitalOcean:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   digitalocean-kzs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensional-codata:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3928,31 +3821,34 @@ dont-distribute-packages:
   directed-cubical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-fastcgi:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-http:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  directory-tree:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-plugins:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   discogs-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   discordian-calendar:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-rest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  discount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DiscussionSupportSystem:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dish:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   disjoint-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  disjoint-set-stateful:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   distance-of-time:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-async:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-azure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-client-server:            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-ekg:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-execution:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-extras:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-fsm:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-lifted:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-monad-control:            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-p2p:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-platform:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-registry:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-simplelocalnet:           [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-supervisor:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-systest:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3971,17 +3867,14 @@ dont-distribute-packages:
   docker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doctest-discover:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   docvim:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DOH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   doi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   DOM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dominion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   domplate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dotfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dot-linker:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  download-curl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  download:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   download-media-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dozenal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dozens:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4019,6 +3912,8 @@ dont-distribute-packages:
   dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dtw:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  duckling:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dumb-cas:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4031,8 +3926,6 @@ dont-distribute-packages:
   dwarfadt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-linker-template:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-mvector:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-object:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-pp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4048,11 +3941,11 @@ dont-distribute-packages:
   easyjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easytensor:                                   [ i686-linux ]
   easytensor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebeats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ec2-unikernel:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eccrypto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecdsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecma262:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4068,19 +3961,15 @@ dont-distribute-packages:
   EEConfig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effect-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   egison-quote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eigen:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ekg-carbon:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ekg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-log:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-rrd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  electrum-mnemonic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   eliminators:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4099,29 +3988,20 @@ dont-distribute-packages:
   enchant:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   encoding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-growler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  engine-io-snap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  engine-io-wai:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-yesod:                              [ 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-function:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enumerate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumeration:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumfun:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   EnumMap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   enummapmap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   env-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  envy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   epanet-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   epass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   epoll:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  epub-metadata:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   epubname:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  epub-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  equal-files:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EqualitySolver:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   erd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   erf-native:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4133,12 +4013,12 @@ dont-distribute-packages:
   error-loc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   error-message:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   error-util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ersatz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ersatz-toysat:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ert:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   escape-artist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EsounD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  esqueleto:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ess:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   estimators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   estreps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4168,22 +4048,17 @@ dont-distribute-packages:
   exact-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   exception-hierarchy:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   exception-monads-fd:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exception-monads-tf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   execs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   exference:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exhaustive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   exherbo-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   exif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-bytes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-deepseq:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-hashable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exinst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  existential:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   explain:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-determinant:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-iomodes-bytestring:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4201,9 +4076,10 @@ dont-distribute-packages:
   extensible-effects:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Extra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extralife:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extrapolate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   faceted:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  factory:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Facts:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   factual-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fadno-braids:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4216,13 +4092,20 @@ dont-distribute-packages:
   fastbayes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastirc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fast-tags:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FastxPipe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fathead-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fault-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-dom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-geoposition:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-hsx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-jquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-ref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-simplejson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-uri:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fbmessenger-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fb-persistent:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fca:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4260,6 +4143,8 @@ dont-distribute-packages:
   file-location:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filepather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FilePather:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   filepath-io-access:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Files:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4269,13 +4154,11 @@ dont-distribute-packages:
   filtrable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Quote-Yahoo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Treasury:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  find-clumpiness:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   find-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   FiniteMap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   first-and-last:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   firstify:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   FirstOrderTheory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fishfood:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fitsio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fitspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4286,10 +4169,8 @@ dont-distribute-packages:
   fixed-storable-array:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-width:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixfile:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fix-imports:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fix-parser-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fix-symbols-gitit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fizz-buzz:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac-picture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flamethrower:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4310,16 +4191,12 @@ dont-distribute-packages:
   flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowsim:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fltkhs-demos:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fltkhs-fluid-demos:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fluidsynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foldl-statistics:                             [ i686-linux ]
   folds-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4329,7 +4206,6 @@ dont-distribute-packages:
   fordo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   forecast-io:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   foreign-var:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ForestStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   for-free:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   forger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   forkable-monad:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4337,7 +4213,6 @@ dont-distribute-packages:
   FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   format:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  format-numbers:                               [ i686-linux ]
   format-status:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   formattable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   formlets-hsp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4351,7 +4226,6 @@ dont-distribute-packages:
   foscam-sort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Foster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   foundation-edge:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foundation:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fpco-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fpnla-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fptest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4361,14 +4235,12 @@ dont-distribute-packages:
   franchise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frank:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fraxl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freddy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-concurrent:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-functors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-operational:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems-counterexamples:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4378,18 +4250,14 @@ dont-distribute-packages:
   free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-vector-spaces:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fresh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-devil:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  friday:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  friday-juicypixels:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-scale-dct:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   frp-arduino:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsh-csv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fswait:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftdi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   FTGL-bytestring:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4415,7 +4283,6 @@ dont-distribute-packages:
   fusion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   futun:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fuzzytime:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fuzzy-timings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-glfw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4423,7 +4290,6 @@ dont-distribute-packages:
   g4ip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gact:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  game-of-life:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   game-probability:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Gamgine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ganymede:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4433,7 +4299,6 @@ dont-distribute-packages:
   gcodehs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-ig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GeBoP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gegl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4457,28 +4322,19 @@ dont-distribute-packages:
   genesis-test:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   genetics:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   geniconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genifunctors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   geni-gui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenI:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   geniplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   geniserver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   geni-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gen-passwd:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   genprog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenSmsPdu:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gentlemark:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenussFold:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-containers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-hspec-aeson:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-hspec-cereal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-hspec-hashable:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-hspec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-path:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genvalidity-time:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeocoderOpenCage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geodetics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geoip2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeoIp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   geojson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   geojson-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4502,11 +4358,7 @@ dont-distribute-packages:
   ghci-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-imported-from:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-ng:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-dom-hello:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-dom:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-dom-jsaddle:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-dom-jsffi:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-dom-webkit:                             [ 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 ]
@@ -4518,30 +4370,17 @@ dont-distribute-packages:
   ghc-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-syb-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-usage:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   giak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Gifcurry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-girepository:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gstaudio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gstbase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-ggit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstpbutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gsttag:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gstvideo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gtk-hs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtkosxapplication:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gtksource:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-javascriptcore:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ginger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-notify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-pangocairo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-pango:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  giphy-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gipeda:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-poppler:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GiST:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4553,18 +4392,13 @@ dont-distribute-packages:
   git-freq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-gpush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-backup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github-release:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github-tools:                                 [ i686-linux ]
   github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github-webhook-handler-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitignore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-jump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-mediate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-monitor:                                  [ 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 ]
@@ -4572,22 +4406,13 @@ dont-distribute-packages:
   gitson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-vogue:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  givegif:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-vte:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit2webextension:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   glade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gladexml-accessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   glapp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glazier-react-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glazier-react:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glazier-react-widget:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-b-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-OGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-task:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glicko:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glider-nlp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   glirc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gll:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4600,19 +4425,11 @@ dont-distribute-packages:
   GlomeTrace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeVec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeView:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-accelerate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-algorithms:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-devil:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-raster:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-sodium:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glue-common:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glue-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glue-ekg:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glue-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gluturtle:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gmap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gmndl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnome-desktop:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4630,40 +4447,20 @@ dont-distribute-packages:
   goatee:                                       [ 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-dataflow:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-firebase-dynamiclinks:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-iam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-manufacturers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-ml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-runtimeconfig:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-safebrowsing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-servicecontrol:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicemanagement:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-sheets:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-shopping-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-slides:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-youtube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-maps-geocoding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2-for-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-oauth2-jwt:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   googleplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   googlepolyline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleSB:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-static-maps:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GoogleSuggest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleTranslate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gopherbot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-demo:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-lambdacube:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gore-and-ash-logging:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-network:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-sdl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-sync:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4672,8 +4469,6 @@ dont-distribute-packages:
   gpio:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Collada:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPipe-GLFW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPipe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-TextureLoad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gps2htmlReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4683,13 +4478,7 @@ dont-distribute-packages:
   grammar-combinators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammatical-parsers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-frp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-ui-gtk:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-ui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Graph500:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Graphalyze:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphbuilder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphene:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GraphHammer-examples:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4698,18 +4487,11 @@ dont-distribute-packages:
   graphics-formats-collada:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicsFormats:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicstools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphql-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-gl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-lambdascope:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-layout:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-ski:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-strategies:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-trs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-ww:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-visit:                                  [ 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 ]
@@ -4722,17 +4504,9 @@ dont-distribute-packages:
   grenade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridbounds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gridland:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GroteTrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-converters:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-inspector:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-mysql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-postgresql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-sqlite:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   group-with:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   growler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4741,10 +4515,8 @@ dont-distribute-packages:
   gruff:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random-fu:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gsmenu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gssapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gssapi-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gstreamer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4775,22 +4547,16 @@ dont-distribute-packages:
   h2c:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   habit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hach:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack2-handler-happstack-server:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack2-handler-mongrel2-http:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack2-handler-snap-server:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack2-handler-warp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-interface-wai:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage2hwn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-diff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-mirror:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-repo-tool:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-sparks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-whatsnew:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib-press:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4811,10 +4577,10 @@ dont-distribute-packages:
   hack-middleware-jsonp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactors:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haddock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddocset:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-formats:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hadoop-rpc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haggis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Haggressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4831,21 +4597,14 @@ dont-distribute-packages:
   hakyll-contrib-hyphenation:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib-links:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-convert:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-filestore:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-ogmarkup:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-R:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   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-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  halma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-telegram-bot:                           [ 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 ]
   hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4867,6 +4626,7 @@ dont-distribute-packages:
   HAppS-IxSet:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-Server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-State:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-authenticate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-auth:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-contrib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4883,9 +4643,7 @@ dont-distribute-packages:
   happstack-monad-peel:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-plugins:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-server-tls-cryptonite:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-server-tls:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-static-routing:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-yui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   happs-tutorial:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4893,13 +4651,11 @@ dont-distribute-packages:
   happybara:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   happybara-webkit-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happy-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hapstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaPy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   harchive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hardware-edsl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaRe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  har:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hark:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HARM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   harmony:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4908,9 +4664,8 @@ dont-distribute-packages:
   haroonga-httpd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haroonga:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   harvest-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasbolt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HasCacBDD:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hascar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascat-lib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4923,13 +4678,11 @@ dont-distribute-packages:
   hashed-storage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hashell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hashids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashtables-plus:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   has:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskakafka:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskanoid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskades:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskarrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskbot-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskdeep:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4943,7 +4696,6 @@ dont-distribute-packages:
   haskell-brainfuck:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-cnc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-coffee:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-compression:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-course-preludes:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskelldb-connect-hdbc-catchio-mtl:           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskelldb-connect-hdbc-catchio-tf:            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4965,12 +4717,11 @@ dont-distribute-packages:
   haskelldb:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskelldb-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskelldb-wx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-eigen-util:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-ftp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-go-checkers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-igraph:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-import-graph:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-kubernetes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-lsp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4991,21 +4742,12 @@ dont-distribute-packages:
   haskellscript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-prisms:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-qq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-src-exts-simple:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-meta-mwotton:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-token-utils:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-fromghc:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-gen:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-tools-ast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-trf:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-tools-backend-ghc:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-cli:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-tools-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 ]
-  haskell-tools-rewrite:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellTutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5037,26 +4779,19 @@ dont-distribute-packages:
   HaskRel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasmin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasparql-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-backend:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-class:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   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:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-postgres-options:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-transaction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haste-cabal-install:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-compiler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-gapi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-perch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hastily:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hatex-guide:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-qq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5066,11 +4801,8 @@ dont-distribute-packages:
   hawitter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hawk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hax:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haxl-amazonka:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl-facebook:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haxl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxparse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haxr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxr-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hayland:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5085,8 +4817,6 @@ dont-distribute-packages:
   hblas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hblock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-booru:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hbro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hburg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HCard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5115,16 +4845,12 @@ dont-distribute-packages:
   hdis86:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdiscount:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdph-closure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdr-histogram:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   HDRUtils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   headergen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heaps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hecc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heckle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hedgehog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hedi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-pile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5140,7 +4866,6 @@ dont-distribute-packages:
   hellage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hellnet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   help-esb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hemkay:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hemokit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5166,12 +4891,8 @@ dont-distribute-packages:
   hevolisa-dph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hevolisa:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexif:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat-lens:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-pickle-generic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat-tagsoup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexquote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hF2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5211,7 +4932,6 @@ dont-distribute-packages:
   hgearman:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeometric:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgeometry:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgettext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5220,27 +4940,21 @@ dont-distribute-packages:
   hgopher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-gpgme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGraphStorage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgrev:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hharp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hi3status:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  H:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiccup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hichi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hidapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hieraclus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-clustering-diagrams:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiernotify:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hieroglyph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hifi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HiggsSet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  higher-leveldb:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  highjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  highjson-swagger:                             [ i686-linux ]
-  highjson-th:                                  [ i686-linux ]
   highWaterMark:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   himg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5248,13 +4962,12 @@ dont-distribute-packages:
   hindley-milner:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinquire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinstaller:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinterface:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hint-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinvaders:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinze-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hipchat-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HipmunkPlayground:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hircules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hirt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5280,10 +4993,7 @@ dont-distribute-packages:
   HLearn-classification:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-iadd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-irr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5299,17 +5009,13 @@ dont-distribute-packages:
   hmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmarkup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-banded:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-glpk:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-mmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nlopt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-repa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-special:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-svdlibc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5364,12 +5070,10 @@ dont-distribute-packages:
   hOpenPGP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopenpgp-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopfield:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopfli:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hora:                                         [ i686-linux ]
   ho-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   horizon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  horname:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hosts-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hothasktags:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hotswap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5378,16 +5082,13 @@ dont-distribute-packages:
   hp2any-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hp2any-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hp2any-manager:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpack-convert:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpaco:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpaco-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpapi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpaste:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpasteit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpc-coveralls:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpc-tracer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpdft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5406,9 +5107,9 @@ dont-distribute-packages:
   hpygments:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpylos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hquantlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hquery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hranker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HRay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hreader-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-reversi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hricket:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5421,11 +5122,9 @@ dont-distribute-packages:
   HROOT-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hruby:                                        [ i686-linux, x86_64-darwin ]
   hs2bf:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs2dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hs2lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hS3:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbackup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5433,7 +5132,6 @@ dont-distribute-packages:
   hsbencher-fusion:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc2hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-data:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-forth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5455,13 +5153,11 @@ dont-distribute-packages:
   hsclock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscope:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hScraper:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsdev:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdif:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-di:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdns-cache:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-dotnet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-duktape:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hsed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsemail-ns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsenv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5474,7 +5170,6 @@ dont-distribute-packages:
   hs-fltk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-gchart:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-gen-iface:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-GeoIP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSGEP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-gizapp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsgnutls:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5482,10 +5177,9 @@ dont-distribute-packages:
   hsgsom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHaruPDF:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HsHTSLib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsimport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-java:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsJudy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5494,7 +5188,6 @@ dont-distribute-packages:
   hslibsvm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSlippyMap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslogger-reader:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hslogger-template:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-logo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslogstash:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsmagick:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5509,19 +5202,14 @@ dont-distribute-packages:
   hsnsq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsntp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSoM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsOpenSSL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsOpenSSL-x509-system:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsoptions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSoundFile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsoz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsparklines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsp-cgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspear:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspec-expectations-lifted:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-pretty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-experimental:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspec-golden-aeson:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-hedgehog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-jenkins:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-monad-control:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5529,11 +5217,9 @@ dont-distribute-packages:
   hspec-shouldbe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-snap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   hs-pgms:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspkcs11:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pkg-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-pkpass:                                    [ 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 ]
@@ -5552,8 +5238,6 @@ dont-distribute-packages:
   hs-scrape:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsseccomp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsSqlite3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hssqlppp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hssqlppp-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsSVN:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5569,7 +5253,6 @@ dont-distribute-packages:
   hsubconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsudoku:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-vcard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsverilog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-watchman:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hswip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5591,30 +5274,22 @@ dont-distribute-packages:
   http-attoparsec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-auth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-lens:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-client-openssl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-request-modifiers:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-streams:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-conduit-browser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-conduit-downloader:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-dispatch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-kinder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-link-header:                             [ i686-linux ]
-  http-pony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   https-everywhere-rules-raw:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-shed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   httpspec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-streams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-wget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   htune:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   htzaar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hub:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hubigraph:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hubris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HueAPI:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  huff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hugs2yc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hulk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HulkImport:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5622,7 +5297,6 @@ dont-distribute-packages:
   hunch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HUnit-Diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunit-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HUnit-Plus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunit-rematch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunt-searchengine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5635,32 +5309,20 @@ dont-distribute-packages:
   huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-balancedparens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-bits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-eliasfano:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-excess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-json:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-json-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-kafka-avro:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-kafka-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-kafka-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker-ses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-packed-vector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-rankselect-base:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-rankselect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-bytevector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-reducers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-succinct:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxmppc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXMPP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxournal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXQ:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxt-binary:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxt-expat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxt-filter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxthelper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxweb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5684,12 +5346,9 @@ dont-distribute-packages:
   hylotab:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyloutils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperdrive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyper-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperfunctions:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyperloglog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperloglogplus:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperpublic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyphenation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hzulip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   i18n:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5701,14 +5360,12 @@ dont-distribute-packages:
   ide-backend:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   idempotent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  identifiers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   idiii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   idna2008:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   IDynamic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ieee-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   iException:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ifcxt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   IFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ige-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ig:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5746,15 +5403,12 @@ dont-distribute-packages:
   implicit-params:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   imports:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   impossible:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imprevu-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   improve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   INblobs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-maps:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  indentation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  indentation-trifecta:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   indexed-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   IndexedList:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   indices:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5766,11 +5420,8 @@ dont-distribute-packages:
   InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   infix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  influxdb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   informative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   inject-function:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inline-java:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inline-r:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   inserts:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inspector-wrecker:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-aeson:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5779,26 +5430,19 @@ dont-distribute-packages:
   instant-generics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   interleavableIO:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interlude-l:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   internetmarke:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interpolation:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpol:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   interruptible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   introduction-test:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  intro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   intro-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   intset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible-hlist:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  invertible:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  invertible-syntax:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-capture:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ion:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-reactive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5815,9 +5459,6 @@ dont-distribute-packages:
   iptadmin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   IPv6DB:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipython-kernel:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ircbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  irc-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  irc-dcc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-color:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5826,14 +5467,11 @@ dont-distribute-packages:
   ironforge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   iron-mq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   isevaluated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  is:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ismtp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   IsNull:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iso8583-bitmaps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   isobmff-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   isohunt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  isotope:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  itemfield:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-compress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5845,14 +5483,8 @@ dont-distribute-packages:
   ivor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-backend-c:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-bitdata:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-eval:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-hw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-opts:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-serialize:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-stdlib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivy-web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ixdopp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ixmonad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5870,7 +5502,6 @@ dont-distribute-packages:
   jason:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  javaclass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-reflect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5879,30 +5510,21 @@ dont-distribute-packages:
   jcdecaux-vls:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Jdh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jdi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jenga:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jni:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   join:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   joinlist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jonathanscard:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jort:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jose-jwt:                                     [ i686-linux ]
-  jsaddle-dom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-hello:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsaddle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-warp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsaddle-webkit2gtk:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsaddle-webkitgtk:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-wkwebview:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   JsContracts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   js-good-parts:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsmw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   json2-hdbc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   json2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-assertions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-ast-quickcheck:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-autotype:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-b:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5911,6 +5533,7 @@ dont-distribute-packages:
   JSON-Combinator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-feed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   JsonGrammar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-incremental-decoder:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-litobj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5919,27 +5542,19 @@ dont-distribute-packages:
   json-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonresume:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonrpc-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsonschema-gen:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonsql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-togo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsontsv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonxlsx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jspath:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  juandelacosa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   judy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   juicy-gcode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   JuicyPixels-canvas:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JuicyPixels-extra:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JuicyPixels-repa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   JunkDB-driver-gdbm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   JunkDB-driver-hashtables:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   JunkDB:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   jupyter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jvm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jvm-streaming:                                [ 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 ]
   kafka-device-glut:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5960,7 +5575,6 @@ dont-distribute-packages:
   karakuri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   karps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   katip-elasticsearch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  katip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kawaii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kazura-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5987,7 +5601,6 @@ dont-distribute-packages:
   keyring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keysafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keystore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keyvaluehash:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   keyword-args:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   khph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kicad-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6003,7 +5616,6 @@ dont-distribute-packages:
   knots:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   koellner-phonetic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Konf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kontra-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   korfu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kqueue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   krapsh:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6023,9 +5635,7 @@ dont-distribute-packages:
   lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdabot-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-bridge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-calculator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-canvas:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-media:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-bullet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6044,10 +5654,7 @@ dont-distribute-packages:
   Lambdajudge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaLit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaNet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-options:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaPrettyQuote:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-sampler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdatex:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdatwit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaya-bus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6072,16 +5679,12 @@ dont-distribute-packages:
   language-ninja:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-puppet:                              [ i686-linux, x86_64-darwin ]
   language-python-colour:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-python:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-python-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-qux:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-sh:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-spelling:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   LargeCardinalHierarchy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  large-hashable:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lastik:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   latest-npm-version:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-hakyll:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6113,19 +5716,14 @@ dont-distribute-packages:
   legion-discovery:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  leksah:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  leksah-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lendingclub:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lenses:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-properties:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lensref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lens-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-text-encoding:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-time:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-tutorial:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lentil:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lenz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lenz-template:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Level0:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leveldb-haskell-fork:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6145,7 +5743,6 @@ dont-distribute-packages:
   libGenI:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libgraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   libhbb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libjenkins:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liblastfm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   liblawless:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liblinear-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6155,20 +5752,14 @@ dont-distribute-packages:
   libpafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libpq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   librandomorg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  librato:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libroman:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   libssh2-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   libssh2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libsystemd-daemon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libsystemd-journal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   libtagc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libvirt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libvorbis:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxls:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxslt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libzfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   LibZip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ligature:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6179,25 +5770,19 @@ dont-distribute-packages:
   Limit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   limp-cbc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   limp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lin-alg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   linda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   linden:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-algebra-cblas:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-circuit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linearmap-category:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-vect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linebreak:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LinguisticsTypes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinkChecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linkchk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   linkcore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   linkedhashmap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linklater:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linode:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   linode-v4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-blkid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-cgroup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6210,20 +5795,17 @@ dont-distribute-packages:
   lipsum-gen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal-demo:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  liquidhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-mux:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-html-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-http-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  list-t-libcurl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ListTree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  list-tries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-zip-def:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   literals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  live-sequencer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ll-picosat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   llsd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-analysis:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6233,11 +5815,9 @@ dont-distribute-packages:
   llvm-data-interop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-ffi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-general-darwin:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general-pure:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general-quote:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-ht:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6245,16 +5825,12 @@ dont-distribute-packages:
   lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  located-monad-logger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lock-file:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log-elasticsearch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   logger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  logging-facade-journald:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logic-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6264,17 +5840,19 @@ dont-distribute-packages:
   Logic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   logplex-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  logsink:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log-warper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojban:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojbanParser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojbanXiragan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojysamban:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-apps:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lol-benches:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-calculus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lol-cpp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   loli:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lol-repa:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lol-tests:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-typing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lookup-tables:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   loop-effin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6287,15 +5865,12 @@ dont-distribute-packages:
   lostcities:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   loup:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lowgl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lp-diagrams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lscabal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   LslPlus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lsystem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ltext:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ltiv1p1:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   luachunk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lucienne:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6313,21 +5888,16 @@ dont-distribute-packages:
   lye:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lykah:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lz4-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lzma-clib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lzma-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-streams:                                 [ 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-amazonka:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   maclight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  madlang:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mage:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MagicHaskeller:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   magico:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   magma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mahoro:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6341,9 +5911,7 @@ dont-distribute-packages:
   makedo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   make-hard-links:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   make-package:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-all:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-anything:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-curl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-editor:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6354,7 +5922,6 @@ dont-distribute-packages:
   manatee-mplayer:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-pdfviewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-processmanager:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-reader:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-template:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-terminal:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-welcome:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6363,19 +5930,13 @@ dont-distribute-packages:
   manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  map-syntax:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown-kate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markdown-pap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markov-processes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markup-preview:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marquise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mars:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marvin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marxup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   masakazu-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MASMGen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   matchers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6395,7 +5956,6 @@ dont-distribute-packages:
   MaybeT-monads-tf:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MazesOfMonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MBot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mbox-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   MC-Fold-DP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mcl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6416,12 +5976,9 @@ dont-distribute-packages:
   mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus-fdk-aac:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mediabus:                                     [ i686-linux ]
-  mediabus-rtp:                                 [ i686-linux ]
   mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mega-sdist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mellon-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mellon-gpio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mellon-web:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6443,28 +6000,23 @@ dont-distribute-packages:
   metricsd-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metronome:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mezzolens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mgeneric:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mhailist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  microformats2-parser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  microlens-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   microlens-each:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   micrologger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   MicrosoftTranslator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mida:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   midair:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   midimory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midi-music-box:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mighttpd2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mighttpd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mikmod:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  milena:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mime-string:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   minecraft-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   minesweeper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6482,7 +6034,6 @@ dont-distribute-packages:
   mirror-tweet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   missing-py2:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   MissingPy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mix-arrows:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mixed-strategies:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mkbndl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mlist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6490,11 +6041,8 @@ dont-distribute-packages:
   mmtf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mnist-idx:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   moan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modbus-tcp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   modelicaparser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modify-fasta:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   modsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-prelude-classy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6503,7 +6051,6 @@ dont-distribute-packages:
   modulespection:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   modulo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MoeDict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  moesocks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mohws:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mollie-api-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6514,8 +6061,7 @@ dont-distribute-packages:
   MonadCatchIO-mtl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCatchIO-transformers-foreign:            [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCatchIO-transformers:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-classes-logging:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-codec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCompose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-dijkstra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-exception:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6534,8 +6080,6 @@ dont-distribute-packages:
   monad-memo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-mersenne-random:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-open:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-parallel-progressbar:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadRandomLazy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ran:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-resumption:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monads-fd:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6543,7 +6087,6 @@ dont-distribute-packages:
   monad-state:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-statevar:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ste:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-st:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-io:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-stm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-task:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6556,7 +6099,6 @@ dont-distribute-packages:
   mondo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   monetdb-mapi:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   money:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongrel2-handler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6582,8 +6124,6 @@ dont-distribute-packages:
   mprover:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpvguihs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mqtt-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mqtt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mrm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   msgpack-aeson:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   msgpack:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6608,8 +6148,8 @@ dont-distribute-packages:
   mud:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mulang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   multext-east-msd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multiaddr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multifile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   multihash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multipass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6637,7 +6177,6 @@ dont-distribute-packages:
   musicxml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mustache2hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mustache-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mustache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mutable-iter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MutationOrder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mute-unmute:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6652,15 +6191,11 @@ dont-distribute-packages:
   mysnapsession-example:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysnapsession:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-effect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-haskell-nem:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-haskell-openssl:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple-quasi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple-typed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   mzv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nagios-plugin-ekg:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   named-lock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6681,7 +6216,6 @@ dont-distribute-packages:
   native:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nat-sized-numbers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   nats-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NaturalLanguageAlphabets:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   natural-number:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   naver-translate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   NearContextAlgebra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6709,9 +6243,6 @@ dont-distribute-packages:
   nettle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-netkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-openflow:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netwire-input-glfw:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netwire-input:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire-input-javascript:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire-vinylglfw-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6720,15 +6251,12 @@ dont-distribute-packages:
   network-bitcoin:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bytestring:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-carbon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-connection:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-dbus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-dns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  networked-game:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-hans:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-interfacerequest:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-minihttp:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-msgpack-rpc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-netpacket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-protocol-xmpp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-rpca:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6739,6 +6267,7 @@ dont-distribute-packages:
   network-stream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-topic-models:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-transport-amqp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-transport-zeromq:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-uri-static:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-wai-router:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-websocket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6749,7 +6278,6 @@ dont-distribute-packages:
   newsynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   newt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   newtype-deriving:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  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 ]
@@ -6762,39 +6290,31 @@ dont-distribute-packages:
   nimber:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ninjas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nitro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nix-eval:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlopt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlp-scores-scripts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   nme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  n-m:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   nntp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   noether:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nofib-analyze:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   noise:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nomyx-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nomyx-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nomyx-language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nomyx-library:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nomyx-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   NonEmptyList:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nonfree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nonlinear-optimization-ad:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nonlinear-optimization:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   noodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  normalization-insensitive:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   no-role-annots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   NoSlow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   notcpp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   not-gloss-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  notzero:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   np-linear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nptools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ntrip-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6806,28 +6326,24 @@ dont-distribute-packages:
   NumberSieves:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   NumberTheory:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  numerals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ranges:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-range:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   NXTDSL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nylas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nymphaea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   oauthenticated:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  obdd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   obd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   oberon0:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Object:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   objectid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ObjectIO:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  octane:                                       [ i686-linux ]
   octohat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6848,15 +6364,13 @@ dont-distribute-packages:
   omnifmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   on-a-horse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   onama:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  one-liner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   oneormore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   online:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OnRmt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-classy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenAFP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenAFP-Utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opench-meteo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLWrappers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6869,24 +6383,17 @@ dont-distribute-packages:
   opengles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenGLRaw21:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-haddock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   openpgp-crypto-api:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   openpgp-Crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenSCAD:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   opensoundcontrol-ht:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   openssh-github-keys:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openssl-createkey:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openssl-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   opentheory-char:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   opentype:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-typerep:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-witness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  operational-alacarte:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   opn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimization:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6903,23 +6410,24 @@ dont-distribute-packages:
   ordrea:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   organize-imports:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgmode:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orgmode-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgstat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   origami:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  orizentic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   OrPatterns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   osc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oscpacking:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-download:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OSM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   oso2pdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  otp-authenticator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   overture:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   package-vt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   packed-dawg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   packedstring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   packman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  packunused:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pacman-memcache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   padKONTROL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pagarme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6928,22 +6436,17 @@ dont-distribute-packages:
   panda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-crossref:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pandoc-csv2table:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-include-code:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-japanese-filters:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pandoc-lens:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-placetable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-plantuml-diagrams:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pang-a-lambda:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   panpipe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pansite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  papa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  papa-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-prelude-lens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  papa-prelude-semigroupoids:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  papillon:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  paprika:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   paragon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Paraiso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   parallel-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6954,7 +6457,6 @@ dont-distribute-packages:
   parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pareto:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Parry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parsec-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-parsers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   parseerror-eq:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   parse-help:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6965,9 +6467,7 @@ dont-distribute-packages:
   parsestar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   partage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partial-isomorphisms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partial-order:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   partly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   passage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PasswordGenerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6991,12 +6491,9 @@ dont-distribute-packages:
   PCLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcre-light-extra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdfname:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pdf-slave:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pdf-slave-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdfsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdynload:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   peakachu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peano:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PeanoWitnesses:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   peggy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7013,23 +6510,18 @@ dont-distribute-packages:
   perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   perf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  period:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   periodic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   PermuteEffects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   persist2er:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-audit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-cereal:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-database-url:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-equivalence:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-hssqlppp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-map:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-mongoDB:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-mysql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-protobuf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-ratelimit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-relational-record:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-zookeeper:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   persona:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   persona-idp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7037,7 +6529,6 @@ dont-distribute-packages:
   peyotls-codec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   peyotls:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pez:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pgdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-harness-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-recorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7062,11 +6553,9 @@ dont-distribute-packages:
   pi-forall:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   piki:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-async:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-attoparsec-streaming:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-bgzf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-binary:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-cacophony:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cereal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cereal-plus:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7076,7 +6565,6 @@ dont-distribute-packages:
   pipes-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-files:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-illumina:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-key-value-csv:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-lzma:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7088,10 +6576,8 @@ dont-distribute-packages:
   pipes-s3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-shell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-sqlite-simple:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-zeromq4:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-zlib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pisigma:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Piso:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pitchtrack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pivotal-tracker:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7102,18 +6588,14 @@ dont-distribute-packages:
   plat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   platinum-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlayingCards:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  playlists:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plist-buddy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plivo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   plocketed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plot-gtk-ui:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plugins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   plumbers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ply-loader:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   png-file:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload-fixed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7123,26 +6605,22 @@ dont-distribute-packages:
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokemon-go-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  poker-eval:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokitdok:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   polar-shader:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polh-lexicon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polimorf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pollutocracy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  poly-arity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   poly-control:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polynom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   polynomial:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   polyseq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polysoup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   polytypeable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polytypeable-utils:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pomodoro:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ponder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pong-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pontarius-mediaserver:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pontarius-xmpp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pontarius-xpmn:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pool-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pool:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7153,7 +6631,6 @@ dont-distribute-packages:
   porter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   PortFusion:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ports:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  posix-acl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-pty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-waitpid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   postcodes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7161,9 +6638,6 @@ dont-distribute-packages:
   postgresql-named:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-orm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-schema:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-simple-bind:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-simple-opts:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-queue:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-sop:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7172,13 +6646,9 @@ dont-distribute-packages:
   postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmark-streams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postmaster:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   potato-tool:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  potrace-diagrams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  powermate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   powerpc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PPrinter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pptable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
@@ -7188,24 +6658,18 @@ dont-distribute-packages:
   prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   prefork:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pregame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  preliminaries:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   prelude-generalize:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   prelude-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   preprocess-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   preprocessor:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  present:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
+  prettyprinter-convert-ansi-wl-pprint:         [ i686-linux, x86_64-linux, x86_64-darwin ]
   prettyprinter-vty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pretty-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PrimitiveArray:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pringletons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   print-debugger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Printf-TH:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   PriorityChansConverger:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7240,27 +6704,20 @@ dont-distribute-packages:
   property-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   proplang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prosper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proteaaudio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   protobuf-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-optparse:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-protoc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   protolude-lifted:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   proton-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   prove-everywhere-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   proxy-kindness:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   psc-ide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pub:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   publicsuffixlistcreate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubnub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubsub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   puffytools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pugixml:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pugs-hsregex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pugs-HsSyck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pugs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7268,14 +6725,13 @@ dont-distribute-packages:
   punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pure-cdb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bundle-fast:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  purescript:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pursuit-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pusher-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pusher-http-haskell:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pusher-ws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pushme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7293,8 +6749,8 @@ dont-distribute-packages:
   qed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   qhull-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   qif:                                          [ 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 ]
+  qm-interpolated-string:                       [ 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 ]
   qtah-cpp-qt5:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7315,8 +6771,6 @@ dont-distribute-packages:
   queuelike:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickAnnotate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickbooks:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickcheck-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  QuickCheck-GenT:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-poly:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-property-comb:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-property-monad:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7324,16 +6778,13 @@ dont-distribute-packages:
   quickcheck-relaxng:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-report:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickcheck-special:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-string-random:                     [ 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 ]
   quick-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickset:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Quickson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  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:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7341,21 +6792,19 @@ dont-distribute-packages:
   quiver-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-groups:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-http:                                  [ 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 ]
   quiver-sort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   quoridor-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   qux:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rabocsv2qif:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rad:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium-formula-parser:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  radium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   radix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rados-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   raft:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rail-compiler-editor:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rails-session:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rainbow-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  raketka:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rakhana:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ralist:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   rallod:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7368,7 +6817,6 @@ dont-distribute-packages:
   random-effin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-hypergeometric:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-stream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-variates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7389,13 +6837,11 @@ dont-distribute-packages:
   rasa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rasenschach:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rattletrap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   raven-haskell-scotty:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   raw-feldspar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rawr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   raz:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   razom-text-util:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rbpcp-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rbr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rcu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7403,21 +6849,15 @@ dont-distribute-packages:
   react-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl2:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-threepenny:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-wx:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-jack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-midyim:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-thread:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ReadArgs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  read-bounded:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   read-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   readline-statevar:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   readme-lhs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7430,45 +6870,30 @@ dont-distribute-packages:
   record:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-preprocessor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  records-sop:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  recursion-schemes:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   recursors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   reddit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   refcount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Referees:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  references:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   refh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflection-extras:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-animation:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-dom-colonnade:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-dom-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-dom-helpers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-dom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-gloss:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-gloss-scene:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-jsx:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-orphans:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ref-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   refresht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  refty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  refurb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexchar:                                    [ 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 ]
-  regexdot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-genex:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-pderiv:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexpr-symbolic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7479,7 +6904,6 @@ dont-distribute-packages:
   regex-tdfa-utf8:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tre:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-type:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-with-pcre:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-xmlschema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   regional-pointers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   regions:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7495,10 +6919,7 @@ dont-distribute-packages:
   reheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reified-records:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rei:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reinterpret-cast:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  relapse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  relational-record-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  relational-postgresql8:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
@@ -7512,18 +6933,18 @@ dont-distribute-packages:
   remote-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   remotion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reorderable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-algorithms:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-array:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-bytestring:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-convert:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-devil:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-fftw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-flow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-linear-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-plugin:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-scalar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-sndfile:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-v4l2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   repl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7536,7 +6957,6 @@ dont-distribute-packages:
   req-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   req:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rerebase:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   resin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-effect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7566,6 +6986,7 @@ dont-distribute-packages:
   ridley-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ridley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   riff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ring-buffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   riot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ripple-federation:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ripple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7577,7 +6998,6 @@ dont-distribute-packages:
   RJson:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rlang-QQ:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rlglue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rl-satton:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rlwe-challenges:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   rmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   RMP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7585,16 +7005,15 @@ dont-distribute-packages:
   RNAdraw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   RNAFold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   RNAFoldProgs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAlien:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   RNAwolf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rncryptor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   robot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   robots-txt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rocksdb-haskell:                              [ i686-linux ]
+  roc-cluster-demo:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roc-cluster:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-engine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-gl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rollbar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   roller:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   RollingDirectory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   rope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7605,8 +7024,6 @@ dont-distribute-packages:
   rosso:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rounding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip-string:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-xml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   route-generator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   route-planning:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7620,15 +7037,11 @@ dont-distribute-packages:
   rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rspp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rss:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rtcm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rtnetlink:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtorrent-rpc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtorrent-state:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rts-loader:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ruby-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rubberband:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruby-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ruff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruler-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruler:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7637,14 +7050,12 @@ dont-distribute-packages:
   rws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SableCC2Hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-access:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safecopy-store:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safeint:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-lazy-io:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-length:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-money:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-printf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safer-file-handles-bytestring:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7675,15 +7086,13 @@ dont-distribute-packages:
   sat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sat-micro-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   scalp-webhooks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   scan-vector-machine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  s-cargot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedyield:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7714,11 +7123,9 @@ dont-distribute-packages:
   scrz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Scurry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scyther-proof:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-cairo-image:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-gfx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-image:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   search:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7726,11 +7133,9 @@ dont-distribute-packages:
   sec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seclib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   second-transfer:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secp256k1:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   secret-santa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   secret-sharing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   secrm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secure-sockets:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   sednaDBXML:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   selectors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7748,52 +7153,43 @@ 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 ]
+  seqid-streams:                                [ 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 ]
   servant-aeson-specs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-docs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-hmac:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-server:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-swagger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-acid:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth-token-api:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-auth-token:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-leveldb:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-persistent:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-db:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-docs:                                 [ i686-linux ]
+  servant-ekg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-github-webhook:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-matrix-param:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-mock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-multipart:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pandoc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-purescript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-py:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-router:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-subscriber:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-client:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-zeppelin-swagger:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   server-generic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  serversession-backend-persistent:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  serversession-backend-redis:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-frontend-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   serv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   services:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7802,16 +7198,12 @@ dont-distribute-packages:
   ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  setdown:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   setgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  setoid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sets:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   setters:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sexp-grammar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sext:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFML-control:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFML:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sfmt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7829,7 +7221,6 @@ dont-distribute-packages:
   shake-cabal-build:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-minify:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  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 ]
@@ -7842,9 +7233,8 @@ dont-distribute-packages:
   she:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelduck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shell-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shellmate-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shellmate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelltestrunner:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   shikensu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7854,21 +7244,17 @@ dont-distribute-packages:
   showdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sibe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sigma-ij:                                     [ i686-linux ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   signed-multiset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   simgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-atom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-bluetooth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-c-value:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-effects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-firewire:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-form:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7878,7 +7264,6 @@ dont-distribute-packages:
   simple-index:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleirc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-logging:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleLog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-log-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7889,18 +7274,15 @@ dont-distribute-packages:
   simple-postgresql-orm:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleprelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleServer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-sql-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplessh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplest-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleTableGenerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-tabular:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-vec3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simseq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sindre:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sink:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   siphon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sitepipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sitemap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sixfiguregroup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized-vector:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7909,14 +7291,11 @@ dont-distribute-packages:
   skell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   skemmtun:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   skylark-client:                               [ 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 ]
   slack-web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   slidemews:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Slides:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sloane:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sloth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   slot-lambda:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallarray:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7931,7 +7310,6 @@ dont-distribute-packages:
   sme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   smerdyakov:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Smooth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smsaero:                                      [ 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 ]
   smt-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7941,7 +7319,6 @@ dont-distribute-packages:
   smtp-mail-ng:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snake-game:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snake:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-accept:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-auth-cli:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-blaze-clay:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-configuration-utilities:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7994,8 +7371,6 @@ dont-distribute-packages:
   snappy-framing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snappy-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-routes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-templates:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-testing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-web-routes:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8010,19 +7385,15 @@ dont-distribute-packages:
   snowflake-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   snow-white:                                   [ 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 ]
   SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket-unix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sodium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   soegtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  solga-swagger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   solr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sonic-visualiser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Sonnex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8031,12 +7402,10 @@ dont-distribute-packages:
   sorted:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sorting:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sorty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sound-collage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   source-code-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   SourceGraph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sousit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   soyuz:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SpaceInvaders:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   spacepart:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SpacePrivateers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   spaceprobe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8052,23 +7421,18 @@ dont-distribute-packages:
   sphero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphinx-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   spice:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spike:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SpinCounter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   spir-v:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   splaytree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   spline3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   splines:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  split-record:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   splitter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Spock-api-ghcjs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Spock-auth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Spock-digestive:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   spoonutil:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   spoty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Sprig:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   spritz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sproxy2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sproxy-web:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   spsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlcipher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8079,27 +7443,23 @@ dont-distribute-packages:
   sql-simple-sqlite:                            [ 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 ]
+  sscan:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sshd-lint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ssh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sssp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sstable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SSTG:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-heap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stable-marriage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stable-memo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack2nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-build-plan:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cabal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stackage-curator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-bump:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-derive-topdown:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-haddock:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   starling:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8109,7 +7469,6 @@ dont-distribute-packages:
   state-bag:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   state:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  state-plus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   state-record:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   statgrab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-dirichlet:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8117,25 +7476,21 @@ dont-distribute-packages:
   statistics-hypergeometric-genvar:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  staversion:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-truetype:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdata:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   steambrowser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  steeloverseer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stego-uuid:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   step-function:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stepwise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-chunked-queues:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-firehose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stm-lifted:                                   [ 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 ]
-  store:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-ATermLib:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-Sdf2Haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   StrappedTemplates:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8148,18 +7503,14 @@ dont-distribute-packages:
   stream-fusion:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-cassava:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streaming-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  strelka:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   str:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   strict-concurrency:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  strict-identity:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  strict-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   strictly:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stringlike:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   string-typelits:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  StringUtils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe-http-streams:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8171,7 +7522,6 @@ dont-distribute-packages:
   stunts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stutter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stylized:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  styx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sub-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8185,8 +7535,8 @@ dont-distribute-packages:
   sunroof-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   supercollider-ht:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supercollider-midi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  superconstraints:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   superdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  supermonad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   super-user-spark:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8196,48 +7546,40 @@ dont-distribute-packages:
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swagger2:                                     [ i686-linux ]
-  swagger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swearjure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   swf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   swift-lda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swish:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SWMMoutGetMB:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SybWidget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-with-class-instances-text:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sylvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  symantic-lib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  symengine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sym:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sym-plot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sync:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sync-mht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   syncthing-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntactic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-example:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-example-json:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SyntaxMacros:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntaxnet-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-pretty:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-printer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-trees-fork-bairyn:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-trees:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-alsa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-core:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-dimensional:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-filter:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-llvm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-midi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Sysmon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sys-process:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-info:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-linux-proc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-locale:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   systemstats:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8255,6 +7597,8 @@ dont-distribute-packages:
   tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-timers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  taggy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  taggy-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   taglib-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagset-positional:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-ht:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8262,7 +7606,6 @@ dont-distribute-packages:
   tagsoup-selection:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tahin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ta:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tailfile-hinotify:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   takusen-oracle:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8274,27 +7617,20 @@ dont-distribute-packages:
   task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   task:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-auto:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tasty-discover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tasty-fail-fast:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-groundhog-converters:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-integrate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-jenkins-xml:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-laws:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tasty-tap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TaxonomyTools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tbox:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tccli:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tcp-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcp-streams-openssl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdd-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tdoc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeaHS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   teams:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  teeth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8321,7 +7657,6 @@ dont-distribute-packages:
   tensorflow-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   termbox-bindings:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  terminal-progress-bar:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   termination-combinators:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   termplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8329,7 +7664,6 @@ dont-distribute-packages:
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tersmu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   testbench:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TestExplode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-sandbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8343,22 +7677,15 @@ dont-distribute-packages:
   testrunner:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-sandbox-compose:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-sandbox-hunit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-sandbox:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-sandbox-quickcheck:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeX-my-math:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  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-builder:                                 [ 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-ldap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-lips:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-markup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   textmatetags:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-normal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8367,8 +7694,6 @@ dont-distribute-packages:
   text-register-machine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-render:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-short:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-show:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-show-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   textual:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-generic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8378,8 +7703,6 @@ dont-distribute-packages:
   tga:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-build:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-context:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  THEff:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  themoviedb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   thentos-cookie-session:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Theora:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   theoremquest-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8391,52 +7714,38 @@ dont-distribute-packages:
   th-instance-reification:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-kinds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  threadscope:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  threads-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  threepenny-gui-flexbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  threepenny-gui:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-sccs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-traced:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-typegraph:                                 [ 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 ]
-  tickle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tictactoe3d:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   TicTacToe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-midi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-serial:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tidal-vis:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tie-knot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tiempo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TigerHash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tiger:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tightrope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tighttp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timberc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeconsole:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-exts:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeparsers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-patterns:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TimePiece:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeseries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timestamp-subprocess-lines:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timezone-unix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8449,7 +7758,6 @@ dont-distribute-packages:
   Titim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tkhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tkyprof:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tld:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tldr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tls-extra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tmp-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8462,29 +7770,23 @@ dont-distribute-packages:
   tokenify:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   toktok:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokyocabinet-haskell:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tomato-rubato-openal:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   toml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  toolshed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  top:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Top:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   topkata:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   torch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   to-string-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   to-string-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  total:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   touched:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tower:                                        [ i686-linux ]
   toxcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   toysolver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tpb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-call:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   traced:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-function-call:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tracetree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tracy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traildb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   trajectory:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   transactional-events:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8493,22 +7795,18 @@ dont-distribute-packages:
   TransformeR:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   transformers-compose:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   transformers-convert:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transformers-eff:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   transformers-runnable:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   TransformersStepByStep:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transient-universe:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   transient-universe-tls:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   translatable-intset:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   translate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   trasa-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  trasa-reflex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis-meta-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   trawl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traypoweroff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   TreeCounter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   treemap-html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   treemap-html-tools:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  treemap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   treersec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TreeStructures:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   t-regex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8527,7 +7825,6 @@ dont-distribute-packages:
   tsession:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tskiplist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tslib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tslogger:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsp-viz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsvsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8541,7 +7838,6 @@ dont-distribute-packages:
   turingMachine:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   turing-machines:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweet-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-graphics:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-trees:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8550,32 +7846,25 @@ 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 ]
-  twilio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   twill:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twiml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twisty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-types-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   txtblk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   typalyze:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeable-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-assertions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   TypeClass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-combinators-quote:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-digits:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-process:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   typedquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-spreadsheet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8590,7 +7879,7 @@ dont-distribute-packages:
   type-level-natural-number-operations:         [ i686-linux, x86_64-linux, x86_64-darwin ]
   typelevel-tensor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   TypeNat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-natural:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-of-html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeparams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8612,16 +7901,14 @@ dont-distribute-packages:
   udp-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhexdump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uhttpc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ui-command:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uid:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   UMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unagi-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   unamb-custom:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unbounded-delays-units:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   unboxed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   unbreak:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-normalization:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unicoder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-show:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-symbols:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniform-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8634,15 +7921,12 @@ dont-distribute-packages:
   universe-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-fcntl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-process-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unjson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unlit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   unordered-containers-rematch:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unpack-funcs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unroll-ghc-plugin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   unsafely:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   unscramble:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unsequential:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unused:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   update-nix-fetchgit:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   up:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   uploadcare:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8652,9 +7936,9 @@ dont-distribute-packages:
   uri-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-enumerator-file:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uri-templater:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   urlcheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldecode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  url-decoders:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldisp-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   UrlDisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8672,6 +7956,7 @@ dont-distribute-packages:
   utf8-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   UTFTConverter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuagc-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uuid-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-options:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8693,12 +7978,12 @@ dont-distribute-packages:
   vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcatt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vcsgui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating-accelerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-opengl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-bytes-instances:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-bytestring:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-clock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8716,10 +8001,8 @@ dont-distribute-packages:
   verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ViennaRNA-bindings:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vimeta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vimus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vintage-basic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8732,7 +8015,6 @@ dont-distribute-packages:
   visual-prof:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vivid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vk-aws-route53:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  VKHS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   vowpal-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   voyeur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vrpn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8746,10 +8028,7 @@ dont-distribute-packages:
   wacom-daemon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   waddle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wahsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-app-file-cgi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-cors:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-devel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-digestive-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-dispatch:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-graceful:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-handler-devel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8762,7 +8041,6 @@ dont-distribute-packages:
   wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-make-assets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-auth:                          [ i686-linux ]
   wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8771,14 +8049,13 @@ dont-distribute-packages:
   wai-middleware-etag:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-headers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-hmac-client:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-json-errors:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-preprocessor:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-route:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-static:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-verbs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-routes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-mysql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-postgresql:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-tokyocabinet:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8791,42 +8068,31 @@ dont-distribute-packages:
   warp-static:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-tls-uid:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   WashNGo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  watchdog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   watcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   watchit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   WaveFront:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wave:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wavesurfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wavy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   weather-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   webapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webapp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-Html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-multiplate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-browser-in-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcloud:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebCont:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank-dispatch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank-wai:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-css:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webdriver-angular:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webdriver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   webdriver-snoy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-encodings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WeberLogic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   webfinger-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-fpco:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-inv-route:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webkit2gtk3-javascriptcore:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webkitgtk3:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webkitgtk3-javascriptcore:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webkit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webkit-javascriptcore:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-output:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-page:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Webrexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8834,9 +8100,6 @@ dont-distribute-packages:
   web-routes-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-routing:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   webserver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  websnap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  websockets-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  websockets-snap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   webwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wedged:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   weighted:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8859,9 +8122,7 @@ dont-distribute-packages:
   windowslive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   winerror:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
+  wires:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPControl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPLib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8871,13 +8132,12 @@ dont-distribute-packages:
   wobsurv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  word24:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wordpass:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wordsearch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  word-wrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   workdays:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-osx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-pure:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8886,8 +8146,9 @@ dont-distribute-packages:
   wraxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wrecker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wreq-sb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wreq-stringless:                              [ 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 ]
+  wsdl:                                         [ 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 ]
@@ -8897,15 +8158,10 @@ dont-distribute-packages:
   wumpus-microprint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wumpus-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   WURFL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxAsteroids:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxcore:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WXDiffCtrl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxdirect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
-  wx:                                           [ 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 ]
@@ -8913,13 +8169,10 @@ dont-distribute-packages:
   X11-rm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xdamage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xfixes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  x11-xinput:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   x509-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xcffib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xdcc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   x-dsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Xec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xfconf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8929,7 +8182,6 @@ dont-distribute-packages:
   xhb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xine:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8940,17 +8192,16 @@ dont-distribute-packages:
   xml-enumerator-combinators:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-html-conduit-lens:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmlhtml:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-isogen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-parsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XMLParser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-pipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-prettify:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-to-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmltv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-tydom-conduit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client-glib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8973,9 +8224,6 @@ dont-distribute-packages:
   xsact:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   XSaiga:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xslt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xtc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xturtle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xxhash:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   y0l0bot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yabi-muno:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8990,13 +8238,10 @@ dont-distribute-packages:
   yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa2048:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glut:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yampa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  YampaSynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yarr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9012,8 +8257,6 @@ dont-distribute-packages:
   yesod-auth-basic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-bcrypt:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-deskcom:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-fb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-hashdb:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-hmac-keccak:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-kerberos:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9030,19 +8273,16 @@ dont-distribute-packages:
   yesod-continuations:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-crud:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-crud-persist:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-csp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-datatables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-fb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-fay:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-goodies:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-ip:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-job-queue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-links:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-mangopay:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-media-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paginate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pagination:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-paginator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paypal-rest:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-platform:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pnotify:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9051,7 +8291,6 @@ dont-distribute-packages:
   yesod-raml-bin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-mock:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-recaptcha:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-routes-flow:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-rst:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9064,26 +8303,17 @@ dont-distribute-packages:
   yesod-tls:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-vend:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yet-another-logger:                           [ i686-linux ]
   YFrob:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-dynamic-configuration:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-keymap-cua:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-keymap-emacs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-keymap-vim:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-misc-modes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-mode-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-mode-javascript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-monokai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-solarized:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-spolsky:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp-libs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yjsvg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yoctoparsec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt-Standalone:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9092,7 +8322,6 @@ dont-distribute-packages:
   yst:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yuiGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yuuko:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yxdb-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zabt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zampolit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   zasni-gerna:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9115,14 +8344,12 @@ dont-distribute-packages:
   zim-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zip-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipedit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zip:                                          [ i686-linux ]
   zipkin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ziptastic-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   zlib-enum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZMachine:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   zmcat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   zmidi-score:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zmqat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoneinfo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]

From 35dd36a027c5421c62b883a948effbcf846af9af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Aug 2017 09:03:21 +0200
Subject: [PATCH 1686/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d913f9a17b0484aaa1d19b6aece184a12d69a71e.
---
 .../haskell-modules/hackage-packages.nix      | 1481 ++++++-----------
 1 file changed, 475 insertions(+), 1006 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d2ce7185c0a..c08e246e5f1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -269,7 +269,6 @@ self: {
        homepage = "https://github.com/choener/ADPfusion";
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ADPfusionSet" = callPackage
@@ -1392,7 +1391,6 @@ self: {
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Biobase" = callPackage
@@ -1440,7 +1438,6 @@ self: {
        homepage = "https://github.com/choener/BiobaseBlast";
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseDotP" = callPackage
@@ -1572,7 +1569,6 @@ self: {
        homepage = "https://github.com/choener/BiobaseNewick";
        description = "Newick file format parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseTrainingData" = callPackage
@@ -1638,7 +1634,6 @@ self: {
        homepage = "https://github.com/choener/BiobaseTypes";
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -1685,7 +1680,6 @@ self: {
        homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BirdPP" = callPackage
@@ -1813,7 +1807,6 @@ self: {
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -1834,7 +1827,6 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Blogdown" = callPackage
@@ -2712,7 +2704,6 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Utility functions for using the chart library with GTK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-simple" = callPackage
@@ -2929,7 +2920,6 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "An FFI interface to the DevIL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libdevil;};
 
   "Combinatorrent" = callPackage
@@ -3574,6 +3564,7 @@ self: {
        ];
        description = "Complete API bindings for DigitalOcean API V2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DOM" = callPackage
@@ -3979,20 +3970,23 @@ self: {
      }) {};
 
   "DeepDarkFantasy" = callPackage
-    ({ mkDerivation, base, bimap, constraints, containers, mtl
-     , QuickCheck, random, recursion-schemes
+    ({ mkDerivation, base, bimap, constraint-unions, constraints
+     , containers, mtl, QuickCheck, random, recursion-schemes
+     , template-haskell
      }:
      mkDerivation {
        pname = "DeepDarkFantasy";
-       version = "0.2017.8.4";
-       sha256 = "0sf1vbzfps2hi3da1b7wh23xhg69xshw8qf7i7iw3w819qlz0f5j";
+       version = "0.2017.8.7";
+       sha256 = "0b3p7yk3brcif92d442c8alp9vlcifxm0m0srk56zcf82sn6sxhh";
        libraryHaskellDepends = [
-         base bimap constraints containers mtl random recursion-schemes
+         base bimap constraint-unions constraints containers mtl random
+         recursion-schemes template-haskell
        ];
        testHaskellDepends = [ base constraints mtl QuickCheck random ];
        description = "A DSL for creating neural network";
        license = stdenv.lib.licenses.asl20;
-     }) {};
+       broken = true;
+     }) {constraint-unions = null;};
 
   "DefendTheKing" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP
@@ -4813,7 +4807,6 @@ self: {
        homepage = "https://github.com/eggzilla/EntrezHTTP";
        description = "Libary to interface with the NCBI Entrez REST service";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EnumContainers" = callPackage
@@ -5378,6 +5371,7 @@ self: {
        homepage = "https://github.com/tonymorris/filepather";
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FileSystem" = callPackage
@@ -5612,7 +5606,6 @@ self: {
        homepage = "https://github.com/choener/ForestStructures";
        description = "Tree- and forest structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ForkableT" = callPackage
@@ -6103,7 +6096,6 @@ self: {
        homepage = "https://github.com/tobbebex/GPipe-Core#readme";
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -6149,6 +6141,19 @@ self: {
        homepage = "https://github.com/plredmond/GPipe-GLFW";
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "GPipe-GLFW_1_4_1_1" = callPackage
+    ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }:
+     mkDerivation {
+       pname = "GPipe-GLFW";
+       version = "1.4.1.1";
+       sha256 = "1sr4dxc9bkfijaxvs7s94x5yfg14pb1r49fycwmzqkcycgz87n8q";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
+       homepage = "https://github.com/plredmond/GPipe-GLFW";
+       description = "GLFW OpenGL context creation for GPipe";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -6251,7 +6256,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GeBoP";
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenI" = callPackage
@@ -6653,7 +6657,6 @@ self: {
        ];
        description = "Interface to Google Suggest API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GoogleTranslate" = callPackage
@@ -6795,7 +6798,6 @@ self: {
        ];
        description = "Graph-Theoretic Analysis library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Grempa" = callPackage
@@ -6973,7 +6975,6 @@ self: {
        homepage = "https://tweag.github.io/HaskellR";
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HARM" = callPackage
@@ -8375,7 +8376,6 @@ self: {
        homepage = "http://software.complete.org/hsh";
        description = "Library to mix shell scripting with Haskell programs";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSHHelpers" = callPackage
@@ -8727,7 +8727,6 @@ self: {
        homepage = "https://github.com/emc2/HUnit-Plus";
        description = "A test framework building on HUnit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-approx" = callPackage
@@ -9075,28 +9074,24 @@ self: {
 
   "HarmTrace" = callPackage
     ({ mkDerivation, array, base, binary, cmdargs, deepseq, Diff
-     , directory, filepath, ghc-prim, HarmTrace-Base, HCodecs, hmatrix
-     , hmatrix-gsl-stats, instant-generics, ListLike, mtl, parallel
-     , parseargs, process, sox, template-haskell, uu-parsinglib, vector
+     , directory, filepath, ghc-prim, HarmTrace-Base, instant-generics
+     , ListLike, matrix, mtl, parallel, process, sox, template-haskell
+     , uu-parsinglib, vector
      }:
      mkDerivation {
        pname = "HarmTrace";
-       version = "2.2.0";
-       sha256 = "1l2w53ispw7sg1daxnynfc94njzm6w838a8ij7rpzd3nxa2b596v";
-       isLibrary = true;
+       version = "2.2.1";
+       sha256 = "1f0m154fqal44i16bq9lxzsxj1810rmjvg7a17q5p80phg3dzarj";
+       revision = "1";
+       editedCabalFile = "0jnj3srkbwi88v8b7zqmkd5zxrc8vsgibf8a0zs82jra0a9jvg6g";
+       isLibrary = false;
        isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary deepseq Diff directory filepath ghc-prim
-         HarmTrace-Base HCodecs hmatrix hmatrix-gsl-stats instant-generics
-         ListLike mtl parallel parseargs process template-haskell
-         uu-parsinglib vector
-       ];
        executableHaskellDepends = [
          array base binary cmdargs deepseq Diff directory filepath ghc-prim
-         HarmTrace-Base hmatrix hmatrix-gsl-stats instant-generics ListLike
-         mtl parallel process sox template-haskell uu-parsinglib vector
+         HarmTrace-Base instant-generics ListLike matrix mtl parallel
+         process sox template-haskell uu-parsinglib vector
        ];
-       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/HarmTrace";
+       homepage = "https://github.com/haas/harmtrace";
        description = "Harmony Analysis and Retrieval of Music";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9895,6 +9890,7 @@ self: {
        ];
        description = "High level bindings to htslib";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsHaruPDF" = callPackage
@@ -9961,7 +9957,6 @@ self: {
        homepage = "https://github.com/vshabanov/HsOpenSSL";
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "HsOpenSSL_0_11_4_10" = callPackage
@@ -9994,7 +9989,6 @@ self: {
        homepage = "https://github.com/redneb/HsOpenSSL-x509-system";
        description = "Use the system's native CA certificate store with HsOpenSSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsParrot" = callPackage
@@ -10738,7 +10732,6 @@ self: {
        homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
        description = "Efficiently scale, crop, flip images with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-repa" = callPackage
@@ -10752,7 +10745,6 @@ self: {
        ];
        description = "Convenience functions to obtain array representations of images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-scale-dct" = callPackage
@@ -11494,7 +11486,6 @@ self: {
        homepage = "https://github.com/choener/LinguisticsTypes";
        description = "Collection of types for natural language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LinkChecker" = callPackage
@@ -11562,7 +11553,6 @@ self: {
        homepage = "http://github.com/yairchu/generator/tree";
        description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ListWriter" = callPackage
@@ -11823,7 +11813,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MC-Fold-DP" = callPackage
@@ -11939,7 +11928,6 @@ self: {
        homepage = "http://nautilus.cs.miyazaki-u.ac.jp/~skata/MagicHaskeller.html";
        description = "Automatic inductive functional programmer by systematic search";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MailchimpSimple" = callPackage
@@ -12440,7 +12428,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadStack" = callPackage
@@ -12877,7 +12864,6 @@ self: {
        homepage = "https://github.com/choener/NaturalLanguageAlphabets";
        description = "Simple scoring schemes for word alignments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NaturalSort" = callPackage
@@ -13543,7 +13529,6 @@ self: {
        homepage = "https://github.com/audreyt/openafp/";
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenAFP-Utils" = callPackage
@@ -13564,7 +13549,6 @@ self: {
        ];
        description = "Assorted utilities to work with AFP data streams";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenAL" = callPackage
@@ -14271,7 +14255,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/Piso";
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PlayHangmanGame" = callPackage
@@ -14440,7 +14423,6 @@ self: {
        homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PrimitiveArray-Pretty" = callPackage
@@ -14660,7 +14642,6 @@ self: {
        homepage = "https://github.com/alexandersgreen/qio-haskell";
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QLearn" = callPackage
@@ -14818,7 +14799,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/QuickCheck-GenT";
        description = "A GenT monad transformer for QuickCheck library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck-safe" = callPackage
@@ -15124,7 +15104,6 @@ self: {
        ];
        description = "Unsupervized construction of RNA family models";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAwolf" = callPackage
@@ -15331,7 +15310,6 @@ self: {
        homepage = "http://github.com/rampion/ReadArgs";
        description = "Simple command line argument parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Redmine" = callPackage
@@ -15356,7 +15334,6 @@ self: {
        homepage = "https://github.com/lookunder/RedmineHs";
        description = "Library to access Redmine's REST services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ref" = callPackage
@@ -15868,7 +15845,6 @@ self: {
        homepage = "https://github.com/AntonXue/SSTG#readme";
        description = "STG Symbolic Execution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "STL" = callPackage
@@ -16691,7 +16667,6 @@ self: {
        homepage = "http://www.haskell.org/yampa/";
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SpacePrivateers" = callPackage
@@ -16871,7 +16846,6 @@ self: {
        homepage = "https://github.com/agrafix/Spock-digestive";
        description = "Digestive functors support for Spock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-lucid" = callPackage
@@ -17020,7 +16994,6 @@ self: {
        ];
        description = "Libary for Stockholm aligmnent format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Stomp" = callPackage
@@ -17149,7 +17122,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "String manipulation utilities";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SuffixStructures" = callPackage
@@ -17297,7 +17269,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH implementation of effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TTTAS" = callPackage
@@ -17476,7 +17447,6 @@ self: {
        ];
        description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TeX-my-math" = callPackage
@@ -17562,7 +17532,6 @@ self: {
        homepage = "https://github.com/testexplode/testexplode";
        description = "Generates testcases from program-snippets";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Theora" = callPackage
@@ -17658,7 +17627,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring dataenc ];
        description = "TigerHash with C implementation";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TimePiece" = callPackage
@@ -18204,7 +18172,6 @@ self: {
        homepage = "http://github.com/grwlf/vkhs";
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Validation" = callPackage
@@ -18315,7 +18282,6 @@ self: {
        homepage = "https://github.com/choener/ViennaRNA-bindings";
        description = "ViennaRNA v2 bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ViennaRNAParser" = callPackage
@@ -19109,7 +19075,6 @@ self: {
        homepage = "xy30.com";
        description = "A library to parse xml";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "XMMS" = callPackage
@@ -19333,7 +19298,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yampa-core" = callPackage
@@ -19369,7 +19333,6 @@ self: {
        homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
        description = "Software synthesizer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yocto" = callPackage
@@ -19597,7 +19560,6 @@ self: {
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {abc = null;};
 
   "abcnotation" = callPackage
@@ -20045,7 +20007,6 @@ self: {
        homepage = "https://github.com/AccelerateHS/accelerate-io";
        description = "Read and write Accelerate arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm" = callPackage
@@ -20890,7 +20851,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "activitystreams-aeson" = callPackage
@@ -21470,7 +21430,6 @@ self: {
        homepage = "https://github.com/thsutton/aeson-diff";
        description = "Extract and apply patches to JSON documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-extra" = callPackage
@@ -21499,7 +21458,6 @@ self: {
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-extra_0_4_1_0" = callPackage
@@ -21546,7 +21504,6 @@ self: {
        homepage = "https://github.com/deviant-logic/aeson-filthy";
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-flat" = callPackage
@@ -21562,7 +21519,6 @@ self: {
        homepage = "https://github.com/seanhess/aeson-flat#readme";
        description = "Tools for creating flat JSON serializations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-flatten" = callPackage
@@ -21587,8 +21543,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-flowtyped";
-       version = "0.9.0";
-       sha256 = "1j593x15bm8b4l59cbzgcg6vgwibjfa4nilsj6dl1y8cfbqwj4aa";
+       version = "0.9.1";
+       sha256 = "0fp5a4r7nvwqsyq8f17afqpdw59n6sf0wj7z83rhq8n149673rsg";
        libraryHaskellDepends = [
          aeson base containers free recursion-schemes reflection scientific
          text time transformers unordered-containers vector wl-pprint
@@ -21600,6 +21556,7 @@ self: {
        homepage = "https://github.com/mikeplus64/aeson-flowtyped#readme";
        description = "Create Flow type definitions from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-generic-compat" = callPackage
@@ -21633,7 +21590,6 @@ self: {
        ];
        description = "Injecting fields into aeson values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-iproute" = callPackage
@@ -22123,7 +22079,6 @@ self: {
        homepage = "http://github.com/liamoc/agda-snippets#readme";
        description = "Render just the Agda snippets of a literate Agda file to HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "agda-snippets-hakyll" = callPackage
@@ -22141,7 +22096,6 @@ self: {
        homepage = "https://github.com/liamoc/agda-snippets#readme";
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "agentx" = callPackage
@@ -22377,6 +22331,7 @@ self: {
        homepage = "http://www.aivikasoft.com";
        description = "Parallel distributed discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aivika-experiment" = callPackage
@@ -22619,7 +22574,6 @@ self: {
        homepage = "https://github.com/mjhopkins/alerta-client";
        description = "Bindings to the alerta REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex" = callPackage
@@ -22659,7 +22613,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Quasi-quoter for Alex lexers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex-tools" = callPackage
@@ -22689,7 +22642,6 @@ self: {
        ];
        description = "utility library for Alfred version 2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alga" = callPackage
@@ -23394,7 +23346,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon API Gateway SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-application-autoscaling" = callPackage
@@ -23431,7 +23382,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon AppStream SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-autoscaling" = callPackage
@@ -23468,7 +23418,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Budgets SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-certificatemanager" = callPackage
@@ -23667,7 +23616,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeBuild SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codecommit" = callPackage
@@ -23986,7 +23934,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-ecr" = callPackage
@@ -24149,7 +24096,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-emr" = callPackage
@@ -24222,7 +24168,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Health APIs and Notifications SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iam" = callPackage
@@ -24349,7 +24294,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
@@ -24404,7 +24348,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lightsail" = callPackage
@@ -24423,7 +24366,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lightsail SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-marketplace-analytics" = callPackage
@@ -24514,7 +24456,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks for Chef Automate SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-pinpoint" = callPackage
@@ -24533,7 +24474,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Pinpoint SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-polly" = callPackage
@@ -24552,7 +24492,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Polly SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-rds" = callPackage
@@ -24571,7 +24510,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-redshift" = callPackage
@@ -24608,7 +24546,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Rekognition SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-route53" = callPackage
@@ -24663,7 +24600,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -24690,7 +24626,6 @@ self: {
        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;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-sdb" = callPackage
@@ -24727,7 +24662,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Service Catalog SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ses" = callPackage
@@ -24764,7 +24698,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Shield SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sms" = callPackage
@@ -24783,7 +24716,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Server Migration Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-snowball" = callPackage
@@ -24802,7 +24734,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export Snowball SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sns" = callPackage
@@ -24839,7 +24770,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ssm" = callPackage
@@ -24876,7 +24806,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Step Functions SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-storagegateway" = callPackage
@@ -24949,7 +24878,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-test" = callPackage
@@ -25026,7 +24954,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon X-Ray SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amby" = callPackage
@@ -25730,7 +25657,6 @@ self: {
        homepage = "https://github.com/exbb2/antigate";
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antimirov" = callPackage
@@ -26511,7 +26437,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "applicative-splice" = callPackage
@@ -26659,7 +26584,6 @@ self: {
        homepage = "http://github.com/analytics/approximate/";
        description = "Approximate discrete values and numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "approximate_0_3_1" = callPackage
@@ -26783,7 +26707,6 @@ self: {
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXScrnSaver;};
 
   "archive" = callPackage
@@ -26885,7 +26808,6 @@ self: {
        homepage = "http://archhaskell.wordpress.com/";
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arena" = callPackage
@@ -27135,7 +27057,6 @@ self: {
        ];
        description = "Natural number arithmetic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arithmoi" = callPackage
@@ -27163,7 +27084,6 @@ self: {
        homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arithmoi_0_5_0_1" = callPackage
@@ -28044,7 +27964,6 @@ self: {
        homepage = "http://github.com/jfischoff/async-extras";
        description = "Extra Utilities for the Async Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-io-either" = callPackage
@@ -28910,7 +28829,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/audacity";
        description = "Interchange with the Audacity sound signal editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "audiovisual" = callPackage
@@ -29508,6 +29426,7 @@ self: {
        homepage = "https://github.com/GaloisInc/avro.git";
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avwx" = callPackage
@@ -30081,7 +30000,6 @@ self: {
        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
@@ -30124,7 +30042,6 @@ self: {
        homepage = "https://github.com/transient-haskell/axiom";
        description = "Web EDSL for running in browsers and server nodes using transient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "axiomatic-classes" = callPackage
@@ -30321,7 +30238,6 @@ 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
@@ -30338,7 +30254,6 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backdropper" = callPackage
@@ -30819,7 +30734,6 @@ self: {
        homepage = "https://github.com/philopon/barrier";
        description = "Shields.io style badge generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barrier-monad" = callPackage
@@ -31209,7 +31123,6 @@ self: {
        homepage = "https://github.com/snoyberg/basic-prelude";
        description = "An enhanced core prelude; a common foundation for alternate preludes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "basic-sop" = callPackage
@@ -31223,7 +31136,6 @@ self: {
        ];
        description = "Basic examples and functions for generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "baskell" = callPackage
@@ -31432,7 +31344,6 @@ self: {
        homepage = "http://github.com/humane-software/haskell-bdd";
        description = "Behavior-Driven Development DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bdelta" = callPackage
@@ -31640,7 +31551,6 @@ self: {
        homepage = "http://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bench_1_0_6" = callPackage
@@ -31927,7 +31837,6 @@ self: {
        homepage = "https://bitbucket.org/kztk/bff-mono/";
        description = "\"Bidirectionalization for Free\" for Monomorphic Transformations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bgmax" = callPackage
@@ -31940,7 +31849,6 @@ self: {
        homepage = "http://github.com/jonpetterbergman/bgmax";
        description = "Parse BgMax-files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bgzf" = callPackage
@@ -32255,7 +32163,6 @@ self: {
        homepage = "https://github.com/choener/bimaps";
        description = "bijections with multiple implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary_0_7_6_1" = callPackage
@@ -32881,7 +32788,6 @@ self: {
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings" = callPackage
@@ -33252,7 +33158,6 @@ self: {
        homepage = "https://github.com/basvandijk/bindings-levmar";
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "bindings-libcddb" = callPackage
@@ -33304,6 +33209,7 @@ self: {
        homepage = "https://github.com/Xandaros/bindings-libg15#readme";
        description = "Bindings to libg15";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {g15 = null;};
 
   "bindings-librrd" = callPackage
@@ -33549,7 +33455,6 @@ self: {
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) saneBackends;};
 
   "bindings-sc3" = callPackage
@@ -34038,7 +33943,6 @@ self: {
        homepage = "https://github.com/acfoltzer/bit-vector";
        description = "Simple bit vectors for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitarray" = callPackage
@@ -34186,7 +34090,6 @@ self: {
        homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
        description = "Instant, two-party Bitcoin payments";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {blockchain-restful-address-index-api = null;};
 
@@ -34569,7 +34472,6 @@ self: {
        homepage = "https://code.mathr.co.uk/bitwise";
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitx-bitcoin" = callPackage
@@ -34691,7 +34593,6 @@ self: {
        homepage = "http://git.kaction.name/black-jewel";
        description = "The pirate bay client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blacktip" = callPackage
@@ -34714,7 +34615,6 @@ self: {
        homepage = "https://github.com/bitemyapp/blacktip";
        description = "Decentralized, k-ordered unique ID generator";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blake2" = callPackage
@@ -35032,6 +34932,7 @@ self: {
        homepage = "http://github.com/mruegenberg/blaze-html-truncate";
        description = "A truncator for blaze-html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-json" = callPackage
@@ -35389,7 +35290,6 @@ self: {
        homepage = "http://github.com/MichaelXavier/bloodhound-amazonka-auth#readme";
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloomfilter" = callPackage
@@ -35452,7 +35352,6 @@ self: {
        homepage = "http://github.com/GregorySchwartz/blosum#readme";
        description = "BLOSUM generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloxorz" = callPackage
@@ -35638,7 +35537,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/games/";
        description = "Three games for inclusion in a web server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bogocopy" = callPackage
@@ -35702,6 +35600,7 @@ self: {
        homepage = "https://github.com/bflyblue/bolt#readme";
        description = "Bolt driver for Neo4j";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boltzmann-samplers" = callPackage
@@ -36005,7 +35904,6 @@ self: {
        ];
        description = "A Bookmarks manager with a HTML generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boombox" = callPackage
@@ -36194,7 +36092,6 @@ self: {
        homepage = "http://github.com/ekmett/bound/";
        description = "Making de Bruijn Succ Less";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bound_2_0_1" = callPackage
@@ -36233,7 +36130,6 @@ self: {
        libraryHaskellDepends = [ base bound monad-gen mtl ];
        description = "Unwrap Scope's with globally fresh values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bounded-tchan" = callPackage
@@ -36351,6 +36247,7 @@ self: {
        homepage = "http://github.com/githubuser/braid#readme";
        description = "Types and functions to work with braids and Khovanov homology";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brain-bleep" = callPackage
@@ -36435,7 +36332,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Break from a loop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "breakout" = callPackage
@@ -36475,7 +36371,6 @@ self: {
        homepage = "https://github.com/rnhmjoj/breve";
        description = "a url shortener";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brians-brain" = callPackage
@@ -36604,6 +36499,7 @@ self: {
        homepage = "https://github.com/lspitzner/brittany/";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan" = callPackage
@@ -36744,7 +36640,6 @@ self: {
        ];
        description = "Mapping between BSON and algebraic data types";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bspack" = callPackage
@@ -36905,7 +36800,6 @@ self: {
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buffer-builder-aeson" = callPackage
@@ -37033,7 +36927,6 @@ self: {
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Rehackable components for writing buildbots and test harnesses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buildbox-tools" = callPackage
@@ -37334,7 +37227,6 @@ self: {
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytable" = callPackage
@@ -37461,7 +37353,6 @@ self: {
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-builder" = callPackage
@@ -37643,7 +37534,6 @@ self: {
        homepage = "http://github.com/acw/bytestring-progress";
        description = "A library for tracking the consumption of a lazy ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-read" = callPackage
@@ -37736,7 +37626,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/bytestring-strict-builder";
        description = "An efficient strict bytestring builder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-time" = callPackage
@@ -38055,6 +37944,7 @@ self: {
        homepage = "https://github.com/jwiegley/c2hsc";
        description = "Convert C API header files to .hsc and .hsc.helper.c files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cab" = callPackage
@@ -38136,7 +38026,6 @@ self: {
        ];
        description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-cargs" = callPackage
@@ -38159,7 +38048,6 @@ self: {
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-constraints" = callPackage
@@ -38229,7 +38117,6 @@ self: {
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -38416,35 +38303,36 @@ self: {
        homepage = "https://github.com/barrucadu/cabal-info";
        description = "Read information from cabal files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-install" = callPackage
     ({ mkDerivation, array, async, base, base16-bytestring, binary
-     , bytestring, Cabal, containers, cryptohash-sha256, directory
-     , filepath, hackage-security, hashable, HTTP, mtl, network
-     , network-uri, pretty, process, QuickCheck, random, regex-posix
-     , stm, tagged, tar, tasty, tasty-hunit, tasty-quickcheck, time
-     , unix, zlib
+     , bytestring, Cabal, containers, cryptohash-sha256, deepseq
+     , directory, echo, edit-distance, filepath, hackage-security
+     , hashable, HTTP, mtl, network, network-uri, pretty, pretty-show
+     , process, QuickCheck, random, stm, tagged, tar, tasty, tasty-hunit
+     , tasty-quickcheck, time, unix, zlib
      }:
      mkDerivation {
        pname = "cabal-install";
-       version = "1.24.0.2";
-       sha256 = "1q0gl3i9cpg854lcsiifxxginnvhp2bpx19wkkzpzrd072983j1a";
+       version = "2.0.0.0";
+       sha256 = "0b9b0sx2nxas894ns1sjyirhvra8y8ixfcsya9pxkw0q5yn0ndsz";
        revision = "1";
-       editedCabalFile = "0v112hvvppa31sklpzg54vr0hfidy1334kg5p3jc0gbgl8in1n90";
+       editedCabalFile = "047bf57sxaajaa0wi7v3bg6kq19ngfpw5n4cc46zlbqqjbvvq1d5";
        isLibrary = false;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal filepath process ];
        executableHaskellDepends = [
          array async base base16-bytestring binary bytestring Cabal
-         containers cryptohash-sha256 directory filepath hackage-security
-         hashable HTTP mtl network network-uri pretty process random stm tar
-         time unix zlib
+         containers cryptohash-sha256 deepseq directory echo edit-distance
+         filepath hackage-security hashable HTTP mtl network network-uri
+         pretty process random stm tar time unix zlib
        ];
        testHaskellDepends = [
-         array async base binary bytestring Cabal containers directory
+         array async base base16-bytestring binary bytestring Cabal
+         containers cryptohash-sha256 deepseq directory edit-distance
          filepath hackage-security hashable HTTP mtl network network-uri
-         pretty process QuickCheck random regex-posix stm tagged tar tasty
+         pretty pretty-show process QuickCheck random stm tagged tar tasty
          tasty-hunit tasty-quickcheck time unix zlib
        ];
        doCheck = false;
@@ -38543,8 +38431,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-macosx";
-       version = "0.2.4.0";
-       sha256 = "1yl8fwbqgdp4hsd5hsgrrzvh1px79nxfsvs9nip6fq3q68qm5ys1";
+       version = "0.2.4.1";
+       sha256 = "01l0m11q5knq1n9vx73515dpzw1mwxf7qin8qfb5ci21yxg91mww";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38561,7 +38449,6 @@ self: {
        homepage = "http://github.com/danfran/cabal-macosx";
        description = "Cabal support for creating Mac OSX application bundles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-meta" = callPackage
@@ -38856,7 +38743,6 @@ self: {
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-uninstall" = callPackage
@@ -39199,7 +39085,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple library to cache a single IO action with timeout";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cached-traversable" = callPackage
@@ -39245,7 +39130,6 @@ self: {
        homepage = "https://github.com/centromere/cacophony#readme";
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "caf" = callPackage
@@ -39345,7 +39229,6 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake3" = callPackage
@@ -39622,6 +39505,7 @@ self: {
        homepage = "https://camfort.github.io";
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "camh" = callPackage
@@ -39701,7 +39585,6 @@ self: {
        homepage = "https://github.com/SumAll/canteven-http";
        description = "Utilities for HTTP programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "canteven-listen-http" = callPackage
@@ -39958,7 +39841,6 @@ self: {
        homepage = "https://github.com/master-q/carettah";
        description = "A presentation tool written with Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "carray" = callPackage
@@ -40255,7 +40137,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cash" = callPackage
@@ -40618,6 +40499,7 @@ self: {
        homepage = "https://github.com/stackbuilders/cassava-megaparsec";
        description = "Megaparsec parser of CSV files that plays nicely with Cassava";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava-streams" = callPackage
@@ -40642,6 +40524,7 @@ self: {
        homepage = "https://github.com/pjones/cassava-streams";
        description = "io-streams interface for the cassava CSV library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassette" = callPackage
@@ -40868,7 +40751,6 @@ self: {
        ];
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cayley-client" = callPackage
@@ -41154,6 +41036,7 @@ self: {
        homepage = "https://github.com/ogma-project/celtchar#readme";
        description = "A tool to build a novel";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cerberus" = callPackage
@@ -41329,7 +41212,6 @@ self: {
        ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-text" = callPackage
@@ -41717,7 +41599,6 @@ self: {
        homepage = "http://www.github.com/batterseapower/charsetdetect";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "charsetdetect-ae" = callPackage
@@ -41770,6 +41651,7 @@ self: {
        homepage = "https://github.com/tonyday567/chart-unit";
        description = "Native haskell charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chaselev-deque" = callPackage
@@ -41847,7 +41729,6 @@ self: {
        homepage = "http://hub.darcs.net/enum/chatty";
        description = "Some monad transformers and typeclasses for abstraction of global dependencies";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chatty-text" = callPackage
@@ -41873,7 +41754,6 @@ self: {
        homepage = "http://hub.darcs.net/enum/chatty-utils";
        description = "Some utilities every serious chatty-based application may need";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chatwork" = callPackage
@@ -41883,8 +41763,8 @@ self: {
      }:
      mkDerivation {
        pname = "chatwork";
-       version = "0.1.1.1";
-       sha256 = "0b4pa4hbx8a4cs2yhad0kwm784w5vra858ixmjfk5jis5xxq279x";
+       version = "0.1.1.2";
+       sha256 = "050a0vhv59svdgja4lc8jxcyxqbrd9zr14hwbrnk7hzk9dxvd0wz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43116,7 +42996,6 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-lib" = callPackage
@@ -43143,7 +43022,6 @@ self: {
        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
@@ -43159,7 +43037,6 @@ self: {
        ];
        homepage = "https://github.com/ra1u/clash-multisignal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-prelude" = callPackage
@@ -43188,7 +43065,6 @@ self: {
        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
@@ -43220,7 +43096,6 @@ self: {
        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
@@ -43239,7 +43114,6 @@ self: {
        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
@@ -43258,7 +43132,6 @@ self: {
        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
@@ -43334,7 +43207,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "A typeclass-based Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classy-prelude-conduit" = callPackage
@@ -43356,7 +43228,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "classy-prelude together with conduit functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classy-prelude-yesod" = callPackage
@@ -43376,7 +43247,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Provide a classy prelude including common Yesod functionality";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classyplate" = callPackage
@@ -43401,7 +43271,6 @@ self: {
        homepage = "http://fvisser.nl/clay";
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks" = callPackage
@@ -43556,6 +43425,7 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "mailing list plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-plugin-media" = callPackage
@@ -43691,7 +43561,6 @@ self: {
        homepage = "https://github.com/ivanperez-keera/clean-home";
        description = "Keep your home dir clean by finding old conf files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clean-unions" = callPackage
@@ -43939,7 +43808,6 @@ self: {
        homepage = "https://github.com/strake/clist.hs";
        description = "Counted list";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clit" = callPackage
@@ -43963,6 +43831,7 @@ self: {
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloben" = callPackage
@@ -44128,6 +43997,7 @@ self: {
        homepage = "https://github.com/cjdev/cloud-seeder#readme";
        description = "A tool for interacting with AWS CloudFormation";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudfront-signer" = callPackage
@@ -44538,8 +44408,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmark-gfm";
-       version = "0.1.0";
-       sha256 = "14x8mq06lhx85z413m2aabp5mwrkzhk5mv2hryf972hiv6pv9r0k";
+       version = "0.1.1";
+       sha256 = "1v3f4ms6q4sb3fkkby03xikkkbip55lgwpmlay9c9jfs4mybpmxd";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
        benchmarkHaskellDepends = [
@@ -44897,7 +44767,6 @@ self: {
        homepage = "https://github.com/chpatrick/codec";
        description = "Simple bidirectional serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codec-libevent" = callPackage
@@ -45059,7 +44928,6 @@ self: {
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codo-notation" = callPackage
@@ -45504,7 +45372,6 @@ self: {
        homepage = "https://github.com/tmcdonell/colour-accelerate";
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colour-space" = callPackage
@@ -45560,6 +45427,7 @@ self: {
        ];
        description = "Enhanced serialization for media that support seeking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "com" = callPackage
@@ -45592,7 +45460,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat-diagrams" = callPackage
@@ -45610,7 +45477,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -45699,7 +45565,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/comfort-graph";
        description = "Graph structure with type parameters for nodes and edges";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comic" = callPackage
@@ -45712,7 +45577,6 @@ self: {
        homepage = "https://oss.xkcd.com/";
        description = "A format for describing comics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comma" = callPackage
@@ -45793,7 +45657,6 @@ self: {
        ];
        description = "Library for working with commoditized amounts and price histories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "commsec" = callPackage
@@ -46052,7 +45915,6 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A generalization for containers that can be stripped of Nothings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compactmap" = callPackage
@@ -46200,7 +46062,6 @@ self: {
        homepage = "http://github.com/analytics/compensated/";
        description = "Compensated floating-point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compensated_0_7_2" = callPackage
@@ -46281,7 +46142,6 @@ self: {
        homepage = "https://code.mathr.co.uk/complex-generic";
        description = "complex numbers with non-mandatory RealFloat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "complex-integrate" = callPackage
@@ -46397,7 +46257,6 @@ self: {
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "JSON for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composite-aeson-refined" = callPackage
@@ -46414,7 +46273,6 @@ self: {
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "composite-aeson support for Refined from the refined package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composite-base" = callPackage
@@ -46437,7 +46295,6 @@ self: {
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Shared utilities for composite-* packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composite-ekg" = callPackage
@@ -46454,7 +46311,6 @@ self: {
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "EKG Metrics for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composite-opaleye" = callPackage
@@ -46478,7 +46334,6 @@ self: {
        homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Opaleye SQL for Frames records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition" = callPackage
@@ -47231,6 +47086,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-algorithms" = callPackage
+    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
+     , conduit-combinators, conduit-extra, containers, deepseq
+     , directory, filepath, HUnit, mtl, resourcet, stm, stm-chans
+     , stm-conduit, test-framework, test-framework-hunit
+     , test-framework-th, transformers, unix
+     }:
+     mkDerivation {
+       pname = "conduit-algorithms";
+       version = "0.0.1.0";
+       sha256 = "1i9jhnlq09shb9l3i0p09di6vrbwnpv1jsa4dkmrvy4z347jxq7n";
+       libraryHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra containers deepseq directory filepath mtl resourcet
+         stm stm-chans stm-conduit transformers unix
+       ];
+       testHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra containers deepseq directory filepath HUnit mtl
+         resourcet stm stm-chans stm-conduit test-framework
+         test-framework-hunit test-framework-th transformers unix
+       ];
+       description = "Conduit-based algorithms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-audio" = callPackage
     ({ mkDerivation, base, conduit, vector }:
      mkDerivation {
@@ -48063,7 +47945,6 @@ self: {
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrained-dynamic" = callPackage
@@ -48167,7 +48048,6 @@ self: {
        homepage = "http://andersk.mit.edu/haskell/constructible/";
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructive-algebra" = callPackage
@@ -49066,7 +48946,6 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -49138,7 +49017,6 @@ self: {
        homepage = "https://github.com/aneksteind/Core#readme";
        description = "compile your own mini functional language with Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "core-haskell" = callPackage
@@ -49706,7 +49584,6 @@ self: {
        homepage = "https://gitlab.com/twittner/cql/";
        description = "Cassandra CQL binary protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cql-io" = callPackage
@@ -49729,7 +49606,6 @@ self: {
        homepage = "https://gitlab.com/twittner/cql-io/";
        description = "Cassandra CQL client";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cqrs" = callPackage
@@ -50800,7 +50676,6 @@ self: {
        homepage = "https://github.com/orome/crypto-enigma-hs";
        description = "An Enigma machine simulator with display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-multihash" = callPackage
@@ -50822,7 +50697,6 @@ self: {
        homepage = "https://github.com/mseri/crypto-multihash#crypto-multihash";
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-numbers" = callPackage
@@ -51370,7 +51244,6 @@ self: {
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression" = callPackage
@@ -51470,7 +51343,6 @@ self: {
        testHaskellDepends = [ base nondeterminism tasty tasty-hunit ];
        description = "Discrete constraint satisfaction problem (CSP) solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cspmchecker" = callPackage
@@ -51589,7 +51461,6 @@ self: {
        homepage = "http://github.com/ozataman/csv-conduit";
        description = "A flexible, fast, conduit-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csv-enumerator" = callPackage
@@ -51825,7 +51696,6 @@ self: {
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cuda" = callPackage
@@ -51882,7 +51752,6 @@ self: {
        homepage = "https://github.com/mrkkrp/cue-sheet";
        description = "Support for construction, rendering, and parsing of CUE sheets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cue-sheet_1_0_0" = callPackage
@@ -52177,7 +52046,6 @@ self: {
        libraryHaskellDepends = [ arithmoi base containers ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cypher" = callPackage
@@ -53183,7 +53051,6 @@ self: {
        homepage = "https://github.com/trskop/data-default-extra";
        description = "A class for types with a default value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-default-generics" = callPackage
@@ -53230,7 +53097,6 @@ self: {
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-default-instances-case-insensitive" = callPackage
@@ -53245,7 +53111,6 @@ self: {
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instance for CI type from case-insensitive package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-default-instances-containers" = callPackage
@@ -53280,7 +53145,6 @@ self: {
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for types in newer versions of base package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-default-instances-old-locale" = callPackage
@@ -53306,7 +53170,6 @@ self: {
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for (lazy and strict) Text and Text Builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-default-instances-unordered-containers" = callPackage
@@ -53323,7 +53186,6 @@ self: {
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for unordered-containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-default-instances-vector" = callPackage
@@ -53338,7 +53200,6 @@ self: {
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for types defined in vector package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-dispersal" = callPackage
@@ -53852,6 +53713,7 @@ self: {
        homepage = "http://github.com/roconnor/data-lens/";
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-lens-fd" = callPackage
@@ -53866,6 +53728,7 @@ self: {
        homepage = "http://github.com/roconnor/data-lens-fd/";
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-lens-ixset" = callPackage
@@ -53904,6 +53767,7 @@ self: {
        homepage = "http://github.com/roconnor/data-lens-template/";
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-list-sequences" = callPackage
@@ -53981,7 +53845,6 @@ self: {
        homepage = "http://msgpack.org/";
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-msgpack-types" = callPackage
@@ -54123,7 +53986,6 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-quotientref" = callPackage
@@ -54371,6 +54233,7 @@ self: {
        homepage = "http://github.com/alistra/data-structure-inferrer";
        description = "Program that infers the fastest data structure available for your program";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-sword" = callPackage
@@ -54574,7 +54437,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dataflow" = callPackage
@@ -54907,7 +54769,6 @@ self: {
        ];
        description = "An implementation of relational database \"migrations\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbmigrations-mysql" = callPackage
@@ -55132,6 +54993,7 @@ self: {
        homepage = "https://github.com/anatolat/dcpu16#readme";
        description = "DCPU-16 Emulator & Assembler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddate" = callPackage
@@ -55534,7 +55396,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath HSH ];
        description = "Utilities to work with debian binary packages";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debian-build" = callPackage
@@ -56532,7 +56393,6 @@ self: {
        homepage = "https://github.com/sboosali/derive-monoid#readme";
        description = "derive Semigroup/Monoid/IsList";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-storable" = callPackage
@@ -56884,6 +56744,7 @@ self: {
        ];
        description = "Compile Dhall to Bash";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-check" = callPackage
@@ -56923,6 +56784,7 @@ self: {
        ];
        description = "Compile Dhall to JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-nix" = callPackage
@@ -56943,6 +56805,7 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-text" = callPackage
@@ -56956,6 +56819,7 @@ self: {
        executableHaskellDepends = [ base dhall optparse-generic text ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -57023,7 +56887,6 @@ self: {
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams" = callPackage
@@ -57041,6 +56904,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative vector graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-boolean" = callPackage
@@ -57086,7 +56950,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -57129,7 +56992,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -57157,6 +57019,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-core" = callPackage
@@ -57238,7 +57101,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -57375,7 +57237,6 @@ self: {
        homepage = "http://github.com/cchalmers/diagrams-pgf";
        description = "PGF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-postscript" = callPackage
@@ -57467,7 +57328,6 @@ self: {
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-solve" = callPackage
@@ -57670,7 +57530,6 @@ self: {
        ];
        description = "Tools to handle StarDict dictionaries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dictionaries_0_2_0_3" = callPackage
@@ -57955,7 +57814,6 @@ self: {
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "A practical formlet library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-aeson" = callPackage
@@ -57978,7 +57836,6 @@ self: {
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-blaze" = callPackage
@@ -58012,7 +57869,6 @@ self: {
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Happstack backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-heist" = callPackage
@@ -58057,7 +57913,6 @@ self: {
        homepage = "https://github.com/athanclark/digestive-functors-lucid";
        description = "Lucid frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-scotty" = callPackage
@@ -58077,7 +57932,6 @@ self: {
        homepage = "https://github.com/mmartin/digestive-functors-scotty";
        description = "Scotty backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-snap" = callPackage
@@ -58095,7 +57949,6 @@ self: {
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Snap backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digit" = callPackage
@@ -58525,7 +58378,6 @@ self: {
        homepage = "http://brandon.si/code/directory-tree-module-released/";
        description = "A simple directory-like tree datatype, with useful IO functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dirfiles" = callPackage
@@ -58690,7 +58542,6 @@ self: {
        homepage = "http://github.com/lightquake/discount";
        description = "Haskell bindings to the discount Markdown library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {markdown = null;};
 
   "discrete-space-map" = callPackage
@@ -58719,8 +58570,8 @@ self: {
        pname = "discrimination";
        version = "0.2.1";
        sha256 = "1krcpv1vp8wa4kdlg3ikx895vf96czkw0i3sczw8vyascczs8cdl";
-       revision = "1";
-       editedCabalFile = "1wshnljdvzj4ka4h571a187b0fks7b0izic4yk29l187ipdi7pva";
+       revision = "2";
+       editedCabalFile = "0byjk3k7f7jvx8kd2y2mi8fl93p85rbn2ycmg0yhb7wlyi7hzyfp";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim hashable
          primitive profunctors promises semigroups transformers
@@ -58764,7 +58615,6 @@ self: {
        homepage = "https://github.com/clintonmead/disjoint-set-stateful";
        description = "Monadic disjoint set";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "disjoint-sets-st" = callPackage
@@ -58919,6 +58769,7 @@ self: {
        homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -59019,6 +58870,7 @@ self: {
        ];
        description = "Collect node stats for EKG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-execution" = callPackage
@@ -59123,6 +58975,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-fsm";
        description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-lifted" = callPackage
@@ -59167,6 +59020,7 @@ self: {
        homepage = "http://haskell-distributed.github.io";
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-p2p" = callPackage
@@ -59188,6 +59042,7 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -59332,6 +59187,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-systest";
        description = "Cloud Haskell Test Support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-task" = callPackage
@@ -60227,7 +60083,6 @@ self: {
        homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover-configurator" = callPackage
@@ -60410,7 +60265,6 @@ self: {
        homepage = "http://github.com/egonschiele/dominion";
        description = "A simulator for the board game Dominion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "domplate" = callPackage
@@ -60699,7 +60553,6 @@ self: {
        homepage = "https://github.com/psibi/download";
        description = "High-level file download based on URLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "download-curl" = callPackage
@@ -60714,7 +60567,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/download-curl";
        description = "High-level file download based on URLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "download-media-content" = callPackage
@@ -61381,6 +61233,7 @@ self: {
        ];
        description = "(Fast) Dynamic Time Warping";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dual-tree" = callPackage
@@ -61430,6 +61283,7 @@ self: {
        homepage = "https://github.com/facebookincubator/duckling#readme";
        description = "A Haskell library for parsing text into structured data";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dumb-cas" = callPackage
@@ -61788,7 +61642,6 @@ self: {
        homepage = "http://github.com/hsyl20/dynamic-linker-template";
        description = "Automatically derive dynamic linking methods from a data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-loader" = callPackage
@@ -61818,7 +61671,6 @@ self: {
        homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-object" = callPackage
@@ -62282,6 +62134,7 @@ self: {
        ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ecdsa" = callPackage
@@ -62672,7 +62525,6 @@ self: {
        libraryHaskellDepends = [ base type-level-sets ];
        description = "Embeds effect systems into Haskell using graded monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effective-aspects" = callPackage
@@ -62753,7 +62605,6 @@ self: {
        homepage = "https://github.com/YellPika/effin";
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effin_0_3_0_3" = callPackage
@@ -62920,6 +62771,7 @@ self: {
        homepage = "https://github.com/osidorkin/haskell-eigen";
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either" = callPackage
@@ -62983,7 +62835,6 @@ self: {
        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_14" = callPackage
@@ -63041,7 +62892,6 @@ self: {
        homepage = "http://github.com/ocharles/ekg-carbon";
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-cloudwatch" = callPackage
@@ -63322,7 +63172,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "easy to remember mnemonic for a high-entropy value";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elenco-albero" = callPackage
@@ -64233,7 +64082,6 @@ self: {
        homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "engine-io-growler" = callPackage
@@ -64271,7 +64119,6 @@ self: {
        ];
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "engine-io-wai" = callPackage
@@ -64290,7 +64137,6 @@ self: {
        ];
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "engine-io-yesod" = callPackage
@@ -64382,7 +64228,6 @@ self: {
        homepage = "https://github.com/sboosali/enumerate";
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumerate-function" = callPackage
@@ -64618,7 +64463,6 @@ self: {
        ];
        description = "An environmentally friendly way to deal with environment variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "epanet-haskell" = callPackage
@@ -64731,7 +64575,6 @@ self: {
        homepage = "http://hub.darcs.net/dino/epub-metadata";
        description = "Library for parsing epub document metadata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "epub-tools" = callPackage
@@ -64754,7 +64597,6 @@ self: {
        homepage = "http://hub.darcs.net/dino/epub-tools";
        description = "Command line utilities for working with epub files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "epubname" = callPackage
@@ -64804,7 +64646,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/equal-files/";
        description = "Shell command for finding equal files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "equational-reasoning" = callPackage
@@ -65138,6 +64979,7 @@ self: {
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersatz_0_4_1" = callPackage
@@ -65278,7 +65120,6 @@ self: {
        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
@@ -66448,7 +66289,6 @@ self: {
        ];
        description = "Exception monad transformer instances for monads-tf classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exception-mtl" = callPackage
@@ -66616,7 +66456,6 @@ self: {
        homepage = "http://github.com/ocharles/exhaustive";
        description = "Compile time checks that a computation considers producing data through all possible constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exherbo-cabal" = callPackage
@@ -66678,7 +66517,6 @@ self: {
        homepage = "https://github.com/k0001/exinst";
        description = "Recover type indexes and instances for your existentialized types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-aeson" = callPackage
@@ -66757,7 +66595,6 @@ self: {
        ];
        description = "Existential types with lens-like accessors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {control-invariants = null;};
 
@@ -66786,6 +66623,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exitcode" = callPackage
+    ({ mkDerivation, base, checkers, lens, mtl, QuickCheck
+     , semigroupoids, semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "exitcode";
+       version = "0.1.0.0";
+       sha256 = "0nkb1mbgmb67qc57s2ypcpg8ky905bqy8ns9y7zq6hmizmyn34f3";
+       revision = "1";
+       editedCabalFile = "077gibwagbkr07lgj8gy2bziam9zb320ry6z889zkqpg74fskbi1";
+       libraryHaskellDepends = [
+         base lens mtl semigroupoids semigroups transformers
+       ];
+       testHaskellDepends = [
+         base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
+         transformers
+       ];
+       homepage = "https://github.com/qfpl/exitcode";
+       description = "Monad transformer for exit codes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exp-extended" = callPackage
     ({ mkDerivation, base, compensated, log-domain }:
      mkDerivation {
@@ -66798,7 +66658,6 @@ self: {
        homepage = "https://code.mathr.co.uk/exp-extended";
        description = "floating point with extended exponent range";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exp-pairs" = callPackage
@@ -67335,6 +67194,7 @@ self: {
        homepage = "https://github.com/wuest/haskell-extralife-api";
        description = "API Client for ExtraLife team and user data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extrapolate" = callPackage
@@ -67350,6 +67210,7 @@ self: {
        homepage = "https://github.com/rudymatela/extrapolate#readme";
        description = "generalize counter-examples of test properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ez-couch" = callPackage
@@ -67414,7 +67275,6 @@ self: {
        homepage = "http://functionalley.eu/Factory/factory.html";
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "factual-api" = callPackage
@@ -67766,7 +67626,6 @@ self: {
        homepage = "https://github.com/elaforge/fast-tags";
        description = "Fast incremental vi and emacs tags";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-tagsoup" = callPackage
@@ -67980,6 +67839,7 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-base" = callPackage
@@ -67993,6 +67853,7 @@ self: {
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-builder" = callPackage
@@ -68010,6 +67871,7 @@ self: {
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-dom" = callPackage
@@ -68023,6 +67885,7 @@ self: {
        homepage = "https://github.com/faylang/fay-dom";
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-geoposition" = callPackage
@@ -68036,6 +67899,7 @@ self: {
        homepage = "https://github.com/victoredwardocallaghan/fay-geoposition";
        description = "W3C compliant implementation of GeoPosition API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-hsx" = callPackage
@@ -68063,6 +67927,7 @@ self: {
        homepage = "https://github.com/faylang/fay-jquery";
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-ref" = callPackage
@@ -68076,6 +67941,7 @@ self: {
        homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-simplejson" = callPackage
@@ -68103,6 +67969,7 @@ self: {
        homepage = "https://github.com/faylang/fay-text";
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-uri" = callPackage
@@ -68116,6 +67983,7 @@ self: {
        homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb" = callPackage
@@ -68147,7 +68015,6 @@ self: {
        homepage = "https://github.com/psibi/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb-persistent" = callPackage
@@ -69314,6 +69181,7 @@ self: {
        homepage = "https://github.com/tonymorris/filepather";
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fileplow" = callPackage
@@ -69496,7 +69364,6 @@ self: {
        homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme";
        description = "Find the clumpiness of labels in a tree";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "find-conduit" = callPackage
@@ -69684,7 +69551,6 @@ self: {
        homepage = "http://functionalley.eu";
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fit" = callPackage
@@ -69758,7 +69624,6 @@ self: {
        ];
        description = "Program to manage the imports of a haskell module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fix-parser-simple" = callPackage
@@ -70122,7 +69987,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Functional Fizz/Buzz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fizzbuzz" = callPackage
@@ -70755,8 +70619,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.3.7";
-       sha256 = "0wa1g5rfnlblhsp7bkwqksakid6pgb9zyigvr00kpy264z2fm50q";
+       version = "0.5.3.8";
+       sha256 = "018ikrd5w5h1sd0adf0ybla7a9vfw9lz06nrppspv2n3i2i55zrb";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -71129,7 +70993,6 @@ self: {
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "foldl-transduce" = callPackage
@@ -71586,7 +71449,6 @@ self: {
        homepage = "https://github.com/agrafix/format-numbers#readme";
        description = "Various number formatting functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "format-status" = callPackage
@@ -71866,7 +71728,6 @@ self: {
        homepage = "https://github.com/haskell-foundation/foundation";
        description = "Alternative prelude with batteries and no dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foundation-edge" = callPackage
@@ -72166,7 +72027,6 @@ self: {
        homepage = "https://github.com/salemove/freddy-hs";
        description = "RabbitMQ Messaging API supporting request-response";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free" = callPackage
@@ -72383,7 +72243,6 @@ self: {
        homepage = "https://github.com/leftaroundabout/free-vector-spaces";
        description = "Instantiate the classes from the vector-space package with types from linear";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-vl" = callPackage
@@ -72463,7 +72322,6 @@ self: {
        homepage = "https://gitlab.com/queertypes/freer";
        description = "Implementation of the Freer Monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freer-converse" = callPackage
@@ -72637,7 +72495,6 @@ self: {
        homepage = "https://github.com/RaphaelJ/friday";
        description = "A functional image processing library for Haskell";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friday-devil" = callPackage
@@ -72673,7 +72530,6 @@ self: {
        homepage = "https://github.com/TomMD/friday-juicypixels";
        description = "Converts between the Friday and JuicyPixels image types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friday-scale-dct" = callPackage
@@ -73019,7 +72875,6 @@ self: {
        homepage = "https://github.com/ixmatus/fswait";
        description = "Wait and observe events on the filesystem for a path, with a timeout";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fswatcher" = callPackage
@@ -73698,7 +73553,6 @@ self: {
        ];
        description = "A 'ten past six' style clock";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fwgl" = callPackage
@@ -73824,7 +73678,6 @@ self: {
        homepage = "http://github.com/marcusbuffett/game-of-life";
        description = "Conway's Game of Life";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "game-probability" = callPackage
@@ -74253,6 +74106,7 @@ self: {
        homepage = "https://github.com/anfelor/gen-passwd#readme";
        description = "Create wordlist-based passwords easily";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gencheck" = callPackage
@@ -74891,7 +74745,6 @@ self: {
        homepage = "https://github.com/danr/genifunctors";
        description = "Generate generalized fmap, foldMap and traverse";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geniplate" = callPackage
@@ -75041,7 +74894,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec" = callPackage
@@ -75061,7 +74913,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
@@ -75083,7 +74934,6 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-binary" = callPackage
@@ -75118,7 +74968,6 @@ self: {
        homepage = "http://cs-syd.eu";
        description = "Standard spec's for cereal-related instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-hashable" = callPackage
@@ -75157,7 +75006,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Path";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-property" = callPackage
@@ -75213,7 +75061,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-time" = callPackage
@@ -75231,7 +75078,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-unordered-containers" = callPackage
@@ -75377,7 +75223,6 @@ self: {
        homepage = "https://github.com/PaulJohnson/geodetics";
        description = "Terrestrial coordinate systems and geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geohash" = callPackage
@@ -75405,7 +75250,6 @@ self: {
        ];
        description = "Pure haskell interface to MaxMind GeoIP database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geojson" = callPackage
@@ -76297,7 +76141,6 @@ self: {
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
@@ -76655,7 +76498,6 @@ self: {
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-dom-hello" = callPackage
@@ -76692,7 +76534,6 @@ self: {
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-dom-jsffi" = callPackage
@@ -76998,7 +76839,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gdk_3_0_14" = callPackage
@@ -77087,6 +76927,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "libgit2-glib bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) libgit2-glib;};
 
   "gi-gio" = callPackage
@@ -77150,7 +76991,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gobjectIntrospection;};
 
   "gi-glib" = callPackage
@@ -77256,7 +77096,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamer bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gstreamer;};
 
   "gi-gstaudio" = callPackage
@@ -77278,7 +77117,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstbase" = callPackage
@@ -77300,7 +77138,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerBase bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstpbutils" = callPackage
@@ -77368,7 +77205,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
@@ -77391,7 +77227,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gtk_3_0_17" = callPackage
@@ -77425,8 +77260,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-hs";
-       version = "0.3.4.3";
-       sha256 = "0ypvb5iklmw7k7j1jzd62arbn875hwyg0lcx1z24csyin6gl7zda";
+       version = "0.3.5.0";
+       sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv";
        libraryHaskellDepends = [
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
@@ -77434,7 +77269,6 @@ self: {
        homepage = "https://github.com/haskell-gi/gi-gtk-hs";
        description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gi-gtkosxapplication" = callPackage
@@ -77480,7 +77314,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
 
   "gi-javascriptcore" = callPackage
@@ -77593,7 +77426,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Pango bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
   "gi-pango_1_0_15" = callPackage
@@ -77646,7 +77478,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
   "gi-poppler" = callPackage
@@ -77917,7 +77748,6 @@ self: {
        homepage = "https://bitbucket.org/tdammers/ginger";
        description = "An implementation of the Jinja2 template language in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ginsu" = callPackage
@@ -77984,6 +77814,7 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "giphy-api" = callPackage
@@ -78011,7 +77842,6 @@ self: {
        homepage = "http://github.com/passy/giphy-api#readme";
        description = "Giphy HTTP API wrapper and CLI search tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gist" = callPackage
@@ -78310,7 +78140,6 @@ self: {
        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;
      }) {};
 
   "git-monitor" = callPackage
@@ -78524,7 +78353,6 @@ self: {
        homepage = "https://github.com/phadej/github";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-backup" = callPackage
@@ -78593,7 +78421,6 @@ self: {
        homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -78614,7 +78441,6 @@ self: {
        homepage = "https://toktok.github.io/";
        description = "Various Github helper utilities";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "github-types" = callPackage
@@ -78682,7 +78508,6 @@ self: {
        ];
        description = "GitHub WebHook Handler implementation for Snap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitignore" = callPackage
@@ -79001,7 +78826,6 @@ self: {
        homepage = "http://github.com/passy/givegif#readme";
        description = "CLI Giphy search tool with previews in iTerm 2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gjk" = callPackage
@@ -79217,7 +79041,6 @@ self: {
        homepage = "https://github.com/louispan/glazier-react#readme";
        description = "ReactJS binding using Glazier and Pipes.Fluid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glazier-react-examples" = callPackage
@@ -79241,7 +79064,6 @@ self: {
        homepage = "https://github.com/louispan/glazier-react#readme";
        description = "Examples of using glazier-react";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glazier-react-widget" = callPackage
@@ -79261,7 +79083,6 @@ self: {
        homepage = "https://github.com/louispan/glazier-react-widget#readme";
        description = "Generic widget library using glazier-react";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gli" = callPackage
@@ -79322,7 +79143,6 @@ self: {
        testHaskellDepends = [ base data-default hspec lens QuickCheck ];
        description = "Glicko-2 implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glider-nlp" = callPackage
@@ -79336,7 +79156,6 @@ self: {
        homepage = "https://github.com/klangner/glider-nlp";
        description = "Natural Language Processing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glintcollider" = callPackage
@@ -79554,7 +79373,6 @@ self: {
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-algorithms" = callPackage
@@ -79567,7 +79385,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-banana" = callPackage
@@ -79668,7 +79485,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -79776,7 +79592,6 @@ self: {
        ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glue-core" = callPackage
@@ -79800,7 +79615,6 @@ self: {
        ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glue-ekg" = callPackage
@@ -79824,7 +79638,6 @@ self: {
        ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glue-example" = callPackage
@@ -79845,7 +79658,6 @@ self: {
        ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gluturtle" = callPackage
@@ -79859,7 +79671,6 @@ self: {
        ];
        description = "turtle like LOGO with glut";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gmap" = callPackage
@@ -79954,17 +79765,17 @@ self: {
      , bytestring, conduit, conduit-extra, exceptions, extra
      , HUnit-approx, lens, monad-control, mtl, resourcet, rtcm, sbp
      , tasty, tasty-hunit, text, time, transformers-base
-     , unordered-containers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.3.6";
-       sha256 = "16kprvn242i05pravy5x04dsnkr5ifb4y427nb0588v5ljhbab0s";
+       version = "0.3.8";
+       sha256 = "1l9f7vfyzikakz8lnp373l2fz4zqrisnmqdryfn3v7pdd06a21dv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base basic-prelude exceptions extra lens monad-control mtl
-         resourcet rtcm sbp time transformers-base
+         base basic-prelude conduit exceptions extra lens monad-control mtl
+         resourcet rtcm sbp time transformers-base vector
        ];
        executableHaskellDepends = [
          base basic-prelude binary-conduit conduit conduit-extra resourcet
@@ -80645,7 +80456,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Container Builder SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-core" = callPackage
@@ -80693,7 +80503,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Dataflow SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dataproc" = callPackage
@@ -80826,7 +80635,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Dynamic Links SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-firebase-rules" = callPackage
@@ -80983,7 +80791,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity and Access Management (IAM) SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-identity-toolkit" = callPackage
@@ -81020,7 +80827,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Natural Language SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-latencytest" = callPackage
@@ -81057,7 +80863,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Manufacturer Center SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-maps-coordinate" = callPackage
@@ -81106,7 +80911,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Machine Learning SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-monitoring" = callPackage
@@ -81311,7 +81115,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud RuntimeConfig SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-safebrowsing" = callPackage
@@ -81324,7 +81127,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Safe Browsing APIs SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-script" = callPackage
@@ -81349,7 +81151,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Control SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-servicemanagement" = callPackage
@@ -81375,7 +81176,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Sheets SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-shopping-content" = callPackage
@@ -81388,7 +81188,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Content API for Shopping SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-siteverification" = callPackage
@@ -81413,7 +81212,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Slides SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-spectrum" = callPackage
@@ -81558,7 +81356,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Data SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube-analytics" = callPackage
@@ -81703,7 +81500,6 @@ self: {
        homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme";
        description = "Google Maps Geocoding API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-oauth2" = callPackage
@@ -81758,7 +81554,6 @@ self: {
        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
@@ -81792,7 +81587,6 @@ self: {
        homepage = "https://github.com/mpilgrem/google-static-maps#readme";
        description = "Bindings to the Google Static Maps API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-translate" = callPackage
@@ -81809,7 +81603,6 @@ self: {
        ];
        description = "Google Translate API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "googleplus" = callPackage
@@ -82038,7 +81831,6 @@ self: {
        homepage = "https://github.com/Teaspot-Studio/gore-and-ash-logging";
        description = "Core module for gore-and-ash with logging utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gore-and-ash-network" = callPackage
@@ -82349,7 +82141,6 @@ self: {
        homepage = "https://grapefruit-project.org/";
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-frp" = callPackage
@@ -82366,7 +82157,6 @@ self: {
        homepage = "https://grapefruit-project.org/";
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-records" = callPackage
@@ -82379,7 +82169,6 @@ self: {
        homepage = "https://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui" = callPackage
@@ -82397,7 +82186,6 @@ self: {
        homepage = "https://grapefruit-project.org/";
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui-gtk" = callPackage
@@ -82416,7 +82204,6 @@ self: {
        homepage = "https://grapefruit-project.org/";
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-core" = callPackage
@@ -82488,7 +82275,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-cl" = callPackage
@@ -82527,7 +82313,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-lambdascope" = callPackage
@@ -82550,7 +82335,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-layout" = callPackage
@@ -82567,7 +82351,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-ski" = callPackage
@@ -82588,7 +82371,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-strategies" = callPackage
@@ -82605,7 +82387,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-trs" = callPackage
@@ -82650,7 +82431,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-serialize" = callPackage
@@ -82696,6 +82476,7 @@ self: {
        homepage = "https://github.com/atzedijkstra/graph-visit";
        description = "Graph walk abstraction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-wrapper" = callPackage
@@ -82876,7 +82657,6 @@ self: {
        homepage = "https://github.com/jml/graphql-api#readme";
        description = "Sketch of GraphQL stuff";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphs" = callPackage
@@ -83226,7 +83006,6 @@ self: {
        homepage = "https://github.com/mhwombat/grid#readme";
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gridbounds" = callPackage
@@ -83291,7 +83070,6 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grm" = callPackage
@@ -83362,7 +83140,6 @@ self: {
        homepage = "http://github.com/lykahb/groundhog";
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-converters" = callPackage
@@ -83406,7 +83183,6 @@ self: {
        homepage = "http://github.com/lykahb/groundhog";
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-inspector_0_8_0_2" = callPackage
@@ -83449,7 +83225,6 @@ self: {
        ];
        description = "MySQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-postgresql" = callPackage
@@ -83469,7 +83244,6 @@ self: {
        ];
        description = "PostgreSQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-sqlite" = callPackage
@@ -83487,7 +83261,6 @@ self: {
        ];
        description = "Sqlite3 backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-th" = callPackage
@@ -83504,7 +83277,6 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "group-by-date" = callPackage
@@ -83780,7 +83552,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -84781,7 +84552,6 @@ self: {
        homepage = "http://gregheartsfield.com/hS3/";
        description = "Interface to Amazon's Simple Storage Service (S3)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hScraper" = callPackage
@@ -84955,7 +84725,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A blog system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hacanon-light" = callPackage
@@ -85391,7 +85160,6 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-interface-wai";
        description = "Hack2 interface to WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-db" = callPackage
@@ -85482,7 +85250,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hackage-plot";
        description = "Generate cumulative graphs of hackage uploads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-processing" = callPackage
@@ -85544,7 +85311,6 @@ self: {
        homepage = "https://github.com/well-typed/hackage-security";
        description = "Utility to manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-security" = callPackage
@@ -85650,7 +85416,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hackage-sparks";
        description = "Generate sparkline graphs of hackage statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-whatsnew" = callPackage
@@ -85685,7 +85450,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hackage2hwn";
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage2twitter" = callPackage
@@ -85883,7 +85647,6 @@ self: {
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock_2_18_1" = callPackage
@@ -86142,6 +85905,7 @@ self: {
        homepage = "http://github.com/jystic/hadoop-rpc";
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hadoop-tools" = callPackage
@@ -86744,7 +86508,6 @@ self: {
        homepage = "http://github.com/Minoru/hakyll-convert";
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -86790,7 +86553,6 @@ self: {
        homepage = "https://gitlab.com/aergus/hakyll-filestore";
        description = "FileStore utilities for Hakyll";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-ogmarkup" = callPackage
@@ -86803,7 +86565,6 @@ self: {
        homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme";
        description = "Integrate ogmarkup document with Hakyll";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-sass" = callPackage
@@ -86833,7 +86594,6 @@ self: {
        homepage = "https://github.com/oisdk/hakyll-series";
        description = "Adds series functionality to hakyll";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-shakespeare" = callPackage
@@ -86851,7 +86611,6 @@ self: {
        ];
        description = "Hakyll Hamlet compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halberd" = callPackage
@@ -86981,7 +86740,6 @@ self: {
        homepage = "https://github.com/timjb/halma";
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma-gui" = callPackage
@@ -87099,7 +86857,6 @@ self: {
        homepage = "https://github.com/mstksg/hamilton";
        description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamlet" = callPackage
@@ -87655,6 +87412,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -88086,7 +87844,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "extend happstack-server with https:// support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "happstack-server-tls-cryptonite" = callPackage
@@ -88143,7 +87900,6 @@ self: {
        homepage = "https://github.com/scrive/happstack-static-routing";
        description = "Support for static URL routing with overlap detection for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-util" = callPackage
@@ -88226,7 +87982,6 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Quasi-quoter for Happy parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happybara" = callPackage
@@ -88330,7 +88085,6 @@ self: {
        homepage = "https://github.com/freizl/har";
        description = "HAR spec in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "harchive" = callPackage
@@ -88551,7 +88305,6 @@ self: {
        homepage = "https://github.com/zmactep/hasbolt#readme";
        description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascal" = callPackage
@@ -88567,7 +88320,6 @@ self: {
        homepage = "https://github.com/mekeor/hascal";
        description = "tiny calculator library and command-line program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascar" = callPackage
@@ -88596,6 +88348,7 @@ self: {
        homepage = "https://github.com/VirtualForgeGmbH/hascar";
        description = "Decompress SAPCAR archives";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascas" = callPackage
@@ -88873,7 +88626,6 @@ self: {
        homepage = "http://hashids.org/";
        description = "Hashids generates short, unique, non-sequential ids from numbers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashing" = callPackage
@@ -89054,6 +88806,7 @@ self: {
        homepage = "http://github.com/singpolyma/haskades";
        description = "Utility to generate bindings for BlackBerry Cascades";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskakafka" = callPackage
@@ -89079,7 +88832,6 @@ self: {
        homepage = "http://github.com/cosbynator/haskakafka";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) rdkafka;};
 
   "haskanoid" = callPackage
@@ -89100,7 +88852,6 @@ self: {
        homepage = "http://github.com/ivanperez-keera/haskanoid";
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskarrow" = callPackage
@@ -89403,7 +89154,6 @@ self: {
        homepage = "http://xy30.com";
        description = "compress files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {booleanlist = null;};
 
@@ -89487,6 +89237,7 @@ self: {
        homepage = "https://github.com/dilawar/haskell-eigen-util#README.md";
        description = "Some utility functions for haskell-eigen library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-exp-parser" = callPackage
@@ -89718,7 +89469,6 @@ self: {
        homepage = "https://github.com/prateekkumarweb/haskell-go-checkers";
        description = "Go and Checkers game in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-google-trends" = callPackage
@@ -89781,7 +89531,6 @@ self: {
        homepage = "https://github.com/ncaq/haskell-import-graph.git#readme";
        description = "create haskell import graph for graphviz";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-in-space" = callPackage
@@ -90296,7 +90045,6 @@ self: {
        homepage = "https://github.com/int-e/haskell-src-exts-simple";
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-meta" = callPackage
@@ -90388,7 +90136,6 @@ self: {
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-ast_0_8_1_0" = callPackage
@@ -90478,7 +90225,6 @@ self: {
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-backend-ghc_0_8_1_0" = callPackage
@@ -90555,7 +90301,6 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Background process for Haskell-tools refactor that editors can connect to";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-daemon_0_8_1_0" = callPackage
@@ -90606,7 +90351,6 @@ 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-debug_0_8_1_0" = callPackage
@@ -90660,7 +90404,6 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "A web-based demo for Haskell-tools Refactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-demo_0_8_1_0" = callPackage
@@ -90709,7 +90452,6 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-prettyprint_0_8_1_0" = callPackage
@@ -90758,7 +90500,6 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-refactor_0_8_1_0" = callPackage
@@ -90812,7 +90553,6 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-rewrite_0_8_1_0" = callPackage
@@ -92107,7 +91847,6 @@ self: {
        homepage = "https://github.com/contivero/hasmin#readme";
        description = "\"A CSS Minifier\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasmin_0_3_2_3" = callPackage
@@ -92314,7 +92053,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction";
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-generic" = callPackage
@@ -92358,7 +92096,6 @@ 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
@@ -92474,7 +92211,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-transaction";
        description = "A composable abstraction over the retryable transactions for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastache" = callPackage
@@ -92638,7 +92374,6 @@ self: {
        homepage = "http://bitbucket.org/sras/hastily";
        description = "A program to download subtitle files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasty-hamiltonian" = callPackage
@@ -92700,7 +92435,6 @@ self: {
        ];
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hath" = callPackage
@@ -92896,7 +92630,6 @@ self: {
        homepage = "https://github.com/facebook/Haxl";
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxl_0_5_1_0" = callPackage
@@ -92943,7 +92676,6 @@ self: {
        homepage = "http://github.com/tvh/haxl-amazonka#readme";
        description = "Haxl data source for accessing AWS services through amazonka";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxl-facebook" = callPackage
@@ -93015,7 +92747,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxr-th" = callPackage
@@ -93328,7 +93059,6 @@ self: {
        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;
      }) {};
 
   "hcc" = callPackage
@@ -93872,7 +93602,6 @@ self: {
        ];
        description = "A Digital Ocean client in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdocs" = callPackage
@@ -94015,7 +93744,6 @@ self: {
        homepage = "http://github.com/ekmett/heaps/";
        description = "Asymptotically optimal Brodal/Okasaki heaps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heaps_0_3_5" = callPackage
@@ -94119,7 +93847,6 @@ self: {
        homepage = "https://github.com/2016rshah/heckle";
        description = "Jekyll in Haskell (feat. LaTeX)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog" = callPackage
@@ -94146,7 +93873,6 @@ self: {
        homepage = "https://hedgehog.qa";
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-quickcheck" = callPackage
@@ -94661,7 +94387,6 @@ self: {
        homepage = "http://github.com/switchface/helm";
        description = "A functionally reactive game engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "help-esb" = callPackage
@@ -95303,7 +95028,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hexpat/";
        description = "XML parser/formatter based on expat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) expat;};
 
   "hexpat-iteratee" = callPackage
@@ -95339,7 +95063,6 @@ self: {
        homepage = "https://github.com/tel/hexpat-lens";
        description = "Lenses for Hexpat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-pickle" = callPackage
@@ -95357,7 +95080,6 @@ self: {
        homepage = "http://code.haskell.org/hexpat-pickle/";
        description = "XML picklers based on hexpat, source-code-similar to those of the HXT package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-pickle-generic" = callPackage
@@ -95387,7 +95109,6 @@ self: {
        libraryHaskellDepends = [ base hexpat tagsoup ];
        description = "Parse (possibly malformed) HTML to hexpat tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpr" = callPackage
@@ -95832,7 +95553,6 @@ self: {
        homepage = "https://fstaals.net/software/hgeometry";
        description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgeos" = callPackage
@@ -95999,6 +95719,7 @@ self: {
        homepage = "https://github.com/LukeHoersten/hgrev";
        description = "Compile Mercurial (hg) version info into Haskell code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgrib" = callPackage
@@ -96153,7 +95874,6 @@ self: {
        homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {systemd = null;};
 
   "hidden-char" = callPackage
@@ -96286,7 +96006,6 @@ self: {
        homepage = "https://gitlab.com/gonz/hifi";
        description = "WiFi connection script generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highWaterMark" = callPackage
@@ -96326,7 +96045,6 @@ self: {
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "higherorder" = callPackage
@@ -96359,7 +96077,6 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highjson-swagger" = callPackage
@@ -96379,7 +96096,6 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Derive swagger instances from highjson specs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "highjson-th" = callPackage
@@ -96401,7 +96117,6 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Template Haskell helpers for highjson specs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "highlight" = callPackage
@@ -96857,7 +96572,6 @@ self: {
        homepage = "https://github.com/LTI2000/hinterface";
        description = "Haskell / Erlang interoperability library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinvaders" = callPackage
@@ -96910,7 +96624,6 @@ self: {
        homepage = "https://github.com/lehins/hip";
        description = "Haskell Image Processing (HIP) Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hipbot" = callPackage
@@ -96955,6 +96668,7 @@ self: {
        ];
        description = "Hipchat API bindings in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hipe" = callPackage
@@ -97405,6 +97119,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hjugement" = callPackage
+    ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "hjugement";
+       version = "1.0.0.20170804";
+       sha256 = "1liq8iq40011lnixr49fx9lm091s7y18y9f1ym19iqj07qprc3x7";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base containers QuickCheck tasty tasty-hunit tasty-quickcheck text
+         transformers
+       ];
+       description = "Majority Judgment";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "hkdf" = callPackage
     ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }:
      mkDerivation {
@@ -97580,7 +97311,6 @@ self: {
        homepage = "http://hledger.org";
        description = "Web API server for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-chart" = callPackage
@@ -97649,7 +97379,6 @@ self: {
        homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
        description = "A terminal UI as drop-in replacement for hledger add";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-interest" = callPackage
@@ -97686,7 +97415,6 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-lib" = callPackage
@@ -98097,7 +97825,6 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Linear Programming based on GLPK";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
@@ -98198,7 +97925,6 @@ self: {
        homepage = "http://code.haskell.org/hmatrix-repa";
        description = "Adaptors for interoperability between hmatrix and repa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-special" = callPackage
@@ -98245,7 +97971,6 @@ self: {
        homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -98281,7 +98006,6 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmeap" = callPackage
@@ -98456,6 +98180,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mpfr;};
 
+  "hmpfr_0_4_3" = callPackage
+    ({ mkDerivation, base, integer-gmp, mpfr }:
+     mkDerivation {
+       pname = "hmpfr";
+       version = "0.4.3";
+       sha256 = "09q4gmj2gr3krh7vpkc8xwiy874d7mr6v57hv2i3n481yhky0yir";
+       enableSeparateDataOutput = true;
+       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
@@ -99675,7 +99414,6 @@ self: {
        homepage = "https://github.com/ananthakumaran/hopfli";
        description = "Bidings to Google's Zopfli compression library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoppy-docs" = callPackage
@@ -99773,7 +99511,6 @@ self: {
        homepage = "http://akc.is/hops";
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoq" = callPackage
@@ -99814,7 +99551,6 @@ self: {
        homepage = "https://github.com/ciez/hora";
        description = "date time";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "horizon" = callPackage
@@ -99849,6 +99585,7 @@ self: {
        homepage = "https://github.com/cocreature/horname#readme";
        description = "Rename function definitions returned by SMT solvers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hosc" = callPackage
@@ -100226,7 +99963,6 @@ self: {
        homepage = "https://github.com/yamadapc/hpack-convert#readme";
        description = "Convert Cabal manifests into hpack's package.yamls";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpaco" = callPackage
@@ -100372,7 +100108,6 @@ self: {
        ];
        description = "Support for well-typed paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpc_0_6_0_3" = callPackage
@@ -100415,7 +100150,6 @@ self: {
        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
@@ -100880,6 +100614,7 @@ self: {
        ];
        description = "A query language for transforming HTML5";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hranker" = callPackage
@@ -100928,7 +100663,6 @@ self: {
        homepage = "http://github.com/dredozubov/hreader-lens";
        description = "Optics for hreader package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hricket" = callPackage
@@ -100988,7 +100722,6 @@ self: {
        ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -101002,7 +100735,6 @@ self: {
        homepage = "http://github.com/ozataman/hs-GeoIP";
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {GeoIP = null;};
 
   "hs-bibutils" = callPackage
@@ -101162,7 +100894,6 @@ self: {
        homepage = "https://github.com/myfreeweb/hs-duktape";
        description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-excelx" = callPackage
@@ -101436,7 +101167,6 @@ self: {
        homepage = "https://github.com/trskop/hs-pkg-config";
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-pkpass" = callPackage
@@ -101897,7 +101627,6 @@ self: {
        ];
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3" = callPackage
@@ -102501,7 +102230,6 @@ self: {
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsdif" = callPackage
@@ -102886,7 +102614,6 @@ self: {
        ];
        description = "A command line program for extending the import list of a Haskell source file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsini" = callPackage
@@ -103026,7 +102753,6 @@ self: {
        libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslogger4j" = callPackage
@@ -103419,7 +103145,6 @@ self: {
        homepage = "http://www.jasani.org/search/label/hsparklines";
        description = "Sparklines for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsparql" = callPackage
@@ -103612,7 +103337,6 @@ self: {
        libraryHaskellDepends = [ base hspec-expectations transformers ];
        description = "A version of hspec-expectations generalized to MonadIO";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations-pretty" = callPackage
@@ -103682,7 +103406,6 @@ self: {
        homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme";
        description = "Use tests to monitor changes in Aeson serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-hashable" = callPackage
@@ -104077,7 +103800,6 @@ self: {
        homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Write end2end web application tests using webdriver and hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec2" = callPackage
@@ -104513,7 +104235,6 @@ self: {
        homepage = "http://jakewheat.github.com/hssqlppp/";
        description = "SQL parser and type checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hssqlppp-th" = callPackage
@@ -104533,7 +104254,6 @@ self: {
        homepage = "http://jakewheat.github.com/hssqlppp/";
        description = "hssqlppp extras which need template-haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstatistics" = callPackage
@@ -104800,7 +104520,6 @@ self: {
        ];
        description = "Synthesizable Verilog DSL supporting for multiple clock and reset";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hswip" = callPackage
@@ -105049,12 +104768,17 @@ self: {
      }) {};
 
   "htirage" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers, QuickCheck, tasty
+     , tasty-quickcheck, text, transformers
+     }:
      mkDerivation {
        pname = "htirage";
-       version = "1.20170723";
-       sha256 = "184z1bzzs00mkvmbr2p2xk0f5agxxv1xqmgbs0hq9yldpsa2nszc";
+       version = "1.20170804";
+       sha256 = "04rjp4gzi2dfzp9vpmwrvlwdj0mwx7s1myvl85jzlf5ikic1898p";
        libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers QuickCheck tasty tasty-quickcheck text transformers
+       ];
        description = "Equiprobable draw from publicly verifiable random data";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -105570,7 +105294,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the OpenSSL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-request-modifiers" = callPackage
@@ -105740,7 +105463,6 @@ self: {
        homepage = "https://github.com/bazqux/http-conduit-downloader";
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-date" = callPackage
@@ -105899,7 +105621,6 @@ self: {
        homepage = "https://github.com/myfreeweb/http-link-header";
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "http-listen" = callPackage
@@ -105996,7 +105717,6 @@ self: {
        homepage = "https://github.com/nfjinjing/http-pony";
        description = "A type unsafe http library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-pony-serve-wai" = callPackage
@@ -106215,7 +105935,6 @@ self: {
        homepage = "http://github.com/afcowie/http-streams/";
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-test" = callPackage
@@ -106446,7 +106165,6 @@ self: {
        homepage = "http://justhub.org";
        description = "For multiplexing GHC installations and providing development sandboxes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hubigraph" = callPackage
@@ -106460,7 +106178,6 @@ self: {
        homepage = "http://ooxo.org/hubigraph/";
        description = "A haskell wrap for Ubigraph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hubris" = callPackage
@@ -106519,7 +106236,6 @@ self: {
        homepage = "https://github.com/elliottt/huff";
        description = "A fast-foward-based planner";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "huffman" = callPackage
@@ -107030,7 +106746,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-bits" = callPackage
@@ -107051,17 +106766,16 @@ self: {
        homepage = "http://github.com/haskell-works/hw-bits#readme";
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hw-bits_0_5_0_3" = callPackage
+  "hw-bits_0_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
      , hw-prim, hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-bits";
-       version = "0.5.0.3";
-       sha256 = "1xkzxfz25ah7p4zybdm0c1081kkca7515jh1d7vjysxs34w8h1yn";
+       version = "0.6.0.0";
+       sha256 = "1w6kr5brkw78a0x82r34aivbbh4bhrng2hzh7hycia7291vysbbw";
        libraryHaskellDepends = [
          base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
@@ -107093,7 +106807,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-conduit#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-diagnostics" = callPackage
@@ -107125,7 +106838,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-eliasfano#readme";
        description = "Elias-Fano";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-excess" = callPackage
@@ -107145,7 +106857,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-excess#readme";
        description = "Excess";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-hedgehog" = callPackage
@@ -107226,7 +106937,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-json#readme";
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-json-lens" = callPackage
@@ -107261,7 +106971,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-json-lens#readme";
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-kafka-avro" = callPackage
@@ -107294,6 +107003,7 @@ self: {
        homepage = "https://github.com/haskell-works/hw-kafka-avro#readme";
        description = "Avro support for Kafka infrastructure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-kafka-client" = callPackage
@@ -107386,7 +107096,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-packed-vector#readme";
        description = "Packed Vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-parser" = callPackage
@@ -107435,22 +107144,34 @@ self: {
        homepage = "http://github.com/haskell-works/hw-rankselect#readme";
        description = "Rank-select";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hw-rankselect_0_8_0_2" = callPackage
-    ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
-     , hw-rankselect-base, QuickCheck, vector
+  "hw-rankselect_0_10_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
+     , directory, hedgehog, hspec, hw-balancedparens, hw-bits
+     , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap
+     , QuickCheck, resourcet, vector
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.8.0.2";
-       sha256 = "0b9ki066c5nypy81dqyj91ghj00p1y5glhg1jpf267q6r0mjkwcm";
+       version = "0.10.0.0";
+       sha256 = "09lnxig3z7792f24jlijm76psa5ihjzdb4g1ilg8iria9h825q1n";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector
+         base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base
+         vector
+       ];
+       executableHaskellDepends = [
+         base directory hw-bits hw-prim hw-rankselect-base mmap vector
        ];
        testHaskellDepends = [
-         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+         base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog
+         hw-prim hw-rankselect-base mmap QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion directory hw-bits hw-prim
+         hw-rankselect-base mmap resourcet vector
        ];
        homepage = "http://github.com/haskell-works/hw-rankselect#readme";
        description = "Rank-select";
@@ -107478,7 +107199,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-rankselect-base#readme";
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-string-parse" = callPackage
@@ -107511,7 +107231,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-succinct#readme";
        description = "Succint datastructures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-vector" = callPackage
@@ -107568,7 +107287,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-xml#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -107883,7 +107601,6 @@ self: {
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Expat parser for HXT";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt-extras" = callPackage
@@ -108486,7 +108203,6 @@ self: {
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyper-haskell-server" = callPackage
@@ -108567,7 +108283,6 @@ self: {
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperloglog_0_4_2" = callPackage
@@ -108665,7 +108380,6 @@ self: {
        homepage = "http://github.com/ekmett/hyphenation";
        description = "Configurable Knuth-Liang hyphenation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hypher" = callPackage
@@ -109156,7 +108870,6 @@ self: {
        ];
        description = "Numeric identifiers for values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "idiii" = callPackage
@@ -109414,7 +109127,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/iff/";
        description = "Constructing and dissecting IFF files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ifscs" = callPackage
@@ -110534,7 +110246,6 @@ self: {
        homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentation-core" = callPackage
@@ -110579,7 +110290,6 @@ self: {
        homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Trifecta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentparser" = callPackage
@@ -110917,7 +110627,6 @@ self: {
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -111147,7 +110856,6 @@ self: {
        homepage = "http://github.com/tweag/inline-java#readme";
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-r" = callPackage
@@ -111184,7 +110892,6 @@ self: {
        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;};
 
   "inliterate" = callPackage
@@ -111465,7 +111172,6 @@ self: {
        homepage = "https://github.com/hvr/int-cast";
        description = "Checked conversions between integral types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integer-gmp_1_0_0_1" = callPackage
@@ -111499,7 +111205,6 @@ self: {
        homepage = "https://github.com/phadej/integer-logarithms";
        description = "Integer logarithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integer-pure" = callPackage
@@ -111634,7 +111339,6 @@ self: {
        ];
        description = "Prelude replacement based on protolude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intern" = callPackage
@@ -111805,7 +111509,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/interpolation/";
        description = "piecewise linear and cubic Hermite interpolation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interruptible" = callPackage
@@ -111941,7 +111644,6 @@ 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
@@ -112088,7 +111790,6 @@ self: {
        testHaskellDepends = [ base QuickCheck transformers ];
        description = "bidirectional arrows, bijective functions, and invariant functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-hlist" = callPackage
@@ -112126,7 +111827,6 @@ self: {
        homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Invertible syntax descriptions for both parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "io-capture" = callPackage
@@ -112810,7 +112510,6 @@ self: {
        homepage = "https://github.com/glguy/irc-core";
        description = "IRC core library for glirc";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-ctcp" = callPackage
@@ -112848,7 +112547,6 @@ self: {
        homepage = "https://github.com/JanGe/irc-dcc";
        description = "A DCC message parsing and helper library for IRC clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-fun-bot" = callPackage
@@ -112952,7 +112650,6 @@ self: {
        homepage = "https://github.com/stepcut/ircbot";
        description = "A library for writing IRC bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ircbouncer" = callPackage
@@ -113063,7 +112760,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Generic pattern predicates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isdicom" = callPackage
@@ -113256,7 +112952,6 @@ self: {
        homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md";
        description = "Isotopic masses and relative abundances";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ispositive" = callPackage
@@ -113314,7 +113009,6 @@ self: {
        ];
        description = "A brick Widget for selectable summary of many elements on a terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iter-stats" = callPackage
@@ -113533,7 +113227,6 @@ self: {
        homepage = "http://ivorylang.org";
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-artifact" = callPackage
@@ -113613,7 +113306,6 @@ self: {
        homepage = "http://ivorylang.org";
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-examples" = callPackage
@@ -113651,7 +113343,6 @@ self: {
        homepage = "http://ivorylang.org";
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-opts" = callPackage
@@ -113671,7 +113362,6 @@ self: {
        homepage = "http://ivorylang.org";
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -113711,7 +113401,6 @@ self: {
        ];
        description = "Serialization library for Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -113725,7 +113414,6 @@ self: {
        homepage = "http://ivorylang.org";
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivy-web" = callPackage
@@ -114212,7 +113900,6 @@ self: {
        homepage = "https://github.com/NICTA/javaclass";
        description = "Java class files";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javascript-extras" = callPackage
@@ -114329,7 +114016,6 @@ self: {
        homepage = "https://github.com/erikd/jenga";
        description = "Generate a cabal freeze file from a stack.yaml";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jenkinsPlugins2nix" = callPackage
@@ -114482,7 +114168,6 @@ self: {
        homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -114637,7 +114322,6 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "jpeg" = callPackage
@@ -114711,7 +114395,6 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle-clib" = callPackage
@@ -114742,7 +114425,6 @@ self: {
        ];
        description = "DOM library that uses jsaddle to support both GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle-hello" = callPackage
@@ -114926,7 +114608,6 @@ self: {
        homepage = "http://github.com/ocharles/json-assertions.git";
        description = "Test that your (Aeson) JSON encoding matches your expectations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-ast" = callPackage
@@ -115143,6 +114824,7 @@ self: {
        homepage = "https://github.com/tfausak/json-feed#readme";
        description = "JSON Feed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-fu" = callPackage
@@ -115426,7 +115108,6 @@ self: {
        ];
        description = "Generics JSON (de)serialization using generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-state" = callPackage
@@ -115464,7 +115145,6 @@ self: {
        homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-togo" = callPackage
@@ -115706,7 +115386,6 @@ self: {
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsonsql" = callPackage
@@ -115813,7 +115492,6 @@ self: {
        ];
        description = "Manage users in MariaDB >= 10.1.1";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "judy" = callPackage
@@ -115960,7 +115638,6 @@ self: {
        homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jvm-parser" = callPackage
@@ -115994,7 +115671,6 @@ 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
@@ -116476,7 +116152,6 @@ self: {
        homepage = "https://github.com/Soostone/katip";
        description = "A structured logging framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "katip-elasticsearch" = callPackage
@@ -117266,7 +116941,6 @@ self: {
        ];
        description = "Pure Haskell key/value store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keyword-args" = callPackage
@@ -117592,7 +117266,6 @@ self: {
        homepage = "https://github.com/scrive/kontra-config";
        description = "JSON config file parsing based on unjson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kontrakcja-templates" = callPackage
@@ -118065,7 +117738,6 @@ self: {
        homepage = "https://github.com/sgillespie/lambda-calculus#readme";
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-canvas" = callPackage
@@ -118118,7 +117790,6 @@ self: {
        homepage = "https://github.com/thomaseding/lambda-options";
        description = "A modern command-line parser for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -118148,7 +117819,6 @@ self: {
        homepage = "https://github.com/maciej-bendkowski/lambda-sampler";
        description = "Boltzmann sampler utilities for lambda calculus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-toolbox" = callPackage
@@ -118709,7 +118379,6 @@ self: {
        homepage = "http://github.com/NorfairKing/lambdatex";
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdatwit" = callPackage
@@ -119590,7 +119259,6 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-puppet_1_3_9" = callPackage
@@ -119653,7 +119321,6 @@ self: {
        homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python-colour" = callPackage
@@ -119685,7 +119352,6 @@ self: {
        homepage = "http://github.com/bjpop/language-python-test";
        description = "testing code for the language-python library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-qux" = callPackage
@@ -119879,7 +119545,6 @@ self: {
        homepage = "https://github.com/factisresearch/large-hashable";
        description = "Efficiently hash (large) Haskell values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "largeword" = callPackage
@@ -120855,7 +120520,6 @@ self: {
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {bin-package-db = null;};
 
@@ -121228,7 +120892,6 @@ self: {
        ];
        description = "Computing lenses generically using generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-text-encoding" = callPackage
@@ -121349,7 +121012,6 @@ self: {
        homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lenz" = callPackage
@@ -121361,7 +121023,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols transformers ];
        description = "Van Laarhoven lenses";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lenz-template" = callPackage
@@ -121883,7 +121544,6 @@ self: {
        ];
        description = "Jenkins API interface";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "liblastfm" = callPackage
@@ -122167,7 +121827,6 @@ self: {
        homepage = "https://github.com/SaneTracker/librato";
        description = "Bindings to the Librato API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libravatar" = callPackage
@@ -122198,7 +121857,6 @@ self: {
        homepage = "https://ahakki.xyz";
        description = "Use Roman Numerals as a Numeric Datatype (sort of)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libssh2" = callPackage
@@ -122292,7 +121950,6 @@ self: {
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {systemd = null;};
 
   "libtagc" = callPackage
@@ -122323,7 +121980,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/libvirt-hs";
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libvirt;};
 
   "libvorbis" = callPackage
@@ -122336,7 +121992,6 @@ self: {
        homepage = "https://github.com/the-real-blackh/libvorbis";
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libxls" = callPackage
@@ -122422,7 +122077,6 @@ self: {
        executableSystemDepends = [ nvpair zfs ];
        description = "Bindings to libzfs, for dealing with the Z File System and Zpools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {nvpair = null; inherit (pkgs) zfs;};
 
   "licensor" = callPackage
@@ -122721,7 +122375,6 @@ self: {
        libraryHaskellDepends = [ base NumInstances vector ];
        description = "Low-dimensional matrices and vectors for graphics and physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linda" = callPackage
@@ -123073,7 +122726,6 @@ self: {
        homepage = "https://github.com/leftaroundabout/linearmap-family";
        description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linearscan" = callPackage
@@ -123122,7 +122774,6 @@ self: {
        homepage = "http://ariis.it/static/articles/linebreak/page.html";
        description = "breaks strings to fit width";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linguistic-ordinals" = callPackage
@@ -123247,7 +122898,6 @@ self: {
        homepage = "https://github.com/hlian/linklater";
        description = "A Haskell library for the Slack API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linode" = callPackage
@@ -123270,7 +122920,6 @@ self: {
        homepage = "http://github.com/Helkafen/haskell-linode#readme";
        description = "Bindings to the Linode API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linode-v4" = callPackage
@@ -123653,6 +123302,7 @@ self: {
        homepage = "https://github.com/ucsd-progsys/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) z3;};
 
   "liquidhaskell-cabal" = callPackage
@@ -123908,7 +123558,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t-libcurl";
        description = "A \"libcurl\"-based streaming HTTP client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-text" = callPackage
@@ -123962,7 +123611,6 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/list-tries/";
        description = "Tries and Patricia tries: finite sets and maps for list keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-zip-def" = callPackage
@@ -124073,7 +123721,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer";
        description = "Live coding of MIDI music";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "liveplot" = callPackage
@@ -124412,7 +124059,6 @@ self: {
        homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {llvm-config = null;};
 
   "llvm-hs-pure" = callPackage
@@ -124778,7 +124424,6 @@ self: {
        homepage = "https://github.com/MailOnline/located-monad-logger#readme";
        description = "Location-aware logging without Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "locators" = callPackage
@@ -124850,7 +124495,6 @@ self: {
        homepage = "https://github.com/trskop/lock-file";
        description = "Provide exclusive access to a resource using lock file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "locked-poll" = callPackage
@@ -125027,7 +124671,6 @@ self: {
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution (Elasticsearch back end)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-postgres" = callPackage
@@ -125104,7 +124747,6 @@ self: {
        homepage = "https://github.com/serokell/log-warper";
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log2json" = callPackage
@@ -125264,7 +124906,6 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade-syslog" = callPackage
@@ -125382,7 +125023,6 @@ self: {
        homepage = "https://github.com/sol/logsink#readme";
        description = "A logging framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lojban" = callPackage
@@ -125529,6 +125169,7 @@ self: {
        homepage = "https://github.com/cpeikert/Lol";
        description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lol-calculus" = callPackage
@@ -125570,6 +125211,7 @@ self: {
        homepage = "https://github.com/cpeikert/Lol";
        description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lol-repa" = callPackage
@@ -125590,6 +125232,7 @@ self: {
        homepage = "https://github.com/cpeikert/Lol";
        description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lol-tests" = callPackage
@@ -125610,6 +125253,7 @@ self: {
        homepage = "https://github.com/cpeikert/Lol";
        description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lol-typing" = callPackage
@@ -125913,7 +125557,6 @@ self: {
        ];
        description = "An EDSL for diagrams based based on linear constraints";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lp-diagrams-svg" = callPackage
@@ -126075,7 +125718,6 @@ self: {
        ];
        description = "Parameterized file evaluator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ltiv1p1" = callPackage
@@ -126096,7 +125738,6 @@ self: {
        homepage = "https://github.com/achirkin/qua-kit";
        description = "Partial implementation of a service provider for LTI 1.1.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ltk" = callPackage
@@ -126137,6 +125778,8 @@ self: {
        pname = "lua-bc";
        version = "0.1.1";
        sha256 = "0bp0j181j2zr2xw6mpj4f17998bmh6qs0y7xbimxz4nh7bf8chba";
+       revision = "1";
+       editedCabalFile = "1bp54qza0pncf4r8dwavxqls2zfvcxavpsvj7sxr52yiz8nisink";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 pretty text
          vector
@@ -126606,7 +126249,6 @@ self: {
        homepage = "http://github.com/alphaHeavy/lzma-conduit";
        description = "Conduit interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) lzma;};
 
   "lzma-enumerator" = callPackage
@@ -126757,7 +126399,6 @@ 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
@@ -127030,7 +126671,6 @@ self: {
        homepage = "https://github.com/vmchale/madlang#readme";
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mage" = callPackage
@@ -127943,7 +127583,6 @@ self: {
        ];
        description = "Syntax sugar for defining maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mappy" = callPackage
@@ -128046,7 +127685,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-unlit" = callPackage
@@ -128160,7 +127798,6 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -128301,7 +127938,6 @@ self: {
        homepage = "https://marvin.readthedocs.io";
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marvin-interpolate" = callPackage
@@ -128342,7 +127978,6 @@ self: {
        ];
        description = "Markup language preprocessor for Haskell";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -128475,6 +128110,26 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "mathflow" = callPackage
+    ({ mkDerivation, base, doctest, hspec, hspec-server, process
+     , QuickCheck, shakespeare, singletons, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "mathflow";
+       version = "0.1.0.0";
+       sha256 = "175r5h1g5dxh1xaxnmy0l0m91433prvd6d32r6pqn9alf6jlm4fd";
+       libraryHaskellDepends = [
+         base process singletons template-haskell
+       ];
+       testHaskellDepends = [
+         base doctest hspec hspec-server QuickCheck shakespeare singletons
+         template-haskell text
+       ];
+       homepage = "https://github.com/junjihashimoto/mathflow#readme";
+       description = "Dependently typed tensorflow modeler";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mathgenealogy" = callPackage
     ({ mkDerivation, base, binary, bytestring, cmdargs, containers
      , directory, fgl, filepath, graphviz, HTTP, process, safe, tagsoup
@@ -129315,7 +128970,6 @@ self: {
        homepage = "https://github.com/sheyll/mediabus";
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "mediabus-fdk-aac" = callPackage
@@ -129383,7 +129037,6 @@ self: {
        homepage = "https://github.com/sheyll/mediabus-rtp";
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "median-stream" = callPackage
@@ -129500,7 +129153,6 @@ self: {
        homepage = "https://github.com/snoyberg/mega-sdist";
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec" = callPackage
@@ -130252,6 +129904,7 @@ self: {
        ];
        description = "Time Synchronized execution";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mezzo" = callPackage
@@ -130382,7 +130035,6 @@ self: {
        homepage = "https://github.com/myfreeweb/microformats2-parser";
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microformats2-types" = callPackage
@@ -130434,7 +130086,6 @@ self: {
        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
@@ -130688,7 +130339,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/midi-music-box";
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midi-simple" = callPackage
@@ -130839,7 +130489,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "High performance web server on WAI/warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mighty-metropolis" = callPackage
@@ -130872,7 +130521,6 @@ self: {
        homepage = "https://github.com/evanrinehart/mikmod";
        description = "MikMod bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mikrokosmos" = callPackage
@@ -130933,7 +130581,6 @@ self: {
        ];
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime" = callPackage
@@ -131527,7 +131174,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mixed-strategies" = callPackage
@@ -131769,7 +131415,6 @@ self: {
        homepage = "https://github.com/kryoxide/mnist-idx/";
        description = "Read and write IDX data that is used in e.g. the MNIST database.";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moan" = callPackage
@@ -131822,7 +131467,6 @@ self: {
        homepage = "https://github.com/roelvandijk/modbus-tcp";
        description = "Communicate with Modbus devices over TCP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "model" = callPackage
@@ -131883,7 +131527,6 @@ self: {
        homepage = "https://github.com/GregorySchwartz/modify-fasta";
        description = "Modify fasta (and CLIP) files in several optional ways";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modsplit" = callPackage
@@ -132060,7 +131703,6 @@ self: {
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mohws" = callPackage
@@ -132224,7 +131866,6 @@ self: {
        homepage = "https://github.com/strake/monad-classes.hs";
        description = "more flexible mtl";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-classes-logging" = callPackage
@@ -132244,7 +131885,6 @@ self: {
        homepage = "https://github.com/edwardgeorge/monad-classes-logging#readme";
        description = "monad-classes based typeclass for Ollie's logging-effect LoggingT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-codec" = callPackage
@@ -132257,6 +131897,7 @@ self: {
        homepage = "https://github.com/kawu/monad-codec";
        description = "Monadic conversion between complex data structures and unique integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-connect" = callPackage
@@ -132845,7 +132486,6 @@ self: {
        homepage = "https://github.com/mnacamura/monad-parallel-progressbar";
        description = "Parallel execution of monadic computations with a progress bar";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-param" = callPackage
@@ -132985,7 +132625,6 @@ self: {
        homepage = "http://github.com/ekmett/monad-st";
        description = "Provides a MonadST class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-state" = callPackage
@@ -133561,7 +133200,6 @@ self: {
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongodb-queue" = callPackage
@@ -134433,7 +134071,6 @@ self: {
        homepage = "https://github.com/lpeterse/haskell-mqtt";
        description = "An MQTT protocol implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mqtt-hs" = callPackage
@@ -134451,7 +134088,6 @@ self: {
        homepage = "http://github.com/k00mi/mqtt-hs";
        description = "A MQTT client library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mrifk" = callPackage
@@ -135041,6 +134677,7 @@ self: {
        homepage = "http://github.com/micxjo/hs-multiaddr";
        description = "A network address format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiarg" = callPackage
@@ -135079,7 +134716,6 @@ self: {
        homepage = "xy30.com";
        description = "create many files from one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multifocal" = callPackage
@@ -135864,7 +135500,6 @@ self: {
        homepage = "https://github.com/JustusAdam/mustache";
        description = "A mustache template parser library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mustache-haskell" = callPackage
@@ -136295,7 +135930,6 @@ self: {
        homepage = "https://github.com/winterland1989/mysql-haskell";
        description = "pure haskell MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-haskell_0_8_1_0" = callPackage
@@ -136337,7 +135971,6 @@ self: {
        homepage = "https://github.com/lorenzo/mysql-haskell-nem#readme";
        description = "Adds a interface like mysql-simple to mysql-haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-haskell-openssl" = callPackage
@@ -136375,7 +136008,6 @@ self: {
        homepage = "https://github.com/paul-rouse/mysql-simple";
        description = "A mid-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-simple-quasi" = callPackage
@@ -136453,7 +136085,6 @@ self: {
        ];
        description = "Web application to view and kill MySQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mzv" = callPackage
@@ -136481,7 +136112,6 @@ self: {
        executableHaskellDepends = [ base HSH mtl process ];
        description = "Utility to call iwconfig";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "n-tuple" = callPackage
@@ -137279,8 +136909,8 @@ self: {
      }:
      mkDerivation {
        pname = "neko-obfs";
-       version = "0.1.0.1";
-       sha256 = "1fv15fsdhy3crny3w7k944fsnpjv3vhkdvnj9s1dj64a1pnysi0b";
+       version = "0.1.0.2";
+       sha256 = "1kqki738d7jfjgr0jcybs9w0fzccmdb1i64caanydpfn6x9rkiac";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -137804,7 +137434,6 @@ self: {
        homepage = "https://github.com/esoeylemez/netwire";
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netwire-input" = callPackage
@@ -137817,7 +137446,6 @@ self: {
        homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netwire-input-glfw" = callPackage
@@ -137835,7 +137463,6 @@ self: {
        homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
        description = "GLFW instance of netwire-input";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netwire-input-javascript" = callPackage
@@ -138105,7 +137732,6 @@ self: {
        homepage = "http://github.com/ocharles/network-carbon";
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-conduit" = callPackage
@@ -138394,7 +138020,6 @@ self: {
        homepage = "http://msgpack.org/";
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-multicast" = callPackage
@@ -138780,6 +138405,7 @@ self: {
        homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-uri" = callPackage
@@ -138872,7 +138498,6 @@ self: {
        ];
        description = "Networked-game support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neural" = callPackage
@@ -139060,7 +138685,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtype-th" = callPackage
@@ -139388,7 +139012,6 @@ self: {
        homepage = "http://chriswarbo.net/git/nix-eval";
        description = "Evaluate Haskell expressions using Nix to get packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-paths" = callPackage
@@ -139917,7 +139540,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Free structures sans laws";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nonlinear-optimization" = callPackage
@@ -139929,6 +139551,7 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Various iterative algorithms for optimization of nonlinear functions";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nonlinear-optimization-ad" = callPackage
@@ -139948,6 +139571,7 @@ self: {
        homepage = "https://github.com/msakai/nonlinear-optimization-ad";
        description = "Wrapper of nonlinear-optimization package for using with AD package";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "noodle" = callPackage
@@ -139998,7 +139622,6 @@ self: {
        homepage = "https://github.com/ppelleti/normalization-insensitive";
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "normalize-imports" = callPackage
@@ -140151,7 +139774,6 @@ self: {
        homepage = "https://github.com/NICTA/notzero";
        description = "A data type for representing numeric values, except zero";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "np-extras" = callPackage
@@ -140448,7 +140070,6 @@ self: {
        homepage = "https://github.com/roelvandijk/numerals";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numerals-base" = callPackage
@@ -140804,7 +140425,6 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs_0_2_4" = callPackage
@@ -140867,7 +140487,6 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-ghcid" = callPackage
@@ -140885,7 +140504,6 @@ 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
@@ -141065,6 +140683,7 @@ self: {
        homepage = "https://github.com/jwaldmann/haskell-obdd";
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oberon0" = callPackage
@@ -141188,7 +140807,6 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "octane_0_20_1" = callPackage
@@ -141682,7 +141300,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "one-time-password" = callPackage
@@ -142011,7 +141628,6 @@ self: {
        homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-union" = callPackage
@@ -142027,7 +141643,6 @@ self: {
        homepage = "https://github.com/bfopa/open-union";
        description = "Extensible, type-safe unions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-witness" = callPackage
@@ -142046,7 +141661,6 @@ self: {
        homepage = "https://github.com/AshleyYakeley/open-witness";
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-witness_0_4_0_1" = callPackage
@@ -142078,6 +141692,7 @@ self: {
        homepage = "https://github.com/hansroland/opench";
        description = "A Haskell implementation of the Swiss Meteo Net data API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opencog-atomspace" = callPackage
@@ -142315,7 +141930,6 @@ self: {
        homepage = "http://github.com/elliottt/hsopenid";
        description = "An implementation of the OpenID-2.0 spec.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openpgp" = callPackage
@@ -142482,7 +142096,6 @@ self: {
        libraryHaskellDepends = [ base directory HsOpenSSL time unix ];
        description = "Create OpenSSL keypairs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openssl-streams" = callPackage
@@ -142502,7 +142115,6 @@ self: {
        ];
        description = "OpenSSL network support for io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opentheory" = callPackage
@@ -142796,7 +142408,6 @@ self: {
        homepage = "https://github.com/emilaxelsson/operational-alacarte";
        description = "A version of Operational suitable for extensible EDSLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "operational-class" = callPackage
@@ -143413,7 +143024,6 @@ self: {
        ];
        description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orgstat" = callPackage
@@ -143490,6 +143100,7 @@ self: {
        homepage = "https://github.com/luminescent-dreams/orizentic#readme";
        description = "Token-based authentication and authorization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "os-release" = callPackage
@@ -143536,6 +143147,7 @@ self: {
        libraryHaskellDepends = [ base colour gloss random ];
        description = "Implements an osculatory packing (kissing circles) algorithm and display";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "osdkeys" = callPackage
@@ -143681,6 +143293,7 @@ self: {
        homepage = "https://github.com/mstksg/otp-authenticator";
        description = "OTP Authenticator (a la google) command line client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ottparse-pretty" = callPackage
@@ -143689,6 +143302,8 @@ self: {
        pname = "ottparse-pretty";
        version = "0.1.2.6";
        sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5";
+       revision = "1";
+       editedCabalFile = "0c6m005ddrdmh8yrnhar5ams2clcbgdmhfrnlvvyppgqprvb3z9z";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143958,7 +143573,6 @@ self: {
        homepage = "https://github.com/hvr/packunused";
        description = "Tool for detecting redundant Cabal package dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pacman-memcache" = callPackage
@@ -144326,7 +143940,6 @@ self: {
        homepage = "https://github.com/baig/pandoc-csv2table-filter";
        description = "Convert CSV to Pandoc Table Markdown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-filter-graphviz" = callPackage
@@ -144419,7 +144032,6 @@ self: {
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-placetable" = callPackage
@@ -144680,7 +144292,6 @@ self: {
        homepage = "https://github.com/data61/papa";
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "papa-base" = callPackage
@@ -144924,7 +144535,6 @@ self: {
        homepage = "https://github.com/data61/papa-prelude";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "papa-prelude-core" = callPackage
@@ -144977,7 +144587,6 @@ self: {
        homepage = "https://github.com/data61/papa-prelude-semigroupoids";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "papa-prelude-semigroups" = callPackage
@@ -145083,7 +144692,6 @@ self: {
        homepage = "https://skami.iocikun.jp/haskell/packages/papillon";
        description = "packrat parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "papillon_0_1_0_5" = callPackage
@@ -145144,6 +144752,7 @@ self: {
        homepage = "https://github.com/mitsuji/paprika#readme";
        description = "The Haskell library and examples for the kids programming robot paprika";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "para" = callPackage
@@ -145470,7 +145079,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf parsec ];
        description = "Some miscellaneous basic string parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsec-free" = callPackage
@@ -145911,7 +145519,6 @@ self: {
        homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-lens" = callPackage
@@ -145946,7 +145553,6 @@ self: {
        homepage = "https://github.com/mtesseract/haskell-partial-order";
        description = "Provides typeclass suitable for types admitting a partial order";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-uri" = callPackage
@@ -146749,7 +146355,6 @@ self: {
        homepage = "https://github.com/NCrashed/pdf-slave#readme";
        description = "Tool to generate PDF from haskintex templates and YAML input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-slave-server" = callPackage
@@ -146801,7 +146406,6 @@ self: {
        homepage = "https://github.com/ncrashed/pdf-slave#readme";
        description = "Template format definition for pdf-slave tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-content" = callPackage
@@ -146991,7 +146595,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Peano numbers";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peano-inf" = callPackage
@@ -147364,7 +146967,6 @@ self: {
        homepage = "https://github.com/w3rs/period";
        description = "Parse and format date periods, collapse and expand their text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "periodic" = callPackage
@@ -147538,7 +147140,6 @@ self: {
        ];
        description = "Parses a Persist Model file and produces Audit Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-cereal" = callPackage
@@ -147667,7 +147268,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql" = callPackage
@@ -147687,7 +147287,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql-haskell" = callPackage
@@ -147715,6 +147314,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "persistent-mysql-haskell_0_3_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , io-streams, monad-control, monad-logger, mysql-haskell, network
+     , persistent, persistent-template, resource-pool, resourcet, text
+     , time, tls, transformers
+     }:
+     mkDerivation {
+       pname = "persistent-mysql-haskell";
+       version = "0.3.3";
+       sha256 = "1dvdz1l5kpliy9h3l11vlrx9yis7a1a54fnj2c764pg6s5kp8rjq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers io-streams monad-control
+         monad-logger mysql-haskell network persistent resource-pool
+         resourcet text time tls transformers
+       ];
+       executableHaskellDepends = [
+         base monad-logger persistent persistent-template transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "A pure haskell backend for the persistent library using MySQL database server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-odbc" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , convertible, HDBC, HDBC-odbc, monad-control, monad-logger
@@ -147747,7 +147372,6 @@ self: {
        testHaskellDepends = [ attoparsec base hspec text ];
        description = "Parse persistent model files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-postgresql" = callPackage
@@ -147799,7 +147423,6 @@ self: {
        homepage = "https://github.com/jprider63/persistent-ratelimit";
        description = "A library for rate limiting activities with a persistent backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-redis" = callPackage
@@ -147862,6 +147485,7 @@ self: {
        homepage = "http://github.com/himura/persistent-relational-record";
        description = "relational-record on persisten backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-sqlite" = callPackage
@@ -148239,7 +147863,6 @@ self: {
        ];
        description = "browse directory listing webpages and download files from them";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgm" = callPackage
@@ -149039,7 +148662,6 @@ self: {
        homepage = "https://github.com/jwiegley/pipes-async";
        description = "A higher-level interface to using concurrency with pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-attoparsec" = callPackage
@@ -149194,7 +148816,6 @@ self: {
        homepage = "https://github.com/centromere/pipes-cacophony#readme";
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-category" = callPackage
@@ -149566,7 +149187,6 @@ self: {
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-io" = callPackage
@@ -150024,7 +149644,6 @@ self: {
        homepage = "https://github.com/peddie/pipes-zeromq4";
        description = "Pipes integration for ZeroMQ messaging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-zlib" = callPackage
@@ -150374,7 +149993,6 @@ self: {
        homepage = "https://github.com/pjones/playlists";
        description = "Library and executable for working with playlist files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "playlists-http" = callPackage
@@ -150510,7 +150128,6 @@ self: {
        homepage = "https://github.com/sumitsahrawat/plot-gtk-ui";
        description = "A quick way to use Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot-gtk3" = callPackage
@@ -150693,7 +150310,6 @@ self: {
        homepage = "http://hub.darcs.net/stepcut/plugins";
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plugins-auto" = callPackage
@@ -150761,7 +150377,6 @@ self: {
        executableHaskellDepends = [ base bytestring linear vector ];
        description = "PLY file loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "png-file" = callPackage
@@ -151068,7 +150683,6 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) poker-eval;};
 
   "pokitdok" = callPackage
@@ -151183,7 +150797,6 @@ self: {
        libraryHaskellDepends = [ base constraints ];
        description = "Tools for working with functions of undetermined arity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "poly-control" = callPackage
@@ -151335,7 +150948,6 @@ self: {
        homepage = "https://github.com/kawu/polysoup";
        description = "Online XML parsing with polyparse and tagsoup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polytypeable" = callPackage
@@ -151509,7 +151121,6 @@ self: {
        homepage = "https://github.com/pontarius/pontarius-xmpp/";
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pontarius-xpmn" = callPackage
@@ -151795,7 +151406,6 @@ self: {
        homepage = "https://github.com/tensor5/posix-acl";
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) acl;};
 
   "posix-error-codes" = callPackage
@@ -152168,7 +151778,6 @@ self: {
        homepage = "https://github.com/mfine/postgresql-schema";
        description = "PostgreSQL Schema Management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple" = callPackage
@@ -152213,7 +151822,6 @@ self: {
        ];
        description = "FFI-like bindings for PostgreSQL stored functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-migration" = callPackage
@@ -152283,7 +151891,6 @@ self: {
        homepage = "https://github.com/jfischoff/postgresql-simple-opts#readme";
        description = "An optparse-applicative parser for postgresql-simple's connection options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-queue" = callPackage
@@ -152621,7 +152228,6 @@ self: {
        homepage = "http://github.com/peti/postmaster";
        description = "Postmaster ESMTP Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "potato-tool" = callPackage
@@ -152667,7 +152273,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Potrace bindings for the diagrams library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "powermate" = callPackage
@@ -152683,7 +152288,6 @@ self: {
        homepage = "https://github.com/ppelleti/powermate";
        description = "bindings for Griffin PowerMate USB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "powerpc" = callPackage
@@ -152804,7 +152408,6 @@ self: {
        homepage = "https://github.com/gdevanla/pptable#readme";
        description = "Pretty Print containers in a tabular format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqc" = callPackage
@@ -153142,7 +152745,6 @@ self: {
        homepage = "https://github.com/jxv/pregame";
        description = "Prelude for applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "preliminaries" = callPackage
@@ -153165,7 +152767,6 @@ self: {
        homepage = "http://github.com/kerscher/preliminaries";
        description = "A larger alternative to the Prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-compat" = callPackage
@@ -153342,7 +152943,6 @@ self: {
        homepage = "https://github.com/chrisdone/present";
        description = "Make presentations for data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "press" = callPackage
@@ -153460,7 +153060,6 @@ self: {
        homepage = "https://github.com/jml/pretty-error";
        description = "Pretty error messages for runtime invariants";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-hex" = callPackage
@@ -153525,7 +153124,6 @@ self: {
        homepage = "https://github.com/cdepillabout/pretty-simple";
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-sop" = callPackage
@@ -153662,6 +153260,8 @@ self: {
        pname = "prettyprinter-ansi-terminal";
        version = "1.1.1.1";
        sha256 = "1d3sr74c0bd1nzp0cy4ip6mk85cp1v8svh6yhggsd89r0wzkb6nl";
+       revision = "1";
+       editedCabalFile = "1giafm5d5yjdkm7fxf208a4scsa2z1sh73zwvfrycgrhqp746brf";
        libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
        testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/quchen/prettyprinter";
@@ -153732,6 +153332,7 @@ self: {
        homepage = "http://github.com/quchen/prettyprinter";
        description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettyprinter-vty" = callPackage
@@ -153918,7 +153519,6 @@ self: {
        homepage = "https://github.com/andrewthad/pringletons";
        description = "Classes and data structures complementing the singletons library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "print-debugger" = callPackage
@@ -155067,7 +154667,6 @@ self: {
        executableHaskellDepends = [ base bytestring filepath ];
        description = "Simple audio library for Windows, Linux, OSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libpulseaudio;};
 
   "proto-lens" = callPackage
@@ -155086,7 +154685,6 @@ self: {
        homepage = "https://github.com/google/proto-lens";
        description = "A lens-based implementation of protocol buffers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens_0_2_2_0" = callPackage
@@ -155122,7 +154720,6 @@ self: {
        homepage = "https://github.com/google/proto-lens";
        description = "Arbitrary instances for proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-arbitrary_0_1_1_1" = callPackage
@@ -155235,7 +154832,6 @@ self: {
        homepage = "https://github.com/google/proto-lens";
        description = "Adapting proto-lens to optparse-applicative ReadMs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-optparse_0_1_0_4" = callPackage
@@ -155308,10 +154904,9 @@ self: {
        ];
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "proto-lens-protoc_0_2_2_2" = callPackage
+  "proto-lens-protoc_0_2_2_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, directory, filepath, haskell-src-exts
      , lens-family, lens-labels, process, proto-lens
@@ -155319,8 +154914,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.2.2.2";
-       sha256 = "1hkx0yqj4jfmq0b3pqwy9jadipazsfcb9fncxqkm9z57a5qa8khn";
+       version = "0.2.2.3";
+       sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155748,7 +155343,6 @@ self: {
        ];
        description = "Pipe stdin to a redis pub/sub channel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffix" = callPackage
@@ -155923,7 +155517,6 @@ self: {
        homepage = "https://github.com/philopon/pugixml-hs";
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugs-DrIFT" = callPackage
@@ -156108,7 +155701,6 @@ self: {
        homepage = "https://github.com/bosu/pure-cdb";
        description = "Another pure-haskell CDB (Constant Database) implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pure-fft" = callPackage
@@ -156272,6 +155864,7 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -156328,6 +155921,7 @@ self: {
        homepage = "https://github.com/soupi/pursuit-client";
        description = "A cli client for pursuit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "push-notify" = callPackage
@@ -156466,7 +156060,6 @@ self: {
        homepage = "https://github.com/pusher-community/pusher-http-haskell";
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-http-haskell_1_3_0_0" = callPackage
@@ -156510,7 +156103,6 @@ self: {
        homepage = "https://github.com/barrucadu/pusher-ws";
        description = "Implementation of the Pusher WebSocket protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pushme" = callPackage
@@ -156926,6 +156518,7 @@ self: {
        homepage = "https://github.com/unclechu/haskell-qm-interpolated-string";
        description = "Implementation of interpolated multiline strings";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qr-imager" = callPackage
@@ -157153,12 +156746,15 @@ self: {
      }) {};
 
   "quantification" = callPackage
-    ({ mkDerivation, aeson, base, hashable, path-pieces, text }:
+    ({ mkDerivation, aeson, base, ghc-prim, hashable, path-pieces, text
+     }:
      mkDerivation {
        pname = "quantification";
-       version = "0.1.1";
-       sha256 = "092qnimc99x1n1g0mfpgsr85fbyd33isjsd9cc8rgb1n44ryj14m";
-       libraryHaskellDepends = [ aeson base hashable path-pieces text ];
+       version = "0.1.2";
+       sha256 = "1ivxikw2fd93qsm9y3lm5bycwsq88nlfq5r1nxhi0qkrs8sdk1gs";
+       libraryHaskellDepends = [
+         aeson base ghc-prim hashable path-pieces text
+       ];
        homepage = "https://github.com/andrewthad/quantification#readme";
        description = "Data types and typeclasses to deal with universally and existentially quantified types";
        license = stdenv.lib.licenses.bsd3;
@@ -157437,7 +157033,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        description = "Simple type-level combinators for augmenting QuickCheck instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-instances" = callPackage
@@ -157659,7 +157254,6 @@ self: {
        homepage = "https://github.com/minad/quickcheck-special#readme";
        description = "Edge cases and special values for QuickCheck Arbitrary instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-state-machine" = callPackage
@@ -157747,7 +157341,6 @@ self: {
        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
@@ -157845,7 +157438,6 @@ self: {
        homepage = "https://github.com/SamuelSchlesinger/Quickterm";
        description = "An interface for describing and executing terminal applications";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quicktest" = callPackage
@@ -158063,7 +157655,6 @@ self: {
        ];
        description = "Extra instances for Quiver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quiver-interleave" = callPackage
@@ -158189,7 +157780,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A library and program to create QIF files from Rabobank CSV exports";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rad" = callPackage
@@ -158237,7 +157827,6 @@ self: {
        homepage = "https://github.com/klangner/radium";
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radium-formula-parser" = callPackage
@@ -158462,6 +158051,7 @@ self: {
        homepage = "https://github.com/ciez/raketka";
        description = "distributed-process node";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rakhana" = callPackage
@@ -158812,7 +158402,6 @@ self: {
        homepage = "https://bitbucket.org/kpratt/random-variate";
        description = "\"Uniform RNG => Non-Uniform RNGs\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "randomgen" = callPackage
@@ -159410,7 +158999,6 @@ self: {
        homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rattletrap_2_5_2" = callPackage
@@ -159621,7 +159209,6 @@ self: {
        homepage = "http://paychandoc.runeks.me/";
        description = "RESTful Bitcoin Payment Channel Protocol Servant API description";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {bitcoin-payment-protocol = null;};
 
@@ -159933,7 +159520,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana" = callPackage
@@ -160039,7 +159625,6 @@ self: {
        homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -160117,7 +159702,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana and JACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-midyim" = callPackage
@@ -160136,7 +159720,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-thread" = callPackage
@@ -160204,7 +159787,6 @@ self: {
        homepage = "https://github.com/thomaseding/read-bounded";
        description = "Class for reading bounded values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "read-editor" = callPackage
@@ -160597,7 +160179,6 @@ self: {
        ];
        description = "Record subtyping and record utilities with generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records-th" = callPackage
@@ -160635,7 +160216,6 @@ self: {
        homepage = "http://github.com/ekmett/recursion-schemes/";
        description = "Generalized bananas, lenses and barbed wire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursive-line-count" = callPackage
@@ -161043,7 +160623,6 @@ self: {
        homepage = "https://github.com/lazac/references";
        description = "Selectors for reading and updating data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "references_0_3_2_2" = callPackage
@@ -161466,7 +161045,6 @@ 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;
      }) {};
 
   "refurb" = callPackage
@@ -161495,7 +161073,6 @@ self: {
        homepage = "https://github.com/ConferHealth/refurb#readme";
        description = "Tools for maintaining a database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex" = callPackage
@@ -161517,7 +161094,6 @@ self: {
        homepage = "http://regex.uk";
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-applicative" = callPackage
@@ -161691,7 +161267,6 @@ self: {
        homepage = "http://regex.uk";
        description = "Tutorial, tests and example programs for regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-genex" = callPackage
@@ -161978,7 +161553,6 @@ self: {
        homepage = "http://regex.uk";
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-xmlschema" = callPackage
@@ -162018,7 +161592,6 @@ self: {
        homepage = "http://functionalley.eu/RegExChar/regExChar.html";
        description = "A POSIX, extended regex-engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexdot" = callPackage
@@ -162035,7 +161608,6 @@ self: {
        homepage = "http://functionalley.eu/RegExDot/regExDot.html";
        description = "A polymorphic, POSIX, extended regex-engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexp-tries" = callPackage
@@ -162307,7 +161879,6 @@ self: {
        homepage = "https://github.com/kerkomen/rei";
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reified-records" = callPackage
@@ -162354,7 +161925,6 @@ self: {
        homepage = "https://github.com/nh2/reinterpret-cast";
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relacion" = callPackage
@@ -162386,7 +161956,6 @@ self: {
        homepage = "https://github.com/iostat/relapse#readme";
        description = "Sensible RLP encoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relation" = callPackage
@@ -162418,6 +161987,7 @@ self: {
        homepage = "https://github.com/yuga/haskell-relational-record-driver-postgresql8";
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query" = callPackage
@@ -162502,7 +162072,6 @@ self: {
        ];
        description = "Examples of Haskell Relationa Record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-schemas" = callPackage
@@ -162872,6 +162441,7 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-array" = callPackage
@@ -162988,7 +162558,6 @@ self: {
        ];
        description = "Perform fft with repa via FFTW";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-flow" = callPackage
@@ -163025,6 +162594,7 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Read and write Repa arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-linear-algebra" = callPackage
@@ -163105,7 +162675,6 @@ self: {
        ];
        description = "Reading and writing sound files with repa arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-stream" = callPackage
@@ -163373,28 +162942,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "req_0_3_1" = callPackage
+  "req_0_4_0" = callPackage
     ({ 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, retry, text, time, transformers
-     , unordered-containers
+     , http-types, monad-control, mtl, QuickCheck, retry, text, time
+     , transformers, transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "req";
-       version = "0.3.1";
-       sha256 = "0qg2773h247ahicz1051zrpc6aqf6zdqyrlp8q274l3qg5q1l03a";
+       version = "0.4.0";
+       sha256 = "1ahs0ig9xi2i6470q6vdc011pk2l0sp39jr1n3f9a0mp5l0m7n0s";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
-         http-client http-client-tls http-types mtl retry text time
-         transformers
+         http-client http-client-tls http-types monad-control mtl retry text
+         time transformers transformers-base
        ];
        testHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
-         data-default-class hspec hspec-core http-client http-types mtl
-         QuickCheck retry text time unordered-containers
+         data-default-class hspec hspec-core http-client http-types
+         monad-control mtl QuickCheck retry text time unordered-containers
        ];
        homepage = "https://github.com/mrkkrp/req";
        description = "Easy-to-use, type-safe, expandable, high-level HTTP library";
@@ -163436,6 +163005,8 @@ self: {
        pname = "req-conduit";
        version = "0.2.1";
        sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c";
+       revision = "1";
+       editedCabalFile = "0pz1pz7l06c6g0d6ripgb8yn5kz5zryzjhabnx93d89qix0dzkg3";
        libraryHaskellDepends = [
          base bytestring conduit http-client req resourcet transformers
        ];
@@ -163493,7 +163064,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/rerebase";
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rerebase_1_1" = callPackage
@@ -164623,6 +164193,7 @@ self: {
        homepage = "http://github.com/bgamari/ring-buffer";
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riot" = callPackage
@@ -164856,7 +164427,6 @@ self: {
        homepage = "https://github.com/grwlf/rl";
        description = "Collection of Reinforcement Learning algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rlglue" = callPackage
@@ -165046,6 +164616,7 @@ self: {
        homepage = "https://github.com/hexresearch/roc-cluster#readme";
        description = "ROC online clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roc-cluster-demo" = callPackage
@@ -165064,6 +164635,7 @@ self: {
        homepage = "https://github.com/ncrashed/roc-cluster-demo#readme";
        description = "Gloss interactive demo for roc-cluster package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rocksdb-haskell" = callPackage
@@ -165086,7 +164658,6 @@ self: {
        homepage = "http://github.com/serokell/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage
@@ -165178,7 +164749,6 @@ self: {
        homepage = "https://github.com/azara/rollbar-haskell";
        description = "error tracking through rollbar.com";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roller" = callPackage
@@ -165529,7 +165099,6 @@ self: {
        ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-aeson" = callPackage
@@ -165563,7 +165132,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -165791,7 +165359,6 @@ self: {
        homepage = "https://github.com/basvandijk/rss";
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rss-conduit" = callPackage
@@ -165873,7 +165440,6 @@ self: {
        homepage = "http://github.com/swift-nav/librtcm";
        description = "RTCM Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtld" = callPackage
@@ -165921,7 +165487,6 @@ self: {
        homepage = "https://gitlab.com/formaltech/rtnetlink-hs";
        description = "Manipulate network devices, addresses, and routes on Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtorrent-rpc" = callPackage
@@ -166001,7 +165566,7 @@ self: {
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -166021,7 +165586,6 @@ self: {
        homepage = "https://github.com/filib/ruby-marshal";
        description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ruby-qq" = callPackage
@@ -166052,7 +165616,6 @@ self: {
        homepage = "http://code.mathr.co.uk/ruff";
        description = "relatively useful fractal functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ruin" = callPackage
@@ -166254,7 +165817,6 @@ self: {
        homepage = "https://github.com/aisamanra/s-cargot";
        description = "A flexible, extensible s-expression library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "s-expression" = callPackage
@@ -166311,7 +165873,6 @@ self: {
        homepage = "http://darcs.redspline.com/safe-access";
        description = "A simple environment to control access to data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-exceptions" = callPackage
@@ -166451,7 +166012,6 @@ self: {
        homepage = "https://github.com/k0001/safe-money";
        description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-plugins" = callPackage
@@ -167291,7 +166851,6 @@ self: {
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbp2udp" = callPackage
@@ -167312,7 +166871,6 @@ self: {
        ];
        description = "SBP to UDP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbv" = callPackage
@@ -167554,6 +167112,7 @@ self: {
        homepage = "https://github.com/redelmann/scat";
        description = "Generates unique passwords for various websites from a single password";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scc" = callPackage
@@ -168543,7 +168102,6 @@ self: {
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
        description = "Render with Cairo on SDL textures. Includes optional convenience drawing API.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sdl2-cairo-image" = callPackage
@@ -168623,7 +168181,6 @@ self: {
        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;};
 
   "sdl2-mixer" = callPackage
@@ -168931,7 +168488,6 @@ self: {
        homepage = "http://github.com/haskoin/secp256k1-haskell#readme";
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secret-santa" = callPackage
@@ -169005,7 +168561,6 @@ self: {
        homepage = "http://code.google.com/p/secure-hs/";
        description = "Secure point-to-point connectivity library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secureUDP" = callPackage
@@ -169690,7 +169245,6 @@ self: {
        homepage = "https://github.com/qfpl/separated";
        description = "A data type with elements separated by values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqaid" = callPackage
@@ -169728,7 +169282,6 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqid_0_1_0" = callPackage
@@ -169777,6 +169330,7 @@ self: {
        homepage = "https://github.com/LukeHoersten/seqid-streams";
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqloc" = callPackage
@@ -170043,7 +169597,6 @@ 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
@@ -170348,6 +169901,7 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -170368,6 +169922,7 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-swagger/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -170386,7 +169941,6 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-acid" = callPackage
@@ -170427,7 +169981,6 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token-api#readme";
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
@@ -170626,6 +170179,7 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Servant types for defining API with relational DBs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-db-postgresql" = callPackage
@@ -170685,7 +170239,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "servant-docs_0_11" = callPackage
@@ -170764,6 +170317,7 @@ self: {
        ];
        description = "Helpers for using ekg with servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-elm" = callPackage
@@ -170881,7 +170435,6 @@ self: {
        homepage = "https://github.com/tsani/servant-github-webhook";
        description = "Servant combinators to facilitate writing GitHub webhooks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -171029,7 +170582,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-multipart" = callPackage
@@ -171056,7 +170608,6 @@ self: {
        homepage = "https://github.com/haskell-servant/servant-multipart#readme";
        description = "multipart/form-data (e.g file upload) support for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-named" = callPackage
@@ -171167,7 +170718,6 @@ self: {
        homepage = "https://github.com/eskimor/servant-purescript#readme";
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pushbullet-client" = callPackage
@@ -171488,7 +171038,6 @@ self: {
        homepage = "http://github.com/eskimor/servant-subscriber#readme";
        description = "When REST is not enough ...";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-subscriber_0_6_0_1" = callPackage
@@ -171673,7 +171222,6 @@ self: {
        homepage = "https://github.com/martyall/servant-zeppelin#readme";
        description = "Swagger instances for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "server-generic" = callPackage
@@ -171762,7 +171310,6 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-backend-redis" = callPackage
@@ -171785,7 +171332,6 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-frontend-snap" = callPackage
@@ -172024,7 +171570,6 @@ self: {
        homepage = "http://bitbucket.org/robertmassaioli/setdown";
        description = "Treating files as sets to perform rapid set manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setenv" = callPackage
@@ -172082,7 +171627,6 @@ self: {
        ];
        description = "A Haskell implementation of setoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setops" = callPackage
@@ -172204,7 +171748,6 @@ self: {
        homepage = "https://github.com/esmolanka/sexp-grammar";
        description = "Invertible parsers for S-expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexp-show" = callPackage
@@ -172258,7 +171801,6 @@ self: {
        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;
      }) {};
 
   "sfml-audio" = callPackage
@@ -172591,7 +172133,6 @@ self: {
        homepage = "https://github.com/LukeHoersten/shake-pack";
        description = "Shake File Pack Rule";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-path" = callPackage
@@ -172978,6 +172519,7 @@ self: {
        homepage = "https://github.com/psibi/shell-conduit";
        description = "Write shell scripts with Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-escape" = callPackage
@@ -173055,7 +172597,6 @@ self: {
        homepage = "https://github.com/valderman/shellmate";
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shellmate-extras" = callPackage
@@ -173075,7 +172616,6 @@ self: {
        homepage = "https://github.com/valderman/shellmate";
        description = "Extra functionality for shellmate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelltestrunner" = callPackage
@@ -173132,6 +172672,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shelly_1_6_8_4" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async
+     , lifted-base, monad-control, mtl, process, system-fileio
+     , system-filepath, text, time, transformers, transformers-base
+     , unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.6.8.4";
+       sha256 = "1s69ifnamzjd121rf7k5idxzbwhc4ap8msxjhfsya04kwzjcixyj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions lifted-async lifted-base monad-control mtl process
+         system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions hspec HUnit lifted-async lifted-base monad-control mtl
+         process system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       homepage = "https://github.com/yesodweb/Shelly.hs";
+       description = "shell-like (systems) programming in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -173556,7 +173127,6 @@ self: {
        homepage = "https://github.com/mdibaiee/sibe";
        description = "Machine Learning algorithms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sieve" = callPackage
@@ -173636,7 +173206,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "sign" = callPackage
@@ -173878,7 +173447,6 @@ self: {
        homepage = "http://github.com/jwiegley/simple-conduit";
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-config" = callPackage
@@ -173950,7 +173518,6 @@ self: {
        homepage = "https://gitlab.com/LukaHorvat/simple-effects";
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-eval" = callPackage
@@ -174108,7 +173675,6 @@ self: {
        homepage = "https://github.com/agrafix/simple-logger#readme";
        description = "A very simple but efficient logging framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-logging" = callPackage
@@ -174375,7 +173941,6 @@ self: {
        homepage = "http://jakewheat.github.io/simple-sql-parser/latest";
        description = "A parser for SQL queries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-stacked-vm" = callPackage
@@ -174478,7 +174043,6 @@ self: {
        homepage = "https://github.com/dzhus/simple-vec3#readme";
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-zipper" = callPackage
@@ -174711,7 +174275,6 @@ self: {
        homepage = "http://sigkill.dk/programs/sindre";
        description = "A programming language for simple GUIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXft;};
 
   "singleton-bool" = callPackage
@@ -174889,6 +174452,7 @@ self: {
        homepage = "http://github.com/alpmestan/sitemap";
        description = "Sitemap parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sitepipe" = callPackage
@@ -174910,7 +174474,6 @@ self: {
        homepage = "https://github.com/ChrisPenner/sitepipe#readme";
        description = "A simple to understand static site generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sixfiguregroup" = callPackage
@@ -175225,7 +174788,6 @@ self: {
        homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting_0_3_3_1" = callPackage
@@ -175342,7 +174904,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bindings to the Slack RTM API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slack-notify-haskell" = callPackage
@@ -175492,7 +175053,6 @@ self: {
        homepage = "http://akc.is/sloane";
        description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slope-field" = callPackage
@@ -175848,7 +175408,6 @@ self: {
        homepage = "https://github.com/GetShopTV/smsaero";
        description = "SMSAero API and HTTP client based on servant library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smt-lib" = callPackage
@@ -176109,7 +175668,6 @@ self: {
        homepage = "https://github.com/zmthy/snap-accept";
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-app" = callPackage
@@ -176442,7 +176000,6 @@ self: {
        homepage = "http://snapframework.com/";
        description = "A web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-templates" = callPackage
@@ -176465,7 +176022,6 @@ self: {
        homepage = "http://snapframework.com/";
        description = "Scaffolding CLI for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-testing" = callPackage
@@ -177700,7 +177256,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using openssl bindings)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-tls" = callPackage
@@ -177794,7 +177349,6 @@ self: {
        ];
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-sctp" = callPackage
@@ -177827,7 +177381,6 @@ self: {
        homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme";
        description = "Unix domain sockets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socketed" = callPackage
@@ -177993,7 +177546,6 @@ self: {
        homepage = "https://github.com/chpatrick/solga";
        description = "Swagger generation for Solga";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "solr" = callPackage
@@ -178165,7 +177717,6 @@ self: {
        ];
        description = "Approximate a song from other pieces of sound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sounddelay" = callPackage
@@ -179089,7 +178640,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/split-record/";
        description = "Split a big audio file into pieces at positions of silence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "split-tchan" = callPackage
@@ -179341,7 +178891,6 @@ self: {
        ];
        description = "Web interface to sproxy database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sproxy2" = callPackage
@@ -179368,7 +178917,6 @@ self: {
        ];
        description = "Secure HTTP proxy for authenticating users via OAuth2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spsa" = callPackage
@@ -179659,7 +179207,6 @@ self: {
        homepage = "http://functionalley.eu/Squeeze/squeeze.html";
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sr-extra" = callPackage
@@ -179741,6 +179288,7 @@ self: {
        ];
        description = "text UI for scanning with SANE";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sscgi" = callPackage
@@ -179974,7 +179522,6 @@ self: {
        homepage = "http://github.com/cutsea110/stable-marriage";
        description = "algorithms around stable marriage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stable-memo" = callPackage
@@ -179988,7 +179535,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stable-tree" = callPackage
@@ -180222,7 +179768,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-run" = callPackage
@@ -180304,6 +179849,7 @@ self: {
        executableHaskellDepends = [ base Cabal optparse-applicative ];
        description = "Convert stack.yaml files into Nix build instructions.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage" = callPackage
@@ -180439,7 +179985,6 @@ self: {
        homepage = "https://github.com/fpco/stackage-curator";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-install" = callPackage
@@ -180769,7 +180314,6 @@ self: {
        testHaskellDepends = [ base checkers mtl QuickCheck ];
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "state-record" = callPackage
@@ -180866,6 +180410,8 @@ self: {
        pname = "statestack";
        version = "0.2.0.5";
        sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl";
+       revision = "1";
+       editedCabalFile = "0kf1jdhdv9fiwlbn2915sg39x23lfxlyp2qb7jkrvx8p8v2sam7i";
        libraryHaskellDepends = [
          base mtl transformers transformers-compat
        ];
@@ -181175,7 +180721,6 @@ self: {
        homepage = "https://github.com/debug-ito/staversion";
        description = "What version is the package X in stackage lts-Y.ZZ?";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stb-image" = callPackage
@@ -181296,7 +180841,6 @@ self: {
        homepage = "https://github.com/schell/steeloverseer#readme";
        description = "A file watcher and development tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stego-uuid" = callPackage
@@ -181311,6 +180855,7 @@ self: {
        homepage = "https://github.com/dimitri-xyz/stego-uuid#readme";
        description = "Generator and verifier for steganographic numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stemmer" = callPackage
@@ -181610,7 +181155,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "Software Transactional Memory lifted to MonadIO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-linkedlist" = callPackage
@@ -182041,7 +181585,6 @@ self: {
        homepage = "https://github.com/fpco/store#readme";
        description = "Fast binary serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "store-core" = callPackage
@@ -182500,7 +182043,6 @@ self: {
        ];
        description = "Translate pull-based stream folds into push-based iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-histogram" = callPackage
@@ -182598,7 +182140,6 @@ self: {
        homepage = "https://github.com/michaelt/streaming-utils";
        description = "http, attoparsec, pipes and other utilities for the streaming libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-wai" = callPackage
@@ -182682,6 +182223,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/strelka";
        description = "A simple, flexible and composable web-router";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strelka-core" = callPackage
@@ -182826,7 +182368,6 @@ self: {
        homepage = "https://github.com/cartazio/strict-identity";
        description = "Strict Identity Monad, handy for writing fast code!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-io" = callPackage
@@ -182838,7 +182379,6 @@ self: {
        libraryHaskellDepends = [ base deepseq extensible-exceptions ];
        description = "A library wrapping standard IO modules to provide strict IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-writer" = callPackage
@@ -183582,7 +183122,6 @@ self: {
        ];
        description = "A generator of nix files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sub-state" = callPackage
@@ -184064,6 +183603,7 @@ self: {
        homepage = "http://github.com/ryantrinkle/superconstraints";
        description = "Access an instance's constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "superdoc" = callPackage
@@ -184097,7 +183637,6 @@ self: {
        ];
        description = "Plugin and base library to support supermonads in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supero" = callPackage
@@ -184363,7 +183902,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
        description = "Implementation of swagger data model";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swagger2" = callPackage
@@ -184393,7 +183931,6 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "swapper" = callPackage
@@ -184490,7 +184027,6 @@ self: {
        homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
        description = "A semantic web toolkit";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sws" = callPackage
@@ -184666,8 +184202,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic";
-       version = "6.3.0.20170703";
-       sha256 = "14r9jdn7pgcajdjgzgxkcn2p394wljlhfsmy6ajp9i18crhinj9y";
+       version = "6.3.0.20170807";
+       sha256 = "1w2yyy35w9k3p53x9a51hn5cfja74i6g62jcw2l1bq5cgaakfjgn";
        libraryHaskellDepends = [
          base containers mono-traversable symantic-document symantic-grammar
          text transformers
@@ -184693,8 +184229,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic-grammar";
-       version = "0.1.0.20170703";
-       sha256 = "09anbgpkh3l8mgzz0nwl65054az0026wl65vi7qmy79ncl2823yd";
+       version = "0.2.0.20170709";
+       sha256 = "0vr0j7v2l9sfw8fcfdrhdcb9imgzklmm7p8n6jh9vlshl2d9piwy";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [
          base megaparsec tasty tasty-hunit text transformers
@@ -184722,6 +184258,7 @@ self: {
        ];
        description = "Symantics for common types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "symbol" = callPackage
@@ -184752,6 +184289,7 @@ self: {
        homepage = "http://github.com/symengine/symengine.hs#readme";
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;};
 
   "symengine-hs" = callPackage
@@ -184927,7 +184465,6 @@ self: {
        homepage = "https://github.com/emilaxelsson/syntactic";
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntactical" = callPackage
@@ -185094,6 +184631,7 @@ self: {
        homepage = "https://github.com/mgajda/syntaxnet-haskell#readme";
        description = "Working with Google's SyntaxNet output files - CoNLL, Tree";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer" = callPackage
@@ -185142,7 +184680,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Control synthesizer effects via ALSA/MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-core" = callPackage
@@ -185175,7 +184712,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Low level part";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-core_0_8_1_1" = callPackage
@@ -185230,7 +184766,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing with static physical dimensions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-filter" = callPackage
@@ -185326,7 +184861,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Render audio signals from MIDI files or realtime messages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sys-auth-smbclient" = callPackage
@@ -185361,7 +184895,6 @@ self: {
        homepage = "https://github.com/NICTA/sys-process";
        description = "A replacement for System.Exit and System.Process.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sysinfo" = callPackage
@@ -185500,7 +185033,6 @@ self: {
        homepage = "https://github.com/ChaosGroup/system-info";
        description = "Get information about CPUs, memory, etc";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-inotify" = callPackage
@@ -185554,7 +185086,6 @@ self: {
        homepage = "https://github.com/erikd/system-linux-proc";
        description = "A library for accessing the /proc filesystem in Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-locale" = callPackage
@@ -186269,6 +185800,7 @@ self: {
        homepage = "http://github.com/alpmestan/taggy";
        description = "Efficient and simple HTML/XML parsing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taggy-lens" = callPackage
@@ -186288,6 +185820,7 @@ self: {
        homepage = "http://github.com/alpmestan/taggy-lens";
        description = "Lenses for the taggy html/xml parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taglib" = callPackage
@@ -186505,7 +186038,6 @@ self: {
        ];
        description = "Tail files in Unix, using hinotify";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tak" = callPackage
@@ -186969,7 +186501,6 @@ self: {
        homepage = "https://github.com/lwm/tasty-discover#readme";
        description = "Test discovery for the tasty framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-expected-failure" = callPackage
@@ -187001,7 +186532,6 @@ self: {
        homepage = "http://github.com/MichaelXavier/tasty-fail-fast#readme";
        description = "Adds the ability to fail a tasty test suite on first test failure";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-golden" = callPackage
@@ -187356,7 +186886,6 @@ self: {
        homepage = "https://github.com/michaelxavier/tasty-tap";
        description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-th" = callPackage
@@ -187518,7 +187047,6 @@ self: {
        homepage = "https://github.com/winterland1989/tcp-streams";
        description = "One stop solution for tcp client and server with tls support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tcp-streams_1_0_1_0" = callPackage
@@ -187683,7 +187211,6 @@ self: {
        homepage = "https://github.com/np/tdoc";
        description = "TDoc is a typed document builder with support for (X)HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teams" = callPackage
@@ -187730,7 +187257,6 @@ self: {
        homepage = "https://github.com/expipiplus1/teeth";
        description = "Dental data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "telegram" = callPackage
@@ -188538,7 +188064,6 @@ self: {
        homepage = "https://github.com/roelvandijk/terminal-progress-bar";
        description = "A simple progress bar in the terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terminal-size" = callPackage
@@ -188980,7 +188505,6 @@ self: {
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "Sandbox for system tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-sandbox-compose" = callPackage
@@ -189042,7 +188566,6 @@ self: {
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "QuickCheck convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-shouldbe" = callPackage
@@ -189074,7 +188597,6 @@ self: {
        ];
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testPkg" = callPackage
@@ -189283,7 +188805,6 @@ self: {
        ];
        description = "Functions for running Tex from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text" = callPackage
@@ -189323,7 +188844,6 @@ self: {
        homepage = "http://github.com/aelve/text-all";
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-and-plots" = callPackage
@@ -189376,7 +188896,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/text-builder";
        description = "An efficient strict text builder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-conversions" = callPackage
@@ -189611,7 +189130,6 @@ self: {
        homepage = "https://github.com/mvv/text-lips";
        description = "Monadic parsing combinator library with attention to locations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-loc" = callPackage
@@ -189889,7 +189407,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show_3_6_2" = callPackage
@@ -189962,7 +189479,6 @@ self: {
        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-show-instances_3_6_2" = callPackage
@@ -190572,7 +190088,6 @@ self: {
        homepage = "https://github.com/ddssff/th-kinds";
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-kinds-fork" = callPackage
@@ -190843,7 +190358,6 @@ self: {
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "themplate" = callPackage
@@ -191140,7 +190654,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extends the threads package with a bounded thread group";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threads-pool" = callPackage
@@ -191195,7 +190708,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threefish" = callPackage
@@ -191277,7 +190789,6 @@ self: {
        homepage = "http://wiki.haskell.org/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threepenny-gui-contextmenu" = callPackage
@@ -191309,7 +190820,6 @@ self: {
        homepage = "https://github.com/barischj/threepenny-gui-flexbox";
        description = "Flexbox layouts for Threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thrift" = callPackage
@@ -191564,7 +191074,6 @@ self: {
        homepage = "https://github.com/NICTA/tickle";
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tictactoe3d" = callPackage
@@ -191641,7 +191150,6 @@ self: {
        homepage = "http://yaxu.org/tidal/";
        description = "Visual rendering for Tidal patterns";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tie-knot" = callPackage
@@ -191847,7 +191355,6 @@ self: {
        homepage = "https://github.com/enzoh/time-exts";
        description = "Yet another time library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-http" = callPackage
@@ -191988,7 +191495,6 @@ self: {
        homepage = "https://github.com/christian-marie/time-qq";
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-recurrence" = callPackage
@@ -192139,7 +191645,6 @@ self: {
        homepage = "https://github.com/xpika/Time-Console";
        description = "time each line of terminal output";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeit" = callPackage
@@ -192343,7 +191848,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Timeplot";
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeprint" = callPackage
@@ -192453,7 +191957,6 @@ self: {
        homepage = "https://github.com/Peaker/timestamp-subprocess-lines";
        description = "Run a command and timestamp its stdout/stderr lines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timestamper" = callPackage
@@ -192789,7 +192292,6 @@ self: {
        testHaskellDepends = [ base HUnit network-uri text ];
        description = "This project separates subdomains, domains, and top-level-domains from URLs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tldr" = callPackage
@@ -193297,6 +192799,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/tomato-rubato";
        description = "Easy to use library for audio programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toml" = callPackage
@@ -193345,7 +192848,6 @@ self: {
        homepage = "http://functionalley.eu";
        description = "Ill-defined library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "top" = callPackage
@@ -193370,7 +192872,6 @@ self: {
        homepage = "http://github.com/tittoassini/top";
        description = "Top (typed oriented protocol) API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "topkata" = callPackage
@@ -193441,7 +192942,6 @@ self: {
        libraryHaskellDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "total-alternative" = callPackage
@@ -193515,7 +193015,6 @@ self: {
        homepage = "https://github.com/tonyday567/tower";
        description = "A numeric tower";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "toxcore" = callPackage
@@ -193650,7 +193149,6 @@ self: {
        ];
        description = "Applications for interacting with the Pushbullet API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tpdb" = callPackage
@@ -193754,7 +193252,6 @@ self: {
        ];
        description = "Visualize Haskell data structures as edge-labeled trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tracker" = callPackage
@@ -193778,7 +193275,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Convenience wrappers for non-intrusive debug tracing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "traildb" = callPackage
@@ -194026,7 +193522,6 @@ self: {
        homepage = "https://github.com/ocharles/transformers-eff";
        description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {effect-interpreters = null;};
 
@@ -194101,21 +193596,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "transient_0_5_9" = callPackage
+  "transient_0_5_9_1" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, containers
      , directory, mtl, random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.5.9";
-       sha256 = "0y06x24x9jy6y6wqmq4smz9mkpy2yk53llaajlhdqysxwmhlpxag";
+       version = "0.5.9.1";
+       sha256 = "0dvv03lshvwvfjv9p54jbcihz8w96k33772msx03qqdnr8n9iql7";
        libraryHaskellDepends = [
          atomic-primops base bytestring containers directory mtl random stm
-         time
+         time transformers
        ];
        testHaskellDepends = [
-         base bytestring containers directory mtl random stm time
-         transformers
+         atomic-primops base bytestring containers directory mtl random stm
+         time transformers
        ];
        homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "composing programs with multithreading, events and distributed computing";
@@ -194154,7 +193649,6 @@ self: {
        homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "Remote execution and map-reduce: distributed computing for Transient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transient-universe-tls" = callPackage
@@ -194450,7 +193944,6 @@ self: {
        ];
        description = "A tree of Data.Map.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "treemap-html" = callPackage
@@ -194870,7 +194363,6 @@ self: {
        ];
        description = "Thread-safe logging, with additional interleaving fuzz-testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tsne" = callPackage
@@ -195414,7 +194906,6 @@ self: {
        homepage = "http://github.com/nick8325/twee";
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tweet-hs" = callPackage
@@ -195613,7 +195104,6 @@ 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
@@ -195706,7 +195196,6 @@ self: {
        homepage = "https://github.com/markandrus/twilio-haskell";
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twill" = callPackage
@@ -195853,7 +195342,6 @@ self: {
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -195920,7 +195408,6 @@ self: {
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -195937,7 +195424,6 @@ self: {
        homepage = "https://github.com/himura/twitter-types-lens";
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tx" = callPackage
@@ -196057,7 +195543,6 @@ self: {
        homepage = "https://github.com/lexi-lambda/type-assertions#readme";
        description = "Runtime type assertions for testing";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-booleans" = callPackage
@@ -196443,7 +195928,6 @@ self: {
        homepage = "https://github.com/konn/type-natural";
        description = "Type-level natural and proofs of their properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-of-html" = callPackage
@@ -196462,6 +195946,7 @@ self: {
        homepage = "https://github.com/knupfer/type-of-html";
        description = "High performance type driven html generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-operators" = callPackage
@@ -196683,7 +196168,6 @@ self: {
        homepage = "https://github.com/fpco/typed-process#readme";
        description = "Run external processes, with strong typing of streams";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-spreadsheet" = callPackage
@@ -197402,7 +196886,6 @@ self: {
        homepage = "https://github.com/hvr/uhttpc";
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ui-command" = callPackage
@@ -197433,7 +196916,6 @@ self: {
        homepage = "http://github.com/hargettp/uid.git";
        description = "Simple unique identifier datatype, serializable and encodable as base32";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ulid" = callPackage
@@ -197525,6 +197007,7 @@ self: {
        homepage = "https://github.com/LukeHoersten/unagi-streams";
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unamb" = callPackage
@@ -198016,7 +197499,6 @@ self: {
        homepage = "https://github.com/Zankoku-Okuno/unicoder";
        description = "Make writing in unicode easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unidecode" = callPackage
@@ -198725,7 +198207,6 @@ self: {
        homepage = "https://github.com/scrive/unjson";
        description = "Bidirectional JSON parsing and generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unlambda" = callPackage
@@ -198783,7 +198264,6 @@ self: {
        executableHaskellDepends = [ base directory text ];
        description = "Tool to convert literate code between styles or to code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unm-hip" = callPackage
@@ -199035,7 +198515,6 @@ self: {
        homepage = "https://github.com/joshuaclayton/unused#readme";
        description = "A command line tool to identify unused code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uom-plugin" = callPackage
@@ -199405,7 +198884,6 @@ self: {
        homepage = "http://github.com/iand675/uri-templater";
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "url" = callPackage
@@ -199441,6 +198919,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/url-decoders";
        description = "Decoders for URL-encoding (aka Percent-encoding)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "url-generic" = callPackage
@@ -200123,6 +199602,7 @@ self: {
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuid-le" = callPackage
@@ -201001,7 +200481,6 @@ self: {
        homepage = "https://github.com/forste/haskellVCSGUI";
        description = "GUI library for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcswrapper" = callPackage
@@ -201206,6 +200685,7 @@ self: {
        homepage = "https://github.com/k0001/vector-bytes-instances";
        description = "Serial (from the bytes package) for Vector (from the vector package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-bytestring" = callPackage
@@ -201870,7 +201350,6 @@ self: {
        homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vimus" = callPackage
@@ -202381,6 +201860,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vty_5_17" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , deepseq, directory, filepath, hashable, HUnit, microlens
+     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
+     , quickcheck-assertions, random, smallcheck, stm, string-qq
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-smallcheck, text, transformers, unix, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "vty";
+       version = "5.17";
+       sha256 = "19dn80mxdd4w68cp21x7rnish5ph9bajzhcrz9mgxc7274g81kwr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers deepseq directory filepath
+         hashable microlens microlens-mtl microlens-th mtl parallel parsec
+         stm terminfo text transformers unix utf8-string vector
+       ];
+       executableHaskellDepends = [
+         base containers microlens microlens-mtl mtl
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers deepseq HUnit
+         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+         smallcheck stm string-qq terminfo test-framework
+         test-framework-hunit test-framework-smallcheck text unix
+         utf8-string vector
+       ];
+       homepage = "https://github.com/jtdaugherty/vty";
+       description = "A simple terminal UI library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vty-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -202607,7 +202122,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "File/CGI/Rev Proxy App of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-app-static" = callPackage
@@ -202702,7 +202216,6 @@ self: {
        homepage = "https://github.com/larskuhtz/wai-cors";
        description = "CORS for WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-devel" = callPackage
@@ -202750,7 +202263,6 @@ self: {
        homepage = "https://github.com/singpolyma/wai-digestive-functors";
        description = "Helpers to bind digestive-functors onto wai requests";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-dispatch" = callPackage
@@ -203118,7 +202630,6 @@ self: {
        ];
        description = "Authentication middleware that secures WAI application";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "wai-middleware-cache" = callPackage
@@ -203433,6 +202944,7 @@ self: {
        homepage = "https://github.com/orbital/wai-middleware-json-errors#readme";
        description = "Converts errors from plaintext to json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-metrics" = callPackage
@@ -203563,7 +203075,6 @@ self: {
        homepage = "https://github.com/scotty-web/wai-middleware-static";
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-static-caching" = callPackage
@@ -203806,7 +203317,6 @@ self: {
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-routing" = callPackage
@@ -204364,7 +203874,6 @@ self: {
        libraryHaskellDepends = [ base mtl time ];
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "watcher" = callPackage
@@ -204445,7 +203954,6 @@ self: {
        homepage = "https://github.com/mrkkrp/wave";
        description = "Work with WAVE and RF64 files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wavefront" = callPackage
@@ -204638,7 +204146,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit network-uri text ];
        description = "Composable, reversible, efficient web routing based on invertible invariants and bijections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -204699,7 +204206,6 @@ self: {
        homepage = "http://hub.darcs.net/ertes/web-page";
        description = "Monoidally construct web pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-plugins" = callPackage
@@ -204919,6 +204425,7 @@ self: {
        homepage = "https://github.com/airalab/hs-web3#readme";
        description = "Ethereum API for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webapi" = callPackage
@@ -205077,7 +204584,6 @@ self: {
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver-angular" = callPackage
@@ -205100,7 +204606,6 @@ self: {
        homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver-snoy" = callPackage
@@ -205190,7 +204695,6 @@ self: {
        homepage = "http://github.com/ananthakumaran/webify";
        description = "webfont generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webkit" = callPackage
@@ -205238,7 +204742,6 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) webkitgtk;};
 
   "webkitgtk3" = callPackage
@@ -205482,7 +204985,6 @@ self: {
        homepage = "https://github.com/athanclark/websockets-simple#readme";
        description = "Simpler interface to the websockets api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets-simple_0_0_6_3" = callPackage
@@ -205519,7 +205021,6 @@ self: {
        ];
        description = "Snap integration for the websockets library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webwire" = callPackage
@@ -206124,7 +205625,6 @@ self: {
        homepage = "https://github.com/winterland1989/wire-streams";
        description = "Fast binary io-streams adapter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wires" = callPackage
@@ -206143,6 +205643,7 @@ self: {
        homepage = "https://github.com/esoeylemez/wires";
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wiring" = callPackage
@@ -206160,7 +205661,6 @@ self: {
        homepage = "http://github.com/seanparsons/wiring/";
        description = "Wiring, promotion and demotion of types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wiringPi" = callPackage
@@ -206176,7 +205676,6 @@ 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;
      }) {};
 
   "with-location" = callPackage
@@ -206572,19 +206071,19 @@ self: {
      }) {};
 
   "word-wrap" = callPackage
-    ({ mkDerivation, base, hspec, text }:
+    ({ mkDerivation, base, criterion, hspec, text }:
      mkDerivation {
        pname = "word-wrap";
-       version = "0.3.3";
-       sha256 = "1qc6v556mynqjk86ba958rdwbmvfy5marria8ybjpjdsrn2zmdm6";
+       version = "0.4.1";
+       sha256 = "15rcqhg9vb7qisk9ryjnyhhfgigxksnkrczycaw2rin08wczjwpb";
        revision = "1";
-       editedCabalFile = "1637bnmg2zm26ik3ql4203yk10jjjj50wyyzzhk210jcrvp8a27g";
+       editedCabalFile = "1k4w4g053vhmpp08542hrqaw81p3p35i567xgdarqmpghfrk68pp";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/jtdaugherty/word-wrap/";
        description = "A library for word-wrapping";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "word24" = callPackage
@@ -206603,7 +206102,6 @@ self: {
        homepage = "https://github.com/winterland1989/word24";
        description = "24-bit word and int types for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "word8" = callPackage
@@ -206700,6 +206198,7 @@ self: {
        homepage = "https://github.com/mgajda/wordpass";
        description = "Dictionary-based password generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "words" = callPackage
@@ -207096,12 +206595,13 @@ self: {
     ({ mkDerivation, base, bytestring, text, utf8-string, wreq }:
      mkDerivation {
        pname = "wreq-stringless";
-       version = "0.5.0.1";
-       sha256 = "0nwn7y593hxf971h0pr7l7l76wl6nmb622yasirzczx8qxvmr5ya";
+       version = "0.5.1.0";
+       sha256 = "1f23f1dxim8xkx7jj0z7fr4xjpmxc8cr0rbh84hhb359mkfklhvf";
        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;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wright" = callPackage
@@ -207199,7 +206699,6 @@ self: {
        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-morph" = callPackage
@@ -207296,6 +206795,7 @@ self: {
        ];
        description = "WSDL parsing in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wsedit" = callPackage
@@ -207454,7 +206954,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxAsteroids" = callPackage
@@ -207470,7 +206969,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxAsteroids";
        description = "Try to avoid the asteroids with your space ship";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxFruit" = callPackage
@@ -207521,7 +207019,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; 
          inherit (pkgs) wxGTK;};
 
@@ -207543,7 +207040,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
@@ -207562,7 +207058,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "helper tool for building wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxhnotepad" = callPackage
@@ -207683,7 +207178,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/x11-xinput";
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXi;};
 
   "x509" = callPackage
@@ -207966,7 +207460,6 @@ self: {
        homepage = "http://github.com/tych0/xcffib";
        description = "A cffi-based python binding for X";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xchat-plugin" = callPackage
@@ -208027,7 +207520,6 @@ self: {
        homepage = "https://github.com/JanGe/xdcc";
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xdg-basedir" = callPackage
@@ -208340,7 +207832,6 @@ self: {
        benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -208962,7 +208453,6 @@ self: {
        homepage = "https://github.com/sinelaw/xml-to-json";
        description = "Library and command line tool for converting XML files to json";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-to-json-fast" = callPackage
@@ -209130,6 +208620,7 @@ self: {
        homepage = "https://github.com/snapframework/xmlhtml";
        description = "XML parser and renderer with HTML 5 quirks mode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmltv" = callPackage
@@ -209701,7 +209192,6 @@ self: {
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xtest" = callPackage
@@ -209729,7 +209219,6 @@ self: {
        ];
        description = "turtle like LOGO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xxhash" = callPackage
@@ -209747,7 +209236,6 @@ self: {
        ];
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "y0l0bot" = callPackage
@@ -210114,7 +209602,6 @@ self: {
        homepage = "https://github.com/michelk/yaml-union.hs";
        description = "Read multiple yaml-files and override fields recursively";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml2owl" = callPackage
@@ -210711,7 +210198,6 @@ self: {
        homepage = "https://github.com/psibi/yesod-auth-fb";
        description = "Authentication backend for Yesod using Facebook";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
@@ -210738,7 +210224,6 @@ self: {
        homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hmac-keccak" = callPackage
@@ -211259,7 +210744,6 @@ self: {
        ];
        description = "Add CSP headers to Yesod apps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-datatables" = callPackage
@@ -211419,6 +210903,7 @@ self: {
        homepage = "https://github.com/fpco/yesod-fay";
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-fb" = callPackage
@@ -211436,7 +210921,6 @@ self: {
        homepage = "https://github.com/psibi/yesod-fb";
        description = "Useful glue functions between the fb library and Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form" = callPackage
@@ -211634,7 +211118,6 @@ self: {
        homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
        description = "Background jobs library for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-json" = callPackage
@@ -211815,7 +211298,6 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-paginator";
        description = "A pagination approach for yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paypal-rest" = callPackage
@@ -212143,7 +211625,6 @@ self: {
        homepage = "https://github.com/frontrowed/yesod-routes-flow";
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-routes-typescript" = callPackage
@@ -212554,7 +212035,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "yhccore" = callPackage
@@ -212886,7 +212366,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Cua keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-cua_0_14_1" = callPackage
@@ -212923,7 +212402,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Emacs keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-emacs_0_14_1" = callPackage
@@ -212973,7 +212451,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Vim keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-vim_0_14_1" = callPackage
@@ -213080,7 +212557,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor miscellaneous modes";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-misc-modes_0_14_1" = callPackage
@@ -213119,7 +212595,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor haskell mode";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-mode-haskell_0_14_1" = callPackage
@@ -213158,7 +212633,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor javascript mode";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-mode-javascript_0_14_1" = callPackage
@@ -213387,7 +212861,6 @@ self: {
        libraryHaskellDepends = [ base HaXml ];
        description = "make SVG string from Haskell data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yjtools" = callPackage
@@ -213431,7 +212904,6 @@ self: {
        homepage = "https://github.com/mniip/yoctoparsec";
        description = "A truly tiny monadic parsing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yoga" = callPackage
@@ -213635,7 +213107,6 @@ self: {
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "z3" = callPackage
@@ -213643,8 +213114,8 @@ self: {
      }:
      mkDerivation {
        pname = "z3";
-       version = "4.1.0";
-       sha256 = "1vpmwizxcab1mlz7vp3hp72ddla7805jn0lq60fmkjgmj95ryvq9";
+       version = "4.1.1";
+       sha256 = "07nmaaa6dldvysvh9jbx3m2cakx1x824hgnbh22w4nyia9hqjd8a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
@@ -214142,7 +213613,6 @@ self: {
        homepage = "https://github.com/mrkkrp/zip";
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "zip-archive" = callPackage
@@ -214457,7 +213927,6 @@ self: {
        homepage = "http://github.com/tittoassini/zm";
        description = "Language independent, reproducible, absolute types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zmcat" = callPackage

From 550373b000b6afdd268007a8ce70265a97ba61e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Aug 2017 08:56:20 +0200
Subject: [PATCH 1687/3246] cabal-install: fix build after updating to version
 2.x

---
 pkgs/development/haskell-modules/configuration-common.nix   | 6 ++++--
 .../haskell-modules/configuration-ghc-7.10.x.nix            | 3 ---
 .../development/haskell-modules/configuration-ghc-8.0.x.nix | 3 ---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0d2f235862f..069213c8798 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -27,8 +27,10 @@ self: super: {
   ghcjs-base = null;
   ghcjs-prim = null;
 
-  # Some packages need a non-core version of Cabal.
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; });
+  # cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with
+  # Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188.
+  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; });
+  hackage-security = dontCheck super.hackage-security;
 
   # Link statically to avoid runtime dependency on GHC.
   jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; };
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 4a09b142d2e..ffa7030d98b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -36,9 +36,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # Enable latest version of cabal-install.
-  cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; });
-
   # Build jailbreak-cabal with the latest version of Cabal.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
 
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 a24d2bcd4c1..ade4d5e915d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -35,9 +35,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # cabal-install can use the native Cabal library.
-  cabal-install = super.cabal-install.override { Cabal = null; };
-
   # jailbreak-cabal can use the native Cabal library.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 

From 67a41eafe9c92269c9f6788f5f54a4b0d282cb96 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 8 Aug 2017 10:14:54 +0200
Subject: [PATCH 1688/3246] cc-wrapper: fix set -u errors

cc @Ericson2314
---
 pkgs/build-support/cc-wrapper/add-flags.sh  | 7 ++++---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 3d01dba6476..7af2ae58f3a 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -10,12 +10,13 @@ declare -a role_prefixes=()
 if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]]; then
     role_prefixes+=(_BUILD)
 fi
-if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]]; then
-    role_prefixes+=('')
-fi
 if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]]; then
     role_prefixes+=(_TARGET)
 fi
+# use this as default if no role is inferred
+if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" || ${#role_prefixes[@]} -eq 0 ]]; then
+    role_prefixes+=('')
+fi
 
 # For each role we serve, we accumulate the input parameters into our own
 # cc-wrapper-derivation-specific environment variables.
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index e47a6bfec86..afa7798e49f 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -20,6 +20,11 @@ fi
 
 source @out@/nix-support/utils.sh
 
+# make set -u happy if the outside environment is unset
+# this should never happen, but does in an LLVM test
+if [ -z "${NIX_STORE:-}" ]; then
+    NIX_STORE=/nix/store
+fi
 
 # Optionally filter out paths not refering to the store.
 expandResponseParams "$@"

From 3e981b9e33141ec8bafd8ecf36cde9cbafaac180 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 8 Aug 2017 10:20:00 +0200
Subject: [PATCH 1689/3246] Revert "cc-wrapper: fix set -u errors"

This reverts commit 67a41eafe9c92269c9f6788f5f54a4b0d282cb96.

see #28021 for discussion
---
 pkgs/build-support/cc-wrapper/add-flags.sh  | 7 +++----
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 7af2ae58f3a..3d01dba6476 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -10,13 +10,12 @@ declare -a role_prefixes=()
 if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]]; then
     role_prefixes+=(_BUILD)
 fi
+if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]]; then
+    role_prefixes+=('')
+fi
 if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]]; then
     role_prefixes+=(_TARGET)
 fi
-# use this as default if no role is inferred
-if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" || ${#role_prefixes[@]} -eq 0 ]]; then
-    role_prefixes+=('')
-fi
 
 # For each role we serve, we accumulate the input parameters into our own
 # cc-wrapper-derivation-specific environment variables.
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index afa7798e49f..e47a6bfec86 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -20,11 +20,6 @@ fi
 
 source @out@/nix-support/utils.sh
 
-# make set -u happy if the outside environment is unset
-# this should never happen, but does in an LLVM test
-if [ -z "${NIX_STORE:-}" ]; then
-    NIX_STORE=/nix/store
-fi
 
 # Optionally filter out paths not refering to the store.
 expandResponseParams "$@"

From 6f7f06375c5dd115f57d63e12d8d8c9957abe5fa Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Tue, 8 Aug 2017 09:43:23 +0100
Subject: [PATCH 1690/3246] Implement required changes

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

diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/libopencore/default.nix
index 6eacfdb6371..6dbd190e7c9 100644
--- a/pkgs/development/libraries/libopencore/default.nix
+++ b/pkgs/development/libraries/libopencore/default.nix
@@ -1,11 +1,15 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl };
 
+let
+    version = "0.1.5";
+in 
 stdenv.mkDerivation {
-  name = "opencore-amr";
+  name = "opencore-amr-${version}";
   src = fetchurl {
-    url = https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-0.1.5.tar.gz;
+    url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz";
     sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
   };
+  
   meta = {
     homepage = https://opencore-amr.sourceforge.io/;
     description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. 

From e1d46c0c4d3bdb0aa42a04bc2bfcadc641b4ac05 Mon Sep 17 00:00:00 2001
From: Taahir Ahmed <ahmed.taahir@gmail.com>
Date: Sun, 30 Jul 2017 13:42:20 -0500
Subject: [PATCH 1691/3246] makeWrapper: Only wrap normal executable files

`makeWrapper` and `wrapProgram` are being invoked on all kinds of
wacky things (usually with the help of bash globs or other machine
assistance).

So far, I have come across `wrapProgram` being invoked on a directory,
as well as on the empty string.

As far as I can tell, it's only valid to invoke these utilities on a
normal (non-directory, non-device) executable file.  This commit
enforces that precondition.
---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index eebde886a88..5429bc41272 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -1,3 +1,12 @@
+# Assert that FILE exists and is executable
+#
+# assertExecutable FILE
+assertExecutable() {
+    local file="$1"
+    [[ -f "${file}" && -x "${file}" ]] || \
+        die "Cannot wrap ${file} because it is not an executable file"
+}
+
 # construct an executable file that wraps the actual executable
 # makeWrapper EXECUTABLE ARGS
 
@@ -24,6 +33,8 @@ makeWrapper() {
     local params varName value command separator n fileNames
     local argv0 flagsBefore flags
 
+    assertExecutable "${file}"
+
     mkdir -p "$(dirname "$wrapper")"
 
     echo "#! $SHELL -e" > "$wrapper"
@@ -131,6 +142,9 @@ filterExisting() {
 wrapProgram() {
     local prog="$1"
     local hidden
+
+    assertExecutable "${prog}"
+
     hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
     while [ -e "$hidden" ]; do
       hidden="${hidden}_"

From a082215df55c1937fb5b0b7c91388702245f66a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 8 Aug 2017 10:50:50 +0200
Subject: [PATCH 1692/3246] hydra: 2017-07-24 -> 2017-07-27

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

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index d5423fea2be..128ce6008fa 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -62,15 +62,15 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2017-07-24";
+  version = "2017-07-27";
 
   inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "a6d9201947aa1468d31ef5c2651251ceeefceb5c";
-    sha256 = "0hk5pxzn94ip3nyccxl91zc5n6wd1h2zcbhdq9p38wa4lrnnm5zv";
+    rev = "3fc320db320c9aa5180c54e77513f1bcb7407079";
+    sha256 = "0kml2rvy5pz8pzl23vfib5vrwxccff9j1jmyq926qv7f5kbzy61b";
   };
 
   buildInputs =

From 4b1bcf8724c1b9a9409a88e930c10f0a50d19b1d Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Tue, 8 Aug 2017 09:57:10 +0100
Subject: [PATCH 1693/3246] pangolin: init at 2017-08-02

---
 .../libraries/pangolin/default.nix            | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/pangolin/default.nix

diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
new file mode 100644
index 00000000000..f5b2f4c2b99
--- /dev/null
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew, xorg
+, ffmpeg, python3 , libjpeg, libpng, libtiff, eigen }:
+
+stdenv.mkDerivation rec {
+  name = "pangolin-${version}";
+
+  version = "2017-08-02";
+
+  src = fetchFromGitHub {
+    owner = "stevenlovegrove";
+    repo = "Pangolin";
+    rev = "f05a8cdc4f0e32cc1664a430f1f85e60e233c407";
+    sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig doxygen ]; 
+
+  buildInputs = [ 
+    mesa_noglu 
+    glew 
+    xorg.libX11 
+    ffmpeg 
+    python3 
+    libjpeg 
+    libpng 
+    libtiff 
+    eigen 
+  ];
+
+  enableParallelBuilding = true;
+
+  # The tests use cmake's findPackage to find the installed version of
+  # pangolin, which isn't what we want (or available).
+  doCheck = false;
+  cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
+
+  meta = {
+    description = "A lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input";
+    longDescription = ''
+      Pangolin is a lightweight portable rapid development library for managing
+      OpenGL display / interaction and abstracting video input. At its heart is
+      a simple OpenGl viewport manager which can help to modularise 3D
+      visualisation without adding to its complexity, and offers an advanced
+      but intuitive 3D navigation handler. Pangolin also provides a mechanism
+      for manipulating program variables through config files and ui
+      integration, and has a flexible real-time plotter for visualising
+      graphical data.
+    '';
+    homepage = https://github.com/stevenlovegrove/Pangolin;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.expipiplus1 ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dd9427c2ce..eb0ee3bc767 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8179,6 +8179,9 @@ with pkgs;
   cairomm = callPackage ../development/libraries/cairomm { };
 
   pango = callPackage ../development/libraries/pango { };
+
+  pangolin = callPackage ../development/libraries/pangolin { };
+
   pangomm = callPackage ../development/libraries/pangomm {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   };

From c8f7f18e69c01907f52634bb6b926a99b030cb95 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 7 Aug 2017 15:06:44 +0000
Subject: [PATCH 1694/3246] cc-wrapper: Fix adding directories to rpath

This fixes a bug introduced in #27831: `for path in "$dir"/lib*.so` assumed that
all libs match `lib*.so`, but 07674788d6932fe702117649b4cd16512d2da8a9 started
adding libs that match `*.so` and `*.so.*`.
---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index e47a6bfec86..028f2d4f548 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -129,7 +129,7 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
             # copied to $out/lib.  If not, we're screwed.
             continue
         fi
-        for path in "$dir"/lib*.so; do
+        for path in "$dir"/*; do
             file="${path##*/}"
             if [ "${libs[$file]:-}" ]; then
                 libs["$file"]=

From c8e9dcc8a44e95fc7aab436587049b5c95e4e86a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 8 Aug 2017 00:15:10 +0000
Subject: [PATCH 1695/3246] cc-wrapper: Fix standalone gcc

This ensures that all salted variables are defined even if the wrapped program
is invoked outside nix-build environment.
---
 pkgs/build-support/cc-wrapper/add-flags.sh | 111 ++++++++-------------
 1 file changed, 44 insertions(+), 67 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 3d01dba6476..4d28ba08d10 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -4,108 +4,85 @@
 # that case, it is cheaper/better to not repeat this step and let the forked
 # wrapped binary just inherit the work of the forker's wrapper script.
 
-# Accumulate prefixes for taking in the right input parameters. See setup-hook
+var_templates=(
+    NIX_CC_WRAPPER+START_HOOK
+    NIX_CC_WRAPPER+EXEC_HOOK
+    NIX_LD_WRAPPER+START_HOOK
+    NIX_LD_WRAPPER+EXEC_HOOK
+
+    NIX+CFLAGS_COMPILE
+    NIX+CFLAGS_LINK
+    NIX+CXXSTDLIB_COMPILE
+    NIX+CXXSTDLIB_LINK
+    NIX+GNATFLAGS_COMPILE
+    NIX+IGNORE_LD_THROUGH_GCC
+    NIX+LDFLAGS
+    NIX+LDFLAGS_BEFORE
+    NIX+LDFLAGS_AFTER
+    NIX+LDFLAGS_HARDEN
+
+    NIX+SET_BUILD_ID
+    NIX+DONT_SET_RPATH
+    NIX+ENFORCE_NO_NATIVE
+)
+
+# Accumulate infixes for taking in the right input parameters. See setup-hook
 # for details.
-declare -a role_prefixes=()
-if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]]; then
-    role_prefixes+=(_BUILD)
+declare -a role_infixes=()
+if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then
+    role_infixes+=(_BUILD_)
 fi
-if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]]; then
-    role_prefixes+=('')
+if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then
+    role_infixes+=(_)
 fi
-if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]]; then
-    role_prefixes+=(_TARGET)
+if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then
+    role_infixes+=(_TARGET_)
 fi
 
-# For each role we serve, we accumulate the input parameters into our own
-# cc-wrapper-derivation-specific environment variables.
-for pre in "${role_prefixes[@]}"; do
-    # We need to mangle names for hygiene, but also take parameters/overrides
-    # from the environment.
-    slurpUnsalted () {
-        case "$1" in
-            CC_WRAPPER_*)
-                local firstPre=NIX_CC_WRAPPER_
-                local varname="${1#CC_WRAPPER_}"
-                ;;
-            LD_WRAPPER_*)
-                local firstPre=NIX_LD_WRAPPER_
-                local varname="${1#LD_WRAPPER_}"
-                ;;
-            *)
-                local firstPre=NIX_
-                local varname="$1"
-                ;;
-        esac
-        local inputVar="${firstPre}${pre}${varname}"
-        local outputVar="${firstPre}@infixSalt@_${varname}"
-        local delimiter=''
-        if [[ -n "${!outputVar:-}" && -n "${!inputVar:-}" ]]; then
-            delimiter=' '
+# We need to mangle names for hygiene, but also take parameters/overrides
+# from the environment.
+for var in "${var_templates[@]}"; do
+    outputVar="${var/+/_@infixSalt@_}"
+    export ${outputVar}+=''
+    # For each role we serve, we accumulate the input parameters into our own
+    # cc-wrapper-derivation-specific environment variables.
+    for infix in "${role_infixes[@]}"; do
+        inputVar="${var/+/${infix}}"
+        if [ -v "$inputVar" ]; then
+            export ${outputVar}+="${!outputVar:+ }${!inputVar}"
         fi
-        # Easiest to just do this to deal with either the input or (old) output.
-        set +u
-        export ${outputVar}+="${delimiter}${!inputVar}"
-        set -u
-    }
-
-    slurpUnsalted CC_WRAPPER_START_HOOK
-    slurpUnsalted CC_WRAPPER_EXEC_HOOK
-    slurpUnsalted LD_WRAPPER_START_HOOK
-    slurpUnsalted LD_WRAPPER_EXEC_HOOK
-
-    slurpUnsalted CFLAGS_COMPILE
-    slurpUnsalted CFLAGS_LINK
-    slurpUnsalted CXXSTDLIB_COMPILE
-    slurpUnsalted CXXSTDLIB_LINK
-    slurpUnsalted GNATFLAGS_COMPILE
-    slurpUnsalted IGNORE_LD_THROUGH_GCC
-    slurpUnsalted LDFLAGS
-    slurpUnsalted LDFLAGS_BEFORE
-    slurpUnsalted LDFLAGS_AFTER
-    slurpUnsalted LDFLAGS_HARDEN
-
-    slurpUnsalted SET_BUILD_ID
-    slurpUnsalted DONT_SET_RPATH
-    slurpUnsalted ENFORCE_NO_NATIVE
+    done
 done
-unset -f slurpUnsalted
 
 # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
-export NIX_@infixSalt@_CFLAGS_COMPILE="-B@out@/bin/ $NIX_@infixSalt@_CFLAGS_COMPILE"
+NIX_@infixSalt@_CFLAGS_COMPILE="-B@out@/bin/ $NIX_@infixSalt@_CFLAGS_COMPILE"
 
 # Export and assign separately in order that a failing $(..) will fail
 # the script.
 
 if [ -e @out@/nix-support/libc-cflags ]; then
-    export NIX_@infixSalt@_CFLAGS_COMPILE
     NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/libc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE"
 fi
 
 if [ -e @out@/nix-support/cc-cflags ]; then
-    export NIX_@infixSalt@_CFLAGS_COMPILE
     NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE"
 fi
 
 if [ -e @out@/nix-support/gnat-cflags ]; then
-    export NIX_@infixSalt@_GNATFLAGS_COMPILE
     NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE"
 fi
 
 if [ -e @out@/nix-support/libc-ldflags ]; then
-    export NIX_@infixSalt@_LDFLAGS
     NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)"
 fi
 
 if [ -e @out@/nix-support/cc-ldflags ]; then
-    export NIX_@infixSalt@_LDFLAGS
     NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)"
 fi
 
 if [ -e @out@/nix-support/libc-ldflags-before ]; then
-    export NIX_@infixSalt@_LDFLAGS_BEFORE
     NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE"
 fi
 
-# That way forked processes don't againt extend these environment variables
+# That way forked processes will not extend these environment variables again.
 export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1

From a6e7dffd1f8e60e852c3de4bf9b153ba874d2823 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 8 Aug 2017 06:56:25 +0000
Subject: [PATCH 1696/3246] cc-wrapper: Fix standalone ld

---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 028f2d4f548..8db64a38e38 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -23,7 +23,7 @@ source @out@/nix-support/utils.sh
 
 # Optionally filter out paths not refering to the store.
 expandResponseParams "$@"
-if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE"
+if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}"
         && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ) ]]; then
     rest=()
     nParams=${#params[@]}
@@ -96,7 +96,7 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_I
                     -l?*)
                         libs["lib${p:2}.so"]=1
                         ;;
-                    "$NIX_STORE"/*.so | "$NIX_STORE"/*.so.*)
+                    "${NIX_STORE:-}"/*.so | "${NIX_STORE:-}"/*.so.*)
                         # This is a direct reference to a shared library.
                         libDirs+=("${p%/*}")
                         libs["${p##*/}"]=1
@@ -123,7 +123,7 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
         if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then
             dir="$dir2"
         fi
-        if [ -n "${rpaths[$dir]:-}" ] || [[ "$dir" != "$NIX_STORE"/* ]]; then
+        if [ -n "${rpaths[$dir]:-}" ] || [[ "$dir" != "${NIX_STORE:-}"/* ]]; then
             # If the path is not in the store, don't add it to the rpath.
             # This typically happens for libraries in /tmp that are later
             # copied to $out/lib.  If not, we're screwed.

From 2ff9f969a16035c8c03c70d04239461e01f0ad92 Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Tue, 8 Aug 2017 10:09:17 +0100
Subject: [PATCH 1697/3246] Added libopencore to all-packages.nix

---
 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 1f32cc4cee3..378f334c45f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4682,6 +4682,8 @@ with pkgs;
     openssl = null;
   };
 
+  opencore-amr = callPackage ../development/libraries/libopencore { };
+  
   ding-libs = callPackage ../tools/misc/ding-libs { };
 
   sssd = callPackage ../os-specific/linux/sssd {

From 6a279ec77aff4688ac5322581de8329d420ac3e5 Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Tue, 8 Aug 2017 10:27:41 +0100
Subject: [PATCH 1698/3246] Fix typo

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

diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/libopencore/default.nix
index 6dbd190e7c9..9a8787ad7f4 100644
--- a/pkgs/development/libraries/libopencore/default.nix
+++ b/pkgs/development/libraries/libopencore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl };
+{ stdenv, fetchurl }:
 
 let
     version = "0.1.5";

From e3d9f6b21b81994af265480621a95b1b4ca5706d Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Tue, 8 Aug 2017 11:48:49 +0200
Subject: [PATCH 1699/3246] openldap: enable crypt

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

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 7155d0f48a8..94a4db43fda 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
       "--disable-dependency-tracking"   # speeds up one-time build
       "--enable-modules"
       "--sysconfdir=/etc"
+      "--enable-crypt"
     ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
       ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
       ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";

From 460a4853684036700e8fe8e8626835ab79e5d61e Mon Sep 17 00:00:00 2001
From: nonsequitur <cornelius.mika@gmail.com>
Date: Tue, 8 Aug 2017 12:49:52 +0200
Subject: [PATCH 1700/3246]  ruby docs: simplify example

The 'phases' attribute is unneeded and misleading
---
 doc/languages-frameworks/ruby.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index 89b7a8986c3..647a30481e3 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -111,7 +111,6 @@ the needed dependencies. For example, to make a derivation
 in stdenv.mkDerivation {
   name = "my-script";
   buildInputs = [ env.wrappedRuby ];
-  phases = [ "installPhase" "fixupPhase" ];
   script = ./my-script.rb;
   buildCommand = ''
     install -D -m755 $script $out/bin/my-script

From 668007f034ab1207836a87923563f74c8abc1164 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 8 Aug 2017 21:12:13 +0900
Subject: [PATCH 1701/3246] flashplayer: 26.0.0.137 -> 26.0.0.151

---
 .../networking/browsers/chromium/plugins.nix           |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 .../mozilla-plugins/flashplayer/standalone.nix         |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index be9aa16e151..c20ce2cca30 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 = "26.0.0.137";
+    version = "26.0.0.151";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0zmslmy7i7ywb2frckg5afkmfqb2lm2mahq0qs8msjzcx9jk4pyx";
+      sha256 = "0l15k2ws3256zyvbfx66j8p1liqv4k2m8hhw2jz8nzza7q6il35p";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index c25390a7c99..0452e7486e6 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 = "26.0.0.137";
+  version = "26.0.0.151";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "1kdwprrrxbdgll05x148vhg86ph77ygr99ycfblblj8wjkcz9s0z"
+          "0dlgardgrd8a18b48b0l6xk68dqi39yndv05phrypsxzr00p23q8"
         else
-          "1ldv0fca43kdda949095r3gk1bc9p8n94z61qijkmrpv91zv5qvl"
+          "0dbvsww4v6hlqn4yhdmzs335inim5iq0ym998x8zpavilqq51y0d"
       else
         if arch == "x86_64" then
-          "0db6dcqal7p79q26kglnsbiv3ysx9r3c7rkdiynww18gzr40vwls"
+          "1yywffslh5px15w62wck1rnlp317jr6a334r409q7hxqc3x90z8l"
         else
-          "1fm6p91c63pyr0lra29vcq2dplb2c7a5114nm4r9rrrzjxakqw5w";
+          "1f1czbx14nvgr1qlzcp03nhj6c55wra8l6f4bsig691n3hfpb6hp";
   };
 
   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 d7dd83b58f3..9a805eb55e4 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,7 +55,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "26.0.0.137";
+  version = "26.0.0.151";
 
   src = fetchurl {
     url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "095457h83zs6cvdyyrh01069kgg8cnhgs1by6s9xpdxgc851n8gp"
+        "0pfb217bg0v9hq0cbyndhmhkba16nhz2rasl7kk4ppxcfcjhr5pb"
       else
-        "1zw3f612cfb8lr331hwqzlpd0gn3r0139bq76pbbbahh2chq99f8";
+        "0a9ayylkpjprad1al7ddplxrpymd181a9gmw9hhk78s11v2zvwn8";
   };
 
   nativeBuildInputs = [ unzip ];

From c943cf7c267e4dbbe0761af1005ca4b9e8b99fd8 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 8 Aug 2017 23:44:25 +1000
Subject: [PATCH 1702/3246] forkstat: 0.01.17 -> 0.02.00

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

diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index 6a987dc9f5b..d69d54af96c 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "forkstat-${version}";
-  version = "0.01.17";
+  version = "0.02.00";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz";
-    sha256 = "0plm2409mmp6n2fjj6bb3z7af2cnh5lg3czlylhgaki9zd0cyb7w";
+    sha256 = "07df2lb32lbr2ggi84h9pjy6ig18n2961ksji4x1hhb4cvc175dg";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From 725089bb2d29d33f90cc826881efe1348e264865 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 8 Aug 2017 23:46:01 +1000
Subject: [PATCH 1703/3246] powerstat: 0.02.11 -> 0.02.12

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

diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix
index 69abdbec5d2..8e52bdf936e 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/pkgs/os-specific/linux/powerstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "powerstat-${version}";
-  version = "0.02.11";
+  version = "0.02.12";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz";
-    sha256 = "0iid3b3284sf89pfp68i1k5mwmr31bqjzasb8clm2sa45ivafx52";
+    sha256 = "16ls3rs1wfckl0b2szqqgiv072afy4qjd3r4kz4vf2qj77kjm06w";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From 49fd201ea35c23cd57f18c9b8bdfa07b765c5790 Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Tue, 8 Aug 2017 15:44:05 +0100
Subject: [PATCH 1704/3246] Fix typo

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4c94ab39619..7a997e92579 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -292,7 +292,7 @@
   khumba = "Bryan Gardiner <bog@khumba.net>";
   KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
   kierdavis = "Kier Davis <kierdavis@gmail.com>";
-  kilourex = "Kiloreux Emperex <kiloreux@gmail.com>";
+  kiloruex = "Kiloreux Emperex <kiloreux@gmail.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>";
   konimex = "Muhammad Herdiansyah <herdiansyah@openmailbox.org>";

From 82a4c5e38b8aaa9787eb184adaa54f06b6f68f8e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 8 Aug 2017 17:07:54 +0200
Subject: [PATCH 1705/3246] ImageMagick: fix Magick-config

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 169576f29bf..48a29e147f0 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -85,7 +85,9 @@ stdenv.mkDerivation rec {
     moveToOutput "bin/*-config" "$dev"
     moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params
     for file in "$dev"/bin/*-config; do
-      substituteInPlace "$file" --replace pkg-config \
+      substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \
+        ${pkgconfig}/bin/pkg-config
+      substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \
         "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'"
     done
   '' + lib.optionalString (ghostscript != null) ''

From f6aa2df3355598ee2cdff876287477fa7d923bd3 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Mon, 7 Aug 2017 22:18:03 -0700
Subject: [PATCH 1706/3246] rftg: init at 0.9.4

An implementation of the card game Race for the Galaxy, including an AI
---
 pkgs/games/rftg/default.nix     | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/games/rftg/default.nix

diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix
new file mode 100644
index 00000000000..27dabe1deac
--- /dev/null
+++ b/pkgs/games/rftg/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, gtk2, pkgconfig }:
+
+stdenv.mkDerivation rec {
+
+  name = "rftg-${version}";
+  version = "0.9.4";
+
+  src = fetchurl {
+    url = "http://keldon.net/rftg/rftg-${version}.tar.bz2";
+    sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8";
+  };
+
+  buildInputs = [ gtk2.dev pkgconfig ];
+
+  meta = {
+    homepage = http://keldon.net/rftg/;
+    description = "Implementation of the card game Race for the Galaxy, including an AI";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.falsifian ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b31eefc9f8a..33be2d64140 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17450,6 +17450,8 @@ with pkgs;
     openglSupport = mesaSupported;
   };
 
+  rftg = callPackage ../games/rftg { };
+
   rigsofrods = callPackage ../games/rigsofrods {
     angelscript = angelscript_2_22;
     mygui = mygui.override {

From d6c510927651edefc5d5a5ef7070a39dfc94144e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 8 Aug 2017 18:06:29 +0200
Subject: [PATCH 1707/3246] python35: 3.5.3 -> 3.5.4

---
 .../interpreters/python/cpython/3.5/default.nix     | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index a47b10d1cbb..82db26960bc 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -27,7 +27,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.5";
-  minorVersion = "3";
+  minorVersion = "4";
   minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "1c6v1n9nz4mlx9mw1125fxpmbrgniqdbbx9hnqx44maqazb2mzpf";
+    sha256 = "0k68ai0a204piwibz013ds6ck7hgj9gk4nin2259y41vpgx3pncl";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
@@ -64,15 +64,6 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
-  patches = [
-    (fetchpatch {
-      name = "glibc-2.25-enosys.patch";
-      url = https://github.com/python/cpython/commit/035ba5da3e53e.patch;
-      sha256 = "1y74ir1w5cq542w27rgzgp70chhq2x047db9911mihpab8p2nj71";
-    })
-    ./no-ldconfig.patch
-  ];
-
   postPatch = ''
     # Determinism
     substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"

From 66e5a9f43f65aa2685edc5e0d932ae14c6d52686 Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Tue, 8 Aug 2017 17:09:19 +0100
Subject: [PATCH 1708/3246] Fix typo

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7a997e92579..a4ea5ecab52 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -292,7 +292,7 @@
   khumba = "Bryan Gardiner <bog@khumba.net>";
   KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
   kierdavis = "Kier Davis <kierdavis@gmail.com>";
-  kiloruex = "Kiloreux Emperex <kiloreux@gmail.com>";
+  kiloreux = "Kiloreux Emperex <kiloreux@gmail.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>";
   konimex = "Muhammad Herdiansyah <herdiansyah@openmailbox.org>";

From 7cdf149fab0dda14b2c11d81e4f440176e3334b7 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Tue, 8 Aug 2017 12:18:16 -0400
Subject: [PATCH 1709/3246] flann: 1.8.4 -> 1.9.1

This should also fix the darwin build on hydra.
---
 pkgs/development/libraries/flann/default.nix      | 15 +++++++--------
 .../development/libraries/flann/no-examples.patch | 10 ----------
 2 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/flann/no-examples.patch

diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix
index 145d2b42a9d..eda18bc432c 100644
--- a/pkgs/development/libraries/flann/default.nix
+++ b/pkgs/development/libraries/flann/default.nix
@@ -1,18 +1,17 @@
-{stdenv, fetchurl, unzip, cmake, python}:
+{stdenv, fetchFromGitHub, unzip, cmake, python}:
 
 stdenv.mkDerivation {
-  name = "flann-1.8.4";
+  name = "flann-1.9.1";
 
-  src = fetchurl {
-    url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip;
-    sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz";
+  src = fetchFromGitHub {
+    owner = "mariusmuja";
+    repo = "flann";
+    rev = "1.9.1";
+    sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
   };
 
   buildInputs = [ unzip cmake python ];
 
-  # patch out examples in Darwin because they do not compile.
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-examples.patch ];
-
   meta = {
     homepage = http://people.cs.ubc.ca/~mariusm/flann/;
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/flann/no-examples.patch b/pkgs/development/libraries/flann/no-examples.patch
deleted file mode 100644
index 95a6f0eed8e..00000000000
--- a/pkgs/development/libraries/flann/no-examples.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt	
-+++ b/CMakeLists.txt	
-@@ -155,7 +155,7 @@
-
- add_subdirectory( cmake )
- add_subdirectory( src )
--add_subdirectory( examples )
-+#add_subdirectory( examples )
- add_subdirectory( test )
- add_subdirectory( doc )

From c74d0d460f3070de23fd55fc81822d23bc0bd686 Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Tue, 8 Aug 2017 17:36:15 +0100
Subject: [PATCH 1710/3246] Implement other required changes

---
 .../libraries/{libopencore => opencore-amr}/default.nix       | 0
 pkgs/top-level/all-packages.nix                               | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/{libopencore => opencore-amr}/default.nix (100%)

diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/opencore-amr/default.nix
similarity index 100%
rename from pkgs/development/libraries/libopencore/default.nix
rename to pkgs/development/libraries/opencore-amr/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 378f334c45f..e4adb1e282b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4682,8 +4682,6 @@ with pkgs;
     openssl = null;
   };
 
-  opencore-amr = callPackage ../development/libraries/libopencore { };
-  
   ding-libs = callPackage ../tools/misc/ding-libs { };
 
   sssd = callPackage ../os-specific/linux/sssd {
@@ -9640,6 +9638,8 @@ with pkgs;
 
   opencollada = callPackage ../development/libraries/opencollada { };
 
+  opencore-amr = callPackage ../development/libraries/opencore-amr { };
+  
   opencsg = callPackage ../development/libraries/opencsg { };
 
   openct = callPackage ../development/libraries/openct { };

From e60ffe642e68812dba4334da9867551bbd888c3c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 8 Aug 2017 16:20:22 +0000
Subject: [PATCH 1711/3246] ocamlPackages.ocamlnet: 4.1.2 -> 4.1.3

---
 .../ocaml-modules/ocamlnet/default.nix         | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 82747b7a876..7e0cad538d5 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -1,12 +1,23 @@
 { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
 , gnutls, nettle }:
 
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.03"
+  then {
+    version = "4.1.3";
+    sha256 = "1ifm3izml9hnr7cic1413spnd8x8ka795awsm2xpam3cs8z3j0ca";
+  } else {
+    version = "4.1.2";
+    sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i";
+  };
+in
+
 stdenv.mkDerivation {
-  name = "ocamlnet-4.1.2";
+  name = "ocaml${ocaml.version}-ocamlnet-${param.version}";
 
   src = fetchurl {
-    url = http://download.camlcity.org/download/ocamlnet-4.1.2.tar.gz;
-    sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i";
+    url = "http://download.camlcity.org/download/ocamlnet-${param.version}.tar.gz";
+    inherit (param) sha256;
   };
 
   buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ];
@@ -40,6 +51,5 @@ stdenv.mkDerivation {
     maintainers = [
       stdenv.lib.maintainers.z77z
     ];
-    broken = stdenv.lib.versionAtLeast ocaml.version "4.05";
   };
 }

From 4021d4d5ee7338ddaff4a1c5c2e41c85da206f18 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 8 Aug 2017 17:19:02 +0000
Subject: [PATCH 1712/3246] Make version a parameter in GHC HEAD derivation

If you want to override the source but the major version changes (ie 8.1
-> 8.3) then you also have to modify the version. Otherwise the build
will fail with difficult to understand errors, making version a
parameter makes it easy to override.
---
 pkgs/development/compilers/ghc/head.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 5a505f39b1a..6573c60ac3a 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -5,6 +5,7 @@
   # If enabled GHC will be build with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
 , enableIntegerSimple ? false, gmp
+, version ? "8.1.20170106"
 }:
 
 let
@@ -12,7 +13,6 @@ let
 
   commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
-  version = "8.1.20170106";
   rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
 
   commonPreConfigure =  ''

From cf7b262485cc81feec53966fa8846d241bb78bca Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 8 Aug 2017 17:21:22 +0000
Subject: [PATCH 1713/3246] Boot ghc HEAD with ghc-8.0.2

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 81a32e1219f..09e3835712f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -84,7 +84,7 @@ in rec {
       selfPkgs = packages.ghc821;
     };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
-      bootPkgs = packages.ghc7103;
+      bootPkgs = packages.ghc802;
       inherit (bootPkgs) alex happy;
       inherit buildPlatform targetPlatform;
       selfPkgs = packages.ghcHEAD;

From 770743bd91685befe4e3f1caee280d54c17aa641 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 8 Aug 2017 17:32:26 +0000
Subject: [PATCH 1714/3246] Bump ghc HEAD version ghc-8.3.20170808

---
 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 6573c60ac3a..362b4895b7e 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -5,7 +5,7 @@
   # If enabled GHC will be build with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
 , enableIntegerSimple ? false, gmp
-, version ? "8.1.20170106"
+, version ? "8.3.20170808"
 }:
 
 let
@@ -13,7 +13,7 @@ let
 
   commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
-  rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
+  rev = "14457cf6a50f708eecece8f286f08687791d51f7";
 
   commonPreConfigure =  ''
     echo ${version} >VERSION
@@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec {
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0";
+    sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y";
   };
 
   postPatch = "patchShebangs .";

From 57506bbb2800d5afcf02cc82efd81d3db67fff9c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@compositional.io>
Date: Tue, 8 Aug 2017 17:40:50 +0000
Subject: [PATCH 1715/3246] xen-4.8: update changed patch hash

---
 pkgs/applications/virtualization/xen/4.8.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index f6205f5c467..3429545557a 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -53,7 +53,7 @@ callPackage (import ./generic.nix (rec {
       patches = [
         (xsaPatch {
           name = "216-qemuu";
-          sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5ma1";
+          sha256 = "06w2iw1r5gip2bpbg19cziws965h9in0f6np74cr31f76yy30yxn";
         })
       ];
       meta.description = "Xen's fork of upstream Qemu";

From eeeead21c5253e2fea5c8c84da79687cd3abe2fd Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 8 Aug 2017 11:56:31 -0700
Subject: [PATCH 1716/3246] add override for digestive-functors-blaze

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 069213c8798..00515be47df 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -867,4 +867,7 @@ self: super: {
   # https://github.com/vincenthz/hs-tls/issues/247
   tls = dontCheck super.tls;
 
+  # missing dependencies: blaze-html >=0.5 && <0.9, blaze-markup >=0.5 && <0.8
+  digestive-functors-blaze = doJailbreak super.digestive-functors-blaze;
+
 }

From c00a95be6324dffe0afe96f2a362f4c8a2d2364e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 8 Aug 2017 21:45:46 +0200
Subject: [PATCH 1717/3246] nix-prefetch-git: fix wrapProgram call

---
 pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index f37940c65c1..291b1a7c600 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -19,7 +19,7 @@ let mkPrefetchScript = tool: src: deps:
       done
       wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin"
       wrapArgs="$wrapArgs --prefix PATH : ${nix.out}/bin" # For nix-hash
-      wrapArgs="$wrapArgs --set HOME : /homeless-shelter"
+      wrapArgs="$wrapArgs --set HOME /homeless-shelter"
       wrapProgram $out/bin/$name $wrapArgs
     '';
 

From 1b77c2950796d0235b2fe33551667c23ae95c2fb Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 8 Aug 2017 22:03:49 +0200
Subject: [PATCH 1718/3246] tor-browser-bundle-bin: 7.0.3 -> 7.0.4

- Update Firefox to 52.3.0esr
- Update Tor to 0.3.0.10
---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 423be7c33e7..980c90a91ee 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -84,7 +84,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.0.3";
+  version = "7.0.4";
 
   lang = "en-US";
 
@@ -94,7 +94,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1p91szx60xx3295bpap9w2ydgaibj0yn9lbdyhajal35bbhjxqhc";
+      sha256 = "17hz6nv7py80zbksk1dypmj8agr5jzsfrpjncphpsrflvbqzs2bx";
     };
 
     "i686-linux" = fetchurl {
@@ -102,7 +102,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0p51dxiq3qxyc5n7xvh1hq039pvp7z730f6dks4h5p3sfqw6isfp";
+      sha256 = "0g8m5x891f4kdvb3fhmh98xfw569sbqd9wcadflabf9vc9bqv3al";
     };
   };
 in

From 2adf36ab8c7903e100e6e7a0a6447934ec09b10e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 8 Aug 2017 23:22:24 +0200
Subject: [PATCH 1719/3246] gcc: fix clang build

---
 pkgs/development/compilers/gcc/5/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e95ef92c3f6..c9780077835 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -325,7 +325,13 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+  preConfigure =
+    # Not sure why this is causing problems, now that the stdenv
+    # exports CPP=cpp the build fails with strange errors on darwin.
+    # https://github.com/NixOS/nixpkgs/issues/27889
+    stdenv.lib.optionalString stdenv.cc.isClang ''
+    unset CPP
+  '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

From 7e3e7906759c2900086baf0218581366e8b7f51e Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 8 Aug 2017 14:28:31 -0700
Subject: [PATCH 1720/3246] add override for html-entities

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 00515be47df..9d916e70645 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -870,4 +870,7 @@ self: super: {
   # missing dependencies: blaze-html >=0.5 && <0.9, blaze-markup >=0.5 && <0.8
   digestive-functors-blaze = doJailbreak super.digestive-functors-blaze;
 
+  # missing dependencies: doctest ==0.12.*
+  html-entities = doJailbreak super.html-entities;
+
 }

From b48ffa332bb9814a04a766072f25e08c3f5abe44 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 8 Aug 2017 22:02:56 +0000
Subject: [PATCH 1721/3246] services.fluentd: add plugins option

This allows us to pass in additional ad-hoc fluentd plugins for custom
output formats and other goodness.
---
 nixos/modules/services/logging/fluentd.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix
index 9fbec245737..95825705d9d 100644
--- a/nixos/modules/services/logging/fluentd.nix
+++ b/nixos/modules/services/logging/fluentd.nix
@@ -4,6 +4,8 @@ with lib;
 
 let
   cfg = config.services.fluentd;
+
+  pluginArgs = concatStringsSep " " (map (x: "-p ${x}") cfg.plugins);
 in {
   ###### interface
 
@@ -28,6 +30,15 @@ in {
         defaultText = "pkgs.fluentd";
         description = "The fluentd package to use.";
       };
+
+      plugins = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = ''
+          A list of plugin paths to pass into fluentd. It will make plugins defined in ruby files
+          there available in your config.
+        '';
+      };
     };
   };
 
@@ -39,7 +50,7 @@ in {
       description = "Fluentd Daemon";
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}";
+        ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config} ${pluginArgs}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };
     };

From bd498ebeece5689385b1cd717362b3bc196b6888 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 9 Aug 2017 00:52:14 +0200
Subject: [PATCH 1722/3246] faker: add ipaddress dependency for Python 2

Faker requires ipaddress package on Python < 3.3:

https://github.com/joke2k/faker/blob/v0.7.18/setup.py#L66-L76
---
 pkgs/development/python-modules/faker/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index ce6887f3e06..3a2a0a64ce6 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi, pythonOlder,
   # Build inputs
-  dateutil, six,
+  dateutil, six, ipaddress ? null,
   # Test inputs
   email_validator, nose, mock, ukpostcodeparser }:
 
+assert pythonOlder "3.3" -> ipaddress != null;
+
 buildPythonPackage rec {
   pname = "Faker";
   version = "0.7.18";
@@ -24,7 +26,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     dateutil
     six
-  ];
+  ] ++ lib.optional (pythonOlder "3.3") ipaddress;
 
   meta = with lib; {
     description = "A Python library for generating fake user data";

From 7e943b5fdb103c2a9a245dbde6ffcc8f19e08860 Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Wed, 9 Aug 2017 02:40:36 +0100
Subject: [PATCH 1723/3246] Enable opencore-amr in ffmpeg-full

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

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index c0c9cfa2749..d9239989cf6 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -100,7 +100,7 @@
 , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support
 , openal ? null # OpenAL 1.1 capture support
 #, opencl ? null # OpenCL code
-#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
+, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
 #, opencv ? null # Video filtering
 , openglExtlib ? false, mesa ? null # OpenGL rendering
 #, openh264 ? null # H.264/AVC encoder
@@ -155,7 +155,7 @@
  *
  * Not packaged:
  *   aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883
- *   libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame
+ *   libmxf libnut libquvi nvenc opencl openh264 oss shine twolame
  *   utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
  *
  * Need fixes to support Darwin:
@@ -360,7 +360,7 @@ stdenv.mkDerivation rec {
     (enableFeature nvenc "nvenc")
     (enableFeature (openal != null) "openal")
     #(enableFeature opencl "opencl")
-    #(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb")
+    (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb")
     #(enableFeature (opencv != null) "libopencv")
     (enableFeature openglExtlib "opengl")
     #(enableFeature (openh264 != null) "openh264")
@@ -403,7 +403,7 @@ stdenv.mkDerivation rec {
     bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
     libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
     libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
-    libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump
+    libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr
     samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
   ] ++ optional openglExtlib mesa
     ++ optionals nonfreeLicensing [ fdk_aac openssl ]

From 6616b9a2255545b42831275b8b44ce6845d1330f Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 8 Aug 2017 20:36:17 -0700
Subject: [PATCH 1724/3246] discord: 0.0.1 -> 0.0.2

---
 .../instant-messengers/discord/default.nix       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index a1f9588d6c9..dab68440b87 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
 , glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
-, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango
-, systemd, libXScrnSaver }:
+, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
+, pango, systemd, libXScrnSaver, libcxx }:
 
 stdenv.mkDerivation rec {
 
     pname = "discord";
-    version = "0.0.1";
+    version = "0.0.2";
     name = "${pname}-${version}";
 
     src = fetchurl {
         url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz";
-        sha256 = "10m3ixvhmxdw55awd84gx13m222qjykj7gcigbjabcvsgp2z63xs";
+        sha256 = "0sb7l0rrpqxzn4fndjr50r5xfiid1f81p22gda4mz943yv37mhfz";
     };
 
+    nativeBuildInputs = [ makeWrapper ];
+
     libPath = stdenv.lib.makeLibraryPath [
         stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
         gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite
         libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
-        libXtst nspr nss pango systemd libXScrnSaver
+        libXtst nspr nss libxcb pango systemd libXScrnSaver
      ];
 
     installPhase = ''
@@ -34,6 +36,8 @@ stdenv.mkDerivation rec {
 
         paxmark m $out/Discord
 
+        wrapProgram $out/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib"
+
         ln -s $out/Discord $out/bin/
         ln -s $out/discord.png $out/share/pixmaps
 

From 3bda92175a7d466facdad03869d33139cabbadd0 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 8 Aug 2017 22:29:19 -0700
Subject: [PATCH 1725/3246] discord: minor clean up, add self to maintainers

---
 .../instant-messengers/discord/default.nix    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index dab68440b87..f787f3f26e9 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -25,24 +25,22 @@ stdenv.mkDerivation rec {
      ];
 
     installPhase = ''
-        mkdir -p $out/{bin,share/pixmaps}
-        mv * $out
+        mkdir -p $out/{bin,opt,share/pixmaps}
+        mv * $out/opt
 
         # Copying how adobe-reader does it,
         # see pkgs/applications/misc/adobe-reader/builder.sh
         patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                 --set-rpath "$out:$libPath"                                   \
-                 $out/Discord
+                 --set-rpath "$out/opt:$libPath"                                   \
+                 $out/opt/Discord
 
-        paxmark m $out/Discord
+        paxmark m $out/opt/Discord
 
-        wrapProgram $out/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib"
+        wrapProgram $out/opt/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib"
 
-        ln -s $out/Discord $out/bin/
-        ln -s $out/discord.png $out/share/pixmaps
+        ln -s $out/opt/Discord $out/bin/
+        ln -s $out/opt/discord.png $out/share/pixmaps
 
-        # Putting udev in the path won't work :(
-        ln -s ${systemd.lib}/lib/libudev.so.1 $out
         ln -s "${desktopItem}/share/applications" $out/share/
         '';
 
@@ -60,7 +58,7 @@ stdenv.mkDerivation rec {
         homepage = https://discordapp.com/;
         downloadPage = "https://github.com/crmarsh/discord-linux-bugs";
         license = licenses.unfree;
-        maintainers = [ maintainers.ldesgoui ];
+        maintainers = [ maintainers.ldesgoui maintainers.MP2E ];
         platforms = [ "x86_64-linux" ];
     };
 }

From c877e8d66dd3a8580d0fa29d834b4f4e59b054cb Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Wed, 9 Aug 2017 14:46:45 +0900
Subject: [PATCH 1726/3246] json-refs: init at 3.0.0

---
 .../node-packages/node-packages-v4.nix        |  545 ++-
 .../node-packages/node-packages-v6.json       |    1 +
 .../node-packages/node-packages-v6.nix        | 3913 ++++++++++-------
 3 files changed, 2688 insertions(+), 1771 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index d22e217efbb..c8924937cac 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -787,13 +787,13 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "resolve-1.3.3" = {
+    "resolve-1.4.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.3.3";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz";
-        sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
+        sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86";
       };
     };
     "detect-file-0.1.0" = {
@@ -1210,13 +1210,13 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "which-1.2.14" = {
+    "which-1.3.0" = {
       name = "which";
       packageName = "which";
-      version = "1.2.14";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
-        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
+        url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
+        sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -2029,13 +2029,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.15" = {
+    "mime-types-2.1.16" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.15";
+      version = "2.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
-        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz";
+        sha1 = "2b858a52e5ecd516db897ac2be87487830698e23";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -2209,13 +2209,13 @@ let
         sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
       };
     };
-    "jsprim-1.4.0" = {
+    "jsprim-1.4.1" = {
       name = "jsprim";
       packageName = "jsprim";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
-        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
     "sshpk-1.13.1" = {
@@ -2236,13 +2236,13 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "extsprintf-1.0.2" = {
+    "extsprintf-1.3.0" = {
       name = "extsprintf";
       packageName = "extsprintf";
-      version = "1.0.2";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
-        sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
     "json-schema-0.2.3" = {
@@ -2254,13 +2254,13 @@ let
         sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
       };
     };
-    "verror-1.3.6" = {
+    "verror-1.10.0" = {
       name = "verror";
       packageName = "verror";
-      version = "1.3.6";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
-        sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
     "asn1-0.2.3" = {
@@ -2326,13 +2326,13 @@ let
         sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
-    "mime-db-1.27.0" = {
+    "mime-db-1.29.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.27.0";
+      version = "1.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz";
-        sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz";
+        sha1 = "48d26d235589651704ac5916ca06001914266878";
       };
     };
     "punycode-1.4.1" = {
@@ -2380,13 +2380,13 @@ let
         sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
       };
     };
-    "express-4.15.3" = {
+    "express-4.15.4" = {
       name = "express";
       packageName = "express";
-      version = "4.15.3";
+      version = "4.15.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz";
-        sha1 = "bab65d0f03aa80c358408972fc700f916944b662";
+        url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz";
+        sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1";
       };
     };
     "rc-1.2.1" = {
@@ -3001,22 +3001,13 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "debug-2.6.7" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz";
-        sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e";
-      };
-    };
-    "depd-1.1.0" = {
+    "depd-1.1.1" = {
       name = "depd";
       packageName = "depd";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz";
-        sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3";
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz";
+        sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359";
       };
     };
     "encodeurl-1.0.1" = {
@@ -3046,13 +3037,13 @@ let
         sha1 = "6f631aef336d6c46362b51764044ce216be3c051";
       };
     };
-    "finalhandler-1.0.3" = {
+    "finalhandler-1.0.4" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz";
-        sha1 = "ef47e77950e999780e86022a560e3217e0d0cc89";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz";
+        sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7";
       };
     };
     "fresh-0.5.0" = {
@@ -3109,13 +3100,22 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.4" = {
+    "proxy-addr-1.1.5" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz";
-        sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz";
+        sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918";
+      };
+    };
+    "qs-6.5.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
+        sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49";
       };
     };
     "range-parser-1.2.0" = {
@@ -3127,22 +3127,22 @@ let
         sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
       };
     };
-    "send-0.15.3" = {
+    "send-0.15.4" = {
       name = "send";
       packageName = "send";
-      version = "0.15.3";
+      version = "0.15.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz";
-        sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309";
+        url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz";
+        sha1 = "985faa3e284b0273c793364a35c6737bd93905b9";
       };
     };
-    "serve-static-1.12.3" = {
+    "serve-static-1.12.4" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.12.3";
+      version = "1.12.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz";
-        sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz";
+        sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961";
       };
     };
     "setprototypeof-1.0.3" = {
@@ -3226,13 +3226,13 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
-    "ipaddr.js-1.3.0" = {
+    "ipaddr.js-1.4.0" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz";
-        sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz";
+        sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0";
       };
     };
     "destroy-1.0.4" = {
@@ -3244,13 +3244,13 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
-    "http-errors-1.6.1" = {
+    "http-errors-1.6.2" = {
       name = "http-errors";
       packageName = "http-errors";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz";
-        sha1 = "5f8b8ed98aca545656bf572997387f904a722257";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz";
+        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
       };
     };
     "mime-1.3.4" = {
@@ -3334,6 +3334,15 @@ let
         sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
       };
     };
+    "semver-5.4.1" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
+        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
+      };
+    };
     "tar-pack-3.4.0" = {
       name = "tar-pack";
       packageName = "tar-pack";
@@ -3622,13 +3631,13 @@ let
         sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
       };
     };
-    "libnpx-9.0.7" = {
+    "libnpx-9.2.3" = {
       name = "libnpx";
       packageName = "libnpx";
-      version = "9.0.7";
+      version = "9.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.0.7.tgz";
-        sha1 = "e30e4d5d0cc21c849541441855d0d334d00b009b";
+        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz";
+        sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304";
       };
     };
     "lockfile-1.0.3" = {
@@ -3955,6 +3964,15 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
+    "which-1.2.14" = {
+      name = "which";
+      packageName = "which";
+      version = "1.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
+        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
+      };
+    };
     "worker-farm-1.4.1" = {
       name = "worker-farm";
       packageName = "worker-farm";
@@ -4126,13 +4144,13 @@ let
         sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
       };
     };
-    "os-locale-2.0.0" = {
+    "os-locale-2.1.0" = {
       name = "os-locale";
       packageName = "os-locale";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz";
-        sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4";
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
+        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
       };
     };
     "read-pkg-up-2.0.0" = {
@@ -4162,13 +4180,13 @@ let
         sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
       };
     };
-    "string-width-2.1.0" = {
+    "string-width-2.1.1" = {
       name = "string-width";
       packageName = "string-width";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz";
-        sha1 = "030664561fc146c9423ec7d978fe2457437fe6d0";
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
+        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
       };
     };
     "which-module-2.0.0" = {
@@ -4189,13 +4207,13 @@ let
         sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
       };
     };
-    "execa-0.5.1" = {
+    "execa-0.7.0" = {
       name = "execa";
       packageName = "execa";
-      version = "0.5.1";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz";
-        sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36";
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
       };
     };
     "mem-1.1.0" = {
@@ -4207,22 +4225,22 @@ let
         sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
       };
     };
-    "cross-spawn-4.0.2" = {
+    "cross-spawn-5.1.0" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
-      version = "4.0.2";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
-        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
       };
     };
-    "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-stream-1.1.0" = {
@@ -4261,6 +4279,24 @@ let
         sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
       };
     };
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    };
     "path-key-2.0.1" = {
       name = "path-key";
       packageName = "path-key";
@@ -4405,13 +4441,13 @@ let
         sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
       };
     };
-    "duplexify-3.5.0" = {
+    "duplexify-3.5.1" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.5.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz";
-        sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz";
+        sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd";
       };
     };
     "end-of-stream-1.4.0" = {
@@ -4486,15 +4522,6 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "end-of-stream-1.0.0" = {
-      name = "end-of-stream";
-      packageName = "end-of-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
-        sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
-      };
-    };
     "stream-shift-1.0.0" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -4612,13 +4639,13 @@ let
         sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4";
       };
     };
-    "https-proxy-agent-2.0.0" = {
+    "https-proxy-agent-2.1.0" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz";
-        sha1 = "ffaa4b6faf586ac340c18a140431e76b7d7f2944";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
+        sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443";
       };
     };
     "node-fetch-npm-2.0.1" = {
@@ -4648,13 +4675,13 @@ let
         sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
       };
     };
-    "agent-base-4.1.0" = {
+    "agent-base-4.1.1" = {
       name = "agent-base";
       packageName = "agent-base";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.0.tgz";
-        sha1 = "20e17401cd49b3c076bf56a4bc6c5b436ffa8d55";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
+        sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -4810,22 +4837,22 @@ let
         sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
       };
     };
-    "boxen-1.2.0" = {
+    "boxen-1.2.1" = {
       name = "boxen";
       packageName = "boxen";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz";
-        sha1 = "03478d84be7fe02189b80904d81d6a80384368f1";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz";
+        sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d";
       };
     };
-    "configstore-3.1.0" = {
+    "configstore-3.1.1" = {
       name = "configstore";
       packageName = "configstore";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz";
-        sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1";
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
+        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
       };
     };
     "import-lazy-2.1.0" = {
@@ -4882,13 +4909,13 @@ let
         sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
       };
     };
-    "chalk-2.0.1" = {
+    "chalk-2.1.0" = {
       name = "chalk";
       packageName = "chalk";
-      version = "2.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz";
-        sha1 = "dbec49436d2ae15f536114e76d14656cdbc0f44d";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
+        sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e";
       };
     };
     "cli-boxes-1.0.0" = {
@@ -4918,22 +4945,22 @@ let
         sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
       };
     };
-    "ansi-styles-3.1.0" = {
+    "ansi-styles-3.2.0" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz";
-        sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
+        sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88";
       };
     };
-    "supports-color-4.2.0" = {
+    "supports-color-4.2.1" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz";
-        sha1 = "ad986dc7eb2315d009b4d77c8169c2231a684037";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
+        sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836";
       };
     };
     "color-convert-1.9.0" = {
@@ -4945,13 +4972,13 @@ let
         sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
       };
     };
-    "color-name-1.1.2" = {
+    "color-name-1.1.3" = {
       name = "color-name";
       packageName = "color-name";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
-        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
+        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
       };
     };
     "has-flag-2.0.0" = {
@@ -4963,58 +4990,13 @@ let
         sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
       };
     };
-    "execa-0.7.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
-        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
-      };
-    };
-    "cross-spawn-5.1.0" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
-      };
-    };
-    "get-stream-3.0.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
-      };
-    };
-    "shebang-command-1.2.0" = {
-      name = "shebang-command";
-      packageName = "shebang-command";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
-        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
-      };
-    };
-    "shebang-regex-1.0.0" = {
-      name = "shebang-regex";
-      packageName = "shebang-regex";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
-        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
-      };
-    };
-    "dot-prop-4.1.1" = {
+    "dot-prop-4.2.0" = {
       name = "dot-prop";
       packageName = "dot-prop";
-      version = "4.1.1";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz";
-        sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1";
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
+        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
       };
     };
     "make-dir-1.0.0" = {
@@ -5725,10 +5707,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.6";
+    version = "1.12.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz";
-      sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
+      sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -6039,7 +6021,7 @@ in
                             ];
                           })
                           sources."ini-1.3.4"
-                          (sources."which-1.2.14" // {
+                          (sources."which-1.3.0" // {
                             dependencies = [
                               sources."isexe-2.0.0"
                             ];
@@ -6121,7 +6103,7 @@ in
           sources."lodash.isstring-4.0.1"
           sources."lodash.mapvalues-4.6.0"
           sources."rechoir-0.6.2"
-          (sources."resolve-1.3.3" // {
+          (sources."resolve-1.4.0" // {
             dependencies = [
               sources."path-parse-1.0.5"
             ];
@@ -6417,12 +6399,16 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.4.0" // {
+              (sources."jsprim-1.4.1" // {
                 dependencies = [
                   sources."assert-plus-1.0.0"
-                  sources."extsprintf-1.0.2"
+                  sources."extsprintf-1.3.0"
                   sources."json-schema-0.2.3"
-                  sources."verror-1.3.6"
+                  (sources."verror-1.10.0" // {
+                    dependencies = [
+                      sources."core-util-is-1.0.2"
+                    ];
+                  })
                 ];
               })
               (sources."sshpk-1.13.1" // {
@@ -6442,9 +6428,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.15" // {
+          (sources."mime-types-2.1.16" // {
             dependencies = [
-              sources."mime-db-1.27.0"
+              sources."mime-db-1.29.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -6469,7 +6455,7 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."which-1.2.14" // {
+      (sources."which-1.3.0" // {
         dependencies = [
           sources."isexe-2.0.0"
         ];
@@ -6678,13 +6664,13 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."express-4.15.3" // {
+      (sources."express-4.15.4" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.15" // {
+              (sources."mime-types-2.1.16" // {
                 dependencies = [
-                  sources."mime-db-1.27.0"
+                  sources."mime-db-1.29.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -6695,16 +6681,11 @@ in
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          (sources."debug-2.6.7" // {
-            dependencies = [
-              sources."ms-2.0.0"
-            ];
-          })
-          sources."depd-1.1.0"
+          sources."depd-1.1.1"
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.8.0"
-          (sources."finalhandler-1.0.3" // {
+          (sources."finalhandler-1.0.4" // {
             dependencies = [
               sources."unpipe-1.0.0"
             ];
@@ -6719,18 +6700,18 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.4" // {
+          (sources."proxy-addr-1.1.5" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.3.0"
+              sources."ipaddr.js-1.4.0"
             ];
           })
-          sources."qs-6.4.0"
+          sources."qs-6.5.0"
           sources."range-parser-1.2.0"
-          (sources."send-0.15.3" // {
+          (sources."send-0.15.4" // {
             dependencies = [
               sources."destroy-1.0.4"
-              (sources."http-errors-1.6.1" // {
+              (sources."http-errors-1.6.2" // {
                 dependencies = [
                   sources."inherits-2.0.3"
                 ];
@@ -6739,15 +6720,15 @@ in
               sources."ms-2.0.0"
             ];
           })
-          sources."serve-static-1.12.3"
+          sources."serve-static-1.12.4"
           sources."setprototypeof-1.0.3"
           sources."statuses-1.3.1"
           (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.15" // {
+              (sources."mime-types-2.1.16" // {
                 dependencies = [
-                  sources."mime-db-1.27.0"
+                  sources."mime-db-1.29.0"
                 ];
               })
             ];
@@ -6915,12 +6896,16 @@ in
                   (sources."http-signature-1.1.1" // {
                     dependencies = [
                       sources."assert-plus-0.2.0"
-                      (sources."jsprim-1.4.0" // {
+                      (sources."jsprim-1.4.1" // {
                         dependencies = [
                           sources."assert-plus-1.0.0"
-                          sources."extsprintf-1.0.2"
+                          sources."extsprintf-1.3.0"
                           sources."json-schema-0.2.3"
-                          sources."verror-1.3.6"
+                          (sources."verror-1.10.0" // {
+                            dependencies = [
+                              sources."core-util-is-1.0.2"
+                            ];
+                          })
                         ];
                       })
                       (sources."sshpk-1.13.1" // {
@@ -6940,9 +6925,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.15" // {
+                  (sources."mime-types-2.1.16" // {
                     dependencies = [
-                      sources."mime-db-1.27.0"
+                      sources."mime-db-1.29.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -6989,7 +6974,7 @@ in
                   })
                 ];
               })
-              sources."semver-5.3.0"
+              sources."semver-5.4.1"
               (sources."tar-2.2.1" // {
                 dependencies = [
                   sources."block-stream-0.0.9"
@@ -7157,12 +7142,16 @@ in
                   (sources."http-signature-1.1.1" // {
                     dependencies = [
                       sources."assert-plus-0.2.0"
-                      (sources."jsprim-1.4.0" // {
+                      (sources."jsprim-1.4.1" // {
                         dependencies = [
                           sources."assert-plus-1.0.0"
-                          sources."extsprintf-1.0.2"
+                          sources."extsprintf-1.3.0"
                           sources."json-schema-0.2.3"
-                          sources."verror-1.3.6"
+                          (sources."verror-1.10.0" // {
+                            dependencies = [
+                              sources."core-util-is-1.0.2"
+                            ];
+                          })
                         ];
                       })
                       (sources."sshpk-1.13.1" // {
@@ -7182,9 +7171,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.15" // {
+                  (sources."mime-types-2.1.16" // {
                     dependencies = [
-                      sources."mime-db-1.27.0"
+                      sources."mime-db-1.29.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -7231,7 +7220,7 @@ in
                   })
                 ];
               })
-              sources."semver-5.3.0"
+              sources."semver-5.4.1"
               (sources."tar-2.2.1" // {
                 dependencies = [
                   sources."block-stream-0.0.9"
@@ -7289,7 +7278,7 @@ in
           })
         ];
       })
-      (sources."which-1.2.14" // {
+      (sources."which-1.3.0" // {
         dependencies = [
           sources."isexe-2.0.0"
         ];
@@ -7472,12 +7461,16 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.4.0" // {
+              (sources."jsprim-1.4.1" // {
                 dependencies = [
                   sources."assert-plus-1.0.0"
-                  sources."extsprintf-1.0.2"
+                  sources."extsprintf-1.3.0"
                   sources."json-schema-0.2.3"
-                  sources."verror-1.3.6"
+                  (sources."verror-1.10.0" // {
+                    dependencies = [
+                      sources."core-util-is-1.0.2"
+                    ];
+                  })
                 ];
               })
               (sources."sshpk-1.13.1" // {
@@ -7497,9 +7490,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.15" // {
+          (sources."mime-types-2.1.16" // {
             dependencies = [
-              sources."mime-db-1.27.0"
+              sources."mime-db-1.29.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -7547,7 +7540,7 @@ in
           })
         ];
       })
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       (sources."tar-2.2.1" // {
         dependencies = [
           sources."block-stream-0.0.9"
@@ -7618,10 +7611,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.2.0";
+    version = "5.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.2.0.tgz";
-      sha1 = "0014eb05ead6870587fa1c068108935c898e9847";
+      url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz";
+      sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -7725,7 +7718,7 @@ in
         ];
       })
       sources."lazy-property-1.0.0"
-      (sources."libnpx-9.0.7" // {
+      (sources."libnpx-9.2.3" // {
         dependencies = [
           sources."dotenv-4.0.0"
           sources."y18n-3.2.1"
@@ -7754,21 +7747,20 @@ in
               })
               sources."decamelize-1.2.0"
               sources."get-caller-file-1.0.2"
-              (sources."os-locale-2.0.0" // {
+              (sources."os-locale-2.1.0" // {
                 dependencies = [
-                  (sources."execa-0.5.1" // {
+                  (sources."execa-0.7.0" // {
                     dependencies = [
-                      sources."cross-spawn-4.0.2"
-                      (sources."get-stream-2.3.1" // {
+                      (sources."cross-spawn-5.1.0" // {
                         dependencies = [
-                          sources."object-assign-4.1.1"
-                          (sources."pinkie-promise-2.0.1" // {
+                          (sources."shebang-command-1.2.0" // {
                             dependencies = [
-                              sources."pinkie-2.0.4"
+                              sources."shebang-regex-1.0.0"
                             ];
                           })
                         ];
                       })
+                      sources."get-stream-3.0.0"
                       sources."is-stream-1.1.0"
                       (sources."npm-run-path-2.0.2" // {
                         dependencies = [
@@ -7837,7 +7829,7 @@ in
               sources."require-directory-2.1.1"
               sources."require-main-filename-1.0.1"
               sources."set-blocking-2.0.0"
-              (sources."string-width-2.1.0" // {
+              (sources."string-width-2.1.1" // {
                 dependencies = [
                   sources."is-fullwidth-code-point-2.0.0"
                 ];
@@ -7872,13 +7864,8 @@ in
               sources."typedarray-0.0.6"
             ];
           })
-          (sources."duplexify-3.5.0" // {
+          (sources."duplexify-3.5.1" // {
             dependencies = [
-              (sources."end-of-stream-1.0.0" // {
-                dependencies = [
-                  sources."once-1.3.3"
-                ];
-              })
               sources."stream-shift-1.0.0"
             ];
           })
@@ -8010,7 +7997,7 @@ in
               sources."http-cache-semantics-3.7.3"
               (sources."http-proxy-agent-2.0.0" // {
                 dependencies = [
-                  (sources."agent-base-4.1.0" // {
+                  (sources."agent-base-4.1.1" // {
                     dependencies = [
                       (sources."es6-promisify-5.0.0" // {
                         dependencies = [
@@ -8026,9 +8013,9 @@ in
                   })
                 ];
               })
-              (sources."https-proxy-agent-2.0.0" // {
+              (sources."https-proxy-agent-2.1.0" // {
                 dependencies = [
-                  (sources."agent-base-4.1.0" // {
+                  (sources."agent-base-4.1.1" // {
                     dependencies = [
                       (sources."es6-promisify-5.0.0" // {
                         dependencies = [
@@ -8060,7 +8047,7 @@ in
               })
               (sources."socks-proxy-agent-3.0.0" // {
                 dependencies = [
-                  (sources."agent-base-4.1.0" // {
+                  (sources."agent-base-4.1.1" // {
                     dependencies = [
                       (sources."es6-promisify-5.0.0" // {
                         dependencies = [
@@ -8193,12 +8180,16 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.4.0" // {
+              (sources."jsprim-1.4.1" // {
                 dependencies = [
                   sources."assert-plus-1.0.0"
-                  sources."extsprintf-1.0.2"
+                  sources."extsprintf-1.3.0"
                   sources."json-schema-0.2.3"
-                  sources."verror-1.3.6"
+                  (sources."verror-1.10.0" // {
+                    dependencies = [
+                      sources."core-util-is-1.0.2"
+                    ];
+                  })
                 ];
               })
               (sources."sshpk-1.13.1" // {
@@ -8218,9 +8209,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.15" // {
+          (sources."mime-types-2.1.16" // {
             dependencies = [
-              sources."mime-db-1.27.0"
+              sources."mime-db-1.29.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -8280,23 +8271,23 @@ in
       sources."unpipe-1.0.0"
       (sources."update-notifier-2.2.0" // {
         dependencies = [
-          (sources."boxen-1.2.0" // {
+          (sources."boxen-1.2.1" // {
             dependencies = [
               sources."ansi-align-2.0.0"
               sources."camelcase-4.1.0"
-              (sources."chalk-2.0.1" // {
+              (sources."chalk-2.1.0" // {
                 dependencies = [
-                  (sources."ansi-styles-3.1.0" // {
+                  (sources."ansi-styles-3.2.0" // {
                     dependencies = [
                       (sources."color-convert-1.9.0" // {
                         dependencies = [
-                          sources."color-name-1.1.2"
+                          sources."color-name-1.1.3"
                         ];
                       })
                     ];
                   })
                   sources."escape-string-regexp-1.0.5"
-                  (sources."supports-color-4.2.0" // {
+                  (sources."supports-color-4.2.1" // {
                     dependencies = [
                       sources."has-flag-2.0.0"
                     ];
@@ -8304,7 +8295,7 @@ in
                 ];
               })
               sources."cli-boxes-1.0.0"
-              (sources."string-width-2.1.0" // {
+              (sources."string-width-2.1.1" // {
                 dependencies = [
                   sources."is-fullwidth-code-point-2.0.0"
                 ];
@@ -8374,9 +8365,9 @@ in
               sources."supports-color-2.0.0"
             ];
           })
-          (sources."configstore-3.1.0" // {
+          (sources."configstore-3.1.1" // {
             dependencies = [
-              (sources."dot-prop-4.1.1" // {
+              (sources."dot-prop-4.2.0" // {
                 dependencies = [
                   sources."is-obj-1.0.1"
                 ];
@@ -8675,12 +8666,16 @@ in
           (sources."http-signature-1.1.1" // {
             dependencies = [
               sources."assert-plus-0.2.0"
-              (sources."jsprim-1.4.0" // {
+              (sources."jsprim-1.4.1" // {
                 dependencies = [
                   sources."assert-plus-1.0.0"
-                  sources."extsprintf-1.0.2"
+                  sources."extsprintf-1.3.0"
                   sources."json-schema-0.2.3"
-                  sources."verror-1.3.6"
+                  (sources."verror-1.10.0" // {
+                    dependencies = [
+                      sources."core-util-is-1.0.2"
+                    ];
+                  })
                 ];
               })
               (sources."sshpk-1.13.1" // {
@@ -8700,9 +8695,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.15" // {
+          (sources."mime-types-2.1.16" // {
             dependencies = [
-              sources."mime-db-1.27.0"
+              sources."mime-db-1.29.0"
             ];
           })
           sources."oauth-sign-0.8.2"
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index b50b47ac0a9..1da53d8e773 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -34,6 +34,7 @@
 , "json"
 , "js-beautify"
 , "jsontool"
+, "json-refs"
 , "json-server"
 , "js-yaml"
 , "karma"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 31e5dddd6fd..229c5743a4d 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 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
-    "resolve-1.3.3" = {
+    "resolve-1.4.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.3.3";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz";
-        sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
+        sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86";
       };
     };
     "global-paths-0.1.2" = {
@@ -418,13 +418,13 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "which-1.2.14" = {
+    "which-1.3.0" = {
       name = "which";
       packageName = "which";
-      version = "1.2.14";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
-        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
+        url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
+        sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -1012,13 +1012,13 @@ let
         sha1 = "652f09dee89c115e5b672bd3de4d16dcc7961377";
       };
     };
-    "ms-rest-azure-2.2.1" = {
+    "ms-rest-azure-2.2.3" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "2.2.1";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.1.tgz";
-        sha1 = "ca9a9fb492b1fe1a41ca8e472edc1dd0922323e6";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.3.tgz";
+        sha1 = "a11fc443b276ee26adbd159b2c5b2107d6197266";
       };
     };
     "node-forge-0.6.23" = {
@@ -1615,13 +1615,13 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "@types/node-7.0.37" = {
+    "@types/node-7.0.39" = {
       name = "@types/node";
       packageName = "@types/node";
-      version = "7.0.37";
+      version = "7.0.39";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-7.0.37.tgz";
-        sha1 = "f129fff94d14a60c3d99eadb9fe0c98119e09c8f";
+        url = "https://registry.npmjs.org/@types/node/-/node-7.0.39.tgz";
+        sha1 = "8aced4196387038113f6f9aa4014ab4c51edab3c";
       };
     };
     "@types/request-0.0.45" = {
@@ -1651,13 +1651,13 @@ let
         sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
-    "@types/form-data-0.0.33" = {
+    "@types/form-data-2.2.0" = {
       name = "@types/form-data";
       packageName = "@types/form-data";
-      version = "0.0.33";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz";
-        sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8";
+        url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.0.tgz";
+        sha1 = "a98aac91dc99857b6af24caef7ca6df302f31565";
       };
     };
     "debug-0.7.4" = {
@@ -2020,13 +2020,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.15" = {
+    "mime-types-2.1.16" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.15";
+      version = "2.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
-        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz";
+        sha1 = "2b858a52e5ecd516db897ac2be87487830698e23";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -2290,13 +2290,13 @@ let
         sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
       };
     };
-    "jsprim-1.4.0" = {
+    "jsprim-1.4.1" = {
       name = "jsprim";
       packageName = "jsprim";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
-        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
     "sshpk-1.13.1" = {
@@ -2317,13 +2317,13 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "extsprintf-1.0.2" = {
+    "extsprintf-1.3.0" = {
       name = "extsprintf";
       packageName = "extsprintf";
-      version = "1.0.2";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
-        sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
     "json-schema-0.2.3" = {
@@ -2335,13 +2335,13 @@ let
         sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
       };
     };
-    "verror-1.3.6" = {
+    "verror-1.10.0" = {
       name = "verror";
       packageName = "verror";
-      version = "1.3.6";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
-        sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
     "asn1-0.2.3" = {
@@ -2407,13 +2407,13 @@ let
         sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
-    "mime-db-1.27.0" = {
+    "mime-db-1.29.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.27.0";
+      version = "1.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz";
-        sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz";
+        sha1 = "48d26d235589651704ac5916ca06001914266878";
       };
     };
     "punycode-1.4.1" = {
@@ -2659,13 +2659,13 @@ let
         sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb";
       };
     };
-    "semver-5.3.0" = {
+    "semver-5.4.1" = {
       name = "semver";
       packageName = "semver";
-      version = "5.3.0";
+      version = "5.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
-        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
+        url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
+        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
       };
     };
     "temp-0.8.3" = {
@@ -2767,15 +2767,6 @@ let
         sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
       };
     };
-    "mime-db-1.29.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.29.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz";
-        sha1 = "48d26d235589651704ac5916ca06001914266878";
-      };
-    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -3253,13 +3244,13 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-5.0.6" = {
+    "buffer-5.0.7" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.0.6";
+      version = "5.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz";
-        sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.7.tgz";
+        sha1 = "570a290b625cf2603290c1149223d27ccf04db97";
       };
     };
     "cached-path-relative-1.0.1" = {
@@ -3730,13 +3721,13 @@ let
         sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
       };
     };
-    "pbkdf2-3.0.12" = {
+    "pbkdf2-3.0.13" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.12";
+      version = "3.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz";
-        sha1 = "be36785c5067ea48d806ff923288c5f750b6b8a2";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz";
+        sha1 = "c37d295531e786b1da3e3eadc840426accb0ae25";
       };
     };
     "public-encrypt-4.0.0" = {
@@ -3820,13 +3811,13 @@ let
         sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
       };
     };
-    "bn.js-4.11.7" = {
+    "bn.js-4.11.8" = {
       name = "bn.js";
       packageName = "bn.js";
-      version = "4.11.7";
+      version = "4.11.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz";
-        sha1 = "ddb048e50d9482790094c13eb3fcfc833ce7ab46";
+        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
+        sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f";
       };
     };
     "browserify-rsa-4.0.1" = {
@@ -5674,22 +5665,22 @@ let
         sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048";
       };
     };
-    "voc-0.5.0" = {
+    "voc-1.0.0" = {
       name = "voc";
       packageName = "voc";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/voc/-/voc-0.5.0.tgz";
-        sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
-      };
-    };
-    "exit-on-epipe-1.0.0" = {
-      name = "exit-on-epipe";
-      packageName = "exit-on-epipe";
       version = "1.0.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/voc/-/voc-1.0.0.tgz";
+        sha1 = "5465c0ce11d0881f7d8e36d8ca587043f33a25ae";
+      };
+    };
+    "exit-on-epipe-1.0.1" = {
+      name = "exit-on-epipe";
+      packageName = "exit-on-epipe";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz";
+        sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692";
       };
     };
     "sax-1.2.4" = {
@@ -6097,6 +6088,15 @@ let
         sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
       };
     };
+    "semver-5.3.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
+        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
+      };
+    };
     "shelljs-0.3.0" = {
       name = "shelljs";
       packageName = "shelljs";
@@ -6277,13 +6277,13 @@ let
         sha1 = "030c9f198f1643a057d776a738e922da4373012d";
       };
     };
-    "express-4.15.3" = {
+    "express-4.15.4" = {
       name = "express";
       packageName = "express";
-      version = "4.15.3";
+      version = "4.15.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz";
-        sha1 = "bab65d0f03aa80c358408972fc700f916944b662";
+        url = "https://registry.npmjs.org/express/-/express-4.15.4.tgz";
+        sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1";
       };
     };
     "accepts-1.3.3" = {
@@ -6304,13 +6304,13 @@ let
         sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a";
       };
     };
-    "compressible-2.0.10" = {
+    "compressible-2.0.11" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.10";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz";
-        sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz";
+        sha1 = "16718a75de283ed8e604041625a2064586797d8a";
       };
     };
     "on-headers-1.0.1" = {
@@ -6385,22 +6385,13 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "debug-2.6.7" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz";
-        sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e";
-      };
-    };
-    "depd-1.1.0" = {
+    "depd-1.1.1" = {
       name = "depd";
       packageName = "depd";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz";
-        sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3";
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz";
+        sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359";
       };
     };
     "encodeurl-1.0.1" = {
@@ -6430,13 +6421,13 @@ let
         sha1 = "6f631aef336d6c46362b51764044ce216be3c051";
       };
     };
-    "finalhandler-1.0.3" = {
+    "finalhandler-1.0.4" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz";
-        sha1 = "ef47e77950e999780e86022a560e3217e0d0cc89";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz";
+        sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7";
       };
     };
     "fresh-0.5.0" = {
@@ -6493,40 +6484,40 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.4" = {
+    "proxy-addr-1.1.5" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz";
-        sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz";
+        sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918";
       };
     };
-    "qs-6.4.0" = {
+    "qs-6.5.0" = {
       name = "qs";
       packageName = "qs";
-      version = "6.4.0";
+      version = "6.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
-        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
+        sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49";
       };
     };
-    "send-0.15.3" = {
+    "send-0.15.4" = {
       name = "send";
       packageName = "send";
-      version = "0.15.3";
+      version = "0.15.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz";
-        sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309";
+        url = "https://registry.npmjs.org/send/-/send-0.15.4.tgz";
+        sha1 = "985faa3e284b0273c793364a35c6737bd93905b9";
       };
     };
-    "serve-static-1.12.3" = {
+    "serve-static-1.12.4" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.12.3";
+      version = "1.12.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz";
-        sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz";
+        sha1 = "9b6aa98eeb7253c4eedc4c1f6fdbca609901a961";
       };
     };
     "setprototypeof-1.0.3" = {
@@ -6592,15 +6583,6 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
-    "ipaddr.js-1.3.0" = {
-      name = "ipaddr.js";
-      packageName = "ipaddr.js";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz";
-        sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec";
-      };
-    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -6610,13 +6592,13 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
-    "http-errors-1.6.1" = {
+    "http-errors-1.6.2" = {
       name = "http-errors";
       packageName = "http-errors";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz";
-        sha1 = "5f8b8ed98aca545656bf572997387f904a722257";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz";
+        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
       };
     };
     "mime-1.3.4" = {
@@ -7132,6 +7114,15 @@ let
         sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085";
       };
     };
+    "which-1.2.14" = {
+      name = "which";
+      packageName = "which";
+      version = "1.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
+        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
+      };
+    };
     "write-file-atomic-1.1.4" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -7636,13 +7627,13 @@ let
         sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
       };
     };
-    "duplexify-3.5.0" = {
+    "duplexify-3.5.1" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.5.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz";
-        sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz";
+        sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd";
       };
     };
     "infinity-agent-2.0.3" = {
@@ -7717,6 +7708,15 @@ let
         sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a";
       };
     };
+    "end-of-stream-1.4.0" = {
+      name = "end-of-stream";
+      packageName = "end-of-stream";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz";
+        sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206";
+      };
+    };
     "stream-shift-1.0.0" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -8159,13 +8159,13 @@ let
         sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
       };
     };
-    "bindings-1.2.1" = {
+    "bindings-1.3.0" = {
       name = "bindings";
       packageName = "bindings";
-      version = "1.2.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
-        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz";
+        sha1 = "b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7";
       };
     };
     "nan-2.6.2" = {
@@ -8306,24 +8306,6 @@ let
         sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
       };
     };
-    "verror-1.10.0" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
-        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
-      };
-    };
-    "extsprintf-1.3.0" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
-        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
-      };
-    };
     "async-0.9.2" = {
       name = "async";
       packageName = "async";
@@ -8441,15 +8423,6 @@ let
         sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4";
       };
     };
-    "end-of-stream-1.4.0" = {
-      name = "end-of-stream";
-      packageName = "end-of-stream";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz";
-        sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206";
-      };
-    };
     "from2-1.3.0" = {
       name = "from2";
       packageName = "from2";
@@ -8855,6 +8828,15 @@ let
         sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749";
       };
     };
+    "bindings-1.2.1" = {
+      name = "bindings";
+      packageName = "bindings";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
+      };
+    };
     "nan-2.1.0" = {
       name = "nan";
       packageName = "nan";
@@ -8918,13 +8900,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.85.0" = {
+    "aws-sdk-2.95.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.85.0";
+      version = "2.95.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.85.0.tgz";
-        sha1 = "e3860761c9a2f8a9017461ab7f3bd075f69dfa8f";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.95.0.tgz";
+        sha1 = "26e21db149443b1f063949dc87984f0d17700e6a";
       };
     };
     "request-2.81.0" = {
@@ -8999,6 +8981,15 @@ let
         sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
       };
     };
+    "qs-6.4.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
+      };
+    };
     "tunnel-agent-0.6.0" = {
       name = "tunnel-agent";
       packageName = "tunnel-agent";
@@ -9044,13 +9035,22 @@ let
         sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
       };
     };
-    "clipboardy-0.1.2" = {
+    "auto-bind-1.1.0" = {
+      name = "auto-bind";
+      packageName = "auto-bind";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.1.0.tgz";
+        sha1 = "93b864dc7ee01a326281775d5c75ca0a751e5961";
+      };
+    };
+    "clipboardy-1.1.4" = {
       name = "clipboardy";
       packageName = "clipboardy";
-      version = "0.1.2";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz";
-        sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc";
+        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.1.4.tgz";
+        sha1 = "51b17574fc682588e2dd295cfa6e6aa109eab5ee";
       };
     };
     "conf-1.1.2" = {
@@ -9062,13 +9062,49 @@ let
         sha1 = "a164003022dd1643cd5abd9653071bd3b0a19f50";
       };
     };
-    "got-6.7.1" = {
+    "got-7.1.0" = {
       name = "got";
       packageName = "got";
-      version = "6.7.1";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
-        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
+        url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz";
+        sha1 = "05450fd84094e6bbea56f451a43a9c289166385a";
+      };
+    };
+    "has-ansi-3.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-3.0.0.tgz";
+        sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37";
+      };
+    };
+    "import-jsx-1.3.0" = {
+      name = "import-jsx";
+      packageName = "import-jsx";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz";
+        sha1 = "079df1da943b3274f46932fb740c9b56dd6351fb";
+      };
+    };
+    "ink-0.3.1" = {
+      name = "ink";
+      packageName = "ink";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz";
+        sha1 = "551047276cb93baa3f14eafaef2ae5b1526e8213";
+      };
+    };
+    "ink-text-input-1.1.0" = {
+      name = "ink-text-input";
+      packageName = "ink-text-input";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.0.tgz";
+        sha1 = "887a9623c23fd5c6f173b9704e6cc6029d0a15c1";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -9080,15 +9116,6 @@ let
         sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af";
       };
     };
-    "log-update-1.0.2" = {
-      name = "log-update";
-      packageName = "log-update";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz";
-        sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
-      };
-    };
     "mem-1.1.0" = {
       name = "mem";
       packageName = "mem";
@@ -9107,31 +9134,31 @@ let
         sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f";
       };
     };
-    "execa-0.5.1" = {
+    "execa-0.6.3" = {
       name = "execa";
       packageName = "execa";
-      version = "0.5.1";
+      version = "0.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz";
-        sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36";
+        url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz";
+        sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe";
       };
     };
-    "cross-spawn-4.0.2" = {
+    "cross-spawn-5.1.0" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
-      version = "4.0.2";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
-        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
       };
     };
-    "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";
       };
     };
     "npm-run-path-2.0.2" = {
@@ -9170,6 +9197,24 @@ let
         sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55";
       };
     };
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    };
     "path-key-2.0.1" = {
       name = "path-key";
       packageName = "path-key";
@@ -9179,13 +9224,13 @@ let
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
-    "dot-prop-4.1.1" = {
+    "dot-prop-4.2.0" = {
       name = "dot-prop";
       packageName = "dot-prop";
-      version = "4.1.1";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz";
-        sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1";
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
+        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
       };
     };
     "env-paths-1.0.0" = {
@@ -9260,13 +9305,13 @@ let
         sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc";
       };
     };
-    "create-error-class-3.0.2" = {
-      name = "create-error-class";
-      packageName = "create-error-class";
-      version = "3.0.2";
+    "decompress-response-3.3.0" = {
+      name = "decompress-response";
+      packageName = "decompress-response";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz";
-        sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
+        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz";
+        sha1 = "80a4dd323748384bfa248083622aedec982adff3";
       };
     };
     "duplexer3-0.1.4" = {
@@ -9278,15 +9323,6 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "get-stream-3.0.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
-      };
-    };
     "is-retry-allowed-1.1.0" = {
       name = "is-retry-allowed";
       packageName = "is-retry-allowed";
@@ -9296,6 +9332,33 @@ let
         sha1 = "11a060568b67339444033d0125a61a20d564fb34";
       };
     };
+    "isurl-1.0.0" = {
+      name = "isurl";
+      packageName = "isurl";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
+        sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67";
+      };
+    };
+    "p-cancelable-0.3.0" = {
+      name = "p-cancelable";
+      packageName = "p-cancelable";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz";
+        sha1 = "b9e123800bcebb7ac13a479be195b507b98d30fa";
+      };
+    };
+    "p-timeout-1.2.0" = {
+      name = "p-timeout";
+      packageName = "p-timeout";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.0.tgz";
+        sha1 = "9820f99434c5817868b4f34809ee5291660d5b6c";
+      };
+    };
     "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
@@ -9314,13 +9377,562 @@ let
         sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73";
       };
     };
-    "capture-stack-trace-1.0.0" = {
-      name = "capture-stack-trace";
-      packageName = "capture-stack-trace";
+    "url-to-options-1.0.1" = {
+      name = "url-to-options";
+      packageName = "url-to-options";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz";
+        sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9";
+      };
+    };
+    "mimic-response-1.0.0" = {
+      name = "mimic-response";
+      packageName = "mimic-response";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
-        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
+        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz";
+        sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e";
+      };
+    };
+    "has-to-string-tag-x-1.4.0" = {
+      name = "has-to-string-tag-x";
+      packageName = "has-to-string-tag-x";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.0.tgz";
+        sha1 = "49d7bcde85c2409be38ac327e3e119a451657c7b";
+      };
+    };
+    "is-object-1.0.1" = {
+      name = "is-object";
+      packageName = "is-object";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz";
+        sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
+      };
+    };
+    "has-symbol-support-x-1.4.0" = {
+      name = "has-symbol-support-x";
+      packageName = "has-symbol-support-x";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.0.tgz";
+        sha1 = "442d89b1d0ac6cf5ff2f7b916ee539869b93a256";
+      };
+    };
+    "ansi-regex-3.0.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
+        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+      };
+    };
+    "babel-core-6.25.0" = {
+      name = "babel-core";
+      packageName = "babel-core";
+      version = "6.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz";
+        sha1 = "7dd42b0463c742e9d5296deb3ec67a9322dad729";
+      };
+    };
+    "babel-plugin-transform-es2015-destructuring-6.23.0" = {
+      name = "babel-plugin-transform-es2015-destructuring";
+      packageName = "babel-plugin-transform-es2015-destructuring";
+      version = "6.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz";
+        sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d";
+      };
+    };
+    "babel-plugin-transform-object-rest-spread-6.23.0" = {
+      name = "babel-plugin-transform-object-rest-spread";
+      packageName = "babel-plugin-transform-object-rest-spread";
+      version = "6.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz";
+        sha1 = "875d6bc9be761c58a2ae3feee5dc4895d8c7f921";
+      };
+    };
+    "babel-plugin-transform-react-jsx-6.24.1" = {
+      name = "babel-plugin-transform-react-jsx";
+      packageName = "babel-plugin-transform-react-jsx";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz";
+        sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3";
+      };
+    };
+    "caller-path-2.0.0" = {
+      name = "caller-path";
+      packageName = "caller-path";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz";
+        sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4";
+      };
+    };
+    "require-from-string-1.2.1" = {
+      name = "require-from-string";
+      packageName = "require-from-string";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz";
+        sha1 = "529c9ccef27380adfec9a2f965b649bbee636418";
+      };
+    };
+    "resolve-from-3.0.0" = {
+      name = "resolve-from";
+      packageName = "resolve-from";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz";
+        sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
+      };
+    };
+    "babel-code-frame-6.22.0" = {
+      name = "babel-code-frame";
+      packageName = "babel-code-frame";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz";
+        sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
+      };
+    };
+    "babel-generator-6.25.0" = {
+      name = "babel-generator";
+      packageName = "babel-generator";
+      version = "6.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz";
+        sha1 = "33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc";
+      };
+    };
+    "babel-helpers-6.24.1" = {
+      name = "babel-helpers";
+      packageName = "babel-helpers";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz";
+        sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
+      };
+    };
+    "babel-messages-6.23.0" = {
+      name = "babel-messages";
+      packageName = "babel-messages";
+      version = "6.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz";
+        sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
+      };
+    };
+    "babel-template-6.25.0" = {
+      name = "babel-template";
+      packageName = "babel-template";
+      version = "6.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz";
+        sha1 = "665241166b7c2aa4c619d71e192969552b10c071";
+      };
+    };
+    "babel-runtime-6.25.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz";
+        sha1 = "33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c";
+      };
+    };
+    "babel-register-6.24.1" = {
+      name = "babel-register";
+      packageName = "babel-register";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz";
+        sha1 = "7e10e13a2f71065bdfad5a1787ba45bca6ded75f";
+      };
+    };
+    "babel-traverse-6.25.0" = {
+      name = "babel-traverse";
+      packageName = "babel-traverse";
+      version = "6.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz";
+        sha1 = "2257497e2fcd19b89edc13c4c91381f9512496f1";
+      };
+    };
+    "babel-types-6.25.0" = {
+      name = "babel-types";
+      packageName = "babel-types";
+      version = "6.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz";
+        sha1 = "70afb248d5660e5d18f811d91c8303b54134a18e";
+      };
+    };
+    "babylon-6.17.4" = {
+      name = "babylon";
+      packageName = "babylon";
+      version = "6.17.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz";
+        sha1 = "3e8b7402b88d22c3423e137a1577883b15ff869a";
+      };
+    };
+    "convert-source-map-1.5.0" = {
+      name = "convert-source-map";
+      packageName = "convert-source-map";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz";
+        sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5";
+      };
+    };
+    "json5-0.5.1" = {
+      name = "json5";
+      packageName = "json5";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+      };
+    };
+    "private-0.1.7" = {
+      name = "private";
+      packageName = "private";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
+        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
+      };
+    };
+    "slash-1.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
+        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
+      };
+    };
+    "esutils-2.0.2" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+      };
+    };
+    "js-tokens-3.0.2" = {
+      name = "js-tokens";
+      packageName = "js-tokens";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz";
+        sha1 = "9866df395102130e38f7f996bceb65443209c25b";
+      };
+    };
+    "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";
+      };
+    };
+    "jsesc-1.3.0" = {
+      name = "jsesc";
+      packageName = "jsesc";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz";
+        sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
+      };
+    };
+    "trim-right-1.0.1" = {
+      name = "trim-right";
+      packageName = "trim-right";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz";
+        sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
+      };
+    };
+    "core-js-2.5.0" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz";
+        sha1 = "569c050918be6486b3837552028ae0466b717086";
+      };
+    };
+    "regenerator-runtime-0.10.5" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
+        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
+      };
+    };
+    "home-or-tmp-2.0.0" = {
+      name = "home-or-tmp";
+      packageName = "home-or-tmp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz";
+        sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
+      };
+    };
+    "source-map-support-0.4.15" = {
+      name = "source-map-support";
+      packageName = "source-map-support";
+      version = "0.4.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz";
+        sha1 = "03202df65c06d2bd8c7ec2362a193056fef8d3b1";
+      };
+    };
+    "globals-9.18.0" = {
+      name = "globals";
+      packageName = "globals";
+      version = "9.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
+        sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a";
+      };
+    };
+    "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";
+      };
+    };
+    "loose-envify-1.3.1" = {
+      name = "loose-envify";
+      packageName = "loose-envify";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz";
+        sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
+      };
+    };
+    "to-fast-properties-1.0.3" = {
+      name = "to-fast-properties";
+      packageName = "to-fast-properties";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz";
+        sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47";
+      };
+    };
+    "babel-plugin-syntax-object-rest-spread-6.13.0" = {
+      name = "babel-plugin-syntax-object-rest-spread";
+      packageName = "babel-plugin-syntax-object-rest-spread";
+      version = "6.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz";
+        sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5";
+      };
+    };
+    "babel-helper-builder-react-jsx-6.24.1" = {
+      name = "babel-helper-builder-react-jsx";
+      packageName = "babel-helper-builder-react-jsx";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz";
+        sha1 = "0ad7917e33c8d751e646daca4e77cc19377d2cbc";
+      };
+    };
+    "babel-plugin-syntax-jsx-6.18.0" = {
+      name = "babel-plugin-syntax-jsx";
+      packageName = "babel-plugin-syntax-jsx";
+      version = "6.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz";
+        sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946";
+      };
+    };
+    "caller-callsite-2.0.0" = {
+      name = "caller-callsite";
+      packageName = "caller-callsite";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz";
+        sha1 = "847e0fce0a223750a9a027c54b33731ad3154134";
+      };
+    };
+    "callsites-2.0.0" = {
+      name = "callsites";
+      packageName = "callsites";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz";
+        sha1 = "06eb84f00eea413da86affefacbffb36093b3c50";
+      };
+    };
+    "arrify-1.0.1" = {
+      name = "arrify";
+      packageName = "arrify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz";
+        sha1 = "898508da2226f380df904728456849c1501a4b0d";
+      };
+    };
+    "chalk-2.1.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
+        sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e";
+      };
+    };
+    "indent-string-3.2.0" = {
+      name = "indent-string";
+      packageName = "indent-string";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz";
+        sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289";
+      };
+    };
+    "lodash.flattendeep-4.4.0" = {
+      name = "lodash.flattendeep";
+      packageName = "lodash.flattendeep";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz";
+        sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2";
+      };
+    };
+    "lodash.isequal-4.5.0" = {
+      name = "lodash.isequal";
+      packageName = "lodash.isequal";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
+      };
+    };
+    "log-update-2.1.0" = {
+      name = "log-update";
+      packageName = "log-update";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-update/-/log-update-2.1.0.tgz";
+        sha1 = "ea37258b5354edb02e73b29190016c87d1c87141";
+      };
+    };
+    "prop-types-15.5.10" = {
+      name = "prop-types";
+      packageName = "prop-types";
+      version = "15.5.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz";
+        sha1 = "2797dfc3126182e3a95e3dfbb2e893ddd7456154";
+      };
+    };
+    "ansi-styles-3.2.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
+        sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88";
+      };
+    };
+    "supports-color-4.2.1" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
+        sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836";
+      };
+    };
+    "color-convert-1.9.0" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
+        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
+      };
+    };
+    "color-name-1.1.3" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
+        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+      };
+    };
+    "has-flag-2.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz";
+        sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
+      };
+    };
+    "ansi-escapes-2.0.0" = {
+      name = "ansi-escapes";
+      packageName = "ansi-escapes";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz";
+        sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b";
+      };
+    };
+    "cli-cursor-2.1.0" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+      };
+    };
+    "wrap-ansi-3.0.1" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz";
+        sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba";
+      };
+    };
+    "restore-cursor-2.0.0" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+      };
+    };
+    "onetime-2.0.1" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
     "mimic-fn-1.1.0" = {
@@ -9332,6 +9944,114 @@ let
         sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18";
       };
     };
+    "string-width-2.1.1" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
+        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
+      };
+    };
+    "strip-ansi-4.0.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
+        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+      };
+    };
+    "is-fullwidth-code-point-2.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+      };
+    };
+    "fbjs-0.8.14" = {
+      name = "fbjs";
+      packageName = "fbjs";
+      version = "0.8.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.14.tgz";
+        sha1 = "d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c";
+      };
+    };
+    "core-js-1.2.7" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "1.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz";
+        sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636";
+      };
+    };
+    "isomorphic-fetch-2.2.1" = {
+      name = "isomorphic-fetch";
+      packageName = "isomorphic-fetch";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz";
+        sha1 = "611ae1acf14f5e81f729507472819fe9733558a9";
+      };
+    };
+    "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";
+      };
+    };
+    "ua-parser-js-0.7.14" = {
+      name = "ua-parser-js";
+      packageName = "ua-parser-js";
+      version = "0.7.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz";
+        sha1 = "110d53fa4c3f326c121292bbeac904d2e03387ca";
+      };
+    };
+    "node-fetch-1.7.2" = {
+      name = "node-fetch";
+      packageName = "node-fetch";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz";
+        sha1 = "c54e9aac57e432875233525f3c891c4159ffefd7";
+      };
+    };
+    "whatwg-fetch-2.0.3" = {
+      name = "whatwg-fetch";
+      packageName = "whatwg-fetch";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz";
+        sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84";
+      };
+    };
+    "encoding-0.1.12" = {
+      name = "encoding";
+      packageName = "encoding";
+      version = "0.1.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz";
+        sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
+      };
+    };
+    "iconv-lite-0.4.18" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
+        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
+      };
+    };
     "unicode-emoji-modifier-base-1.0.0" = {
       name = "unicode-emoji-modifier-base";
       packageName = "unicode-emoji-modifier-base";
@@ -9350,15 +10070,6 @@ let
         sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39";
       };
     };
-    "babel-code-frame-6.22.0" = {
-      name = "babel-code-frame";
-      packageName = "babel-code-frame";
-      version = "6.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz";
-        sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
-      };
-    };
     "doctrine-2.0.0" = {
       name = "doctrine";
       packageName = "doctrine";
@@ -9377,13 +10088,13 @@ let
         sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8";
       };
     };
-    "espree-3.4.3" = {
+    "espree-3.5.0" = {
       name = "espree";
       packageName = "espree";
-      version = "3.4.3";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz";
-        sha1 = "2910b5ccd49ce893c2ffffaab4fd8b3a31b82374";
+        url = "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz";
+        sha1 = "98358625bdd055861ea27e2867ea729faf463d8d";
       };
     };
     "esquery-1.0.0" = {
@@ -9404,15 +10115,6 @@ let
         sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
       };
     };
-    "esutils-2.0.2" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
-        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
-      };
-    };
     "file-entry-cache-2.0.0" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
@@ -9422,13 +10124,13 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.18.0" = {
-      name = "globals";
-      packageName = "globals";
-      version = "9.18.0";
+    "functional-red-black-tree-1.0.1" = {
+      name = "functional-red-black-tree";
+      packageName = "functional-red-black-tree";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a";
+        url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz";
+        sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
     "ignore-3.3.3" = {
@@ -9440,13 +10142,13 @@ let
         sha1 = "432352e57accd87ab3110e82d3fea0e47812156d";
       };
     };
-    "inquirer-3.2.0" = {
+    "inquirer-3.2.1" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "3.2.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.0.tgz";
-        sha1 = "45b44c2160c729d7578c54060b3eed94487bb42b";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.1.tgz";
+        sha1 = "06ceb0f540f45ca548c17d6840959878265fa175";
       };
     };
     "is-resolvable-1.0.0" = {
@@ -9458,13 +10160,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.9.0" = {
+    "js-yaml-3.9.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.9.0";
+      version = "3.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz";
-        sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz";
+        sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0";
       };
     };
     "levn-0.3.0" = {
@@ -9548,15 +10250,6 @@ let
         sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
       };
     };
-    "js-tokens-3.0.2" = {
-      name = "js-tokens";
-      packageName = "js-tokens";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz";
-        sha1 = "9866df395102130e38f7f996bceb65443209c25b";
-      };
-    };
     "esrecurse-4.2.0" = {
       name = "esrecurse";
       packageName = "esrecurse";
@@ -9593,13 +10286,13 @@ let
         sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
       };
     };
-    "circular-json-0.3.1" = {
+    "circular-json-0.3.3" = {
       name = "circular-json";
       packageName = "circular-json";
-      version = "0.3.1";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz";
-        sha1 = "be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d";
+        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz";
+        sha1 = "815c99ea84f6809529d2f45791bdf82711352d66";
       };
     };
     "del-2.2.2" = {
@@ -9656,15 +10349,6 @@ let
         sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39";
       };
     };
-    "arrify-1.0.1" = {
-      name = "arrify";
-      packageName = "arrify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz";
-        sha1 = "898508da2226f380df904728456849c1501a4b0d";
-      };
-    };
     "array-uniq-1.0.3" = {
       name = "array-uniq";
       packageName = "array-uniq";
@@ -9683,33 +10367,6 @@ let
         sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f";
       };
     };
-    "ansi-escapes-2.0.0" = {
-      name = "ansi-escapes";
-      packageName = "ansi-escapes";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz";
-        sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b";
-      };
-    };
-    "chalk-2.0.1" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz";
-        sha1 = "dbec49436d2ae15f536114e76d14656cdbc0f44d";
-      };
-    };
-    "cli-cursor-2.1.0" = {
-      name = "cli-cursor";
-      packageName = "cli-cursor";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
-        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
-      };
-    };
     "cli-width-2.1.0" = {
       name = "cli-width";
       packageName = "cli-width";
@@ -9764,103 +10421,13 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
-    "string-width-2.1.0" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz";
-        sha1 = "030664561fc146c9423ec7d978fe2457437fe6d0";
-      };
-    };
-    "strip-ansi-4.0.0" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
-        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
-      };
-    };
-    "ansi-styles-3.1.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz";
-        sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750";
-      };
-    };
-    "supports-color-4.2.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz";
-        sha1 = "ad986dc7eb2315d009b4d77c8169c2231a684037";
-      };
-    };
-    "color-convert-1.9.0" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
-        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
-      };
-    };
-    "color-name-1.1.2" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
-        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
-      };
-    };
-    "has-flag-2.0.0" = {
-      name = "has-flag";
-      packageName = "has-flag";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz";
-        sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51";
-      };
-    };
-    "restore-cursor-2.0.0" = {
-      name = "restore-cursor";
-      packageName = "restore-cursor";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
-        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
-      };
-    };
-    "onetime-2.0.1" = {
-      name = "onetime";
-      packageName = "onetime";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
-        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
-      };
-    };
-    "iconv-lite-0.4.18" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
-        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
-      };
-    };
-    "jschardet-1.4.2" = {
+    "jschardet-1.5.1" = {
       name = "jschardet";
       packageName = "jschardet";
-      version = "1.4.2";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz";
-        sha1 = "2aa107f142af4121d145659d44f50830961e699a";
+        url = "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz";
+        sha1 = "c519f629f86b3a5bedba58a88d311309eec097f9";
       };
     };
     "tmp-0.0.31" = {
@@ -9881,24 +10448,6 @@ let
         sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
       };
     };
-    "is-fullwidth-code-point-2.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
-        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
-      };
-    };
-    "ansi-regex-3.0.0" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
-        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
-      };
-    };
     "tryit-1.0.3" = {
       name = "tryit";
       packageName = "tryit";
@@ -10016,13 +10565,13 @@ let
         sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
       };
     };
-    "eslint-4.2.0" = {
+    "eslint-4.4.1" = {
       name = "eslint";
       packageName = "eslint";
-      version = "4.2.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-4.2.0.tgz";
-        sha1 = "a2b3184111b198e02e9c7f3cca625a5e01c56b3d";
+        url = "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz";
+        sha1 = "99cd7eafcffca2ff99a5c8f5f2a474d6364b4bd3";
       };
     };
     "supports-color-3.2.3" = {
@@ -10043,6 +10592,15 @@ let
         sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
       };
     };
+    "log-update-1.0.2" = {
+      name = "log-update";
+      packageName = "log-update";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz";
+        sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
+      };
+    };
     "ora-1.3.0" = {
       name = "ora";
       packageName = "ora";
@@ -10385,13 +10943,13 @@ let
         sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc";
       };
     };
-    "anymatch-1.3.0" = {
+    "anymatch-1.3.2" = {
       name = "anymatch";
       packageName = "anymatch";
-      version = "1.3.0";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz";
-        sha1 = "a3e52fa39168c825ff57b0248126ce5a8ff95507";
+        url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz";
+        sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a";
       };
     };
     "async-each-1.0.1" = {
@@ -10457,6 +11015,15 @@ let
         sha1 = "86677c97d1720b363431d04d0d15293bd38c1565";
       };
     };
+    "normalize-path-2.1.1" = {
+      name = "normalize-path";
+      packageName = "normalize-path";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz";
+        sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
+      };
+    };
     "arr-diff-2.0.0" = {
       name = "arr-diff";
       packageName = "arr-diff";
@@ -10511,15 +11078,6 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "normalize-path-2.1.1" = {
-      name = "normalize-path";
-      packageName = "normalize-path";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz";
-        sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
-      };
-    };
     "object.omit-2.0.1" = {
       name = "object.omit";
       packageName = "object.omit";
@@ -10646,15 +11204,6 @@ let
         sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
       };
     };
-    "remove-trailing-separator-1.0.2" = {
-      name = "remove-trailing-separator";
-      packageName = "remove-trailing-separator";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz";
-        sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511";
-      };
-    };
     "for-own-0.1.5" = {
       name = "for-own";
       packageName = "for-own";
@@ -10718,13 +11267,22 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "binary-extensions-1.8.0" = {
+    "remove-trailing-separator-1.0.2" = {
+      name = "remove-trailing-separator";
+      packageName = "remove-trailing-separator";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz";
+        sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511";
+      };
+    };
+    "binary-extensions-1.9.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.8.0";
+      version = "1.9.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.9.0.tgz";
+        sha1 = "66506c16ce6f4d6928a5b3cd6a33ca41e941e37b";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -10916,13 +11474,13 @@ let
         sha1 = "21ffdc429be2b50cb361df990a40a7731288e935";
       };
     };
-    "simple-git-1.73.0" = {
+    "simple-git-1.75.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.73.0";
+      version = "1.75.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.73.0.tgz";
-        sha1 = "87683a729b1bee016a3182f95a2ab72317bb0230";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.75.0.tgz";
+        sha1 = "eaddc90118b40a1dca3837d51c50ac064ee1d288";
       };
     };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
@@ -10962,13 +11520,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.6" = {
+    "coffee-script-1.12.7" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.6";
+      version = "1.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz";
-        sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
+        sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
       };
     };
     "jade-1.11.0" = {
@@ -12240,13 +12798,13 @@ let
         sha1 = "ab530dbbdab71071369828ef11c8d7ae558d5116";
       };
     };
-    "chai-4.1.0" = {
+    "chai-4.1.1" = {
       name = "chai";
       packageName = "chai";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chai/-/chai-4.1.0.tgz";
-        sha1 = "331a0391b55c3af8740ae9c3b7458bc1c3805e6d";
+        url = "https://registry.npmjs.org/chai/-/chai-4.1.1.tgz";
+        sha1 = "66e21279e6f3c6415ff8231878227900e2171b39";
       };
     };
     "chai-as-promised-7.1.1" = {
@@ -12258,13 +12816,13 @@ let
         sha1 = "08645d825deb8696ee61725dbf590c012eb00ca0";
       };
     };
-    "fast-json-patch-2.0.3" = {
+    "fast-json-patch-2.0.4" = {
       name = "fast-json-patch";
       packageName = "fast-json-patch";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.3.tgz";
-        sha1 = "d17ab0b94d742ec200bef297a378b57368a47f09";
+        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.4.tgz";
+        sha1 = "6aa2b2918ff6f5a16daddf2745547a9ccf36a9fb";
       };
     };
     "iterare-0.0.8" = {
@@ -12501,6 +13059,96 @@ let
         sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee";
       };
     };
+    "graphlib-2.1.1" = {
+      name = "graphlib";
+      packageName = "graphlib";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.1.tgz";
+        sha1 = "42352c52ba2f4d035cb566eb91f7395f76ebc951";
+      };
+    };
+    "native-promise-only-0.8.1" = {
+      name = "native-promise-only";
+      packageName = "native-promise-only";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz";
+        sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
+      };
+    };
+    "path-loader-1.0.2" = {
+      name = "path-loader";
+      packageName = "path-loader";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.2.tgz";
+        sha1 = "cd5c73e7e39a91011be148d6bfdd8a85bb931ef9";
+      };
+    };
+    "uri-js-3.0.2" = {
+      name = "uri-js";
+      packageName = "uri-js";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz";
+        sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa";
+      };
+    };
+    "superagent-3.5.2" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "3.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz";
+        sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8";
+      };
+    };
+    "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";
+      };
+    };
+    "cookiejar-2.1.1" = {
+      name = "cookiejar";
+      packageName = "cookiejar";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz";
+        sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
+      };
+    };
+    "form-data-2.2.0" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.2.0.tgz";
+        sha1 = "9a5e3b9295f980b2623cf64fa238b14cebca707b";
+      };
+    };
+    "formidable-1.1.1" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz";
+        sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
+      };
+    };
+    "punycode-2.1.0" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz";
+        sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d";
+      };
+    };
     "body-parser-1.17.2" = {
       name = "body-parser";
       packageName = "body-parser";
@@ -12573,13 +13221,13 @@ let
         sha1 = "784ac7734e4a453a9c6e6e8680a9329275c8b687";
       };
     };
-    "please-upgrade-node-1.0.1" = {
+    "please-upgrade-node-3.0.1" = {
       name = "please-upgrade-node";
       packageName = "please-upgrade-node";
-      version = "1.0.1";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-1.0.1.tgz";
-        sha1 = "f92dd3443d9797f5742510ea2fd205f811b3b1f7";
+        url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz";
+        sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db";
       };
     };
     "pluralize-3.1.0" = {
@@ -12636,6 +13284,15 @@ let
         sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339";
       };
     };
+    "debug-2.6.7" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz";
+        sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e";
+      };
+    };
     "iconv-lite-0.4.15" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
@@ -12762,6 +13419,15 @@ let
         sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006";
       };
     };
+    "create-error-class-3.0.2" = {
+      name = "create-error-class";
+      packageName = "create-error-class";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz";
+        sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
+      };
+    };
     "node-status-codes-1.0.0" = {
       name = "node-status-codes";
       packageName = "node-status-codes";
@@ -12789,6 +13455,15 @@ let
         sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
       };
     };
+    "capture-stack-trace-1.0.0" = {
+      name = "capture-stack-trace";
+      packageName = "capture-stack-trace";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
+        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
+      };
+    };
     "camelcase-3.0.0" = {
       name = "camelcase";
       packageName = "camelcase";
@@ -12906,22 +13581,13 @@ let
         sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6";
       };
     };
-    "connect-3.6.2" = {
+    "connect-3.6.3" = {
       name = "connect";
       packageName = "connect";
-      version = "3.6.2";
+      version = "3.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz";
-        sha1 = "694e8d20681bfe490282c8ab886be98f09f42fe7";
-      };
-    };
-    "core-js-2.4.1" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz";
-        sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e";
+        url = "https://registry.npmjs.org/connect/-/connect-3.6.3.tgz";
+        sha1 = "f7320d46a25b4be7b483a2236517f24b1e27e301";
       };
     };
     "di-0.0.1" = {
@@ -13248,15 +13914,6 @@ let
         sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
       };
     };
-    "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.3" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -13950,15 +14607,6 @@ let
         sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
       };
     };
-    "lodash.isequal-4.5.0" = {
-      name = "lodash.isequal";
-      packageName = "lodash.isequal";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
-        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
-      };
-    };
     "merge-stream-1.0.1" = {
       name = "merge-stream";
       packageName = "merge-stream";
@@ -14067,15 +14715,6 @@ let
         sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
       };
     };
-    "convert-source-map-1.5.0" = {
-      name = "convert-source-map";
-      packageName = "convert-source-map";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz";
-        sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5";
-      };
-    };
     "express-2.5.11" = {
       name = "express";
       packageName = "express";
@@ -14211,15 +14850,6 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
-    "debug-2.6.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
-      };
-    };
     "diff-3.2.0" = {
       name = "diff";
       packageName = "diff";
@@ -14715,6 +15345,24 @@ let
         sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
       };
     };
+    "express-4.15.3" = {
+      name = "express";
+      packageName = "express";
+      version = "4.15.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz";
+        sha1 = "bab65d0f03aa80c358408972fc700f916944b662";
+      };
+    };
+    "express-session-1.15.2" = {
+      name = "express-session";
+      packageName = "express-session";
+      version = "1.15.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz";
+        sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4";
+      };
+    };
     "follow-redirects-1.2.4" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -14868,13 +15516,13 @@ let
         sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b";
       };
     };
-    "node-red-node-email-0.1.23" = {
+    "node-red-node-email-0.1.24" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.23";
+      version = "0.1.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.23.tgz";
-        sha1 = "ff910b8abb34ac926c1228e082d7667f92bb3737";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.24.tgz";
+        sha1 = "ba12c72b01b39e33f375ccbf4321b163425e8fb2";
       };
     };
     "node-red-node-twitter-0.1.11" = {
@@ -15075,6 +15723,51 @@ let
         sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90";
       };
     };
+    "send-0.15.3" = {
+      name = "send";
+      packageName = "send";
+      version = "0.15.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz";
+        sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309";
+      };
+    };
+    "serve-static-1.12.3" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.12.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz";
+        sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2";
+      };
+    };
+    "crc-3.4.4" = {
+      name = "crc";
+      packageName = "crc";
+      version = "3.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz";
+        sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
+      };
+    };
+    "debug-2.6.3" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz";
+        sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d";
+      };
+    };
+    "uid-safe-2.1.5" = {
+      name = "uid-safe";
+      packageName = "uid-safe";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz";
+        sha1 = "2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a";
+      };
+    };
     "retry-0.6.1" = {
       name = "retry";
       packageName = "retry";
@@ -15165,13 +15858,13 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
-    "websocket-stream-5.0.0" = {
+    "websocket-stream-5.0.1" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
-      version = "5.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.0.tgz";
-        sha1 = "1d1318f0576ce20a12555372108ae9418a403634";
+        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.1.tgz";
+        sha1 = "51cb992988c2eeb4525ccd90eafbac52a5ac6700";
       };
     };
     "leven-1.0.2" = {
@@ -15228,13 +15921,13 @@ let
         sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b";
       };
     };
-    "ws-3.0.0" = {
+    "ws-3.1.0" = {
       name = "ws";
       packageName = "ws";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-3.0.0.tgz";
-        sha1 = "98ddb00056c8390cb751e7788788497f99103b6c";
+        url = "https://registry.npmjs.org/ws/-/ws-3.1.0.tgz";
+        sha1 = "8afafecdeab46d572e5397ee880739367aa2f41c";
       };
     };
     "append-field-0.1.0" = {
@@ -15462,15 +16155,6 @@ let
         sha1 = "787add2415d827acb3af6ec4bca1ea9596418853";
       };
     };
-    "encoding-0.1.12" = {
-      name = "encoding";
-      packageName = "encoding";
-      version = "0.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz";
-        sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
-      };
-    };
     "uue-3.1.0" = {
       name = "uue";
       packageName = "uue";
@@ -15822,6 +16506,15 @@ let
         sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
       };
     };
+    "debug-3.0.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.0.0.tgz";
+        sha1 = "1d2feae53349047b08b264ec41906ba17a8516e4";
+      };
+    };
     "qs-0.5.1" = {
       name = "qs";
       packageName = "qs";
@@ -16191,13 +16884,13 @@ let
         sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
       };
     };
-    "libnpx-9.2.0" = {
+    "libnpx-9.2.3" = {
       name = "libnpx";
       packageName = "libnpx";
-      version = "9.2.0";
+      version = "9.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.0.tgz";
-        sha1 = "ce721ffc7bdfa275c18677b82728e6ee96a50642";
+        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz";
+        sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304";
       };
     };
     "lodash._baseuniq-4.6.0" = {
@@ -16443,13 +17136,13 @@ let
         sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
       };
     };
-    "os-locale-2.0.0" = {
+    "os-locale-2.1.0" = {
       name = "os-locale";
       packageName = "os-locale";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz";
-        sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4";
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
+        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
       };
     };
     "read-pkg-up-2.0.0" = {
@@ -16479,6 +17172,15 @@ let
         sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
       };
     };
+    "execa-0.7.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+      };
+    };
     "read-pkg-2.0.0" = {
       name = "read-pkg";
       packageName = "read-pkg";
@@ -16659,13 +17361,13 @@ let
         sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4";
       };
     };
-    "https-proxy-agent-2.0.0" = {
+    "https-proxy-agent-2.1.0" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz";
-        sha1 = "ffaa4b6faf586ac340c18a140431e76b7d7f2944";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
+        sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443";
       };
     };
     "node-fetch-npm-2.0.1" = {
@@ -16695,13 +17397,13 @@ let
         sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
       };
     };
-    "agent-base-4.1.0" = {
+    "agent-base-4.1.1" = {
       name = "agent-base";
       packageName = "agent-base";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.0.tgz";
-        sha1 = "20e17401cd49b3c076bf56a4bc6c5b436ffa8d55";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
+        sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -16776,22 +17478,22 @@ let
         sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
       };
     };
-    "boxen-1.2.0" = {
+    "boxen-1.2.1" = {
       name = "boxen";
       packageName = "boxen";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz";
-        sha1 = "03478d84be7fe02189b80904d81d6a80384368f1";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz";
+        sha1 = "0f11e7fe344edb9397977fc13ede7f64d956481d";
       };
     };
-    "configstore-3.1.0" = {
+    "configstore-3.1.1" = {
       name = "configstore";
       packageName = "configstore";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz";
-        sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1";
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
+        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
       };
     };
     "import-lazy-2.1.0" = {
@@ -16839,42 +17541,6 @@ let
         sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
-    "execa-0.7.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
-        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
-      };
-    };
-    "cross-spawn-5.1.0" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
-      };
-    };
-    "shebang-command-1.2.0" = {
-      name = "shebang-command";
-      packageName = "shebang-command";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
-        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
-      };
-    };
-    "shebang-regex-1.0.0" = {
-      name = "shebang-regex";
-      packageName = "shebang-regex";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
-        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
-      };
-    };
     "unique-string-1.0.0" = {
       name = "unique-string";
       packageName = "unique-string";
@@ -16902,6 +17568,15 @@ let
         sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
       };
     };
+    "got-6.7.1" = {
+      name = "got";
+      packageName = "got";
+      version = "6.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
+      };
+    };
     "argparse-0.1.15" = {
       name = "argparse";
       packageName = "argparse";
@@ -17154,13 +17829,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.36.2" = {
+    "snyk-1.38.1" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.36.2";
+      version = "1.38.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.36.2.tgz";
-        sha1 = "88be72a8da75a02e920f2be7f5830402b5e0eb41";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.38.1.tgz";
+        sha1 = "8a7527cc89811daa400780ea9051f5a73e737f23";
       };
     };
     "spawn-please-0.3.0" = {
@@ -17253,13 +17928,13 @@ let
         sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
       };
     };
-    "es5-ext-0.10.24" = {
+    "es5-ext-0.10.26" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.24";
+      version = "0.10.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz";
-        sha1 = "a55877c9924bc0c8d9bd3c2cbe17495ac1709b14";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.26.tgz";
+        sha1 = "51b2128a531b70c4f6764093a73cbebb82186372";
       };
     };
     "es6-iterator-2.0.1" = {
@@ -17307,13 +17982,13 @@ let
         sha1 = "f27aec2498b24027ac719214026521591111508f";
       };
     };
-    "snyk-gradle-plugin-1.0.2" = {
+    "snyk-gradle-plugin-1.0.3" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.0.2.tgz";
-        sha1 = "364550d5f388673400296d3ab31df358c678bb9e";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.0.3.tgz";
+        sha1 = "9583df8bda478d4a20070d577b1da2e1cb6499ef";
       };
     };
     "snyk-module-1.8.1" = {
@@ -17379,13 +18054,13 @@ let
         sha1 = "13743a058437dff890baaf437c333c966a743cb6";
       };
     };
-    "snyk-sbt-plugin-1.0.2" = {
+    "snyk-sbt-plugin-1.1.0" = {
       name = "snyk-sbt-plugin";
       packageName = "snyk-sbt-plugin";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.0.2.tgz";
-        sha1 = "ce2aa9a3b08af6680d5ee8a007ecb6ae55fb72d1";
+        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.1.0.tgz";
+        sha1 = "922bc70220ee95f26fbb1e482ff1dcbccdd1f050";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -17641,13 +18316,13 @@ let
         sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
       };
     };
-    "domino-1.0.28" = {
+    "domino-1.0.29" = {
       name = "domino";
       packageName = "domino";
-      version = "1.0.28";
+      version = "1.0.29";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz";
-        sha1 = "9ce3f6a9221a2c3288984b14ea191cd27b392f87";
+        url = "https://registry.npmjs.org/domino/-/domino-1.0.29.tgz";
+        sha1 = "de8aa1f6f98e3c5538feb7a61fa69c1eabbace06";
       };
     };
     "express-handlebars-3.0.0" = {
@@ -17760,13 +18435,13 @@ let
         sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
       };
     };
-    "bunyan-1.8.10" = {
+    "bunyan-1.8.12" = {
       name = "bunyan";
       packageName = "bunyan";
-      version = "1.8.10";
+      version = "1.8.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz";
-        sha1 = "201fedd26c7080b632f416072f53a90b9a52981c";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz";
+        sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797";
       };
     };
     "bunyan-syslog-udp-0.1.0" = {
@@ -17823,13 +18498,13 @@ let
         sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31";
       };
     };
-    "dtrace-provider-0.8.3" = {
+    "dtrace-provider-0.8.5" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.8.3";
+      version = "0.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.3.tgz";
-        sha1 = "ba1bfc6493285ccfcfc6ab69cd5c61d74c2a43bf";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz";
+        sha1 = "98ebba221afac46e1c39fd36858d8f9367524b92";
       };
     };
     "mv-2.1.1" = {
@@ -17941,13 +18616,13 @@ let
         sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff";
       };
     };
-    "msgpack5-3.4.1" = {
+    "msgpack5-3.5.0" = {
       name = "msgpack5";
       packageName = "msgpack5";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.4.1.tgz";
-        sha1 = "350ef35899c6c8773710fd84d881ddd3340a8114";
+        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.0.tgz";
+        sha1 = "193b3e864959a826d33074460c2651d1ed04b07a";
       };
     };
     "dom-storage-2.0.2" = {
@@ -18346,15 +19021,6 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "private-0.1.7" = {
-      name = "private";
-      packageName = "private";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
-        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
-      };
-    };
     "recast-0.11.23" = {
       name = "recast";
       packageName = "recast";
@@ -19067,15 +19733,6 @@ let
         sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
       };
     };
-    "formidable-1.1.1" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz";
-        sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
-      };
-    };
     "http-signature-0.11.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -19148,13 +19805,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.2.0" = {
+    "csv-parse-1.2.1" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz";
-        sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.1.tgz";
+        sha1 = "9199c23f2490d98c4d9ab2a0167b06927498c9df";
       };
     };
     "stream-transform-0.1.2" = {
@@ -19391,13 +20048,13 @@ let
         sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57";
       };
     };
-    "tapable-0.2.6" = {
+    "tapable-0.2.8" = {
       name = "tapable";
       packageName = "tapable";
-      version = "0.2.6";
+      version = "0.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz";
-        sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d";
+        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz";
+        sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22";
       };
     };
     "memory-fs-0.3.0" = {
@@ -19409,15 +20066,6 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
-    "async-2.4.1" = {
-      name = "async";
-      packageName = "async";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz";
-        sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7";
-      };
-    };
     "blueimp-md5-2.7.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
@@ -19427,13 +20075,13 @@ let
         sha1 = "7f518e0dd70467fefe28ecba398916092f2a02a9";
       };
     };
-    "color-1.0.3" = {
+    "color-2.0.0" = {
       name = "color";
       packageName = "color";
-      version = "1.0.3";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz";
-        sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d";
+        url = "https://registry.npmjs.org/color/-/color-2.0.0.tgz";
+        sha1 = "e0c9972d1e969857004b101eaa55ceab5961d67d";
       };
     };
     "crossroads-0.12.2" = {
@@ -19454,13 +20102,13 @@ let
         sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580";
       };
     };
-    "express-session-1.15.3" = {
+    "express-session-1.15.5" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.15.3";
+      version = "1.15.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.3.tgz";
-        sha1 = "db545f0435a7b1b228ae02da8197f65141735c67";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.5.tgz";
+        sha1 = "f49a18227263b316f6f8544da5fee25a540259ec";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -19490,15 +20138,6 @@ let
         sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73";
       };
     };
-    "ignore-3.2.7" = {
-      name = "ignore";
-      packageName = "ignore";
-      version = "3.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz";
-        sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd";
-      };
-    };
     "just-detect-adblock-1.0.0" = {
       name = "just-detect-adblock";
       packageName = "just-detect-adblock";
@@ -19544,15 +20183,6 @@ let
         sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
       };
     };
-    "npm-registry-client-8.3.0" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz";
-        sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f";
-      };
-    };
     "octicons-3.5.0" = {
       name = "octicons";
       packageName = "octicons";
@@ -19571,13 +20201,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.2.1" = {
+    "raven-2.1.1" = {
       name = "raven";
       packageName = "raven";
-      version = "1.2.1";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz";
-        sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd";
+        url = "https://registry.npmjs.org/raven/-/raven-2.1.1.tgz";
+        sha1 = "b3a974c6c29315c677c079e168435ead196525cd";
       };
     };
     "signals-1.0.0" = {
@@ -19598,13 +20228,13 @@ let
         sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3";
       };
     };
-    "superagent-3.5.2" = {
-      name = "superagent";
-      packageName = "superagent";
-      version = "3.5.2";
+    "socket.io-2.0.3" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz";
-        sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.3.tgz";
+        sha1 = "4359f06a24933ae6bd087798af78c680eae345e3";
       };
     };
     "winston-2.3.1" = {
@@ -19661,24 +20291,6 @@ let
         sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "whatwg-fetch-2.0.3" = {
-      name = "whatwg-fetch";
-      packageName = "whatwg-fetch";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz";
-        sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84";
-      };
-    };
-    "crc-3.4.4" = {
-      name = "crc";
-      packageName = "crc";
-      version = "3.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz";
-        sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
-      };
-    };
     "broadway-0.2.10" = {
       name = "broadway";
       packageName = "broadway";
@@ -19859,15 +20471,6 @@ let
         sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
       };
     };
-    "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";
-      };
-    };
     "stack-trace-0.0.9" = {
       name = "stack-trace";
       packageName = "stack-trace";
@@ -19877,6 +20480,15 @@ let
         sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
       };
     };
+    "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";
+      };
+    };
     "eve-0.5.4" = {
       name = "eve";
       packageName = "eve";
@@ -19886,22 +20498,85 @@ let
         sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa";
       };
     };
-    "cookiejar-2.1.1" = {
-      name = "cookiejar";
-      packageName = "cookiejar";
-      version = "2.1.1";
+    "engine.io-3.1.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz";
-        sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.0.tgz";
+        sha1 = "5ca438e3ce9fdbc915c4a21c8dd9e1266706e57e";
       };
     };
-    "form-data-2.2.0" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.2.0";
+    "socket.io-adapter-1.1.1" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.2.0.tgz";
-        sha1 = "9a5e3b9295f980b2623cf64fa238b14cebca707b";
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz";
+        sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b";
+      };
+    };
+    "socket.io-client-2.0.3" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz";
+        sha1 = "6caf4aff9f85b19fd91b6ce13d69adb564f8873b";
+      };
+    };
+    "socket.io-parser-3.1.2" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz";
+        sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2";
+      };
+    };
+    "engine.io-parser-2.1.1" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz";
+        sha1 = "e0fb3f0e0462f7f58bb77c1a52e9f5a7e26e4668";
+      };
+    };
+    "uws-0.14.5" = {
+      name = "uws";
+      packageName = "uws";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz";
+        sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc";
+      };
+    };
+    "has-binary2-1.0.2" = {
+      name = "has-binary2";
+      packageName = "has-binary2";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz";
+        sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98";
+      };
+    };
+    "isarray-2.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz";
+        sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e";
+      };
+    };
+    "engine.io-client-3.1.1" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz";
+        sha1 = "415a9852badb14fa008fa3ef1e31608db6761325";
       };
     };
     "adm-zip-0.4.7" = {
@@ -19967,13 +20642,13 @@ let
         sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0";
       };
     };
-    "enhanced-resolve-3.3.0" = {
+    "enhanced-resolve-3.4.1" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "3.3.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz";
-        sha1 = "950964ecc7f0332a42321b673b38dc8ff15535b3";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz";
+        sha1 = "0421e339fd71419b3da13d129b3979040230476e";
       };
     };
     "escope-3.6.0" = {
@@ -19985,22 +20660,13 @@ let
         sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
       };
     };
-    "json-loader-0.5.4" = {
+    "json-loader-0.5.7" = {
       name = "json-loader";
       packageName = "json-loader";
-      version = "0.5.4";
+      version = "0.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz";
-        sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de";
-      };
-    };
-    "json5-0.5.1" = {
-      name = "json5";
-      packageName = "json5";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
-        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+        url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz";
+        sha1 = "dca14a70235ff82f0ac9a3abeb60d337a365185d";
       };
     };
     "loader-runner-2.3.0" = {
@@ -20048,13 +20714,13 @@ let
         sha1 = "b951f4abb6bd617e66f63eb891498e391763e309";
       };
     };
-    "watchpack-1.3.1" = {
+    "watchpack-1.4.0" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz";
-        sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz";
+        sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac";
       };
     };
     "webpack-sources-1.0.1" = {
@@ -20129,22 +20795,49 @@ let
         sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
       };
     };
-    "timers-browserify-2.0.2" = {
+    "timers-browserify-2.0.3" = {
       name = "timers-browserify";
       packageName = "timers-browserify";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz";
-        sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz";
+        sha1 = "41fd0bdc926a5feedc33a17a8e1f7d491925f7fc";
       };
     };
-    "setimmediate-1.0.5" = {
-      name = "setimmediate";
-      packageName = "setimmediate";
-      version = "1.0.5";
+    "global-4.3.2" = {
+      name = "global";
+      packageName = "global";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
-        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+        url = "https://registry.npmjs.org/global/-/global-4.3.2.tgz";
+        sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
+      };
+    };
+    "min-document-2.19.0" = {
+      name = "min-document";
+      packageName = "min-document";
+      version = "2.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz";
+        sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685";
+      };
+    };
+    "process-0.5.2" = {
+      name = "process";
+      packageName = "process";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process/-/process-0.5.2.tgz";
+        sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf";
+      };
+    };
+    "dom-walk-0.1.1" = {
+      name = "dom-walk";
+      packageName = "dom-walk";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz";
+        sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
       };
     };
     "source-list-map-2.0.0" = {
@@ -20156,15 +20849,6 @@ let
         sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085";
       };
     };
-    "babel-runtime-6.23.0" = {
-      name = "babel-runtime";
-      packageName = "babel-runtime";
-      version = "6.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz";
-        sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b";
-      };
-    };
     "death-1.1.0" = {
       name = "death";
       packageName = "death";
@@ -20183,15 +20867,6 @@ let
         sha1 = "39c72ed89d1b49ba708e18776500488902a52027";
       };
     };
-    "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";
@@ -20210,13 +20885,13 @@ let
         sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
       };
     };
-    "node-emoji-1.7.0" = {
+    "node-emoji-1.8.1" = {
       name = "node-emoji";
       packageName = "node-emoji";
-      version = "1.7.0";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.7.0.tgz";
-        sha1 = "a400490aac409b616d13941532200f128af037f9";
+        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz";
+        sha1 = "6eec6bfb07421e2148c75c6bba72421f8530a826";
       };
     };
     "object-path-0.11.4" = {
@@ -20255,15 +20930,6 @@ let
         sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9";
       };
     };
-    "regenerator-runtime-0.10.5" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.10.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
-        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
-      };
-    };
     "is-deflate-1.0.0" = {
       name = "is-deflate";
       packageName = "is-deflate";
@@ -20291,15 +20957,6 @@ let
         sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52";
       };
     };
-    "loose-envify-1.3.1" = {
-      name = "loose-envify";
-      packageName = "loose-envify";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz";
-        sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
-      };
-    };
     "ci-info-1.0.0" = {
       name = "ci-info";
       packageName = "ci-info";
@@ -20435,31 +21092,22 @@ let
         sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
       };
     };
-    "yeoman-environment-2.0.0" = {
+    "yeoman-environment-2.0.1" = {
       name = "yeoman-environment";
       packageName = "yeoman-environment";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.0.tgz";
-        sha1 = "dafa2fc512c168cb8313453e5318e64731265915";
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.1.tgz";
+        sha1 = "2b89415abd47775878bf4f77dbca97158f77de88";
       };
     };
-    "yosay-2.0.0" = {
+    "yosay-2.0.1" = {
       name = "yosay";
       packageName = "yosay";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yosay/-/yosay-2.0.0.tgz";
-        sha1 = "0f3d2bb01f7f25362c127212f53c1572906333fe";
-      };
-    };
-    "execa-0.6.3" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz";
-        sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe";
+        url = "https://registry.npmjs.org/yosay/-/yosay-2.0.1.tgz";
+        sha1 = "078167f0365732e5c82d3f64633f9cd3a0526d2f";
       };
     };
     "filter-obj-1.1.0" = {
@@ -20525,15 +21173,6 @@ let
         sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31";
       };
     };
-    "indent-string-3.1.0" = {
-      name = "indent-string";
-      packageName = "indent-string";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/indent-string/-/indent-string-3.1.0.tgz";
-        sha1 = "08ff4334603388399b329e6b9538dc7a3cf5de7d";
-      };
-    };
     "execa-0.4.0" = {
       name = "execa";
       packageName = "execa";
@@ -20846,7 +21485,7 @@ in
           sources."source-map-0.5.6"
         ];
       })
-      sources."resolve-1.3.3"
+      sources."resolve-1.4.0"
       sources."global-paths-0.1.2"
       sources."source-map-0.1.9"
       sources."xml2tss-0.0.5"
@@ -20890,7 +21529,7 @@ in
       })
       sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
-      sources."which-1.2.14"
+      sources."which-1.3.0"
       sources."parse-passwd-1.0.0"
       sources."isexe-2.0.0"
       sources."amdefine-1.0.1"
@@ -21094,7 +21733,7 @@ in
       })
       sources."moment-2.18.1"
       sources."ms-rest-2.2.1"
-      (sources."ms-rest-azure-2.2.1" // {
+      (sources."ms-rest-azure-2.2.3" // {
         dependencies = [
           sources."async-0.2.7"
         ];
@@ -21194,12 +21833,12 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
-      sources."@types/node-7.0.37"
+      sources."@types/node-7.0.39"
       sources."@types/request-0.0.45"
       sources."@types/uuid-2.0.30"
       sources."is-buffer-1.1.5"
       sources."is-stream-1.1.0"
-      sources."@types/form-data-0.0.33"
+      sources."@types/form-data-2.2.0"
       sources."debug-0.7.4"
       sources."q-0.9.7"
       sources."pkginfo-0.4.0"
@@ -21254,7 +21893,7 @@ 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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.3"
       sources."stringstream-0.0.5"
@@ -21279,7 +21918,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21289,9 +21928,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -21307,7 +21950,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."ctype-0.5.2"
       sources."source-map-0.1.43"
@@ -21374,7 +22017,7 @@ in
       })
       sources."lodash-4.2.1"
       sources."promised-temp-0.1.0"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       (sources."temp-0.8.3" // {
         dependencies = [
           sources."rimraf-2.2.8"
@@ -21503,7 +22146,7 @@ in
         ];
       })
       sources."browserify-zlib-0.1.4"
-      sources."buffer-5.0.6"
+      sources."buffer-5.0.7"
       sources."cached-path-relative-1.0.1"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
@@ -21539,7 +22182,7 @@ in
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
       sources."readable-stream-2.3.3"
-      sources."resolve-1.3.3"
+      sources."resolve-1.4.0"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
@@ -21585,7 +22228,7 @@ in
       sources."create-hash-1.1.3"
       sources."create-hmac-1.1.6"
       sources."diffie-hellman-5.0.2"
-      sources."pbkdf2-3.0.12"
+      sources."pbkdf2-3.0.13"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
       sources."browserify-aes-1.0.6"
@@ -21596,7 +22239,7 @@ in
       sources."safe-buffer-5.1.1"
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
-      sources."bn.js-4.11.7"
+      sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
       sources."parse-asn1-5.1.0"
@@ -21753,7 +22396,7 @@ in
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
       sources."spdx-correct-1.0.2"
@@ -21933,7 +22576,7 @@ in
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
       sources."k-rpc-socket-1.7.1"
-      sources."bn.js-4.11.7"
+      sources."bn.js-4.11.8"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
@@ -21996,7 +22639,7 @@ in
       sources."sntp-0.1.4"
       sources."codepage-1.4.0"
       sources."utfx-1.0.1"
-      sources."voc-0.5.0"
+      sources."voc-1.0.0"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
           sources."readable-stream-2.3.3"
@@ -22004,7 +22647,7 @@ in
           sources."string_decoder-1.0.3"
         ];
       })
-      sources."exit-on-epipe-1.0.0"
+      sources."exit-on-epipe-1.0.1"
       sources."commander-2.11.0"
       sources."typedarray-0.0.6"
       sources."sax-1.2.4"
@@ -22021,10 +22664,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.6";
+    version = "1.12.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz";
-      sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
+      sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -22054,6 +22697,7 @@ in
           sources."glob-7.1.1"
           sources."nopt-4.0.1"
           sources."plist-2.0.1"
+          sources."semver-5.3.0"
           sources."shelljs-0.3.0"
           sources."base64-js-1.1.2"
           sources."xmlbuilder-8.2.2"
@@ -22094,7 +22738,7 @@ in
       sources."glob-5.0.15"
       sources."minimatch-3.0.4"
       sources."plist-1.2.0"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."shelljs-0.5.3"
       sources."underscore-1.8.3"
       sources."unorm-1.4.1"
@@ -22199,7 +22843,7 @@ in
       sources."interpret-1.0.3"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
-      sources."resolve-1.3.3"
+      sources."resolve-1.4.0"
       sources."path-parse-1.0.5"
       (sources."browserify-13.3.0" // {
         dependencies = [
@@ -22304,7 +22948,7 @@ in
       sources."create-hash-1.1.3"
       sources."create-hmac-1.1.6"
       sources."diffie-hellman-5.0.2"
-      sources."pbkdf2-3.0.12"
+      sources."pbkdf2-3.0.13"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
       sources."browserify-aes-1.0.6"
@@ -22315,7 +22959,7 @@ in
       sources."safe-buffer-5.1.1"
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
-      sources."bn.js-4.11.7"
+      sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
       sources."parse-asn1-5.1.0"
@@ -22355,11 +22999,7 @@ in
       sources."indexof-0.0.1"
       sources."chalk-1.1.3"
       sources."compression-1.7.0"
-      (sources."express-4.15.3" // {
-        dependencies = [
-          sources."debug-2.6.7"
-        ];
-      })
+      sources."express-4.15.4"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -22368,43 +23008,35 @@ in
       sources."ansi-regex-2.1.1"
       sources."accepts-1.3.3"
       sources."bytes-2.5.0"
-      sources."compressible-2.0.10"
+      sources."compressible-2.0.11"
       sources."debug-2.6.8"
       sources."on-headers-1.0.1"
       sources."vary-1.1.1"
-      sources."mime-types-2.1.15"
+      sources."mime-types-2.1.16"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."ms-2.0.0"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."depd-1.1.0"
+      sources."depd-1.1.1"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.0"
-      (sources."finalhandler-1.0.3" // {
-        dependencies = [
-          sources."debug-2.6.7"
-        ];
-      })
+      sources."finalhandler-1.0.4"
       sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.4"
-      sources."qs-6.4.0"
+      sources."proxy-addr-1.1.5"
+      sources."qs-6.5.0"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.3" // {
-        dependencies = [
-          sources."debug-2.6.7"
-        ];
-      })
-      sources."serve-static-1.12.3"
+      sources."send-0.15.4"
+      sources."serve-static-1.12.4"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
@@ -22412,9 +23044,9 @@ in
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.3.0"
+      sources."ipaddr.js-1.4.0"
       sources."destroy-1.0.4"
-      sources."http-errors-1.6.1"
+      sources."http-errors-1.6.2"
       sources."mime-1.3.4"
       sources."media-typer-0.3.0"
       sources."npm-package-arg-5.1.2"
@@ -22463,6 +23095,7 @@ in
       (sources."node-gyp-3.6.2" // {
         dependencies = [
           sources."glob-7.1.2"
+          sources."semver-5.3.0"
         ];
       })
       sources."normalize-git-url-3.0.2"
@@ -22557,7 +23190,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22567,9 +23200,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -22637,7 +23274,7 @@ in
         ];
       })
       sources."registry-url-3.1.0"
-      sources."duplexify-3.5.0"
+      sources."duplexify-3.5.1"
       sources."infinity-agent-2.0.3"
       sources."is-redirect-1.0.0"
       sources."is-stream-1.1.0"
@@ -22646,11 +23283,7 @@ in
       sources."prepend-http-1.0.4"
       sources."read-all-stream-3.1.0"
       sources."timed-out-2.0.0"
-      (sources."end-of-stream-1.0.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."end-of-stream-1.4.0"
       sources."stream-shift-1.0.0"
       (sources."rc-1.2.1" // {
         dependencies = [
@@ -22786,9 +23419,9 @@ in
       sources."cookie-0.1.2"
       sources."merge-descriptors-0.0.2"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.15"
+      sources."mime-types-2.1.16"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."ms-0.7.0"
       sources."crc-3.2.1"
       sources."ee-first-1.1.0"
@@ -22796,7 +23429,7 @@ in
       sources."ipaddr.js-1.0.5"
       sources."destroy-1.0.3"
       sources."mime-1.2.11"
-      sources."bindings-1.2.1"
+      sources."bindings-1.3.0"
       sources."nan-2.6.2"
       sources."jsonparse-0.0.6"
       sources."es5class-2.3.1"
@@ -22938,11 +23571,9 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
-      (sources."duplexify-3.5.0" // {
+      (sources."duplexify-3.5.1" // {
         dependencies = [
-          sources."end-of-stream-1.0.0"
           sources."readable-stream-2.3.3"
-          sources."once-1.3.3"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.3"
         ];
@@ -23013,7 +23644,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.85.0"
+      sources."aws-sdk-2.95.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
@@ -23048,7 +23679,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -23072,7 +23703,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23082,9 +23713,14 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."core-util-is-1.0.2"
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -23100,7 +23736,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -23113,49 +23749,51 @@ in
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
-    version = "1.1.0";
+    version = "2.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emoj/-/emoj-1.1.0.tgz";
-      sha1 = "5a43ae17f6bf672cd8e40891357f84b086c52509";
+      url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz";
+      sha1 = "6f6faf41a8f48e6080bffb2012041fc89491dd9f";
     };
     dependencies = [
-      sources."chalk-1.1.3"
-      sources."clipboardy-0.1.2"
+      sources."auto-bind-1.1.0"
+      sources."clipboardy-1.1.4"
       sources."conf-1.1.2"
-      (sources."got-6.7.1" // {
+      sources."got-7.1.0"
+      sources."has-ansi-3.0.0"
+      sources."import-jsx-1.3.0"
+      (sources."ink-0.3.1" // {
         dependencies = [
-          sources."get-stream-3.0.0"
+          sources."chalk-2.1.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
         ];
       })
-      sources."has-ansi-2.0.0"
+      sources."ink-text-input-1.1.0"
       sources."lodash.debounce-4.0.8"
-      sources."log-update-1.0.2"
       sources."mem-1.1.0"
-      sources."meow-3.7.0"
+      (sources."meow-3.7.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
       sources."skin-tone-1.0.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."execa-0.6.3"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
       sources."is-stream-1.1.0"
       sources."npm-run-path-2.0.2"
       sources."p-finally-1.0.0"
       sources."signal-exit-3.0.2"
       sources."strip-eof-1.0.0"
       sources."lru-cache-4.1.1"
-      sources."which-1.2.14"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
       sources."isexe-2.0.0"
-      sources."object-assign-4.1.1"
-      sources."pinkie-promise-2.0.1"
-      sources."pinkie-2.0.4"
       sources."path-key-2.0.1"
-      sources."dot-prop-4.1.1"
+      sources."dot-prop-4.2.0"
       sources."env-paths-1.0.0"
       sources."make-dir-1.0.0"
       sources."pkg-up-2.0.0"
@@ -23166,28 +23804,137 @@ in
       sources."p-locate-2.0.0"
       sources."path-exists-3.0.0"
       sources."p-limit-1.1.0"
-      sources."create-error-class-3.0.2"
+      sources."decompress-response-3.3.0"
       sources."duplexer3-0.1.4"
-      sources."is-redirect-1.0.0"
+      sources."is-plain-obj-1.1.0"
       sources."is-retry-allowed-1.1.0"
+      sources."isurl-1.0.0"
       sources."lowercase-keys-1.0.0"
+      sources."p-cancelable-0.3.0"
+      sources."p-timeout-1.2.0"
       sources."safe-buffer-5.1.1"
       sources."timed-out-4.0.1"
-      sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."url-to-options-1.0.1"
+      sources."mimic-response-1.0.0"
+      sources."has-to-string-tag-x-1.4.0"
+      sources."is-object-1.0.1"
+      sources."has-symbol-support-x-1.4.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."ansi-regex-3.0.0"
+      sources."babel-core-6.25.0"
+      sources."babel-plugin-transform-es2015-destructuring-6.23.0"
+      sources."babel-plugin-transform-object-rest-spread-6.23.0"
+      sources."babel-plugin-transform-react-jsx-6.24.1"
+      sources."caller-path-2.0.0"
+      sources."require-from-string-1.2.1"
+      sources."resolve-from-3.0.0"
+      sources."babel-code-frame-6.22.0"
+      sources."babel-generator-6.25.0"
+      sources."babel-helpers-6.24.1"
+      sources."babel-messages-6.23.0"
+      sources."babel-template-6.25.0"
+      sources."babel-runtime-6.25.0"
+      sources."babel-register-6.24.1"
+      sources."babel-traverse-6.25.0"
+      sources."babel-types-6.25.0"
+      sources."babylon-6.17.4"
+      sources."convert-source-map-1.5.0"
+      sources."debug-2.6.8"
+      sources."json5-0.5.1"
+      sources."lodash-4.17.4"
+      sources."minimatch-3.0.4"
+      sources."path-is-absolute-1.0.1"
+      sources."private-0.1.7"
+      sources."slash-1.0.0"
+      sources."source-map-0.5.6"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."has-ansi-2.0.0"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."esutils-2.0.2"
+      sources."js-tokens-3.0.2"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      (sources."strip-ansi-3.0.1" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."supports-color-2.0.0"
+      sources."detect-indent-4.0.0"
+      sources."jsesc-1.3.0"
+      sources."trim-right-1.0.1"
+      sources."repeating-2.0.1"
+      sources."is-finite-1.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."core-js-2.5.0"
+      sources."regenerator-runtime-0.10.5"
+      sources."home-or-tmp-2.0.0"
+      sources."mkdirp-0.5.1"
+      sources."source-map-support-0.4.15"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."minimist-0.0.8"
+      sources."globals-9.18.0"
+      sources."invariant-2.2.2"
+      sources."loose-envify-1.3.1"
+      sources."to-fast-properties-1.0.3"
+      sources."ms-2.0.0"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+      sources."babel-plugin-syntax-object-rest-spread-6.13.0"
+      sources."babel-helper-builder-react-jsx-6.24.1"
+      sources."babel-plugin-syntax-jsx-6.18.0"
+      sources."caller-callsite-2.0.0"
+      sources."callsites-2.0.0"
+      sources."arrify-1.0.1"
+      sources."indent-string-3.2.0"
+      sources."lodash.flattendeep-4.4.0"
+      sources."lodash.isequal-4.5.0"
+      sources."log-update-2.1.0"
+      sources."prop-types-15.5.10"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
+      sources."ansi-escapes-2.0.0"
+      sources."cli-cursor-2.1.0"
+      (sources."wrap-ansi-3.0.1" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."restore-cursor-2.0.0"
+      sources."onetime-2.0.1"
       sources."mimic-fn-1.1.0"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."is-fullwidth-code-point-2.0.0"
+      (sources."fbjs-0.8.14" // {
+        dependencies = [
+          sources."core-js-1.2.7"
+        ];
+      })
+      sources."isomorphic-fetch-2.2.1"
+      sources."object-assign-4.1.1"
+      sources."promise-7.3.1"
+      sources."setimmediate-1.0.5"
+      sources."ua-parser-js-0.7.14"
+      sources."node-fetch-1.7.2"
+      sources."whatwg-fetch-2.0.3"
+      sources."encoding-0.1.12"
+      sources."iconv-lite-0.4.18"
+      sources."asap-2.0.6"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
-      sources."minimist-1.2.0"
       sources."normalize-package-data-2.4.0"
       (sources."read-pkg-up-1.0.1" // {
         dependencies = [
@@ -23195,20 +23942,26 @@ in
           sources."path-exists-2.1.0"
         ];
       })
-      sources."redent-1.0.0"
+      (sources."redent-1.0.0" // {
+        dependencies = [
+          sources."indent-string-2.1.0"
+        ];
+      })
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       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."read-pkg-1.1.0"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
       sources."graceful-fs-4.1.11"
@@ -23217,11 +23970,7 @@ in
       sources."error-ex-1.3.1"
       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."get-stdin-4.0.1"
       sources."unicode-emoji-modifier-base-1.0.0"
     ];
@@ -23236,39 +23985,41 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "4.2.0";
+    version = "4.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-4.2.0.tgz";
-      sha1 = "a2b3184111b198e02e9c7f3cca625a5e01c56b3d";
+      url = "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz";
+      sha1 = "99cd7eafcffca2ff99a5c8f5f2a474d6364b4bd3";
     };
     dependencies = [
       sources."ajv-5.2.2"
       sources."babel-code-frame-6.22.0"
       sources."chalk-1.1.3"
       sources."concat-stream-1.6.0"
+      sources."cross-spawn-5.1.0"
       sources."debug-2.6.8"
       sources."doctrine-2.0.0"
       sources."eslint-scope-3.7.1"
-      sources."espree-3.4.3"
+      sources."espree-3.5.0"
       sources."esquery-1.0.0"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
+      sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
       sources."ignore-3.3.3"
       sources."imurmurhash-0.1.4"
-      (sources."inquirer-3.2.0" // {
+      (sources."inquirer-3.2.1" // {
         dependencies = [
-          sources."chalk-2.0.1"
+          sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
-          sources."ansi-styles-3.1.0"
-          sources."supports-color-4.2.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
           sources."ansi-regex-3.0.0"
         ];
       })
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.9.0"
+      sources."js-yaml-3.9.1"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.4"
@@ -23280,6 +24031,7 @@ in
       sources."pluralize-4.0.0"
       sources."progress-2.0.0"
       sources."require-uncached-1.0.3"
+      sources."semver-5.4.1"
       sources."strip-json-comments-2.0.1"
       (sources."table-4.0.1" // {
         dependencies = [
@@ -23306,6 +24058,13 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
+      sources."lru-cache-4.1.1"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
       sources."ms-2.0.0"
       sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
@@ -23316,7 +24075,7 @@ in
         ];
       })
       sources."flat-cache-1.2.2"
-      sources."circular-json-0.3.1"
+      sources."circular-json-0.3.3"
       sources."del-2.2.2"
       sources."graceful-fs-4.1.11"
       sources."write-0.2.1"
@@ -23345,7 +24104,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      (sources."string-width-2.1.0" // {
+      (sources."string-width-2.1.1" // {
         dependencies = [
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -23353,14 +24112,14 @@ in
       })
       sources."through-2.3.8"
       sources."color-convert-1.9.0"
-      sources."color-name-1.1.2"
+      sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
       sources."iconv-lite-0.4.18"
-      sources."jschardet-1.4.2"
+      sources."jschardet-1.5.1"
       sources."tmp-0.0.31"
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
@@ -23396,10 +24155,10 @@ in
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
     packageName = "eslint_d";
-    version = "5.0.0";
+    version = "5.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.0.0.tgz";
-      sha1 = "88bbceec5d5eead280b63b6351881bc05bfe3987";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.1.0.tgz";
+      sha1 = "937da79d43f4411c92837c8aec22cf307bc6a572";
     };
     dependencies = [
       (sources."chalk-1.1.3" // {
@@ -23407,9 +24166,9 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      sources."eslint-4.2.0"
+      sources."eslint-4.4.1"
       sources."optionator-0.8.2"
-      sources."resolve-1.3.3"
+      sources."resolve-1.4.0"
       (sources."supports-color-3.2.3" // {
         dependencies = [
           sources."has-flag-1.0.0"
@@ -23423,29 +24182,31 @@ in
       sources."ajv-5.2.2"
       sources."babel-code-frame-6.22.0"
       sources."concat-stream-1.6.0"
+      sources."cross-spawn-5.1.0"
       sources."debug-2.6.8"
       sources."doctrine-2.0.0"
       sources."eslint-scope-3.7.1"
-      sources."espree-3.4.3"
+      sources."espree-3.5.0"
       sources."esquery-1.0.0"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
+      sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
       sources."ignore-3.3.3"
       sources."imurmurhash-0.1.4"
-      (sources."inquirer-3.2.0" // {
+      (sources."inquirer-3.2.1" // {
         dependencies = [
-          sources."chalk-2.0.1"
+          sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
-          sources."ansi-styles-3.1.0"
-          sources."supports-color-4.2.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
           sources."ansi-regex-3.0.0"
         ];
       })
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.9.0"
+      sources."js-yaml-3.9.1"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.4"
@@ -23456,6 +24217,7 @@ in
       sources."pluralize-4.0.0"
       sources."progress-2.0.0"
       sources."require-uncached-1.0.3"
+      sources."semver-5.4.1"
       sources."strip-json-comments-2.0.1"
       (sources."table-4.0.1" // {
         dependencies = [
@@ -23476,6 +24238,13 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
+      sources."lru-cache-4.1.1"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
       sources."ms-2.0.0"
       sources."esrecurse-4.2.0"
       sources."object-assign-4.1.1"
@@ -23486,7 +24255,7 @@ in
         ];
       })
       sources."flat-cache-1.2.2"
-      sources."circular-json-0.3.1"
+      sources."circular-json-0.3.3"
       sources."del-2.2.2"
       sources."graceful-fs-4.1.11"
       sources."write-0.2.1"
@@ -23515,7 +24284,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      (sources."string-width-2.1.0" // {
+      (sources."string-width-2.1.1" // {
         dependencies = [
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -23523,14 +24292,14 @@ in
       })
       sources."through-2.3.8"
       sources."color-convert-1.9.0"
-      sources."color-name-1.1.2"
+      sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
       sources."iconv-lite-0.4.18"
-      sources."jschardet-1.4.2"
+      sources."jschardet-1.5.1"
       sources."tmp-0.0.31"
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
@@ -23567,10 +24336,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "3.1.1";
+    version = "3.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.1.tgz";
-      sha1 = "f5680fbee2cb2a56e99042b14d935e3eb861b300";
+      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.2.tgz";
+      sha1 = "991e30c80db4b1cf15eacb257620a7edce9c6ef4";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -23628,7 +24397,7 @@ in
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
       sources."spdx-correct-1.0.2"
@@ -23700,7 +24469,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.2"
       sources."stringstream-0.0.5"
@@ -23721,7 +24490,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23731,9 +24500,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -23749,7 +24522,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."throttleit-1.0.0"
       sources."isexe-2.0.0"
@@ -23865,7 +24638,7 @@ in
       sources."chokidar-1.7.0"
       sources."minimatch-3.0.4"
       sources."ps-tree-0.0.3"
-      sources."anymatch-1.3.0"
+      sources."anymatch-1.3.2"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
       sources."inherits-2.0.3"
@@ -23873,8 +24646,8 @@ in
       sources."is-glob-2.0.1"
       sources."readdirp-2.1.0"
       sources."fsevents-1.1.2"
-      sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
+      sources."normalize-path-2.1.1"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -23883,7 +24656,6 @@ in
       sources."filename-regex-2.0.1"
       sources."is-extglob-1.0.0"
       sources."kind-of-3.2.2"
-      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
@@ -23908,7 +24680,6 @@ in
       sources."isarray-1.0.0"
       sources."is-buffer-1.1.5"
       sources."is-posix-bracket-0.1.1"
-      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -23916,7 +24687,8 @@ in
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.8.0"
+      sources."remove-trailing-separator-1.0.2"
+      sources."binary-extensions-1.9.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
@@ -23941,7 +24713,7 @@ in
       })
       sources."request-2.81.0"
       sources."rimraf-2.6.1"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."abbrev-1.1.0"
@@ -23983,7 +24755,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -24003,7 +24775,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24013,9 +24785,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -24031,7 +24807,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
@@ -24082,7 +24858,7 @@ in
       sources."async-2.5.0"
       sources."lodash.groupby-4.6.0"
       sources."minilog-2.0.8"
-      sources."simple-git-1.73.0"
+      sources."simple-git-1.75.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
       sources."lodash-4.17.4"
       sources."microee-0.0.2"
@@ -24156,7 +24932,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.6"
+      sources."coffee-script-1.12.7"
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
@@ -24336,7 +25112,7 @@ in
       sources."lodash.isstring-4.0.1"
       sources."lodash.mapvalues-4.6.0"
       sources."rechoir-0.6.2"
-      sources."resolve-1.3.3"
+      sources."resolve-1.4.0"
       sources."detect-file-0.1.0"
       sources."is-glob-2.0.1"
       sources."micromatch-2.3.11"
@@ -24394,7 +25170,7 @@ in
       sources."is-windows-0.2.0"
       sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
-      sources."which-1.2.14"
+      sources."which-1.3.0"
       sources."parse-passwd-1.0.0"
       sources."isexe-2.0.0"
       (sources."is-plain-object-2.0.4" // {
@@ -24607,7 +25383,7 @@ in
           sources."source-map-0.4.4"
         ];
       })
-      (sources."js-yaml-3.9.0" // {
+      (sources."js-yaml-3.9.1" // {
         dependencies = [
           sources."esprima-4.0.0"
         ];
@@ -24621,7 +25397,7 @@ in
       sources."once-1.4.0"
       sources."resolve-1.1.7"
       sources."supports-color-3.2.3"
-      sources."which-1.2.14"
+      sources."which-1.3.0"
       sources."wordwrap-1.0.0"
       sources."estraverse-1.9.3"
       sources."esutils-2.0.2"
@@ -24686,18 +25462,18 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-    version = "2.0.1";
+    version = "2.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.0.1.tgz";
-      sha1 = "37abd20a6fe7569c55bc823848e6e40e9148c1a6";
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.1.0.tgz";
+      sha1 = "439c52c899e6f722276739dbb52b3211fc868caf";
     };
     dependencies = [
       sources."@reactivex/rxjs-5.4.2"
-      sources."chai-4.1.0"
+      sources."chai-4.1.1"
       sources."chai-as-promised-7.1.1"
-      sources."chalk-2.0.1"
+      sources."chalk-2.1.0"
       sources."commander-2.11.0"
-      sources."fast-json-patch-2.0.3"
+      sources."fast-json-patch-2.0.4"
       sources."glob-7.1.2"
       sources."iterare-0.0.8"
       sources."lodash-4.17.4"
@@ -24721,11 +25497,11 @@ in
       sources."get-func-name-2.0.0"
       sources."pathval-1.1.0"
       sources."type-detect-4.0.3"
-      sources."ansi-styles-3.1.0"
+      sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.2.0"
+      sources."supports-color-4.2.1"
       sources."color-convert-1.9.0"
-      sources."color-name-1.1.2"
+      sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
       sources."deep-equal-1.0.1"
       sources."fs.realpath-1.0.0"
@@ -24882,13 +25658,67 @@ in
     };
     production = true;
   };
+  json-refs = nodeEnv.buildNodePackage {
+    name = "json-refs";
+    packageName = "json-refs";
+    version = "3.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.0.tgz";
+      sha1 = "1b52b826691862b4873224bc1d07a2060645663c";
+    };
+    dependencies = [
+      sources."commander-2.11.0"
+      sources."graphlib-2.1.1"
+      sources."js-yaml-3.9.1"
+      sources."lodash-4.17.4"
+      sources."native-promise-only-0.8.1"
+      sources."path-loader-1.0.2"
+      sources."slash-1.0.0"
+      sources."uri-js-3.0.2"
+      sources."argparse-1.0.9"
+      sources."esprima-4.0.0"
+      sources."sprintf-js-1.0.3"
+      sources."superagent-3.5.2"
+      sources."component-emitter-1.2.1"
+      sources."cookiejar-2.1.1"
+      sources."debug-2.6.8"
+      sources."extend-3.0.1"
+      sources."form-data-2.2.0"
+      sources."formidable-1.1.1"
+      sources."methods-1.1.2"
+      sources."mime-1.3.6"
+      sources."qs-6.5.0"
+      sources."readable-stream-2.3.3"
+      sources."ms-2.0.0"
+      sources."asynckit-0.4.0"
+      sources."combined-stream-1.0.5"
+      sources."mime-types-2.1.16"
+      sources."delayed-stream-1.0.0"
+      sources."mime-db-1.29.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."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
+      sources."util-deprecate-1.0.2"
+      sources."punycode-2.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03).";
+      homepage = https://github.com/whitlockjc/json-refs;
+      license = "MIT";
+    };
+    production = true;
+  };
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.11.2";
+    version = "0.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.11.2.tgz";
-      sha1 = "f31b366bd3c540ecebf0cf3e0f4d04c427b21781";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.12.0.tgz";
+      sha1 = "e8764bcb2fccbbe2a0c3bc406ea1ef04e9007308";
     };
     dependencies = [
       sources."body-parser-1.17.2"
@@ -24902,7 +25732,12 @@ in
       sources."connect-pause-0.1.1"
       sources."cors-2.8.4"
       sources."errorhandler-1.5.0"
-      sources."express-4.15.3"
+      (sources."express-4.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+          sources."qs-6.5.0"
+        ];
+      })
       (sources."express-urlrewrite-1.2.0" // {
         dependencies = [
           sources."path-to-regexp-1.7.0"
@@ -24923,7 +25758,7 @@ in
         ];
       })
       sources."object-assign-4.1.1"
-      sources."please-upgrade-node-1.0.1"
+      sources."please-upgrade-node-3.0.1"
       sources."pluralize-3.1.0"
       sources."request-2.81.0"
       sources."server-destroy-1.0.1"
@@ -24937,8 +25772,8 @@ in
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.6.7"
-      sources."depd-1.1.0"
-      sources."http-errors-1.6.1"
+      sources."depd-1.1.1"
+      sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
       sources."qs-6.4.0"
@@ -24951,8 +25786,8 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.15"
-      sources."mime-db-1.27.0"
+      sources."mime-types-2.1.16"
+      sources."mime-db-1.29.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -24960,7 +25795,7 @@ in
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
       sources."accepts-1.3.3"
-      sources."compressible-2.0.10"
+      sources."compressible-2.0.11"
       sources."on-headers-1.0.1"
       sources."safe-buffer-5.1.1"
       sources."vary-1.1.1"
@@ -24972,19 +25807,27 @@ in
       sources."cookie-signature-1.0.6"
       sources."encodeurl-1.0.1"
       sources."etag-1.8.0"
-      sources."finalhandler-1.0.3"
+      (sources."finalhandler-1.0.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."fresh-0.5.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.4"
+      sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      sources."send-0.15.3"
-      sources."serve-static-1.12.3"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
+      sources."serve-static-1.12.4"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.3.0"
+      sources."ipaddr.js-1.4.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."isarray-0.0.1"
@@ -25024,7 +25867,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25034,9 +25877,14 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."core-util-is-1.0.2"
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -25089,7 +25937,7 @@ in
       sources."got-5.7.1"
       sources."registry-auth-token-3.3.1"
       sources."registry-url-3.1.0"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."create-error-class-3.0.2"
       sources."duplexer2-0.1.4"
       sources."is-redirect-1.0.0"
@@ -25112,7 +25960,6 @@ in
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."pinkie-2.0.4"
-      sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
@@ -25171,10 +26018,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.9.0";
+    version = "3.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz";
-      sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz";
+      sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0";
     };
     dependencies = [
       sources."argparse-1.0.9"
@@ -25207,8 +26054,12 @@ in
           sources."lodash-4.17.4"
         ];
       })
-      sources."connect-3.6.2"
-      sources."core-js-2.4.1"
+      (sources."connect-3.6.3" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
+      sources."core-js-2.5.0"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
       (sources."expand-braces-0.1.2" // {
@@ -25252,8 +26103,8 @@ in
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.6.7"
-      sources."depd-1.1.0"
-      sources."http-errors-1.6.1"
+      sources."depd-1.1.1"
+      sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
       sources."qs-6.4.0"
@@ -25266,9 +26117,9 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.15"
-      sources."mime-db-1.27.0"
-      sources."anymatch-1.3.0"
+      sources."mime-types-2.1.16"
+      sources."mime-db-1.29.0"
+      sources."anymatch-1.3.2"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
       sources."is-binary-path-1.0.1"
@@ -25276,8 +26127,8 @@ in
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
       sources."fsevents-1.1.2"
-      sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
+      sources."normalize-path-2.1.1"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -25286,7 +26137,6 @@ in
       sources."filename-regex-2.0.1"
       sources."is-extglob-1.0.0"
       sources."kind-of-3.2.2"
-      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
@@ -25311,7 +26161,6 @@ in
       sources."isarray-1.0.0"
       sources."is-buffer-1.1.5"
       sources."is-posix-bracket-0.1.1"
-      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -25319,7 +26168,8 @@ in
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.8.0"
+      sources."remove-trailing-separator-1.0.2"
+      sources."binary-extensions-1.9.0"
       sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
       sources."core-util-is-1.0.2"
@@ -25337,7 +26187,7 @@ in
         ];
       })
       sources."request-2.81.0"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
@@ -25395,7 +26245,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25405,9 +26255,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -25430,7 +26284,11 @@ in
       sources."once-1.4.0"
       sources."uid-number-0.0.6"
       sources."wrappy-1.0.2"
-      sources."finalhandler-1.0.3"
+      (sources."finalhandler-1.0.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."parseurl-1.3.1"
       sources."utils-merge-1.0.0"
       sources."encodeurl-1.0.1"
@@ -25603,7 +26461,7 @@ in
       sources."qs-4.0.0"
       (sources."response-time-2.3.2" // {
         dependencies = [
-          sources."depd-1.1.0"
+          sources."depd-1.1.1"
         ];
       })
       (sources."serve-favicon-2.3.2" // {
@@ -25620,7 +26478,7 @@ in
         dependencies = [
           sources."escape-html-1.0.3"
           sources."send-0.13.2"
-          sources."depd-1.1.0"
+          sources."depd-1.1.1"
           sources."statuses-1.2.1"
         ];
       })
@@ -25637,10 +26495,10 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
-      sources."compressible-2.0.10"
-      sources."mime-types-2.1.15"
+      sources."compressible-2.0.11"
+      sources."mime-types-2.1.16"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."ms-0.7.1"
       sources."csrf-3.0.6"
       sources."rndm-1.2.0"
@@ -25705,7 +26563,7 @@ in
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
       sources."replace-ext-0.0.1"
-      sources."duplexify-3.5.0"
+      sources."duplexify-3.5.1"
       (sources."glob-stream-5.3.5" // {
         dependencies = [
           sources."through2-0.6.5"
@@ -25726,9 +26584,9 @@ in
       sources."strip-bom-stream-1.0.0"
       sources."through2-filter-2.0.0"
       sources."vali-date-1.0.0"
-      sources."end-of-stream-1.0.0"
+      sources."end-of-stream-1.4.0"
       sources."stream-shift-1.0.0"
-      sources."once-1.3.3"
+      sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."extend-3.0.1"
       sources."glob-5.0.15"
@@ -25860,15 +26718,15 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "3.4.2";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz";
-      sha1 = "d0ef4d332126dbf18d0d640c9b382dd48be97594";
+      url = "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz";
+      sha1 = "1328567d2717f997030f8006234bce9b8cd72465";
     };
     dependencies = [
       sources."browser-stdout-1.3.0"
       sources."commander-2.9.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.8"
       sources."diff-3.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."glob-7.1.1"
@@ -25878,7 +26736,7 @@ in
       sources."mkdirp-0.5.1"
       sources."supports-color-3.1.2"
       sources."graceful-readlink-1.0.1"
-      sources."ms-0.7.2"
+      sources."ms-2.0.0"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -26003,7 +26861,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -26023,7 +26881,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26033,9 +26891,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -26051,7 +26913,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
@@ -26130,7 +26992,7 @@ in
       sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
-      sources."which-1.2.14"
+      sources."which-1.3.0"
       sources."inherits-2.0.3"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -26180,7 +27042,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -26200,7 +27062,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26210,9 +27072,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -26228,7 +27094,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."isexe-2.0.0"
@@ -26253,11 +27119,7 @@ in
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
       sources."debug-2.6.8"
-      (sources."express-4.15.3" // {
-        dependencies = [
-          sources."debug-2.6.7"
-        ];
-      })
+      sources."express-4.15.4"
       sources."glob-5.0.15"
       sources."path-is-absolute-1.0.1"
       sources."rc-1.2.1"
@@ -26266,7 +27128,7 @@ in
       sources."strong-data-uri-1.0.4"
       sources."v8-debug-1.0.1"
       sources."v8-profiler-5.7.0"
-      sources."which-1.2.14"
+      sources."which-1.3.0"
       sources."ws-1.1.4"
       sources."yargs-3.32.0"
       sources."browser-launcher2-0.4.6"
@@ -26352,44 +27214,36 @@ in
       sources."content-type-1.0.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."depd-1.1.0"
+      sources."depd-1.1.1"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.0"
-      (sources."finalhandler-1.0.3" // {
-        dependencies = [
-          sources."debug-2.6.7"
-        ];
-      })
+      sources."finalhandler-1.0.4"
       sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.4"
-      sources."qs-6.4.0"
+      sources."proxy-addr-1.1.5"
+      sources."qs-6.5.0"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.3" // {
-        dependencies = [
-          sources."debug-2.6.7"
-        ];
-      })
-      sources."serve-static-1.12.3"
+      sources."send-0.15.4"
+      sources."serve-static-1.12.4"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.1"
-      sources."mime-types-2.1.15"
+      sources."mime-types-2.1.16"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.3.0"
+      sources."ipaddr.js-1.4.0"
       sources."destroy-1.0.4"
-      sources."http-errors-1.6.1"
+      sources."http-errors-1.6.2"
       sources."mime-1.3.4"
       sources."inherits-2.0.3"
       sources."media-typer-0.3.0"
@@ -26409,13 +27263,17 @@ in
       (sources."node-pre-gyp-0.6.36" // {
         dependencies = [
           sources."rimraf-2.6.1"
-          sources."semver-5.3.0"
+          sources."semver-5.4.1"
           sources."glob-7.1.2"
         ];
       })
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
-      sources."request-2.81.0"
+      (sources."request-2.81.0" // {
+        dependencies = [
+          sources."qs-6.4.0"
+        ];
+      })
       sources."tar-2.2.1"
       (sources."tar-pack-3.4.0" // {
         dependencies = [
@@ -26481,7 +27339,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26491,9 +27349,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -26552,7 +27414,7 @@ in
       })
       sources."request-2.81.0"
       sources."rimraf-2.6.1"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
@@ -26600,7 +27462,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -26620,7 +27482,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26630,9 +27492,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -26648,7 +27514,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
@@ -26699,7 +27565,7 @@ in
       })
       sources."undefsafe-0.0.3"
       sources."update-notifier-0.5.0"
-      sources."anymatch-1.3.0"
+      sources."anymatch-1.3.2"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
       sources."inherits-2.0.3"
@@ -26708,8 +27574,8 @@ in
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
       sources."fsevents-1.1.2"
-      sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
+      sources."normalize-path-2.1.1"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -26718,7 +27584,6 @@ in
       sources."filename-regex-2.0.1"
       sources."is-extglob-1.0.0"
       sources."kind-of-3.2.2"
-      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
@@ -26743,7 +27608,6 @@ in
       sources."isarray-1.0.0"
       sources."is-buffer-1.1.5"
       sources."is-posix-bracket-0.1.1"
-      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -26751,7 +27615,8 @@ in
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.8.0"
+      sources."remove-trailing-separator-1.0.2"
+      sources."binary-extensions-1.9.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
@@ -26772,7 +27637,7 @@ in
       })
       sources."request-2.81.0"
       sources."rimraf-2.6.1"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."minimist-0.0.8"
@@ -26812,7 +27677,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -26832,7 +27697,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26842,9 +27707,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -26860,7 +27729,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
@@ -26920,7 +27789,7 @@ in
         ];
       })
       sources."registry-url-3.1.0"
-      sources."duplexify-3.5.0"
+      sources."duplexify-3.5.1"
       sources."infinity-agent-2.0.3"
       sources."is-redirect-1.0.0"
       sources."is-stream-1.1.0"
@@ -26929,11 +27798,7 @@ in
       sources."prepend-http-1.0.4"
       sources."read-all-stream-3.1.0"
       sources."timed-out-2.0.0"
-      (sources."end-of-stream-1.0.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."end-of-stream-1.4.0"
       sources."stream-shift-1.0.0"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
@@ -26950,10 +27815,10 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.17.4";
+    version = "0.17.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.17.4.tgz";
-      sha1 = "087a2819f6b59700166be29b04946ad40ac513d2";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.17.5.tgz";
+      sha1 = "1dcf3ead7902ce2df615cdfbe19f3cd9a50e28e2";
     };
     dependencies = [
       sources."basic-auth-1.1.0"
@@ -26966,6 +27831,12 @@ in
       sources."cors-2.8.3"
       sources."cron-1.2.1"
       sources."express-4.15.3"
+      (sources."express-session-1.15.2" // {
+        dependencies = [
+          sources."debug-2.6.3"
+          sources."ms-0.7.2"
+        ];
+      })
       sources."follow-redirects-1.2.4"
       sources."fs-extra-1.0.0"
       sources."fs.notify-0.0.4"
@@ -27001,7 +27872,7 @@ in
       })
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.8"
-      sources."node-red-node-email-0.1.23"
+      sources."node-red-node-email-0.1.24"
       (sources."node-red-node-twitter-0.1.11" // {
         dependencies = [
           sources."request-2.81.0"
@@ -27016,8 +27887,8 @@ in
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.6.7"
-      sources."depd-1.1.0"
-      sources."http-errors-1.6.1"
+      sources."depd-1.1.1"
+      sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
       sources."qs-6.4.0"
@@ -27027,8 +27898,8 @@ in
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
-      sources."mime-types-2.1.15"
-      sources."mime-db-1.27.0"
+      sources."mime-types-2.1.16"
+      sources."mime-db-1.29.0"
       sources."css-select-1.2.0"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
@@ -27073,13 +27944,17 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.0"
-      sources."finalhandler-1.0.3"
+      (sources."finalhandler-1.0.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."fresh-0.5.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.4"
+      sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
       sources."send-0.15.3"
       sources."serve-static-1.12.3"
@@ -27087,9 +27962,12 @@ in
       sources."negotiator-0.6.1"
       sources."unpipe-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.3.0"
+      sources."ipaddr.js-1.4.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
+      sources."crc-3.4.4"
+      sources."uid-safe-2.1.5"
+      sources."random-bytes-1.0.0"
       sources."graceful-fs-4.1.11"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
@@ -27111,13 +27989,9 @@ in
       sources."pump-1.0.2"
       sources."reinterval-1.1.0"
       sources."split2-2.1.1"
-      (sources."websocket-stream-5.0.0" // {
+      (sources."websocket-stream-5.0.1" // {
         dependencies = [
-          (sources."ws-3.0.0" // {
-            dependencies = [
-              sources."safe-buffer-5.0.1"
-            ];
-          })
+          sources."ws-3.1.0"
         ];
       })
       sources."xtend-4.0.1"
@@ -27147,12 +28021,7 @@ in
       sources."is-glob-3.1.0"
       sources."path-dirname-1.0.2"
       sources."is-extglob-2.1.1"
-      (sources."duplexify-3.5.0" // {
-        dependencies = [
-          sources."end-of-stream-1.0.0"
-          sources."once-1.3.3"
-        ];
-      })
+      sources."duplexify-3.5.1"
       sources."stream-shift-1.0.0"
       sources."extend-shallow-2.0.1"
       sources."is-absolute-0.2.6"
@@ -27256,7 +28125,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27266,9 +28135,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -27444,7 +28317,7 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-2.6.8" // {
+      (sources."debug-3.0.0" // {
         dependencies = [
           sources."ms-2.0.0"
         ];
@@ -27454,7 +28327,7 @@ in
       sources."bytes-0.2.0"
       sources."pause-0.0.1"
       sources."mime-1.2.6"
-      sources."coffee-script-1.12.6"
+      sources."coffee-script-1.12.7"
       sources."vows-0.8.1"
       sources."eyes-0.1.8"
       sources."diff-1.0.8"
@@ -27561,7 +28434,7 @@ in
       sources."ini-1.3.4"
       sources."init-package-json-1.10.1"
       sources."lazy-property-1.0.0"
-      sources."libnpx-9.2.0"
+      sources."libnpx-9.2.3"
       sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
@@ -27666,12 +28539,12 @@ in
       })
       sources."decamelize-1.2.0"
       sources."get-caller-file-1.0.2"
-      sources."os-locale-2.0.0"
+      sources."os-locale-2.1.0"
       sources."read-pkg-up-2.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."set-blocking-2.0.0"
-      (sources."string-width-2.1.0" // {
+      (sources."string-width-2.1.1" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
         ];
@@ -27688,19 +28561,18 @@ in
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."execa-0.5.1"
+      sources."execa-0.7.0"
       sources."lcid-1.0.0"
       sources."mem-1.1.0"
-      sources."cross-spawn-4.0.2"
-      sources."get-stream-2.3.1"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
       sources."is-stream-1.1.0"
       sources."npm-run-path-2.0.2"
       sources."p-finally-1.0.0"
       sources."signal-exit-3.0.2"
       sources."strip-eof-1.0.0"
-      sources."object-assign-4.1.1"
-      sources."pinkie-promise-2.0.1"
-      sources."pinkie-2.0.4"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
       sources."path-key-2.0.1"
       sources."invert-kv-1.0.0"
       sources."mimic-fn-1.1.0"
@@ -27722,12 +28594,7 @@ in
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
       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."duplexify-3.5.1"
       sources."end-of-stream-1.4.0"
       sources."flush-write-stream-1.0.2"
       sources."from2-2.3.0"
@@ -27755,6 +28622,7 @@ in
         ];
       })
       sources."delegates-1.0.0"
+      sources."object-assign-4.1.1"
       (sources."wide-align-1.1.2" // {
         dependencies = [
           sources."string-width-1.0.2"
@@ -27773,12 +28641,12 @@ in
       sources."agentkeepalive-3.3.0"
       sources."http-cache-semantics-3.7.3"
       sources."http-proxy-agent-2.0.0"
-      sources."https-proxy-agent-2.0.0"
+      sources."https-proxy-agent-2.1.0"
       sources."node-fetch-npm-2.0.1"
       sources."socks-proxy-agent-3.0.0"
       sources."humanize-ms-1.2.1"
       sources."ms-2.0.0"
-      sources."agent-base-4.1.0"
+      sources."agent-base-4.1.1"
       sources."debug-2.6.8"
       sources."es6-promisify-5.0.0"
       sources."es6-promise-4.1.1"
@@ -27812,7 +28680,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -27831,7 +28699,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27841,9 +28709,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -27859,14 +28731,14 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.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."boxen-1.2.0" // {
+      (sources."boxen-1.2.1" // {
         dependencies = [
-          sources."chalk-2.0.1"
+          sources."chalk-2.1.0"
         ];
       })
       (sources."chalk-1.1.3" // {
@@ -27877,7 +28749,7 @@ in
           sources."ansi-regex-2.1.1"
         ];
       })
-      sources."configstore-3.1.0"
+      sources."configstore-3.1.1"
       sources."import-lazy-2.1.0"
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
@@ -27885,13 +28757,7 @@ in
       sources."xdg-basedir-3.0.0"
       sources."ansi-align-2.0.0"
       sources."cli-boxes-1.0.0"
-      (sources."term-size-1.2.0" // {
-        dependencies = [
-          sources."execa-0.7.0"
-          sources."cross-spawn-5.1.0"
-          sources."get-stream-3.0.0"
-        ];
-      })
+      sources."term-size-1.2.0"
       (sources."widest-line-1.0.0" // {
         dependencies = [
           sources."string-width-1.0.2"
@@ -27899,30 +28765,24 @@ in
           sources."ansi-regex-2.1.1"
         ];
       })
-      sources."ansi-styles-3.1.0"
+      sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.2.0"
+      sources."supports-color-4.2.1"
       sources."color-convert-1.9.0"
-      sources."color-name-1.1.2"
+      sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
         ];
       })
-      sources."dot-prop-4.1.1"
+      sources."dot-prop-4.2.0"
       sources."make-dir-1.0.0"
       sources."unique-string-1.0.0"
       sources."is-obj-1.0.1"
       sources."crypto-random-string-1.0.0"
       sources."package-json-4.0.1"
-      (sources."got-6.7.1" // {
-        dependencies = [
-          sources."get-stream-3.0.0"
-        ];
-      })
+      sources."got-6.7.1"
       sources."registry-auth-token-3.3.1"
       sources."registry-url-3.1.0"
       sources."create-error-class-3.0.2"
@@ -27995,7 +28855,7 @@ in
       })
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.6"
+      sources."coffee-script-1.12.7"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."request-2.81.0"
@@ -28020,7 +28880,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -28041,7 +28901,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28051,9 +28911,14 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."core-util-is-1.0.2"
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -28069,7 +28934,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
@@ -28088,7 +28953,6 @@ in
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.3.3"
-      sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.3"
@@ -28160,16 +29024,20 @@ in
       sources."json-parse-helpfulerror-1.0.3"
       sources."lodash-4.17.4"
       sources."node-alias-1.0.4"
-      sources."npm-3.10.10"
+      (sources."npm-3.10.10" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
       (sources."npmi-2.0.1" // {
         dependencies = [
           sources."semver-4.3.6"
         ];
       })
       sources."require-dir-0.3.2"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.36.2" // {
+      (sources."snyk-1.38.1" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -28183,22 +29051,22 @@ in
       sources."spawn-please-0.3.0"
       (sources."update-notifier-2.2.0" // {
         dependencies = [
-          (sources."boxen-1.2.0" // {
+          (sources."boxen-1.2.1" // {
             dependencies = [
-              sources."chalk-2.0.1"
+              sources."chalk-2.1.0"
             ];
           })
-          sources."configstore-3.1.0"
+          sources."configstore-3.1.1"
           sources."latest-version-3.1.0"
           sources."xdg-basedir-3.0.0"
           sources."camelcase-4.1.0"
-          sources."string-width-2.1.0"
-          sources."ansi-styles-3.1.0"
-          sources."supports-color-4.2.0"
+          sources."string-width-2.1.1"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
-          sources."dot-prop-4.1.1"
+          sources."dot-prop-4.2.0"
           sources."write-file-atomic-2.1.0"
           sources."package-json-4.0.1"
           sources."got-6.7.1"
@@ -28355,7 +29223,7 @@ in
       sources."es6-symbol-3.1.1"
       sources."ms-2.0.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.24"
+      sources."es5-ext-0.10.26"
       sources."es6-iterator-2.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
@@ -28395,7 +29263,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.15"
+      sources."mime-types-2.1.16"
       sources."node-uuid-1.4.8"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.3"
@@ -28415,7 +29283,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28425,9 +29293,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -28443,7 +29315,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
@@ -28467,7 +29339,7 @@ in
       sources."open-0.0.5"
       sources."os-name-1.0.3"
       sources."snyk-config-1.0.1"
-      sources."snyk-gradle-plugin-1.0.2"
+      sources."snyk-gradle-plugin-1.0.3"
       sources."snyk-module-1.8.1"
       sources."snyk-mvn-plugin-1.0.0"
       sources."snyk-policy-1.7.1"
@@ -28483,7 +29355,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."snyk-sbt-plugin-1.0.2"
+      sources."snyk-sbt-plugin-1.1.0"
       sources."snyk-tree-1.0.0"
       sources."snyk-try-require-1.2.0"
       (sources."tempfile-1.1.1" // {
@@ -28553,7 +29425,7 @@ in
           sources."for-in-0.1.8"
         ];
       })
-      sources."js-yaml-3.9.0"
+      sources."js-yaml-3.9.1"
       sources."argparse-1.0.9"
       sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
@@ -28634,20 +29506,16 @@ in
       sources."yallist-2.1.2"
       sources."promise-7.3.1"
       sources."string-length-1.0.1"
-      sources."duplexify-3.5.0"
+      sources."duplexify-3.5.1"
       sources."infinity-agent-2.0.3"
       sources."nested-error-stacks-1.0.2"
-      (sources."end-of-stream-1.0.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."end-of-stream-1.4.0"
       sources."stream-shift-1.0.0"
       sources."querystring-0.2.0"
       sources."import-lazy-2.1.0"
       (sources."ansi-align-2.0.0" // {
         dependencies = [
-          sources."string-width-2.1.0"
+          sources."string-width-2.1.1"
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -28656,7 +29524,7 @@ in
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
       sources."color-convert-1.9.0"
-      sources."color-name-1.1.2"
+      sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
       sources."execa-0.7.0"
       sources."cross-spawn-5.1.0"
@@ -28704,14 +29572,16 @@ in
       })
       sources."connect-busboy-0.0.2"
       sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
-      sources."core-js-2.4.1"
+      sources."core-js-2.5.0"
       sources."diff-1.4.0"
-      sources."domino-1.0.28"
+      sources."domino-1.0.29"
       sources."entities-1.1.1"
-      (sources."express-4.15.3" // {
+      (sources."express-4.15.4" // {
         dependencies = [
           sources."content-type-1.0.2"
-          sources."finalhandler-1.0.3"
+          sources."debug-2.6.8"
+          sources."finalhandler-1.0.4"
+          sources."qs-6.5.0"
         ];
       })
       sources."express-handlebars-3.0.0"
@@ -28721,14 +29591,14 @@ in
           sources."ms-0.7.1"
         ];
       })
-      sources."js-yaml-3.9.0"
+      sources."js-yaml-3.9.1"
       sources."mediawiki-title-0.5.6"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
       sources."node-uuid-1.4.8"
       sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork"
       sources."prfun-2.1.4"
       sources."request-2.81.0"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       (sources."serve-favicon-2.4.3" // {
         dependencies = [
           sources."safe-buffer-5.0.1"
@@ -28754,8 +29624,8 @@ in
       sources."is-arguments-1.0.2"
       sources."bytes-2.4.0"
       sources."debug-2.6.7"
-      sources."depd-1.1.0"
-      sources."http-errors-1.6.1"
+      sources."depd-1.1.1"
+      sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
       sources."qs-6.4.0"
@@ -28768,10 +29638,10 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.15"
-      sources."mime-db-1.27.0"
+      sources."mime-types-2.1.16"
+      sources."mime-db-1.29.0"
       sources."accepts-1.3.3"
-      sources."compressible-2.0.10"
+      sources."compressible-2.0.11"
       sources."on-headers-1.0.1"
       sources."safe-buffer-5.1.1"
       sources."vary-1.1.1"
@@ -28794,13 +29664,17 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.4"
+      sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      sources."send-0.15.3"
-      sources."serve-static-1.12.3"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
+      sources."serve-static-1.12.4"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.3.0"
+      sources."ipaddr.js-1.4.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."glob-6.0.4"
@@ -28886,7 +29760,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28896,9 +29770,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -28916,7 +29794,7 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."bluebird-3.5.0"
-      sources."bunyan-1.8.10"
+      sources."bunyan-1.8.12"
       sources."bunyan-syslog-udp-0.1.0"
       sources."gelf-stream-1.1.1"
       sources."hot-shots-4.5.0"
@@ -28928,7 +29806,7 @@ in
         ];
       })
       sources."dnscache-1.0.1"
-      sources."dtrace-provider-0.8.3"
+      sources."dtrace-provider-0.8.5"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
@@ -28966,7 +29844,7 @@ in
       })
       sources."lodash-3.10.1"
       sources."merge-1.2.0"
-      (sources."msgpack5-3.4.1" // {
+      (sources."msgpack5-3.5.0" // {
         dependencies = [
           sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
@@ -29155,7 +30033,7 @@ in
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
       sources."spdx-correct-1.0.2"
@@ -29285,7 +30163,7 @@ in
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
       sources."k-rpc-socket-1.7.1"
-      sources."bn.js-4.11.7"
+      sources."bn.js-4.11.8"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
@@ -29358,8 +30236,8 @@ in
       sources."pend-1.2.0"
       sources."ee-first-1.1.1"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.15"
-      sources."mime-db-1.27.0"
+      sources."mime-types-2.1.16"
+      sources."mime-db-1.29.0"
       sources."basic-auth-1.0.4"
       (sources."connect-2.30.2" // {
         dependencies = [
@@ -29422,7 +30300,7 @@ in
       sources."pause-0.1.0"
       (sources."response-time-2.3.2" // {
         dependencies = [
-          sources."depd-1.1.0"
+          sources."depd-1.1.1"
         ];
       })
       (sources."serve-favicon-2.3.2" // {
@@ -29439,7 +30317,7 @@ in
         dependencies = [
           sources."escape-html-1.0.3"
           sources."send-0.13.2"
-          sources."depd-1.1.0"
+          sources."depd-1.1.1"
           sources."range-parser-1.0.3"
           sources."statuses-1.2.1"
         ];
@@ -29454,7 +30332,7 @@ in
       })
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
-      sources."compressible-2.0.10"
+      sources."compressible-2.0.11"
       sources."negotiator-0.5.3"
       sources."ms-0.7.1"
       sources."csrf-3.0.6"
@@ -29641,7 +30519,7 @@ in
           sources."bencode-1.0.0"
         ];
       })
-      sources."bn.js-4.11.7"
+      sources."bn.js-4.11.8"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
@@ -29671,7 +30549,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."addr-to-ip-port-1.4.2"
-      sources."which-1.2.14"
+      sources."which-1.3.0"
       sources."isexe-2.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -29737,7 +30615,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.15"
+      sources."mime-types-2.1.16"
       sources."node-uuid-1.4.8"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -29753,9 +30631,9 @@ in
       sources."har-validator-2.0.6"
       sources."async-2.5.0"
       sources."lodash-4.17.4"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -29765,9 +30643,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -29816,10 +30698,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.5.2";
+    version = "1.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.5.2.tgz";
-      sha1 = "7ea0751da27b93bfb6cecfcec509994f52d83bb3";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.5.3.tgz";
+      sha1 = "59dadc683345ec6b88f88b94ed4ae7e1da394bfe";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -29930,7 +30812,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-2.6.8"
+      sources."debug-3.0.0"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -29972,7 +30854,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."safe-buffer-5.1.1"
@@ -29992,7 +30874,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -30002,9 +30884,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -30020,7 +30906,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."events.node-0.4.9"
     ];
@@ -30032,10 +30918,10 @@ in
   semver = nodeEnv.buildNodePackage {
     name = "semver";
     packageName = "semver";
-    version = "5.3.0";
+    version = "5.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
-      sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
+      url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
+      sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -30073,14 +30959,14 @@ in
         ];
       })
       sources."commander-2.11.0"
-      sources."js-yaml-3.9.0"
+      sources."js-yaml-3.9.1"
       sources."cookies-0.7.0"
       sources."request-2.81.0"
       sources."async-0.9.2"
       sources."es6-shim-0.21.1"
       sources."semver-4.3.6"
       sources."minimatch-1.0.0"
-      sources."bunyan-1.8.10"
+      sources."bunyan-1.8.12"
       sources."handlebars-2.0.0"
       sources."highlight.js-8.9.1"
       sources."lunr-0.7.2"
@@ -30089,7 +30975,7 @@ in
       sources."JSONStream-1.3.1"
       sources."mkdirp-0.5.1"
       sources."sinopia-htpasswd-0.4.5"
-      sources."http-errors-1.6.1"
+      sources."http-errors-1.6.2"
       (sources."readable-stream-1.1.14" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -30105,13 +30991,13 @@ in
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."debug-2.6.1"
-      sources."depd-1.1.0"
+      sources."depd-1.1.1"
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.0"
-      (sources."finalhandler-1.0.3" // {
+      (sources."finalhandler-1.0.4" // {
         dependencies = [
-          sources."debug-2.6.7"
+          sources."debug-2.6.8"
           sources."ms-2.0.0"
         ];
       })
@@ -30122,7 +31008,7 @@ in
       sources."parseurl-1.3.1"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.4"
+      sources."proxy-addr-1.1.5"
       sources."qs-6.4.0"
       sources."range-parser-1.2.0"
       (sources."router-1.3.1" // {
@@ -30138,21 +31024,21 @@ in
       sources."type-is-1.6.15"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.1"
-      sources."mime-types-2.1.15"
+      sources."mime-types-2.1.16"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."ms-0.7.2"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.3.0"
+      sources."ipaddr.js-1.4.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."media-typer-0.3.0"
       sources."raw-body-1.3.4"
       sources."bytes-1.0.0"
       sources."iconv-lite-0.4.8"
-      sources."compressible-2.0.10"
+      sources."compressible-2.0.11"
       sources."on-headers-1.0.1"
       sources."safe-buffer-5.1.1"
       sources."argparse-1.0.9"
@@ -30190,7 +31076,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -30200,9 +31086,14 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."core-util-is-1.0.2"
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -30221,7 +31112,7 @@ in
       sources."punycode-1.4.1"
       sources."lru-cache-2.7.3"
       sources."sigmund-1.0.1"
-      sources."dtrace-provider-0.8.3"
+      sources."dtrace-provider-0.8.5"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
@@ -30270,7 +31161,6 @@ in
           sources."domelementtype-1.1.3"
         ];
       })
-      sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.3"
@@ -30409,7 +31299,7 @@ in
       sources."dtrace-provider-0.6.0"
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
-      sources."csv-parse-1.2.0"
+      sources."csv-parse-1.2.1"
       sources."stream-transform-0.1.2"
       sources."csv-stringify-0.0.8"
       sources."asn1-0.1.11"
@@ -30444,11 +31334,10 @@ in
           })
         ];
       })
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
-          sources."extsprintf-1.0.2"
-          sources."verror-1.3.6"
+          sources."extsprintf-1.3.0"
         ];
       })
       sources."json-schema-0.2.3"
@@ -30481,7 +31370,7 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-2.6.8"
+      sources."debug-3.0.0"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
@@ -30560,7 +31449,7 @@ in
       sources."glob-7.1.2"
       sources."minimatch-3.0.4"
       sources."resolve-from-2.0.0"
-      sources."tapable-0.2.6"
+      sources."tapable-0.2.8"
       sources."memory-fs-0.3.0"
       sources."graceful-fs-4.1.11"
       sources."object-assign-4.1.1"
@@ -30594,10 +31483,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.4.1";
+    version = "2.4.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz";
-      sha1 = "c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz";
+      sha1 = "f8395f85d459276067c988aa41837a8f82870844";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -30610,15 +31499,14 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.0.24";
+    version = "3.0.27";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.24.tgz";
-      sha1 = "ee93400ad9857fb7a1671778db83f6a23f033121";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.27.tgz";
+      sha1 = "a97db8c8ba6b9dba4e2f88d86aa9548fa6320034";
     };
     dependencies = [
-      sources."commander-2.9.0"
+      sources."commander-2.11.0"
       sources."source-map-0.5.6"
-      sources."graceful-readlink-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -30631,26 +31519,35 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.23";
+    version = "1.1.27";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.23.tgz";
-      sha1 = "8067752f07877ef4311833146d58f7badf2f9f4a";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.27.tgz";
+      sha1 = "47d7f0cedbecd9c9a1f7377cbaea944053727153";
     };
     dependencies = [
-      sources."async-2.4.1"
+      sources."async-2.5.0"
       sources."bluebird-3.5.0"
       sources."blueimp-md5-2.7.0"
       sources."body-parser-1.17.2"
-      sources."color-1.0.3"
+      sources."color-2.0.0"
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
       sources."diff2html-2.3.0"
-      sources."express-4.15.3"
-      sources."express-session-1.15.3"
+      (sources."express-4.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+          sources."qs-6.5.0"
+        ];
+      })
+      (sources."express-session-1.15.5" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.2.7"
+      sources."ignore-3.3.3"
       sources."just-detect-adblock-1.0.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
@@ -30699,7 +31596,7 @@ in
           sources."sntp-1.0.9"
         ];
       })
-      (sources."npm-registry-client-8.3.0" // {
+      (sources."npm-registry-client-8.4.0" // {
         dependencies = [
           sources."request-2.81.0"
           sources."combined-stream-1.0.5"
@@ -30722,11 +31619,11 @@ in
       sources."os-homedir-1.0.2"
       sources."passport-0.3.2"
       sources."passport-local-1.0.0"
-      (sources."raven-1.2.1" // {
+      (sources."raven-2.1.1" // {
         dependencies = [
           sources."json-stringify-safe-5.0.1"
-          sources."uuid-3.0.0"
           sources."stack-trace-0.0.9"
+          sources."uuid-3.0.0"
         ];
       })
       (sources."rc-1.2.1" // {
@@ -30736,16 +31633,10 @@ in
       })
       sources."rimraf-2.6.1"
       sources."semver-5.3.0"
-      sources."serve-static-1.12.3"
+      sources."serve-static-1.12.4"
       sources."signals-1.0.0"
       sources."snapsvg-0.5.1"
-      (sources."socket.io-1.7.4" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."object-assign-4.1.0"
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."socket.io-2.0.3"
       (sources."superagent-3.5.2" // {
         dependencies = [
           sources."component-emitter-1.2.1"
@@ -30773,7 +31664,7 @@ in
       })
       (sources."yargs-8.0.2" // {
         dependencies = [
-          sources."string-width-2.1.0"
+          sources."string-width-2.1.1"
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -30782,8 +31673,8 @@ in
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.6.7"
-      sources."depd-1.1.0"
-      sources."http-errors-1.6.1"
+      sources."depd-1.1.1"
+      sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
       sources."qs-6.4.0"
@@ -30796,11 +31687,11 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.15"
-      sources."mime-db-1.27.0"
+      sources."mime-types-2.1.16"
+      sources."mime-db-1.29.0"
       sources."color-convert-1.9.0"
       sources."color-string-1.5.2"
-      sources."color-name-1.1.2"
+      sources."color-name-1.1.3"
       sources."simple-swizzle-0.2.2"
       sources."is-arrayish-0.3.1"
       sources."cookie-0.3.1"
@@ -30820,25 +31711,33 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.0"
-      sources."finalhandler-1.0.3"
+      (sources."finalhandler-1.0.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."fresh-0.5.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.4"
+      sources."proxy-addr-1.1.5"
       sources."range-parser-1.2.0"
-      sources."send-0.15.3"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
       sources."utils-merge-1.0.0"
       sources."vary-1.1.1"
       sources."negotiator-0.6.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.3.0"
+      sources."ipaddr.js-1.4.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."crc-3.4.4"
       sources."on-headers-1.0.1"
-      sources."uid-safe-2.1.4"
+      sources."uid-safe-2.1.5"
       sources."random-bytes-1.0.0"
       (sources."broadway-0.2.10" // {
         dependencies = [
@@ -31065,11 +31964,9 @@ in
           sources."string_decoder-1.0.3"
         ];
       })
-      (sources."duplexify-3.5.0" // {
+      (sources."duplexify-3.5.1" // {
         dependencies = [
-          sources."end-of-stream-1.0.0"
           sources."readable-stream-2.3.3"
-          sources."once-1.3.3"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.3"
         ];
@@ -31154,7 +32051,7 @@ in
       sources."json-stable-stringify-1.0.1"
       sources."jsonify-0.0.0"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -31164,9 +32061,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -31192,10 +32093,10 @@ in
       })
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
-      (sources."boxen-1.2.0" // {
+      (sources."boxen-1.2.1" // {
         dependencies = [
-          sources."chalk-2.0.1"
-          sources."string-width-2.1.0"
+          sources."chalk-2.1.0"
+          sources."string-width-2.1.1"
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -31207,7 +32108,7 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."configstore-3.1.0" // {
+      (sources."configstore-3.1.1" // {
         dependencies = [
           sources."write-file-atomic-2.1.0"
         ];
@@ -31219,7 +32120,7 @@ in
       sources."xdg-basedir-3.0.0"
       (sources."ansi-align-2.0.0" // {
         dependencies = [
-          sources."string-width-2.1.0"
+          sources."string-width-2.1.1"
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -31229,9 +32130,9 @@ in
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
       sources."widest-line-1.0.0"
-      sources."ansi-styles-3.1.0"
+      sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.2.0"
+      sources."supports-color-4.2.1"
       sources."has-flag-2.0.0"
       sources."execa-0.7.0"
       (sources."cross-spawn-5.1.0" // {
@@ -31250,7 +32151,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."path-key-2.0.1"
       sources."has-ansi-2.0.0"
-      sources."dot-prop-4.1.1"
+      sources."dot-prop-4.2.0"
       sources."make-dir-1.0.0"
       sources."unique-string-1.0.0"
       sources."is-obj-1.0.1"
@@ -31282,76 +32183,60 @@ in
       sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."eve-0.5.4"
-      (sources."engine.io-1.8.4" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      sources."has-binary-0.1.7"
-      (sources."socket.io-adapter-0.5.0" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-client-1.7.4" // {
+      sources."engine.io-3.1.0"
+      sources."socket.io-adapter-1.1.1"
+      (sources."socket.io-client-2.0.3" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
         ];
       })
-      (sources."socket.io-parser-2.3.1" // {
+      (sources."socket.io-parser-3.1.2" // {
         dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
+          sources."component-emitter-1.2.1"
+          sources."isarray-2.0.1"
         ];
       })
       sources."base64id-1.0.0"
-      sources."engine.io-parser-1.3.2"
-      sources."ws-1.1.4"
+      sources."engine.io-parser-2.1.1"
+      (sources."ws-2.3.1" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
+      sources."uws-0.14.5"
       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."engine.io-client-1.8.4" // {
+      (sources."has-binary2-1.0.2" // {
         dependencies = [
-          sources."component-emitter-1.2.1"
-          sources."debug-2.3.3"
-          sources."ws-1.1.2"
-          sources."ms-0.7.2"
+          sources."isarray-2.0.1"
         ];
       })
+      sources."ultron-1.1.0"
+      sources."backo2-1.0.2"
+      sources."component-bind-1.0.0"
+      (sources."engine.io-client-3.1.1" // {
+        dependencies = [
+          sources."component-emitter-1.2.1"
+        ];
+      })
+      sources."has-cors-1.1.0"
       sources."indexof-0.0.1"
       sources."object-component-0.0.3"
+      sources."parseqs-0.0.5"
       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."cliui-3.2.0"
       sources."decamelize-1.2.0"
       sources."get-caller-file-1.0.2"
-      (sources."os-locale-2.0.0" // {
-        dependencies = [
-          sources."execa-0.5.1"
-          sources."cross-spawn-4.0.2"
-          sources."get-stream-2.3.1"
-          sources."lru-cache-4.1.1"
-        ];
-      })
+      sources."os-locale-2.1.0"
       sources."read-pkg-up-2.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
@@ -31361,8 +32246,6 @@ in
       sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."mem-1.1.0"
-      sources."pinkie-promise-2.0.1"
-      sources."pinkie-2.0.4"
       sources."invert-kv-1.0.0"
       sources."mimic-fn-1.1.0"
       sources."find-up-2.1.0"
@@ -31468,7 +32351,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.15"
+      sources."mime-types-2.1.16"
       sources."node-uuid-1.4.8"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -31484,9 +32367,9 @@ in
       sources."har-validator-2.0.6"
       sources."async-2.5.0"
       sources."lodash-4.17.4"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -31496,9 +32379,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -31549,10 +32436,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "3.2.0";
+    version = "3.5.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-3.2.0.tgz";
-      sha1 = "8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f";
+      url = "https://registry.npmjs.org/webpack/-/webpack-3.5.1.tgz";
+      sha1 = "b749ee3d2b5a118dad53e8e41585b3f71e75499a";
     };
     dependencies = [
       sources."acorn-5.1.1"
@@ -31564,10 +32451,10 @@ in
       sources."ajv-5.2.2"
       sources."ajv-keywords-2.1.0"
       sources."async-2.5.0"
-      sources."enhanced-resolve-3.3.0"
+      sources."enhanced-resolve-3.4.1"
       sources."escope-3.6.0"
       sources."interpret-1.0.3"
-      sources."json-loader-0.5.4"
+      sources."json-loader-0.5.7"
       sources."json5-0.5.1"
       sources."loader-runner-2.3.0"
       sources."loader-utils-1.1.0"
@@ -31579,15 +32466,23 @@ in
         ];
       })
       sources."source-map-0.5.6"
-      sources."supports-color-3.2.3"
-      sources."tapable-0.2.6"
+      sources."supports-color-4.2.1"
+      sources."tapable-0.2.8"
       sources."uglifyjs-webpack-plugin-0.4.6"
-      sources."watchpack-1.3.1"
+      sources."watchpack-1.4.0"
       sources."webpack-sources-1.0.1"
-      (sources."yargs-6.6.0" // {
+      (sources."yargs-8.0.2" // {
         dependencies = [
-          sources."camelcase-3.0.0"
-          sources."cliui-3.2.0"
+          sources."camelcase-4.1.0"
+          (sources."cliui-3.2.0" // {
+            dependencies = [
+              sources."string-width-1.0.2"
+            ];
+          })
+          sources."string-width-2.1.1"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
         ];
       })
       sources."co-4.6.0"
@@ -31603,7 +32498,7 @@ in
       sources."esrecurse-4.2.0"
       sources."estraverse-4.2.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.24"
+      sources."es5-ext-0.10.26"
       sources."es6-iterator-2.0.1"
       sources."es6-set-0.1.5"
       sources."es6-symbol-3.1.1"
@@ -31637,7 +32532,7 @@ in
       sources."querystring-es3-0.2.1"
       sources."stream-browserify-2.0.1"
       sources."stream-http-2.7.2"
-      sources."timers-browserify-2.0.2"
+      sources."timers-browserify-2.0.3"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -31660,7 +32555,7 @@ in
       sources."create-hash-1.1.3"
       sources."create-hmac-1.1.6"
       sources."diffie-hellman-5.0.2"
-      sources."pbkdf2-3.0.12"
+      sources."pbkdf2-3.0.13"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.5"
       sources."browserify-aes-1.0.6"
@@ -31670,7 +32565,7 @@ in
       sources."cipher-base-1.0.4"
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
-      sources."bn.js-4.11.7"
+      sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
       sources."parse-asn1-5.1.0"
@@ -31686,10 +32581,17 @@ in
       sources."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
       sources."xtend-4.0.1"
+      (sources."global-4.3.2" // {
+        dependencies = [
+          sources."process-0.5.2"
+        ];
+      })
       sources."setimmediate-1.0.5"
+      sources."min-document-2.19.0"
+      sources."dom-walk-0.1.1"
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
-      sources."has-flag-1.0.0"
+      sources."has-flag-2.0.0"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
           sources."yargs-3.10.0"
@@ -31710,7 +32612,7 @@ in
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
       sources."chokidar-1.7.0"
-      sources."anymatch-1.3.0"
+      sources."anymatch-1.3.2"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
       sources."is-binary-path-1.0.1"
@@ -31718,8 +32620,8 @@ in
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
       sources."fsevents-1.1.2"
-      sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
+      sources."normalize-path-2.1.1"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -31727,7 +32629,6 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.1"
       sources."is-extglob-1.0.0"
-      sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
       sources."regex-cache-0.4.3"
@@ -31749,7 +32650,6 @@ in
         ];
       })
       sources."is-posix-bracket-0.1.1"
-      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -31757,7 +32657,8 @@ in
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.8.0"
+      sources."remove-trailing-separator-1.0.2"
+      sources."binary-extensions-1.9.0"
       sources."minimatch-3.0.4"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.8"
@@ -31774,7 +32675,7 @@ in
       })
       sources."request-2.81.0"
       sources."rimraf-2.6.1"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."tar-2.2.1"
       sources."tar-pack-3.4.0"
       sources."abbrev-1.1.0"
@@ -31816,7 +32717,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -31832,7 +32733,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -31842,9 +32743,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -31860,7 +32765,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -31874,34 +32779,51 @@ in
       sources."ms-2.0.0"
       sources."source-list-map-2.0.0"
       sources."get-caller-file-1.0.2"
-      sources."os-locale-1.4.0"
-      sources."read-pkg-up-1.0.1"
+      sources."os-locale-2.1.0"
+      sources."read-pkg-up-2.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."which-module-1.0.0"
+      sources."which-module-2.0.0"
       sources."y18n-3.2.1"
-      (sources."yargs-parser-4.2.1" // {
+      (sources."yargs-parser-7.0.0" // {
         dependencies = [
-          sources."camelcase-3.0.0"
+          sources."camelcase-4.1.0"
         ];
       })
       sources."wrap-ansi-2.1.0"
+      sources."execa-0.7.0"
       sources."lcid-1.0.0"
+      sources."mem-1.1.0"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."strip-eof-1.0.0"
+      sources."lru-cache-4.1.1"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
+      sources."path-key-2.0.1"
       sources."invert-kv-1.0.0"
-      sources."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."mimic-fn-1.1.0"
+      sources."find-up-2.1.0"
+      sources."read-pkg-2.0.0"
+      sources."locate-path-2.0.0"
+      sources."p-locate-2.0.0"
+      sources."path-exists-3.0.0"
+      sources."p-limit-1.1.0"
+      sources."load-json-file-2.0.0"
       sources."normalize-package-data-2.4.0"
-      sources."path-type-1.1.0"
+      sources."path-type-2.0.0"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
-      sources."strip-bom-2.0.0"
+      sources."strip-bom-3.0.0"
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
-      sources."is-utf8-0.2.1"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
@@ -31943,7 +32865,7 @@ in
       sha1 = "06fe67d8040802993f9f1e1923d671cbf9ead5d1";
     };
     dependencies = [
-      sources."babel-runtime-6.23.0"
+      sources."babel-runtime-6.25.0"
       sources."bytes-2.5.0"
       sources."camelcase-4.1.0"
       sources."chalk-1.1.3"
@@ -31955,12 +32877,12 @@ in
       sources."glob-7.1.2"
       sources."gunzip-maybe-1.4.1"
       sources."ini-1.3.4"
-      (sources."inquirer-3.2.0" // {
+      (sources."inquirer-3.2.1" // {
         dependencies = [
-          sources."chalk-2.0.1"
+          sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
-          sources."ansi-styles-3.1.0"
-          sources."supports-color-4.2.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -31971,21 +32893,21 @@ in
       sources."loud-rejection-1.6.0"
       sources."micromatch-2.3.11"
       sources."mkdirp-0.5.1"
-      sources."node-emoji-1.7.0"
+      sources."node-emoji-1.8.1"
       sources."object-path-0.11.4"
       sources."proper-lockfile-2.0.1"
       sources."read-1.0.7"
       sources."request-2.81.0"
       sources."request-capture-har-1.2.2"
       sources."rimraf-2.6.1"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."strip-bom-3.0.0"
       sources."tar-fs-1.15.3"
       sources."tar-stream-1.5.4"
       sources."uuid-3.1.0"
       sources."v8-compile-cache-1.1.0"
       sources."validate-npm-package-license-3.0.1"
-      sources."core-js-2.4.1"
+      sources."core-js-2.5.0"
       sources."regenerator-runtime-0.10.5"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -32012,12 +32934,8 @@ in
       sources."pumpify-1.3.5"
       sources."through2-2.0.3"
       sources."pako-0.2.9"
-      sources."duplexify-3.5.0"
-      (sources."end-of-stream-1.0.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."duplexify-3.5.1"
+      sources."end-of-stream-1.4.0"
       sources."readable-stream-2.3.3"
       sources."stream-shift-1.0.0"
       sources."core-util-is-1.0.2"
@@ -32026,11 +32944,7 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      (sources."pump-1.0.2" // {
-        dependencies = [
-          sources."end-of-stream-1.4.0"
-        ];
-      })
+      sources."pump-1.0.2"
       sources."xtend-4.0.1"
       sources."ansi-escapes-2.0.0"
       sources."cli-cursor-2.1.0"
@@ -32042,7 +32956,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      (sources."string-width-2.1.0" // {
+      (sources."string-width-2.1.1" // {
         dependencies = [
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -32050,14 +32964,14 @@ in
       })
       sources."through-2.3.8"
       sources."color-convert-1.9.0"
-      sources."color-name-1.1.2"
+      sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
       sources."iconv-lite-0.4.18"
-      sources."jschardet-1.4.2"
+      sources."jschardet-1.5.1"
       sources."tmp-0.0.31"
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
@@ -32112,7 +33026,6 @@ in
       sources."is-primitive-2.0.0"
       sources."minimist-0.0.8"
       sources."lodash.toarray-4.4.0"
-      sources."string.prototype.codepointat-0.2.0"
       sources."retry-0.10.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -32127,7 +33040,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -32146,7 +33059,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -32156,9 +33069,13 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -32174,7 +33091,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."chownr-1.0.1"
       sources."bl-1.2.1"
@@ -32202,18 +33119,18 @@ in
       sources."async-2.5.0"
       sources."chalk-1.1.3"
       sources."cli-list-0.2.0"
-      sources."configstore-3.1.0"
+      sources."configstore-3.1.1"
       sources."cross-spawn-5.1.0"
       sources."figures-2.0.0"
       sources."fullname-3.3.0"
       sources."got-6.7.1"
       sources."humanize-string-1.0.1"
-      (sources."inquirer-3.2.0" // {
+      (sources."inquirer-3.2.1" // {
         dependencies = [
-          sources."chalk-2.0.1"
+          sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
-          sources."ansi-styles-3.1.0"
-          sources."supports-color-4.2.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -32298,10 +33215,10 @@ in
         ];
       })
       sources."yeoman-doctor-2.1.0"
-      sources."yeoman-environment-2.0.0"
-      (sources."yosay-2.0.0" // {
+      sources."yeoman-environment-2.0.1"
+      (sources."yosay-2.0.1" // {
         dependencies = [
-          sources."ansi-styles-3.1.0"
+          sources."ansi-styles-3.2.0"
         ];
       })
       sources."ansi-styles-2.2.1"
@@ -32310,7 +33227,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
-      sources."dot-prop-4.1.1"
+      sources."dot-prop-4.2.0"
       sources."graceful-fs-4.1.11"
       sources."make-dir-1.0.0"
       sources."unique-string-1.0.0"
@@ -32323,7 +33240,7 @@ in
       sources."slide-1.1.6"
       sources."lru-cache-4.1.1"
       sources."shebang-command-1.2.0"
-      sources."which-1.2.14"
+      sources."which-1.3.0"
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
       sources."shebang-regex-1.0.0"
@@ -32352,7 +33269,7 @@ in
       sources."p-some-2.0.0"
       sources."aggregate-error-1.0.0"
       sources."clean-stack-1.3.0"
-      sources."indent-string-3.1.0"
+      sources."indent-string-3.2.0"
       sources."cross-spawn-async-2.2.5"
       sources."object-assign-4.1.1"
       sources."deep-extend-0.4.2"
@@ -32379,7 +33296,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      (sources."string-width-2.1.0" // {
+      (sources."string-width-2.1.1" // {
         dependencies = [
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -32387,12 +33304,12 @@ in
       })
       sources."through-2.3.8"
       sources."color-convert-1.9.0"
-      sources."color-name-1.1.2"
+      sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."iconv-lite-0.4.18"
-      sources."jschardet-1.4.2"
+      sources."jschardet-1.5.1"
       sources."tmp-0.0.31"
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
@@ -32423,7 +33340,7 @@ in
       sources."lodash._getnative-3.9.1"
       sources."osx-release-1.1.0"
       sources."win-release-1.1.1"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -32437,7 +33354,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.15"
+      sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
@@ -32455,7 +33372,7 @@ in
       sources."cryptiles-2.0.5"
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
-      (sources."jsprim-1.4.0" // {
+      (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -32465,9 +33382,14 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."extsprintf-1.0.2"
+      sources."extsprintf-1.3.0"
       sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."core-util-is-1.0.2"
       sources."asn1-0.2.3"
       (sources."dashdash-1.14.1" // {
         dependencies = [
@@ -32483,7 +33405,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.27.0"
+      sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
       sources."camelcase-keys-2.1.0"
       sources."loud-rejection-1.6.0"
@@ -32526,7 +33448,6 @@ in
       sources."node-status-codes-1.0.0"
       sources."read-all-stream-3.1.0"
       sources."readable-stream-2.3.3"
-      sources."core-util-is-1.0.2"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -32566,12 +33487,12 @@ in
       sources."lodash.pad-4.5.1"
       sources."lodash.padend-4.6.1"
       sources."lodash.padstart-4.6.1"
-      (sources."boxen-1.2.0" // {
+      (sources."boxen-1.2.1" // {
         dependencies = [
           sources."camelcase-4.1.0"
-          sources."chalk-2.0.1"
-          sources."ansi-styles-3.1.0"
-          sources."supports-color-4.2.0"
+          sources."chalk-2.1.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
         ];
       })
       sources."import-lazy-2.1.0"

From 531a5b1afeb10ca4c347f2c7d8386e1187b456bf Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 5 Jul 2017 13:02:20 +0100
Subject: [PATCH 1727/3246] git-fame: init at 2.5.2

---
 .../git-and-tools/default.nix                 |  2 +
 .../git-and-tools/git-fame/Gemfile            |  4 ++
 .../git-and-tools/git-fame/Gemfile.lock       | 26 ++++++++
 .../git-and-tools/git-fame/default.nix        | 19 ++++++
 .../git-and-tools/git-fame/gemset.nix         | 60 +++++++++++++++++++
 5 files changed, 111 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-fame/Gemfile
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-fame/default.nix
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 081bfd5918b..82846a564cd 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -34,6 +34,8 @@ rec {
 
   git = appendToName "minimal" gitBase;
 
+  git-fame = callPackage ./git-fame {};
+
   # The full-featured Git.
   gitFull = gitBase.override {
     svnSupport = true;
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile
new file mode 100644
index 00000000000..17373f02b44
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in git_fame.gemspec
+gem "git_fame"
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock
new file mode 100644
index 00000000000..0ac7907fe55
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock
@@ -0,0 +1,26 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    git_fame (2.5.2)
+      hirb (~> 0.7.3)
+      memoist (~> 0.14.0)
+      method_profiler (~> 2.0.1)
+      progressbar (~> 0.21.0)
+      scrub_rb (~> 1.0.1)
+      trollop (~> 2.1.2)
+    hirb (0.7.3)
+    memoist (0.14.0)
+    method_profiler (2.0.1)
+      hirb (>= 0.6.0)
+    progressbar (0.21.0)
+    scrub_rb (1.0.1)
+    trollop (2.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  git_fame
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
new file mode 100644
index 00000000000..8b77efd1be2
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, bundlerEnv, ruby, fetchFromGitHub, makeWrapper, bundler }:
+
+bundlerEnv rec {
+  inherit ruby;
+
+  pname = "git_fame";
+
+  gemdir = ./.;
+
+  meta = with stdenv.lib; {
+    description = ''
+      A command-line tool that helps you summarize and pretty-print collaborators based on contributions
+      '';
+    homepage    = http://oleander.io/git-fame-rb;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ expipiplus1 ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix
new file mode 100644
index 00000000000..49b4af4ef6d
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix
@@ -0,0 +1,60 @@
+{
+  git_fame = {
+    dependencies = ["hirb" "memoist" "method_profiler" "progressbar" "scrub_rb" "trollop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02k5ls5zyif8skdbnym6zw9y76whlnksw2m94jsh2n1ygk98izdd";
+      type = "gem";
+    };
+    version = "2.5.2";
+  };
+  hirb = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mzch3c2lvmf8gskgzlx6j53d10j42ir6ik2dkrl27sblhy76cji";
+      type = "gem";
+    };
+    version = "0.7.3";
+  };
+  memoist = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03d3h6kp16bf0crqg1cxdgp1d2iyzn53d3phbmjh4pjybqls0gcm";
+      type = "gem";
+    };
+    version = "0.14.0";
+  };
+  method_profiler = {
+    dependencies = ["hirb"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ax04qrrv7fqp5ayxaxhn72660pybdkpkvmgiwbg7bs7x5ijjzd8";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
+  progressbar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17haw9c6c9q6imsn83pii32jnihpg76jgd09x7y4hjqq45n3qcdh";
+      type = "gem";
+    };
+    version = "0.21.0";
+  };
+  scrub_rb = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dwg33w83w17aiij9kcbi7irj7lh045nh9prjgkzjya3f1j60d3x";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  trollop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
+}
\ No newline at end of file

From bc5160eacde131d83c3a25827963a676d1391abe Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 9 Aug 2017 08:41:48 +0200
Subject: [PATCH 1728/3246] gdb: fix clang build

---
 pkgs/development/tools/misc/gdb/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 02ff52155b1..410fd36ef25 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -66,6 +66,13 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (!pythonSupport) "--without-python"
     ++ stdenv.lib.optional multitarget "--enable-targets=all";
 
+  preConfigure =
+    # Not sure why this is causing problems, now that the stdenv
+    # exports CPP=cpp the build fails with strange errors on darwin.
+    stdenv.lib.optionalString stdenv.cc.isClang ''
+      unset CPP
+    '';
+
   postInstall =
     '' # Remove Info files already provided by Binutils and other packages.
        rm -v $out/share/info/bfd.info

From 616fb95356d4617cb83b1c0345c9ce837a025679 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Aug 2017 09:40:05 +0200
Subject: [PATCH 1729/3246] python34: 3.4.6 -> 3.4.7

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

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 4d20a21a4d1..e188e7ff48a 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -27,7 +27,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.4";
-  minorVersion = "6";
+  minorVersion = "7";
   minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "0h2z248hkf8x1ix1z8npkqs9cq62i322sl4rcjdkp7mawsxjhd7i";
+    sha256 = "06wx2ag0dnixny67jfdl5z10243fjga898cgxhnr4dnxaqmwy547";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

From 38f3153caa17c6f3d0445e5e55696cc041e60e9a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 9 Aug 2017 10:08:14 +0200
Subject: [PATCH 1730/3246] motu-client: 1.0.8 -> 1.4.0

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

diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix
index b5e9fa6a51e..0d5c79fde90 100644
--- a/pkgs/applications/science/misc/motu-client/default.nix
+++ b/pkgs/applications/science/misc/motu-client/default.nix
@@ -1,11 +1,11 @@
 { python27Packages, fetchurl, lib } :
 python27Packages.buildPythonApplication rec {
   name = "motu-client-${version}";
-  version = "1.0.8";
+  version = "1.4.00";
 
   src = fetchurl {
-    url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz";
-    sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2";
+    url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz";
+    sha256 = "0v0h90mylhaamd1vm4nc64q63vmlafhijm47hs0xfam33y1q2yvb";
   };
 
   meta = with lib; {

From da430a159791a624f87cad9735afca412b2c105e Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <couchemar@yandex.ru>
Date: Wed, 9 Aug 2017 11:51:14 +0300
Subject: [PATCH 1731/3246] elixir: 1.5.0 -> 1.5.1

Also homepage URL is updated
---
 pkgs/development/interpreters/elixir/1.5.nix             | 4 ++--
 pkgs/development/interpreters/elixir/generic-builder.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index 23c4db804d3..e85d2500223 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.5.0";
-  sha256 = "1y8c0s0wfgv444vhpnz9v8z8rc39kqhzzzkzqjxsh576vd868pbz";
+  version = "1.5.1";
+  sha256 = "0q0zr3v9cyb7p9aab8v038hnjm84nf9b60kikffp6w9rfqqqf767";
   minimumOTPVersion = "18";
 }
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 3d779e665cd..8f83a338484 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -59,7 +59,7 @@ in
     '';
 
     meta = with stdenv.lib; {
-      homepage = http://elixir-lang.org/;
+      homepage = https://elixir-lang.org/;
       description = "A functional, meta-programming aware language built on top of the Erlang VM";
 
       longDescription = ''

From 345b35c48af0c6534fc649ef4b2050ebf0b91d50 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 21 Mar 2017 10:08:10 +0100
Subject: [PATCH 1732/3246] Python: add
 buildPythonPackage.overridePythonPackage method.

This allows one to always override the call to `buildPythonPackage`.

In the following example we create an environment where we have the `blaze` package using an older version of `pandas`. We override first the Python interpreter and pass `packageOverrides` which contains the overrides for packages in
the package set.

```
with import <nixpkgs> {};

(let
  python = let
    packageOverrides = self: super: {
      pandas = super.pandas.overridePythonPackage(old: rec {
        version = "0.19.1";
        name = "pandas-${version}";
        src =  super.fetchPypi {
          pname = "pandas";
          inherit version;
          sha256 = "08blshqj9zj1wyjhhw3kl2vas75vhhicvv72flvf1z3jvapgw295";
        };
      });
    };
  in pkgs.python3.override {inherit packageOverrides;};

in python.withPackages(ps: [ps.blaze])).env
```
---
 doc/languages-frameworks/python.md | 39 ++++++++++++++++++++++++++----
 pkgs/top-level/python-packages.nix | 19 ++++++++++++++-
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 8e7a8760604..c8add96a148 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -545,6 +545,35 @@ All parameters from `mkDerivation` function are still supported.
 * `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
 * `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
 
+##### Overriding Python packages
+
+The `buildPythonPackage` function has a `overridePythonPackage` method that
+can be used to override the package. In the following example we create an
+environment where we have the `blaze` package using an older version of `pandas`.
+We override first the Python interpreter and pass
+`packageOverrides` which contains the overrides for packages in the package set.
+
+```nix
+with import <nixpkgs> {};
+
+(let
+  python = let
+    packageOverrides = self: super: {
+      pandas = super.pandas.overridePythonPackage(old: rec {
+        version = "0.19.1";
+        name = "pandas-${version}";
+        src =  super.fetchPypi {
+          pname = "pandas";
+          inherit version;
+          sha256 = "08blshqj9zj1wyjhhw3kl2vas75vhhicvv72flvf1z3jvapgw295";
+        };
+      });
+    };
+  in pkgs.python3.override {inherit packageOverrides;};
+
+in python.withPackages(ps: [ps.blaze])).env
+```
+
 #### `buildPythonApplication` function
 
 The `buildPythonApplication` function is practically the same as `buildPythonPackage`.
@@ -754,17 +783,17 @@ In the following example we rename the `pandas` package and build it.
 ```nix
 with import <nixpkgs> {};
 
-let
+(let
   python = let
     packageOverrides = self: super: {
-      pandas = super.pandas.override {name="foo";};
+      pandas = super.pandas.overridePythonPackage(old: {name="foo";});
     };
   in pkgs.python35.override {inherit packageOverrides;};
 
-in python.pkgs.pandas
+in python.withPackages(ps: [ps.pandas])).env
 ```
-Using `nix-build` on this expression will build the package `pandas`
-but with the new name `foo`.
+Using `nix-build` on this expression will build an environment that contains the
+package `pandas` but with the new name `foo`.
 
 All packages in the package set will use the renamed package.
 A typical use case is to switch to another version of a certain package.
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6df0af98295..eb5e5459450 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -35,7 +35,24 @@ let
 
   mkPythonDerivation = makeOverridable( callPackage ../development/interpreters/python/mk-python-derivation.nix {
   });
-  buildPythonPackage = makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix {
+
+  # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`.
+  # This function introduces `overridePythonPackage` and it overrides the call to `buildPythonPackage`.
+  makeOverridablePythonPackage = f: origArgs:
+    let
+      ff = f origArgs;
+      overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs);
+    in
+      if builtins.isAttrs ff then (ff // {
+        overridePythonPackage = newArgs: makeOverridable f (overrideWith newArgs);
+      })
+      else if builtins.isFunction ff then {
+        overridePythonPackage = newArgs: makeOverridable f (overrideWith newArgs);
+        __functor = self: ff;
+      }
+      else ff;
+
+  buildPythonPackage = makeOverridablePythonPackage (callPackage ../development/interpreters/python/build-python-package.nix {
     inherit mkPythonDerivation;
     inherit bootstrapped-pip;
     flit = self.flit;

From 0ff782e14114e71a76d400274dc4c95c980477de Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Aug 2017 12:14:20 +0200
Subject: [PATCH 1733/3246] makeWrapper: fix regression introduced in #24944

In some cases wrappers could not be made. See e.g.
https://github.com/NixOS/nixpkgs/pull/24944#issuecomment-321175692
---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 82176becf2a..cde28fbbcaf 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -33,7 +33,7 @@ makeWrapper() {
     local params varName value command separator n fileNames
     local argv0 flagsBefore flags
 
-    assertExecutable "${file}"
+    assertExecutable "${original}"
 
     mkdir -p "$(dirname "$wrapper")"
 

From f337be57eefdae3da5067d301d8eb2bf0a8ded1e Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 9 Aug 2017 12:27:03 +0200
Subject: [PATCH 1734/3246] mpd: add lame support

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

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index b7eb0b5397d..63a781c5941 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -18,6 +18,7 @@
 , mmsSupport ? true, libmms
 , mpg123Support ? true, mpg123
 , aacSupport ? true, faad2
+, lameSupport ? true, lame
 , pulseaudioSupport ? true, libpulseaudio
 , jackSupport ? true, libjack2
 , gmeSupport ? true, game-music-emu
@@ -72,6 +73,7 @@ in stdenv.mkDerivation rec {
     ++ opt mmsSupport libmms
     ++ opt mpg123Support mpg123
     ++ opt aacSupport faad2
+    ++ opt lameSupport lame
     ++ opt zipSupport zziplib
     ++ opt (!stdenv.isDarwin && pulseaudioSupport) libpulseaudio
     ++ opt (!stdenv.isDarwin && jackSupport) libjack2
@@ -105,6 +107,7 @@ in stdenv.mkDerivation rec {
       (mkFlag mmsSupport "mms")
       (mkFlag mpg123Support "mpg123")
       (mkFlag aacSupport "aac")
+      (mkFlag lameSupport "lame-encoder")
       (mkFlag (!stdenv.isDarwin && pulseaudioSupport) "pulse")
       (mkFlag (!stdenv.isDarwin && jackSupport) "jack")
       (mkFlag stdenv.isDarwin "osx")

From 1db52734ad19aeea18f30f54a6f543f5b0cd1764 Mon Sep 17 00:00:00 2001
From: Marius Metzger <mariusmetzger@versanet.de>
Date: Wed, 9 Aug 2017 12:41:15 +0200
Subject: [PATCH 1735/3246] check_ssl_cert: init at 1.51.0 (#28069)

---
 .../nagios/plugins/check_ssl_cert.nix         | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
new file mode 100644
index 00000000000..935b1092e66
--- /dev/null
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -0,0 +1,33 @@
+{ pkgs, openssl }:
+#with import <nixpkgs> {};
+with pkgs;
+
+stdenv.mkDerivation rec {
+  name = "check_ssl_cert-${version}";
+  version = "1.51.0";
+
+  src = fetchgit {
+    url = https://github.com/matteocorti/check_ssl_cert;
+    rev = "4e31a82008a48cd6efb82914e0bb1e136b339a31"; # v1.51.0
+    sha256 = "1x1lcxxgzvjznn1iyla4hmc02c0vqdbzvd8xj61niknm02q07lcf";
+  };
+
+  buildInputs = [ makeWrapper file ];
+  #nativeBuildInputs = [ makeWrapper ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/man
+    cp check_ssl_cert $out/bin
+    cp check_ssl_cert.1 $out/man1
+    wrapProgram $out/bin/check_ssl_cert \
+      --prefix PATH : "${openssl}/bin:${file}/bin"
+  '';
+
+  meta = {
+    description = "A Nagios plugin to check the CA and validity of an X.509 certificate";
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9571367340..1cd996fca06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11360,6 +11360,8 @@ with pkgs;
   munin = callPackage ../servers/monitoring/munin { };
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
+  
+  checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 

From cbca75b8c94e2f99b6505012a1658c40162839e1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 9 Aug 2017 12:50:58 +0200
Subject: [PATCH 1736/3246] Revert "check_ssl_cert: init at 1.51.0 (#28069)"

This reverts commit 1db52734ad19aeea18f30f54a6f543f5b0cd1764.
---
 .../nagios/plugins/check_ssl_cert.nix         | 33 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
deleted file mode 100644
index 935b1092e66..00000000000
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ pkgs, openssl }:
-#with import <nixpkgs> {};
-with pkgs;
-
-stdenv.mkDerivation rec {
-  name = "check_ssl_cert-${version}";
-  version = "1.51.0";
-
-  src = fetchgit {
-    url = https://github.com/matteocorti/check_ssl_cert;
-    rev = "4e31a82008a48cd6efb82914e0bb1e136b339a31"; # v1.51.0
-    sha256 = "1x1lcxxgzvjznn1iyla4hmc02c0vqdbzvd8xj61niknm02q07lcf";
-  };
-
-  buildInputs = [ makeWrapper file ];
-  #nativeBuildInputs = [ makeWrapper ];
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/man
-    cp check_ssl_cert $out/bin
-    cp check_ssl_cert.1 $out/man1
-    wrapProgram $out/bin/check_ssl_cert \
-      --prefix PATH : "${openssl}/bin:${file}/bin"
-  '';
-
-  meta = {
-    description = "A Nagios plugin to check the CA and validity of an X.509 certificate";
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cd996fca06..e9571367340 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11360,8 +11360,6 @@ with pkgs;
   munin = callPackage ../servers/monitoring/munin { };
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
-  
-  checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 

From fd6e51d5505c128c2051ddcbcb395d12c0d94299 Mon Sep 17 00:00:00 2001
From: Marius Metzger <mariusmetzger@versanet.de>
Date: Wed, 9 Aug 2017 12:41:15 +0200
Subject: [PATCH 1737/3246] check_ssl_cert: init at 1.51.0 (#28069)

---
 .../nagios/plugins/check_ssl_cert.nix         | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
new file mode 100644
index 00000000000..4989a01c9e3
--- /dev/null
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl }:
+
+stdenv.mkDerivation rec {
+  name = "check_ssl_cert-${version}";
+  version = "1.51.0";
+
+  src = fetchFromGitHub {
+    owner = "matteocorti";
+    repo = "check_ssl_cert";
+    rev = "v${version}";
+    sha256 = "07g4dhwp1plzmlqazapn0s0hysmf3kk0pa2x0wns482xm1v1mr05";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  makeFlags = [ "DESTDIR=$(out)/bin" "MANDIR=$(out)/share/man" ];
+
+  postInstall = ''
+    wrapProgram $out/bin/check_ssl_cert \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ openssl file which curl ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Nagios plugin to check the CA and validity of an X.509 certificate";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9571367340..1cd996fca06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11360,6 +11360,8 @@ with pkgs;
   munin = callPackage ../servers/monitoring/munin { };
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
+  
+  checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 

From e8020e272d1b335d2d5d513984df54bf1e90b5ea Mon Sep 17 00:00:00 2001
From: Karol Chmist <karol@chmist.com>
Date: Wed, 9 Aug 2017 13:43:27 +0200
Subject: [PATCH 1738/3246] idea-ultimate: 2017.1.5 -> 2017.2.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 186f9d2c23b..6970c771aa5 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -307,12 +307,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2017.1.5";
+    version = "2017.2.1";
     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}-no-jdk.tar.gz";
-      sha256 = "0gjj2g9fcrbbbp3v4clg0kj48qdw0gqcn9im4h8p3z2zscpg16ag";
+      sha256 = "0y3r82i229d7lywixyifv4kkrwivixl75flagaqbkzw3j9wklg3k";
     };
     wmClass = "jetbrains-idea";
     update-channel = "IDEA_Release";

From f4ca99166a8b270b62ed81949ebc0612478fa716 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 8 Aug 2017 20:33:33 +0200
Subject: [PATCH 1739/3246] serf: fix build

---
 pkgs/development/libraries/serf/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index c10a355dee0..3fab42e3eb5 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos, pkgconfig, gnused }:
+{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos
+, pkgconfig, gnused, expat, openldap }:
 
 stdenv.mkDerivation rec {
   name = "serf-1.3.9";
@@ -8,18 +9,22 @@ stdenv.mkDerivation rec {
     sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ apr scons openssl aprutil zlib ]
-    ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos
-    ++ [ pkgconfig ];
+    ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
 
-  configurePhase = ''
-    ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
-    ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct
-    ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' -i SConstruct
+  postPatch = ''
+    sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' \
+        -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' \
+        -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' \
+        -e 's,$OPENSSL/lib,${openssl.out}/lib,' \
+        -e 's,$OPENSSL/include,${openssl.dev}/include,' \
+      -i SConstruct
   '';
 
   buildPhase = ''
-    scons PREFIX="$out" OPENSSL="${openssl.dev}" ZLIB="${zlib.dev}" APR="$(echo "${apr.dev}"/bin/*-config)" \
+    scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \
+      LINKFLAGS="-L${zlib.out}/lib -L${expat}/lib -L${openldap}/lib" \
         APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
           if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
         }" ${

From 9c5f6f9528817a633a355c95f62cf6307f2b5a4c Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:18:44 +0800
Subject: [PATCH 1740/3246] pythonPackages.zope_testrunner: Remove subunit
 dependency, no longer necessary since latest release

---
 pkgs/development/python-modules/zope_testrunner/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index 6d4d8be4856..7f2af64d915 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -6,7 +6,6 @@
 , zope_exceptions
 , zope_testing
 , six
-, subunit
 }:
 
 
@@ -21,7 +20,7 @@ buildPythonPackage rec {
     extension = "zip";
   };
 
-  propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ stdenv.lib.optional (!isPy3k) subunit;
+  propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
 
   meta = with stdenv.lib; {
     description = "A flexible test runner with layer support";

From 45addeacb0385b6c466e17cc5eb1d876ff289714 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:19:26 +0800
Subject: [PATCH 1741/3246] pythonPackages.aiohttp-cors: Remove zodb3
 dependency

---
 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 eb5e5459450..7225f65e11b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -356,7 +356,7 @@ in {
     # Requires network access
     doCheck = false;
 
-    propagatedBuildInputs = with self; [ zodb3 aiohttp ]
+    propagatedBuildInputs = with self; [ aiohttp ]
       ++ optional (pythonOlder "3.5") typing;
 
     meta = {

From a0c1167e0eab15de69a9b209cb07201b1d92b64d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:20:11 +0800
Subject: [PATCH 1742/3246] pythonPackages.zope_browserresource: Remove
 outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7225f65e11b..c9131681e13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25017,24 +25017,6 @@ EOF
     };
   };
 
-  zope_browserresource = buildPythonPackage rec {
-    name = "zope.browserresource-4.0.1";
-
-    propagatedBuildInputs = with self; [
-      zope_component zope_configuration zope_contenttype zope_i18n
-      zope_interface zope_location zope_publisher zope_schema zope_traversing
-    ];
-
-    # all tests fail
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.browserresource/zope.browserresource-4.0.1.zip";
-      sha256 = "d580184562e7098950ae377b5b37fbb88becdaa2256ac2a6760b69a3e86a99b2";
-    };
-  };
-
-
 
   zope_component = buildPythonPackage rec {
     name = "zope.component-4.2.1";

From 88648d42f4d6203d65ba3f85b2c65c9956ae764c Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:20:36 +0800
Subject: [PATCH 1743/3246] pythonPackages.zope_container: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9131681e13..95a3b371943 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25060,29 +25060,6 @@ EOF
   };
 
 
-  zope_container = buildPythonPackage rec {
-    name = "zope.container-4.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.container/${name}.tar.gz";
-      sha256 = "5c04e61b52fd04d8b7103476532f557c2278c86281aae30d44f88a5fbe888940";
-    };
-
-    # a test is failing
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [
-      zodb3 zope_broken zope_dottedname zope_publisher
-      zope_filerepresentation zope_lifecycleevent zope_size
-      zope_traversing
-    ];
-
-    meta = {
-        maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
-
   zope_contenttype = buildPythonPackage rec {
     name = "zope.contenttype-4.0.1";
 

From 30291227f2411abaca097773eedb49b8f259e297 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:21:11 +0800
Subject: [PATCH 1744/3246] pythonPackages.almir: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 95a3b371943..376b5dca389 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -411,88 +411,6 @@ in {
     };
   };
 
-  almir = let
-    sqlalchemy_0_8 = buildPythonPackage rec {
-      name = "SQLAlchemy-0.8.7";
-      disabled = isPy34 || isPy35;
-#       doCheck = !isPyPy;
-
-      src = pkgs.fetchurl {
-        url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz";
-        sha256 = "9edb47d137db42d57fd26673d6c841e189b1aeb9b566cca908962fcc8448c0bc";
-      };
-
-      preConfigure = optionalString isPy3k ''
-        python3 sa2to3.py --no-diffs -w lib test examples
-      '';
-
-      buildInputs = with self; [ nose mock ]
-        ++ stdenv.lib.optional doCheck pysqlite;
-
-      checkPhase = ''
-        ${python.executable} sqla_nose.py
-      '';
-
-      doCheck = false;
-
-      meta = {
-        homepage = http://www.sqlalchemy.org/;
-        description = "A Python SQL toolkit and Object Relational Mapper";
-      };
-    };
-  in buildPythonPackage rec {
-    name = "almir-0.1.8";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/almir/${name}.zip";
-      sha256 = "5dc0b8a5071f3ff46cd2d92608f567ba446e4c733c063b17d89703caeb9868fe";
-    };
-
-    buildInputs = with self; [
-      pkgs.which
-      self.coverage
-      self.mock
-      self.tissue
-      self.unittest2
-      self.webtest
-    ];
-
-    propagatedBuildInputs = with self; [
-      pkgs.makeWrapper
-      pkgs.bacula
-      self.colander
-      self.deform
-      self.deform_bootstrap
-      self.docutils
-      self.nose
-      self.mysql_connector_repackaged
-      self.pg8000
-      self.pyramid
-      self.pyramid_beaker
-      self.pyramid_exclog
-      self.pyramid_jinja2
-      self.pyramid_tm
-      self.pytz
-      sqlalchemy_0_8
-      self.transaction
-      self.waitress
-      self.webhelpers
-      self.psycopg2
-      (self.zope_sqlalchemy.override rec {propagatedBuildInputs = with self; [ sqlalchemy_0_8 transaction ];})
-    ];
-
-    postInstall = ''
-      ln -s ${pkgs.bacula}/bin/bconsole $out/bin
-    '';
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-      platforms = platforms.all;
-      # Two versions of sqlalchemy in closure
-      broken = true;
-    };
-  };
-
 
   alot = buildPythonPackage rec {
     rev = "0.5.1";

From 313ea3827b52aa030af19528607e074735a65e16 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:21:46 +0800
Subject: [PATCH 1745/3246] pythonPackages.zope_sqlalchemy: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 376b5dca389..adf9a6d6425 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25224,26 +25224,6 @@ EOF
   };
 
 
-  zope_sqlalchemy = buildPythonPackage rec {
-    name = "zope.sqlalchemy-0.7.6";
-
-    doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.sqlalchemy/${name}.zip";
-      sha256 = "0vxhpdvzihsmg63aralmc7hx62lzrsnlxvskvlcr4mkwzwb22haj";
-    };
-
-    buildInputs = with self; [ zope_testing zope_interface ];
-    propagatedBuildInputs = with self; [ sqlalchemy transaction ];
-
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar ];
-      platforms = platforms.all;
-    };
-  };
-
-
   zope_testing = buildPythonPackage rec {
     name = "zope.testing-${version}";
     version = "4.6.1";

From 64259cdd7c16d14bb1620963b8ec1d0ddbfd8c7e Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:22:14 +0800
Subject: [PATCH 1746/3246] pythonPackages.zope_traversing: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index adf9a6d6425..b80b026726d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25248,24 +25248,6 @@ EOF
 
   zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };
 
-  zope_traversing = buildPythonPackage rec {
-    name = "zope.traversing-4.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.traversing/${name}.zip";
-      sha256 = "79d38b92ec1d9a2467966ee954b792d83ac66f22e45e928113d4b5dc1f5e74eb";
-    };
-
-    propagatedBuildInputs = with self; [ zope_location zope_security zope_publisher transaction zope_tales ];
-
-    # circular dependency on zope_browserresource
-    doCheck = false;
-
-    meta = {
-        maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
 
   zope_interface = callPackage ../development/python-modules/zope_interface { };
 

From 5583e3a2bd6be3b03c38d5ea729f64b569fa8f42 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:22:32 +0800
Subject: [PATCH 1747/3246] pythonPackages.zope_publisher: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b80b026726d..a2f6877d8a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25150,24 +25150,6 @@ EOF
   };
 
 
-  zope_publisher = buildPythonPackage rec {
-    name = "zope.publisher-3.12.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.publisher/${name}.tar.gz";
-      sha256 = "d994d8eddfba504841492115032a9a7d86b1713ebc96d0ca16fbc6ee93168ba4";
-    };
-
-    propagatedBuildInputs = with self; [
-      zope_browser zope_contenttype zope_i18n zope_security
-    ];
-
-    meta = {
-        maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
-
   zope_schema = buildPythonPackage rec {
     name = "zope.schema-4.4.2";
 

From fab8f7ac4b6cd784cfa384ea2e3547b0f7807557 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:22:49 +0800
Subject: [PATCH 1748/3246] pythonPackages.zope_browser: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a2f6877d8a2..b3bc1588aa2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24920,22 +24920,6 @@ EOF
   };
 
 
-  zope_browser = buildPythonPackage rec {
-    name = "zope.browser-2.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.browser/${name}.zip";
-      sha256 = "0f9r5rn9lzgi4hvkhgb6vgw8kpz9sv16jsfb9ws4am8gbqcgv2iy";
-    };
-
-    propagatedBuildInputs = with self; [ zope_interface ];
-
-    meta = {
-        maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
-
   zope_component = buildPythonPackage rec {
     name = "zope.component-4.2.1";
 

From c06cfd0404ac57e796215157672256e15d0b662c Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:23:27 +0800
Subject: [PATCH 1749/3246] pythonPackages.zope_security: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3bc1588aa2..e732a4d7150 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25155,25 +25155,6 @@ EOF
   };
 
 
-  zope_security = buildPythonPackage rec {
-    name = "zope.security-4.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.security/${name}.tar.gz";
-      sha256 = "8da30b03d5491464d59397e03b88192f31f587325ee6c6eb1ca596a1e487e2ec";
-    };
-
-    propagatedBuildInputs = with self; [
-      zope_component zope_configuration zope_i18nmessageid zope_schema
-      zope_proxy zope_testrunner
-    ];
-
-    meta = {
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
-
   zope_size = buildPythonPackage rec {
     name = "zope.size-3.5.0";
 

From ced137d980e7180afc98d4b436d4d0eb76ba9035 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:24:13 +0800
Subject: [PATCH 1750/3246] pythonPackages.zodb3: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e732a4d7150..411441f9488 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24809,26 +24809,6 @@ EOF
     };
   };
 
-  zodb3 = buildPythonPackage rec {
-    name = "zodb3-${version}";
-    version = "3.11.0";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/Z/ZODB3/ZODB3-${version}.tar.gz";
-      sha256 = "b5767028e732c619f45c27189dd001e14ec155d7984807991fce751b35b4fcb0";
-    };
-
-    propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event BTrees persistent ZEO ];
-
-    meta = {
-      description = "An object-oriented database for Python";
-      homepage = http://pypi.python.org/pypi/ZODB3;
-      license = licenses.zpl20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
-
   zodb = buildPythonPackage rec {
     name = "zodb-${version}";
     disabled = isPyPy;

From 80ef4d6fc7c330d4f5a694a691abde13ac6e8dab Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:24:52 +0800
Subject: [PATCH 1751/3246] pythonPackages.zope_tales: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 411441f9488..b5966262d10 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8830,18 +8830,6 @@ in {
 
   };
 
-  zope_tales = buildPythonPackage rec {
-    name = "zope.tales-4.0.2";
-
-    propagatedBuildInputs = with self; [ zope_interface six zope_testrunner ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zope.tales/${name}.zip";
-      sha256 = "c0485f09c3f23c7a0ceddabcb02d4a40ebecf8f8f36c87fa9a02c415f96c969e";
-    };
-  };
-
-
   zope_deprecation = buildPythonPackage rec {
     name = "zope.deprecation-4.1.2";
 

From 48b305ca6dcc9597104de5a2b2c41cf3463b2ce5 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:25:23 +0800
Subject: [PATCH 1752/3246] pythonPackages.pyramid_zodbconn: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5966262d10..30fce14fd28 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8496,26 +8496,6 @@ in {
     };
   };
 
-  pyramid_zodbconn = buildPythonPackage rec {
-    name = "pyramid_zodbconn-0.7";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyramid_zodbconn/${name}.tar.gz";
-      sha256 = "56cfdb6b13dc87b1c51c7abc1557c63960d6b858e14a2d4c9693c3f7877f5f63";
-    };
-
-    # should be fixed in next release
-    doCheck = false;
-
-    buildInputs = with self; [ mock ];
-    propagatedBuildInputs = with self; [ pyramid zodb zodburi ZEO ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
-
   pyramid_mailer = buildPythonPackage rec {
     name = "pyramid_mailer-0.13";
 

From 953484b4e30407ecee589d40d6403cdf800c6114 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:26:04 +0800
Subject: [PATCH 1753/3246] pythonPackages.zodburi: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30fce14fd28..534f3e5eaae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8549,22 +8549,6 @@ in {
     };
   };
 
-
-  zodburi = buildPythonPackage rec {
-    name = "zodburi-2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/z/zodburi/${name}.tar.gz";
-      sha256 = "c04b9beca032bb7b968a3464417596ba4607a927c5e65929860962ddba1cccc0";
-    };
-
-    buildInputs = with self; [ zodb mock ZEO ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
   ZEO = self.buildPythonPackage rec {
     name = "ZEO-4.0.0";
 

From 660b225903c975dc94b0b4ef8eb3b596f316517b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:26:29 +0800
Subject: [PATCH 1754/3246] pythonPackages.ZEO: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 534f3e5eaae..95becbb10c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8549,21 +8549,6 @@ in {
     };
   };
 
-  ZEO = self.buildPythonPackage rec {
-    name = "ZEO-4.0.0";
-
-    propagatedBuildInputs = with self; [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/Z/ZEO/${name}.tar.gz";
-      sha256 = "63555b6d2b5f98d215c4b5fdce004fb0475daa6efc8b70f39c77d646c12d7e51";
-    };
-
-    meta = {
-      homepage = https://pypi.python.org/pypi/ZEO;
-    };
-  };
-
   random2 = self.buildPythonPackage rec {
     name = "random2-1.0.1";
 

From b7b66c31f288fd88e529a2b0939d4874489ed97d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:27:00 +0800
Subject: [PATCH 1755/3246] pythonPackages.pyramid_mailer: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 95becbb10c1..10bf51d535a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8496,21 +8496,6 @@ in {
     };
   };
 
-  pyramid_mailer = buildPythonPackage rec {
-    name = "pyramid_mailer-0.13";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyramid_mailer/${name}.tar.gz";
-      sha256 = "4debfad05ee65a05ba6f43e2af913e6e30db75ba42254e4aa0291500c4caa1fc";
-    };
-
-    buildInputs = with self; [ pyramid transaction ];
-    propagatedBuildInputs = with self; [ repoze_sendmail ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
 
   pyrtlsdr = buildPythonPackage rec {
     name = "pyrtlsdr-0.2.0";

From bc6d9b0d466f4e35fc01847808c9716d66b1c2ad Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:27:28 +0800
Subject: [PATCH 1756/3246] pythonPackages.repoze_sendmail: Remove outdated
 package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 10bf51d535a..a84b17ca30e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8518,22 +8518,6 @@ in {
     };
   };
 
-
-  repoze_sendmail = buildPythonPackage rec {
-    name = "repoze.sendmail-4.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/repoze.sendmail/${name}.tar.gz";
-      sha256 = "51813730adc24728d5ce2609038f7bb81aa1632539d7a79045ef4aa6942eaba2";
-    };
-
-    buildInputs = with self; [ transaction ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
   random2 = self.buildPythonPackage rec {
     name = "random2-1.0.1";
 

From 6d82bac4243231338ff01c88886d3b012a6b041e Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:28:02 +0800
Subject: [PATCH 1757/3246] pythonPackages.hypatia: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a84b17ca30e..136315cac86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8383,21 +8383,6 @@ in {
     };
   };
 
-  hypatia = buildPythonPackage rec {
-    name = "hypatia-0.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/hypatia/${name}.tar.gz";
-      sha256 = "fb4d394eeac4b06ff2259cada6174aebbe77edd243ffd1deda320cb327f98bd9";
-    };
-
-    buildInputs = with self; [ zope_interface zodb ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
 
   zope_copy = buildPythonPackage rec {
     name = "zope.copy-4.0.2";

From 5167116ebabe1f6eaf341bd701fb23e4d512433f Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:28:46 +0800
Subject: [PATCH 1758/3246] pythonPackages.pyramid_tm: Remove outdated package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 136315cac86..05125aa778a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8074,22 +8074,6 @@ in {
   };
 
 
-  pyramid_tm = buildPythonPackage rec {
-    name = "pyramid_tm-0.10";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyramid_tm/${name}.tar.gz";
-      sha256 = "99528c54accf2bd5860d10634fe8972e8375b2d0f50ee08f208ed0484ffafc1d";
-    };
-
-    propagatedBuildInputs = with self; [ transaction pyramid ];
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar matejc ];
-      platforms = platforms.all;
-    };
-  };
-
-
   pyramid_multiauth = buildPythonPackage rec {
     name = "pyramid_multiauth-${version}";
     version = "0.8.0";

From 490df6756228390846dbed82b359f50fba88149b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:33:54 +0800
Subject: [PATCH 1759/3246] pythonPackages.pecan: 1.0.3 -> 1.2.1

---
 .../python-modules/pecan/default.nix          | 40 +++++++++++++++++++
 .../pecan/python36_test_fix.patch             | 13 ++++++
 pkgs/top-level/python-packages.nix            | 22 +---------
 3 files changed, 54 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/pecan/default.nix
 create mode 100644 pkgs/development/python-modules/pecan/python36_test_fix.patch

diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
new file mode 100644
index 00000000000..b6e022640cb
--- /dev/null
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+# Python deps
+, singledispatch
+, logutils
+, webtest
+, Mako
+, genshi
+, Kajiki
+, sqlalchemy
+, gunicorn
+, jinja2
+, virtualenv
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pecan";
+  version = "1.2.1";
+
+  patches = [
+    ./python36_test_fix.patch
+  ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ikc32rd2hr8j2jxc0mllvdjvxydx3fwfp3z8sdxmkzdkixlb5cd";
+  };
+
+  propagatedBuildInputs = [ singledispatch logutils ];
+  buildInputs = [
+    webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Pecan";
+    homepage = "http://github.com/pecan/pecan";
+  };
+}
diff --git a/pkgs/development/python-modules/pecan/python36_test_fix.patch b/pkgs/development/python-modules/pecan/python36_test_fix.patch
new file mode 100644
index 00000000000..65e0733ab06
--- /dev/null
+++ b/pkgs/development/python-modules/pecan/python36_test_fix.patch
@@ -0,0 +1,13 @@
+diff --git a/pecan/tests/test_conf.py b/pecan/tests/test_conf.py
+index 0573d84..7c98e16 100644
+--- a/pecan/tests/test_conf.py
++++ b/pecan/tests/test_conf.py
+@@ -157,7 +157,7 @@ class TestConf(PecanTestCase):
+
+             try:
+                 configuration.conf_from_file(f.name)
+-            except (ValueError, SystemError) as e:
++            except (ValueError, SystemError, ImportError) as e:
+                 assert 'relative import' in str(e)
+             else:
+                 raise AssertionError(
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 05125aa778a..4f933b4364d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15332,27 +15332,7 @@ in {
     '';
   };
 
-  pecan = buildPythonPackage rec {
-    name = "pecan-${version}";
-    version = "1.0.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pecan/${name}.tar.gz";
-      sha256 = "04abmybab8jzbwgmrr0fcpcfhcvvkdsv9q135dss02wyk9q9jv4d";
-    };
-
-    propagatedBuildInputs = with self; [
-      singledispatch logutils
-    ];
-    buildInputs = with self; [
-      webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
-    ];
-
-    meta = with stdenv.lib; {
-      description = "Pecan";
-      homepage = "http://github.com/pecan/pecan";
-    };
-  };
+  pecan = callPackage ../development/python-modules/pecan { };
 
   kaitaistruct = buildPythonPackage rec {
     name = "kaitaistruct-${version}";

From f06a5f4935bfdc80bc916b8fba2cc6c0434619ff Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 12:37:57 +0800
Subject: [PATCH 1760/3246] pythonPackages.transaction: 1.4.3 -> 2.1.2

---
 .../python-modules/transaction/default.nix    | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +-----------
 2 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/transaction/default.nix

diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix
new file mode 100644
index 00000000000..31f69971e52
--- /dev/null
+++ b/pkgs/development/python-modules/transaction/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, zope_interface
+, mock
+}:
+
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "transaction";
+  version = "2.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1mab0r3grmgz9d97y8pynhg0r34v0am35vpxyvh7ff5sgmg3dg5r";
+  };
+
+  propagatedBuildInputs = [ zope_interface mock ];
+
+  meta = with stdenv.lib; {
+    description = "Transaction management";
+    homepage = http://pypi.python.org/pypi/transaction;
+    license = licenses.zpl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f933b4364d..f56561053ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23386,23 +23386,8 @@ in {
   };
 
 
-  transaction = buildPythonPackage rec {
-    name = "transaction-${version}";
-    version = "1.4.3";
+  transaction = callPackage ../development/python-modules/transaction { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/transaction/${name}.tar.gz";
-      sha256 = "1b2304a886a85ad014f73d93346c14350fc214ae22a4f565f42f6761cfb9ecc5";
-    };
-
-    propagatedBuildInputs = with self; [ zope_interface ];
-
-    meta = {
-      description = "Transaction management";
-      homepage = http://pypi.python.org/pypi/transaction;
-      license = licenses.zpl20;
-    };
-  };
 
   transmissionrpc = buildPythonPackage rec {
     name = "transmissionrpc-${version}";

From 3ba2300b2d24fd90e97468a605d50b5441c2770f Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 13:18:05 +0800
Subject: [PATCH 1761/3246] pythonPackages.zodb: 4.0.1 -> 5.2.4

---
 .../python-modules/zodb/default.nix           | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +----------
 2 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/zodb/default.nix

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
new file mode 100644
index 00000000000..a4855c23865
--- /dev/null
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, isPy3k
+, zope_testrunner
+, transaction
+, six
+, wheel
+, zope_interface
+, zodbpickle
+, zconfig
+, persistent
+, zc_lockfile
+, BTrees
+, manuel
+}:
+
+buildPythonPackage rec {
+    pname = "ZODB";
+    version = "5.2.4";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1pya0inkkxaqmi14gp796cidf894nz64n603zk670jj9xz0wkhgc";
+    };
+
+    propagatedBuildInputs = [
+      manuel
+      transaction
+      zope_testrunner
+      six
+      wheel
+      zope_interface
+      zodbpickle
+      zconfig
+      persistent
+      zc_lockfile
+      BTrees
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Zope Object Database: object database and persistence";
+      homepage = http://pypi.python.org/pypi/ZODB;
+      license = licenses.zpl21;
+      maintainers = with maintainers; [ goibhniu ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f56561053ce..94345955e96 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24649,33 +24649,7 @@ EOF
     };
   };
 
-  zodb = buildPythonPackage rec {
-    name = "zodb-${version}";
-    disabled = isPyPy;
-
-    version = "4.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/Z/ZODB/ZODB-${version}.tar.gz";
-      sha256 = "c5d8ffcca37ab4d0a9bfffead6228d58c00cf1c78135abc98a8dbf05b8c8fb58";
-    };
-
-    propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ]
-      ++ optionals isPy3k [ zodbpickle ];
-
-    preCheck = if isPy3k then ''
-      # test failure on py3.4
-      rm src/ZODB/tests/testDB.py
-      rm src/ZODB/tests/test_fsdump.py # Error with Python 3.6
-    '' else "";
-
-    meta = {
-      description = "An object-oriented database for Python";
-      homepage = http://pypi.python.org/pypi/ZODB;
-      license = licenses.zpl20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
+  zodb = callPackage ../development/python-modules/zodb {};
 
   zodbpickle = callPackage ../development/python-modules/zodbpickle {};
 

From 9cd05278a69f0864d2229823e8e1a61f2fb7c7ba Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 13:19:39 +0800
Subject: [PATCH 1762/3246] vulnix: use zodb from pythonPackages

---
 pkgs/tools/security/vulnix/default.nix      | 10 ++---
 pkgs/tools/security/vulnix/requirements.nix | 47 ---------------------
 2 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/tools/security/vulnix/requirements.nix

diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index a058c2ee1a8..1beb2268fc6 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -1,10 +1,6 @@
-{ stdenv, pythonPackages, fetchurl, callPackage, nix, }:
+{ stdenv, pythonPackages, fetchurl, callPackage, nix }:
 
-let
-  external = callPackage ./requirements.nix {
-    inherit pythonPackages;
-  };
-in pythonPackages.buildPythonApplication rec{
+pythonPackages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "vulnix";
   version = "1.2.2";
@@ -28,7 +24,7 @@ in pythonPackages.buildPythonApplication rec{
     lxml
     pyyaml
     requests
-    external.zodb
+    zodb
   ]);
 
   checkPhase = "py.test";
diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
deleted file mode 100644
index 716b0aac51e..00000000000
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ pythonPackages, fetchurl, stdenv }:
-
-rec {
-  zodb = pythonPackages.buildPythonPackage {
-    name = "ZODB-5.2.0";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/1e/47/2f17075ca94a4a537ebd8e195c458456ef49aa67355ec805e478b8ad1959/ZODB-5.2.0.tar.gz";
-      sha256 = "11l495lyym2fpvalj18yvcqwnsp8gyp18sgv5v575k4s2035lz0x";
-    };
-    doCheck = false;
-    propagatedBuildInputs = [
-      transaction
-    ] ++ (with pythonPackages; [
-      six
-      wheel
-      zope_interface
-      zodbpickle
-      zconfig
-      persistent
-      zc_lockfile
-      BTrees
-    ]);
-
-    meta = with stdenv.lib; {
-      license = licenses.zpl21;
-      description = "Zope Object Database: object database and persistence";
-    };
-  };
-
-  transaction = pythonPackages.buildPythonPackage {
-    name = "transaction-2.0.3";
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz";
-      sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f";
-    };
-    propagatedBuildInputs = with pythonPackages; [
-      zope_interface
-      six
-      wheel
-      mock
-    ];
-    meta = with stdenv.lib; {
-      license = licenses.zpl21;
-      description = "Transaction management for Python";
-    };
-  };
-}

From 4495bfe1382ea779f02996d0e18d25d892678e8c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 9 Aug 2017 15:06:03 +0200
Subject: [PATCH 1763/3246] python.buildEnv: only wrap executables

---
 pkgs/applications/virtualization/xen/packages.nix | 4 ----
 pkgs/development/interpreters/python/wrapper.nix  | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index 8f5262acb02..f4bde18f3df 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -10,8 +10,6 @@ rec {
   xen_4_5-vanilla = callPackage ./4.5.nix {
     # At the very least included seabios and etherboot need gcc49,
     # so we have to build all of it with gcc49.
-    stdenv = overrideCC stdenv gcc49;
-
     meta = {
       description = "vanilla";
       longDescription = ''
@@ -60,8 +58,6 @@ rec {
   xen_4_8-vanilla = callPackage ./4.8.nix {
     # At the very least included seabios and etherboot need gcc49,
     # so we have to build all of it with gcc49.
-    stdenv = overrideCC stdenv gcc49;
-
     meta = {
       description = "vanilla";
       longDescription = ''
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index f95e51c82ee..9f355ddefda 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -28,7 +28,9 @@ let
           for prg in *; do
             if [ -f "$prg" ]; then
               rm -f "$out/bin/$prg"
-              makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true"
+              if [ -x "$prg" ]; then
+                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true"
+              fi
             fi
           done
         fi

From bd27239c068b6ab1be668e3682d12861d77d08d6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 9 Aug 2017 09:13:28 -0400
Subject: [PATCH 1764/3246] atom: 1.18.0 -> 1.19.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 9f0c97ce154..ec8bef7deee 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.18.0";
+  version = "1.19.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6";
+    sha256 = "1gdasqpmbyasd05p5920aw6bf8j58crs51gxjslsgbl1azi4yfh2";
     name = "${name}.deb";
   };
 

From ed55bdb50103bfc22abff15389d7634c268d499c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 9 Aug 2017 14:22:26 +0000
Subject: [PATCH 1765/3246] lkl: 2017-06-27 -> 2017-08-09

Just bumping the package version to pick up a bugfix.

Fixes #28055
---
 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 d1bf5792a1b..b790a15e607 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "lkl-2017-06-27";
-  rev  = "0d91d102b046eec535a6d67df9829b80b24e9ce9";
+  name = "lkl-2017-08-09";
+  rev  = "083cdeece0577635d523244dcf0da86074e23e4e";
 
   outputs = [ "dev" "lib" "out" ];
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     inherit rev;
     owner  = "lkl";
     repo   = "linux";
-    sha256 = "1sc18fik2dm0hnsb5q4srvwbf6wgv27zlf3qa7x39g4vbj1jqgas";
+    sha256 = "1fyh0p54jgsqywswj40zbw64jbqx2w10wax1k3j2szzlhjrv9x1a";
   };
 
   # Fix a /usr/bin/env reference in here that breaks sandboxed builds

From 10bcf0818f47b460d73c812ba50a2d50884bacd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 9 Aug 2017 16:36:32 +0200
Subject: [PATCH 1766/3246] knot-resolver: security 1.3.2 -> 1.3.3

https://lists.nic.cz/pipermail/knot-dns-users/2017-August/001184.html
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index d4210c31eb8..390bf43d4d6 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "846b7496cb6273b831fd52eca09078c0454b06a8a6b792e2125c7b6818246edb";
+    sha256 = "c679238bea5744de8a99f4402a61e9e58502bc42b40ecfa370e53679ed5d5b80";
   };
 
   outputs = [ "out" "dev" ];

From 25c12d0abf7209f3b7f8a1d102d2426127ca32f2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 9 Aug 2017 17:34:28 +0200
Subject: [PATCH 1767/3246] screenfetch: fix wrapProgram usage

---
 pkgs/tools/misc/screenfetch/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index c138261f9a3..a781ff91027 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -21,17 +21,10 @@ stdenv.mkDerivation {
     # Fix all of the depedencies of screenfetch
     patchShebangs $out/bin/screenfetch
     wrapProgram "$out/bin/screenfetch" \
-      --set PATH : "" \
-      --prefix PATH : "${coreutils}/bin" \
-      --prefix PATH : "${gawk}/bin" \
-      --prefix PATH : "${procps}/bin" \
-      --prefix PATH : "${gnused}/bin" \
-      --prefix PATH : "${findutils}/bin" \
-      --prefix PATH : "${xdpyinfo}/bin" \
-      --prefix PATH : "${xprop}/bin" \
-      --prefix PATH : "${gnugrep}/bin" \
-      --prefix PATH : "${ncurses}/bin" \
-      --prefix PATH : "${bc}/bin"
+      --set PATH ${stdenv.lib.makeBinPath [
+        coreutils gawk procps gnused findutils xdpyinfo
+        xprop gnugrep ncurses bc
+      ]}
   '';
 
   meta = {

From fa02817cda46e781d39f3bda212617d72e548824 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 9 Aug 2017 17:59:47 +0200
Subject: [PATCH 1768/3246] docker-machine: 0.12.0 -> 0.12.2

---
 .../networking/cluster/docker-machine/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 5016dc8fca3..95ad83cb3b1 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "machine-${version}";
-  version = "0.12.0";
+  version = "0.12.2";
 
   goPackagePath = "github.com/docker/machine";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "docker";
     repo = "machine";
-    sha256 = "08y87d0whag9sy1q5s84xrz95k12c9crh3zmdcr1ylrwqnszrn2y";
+    sha256 = "0ikgjb6x6h7f43vjabxnqgrrlq516zsz7vj945hca1w919jpdwhf";
   };
 
   postInstall = ''

From 771f28bac804dfb6ebf99122bfe4e5393d9c278d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 9 Aug 2017 09:02:55 +0000
Subject: [PATCH 1769/3246] cc-wrapper: Fix support for qtbase-setup-hook

Revert https://github.com/NixOS/nixpkgs/pull/27657#issuecomment-318161946
due to https://github.com/NixOS/nixpkgs/pull/28021#issuecomment-321045542
---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 8db64a38e38..d0a1d5a0ddb 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -132,11 +132,14 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
         for path in "$dir"/*; do
             file="${path##*/}"
             if [ "${libs[$file]:-}" ]; then
-                libs["$file"]=
-                if [ -z "${rpaths[$dir]:-}" ]; then
-                    rpaths["$dir"]=1
-                    extraAfter+=(-rpath "$dir")
-                fi
+                # This library may have been provided by a previous directory,
+                # but if that library file is inside an output of the current
+                # derivation, it can be deleted after this compilation and
+                # should be found in a later directory, so we add all
+                # directories that contain any of the libraries to rpath.
+                rpaths["$dir"]=1
+                extraAfter+=(-rpath "$dir")
+                break
             fi
         done
     done

From 17753fa005feafbcc798996989909ba563153034 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 9 Aug 2017 17:33:02 +0100
Subject: [PATCH 1770/3246] stdenv: fix typo in setup.sh

---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 81ed1c635e1..b6bca3e1f56 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -750,7 +750,7 @@ configurePhase() {
 buildPhase() {
     runHook preBuild
 
-    if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile[[ ) ]]; then
+    if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
         echo "no Makefile, doing nothing"
     else
         # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409

From 46a25ea7ea155193302e749e5d72513bee0a296b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 9 Aug 2017 19:43:46 +0200
Subject: [PATCH 1771/3246] linuxPackages.bcc: fix using wrapProgram on .c file

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

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 38f57e7663e..24686e73e23 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -25,11 +25,13 @@ stdenv.mkDerivation rec {
     mv $out/share/bcc/man $out/share/
 
     for f in $out/share/bcc/tools\/*; do
-      ln -s $f $out/bin/$(basename $f)
-      wrapProgram $f \
-        --prefix LD_LIBRARY_PATH : $out/lib \
-        --prefix PYTHONPATH : $out/lib/python2.7/site-packages \
-        --prefix PYTHONPATH : :${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages
+      if [ -x $f ]; then
+        ln -s $f $out/bin/$(basename $f)
+        wrapProgram $f \
+          --prefix LD_LIBRARY_PATH : $out/lib \
+          --prefix PYTHONPATH : $out/lib/python2.7/site-packages \
+          --prefix PYTHONPATH : ${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages
+      fi
     done
   '';
 

From 30d76b8ccdf12412df7e00cb619c5fe12a09706a Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Sun, 6 Aug 2017 19:09:33 +0200
Subject: [PATCH 1772/3246] seafile-client: 5.0.7 -> 6.1.0

bump to qt5
---
 .../networking/seafile-client/default.nix     | 41 +++++++------------
 .../libraries/libsearpc/default.nix           |  2 +-
 pkgs/misc/seafile-shared/default.nix          |  6 +--
 pkgs/tools/networking/ccnet/default.nix       |  8 ++--
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 9c6aefd8ced..d930e24883e 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -1,39 +1,28 @@
-{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafile-shared, ccnet, makeWrapper}:
+{ stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools
+, seafile-shared, ccnet, makeWrapper }:
 
-stdenv.mkDerivation rec
-{
-  version = "5.0.7";
+stdenv.mkDerivation rec {
+  version = "6.1.0";
   name = "seafile-client-${version}";
 
-  src = fetchurl
-  {
+  src = fetchurl {
     url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
-    sha256 = "ae6975bc1adf45d09cf9f6332ceac7cf285f8191f6cf50c6291ed45f8cf4ffa5";
+    sha256 = "16rn6b9ayaccgwx8hs3yh1wb395pp8ffh8may8a8bpcc4gdry7bd";
   };
 
-  buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];
-
-  builder = writeScript "${name}-builder.sh" ''
-    source $stdenv/setup
-
-    tar xvfz $src
-    cd seafile-client-*
-
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" .
-    make -j1
-
-    make install
+  nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
+  buildInputs = [ qtbase qttools seafile-shared ];
 
+  postInstall = ''
     wrapProgram $out/bin/seafile-applet \
       --suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}
-    '';
+  '';
 
-  meta =
-  {
-    homepage = https://github.com/haiwen/seafile-clients;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/haiwen/seafile-client;
     description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.calrama ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.calrama ];
   };
 }
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 12922d4612d..0457c0eb9c4 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec
 {
   version = "3.0.7";
-  seafileVersion = "5.0.7";
+  seafileVersion = "6.1.0";
   name = "libsearpc-${version}";
 
   src = fetchurl
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index fba78132bb5..6ce337855d9 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec
 {
-  version = "5.0.7";
+  version = "6.1.0";
   name = "seafile-shared-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
-    sha256 = "ec166c86a41e7ab3b1ae97a56326ab4a2b1ec38686486b956c3d153b8023c670";
+    sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6";
   };
 
   buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ];
   propagatedBuildInputs = [ ccnet curl ];
 
   preConfigure = ''
-  sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh
+  sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh
   ./autogen.sh
   '';
 
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index bab8cbc8639..22237794f07 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec
 {
-  version = "5.0.7";
-  seafileVersion = "5.0.7";
+  version = "6.1.0";
+  seafileVersion = "6.1.0";
   name = "ccnet-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
-    sha256 = "1e1c670a85619b174328a15925a050c7a8b323fecd13434992332f5c15e05de1";
+    sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb";
   };
 
   buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python ];
   propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ];
 
   preConfigure = ''
-  sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh
+  sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh
   ./autogen.sh
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cd996fca06..b349aa2a374 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15973,7 +15973,7 @@ with pkgs;
     inherit (gnome2) libart_lgpl;
   };
 
-  seafile-client = callPackage ../applications/networking/seafile-client { };
+  seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };
 
   seeks = callPackage ../tools/networking/p2p/seeks {
     protobuf = protobuf2_5;

From 1ed786292b438930b510aeb78f7678917be21aba Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 9 Aug 2017 19:38:59 +0200
Subject: [PATCH 1773/3246] searx: cleanup, remove python name prefix

---
 pkgs/servers/web-apps/searx/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix
index 551f3a015a1..0feae7d7241 100644
--- a/pkgs/servers/web-apps/searx/default.nix
+++ b/pkgs/servers/web-apps/searx/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ lib, pythonPackages, fetchFromGitHub }:
 
 pythonPackages.buildPythonApplication rec {
   name = "searx-${version}";
   version = "0.12.0";
+  namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "asciimoo";
@@ -25,10 +26,10 @@ pythonPackages.buildPythonApplication rec {
     pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/asciimoo/searx;
     description = "A privacy-respecting, hackable metasearch engine";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ matejc fpletz profpatsch ];
   };
- }
+}

From 2d5c1226c65192a2f8c503e23f6d9738f47be206 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 9 Aug 2017 19:51:25 +0200
Subject: [PATCH 1774/3246] cacert: really fix utf-8 certname blacklists

See #27576.
---
 pkgs/data/misc/cacert/default.nix             |  7 ++++---
 .../misc/cacert/fix-unicode-ca-names.patch    | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/data/misc/cacert/fix-unicode-ca-names.patch

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index fbf9af36f27..22cd14fe4ab 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, nss, python3
+{ stdenv, fetchurl, writeText, nss, python
 , blacklist ? []
 , includeEmail ? false
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = nss.src;
 
-  nativeBuildInputs = [ python3 ];
+  nativeBuildInputs = [ python ];
 
   configurePhase = ''
     ln -s nss/lib/ckfw/builtins/certdata.txt
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
     ${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)}
     EOF
 
-    cp ${certdata2pem} certdata2pem.py
+    cat ${certdata2pem} > certdata2pem.py
+    patch -p1 < ${./fix-unicode-ca-names.patch}
     ${optionalString includeEmail ''
       # Disable CAs used for mail signing
       substituteInPlace certdata2pem.py --replace \[\'CKA_TRUST_EMAIL_PROTECTION\'\] '''
diff --git a/pkgs/data/misc/cacert/fix-unicode-ca-names.patch b/pkgs/data/misc/cacert/fix-unicode-ca-names.patch
new file mode 100644
index 00000000000..07d3629196a
--- /dev/null
+++ b/pkgs/data/misc/cacert/fix-unicode-ca-names.patch
@@ -0,0 +1,20 @@
+--- a/certdata2pem.py	2017-08-01 23:10:00.000000000 +0300
++++ b/certdata2pem.py	2017-08-01 23:08:21.131297636 +0300
+@@ -88,7 +88,7 @@
+ \# Read blacklist.
+ blacklist = []
+ if os.path.exists('blacklist.txt'):
+-    for line in open('blacklist.txt', 'r'):
++    for line in io.open('blacklist.txt', 'r', encoding='utf-8'):
+         line = line.strip()
+         if line.startswith('#') or len(line) == 0:
+             continue
+@@ -101,7 +101,7 @@
+     if obj['CKA_CLASS'] != 'CKO_NSS_TRUST':
+         continue
+     if obj['CKA_LABEL'] in blacklist:
+-        print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL'])
++        print("Certificate %s blacklisted, ignoring." % unicode(obj['CKA_LABEL']).encode('utf-8'))
+     elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR':
+         trust[obj['CKA_LABEL']] = True
+     elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR':

From 6225f1bf665c884f0a24f26b81f7c06355bf20cd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 9 Aug 2017 21:32:38 +0200
Subject: [PATCH 1775/3246] android-studio-preview: 3.0.0.8 -> 3.0.0.9

"Android Studio 3.0 Canary 9" -> "Android Studio 3.0 Beta 1"
---
 pkgs/applications/editors/android-studio/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 17f795ad68d..1a324b544dc 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,9 +27,9 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.8"; # This is actually "Android Studio 3.0 Canary 9"
-    build = "171.4220116";
-    sha256Hash = "02aw1m65wb5cgjq1dxm86c5m6p8b41kgjcgsl5d0h93fb4clf64b";
+    version = "3.0.0.9"; # This is actually "Android Studio 3.0 Beta 1"
+    build = "171.4243858";
+    sha256Hash = "137jd4146srjigyzcfds8pf7b185q1qdkb0zp2yqc8g6bv4ccb22";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";

From d93c6367370f6acff76260308f4e7522a41c1c9e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 9 Aug 2017 21:37:29 +0200
Subject: [PATCH 1776/3246] Revert "gcc: fix clang build"

This fixes the gcc build but results in a gcc that doesn't generate
valid binaries.

gcc -o hello hello.c
./hello
Killed: 9

This reverts commit 2adf36ab8c7903e100e6e7a0a6447934ec09b10e.
---
 pkgs/development/compilers/gcc/5/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index c9780077835..e95ef92c3f6 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -325,13 +325,7 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure =
-    # Not sure why this is causing problems, now that the stdenv
-    # exports CPP=cpp the build fails with strange errors on darwin.
-    # https://github.com/NixOS/nixpkgs/issues/27889
-    stdenv.lib.optionalString stdenv.cc.isClang ''
-    unset CPP
-  '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

From 4872be756d46805e4bf0a47c96496ec39ce11184 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Fri, 4 Aug 2017 18:27:20 +0200
Subject: [PATCH 1777/3246] monit: 5.20.0 -> 5.23.0

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

diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 055a480f92a..71a4db63c84 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
-  name = "monit-5.20.0";
+  name = "monit-5.23.0";
 
   src = fetchurl {
     url = "${meta.homepage}dist/${name}.tar.gz";
-    sha256 = "13drg4k9r9drn7bpj3n04kkf1l29q05jdccdar6yc6hcqmg3kb7b";
+    sha256 = "04v7sp2vc1q6h8c5j8h4izffn9d97cdj0k64m4ml00lw6wxgwffx";
   };
 
   nativeBuildInputs = [ bison flex ];

From 08e450df469a4ca4079d115ad06584ebe3aa45ff Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Fri, 4 Aug 2017 18:35:44 +0200
Subject: [PATCH 1778/3246] movit: 1.2.0 -> 1.5.1

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

diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index fa765a6b107..a344b8fa92f 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "movit-${version}";
-  version = "1.2.0";
+  version = "1.5.1";
 
   src = fetchurl {
     url = "http://movit.sesse.net/${name}.tar.gz";
-    sha256 = "0wyl5xl4pkw17pkxsdg8idqvsgm4fxapd0r4dw9wlxw250915nmf";
+    sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
   };
 
   outputs = [ "out" "dev" ];

From 37bf3c87824422b39558833e56a3c2e0b4251917 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 9 Aug 2017 21:24:06 +0200
Subject: [PATCH 1779/3246] pythonPackages.distorm3: init at 3.3.4

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

diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix
new file mode 100644
index 00000000000..db781af2a5d
--- /dev/null
+++ b/pkgs/development/python-modules/distorm3/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  pname = "distorm3";
+  version = "3.3.4";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/${pname}/${name}.zip";
+    sha256 = "1bh9xdiz9mkf9lfffimfn3hgd0mh60y7wl1micgkxzpl7hnxrpd4";
+  };
+
+  # no tests included
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Powerful Disassembler Library For x86/AMD64";
+    homepage = https://github.com/gdabah/distorm;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 94345955e96..efb40cd6241 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -163,6 +163,8 @@ in {
 
   discordpy = callPackage ../development/python-modules/discordpy { };
 
+  distorm3 = callPackage ../development/python-modules/distorm3 { };
+
   h5py = callPackage ../development/python-modules/h5py {
     hdf5 = pkgs.hdf5;
   };

From 2e29774f4cd295d633adf3176ac89874a3ebce95 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Fri, 4 Aug 2017 19:02:05 +0200
Subject: [PATCH 1780/3246] volatility: 2.4 -> 2.6, refactor, update outdated
 homepage

---
 pkgs/tools/security/volatility/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index 6f1b7fe6ef4..b64124b3c54 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "volatility-2.4";
+  version = "2.6";
+  name = "volatility-${version}";
 
   src = fetchurl {
-    url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz";
-    sha256 = "1wffrkvj2lrkqhwamyix9fy05y6g6w8h1sz2iqlm6i6ag7yxykv8";
+    url = "http://downloads.volatilityfoundation.org/releases/${version}/${name}.zip";
+    sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv";
   };
 
   doCheck = false;
 
-  propagatedBuildInputs = [ pythonPackages.pycrypto ];
+  propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ];
 
   meta = with stdenv.lib; {
-    homepage = https://code.google.com/p/volatility;
+    homepage = http://www.volatilityfoundation.org/;
     description = "Advanced memory forensics framework";
     maintainers = with maintainers; [ bosu ];
     license = stdenv.lib.licenses.gpl2Plus;

From e9a2cfda7bfad1b58b5b316fda77c8be32ef283c Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Sat, 5 Aug 2017 00:09:05 +0200
Subject: [PATCH 1781/3246] vigra: 1.10.0 -> 1.11.1

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

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index c122928eddd..2910e8b7dbb 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -6,11 +6,11 @@ let
   # Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
 in stdenv.mkDerivation rec {
   name = "vigra-${version}";
-  version = "1.10.0";
+  version = "1.11.1";
 
   src = fetchurl {
     url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz";
-    sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0";
+    sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj";
   };
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";

From c7f14143c40dacbd4ca464a67d3da5538bf4e1ca Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 8 Aug 2017 20:37:00 -0700
Subject: [PATCH 1782/3246] miniupnpc: fix on darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For some reason miniupnpc needs libtool for static linking. Probably not ideal
but it’s doing similar on other platforms as well (using ar).
---
 pkgs/tools/networking/miniupnpc/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix             | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 09459e0e283..2cca57121e9 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, which, cctools }:
 
 let
   generic = { version, sha256 }:
@@ -10,11 +10,14 @@ let
         inherit sha256;
       };
 
+      nativeBuildInputs = [] ++
+        stdenv.lib.optionals stdenv.isDarwin [ which cctools ];
+
       patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
 
       doCheck = !stdenv.isFreeBSD;
 
-      installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
+      makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
 
       meta = {
         homepage = http://miniupnp.free.fr/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97cd763bb22..2da885c140c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3192,7 +3192,8 @@ with pkgs;
 
   minissdpd = callPackage ../tools/networking/minissdpd { };
 
-  inherit (callPackage ../tools/networking/miniupnpc { })
+  inherit (callPackage ../tools/networking/miniupnpc
+            { inherit (darwin) cctools; })
     miniupnpc_1 miniupnpc_2;
   miniupnpc = miniupnpc_1;
 

From da93220fff10b96f4853fad6d5f3c463d33a0212 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 9 Aug 2017 17:11:01 -0300
Subject: [PATCH 1783/3246] mkvtoolnix: 13.0.0 -> 14.0.0

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 0877df0a68c..b902b96a7cd 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "13.0.0";
+  version = "14.0.0";
 
   src = fetchFromGitHub {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "0dz86fzv19wknd8p31nnx2imj80v7m944ssapp8fmq9hkc36m777";
+    sha256 = "1ygc2qrd074vz2yw4iqml5ir31kkvkv7pz3hcfy423p9s06xi1k2";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];

From 7cd44aeeef932551c2b3d5ba41e5897115103b2c Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 9 Aug 2017 22:14:23 +0100
Subject: [PATCH 1784/3246] pangolin: fix OS X build

---
 pkgs/development/libraries/pangolin/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix                 | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
index f5b2f4c2b99..09cbd86eb92 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew, xorg
-, ffmpeg, python3 , libjpeg, libpng, libtiff, eigen }:
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew
+, xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen
+, Carbon ? null, Cocoa ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "pangolin-${version}";
@@ -25,7 +27,8 @@ stdenv.mkDerivation rec {
     libpng 
     libtiff 
     eigen 
-  ];
+  ]
+  ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb0ee3bc767..996691fa435 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8180,7 +8180,9 @@ with pkgs;
 
   pango = callPackage ../development/libraries/pango { };
 
-  pangolin = callPackage ../development/libraries/pangolin { };
+  pangolin = callPackage ../development/libraries/pangolin {
+    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+  };
 
   pangomm = callPackage ../development/libraries/pangomm {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;

From bdcb21c4667599aaef7ff9d23799f00b6b199000 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 9 Aug 2017 17:09:22 -0400
Subject: [PATCH 1785/3246] elpa-packages: 2017-08-09

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index b5c0d465368..0fd05f934c7 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -752,10 +752,10 @@
       }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
         pname = "exwm";
-        version = "0.14";
+        version = "0.15";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.14.tar";
-          sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx";
+          url = "https://elpa.gnu.org/packages/exwm-0.15.tar";
+          sha256 = "1y7nqry9y0a99bsdqkk9f554vczfw4sz6raadw3138835qy697jg";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -1446,10 +1446,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170731";
+        version = "20170807";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170731.tar";
-          sha256 = "1vf91r4ifnjg5r82l5ikq0bwsxd5dsbgywzmwaspm6ckx49nksnl";
+          url = "https://elpa.gnu.org/packages/org-20170807.tar";
+          sha256 = "185pyc0v4vwzvkygqhpld14lk62ygvfb9ycz609n99m0wqlamwz3";
         };
         packageRequires = [];
         meta = {

From 05bee41510b17bd58b6ba211162ca9ddcdecb3cf Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 9 Aug 2017 17:09:37 -0400
Subject: [PATCH 1786/3246] org-packages: 2017-08-09

---
 .../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 f51fec80075..e9eccf83334 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 = "20170731";
+        version = "20170807";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170731.tar";
-          sha256 = "0lphzjxmk5y9g6b9rnacc9z55hbws3xmycsqdvsz56xr3aawx255";
+          url = "http://orgmode.org/elpa/org-20170807.tar";
+          sha256 = "0cpkkfw7wmz242r5zzpcnzp7gfsmja90gqqb5h20azxmq96kfzga";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170731";
+        version = "20170807";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170731.tar";
-          sha256 = "1bba4m9r598f9l8wmr1j670d1qp4fcbbhzp9m4qd2md09rm3nsnw";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170807.tar";
+          sha256 = "145j9g1lx5nj85irdh9ljhh4rhwj9ys8nnca549lyxd9a5yiav5k";
         };
         packageRequires = [];
         meta = {

From d887748507c8cd2f460b41af49e72d3f5b21291a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 9 Aug 2017 17:11:29 -0400
Subject: [PATCH 1787/3246] melpa-stable-packages: 2017-08-09

Removals:
 - aurora-config-mode: removed from melpa
 - fuel: repo moved, lost tags for stable version
---
 .../emacs-modes/melpa-stable-generated.nix    | 483 +++++++++++-------
 1 file changed, 306 insertions(+), 177 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 434e4384738..61a63efb67e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -86,12 +86,12 @@
     abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abyss-theme";
-        version = "0.5";
+        version = "0.7";
         src = fetchFromGitHub {
           owner = "mgrbyte";
           repo = "emacs-abyss-theme";
-          rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc";
-          sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia";
+          rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14";
+          sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme";
@@ -1136,12 +1136,12 @@
     alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alda-mode";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "921b1d39ee1122c0f6935598dc17aaa904e74819";
-          sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f";
+          rev = "97c20b1fd9ad3f138e1100e3a837d05108c4c564";
+          sha256 = "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1981,27 +1981,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "aurora-config-mode";
-        version = "0.0.2";
-        src = fetchFromGitHub {
-          owner = "bdd";
-          repo = "aurora-config-mode.el";
-          rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
-          sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode";
-          sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
-          name = "aurora-config-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/aurora-config-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
     melpaBuild {
         pname = "auth-password-store";
@@ -2028,14 +2007,14 @@
         pname = "auto-compile";
         version = "1.4.0";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "emacscollective";
           repo = "auto-compile";
           rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c";
           sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile";
-          sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
+          sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf";
           name = "auto-compile";
         };
         packageRequires = [ dash emacs packed ];
@@ -3124,12 +3103,12 @@
     bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bshell";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "bshell";
-          rev = "0abd93439895851c1ad3037b0df7443e577ed1ba";
-          sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw";
+          rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68";
+          sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
@@ -3166,12 +3145,12 @@
     buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-manage";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "buffer-manage";
-          rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af";
-          sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma";
+          rev = "1110217973afa1329c47a1f7e6962aad36a90134";
+          sha256 = "0hb75npk1d9bdqpgdrin8vvfn64arhgq0h69xgvhwcdlm7xjg1bf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
@@ -5152,12 +5131,12 @@
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
-        version = "1.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "2cb03c48f44a5b3cbbbbe05e9841b2c61bd8ed81";
-          sha256 = "1i13w1pziv8c1d9gi6pg50v60z7jyx2grpamrbnazvd6rci88paf";
+          rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4";
+          sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -6541,17 +6520,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "deft";
         version = "0.7";
-        src = fetchgit {
-          url = "git://jblevins.org/git/deft.git";
+        src = fetchFromGitHub {
+          owner = "jrblevin";
+          repo = "deft";
           rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40";
           sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft";
-          sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
+          sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp";
           name = "deft";
         };
         packageRequires = [];
@@ -7284,16 +7265,16 @@
     docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
     melpaBuild {
         pname = "docker-compose-mode";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "meqif";
           repo = "docker-compose-mode";
-          rev = "a38b64aecd037556c91d9aef29f1d04496295f2b";
-          sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds";
+          rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c";
+          sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
-          sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
+          sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g";
           name = "docker-compose-mode";
         };
         packageRequires = [ dash emacs yaml-mode ];
@@ -7808,12 +7789,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "1.5.5";
+        version = "1.5.7";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19";
-          sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md";
+          rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c";
+          sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -7889,22 +7870,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+    ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "0.2.1";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1";
-          sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q";
+          rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83";
+          sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
-        packageRequires = [ emacs f ido-completing-read-plus ];
+        packageRequires = [ emacs f ];
         meta = {
           homepage = "https://melpa.org/#/ebal";
           license = lib.licenses.free;
@@ -8970,14 +8951,14 @@
         pname = "elx";
         version = "1.1.0";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "emacscollective";
           repo = "elx";
           rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d";
           sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx";
-          sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
+          sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz";
           name = "elx";
         };
         packageRequires = [ emacs ];
@@ -11802,12 +11783,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "1.9.1";
+        version = "1.9.2";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0";
-          sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b";
+          rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f";
+          sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -12324,6 +12305,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "flycheck-popup-tip";
+        version = "0.12.1";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-popup-tip";
+          rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c";
+          sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
+          sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx";
+          name = "flycheck-popup-tip";
+        };
+        packageRequires = [ emacs flycheck popup ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-popup-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "flycheck-pos-tip";
@@ -13424,25 +13426,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "fuel";
-        version = "0.96";
-        src = fetchgit {
-          url = "git://factorcode.org/git/factor.git";
-          rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
-          sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
-          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
-          name = "fuel";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/fuel";
-          license = lib.licenses.free;
-        };
-      }) {};
     full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "full-ack";
@@ -16163,12 +16146,12 @@
     helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-backup";
-        version = "0.2.2";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "antham";
           repo = "helm-backup";
-          rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4";
-          sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg";
+          rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb";
+          sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -18512,22 +18495,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "3.16";
+        version = "4.3";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
-          repo = "ido-ubiquitous";
-          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
-          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
+          repo = "ido-completing-read-plus";
+          rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
+          sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
-          sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
+          sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
           name = "ido-completing-read-plus";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ cl-lib emacs s ];
         meta = {
           homepage = "https://melpa.org/#/ido-completing-read+";
           license = lib.licenses.free;
@@ -18620,16 +18603,16 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "3.16";
+        version = "4.3";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
-          repo = "ido-ubiquitous";
-          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
-          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
+          repo = "ido-completing-read-plus";
+          rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
+          sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
-          sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
+          sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz";
           name = "ido-ubiquitous";
         };
         packageRequires = [ cl-lib emacs ido-completing-read-plus ];
@@ -18872,12 +18855,12 @@
     imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-anywhere";
-        version = "1.1.3";
+        version = "1.1.4";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "imenu-anywhere";
-          rev = "94bab9136e1264e98a10d9325ad53d735307f8f3";
-          sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j";
+          rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3";
+          sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere";
@@ -19040,12 +19023,12 @@
     importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "importmagic";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "135e049d763ceb4cabd0bab068c4c71452459065";
-          sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq";
+          rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5";
+          sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@@ -20675,12 +20658,12 @@
     kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kill-or-bury-alive";
-        version = "0.1.2";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "kill-or-bury-alive";
-          rev = "b488c3dbba657bbd524402f48fde16ab6b1211db";
-          sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5";
+          rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041";
+          sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@@ -21459,11 +21442,11 @@
     lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lms";
-        version = "0.6";
+        version = "0.7";
         src = fetchhg {
           url = "https://bitbucket.com/inigoserna/lms.el";
-          rev = "5f20620f62a1";
-          sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9";
+          rev = "f07ac3678e27";
+          sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms";
@@ -21692,13 +21675,13 @@
         version = "2.1";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
-          repo = "osx-pseudo-daemon";
+          repo = "mac-pseudo-daemon";
           rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
           sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon";
-          sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon";
+          sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0";
           name = "mac-pseudo-daemon";
         };
         packageRequires = [ cl-lib ];
@@ -21924,6 +21907,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-imerge";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-imerge";
+          rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c";
+          sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
+          sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4";
+          name = "magit-imerge";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-imerge";
+          license = lib.licenses.free;
+        };
+      }) {};
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
@@ -22050,22 +22054,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
+    magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "magithub";
-        version = "0.1.2";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "283bde94b3fe5cd8f4634887812c58eaf55aef60";
-          sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7";
+          rev = "959e7b259697c79ccf46b95827575d3e15e83d30";
+          sha256 = "19m7qmp5pi5l3mak1j475qxgnpr4kc4dm7qj80qc4m844bkacc4h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
           sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
           name = "magithub";
         };
-        packageRequires = [ emacs git-commit magit s with-editor ];
+        packageRequires = [ emacs ghub-plus magit s ];
         meta = {
           homepage = "https://melpa.org/#/magithub";
           license = lib.licenses.free;
@@ -22669,12 +22673,12 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "3.0.1";
+        version = "3.0.2";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537";
-          sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb";
+          rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6";
+          sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -24119,14 +24123,14 @@
         pname = "no-littering";
         version = "0.5.9";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "emacscollective";
           repo = "no-littering";
           rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82";
           sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
-          sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
+          sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh";
           name = "no-littering";
         };
         packageRequires = [ cl-lib ];
@@ -24638,12 +24642,12 @@
     obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "obfusurl";
-        version = "2.0";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "obfusurl.el";
-          rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e";
-          sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961";
+          rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5";
+          sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
@@ -24680,12 +24684,12 @@
     ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ocp-indent";
-        version = "1.6.0";
+        version = "1.6.1";
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "032599b162624a4b65c82c20be06433f24b00e8f";
-          sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f";
+          rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c";
+          sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -24743,12 +24747,12 @@
     olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "olivetti";
-        version = "1.5.6";
+        version = "1.5.7";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "olivetti";
-          rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef";
-          sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2";
+          rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8";
+          sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -24873,8 +24877,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "ad147956b936fd528d26ca88158a8af96ff5827a";
-          sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm";
+          rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e";
+          sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -26299,13 +26303,13 @@
         version = "2.1";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
-          repo = "osx-pseudo-daemon";
+          repo = "mac-pseudo-daemon";
           rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
           sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon";
-          sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon";
+          sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z";
           name = "osx-pseudo-daemon";
         };
         packageRequires = [];
@@ -26655,14 +26659,14 @@
         pname = "packed";
         version = "2.0.1";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "emacscollective";
           repo = "packed";
           rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1";
           sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
-          sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed";
+          sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd";
           name = "packed";
         };
         packageRequires = [ dash emacs ];
@@ -27277,6 +27281,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pelican-mode";
+        version = "20170808";
+        src = fetchgit {
+          url = "https://git.korewanetadesu.com/pelican-mode.git";
+          rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c";
+          sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
+          sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi";
+          name = "pelican-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pelican-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "per-buffer-theme";
@@ -28599,12 +28623,12 @@
     protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protobuf-mode";
-        version = "3.3.2";
+        version = "3.4.0pre1";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "5532abc15b97f3489183b266b41844306052a3fa";
-          sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4";
+          rev = "3afcded28a6aa9c44adf801ca5bff2133fcf3030";
+          sha256 = "03m1fprfz6cwxijp5fls502g6g3svyz760bwwwnbvyx4carwzmsp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -29583,6 +29607,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "react-snippets";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "johnmastro";
+          repo = "react-snippets.el";
+          rev = "bfc4b68b81374a6a080240592641091a7e8a6d61";
+          sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets";
+          sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
+          name = "react-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/react-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
     real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "real-auto-save";
@@ -30237,12 +30282,12 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "0.1.4";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749";
-          sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9";
+          rev = "4a24c86a1873289538134fe431e544fa3e12e788";
+          sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -30447,12 +30492,12 @@
     ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-electric";
-        version = "2.2.3";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "ruby-electric.el";
-          rev = "dfb4b448a63ae749c74edf6415ad569d52cab904";
-          sha256 = "0z3whvjmxbyk7lrxl3z2lj1skacwd050b5jvpnw6gcdm2hr8mfbs";
+          rev = "d04313dbee42c0d1009558a7c9424e4ae8611908";
+          sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
@@ -30871,8 +30916,8 @@
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf";
-          sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw";
+          rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379";
+          sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -30991,12 +31036,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "1.7.1";
+        version = "1.8.0";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937";
-          sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c";
+          rev = "d1fd5d47aacba723631d5d374169a45ff2051c41";
+          sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -31558,12 +31603,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "0.0.8";
+        version = "0.0.9";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2";
-          sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd";
+          rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487";
+          sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -31663,12 +31708,12 @@
     simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simpleclip";
-        version = "1.0.2";
+        version = "1.0.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "simpleclip";
-          rev = "7deff873b79910496b4baf647cdb8dd5de63465a";
-          sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz";
+          rev = "d461c462c237cd896553adb468cd77499d0d26ad";
+          sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
@@ -33256,12 +33301,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "26e8b0615def4f0531682b8a849f55d330616ac1";
-          sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np";
+          rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f";
+          sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -34514,12 +34559,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "0.10";
+        version = "0.11";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8";
-          sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89";
+          rev = "541f73c779e72eb6ebcc6814a75771e91679875a";
+          sha256 = "1rjxn5pfryxbxsgfmmzidcs83azvzvzq0nnphbxmlxybp97wzimx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -34556,12 +34601,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "1.8";
+        version = "1.8.5";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4";
-          sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk";
+          rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4";
+          sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -34577,12 +34622,12 @@
     treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
     melpaBuild {
         pname = "treemacs-evil";
-        version = "1.8";
+        version = "1.8.5";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4";
-          sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk";
+          rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4";
+          sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -35315,6 +35360,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "vc-msg";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "vc-msg";
+          rev = "091f3cf15ecb35bb4dc5de1ef7229f78735d9aee";
+          sha256 = "0s129fzxhrr8pp4h0hkmxapnman67r0bdmbj8ys6r361na7h16hf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg";
+          sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9";
+          name = "vc-msg";
+        };
+        packageRequires = [ emacs popup ];
+        meta = {
+          homepage = "https://melpa.org/#/vc-msg";
+          license = lib.licenses.free;
+        };
+      }) {};
     vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vcomp";
@@ -36451,12 +36517,12 @@
     with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "with-simulated-input";
-        version = "2.0";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "with-simulated-input";
-          rev = "568bfb8e1d59a19cb309fd72a7ab0e9e51229e31";
-          sha256 = "1aa8ya5yzsijra7cf9rm80ffddv520kzm9rggw3nr3dj2sk03p8c";
+          rev = "9efeb236c8f6887a8591d6241962c37266d8e726";
+          sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
@@ -36532,6 +36598,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wordgen";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "wordgen.el";
+          rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d";
+          sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen";
+          sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m";
+          name = "wordgen";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/wordgen";
+          license = lib.licenses.free;
+        };
+      }) {};
     wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wordsmith-mode";
@@ -37015,6 +37102,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yarn-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "anachronic";
+          repo = "yarn-mode";
+          rev = "99891000efe31214b065fa9446cd5e68c5c42ed8";
+          sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode";
+          sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg";
+          name = "yarn-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/yarn-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yascroll";
@@ -37254,6 +37362,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    zephir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zephir-mode";
+        version = "0.3.3";
+        src = fetchFromGitHub {
+          owner = "sergeyklay";
+          repo = "zephir-mode";
+          rev = "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c";
+          sha256 = "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
+          sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j";
+          name = "zephir-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/zephir-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";

From b43888b973390852ddbcfa6d262f21fc9dc7795d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 9 Aug 2017 17:14:51 -0400
Subject: [PATCH 1788/3246] melpa-packages: 2017-08-09

Removals:
 - aurora-config-mode: removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 2106 ++++++++++-------
 1 file changed, 1216 insertions(+), 890 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 8caa31c5dad..ce7c1845d59 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -169,12 +169,12 @@
     abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abyss-theme";
-        version = "20160420.512";
+        version = "20170808.645";
         src = fetchFromGitHub {
           owner = "mgrbyte";
           repo = "emacs-abyss-theme";
-          rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc";
-          sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia";
+          rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14";
+          sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme";
@@ -822,8 +822,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
+          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1095,8 +1095,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ace-popup-menu";
-          rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d";
-          sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c";
+          rev = "15ee28a9dcf025f30626313ebd376c0586013c8e";
+          sha256 = "187j3ixxrxkbja8xy7xgxpsx0ngwmn55gw0rnvlpj2pyz8vl192q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu";
@@ -1112,12 +1112,12 @@
     ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-window";
-        version = "20170421.428";
+        version = "20170801.1334";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "0a59342b7aafa9f89b477b0cc28f41a1abb8096c";
-          sha256 = "05wkd93lm7mp5s3bgjqg6cq70dz5429cj27bj0pmls8nbzmyc5bw";
+          rev = "6aaf1e634414e7485b47ff94aac6c34588f2a371";
+          sha256 = "1dmb4q1xgf5mk4riihk2mmn7k182y9j1amcr8m2dmdw0hrgvsfcd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1487,12 +1487,12 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "alchemist";
-        version = "20170614.218";
+        version = "20170803.414";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "38c0d2a21e3fedf71eda5f21f51aa79a0fddeb3b";
-          sha256 = "1hvkx35hjnpj8jfl41b510mcqfcxbv5msc8zmvd7jmdfx5gcn2d7";
+          rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57";
+          sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1508,12 +1508,12 @@
     alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alda-mode";
-        version = "20170629.2153";
+        version = "20170803.1852";
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "24f2495ab209f8f00b7883285637e207b6f07201";
-          sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm";
+          rev = "08556b3050c0bfc2d8f0a6d918610dbb2b85958f";
+          sha256 = "1f2m7pz3l62gk5ndfh49hm87ihz0lfk28izps9j3i68h4zclk3ls";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1794,8 +1794,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "1e7c9322c1ef395c4c4585bb29f5a421f2aa3077";
-          sha256 = "1bb090n8nz8vacspihvnq37dx8knjgnarjbx5r4mqy9bp1v8i52p";
+          rev = "0f9576791b86e0b315447e6823b3a7db131cd826";
+          sha256 = "1qqh1gg4sanh0vi624gys9wdncmvc92kly4zlwl6a9jhi3sr7w3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2894,12 +2894,12 @@
     async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "async";
-        version = "20170610.2241";
+        version = "20170804.2158";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "d6222c2959caaca5c4980038756097da8a51e505";
-          sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn";
+          rev = "d395e92d2a12e8b944ccfcdc1330c8665a3187f5";
+          sha256 = "03n93cwbwrbs73kv2ysgc1qw6as8wd2q5cl743zb58y6h74kshv0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -2978,12 +2978,12 @@
     atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "atom-one-dark-theme";
-        version = "20170117.1905";
+        version = "20170803.916";
         src = fetchFromGitHub {
           owner = "jonathanchu";
           repo = "atom-one-dark-theme";
-          rev = "44903ab7c349ef225499d642f249b6dfef5c5161";
-          sha256 = "0cjp2p018xsj3sx46adrlsc3zksph4hgkn2gdqb3w8illgzp9nyp";
+          rev = "6ad96e25f8b46942380afbc33e3659a5e9fa09b1";
+          sha256 = "06gf26r00yq1whrws9ilra8l2xfg2x89vxbgx3vgbwlvwx9wcsm6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
@@ -3101,27 +3101,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "aurora-config-mode";
-        version = "20140520.203";
-        src = fetchFromGitHub {
-          owner = "bdd";
-          repo = "aurora-config-mode.el";
-          rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
-          sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode";
-          sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
-          name = "aurora-config-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/aurora-config-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
     melpaBuild {
         pname = "auth-password-store";
@@ -3207,16 +3186,16 @@
     auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
     melpaBuild {
         pname = "auto-compile";
-        version = "20170728.942";
+        version = "20170805.447";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "emacscollective";
           repo = "auto-compile";
-          rev = "c9786234bdc32237e6c304e6a7c917504370358d";
-          sha256 = "0x9vmq9q3hkljv2dz57q97szsv60sbiyp6bbzp3272ykz6snpj76";
+          rev = "ef7d0fb0ac902e40a5010f8c54d3fe1f279723ef";
+          sha256 = "11ha04cfs8pm3f23hy4v8cfkfzkhig2mapwyq4brjcrbrwpac9zp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile";
-          sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
+          sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf";
           name = "auto-compile";
         };
         packageRequires = [ emacs packed ];
@@ -3625,12 +3604,12 @@
     auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-package-update";
-        version = "20151025.2311";
+        version = "20170803.1005";
         src = fetchFromGitHub {
           owner = "rranelli";
           repo = "auto-package-update.el";
-          rev = "cdef79f9fc6f8347fdd05664978fb9a948ea0410";
-          sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
+          rev = "0b296970d09d7deb7f780cb041fcbc313d39aa5d";
+          sha256 = "1nicx2sjnmf3i7dlzi788rh2kjc7mj9q69knp3g2x72zxqy8x07d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update";
@@ -4044,12 +4023,12 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20170702.237";
+        version = "20170804.1135";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b";
-          sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7";
+          rev = "0ed6408f18bf13840f6f57638f86c3b9dfe4a07a";
+          sha256 = "0pjxjgk39n6spman4grqgw2r82idld7agmc4q2j4f2gp9a0k2bll";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -4090,8 +4069,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "avy-menu";
-          rev = "71b71e64900d0637e17013781042e086e9bf56e7";
-          sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial";
+          rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0";
+          sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu";
@@ -4424,12 +4403,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170718.1307";
+        version = "20170806.1329";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "06d54b58f2ea5c49507164d97e8837406484a274";
-          sha256 = "0a4xhq5y4vclv91zq83vb8irsvf0xly09y3zxvddyliy4bn3f8hi";
+          rev = "7b4e0dd8750e7a10fe446201e85346aeb18cca8e";
+          sha256 = "1wcdzq4smi0070inrr5pc4zi6rbyxrf1ba0pj206cq14nfvjywj5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4693,16 +4672,16 @@
     bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bbyac";
-        version = "20170127.516";
+        version = "20170809.444";
         src = fetchFromGitHub {
           owner = "baohaojun";
           repo = "bbyac";
-          rev = "4dfb1f7c7f0402a0abf45e00007edc2c7f98a25a";
-          sha256 = "0vm83ccr9q93z4cvnrzz0al5rpxm8zh9yysn5lja6g2474nm01wy";
+          rev = "3957374b970901ebd4a48509e97a8f78307cf1a5";
+          sha256 = "1psrrw1770v9bb3i8kgc2fjqm8r48fxfys13raww2pcl9fy2j199";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4409df77dca17b3f9556666a62ee924cb8794364/recipes/bbyac";
-          sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac";
+          sha256 = "1pb12b8xrcgyniwqc90z3kr3rq9kkzxjawwcz7xwzymq39fx0897";
           name = "bbyac";
         };
         packageRequires = [ browse-kill-ring cl-lib ];
@@ -4777,12 +4756,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "20170714.709";
+        version = "20170801.2308";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "6e489758708cf7797ab3619cfdccd7422615dcda";
-          sha256 = "0cjc9c2sr081b9nfspballb032h2809n1w3533v3ci8pcq82vq96";
+          rev = "f8357cb7516ff9d7f86c1e7306a74f812a72dcb4";
+          sha256 = "09n0810r00nli0jg1z3rcw8hpybsa5jxrh0gcg9n12hz5vyy3a36";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -5069,12 +5048,12 @@
     binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "binclock";
-        version = "20170725.121";
+        version = "20170802.416";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "binclock.el";
-          rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876";
-          sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk";
+          rev = "87042230d7f3fe3e9a77fae0dbab7d8f7e7794ad";
+          sha256 = "0bbcn3aif3qvmgbga7znivcbgn1n79278x7xvbha52zpj584xp8d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
@@ -5361,12 +5340,12 @@
     bliss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bliss-theme";
-        version = "20141115.2301";
+        version = "20170808.607";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-bliss-theme";
-          rev = "2c6922cb24118722819bea79a981f066039d34a3";
-          sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr";
+          rev = "c3cf6d8a666ab26909b7da158f9e94df71a5fbbf";
+          sha256 = "1bpyhsjfdjfa1iw9kv7fsl30vz48qllqgjg1rsxdl3vcripcbc9z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/bliss-theme";
@@ -5632,12 +5611,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20170709.1244";
+        version = "20170802.1256";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "d45fecf0aca62f977ceb3b725aa7b7625ae82f33";
-          sha256 = "1ma40xnbxdpb49c9w1i65g2q1hl0b731c2vagqazxw21ng36mf71";
+          rev = "d5c4e762fcfad605b95125d8422f0071494ddd91";
+          sha256 = "1px37ymsakw3yxpa32sw7q4vi1mkiphaz0qfbl02gwxigdylpzlr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5674,12 +5653,12 @@
     boron-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "boron-theme";
-        version = "20150117.952";
+        version = "20170808.608";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-boron-theme";
-          rev = "ea5873139424d6ca013b915876daf0399432015b";
-          sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb";
+          rev = "87ae1a765e07429fec25d2f29b004f84b52d2e0a";
+          sha256 = "1kdf71af1s67vshgwkdgi7swxx942i605awhmhrhdjbkra29v4yn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/boron-theme";
@@ -5695,12 +5674,12 @@
     boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "boxquote";
-        version = "20170418.835";
+        version = "20170802.417";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "boxquote.el";
-          rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883";
-          sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm";
+          rev = "7e47e0e2853bc1215739b2e28f260e9eed93b2c5";
+          sha256 = "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
@@ -5923,12 +5902,12 @@
     bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bshell";
-        version = "20170116.1117";
+        version = "20170806.1446";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "bshell";
-          rev = "0abd93439895851c1ad3037b0df7443e577ed1ba";
-          sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw";
+          rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68";
+          sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
@@ -6070,12 +6049,12 @@
     buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-manage";
-        version = "20170109.1220";
+        version = "20170806.1436";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "buffer-manage";
-          rev = "e320ae7e05803551d8b534aaee84cae6e53155e2";
-          sha256 = "1dns2ngvmyyyr2a0ww9af0s8yzhbgm1gqqlc6686b04wnj8gdphf";
+          rev = "df326e330ec6342648cc3c599155d7efc1eed5f9";
+          sha256 = "1y7k1d18a2w8jgqkbmzgvr4ws3yyymgphsnq0dmb3bi4a5q21n4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
@@ -6884,12 +6863,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20170801.117";
+        version = "20170807.607";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "486d9a6aa6aac64a9c53555ec69980be5f3ad366";
-          sha256 = "03rc80v44slqh4r9fdyl95mljcx4gspn1bij4kc1wzrs5anf8dig";
+          rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97";
+          sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -7282,12 +7261,12 @@
     ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ceylon-mode";
-        version = "20170626.1403";
+        version = "20170806.919";
         src = fetchFromGitHub {
           owner = "lucaswerkmeister";
           repo = "ceylon-mode";
-          rev = "cd027d71a6cd29b94ba46919b4e067b86f267fc6";
-          sha256 = "06knyp3blini231ahlmkml3r0ypdajlz1dm41mwnzgcmg04x0s2h";
+          rev = "1267447a38648502627005bfad0a3aef3572ef7d";
+          sha256 = "1qj0dxfwh4yn9q01j22nq3ssg8l0s9v437l685gfly3ac5fp83ry";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
@@ -7307,8 +7286,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "089803189dafa145564b37b2e9340da547ff7c0c";
-          sha256 = "07xd2pkz30nf09jv7vqb29n1vd3wc70p7j42f0zz22dcvx3iw2g3";
+          rev = "627b6c44e5af58a0b73503dc4c9f52c077c9136e";
+          sha256 = "1ai0czdrzm58gmzg9bkcp16wa05rpwxllf1dwblny77mpd9c0ain";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7342,12 +7321,54 @@
           license = lib.licenses.free;
         };
       }) {};
+    cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
+    melpaBuild {
+        pname = "cfml-mode";
+        version = "20170808.1635";
+        src = fetchFromGitHub {
+          owner = "am2605";
+          repo = "cfml-mode";
+          rev = "5f97dd05d73d33975503d52daafb83af41b152ae";
+          sha256 = "04dwxznm723arh9yrn1cvbaj6rnng5a5dk6ic9nw5ndmpqi3fnj8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode";
+          sha256 = "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp";
+          name = "cfml-mode";
+        };
+        packageRequires = [ cftag-mode emacs mmm-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/cfml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cftag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cftag-mode";
+        version = "20170808.1635";
+        src = fetchFromGitHub {
+          owner = "am2605";
+          repo = "cfml-mode";
+          rev = "5f97dd05d73d33975503d52daafb83af41b152ae";
+          sha256 = "04dwxznm723arh9yrn1cvbaj6rnng5a5dk6ic9nw5ndmpqi3fnj8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode";
+          sha256 = "0qnq8h5nwhw464ax8qpbsvflpaar44zw0mh2y7kc358v27n3qy6c";
+          name = "cftag-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/cftag-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cg";
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12278";
+          rev = "12293";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7431,8 +7452,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "char-menu";
-          rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2";
-          sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj";
+          rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d";
+          sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu";
@@ -7490,12 +7511,12 @@
     cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cheat-sh";
-        version = "20170707.757";
+        version = "20170802.418";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "cheat-sh.el";
-          rev = "f61dc1ab9f0d6933dfda5366b8051217f1e9b491";
-          sha256 = "028xyflii2ah6ijhq4fpmzsaj1nhps90kprpy7x7a9v4s85yvadx";
+          rev = "e90445124f3f145a047779e42d070a3c5e150f70";
+          sha256 = "06avap8w833syhz7pdpsm73nbsgbwzmpagd7f3khzaf6r6c90jmn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
@@ -7658,12 +7679,12 @@
     chinese-conv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-conv";
-        version = "20160218.1315";
+        version = "20170807.1428";
         src = fetchFromGitHub {
           owner = "gucong";
           repo = "emacs-chinese-conv";
-          rev = "2e5ba28b24c32d8d1da81cf9877c79abbf2e9bbb";
-          sha256 = "1vfyb8gfrvfrvaaw0p7c6xji2kz6cqm6km2cmjixw0qjikxxlkv1";
+          rev = "b56815bbb163d642e97fa73093b5a7e87cc32574";
+          sha256 = "1bc3yn8y60y6a4vpqv39arn1pkcpl4s4n0sz9446f6m1lcal4c3r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a798158829f8fd84dd3e5e3ec5987d98ff54e641/recipes/chinese-conv";
@@ -7725,8 +7746,8 @@
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "pyim";
-          rev = "88adc57d754c9aecc922fe8b29239148f2b6557c";
-          sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v";
+          rev = "1f40c4341a886ec952de14f642f07ccce90670b2";
+          sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim";
@@ -7891,8 +7912,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "71f737d444da95c6175b513d500c56ae9711bbd0";
-          sha256 = "0z2djw2y0rzpm256jqihv19hn9q8b7x2mga3h5r2gwzw803134y9";
+          rev = "9c3b1863a9e80cce672762fbbfeee98842da2a49";
+          sha256 = "0pn8hrwq5ahzj3gckhczs1q7nblsfhvg6vdd8c5y1ak4hhygp563";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8162,13 +8183,13 @@
         pname = "clang-format";
         version = "20170120.137";
         src = fetchsvn {
-          url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "309673";
+          url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
+          rev = "310509";
           sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
-          sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format";
+          sha256 = "1s7xbq1xczzz24gi6wlv9ihzs7cbsn3g16rrhdpxwaadagbasgk7";
           name = "clang-format";
         };
         packageRequires = [ cl-lib ];
@@ -8549,12 +8570,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170725.2307";
+        version = "20170807.1610";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613";
-          sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf";
+          rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172";
+          sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8574,8 +8595,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613";
-          sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf";
+          rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172";
+          sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8780,12 +8801,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20170730.546";
+        version = "20170804.430";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "7747ab37dfd678c3349d13ab8bcb9e5cff93c637";
-          sha256 = "1p9vn3jnk3j0l2xm818dijfh5wm8l6y4ir2xiq6pqxf9v3qrp2lv";
+          rev = "69cfce070ee9e23f45736aec7c92c7ce7c86b479";
+          sha256 = "05qh9pigc37446x4ivpsi5j1q22jyjnmky5ja72dajibfrdg3zjp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8805,8 +8826,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "748c192f8b8181f3df39ab4f6a07f25a45211c8f";
-          sha256 = "1l4xx4lbm9xlvkq80dij7sydh0vnaj97ad42qjll9afwp6galp2b";
+          rev = "92d16be9e6578600a273b338d003eb8908e5ed4e";
+          sha256 = "0qrji1wc2alj5x6saj1kz96x0m50qd4b6yhb1ks7fpdy977r4paa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9155,12 +9176,12 @@
     colonoscopy-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "colonoscopy-theme";
-        version = "20141115.2301";
+        version = "20170808.609";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-colonoscopy-theme";
-          rev = "7b873d7e7e091b71bf4fdd23ded19e261a1e3936";
-          sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6";
+          rev = "64bbb322b13dae91ce9f1e3581f836f94f800ead";
+          sha256 = "1r0is6zjkzikm565fvmj0gx8ms5ig9l5xihnka4fig7jy6ak33z5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/colonoscopy-theme";
@@ -9322,12 +9343,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170730.241";
+        version = "20170807.1724";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "51c95e37f02bc075a3d0d7a795dc7083ab57128b";
-          sha256 = "16jbf9h0x0vw1mly4x0zrqvzs6wg16jplgy43kcnr8sc1xbj16xy";
+          rev = "12da490d95bf2e64b62a2db27b88af6e6c823d6e";
+          sha256 = "1py4y6dgd2vygwyn5zcxfw0hbg4bsd4yi6dyas30649s868s3b3i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -10154,12 +10175,12 @@
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
-        version = "20170729.429";
+        version = "20170804.1202";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "1ab4b8e582450a1b1780e69c823d63c4622b8a1e";
-          sha256 = "0i64qm7y0c93ca3fsydinab9l4mgr1kd4m0l06871583w3brjirf";
+          rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4";
+          sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -10374,8 +10395,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
+          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10542,8 +10563,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6";
-          sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh";
+          rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
+          sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10626,8 +10647,8 @@
         src = fetchFromGitHub {
           owner = "necaris";
           repo = "conda.el";
-          rev = "0257cd83796c3bdc357b69c1ecaf6d7eb6e2bf53";
-          sha256 = "035srwyx94fp80f6rgkvx1vxlvaznsgp7zy5gcddvyazx1a1yj0s";
+          rev = "468a9090f3a41e4c14d23a3b7987defd27ccd799";
+          sha256 = "0bcjvqs3m5vwmixm745mp19sy0fkdpv080issqf97jqxh3arqh1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -10919,8 +10940,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "fc275339b57690d4157160ed22b7672d5382cbe7";
-          sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l";
+          rev = "9b071a8fb130fe8391d445706711bcc4de2b3998";
+          sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11418,12 +11439,12 @@
     crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "crux";
-        version = "20170626.632";
+        version = "20170801.1334";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "11096b95d1119847e746e4aae36c9de6163e5472";
-          sha256 = "0ykm3cm6yrwp4a1b5rjjg9wzdp37w2rnjg1cyg2q33k31p49ywrf";
+          rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f";
+          sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -11960,8 +11981,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "cyphejor";
-          rev = "d7842388a1872b165489624a1a68f536de97e28d";
-          sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2";
+          rev = "2d421507afead407f9daae694df254b160c4ff65";
+          sha256 = "0rshg8b2wvw285j4b8f68hp4ilfsk324yh4inshj19c9lkbgqp39";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor";
@@ -12002,8 +12023,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "c95ca9f21a3524718a83c3415bb7102a508154be";
-          sha256 = "1d1hrd57k23gg5sbm49y17a1ly55d0d07if2sm467sa0b12zk45m";
+          rev = "878cc63ece3d9721f36f15aeca74a270d496adf0";
+          sha256 = "094gss26440gikiq7d9bh7rmdy4bhnwq1bjdy7d8rr8d282x6ivm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12082,12 +12103,12 @@
     dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dad-joke";
-        version = "20170626.252";
+        version = "20170802.420";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "dad-joke.el";
-          rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9";
-          sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr";
+          rev = "973f66781bb4ccc01434d30bbff833cbbbfe1605";
+          sha256 = "0am97ls9z4awak4y78xhdyzbs93vwk5jks9c48lhjy7vq3vr21zf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
@@ -12103,12 +12124,12 @@
     dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dakrone-light-theme";
-        version = "20170724.1403";
+        version = "20170808.1440";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "dakrone-light-theme";
-          rev = "5f1d506a8047cf8790ab50baf08b539645af6299";
-          sha256 = "1kadp8h97zz26d3br0y9bakwi90c7rwgjya9z46m0mx9jjlpx5yw";
+          rev = "06f198dc8b4ca7421990b30a23d89c8e0b8c5de4";
+          sha256 = "01vqlsv44h2ah79c8jqv8vkqvgmhqx2w3qbq07l7fx3zkpgjfmpy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme";
@@ -12124,12 +12145,12 @@
     dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dakrone-theme";
-        version = "20140211.2045";
+        version = "20170801.1233";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "dakrone-theme";
-          rev = "281ac9f9080a94bf9dada2f40cdba58e50f94235";
-          sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy";
+          rev = "232ad1be5f3572dcbdf528f1655109aa355a6937";
+          sha256 = "0p51zni42hv090vv6mk9v0v88achmgxlsmlr40y8y6ng57w51r4s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dcc07077b47d7c710c7f2d4919d791ed16ed5b26/recipes/dakrone-theme";
@@ -12166,12 +12187,12 @@
     dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dante";
-        version = "20170726.1140";
+        version = "20170809.19";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "ac13c74b76aaf646af2bec9d01fe29f1725baac6";
-          sha256 = "1k51pm10qkp2svbzlajswgsyghad8v91djir6iyfdjl54qjhk56y";
+          rev = "57c66e4741505b1f1c8147d413064d05cabfa69e";
+          sha256 = "07g5x1shx6l1wn12jna4qr7ikn1d0whmksvgc5g2rj7p7j021yv9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12208,12 +12229,12 @@
     dark-krystal-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dark-krystal-theme";
-        version = "20141115.2301";
+        version = "20170808.600";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-dark-krystal-theme";
-          rev = "bcb3c4ccf17db541e319d60e2eca38a5b22d5664";
-          sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx";
+          rev = "79084b99665dc9ffb0ec62cc092349a5ecebebbc";
+          sha256 = "1d3cdsaba71qxdqrbj1jrlq8a0iw3h50l5grcdjvxixdnf5nsa4c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/dark-krystal-theme";
@@ -12917,17 +12938,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "deft";
         version = "20160610.1739";
-        src = fetchgit {
-          url = "git://jblevins.org/git/deft.git";
+        src = fetchFromGitHub {
+          owner = "jrblevin";
+          repo = "deft";
           rev = "86825cd420985112d9dd38060e0edb72b08c6dab";
           sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft";
-          sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
+          sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp";
           name = "deft";
         };
         packageRequires = [];
@@ -13107,11 +13130,11 @@
     dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }:
     melpaBuild {
         pname = "dic-lookup-w3m";
-        version = "20170427.732";
+        version = "20170803.354";
         src = fetchsvn {
           url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/";
-          rev = "97";
-          sha256 = "077iz1fsw22rhzlsigslx5k6hsk1xny3kikr4gcwdmjd28yh7nvg";
+          rev = "99";
+          sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m";
@@ -13403,8 +13426,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
-          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
+          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
+          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13420,12 +13443,12 @@
     dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-collapse";
-        version = "20170719.346";
+        version = "20170806.1203";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
-          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
+          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
+          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
@@ -13589,8 +13612,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
-          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
+          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
+          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13610,8 +13633,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
-          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
+          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
+          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13736,8 +13759,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
-          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
+          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
+          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13757,8 +13780,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
-          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
+          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
+          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13818,8 +13841,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
-          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
+          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
+          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13839,8 +13862,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
-          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
+          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
+          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13856,12 +13879,12 @@
     dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-single";
-        version = "20151230.1758";
+        version = "20170804.544";
         src = fetchFromGitHub {
           owner = "crocket";
           repo = "dired-single";
-          rev = "71ffc5decd048d3c420d9cdd5ac66e72ca18e934";
-          sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2";
+          rev = "0dcc645de6397bf12c33229de67a503e4490c618";
+          sha256 = "16073xjfx7cvv9g8dlyxwa4ca6x35vwarqq43mrl05nxcq0rfzv3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single";
@@ -13939,8 +13962,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
-          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
+          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
+          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14646,12 +14669,12 @@
     dna-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dna-mode";
-        version = "20130821.1105";
+        version = "20170804.114";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "dna-mode-el";
-          rev = "c3fed6b9d98deafbc1525d445a920b969120fe6a";
-          sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n";
+          rev = "471d374de22c33eaddd8e41dd8ae29753fab2f6a";
+          sha256 = "05zsaypyavyn7gs0jk63chkxkm2rl4nbrqgv6zxrbqcar7gv86am";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dna-mode";
@@ -14759,16 +14782,16 @@
     docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
     melpaBuild {
         pname = "docker-compose-mode";
-        version = "20170730.1527";
+        version = "20170808.58";
         src = fetchFromGitHub {
           owner = "meqif";
           repo = "docker-compose-mode";
-          rev = "a38b64aecd037556c91d9aef29f1d04496295f2b";
-          sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds";
+          rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c";
+          sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
-          sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
+          sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g";
           name = "docker-compose-mode";
         };
         packageRequires = [ dash emacs yaml-mode ];
@@ -14906,12 +14929,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170727.1321";
+        version = "20170809.734";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "70e99c07e626774f52008cacb3f7fc18453d97ce";
-          sha256 = "160m5f05l32372i9qj611zmkf6bj5f7vnjprrkkx29ldz7f5pc0i";
+          rev = "1cc44b94bfe960de7c5fbae0bd18ef33433f4e00";
+          sha256 = "1axcyfwxxq0c2kixkmzw2lfhfcq97bgfajgawikk58p0hahdhxs9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15023,6 +15046,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dotnet";
+        version = "20170808.1423";
+        src = fetchFromGitHub {
+          owner = "julienXX";
+          repo = "dotnet.el";
+          rev = "514d36ec1090f78c999a7d6614176f03a0065a9d";
+          sha256 = "1cg5hmkay5zj7ax8dnwipy5vsx2vg3ragvqbzizv71qasyr5vyjh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet";
+          sha256 = "06k1ikwg9bis9kk4r41bm0a0d8a31wscqyr6n99d7836p1h4jfki";
+          name = "dotnet";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/dotnet";
+          license = lib.licenses.free;
+        };
+      }) {};
     download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "download-region";
@@ -15341,7 +15385,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1803635";
+          rev = "1804597";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15840,12 +15884,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170730.2031";
+        version = "20170807.501";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19";
-          sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md";
+          rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c";
+          sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15921,22 +15965,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+    ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "20170520.130";
+        version = "20170802.113";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1";
-          sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q";
+          rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83";
+          sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
-        packageRequires = [ emacs f ido-completing-read-plus ];
+        packageRequires = [ emacs f ];
         meta = {
           homepage = "https://melpa.org/#/ebal";
           license = lib.licenses.free;
@@ -16447,12 +16491,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20170725.1610";
+        version = "20170802.238";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "1884ac61c2d8045bbb96465df7e29b2c740c48ed";
-          sha256 = "1c8h7vndcf4dwp5zlwsdnw3mkmxmjifn7m660pnpxj52s2da3801";
+          rev = "1e75aa41aaf61ac26cd833635f9d61d44065a915";
+          sha256 = "11ym09hijk3dy445pn826r7ng27w2032id3h1pzk0nzfq9zxhwlk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16552,12 +16596,12 @@
     edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "edts";
-        version = "20170729.659";
+        version = "20170804.343";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
           repo = "edts";
-          rev = "b3508bc998cebd4946b591d61b0bb4d5a56ef704";
-          sha256 = "0r6g8pzf94n3h56fz933hq8jxf7chpj3kbgykj3ffabxkjxfn2rg";
+          rev = "42c69a845bfe1c123d6e2a773c22931892ab85ac";
+          sha256 = "0a629i2d6kjzmhrnji0x8320k93y8kwf7bb6r1acz83gh60smd3z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16602,12 +16646,12 @@
     eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eg";
-        version = "20170730.849";
+        version = "20170801.617";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "eg.el";
-          rev = "4d9fb8f2f4905c25aefd0759e89fa13cb994cdeb";
-          sha256 = "1d4lcf48m8ac2rmszx7l0nkmfr28fv2g3flwwpmb4zjkhz2k1gw0";
+          rev = "03177033ebaecd4e9888cad35951cf4c2addfc88";
+          sha256 = "0jf5fvakq6qvd351ad7lsx8j1xd70ygr582abksp3pgd88sn0r2q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
@@ -16726,12 +16770,12 @@
     ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170725.1457";
+        version = "20170803.629";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "4f5f29d3516d687025ad9423dc98bcd202efed56";
-          sha256 = "17243a77m7y4abiwscf885wmci1mkln4axay49f44cyfcj3fk2i2";
+          rev = "f47f020336f5ee32bfe7d27c53f6ca10eee2bc16";
+          sha256 = "0lpmg05yfza0c4bgj9gjgz3d48pnizvsjjdk3qdw6sz748k9k415";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16932,12 +16976,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170723.19";
+        version = "20170729.1712";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "cc26f37e19ebc60ca75067115d3794cda88003c5";
-          sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w";
+          rev = "f598a7537710f929c6f7592d8c543768361ba0de";
+          sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -17119,12 +17163,12 @@
     el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el2org";
-        version = "20170502.550";
+        version = "20170804.2142";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "el2org";
-          rev = "c85837d56ed8fe1b31927755294db49ac46f443e";
-          sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6";
+          rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e";
+          sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
@@ -17607,12 +17651,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20170729.338";
+        version = "20170807.1924";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "e3fca6d8f5bc176de26d37fe9c1b3e129f79cab0";
-          sha256 = "1p30k2bws9r3j4dmdxin1dz31d751wyikqgyqs9wzcddk0cfrm46";
+          rev = "4d44a51603b4004192d62fe58beb12c029709d89";
+          sha256 = "13rxgak84hqkqha86h75l1yvk9yk648sqk70pblbi0309g8sqb10";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17908,12 +17952,12 @@
     elscreen-buffer-group = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elscreen-buffer-group";
-        version = "20160105.803";
+        version = "20170808.1825";
         src = fetchFromGitHub {
           owner = "jeffgran";
           repo = "elscreen-buffer-group";
-          rev = "06ea9384a642ff5c3a93f36aee9f5d6b5c17657e";
-          sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz";
+          rev = "a3cd4d7eae3cca87bede4b39a46d3c0641f8cd06";
+          sha256 = "0flja2j5xqhxc0qrclnxcpyzvn7gyjynfpa3mp1hb250c313igy5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6fedb7b6ef58089da4b35ad115f699b4b24ff2/recipes/elscreen-buffer-group";
@@ -18013,12 +18057,12 @@
     elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elvish-mode";
-        version = "20170729.1702";
+        version = "20170808.1511";
         src = fetchFromGitHub {
           owner = "ALSchwalm";
           repo = "elvish-mode";
-          rev = "72ac8385c0dc923ce2385f1e8c4aee3f6ef99d1c";
-          sha256 = "0daw0wgd7rpdp78dsacw8kr2kcrhqg4082wdbzl14lyimpmzm4fy";
+          rev = "4511171f2d8ee01d8a7b76c64f552fe5258af79f";
+          sha256 = "0h4b6r3qbvcr1hgs2fiv3csq3iw11n0ilsv7dafn427gbadf0krf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode";
@@ -18055,16 +18099,16 @@
     elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elx";
-        version = "20170712.510";
+        version = "20170805.449";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "emacscollective";
           repo = "elx";
-          rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d";
-          sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq";
+          rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5";
+          sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx";
-          sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
+          sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz";
           name = "elx";
         };
         packageRequires = [ emacs ];
@@ -18160,12 +18204,12 @@
     emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql";
-        version = "20170410.1218";
+        version = "20170807.1901";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "1b37570bf5813e160fa18a766e20dfa690910519";
-          sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
+          rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
+          sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
@@ -18185,8 +18229,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "1b37570bf5813e160fa18a766e20dfa690910519";
-          sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
+          rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
+          sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
@@ -18206,8 +18250,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "1b37570bf5813e160fa18a766e20dfa690910519";
-          sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
+          rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
+          sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
@@ -18223,12 +18267,12 @@
     emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql-sqlite";
-        version = "20170410.1218";
+        version = "20170806.1551";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "1b37570bf5813e160fa18a766e20dfa690910519";
-          sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
+          rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
+          sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
@@ -18927,12 +18971,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170731.425";
+        version = "20170808.1134";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "6f6978d41126803ee61f614c91e791e6b5a36e38";
-          sha256 = "1acqi07n3yncv2mz2qm6c46b2381j1fjmmrrlcg3yb72inqr73y7";
+          rev = "08e6b4d98d1afeb637f27432349b4833320808a4";
+          sha256 = "0yr4bfp5shvm49qbr9k47ayglr7im65d0is770brjfbxcb68ry95";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19568,8 +19612,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "e25f673d520342bfe7cd479ef6b850a57f8ab1ea";
-          sha256 = "11gx8rqgxxnadgb1hizv6rdj7s9ib9m7bg8rm0ncvgrmykfaq8wm";
+          rev = "48e35d38d7625a10395b03edb4337668abaa4905";
+          sha256 = "15cq0gzczvin8xkdxrfj37819gx7hzdrcn5hx41q39cn1qzswxm2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19731,12 +19775,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170724.1307";
+        version = "20170803.1433";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "28f06589e07a22b7a1a1b19f79472c0bafb5fc32";
-          sha256 = "0413706dxmql9sl2rwi7y9pqdka73lnpqwn5cvl2y4r279hdppv3";
+          rev = "2e00707f42276b59fff2a32c64703e9586b22ae6";
+          sha256 = "0kcrca7f33020hxhx30vqdf21j1w32lvn28ys8g7gwa20nq05zb3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -19899,12 +19943,12 @@
     eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "eshell-fixed-prompt";
-        version = "20170108.1301";
+        version = "20170804.635";
         src = fetchFromGitHub {
           owner = "mallt";
           repo = "eshell-fixed-prompt-mode";
-          rev = "0b1d7cc05a7f59e8c06c321401cea86c6cb068af";
-          sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2";
+          rev = "4351b214de6d4e8e45279930448e2f93b491848e";
+          sha256 = "1zx3zn28m5dnvsnkpqd26szv9yzplnb6wyp9vfjfs3hnasrizbxc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt";
@@ -20399,12 +20443,12 @@
     euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "euslisp-mode";
-        version = "20170731.943";
+        version = "20170807.1433";
         src = fetchFromGitHub {
           owner = "iory";
           repo = "euslisp-mode";
-          rev = "e2c6506a4d333ceb99dc64c34944beb0b34431c8";
-          sha256 = "1knphaw3sw20wjvyqs9a1ppx0r04xif756ixxb2ymakhb8g0ifbh";
+          rev = "f64c117b62a3715c438bfd85851029c1b4a45748";
+          sha256 = "1fqasd25hgif1q9j6rxqqwyrqg48ykb5g12w34jsm8zgg50n43n0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode";
@@ -20546,12 +20590,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170726.912";
+        version = "20170802.1333";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f";
-          sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1";
+          rev = "45712ad214b0ad2257814705d6baa3f9120574cd";
+          sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20903,12 +20947,12 @@
     evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-goggles";
-        version = "20170724.211";
+        version = "20170808.404";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-goggles";
-          rev = "879114abeaad8515937cb2a762d0438b6b7bb026";
-          sha256 = "0zia2z0nvsxmplg1d6dy45dj5pkvak2wqn7dw10yb9bj0shfhjmv";
+          rev = "513ba2eb3ed7f579b9babeff0d2d0e0b0a37c69f";
+          sha256 = "0gq7wlix1zfvlcn901jcr10pfzphmsgmsymqq2pblc8d54nhv4wj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -21008,12 +21052,12 @@
     evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-lion";
-        version = "20170523.450";
+        version = "20170801.2232";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-lion";
-          rev = "79766bfb8cbaa82af92eb9c90ea370e10ff74ea4";
-          sha256 = "1799gjd1qj6hdzdy88x7lw0xwygkh70zm0y5gkhlmn4rzkdka9j1";
+          rev = "6667fe9891350b00596a8a335a68261c1f5ab504";
+          sha256 = "1j3xy7b0b0rf1zznqjgd9gw1369w75h7i0kgmwgngn8xg5w9jl9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
@@ -21281,12 +21325,12 @@
     evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "evil-org";
-        version = "20170724.752";
+        version = "20170802.1428";
         src = fetchFromGitHub {
           owner = "Somelauw";
           repo = "evil-org-mode";
-          rev = "fc21477b2ac12b570c8428808f334d467a617e86";
-          sha256 = "0fqk11mq4l7q7c5dv8049pmsggh3cmy4fhhq7c6h36dij02fkf01";
+          rev = "1725325eae0e3bf3609cb1a86effaa790afcc5de";
+          sha256 = "0r9n7yqj9fdcqpz99fwjnln9w0w5lqhsgyipjvihb56plrrc2w8c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21411,8 +21455,8 @@
         src = fetchFromGitHub {
           owner = "naclander";
           repo = "evil-search-highlight-persist";
-          rev = "6e04a8c075f5fd62526d222447048faab8bfa187";
-          sha256 = "1ni1bila3kjqrjcn1sm6g6h2cmf1chrh4d8nj4qfjvkb12fkw6j6";
+          rev = "979d2dec58d3b9c5ca5fdf4bb802a0209913794e";
+          sha256 = "0ak8r7cgz5xnjyfg3w9mwxhvaw8ny3hy0i2bqn3vf5dps649iy7i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist";
@@ -21449,12 +21493,12 @@
     evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "20170702.302";
+        version = "20170806.1150";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "c50372d152b123fbf7bc26b49504505a22e82635";
-          sha256 = "1xvpjs91wr351gl0xb3fbbm4yhv2rcgbqcn8srw022a2snhrdw27";
+          rev = "e247d6980093633f04431967819bf10b0d23c59c";
+          sha256 = "1qv8f45g864vhx7k62gcsivmalq2vaqpvp1klc773d2y0k2b2w0n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21579,8 +21623,8 @@
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f";
-          sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1";
+          rev = "45712ad214b0ad2257814705d6baa3f9120574cd";
+          sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -21886,6 +21930,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "exotica-theme";
+        version = "20170809.558";
+        src = fetchFromGitHub {
+          owner = "jbharat";
+          repo = "exotica-theme";
+          rev = "fbb34138ec48d505ac64e8141590f87777d82c2b";
+          sha256 = "03k6vj4ckgccfrl906v0fpwxvp5gzkcsd3iy8k7h11jdbyhlbb3m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
+          sha256 = "1fzf1zpllkddkq02hvabbi2bh6rnanlyinb6fjwsyh39wvzhsfhs";
+          name = "exotica-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/exotica-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "expand-line";
@@ -22015,12 +22080,12 @@
     exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170708.1735";
+        version = "20170809.413";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5";
-          sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds";
+          rev = "6adaee93a4f84806cf197dae872f00039a3ca87e";
+          sha256 = "04h8qjlvcnafs6771k4k2fsrg36j7b30dfmb9whrggs0lmsb5agq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -22742,8 +22807,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elisp-finalize";
-          rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27";
-          sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79";
+          rev = "0496a7b8f2f8b197010d8602b5fc529f5104704a";
+          sha256 = "1canhfvqjkm0bbr9g50pi0cibhq3mf7g79k2m18d8zarc9jljrjm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
@@ -22986,12 +23051,12 @@
     firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "firecode-theme";
-        version = "20141115.2302";
+        version = "20170808.611";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-firecode-theme";
-          rev = "73573192e5e9d14d94dfc5131dd2b7a780b89626";
-          sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm";
+          rev = "8b7b03ecdd41e70dab145b98906017e1392eaef4";
+          sha256 = "1vrpnv7555mbsksflgdkg7hc65fjcyzvzv2261y043rlh2qrn0sy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/firecode-theme";
@@ -23114,8 +23179,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "fix-input";
-          rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3";
-          sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z";
+          rev = "a0fd233bba6206854c5d7365d7182aaae842f210";
+          sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input";
@@ -23156,8 +23221,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "fix-word";
-          rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338";
-          sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412";
+          rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77";
+          sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word";
@@ -23243,12 +23308,12 @@
     flatland-black-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flatland-black-theme";
-        version = "20141115.2230";
+        version = "20170808.612";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-flatland-black-theme";
-          rev = "75fc4f1815feb23563a60477c02d70326b45c59e";
-          sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1";
+          rev = "348c5d5fe615e6ea13cadc17f046e506e789ce07";
+          sha256 = "1g5jqxdk35ahx8qk4vi7whhcpi1qp7rbbjgiih974fs59cg5iki0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/flatland-black-theme";
@@ -23429,12 +23494,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "20170725.127";
+        version = "20170802.1500";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0";
-          sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b";
+          rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f";
+          sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -23555,12 +23620,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170730.1740";
+        version = "20170802.22";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "c451140ef785dd7853445121866f9ea45889255b";
-          sha256 = "0vnpnv7kcbgdrpnqw9mb3qn5lzi4493k8b5jwwl6rz5hrl84yrx3";
+          rev = "ed08ce36e5cc97cfabb84ccaba84a00db917f082";
+          sha256 = "1r6lrxc8wv73fh4ybq83awci92ajrbgila8b86vxgvhvhl8jcj6d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24231,8 +24296,8 @@
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "flycheck-inline";
-          rev = "d24e3772b0ac6e40306ff25cebd7c6add696d54c";
-          sha256 = "0hgcgyjrbdqsgf54wa3j6mkq41nq28n2hyysdgfgnn4kd2jmri40";
+          rev = "624957ec04164f03656bf2d0a5ccd6d2b013f545";
+          sha256 = "1qrwci7d5g3c3s2z888hydsa22hhiwlarq3im8w2crlzx5lhnbz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ad3925576719f34682f65867fd5bbbc97818870/recipes/flycheck-inline";
@@ -24602,6 +24667,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "flycheck-popup-tip";
+        version = "20170730.651";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-popup-tip";
+          rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c";
+          sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
+          sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx";
+          name = "flycheck-popup-tip";
+        };
+        packageRequires = [ emacs flycheck popup ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-popup-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "flycheck-pos-tip";
@@ -24714,8 +24800,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
+          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24924,8 +25010,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6";
-          sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh";
+          rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
+          sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25487,12 +25573,12 @@
     flymake-solidity = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-solidity";
-        version = "20160424.720";
+        version = "20170804.2344";
         src = fetchFromGitHub {
           owner = "kootenpv";
           repo = "flymake-solidity";
-          rev = "b9a9aa78b84b2358c24a73a84fcd3d133a0423f1";
-          sha256 = "06ndpccsqrnfgxpgsywgq81ykkxchm2dp0q2617klbihwngfr8w4";
+          rev = "48bfe9525f764d8a68cc0270905dbf45bfd00bb8";
+          sha256 = "0v8sf5m0mygqahjyadxgffdf7p59wb0qnghyxajhc69sbg58hnnd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b13f57b77f6648336a049a8dda37757d4dafd90/recipes/flymake-solidity";
@@ -26359,22 +26445,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "frames-only-mode";
-        version = "20170129.120";
+        version = "20170802.455";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "frames-only-mode";
-          rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28";
-          sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v";
+          rev = "dbe2725846ab9d90b309fe0f5e303e600a7d1661";
+          sha256 = "0c6xq2l9hzw2gavnwzwp5gg7nzvf7dl1x8qh7aabchd4a8c050rb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
           sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h";
           name = "frames-only-mode";
         };
-        packageRequires = [ emacs seq ];
+        packageRequires = [ dash emacs s ];
         meta = {
           homepage = "https://melpa.org/#/frames-only-mode";
           license = lib.licenses.free;
@@ -26517,12 +26603,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170730.1659";
+        version = "20170809.146";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "f521a27332898aecf5b2ee710d67e1bcca380641";
-          sha256 = "07lbjdiqyazvylk4ddb9789kyrnlllhnf67c770lsaagxn69scks";
+          rev = "6e21d45c29dd03e6e6ec5d43f95b7a81832c3ca9";
+          sha256 = "0fzc9b87qlp5phr9gxylnfsi2749zgcs5aqabqdc3fpqqhb7hhy1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26543,18 +26629,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fuel";
-        version = "20170709.139";
-        src = fetchgit {
-          url = "git://factorcode.org/git/factor.git";
-          rev = "bfd830f6b4b4c01a64a287395ea62d8e671b0891";
-          sha256 = "1xnh1qp8gmn6g9sm0l1sh8k9j9x3y0vns8h5wh1i22bs420rl1w3";
+        version = "20170805.2030";
+        src = fetchFromGitHub {
+          owner = "factor";
+          repo = "factor";
+          rev = "3faad21b3d02fe81a2c0fae13ed14ad6652accc1";
+          sha256 = "14h2mwg0ny3mn7hjqgb9r5661ar2jwamz90v69bx0kz0lmr9drmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
-          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
+          sha256 = "08hzzg5dhqkl5c5lfhwcwmx8m8z3k1nxshn2wlpqf5gch8f2nj6z";
           name = "fuel";
         };
         packageRequires = [ cl-lib emacs ];
@@ -26629,12 +26716,12 @@
     function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "function-args";
-        version = "20170303.515";
+        version = "20170809.1011";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "function-args";
-          rev = "a559041e5fed851c889bcfed7553a4dcd855ffae";
-          sha256 = "0cc9djbsr3i5w9zsiblk1f9y45czkiwjmn32kzf3fni4rxwvc8xk";
+          rev = "00a73c8ca4e6fd1eb5ea84e6fc9b277694713ba5";
+          sha256 = "1higgnmrpp307vl9zb4qd40dcch9mwqmln1wv6v0a2kvzhd8nd21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
@@ -26675,8 +26762,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "68037c3af786aad0a605847278393babd0095203";
-          sha256 = "180hxfh1igkhfnwd5613gvnqk1rmsncfyi28yd0plqryi3495822";
+          rev = "0a1ca0538cc8a72f6065140b893001d5ec9d04b3";
+          sha256 = "0i4rm8zkfa0d3arfwvhwbzxkbflhccj5202rqmgmjvkg18skl5l5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26938,12 +27025,12 @@
     geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geben";
-        version = "20170620.2012";
+        version = "20170801.551";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben";
-          rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc";
-          sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg";
+          rev = "ec3f5e9376cf1ea5615990bd8c212543d57f033b";
+          sha256 = "0860nnarbm76jp40v7p5d2wdnq12p03paiw17g3h5p27wnaj611d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -27005,8 +27092,8 @@
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd";
-          sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77";
+          rev = "dd08e3d83d070eb8d041d66217b4591a55729024";
+          sha256 = "1mchrrrygwxy2ivnh7zfv0bqqvwinh61b5204yvivw303rfyc2iy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -27316,12 +27403,12 @@
     ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub";
-        version = "20170728.849";
+        version = "20170803.601";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "e85479bf048e06740331234a67c07bcdb3e294c4";
-          sha256 = "1sh8cwaaxlg0ja59lg70hl1lyhl9i7bfkamq3qz7kl2913axnzw2";
+          rev = "887ba91d724c656c35fed3eecd2e7d826553ff91";
+          sha256 = "1ngin66i3rn0j9wz1lhc8nh1saka924ilnw4r91pkr7gsyd3c20s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
@@ -27337,12 +27424,12 @@
     ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub-plus";
-        version = "20170517.1445";
+        version = "20170806.1323";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "ghub-plus";
-          rev = "07bd117a77d2f2de88facfa18b839c5c8bd5a423";
-          sha256 = "04k3xvs33vv3g01ah16bc4l6f3ym4w16i9bk5q2s4f1xh4lad3jn";
+          rev = "153c194718abc74a49078b056c87959a39b35627";
+          sha256 = "08svh16jdiz3rirk2wba6gwf8m3hhrhazlyb7idn4y22zc0am254";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -27358,12 +27445,12 @@
     gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gift-mode";
-        version = "20170603.906";
+        version = "20170809.130";
         src = fetchFromGitHub {
           owner = "csrhodes";
           repo = "gift-mode";
-          rev = "0d6adae976ee0831877d4bf237090ff67fb76e1d";
-          sha256 = "1ld367qvyn7700mry24j4ywmanaknpwgfmq18h72sn408z9vsalc";
+          rev = "573e4a8001e9585d347a99323a1649c2055ae5ff";
+          sha256 = "0qhhgwhj5nghlq5nrz7ycy2y5s1q10xzsahlh41fm5givm0rb650";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode";
@@ -27530,8 +27617,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4";
-          sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b";
+          rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d";
+          sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -29124,8 +29211,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "6c8669edb20249cd5534c78cfb48e7cf0978dda3";
-          sha256 = "096jmch5wqzal8qd6f72bsh0wi1fwlmjsis4n888942mq84vk8jw";
+          rev = "77f7f28d314862754877bf19a8b032158522f7aa";
+          sha256 = "0354zk5j5fgin66vc9m63ca272bfq3vlqj5v34xqz26lqs3fpdb2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -29391,12 +29478,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20170629.1129";
+        version = "20170801.942";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "fb0cb14954e799dfa69d1aaf56e863db48c2c296";
-          sha256 = "076bdkswajjzxb1jhwq71rwz8pn9klxk68r2ldab3pk9wlih4adn";
+          rev = "2cad15190b417804d82edb4981e7b3e62907c4ee";
+          sha256 = "12zssdd23hm5l27lja8q8b78wzq8zwzx8sxpqaqsm53bq6w23jmp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29412,12 +29499,12 @@
     govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "govet";
-        version = "20150428.1159";
+        version = "20170808.1024";
         src = fetchFromGitHub {
           owner = "meshelton";
           repo = "govet";
-          rev = "736f11850f2d1d62bd417fb57d4f8bb55a176b70";
-          sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb";
+          rev = "1c05817cf8b96589076c7ac4e52ee58a860a0cbf";
+          sha256 = "1n223i87xmk8p8h8dswnhhvazy0z53dzl36gmk9y7ck8bd9vz706";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e4a5f5031c76056d8f1b64b27a39a512c7c59cd/recipes/govet";
@@ -29521,8 +29608,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "785067783c93278de73cf4abe7fbf29b59b1f686";
-          sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv";
+          rev = "5a80ee1f6d026d6bf89320fcbe2b47f253c905a7";
+          sha256 = "1312sfr0nyl8bd2rjjm27l7x2hx9mby70bay0zyhyqznj12hlwpq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29881,12 +29968,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170731.150";
+        version = "20170808.1211";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "785067783c93278de73cf4abe7fbf29b59b1f686";
-          sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv";
+          rev = "5a80ee1f6d026d6bf89320fcbe2b47f253c905a7";
+          sha256 = "1312sfr0nyl8bd2rjjm27l7x2hx9mby70bay0zyhyqznj12hlwpq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29944,12 +30031,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20170730.1820";
+        version = "20170809.719";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "813a2165b993014d6a3d02abfd077d711f7372fe";
-          sha256 = "1hwv7jqmigwnwdq50dlbi1i8ddq33qi40jhfynh8855kz0c2gqh9";
+          rev = "061bad7cbb939540a559b412b1cf2df25b45cbff";
+          sha256 = "0wrqjmdipg515idi385d2yk0vxsq5dkdd0qg743ia90kndcfbwda";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -30091,12 +30178,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170702.724";
+        version = "20170803.703";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f";
-          sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi";
+          rev = "f85e1bc2666a9d668c808984757862c9aa93d269";
+          sha256 = "00iggj2vnjf3sy276mq79ia86ll83p9g426miy3n6ig8pr333sz4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30661,8 +30748,8 @@
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-extensions";
-          rev = "5a57a6401f6625640f46d8f8d540ecddf52bb12d";
-          sha256 = "1262kddcn3jr758s6wv15q3bh8j160q4m8nz2pbv2prabg0csz5n";
+          rev = "f0c6a4d07bd18b39010a4bc28340aff4ceebf785";
+          sha256 = "15926zw2sj180svn53fmb1x8x8aw7754anbaxb8xbcpg2zrkspbh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -30864,12 +30951,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170731.1225";
+        version = "20170809.345";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de";
-          sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw";
+          rev = "35149d27981f0d617ee84d05f7e91ced22b43302";
+          sha256 = "0kcdfh9hwkyirfb77hls8xyg1xx5vxxiid921zlxyd42mq2bq0rh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31032,12 +31119,12 @@
     helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-backup";
-        version = "20170625.328";
+        version = "20170807.1239";
         src = fetchFromGitHub {
           owner = "antham";
           repo = "helm-backup";
-          rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4";
-          sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg";
+          rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb";
+          sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -31074,12 +31161,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20170801.157";
+        version = "20170808.1124";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b";
-          sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl";
+          rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463";
+          sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -31473,12 +31560,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170727.1245";
+        version = "20170806.2108";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de";
-          sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw";
+          rev = "35149d27981f0d617ee84d05f7e91ced22b43302";
+          sha256 = "0kcdfh9hwkyirfb77hls8xyg1xx5vxxiid921zlxyd42mq2bq0rh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -32583,6 +32670,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-lastpass";
+        version = "20170808.511";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "helm-lastpass";
+          rev = "3d07a1d68586980ae33dd7f84be00eaace31f7d2";
+          sha256 = "1rn19hql62fgz1kiyxyw11h3h9m38nnhba9sghlrxj3wk11fm8gs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass";
+          sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57";
+          name = "helm-lastpass";
+        };
+        packageRequires = [ csv emacs helm-core ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-lastpass";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-lobsters";
@@ -32858,12 +32966,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170726.1718";
+        version = "20170807.611";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "58690a15a06f7dc645175f1b34c9e099ac68f018";
-          sha256 = "14z0ivi69ja9zd0qjpf98jp1x8skdp3a7w9yy2h9ffjhm2c7pgaf";
+          rev = "0bba7cdced06a93eefc9b04d05fdbddf08ad377f";
+          sha256 = "0r9l4q7h5zk8i5f5hac54pvlb0y0nyzqy996lv6r8y2a734angay";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -33366,8 +33474,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
+          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -34516,12 +34624,12 @@
     highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-parentheses";
-        version = "20151107.2316";
+        version = "20170809.1151";
         src = fetchFromGitHub {
           owner = "tsdh";
           repo = "highlight-parentheses.el";
-          rev = "a821a314942f409cd69660d816cd9a0aebd1ae8f";
-          sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r";
+          rev = "c38885bba4f174c0a2cad3a60fe12b7cf8699aa1";
+          sha256 = "0j3rv7cpvckbsdl7lppgdyxbbznqzds5hvjl1qfwip1plbc8vcb2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/highlight-parentheses";
@@ -34700,6 +34808,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
+    melpaBuild {
+        pname = "himp";
+        version = "20170808.1022";
+        src = fetchFromGitHub {
+          owner = "mkcms";
+          repo = "himp";
+          rev = "dcc116b2509a74a3fab41be1c095e1f6fffc7923";
+          sha256 = "00s4bb19jq48bldlcharym4757mbj0z5rag086p7mfhxa3wazmrm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp";
+          sha256 = "1igzlvm4g4rcnlvnwi5kn1jfvyrw2vnmp1kpvfnv7w9n6d8kflla";
+          name = "himp";
+        };
+        packageRequires = [ emacs vimish-fold ];
+        meta = {
+          homepage = "https://melpa.org/#/himp";
+          license = lib.licenses.free;
+        };
+      }) {};
     hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hindent";
@@ -34707,8 +34836,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "0721221ede01d6a3468e562fd7ea0df114de34e2";
-          sha256 = "09cyzvk1ixbmnd6wl8idxn0263mgsvcnh1742flvxa5wsbqm9f08";
+          rev = "dde17a134ae99bd3c6e9b98ed04ad1740c2cd00b";
+          sha256 = "1piyzinjz0khfpl96rgxg0f5yy4han16zqj7lcjd9xfzdx9rg4yg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -35054,12 +35183,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170729.742";
+        version = "20170807.1130";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "ace6725f72efd50556f52c359f7b1836b956fa2b";
-          sha256 = "1r7vww10dvv843zgmg62wwv2b6fw8nx73lsqzj5j01pi3zxz74vm";
+          rev = "fb314edbb193a1c640ae8f13c0373c7de26e2c8e";
+          sha256 = "1gq6f1dhfwsm1xk5952nxv8j67bz230pnswf9s1zp21drxwgdk20";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35703,12 +35832,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20170722.818";
+        version = "20170803.1319";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "943636fe4a35298d9d234222bc4520dec9ef2305";
-          sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg";
+          rev = "ab67b29835ed550427b75e94784b63d98a00c0e0";
+          sha256 = "0mlzgql5xrjgbk9f269jnf3kxvymlcwnlvak4dfk2gwvi56phjzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -36093,22 +36222,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20170719.119";
+        version = "20170807.1445";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
-          repo = "ido-ubiquitous";
-          rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9";
-          sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3";
+          repo = "ido-completing-read-plus";
+          rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
+          sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
-          sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
+          sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
           name = "ido-completing-read-plus";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ cl-lib emacs s ];
         meta = {
           homepage = "https://melpa.org/#/ido-completing-read+";
           license = lib.licenses.free;
@@ -36411,16 +36540,16 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20170718.1033";
+        version = "20170807.1445";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
-          repo = "ido-ubiquitous";
-          rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9";
-          sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3";
+          repo = "ido-completing-read-plus";
+          rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
+          sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
-          sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
+          sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz";
           name = "ido-ubiquitous";
         };
         packageRequires = [ cl-lib emacs ido-completing-read-plus ];
@@ -36764,12 +36893,12 @@
     imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-anywhere";
-        version = "20160831.356";
+        version = "20170805.1155";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "imenu-anywhere";
-          rev = "94bab9136e1264e98a10d9325ad53d735307f8f3";
-          sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j";
+          rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3";
+          sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere";
@@ -36996,8 +37125,8 @@
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c";
-          sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4";
+          rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5";
+          sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@@ -37034,12 +37163,12 @@
     indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
     melpaBuild {
         pname = "indent-tools";
-        version = "20170728.546";
+        version = "20170803.418";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "indent-tools";
-          rev = "565c0b984d19c62b7a85efd69ae195b592d62f7f";
-          sha256 = "0rqc1n4z2w5i48ma29mrbb90350kxfgzk0vf8wdnksa78ja87yyn";
+          rev = "8ea9f4bbe95a118801f8b6a1f5950e331b43876a";
+          sha256 = "0sb1c7gdm4ni1jcpb0rz3xgfgs45a8pi4nhks7cm2mly7rb7wvl0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
@@ -37076,12 +37205,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170728.1109";
+        version = "20170808.1327";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "a64f1ffc81539d40df9e89802bbebf14a0d19f83";
-          sha256 = "0cmh6mv319m4i2y89rl63z2k3634d4ldg18yy3aal44ljxrbdslq";
+          rev = "ee843f08cf6f862b298728103c142ce56824dfc4";
+          sha256 = "070yw07fcimblzy94pg1mvf7n5dv91wwq7kwyys4zkm92ypl874l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -37126,12 +37255,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170730.119";
+        version = "20170809.114";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "aaaeef6a4b1f41ebc3ab11ff28d6fa5938f762d4";
-          sha256 = "19qjamjpm96wwv4ni2lbzwrb73d5xwfkrq6lvy32k6rav5r7lx1d";
+          rev = "21d3e978652bcbb995954bf95e80c0ee4669701a";
+          sha256 = "0g0qs0znys123yr50ykhgiz505spar3q2cgsyn61ky44df2pl4ff";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -37272,10 +37401,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20170730.2148";
+        version = "20170807.2112";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "0xg4cw8s5ildc7iyyvy6xxri3cy00g06b10022izlhbxy7crdgai";
+          sha256 = "13l62fjq7g79s0ycj506fsvi16mmf1kqiqhbrj6f5n2j962k1qaf";
           name = "info+.el";
         };
         recipeFile = fetchurl {
@@ -37648,12 +37777,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170728.814";
+        version = "20170807.2147";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "28271d50ca65c460cd0983cea13a2c4509b95583";
-          sha256 = "0b73cwr68sdi5vc486952x0iv95hwyw79gymp91kyi558wxdssp3";
+          rev = "453d6d64c88df8ada4d6b9e4004c392d219e3799";
+          sha256 = "13wm0kz4ijl2smpw5ws5v97j19df5m9yw2iv4xgpcg4if9aby67y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -38272,12 +38401,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170728.1036";
+        version = "20170806.1231";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "fc275339b57690d4157160ed22b7672d5382cbe7";
-          sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l";
+          rev = "9b071a8fb130fe8391d445706711bcc4de2b3998";
+          sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38293,12 +38422,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20170801.157";
+        version = "20170808.1124";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b";
-          sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl";
+          rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463";
+          sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -38402,8 +38531,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "fc275339b57690d4157160ed22b7672d5382cbe7";
-          sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l";
+          rev = "9b071a8fb130fe8391d445706711bcc4de2b3998";
+          sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38507,8 +38636,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
+          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -39236,12 +39365,12 @@
     jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "jg-quicknav";
-        version = "20160216.2035";
+        version = "20170808.1830";
         src = fetchFromGitHub {
           owner = "jeffgran";
           repo = "jg-quicknav";
-          rev = "1b598ee3d691b68dc64f1727a959eab538893d07";
-          sha256 = "164wm83av3p2c9dkhpmqrb7plq9ngmnsa5aly3a1xam1cds22hp4";
+          rev = "c8d53e774d63e68a944092c08a026b57da741038";
+          sha256 = "0rdrryfppgj5smrds5gyyhc4z8x36aq3gxdpckq80rbl4s729chy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/jg-quicknav";
@@ -39465,12 +39594,12 @@
     js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-comint";
-        version = "20170627.1952";
+        version = "20170808.527";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "2c19fafed953ea0972ff086614f86614f4d5dc13";
-          sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp";
+          rev = "eb4744122724b24e492c2171fff438e3ee2045a8";
+          sha256 = "1bbzbv1dasqxkljq06qngb4l22x7gpgncz7jmn0pqixnhqj5k66y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
@@ -39591,12 +39720,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170721.602";
+        version = "20170804.335";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc";
-          sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy";
+          rev = "91c745ad062d454834f646dcd16be6856a1db8b3";
+          sha256 = "0qr2pd2zhhwl6jw8mqy25wnig9v9nicc7plan0ni4dlbhljrx3rh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -40027,6 +40156,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jump-tree";
+        version = "20170809.708";
+        src = fetchFromGitHub {
+          owner = "yangwen0228";
+          repo = "jump-tree";
+          rev = "ff010ee6acfa9bee2486dd7b3384c12a802b0191";
+          sha256 = "1w7sncr5gdlyqk3bvm7zjif5yxp9sa6v82kk5zx04qdbsn9dn308";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree";
+          sha256 = "1gknpwd1vjpd1jqpi2axhyi6sg4clarr32rfrfz6hi6kmzr848mj";
+          name = "jump-tree";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/jump-tree";
+          license = lib.licenses.free;
+        };
+      }) {};
     jumplist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jumplist";
@@ -40153,6 +40303,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    kaleidoscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "kaleidoscope";
+        version = "20170808.117";
+        src = fetchFromGitHub {
+          owner = "algernon";
+          repo = "kaleidoscope.el";
+          rev = "e932103e043bd1503bf5d98dd117ff6737b852bc";
+          sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope";
+          sha256 = "0nfz207rzpnni7jyzvdvz5lr0zcpzy278a86821cmw8d5l81a3yp";
+          name = "kaleidoscope";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "https://melpa.org/#/kaleidoscope";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kaleidoscope-evil-state-flash = callPackage ({ evil, fetchFromGitHub, fetchurl, kaleidoscope, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "kaleidoscope-evil-state-flash";
+        version = "20170728.320";
+        src = fetchFromGitHub {
+          owner = "algernon";
+          repo = "kaleidoscope.el";
+          rev = "e932103e043bd1503bf5d98dd117ff6737b852bc";
+          sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope-evil-state-flash";
+          sha256 = "17a4nmdi6h0z4va3kiw4ivaywiisblz6cicypk9d3g9sl92drcvq";
+          name = "kaleidoscope-evil-state-flash";
+        };
+        packageRequires = [ evil kaleidoscope s ];
+        meta = {
+          homepage = "https://melpa.org/#/kaleidoscope-evil-state-flash";
+          license = lib.licenses.free;
+        };
+      }) {};
     kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "kanban";
         version = "20170418.110";
@@ -40196,12 +40388,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170725.514";
+        version = "20170802.1135";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "96619e8c330dcb5a0b45bde1fb2a6697729d3541";
-          sha256 = "1i8jk2l703ikmkqb1lf6mvrldb05kfp6gnak26lpc9s7pb4m8mhn";
+          rev = "37b5b837051834cf7f8eb5b486d8b04b021433f3";
+          sha256 = "0bmzfc337pv3scs717yhyw0vsrp864s6l255afli0bd2hicncnaa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -40599,8 +40791,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "kill-or-bury-alive";
-          rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041";
-          sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq";
+          rev = "415de48695efd30163a015063873b03f4ca5b743";
+          sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@@ -40704,8 +40896,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "22aa73f55b5943fb464c3335978bf9b38daa39e1";
-          sha256 = "1imb37jmnybimyjl1j3fqja2yxjl8h7cn0pzkmchl6gv3yyw3w01";
+          rev = "4b77edeaf193c1e7dd2078b9516ce2cd20fe99f9";
+          sha256 = "0s1g1fkq0m68l7ly0i1jhf1jk7abpx0kiwgcv734gb4b2ddc625n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -41015,12 +41207,12 @@
     kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "kurecolor";
-        version = "20161016.1827";
+        version = "20170808.602";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "kurecolor";
-          rev = "2b2c6778d75ef90f42fdffbe3ba7e58fa661946a";
-          sha256 = "0zcqjphz2vad6jccw9z7fds8xmvv0vmgp7fi0d8i0i5fbhpwpfz7";
+          rev = "3e8b63e89e294179e42a14a4a357c29a72669a22";
+          sha256 = "0pj8252x5s61bwsfrhi5qvwk8jia3kc67r82v5m4a900zpmx3a7k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
@@ -41202,12 +41394,12 @@
     lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "lastpass";
-        version = "20170418.1102";
+        version = "20170801.1214";
         src = fetchFromGitHub {
           owner = "storvik";
           repo = "emacs-lastpass";
-          rev = "ff05ae82b1073759989616caf362c85575fdfc58";
-          sha256 = "1wsnb1w3q2b0lj6087njy0r5nnlyddrnqyxkbv6p6mbqin1zkahs";
+          rev = "a2c94ff358db43a977d02032ba84ee1008579522";
+          sha256 = "1nc21pf7cmbfidnilk6012h7124yxhkhzwim7yg95sqcmr8ws9js";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -41390,12 +41582,12 @@
     lavender-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lavender-theme";
-        version = "20141115.2302";
+        version = "20170808.613";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-lavender-theme";
-          rev = "d9e4d7838167a0e07fb5d04877a7b34c4b4cc1ee";
-          sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k";
+          rev = "ef5e959b95d7fb8152137bc186c4c24e986c1e3c";
+          sha256 = "0pbpns387fmalkakbdl2q7d2y720m7ai7mnydsinjwlkdrshvj4g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/lavender-theme";
@@ -42401,12 +42593,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170716.827";
+        version = "20170805.1249";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "cee63ee3591eb0f498ace801f1543a4bc6b58514";
-          sha256 = "1h6m8qixvl9mnj6lmkqwljvyv65c6yb683krxrrbs4nrsy41z6s3";
+          rev = "c1a2903fbe4c7212960c886143105caceb3faff2";
+          sha256 = "1xv5yid7hzja97lvsfycpw9ss2yd69dzvjp9a54xp79ydvxwcc0m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -42508,13 +42700,13 @@
         pname = "llvm-mode";
         version = "20150910.644";
         src = fetchgit {
-          url = "http://llvm.org/git/llvm";
-          rev = "ca05253041c3e241f3987b430771f5db8aa35806";
-          sha256 = "03w7w70hj7nrhr0hsrxfbi8hrmxrbbhi2rzmzzk6pv1r9l7krjbd";
+          url = "https://llvm.org/git/llvm";
+          rev = "c85760a9a3e892fb31ee1fab1e16393c5bb1ff1e";
+          sha256 = "0p7kja62xph1nmmpa4mbi3n8ipp5pjb8xvwbn6rfw3s2m8vmwjqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
-          sha256 = "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
+          sha256 = "0jxwa7gaxv9kkgjp87ggzlfqbf6xs19z0s9ycnv2h5hlxpnzrlnb";
           name = "llvm-mode";
         };
         packageRequires = [];
@@ -42526,11 +42718,11 @@
     lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lms";
-        version = "20170731.1219";
+        version = "20170804.922";
         src = fetchhg {
           url = "https://bitbucket.com/inigoserna/lms.el";
-          rev = "5f20620f62a1";
-          sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9";
+          rev = "f07ac3678e27";
+          sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms";
@@ -43199,13 +43391,13 @@
         version = "20170728.1240";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
-          repo = "osx-pseudo-daemon";
+          repo = "mac-pseudo-daemon";
           rev = "d235680a72677f11925b912428ad1a57b664e3e8";
           sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon";
-          sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon";
+          sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0";
           name = "mac-pseudo-daemon";
         };
         packageRequires = [ cl-lib ];
@@ -43362,12 +43554,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170731.914";
+        version = "20170803.828";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4";
-          sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b";
+          rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d";
+          sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43516,12 +43708,12 @@
     magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-imerge";
-        version = "20170725.1850";
+        version = "20170805.819";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-imerge";
-          rev = "ea578e8adf1ba2f98934660bd9db01cfc074b334";
-          sha256 = "06w281ir0iwlmcad26b2zkk08ympw190znsll9pdlcdvzyrsl5nl";
+          rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c";
+          sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
@@ -43583,8 +43775,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4";
-          sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b";
+          rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d";
+          sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43705,12 +43897,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "magithub";
-        version = "20170730.723";
+        version = "20170809.657";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "4ebcc6890ed53d789869da85a0bcb33c2b210801";
-          sha256 = "153pcx585hhinj10bsfa5hlzx6lr768dyrwsv3wm16wfli53p18v";
+          rev = "5c3eed698fcbae53399e8c9d7d728943a516adb7";
+          sha256 = "1jgc0w5mwy2pg51yhca4hdhrdqkv7k33pbj1151wgway2zil00yh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -43772,8 +43964,8 @@
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-mainline";
-          rev = "0e88f91e49ef27cb77d74f6a8d8140063549d67f";
-          sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5";
+          rev = "2ef3175854f5b6c85f2e1bed26507cdca2f6ad16";
+          sha256 = "1zkm51gp1lkaz6n8ixf31rwjqms49mi8qdq10a7nibdzivpj8mg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/main-line";
@@ -44259,12 +44451,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170731.1713";
+        version = "20170803.1101";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "884a72d9b69db4974e06d4a9c265b8fd607f7e31";
-          sha256 = "06hxl0bdc2pa3gzznczhxhrwzdk7p0abhsmg11yh1s6csw678qsm";
+          rev = "40dbc48c0db151b687d3a549df29c60383261089";
+          sha256 = "1jpc4yhiq6m8lyz0s26akbkd0ggnhky6i1c8711f1ci8rqm5ckha";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44725,12 +44917,12 @@
     mbo70s-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mbo70s-theme";
-        version = "20141122.642";
+        version = "20170808.615";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-mbo70s-theme";
-          rev = "d50414697760896dbe6b06d2a00c271c16e0e4a2";
-          sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z";
+          rev = "bed3db8965708ed4e9482b224a9b084765c052f2";
+          sha256 = "19hha9xwfqvdgsws69x0mcm93yfllp44hdl1xw9zlhj8f4ihizh5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8d0c1050b3319e136fe75903ae3612a52790189/recipes/mbo70s-theme";
@@ -44872,12 +45064,12 @@
     mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mellow-theme";
-        version = "20141115.2302";
+        version = "20170808.617";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-mellow-theme";
-          rev = "ab72898824af6452d0cefea16e49491e42b660d1";
-          sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld";
+          rev = "2bdf18f05f5212b6f269d9a94afe2cf201766891";
+          sha256 = "0cj9lkqgiaq1s2k9ky93jgv5pfbmjznsd54r3iqkiy1zshpkir68";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mellow-theme";
@@ -45021,8 +45213,8 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537";
-          sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb";
+          rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6";
+          sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -45267,12 +45459,12 @@
     midje-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "midje-mode";
-        version = "20150921.1750";
+        version = "20170808.2103";
         src = fetchFromGitHub {
           owner = "dnaumov";
           repo = "midje-mode";
-          rev = "07fc6cee4f5d6aa4187636266b9681a3e455ab6b";
-          sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg";
+          rev = "10ad5b6084cd03d5cd268b486a7c3c246d85535f";
+          sha256 = "0nag9ks7qbg40h9z954v42x8zi65wbgfhviwvxvb2bmbzv4m4pbs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/midje-mode";
@@ -45742,12 +45934,12 @@
     mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mmm-mode";
-        version = "20170220.1548";
+        version = "20170808.1814";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "mmm-mode";
-          rev = "631e7f12d1641cb40e650134f35f2680a1a310a1";
-          sha256 = "0lwvh7f6hmjfdgidshqz25pihyd5bg87y23mbhkjb7qkdjas07wb";
+          rev = "c68cee0beaeb99c5bd178fab6fec995bce4e501f";
+          sha256 = "1k13q5hwb2p2bq5j84pln9kx18bs2x9zfnzgqm4acrxjp9hnknlc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode";
@@ -45767,8 +45959,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "mmt";
-          rev = "1d89502ea4b0f6a7da327a95f104f5c11e662493";
-          sha256 = "1pqarm9gpzc5qyiqr2713q1xn1p20kl5shrmm77m150z4qfhxzhx";
+          rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392";
+          sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
@@ -45914,8 +46106,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "modalka";
-          rev = "70db2088c14884e9d93a1f987ee9bc2753ca5772";
-          sha256 = "07zqv6rm97kaxh0ii6n88yva7h3r3n8k6sssiy8hw6mf8817x44p";
+          rev = "7ee76939b9269c652f93065a8fcc7da24434a167";
+          sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -46679,12 +46871,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20170722.823";
+        version = "20170808.1745";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "a598b60c0f9a6a718ec712d6df5591d3cd7f23f3";
-          sha256 = "1pf6d2idq8sljkp7haxxqknvja4cj44i88difzs5wvkmdd2pvlh0";
+          rev = "316bd3a5916114e545d9ee26208cc82771cb7002";
+          sha256 = "1ff249bvppw9dnjqawc48yhf1vyvq8a54xm8808pak2crpn44zix";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -47054,12 +47246,12 @@
     mustard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mustard-theme";
-        version = "20141115.2302";
+        version = "20170808.619";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-mustard-theme";
-          rev = "33bc6e3a0e2abc5668afdb349bca7e8b5730582c";
-          sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf";
+          rev = "3b15d992c79590d7ea2503004e2a863b57e274b5";
+          sha256 = "01ak4ayk46jqawlbb9cqliiqhnn68cq27kryamibdpds8sq0ch83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mustard-theme";
@@ -48138,12 +48330,12 @@
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20170729.1816";
+        version = "20170805.1240";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "91fc75e8ceebf850bd2ec07522e744eef0b89098";
-          sha256 = "0margf3d0zg6nk5lf7s7dgf7qhx664jhk27wlsjnysm79d6d98f7";
+          rev = "26a20424a087b0de16004b1e0186060d08d6baac";
+          sha256 = "1m6kxhy6cvcwcv9j9l8wgkgqy56yqmnqdlwr3hp22vbancvqfl16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -48201,12 +48393,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20170520.553";
+        version = "20170809.1128";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "749f48b510d0fd47dac67850f4089119fbff142a";
-          sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25";
+          rev = "b922497ea0af39fdf1a7e856d0cd2ce81d98d76f";
+          sha256 = "1db0cjsq99b1z6786g3j8y39vj3gga7x6yzkilxdp7z6scs1qdwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -48226,8 +48418,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "a2778988f2b70a5f000202afa7213b553350c72e";
-          sha256 = "1iiy8sfdqqd2jz8lcccf0lpwxqaa5ppa47maic2gy2m7qxgw7418";
+          rev = "af765a8eab288eb638100e027b97a1d15e4e3026";
+          sha256 = "1mnzaa2c87pg12hgn5lfz1nxnyd8a9lfbar7imwr4jxih54ibdna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -48369,16 +48561,16 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170728.952";
+        version = "20170805.450";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "emacscollective";
           repo = "no-littering";
-          rev = "c1b3aa13f5311e1a7778f9cccd25680bbbf04c5f";
-          sha256 = "0rd3cr63vgy1xbbszdi87p7g55ypnq59gjqkmzfc69z0fv05d2fv";
+          rev = "d556a4cd3bfd3827c3d395ff6cd1e6086658589d";
+          sha256 = "0ybkiwidrmrnmf7sgd8vdfh5nhdi02yfw330rqr7xw5vf0k9fsap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
-          sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
+          sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh";
           name = "no-littering";
         };
         packageRequires = [ cl-lib ];
@@ -48394,8 +48586,8 @@
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "noaa";
-          rev = "1198eed7cf2960a5b91f8750a08c906c716b53ff";
-          sha256 = "1dvck23akkn6jffc86ddf951ksvq1w2nygji6qk5vkidcx5f4rnd";
+          rev = "a4ec583275450d718334238d2813579420229f65";
+          sha256 = "0ah6b31x9f4lc6q984nilj4g0aqzam5rhb3s61jgx9k4x7jmdks1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa";
@@ -48579,8 +48771,8 @@
         version = "20170720.301";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "4a101ec7aabef163ffbdafe1b0a732bb23b3b0bc";
-          sha256 = "172027wirk7gc4siy3f9zccm01iqjlfx0nk3s8pq7qg20cx0aa39";
+          rev = "0967e46475be71d39daf928c9370af20b416f102";
+          sha256 = "045xazhax0svalzr4hiv7yd0373q1dfdgq9mdk6avx6xdpk2fqcf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48825,12 +49017,12 @@
     numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "numbers";
-        version = "20170712.238";
+        version = "20170802.434";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "numbers.el";
-          rev = "74be68b94143f042ce461b2a69202f515acaf20c";
-          sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x";
+          rev = "dd02508b788a13b7d4dbcc4923fa23134b783ab3";
+          sha256 = "0bgha85j5f9lpk1h3siiw28v5sy6z52n7d7xi3m301r9hdlccc39";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers";
@@ -49391,12 +49583,12 @@
     ob-nim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-nim";
-        version = "20160830.220";
+        version = "20170809.1130";
         src = fetchFromGitHub {
           owner = "lompik";
           repo = "ob-nim";
-          rev = "050b165817e62067b0d686d96e25bc12fb9c7d84";
-          sha256 = "18v4f23rxbl76ldzxmga1dlkammdy87aslk2p6x9l5gjr9w1xz3a";
+          rev = "bf1642cb93f0a898804dc13fd9408d2964403bd2";
+          sha256 = "1xgi863wn1pvlsajmldd706k1dk7d7pa6b9nbgsh34kzchvhd75s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7263ebadeabe36359c14ffb36deda2bc75f2ca61/recipes/ob-nim";
@@ -49580,12 +49772,12 @@
     ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }:
     melpaBuild {
         pname = "ob-spice";
-        version = "20160815.2249";
+        version = "20170801.2222";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "ob-spice";
-          rev = "0ea589f852de4b1eb239c985be9f960367aa5c1a";
-          sha256 = "10cyqjqbv87n3d1m3v6vxlyk3xzazms6876ay30nhkd4dbsw8kak";
+          rev = "b296232e28f61366265084fafb2f47876d987069";
+          sha256 = "1s2jyx75xkqbkm9g4i3h1f0rz9ms5dbs7zqavdiswq9mr8qx1kwq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice";
@@ -49727,12 +49919,12 @@
     obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "obfusurl";
-        version = "20170325.802";
+        version = "20170809.824";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "obfusurl.el";
-          rev = "96c619fe4753062af93a12f44b67ba8aed22f2fb";
-          sha256 = "176a8r4y4glrjssywvc2xzdbk987fs796zsj892xcamcmzc688na";
+          rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5";
+          sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
@@ -49895,12 +50087,12 @@
     ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ocp-indent";
-        version = "20170412.12";
+        version = "20170803.222";
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "cae4e8c9d0ff0c29e5fc32c8ac0cea539f8f6a13";
-          sha256 = "1wni1xrv6kr001spdz66lza4xajx1w0v3mfbf28x17l4is2108rn";
+          rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c";
+          sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -50021,12 +50213,12 @@
     olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "olivetti";
-        version = "20160912.1758";
+        version = "20170806.2121";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "olivetti";
-          rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef";
-          sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2";
+          rev = "21f8356ce025a66125954ed372c8ace83bd279c4";
+          sha256 = "0a3d5rsg4vmjzj8lwgj8i205ns526g66895ppx4az6x542yamr5x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -50189,12 +50381,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170721.946";
+        version = "20170804.158";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "ad147956b936fd528d26ca88158a8af96ff5827a";
-          sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm";
+          rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e";
+          sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50721,12 +50913,12 @@
     org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-brain";
-        version = "20170706.447";
+        version = "20170809.633";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "org-brain";
-          rev = "497c18f517074629394c4c30de03d985e0c5ca8c";
-          sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8";
+          rev = "7a35d6043a1ffb5d2fff14bface51a57d4f7ab2b";
+          sha256 = "0mcrlh3y3jqffn6d92gyi3c1nh4vn4b1xclmhh2dmbl4haypk40b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -50809,8 +51001,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
-          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+          rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184";
+          sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
@@ -51166,8 +51358,8 @@
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "323d0b39d0284cef730b706dce7c0e58ed35530f";
-          sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842";
+          rev = "2f645cf910b21d0ea63da58ad32f02cf8a6fb178";
+          sha256 = "0qkdyfkk6xflhsb127208623qbhxcxcvagw0v8yksw2ypdaypd4x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
@@ -51434,12 +51626,12 @@
     org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-link-minor-mode";
-        version = "20170616.516";
+        version = "20170805.1152";
         src = fetchFromGitHub {
           owner = "seanohalpin";
           repo = "org-link-minor-mode";
-          rev = "f7d986b4c63673e0e81ad87e9109237abc667893";
-          sha256 = "0i7xj6hp0mxc42y2yjv8cwgsflfyx47d63b9v4dmkjbs9fda06mj";
+          rev = "7b92df60f3fee7f609d649d80ef243b45771ebea";
+          sha256 = "1lz7qj57s391ssawmccvhgxv1w99fj1m9rg3g4pymdl3sgdcz4g4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1d2add7baf96c9a18671766d61c8aa028756796/recipes/org-link-minor-mode";
@@ -51500,8 +51692,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4";
-          sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08";
+          rev = "8ab9a82be2a6178063e395a6ab3d2b9e083059c3";
+          sha256 = "0314hjdlvwgc2zp7vicg8afnmd3dggj22h26dwmq5ngd3vwih4yg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -51520,8 +51712,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4";
-          sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08";
+          rev = "8ab9a82be2a6178063e395a6ab3d2b9e083059c3";
+          sha256 = "0314hjdlvwgc2zp7vicg8afnmd3dggj22h26dwmq5ngd3vwih4yg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51537,12 +51729,12 @@
     org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "20170506.2244";
+        version = "20170807.549";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "c0e99cfdfa645300a0c114fa6825efdf797da7c0";
-          sha256 = "1rk7w0qsa824sfm1f3djg7vr6kxnvz3znn6vrzb9kcsmrf1y3k2z";
+          rev = "8067e76eb1fb6a9c15229cc93015aba923120a19";
+          sha256 = "0r33y6l74i8n2fbqcazq4r2659lqva855mf5lm5yf7spjga2f9vw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -51684,12 +51876,12 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20170607.442";
+        version = "20170806.1924";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "fa4e86621a63033148f8fe295a11b4721ba17462";
-          sha256 = "123b0cf47c5gnj3yakhjr2q7kc8nmhim9c2ngdls6g944ig07l0d";
+          rev = "50430ababf73a2d090881a952e9770badaf7478b";
+          sha256 = "1xph0pdcbzlxfnbhhad2jgkznrl2vs76yl3jd29ny4xsl0n3gglw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -51737,8 +51929,8 @@
         version = "20170701.919";
         src = fetchgit {
           url = "https://git.leafac.com/org-password-manager";
-          rev = "b2814d26287f2b6295a39098da9f5e2fbc5f2de2";
-          sha256 = "1pzlmy5vry9q898r4chgn6qp6s1ajlkv946lhn6z7qpdspvy9kyy";
+          rev = "3e7058586b2ab96b12e9b1195b1db1e66e704f20";
+          sha256 = "0ac0nd84y8lckapyckbdvc1wdflwz5nxm7isxcc8cp92pgqy49r2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
@@ -51838,12 +52030,12 @@
     org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
     melpaBuild {
         pname = "org-projectile";
-        version = "20170731.2333";
+        version = "20170803.634";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
-          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+          rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184";
+          sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
@@ -51863,8 +52055,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
-          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+          rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184";
+          sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
@@ -51949,12 +52141,12 @@
     org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-recent-headings";
-        version = "20170727.1633";
+        version = "20170807.1014";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-recent-headings";
-          rev = "1b14f7f833f158f03461fb12d41a8c9f6ad4bd6a";
-          sha256 = "09jp7kfjkcaqlnnls80pzxgsga7fids7w495sd319sml36fa46m8";
+          rev = "a9f3fdf1cb3deb34103ea9f6f604bdf0edac1968";
+          sha256 = "1kbba9x1x2jn1081zy8ync0vfsnj2cjflnlyycpb7lprsjbdq3zs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -51991,12 +52183,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170727.1217";
+        version = "20170808.625";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "30be4111d465b6d8fbdc9785e8c49dc0ce16bab0";
-          sha256 = "0zcv0np6hnq5jcblxxrvh99rd9zi7savpyhad29krqw7rhii1z71";
+          rev = "0af19a6ed3ccde878c27c27f1413409fdc0de9f8";
+          sha256 = "0prwvc3yywivhap6rrji25afcxc553nginzxgrr7fbkxy5vfprzg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -52146,22 +52338,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+    org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-super-agenda";
-        version = "20170801.156";
+        version = "20170805.1106";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-super-agenda";
-          rev = "591ea418588a2ad0cd34146831d369b030cea188";
-          sha256 = "06jk5xp5x01123lwxv4srhcirjg8cwffz35x0kfndl0lq43g3mzi";
+          rev = "fd3b18dd2a4b0aa77d60e4b3af4288b62cae9517";
+          sha256 = "0cr6jv58lj7483vwm75yc4nncjkw4723dizdysd6qypq5px65zr6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
           sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra";
           name = "org-super-agenda";
         };
-        packageRequires = [ dash emacs org s ];
+        packageRequires = [ dash emacs ht org s ];
         meta = {
           homepage = "https://melpa.org/#/org-super-agenda";
           license = lib.licenses.free;
@@ -52445,14 +52637,14 @@
         pname = "org-wc";
         version = "20170727.1911";
         src = fetchFromGitHub {
-          owner = "dato";
+          owner = "tesujimath";
           repo = "org-wc";
           rev = "d294ad7117c150445e6166fc0d88c14a8386f34e";
           sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e2f0d29fb0c046d9f7c32215ea58897147f3b291/recipes/org-wc";
-          sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc";
+          sha256 = "1yk2py4bzm2yr8vw6rbgl2hfpd21hf4fga0d5q6y779631klp6wl";
           name = "org-wc";
         };
         packageRequires = [];
@@ -52464,16 +52656,16 @@
     org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-webpage";
-        version = "20170730.50";
+        version = "20170809.638";
         src = fetchFromGitHub {
           owner = "tumashu";
-          repo = "org-webpage";
-          rev = "e9bb72c7bf75243553f786193e7c9535777559f0";
-          sha256 = "0ak2210d9qx4zfgqzilxzla1rswwjgjnc15kh6drn6dfmj1krfnz";
+          repo = "org2web";
+          rev = "89a67c0e32e172613e6c46bffcd9537f9198067a";
+          sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage";
-          sha256 = "0ndvv5kw65p5shgg0gn3rpxz3zbxgcpa6an4m4yxms0ma72xw124";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org-webpage";
+          sha256 = "11zv1vbwd03dyk2ac8k8lh0x5f2b6vpxdib74qs8wdvvqi7pippm";
           name = "org-webpage";
         };
         packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ];
@@ -52506,12 +52698,12 @@
     org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
     melpaBuild {
         pname = "org2blog";
-        version = "20170627.1750";
+        version = "20170804.2043";
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "026629da7517dad6ffd9e005299874cf2163958e";
-          sha256 = "0dlrlm83i61zk6mvmfspcpakfjv5d7kfazk05f694ijfmqvmvfiw";
+          rev = "bc398e6bb529b6b0022c24d570f4d65bbfd70d5b";
+          sha256 = "0fkms3hci43rb4dv74rfglwjgqiw23ggxr2pc1zcr29q0fra7hdf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -52587,6 +52779,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
+    melpaBuild {
+        pname = "org2web";
+        version = "20170809.411";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "org2web";
+          rev = "89a67c0e32e172613e6c46bffcd9537f9198067a";
+          sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web";
+          sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf";
+          name = "org2web";
+        };
+        packageRequires = [
+          cl-lib
+          dash
+          el2org
+          ht
+          htmlize
+          mustache
+          org
+          simple-httpd
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/org2web";
+          license = lib.licenses.free;
+        };
+      }) {};
     organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "organic-green-theme";
@@ -52971,13 +53193,13 @@
         version = "20170721.2307";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
-          repo = "osx-pseudo-daemon";
+          repo = "mac-pseudo-daemon";
           rev = "d235680a72677f11925b912428ad1a57b664e3e8";
           sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon";
-          sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon";
+          sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z";
           name = "osx-pseudo-daemon";
         };
         packageRequires = [];
@@ -53049,6 +53271,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    outline-toc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "outline-toc";
+        version = "20170730.430";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "outline-toc.el";
+          rev = "31f04bea19cfcfb01a94d1fd2b72391cb02b7463";
+          sha256 = "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/64b07ee55e87c4a1125ce18a8ae0a44661380ffe/recipes/outline-toc";
+          sha256 = "13hy9ahla68qcbfbm7b5d0yy774qfc3byb6pn9c66k2wg4xh6pxb";
+          name = "outline-toc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/outline-toc";
+          license = lib.licenses.free;
+        };
+      }) {};
     outlined-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "outlined-elisp-mode";
@@ -53220,16 +53463,16 @@
     ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-clip";
-        version = "20170108.1348";
+        version = "20170805.505";
         src = fetchFromGitHub {
           owner = "jkitchin";
-          repo = "scimax";
-          rev = "4470f452f4219a53947da4c3d4ade188f978ad73";
-          sha256 = "1nz02plf1p73690z2czn95fpiy5hissq6xnhfj5gf3ykmyzn5wbc";
+          repo = "ox-clip";
+          rev = "649aa719c6cb3fab46d1ff20d8090b85503a771e";
+          sha256 = "0n2s59668l9n9vz8qs4kmbmlf6cybd0zijkb65qvba5iz4lxsj08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
-          sha256 = "0vkw8r34wnax08kkdgwzm62srp9avvza1jaj582l8nn0a75284yg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip";
+          sha256 = "1sm0ivd8rypnl0z901anjsnbfjwhxqcaagqav82ybdb1z6x1qicv";
           name = "ox-clip";
         };
         packageRequires = [ htmlize org ];
@@ -53581,8 +53824,8 @@
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org8-wikiexporters";
-          rev = "57538ada07d1c631cfd07410cd8f47523be54c9a";
-          sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl";
+          rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f";
+          sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-tiddly";
@@ -53661,12 +53904,12 @@
     ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-twiki";
-        version = "20160306.915";
+        version = "20170803.1339";
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org8-wikiexporters";
-          rev = "57538ada07d1c631cfd07410cd8f47523be54c9a";
-          sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl";
+          rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f";
+          sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/084da2cc725cc23b02657e7adb14ec31532ad25a/recipes/ox-twiki";
@@ -53766,12 +54009,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170709.120";
+        version = "20170807.1657";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "4e4b34fc4f12ef2f7965fa959c5809aacdb6af63";
-          sha256 = "036gvgh97ng8l8srq4jgjil6na15fy4h7w7aljxx6wkmaik7nvg7";
+          rev = "421e03d4faabea31b9135f7e2d1fd3a8cb3649f8";
+          sha256 = "1md21a3clabc1xcs94gqy671wpxsbjr009c5dv2sxrq6xrdg1isz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -53787,12 +54030,12 @@
     package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-plus";
-        version = "20150319.1455";
+        version = "20170802.2039";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "package";
-          rev = "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b";
-          sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
+          rev = "09338e859168b45f1eb7386da184c48d31473068";
+          sha256 = "0wc21d33xlgnw8j5qiv4r1rp2wglk3qcqlr1xcs0rmb4i5cjwnrm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+";
@@ -53850,16 +54093,16 @@
     packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "packed";
-        version = "20170314.1340";
+        version = "20170805.449";
         src = fetchFromGitHub {
-          owner = "tarsius";
+          owner = "emacscollective";
           repo = "packed";
-          rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1";
-          sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi";
+          rev = "e8b20e287222dbf08ebc46e405412c3213102a7e";
+          sha256 = "1a02s0ssci6fywk4k8kq5prwz5j4y1270v05qw9wwxa0fx083rn5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
-          sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed";
+          sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd";
           name = "packed";
         };
         packageRequires = [ dash emacs ];
@@ -54037,12 +54280,12 @@
     pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
     melpaBuild {
         pname = "pamparam";
-        version = "20170725.1345";
+        version = "20170808.1219";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "pamparam";
-          rev = "017df884700a9db27dc486f7047da4bc7639ee6e";
-          sha256 = "1b5gkmgqwibbavw3qfkgyaj1y3shr0nm3ksrl3ahhabylg3fj5as";
+          rev = "33efb42525da0094a5338f6cae4013fddf550118";
+          sha256 = "0r8c3njp24g1jsmypdvd7ax0hylk3igp0yfblszsz1ypafl4x2jv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
@@ -54392,12 +54635,12 @@
     pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pasp-mode";
-        version = "20170711.516";
+        version = "20170803.1301";
         src = fetchFromGitHub {
           owner = "santifa";
           repo = "pasp-mode";
-          rev = "2d7307b7483eaf6030497c83dea39207cf843638";
-          sha256 = "1nxrad0mg1ywcjhh7npbnz69bxf44ih51f74m040mnvmmd15jw3q";
+          rev = "6511193677d6113fec1171f476c0db3be242ee15";
+          sha256 = "1fk87iiqnyfwblw8fgqhw2mg61w2pl7id1dm8lb75pqrjq8kvjbg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode";
@@ -54413,12 +54656,12 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "20170728.26";
+        version = "20170802.253";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "4dc3397caaa2fb3672cf7fbb2189927538c4642c";
-          sha256 = "1gxkx73avmv2j19qaszjwy6kasggh40ahnmayfxsvgjxxzd5c46s";
+          rev = "2bc78649614356eff88f8c826d08782f5f804378";
+          sha256 = "19awdplirf1s4ajmcvw6b2wlkmrvx5v8i8m4b8glp4wchx27czgn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -54999,12 +55242,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20170721.718";
+        version = "20170809.1007";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "804d9929ce354c60d91ab756735ffff8a6f30688";
-          sha256 = "1qfv9zmqw3s3j94kprr4g73cq0b9cqw0bihbm1pbw6pybivdry09";
+          rev = "a5dfc038e989af2a4b48265a07d26222c9d1212b";
+          sha256 = "1zjws8yafh3zwnfm1jw92w6f5f1vdcbyj1h7v3i19ixf19h2af76";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -55020,12 +55263,12 @@
     peacock-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "peacock-theme";
-        version = "20141115.2302";
+        version = "20170808.620";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-peacock-theme";
-          rev = "268a2a7eb48ac750fc939657169ec65f2ac0f4f7";
-          sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3";
+          rev = "9e46fbfb562b6e26c6e3d6d618b044b3694da4c8";
+          sha256 = "0w4dzdsv2cdldss5jwmdbjb5a62k5j1szwdim4gv8ldifhj7fy22";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/peacock-theme";
@@ -55101,6 +55344,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pelican-mode";
+        version = "20170808.252";
+        src = fetchgit {
+          url = "https://git.korewanetadesu.com/pelican-mode.git";
+          rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c";
+          sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
+          sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi";
+          name = "pelican-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pelican-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "per-buffer-theme";
@@ -56672,12 +56935,12 @@
     point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "point-stack";
-        version = "20141225.2110";
+        version = "20170808.958";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "point-stack";
-          rev = "86b37666882398f4db93f3aba0ebb7b7965032cd";
-          sha256 = "0nqv63yy0qpxhblzmkyvla90p9a7729fqxvhkfld9jxfqpgv1xyp";
+          rev = "76e17311e3a810314c7d31ac46dc55450ff30fa2";
+          sha256 = "1sp3djnyg3f5ci43m4pi0f6clblrz5lrnzc415r87csbavqqgv2z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3c9e6b3c583f098f75462b4d48cd137a1bcb76/recipes/point-stack";
@@ -56754,12 +57017,12 @@
     poly-ruby = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
     melpaBuild {
         pname = "poly-ruby";
-        version = "20170710.220";
+        version = "20170802.648";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "poly-ruby.el";
-          rev = "acc0c3cc8d0607edc769b35e19fcd39e8f57d903";
-          sha256 = "1gq7rz9s44cf4m9bdapr7rnvincxsp16yci7g3ljq0mpiyl1l2b0";
+          rev = "e6f50a92d29a5ff567d70cafa6621c4f89056d11";
+          sha256 = "1pdimvcrjq0k6a9kijcl6zmsmmvssdqsdkgcz14qs4444qly4l9b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby";
@@ -56838,12 +57101,12 @@
     pony-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pony-mode";
-        version = "20151028.302";
+        version = "20170807.822";
         src = fetchFromGitHub {
           owner = "davidmiller";
           repo = "pony-mode";
-          rev = "d319b0317bfbdac12d28cfd83abe31cc35f3cdd7";
-          sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr";
+          rev = "760684d30b6c234d1b88c9a4673a808f36f7f341";
+          sha256 = "1y4gxn25i2nszdhqq8jxf9h65mqfgcwbypx5p4wkan5i1v2i3yr1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1fd64317610fb6ef5b14e8bf15e727680d5ff09/recipes/pony-mode";
@@ -57359,12 +57622,12 @@
     preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "preseed-generic-mode";
-        version = "20150119.1241";
+        version = "20170802.1753";
         src = fetchFromGitHub {
           owner = "suntong";
           repo = "preseed-generic-mode";
-          rev = "19bce980d41607bef8af4b1901343abfca0f0855";
-          sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0";
+          rev = "341d85f8ecdc8834956a0352ece542f45def88db";
+          sha256 = "1p486absi0mlcangpbh6hs36wvlmm9s6f4ag0lzmw7w3ikhp88kn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode";
@@ -58241,8 +58504,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "072431452a365450c607e9503f51786be44ecf7f";
-          sha256 = "0yl003jbxd7k70a8ajs19256pq4g71fkx1nqg207mzvagmnp3iqp";
+          rev = "35db2675b418ea105ef89f88fd1bf0257eb8a3ff";
+          sha256 = "0xfrbz1xal8xkg1s9z5mlzqc6qvrjdy9i98g4crmwhvjvv58wff0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58258,12 +58521,12 @@
     protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protocols";
-        version = "20170327.758";
+        version = "20170802.432";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "protocols.el";
-          rev = "1c93a48d4173635a7b742248797f424e7ce851e3";
-          sha256 = "1hbk7ikcp041m7g2nfbbvsyj15d7p3dhsv0yvyy1n6bm5azh30zr";
+          rev = "d0f7c4acb05465f1a0d4be54363bbd2802647e77";
+          sha256 = "1xg3pwsnzn795bz299x273ral2jrz2v3p9r6gjm4dcx5pm3348mj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols";
@@ -58838,8 +59101,8 @@
         src = fetchFromGitHub {
           owner = "statmobile";
           repo = "pydoc";
-          rev = "84133eefce0e52a861894815f0c414f1f276f6e1";
-          sha256 = "1j5cjfak8rak8rp1cijjfyndpxjkr2vqw22av3386pbwdm6fzamg";
+          rev = "916153516382e5546b59b46342c58ed76cf27faf";
+          sha256 = "18ba5mcp030l6ywdq70ryvbwn7af28kp0xi8h1bma5mwcxj2sg2c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc";
@@ -58875,12 +59138,12 @@
     pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }:
     melpaBuild {
         pname = "pyenv-mode";
-        version = "20160221.1123";
+        version = "20170801.1648";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pyenv-mode";
-          rev = "560614d47e3b0331f5c0e136763be69ef052048d";
-          sha256 = "049wgwygdaa0p8p4pl37wkc06nam9ph17i9gzcg7w0hfwghjrc5j";
+          rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820";
+          sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode";
@@ -58959,12 +59222,12 @@
     pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
     melpaBuild {
         pname = "pyim";
-        version = "20170730.1512";
+        version = "20170809.413";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "pyim";
-          rev = "88adc57d754c9aecc922fe8b29239148f2b6557c";
-          sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v";
+          rev = "1f40c4341a886ec952de14f642f07ccce90670b2";
+          sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
@@ -59064,12 +59327,12 @@
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "pyimport";
-        version = "20170303.732";
+        version = "20170808.346";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pyimport";
-          rev = "2482c8efee8edab9f26ea278848d786323fcff9d";
-          sha256 = "091ilax7vs34mh907rxfi2hm140ipa39nwrs27w8nllx2qsrbljv";
+          rev = "50789ef8c5e19997bd5b0d4c47acb7660d128e76";
+          sha256 = "1g4kp6m9bqpvyp0wy1bjx8246mqvdy5jznl1ash1qn7gr07kb34s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -59110,8 +59373,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "7d6114fe71f1e6ab4a7c19546f380a7cb216eac9";
-          sha256 = "1dq3ihmqdh6nb1ybz29qrkgz1ka2jhv76izh5a1q0l19qgni8wqi";
+          rev = "62dc3d2f5eb57a70088a9b9959b6eb139cca227c";
+          sha256 = "1cjdn499i5cn6lindzgnmhp9370pg9fqjpvngkyry16xs57fmz4a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -59253,12 +59516,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170731.105";
+        version = "20170803.405";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "1d4cdc44c4fa1a15b0b1c4bb1774d0fc20d48616";
-          sha256 = "1xp4lzwc95qkam8b86pmz8y0zg3w579rvygh22y47g0dlblyxgsn";
+          rev = "85978be547434adc9c673cb3cfb7e7cf8729d514";
+          sha256 = "0diczpxf8ax6ci8j18ac92nslj7l6spl9a8fazdy1w9j9dmgc7s6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -60282,12 +60545,12 @@
     react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "react-snippets";
-        version = "20160712.1521";
+        version = "20170803.1550";
         src = fetchFromGitHub {
           owner = "johnmastro";
           repo = "react-snippets.el";
-          rev = "3216134ee98b0ac39454d11d19b1508d3e7ca709";
-          sha256 = "1j89pzx5karfh37gp0s9mnsq72h9628fihjqhra5h4qpj1irmkld";
+          rev = "bfc4b68b81374a6a080240592641091a7e8a6d61";
+          sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets";
@@ -60387,12 +60650,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20170712.334";
+        version = "20170803.632";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "ad333ac5e95f7e0c98cb4bc4c924ca9fff97cc88";
-          sha256 = "1yng0fj9zr57jwmaxk71vxlwpxahyc4iadyyj5v8c09a4ljvlfs6";
+          rev = "3f1b98f7a92e68e087a9a2174e61ac723eb161d3";
+          sha256 = "1xiw6aw31zmvqwa3vpbq1xnla8539rjdy5gfxlhrw1qah5fqxni8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -60725,12 +60988,12 @@
     redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redprl";
-        version = "20170719.754";
+        version = "20170808.515";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "f5a1ad20cacba47193be6d40230519c28e3578fd";
-          sha256 = "07i5xa87wdyv9v0ib2j3bk9gv2dc8ah7jgi2agicfn4lxygf710b";
+          rev = "0b881a3f73cd6fafddfbd602a1abda5f8fc7ab98";
+          sha256 = "0s4iakcpjiwvxjdcmn22yfsr0ya0h4xvpr713d0h9yjdbblx1m20";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -61142,10 +61405,10 @@
       }) {};
     replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "replace-plus";
-        version = "20170731.2148";
+        version = "20170801.1947";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/replace+.el";
-          sha256 = "0fj2kkvilgrz0ih08issdrq8wbswcxs8af1jv50zx7lfyjpix2s3";
+          sha256 = "0vlk2sjszzzkf94vfgb52ck4qbqp9ll1kdlxnmxixjxxl8iciwzj";
           name = "replace+.el";
         };
         recipeFile = fetchurl {
@@ -61496,12 +61759,12 @@
     review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "review-mode";
-        version = "20170105.2156";
+        version = "20170804.545";
         src = fetchFromGitHub {
           owner = "kmuto";
           repo = "review-el";
-          rev = "fc7a2f152be63874da4211ec0b49ff1fadb6465e";
-          sha256 = "1fg18kb5y8rsxnh166r0yj5wb0927rsdhpwmfwq3i9kgycgpznix";
+          rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea";
+          sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
@@ -61557,12 +61820,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "20170622.1135";
+        version = "20170809.1107";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000";
-          sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr";
+          rev = "081685a8c624220ece68d6dca8d60016585b04ff";
+          sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -61725,12 +61988,12 @@
     riscv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "riscv-mode";
-        version = "20161001.1838";
+        version = "20170804.821";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "riscv-mode";
-          rev = "e8425b71443a2decbe70cc5892e72ce2ceb17570";
-          sha256 = "035hv8dpc6rk4b22mw4ch9yzf4wq14h8bba765fxg87grpi0mwg4";
+          rev = "99febf97d1fa9441e8dada94fe30c2aa439c9749";
+          sha256 = "119p926ypz525xdh82m2d1saky1qh5va224fxyqisfbwfrc17arh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode";
@@ -61746,12 +62009,12 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "20170710.711";
+        version = "20170808.634";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "a0a9cfd532f05f9ccb42919b9105d8e902d971fd";
-          sha256 = "1gbgm00arfkgvp8gihpn1zf69lp4a5glhvrawnma6kraf5ldx0fs";
+          rev = "4a24c86a1873289538134fe431e544fa3e12e788";
+          sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -61981,8 +62244,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
+          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -62043,8 +62306,8 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59459";
-          sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
+          rev = "59553";
+          sha256 = "00lwwhwq1bzmkr97q22frmzwm4g1kddgiyzlmfwv16k0g3ihwydg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
@@ -62121,12 +62384,12 @@
     ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-electric";
-        version = "20150713.752";
+        version = "20170808.2046";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "ruby-electric.el";
-          rev = "35d04e90ef243c7090edf9aaad0142a5a77f0ebd";
-          sha256 = "0ksbm6cbqz7dx6qyq8nlpbx41b153jaww4fwnfwbx9rz993wjjkg";
+          rev = "d04313dbee42c0d1009558a7c9424e4ae8611908";
+          sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
@@ -62394,12 +62657,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170728.1006";
+        version = "20170805.952";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "09efc45dee786cb220c233426ddd82b26ad950eb";
-          sha256 = "0rga8whnzhnz6a0n13bimrdjardzmn5h38d71gmvrs40kbs0350h";
+          rev = "b10ad4177786a139623984c4855eb9de3864c697";
+          sha256 = "1dxsw71yxqzpnsr2cy7ba3mmzsnjp8kw0la6d7wc67m704fxymz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -62541,12 +62804,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20170218.1829";
+        version = "20170806.2110";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "db99da9189002f3a95e9dc24038f73fc3a3f0499";
-          sha256 = "1bbkfwnqlr68qkzdcjs3gjm3lfvbcw7vwx9bvrfx6rhl8k9a2i15";
+          rev = "15d32495acb7df9aeb1def6845332a1a72fd2a36";
+          sha256 = "068x0dzknpxcjnvbp5wkg3i3bvr67dg7mns7r859mpr59q9gyh9j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -62797,8 +63060,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "a6e98831985be670148c527747b0e91330d0307b";
-          sha256 = "0yyacg09p74r4q56kqw3km6sqwnk2hpzxqi9jvbw10x2q2c618bk";
+          rev = "9b0378836bd7af24fa67f93fa456c57cc3fdbbcb";
+          sha256 = "19js3vyi52xz83419x1n1nrwqvqsa5p8rf33z99bdmy1rj4xrfgk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -62835,12 +63098,12 @@
     scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scala-mode";
-        version = "20170611.806";
+        version = "20170802.432";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf";
-          sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw";
+          rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379";
+          sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -63252,12 +63515,12 @@
     sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }:
     melpaBuild {
         pname = "sdcv";
-        version = "20170501.2155";
+        version = "20170801.2216";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "sdcv.el";
-          rev = "cf7aa835360a1cb93b2b5fedaf5b816ff7410f0f";
-          sha256 = "05bcgfzl23v8hkj395pp0gwl088smyx36i82sx5yjgygpg2i5dif";
+          rev = "ebe45a5fb1e465cb4150e4dbe38a069b2a218219";
+          sha256 = "0pcbrzii9x7v3qqygr29yi6pg1gvzjbsgcfziispsf24n01lrrly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv";
@@ -63438,12 +63701,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "20170722.434";
+        version = "20170803.547";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "17884d02d8aaf2478590ea13542f2954d1dc203b";
-          sha256 = "04wqrkpihrgrw244baama1aaj1ih80w0001hw3xnbl6xnxsyvm4z";
+          rev = "9197838617211c71a965aa4b009249d231249902";
+          sha256 = "1zk0rf2iq14vssrj9p3ixcricm2lp8kwfxxj1x8vixk1kw118q3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -63731,12 +63994,12 @@
     services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "services";
-        version = "20170327.835";
+        version = "20170802.430";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "services.el";
-          rev = "87d65bf9fd8b02101f751846c650fc518355d1ea";
-          sha256 = "01wlknj97jrmhji3c3dyc6cm8pp0rj93knfrg3l7zimr7crx3rg3";
+          rev = "04c7986041a33dfa0b0ae57c7d6fbd600548c596";
+          sha256 = "0ycfkskkdlmc0l75z5a8f66wq5mvb24c4kz19a6kqs8rwm2ygz35";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services";
@@ -64378,12 +64641,12 @@
     shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
     melpaBuild {
         pname = "shr-tag-pre-highlight";
-        version = "20170525.902";
+        version = "20170801.2201";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "shr-tag-pre-highlight.el";
-          rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889";
-          sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6";
+          rev = "8b102c4c42180b5e9fa9dbc776fb28f12afb38a0";
+          sha256 = "0z00k3rxz26dmn55mhrbv0p39xk3lwd66vmw0dm8m1lrkjxpsq8v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
@@ -64441,12 +64704,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "20170714.1041";
+        version = "20170805.1619";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2";
-          sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd";
+          rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487";
+          sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -64755,12 +65018,12 @@
     simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simpleclip";
-        version = "20170603.1542";
+        version = "20170803.540";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "simpleclip";
-          rev = "7deff873b79910496b4baf647cdb8dd5de63465a";
-          sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz";
+          rev = "d461c462c237cd896553adb468cd77499d0d26ad";
+          sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
@@ -64965,12 +65228,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170731.25";
+        version = "20170807.711";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "5858bd60b4adadf2a52825aef9a49021eba89477";
-          sha256 = "1difrbzz0cfw48nabaglcqlpvsrd2zn24f6spfx0qh22rfhcz4qy";
+          rev = "e9cdebc689bb7780d0c278bf63577103fffc4aeb";
+          sha256 = "1yys57pn7bym8galpf1k88xc5gs70xsv5fd1bdpq5k93is135js1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -65028,12 +65291,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170705.643";
+        version = "20170804.1113";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6";
-          sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v";
+          rev = "84e5a99f5e8caf4d42076681b9befb1bf80493bb";
+          sha256 = "1fw4biar85xy8as1smry8kzyfw0lbnbipzinbmpaliz2fljfnkqm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -65133,12 +65396,12 @@
     slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slime-theme";
-        version = "20141115.2302";
+        version = "20170808.622";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-slime-theme";
-          rev = "441288a5791d24e79ada2698888653ef3cf2ac6f";
-          sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx";
+          rev = "8e5880ac69e0b6a079103001cc3a90bdb688998f";
+          sha256 = "0g90ypwyvpdzilvhj0rgfrp78a5gflply3rix2wx8rncw569qb6g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/slime-theme";
@@ -65217,12 +65480,12 @@
     slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slstats";
-        version = "20170629.235";
+        version = "20170802.413";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "slstats.el";
-          rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167";
-          sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4";
+          rev = "ebadbf5e3ffddee788f5ec09f759ed7eef6e1dae";
+          sha256 = "1dn81r7dkj5pbl4adps7gcwn2yrxmap0ds6ninjzyr18m4lca7zb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -65951,13 +66214,13 @@
         pname = "sml-modeline";
         version = "20120110.1240";
         src = fetchbzr {
-          url = "lp:~nxhtml/nxhtml/main";
+          url = "https://code.launchpad.net/~nxhtml/nxhtml/main";
           rev = "835";
           sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3438977c0bf907b7a3480e6b88b277109c663385/recipes/sml-modeline";
-          sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/sml-modeline";
+          sha256 = "0fvdaby49q34sa83i3mgwyzaf1rflcary9pqi2gvbiibcwmkg82b";
           name = "sml-modeline";
         };
         packageRequires = [];
@@ -66284,12 +66547,12 @@
     solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solaire-mode";
-        version = "20170718.1048";
+        version = "20170809.1220";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-solaire-mode";
-          rev = "4058f17c7ccd4eb192598ce493d2e2d2361ee2e0";
-          sha256 = "0vk5d3l2s0dxdv6yjdnwbhs0cdq71kd3l949a8w0qaypad8hg11i";
+          rev = "8794f4d8fb63758d19e5a5f23e1d1118f0a1d10f";
+          sha256 = "0vq01w4krj7l3qgqck2a1cz2d5xzkbx2giimkxqxzyb00820z41s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -67420,12 +67683,12 @@
     ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-config-mode";
-        version = "20170711.1433";
+        version = "20170803.1039";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "8ce61a22d07cdcb96aa31fa9e5493875f00ad516";
-          sha256 = "03lpfj2gq0wl8zsjwdkwk5i6ih2cwcmya55cyw8fs8i19y3zhcyb";
+          rev = "c6dc66b6678605f0df8eb61778b10ae21eb7caf5";
+          sha256 = "05pdz6117m78zfvxi9mskw8svx4bs5k3bpv9nk9mzg9n0zw8algy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
@@ -67441,12 +67704,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170725.429";
+        version = "20170801.2303";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "dbd8608551bc9e05280415b7b3937b1a151c7718";
-          sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr";
+          rev = "a7246531ab3d3c2d7cb3bd515353dfecbe5902c1";
+          sha256 = "1ac10acyz0d3z5gmm79flxz7mmbww0xbr278qbwyzyr8h0hv2d5d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -67716,8 +67979,8 @@
         version = "20140213.348";
         src = fetchgit {
           url = "git://repo.or.cz/stgit.git";
-          rev = "90d50ad4a78c06f99fbf185aeb3322d1502a016e";
-          sha256 = "0gh15q04dl0cgnabxjr3sgzkm31m9ls3r0d9ha7vs710wiffpbqx";
+          rev = "f248e80ec7ed418d23d47c8a6c147a8a42855d29";
+          sha256 = "1icm94ri23m66p0lmg0sdqi04m3vfwd2jcngym9gcg8p5gqq8j2g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit";
@@ -68187,12 +68450,12 @@
     sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sudo-edit";
-        version = "20170605.1710";
+        version = "20170803.2052";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "sudo-edit";
-          rev = "57d49eafd53868d3c86b20fa51e1889e621872c0";
-          sha256 = "1gxyy1z8qq610g2x0zzlccqq33gd54wwl1akhnw5xg4mvwhjvidf";
+          rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b";
+          sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
@@ -68250,12 +68513,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "20170730.306";
+        version = "20170806.1414";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "1c8a6ca6e135e7228d45247adee75f721f20ef64";
-          sha256 = "0ld6ivnkrhj3rdlr54sg90i4pdkgvyma9mhpr52ni6ab4053mpyj";
+          rev = "6ae090cab9bc16650c1788e83ccd2fe95a959de2";
+          sha256 = "1rnp7zwr5j345l569zhpskf7g6bkg0jmplzjwy79rlv3h3d6rv4d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -68624,12 +68887,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20170609.938";
+        version = "20170804.1038";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "fc275339b57690d4157160ed22b7672d5382cbe7";
-          sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l";
+          rev = "9b071a8fb130fe8391d445706711bcc4de2b3998";
+          sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -69565,12 +69828,12 @@
     telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "telephone-line";
-        version = "20170611.1115";
+        version = "20170804.1057";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "743614f372598597282efd29a18e624d5ef80bc1";
-          sha256 = "0jl4kdmid2jy5gys9q1r58x41q4srh7hinhzr3q1f6f47lpcpvkf";
+          rev = "01a2be2798850519873fe7abc59d715a978e6f20";
+          sha256 = "06g4vd4air0rflzi1yz9qh1zxnwh7x13ffcib5fk7b0h8ypl72wd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -69817,12 +70080,12 @@
     terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "terminal-here";
-        version = "20170426.48";
+        version = "20170805.251";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "terminal-here";
-          rev = "26e7c8d180dcc62d8802762ba738eb2ee02fd16c";
-          sha256 = "06hqqjj8fl32mxiws6jqnii6cnbds2686y2hfv7v83rj6fy31vgc";
+          rev = "5e440c33a1d24762477863af5c9b7a896df4be1b";
+          sha256 = "0kqn3gzm5q37d2iz0wk2xcl7qlmqkblwy8zdc7plc6syldnh91aj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
@@ -70293,12 +70556,12 @@
     thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thinks";
-        version = "20170607.144";
+        version = "20170802.428";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "thinks.el";
-          rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d";
-          sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65";
+          rev = "15e0437f5b635bdcf738ca092e26aa6d8ecdba36";
+          sha256 = "1i2i8c53z8n48407jaz641adszv13yjg8cvq4k3hijddp651k555";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@@ -70360,8 +70623,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "ec2a252136cb864a9edb22ef895bd62ff29c53e1";
-          sha256 = "1avsnlxmr12zbjfv82mg69031s64c1rff7yfbk12hzba93rndnlp";
+          rev = "0a8c34ceedf0f9272fb6d3519596ddf90cffcac2";
+          sha256 = "1bhcn79l52m5ad4z8sv9165vsib2rvmqcf1sdaisrk7nfqwvy8sc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -70415,22 +70678,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
+    tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170729.2113";
+        version = "20170806.2049";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "6ad865937b7615652004ceca2e59c8ecfd737a9b";
-          sha256 = "1krl4h20sr2yk2napqap1b5lm88vzzdy5162i5rf7l53scjdc8vr";
+          rev = "77e4fe848dd664ead1f6980a9a99d82e2bee75d7";
+          sha256 = "18n0w02h6wvp5gxnsm7lcwdg68sxcqz9sx6xpkxlidyhixk2iap9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
           sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
           name = "tide";
         };
-        packageRequires = [ cl-lib dash flycheck typescript-mode ];
+        packageRequires = [ cl-lib dash flycheck s typescript-mode ];
         meta = {
           homepage = "https://melpa.org/#/tide";
           license = lib.licenses.free;
@@ -71287,12 +71550,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170730.2052";
+        version = "20170804.559";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "7a1af3d62e0b27e032b9c9219b97289c11b332ab";
-          sha256 = "0sfq643pfdmfcidm8ji52fn987vf3zwk2v6drmw8p3qzjx2k1m7q";
+          rev = "c9de81914e2688dc1c6a3b2bf70013a2a5ed0b63";
+          sha256 = "1vlla25lk75s84ns2svxdnvwfwhwp6jigmsq5v4s7k9xq5py0df7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -71392,12 +71655,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170729.834";
+        version = "20170809.1104";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93";
-          sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw";
+          rev = "0b413fc58d9bffd30132ee33dc4c98f9717e53df";
+          sha256 = "0lwy721n9f18mxs5xz9cgfc2rpqrz44yiw6vvy9bxmdfhq51rlaf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -71417,8 +71680,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93";
-          sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw";
+          rev = "0b413fc58d9bffd30132ee33dc4c98f9717e53df";
+          sha256 = "0lwy721n9f18mxs5xz9cgfc2rpqrz44yiw6vvy9bxmdfhq51rlaf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71642,12 +71905,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170531.557";
+        version = "20170803.331";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "1af437337abe17afc95de7070fd242165529f556";
-          sha256 = "0jjlb4i1vp5390v9w0dg4cc0l46jrxqphvw6b3wn1zy511r9q1jm";
+          rev = "3dd1684db5d085f1b668d19646a4051a3261f34e";
+          sha256 = "1d7yc0iqmxxqlcsbbci4wcz49sbfj6pdvbr7d98dsjxrg6pgjzjh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -71980,8 +72243,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "typit";
-          rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35";
-          sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w";
+          rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5";
+          sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
@@ -72654,12 +72917,12 @@
     uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "uptimes";
-        version = "20170425.331";
+        version = "20170802.426";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "uptimes.el";
-          rev = "07bcd6517243c9c9f61172202d33718bd9b2a850";
-          sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n";
+          rev = "c1e45ea728e5eaedea3e7974256fcfbcd20970f5";
+          sha256 = "15qcii1cs7kyzn44b6np7lxflrszbf3n1wr7vhid6l71cnfgbz86";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
@@ -72675,12 +72938,12 @@
     url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "url-shortener";
-        version = "20160404.1959";
+        version = "20170804.1942";
         src = fetchFromGitHub {
           owner = "yuyang0";
           repo = "url-shortener";
-          rev = "817ac58f6fd2190f688619a91cdc28654b211df9";
-          sha256 = "1nah3vjg7966ssh2iwz8fingmcni867ksj2bjrvkgzmqbxqdxz9r";
+          rev = "06db8270213b9e352d6c335b0663059a1353d05e";
+          sha256 = "1ndcajgvfl46zw2iwgghvcldsy9p778pifkhlanivc6azajhpjhh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener";
@@ -72782,8 +73045,8 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "4fcf11ae5f3ddc5ebc8f8f973fcf3f995c29c38d";
-          sha256 = "1pw8h6bwjmr61l7ncl36w9lqxsq4z9pbsi93nc0sfr67ram5ri47";
+          rev = "5ca193128c10f6af877c174ec0a9029782f0ef50";
+          sha256 = "1m8ccx4hnncwd5hhi46ghprk9cdljw0qlyy4ya05fgvxl7yz8b4s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -73069,6 +73332,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "vc-msg";
+        version = "20170725.7";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "vc-msg";
+          rev = "6f1b788a58d2b64ac0c4648039ecd40b3989a489";
+          sha256 = "1xay9h16vr9pm1csfaqy71m9rsphh77r2rmk1sxpdasr5aa00vq1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg";
+          sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9";
+          name = "vc-msg";
+        };
+        packageRequires = [ emacs popup ];
+        meta = {
+          homepage = "https://melpa.org/#/vc-msg";
+          license = lib.licenses.free;
+        };
+      }) {};
     vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vc-osc";
@@ -73454,8 +73738,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "vimish-fold";
-          rev = "e631352fbf910f692807afe38a2b6a7882a403a8";
-          sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq";
+          rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42";
+          sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -73784,12 +74068,12 @@
     vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vue-html-mode";
-        version = "20170225.2301";
+        version = "20170804.1723";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "vue-html-mode";
-          rev = "e9708b80a319af14266562d8bf920747e94f1cf8";
-          sha256 = "073vygm04x4gf150ibarz2qxbl37k6jzd907ydbq8nyq6hm1z1wj";
+          rev = "cd76195b2bda28d247a79124334ffcc5124676cb";
+          sha256 = "1flnn6gz5ihkdw6p3pkllqcd1v7j89hc225izv8x5v2i5biyndsv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
@@ -73809,8 +74093,8 @@
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "e256f432b9cec9a0294fe3edf1c4965e1de28570";
-          sha256 = "11nrzdqwzd7ib8gv52vplcafiwmv5nm6ql3ahw512zkkb2w3bkza";
+          rev = "3a3eab579361351b78a87bb5710d3bbfe351b993";
+          sha256 = "1b72vpg53whq3h85ck3c9if8km2rlzf8bvxkkv0j6zm66rvph0j3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -74074,12 +74358,12 @@
     wavefront-obj-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wavefront-obj-mode";
-        version = "20150501.1116";
+        version = "20170808.1016";
         src = fetchFromGitHub {
           owner = "abend";
           repo = "wavefront-obj-mode";
-          rev = "75eedad052848e82cdd94064764956b906e6d6b2";
-          sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy";
+          rev = "34027915de6496460d8e68b5991dd24d47d54859";
+          sha256 = "0yj4wb5sdsbh3gp0sh2ajrrn6s8vg492809g4gxkxp30jhr6xc9q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d48e4fdc6c7079a1ca70c1e879473a98c11bbe6c/recipes/wavefront-obj-mode";
@@ -74242,12 +74526,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170709.922";
+        version = "20170807.903";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "e4304bcfa0c5121522ba2a5db75af8a2e4e81246";
-          sha256 = "1pyhipazvhqflpxxdaqjyp7l5vpcp3cbc4qqb5fy1zxnlb5yj62l";
+          rev = "448c197fd78178bcf3e744c90b85a08f07bae3a0";
+          sha256 = "0vmh9cqhcw32qliqrlmkb9jwhi3m4iy5x5a96sk3f75zx14ryjr8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -74811,8 +75095,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "e9e61170f98bfde12b49b750966a826c0c72f848";
-          sha256 = "1s9jysl6gql0fnngm4mwqclbw99502dkrvakz3wxh37c7mf5g9r2";
+          rev = "38d2aca88b4afd2ade7f38df7275a3d31324df3b";
+          sha256 = "1bahwsx1cpima658bg62w63a4s24vp0qpw0gmxb245cyzpi8ng2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -75115,6 +75399,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    windwow = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "windwow";
+        version = "20170803.1748";
+        src = fetchFromGitHub {
+          owner = "vijumathew";
+          repo = "windwow";
+          rev = "717190e22aeb28130ce2a52470b7fb26b180e8dd";
+          sha256 = "0n2b2jaaqwc8z8rmfc7rqnk2sf875gp3xyjfgayvq7ya9c9bnv7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/12aba18872021ce0affa96c46a17353c7d073ca2/recipes/windwow";
+          sha256 = "0cbkp98pwzj484akdbidvdz4kqxv6ix6paimpxnag6fffciq245h";
+          name = "windwow";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/windwow";
+          license = lib.licenses.free;
+        };
+      }) {};
     winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "winpoint";
@@ -75219,22 +75524,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20170730.314";
+        version = "20170803.917";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "5cddefaff6aa0fa8ce2a0fa23900687c07d87481";
-          sha256 = "11fsaam88xj8aambiacsmcgn1mjfkx3mm7y74lnnwcslbrmj977a";
+          rev = "4d3d50b09dee3305a365d7eb005313d42dddd6ea";
+          sha256 = "11416ic4nf04fgd7947lxfc4c8g6lb4r2ickr5mydqw4wqzanqi9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
           sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
-        packageRequires = [ async dash emacs ];
+        packageRequires = [ async emacs ];
         meta = {
           homepage = "https://melpa.org/#/with-editor";
           license = lib.licenses.free;
@@ -75264,12 +75569,12 @@
     with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "with-simulated-input";
-        version = "20170729.1252";
+        version = "20170807.1512";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "with-simulated-input";
-          rev = "7f37451dcfbb1873f605e2a412d0585f5c3bed49";
-          sha256 = "0s40mpy10fbdr2b241qa239zdh54gmqk4j9pigqm1zlzi9d5msan";
+          rev = "9efeb236c8f6887a8591d6241962c37266d8e726";
+          sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
@@ -75369,12 +75674,12 @@
     wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wordgen";
-        version = "20161104.944";
+        version = "20170803.1120";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "wordgen.el";
-          rev = "c46d8da6dae8c82d3a5d8b903a12dd5f2ae94939";
-          sha256 = "0gcbj64dkzwa2xfp6y9lwb5m678g7lf9jrkr9whdrm9mgpifmdmi";
+          rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d";
+          sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen";
@@ -75768,12 +76073,12 @@
     xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-css-mode";
-        version = "20170713.629";
+        version = "20170804.2244";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "df1906547f51f50c7e61ffa6c518a6ffb23d4770";
-          sha256 = "0q93nz5z4awasllnnqs6pzi83mrx8nl7d3mi13ppqhd50sjm0166";
+          rev = "a91d934e15343738393cb2dc7a75d712581d09eb";
+          sha256 = "14b1aw1iffhk7gk0fwyrjb40173cli968hy6x72mmgq3ry664h44";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -75789,12 +76094,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170725.420";
+        version = "20170804.2206";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "4557ee44475b50061219653f0178efd9d832a79f";
-          sha256 = "06fx2mnyd7qs867m1hjzzj47wj06hhqz74bwif6rzhy5v4j7wdcr";
+          rev = "174fdd95edb77820a03eb161e3ab6b867936f9fe";
+          sha256 = "1l3a6hkhv26ixkmjc1zfl43zx8s0c3czk8zgahydpjx111q5381d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -75810,12 +76115,12 @@
     xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-find";
-        version = "20170729.1407";
+        version = "20170804.2234";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "5eaa02e28c4496bbf898271401005a694176a2d3";
-          sha256 = "0wdlc3d4ciyhc2nnnvfp0bdvar4486rcqfkj9czjb6v6jax3farx";
+          rev = "6b70b8122643402aedcc1cf88406330628d92286";
+          sha256 = "0gd7nsx205s33dxjx52cc4k8frdxrnwsvl7qkx8mckqvc1y2wxa1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
@@ -75831,12 +76136,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170729.1310";
+        version = "20170804.2154";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "636d4be0adf234ace22ee236b66b7b9ce81cff54";
-          sha256 = "1kqy10y7bqza4y7fj5n0vg536hksjzjbd2r3n36dij27k8n996dm";
+          rev = "4a7da476edf9eed9ad7725fe31113b87f97696bd";
+          sha256 = "140gxnnxqk649j60d3aibs42si95vakmy6m937gb25b2bmvhkwwh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -75852,12 +76157,12 @@
     xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-get-thing";
-        version = "20170713.628";
+        version = "20170804.2211";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-get-thing-or-selection";
-          rev = "29a82b1a291ad6625b0da152ff1de10455d1831a";
-          sha256 = "1si443vicgq7swr79lc9jv7fxm8x273xajrm6xqahkxzyly2751q";
+          rev = "00aa90c74f6e23eb9dae3082a16454264f9d1ed8";
+          sha256 = "0xp8w9myhdwiw7m2zj9bd2kc93djx35s3iss5yrz92kcw6m3n53m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -75873,12 +76178,12 @@
     xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-lookup";
-        version = "20170713.615";
+        version = "20170804.2259";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "lookup-word-on-internet";
-          rev = "91645ba91772bf4a1a20765722b72f7e374feacc";
-          sha256 = "0hrs77qllpa77964bwjdmq4bzr47bgc0n57jsaagcdbs7wc6bmc0";
+          rev = "7f4e9252d5f84438c83912720bcd313092f8f44f";
+          sha256 = "17fq0b2rc9wjjii17mnybp8v3nvp297azkd2bwz952r0x9g2s92b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup";
@@ -75894,12 +76199,12 @@
     xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-math-input";
-        version = "20170707.2324";
+        version = "20170803.722";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "b944092474e5c9194860dbb6d007a8f2ce98c94c";
-          sha256 = "04ffknah3gmnjkk4wzhbzwj40mxzgwzxqq7cxrg4k86l9wq50pjb";
+          rev = "8c988bc469209e7f393fa5a1ac4663bfb713c7a7";
+          sha256 = "1ndczz69v70c13jdb651yiqnk1avy78i11ydbvr0qf78gd859i5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
@@ -75936,12 +76241,12 @@
     xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20170713.628";
+        version = "20170804.2216";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "62ac5be31f6b2e2ce10f695122e9cb7a9411e1ba";
-          sha256 = "1j3qq54v68nal60zxnc89a7cy5bbsnn1bp97n3giwdk03rla4yk6";
+          rev = "1249d62fe1d962e38ab8d9e48813c1ad5d21ae51";
+          sha256 = "0i8r7kv2kai1r1fs509j3lx4kzv8bv6qsb3882qh6hjcnlpf0pyy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -76486,8 +76791,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "69c4e154f9335750ab8658a00577952930138a79";
-          sha256 = "166zhipzsv2v2qlxglmxr8a0syi5aq2rrh8sxs6n4wmnpgcfglhg";
+          rev = "fdff36994bc59bb02c1968684862ded9003c6c7d";
+          sha256 = "0w38s7xl77ch8h65x2njn9nwvwdxjw7rz15gw2qmp69sjv4nvnna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -76736,8 +77041,8 @@
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "yarn-mode";
-          rev = "99891000efe31214b065fa9446cd5e68c5c42ed8";
-          sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy";
+          rev = "998b408d6be05fd1c3a9fd8db6ffaab3bf86d06b";
+          sha256 = "09mrcv30n6zmgnwgl5pb2cyk6122a0ng1xg20grpmlwbq3qlr424";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode";
@@ -76774,12 +77079,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170723.1530";
+        version = "20170808.940";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5";
-          sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1";
+          rev = "e371c119ecc9044c8ca2d6b93215121eb714d6b1";
+          sha256 = "02md6332891fwwiqqf9x3sjd7568lg2lmjcx79cdjcl5hjik7qdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -76881,8 +77186,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6";
-          sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh";
+          rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
+          sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -77036,13 +77341,13 @@
         pname = "zeitgeist";
         version = "20131228.1009";
         src = fetchgit {
-          url = "git://anongit.freedesktop.org/zeitgeist/zeitgeist-datasources";
+          url = "https://anongit.freedesktop.org/git/zeitgeist/zeitgeist-datasources.git";
           rev = "cdd1c219ed3afa9500403c3c499f49583d599034";
           sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fb5f96d92b33fe97573334038f2fe4f984f37cca/recipes/zeitgeist";
-          sha256 = "0m6drp3c6hp70ypbva3ji2dndl9an1jm2zlhnpwmjxsmw47cd732";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/zeitgeist";
+          sha256 = "0zbpmdf7fq3qph70m13giir58y1n5z6q6kqixjll5j4fk98k6bkz";
           name = "zeitgeist";
         };
         packageRequires = [];
@@ -77134,6 +77439,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "zephir-mode";
+        version = "20170808.1302";
+        src = fetchFromGitHub {
+          owner = "sergeyklay";
+          repo = "zephir-mode";
+          rev = "9295bb18b273502dfcc75c34c04ce9f48fe4e53a";
+          sha256 = "17wsl7c9fcr6qybr7qhlvkikb11n809cxi6ghgskh131a8mxb4fn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
+          sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j";
+          name = "zephir-mode";
+        };
+        packageRequires = [ cl-lib emacs pkg-info ];
+        meta = {
+          homepage = "https://melpa.org/#/zephir-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
@@ -77346,10 +77672,10 @@
       }) {};
     zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "zones";
-        version = "20170605.1046";
+        version = "20170802.1406";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/zones.el?revision=30";
-          sha256 = "05my99nn7pj5alswfhd11kkyibivqh65bhjfalbfv7flfmvg6pcz";
+          url = "https://www.emacswiki.org/emacs/download/zones.el?revision=32";
+          sha256 = "02vvkj2nx5ha1ad1zn5jd91jakxwx1pkrysj07a8y2sg657d7nkk";
           name = "zones.el";
         };
         recipeFile = fetchurl {
@@ -77620,8 +77946,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "zzz-to-char";
-          rev = "b62414b155fe2e09d91b70059a909d1403d89acf";
-          sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj";
+          rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0";
+          sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char";

From 5e89bcae00a52c5bf8388c2b737455d3980e83d7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 9 Aug 2017 23:35:09 +0200
Subject: [PATCH 1789/3246] evolution_data_server: wrap all and only
 executables

---
 .../gnome-3/3.22/core/evolution-data-server/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
index a8c3f724b85..c2038ecdce6 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   preFixup = ''
-    for f in "$out/libexec/"*; do
+    for f in $(find $out/libexec/ -type f -executable); do
       wrapProgram "$f" \
         --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
         --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"

From b1f5305abd7b1b3d7ed180d9d00301da6e323e41 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 9 Aug 2017 23:53:08 +0200
Subject: [PATCH 1790/3246] serf: fix darwin build

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

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 3fab42e3eb5..001199cd821 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos
-, pkgconfig, gnused, expat, openldap }:
+, pkgconfig, gnused, expat, openldap, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "serf-1.3.9";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ apr scons openssl aprutil zlib ]
+  buildInputs = [ apr scons openssl aprutil zlib libiconv ]
     ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
 
   postPatch = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \
-      LINKFLAGS="-L${zlib.out}/lib -L${expat}/lib -L${openldap}/lib" \
+      LINKFLAGS="-L${zlib.out}/lib -L${expat}/lib -L${openldap}/lib -L${libiconv}/lib" \
         APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
           if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
         }" ${

From 7e5332c86870336706f51faca50ea5a1b3e9bad5 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 9 Aug 2017 22:07:01 +0000
Subject: [PATCH 1791/3246] tinc: allow the daemon to write to files in
 /etc/tinc/${network}/hosts

Follow up https://github.com/NixOS/nixpkgs/pull/27756: tinc daemon may also create new files in ```/etc/tinc/$network/hosts```
---
 nixos/modules/services/networking/tinc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index b70e44ff542..7410908b735 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -172,6 +172,7 @@ in
         };
         preStart = ''
           mkdir -p /etc/tinc/${network}/hosts
+          chown tinc.${network} /etc/tinc/${network}/hosts
 
           # Determine how we should generate our keys
           if type tinc >/dev/null 2>&1; then

From bf8c1251708f013ecbcf3a1c6770a175e9161170 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 9 Aug 2017 23:00:56 +0200
Subject: [PATCH 1792/3246] cc-wrapper: fix LD_DYLD_PATH on darwin

Having multiple compilers in the build environment would result in an
invalid LD_DYLD_PATH like /usr/lib/dyld/usr/lib/dyld.
Since the path is hardcoded in XNU it can't be anything but
/usr/lib/dyld anyway.
---
 pkgs/build-support/cc-wrapper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 01d1bbd7a5d..905135e7adc 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -150,7 +150,7 @@ stdenv.mkDerivation {
         echo $dynamicLinker > $out/nix-support/dynamic-linker
 
     '' + (if targetPlatform.isDarwin then ''
-        printf "export LD_DYLD_PATH+=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
+        printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
     '' else ''
         if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
           echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32

From b32b18631e94ebbb0e6f201db24b6b541b901f89 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 9 Aug 2017 22:35:20 +0000
Subject: [PATCH 1793/3246] nixos/tinc: do not tell systemd where is pidfile

```Tinc```'s pid file has more info than just a pid

```
# cat /run/tinc.dmz.pid
12209 7BD4A657B4A04364D268D188A0F4AA972A05247D802149246BBE1F1E689CABA1 127.0.0.1 port 656
```
so ```systemd``` fails to parse it.
It results in long (re)start times when ```systemd``` waits for a correct pid file to appear.
---
 nixos/modules/services/networking/tinc.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 7410908b735..7a786b54ccb 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -166,7 +166,6 @@ in
         path = [ data.package ];
         serviceConfig = {
           Type = "simple";
-          PIDFile = "/run/tinc.${network}.pid";
           Restart = "always";
           RestartSec = "3";
         };

From cc5480cb0025d8552b5ddb0bf6297d459f5a84d7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 00:43:26 +0200
Subject: [PATCH 1794/3246] csmith: fix wrapProgram call

---
 pkgs/development/tools/misc/csmith/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix
index 38772a4dd89..9a8c24fa168 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/pkgs/development/tools/misc/csmith/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
       --replace '../compiler_test.pl' $out/bin/compiler_test.pl \
       --replace '../$CONFIG_FILE' '$CONFIG_FILE'
 
-    wrapProgram $out/bin/launchn.pl --prefix PERL5LIB : "$PERL5LIB" $out/bin/launchn.pl
+    wrapProgram $out/bin/launchn.pl \
+      --prefix PERL5LIB : "$PERL5LIB"
 
     mkdir -p $out/share/csmith
     mv $out/bin/compiler_test.in $out/share/csmith/

From 767b2ae327ba3dcd0e245c074836893439e53148 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 7 Aug 2017 01:30:27 +0200
Subject: [PATCH 1795/3246] nixos/dnscrypt-proxy: default to random upstream
 resolver

---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 077aeca457e..ed658258c7f 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -82,14 +82,13 @@ in
       };
 
       resolverName = mkOption {
-        default = "dnscrypt.eu-nl";
+        default = "random";
+        example = "dnscrypt.eu-nl";
         type = types.nullOr types.str;
         description = ''
           The name of the DNSCrypt resolver to use, taken from
-          <filename>${resolverList}</filename>.  The default
-          resolver is located in Holland, supports DNS security
-          extensions, and <emphasis>claims</emphasis> to not
-          keep logs.
+          <filename>${resolverList}</filename>.  The default is to
+          pick a random non-logging resolver that supports DNSSEC.
         '';
       };
 

From 3bfce2f55ff530d6e78f67cedb13e12711f5baa5 Mon Sep 17 00:00:00 2001
From: Ben Zhang <benzhangniu@gmail.com>
Date: Wed, 9 Aug 2017 19:26:27 -0400
Subject: [PATCH 1796/3246] nodePackages.lerna: init at 2.0.0

---
 .../node-packages/node-packages-v6.json       |    1 +
 .../node-packages/node-packages-v6.nix        | 1159 ++++++++++++++---
 2 files changed, 987 insertions(+), 173 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 1da53d8e773..7e49f7fedae 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -39,6 +39,7 @@
 , "js-yaml"
 , "karma"
 , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
+, "lerna"
 , "lcov-result-merger"
 , "meat"
 , "mocha"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 229c5743a4d..4add1fccb53 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -14553,6 +14553,627 @@ let
         sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
       };
     };
+    "command-join-2.0.0" = {
+      name = "command-join";
+      packageName = "command-join";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/command-join/-/command-join-2.0.0.tgz";
+        sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf";
+      };
+    };
+    "conventional-changelog-cli-1.3.2" = {
+      name = "conventional-changelog-cli";
+      packageName = "conventional-changelog-cli";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz";
+        sha1 = "33abf2b5720a9b094df38e81741ccb502e1a4125";
+      };
+    };
+    "conventional-recommended-bump-1.0.1" = {
+      name = "conventional-recommended-bump";
+      packageName = "conventional-recommended-bump";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz";
+        sha1 = "56b8ae553a8a1152fa069e767599e1f6948bd36c";
+      };
+    };
+    "dedent-0.7.0" = {
+      name = "dedent";
+      packageName = "dedent";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz";
+        sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c";
+      };
+    };
+    "fs-extra-3.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz";
+        sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291";
+      };
+    };
+    "get-port-3.1.0" = {
+      name = "get-port";
+      packageName = "get-port";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-port/-/get-port-3.1.0.tgz";
+        sha1 = "ef01b18a84ca6486970ff99e54446141a73ffd3e";
+      };
+    };
+    "globby-6.1.0" = {
+      name = "globby";
+      packageName = "globby";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz";
+        sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c";
+      };
+    };
+    "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";
+      };
+    };
+    "load-json-file-2.0.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+      };
+    };
+    "read-cmd-shim-1.0.1" = {
+      name = "read-cmd-shim";
+      packageName = "read-cmd-shim";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz";
+        sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b";
+      };
+    };
+    "read-pkg-2.0.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+      };
+    };
+    "strong-log-transformer-1.0.6" = {
+      name = "strong-log-transformer";
+      packageName = "strong-log-transformer";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz";
+        sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3";
+      };
+    };
+    "temp-write-3.3.0" = {
+      name = "temp-write";
+      packageName = "temp-write";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/temp-write/-/temp-write-3.3.0.tgz";
+        sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9";
+      };
+    };
+    "write-file-atomic-2.1.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
+        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
+      };
+    };
+    "write-json-file-2.2.0" = {
+      name = "write-json-file";
+      packageName = "write-json-file";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.2.0.tgz";
+        sha1 = "51862506bbb3b619eefab7859f1fd6c6d0530876";
+      };
+    };
+    "write-pkg-3.1.0" = {
+      name = "write-pkg";
+      packageName = "write-pkg";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz";
+        sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9";
+      };
+    };
+    "yargs-8.0.2" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "8.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
+        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
+      };
+    };
+    "add-stream-1.0.0" = {
+      name = "add-stream";
+      packageName = "add-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz";
+        sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa";
+      };
+    };
+    "conventional-changelog-1.1.4" = {
+      name = "conventional-changelog";
+      packageName = "conventional-changelog";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.4.tgz";
+        sha1 = "108bc750c2a317e200e2f9b413caaa1f8c7efa3b";
+      };
+    };
+    "tempfile-1.1.1" = {
+      name = "tempfile";
+      packageName = "tempfile";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz";
+        sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
+      };
+    };
+    "conventional-changelog-angular-1.4.0" = {
+      name = "conventional-changelog-angular";
+      packageName = "conventional-changelog-angular";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz";
+        sha1 = "118b9f7d41a3d99500bfb6bea1f3525e055e8b9b";
+      };
+    };
+    "conventional-changelog-atom-0.1.1" = {
+      name = "conventional-changelog-atom";
+      packageName = "conventional-changelog-atom";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz";
+        sha1 = "d40a9b297961b53c745e5d1718fd1a3379f6a92f";
+      };
+    };
+    "conventional-changelog-codemirror-0.1.0" = {
+      name = "conventional-changelog-codemirror";
+      packageName = "conventional-changelog-codemirror";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz";
+        sha1 = "7577a591dbf9b538e7a150a7ee62f65a2872b334";
+      };
+    };
+    "conventional-changelog-core-1.9.0" = {
+      name = "conventional-changelog-core";
+      packageName = "conventional-changelog-core";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz";
+        sha1 = "de5dfbc091847656508d4a389e35c9a1bc49e7f4";
+      };
+    };
+    "conventional-changelog-ember-0.2.6" = {
+      name = "conventional-changelog-ember";
+      packageName = "conventional-changelog-ember";
+      version = "0.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz";
+        sha1 = "8b7355419f5127493c4c562473ab2fc792f1c2b6";
+      };
+    };
+    "conventional-changelog-eslint-0.1.0" = {
+      name = "conventional-changelog-eslint";
+      packageName = "conventional-changelog-eslint";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz";
+        sha1 = "a52411e999e0501ce500b856b0a643d0330907e2";
+      };
+    };
+    "conventional-changelog-express-0.1.0" = {
+      name = "conventional-changelog-express";
+      packageName = "conventional-changelog-express";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz";
+        sha1 = "55c6c841c811962036c037bdbd964a54ae310fce";
+      };
+    };
+    "conventional-changelog-jquery-0.1.0" = {
+      name = "conventional-changelog-jquery";
+      packageName = "conventional-changelog-jquery";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz";
+        sha1 = "0208397162e3846986e71273b6c79c5b5f80f510";
+      };
+    };
+    "conventional-changelog-jscs-0.1.0" = {
+      name = "conventional-changelog-jscs";
+      packageName = "conventional-changelog-jscs";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz";
+        sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c";
+      };
+    };
+    "conventional-changelog-jshint-0.1.0" = {
+      name = "conventional-changelog-jshint";
+      packageName = "conventional-changelog-jshint";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz";
+        sha1 = "00cab8e9a3317487abd94c4d84671342918d2a07";
+      };
+    };
+    "compare-func-1.3.2" = {
+      name = "compare-func";
+      packageName = "compare-func";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz";
+        sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648";
+      };
+    };
+    "github-url-from-git-1.5.0" = {
+      name = "github-url-from-git";
+      packageName = "github-url-from-git";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz";
+        sha1 = "f985fedcc0a9aa579dc88d7aff068d55cc6251a0";
+      };
+    };
+    "read-pkg-up-2.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+      };
+    };
+    "array-ify-1.0.0" = {
+      name = "array-ify";
+      packageName = "array-ify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz";
+        sha1 = "9e528762b4a9066ad163a6962a364418e9626ece";
+      };
+    };
+    "conventional-changelog-writer-1.4.1" = {
+      name = "conventional-changelog-writer";
+      packageName = "conventional-changelog-writer";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz";
+        sha1 = "3f4cb4d003ebb56989d30d345893b52a43639c8e";
+      };
+    };
+    "conventional-commits-parser-1.3.0" = {
+      name = "conventional-commits-parser";
+      packageName = "conventional-commits-parser";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz";
+        sha1 = "e327b53194e1a7ad5dc63479ee9099a52b024865";
+      };
+    };
+    "dateformat-1.0.12" = {
+      name = "dateformat";
+      packageName = "dateformat";
+      version = "1.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz";
+        sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9";
+      };
+    };
+    "get-pkg-repo-1.4.0" = {
+      name = "get-pkg-repo";
+      packageName = "get-pkg-repo";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz";
+        sha1 = "c73b489c06d80cc5536c2c853f9e05232056972d";
+      };
+    };
+    "git-raw-commits-1.2.0" = {
+      name = "git-raw-commits";
+      packageName = "git-raw-commits";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz";
+        sha1 = "0f3a8bfd99ae0f2d8b9224d58892975e9a52d03c";
+      };
+    };
+    "git-remote-origin-url-2.0.0" = {
+      name = "git-remote-origin-url";
+      packageName = "git-remote-origin-url";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz";
+        sha1 = "5282659dae2107145a11126112ad3216ec5fa65f";
+      };
+    };
+    "git-semver-tags-1.2.1" = {
+      name = "git-semver-tags";
+      packageName = "git-semver-tags";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz";
+        sha1 = "6ccd2a52e735b736748dc762444fcd9588e27490";
+      };
+    };
+    "conventional-commits-filter-1.0.0" = {
+      name = "conventional-commits-filter";
+      packageName = "conventional-commits-filter";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz";
+        sha1 = "6fc2a659372bc3f2339cf9ffff7e1b0344b93039";
+      };
+    };
+    "split-1.0.1" = {
+      name = "split";
+      packageName = "split";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
+        sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9";
+      };
+    };
+    "is-subset-0.1.1" = {
+      name = "is-subset";
+      packageName = "is-subset";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz";
+        sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6";
+      };
+    };
+    "modify-values-1.0.0" = {
+      name = "modify-values";
+      packageName = "modify-values";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz";
+        sha1 = "e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2";
+      };
+    };
+    "is-text-path-1.0.1" = {
+      name = "is-text-path";
+      packageName = "is-text-path";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz";
+        sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e";
+      };
+    };
+    "trim-off-newlines-1.0.1" = {
+      name = "trim-off-newlines";
+      packageName = "trim-off-newlines";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz";
+        sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3";
+      };
+    };
+    "text-extensions-1.5.0" = {
+      name = "text-extensions";
+      packageName = "text-extensions";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.5.0.tgz";
+        sha1 = "d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc";
+      };
+    };
+    "parse-github-repo-url-1.4.0" = {
+      name = "parse-github-repo-url";
+      packageName = "parse-github-repo-url";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz";
+        sha1 = "286c53e2c9962e0641649ee3ac9508fca4dd959c";
+      };
+    };
+    "dargs-4.1.0" = {
+      name = "dargs";
+      packageName = "dargs";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz";
+        sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17";
+      };
+    };
+    "lodash.template-4.4.0" = {
+      name = "lodash.template";
+      packageName = "lodash.template";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz";
+        sha1 = "e73a0385c8355591746e020b99679c690e68fba0";
+      };
+    };
+    "lodash.templatesettings-4.1.0" = {
+      name = "lodash.templatesettings";
+      packageName = "lodash.templatesettings";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz";
+        sha1 = "2b4d4e95ba440d915ff08bc899e4553666713316";
+      };
+    };
+    "gitconfiglocal-1.0.0" = {
+      name = "gitconfiglocal";
+      packageName = "gitconfiglocal";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz";
+        sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b";
+      };
+    };
+    "conventional-commits-parser-2.0.0" = {
+      name = "conventional-commits-parser";
+      packageName = "conventional-commits-parser";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz";
+        sha1 = "71d01910cb0a99aeb20c144e50f81f4df3178447";
+      };
+    };
+    "jsonfile-3.0.1" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz";
+        sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66";
+      };
+    };
+    "universalify-0.1.1" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz";
+        sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7";
+      };
+    };
+    "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";
+      };
+    };
+    "strip-bom-3.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+      };
+    };
+    "path-type-2.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+      };
+    };
+    "byline-5.0.0" = {
+      name = "byline";
+      packageName = "byline";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz";
+        sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1";
+      };
+    };
+    "minimist-0.1.0" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
+        sha1 = "99df657a52574c21c9057497df742790b2b4c0de";
+      };
+    };
+    "temp-dir-1.0.0" = {
+      name = "temp-dir";
+      packageName = "temp-dir";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz";
+        sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d";
+      };
+    };
+    "detect-indent-5.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
+        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
+      };
+    };
+    "sort-keys-2.0.0" = {
+      name = "sort-keys";
+      packageName = "sort-keys";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz";
+        sha1 = "658535584861ec97d730d6cf41822e1f56684128";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    };
+    "os-locale-2.1.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
+        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
+      };
+    };
+    "which-module-2.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    };
+    "yargs-parser-7.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
+        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
+      };
+    };
+    "execa-0.7.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+      };
+    };
     "vinyl-1.2.0" = {
       name = "vinyl";
       packageName = "vinyl";
@@ -16857,15 +17478,6 @@ let
         sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea";
       };
     };
-    "detect-indent-5.0.0" = {
-      name = "detect-indent";
-      packageName = "detect-indent";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
-        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
-      };
-    };
     "fstream-npm-1.2.1" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -17010,15 +17622,6 @@ let
         sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
       };
     };
-    "read-cmd-shim-1.0.1" = {
-      name = "read-cmd-shim";
-      packageName = "read-cmd-shim";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz";
-        sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b";
-      };
-    };
     "read-package-tree-5.1.6" = {
       name = "read-package-tree";
       packageName = "read-package-tree";
@@ -17073,15 +17676,6 @@ let
         sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8";
       };
     };
-    "write-file-atomic-2.1.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
-      };
-    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -17118,105 +17712,6 @@ let
         sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d";
       };
     };
-    "yargs-8.0.2" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "8.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
-        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
-      };
-    };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
-      };
-    };
-    "os-locale-2.1.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
-      };
-    };
-    "read-pkg-up-2.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
-      };
-    };
-    "which-module-2.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
-        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
-      };
-    };
-    "yargs-parser-7.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
-        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
-      };
-    };
-    "execa-0.7.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
-        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
-      };
-    };
-    "read-pkg-2.0.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
-        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
-      };
-    };
-    "load-json-file-2.0.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
-        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
-      };
-    };
-    "path-type-2.0.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
-        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
-      };
-    };
-    "strip-bom-3.0.0" = {
-      name = "strip-bom";
-      packageName = "strip-bom";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
-        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
-      };
-    };
     "lodash._createset-4.0.3" = {
       name = "lodash._createset";
       packageName = "lodash._createset";
@@ -18081,15 +18576,6 @@ let
         sha1 = "30fc2b11c07064591ee35780c826be91312f2144";
       };
     };
-    "tempfile-1.1.1" = {
-      name = "tempfile";
-      packageName = "tempfile";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz";
-        sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
-      };
-    };
     "then-fs-2.0.0" = {
       name = "then-fs";
       packageName = "then-fs";
@@ -20867,15 +21353,6 @@ let
         sha1 = "39c72ed89d1b49ba708e18776500488902a52027";
       };
     };
-    "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.1.0" = {
       name = "leven";
       packageName = "leven";
@@ -20957,15 +21434,6 @@ let
         sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52";
       };
     };
-    "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";
-      };
-    };
     "lodash.toarray-4.4.0" = {
       name = "lodash.toarray";
       packageName = "lodash.toarray";
@@ -21092,13 +21560,13 @@ let
         sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
       };
     };
-    "yeoman-environment-2.0.1" = {
+    "yeoman-environment-2.0.2" = {
       name = "yeoman-environment";
       packageName = "yeoman-environment";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.1.tgz";
-        sha1 = "2b89415abd47775878bf4f77dbca97158f77de88";
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.2.tgz";
+        sha1 = "504ece28e11b5ac487e90b97d8189afa38db4331";
       };
     };
     "yosay-2.0.1" = {
@@ -21362,15 +21830,6 @@ let
         sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9";
       };
     };
-    "globby-6.1.0" = {
-      name = "globby";
-      packageName = "globby";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz";
-        sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c";
-      };
-    };
     "grouped-queue-0.3.3" = {
       name = "grouped-queue";
       packageName = "grouped-queue";
@@ -25530,10 +25989,10 @@ in
   jayschema = nodeEnv.buildNodePackage {
     name = "jayschema";
     packageName = "jayschema";
-    version = "0.3.1";
+    version = "0.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
-      sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58";
+      url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz";
+      sha1 = "7630ef74577274e95ad6d386ddfa091fcee8df4b";
     };
     dependencies = [
       sources."when-3.4.6"
@@ -26539,6 +26998,360 @@ in
     };
     production = true;
   };
+  lerna = nodeEnv.buildNodePackage {
+    name = "lerna";
+    packageName = "lerna";
+    version = "2.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lerna/-/lerna-2.0.0.tgz";
+      sha1 = "49a72fe70e06aebfd7ea23efb2ab41abe60ebeea";
+    };
+    dependencies = [
+      sources."async-1.5.2"
+      sources."chalk-1.1.3"
+      sources."cmd-shim-2.0.2"
+      sources."columnify-1.5.4"
+      sources."command-join-2.0.0"
+      sources."conventional-changelog-cli-1.3.2"
+      (sources."conventional-recommended-bump-1.0.1" // {
+        dependencies = [
+          sources."conventional-commits-parser-2.0.0"
+        ];
+      })
+      sources."dedent-0.7.0"
+      sources."execa-0.6.3"
+      sources."find-up-2.1.0"
+      sources."fs-extra-3.0.1"
+      sources."get-port-3.1.0"
+      sources."glob-7.1.2"
+      sources."globby-6.1.0"
+      sources."graceful-fs-4.1.11"
+      (sources."inquirer-3.2.1" // {
+        dependencies = [
+          sources."chalk-2.1.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      sources."is-ci-1.0.10"
+      (sources."load-json-file-2.0.0" // {
+        dependencies = [
+          sources."strip-bom-3.0.0"
+        ];
+      })
+      sources."lodash-4.17.4"
+      sources."minimatch-3.0.4"
+      sources."npmlog-4.1.2"
+      sources."p-finally-1.0.0"
+      sources."path-exists-3.0.0"
+      sources."read-cmd-shim-1.0.1"
+      (sources."read-pkg-2.0.0" // {
+        dependencies = [
+          sources."path-type-2.0.0"
+        ];
+      })
+      sources."rimraf-2.6.1"
+      sources."safe-buffer-5.1.1"
+      sources."semver-5.4.1"
+      sources."signal-exit-3.0.2"
+      (sources."strong-log-transformer-1.0.6" // {
+        dependencies = [
+          sources."minimist-0.1.0"
+        ];
+      })
+      (sources."temp-write-3.3.0" // {
+        dependencies = [
+          sources."uuid-3.1.0"
+        ];
+      })
+      sources."write-file-atomic-2.1.0"
+      sources."write-json-file-2.2.0"
+      (sources."write-pkg-3.1.0" // {
+        dependencies = [
+          sources."sort-keys-2.0.0"
+        ];
+      })
+      (sources."yargs-8.0.2" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+          (sources."cliui-3.2.0" // {
+            dependencies = [
+              sources."string-width-1.0.2"
+            ];
+          })
+          sources."is-fullwidth-code-point-1.0.0"
+        ];
+      })
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."mkdirp-0.5.1"
+      sources."minimist-0.0.8"
+      sources."wcwidth-1.0.1"
+      sources."defaults-1.0.3"
+      sources."clone-1.0.2"
+      sources."add-stream-1.0.0"
+      sources."conventional-changelog-1.1.4"
+      (sources."meow-3.7.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+          sources."read-pkg-up-1.0.1"
+          sources."find-up-1.1.2"
+          sources."read-pkg-1.1.0"
+          sources."path-exists-2.1.0"
+          sources."load-json-file-1.1.0"
+        ];
+      })
+      sources."tempfile-1.1.1"
+      sources."conventional-changelog-angular-1.4.0"
+      sources."conventional-changelog-atom-0.1.1"
+      sources."conventional-changelog-codemirror-0.1.0"
+      (sources."conventional-changelog-core-1.9.0" // {
+        dependencies = [
+          sources."read-pkg-1.1.0"
+          sources."read-pkg-up-1.0.1"
+          sources."load-json-file-1.1.0"
+          sources."find-up-1.1.2"
+          sources."path-exists-2.1.0"
+        ];
+      })
+      sources."conventional-changelog-ember-0.2.6"
+      sources."conventional-changelog-eslint-0.1.0"
+      sources."conventional-changelog-express-0.1.0"
+      sources."conventional-changelog-jquery-0.1.0"
+      sources."conventional-changelog-jscs-0.1.0"
+      sources."conventional-changelog-jshint-0.1.0"
+      sources."compare-func-1.3.2"
+      sources."github-url-from-git-1.5.0"
+      sources."q-1.5.0"
+      sources."read-pkg-up-2.0.0"
+      sources."array-ify-1.0.0"
+      sources."dot-prop-3.0.0"
+      sources."is-obj-1.0.1"
+      sources."conventional-changelog-writer-1.4.1"
+      sources."conventional-commits-parser-1.3.0"
+      sources."dateformat-1.0.12"
+      sources."get-pkg-repo-1.4.0"
+      sources."git-raw-commits-1.2.0"
+      sources."git-remote-origin-url-2.0.0"
+      sources."git-semver-tags-1.2.1"
+      sources."normalize-package-data-2.4.0"
+      sources."through2-2.0.3"
+      sources."conventional-commits-filter-1.0.0"
+      sources."handlebars-4.0.10"
+      sources."json-stringify-safe-5.0.1"
+      sources."split-1.0.1"
+      sources."is-subset-0.1.1"
+      sources."modify-values-1.0.0"
+      sources."optimist-0.6.1"
+      sources."source-map-0.4.4"
+      (sources."uglify-js-2.8.29" // {
+        dependencies = [
+          sources."source-map-0.5.6"
+          sources."yargs-3.10.0"
+        ];
+      })
+      sources."wordwrap-0.0.3"
+      sources."amdefine-1.0.1"
+      sources."uglify-to-browserify-1.0.2"
+      sources."camelcase-1.2.1"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      sources."window-size-0.1.0"
+      sources."center-align-0.1.3"
+      sources."right-align-0.1.3"
+      sources."align-text-0.1.4"
+      sources."lazy-cache-1.0.4"
+      sources."kind-of-3.2.2"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.5"
+      sources."through-2.3.8"
+      sources."JSONStream-1.3.1"
+      sources."is-text-path-1.0.1"
+      sources."split2-2.1.1"
+      sources."trim-off-newlines-1.0.1"
+      sources."jsonparse-1.3.1"
+      sources."text-extensions-1.5.0"
+      sources."get-stdin-4.0.1"
+      sources."parse-github-repo-url-1.4.0"
+      sources."hosted-git-info-2.5.0"
+      sources."dargs-4.1.0"
+      sources."lodash.template-4.4.0"
+      sources."number-is-nan-1.0.1"
+      sources."lodash._reinterpolate-3.0.0"
+      sources."lodash.templatesettings-4.1.0"
+      sources."gitconfiglocal-1.0.0"
+      sources."pify-2.3.0"
+      sources."ini-1.3.4"
+      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."path-type-1.1.0"
+      sources."parse-json-2.2.0"
+      sources."pinkie-promise-2.0.1"
+      sources."strip-bom-2.0.0"
+      sources."error-ex-1.3.1"
+      sources."is-arrayish-0.2.1"
+      sources."pinkie-2.0.4"
+      sources."is-utf8-0.2.1"
+      sources."readable-stream-2.3.3"
+      sources."xtend-4.0.1"
+      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-1.0.3"
+      sources."util-deprecate-1.0.2"
+      (sources."camelcase-keys-2.1.0" // {
+        dependencies = [
+          sources."camelcase-2.1.1"
+        ];
+      })
+      sources."loud-rejection-1.6.0"
+      sources."map-obj-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."redent-1.0.0"
+      sources."trim-newlines-1.0.0"
+      sources."currently-unhandled-0.4.1"
+      sources."array-find-index-1.0.2"
+      sources."indent-string-2.1.0"
+      sources."strip-indent-1.0.1"
+      sources."repeating-2.0.1"
+      sources."is-finite-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."uuid-2.0.3"
+      sources."concat-stream-1.6.0"
+      sources."typedarray-0.0.6"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."strip-eof-1.0.0"
+      sources."lru-cache-4.1.1"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
+      sources."path-key-2.0.1"
+      sources."locate-path-2.0.0"
+      sources."p-locate-2.0.0"
+      sources."p-limit-1.1.0"
+      sources."jsonfile-3.0.1"
+      sources."universalify-0.1.1"
+      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."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."ansi-escapes-2.0.0"
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.1.0"
+      sources."external-editor-2.0.4"
+      sources."figures-2.0.0"
+      sources."mute-stream-0.0.7"
+      sources."run-async-2.3.0"
+      sources."rx-lite-4.0.8"
+      sources."rx-lite-aggregates-4.0.8"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
+      sources."restore-cursor-2.0.0"
+      sources."onetime-2.0.1"
+      sources."mimic-fn-1.1.0"
+      sources."iconv-lite-0.4.18"
+      sources."jschardet-1.5.1"
+      sources."tmp-0.0.31"
+      sources."is-promise-2.1.0"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."ci-info-1.0.0"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+      sources."are-we-there-yet-1.1.4"
+      sources."console-control-strings-1.1.0"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."is-fullwidth-code-point-1.0.0"
+        ];
+      })
+      sources."set-blocking-2.0.0"
+      sources."delegates-1.0.0"
+      sources."aproba-1.1.2"
+      sources."has-unicode-2.0.1"
+      (sources."wide-align-1.1.2" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."is-fullwidth-code-point-1.0.0"
+        ];
+      })
+      sources."code-point-at-1.1.0"
+      sources."byline-5.0.0"
+      sources."duplexer-0.1.1"
+      sources."moment-2.18.1"
+      sources."make-dir-1.0.0"
+      sources."temp-dir-1.0.0"
+      sources."imurmurhash-0.1.4"
+      sources."slide-1.1.6"
+      sources."detect-indent-5.0.0"
+      sources."sort-keys-1.1.2"
+      sources."is-plain-obj-1.1.0"
+      sources."get-caller-file-1.0.2"
+      (sources."os-locale-2.1.0" // {
+        dependencies = [
+          sources."execa-0.7.0"
+        ];
+      })
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."which-module-2.0.0"
+      sources."y18n-3.2.1"
+      (sources."yargs-parser-7.0.0" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+        ];
+      })
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."is-fullwidth-code-point-1.0.0"
+        ];
+      })
+      sources."lcid-1.0.0"
+      sources."mem-1.1.0"
+      sources."invert-kv-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Tool for managing JavaScript projects with multiple packages";
+      homepage = https://lernajs.io/;
+      license = "MIT";
+    };
+    production = true;
+  };
   lcov-result-merger = nodeEnv.buildNodePackage {
     name = "lcov-result-merger";
     packageName = "lcov-result-merger";
@@ -32436,10 +33249,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "3.5.1";
+    version = "3.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-3.5.1.tgz";
-      sha1 = "b749ee3d2b5a118dad53e8e41585b3f71e75499a";
+      url = "https://registry.npmjs.org/webpack/-/webpack-3.5.2.tgz";
+      sha1 = "a9601066e23af3c80f3bf9758fd794ca9778f251";
     };
     dependencies = [
       sources."acorn-5.1.1"
@@ -33215,7 +34028,7 @@ in
         ];
       })
       sources."yeoman-doctor-2.1.0"
-      sources."yeoman-environment-2.0.1"
+      sources."yeoman-environment-2.0.2"
       (sources."yosay-2.0.1" // {
         dependencies = [
           sources."ansi-styles-3.2.0"

From b4d2b841d984a3e692d9a911870f00fa167900d9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 01:26:30 +0200
Subject: [PATCH 1797/3246] libreoffice: remove obsolete file from wrapping

---
 pkgs/applications/office/libreoffice/still.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 7c122c0725a..7f564379c66 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -163,7 +163,7 @@ in stdenv.mkDerivation rec {
 
     mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
 
-    for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
+    for a in sbase scalc sdraw smath swriter simpress soffice; do
       ln -s $out/lib/libreoffice/program/$a $out/bin/$a
       wrapProgram "$out/bin/$a" \
          --prefix XDG_DATA_DIRS : \

From 5f6fe648230d0e2997ec7ec627b76349ca1d0788 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 03:35:55 +0200
Subject: [PATCH 1798/3246] audio-recorder: fix makeWrapper call

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

diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
index 283d4c7d493..c482e44e7aa 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"'
-      '--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"'
-      '--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"')
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $GST_PLUGIN_SYSTEM_PATH_1_0
+      --prefix GIO_EXTRA_MODULES : ${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules)
   '';
 
   meta = with stdenv.lib; {

From ffd46e9bce2d4e10ddfa57ec5f517e8bee99efdc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 03:36:10 +0200
Subject: [PATCH 1799/3246] gnuradio: fix makeWrapper calls

---
 pkgs/applications/misc/gnuradio/default.nix | 2 +-
 pkgs/applications/misc/gnuradio/wrapper.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 8218285c5fb..e10cb30d187 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc"
 
-    for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do
+    for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do
         wrapProgram "$file" \
             --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
             --set MATPLOTLIBRC "$out/share/gnuradio"
diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix
index cc8dbde273b..db2b453913f 100644
--- a/pkgs/applications/misc/gnuradio/wrapper.nix
+++ b/pkgs/applications/misc/gnuradio/wrapper.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     ln -s "${gnuradio}"/bin/* $out/bin/
 
-    for file in "$out"/bin/*; do
+    for file in $(find $out/bin -type f -executable); do
         wrapProgram "$file" \
             --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
-                                      (map (path: "$(toPythonPath ${path})") extraPackages)} \
+                                     (map (path: "$(toPythonPath ${path})") extraPackages)} \
             --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
     done
 

From 60418e9196e7b8941cc2234db00194d614d38aae Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 03:43:04 +0200
Subject: [PATCH 1800/3246] edac-utils: fix makeWrapper call

---
 pkgs/os-specific/linux/edac-utils/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix
index b24099f9599..13c1218e90c 100644
--- a/pkgs/os-specific/linux/edac-utils/default.nix
+++ b/pkgs/os-specific/linux/edac-utils/default.nix
@@ -25,9 +25,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     wrapProgram "$out/sbin/edac-ctl" \
-      --set PATH : "" \
-      --prefix PATH : "${dmidecode}/bin" \
-      --prefix PATH : "${kmod}/bin"
+      --set PATH ${stdenv.lib.makeBinPath [ dmidecode kmod ]}
   '';
 
   meta = with stdenv.lib; {

From 149df7769af216aca95eb07a992387f7d578068b Mon Sep 17 00:00:00 2001
From: Grant Wu <grantwwu@gmail.com>
Date: Wed, 9 Aug 2017 02:54:22 -0400
Subject: [PATCH 1801/3246] libtorrentRasterbar 1.1.1 -> 1.1.4

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

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index b6aace0de2d..ed52902938d 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.1.1";
-  sha256 = "1185ixlhhwpkqvwhnhrzgply03zq8mycj25m1am9aad8nshiaw3j";
+  version = "1.1.4";
+  sha256 = "1rrp4b7zfz0fnjvax2r9r5rrh6z1s4xqb9dx20gzr4gs8x5v5jws";
 })

From e77068d0825e19ad6d2b624d25dcc6aeceab3076 Mon Sep 17 00:00:00 2001
From: Grant Wu <grantwwu@gmail.com>
Date: Wed, 9 Aug 2017 02:57:29 -0400
Subject: [PATCH 1802/3246] Add note to libtorrent to prevent conflation with
 libtorrentRasterbar

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

diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index 3ff02834247..d1827a6045d 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -1,3 +1,5 @@
+# NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent
+# This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others
 { stdenv, fetchFromGitHub, pkgconfig
 , libtool, autoconf, automake, cppunit
 , openssl, libsigcxx, zlib }:

From a77c7e95fbb56af347cc6d731f8a9c343cdcf1a9 Mon Sep 17 00:00:00 2001
From: Grant Wu <grantwwu@gmail.com>
Date: Wed, 9 Aug 2017 22:40:44 -0400
Subject: [PATCH 1803/3246] libtorrentRasterbar_1_0 1.0.10 -> 1.0.11

---
 pkgs/development/libraries/libtorrent-rasterbar/1.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix
index 97aa0145956..877d8ed434c 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.0.10";
-  sha256 = "1x5gvajplmwx869avlpx8p3c12pzi6wkgqaxmj5049nvw57l00kl";
+  version = "1.0.11";
+  sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i";
 })

From 310563fab8669da2c62ec0b7db22f14141957922 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 10 Aug 2017 04:52:16 +0200
Subject: [PATCH 1804/3246] gist: 4.5.0 -> 4.6.1

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

diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
index f0ab06066a5..11fcae85528 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/pkgs/tools/text/gist/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "gist";
-  version = "4.5.0";
-  sha256 = "0k9bgjdmnr14whmjx6c8d5ak1dpazirj96hk5ds69rl5d9issw0l";
+  version = "4.6.1";
+  sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff";
 
   buildInputs = [ makeWrapper ];
 

From b224644795bc2601da244b0e708ca7754bac64d4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 Aug 2017 10:57:42 +0800
Subject: [PATCH 1805/3246] unetbootin: 613 -> 655

---
 pkgs/tools/cd-dvd/unetbootin/default.nix | 44 ++++++++++++++----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 14076a757f4..4d6ddd546db 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,31 +1,37 @@
-{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
+{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
 , p7zip, mtools, syslinux }:
 
 stdenv.mkDerivation rec {
   name = "unetbootin-${version}";
-  version = "613";
+  version = "655";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
-    sha256 = "1f389z5lqimp4hlxm6zlrh1ja474r6ivzb9r43i9bvf0z1n21f0q";
+  src = fetchFromGitHub {
+    owner  = "unetbootin";
+    repo   = "unetbootin";
+    rev    = version;
+    sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py";
   };
 
-  sourceRoot = ".";
+  sourceRoot = "${name}-src/src/unetbootin";
 
-  buildInputs = [ makeWrapper qt4 qmake4Hook ];
+  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ makeWrapper qmake4Hook ];
+  enableParallelBuilding = true;
 
   # Lots of nice hard-coded paths...
-  postUnpack = ''
+  postPatch = ''
     substituteInPlace unetbootin.cpp \
-      --replace /sbin/fdisk ${utillinux}/sbin/fdisk \
-      --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
-      --replace /sbin/blkid ${utillinux}/sbin/blkid \
-      --replace /bin/df ${coreutils}/bin/df \
-      --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
-      --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
+      --replace /bin/df             ${coreutils}/bin/df \
+      --replace /sbin/blkid         ${utillinux}/sbin/blkid \
+      --replace /sbin/fdisk         ${utillinux}/sbin/fdisk \
+      --replace /sbin/sfdisk        ${utillinux}/sbin/sfdisk \
+      --replace /usr/bin/syslinux   ${syslinux}/bin/syslinux \
+      --replace /usr/bin/extlinux   ${syslinux}/sbin/extlinux \
       --replace /usr/share/syslinux ${syslinux}/share/syslinux
+
     substituteInPlace main.cpp \
       --replace /usr/share/unetbootin $out/share/unetbootin
+
     substituteInPlace unetbootin.desktop \
       --replace /usr/bin $out/bin
   '';
@@ -46,15 +52,15 @@ stdenv.mkDerivation rec {
     cp unetbootin.desktop $out/share/applications
 
     wrapProgram $out/bin/unetbootin \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \
       --set QT_X11_NO_MITSHM 1
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://unetbootin.sourceforge.net/;
+    homepage    = http://unetbootin.sourceforge.net/;
     description = "A tool to create bootable live USB drives from ISO images";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.ebzzry ];
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ ebzzry ];
   };
 }

From 7c669d6f7bb99850417ece83e2f41737dced9889 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Thu, 10 Aug 2017 08:02:20 +0200
Subject: [PATCH 1806/3246] nodejs: 8.2.1 -> 8.3.0

---
 pkgs/development/web/nodejs/v8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 593e9d1e562..a891e637d26 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.2.1";
+    version = "8.3.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "12wcmm2g1zlihja41my5r06sla0s6ygvycxds1ryl3jl2j4nvi02";
+      sha256 = "0lbfp7j73ig0xa3gh8wnl4g3lji7lm34l0ybfys4swl187c3da63";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];

From 75078b9116f65a681786871316b3cdab2999e623 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Thu, 10 Aug 2017 08:38:52 +0200
Subject: [PATCH 1807/3246] networkmanager_dmenu: unstable-2017-05-28 -> 1.1

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

diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix
index 79fad953a2c..82810e714d5 100644
--- a/pkgs/tools/networking/networkmanager_dmenu/default.nix
+++ b/pkgs/tools/networking/networkmanager_dmenu/default.nix
@@ -3,14 +3,14 @@
 
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
-  name = "networkmanager_dmenu-unstable-${version}";
-  version = "2017-05-28";
+  name = "networkmanager_dmenu-${version}";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
-    rev = "eeb8e6922dee887890884f129b51bb21b0047d30";
-    sha256 = "00n82sjjqk76sfxi92f5vnzpngk66cqwyzqdanbszpl019ajr5h6";
+    rev = "v${version}";
+    sha256 = "1z6151z7c4jv5k2i50zr7ld4k3m07dgpmss9f3hsav95cv55dcnb";
   };
 
   buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ];

From 291da85ed9582320694100c851e459793e5dad8a Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Thu, 10 Aug 2017 08:47:07 +0200
Subject: [PATCH 1808/3246] haskell: remove any extraneous outputs from
 sdistTarball

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

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index c67b61acd78..43723b80774 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -75,6 +75,9 @@ rec {
 
   sdistTarball = pkg: lib.overrideDerivation pkg (drv: {
     name = "${drv.pname}-source-${drv.version}";
+    # Since we disable the haddock phase, we also need to override the
+    # outputs since the separate doc output will not be produced.
+    outputs = ["out"];
     buildPhase = "./Setup sdist";
     haddockPhase = ":";
     checkPhase = ":";

From 031eb79a0b99b75577b375a503368a680f7389c1 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 10 Aug 2017 10:13:17 +0000
Subject: [PATCH 1809/3246] ccacheWrapper: extraConfig does not handle special
 characters

An independent part of https://github.com/NixOS/nixpkgs/pull/28022
---
 pkgs/development/tools/misc/ccache/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 765fdfb2ea4..65c7e633f8e 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, runCommand, zlib }:
+{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }:
 
 let ccache = stdenv.mkDerivation rec {
   name = "ccache-${version}";
@@ -32,18 +32,16 @@ let ccache = stdenv.mkDerivation rec {
         isGNU = unwrappedCC.isGNU or false;
       };
       inherit (unwrappedCC) lib;
+      nativeBuildInputs = [ makeWrapper ];
       buildCommand = ''
         mkdir -p $out/bin
 
         wrap() {
           local cname="$1"
           if [ -x "${unwrappedCC}/bin/$cname" ]; then
-            cat > $out/bin/$cname << EOF
-        #!/bin/sh
-        ${extraConfig}
-        exec ${ccache}/bin/ccache ${unwrappedCC}/bin/$cname "\$@"
-        EOF
-            chmod +x $out/bin/$cname
+            makeWrapper ${ccache}/bin/ccache $out/bin/$cname \
+              --run ${stdenv.lib.escapeShellArg extraConfig} \
+              --add-flags ${unwrappedCC}/bin/$cname
           fi
         }
 

From 206a4c9aba6772f01d175e72636d1283dc038cc0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 12:55:46 +0200
Subject: [PATCH 1810/3246] Partly revert "python.buildEnv: only wrap
 executables"

This partly reverts commit 4495bfe1382ea779f02996d0e18d25d892678e8c.

The xen changes should not have been commited.
---
 pkgs/applications/virtualization/xen/packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index f4bde18f3df..8f5262acb02 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -10,6 +10,8 @@ rec {
   xen_4_5-vanilla = callPackage ./4.5.nix {
     # At the very least included seabios and etherboot need gcc49,
     # so we have to build all of it with gcc49.
+    stdenv = overrideCC stdenv gcc49;
+
     meta = {
       description = "vanilla";
       longDescription = ''
@@ -58,6 +60,8 @@ rec {
   xen_4_8-vanilla = callPackage ./4.8.nix {
     # At the very least included seabios and etherboot need gcc49,
     # so we have to build all of it with gcc49.
+    stdenv = overrideCC stdenv gcc49;
+
     meta = {
       description = "vanilla";
       longDescription = ''

From 15351c478046935ae4a5504d492c7db1ad0fa31e Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 10 Aug 2017 11:34:32 +0000
Subject: [PATCH 1811/3246] apply 'restartIfChanged = false' to all libvirtd
 services

Although it is quite safe to restart ```libvirtd``` when there are only ```qemu``` machines, in case if there are ```libvirt_lxc``` containers, a restart may result in putting the whole system into an odd state: the containers go on running but the new ```libvirtd``` daemons do not see them.
---
 nixos/modules/virtualisation/libvirtd.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 57178e05e5c..ade0ba531cf 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -168,8 +168,9 @@ in {
       serviceConfig = {
         Type = "notify";
         KillMode = "process"; # when stopping, leave the VMs alone
-        Restart = "on-failure";
+        Restart = "no";
       };
+      restartIfChanged = false;
     };
 
     systemd.services.libvirt-guests = {
@@ -187,6 +188,7 @@ in {
     systemd.services.virtlogd = {
       description = "Virtual machine log manager";
       serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlogd virtlogd";
+      restartIfChanged = false;
     };
 
     systemd.sockets.virtlockd = {
@@ -198,6 +200,7 @@ in {
     systemd.services.virtlockd = {
       description = "Virtual machine lock manager";
       serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd";
+      restartIfChanged = false;
     };
   };
 }

From b5ea89f50c66d23ad3119aa03186fda858b6c943 Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@openmailbox.org>
Date: Mon, 24 Jul 2017 17:25:38 +0700
Subject: [PATCH 1812/3246] neofetch: 3.0.1 -> 3.2.0

---
 pkgs/tools/misc/neofetch/default.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 2ecaae6a33f..ea2b863cd77 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -1,26 +1,33 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
-  version = "3.0.1";
+  version = "3.2.0";
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "0ccdgyn9m7vbrmjlsxdwv7cagsdg8hy8x4n1mx334pkqvl820jjn";
+    sha256 = "1skkclvkqayqsbywja2fhv18l4rn9kg2da6bkip82zrwd713akl3";
   };
 
-  patchPhase = ''
-    substituteInPlace ./neofetch \
-    --replace "/usr/share" "$out/share"
-  '';
+  # This patch is only needed so that Neofetch 3.2.0 can look for
+  # configuration file, w3m directory (for fetching images) and ASCII
+  # directory properly. It won't be needed in subsequent releases.
+  patches = [
+    (fetchpatch {
+      name = "nixos.patch";
+      url = "https://github.com/konimex/neofetch/releases/download/3.2.0/nixos.patch";
+      sha256 = "0c6vsa74bxq6qlgbv3rrkhzkpvnq4304s6y2r1bl0sachyakaljy";
+    })
+  ];
+
 
   dontBuild = true;
 
 
   makeFlags = [
-    "DESTDIR=$(out)"
-    "PREFIX="
+    "PREFIX=$(out)"
+    "SYSCONFDIR=$(out)/etc"
   ];
 
   meta = with stdenv.lib; {
@@ -28,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/dylanaraps/neofetch;
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ alibabzo ];
+    maintainers = with maintainers; [ alibabzo konimex ];
   };
 }

From f60fffe6976e1eb4bf55076808d6825a2bdca541 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 15:15:22 +0200
Subject: [PATCH 1813/3246] sawfish: fix wrapProgram call

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

diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index 0f362e02ebf..37596f5f212 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about  $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do
       wrapProgram $i \
-        --prefix REP_DL_LOAD_PATH "$out/lib/rep" \
-	--set REP_LOAD_PATH "$out/share/sawfish/lisp"
+        --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \
+        --set REP_LOAD_PATH "$out/share/sawfish/lisp"
     done
   '';
 

From c438fe5a16a16cd8068077df605b377beab786f5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 15:15:44 +0200
Subject: [PATCH 1814/3246] system-config-printer: fix wrapProgram call

---
 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 04aa838270c..fbef31fb546 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     ''
       buildPythonPath "$out $pythonPath"
       gappsWrapperArgs+=(
-        --prefix PATH "$program_PATH"
+        --prefix PATH : "$program_PATH"
         --set CUPS_DATADIR "${cups-filters}/share/cups"
       )
 

From c3e8d491ff3dc966c40a7f56485dd589bef71c30 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 15:49:56 +0200
Subject: [PATCH 1815/3246] clerk: fix wrapProgram call

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

diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix
index babbcc51e40..4da2228c6c1 100644
--- a/pkgs/applications/audio/clerk/default.nix
+++ b/pkgs/applications/audio/clerk/default.nix
@@ -13,13 +13,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ makeWrapper pythonPackages.mpd2 ];
 
-  buildPhase = ''
-    echo skipping build phase...
-  '';
+  dontBuild = true;
 
   installPhase = ''
     DESTDIR=$out PREFIX=/ make install
-    wrapProgram $out/bin/clerk $out/bin/clerk \
+    wrapProgram $out/bin/clerk \
       --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}"
   '';
 

From 6bcbf585ec480e57405a2ce0440e0ff382c0dff2 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Thu, 10 Aug 2017 16:02:03 +0200
Subject: [PATCH 1816/3246] Typora: 0.9.29 -> 0.9.31

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

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index a40c22e8886..f9756ad1ab7 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -3,18 +3,18 @@
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
-  version = "0.9.29";
+  version = "0.9.31";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
-        sha256 = "1d7a02ee603be871d6f8c25b5c11069267ec11644a4f513635c0769ce46a44a7";
+        sha256 = "8a68c4fb01316bda7c8291da22f539c70d09ca7af89190ad8705296b21f10758";
       }
     else
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_i386.deb";
-        sha256 = "79834b0ccd2257c030aec850ebc81fe115f46891b482f1ffa41fcc19c5f29659";
+        sha256 = "16a1d1c9503f6fc2c62d0bad4ef4db68e0e70cbd430f05f923b83f869e3b3486";
       }
     ;
 

From b44bed5568c7980276f4faaec5367d65aeb0a5e1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 10 Aug 2017 02:04:02 +0200
Subject: [PATCH 1817/3246] curl: 7.54.1 -> 7.55.0

Fixes #28073.

Fixes CVE-2017-1000101, CVE-2017-1000100, CVE-2017-1000099.
---
 pkgs/tools/networking/curl/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index daf5a19b01c..c9b70ee0e64 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.54.1";
+  name = "curl-7.55.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1815iz5a7qghipjcl7s97hk4jqh4f3kqc487xi20rvh1s3r4vz7x";
+    sha256 = "1cg5h0klsx887qd4wpkk5bpkbw1bfc4q7adsrai71zhmdzn6j7dg";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@@ -72,6 +72,10 @@ stdenv.mkDerivation rec {
   CXXCPP = "g++ -E";
 
   postInstall = ''
+    pushd docs/libcurl
+    make install
+    popd
+
     moveToOutput bin/curl-config "$dev"
     sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
   '' + stdenv.lib.optionalString gnutlsSupport ''

From e204bef48775e8618f4497c80b79aa8730c97b2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Aug 2017 16:45:33 +0200
Subject: [PATCH 1818/3246] libsoup: update to version 2.59.90.1 to fix
 CVE-2017-2885

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

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 030d800f4a5..d1b476d94d2 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -4,15 +4,15 @@
 , libintlOrEmpty
 , intltool, python }:
 let
-  majorVersion = "2.56";
-  version = "${majorVersion}.0";
+  majorVersion = "2.59";
+  version = "${majorVersion}.90.1";
 in
 stdenv.mkDerivation {
   name = "libsoup-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
-    sha256 = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5";
+    sha256 = "0bh8wa0szkm9bx2anfq655zshwf6jhxvrqwx8jyh8rqgi6z9dhz0";
   };
 
   prePatch = ''

From 151fab911ed81c0db355bc371c4b4c32924dc3ec Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Thu, 10 Aug 2017 23:57:46 +1000
Subject: [PATCH 1819/3246] mbpfan: 1.9.1 -> 2.0.1

removed patch for lsmod/grep as they are no longer used (dgraziotin/mbpfan@5f2da79)
---
 pkgs/os-specific/linux/mbpfan/default.nix | 15 ++----------
 pkgs/os-specific/linux/mbpfan/fixes.patch | 29 -----------------------
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/mbpfan/fixes.patch

diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 4866c3d8132..0c4ee907bef 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -2,24 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mbpfan-${version}";
-  version = "1.9.1";
+  version = "2.0.1";
   src = fetchFromGitHub {
     owner = "dgraziotin";
     repo = "mbpfan";
     rev = "v${version}";
-    sha256 = "0issn5233h2nclrmh2jzyy5y0dyyd57f1ia7gvs3bys95glcm2s5";
+    sha256 = "1iri1py9ym0zz7fcacbf0d9y3i3ay77jmajckchagamkfha16zyp";
   };
-  patches = [
-    ./fixes.patch
-    (fetchpatch { # buffer overflow fix https://github.com/dgraziotin/mbpfan/issues/72
-                  url = https://github.com/dgraziotin/mbpfan/commit/f2736c8ab93cafffc25b86bcc6c33e6cbd537243.patch;
-                  sha256 = "10sldc69c91qk3hq0f6r3gxay38l2iw93nl85qh94mwpb8hy92yj"; })
-  ];
-  postPatch = ''
-    substituteInPlace src/main.c \
-      --replace '@GREP@' '${gnugrep}/bin/grep' \
-      --replace '@LSMOD@' '${kmod}/bin/lsmod'
-  '';
   installPhase = ''
     mkdir -p $out/bin $out/etc
     cp bin/mbpfan $out/bin
diff --git a/pkgs/os-specific/linux/mbpfan/fixes.patch b/pkgs/os-specific/linux/mbpfan/fixes.patch
deleted file mode 100644
index 548cce05c35..00000000000
--- a/pkgs/os-specific/linux/mbpfan/fixes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/main.c b/src/main.c
-index e8af708..6cfee17 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -71,7 +71,7 @@ void check_requirements()
-       * Check for coretemp and applesmc modules
-       * Credits: -http://stackoverflow.com/questions/12978794
-       */
--    FILE *fd = popen("lsmod | grep coretemp", "r");
-+    FILE *fd = popen("@LSMOD@ | @GREP@ coretemp", "r");
-     char buf[16];
- 
-     if (!(fread (buf, 1, sizeof (buf), fd) > 0)) {
-@@ -87,7 +87,7 @@ void check_requirements()
- 
-     pclose(fd);
- 
--    fd = popen("lsmod | grep applesmc", "r");
-+    fd = popen("@LSMOD@ | @GREP@ applesmc", "r");
- 
-     if (!(fread (buf, 1, sizeof (buf), fd) > 0)) {
-         DIR* dir = opendir(APPLESMC_PATH);
-@@ -145,4 +145,4 @@ int main(int argc, char *argv[])
-     void (*fan_control)() = mbpfan;
-     go_daemon(fan_control);
-     exit(EXIT_SUCCESS);
--}
-\ No newline at end of file
-+}

From 8d70d4066fb45267b6846aaa7961c470b9741a8e Mon Sep 17 00:00:00 2001
From: AbnerLee <ilchenearly@gmail.com>
Date: Fri, 11 Aug 2017 00:47:08 +0800
Subject: [PATCH 1820/3246] correct the sha265 of typora after package update

The deb is updated just now without increase the version number..
---
 pkgs/applications/editors/typora/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index f9756ad1ab7..0733bd79665 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
-        sha256 = "8a68c4fb01316bda7c8291da22f539c70d09ca7af89190ad8705296b21f10758";
+        sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42";
       }
     else
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_i386.deb";
-        sha256 = "16a1d1c9503f6fc2c62d0bad4ef4db68e0e70cbd430f05f923b83f869e3b3486";
+        sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1";
       }
     ;
 

From 700f7614cde2673bc1ececf1f2008b64a1b56158 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 12:55:46 +0200
Subject: [PATCH 1821/3246] Partly revert "python.buildEnv: only wrap
 executables"

This partly reverts commit 4495bfe1382ea779f02996d0e18d25d892678e8c.

The xen changes should not have been commited.

(cherry picked from commit 206a4c9aba6772f01d175e72636d1283dc038cc0)
---
 pkgs/applications/virtualization/xen/packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index f4bde18f3df..8f5262acb02 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -10,6 +10,8 @@ rec {
   xen_4_5-vanilla = callPackage ./4.5.nix {
     # At the very least included seabios and etherboot need gcc49,
     # so we have to build all of it with gcc49.
+    stdenv = overrideCC stdenv gcc49;
+
     meta = {
       description = "vanilla";
       longDescription = ''
@@ -58,6 +60,8 @@ rec {
   xen_4_8-vanilla = callPackage ./4.8.nix {
     # At the very least included seabios and etherboot need gcc49,
     # so we have to build all of it with gcc49.
+    stdenv = overrideCC stdenv gcc49;
+
     meta = {
       description = "vanilla";
       longDescription = ''

From 0f5cbe43da12ce2660a6ea6bcbc848dccce4a34c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 10 Aug 2017 20:48:31 +0200
Subject: [PATCH 1822/3246] subversion18: 1.8.17 -> 1.8.18 for CVE-2017-9800

See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 17ff3e4b19f..45080e25d59 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -104,8 +104,8 @@ let
 
 in {
   subversion18 = common {
-    version = "1.8.17";
-    sha256 = "1450fkj1jmxyphqn6cd95z1ykwsabajm9jw4i412qpwss8w9a4fy";
+    version = "1.8.18";
+    sha256 = "19lpqdrl86mjfdpayhn3f9rkmpb6zs2iny38cnxq6wcj7snh0sz5";
   };
 
   subversion19 = common {

From abd837fe3d5fc31f310eb2afe67a58dadcb002f8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 10 Aug 2017 20:52:45 +0200
Subject: [PATCH 1823/3246] subversion19: 1.9.5 -> 1.9.6 for CVE-2017-9800

See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 45080e25d59..586f4c52792 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -109,7 +109,7 @@ in {
   };
 
   subversion19 = common {
-    version = "1.9.5";
-    sha256 = "1ramwly6p74jhb2rdm5ygxjri7jds940cilyvnsdq60xzy5cckwa";
+    version = "1.9.6";
+    sha256 = "06dfram53lyfyyqgz1r7c5323qqc6mjcpwi1j402y21lnqgwbjyv";
   };
 }

From 3be89a675814c3c2dd21fc3102c71960e896b97c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 10 Aug 2017 20:58:43 +0200
Subject: [PATCH 1824/3246] libsoup: security 2.56.0 -> 2.56.1

Fixes CVE-2017-2885
---
 pkgs/development/libraries/libsoup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 030d800f4a5..914c99d259e 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -5,14 +5,14 @@
 , intltool, python }:
 let
   majorVersion = "2.56";
-  version = "${majorVersion}.0";
+  version = "${majorVersion}.1";
 in
 stdenv.mkDerivation {
   name = "libsoup-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
-    sha256 = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5";
+    sha256 = "c32a46d77b4da433b51d8fd09a57a44b198e03bdc93e5219afcc687c7948eac3";
   };
 
   prePatch = ''

From 11861b7c97af2c64761e68763dd3d13a1508fd4e Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Tue, 8 Aug 2017 22:43:54 +0200
Subject: [PATCH 1825/3246] pcmanfm: build with gtk3

---
 pkgs/applications/misc/pcmanfm/default.nix   | 12 ++++++++++--
 pkgs/development/libraries/libfm/default.nix | 13 +++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index 137d68d8171..8251c07206d 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }:
+{ stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig
+, withGtk3 ? true, gtk2, gtk3 }:
 
+let
+  libfm' = libfm.override { inherit withGtk3; };
+  gtk = if withGtk3 then gtk3 else gtk2;
+  inherit (stdenv.lib) optional;
+in
 stdenv.mkDerivation rec {
   name = "pcmanfm-1.2.5";
   src = fetchurl {
@@ -7,7 +13,9 @@ stdenv.mkDerivation rec {
     sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc";
   };
 
-  buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ];
+  buildInputs = [ glib gtk intltool libfm' libX11 pango pkgconfig ];
+
+  configureFlags = optional withGtk3 "--with-gtk=3";
 
   meta = with stdenv.lib; {
     homepage = http://blog.lxde.org/?cat=28/;
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index c32866a0d26..d42425c8e18 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_34
-, extraOnly ? false }:
+{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala_0_34
+, extraOnly ? false
+, withGtk3 ? false, gtk2, gtk3 }:
 let
+    gtk = if withGtk3 then gtk3 else gtk2;
     inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
@@ -14,10 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7";
   };
 
-  buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_34 ]
+  buildInputs = [ glib gtk intltool pango pkgconfig vala_0_34 ]
                 ++ optional (!extraOnly) menu-cache;
 
-  configureFlags = optional extraOnly "--with-extra-only";
+  configureFlags = [ (optional extraOnly "--with-extra-only")
+                     (optional withGtk3 "--with-gtk=3") ];
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     homepage = http://blog.lxde.org/?cat=28/;

From ecd4c58d0ac6d3d10916c01fc8e1cc6f27acc66f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 10 Aug 2017 16:21:24 -0400
Subject: [PATCH 1826/3246] plymouth: 0.9.2 -> 0.9.3

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

diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index b1b1a4649ba..4d70533fac7 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "plymouth-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2";
-    sha256 = "0zympsgy5bbfl2ag5nc1jxlshpx8r1s1yyjisanpx76g88hfh31g";
+    url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz";
+    sha256 = "0x2a9s5jdvfcrdnwbdhm5x4ck3zimmcpghnqvhl65byfj25d13cz";
   };
 
   nativeBuildInputs = [
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
       --libdir=$out/lib
       --libexecdir=$out/lib
       --sysconfdir=/etc
+      --with-systemdunitdir=$out/etc/systemd/system
       --localstatedir=/var
       --with-logo=/etc/plymouth/logo.png
       --with-background-color=0x000000

From b1ce017d44c5a79477b7c1d10a728f5907c62d9a Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 10 Aug 2017 20:26:24 +0000
Subject: [PATCH 1827/3246] babelstone-han: 9.0.2 -> 10.0.0 (#28108)

* babelstone-han: 9.0.2 -> 10.0.0

* simplification (two hashes -> one hash)

* simplification (fetchurl -> fetchzip)
---
 pkgs/data/fonts/babelstone-han/default.nix | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
index 16534d4d6cb..97333f7d953 100644
--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -1,22 +1,16 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
+let
+  version = "10.0.0";
+in fetchzip {
   name = "babelstone-han-${version}";
-  version = "9.0.2";
 
-  src = fetchurl {
-    url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip";
-    sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha";
-  };
-
-  buildInputs = [ unzip ];
-
-  sourceRoot = ".";
-
-  installPhase = ''
+  url = http://www.babelstone.co.uk/Fonts/0816/BabelStoneHan.zip;
+  postFetch = ''
     mkdir -p $out/share/fonts/truetype
-    cp -v *.ttf $out/share/fonts/truetype
+    unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
   '';
+  sha256 = "0648hv5c1hq3bq7mlk7bnmflzzqj4wh137bjqyrwj5hy3nqzvl5r";
 
   meta = with stdenv.lib; {
     description = "Unicode CJK font with over 32600 Han characters";

From f3f8c584a41a21b69ac7e7c1d8f19e1a8ba997be Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 10 Aug 2017 21:40:21 +0000
Subject: [PATCH 1828/3246] amazon-image: Add disk format option to image
 builder module

---
 nixos/maintainers/scripts/ec2/amazon-image.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index cdfac71634d..7541fbc8691 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -22,15 +22,20 @@ in {
         generated image. Glob patterns work.
       '';
     };
+
+    format = mkOption {
+      type = types.enum [ "raw" "qcow2" ];
+      default = "qcow2";
+      description = "The image format to output";
+    };
   };
 
   config.system.build.amazonImage = import ../../../lib/make-disk-image.nix {
     inherit lib config;
-    inherit (cfg) contents;
+    inherit (cfg) contents format;
     pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
     partitioned = config.ec2.hvm;
     diskSize = if config.ec2.hvm then 2048 else 8192;
-    format = "qcow2";
     configFile = pkgs.writeText "configuration.nix"
       ''
         {

From 5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 10 Aug 2017 22:57:26 +0000
Subject: [PATCH 1829/3246] amazon-image: support VPC/VHD as an output format
 for the builder

---
 nixos/lib/make-disk-image.nix                  | 10 ++++++++--
 nixos/maintainers/scripts/ec2/amazon-image.nix |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 56766ec9047..9c91bf39225 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -39,6 +39,12 @@
 with lib;
 
 let
+  extensions = {
+    qcow2 = "qcow2";
+    vpc   = "vhd";
+    raw   = "img";
+  };
+
   # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix
   # TODO: factor out more cleanly
 
@@ -142,8 +148,8 @@ in pkgs.vmTools.runInLinuxVM (
           mv $diskImage $out/nixos.img
           diskImage=$out/nixos.img
         '' else ''
-          ${pkgs.qemu}/bin/qemu-img convert -f raw -O qcow2 $diskImage $out/nixos.qcow2
-          diskImage=$out/nixos.qcow2
+          ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} $diskImage $out/nixos.${extensions.${format}}
+          diskImage=$out/nixos.${extensions.${format}}
         ''}
         ${postVM}
       '';
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 7541fbc8691..955fdff7953 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -24,7 +24,7 @@ in {
     };
 
     format = mkOption {
-      type = types.enum [ "raw" "qcow2" ];
+      type = types.enum [ "raw" "qcow2" "vpc" ];
       default = "qcow2";
       description = "The image format to output";
     };

From 4a0efc9c4f12ba2c69fe76a4b979c7daf0ea4aa6 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 11 Aug 2017 02:17:35 +0200
Subject: [PATCH 1830/3246] git: 2.14.0 -> 2.14.1

The new version contains a security fix for CVE-2017-1000117

More information regarding this update can be found here:
http://marc.info/?l=git&m=150238802328673&w=2
---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 0b93ae1f203..7cc2c8b778a 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -12,7 +12,7 @@
 }:
 
 let
-  version = "2.14.0";
+  version = "2.14.1";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0xarcp0m7jbncic0g3ahz8l2d6b27h0g9ndgrhy9abkx61m6wgpr";
+    sha256 = "1iic3wiihxp3l3k6d4z886v3869c3dzgddjxnd5124wy1rnlqwkg";
   };
 
   hardeningDisable = [ "format" ];

From f0719b5a0b289a011cdcc5c6da3d2fc6ed677917 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 10 Aug 2017 20:54:28 -0400
Subject: [PATCH 1831/3246] mercurial: 4.1.1 -> 4.3.1

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 01d1a21f3a7..39d44ab145d 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
 
 let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
-  version = "4.1.1";
+  version = "4.3.1";
   name = "mercurial-${version}";
   inherit (python2Packages) docutils hg-git dulwich python;
 in python2Packages.buildPythonApplication {
@@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
 
   src = fetchurl {
     url = "https://mercurial-scm.org/release/${name}.tar.gz";
-    sha256 = "17imsf4haqgw364p1z9i416jinmfxfia537b84hcg0rg43hinmv3";
+    sha256 = "18hq6vvjsrjsnbs15bvyyfrss35bgc0hgw4wxksdyaj578pg04ib";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From d21572c289f8f03ff393dd75759964b678eccc6e Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 9 Aug 2017 23:23:25 -0300
Subject: [PATCH 1832/3246] adapta-gtk-theme: 3.91.1.47 -> 3.91.2.10

---
 pkgs/misc/themes/adapta/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index acce5ccac21..a86cfd48d54 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.91.1.47";
+  version = "3.91.2.10";
 
   src = fetchFromGitHub {
     owner = "tista500";
     repo = "Adapta";
     rev = version;
-    sha256 = "1w41xwhb93p999g0835cmlax55a5fyz9j4m5nn6nss2d6g6nrxap";
+    sha256 = "0bp5fnxgrrrs0ajqw2lbhbarbpvzvajnvcjip6fkl9aa76gz9czy";
   };
 
   preferLocalBuild = true;
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
     "--disable-gtk_legacy"
     "--disable-gtk_next"
     "--disable-unity"
-    "--disable-parallel" # parallel build is not finishing
   ];
 
   meta = with stdenv.lib; {

From edd4a0efe3daf137c043275062581a9ae8ac8a1e Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Thu, 10 Aug 2017 20:40:59 -0400
Subject: [PATCH 1833/3246] postfix: fix typo in transport_maps path

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

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 845c6acc7fe..47ce2c4c5e3 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -76,7 +76,7 @@ let
   // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; }
   // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; }
   // optionalAttrs haveAliases { alias_maps = "${cfg.aliasMapType}:/etc/postfix/aliases"; }
-  // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfx/transport"; }
+  // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; }
   // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; }
   // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
   // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; }

From 01fbf30041d1ee0c3ad819fe59389eadc92d9ac4 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Thu, 10 Aug 2017 21:10:00 -0400
Subject: [PATCH 1834/3246] postfix: warn about deprecated extraMasterConf
 option

---
 nixos/modules/services/mail/postfix.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 47ce2c4c5e3..a3e60cfecad 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -839,5 +839,8 @@ in
     (mkIf (cfg.extraConfig != "") {
       warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ];
     })
+    (mkIf (cfg.extraMasterConf != "") {
+      warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ];
+    })
   ]);
 }

From 9186dda4a9a519aeb73b68358ff9e4af911647c3 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Thu, 10 Aug 2017 21:22:28 -0400
Subject: [PATCH 1835/3246] postfix: wakeup value should be used even if
 wakeupUnusedComponent is not defined

---
 nixos/modules/services/mail/postfix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index a3e60cfecad..cc17db103a0 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -213,8 +213,8 @@ let
         wakeupDefined = options.wakeup.isDefined;
         wakeupUCDefined = options.wakeupUnusedComponent.isDefined;
         finalValue = toString config.wakeup
-                   + optionalString (!config.wakeupUnusedComponent) "?";
-      in if wakeupDefined && wakeupUCDefined then finalValue else "-";
+                   + optionalString (wakeupUCDefined && !config.wakeupUnusedComponent) "?";
+      in if wakeupDefined then finalValue else "-";
 
     in [
       config.name

From 719aa35c0cbd0cfaa4856b428f1d0717cff024dc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 11 Aug 2017 09:47:27 +0800
Subject: [PATCH 1836/3246] collectd-data: init at 5.7.0 - contains just data
 files from collectd

---
 pkgs/tools/system/collectd/data.nix | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/tools/system/collectd/data.nix

diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix
new file mode 100644
index 00000000000..cb8c4cc7d02
--- /dev/null
+++ b/pkgs/tools/system/collectd/data.nix
@@ -0,0 +1,14 @@
+{ stdenv, collectd }:
+
+stdenv.mkDerivation rec {
+  inherit (collectd) meta version;
+
+  name = "collectd-data-${version}";
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/collectd
+    cp ${collectd}/share/collectd/*.{db,conf} $out/share/collectd/
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c26ba7c826..7396fc18015 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1362,6 +1362,8 @@ with pkgs;
     libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet
   };
 
+  collectd-data = callPackage ../tools/system/collectd/data.nix { };
+
   colormake = callPackage ../development/tools/build-managers/colormake { };
 
   cpuminer = callPackage ../tools/misc/cpuminer { };

From 5def5bab3c948944c75eba224a76a32559d5c6fc Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 11 Aug 2017 01:57:38 +0000
Subject: [PATCH 1837/3246] amazon-image: make image size configurable

---
 nixos/maintainers/scripts/ec2/amazon-image.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 955fdff7953..9756aebe7f2 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -23,6 +23,12 @@ in {
       '';
     };
 
+    sizeMB = mkOption {
+      type = types.int;
+      default = if config.ec2.hvm then 2048 else 8192;
+      description = "The size in MB of the image";
+    };
+
     format = mkOption {
       type = types.enum [ "raw" "qcow2" "vpc" ];
       default = "qcow2";
@@ -35,7 +41,7 @@ in {
     inherit (cfg) contents format;
     pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
     partitioned = config.ec2.hvm;
-    diskSize = if config.ec2.hvm then 2048 else 8192;
+    diskSize = sizeMB;
     configFile = pkgs.writeText "configuration.nix"
       ''
         {
@@ -46,5 +52,4 @@ in {
         }
       '';
   };
-
 }

From ca99ec3f58a9cee35ae8317bf3a64aab5ebb526e Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 11 Aug 2017 02:12:39 +0000
Subject: [PATCH 1838/3246] amazon-image: fix typo in last commit

---
 nixos/maintainers/scripts/ec2/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 9756aebe7f2..d76fb644d02 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -41,7 +41,7 @@ in {
     inherit (cfg) contents format;
     pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
     partitioned = config.ec2.hvm;
-    diskSize = sizeMB;
+    diskSize = cfg.sizeMB;
     configFile = pkgs.writeText "configuration.nix"
       ''
         {

From 3d8f85797ae633ced8841b522b5d77b6c5734e4f Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Fri, 11 Aug 2017 11:11:46 +0900
Subject: [PATCH 1839/3246] asciidoctor: use ruby 2.3

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

diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix
index 495a5fcf882..f494f191159 100644
--- a/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, lib, bundlerEnv, ruby_2_2, curl }:
+{ stdenv, lib, bundlerEnv, ruby, curl }:
 
-bundlerEnv rec {
+bundlerEnv {
   pname = "asciidoctor";
-  ruby = ruby_2_2;
+
+  inherit ruby;
+
   gemdir = ./.;
 
   meta = with lib; {

From 48ffb8284f72d1bb8bc8a3c71eea85570e51f54b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 11 Aug 2017 00:14:26 -0300
Subject: [PATCH 1840/3246] eom: init at 1.18.2

---
 pkgs/desktops/mate/default.nix     |  1 +
 pkgs/desktops/mate/eom/default.nix | 42 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/desktops/mate/eom/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 528f792a600..fc4849a5ec5 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -2,6 +2,7 @@
 rec {
   atril = callPackage ./atril { };
   caja = callPackage ./caja { };
+  eom = callPackage ./eom { };
   mate-common = callPackage ./mate-common { };
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
new file mode 100644
index 00000000000..1c27958b0c9
--- /dev/null
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "eom-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "00ns7g7qykakc89lijrw2vwy9x9ijqiyvmnd4sw0j6py90zs8m87";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    dbus_glib
+    exempi
+    lcms2
+    libexif
+    libjpeg
+    librsvg
+    libxml2
+    shared_mime_info
+    gnome3.gtk
+    gnome3.libpeas
+    mate.mate-desktop
+  ];
+
+  meta = {
+    description = "An image viewing and cataloging program for the MATE desktop";
+    homepage = http://mate-desktop.org;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}

From 486391d191f9f7ec1185060f749b2065e3941b5f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 11 Aug 2017 14:22:10 +0800
Subject: [PATCH 1841/3246] check-uptime: init at 20161112

---
 pkgs/servers/monitoring/plugins/uptime.nix | 26 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/servers/monitoring/plugins/uptime.nix

diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix
new file mode 100644
index 00000000000..2f26bc26ba4
--- /dev/null
+++ b/pkgs/servers/monitoring/plugins/uptime.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "check-uptime-${version}";
+  version = "20161112";
+
+  src = fetchFromGitHub {
+    owner  = "madrisan";
+    repo   = "nagios-plugins-uptime";
+    rev    = "51822dacd1d404b3eabf3b4984c64b2475ed6f3b";
+    sha256 = "18q9ibzqn97dsyr9xs3w9mqk80nmmfw3kcjidrdsj542amlsycyk";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
+  postInstall = "ln -sr $out/libexec $out/bin";
+
+  meta = with stdenv.lib; {
+    description = "Uptime check plugin for Sensu/Nagios/others";
+    homepage    = https://github.com/madrisan/nagios-plugins-uptime;
+    license     = licenses.gpl3;
+    maintainer  = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a31aefbab69..556bb695dc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19231,6 +19231,8 @@ with pkgs;
 
   hy = callPackage ../development/interpreters/hy {};
 
+  check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { };
+
   ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
 
   chrome-gnome-shell = callPackage  ../desktops/gnome-3/extensions/chrome-gnome-shell {};

From 18112eea52755a72095cc53f87a1fe5f783db50b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 11 Aug 2017 16:00:06 +0800
Subject: [PATCH 1842/3246] dropbox: 31.4.25 -> 32.4.23

---
 .../networking/dropbox/default.nix            | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index af4ec08ff00..088fda046a4 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -24,30 +24,27 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "31.4.25";
-  sha256 =
-    {
-      "x86_64-linux" = "02qla89gf7zawfk0kxd3xzr7vb91khj3p83bvh456ap51h0z5wzv";
-      "i686-linux"   = "0sfh24qyc91q6ssn8lrzfdsv4jjy0hvgizcq3y3fk46zaa7jjxr2";
-    }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+  version = "32.4.23";
+  sha256 = {
+    "x86_64-linux" = "11jh3cyax652crhvjshi8gnvb8mpp7hfbgwqjx5n1q3j1rswm3d1";
+    "i686-linux"   = "0xf0in3ywgd53v19h0v2sg69b6y2lbvr5y6jz10x3cighzr31qfp";
+  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
-  arch =
-    {
-      "x86_64-linux" = "x86_64";
-      "i686-linux"   = "x86";
-    }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+  arch = {
+    "x86_64-linux" = "x86_64";
+    "i686-linux"   = "x86";
+  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   # relative location where the dropbox libraries are stored
   appdir = "opt/dropbox";
 
-  libs =
-    [
-      dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
-      libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
-      ncurses zlib
+  libs = [
+    dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
+    libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
+    ncurses zlib
 
-      qtbase qtdeclarative qtwebkit
-    ];
+    qtbase qtdeclarative qtwebkit
+  ];
   ldpath = stdenv.lib.makeLibraryPath libs;
 
   desktopItem = makeDesktopItem {
@@ -141,11 +138,11 @@ in mkDerivation {
     paxmark m $out/${appdir}/dropbox
   '';
 
-  meta = {
-    homepage = http://www.dropbox.com;
+  meta = with lib; {
     description = "Online stored folders (daemon version)";
-    maintainers = with lib.maintainers; [ ttuegel ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
-    license = lib.licenses.unfree;
+    homepage    = http://www.dropbox.com;
+    maintainers = with maintainers; [ ttuegel ];
+    license     = licenses.unfree;
+    platforms   = [ "i686-linux" "x86_64-linux" ];
   };
 }

From 8dc869e3400cb30bd8685128c038593a0e793b54 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 31 Jul 2017 09:52:45 +0200
Subject: [PATCH 1843/3246] chromium: 59.0.3071.115 -> 60.0.3112.78

get rid of outdated version branches and patches
take a patch from gentoo, to fix gn bootstrapping
---
 .../networking/browsers/chromium/common.nix   | 11 ++--
 ...romium-59.0.3071.115-system_ffmpeg-1.patch | 63 -------------------
 .../patches/chromium-gn-bootstrap-r8.patch    | 13 ++++
 .../chromium/patches/glibc-2.24.patch         | 14 -----
 .../browsers/chromium/upstream-info.nix       | 18 +++---
 5 files changed, 27 insertions(+), 92 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 11177f3ee48..b930ab79658 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -104,23 +104,22 @@ let
       nspr nss systemd
       utillinux alsaLib
       bison gperf kerberos
-      glib gtk2 dbus_glib
+      glib gtk2 gtk3 dbus_glib
       libXScrnSaver libXcursor libXtst mesa
       pciutils protobuf speechd libXdamage
     ] ++ optional gnomeKeyringSupport libgnome_keyring3
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optionals cupsSupport [ libgcrypt cups ]
-      ++ optional pulseSupport libpulseaudio
-      ++ optional (versionAtLeast version "56.0.0.0") gtk3;
+      ++ optional pulseSupport libpulseaudio;
 
     patches = [
       ./patches/nix_plugin_paths_52.patch
+      ./patches/chromium-gn-bootstrap-r8.patch
       # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
       # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
       ./patches/fix_network_api_crash.patch
-      ./patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
-    ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
-      ++ optional enableWideVine ./patches/widevine.patch;
+
+    ] ++ optional enableWideVine ./patches/widevine.patch;
 
     postPatch = ''
       # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
deleted file mode 100644
index 2ffdcc0ad6a..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Submitted By:            DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
-Date:                    2017-06-25
-Initial Package Version: 57.0.2987.110
-Upstream Status:         Not submitted
-Origin:                  Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
-Description:             Allows building with system provided ffmpeg. Rediffed
-                         for chromium-59.0.3071.109.
-
-diff -Naurp chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h
---- chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h	2017-06-20 17:03:19.000000000 -0500
-+++ chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h	2017-06-23 00:21:10.551912699 -0500
-@@ -23,10 +23,6 @@
- 
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings.  This
--// list of defines must mirror those in the 'defines' section of FFmpeg's
--// BUILD.gn file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -40,7 +36,6 @@ extern "C" {
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
-diff -Naurp chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc
---- chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc	2017-06-20 17:03:19.000000000 -0500
-+++ chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc	2017-06-23 00:22:56.289311692 -0500
-@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
-   // If no estimate is found, the stream entry will be kInfiniteDuration.
-   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
-                                                     kInfiniteDuration);
--  const AVFormatInternal* internal = format_context->internal;
--  if (internal && internal->packet_buffer &&
--      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
--    struct AVPacketList* packet_buffer = internal->packet_buffer;
--    while (packet_buffer != internal->packet_buffer_end) {
--      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
--                start_time_estimates.size());
--      const AVStream* stream =
--          format_context->streams[packet_buffer->pkt.stream_index];
--      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
--        const base::TimeDelta packet_pts =
--            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
--        // We ignore kNoTimestamp here since -int64_t::min() is possible; see
--        // https://crbug.com/700501. Technically this is a valid value, but in
--        // practice shouldn't occur, so just ignore it when estimating.
--        if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
--            packet_pts < start_time_estimates[stream->index]) {
--          start_time_estimates[stream->index] = packet_pts;
--        }
--      }
--      packet_buffer = packet_buffer->next;
--    }
--  }
- 
-   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
- 
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch
new file mode 100644
index 00000000000..d9f389aaf58
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch
@@ -0,0 +1,13 @@
+Index: tools/gn/bootstrap/bootstrap.py
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+       'base/sys_info.cc',
+       'base/task_runner.cc',
+       'base/task_scheduler/delayed_task_manager.cc',
++      'base/task_scheduler/environment_config.cc',
+       'base/task_scheduler/post_task.cc',
+       'base/task_scheduler/priority_queue.cc',
+       'base/task_scheduler/scheduler_lock_impl.cc',
diff --git a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch
deleted file mode 100644
index 10a04b7ec8d..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2016-08-03 21:02:37.000000000 +0200
-+++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2016-08-14 10:59:51.395354850 +0200
-@@ -41,6 +41,11 @@
- #include <errno.h>
- #include <sys/mman.h>
- 
-+#if OS(LINUX) && defined(MADV_FREE)
-+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 708320e92a2..ba3995f129a 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 = "086j8s8wjwk26gfb7hdqn1lsmwgr9mmw93yfi6s4wia9ra0ccwj2";
-    sha256bin64 = "0z1dshxzyn5zhr4xg5mvrq70jxsfkwv50achq802322y4jz52f7n";
-    version = "60.0.3112.66";
+    sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8";
+    sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m";
+    version = "60.0.3112.78";
   };
   dev = {
-    sha256 = "1hbf7hv4934686dp0dbqy06vbwb2kq4wz5hjfdxrgafrzqac2j7g";
-    sha256bin64 = "1gg1a3k80qncr7dpw9gycndv52396cqyq9zfmzf6c4njpn2khjfv";
-    version = "61.0.3153.4";
+    sha256 = "0b8bzxnnzfl17vw0gwds89zjc4z4zi6fdz8f97w3x8a5ad0c2h5i";
+    sha256bin64 = "1n1q6g7avw4yrzdhpzq0pfd12k1fb18hc01jqnq2ak0aisdaga72";
+    version = "61.0.3163.13";
   };
   stable = {
-    sha256 = "0w1i4q7w5lcajc18jrchrhhm00x0jzm846l5x7a5rcp3baawkjrp";
-    sha256bin64 = "1naq20508qjm9hlwlpj686a0lawca58rnr35ws2gh2gsyxrxnmx1";
-    version = "59.0.3071.115";
+    sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8";
+    sha256bin64 = "0wbqbbq9zxizfbjxj241nhk1qgjq91db0lzzbkm5hjvjhx6war4s";
+    version = "60.0.3112.78";
   };
 }

From bb397093b53b8f9f839adb9c0190ab5bd23ba677 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 31 Jul 2017 10:01:15 +0200
Subject: [PATCH 1844/3246] chromium: add build flags and system libs

This is lifted from the Arch build recipe:
https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/chromium

using system libjpeg still doesn't work for some reason, otherwise the
build runs fine
---
 .../networking/browsers/chromium/common.nix        | 14 +++++++++++---
 .../networking/browsers/chromium/default.nix       |  9 +++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index b930ab79658..7802e1bf1b5 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -60,7 +60,10 @@ let
     in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
 
   gnSystemLibraries = [
-    "ffmpeg" "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "snappy" # "libpng" "libjpeg"
+    "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
+    # "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
+    # "re2" # fails with linker errors
+    # "ffmpeg" # https://crbug.com/731766
   ];
 
   opusWithCustomModes = libopus.override {
@@ -73,7 +76,7 @@ let
     libpng libcap
     xdg_utils yasm minizip libwebp
     libusb1 re2 zlib
-    ffmpeg harfbuzz libxslt harfbuzz-icu libxml2
+    ffmpeg harfbuzz-icu libxslt libxml2
   ];
 
   # build paths and release info
@@ -182,9 +185,14 @@ let
       enable_hotwording = enableHotwording;
       enable_widevine = enableWideVine;
       use_cups = cupsSupport;
-    } // {
+
       treat_warnings_as_errors = false;
       is_clang = false;
+      clang_use_chrome_plugins = false;
+      remove_webcore_debug_symbols = true;
+      use_gtk3 = true;
+      enable_swiftshader = false;
+      fieldtrial_testing_like_official_build = true;
 
       # Google API keys, see:
       #   http://www.chromium.org/developers/how-tos/api-keys
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 30a16d824d0..7aa02e2c574 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,5 +1,5 @@
 { newScope, stdenv, makeWrapper, makeDesktopItem, ed
-, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas
+, glib, gtk3, gnome3, gsettings_desktop_schemas
 
 # package customization
 , channel ? "stable"
@@ -67,9 +67,6 @@ let
 
   inherit (stdenv.lib) versionAtLeast;
 
-  gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
-  gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
-
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${version}";
   inherit version;
@@ -78,10 +75,10 @@ in stdenv.mkDerivation {
     makeWrapper ed
 
     # needed for GSETTINGS_SCHEMAS_PATH
-    gsettings_desktop_schemas glib gtk
+    gsettings_desktop_schemas glib gtk3
 
     # needed for XDG_ICON_DIRS
-    gnome.defaultIconTheme
+    gnome3.defaultIconTheme
   ];
 
   outputs = ["out" "sandbox"];

From e8f1ddcbd1d9bd0f523670cc9e7c0f69ba75c243 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 3 Aug 2017 14:44:37 +0200
Subject: [PATCH 1845/3246] chromium: 60.0.3112.78 -> 60.0.3112.90

---
 .../networking/browsers/chromium/upstream-info.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index ba3995f129a..e80cfdbc904 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -6,13 +6,13 @@
     version = "60.0.3112.78";
   };
   dev = {
-    sha256 = "0b8bzxnnzfl17vw0gwds89zjc4z4zi6fdz8f97w3x8a5ad0c2h5i";
-    sha256bin64 = "1n1q6g7avw4yrzdhpzq0pfd12k1fb18hc01jqnq2ak0aisdaga72";
-    version = "61.0.3163.13";
+    sha256 = "0yan2dzx1854f3xslif5682rkb82a1li6vxj12z5s5fxqijhj1jq";
+    sha256bin64 = "0ddva2rqnid2gcx3qh72p41wc15869w2w9n0rbdpn662rpl041v1";
+    version = "61.0.3163.25";
   };
   stable = {
-    sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8";
-    sha256bin64 = "0wbqbbq9zxizfbjxj241nhk1qgjq91db0lzzbkm5hjvjhx6war4s";
-    version = "60.0.3112.78";
+    sha256 = "1rirhwvccidza4q4z1gqdwcd9v1bymh1m9r2cq8jhiabfrjpjbxl";
+    sha256bin64 = "1lw349ips0sgyls3arv864yq5xykfn9jilwkalvllaq6yvdvcvlk";
+    version = "60.0.3112.90";
   };
 }

From d5294f7359beb3a149cf55d9021e69ce118dff4e Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Mon, 7 Aug 2017 15:52:35 +0700
Subject: [PATCH 1846/3246] nodePackages.jsonlint init : at 1.6.2

---
 .../node-packages/node-packages-v6.json       |  1 +
 .../node-packages/node-packages-v6.nix        | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 1da53d8e773..1941d9821b4 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -33,6 +33,7 @@
 , "jshint"
 , "json"
 , "js-beautify"
+, "jsonlint"
 , "jsontool"
 , "json-refs"
 , "json-server"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 229c5743a4d..f4f225ec585 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -25643,6 +25643,30 @@ in
     };
     production = true;
   };
+  jsonlint = nodeEnv.buildNodePackage {
+    name = "jsonlint";
+    packageName = "jsonlint";
+    version = "1.6.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz";
+      sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830";
+    };
+    dependencies = [
+      sources."nomnom-1.8.1"
+      sources."JSV-4.0.2"
+      sources."underscore-1.6.0"
+      sources."chalk-0.4.0"
+      sources."has-color-0.1.7"
+      sources."ansi-styles-1.0.0"
+      sources."strip-ansi-0.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Validate JSON";
+      homepage = http://zaach.github.com/jsonlint/;
+    };
+    production = true;
+  };
   jsontool = nodeEnv.buildNodePackage {
     name = "jsontool";
     packageName = "jsontool";

From 400abb88773baa286eec3451267e7397f2be39b3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 29 Jul 2017 23:33:58 +0200
Subject: [PATCH 1847/3246] gdal: 2.1.3 -> 2.2.1

---
 pkgs/development/libraries/gdal/default.nix | 39 +++++++++++++--------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index eb8f17980c2..0bb91951a28 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -7,13 +7,13 @@
 
 with stdenv.lib;
 
-composableDerivation.composableDerivation {} (fixed: rec {
-  version = "2.1.3";
+stdenv.mkDerivation rec {
+  version = "2.2.1";
   name = "gdal-${version}";
 
   src = fetchurl {
-    url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "0jh7filpf5dk5iz5acj7y3y49ihnzqypxckdlj0sjigbqq6hlsmf";
+    url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+    sha256 = "0rk0p0k787whzzdl8m1f9wcrm7h9bf1pny3z96d93b4383arhw4j";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
@@ -22,16 +22,6 @@ composableDerivation.composableDerivation {} (fixed: rec {
   ++ stdenv.lib.optional stdenv.isDarwin libiconv
   ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
 
-  hardeningDisable = [ "format" ];
-
-  # - Unset CC and CXX as they confuse libtool.
-  # - teach gdal that libdf is the legacy name for libhdf
-  preConfigure = ''
-      unset CC CXX
-      substituteInPlace configure \
-      --replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
-    '';
-
   configureFlags = [
     "--with-jpeg=${libjpeg.dev}"
     "--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
@@ -50,6 +40,25 @@ composableDerivation.composableDerivation {} (fixed: rec {
     (if netcdfSupport then "--with-netcdf=${netcdf}" else "")
   ];
 
+  hardeningDisable = [ "format" ];
+
+  CXXFLAGS = "-fpermissive";
+
+  postPatch = ''
+    sed -i '/ifdef bool/i\
+      #ifdef swap\
+      #undef swap\
+      #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h
+  '';
+
+  # - Unset CC and CXX as they confuse libtool.
+  # - teach gdal that libdf is the legacy name for libhdf
+  preConfigure = ''
+      unset CC CXX
+      substituteInPlace configure \
+      --replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
+    '';
+
   preBuild = ''
     substituteInPlace swig/python/GNUmakefile \
       --replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)"
@@ -68,4 +77,4 @@ composableDerivation.composableDerivation {} (fixed: rec {
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
-})
+}

From 64b57cfc1d9ba2758fa7237997261d497d9e721a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 Aug 2017 20:37:56 +0200
Subject: [PATCH 1848/3246] shapelib: use not HTTPS as TLS is configured
 incorrectly

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

diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix
index 529dee9376a..b481bd0cf65 100644
--- a/pkgs/development/libraries/shapelib/default.nix
+++ b/pkgs/development/libraries/shapelib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "shapelib-1.4.0";
 
   src = fetchurl {
-    url = "https://download.osgeo.org/shapelib/${name}.tar.gz";
+    url = "http://download.osgeo.org/shapelib/${name}.tar.gz";
     sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y";
   };
 

From d98245b25609bc7529e292bcee8ab9c18404f0eb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 00:02:24 +0200
Subject: [PATCH 1849/3246] pythonPackages.keystoneauth1: fix substituteInPlace

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

diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
index 033f08f9587..c2c2235836f 100644
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
 
   postPatch = ''
     sed -i 's@python@${python.interpreter}@' .testr.conf
-    substituteInPlace requirements.txt --replace "argparse"
+    substituteInPlace requirements.txt --replace "argparse" ""
   '';
 }

From 84a9a80123206fbb37cf20f87283336b8bfc6b21 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 00:02:48 +0200
Subject: [PATCH 1850/3246] pythonPackages.oslo-config: fix substituteInPlace

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

diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
index 7cdfb9061fb..a76937278c4 100644
--- a/pkgs/development/python-modules/oslo-config/default.nix
+++ b/pkgs/development/python-modules/oslo-config/default.nix
@@ -17,6 +17,6 @@ buildPythonPackage rec {
   doCheck = false;
 
   postPatch = ''
-    substituteInPlace requirements.txt --replace "argparse"
+    substituteInPlace requirements.txt --replace "argparse" ""
   '';
 }

From dec77a45fafb41dd57aef11b0a784a3fb100593a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 00:03:06 +0200
Subject: [PATCH 1851/3246] xastir: fix build

---
 pkgs/applications/misc/xastir/default.nix | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix
index 9b27e8fc794..c677f7371fc 100644
--- a/pkgs/applications/misc/xastir/default.nix
+++ b/pkgs/applications/misc/xastir/default.nix
@@ -4,11 +4,9 @@
 , perl, proj, rastermagick, shapelib
 }:
 
-let
+stdenv.mkDerivation rec {
+  name = "xastir-${version}";
   version = "208";
-in
-stdenv.mkDerivation {
-  name = "xastir-"+version;
 
   src = fetchFromGitHub {
     owner = "Xastir";
@@ -17,15 +15,16 @@ stdenv.mkDerivation {
     sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl";
   };
 
-  buildInputs =
-    [ autoreconfHook
-      curl db gdal libgeotiff
-      libXpm libXt motif pcre
-      perl proj rastermagick shapelib
-    ];
+  buildInputs = [
+    autoreconfHook
+    curl db gdal libgeotiff
+    libXpm libXt motif pcre
+    perl proj rastermagick shapelib
+  ];
 
-  configureFlags =
-    [ "--with-motif-includes=${motif}/include" ];
+  configureFlags = [ "--with-motif-includes=${motif}/include" ];
+
+  postPatch = "patchShebangs .";
 
   meta = with stdenv.lib; {
     description = "Graphical APRS client";

From fac1ded619c8a4ecb6b7fdb5a119e4ea7f586f20 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 03:20:08 +0200
Subject: [PATCH 1852/3246] trezor-bridge: remove

---
 .../mozilla-plugins/trezor/default.nix        | 47 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 49 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
deleted file mode 100644
index db871c0c9a5..00000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, dpkg, zlib }:
-
-assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
-
-stdenv.mkDerivation {
-  name = "TREZOR-bridge-1.0.5";
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url    = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_amd64.deb;
-        sha256 = "0097h4v88yca4aayzprrh4pk03xvvj7ncz2mi83chm81gsr2v67z";
-      }
-    else
-      fetchurl {
-        url    = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_i386.deb;
-        sha256 = "0xzbq78s3ivg00f0bj6gyjgf47pvjx2l4mm05jjmdar60bf1xr1n";
-      };
-
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  unpackPhase = "${dpkg}/bin/dpkg-deb -x $src .";
-
-  installPhase = ''
-    mkdir -p $out/etc/udev/rules.d/ $out/lib/mozilla/plugins
-    cp ./lib/udev/rules.d/51-trezor-udev.rules $out/etc/udev/rules.d/
-    cp ./usr/lib/mozilla/plugins/npBitcoinTrezorPlugin.so $out/lib/mozilla/plugins
-  '';
-
-  meta = with stdenv.lib;
-    { description = "Plugin for browser to TREZOR device communication";
-      homepage = https://mytrezor.com;
-      license = licenses.unfree;
-      maintainers = with maintainers; [ ehmry ];
-      # Download URL, .deb content & hash (yikes) changed, not version.
-      # New archive doesn't contain any Mozilla plugin at all.
-      broken = true;
-    };
-
-}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 556bb695dc2..eaf297240db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16396,8 +16396,6 @@ with pkgs;
 
   treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; };
 
-  trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { };
-
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
   trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { };

From 72457cdebbeeafbc48cba517f07351ff02cc0dab Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 11:35:58 +0200
Subject: [PATCH 1853/3246] pythonPackages.worldengine: fix build

---
 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 efb40cd6241..78521902c52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25473,7 +25473,7 @@ EOF
       substituteInPlace setup.py \
         --replace pypng>=0.0.18 purepng \
         --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \
-        --replace 'argparse==1.2.1' 'argparse' \
+        --replace 'argparse==1.2.1' "" \
         --replace 'protobuf==3.0.0a3' 'protobuf' \
         --replace 'noise==1.2.2' 'noise' \
         --replace 'PyPlatec==1.4.0' 'PyPlatec' \

From 28cc2642f09419b0a8345d6349329b851d11ad98 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 11:40:08 +0200
Subject: [PATCH 1854/3246] treewide: use less `phases` if not necessary

This removes some skipping of e.g. fixupPhase and cleans up occurences
where this led to duplicating code
---
 .../altcoins/zcash/libsnark/xbyak.nix         |  2 +-
 .../mozilla-plugins/bluejeans/default.nix     |  2 --
 .../git-and-tools/git-radar/default.nix       |  6 ++--
 pkgs/os-specific/linux/iputils/default.nix    |  8 ++++--
 pkgs/tools/backup/duply/default.nix           |  9 +++---
 pkgs/tools/compression/zstd/default.nix       |  4 ---
 .../networking/connman_dmenu/default.nix      |  5 ++--
 pkgs/tools/networking/quicktun/default.nix    |  5 +---
 pkgs/tools/networking/ratools/default.nix     |  8 ++----
 pkgs/tools/networking/tlspool/default.nix     |  4 +--
 .../nix-prefetch-scripts/default.nix          | 28 ++++++++-----------
 pkgs/tools/security/jd-gui/default.nix        |  3 +-
 pkgs/tools/security/omapd/default.nix         | 19 ++++++-------
 pkgs/tools/text/popfile/default.nix           | 11 +-------
 pkgs/top-level/all-packages.nix               |  1 -
 pkgs/top-level/python-packages.nix            |  2 ++
 16 files changed, 43 insertions(+), 74 deletions(-)

diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
index 1e5d19b044a..88d432fd163 100644
--- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
+++ b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn";
   };
 
-  phases = ["unpackPhase" "installPhase"];
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p $out/include
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index c33bff60e01..fa98f2a9e78 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
     sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2";
   };
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
   unpackPhase = "${dpkg}/bin/dpkg-deb -x $src .";
 
   installPhase =
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
index 3b10c3305ef..1bf7a14932e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -4,10 +4,6 @@ stdenv.mkDerivation rec {
   name = "git-radar-${version}";
   version = "0.5";
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  dontInstallSrc = true;
-
   src = fetchFromGitHub {
     owner = "michaeldfallen";
     repo = "git-radar";
@@ -15,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9";
   };
 
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p $out/bin
     cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 1b6be8e4aa1..dd5770744bf 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , libsysfs, gnutls, openssl
-, libcap, sp, docbook_sgml_dtd_31
+, libcap, opensp, docbook_sgml_dtd_31
 , libidn, nettle
 , SGMLSpm, libgcrypt }:
 
@@ -18,13 +18,15 @@ stdenv.mkDerivation rec {
   };
 
   prePatch = ''
-    sed -i s/sgmlspl/sgmlspl.pl/ doc/Makefile
+    sed -e s/sgmlspl/sgmlspl.pl/ \
+        -e s/nsgmls/onsgmls/ \
+      -i doc/Makefile
   '';
 
   makeFlags = "USE_GNUTLS=no";
 
   buildInputs = [
-    libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle
+    libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle
   ];
 
   buildFlags = "man all ninfod";
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index 7917403a915..e8d3a2e185e 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -12,16 +12,15 @@ stdenv.mkDerivation {
 
   buildInputs = [ txt2man makeWrapper ];
 
-  phases = [ "unpackPhase" "installPhase" ];
+  postPatch = "patchShebangs .";
 
   installPhase = ''
     mkdir -p "$out/bin"
     mkdir -p "$out/share/man/man1"
-    sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply
-    mv duply "$out/bin"
+    install -vD duply "$out/bin"
     wrapProgram "$out/bin/duply" --set PATH \
-        "${coreutils}/bin:${python}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin:${which}/bin"
-    "$out/bin/duply" txt2man | gzip -c > "$out/share/man/man1/duply.1.gz"
+        ${stdenv.lib.makeBinPath [ coreutils python duplicity gawk gnupg1 bash gnugrep txt2man which ]}
+    "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index fb9301bf1ce..2be3bf167da 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -12,10 +12,6 @@ stdenv.mkDerivation rec {
     owner = "facebook";
   };
 
-  # The Makefiles don't properly use file targets, but blindly rebuild
-  # all dependencies on every make invocation. So no nice phases. :-(
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
   makeFlags = [
     "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}"
   ];
diff --git a/pkgs/tools/networking/connman_dmenu/default.nix b/pkgs/tools/networking/connman_dmenu/default.nix
index 42ef7f4f4da..c39c82df634 100644
--- a/pkgs/tools/networking/connman_dmenu/default.nix
+++ b/pkgs/tools/networking/connman_dmenu/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchFromGitHub, connman, dmenu }:
+
 stdenv.mkDerivation rec {
   name = "connman_dmenu-${version}";
   version = "git-29-9-2015";
@@ -12,10 +13,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ connman dmenu ];
 
-  phases = "unpackPhase patchPhase installPhase fixupPhase";
+  dontBuild = true;
 
   # remove root requirement, see: https://github.com/march-linux/connman_dmenu/issues/3
-  patchPhase = ''
+  postPatch = ''
     sed -i '89,92d' connman_dmenu
   '';
 
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index 22c6331cb44..6332d6c8577 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -13,14 +13,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libsodium ];
 
-  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
-
   buildPhase = "bash build.sh";
 
   installPhase = ''
-    mkdir -p $out/bin
     rm out/quicktun*tgz
-    cp -v out/quicktun* $out/bin/
+    install -vD out/quicktun* -t $out/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix
index 00c1c86ea8b..5e18ee80f99 100644
--- a/pkgs/tools/networking/ratools/default.nix
+++ b/pkgs/tools/networking/ratools/default.nix
@@ -11,15 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq";
   };
 
-  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
-
   makeFlags = "-C src";
 
   installPhase = ''
-    mkdir -p $out/{bin,sbin,share/man/man8}
-    cp bin/ractl $out/bin
-    cp bin/rad $out/sbin
-    cp man/* $out/share/man/man8
+    install -vD bin/* -t $out/bin
+    install -vD man/* -t $out/share/man/man8
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix
index 2a43358a5e1..4a1e91f7f59 100644
--- a/pkgs/tools/networking/tlspool/default.nix
+++ b/pkgs/tools/networking/tlspool/default.nix
@@ -23,11 +23,9 @@ stdenv.mkDerivation rec {
                   libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ]
                 ++ stdenv.lib.optional useSystemd systemd;
 
-  phases = [ "unpackPhase" "patchPhase" "postPatchPhase" "buildPhase" "installPhase" ]; 
-
   patches = [ ./fixing-rpath.patch ./configvar-fix.patch ];
 
-  postPatchPhase = ''
+  postPatch = ''
     substituteInPlace etc/tlspool.conf \
       --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \
       --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so"
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 291b1a7c600..95280bf60b3 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -8,19 +8,13 @@ let mkPrefetchScript = tool: src: deps:
 
     buildInputs = [ makeWrapper ];
 
-    phases = [ "installPhase" "fixupPhase" ];
-    installPhase = ''
-      mkdir -p $out/bin
+    unpackPhase = ":";
 
-      local wrapArgs=""
-      cp ${src} $out/bin/$name;
-      for dep in ${stdenv.lib.concatStringsSep " " deps}; do
-        wrapArgs="$wrapArgs --prefix PATH : $dep/bin"
-      done
-      wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin"
-      wrapArgs="$wrapArgs --prefix PATH : ${nix.out}/bin" # For nix-hash
-      wrapArgs="$wrapArgs --set HOME /homeless-shelter"
-      wrapProgram $out/bin/$name $wrapArgs
+    installPhase = ''
+      install -vD ${src} $out/bin/$name;
+      wrapProgram $out/bin/$name \
+        --prefix PATH : ${stdenv.lib.makeBinPath (deps ++ [ gnused nix ])} \
+        --set HOME /homeless-shelter
     '';
 
     preferLocalBuild = true;
@@ -32,11 +26,11 @@ let mkPrefetchScript = tool: src: deps:
     };
   };
 in rec {
-  nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [bazaar];
-  nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [cvs];
-  nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils];
-  nix-prefetch-hg  = mkPrefetchScript "hg"  ../../../build-support/fetchhg/nix-prefetch-hg   [mercurial];
-  nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out];
+  nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ];
+  nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ];
+  nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ git coreutils ];
+  nix-prefetch-hg  = mkPrefetchScript "hg"  ../../../build-support/fetchhg/nix-prefetch-hg   [ mercurial ];
+  nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ subversion ];
 
   nix-prefetch-scripts = buildEnv {
     name = "nix-prefetch-scripts";
diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix
index 32bc1a4d711..72cb19aa732 100644
--- a/pkgs/tools/security/jd-gui/default.nix
+++ b/pkgs/tools/security/jd-gui/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ upx patchelf ];
 
-  phases = "unpackPhase installPhase";
   unpackPhase = "tar xf ${src}";
   installPhase = ''
     mkdir -p $out/bin
@@ -41,6 +40,8 @@ stdenv.mkDerivation rec {
       $out/bin/jd-gui
   '';
 
+  dontStrip = true;
+
   meta = {
     description = "Fast Java Decompiler with powerful GUI";
     homepage    = "http://jd.benow.ca/";
diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix
index ae1c2c05f14..9e01e8f0a9f 100644
--- a/pkgs/tools/security/omapd/default.nix
+++ b/pkgs/tools/security/omapd/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, cmake, qt4, gdb, zlib }:
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, qt4, gdb, zlib }:
 
+stdenv.mkDerivation rec {
   name = "omapd-${version}";
   version = "0.9.2";
 
@@ -11,23 +11,20 @@ stdenv.mkDerivation rec {
 
   patches = [ ./zlib.patch ];
 
-  buildInputs = [ cmake qt4 zlib gdb ];
-
-  phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ];
+  buildInputs = [ qt4 zlib gdb ];
 
   buildPhase = ''
     (cd plugins/RAMHashTables; qmake; make)
     qmake
     make
-    '';
+  '';
 
   installPhase = ''
-    mkdir -p $out $out/bin $out/etc $out/usr/lib/omapd/plugins
-    cp omapd $out/bin/.
-    cp omapd.conf $out/etc/.
-    cp plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/.
+    install -vD omapd $out/bin/omapd
+    install -vD omapd.conf $out/etc/omapd.conf
+    install -vD plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/libRAMHashTables.so
     ln -s $out/usr/lib/omapd/plugins $out/bin/plugins
-    '';
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/omapd;
diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix
index 4048093a395..334c0ee403c 100644
--- a/pkgs/tools/text/popfile/default.nix
+++ b/pkgs/tools/text/popfile/default.nix
@@ -25,15 +25,12 @@ stdenv.mkDerivation rec {
     TimeDate # == DateParse
     HTMLTemplate
     # IO::Socket::Socks is not in nixpkgs
-    # IOSocketSocks 
+    # IOSocketSocks
     IOSocketSSL
     NetSSLeay
     SOAPLite
   ]);
 
-
-  phases = [ "unpackPhase" "installPhase" "patchPhase" "postInstall" ];
-
   installPhase = ''
     mkdir -p $out/bin
     # I user `cd` rather than `cp $out/* ...` b/c the * breaks syntax
@@ -42,11 +39,7 @@ stdenv.mkDerivation rec {
     cp -r * $out/bin
     cd $out/bin
     chmod +x *.pl
-  '';
 
-  patchPhase = "patchShebangs $out";
-
-  postInstall = ''
     find $out -name '*.pl' -executable | while read path; do
       wrapProgram "$path" \
         --prefix PERL5LIB : $PERL5LIB:$out/bin \
@@ -66,6 +59,4 @@ stdenv.mkDerivation rec {
     # http://getpopfile.org/docs/faq:systemrequirements
     platforms = stdenv.lib.platforms.linux;
   };
-
 }
-  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eaf297240db..18f66f33b64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11943,7 +11943,6 @@ with pkgs;
   iproute = callPackage ../os-specific/linux/iproute { };
 
   iputils = callPackage ../os-specific/linux/iputils {
-    sp = spCompat;
     inherit (perlPackages) SGMLSpm;
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 78521902c52..8ad10d47867 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6925,6 +6925,8 @@ in {
 
     propagatedBuildInputs = with self; [ six pycrypto ];
 
+    doCheck = false;
+
     meta = {
       description = "libthumbor is the python extension to thumbor";
       homepage = http://github.com/heynemann/libthumbor;

From 6a8c520fbce9313ca06fbf6ba6d8c5ff930b73ed Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 11 Aug 2017 12:32:56 +0200
Subject: [PATCH 1855/3246] slop: 7.3.48 -> 7.3.49

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

diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index 234ca22faa3..f6c4c3548e2 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "slop-${version}";
-  version = "7.3.48";
+  version = "7.3.49";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "slop";
     rev = "v${version}";
-    sha256 = "17a070y186wa375l4z8j7xql92hgpang69fkdyksycdznih7jwk6";
+    sha256 = "0is3mh2d1jqgvv72v5x92w23yf26n8n384nbr1b6cn883aw8j7jz";
   };
 
   nativeBuildInputs = [ cmake ];

From 3cbc3ddf310b758562b82ca1082ea7a83333a827 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 11 Aug 2017 12:38:50 +0200
Subject: [PATCH 1856/3246] maim: 5.4.66 -> 5.4.67

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

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index fcb12239650..3d278cbce6f 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.4.66";
+  version = "5.4.67";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "0aimci6n7dvfwa690rbcd6fdrsvcanxy53j752v3151x6gahw3gb";
+    sha256 = "1p72pkfnzhxxmlnryjyvgr6cgjm5ww10xr35si9mx9s4b9pz38jd";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 8648468833136f4a571a5dcab9a9bb6f36c4dbf2 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Thu, 10 Aug 2017 20:41:27 +0200
Subject: [PATCH 1857/3246] graylog: 2.2.3 -> 2.3.0

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index b1f3cff0839..00cb6fd44f2 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.3";
+  version = "2.3.0";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "02x8brzlyx7qpxb1pgs74iv1gdykvs7cihff0rzjmh7bp1y1xq1x";
+    sha256 = "03jv8l5hj3hw91vk69pxhc2zvxyzc5sfvxf700rq83wsjh6gb5iz";
   };
 
   dontBuild = true;

From 25f3cf03003677647853706019fd32e014f40024 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 8 Aug 2017 18:03:44 +0200
Subject: [PATCH 1858/3246] graylogPlugins: update/extend plugins

---
 pkgs/tools/misc/graylog/plugins.nix | 33 ++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 1c4e2c99283..8ea86d1a7a5 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -22,13 +22,26 @@ let
       };
     });
 in {
+  aggregates = glPlugin rec {
+    name = "graylog-aggregates-${version}";
+    pluginName = "graylog-plugin-aggregates";
+    version = "1.1.1";
+    src = fetchurl {
+      url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "1wx5i8ls7dgffsy35i91gkrj6p9nh2jbar9pgas190lfb9yk45bx";
+    };
+    meta = {
+      homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates;
+      description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies";
+    };
+  };
   auth_sso = glPlugin rec {
     name = "graylog-auth-sso-${version}";
     pluginName = "graylog-plugin-auth-sso";
-    version = "1.0.6";
+    version = "2.3.0";
     src = fetchurl {
       url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "0wvdf2rnjrhdw1vp7bc7008s45rggzq57lh8k6s3q35rppligaqd";
+      sha256 = "110ag10y0xyf3za6663vf68r5rwdi92315a37vysqvj00y7yak0l";
     };
     meta = {
       homepage = https://github.com/Graylog2/graylog-plugin-auth-sso;
@@ -64,13 +77,13 @@ in {
   jabber = glPlugin rec {
     name = "graylog-jabber-${version}";
     pluginName = "graylog-plugin-jabber";
-    version = "1.2.1";
+    version = "2.0.0";
     src = fetchurl {
-      url = "https://github.com/Graylog2/${pluginName}/releases/download/v${version}/${pluginName}-${version}.jar";
-      sha256 = "1r12hpjp2ggmhsapgrk829va94aw44qi2kqqkgf1fj9ih4k0c837";
+      url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "1bqj5g9zjnw08bva7379c2ar3nhmyiilj7kjxd16qvfdn2674r5h";
     };
     meta = {
-      homepage = https://github.com/Graylog2/graylog-plugin-jabber;
+      homepage = https://github.com/graylog-labs/graylog-plugin-jabber;
       description = "Jabber Alarmcallback Plugin for Graylog";
     };
   };
@@ -103,13 +116,13 @@ in {
   redis = glPlugin rec {
     name = "graylog-redis-${version}";
     pluginName = "graylog-plugin-redis";
-    version = "0.1.0";
+    version = "0.1.1";
     src = fetchurl {
-      url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "0hwz83m9gwx0fdapc63v3lr1q6acbphssqwp4qqzz78wg2w79xgi";
+      url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "0dfgh6w293ssagas5y0ixwn0vf54i5iv61r5p2q0rbv2da6xvhbw";
     };
     meta = {
-      homepage = https://github.com/Graylog2/graylog-plugin-redis;
+      homepage = https://github.com/graylog-labs/graylog-plugin-redis;
       description = "Redis plugin for Graylog";
     };
   };

From aa8e60d934eed31844333ab1bdb6cef3799fc502 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Thu, 10 Aug 2017 21:29:54 +0200
Subject: [PATCH 1859/3246] graylog module: adapt to Graylog version 2.3.0

---
 nixos/modules/services/logging/graylog.nix | 24 +++++-----------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index 9f0fb11f025..a0dc0d6d089 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -11,9 +11,7 @@ let
     password_secret = ${cfg.passwordSecret}
     root_username = ${cfg.rootUsername}
     root_password_sha2 = ${cfg.rootPasswordSha2}
-    elasticsearch_cluster_name = ${cfg.elasticsearchClusterName}
-    elasticsearch_discovery_zen_ping_multicast_enabled = ${boolToString cfg.elasticsearchDiscoveryZenPingMulticastEnabled}
-    elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts}
+    elasticsearch_hosts = ${concatStringsSep "," cfg.elasticsearchHosts}
     message_journal_dir = ${cfg.messageJournalDir}
     mongodb_uri = ${cfg.mongodbUri}
     plugin_dir = /var/lib/graylog/plugins
@@ -91,22 +89,10 @@ in
         '';
       };
 
-      elasticsearchClusterName = mkOption {
-        type = types.str;
-        example = "graylog";
-        description = "This must be the same as for your Elasticsearch cluster";
-      };
-
-      elasticsearchDiscoveryZenPingMulticastEnabled = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to use elasticsearch multicast discovery";
-      };
-
-      elasticsearchDiscoveryZenPingUnicastHosts = mkOption {
-        type = types.str;
-        default = "127.0.0.1:9300";
-        description = "Tells Graylogs Elasticsearch client how to find other cluster members. See Elasticsearch documentation for details";
+      elasticsearchHosts = mkOption {
+        type = types.listOf types.str;
+        example = literalExample ''[ "http://node1:9200" "http://user:password@node2:19200" ]'';
+        description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication";
       };
 
       messageJournalDir = mkOption {

From 14080832b02d7c8925504f2172e71bf2d37bb9c6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 13:26:10 +0200
Subject: [PATCH 1860/3246] spCompat: remove

not used anymore
---
 pkgs/tools/text/sgml/opensp/compat.nix | 21 ---------------------
 pkgs/top-level/all-packages.nix        |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/tools/text/sgml/opensp/compat.nix

diff --git a/pkgs/tools/text/sgml/opensp/compat.nix b/pkgs/tools/text/sgml/opensp/compat.nix
deleted file mode 100644
index 496d68df5b3..00000000000
--- a/pkgs/tools/text/sgml/opensp/compat.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, opensp }:
-
-stdenv.mkDerivation {
-  name = "sp-compat-${stdenv.lib.getVersion opensp}";
-
-  phases = [ "installPhase" "fixupPhase" ];
-
-  installPhase = ''
-    mkdir -pv $out/bin
-    for i in ${opensp}/bin/o*; do
-      ln -sv $i $out/bin/''${i#${opensp}/bin/o}
-    done
-    '';
-
-  setupHook = opensp.setupHook;
-
-  meta = opensp.meta // {
-    description = "Compatibility wrapper for old programs looking for original sp programs";
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18f66f33b64..82b971a96c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3558,8 +3558,6 @@ with pkgs;
 
   opensp = callPackage ../tools/text/sgml/opensp { };
 
-  spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { };
-
   opentracker = callPackage ../applications/networking/p2p/opentracker { };
 
   opentsdb = callPackage ../tools/misc/opentsdb {};

From 83f8ffb11d0a229873d6e4895865a1eed11aa1f0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 13:32:05 +0200
Subject: [PATCH 1861/3246] Revert "trezor-bridge: remove"

This reverts commit fac1ded619c8a4ecb6b7fdb5a119e4ea7f586f20.

missed one use
---
 .../mozilla-plugins/trezor/default.nix        | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
new file mode 100644
index 00000000000..db871c0c9a5
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, dpkg, zlib }:
+
+assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "TREZOR-bridge-1.0.5";
+
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url    = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_amd64.deb;
+        sha256 = "0097h4v88yca4aayzprrh4pk03xvvj7ncz2mi83chm81gsr2v67z";
+      }
+    else
+      fetchurl {
+        url    = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_i386.deb;
+        sha256 = "0xzbq78s3ivg00f0bj6gyjgf47pvjx2l4mm05jjmdar60bf1xr1n";
+      };
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  unpackPhase = "${dpkg}/bin/dpkg-deb -x $src .";
+
+  installPhase = ''
+    mkdir -p $out/etc/udev/rules.d/ $out/lib/mozilla/plugins
+    cp ./lib/udev/rules.d/51-trezor-udev.rules $out/etc/udev/rules.d/
+    cp ./usr/lib/mozilla/plugins/npBitcoinTrezorPlugin.so $out/lib/mozilla/plugins
+  '';
+
+  meta = with stdenv.lib;
+    { description = "Plugin for browser to TREZOR device communication";
+      homepage = https://mytrezor.com;
+      license = licenses.unfree;
+      maintainers = with maintainers; [ ehmry ];
+      # Download URL, .deb content & hash (yikes) changed, not version.
+      # New archive doesn't contain any Mozilla plugin at all.
+      broken = true;
+    };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82b971a96c5..bab28228b1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16393,6 +16393,8 @@ with pkgs;
 
   treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; };
 
+  trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { };
+
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
   trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { };

From aa661ed796414fc6bd4c1432e6172321efb31e1c Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 11 Aug 2017 11:10:31 +0900
Subject: [PATCH 1862/3246] firefox-bin: 55.0 -> 55.0.1

---
 .../browsers/firefox-bin/release_sources.nix  | 762 +++++++++---------
 1 file changed, 381 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 5a34d305af7..2d076828694 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,955 +1,955 @@
 {
-  version = "55.0";
+  version = "55.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ach/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ach/firefox-55.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "0ce9a2852a86553f96018e8873e966996f5386204065200f0b24dd0b939aa815efda0fde06133974d79ae4f944c5a77ef4d91929baddc6d72a5a457203ef7784";
+      sha512 = "c991a8c53d1f415253a66fdf337e082a3cb75f30b9b340ed29b059e2a6f50d67c320bcfa9584206f1e23c1af5d3e8b825e30ee009f7d8130318cc356d8550316";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/af/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/af/firefox-55.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "97c01c8794e2ffe0cc25e6352ba4c6155ea1e1dfc8bcec669036ffda1aec943326ac38c43eb8260a55d46a264858144bdf0cceb9912c4f2d0d373d4d0d4256b8";
+      sha512 = "8112c343179b1bd61f03cb67a0712ef5584848bd2dfb28dc46ccabfc66eb803ef9f23d023c6f22c6cadf715ba459f36e99bae5be8f6c62af772a7f67f724767e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/an/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/an/firefox-55.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "f30070803ac80d00e4fb248f0c1e871b51bb4c78f8c3b12923d6b96c9686ea22768aeb9204da880647893524aa68e44576be4092d44a6b189b5cf01f493f9c82";
+      sha512 = "41899ad93e627e851423ec8b5acd6bd940a10dbe80e98377e7d4080b31e9a8f5ceb51eec46931429688a4b56065af2a3595f51c3ef2c51561dd5a06d0c0cb347";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ar/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ar/firefox-55.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "213d73338a3087f925a5137432e84f1c0f881d37c33c109d9ab6e2744556341697e56c7efcd7f4d5011cdb6fec03de072afbf14c34a30770456f71c8971d4b6d";
+      sha512 = "ba4bf0c1ede64f3c11d00b5ef3b193d4e36bfc49687572050b22cbd0bc30be050a7df3401eb20e869b1f33ab16988701392b845f89d4693a589be589eda54ecd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/as/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/as/firefox-55.0.1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "1d33b5602db1a326be0ac9ed726e38b5e871904685e6586211caf6b330417d33c717399663d94d725d4f8784591c5b7eaf4b4ecb867b8d99e2c85671b31f5877";
+      sha512 = "b3ae2fad8940ddaa16102f9d43bc5113a5f4f38a4527c43e1a4b88a63015d128a201b68b72377c23274023b7486829181bb44ecec43ba50fe1bc438d30da8349";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ast/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ast/firefox-55.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "93a08c86dac4a81fee72cd4c35f39f578222ef11e28e503851c9a7ad7cffec3e3324c32374ed851094b8ae91c642a2d726b98cade60fb4511a935320ba790faa";
+      sha512 = "80688f5eb65f4fe09a840d5f3ba2516bbe45dbb2f2b96cb4f8af38900880dea22f3b8e040491d81c96abb4fa1d50815e86b5806dc8e31148c0235b0a72bafb12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/az/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/az/firefox-55.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "4661628ea83c2101481bf08c1484952a30c27b9cd1d169bacd96fb6416ef77321e7e606e989521189c5135c63b2b82b7fbd3e85d0f50919f6c9c277176aa34df";
+      sha512 = "0e8d42394d79c3a8f8f9f7a7ddf5894adbd89627832908e2f82b4712bd3260e8b10e04eb0166ee8c2a1010cd9dc4836ccbf99d3af794187ee90f06142286bed1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/be/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/be/firefox-55.0.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "7062919a385600ed74972b1851ab7bd20a46003c37e058b93cf8fdb853ebb890b173aa6cc572d2f51661b571d3efbc189d04abff4dbbd9e93398ad5a55015e7f";
+      sha512 = "c13a53874775cf3e2da703dc7ca5c1f9d69e3af9050b7f58cf903f87a2ee7643e7db361d3d3628e470d808ce1b412d355653cf2d67691e1e89c584a9709cfe41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bg/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bg/firefox-55.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "d58389193c33aa24aac09ad286b83f0f808116f20907506d2d37a3cc45ae43223784fc12face495cbba34be24358584e38add83048b477a27a93f8934c86c82e";
+      sha512 = "8a6a34f0a31793e70edfd44edb54d3709a3960c3625f5856626c28f0df0e93d18d0190d3161c18315df678328918fd4029de9be9db7a6ee426a9054dc5d9c50e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bn-BD/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bn-BD/firefox-55.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "9d552eec9497565bcd71faba474338e97465d1902280972a04f4f7e5fae88cdeac144b12fd1bc80d079b8c16b0c7e5a4dd5da6e56486e688820653cff35ae517";
+      sha512 = "17e2b8046b6dfe2bef7c8dd7027fa2fe2c008672b7d5a9676a9b6ece12b7b3bf7fe61a5d5378f1974f530199739982a83b421b7cf4643c9bd654a4b2235f3bc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bn-IN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bn-IN/firefox-55.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "4f150944cc42c829fc619e3a20fbca9f5116180b5c2e160d48c8b9f42325898847abbc0bb0724343527e97cbb74b7286dd8b7901c0ee9ce83559198994486505";
+      sha512 = "39a5c15019881507552a583053fe601dbc04e0de410dad3ce7727ddcdb128b28c5becfc748a1c5b89bb272db66f2bcb4eb6ea1b8a3cd37c1d10156ba29b3165d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/br/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/br/firefox-55.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "18f0d851b249c7bb8979499b146756efbad587ce48ded72a58bbfa2dd1fe951d5ee6d1188f6e659c760aa4e60095b481921feb016e69f78e439de18f7ecc0bcf";
+      sha512 = "7ee7d1fcffbaa0791c88338a8b471bc20747abed505ece15f74f58b747eb56b300b71ff15e72e56d5deaf75d98ccbe93bf8c1e0ad3038238913f72f9156f8790";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bs/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bs/firefox-55.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "b0b838026b932d558ff3af52bca708e3f60929c2928c17c956b1d4f2e023edd45d98d65b7ea268c2ae04299944d26cf19d9a9deecabfe447c8548cd8afe98b28";
+      sha512 = "038c185cd6fd2efb1dc51c9e2275d98fa0040e68de306d5cc3d799893a69f937353c94c00bfb9fcfef2a2c6099149926ce30ecfbd972170cea501f9c44c836c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ca/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ca/firefox-55.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "fd700550d5983f53d80330d08754c84e7683f965316f738e9ca5d45176d7fd42ec57a02aaef3e82358d8c7913cce9284e04299d32cac443063184c41e5c7b0a5";
+      sha512 = "be717242a9c93705234d87d0b091925f1b07e60130aa06ef19b72283f0594abafed577b6d98eaa9fab6941d1f8c2f43292de20b9476312aebe0fc51d368ac50d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cak/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cak/firefox-55.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "4cfc69ef47fee1a8a2127be92cef59d2dfb40c99ac172eb78de978e7cd7aced093a7c1da91fdf518a0c9b23a81f393919c44c353b52fcb71b53b41ffe88fa22f";
+      sha512 = "1b9ea57bd4164862c9c29e3fa16200aa7ca15c277f00b838439edba4256e323aff97d27264bbd20a5e08ed70e4f897611505570eb01a2ce0f9cb30c2c611d065";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cs/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cs/firefox-55.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "33c912c591e8856bad1130281db996c82df28fff10d7f7031ababeb7acd385df6ef14165c491b48edd285cd8086071dbf41e3448431f028364d62810b3fe4a34";
+      sha512 = "ee32ed99d5d4b05d6a9ca4d6d274e16ada833dfc9f5735898eebcffa7925d1ac1229ab671af9f8eaad7d4fd6d2135e58c8f6266e1173a8797a513b977235ec0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cy/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cy/firefox-55.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "5cdc13b0317d7b0998c534a92e094374ffedea9f430e0f27c97b972985ca050abb7ddecff60f87ccc0d6c240db453b335fba12eec3e8448f0f830b402dfa6171";
+      sha512 = "29302ad22573fc52e0764b89848ea43ebff98ffe94d3d91d1aafa05e063cf9c5580c9e79e0b987f18a87a648a6076f98c48d20d5621ebd46be02fcf41ce19779";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/da/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/da/firefox-55.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "c0cfc7e4a398d5004c1a3f1afb3ee5c32502e7929cd7ff7cbdced2f9104452a6754db8c22764cdaa90885698cdf40379016f866595f98adf1498f48576a1fc86";
+      sha512 = "25f8252bac8b1b4e353dc8be0945820bb9e013dfb30866b14d6109026c122cd9038e0e70d54f959a59dbf99fbbee48d0e3254f7e1091b2e2e2811b83498e36d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/de/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/de/firefox-55.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "544e6069c5f2c92b80f804d105d4a198ca360415701d9a9ebb08044cd877a2e0793b03381bdab55e31649b021a1343647ae8f21844915096347fdc2e8280ed45";
+      sha512 = "2d013bd921ea9758807e64588f887fd841c6b8b32a18b9eab3b2ac1f598c4d7acb27b2defd4a836bedac238c96cc7bf700ef87f973a39d21e87ddbb7e27be1ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/dsb/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/dsb/firefox-55.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "53e7bbac4a479e06a14dc91313b66f28c5731b88faea2254c0e72e40ef4eb772c61bf494557474f03e1b52d3d85f8cfd2785085b4d7324907107080342899a56";
+      sha512 = "f640fd20c2beb5cf6aaf402fa220a01176e0eb74d4429cc10f76bfca9a8579e17e490bb2f045ca6e61de4ab49703c68571c4dd7ee82c438b2f8ab94ecf53ec0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/el/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/el/firefox-55.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "304085e04c30b73476ffc84da692d9e08c3edfebb31e7e9777afa7a1e12ee0d15c5d9bc4124edade6701833de02813c0549d8a731a58e824b00e483f4965f49c";
+      sha512 = "6d1f68305ef9faf6c0d304b8ed4b4c093375c03b95b01ea7c61fd421cefbc84b8fb878cf49fdc5f3ec8552b277dc351f201470c5c4f45a249b3e010a863dd65b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-GB/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-GB/firefox-55.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "237cc95b7c83b2e76627fcd2f417d21868d62398dd5477bcb9355bc0c73f53e9e595e95bf9de0597c15f7eec836aa9e3f9b1fab29309599cd4ec1c7b69b938d6";
+      sha512 = "e4bb9746e00490bac82750130284847d845ee8c85d48d84b799d725a3dd82ce68046bb2c9bcfa4c92070383a4f439766abe58dbfc9346cb51aabdc730b3e8ea8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-US/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-US/firefox-55.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "1d86223b3f56266eb83307e92c4d39c0d765b94015b089bef8eec5730e0a8e4aeb7cd06e4cbd43b445ac4d24cccabebfae02f003b791d1be03dbec3c9a46c9ce";
+      sha512 = "13598109ae60682bfa122925874173749114a093f7989bf0a4cac4def59db5ad53db61546d28ce09482cab1225924c7d35bf4efa8b3051e78ad760f892050a35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-ZA/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-ZA/firefox-55.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "8411248503638d44933c38bc105874befc160e90f2323764c7bc02667c634456c7c79cc8a7931e10ccdbaf4e20e3b2d5098b9b87ec63f75ffa56b6c62aa5b746";
+      sha512 = "5d7dd0d6b2e06dc2c3ab94cdeefd168c005703cc3c632aafd7896bc631002ebe26c1c0103307f3165b720cfe79e63fdc9b37429885a2eefdba492b714ab308ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/eo/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/eo/firefox-55.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "fe376d69e5a8100e3ae70036d875019b04ff2c8d62d7caf32adf528fa90f78a0d16c986b7077c61c38be5331f3413777028a853681b090d42bb3e09475a5b5ee";
+      sha512 = "1f67bfb98891effb2ecfb127b9ab9ffda714187a34265277fb7841f41d5a4ddfb81ead7f4cc1d38af290feaeb36c315b2050a889b6e9b9bd7b9cdd51ba0cbb6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-AR/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-AR/firefox-55.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "7ee72d922075b528dbef56bcf784690bb54582094a113c9ff0dec0f8ef64ec214f2ee16e930f8ba7963c4bffb4a8d5fd23e5cd76ad8557d70b1632a6124ca6f6";
+      sha512 = "011b4f49e90ad091be5e8d932ee9a76b1653f307db328ee6770b99ef37f57e62477ca7529d182f328203523f9d0160f337748166691921d5720640c634522515";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-CL/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-CL/firefox-55.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "d03c2d4fb96b2d64c263fea62ac3cd643648baeadc4091238fff87cbc2fc37cad3069e1e4fe949a4ff7162fedc85dfaeafe49326aa5de780c96a0160e91ee9f7";
+      sha512 = "ef29baee74951692720c32522bec81330911ac0366e9bbd816a5bdf0738e064268af2f63ea5b3542e51eed21775cde8b4d60f6cb47bb18b94315afcd078a1c84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-ES/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-ES/firefox-55.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "6893e72c09cea00bf2b7e05f0e170e97967868675d8d9752c18bae61a5f147b60db5ef165138a3355b0221515838d526b14f09cc1f99ee893b7c9cfc618ddfe0";
+      sha512 = "8f21e0632e2b4d86883b139f5992becd89a8c243afd131e2f9dd863e2fb21279bd858f618789a73d46218de3bd59a5c4b017dcdda5b1db9a3400e0e0ace3c9c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-MX/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-MX/firefox-55.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "ba8469977b4f61df8165b09d333fa6ffb718d7e3710f62a459bd0da3a80a63b947ef1cac26704b5c4e9f4eb2380b2047e500fae372a82808cc7e5fa4ab9b0e62";
+      sha512 = "9d59bfffc685aee31004894e81dda5efa3c512bfe61dbf5d224b31cdff6a859598287a8a80e7d96645718689df2dfee3b4a79c064e789d246cf32138b9346f5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/et/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/et/firefox-55.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "07f6ac8fab7a73fde5c607b31be1630fc2c01778808259f0f1472ad3bde56dfcdbaa584de0f9fe1fba6a540fbea6709d124daf64bdd89f755ae98884c971cfc0";
+      sha512 = "a833839e8243760942337161192fdcddcdd7ccffd3b5ce3c7dc939492366e8579e0deabc933a607885f20059e40dabffd389a52db05ea6bdbc794d9e15a1c9e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/eu/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/eu/firefox-55.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4f26a97eef55cb6cb4b236fb69dab897b9263ace1de3ac9fca099118b7f96db41e5b8f1dc371e636715ab2aa078d2e5e76c88fb907234d7a206e8a96f8dc9a21";
+      sha512 = "0415c1f00f612d080dccfc3829c3f89de4fc5921ad8603c7eda0aaf9ca57b055c66a4a0f44782a8b381e4e166964f5cc805b65b84525a073a1fa3e605bd07aaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fa/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fa/firefox-55.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "86a1accb6903fc0f2cf49cc86920e5e4b4a20a610c6a212864ae83e2bece1d818be515fcf9823bcb1c31ae748776514ce54fe6a1a57c728d1745d67c45856a66";
+      sha512 = "699be76441b245de502cf0b9ac44fe3c454fd11fa00d6ad590b2a393a31f4f291c3b5b7075741c82c28a721eb38a11a3627e71b42e910fbc2f474f2284820f86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ff/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ff/firefox-55.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "b33df9a1488989cefb5bc849d44c5194c25874c679e48634673ccf8cd32cee3274b6417de6b58bdc45a68c58adbeb3e0fe36dffd9b0526b9c79a902cb7b5077c";
+      sha512 = "910928159d16269784d3a41b8a423138060bdedc7e190c80e5bc95bb9358b6e8fd08c519106d68326eea4bc8f5c54157cda151fcb72d5bb1d19f82696297760b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fi/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fi/firefox-55.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "c03b784f3d13078fdc760f07f5bdc2352e5e3ea2d8d49931f6ca6a9ce91b787d85624cb1f2d6bcb624cab6a3c018669c1f47443e2a32fc0472d2139623275885";
+      sha512 = "1085f674e3fd557d62d29c81d52dbabbf09229a03d38d8eba1886a98937c560e91b8a5cd5fac1d313946eba6622eb21462bb1227cd35dfef523b34e8928b7f3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fr/firefox-55.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "d9f0baca6f54ec4bd60c33ec87bc7bb307054c5214182ba7c14ddbfba6748e77f87914b6373d288f8514361dc2627ca75cba9bb97038f183787dca07ecc629a2";
+      sha512 = "038f8198004d38ad9e2814bd55b2ef1d6e3af3f8f3369a90b41e44421b94ae960380ab65367375e15eeb1d0af72343874314c1005aee18dc86cf079fdc19fb80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fy-NL/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fy-NL/firefox-55.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "8452dfef5134afe2184cb8d2589d95fc75bb9bd487a2451fbbcb873f72b3612f7eb552772e4b9957060d506274d2655505838628d468efcc1b534697734466d7";
+      sha512 = "83eb5df7022ad9adce4ab7966fc4979aad7f6d1bf2b47001105d67d7933feb8c264708938b87fac3908a65adcebf72f6af9d5623fa6026458dad76a360f0608d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ga-IE/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ga-IE/firefox-55.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ca465448eb5ca014579e73c5e9aa09129f7ac3725f90e6ba8bc96f67ee74e5bf916050d968ed91d52b60cd8f291f5553bd66ab4373af6537c43fce4e8a526c5b";
+      sha512 = "34f3bf3ecfc264bcbde3bbca80bf138d1f7f925ce6606d6c588f0df25f22eb912dd3d0388a6798091cb88b51a22380e01fe984bc80edf95c76e301e7cac2b2cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gd/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gd/firefox-55.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "c79b3c9c3970cc3eb8d0de8004479e1d6832d8b1c40640112e508ddc3db36a318f620c519a11914d5a103e01d8227016e4a57c41474aae346af15cdd5d5754e1";
+      sha512 = "4d2f04c7cf06c6f8efed7abe74f8ab27794c01aba57ae2f45bbd1a749295ed7b6db4389b1c93148330695c6d213642dd9046068f0bd23ed3920bfcc7fb9dd4f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gl/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gl/firefox-55.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "ed98aef69f2aa9de72508e6860935b4465777cf26252c4a4233a4809e1e5f91e44d737bfa13d2705bae2e0c250cd9b4a92711cb022d84c109dbcf61a47286a85";
+      sha512 = "d70c3cd99be7dd1d80c070d5301a1d84f33f1b626e0471861980512c81672066a7869a5d289cf862ff4d0ff6f488b0a7cc298675aa9afb0a62a191ac476b71b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gn/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gn/firefox-55.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "0c6eb876fa8ab4c0896d96cf87e52eb43f0ded62c93770ad3f59ed7c2e81bb7a231d4d698e83aead3f557e7c3443cb105860b2f98998804ae14e49c3ab3bafc1";
+      sha512 = "f183e3c3ef451367362aad3bc96cf1500fce451d3c0f467822e756266bc48d7d9d7952e82f171db2d8bf23d41bf58cef34f67da7211d31335f86574abaee567f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gu-IN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gu-IN/firefox-55.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "3a57b1adba2f9fe33f91ac645665ab8301b1adc5a22f2f1a04d1a3c3947c25499b9d14a3e00b8f147ecc2664a3ef5ee1c4f5b397283c5fad454dcde94c261932";
+      sha512 = "31afdd21bc2d9af1a52cd24f74c76480658fb0506f38e6fd5f5f85bd66eedae49cef89aed9060f1255c515d24b2998cbf9eb449b5083bc6f2bf1805d152197ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/he/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/he/firefox-55.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "46002542fa8baec217d26a1b246e2e2403cbe3af1a471da0fcb936c67e63bdf547577bb9655d1df414bfba8a16d2abd29954697dc967328f77678d08196ead3e";
+      sha512 = "c68c416515336a6c2c8ae69151c1b8c972f24671d354929eaf3eb647944d6e99085b5768a8156e59015401a33174fac774f0bdacc6005c3ad23a008009653fb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hi-IN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hi-IN/firefox-55.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "c905d2044a685dda24288c3729261f58e1d896c71a8d437471dca5457676e9a77d2a112252f2482ffd744c08f6c8090541c53f8c27f85a609557603ddd114025";
+      sha512 = "2e62b66e9d34c9a7d9472726dc322746ef399b24400b9315dcd15f010d0bdf80d8f0c1ca912ce3275770ad925f47d576b59484b3acd861d1f3fae9e2ffe5277f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hr/firefox-55.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "f4a0084786f61e6586f0cf4f534c4402b66c82654d95db92fadadeb743766a976a4c349097633a536aad8f5dafb25127c4366ed002cdcf93f0a963ed431d827b";
+      sha512 = "a5caa5839d7ba556314c513a9599ebdae05de41f5b3289987a1f1d1dee030b53da07773fd6517f42899ef443770ec3549f4160c77e26f68a1e1bb3ca598bd866";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hsb/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hsb/firefox-55.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "d1366512fbb61a283f363a29ebf8e8570844ebe29bc0068a68837261181f44aca5e8fb5c3ade82d930b624e1ae7dc2cf30a0e6e0d830a60c529f6fa9d2bae1b8";
+      sha512 = "df83ae1a93cbed29c85d75add44b70fde9c187953fa169cbdc106ecb722ec845b129fb762325f08d0ecca188ac6bac43c6662059a6694d43ed90472ee8eb23de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hu/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hu/firefox-55.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d76a3a892c22efa04e84ae9c66ee76494709b1185f8d1033fc3bffbe67e433607edd152277218501ca94d5cfc88f8e9de356176c7ac2204ceab18eddf51cac75";
+      sha512 = "c5787634d4fcff538423fdd9761989ef341058fb129f33bb729686cbe5319aad7d67c8d19d9e42b7d81ac08381cd0d07504fe413a9c38c310ba3d7440ceb6934";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hy-AM/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hy-AM/firefox-55.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "f771b69e18434a8f9a5fe5e381702e078e37c87c4bc1cc4e0fa30be0c46f3eaf36462e6d4dfc1e12d5896ac6a5597f5987477fb8aaa5a5a5f0648c92d159cbe8";
+      sha512 = "6318a512fee633ce49a2ac6cf3b3295e74624bd935e9979193796956c11239f1da3ebeb99b5547e3aaaf339c4f87d0e4501edacc13fd11435abf000a9e119ed2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/id/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/id/firefox-55.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "6fb40ff190d292d18da43a769aa679da1ed6510f185023ba08e749af46b4b0fecb3d305d9dface2ea1c2096bd8176add235daebcfde6bfae767407d57e040ba5";
+      sha512 = "2c7d0de71a675a0d6abe14037db11087ad9a2825bc2d9bbd863f209b86d9875da08eb2005590418262b63bdb12a9b122e54230824d5916059f3855b628eec8de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/is/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/is/firefox-55.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "47f51627d21b803477b237b8f3599cb02efe107687fc25ca14c82a7d1413a0b49f3f47cadd42a937e10142ec0db6e538f2fd17ec1fabbb868e0db45011ce1365";
+      sha512 = "a1dc23e047cb7bc21f3c1a888cd8f9168161296a47148c2296e4f033d7038fed83566a429610fb35b514aa8a902839a00201901d46361205e5e292eca7418813";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/it/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/it/firefox-55.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "5707b17aac678c28ebfef28b062799f4683c2f2192de7b305b8699ed788de54aead0012c1a41c999a2270a30e368dbf25d53bc887f5249279220ffcff143dab4";
+      sha512 = "cb2bd028873e28aa197e3f599b2d1aed913273f888cc2eb69775b1936763011baec1f03bc57e3da6b2088a8ff37d08ab014bdce8161bf6929c57f658772af8fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ja/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ja/firefox-55.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "9290d777a33e434c587c19b5193a32c2130662c0c74917dc1c298b0f906aa3ccfd8631dfc3c396ec771efbddb254fe603ea9adf42524e72c9b607a7eaa81485f";
+      sha512 = "dda54f19f4a5a493b7ae6167955c9ff4c503d8cf239fe6b993a87d3f73171162e29270366bb3f2f1f1afea80e3332928417bb3e26fc414d6543e9ab2e1a2008a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ka/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ka/firefox-55.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "4ffddb53f2f9ed891aa75ff92dee070fbed1570585bdd8d1517af6cb604fef9ef98e4efa0ff5672a911e2934e91b8e74ef808826b6f4a7c08ffba45bc1e2df1e";
+      sha512 = "9e0a7042225361addf1fe41c13e0e3df869e41c1a88b4adfa64cd4912c4cc113804dac23ef5ac7a8a196ebb8552a2baf988aa9da618ab1a64e307d02c15177c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kab/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kab/firefox-55.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "6cf1f5f445a99a90bb509e9f962f63c3674d1f621c469b354044f2ecf30f756599d1c920b34e4665412694da7d6f85729608522b5f7e6c3c0b02ae23b0b12fc9";
+      sha512 = "27f319c418dc54296f616b9fc2b6069f1f0da92b2eb95d872b4fa582f494f0339cbe40fe0427ae1cf8a1ddb1ee436ae56773c7413591f4bd76f027916bcef187";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kk/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kk/firefox-55.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "0b5810e34c15a1152524e4a437399e627edce29bf9edad54cb4731f23ff3fe06fa94fd750f35398ee2577dbb0abf94d9f965c90520e1cc24bfcb97aa5bc2696d";
+      sha512 = "7d5664fb243b214846fbf2a1772be96df94345bbc6cb076b9e75ea0dc126e3113faab67ee935792df48a915aa7274acc1d4ce48bf09f17f662341b2235ef6d1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/km/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/km/firefox-55.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "86ffecf5a046d4084bb991e527e3fa009dc4a228f4f9595fa594967652fa926ac3c126b9848002b856b9c7a0295d757311b4475a88f42f6e9087df6dd29886cf";
+      sha512 = "7df87f956678f7f90df95f5bbe1309eba7f89ec2e1030746f56df0e14cdce200a1204bb73f8db68b02655db36d13941cd0887116e974df2e11d8d222f5dfb6b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kn/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kn/firefox-55.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "ada203b9d3edcb87fa87f421509738dd023c0be9444ecdb411c66d6f3dce567a1720b1bf013fbaa259628b399f117e20d365ab6d2e5a2b02d1ac93d7b857a0e9";
+      sha512 = "532c5d7a67d6508188628b9728fb6a1339ed9c789fd8cc58c33a9b9495e8ba8b979c631bfae66096b164c277dc0eeca167911aa4b856a1d6d437bd5a60103a3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ko/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ko/firefox-55.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "ea8aef83aab3b5f8c6d1add9c7be91f883253c2042312daedccace4254e64cc352f45b1ff0b18c1f20fcce852bf3a203e579660acd9c15f90a27b6002670c626";
+      sha512 = "c1170288dfe6d2ea418d93e3d401a2746c88df77cd8ededd70b17dac4652488b20966aa472f7e929662a8305fc03f7153b534d79d6e8dc62dfb0b468a417317c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lij/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lij/firefox-55.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "43a44b2f0c0626399593b386c8ecd278248bf63ce2646dcb1a2bd28c3da32d99bb7fecfddf42097f7f89966bbbc78094f04b0ce2771f2319f83d19f1e0aa6e44";
+      sha512 = "3f2b8227f04064ea5507774848296fb12d4e17b806cea7a356c36995648a4db740d68382ab6d6417d745dc278b6cddc6f18cfc6fbbeb60480106d726715c0d1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lt/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lt/firefox-55.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "959869c39df29073c5a10ea314884d474b77c0c40832651083932785db629b0dc7dec8554da33306bd8db588c1a54cd042443970fa7c8aef26ef7f218ec49719";
+      sha512 = "24d0621a76f53b2a4fc7f3b4d97a1a066ff6fb7c7e1dba9028ef719a38042271412068a7a874862ccbbaf010a7491088e231036271c54e51c624bb82937b139f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lv/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lv/firefox-55.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "594a01d1b5dfc77082696b754065e4b6b5543ed5e4d356dd38255d323b8c1803447734ea631b5d5e5a9b4f8611167c3bd6527e076d546731f9a8b406c8afbc23";
+      sha512 = "c36c40e21e305373e7d4ddb67702055cdef28f880739c2339c5e75a0f1d30c2e73316f65badd69dc93552ae33a1f493658002d73caac5a97b8d03e3e4365e6fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mai/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mai/firefox-55.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "90d6997dc57a5986d62760d6d163c0a56460959964f0c2e9acda5570cb768e95be04b5b8648437df9845169262954d2b411656d3a054e2fec408f71453928c21";
+      sha512 = "f033e7d1cf52486775ec614bf6272cdde3cbb17a00aad49c8c7739d72488c03d9803c860aed581640689e336bc55799521da4bb0b3a6c9cedd3af38f94c944f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mk/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mk/firefox-55.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "06c3a0a722059ef6db6cdd5cb38875c1916dfa2a8bf7c27b0eca2e9ae893348cd935f208dc1e09c7760dfe3dd63428e83b1f8b2a364394507188cdc4eb86763d";
+      sha512 = "d01f9acf588e5067681422daff9be1f2e033b91ab2dba9a979dfd9bd918b1a20e5ace64739ebccffe025e03b80a2f3a955cbf5940ee9341e2f62053ffcbdc408";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ml/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ml/firefox-55.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "8d51b7daa4fc768752dc9a48ca9c38c62e0dd35925518ac4f4d80ff6178789205a7c2c8935b5336751106d8504900bfcd2af8aff2f977c7b35d1295071581c87";
+      sha512 = "95a6cabe1b0fa984de1df148207d22b570a09a5c1fe95e898a33e0e0c905b9f868586294032712339562d8f5cc78961a7fed5aa3c1a5c1a77ea5a5f3197b520d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mr/firefox-55.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "f9aec2aa02c336c8699b4420abe7e7a94e0d376529275e24a57e8158c99e472e3fb78d757782ab9510abe6e0272a66865e7e84ab599e3d5477c2af91f079bb0f";
+      sha512 = "59053496d9d37cec07ed1dde98ae07db593726d49fe97399e97e4a6ac667835cb34db4864c5e67bffd1a9c1727c1af2feb19fea0685fdd2f6b5226ad24022656";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ms/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ms/firefox-55.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "3e6879f56f8e4b85c306c73a5c59ef463ed287793ff2bca0834b2640070eff9417d4c59bdad4963229d3c3e38fde67386531ac69abcd3164adfabc668d68003b";
+      sha512 = "c3a23a7165b0f233fa606e622868690f696b262f33a2c1f2b23ab37f392e71bac7cfd04f9e240660ed5f6075cd3192d9ce1be46a649d5abfb7beb9a16ff91e7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/my/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/my/firefox-55.0.1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "64c34b420d5e9e0cee53486947dd634ef015a2c043601e3ff040b08a840375755390ed6b2898e8024f9c6a87e367d7dadfe04f26bb6c500c391056100eb01fc0";
+      sha512 = "493e5d971b55696121edcd72712120caf638aa13d2654e8f4db4e814a7b8c4cc2c7b89622b385029ed1a9ca14294cc39d8522784000708f418205c36b1f2fa64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nb-NO/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nb-NO/firefox-55.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "17e1ea276a3000105018046f53752c0b4498d701844aa29ad7cfe5857ada0c3ecfe29f9bc11bf09801db35b0c58be030069229096e01eddbc702e6f8917b5167";
+      sha512 = "c7c3e85d2749bbdc75a359ff5285ef3cee14b710aaa6e0f39415cd72693f219589b64d26cbf15020c380b51ac0d4a6d41e730af9991cca1b4d5f1ddae4c63dee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nl/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nl/firefox-55.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "70fe41e9c3f6bb8d5fc3be480a469bde02197036c763839021ff38c25050be3a4b0f15f71b16ddd4c0827fbc635be81751e1d679e6445f509b2b8cc30d70a5a2";
+      sha512 = "1d77c158ebfdb65004f5c999e6da15ba2cef2dc998c69bbf5477bdb8b41131e968187017783c65103f2040db2154833857790ab9c6aa705b866b60683f0c4ac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nn-NO/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nn-NO/firefox-55.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "803390f1850a286531046e3d3d9499050680f8ec8d8f727f0755b69af833fef7aa1bc841566809d38dfdbff0433b20853e4cd64ff0648789279b1cf9181e64fc";
+      sha512 = "37630d6abf1db435bbff8ea2821966ea58fcc3326199dcfc0e95833732c9ad767610781046ba4b031b516f5dc301e7a7d699699ad7b39efd2e9cf3df05bc3637";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/or/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/or/firefox-55.0.1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "79d474b2c0e3dd1b09f42895370ac7cccaa7ce71f1d1154665865114dc6db2a165e099de03f064ad6603e7fba967f85865070184ae7d478940d250c0579a8b14";
+      sha512 = "bec28704aff4671d2ee5413a29335f84bb04b4d5dfbd108988e1772c68486e1f5bdb2b7b799792343b1191b768cee7cda59aad0efbc0dbc45def3149e7eb41a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pa-IN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pa-IN/firefox-55.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "958cf459da7c99979c2684bce55f47ba5bfcc3ba908bf11f3c981bec565406aedeeef2ab691e28bd35b7763695fe1cccb9ed76de9442612c99e01960925758a4";
+      sha512 = "eeb9a7a8400e14241296ea75c55fbc17461d298bf7d4a4b57e26cec434e398d070b9207d6d19a3038b65fec4792f9eff47b758f5e5b0ff373b349f67f44ee1c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pl/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pl/firefox-55.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "a3c0c0b388ab02a2014a7a1ba18d373557e1828f449fd5ed713c8ea2ed110e3450fca2efe093a0e9ba0893fc447e5189ae7afdc77ba3eb1b7c5eb416b4efc50d";
+      sha512 = "560a7fe08b460f99e6d166caa8fd442ea343a1eff9c5643b96ce9085fbd76cc27eb3b2ccda59172c5e7542bfecdc3cad39257506531c51350f655744bfe166f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pt-BR/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pt-BR/firefox-55.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "5ea81d1719cfbb161ce4a27a72bef3d579850bc26f911729bfc46cf495d680898746361fd3e73d0096b962c498ed9cf7706d6fd940f04d1f6a2b81f0790001b2";
+      sha512 = "452bdb25f38b31af0ed6cb1f2636ce238ab898065b8f61f505206e1dde12555a18d491b5895b549e1d5efef94144b99988a69e19f9ccc068c76474bc0898aca2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pt-PT/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pt-PT/firefox-55.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "460393c862a11816d7b3bbbaeb3fef4c566c1fb4c479ddbafa4edadc1f085e00bf8e9b01e5d5342058fa384512701e48745015d3a56d98a8e954679e0258c703";
+      sha512 = "54c6b9bae229fbdbe366fac25e9a3b89f48d85f41f715f9db1f3f1b4fd210056f642549a982eff9ac4e2b68640ab01517ff9756cd63b72045f11c07619b59761";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/rm/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/rm/firefox-55.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "0dd87197bf700923f771fe96bbabddd209f5022ca6248599beaec3f32d86559b560342989d24612977c30f61797a02d453e0e36259496128314a87f8a8b3aab1";
+      sha512 = "075a161ab0cbc6417dbfb4873c8ade404a2fc911f2da9e0149d90b04b32f6c9ccbf42b22f2abaf13ef4f9cb4d8330a90054517a651d0c0f1f940431ece8b2518";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ro/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ro/firefox-55.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "60f1d69e881aabb32b40566f907560eb17d5b700fede8ecc1b5c8d198041cefa774b953dceb69e30c0d5ee57ef32b27b9cb4f43d550452b43414a8d712943c8f";
+      sha512 = "5c1eea33100fe2bd020f9d1ac2bb781ec04b25a12d271d3dbc311319f7a688f245e2d7357055bd8321ead58923857f689e417827ac3125ec206975134e4203cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ru/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ru/firefox-55.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "fe4c0ada1acf61cf784ecd6975d3c49a897285f2f816d60c33b82f8c4f0cdcc221bfc5032381488202454ecfef5bda99de12eca7336ea1028c2c13f2c2d052bb";
+      sha512 = "c9d99eaa7ad17a29cfd860c343581654da5daf15db5bf653a3d0b13b03d1914fafe7f6801810b3ee06abcf687c71cc1f9d20cd727b10cbe91e7bb6c977aa279b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/si/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/si/firefox-55.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "ee52d9a71535bb8df0101a91b414e5a60b2f4d3db9e2ef65a1dc737d2f81d20bce6813968c5f8d25db40b14dd253149fd7511505ac43f2bdede7363df8e1f594";
+      sha512 = "e36e3e4767f9afd211dd4333bee2ca4ad3d9ccc7081b1cd008098263570aad4272eab91032527c3f6f0a70e54953dc806cfc00a08627ebd81943195add184603";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sk/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sk/firefox-55.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "be8e5677c9e244ef4f8c660380f3e2c141b80534685079c8a76f6d74a12defe5517de04a2504dbf5c4027dfcf76e4c80414320f36dac8701c8baf16ca75740bf";
+      sha512 = "148b8ebbaba7d111234108758fb48ddc883c6d9094e8f22680d65cb9ef05fb34eeec4e09c141e7523ff511fbbc2db84b0eef31efa92730ab30a4830192875c51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sl/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sl/firefox-55.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "cc693f834b5017fac4c2655b3b362cf54a0920dd25194a5c1fbd8af8c68a9d130d0dd055eaa9fb4c4348b0bd479da517e6b3546190f83222f2ac2fcbf411f19f";
+      sha512 = "fd0f058fb2a7fd304d08fc4966c7235c557d869b0a02955a3459b354793a1c2245e45ecffe9d0b251357062cd81db10b5d3f982ab15abcdf275af31d91038f9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/son/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/son/firefox-55.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "39618b1e8d08c7ef70ee7873daccfbcc41d0ede0a3a39dd861bd3155e82f1104b72d4ee7193fc30b4f53aa9f6ca12209a68b68470bb319189c5dffd7a9db4d1f";
+      sha512 = "4e6bc840e788b0a3a9cbeca86969d3a37afcf600b583777de84cd77d21010360afa39dc2ab4809b12cd798307cb84c6f10e7760395b2fd2aedabfc6419b02d18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sq/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sq/firefox-55.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "e518cbd7d40c96dd2ce6171bbfa76b946cf4d397790b4b9ae8f00691cdeaa95d3104bf174900b18115eb07c8ac5d6158ab5aa01533f9bf06d435ebccc1a034a0";
+      sha512 = "e852af7925a2a5a0c59cc54137d1a574d5cadd831929ddbf375b726b1241dcf901b18f97f030a5ca08283453ee86ddfa113488adeac6fb974524911e354cb763";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sr/firefox-55.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "9ac9d605aaf3982ce6ff4d76ce54b30bce251e9739061607377483663b1654805b818d08b29a636b8a9f8b83bed38d8f91d2d48f29e39b4caf03fc895b7ea605";
+      sha512 = "99b3f089f8c17701ddedb41add217ff5395b3f942e7f455c19f63e49a499282a2432d9f198eb4ca219cf25656ac90c803c4cb7be01975be307b7835b2ad0561b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sv-SE/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sv-SE/firefox-55.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "7bad9194fa09f4785317488b430b1cfc3add9b460d340756477631b8f2d05b9ade9326cacd735f804fd26f702152906cbab844d9b7abc7ee7f68a7e52e6d60a0";
+      sha512 = "f5f91a85e7ed10c2734779586e69856903051074ac76dd186d1816253e4d7441d60cad5172c1dc2496e0cb660dbc40fef4bc586e8e7bd19f7145f3b53f2c2736";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ta/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ta/firefox-55.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "501093bddb36797bc4e6b97e5101dcb5f7c630aad13db5c8b4c3cf8db3d8182a4b9c68c43835c9366db72ea4dd6cef2b1d3c429c28d104a107e969bf852ea318";
+      sha512 = "291bd760b10656f5cf7df91e5c978e3caf8748180aa98507e378ee90033df8b971a020b253d5ea691067eb7d08a3ac3f998b64860b49bdf7b2b8eeb29d18b737";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/te/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/te/firefox-55.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "d3bb8e779529649794daa3efc52fca016195da4afba374500951d87dbe74f4ad2856e7549c959eef4e5711e7b1d1f66e04f6e7e622ba9a3c27b2f7e769f00496";
+      sha512 = "4b24c2f7a8e9b660285a9a8e14789bf18fe42bdd484dabf68a99b502a52eacce81df5d5375321cdc5c1b69988e35f0e9e3d2d2cfacaee72033a2c68af0b25a6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/th/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/th/firefox-55.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "7fd54688fd6fcfe3042d02b4204d82ebf11391784c36be3f479f41a32f1e7fde704773345f16a562044da5bac02302722ae248aaac5a4b2cb8add484939c8d51";
+      sha512 = "a479f709c4c512dd3906e9694ffc454ae315855b4a37740619b8536d1dd98764ad191944617351243eba474ec44c95d3153efb69d4dc13aa8047bbc477feabec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/tr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/tr/firefox-55.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1d4fcec068163b55461d082f87c070a4a04db04e0b9d292a29e41baaeb3a44415f60338174a7589876bb98ff271bd0b4e1fe58a794053d534e27bffc522ad599";
+      sha512 = "1e12a004cd63cd547cd925736a2cec78ffb98d5f395474c9e8fc96752cf621a2311d638d96444afb593f113c6ec46a892fe96fba882ed7b7c49aa05d4685e70c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/uk/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/uk/firefox-55.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2f048f195269c652e642250014ba6b3012ef0e212ea794a989ecbafedc6fee27976869b807c87411896da344fcc81b3803f226a70f881f2d66dd517c86f98511";
+      sha512 = "0634489527974d7c7afbe2c55d054f9dd50ebfeb2777944dcb8d4a14ba5171230540c17172c5b0d5df64d99fd23d7b9ce384657e1e1b25b73118b9b66b748613";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ur/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ur/firefox-55.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "0700f646fb81bb96a7aafe0c8246fab8cc39200e34fda0b89535d026e6ea71d3216679f13867a8fd6f43c2efa23902e926f68ec15ec65aa1d5f67373ea3b7341";
+      sha512 = "8a519683ea1d611f6932e651dd0e400596529ae428700ddf8929924910614598f8d8c660e317357520d31bf1347d1f90c1e89b91eb74b339eedb981da032af4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/uz/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/uz/firefox-55.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "17c0be62adaa2f3a930e727910f0ffd9dae03eb53ef6fb72ce3fcbf9b6facf49e12164632acd8446c24560f2d8a233ee946ffdbcb270c815b9beee146e93875b";
+      sha512 = "964afe349e8b7f908f520d039fd1da6c8ee245b68dc8957a04222ff281a077f86e7b8185850ef7a4b741a697832bc36bbfda39051409a9c3adb74f2def64b621";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/vi/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/vi/firefox-55.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "8b120d1ec2fdbcd7b0276975842604c41f840e59739166f32c35a8ec93805b6220e3570fa6c5cbea66dc988e354d4fb5f900b5a359a784279f1ee78a32a7ae15";
+      sha512 = "ae9dc4d2be8d82cd82dbcfe638d021713e8559fae2d14847aec687fa90d90afbbb206bfbabaa15ed00ba8c4ac058f4c950bfd320c307b968246968fdd30748de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/xh/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/xh/firefox-55.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "9b981b60acc1d5fb66208279a3dc5ed113c3b1cf8c2169d5ad7ea258654b311f2338afdf9fae38c88b1c575cbe0f00b2359f928beb90288ad5b456e9f956c19b";
+      sha512 = "f9f0c35d0446da3bcc57b0b2dd9cd622de5a3fbb0a6daa987d2de6fcb2804be9020ca190c8b318375fb255d7ff86b265a65e7d0fd819f9004fbeab1546cb62c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/zh-CN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/zh-CN/firefox-55.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "5148d542265e62ba50129526bed91f15ae06018e097fe0afcea228d183b38521a6025e83ac7325f8db991c3517ec38b4590b6065028abcce011cb1ff3f89e8bb";
+      sha512 = "f67ba436854973c9a809b78c3a2511aed27b6c4532304464220841a2159f851e84bdf0fe394527aeea48238802fc5c7336b2399078a8891d4c76554e8067038e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/zh-TW/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/zh-TW/firefox-55.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "466f5e6edf90c6e2864d234cad8271cc9e278dce0748054b109fad9f0c2f5df75ae6b50098a4130a55355dc7cf65556a3cd1a1b3d62e6fc5551317b86b464263";
+      sha512 = "ef0e3fc59630c9ab9072142651420151b897b048af3eac878c8222bdba76d47e2e45160227a2a58862a55ccce954451b892b4f5b5c6062d769dbd940edfefdfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ach/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ach/firefox-55.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "c0fecaed3198f68ff1504be584fc74d6c4efa3ed785eeb330c65ff2f8a4c3979efb01ddf9e6dca047db6efbcdcdb51720bc2612ea0954b340e20c5d9f90cde04";
+      sha512 = "cfd977fb5aea5c5b707df817993d547aae8b8c04293c3f57dfb630fcb2a0e85b5deb79253da544b7c3a92ec5319989fa148ad3b1ce950d6bafc7d4fe8f1bd2d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/af/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/af/firefox-55.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "b9a1ba9d7b48997fa4ed799276da18cfadcaa29a206c135c7c7d74bf677f5f40621feb50fe258bd341fa57840dcd3d5144ddc5385f408a6200e8f5ddbc5c02eb";
+      sha512 = "b6c671a746691cea4d4cf6d5b9932b0f1c025f04e11e7ecd38a53c0c2759d3a3ca82e6d00febd1f644fc18730b2f6538734adc02c9e18094f7533f81a955088d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/an/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/an/firefox-55.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "205d0f8893cd5d90eb0b5bd34341bfd7857c88089685d7560a57e6a46e65e03bbd447e8b3b9471f1bb2f0a69c2abbb9ee96d0aacd5d544053dd7f33842402e7c";
+      sha512 = "51f824b2208b18939ac12a6d63507186d20e8e66e0fd9ff030c1bc637a14d987ba85ad5b2425883d90f88952fde84f43e291e68da004e8114d854965421ba9b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ar/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ar/firefox-55.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "3db4dae2cd2a4fc51792f8bb398b47c91e13fc5dfeeb8ad14c7bc101b55d14f1d75e719d5ce03e96d29245805471ce0ad2f38663b3dc837d83a16a365bc1de05";
+      sha512 = "411b0f01d5f6a4f8915f51960b0d7d62a1b9cd9c3de665674a019d356677e9ea82720df4b715523ddc87458dc3edabd8945b7d1e41574a22dc4df5c0b62ed869";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/as/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/as/firefox-55.0.1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "5b06bd9944c38dfc8c5c92930e2d3c2470d8cadcb11cb97d1ac98426624e4082fb0f61ce27a70572967525166b1343d84ae4cf9c46c4aba9c9afb4e4513c74fd";
+      sha512 = "18d6094a2780759e97b4556fad1d504ee1c1cb41a5ceb8481599f2a41458b5c0100b1fd2a0911f1e125b4089b093f1a306bf838e1c00bbd1bd5c482e0f894881";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ast/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ast/firefox-55.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "5653c855893160419dedf857b6568f9c1bd122da27593f749e81389aef248eb4f1d57b85de70c2a122ba2d941a8da3cb320975ffbb9b56d7647e5bfc18ea7c0a";
+      sha512 = "ec88a6ae8ef64aa01b2c03feed80ece24ddbe19f2c1abe38f5e2b21554b782ee52331175ccada48f47d60c56d4c9a36b28b6d62b332dfe64f033ff9a90581449";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/az/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/az/firefox-55.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "dd6b4c7ff6362710dd631f40a33b5c97f3e3cdd245443ae9a8ba03e31335ff73c9ab695addea10b83733bbc6b65dc68ffa54315c50602661ab447a25cf58912d";
+      sha512 = "e58a646b68a068de0c5b96f088770383345fe46661d667e6d9cc1b7fb0384351dbb10caca6eec618303ab8dfaa82708a71d9376e16017173710f41e0b7d55357";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/be/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/be/firefox-55.0.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "3688df68952a358e7005ccd64c2b0912d9b113dc146ecce19739043ccfd37f92fc2b470d47c2723a24c8b53d113f705afe56d1fdc3c1b7304c3ed4546b9d347f";
+      sha512 = "e4d8d905eab7b69c78864cbf268ff8e8246f5792e3e55d28e8a44c12027ae8269738a0ddd0fddd4282dd7536e1266e58461553334f1287f7416c9fd5dd29e2d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bg/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bg/firefox-55.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b3ef5094491445ba3544a8a4880f8474cd9d7092cd67184acbebf4e3768b6a0bd43e03938120f3d67ac519e86f3c538c26458963c1c32ed3bd89e9f8019cb5e9";
+      sha512 = "62ae8fab0c91d585234f7eda98a4a7075956b00bbcee5ba06d1dacc2262b32eae37ef3cd1b66da34b02bc309b1b704a2b97c297e3c189de6eb2c969dc1100626";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bn-BD/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bn-BD/firefox-55.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "3584ed2d1eb05f217cd475edaaf1869ae3e564af8738cfeca7d0484dee12abb4040c56d4e7c20cf15c983cb2245fd84e9ba1561b27f4dee57a50549fa07c20ed";
+      sha512 = "0cce61b9d0f88911abe306140de86964808d8e94880287e1d3ca6dec6b3c36b79143d03d46bc366809e69b70492ae648aa80bc57897d38c92bd76ab56b36a24e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bn-IN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bn-IN/firefox-55.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "0632856baad0891c3d22454146e64e884828d7aaabb58c1f1fb3c45314eec95765df9bf6bcf68e1edbc5873c93d0d99135f71f7ffe979ff656c2748df1305edd";
+      sha512 = "53f25ae4f49e125b7757740a5f5ec9d08687871d4ab56ae3f4f4506bee2d1453c24c99022a4be0e07f6376bce3b0c0063b7155ec7decff8e2ad61ca456def7e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/br/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/br/firefox-55.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "dae7d1bdd93492303adf1ebe37b92fb3400437911ee0c8bda33840c5cd1fd0307d631a65300dcade93c116fcd3c85d04c518d2aa2ca792eaf20a7d10d99ce3d1";
+      sha512 = "98d83c45d5599bbc62db2204f177b2ff4b710a75ccbbe6d67c8d16829504b8f4a2dbfd2940e583514e41147811c4b3cc4f74637b3212e018eacad85f6f56e892";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bs/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bs/firefox-55.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "d9fbb02a07176a8063c8317f795859e2bce1ec56f63742cbbe88fce9b07f03ad3b536ba459a1d655b50f3a867e84f8f56dc041a9f57ee93eebd14f174b938d6c";
+      sha512 = "7691546b4cb9cc4de8f0544e42528704f5c204b382b195da7ef2764faf5e2b6cc58285da890e800ed83e82be01924db0e219d1523959c04faa24a11e3e16b04b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ca/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ca/firefox-55.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "cd93cc44280eb61b2958e745ce27b94fe583535ccb7dc7788f0f74c625a0189db6515328f479224dd3899beaf9a878969ea945da053f2819510b1a9584ced229";
+      sha512 = "21d664d5a589ef1f0f41a936d8e46a3b220d7b1c6e996f639556986e36097144b82dce5dcec1807b3191e5dc3835df6007e845c847bafcffb0e456777cfcbb67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cak/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cak/firefox-55.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "14c43245c2f91db0d7ccaf010572fad29f29687156ae21abaf98bcdac578d49673342fb4ba7143aa5d6268c03d37169d7fcf95dfaf48cb494ea721657f66d0b9";
+      sha512 = "a2a289569ed8ce5fd9916d11bab43a0f4166c2878095f2a30fc8ed587eabad7ddcd5fa7a43070eb54daf8549e5f19a3c12d103d1cee493eac2e1adc3b536a952";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cs/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cs/firefox-55.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "40c11bc35d1d781cc8c76f7bf42997a0781627c0385fc67b0562edcac04d8bf6f2a4217702ef4ea681f4e39147afbc814a89e23df46b561b1a4f5149404fc955";
+      sha512 = "a24dcacc4f5de63f335e44087f40c203de5ffd482232e691f1f1cd576bd4d41ab949c3d07ad8c1aeeba38863b1a9ce69380079a3cfa0ae7ea3dffebe7d964972";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cy/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cy/firefox-55.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "9a946b301e70e7afccbb599e4d4c4d43645cfee27d3e3afbf5862ebb36436c66e0a59a5136ab9729e9d2e01f752feaa2ea341726b41fa03e91d7e909b0dd0b95";
+      sha512 = "7e961c9366d3c0fb2668d6f8d9d874bd7d52e28ed53a461afc234375a5d06239fdb866c12d53f41027672afb889e257075bb59ad869c56a54b409bcb3a4e0ab0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/da/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/da/firefox-55.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "cf42e36971c0d743daca66b5355ccfeff994094bda6ad3526af76c89818f8335af49d0dfb520d2b58d40da64587f85588cd4c61eafdd12a0763ce1034bf44fb4";
+      sha512 = "a058ea5cde4277a26d6f3592b281212087511e8efd79dbd05a59696c81e762949709e12f94f794b252abbfb810a410f95c103b52cfcba34d2397a0b0ca51ad96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/de/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/de/firefox-55.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "7cec9410debcbf95489e3d9a8129a53507de27fce635cff7a60b7f977f6407f7396d03ee5570528eb4524901a1703b2ce7798a637711c9166d3789e95e4b6d35";
+      sha512 = "22788aa3f8bf59a1366ef4bcf3250f2d6155d7ee3de8b2b019dda6a294e6fef58ce1ec6bd0d54b41e8618491de872249f4fe1618779edc418a43d2a5189f4b99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/dsb/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/dsb/firefox-55.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "387ccb1bea5c49115a89c6b64399647e9df08c3b4c2997c9aee761ca73bdacb6a3a05a594453f44aae119512cd5dc62a1adda94ee1974a8809fd9ac6907a5562";
+      sha512 = "bbafd69ddb7f73c4b3fa272fdf91352a9db8b9ab57d56d2d5e743738026e6e5f811c0bda9a69b1db4d533ca8c6de1b5bece1f0f4784092b3b3e8672bb30c3876";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/el/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/el/firefox-55.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "b894fcd577e94288d785eaf058707a456841b2a50786de9a8e9324008e76e29bcd83960f4e292d046f304d90b1d95c941e126d701417b58708a68a85c0f25496";
+      sha512 = "650b3add1753bbad904bb2c1577ee28598f0a0588e38a219b29ca1cb333e9e561c17e560e4e00ba6c861d89ddb70bd7352289b5711c0e24f6f78d37e53e02683";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-GB/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-GB/firefox-55.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "74b06f6c1d61ea89994df6ed8716b72e9b8cb256bc4420e6011600aee9f161287250baa9f39ad7f8b806fdecfc60c4d7e5bd31e6b02a2f2fbd20fda09c2da2ff";
+      sha512 = "e82dc2a34212a8346bee261ecfb07e82aca6b09582a652f1f9ff90df6f5a5fb9f44c284eb27db4aeba743239262a87faa0e4f6ee3fec66fa97788e66c4e83bfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-US/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-US/firefox-55.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "d40f8913e3a280f846c8507ef55d934b5e183ad16e01c27d05767ab660235673a4615a8a10f52d5562912f4e88d4c0d4be3ee6a3ab13508a0bf9a8768a06743a";
+      sha512 = "763f0b2294085215282852ce482f2be625efe355138ae709c84ed65ef4ba28908115fe3027eece41e3b5fd1fc164c050d150fefb4fb142eb6652229c021bfe7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-ZA/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-ZA/firefox-55.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "eeab81e4954ac3ad4ecb1d973d592f137c59fbb62190e6128c6728c78a3ffbcd0ab053a31529bf6a4b2c59787c25e3c62b41e6de682cad7530a40bfe34f83f86";
+      sha512 = "9ca62fc6eac9050a7141ad4025e6fd6e3a703e18c3a184ecd1620fa8cf098867ce4886774673e0c10833ca1312b555f02d436b5d8088b78963b682a5de1537bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/eo/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/eo/firefox-55.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "471b7b8ade86cc0584d3354e074acbdcdfb1afd048e6b6532e10c664668fd3d42d3c57412befa7905d9eec60b4aa2e484982e72e3f2d1c10c4a2f8025083c8db";
+      sha512 = "3dd8d02a132d96913e017aa4194ab496c21a7b708c5ee1e02bec3c7bcc769a7f53c8908bd56a71918e55b49201f645f68ece3e0eb522fe0719a152bd6067245b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-AR/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-AR/firefox-55.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "7f8ba4fdfa1114c52dafc0b20aae6decdaf79d273494f9a758172d0a66f38b77a1eac6470afbf5f1bdca0844ac43be6b59d70ad24992146959c358e6732b4400";
+      sha512 = "aa8ab141a092b481cfb9fa72f2226913ab7672260b2fd0dbee894215ce373d7cbc1ed7451cd1c1010ff079d14cf9f2e992cc32e981b44360b82d867fb4709d85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-CL/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-CL/firefox-55.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "85705a9875897c45fcf0ec1edc87cd3b7f68d4bdc271a9a998609d71ea49e58ab5440913ba33e09153d7095d4303572be84c01f1d7ea1d08251c5194b983de34";
+      sha512 = "73d2ae9ad8442a49700341127e7ba31ecba568e558d27b607c5a6bf8e89a9e515c3bf6b9946f094ba4640cf5bea970e5f8473a5ce953a09c1fdcabd2a68d7a7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-ES/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-ES/firefox-55.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "5d900419effda0612c0f45a0c8023938f2d8b60cd240d71f5b334b2f903e3c4fad8c7ee548431bb85f3868af844b7214ef67ccd9b7a3775f8bbbe0cddcd53ebe";
+      sha512 = "213f71697b99bb7dcc978bca57fe119940f8197b75b5aed3964db89859fdbaaa0968829269c5a8d6f01bf21f670f85bcbdc9f7d4f6b111971636e44580b67003";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-MX/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-MX/firefox-55.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "054cf514419b9b30fee31554ea08aa58d8d36b6b1b51c1bb91cb2436dd26db349b31a1ee807906b113536d94a73c352430f3044b32a0e582c0ff328ac10d518f";
+      sha512 = "d12e8f13fd94c3c6f93f5e20ef5cfeb5c3f82a479baa5bca5a5517dd55bd048db59454a56730e69f6bf051a81b5d2bad239ce0fe8975aa00c863667b464503cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/et/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/et/firefox-55.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "af38aefbf277b85fff536a35a4138354ce12ac8b3536f7c0cf5a1a3d5ecf79f138adbcdda1f68cfefcf137c1aa1581fe34749d1d005ffcf369db8561bf2ae536";
+      sha512 = "8f6a6393f009b19743debdaf1bf3cbe12e566a4288f8fdacbb0119961542fcbf082aff03ebe79f54311ba00017851ca4ec4efab9553ea2e1178b6dba9677e31e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/eu/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/eu/firefox-55.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "04176bc464fa903a4a04c9e3ded80dd909d5820ef75bd2bd9ecdcb703cdb19675430d9561e2bc49338ca59eac1be1cdfda9d4acbc4ca5ff61893d32882161dba";
+      sha512 = "7b1f3af68205e3688bfc0e519f9cc6f796477d2f8b11f0c7e035fab1ce917e713b6b18dd498c5d04da3c51a50dda01132268a24180ebcdc15f452bb25d0dab0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fa/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fa/firefox-55.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "ef46e0a4b523b3ba883e07b79ebbb343caaec7675b5f6aa456b13b3e362c17069a563c18ce0692fb7854e2f6c72ca880130bf9ae0671177262027564803f971c";
+      sha512 = "1379243d07c5216b31ae2689b11d8729d0905ace42e4bc8ba40289bd39509020ae551e2fd0f5a16b883486ae0bc20c33ee2902650304cf628a239ce3071ed683";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ff/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ff/firefox-55.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "fbeb3f00058cece9df5181aac388f57a60dc9bfb2c5971af6d96e2fa876e7d55a43aed82e56eab302e470c67831c84785dce08ba926e1649c13e0641675bb325";
+      sha512 = "3bf4eec5d5a3c4da765db6997a57dca3f67d52ef302cd38db759592b9904e7b357870d39920bd75b805700ec4b9f4a94400111a321518c5d4f31690ece946289";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fi/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fi/firefox-55.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "4af7d213d3fe7e30940adeaa5ac59d1c7b20bd243935684a83ce746576ea68347c41cb897fee50636852402f05aab757208db03a7c746025212dd028b43b7f4b";
+      sha512 = "1a33cd82fbda2554fa76684afbf3a843babd5872459026f1f32fe496e99ed631252ec63933a291214535476f8858d03aea26b7cf2108a029ab5f99ea8c229650";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fr/firefox-55.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "09c81a787cfde2292b88960a7b95a2e5c18e9f0c40a5972f18580c27fe3d2140c4295282e8b8ac2b3ec1b1dcafe1244b7392832805878d7231e1531ddf1c923c";
+      sha512 = "c92bf5cfce5b5114342d98d526e287ded4d82516f008e705ded1ddbf11c1cccd8ba3d3ba777f6be0727f7aca776ac7312fc7e5ce3c2f77ae69420541471d0289";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fy-NL/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fy-NL/firefox-55.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "e495c0b559da6d9173786af68760a4fb0b25f4e5d504a9a8e58b21e37903336e4eb15c4beed8a5a791f8c25da0d46ba95256cf5edd31fdcc2acb47ffa85a1b87";
+      sha512 = "16973677379fa16283956fd31a73da2697c4f38b41618e14bcaef4fd3e68430c15ca5327f6752d8123c137b3e026ff682d534e7819f87d8cc3ebe7a7ca865b87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ga-IE/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ga-IE/firefox-55.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "29b28a8c717660ff3b0f07b330ee377927b17deaa887802615e447544b88279871e72a4c73441d9bb76eb6a60e85907ca94ac8375c0125eeaed2500e815f9a6f";
+      sha512 = "a26c96dccb61b5e7685a9914f68e40e3ca468438438bbb07f9b524a9a2f3b26959b7a359b332eeb7da47f7a8ffee5f8811115e857406e99abd7f170b64fa26b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gd/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gd/firefox-55.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "2e3d7902773255a69990d1f5176637aa45753eac4d6c903bd8dfdea505f2a07d714181bb4662bae4591b4155fb04a87e09d65eb19476ce2c4d0143b7f8f2641d";
+      sha512 = "d2e4578150f8ad0166c48f6fcad2f735ddc982af2cca30aa694e44e593f4033c259e7f7aee1fd1941fded86d2937464bf11e8a906fb732ca2084632ffc7d642a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gl/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gl/firefox-55.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "5af911b6e1bacef308491b10b21592f06539f4360a84d126d0f78fb43196029ec352f8aeb9fa6180899f5d74334ae002602aa70e1b4112ed4cbe79b00bc4a929";
+      sha512 = "999546c43bb56cf95509a8e9b122e649e4ca608fc4e0a3b8e82e9f58c334460420c58650a8837e4247b63eee6f840def3bb80e6c517badd50449e0dfc471d661";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gn/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gn/firefox-55.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "721330e35f1632969c92cb732af6a1873c0516292f58e04db3d0c7a96d1cca2ffdcbbacdfb65ff3a958f8757fbf788dd7e667e3037f3b1505a1cb5c34114e02d";
+      sha512 = "caeec1355d3bd3331241fec97b0c6008b8f3c42c1d56b1796a7be4c2ae994569a5d2011fd5b723ca3e560bf07fb1de50523ad2736345aee753f37d6cf5ae7f09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gu-IN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gu-IN/firefox-55.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "c56f1f632cf4bc89c5f2ae69c375878d9f4aadb3ace0c228f36ab42311ea41eb2aaa4b858596e820729a7474a568c57f6a259a2745902243c5cd21b94ea59fa4";
+      sha512 = "1e3feebb32c4240d5c15b0c915b92eff9f63b266ed74b32e1df9fe824b27a3c4d2d06492c9b9d47ba22460e0c2cc854322250edcc1a54e4b6346ac9ee0048b51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/he/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/he/firefox-55.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "69336ba52a347549bf684bb5238ab14dda633d485de617262fc9377572b7c77cfd024cae9f299ff58425d95984939b95cd02f2a3a23ee07879ebc5455a7f7adc";
+      sha512 = "5d83b761b3f8653e1701e75a66c3741a9dc7e377fdb2d7b66a23bcf314f3993e45293d8682e65fb58f2d6a720ecffb0b2568aedcc89804da1efad0590629c3a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hi-IN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hi-IN/firefox-55.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "a141064e138094b02989aec9c3801dfbb6dd70869e3fd590325e6fa4b84968d73270a6559156e774ed27f42062b0fa5f78f0c0a373bfa2a02ae2525d3b516781";
+      sha512 = "9c59cba32c02786bed46c01797e7bbf3d745f90da98cd07ce6ccb578c402bdc8cf3d8887a57b5523a072ddc6d98dcd9761862f32c59570160c732b8408f182c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hr/firefox-55.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "1547872d6d1535cd106b0627830c093d33622f42ff01a419695422af5c030a54996c8b9c95e89589c8ec75eed68485e3ae78bc7cfc0a3b09d303e3a1c0bbbe76";
+      sha512 = "20684ed388fffc81fd7b8d88f4d57f4bb130ea4671a60d4dd70d1bd5250b491a36cb0eff0b7820a26f24695d30afd5c909709b6e8ab27f9e24ae1381a8b4dbc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hsb/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hsb/firefox-55.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "796500589c98757a7986158bd08f12ff76ccc09aa4d6132b78c011cb58ecd4d5d0798d780e6178a0597bf5c921e6168e606df56106c8ddbc49262991e10233b6";
+      sha512 = "996ee7693cdb808ede4df1c6d8533a964f0bd98a4026067bfcdad8d1c78b232cdd83f1fa7fceb532deb9197ccde437d42d13449c8ad0fe9cde3dec1f3006a775";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hu/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hu/firefox-55.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "7801da792cca62683a7d1ab812fb831ea80d90994b18a151623c05d2f30979d557cc1a6aa0a7ecd44f440c76e71cec9a4749fdd4c49442ea151c1720a7a5d988";
+      sha512 = "faaf14a3f2aaefdada31761bca2056d2592bdb6ec5a053d7c8efe871b0b2ff191b152fc240782b24f3954b4913501efd303bdb301b4a69140e6c47a3fa6856a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hy-AM/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hy-AM/firefox-55.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "d47fccbc883ca137200c613aa96899e356cfb09190952805c20d36653d3477abee4db49471a1416ce13455ad5bb6836a7217ae51fce77dd0fb12f1187e11bae9";
+      sha512 = "9190ade1a9885ebbfd0090ee926e0d5e31da61a7c98f874916c423a60328c5f936f29fb60949c1ebf9d726f07f097312c64a67dc193d71537d4adf4a9b7729c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/id/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/id/firefox-55.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "41e111080bed45b7783cd50e7069811b17b35eb0268a92f901531dc1e0a7e7fe07b94ac325f5b5b436b71ceffc1d329837c74875a32e13d3205537b750fbee58";
+      sha512 = "88fe78ccc643a704e068a32d2fc60624a23c269b85bf0c96c8538fb5243c1db93578f1a91993537bd7dc672acb9dc6f4cc75ed444774ff74c7abaf621226b43e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/is/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/is/firefox-55.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "9172c69ae72fa83a05f0926cbf87ed4694653395027b91f441ab976790c581b9383dbe62bfc74a425279ef68f8c6f6d2ef003b20aa241be6269c34bbab147150";
+      sha512 = "969e28b5d8696fe735063161b4848fb3a8cc400ca2f2e3db246dbe68d301c7da3adad7bfda61eed10c85ac028582b2568f57d0c727abd184be2850d44bea427e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/it/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/it/firefox-55.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "daaade14d2dafbb76e021f87773a535783e533474138652fcb0b25bc41a1ad4f13d7cf65119730fed56c43116a3392f3adc435a7f8e8326ee8ea4d9e9cf19ef9";
+      sha512 = "59b389ae6710bfe3d8c62b9b482bf44af419446db0ff5278b1c18bb45eaf122f5b3b47d32b19eb3686cd965bf1e51643221bb01fd6be6990f8ef14159ae6477a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ja/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ja/firefox-55.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "6741bb18a17559482f8b95c1fc6acfce6b0e31e474e5d88905bdf3b939967c0ba625cea7e1f1b2f2ce6e77f3128f1f85069e946e7e6a16fbf4a637cac7e79565";
+      sha512 = "f79c322f4d2d23efc682ca4e02d114583008f2797e5672022d412b27356a1bd34f4c216545ef8c8f00fef17be0fb405384d98f4e44679372b9cf7953e2e8af78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ka/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ka/firefox-55.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "c1849ec6d69ffc87918515a7de95e0405a14b1cc268e68dfa11f8c832ced907e73a021b5c9b5f1839e99d692c13fd3f33197eb91de98f588f5750de03fe098f6";
+      sha512 = "a5f440758bc4607955911d0fb2320036b4d9a06dea07c7cbfe9fd67b767a544cc0df582af329e4c99f3eeb065627e90a989368d26a14530fc94a28d6fe65c7c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kab/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kab/firefox-55.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "aaa9a9d415f39dc957ec59becf3b649c650cce619417dd5182835190aa8bf361bfd048ff647099320cbda296c9a992927de9c6a90e84dace4a1e5cbed0b9758a";
+      sha512 = "1f9d2fd390226d06f0165d9a5f53c5b9d67a424969b7881b91374867179ed09efd05cf404de086734165312cfe09131692874632359c9a9fd323a6a9b7dec101";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kk/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kk/firefox-55.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "e7f47f9270c909135dcaea2e4a47e1e16a6a0d3b886ef9f4ff0e3e750cd8b6b253eb7944c6f7155df6e91c838bc84544c2880f9c75eff12c97f68ef8da098575";
+      sha512 = "faa9e21a95a41d8c846a5cec6f7cd0d2cdb0a382593e91e824e1d8013af146378c965b28cd44953702167e2e355436a2f5042ae727cf6c95ca75d0eb57f92119";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/km/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/km/firefox-55.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "3e46f8ffba4f93450dcc2aadd010ce0b181e1461902a517c4d6030baaf6814debd2280202308980b3e02879d23144aa186af5c9af6e53e8d6b8d5e5b430bfc26";
+      sha512 = "514bccf7cf2c433d846c7307c75b512f20c6ca4deef5f8f59f744656a81e514a9e62fd4336e223fdb59698b6dc00db0aeec51da4518f0d3467b5a3f06598ef42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kn/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kn/firefox-55.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "8de3d801bfe8a1b87719715982cc9eba3b39158a8933b26379884d795bd2eecd43578197165a97f514c50286713bb83c06e200818c2e4ff2714baea72b8a3dc7";
+      sha512 = "814b1fcdd19fa4044ab760818ffc6e246ea2cea36b89785069af857763b23623f4e9cc50a6aa19a77a00a61b501c26182d7296706b7d01bc9a25006c03580058";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ko/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ko/firefox-55.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "5991b9223486acba78015b19d6d0e32dc28aa0e341b4b11928a9f28b1a6f4d366c38690d311ee15ceb607933887cbd8c93940ef0dbab8fb129c94868a5a5d27d";
+      sha512 = "462747db276da856fffb562036367b947822f18513c2eb7cf70d6d3ac31438b59896ebf9c12e9e61abd5adb0b761774ad90cb41eb59789beb994c8dba11fe8bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lij/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lij/firefox-55.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c5ce8dbb363667ef0b037c5022404b756a360272505d756593860598e8d08a04bebb45edd9a27ebc279547658f142ec1e65798c2e2d13ebbfdfee56cd30e20c1";
+      sha512 = "04802af2002399a7540f7ea5e5dbb23cb02d30f567a0afb64fdbc45645251d8bdd6e9563f4b5f5c324c267828115c719b161b074b80f7b9ba8ad4a1a0b24f371";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lt/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lt/firefox-55.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "131d67e7bfcaba8ff55d7fbde587aaa1039cb73980e728b29a445acb4bc8f2f17f97802e03a400ef3d6933c2475fe35e7a3acb1b30f949ad71dc054b8d496c36";
+      sha512 = "968e19afc7f0613fc184632529b379334d2409d5d0da5b24117748cbdfac714e8465267b65d2674f8721b47e969279c054add60f2a060331617ac2a02e97d032";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lv/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lv/firefox-55.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "7e9b614dbb86ef76fd752180c5b633345d37d24e731eeb10ded7694278903d42f5beaab8a17c5a6472401754b582687595f34233058bacca00dbf3d1f774a5d7";
+      sha512 = "b6ec789c77040508706702d1fff20f0a277c8a5a1f28a375eedef91e0d7cf29a58b3f2027ce1ad2bf8a25ea5043751ee52b8468c4cfc516e1859570a1dad02d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mai/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mai/firefox-55.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "cdf641eadf20fa21c5384377183c7797d199c3232f55dc1377d52e330d1ca2d0b1478e3301fef696726a4094284a94d77257462d4a5447ec2ea6b99e2d009e67";
+      sha512 = "1ca567163688b14cfd4deb5cd2f0739807807060dde26508d87c8590cb8ebc9010edd7dc92869de6af2928eab32d42fad5da94a74ebb3bf96cdb7883cf2f9225";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mk/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mk/firefox-55.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "ed8d29a7a6a0c255a24be9c6c670677b2cb081129b36490ff59eceae374e2da3911cc279975c55b5ecc8fe7988364b069145b16633ab6c4c945f35c91772c484";
+      sha512 = "87ad815c0aa9e45507ef044248fb961b7bb98b4d4b10426aa448f41d129a162bc1d3f6106016c7cd92cf03b63c1682224aedfea9093030561b13dca79c6d11f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ml/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ml/firefox-55.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "a4a4758635913dc8a4b5d55df97fc9e1141a7120541a0a962aa4b2c566d0985a6500bd25319b0a5f81821c22ee3745e12603499d8f996276db9df07033741f0b";
+      sha512 = "85fe206ba0b20d8eb6c3846685c851ec579d8f188a5d6626ec56c9840bf8a76a0616457ee687cb4d395ac0e71978f9403832207a4675c560546c7ea813014aca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mr/firefox-55.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "59144a70caf75fcdb3b7b4898899e0e3f48449d2b0ae0a92ac5cb022ba8a72e076b53c59bc7dab61dbad17561930b0e1182e47081712bbee66f5beaaef84206e";
+      sha512 = "c41938fdc8a19a49a6100ebf2d452750069e3038d8dbaeab4397f2289622963fa6d74a3c96419eb6cfe7e14bafcbf4b3b4a1f85638f1a402c2cb69daf720b740";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ms/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ms/firefox-55.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "833f8d447913836f26588aa0e5054658cc38b986b72385486cce8a2c9e7e7519615149e7a4da4eee64f83bacd24c924a4cbb5c7f5b8450b75070f28fc558dcb6";
+      sha512 = "f37a606f1713e2f680b32ebcd5bb90f68cf324f26512bfeb628a4d9e71d138004bf08082fad8fa961b2ff28ae3d34c453d890c37b9f775fe27944bb7a5c013f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/my/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/my/firefox-55.0.1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "d44980bbf4e9498eba7cc0170a558a0ed1a6e3fb9d4e55cbe4250d35e9a06c1a7e221f2f81e51733e28662ddb64a5de9833e78068390087d42ff8a7a10e3527a";
+      sha512 = "fa730b3568f06a8350372ac88d3ed7738cd254406a65c36570efbb502a61a60a1a4ab14bf587b4ffe365d3133eb76c841540248402dc87db0d3607235f2878c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nb-NO/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nb-NO/firefox-55.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "757b17a9e585bfdedfa6d72860903e7b6430a434a747cfe590f3886f846e03f5f584b62b4e6caa73840260a82d7a9709f99b2a321bfe872f4a81859ae1d3f5e4";
+      sha512 = "5e1fb7632da3755454deca4169802694051c769b0da75978b1762694e0516b202198b74b306d2670c9d05f7237faead7ba15cb55272cc8b3c7cdf14c0a44ce8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nl/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nl/firefox-55.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "7c4289a63586f2420609f525b28a01ce19943afd8b9417583a51afc50bf741439cfc8a2aa706c6d2230f45c6603a86a595a1525dc1abddef1496737bb321b01d";
+      sha512 = "5e6dc41cb51190786724b34a566ffa8b16314f54200b7bc2130a6178f0d3693df0fefc7a3935db13e9cd27ff5ade21927900680e9cd6c964ac7a23961d72214d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nn-NO/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nn-NO/firefox-55.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "5508f9dd6102f45694c2a7145b9b58f35ba2f0d2703f9e8bbb84094b81f384a2c7cad6df4de245dd87b1dee379d7fc202a66b46be8cad50de94f37afc1e51e63";
+      sha512 = "2d95d711b99a9e94bcb0e2cb923fa584d7a1e7ca2d2b3d289b20f78a8f8c0bf909a26d45a1feb540bcc4c9e983e40d0eecd24b16d0227d5155f7ad684705215c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/or/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/or/firefox-55.0.1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "a5acda036bfaeb2c06c9b8f2e74475f67624416cb41069654b5dd104e353d2f84ee9a51a036a828355aaf6bdfa9f8f3f9495a287f2c237dd9b15e06d2a774272";
+      sha512 = "d9bb706c45c5e7a822f106888f47615c1948ee74d8bb5a179ba838634262862a561fcf8d0b79a86089b08f0213cf1ee21387bd4e7de1b47719fd76ef607234ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pa-IN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pa-IN/firefox-55.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "a3e807fe14653a8d55925f2c7ca8e963534b14fd5163b1eb168aa9de31f39da90b1a01c2510cd91117e3949b90bdded0666397d7383c4ea20a70fece438ab7ca";
+      sha512 = "ca8121c9ab978cd044bf8efd5c0ad07d7e790cfd1cd6121413d2508d6ddf8fa75e510cf866b5e8506312b1b22fdbc95e3af9008440fdfb8c392dbefeb81ad3a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pl/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pl/firefox-55.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "5f256d8ad06ad7dcb8898ad5b7abac13c01ad34f94a2c1a457199a61e94e5b89f76f271f17d90d9686eb49055ef14dc222773d33fd3f53617b2a2f51577bd9db";
+      sha512 = "d83d65bf5f0ed37a7f5a2b66e075aaf4caea91240763e537d0198369e93d0c64b1526f14023d7daa697ac6678728f6d7520aa66bcec7ea282760116642b00c05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pt-BR/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pt-BR/firefox-55.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e36673066bc2d6c68b0c4eb1b6e493d5d5f7f14c29c3c117c76057168f35bc5b7d5966d9f310930e1f8172baa8ca2ed3f04afefa9a752648867c3a3dce48fff1";
+      sha512 = "2184c06f9f205b624f2fa7e9437311c9dd3100135061cb0eb94dabafa27e9b5c5da5aa31e97a70e6f8b773b1c1704472a4cd87d30d6dd463eaad3d8eda009254";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pt-PT/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pt-PT/firefox-55.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "d57456e2da3f1c0287554cf2a1aca6b19e99a08c34423711e13176ac8d47da25f2856cab56ad0daa99c60ed0fce417af2447fed1d94c2d0daf4b35f22a9b889b";
+      sha512 = "c40aea22fe64588eae5510b0c047c2d42673b7f22ef17a126bd642a2cfa9fa6ee27e7480089b381d4ceaedec2508ca6685f8301631948624f85b024403456d6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/rm/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/rm/firefox-55.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "036a41157ba884430046fdcead68a37fe254447016cef723754f70cfd88f2fd385ac7c374e82adb06556c541f0ae82ee5f739d1a190ba06a1cf04405e4669b1f";
+      sha512 = "235cf224fa8f78561ce0f1178dbaf3ac0798cbfd3c3da97069e74aadfb38c6fdc90c3e01d45a5346588bc001f5f82e5fbed73672e7bae6fd2ce721d99416c1ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ro/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ro/firefox-55.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "ac349bd51e8fd251f9581ba96c4ca6c69e24e736e44d28c9661e5163a3893ec9ae42c437a0a5b465266a35b966bff0bed8ae081fc93b56d59134fec4ff38cda3";
+      sha512 = "f6f3ba58b8241678c4a82d03433e2f58ead36037068809c404e930afb335fcd4057f3db6a5266785fd573271e66dd98d4987d6524c2b0fa2d01fb05b5671432f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ru/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ru/firefox-55.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "dde58da3b6789ab33fdd8982d328412ac9c6821fd59268dca2fae0bc8dfb8558dfaec4a1d3c9802b33e2c10f7cb0bdf5480dcbbb1fe8e6b8be1774064ca5b85d";
+      sha512 = "c7f9833724b30b81a58c6efb00ae57a69b32c2e7590d6ca0ccdc65d8960336068daf7b8f4e305a466c054f8f4897464cadb3fea48ac05aecef14e18c121a64ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/si/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/si/firefox-55.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "41b96f0c5c4dea98296f791e121e2421545b04995d92326176561f0c034c261e19bb2a7db9e72df52a9285ad5d1ff96a4e38559a386212c7267ccf475764b281";
+      sha512 = "669762fb074a3d7da7ae00c753863519e1d8afe68a183e7f6bd83d8e4305f2db7e1bb8b9a8e64aec20d3b735196bd55874573cca257d4a2de5f59b3d6d7aaee2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sk/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sk/firefox-55.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "c19fb32205523afb74ac7edf29f3e55a9ffef4e24d18c47cca493b38d5e1bab8fda308f6c5889a64b8a8ed266c8795a67bbfd690bc381c02405be1ff6cb5e9e2";
+      sha512 = "beb2861f5127b121fce3ef6811de7d801c5ec3cd05c832c16b2839c08a925d2e34a8106270ec956e5f45d6062e9d5cbf72ae4d7d9ed894d9cb44d5914f0a41dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sl/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sl/firefox-55.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "490c0174c5d6bb8cdf0619eaf00b87fd15d5365b40680786943cc7c775ba14cadd21e5aa6948b82f0f45bbf17d747f0217ec43b3da8c523b1acff60c3a6c7c63";
+      sha512 = "687b20e50fae586cfff1426e189f28d54aecdeacef80b3f68caacf002f52cb7141fe34803dd1e1d8664efc8500987c752e616e26aaa15b3f051afe878e3a82af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/son/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/son/firefox-55.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "b0e9ad5e3b2c0c274d70a048855c2a923304be5464ddc7066f64cd20833929702c413816f466c98693fab9c7167f4343a12a7d528bd499d3c4d7fd3b268c4a49";
+      sha512 = "92b0b4353fb0e858e3998903c5d2ef82e38259ce1d9560abf06ec6b55174d17db871d967cdb62b4ad23bfbcbb10a2541d14f0b2886f73d6b2d670c93fc48220d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sq/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sq/firefox-55.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "285224e3a62ad4c93f63c24757e4d3d973a2c599baa7cb8729c3e4446e7ca054b38f80dcfec26b52491631f04aa10406b4fe25bd9e9d60174609ff6c446036f5";
+      sha512 = "d9ec031149f9a845e6f11c34a96aa54cc14566e569b1395a83158fe32f433c51a95b1e16e99706f92973661c48856372b134c43b2ebbdc8d358108dc0998033c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sr/firefox-55.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3a4b5082d7f9afe834ff3236304b6a50a5b2262f9024ba8477bf6b2d25908d0aa440432b093a5e2d6a7c698a683e00ac299ffb1913d28298005dbbc38c8c1515";
+      sha512 = "cbb81a562427e4773a4c971d24bfc5f9ac689f8f85b6edc2a2b32572f10b202e8b16de562cae85cfe1a9e86eafa3bd60c8bcbfc2b3675128c96c73c223894f08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sv-SE/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sv-SE/firefox-55.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "dcad45f1cfa03e12c594665666d715310d29f0984ef4af446356c9d030decd9551782a1b591fad218c2421edafe7f2262200a2e6a1672ac41d7f16a9664ebd7b";
+      sha512 = "f46223ace271fcd4ca96ac6724bf60d99da5e80dcf00d6f2889cfdb41d1ca8c03ea3ca5ba61f6cc855c9cc2b62e4602628847d641f85d8bf2c6dd33cdd208b0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ta/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ta/firefox-55.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "a351f1850772b6086a70d6c8f6edc5b0906b8b5a9dbb8c05dea8a75f4ebeb46b1e9077f2c145b5b557acf3e7382d72f94949a1a0420c5c04d9e7b17292ef5d63";
+      sha512 = "cd3297d41e6524eb7ce5d398b8a95ee0ab008a626b1846e50096343aa5f469149a2a5c0f3d452d0f10ebe6f397e68d76dda4eaa9f3c10b0fa2b6a0d5d60bfa2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/te/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/te/firefox-55.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "8f1a725b309eff87d1ba130d02e6807a7202d91f0d7cee73672e6dd0dcc90b92b5a7aa73150d9c69140e9c27140b364557d289a644c1131c57d19a34d96acecd";
+      sha512 = "ac7a7ffe87187610a861e32a1a314ab0dc3141eb0910a1987946adccc686cbd1b58ccd996009fef49d642f3ae0568cf429811e652f4fa23b1f5381f3511fb65c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/th/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/th/firefox-55.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "95f20d59433954c0b26a709378a853f6297028126ffaf2beabbe0332acc9df3089dfbc0095f3aac503a04b0cdfce9f79199eed9ca04b810f213f5692a1fc4cad";
+      sha512 = "2dc3ed9875d863b27151ae75dc83b5f2f738f0fac24f5fd1b3ba9f7a4aed1c2e77aaaf588bdca534b2a4078a086558ed820cbfd6e852244897dda7601bd5091f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/tr/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/tr/firefox-55.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "6eb68dc198c1106d48ea93b924dc961aaa10a7e89a74f7ffcd219f1de4952c403b19062bd23fa625f82cc9cdad0506f777aa57da6fb106050e962deffa79cc76";
+      sha512 = "869d654afeb246281be5b287ae76749e25da2e15d7d456cb5848281153307ca50f35a2c62dba0014b90ecf322a85ae8b7daa12ca156e8f5ac33854f6a890f19e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/uk/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/uk/firefox-55.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "c43f597db5027f6c1ba76e4308a7e733a78f1d3711a4529b5cc8f51eebe7bd2a55007975f248be698485fecb91ecbc43a141a94869e41445a07f90fa81d70cb0";
+      sha512 = "709a5b8889c4a871dfa15c46bc7eee38986f4b76eef4bade78daf88f46e0ee50a815c54c0bf1e77924d1ae04d464de3a4d1c03494bb2781df11ab32d9e4766ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ur/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ur/firefox-55.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "2d7af1f97cf035519c43e57ba4be3f95f64e2da816d01c924e82dd4c442d767098247f1bd7535f3d5c658254ba7a9ade752f97ca4951a6a0989f6303cfeb3354";
+      sha512 = "d7a0481116d791eebc511ef35a79dad263bcbcde54838a03b86fd5864746c4353cea4e8ee7998b18b266509e2ce584da0cfed39c324c79b847b44ecb043ccf8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/uz/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/uz/firefox-55.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "f5173c595187661731aa3e4edb3fa35f3be9c0f494882a06e765142e193488e50538b1558ae094b8a0c462758601a89dc9105ecee6ed485435083f5c9ea67f6c";
+      sha512 = "5102829f08869d90f362c8da8a6947c23b23c616b6c3cca58e4a8fc9ba68573e8d74238029ad51ca2439f7946359903bbf03c2468c86bfa7f7679580f9a60649";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/vi/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/vi/firefox-55.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "2b30eea824bf032526033203798ad34337e7151c45cc055ad7eba9def8f46b6108de2730ae5dea45627b65ed7ec617ca15b5372f23e3e4a33a303bb51ac4983b";
+      sha512 = "a4a936439a729142af19aa2db02a6e769bfe6c653e6d54381b7d80756968b6ebe6dbad51a267936e173b49d3f92b94e89012fd35c54aa790f17217b001b7dc3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/xh/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/xh/firefox-55.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "2d098f192bfee274dd9c4cd806bf35bd311c50eb73a45e23eb5e497e636617e020c518f131520f5f0ba3d23864c97f09b4d9b46db9cc4d55c63be3731e990aa6";
+      sha512 = "9ac4a54cb66cdbc720e263277dbeee14d243c025ee63f6a1ee4990575fbbb333a0979a19615c226fe1486d9896d6754b5485dedcffb576511754d6781c572dc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/zh-CN/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/zh-CN/firefox-55.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "f89e61ad4c1b44d48e0e0e7be3dcd80df548e5f0d0932b915a2c37b36bd882cfd4d19c2d2261b64266a8317acb066b2c48db0348dbe37c14b748d5832f6c0e84";
+      sha512 = "e007854739c12502665418c3e0470940cb9df0314537275dac5d3c80923a756dda14b7161196b7289187d6706d58f887f59f47e07f764714298e5da1a41a0979";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/zh-TW/firefox-55.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/zh-TW/firefox-55.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "c8547fe1196a6b0ef8644edf69cdd68b74e208260c7e51f51a03d854374b0ed8623ebfb1e7c6e6c4d05edbc13e7862d0fdf260d77b7f2e125379258c4b3d44c6";
+      sha512 = "f414e7c6da2b2b5a1871f25def1ee055f7cdb66a6e76ee66848c26e2eb2d999e65070a816067990cb9d855420392e4b84b52b957e6dca063f8a011f2ddb4bbe6";
     }
     ];
 }

From 71d0a5a328fa195ab5e5252d3b1b0f06c546c24a Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 11 Aug 2017 11:10:32 +0900
Subject: [PATCH 1863/3246] firefox: 55.0 -> 55.0.1

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 19dfba0b0eb..70b938bc5de 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,10 +6,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "55.0";
+    version = "55.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "b3ca0a926faedfc12c859965629330489ac6c05730a0dc38748704a1a25e876decfba78a3d665e22a6773b0a3bfed3109cd624be77d130785b4097d6d9f9c94b";
+      sha512 = "2c15cb3e1a9f464f63ff7ac8ccf0625ed845a5cb9b186d7acf121c439cec38bcdeee93630e99dbfd336f1b7e60a7c09822a1eba59f308bba8866f155b2ed1c47";
     };
 
     meta = {

From 1fe7f03544b13ccadf426593436ffc15ae3a7293 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 04:53:39 +0000
Subject: [PATCH 1864/3246] roboto: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/roboto/default.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix
index fbb364b9d72..00c4bb7fb88 100644
--- a/pkgs/data/fonts/roboto/default.nix
+++ b/pkgs/data/fonts/roboto/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "roboto-${version}";
+let
   version = "2.136";
+in fetchzip rec {
+  name = "roboto-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip";
-    sha256 = "0yx3q5wbbl1qkxfx1fglzy3rvms98jr8fcfj70vvvz3r3lppv201";
-  };
+  url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip";
 
-  nativeBuildInputs = [ unzip ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -a *.ttf $out/share/fonts/truetype/
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
   '';
 
+  sha256 = "02fanxx2hg0kvxl693rc0fkbrbr2i8b14qmpparkrwmv0j35wnd7";
+
   meta = {
     homepage = https://github.com/google/roboto;
     description = "The Roboto family of fonts";

From 7c79bb6a87a07cad21482fa570ce2208cfe704eb Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 04:51:52 +0000
Subject: [PATCH 1865/3246] font-awesome-ttf: make the font derivation
 fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/font-awesome-ttf/default.nix | 22 +++++++++-----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix
index bc564a80d92..34548b97244 100644
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "font-awesome-${version}";
+let
   version = "4.7.0";
+in fetchzip rec {
+  name = "font-awesome-${version}";
 
-  src = fetchFromGitHub {
-    owner  = "FortAwesome";
-    repo   = "Font-Awesome";
-    rev    = "v${version}";
-    sha256 = "0w30y26jp8nvxa3iiw7ayl6rkza1rz62msl9xw3srvxya1c77grc";
-  };
+  url = "https://github.com/FortAwesome/Font-Awesome/archive/v${version}.zip";
 
-  buildCommand = ''
-    mkdir -p $out/share/fonts/truetype
-    cp $src/fonts/*.ttf $out/share/fonts/truetype
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile Font-Awesome-${version}/fonts/fontawesome-webfont.ttf -d $out/share/fonts/truetype
   '';
 
+  sha256 = "0w8y7gxbqiy444phg4jl89kc5hq3jffbkhab8p110qy9jx8s106s";
+
   meta = with stdenv.lib; {
     description = "Font Awesome - TTF font";
     longDescription = ''

From e8fc26fdb298f457370e95f6d57506397ddc3c16 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 04:20:54 +0000
Subject: [PATCH 1866/3246] wqy_zenhei: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/wqy-zenhei/default.nix | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index 92f043c7fc0..9718763d004 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "wqy-zenhei-${version}";
+let
   version = "0.9.45";
+in fetchzip rec {
+  name = "wqy-zenhei-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/wqy/${name}.tar.gz";
-    sha256 = "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4";
-  };
+  url = "mirror://sourceforge/wqy/${name}.tar.gz";
 
-  dontBuild = true;
+  postFetch = ''
+    tar -xzf $downloadedFile --strip-components=1
+    mkdir -p $out/share/fonts
+    install -m644 *.ttc $out/share/fonts/
+  '';
 
-  installPhase =
-    ''
-      mkdir -p $out/share/fonts
-      install -m644 *.ttc $out/share/fonts/
-    '';
+  sha256 = "0hbjq6afcd63nsyjzrjf8fmm7pn70jcly7fjzjw23v36ffi0g255";
 
   meta = {
     description = "A (mainly) Chinese Unicode font";
@@ -25,4 +23,3 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
-

From 9baf0b76b767f8bc9995bcef9e8f1cf173fb4502 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 04:10:51 +0000
Subject: [PATCH 1867/3246] wqy_microhei: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/wqy-microhei/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix
index c0665b2f0cc..038f0316940 100644
--- a/pkgs/data/fonts/wqy-microhei/default.nix
+++ b/pkgs/data/fonts/wqy-microhei/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "wqy-microhei-0.2.0-beta";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/wqy/${name}.tar.gz";
-    sha256 = "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8";
-  };
+  url = "mirror://sourceforge/wqy/${name}.tar.gz";
 
-  installPhase = ''install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc'';
+  postFetch = ''
+    tar -xzf $downloadedFile --strip-components=1
+    install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc
+  '';
+
+  sha256 = "0i5jh7mkp371fxqmsvn7say075r641yl4hq26isjyrqvb8cv92a9";
 
   meta = {
     description = "A (mainly) Chinese Unicode font";

From 5f4906616d18221dedd1e7db3f749b47d54803b0 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 04:09:15 +0000
Subject: [PATCH 1868/3246] vistafonts: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/vista-fonts/default.nix | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index 5fea1f795fd..f84d067eed8 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -1,24 +1,14 @@
-{stdenv, fetchurl, cabextract}:
+{stdenv, fetchzip, cabextract}:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "vista-fonts-1";
 
-  src = fetchurl {
-    url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe;
-    sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4";
-  };
+  url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe;
 
-  buildInputs = [cabextract];
+  postFetch = ''
+    ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile
+    ${cabextract}/bin/cabextract --lowercase --filter '*.TTF' ppviewer.cab
 
-  unpackPhase = ''
-    cabextract --lowercase --filter ppviewer.cab $src
-    cabextract --lowercase --filter '*.TTF' ppviewer.cab
-    sourceRoot=.
-  '';
-
-  dontBuild = true;
-
-  installPhase = ''
     mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
 
@@ -31,6 +21,8 @@ stdenv.mkDerivation {
     done
   '';
 
+  sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g";
+
   meta = {
     description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";
     homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx;

From dfb345898bc38f49e8a2a11a6e324dfa7a2efcbc Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 04:03:56 +0000
Subject: [PATCH 1869/3246] ubuntu_font_family: make the font derivation
 fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 .../data/fonts/ubuntu-font-family/default.nix | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix
index 61e12848d97..e78f86fede4 100644
--- a/pkgs/data/fonts/ubuntu-font-family/default.nix
+++ b/pkgs/data/fonts/ubuntu-font-family/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "ubuntu-font-family-0.83";
-  buildInputs = [unzip];
 
-  src = fetchurl {
-    url = "http://font.ubuntu.com/download/${name}.zip";
-    sha256 = "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5";
-  };
+  url = "http://font.ubuntu.com/download/${name}.zip";
 
-  installPhase =
-    ''
-      mkdir -p $out/share/fonts/ubuntu
-      cp *.ttf $out/share/fonts/ubuntu
-    '';
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/ubuntu
+  '';
+
+  sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh";
 
   meta = {
     description = "Ubuntu Font Family";

From 44b3f9151ac5383e7158b45e027f623d22a0221a Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 04:01:26 +0000
Subject: [PATCH 1870/3246] iosevka: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/iosevka/default.nix | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 78519ff8c9b..0626ab8e489 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,25 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "iosevka-${version}";
+let
   version = "1.13.1";
+in fetchzip rec {
+  name = "iosevka-${version}";
 
-  buildInputs = [ unzip ];
+  url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip";
 
-  src = fetchurl {
-    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip";
-    sha256 = "05nnzbhv0sidbzzamz10nlh3j974m95p3dmd66165y4wxyhs989i";
-  };
-
-  sourceRoot = ".";
-
-  installPhase = ''
-    fontdir=$out/share/fonts/iosevka
-
-    mkdir -p $fontdir
-    cp -v iosevka-* $fontdir
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
+  sha256 = "0w35jkvfnzn4clm3010wv13sil2yj6pxffx40apjp7yhh19c4sw7";
+
   meta = with stdenv.lib; {
     homepage = http://be5invis.github.io/Iosevka/;
     downloadPage = "https://github.com/be5invis/Iosevka/releases";

From bee42ef52b3551de862a924166d1903786376b5c Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 03:59:59 +0000
Subject: [PATCH 1871/3246] mro-unicode: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/mro-unicode/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix
index 493a26e5556..8986a9adb7a 100644
--- a/pkgs/data/fonts/mro-unicode/default.nix
+++ b/pkgs/data/fonts/mro-unicode/default.nix
@@ -1,10 +1,13 @@
-{ lib, runCommand, fetchurl }:
+{ lib, fetchzip }:
 
-runCommand "mro-unicode-2013-05-25" {
-  src = fetchurl {
-    url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf";
-    sha256 = "1za74ych0sh97ks6qp9iqq9jankgnkrq65s350wsbianwi72di45";
-  };
+fetchzip {
+  name = "mro-unicode-2013-05-25";
+
+  url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf";
+
+  postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf";
+
+  sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g";
 
   meta = with lib; {
     homepage = https://github.com/phjamr/MroUnicode;
@@ -14,7 +17,3 @@ runCommand "mro-unicode-2013-05-25" {
     platforms = platforms.all;
   };
 }
-''
-  mkdir -p $out/share/fonts/truetype
-  cp $src $out/share/fonts/truetype/MroUnicode-Regular.ttf
-''

From 9f11dcc625be85996348f0e95a27800dcdc4b592 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 03:57:52 +0000
Subject: [PATCH 1872/3246] marathi-cursive: make the font derivation
 fixed-output

- [x] homepage fixed
- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/marathi-cursive/default.nix | 23 ++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix
index e3f47cb8b0d..48b2f4c516b 100644
--- a/pkgs/data/fonts/marathi-cursive/default.nix
+++ b/pkgs/data/fonts/marathi-cursive/default.nix
@@ -1,27 +1,26 @@
-{ stdenv, fetchurl, p7zip }:
+{ stdenv, fetchzip, p7zip }:
 
-stdenv.mkDerivation rec {
-  name = "marathi-cursive-${version}";
+let
   version = "1.2";
+in fetchzip rec {
+  name = "marathi-cursive-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z";
-    sha256 = "0zhqkkfkz5mhfz8xv305s16h80p9v1iva829fznxd2c44ngyplmc";
-  };
+  url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z";
 
-  buildInputs = [ p7zip ];
+  postFetch = ''
+    ${p7zip}/bin/7z x $downloadedFile
+    cd MarathiCursive
 
-  unpackCmd = "7z x $curSrc";
-
-  installPhase = ''
     mkdir -p $out/share/fonts/marathi-cursive
     cp -v *.otf *.ttf $out/share/fonts/marathi-cursive
     mkdir -p $out/share/doc/${name}
     cp -v README *.txt $out/share/doc/${name}
   '';
 
+  sha256 = "0fhz2ixrkm523qlx5pnwyzxgb1cfiiwrhls98xg8a5l3sypn1g8v";
+
   meta = with stdenv.lib; {
-    homepage = https://github.com/MihailJP/marathi-cursive;
+    homepage = https://github.com/MihailJP/MarathiCursive;
     description = "Modi script font with Graphite and OpenType support";
     maintainers = with maintainers; [ mathnerd314 ];
     license = licenses.mit; # It's the M+ license, M+ is MIT(-ish)

From be422a4a68cf1d9140b5de6930ef7dcb569731ba Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 03:51:51 +0000
Subject: [PATCH 1873/3246] ipaexfont: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/ipaexfont/default.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix
index e6d4b6734bf..dfeab5124c8 100644
--- a/pkgs/data/fonts/ipaexfont/default.nix
+++ b/pkgs/data/fonts/ipaexfont/default.nix
@@ -1,20 +1,17 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "ipaexfont-003.01";
 
-  src = fetchurl {
-    url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
-    sha256 = "0nmfyh10rzkvp0qmrla0dahkmmxq47678y4v8fdm8fpdzmf0kpn7";
-  };
+  url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
 
-  buildInputs = [ unzip ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype/
-    cp *.ttf $out/share/fonts/opentype/
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj";
+
   meta = with stdenv.lib; {
     description = "Japanese font package with Mincho and Gothic fonts";
     longDescription = ''

From 576e9aacc0cde8cc47b0cbb0849325d5c7ed148d Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 03:50:44 +0000
Subject: [PATCH 1874/3246] ipafont: make the font derivation fixed-output

- [x] make the font derivations fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/ipafont/default.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix
index 1f37630835d..c056f14f46f 100644
--- a/pkgs/data/fonts/ipafont/default.nix
+++ b/pkgs/data/fonts/ipafont/default.nix
@@ -1,23 +1,16 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "ipafont-003.03";
 
-  src = fetchurl {
-    url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php";
-    sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5";
-  };
+  url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php";
 
-  buildInputs = [ unzip ];
-
-  unpackPhase = ''
-    unzip $src
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype
   '';
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    cp ./IPAfont00303/*.ttf $out/share/fonts/opentype/
-  '';
+  sha256 = "0lrjd0bfy36f9j85m12afg5nvr5id3sig2nmzs5qifskbd7mqv9h";
 
   meta = {
     description = "Japanese font package with Mincho and Gothic fonts";

From 7e2b15f08bcd882a5dc52935f80333f7ab5b1e7b Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 03:49:27 +0000
Subject: [PATCH 1875/3246] liberastika: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/liberastika/default.nix | 28 ++++++++++---------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix
index 964210c8dfe..2e1f89ed1e7 100644
--- a/pkgs/data/fonts/liberastika/default.nix
+++ b/pkgs/data/fonts/liberastika/default.nix
@@ -1,26 +1,20 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "liberastika-${version}";
+let
   version = "1.1.5";
+in fetchzip rec {
+  name = "liberastika-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip";
-    sha256 = "0vg5ki120lb577ihvq8w0nxs8yacqzcvsmnsygksmn6281hyj0xj";
-  };
+  url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip";
 
-  buildInputs = [ unzip ];
-
-  sourceRoot = ".";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -v $(find . -name '*.ttf') $out/share/fonts/truetype
-
-    mkdir -p "$out/doc/${name}"
-    cp -v AUTHORS ChangeLog COPYING README "$out/doc/${name}" || true
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.ttf                           -d $out/share/fonts/truetype
+    unzip -j $downloadedFile AUTHORS ChangeLog COPYING README -d "$out/share/doc/${name}"
   '';
 
+  sha256 = "1a9dvl1pzch2vh8sqyyn1d1wz4n624ffazl6hzlc3s5k5lzrb6jp";
+
   meta = with stdenv.lib; {
     description = "Liberation Sans fork with improved cyrillic support";
     homepage = https://sourceforge.net/projects/lib-ka/;

From 8ec0a03bb2be8226848f9d4a6133eb9a8f9e0457 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 13:35:52 +0000
Subject: [PATCH 1876/3246] gentium: make the font derivation fixed-output
 (#28132)

- [x] source link fixed
- [x] make the font derivations fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 .../data/fonts/gentium-book-basic/default.nix | 25 ++++++++-----------
 pkgs/data/fonts/gentium/default.nix           | 25 +++++++++----------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix
index c6812e39ef8..4c1e484253c 100644
--- a/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -1,26 +1,23 @@
 { stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "gentium-book-basic-${version}";
+let
   major = "1";
   minor = "102";
   version = "${major}.${minor}";
+in fetchzip rec {
+  name = "gentium-book-basic-${version}";
 
-  src = fetchzip {
-    name = "${name}.zip";
-    url = "http://software.sil.org/downloads/gentium/GentiumBasic_${major}${minor}.zip";
-    sha256 = "109yiqwdfb1bn7d6bjp8d50k1h3z3kz86p3faz11f9acvsbsjad0";
-  };
+  url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${major}${minor}.zip";
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/${name}
-    cp -v *.ttf $out/share/fonts/truetype/
-    cp -v FONTLOG.txt GENTIUM-FAQ.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -l $downloadedFile
+    unzip -j $downloadedFile \*.ttf                            -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name}
   '';
 
+  sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd";
+
   meta = with stdenv.lib; {
     homepage = http://software.sil.org/gentium/;
     description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix
index 975c4c72a9c..2e2ffdeb5bb 100644
--- a/pkgs/data/fonts/gentium/default.nix
+++ b/pkgs/data/fonts/gentium/default.nix
@@ -1,23 +1,22 @@
 { stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "gentium-${version}";
+let
   version = "5.000";
+in fetchzip rec {
+  name = "gentium-${version}";
 
-  src = fetchzip {
-    url = "http://software.sil.org/downloads/d/gentium/GentiumPlus-${version}.zip";
-    sha256 = "0g9sx38wh7f0m16gr64g2xggjwak2q6jw9y4zhrvhmp4aq4xfqm6";
-  };
+  url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip";
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/${name}
-    cp -v *.ttf $out/share/fonts/truetype/
-    cp -vr documentation/ FONTLOG.txt GENTIUM-FAQ.txt README.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -l $downloadedFile
+    unzip -j $downloadedFile \*.ttf                                          -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt \*/README.txt -d $out/share/doc/${name}
+    unzip -j $downloadedFile \*/documentation/\*                             -d $out/share/doc/${name}/documentation
   '';
 
+  sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp";
+
   meta = with stdenv.lib; {
     homepage = http://software.sil.org/gentium/;
     description = "A high-quality typeface family for Latin, Cyrillic, and Greek";

From a3e9a6982180b2e9d3261c8966c629d84a2a6e97 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 13:36:53 +0000
Subject: [PATCH 1877/3246] bakoma_ttf: make the font derivations fixed-output
 (#28130)

- [x] dead link fixed
- [x] make the font derivations fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/bakoma-ttf/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix
index bffa7edb604..8d87154c1df 100644
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@@ -1,20 +1,18 @@
-{stdenv, fetchurl}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "bakoma-ttf";
 
-  src = fetchurl {
-    url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2;
-    sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";
-  };
+  url = http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km;
 
-  dontBuild = true;
-
-  installPhase = ''
+  postFetch = ''
+    tar xjvf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/truetype
     cp ttf/*.ttf $out/share/fonts/truetype
   '';
 
+  sha256 = "0g7i723n00cqx2va05z1h6v3a2ar69gqw4hy6pjj7m0ml906rngc";
+
   meta = {
     description = "TrueType versions of the Computer Modern and AMS TeX Fonts";
     homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/;

From a4e44ffecb7d0a10cf77f35533a75d273d6a8b3b Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 13:38:52 +0000
Subject: [PATCH 1878/3246] opensans-ttf: make the font derivations
 fixed-output (#28126)

- [x] dead link fixed
- [x] make the font derivations fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/opensans-ttf/default.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix
index dbcf84c9a74..2807bd6d435 100644
--- a/pkgs/data/fonts/opensans-ttf/default.nix
+++ b/pkgs/data/fonts/opensans-ttf/default.nix
@@ -1,22 +1,18 @@
-{stdenv, fetchurl}:
+{stdenv, fetchzip}:
 
-# adapted from https://aur.archlinux.org/packages/tt/ttf-opensans/PKGBUILD
-
-stdenv.mkDerivation rec {
+fetchzip {
   name = "opensans-ttf-20140617";
 
-  src = fetchurl {
-    url = "https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz";
-    sha256 = "1ycn39dijhd3lffmafminrnfmymdig2jvc6i47bb42fx777q97q4";
-  };
+  url = "http://web.archive.org/web/20150801161609/https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz";
 
-  sourceRoot = ".";
-
-  installPhase = ''
+  postFetch = ''
+    tar -xzf $downloadedFile
     mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
   '';
 
+  sha256 = "0zpzqw5y9g5jk7xjcxa12ds60ckvxmpw8p7bnkkmad53s94yr5wf";
+
   meta = {
     description = "Open Sans fonts";
     longDescription = ''

From 078f1dde724456eeacaf83c9931c34c09b35d0bb Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 13:40:45 +0000
Subject: [PATCH 1879/3246] cabin: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/cabin/default.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix
index 8e432db8418..5bf4d454b06 100644
--- a/pkgs/data/fonts/cabin/default.nix
+++ b/pkgs/data/fonts/cabin/default.nix
@@ -1,22 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "cabin-1.005";
 
-  src = fetchFromGitHub {
-    owner = "impallari";
-    repo = "Cabin";
-    rev = "982839c790e9dc57c343972aa34c51ed3b3677fd";
-    sha256 = "16v7spviphvdh2rrr8klv11lc9hxphg12ddf0qs7xdx801ri0ppn";
-  };
+  url = https://github.com/impallari/Cabin/archive/982839c790e9dc57c343972aa34c51ed3b3677fd.zip;
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
-    cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/
-    cp -v README.md FONTLOG.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.otf                    -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
   '';
 
+  sha256 = "1ax5c2iab48qsk9zn3gjvqaib2lnlm25f1wr0aysf5ngw0y0jkrd";
+
   meta = with stdenv.lib; {
     description = "A humanist sans with 4 weights and true italics";
     longDescription = ''

From 973ebce99693f7d9673fdd012836bd58f82f8932 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 13:29:41 +0000
Subject: [PATCH 1880/3246] noto-fonts, noto-fonts-cjk: make the font
 derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/noto-fonts/default.nix | 50 +++++++++-----------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 28fce379968..73059cbcc33 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -1,30 +1,23 @@
-{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
+{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
 
 rec {
   # 18MB
-  noto-fonts = let version = "git-2016-03-29"; in stdenv.mkDerivation {
+  noto-fonts = let version = "git-2016-03-29"; in fetchzip {
     name = "noto-fonts-${version}";
 
-    src = fetchFromGitHub {
-      owner = "googlei18n";
-      repo = "noto-fonts";
-      rev = "e8b0af48b15d64bd490edab4418b5e396cf29644";
-      sha256 = "02yv12fbb4n1gp9g9m0qxnj6adpg9hfsr9377h2d4xsf6sxcgy6f";
-    };
+    url = https://github.com/googlei18n/noto-fonts/archive/e8b0af48b15d64bd490edab4418b5e396cf29644.zip;
+    postFetch = ''
+      unzip $downloadedFile
 
-    phases = [ "unpackPhase" "installPhase" ];
-
-    installPhase = ''
       mkdir -p $out/share/fonts/noto
-      cp hinted/*.ttf $out/share/fonts/noto
+      cp noto-fonts-*/hinted/*.ttf $out/share/fonts/noto
       # Also copy unhinted & alpha fonts for better glyph coverage,
       # if they don't have a hinted version
       # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J)
-      cp -n unhinted/*.ttf $out/share/fonts/noto
-      cp -n alpha/*.ttf $out/share/fonts/noto
+      cp -n noto-fonts-*/unhinted/*.ttf $out/share/fonts/noto
+      cp -n noto-fonts-*/alpha/*.ttf $out/share/fonts/noto
     '';
-
-    preferLocalBuild = true;
+    sha256 = "0wphc8671dpbx3rxzmjisnjipg2c2vkhw2i6mmyamd6vvcwajd64";
 
     meta = with stdenv.lib; {
       inherit version;
@@ -49,27 +42,16 @@ rec {
     };
   };
   # 89MB
-  noto-fonts-cjk = let version = "1.004"; in stdenv.mkDerivation {
+  noto-fonts-cjk = let version = "1.004"; in fetchzip {
     name = "noto-fonts-cjk-${version}";
 
-    src = fetchurl {
-      # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file
-      url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip";
-      sha256 = "1vg3si6slvk8cklq6s5c76s84kqjc4wvwzr4ysljzjpgzra2rfn6";
-    };
-
-    nativeBuildInputs = [ unzip ];
-
-    phases = [ "unpackPhase" "installPhase" ];
-
-    sourceRoot = ".";
-
-    installPhase = ''
-      mkdir -p $out/share/fonts/noto
-      cp *.ttc $out/share/fonts/noto
+    # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file
+    url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip";
+    postFetch = ''
+      mkdir -p $out/share/fonts
+      unzip -j $downloadedFile \*.ttc -d $out/share/fonts/noto
     '';
-
-    preferLocalBuild = true;
+    sha256 = "0ghw2azqq3nkcxsbvf53qjmrhcfsnry79rq7jsr0wwi2pn7d3dsq";
 
     meta = with stdenv.lib; {
       inherit version;

From 265744f2e0b0dbcc53a1acd24a9f0716060f3033 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 13:42:16 +0000
Subject: [PATCH 1881/3246] fira-code: make the font derivation fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/fira-code/default.nix | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index e14505f61bd..5cfd2ec1f47 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -1,24 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "fira-code-${version}";
+let
   version = "1.204";
+in fetchzip {
+  name = "fira-code-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip";
-    sha256 = "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18";
-  };
+  url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip";
 
-  sourceRoot = "otf";
-
-  buildInputs = [ unzip ];
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    cp -v *.otf $out/share/fonts/opentype
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "0gngbnrq42ysz13w3s227ghv1yigw399r3w2415ipb5pba8vipad";
+
   meta = with stdenv.lib; {
     homepage = https://github.com/tonsky/FiraCode;
     description = "Monospace font with programming ligatures";

From dfde45d98e1cdcbbaa7456c569461a66ffe17389 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 13:43:18 +0000
Subject: [PATCH 1882/3246] fira-code-symbols: make the font derivation
 fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/fira-code/symbols.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix
index e8868764271..c19fbccb142 100644
--- a/pkgs/data/fonts/fira-code/symbols.nix
+++ b/pkgs/data/fonts/fira-code/symbols.nix
@@ -1,11 +1,16 @@
-{ stdenv, runCommand, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-runCommand "fira-code-symbols-20160811" {
-  src = fetchurl {
-    url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip";
-    sha256 = "01sk8cmm50xg2vwf0ff212yi5gd2sxcb5l4i9g004alfrp7qaqxg";
-  };
-  buildInputs = [ unzip ];
+fetchzip {
+  name = "fira-code-symbols-20160811";
+
+  url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile -d $out/share/fonts/opentype
+  '';
+
+  sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm";
 
   meta = with stdenv.lib; {
     description = "FiraCode unicode ligature glyphs in private use area";
@@ -18,7 +23,4 @@ runCommand "fira-code-symbols-20160811" {
     maintainers = [ maintainers.profpatsch ];
     homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632";
   };
-} ''
-  mkdir -p $out/share/fonts/opentype
-  unzip "$src" -d $out/share/fonts/opentype
-''
+}

From 48b2962550ccb41c7c45663db1be19c5a71458d4 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 11 Aug 2017 13:39:01 +0000
Subject: [PATCH 1883/3246] arphic-ukai, arphic-uming: make the font derivation
 fixed-output

- [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754)
---
 pkgs/data/fonts/arphic/default.nix | 50 ++++++++++++------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix
index b392ac79b2d..37d9a199567 100644
--- a/pkgs/data/fonts/arphic/default.nix
+++ b/pkgs/data/fonts/arphic/default.nix
@@ -1,27 +1,23 @@
-{ stdenv, fetchurl, mkfontscale, mkfontdir }:
+{ stdenv, fetchzip, mkfontscale, mkfontdir }:
 
-{
-  arphic-ukai = stdenv.mkDerivation rec {
+let
+  version = "0.2.20080216.2";
+in {
+  arphic-ukai = fetchzip {
     name = "arphic-ukai-${version}";
 
-    version = "0.2.20080216.2";
+    url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
 
-    src = fetchurl {
-      url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
-      sha256 = "1lp3i9m6x5wrqjkh1a8vpyhmsrhvsa2znj2mx13qfkwza5rqv5ml";
-    };
-
-    buildInputs = [ mkfontscale mkfontdir ];
-
-    phases = [ "unpackPhase" "installPhase" ];
-
-    installPhase = ''
+    postFetch = ''
+      tar -xjvf $downloadedFile --strip-components=1
       install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
       cd $out/share/fonts
-      mkfontdir
-      mkfontscale
+      ${mkfontdir}/bin/mkfontdir
+      ${mkfontscale}/bin/mkfontscale
     '';
 
+    sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl";
+
     meta = with stdenv.lib; {
       description = "CJK Unicode font Kai style";
       homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
@@ -32,27 +28,21 @@
     };
   };
 
-  arphic-uming = stdenv.mkDerivation rec {
+  arphic-uming = fetchzip {
     name = "arphic-uming-${version}";
 
-    version = "0.2.20080216.2";
+    url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
 
-    src = fetchurl {
-      url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
-      sha256 = "1ny11n380vn7sryvy1g3a83y3ll4h0jf9wgnrx55nmksx829xhg3";
-    };
-
-    buildInputs = [ mkfontscale mkfontdir ];
-
-    phases = [ "unpackPhase" "installPhase" ];
-
-    installPhase = ''
+    postFetch = ''
+      tar -xjvf $downloadedFile --strip-components=1
       install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
       cd $out/share/fonts
-      mkfontdir
-      mkfontscale
+      ${mkfontdir}/bin/mkfontdir
+      ${mkfontscale}/bin/mkfontscale
     '';
 
+    sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d";
+
     meta = with stdenv.lib; {
       description = "CJK Unicode font Ming style";
       homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;

From 516ba12b6de82559e604de53eeedd42f886df62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 11 Aug 2017 15:03:06 +0100
Subject: [PATCH 1884/3246] dropbox: fix makeWrapper usage

makeWrapper checks now if script is executable,
so we have to chmod first.
---
 pkgs/applications/networking/dropbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 088fda046a4..25259b467bb 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -96,10 +96,10 @@ in mkDerivation {
 
     mkdir -p "$out/bin"
     RPATH="${ldpath}:$out/${appdir}"
+    chmod 755 $out/${appdir}/dropbox
     makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
       --prefix LD_LIBRARY_PATH : "$RPATH"
 
-    chmod 755 $out/${appdir}/dropbox
 
     rm $out/${appdir}/wmctrl
     ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl

From 211593fe4909fecdb3afc1b2388c37f8392109a0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 11 Aug 2017 09:47:54 +0800
Subject: [PATCH 1885/3246] influxdb nixos module: allow customizing the
 collectd dependency

---
 nixos/modules/services/databases/influxdb.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index dd88624f406..7fe25252350 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -68,7 +68,7 @@ let
 
     collectd = [{
       enabled = false;
-      typesdb = "${pkgs.collectd}/share/collectd/types.db";
+      typesdb = "${pkgs.collectd-data}/share/collectd/types.db";
       database = "collectd_db";
       port = 25826;
     }];
@@ -149,7 +149,6 @@ in
         type = types.attrs;
       };
     };
-
   };
 
 

From ae5e8dda0775784ccf1d9e63bf45fcefad42b6e7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 11 Aug 2017 10:22:20 -0400
Subject: [PATCH 1886/3246] sbt: 0.13.16 -> 1.0.0

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 8d121b28c95..4627a6bd312 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.16";
+  version = "1.0.0";
 
   src = fetchurl {
     urls = [
       "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
-      "https://cocl.us/sbt01316tgz"
+      "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
     ];
-    sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2";
+    sha256 = "0njwch97g69vzxfqhlaibjwbif2vka68dssddk2jlpqlf94lzq4s";
   };
 
   patchPhase = ''

From 31c344982f0c47af4d33cb5a37125deb1d767ef0 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 10 Aug 2017 19:43:49 +0000
Subject: [PATCH 1887/3246] data/fonts: simpler cleanups

---
 pkgs/data/fonts/andagii/default.nix           | 20 ++---
 pkgs/data/fonts/anonymous-pro/default.nix     | 26 +++---
 pkgs/data/fonts/arkpandora/default.nix        | 28 +++---
 pkgs/data/fonts/aurulent-sans/default.nix     | 21 ++---
 pkgs/data/fonts/baekmuk-ttf/default.nix       | 26 ++----
 pkgs/data/fonts/caladea/default.nix           | 19 ++--
 pkgs/data/fonts/camingo-code/default.nix      | 23 +++--
 pkgs/data/fonts/cantarell-fonts/default.nix   |  4 +
 pkgs/data/fonts/carlito/default.nix           | 19 ++--
 pkgs/data/fonts/cm-unicode/default.nix        | 19 ++--
 pkgs/data/fonts/comfortaa/default.nix         | 29 +++----
 pkgs/data/fonts/comic-neue/default.nix        | 35 ++++----
 pkgs/data/fonts/comic-relief/default.nix      | 31 +++----
 pkgs/data/fonts/corefonts/default.nix         |  4 +
 pkgs/data/fonts/crimson/default.nix           | 18 ++--
 pkgs/data/fonts/culmus/default.nix            | 21 ++---
 pkgs/data/fonts/dina/default.nix              | 20 ++---
 pkgs/data/fonts/dosis/default.nix             | 22 ++---
 pkgs/data/fonts/droid/default.nix             |  4 +
 pkgs/data/fonts/eb-garamond/default.nix       | 23 +++--
 .../emacs-all-the-icons-fonts/default.nix     | 22 +++--
 pkgs/data/fonts/encode-sans/default.nix       | 22 ++---
 .../fonts/fantasque-sans-mono/default.nix     | 29 +++----
 pkgs/data/fonts/fira-mono/default.nix         | 21 ++---
 pkgs/data/fonts/fira/default.nix              | 21 ++---
 .../fonts/fontconfig-penultimate/default.nix  | 17 ++--
 pkgs/data/fonts/freefont-ttf/default.nix      | 19 ++--
 pkgs/data/fonts/gdouros/default.nix           | 83 ++++++++----------
 pkgs/data/fonts/go-font/default.nix           |  4 +
 pkgs/data/fonts/gyre/default.nix              | 22 ++---
 pkgs/data/fonts/hack/default.nix              | 29 +++----
 pkgs/data/fonts/hanazono/default.nix          | 27 +++---
 pkgs/data/fonts/hasklig/default.nix           | 23 ++---
 .../fonts/helvetica-neue-lt-std/default.nix   | 26 +++---
 pkgs/data/fonts/inconsolata/default.nix       | 19 ++--
 pkgs/data/fonts/input-fonts/default.nix       |  8 +-
 pkgs/data/fonts/junicode/default.nix          | 20 ++---
 pkgs/data/fonts/kawkab-mono/default.nix       | 20 ++---
 .../fonts/kochi-substitute-naga10/default.nix | 16 ++--
 pkgs/data/fonts/kochi-substitute/default.nix  |  4 +
 pkgs/data/fonts/lato/default.nix              | 21 ++---
 .../fonts/league-of-moveable-type/default.nix |  4 +
 pkgs/data/fonts/libre-baskerville/default.nix | 22 ++---
 pkgs/data/fonts/libre-bodoni/default.nix      | 22 ++---
 pkgs/data/fonts/libre-caslon/default.nix      |  4 +
 pkgs/data/fonts/libre-franklin/default.nix    | 22 ++---
 pkgs/data/fonts/lmodern/default.nix           | 23 ++---
 pkgs/data/fonts/lmodern/lmmath.nix            | 20 ++---
 pkgs/data/fonts/lobster-two/default.nix       |  4 +
 pkgs/data/fonts/lohit-fonts/default.nix       | 87 ++++++++++---------
 pkgs/data/fonts/meslo-lg/default.nix          |  4 +
 pkgs/data/fonts/mononoki/default.nix          | 21 ++---
 pkgs/data/fonts/montserrat/default.nix        | 17 ++--
 pkgs/data/fonts/mph-2b-damase/default.nix     | 21 ++---
 .../fonts/mplus-outline-fonts/default.nix     | 19 ++--
 pkgs/data/fonts/nafees/default.nix            |  4 +
 pkgs/data/fonts/nerdfonts/default.nix         |  4 +
 pkgs/data/fonts/norwester/default.nix         | 22 ++---
 pkgs/data/fonts/oldsindhi/default.nix         | 24 +++--
 pkgs/data/fonts/oldstandard/default.nix       |  4 +
 pkgs/data/fonts/open-dyslexic/default.nix     | 27 +++---
 pkgs/data/fonts/orbitron/default.nix          | 24 +++--
 pkgs/data/fonts/overpass/default.nix          | 28 +++---
 pkgs/data/fonts/oxygenfonts/default.nix       | 22 ++---
 pkgs/data/fonts/paratype-pt/mono.nix          | 27 +++---
 pkgs/data/fonts/paratype-pt/sans.nix          | 27 +++---
 pkgs/data/fonts/paratype-pt/serif.nix         | 27 +++---
 pkgs/data/fonts/pecita/default.nix            | 19 ++--
 pkgs/data/fonts/poly/default.nix              |  4 +
 pkgs/data/fonts/powerline-fonts/default.nix   | 27 +++---
 pkgs/data/fonts/profont/default.nix           | 29 +++----
 pkgs/data/fonts/quattrocento-sans/default.nix | 28 +++---
 pkgs/data/fonts/quattrocento/default.nix      | 26 +++---
 pkgs/data/fonts/raleway/default.nix           | 27 +++---
 pkgs/data/fonts/roboto-mono/default.nix       |  4 +
 pkgs/data/fonts/roboto-slab/default.nix       |  4 +
 pkgs/data/fonts/sampradaya/default.nix        | 19 ++--
 pkgs/data/fonts/shrikhand/default.nix         | 18 ++--
 pkgs/data/fonts/signwriting/default.nix       |  4 +
 pkgs/data/fonts/siji/default.nix              | 22 +++--
 pkgs/data/fonts/source-code-pro/default.nix   | 25 +++---
 pkgs/data/fonts/source-han-sans/default.nix   | 32 +++----
 pkgs/data/fonts/source-han-serif/default.nix  | 32 +++----
 pkgs/data/fonts/source-sans-pro/default.nix   | 16 ++--
 pkgs/data/fonts/source-serif-pro/default.nix  | 20 ++---
 pkgs/data/fonts/stix-otf/default.nix          | 26 +++---
 pkgs/data/fonts/stix-two/default.nix          | 24 +++--
 pkgs/data/fonts/tai-languages/default.nix     | 21 +++--
 pkgs/data/fonts/tempora-lgc/default.nix       |  4 +
 pkgs/data/fonts/terminus-font-ttf/default.nix | 18 ++--
 pkgs/data/fonts/theano/default.nix            | 21 ++---
 pkgs/data/fonts/tipa/default.nix              |  8 +-
 .../data/fonts/ttf-bitstream-vera/default.nix | 16 ++--
 pkgs/data/fonts/ttf-envy-code-r/default.nix   | 24 +++--
 pkgs/data/fonts/unifont_upper/default.nix     | 20 ++---
 95 files changed, 865 insertions(+), 1088 deletions(-)

diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix
index 562aa8be4ef..5c708457f8d 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -1,22 +1,18 @@
 { stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "andagii-${version}";
+let
   version = "1.0.2";
+in fetchzip {
+  name = "andagii-${version}";
 
-  src = fetchzip {
-    url = http://www.i18nguy.com/unicode/andagii.zip;
-    sha256 = "0a0c43y1fd5ksj50axhng7p00kgga0i15p136g68p35wj7kh5g2k";
-    stripRoot = false;
-    curlOpts = "--user-agent 'Mozilla/5.0'";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
+  url = http://www.i18nguy.com/unicode/andagii.zip;
+  curlOpts = "--user-agent 'Mozilla/5.0'";
+  postFetch = ''
+    unzip $downloadedFile
     mkdir -p $out/share/fonts/truetype
     cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf
   '';
+  sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2";
 
   # There are multiple claims that the font is GPL, so I include the
   # package; but I cannot find the original source, so use it on your
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index da34a2f43aa..ff8813f7813 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -1,23 +1,17 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "anonymousPro-${version}";
+let
   version = "1.002";
+in fetchzip rec {
+  name = "anonymousPro-${version}";
 
-  src = fetchurl {
-    url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip";
-    sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6";
-  };
-
-  nativeBuildInputs = [ unzip ];
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/${name}
-    find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \;
-    find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \;
+  url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip";
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.ttf                           -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.txt                           -d "$out/share/doc/${name}"
   '';
+  sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f";
 
   meta = with stdenv.lib; {
     homepage = http://www.marksimonson.com/fonts/view/anonymous-pro;
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index 59be4fd14c8..c2e64cb63dd 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
-  name = "arkpandora-${version}";
+{ stdenv, fetchurl, unzip }:
+
+let
   version = "2.04";
+in fetchurl {
+  name = "arkpandora-${version}";
 
-  src = fetchurl {
-    urls = [
-      "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
-      "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz"
-      "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz"
-      ];
-    sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51";
-  };
-
-  installPhase = ''
+  urls = [
+    "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz"
+    "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
+    "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz"
+  ];
+  downloadToTemp = true;
+  recursiveHash = true;
+  postFetch = ''
+    tar -xzvf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
   '';
+  sha256 = "177k0fbs0787al0snkl8w68d2qkg7snnnq6qp28j9s98vaabs04k";
 
   meta = {
     description = "Font, metrically identical to Arial and Times New Roman";
diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix
index 9941b4791b5..1a83ce17646 100644
--- a/pkgs/data/fonts/aurulent-sans/default.nix
+++ b/pkgs/data/fonts/aurulent-sans/default.nix
@@ -1,21 +1,14 @@
-{stdenv, fetchgit}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "aurulent-sans-0.1";
 
-  src = fetchgit {
-    url = "https://github.com/deepfire/hartke-aurulent-sans.git";
-    rev = "refs/tags/${name}";
-    sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    fontDir=$out/share/fonts/opentype
-    mkdir -p $fontDir
-    cp *.otf $fontDir
+  url = "https://github.com/deepfire/hartke-aurulent-sans/archive/${name}.zip";
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
+  sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li";
 
   meta = {
     description = "Aurulent Sans";
diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix
index ba1f21c186e..555bba63354 100644
--- a/pkgs/data/fonts/baekmuk-ttf/default.nix
+++ b/pkgs/data/fonts/baekmuk-ttf/default.nix
@@ -1,24 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "baekmuk-ttf-2.2";
 
-  src = fetchurl {
-    url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
-    sha256 = "10hqspl70h141ywz1smlzdanlx9vwgsp1qrcjk68fn2xnpzpvaq8";
-  };
-
-  dontBuild = true;
-
-  installPhase = let
-    fonts_dir = "$out/share/fonts";
-    doc_dir = "$out/share/doc/${name}";
-  in ''
-    mkdir -pv ${fonts_dir}
-    mkdir -pv ${doc_dir}
-    cp ttf/*.ttf ${fonts_dir}
-    cp COPYRIGHT* ${doc_dir}
+  url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
+  postFetch = ''
+    tar -xzvf $downloadedFile --strip-components=1
+    mkdir -p $out/share/fonts $out/share/doc/${name}
+    cp ttf/*.ttf  $out/share/fonts
+    cp COPYRIGHT* $out/share/doc/${name}
   '';
+  sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g";
 
   meta = {
     description = "Korean font";
diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix
index 110405839a1..56d8273f78a 100644
--- a/pkgs/data/fonts/caladea/default.nix
+++ b/pkgs/data/fonts/caladea/default.nix
@@ -1,22 +1,19 @@
-{stdenv, fetchurl}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "caladea-${version}";
+let
   version = "20130214";
+in fetchzip rec {
+  name = "caladea-${version}";
 
-  src = fetchurl {
-    url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz";
-    sha256 = "02addvvkbvf3bn21kfyj10j9w1c8hdxxld4wjmnc1j8ksqpir3f4";
-  };
-
-  phases = ["unpackPhase" "installPhase"];
-
-  installPhase = ''
+  url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz";
+  postFetch = ''
+    tar -xzvf $downloadedFile --strip-components=1
     mkdir -p $out/etc/fonts/conf.d
     mkdir -p $out/share/fonts/truetype
     cp -v *.ttf $out/share/fonts/truetype
     cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf
   '';
+  sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z";
 
   meta = with stdenv.lib; {
     # This font doesn't appear to have any official web site but this
diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix
index bc1402270aa..dfdf367337c 100644
--- a/pkgs/data/fonts/camingo-code/default.nix
+++ b/pkgs/data/fonts/camingo-code/default.nix
@@ -1,22 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "camingo-code-${version}";
+let
   version = "1.0";
+in fetchzip rec {
+  name = "camingo-code-${version}";
 
-  src = fetchurl {
-    url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip;
-    sha256 = "1gbpfa5mqyhi5yrb6dl708pggiwp002b532fn3axiagb0cxxf02s";
-  };
-
-  buildInputs = [ unzip ];
-
-  installPhase = ''
+  url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip;
+  postFetch = ''
+    unzip $downloadedFile
     mkdir -p $out/share/fonts/truetype
     mkdir -p $out/share/doc/${name}
-    cp -v camingo-code/*.ttf $out/share/fonts/truetype/
-    cp -v camingo-code/*.txt $out/share/doc/${name}/
+    cp -v fonts/camingo-code/*.ttf $out/share/fonts/truetype/
+    cp -v fonts/camingo-code/*.txt $out/share/doc/${name}/
   '';
+  sha256 = "035z2k6lwwy2bysw27pirn3vjxnj2h23nyx8jr213rb2bl0m21x1";
 
   meta = with stdenv.lib; {
     homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/;
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 98ce946044d..de2edad451b 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl";
   };
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2";
+
   meta = {
     description = "Default typeface used in the user interface of GNOME since version 3.0";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix
index b90d89c9779..2243435bc5d 100644
--- a/pkgs/data/fonts/carlito/default.nix
+++ b/pkgs/data/fonts/carlito/default.nix
@@ -1,23 +1,22 @@
-{stdenv, fetchurl}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "carlito-${version}";
+let
   version = "20130920";
+in fetchzip rec {
+  name = "carlito-${version}";
 
-  src = fetchurl {
-    url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";
-    sha256 = "0nmgzp6gdvv4dipswrw0l1bfjp4jbic2qvm7dpqiq71jpin2plab";
-  };
+  url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";
 
-  phases = ["unpackPhase" "installPhase"];
-
-  installPhase = ''
+  postFetch = ''
+    tar -xzvf $downloadedFile --strip-components=1
     mkdir -p $out/etc/fonts/conf.d
     mkdir -p $out/share/fonts/truetype
     cp -v *.ttf $out/share/fonts/truetype
     cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf
   '';
 
+  sha256 = "0d72zy6kdmxgpi63r3yvi3jh1hb7lvlgv8hgd4ag0x10dz18mbzv";
+
   meta = with stdenv.lib; {
     # This font doesn't appear to have any official web site but this
     # one provides some good information and samples.
diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix
index ed7ce93e189..d17021feb81 100644
--- a/pkgs/data/fonts/cm-unicode/default.nix
+++ b/pkgs/data/fonts/cm-unicode/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "cm-unicode-${version}";
+let
   version = "0.7.0";
+in fetchzip rec {
+  name = "cm-unicode-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz";
-    sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl";
-  };
+  url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz";
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
+  postFetch = ''
+    tar -xJvf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/opentype
     mkdir -p $out/share/doc/${name}
     cp -v *.otf $out/share/fonts/opentype/
     cp -v README FontLog.txt $out/share/doc/${name}
   '';
 
+  sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn";
+
   meta = with stdenv.lib; {
     homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/;
     description = "Computer Modern Unicode fonts";
diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix
index c773f395592..0dd4f727ad2 100644
--- a/pkgs/data/fonts/comfortaa/default.nix
+++ b/pkgs/data/fonts/comfortaa/default.nix
@@ -1,25 +1,18 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "comfortaa-${version}";
+let
   version = "2.004";
+in fetchzip rec {
+  name = "comfortaa-${version}";
 
-  src = fetchurl {
-    url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip";
-    sha256 = "0js0kk5g6b7xrq92b68gz5ipbiv1havnbgnfqzvlw3k3nllwnl9z";
-  };
-
-  phases = ["unpackPhase" "installPhase"];
-
-  buildInputs = [unzip];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/${name}
-    cp -v *.ttf $out/share/fonts/truetype/
-    cp -v FONTLOG.txt $out/share/doc/${name}/
-    cp -v donate.html $out/share/doc/${name}/
+  url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip";
+  postFetch = ''
+    mkdir -p $out/share/fonts $out/share/doc
+    unzip -l $downloadedFile
+    unzip -j $downloadedFile \*.ttf                        -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name}
   '';
+  sha256 = "1gnscf3kw9p5gbc5594a22cc6nmiir9mhp1nl3mkbzd4v1jfbh2h";
 
   meta = with stdenv.lib; {
     homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949;
diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix
index 5d3da910e0b..07fc172ca51 100644
--- a/pkgs/data/fonts/comic-neue/default.nix
+++ b/pkgs/data/fonts/comic-neue/default.nix
@@ -1,29 +1,24 @@
-{ stdenv, fetchurl
-, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "comic-neue-${version}";
+let
   version = "2.2";
+in fetchzip rec {
+  name = "comic-neue-${version}";
 
-  src = fetchurl {
-    url = "http://comicneue.com/${name}.zip";
-    sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n";
-  };
+  url = "http://comicneue.com/${name}.zip";
 
-  buildInputs = [ unzip ];
-  phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = name;
-
-  installPhase = ''
-    mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name}
-    cp -v OTF/*.otf  $out/share/fonts/opentype
-    cp -v Web/*.ttf $out/share/fonts/truetype
-    cp -v Web/*.eot  $out/share/fonts/EOT
-    cp -v Web/*.woff  $out/share/fonts/WOFF
-    cp -v Web/*.woff2  $out/share/fonts/WOFF2
-    cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -vp $out/share/{doc,fonts}
+    unzip -j $downloadedFile comic-neue-2.2/\*.otf   -d $out/share/fonts/opentype
+    unzip -j $downloadedFile comic-neue-2.2/\*.ttf   -d $out/share/fonts/truetype
+    unzip -j $downloadedFile comic-neue-2.2/\*.eot   -d $out/share/fonts/EOT
+    unzip -j $downloadedFile comic-neue-2.2/\*.woff  -d $out/share/fonts/WOFF
+    unzip -j $downloadedFile comic-neue-2.2/\*.woff2 -d $out/share/fonts/WOFF2
+    unzip -j $downloadedFile comic-neue-2.2/\*.pdf comic-neue-2.2/FONTLOG.txt comic-neue-2.2/OFL-FAQ.txt comic-neue-2.2/SIL-License.txt -d $out/share/doc/${name}
   '';
 
+  sha256 = "1yypq5aqqzv3q1c6vx5130mi2iwihzzvrawhwqpwsfjl0p25sq9q";
+
   meta = with stdenv.lib; {
     homepage = http://comicneue.com/;
     description = "A casual type face: Make your lemonade stand look like a fortune 500 company";
diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix
index 31c89215ea7..2a1273214bd 100644
--- a/pkgs/data/fonts/comic-relief/default.nix
+++ b/pkgs/data/fonts/comic-relief/default.nix
@@ -1,32 +1,23 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "comic-relief-${version}";
+let
   version = "1.1";
+in fetchzip rec {
+  name = "comic-relief-${version}";
 
-  src = fetchurl {
-    url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip";
-    sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch";
-  };
+  url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip";
 
-  buildInputs = [unzip];
-
-  phases = ["unpackPhase" "installPhase"];
-
-  unpackCmd = ''
-    mkdir -p ${name}
-    unzip -qq -d ${name} $src
-  '';
-
-  installPhase = ''
+  postFetch = ''
     mkdir -p $out/etc/fonts/conf.d
     mkdir -p $out/share/doc/${name}
     mkdir -p $out/share/fonts/truetype
-    cp -v *.ttf $out/share/fonts/truetype
-    cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf
-    cp -v FONTLOG.txt $out/share/doc/${name}
+    cp -v ${./comic-sans-ms-alias.conf}     $out/etc/fonts/conf.d/30-comic-sans-ms.conf
+    unzip -j $downloadedFile \*.ttf      -d $out/share/fonts/truetype
+    unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name}
   '';
 
+  sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff";
+
   meta = with stdenv.lib; {
     homepage = http://loudifier.com/comic-relief/;
     description = "A font metric-compatible with Microsoft Comic Sans";
diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix
index c514f1ab7fb..91c8ed1163d 100644
--- a/pkgs/data/fonts/corefonts/default.nix
+++ b/pkgs/data/fonts/corefonts/default.nix
@@ -59,6 +59,10 @@ stdenv.mkDerivation {
     done
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx";
+
   meta = with stdenv.lib; {
     homepage = http://corefonts.sourceforge.net/;
     description = "Microsoft's TrueType core fonts for the Web";
diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix
index f612f077064..e96c13b7822 100644
--- a/pkgs/data/fonts/crimson/default.nix
+++ b/pkgs/data/fonts/crimson/default.nix
@@ -1,23 +1,23 @@
-{stdenv, fetchurl}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "crimson-${version}";
+let
   version = "2014.10";
+in fetchzip rec {
+  name = "crimson-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz";
-    sha256 = "0qyihrhqb89vwg9cfpaf5xqmcjvs4r4614bxy634vmqv9v1bzn5b";
-  };
+  url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz";
 
-  phases = ["unpackPhase" "installPhase"];
+  postFetch = ''
+    tar -xzvf $downloadedFile --strip-components=1
 
-  installPhase = ''
     mkdir -p $out/share/fonts/opentype
     mkdir -p $out/share/doc/${name}
     cp -v "Desktop Fonts/OTF/"*.otf $out/share/fonts/opentype
     cp -v README.md $out/share/doc/${name}
   '';
 
+  sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842";
+
   meta = with stdenv.lib; {
     homepage = https://aldusleaf.org/crimson.html;
     description = "A font family inspired by beautiful oldstyle typefaces";
diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix
index 08783e46cde..236058c0b27 100644
--- a/pkgs/data/fonts/culmus/default.nix
+++ b/pkgs/data/fonts/culmus/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "culmus-${version}";
+let
   version = "0.130";
+in fetchzip {
+  name = "culmus-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
-    sha256 = "908583e388bc983a63df4f38f7130eac69fc19539952031408bb3c627846f9c1";
-  };
-  
-  installPhase = ''
+  url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
+
+  postFetch = ''
+    tar -xzvf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/truetype
     cp -v *.ttf $out/share/fonts/truetype/
   '';
-  
+
+  sha256 = "0v5vm8j2bxnw2qn0640kyibn4h8ck8cidhx2pixi5xsayr0ij1n6";
+
   meta = {
     description = "Culmus Hebrew fonts";
     longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows.";
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index a206bd7f911..66feaf0ff54 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -1,23 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+let
   version = "2.92";
+in fetchzip rec {
   name = "dina-font-${version}";
 
-  src = fetchurl {
-    url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
-    sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
-  };
+  url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
 
-  nativeBuildInputs = [ unzip ];
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase =
-  ''
+  postFetch = ''
     mkdir -p $out/share/fonts
-    cp *.bdf $out/share/fonts
+    unzip -j $downloadedFile \*.bdf -d $out/share/fonts
   '';
 
+  sha256 = "02a6hqbq18sw69npylfskriqhvj1nsk65hjjyd05nl913ycc6jl7";
+
   meta = with stdenv.lib; {
     description = "A monospace bitmap font aimed at programmers";
     longDescription = ''
diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix
index 28b9ee2f1e7..01157e8b7e4 100644
--- a/pkgs/data/fonts/dosis/default.nix
+++ b/pkgs/data/fonts/dosis/default.nix
@@ -1,22 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "dosis-1.007";
 
-  src = fetchFromGitHub {
-    owner = "impallari";
-    repo = "Dosis";
-    rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc";
-    sha256 = "0glniyg07z5gx5gsa1ymarg2gsncjyf94wi6j9bf68v5s2w3v7md";
-  };
+  url = https://github.com/impallari/Dosis/archive/12df1e13e58768f20e0d48ff15651b703f9dd9dc.zip;
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
-    cp -v "fonts/OTF v1.007 Fontlab/"*.otf $out/share/fonts/opentype/
-    cp -v README.md FONTLOG.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.otf                    -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
   '';
 
+  sha256 = "11a8jmgaly14l7rm3jxkwwv3ngr8fdlkp70nicjk2rg0nny2cvfq";
+
   meta = with stdenv.lib; {
     description = "A very simple, rounded, sans serif family";
     longDescription = ''
diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix
index 70730a7d8b7..c2a4868a091 100644
--- a/pkgs/data/fonts/droid/default.nix
+++ b/pkgs/data/fonts/droid/default.nix
@@ -50,6 +50,10 @@ stdenv.mkDerivation rec {
     cp *.ttf $out/share/fonts/droid
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1l3lqfdr9pm05b1py9yr3cf65gi1my7jrrlvikqpqg2zr066n6c3";
+
   meta = {
     description = "Droid Family fonts by Google Android";
     homepage = https://github.com/google/fonts;
diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix
index 0956250e36c..53a5d9f73cc 100644
--- a/pkgs/data/fonts/eb-garamond/default.nix
+++ b/pkgs/data/fonts/eb-garamond/default.nix
@@ -1,23 +1,20 @@
 { stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "eb-garamond-${version}";
+let
   version = "0.016";
+in fetchzip rec {
+  name = "eb-garamond-${version}";
 
-  src = fetchzip {
-    url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip";
-    sha256 = "0j40bg1di39q7zis64il67xchldyznrl8wij9il10c4wr8nl4r9z";
-  };
+  url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip";
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
-    cp -v "otf/"*.otf $out/share/fonts/opentype/
-    cp -v Changes README.markdown README.xelualatex $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.otf                                          -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*Changes \*README.markdown \*README.xelualatex -d "$out/share/doc/${name}"
   '';
 
+  sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3";
+
   meta = with stdenv.lib; {
     homepage = http://www.georgduffner.at/ebgaramond/;
     description = "Digitization of the Garamond shown on the Egenolff-Berner specimen";
diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
index 4082d5949a3..10305a8c2d2 100644
--- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
+++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "emacs-all-the-icons-fonts-${version}";
+let
   version = "3.1.1";
+in fetchzip {
+  name = "emacs-all-the-icons-fonts-${version}";
 
-  src = fetchFromGitHub {
-    owner = "domtronn";
-    repo = "all-the-icons.el";
-    rev = version;
-    sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf";
-  };
+  url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip";
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/all-the-icons
-    for font in $src/fonts/*.ttf; do cp $font $out/share/fonts/all-the-icons; done
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons
   '';
 
+  sha256 = "0ps8q9nkx67ivgn8na4s012360v36jwr0951rsg7j6dyyw9g41jq";
+
   meta = with stdenv.lib; {
     description = "Icon fonts for emacs all-the-icons";
     longDescription = ''
diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix
index e0f79b2722c..96d64e13893 100644
--- a/pkgs/data/fonts/encode-sans/default.nix
+++ b/pkgs/data/fonts/encode-sans/default.nix
@@ -1,22 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "encode-sans-1.002";
 
-  src = fetchFromGitHub {
-    owner = "impallari";
-    repo = "Encode-Sans";
-    rev = "11162b46892d20f55bd42a00b48cbf06b5871f75";
-    sha256 = "1v5k79qlsl6nggilmjw56axwwr2b3838x6vqch4lh0dck5ri9w2c";
-  };
+  url = https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip;
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/${name}
-    cp -v *.ttf $out/share/fonts/truetype/
-    cp -v README.md FONTLOG.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.ttf                    -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
   '';
 
+  sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p";
+
   meta = with stdenv.lib; {
     description = "A versatile sans serif font family";
     longDescription = ''
diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix
index a87c89d1df9..de52ae411ef 100644
--- a/pkgs/data/fonts/fantasque-sans-mono/default.nix
+++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix
@@ -1,28 +1,19 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "fantasque-sans-mono-${version}";
+let
   version = "1.7.1";
+in fetchzip rec {
+  name = "fantasque-sans-mono-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip";
-    sha256 = "0lkky7mmpq6igpjh7lsv30xjx62mwlx27gd9zwcyv3mp2d2b5cvb";
-  };
+  url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip";
 
-  buildInputs = [unzip];
-  phases = ["unpackPhase" "installPhase"];
-
-  unpackCmd = ''
-    mkdir -p ${name}
-    unzip -qq -d ${name} $src
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.otf    -d $out/share/fonts/opentype
+    unzip -j $downloadedFile README.md -d $out/share/doc/${name}
   '';
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
-    cp -v "OTF/"*.otf $out/share/fonts/opentype
-    cp -v README.md $out/share/doc/${name}
-  '';
+  sha256 = "1sjdpnxyjdbqxzrylzkynxh1bmicc71h3pmwmr3a3cq0h53g28z0";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/belluzj/fantasque-sans;
diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix
index 3997ba27719..4fc6aab9510 100644
--- a/pkgs/data/fonts/fira-mono/default.nix
+++ b/pkgs/data/fonts/fira-mono/default.nix
@@ -1,22 +1,17 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip {
   name = "fira-mono-3.206";
 
-  src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip;
-    sha256 = "1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi";
-  };
+  url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip;
 
-  buildInputs = [ unzip ];
-  phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraMonoFonts3206";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \;
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "0m4kdjh4xjyznybpgh21a0gibv4wsxq0rqyl3wv942zk6mclmgdf";
+
   meta = with stdenv.lib; {
     homepage = http://www.carrois.com/fira-4-1/;
     description = "Monospace font for Firefox OS";
diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
index f777ae33e0b..cddb8cd726a 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/pkgs/data/fonts/fira/default.nix
@@ -1,22 +1,17 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "fira-4.106";
 
-  src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip;
-    sha256 = "123xwd7abb96lsla1v579vfpvc7fwixhq78221qxrw4dv8mgf8id";
-  };
+  url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip;
 
-  buildInputs = [unzip];
-  phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraFonts4106";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \;
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "174nwmpvxqg1qjfj6h3yvrphs1s3n6zricdh27iaxilajm0ilbgs";
+
   meta = with stdenv.lib; {
     homepage = http://www.carrois.com/fira-4-1/;
     description = "Sans-serif font for Firefox OS";
diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
index 360cacb551d..da1c4467036 100644
--- a/pkgs/data/fonts/fontconfig-penultimate/default.nix
+++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -1,21 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
 let version = "0.3.5"; in
-stdenv.mkDerivation {
+fetchzip {
   name = "fontconfig-penultimate-${version}";
 
-  src = fetchFromGitHub {
-    owner = "ttuegel";
-    repo = "fontconfig-penultimate";
-    rev = version;
-    sha256 = "1xi664bs6n687s972nch87hi0iqkd6gr1l76zl58pymiw2132ks8";
-  };
+  url = "https://github.com/ttuegel/fontconfig-penultimate/archive/${version}.zip";
 
-  installPhase = ''
+  postFetch = ''
     mkdir -p $out/etc/fonts/conf.d
-    cp *.conf $out/etc/fonts/conf.d
+    unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d
   '';
 
+  sha256 = "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk";
+
   meta = with stdenv.lib; {
     homepage = https://github.com/ttuegel/fontconfig-penultimate;
     description = "Sensible defaults for Fontconfig";
diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix
index 00d5cfba27a..87b3abe2911 100644
--- a/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/pkgs/data/fonts/freefont-ttf/default.nix
@@ -1,20 +1,17 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "freefont-ttf-20120503";
 
-  src = fetchurl {
-    url = "mirror://gnu/freefont/${name}.zip";
-    sha256 = "1bw9mrf5pqi2a29b7qw4nhhj566aqqmi28hkbn2a38c2pzqvm1bw";
-  };
+  url = "mirror://gnu/freefont/${name}.zip";
 
-  buildInputs = [ unzip ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
   '';
 
+  sha256 = "0h0x2hhr7kvjiycf7fv800xxwa6hcpiz54bqx06wsqc7z61iklvd";
+
   meta = {
     description = "GNU Free UCS Outline Fonts";
     longDescription = ''
diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix
index 28bea4c2c8b..359074099ba 100644
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/pkgs/data/fonts/gdouros/default.nix
@@ -1,62 +1,51 @@
-{stdenv, fetchurl, unzip, lib }:
+{stdenv, fetchzip, lib}:
+
 let
   fonts = {
-    symbola = { version = "9.00"; file = "Symbola.zip"; sha256 = "0d9zrlvzh8inhr17p99banr0dmrvkwxbk3q7zhqqx2z4gf2yavc5";
+    symbola = { version = "9.17"; file = "Symbola.zip"; sha256 = "13z18lxx0py54nns61ihgxacpf1lg9s7g2sbpbnxpllqw7j73iq2";
                 description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
-    aegyptus = { version = "6.00"; file = "Aegyptus.zip"; sha256 = "10mr54ja9b169fhqfkrw510jybghrpjx7a8a7m38k5v39ck8wz6v";
+    aegyptus = { version = "6.17"; file = "Aegyptus.zip"; sha256 = "19rkf89msqb076qjdfa75pqrx35c3slj64vxw08zqdvyavq7jc79";
                  description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
-    akkadian = { version = "7.13"; file = "Akkadian.zip"; sha256 = "1jd2fb6jnwpdwgkidsi2pnw0nk2cpya8k85299w591sqslfkxyij";
+    akkadian = { version = "7.17"; file = "AkkadianAssyrian.zip"; sha256 = "1xw2flrwb5r89sk7jd195v3svsb21brf1li2i3pdjcfqxfp5m0g7";
                  description = "Sumero-Akkadian Cuneiform"; };
-    anatolian = { version = "5.02"; file = "Anatolian.zip"; sha256 = "0arm58sijzk0bqmfb70k1sjvq79wgw16hx3j2g4l8qz4sv05bp8l";
+    anatolian = { version = "5.17"; file = "Anatolian.zip"; sha256 = "0dqcyjakc4fy076pjplm6psl8drpwxiwyq97xrf6a3qa098gc0qc";
                   description = "Anatolian Hieroglyphs"; };
-    maya = { version = "4.14"; file = "Maya.zip"; sha256 = "0l97racgncrhb96mfbsx8dr5n4j289iy0nnwhxf9b21ns58a9x4f";
+    maya = { version = "4.17"; file = "Maya.zip"; sha256 = "17s5c23wpqrcq5h6pgssbmzxiv4jvhdh2ssr99j9q6j32a51h9gh";
              description = "Maya Hieroglyphs"; };
-    unidings = { version = "8.00"; file = "Unidings.zip"; sha256 = "1i0z3mhgj4680188lqpmk7rx3yiz4l7yybb4wq6zk35j75l28irm";
+    unidings = { version = "9.17"; file = "Unidings.zip"; sha256 = "0nzw8mrhk0hbjnl2cgi31b00vmi785win86kiz9d2yzdfz1is6sk";
                  description = "Glyphs and Icons for blocks of The Unicode Standard"; };
-    musica = { version = "3.12"; file = "Musica.zip"; sha256 = "079vyb0mpxvlcf81d5pqh9dijkcvidfbcyvpbgjpmgzzrrj0q210";
+    musica = { version = "3.17"; file = "Musica.zip"; sha256 = "0mnv61dxzs2npvxgs5l9q81q19xzzi1sn53x5qwpiirkmi6bg5y6";
                description = "Musical Notation"; };
-    analecta = { version = "5.00"; file = "Analecta.zip"; sha256 = "0rphylnz42fqm1zpx5jx60k294kax3sid8r2hx3cbxfdf8fnpb1f";
+    analecta = { version = "5.17"; file = "Analecta.zip"; sha256 = "13npnfscd9mz6vf89qxxbj383njf53a1smqjh0c1w2lvijgak3aj";
                  description = "Coptic, Gothic, Deseret"; };
-    # the following are also available from http://users.teilar.gr/~g1951d/
-    # but not yet packaged:
-    #  - Aroania
-    #  - Anaktoria
-    #  - Alexander
-    #  - Avdira
-    #  - Asea
-    #  - Aegean
+    textfonts = { version = "7.17"; file = "TextfontsFonts.zip"; sha256 = "1ggflqnslp81v8pzmzx6iwi2sa38l9bpivjjci7nvx3y5xynm6wl";
+                 description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; };
+    aegan = { version = "9.17"; file = "AegeanFonts.zip"; sha256 = "0dm2ck3p11bc9izrh7xz3blqfqg1mgsvy4jsgmz9rcs4m74xrhsf";
+              description = "Aegean"; };
+    abydos = { version = "1.23"; file = "AbydosFont.zip"; sha256 = "04r7ysnjjq0nrr3m8lbz8ssyx6xaikqybjqxzl3ziywl9h6nxdj8";
+               description = "AbydosFont"; };
   };
-  mkpkg = name_: {version, file, sha256, description}:
-    stdenv.mkDerivation rec {
-      name = "${name_}-${version}";
 
-      src = fetchurl {
-        url = "http://users.teilar.gr/~g1951d/${file}";
-        inherit sha256;
-      };
+  mkpkg = name_: {version, file, sha256, description}: fetchzip rec {
+    name = "${name_}-${version}";
+    url = "http://users.teilar.gr/~g1951d/${file}";
+    postFetch = ''
+      mkdir -p $out/share/{fonts,doc}
+      unzip -j $downloadedFile \*.ttf                 -d $out/share/fonts/truetype
+      unzip -j $downloadedFile \*.docx \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true  # unpack docs if any
+      rmdir "$out/share/doc/${name}" $out/share/doc                               || true  # remove dirs if empty
+    '';
+    inherit sha256;
 
-      buildInputs = [ unzip ];
-
-      sourceRoot = ".";
-
-      installPhase = ''
-        mkdir -p $out/share/fonts/truetype
-        cp -v *.ttf $out/share/fonts/truetype/
-
-        mkdir -p "$out/doc/${name}"
-        cp -v *.docx *.pdf *.xlsx "$out/doc/${name}/"
-      '';
-
-      meta = {
-        inherit description;
-        # In lieu of a license:
-        # Fonts in this site are offered free for any use;
-        # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
-        license = stdenv.lib.licenses.free;
-        homepage = http://users.teilar.gr/~g1951d/;
-        platforms = stdenv.lib.platforms.unix;
-      };
+    meta = {
+      inherit description;
+      # In lieu of a license:
+      # Fonts in this site are offered free for any use;
+      # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
+      license = stdenv.lib.licenses.free;
+      homepage = http://users.teilar.gr/~g1951d/;
+      platforms = stdenv.lib.platforms.unix;
     };
-
+  };
 in
-lib.mapAttrs mkpkg fonts
+  lib.mapAttrs mkpkg fonts
diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix
index 0c9dfa40982..a0af38cfd24 100644
--- a/pkgs/data/fonts/go-font/default.nix
+++ b/pkgs/data/fonts/go-font/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "10hfm2cpxlx1ng7r2mbvykjhmy131qlgzpdzj7ibg9kr293bcjc0";
+
   meta = with stdenv.lib; {
     homepage = https://blog.golang.org/go-fonts;
     description = "The Go font family";
diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix
index a5f43d4169b..492d89a674c 100644
--- a/pkgs/data/fonts/gyre/default.nix
+++ b/pkgs/data/fonts/gyre/default.nix
@@ -1,24 +1,20 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
+let
   baseName = "gyre-fonts";
   version = "2.005";
+in fetchzip {
   name="${baseName}-${version}";
-  
-  src = fetchurl {
-    url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip";
-    sha256 = "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31";
-  };
 
-  buildInputs = [unzip];
+  url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip";
 
-  sourceRoot = ".";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp *.otf $out/share/fonts/truetype
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/truetype
   '';
 
+  sha256 = "17amdpahs6kn7hk3dqxpff1s095cg1caxzij3mxjbbxp8zy0l111";
+
   meta = {
     description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX";
     longDescription = ''
diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
index 689e1e054dc..f997f10db1d 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/pkgs/data/fonts/hack/default.nix
@@ -1,26 +1,21 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "hack-font-${version}";
+let
   version = "2.020";
+in fetchzip rec {
+  name = "hack-font-${version}";
 
-  src = let
-    version_ = with stdenv.lib;
-      concatStringsSep "_" (splitString "." version);
-  in fetchurl {
-    sha256 = "16kkmc3psckw1b7k07ccn1gi5ymhlg9djh43nqjzg065g6p6d184";
-    url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
-  };
+  url = let
+    version_ = with stdenv.lib; concatStringsSep "_" (splitString "." version);
+  in "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
 
-  sourceRoot = ".";
-
-  nativeBuildInputs = [ unzip ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/hack
-    cp *.ttf $out/share/fonts/hack
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack
   '';
 
+  sha256 = "0cpsglb9vnhmpsn496aqisfvmq3yxvjnj7c361dspy0fn6z8x60c";
+
   meta = with stdenv.lib; {
     description = "A typeface designed for source code";
     longDescription = ''
diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix
index 01be8afd7aa..27459b2d1f3 100644
--- a/pkgs/data/fonts/hanazono/default.nix
+++ b/pkgs/data/fonts/hanazono/default.nix
@@ -1,25 +1,20 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "hanazono-${version}";
+let
   version = "20141012";
+in fetchzip {
+  name = "hanazono-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-20141012.zip";
-    sha256 = "020jhqnzm9jvkmfvvyk1my26ncwxbnb9yc8v7am252jwrifji9q6";
-  };
+  url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-${version}.zip";
 
-  buildInputs = [ unzip ];
-
-  sourceRoot = ".";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/hanazono
-    cp *.ttf $out/share/fonts/hanazono
-    mkdir -p $out/share/doc/hanazono
-    cp *.txt $out/share/doc/hanazono
+  postFetch = ''
+    mkdir -p $out/share/fonts/hanazono $out/share/doc/hanazono
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hanazono
+    unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono
   '';
 
+  sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2";
+
   meta = with stdenv.lib; {
     description = "Free kanji font containing 96,327 characters";
     homepage = http://fonts.jp/hanazono/;
diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix
index 51d2b8b9c11..96af2e573a2 100644
--- a/pkgs/data/fonts/hasklig/default.nix
+++ b/pkgs/data/fonts/hasklig/default.nix
@@ -1,25 +1,20 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "hasklig-${version}";
+let
   version = "1.1";
+in fetchzip {
+  name = "hasklig-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip";
-    sha256 = "1hwmdbygallw2kjk0v3a3dl7w6b21wii3acrl0w3ibn05g1cxv4q";
-  };
+  url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip";
 
-  buildInputs = [ unzip ];
-
-  sourceRoot = ".";
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
+  postFetch = ''
+    unzip $downloadedFile
     mkdir -p $out/share/fonts/opentype
     cp *.otf $out/share/fonts/opentype
   '';
 
+  sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq";
+
   meta = with stdenv.lib; {
     homepage = https://github.com/i-tu/Hasklig;
     description = "A font with ligatures for Haskell code based off Source Code Pro";
diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
index 13e98462b21..a614017b809 100644
--- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
+++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
@@ -1,25 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "helvetica-neue-lt-std-${version}";
+let
   version = "2013.06.07"; # date of most recent file in distribution
+in fetchzip rec {
+  name = "helvetica-neue-lt-std-${version}";
 
-  src = fetchurl {
-    url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip";
-    sha256 = "0nrjdj2a11dr6d3aihvjxzrkdi0wq6f2bvaiimi5iwmpyz80n0h6";
-  };
+  url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip";
 
-  nativeBuildInputs = [ unzip ];
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  sourceRoot = "Helvetica Neue LT Std";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    cp -v *.otf $out/share/fonts/opentype
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile Helvetica\ Neue\ LT\ Std/\*.otf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "0ampp9vf9xw0sdppl4lb9i9h75ywljhdcqmzh45mx2x9m7h6xgg9";
+
   meta = {
     homepage = http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html;
     description = "Helvetica Neue LT Std font";
diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix
index caa67256a1f..13aeae80312 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,20 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "inconsolata-${version}";
+let
   version = "1.010";
+in fetchzip {
+  name = "inconsolata-${version}";
 
-  src = fetchurl {
-    url = "http://www.levien.com/type/myfonts/Inconsolata.otf";
-    sha256 = "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m";
-  };
+  url = "http://www.levien.com/type/myfonts/Inconsolata.otf";
 
-  phases = [ "installPhase" ];
+  postFetch = "install -Dm644 $downloadedFile $out/share/fonts/opentype/inconsolata.otf";
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    cp -v $src $out/share/fonts/opentype/inconsolata.otf
-  '';
+  sha256 = "1yyf7agabfv0ia57c7in0r33x7c8ay445zf7c3dfc83j6w85g3i7";
 
   meta = with stdenv.lib; {
     homepage = http://www.levien.com/type/myfonts/inconsolata.html;
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix
index 8cfda1a5e9c..5217b175ed2 100644
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/pkgs/data/fonts/input-fonts/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "input-fonts-${version}";
-  version = "2016-10-06"; # date of the download and checksum
+  version = "2017-08-10"; # date of the download and checksum
 
   src = requireFile {
     name = "Input-Font.zip";
     url = "http://input.fontbureau.com/download/";
-    sha256 = "06hrsrb5a6hzrgkkhk0gdj92rhgr433vgn4j5g3pd8f1ijlfqn4y";
+    sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
     cp -a *.txt "$out"/share/doc/
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0k7xqkgqldd110ch9s144ilh762q777qcjvg3plmrb9s6xiaqvvd";
+
   meta = with stdenv.lib; {
     description = "Fonts for Code, from Font Bureau";
     longDescrition = ''
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index a8b6c8853f3..8b1ddd0c753 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -1,20 +1,16 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "junicode-0.7.8";
 
-  src = fetchurl {
-    url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip;
-    sha256 = "1lgkhj52s351ya7lp9z3xba7kaivgdvg80njhpj1rpc3jcmc69vl";
-  };
+  url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip;
 
-  buildInputs = [ unzip ];
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/junicode-ttf
+  '';
 
-  installPhase =
-    ''
-      mkdir -p $out/share/fonts/junicode-ttf
-      cp fonts/*.ttf $out/share/fonts/junicode-ttf
-    '';
+  sha256 = "0q4si9pnbif36154sv49kzc7ygivgflv81nzmblpz3b2p77g9956";
 
   meta = {
     homepage = http://junicode.sourceforge.net/;
diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix
index 7b990327286..bfc76b69b65 100644
--- a/pkgs/data/fonts/kawkab-mono/default.nix
+++ b/pkgs/data/fonts/kawkab-mono/default.nix
@@ -1,21 +1,17 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "kawkab-mono-20151015";
 
-  src = fetchurl {
-    url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip";
-    sha256 = "16pv9s4q7199aacbzfi2d10rcrq77vyfvzcy42g80nhfrkz1cb0m";
-  };
+  url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip";
 
-  buildInputs = [ unzip ];
-  sourceRoot = ".";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
   '';
 
+  sha256 = "1vfrb7xs817najplncg7zl9j5yxj8qnwb7aqm2v9p9xwafa4d2yd";
+
   meta = {
     description = "An arab fixed-width font";
     homepage = http://makkuk.com/kawkab-mono/;
diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix
index ea2c15752d7..c24e6898129 100644
--- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix
+++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
 let version = "20030809";
 in
-stdenv.mkDerivation {
+fetchzip {
   name = "kochi-substitute-naga10-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2";
-    sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c";
-  };
+  url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2";
 
-  sourceRoot = "kochi-substitute-${version}";
-
-  installPhase = ''
+  postFetch = ''
+    tar -xjf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/truetype
     cp ./kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf
     cp ./kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf
   '';
 
+  sha256 = "1bjb5cr3wf3d5y7xj1ly2mkv4ndwvg615rb1ql6lsqc2icjxk7j9";
+
   meta = {
     description = "Japanese font, non-free replacement for MS Gothic and MS Mincho";
     longDescription = ''
diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix
index 6337387b376..f49d20e3ba7 100644
--- a/pkgs/data/fonts/kochi-substitute/default.nix
+++ b/pkgs/data/fonts/kochi-substitute/default.nix
@@ -28,6 +28,10 @@ stdenv.mkDerivation {
     cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "10hcrf51npc1w2jsz5aiw07dgw96vs4wmsz4ai9zyaswipvf8ddy";
+
   meta = {
     description = "Japanese font, a free replacement for MS Gothic and MS Mincho";
     longDescription = ''
diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix
index 8d1111090aa..91d85ce9a0d 100644
--- a/pkgs/data/fonts/lato/default.nix
+++ b/pkgs/data/fonts/lato/default.nix
@@ -1,22 +1,17 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "lato-2.0";
 
-  src = fetchurl {
-    url = http://www.latofonts.com/download/Lato2OFL.zip;
-    sha256 = "1f5540g0ja1nx3ddd3ywn77xc81ssrxpq8n3gyb9sabyq2b4xda2";
-  };
+  url = http://www.latofonts.com/download/Lato2OFL.zip;
 
-  sourceRoot = "Lato2OFL";
-
-  buildInputs = [ unzip ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/lato
-    cp *.ttf $out/share/fonts/lato
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato
   '';
 
+  sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5";
+
   meta = with stdenv.lib; {
     homepage = http://www.latofonts.com/;
 
diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix
index 8f6d5ec8ad6..82ceebae327 100644
--- a/pkgs/data/fonts/league-of-moveable-type/default.nix
+++ b/pkgs/data/fonts/league-of-moveable-type/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
     cp */share/fonts/opentype/*.otf $out/share/fonts/opentype
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1gy959qhhdwm1phbrkab9isi0dmxcy0yizzncb0k49w88mc13vd0";
+
   meta = {
     description = "Font Collection by The League of Moveable Type";
 
diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix
index 64779b5d388..18f236068a2 100644
--- a/pkgs/data/fonts/libre-baskerville/default.nix
+++ b/pkgs/data/fonts/libre-baskerville/default.nix
@@ -1,22 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "libre-baskerville-1.000";
 
-  src = fetchFromGitHub {
-    owner = "impallari";
-    repo = "Libre-Baskerville";
-    rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f";
-    sha256 = "0i9ra6ip81zzjxl71p8zwa6ymlmkf4yi5ny22vlwx9a53kbf4ifl";
-  };
+  url = https://github.com/impallari/Libre-Baskerville/archive/2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f.zip;
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/${name}
-    cp -v *.ttf $out/share/fonts/truetype/
-    cp -v README.md FONTLOG.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip    -j $downloadedFile \*.ttf                    -d $out/share/fonts/truetype
+    unzip -n -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
   '';
 
+  sha256 = "0arlq89b3vmpw3n4wbllsdvqblhz6p09dm19z1cndicmcgk26w2a";
+
   meta = with stdenv.lib; {
     description = "A webfont family optimized for body text";
     longDescription = ''
diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix
index 691d5556e8f..96f366973f0 100644
--- a/pkgs/data/fonts/libre-bodoni/default.nix
+++ b/pkgs/data/fonts/libre-bodoni/default.nix
@@ -1,22 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "libre-bodoni-2.000";
 
-  src = fetchFromGitHub {
-    owner = "impallari";
-    repo = "Libre-Bodoni";
-    rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d";
-    sha256 = "1ncfkvmcxh2lphfra43h8482qglpd965v96agvz092697xwrbyn9";
-  };
+  url = https://github.com/impallari/Libre-Bodoni/archive/995a40e8d6b95411d660cbc5bb3f726ffd080c7d.zip;
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
-    cp -v "fonts/v2000 - initial glyphs migration/OTF/"*.otf $out/share/fonts/opentype/
-    cp -v README.md FONTLOG.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*/v2000\ -\ initial\ glyphs\ migration/OTF/\*.otf  -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*README.md \*FONTLOG.txt                           -d "$out/share/doc/${name}"
   '';
 
+  sha256 = "0pnb1xydpvcl9mkz095f566kz7yj061wbf40rwrbwmk706f6bsiw";
+
   meta = with stdenv.lib; {
     description = "Bodoni fonts adapted for today's web requirements";
     longDescription = ''
diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix
index 5037cb81f39..ec932ab978c 100644
--- a/pkgs/data/fonts/libre-caslon/default.nix
+++ b/pkgs/data/fonts/libre-caslon/default.nix
@@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
     cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name}
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "05aajwny99yqzn1nnq1blx6h7rl54x056y12hyawfbigkzxhscns";
+
   meta = with stdenv.lib; {
     description = "Caslon fonts based on hand-lettered American Caslons of 1960s";
     homepage = http://www.impallari.com/librecaslon;
diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix
index 473102d77ef..9ca37e35640 100644
--- a/pkgs/data/fonts/libre-franklin/default.nix
+++ b/pkgs/data/fonts/libre-franklin/default.nix
@@ -1,22 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "libre-franklin-1.014";
 
-  src = fetchFromGitHub {
-    owner = "impallari";
-    repo = "Libre-Franklin";
-    rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3";
-    sha256 = "0df41cqhw5dz3g641n4nd2jlqjf5m4fkv067afk3759m4hg4l78r";
-  };
+  url = https://github.com/impallari/Libre-Franklin/archive/006293f34c47bd752fdcf91807510bc3f91a0bd3.zip;
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
-    cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/
-    cp -v README.md FONTLOG.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.otf                    -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
   '';
 
+  sha256 = "1rkjp8x62cn4alw3lp7m45q34bih81j2hg15kg5c1nciyqq1qz0z";
+
   meta = with stdenv.lib; {
     description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic.";
     homepage = https://github.com/impallari/Libre-Franklin;
diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix
index e694ba4db75..6876000d6e4 100644
--- a/pkgs/data/fonts/lmodern/default.nix
+++ b/pkgs/data/fonts/lmodern/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "lmodern-2.004.4";
-  
-  src = fetchurl {
-    url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz;
-    sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw";
-  };
 
-  installPhase = ''
+  url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz;
+
+  postFetch = ''
+    tar xzvf $downloadedFile
+
     mkdir -p $out/texmf-dist/
     mkdir -p $out/share/fonts/
 
-    cp -r ./* $out/texmf-dist/
-    cp -r fonts/{opentype,type1} $out/share/fonts/
+    cp -r lmodern-2.004.4/* $out/texmf-dist/
+    cp -r lmodern-2.004.4/fonts/{opentype,type1} $out/share/fonts/
 
-    ln -s $out/texmf* $out/share/
+    ln -s -r $out/texmf* $out/share/
   '';
 
+  sha256 = "13n7ls8ss4sffd6c1iw2wb5hbq642i0fmivm76mbqwf652l002i5";
+
   meta = {
     description = "Latin Modern font";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix
index 6e136c39eb0..c6e0788eed3 100644
--- a/pkgs/data/fonts/lmodern/lmmath.nix
+++ b/pkgs/data/fonts/lmodern/lmmath.nix
@@ -1,28 +1,24 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "lmmath-0.903";
-  
-  src = fetchurl {
-    url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf";
-    sha256 = "ee96cb14f5c746d6c6b9ecfbdf97dafc2f535be3dd277e15e8ea6fb594995d64";
-    name = "lmmath-0.903.zip";
-  };
 
-  buildInputs = [unzip];
+  url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf";
 
-  sourceRoot = ".";
+  postFetch = ''
+    unzip $downloadedFile
 
-  installPhase = ''
     mkdir -p $out/texmf-dist/fonts/opentype
     mkdir -p $out/share/fonts/opentype
 
     cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf
     cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf
 
-    ln -s $out/texmf* $out/share/
+    ln -s -r $out/texmf* $out/share/
   '';
 
+  sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln";
+
   meta = {
     description = "Latin Modern font";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix
index 84752fe6a1d..850fd1a1f94 100644
--- a/pkgs/data/fonts/lobster-two/default.nix
+++ b/pkgs/data/fonts/lobster-two/default.nix
@@ -65,6 +65,10 @@ in
       cp -v ${regular.file} $out/share/fonts/opentype/${regular.name}
     '';
 
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym";
+
     meta = with stdenv.lib; {
       homepage = http://www.impallari.com/lobstertwo;
       description = "Script font with many ligatures";
diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix
index 12c4f67666d..c847b4cdd27 100644
--- a/pkgs/data/fonts/lohit-fonts/default.nix
+++ b/pkgs/data/fonts/lohit-fonts/default.nix
@@ -1,58 +1,59 @@
-{ stdenv, fetchurl, lib }:
+{ stdenv, fetchzip, lib }:
 let
   fonts = {
-    assamese = { label = "Assamese"; version = "2.91.3" ; sha256 = "0kbdvi8f7vbvsain9zmnj9h43a6bmdkhk5c2wzg15100w7wf6lpq"; };
-    bengali = { label = "Bengali"; version = "2.91.3" ; sha256 = "1wdd2dkqaflf6nm5yc7llkfxin6g0zb2sbcd5g2xbrl0gwwcmkij"; };
-    devanagari = { label = "Devanagari script"; version = "2.95.2" ; sha256 = "1ss0j0pcfrg1vsypnm0042y4bn7b84mi6lbfsvr6rs89lb5swvn2"; };
-    gujarati = { label = "Gujarati"; version = "2.92.2-and-4.2.2" ; sha256 = "1i27yjhn3x31a89x1hjs6rskdwp2kh0hibq1xiz3rgqil2m0jar6"; };
-    gurmukhi = { label = "Gurmukhi script"; version = "2.91.0" ; sha256 = "0z8a30mnyhlfvqhnggfk0369hqg779ihqyhcmpxj0sf9dmb1i0mj"; }; # renamed from Punjabi
-    kannada = { label = "Kannada"; version = "2.5.3" ; sha256 = "1x9fb5z1bwmfi0y1fdnzizzjxhbxp272wxznx36063kjf25bb9pi"; };
-    malayalam = { label = "Malayalam"; version = "2.92.0" ; sha256 = "1syv1irxh5xl0z0d5kwankhlmi7s2dg4wpp58nq0mkd3rhm5q8qw"; };
-    marathi = { label = "Marathi"; version = "2.94.0" ; sha256 = "0y9sca6gbfbafv52v0n2r1xfs8rg6zmqs4vp9sjfc1c6yqhzagl4"; };
-    nepali = { label = "Nepali"; version = "2.94.0" ; sha256 = "0c56141rpxc30581i3gisg8kfaadxhqjhgshni6g7a7rn6l4dx17"; };
-    odia = { label = "Odia"; version = "2.91.0" ; sha256 = "15iz9kdf9k5m8wcn2iqlqjm758ac3hvnk93va6kac06frxnhw9lp"; }; # renamed from Oriya
-    tamil-classical = { label = "Classical Tamil"; version = "2.5.3" ; sha256 = "0ci4gk8qhhysjza69nncgmqmal8s4n8829icamvlzbmjdd4s2pij"; };
-    tamil = { label = "Tamil"; version = "2.91.1" ; sha256 = "1ir6kjl48apwk41xbpj0x458k108s7i61yzpkfhqcy1fkcr7cngj"; };
-    telugu = { label = "Telugu"; version = "2.5.4" ; sha256 = "06gdba7690y20l7nsi8fnnimim5hlq7hik0mpk2fzw4w39hjybk9"; };
+    assamese        = { label = "Assamese";          version = "2.91.5"; sha256 = "06cw416kgw0m6883n5ixmpniinsd747rdmacf06z83w1hqwj2js6"; };
+    bengali         = { label = "Bengali";           version = "2.91.5"; sha256 = "1j7gfmkzzyk9mivy09a9yfqxpidw52hw48dyh4qkci304mspcbvr"; };
+    devanagari      = { label = "Devanagari script"; version = "2.95.4"; sha256 = "1c17xirzx5rf7xpmkrm94jf9xrzckyagwnqn3pyag28lyj8x67m5"; };
+    gujarati        = { label = "Gujarati";          version = "2.92.4"; sha256 = "0xdgmkikz532zxj239wr73l24qnzxhra88f52146x7fsb7gpvfb1"; };
+    gurmukhi        = { label = "Gurmukhi script";   version = "2.91.2"; sha256 = "1xk1qvc0xwcmjcavj9zmy4bbphffdlv7sldmqlk30ch5fy5r0ypb"; }; # renamed from Punjabi
+    kannada         = { label = "Kannada";           version = "2.5.4" ; sha256 = "0sax56xg98p2nf0nsvba42hhz946cs7q0gidiz9zfpb6pbgwxdgg"; };
+    malayalam       = { label = "Malayalam";         version = "2.92.2"; sha256 = "18sca59fj9zvqhagbix35i4ld2n4mwv57q04pijl5gvpyfb1abs8"; };
+    marathi         = { label = "Marathi";           version = "2.94.2"; sha256 = "0cjjxxlhqmdmhr35s4ak0ma89456daik5rqrn6pdzj39098lmci7"; };
+    nepali          = { label = "Nepali";            version = "2.94.2"; sha256 = "1p7lif136xakfqkbv6p1lb56rs391b25vn4bxrjdfvsk0r0h0ry3"; };
+    odia            = { label = "Odia";              version = "2.91.2"; sha256 = "0z5rc4f9vfrfm8h2flzf5yx44x50jqdmmzifkmjwczib3hpg2ila"; }; # renamed from Oriya
+    tamil-classical = { label = "Classical Tamil";   version = "2.5.4" ; sha256 = "0svmj3dhk0195mhdwjhi3qgwa83223irb32fp12782sj9njdvyi2"; };
+    tamil           = { label = "Tamil";             version = "2.91.3"; sha256 = "0qyw9p8alyvjryyw8a25q3gfyrhby49mjb0ydgggf5ckd07kblcm"; };
+    telugu          = { label = "Telugu";            version = "2.5.5" ; sha256 = "07p41686ypmclj9d3njp01lvrgssqxa4s5hsbrqfjrnwd3rjspzr"; };
   };
   gplfonts = {
     # GPL fonts removed from later releases
-    kashmiri = { label = "Kashmiri"; version = "2.4.3" ; sha256 = "0ax8xzv4pz17jnsjdklawncsm2qn7176wbxykswygpzdd5lr0gg9"; };
-    konkani = { label = "Konkani"; version = "2.4.3" ; sha256 = "03zc27z26a60aaggrqx4d6l0jgggciq8p83v6vgg0k6l3apvcp45"; };
-    maithili = { label = "Maithili"; version = "2.4.3" ; sha256 = "0aqwnhq1namvvb77f2vssahixqf4xay7ja4q8qc312wxkajdqh4a"; };
-    sindhi = { label = "Sindhi"; version = "2.4.3" ; sha256 = "00imfbn01yc2g5zdyydks9w3ndkawr66l9qk2idlvw3yz3sw2kf1"; };
+    kashmiri        = { label = "Kashmiri";          version = "2.4.3" ; sha256 = "0c6whklad9bscymrlcbxj4fdvh4cdf40vb61ykbp6mapg6dqxwhn"; };
+    konkani         = { label = "Konkani";           version = "2.4.3" ; sha256 = "0pcb5089dabac1k6ymqnbnlyk7svy2wnb5glvhsd8glycjhrcp70"; };
+    maithili        = { label = "Maithili";          version = "2.4.3" ; sha256 = "1yfwv7pcj7k4jryz0s6mb56bq7fs15g56y7pi5yd89q1f8idk6bc"; };
+    sindhi          = { label = "Sindhi";            version = "2.4.3" ; sha256 = "1iywzyy185bvfsfi5pp11c8bzrp40kni2cpwcmxqwha7c9v8brlc"; };
   };
-  mkpkg = license: name: {label, version, sha256}:
-    stdenv.mkDerivation {
-      name = "lohit-${name}-${version}";
 
-      src = fetchurl {
-        url = "https://fedorahosted.org/releases/l/o/lohit/lohit-${name}-ttf-${version}.tar.gz";
-        inherit sha256;
-      };
+  mkpkg = license: name: {label, version, sha256}: fetchzip {
+    name = "lohit-${name}-${version}";
 
-      installPhase = ''
-        mkdir -p $out/share/fonts/truetype
-        cp -v *.ttf $out/share/fonts/truetype/
+    url = "https://releases.pagure.org/lohit/lohit-${name}-ttf-${version}.tar.gz";
 
-        mkdir -p $out/etc/fonts/conf.d
-        cp -v *.conf $out/etc/fonts/conf.d
+    postFetch = ''
+      tar -xzf $downloadedFile --strip-components=1
 
-        mkdir -p "$out/share/doc/lohit-${name}"
-        cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/"
-      '';
+      mkdir -p $out/share/fonts/truetype
+      cp -v *.ttf $out/share/fonts/truetype/
 
-      meta = {
-        inherit license;
-        description = "Free and open source fonts for Indian languages (" + label + ")";
-        homepage = https://fedorahosted.org/lohit/;
-        maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ];
-        # Set a non-zero priority to allow easy overriding of the
-        # fontconfig configuration files.
-        priority = 5;
-        platforms = stdenv.lib.platforms.unix;
-      };
+      mkdir -p $out/etc/fonts/conf.d
+      cp -v *.conf $out/etc/fonts/conf.d
+
+      mkdir -p "$out/share/doc/lohit-${name}"
+      cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/"
+    '';
+
+    inherit sha256;
+
+    meta = {
+      inherit license;
+      description = "Free and open source fonts for Indian languages (" + label + ")";
+      homepage = https://pagure.io/lohit;
+      maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ];
+      # Set a non-zero priority to allow easy overriding of the
+      # fontconfig configuration files.
+      priority = 5;
+      platforms = stdenv.lib.platforms.unix;
     };
+  };
 
 in
 # Technically, GPLv2 with usage exceptions
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix
index fe123f6622d..8a11a98ebd2 100644
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
     cp *.ttf $out/share/fonts/truetype
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1cppf8sk6r5wjnnas9n6iyag6pj9jvaic66lvwpqg3742s5akx6x";
+
   meta = {
     description = "A customized version of Apple’s Menlo-Regular font";
     homepage = https://github.com/andreberg/Meslo-Font/;
diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix
index d93c0fb96d4..cc481a136ba 100644
--- a/pkgs/data/fonts/mononoki/default.nix
+++ b/pkgs/data/fonts/mononoki/default.nix
@@ -1,22 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "mononoki-${version}";
+let
   version = "1.2";
+in fetchzip {
+  name = "mononoki-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip";
-    sha256 = "0n66bnn2i776fbky14qjijwsbrja9yzc1xfsmvz99znvcdvflafg";
-  };
+  url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip";
 
-  buildInputs = [ unzip ];
-  phases = [ "unpackPhase" ];
-
-  unpackPhase = ''
+  postFetch = ''
     mkdir -p $out/share/fonts/mononoki
-    unzip $src -d $out/share/fonts/mononoki
+    unzip -j $downloadedFile -d $out/share/fonts/mononoki
   '';
 
+  sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff";
+
   meta = with stdenv.lib; {
     homepage = https://github.com/madmalik/mononoki;
     description = "A font for programming and code review";
diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix
index 70fd2060ff1..7d7be9a41a6 100644
--- a/pkgs/data/fonts/montserrat/default.nix
+++ b/pkgs/data/fonts/montserrat/default.nix
@@ -2,22 +2,23 @@
 #
 # https://aur.archlinux.org/packages/ttf-montserrat/
 
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "montserrat-${version}";
+let
   version = "1.0";
+in fetchzip {
+  name = "montserrat-${version}";
 
-  src = fetchurl {
-    url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz";
-    sha256 = "12yn651kxi5fcbpdxhapg5fpri291mgcfc1kx7ymg53nrl11nj3x";
-  };
+  url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz";
 
-  installPhase = ''
+  postFetch = ''
+    tar -xzf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/montserrat
     cp *.ttf $out/share/fonts/montserrat
   '';
 
+  sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w";
+
   meta = with stdenv.lib; {
     description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)";
     homepage    = "http://www.fontspace.com/julieta-ulanovsky/montserrat";
diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix
index 49d857ec575..5729561c580 100644
--- a/pkgs/data/fonts/mph-2b-damase/default.nix
+++ b/pkgs/data/fonts/mph-2b-damase/default.nix
@@ -1,23 +1,16 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "MPH-2B-Damase";
 
-  src = fetchurl {
-    url = http://www.wazu.jp/downloads/damase_v.2.zip;
-    sha256 = "0y7rakbysjjrzcc5y100hkn64j7js434x20pyi6rllnw2w2n1y1h";
-  };
+  url = http://www.wazu.jp/downloads/damase_v.2.zip;
 
-  buildInputs = [unzip];
-
-  unpackPhase = ''
-    unzip $src;
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
   '';
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
-  '';
+  sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql";
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix
index 839d61206c2..b70166b7ec1 100644
--- a/pkgs/data/fonts/mplus-outline-fonts/default.nix
+++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "mplus-${version}";
+let
   version = "062";
+in fetchzip rec {
+  name = "mplus-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
-    sha256 = "1f44vmnma5njhfiz351gwblxmdh9njv486864zrxqaa1h5pvdhha";
-  };
+  url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
+  postFetch = ''
+    tar -xJf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
   '';
 
+  sha256 = "0zm1snq5r584rz90yv5lndsqgchdaxq2185vrk7849ch4k5vd23z";
+
   meta = with stdenv.lib; {
     description = "M+ Outline Fonts";
     homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html;
diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix
index d75dcda6421..054c2ca91f6 100644
--- a/pkgs/data/fonts/nafees/default.nix
+++ b/pkgs/data/fonts/nafees/default.nix
@@ -38,6 +38,10 @@ stdenv.mkDerivation rec {
     # cp $riqa/*.ttf $out/share/fonts/truetype
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1wa0j65iz20ij37dazd1rjg8x625m6q1y8g5h7ia48pbc88sr01q";
+
   meta = {
     description = "OpenType Urdu font from the Center for Research in Urdu Language Processing";
     longDescription = ''
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index 409dcce024b..4b725cbf5f8 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
     ./install.sh ${withFont}
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0bxna3llj6kf1rndvkw8w81blmgwy9l8kricynlf0l3mdd6li1f4";
+
   meta = with stdenv.lib; {
     description = ''
       Nerd Fonts is a project that attempts to patch as many developer targeted
diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix
index 9bd38409955..35d69aa7f07 100644
--- a/pkgs/data/fonts/norwester/default.nix
+++ b/pkgs/data/fonts/norwester/default.nix
@@ -1,24 +1,20 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  pname = "norwester";
+let
   version = "1.2";
+  pname = "norwester";
+in fetchzip rec {
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://jamiewilson.io/norwester/assets/norwester.zip";
-    sha256 = "0syg8ss7mpli4cbxvh3ld7qrlbhb2dfv3wchm765iw6ndc05g92d";
-  };
+  url = "http://jamiewilson.io/norwester/assets/norwester.zip";
 
-  phases = [ "installPhase" ];
-
-  buildInputs = [ unzip ];
-
-  installPhase = ''
+  postFetch = ''
     mkdir -p $out/share/fonts/opentype
-    unzip -D -j $src ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/
+    unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/
   '';
 
+  sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r";
+
   meta = with stdenv.lib; {
     homepage = http://jamiewilson.io/norwester;
     description = "A condensed geometric sans serif by Jamie Wilson";
diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix
index 411af37932a..4e55b5098c8 100644
--- a/pkgs/data/fonts/oldsindhi/default.nix
+++ b/pkgs/data/fonts/oldsindhi/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, fetchurl, p7zip }:
+{ stdenv, fetchzip, p7zip }:
 
-stdenv.mkDerivation rec {
-  name = "oldsindhi-${version}";
+let
   version = "0.1";
+in fetchzip rec {
+  name = "oldsindhi-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z";
-    sha256 = "1sbmxyxi81k88hkfw7gnnpgd5vy2vyj5y5428cd6nz4zlaclgq8z";
-  };
+  url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z";
 
-  buildInputs = [ p7zip ];
+  postFetch = ''
+    ${p7zip}/bin/7z x $downloadedFile
 
-  unpackCmd = "7z x $curSrc";
-
-  installPhase = ''
     mkdir -p $out/share/fonts/truetype
     mkdir -p $out/share/doc/${name}
-    cp -v *.ttf $out/share/fonts/truetype/
-    cp -v README *.txt $out/share/doc/${name}
+    cp -v OldSindhi/*.ttf $out/share/fonts/truetype/
+    cp -v OldSindhi/README OldSindhi/*.txt $out/share/doc/${name}
   '';
 
+  sha256 = "1na3lxyz008fji5ln3fqzyr562k6kch1y824byhfs4y0rwwz3f3q";
+
   meta = with stdenv.lib; {
     homepage = https://github.com/MihailJP/oldsindhi;
     description = "Free Sindhi Khudabadi font";
diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix
index 125a4b636a9..95f8f3be7d6 100644
--- a/pkgs/data/fonts/oldstandard/default.nix
+++ b/pkgs/data/fonts/oldstandard/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
     cp -v FONTLOG.txt $out/share/doc/${name}
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n";
+
   meta = with stdenv.lib; {
     homepage = https://github.com/akryukov/oldstand;
     description = "An attempt to revive a specific type of Modern style of serif typefaces";
diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix
index 5d9bb584360..1320ad8438f 100644
--- a/pkgs/data/fonts/open-dyslexic/default.nix
+++ b/pkgs/data/fonts/open-dyslexic/default.nix
@@ -1,25 +1,20 @@
-{stdenv, fetchgit}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "open-dyslexic-${version}";
+let
   version = "2014-11-11";
+in fetchzip {
+  name = "open-dyslexic-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/antijingoist/open-dyslexic.git";
-    rev = "f4b5ba89018b44d633608907e15f93fb3fabbabc";
-    sha256 = "04pa7c2cary6pqxsmxqrg7wi19szg7xh8panmvqvmc7jas0mzg6q";
-  };
+  url = https://github.com/antijingoist/open-dyslexic/archive/f4b5ba89018b44d633608907e15f93fb3fabbabc.zip;
 
-  phases = ["unpackPhase" "installPhase"];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    cp -v 'otf/'*.otf $out/share/fonts/opentype
-
-    mkdir -p $out/share/doc/open-dyslexic
-    cp -v README.md $out/share/doc/open-dyslexic
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.otf       -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic
   '';
 
+  sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2";
+
   meta = with stdenv.lib; {
     homepage = http://opendyslexic.org/;
     description = "Font created to increase readability for readers with dyslexia";
diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix
index fa34d9586c5..e0ef1ecda81 100644
--- a/pkgs/data/fonts/orbitron/default.nix
+++ b/pkgs/data/fonts/orbitron/default.nix
@@ -1,26 +1,22 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "orbitron-${version}";
+let
   version = "20110526";
+in fetchzip {
+  name = "orbitron-${version}";
 
-  src = fetchFromGitHub {
-    owner  = "theleagueof";
-    repo   = "orbitron";
-    rev    = "13e6a52";
-    sha256 = "1c6jb7ayr07j1pbnzf3jxng9x9bbqp3zydf8mqdw9ifln1b4ycyf";
-  };
+  url = https://github.com/theleagueof/orbitron/archive/13e6a52.zip;
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
+  postFetch = ''
     otfdir=$out/share/fonts/opentype/orbitron
     ttfdir=$out/share/fonts/ttf/orbitron
     mkdir -p $otfdir $ttfdir
-    cp -v Orbitron*.otf $otfdir
-    cp -v Orbitron*.ttf $ttfdir
+    unzip -j $downloadedFile \*/Orbitron\*.otf -d $otfdir
+    unzip -j $downloadedFile \*/Orbitron\*.ttf -d $ttfdir
   '';
 
+  sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv";
+
   meta = with stdenv.lib; {
     homepage = https://www.theleagueofmoveabletype.com/orbitron;
     downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download";
diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix
index e24d61d5ba1..8bb4e82747a 100644
--- a/pkgs/data/fonts/overpass/default.nix
+++ b/pkgs/data/fonts/overpass/default.nix
@@ -1,27 +1,19 @@
-{ stdenv, fetchFromGitHub, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "overpass-${version}";
+let
   version = "3.0.2";
+in fetchzip rec {
+  name = "overpass-${version}";
 
-  src = fetchFromGitHub {
-    owner = "RedHatBrand";
-    repo = "Overpass";
-    rev = version;
-    sha256 = "1bgmnhdfmp4rycyadcnzw62vkvn63nn29pq9vbjf4c9picvl8ah6";
-  };
+  url = "https://github.com/RedHatBrand/Overpass/archive/${version}.zip";
 
-  nativeBuildInputs = [ unzip ];
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/doc/${name}
-    mkdir -p $out/share/fonts/opentype
-    cp -v "desktop-fonts/"*"/"*.otf $out/share/fonts/opentype
-    cp -v LICENSE.md README.md $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/fonts/opentype ; unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+    mkdir -p $out/share/doc/${name}    ; unzip -j $downloadedFile \*.md  -d $out/share/doc/${name}
   '';
 
+  sha256 = "05zv3zcfc9a707sn3hhf46b126k19d9byzvi5ixp5y2548vjvl6s";
+
   meta = with stdenv.lib; {
     homepage = http://overpassfont.org/;
     description = "Font heavily inspired by Highway Gothic";
diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix
index 1054986288a..109b3c3a0b3 100644
--- a/pkgs/data/fonts/oxygenfonts/default.nix
+++ b/pkgs/data/fonts/oxygenfonts/default.nix
@@ -1,23 +1,17 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "oxygenfonts-20160824";
 
-  src = fetchFromGitHub {
-    owner = "vernnobile";
-    repo = "oxygenFont";
-    rev = "62db0ebe3488c936406685485071a54e3d18473b";
-    sha256 = "134kx3d0g3zdkw8kl8p6j37fzw3bl163jv2dx4dk1451f3ramcnh";
-  };
+  url = https://github.com/vernnobile/oxygenFont/archive/62db0ebe3488c936406685485071a54e3d18473b.zip;
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype/
-    cp OxygenSans-version-0.4/*/*.ttf $out/share/fonts/truetype/
-    cp Oxygen-Monospace/*.ttf $out/share/fonts/truetype/
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile '*/Oxygen-Sans.ttf' '*/Oxygen-Sans-Bold.ttf' '*/OxygenMono-Regular.ttf' -d $out/share/fonts/truetype
   '';
 
+  sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf";
+
   meta = with stdenv.lib; {
     description = "Desktop/gui font for integrated use with the KDE desktop";
     longDescription = ''
diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix
index 1a9cf29c3e0..6124d0c79b6 100644
--- a/pkgs/data/fonts/paratype-pt/mono.nix
+++ b/pkgs/data/fonts/paratype-pt/mono.nix
@@ -1,30 +1,23 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "paratype-pt-mono";
 
-  src = fetchurl rec {
-    url = "http://www.paratype.ru/uni/public/PTMono.zip";
-    sha256 = "1wqaai7d6xh552vvr5svch07kjn1q89ab5jimi2z0sbd0rbi86vl";
-  };
+  url = "http://www.paratype.ru/uni/public/PTMono.zip";
 
-  buildInputs = [unzip];
-
-  phases = "unpackPhase installPhase";
-  sourceRoot = ".";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/paratype
-    cp *.ttf $out/share/fonts/truetype
-    cp *.txt $out/share/doc/paratype
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype
   '';
 
+  sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm";
+
   meta = with stdenv.lib; {
     homepage = http://www.paratype.ru/public/; 
     description = "An open Paratype font";
 
-    license = "Open Paratype license"; 
+    license = "Open Paratype license";
     # no commercial distribution of the font on its own
     # must rename on modification
     # http://www.paratype.ru/public/pt_openlicense.asp
diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix
index 89d9e9381e7..499871a4228 100644
--- a/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/pkgs/data/fonts/paratype-pt/sans.nix
@@ -1,30 +1,23 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "paratype-pt-sans";
 
-  src = fetchurl rec {
-    url = "http://www.paratype.ru/uni/public/PTSans.zip";
-    sha256 = "1j9gkbqyhxx8pih5agr9nl8vbpsfr9vdqmhx73ji3isahqm3bhv5";
-  };
+  url = "http://www.paratype.ru/uni/public/PTSans.zip";
 
-  buildInputs = [unzip];
-
-  phases = "unpackPhase installPhase";
-  sourceRoot = ".";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/paratype
-    cp *.ttf $out/share/fonts/truetype
-    cp *.txt $out/share/doc/paratype
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype
   '';
 
+  sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0";
+
   meta = with stdenv.lib; {
     homepage = http://www.paratype.ru/public/; 
     description = "An open Paratype font";
 
-    license = "Open Paratype license"; 
+    license = "Open Paratype license";
     # no commercial distribution of the font on its own
     # must rename on modification
     # http://www.paratype.ru/public/pt_openlicense.asp
diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix
index 323e10c8b7b..409aaf526f8 100644
--- a/pkgs/data/fonts/paratype-pt/serif.nix
+++ b/pkgs/data/fonts/paratype-pt/serif.nix
@@ -1,30 +1,23 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "paratype-pt-serif";
 
-  src = fetchurl rec {
-    url = "http://www.paratype.ru/uni/public/PTSerif.zip";
-    sha256 = "0x3l58c1rvwmh83bmmgqwwbw9av1mvvq68sw2hdkyyihjvamyvvs";
-  };
+  url = "http://www.paratype.ru/uni/public/PTSerif.zip";
 
-  buildInputs = [unzip];
-
-  phases = "unpackPhase installPhase";
-  sourceRoot = ".";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/paratype
-    cp *.ttf $out/share/fonts/truetype
-    cp *.txt $out/share/doc/paratype
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype
   '';
 
+  sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d";
+
   meta = with stdenv.lib; {
     homepage = http://www.paratype.ru/public/; 
     description = "An open Paratype font";
 
-    license = "Open Paratype license"; 
+    license = "Open Paratype license";
     # no commercial distribution of the font on its own
     # must rename on modification
     # http://www.paratype.ru/public/pt_openlicense.asp
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index 7650c13961e..b57cf22569d 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -1,21 +1,20 @@
-{stdenv, fetchurl}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "pecita-${version}";
+let
   version = "5.4";
+in fetchzip rec {
+  name = "pecita-${version}";
 
-  src = fetchurl {
-    url = "http://archive.rycee.net/pecita/${name}.tar.xz";
-    sha256 = "1cqzj558ldzzsbfbvlwp5fjh2gxa03l16dki0n8z5lmrdq8hrkws";
-  };
+  url = "http://archive.rycee.net/pecita/${name}.tar.xz";
 
-  phases = ["unpackPhase" "installPhase"];
-
-  installPhase = ''
+  postFetch = ''
+    tar xJvf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/opentype
     cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf
   '';
 
+  sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm";
+
   meta = with stdenv.lib; {
     homepage = http://pecita.eu/police-en.php;
     description = "Handwritten font with connected glyphs";
diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix
index 7298dbb18ce..b27290707b6 100644
--- a/pkgs/data/fonts/poly/default.nix
+++ b/pkgs/data/fonts/poly/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
     cp ${italic} $out/share/fonts/opentype/Poly-Italic.otf
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "11d7ldryfxi0wzfrg1bhw23a668a44vdb8gggxryvahmp5ahmq2h";
+
   meta = {
     description = "Medium contrast serif font";
     longDescription = ''
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 3140be6d035..9f42324e6d6 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -1,34 +1,29 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip}:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "powerline-fonts-2017-05-25";
 
-  src = fetchFromGitHub {
-    owner = "powerline";
-    repo = "fonts";
-    rev = "fe396ef6f6b9b315f30af7d7229ff21f67a66e12";
-    sha256 = "1l72kf0zqdp52hbnphky5cl0a1p9fghldvq7ppbnnrhmcwvavprs";
-  };
+  url = https://github.com/powerline/fonts/archive/fe396ef6f6b9b315f30af7d7229ff21f67a66e12.zip;
 
-  dontBuild = true;
-
-  installPhase = ''
+  postFetch = ''
     mkdir -p $out/share/fonts/opentype
-    cp -v */*.otf $out/share/fonts/opentype
+    unzip -j $downloadedFile '*.otf' -d $out/share/fonts/opentype
 
     mkdir -p $out/share/fonts/truetype
-    cp -v */*.ttf $out/share/fonts/truetype
+    unzip -j $downloadedFile '*.ttf' -d $out/share/fonts/truetype
 
     mkdir -p $out/share/fonts/bdf
-    cp -v */BDF/*.bdf $out/share/fonts/bdf
+    unzip -j $downloadedFile '*/BDF/*.bdf' -d $out/share/fonts/bdf
 
     mkdir -p $out/share/fonts/pcf
-    cp -v */PCF/*.pcf.gz $out/share/fonts/pcf
+    unzip -j $downloadedFile '*/PCF/*.pcf.gz' -d $out/share/fonts/pcf
 
     mkdir -p $out/share/fonts/psf
-    cp -v */PSF/*.psf.gz $out/share/fonts/psf
+    unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf
   '';
 
+  sha256 = "07yjbwri7nnnnynps86sz0dlivwqw7gfw045v63q969nab9dw388";
+
   meta = with stdenv.lib; {
     homepage = https://github.com/powerline/fonts;
     description = "Patched fonts for Powerline users";
diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix
index 98227605ac8..0c6eede969f 100644
--- a/pkgs/data/fonts/profont/default.nix
+++ b/pkgs/data/fonts/profont/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "profont";
 
-  src = fetchurl {
-    url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
-    sha256 = "19ww5iayxzxxgixa9hgb842xd970mwghxfz2vsicp8wfwjh6pawr";
-  };
+  url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
 
-  buildInputs = [ unzip ];
+  postFetch = ''
+    unzip -j $downloadedFile
 
-  phases = [ "unpackPhase" "installPhase" ];
-  installPhase =
-    ''
-      mkdir -p $out/share/doc/$name $out/share/fonts/misc
+    mkdir -p $out/share/doc/$name $out/share/fonts/misc
 
-      cp LICENSE $out/share/doc/$name/LICENSE
+    cp LICENSE $out/share/doc/$name/LICENSE
 
-      for f in *.pcf; do
-        gzip -c "$f" > $out/share/fonts/misc/"$f".gz
-      done
-    '';
+    for f in *.pcf; do
+      gzip -c "$f" > $out/share/fonts/misc/"$f".gz
+    done
+  '';
+
+  sha256 = "1calqmvrfv068w61f614la8mg8szas6m5i9s0lsmwjhb4qwjyxbw";
 
   meta = with stdenv.lib; {
     homepage = http://tobiasjung.name;
diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix
index 116fdd25a04..34c8a74a762 100644
--- a/pkgs/data/fonts/quattrocento-sans/default.nix
+++ b/pkgs/data/fonts/quattrocento-sans/default.nix
@@ -1,26 +1,20 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "quattrocento-sans-${version}";
+let
   version = "2.0";
+in fetchzip rec {
+  name = "quattrocento-sans-${version}";
 
-  src = fetchurl {
-    url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
-    sha256 = "043jfdn18dgzpx3qb3s0hc541n6xv4gacsm4srd6f0pri45g4wh1";
-  };
+  url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
 
-  buildInputs = [unzip];
-  phases = ["unpackPhase" "installPhase"];
-
-  sourceRoot = "quattrocento-sans-v${version}";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
-    cp -v "src/"*.otf $out/share/fonts/opentype
-    cp -v FONTLOG.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{fonts,doc}
+    unzip -j $downloadedFile '*/QuattrocentoSans*.otf' -d $out/share/fonts/opentype
+    unzip -j $downloadedFile '*/FONTLOG.txt'           -d $out/share/doc/${name}
   '';
 
+  sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343";
+
   meta = with stdenv.lib; {
     homepage = http://www.impallari.com/quattrocentosans/;
     description = "A classic, elegant and sober sans-serif typeface";
diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix
index 7ef62d2300c..a78001bb4ae 100644
--- a/pkgs/data/fonts/quattrocento/default.nix
+++ b/pkgs/data/fonts/quattrocento/default.nix
@@ -1,24 +1,20 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "quattrocento-${version}";
+let
   version = "1.1";
+in fetchzip rec {
+  name = "quattrocento-${version}";
 
-  src = fetchurl {
-    url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
-    sha256 = "09wmbfwkry1r2cf5z4yy67wd4yzlnsjigg01r5r80z1phl0axn9n";
-  };
+  url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
 
-  buildInputs = [unzip];
-  phases = ["unpackPhase" "installPhase"];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
-    cp -v "src/"*.otf $out/share/fonts/opentype
-    cp -v FONTLOG.txt $out/share/doc/${name}
+  postFetch = ''
+    mkdir -p $out/share/{fonts,doc}
+    unzip -j $downloadedFile \*.otf        -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*FONTLOG.txt -d $out/share/doc/${name}
   '';
 
+  sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0";
+
   meta = with stdenv.lib; {
     homepage = http://www.impallari.com/quattrocento/;
     description = "A classic, elegant, sober and strong serif typeface";
diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix
index e754135755a..2ba9069d48b 100644
--- a/pkgs/data/fonts/raleway/default.nix
+++ b/pkgs/data/fonts/raleway/default.nix
@@ -1,23 +1,20 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "raleway-${version}";
+let
   version = "2016-08-30";
+in fetchzip {
+  name = "raleway-${version}";
 
-  src = fetchFromGitHub {
-    owner = "impallari";
-    repo = "Raleway";
-    rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a";
-    sha256 = "1i6a14ynm29gqjr7kfk118v69vjpd3g4ylwfvhwa66xax09jkhlr";
-  };
-  dontBuild = true;
+  url = https://github.com/impallari/Raleway/archive/fa27f47b087fc093c6ae11cfdeb3999ac602929a.zip;
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    cp "$src/fonts/OTF v3.000 Fontlab"/*.otf $out/share/fonts/opentype
-    find -type f -maxdepth 1 -exec cp "{}" $out/ \;
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*-Original.otf  -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*.txt \*.md     -d $out
   '';
 
+  sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60";
+
   meta = {
     description = "Raleway is an elegant sans-serif typeface family";
 
@@ -35,7 +32,7 @@ stdenv.mkDerivation rec {
       It also has a sister display family, Raleway Dots.
     '';
 
-    homepage = src.meta.homepage;
+    homepage = https://github.com/impallari/Raleway;
     license = stdenv.lib.licenses.ofl;
 
     maintainers = with stdenv.lib.maintainers; [ profpatsch ];
diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix
index e9eff414bc1..175acb22d7b 100644
--- a/pkgs/data/fonts/roboto-mono/default.nix
+++ b/pkgs/data/fonts/roboto-mono/default.nix
@@ -63,6 +63,10 @@ stdenv.mkDerivation rec {
     cp -a *.ttf $out/share/fonts/truetype/
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1rd3qql779dn9nl940hf988lvv4gfy5llgrlfqq0db0c22b2yfng";
+
   meta = {
     homepage = https://www.google.com/fonts/specimen/Roboto+Mono;
     description = "Google Roboto Mono fonts";
diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix
index 5a8a3f3c120..c5ce13ad7ae 100644
--- a/pkgs/data/fonts/roboto-slab/default.nix
+++ b/pkgs/data/fonts/roboto-slab/default.nix
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
     cp -a *.ttf $out/share/fonts/truetype/
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0imhvisjzi0rvn32hn04kngca4szx0j39h4c4zs7ryb4wdca76q9";
+
   meta = {
     homepage = https://www.google.com/fonts/specimen/Roboto+Slab;
     description = "Google Roboto Slab fonts";
diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/data/fonts/sampradaya/default.nix
index 57639d8e6ab..90b32f251ef 100644
--- a/pkgs/data/fonts/sampradaya/default.nix
+++ b/pkgs/data/fonts/sampradaya/default.nix
@@ -1,10 +1,13 @@
-{ lib, runCommand, fetchurl }:
+{ lib, fetchzip }:
 
-runCommand "sampradaya-2015-05-26" {
-  src = fetchurl {
-    url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf";
-    sha256 = "0110k1yh5kz3f04wp72bfz59pxjc7p6jv7m5p0rqn1kqbf7g3pck";
-  };
+fetchzip {
+  name = "sampradaya-2015-05-26";
+
+  url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf";
+
+  postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/Sampradaya.ttf";
+
+  sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv";
 
   meta = with lib; {
     homepage = https://bitbucket.org/OorNaattaan/sampradaya/;
@@ -14,7 +17,3 @@ runCommand "sampradaya-2015-05-26" {
     platforms = platforms.all;
   };
 }
-''
-  mkdir -p $out/share/fonts/truetype
-  cp $src $out/share/fonts/truetype/Sampradaya.ttf
-''
diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix
index 942a284e2c0..034c36a63ce 100644
--- a/pkgs/data/fonts/shrikhand/default.nix
+++ b/pkgs/data/fonts/shrikhand/default.nix
@@ -1,19 +1,15 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+let
   version = "2016-03-03";
+in fetchzip {
   name = "shrikhand-${version}";
 
-  src = fetchFromGitHub {
-    owner = "jonpinhorn";
-    repo = "shrikhand";
-    rev = "c11c9b0720fba977fad7cb4f339ebacdba1d1394";
-    sha256 = "1d21bvj4w8i0zrmkdrgbn0rpzac89iazfids1x273gsrsvvi45kk";
-  };
+  url = https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf;
 
-  installPhase = ''
-    install -D -m644 build/Shrikhand-Regular.ttf $out/share/fonts/truetype/Shrikhand-Regular.ttf
-  '';
+  postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf";
+
+  sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs";
 
   meta = with stdenv.lib; {
     homepage = https://jonpinhorn.github.io/shrikhand/;
diff --git a/pkgs/data/fonts/signwriting/default.nix b/pkgs/data/fonts/signwriting/default.nix
index 147f4edc519..883e43b4381 100644
--- a/pkgs/data/fonts/signwriting/default.nix
+++ b/pkgs/data/fonts/signwriting/default.nix
@@ -13,6 +13,10 @@ runCommand "signwriting-1.1.4" {
     sha256 = "0am5wbf7jdy9szxkbsc5f3959cxvbj7mr0hy1ziqmkz02c6xjw2m";
   };
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0cn37s3lc7gbr8036l7ia2869qmxglkmgllh3r9q5j54g3sfjc7q";
+
   meta = with lib; {
     homepage = https://github.com/Slevinski/signwriting_2010_fonts;
     description = "Typeface for written sign languages";
diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix
index 382f3fa8f0f..b695143fa59 100644
--- a/pkgs/data/fonts/siji/default.nix
+++ b/pkgs/data/fonts/siji/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "siji-${date}";
+let
   date = "2016-05-13";
+in fetchzip {
+  name = "siji-${date}";
 
-  src = fetchFromGitHub {
-    owner = "stark";
-    repo = "siji";
-    rev = "95369afac3e661cb6d3329ade5219992c88688c1";
-    sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
-  };
+  url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip;
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/pcf
-    cp -v */*.pcf $out/share/fonts/pcf
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.pcf -d $out/share/fonts/pcf
   '';
 
+  sha256 = "1799hs7zd8w7qyja4mii9ggmrm786az7ldsqwx9mbi51b56ym640";
+
   meta = {
     homepage = https://github.com/stark/siji;
     description = "An iconic bitmap font based on Stlarch with additional glyphs";
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index 8679a8fd8ce..08c330809e8 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -1,24 +1,19 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "source-code-pro-${version}";
+let
   version = "2.030";
+in fetchzip {
+  name = "source-code-pro-${version}";
 
-  src = fetchFromGitHub {
-    owner = "adobe-fonts";
-    repo = "source-code-pro";
-    rev = "2.030R-ro/1.050R-it";
-    name = "2.030R-ro-1.050R-it";
-    sha256 = "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n";
-  };
+  url = https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip;
 
-  phases = "unpackPhase installPhase";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \;
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "0d8qwzjgnz264wlm4qim048z3236z4hbblvc6yplw13f6b65j6fv";
+
   meta = {
     description = "A set of monospaced OpenType fonts designed for coding environments";
     maintainers = with stdenv.lib.maintainers; [ relrod ];
diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix
index 240f0ff5d29..dc0d3175851 100644
--- a/pkgs/data/fonts/source-han-sans/default.nix
+++ b/pkgs/data/fonts/source-han-sans/default.nix
@@ -1,26 +1,20 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
 let
-  makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec {
+  makePackage = {variant, language, region, sha256}: let
     version = "1.004R";
-    name = "source-han-sans-${variant}-${version}";
     revision = "5f5311e71cb628321cc0cffb51fb38d862b726aa";
+  in fetchzip {
+    name = "source-han-sans-${variant}-${version}";
 
-    buildInputs = [ unzip ];
+    url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip";
 
-    src = fetchurl {
-      url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip";
-      inherit sha256;
-    };
-
-    setSourceRoot = ''
-      sourceRoot=$( echo SourceHanSans* )
+    postFetch = ''
+      mkdir -p $out/share/fonts
+      unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
     '';
 
-    installPhase = ''
-      mkdir -p $out/share/fonts/opentype
-      cp $( find . -name '*.otf' ) $out/share/fonts/opentype
-    '';
+    inherit sha256;
 
     meta = {
       description = "${language} subset of an open source Pan-CJK sans-serif typeface";
@@ -36,24 +30,24 @@ in
     variant = "japanese";
     language = "Japanese";
     region = "JP";
-    sha256 = "0m1zprwqnqp3za42firg53hyzir6p0q73fl8mh5j4px3zgivlvfw";
+    sha256 = "194zapswaqly8ycx3k66vznlapvpyhdigp3sabsl4hn87j9xsc5v";
   };
   korean = makePackage {
     variant = "korean";
     language = "Korean";
     region = "KR";
-    sha256 = "1bz6n2sd842vgnqky0i7a3j3i2ixhzzkkbx1m8plk04r1z41bz9q";
+    sha256 = "0xij6mciiqgpwv1agqily2jji377x084k7fj4rpv6z0r5vvhqr08";
   };
   simplified-chinese = makePackage {
     variant = "simplified-chinese";
     language = "Simplified Chinese";
     region = "CN";
-    sha256 = "0ksafcwmnpj3yxkgn8qkqkpw10ivl0nj9n2lsi9c6fw3aa71s3ha";
+    sha256 = "038av18d45qr85bgx95j2fm8j64d72nsm9xzg0lpwr9xwni2sbx0";
   };
   traditional-chinese = makePackage {
     variant = "traditional-chinese";
     language = "Traditional Chinese";
     region = "TW";
-    sha256 = "1l4zymd5n4nl9gmja707xq6bar88dxki2mwdixdfrkf544cidflj";
+    sha256 = "1mzcv5hksyxplyv5q3w5nr1xz73hdnvip5gicz35j0by4gc739lr";
   };
 }
diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix
index 148f5a4538f..ac85d31d331 100644
--- a/pkgs/data/fonts/source-han-serif/default.nix
+++ b/pkgs/data/fonts/source-han-serif/default.nix
@@ -1,27 +1,21 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
 let
-  makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec {
+  makePackage = {variant, language, region, sha256}: let
     version = "1.000R";
-    name = "source-han-serif-${variant}-${version}";
     revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76";
+  in fetchzip {
+    name = "source-han-serif-${variant}-${version}";
 
-    buildInputs = [ unzip ];
+    url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip";
 
-    src = fetchurl {
-      url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip";
-      inherit sha256;
-    };
-
-    setSourceRoot = ''
-      sourceRoot=$( echo SourceHanSerif* )
-    '';
-
-    installPhase = ''
+    postFetch = ''
       mkdir -p $out/share/fonts/opentype
-      cp $( find . -name '*.otf' ) $out/share/fonts/opentype
+      unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
     '';
 
+    inherit sha256;
+
     meta = {
       description = "${language} subset of an open source Pan-CJK serif typeface";
       homepage = https://github.com/adobe-fonts/source-han-sans;
@@ -36,24 +30,24 @@ in
     variant = "japanese";
     language = "Japanese";
     region = "JP";
-    sha256 = "0488zxr6jpwinzayrznc4ciy8mqcq9afx80xnp37pl9gcxsv0jp7";
+    sha256 = "0cklcy6y3r7pg8z43fzd8zl5g46bkqa1iy0li49rm0fgdaw7kin2";
   };
   korean = makePackage {
     variant = "korean";
     language = "Korean";
     region = "KR";
-    sha256 = "1kwsqrb3s52nminq65n3la540dgvahnhvgwv5h168nrmz881ni9r";
+    sha256 = "0lxrr978djsych8fmbl57n1c9c7ihl61w0b9q4plw27vd6p41fza";
   };
   simplified-chinese = makePackage {
     variant = "simplified-chinese";
     language = "Simplified Chinese";
     region = "CN";
-    sha256 = "0y6js0hjgf1i8mf7kzklcl02qg0bi7j8n7j1l4awmkij1ix2yc43";
+    sha256 = "0k3x4kncjnbipf4i3lkk6b33zpf1ckp5648z51v48q47l3zqpm6p";
   };
   traditional-chinese = makePackage {
     variant = "traditional-chinese";
     language = "Traditional Chinese";
     region = "TW";
-    sha256 = "0q52dn0vh3pqpr9gn4r4qk99lkvhf2gl12y99n9423brrqyfbi6h";
+    sha256 = "00bi66nlkrargmmf4av24qfd716py7a9smcvr4xnll7fffldxv06";
   };
 }
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index 83b6a3f2d57..4ae9ceac01d 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "source-sans-pro-2.010";
-  src = fetchurl {
-    url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz";
-    sha256 = "1s3rgia6x9fxc2pvlwm203grqkb49px6q0xnh8kbqxqsgna615p2";
-  };
 
-  phases = "unpackPhase installPhase";
+  url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.zip";
 
-  installPhase = ''
+  postFetch = ''
     mkdir -p $out/share/fonts/opentype
-    find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \;
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2";
+
   meta = with stdenv.lib; {
     homepage = http://sourceforge.net/adobe/sourcesans;
     description = "A set of OpenType fonts designed by Adobe for UIs";
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix
index 0ccb0299a36..d627d813daa 100644
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ b/pkgs/data/fonts/source-serif-pro/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "source-serif-pro-${version}";
+let
   version = "1.017";
+in fetchzip {
+  name = "source-serif-pro-${version}";
 
-  src = fetchurl rec {
-    url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.tar.gz";
-    sha256 = "04h24iywjl4fd08x22ypdb3sm979wjfq4wk95r3rk8w376spakrg";
-  };
+  url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.zip";
 
-  phases = "unpackPhase installPhase";
-
-  installPhase = ''
+  postFetch = ''
     mkdir -p $out/share/fonts/opentype
-    find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \;
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1";
+
   meta = with stdenv.lib; {
     homepage = http://sourceforge.net/adobe/sourceserifpro;
     description = "A set of OpenType fonts to complement Source Sans Pro";
diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix
index f32d865c95c..1ae85da3f7f 100644
--- a/pkgs/data/fonts/stix-otf/default.nix
+++ b/pkgs/data/fonts/stix-otf/default.nix
@@ -1,25 +1,19 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
-  name = "stix-otf-${version}";
+let
   version = "1.1.1";
+in fetchzip rec {
+  name = "stix-otf-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip";
-    sha256 = "1q35wbqn3nh78pdban9z37lh090c6p49q3d00zzxm0axxz66xy4q";
-  };
+  url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip";
 
-  buildInputs = [unzip];
-
-  phases = ["unpackPhase" "installPhase"];
-
-  sourceRoot = "Fonts/STIX-Word";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    cp *.otf $out/share/fonts/opentype
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw";
+
   meta = with stdenv.lib; {
     homepage = http://www.stixfonts.org/;
     description = "Fonts for Scientific and Technical Information eXchange";
diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix
index d4ec083a070..f535c0d7e7b 100644
--- a/pkgs/data/fonts/stix-two/default.nix
+++ b/pkgs/data/fonts/stix-two/default.nix
@@ -1,23 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "stix-two-${version}";
+let
   version = "2.0.0";
+in fetchzip {
+  name = "stix-two-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip";
-    sha256 = "0f6rcg0p2dhnks523nywgkjk56bjajz3gnwsrap932674xxjkb3g";
-  };
+  url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip";
 
-  buildInputs = [ unzip ];
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/opentype
-    cp -v "Fonts/OTF/"*.otf $out/share/fonts/opentype
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
+  sha256 = "19i30d2xjk52bjj7xva1hnlyh58yd5phas1njcc8ldcz87a1lhql";
+
   meta = with stdenv.lib; {
     homepage = http://www.stixfonts.org/;
     description = "Fonts for Scientific and Technical Information eXchange";
diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix
index 0b9a63f2cb3..7778c4a98b8 100644
--- a/pkgs/data/fonts/tai-languages/default.nix
+++ b/pkgs/data/fonts/tai-languages/default.nix
@@ -1,11 +1,14 @@
-{ lib, runCommand, fetchurl }:
+{ lib, fetchzip }:
 
 {
-tai-ahom = runCommand "tai-ahom-2015-07-06" {
-  src = fetchurl {
-    url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true";
-    sha256 = "0zpjsylm29qc3jdv5kv0689pcirai46j7xjp5dppi0fmzxaxqnsk";
-  };
+tai-ahom = fetchzip {
+  name = "tai-ahom-2015-07-06";
+
+  url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true";
+
+  postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/AhomUnicode.ttf";
+
+  sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q";
 
   meta = with lib; {
     homepage = https://github.com/enabling-languages/tai-languages;
@@ -14,11 +17,7 @@ tai-ahom = runCommand "tai-ahom-2015-07-06" {
     license = licenses.ofl; # See font metadata
     platforms = platforms.all;
   };
-}
-''
-  mkdir -p $out/share/fonts/truetype
-  cp $src $out/share/fonts/truetype/AhomUnicode.ttf
-'';
+};
 
 # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai)
 
diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix
index c934bdb70e3..d0e7b89888c 100644
--- a/pkgs/data/fonts/tempora-lgc/default.nix
+++ b/pkgs/data/fonts/tempora-lgc/default.nix
@@ -30,6 +30,10 @@ stdenv.mkDerivation {
     mkdir -p "$out/share/fonts/opentype/public"
     cp ${toString srcs} "$out/share/fonts/opentype/public"
   '';
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1kwj31cjgdirqvh6bxs4fnvvr1ppaz6z8w40kvhkivgs69jglmzw";
+
   meta = {
     description = ''Tempora font'';
     license = stdenv.lib.licenses.gpl2 ;
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix
index 01959f91195..8750dfbd52d 100644
--- a/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/pkgs/data/fonts/terminus-font-ttf/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "terminus-font-ttf-${version}";
+let
   version = "4.40.1";
+in fetchzip rec {
+  name = "terminus-font-ttf-${version}";
 
-  src = fetchurl {
-    url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
-    sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188";
-  };
+  url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
 
-  nativeBuildInputs = [ unzip ];
+  postFetch = ''
+    unzip -j $downloadedFile
 
-  installPhase = ''
     for i in *.ttf; do
       local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')"
       install -Dm 644 "$i" "$out/share/fonts/truetype/$destname"
@@ -20,6 +18,8 @@ stdenv.mkDerivation rec {
     install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING"
   '';
 
+  sha256 = "0cfkpgixdz47y94s9j26pm7n4hvad23vb2q4315kgahl4294zcpg";
+
   meta = with stdenv.lib; {
     description = "A clean fixed width TTF font";
     longDescription = ''
diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix
index c385c3d40a9..2dbe7e720d2 100644
--- a/pkgs/data/fonts/theano/default.nix
+++ b/pkgs/data/fonts/theano/default.nix
@@ -1,24 +1,21 @@
 { stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "theano-${version}";
+let
   version = "2.0";
+in fetchzip rec {
+  name = "theano-${version}";
 
-  src = fetchzip {
-    stripRoot = false;
-    url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip";
-    sha256 = "1z3c63rcp4vfjyfv8xwc3br10ydwjyac3ipbl09y01s7qhfz02gp";
-  };
+  url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip";
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
+  postFetch = ''
     mkdir -p $out/share/fonts/opentype
     mkdir -p $out/share/doc/${name}
-    find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \;
-    find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \;
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}"
   '';
 
+  sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8";
+
   meta = with stdenv.lib; {
     homepage = https://github.com/akryukov/theano;
     description = "An old-style font designed from historic samples";
diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix
index 45d88901ea7..1a4954e6ce4 100644
--- a/pkgs/data/fonts/tipa/default.nix
+++ b/pkgs/data/fonts/tipa/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "tipa-1.3";
-  
+
   src = fetchurl {
     url = "mirror://debian/pool/main/t/tipa/tipa_1.3.orig.tar.gz";
     sha256 = "1q1sisxdcd2zd9b7mnagr2mxf9v3n1r4s5892zx5ly4r0niyya9m";
@@ -13,9 +13,13 @@ stdenv.mkDerivation {
     mkdir -p "$PREFIX" "$out/share"
     make install PREFIX="$PREFIX"
 
-    ln -s $out/texmf* $out/share/
+    ln -s -r $out/texmf* $out/share/
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1g2cclykr6ax584rlcri8w2h385n624sgfx2fm45r0cwkg1p77h2";
+
   meta = {
     description = "Phonetic font for TeX";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index 0ab7657cc6f..a4d479ea33c 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
@@ -1,21 +1,19 @@
-{stdenv, fetchurl}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "ttf-bitstream-vera-1.10";
 
-  src = fetchurl {
-    url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
-    sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv";
-  };
+  url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
 
-  dontBuild = true;
-
-  installPhase = ''
+  postFetch = ''
+    tar -xjf $downloadedFile --strip-components=1
     fontDir=$out/share/fonts/truetype
     mkdir -p $fontDir
     cp *.ttf $fontDir
   '';
 
+  sha256 = "179hal4yi3367jg8rsvqx6h2w4s0kn9zzrv8c47sslyg28g39s4m";
+
   meta = {
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix
index 8db10d7f582..2c58f197f18 100644
--- a/pkgs/data/fonts/ttf-envy-code-r/default.nix
+++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
+
 let
   pname = "ttf-envy-code-r";
   version = "PR7";
-in
-stdenv.mkDerivation rec {
+in fetchzip {
   name = "${pname}-0.${version}";
 
-  src = fetchurl {
-    url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip";
-    sha256 = "9f7e9703aaf21110b4e1a54d954d57d4092727546348598a5a8e8101e4597aff";
-  };
+  url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip";
 
-  buildInputs = [unzip];
-
-  installPhase = ''
-    for f in *.ttf; do
-        install -Dm 644 "$f" "$out/share/fonts/truetype/$f"
-    done
-    install -Dm 644 Read\ Me.txt "$out/share/doc/${pname}/readme.txt"
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.txt -d "$out/share/doc/${pname}"
   '';
 
+  sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z";
+
   meta = with stdenv.lib; {
     homepage = http://damieng.com/blog/tag/envy-code-r;
     description = "Free scalable coding font by DamienG";
diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix
index 7f7b53526e5..8a3fd2d6035 100644
--- a/pkgs/data/fonts/unifont_upper/default.nix
+++ b/pkgs/data/fonts/unifont_upper/default.nix
@@ -1,21 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "unifont_upper-${version}";
+let
   version = "9.0.03";
+in fetchzip rec {
+  name = "unifont_upper-${version}";
 
-  ttf = fetchurl {
-    url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf";
-    sha256 = "015v39y6nnyz4ld006349jzk9isyaqp4cnvmz005ylfnicl4zwhi";
-  };
+  url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf";
 
-  phases = "installPhase";
+  postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
 
-  installPhase =
-    ''
-      mkdir -p $out/share/fonts/truetype
-      cp -v ${ttf} $out/share/fonts/truetype/unifont_upper.ttf
-    '';
+  sha256 = "0anja3wrdjw0czqqk6wpf9yrkp0b11hb98wzmrpyij9gfgrspd71";
 
   meta = with stdenv.lib; {
     description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";

From fecca868c3790071b6b4bb3f0ef00df076b60a82 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 11 Aug 2017 15:04:02 +0200
Subject: [PATCH 1888/3246] jenkins: 2.71 -> 2.73

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

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 8f545df2d8b..b0bc4f4a62c 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.71";
+  version = "2.73";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "0b3mxbcv7afj8ksr2y33rvprj7003679j545igf5dsal82i7swhl";
+    sha256 = "1q9q2vjza3slmbh6sbxak1y3ryvisphlh92nidsp88rv60zn3nv8";
   };
 
   buildCommand = ''

From 6fdf8b3f778fa7c16040d3d7f3bed408fb7bffd0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 11 Aug 2017 17:32:23 +0200
Subject: [PATCH 1889/3246] nginxMainline: 1.13.3 -> 1.13.4

---
 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 ced0fd0976f..64d0a9b7952 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.13.3";
-  sha256 = "0whdpgfb1y9r7f3y91r4m0wpgrwwdl2byahp9a7gn0n30j0gjwsv";
+  version = "1.13.4";
+  sha256 = "1fpvy6738h951qks7wn6kdqwyprfsxirlxfq549n2p56kg2g68fy";
 })

From 9f7f85a3cdff9658c3deeb7291242bddcc2e28f7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 11 Aug 2017 17:37:14 +0200
Subject: [PATCH 1890/3246] nixos/tests/nginx: fix name

---
 nixos/tests/nginx.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index c2beb5590ef..7f7bc0f0b4f 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -3,7 +3,7 @@
 #      generated virtual hosts config.
 
 import ./make-test.nix ({ pkgs, ...} : {
-  name = "jenkins";
+  name = "nginx";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ mbbx6spp ];
   };

From c6e200ea7c8eb71463d239285236e2a429fd06cd Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 10 Aug 2017 19:43:49 +0000
Subject: [PATCH 1891/3246] data/fonts: simpler cleanups (group 2)

---
 pkgs/data/fonts/clearlyU/default.nix     | 4 ++++
 pkgs/data/fonts/dina-pcf/default.nix     | 6 +++++-
 pkgs/data/fonts/dosemu-fonts/default.nix | 6 +++++-
 pkgs/data/fonts/envypn-font/default.nix  | 4 ++++
 pkgs/data/fonts/gohufont/default.nix     | 4 ++++
 pkgs/data/fonts/proggyfonts/default.nix  | 6 +++++-
 pkgs/data/fonts/tewi/default.nix         | 6 +++++-
 pkgs/data/fonts/ucs-fonts/default.nix    | 4 ++++
 pkgs/data/fonts/uni-vga/default.nix      | 4 ++++
 pkgs/data/fonts/unifont/default.nix      | 4 ++++
 10 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix
index 9334468d76c..1e4df0c9221 100644
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation {
       mkfontdir 
       mkfontscale
     '';
+  
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "127zrg65s90ksj99kr9hxny40rbxvpai62mf5nqk853hcd1bzpr6";
 
   meta = {
     description = "A Unicode font";
diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix
index d08887a5cde..b94004b24bb 100644
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ b/pkgs/data/fonts/dina-pcf/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     for i in Dina_r700-*.bdf; do
         bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i
     done
-    gzip *.pcf
+    gzip -n *.pcf
 
     fontDir="$out/share/fonts/misc"
     mkdir -p "$fontDir"
@@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
 
   preferLocalBuild = true;
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0v0qn5zwq4j1yx53ypg6w6mqx6dk8l1xix0188b0k4z3ivgnflyb";
+
   meta = with stdenv.lib; {
     description = "A monospace bitmap font aimed at programmers";
     longDescription = ''
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix
index 84c57fc7e8f..f564507c777 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     for i in */etc/*.bdf; do
       fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz"
       echo -n "Installing font $fontOut..." >&2
-      ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 > "$fontOut"
+      ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 -n > "$fontOut"
       echo " done." >&2
     done
     cp */etc/dosemu.alias "$fontPath/fonts.alias"
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
     ${mkfontscale}/bin/mkfontscale
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1miqv0ral5vazx721wildjlzvji5r7pbgm39c0cpj5ywafaikxr8";
+
   meta = {
     description = "Various fonts from the DOSEmu project";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix
index 203b68f5e5d..40880d022db 100644
--- a/pkgs/data/fonts/envypn-font/default.nix
+++ b/pkgs/data/fonts/envypn-font/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
     mkfontscale
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "04sjxfrlvjc2f0679cy4w366mpzbn3fp6gnrjb8vy12vjd1ffnc1";
+
   meta = with stdenv.lib; {
     description = ''
       Readable bitmap font inspired by Envy Code R
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index 2bd0d5800b4..f4043697e7b 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -50,6 +50,10 @@ stdenv.mkDerivation rec {
     mkfontscale
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0msl5y9q6hjbhc85v121x1b1rhsh2rbqqy4k234i5mpp8l3087r7";
+
   meta = with stdenv.lib; {
     description = ''
       A monospace bitmap font well suited for programming and terminal use
diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix
index 9a4cfb3093b..9637a6c85b0 100644
--- a/pkgs/data/fonts/proggyfonts/default.nix
+++ b/pkgs/data/fonts/proggyfonts/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "proggyfonts-0.1";
 
   src = fetchurl {
-    url = "http://kaictl.net/software/${name}.tar.gz";
+    url = "http://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz";
     sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n";
   };
 
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
       done
     '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "06jsf3rw6q4l1jrw1161h4vxa1xbvpry5x12d8sh5g7hjk88p77g";
+
   meta = with stdenv.lib; {
     homepage = http://upperbounds.net;
     description = "A set of fixed-width screen fonts that are designed for code listings";
diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix
index 2b2a71bf7b4..78d94462654 100644
--- a/pkgs/data/fonts/tewi/default.nix
+++ b/pkgs/data/fonts/tewi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
         bdftopcf -o ''${i/bdf/pcf} $i
     done
 
-    gzip *.pcf
+    gzip -n *.pcf
   '';
 
   installPhase = ''
@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
     mkfontscale
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "14dv3m1svahjyb9c1x1570qrmlnynzg0g36b10bqqs8xvhix34yq";
+
   meta = with stdenv.lib; {
     description = "A nice bitmap font, readable even at small sizes";
     longDescription = ''
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index b9af7fad165..75ab2f40b6f 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
     mkfontscale
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk";
+
   meta = with stdenv.lib; {
     description = "Unicode bitmap fonts";
     maintainers = [ maintainers.raskin ];
diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix
index 63f74bb41b4..ce18893ced7 100644
--- a/pkgs/data/fonts/uni-vga/default.nix
+++ b/pkgs/data/fonts/uni-vga/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation {
     mkfontscale
   '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  sha256 = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7";
+
   meta = {
     description = "Unicode VGA font";
     maintainers = [stdenv.lib.maintainers.ftrvxmtrx];
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index bd99d20480b..4d9f3fc7104 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
       mkfontscale
     '';
 
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1s7gpxxj760aw3rpk760s3w8qdkn819rs7si1qj4grm3s6hb2gd8";
+
   meta = with stdenv.lib; {
     description = "Unicode font for Base Multilingual Plane";
     homepage = http://unifoundry.com/unifont.html;

From f2d420e4c982a102fc40c8b412180a3a102a4a54 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 11 Aug 2017 12:09:42 -0400
Subject: [PATCH 1892/3246] linux: 4.9.41 -> 4.9.42

---
 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 fb7440a04ae..597d87c63fb 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.41";
+  version = "4.9.42";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "11y6q0mmi3z6pg4h0prv67pr1a78rvrzw75ygg6720dz0jzvnnmd";
+    sha256 = "0ivq75vksd8rca881zyfimb6n43clr93gbgkd9w8p4qcj797f18a";
   };
 
   kernelPatches = args.kernelPatches;

From 47d9b48e4d7d4e9cdb027c38c3dc7977bd4f6f40 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 11 Aug 2017 12:14:53 -0400
Subject: [PATCH 1893/3246] linux: 4.12.5 -> 4.12.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index 97072a2ce74..1cbba85b7ba 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.5";
+  version = "4.12.6";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1833ibdb13dbg5xmf500bxkin8ng4yav3l5qvfilj0v4ygjlhlbi";
+    sha256 = "0ywkzqjl9rq672nwn74cw2d871hpzxkrlyx40lkkp4z1y440ijh1";
   };
 
   kernelPatches = args.kernelPatches;

From 6f9d84fe6494b9849d20cfa15f7eb1d42d034ea6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 8 Aug 2017 18:11:46 +0000
Subject: [PATCH 1894/3246] coqPackages.interval: fix URL

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

diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index e07c7c80ac0..c3169970ad2 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "coq${coq.coq-version}-interval-3.1.1";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/36342/interval-3.1.1.tar.gz;
-    sha256 = "0jzkb0xykiz9bfaminy9yd88b5w0gxcpw506yaaqmnmb43gdksyf";
+    url = https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz;
+    sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3";
   };
 
   nativeBuildInputs = [ which ];

From 0eb9c5bd42ea4dc1c7efdd2d718aa0c5c24622d3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 19:08:02 +0200
Subject: [PATCH 1895/3246] linux_3_10: remove

Support ends in Oct 2017
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 18 ------------------
 pkgs/top-level/all-packages.nix              | 16 ----------------
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.10.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
deleted file mode 100644
index 9587ba356ff..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "3.10.105";
-  extraMeta.branch = "3.10";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1739mikbyfx1zfmra16lnprca3pcvcplqss4x1jzdqmvkh9cqnqw";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd97b2152fc..0adf513cab3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12071,21 +12071,6 @@ with pkgs;
     ];
   };
 
-  linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix {
-    kernelPatches = with kernelPatches;
-      [ bridge_stp_helper
-        p9_fixes
-        lguest_entry-linkage
-        packet_fix_race_condition_CVE_2016_8655
-        DCCP_double_free_vulnerability_CVE-2017-6074
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -12314,7 +12299,6 @@ with pkgs;
   linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead;
   linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
-  linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12);

From 9f3f575ab3eb4cd6b5f8de20e6f1a5374fedef2c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 19:09:58 +0200
Subject: [PATCH 1896/3246] linux_4_4: remove

Support ends in Feb 2018
---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 18 ------------------
 pkgs/top-level/all-packages.nix             | 14 --------------
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.4.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
deleted file mode 100644
index 16699dcdf43..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.4.80";
-  extraMeta.branch = "4.4";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hs07k49sbpi8yw2mdwn1967i82x4wn6kg0lbjvv5l1pv3alky1l";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0adf513cab3..f06493f5741 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12071,19 +12071,6 @@ with pkgs;
     ];
   };
 
-  linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        kernelPatches.p9_fixes
-        kernelPatches.cpu-cgroup-v2."4.4"
-      ]
-      ++ 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
@@ -12299,7 +12286,6 @@ with pkgs;
   linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead;
   linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
-  linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12);
   # Don't forget to update linuxPackages_latest!

From 05b8cae9ec88156f46d9b98424643b6208664222 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 19:11:48 +0200
Subject: [PATCH 1897/3246] linux: remove unused kernel patches

---
 .../kernel/cpu-cgroup-v2-patches/4.4.patch    |  407 ------
 .../linux/kernel/crc-regression.patch         |   24 -
 .../kernel/multithreaded-rsapubkey-asn1.patch |   45 -
 pkgs/os-specific/linux/kernel/no-xsave.patch  |   85 --
 pkgs/os-specific/linux/kernel/patches.nix     |   72 -
 pkgs/os-specific/linux/kernel/perf.diff       |   18 -
 pkgs/os-specific/linux/kernel/perf.nix        |    1 -
 .../linux/kernel/ubuntu-fan-4.4.patch         | 1240 -----------------
 .../ubuntu-unprivileged-overlayfs.patch       |   69 -
 9 files changed, 1961 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/crc-regression.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/no-xsave.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/perf.diff
 delete mode 100644 pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch

diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
deleted file mode 100644
index 8f2418c9efc..00000000000
--- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
+++ /dev/null
@@ -1,407 +0,0 @@
-commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b
-Author: Tejun Heo <tj@kernel.org>
-Date:   Fri Mar 11 07:31:23 2016 -0500
-
-    sched: Misc preps for cgroup unified hierarchy interface
-    
-    Make the following changes in preparation for the cpu controller
-    interface implementation for the unified hierarchy.  This patch
-    doesn't cause any functional differences.
-    
-    * s/cpu_stats_show()/cpu_cfs_stats_show()/
-    
-    * s/cpu_files/cpu_legacy_files/
-    
-    * Separate out cpuacct_stats_read() from cpuacct_stats_show().  While
-      at it, remove pointless cpuacct_stat_desc[] array.
-    
-    Signed-off-by: Tejun Heo <tj@kernel.org>
-    Cc: Ingo Molnar <mingo@redhat.com>
-    Cc: Peter Zijlstra <peterz@infradead.org>
-    Cc: Li Zefan <lizefan@huawei.com>
-    Cc: Johannes Weiner <hannes@cmpxchg.org>
-
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 732e993..77f3ddd 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -8512,7 +8512,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota)
- 	return ret;
- }
- 
--static int cpu_stats_show(struct seq_file *sf, void *v)
-+static int cpu_cfs_stats_show(struct seq_file *sf, void *v)
- {
- 	struct task_group *tg = css_tg(seq_css(sf));
- 	struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
-@@ -8552,7 +8552,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css,
- }
- #endif /* CONFIG_RT_GROUP_SCHED */
- 
--static struct cftype cpu_files[] = {
-+static struct cftype cpu_legacy_files[] = {
- #ifdef CONFIG_FAIR_GROUP_SCHED
- 	{
- 		.name = "shares",
-@@ -8573,7 +8573,7 @@ static struct cftype cpu_files[] = {
- 	},
- 	{
- 		.name = "stat",
--		.seq_show = cpu_stats_show,
-+		.seq_show = cpu_cfs_stats_show,
- 	},
- #endif
- #ifdef CONFIG_RT_GROUP_SCHED
-@@ -8599,7 +8599,7 @@ struct cgroup_subsys cpu_cgrp_subsys = {
- 	.fork		= cpu_cgroup_fork,
- 	.can_attach	= cpu_cgroup_can_attach,
- 	.attach		= cpu_cgroup_attach,
--	.legacy_cftypes	= cpu_files,
-+	.legacy_cftypes	= cpu_legacy_files,
- 	.early_init	= 1,
- };
- 
-diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
-index dd7cbb5..42b2dd5 100644
---- a/kernel/sched/cpuacct.c
-+++ b/kernel/sched/cpuacct.c
-@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V)
- 	return 0;
- }
- 
--static const char * const cpuacct_stat_desc[] = {
--	[CPUACCT_STAT_USER] = "user",
--	[CPUACCT_STAT_SYSTEM] = "system",
--};
--
--static int cpuacct_stats_show(struct seq_file *sf, void *v)
-+static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp)
- {
--	struct cpuacct *ca = css_ca(seq_css(sf));
- 	int cpu;
--	s64 val = 0;
- 
-+	*userp = 0;
- 	for_each_online_cpu(cpu) {
- 		struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu);
--		val += kcpustat->cpustat[CPUTIME_USER];
--		val += kcpustat->cpustat[CPUTIME_NICE];
-+		*userp += kcpustat->cpustat[CPUTIME_USER];
-+		*userp += kcpustat->cpustat[CPUTIME_NICE];
- 	}
--	val = cputime64_to_clock_t(val);
--	seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val);
- 
--	val = 0;
-+	*sysp = 0;
- 	for_each_online_cpu(cpu) {
- 		struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu);
--		val += kcpustat->cpustat[CPUTIME_SYSTEM];
--		val += kcpustat->cpustat[CPUTIME_IRQ];
--		val += kcpustat->cpustat[CPUTIME_SOFTIRQ];
-+		*sysp += kcpustat->cpustat[CPUTIME_SYSTEM];
-+		*sysp += kcpustat->cpustat[CPUTIME_IRQ];
-+		*sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ];
- 	}
-+}
- 
--	val = cputime64_to_clock_t(val);
--	seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val);
-+static int cpuacct_stats_show(struct seq_file *sf, void *v)
-+{
-+	cputime64_t user, sys;
- 
-+	cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys);
-+	seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user));
-+	seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys));
- 	return 0;
- }
- 
-
-commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97
-Author: Tejun Heo <tj@kernel.org>
-Date:   Fri Mar 11 07:31:23 2016 -0500
-
-    sched: Implement interface for cgroup unified hierarchy
-    
-    While the cpu controller doesn't have any functional problems, there
-    are a couple interface issues which can be addressed in the v2
-    interface.
-    
-    * cpuacct being a separate controller.  This separation is artificial
-      and rather pointless as demonstrated by most use cases co-mounting
-      the two controllers.  It also forces certain information to be
-      accounted twice.
-    
-    * Use of different time units.  Writable control knobs use
-      microseconds, some stat fields use nanoseconds while other cpuacct
-      stat fields use centiseconds.
-    
-    * Control knobs which can't be used in the root cgroup still show up
-      in the root.
-    
-    * Control knob names and semantics aren't consistent with other
-      controllers.
-    
-    This patchset implements cpu controller's interface on the unified
-    hierarchy which adheres to the controller file conventions described
-    in Documentation/cgroups/unified-hierarchy.txt.  Overall, the
-    following changes are made.
-    
-    * cpuacct is implictly enabled and disabled by cpu and its information
-      is reported through "cpu.stat" which now uses microseconds for all
-      time durations.  All time duration fields now have "_usec" appended
-      to them for clarity.  While this doesn't solve the double accounting
-      immediately, once majority of users switch to v2, cpu can directly
-      account and report the relevant stats and cpuacct can be disabled on
-      the unified hierarchy.
-    
-      Note that cpuacct.usage_percpu is currently not included in
-      "cpu.stat".  If this information is actually called for, it can be
-      added later.
-    
-    * "cpu.shares" is replaced with "cpu.weight" and operates on the
-      standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000).
-      The weight is scaled to scheduler weight so that 100 maps to 1024
-      and the ratio relationship is preserved - if weight is W and its
-      scaled value is S, W / 100 == S / 1024.  While the mapped range is a
-      bit smaller than the orignal scheduler weight range, the dead zones
-      on both sides are relatively small and covers wider range than the
-      nice value mappings.  This file doesn't make sense in the root
-      cgroup and isn't create on root.
-    
-    * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max"
-      which contains both quota and period.
-    
-    * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by
-      "cpu.rt.max" which contains both runtime and period.
-    
-    v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for
-        CFS bandwidth stats and also using raw division for u64.  Use
-        CONFIG_CFS_BANDWITH and do_div() instead.
-    
-        The semantics of "cpu.rt.max" is not fully decided yet.  Dropped
-        for now.
-    
-    Signed-off-by: Tejun Heo <tj@kernel.org>
-    Cc: Ingo Molnar <mingo@redhat.com>
-    Cc: Peter Zijlstra <peterz@infradead.org>
-    Cc: Li Zefan <lizefan@huawei.com>
-    Cc: Johannes Weiner <hannes@cmpxchg.org>
-
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 77f3ddd..7aafe63 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -8591,6 +8591,139 @@ static struct cftype cpu_legacy_files[] = {
- 	{ }	/* terminate */
- };
- 
-+static int cpu_stats_show(struct seq_file *sf, void *v)
-+{
-+	cpuacct_cpu_stats_show(sf);
-+
-+#ifdef CONFIG_CFS_BANDWIDTH
-+	{
-+		struct task_group *tg = css_tg(seq_css(sf));
-+		struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
-+		u64 throttled_usec;
-+
-+		throttled_usec = cfs_b->throttled_time;
-+		do_div(throttled_usec, NSEC_PER_USEC);
-+
-+		seq_printf(sf, "nr_periods %d\n"
-+			   "nr_throttled %d\n"
-+			   "throttled_usec %llu\n",
-+			   cfs_b->nr_periods, cfs_b->nr_throttled,
-+			   throttled_usec);
-+	}
-+#endif
-+	return 0;
-+}
-+
-+#ifdef CONFIG_FAIR_GROUP_SCHED
-+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css,
-+			       struct cftype *cft)
-+{
-+	struct task_group *tg = css_tg(css);
-+	u64 weight = scale_load_down(tg->shares);
-+
-+	return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024);
-+}
-+
-+static int cpu_weight_write_u64(struct cgroup_subsys_state *css,
-+				struct cftype *cftype, u64 weight)
-+{
-+	/*
-+	 * cgroup weight knobs should use the common MIN, DFL and MAX
-+	 * values which are 1, 100 and 10000 respectively.  While it loses
-+	 * a bit of range on both ends, it maps pretty well onto the shares
-+	 * value used by scheduler and the round-trip conversions preserve
-+	 * the original value over the entire range.
-+	 */
-+	if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX)
-+		return -ERANGE;
-+
-+	weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL);
-+
-+	return sched_group_set_shares(css_tg(css), scale_load(weight));
-+}
-+#endif
-+
-+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf,
-+						  long period, long quota)
-+{
-+	if (quota < 0)
-+		seq_puts(sf, "max");
-+	else
-+		seq_printf(sf, "%ld", quota);
-+
-+	seq_printf(sf, " %ld\n", period);
-+}
-+
-+/* caller should put the current value in *@periodp before calling */
-+static int __maybe_unused cpu_period_quota_parse(char *buf,
-+						 u64 *periodp, u64 *quotap)
-+{
-+	char tok[21];	/* U64_MAX */
-+
-+	if (!sscanf(buf, "%s %llu", tok, periodp))
-+		return -EINVAL;
-+
-+	*periodp *= NSEC_PER_USEC;
-+
-+	if (sscanf(tok, "%llu", quotap))
-+		*quotap *= NSEC_PER_USEC;
-+	else if (!strcmp(tok, "max"))
-+		*quotap = RUNTIME_INF;
-+	else
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_CFS_BANDWIDTH
-+static int cpu_max_show(struct seq_file *sf, void *v)
-+{
-+	struct task_group *tg = css_tg(seq_css(sf));
-+
-+	cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg));
-+	return 0;
-+}
-+
-+static ssize_t cpu_max_write(struct kernfs_open_file *of,
-+			     char *buf, size_t nbytes, loff_t off)
-+{
-+	struct task_group *tg = css_tg(of_css(of));
-+	u64 period = tg_get_cfs_period(tg);
-+	u64 quota;
-+	int ret;
-+
-+	ret = cpu_period_quota_parse(buf, &period, &quota);
-+	if (!ret)
-+		ret = tg_set_cfs_bandwidth(tg, period, quota);
-+	return ret ?: nbytes;
-+}
-+#endif
-+
-+static struct cftype cpu_files[] = {
-+	{
-+		.name = "stat",
-+		.flags = CFTYPE_NOT_ON_ROOT,
-+		.seq_show = cpu_stats_show,
-+	},
-+#ifdef CONFIG_FAIR_GROUP_SCHED
-+	{
-+		.name = "weight",
-+		.flags = CFTYPE_NOT_ON_ROOT,
-+		.read_u64 = cpu_weight_read_u64,
-+		.write_u64 = cpu_weight_write_u64,
-+	},
-+#endif
-+#ifdef CONFIG_CFS_BANDWIDTH
-+	{
-+		.name = "max",
-+		.flags = CFTYPE_NOT_ON_ROOT,
-+		.seq_show = cpu_max_show,
-+		.write = cpu_max_write,
-+	},
-+#endif
-+	{ }	/* terminate */
-+};
-+
- struct cgroup_subsys cpu_cgrp_subsys = {
- 	.css_alloc	= cpu_cgroup_css_alloc,
- 	.css_free	= cpu_cgroup_css_free,
-@@ -8600,7 +8733,15 @@ struct cgroup_subsys cpu_cgrp_subsys = {
- 	.can_attach	= cpu_cgroup_can_attach,
- 	.attach		= cpu_cgroup_attach,
- 	.legacy_cftypes	= cpu_legacy_files,
-+	.dfl_cftypes	= cpu_files,
- 	.early_init	= 1,
-+#ifdef CONFIG_CGROUP_CPUACCT
-+	/*
-+	 * cpuacct is enabled together with cpu on the unified hierarchy
-+	 * and its stats are reported through "cpu.stat".
-+	 */
-+	.depends_on	= 1 << cpuacct_cgrp_id,
-+#endif
- };
- 
- #endif	/* CONFIG_CGROUP_SCHED */
-diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
-index 42b2dd5..b4d32a6 100644
---- a/kernel/sched/cpuacct.c
-+++ b/kernel/sched/cpuacct.c
-@@ -224,6 +224,30 @@ static struct cftype files[] = {
- 	{ }	/* terminate */
- };
- 
-+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */
-+void cpuacct_cpu_stats_show(struct seq_file *sf)
-+{
-+	struct cgroup_subsys_state *css;
-+	u64 usage, user, sys;
-+
-+	css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys);
-+
-+	usage = cpuusage_read(css, seq_cft(sf));
-+	cpuacct_stats_read(css_ca(css), &user, &sys);
-+
-+	user *= TICK_NSEC;
-+	sys *= TICK_NSEC;
-+	do_div(usage, NSEC_PER_USEC);
-+	do_div(user, NSEC_PER_USEC);
-+	do_div(sys, NSEC_PER_USEC);
-+
-+	seq_printf(sf, "usage_usec %llu\n"
-+		   "user_usec %llu\n"
-+		   "system_usec %llu\n", usage, user, sys);
-+
-+	css_put(css);
-+}
-+
- /*
-  * charge this task's execution time to its accounting group.
-  *
-diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h
-index ed60562..44eace9 100644
---- a/kernel/sched/cpuacct.h
-+++ b/kernel/sched/cpuacct.h
-@@ -2,6 +2,7 @@
- 
- extern void cpuacct_charge(struct task_struct *tsk, u64 cputime);
- extern void cpuacct_account_field(struct task_struct *p, int index, u64 val);
-+extern void cpuacct_cpu_stats_show(struct seq_file *sf);
- 
- #else
- 
-@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *p, int index, u64 val)
- {
- }
- 
-+static inline void cpuacct_cpu_stats_show(struct seq_file *sf)
-+{
-+}
-+
- #endif
diff --git a/pkgs/os-specific/linux/kernel/crc-regression.patch b/pkgs/os-specific/linux/kernel/crc-regression.patch
deleted file mode 100644
index 623713d16a6..00000000000
--- a/pkgs/os-specific/linux/kernel/crc-regression.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-See https://github.com/NixOS/nixpkgs/issues/6231
-
-v3.14.31:crypto/crc32c.c is missing the MODULE_ALIAS_CRYPTO("crc32c").
-That's probably because crypto/crc32c.c was renamed to
-crypto/crc32c_generic.c in commit
-06e5a1f29819759392239669beb2cad27059c8ec and therefore fell through
-the cracks when backporting commit
-5d26a105b5a73e5635eae0629b42fa0a90e07b7b.
-
-So the affected kernels (all that backported the "crypto-" prefix
-patches) need this additional patch:
-
-diff --git a/crypto/crc32c.c b/crypto/crc32c.c
-index 06f7018c9d95..aae5829eb681 100644
---- a/crypto/crc32c.c
-+++ b/crypto/crc32c.c
-@@ -167,6 +167,7 @@ static void __exit crc32c_mod_fini(void)
- module_init(crc32c_mod_init);
- module_exit(crc32c_mod_fini);
-
-+MODULE_ALIAS_CRYPTO("crc32c");
- MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>");
- MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c");
- MODULE_LICENSE("GPL");
diff --git a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch
deleted file mode 100644
index 9f5790862b6..00000000000
--- a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-
-From	Yang Shi <>
-Subject	[PATCH] crypto: rsa - fix a potential race condition in build
-Date	Fri, 2 Dec 2016 15:41:04 -0800
-
-
-When building kernel with RSA enabled with multithreaded, the below
-compile failure might be caught:
-
-| /buildarea/kernel-source/crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory
-| #include "rsapubkey-asn1.h"
-| ^
-| compilation terminated.
-| CC crypto/rsa-pkcs1pad.o
-| CC crypto/algboss.o
-| CC crypto/testmgr.o
-| make[3]: *** [/buildarea/kernel-source/scripts/Makefile.build:289: crypto/rsa_helper.o] Error 1
-| make[3]: *** Waiting for unfinished jobs....
-| make[2]: *** [/buildarea/kernel-source/Makefile:969: crypto] Error 2
-| make[1]: *** [Makefile:150: sub-make] Error 2
-| make: *** [Makefile:24: __sub-make] Error 2
-
-The header file is not generated before rsa_helper is compiled, so
-adding dependency to avoid such issue.
-
-Signed-off-by: Yang Shi <yang.shi@windriver.com>
-
----
- crypto/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/crypto/Makefile b/crypto/Makefile
-index 99cc64a..8db39f9 100644
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -40,6 +40,7 @@ obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o
-
- $(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h
- $(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h
-+$(obj)/rsa_helper.o: $(obj)/rsa_helper.c $(obj)/rsaprivkey-asn1.h
- clean-files += rsapubkey-asn1.c rsapubkey-asn1.h
- clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h
-
---
-2.0.2
diff --git a/pkgs/os-specific/linux/kernel/no-xsave.patch b/pkgs/os-specific/linux/kernel/no-xsave.patch
deleted file mode 100644
index dde96d7dccd..00000000000
--- a/pkgs/os-specific/linux/kernel/no-xsave.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- a/arch/x86/xen/enlighten.c
-+++ b/arch/x86/xen/enlighten.c
-@@ -168,21 +168,23 @@ static void __init xen_banner(void)
- 	       xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : "");
- }
- 
-+static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0;
-+static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0;
-+
- static void xen_cpuid(unsigned int *ax, unsigned int *bx,
- 		      unsigned int *cx, unsigned int *dx)
- {
-+	unsigned maskecx = ~0;
- 	unsigned maskedx = ~0;
- 
- 	/*
- 	 * Mask out inconvenient features, to try and disable as many
- 	 * unsupported kernel subsystems as possible.
- 	 */
--	if (*ax == 1)
--		maskedx = ~((1 << X86_FEATURE_APIC) |  /* disable APIC */
--			    (1 << X86_FEATURE_ACPI) |  /* disable ACPI */
--			    (1 << X86_FEATURE_MCE)  |  /* disable MCE */
--			    (1 << X86_FEATURE_MCA)  |  /* disable MCA */
--			    (1 << X86_FEATURE_ACC));   /* thermal monitoring */
-+	if (*ax == 1) {
-+		maskecx = cpuid_leaf1_ecx_mask;
-+		maskedx = cpuid_leaf1_edx_mask;
-+	}
- 
- 	asm(XEN_EMULATE_PREFIX "cpuid"
- 		: "=a" (*ax),
-@@ -190,9 +192,43 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
- 		  "=c" (*cx),
- 		  "=d" (*dx)
- 		: "0" (*ax), "2" (*cx));
-+
-+	*cx &= maskecx;
- 	*dx &= maskedx;
- }
- 
-+static __init void xen_init_cpuid_mask(void)
-+{
-+	unsigned int ax, bx, cx, dx;
-+
-+	cpuid_leaf1_edx_mask =
-+		~((1 << X86_FEATURE_MCE)  |  /* disable MCE */
-+		  (1 << X86_FEATURE_MCA)  |  /* disable MCA */
-+		  (1 << X86_FEATURE_ACC));   /* thermal monitoring */
-+
-+	if (!xen_initial_domain())
-+		cpuid_leaf1_edx_mask &=
-+			~((1 << X86_FEATURE_APIC) |  /* disable local APIC */
-+			  (1 << X86_FEATURE_ACPI));  /* disable ACPI */
-+
-+	ax = 1;
-+	xen_cpuid(&ax, &bx, &cx, &dx);
-+
-+	/* cpuid claims we support xsave; try enabling it to see what happens */
-+	if (cx & (1 << (X86_FEATURE_XSAVE % 32))) {
-+		unsigned long cr4;
-+
-+		set_in_cr4(X86_CR4_OSXSAVE);
-+		
-+		cr4 = read_cr4();
-+
-+		if ((cr4 & X86_CR4_OSXSAVE) == 0)
-+			cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_XSAVE % 32));
-+
-+		clear_in_cr4(X86_CR4_OSXSAVE);
-+	}
-+}
-+
- static void xen_set_debugreg(int reg, unsigned long val)
- {
- 	HYPERVISOR_set_debugreg(reg, val);
-@@ -903,6 +939,8 @@ asmlinkage void __init xen_start_kernel(void)
- 
- 	xen_init_irq_ops();
- 
-+	xen_init_cpuid_mask();
-+
- #ifdef CONFIG_X86_LOCAL_APIC
- 	/*
- 	 * set up the basic apic ops.
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 4c78928a99a..e5f430b4d82 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -21,12 +21,6 @@ in
 
 rec {
 
-  multithreaded_rsapubkey =
-    {
-      name = "multithreaded-rsapubkey-asn1.patch";
-      patch = ./multithreaded-rsapubkey-asn1.patch;
-    };
-
   bridge_stp_helper =
     { name = "bridge-stp-helper";
       patch = ./bridge-stp-helper.patch;
@@ -37,12 +31,6 @@ rec {
       patch = ./p9-fixes.patch;
     };
 
-  no_xsave =
-    { name = "no-xsave";
-      patch = ./no-xsave.patch;
-      features.noXsave = true;
-    };
-
   mips_fpureg_emu =
     { name = "mips-fpureg-emulation";
       patch = ./mips-fpureg-emulation.patch;
@@ -63,22 +51,6 @@ rec {
       patch = ./modinst-arg-list-too-long.patch;
     };
 
-  ubuntu_fan_4_4 =
-    { name = "ubuntu-fan";
-      patch = ./ubuntu-fan-4.4.patch;
-    };
-
-  ubuntu_unprivileged_overlayfs =
-    { name = "ubuntu-unprivileged-overlayfs";
-      patch = ./ubuntu-unprivileged-overlayfs.patch;
-    };
-
-  tuxonice_3_10 = makeTuxonicePatch {
-    version = "2013-11-07";
-    kernelVersion = "3.10.18";
-    sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j";
-  };
-
   grsecurity_testing = throw ''
     Upstream has ceased free support for grsecurity/PaX.
 
@@ -87,11 +59,6 @@ rec {
     for more information.
   '';
 
-  crc_regression =
-    { name = "crc-backport-regression";
-      patch = ./crc-regression.patch;
-    };
-
   genksyms_fix_segfault =
     { name = "genksyms-fix-segfault";
       patch = ./genksyms-fix-segfault.patch;
@@ -107,47 +74,8 @@ rec {
       patch = ./chromiumos-patches/no-link-restrictions.patch;
     };
 
-  chromiumos_mfd_fix_dependency =
-    { name = "mfd_fix_dependency";
-      patch = ./chromiumos-patches/mfd-fix-dependency.patch;
-    };
-
-  hiddev_CVE_2016_5829 =
-    { name = "hiddev_CVE_2016_5829";
-      patch = fetchpatch {
-        url = "https://sources.debian.net/data/main/l/linux/4.6.3-1/debian/patches/bugfix/all/HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch";
-        sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy";
-      };
-    };
-
   cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
 
-  lguest_entry-linkage =
-    { name = "lguest-asmlinkage.patch";
-      patch = fetchpatch {
-        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git"
-            + "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52";
-        sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc";
-      };
-    };
-
-  packet_fix_race_condition_CVE_2016_8655 =
-    { name = "packet_fix_race_condition_CVE_2016_8655.patch";
-      patch = fetchpatch {
-        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=84ac7260236a49c79eede91617700174c2c19b0c";
-        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";
-      };
-    };
-
   DCCP_double_free_vulnerability_CVE-2017-6074 = rec
     { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch";
       patch = fetchpatch {
diff --git a/pkgs/os-specific/linux/kernel/perf.diff b/pkgs/os-specific/linux/kernel/perf.diff
deleted file mode 100644
index 88d0381784f..00000000000
--- a/pkgs/os-specific/linux/kernel/perf.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- perf/config/utilities.mak.orig	2014-01-25 14:55:32.573320370 +0000
-+++ perf/config/utilities.mak	2014-01-25 15:13:34.174337760 +0000
-@@ -186,9 +186,14 @@
- endif
- TRY_CC_MSG=echo "    CHK $(3)" 1>&2;
- 
-+define newline
-+
-+
-+endef
-+
- try-cc = $(shell sh -c						  \
- 	'TMP="$(OUTPUT)$(TMPOUT).$$$$";				  \
- 	 $(TRY_CC_MSG)						  \
--	 echo "$(1)" |						  \
-+	 echo -e "$(subst $(newline),\\n,$(1))" | tee _test.c |   \
- 	 $(CC) -x c - $(2) -o "$$TMP" $(TRY_CC_OUTPUT) && echo y; \
- 	 rm -f "$$TMP"')
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index b6f1f7d9f8a..f01f3928950 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
-    ${optionalString (versionOlder kernel.version "3.13") "patch -p1 < ${./perf.diff}"}
     [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
     export makeFlags="DESTDIR=$out $makeFlags"
   '';
diff --git a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch b/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch
deleted file mode 100644
index 39150ad790d..00000000000
--- a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch
+++ /dev/null
@@ -1,1240 +0,0 @@
-From e64058be3b97c5bd3e034fc4ece21e306ef6f90b Mon Sep 17 00:00:00 2001
-From: Jay Vosburgh <jay.vosburgh@canonical.com>
-Date: Wed, 1 Apr 2015 16:11:09 -0700
-Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3)
-
-Switch to a single tunnel for all mappings, this removes the limitations
-on how many mappings each tunnel can handle, and therefore how many Fan
-slices each local address may hold.
-
-NOTE: This introduces a new kernel netlink interface which needs updated
-iproute2 support.
-
-BugLink: http://bugs.launchpad.net/bugs/1470091
-Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
-Signed-off-by: Andy Whitcroft <apw@canonical.com>
-Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-
-Conflicts:
-	include/net/ip_tunnels.h
----
- include/net/ip_tunnels.h       |  15 ++++
- include/uapi/linux/if_tunnel.h |  20 +++++
- net/ipv4/ip_tunnel.c           |   7 +-
- net/ipv4/ipip.c                | 186 +++++++++++++++++++++++++++++++++++++++--
- 4 files changed, 222 insertions(+), 6 deletions(-)
-
-diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
-index 62a750a..47fec59 100644
---- a/include/net/ip_tunnels.h
-+++ b/include/net/ip_tunnels.h
-@@ -91,6 +91,19 @@ struct ip_tunnel_dst {
- };
- 
- struct metadata_dst;
-+/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16
-+ * underlay (10.88.0.0/16, for example).  Multiple local addresses within
-+ * the /16 may be used, but a particular overlay may not span
-+ * multiple underlay subnets.
-+ *
-+ * We store one underlay, indexed by the overlay's high order octet.
-+ */
-+#define FAN_OVERLAY_CNT		256
-+
-+struct ip_tunnel_fan {
-+/*	u32 __rcu	*map;*/
-+	u32		map[FAN_OVERLAY_CNT];
-+};
- 
- struct ip_tunnel {
- 	struct ip_tunnel __rcu	*next;
-@@ -123,6 +136,7 @@ struct ip_tunnel {
- #endif
- 	struct ip_tunnel_prl_entry __rcu *prl;	/* potential router list */
- 	unsigned int		prl_count;	/* # of entries in PRL */
-+	struct ip_tunnel_fan	fan;
- 	int			ip_tnl_net_id;
- 	struct gro_cells	gro_cells;
- 	bool			collect_md;
-@@ -143,6 +157,7 @@ struct ip_tunnel {
- #define TUNNEL_VXLAN_OPT	__cpu_to_be16(0x1000)
- 
- #define TUNNEL_OPTIONS_PRESENT	(TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT)
-+#define TUNNEL_FAN		__cpu_to_be16(0x4000)
- 
- struct tnl_ptk_info {
- 	__be16 flags;
-diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
-index af4de90..85a3e4b 100644
---- a/include/uapi/linux/if_tunnel.h
-+++ b/include/uapi/linux/if_tunnel.h
-@@ -57,6 +57,10 @@ enum {
- 	IFLA_IPTUN_ENCAP_FLAGS,
- 	IFLA_IPTUN_ENCAP_SPORT,
- 	IFLA_IPTUN_ENCAP_DPORT,
-+
-+	__IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */
-+	IFLA_IPTUN_FAN_MAP = 33,
-+
- 	__IFLA_IPTUN_MAX,
- };
- #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
-@@ -132,4 +136,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 /* _UAPI_IF_TUNNEL_H_ */
-diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
-index cbb51f3..7a6174b 100644
---- a/net/ipv4/ip_tunnel.c
-+++ b/net/ipv4/ip_tunnel.c
-@@ -1110,6 +1110,11 @@ out:
- }
- EXPORT_SYMBOL_GPL(ip_tunnel_newlink);
- 
-+static int ip_tunnel_is_fan(struct ip_tunnel *tunnel)
-+{
-+	return tunnel->parms.i_flags & TUNNEL_FAN;
-+}
-+
- int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
- 			 struct ip_tunnel_parm *p)
- {
-@@ -1119,7 +1124,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
- 	struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id);
- 
- 	if (dev == itn->fb_tunnel_dev)
--		return -EINVAL;
-+		return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL;
- 
- 	t = ip_tunnel_find(itn, p, dev->type);
- 
-diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
-index a09fb0d..56e8984 100644
---- a/net/ipv4/ipip.c
-+++ b/net/ipv4/ipip.c
-@@ -107,6 +107,7 @@
- #include <linux/init.h>
- #include <linux/netfilter_ipv4.h>
- #include <linux/if_ether.h>
-+#include <linux/inetdevice.h>
- 
- #include <net/sock.h>
- #include <net/ip.h>
-@@ -208,6 +209,40 @@ drop:
- 	return 0;
- }
- 
-+static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel)
-+{
-+	return tunnel->parms.i_flags & TUNNEL_FAN;
-+}
-+
-+/*
-+ * Determine fan tunnel endpoint to send packet to, based on the inner IP
-+ * address.  For an overlay (inner) address Y.A.B.C, the transformation is
-+ * F.G.A.B, where "F" and "G" are the first two octets of the underlay
-+ * network (the network portion of a /16), "A" and "B" are the low order
-+ * two octets of the underlay network host (the host portion of a /16),
-+ * and "Y" is a configured first octet of the overlay network.
-+ *
-+ * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay
-+ * subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to
-+ * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts
-+ * overlay network 99.6.7.0/24.
-+ */
-+static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)
-+{
-+	unsigned int overlay;
-+	u32 daddr, underlay;
-+
-+	daddr = ntohl(ip_hdr(skb)->daddr);
-+	overlay = daddr >> 24;
-+	underlay = tunnel->fan.map[overlay];
-+	if (!underlay)
-+		return -EINVAL;
-+
-+	*iph = tunnel->parms.iph;
-+	iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff));
-+	return 0;
-+}
-+
- /*
-  *	This function assumes it is being called from dev_queue_xmit()
-  *	and that skb is filled properly by that function.
-@@ -215,7 +250,8 @@ drop:
- static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
- {
- 	struct ip_tunnel *tunnel = netdev_priv(dev);
--	const struct iphdr  *tiph = &tunnel->parms.iph;
-+	const struct iphdr *tiph;
-+	struct iphdr fiph;
- 
- 	if (unlikely(skb->protocol != htons(ETH_P_IP)))
- 		goto tx_error;
-@@ -224,6 +260,14 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
- 	if (IS_ERR(skb))
- 		goto out;
- 
-+	if (ipip_tunnel_is_fan(tunnel)) {
-+		if (ipip_build_fan_iphdr(tunnel, skb, &fiph))
-+			goto tx_error;
-+		tiph = &fiph;
-+	} else {
-+		tiph = &tunnel->parms.iph;
-+	}
-+
- 	skb_set_inner_ipproto(skb, IPPROTO_IPIP);
- 
- 	ip_tunnel_xmit(skb, dev, tiph, tiph->protocol);
-@@ -375,21 +419,88 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
- 	return ret;
- }
- 
-+static void ipip_fan_free_map(struct ip_tunnel *t)
-+{
-+	memset(&t->fan.map, 0, sizeof(t->fan.map));
-+}
-+
-+static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)
-+{
-+	u32 overlay, overlay_mask, underlay, underlay_mask;
-+
-+	if ((map->underlay_prefix && map->underlay_prefix != 16) ||
-+	    (map->overlay_prefix && map->overlay_prefix != 8))
-+		return -EINVAL;
-+
-+	overlay = ntohl(map->overlay);
-+	overlay_mask = ntohl(inet_make_mask(map->overlay_prefix));
-+
-+	underlay = ntohl(map->underlay);
-+	underlay_mask = ntohl(inet_make_mask(map->underlay_prefix));
-+
-+	if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask))
-+		return -EINVAL;
-+
-+	if (!(overlay & overlay_mask) && (underlay & underlay_mask))
-+		return -EINVAL;
-+
-+	t->parms.i_flags |= TUNNEL_FAN;
-+
-+	/* Special case: overlay 0 and underlay 0 clears all mappings */
-+	if (!overlay && !underlay) {
-+		ipip_fan_free_map(t);
-+		return 0;
-+	}
-+
-+	overlay >>= (32 - map->overlay_prefix);
-+	t->fan.map[overlay] = underlay;
-+
-+	return 0;
-+}
-+	
-+
-+static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,
-+			    struct ip_tunnel_parm *parms)
-+{
-+	struct ip_tunnel_fan_map *map;
-+	struct nlattr *attr;
-+	int rem, rv;
-+
-+	if (!data[IFLA_IPTUN_FAN_MAP])
-+		return 0;
-+
-+	if (parms->iph.daddr)
-+		return -EINVAL;
-+
-+	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {
-+		map = nla_data(attr);
-+		rv = ipip_fan_set_map(t, map);
-+		if (rv)
-+			return rv;
-+	}
-+
-+	return 0;
-+}
-+
- static int ipip_newlink(struct net *src_net, struct net_device *dev,
- 			struct nlattr *tb[], struct nlattr *data[])
- {
- 	struct ip_tunnel_parm p;
- 	struct ip_tunnel_encap ipencap;
-+	struct ip_tunnel *t = netdev_priv(dev);
-+	int err;
- 
- 	if (ipip_netlink_encap_parms(data, &ipencap)) {
--		struct ip_tunnel *t = netdev_priv(dev);
--		int err = ip_tunnel_encap_setup(t, &ipencap);
-+		err = ip_tunnel_encap_setup(t, &ipencap);
- 
- 		if (err < 0)
- 			return err;
- 	}
- 
- 	ipip_netlink_parms(data, &p);
-+	err = ipip_netlink_fan(data, t, &p);
-+	if (err < 0)
-+		return err;
- 	return ip_tunnel_newlink(dev, tb, &p);
- }
- 
-@@ -398,16 +509,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[],
- {
- 	struct ip_tunnel_parm p;
- 	struct ip_tunnel_encap ipencap;
-+	struct ip_tunnel *t = netdev_priv(dev);
-+	int err;
- 
- 	if (ipip_netlink_encap_parms(data, &ipencap)) {
--		struct ip_tunnel *t = netdev_priv(dev);
--		int err = ip_tunnel_encap_setup(t, &ipencap);
-+		err = ip_tunnel_encap_setup(t, &ipencap);
- 
- 		if (err < 0)
- 			return err;
- 	}
- 
- 	ipip_netlink_parms(data, &p);
-+	err = ipip_netlink_fan(data, t, &p);
-+	if (err < 0)
-+		return err;
- 
- 	if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) ||
- 	    (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr))
-@@ -439,6 +554,8 @@ static size_t ipip_get_size(const struct net_device *dev)
- 		nla_total_size(2) +
- 		/* IFLA_IPTUN_ENCAP_DPORT */
- 		nla_total_size(2) +
-+		/* IFLA_IPTUN_FAN_MAP */
-+		nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 +
- 		0;
- }
- 
-@@ -466,6 +583,29 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)
- 			tunnel->encap.flags))
- 		goto nla_put_failure;
- 
-+	if (tunnel->parms.i_flags & TUNNEL_FAN) {
-+		struct nlattr *fan_nest;
-+		int i;
-+
-+		fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP);
-+		if (!fan_nest)
-+			goto nla_put_failure;
-+		for (i = 0; i < 256; i++) {
-+			if (tunnel->fan.map[i]) {
-+				struct ip_tunnel_fan_map map;
-+
-+				map.underlay = htonl(tunnel->fan.map[i]);
-+				map.underlay_prefix = 16;
-+				map.overlay = htonl(i << 24);
-+				map.overlay_prefix = 8;
-+				if (nla_put(skb, IFLA_FAN_MAPPING,
-+					    sizeof(map), &map))
-+					goto nla_put_failure;
-+			}
-+		}
-+		nla_nest_end(skb, fan_nest);
-+	}
-+
- 	return 0;
- 
- nla_put_failure:
-@@ -483,6 +623,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
- 	[IFLA_IPTUN_ENCAP_FLAGS]	= { .type = NLA_U16 },
- 	[IFLA_IPTUN_ENCAP_SPORT]	= { .type = NLA_U16 },
- 	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },
-+
-+	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },
-+	[IFLA_IPTUN_FAN_MAP]		= { .type = NLA_NESTED },
- };
- 
- static struct rtnl_link_ops ipip_link_ops __read_mostly = {
-@@ -523,6 +666,23 @@ static struct pernet_operations ipip_net_ops = {
- 	.size = sizeof(struct ip_tunnel_net),
- };
- 
-+#ifdef CONFIG_SYSCTL
-+static struct ctl_table_header *ipip_fan_header;
-+static unsigned int ipip_fan_version = 3;
-+
-+static struct ctl_table ipip_fan_sysctls[] = {
-+	{
-+		.procname	= "version",
-+		.data		= &ipip_fan_version,
-+		.maxlen		= sizeof(ipip_fan_version),
-+		.mode		= 0444,
-+		.proc_handler	= proc_dointvec,
-+	},
-+	{},
-+};
-+
-+#endif /* CONFIG_SYSCTL */
-+
- static int __init ipip_init(void)
- {
- 	int err;
-@@ -541,9 +701,22 @@ static int __init ipip_init(void)
- 	if (err < 0)
- 		goto rtnl_link_failed;
- 
-+#ifdef CONFIG_SYSCTL
-+	ipip_fan_header = register_net_sysctl(&init_net, "net/fan",
-+					      ipip_fan_sysctls);
-+	if (!ipip_fan_header) {
-+		err = -ENOMEM;
-+		goto sysctl_failed;
-+	}
-+#endif /* CONFIG_SYSCTL */
-+
- out:
- 	return err;
- 
-+#ifdef CONFIG_SYSCTL
-+sysctl_failed:
-+	rtnl_link_unregister(&ipip_link_ops);
-+#endif /* CONFIG_SYSCTL */
- rtnl_link_failed:
- 	xfrm4_tunnel_deregister(&ipip_handler, AF_INET);
- xfrm_tunnel_failed:
-@@ -553,6 +726,9 @@ xfrm_tunnel_failed:
- 
- static void __exit ipip_fini(void)
- {
-+#ifdef CONFIG_SYSCTL
-+	unregister_net_sysctl_table(ipip_fan_header);
-+#endif /* CONFIG_SYSCTL */
- 	rtnl_link_unregister(&ipip_link_ops);
- 	if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET))
- 		pr_info("%s: can't deregister tunnel\n", __func__);
--- 
-2.7.4
-
-From 14aba409d044e3a314c09c650e1c42de699700b8 Mon Sep 17 00:00:00 2001
-From: Jay Vosburgh <jay.vosburgh@canonical.com>
-Date: Wed, 11 Nov 2015 13:04:50 +0000
-Subject: [PATCH] UBUNTU: SAUCE: fan: add VXLAN implementation
-
-Generify the fan mapping support and utilise that to implement fan
-mappings over vxlan transport.
-
-Expose the existance of this functionality (when the module is loaded)
-via an additional sysctl marker.
-
-Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
-[apw@canonical.com: added feature marker for fan over vxlan.]
-Signed-off-by: Andy Whitcroft <apw@canonical.com>
----
- drivers/net/vxlan.c            | 245 +++++++++++++++++++++++++++++++++++++++++
- include/net/ip_tunnels.h       |  19 +++-
- include/net/vxlan.h            |   2 +
- include/uapi/linux/if_link.h   |   1 +
- include/uapi/linux/if_tunnel.h |   2 +-
- net/ipv4/ip_tunnel.c           |   7 +-
- net/ipv4/ipip.c                | 242 +++++++++++++++++++++++++++++++---------
- 7 files changed, 453 insertions(+), 65 deletions(-)
-
-diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-index 405a7b6..a17cfd0 100644
---- a/drivers/net/vxlan.c
-+++ b/drivers/net/vxlan.c
-@@ -23,6 +23,7 @@
- #include <linux/udp.h>
- #include <linux/igmp.h>
- #include <linux/etherdevice.h>
-+#include <linux/inetdevice.h>
- #include <linux/if_ether.h>
- #include <linux/if_vlan.h>
- #include <linux/hash.h>
-@@ -106,6 +107,167 @@ static inline bool vxlan_collect_metadata(struct vxlan_sock *vs)
- 	       ip_tunnel_collect_metadata();
- }
- 
-+static struct ip_fan_map *vxlan_fan_find_map(struct vxlan_dev *vxlan, __be32 daddr)
-+{
-+	struct ip_fan_map *fan_map;
-+
-+	rcu_read_lock();
-+	list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) {
-+		if (fan_map->overlay ==
-+		    (daddr & inet_make_mask(fan_map->overlay_prefix))) {
-+			rcu_read_unlock();
-+			return fan_map;
-+		}
-+	}
-+	rcu_read_unlock();
-+
-+	return NULL;
-+}
-+
-+static void vxlan_fan_flush_map(struct vxlan_dev *vxlan)
-+{
-+	struct ip_fan_map *fan_map;
-+
-+	list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) {
-+		list_del_rcu(&fan_map->list);
-+		kfree_rcu(fan_map, rcu);
-+	}
-+}
-+
-+static int vxlan_fan_del_map(struct vxlan_dev *vxlan, __be32 overlay)
-+{
-+	struct ip_fan_map *fan_map;
-+
-+	fan_map = vxlan_fan_find_map(vxlan, overlay);
-+	if (!fan_map)
-+		return -ENOENT;
-+
-+	list_del_rcu(&fan_map->list);
-+	kfree_rcu(fan_map, rcu);
-+
-+	return 0;
-+}
-+
-+static int vxlan_fan_add_map(struct vxlan_dev *vxlan, struct ifla_fan_map *map)
-+{
-+	__be32 overlay_mask, underlay_mask;
-+	struct ip_fan_map *fan_map;
-+
-+	overlay_mask = inet_make_mask(map->overlay_prefix);
-+	underlay_mask = inet_make_mask(map->underlay_prefix);
-+
-+	netdev_dbg(vxlan->dev, "vfam: map: o %x/%d u %x/%d om %x um %x\n",
-+		   map->overlay, map->overlay_prefix,
-+		   map->underlay, map->underlay_prefix,
-+		   overlay_mask, underlay_mask);
-+
-+	if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask))
-+		return -EINVAL;
-+
-+	if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask))
-+		return -EINVAL;
-+
-+	/* Special case: overlay 0 and underlay 0: flush all mappings */
-+	if (!map->overlay && !map->underlay) {
-+		vxlan_fan_flush_map(vxlan);
-+		return 0;
-+	}
-+	
-+	/* Special case: overlay set and underlay 0: clear map for overlay */
-+	if (!map->underlay)
-+		return vxlan_fan_del_map(vxlan, map->overlay);
-+
-+	if (vxlan_fan_find_map(vxlan, map->overlay))
-+		return -EEXIST;
-+
-+	fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL);
-+	fan_map->underlay = map->underlay;
-+	fan_map->overlay = map->overlay;
-+	fan_map->underlay_prefix = map->underlay_prefix;
-+	fan_map->overlay_mask = ntohl(overlay_mask);
-+	fan_map->overlay_prefix = map->overlay_prefix;
-+
-+	list_add_tail_rcu(&fan_map->list, &vxlan->fan.fan_maps);
-+
-+	return 0;
-+}
-+	
-+static int vxlan_parse_fan_map(struct nlattr *data[], struct vxlan_dev *vxlan)
-+{
-+	struct ifla_fan_map *map;
-+	struct nlattr *attr;
-+	int rem, rv;
-+
-+	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {
-+		map = nla_data(attr);
-+		rv = vxlan_fan_add_map(vxlan, map);
-+		if (rv)
-+			return rv;
-+	}
-+
-+	return 0;
-+}
-+
-+static int vxlan_fan_build_rdst(struct vxlan_dev *vxlan, struct sk_buff *skb,
-+				      struct vxlan_rdst *fan_rdst)
-+{
-+	struct ip_fan_map *f_map;
-+	union vxlan_addr *va;
-+	u32 daddr, underlay;
-+	struct arphdr *arp;
-+	void *arp_ptr;
-+	struct ethhdr *eth;
-+	struct iphdr *iph;
-+
-+	eth = eth_hdr(skb);
-+	switch (eth->h_proto) {
-+	case htons(ETH_P_IP):
-+		iph = ip_hdr(skb);
-+		if (!iph)
-+			return -EINVAL;
-+		daddr = iph->daddr;
-+		break;
-+	case htons(ETH_P_ARP):
-+		arp = arp_hdr(skb);
-+		if (!arp)
-+			return -EINVAL;
-+		arp_ptr = arp + 1;
-+		netdev_dbg(vxlan->dev,
-+			   "vfbr: arp sha %pM sip %pI4 tha %pM tip %pI4\n",
-+			   arp_ptr, arp_ptr + skb->dev->addr_len,
-+			   arp_ptr + skb->dev->addr_len + 4,
-+			   arp_ptr + (skb->dev->addr_len * 2) + 4);
-+		arp_ptr += (skb->dev->addr_len * 2) + 4;
-+		memcpy(&daddr, arp_ptr, 4);
-+		break;
-+	default:
-+		netdev_dbg(vxlan->dev, "vfbr: unknown eth p %x\n", eth->h_proto);
-+		return -EINVAL;
-+	}
-+
-+	f_map = vxlan_fan_find_map(vxlan, daddr);
-+	if (!f_map)
-+		return -EINVAL;
-+
-+	daddr = ntohl(daddr);
-+	underlay = ntohl(f_map->underlay);
-+	if (!underlay)
-+		return -EINVAL;
-+
-+	memset(fan_rdst, 0, sizeof(*fan_rdst));
-+	va = &fan_rdst->remote_ip;
-+	va->sa.sa_family = AF_INET;
-+	fan_rdst->remote_vni = vxlan->default_dst.remote_vni;
-+	va->sin.sin_addr.s_addr = htonl(underlay |
-+					((daddr & ~f_map->overlay_mask) >>
-+					 (32 - f_map->overlay_prefix -
-+					  (32 - f_map->underlay_prefix))));
-+	netdev_dbg(vxlan->dev, "vfbr: daddr %x ul %x dst %x\n",
-+		   daddr, underlay, va->sin.sin_addr.s_addr);
-+
-+	return 0;
-+}
-+
- #if IS_ENABLED(CONFIG_IPV6)
- static inline
- bool vxlan_addr_equal(const union vxlan_addr *a, const union vxlan_addr *b)
-@@ -2029,6 +2191,13 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
- 			goto rt_tx_error;
- 		}
- 
-+		if (fan_has_map(&vxlan->fan) && rt->rt_flags & RTCF_LOCAL) {
-+			netdev_dbg(dev, "discard fan to localhost %pI4\n",
-+				   &dst->sin.sin_addr.s_addr);
-+			ip_rt_put(rt);
-+			goto tx_free;
-+		}
-+
- 		/* Bypass encapsulation if the destination is local */
- 		if (rt->rt_flags & RTCF_LOCAL &&
- 		    !(rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))) {
-@@ -2169,6 +2338,20 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
- 		return NETDEV_TX_OK;
- 	}
- 
-+	if (fan_has_map(&vxlan->fan)) {
-+		struct vxlan_rdst fan_rdst;
-+
-+		netdev_dbg(vxlan->dev, "vxlan_xmit p %x d %pM\n",
-+			   eth->h_proto, eth->h_dest);
-+		if (vxlan_fan_build_rdst(vxlan, skb, &fan_rdst)) {
-+			dev->stats.tx_dropped++;
-+			kfree_skb(skb);
-+			return NETDEV_TX_OK;
-+		}
-+		vxlan_xmit_one(skb, dev, &fan_rdst, 0);
-+		return NETDEV_TX_OK;
-+	}
-+
- 	f = vxlan_find_mac(vxlan, eth->h_dest);
- 	did_rsc = false;
- 
-@@ -2532,6 +2715,8 @@ static void vxlan_setup(struct net_device *dev)
- 
- 	for (h = 0; h < FDB_HASH_SIZE; ++h)
- 		INIT_HLIST_HEAD(&vxlan->fdb_head[h]);
-+
-+	INIT_LIST_HEAD(&vxlan->fan.fan_maps);
- }
- 
- static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = {
-@@ -2881,6 +3066,7 @@ EXPORT_SYMBOL_GPL(vxlan_dev_create);
- static int vxlan_newlink(struct net *src_net, struct net_device *dev,
- 			 struct nlattr *tb[], struct nlattr *data[])
- {
-+	struct vxlan_dev *vxlan = netdev_priv(dev);
- 	struct vxlan_config conf;
- 	int err;
- 
-@@ -2899,6 +3085,12 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev,
- 		conf.remote_ip.sa.sa_family = AF_INET6;
- 	}
- 
-+	if (data[IFLA_VXLAN_FAN_MAP]) {
-+		err = vxlan_parse_fan_map(data, vxlan);
-+		if (err)
-+			return err;
-+	}
-+
- 	if (data[IFLA_VXLAN_LOCAL]) {
- 		conf.saddr.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_LOCAL]);
- 		conf.saddr.sa.sa_family = AF_INET;
-@@ -3037,6 +3229,7 @@ static size_t vxlan_get_size(const struct net_device *dev)
- 		nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_UDP_ZERO_CSUM6_RX */
- 		nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_TX */
- 		nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_RX */
-+		nla_total_size(sizeof(struct ip_fan_map) * 256) +
- 		0;
- }
- 
-@@ -3083,6 +3276,26 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)
- 		}
- 	}
- 
-+	if (fan_has_map(&vxlan->fan)) {
-+		struct nlattr *fan_nest;
-+		struct ip_fan_map *fan_map;
-+
-+		fan_nest = nla_nest_start(skb, IFLA_VXLAN_FAN_MAP);
-+		if (!fan_nest)
-+			goto nla_put_failure;
-+		list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) {
-+			struct ifla_fan_map map;
-+
-+			map.underlay = fan_map->underlay;
-+			map.underlay_prefix = fan_map->underlay_prefix;
-+			map.overlay = fan_map->overlay;
-+			map.overlay_prefix = fan_map->overlay_prefix;
-+			if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map))
-+				goto nla_put_failure;
-+		}
-+		nla_nest_end(skb, fan_nest);
-+	}
-+
- 	if (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan->cfg.ttl) ||
- 	    nla_put_u8(skb, IFLA_VXLAN_TOS, vxlan->cfg.tos) ||
- 	    nla_put_u8(skb, IFLA_VXLAN_LEARNING,
-@@ -3201,6 +3414,22 @@ static __net_init int vxlan_init_net(struct net *net)
- 	return 0;
- }
- 
-+#ifdef CONFIG_SYSCTL
-+static struct ctl_table_header *vxlan_fan_header;
-+static unsigned int vxlan_fan_version = 4;
-+
-+static struct ctl_table vxlan_fan_sysctls[] = {
-+	{
-+		.procname	= "vxlan",
-+		.data		= &vxlan_fan_version,
-+		.maxlen		= sizeof(vxlan_fan_version),
-+		.mode		= 0444,
-+		.proc_handler	= proc_dointvec,
-+	},
-+	{},
-+};
-+#endif /* CONFIG_SYSCTL */
-+
- static void __net_exit vxlan_exit_net(struct net *net)
- {
- 	struct vxlan_net *vn = net_generic(net, vxlan_net_id);
-@@ -3256,7 +3485,20 @@ static int __init vxlan_init_module(void)
- 	if (rc)
- 		goto out3;
- 
-+#ifdef CONFIG_SYSCTL
-+	vxlan_fan_header = register_net_sysctl(&init_net, "net/fan",
-+					      vxlan_fan_sysctls);
-+	if (!vxlan_fan_header) {
-+		rc = -ENOMEM;
-+		goto sysctl_failed;
-+	}
-+#endif /* CONFIG_SYSCTL */
-+
- 	return 0;
-+#ifdef CONFIG_SYSCTL
-+sysctl_failed:
-+	rtnl_link_unregister(&vxlan_link_ops);
-+#endif /* CONFIG_SYSCTL */
- out3:
- 	unregister_netdevice_notifier(&vxlan_notifier_block);
- out2:
-@@ -3269,6 +3511,9 @@ late_initcall(vxlan_init_module);
- 
- static void __exit vxlan_cleanup_module(void)
- {
-+#ifdef CONFIG_SYSCTL
-+	unregister_net_sysctl_table(vxlan_fan_header);
-+#endif /* CONFIG_SYSCTL */
- 	rtnl_link_unregister(&vxlan_link_ops);
- 	unregister_netdevice_notifier(&vxlan_notifier_block);
- 	destroy_workqueue(vxlan_wq);
-diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
-index 47fec59..28a38e5 100644
---- a/include/net/ip_tunnels.h
-+++ b/include/net/ip_tunnels.h
-@@ -100,9 +100,18 @@ struct metadata_dst;
-  */
- #define FAN_OVERLAY_CNT		256
- 
-+struct ip_fan_map {
-+	__be32			underlay;
-+	__be32			overlay;
-+	u16			underlay_prefix;
-+	u16			overlay_prefix;
-+	u32			overlay_mask;
-+	struct list_head	list;
-+	struct rcu_head		rcu;
-+};
-+
- struct ip_tunnel_fan {
--/*	u32 __rcu	*map;*/
--	u32		map[FAN_OVERLAY_CNT];
-+	struct list_head	fan_maps;
- };
- 
- struct ip_tunnel {
-@@ -157,7 +166,11 @@ struct ip_tunnel {
- #define TUNNEL_VXLAN_OPT	__cpu_to_be16(0x1000)
- 
- #define TUNNEL_OPTIONS_PRESENT	(TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT)
--#define TUNNEL_FAN		__cpu_to_be16(0x4000)
-+
-+static inline int fan_has_map(const struct ip_tunnel_fan *fan)
-+{
-+	return !list_empty(&fan->fan_maps);
-+}
- 
- struct tnl_ptk_info {
- 	__be16 flags;
-diff --git a/include/net/vxlan.h b/include/net/vxlan.h
-index e289ada..542f421 100644
---- a/include/net/vxlan.h
-+++ b/include/net/vxlan.h
-@@ -161,6 +161,8 @@ struct vxlan_dev {
- 	struct vxlan_rdst default_dst;	/* default destination */
- 	u32		  flags;	/* VXLAN_F_* in vxlan.h */
- 
-+	struct ip_tunnel_fan fan;
-+
- 	struct timer_list age_timer;
- 	spinlock_t	  hash_lock;
- 	unsigned int	  addrcnt;
-diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
-index 5ad5737..6cde3bf 100644
---- a/include/uapi/linux/if_link.h
-+++ b/include/uapi/linux/if_link.h
-@@ -443,6 +443,7 @@ enum {
- 	IFLA_VXLAN_GBP,
- 	IFLA_VXLAN_REMCSUM_NOPARTIAL,
- 	IFLA_VXLAN_COLLECT_METADATA,
-+	IFLA_VXLAN_FAN_MAP = 33,
- 	__IFLA_VXLAN_MAX
- };
- #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
-diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
-index 85a3e4b..d36b150 100644
---- a/include/uapi/linux/if_tunnel.h
-+++ b/include/uapi/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;
-diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
-index 7a6174b..c821bf1 100644
---- a/net/ipv4/ip_tunnel.c
-+++ b/net/ipv4/ip_tunnel.c
-@@ -1110,11 +1110,6 @@ out:
- }
- EXPORT_SYMBOL_GPL(ip_tunnel_newlink);
- 
--static int ip_tunnel_is_fan(struct ip_tunnel *tunnel)
--{
--	return tunnel->parms.i_flags & TUNNEL_FAN;
--}
--
- int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
- 			 struct ip_tunnel_parm *p)
- {
-@@ -1124,7 +1119,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
- 	struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id);
- 
- 	if (dev == itn->fb_tunnel_dev)
--		return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL;
-+		return fan_has_map(&tunnel->fan) ? 0 : -EINVAL;
- 
- 	t = ip_tunnel_find(itn, p, dev->type);
- 
-diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
-index 56e8984..3877b0e 100644
---- a/net/ipv4/ipip.c
-+++ b/net/ipv4/ipip.c
-@@ -108,6 +108,7 @@
- #include <linux/netfilter_ipv4.h>
- #include <linux/if_ether.h>
- #include <linux/inetdevice.h>
-+#include <linux/rculist.h>
- 
- #include <net/sock.h>
- #include <net/ip.h>
-@@ -209,37 +210,144 @@ drop:
- 	return 0;
- }
- 
--static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel)
-+static struct ip_fan_map *ipip_fan_find_map(struct ip_tunnel *t, __be32 daddr)
- {
--	return tunnel->parms.i_flags & TUNNEL_FAN;
-+	struct ip_fan_map *fan_map;
-+
-+	rcu_read_lock();
-+	list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) {
-+		if (fan_map->overlay ==
-+		    (daddr & inet_make_mask(fan_map->overlay_prefix))) {
-+			rcu_read_unlock();
-+			return fan_map;
-+		}
-+	}
-+	rcu_read_unlock();
-+
-+	return NULL;
- }
- 
--/*
-- * Determine fan tunnel endpoint to send packet to, based on the inner IP
-- * address.  For an overlay (inner) address Y.A.B.C, the transformation is
-- * F.G.A.B, where "F" and "G" are the first two octets of the underlay
-- * network (the network portion of a /16), "A" and "B" are the low order
-- * two octets of the underlay network host (the host portion of a /16),
-- * and "Y" is a configured first octet of the overlay network.
-+/* Determine fan tunnel endpoint to send packet to, based on the inner IP
-+ * address.  
-+ *
-+ * Given a /8 overlay and /16 underlay, for an overlay (inner) address
-+ * Y.A.B.C, the transformation is F.G.A.B, where "F" and "G" are the first
-+ * two octets of the underlay network (the network portion of a /16), "A"
-+ * and "B" are the low order two octets of the underlay network host (the
-+ * host portion of a /16), and "Y" is a configured first octet of the
-+ * overlay network.
-+ *
-+ * E.g., underlay host 10.88.3.4/16 with an overlay of 99.0.0.0/8 would
-+ * host overlay subnet 99.3.4.0/24.  An overlay network datagram from
-+ * 99.3.4.5 to 99.6.7.8, would be directed to underlay host 10.88.6.7,
-+ * which hosts overlay network subnet 99.6.7.0/24.  This transformation is
-+ * described in detail further below.
-+ *
-+ * Using netmasks for the overlay and underlay other than /8 and /16, as
-+ * shown above, can yield larger (or smaller) overlay subnets, with the
-+ * trade-off of allowing fewer (or more) underlay hosts to participate.
-+ *
-+ * The size of each overlay network subnet is defined by the total of the
-+ * network mask of the overlay plus the size of host portion of the
-+ * underlay network. In the above example, /8 + /16 = /24.
-+ *
-+ * E.g., consider underlay host 10.99.238.5/20 and overlay 99.0.0.0/8. In
-+ * this case, the network portion of the underlay is 10.99.224.0/20, and
-+ * the host portion is 0.0.14.5 (12 bits).  To determine the overlay
-+ * network subnet, the 12 bits of host portion are left shifted 12 bits
-+ * (/20 - /8) and ORed with the overlay subnet prefix.  This yields an
-+ * overlay subnet of 99.224.80/20, composed of 8 bits overlay, followed by
-+ * 12 bits underlay.  This yields 12 bits in the overlay network portion,
-+ * allowing for 4094 addresses in each overlay network subnet.  The
-+ * trade-off is that fewer hosts may participate in the underlay network,
-+ * as its host address size has shrunk from 16 bits (65534 addresses) in
-+ * the first example to 12 bits (4094 addresses) here.
-+ *
-+ * For fewer hosts per overlay subnet (permitting a larger number of
-+ * underlay hosts to participate), the underlay netmask may be made
-+ * smaller.
-+ *
-+ * E.g., underlay host 10.111.1.2/12 (network 10.96.0.0/12, host portion
-+ * is 0.15.1.2, 20 bits) with an overlay of 33.0.0.0/8 would left shift
-+ * the 20 bits of host by 4 (so that it's highest order bit is adjacent to
-+ * the lowest order bit of the /8 overlay).  This yields an overlay subnet
-+ * of 33.240.16.32/28 (8 bits overlay, 20 bits from the host portion of
-+ * the underlay).  This provides more addresses for the underlay network
-+ * (approximately 2^20), but each host's segment of the overlay provides
-+ * only 4 bits of addresses (14 usable).
-+ *
-+ * It is also possible to adjust the overlay subnet.
-+ *
-+ * For an overlay of 240.0.0.0/5 and underlay of 10.88.0.0/20, consider
-+ * underlay host 10.88.129.2; the 12 bits of host, 0.0.1.2, are left
-+ * shifted 15 bits (/20 - /5), yielding an overlay network of
-+ * 240.129.0.0/17.  An underlay host of 10.88.244.215 would yield an
-+ * overlay network of 242.107.128.0/17.
-+ *
-+ * For an overlay of 100.64.0.0/10 and underlay of 10.224.220.0/24, for
-+ * underlay host 10.224.220.10, the underlay host portion (.10) is left
-+ * shifted 14 bits, yielding an overlay network subnet of 100.66.128.0/18.
-+ * This would permit 254 addresses on the underlay, with each overlay
-+ * segment providing approximately 2^14 - 2 addresses (16382).
-+ *
-+ * For packets being encapsulated, the overlay network destination IP
-+ * address is deconstructed into its overlay and underlay-derived
-+ * portions.  The underlay portion (determined by the overlay mask and
-+ * overlay subnet mask) is right shifted according to the size of the
-+ * underlay network mask.  This value is then ORed with the network
-+ * portion of the underlay network to produce the underlay network
-+ * destination for the encapsulated datagram.
-+ *
-+ * For example, using the initial example of underlay 10.88.3.4/16 and
-+ * overlay 99.0.0.0/8, with underlay host 10.88.3.4/16 providing overlay
-+ * subnet 99.3.4.0/24 with specfic host 99.3.4.5.  A datagram from
-+ * 99.3.4.5 to 99.6.7.8 would first have the underlay host derived portion
-+ * of the address extracted.  This is a number of bits equal to underlay
-+ * network host portion.  In the destination address, the highest order of
-+ * these bits is one bit lower than the lowest order bit from the overlay
-+ * network mask.
-+ *
-+ * Using the sample value, 99.6.7.8, the overlay mask is /8, and the
-+ * underlay mask is /16 (leaving 16 bits for the host portion).  The bits
-+ * to be shifted are the middle two octets, 0.6.7.0, as this is 99.6.7.8
-+ * ANDed with the mask 0x00ffff00 (which is 16 bits, the highest order of
-+ * which is 1 bit lower than the lowest order overlay address bit).
-  *
-- * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay
-- * subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to
-- * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts
-- * overlay network 99.6.7.0/24.
-+ * These octets, 0.6.7.0, are then right shifted 8 bits, yielding 0.0.6.7.
-+ * This value is then ORed with the underlay network portion,
-+ * 10.88.0.0/16, providing 10.88.6.7 as the final underlay destination for
-+ * the encapuslated datagram.
-+ *
-+ * Another transform using the final example: overlay 100.64.0.0/10 and
-+ * underlay 10.224.220.0/24.  Consider overlay address 100.66.128.1
-+ * sending a datagram to 100.66.200.5.  In this case, 8 bits (the host
-+ * portion size of 10.224.220.0/24) beginning after the 100.64/10 overlay
-+ * prefix are masked off, yielding 0.2.192.0.  This is right shifted 14
-+ * (32 - 10 - (32 - 24), i.e., the number of bits between the overlay
-+ * network portion and the underlay host portion) bits, yielding 0.0.0.11.
-+ * This is ORed with the underlay network portion, 10.224.220.0/24, giving
-+ * the underlay destination of 10.224.220.11 for overlay destination
-+ * 100.66.200.5.
-  */
- static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)
- {
--	unsigned int overlay;
-+	struct ip_fan_map *f_map;
- 	u32 daddr, underlay;
- 
-+	f_map = ipip_fan_find_map(tunnel, ip_hdr(skb)->daddr);
-+	if (!f_map)
-+		return -ENOENT;
-+
- 	daddr = ntohl(ip_hdr(skb)->daddr);
--	overlay = daddr >> 24;
--	underlay = tunnel->fan.map[overlay];
-+	underlay = ntohl(f_map->underlay);
- 	if (!underlay)
- 		return -EINVAL;
- 
- 	*iph = tunnel->parms.iph;
--	iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff));
-+	iph->daddr = htonl(underlay |
-+			   ((daddr & ~f_map->overlay_mask) >>
-+			    (32 - f_map->overlay_prefix -
-+			     (32 - f_map->underlay_prefix))));
- 	return 0;
- }
- 
-@@ -260,7 +368,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
- 	if (IS_ERR(skb))
- 		goto out;
- 
--	if (ipip_tunnel_is_fan(tunnel)) {
-+	if (fan_has_map(&tunnel->fan)) {
- 		if (ipip_build_fan_iphdr(tunnel, skb, &fiph))
- 			goto tx_error;
- 		tiph = &fiph;
-@@ -325,6 +433,8 @@ static const struct net_device_ops ipip_netdev_ops = {
- 
- static void ipip_tunnel_setup(struct net_device *dev)
- {
-+	struct ip_tunnel *t = netdev_priv(dev);
-+
- 	dev->netdev_ops		= &ipip_netdev_ops;
- 
- 	dev->type		= ARPHRD_TUNNEL;
-@@ -336,6 +446,7 @@ static void ipip_tunnel_setup(struct net_device *dev)
- 	dev->features		|= IPIP_FEATURES;
- 	dev->hw_features	|= IPIP_FEATURES;
- 	ip_tunnel_setup(dev, ipip_net_id);
-+	INIT_LIST_HEAD(&t->fan.fan_maps);
- }
- 
- static int ipip_tunnel_init(struct net_device *dev)
-@@ -419,41 +530,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
- 	return ret;
- }
- 
--static void ipip_fan_free_map(struct ip_tunnel *t)
-+static void ipip_fan_flush_map(struct ip_tunnel *t)
- {
--	memset(&t->fan.map, 0, sizeof(t->fan.map));
-+	struct ip_fan_map *fan_map;
-+
-+	list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) {
-+		list_del_rcu(&fan_map->list);
-+		kfree_rcu(fan_map, rcu);
-+	}
- }
- 
--static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)
-+static int ipip_fan_del_map(struct ip_tunnel *t, __be32 overlay)
- {
--	u32 overlay, overlay_mask, underlay, underlay_mask;
-+	struct ip_fan_map *fan_map;
- 
--	if ((map->underlay_prefix && map->underlay_prefix != 16) ||
--	    (map->overlay_prefix && map->overlay_prefix != 8))
--		return -EINVAL;
-+	fan_map = ipip_fan_find_map(t, overlay);
-+	if (!fan_map)
-+		return -ENOENT;
-+
-+	list_del_rcu(&fan_map->list);
-+	kfree_rcu(fan_map, rcu);
- 
--	overlay = ntohl(map->overlay);
--	overlay_mask = ntohl(inet_make_mask(map->overlay_prefix));
-+	return 0;
-+}
- 
--	underlay = ntohl(map->underlay);
--	underlay_mask = ntohl(inet_make_mask(map->underlay_prefix));
-+static int ipip_fan_add_map(struct ip_tunnel *t, struct ifla_fan_map *map)
-+{
-+	__be32 overlay_mask, underlay_mask;
-+	struct ip_fan_map *fan_map;
- 
--	if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask))
--		return -EINVAL;
-+	overlay_mask = inet_make_mask(map->overlay_prefix);
-+	underlay_mask = inet_make_mask(map->underlay_prefix);
- 
--	if (!(overlay & overlay_mask) && (underlay & underlay_mask))
-+	if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask))
- 		return -EINVAL;
- 
--	t->parms.i_flags |= TUNNEL_FAN;
-+	if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask))
-+		return -EINVAL;
- 
--	/* Special case: overlay 0 and underlay 0 clears all mappings */
--	if (!overlay && !underlay) {
--		ipip_fan_free_map(t);
-+	/* Special case: overlay 0 and underlay 0: flush all mappings */
-+	if (!map->overlay && !map->underlay) {
-+		ipip_fan_flush_map(t);
- 		return 0;
- 	}
-+	
-+	/* Special case: overlay set and underlay 0: clear map for overlay */
-+	if (!map->underlay)
-+		return ipip_fan_del_map(t, map->overlay);
-+
-+	if (ipip_fan_find_map(t, map->overlay))
-+		return -EEXIST;
-+
-+	fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL);
-+	fan_map->underlay = map->underlay;
-+	fan_map->overlay = map->overlay;
-+	fan_map->underlay_prefix = map->underlay_prefix;
-+	fan_map->overlay_mask = ntohl(overlay_mask);
-+	fan_map->overlay_prefix = map->overlay_prefix;
- 
--	overlay >>= (32 - map->overlay_prefix);
--	t->fan.map[overlay] = underlay;
-+	list_add_tail_rcu(&fan_map->list, &t->fan.fan_maps);
- 
- 	return 0;
- }
-@@ -462,7 +597,7 @@ static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)
- static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,
- 			    struct ip_tunnel_parm *parms)
- {
--	struct ip_tunnel_fan_map *map;
-+	struct ifla_fan_map *map;
- 	struct nlattr *attr;
- 	int rem, rv;
- 
-@@ -474,7 +609,7 @@ static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,
- 
- 	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {
- 		map = nla_data(attr);
--		rv = ipip_fan_set_map(t, map);
-+		rv = ipip_fan_add_map(t, map);
- 		if (rv)
- 			return rv;
- 	}
-@@ -555,7 +690,7 @@ static size_t ipip_get_size(const struct net_device *dev)
- 		/* IFLA_IPTUN_ENCAP_DPORT */
- 		nla_total_size(2) +
- 		/* IFLA_IPTUN_FAN_MAP */
--		nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 +
-+		nla_total_size(sizeof(struct ifla_fan_map)) * 256 +
- 		0;
- }
- 
-@@ -583,25 +718,22 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)
- 			tunnel->encap.flags))
- 		goto nla_put_failure;
- 
--	if (tunnel->parms.i_flags & TUNNEL_FAN) {
-+	if (fan_has_map(&tunnel->fan)) {
- 		struct nlattr *fan_nest;
--		int i;
-+		struct ip_fan_map *fan_map;
- 
- 		fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP);
- 		if (!fan_nest)
- 			goto nla_put_failure;
--		for (i = 0; i < 256; i++) {
--			if (tunnel->fan.map[i]) {
--				struct ip_tunnel_fan_map map;
--
--				map.underlay = htonl(tunnel->fan.map[i]);
--				map.underlay_prefix = 16;
--				map.overlay = htonl(i << 24);
--				map.overlay_prefix = 8;
--				if (nla_put(skb, IFLA_FAN_MAPPING,
--					    sizeof(map), &map))
--					goto nla_put_failure;
--			}
-+		list_for_each_entry_rcu(fan_map, &tunnel->fan.fan_maps, list) {
-+			struct ifla_fan_map map;
-+
-+			map.underlay = fan_map->underlay;
-+			map.underlay_prefix = fan_map->underlay_prefix;
-+			map.overlay = fan_map->overlay;
-+			map.overlay_prefix = fan_map->overlay_prefix;
-+			if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map))
-+				goto nla_put_failure;
- 		}
- 		nla_nest_end(skb, fan_nest);
- 	}
--- 
-2.7.4
-
diff --git a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch b/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch
deleted file mode 100644
index cfa8009e71e..00000000000
--- a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 7415cb7b31569e9266229d4ebc79ccec4841ab04 Mon Sep 17 00:00:00 2001
-From: Serge Hallyn <serge.hallyn@ubuntu.com>
-Date: Fri, 7 Feb 2014 09:32:46 -0600
-Subject: [PATCH] UBUNTU: SAUCE: Overlayfs: allow unprivileged mounts
-
-Unprivileged mounting, here, refers to root in a non-initial user
-namespace performing the mount.  In particular, it requires
-CAP_SYS_ADMIN toward the task's mounts namespace, alleviating
-the concerns of manipulating mount environment for setuid-root
-binaries on the host.
-
-We refuse unprivileged mounting of most filesystem types because
-we do not trust the in-kernel superblock parsers to correctly
-handle malicious input.
-
-However, overlayfs does not parse any user-provided data other
-than the pathnames passed in.  Therefore unprivileged mounting
-of overlayfs should be safe.
-
-Allowing unprivileged mounting of overlayfs filesystems would
-allow Ubuntu Trusty users to create overlayfs-based container
-snapshots, which would be a huge usability improvement.
-
-This patch enables unprivileged mounting of overlayfs.
-
-I tested a few simple combinations, and found that, when
-doing (the equivalent of)
-
-mount -t overlayfs -oupperdir=u,lowerdir=l l t
-
-(u for upper, l for lower, t for target),
-
-1. overlayfs mount is always allowed, regardless of ownership
-of u, l, or t.  However
-
-2. Creation of new files is allowed so long as u is owned by
-   T.  Otherwise, regardless of ownerships of l and t it is
-   denied.  (This is expected;  t was the mountpoint and
-   'disapears', so its ownership is irrelevant)
-
-3. modification of a file 'hithere' which is in l but not yet
-   in u, and which is not owned by T, is not allowed, even if
-   writes to u are allowed.  This may be a bug in overlayfs,
-   but it is safe behavior.  It also will not cause a problem
-   for lxc since lxc will ensure that files are mapped into T's
-   namespace.
-
-Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
-Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-Signed-off-by: Andy Whitcroft <apw@canonical.com>
----
- fs/overlayfs/super.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
-index 9473e79..50890c2 100644
---- a/fs/overlayfs/super.c
-+++ b/fs/overlayfs/super.c
-@@ -668,6 +668,7 @@ static struct file_system_type ovl_fs_type = {
- 	.name		= "overlayfs",
- 	.mount		= ovl_mount,
- 	.kill_sb	= kill_anon_super,
-+	.fs_flags	= FS_USERNS_MOUNT,
- };
- MODULE_ALIAS_FS("overlayfs");
- 
--- 
-2.1.0.rc1
-

From 897eec7d7965f87bf859066e21affd6f2fa6b828 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 19:12:14 +0200
Subject: [PATCH 1898/3246] linuxHeaders_2_{4,6}: remove

---
 pkgs/os-specific/linux/kernel-headers/2.4.nix | 54 -------------------
 pkgs/top-level/all-packages.nix               | 10 ----
 2 files changed, 64 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.4.nix

diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix
deleted file mode 100644
index 9457769f5ef..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/2.4.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{stdenv, fetchurl, perl, cross ? null}:
-
-assert cross == null -> stdenv.isLinux;
-
-let
-  version = "2.4.37.9";
-  kernelHeadersBaseConfig = if cross == null then
-      stdenv.platform.kernelHeadersBaseConfig
-    else
-      cross.platform.kernelHeadersBaseConfig;
-in
-
-stdenv.mkDerivation {
-  name = "linux-headers-${version}";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.4/linux-${version}.tar.bz2";
-    sha256 = "08rca9lcb5l5w483hgaqk8pi2njd7cmwpkifjqxwlb3g8liz4r5g";
-  };
-
-  targetConfig = if cross != null then cross.config else null;
-
-  platform =
-    if cross != null then cross.platform.kernelArch else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.isArm then "arm" else
-    abort "don't know what the kernel include directory is called for this platform";
-
-  buildInputs = [perl];
-
-  patchPhase = ''
-    sed -i s,/bin/pwd,pwd, Makefile
-  '';
-
-  extraIncludeDirs =
-    if cross != null then
-      (if cross.arch == "powerpc" then ["ppc"] else [])
-    else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-
-  buildPhase = ''
-    cp arch/$platform/${kernelHeadersBaseConfig} .config
-    make mrproper symlinks include/linux/{version,compile}.h \
-      ARCH=$platform
-    yes "" | make oldconfig ARCH=$platform
-  '';
-
-  installPhase = ''
-    mkdir -p $out/include
-    cp -a include/{asm,asm-$platform,acpi,linux,pcmcia,scsi,video} \
-      $out/include
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f06493f5741..7a8453e86fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12007,14 +12007,6 @@ with pkgs;
 
   lkl = callPackage ../applications/virtualization/lkl { };
 
-  linuxHeaders_2_4 = callPackage ../os-specific/linux/kernel-headers/2.4.nix {
-    cross = if targetPlatform != hostPlatform then targetPlatform else null;
-  };
-
-  linuxHeaders_2_6 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
-    cross = if targetPlatform != hostPlatform then targetPlatform else null;
-  };
-
   linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
     cross = if targetPlatform != hostPlatform then targetPlatform else null;
   };
@@ -12024,8 +12016,6 @@ with pkgs;
     if targetPlatform != hostPlatform
     then
       { # switch
-        "2.4" = linuxHeaders_2_4;
-        "2.6" = linuxHeaders_2_6;
         "4.4" = linuxHeaders_4_4;
       }.${targetPlatform.platform.kernelMajor}
         or (throw "Unknown linux kernel version")

From f77825618f5407689ee348c17c8eea5edeed1d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Fri, 11 Aug 2017 19:09:38 +0200
Subject: [PATCH 1899/3246] ipfsapi: 0.4.5-pre -> 0.4.2.post1

This is not a downgrade, 0.4.5-pre was a unofficial version.
---
 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 8ad10d47867..baf7d52cd16 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6648,14 +6648,14 @@ in {
 
   ipfsapi = buildPythonPackage rec {
     name = "ipfsapi-${version}";
-    version = "0.4.5-pre";
+    version = "0.4.2.post1";
     disabled = isPy26 || isPy27;
 
     src = pkgs.fetchFromGitHub {
       owner = "ipfs";
       repo = "py-ipfs-api";
-      rev = "bcce00e4a9b674d062729d82bd49a9ffbf76486f";
-      sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126";
+      rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61";
+      sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn";
     };
 
     propagatedBuildInputs = with self; [ six requests ];

From e34ce9d1c551fb43742aada6bb43ccb1a52e64a1 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 10 Aug 2017 11:43:48 +0200
Subject: [PATCH 1900/3246] gnupg: 2.1.22 -> 2.1.23

This release in a RC for gnupg-2.2. The main difference as far as
nixpkgs is concerned is that the binary `gpg2` is now called `gpg` and
`gpgv2` is called `gpgv`.

This update fixed all explicit use of `gpg2` and `gpgv2` across nixpkgs,
but there might be some packaged software that internally use `gpg2`
not handeled by this commit.

See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00001.html
for full release information
---
 pkgs/applications/misc/gpg-mdp/default.nix                | 4 ++--
 .../networking/browsers/firefox-bin/update.nix            | 4 ++--
 .../networking/mailreaders/notmuch/default.nix            | 8 ++++----
 pkgs/development/ruby-modules/gem-config/default.nix      | 2 +-
 pkgs/os-specific/linux/tomb/default.nix                   | 3 +--
 pkgs/tools/misc/debian-devscripts/default.nix             | 4 ++--
 pkgs/tools/misc/pipelight/default.nix                     | 2 +-
 pkgs/tools/misc/pipelight/pipelight.patch                 | 2 +-
 pkgs/tools/security/gnupg/1compat.nix                     | 4 ----
 pkgs/tools/security/gnupg/21.nix                          | 4 ++--
 pkgs/tools/security/gnupg/gpgkey2ssh-20.patch             | 2 +-
 pkgs/tools/security/pius/default.nix                      | 2 +-
 12 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix
index fe58fa92d07..4143f6fde55 100644
--- a/pkgs/applications/misc/gpg-mdp/default.nix
+++ b/pkgs/applications/misc/gpg-mdp/default.nix
@@ -19,11 +19,11 @@ in stdenv.mkDerivation {
       --replace "alias echo=/bin/echo" ""
 
     substituteInPlace ./src/config.c \
-      --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" \
+      --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \
       --replace "/usr/bin/vi" "vi"
 
     substituteInPlace ./mdp.1 \
-      --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2"
+      --replace "/usr/bin/gpg" "${gnupg}/bin/gpg"
   '';
   # we add symlinks to the binary and man page with the name 'gpg-mdp', in case
   # the completely unrelated program also named 'mdp' is already installed.
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index 3bcc2ab003c..ac3f7d1380c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -22,7 +22,7 @@ in writeScript "update-${name}" ''
   pushd ${basePath}
 
   HOME=`mktemp -d`
-  cat ${./firefox.key} | gpg2 --import
+  cat ${./firefox.key} | gpg --import
 
   tmpfile=`mktemp`
   url=${baseUrl}
@@ -47,7 +47,7 @@ in writeScript "update-${name}" ''
 
   curl --silent -o $HOME/shasums "$url$version/SHA512SUMS"
   curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc"
-  gpgv2 --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums
+  gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums
 
   # this is a list of sha512 and tarballs for both arches
   shasums=`cat $HOME/shasums`
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index c53383b954e..606e5593593 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
     find test -type f -exec \
       sed -i \
         -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \
-        -e "s|gpg |${gnupg}/bin/gpg2 |" \
-        -e "s| gpg| ${gnupg}/bin/gpg2|" \
+        -e "s|gpg |${gnupg}/bin/gpg |" \
+        -e "s| gpg| ${gnupg}/bin/gpg|" \
         -e "s|gpgsm |${gnupg}/bin/gpgsm |" \
         -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \
-        -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg2|" \
+        -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg|" \
         "{}" ";"
 
     for src in \
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
       emacs/notmuch-crypto.el
     do
       substituteInPlace "$src" \
-        --replace \"gpg\" \"${gnupg}/bin/gpg2\"
+        --replace \"gpg\" \"${gnupg}/bin/gpg\"
     done
   '';
 
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 204c7443600..90e72b16802 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -242,7 +242,7 @@ in
 
       substituteInPlace lib/sup/crypto.rb \
         --replace 'which gpg2' \
-                  '${which}/bin/which gpg2'
+                  '${which}/bin/which gpg'
     '';
   };
 
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index f1347c197bf..2ef5d53b066 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -28,8 +28,7 @@ stdenv.mkDerivation rec {
     install -Dm755 tomb       $out/bin/tomb
     install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1
 
-    # it works fine with gnupg v2, but it looks for an executable named gpg
-    ln -s ${gnupg}/bin/gpg2 $out/bin/gpg
+    ln -s ${gnupg}/bin/gpg $out/bin/gpg
 
     wrapProgram $out/bin/tomb \
       --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]}
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index cbc7a2e7e46..810bf06527b 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -27,10 +27,10 @@ in stdenv.mkDerivation rec {
     mkdir -p "$tgtpy"
     export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
     find po4a scripts -type f -exec sed -r \
-      -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \
+      -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@g" \
       -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \
       -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \
-      -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \
+      -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \
       -e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \
       -i {} +
     sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index 16f50436990..c68d41532c2 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
       --prefix=$out \
       --moz-plugin-path=$out/${mozillaPluginPath} \
       --wine-path=${wine_custom} \
-      --gpg-exec=${gnupg}/bin/gpg2 \
+      --gpg-exec=${gnupg}/bin/gpg \
       --bash-interp=${bash}/bin/bash \
       --downloader=${curl.bin}/bin/curl
       $configureFlags
diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/tools/misc/pipelight/pipelight.patch
index 66dd0fdab4c..fc6666f8f12 100644
--- a/pkgs/tools/misc/pipelight/pipelight.patch
+++ b/pkgs/tools/misc/pipelight/pipelight.patch
@@ -62,7 +62,7 @@ diff -urN pipelight.old/configure pipelight.new/configure
 -	gpg_exec="/usr/bin/gpg"
 -fi
 +bash_interp=bash
-+gpg_exec=gpg2
++gpg_exec=gpg
  moz_plugin_path=""
  gcc_runtime_dlls=""
  so_mode="0644"
diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix
index da700fe9f22..eadfbe230b3 100644
--- a/pkgs/tools/security/gnupg/1compat.nix
+++ b/pkgs/tools/security/gnupg/1compat.nix
@@ -12,10 +12,6 @@ stdenv.mkDerivation {
     ${coreutils}/bin/rm $out/bin
     ${coreutils}/bin/mkdir -p $out/bin
     ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin
-
-    # Add gpg->gpg2 and gpgv->gpgv2 symlinks
-    ${coreutils}/bin/ln -s gpg2 $out/bin/gpg
-    ${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv
   '';
 
   meta = gnupg.meta // {
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 2d43d3e977a..1523f3e159c 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.22";
+  version = "2.1.23";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1msazgy1q1pp7y2xr46z0il4pfzmzgzkp7v0hv5cz4hvkspnywa6";
+    sha256 = "0xqd5nm4j3w9lwk35vg57gl2i8bfkmx7d24i44gkbscm2lwpci59";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
index 4bfdc13ef59..65804bac764 100644
--- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
+++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
@@ -7,7 +7,7 @@ index 903fb5b..d5611dc 100644
  
    ret = asprintf (&command,
 -		  "gpg --list-keys --with-colons --with-key-data '%s'",
-+		  "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'",
++		  "@out@/bin/gpg --list-keys --with-colons --with-key-data '%s'",
  		  keyid);
    assert (ret > 0);
  
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index c81a01ef896..af27fb6cd01 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   buildInputs = [ python ];
 
   patchPhase = ''
-    sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g'
+    sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg|g'
   '';
 
   dontBuild = true;

From 60da71407a060b1738b0acf787bff0b10fc86cad Mon Sep 17 00:00:00 2001
From: Ben Darwin <ben@gentzen>
Date: Fri, 11 Aug 2017 12:33:53 -0400
Subject: [PATCH 1901/3246] pythonPackages.paramz: init at 0.7.4

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

diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
new file mode 100644
index 00000000000..97d4d6de404
--- /dev/null
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator }:
+
+buildPythonPackage rec {
+  pname = "paramz";
+  version = "0.7.4";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1r4mayzp7cb5w1kz45sw65is9j3p60h0yyp8hdhsx393rr4n82nn";
+  };
+
+  propagatedBuildInputs = [ numpy scipy six decorator ];
+
+  meta = with stdenv.lib; {
+    description = "Parameterization framework for parameterized model creation and handling";
+    homepage = https://github.com/sodz/paramz;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e87630212ce..6c5fe359981 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16463,6 +16463,8 @@ in {
     };
   };
 
+  paramz = callPackage ../development/python-modules/paramz { };
+
   parsel = buildPythonPackage rec {
     name = "parsel-${version}";
     version = "1.1.0";

From bc755f39d2022e8faaca38f17efa95e4e8db3e75 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 10 Aug 2017 20:42:08 +0000
Subject: [PATCH 1902/3246] Update all-packages.nix

---
 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 7a8453e86fb..55ee8f34be6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13095,7 +13095,7 @@ with pkgs;
   stix-two = callPackage ../data/fonts/stix-two { };
 
   inherit (callPackages ../data/fonts/gdouros { })
-    symbola aegyptus akkadian anatolian maya unidings musica analecta;
+    symbola aegyptus akkadian anatolian maya unidings musica analecta textfonts aegan abydos;
 
   iana-etc = callPackage ../data/misc/iana-etc { };
 

From 443ac233364b68903b7eaf342ba9fe6f53a3271a Mon Sep 17 00:00:00 2001
From: "pe@pijul.org" <pe@pijul.org>
Date: Thu, 3 Aug 2017 08:32:49 +0200
Subject: [PATCH 1903/3246] Gwyddion: init at 2.48

---
 .../science/chemistry/gwyddion/default.nix    | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/science/chemistry/gwyddion/default.nix

diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix
new file mode 100644
index 00000000000..b98af36604a
--- /dev/null
+++ b/pkgs/applications/science/chemistry/gwyddion/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, gtk2, pkgconfig }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation {
+  name = "gwyddion";
+  version = "2.48";
+  src = fetchurl {
+    url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz";
+    sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx";
+  };
+  buildInputs = [ gtk2 pkgconfig ];
+  meta = {
+    homepage = http://gwyddion.net/;
+
+    description = "Scanning probe microscopy data visualization and analysis";
+
+    longDescription = ''
+      A modular program for SPM (scanning probe microscopy) data
+      visualization and analysis. Primarily it is intended for the
+      analysis of height fields obtained by scanning probe microscopy
+      techniques (AFM, MFM, STM, SNOM/NSOM) and it supports a lot of
+      SPM data formats. However, it can be used for general height
+      field and (greyscale) image processing, for instance for the
+      analysis of profilometry data or thickness maps from imaging
+      spectrophotometry.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a8453e86fb..664019fd6f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2384,6 +2384,8 @@ with pkgs;
 
   gvolicon = callPackage ../tools/audio/gvolicon {};
 
+  gwyddion = callPackage ../applications/science/chemistry/gwyddion {};
+
   gzip = callPackage ../tools/compression/gzip { };
 
   gzrt = callPackage ../tools/compression/gzrt { };

From ebdbc08583fe9a5e6dfb68c02002163091900819 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 11 Jul 2017 11:51:18 +0300
Subject: [PATCH 1904/3246] xorg: Split some man outputs from doc

Because soon manpages won't go to $doc anymore.
---
 pkgs/servers/x11/xorg/overrides.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8317bd7ce6f..2f2270d536d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -73,7 +73,7 @@ in
   libxcb = attrs : attrs // {
     nativeBuildInputs = [ args.python ];
     configureFlags = "--enable-xkb --enable-xinput";
-    outputs = [ "out" "dev" "doc" ];
+    outputs = [ "out" "dev" "man" "doc" ];
   };
 
   xcbproto = attrs : attrs // {
@@ -177,7 +177,7 @@ in
   };
 
   libXext = attrs: attrs // {
-    outputs = [ "out" "dev" "doc" ];
+    outputs = [ "out" "dev" "man" "doc" ];
     propagatedBuildInputs = [ xorg.xproto xorg.libXau ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
@@ -187,7 +187,7 @@ in
   };
 
   libXi = attrs: attrs // {
-    outputs = [ "out" "dev" "doc" ];
+    outputs = [ "out" "dev" "man" "doc" ];
     propagatedBuildInputs = [ xorg.libXfixes ];
   };
 

From 9f2f74d9bc9450e8c5cb0cda0b341be63a380e04 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 11 Jul 2017 11:53:28 +0300
Subject: [PATCH 1905/3246] ffmpeg: Add man output

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

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index a34b378552a..1bd8b739260 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   postPatch = ''patchShebangs .'';
   inherit patches;
 
-  outputs = [ "bin" "dev" "out" ]
+  outputs = [ "bin" "dev" "out" "man" ]
     ++ optional (reqMin "1.0") "doc" ; # just dev-doc
   setOutputFlags = false; # doesn't accept all and stores configureFlags in libs!
 

From 3f29eb824869434ee4c1fa3656af6a0161174407 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 11 Jul 2017 11:53:41 +0300
Subject: [PATCH 1906/3246] ghostscript: Add man output

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

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index c8edeaf93a1..2467420046b 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" "doc" ];
 
   enableParallelBuilding = true;
 

From 03d37dc38835b555a2fb89668231205cd974455a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 11 Jul 2017 11:53:57 +0300
Subject: [PATCH 1907/3246] perlPackages.ack: doc -> man

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8601f266186..63e88316aae 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -30,7 +30,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
       sha256 = "0ifbmbfvagfi76i7vjpggs2hrbqqisd14f5zizan6cbdn8dl5z2g";
     };
-    outputs = ["out" "doc"];
+    outputs = ["out" "man"];
     # use gnused so that the preCheck command passes
     buildInputs = stdenv.lib.optional stdenv.isDarwin gnused;
     propagatedBuildInputs = [ FileNext ];

From 1ff422aa23d3c38089e08bad6e77178d36445215 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 11 Jul 2017 12:14:14 +0300
Subject: [PATCH 1908/3246] treewide: Add man & info outputs where necessary
 (instead of doc)

Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
---
 pkgs/applications/audio/flac/default.nix                      | 2 +-
 pkgs/applications/graphics/meh/default.nix                    | 2 +-
 pkgs/applications/misc/moonlight-embedded/default.nix         | 2 +-
 pkgs/applications/misc/mupdf/default.nix                      | 2 +-
 pkgs/applications/misc/xrq/default.nix                        | 2 +-
 pkgs/applications/networking/irc/weechat/default.nix          | 2 +-
 pkgs/applications/window-managers/ratpoison/default.nix       | 2 +-
 pkgs/desktops/gnome-2/platform/GConf/default.nix              | 2 +-
 pkgs/development/compilers/ghc/8.0.2.nix                      | 2 +-
 pkgs/development/compilers/rust/rustc.nix                     | 2 +-
 pkgs/development/libraries/aalib/default.nix                  | 2 +-
 pkgs/development/libraries/acl/default.nix                    | 2 +-
 pkgs/development/libraries/attr/default.nix                   | 2 +-
 pkgs/development/libraries/fftw/default.nix                   | 2 +-
 pkgs/development/libraries/gettext/default.nix                | 2 +-
 pkgs/development/libraries/libao/default.nix                  | 2 +-
 pkgs/development/libraries/libffi/default.nix                 | 2 +-
 pkgs/development/libraries/libjpeg-turbo/default.nix          | 2 +-
 pkgs/development/libraries/libksba/default.nix                | 2 +-
 pkgs/development/libraries/libmbim/default.nix                | 2 +-
 pkgs/development/libraries/libsndfile/default.nix             | 2 +-
 pkgs/development/libraries/libtiff/default.nix                | 2 +-
 pkgs/development/libraries/libxml2/default.nix                | 2 +-
 pkgs/development/libraries/libxslt/default.nix                | 2 +-
 pkgs/development/libraries/mpfr/default.nix                   | 2 +-
 pkgs/development/libraries/readline/6.3.nix                   | 2 +-
 pkgs/development/libraries/readline/7.0.nix                   | 2 +-
 pkgs/development/libraries/slang/default.nix                  | 2 +-
 pkgs/development/libraries/xapian/default.nix                 | 2 +-
 pkgs/development/tools/build-managers/gnumake/4.2/default.nix | 2 +-
 pkgs/os-specific/linux/libcap/default.nix                     | 2 +-
 pkgs/os-specific/linux/udisks/2-default.nix                   | 2 +-
 pkgs/servers/http/apache-httpd/2.4.nix                        | 2 +-
 pkgs/servers/uftp/default.nix                                 | 2 +-
 pkgs/shells/bash/4.4.nix                                      | 2 +-
 pkgs/tools/graphics/pfstools/default.nix                      | 2 +-
 pkgs/tools/networking/dnsperf/default.nix                     | 2 +-
 pkgs/tools/networking/tinc/pre.nix                            | 2 +-
 pkgs/tools/text/groff/default.nix                             | 2 +-
 39 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 52e29e3da4c..9d10627afce 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   #doCheck = true; # takes lots of time
 
-  outputs = [ "bin" "dev" "out" "doc" ];
+  outputs = [ "bin" "dev" "out" "man" "doc" ];
 
   meta = with stdenv.lib; {
     homepage = http://xiph.org/flac/;
diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix
index 1b5fbc2271b..ac2a194b7ca 100644
--- a/pkgs/applications/graphics/meh/default.nix
+++ b/pkgs/applications/graphics/meh/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     make PREFIX=$out install
   '';
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" ];
 
   buildInputs = [ libXext libX11 libjpeg libpng giflib ];
 
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 894751571ec..c95f935b855 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" ];
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 914dc335145..da5f3c3bf12 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "prefix=$(out)" ];
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ];
-  outputs = [ "bin" "dev" "out" "doc" ];
+  outputs = [ "bin" "dev" "out" "man" "doc" ];
 
   preConfigure = ''
     # Don't remove mujs because upstream version is incompatible
diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix
index c0c5616db79..fe65004b32a 100644
--- a/pkgs/applications/misc/xrq/default.nix
+++ b/pkgs/applications/misc/xrq/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     make PREFIX=$out install
   '';
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" ];
 
   buildInputs = [ libX11 ];
 
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index e1a9640bc23..e9484044fcc 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc";
   };
 
-  outputs = [ "out" ]; # "doc" was here but was not produced
+  outputs = [ "out" "man" ];
 
   enableParallelBuilding = true;
   cmakeFlags = with stdenv.lib; [
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 9879ffd64df..ced8e2e0b9d 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr";
   };
 
-  outputs = [ "out" "contrib" "doc" "info" ];
+  outputs = [ "out" "contrib" "man" "doc" "info" ];
 
   configureFlags = [
     # >=1.4.9 requires this even with readline in inputs
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index d1f748c993d..afa27a93bad 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "man" ];
 
   buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 354091fb646..e50a8df7352 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" "doc" ];
 
   preConfigure = ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index c5767541a02..f5bcc73fd6d 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation {
   buildInputs = [ ncurses ] ++ targetToolchains
     ++ optional (!forceBundledLLVM) llvmShared;
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" "doc" ];
   setOutputFlags = false;
 
   # Disable codegen units for the tests.
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index 2615cac7b90..69d736d4476 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv";
   };
 
-  outputs = [ "bin" "dev" "out" "doc" ];
+  outputs = [ "bin" "dev" "out" "man" "info" ];
   setOutputFlags = false; # Doesn't support all the flags
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index b29a12e6f41..dc9e4e6ff18 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p";
   };
 
-  outputs = [ "bin" "dev" "out" "doc" ];
+  outputs = [ "bin" "dev" "out" "man" "doc" ];
 
   nativeBuildInputs = [ gettext ];
   buildInputs = [ attr ];
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 7cab14a8e10..6a94cb0c0e2 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5";
   };
 
-  outputs = [ "bin" "dev" "out" "doc" ];
+  outputs = [ "bin" "dev" "out" "man" "doc" ];
 
   nativeBuildInputs = [ gettext ];
 
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 4bbc515831e..d4d8c7f8aee 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g8qk98lgq770ixdf7n36yd5xjsgm2v3wzvnphwmhy6r4y2amx0y";
   };
 
-  outputs = [ "out" "dev" "doc" ]; # it's dev-doc only
+  outputs = [ "out" "dev" "man" "info" ]; # it's dev-doc only
   outputBin = "dev"; # fftw-wisdom
 
   configureFlags =
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index d7058884104..b96c4599994 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
   patches = [ ./absolute-paths.diff ];
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" "doc" "info" ];
 
   # FIXME stackprotector needs gcc 4.9 in bootstrap tools
   hardeningDisable = [ "format" "stackprotector" ];
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index d3cb1283331..ee57859acc3 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "man" "doc" ];
 
   buildInputs =
     [ pkgconfig ] ++
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index ca149bd3db3..284705e88d3 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch;
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "man" "info" ];
 
   buildInputs = stdenv.lib.optional doCheck dejagnu;
 
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index d1181966815..1023c8ae505 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional (hostPlatform.libc or null == "msvcrt")
       ./mingw-boolean.patch;
 
-  outputs = [ "bin" "dev" "out" "doc" ];
+  outputs = [ "bin" "dev" "out" "man" "doc" ];
 
   nativeBuildInputs = [ nasm ];
 
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 9e1d4b58a92..8bff5a21cd0 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "info" ];
 
   propagatedBuildInputs = [ libgpgerror ];
 
diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index c40e54e09cb..f1625e6a33f 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nxb4x8l092xckk4dy84cn5qhviif8akzy0miypapjqqbalm53fa";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "man" ];
 
   preConfigure = ''
     patchShebangs .
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 180d217ddf1..75e1374a228 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  outputs = [ "bin" "dev" "out" "doc" ];
+  outputs = [ "bin" "dev" "out" "man" "doc" ];
 
   # need headers from the Carbon.framework in /System/Library/Frameworks to
   # compile this on darwin -- not sure how to handle
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 7f6faa996bd..b64a578f0cc 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
     '';
 
-  outputs = [ "bin" "dev" "out" "doc" ];
+  outputs = [ "bin" "dev" "out" "man" "doc" ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 10dd4ee5dbe..37057295672 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
     })
   ];
 
-  outputs = [ "bin" "dev" "out" "doc" ]
+  outputs = [ "bin" "dev" "out" "man" "doc" ]
     ++ lib.optional pythonSupport "py";
   propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
 
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 118b8af5a6f..8a24b700ecf 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       --replace 'la_LDFLAGS =' 'la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS)'
   '';
 
-  outputs = [ "bin" "dev" "out" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
+  outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
 
   buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ];
 
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 4f9a9fb9bd0..360ad66b7ce 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./upstream.patch ];
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "doc" "info" ];
 
   # mpfr.h requires gmp.h
   propagatedBuildInputs = [ gmp ];
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index 822ce7b0055..1183f46b8db 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "man" "doc" "info" ];
 
   propagatedBuildInputs = [ncurses];
 
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 7cc76e08768..fd1a3608377 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "man" "doc" "info" ];
 
   propagatedBuildInputs = [ncurses];
 
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index 553ddb7d3b7..70e9d6181d9 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "man" "doc" ];
 
   # Fix some wrong hardcoded paths
   preConfigure = ''
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 764200c89f5..23fee81e0a5 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -11,7 +11,7 @@ let
       inherit sha256;
     };
 
-    outputs = [ "out" "doc" ];
+    outputs = [ "out" "man" "doc" ];
 
     buildInputs = [ libuuid zlib ];
     nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 323f33d7d6c..56d4b831460 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   configureFlags = stdenv.lib.optional guileSupport "--with-guile";
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" "info" ];
 
   meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/make/;
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 088d2ae234c..1cc8ab60d75 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39";
   };
 
-  outputs = [ "out" "dev" "lib" "doc" ]
+  outputs = [ "out" "dev" "lib" "man" "doc" ]
     ++ stdenv.lib.optional (pam != null) "pam";
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 35873b3a062..a265395f96e 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" ];
 
   patches = [ ./force-path.patch ];
 
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 30f8fbef119..3393d0cf58b 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   # FIXME: -dev depends on -doc
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" "man" "doc" ];
   setOutputFlags = false; # it would move $out/modules, etc.
 
   buildInputs = [perl] ++
diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index 22cc5646f8b..524fb8c14c4 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl ];
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" ];
 
   patchPhase = ''
     substituteInPlace makefile --replace gcc cc
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index dba31e41ca3..cf7fe35d5f3 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  outputs = [ "out" "dev" "doc" "info" ];
+  outputs = [ "out" "dev" "man" "doc" "info" ];
 
   # the man pages are small and useful enough
   outputMan = if interactive then "out" else null;
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 53f77d097c5..7e6b3523ed8 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1fyc2c7jzr7k797c2dqyyvapzc3szxwcp48r382yxz2yq558xgd9";
   };
 
-  outputs = [ "out" "dev" "doc"];
+  outputs = [ "out" "dev" "man"];
 
   cmakeFlags = ''
     -DWITH_MATLAB=false 
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
index c65e47a88b0..b021201a4d4 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "03kfc65s5a9csa5i7xjsv0psq144k8d9yw7xlny61bg1h2kg1db4";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" "doc" ];
 
   buildInputs = [ bind libseccomp zlib ];
 
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 1d80db68991..38ba5accbb3 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "05an2vj0a3wjv5w672wgzyixbydin5jpja5zv6x81bc72dms0ymc";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" "info" ];
 
   nativeBuildInputs = [ autoreconfHook texinfo ];
   buildInputs = [ ncurses readline zlib lzo openssl ];
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index fc6b1abf24d..2f37f6394ba 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" "doc" "info" ];
 
   enableParallelBuilding = false;
 

From e4876d6e43fd3a0198f2133371b3450b9ce0b016 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 11 Jul 2017 12:05:31 +0300
Subject: [PATCH 1909/3246] stdenv: Don't move man or info pages to $doc

Because .doc is normally not installed to user environments, these
manpages are unaccessible by default otherwise.
---
 doc/multiple-output.xml                            | 4 ++--
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index a81ad6ca9eb..a9151b2da3e 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -73,7 +73,7 @@
 
       <varlistentry><term><varname>
         $outputMan</varname></term><listitem><para>
-        is for man pages (except for section 3). They go to <varname>man</varname> or <varname>doc</varname> or <varname>$outputBin</varname> by default.
+        is for man pages (except for section 3). They go to <varname>man</varname> or <varname>$outputBin</varname> by default.
       </para></listitem></varlistentry>
 
       <varlistentry><term><varname>
@@ -83,7 +83,7 @@
 
       <varlistentry><term><varname>
         $outputInfo</varname></term><listitem><para>
-        is for info pages. They go to <varname>info</varname> or <varname>doc</varname> or <varname>$outputMan</varname> by default.
+        is for info pages. They go to <varname>info</varname> or <varname>$outputMan</varname> by default.
       </para></listitem></varlistentry>
 
     </variablelist>
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 62a6491b8dc..ddd1eafb4f9 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -40,9 +40,9 @@ _overrideFirst outputLib "lib" "out"
 _overrideFirst outputDoc "doc" "out"
 _overrideFirst outputDevdoc "devdoc" REMOVE # documentation for developers
 # man and info pages are small and often useful to distribute with binaries
-_overrideFirst outputMan "man" "doc" "$outputBin"
+_overrideFirst outputMan "man" "$outputBin"
 _overrideFirst outputDevman "devman" "devdoc" "$outputMan"
-_overrideFirst outputInfo "info" "doc" "$outputMan"
+_overrideFirst outputInfo "info" "$outputMan"
 
 
 # Add standard flags to put files into the desired outputs.

From 9158944b44cc775217fde8a47baf48af5f468f73 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 11 Jul 2017 14:06:49 +0300
Subject: [PATCH 1910/3246] tzdata: Fix man directory

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

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 7784e59e4b2..843055a2c45 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     "TZDIR=$(out)/share/zoneinfo"
     "ETCDIR=$(TMPDIR)/etc"
     "LIBDIR=$(dev)/lib"
-    "MANDIR=$(man)/man"
+    "MANDIR=$(man)/share/man"
     "AWK=awk"
     "CFLAGS=-DHAVE_LINK=0"
   ];

From 6aa074f17b92a742dc21d3b3d907cb5f95c43e45 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 11 Jul 2017 14:10:57 +0300
Subject: [PATCH 1911/3246] e2fsprogs: Split info pages to own output

They weren't actually getting built due to missing texinfo, but it was
creating an empty $man/share/info anyway.
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 8703e81fb1d..7c3ab92fa88 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libuuid, gettext }:
+{ stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "e2fsprogs-1.43.4";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d";
   };
 
-  outputs = [ "bin" "dev" "out" "man" ];
+  outputs = [ "bin" "dev" "out" "man" "info" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig texinfo ];
   buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
 
   crossAttrs = {

From aeeb23853a5569cc6ef9279a58a6b0b60034cba9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 11 Jul 2017 14:13:18 +0300
Subject: [PATCH 1912/3246] stdenv: Don't move info pages to the 'man' output

Because if you were to disable man pages via 'programs.man.enable',
the "man" output wouldn't be installed and the info pages would go
missing.
---
 doc/multiple-output.xml                            | 2 +-
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index a9151b2da3e..a2acc91e55a 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -83,7 +83,7 @@
 
       <varlistentry><term><varname>
         $outputInfo</varname></term><listitem><para>
-        is for info pages. They go to <varname>info</varname> or <varname>$outputMan</varname> by default.
+        is for info pages. They go to <varname>info</varname> or <varname>$outputBin</varname> by default.
       </para></listitem></varlistentry>
 
     </variablelist>
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index ddd1eafb4f9..60d4ccf99ed 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -42,7 +42,7 @@ _overrideFirst outputDevdoc "devdoc" REMOVE # documentation for developers
 # man and info pages are small and often useful to distribute with binaries
 _overrideFirst outputMan "man" "$outputBin"
 _overrideFirst outputDevman "devman" "devdoc" "$outputMan"
-_overrideFirst outputInfo "info" "$outputMan"
+_overrideFirst outputInfo "info" "$outputBin"
 
 
 # Add standard flags to put files into the desired outputs.

From 81c360d94833815c686d99c84bd0581a27349ac4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 12 Jul 2017 16:26:19 +0300
Subject: [PATCH 1913/3246] utftp: Fix manpage fallout from previous commits

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

diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index 524fb8c14c4..2e32f75c867 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin $doc/share/man/man1
+    mkdir -p $out/bin $man/share/man/man1
     cp {uftp,uftpd,uftp_keymgt,uftpproxyd} $out/bin/
-    cp {uftp.1,uftpd.1,uftp_keymgt.1,uftpproxyd.1} $doc/share/man/man1
+    cp {uftp.1,uftpd.1,uftp_keymgt.1,uftpproxyd.1} $man/share/man/man1
   '';
 
   meta = {

From bd0e161f0cd6a34a5fa777570b1489f1275af417 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 12 Jul 2017 16:26:49 +0300
Subject: [PATCH 1914/3246] bashInteractive: Fix manpages since previous
 commits

---
 pkgs/shells/bash/4.4.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index cf7fe35d5f3..b4a2ba55388 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -36,10 +36,9 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  outputs = [ "out" "dev" "man" "doc" "info" ];
-
-  # the man pages are small and useful enough
-  outputMan = if interactive then "out" else null;
+  outputs = [ "out" "dev" "doc" "info" ]
+    # the man pages are small and useful enough, so include them in $out in interactive builds
+    ++ stdenv.lib.optional (!interactive) "man";
 
   NIX_CFLAGS_COMPILE = ''
     -DSYS_BASHRC="/etc/bashrc"

From 1a0f8263fec0c5b181725300c40d1b08672b1afd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 12 Jul 2017 18:44:18 +0300
Subject: [PATCH 1915/3246] texlive: Fix fallout from man/info/doc output
 changes

---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 34520e92a9a..c15f165013b 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -132,8 +132,7 @@ core = stdenv.mkDerivation rec {
         '')
   + /* doc location identical with individual TeX pkgs */ ''
     mkdir -p "$doc/doc"
-    mv "$doc"/share/{man,info} "$doc"/doc
-    rmdir "$doc"/share
+    mv "$out"/share/{man,info} "$doc"/doc
   '' + cleanBrokenLinks;
 
   setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references)

From 58834f727fab8c1c7d47c6f59b99ac42780b690a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 11 Aug 2017 13:26:51 +0300
Subject: [PATCH 1916/3246] makeWrapper: use consistent style

All the other plain variable references (before e1d46c0c4) are without
braces.
---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index cde28fbbcaf..f9d435df655 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -3,8 +3,8 @@
 # assertExecutable FILE
 assertExecutable() {
     local file="$1"
-    [[ -f "${file}" && -x "${file}" ]] || \
-        die "Cannot wrap ${file} because it is not an executable file"
+    [[ -f "$file" && -x "$file" ]] || \
+        die "Cannot wrap '$file' because it is not an executable file"
 }
 
 # construct an executable file that wraps the actual executable
@@ -33,7 +33,7 @@ makeWrapper() {
     local params varName value command separator n fileNames
     local argv0 flagsBefore flags
 
-    assertExecutable "${original}"
+    assertExecutable "$original"
 
     mkdir -p "$(dirname "$wrapper")"
 
@@ -131,7 +131,7 @@ wrapProgram() {
     local prog="$1"
     local hidden
 
-    assertExecutable "${prog}"
+    assertExecutable "$prog"
 
     hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
     while [ -e "$hidden" ]; do

From decbc7d50ed0cd769c86f6a9de5fc32aab439589 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Fri, 11 Aug 2017 21:04:17 +0200
Subject: [PATCH 1917/3246] wireguard: 0.0.20170726 -> 0.0.20170810

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index ef6a538af79..277c6d19f5b 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,15 +6,15 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170726";
+  version = "0.0.20170810";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1nq1h9k1kf6p28ykids5mmdq50q6zpj0ylhsf94q1hjydcmlb4fv";
+    sha256 = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7";
   };
 
   meta = with stdenv.lib; {
-    homepage     = https://www.wireguard.io/;
+    homepage     = https://www.wireguard.com/;
     downloadPage = https://git.zx2c4.com/WireGuard/refs/;
     description  = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security";
     maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];

From 0611be740ecf223bab89390ad8052881234ad79e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 21:06:48 +0200
Subject: [PATCH 1918/3246] firefox: fix on i686

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 70b938bc5de..a5256e19e1b 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, fetchurl, fetchFromGitHub }:
+{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch }:
 
 let common = opts: callPackage (import ./common.nix opts); in
 
@@ -12,6 +12,11 @@ rec {
       sha512 = "2c15cb3e1a9f464f63ff7ac8ccf0625ed845a5cb9b186d7acf121c439cec38bcdeee93630e99dbfd336f1b7e60a7c09822a1eba59f308bba8866f155b2ed1c47";
     };
 
+    patches = lib.optional stdenv.isi686 (fetchpatch {
+      url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
+      sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
+    });
+
     meta = {
       description = "A web browser built from Firefox source tree";
       homepage = http://www.mozilla.com/en-US/firefox/;

From 83cc65a39f220d58340cae31f5667d3f1c922418 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 11 Aug 2017 21:45:04 +0200
Subject: [PATCH 1919/3246] gollum: 4.1.1 -> 4.1.2

---
 pkgs/applications/misc/gollum/Gemfile.lock | 26 +++++++-------
 pkgs/applications/misc/gollum/gemset.nix   | 41 +++++++++++++---------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 4322b408843..7315c0a8d72 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -3,43 +3,43 @@ GEM
   specs:
     charlock_holmes (0.7.3)
     diff-lcs (1.3)
-    gemojione (3.2.0)
+    gemojione (3.3.0)
       json
-    github-markup (1.6.0)
+    github-markup (1.6.1)
     gitlab-grit (2.8.1)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
-    gollum (4.1.1)
+    gollum (4.1.2)
       gemojione (~> 3.2)
-      gollum-lib (~> 4.0, >= 4.0.1)
+      gollum-lib (>= 4.2.7)
       kramdown (~> 1.9.0)
       mustache (>= 0.99.5, < 1.0.0)
       sinatra (~> 1.4, >= 1.4.4)
       useragent (~> 0.16.2)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.2.5)
+    gollum-lib (4.2.7)
       gemojione (~> 3.2)
       github-markup (~> 1.6)
       gollum-grit_adapter (~> 1.0)
-      nokogiri (~> 1.6.4)
-      rouge (~> 2.0)
+      nokogiri (>= 1.6.1, < 2.0)
+      rouge (~> 2.1)
       sanitize (~> 2.1)
       stringex (~> 2.6)
     json (2.1.0)
     kramdown (1.9.0)
     mime-types (2.99.3)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.2.0)
     mustache (0.99.8)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     posix-spawn (0.3.13)
     rack (1.6.8)
     rack-protection (1.5.3)
       rack
-    rouge (2.0.7)
+    rouge (2.1.1)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
     sinatra (1.4.8)
@@ -47,7 +47,7 @@ GEM
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     stringex (2.7.1)
-    tilt (2.0.7)
+    tilt (2.0.8)
     useragent (0.16.8)
 
 PLATFORMS
@@ -57,4 +57,4 @@ DEPENDENCIES
   gollum
 
 BUNDLED WITH
-   1.15.0
+   1.15.3
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index 2ad724b2bc7..cff774d7daa 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -16,22 +16,24 @@
     version = "1.3";
   };
   gemojione = {
+    dependencies = ["json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik";
+      sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.3.0";
   };
   github-markup = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9";
+      sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.6.1";
   };
   gitlab-grit = {
+    dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
@@ -40,14 +42,16 @@
     version = "2.8.1";
   };
   gollum = {
+    dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s";
+      sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a";
       type = "gem";
     };
-    version = "4.1.1";
+    version = "4.1.2";
   };
   gollum-grit_adapter = {
+    dependencies = ["gitlab-grit"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
@@ -56,12 +60,13 @@
     version = "1.0.1";
   };
   gollum-lib = {
+    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z";
+      sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
       type = "gem";
     };
-    version = "4.2.5";
+    version = "4.2.7";
   };
   json = {
     source = {
@@ -90,10 +95,10 @@
   mini_portile2 = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
+      sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.2.0";
   };
   mustache = {
     source = {
@@ -104,12 +109,13 @@
     version = "0.99.8";
   };
   nokogiri = {
+    dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj";
+      sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
       type = "gem";
     };
-    version = "1.6.8.1";
+    version = "1.8.0";
   };
   posix-spawn = {
     source = {
@@ -128,6 +134,7 @@
     version = "1.6.8";
   };
   rack-protection = {
+    dependencies = ["rack"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
@@ -138,12 +145,13 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
+      sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p";
       type = "gem";
     };
-    version = "2.0.7";
+    version = "2.1.1";
   };
   sanitize = {
+    dependencies = ["nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
@@ -152,6 +160,7 @@
     version = "2.1.0";
   };
   sinatra = {
+    dependencies = ["rack" "rack-protection" "tilt"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
@@ -170,10 +179,10 @@
   tilt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b";
+      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
       type = "gem";
     };
-    version = "2.0.7";
+    version = "2.0.8";
   };
   useragent = {
     source = {

From 350a6c3726beee36c8939fff7b98c1a6659fc4d4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 21:53:01 +0200
Subject: [PATCH 1920/3246] tests.plasma5: fix eval

---
 nixos/tests/plasma5.nix                           | 15 ++++-----------
 .../data/fonts/fontconfig-penultimate/default.nix |  9 +++++----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index f97544b5ea5..8b49b26c24a 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -16,17 +16,10 @@ import ./make-test.nix ({ pkgs, ...} :
 
     # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why.
     nixpkgs.config.packageOverrides = superPkgs: {
-      fontconfig-penultimate = superPkgs.fontconfig-penultimate.overrideAttrs
-        (_attrs: rec {
-          version = "0.3.3";
-          name = "fontconfig-penultimate-${version}";
-          src = pkgs.fetchFromGitHub {
-            owner = "ttuegel";
-            repo = "fontconfig-penultimate";
-            rev = version;
-            sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
-          };
-        });
+      fontconfig-penultimate = superPkgs.fontconfig-penultimate.override {
+        version = "0.3.3";
+        sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
+      };
     };
   };
 
diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
index da1c4467036..e1be0da428a 100644
--- a/pkgs/data/fonts/fontconfig-penultimate/default.nix
+++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchzip
+, version ? "0.3.5"
+, sha256 ? "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk"
+}:
 
-let version = "0.3.5"; in
 fetchzip {
   name = "fontconfig-penultimate-${version}";
 
   url = "https://github.com/ttuegel/fontconfig-penultimate/archive/${version}.zip";
+  inherit sha256;
 
   postFetch = ''
     mkdir -p $out/etc/fonts/conf.d
     unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d
   '';
 
-  sha256 = "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk";
-
   meta = with stdenv.lib; {
     homepage = https://github.com/ttuegel/fontconfig-penultimate;
     description = "Sensible defaults for Fontconfig";

From f9204b97623d75c0c9d90488a112767d8166b5fd Mon Sep 17 00:00:00 2001
From: Keith Amidon <kamidon@users.noreply.github.com>
Date: Fri, 11 Aug 2017 13:13:33 -0700
Subject: [PATCH 1921/3246] nixos/samba: fix pam service name typo (#28049)

The PAM service name used before this commit was "sambda", with an
extra 'd'. For some reason I don't quite fully understand this typo
prevents GDM from starting. This change fixes that as tested in VMs
built using "nixos-rebuild -I nixpkgs=<mypkgs> build-vm".
---
 nixos/modules/services/network-filesystems/samba.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 87c4f7a8ebc..b3b4d0c915a 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -243,7 +243,7 @@ in
           };
         };
 
-        security.pam.services.sambda = {};
+        security.pam.services.samba = {};
 
       })
     ];

From 03b4cab963942942e57582c9dd016f9f8bda4f6f Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Fri, 11 Aug 2017 22:14:01 +0200
Subject: [PATCH 1922/3246] haskell: fix ghcjs build with cabal-install-2.0

---
 pkgs/development/compilers/ghcjs/ghcjs.patch | 24 +++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch
index 61bbb95b0a5..9f4fa3a8b7a 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs.patch
+++ b/pkgs/development/compilers/ghcjs/ghcjs.patch
@@ -2,7 +2,7 @@ diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
 index db8b12e..7b815c5 100644
 --- a/src-bin/Boot.hs
 +++ b/src-bin/Boot.hs
-@@ -526,9 +526,7 @@ initPackageDB :: B ()
+@@ -540,9 +540,7 @@ initPackageDB :: B ()
  initPackageDB = do
    msg info "creating package databases"
    initDB "--global" <^> beLocations . blGlobalDB
@@ -12,7 +12,7 @@ index db8b12e..7b815c5 100644
      initDB dbName db = do
        rm_rf db >> mkdir_p db
        ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
-@@ -552,29 +550,22 @@ installDevelopmentTree = subTop $ do
+@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do
    msgD info $ "preparing development boot tree"
    checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
      testGit "ghcjs-boot" >>= \case
@@ -46,7 +46,25 @@ index db8b12e..7b815c5 100644
        mapM_ patchPackage =<< allPackages
        preparePrimops
        buildGenPrim
-@@ -1110,14 +1101,14 @@ cabalInstallFlags parmakeGhcjs = do
+@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do
+   globalFlags <- cabalGlobalFlags
+   flags <- cabalInstallFlags (length pkgs == 1)
+   let args = globalFlags ++ ("install" : pkgs) ++
+-             [ "--solver=topdown" -- the modular solver refuses to install stage1 packages
++             [ "--allow-boot-library-installs"
+              ] ++ map ("--configure-option="<>) configureOpts ++ flags
+   checkInstallPlan pkgs args
+   cabal_ args
+@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do
+ -- uses somewhat fragile parsing of --dry-run output, find a better way
+ checkInstallPlan :: [Package] -> [Text] -> B ()
+ checkInstallPlan pkgs opts = do
+-  plan <- cabal (opts ++ ["-v2", "--dry-run"])
++  plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"])
+   when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan)
+   where
+     hasReinstalls = T.isInfixOf "(reinstall)"   -- reject reinstalls
+@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
             , "--avoid-reinstalls"
             , "--builddir",      "dist"
             , "--with-compiler", ghcjs ^. pgmLocText

From d06ab41c857e7acaa28a7e66d36d8d271e72e11a Mon Sep 17 00:00:00 2001
From: rybern <ryanbernstein1@gmail.com>
Date: Fri, 11 Aug 2017 16:32:59 -0400
Subject: [PATCH 1923/3246] moon-buggy: init at 1.0.51 (#28165)

---
 lib/maintainers.nix               |  1 +
 pkgs/games/moon-buggy/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/games/moon-buggy/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fcfe2556043..0f4e6fe2261 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -508,6 +508,7 @@
   ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>";
   ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>";
   ryantm = "Ryan Mulligan <ryan@ryantm.com>";
+  rybern = "Ryan Bernstein <ryan.bernstein@columbia.edu>";
   rycee = "Robert Helgesson <robert@rycee.net>";
   ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
   rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>";
diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix
new file mode 100644
index 00000000000..8ea8dfccb16
--- /dev/null
+++ b/pkgs/games/moon-buggy/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation rec {
+  baseName = "moon-buggy";
+  version = "1.0.51";
+  name = "${baseName}-${version}";
+
+  buildInputs = [
+    ncurses
+  ];
+
+  src = fetchurl {
+    url = "http://m.seehuhn.de/programs/${name}.tar.gz";
+    sha256 = "0gyjwlpx0sd728dwwi7pwks4zfdy9rm1w1xbhwg6zip4r9nc2b9m";
+  };
+
+  meta = {
+    description = ''A simple character graphics game where you drive some kind of car across the moon's surface'';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [stdenv.lib.maintainers.rybern];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = http://www.seehuhn.de/pages/moon-buggy;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 664019fd6f6..00d56ee2be6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17300,6 +17300,8 @@ with pkgs;
 
   minecraft-server = callPackage ../games/minecraft-server { };
 
+  moon-buggy = callPackage ../games/moon-buggy {};
+
   multimc = libsForQt5.callPackage ../games/multimc { };
 
   minetest = callPackage ../games/minetest {

From 51092fd0c34544f5759ab3e6d951cd5f2e95589e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 22:40:12 +0200
Subject: [PATCH 1924/3246] tlspool: don't create unused directories

---
 pkgs/tools/networking/tlspool/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix
index 4a1e91f7f59..53465a0242d 100644
--- a/pkgs/tools/networking/tlspool/default.nix
+++ b/pkgs/tools/networking/tlspool/default.nix
@@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin $out/lib $out/sbin $out/man $out/etc/tlspool/ $out/include/${pname}/pulleyback
-    mkdir -p $out/${python.sitePackages}/tlspool
-    mkdir -p $out/bdb
+    mkdir -p $out/bin $out/lib $out/sbin $out/etc/tlspool/ $out/include/${pname}/pulleyback
     make DESTDIR=$out PREFIX=/ install
     cp -R etc/* $out/etc/tlspool/
     cp include/tlspool/*.h $out/include/${pname}

From 519c254a41a72d1fbfc270552d25e94701f277dc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 22:42:10 +0200
Subject: [PATCH 1925/3246] screenfetch: fix man path

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

diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index a781ff91027..352fee14fa6 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     install -Dm 0755 screenfetch-dev $out/bin/screenfetch
-    install -Dm 0644 screenfetch.1 $out/man/man1/screenfetch.1
+    install -Dm 0644 screenfetch.1 $out/share/man/man1/screenfetch.1
 
     # Fix all of the depedencies of screenfetch
     patchShebangs $out/bin/screenfetch

From 3a078da8dc4cb73baae55f8f50f8a94a453e5e3d Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 11 Aug 2017 13:34:20 -0400
Subject: [PATCH 1926/3246] rtags: 2.11 -> 2.12

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

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 85d14835a25..39ee3179e9c 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "rtags-${version}";
-  version = "2.11";
+  version = "2.12";
 
   buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]
     ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
     url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "0965jn8zk3mh07yzw6jmwwp56xly1sihkn0vhv07izkh41mdkrvv";
+    sha256 = "0bgjcvyvkpqcgw4571iz39sqydmcaz6ymx7kxcmq6j7rffs6qs7l";
     # unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation
     postFetch = ''

From 723bd8b9c541acf546c825beffa1b241098f74d3 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 25 Jul 2017 13:44:05 -0700
Subject: [PATCH 1927/3246] go: support for aarch64 via binary bootstrap

---
 pkgs/development/compilers/go/1.6.nix |  1 +
 pkgs/development/compilers/go/1.7.nix |  1 +
 pkgs/development/compilers/go/1.8.nix |  1 +
 pkgs/top-level/all-packages.nix       | 15 ++++++++++++---
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 61408c0ebb3..0eebc92ee59 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -128,6 +128,7 @@ stdenv.mkDerivation rec {
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
            else if stdenv.isArm then "arm"
+           else if stdenv.isAarch64 then "arm64"
            else throw "Unsupported system";
   GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
   GO386 = 387; # from Arch: don't assume sse2 on i686
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index d7a824239b8..b1230da5a14 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -123,6 +123,7 @@ stdenv.mkDerivation rec {
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
            else if stdenv.isArm then "arm"
+           else if stdenv.isAarch64 then "arm64"
            else throw "Unsupported system";
   GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
   GO386 = 387; # from Arch: don't assume sse2 on i686
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
index 8e0b1c7360f..8a675b1b776 100644
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -128,6 +128,7 @@ stdenv.mkDerivation rec {
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
            else if stdenv.isArm then "arm"
+           else if stdenv.isAarch64 then "arm64"
            else throw "Unsupported system";
   GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
   GO386 = 387; # from Arch: don't assume sse2 on i686
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00d56ee2be6..0869c46849a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5596,9 +5596,18 @@ with pkgs;
 
   glslang = callPackage ../development/compilers/glslang { };
 
-  go_bootstrap = callPackage ../development/compilers/go/1.4.nix {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  go_bootstrap = if stdenv.isAarch64 then
+    srcOnly {
+      name = "go-1.8-linux-arm64-bootstrap";
+      src = fetchurl {
+        url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz";
+        sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6";
+      };
+    }
+  else
+    callPackage ../development/compilers/go/1.4.nix {
+      inherit (darwin.apple_sdk.frameworks) Security;
+    };
 
   go_1_6 = callPackage ../development/compilers/go/1.6.nix {
     inherit (darwin.apple_sdk.frameworks) Security Foundation;

From 345e0e679457d839bb2e23b5ed64947372d94fea Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 11 Aug 2017 23:25:30 +0200
Subject: [PATCH 1928/3246] hardened-config: enable read-only LSM hooks

Implies that SELinux can no longer be disabled at runtime (only at boot
time, via selinux=0).

See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=dd0859dccbe291cf8179a96390f5c0e45cb9af1d
---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 579fb2947ec..5711779eb86 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -46,6 +46,14 @@ ${optionalString (versionOlder version "4.11") ''
   DEBUG_SET_MODULE_RONX y
 ''}
 
+# Mark LSM hooks read-only after init.  Conflicts with SECURITY_SELINUX_DISABLE
+# (disabling SELinux at runtime); hence, SELinux can only be disabled at boot
+# via the selinux=0 boot parameter.
+${optionalString (versionAtLeast version "4.12") ''
+  SECURITY_SELINUX_DISABLE n
+  SECURITY_WRITABLE_HOOKS n
+''}
+
 DEBUG_WX y # boot-time warning on RWX mappings
 
 # Stricter /dev/mem

From f48109387ab1179fa66e3ea0362f6755a3bb9006 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 Aug 2017 23:13:53 +0200
Subject: [PATCH 1929/3246] mergeAttrsByVersion, versionedDerivation: remove

obsolete and ancient
---
 lib/deprecated.nix              | 42 ---------------------------------
 pkgs/misc/misc.nix              |  5 ----
 pkgs/top-level/all-packages.nix |  1 -
 3 files changed, 48 deletions(-)

diff --git a/lib/deprecated.nix b/lib/deprecated.nix
index d4e78c39250..8cdfab381ba 100644
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -309,48 +309,6 @@ rec {
   mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; };
   mergeAttrsByFuncDefaultsClean = list: removeAttrs (mergeAttrsByFuncDefaults list) ["mergeAttrBy"];
 
-  # merge attrs based on version key into mkDerivation args, see mergeAttrBy to learn about smart merge defaults
-  #
-  # This function is best explained by an example:
-  #
-  #     {version ? "2.x"}:
-  #
-  #     mkDerivation (mergeAttrsByVersion "package-name" version
-  #       { # version specific settings
-  #         "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool];  };
-  #         "2.x" = { src = ..; };
-  #       }
-  #       {  // shared settings
-  #          buildInputs = [ common build inputs ];
-  #          meta = { .. }
-  #       }
-  #     )
-  #
-  # Please note that e.g. Eelco Dolstra usually prefers having one file for
-  # each version. On the other hand there are valuable additional design goals
-  #  - readability
-  #  - do it once only
-  #  - try to avoid duplication
-  #
-  # Marc Weber and Michael Raskin sometimes prefer keeping older
-  # versions around for testing and regression tests - as long as its cheap to
-  # do so.
-  #
-  # Very often it just happens that the "shared" code is the bigger part.
-  # Then using this function might be appropriate.
-  #
-  # Be aware that its easy to cause recompilations in all versions when using
-  # this function - also if derivations get too complex splitting into multiple
-  # files is the way to go.
-  #
-  # See misc.nix -> versionedDerivation
-  # discussion: nixpkgs: pull/310
-  mergeAttrsByVersion = name: version: attrsByVersion: base:
-    mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; }
-                                    base
-                                    (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion)
-                                  ];
-
   # sane defaults (same name as attr name so that inherit can be used)
   mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; }
     listToAttrs (map (n: nameValuePair n lib.concat)
diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix
index a3c293beab3..cb4765957f1 100644
--- a/pkgs/misc/misc.nix
+++ b/pkgs/misc/misc.nix
@@ -5,11 +5,6 @@ let inherit (pkgs) stdenv runCommand perl lib;
 in
 
 {
-
-  # description see mergeAttrsByVersion in lib/misc.nix
-  versionedDerivation = name: version: attrsByVersion: base:
-    pkgs.stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion name version attrsByVersion base);
-
   /*
     Usage example creating a derivation installing ruby, sup and a lib:
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0869c46849a..890d7225e30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -50,7 +50,6 @@ with pkgs;
   inherit lib config;
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;
-  inherit (misc) versionedDerivation;
 
   # Applying this to an attribute set will cause nix-env to look
   # inside the set for derivations.

From 7f139a2a6bde6898b29b03942634e20d1f5b113c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 11 Aug 2017 23:39:55 +0200
Subject: [PATCH 1930/3246] android-studio-preview: 3.0.0.9 -> 3.0.0.10

---
 pkgs/applications/editors/android-studio/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 1a324b544dc..471f78f0c07 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,9 +27,9 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.9"; # This is actually "Android Studio 3.0 Beta 1"
-    build = "171.4243858";
-    sha256Hash = "137jd4146srjigyzcfds8pf7b185q1qdkb0zp2yqc8g6bv4ccb22";
+    version = "3.0.0.10"; # "Android Studio 3.0 Beta 2"
+    build = "171.4263559";
+    sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";

From b4d2cd6f6a8f004c1ea4ec7f84d9f7f6a93418ce Mon Sep 17 00:00:00 2001
From: Phil <philipp.B.610@googlemail.com>
Date: Fri, 11 Aug 2017 23:59:52 +0200
Subject: [PATCH 1931/3246] nixos/tor: add tor hidden service options (#28081)

* nixos/tor: add hiddenServices option

This change allows to configure hidden services more conveniently.

* nixos/tor: fix default/example mixup

* nixos/tor: use docbook in documentation

Also use more elegant optionalString for optional strings.

* tor: seperate hidden service port by newline

* tor: better example for hidden service path

a path below /var/lib/tor is usually used for hidden services
---
 nixos/modules/services/security/tor.nix | 104 +++++++++++++++++++++---
 1 file changed, 92 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 10596d6431d..3f1450ebfbd 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -46,8 +46,20 @@ let
       ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed
     ''}
   ''
+  + hiddenServices
   + cfg.extraConfig;
 
+  hiddenServices = concatStrings (mapAttrsToList (hiddenServiceDir: hs:
+    let
+      hsports = concatStringsSep "\n" (map mkHiddenServicePort hs.hiddenServicePorts);
+    in
+      "HiddenServiceDir ${hiddenServiceDir}\n${hsports}\n${hs.extraConfig}\n"
+    ) cfg.hiddenServices);
+
+    mkHiddenServicePort = hsport: let
+      trgt = optionalString (hsport.target != null) (" " + hsport.target);
+    in "HiddenServicePort ${toString hsport.virtualPort}${trgt}";
+
   torRcFile = pkgs.writeText "torrc" torRc;
 in
 {
@@ -229,11 +241,11 @@ in
           default = null;
           example = "450 GBytes";
           description = ''
-            Specify maximum bandwidth allowed during an accounting
-            period. This allows you to limit overall tor bandwidth
-            over some time period. See the
-            <literal>AccountingMax</literal> option by looking at the
-            tor manual (<literal>man tor</literal>) for more.
+            Specify maximum bandwidth allowed during an accounting period. This
+            allows you to limit overall tor bandwidth over some time period.
+            See the <literal>AccountingMax</literal> option by looking at the
+            tor manual <citerefentry><refentrytitle>tor</refentrytitle>
+            <manvolnum>1</manvolnum></citerefentry> for more.
 
             Note this limit applies individually to upload and
             download; if you specify <literal>"500 GBytes"</literal>
@@ -247,10 +259,11 @@ in
           default = null;
           example = "month 1 1:00";
           description = ''
-            Specify length of an accounting period. This allows you to
-            limit overall tor bandwidth over some time period. See the
-            <literal>AccountingStart</literal> option by looking at
-            the tor manual (<literal>man tor</literal>) for more.
+            Specify length of an accounting period. This allows you to limit
+            overall tor bandwidth over some time period. See the
+            <literal>AccountingStart</literal> option by looking at the tor
+            manual <citerefentry><refentrytitle>tor</refentrytitle>
+            <manvolnum>1</manvolnum></citerefentry> for more.
           '';
         };
 
@@ -279,9 +292,10 @@ in
           type    = types.str;
           example = "143";
           description = ''
-            What port to advertise for Tor connections. This corresponds
-            to the <literal>ORPort</literal> section in the Tor manual; see
-            <literal>man tor</literal> for more details.
+            What port to advertise for Tor connections. This corresponds to the
+            <literal>ORPort</literal> section in the Tor manual; see
+            <citerefentry><refentrytitle>tor</refentrytitle>
+            <manvolnum>1</manvolnum></citerefentry> for more details.
 
             At a minimum, you should just specify the port for the
             relay to listen on; a common one like 143, 22, 80, or 443
@@ -314,6 +328,72 @@ in
           '';
         };
       };
+
+      hiddenServices = mkOption {
+        type = types.attrsOf (types.submodule ({
+          options = {
+            hiddenServicePorts = mkOption {
+              type = types.listOf (types.submodule {
+                options = {
+                  virtualPort = mkOption {
+                    type = types.int;
+                    example = 80;
+                    description = "Virtual port.";
+                  };
+                  target = mkOption {
+                    type = types.nullOr types.str;
+                    default = null;
+                    example = "127.0.0.1:8080";
+                    description = ''
+                      Target virtual Port shall be mapped to.
+
+                      You may override the target port, address, or both by
+                      specifying a target of addr, port, addr:port, or
+                      unix:path. (You can specify an IPv6 target as
+                      [addr]:port. Unix paths may be quoted, and may use
+                      standard C escapes.)
+                    '';
+                  };
+                };
+              });
+              example = [ { virtualPort = 80; target = "127.0.0.1:8080"; } { virtualPort = 6667; } ];
+              description = ''
+                If target is <literal>null</literal> the virtual port is mapped
+                to the same port on 127.0.0.1 over TCP. You may use
+                <literal>target</literal> to overwrite this behaviour (see
+                description of target).
+
+                This corresponds to the <literal>HiddenServicePort VIRTPORT
+                [TARGET]</literal> option by looking at the tor manual
+                <citerefentry><refentrytitle>tor</refentrytitle>
+                <manvolnum>1</manvolnum></citerefentry> for more information.
+              '';
+            };
+            extraConfig = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Extra configuration. Contents will be added in the current
+                hidden service context.
+              '';
+            };
+          };
+        }));
+        default = {};
+        example = {
+          "/var/lib/tor/webserver" = {
+            hiddenServicePorts = [ { virtualPort = 80; } ];
+          };
+        };
+        description = ''
+          Configure hidden services.
+
+          Please consult the tor manual
+          <citerefentry><refentrytitle>tor</refentrytitle>
+          <manvolnum>1</manvolnum></citerefentry> for a more detailed
+          explanation. (search for 'HIDDEN').
+        '';
+      };
     };
   };
 

From 44f9be70c66145cb5e28fcb146de4c47df10f15c Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Sat, 12 Aug 2017 00:37:53 +0200
Subject: [PATCH 1932/3246] freicoin: fix build

---
 pkgs/applications/altcoins/freicoin.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
index e8a26365361..a44dbbd62ce 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
   # I think that openssl and zlib are required, but come through other
   # packages
 
+  preBuild = "unset AR";
+
   installPhase = ''
     mkdir -p $out/bin
     cp freicoin-qt $out/bin

From 2bea8873c3f9a6ba3c5fc2b83cdc25de7b8cd7d8 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Sat, 12 Aug 2017 00:38:13 +0200
Subject: [PATCH 1933/3246] memorycoin: fix build

---
 pkgs/applications/altcoins/memorycoin.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix
index b653ce82a67..9efab9a8bab 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec{
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
-  preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
+  preBuild = "unset AR;"
+             + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile"));
 
   installPhase =
     if withGui

From 3584f1d6d4ec665d8e6572e1706761612777dc71 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Sat, 12 Aug 2017 00:38:32 +0200
Subject: [PATCH 1934/3246] primecoin: fix build

---
 pkgs/applications/altcoins/primecoin.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix
index 31183670212..e6ed05dd27f 100644
--- a/pkgs/applications/altcoins/primecoin.nix
+++ b/pkgs/applications/altcoins/primecoin.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec{
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
-  preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
+  preBuild = "unset AR;"
+              + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile"));
 
   installPhase =
     if withGui

From a3103fb406be5769b630fa0d86d3e74812255e8d Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Fri, 11 Aug 2017 15:49:05 -0700
Subject: [PATCH 1935/3246] mpDris2: add mutagen for cover art support (#28063)

* mpDris2: add mutagen for cover art support

* mpdris2: move mutagen to `pythonPath`
---
 pkgs/tools/audio/mpdris2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index fd9cf2bacbf..c326533ece1 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ intltool autoreconfHook pythonPackages.wrapPython ];
-  propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ];
-  pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify ];
+  propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python  ];
+  pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify mutagen ];
   postInstall = "wrapPythonPrograms";
 
   meta = with stdenv.lib; {

From 59fa868b01c6f22b9072508cebbecdc4930034e5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 12 Aug 2017 00:55:32 +0200
Subject: [PATCH 1936/3246] tests.plasma5: fix hash

---
 nixos/tests/plasma5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index 8b49b26c24a..f3bd4c5915b 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} :
     nixpkgs.config.packageOverrides = superPkgs: {
       fontconfig-penultimate = superPkgs.fontconfig-penultimate.override {
         version = "0.3.3";
-        sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
+        sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9";
       };
     };
   };

From d332d768b53fa5526978e22347ab55837ecc5724 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 21 May 2017 20:10:41 +0300
Subject: [PATCH 1937/3246] darwin: Add recurseForDerivations

---
 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 a31aefbab69..c3f570b8089 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11763,7 +11763,7 @@ with pkgs;
 
   darwin = let
     apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
-  in apple-source-releases // rec {
+  in recurseIntoAttrs (apple-source-releases // rec {
     cctools = callPackage ../os-specific/darwin/cctools/port.nix {
       inherit libobjc;
       stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;
@@ -11807,7 +11807,7 @@ with pkgs;
     usr-include = callPackage ../os-specific/darwin/usr-include {};
 
     DarwinTools = callPackage ../os-specific/darwin/DarwinTools {};
-  };
+  });
 
   devicemapper = lvm2;
 

From aa7627310cef0c4201d45f9dc22a34effa23c0b3 Mon Sep 17 00:00:00 2001
From: Ben Darwin <ben@ramanujan>
Date: Fri, 11 Aug 2017 23:01:10 -0400
Subject: [PATCH 1938/3246] pythonPackages.paramz: fix URL

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

diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 97d4d6de404..5137485a58f 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Parameterization framework for parameterized model creation and handling";
-    homepage = https://github.com/sodz/paramz;
+    homepage = https://github.com/sods/paramz;
     license = licenses.bsd3;
     maintainers = with maintainers; [ bcdarwin ];
   };

From afa9031062c40ef75d95c2c91c3c0d6e4925f3e7 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Fri, 11 Aug 2017 23:31:08 -0400
Subject: [PATCH 1939/3246] rtl8812au: Fix comment typo

The commit 5d693c84d2e492080e982bf7429d6e923229d721 cleaned up the
substitute() function in stdenv and caused this line to
fail.
---
 pkgs/os-specific/linux/rtl8812au/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 34fc7b5c759..6528614f32d 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
     substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}"
-    substituteInPlace ./Makefile --replace /sbin/depmod #
+    substituteInPlace ./Makefile --replace /sbin/depmod \#
     substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 

From c08ceb1df86cc5a434632c45dd2a32b66f9f3687 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Wed, 9 Aug 2017 22:47:53 -0400
Subject: [PATCH 1940/3246] rtl8812au: Fixes for newer linux kernels

This includes the patches from the pull requests #42, #43, and #46
submitted to Grawp/rtl8812au_rtl8821au
---
 pkgs/os-specific/linux/rtl8812au/default.nix | 22 ++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 6528614f32d..4ea6b35e377 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel }:
+{ stdenv, fetchFromGitHub, fetchpatch, kernel }:
 
 stdenv.mkDerivation rec {
   name = "rtl8812au-${kernel.version}-${version}";
@@ -11,11 +11,29 @@ stdenv.mkDerivation rec {
     sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry";
   };
 
+  patches = [
+    (fetchpatch { # From PR # 42
+      name = "rtl8812au-4.11.x-fix.patch";
+      url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/3224e74ad9c230b74a658e80dad66ab95c9e2ef5.patch;
+      sha256 = "12g4yvivg4d0qm5cgxs7k54p3y7h1dc2jw6rp1xbppwf3j1z6xks";
+    })
+    (fetchpatch { # From PR #46
+      name = "rtl8812au-4.11.9-fix.patch";
+      url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/58fc45a4511b8b9d6b52813168e3eee657517b1f.patch;
+      sha256 = "18bag2mif5112lap2xvx2bb0wxrd13f9y9cwqv1qzp5nyqiniziz";
+    })
+    (fetchpatch { # From PR #43
+      name = "rtl8812au-4.12-fix.patch";
+      url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/a5475c9f1f54099ca35c8680f2dedee11fa9edec.patch;
+      sha256 = "01xa51whq1xa0sh3y2bhm65f0cryzmv46v530axqjrpnd924432d";
+    })
+  ];
+
   hardeningDisable = [ "pic" ];
 
   NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types";
 
-  patchPhase = ''
+  prePatch = ''
     substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
     substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}"
     substituteInPlace ./Makefile --replace /sbin/depmod \#

From 87151128f15f3b2e83ecaaf957d442c562322356 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 11 Aug 2017 23:32:15 -0700
Subject: [PATCH 1941/3246] hugo: 0.25.1 -> 0.26

---
 pkgs/applications/misc/hugo/default.nix |   4 +-
 pkgs/applications/misc/hugo/deps.nix    | 127 ++++++++++--------------
 2 files changed, 52 insertions(+), 79 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 27757e4e31a..2b0be1c9030 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.25.1";
+  version = "0.26";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "gohugoio";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz";
+    sha256 = "1g2brxhc6lyl2qa41lrqw2hadl601inmshsxlpmv99ax67sa19d1";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index ff832d4961f..240983b3c71 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/BurntSushi/toml";
-      rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab";
-      sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg";
+      rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
     };
   }
   {
@@ -35,15 +35,6 @@
       sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami";
     };
   }
-  {
-    goPackagePath = "github.com/bep/inflect";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bep/inflect";
-      rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69";
-      sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3";
-    };
-  }
   {
     goPackagePath = "github.com/chaseadamsio/goorgeous";
     fetch = {
@@ -76,8 +67,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/eknkc/amber";
-      rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5";
-      sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq";
+      rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448";
+      sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a";
     };
   }
   {
@@ -85,8 +76,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/fortytw2/leaktest";
-      rev = "7dad53304f9614c1c365755c1176a8e876fee3e8";
-      sha256 = "1f2pmzs0dgayg0q672cpzxqa1ls48aha262qxlglihdvami53b2m";
+      rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513";
+      sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz";
     };
   }
   {
@@ -103,8 +94,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "a91eba7f97777409bc2c443f5534d41dd20c5720";
-      sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";
+      rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf";
+      sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi";
     };
   }
   {
@@ -112,8 +103,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-immutable-radix";
-      rev = "30664b879c9a771d8d50b137ab80ee0748cb2fcc";
-      sha256 = "0v9k0l7w2zmczcqmhrmpb9hvc63xm9ppbb8fj87yvl0hvrb92mgb";
+      rev = "8aac2701530899b64bdea735a1de8da899815220";
+      sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6";
     };
   }
   {
@@ -143,6 +134,15 @@
       sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
     };
   }
+  {
+    goPackagePath = "github.com/jdkato/prose";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jdkato/prose";
+      rev = "c24611cae00c16858e611ef77226dd2f7502759f";
+      sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1";
+    };
+  }
   {
     goPackagePath = "github.com/kardianos/osext";
     fetch = {
@@ -152,15 +152,6 @@
       sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
     };
   }
-  {
-    goPackagePath = "github.com/kr/fs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/fs";
-      rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
-      sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
-    };
-  }
   {
     goPackagePath = "github.com/kyokomi/emoji";
     fetch = {
@@ -175,8 +166,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/magiconair/properties";
-      rev = "51463bfca2576e06c62a8504b5c0f06d61312647";
-      sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288";
+      rev = "be5ece7dd465ab0765a9682137865547526d1dfb";
+      sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8";
+    };
+  }
+  {
+    goPackagePath = "github.com/markbates/inflect";
+    fetch = {
+      type = "git";
+      url = "https://github.com/markbates/inflect";
+      rev = "6cacb66d100482ef7cc366289ccb156020e57e76";
+      sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2";
     };
   }
   {
@@ -184,8 +184,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/miekg/mmark";
-      rev = "f809cc9d384e2f7f3985a28a899237b892f35719";
-      sha256 = "0fyw2dkv9bk1fx10a23n8qvcgsr0pjk7p379k8nafx8sjmz3pdbd";
+      rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f";
+      sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
     };
   }
   {
@@ -220,26 +220,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286";
-      sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "c605e284fe17294bda444b34710735b29d1a9d90";
-      sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/sftp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/sftp";
-      rev = "a5f8514e29e90a859e93871b1582e5c81f466f82";
-      sha256 = "0fis12k0h4jyyrpm13mhr5vvyqrgmnc06p4dwgzbfk6h6aq3qzcd";
+      rev = "69d355db5304c0f7f809a2edc054553e7142f016";
+      sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm";
     };
   }
   {
@@ -247,8 +229,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae";
-      sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137";
+      rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c";
+      sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4";
     };
   }
   {
@@ -283,8 +265,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37";
-      sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx";
+      rev = "34594c771f2c18301dc152640ad40ece28795373";
+      sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38";
     };
   }
   {
@@ -328,8 +310,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/viper";
-      rev = "c1de95864d73a5465492829d7cb2dd422b19ac96";
-      sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm";
+      rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7";
+      sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3";
     };
   }
   {
@@ -337,8 +319,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a";
-      sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9";
+      rev = "05e8a0eda380579888eb53c394909df027f06991";
+      sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv";
     };
   }
   {
@@ -350,15 +332,6 @@
       sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f";
     };
   }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "850760c427c516be930bc91280636328f1a62286";
-      sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz";
-    };
-  }
   {
     goPackagePath = "golang.org/x/image";
     fetch = {
@@ -373,8 +346,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd";
-      sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8";
+      rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f";
+      sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k";
     };
   }
   {
@@ -382,8 +355,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a";
-      sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj";
+      rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695";
+      sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n";
     };
   }
   {
@@ -391,8 +364,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735";
-      sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh";
+      rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720";
+      sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1";
     };
   }
   {
@@ -400,8 +373,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
-      sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
+      rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b";
+      sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
     };
   }
 ]

From 8cd83cde50721ba6953512b2bab81dda4c5271ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 12 Aug 2017 07:45:29 +0100
Subject: [PATCH 1942/3246] pcmanfm: add defaultIconTheme to fix missing icons

---
 pkgs/applications/misc/pcmanfm/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index 8251c07206d..148dd427fbc 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig
-, withGtk3 ? true, gtk2, gtk3 }:
+, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }:
 
 let
   libfm' = libfm.override { inherit withGtk3; };
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc";
   };
 
-  buildInputs = [ glib gtk intltool libfm' libX11 pango pkgconfig ];
+  buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
 
   configureFlags = optional withGtk3 "--with-gtk=3";
 

From 026b60e49e933d2093dab105734b38817ba8e93e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 12 Aug 2017 08:55:59 +0200
Subject: [PATCH 1943/3246] python.pkgs.sphinx: move expression

---
 .../python-modules/sphinx/default.nix         | 65 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 45 +------------
 2 files changed, 67 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/development/python-modules/sphinx/default.nix

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
new file mode 100644
index 00000000000..ae08db31b2a
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, simplejson
+, mock
+, glibcLocales
+, html5lib
+, pythonOlder
+, enum34
+, python
+, docutils
+, jinja2
+, pygments
+, alabaster
+, Babel
+, snowballstemmer
+, six
+, sqlalchemy
+, whoosh
+, imagesize
+, requests
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "Sphinx";
+  version = "1.5.2";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722";
+  };
+  LC_ALL = "en_US.UTF-8";
+  buildInputs = [ pytest simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
+  # Disable two tests that require network access.
+  checkPhase = ''
+    cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
+  '';
+  propagatedBuildInputs = [
+    docutils
+    jinja2
+    pygments
+    alabaster
+    Babel
+    snowballstemmer
+    six
+    sqlalchemy
+    whoosh
+    imagesize
+    requests
+  ];
+
+  # https://github.com/NixOS/nixpkgs/issues/22501
+  # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
+  postPatch = ''
+    substituteInPlace sphinx/make_mode.py --replace "sys.executable, " ""
+  '';
+
+  meta = {
+    description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";
+    homepage = http://sphinx.pocoo.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ nand0p ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2f0c195dfe..835118b0f20 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22202,50 +22202,9 @@ in {
     };
   });
 
-  sphinx = buildPythonPackage (rec {
-    name = "${pname}-${version}";
-    pname = "Sphinx";
-    version = "1.5.2";
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722";
-    };
-    LC_ALL = "en_US.UTF-8";
-    buildInputs = with self; [ pytest simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34;
-    # Disable two tests that require network access.
-    checkPhase = ''
-      cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
-    '';
-    propagatedBuildInputs = with self; [
-      docutils
-      jinja2
-      pygments
-      alabaster
-      Babel
-      snowballstemmer
-      six
-      sqlalchemy
-      whoosh
-      imagesize
-      requests
-    ];
+  sphinx = callPackage ../development/python-modules/sphinx { };
 
-    # https://github.com/NixOS/nixpkgs/issues/22501
-    # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
-    postPatch = ''
-      substituteInPlace sphinx/make_mode.py --replace "sys.executable, " ""
-    '';
-
-    meta = {
-      description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";
-      homepage = http://sphinx.pocoo.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ nand0p ];
-      platforms = platforms.all;
-    };
-  });
-
-  sphinx_1_2 = self.sphinx.override rec {
+  sphinx_1_2 = self.sphinx.overridePythonPackage rec {
     name = "sphinx-1.2.3";
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz";

From abdb58e407d0351894ea1ee32c3484a89f1e53cd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 12 Aug 2017 08:58:06 +0200
Subject: [PATCH 1944/3246] Python: overridePythonPackage ->
 overridePythonAttrs

to better fit the existing naming scheme.

https://github.com/NixOS/nixpkgs/pull/26155#issuecomment-321279629
---
 doc/languages-frameworks/python.md | 6 +++---
 pkgs/top-level/python-packages.nix | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index c8add96a148..c100c9d0c20 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -547,7 +547,7 @@ All parameters from `mkDerivation` function are still supported.
 
 ##### Overriding Python packages
 
-The `buildPythonPackage` function has a `overridePythonPackage` method that
+The `buildPythonPackage` function has a `overridePythonAttrs` method that
 can be used to override the package. In the following example we create an
 environment where we have the `blaze` package using an older version of `pandas`.
 We override first the Python interpreter and pass
@@ -559,7 +559,7 @@ with import <nixpkgs> {};
 (let
   python = let
     packageOverrides = self: super: {
-      pandas = super.pandas.overridePythonPackage(old: rec {
+      pandas = super.pandas.overridePythonAttrs(old: rec {
         version = "0.19.1";
         name = "pandas-${version}";
         src =  super.fetchPypi {
@@ -786,7 +786,7 @@ with import <nixpkgs> {};
 (let
   python = let
     packageOverrides = self: super: {
-      pandas = super.pandas.overridePythonPackage(old: {name="foo";});
+      pandas = super.pandas.overridePythonAttrs(old: {name="foo";});
     };
   in pkgs.python35.override {inherit packageOverrides;};
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 835118b0f20..2884f39bc87 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -37,17 +37,17 @@ let
   });
 
   # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`.
-  # This function introduces `overridePythonPackage` and it overrides the call to `buildPythonPackage`.
+  # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`.
   makeOverridablePythonPackage = f: origArgs:
     let
       ff = f origArgs;
       overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs);
     in
       if builtins.isAttrs ff then (ff // {
-        overridePythonPackage = newArgs: makeOverridable f (overrideWith newArgs);
+        overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs);
       })
       else if builtins.isFunction ff then {
-        overridePythonPackage = newArgs: makeOverridable f (overrideWith newArgs);
+        overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs);
         __functor = self: ff;
       }
       else ff;
@@ -22204,7 +22204,7 @@ in {
 
   sphinx = callPackage ../development/python-modules/sphinx { };
 
-  sphinx_1_2 = self.sphinx.overridePythonPackage rec {
+  sphinx_1_2 = self.sphinx.overridePythonAttrs rec {
     name = "sphinx-1.2.3";
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz";

From a25e324e063ca3e8b3036964af16259453734823 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 12 Aug 2017 09:04:44 +0200
Subject: [PATCH 1945/3246] python.pkgs.audioread: move expression

---
 .../python-modules/audioread/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +--------------
 2 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/audioread/default.nix

diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix
new file mode 100644
index 00000000000..bf71cf8cfbd
--- /dev/null
+++ b/pkgs/development/python-modules/audioread/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "audioread";
+  name = "${pname}-${version}";
+  version = "2.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e";
+  };
+
+  # No tests, need to disable or py3k breaks
+  doCheck = false;
+
+  meta = {
+    description = "Cross-platform audio decoding";
+    homepage = "https://github.com/sampsyo/audioread";
+    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 2884f39bc87..0e308a2f64b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -709,24 +709,7 @@ in {
     };
    });
 
-  audioread = buildPythonPackage rec {
-    name = "audioread-${version}";
-    version = "2.1.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/audioread/${name}.tar.gz";
-      sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e";
-    };
-
-    # No tests, need to disable or py3k breaks
-    doCheck = false;
-
-    meta = {
-      description = "Cross-platform audio decoding";
-      homepage = "https://github.com/sampsyo/audioread";
-      license = licenses.mit;
-    };
-  };
+  audioread = callPackage ../development/python-modules/audioread { };
 
   audiotools = buildPythonPackage rec {
     name = "audiotools-${version}";

From 66ce84b61976f533251a1bd6a5f032efc8741fa1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 12 Aug 2017 09:10:32 +0200
Subject: [PATCH 1946/3246] python.pkgs.bottleneck: move expression

---
 .../python-modules/bottleneck/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +------------
 2 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/bottleneck/default.nix

diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
new file mode 100644
index 00000000000..2c1850b86ab
--- /dev/null
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, numpy
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "Bottleneck";
+  name = "Bottleneck-${version}";
+  version = "1.2.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8";
+  };
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ numpy ];
+  checkPhase = ''
+    nosetests -v $out/${python.sitePackages}
+  '';
+  postPatch = ''
+    substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" ""
+  '';
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e308a2f64b..54cc59be09a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16015,23 +16015,7 @@ in {
 
   };
 
-  bottleneck = buildPythonPackage rec {
-    name = "Bottleneck-${version}";
-    version = "1.2.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/B/Bottleneck/Bottleneck-${version}.tar.gz";
-      sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = [self.numpy];
-    checkPhase = ''
-      nosetests -v $out/${python.sitePackages}
-    '';
-    postPatch = ''
-      substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" ""
-    '';
-  };
+  bottleneck = callPackage ../development/python-modules/bottleneck { };
 
   paho-mqtt = buildPythonPackage rec {
     name = "paho-mqtt-${version}";

From 025222ec799a460bb4aa29d82ab63703e6a960a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 12 Aug 2017 09:23:08 +0100
Subject: [PATCH 1947/3246] pluma: also add default icon theme

---
 pkgs/desktops/mate/pluma/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index 29df4fc475a..a290c404469 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     python
     gnome3.gtksourceview
     gnome3.libpeas
+    gnome3.defaultIconTheme
     mate.mate-desktop
   ];
 

From 73e01c549e23c915945e006162e8005525457e8c Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 12 Aug 2017 10:27:42 +0200
Subject: [PATCH 1948/3246] sonarr: 2.0.0.4753 -> 2.0.0.4928

---
 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 3c096a0d52e..20fb74924d3 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.4753";
+  version = "2.0.0.4928";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "1rhdnd37fd5a4wbnrd817bf7ln4095kzmv283kmm8fz93nmmc19c";
+    sha256 = "0wggh8z5dmkkcgbb1hzikia55djdqmbqz2dpzx1iyvgys7y5n8xm";
   };
 
   buildInputs = [

From 35a268795c5ce93c05ecbdb155f7bb88f4210e59 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 12 Aug 2017 10:28:09 +0200
Subject: [PATCH 1949/3246] emby: 3.2.22.0 -> 3.2.26.0

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

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 7e4c69e3862..4480d950766 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.22.0";
+  version = "3.2.26.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0vc9391q1mi16k05yl5lqs2cmsgcid339pbqm9fyqzm33fk7d73r";
+    sha256 = "04d06640g56f894ypxyp7q5ikbp29nw19w6z136b5kdjy97b6idr";
   };
 
   buildInputs = with pkgs; [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "MediaBrowser - Bring together your videos, music, photos, and live television";
-    homepage = http://emby.media/;
+    homepage = https://emby.media/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.fadenb ];
     platforms = stdenv.lib.platforms.all;

From 3292d801c031fa3c7b01629e38f5490abf5f2c9f Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 12 Aug 2017 10:48:37 +0200
Subject: [PATCH 1950/3246] pythonPackages.phonenumbers: 8.5.1 -> 8.7.1

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index aba0631a536..18cd9f021fe 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.5.1";
+  version = "8.7.1";
   name = "${pname}-${version}";
 
   meta = {
@@ -14,6 +14,6 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
-    sha256 = "b7d1a5832650fad633d1e4159873788ebfb15e053292c20ab9f5119a574f3a67";
+    sha256 = "1zmi2xvh6v4iyfxmrqhj2byfac9xk733w663a7phib7y6wkvqlgr";
   };
 }

From 7bcce71b8f5477280582512f9b70bcab16aa66e3 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 12 Aug 2017 10:58:54 +0200
Subject: [PATCH 1951/3246] SystemdJournal2Gelf: 20160414 -> 20170413

---
 pkgs/tools/system/systemd-journal2gelf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix
index 59df5ee90a4..bfbe217c269 100644
--- a/pkgs/tools/system/systemd-journal2gelf/default.nix
+++ b/pkgs/tools/system/systemd-journal2gelf/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "SystemdJournal2Gelf-${version}";
-  version = "20160414";
+  version = "20170413";
 
   goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf";
 
   src = fetchFromGitHub {
-    rev = "aba2f24e59f190ab8830bf40f92f890e62a9ec9f";
+    rev = "862b1d60d2ba12cd8480304ca95041066cc8bdd0";
     owner = "parse-nl";
     repo = "SystemdJournal2Gelf";
-    sha256 = "012fmnb44681dgz21n1dlb6vh923bpk5lkqir1q40kfz6pacq64n";
+    sha256 = "0xvvc7w2sxkhb33nkq5v626l673d5j2z0yc75wvmqzncwfkkv94v";
   };
 
   goDeps = ./deps.nix;

From 94cadf33baa05d4c2a5ee48354eaf1ef5dd43a60 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 12 Aug 2017 01:17:28 +0200
Subject: [PATCH 1952/3246] nmap: 7.50 -> 7.60

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

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 6495634da33..cce737af9c1 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -19,11 +19,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "7.50";
+  version = "7.60";
 
   src = fetchurl {
     url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "1ckl2qxqxkrfa2qxdrqyaa4k1hhj273aqckrc46fijdz0a76mag9";
+    sha256 = "08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8";
   };
 
   patches = ./zenmap.patch;

From 9ac5525f877d879b060fdbe929c6a7e3d2a441d3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 12 Aug 2017 01:17:47 +0200
Subject: [PATCH 1953/3246] virtmanager: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index dad16ffb0f0..13dbf544c92 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -9,12 +9,12 @@ with stdenv.lib;
 
 python2Packages.buildPythonApplication rec {
   name = "virt-manager-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
-    sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
+    sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23";
   };
 
   nativeBuildInputs = [ wrapGAppsHook intltool file ];

From 5d2764eb68f99574c6b6e0efc2d85a6cdaad2c9d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 12 Aug 2017 11:04:42 +0200
Subject: [PATCH 1954/3246] prometheus-blackbox-exporter: 0.5.0 -> 0.8.1

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

diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
index 388e4d4ac01..ce2e1cf2d74 100644
--- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
@@ -57,8 +57,8 @@ in {
         AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
         ExecStart = ''
           ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
-            -web.listen-address :${toString cfg.port} \
-            -config.file ${cfg.configFile} \
+            --web.listen-address :${toString cfg.port} \
+            --config.file ${cfg.configFile} \
             ${concatStringsSep " \\\n  " cfg.extraFlags}
         '';
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index ccbcce26033..27e6dea01ec 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.5.0";
+  version = "0.8.1";
   rev = version;
 
   goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "1q719q7xslksj9m5c5d8jmap9380nsrdc71yjyn70rimv8xmzfj1";
+    sha256 = "1bnn1xa11593m66ihdnyka0ck8zmg4abvwdyy5fpnyx29g3ym4sd";
   };
 
   meta = with stdenv.lib; {

From b2353e60420fca037fa99bceca8bf065399f16c2 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Mon, 7 Aug 2017 22:30:31 +0100
Subject: [PATCH 1955/3246] umemcache: fix build; remove broken status

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1764b4b743b..be5b4233ea7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23908,11 +23908,12 @@ in {
       sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918";
     };
 
+    hardeningDisable = [ "format" ];
+
     meta = {
       description = "Ultra fast memcache client written in highly optimized C++ with Python bindings";
       homepage = https://github.com/esnme/ultramemcache;
       license = licenses.bsdOriginal;
-      broken = true;
     };
   };
 

From 1844dfc491d187429a6a2bbc81c04362a96a1a46 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Mon, 7 Aug 2017 22:32:54 +0100
Subject: [PATCH 1956/3246] konfig: 0.9 -> 1.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 1764b4b743b..bc1cc902173 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12014,7 +12014,7 @@ in {
 
   konfig = buildPythonPackage rec {
     name = "konfig-${version}";
-    version = "0.9";
+    version = "1.1";
 
     # konfig unconditionaly depend on configparser, even if it is part of
     # the standard library in python 3.2 or above.
@@ -12023,10 +12023,10 @@ in {
     src = pkgs.fetchgit {
       url = https://github.com/mozilla-services/konfig.git;
       rev = "refs/tags/${version}";
-      sha256 = "1kc5iy61ckbmf65d9ssyqiyb25lnxjvr7c2vcsdl9wx4n6fhwzx3";
+      sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c";
     };
 
-    propagatedBuildInputs = with self; [ configparser argparse ];
+    propagatedBuildInputs = with self; [ configparser argparse six ];
 
     meta = {
       description = "Yet Another Config Parser";

From 5acb1b2d0fa5bf291cef88165c7e68b96a07f71a Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Mon, 7 Aug 2017 22:33:53 +0100
Subject: [PATCH 1957/3246] konfig: remove obsolete argparse dependency; fixes
 build failure

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc1cc902173..3c7d841821e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12026,7 +12026,23 @@ in {
       sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c";
     };
 
-    propagatedBuildInputs = with self; [ configparser argparse six ];
+    propagatedBuildInputs = with self; [ configparser six ];
+
+    patches = [ (pkgs.writeText "konfig.patch" ''
+      diff --git a/setup.py b/setup.py
+      index 96fd858..bb4db06 100644
+      --- a/setup.py
+      +++ b/setup.py
+      @@ -20,7 +20,7 @@ setup(name='konfig',
+             author_email="tarek@mozilla.com",
+             include_package_data=True,
+             install_requires = [
+      -        'configparser', 'argparse', 'six'
+      +        'configparser', 'six'
+             ],
+             zip_safe=False,
+             classifiers=classifiers,
+    '') ];
 
     meta = {
       description = "Yet Another Config Parser";

From 9074440f11c49134f65be9fd08a89848a894eaa0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 12 Aug 2017 09:46:59 +0000
Subject: [PATCH 1958/3246] ocamlPackages.configurator: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index d6acbaa7142..07422f8cc80 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -289,7 +289,8 @@ rec {
 
   configurator = janePackage {
     name = "configurator";
-    hash = "1ll90pnprc5nah621ckvqi1gwagvglzx2mzjpkppddw1kr320w80";
+    version = "0.9.1";
+    hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix";
     propagatedBuildInputs = [ ppx_base ];
     meta.description = "Helper library for gathering system configuration";
   };

From 9b92af99420d644f1574955200112f1d52284eae Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 12 Aug 2017 11:20:53 +0100
Subject: [PATCH 1959/3246] pythonPackages.pasteScript: fix typo in 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 54cc59be09a..62a228a165e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16266,7 +16266,7 @@ in {
 
    pasteScript = buildPythonPackage rec {
     version = "1.7.5";
-    name = "PasterScript-${version}";
+    name = "PasteScript-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/P/PasteScript/${name}.tar.gz";

From c0fc1670f5a889a991c8ab7b035d30e3d7dbf98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 12 Aug 2017 11:17:35 +0100
Subject: [PATCH 1960/3246] pythonPackages.umemcache: move expression out of
 python-packages.nix

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

diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix
new file mode 100644
index 00000000000..4d09fda83da
--- /dev/null
+++ b/pkgs/development/python-modules/umemcache/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchurl }:
+
+buildPythonPackage rec {
+  name = "umemcache-${version}";
+  version = "1.6.3";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "mirror://pypi/u/umemcache/${name}.zip";
+    sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918";
+  };
+
+  hardeningDisable = [ "format" ];
+
+  meta = with stdenv.lib; {
+    description = "Ultra fast memcache client written in highly optimized C++ with Python bindings";
+    homepage = https://github.com/esnme/ultramemcache;
+    license = licenses.bsdOriginal;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de64b64bed7..cbf654b9890 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23658,24 +23658,7 @@ in {
 
   };
 
-  umemcache = buildPythonPackage rec {
-    name = "umemcache-${version}";
-    version = "1.6.3";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/u/umemcache/${name}.zip";
-      sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918";
-    };
-
-    hardeningDisable = [ "format" ];
-
-    meta = {
-      description = "Ultra fast memcache client written in highly optimized C++ with Python bindings";
-      homepage = https://github.com/esnme/ultramemcache;
-      license = licenses.bsdOriginal;
-    };
-  };
+  umemcache = callPackage ../development/python-modules/umemcache {};
 
   unicodecsv = buildPythonPackage rec {
     version = "0.14.1";

From fb36d9edb30102a5bd041940fb438241735788fa Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Sat, 12 Aug 2017 12:28:46 +0200
Subject: [PATCH 1961/3246] vivaldi: 1.10.867.48-1 -> 1.11.917.39-1

---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++--
 .../networking/browsers/vivaldi/ffmpeg-codecs.nix         | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index d5006eec3ab..a1238cb5964 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -13,11 +13,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi";
-  version = "1.10.867.48-1";
+  version = "1.11.917.39-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "1han45swvv0y2i2kg7xhml1wj5zyrf2c2hc5b07kqsjkfg9iz1lc";
+    sha256 = "0rsggp4ayj462g217zb9y9grhvbrcxa51a77l8l4qzhd9lg7zvx6";
   };
 
   unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index fb10e2b6c83..1a1b7ae142c 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi-ffmpeg-codecs";
-  version = "59.0.3071.104";
+  version = "60.0.3112.90";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
-    sha512 = "419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf";
+    sha512 = "2p7pjjsxpglxjmh0asyykagqh33ccrjwj4b2aski4h31wkxv9b9najy8aqk6j1bi06n9wd35vis4hz4fr6kvgckllg1pjqrb3bpwmq5";
   };
 
   buildInputs = [ ];
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
     python2 xdg_utils
   ];
 
+  patches = [
+    ../chromium/patches/chromium-gn-bootstrap-r8.patch
+  ];
+
   configurePhase = ''
     runHook preConfigure
 

From e93fe9a1bde82b2d9892ea44be9b62d09ddc756f Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 7 Apr 2017 23:28:33 -0700
Subject: [PATCH 1962/3246] bitcoinarmory: init at 0.96.1

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

diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
new file mode 100644
index 00000000000..78ac55088a4
--- /dev/null
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchFromGitHub, pythonPackages
+, pkgconfig, autoreconfHook, rsync
+, swig, qt4, fcgi
+, bitcoin, procps, utillinux
+}:
+let
+
+  version = "0.96.1";
+  sitePackages = pythonPackages.python.sitePackages;
+  inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted;
+
+in mkPythonDerivation {
+
+  name = "bitcoinarmory-${version}";
+
+  src = fetchFromGitHub {
+    owner = "goatpig";
+    repo = "BitcoinArmory";
+    rev = "v${version}";
+    #sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2";
+    sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true;
+  };
+
+  # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that.
+  #patches = [ ./shutdown-fix.patch ];
+
+  buildInputs = [
+    pkgconfig
+    autoreconfHook
+    swig
+    qt4
+    fcgi
+    rsync # used by silly install script (TODO patch upstream)
+  ];
+
+  propagatedBuildInputs = [
+    pyqt4
+    psutil
+    twisted
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  makeWrapperArgs = [
+    "--prefix            PATH : ${bitcoin}/bin"   # for `bitcoind`
+    "--prefix            PATH : ${procps}/bin"    # for `free`
+    "--prefix            PATH : ${utillinux}/bin" # for `whereis`
+    "--suffix LD_LIBRARY_PATH : $out/lib"         # for python bindings built as .so files
+    "--run    cd\\ $out/lib/armory"               # so that GUI resources can be loaded
+  ];
+
+  # auditTmpdir runs during fixupPhase, so patchelf before that
+  preFixup = ''
+    newRpath=$(patchelf --print-rpath $out/bin/ArmoryDB | sed -r 's|(.*)(/tmp/nix-build-.*libfcgi/.libs:?)(.*)|\1\3|')
+    patchelf --set-rpath $out/lib:$newRpath $out/bin/ArmoryDB
+  '';
+
+  # fixupPhase of mkPythonDerivation wraps $out/bin/*, so this needs to come after
+  postFixup = ''
+    wrapPythonProgramsIn $out/lib/armory "$out $pythonPath"
+    ln -sf $out/lib/armory/ArmoryQt.py $out/bin/armory
+  '';
+
+  meta = {
+    description = "Bitcoin wallet with cold storage and multi-signature support";
+    longDescription = ''
+      Armory is the most secure and full featured solution available for users
+      and institutions to generate and store Bitcoin private keys. This means
+      users never have to trust the Armory team and can use it with the Glacier
+      Protocol. Satoshi would be proud!
+
+      Users are empowered with multiple encrypted Bitcoin wallets and permanent
+      one-time ‘paper backups’. Armory pioneered cold storage and distributed
+      multi-signature. Bitcoin cold storage is a system for securely storing
+      Bitcoins on a completely air-gapped offline computer.
+
+      Maintainer's note: The original authors at https://bitcoinarmory.com/
+      discontinued development. I elected instead to package GitHub user
+      @goatpig's fork, as it's the most active, at time of this writing.
+    '';
+    homepage = https://github.com/goatpig/BitcoinArmory;
+    license = stdenv.lib.licenses.agpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ elitak ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c783b3cb916..c324ad38251 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13401,6 +13401,8 @@ with pkgs;
 
   bibletime = callPackage ../applications/misc/bibletime { };
 
+  bitcoinarmory = callPackage ../applications/misc/bitcoinarmory { pythonPackages = python2Packages; };
+
   bitkeeper = callPackage ../applications/version-management/bitkeeper {
     gperf = gperf_3_0;
   };

From b80b54fbfb1d046f0f86565f6836666f751cf2ce Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 12 Aug 2017 11:05:14 +0200
Subject: [PATCH 1963/3246] gti: 2016-12-07 -> 1.6.1

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

diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix
index 726c7a115ee..a66b32c789c 100644
--- a/pkgs/tools/misc/gti/default.nix
+++ b/pkgs/tools/misc/gti/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gti-${version}";
-  version = "2016-12-07";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "rwos";
     repo = "gti";
-    rev = "d78001bd5b4b6f6ad853b4ec810e9a1ecde1ee32";
-    sha256 = "0449h9m16x542fy6gmhqqkvkg7z7brxw5vmb85nkk1gdlr9pl1mr";
+    rev = "v${version}";
+    sha256 = "19q3r4v22z2q1j4njap356f3mcq6kwh6v8nbbq2rw4x3cdxwdv51";
   };
 
   installPhase = ''

From 71615c19af23a630515e001186cbfcabe7e68b1a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 12 Aug 2017 13:22:04 +0200
Subject: [PATCH 1964/3246] python35: add no-ldconfig.patch again

after it was accidentally removed in
d6c510927651edefc5d5a5ef7070a39dfc94144e
---
 pkgs/development/interpreters/python/cpython/3.5/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 82db26960bc..32bc0e22d1d 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -64,6 +64,10 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
+  patches = [
+    ./no-ldconfig.patch
+  ];
+
   postPatch = ''
     # Determinism
     substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"

From a726fcf153756e9936c8e55671bf2fe8d80e38dc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 13:27:41 +0200
Subject: [PATCH 1965/3246] freestyle: remove

marked as broken and integrated in blender:
http://freestyle.sourceforge.net/
---
 pkgs/misc/freestyle/default.nix |  54 ----------
 pkgs/misc/freestyle/patch       | 182 --------------------------------
 pkgs/top-level/all-packages.nix |   2 -
 3 files changed, 238 deletions(-)
 delete mode 100644 pkgs/misc/freestyle/default.nix
 delete mode 100644 pkgs/misc/freestyle/patch

diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix
deleted file mode 100644
index 6d022220794..00000000000
--- a/pkgs/misc/freestyle/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libqglviewer
-, swig, python }:
-
-stdenv.mkDerivation {
-  name = "freestyle-2.2.0";
-
-  src = fetchurl {
-    url = mirror://sourceforge/freestyle/freestyle.2.2.0-src.tar.bz2;
-    sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga";
- };
-
-  buildInputs = [ qt4 libpng lib3ds freeglut libXi libqglviewer swig ];
-  
-  inherit python freeglut libqglviewer lib3ds; # if you want to use another adopt patch and Config.pri
-
-  buildPhase = ''
-    export PYTHON_VERSION=2.5
-    cd src/system && qmake -makefile PREFIX=\$out && cd ..
-    cd rendering && qmake -makefile PREFIX=\$out && cd ..
-    qmake -makefile PREFIX=\$out && make
-    cd swig && make -f Makefile
-    cd ../..
-
-    hide=$out/nix-support/hide
-    moddir=$out/share/freestyle
-    mkdir -p $out/bin $moddir $hide
-    cp -r style_modules $moddir
-    cp build/lib/*.so* $hide
-    cp build/Freestyle $hide
-    cp -r build/linux-g++/debug/lib/python $hide/pylib
-    cat > $out/bin/Freestyle << EOF
-      #!/bin/sh
-      echo use export PYTHONPATH to add your py files to the search path
-      echo the style modules can be loded from directory $moddir
-      echo starting Freestyle know - have fun
-      echo -e "\n\n\n\n"
-      export PYTHONPATH=$PYTHONPATH:$moddir/style_modules:$hide/pylib
-      LD_LIBRARY_PATH=$hide
-      $hide/Freestyle
-    EOF
-    chmod +x $out/bin/Freestyle
-  '';
-
-  patches = ./patch;
-
-  installPhase = ":";
-
-  meta = {
-    description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
-    homepage = http://freestyle.sourceforge.net;
-    license  = stdenv.lib.licenses.gpl2;
-    broken = true;
-  };
-}
diff --git a/pkgs/misc/freestyle/patch b/pkgs/misc/freestyle/patch
deleted file mode 100644
index dae1b66f9bb..00000000000
--- a/pkgs/misc/freestyle/patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -U3 -r a/src/Config.pri b/src/Config.pri
---- a/src/Config.pri	2008-06-06 22:08:06.000000000 +0200
-+++ b/src/Config.pri	2008-06-08 03:50:16.000000000 +0200
-@@ -80,11 +80,11 @@
- win32:QMAKE_CXXFLAGS     *= /GR /GX
- win32:QMAKE_CFLAGS       *= /GR /GX
- irix-n32:QMAKE_CFLAGS    *= -LANG:std
--irix-n32:QMAKE_CXXFLAGS  *= -LANG:std
--linux-g++:QMAKE_CFLAGS   *= -Wno-deprecated
--linux-g++:QMAKE_CXXFLAGS *= -Wno-deprecated
--cygwin-g++:QMAKE_CFLAGS   *= -Wno-deprecated
--cygwin-g++:QMAKE_CXXFLAGS *= -Wno-deprecated -mno-win32
-+QMAKE_CXXFLAGS  *= -LANG:std
-+QMAKE_CFLAGS   *= -Wno-deprecated -fPIC
-+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC
-+QMAKE_CFLAGS   *= -Wno-deprecated -fPIC
-+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC
- mac:QMAKE_CFLAGS         *= -Wno-deprecated
- mac:QMAKE_CXXFLAGS       *= -Wno-deprecated
- 
-diff -U3 -r a/src/geometry/Grid.h b/src/geometry/Grid.h
---- a/src/geometry/Grid.h	2008-06-06 22:08:06.000000000 +0200
-+++ b/src/geometry/Grid.h	2008-06-06 22:05:52.000000000 +0200
-@@ -321,7 +321,7 @@
-           for (OccludersSet::iterator it = occluders.begin();
-               it != occluders.end();
-               it++) {
--                  if ((unsigned)(*it)->userdata2 != _timestamp) {
-+                  if ((unsigned long)(*it)->userdata2 != _timestamp) {
-                       (*it)->userdata2 = (void*)_timestamp;
-                       visitor.examineOccluder(*it);
-                   }
-diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri
---- a/src/libconfig.pri	2008-06-06 22:08:06.000000000 +0200
-+++ b/src/libconfig.pri	2008-06-07 22:23:44.000000000 +0200
-@@ -1,110 +1,32 @@
- # This file should be viewed as a -*- mode: Makefile -*-
- 
--contains( CONFIG, 3ds1.20 ) {
-   message ("Using 3ds 1.2.0 module")
--  linux-g++:INCLUDEPATH  *= $(HOME)/INCLUDE/LINUX
--  linux-g++:LIBS         *= -L$(HOME)/LIB/LINUX -l3ds
--  cygwin-g++:INCLUDEPATH  *= /usr/lib/lib3ds-1.2.0
--  cygwin-g++:LIBS         *= -L/usr/lib/lib3ds-1.2.0/lib3ds -l3ds
--  mac:INCLUDEPATH *= /usr/local/include
--  mac:LIBS         *= -l3ds
--  mac:QMAKE_LIBDIR *= /usr/local/lib
--  win32:    INCLUDEPATH  *= C:\include\lib3ds\1.2.0
--  win32:    QMAKE_LIBDIR *= C:\lib\lib3ds\1.2.0
--  win32:debug:    LIBS         *= lib3ds-120sd.lib
--  win32:release:    LIBS         *= lib3ds-120s.lib
--}
--
--contains( CONFIG, 3ds1.30 ) {
--  message ("Using 3ds 1.3.0 module")
--  linux-g++:INCLUDEPATH  *= $(HOME)/INCLUDE/LINUX
--  linux-g++:LIBS         *= -L$(HOME)/LIB/LINUX -l3ds
--  cygwin-g++:INCLUDEPATH  *= /usr/lib/lib3ds-1.3.0
--  cygwin-g++:LIBS         *= -L/usr/lib/lib3ds-1.3.0/lib3ds -l3ds
--  mac:INCLUDEPATH *= /usr/local/include
--  mac:LIBS         *= -l3ds
--  mac:QMAKE_LIBDIR *= /usr/local/lib
--  win32:    INCLUDEPATH  *= C:\include\lib3ds\1.3.0
--  win32:    QMAKE_LIBDIR *= C:\lib\lib3ds\1.3.0
--  win32:debug:    LIBS         *= lib3ds-1_3d.lib
--  win32:release:    LIBS         *= lib3ds-1_3.lib
--}
-+  INCLUDEPATH  *= $(lib3ds)/include
-+  LIBS         *= -L$(lib3ds)/lib -l3ds
- 
- contains( CONFIG, qglviewer ) {
-   message ("Using QGLViewer module")
-   CONFIG *= qt thread opengl glut
--  linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE
--  linux-g++:LIBS        *= -L$(HOME)/LIB/LINUX -lQGLViewer
--  cygwin-g++:LIBS        *= -lQGLViewer
--  win32:    INCLUDEPATH  *= $(HOME)\INCLUDE
--  win32:    QMAKE_LIBDIR *= $(HOME)\LIB
--  win32:    LIBS        *= QGLViewer.lib
-+  INCLUDEPATH *= $(mesa)/include
-+  LIBS        *= -L$(mesa)/lib -lQGLViewer
-+  LIBS        *= -lQGLViewer
- }
- 
--contains( CONFIG, python2.3) {
--  message ("Using python 2.3 module")
--  linux-g++:INCLUDEPATH *= /usr/include/python2.3
--  linux-g++:LIBS	*= -lpthread -lm -lutil	
--  linux-g++:LIBS        *= -L/usr/local/lib/ -lpython2.3 -L$(HOME)/LIB/LINUX 
--  win32:    INCLUDEPATH *= C:\python23\include
--  win32:    QMAKE_LIBDIR *= C:\python23\libs
--  win32:    LIBS        *= python23.lib
--}
--
--contains( CONFIG, python2.4) {
--  message ("Using python 2.4 module")
--  linux-g++:INCLUDEPATH *= /usr/include/python2.4
--  linux-g++:LIBS	*= -lpthread -lm -lutil	
--  linux-g++:LIBS        *= -L/usr/local/lib/ -lpython2.4 -L$(HOME)/LIB/LINUX
--  cygwin-g++:INCLUDEPATH *= /usr/include/python2.4
--  cygwin-g++:LIBS	*= -lpthread -lm -lutil	
--  cygwin-g++:LIBS        *= -L/usr/lib/python2.4/config -lpython2.4 
--  win32:    INCLUDEPATH *= C:\python24\include
--  win32:    QMAKE_LIBDIR *= C:\python24\libs
--  win32:    LIBS        *= python24.lib
--}
--
--contains( CONFIG, python2.5) {
--  message ("Using python 2.5 module")
--  linux-g++:INCLUDEPATH *= /usr/include/python2.5
--  linux-g++:LIBS	*= -lpthread -lm -lutil	
--  linux-g++:LIBS        *= -L/usr/local/lib/ -lpython2.5 -L$(HOME)/LIB/LINUX
--  mac:	    INCLUDEPATH *= /usr/include/python2.5
--  mac:      LIBS        *= -L/usr/lib/python2.5/config -lpython2.5
--  cygwin-g++:INCLUDEPATH *= /usr/include/python2.5
--  cygwin-g++:LIBS	*= -lpthread -lm -lutil	
--  cygwin-g++:LIBS        *= -L/usr/lib/python2.5/config -lpython2.5 
--  win32:    INCLUDEPATH *= C:\python25\include
--  win32:    QMAKE_LIBDIR *= C:\python25\libs
--  win32:    LIBS        *= python25.lib
--}
-+message ("Using python ${PYTHON_VERSION} module")
-+INCLUDEPATH *= ${python}/include/python${PYTHON_VERSION}
-+LIBS	*= -lpthread -lm -lutil	
-+LIBS        *= -L${python}/lib -lpython${PYTHON_VERSION} -L$(HOME)/LIB/LINUX
- 
- 
- contains( CONFIG, glut) {
-   message ("Using glut module")
--  linux-g++:LIBS *= -lglut -lXi
--  cygwin-g++:LIBS *= -lglut -lXi
--  mac: LIBS *= -framework Glut
--  win32:INCLUDEPATH *= C:\include
--  win32: QMAKE_LIBDIR *= C:\lib\glut
--  win32: LIBS *= glut32.lib
-+  INCLUDEPATH *= ${freeglut}/include
-+  LIBS *= -lglut -lXi -L{freeglut}/lib
- }
- 
- contains( CONFIG, qglviewer2 ) {
--  message ("Using QGLViewer module")
-+  MESSAGE ("Using QGLViewer module")
-   CONFIG *= qt thread opengl glut
--  linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE
--  linux-g++:LIBS        *= -L$(HOME)/LIB/LINUX -lQGLViewer
--  mac: LIBS *= -lQGLViewer
--  cygwin-g++:LIBS        *= -lQGLViewer2
--  win32:    INCLUDEPATH  *= C:\include\QGLViewer\2.2.5
--  win32{
--    release{
--      QMAKE_LIBDIR *= C:\lib\QGLViewer\release
--    }
--    debug{
--      QMAKE_LIBDIR *= C:\lib\QGLViewer\debug
--    }
--  }
--  win32:    LIBS        *= QGLViewer2.lib
-+  INCLUDEPATH *= $(libqglviewer)/include
-+  LIBS        *= -L$(libqglviewer)/lib -lQGLViewer
- }
-diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile
---- a/src/swig/Makefile	2008-06-06 22:08:06.000000000 +0200
-+++ b/src/swig/Makefile	2008-06-08 01:17:31.000000000 +0200
-@@ -19,14 +19,15 @@
- LIBDIR    = ../../build/${PLATEFORM}/${BUILD}/lib/python
- IPATH     = -I../geometry -I../image -I../scene_graph -I../stroke \
-             -I../system -I../view_map -I../winged_edge \
--            -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}
-+            -I${python}/include/python${PYTHON_VERSION}
- # options to compile with static python : -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic
- #OPTI      = -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
- DBUG      = #-ggdb #-pg
- WARN	  = -w #-W -Wall #-pedantic -ansi
- 
--CFLAGS    = ${OPTI} ${DBUG} ${WARN} ${IPATH}
--LDFLAGS   = ${OPTI} ${DBUG} ${WARN} ${LPATH}
-+CFLAGS    = ${OPTI} ${DBUG} ${WARN} ${IPATH} -fPIC
-+LDFLAGS   = ${OPTI} ${DBUG} ${WARN} ${LPATH} -L${python}/lib
-+
- 
- SWIG_SRC  = Freestyle.i
- PY_SRC    = ${SWIG_SRC:.i=.py}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72682f2170c..9a9bef20075 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18596,8 +18596,6 @@ with pkgs;
 
   foomatic-filters = callPackage ../misc/drivers/foomatic-filters {};
 
-  freestyle = callPackage ../misc/freestyle { };
-
   gajim = callPackage ../applications/networking/instant-messengers/gajim { };
 
   gammu = callPackage ../applications/misc/gammu { };

From c39fec56a8428b4692a8b545386905d6c3bcca83 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 13:33:34 +0200
Subject: [PATCH 1966/3246] restund: remove

marked as broken for several years and no new release fixing the build
---
 pkgs/servers/restund/default.nix | 33 --------------------------------
 pkgs/top-level/all-packages.nix  |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/servers/restund/default.nix

diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix
deleted file mode 100644
index f5b939d85bd..00000000000
--- a/pkgs/servers/restund/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, zlib, openssl, libre, librem, mysql }:
-stdenv.mkDerivation rec {
-  version = "0.4.2";
-  name = "restund-${version}";
-  src=fetchurl {
-    url = "http://www.creytiv.com/pub/restund-${version}.tar.gz";
-    sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2";
-  };
-  buildInputs = [ zlib openssl libre librem mysql.lib ];
-  makeFlags = [
-    "LIBRE_MK=${libre}/share/re/re.mk"
-    "LIBRE_INC=${libre}/include/re"
-    "LIBRE_SO=${libre}/lib"
-    "LIBREM_PATH=${librem}"
-    ''PREFIX=$(out)''
-    "USE_MYSQL=1"
-  ]
-  ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
-  ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
-  ;
-  NIX_LDFLAGS='' -L${stdenv.lib.getLib mysql.client}/lib/mysql '';
-  meta = {
-    homepage = http://www.creytiv.com/restund.html;
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.bsd3;
-    inherit version;
-    downloadPage = "http://www.creytiv.com/pub/";
-    updateWalker = true;
-    downloadURLRegexp = "/restund-.*[.]tar[.]";
-    broken = true; # probably due to glibc-2.20
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a9bef20075..89ccc094e01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11488,8 +11488,6 @@ with pkgs;
 
   restic = callPackage ../tools/backup/restic { };
 
-  restund = callPackage ../servers/restund {};
-
   rethinkdb = callPackage ../servers/nosql/rethinkdb {
     libtool = darwin.cctools;
   };

From 79ac09ea06da73281140afbd46e1464675d7285b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 13:38:32 +0200
Subject: [PATCH 1967/3246] ripple-rest: remove

marked as broken for > 1 yr, development is frozen and author recommends
moving to https://github.com/ripple/ripple-lib
---
 nixos/modules/misc/ids.nix                  |   4 +-
 nixos/modules/module-list.nix               |   1 -
 nixos/modules/services/misc/ripple-rest.nix | 110 --------------------
 pkgs/servers/rippled/ripple-rest.nix        |  27 -----
 pkgs/top-level/all-packages.nix             |   2 -
 5 files changed, 2 insertions(+), 142 deletions(-)
 delete mode 100644 nixos/modules/services/misc/ripple-rest.nix
 delete mode 100644 pkgs/servers/rippled/ripple-rest.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 84d89510679..6ec3c1a112d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -214,7 +214,7 @@
       plex = 193;
       grafana = 196;
       skydns = 197;
-      ripple-rest = 198;
+      # ripple-rest = 198; # unused, removed 2017-08-12
       nix-serve = 199;
       tvheadend = 200;
       uwsgi = 201;
@@ -489,7 +489,7 @@
       sabnzbd = 194;
       #grafana = 196; #unused
       #skydns = 197; #unused
-      #ripple-rest = 198; #unused
+      # ripple-rest = 198; # unused, removed 2017-08-12
       #nix-serve = 199; #unused
       #tvheadend = 200; #unused
       uwsgi = 201;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6062bf623e7..1da1ea5ae11 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -323,7 +323,6 @@
   ./services/misc/radarr.nix
   ./services/misc/redmine.nix
   ./services/misc/rippled.nix
-  ./services/misc/ripple-rest.nix
   ./services/misc/ripple-data-api.nix
   ./services/misc/rogue.nix
   ./services/misc/siproxd.nix
diff --git a/nixos/modules/services/misc/ripple-rest.nix b/nixos/modules/services/misc/ripple-rest.nix
deleted file mode 100644
index 49520f68a50..00000000000
--- a/nixos/modules/services/misc/ripple-rest.nix
+++ /dev/null
@@ -1,110 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.rippleRest;
-
-  configFile = pkgs.writeText "ripple-rest-config.json" (builtins.toJSON {
-    config_version = "2.0.3";
-    debug = cfg.debug;
-    port = cfg.port;
-    host = cfg.host;
-    ssl_enabled = cfg.ssl.enable;
-    ssl = {
-      key_path = cfg.ssl.keyPath;
-      cert_path = cfg.ssl.certPath;
-      reject_unathorized = cfg.ssl.rejectUnathorized;
-    };
-    db_path = cfg.dbPath;
-    max_transaction_fee = cfg.maxTransactionFee;
-    rippled_servers = cfg.rippleds;
-  });
-
-in {
-  options.services.rippleRest = {
-    enable = mkEnableOption "ripple rest";
-
-    debug = mkEnableOption "debug for ripple-rest";
-
-    host = mkOption {
-      description = "Ripple rest host.";
-      default = "localhost";
-      type = types.str;
-    };
-
-    port = mkOption {
-      description = "Ripple rest port.";
-      default = 5990;
-      type = types.int;
-    };
-
-    ssl = {
-      enable = mkEnableOption "ssl";
-
-      keyPath = mkOption {
-        description = "Path to the ripple rest key file.";
-        default = null;
-        type = types.nullOr types.path;
-      };
-
-
-      certPath = mkOption {
-        description = "Path to the ripple rest cert file.";
-        default = null;
-        type = types.nullOr types.path;
-      };
-
-      rejectUnathorized = mkOption {
-        description = "Whether to reject unatohroized.";
-        default = true;
-        type = types.bool;
-      };
-    };
-
-    dbPath = mkOption {
-      description = "Ripple rest database path.";
-      default = "${cfg.dataDir}/ripple-rest.db";
-      type = types.path;
-    };
-
-    maxTransactionFee = mkOption {
-      description = "Ripple rest max transaction fee.";
-      default = 1000000;
-      type = types.int;
-    };
-
-    rippleds = mkOption {
-      description = "List of rippled servers.";
-      default = [
-        "wss://s1.ripple.com:443"
-      ];
-      type = types.listOf types.str;
-    };
-
-    dataDir = mkOption {
-      description = "Ripple rest data directory.";
-      default = "/var/lib/ripple-rest";
-      type = types.path;
-    };
-  };
-
-  config = mkIf (cfg.enable) {
-    systemd.services.ripple-rest = {
-      wantedBy = [ "multi-user.target"];
-      after = ["network.target" ];
-      environment.NODE_PATH="${pkgs.ripple-rest}/lib/node_modules/ripple-rest/node_modules";
-      serviceConfig = {
-        ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.ripple-rest}/lib/node_modules/ripple-rest/server/server.js --config ${configFile}";
-        User = "ripple-rest";
-      };
-    };
-
-    users.extraUsers.postgres = {
-      name = "ripple-rest";
-      uid = config.ids.uids.ripple-rest;
-      createHome = true;
-      home = cfg.dataDir;
-    };
-  };
-}
diff --git a/pkgs/servers/rippled/ripple-rest.nix b/pkgs/servers/rippled/ripple-rest.nix
deleted file mode 100644
index 3449645f185..00000000000
--- a/pkgs/servers/rippled/ripple-rest.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, fetchFromGitHub, nodePackages }:
-
-with lib;
-
-let
-  np = nodePackages.override { generated = ./package.nix; self = np; };
-in nodePackages.buildNodePackage rec {
-  name = "ripple-rest-${version}";
-  version = "1.7.0-rc1";
-
-  src = fetchFromGitHub {
-    repo = "ripple-rest";
-    owner = "ripple";
-    rev = version;
-    sha256 = "19ixgrz40iawd927jan0g1ac8w56wxh2vy3n3sa3dn9cmjd4k2r3";
-  };
-
-  deps = (filter (v: nixType v == "derivation") (attrValues np));
-
-  meta = {
-    description = " RESTful API for submitting payments and monitoring accounts on the Ripple Network";
-    homepage = https://github.com/ripple/ripple-rest;
-    maintainers = with maintainers; [ offline ];
-    license = [ licenses.mit ];
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89ccc094e01..34e46b2885d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11496,8 +11496,6 @@ with pkgs;
     boost = boost159;
   };
 
-  #ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { };
-
   s6 = callPackage ../tools/system/s6 { };
 
   s6-rc = callPackage ../tools/system/s6-rc { };

From a33dfc86f3c63b377951a41efdfea8e1a4d3aafe Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 14:01:08 +0200
Subject: [PATCH 1968/3246] ultrastardx: 1.1, 1.3-beta -> 2017.8.0

---
 pkgs/games/ultrastardx/1.1.nix                | 32 -------------------
 .../ultrastardx/{1.3-beta.nix => default.nix} | 10 +++---
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  9 +-----
 4 files changed, 6 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/games/ultrastardx/1.1.nix
 rename pkgs/games/ultrastardx/{1.3-beta.nix => default.nix} (86%)

diff --git a/pkgs/games/ultrastardx/1.1.nix b/pkgs/games/ultrastardx/1.1.nix
deleted file mode 100644
index 9810d5186b0..00000000000
--- a/pkgs/games/ultrastardx/1.1.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl, pkgconfig, lua, fpc, pcre, portaudio, freetype, libpng
-, SDL, SDL_image, ffmpeg, sqlite, zlib, libX11 }:
-
-stdenv.mkDerivation rec {
-  name = "ultrastardx-1.1";
-  src = fetchurl {
-    url = "mirror://sourceforge/ultrastardx/${name}-src.tar.gz";
-    sha256 = "0sfj5rfgj302avcp6gj5hiypcxms1wc6h3qzjaf5i2a9kcvnibcd";
-  };
-
-  buildInputs = [ pkgconfig fpc pcre portaudio freetype libpng SDL SDL_image ffmpeg
-    sqlite lua ];
-
-
-  # The fpc is not properly wrapped to add -rpath. I add this manually.
-  # I even do a trick on lib/lib64 for libgcc, that I expect it will work.
-  preBuild = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL.out}/lib -rpath ${SDL_image}/lib -rpath ${libpng.out}/lib -rpath ${freetype.out}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg.out}/lib -rpath ${zlib.out}/lib -rpath ${sqlite.out}/lib -rpath ${libX11.out}/lib -rpath ${pcre.out}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc.out}/lib64 -rpath ${stdenv.cc.cc.out}/lib"
-
-    sed -i 414,424d Makefile
-  '';
-
-  # dlopened libgcc requires the rpath not to be shrinked
-  dontPatchELF = true;
-
-  meta = {
-    homepage = http://ultrastardx.sourceforge.net/;
-    description = "Free and open source karaoke game";
-    license = stdenv.lib.licenses.gpl2Plus;
-    broken = true;
-  };
-}
diff --git a/pkgs/games/ultrastardx/1.3-beta.nix b/pkgs/games/ultrastardx/default.nix
similarity index 86%
rename from pkgs/games/ultrastardx/1.3-beta.nix
rename to pkgs/games/ultrastardx/default.nix
index ca7d6b35a21..ce68f190992 100644
--- a/pkgs/games/ultrastardx/1.3-beta.nix
+++ b/pkgs/games/ultrastardx/default.nix
@@ -12,18 +12,16 @@ let
 
 in stdenv.mkDerivation rec {
   name = "ultrastardx-${version}";
-  version = "1.3.5-beta";
+  version = "2017.8.0";
   src = fetchFromGitHub {
     owner = "UltraStar-Deluxe";
     repo = "USDX";
     rev = "v${version}";
-    sha256 = "0qp64qsj29a08cbv3i52jm1w2pcklw6ya5sniycs24zxggza5pkn";
+    sha256 = "1zp0xfwzci3cjmwx3cprcxvm60cik5cvhvrz9n4d6yb8dv38nqzm";
   };
 
-  buildInputs = [
-    pkgconfig autoreconfHook
-    fpc libpng
-  ] ++ sharedLibs;
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ fpc libpng ] ++ sharedLibs;
 
   postPatch = ''
     # autoconf substitutes strange things otherwise
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 49ba2d0ccdf..5c9ae26c77b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -139,6 +139,7 @@ mapAliases (rec {
   telepathy_qt5 = libsForQt5.telepathy;  # added 2015-12-19
   tftp_hpa = tftp-hpa; # added 2015-04-03
   ucsFonts = ucs-fonts; # added 2016-07-15
+  ultrastardx-beta = ultrastardx; # added 2017-08-12
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
   vimbWrapper = vimb; # added 2015-01
   vimprobable2Wrapper = vimprobable2; # added 2015-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34e46b2885d..f372524008b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17569,14 +17569,7 @@ with pkgs;
 
   ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
 
-  ultrastardx = callPackage ../games/ultrastardx/1.1.nix {
-    ffmpeg = ffmpeg_0;
-    lua = lua5;
-  };
-  ultrastardx-beta = callPackage ../games/ultrastardx/1.3-beta.nix {
-    ffmpeg = ffmpeg_0;
-    lua = lua5;
-  };
+  ultrastardx = callPackage ../games/ultrastardx/default.nix { };
 
   unnethack = callPackage ../games/unnethack { };
 

From f7e4531979d4beb889b52663efbff2c718c70335 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Sat, 12 Aug 2017 13:49:21 +0100
Subject: [PATCH 1969/3246] syncserver: fix dependency conflict with webtest

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1764b4b743b..a4f7520c86c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8146,7 +8146,8 @@ in {
       sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h";
     };
 
-    propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib webtest ];
+    propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib ];
+    buildInputs = with self; [ webtest ];
   };
 
   pyroute2 = callPackage ../development/python-modules/pyroute2 { };
@@ -26681,7 +26682,7 @@ EOF
       pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql
       pymysqlsa umemcache WSGIProxy requests pybrowserid
     ];
-    buildInputs = with self; [ testfixtures unittest2  ];
+    buildInputs = with self; [ testfixtures unittest2 webtest ];
 
     #doCheck = false; # lazy packager
   };

From d6c1d2f793473d25838433cc882753982067496b Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Mon, 7 Aug 2017 23:45:25 +0100
Subject: [PATCH 1970/3246] firefox syncserver service: fix PYTHONPATH

---
 .../modules/services/networking/firefox/sync-server.nix  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
index 3a95b9c4ec9..c1a14931429 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixos/modules/services/networking/firefox/sync-server.nix
@@ -119,12 +119,13 @@ in
 
   config = mkIf cfg.enable {
 
-    systemd.services.syncserver = {
+    systemd.services.syncserver = let
+      syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]);
+    in {
       after = [ "network.target" ];
       description = "Firefox Sync Server";
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.pythonPackages.pasteScript pkgs.coreutils ];
-      environment.PYTHONPATH = "${pkgs.pythonPackages.syncserver}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages";
+      path = [ pkgs.coreutils syncServerEnv ];
       preStart = ''
         if ! test -e ${cfg.privateConfig}; then
           umask u=rwx,g=x,o=x
@@ -133,7 +134,7 @@ in
           echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
         fi
       '';
-      serviceConfig.ExecStart = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}";
+      serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}";
     };
 
   };

From 69a4836df5f586468755d4897cba02fc40dac24e Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Mon, 7 Aug 2017 23:55:43 +0100
Subject: [PATCH 1971/3246] firefox syncserver service: run as non-root user by
 default

---
 nixos/doc/manual/release-notes/rl-1709.xml    |  8 +++
 .../networking/firefox/sync-server.nix        | 52 +++++++++++++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index a32f9963d1c..90d7bd4b550 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -154,6 +154,14 @@ rmdir /var/lib/ipfs/.ipfs
       variables as parameters.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      <literal>services.firefox.syncserver</literal> now runs by default as a
+      non-root user. To accomodate this change, the default sqlite database
+      location has also been changed. Migration should work automatically.
+      Refer to the description of the options for more details.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
index c1a14931429..a9f3fd65d76 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixos/modules/services/networking/firefox/sync-server.nix
@@ -4,6 +4,10 @@ with lib;
 
 let
   cfg = config.services.firefox.syncserver;
+
+  defaultDbLocation = "/var/db/firefox-sync-server/firefox-sync-server.db";
+  defaultSqlUri = "sqlite:///${defaultDbLocation}";
+
   syncServerIni = pkgs.writeText "syncserver.ini" ''
     [DEFAULT]
     overrides = ${cfg.privateConfig}
@@ -25,6 +29,7 @@ let
     backend = tokenserver.verifiers.LocalVerifier
     audiences = ${removeSuffix "/" cfg.publicUrl}
   '';
+
 in
 
 {
@@ -65,6 +70,18 @@ in
         '';
       };
 
+      user = mkOption {
+        type = types.str;
+        default = "syncserver";
+        description = "User account under which syncserver runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "syncserver";
+        description = "Group account under which syncserver runs.";
+      };
+
       publicUrl = mkOption {
         type = types.str;
         default = "http://localhost:5000/";
@@ -85,7 +102,7 @@ in
 
       sqlUri = mkOption {
         type = types.str;
-        default = "sqlite:////var/db/firefox-sync-server.db";
+        default = defaultSqlUri;
         example = "postgresql://scott:tiger@localhost/test";
         description = ''
           The location of the database. This URL is composed of
@@ -126,16 +143,45 @@ in
       description = "Firefox Sync Server";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.coreutils syncServerEnv ];
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = true;
+      };
+
       preStart = ''
         if ! test -e ${cfg.privateConfig}; then
-          umask u=rwx,g=x,o=x
-          mkdir -p $(dirname ${cfg.privateConfig})
+          mkdir -m 700 -p $(dirname ${cfg.privateConfig})
           echo  > ${cfg.privateConfig} '[syncserver]'
           echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
         fi
+        chown ${cfg.user}:${cfg.group} ${cfg.privateConfig}
+      '' + optionalString (cfg.sqlUri == defaultSqlUri) ''
+        if ! test -e $(dirname ${defaultDbLocation}); then
+          mkdir -m 700 -p $(dirname ${defaultDbLocation})
+          chown ${cfg.user}:${cfg.group} $(dirname ${defaultDbLocation})
+        fi
+        # Move previous database file if it exists
+        oldDb="/var/db/firefox-sync-server.db"
+        if test -f $oldDb; then
+          mv $oldDb ${defaultDbLocation}
+          chown ${cfg.user}:${cfg.group} ${defaultDbLocation}
+        fi
       '';
       serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}";
     };
 
+    users.extraUsers = optionalAttrs (cfg.user == "syncserver")
+      (singleton {
+        name = "syncserver";
+        group = cfg.group;
+        isSystemUser = true;
+      });
+
+    users.extraGroups = optionalAttrs (cfg.group == "syncserver")
+      (singleton {
+        name = "syncserver";
+      });
   };
 }

From 02d168e13057d4b07577ae2a3cab159a485804a7 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 12 Aug 2017 15:17:39 +0100
Subject: [PATCH 1972/3246] Pull request template: comment out instructions

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e847c73a889..7e7c2418712 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 
 ###### Things done
 
-Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.
+<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
 
 - [ ] Tested using sandboxing
   ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,

From cdb7197d3e980d72b31ffa1a4a1ff2b17568d6db Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 14:11:14 +0200
Subject: [PATCH 1973/3246] glestae: remove

Has been broken for years
---
 pkgs/games/glestae/default.nix  | 34 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 --
 2 files changed, 36 deletions(-)
 delete mode 100644 pkgs/games/glestae/default.nix

diff --git a/pkgs/games/glestae/default.nix b/pkgs/games/glestae/default.nix
deleted file mode 100644
index 2a2809cc805..00000000000
--- a/pkgs/games/glestae/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl
-, mesa, cmake, lua5, SDL, openal, libvorbis, libogg, zlib, physfs
-, freetype, libpng, libjpeg, glew, wxGTK28, libxml2, libpthreadstubs
-}:
-
-stdenv.mkDerivation rec {
-  name = "glestae-${version}";
-  version = "0.3.2";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/glestae/${version}/glestae-src-${version}.tar.bz2";
-    sha256 = "1k02vf88mms0zbprvy1b1qdwjzmdag5rd1p43f0gpk1sms6isn94";
-  };
-
-  buildInputs =
-    [ mesa cmake lua5 SDL openal libvorbis libogg zlib physfs
-      freetype libpng libjpeg glew wxGTK28 libxml2 libpthreadstubs
-    ];
-
-  cmakeFlags = [
-    "-DLUA_LIBRARIES=-llua"
-    "-DGAE_DATA_DIR=$out/share/glestae"
-  ];
-
-  meta = {
-    description = "A 3D RTS - fork of inactive Glest project";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
-    # Note that some data seems to be under separate redistributable licenses
-    license = stdenv.lib.licenses.gpl2Plus;
-    broken = true;
-    downloadPage = "http://sourceforge.net/projects/glestae/files/0.3.2/";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f372524008b..4ca0dcbc9f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17227,8 +17227,6 @@ with pkgs;
 
   gl117 = callPackage ../games/gl-117 {};
 
-  glestae = callPackage ../games/glestae {};
-
   globulation2 = callPackage ../games/globulation {
     boost = boost155;
   };

From 9b3f95498b20eee43594b17510d6a6b17ac23b0a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 14:16:12 +0200
Subject: [PATCH 1974/3246] soi: is not broken

---
 pkgs/games/soi/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index 7c4b2fe823c..9fcab8b1ec9 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin nckx ];
     platforms = platforms.linux;
     license = licenses.free;
-    broken = true;
     downloadPage = http://sourceforge.net/projects/soi/files/;
   };
 }

From 0376ccb7045401248dcd2b84f5fb4b8f1df61cb3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 16:54:11 +0200
Subject: [PATCH 1975/3246] phpPackages.composer: 1.4.2 -> 1.5.1

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index cec9674c8b5..1d07acb8e77 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -235,14 +235,14 @@ let
 
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
-    version = "1.4.2";
+    version = "1.5.1";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "1x467ngxb976ba2r9kqba7jpvm95a0db8nwaa2z14zs7xv1la6bb";
+      sha256 = "107v8hdgmi2s15zsd9ffrr3jyw01qkwv174y9gw9fbpdrjwffi97";
     };
+    unpackPhase = ":";
 
-    phases = [ "installPhase" ];
     buildInputs = [ pkgs.makeWrapper ];
 
     installPhase = ''

From 7eca5a73885b6a764283909ccc71408a7346ce63 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 12 Aug 2017 17:03:31 +0200
Subject: [PATCH 1976/3246] zsh: 5.3.1 -> 5.4.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 8299bef691a..50481dd941b 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "5.3.1";
+  version = "5.4.1";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "0hbqn1zg3x5i9klqfzhizk88jzy8pkg65r9k41b3cn42lg3ncsy1";
+    sha256 = "17qg4iqhvkxsmk1p04brkjq20vb7zx6d8qx1r2q8v6cy4qvqjbjr";
   };
 
 in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "03h42gjqx7yb7qggi7ha0ndsggnnav1qm9vx737jwmiwzy8ab51x";
+    sha256 = "1qhw00y0gnr66bil48hj4wjm0cbjxfdkz5hyb82garp8r8rbhiy4";
   };
 
   buildInputs = [ ncurses pcre ];

From db6a966868ecbccae4cd75a9a48d5483f052434e Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 12 Aug 2017 17:34:08 +0200
Subject: [PATCH 1977/3246] zynaddsubfx: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 42fe3e34cd4..52b9a57c00b 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation  rec {
   name = "zynaddsubfx-${version}";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2";
-    sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8";
+    sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm";
   };
 
   buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];

From 4502e61c5d0ac962e01101b3e55b57921d52867c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 18:13:23 +0200
Subject: [PATCH 1978/3246] audit: 2.7.6 -> 2.7.7

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

diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index a912e6de965..e433deff90c 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -5,11 +5,11 @@
 assert enablePython -> python != null;
 
 stdenv.mkDerivation rec {
-  name = "audit-2.7.6";
+  name = "audit-2.7.7";
 
   src = fetchurl {
     url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
-    sha256 = "1rqlj15kbyfw4z88z8whf1q2rcg17vs439fvzdds55fwzyf2hrgs";
+    sha256 = "1vvqw5xgirap0jdmajw7l3pq563aycvy3hlqvj3k2cac8i4jbqlq";
   };
 
   outputs = [ "bin" "dev" "out" "man" "plugins" ];

From a9e463bc9d97fcc3a909014594f99590d3198a18 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Aug 2017 03:00:33 +0200
Subject: [PATCH 1979/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/3ff230318aca571c2953011d5119a7801279152d.
---
 .../haskell-modules/hackage-packages.nix      | 1346 +++++++++++++----
 1 file changed, 1061 insertions(+), 285 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c08e246e5f1..1db281b39cd 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3970,23 +3970,21 @@ self: {
      }) {};
 
   "DeepDarkFantasy" = callPackage
-    ({ mkDerivation, base, bimap, constraint-unions, constraints
-     , containers, mtl, QuickCheck, random, recursion-schemes
-     , template-haskell
+    ({ mkDerivation, base, bimap, constraints, containers, mtl
+     , QuickCheck, random, recursion-schemes, template-haskell
      }:
      mkDerivation {
        pname = "DeepDarkFantasy";
-       version = "0.2017.8.7";
-       sha256 = "0b3p7yk3brcif92d442c8alp9vlcifxm0m0srk56zcf82sn6sxhh";
+       version = "0.2017.8.11";
+       sha256 = "14ibpvqy8awv6mcdm7ywybq5pk6wf6hwqq18mq8l116jgi7c9vvr";
        libraryHaskellDepends = [
-         base bimap constraint-unions constraints containers mtl random
-         recursion-schemes template-haskell
+         base bimap constraints containers mtl random recursion-schemes
+         template-haskell
        ];
        testHaskellDepends = [ base constraints mtl QuickCheck random ];
        description = "A DSL for creating neural network";
        license = stdenv.lib.licenses.asl20;
-       broken = true;
-     }) {constraint-unions = null;};
+     }) {};
 
   "DefendTheKing" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP
@@ -4809,6 +4807,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "EntrezHTTP_1_0_4" = callPackage
+    ({ mkDerivation, base, biocore, bytestring, conduit, HTTP
+     , http-conduit, hxt, mtl, network, Taxonomy, text, transformers
+     }:
+     mkDerivation {
+       pname = "EntrezHTTP";
+       version = "1.0.4";
+       sha256 = "1gp5g3r05rwayk1gdb9dfzjmywwlr5d236dygryzmga9q13gwvxq";
+       libraryHaskellDepends = [
+         base biocore bytestring conduit HTTP http-conduit hxt mtl network
+         Taxonomy text transformers
+       ];
+       homepage = "https://github.com/eggzilla/EntrezHTTP";
+       description = "Libary to interface with the NCBI Entrez REST service";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "EnumContainers" = callPackage
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
@@ -17430,6 +17446,22 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "Taxonomy_1_0_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl
+     , graphviz, parsec, text, vector
+     }:
+     mkDerivation {
+       pname = "Taxonomy";
+       version = "1.0.3";
+       sha256 = "0w4j1v2l7c8a8x0rpvq1gxbvjcw83kj84m5bw6bwx3x6gc997xxn";
+       libraryHaskellDepends = [
+         aeson base bytestring either-unwrap fgl graphviz parsec text vector
+       ];
+       description = "Libary for parsing, processing and vizualization of taxonomy data";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "TaxonomyTools" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs
      , directory, either-unwrap, EntrezHTTP, fgl, hxt, parsec, process
@@ -18301,23 +18333,25 @@ self: {
      }) {};
 
   "Villefort" = callPackage
-    ({ mkDerivation, base, FindBin, HDBC, HDBC-sqlite3, mtl, random
-     , scotty, split, text, time
+    ({ mkDerivation, base, directory, filepath, FindBin, HDBC
+     , HDBC-sqlite3, mtl, process, QuickCheck, random, scotty, split
+     , strict, text, time, transformers, unix
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.0.8";
-       sha256 = "0974k5adxxa0jpi99wqq13lnav2rdb7qr40snvycsazk5mx1fd35";
+       version = "0.1.1.1";
+       sha256 = "0zba13j6va4bnyxgkp7yq5y7mvyw94x0932kf75b33bw3pan04hz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base FindBin HDBC HDBC-sqlite3 mtl random split time
+         base directory filepath FindBin HDBC HDBC-sqlite3 mtl process
+         random scotty split strict text time transformers unix
        ];
        executableHaskellDepends = [
-         base HDBC HDBC-sqlite3 scotty split text time
+         base HDBC HDBC-sqlite3 random scotty split text time
        ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base HDBC HDBC-sqlite3 QuickCheck ];
        homepage = "https://github.com/Chrisr850/Villefort#readme";
        description = "Villefort is a task manager and time tracker written in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -18712,6 +18746,8 @@ self: {
        pname = "Win32-extras";
        version = "0.2.0.1";
        sha256 = "00lrqvsa74mqv0k4yz00j2jdpmchkyhcicqv24z9a53iv1i0xp7h";
+       revision = "1";
+       editedCabalFile = "0gxp1a5sk9jb7x1mvz5jk68n8npvh8b9nlqcw9s2dn4wlyicm4mp";
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ imm32 msimg32 ];
        homepage = "http://hub.darcs.net/shelarcy/Win32-extras/";
@@ -25525,12 +25561,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ansi-wl-pprint_0_6_8" = callPackage
+  "ansi-wl-pprint_0_6_8_1" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
        pname = "ansi-wl-pprint";
-       version = "0.6.8";
-       sha256 = "114ga28xa2wkdf4azyhffwjh94zxa62q2z0cn58xhnca1y2b3xjx";
+       version = "0.6.8.1";
+       sha256 = "0qxk0iibbyqk7fmrq5cbkr1269bd6vqbdmj2n8s5bvds0836mnnm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
@@ -27223,8 +27259,8 @@ self: {
      }:
      mkDerivation {
        pname = "array-primops";
-       version = "0.2.0.0";
-       sha256 = "02ln59zhkgi1l1zbci2zxyyidhlxmz22csky1y0zdx119nsnhsza";
+       version = "0.2.0.1";
+       sha256 = "0kdf88xs6aplxah90pl2r94fgfl58a4fmpxjcbvb9996823q54qg";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base ghc-prim QuickCheck tasty tasty-quickcheck
@@ -29257,8 +29293,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "14";
-       editedCabalFile = "1xmpf1r6lm3j577svyg43520f3sv838p711s46xh7f6ch4qgdx0i";
+       revision = "15";
+       editedCabalFile = "06vhxs4172liq6ayf2cg3b45hk3jkcxbgz1ilwqrw9bbn8lfgq6s";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -33911,8 +33947,8 @@ self: {
      }:
      mkDerivation {
        pname = "bit-stream";
-       version = "0.1.0.1";
-       sha256 = "0qza9w01qwrbfa35dzhfzxxd8ss1aww332s48sbpdjq3ywkjgk81";
+       version = "0.1.0.2";
+       sha256 = "1x4vcg2y2il540syqdzk2wdixs8g672lhzjm46y40x4299yjw7w1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim vector ];
@@ -35933,6 +35969,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "boomerang_1_4_5_3" = callPackage
+    ({ mkDerivation, base, mtl, template-haskell, text }:
+     mkDerivation {
+       pname = "boomerang";
+       version = "1.4.5.3";
+       sha256 = "124k13x5wzjy2qlbdgixncgr5l7cxw4glq1hjb8hyk8vfvgs6qfl";
+       libraryHaskellDepends = [ base mtl template-haskell text ];
+       description = "Library for invertible parsing and printing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "boomslang" = callPackage
     ({ mkDerivation, base, containers, data-accessor
      , data-accessor-template, font-opengl-basic4x6, GLFW-b, MonadRandom
@@ -36309,8 +36357,8 @@ self: {
      }:
      mkDerivation {
        pname = "brainheck";
-       version = "0.1.0.3";
-       sha256 = "0b153bjibqm6qicnh3r42fcv4w2c4qagllg0f1k5gxg903954xma";
+       version = "0.1.0.4";
+       sha256 = "0jar6jlid339k9rimlawah9800nqdybbr3l2k44y6i7q5pb656by";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44408,8 +44456,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmark-gfm";
-       version = "0.1.1";
-       sha256 = "1v3f4ms6q4sb3fkkby03xikkkbip55lgwpmlay9c9jfs4mybpmxd";
+       version = "0.1.3";
+       sha256 = "1fkisbrydmdx5h8yad09fzk8h1b1j53r02g7vb81izgdwj9b673k";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
        benchmarkHaskellDepends = [
@@ -44451,6 +44499,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cmark-patterns" = callPackage
+    ({ mkDerivation, base, cmark }:
+     mkDerivation {
+       pname = "cmark-patterns";
+       version = "0.1.0.0";
+       sha256 = "15pdlcc0ak1pbx7qz6w5xfv4g9wkapx0flxqqkhcksa4k1h3hr1f";
+       libraryHaskellDepends = [ base cmark ];
+       homepage = "http://github.com/aelve/cmark-patterns";
+       description = "Pattern synonyms for cmark";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cmark-sections" = callPackage
     ({ mkDerivation, base, base-prelude, cmark, containers, hspec
      , microlens, QuickCheck, split, text
@@ -45181,8 +45241,8 @@ self: {
      }:
      mkDerivation {
        pname = "collection-json";
-       version = "1.0.0.0";
-       sha256 = "0v068wayi1f22infgccflpfg78zcwqdga3q6980jxs7irng9xsjv";
+       version = "1.0.1.0";
+       sha256 = "1vq21mjc0zfn1q1mwscq3m5j3dls8dsfcanc9n8kp3sz4lz2f3zw";
        libraryHaskellDepends = [ aeson base network-uri text ];
        testHaskellDepends = [
          aeson base network-uri QuickCheck quickcheck-instances
@@ -46357,6 +46417,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "composition-prelude" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "composition-prelude";
+       version = "0.1.0.1";
+       sha256 = "0a020wl2i84f30y21yywdb4qhr3a1lrjmmcw25kfjg011gdxggf4";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/vmchale/composition-prelude#readme";
+       description = "Higher-order function combinators";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "composition-tree" = callPackage
     ({ mkDerivation, base, doctest, QuickCheck }:
      mkDerivation {
@@ -46654,8 +46726,8 @@ self: {
      }:
      mkDerivation {
        pname = "concrete-haskell";
-       version = "0.1.0.13";
-       sha256 = "1vhwph94v6wspfk4bxafv9zq0l6x5s3lz7rrz9xc99pqwz3dhj2l";
+       version = "0.1.0.14";
+       sha256 = "1qmnmwdk1gz6kn35j150xgdz3fiz895l3qn1km11i6g3ns46rjvj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47095,8 +47167,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-algorithms";
-       version = "0.0.1.0";
-       sha256 = "1i9jhnlq09shb9l3i0p09di6vrbwnpv1jsa4dkmrvy4z347jxq7n";
+       version = "0.0.2.0";
+       sha256 = "17b2j4pm6d2r80q0f33sa1iyfxszmk5lgf94qdw9hbwhs6g7rfjb";
        libraryHaskellDepends = [
          async base bytestring bzlib-conduit conduit conduit-combinators
          conduit-extra containers deepseq directory filepath mtl resourcet
@@ -47324,6 +47396,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conduit-iconv_0_1_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, criterion, mtl
+     , QuickCheck, test-framework, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "conduit-iconv";
+       version = "0.1.1.2";
+       sha256 = "02s5jyr6mii45q4nar5fzqr4hsf7b6rw9fyc6g1jrqjr76xk6vsw";
+       libraryHaskellDepends = [ base bytestring conduit ];
+       testHaskellDepends = [
+         base bytestring conduit mtl QuickCheck test-framework
+         test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion mtl text
+       ];
+       homepage = "https://github.com/sdroege/conduit-iconv";
+       description = "Conduit for character encoding conversion";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-merge" = callPackage
     ({ mkDerivation, base, conduit, mtl }:
      mkDerivation {
@@ -50019,8 +50113,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.18";
-       sha256 = "0w0vrgqiwpy3s3saqjwqy15vky3y1vvhb3ncq1sy52y4csszzmh5";
+       version = "5.9.19";
+       sha256 = "1ar2zbjan63bcwinp3vxxgbpvlr2vffk26b3vr479gdw0mngwa91";
        libraryHaskellDepends = [
          array base binary bytestring cereal cond directory exceptions
          filepath gray-extended hdaemonize hsyslog MonadRandom mtl
@@ -55439,8 +55533,8 @@ self: {
      }:
      mkDerivation {
        pname = "debug-me";
-       version = "1.20170510";
-       sha256 = "0lxzy58a1qyl3vwhn9faiibsfrkaqxylvsdxhfki1x03amwzwnyw";
+       version = "1.20170810";
+       sha256 = "11lbqp7j8wi1r7wkh2fg0rvgkf9icwq306g8h1fz0mkqwcsxmiyq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55913,6 +56007,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_0_7_1_0" = callPackage
+    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
+     , leancheck, mtl, random, ref-fd, semigroups, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "0.7.1.0";
+       sha256 = "058vdwsjjh5pbjbnsr8jfx7n84d4w79r7fkavlzy0a9a2cvb3nia";
+       libraryHaskellDepends = [
+         base concurrency containers deepseq exceptions leancheck mtl random
+         ref-fd semigroups transformers transformers-base
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Systematic testing for Haskell concurrency";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -60903,6 +61016,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "drifter_0_2_3" = callPackage
+    ({ mkDerivation, base, containers, fgl, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "drifter";
+       version = "0.2.3";
+       sha256 = "0f16v4v0ff27qk71a6fsrcwy02nc53g9q1qrfscn8q3swi3rslyz";
+       libraryHaskellDepends = [ base containers fgl text ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck text
+       ];
+       homepage = "https://github.com/AndrewRademacher/drifter";
+       description = "Simple schema management for arbitrary databases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "drifter-postgresql" = callPackage
     ({ mkDerivation, base, containers, drifter, either, mtl
      , postgresql-simple, tasty, tasty-hunit, text, time
@@ -64893,8 +65024,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "error-util";
-       version = "0.0.1.1";
-       sha256 = "14z1yffg0lxyjqf5zpfcz493zh8y4p9d2abmdzvf56qx47r37lb8";
+       version = "0.0.1.2";
+       sha256 = "01jfbq43ps6wjl9z5l1g8zfdi225mfn3xy59n6vrfxh0vsi1c6fz";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/pmlodawski/error-util";
        description = "Set of utils and operators for error handling";
@@ -67201,8 +67332,8 @@ self: {
     ({ mkDerivation, base, leancheck, speculate, template-haskell }:
      mkDerivation {
        pname = "extrapolate";
-       version = "0.1.0";
-       sha256 = "1y9mk8g9sfvp8cyjqfy91qrhkn76clx2lp5kbaa3q2kyhiqifg63";
+       version = "0.2.1";
+       sha256 = "0bb02q5pb3lx5ass9265qb25fn0g30drv0b5250njagc1gi69nrl";
        libraryHaskellDepends = [
          base leancheck speculate template-haskell
        ];
@@ -68207,13 +68338,19 @@ self: {
      }) {};
 
   "feature-flipper" = callPackage
-    ({ mkDerivation, base, containers, hspec, mtl, text }:
+    ({ mkDerivation, base, bytestring, containers, digest, hspec, mtl
+     , text
+     }:
      mkDerivation {
        pname = "feature-flipper";
-       version = "0.2.0.1";
-       sha256 = "16d9cx3cm5ljbi6f5xmnm654hfi8kkw5wrv077k0zv41wzkpn5md";
-       libraryHaskellDepends = [ base containers mtl text ];
-       testHaskellDepends = [ base containers hspec mtl ];
+       version = "0.2.1.2";
+       sha256 = "18g90xvbgxzj2in8v3y7s6p305h0rg5p5163262vi9cdi7lrvvc8";
+       libraryHaskellDepends = [
+         base bytestring containers digest mtl text
+       ];
+       testHaskellDepends = [
+         base bytestring containers digest hspec mtl text
+       ];
        homepage = "https://github.com/toddmohney/flipper#readme";
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
@@ -68226,8 +68363,8 @@ self: {
      }:
      mkDerivation {
        pname = "feature-flipper-postgres";
-       version = "0.1.0.1";
-       sha256 = "1mhwdqpy3l0dx7cwmxi67yp9mp223ang5vpawsh27ms0p8qbgp95";
+       version = "0.1.1.1";
+       sha256 = "186khsn3gqxqhxlah6m8fgl4qlwf3pgmqagvr8rnfv44vzynw8by";
        libraryHaskellDepends = [
          base bytestring containers feature-flipper monad-logger mtl
          persistent persistent-postgresql persistent-template text time
@@ -68757,6 +68894,8 @@ self: {
        pname = "fgl";
        version = "5.5.3.1";
        sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy";
+       revision = "1";
+       editedCabalFile = "00bw87y97ym844ir4mdq0vx5kfb0brzlqmrbqa0iq35lkwsd4k3g";
        libraryHaskellDepends = [
          array base containers deepseq transformers
        ];
@@ -68766,6 +68905,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fgl_5_6_0_0" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, hspec
+     , microbench, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "fgl";
+       version = "5.6.0.0";
+       sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll";
+       libraryHaskellDepends = [
+         array base containers deepseq transformers
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base deepseq microbench ];
+       description = "Martin Erwig's Functional Graph Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fgl-arbitrary" = callPackage
     ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
      mkDerivation {
@@ -69366,6 +69523,31 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "find-clumpiness_0_2_2_0" = callPackage
+    ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness
+     , containers, listsafe, mtl, optparse-applicative, text, text-show
+     , tree-fun, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "find-clumpiness";
+       version = "0.2.2.0";
+       sha256 = "174i1yhd7z884xfci8ml9kbcm0qpnsbryj8vchrd7rwi63ya0rbw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base BiobaseNewick bytestring clumpiness containers listsafe
+         mtl text text-show tree-fun unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base BiobaseNewick bytestring clumpiness containers
+         optparse-applicative text tree-fun unordered-containers
+       ];
+       homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme";
+       description = "Find the clumpiness of labels in a tree";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "find-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -69592,8 +69774,8 @@ self: {
      }:
      mkDerivation {
        pname = "fitspec";
-       version = "0.4.1";
-       sha256 = "0smv851kg4p4qfp29h85zm87x5y3qmqd3hxmznnf7cdp7arxgc74";
+       version = "0.4.3";
+       sha256 = "0kbv2bz4cf8bvv8i5ypcldcyxd6l7f6wwsb85vfmjqrq7kn2apr2";
        libraryHaskellDepends = [
          base cmdargs leancheck template-haskell
        ];
@@ -70619,8 +70801,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.3.8";
-       sha256 = "018ikrd5w5h1sd0adf0ybla7a9vfw9lz06nrppspv2n3i2i55zrb";
+       version = "0.5.3.9";
+       sha256 = "1cvrknfg6h9w6njyx7w87qw19nd3n5615qxaf25fygd5yggydb19";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -70806,6 +70988,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fmt_0_4_0_0" = callPackage
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, containers, criterion, deepseq, formatting, hspec
+     , interpolate, microlens, neat-interpolation, text, text-format
+     , time, time-locale-compat, vector
+     }:
+     mkDerivation {
+       pname = "fmt";
+       version = "0.4.0.0";
+       sha256 = "0ksc8nx3v26y7k25a4x0knbmy9f5c9sa7j54b6fp4xb93bcdn76h";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring containers
+         microlens text text-format time time-locale-compat
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec neat-interpolation text vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq formatting interpolate
+         text text-format vector
+       ];
+       homepage = "http://github.com/aelve/fmt";
+       description = "A new formatting library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fn" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, directory
      , filepath, hspec, http-types, text, unordered-containers, wai
@@ -72921,8 +73130,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.4.0.1";
-       sha256 = "0k0vyyaqkpmz4znc6gvdjk3g5qfximgdac9qh252icz30fhr3bn4";
+       version = "0.5.0.0";
+       sha256 = "17i6jml4v88wy456p3gjzc93db1sr0p5q19vb3jw61648nmswvgb";
        libraryHaskellDepends = [
          attoparsec base bytestring connection containers exceptions network
          transformers
@@ -72939,8 +73148,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.4.0.1";
-       sha256 = "17rrirya6bk17qprzrjl6ndsyszqvwz5bya7l68wyqr4715gbaxs";
+       version = "0.5.0.0";
+       sha256 = "16g1j2a8kikva08bi6n22sw0limlwj8r53acrlq6licg2sdlzp06";
        libraryHaskellDepends = [
          base bytestring conduit-combinators connection exceptions
          ftp-client resourcet
@@ -79761,16 +79970,16 @@ self: {
      }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;};
 
   "gnss-converters" = callPackage
-    ({ mkDerivation, base, basic-prelude, binary, binary-conduit
-     , bytestring, conduit, conduit-extra, exceptions, extra
-     , HUnit-approx, lens, monad-control, mtl, resourcet, rtcm, sbp
-     , tasty, tasty-hunit, text, time, transformers-base
+    ({ mkDerivation, aeson, aeson-pretty, base, basic-prelude, binary
+     , binary-conduit, bytestring, conduit, conduit-extra, exceptions
+     , extra, lens, monad-control, mtl, resourcet, rtcm, sbp, tasty
+     , tasty-golden, tasty-hunit, text, time, transformers-base
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.3.8";
-       sha256 = "1l9f7vfyzikakz8lnp373l2fz4zqrisnmqdryfn3v7pdd06a21dv";
+       version = "0.3.11";
+       sha256 = "0f6953pp35rgy2x51db3faawmnr7lsbrdihyi16kcqbffdwcni9g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79778,12 +79987,12 @@ self: {
          resourcet rtcm sbp time transformers-base vector
        ];
        executableHaskellDepends = [
-         base basic-prelude binary-conduit conduit conduit-extra resourcet
+         base basic-prelude binary-conduit conduit conduit-extra
        ];
        testHaskellDepends = [
-         base basic-prelude binary binary-conduit bytestring conduit
-         conduit-extra HUnit-approx lens resourcet rtcm sbp tasty
-         tasty-hunit text unordered-containers
+         aeson aeson-pretty base basic-prelude binary binary-conduit
+         bytestring conduit conduit-extra lens resourcet rtcm sbp tasty
+         tasty-golden tasty-hunit text unordered-containers
        ];
        homepage = "http://github.com/swift-nav/gnss-converters";
        description = "GNSS Converters";
@@ -81898,16 +82107,17 @@ self: {
      }) {};
 
   "gotta-go-fast" = callPackage
-    ({ mkDerivation, base, brick, cmdargs, directory, random, time, vty
+    ({ mkDerivation, base, brick, cmdargs, directory, random, text
+     , time, vty, word-wrap
      }:
      mkDerivation {
        pname = "gotta-go-fast";
-       version = "0.1.3.1";
-       sha256 = "1fid0xshpimxq0n73741ywm4a34vscw289bw93jd4gmnihyp9bgs";
+       version = "0.1.4.0";
+       sha256 = "15gip4nggw3wxa3k546sqqbiqzhkw5acxwmwy3iv911d61s89gvb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base brick cmdargs directory random time vty
+         base brick cmdargs directory random text time vty word-wrap
        ];
        homepage = "https://github.com/hot-leaf-juice/gotta-go-fast";
        description = "A command line utility for practicing typing";
@@ -87225,6 +87435,8 @@ self: {
        pname = "hapistrano";
        version = "0.3.2.2";
        sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7";
+       revision = "1";
+       editedCabalFile = "0rx3hs8z717cmx3l97fjmyz94i0n25f69x2rk3nvgnldskvjxswv";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -87242,6 +87454,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_2_4" = callPackage
+    ({ mkDerivation, aeson, async, base, directory, filepath, hspec
+     , mtl, optparse-applicative, path, path-io, process, stm, temporary
+     , time, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.2.4";
+       sha256 = "08p1060m9wjxgxai5zxhzv40c0h9xsdvcbdg33b20hzyapzgq6kl";
+       revision = "1";
+       editedCabalFile = "0cvbn9a7jhq8nr1cwfij5bm030d662s5hn287q5w5wx5xmmzsn9m";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base filepath mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base optparse-applicative path path-io stm yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process temporary
+       ];
+       homepage = "https://github.com/stackbuilders/hapistrano";
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -87580,8 +87821,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-foundation";
-       version = "0.5.9";
-       sha256 = "0xn176m65wjvbfqcjhwvvm7imq01iiixap4jay1wn6qzk0qn5w5n";
+       version = "0.5.9.1";
+       sha256 = "05fcvwa25x993ba8h034877di4y1m3yp5f5fvx4jxdybpf868jnn";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state base happstack-hsp happstack-server hsp lifted-base
@@ -87797,7 +88038,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "happstack-server_7_5_0" = callPackage
+  "happstack-server_7_5_0_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
      , containers, directory, exceptions, extensible-exceptions
      , filepath, hslogger, html, HUnit, monad-control, mtl, network
@@ -87808,8 +88049,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.5.0";
-       sha256 = "0ybwzb9w6mzw9mjr10rpih9hh1cs4v0wdaizl7p5l34xk441qaxw";
+       version = "7.5.0.1";
+       sha256 = "05cb20rj4qys7r5kkbvjnm4bknfzwanf4r4yk1jq7a71x2sgcxc0";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -87846,6 +88087,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
+  "happstack-server-tls_7_1_6_4" = callPackage
+    ({ mkDerivation, base, bytestring, extensible-exceptions
+     , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "happstack-server-tls";
+       version = "7.1.6.4";
+       sha256 = "1wn0yv4x619sl70fy3ffby78lfjiq9d73d4rsp3mkgr6d3kn45wj";
+       libraryHaskellDepends = [
+         base bytestring extensible-exceptions happstack-server hslogger
+         HsOpenSSL network sendfile time unix
+       ];
+       librarySystemDepends = [ openssl ];
+       homepage = "http://www.happstack.com/";
+       description = "extend happstack-server with https:// support (TLS/SSL)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "happstack-server-tls-cryptonite" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , extensible-exceptions, happstack-server, hslogger, network
@@ -89016,6 +89277,32 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "haskell-abci" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, conduit
+     , conduit-combinators, conduit-extra, foundation, lens
+     , network-conduit, proto-lens, proto-lens-arbitrary
+     , proto-lens-protoc, text
+     }:
+     mkDerivation {
+       pname = "haskell-abci";
+       version = "0.1.0.0";
+       sha256 = "15d4hqld9f00vmc3cvjvhamfkcl60dfdmkkrd9yrqj044ml93kaf";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       libraryHaskellDepends = [
+         base binary bytestring conduit conduit-combinators conduit-extra
+         foundation lens network-conduit proto-lens proto-lens-arbitrary
+         proto-lens-protoc
+       ];
+       executableHaskellDepends = [
+         base binary bytestring foundation lens text
+       ];
+       homepage = "https://github.com/cwgoes/haskell-abci#readme";
+       description = "Haskell Application BlockChain Interface (ABCI) Server Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-aliyun" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, basic-prelude
      , blaze-builder, bytestring, case-insensitive, conduit, Crypto
@@ -91849,7 +92136,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hasmin_0_3_2_3" = callPackage
+  "hasmin_0_3_2_4" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , criterion, directory, doctest, doctest-discover, gitrev, hopfli
      , hspec, hspec-attoparsec, matrix, mtl, numbers
@@ -91857,8 +92144,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasmin";
-       version = "0.3.2.3";
-       sha256 = "0qk551j27rc36gmrfdhlvz3kzn8yj8alzc2n86jgyx480gj354gg";
+       version = "0.3.2.4";
+       sha256 = "0xbc5pihr9izms94idc3bmapfs58pg2smn3ym3wnsxs69bah8xfi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94999,14 +95286,14 @@ self: {
      }:
      mkDerivation {
        pname = "hexml-lens";
-       version = "0.1.0.0";
-       sha256 = "11v137m91asl52srb82xfvxjl3cyiw2213mjyy1lbqzdriz6k9lc";
+       version = "0.2.0";
+       sha256 = "1rj45rghjzcgdllrcz2qm1sixjl73ncij5bh5qnkdb65b5hkfhfp";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring foundation hexml lens text
        ];
-       testHaskellDepends = [
-         base bytestring doctest foundation hexml lens QuickCheck text
-       ];
+       testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "https://github.com/pepeiborra/hexml-lens#readme";
        description = "Lenses for the hexml package";
        license = stdenv.lib.licenses.bsd3;
@@ -97125,8 +97412,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjugement";
-       version = "1.0.0.20170804";
-       sha256 = "1liq8iq40011lnixr49fx9lm091s7y18y9f1ym19iqj07qprc3x7";
+       version = "1.0.0.20170808";
+       sha256 = "1za90csf836zc4iv2gn5m4049zknzp5ydham0axga13987bs2j1w";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-hunit tasty-quickcheck text
@@ -100404,8 +100691,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.4.2";
-       sha256 = "085imrvkxvw06sg8wcgzba9jw8hficizjf6lmqk4ai6ahpgmml6s";
+       version = "2.4.3";
+       sha256 = "1qdk5s1dv3v9pvf8hrr2cwgqsvk7pfiy1k3vvdqcv5cfnknqx0y1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103543,6 +103830,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hspec-multicheck" = callPackage
+    ({ mkDerivation, base, hspec, hspec-smallcheck, QuickCheck
+     , smallcheck
+     }:
+     mkDerivation {
+       pname = "hspec-multicheck";
+       version = "0.1";
+       sha256 = "1x4c3fsvxacwh5jlfjmasxm8bznqv9b6hsd7fr0vqp6q9a2hrx8k";
+       libraryHaskellDepends = [
+         base hspec hspec-smallcheck QuickCheck smallcheck
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/marcellussiegburg/hspec-multicheck";
+       description = "A testing framework for Haskell using Hspec";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "hspec-pg-transact" = callPackage
     ({ mkDerivation, base, bytestring, hspec, pg-transact
      , postgresql-simple, resource-pool, text, tmp-postgres
@@ -104599,6 +104903,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsx2hs_0_14_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, haskell-src-exts
+     , haskell-src-meta, mtl, template-haskell, utf8-string
+     }:
+     mkDerivation {
+       pname = "hsx2hs";
+       version = "0.14.1.1";
+       sha256 = "0hymdradb2vsx7gpdwrlmkv1qg4p2r5l6pfiqc4ijyn152jrgr7b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring haskell-src-exts haskell-src-meta mtl
+         template-haskell utf8-string
+       ];
+       homepage = "https://github.com/seereason/hsx2hs";
+       description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsyscall" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -104894,14 +105218,21 @@ self: {
      }) {};
 
   "html-parse" = callPackage
-    ({ mkDerivation, attoparsec, base, criterion, deepseq, tagsoup
-     , text
+    ({ mkDerivation, attoparsec, base, containers, criterion, deepseq
+     , hspec, hspec-discover, QuickCheck, quickcheck-instances
+     , string-conversions, tagsoup, text
      }:
      mkDerivation {
        pname = "html-parse";
-       version = "0.2.0.0";
-       sha256 = "14jap2xx030hzb0qs2rz30q92zivl0qd9h5z2ab3msl6vh0q97ww";
-       libraryHaskellDepends = [ attoparsec base deepseq text ];
+       version = "0.2.0.1";
+       sha256 = "1v6i9g4l0j8mvi12lqv40k30lpn8bv28pvf6ps0zgjgpb2khfxsw";
+       libraryHaskellDepends = [
+         attoparsec base containers deepseq text
+       ];
+       testHaskellDepends = [
+         base containers hspec hspec-discover QuickCheck
+         quickcheck-instances string-conversions text
+       ];
        benchmarkHaskellDepends = [
          attoparsec base criterion deepseq tagsoup text
        ];
@@ -106393,6 +106724,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hunit-dejafu_0_7_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
+     mkDerivation {
+       pname = "hunit-dejafu";
+       version = "0.7.0.0";
+       sha256 = "0pp3rxzb00glkc9fn45hik7rn4dwampdbh7va0gdlzh1jma6wpgw";
+       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the HUnit test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -106748,6 +107092,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-balancedparens_0_2_0_0" = callPackage
+    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
+     , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector
+     }:
+     mkDerivation {
+       pname = "hw-balancedparens";
+       version = "0.2.0.0";
+       sha256 = "1yd7s4n93rparg99x3kjsfiyk1si8kfg2ibfz5da1dlnzpffvmfq";
+       libraryHaskellDepends = [
+         base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple
+         vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion hw-bits hw-prim vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
+       description = "Balanced parentheses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-bits" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
      , hw-prim, hw-string-parse, QuickCheck, safe, vector
@@ -106859,6 +107227,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-excess_0_2_0_0" = callPackage
+    ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
+     , QuickCheck, safe, storable-record, vector
+     }:
+     mkDerivation {
+       pname = "hw-excess";
+       version = "0.2.0.0";
+       sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi";
+       libraryHaskellDepends = [
+         base hw-bits hw-prim hw-rankselect-base safe storable-record vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-excess#readme";
+       description = "Excess";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-hedgehog" = callPackage
     ({ mkDerivation, base, hedgehog, vector }:
      mkDerivation {
@@ -107146,7 +107534,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect_0_10_0_0" = callPackage
+  "hw-rankselect_0_10_0_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap
@@ -107154,8 +107542,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.10.0.0";
-       sha256 = "09lnxig3z7792f24jlijm76psa5ihjzdb4g1ilg8iria9h825q1n";
+       version = "0.10.0.1";
+       sha256 = "0xpgm2r05cshsn7ddkx6pxfj80y5fgpvi1r11iqxvdgnfdhpv780";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112424,15 +112812,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "irc-client_0_4_4_3" = callPackage
+  "irc-client_0_4_4_4" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
      , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
      , time, tls, transformers, x509, x509-store, x509-validation
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "0.4.4.3";
-       sha256 = "0m85swb00hkpj13rk413vd7zxwsqps20kqnjwzwi14288awigjd1";
+       version = "0.4.4.4";
+       sha256 = "0y858xsjl16vlb9ifvw7akw727zmg06i5ald78r8828c8piqa259";
        libraryHaskellDepends = [
          base bytestring conduit connection irc-conduit irc-ctcp
          network-conduit-tls old-locale stm stm-conduit text time tls
@@ -112474,15 +112862,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "irc-conduit_0_2_2_2" = callPackage
+  "irc-conduit_0_2_2_3" = 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.2";
-       sha256 = "0glgq9wbx0i42ry7ribp8r54lsx39qjvvd9dhx1cnv5bb5jwihas";
+       version = "0.2.2.3";
+       sha256 = "06gklbipbjg0n2c3iqh753v9njd602r3lj4rmq1155kx0bxlwhmg";
        libraryHaskellDepends = [
          async base bytestring conduit conduit-extra connection irc irc-ctcp
          network-conduit-tls profunctors text time tls transformers
@@ -113213,15 +113601,15 @@ self: {
   "ivory" = callPackage
     ({ mkDerivation, alex, array, base, base-compat, containers, dlist
      , filepath, happy, monadLib, pretty, template-haskell, text
-     , th-lift
+     , th-abstraction, th-lift
      }:
      mkDerivation {
        pname = "ivory";
-       version = "0.1.0.6";
-       sha256 = "13akncp29sqidkqxfbv6k2gadipdzvnk6svgwm1p29xr5wxfizca";
+       version = "0.1.0.7";
+       sha256 = "1qf0kp863ivb57mrc27kh1vm5a7ikfiz1hk32pm3jq8h7i2znh1s";
        libraryHaskellDepends = [
          array base base-compat containers dlist filepath monadLib pretty
-         template-haskell text th-lift
+         template-haskell text th-abstraction th-lift
        ];
        libraryToolDepends = [ alex happy ];
        homepage = "http://ivorylang.org";
@@ -113253,10 +113641,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-backend-c";
-       version = "0.1.0.5";
-       sha256 = "0dg5408il1s9z1v69k8vw80ypmkbanvqfsw8a5gi8l3b9xinjzg0";
-       revision = "3";
-       editedCabalFile = "09r09jbbj6a3qm07gj64pbszs72kpvab0320flg6rq9ng2pswv49";
+       version = "0.1.0.7";
+       sha256 = "1xj492gzlypwd66w71mz4ndvl27vx2c712nz61myp3i4lx4rnpay";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring containers directory filepath ivory
@@ -116875,8 +117261,8 @@ self: {
      }:
      mkDerivation {
        pname = "keysafe";
-       version = "0.20170303";
-       sha256 = "0nmlm6izhg0nh4wh6vrdl8sm6w447x3jnx4nxxwxxz4mfy4yx18p";
+       version = "0.20170811";
+       sha256 = "12akw0r3m4pz8gb1sxa8azm17jq8564300wwh3c5f47dy29p23py";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -119022,6 +119408,8 @@ self: {
        pname = "language-lua";
        version = "0.10.0";
        sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c";
+       revision = "1";
+       editedCabalFile = "0l90w79xn0k1wqhz7gb2ih33nja3w9m8pp11d9dxdg5am05fyhm2";
        libraryHaskellDepends = [ array base bytestring deepseq text ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
@@ -124246,8 +124634,8 @@ self: {
      }:
      mkDerivation {
        pname = "lmdb-simple";
-       version = "0.3.0.0";
-       sha256 = "1sin30ddq206f86br9snidskn02m4s6wwaaylvpmxzhay40b2f6i";
+       version = "0.3.1.0";
+       sha256 = "1d43gss6ri05rnjsjfmaxpzb91gfvnjhz41ls7rjmqa1x8ym2lsn";
        libraryHaskellDepends = [ base bytestring lmdb serialise ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -124587,6 +124975,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "log-base_0_7_2_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
+     , exceptions, mmorph, monad-control, monad-time, mtl, semigroups
+     , stm, text, time, transformers-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "log-base";
+       version = "0.7.2.0";
+       sha256 = "1lxlm76n1yhdkqmi44m4h460sc3a6lmscaz2daci16vvl4kzilds";
+       revision = "1";
+       editedCabalFile = "0x11xxfvlak8p7p544gknm2k7nqh1wq01bg800gdgppxcpv3m4li";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring deepseq exceptions mmorph
+         monad-control monad-time mtl semigroups stm text time
+         transformers-base unordered-containers
+       ];
+       homepage = "https://github.com/scrive/log";
+       description = "Structured logging solution (base package)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-domain" = callPackage
     ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
      , comonad, deepseq, distributive, doctest, generic-deriving
@@ -124673,6 +125083,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "log-elasticsearch_0_9_1_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , bloodhound, bytestring, deepseq, http-client, http-client-tls
+     , log-base, semigroups, text, text-show, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "log-elasticsearch";
+       version = "0.9.1.0";
+       sha256 = "0i6mpdh1g25wa9yk9p5isg7idjqh3z0zd2mm43707z4s36pfr9m5";
+       revision = "1";
+       editedCabalFile = "1c2245z8ajy11n033my5wzj9q79vbj4jlysy477syr6h5840wd6x";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring bloodhound bytestring
+         deepseq http-client http-client-tls log-base semigroups text
+         text-show time transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/scrive/log";
+       description = "Structured logging solution (Elasticsearch back end)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-postgres" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base
@@ -124694,6 +125127,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "log-postgres_0_7_0_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base
+     , mtl, semigroups, split, text, text-show, time
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "log-postgres";
+       version = "0.7.0.2";
+       sha256 = "16v3wli0jll5j24pdzmya90lyawqv3rcvsfd4z88kgcchds07iji";
+       revision = "1";
+       editedCabalFile = "1f18nzrh3bxnb58cmd3zyqpwaw2jyfl92dg6qd30zhlvlnkz1q7q";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring bytestring deepseq
+         hpqtypes http-client lifted-base log-base mtl semigroups split text
+         text-show time unordered-containers vector
+       ];
+       homepage = "https://github.com/scrive/log";
+       description = "Structured logging solution (PostgreSQL back end)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-utils" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default
      , exceptions, hpqtypes, http-types, invariant, kontra-config
@@ -125514,8 +125970,8 @@ self: {
      }:
      mkDerivation {
        pname = "loup";
-       version = "0.0.14";
-       sha256 = "0j700rms8g1k8lz2anwh9j6pq8f4yqxmcvkn1ssxx2k5dvbq7q80";
+       version = "0.0.15";
+       sha256 = "1pb2ka69vpv9x318b80dcgk72g6r4s24j9n8dcjg0ibw6cxsn5fg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126654,8 +127110,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.4.0.1";
-       sha256 = "1qldc05017i1dy1mcl79r0ynxx66qqnsyp8f3y5lk4jdgrfz9mb1";
+       version = "2.4.0.2";
+       sha256 = "0jc86l0cz9nnp11fdn10qyb78g1klaq6qlipqrzrq5vil419vdss";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129178,7 +129634,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_6_0_2" = callPackage
+  "megaparsec_6_1_0" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -129186,8 +129642,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "6.0.2";
-       sha256 = "0j056smq8k0pal765vanjzg51aw7wxv0qihsipirb6d7ik03didf";
+       version = "6.1.0";
+       sha256 = "1096frlw1q7mgr87ndbwbg26dcmj1yv8a88xwwwy4p2f5m4df0fd";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -129858,7 +130314,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "metrics_0_4_1_0" = callPackage
+  "metrics_0_4_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , HUnit, lens, mwc-random, primitive, QuickCheck, text, time
      , transformers, transformers-base, unix-compat
@@ -129866,8 +130322,8 @@ self: {
      }:
      mkDerivation {
        pname = "metrics";
-       version = "0.4.1.0";
-       sha256 = "0d4pp1f2ag7bmsxb57p1h6c2qxf1svda9vdlrg8p8111nim5miar";
+       version = "0.4.1.1";
+       sha256 = "1f2vqwldp457956bx839r9v3xpmp95q42insn2xcdw669rq6wpym";
        libraryHaskellDepends = [
          ansi-terminal base bytestring containers lens mwc-random primitive
          text time transformers transformers-base unix-compat
@@ -130066,6 +130522,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens_0_4_8_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.4.8.1";
+       sha256 = "0iqagqc3c6b6ihydhc6s7dlibwwf7pr1k9gixls3jikj6hfxzf0p";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
      , scientific, tasty, tasty-hunit, text, unordered-containers
@@ -131118,14 +131587,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_6_0_0" = callPackage
+  "miso_0_7_0_0" = callPackage
     ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers
      , lucid, servant, servant-lucid, text, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.6.0.0";
-       sha256 = "14pzfqzrakiw1xfmzkynjjg2h1d1ab4ndwy4fyl1wffrb0dnjqxg";
+       version = "0.7.0.0";
+       sha256 = "0zakd08mfrzhdi9wqzj7vs62wlnhzkakbx0yqa9qgzfz4x6pi1j8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138797,8 +139266,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.5.0.1";
-       sha256 = "0j3wxzf8p5ck3dxfb6bmv3g8xpknsdalgjgp39i47g4qf27prqgx";
+       version = "0.6.0.0";
+       sha256 = "0bs0jxxgrq29b14mcslyqa29znbhlx6kwq93jzr995alhn7g92px";
        libraryHaskellDepends = [
          async base binary bytestring template-haskell unix
        ];
@@ -139782,6 +140251,8 @@ self: {
        pname = "np-extras";
        version = "0.3.1.1";
        sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf";
+       revision = "1";
+       editedCabalFile = "1m4sfcpb9dcawckfk6nb2qib402s958zjgspd4svxrzdyaqqg4i3";
        libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
@@ -141035,8 +141506,8 @@ self: {
      }:
      mkDerivation {
        pname = "oidc-client";
-       version = "0.3.0.0";
-       sha256 = "0k5gknbp54pqbk66cx900lqdrxn0fzfpcpafpfmvz4r49parrj7w";
+       version = "0.3.0.1";
+       sha256 = "0wk1lx3kqgza9dah89p10bza1iasdj4bnbax5x66h2a7imn7c4sk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141044,7 +141515,8 @@ self: {
          http-client-tls jose-jwt network network-uri text time tls
        ];
        testHaskellDepends = [
-         base bytestring hspec http-client http-client-tls http-types text
+         aeson base bytestring exceptions hspec http-client http-client-tls
+         http-types jose-jwt network-uri text time
        ];
        homepage = "https://github.com/krdlab/haskell-oidc-client";
        description = "OpenID Connect 1.0 library for RP";
@@ -143902,10 +144374,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.2.5.0";
-       sha256 = "14c4nbibx4qbi7pvycaf3q12hpj4s02wdg5pl23z2b4f8jz3pnfl";
-       revision = "1";
-       editedCabalFile = "1l1nbijrw2brj9b849agm9cyzn9iwn25kmj1m2xyyyyd1bk95nqr";
+       version = "0.2.6.0";
+       sha256 = "1mbv2840l6kjc878f6miar3vfbgx2mwllxaryjlj9y6s6001185b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -144270,26 +144740,26 @@ self: {
   "papa" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, 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, QuickCheck, template-haskell
+     , papa-bifunctors-export, papa-bifunctors-implement, papa-lens
+     , papa-lens-export, papa-lens-implement, papa-semigroupoids
+     , papa-semigroupoids-export, papa-semigroupoids-implement, papa-x
+     , papa-x-export, papa-x-implement, QuickCheck, template-haskell
      }:
      mkDerivation {
        pname = "papa";
-       version = "0.2.1";
-       sha256 = "11jklw09xgsd75q85yivsgdab82kg0s98nnarlbid5q433gszs8v";
+       version = "0.3.0";
+       sha256 = "0rqk37yv5z0fmk5ksmfp5gsx0fvhb9vgzxf699dfzcyjhr2wza4i";
        libraryHaskellDepends = [
          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
+         papa-bifunctors-export papa-bifunctors-implement papa-lens
+         papa-lens-export papa-lens-implement papa-semigroupoids
+         papa-semigroupoids-export papa-semigroupoids-implement papa-x
+         papa-x-export papa-x-implement
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa";
+       homepage = "https://github.com/qfpl/papa";
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144301,53 +144771,49 @@ self: {
      }:
      mkDerivation {
        pname = "papa-base";
-       version = "0.2.0";
-       sha256 = "1hvkjjjwh1m3d3mck5z1szr2f2g4agj20hvrcxwm3iig3nqz04cb";
+       version = "0.3.0";
+       sha256 = "1mj70lipn90jpnadwzs2sl36q72x0z47bhhnmzdcpr79irqf1fx2";
        libraryHaskellDepends = [
          base papa-base-export papa-base-implement
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-base";
+       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "papa-base-export" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
-     , template-haskell
+     , semigroups, template-haskell
      }:
      mkDerivation {
        pname = "papa-base-export";
-       version = "0.2.0";
-       sha256 = "0jm98mfs339paah260idshsdz1f4hqfnz0c520f7dsvipks81v0z";
-       revision = "1";
-       editedCabalFile = "1y18rf9q5b6h03870wvlqj53l86r0ad25wm4mv035z1h1c6qmaqn";
-       libraryHaskellDepends = [ base ];
+       version = "0.3.0";
+       sha256 = "19ix2ckdp22xfjghgb8a7586pbldz291185bc96j37ijmy4lhd5z";
+       libraryHaskellDepends = [ base semigroups ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-base-export";
+       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "papa-base-implement" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
-     , template-haskell
+    ({ mkDerivation, base, directory, doctest, filepath
+     , papa-base-export, QuickCheck, semigroups, template-haskell
      }:
      mkDerivation {
        pname = "papa-base-implement";
-       version = "0.2.0";
-       sha256 = "0787w4r79aa94nwihzwvc9vash6bqlrg3mkw760ssygl8p5f9834";
-       revision = "1";
-       editedCabalFile = "1rb6bm8frga4fh865lrwhwpafgi7x8fq4cshb1j869fj0hzfig70";
-       libraryHaskellDepends = [ base ];
+       version = "0.3.0";
+       sha256 = "17swqgg9nja1jlyhynzaybcq47kqmf0ci7rpd6n2vmwmg2d12inx";
+       libraryHaskellDepends = [ base papa-base-export semigroups ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-base-implement";
+       homepage = "https://github.com/qfpl/papa";
        description = "Useful base functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144359,15 +144825,15 @@ self: {
      }:
      mkDerivation {
        pname = "papa-bifunctors";
-       version = "0.2.0";
-       sha256 = "0gwqqf141gq20bf9p3gm3ki8x3xnqkgkbbjd5vgars8gj0scqmga";
+       version = "0.3.0";
+       sha256 = "04yy7v810sff3k4wjlmkpqjxic3wj35c03vpiqi2mnjawy4dv02m";
        libraryHaskellDepends = [
          base papa-bifunctors-export papa-bifunctors-implement
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-bifunctors";
+       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144378,13 +144844,13 @@ self: {
      }:
      mkDerivation {
        pname = "papa-bifunctors-export";
-       version = "0.2.0";
-       sha256 = "0q1px6sr1pqc6q33mvys5wnbdz2ydma6dcn0fd2m58kvxcq53163";
+       version = "0.3.0";
+       sha256 = "0r4sk72ffd6whmmq6x9yjl8yfmq6i8hgywncambhhkprnq0y1lrl";
        libraryHaskellDepends = [ base bifunctors ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-bifunctors-export";
+       homepage = "https://github.com/qfpl/papa";
        description = "export useful functions from `bifunctors`";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144395,13 +144861,13 @@ self: {
      }:
      mkDerivation {
        pname = "papa-bifunctors-implement";
-       version = "0.2.0";
-       sha256 = "04qndk9sca9mrya3lqnb9678dflh2s09j5n8bfa8102hici29fic";
+       version = "0.3.0";
+       sha256 = "0s003pj5mbqrlp14krzah42920ai111nyp9xz3zi9q0qjqd293x5";
        libraryHaskellDepends = [ base bifunctors ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-bifunctors-implement";
+       homepage = "https://github.com/qfpl/papa";
        description = "useful `bifunctors` functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144473,15 +144939,15 @@ self: {
      }:
      mkDerivation {
        pname = "papa-lens";
-       version = "0.2.0";
-       sha256 = "1m9cladf481w4yql8d1wrahinzfwgdbiyl4mdvxa9ls9rivq54zb";
+       version = "0.3.0";
+       sha256 = "0rdxmp9smrbk86hi0n0v4c49mlw4py39961mv7j8mg4szrgnmb8s";
        libraryHaskellDepends = [
          base papa-lens-export papa-lens-implement
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-lens";
+       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144492,13 +144958,13 @@ self: {
      }:
      mkDerivation {
        pname = "papa-lens-export";
-       version = "0.2.0";
-       sha256 = "1c8fydf4gi9zq6962f936n0g33cpjmxrr5wdazr7qja7jjdn3sm3";
+       version = "0.3.0";
+       sha256 = "02pqgkx0xdpcwaknk0hh0b2mvk0kqh5i1m0zfx6fvh9k7yzjm510";
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-lens-export";
+       homepage = "https://github.com/qfpl/papa";
        description = "export useful functions from `lens`";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144509,13 +144975,13 @@ self: {
      }:
      mkDerivation {
        pname = "papa-lens-implement";
-       version = "0.2.1";
-       sha256 = "0bwwmsnq5a957p3gj9m9r0vx5a3vqyjbywqhl9m2plgzbwlqxfd9";
+       version = "0.3.0";
+       sha256 = "0scfdiqvjrzimavl6v3g9rlak5rxaa8kdrwxvxsswm4iw7ach1px";
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-lens-implement";
+       homepage = "https://github.com/qfpl/papa";
        description = "useful `lens` functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144613,15 +145079,15 @@ self: {
      }:
      mkDerivation {
        pname = "papa-semigroupoids";
-       version = "0.2.0";
-       sha256 = "1gl9kp6c0h6abpx4lxb9lkksbxs5h0rdxjykc3g1fwgsljklk1ry";
+       version = "0.3.0";
+       sha256 = "19gdwj4f2cd25qjakkfwij4igbvx1065dn8gjrdy78vkjsnx9c80";
        libraryHaskellDepends = [
          base papa-semigroupoids-export papa-semigroupoids-implement
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-semigroupoids";
+       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144632,31 +145098,82 @@ self: {
      }:
      mkDerivation {
        pname = "papa-semigroupoids-export";
-       version = "0.2.0";
-       sha256 = "06b5pygdbvmkvfmd27gf6z16shiqkrybm5smijs1iilm7yd4ms8v";
+       version = "0.3.0";
+       sha256 = "19fr1sdpvs9yf8030ff8kx9qahd7zprck5d8mxz2xgrl86zlaa8d";
        libraryHaskellDepends = [ base semigroupoids ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-semigroupoids-export";
+       homepage = "https://github.com/qfpl/papa";
        description = "export useful functions from `semigroupoids`";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "papa-semigroupoids-implement" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
-     , semigroupoids, template-haskell
+     , semigroupoids, semigroups, template-haskell
      }:
      mkDerivation {
        pname = "papa-semigroupoids-implement";
-       version = "0.2.1";
-       sha256 = "0zr8vx3vpkilwmwl73ll6ajs9by65sd6n96binrf0wf68jwb41rh";
-       libraryHaskellDepends = [ base semigroupoids ];
+       version = "0.3.0";
+       sha256 = "0i84p1gffvgq58pmjr9rp774zfbvzs3w9krpp60d8pyz61rmsgjd";
+       libraryHaskellDepends = [ base semigroupoids semigroups ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa";
-       description = "useful `bifunctors` functions reimplemented";
+       homepage = "https://github.com/qfpl/papa";
+       description = "useful `semigroupoids` functions reimplemented";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-x" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, papa-x-export
+     , papa-x-implement, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-x";
+       version = "0.3.0";
+       sha256 = "0nxhvnhlk622q7qfzl3z6fwzsanjhy26p8i51w1g5p89izwz8yy4";
+       libraryHaskellDepends = [ base papa-x-export papa-x-implement ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/qfpl/papa";
+       description = "Prelude with only useful functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-x-export" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-x-export";
+       version = "0.3.0";
+       sha256 = "1y94kfpzk5v5agwhqlysm4jg3q0n09sqpw1wn9r5qqvvxkkjx9s1";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/qfpl/papa";
+       description = "export useful functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-x-implement" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-x-implement";
+       version = "0.3.0";
+       sha256 = "1qycam0xb99vgfh01sw3vq5mvlgrq9kgjfs2js8inhmzij3a0nv9";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/qfpl/papa";
+       description = "useful functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -149181,8 +149698,8 @@ self: {
     ({ mkDerivation, base, containers, heaps, pipes }:
      mkDerivation {
        pname = "pipes-interleave";
-       version = "1.1.1";
-       sha256 = "0l7g184ksrh9qy8ixh49iv13amiwh40v6bbx0gcgq451knfl4n17";
+       version = "1.1.2";
+       sha256 = "0anjd66z0z7813jcakqcagp4ml8q4dg6bvygy8mn2jqggm2bqs4d";
        libraryHaskellDepends = [ base containers heaps pipes ];
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
@@ -149252,8 +149769,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-lzma";
-       version = "0.1.1.1";
-       sha256 = "09ndjxrfh55269gjpm61h65bk0xcv46dah8i0svxcdq4myc8d9r4";
+       version = "0.1.1.2";
+       sha256 = "0wx23wf1vr8d2nyapxgmpn1jk53hjbla1xss714vkmar7am37vrc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring lzma pipes ];
@@ -149466,10 +149983,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-s3";
-       version = "0.3.0.2";
-       sha256 = "1rx45znf7ln23gd41fwgfzvqzgqw59w7ab7vnk175waayldbp2gx";
-       revision = "1";
-       editedCabalFile = "0w1bmf15k6jdiqpcfv8gk41zhh2kr33ch3r72g6rxh42akia99iy";
+       version = "0.3.0.3";
+       sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa";
        libraryHaskellDepends = [
          aws base bytestring http-client http-client-tls http-types pipes
          pipes-bytestring pipes-safe resourcet text transformers
@@ -151848,14 +152363,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "postgresql-simple-migration_0_1_10_1" = callPackage
+  "postgresql-simple-migration_0_1_11_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
      , directory, hspec, postgresql-simple, text, time
      }:
      mkDerivation {
        pname = "postgresql-simple-migration";
-       version = "0.1.10.1";
-       sha256 = "0g7xf0cl6ld7qs94qsv67rxln4hpibgy7jfgvbaq1br6pwa1w68s";
+       version = "0.1.11.0";
+       sha256 = "17kmmilvzpllk5nr7xngkym2gavkv32z5i1b7vc290g89c58a3y0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152516,8 +153031,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.48";
-       sha256 = "14gdi3md3mr12dp9hi83bqzis9x90bf0cqknrzdi2xfb9wb1jdl5";
+       version = "0.0.49";
+       sha256 = "1xk8l4lbicl1k6xr14x80dlc5g55dj59xgzgx01b61d0k595mmj1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153211,7 +153726,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "prettyprinter_1_1_0_1" = callPackage
+  "prettyprinter_1_1_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
      , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -153219,8 +153734,8 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter";
-       version = "1.1.0.1";
-       sha256 = "0pfvh90gya175bdfmkzq53f4i3mvgybqhd4sw86y0vvfg8zpc38n";
+       version = "1.1.1";
+       sha256 = "1kzfgwpsg3br3dkvqjhldv1bjqw7k8sg3xqinkk3c1219pk2xcx0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -153367,8 +153882,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, primitive }:
      mkDerivation {
        pname = "prim-array";
-       version = "0.2";
-       sha256 = "0h9n1v3xqvxf8pmycmj5qd4gw8zcxgy4l1fjxff9sfzhpsnvcmp9";
+       version = "0.2.1";
+       sha256 = "1ng4yhlv12h84gvz7ll9dkk8sydidb31da836y1q9ygdnhh7ipaf";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        homepage = "https://github.com/andrewthad/prim-array#readme";
        description = "Primitive byte array with type variable";
@@ -155022,6 +155537,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers_2_4_3" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, filepath, mtl, parsec, syb, utf8-string
+     }:
+     mkDerivation {
+       pname = "protocol-buffers";
+       version = "2.4.3";
+       sha256 = "1spxilp6zk30ijcr3vqgnzbznc0g3050cy9258931vz2zfkjc6kd";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath mtl
+         parsec syb utf8-string
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
@@ -155037,6 +155570,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers-descriptor_2_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
+     mkDerivation {
+       pname = "protocol-buffers-descriptor";
+       version = "2.4.3";
+       sha256 = "1wwn4lwzl0l8bbw99hdh9xizc39hvjr9cxc5sww8f4zh2vbyw99p";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers protocol-buffers
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor-fork" = callPackage
     ({ mkDerivation, base, bytestring, containers
      , protocol-buffers-fork
@@ -155090,6 +155639,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "protolude_0_2" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "protolude";
+       version = "0.2";
+       sha256 = "1ky72pv1icrcj9s3al23nwylyv7l60s2h0m2hs85wdb3kn1c042n";
+       libraryHaskellDepends = [
+         array async base bytestring containers deepseq ghc-prim hashable
+         mtl mtl-compat safe stm text transformers
+       ];
+       homepage = "https://github.com/sdiehl/protolude";
+       description = "A small prelude";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protolude-lifted" = callPackage
     ({ mkDerivation, async, base, lifted-async, lifted-base, protolude
      }:
@@ -156411,12 +156979,12 @@ self: {
      }) {};
 
   "qchas" = callPackage
-    ({ mkDerivation, base, hmatrix, tasty, tasty-hunit }:
+    ({ mkDerivation, base, hmatrix, random, tasty, tasty-hunit }:
      mkDerivation {
        pname = "qchas";
-       version = "1.0.0";
-       sha256 = "0zjhhk6i60svp4p17xjg7pyc5hinj32r7jrcg7z7jibqmm5d3mds";
-       libraryHaskellDepends = [ base hmatrix ];
+       version = "1.0.1.0";
+       sha256 = "12hvhprcpwznxkdl2165ydsrh1r10xz4q4px1dyzyy5i8pkmddam";
+       libraryHaskellDepends = [ base hmatrix random ];
        testHaskellDepends = [ base hmatrix tasty tasty-hunit ];
        homepage = "https://github.com/ardeleanasm/qchas#readme";
        description = "A library for implementing Quantum Algorithms";
@@ -156747,16 +157315,17 @@ self: {
 
   "quantification" = callPackage
     ({ mkDerivation, aeson, base, ghc-prim, hashable, path-pieces, text
+     , vector
      }:
      mkDerivation {
        pname = "quantification";
-       version = "0.1.2";
-       sha256 = "1ivxikw2fd93qsm9y3lm5bycwsq88nlfq5r1nxhi0qkrs8sdk1gs";
+       version = "0.2";
+       sha256 = "13mvhhg7j47ff741zrbnr11f5x2bv4gqdz02g2h8rr116shb31ia";
        libraryHaskellDepends = [
-         aeson base ghc-prim hashable path-pieces text
+         aeson base ghc-prim hashable path-pieces text vector
        ];
        homepage = "https://github.com/andrewthad/quantification#readme";
-       description = "Data types and typeclasses to deal with universally and existentially quantified types";
+       description = "Rage against the quantification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -158196,8 +158765,8 @@ self: {
      }:
      mkDerivation {
        pname = "random-bytestring";
-       version = "0.1.0";
-       sha256 = "0v4fmns5qji5mb0grnghl2yv5l4rg29319f1d1d7kcz9qwz9qwrd";
+       version = "0.1.1";
+       sha256 = "08hpzxa4dzxpkcsb18yg093h7z14x73rfhg3l1qs9mddj37wghmh";
        libraryHaskellDepends = [ base bytestring mwc-random ];
        benchmarkHaskellDepends = [
          async base bytestring criterion entropy ghc-prim mwc-random
@@ -160218,6 +160787,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "recursion-schemes-ext" = callPackage
+    ({ mkDerivation, base, composition-prelude, criterion, hspec
+     , recursion-schemes
+     }:
+     mkDerivation {
+       pname = "recursion-schemes-ext";
+       version = "0.1.0.1";
+       sha256 = "1g24mcb6qdpq6ggnixbb82iq3b3fhrgpspgrblk9cwwrpl1arnhg";
+       libraryHaskellDepends = [
+         base composition-prelude recursion-schemes
+       ];
+       testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme";
+       description = "Amateur addenda to recursion-schemes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "recursive-line-count" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, gtk, mtl
      , process
@@ -165332,6 +165919,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rset" = callPackage
+    ({ mkDerivation, base, QuickCheck, safe }:
+     mkDerivation {
+       pname = "rset";
+       version = "1.0.0";
+       sha256 = "1d1r9hp38mhl1jmmqhn42al7gd0nsqk5d5msqrzjwxdyj884y3pq";
+       libraryHaskellDepends = [ base safe ];
+       testHaskellDepends = [ base QuickCheck safe ];
+       homepage = "https://github.com/lovasko/rset";
+       description = "Range set";
+       license = "unknown";
+     }) {};
+
   "rspp" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -165416,13 +166016,13 @@ self: {
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-bits, binary-conduit, bytestring
      , conduit, conduit-combinators, conduit-extra, lens, lens-aeson
-     , random, resourcet, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, word24
+     , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, word24
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.2.2";
-       sha256 = "1fh6hvz3isv8zzmw94lkr354lm7805pr8sg5rj859skh2h49mzbb";
+       version = "0.2.5";
+       sha256 = "1idqvlva12ndm4nbjhigz6z8r7y8lr25yck6fxilkls766rdv61m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165431,7 +166031,7 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-combinators conduit-extra resourcet
+         conduit-combinators conduit-extra
        ];
        testHaskellDepends = [
          base basic-prelude binary binary-bits bytestring lens random tasty
@@ -166577,6 +167177,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sandi_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, criterion, exceptions
+     , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th
+     }:
+     mkDerivation {
+       pname = "sandi";
+       version = "0.4.1";
+       sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j";
+       libraryHaskellDepends = [
+         base bytestring conduit exceptions stringsearch
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "http://hackage.haskell.org/package/sandi";
+       description = "Data encoding library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sandlib" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -166826,13 +167448,13 @@ self: {
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
      , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
-     , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, text, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.2.11";
-       sha256 = "1fdwsqh3mr90w6k4f4y8cbshx8divhfwhc06cfbdh64k8wckl27x";
+       version = "2.2.12";
+       sha256 = "14c188bn883nd5nngvydx6aj8z7x1cgjgsl41l8a6hsiwjx721l0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166842,7 +167464,7 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-extra resourcet yaml
+         conduit-extra yaml
        ];
        testHaskellDepends = [
          aeson base base64-bytestring basic-prelude bytestring QuickCheck
@@ -168622,14 +169244,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "selda_0_1_10_0" = callPackage
+  "selda_0_1_10_1" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
      , psqueues, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "selda";
-       version = "0.1.10.0";
-       sha256 = "107wj74yxw5nz6pzvn9k6inn5x4vcrjv80416a2kr8nl25x1ixgs";
+       version = "0.1.10.1";
+       sha256 = "1yx8gxi9bha95ss2i1hvbv8vlywxgi3a6rxjig44jz5w2s0zlp5h";
        libraryHaskellDepends = [
          base bytestring exceptions hashable mtl psqueues text time
          unordered-containers
@@ -168719,12 +169341,12 @@ self: {
      }) {};
 
   "selections" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, mtl }:
+    ({ mkDerivation, base, bifunctors, comonad }:
      mkDerivation {
        pname = "selections";
-       version = "0.1.0.0";
-       sha256 = "0wl8jy0c3sm384qr4q143d0wiy2984mdyxhwd78mnq4glsipkwyc";
-       libraryHaskellDepends = [ base bifunctors comonad mtl ];
+       version = "0.1.0.3";
+       sha256 = "1g7p30mjvkq8ymmjdhh54bhyjs2dvz7v860mr1f8qs35j31bkabd";
+       libraryHaskellDepends = [ base bifunctors comonad ];
        homepage = "https://github.com/ChrisPenner/selections#readme";
        description = "Combinators for operating with selections over an underlying functor";
        license = stdenv.lib.licenses.bsd3;
@@ -169234,8 +169856,10 @@ self: {
      }:
      mkDerivation {
        pname = "separated";
-       version = "0.2.2";
-       sha256 = "137s8rzpppnyg3l794m17pndix0nja66qcancwjjqhhfdhmc2pv4";
+       version = "0.2.3";
+       sha256 = "0lxl7i0j27nn43a6p7ayxd1rr48h31zj0bviw0nd49fsd9l5c0iq";
+       revision = "1";
+       editedCabalFile = "0k1z3a9yr9aq7cnm7kfk5yiclhq95nqlgnzzz5ksj010qmnsb6zj";
        libraryHaskellDepends = [
          base bifunctors lens semigroupoids semigroups
        ];
@@ -169579,8 +170203,8 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.3";
-       sha256 = "1crcc9vsg713cnsrpha54rki4a9pnls8sw4m9hz3pikmyqg01jsh";
+       version = "0.3.1";
+       sha256 = "01wjr1xlnvz2ml7iiarbbl1h8p4ax457nq1n6xxx070d08l4iq33";
        libraryHaskellDepends = [
          acid-state aeson ansi-terminal base base16-bytestring
          base64-bytestring bytestring clock containers deepseq directory
@@ -170466,6 +171090,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-iCalendar" = callPackage
+    ({ mkDerivation, base, data-default, http-media, iCalendar, servant
+     }:
+     mkDerivation {
+       pname = "servant-iCalendar";
+       version = "0.1.0.1";
+       sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
+       libraryHaskellDepends = [
+         base data-default http-media iCalendar servant
+       ];
+       homepage = "https://github.com/fgaz/servant-iCalendar#readme";
+       description = "Servant support for iCalendar";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-jquery" = callPackage
     ({ mkDerivation, aeson, base, charset, filepath, hspec
      , hspec-expectations, language-ecmascript, lens, servant
@@ -172202,8 +172841,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.30";
-       sha256 = "0yy820lwl890p96d61n8h7wm6g9ykgldjm29yrp60kzxfjbicpnc";
+       version = "0.0.31";
+       sha256 = "134v3rzyhf5yv417dp90f9phgm4mdbhc5sv9l44jdbhplnmahh2m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173243,6 +173882,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "signal_0_1_0_4" = callPackage
+    ({ mkDerivation, base, unix }:
+     mkDerivation {
+       pname = "signal";
+       version = "0.1.0.4";
+       sha256 = "1rbnblp2d9cw54jnxjcfjhp0bizvcdcxg9y1b4ky0iskny9dvgy4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base unix ];
+       executableHaskellDepends = [ base ];
+       homepage = "http://github.com/pmlodawski/signal";
+       description = "Multiplatform signal support for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "signals" = callPackage
     ({ mkDerivation, base, containers, hashable, imperative-edsl-vhdl
      , language-vhdl, mtl, observable-sharing, operational-alacarte
@@ -175173,6 +175828,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck_1_1_2" = callPackage
+    ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
+     mkDerivation {
+       pname = "smallcheck";
+       version = "1.1.2";
+       sha256 = "14690ahl3iq99hw638qk0bpmkmspghjz2yh8p1nyccli92y23xjm";
+       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
+       homepage = "https://github.com/feuerbach/smallcheck";
+       description = "A property-based testing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallcheck-laws" = callPackage
     ({ mkDerivation, base, smallcheck, smallcheck-series }:
      mkDerivation {
@@ -175289,8 +175957,8 @@ self: {
      }:
      mkDerivation {
        pname = "smartcheck";
-       version = "0.2.2";
-       sha256 = "1wc5257r6qrbawn4ip2d9fqlcpb77bjikjn3ixsa3rhazbasq2is";
+       version = "0.2.4";
+       sha256 = "0wj6xwassh69z97p47xh7i68xs7mvi05fni4qxizyicmbr8k27il";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -175839,10 +176507,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-extras";
-       version = "0.12.0.0";
-       sha256 = "15744qmp48qn67n8w2nxxqxfh5rjlg328psl58whb8q5m6grgv3n";
-       revision = "2";
-       editedCabalFile = "1zm93m5x6h63nagjlfzsq4cgx2600hm16zj5pjxvfh0d0vgq0yjp";
+       version = "0.12.1.0";
+       sha256 = "1lkdva37dcg6zvy02v65qi8pwzia7wai0ny744jdr659lmninn4g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -175966,8 +176632,8 @@ self: {
        pname = "snap-server";
        version = "1.0.2.2";
        sha256 = "0zw3z9s61kkfmlvrg3sfqvd0c3mzg9zjwp01hm1br3z8cawmzpi7";
-       revision = "1";
-       editedCabalFile = "1r35srci0bglwz8bbl6kwgb33g0lpqdwv8lsy7hfc1l3kj4a7p2f";
+       revision = "2";
+       editedCabalFile = "032m1c42qm4b07s835aa9jl2n7r7py8cdz3fdfqi6qd68z7lqrb5";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -178271,8 +178937,8 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.2.6";
-       sha256 = "0dc1ahgqwykiscm1bhkf07kijpn4sm4w4sfg88vvdyq8swil5kyz";
+       version = "0.2.7";
+       sha256 = "0n5lrwlagb6clj3sarmdzy43n9dyfj6rz1rnyj8d63s57fk7jpl5";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base cmdargs containers leancheck ];
        benchmarkHaskellDepends = [ base cmdargs containers leancheck ];
@@ -186482,6 +187148,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_0_7_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "0.7.0.0";
+       sha256 = "0713gck8zdcd303zaq52g0ca9x28arwj9n1brfyzqscac95bcccc";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, tasty
      , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -189835,12 +190514,12 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
-  "th-abstraction_0_2_4_0" = callPackage
+  "th-abstraction_0_2_5_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
-       version = "0.2.4.0";
-       sha256 = "0d2dwf0szxw2vxhdir5xvkgl49qwnm15c7m0a4r7fc1qrnwyvf8r";
+       version = "0.2.5.0";
+       sha256 = "1fxapnbny5gyys24q8v93i6ipcrmsrs2b95i8kz2dpgg8cc95skp";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -191025,8 +191704,8 @@ self: {
      }:
      mkDerivation {
        pname = "tibetan-utils";
-       version = "0.1.1.2";
-       sha256 = "10n0vbhkyvq5mcf98mbh06pzzp3f2k1w9mk576h3ciyh8rirvl4d";
+       version = "0.1.1.3";
+       sha256 = "0jd6w07sks4v9x7m77dz3r59ri2vsmmbv82yi457bn9szdy0jz2x";
        libraryHaskellDepends = [
          base composition either megaparsec text text-show
        ];
@@ -194911,15 +195590,14 @@ self: {
   "tweet-hs" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, composition, containers, criterion, data-default
-     , directory, extra, hspec, hspec-megaparsec, htoml, http-client
-     , http-client-tls, http-types, lens, megaparsec
-     , optparse-applicative, QuickCheck, split, text
-     , unordered-containers
+     , directory, extra, hspec, htoml, http-client, http-client-tls
+     , http-types, lens, megaparsec, optparse-applicative, QuickCheck
+     , split, text, unordered-containers
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.0.1";
-       sha256 = "0z1gi0mlxkchzq6644m5ya3qjz2jzi5rziak5jyz8b8ssvspw3nv";
+       version = "1.0.1.1";
+       sha256 = "1vcwyhwvh3xfm8n2xlic12in6ybkq11nsafqv0fhbdzhscxgqhqs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194929,9 +195607,7 @@ self: {
          split text unordered-containers
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring hspec hspec-megaparsec megaparsec QuickCheck
-       ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Command-line tool for twitter";
@@ -198028,8 +198704,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.5.1";
-       sha256 = "1fqf9xqapzff8105p9ya65qjy6b1vmg9gvcm37gzv1i3bz7c7z8l";
+       version = "0.5.1.1";
+       sha256 = "1cj9qs7r3p8zhlrv3h3phmflp158ckimg3rzq4c28vfx85d8vxz2";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions ghc-prim hashable
          microlens microlens-mtl mtl safe stm text text-format transformers
@@ -200436,6 +201112,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vcf" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec
+     , hspec-expectations, text
+     }:
+     mkDerivation {
+       pname = "vcf";
+       version = "0.9.0";
+       sha256 = "1sjsgld8zd30insksv0n3rsjwq0mrr69rqnb1jpcq8lmcgz43jlq";
+       libraryHaskellDepends = [ aeson attoparsec base bytestring text ];
+       testHaskellDepends = [
+         attoparsec base bytestring hspec hspec-expectations
+       ];
+       description = "A package to parse VCF files inspired in similar python libraries";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vcs-revision" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
@@ -200950,6 +201642,8 @@ self: {
        pname = "vector-space-points";
        version = "0.2.1.2";
        sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy";
+       revision = "1";
+       editedCabalFile = "1vgywmhxkkb7mfirl0wik5mk8xj9s3d23f9zwj5svnbyvdkc3fl4";
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -201253,14 +201947,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "viewprof_0_0_0_7" = callPackage
+  "viewprof_0_0_0_8" = callPackage
     ({ mkDerivation, base, brick, containers, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.7";
-       sha256 = "11q6p9faav8j6s8qqhvdij6jzd3v3pbgm5q94ksrn5sr2h4p10k8";
+       version = "0.0.0.8";
+       sha256 = "0pll3j9v5fapbawjp86cnyhdscmj2zn6cqwzg8dxi9s7z8nhqxk9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -201672,6 +202366,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vivid-osc" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cereal, microspec, time
+     }:
+     mkDerivation {
+       pname = "vivid-osc";
+       version = "0.3.0.0";
+       sha256 = "152ai2j75hbjvws9k1ii2h32nnj8ak44agwpdcfkdf7nc1fgha57";
+       libraryHaskellDepends = [ base binary bytestring cereal time ];
+       testHaskellDepends = [ base bytestring cereal microspec time ];
+       description = "Open Sound Control encode/decode";
+       license = "GPL";
+     }) {};
+
   "vk-aws-route53" = callPackage
     ({ mkDerivation, aws, base, bytestring, containers, http-conduit
      , http-types, old-locale, resourcet, text, time, xml-conduit
@@ -203719,21 +204426,20 @@ self: {
 
   "warc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, errors, exceptions
-     , filepath, free, lens, mmorph, optparse-applicative, pipes
-     , pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time
-     , transformers
+     , filepath, free, hashable, lens, mmorph, optparse-applicative
+     , pipes, pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "warc";
-       version = "0.3.1";
-       sha256 = "044mvpwzgcqzj0zbmlb6v0nx5s2jqw5r9na1m94fxzk571am51rb";
-       revision = "1";
-       editedCabalFile = "0xmwmi3wqyrpci2zm50kvvyzdyqsblaarm6zz7rjky4qykc12kqr";
+       version = "1.0.1";
+       sha256 = "0vwml51prp730n5dmdla4s2116slp0wqg195b7psv4a3yqfx7v7p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring errors free lens mmorph pipes
+         attoparsec base bytestring errors free hashable lens mmorph pipes
          pipes-attoparsec pipes-bytestring text time transformers
+         unordered-containers
        ];
        executableHaskellDepends = [
          attoparsec base bytestring errors exceptions filepath free lens
@@ -204359,6 +205065,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-routes-th_0_22_6_2" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split
+     , template-haskell, text, web-routes
+     }:
+     mkDerivation {
+       pname = "web-routes-th";
+       version = "0.22.6.2";
+       sha256 = "1j661bdl5nb7a02gvsi89dybzaczjynp3d6kxnrgc4jc41rwbgj8";
+       libraryHaskellDepends = [
+         base parsec split template-haskell text web-routes
+       ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ];
+       homepage = "https://github.com/happstack/web-routes-th";
+       description = "Support for deriving PathInfo using Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "web-routes-transformers" = callPackage
     ({ mkDerivation, base, transformers, web-routes }:
      mkDerivation {
@@ -205096,6 +205820,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weeder_0_1_7" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq
+     , directory, extra, filepath, foundation, hashable, process, text
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "weeder";
+       version = "0.1.7";
+       sha256 = "0mvpy2qzwjdl204k3qfi1cjz44rknzyrc187wp9lvxv40mb2kyd6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs deepseq directory extra filepath
+         foundation hashable process text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/ndmitchell/weeder#readme";
+       description = "Detect dead code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "weigh" = callPackage
     ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
      , process, random, split, template-haskell, temporary
@@ -206014,8 +206759,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.25";
-       sha256 = "1sd087mf1gr9glx8fa775fp1zf8jyka1cfcqb6jn682bl021xz7p";
+       version = "0.3.26";
+       sha256 = "1wa1qpz5fdsgisvm9idla3jri1gzdgycmiphhynkn1k0337j0xy9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -207213,6 +207958,8 @@ self: {
        pname = "x509";
        version = "1.7.2";
        sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw";
+       revision = "1";
+       editedCabalFile = "07mphpmj4zk5mzhp5x50a7q6w134kgymf557dcgbp643cbkcmc66";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          cryptonite hourglass memory mtl pem
@@ -207352,6 +208099,8 @@ self: {
        pname = "x509-validation";
        version = "1.6.9";
        sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44";
+       revision = "1";
+       editedCabalFile = "02n9s0wizi4wivs6is4cyapqjjnbrx3zdk34q0cnlfsvbbvyhjax";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base byteable bytestring containers
          cryptonite data-default-class hourglass memory mtl pem x509
@@ -213615,6 +214364,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zip_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+     , cereal, conduit, conduit-extra, containers, digest, exceptions
+     , filepath, hspec, monad-control, mtl, path, path-io, plan-b
+     , QuickCheck, resourcet, text, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "zip";
+       version = "0.2.0";
+       sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr";
+       libraryHaskellDepends = [
+         base bytestring bzlib-conduit case-insensitive cereal conduit
+         conduit-extra containers digest exceptions filepath monad-control
+         mtl path path-io plan-b resourcet text time transformers
+         transformers-base
+       ];
+       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 e01c538f4fd64b22a2a0e2fdd6ac36e2a4205c97 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 12 Aug 2017 18:20:23 +0200
Subject: [PATCH 1980/3246] axel: 2.12 -> 2.13.1

---
 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 8c23e11017c..322a1a06289 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.12";
+  version = "2.13.1";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
-    sha256 = "12sa5whd5mjn1idd83hbhm0rmsh5bvhhgvv03fk5cgxynwkbprr8";
+    sha256 = "15bi5wx6fyf9k0y03dy5mk2rv06mrfgiyrlh44add9n07wi574p1";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 60730cb04351a4ab3ecde1d36b2d441762defb6e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 18:23:08 +0200
Subject: [PATCH 1981/3246] automake: 1.15 -> 1.15.1

---
 pkgs/development/tools/misc/automake/automake-1.15.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix
index 49978e9739d..d6399e128a3 100644
--- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.15";
+  name = "automake-1.15.1";
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.xz";
-    sha256 = "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r";
+    sha256 = "1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg";
   };
 
   buildInputs = [ perl autoconf ];

From 4ebac8f702be49a8f18f72bdb00148d7ffc896c9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 16:59:44 +0200
Subject: [PATCH 1982/3246] lr: 0.3.2 -> 0.4

---
 pkgs/tools/system/lr/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 11f30f6f444..5510ec0e948 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -1,17 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
-let
-  version = "0.3.2";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "lr-${version}";
-  inherit version;
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "chneukirchen";
     repo = "lr";
     rev = "v${version}";
-    sha256 = "1bbgzshayk0kzmlyw44jqskgmxz5c4jh2h0bqg3n5zi89588ng2k";
+    sha256 = "16qp0791s652yi86x472wwr62w6nhiyb1i662d85y5zyfagdf7dd";
   };
 
   makeFlags = "PREFIX=$(out)";

From d5fed93263f853a433d5d3a139068ea0f9fcc16f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 17:13:33 +0200
Subject: [PATCH 1983/3246] ola: 0.10.4 -> 0.10.5

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

diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index b6d2a1cd20b..0aba5106387 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ola-${version}";
-  version = "0.10.4";
+  version = "0.10.5";
 
   src = fetchFromGitHub {
     owner = "OpenLightingProject";
     repo = "ola";
     rev = version;
-    sha256 = "1skb3dwpmsfdr8mp3rs80jmsr1bf78270d9bnd8h0pv8bkb8zvim";
+    sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al";
   };
 
   nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];

From 4ce80c5ed54f547076976e7f01a4201052dcf7ca Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 17:16:53 +0200
Subject: [PATCH 1984/3246] php70: 7.0.21 -> 7.0.22

---
 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 675616a5f21..3cb1d4ed61c 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -330,8 +330,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.21";
-    sha256 = "07r3qqyyvf16k4xk5b2070fwilggmph5937drjm8cvyyjb1k789b";
+    version = "7.0.22";
+    sha256 = "1ppxdlyb9vapcmzylml447vrlizam72h1w41vvn15pdbd5zv5q48";
   };
 
   php71 = generic {

From bd1a78aa34665952fafbfd3ebdec3ed701bc88e0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 17:17:32 +0200
Subject: [PATCH 1985/3246] php: 7.1.7 -> 7.1.8

---
 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 3cb1d4ed61c..ed018a94227 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -335,7 +335,7 @@ in {
   };
 
   php71 = generic {
-    version = "7.1.7";
-    sha256 = "1y0z5n0kyd15wzmn1lprjgaysbg0z428q9cjbx4dqf3zk296g6q7";
+    version = "7.1.8";
+    sha256 = "1y527hs9yh9lmr38q3rf7gkhnvk49vh4nyhci6852mjhjh5a0r3h";
   };
 }

From 89ad46d9b4eacc2120801d8e9c49f498df79ac38 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 18:38:10 +0200
Subject: [PATCH 1986/3246] sysdig: fix build with current curl

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 71a7acab0e1..ca5cea0a012 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -29,6 +29,12 @@ stdenv.mkDerivation rec {
     "-DluaL_getn(L,i)=((int)lua_objlen(L,i))"
   ];
 
+  postPatch = ''
+    sed 's|curl/curlbuild\.h|curl/system.h|' -i \
+        userspace/libsinsp/marathon_http.cpp \
+        userspace/libsinsp/mesos_http.cpp
+ '';
+
   preConfigure = ''
     export INSTALL_MOD_PATH="$out"
   '' + optionalString (kernel != null) ''

From bb5702c521e5ac4f23457159064d7b4c94b5f241 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 18:49:24 +0200
Subject: [PATCH 1987/3246] treewide: remove automake pinning to the newest
 version

quasi no-op
---
 pkgs/applications/misc/pcmanx-gtk2/default.nix             | 4 ++--
 pkgs/applications/networking/cluster/mesos/default.nix     | 4 ++--
 pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index ad5a0b0ef0d..65366607c50 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }:
+{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }:
 
 stdenv.mkDerivation {
   name = "pcmanx-gtk2-1.3";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302";
   };
 
-  buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ];
+  buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ];
 
   preConfigure = ''
     ./autogen.sh
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index a7cc5d78938..65758fca600 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
-, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
+, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
 , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
 , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
 , ethtool, coreutils, which, iptables
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    makeWrapper autoconf automake115x libtool curl sasl jdk maven
+    makeWrapper autoconf automake libtool curl sasl jdk maven
     python wrapPython boto setuptools leveldb
     subversion apr glog openssl libevent
   ] ++ lib.optionals stdenv.isLinux [
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
index 34cea5141ba..66cc2cb24c7 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
@@ -3,7 +3,7 @@
 , libchamplain, clutter_gtk, geocode_glib
 , bash, wrapGAppsHook, itstool, folks, libnotify, libxml2
 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }:
+, libsoup, vala_0_32, dbus_glib, automake, autoconf }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   libchamplain clutter_gtk geocode_glib
-                  vala_0_32 automake115x autoconf db ];
+                  vala_0_32 automake autoconf db ];
 
   preFixup = ''
     gappsWrapperArgs+=(

From 439335f676cc41839c507fa991fda935161d5363 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 19:09:26 +0200
Subject: [PATCH 1988/3246] urlview: builds with default automake

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

diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix
index f0a48cfb8d4..f745bf3ad60 100644
--- a/pkgs/applications/misc/urlview/default.nix
+++ b/pkgs/applications/misc/urlview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, automake111x, autoreconfHook }:
+{ stdenv, fetchurl, ncurses, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version    = "0.9";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42";
   };
 
-  buildInputs = [ ncurses automake111x autoreconfHook ];
+  buildInputs = [ ncurses autoreconfHook ];
 
   preAutoreconf = ''
     touch NEWS

From 220c5377e87d488680e8ca06bd5bbde00d6722f7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 19:11:51 +0200
Subject: [PATCH 1989/3246] automake112x: remove

unused
---
 .../tools/misc/automake/automake-1.12.x.nix   | 54 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 56 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/automake/automake-1.12.x.nix

diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix
deleted file mode 100644
index 34bffff23d4..00000000000
--- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
-
-stdenv.mkDerivation rec {
-  name = "automake-1.12.6";
-
-  # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
-  # available upstream; see
-  # <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
-  builder = ./builder.sh;
-
-  setupHook = ./setup-hook.sh;
-
-  src = fetchurl {
-    url = "mirror://gnu/automake/${name}.tar.xz";
-    sha256 = "1ynvca8z4aqcwr94rf7j1bfiid2w9w250y9qhnyj9vmi8lhsnd7q";
-  };
-
-  buildInputs = [perl autoconf makeWrapper];
-
-  # This test succeeds on my machine, but fails on Hydra (for reasons
-  # not yet understood).
-  patchPhase = ''
-    sed -i -e 's|t/aclocal7.sh||' Makefile.in
-  '';
-
-  inherit doCheck;
-
-  # The test suite can run in parallel.
-  enableParallelBuilding = true;
-
-  # Disable indented log output from Make, otherwise "make.test" will
-  # fail.
-  preCheck = "unset NIX_INDENT_MAKE";
-
-  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-
-  meta = {
-    branch = "1.12";
-    homepage = http://www.gnu.org/software/automake/;
-    description = "GNU standard-compliant makefile generator";
-
-    longDescription = ''
-      GNU Automake is a tool for automatically generating
-      `Makefile.in' files compliant with the GNU Coding
-      Standards.  Automake requires the use of Autoconf.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e78b08c068..72eb0c4a43d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6605,8 +6605,6 @@ with pkgs;
 
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
 
-  automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { };
-
   automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { };
 
   automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { };

From beace037d0f77b83064f0e0beca0f29d4a2ac7f4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 19:25:39 +0200
Subject: [PATCH 1990/3246] mongoc: 1.5.4 -> 1.7.0

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

diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 5275f4ecb73..67d2bdf1559 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchzip, autoconf, automake114x, perl, pkgconfig, libbson, libtool
+{ stdenv, fetchzip, perl, pkgconfig, libbson
 , openssl, which
 }:
 
 stdenv.mkDerivation rec {
   name = "mongoc-${version}";
-  version = "1.5.4";
+  version = "1.7.0";
 
   src = fetchzip {
     url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
-    sha256 = "0xjk3k76n8yz7zi6a0dx1wgpsvvn5qhpzrapdw4v3h49hwf7rc5q";
+    sha256 = "1s0j7wmgdkgawzd75psh5ml35lkx68h6pimqrnfp2z1ggzcwajgn";
   };
 
   propagatedBuildInputs = [ libbson ];
-  buildInputs = [ autoconf automake114x libtool openssl perl pkgconfig which ];
+  buildInputs = [ openssl perl pkgconfig which ];
 
   meta = with stdenv.lib; {
     description = "The official C client library for MongoDB";

From fbb6b90ed04761f6df87f515e829ad48b5a55c39 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 12 Aug 2017 12:42:30 -0500
Subject: [PATCH 1991/3246] yices: 2.5.1 -> 2.5.2

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

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 0ec7f93d26f..c8e20c7260c 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchurl {
     url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=${name}-src.tar.gz&accept=I+Agree";
     name = "${name}-src.tar.gz";
-    sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c";
+    sha256 = "18mjnwg0pwc0fx4f99l7hxsi10mb5skkzk0k1m3xv5kx3qfnghs0";
   };
 
   patchPhase = ''patchShebangs tests/regress/check.sh'';
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   # only installing the libyices.so.2.5.1 file.
   installPhase = ''
       make install LDCONFIG=true
-      (cd $out/lib && ln -s -f libyices.so.2.5.1 libyices.so.2.5)
+      (cd $out/lib && ln -s -f libyices.so.2.5.2 libyices.so.2.5)
   '';
 
   meta = with stdenv.lib; {

From 473b58f20e491312a03c9c1578c89116e39a1d50 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 19:33:22 +0200
Subject: [PATCH 1992/3246] inkscape: remove unused automake114x, intltool

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

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index f48ce6a4ce4..a3a58bc87ee 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
-, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
+, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif, automake114x, potrace, cmake
+, libvisio, libcdr, libexif, potrace, cmake
 }:
 
 let
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     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 potrace cmake python2Env
+    makeWrapper gsl poppler imagemagick libwpg librevenge
+    libvisio libcdr libexif potrace cmake python2Env
   ];
 
   enableParallelBuilding = true;

From 7e5ebed971d0b63a2fd34d94da62713a5f1fb192 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 20:18:58 +0200
Subject: [PATCH 1993/3246] coreutils: use autoreconfHook

---
 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 099e9ee0849..48bcf143bb6 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildPackages
-, autoconf, automake114x, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
+, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
 , hostPlatform, buildPlatform
 , aclSupport ? false, acl ? null
 , attrSupport ? false, attr ? null
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gmp ]
     ++ optional aclSupport acl
     ++ optional attrSupport attr
-    ++ optionals hostPlatform.isCygwin [ autoconf automake114x texinfo ]   # due to patch
+    ++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ]   # due to patch
     ++ optionals selinuxSupport [ libselinux libsepol ]
        # TODO(@Ericson2314): Investigate whether Darwin could benefit too
     ++ optional (hostPlatform != buildPlatform && hostPlatform.libc != "glibc") libiconv;

From bfdd9d2e664a4b28fa7966b39af0de2ea41d8926 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 20:21:24 +0200
Subject: [PATCH 1994/3246] automake114x: remove

---
 .../tools/misc/automake/automake-1.14.x.nix   | 41 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 43 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/automake/automake-1.14.x.nix

diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix
deleted file mode 100644
index c797042885a..00000000000
--- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
-
-stdenv.mkDerivation rec {
-  name = "automake-1.14.1";
-
-  src = fetchurl {
-    url = "mirror://gnu/automake/${name}.tar.xz";
-    sha256 = "0s86rzdayj1licgj35q0mnynv5xa8f4p32m36blc5jk9id5z1d59";
-  };
-
-  buildInputs = [ perl autoconf ];
-
-  setupHook = ./setup-hook.sh;
-
-  # Disable indented log output from Make, otherwise "make.test" will
-  # fail.
-  preCheck = "unset NIX_INDENT_MAKE";
-  inherit doCheck;
-
-  # The test suite can run in parallel.
-  enableParallelBuilding = true;
-
-  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-
-  meta = {
-    branch = "1.14";
-    homepage = http://www.gnu.org/software/automake/;
-    description = "GNU standard-compliant makefile generator";
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    longDescription = ''
-      GNU Automake is a tool for automatically generating
-      `Makefile.in' files compliant with the GNU Coding
-      Standards.  Automake requires the use of Autoconf.
-    '';
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73714e331d6..8ca36c590e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6607,8 +6607,6 @@ with pkgs;
 
   automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { };
 
-  automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { };
-
   automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { };
 
   automoc4 = callPackage ../development/tools/misc/automoc4 { };

From bd657a72932e8605d3d889fb47f0f33da420f516 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 20:26:50 +0200
Subject: [PATCH 1995/3246] libtsm: use autoreconfHook

---
 pkgs/development/libraries/libtsm/default.nix | 12 ++++--------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index dc9e1d01df4..9ba25f33282 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoconf, automake }:
+{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libtsm-3";
@@ -8,13 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i";
   };
 
-  buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [
-    autoconf automake
-   ];
-
-  preConfigure = lib.optionalString stdenv.isDarwin ''
-    aclocal
-  '';
+  buildInputs = [ libxkbcommon pkgconfig ] ++ stdenv.isDarwin [
+    autoreconfHook
+  ];
 
   configureFlags = [ "--disable-debug" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ca36c590e8..0185584e80e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9229,9 +9229,7 @@ with pkgs;
 
   libtap = callPackage ../development/libraries/libtap { };
 
-  libtsm = callPackage ../development/libraries/libtsm {
-    automake = automake114x;
-  };
+  libtsm = callPackage ../development/libraries/libtsm { };
 
   libtunepimp = callPackage ../development/libraries/libtunepimp { };
 

From 758421c0ab98f7a843bcd42c4a2522a3c14bdbe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 12 Aug 2017 07:20:09 +0100
Subject: [PATCH 1996/3246] spl: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 865be70f34d..227b67e4486 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -15,13 +15,13 @@ in
   assert buildKernel -> kernel != null;
 stdenv.mkDerivation rec {
   name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "05qqwhxc9nj94y28c97iwfz8gkjwicrhnkj425yb47gqa8rafazk";
+    sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From 317786c68968fe9642e078856c33cd0330fddf49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 12 Aug 2017 07:20:32 +0100
Subject: [PATCH 1997/3246] zfs: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index a47b43a1f0f..6d3ad657140 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -15,13 +15,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "zfs";
     rev = "zfs-${version}";
-    sha256 = "16z0fl282rsmvgk608ii7n410swivkrisp112n2fhhjc1fs0zall";
+    sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n";
   };
 
   patches = [

From 8e178502e5d6c611e0e4f7fdad5ddd6a00c95106 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 12 Aug 2017 20:39:32 +0200
Subject: [PATCH 1998/3246] clib: 1.7.0 -> 1.8.0

---
 pkgs/tools/package-management/clib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index cd9499d9146..795a605b3b6 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, curl  }:
 
 stdenv.mkDerivation rec {
-  version = "1.7.0";
+  version = "1.8.0";
   name = "clib-${version}";
 
   src = fetchFromGitHub {
     rev    = version;
     owner  = "clibs";
     repo   = "clib";
-    sha256 = "08n2i3dyh5vnrb74a6wlqqn67c9nwkq0v0v651zzha495mqbciq7";
+    sha256 = "0w1qiwq0jjrk8p848bmwxq4wvzhbd2zghq3qm8ylaj3z0xdw7ppk";
   };
 
   hardeningDisable = [ "fortify" ];

From 6d7b0dcdf1482ca8b2f1c1d08febd77587dae358 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 21:06:18 +0200
Subject: [PATCH 1999/3246] gnome3.pomodoro: no need for automake113x

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

diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
index 3ceabe70ad8..37cdfc730ab 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
+{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper,
   dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base,
   glib, gobjectIntrospection, telepathy_glib
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   configureScript = ''./autogen.sh'';
 
   buildInputs = [
-    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
+    which intltool glib gobjectIntrospection pkgconfig libtool
     makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gnome3.gsettings_desktop_schemas gnome3.gnome_desktop

From c1b3dc3308c68d95c054d8388b92af73e61bc6dd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 21:06:46 +0200
Subject: [PATCH 2000/3246] povray: 3.7 -> 3.7.0.3

---
 pkgs/tools/graphics/povray/default.nix | 20 ++++++++++++--------
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index 1dceb210235..6bdff06699b 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -1,12 +1,16 @@
-{stdenv, fetchgit, autoconf, automake, boost, zlib, libpng, libjpeg, libtiff}:
+{ stdenv, fetchFromGitHub, autoconf, automake, boost
+, zlib, libpng, libjpeg, libtiff
+}:
 
-stdenv.mkDerivation {
-  name = "povray-3.7";
+stdenv.mkDerivation rec {
+  name = "povray-${version}";
+  version = "3.7.0.3";
 
-  src = fetchgit {
-    url = "https://github.com/POV-Ray/povray.git";
-    rev = "39ce8a24e50651904010dda15872d63be15d7c37";
-    sha256 = "1nbs9vwf6fn3jkm0myfnbn7nrc17q8ppzmr4h7kj49nr0710ifw0";
+  src = fetchFromGitHub {
+    owner = "POV-Ray";
+    repo = "povray";
+    rev = "v${version}";
+    sha256 = "0mzkgk3gn8jfrw1fq0z3kqbysdfq8nwdl8a28l18v8gzb31bblhq";
   };
 
 
@@ -40,6 +44,6 @@ stdenv.mkDerivation {
     homepage = http://www.povray.org/;
     description = "Persistence of Vision Raytracer";
     license = licenses.free;
-	platforms = platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0185584e80e..4da826510e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3827,9 +3827,7 @@ with pkgs;
 
   postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { };
 
-  povray = callPackage ../tools/graphics/povray {
-    automake = automake113x; # fails with 14
-  };
+  povray = callPackage ../tools/graphics/povray { };
 
   ppl = callPackage ../development/libraries/ppl { };
 

From 0bce8f86e5b481266230fb0111180df017a1b34d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 21:28:08 +0200
Subject: [PATCH 2001/3246] misc: remove

ancient code, that is not used and at least partly broken
---
 pkgs/misc/misc.nix              | 165 --------------------------------
 pkgs/top-level/all-packages.nix |   2 -
 2 files changed, 167 deletions(-)
 delete mode 100644 pkgs/misc/misc.nix

diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix
deleted file mode 100644
index cb4765957f1..00000000000
--- a/pkgs/misc/misc.nix
+++ /dev/null
@@ -1,165 +0,0 @@
-{ pkgs, stdenv } :
-
-let inherit (pkgs) stdenv runCommand perl lib;
-
-in
-
-{
-  /*
-    Usage example creating a derivation installing ruby, sup and a lib:
-
-      packageOverrides = {
-	rubyCollection = collection {
-	  name = "ruby";
-	  list = let l = rubyPackages; in
-	    [ pkgs.ruby l.chronic l.sup ];
-	};
-      }
-  */
-  collection = {list, name} : runCommand "collection-${name}" {} ''
-    mkdir -p $out/nix-support
-    printWords ${builtins.toString list} > $out/nix-support/propagated-user-env-packages
-  '';
-
-  /* creates a derivation symlinking references C/C++ libs into one include and lib directory called $out/cdt-envs/${name}
-     then you can
-     ln -s ~/.nix-profile/cdt-envs/name ./nix-deps
-     and add .nix-deps/{libs,includes} to IDE's such as Eclipse/ Netbeans etc.
-     To update replace library versions just replace the symlink
-  */
-  cdtEnv = { name, buildInputs }:
-    stdenv.mkDerivation {
-     name = "cdt-env-${name}";
-     inherit buildInputs;
-     phases = "installPhase";
-     installPhase = ''
-      set -x
-      # requires bash4
-      PATH=$PATH:${pkgs.pkgconfig}/bin
-
-      perlScript=$(dirname $(dirname ${builtins.getEnv "NIXPKGS_ALL"}))/build-support/buildenv/builder.pl
-      # now collect includes and lib paths
-
-      # probably the nix hooks work best, so reuse them by reading NIX_CFLAGS_COMPILE and NIX_LDFLAGS
-
-      PKG_CONFIG_KNOWN_PACKAGES=$(pkg-config --list-all | sed 's/ .*//')
-
-      declare -A INCLUDE_PATHS
-      declare -A LIB_PATHS
-      declare -A LIBS
-      declare -A CFLAGS_OTHER
-
-      PKG_CONFIG_LIBS="$(pkg-config --libs $PKG_CONFIG_KNOWN_PACKAGES)"
-      PKG_CONFIG_CFLAGS="$(pkg-config --cflags $PKG_CONFIG_KNOWN_PACKAGES)"
-
-      for i in $NIX_CFLAGS_COMPILE $PKG_CONFIG_CFLAGS; do
-        echo i is $i
-        case $i in
-          -I*) INCLUDE_PATHS["''${i/-I/}"]= ;;
-          *) CFLAGS_OTHER["''${i}"]= ;;
-        esac
-          echo list is now ''${!INCLUDE_PATHS[@]}
-      done
-
-      for i in $NIX_LDFLAGS $PKG_CONFIG_LIBS; do
-        case $i in
-          -L*)
-          LIB_PATHS["''${i/-L/}"]= ;;
-        esac
-      done
-
-      for i in $NIX_LDFLAGS $PKG_CONFIG_LIBS; do
-        echo chekcing $i
-        case $i in
-          -l*) LIBS["''${i}"]= ;;
-        esac;
-      done
-
-      # build output env
-
-      target="$out/cdt-envs/${name}"
-
-      link(){
-        echo "link !!!!"
-          echo $1
-          echo $2
-        (
-          export out="$1"
-          export paths="$2"
-
-          export ignoreCollisions=1
-          export manifest=
-          export pathsToLink=/
-          ${perl}/bin/perl $perlScript
-        )
-      }
-
-      mkdir -p $target/{include,lib}
-      link $target/lib "$(echo "''${!LIB_PATHS[@]}")"
-      link $target/include "$(echo "''${!INCLUDE_PATHS[@]}")"
-      echo "''${!LIBS[@]}" > $target/libs
-      echo "''${!CFLAGS_OTHER[@]}" > $target/cflags-other
-      echo "''${PKG_CONFIG_PATH}" > $target/PKG_CONFIG_PATH
-      echo "''${PATH}" > $target/PATH
-    '';
-  };
-
-
-  # build a debug version of a package
-  debugVersion = pkg: lib.overrideDerivation pkg (attrs: {
-
-    prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases;
-    postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases;
-
-    dontStrip = true;
-
-    CFLAGS="-ggdb -O0";
-    CXXFLAGS="-ggdb -O0";
-
-    debugPhase = ''
-      s=$out/src
-      mkdir -p $s; cd $s;
-      export TMP=$s
-      export TEMP=$s
-
-      for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do
-        declare -x "$var=''${!var} -ggdb -O0"
-      done
-      echo "file should tell that executable has not been stripped"
-    '';
-
-    objectsPhase = ''
-      cd $out/src
-      find . -name "*.o" -exec rm {} \;
-    '';
-  });
-
-  # build an optimized ersion of a package but with symbols and source
-  symbolsVersion = pkg: lib.overrideDerivation pkg (attrs: {
-
-    prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases;
-    postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases;
-
-    dontStrip = true;
-
-    CFLAGS="-g -O2";
-    CXXFLAGS="-g -O2";
-
-    debugPhase = ''
-      s=$out/src
-      mkdir -p $s; cd $s;
-      export TMP=$s
-      export TEMP=$s
-
-      for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do
-        declare -x "$var=''${!var} -g -O2"
-      done
-      echo "file should tell that executable has not been stripped"
-    '';
-
-    objectsPhase = ''
-      cd $out/src
-      find . -name "*.o" -exec rm {} \;
-    '';
-  });
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4da826510e0..8d4298aec3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19126,8 +19126,6 @@ with pkgs;
     inherit (gnome2) gtksourceview;
   };
 
-  misc = callPackage ../misc/misc.nix { };
-
   bullet = callPackage ../development/libraries/bullet {};
   bullet283 = callPackage ../development/libraries/bullet/bullet283.nix {};
 

From 05a11f8a3d312812309c0bd54cc1aaf5267b2849 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 21:48:32 +0200
Subject: [PATCH 2002/3246] mysql-workbench: build with default automake

---
 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 8d4298aec3f..a1dc6100537 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18731,7 +18731,6 @@ with pkgs;
   mnemonicode = callPackage ../misc/mnemonicode { };
 
   mysql-workbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in {
-    automake = automake113x;
     gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};};
     mysql = mysql;
     pcre = pcre-cpp;

From 1e2529498db2367ac886ab68c7388dfbecc67a3d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 12 Aug 2017 21:48:51 +0200
Subject: [PATCH 2003/3246] automake113x: remove

---
 .../tools/misc/automake/automake-1.13.x.nix   | 41 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 43 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/automake/automake-1.13.x.nix

diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
deleted file mode 100644
index 54e697656d2..00000000000
--- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
-
-stdenv.mkDerivation rec {
-  name = "automake-1.13.4";
-
-  src = fetchurl {
-    url = "mirror://gnu/automake/${name}.tar.xz";
-    sha256 = "0rhx1mr2gv483s4bc9yy9skwr5d5a3jcyfaw24h0r3wvylrlkkl9";
-  };
-
-  buildInputs = [ perl autoconf ];
-
-  setupHook = ./setup-hook.sh;
-
-  # Disable indented log output from Make, otherwise "make.test" will
-  # fail.
-  preCheck = "unset NIX_INDENT_MAKE";
-  inherit doCheck;
-
-  # The test suite can run in parallel.
-  enableParallelBuilding = true;
-
-  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-
-  meta = {
-    branch = "1.13";
-    homepage = http://www.gnu.org/software/automake/;
-    description = "GNU standard-compliant makefile generator";
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    longDescription = ''
-      GNU Automake is a tool for automatically generating
-      `Makefile.in' files compliant with the GNU Coding
-      Standards.  Automake requires the use of Autoconf.
-    '';
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1dc6100537..f6ae62db18d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6603,8 +6603,6 @@ with pkgs;
 
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
 
-  automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { };
-
   automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { };
 
   automoc4 = callPackage ../development/tools/misc/automoc4 { };

From 463f53906abe58f532edd3811e98ac3ceb85fb85 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 12 Aug 2017 23:56:21 +0200
Subject: [PATCH 2004/3246] mixxx: fix build

---
 pkgs/applications/audio/mixxx/default.nix  |  2 ++
 pkgs/applications/audio/mixxx/sqlite.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/applications/audio/mixxx/sqlite.patch

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 33265e1b3e8..0bf7472ea11 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
   };
 
+  patches = [ ./sqlite.patch ]; # from: https://bugs.gentoo.org/show_bug.cgi?id=622776
+
   buildInputs = [
     chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
     libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
diff --git a/pkgs/applications/audio/mixxx/sqlite.patch b/pkgs/applications/audio/mixxx/sqlite.patch
new file mode 100644
index 00000000000..ed9f4ee5143
--- /dev/null
+++ b/pkgs/applications/audio/mixxx/sqlite.patch
@@ -0,0 +1,13 @@
+diff -urN old/src/library/trackcollection.h mixxx-2.0.0/src/library/trackcollection.h
+--- old/src/library/trackcollection.h	2017-07-30 00:04:48.511029517 -0400
++++ mixxx-2.0.0/src/library/trackcollection.h	2017-07-30 00:05:03.378699826 -0400
+@@ -34,8 +34,7 @@
+ #include "library/dao/libraryhashdao.h"
+
+ #ifdef __SQLITE3__
+-typedef struct sqlite3_context sqlite3_context;
+-typedef struct Mem sqlite3_value;
++#include <sqlite3.h>
+ #endif
+
+ class TrackInfoObject;

From 302e7825fad0788849ad76d35dc04fb78a0e66ed Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 00:16:42 +0200
Subject: [PATCH 2005/3246] htslib: 1.4.0 -> 1.5.0

---
 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 a74905b5ba1..5a08e32e7e9 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   version = "${major}.0";
   pname = "htslib";
-  major = "1.4";
+  major = "1.5";
 
   src = fetchurl {
     url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2";
-    sha256 = "0l1ki3sqfhawfn7fx9v7i2pm725jki4c5zij9j96xka5zwc8iz2w";
+    sha256 = "0bcjmnbwp2bib1z1bkrp95w9v2syzdwdfqww10mkb1hxlmg52ax0";
   };
 
   buildInputs = [ zlib bzip2 lzma curl ];

From ca45a26ec36d8fe52ca4821668400a71b42bc626 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 00:17:25 +0200
Subject: [PATCH 2006/3246] samtools: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index 827c1448693..f8391a2d6b3 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "samtools";
-  major = "1.4";
+  major = "1.5";
   version = "${major}.0";
 
   src = fetchurl {
     url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2";
-    sha256 = "1x73c0lxvd58ghrmaqqyp56z7bkmp28a71fk4ap82j976pw5pbls";
+    sha256 = "1xidmv0jmfy7l0kb32hdnlshcxgzi1hmygvig0cqrq1fhckdlhl5";
   };
 
   buildInputs = [ zlib ncurses ];

From 15a99ae367ee899d9a3c095dd3b2c8e05f4da3b5 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 00:17:48 +0200
Subject: [PATCH 2007/3246] bcftools: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index 97e081f908e..cfd72601d1e 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bcftools";
-  major = "1.4";
+  major = "1.5";
   version = "${major}.0";
 
   src = fetchurl {
     url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2";
-    sha256 = "0k93mq3lf73dch81p4zxi0bdll567acxfa81qzbzkqflgsjb1ccg";
+    sha256 = "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz";
   };
 
   buildInputs = [ zlib bzip2 lzma perl ];

From 038507969699230fdc0b3086ad9cfaad7058f389 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 12 Aug 2017 14:22:45 +0000
Subject: [PATCH 2008/3246] fontforge: 20160404 -> 20170730 + support
 reproducible builds

---
 pkgs/tools/misc/fontforge/default.nix         | 28 ++++++++++-------
 ...fontforge-20140813-use-system-uthash.patch | 30 +++++++++++++++++++
 .../misc/fontforge/fontforge-fonttools.nix    | 14 +++++++--
 3 files changed, 59 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch

diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index ca636420854..f79bb123b34 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, lib
+{ stdenv, fetchFromGitHub, fetchpatch, lib, runCommand
 , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
 , withSpiro ? false, libspiro
@@ -9,22 +9,30 @@
 
 stdenv.mkDerivation rec {
   name = "fontforge-${version}";
-  version = "20160404";
+  version = "20170730";
+
+  # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19)
+  SOURCE_DATE_EPOCH = lib.fileContents (runCommand "unixtime-of-${version}" {} "date -d ${version} +%s > $out");
 
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "fontforge";
     rev = version;
-    sha256 = "15nacq84n9gvlzp3slpmfrrbh57kfb6lbdlc46i7aqgci4qv6fg0";
+    sha256 = "15k6x97383p8l40jvcivalhwgbbcdg5vciyjz6m9r0lrlnjqkv99";
   };
 
-  patches = [(fetchpatch {
-    name = "use-system-uthash.patch";
-    url = "http://pkgs.fedoraproject.org/cgit/fontforge.git/plain/"
-      + "fontforge-20140813-use-system-uthash.patch?id=8bdf933";
-    sha256 = "0n8i62qv2ygfii535rzp09vvjx4qf9zp5qq7qirrbzm1l9gykcjy";
-  })];
-  patchFlags = "-p0";
+  patches = [
+    ./fontforge-20140813-use-system-uthash.patch
+
+    (fetchpatch {
+       url = "https://github.com/fontforge/fontforge/compare/${version}...volth:rb-${version}.patch";
+       name = "fontforge-${version}-reproducible-build.patch";
+       sha256 = "089w94xnc0ik3rfx9b7q124x9n1nzbyzzcyynl1x31d22byxgl34";
+     })
+  ];
+
+  # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries
+  NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-msse2" "-mfpmath=sse" ];
 
   buildInputs = [
     autoconf automake gnum4 libtool perl pkgconfig gettext uthash
diff --git a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch b/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch
new file mode 100644
index 00000000000..27c8274c1d2
--- /dev/null
+++ b/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.am.old	2014-08-12 10:07:32.000000000 +0530
++++ b/Makefile.am	2014-09-08 16:23:56.046996941 +0530
+@@ -43,7 +43,6 @@
+ AM_CPPFLAGS =
+ AM_LDFLAGS =
+ 
+-BUILT_SOURCES = uthash/src
+ EXTRA_DIST =
+ CLEANFILES =
+ MOSTLYCLEANFILES =
+@@ -113,7 +112,6 @@
+ 	Packaging/FontForge-doc.spec \
+ 	Packaging/FontForge.spec \
+ 	Packaging/FontForge.static.spec \
+-	uthash/src \
+ 	$(NULL)
+ 
+ #--------------------------------------------------------------------------
+@@ -129,11 +127,6 @@
+ 
+ 
+ #--------------------------------------------------------------------------
+-uthash/src:
+-	if [ ! -e uthash/src ]; then \
+-	if [ -e uthash ] ; then rm -r uthash ; fi ; \
+-	git clone https://github.com/troydhanson/uthash ; \
+-	fi ;
+ 
+ # We import a selection of targets from Frank's standard packaging Makefile.
+ 
diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
index 046c1d44920..0f82f4ad638 100644
--- a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
+++ b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
@@ -1,7 +1,15 @@
-{stdenv, fontforge, zlib}:
+{stdenv, fetchFromGitHub, zlib}:
+
 stdenv.mkDerivation rec {
-  name = "fontforge-fonttools-${fontforge.version}";
-  src = fontforge.src;
+  version = "20160404";
+  name = "fontforge-fonttools-${version}";
+
+  src = fetchFromGitHub {
+    owner = "fontforge";
+    repo = "fontforge";
+    rev = version;
+    sha256 = "15nacq84n9gvlzp3slpmfrrbh57kfb6lbdlc46i7aqgci4qv6fg0";
+  };
 
   buildInputs = [zlib];
 

From ee85d3d166c2b659fc00ee1c7398d7a6aee12e00 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 12 Aug 2017 17:12:38 +0200
Subject: [PATCH 2009/3246] webkitgtk: 2.16.4 -> 2.16.6

see: https://webkitgtk.org/2017/07/24/webkitgtk2.16.6-released.html

Security fixes: CVE-2017-7039, CVE-2017-7018, CVE-2017-7030,
  CVE-2017-7037, CVE-2017-7034, CVE-2017-7055, CVE-2017-7056,
  CVE-2017-7064, CVE-2017-7061, CVE-2017-7048, CVE-2017-7046.
---
 pkgs/development/libraries/webkitgtk/2.16.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix
index 6231a59dbd1..7d7424d914d 100644
--- a/pkgs/development/libraries/webkitgtk/2.16.nix
+++ b/pkgs/development/libraries/webkitgtk/2.16.nix
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.16.4";
+  version = "2.16.6";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0a2ikwiw1wn8w11y9ci6nn6dq9w0iki48l9lhnbm7g8rhcrs9azr";
+    sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw";
   };
 
   # see if we can clean this up....

From 2ecc4d84ada0c40765052238a1eeae310276b6b4 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 13 Aug 2017 00:23:34 +0200
Subject: [PATCH 2010/3246] man-pages: 4.11 -> 4.12

---
 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 6ced5785ecf..def57149f22 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.11";
+  version = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "097m0gsbaz0gf9ir4lmph3h5jj6wmydk1rglfz82dysybx4q1pmd";
+    sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093";
   };
 
   makeFlags = [ "MANDIR=$(out)/share/man" ];

From 2866b8416880fc0c42c99f26e4430bcd97a5885d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 13 Aug 2017 00:40:33 +0200
Subject: [PATCH 2011/3246] libtsm: fix eval

Ref: bd657a72932e8605d3d889fb47f0f33da420f516
---
 pkgs/development/libraries/libtsm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index 9ba25f33282..bac29bc0ca8 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i";
   };
 
-  buildInputs = [ libxkbcommon pkgconfig ] ++ stdenv.isDarwin [
+  buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [
     autoreconfHook
   ];
 

From 8933aca97827a1efd8628d2f11e85f1aa9617508 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 00:50:34 +0200
Subject: [PATCH 2012/3246] byobu: 5.112 -> 5.121

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

diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index d00e1abc7a5..82ae4d40f2d 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
-  version = "5.112";
+  version = "5.121";
   name = "byobu-" + version;
 
   src = fetchurl {
     url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
-    sha256 = "0avv1s8dh3z6rzkf1mn1375v3im1qc9c63w09yvwxdlcq5xznrsd";
+    sha256 = "0rbwb7kh0f458ad51grrhz56889g6xj1c29c838pi37cjdgl3wjx";
   };
 
   doCheck = true;

From ef026e02fcaa92323be875d8c7146b0b86e31880 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 12 Aug 2017 15:50:55 -0700
Subject: [PATCH 2013/3246] obs-studio: 19.0.3 -> 20.0.0

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

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index cddd2af7ae2..b0214f4faa3 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -26,13 +26,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "19.0.3";
+  version = "20.0.0";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "1qh69bw848l61fmh6n5q86yl3djmvzh76ln044ngi2k69a9bl94b";
+    sha256 = "07xjrr86722b05f88z77hzcrkkdlcz3pndaw600ip5xqhsyjy330";
   };
 
   patches = [ ./find-xcb.patch ];

From 32e329b1c73e59429496b7ee2ad1024af33ad669 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 01:01:07 +0200
Subject: [PATCH 2014/3246] dateutils: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 396d26a6cd1..86a8d3f234b 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.1";
+  version = "0.4.2";
   name = "dateutils-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
-    sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c";
+    sha256 = "0sxl5rz9rw02dfn5mdww378hjgnnbxavs52viyfyx620b29finpc";
   };
 
   meta = with stdenv.lib; {

From 877d331765393420ed2855715d1f445b8de25cd9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 12 Aug 2017 19:44:56 -0400
Subject: [PATCH 2015/3246] vscode: 1.14.2 -> 1.15.0

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 18eb1803fd6..dee8dc6b510 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.14.2";
+  version = "1.15.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0ladqwgy37imq957mmbdfslaxcnx8gcl9nb1q5p8r91vldvf31zd";
-    "x86_64-linux" = "1nb9n6511v2p1nwcwh6kbpxgydfs66yn7q2nf1rmh42ha5yzqkja";
-    "x86_64-darwin" = "0yk2yd8rzhmsh276xfgywp1gjjkvxypgnjhs8jaxvrgsj7aw1s39";
+    "i686-linux" = "1ny4n6xbwvw88fy6k59dd2g4h8z9a9r7m6fbpgs6lwv0a6cill01";
+    "x86_64-linux" = "16mm9yks271p81nsp6yhfgdy5b1w7cs12cwn2z919kj0i4i09fk1";
+    "x86_64-darwin" = "1dwpnllff72yd8a6gc9xv4j7fxwsjgwjvdss0ld4m6kx17zm43qm";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 8da8a162bbc8858632eb5da3c1682e3c75393034 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 13 Aug 2017 03:57:50 +0200
Subject: [PATCH 2016/3246] notmuch: 0.24.2 -> 0.25

---
 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 606e5593593..d9af01bdad4 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.24.2";
+  version = "0.25";
   name = "notmuch-${version}";
 
   passthru = {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "0lfchvapk11qazdgsxj42igp9mpp83zbd0h1jj6r3ifmhikajxma";
+    sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5";
   };
 
   buildInputs = [

From 3e9f76774ab03c0aa06267dcfa1c7d7f6c984cf2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 20 May 2017 19:44:20 +0300
Subject: [PATCH 2017/3246] nixpkgs release: Fix Darwin-only jobs

Currently the logic of generating nixpkgs Hydra jobs is to walk through
the pkgs evaluated for system = "x86_64-linux", collect any derivations
and their meta.platforms values. However, that doesn't work for
packages whose meta.platforms doesn't include x86_64-linux, as just
evaluating their meta attribute raises an error so they get skipped
completely.

As a less-intrusive fix (i.e. anything than rewriting the current package
enumeration logic), allow passing `config.allowUnsupportedSystem = true`
to permit evaluating packages regardless of their platform and use that
in the package listing phase.

Fixes #25200
---
 pkgs/stdenv/generic/check-meta.nix | 4 +++-
 pkgs/top-level/release-lib.nix     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 8b2cf01f169..8544d932f81 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -40,6 +40,8 @@ let
 
   allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
 
+  allowUnsupportedSystem = config.allowUnsupportedSystem or false;
+
   isUnfree = licenses: lib.lists.any (l:
     !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
 
@@ -177,7 +179,7 @@ let
       { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; }
     else if !allowBroken && attrs.meta.broken or false then
       { valid = false; reason = "broken"; errormsg = "is marked as broken"; }
-    else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then
+    else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then
       { valid = false; reason = "broken"; errormsg = "is not supported on ‘${system}’"; }
     else if !(hasAllowedInsecure attrs) then
       { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index ddc449ae59c..c852ace7d7c 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -13,7 +13,7 @@ rec {
 
   allPackages = args: packageSet (args // nixpkgsArgs);
 
-  pkgs = pkgsFor "x86_64-linux";
+  pkgs = packageSet (lib.recursiveUpdate { system = "x86_64-linux"; config.allowUnsupportedSystem = true; } nixpkgsArgs);
   inherit lib;
 
 

From 0065365bdf7d9487fb396a2a5a335d0257a79b73 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 12 Aug 2017 20:38:35 -0700
Subject: [PATCH 2018/3246] nixpkgs release: remove macOS hack

was needed for testing previously
see:

https://github.com/NixOS/nixpkgs/pull/28174#pullrequestreview-55944725
---
 pkgs/top-level/release.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f59b2debe86..4a946a93003 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -126,9 +126,6 @@ let
         pandas = unix;
         scikitlearn = unix;
       };
-
-      # hack around broken eval of non-linux packages for now.
-      tests.macOSSierraShared = darwin;
     } ));
 
 in jobs

From 505e94256ef247dc5425068304583f8dc1b2064a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 11:44:36 +0200
Subject: [PATCH 2019/3246] stdenv: resurrect the allowedRequisites check

Discovered in #28091.  I'm sorry I forgot to re-check my TODOs, long ago.
---
 pkgs/stdenv/linux/default.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index c475d2d1e92..0aeb292e316 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -299,13 +299,21 @@ in
         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
-        ] ++ lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
-        */
+      # Mainly avoid reference to bootstrap tools
+      allowedRequisites = with prevStage; with lib;
+        # Simple executable tools
+        concatMap (p: [ (getBin p) (getLib p) ])
+          [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
+            gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
+          ]
+        # Library dependencies
+        ++ map getLib [ attr acl zlib pcre libsigsegv ]
+        # More complicated cases
+        ++ [
+            glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
+            gcc gcc.cc gcc.cc.lib gcc.expandResponseParams
+          ]
+        ++ lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
 
       overrides = self: super: {
         inherit (prevStage)

From 3b56edae94f3ea1b87852b52a4667411d060f592 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 12:19:58 +0200
Subject: [PATCH 2020/3246] python34: remove symlink to pip

Symbolic links were added pointing to the executables that end with 3 as
part of the Python 2 to 3 migration. At some point I disabled ensurepip
but forgot to remove this symbolic link.
---
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index e188e7ff48a..5799e319ba0 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -127,7 +127,6 @@ in stdenv.mkDerivation {
 
     # Use Python3 as default python
     ln -s "$out/bin/idle3" "$out/bin/idle"
-    ln -s "$out/bin/pip3" "$out/bin/pip"
     ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
     ln -s "$out/bin/python3" "$out/bin/python"
     ln -s "$out/bin/python3-config" "$out/bin/python-config"

From 53d2838f27ce504e154dfbd079c259c4c372daab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 12:20:22 +0200
Subject: [PATCH 2021/3246] python35: remove symlink to pip

Symbolic links were added pointing to the executables that end with 3 as
part of the Python 2 to 3 migration. At some point I disabled ensurepip
but forgot to remove this symbolic link.
---
 pkgs/development/interpreters/python/cpython/3.5/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 32bc0e22d1d..1b71dba42c4 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -125,7 +125,6 @@ in stdenv.mkDerivation {
 
     # Use Python3 as default python
     ln -s "$out/bin/idle3" "$out/bin/idle"
-    ln -s "$out/bin/pip3" "$out/bin/pip"
     ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
     ln -s "$out/bin/python3" "$out/bin/python"
     ln -s "$out/bin/python3-config" "$out/bin/python-config"

From 748589bf60feb00f54c325503e87771754bdc044 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 12:20:36 +0200
Subject: [PATCH 2022/3246] python36: remove symlink to pip

Symbolic links were added pointing to the executables that end with 3 as
part of the Python 2 to 3 migration. At some point I disabled ensurepip
but forgot to remove this symbolic link.
---
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 7e05a0ce61c..0b0f9c8be6a 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -125,7 +125,6 @@ in stdenv.mkDerivation {
 
     # Use Python3 as default python
     ln -s "$out/bin/idle3" "$out/bin/idle"
-    ln -s "$out/bin/pip3" "$out/bin/pip"
     ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
     ln -s "$out/bin/python3" "$out/bin/python"
     ln -s "$out/bin/python3-config" "$out/bin/python-config"

From 184d2e79778a4e5ff6bf09037d0df9f4574c11b9 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 13 Aug 2017 13:26:30 +0200
Subject: [PATCH 2023/3246] alt-ergo: use https instead of http to fetch
 archive

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

diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 7cf0aeb203d..8cf4bb9b6d2 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.30";
 
   src = fetchurl {
-    url    = "http://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
+    url    = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
     name   = "${name}.tar.gz";
     sha256 = "025pacb4ax864fn5x8k78mw6hiig4jcazblj18gzxspg4f1l5n1g";
   };
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-performance theorem prover and SMT solver";
-    homepage    = "http://alt-ergo.ocamlpro.com/";
+    homepage    = "https://alt-ergo.ocamlpro.com/";
     license     = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];

From b9b00495d53ad85f04279865c95d09e2a57bb94a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 13 Aug 2017 19:31:23 +0800
Subject: [PATCH 2024/3246] tboot: 1.8.2 -> 1.9.6

---
 pkgs/tools/security/tboot/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix
index 506b1d398d5..8530aab4e70 100644
--- a/pkgs/tools/security/tboot/default.nix
+++ b/pkgs/tools/security/tboot/default.nix
@@ -1,16 +1,19 @@
 { stdenv, fetchurl, trousers, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tboot-1.8.2";
+  name = "tboot-${version}";
+  version = "1.9.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/tboot/${name}.tar.gz";
-    sha256 = "1l9ccm7ik9fs7kzg1bjc5cjh0pcf4v0k1c84dmyr51r084i7p31m";
+    sha256 = "0f9afz260xhycpd0x5zz6jn8ha14i8j98rck0fhb55l1rbbfwm8v";
   };
 
+  patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ];
+
   buildInputs = [ trousers openssl zlib ];
 
-  patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ];
+  enableParallelBuilding = true;
 
   hardeningDisable = [ "pic" "stackprotector" ];
 
@@ -27,8 +30,7 @@ stdenv.mkDerivation rec {
     description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM";
     homepage    = http://sourceforge.net/projects/tboot/;
     license     = licenses.bsd3;
-    maintainers = [ maintainers.ak ];
+    maintainers = with maintainers; [ ak ];
     platforms   = platforms.linux;
   };
 }
-

From fd6db4f9136bff6d4926f2a77b07f85328aa3723 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 13 Aug 2017 14:18:49 +0200
Subject: [PATCH 2025/3246] aescrypt: use https to fetch archive

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

diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 53aec187bb7..d1139259922 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "aescrypt-${version}";
 
   src = fetchurl {
-    url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz";
+    url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz";
     sha256 = "1a1rs7xmbxh355qg3v02rln3gshvy3j6wkx4g9ir72l22mp6zkc7";
   };
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Encrypt files with Advanced Encryption Standard (AES)";
-    homepage    = http://www.aescrypt.com/;
+    homepage    = https://www.aescrypt.com/;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 qknight ];
     platforms   = stdenv.lib.platforms.all;

From f21cd848850581831e7746590e75c764c327e2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 14:45:47 +0200
Subject: [PATCH 2026/3246] mesa: maintenance 17.1.5 -> 17.1.6

---
 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 45819a8f3a6..f23838cb956 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.1.5";
+  version = "17.1.6";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -82,7 +82,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 = "378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9";
+    sha256 = "0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50";
   };
 
   prePatch = "patchShebangs .";

From ebafe1d9ab22d0c82ce4d8cd9659fe5cbdb99c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 14:47:41 +0200
Subject: [PATCH 2027/3246] libdrm: 2.4.81 -> 2.4.82

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index a8cf2864807..8fe7ef4609a 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.81";
+  name = "libdrm-2.4.82";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae";
+    sha256 = "43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c";
   };
 
   outputs = [ "out" "dev" ];

From beec141d84cc9cdc960c960fbf3dde145c2d3e33 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 13 Aug 2017 21:17:53 +0800
Subject: [PATCH 2028/3246] ddclient: assign group for ddclient

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

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 6ec3c1a112d..859838182ed 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -335,7 +335,7 @@
       dialout = 27;
       #polkituser = 28; # currently unused, polkitd doesn't need a group
       utmp = 29;
-      #ddclient = 30; # unused
+      ddclient = 30;
       davfs2 = 31;
       disnix = 33;
       osgi = 34;

From d4f4f418b31f0a70dce50f54ce4280fef76cba08 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 13 Aug 2017 21:45:25 +0800
Subject: [PATCH 2029/3246] ddclient: minor packaging cleanups

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

diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index 333292d9fab..6d3ca27df1d 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -11,31 +11,31 @@ buildPerlPackage rec {
 
   outputs = [ "out" ];
 
-  buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ];
+  buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 ];
 
   patches = [ ./ddclient-line-buffer-stdout.patch ];
 
   # Use iproute2 instead of ifconfig
   preConfigure = ''
     touch Makefile.PL
-    substituteInPlace ddclient --replace 'in the output of ifconfig' 'in the output of ip addr show'
-    substituteInPlace ddclient --replace 'ifconfig -a' '${iproute}/sbin/ip addr show'
-    substituteInPlace ddclient --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg'
+    substituteInPlace ddclient \
+      --replace 'in the output of ifconfig' 'in the output of ip addr show' \
+      --replace 'ifconfig -a'               '${iproute}/sbin/ip addr show' \
+      --replace 'ifconfig $arg'             '${iproute}/sbin/ip addr show $arg'
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp ddclient $out/bin
+    install -Dm755 ddclient $out/bin/ddclient
   '';
 
+  # there are no tests distributed with ddclient
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = https://sourceforge.net/p/ddclient/wiki/Home/;
     description = "Client for updating dynamic DNS service entries";
-    license = licenses.gpl2Plus;
-
+    homepage    = https://sourceforge.net/p/ddclient/wiki/Home/;
+    license     = licenses.gpl2Plus;
     # Mostly since `iproute` is Linux only.
-    platforms = platforms.linux;
+    platforms   = platforms.linux;
   };
 }

From 4ce76d9e1a4abb5ef0461ea8ac19095868fa5f66 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 13 Aug 2017 21:46:13 +0800
Subject: [PATCH 2030/3246] ddclient nixos module: follow best practice for
 running daemons

Couple of changes:

 - move home to /var/lib/ddclient so we can enable ProtectSystem=full
 - do not stick binary into systemPackages as it will only run as a daemon
 - run as dedicated user/group
 - document why we cannot run as type=forking (output is swallowed)
 - secure things by running with ProtectSystem and PrivateTmp
 - .pid file goes into /run/ddclient
 - let nix create the home directory instead of handling it manually
 - make the interval configurable
---
 .../modules/services/networking/ddclient.nix  | 98 +++++++++++--------
 1 file changed, 55 insertions(+), 43 deletions(-)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 28c96a9baef..9e56545f746 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -1,17 +1,33 @@
 { config, pkgs, lib, ... }:
 
 let
+  cfg = config.services.ddclient;
+  boolToStr = bool: if bool then "yes" else "no";
 
-  inherit (lib) mkOption mkIf singleton;
-  inherit (pkgs) ddclient;
-
-  stateDir = "/var/spool/ddclient";
-  ddclientUser = "ddclient";
-  ddclientFlags = "-foreground -file ${config.services.ddclient.configFile}";
-  ddclientPIDFile = "${stateDir}/ddclient.pid";
+  configText = ''
+    # This file can be used as a template for configFile or is automatically generated by Nix options.
+    daemon=${toString cfg.interval}
+    cache=${cfg.homeDir}/ddclient.cache
+    pid=/run/ddclient/ddclient.pid
+    foreground=NO
+    use=${cfg.use}
+    login=${cfg.username}
+    password=${cfg.password}
+    protocol=${cfg.protocol}
+    ${let server = cfg.server; in
+      lib.optionalString (server != "") "server=${server}"}
+    ssl=${boolToStr cfg.ssl}
+    wildcard=YES
+    quiet=${boolToStr cfg.quiet}
+    verbose=${boolToStr cfg.verbose}
+    ${cfg.domain}
+    ${cfg.extraConfig}
+  '';
 
 in
 
+with lib;
+
 {
 
   ###### interface
@@ -28,6 +44,12 @@ in
         '';
       };
 
+      homeDir = mkOption {
+        default = "/var/lib/ddclient";
+        type = str;
+        description = "Home directory for the daemon user.";
+      };
+
       domain = mkOption {
         default = "";
         type = str;
@@ -52,6 +74,12 @@ in
         '';
       };
 
+      interval = mkOption {
+        default = 600;
+        type = int;
+        description = "The interval at which to run the check and update.";
+      };
+
       configFile = mkOption {
         default = "/etc/ddclient.conf";
         type = path;
@@ -126,37 +154,24 @@ in
 
   config = mkIf config.services.ddclient.enable {
 
-    environment.systemPackages = [ ddclient ];
+    users = {
+      extraGroups.ddclient.gid = config.ids.gids.ddclient;
 
-    users.extraUsers = singleton {
-      name = ddclientUser;
-      uid = config.ids.uids.ddclient;
-      description = "ddclient daemon user";
-      home = stateDir;
+      extraUsers.ddclient = {
+        uid = config.ids.uids.ddclient;
+        description = "ddclient daemon user";
+        group = "ddclient";
+        home = cfg.homeDir;
+        createHome = true;
+      };
     };
 
     environment.etc."ddclient.conf" = {
-      enable = config.services.ddclient.configFile == "/etc/ddclient.conf";
+      enable = cfg.configFile == "/etc/ddclient.conf";
       uid = config.ids.uids.ddclient;
+      gid = config.ids.gids.ddclient;
       mode = "0600";
-      text = ''
-        # This file can be used as a template for configFile or is automatically generated by Nix options.
-        daemon=600
-        cache=${stateDir}/ddclient.cache
-        pid=${ddclientPIDFile}
-        use=${config.services.ddclient.use}
-        login=${config.services.ddclient.username}
-        password=${config.services.ddclient.password}
-        protocol=${config.services.ddclient.protocol}
-        ${let server = config.services.ddclient.server; in
-          lib.optionalString (server != "") "server=${server}"}
-        ssl=${if config.services.ddclient.ssl then "yes" else "no"}
-        wildcard=YES
-        quiet=${if config.services.ddclient.quiet then "yes" else "no"}
-        verbose=${if config.services.ddclient.verbose then "yes" else "no"}
-        ${config.services.ddclient.domain}
-        ${config.services.ddclient.extraConfig}
-      '';
+      text = configText;
     };
 
     systemd.services.ddclient = {
@@ -166,17 +181,14 @@ in
       restartTriggers = [ config.environment.etc."ddclient.conf".source ];
 
       serviceConfig = {
-        # Uncomment this if too many problems occur:
-        # Type = "forking";
-        User = ddclientUser;
-        Group = "nogroup"; #TODO get this to work
-        PermissionsStartOnly = "true";
-        PIDFile = ddclientPIDFile;
-        ExecStartPre = ''
-          ${pkgs.stdenv.shell} -c "${pkgs.coreutils}/bin/mkdir -m 0755 -p ${stateDir} && ${pkgs.coreutils}/bin/chown ${ddclientUser} ${stateDir}"
-        '';
-        ExecStart = "${ddclient}/bin/ddclient ${ddclientFlags}";
-        #ExecStartPost = "${pkgs.coreutils}/bin/rm -r ${stateDir}"; # Should we have this?
+        RuntimeDirectory = "ddclient";
+        # we cannot run in forking mode as it swallows all the program output
+        Type = "simple";
+        User = "ddclient";
+        Group = "ddclient";
+        ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -foreground -file ${cfg.configFile}";
+        ProtectSystem = "full";
+        PrivateTmp = true;
       };
     };
   };

From 3fde7111461715457464decd19404e4c82a6d2ef Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 13 Aug 2017 13:43:16 +0200
Subject: [PATCH 2031/3246] acoustid-fingerprinter: use https to fetch package

---
 pkgs/tools/audio/acoustid-fingerprinter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index b8341204e92..ba029814f39 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.6";
 
   src = fetchurl {
-    url = "http://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
+    url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
         + "${name}.tar.gz";
     sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0";
   };
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   }) ];
 
   meta = with stdenv.lib; {
-    homepage = http://acoustid.org/fingerprinter;
+    homepage = https://acoustid.org/fingerprinter;
     description = "Audio fingerprinting tool using chromaprint";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with maintainers; [ ehmry ];

From 1784840b7259c7539ab44dbb9a51b39fc376277f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 16:27:40 +0200
Subject: [PATCH 2032/3246] dbus: maintenance 1.10.20 -> 1.10.22

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

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 5fe13d86f2d..17a5c65376b 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.10.20";
-  sha256 = "0j0b8rn9fvh1m4nndp9fzq09xw50grp5kfvkv7jgs9al1dwbjx75";
+  version = "1.10.22";
+  sha256 = "15vv9gz5i4f5l7h0d045qz5iyvl89hjk2k83lb4vbizd7qg41cg2";
 
 self = stdenv.mkDerivation {
     name = "dbus-${version}";

From b53d4c6f2d2b5df9e680aef1f9c34fb1e82bc1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 16:28:05 +0200
Subject: [PATCH 2033/3246] gdk-pixbuf: maintenance 2.36.6 -> 2.36.8

---
 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 f40ebf00590..906822b40f3 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 = "6";
+  ver_min = "8";
 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 = "455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c";
+    sha256 = "5d68e5283cdc0bf9bda99c3e6a1d52ad07a03364fa186b6c26cfc86fcd396a19";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From bbdb8f5cff70f846ffee597835a53b3a439d3867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 16:28:51 +0200
Subject: [PATCH 2034/3246] gkt3: maintenance 3.22.16 -> 3.22.18

---
 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 cf888641b94..94f603bced2 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 = "16";
+  ver_min = "18";
   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 = "3e0c3ad01f3c8c5c9b1cc1ae00852bd55164c8e5a9c1f90ba5e07f14f175fe2c";
+    sha256 = "b64b1c2ec20adf128ac08ee704d1f4e7b0a8d3df097d51f62edb271c7bb1bf69";
   };
 
   outputs = [ "out" "dev" ];

From cbfb89f996dba22686c32077454fa7357fce3d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 16:29:14 +0200
Subject: [PATCH 2035/3246] harfbuzz: 1.4.6 -> 1.4.8

---
 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 191d3365d6c..8885f2a2c43 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.4.6";
+  version = "1.4.8";
   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 = "21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293";
+    sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131";
   };
 
   outputs = [ "out" "dev" ];

From 2d0f1c81649807e56e50a27c5632c833f4342842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 16:29:50 +0200
Subject: [PATCH 2036/3246] pango: maintenance 1.40.6 -> 1.40.9

Also enable tests on Linux, as they seem fine now.
---
 pkgs/development/libraries/pango/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 9b396261fcc..0e4099d6fe5 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -6,14 +6,14 @@ with stdenv.lib;
 
 let
   ver_maj = "1.40";
-  ver_min = "6";
+  ver_min = "9";
 in
 stdenv.mkDerivation rec {
   name = "pango-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-    sha256 = "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573";
+    sha256 = "9faea6535312fe4436b93047cf7a04af544eb52a079179bd3a33821aacce7e16";
   };
 
   outputs = [ "bin" "dev" "out" "devdoc" ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = false; # test-layout fails on 1.40.3 (fails to find font config)
+  doCheck = stdenv.host.isLinux;
   # jww (2014-05-05): The tests currently fail on Darwin:
   #
   # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)

From d60b288663718cbde7a0f5ec936b55e70c14a3d2 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michaelpj@gmail.com>
Date: Wed, 9 Aug 2017 19:00:30 +0100
Subject: [PATCH 2037/3246] Nixpkgs manual: expand documentation for overlays

---
 doc/overlays.xml | 67 +++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index f8f554bb556..6d631071c34 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -8,59 +8,62 @@
 overlays. Overlays are used to add layers in the fix-point used by Nixpkgs
 to compose the set of all packages.</para>
 
+<para>Nixpkgs can be configured with a list of overlays, which are
+applied in order. This means that the order of the overlays can be significant
+if multiple layers override the same package.</para>
+
 <!--============================================================-->
 
 <section xml:id="sec-overlays-install">
-<title>Installing Overlays</title>
+<title>Installing overlays</title>
 
-<para>The set of overlays is looked for in the following places. The
-first one present is considered, and all the rest are ignored:
+<para>The list of overlays is determined as follows:
 
 <orderedlist>
 
   <listitem>
+    <para>First, if an <varname>overlays</varname> argument to the nixpkgs function itself is given,
+    then that is used. This can be passed explicitly when importing nipxkgs, for example 
+    <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ] }</literal>.</para>
 
-    <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 is described in <xref linkend="sec-overlays-layout"/>.</para>
-
+    <para>On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present, 
+    is passed to the system Nixpkgs in this way. Note that this does not affect the overlays for
+    non-NixOS operations (e.g. <literal>nix-env</literal>), which are looked up independently.</para>
   </listitem>
 
   <listitem>
+    <para>Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal> exists and is a 
+    directory, then the result is the set of overlays found in that directory, ordered lexicographically.</para> 
 
-    <para>In the directory pointed to by the Nix search path entry
-    <literal>&lt;nixpkgs-overlays></literal>.</para>
+    <para>See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to 
+    set a value for <literal>&lt;nixpkgs-overlays>.</literal></para>
   </listitem>
 
   <listitem>
-
-    <para>In the directory <filename>~/.config/nixpkgs/overlays/</filename>.</para>
+    <para>Otherwise, if <filename>~/.config/nixpkgs/overlays/</filename> exists and is a directory, then
+    the result is the set of overlays found in that directory, ordered lexicographically.</para>
   </listitem>
 
 </orderedlist>
 </para>
 
-<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>For the second and third options overlays can be provided as files, 
+directories containing a <filename>default.nix</filename>, or symlinks to one of those.</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, 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 it in <filename>~/.config/nixpkgs/overlays/</filename> directory.</para>
+<para>The last option provides a convenient way to install an overlay from a repository, 
+by cloning the overlay's repository and adding a symbolic link to it in 
+<filename>~/.config/nixpkgs/overlays/</filename>.</para>
 
 </section>
 
 <!--============================================================-->
 
-<section xml:id="sec-overlays-layout">
-<title>Overlays Layout</title>
+<section xml:id="sec-overlays-definition">
+<title>Defining overlays</title>
 
-<para>Overlays are expressed as Nix functions which accept 2 arguments and return a set of
-packages.</para>
+<para>Overlays are Nix functions which accept two arguments, 
+conventionally called <varname>self</varname> and <varname>super</varname>, 
+and return a set of packages. For example, the following is a valid overlay.</para>
 
 <programlisting>
 self: super:
@@ -75,25 +78,31 @@ self: super:
 }
 </programlisting>
 
-<para>The first argument, usually named <varname>self</varname>, corresponds to the final package
+<para>The first argument (<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 overridden dependencies used in the
 <varname>boost</varname> override.</para>
 
-<para>The second argument, usually named <varname>super</varname>,
+<para>The second argument (<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 should be used either
+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
+<filename>pkgs/top-level/all-packages.nix</filename>, containing
 overridden and/or new packages.</para>
 
+<para>Overlays are similar to other methods for customizing Nixpkgs, in particular
+the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>.
+Indeed, <literal>packageOverrides</literal> acts as an overlay with only the 
+<varname>super</varname> argument. It is therefore appropriate for basic use, 
+but overlays are more powerful and easier to distribute.</para>
+
 </section>
 
 </chapter>

From 5bc183ebf868b32b599692a3b651a39d8a97dee3 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michaelpj@gmail.com>
Date: Sun, 13 Aug 2017 14:42:33 +0100
Subject: [PATCH 2038/3246] Overlays: fix some documentation nits

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

diff --git a/doc/overlays.xml b/doc/overlays.xml
index 6d631071c34..ad31b90299e 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -47,7 +47,7 @@ if multiple layers override the same package.</para>
 </orderedlist>
 </para>
 
-<para>For the second and third options overlays can be provided as files, 
+<para>For the second and third options, overlays are extracted from the given directory as files, 
 directories containing a <filename>default.nix</filename>, or symlinks to one of those.</para>
 
 <para>The last option provides a convenient way to install an overlay from a repository, 

From 7d50d5e304caa148f1bcde7ee9ae42aac30f8111 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 13 Aug 2017 15:09:16 +0000
Subject: [PATCH 2039/3246] far2l: 2017-05-09 -> 2017-07-13

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

diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 87709ec102b..658fe3477b3 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -2,15 +2,15 @@
   xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
 
 stdenv.mkDerivation rec {
-  rev = "ab240373f69824c56e9255d452b689cff3b1ecfb";
-  build = "2017-05-09-${builtins.substring 0 10 rev}";
+  rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed";
+  build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}";
   name = "far2l-2.1.${build}";
 
   src = fetchFromGitHub {
     owner = "elfmz";
     repo = "far2l";
     rev = rev;
-    sha256 = "1b6w6xhja3xkfzhrdy8a8qpbhxws75khm1zhwz8sc8la9ykd541q";
+    sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8";
   };
 
   nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];

From d9854884fa52f0207faa1f5d431d2a48f3d57eb4 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 13 Aug 2017 15:09:37 +0000
Subject: [PATCH 2040/3246] far2l: add nix syntax highlighting

---
 .../far2l/add-nix-syntax-highlighting.patch   | 157 ++++++++++++++++++
 pkgs/applications/misc/far2l/default.nix      |   2 +
 2 files changed, 159 insertions(+)
 create mode 100644 pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch

diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
new file mode 100644
index 00000000000..68a16b196fa
--- /dev/null
+++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
@@ -0,0 +1,157 @@
+diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc
+new file mode 100644
+index 0000000..1bd9bb5
+--- /dev/null
++++ b/colorer/configs/base/hrc/nix.hrc
+@@ -0,0 +1,132 @@
++<?xml version="1.0" encoding="windows-1251"?>
++<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"
++  "http://colorer.sf.net/2003/hrc.dtd">
++<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"
++     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++     xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd">
++
++  <type name="nix">
++
++    <annotation><documentation>
++        Nix
++    </documentation></annotation>
++
++    <import type="def"/>
++
++    <region name="Code" parent="def:Text"/>
++    <region name="StringEscape" parent="def:StringContent"/>
++    <region name='Import' parent='def:Directive'/>
++    <region name='ImportOutline' parent='def:Outlined'/>
++    <region name="Path"     parent="def:Path"/>
++    <region name="URL"      parent="def:String"/>
++    <region name="LiteralKeyword" parent="def:Keyword"/>
++    <region name='Interpolation' parent='def:StringEdge'/>
++    <region name="Ident" parent="def:Identifier"/> <!-- Label  -->
++
++    <scheme name="TabsAsErrors" if="tabs-as-errors">
++      <regexp match="/\t+/" region='def:Error'/>
++    </scheme>
++
++    <scheme name="SpacesAsErrors" if="spaces-as-errors">
++      <regexp match="/\x20+$/" region='def:Error'/>
++    </scheme>
++
++    <scheme name="NotNestedComment">
++      <inherit scheme="TabsAsErrors"/>
++      <inherit scheme="SpacesAsErrors"/>
++      <inherit scheme="Comment"/>
++    </scheme>
++
++    <scheme name="String">
++      <inherit scheme="TabsAsErrors"/>
++      <inherit scheme="SpacesAsErrors"/>
++<!--  <regexp match="/\\[xX]0*[\da-fA-F]{1,2}/"                   region0="StringEscape"/> -->
++      <regexp match="/\\./"                                       region0="StringEscape"/>
++      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
++    </scheme>
++
++    <scheme name="BlockString">
++      <inherit scheme="TabsAsErrors"/>
++      <inherit scheme="SpacesAsErrors"/>
++
++      <regexp match="/&apos;&apos;\$/"                                          region0="StringEscape"/>
++      <regexp match="/&apos;&apos;&apos;/"                                      region0="StringEscape"/>
++      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
++    </scheme>
++
++    <scheme name="NixIdent">
++      <regexp match="/\w[\w\d-]*'*/"           region0="Ident"/>
++    </scheme>
++
++    <scheme name="NixExpression">
++      <inherit scheme="TabsAsErrors"/>
++      <inherit scheme="SpacesAsErrors"/>
++
++      <inherit scheme="def:unixCommentDirective"/>
++      <block start="/#/"    end="/\s*$/"            scheme="Comment"          region="LineComment" region10="def:Error"/>
++      <block start="/\/\*/" end="/\*\//"            scheme="NotNestedComment" region="Comment"     region00="PairStart" region10="PairEnd"/>
++
++      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
++      <block start="/(\{)/"   end="/(\})/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
++      <block start="/(\()/"   end="/(\))/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
++      <block start="/(\[)/"   end="/(\])/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
++
++      <regexp match="/(\.\.|\.|\~|)\/[\w\d.+=?-]+(\/[\w\d.+=?-]+)*/"            region0="Path"/>
++      <regexp match="/&lt;[\w\d\/.-]+&gt;/"                                     region0="Path"/>
++      <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/"    region0="URL"/>
++      <block start="/(&quot;)/"       end="/(&quot;)/"       scheme="String"      region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
++      <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
++
++      <keywords region="Keyword">
++        <word name="assert"/>
++        <word name="else"/>
++        <word name="if"/>
++        <word name="in"/>
++        <word name="inherit"/>
++        <word name="import"/>
++        <word name="let"/>
++        <word name="rec"/>
++        <word name="then"/>
++        <word name="throw"/>
++        <word name="with"/>
++      </keywords>
++      <keywords region="LiteralKeyword">
++        <word name="true"/>
++        <word name="false"/>
++        <word name="null"/>
++      </keywords>
++      <keywords region="Symbol">
++        <symb name="."/>
++        <symb name=":"/>
++        <symb name=","/>
++        <symb name=";"/>
++
++        <symb name="*"/>
++        <symb name="/"/>
++        <symb name="%"/>
++        <symb name="+"/>
++        <symb name="-"/>
++        <symb name="!"/>
++        <symb name="?"/>
++        <symb name="@"/>
++        <symb name="&lt;"/>
++        <symb name="&gt;"/>
++        <symb name="&amp;"/>
++        <symb name="|"/>
++        <symb name="="/>
++        <symb name="..."/>
++      </keywords>
++
++      <inherit scheme="def:Number"/>
++      <inherit scheme="NixIdent"/>
++
++      <regexp match="/[^\)\}\]\s]/" region='def:Error'/>
++
++    </scheme>
++
++    <scheme name="nix">
++      <inherit scheme="NixExpression"/>
++    </scheme>
++
++  </type>
++</hrc>
+diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc
+index 11e493b..2a67263 100644
+--- a/colorer/configs/base/hrc/proto.hrc
++++ b/colorer/configs/base/hrc/proto.hrc
+@@ -156,6 +156,14 @@
+     <location link="jar:common.jar!base/lua.hrc"/>
+     <filename>/\.(w?lua)$/i</filename>
+   </prototype>
++  <prototype name="nix" group="main" description="Nix">
++    <location link="nix.hrc"/>
++    <filename>/\.(nix)$/i</filename>
++    <parameters>
++      <param name="tabs-as-errors" value="true" description="Shows tabulation symbol as error"/>
++      <param name="spaces-as-errors" value="true" description="Shows trailing spaces as error"/>
++    </parameters>
++  </prototype>
+   <prototype name="ruby" group="main" description="Ruby">
+     <location link="jar:common.jar!base/ruby.hrc"/>
+     <filename>/\.(rb|rbw|ruby|rake)$/i</filename>
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 658fe3477b3..926b1a41ede 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ wxGTK30 glib pcre ];
 
+  patches = [ ./add-nix-syntax-highlighting.patch ];
+
   postPatch = ''
     echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
 

From e16a0988bc18be3997f5c475f373a8ac127d3fa0 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 25 Jul 2017 09:01:08 +0200
Subject: [PATCH 2041/3246] radicale: 1.1.4 -> 2.1.2

This commit readds and updates the 1.x package from 1.1.4 to 1.1.6 which
also includes the needed command for migrating to 2.x

The module is adjusted to the version change, defaulting to radicale2 if
stateVersion >= 17.09 and radicale1 otherwise. It also now uses
ExecStart instead of the script service attribute. Some missing dots at
the end of sentences were also added.

I added a paragraph in the release notes on how to update to a newer
version.
---
 nixos/doc/manual/release-notes/rl-1709.xml    |  3 +
 .../modules/services/networking/radicale.nix  | 40 ++++++---
 nixos/release.nix                             |  1 +
 nixos/tests/radicale.nix                      | 83 +++++--------------
 pkgs/servers/radicale/1.x.nix                 | 34 ++++++++
 pkgs/servers/radicale/default.nix             | 32 ++++---
 pkgs/top-level/all-packages.nix               |  5 +-
 7 files changed, 112 insertions(+), 86 deletions(-)
 create mode 100644 pkgs/servers/radicale/1.x.nix

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index a32f9963d1c..0850189f634 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -101,6 +101,9 @@ rmdir /var/lib/ipfs/.ipfs
     <para>
       The <literal>mysql</literal> default <literal>dataDir</literal> has changed from <literal>/var/mysql</literal> to <literal>/var/lib/mysql</literal>.
     </para>
+    <para>
+      Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by setting the <literal>package</literal> to <literal>radicale2</literal>, which is done automatically when <literal>stateVersion</literal> is 17.09 or higher.
+    </para>
   </listitem>
   <listitem>
     <para>
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index ef860e7e5df..f1b8edf4371 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -8,17 +8,35 @@ let
 
   confFile = pkgs.writeText "radicale.conf" cfg.config;
 
+  # This enables us to default to version 2 while still not breaking configurations of people with version 1
+  defaultPackage = if versionAtLeast "17.09" config.system.stateVersion then {
+    pkg = pkgs.radicale2;
+    text = "pkgs.radicale2";
+  } else {
+    pkg = pkgs.radicale1;
+    text = "pkgs.radicale1";
+  };
 in
 
 {
 
   options = {
-
     services.radicale.enable = mkOption {
       type = types.bool;
       default = false;
       description = ''
-          Enable Radicale CalDAV and CardDAV server
+          Enable Radicale CalDAV and CardDAV server.
+      '';
+    };
+
+    services.radicale.package = mkOption {
+      type = types.package;
+      default = defaultPackage.pkg;
+      defaultText = defaultPackage.text;
+      description = ''
+        Radicale package to use. This defaults to version 1.x if
+        <literal>system.stateVersion &lt; 17.09</literal> and version 2.x
+        otherwise.
       '';
     };
 
@@ -27,13 +45,13 @@ in
       default = "";
       description = ''
         Radicale configuration, this will set the service
-        configuration file
+        configuration file.
       '';
-      };
+    };
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.radicale ];
+    environment.systemPackages = [ cfg.package ];
 
     users.extraUsers = singleton
       { name = "radicale";
@@ -52,11 +70,13 @@ in
       description = "A Simple Calendar and Contact Server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      script = "${pkgs.radicale}/bin/radicale -C ${confFile} -f";
-      serviceConfig.User = "radicale";
-      serviceConfig.Group = "radicale";
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/radicale -C ${confFile} -f";
+        User = "radicale";
+        Group = "radicale";
+      };
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ aneeshusa ];
+  meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index 9604da5a4d7..7ee0c6064d0 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -297,6 +297,7 @@ in rec {
   tests.pumpio = callTest tests/pump.io.nix {};
   # tests.quagga = callTest tests/quagga.nix {};
   tests.quake3 = callTest tests/quake3.nix {};
+  tests.radicale = callTest tests/radicale.nix {};
   tests.runInMachine = callTest tests/run-in-machine.nix {};
   tests.samba = callTest tests/samba.nix {};
   tests.sddm = callSubTests tests/sddm.nix {};
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index 4c2ed8456dd..bec86d2cb28 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -1,80 +1,39 @@
 let
-  port = 5232;
-  radicaleOverlay = self: super: {
-    radicale = super.radicale.overrideAttrs (oldAttrs: {
-      propagatedBuildInputs = with self.pythonPackages;
-        (oldAttrs.propagatedBuildInputs or []) ++ [
-          passlib
-        ];
-    });
-  };
-  common = { config, pkgs, ...}: {
+  user = "someuser";
+  password = "some_password";
+  port = builtins.toString 5232;
+in
+  import ./make-test.nix ({ pkgs, lib, ... }: {
+  name = "radicale";
+  meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];
+
+  machine = {
     services.radicale = {
       enable = true;
-      config = let home = config.users.extraUsers.radicale.home; in ''
-        [server]
-        hosts = 127.0.0.1:${builtins.toString port}
-        daemon = False
-        [encoding]
-        [well-known]
+      config = ''
         [auth]
         type = htpasswd
         htpasswd_filename = /etc/radicale/htpasswd
         htpasswd_encryption = bcrypt
-        [git]
-        [rights]
+
         [storage]
-        type = filesystem
-        filesystem_folder = ${home}/collections
+        filesystem_folder = /tmp/collections
+
         [logging]
-        [headers]
+        debug = True
       '';
     };
     # WARNING: DON'T DO THIS IN PRODUCTION!
     # This puts secrets (albeit hashed) directly into the Nix store for ease of testing.
-    environment.etc."radicale/htpasswd".source = with pkgs; let
-      py = python.withPackages(ps: with ps; [ passlib ]);
-    in runCommand "htpasswd" {} ''
-        ${py}/bin/python -c "
-from passlib.apache import HtpasswdFile
-ht = HtpasswdFile(
-    '$out',
-    new=True,
-    default_scheme='bcrypt'
-)
-ht.set_password('someuser', 'really_secret_password')
-ht.save()
-"
+    environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} ''
+      ${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password}
     '';
   };
-
-in import ./make-test.nix ({ lib, ... }: {
-  name = "radicale";
-  meta.maintainers = with lib.maintainers; [ aneeshusa ];
-
-  # Test radicale with bcrypt-based htpasswd authentication
-  nodes = {
-    py2 = { config, pkgs, ... }@args: (common args) // {
-      nixpkgs.overlays = [
-        radicaleOverlay
-      ];
-    };
-    py3 = { config, pkgs, ... }@args: (common args) // {
-      nixpkgs.overlays = [
-        (self: super: {
-          python = self.python3;
-          pythonPackages = self.python3.pkgs;
-        })
-        radicaleOverlay
-      ];
-    };
-  };
-
+  
+  # This tests whether the web interface is accessible to an authenticated user
   testScript = ''
-    for my $machine ($py2, $py3) {
-      $machine->waitForUnit('radicale.service');
-      $machine->waitForOpenPort(${builtins.toString port});
-      $machine->succeed('curl -s http://someuser:really_secret_password@127.0.0.1:${builtins.toString port}/someuser/calendar.ics/');
-    }
+    $machine->waitForUnit('radicale.service');
+    $machine->waitForOpenPort(${port});
+    $machine->succeed('curl --fail http://${user}:${password}@localhost:${port}/.web/');
   '';
 })
diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix
new file mode 100644
index 00000000000..13db868845a
--- /dev/null
+++ b/pkgs/servers/radicale/1.x.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "radicale-${version}";
+  version = "1.1.6";
+
+  src = fetchurl {
+    url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";
+    sha256 = "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0";
+  };
+
+  propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [
+    pythonPackages.flup
+    pythonPackages.ldap
+    pythonPackages.sqlalchemy
+  ];
+
+  doCheck = !pythonPackages.isPy3k;
+
+  meta = with stdenv.lib; {
+    homepage = http://www.radicale.org/;
+    description = "CalDAV CardDAV server";
+    longDescription = ''
+      The Radicale Project is a complete CalDAV (calendar) and CardDAV
+      (contact) server solution. Calendars and address books are available for
+      both local and remote access, possibly limited through authentication
+      policies. They can be viewed and edited by calendar and contact clients
+      on mobile phones or computers.
+    '';
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ edwtjo pSub aneeshusa ];
+  };
+}
diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index b6d61e29395..ee38783a899 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -1,21 +1,27 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
-pythonPackages.buildPythonApplication rec {
+let
+  version = "2.1.2";
+  sha256 = "0gmbnvm17j0ilcnci1k2jh0vkbz5g8xlk9lgia5mlx790048hlm8";
+in
+
+python3Packages.buildPythonApplication {
   name = "radicale-${version}";
-  version = "1.1.4";
+  inherit version;
 
-  src = fetchurl {
-    url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";
-    sha256 = "17p0hayyw30pfb81xqvd7jhjm6yrk2dnbgvqagx1nqdsr89ar0ss";
+  src = fetchFromGitHub {
+    owner = "Kozea";
+    repo = "Radicale";
+    rev = version;
+    inherit sha256;
   };
 
-  propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [
-    pythonPackages.flup
-    pythonPackages.ldap
-    pythonPackages.sqlalchemy
-  ];
+  doCheck = false;
 
-  doCheck = !pythonPackages.isPy3k;
+  propagatedBuildInputs = with python3Packages; [
+    vobject
+    passlib
+  ];
 
   meta = with stdenv.lib; {
     homepage = http://www.radicale.org/;
@@ -29,6 +35,6 @@ pythonPackages.buildPythonApplication rec {
     '';
     license = licenses.gpl3Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ edwtjo pSub aneeshusa ];
+    maintainers = with maintainers; [ edwtjo pSub aneeshusa infinisil ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6ae62db18d..eebda89ece6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11468,7 +11468,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
   };
 
-  radicale = callPackage ../servers/radicale { };
+  radicale1 = callPackage ../servers/radicale/1.x.nix { };
+  radicale2 = callPackage ../servers/radicale/default.nix { };
+
+  radicale = radicale2;
 
   rake = callPackage ../development/tools/build-managers/rake { };
 

From 206faacbcb8c9a4655c6c8cf2cf5eec688d59719 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 13 Aug 2017 17:58:18 +0200
Subject: [PATCH 2042/3246] gcc: fix clang build

Fixes #27889

This works properly now that LD_DYLD_PATH is fixed
---
 pkgs/development/compilers/gcc/5/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e95ef92c3f6..c9780077835 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -325,7 +325,13 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+  preConfigure =
+    # Not sure why this is causing problems, now that the stdenv
+    # exports CPP=cpp the build fails with strange errors on darwin.
+    # https://github.com/NixOS/nixpkgs/issues/27889
+    stdenv.lib.optionalString stdenv.cc.isClang ''
+    unset CPP
+  '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

From c4fb72cbb573ddc2ad3c73526cdde7e47440dfd8 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 12 Aug 2017 22:53:29 +0000
Subject: [PATCH 2043/3246] $SOURCE_DATE_EPOCH moved to preConfigure

---
 pkgs/tools/misc/fontforge/default.nix             | 8 ++++----
 pkgs/tools/misc/fontforge/fontforge-fonttools.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index f79bb123b34..04abaa87611 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, lib, runCommand
+{ stdenv, fetchFromGitHub, fetchpatch, lib
 , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
 , withSpiro ? false, libspiro
@@ -11,9 +11,6 @@ stdenv.mkDerivation rec {
   name = "fontforge-${version}";
   version = "20170730";
 
-  # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19)
-  SOURCE_DATE_EPOCH = lib.fileContents (runCommand "unixtime-of-${version}" {} "date -d ${version} +%s > $out");
-
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "fontforge";
@@ -49,6 +46,9 @@ stdenv.mkDerivation rec {
 
   # work-around: git isn't really used, but configuration fails without it
   preConfigure = ''
+    # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19)
+    export SOURCE_DATE_EPOCH=$(date -d ${version} +%s)
+
     export GIT="$(type -P true)"
     cp -r "${gnulib}" ./gnulib
     chmod +w -R ./gnulib
diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
index 0f82f4ad638..c65d8ed375d 100644
--- a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
+++ b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = ''Small font tools shipped in FontForge contrib'';
-    license = fontforge.meta.license;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ raskin ];
     platforms = with platforms; unix;
   };

From cb3575bda7ab110e4e6fce9f29d8ac5edb142294 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 13 Aug 2017 12:27:30 -0400
Subject: [PATCH 2044/3246] kubernetes-helm: 2.5.0 -> 2.5.1

---
 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 dc7d2b8b2ea..0ac872c35c9 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,10 +4,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd"
-             else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj";
+             then "1hkr5s1c72sqf156lk6gsnbfs75jnpqs42f64a7mz046c06kv98f"
+             else "00xw0c66x58g915989fc72mwliysxi5glrkdafi3gcfmlhrnc68i";
   pname = "helm";
-  version = "2.5.0";
+  version = "2.5.1";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";

From 92d4efee8e895d4cc3fb10841004ba6d389e3d19 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 13 Aug 2017 18:54:43 +0200
Subject: [PATCH 2045/3246] clipster: 1.0.1 -> 1.2.5

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

diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index e34f4bc8f2f..a70cba3f3d0 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation  rec {
   name = "clipster-${version}";
-  version = "1.0.1";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
     rev = "${version}";
-    sha256 = "0y0igi5r5x2gxglm0aarn2mhdfn6whakm6359i3h0wkn6qw1p1l2";
+    sha256 = "0yjljpqpcbi84ibbrxbm5cbgs16ada4cmvir744hygrdl948zzk3";
   };
 
   pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);

From 2d5a04e5bdb3e5817352d6c31eb56f0653cbe50c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 13 Aug 2017 19:07:38 +0200
Subject: [PATCH 2046/3246] nixos/agetty: override upstream default

Also see c2cf696430055498467dd9deec59939e8d52a43e.
---
 nixos/modules/services/ttys/agetty.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index f8dd75ea2c4..3429397d2cc 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -85,12 +85,18 @@ in
       };
 
     systemd.services."container-getty@" =
-      { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM";
+      { serviceConfig.ExecStart = [
+          "" # override upstream default with an empty ExecStart
+          (gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM")
+        ];
         restartIfChanged = false;
       };
 
     systemd.services."console-getty" =
-      { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM";
+      { serviceConfig.ExecStart = [
+          "" # override upstream default with an empty ExecStart
+          (gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM")
+        ];
         serviceConfig.Restart = "always";
         restartIfChanged = false;
         enable = mkDefault config.boot.isContainer;

From a0aae85012ec4807d46495f44246ea092db2570e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 21:30:42 +0200
Subject: [PATCH 2047/3246] Python: move some attributes together with the rest
 of the Python-related attributes.

---
 pkgs/top-level/all-packages.nix | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6ae62db18d..d50e812eaf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6336,6 +6336,7 @@ with pkgs;
   python = python2;
   python2 = python27;
   python3 = python36;
+  pypy = pypy27;
 
   # Python interpreter that is build with all modules, including tkinter.
   # These are for compatibility and should not be used inside Nixpkgs.
@@ -6369,17 +6370,22 @@ with pkgs;
     self = python36;
   };
 
-  # Should eventually be moved inside Python interpreters.
-  python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { };
-
-  pypy = pypy27;
-
   pypy27 = callPackage ../development/interpreters/python/pypy/2.7 {
     self = pypy27;
     python = python27.override{x11Support=true;};
     db = db.override { dbmSupport = true; };
   };
 
+  # Python package sets.
+  python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
+  python34Packages = python34.pkgs;
+  python35Packages = python35.pkgs;
+  python36Packages = recurseIntoAttrs python36.pkgs;
+  pypyPackages = pypy.pkgs;
+
+  # Should eventually be moved inside Python interpreters.
+  python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { };
+
   python2nix = callPackage ../tools/package-management/python2nix { };
 
   pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
@@ -10914,20 +10920,6 @@ with pkgs;
     sqitchModule = perlPackages.AppSqitch;
   };
 
-  ### DEVELOPMENT / PYTHON MODULES
-
-  # Python package sets.
-
-  python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
-
-  python34Packages = python34.pkgs;
-
-  python35Packages = python35.pkgs;
-
-  python36Packages = recurseIntoAttrs python36.pkgs;
-
-  pypyPackages = pypy.pkgs;
-
   ### DEVELOPMENT / R MODULES
 
   R = callPackage ../applications/science/math/R {

From afc6b4310cbde738aa2a7496817000d1ffec160a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 21:33:02 +0200
Subject: [PATCH 2048/3246] Python: build 2.7 and 3.6 packages on Hydra again

---
 pkgs/top-level/release.nix | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f59b2debe86..e73f6f4f112 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -108,24 +108,6 @@ let
       #rPackages = packagePlatforms pkgs.rPackages;
       ocamlPackages = { };
       perlPackages = { };
-      pythonPackages = {
-        blaze = unix;
-        pandas = unix;
-        scikitlearn = unix;
-      };
-      python2Packages = { };
-      python27Packages = { };
-      python3Packages = { };
-      python35Packages = {
-        blaze = unix;
-        pandas = unix;
-        scikitlearn = unix;
-      };
-      python36Packages = {
-        blaze = unix;
-        pandas = unix;
-        scikitlearn = unix;
-      };
 
       # hack around broken eval of non-linux packages for now.
       tests.macOSSierraShared = darwin;

From 9c3702ad35b796a8799ffd6424ede60947ef8e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 21:38:39 +0200
Subject: [PATCH 2049/3246] busybox: downgrade 1.27.1 -> 1.26.2

... to fix our bootstrap tools until we find what exactly is wrong.
This effectively reverts 06a513ee05 and 50831d543d.
Discussion thread: #27746.
---
 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 2548e33bf4c..815e2e0f6ef 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -27,11 +27,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.27.1";
+  name = "busybox-1.26.2";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468";
+    sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

From 59e34685da9450bfac43815b175a345656c0a10c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 13 Aug 2017 15:38:42 -0400
Subject: [PATCH 2050/3246] linux: 4.12.6 -> 4.12.7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index 1cbba85b7ba..a7b6442cb6e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.6";
+  version = "4.12.7";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ywkzqjl9rq672nwn74cw2d871hpzxkrlyx40lkkp4z1y440ijh1";
+    sha256 = "14xyh5wyvp4pmvw4mz9lccw1ijshm7500ijmxzhc9ipjnmp5rhky";
   };
 
   kernelPatches = args.kernelPatches;

From 5c29873e99cd5276175c9b16151eaf675204a6e2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 13 Aug 2017 15:41:45 -0400
Subject: [PATCH 2051/3246] linux: 4.9.42 -> 4.9.43

---
 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 597d87c63fb..40c99cbfd88 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.42";
+  version = "4.9.43";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ivq75vksd8rca881zyfimb6n43clr93gbgkd9w8p4qcj797f18a";
+    sha256 = "1h0fv24pmrwmnpa6zzknqk7swq15z7dhkvy1hvzkjz4bfqgb28mx";
   };
 
   kernelPatches = args.kernelPatches;

From c0769dc6effc042209ede41330946bbe34b9ec90 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 13 Aug 2017 00:17:43 +0200
Subject: [PATCH 2052/3246] nixos/hardened profile: increase ASLR entropy

---
 nixos/modules/profiles/hardened.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 0a0838431da..0ab210cc4c3 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -59,4 +59,10 @@ with lib;
   # the feature at runtime.  Attempting to create a user namespace
   # with unshare will then fail with "no space left on device".
   boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0;
+
+  # Raise ASLR entropy for 64bit & 32bit, respectively.
+  #
+  # Note: mmap_rnd_compat_bits may not exist on 64bit.
+  boot.kernel.sysctl."vm.mmap_rnd_bits" = mkDefault 32;
+  boot.kernel.sysctl."vm.mmap_rnd_compat_bits" = mkDefault 16;
 }

From f91355443282244ce78292b77d88a09e4ff7bb5d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 21:42:30 +0200
Subject: [PATCH 2053/3246] python.pkgs.gst-python: fix Python 3 build

---
 .../libraries/gstreamer/python/default.nix     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 4c3cdd90127..9a4a19d5961 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -1,12 +1,11 @@
-{ fetchurl, stdenv, pkgconfig, pythonPackages
-, gst-plugins-base
-, ncurses
+{ fetchurl, stdenv, pkgconfig, python, pygobject3
+, gst-plugins-base, ncurses
 }:
 
-let
-  inherit (pythonPackages) python pygobject3;
-in stdenv.mkDerivation rec {
-  name = "gst-python-1.10.4";
+stdenv.mkDerivation rec {
+  pname = "gst-python";
+  version = "1.10.4";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     urls = [
@@ -26,11 +25,14 @@ in stdenv.mkDerivation rec {
   buildInputs = [ ncurses ];
 
   preConfigure = ''
-    export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides"
+    export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.sitePackages}/gi/overrides"
   '';
 
   propagatedBuildInputs = [ gst-plugins-base pygobject3 ];
 
+  # Needed for python.buildEnv
+  passthru.pythonPath = [];
+
   meta = {
     homepage = http://gstreamer.freedesktop.org;
 

From d0d87242619e5649078739e34afcdf05f3a52cac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 21:46:01 +0200
Subject: [PATCH 2054/3246] python.pkgs.gst-python: move expression

---
 .../gstreamer/python => python-modules/gst-python}/default.nix  | 0
 .../gst-python}/different-path-with-pygobject.patch             | 0
 pkgs/top-level/python-packages.nix                              | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/{libraries/gstreamer/python => python-modules/gst-python}/default.nix (100%)
 rename pkgs/development/{libraries/gstreamer/python => python-modules/gst-python}/different-path-with-pygobject.patch (100%)

diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
similarity index 100%
rename from pkgs/development/libraries/gstreamer/python/default.nix
rename to pkgs/development/python-modules/gst-python/default.nix
diff --git a/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch b/pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch
similarity index 100%
rename from pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch
rename to pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cd3d0c1cccf..146b7e5ec57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6391,7 +6391,7 @@ in {
     };
   };
 
-  gst-python = callPackage ../development/libraries/gstreamer/python {
+  gst-python = callPackage ../development/python-modules/gst-python {
     gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;
   };
 

From e81e9e82b1712e4a021b42ef77a6c7b432e5b4bc Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 12 Aug 2017 17:20:09 +0200
Subject: [PATCH 2055/3246] zziplib: 0.13.66 -> 0.13.67

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

diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 98215aa0c74..07a6f7ef088 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "zziplib-${version}";
-  version = "0.13.66";
+  version = "0.13.67";
 
   src = fetchurl {
-    url = "mirror://sourceforge/zziplib/zziplib13/${version}/${name}.tar.gz";
-    sha256 = "0zdx0s19slzv79xplnr6jx0xjb01dd71jzpscf6vlj6k9ry8rcar";
+    url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz";
+    sha256 = "0802kdxwxx9zanpwb4w4wfi3blwhv0ri05mzdgd35j5sva5ify0j";
   };
 
   patchPhase = ''

From 6883119ab0bb4c9db7b99e4269ab5091ad95191c Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 13 Aug 2017 13:31:56 -0700
Subject: [PATCH 2056/3246] add some overrides for ghc 7.10.3 to build ghcjs

---
 .../haskell-modules/configuration-ghc-7.10.x.nix            | 6 ++++++
 1 file changed, 6 insertions(+)

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 ffa7030d98b..74e1c21c581 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -164,6 +164,12 @@ self: super: {
   vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms)
     [ self.mtl self.mwc-random ];
 
+  # vector with ghc < 8.0 needs semigroups
+  vector = addBuildDepend super.vector self.semigroups;
+
+  # too strict dependency on directory
+  tasty-ant-xml = doJailbreak super.tasty-ant-xml;
+
   # https://github.com/thoughtpolice/hs-ed25519/issues/13
   ed25519 = dontCheck super.ed25519;
 

From b7bd842fd646bf802623b9da22b873b3c9c40d99 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 12 Aug 2017 18:18:14 +0200
Subject: [PATCH 2057/3246] zexy: fix build

---
 pkgs/applications/audio/pd-plugins/zexy/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix
index 7cd244c9ea4..8b7c2121bd7 100644
--- a/pkgs/applications/audio/pd-plugins/zexy/default.nix
+++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoconf automake puredata ];
 
-  patchPhase = ''
+  preBuild = ''
+    export LD=$CXX
     cd src/
     for i in ${puredata}/include/pd/*; do
       ln -s $i .

From 207ed51615dd7e2aae32f400182f0f45b6064241 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 13 Aug 2017 22:35:25 +0200
Subject: [PATCH 2058/3246] gkrellm: fix installation

Fixes #28239.
---
 pkgs/applications/misc/gkrellm/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index 8654e7f3a26..77ce0327a92 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE
+{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which
 , IOKit ? null }:
 
 with stdenv.lib;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig which ];
   buildInputs = [gettext glib gtk2 libX11 libSM libICE]
     ++ optionals stdenv.isDarwin [ IOKit ];
 
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
        sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
      done '';
 
-   installPhase = ''
-     make DESTDIR=$out install
-     '';
+  makeFlags = [ "STRIP=-s" ];
+  installFlags = [ "DESTDIR=$(out)" ];
 
    meta = {
     description = "Themeable process stack of system monitors";

From 247974025bf909ef6305fd7e878790e2a94f9889 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 13 Aug 2017 22:37:05 +0200
Subject: [PATCH 2059/3246] gkrellm: minor formatting fix

---
 pkgs/applications/misc/gkrellm/default.nix | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index 77ce0327a92..b9cbf8064a0 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -20,22 +20,23 @@ stdenv.mkDerivation rec {
   # Makefiles are patched to fix references to `/usr/X11R6' and to add
   # `-lX11' to make sure libX11's store path is in the RPATH.
   patchPhase = ''
-     echo "patching makefiles..."
-     for i in Makefile src/Makefile server/Makefile
-     do
-       sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
-     done '';
+    echo "patching makefiles..."
+    for i in Makefile src/Makefile server/Makefile
+    do
+      sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
+    done
+  '';
 
   makeFlags = [ "STRIP=-s" ];
   installFlags = [ "DESTDIR=$(out)" ];
 
-   meta = {
+  meta = {
     description = "Themeable process stack of system monitors";
-    longDescription =
-      '' GKrellM is a single process stack of system monitors which supports
-         applying themes to match its appearance to your window manager, Gtk,
-         or any other theme.
-      '';
+    longDescription = ''
+      GKrellM is a single process stack of system monitors which
+      supports applying themes to match its appearance to your window
+      manager, Gtk, or any other theme.
+    '';
 
     homepage = http://gkrellm.srcbox.net;
     license = licenses.gpl3Plus;

From f66b765f769b5eae58bc7786d5439682b1d9e8a6 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 21:52:41 +0000
Subject: [PATCH 2060/3246] lib/maintainers.nix: added sdll

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0f4e6fe2261..5efd472d5f8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -521,6 +521,7 @@
   schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
   scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
+  sdll = "Sasha Illarionov <sasha.delly@gmail.com>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
   shanemikel = "Shane Pearlman <shanemikel1@gmail.com>";

From 58b28484edd8a355403fc31dcf71a6fb0e0fa805 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 22:25:14 +0000
Subject: [PATCH 2061/3246] cymem: init at 1.31.2

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

diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix
new file mode 100644
index 00000000000..f2c6c649a83
--- /dev/null
+++ b/pkgs/development/python-modules/cymem/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, python
+}:
+buildPythonPackage rec {
+  name = "cymem-${version}";
+  version = "1.31.2";
+
+  src = fetchFromGitHub {
+    owner = "explosion";
+    repo = "cymem";
+    rev = "1.31.2";
+    sha256 = "0miznr4kbdzw8yik3m96jmrlmln4qv7z3i3qdp7wjqr51zpqfm1k";
+  };
+
+  propagatedBuildInputs = [
+   cython   
+  ];
+    
+  checkPhase = ''
+    cd cymem/tests
+    ${python.interpreter} -m unittest discover -p "*test*"
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "Cython memory pool for RAII-style memory management";
+    homepage = https://github.com/explosion/cymem;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74be1ab3a76..0f23d36333f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28715,6 +28715,8 @@ EOF
 
   gensim = callPackage  ../development/python-modules/gensim { };
 
+  cymem = callPackage ../development/python-modules/cymem { };
+
 });
 
 in fix' (extends overrides packages)

From fe17ed640a9cf9673b1d3e59affa4903b2992982 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 22:26:02 +0000
Subject: [PATCH 2062/3246] ftfy: init at 4.4.3

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

diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
new file mode 100644
index 00000000000..c0aea987781
--- /dev/null
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, html5lib
+, wcwidth
+, nose
+, python
+}:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "ftfy";
+  version = "4.4.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";        
+  };
+
+  propagatedBuildInputs = [ html5lib wcwidth];
+
+  buildInputs = [
+    nose
+  ];
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Given Unicode text, make its representation consistent and possibly less broken.";
+    homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];    
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f23d36333f..07d20c7f483 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28717,6 +28717,8 @@ EOF
 
   cymem = callPackage ../development/python-modules/cymem { };
 
+  ftfy = callPackage ../development/python-modules/ftfy { };    
+
 });
 
 in fix' (extends overrides packages)

From b5b2890278331ceaa21b237f6aa29fa2a946a5e7 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 22:26:25 +0000
Subject: [PATCH 2063/3246] murmurhash: init at 0.26.4

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

diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
new file mode 100644
index 00000000000..aa5e3358866
--- /dev/null
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, python
+}:
+
+buildPythonPackage rec {
+  name = "murmurhash-${version}";
+  version = "0.26.4";
+  
+  src = fetchFromGitHub {
+    owner = "explosion";
+    repo = "murmurhash";
+    rev = "0.26.4";
+    sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv";    
+  };
+
+  buildInputs = [
+   cython
+  ];
+  
+  checkPhase = ''
+    cd murmurhash/tests
+    ${python.interpreter} -m unittest discover -p "*test*"
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "Cython bindings for MurmurHash2";
+    homepage = https://github.com/explosion/murmurhash;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07d20c7f483..77e33e63a3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28719,6 +28719,8 @@ EOF
 
   ftfy = callPackage ../development/python-modules/ftfy { };    
 
+  murmurhash = callPackage ../development/python-modules/murmurhash { };      
+
 });
 
 in fix' (extends overrides packages)

From 3fe916dd4af296657a193c1dfef5d31deccca364 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 22:27:01 +0000
Subject: [PATCH 2064/3246] plac: init at 0.9.6

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

diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix
new file mode 100644
index 00000000000..4ca6d0e08d1
--- /dev/null
+++ b/pkgs/development/python-modules/plac/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+}:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "plac";
+  version = "0.9.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16zqpalx4i1n1hrcvaj8sdixapy2g76fc13bbahz0xc106d72gxs";
+  };
+
+  checkPhase = ''
+      cd doc
+      ${python.interpreter} -m unittest discover -p "*test_plac*"
+    '';
+  
+  meta = with stdenv.lib; {
+    description = "Parsing the Command Line the Easy Way";
+    homepage = https://github.com/micheles/plac;
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 77e33e63a3e..3f944c7077f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28721,6 +28721,8 @@ EOF
 
   murmurhash = callPackage ../development/python-modules/murmurhash { };      
 
+  plac = callPackage ../development/python-modules/plac { };        
+
 });
 
 in fix' (extends overrides packages)

From f1ce370b8e91dbc0e255456610a9f1b292114b40 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Mon, 15 May 2017 10:06:47 +0000
Subject: [PATCH 2065/3246] preshed: init at 1.0.0

---
 .../python-modules/preshed/default.nix        | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/preshed/default.nix

diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix
new file mode 100644
index 00000000000..d82408e620e
--- /dev/null
+++ b/pkgs/development/python-modules/preshed/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, cython
+, cymem
+, python
+}:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "preshed";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1pdl4p2d32ficfh18xdkgsj6ajzdxc6mxhhf84z0wq1l8viskcx6";
+  };
+
+  propagatedBuildInputs = [
+   cython
+   cymem
+  ];
+  buildInputs = [
+    pytest
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} setup.py test
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "Cython hash tables that assume keys are pre-hashed";
+    homepage = https://github.com/explosion/preshed;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f944c7077f..9a394641373 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28721,8 +28721,12 @@ EOF
 
   murmurhash = callPackage ../development/python-modules/murmurhash { };      
 
+
   plac = callPackage ../development/python-modules/plac { };        
 
+
+  preshed = callPackage ../development/python-modules/preshed { };
+
 });
 
 in fix' (extends overrides packages)

From ea418720d79fc2115e7c95474e77182b6f4e6924 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Mon, 15 May 2017 10:08:30 +0000
Subject: [PATCH 2066/3246] thinc: init at 1.0.1

---
 .../python-modules/thinc/default.nix          | 84 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 +-
 2 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/thinc/default.nix

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
new file mode 100644
index 00000000000..817ea6388f9
--- /dev/null
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -0,0 +1,84 @@
+{ stdenv
+, pkgs
+, buildPythonPackage
+, fetchPypi
+, fetchFromGitHub
+, pytest
+, cython
+, cymem
+, preshed
+, numpy
+, python
+, murmurhash
+, hypothesis
+, tqdm
+, cytoolz
+, plac
+, six
+, mock
+, termcolor
+, wrapt
+, dill
+}:
+
+let
+  enableDebugging = true;
+
+  pathlibLocked = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "pathlib";
+    version = "1.0.1";
+
+    src = fetchPypi {
+      inherit pname version;      
+      sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39";
+    };
+
+    doCheck = false; # fails to import support from test
+  };
+in buildPythonPackage rec {
+  name = "thinc-${version}";
+  version = "6.5.1";
+
+  src = fetchFromGitHub {
+    owner = "explosion";
+    repo = "thinc";
+    rev = "v${version}";
+    sha256 = "008kmjsvanh6qgnpvsn3qacfcyprxirxbw4yfd8flyg7mxw793ws";    
+  };
+
+  propagatedBuildInputs = [
+   cython
+   cymem
+   preshed
+   numpy
+   murmurhash
+   pytest
+   hypothesis
+   tqdm
+   cytoolz
+   plac
+   six
+   mock
+   termcolor
+   wrapt
+   dill
+   pathlibLocked
+  ];
+
+  doCheck = false;
+  
+  # fails to import some modules
+  # checkPhase = ''
+  #   ${python.interpreter} -m pytest thinc/tests
+  #   # cd thinc/tests
+  #   # ${python.interpreter} -m unittest discover -p "*test*"
+  # '';
+  
+  meta = with stdenv.lib; {
+    description = "Practical Machine Learning for NLP in Python";
+    homepage = https://github.com/explosion/thinc;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a394641373..7572a28ac84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28721,12 +28721,12 @@ EOF
 
   murmurhash = callPackage ../development/python-modules/murmurhash { };      
 
-
   plac = callPackage ../development/python-modules/plac { };        
-
-
+  
   preshed = callPackage ../development/python-modules/preshed { };
 
+  thinc = callPackage ../development/python-modules/thinc { };  
+
 });
 
 in fix' (extends overrides packages)

From 96dc15f2c9790029cfd7d4b19c35d43a0e9e4583 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Mon, 15 May 2017 10:09:39 +0000
Subject: [PATCH 2067/3246] spacy: init at 1.8.2

---
 .../python-modules/spacy/default.nix          | 76 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/development/python-modules/spacy/default.nix

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
new file mode 100644
index 00000000000..452f3f1d923
--- /dev/null
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -0,0 +1,76 @@
+{ stdenv
+, pkgs
+, buildPythonPackage
+, python
+, fetchPypi
+, fetchFromGitHub
+, pytest 
+, cython
+, cymem
+, preshed
+, pathlib2
+, numpy
+, murmurhash
+, plac
+, six
+, ujson
+, dill
+, requests
+, ftfy
+, thinc
+, pip
+}:
+let
+  enableDebugging = true;
+  regexLocked = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "regex";
+    version = "2017.04.05";
+
+    src = fetchPypi {
+      inherit pname version;      
+      sha256 = "0c95gf3jzz8mv52lkgq0h7sbasjwvdhghm4s0phmy5k9sr78f4fq";
+    };
+  };
+in buildPythonPackage rec {
+  name = "spacy-${version}";
+  version = "1.8.2";
+
+  src = fetchFromGitHub {
+    owner = "explosion";
+    repo = "spaCy";
+    rev = "v${version}";
+    sha256 = "0v3bmmar31a6968y4wl0lmgnc3829l2mnwd8s959m4pqw1y1w648";    
+  };  
+
+  propagatedBuildInputs = [
+   cython
+   cymem
+   pathlib2
+   preshed
+   numpy
+   murmurhash
+   plac
+   six
+   ujson
+   dill
+   requests
+   regexLocked
+   ftfy
+   thinc
+   pytest
+   pip
+  ];
+
+  doCheck = false;
+  # checkPhase = ''
+  #   ${python.interpreter} -m pytest spacy/tests --vectors --models --slow
+  # '';  
+  
+  meta = with stdenv.lib; {
+    description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython";
+    homepage = https://github.com/explosion/spaCy;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7572a28ac84..9fe6d253b01 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28727,6 +28727,7 @@ EOF
 
   thinc = callPackage ../development/python-modules/thinc { };  
 
+  spacy = callPackage ../development/python-modules/spacy { };  
 });
 
 in fix' (extends overrides packages)

From 5dc63e69dbc4acacdbf08fee71be994b15829f50 Mon Sep 17 00:00:00 2001
From: Wisut Hantanong <wizzup@users.noreply.github.com>
Date: Mon, 14 Aug 2017 03:58:35 +0700
Subject: [PATCH 2068/3246] pythonPackages.django_extensions : init at 1.8.1
 (#27378)

* add django-extensions 1.8.1

* enable testing

* use propagatedBuildInputs
---
 .../django-extensions/default.nix             | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-extensions/default.nix

diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
new file mode 100644
index 00000000000..13f35d110c7
--- /dev/null
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, vobject, mock, tox, pytestcov, pytest-django, pytest, shortuuid
+, django, six
+}:
+
+buildPythonPackage rec {
+  pname = "django-extensions";
+  version = "1.8.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "${pname}";
+    repo = "${pname}";
+    rev = "${version}";
+    sha256 = "08rd9zswvjb9dixzyd3p3l3hw3wwhqkgyjvid65niybzjl1xdb5h";
+  };
+
+  buildInputs = [ vobject mock tox pytestcov pytest-django pytest shortuuid ];
+
+  propagatedBuildInputs = [ django six ];
+
+  meta = with stdenv.lib; {
+    description = "A collection of custom extensions for the Django Framework";
+    homepage = https://github.com/django-extensions/django-extensions;
+    licenses = [ licenses.mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9fe6d253b01..c053ca7450c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8968,6 +8968,8 @@ in {
     };
   };
 
+  django_extensions = callPackage ../development/python-modules/django-extensions { };
+
   django_guardian = callPackage ../development/python-modules/django_guardian.nix { };
 
   django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };

From 6c41803f02b387db31cd8982ec866d5f1799ded1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 13 Aug 2017 22:43:41 +0200
Subject: [PATCH 2069/3246] ldns: get rid of reference to openssl.dev

Reduces size from ~100MB to ~40M.
---
 pkgs/development/libraries/ldns/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 88586cdabba..f465cf1cc44 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
     make
     make install
     popd
+
+    sed -i "$out/lib/libldns.la" -e "s,-L${openssl.dev},-L${openssl.out},g"
   '';
 
   meta = with stdenv.lib; {

From 1995dbf7722d8dcb71c2e7585a249ea49d628876 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 13 Aug 2017 14:47:31 -0700
Subject: [PATCH 2070/3246] obs-studio: 20.0.0 -> 20.0.1

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

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index b0214f4faa3..3707f32c9d3 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -26,13 +26,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "20.0.0";
+  version = "20.0.1";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "07xjrr86722b05f88z77hzcrkkdlcz3pndaw600ip5xqhsyjy330";
+    sha256 = "1f701rh4w88ba48b50y16fvmzzsyv4y5nv30mrx3pb2ni7wyanld";
   };
 
   patches = [ ./find-xcb.patch ];

From ed0af35697f1846e2ea2c03cb721618b6cd2eb96 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sun, 13 Aug 2017 17:07:27 +0300
Subject: [PATCH 2071/3246] wineUnstable: 2.13 -> 2.14

Staging updated as well
---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index ac27f0f1505..479726e1304 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.13";
+    version = "2.14";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "1y3yb01lg90pi8a9qjmymg7kikwkmvpkjxi6bbk1q1lvs7fs7g3g";
+    sha256 = "1ilmhwm7vlp4fbl5a5m3rwwfw8g821gkjkd01ih2ixw1a7ck9y83";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1ivjx5pf0xqqmdc1k5skg9saxgqzh3x01vjgypls7czmnpp3aylb";
+    sha256 = "0mbklg0q3k5iavmwfbrwq4p8589ayikwq5q9wk87885xv32g176g";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 276d7477f8930053d898818c2c5f10c04c5bc765 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 13 Aug 2017 23:43:58 +0200
Subject: [PATCH 2072/3246] josm: 12450 -> 12545

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 2431e7b7cbb..e03abb8bf95 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "12450";
+  version = "12545";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1l817mclbzyin9yh16q9jcqi31cz0qy6yi31hc8jp5ablknk979j";
+    sha256 = "0817mjc4118b5hhfvx67bib1lhcg8mdkzibrpa2mb7hrv38q56y4";
   };
 
   phases = [ "installPhase" ];

From fbfe53b12ff42f376514fce2bc588d3ffd6a3aea Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 13 Aug 2017 23:52:34 +0200
Subject: [PATCH 2073/3246] eclipse-plugin-autodetect-encoding: 1.8.3 -> 1.8.4

---
 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 44c1ebcecfd..a3b4193edc6 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -129,16 +129,16 @@ rec {
 
   autodetect-encoding = buildEclipsePlugin rec {
     name = "autodetect-encoding-${version}";
-    version = "1.8.3.201610171338";
+    version = "1.8.4.201708052053";
 
     srcFeature = fetchurl {
       url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar";
-      sha256 = "09xfn5j6vr9r7n0riqs5ja5ms98ax9pyi3f7irnv80flhzagdv7f";
+      sha256 = "1gbvib5dd75pp5mr17ckj2y66gnxjvpc067im5nsl9fyljdw867c";
     };
 
     srcPlugin = fetchurl {
       url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar";
-      sha256 = "0l2zw4whx1a7j0jl7i6n6igr2ki6jh6nwggx53n3ipzg7cgdcg0y";
+      sha256 = "0728zsbfs1mc4qvx2p92hkxpnknckqk0xvqlmzivsnr62b5qd5im";
     };
 
     meta = with stdenv.lib; {

From 059d722e5ce492917d6c48e9137f8df208231503 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 13 Aug 2017 22:29:00 +0200
Subject: [PATCH 2074/3246] sshfs-fuse: 2.9 -> 2.10

---
 pkgs/tools/filesystems/sshfs-fuse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index dd49b19358c..c1502a3227d 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "2.9";
+  version = "2.10"; # Temporary (need to add libfuse 3.x first)
   name = "sshfs-fuse-${version}";
   
   src = fetchFromGitHub {
-    repo = "sshfs";
     owner = "libfuse";
+    repo = "sshfs";
     rev = "sshfs-${version}";
-    sha256 = "1n0cq72ps4dzsh72fgfprqn8vcfr7ilrkvhzpy5500wjg88diapv";
+    sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1";
   };
   
   buildInputs = [ pkgconfig glib fuse autoreconfHook ];
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/libfuse/sshfs;
+    inherit (src.meta) homepage;
     description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ primeos ];
   };
 }

From e6157451c18f884b37c14a69f585900c0107dccf Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 12 Aug 2017 22:04:00 +0200
Subject: [PATCH 2075/3246] nixos/munin: scripts need to be executable in order
 to build a wrapper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"Builder called die: Cannot wrap
/nix/store/XXX-munin-available-plugins/plugin.sh because it is not an
executable file"

[Bjørn: Keep DRY, quote "$file".]
---
 nixos/modules/services/monitoring/munin.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index b26bcba6405..723b04dc0fe 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -26,7 +26,9 @@ let
 
       for file in $out/*; do
         case "$file" in
-            plugin.sh) continue;;
+            */plugin.sh|*/plugins.history)
+              chmod +x "$file"
+              continue;;
         esac
 
         # read magic makers from the file

From 3317c71c5c629939e434288390c1d26506160d13 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 12 Aug 2017 00:54:28 +0200
Subject: [PATCH 2076/3246] grub2: 2.x-2015-11-16 -> 2.02

Fixes #24451.
---
 pkgs/tools/misc/grub/2.0x.nix | 38 +++++++++--------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 634022e88e0..5b9130bbe0e 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake
-, gettext, ncurses, libusb, freetype, qemu, devicemapper
+, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont
 , zfs ? null
 , efiSupport ? false
 , zfsSupport ? true
@@ -30,18 +30,7 @@ let
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.x-2015-11-16";
-
-  unifont_bdf = fetchurl {
-    url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
-    sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
-  };
-
-  po_src = fetchurl {
-    name = "grub-2.02-beta2.tar.gz";
-    url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
-    sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm";
-  };
+  version = "2.02";
 
 in (
 
@@ -52,13 +41,12 @@ assert !(efiSupport && xenSupport);
 stdenv.mkDerivation rec {
   name = "grub-${version}";
 
-  src = fetchFromSavannah {
-    repo = "grub";
-    rev = "50d6f38febe80d4d3088dae1ee639b341787ab71";
-    sha256 = "1pyn2qa8hwiabhgnzj86y4b69y4a37dh5n0j4csmm7xmgc13vvww";
+  src = fetchurl {
+    url = "mirror://gnu/grub/${name}.tar.xz";
+    sha256 = "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1";
   };
 
-  nativeBuildInputs = [ autogen flex bison python autoconf automake ];
+  nativeBuildInputs = [ bison flex python ];
   buildInputs = [ ncurses libusb freetype gettext devicemapper ]
     ++ optional doCheck qemu
     ++ optional zfsSupport zfs;
@@ -68,6 +56,10 @@ stdenv.mkDerivation rec {
   # Work around a bug in the generated flex lexer (upstream flex bug?)
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
+  postPatch = ''
+    substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
+  '';
+
   preConfigure =
     '' for i in "tests/util/"*.in
        do
@@ -89,16 +81,6 @@ stdenv.mkDerivation rec {
       unset CPP # setting CPP intereferes with dependency calculation
     '';
 
-  prePatch =
-    '' tar zxf ${po_src} grub-2.02~beta2/po
-       rm -rf po
-       mv grub-2.02~beta2/po po
-       sh autogen.sh
-       gunzip < "${unifont_bdf}" > "unifont.bdf"
-       sed -i "configure" \
-           -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
-    '';
-
   patches = [ ./fix-bash-completion.patch ];
 
   configureFlags = optional zfsSupport "--enable-libzfs"

From eb9f427d4e23af7f7da051e640024bf99a72f343 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 14 Aug 2017 07:55:31 +0200
Subject: [PATCH 2077/3246] zfs: use multiple outputs

Some dev headers are especially large.
---
 pkgs/os-specific/linux/zfs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 6d3ad657140..48389a758b7 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -107,6 +107,8 @@ in stdenv.mkDerivation rec {
     rm -rf $out/share/zfs/zfs-tests
   '';
 
+  outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ];
+
   meta = {
     description = "ZFS Filesystem Linux Kernel module";
     longDescription = ''

From e3d10cfc1c840423ff2d84bfcf538e2619a82aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 14 Aug 2017 08:45:16 +0200
Subject: [PATCH 2078/3246] pango: revert the doCheck = true change

I messed up the testing; I'm really sorry.
---
 pkgs/development/libraries/pango/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 0e4099d6fe5..29a69bee0c7 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = stdenv.host.isLinux;
+  doCheck = false; # test-layout fails on 1.40.3 (fails to find font config)
   # jww (2014-05-05): The tests currently fail on Darwin:
   #
   # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)

From b04a77a1d4f63b82e0babb57435e3c2f67be2dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 14 Aug 2017 08:45:58 +0200
Subject: [PATCH 2079/3246] wayland-protocols: 1.7 -> 1.10

Needed for gtk3 to build after the minor updates.
---
 pkgs/development/libraries/wayland/protocols.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index dda1bd36976..436de5609e5 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "wayland-protocols-${version}";
-  version = "1.7";
+  version = "1.10";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "07qw166s6bm81zfnhf4lmww6wj0il960fm3vp7n1z3rign9jlpv3";
+    sha256 = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 26b7edae2b846cc21bd93542211172de28f2d9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 14 Aug 2017 09:15:10 +0200
Subject: [PATCH 2080/3246] gdk-pixbuf: downgrade a bit for now

Updating higher will be tricky.
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 906822b40f3..38c1b6197a5 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,16 @@
 
 let
   ver_maj = "2.36";
-  ver_min = "8";
+  ver_min = "7";
+  # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
+  # which apparently requires access to shared_mime_info files during runtime.
 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 = "5d68e5283cdc0bf9bda99c3e6a1d52ad07a03364fa186b6c26cfc86fcd396a19";
+    sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 817fdff7d4fdd782237d13cb40baca7b74404c4e Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 28 Jul 2017 11:17:55 +0200
Subject: [PATCH 2081/3246] pythonPackages.lxml: 3.7.2 -> 3.8.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cd3d0c1cccf..b72e6f75cd5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12218,11 +12218,11 @@ in {
 
 
   lxml = buildPythonPackage ( rec {
-    name = "lxml-3.7.2";
+    name = "lxml-3.8.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/l/lxml/${name}.tar.gz";
-      sha256 = "02j1wf3sh2qmswcz3rh0xvsb8jm63ifaiz2bkng93hyvc1iignar";
+      sha256 = "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk";
     };
 
     buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];

From 791e440817166e7215ae6d6dc54828f7de670c01 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 28 Jul 2017 11:19:13 +0200
Subject: [PATCH 2082/3246] pythonPackages.html5-parser: init at 0.4.3

---
 .../python-modules/html5-parser/default.nix   | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/html5-parser/default.nix

diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
new file mode 100644
index 00000000000..549dcb89bf7
--- /dev/null
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }:
+
+buildPythonPackage rec {
+  pname = "html5-parser";
+  version = "0.4.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "173vzg214x7qfq201m4b09wg5nszdgwjw5q02v23k54iqm3kcpnx";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ];
+
+  doCheck = false; # No such file or directory: 'run_tests.py'
+
+  meta = with stdenv.lib; {
+    description = "Fast C based HTML 5 parsing for python";
+    homepage = https://html5-parser.readthedocs.io;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b72e6f75cd5..39c73e6f6e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2085,6 +2085,8 @@ in {
     };
   };
 
+  html5-parser = callPackage ../development/python-modules/html5-parser {};
+
   httpserver = callPackage ../development/python-modules/httpserver {};
 
   bleach = buildPythonPackage rec {

From d87f53baf90f4d7505c63916d75e89daac9de1eb Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 28 Jul 2017 17:46:54 +0200
Subject: [PATCH 2083/3246] calibre: 3.3.0 -> 3.5.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 8341898fa23..6ca457cc1d3 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.3.0";
+  version = "3.5.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c";
+    sha256 = "1al0vy11zvlxlrf03i631p6b419hy47pbzmgydswrii4prndj4xv";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
     # Remove unneeded files and libs
     rm -rf resources/calibre-portable.* \
-           src/{chardet,cherrypy,html5lib,odf,routes}
+           src/odf
   '';
 
   dontUseQmakeConfigure = true;
@@ -49,12 +49,11 @@ stdenv.mkDerivation rec {
     poppler_utils libpng imagemagick libjpeg
     fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
   ] ++ (with python2Packages; [
-    html5lib_0_9999999 # needs to be before mechanize ?
-    apsw cssselect cssutils dateutil lxml mechanize netifaces pillow
+    apsw cssselect cssutils dateutil html5-parser lxml mechanize netifaces pillow
     python pyqt5 sip
     regex msgpack
     # the following are distributed with calibre, but we use upstream instead
-    chardet cherrypy odfpy routes
+    odfpy
   ]);
 
   installPhase = ''
@@ -91,6 +90,9 @@ stdenv.mkDerivation rec {
       substituteAllInPlace $entry
     done
 
+    mkdir -p $out/share
+    cp -a man-pages $out/share/man
+
     runHook postInstall
   '';
 

From b73ae0a695f3fec59d4d0c4613496e40e3c795c4 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 14 Aug 2017 11:13:49 +0300
Subject: [PATCH 2084/3246] maxx: move deps from module to package

---
 .../services/x11/desktop-managers/maxx.nix        | 15 ---------------
 pkgs/desktops/maxx/default.nix                    | 12 ++++++++++--
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
index bceb23c276e..6a698658bdd 100644
--- a/nixos/modules/services/x11/desktop-managers/maxx.nix
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -5,20 +5,9 @@ with lib;
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.maxx;
-  deps = [ pkgs.gcc ] ++ cfg.extraPackages;
 in {
   options.services.xserver.desktopManager.maxx = {
     enable = mkEnableOption "MaXX desktop environment";
-
-    extraPackages = mkOption {
-      type = with types; listOf package;
-      default = with pkgs; [
-        xorg.xclock xsettingsd
-      ];
-      description = ''
-        Extra packages visible to session.
-      '';
-    };
   };
 
   config = mkIf (xcfg.enable && cfg.enable) {
@@ -33,10 +22,6 @@ in {
     services.xserver.desktopManager.session = [
     { name = "MaXX";
       start = ''
-        export PATH="${makeBinPath deps}:$PATH"
-        export GTK_PATH="${pkgs.gtk-engine-murrine}/lib/gtk-2.0:${pkgs.gtk_engines}/lib/gtk-2.0:$GTK_PATH"
-        export GDK_PIXBUF_MODULE_FILE=$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)
-
         exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt
       '';
     }];
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 8cceb5a05d3..5bcc6e84152 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, makeWrapper
 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
 , libXinerama, libXdamage, libICE, libXtst, libXaw
 , fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses
-, bash }:
+, gcc, xclock, xsettingsd, bash, gtk-engine-murrine, gtk_engines, librsvg }:
 
 let
   version = "Indy-1.1.0";
@@ -26,6 +26,8 @@ in stdenv.mkDerivation {
     })
   ];
 
+  buildInputs = [ makeWrapper ];
+
   buildPhase = ''
     while IFS= read -r -d $'\0' i; do
       if isELF "$i"; then
@@ -47,8 +49,14 @@ in stdenv.mkDerivation {
 
     mv -- ./* "$maxx"
     ln -s $maxx/share/icons $out/share
+
+    wrapProgram $maxx/etc/skel/Xsession.dt \
+      --prefix GTK_PATH : "${gtk-engine-murrine}/lib/gtk-2.0:${gtk_engines}/lib/gtk-2.0" \
+      --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)"
   '';
 
+  propagatedUserEnvPkgs = [ gcc xclock xsettingsd ];
+
   meta = with stdenv.lib; {
     description = "A replica of IRIX Interactive Desktop";
     homepage = http://www.maxxinteractive.com;

From c5ec8cf5233cfb0a872e78a533e56497ca21764d Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 8 Aug 2017 11:34:09 +0200
Subject: [PATCH 2085/3246] frog: init at v0.13.7

---
 .../libraries/languagemachines/frog.nix       | 53 +++++++++++++
 .../libraries/languagemachines/frogdata.nix   | 31 ++++++++
 .../libraries/languagemachines/libfolia.nix   | 30 +++++++
 .../mbt-add-libxml2-dep.patch                 | 13 +++
 .../libraries/languagemachines/mbt.nix        | 40 ++++++++++
 .../libraries/languagemachines/packages.nix   | 14 ++++
 .../release-info/LanguageMachines-frog.json   |  5 ++
 .../LanguageMachines-frogdata.json            |  5 ++
 .../LanguageMachines-libfolia.json            |  5 ++
 .../release-info/LanguageMachines-mbt.json    |  5 ++
 .../LanguageMachines-ticcutils.json           |  5 ++
 .../release-info/LanguageMachines-timbl.json  |  5 ++
 .../LanguageMachines-timblserver.json         |  5 ++
 .../release-info/LanguageMachines-ucto.json   |  5 ++
 .../LanguageMachines-uctodata.json            |  5 ++
 .../libraries/languagemachines/test.nix       | 25 ++++++
 .../libraries/languagemachines/ticcutils.nix  | 29 +++++++
 .../libraries/languagemachines/timbl.nix      | 36 +++++++++
 .../languagemachines/timblserver.nix          | 37 +++++++++
 .../libraries/languagemachines/ucto.nix       | 48 +++++++++++
 .../libraries/languagemachines/uctodata.nix   | 32 ++++++++
 .../libraries/languagemachines/update         | 79 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 23 files changed, 516 insertions(+)
 create mode 100644 pkgs/development/libraries/languagemachines/frog.nix
 create mode 100644 pkgs/development/libraries/languagemachines/frogdata.nix
 create mode 100644 pkgs/development/libraries/languagemachines/libfolia.nix
 create mode 100644 pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch
 create mode 100644 pkgs/development/libraries/languagemachines/mbt.nix
 create mode 100644 pkgs/development/libraries/languagemachines/packages.nix
 create mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
 create mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
 create mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json
 create mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json
 create mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json
 create mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json
 create mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json
 create mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
 create mode 100644 pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json
 create mode 100644 pkgs/development/libraries/languagemachines/test.nix
 create mode 100644 pkgs/development/libraries/languagemachines/ticcutils.nix
 create mode 100644 pkgs/development/libraries/languagemachines/timbl.nix
 create mode 100644 pkgs/development/libraries/languagemachines/timblserver.nix
 create mode 100644 pkgs/development/libraries/languagemachines/ucto.nix
 create mode 100644 pkgs/development/libraries/languagemachines/uctodata.nix
 create mode 100755 pkgs/development/libraries/languagemachines/update

diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix
new file mode 100644
index 00000000000..c80c28eb14b
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/frog.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl
+, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, libxml2, icu
+, languageMachines
+}:
+
+let
+  release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-frog.json);
+in
+
+stdenv.mkDerivation {
+  name = "frog";
+  version = release.version;
+  src = fetchurl { inherit (release) url sha256;
+                   name = "frog-${release.version}.tar.gz"; };
+  buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive
+                  libxml2 icu
+                  languageMachines.ticcutils
+                  languageMachines.timbl
+                  languageMachines.mbt
+                  languageMachines.libfolia
+                  languageMachines.ucto
+                  languageMachines.frogdata
+                ];
+
+  preConfigure = ''
+    sh bootstrap.sh
+  '';
+  postInstall = ''
+    # frog expects the data files installed in the same prefix
+    mkdir -p $out/share/frog/;
+    for f in ${languageMachines.frogdata}/share/frog/*; do
+      ln -s $f $out/share/frog/;
+    done;
+
+    make check
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch";
+    homepage    = https://languagemachines.github.io/frog;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ roberth ];
+
+    longDescription = ''
+      Frog is an integration of memory-based natural language processing (NLP) modules developed for Dutch. All NLP modules are based on Timbl, the Tilburg memory-based learning software package. Most modules were created in the 1990s at the ILK Research Group (Tilburg University, the Netherlands) and the CLiPS Research Centre (University of Antwerp, Belgium). Over the years they have been integrated into a single text processing tool, which is currently maintained and developed by the Language Machines Research Group and the Centre for Language and Speech Technology at Radboud University Nijmegen. A dependency parser, a base phrase chunker, and a named-entity recognizer module were added more recently. Where possible, Frog makes use of multi-processor support to run subtasks in parallel.
+
+      Various (re)programming rounds have been made possible through funding by NWO, the Netherlands Organisation for Scientific Research, particularly under the CGN project, the IMIX programme, the Implicit Linguistics project, the CLARIN-NL programme and the CLARIAH programme.
+    '';
+  };
+
+}
diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix
new file mode 100644
index 00000000000..d9578c380e6
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/frogdata.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl
+, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, libxml2, icu
+, languageMachines
+}:
+
+let
+  release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-frogdata.json);
+in
+
+stdenv.mkDerivation {
+  name = "frogdata";
+  version = release.version;
+  src = fetchurl { inherit (release) url sha256;
+                   name = "frogdata-${release.version}.tar.gz"; };
+  buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive
+                ];
+
+  preConfigure = ''
+    sh bootstrap.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch";
+    homepage    = https://languagemachines.github.io/frog;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ roberth ];
+  };
+
+}
diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix
new file mode 100644
index 00000000000..9cddbdd22d9
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/libfolia.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl
+, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, libxml2, icu
+, languageMachines }:
+
+let
+  release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-libfolia.json);
+in
+
+stdenv.mkDerivation {
+  name = "libfolia";
+  version = release.version;
+  src = fetchurl { inherit (release) url sha256;
+                   name = "libfolia-${release.version}.tar.gz"; };
+  buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive libxml2 icu languageMachines.ticcutils ];
+  preConfigure = "sh bootstrap.sh";
+
+  meta = with stdenv.lib; {
+    description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format.";
+    homepage    = https://proycon.github.io/folia/;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ roberth ];
+
+    longDescription = ''
+      A high-level C++ API to read, manipulate, and create FoLiA documents. FoLiA is an XML-based annotation format, suitable for the representation of linguistically annotated language resources. FoLiA’s intended use is as a format for storing and/or exchanging language resources, including corpora.
+    '';
+  };
+
+}
diff --git a/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch b/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch
new file mode 100644
index 00000000000..9037f1093bb
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/mbt-add-libxml2-dep.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac	2017-06-12 06:48:15.000000000 +0200
++++ b/configure.ac	2017-06-12 06:50:06.000000000 +0200
+@@ -76,6 +76,10 @@
+ CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS"
+ LIBS="$LIBS $ticcutils_LIBS"
+ 
++PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.6.16] )
++CXXFLAGS="$CXXFLAGS $libxml2_CFLAGS"
++LIBS="$LIBS $libxml2_LIBS"
++
+ AC_CONFIG_FILES([
+   Makefile
+   mbt.pc
diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix
new file mode 100644
index 00000000000..0ba7e686e43
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/mbt.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl
+, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, libxml2
+, languageMachines
+}:
+
+let
+  release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-mbt.json);
+in
+
+stdenv.mkDerivation {
+  name = "mbt";
+  version = release.version;
+  src = fetchurl { inherit (release) url sha256;
+                   name = "mbt-${release.version}.tar.gz"; };
+  buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive
+                  libxml2
+                  languageMachines.ticcutils
+                  languageMachines.timbl
+                ];
+  patches = [ ./mbt-add-libxml2-dep.patch ];
+  preConfigure = ''
+    sh bootstrap.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Memory Based Tagger";
+    homepage    = https://languagemachines.github.io/mbt/;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ roberth ];
+
+    longDescription = ''
+      MBT is a memory-based tagger-generator and tagger in one. The tagger-generator part can generate a sequence tagger on the basis of a training set of tagged sequences; the tagger part can tag new sequences. MBT can, for instance, be used to generate part-of-speech taggers or chunkers for natural language processing. It has also been used for named-entity recognition, information extraction in domain-specific texts, and disfluency chunking in transcribed speech.
+
+      Mbt is used by Frog for Dutch tagging.
+    '';
+  };
+
+}
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
new file mode 100644
index 00000000000..c2d449ed13c
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -0,0 +1,14 @@
+{ callPackage }:
+{
+  ticcutils = callPackage ./ticcutils.nix { };
+  libfolia = callPackage ./libfolia.nix { };
+  ucto = callPackage ./ucto.nix { };
+  uctodata = callPackage ./uctodata.nix { };
+  timbl = callPackage ./timbl.nix { };
+  timblserver = callPackage ./timblserver.nix { };
+  mbt = callPackage ./mbt.nix { };
+  frog = callPackage ./frog.nix { };
+  frogdata = callPackage ./frogdata.nix { };
+
+  test = callPackage ./test.nix { };
+}
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
new file mode 100644
index 00000000000..55c2ec20a31
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
@@ -0,0 +1,5 @@
+{
+  "version": "v0.13.7",
+  "url": "https://api.github.com/repos/LanguageMachines/frog/tarball/v0.13.7",
+  "sha256": "0swyfi3g862n888qj8v8kd18745hasy0vnc70i9qlv0ji0321bnf"
+}
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
new file mode 100644
index 00000000000..1147322be6d
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
@@ -0,0 +1,5 @@
+{
+  "version": "v0.13",
+  "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13",
+  "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg"
+}
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json
new file mode 100644
index 00000000000..792d958213f
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-libfolia.json
@@ -0,0 +1,5 @@
+{
+  "version": "v1.7",
+  "url": "https://api.github.com/repos/LanguageMachines/libfolia/tarball/v1.7",
+  "sha256": "0hpxdry7n2887klryc587xv46p6z6jp6hz9x7k2pk5v7jb0z4s65"
+}
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json
new file mode 100644
index 00000000000..f1bbff47a28
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-mbt.json
@@ -0,0 +1,5 @@
+{
+  "version": "v3.2.16",
+  "url": "https://api.github.com/repos/LanguageMachines/mbt/tarball/v3.2.16",
+  "sha256": "0f9f5l84m0lmmv4km9myn3yhy67jbmk3qn2fi40dy025gx4l0x3x"
+}
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json
new file mode 100644
index 00000000000..11069c6b02c
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ticcutils.json
@@ -0,0 +1,5 @@
+{
+  "version": "v0.15",
+  "url": "https://api.github.com/repos/LanguageMachines/ticcutils/tarball/v0.15",
+  "sha256": "0lssb1klx2flmr6fy78j37i5lbq3gfhzjx24j6n72ndm2rvprvcn"
+}
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json
new file mode 100644
index 00000000000..d35f2c8333a
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timbl.json
@@ -0,0 +1,5 @@
+{
+  "version": "v6.4.9",
+  "url": "https://api.github.com/repos/LanguageMachines/timbl/tarball/v6.4.9",
+  "sha256": "1279npc3xlq05hnkylpbkgg941gjhvl6sd5fw4vgwcx2rwmmlaay"
+}
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json
new file mode 100644
index 00000000000..d588da3f8b6
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-timblserver.json
@@ -0,0 +1,5 @@
+{
+  "version": "v1.11",
+  "url": "https://api.github.com/repos/LanguageMachines/timblserver/tarball/v1.11",
+  "sha256": "02k8c704wr5miy82w6zj0imm7sdfnxf3db34qiaa8l3myhn17qlw"
+}
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
new file mode 100644
index 00000000000..9b05cf3e139
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
@@ -0,0 +1,5 @@
+{
+  "version": "v0.9.6",
+  "url": "https://api.github.com/repos/LanguageMachines/ucto/tarball/v0.9.6",
+  "sha256": "0fxq4j32g7kp6789xz23651c4v2j7zlz87cshfv9g1xjs7jxns3f"
+}
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json
new file mode 100644
index 00000000000..08069bb333b
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-uctodata.json
@@ -0,0 +1,5 @@
+{
+  "version": "v0.4",
+  "url": "https://api.github.com/repos/LanguageMachines/uctodata/tarball/v0.4",
+  "sha256": "02c78qmwi9ijpk5wila3p62fmfdy1rpmlvvzbxs3wg0rdb0nwvd2"
+}
diff --git a/pkgs/development/libraries/languagemachines/test.nix b/pkgs/development/libraries/languagemachines/test.nix
new file mode 100644
index 00000000000..48c41ac52f2
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/test.nix
@@ -0,0 +1,25 @@
+{ runCommand
+, languageMachines
+}:
+
+runCommand "frog-test" {} ''
+  ${languageMachines.frog}/bin/frog >$out <<EOF
+  Dit is een test
+  
+  EOF
+  echo "Frog output:"
+  cat $out
+
+  expected () {
+    echo "Test expectation failed: $@"
+    exit 1
+  }
+
+  lines="$(wc -l $out | awk '{print $1}')"
+  test 5 = $lines || expected "Five lines of output"
+  grep "is" $out | grep "zijn" >/dev/null || expected "Stemming works"
+  grep "een" $out | grep "onbep" >/dev/null || expected "Tagging works"
+
+  deps="$(echo $(awk 'BEGIN { FS = "\t*" } ; {print $1 " -> " $9 "; "}' <$out))"
+  test "1 -> 2; 2 -> 0; 3 -> 4; 4 -> 2; -> ;" = "$deps" || expected "Dependency parsing works"
+''
diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix
new file mode 100644
index 00000000000..f1cb62e6802
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/ticcutils.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl
+, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, libxml2, zlib, bzip2, libtar }:
+
+let
+  release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-ticcutils.json);
+in
+
+stdenv.mkDerivation {
+  name = "ticcutils";
+  version = release.version;
+  src = fetchurl { inherit (release) url sha256;
+                   name = "ticcutils-${release.version}.tar.gz"; };
+  buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive libxml2
+                  # optional:
+                  zlib bzip2 libtar
+                  # broken but optional: boost
+                ];
+  preConfigure = "sh bootstrap.sh";
+
+  meta = with stdenv.lib; {
+    description = "This module contains useful functions for general use in the TiCC software stack and beyond.";
+    homepage    = https://github.com/LanguageMachines/ticcutils;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ roberth ];
+  };
+
+}
diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix
new file mode 100644
index 00000000000..6a60996dc60
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/timbl.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl
+, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, libxml2
+, languageMachines
+}:
+
+let
+  release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-timbl.json);
+in
+
+stdenv.mkDerivation {
+  name = "timbl";
+  version = release.version;
+  src = fetchurl { inherit (release) url sha256;
+                   name = "timbl-${release.version}.tar.gz"; };
+  buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive
+                  libxml2
+                  languageMachines.ticcutils
+                ];
+  preConfigure = "sh bootstrap.sh";
+
+  meta = with stdenv.lib; {
+    description = "TiMBL implements several memory-based learning algorithms";
+    homepage    = https://github.com/LanguageMachines/timbl/;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ roberth ];
+
+    longDescription = ''
+      TiMBL is an open source software package implementing several memory-based learning algorithms, among which IB1-IG, an implementation of k-nearest neighbor classification with feature weighting suitable for symbolic feature spaces, and IGTree, a decision-tree approximation of IB1-IG. All implemented algorithms have in common that they store some representation of the training set explicitly in memory. During testing, new cases are classified by extrapolation from the most similar stored cases.
+
+      For over fifteen years TiMBL has been mostly used in natural language processing as a machine learning classifier component, but its use extends to virtually any supervised machine learning domain. Due to its particular decision-tree-based implementation, TiMBL is in many cases far more efficient in classification than a standard k-nearest neighbor algorithm would be.
+    '';
+  };
+
+}
diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix
new file mode 100644
index 00000000000..d8659c9a86b
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/timblserver.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl
+, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, libxml2
+, languageMachines
+}:
+
+let
+  release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-timblserver.json);
+in
+
+stdenv.mkDerivation {
+  name = "timblserver";
+  version = release.version;
+  src = fetchurl { inherit (release) url sha256;
+                   name = "timblserver-${release.version}.tar.gz"; };
+  buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive
+                  libxml2
+                  languageMachines.ticcutils
+                  languageMachines.timbl
+                ];
+  preConfigure = "sh bootstrap.sh";
+
+  meta = with stdenv.lib; {
+    description = "This server for TiMBL implements several memory-based learning algorithms";
+    homepage    = https://github.com/LanguageMachines/timblserver/;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ roberth ];
+
+    longDescription = ''
+      This implements a server for TiMBL. TiMBL is an open source software package implementing several memory-based learning algorithms, among which IB1-IG, an implementation of k-nearest neighbor classification with feature weighting suitable for symbolic feature spaces, and IGTree, a decision-tree approximation of IB1-IG. All implemented algorithms have in common that they store some representation of the training set explicitly in memory. During testing, new cases are classified by extrapolation from the most similar stored cases.
+
+      For over fifteen years TiMBL has been mostly used in natural language processing as a machine learning classifier component, but its use extends to virtually any supervised machine learning domain. Due to its particular decision-tree-based implementation, TiMBL is in many cases far more efficient in classification than a standard k-nearest neighbor algorithm would be.
+    '';
+  };
+
+}
diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix
new file mode 100644
index 00000000000..d60bca41272
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/ucto.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl
+, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, libxml2, icu
+, languageMachines
+}:
+
+let
+  release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-ucto.json);
+in
+
+stdenv.mkDerivation {
+  name = "ucto";
+  version = release.version;
+  src = fetchurl { inherit (release) url sha256;
+                   name = "ucto-${release.version}.tar.gz"; };
+  buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive
+                  icu libxml2
+                  languageMachines.ticcutils
+                  languageMachines.libfolia
+                  languageMachines.uctodata
+                  # TODO textcat from libreoffice? Pulls in X11 dependencies?
+                ];
+  preConfigure = "sh bootstrap.sh;";
+
+  postInstall = ''
+    # ucto expects the data files installed in the same prefix
+    mkdir -p $out/share/ucto/;
+    for f in ${languageMachines.uctodata}/share/ucto/*; do
+      echo "Linking $f"
+      ln -s $f $out/share/ucto/;
+    done;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A rule-based tokenizer for natural language";
+    homepage    = https://languagemachines.github.io/ucto/;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ roberth ];
+
+    longDescription = ''
+      Ucto tokenizes text files: it separates words from punctuation, and splits sentences. It offers several other basic preprocessing steps such as changing case that you can all use to make your text suited for further processing such as indexing, part-of-speech tagging, or machine translation.
+
+      Ucto comes with tokenisation rules for several languages and can be easily extended to suit other languages. It has been incorporated for tokenizing Dutch text in Frog, a Dutch morpho-syntactic processor.
+    '';
+  };
+
+}
diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix
new file mode 100644
index 00000000000..33037dbb87f
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/uctodata.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl
+, automake, autoconf, libtool, pkgconfig, autoconf-archive
+, libxml2, icu
+, languageMachines }:
+
+let
+  release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-uctodata.json);
+in
+
+stdenv.mkDerivation {
+  name = "uctodata";
+  version = release.version;
+  src = fetchurl { inherit (release) url sha256;
+                   name = "uctodata-${release.version}.tar.gz"; };
+  buildInputs = [ automake autoconf libtool pkgconfig autoconf-archive ];
+  preConfigure = "sh bootstrap.sh";
+
+  meta = with stdenv.lib; {
+    description = "A rule-based tokenizer for natural language";
+    homepage    = https://languagemachines.github.io/ucto/;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ roberth ];
+
+    longDescription = ''
+      Ucto tokenizes text files: it separates words from punctuation, and splits sentences. It offers several other basic preprocessing steps such as changing case that you can all use to make your text suited for further processing such as indexing, part-of-speech tagging, or machine translation.
+
+      Ucto comes with tokenisation rules for several languages and can be easily extended to suit other languages. It has been incorporated for tokenizing Dutch text in Frog, a Dutch morpho-syntactic processor.
+    '';
+  };
+
+}
diff --git a/pkgs/development/libraries/languagemachines/update b/pkgs/development/libraries/languagemachines/update
new file mode 100755
index 00000000000..3189637df74
--- /dev/null
+++ b/pkgs/development/libraries/languagemachines/update
@@ -0,0 +1,79 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --packages curl
+#!nix-shell --packages jq
+#!nix-shell --packages parallel
+#!nix-shell -i bash
+
+# Exit immediately if a command exits with a non-zero status.
+# Exit when a producer fails in a pipe
+# Treat undefined variable references as errors
+set -e -o pipefail -u
+
+# Check if working directory is (probably) right
+test "./update" = $0 || {
+    echo "The working directory ought to be the same is the update script location. Please invoke as ./update" 1>&2
+    exit 1
+}
+
+# Create temporary directory with automatic cleanup
+readonly MY_TMP="$(mktemp -d)"
+cleanup () {
+    rm -rf "$MY_TMP"
+}
+trap cleanup EXIT
+
+# stdout: file containing release info and a convenient placeholder
+# for the sha256 attribute
+getRelease () {
+    local owner="$1"
+    local repo="$2"
+    local out="$MY_TMP/$owner--$repo-release"
+    curl -fSs https://api.github.com/repos/"$owner"/"$repo"/releases/latest \
+        | jq '{ version: .name, url: .tarball_url, sha256: "__SHA256__" }' \
+             > "$out"
+    echo "$out"
+}
+
+# 'getters' for the release info file
+
+# stdout: unquoted tarball url
+releaseUrl () {
+    local file="$1"
+    jq -r '.url' <"$file"
+}
+
+# stdout: unquoted version
+releaseVersion () {
+    local file="$1"
+    jq -r '.version' <"$file"
+}
+
+# Fetch release tarball and compute hash
+# stdout: base32 sha256 to be used in fetchurl
+getReleaseHash () {
+    local file="$1"
+    local name="$2"
+    nix-prefetch-url "$(releaseUrl "$file")" --name "$name-$(releaseVersion "$file").tar.gz"
+}
+
+# Write a release info file to release-info/$owner-$repo.json
+updateRelease () {
+    local owner="$1"
+    local repo="$2"
+    local r="$(getRelease "$owner" "$repo")"
+    local hash="$(getReleaseHash "$r" "$repo")"
+    sed \
+      -e s/__SHA256__/"$hash"/\
+      <"$r" \
+      >"release-info/$owner-$repo.json"
+}
+
+updateRelease LanguageMachines frogdata
+updateRelease LanguageMachines frog
+updateRelease LanguageMachines libfolia
+updateRelease LanguageMachines mbt
+updateRelease LanguageMachines ticcutils
+updateRelease LanguageMachines timbl
+updateRelease LanguageMachines timblserver
+updateRelease LanguageMachines ucto
+updateRelease LanguageMachines uctodata
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b507cfe74d..7ccbb0cdf4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7846,6 +7846,8 @@ with pkgs;
 
   freetts = callPackage ../development/libraries/freetts { };
 
+  frog = self.languageMachines.frog;
+
   fstrm = callPackage ../development/libraries/fstrm { };
 
   cfitsio = callPackage ../development/libraries/cfitsio { };
@@ -8444,6 +8446,8 @@ with pkgs;
   };
   libkrb5 = krb5Full.override { type = "lib"; };
 
+  languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; });
+
   lasso = callPackage ../development/libraries/lasso { };
 
   LASzip = callPackage ../development/libraries/LASzip { };

From 3c136e5fa46d4b712fa4a84252fdbd73d787e8e0 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 14 Aug 2017 14:00:12 +0200
Subject: [PATCH 2086/3246] dpkg: 1.18.18 -> 1.18.24

Fixes CVE-2017-8283
---
 pkgs/tools/package-management/dpkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index d262253a51f..53c39003483 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dpkg-${version}";
-  version = "1.18.18";
+  version = "1.18.24";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "1xbgjdazcxb9iqrz6jcmy8qwgwggvf6rws2265sh01b6skin32y8";
+    sha256 = "1d6p22vk1b9v16q96mwaz9w2xr4ly28yamkh49md9gq67qfhhlyq";
   };
 
   configureFlags = [

From 806af3d2c8ab1969035b38353fdd8902d00b6574 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 14 Aug 2017 20:28:11 +0800
Subject: [PATCH 2087/3246] syncthing: 0.14.32 -> 0.14.36

---
 pkgs/applications/networking/syncthing/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 5fb950886e3..dd2576cd083 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.32";
+  version = "0.14.36";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "1agjr3m4gnywbp40idi0pwy25cp836sdcar7r6r9hwcqxyyzz545";
+    sha256 = "1l4s74qlabwfkpi9lmm588ym0myavbs06a5gpp9nihzrsal18727";
   };
 
   buildInputs = [ go removeReferencesTo ];
@@ -21,13 +21,14 @@ stdenv.mkDerivation rec {
     # Syncthing's build.go script expects this working directory
     cd src/github.com/syncthing/syncthing
 
-    go run build.go -no-upgrade -version v${version} install all
+    go run build.go -no-upgrade -version v${version} build
   '';
 
   installPhase = ''
-    mkdir -p $out/bin $out/lib/systemd/{system,user}
+    mkdir -p $out/lib/systemd/{system,user}
+
+    install -Dm755 syncthing $out/bin/syncthing
 
-    cp bin/* $out/bin
   '' + lib.optionalString (stdenv.isLinux) ''
     substitute etc/linux-systemd/system/syncthing-resume.service \
                $out/lib/systemd/system/syncthing-resume.service \

From 129f8d7e999b1a1f0fceaecadca30211e34d85a6 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 14 Aug 2017 15:03:12 +0200
Subject: [PATCH 2088/3246] kibana: 4.6.0 -> 4.6.5

Fixes CVE-2016-10366
---
 pkgs/development/tools/misc/kibana/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix
index bd85f614028..fc1ac932338 100644
--- a/pkgs/development/tools/misc/kibana/default.nix
+++ b/pkgs/development/tools/misc/kibana/default.nix
@@ -11,13 +11,13 @@ let
   elasticArch = archOverrides."${arch}" or arch;
   plat = elemAt info 1;
   shas = {
-    "x86_64-linux"  = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw";
-    "i686-linux"    = "0d77a2v14pg5vr711hzbva8jjy0sxw9w889f2r1vhwngrhcfz4pf";
-    "x86_64-darwin" = "1cajljx13h8bncmayzvlzsynwambz61cspjnsn2h19zghn2vj2c9";
+    "x86_64-linux"  = "1wnnrhhpgc58s09p99cmi8r2jmwsd5lmh2inb0k8nmizz5v1sjz0";
+    "i686-linux"    = "0sdx59jlfrf7r9793xpn2vxaxjdczgn3qfw8yny03dcs6fjaxi2y";
+    "x86_64-darwin" = "0rmp536kn001g52lxngpj6x6d0j3qj0r11d4djbz7h6s5ml03kza";
   };
 in stdenv.mkDerivation rec {
   name = "kibana-${version}";
-  version = "4.6.0";
+  version = "4.6.5";
 
   src = fetchurl {
     url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz";

From aa60296df6d6345e527b550779fa9317b877e149 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 14 Aug 2017 15:23:34 +0100
Subject: [PATCH 2089/3246] direnv: 2.10.0 -> 2.12.2

---
 pkgs/tools/misc/direnv/default.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 346ee797637..1606fffe397 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,26 +1,32 @@
-{ stdenv, fetchFromGitHub, go, bash, writeText}:
+{ stdenv, fetchFromGitHub, buildGoPackage, bash, writeText}:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "direnv-${version}";
-  version = "2.10.0";
+  version = "2.12.2";
+  goPackagePath = "github.com/direnv/direnv";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "04b098i8dlr6frks67ik0kbc281c6j8lkb6v0y33iwqv45n233q3";
+    sha256 = "0i8fnxhcl1zin714wxk93x8fi36z4fibapfn4jl3qkwbczkj8c8b";
   };
 
-  buildInputs = [ go ];
+  postConfigure = ''
+    cd $NIX_BUILD_TOP/go/src/$goPackagePath
+  '';
 
   buildPhase = ''
     make BASH_PATH=${bash}/bin/bash
   '';
 
   installPhase = ''
-    make install DESTDIR=$out
-    mkdir -p $out/share/fish/vendor_conf.d
-    echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish
+    mkdir -p $out
+    make install DESTDIR=$bin
+    mkdir -p $bin/share/fish/vendor_conf.d
+    echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish
+  '' + stdenv.lib.optionalString (stdenv.isDarwin) ''
+    install_name_tool -delete_rpath $out/lib $bin/bin/direnv
   '';
 
   meta = with stdenv.lib; {
@@ -39,6 +45,5 @@ stdenv.mkDerivation rec {
     homepage = http://direnv.net;
     license = licenses.mit;
     maintainers = with maintainers; [ zimbatm ];
-    inherit (go.meta) platforms;
   };
 }

From 2a0c6c7beedf067265331cac8f7c1c28c6ff0452 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 11 Aug 2017 20:28:56 -0700
Subject: [PATCH 2090/3246] dns-root-data: 2017-07-11 -> 2017-07-26

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

diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix
index ec0d9c83ad5..1786d877dbc 100644
--- a/pkgs/data/misc/dns-root-data/default.nix
+++ b/pkgs/data/misc/dns-root-data/default.nix
@@ -4,7 +4,7 @@ let
 
   rootHints = fetchurl {
     url = "http://www.internic.net/domain/named.root";
-    sha256 = "1zf3ydn44z70gq1kd95lvk9cp68xlbl8vqpswqlhd30qafx6v6d1";
+    sha256 = "0qsyxpj5b3i7n162qfyv76ljqbvnwjii7jk8mpfinklx0sk01473";
   };
 
   rootKey = ./root.key;
@@ -13,7 +13,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "dns-root-data-2017-07-11";
+  name = "dns-root-data-2017-07-26";
 
   buildCommand = ''
     mkdir $out

From b94210b066cebefee9497e1ce7fc0611ef54407b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 14 Aug 2017 12:51:30 -0400
Subject: [PATCH 2091/3246] linux-copperhead: 4.12.5.a -> 4.12.7.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index adbc5602163..1e54985ba59 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.12.5";
+  version = "4.12.7";
   revision = "a";
-  sha256 = "03cyh9fsbd95gdd477k1jmk3f9aj5dnw5wr8041y51v8f63vzbpk";
+  sha256 = "1kj0s5r7fx2d0crak7576jv9r6q7yx4aqmxpib6mhj1zfhsczdp0";
 in
 
 import ./generic.nix (args // {

From 135a841d9124f0c27750ee909d02a84bff23b44e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 14 Aug 2017 12:56:36 -0400
Subject: [PATCH 2092/3246] curl: 7.55.0 -> 7.55.1

---
 pkgs/tools/networking/curl/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 4d292abc9ac..4ec79af6651 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.55.0";
+  name = "curl-7.55.1";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1cg5h0klsx887qd4wpkk5bpkbw1bfc4q7adsrai71zhmdzn6j7dg";
+    sha256 = "1yvcn7jbh99gsqhc040nky0h15a1cfh8yic6k0a1zhdhscpakcg5";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@@ -72,10 +72,6 @@ stdenv.mkDerivation rec {
   CXXCPP = "g++ -E";
 
   postInstall = ''
-    pushd docs/libcurl
-    make install
-    popd
-
     moveToOutput bin/curl-config "$dev"
     sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
   '' + stdenv.lib.optionalString gnutlsSupport ''

From 3c9cf282bba0ccb12d5212563650d152730e7b9d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 Aug 2017 14:34:12 -0400
Subject: [PATCH 2093/3246] cc-wrapper: Improve `set -u` compliance

---
 pkgs/build-support/cc-wrapper/cc-wrapper.sh | 29 +++++++++++--------
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 32 ++++++++++++---------
 pkgs/build-support/cc-wrapper/utils.sh      |  2 +-
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index e5a3a581851..1c654ea4756 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -34,7 +34,7 @@ cppInclude=1
 expandResponseParams "$@"
 declare -i n=0
 nParams=${#params[@]}
-while [ "$n" -lt "$nParams" ]; do
+while (( "$n" < "$nParams" )); do
     p=${params[n]}
     p2=${params[n+1]:-} # handle `p` being last one
     if [ "$p" = -c ]; then
@@ -83,7 +83,7 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then
     rest=()
     nParams=${#params[@]}
     declare -i n=0
-    while [ "$n" -lt "$nParams" ]; do
+    while (( "$n" < "$nParams" )); do
         p=${params[n]}
         p2=${params[n+1]:-} # handle `p` being last one
         if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
@@ -101,21 +101,24 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then
         fi
         n+=1
     done
-    params=("${rest[@]}")
+    # Old bash empty array hack
+    params=(${rest+"${rest[@]}"})
 fi
 
 
 # Clear march/mtune=native -- they bring impurity.
 if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then
     rest=()
-    for p in "${params[@]}"; do
+    # Old bash empty array hack
+    for p in ${params+"${params[@]}"}; do
         if [[ "$p" = -m*=native ]]; then
             skip "$p"
         else
             rest+=("$p")
         fi
     done
-    params=("${rest[@]}")
+    # Old bash empty array hack
+    params=(${rest+"${rest[@]}"})
 fi
 
 if [[ "$isCpp" = 1 ]]; then
@@ -163,14 +166,13 @@ fi
 
 # Optionally print debug info.
 if [ -n "${NIX_DEBUG:-}" ]; then
-    set +u # Old bash workaround, see ld-wrapper for explanation.
+    # Old bash workaround, see ld-wrapper for explanation.
     echo "extra flags before to @prog@:" >&2
-    printf "  %q\n" "${extraBefore[@]}"  >&2
+    printf "  %q\n" ${extraBefore+"${extraBefore[@]}"}  >&2
     echo "original flags to @prog@:" >&2
-    printf "  %q\n" "${params[@]}" >&2
+    printf "  %q\n" ${params+"${params[@]}"} >&2
     echo "extra flags after to @prog@:" >&2
-    printf "  %q\n" "${extraAfter[@]}" >&2
-    set -u
+    printf "  %q\n" ${extraAfter+"${extraAfter[@]}"} >&2
 fi
 
 if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
@@ -178,5 +180,8 @@ if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
 fi
 
 PATH="$path_backup"
-set +u # Old bash workaround, see above.
-exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
+# Old bash workaround, see above.
+exec @prog@ \
+    ${extraBefore+"${extraBefore[@]}"} \
+    ${params+"${params[@]}"} \
+    ${extraAfter+"${extraAfter[@]}"}
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index d0a1d5a0ddb..d5fdc837cf5 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -28,7 +28,7 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}"
     rest=()
     nParams=${#params[@]}
     declare -i n=0
-    while [ "$n" -lt "$nParams" ]; do
+    while (( "$n" < "$nParams" )); do
         p=${params[n]}
         p2=${params[n+1]:-} # handle `p` being last one
         if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then
@@ -51,7 +51,8 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}"
         fi
         n+=1
     done
-    params=("${rest[@]}")
+    # Old bash empty array hack
+    params=(${rest+"${rest[@]}"})
 fi
 
 source @out@/nix-support/add-hardening.sh
@@ -73,11 +74,12 @@ relocatable=
 # Find all -L... switches for rpath, and relocatable flags for build id.
 if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then
     prev=
-    # Old bash thinks empty arrays are undefined, ugh, so temporarily disable
-    # `set -u`.
-    set +u
-    for p in "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"; do
-        set -u
+    # Old bash thinks empty arrays are undefined, ugh.
+    for p in \
+        ${extraBefore+"${extraBefore[@]}"} \
+        ${params+"${params[@]}"} \
+        ${extraAfter+"${extraAfter[@]}"}
+    do
         case "$prev" in
             -L)
                 libDirs+=("$p")
@@ -155,14 +157,13 @@ fi
 
 # Optionally print debug info.
 if [ -n "${NIX_DEBUG:-}" ]; then
-    set +u # Old bash workaround, see above.
+    # Old bash workaround, see above.
     echo "extra flags before to @prog@:" >&2
-    printf "  %q\n" "${extraBefore[@]}"  >&2
+    printf "  %q\n" ${extraBefore+"${extraBefore[@]}"}  >&2
     echo "original flags to @prog@:" >&2
-    printf "  %q\n" "${params[@]}" >&2
+    printf "  %q\n" ${params+"${params[@]}"} >&2
     echo "extra flags after to @prog@:" >&2
-    printf "  %q\n" "${extraAfter[@]}" >&2
-    set -u
+    printf "  %q\n" ${extraAfter+"${extraAfter[@]}"} >&2
 fi
 
 if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
@@ -170,5 +171,8 @@ if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
 fi
 
 PATH="$path_backup"
-set +u # Old bash workaround, see above.
-exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
+# Old bash workaround, see above.
+exec @prog@ \
+    ${extraBefore+"${extraBefore[@]}"} \
+    ${params+"${params[@]}"} \
+    ${extraAfter+"${extraAfter[@]}"}
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 5a70c2d9ccf..7e9979f10ae 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -24,7 +24,7 @@ badPath() {
 }
 
 expandResponseParams() {
-    declare -g params=("$@")
+    declare -ga params=("$@")
     local arg
     for arg in "$@"; do
         if [[ "$arg" == @* ]]; then

From e8557ff74caf84803f818ad12d9e64c845d20611 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 14 Aug 2017 15:18:03 -0400
Subject: [PATCH 2094/3246] elpa-package: 2017-08-14

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 0fd05f934c7..e3861c8c2f6 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -822,10 +822,10 @@
     gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "gited";
-        version = "0.3.2";
+        version = "0.3.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gited-0.3.2.tar";
-          sha256 = "1y40zn1w5m2srrqffkpvvzk3j5zzq21smsqychyx2diggn4c0hgi";
+          url = "https://elpa.gnu.org/packages/gited-0.3.3.tar";
+          sha256 = "0h3ps26sy4wp1s9vpsj066fpqjqacjlprz3kb09macgsg88k2c1p";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1446,10 +1446,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170807";
+        version = "20170814";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170807.tar";
-          sha256 = "185pyc0v4vwzvkygqhpld14lk62ygvfb9ycz609n99m0wqlamwz3";
+          url = "https://elpa.gnu.org/packages/org-20170814.tar";
+          sha256 = "1rk3y4ns5f7f22vv0pg1x5mpn3vpm1123sxpd1ilbzajw3hfgwwn";
         };
         packageRequires = [];
         meta = {

From d9a5cdecf628aa05a79003c15f665d21acec72e4 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 14 Aug 2017 15:18:20 -0400
Subject: [PATCH 2095/3246] org-package: 2017-08-14

---
 .../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 e9eccf83334..c3153b06e26 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 = "20170807";
+        version = "20170814";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170807.tar";
-          sha256 = "0cpkkfw7wmz242r5zzpcnzp7gfsmja90gqqb5h20azxmq96kfzga";
+          url = "http://orgmode.org/elpa/org-20170814.tar";
+          sha256 = "1r55vfjbll18h1nb5a48293x9lwmcmxgpx8h20n77n3inqmc6yli";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170807";
+        version = "20170814";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170807.tar";
-          sha256 = "145j9g1lx5nj85irdh9ljhh4rhwj9ys8nnca549lyxd9a5yiav5k";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170814.tar";
+          sha256 = "15v3944p1vnjqmy6il6gr1ipqw32cjzdq6w43rniwv2vr5lmh6iz";
         };
         packageRequires = [];
         meta = {

From 0f07fd95b5d35e775ce98d7fb4c0de93a17801ee Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 14 Aug 2017 15:19:10 -0400
Subject: [PATCH 2096/3246] melpa-stable-package: 2017-08-14

---
 .../emacs-modes/melpa-stable-generated.nix    | 200 +++++++++++++-----
 1 file changed, 142 insertions(+), 58 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 61a63efb67e..7cb801673ec 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1268,6 +1268,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    amx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "amx";
+        version = "1.1.1";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "amx";
+          rev = "7d5d7974057a36a332f8b30e99fe464f25b6e0ae";
+          sha256 = "0jqvah4i2r5di8k3rx6hyjnxdr3alzqmlv6iab5wdhkafyvwl0dq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
+          sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap";
+          name = "amx";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/amx";
+          license = lib.licenses.free;
+        };
+      }) {};
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
@@ -3859,12 +3880,12 @@
     cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cfengine-code-style";
-        version = "3.10.1";
+        version = "3.11.0";
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "99e8b116e779f97e96866891362817c1c5c6534c";
-          sha256 = "1ckk6jvmwrrlfd4ja8n5q99ajasgvbdkzkba9mswhq9dvk6avvn0";
+          rev = "520851447dba901097b121b58b1a0da370481a2c";
+          sha256 = "0sz4zqw2s7f5rhqad4kmrfdsl24xqflfsm4hzfbwzvsrlp7ndis7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -4564,12 +4585,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.9.0";
+        version = "3.9.1";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "f15cfd891d1e01247ed285320ae32b6c3182ac8f";
-          sha256 = "0asp6kijrmf9bayg8jvhgkd1z2falzhyippkwgih9ygpa65qvqpq";
+          rev = "fca4423786ba2c4a5ab0ec6c1a1cbac8cd8600b4";
+          sha256 = "08x5mqhrsm3y28hiy32h336n9ggn2snb56k242hqhij1lsg7iga3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5365,6 +5386,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }:
+    melpaBuild {
+        pname = "company-terraform";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "rafalcieslak";
+          repo = "emacs-company-terraform";
+          rev = "b08ced5bac44c0253e3725a7f7a6246bdf1cf2b6";
+          sha256 = "10922ykv6ii28rnhg4vri2g1fs5897xjxw6a5pk1rw2mld5kx57r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
+          sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh";
+          name = "company-terraform";
+        };
+        packageRequires = [ company emacs terraform-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/company-terraform";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
     melpaBuild {
         pname = "company-web";
@@ -6313,12 +6355,12 @@
     dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
     melpaBuild {
         pname = "dashboard";
-        version = "1.0.3";
+        version = "1.2.3";
         src = fetchFromGitHub {
           owner = "rakanalh";
           repo = "emacs-dashboard";
-          rev = "cd9899342bc94e59aa42275554810e50d045aaa4";
-          sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as";
+          rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58";
+          sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -7265,12 +7307,12 @@
     docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
     melpaBuild {
         pname = "docker-compose-mode";
-        version = "0.2.2";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "meqif";
           repo = "docker-compose-mode";
-          rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c";
-          sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v";
+          rev = "37d8afb6a72f829fdbc77e76f18587530ff319b4";
+          sha256 = "11283gl19iqm03a5l635qq36fpxlj05j7a6hlnv7v15n3h7d5512";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -7873,12 +7915,12 @@
     ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "0.3.0";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83";
-          sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl";
+          rev = "4d19565516785348894c4911e757e33a270b3efd";
+          sha256 = "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -11419,12 +11461,12 @@
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "0.2.2";
+        version = "0.2.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "77f1e187b9cecb6975bedcfe91c8c81f1b133686";
-          sha256 = "0n0v9jwswcc16cigyffvy3m9y7qqrs8qzjs11sq3d420zrv16b39";
+          rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f";
+          sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -12308,12 +12350,12 @@
     flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flycheck-popup-tip";
-        version = "0.12.1";
+        version = "0.12.2";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-popup-tip";
-          rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c";
-          sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw";
+          rev = "ef86aad907f27ca076859d8d9416f4f7727619c6";
+          sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
@@ -12350,12 +12392,12 @@
     flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-pycheckers";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "flycheck-pycheckers";
-          rev = "3c89f455472b5a77e28129825bb801b464d96ca1";
-          sha256 = "1fxbabxsdqm98vhs51k5z6prjkskjq2nsl9vsmlbwgjgyg4hx1xr";
+          rev = "220c551df591792d08fc9d149ab3329171743cb9";
+          sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -14479,12 +14521,12 @@
     gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitpatch";
-        version = "0.5.0";
+        version = "0.5.1";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "gitpatch";
-          rev = "577d5adf65c8133caa325c10e89e1e2fc323c907";
-          sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4";
+          rev = "94d40a2ee2b7cd7b209546ea02568079176b0034";
+          sha256 = "1drf4fvmak7brf16axkh4nfz8pg44i7pjhfjz3dbkycbpp8y5vig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch";
@@ -15004,12 +15046,12 @@
     google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "google-this";
-        version = "1.11";
+        version = "1.12";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "emacs-google-this";
-          rev = "22cff810e7ed3b3c9dae066588508864c25c6d99";
-          sha256 = "14dz9wjp8ym86a03pw5y1sd51zw83d6485hpq8mh8zm0j1fba0y0";
+          rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84";
+          sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this";
@@ -15295,15 +15337,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
+    graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
     melpaBuild {
         pname = "graphene";
-        version = "0.9.7";
+        version = "0.9.8";
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "graphene";
-          rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed";
-          sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl";
+          rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe";
+          sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -15316,7 +15358,7 @@
           exec-path-from-shell
           flycheck
           graphene-meta-theme
-          ido-ubiquitous
+          ido-completing-read-plus
           ppd-sr-speedbar
           smartparens
           smex
@@ -16017,6 +16059,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
+    melpaBuild {
+        pname = "hasky-stack";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "hasky-mode";
+          repo = "hasky-stack";
+          rev = "a11d1e00f41407ec77ea9e6eab93949a18f58069";
+          sha256 = "1bib7nic9by2vrqvrzpp62dk4apz2iyyprvk4hlgji2hkxyf2wpb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
+          sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8";
+          name = "hasky-stack";
+        };
+        packageRequires = [ emacs f magit-popup ];
+        meta = {
+          homepage = "https://melpa.org/#/hasky-stack";
+          license = lib.licenses.free;
+        };
+      }) {};
     haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haxor-mode";
@@ -18495,22 +18558,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "4.3";
+        version = "4.5";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
-          sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
+          rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
+          sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
           sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
           name = "ido-completing-read-plus";
         };
-        packageRequires = [ cl-lib emacs s ];
+        packageRequires = [ cl-lib emacs memoize s ];
         meta = {
           homepage = "https://melpa.org/#/ido-completing-read+";
           license = lib.licenses.free;
@@ -18603,12 +18666,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "4.3";
+        version = "4.5";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
-          sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
+          rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
+          sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
@@ -19379,12 +19442,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "0.1.20";
+        version = "0.1.21";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "402722b5ad035b87fc08bc73343f05610a5fcb3c";
-          sha256 = "143y94b4spslh06x4klvsvil7ywn3cmrad4mg1qc0y0h0d9ksd4v";
+          rev = "4c8f3e7f4ad03179425c722d5072beae254da73b";
+          sha256 = "0q377rpgszqixjbmwck6kcczfb3j8axx0pk6fqavzp8qyc3q121l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -24873,12 +24936,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "4.0";
+        version = "4.1";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e";
-          sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01";
+          rev = "a9a66b047606c6b5dc48abdb0eb70a1f9dcd08f2";
+          sha256 = "0m1f62cr0h426g66c7r36v3yr2bdakkjwxzdvpd0gh81xazn8yjz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -28623,12 +28686,12 @@
     protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protobuf-mode";
-        version = "3.4.0pre1";
+        version = "3.4.0pre3";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "3afcded28a6aa9c44adf801ca5bff2133fcf3030";
-          sha256 = "03m1fprfz6cwxijp5fls502g6g3svyz760bwwwnbvyx4carwzmsp";
+          rev = "eaeca0d42b1fc4a8023a7f90d889631eda9360a3";
+          sha256 = "02c360xhmnhcybl23fa0p7l3x3zn4mil1c7cnpilnv0bqxy5399n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -30492,12 +30555,12 @@
     ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-electric";
-        version = "2.3.0";
+        version = "2.3.1";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "ruby-electric.el";
-          rev = "d04313dbee42c0d1009558a7c9424e4ae8611908";
-          sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm";
+          rev = "3553448a780a1ea5c3b0e9becd820d4762876593";
+          sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
@@ -31016,11 +31079,11 @@
     secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "secretaria";
-        version = "0.2.4";
+        version = "0.2.5";
         src = fetchgit {
           url = "https://bitbucket.org/shackra/secretaria.el";
-          rev = "aae30bfc93fa5ea846bce086b22321c46b94ff7b";
-          sha256 = "18ad7q2a131gpvjj8923vp06zh0zfdy1589vs3f09v16aazbcfqc";
+          rev = "7bd1cf591528b18a153e15a260d7817b72c900f2";
+          sha256 = "0n9mj2g59yiqbg81rk0gglbgpvfs550r4y26n8nf5pyxpxfllv5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@@ -31558,6 +31621,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    shrink-path = callPackage ({ dash, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "shrink-path";
+        version = "0.3.1";
+        src = fetchFromGitLab {
+          owner = "bennya";
+          repo = "shrink-path.el";
+          rev = "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b";
+          sha256 = "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path";
+          sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb";
+          name = "shrink-path";
+        };
+        packageRequires = [ dash f s ];
+        meta = {
+          homepage = "https://melpa.org/#/shrink-path";
+          license = lib.licenses.free;
+        };
+      }) {};
     shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shrink-whitespace";

From 879a5e0c6e29ded60981a6de3ec840b8cdfe3769 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 14 Aug 2017 15:21:59 -0400
Subject: [PATCH 2097/3246] melpa-package: 2017-08-14

---
 .../editors/emacs-modes/melpa-generated.nix   | 1036 ++++++++++-------
 1 file changed, 592 insertions(+), 444 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index ce7c1845d59..4f0839c7d88 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -822,8 +822,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
-          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
+          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
+          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1787,6 +1787,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "amx";
+        version = "20170810.1842";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "amx";
+          rev = "7a51b7854036cf6c5ecce8ff09ace2a9595c002f";
+          sha256 = "1x0f5wqyg56xw3byg18wlb16d5m6pn63axvdfiwibyqm9y1ljqm6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
+          sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap";
+          name = "amx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/amx";
+          license = lib.licenses.free;
+        };
+      }) {};
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
@@ -4023,12 +4044,12 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20170804.1135";
+        version = "20170813.254";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "0ed6408f18bf13840f6f57638f86c3b9dfe4a07a";
-          sha256 = "0pjxjgk39n6spman4grqgw2r82idld7agmc4q2j4f2gp9a0k2bll";
+          rev = "8556274978be5ca2947777dc5e28f5487e069449";
+          sha256 = "0k0yw5vnv0f8xqly9s3ja90gcywnyg2b0pp3yxyk6r7qqns63pkj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -4424,12 +4445,12 @@
     bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bash-completion";
-        version = "20170716.629";
+        version = "20170812.623";
         src = fetchFromGitHub {
           owner = "szermatt";
           repo = "emacs-bash-completion";
-          rev = "d673bf1ed020cf1378fe3d90e1308f555cb0d1af";
-          sha256 = "18ql2k8zh2znl4lnks5r0k1b5l7x0hl1w9mhkp0anld2p2bv9f14";
+          rev = "8ca917f4287c133e27f02fc7f3eda47e16d9ab12";
+          sha256 = "0bv0a3d6yk880zfql39xvjhpvw8x61qma57r4vgqk0lk0vqjcwq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -4672,12 +4693,12 @@
     bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bbyac";
-        version = "20170809.444";
+        version = "20170814.222";
         src = fetchFromGitHub {
           owner = "baohaojun";
           repo = "bbyac";
-          rev = "3957374b970901ebd4a48509e97a8f78307cf1a5";
-          sha256 = "1psrrw1770v9bb3i8kgc2fjqm8r48fxfys13raww2pcl9fy2j199";
+          rev = "591b4668e80998c4aed85b55623a8f127e77792b";
+          sha256 = "1w3x74ca5gkjqzdj4sxy9syy55p1bw2r00hqw423bvv0jr20m6av";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac";
@@ -4756,12 +4777,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "20170801.2308";
+        version = "20170810.624";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "f8357cb7516ff9d7f86c1e7306a74f812a72dcb4";
-          sha256 = "09n0810r00nli0jg1z3rcw8hpybsa5jxrh0gcg9n12hz5vyy3a36";
+          rev = "bc608ef0735e5b7e34b320b899fd2b3ce2156d1b";
+          sha256 = "1vb9505lkzkl9ipczs3q0vmf70mzf9l1wk703g9b5aiss81r5w4i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -5094,8 +5115,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "7b055494e39efba8b237202b7c97f40aa19e2579";
-          sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n";
+          rev = "360df30683a711c443f87e495ba14cdd125a505d";
+          sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -6382,12 +6403,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20170729.609";
+        version = "20170812.128";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "ca090405d92d28bc9552ef4d5eab00e3d18a7d3c";
-          sha256 = "1ghpcz22i8dzdnxr8m5cl4g4l4bqc5z2h4f9chwhkc0csxlrvkal";
+          rev = "6ad9565cd7adc195f81bdbbc1115a6bd96802a72";
+          sha256 = "1qlfr09k39wmhr6lngsq1c7gdw4c8smvmn2vj6r2jlhnfav54ig5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -7324,12 +7345,12 @@
     cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "cfml-mode";
-        version = "20170808.1635";
+        version = "20170811.2240";
         src = fetchFromGitHub {
           owner = "am2605";
           repo = "cfml-mode";
-          rev = "5f97dd05d73d33975503d52daafb83af41b152ae";
-          sha256 = "04dwxznm723arh9yrn1cvbaj6rnng5a5dk6ic9nw5ndmpqi3fnj8";
+          rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807";
+          sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode";
@@ -7345,12 +7366,12 @@
     cftag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cftag-mode";
-        version = "20170808.1635";
+        version = "20170811.2240";
         src = fetchFromGitHub {
           owner = "am2605";
           repo = "cfml-mode";
-          rev = "5f97dd05d73d33975503d52daafb83af41b152ae";
-          sha256 = "04dwxznm723arh9yrn1cvbaj6rnng5a5dk6ic9nw5ndmpqi3fnj8";
+          rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807";
+          sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode";
@@ -7368,7 +7389,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12293";
+          rev = "12304";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7784,12 +7805,12 @@
     chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-word-at-point";
-        version = "20150618.1838";
+        version = "20170811.241";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "chinese-word-at-point.el";
-          rev = "36a03cce32fe059d2b581cb2e029715c0be81074";
-          sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
+          rev = "8223d7439e005555b86995a005b225ae042f0538";
+          sha256 = "13gva1ld4f9wwb2m4fpk6bd9342qvvmaf5i1r3x3h84czmk0nq1r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b7785eca577218feade982c979694389f37ec3/recipes/chinese-word-at-point";
@@ -7912,8 +7933,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "9c3b1863a9e80cce672762fbbfeee98842da2a49";
-          sha256 = "0pn8hrwq5ahzj3gckhczs1q7nblsfhvg6vdd8c5y1ak4hhygp563";
+          rev = "f2b198ed926b9c4deea63cc6a169a748d81c551f";
+          sha256 = "1flxbf19k048as38vr3vjcrf3xz2f41y4wfig1sbb7aiag63ahcm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8184,8 +8205,8 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "310509";
-          sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
+          rev = "310836";
+          sha256 = "135p8ag315sh9zwssb6f9widiqh6xrcnry1r1v0ij8r94n7bw6la";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format";
@@ -8826,8 +8847,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "92d16be9e6578600a273b338d003eb8908e5ed4e";
-          sha256 = "0qrji1wc2alj5x6saj1kz96x0m50qd4b6yhb1ks7fpdy977r4paa";
+          rev = "ce2750817b768cee6ae119747cdf806401f09332";
+          sha256 = "1kc7308y4y1684dl8nv8s6dy7p5m39dgyyvb3amd6cmfqka9010l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9343,12 +9364,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170807.1724";
+        version = "20170813.237";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "12da490d95bf2e64b62a2db27b88af6e6c823d6e";
-          sha256 = "1py4y6dgd2vygwyn5zcxfw0hbg4bsd4yi6dyas30649s868s3b3i";
+          rev = "8faa5d0153166e44416d59324dc39e43469d684c";
+          sha256 = "137rn1k1hlaz4k47mrh358k5kpc29n87281sq3sd8gq3rdm8hs7a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9530,12 +9551,12 @@
     comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "comment-dwim-2";
-        version = "20150825.1549";
+        version = "20170809.1354";
         src = fetchFromGitHub {
           owner = "remyferre";
           repo = "comment-dwim-2";
-          rev = "8cedecde018b5872195bfead6511af822776a430";
-          sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
+          rev = "8da8aba4cab4a0a1eef3aea2de219227526876e4";
+          sha256 = "1bvgdm52bp39gdcqxb02bnxssmih887jgr82m3c09yfwkpnr2qry";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2";
@@ -10395,8 +10416,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
-          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
+          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
+          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10493,6 +10514,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }:
+    melpaBuild {
+        pname = "company-terraform";
+        version = "20170812.722";
+        src = fetchFromGitHub {
+          owner = "rafalcieslak";
+          repo = "emacs-company-terraform";
+          rev = "bd97342fa1b3b77bd19a3ff202a5ce5cbead36d4";
+          sha256 = "0yv0hiskdxx2653g5crmb9yq6c8azrvdja56wnhm8i9kvhnhkggh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
+          sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh";
+          name = "company-terraform";
+        };
+        packageRequires = [ company emacs terraform-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/company-terraform";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-try-hard = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-try-hard";
@@ -10936,12 +10978,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170728.855";
+        version = "20170813.351";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "9b071a8fb130fe8391d445706711bcc4de2b3998";
-          sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz";
+          rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
+          sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11041,12 +11083,12 @@
     counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "counsel-projectile";
-        version = "20170216.1426";
+        version = "20170814.341";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "aefd25c74718e66f180127c0d273eade887325b0";
-          sha256 = "10d29mpvsav19m9x51w8bjv0r9agxdwsvhk1ql62lj7rcy4256jq";
+          rev = "280ead0e511904c67a9cb1686206efb65ba9c064";
+          sha256 = "1wybb8lh6cbkx9mqhs2nrfjab6p6mfj36c2n6pxps6jsgzb9syi5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -11756,8 +11798,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "e1e158d2103f0b441ed27ad4b2c0c123d7d710d7";
-          sha256 = "0mbqdnbd6rqhsfdn5rijp9siyp5720s1gj6sadpqp55qi9r1hnpx";
+          rev = "a331f1d355c5d2fc608a59c1cbbf016ea09d6deb";
+          sha256 = "1anwj210gini3p98wy3fj1gbn5ijkbd5vnfc3526h4vppsb4vili";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -12023,8 +12065,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "878cc63ece3d9721f36f15aeca74a270d496adf0";
-          sha256 = "094gss26440gikiq7d9bh7rmdy4bhnwq1bjdy7d8rr8d282x6ivm";
+          rev = "91f2ad9f1285311058dfee641616053bc8d64eca";
+          sha256 = "0mb4kcvrwsvflywh5lnq20irmlgzgyqcjsmbmbhs21s3p6l9fh68";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12187,12 +12229,12 @@
     dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dante";
-        version = "20170809.19";
+        version = "20170809.1326";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "57c66e4741505b1f1c8147d413064d05cabfa69e";
-          sha256 = "07g5x1shx6l1wn12jna4qr7ikn1d0whmksvgc5g2rj7p7j021yv9";
+          rev = "ccb16d240504951ccd3fa71c533d3d7a06769562";
+          sha256 = "04gypz2i57zjhpj9khrfj0sr1c4hdf8yqxhlb9rwjknq3a807rr9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12418,12 +12460,12 @@
     dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dash";
-        version = "20170727.212";
+        version = "20170810.137";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "b4faa9397e06206b646f684a603e320f962674d1";
-          sha256 = "0cjh9g8xfzf2rb6dy313rpxwd40yl7n3hdl9a2k8fdwyaww97p6a";
+          rev = "0df0ff1a65d54377381e50c08d88b247db44c3dd";
+          sha256 = "01v75zavzb476cn3c43h9m2wa7vxrsipaja6y1wib07bfbh6i5gm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12464,8 +12506,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "b4faa9397e06206b646f684a603e320f962674d1";
-          sha256 = "0cjh9g8xfzf2rb6dy313rpxwd40yl7n3hdl9a2k8fdwyaww97p6a";
+          rev = "0df0ff1a65d54377381e50c08d88b247db44c3dd";
+          sha256 = "01v75zavzb476cn3c43h9m2wa7vxrsipaja6y1wib07bfbh6i5gm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12481,12 +12523,12 @@
     dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
     melpaBuild {
         pname = "dashboard";
-        version = "20170419.2358";
+        version = "20170810.1025";
         src = fetchFromGitHub {
           owner = "rakanalh";
           repo = "emacs-dashboard";
-          rev = "27c559952483301cc92539f68a89a047a0cc69ad";
-          sha256 = "0hl97zc5wvxnpizp29rri7nbpklgx7fvb3idmghckinpgg3gnz2x";
+          rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58";
+          sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -14782,12 +14824,12 @@
     docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
     melpaBuild {
         pname = "docker-compose-mode";
-        version = "20170808.58";
+        version = "20170812.1551";
         src = fetchFromGitHub {
           owner = "meqif";
           repo = "docker-compose-mode";
-          rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c";
-          sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v";
+          rev = "37d8afb6a72f829fdbc77e76f18587530ff319b4";
+          sha256 = "11283gl19iqm03a5l635qq36fpxlj05j7a6hlnv7v15n3h7d5512";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -14929,12 +14971,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170809.734";
+        version = "20170809.1218";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "1cc44b94bfe960de7c5fbae0bd18ef33433f4e00";
-          sha256 = "1axcyfwxxq0c2kixkmzw2lfhfcq97bgfajgawikk58p0hahdhxs9";
+          rev = "af5f703b6b63a7823fe5eec9864222c794a05566";
+          sha256 = "0c6sr2n795cjbvvlgiqb6a6lixbwdag5p4l3iw4knikdp31gk55w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15385,7 +15427,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1804597";
+          rev = "1804990";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15486,12 +15528,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170725.1803";
+        version = "20170812.1308";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "8fae9be1b630c57d5d40586bddda70024006701f";
-          sha256 = "18mq9anbw6l0d13lfbnghbc2iszibi36ds14zd1jvmfq2nbxq3bb";
+          rev = "7b6c37a2e4e5a4c3ad9fbcd89c8eba1b32709b6b";
+          sha256 = "0z4hgg7ya1x89gplk0hx4gi7div1bnqyi18hcj0zmgl9db0z333w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15884,12 +15926,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170807.501";
+        version = "20170812.1030";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c";
-          sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s";
+          rev = "69c7c0df9c3d8b97b5a779c41460f6fb4f65ac75";
+          sha256 = "1rd7ssa3v3plpglqvpm03dlqfk8yyfwv0f8wqk1kr97yz7zxrp40";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15968,12 +16010,12 @@
     ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "20170802.113";
+        version = "20170810.631";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83";
-          sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl";
+          rev = "4d19565516785348894c4911e757e33a270b3efd";
+          sha256 = "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -16113,12 +16155,12 @@
     ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ecukes";
-        version = "20170104.1041";
+        version = "20170810.305";
         src = fetchFromGitHub {
           owner = "ecukes";
           repo = "ecukes";
-          rev = "277d25cf8fc9548239599244ab15a2268a55b31b";
-          sha256 = "0jh7l4lhbjd7qxqdi8d8mk5j3qxx70x3jdzpw2xw6szcx67lvd3s";
+          rev = "65f29ff764c3742cc1190371b1ac91f0812535f3";
+          sha256 = "16dypiczds89kpwqj7p29n5qcqpc1d7faci2f4glw1m60gnkgvqq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -16646,12 +16688,12 @@
     eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eg";
-        version = "20170801.617";
+        version = "20170812.407";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "eg.el";
-          rev = "03177033ebaecd4e9888cad35951cf4c2addfc88";
-          sha256 = "0jf5fvakq6qvd351ad7lsx8j1xd70ygr582abksp3pgd88sn0r2q";
+          rev = "69ba1defaf636452d46b948d22d8fefc6a937f81";
+          sha256 = "13ckp1jbzhq18fpzq670q2mmzka6wfyh8smxvx6msg72nnn740z5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
@@ -16842,12 +16884,12 @@
     ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20170728.539";
+        version = "20170810.221";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "c02d2f14e3e803094c47c5d605196af887a5d80f";
-          sha256 = "140s75sqlvgc7a00ankkb7892yc03vznk6gvilgdcccw76dki9l1";
+          rev = "72adcdfb5d12d49429a1c655f0b02fe657445c4f";
+          sha256 = "1y10xzvmxqj61r0sq3hcd6zq6x2ird1z54draaa0wpafgq8610g9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -16892,12 +16934,12 @@
     el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-get";
-        version = "20170701.1607";
+        version = "20170813.1436";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "4a1dde57e8a4d4c22ed279bac8253f5f16da9197";
-          sha256 = "19570r8y2cs8y51rmihk5hk5sqavck4bf0zanajnplhxw52h0fji";
+          rev = "99bc5e1814ffa302b8413e1d2adddd8c2113f75e";
+          sha256 = "06swrmpwfm6asiz3ggrbaa3l277g0xl43wiw6s8kzmqfh58r6837";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -18057,12 +18099,12 @@
     elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elvish-mode";
-        version = "20170808.1511";
+        version = "20170813.1301";
         src = fetchFromGitHub {
           owner = "ALSchwalm";
           repo = "elvish-mode";
-          rev = "4511171f2d8ee01d8a7b76c64f552fe5258af79f";
-          sha256 = "0h4b6r3qbvcr1hgs2fiv3csq3iw11n0ilsv7dafn427gbadf0krf";
+          rev = "002f663fe01665b819711655aaaef2b891382d32";
+          sha256 = "1y634zc983yfi53q8sb2pp3h0s6ws3ypyqh3b9iw5jax6ia1h4ys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode";
@@ -18791,12 +18833,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 = "20170109.1526";
+        version = "20170811.1057";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "emacs-refactor";
-          rev = "07e0b41fe080536e8a69301ff1c692f2871bee2f";
-          sha256 = "1ckbc2ziw31cqal9hmc6n6gmncwficzw5rwwdcy4wj7f7w3xkr5z";
+          rev = "d7009b30be810af6bb33c7d99a9b320e2aaeb698";
+          sha256 = "1hx5bv1banrnsb9wrnn57b4wj981qpvnx66px7h304yr95x8bls4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
@@ -18866,12 +18908,12 @@
     engine-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "engine-mode";
-        version = "20170731.1304";
+        version = "20170812.2007";
         src = fetchFromGitHub {
           owner = "hrs";
           repo = "engine-mode";
-          rev = "feb41a46e3a4cfcdea405db2bc3ea485776eaa7f";
-          sha256 = "0g5sxrbcbf5bv62szw7m9cfxj0lxa090pxj9s6i0v83ljxnra8sn";
+          rev = "408932727bb723017eaf6338e50cb6d1266b8df8";
+          sha256 = "1wl172ldmdw6gcdzbbf7dln7m55112kq42jzs42xbihm0v1x8xlb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
@@ -18887,12 +18929,12 @@
     enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "enh-ruby-mode";
-        version = "20170417.2356";
+        version = "20170810.1602";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "71ba417baea4c4e1ac814854638cbeb4b0b383fd";
-          sha256 = "1hbmjbk6xs1r0kqh5ci7jfr6905ipa7xz0kgypqrlg0zap52gayz";
+          rev = "23b00cce325453f644e10ea99ca15e9b115ba562";
+          sha256 = "0k5r6bip15lqd1c5fkjajrmjxjds3n4r48f4rljayf2acbf13mxa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -19503,12 +19545,12 @@
     ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }:
     melpaBuild {
         pname = "ereader";
-        version = "20170529.1408";
+        version = "20170809.2201";
         src = fetchFromGitHub {
           owner = "bddean";
           repo = "emacs-ereader";
-          rev = "ef3cd7b9ced044bbd9a3e7cce0c78a970a483288";
-          sha256 = "0n0n7600zwa9z8srafq0gp6d17lkr4pkrsql50rl2qa1fr44zi7z";
+          rev = "f3bbd3f13195f8fba3e3c880aab0e4c60430dcf3";
+          sha256 = "18yqqqxsivnq2m8mxz7ifp0bfmn3q9m11w3abryxg2snh4vb5sy6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader";
@@ -19612,8 +19654,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "48e35d38d7625a10395b03edb4337668abaa4905";
-          sha256 = "15cq0gzczvin8xkdxrfj37819gx7hzdrcn5hx41q39cn1qzswxm2";
+          rev = "dac724923328ad0fd085a4d4e397dcbb12e30084";
+          sha256 = "0wc84i939819zbxciqkarfgvdipzhd169cykv1y0l40b21p0jlzx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -20136,8 +20178,8 @@
         src = fetchFromGitHub {
           owner = "ecukes";
           repo = "espuds";
-          rev = "7fc312184348df55d19d06914605356885674354";
-          sha256 = "1vx1b1pyi2xpfl822mskzvh943rxp9pyr915fnx5pjp58hjwwf3h";
+          rev = "8caef13020527956a56b53171057ca1d0e2fb48b";
+          sha256 = "0nj5llf9s59dagwqj4s87ccwaky9pan3dyw1dcf8m8f41s5zia62";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
@@ -21052,12 +21094,12 @@
     evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-lion";
-        version = "20170801.2232";
+        version = "20170810.2314";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-lion";
-          rev = "6667fe9891350b00596a8a335a68261c1f5ab504";
-          sha256 = "1j3xy7b0b0rf1zznqjgd9gw1369w75h7i0kgmwgngn8xg5w9jl9f";
+          rev = "aaa3874ad54c31b4322ac5bbc63e331498b11d61";
+          sha256 = "1aq3ip93sxk05gfgh2zw6zckmkir0viqaqz674fcmsd2rc2051zn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
@@ -21933,12 +21975,12 @@
     exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exotica-theme";
-        version = "20170809.558";
+        version = "20170814.438";
         src = fetchFromGitHub {
           owner = "jbharat";
           repo = "exotica-theme";
-          rev = "fbb34138ec48d505ac64e8141590f87777d82c2b";
-          sha256 = "03k6vj4ckgccfrl906v0fpwxvp5gzkcsd3iy8k7h11jdbyhlbb3m";
+          rev = "c099e700e87638fa8cc45aa35e46952857ccf91d";
+          sha256 = "08i0d5f011wxvkd4njjabi986cjvf7c82i84jwkpdhv1gx67dmnb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
@@ -22140,22 +22182,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ez-query-replace";
-        version = "20170311.139";
+        version = "20170814.621";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ez-query-replace.el";
-          rev = "66381226da00cc4a87c7d5962aaabbc0eb325cb7";
-          sha256 = "1p5qg5pz87ym1gd0jmakkpkskmffl69694pkxbhhfxp10pyshzmc";
+          rev = "f5dbd2d3e5e62e6b7e7cc1a98fc4d0cd411e5afa";
+          sha256 = "14mikpxrsmjwdpya45cf47v2gjwxmql10xjk907x27iqqxmfif74";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace";
           sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx";
           name = "ez-query-replace";
         };
-        packageRequires = [ dash ];
+        packageRequires = [ dash s ];
         meta = {
           homepage = "https://melpa.org/#/ez-query-replace";
           license = lib.licenses.free;
@@ -22578,12 +22620,12 @@
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20170615.1143";
+        version = "20170812.1131";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "cddd216402c9a9b4228b5f82afa1bd637b2e0c37";
-          sha256 = "0kvn9ikxnv9ahz0cqal3drxv95slwbf758sp37irih6fqh3ybgbl";
+          rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f";
+          sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -24670,12 +24712,12 @@
     flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flycheck-popup-tip";
-        version = "20170730.651";
+        version = "20170812.1651";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-popup-tip";
-          rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c";
-          sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw";
+          rev = "ef86aad907f27ca076859d8d9416f4f7727619c6";
+          sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
@@ -24733,12 +24775,12 @@
     flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-pycheckers";
-        version = "20170728.1103";
+        version = "20170810.1143";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "flycheck-pycheckers";
-          rev = "2fd53300525deb3c5ac903cc4cb89e3e5cce7b4e";
-          sha256 = "1nw6vifmpncnkhdbnn95khncdwjahri2l862c97q4ni5ikms7i7q";
+          rev = "220c551df591792d08fc9d149ab3329171743cb9";
+          sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -24800,8 +24842,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
-          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
+          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
+          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -26603,12 +26645,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170809.146";
+        version = "20170809.1039";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "6e21d45c29dd03e6e6ec5d43f95b7a81832c3ca9";
-          sha256 = "0fzc9b87qlp5phr9gxylnfsi2749zgcs5aqabqdc3fpqqhb7hhy1";
+          rev = "e4742d609b4da715bc23f3271cb3393e15c22291";
+          sha256 = "1rp67kpy9d5dkap80b2613kmplh3bbm0s46c4x8pdh8fy42vh2jv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26716,12 +26758,12 @@
     function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "function-args";
-        version = "20170809.1011";
+        version = "20170813.455";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "function-args";
-          rev = "00a73c8ca4e6fd1eb5ea84e6fc9b277694713ba5";
-          sha256 = "1higgnmrpp307vl9zb4qd40dcch9mwqmln1wv6v0a2kvzhd8nd21";
+          rev = "e803dde6f2f96c4513e6d91af8d1aa859e584c57";
+          sha256 = "1bqkwn2nl8dgky73jxhhll26skiyalwl07337qdl7m8gjc25kcy8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
@@ -26762,8 +26804,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "0a1ca0538cc8a72f6065140b893001d5ec9d04b3";
-          sha256 = "0i4rm8zkfa0d3arfwvhwbzxkbflhccj5202rqmgmjvkg18skl5l5";
+          rev = "d49c88c9f71f2b3b20779c223d6c0f7e6e0134c8";
+          sha256 = "091p3anl6nqjmy9rlizrg1vmrd2n72gmar6g2hhiw611231z135d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -27617,8 +27659,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d";
-          sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd";
+          rev = "5c05bdb9de39872649821ea3c70f3489741bcc66";
+          sha256 = "0g6578fpycfg7f5v3a7q6vaqgvcnxyf90yzg9mkjgis7b3im8jb7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -29270,12 +29312,12 @@
     google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "google-this";
-        version = "20160710.1720";
+        version = "20170810.515";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "emacs-google-this";
-          rev = "4713c93d4c45458a7320b5e2af9b1edd43fd5e0b";
-          sha256 = "0q8d10ihvqvnbp7gn19ixgi37cvpgyc5a8ls9nkr6w7valc4c0rz";
+          rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84";
+          sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this";
@@ -29375,12 +29417,12 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "20170522.53";
+        version = "20170811.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "c15bdcb78a46167e7a3fbaf5f71cbeddf2f13b78";
-          sha256 = "0pzzcjc41k3by534ii11jxfind4fq1cv3pqa3scisv4pvyj6lha6";
+          rev = "22f54d6c00c48f38a04a74990db501946405c1a8";
+          sha256 = "1p69i0w7gbc3fmgwx5mhb30qp7zfgh7sfk7jdvd7270k0nixs7qr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -29608,8 +29650,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "5a80ee1f6d026d6bf89320fcbe2b47f253c905a7";
-          sha256 = "1312sfr0nyl8bd2rjjm27l7x2hx9mby70bay0zyhyqznj12hlwpq";
+          rev = "606d6216c291c96f948e04ca481962c326771cf7";
+          sha256 = "0hkxdasgj8jn5dy7yjk3grgvxldic1azclnip24kyrmn36471n6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29664,15 +29706,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
+    graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
     melpaBuild {
         pname = "graphene";
-        version = "20161120.938";
+        version = "20170810.640";
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "graphene";
-          rev = "bf77248e49b116a241bd5856df918ed63f89e195";
-          sha256 = "1rn498l25vjy1wg45iskry8hh2afvd09cmg8dxppphjislw9pwch";
+          rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe";
+          sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -29685,7 +29727,7 @@
           exec-path-from-shell
           flycheck
           graphene-meta-theme
-          ido-ubiquitous
+          ido-completing-read-plus
           ppd-sr-speedbar
           smartparens
           smex
@@ -29968,12 +30010,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170808.1211";
+        version = "20170810.919";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "5a80ee1f6d026d6bf89320fcbe2b47f253c905a7";
-          sha256 = "1312sfr0nyl8bd2rjjm27l7x2hx9mby70bay0zyhyqznj12hlwpq";
+          rev = "606d6216c291c96f948e04ca481962c326771cf7";
+          sha256 = "0hkxdasgj8jn5dy7yjk3grgvxldic1azclnip24kyrmn36471n6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -30682,12 +30724,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170731.1629";
+        version = "20170810.1519";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "518701c157468659e393e40aed2bdc37bcb408db";
-          sha256 = "0646bk3ky0gv32dqiy7m40va82fcc5jpsbli7rz06zgg4nvh77h6";
+          rev = "783ea06cab61e16b86bb434d3c8a61076f564bb7";
+          sha256 = "0ypb3qilcnphxhsaskib5h8n4m2ivwka116jnjpdjrgwh838aakp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30762,6 +30804,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
+    melpaBuild {
+        pname = "hasky-stack";
+        version = "20170814.417";
+        src = fetchFromGitHub {
+          owner = "hasky-mode";
+          repo = "hasky-stack";
+          rev = "bbbe58bf11f0188dfc71d3786a1bef73b9650fba";
+          sha256 = "0x31qljrp83r3c34j0npjw49sy491la894x8g8vh5gbih8xd72jm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
+          sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8";
+          name = "hasky-stack";
+        };
+        packageRequires = [ emacs f magit-popup ];
+        meta = {
+          homepage = "https://melpa.org/#/hasky-stack";
+          license = lib.licenses.free;
+        };
+      }) {};
     haste = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "haste";
@@ -30951,12 +31014,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170809.345";
+        version = "20170814.46";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "35149d27981f0d617ee84d05f7e91ced22b43302";
-          sha256 = "0kcdfh9hwkyirfb77hls8xyg1xx5vxxiid921zlxyd42mq2bq0rh";
+          rev = "80dada6a077b29e2f05371b320ac4fcf7ab43b65";
+          sha256 = "10902xi9l4564qm4qv5vnw06xqgwl30i3cs9p6amlwcfcppwfmd4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31329,12 +31392,12 @@
     helm-charinfo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-charinfo";
-        version = "20170611.1746";
+        version = "20170810.531";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "helm-charinfo";
-          rev = "a4902a90bd9f012468ad8186e2548c7814847613";
-          sha256 = "024pqnw87whwa7zpld8bcz1izaymqk0vajhbf9m173hlfw6x7wmp";
+          rev = "91798a49dc115342a7e01e48b264e9a0bf5ea414";
+          sha256 = "1ifj6zz5k7qjalg06fvfc7rdmlha0n9hll2hiq7mrcj7lfac6jga";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/helm-charinfo";
@@ -31560,12 +31623,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170806.2108";
+        version = "20170810.2231";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "35149d27981f0d617ee84d05f7e91ced22b43302";
-          sha256 = "0kcdfh9hwkyirfb77hls8xyg1xx5vxxiid921zlxyd42mq2bq0rh";
+          rev = "80dada6a077b29e2f05371b320ac4fcf7ab43b65";
+          sha256 = "10902xi9l4564qm4qv5vnw06xqgwl30i3cs9p6amlwcfcppwfmd4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -32970,8 +33033,8 @@
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "0bba7cdced06a93eefc9b04d05fdbddf08ad377f";
-          sha256 = "0r9l4q7h5zk8i5f5hac54pvlb0y0nyzqy996lv6r8y2a734angay";
+          rev = "1db8ee9b6c1f8341612216e715b048ab225dedec";
+          sha256 = "0z9pcrb4xazv2a2m2kxy26kw0ai1lfnj53y967y40mrkbmsrsa6q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -33470,12 +33533,12 @@
     helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "helm-rtags";
-        version = "20170730.1306";
+        version = "20170812.2111";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
-          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
+          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
+          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -34517,6 +34580,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    highlight-function-calls = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-function-calls";
+        version = "20170812.1913";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "highlight-function-calls";
+          rev = "bbbbb7fdbcd853163a4bc821c56603164d35792e";
+          sha256 = "1a73v78w4ms2lghjai1dvk1kf8jgx7ab87vqk94x4a2xyrfhbf3x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1eed3f9af218d21ea8db37ee91888e23e59bd5/recipes/highlight-function-calls";
+          sha256 = "0wmxijkhx74da3ygnvzsdvbh2iii4f7424wmm01b5skbr7qva690";
+          name = "highlight-function-calls";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/highlight-function-calls";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indent-guides";
@@ -34811,12 +34895,12 @@
     himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
     melpaBuild {
         pname = "himp";
-        version = "20170808.1022";
+        version = "20170810.1117";
         src = fetchFromGitHub {
           owner = "mkcms";
           repo = "himp";
-          rev = "dcc116b2509a74a3fab41be1c095e1f6fffc7923";
-          sha256 = "00s4bb19jq48bldlcharym4757mbj0z5rag086p7mfhxa3wazmrm";
+          rev = "687ed90cbb1566fe09f7fb917c131c9f906f521d";
+          sha256 = "08dblmc68q233glpc7chv79a06rwly5nhkzfp3rzjvfphvnlihmq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp";
@@ -35101,12 +35185,12 @@
     hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-sentence";
-        version = "20140802.920";
+        version = "20170812.646";
         src = fetchFromGitHub {
           owner = "milkypostman";
           repo = "hl-sentence";
-          rev = "45e3cc525ba636c0f22baa6d0938d9808622bc89";
-          sha256 = "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs";
+          rev = "1235ec94af083c3e43559ce0cac6db485aa938e0";
+          sha256 = "1b58d79pkakfz2l31lg8nfkb1dfzrnbw4p5cs8mlxpfa5j4z13af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence";
@@ -35832,12 +35916,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20170803.1319";
+        version = "20170813.1058";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "ab67b29835ed550427b75e94784b63d98a00c0e0";
-          sha256 = "0mlzgql5xrjgbk9f269jnf3kxvymlcwnlvak4dfk2gwvi56phjzf";
+          rev = "b4fb3298cd071d56aa9a5fc6be51ae9871ad451e";
+          sha256 = "127l60rm1dhq1l5cwsnc5i2vh7xfzdagwlhy4wmjm22xs1ms6kn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -36018,7 +36102,7 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170726.849";
+        version = "20170811.1012";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089";
           sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz";
@@ -36222,22 +36306,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20170807.1445";
+        version = "20170813.2325";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
-          sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
+          rev = "e7194753330fb5da295fbb5d1e819b9b4fd926b2";
+          sha256 = "1ll19xlchf4br27yxr2f8jb3q5d0cypjjjj852d8g8pgs565amaw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
           sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
           name = "ido-completing-read-plus";
         };
-        packageRequires = [ cl-lib emacs s ];
+        packageRequires = [ cl-lib emacs memoize s ];
         meta = {
           homepage = "https://melpa.org/#/ido-completing-read+";
           license = lib.licenses.free;
@@ -36540,12 +36624,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20170807.1445";
+        version = "20170813.946";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
-          sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
+          rev = "e7194753330fb5da295fbb5d1e819b9b4fd926b2";
+          sha256 = "1ll19xlchf4br27yxr2f8jb3q5d0cypjjjj852d8g8pgs565amaw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
@@ -37401,10 +37485,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20170807.2112";
+        version = "20170810.1125";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "13l62fjq7g79s0ycj506fsvi16mmf1kqiqhbrj6f5n2j962k1qaf";
+          sha256 = "0nr9d2rqipbz2p30f1bmg10mbnndxqx9k6jj1qkmijhzzbk5w36l";
           name = "info+.el";
         };
         recipeFile = fetchurl {
@@ -37777,12 +37861,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170807.2147";
+        version = "20170812.1029";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "453d6d64c88df8ada4d6b9e4004c392d219e3799";
-          sha256 = "13wm0kz4ijl2smpw5ws5v97j19df5m9yw2iv4xgpcg4if9aby67y";
+          rev = "1c34f8e858eb11493078ca222fd0f598cf9f1e26";
+          sha256 = "115pqqyhinjpcjh1sigwcbqinwcslk19qmqxwxpwfka62j8c22x1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -38401,12 +38485,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170806.1231";
+        version = "20170813.351";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "9b071a8fb130fe8391d445706711bcc4de2b3998";
-          sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz";
+          rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
+          sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38531,8 +38615,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "9b071a8fb130fe8391d445706711bcc4de2b3998";
-          sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz";
+          rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
+          sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38569,12 +38653,12 @@
     ivy-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "ivy-pass";
-        version = "20170730.2153";
+        version = "20170812.1255";
         src = fetchFromGitHub {
           owner = "ecraven";
           repo = "ivy-pass";
-          rev = "b2d9b66583107694e8816e4e51809ebe9ee31d81";
-          sha256 = "1jz7bbr94bv4ql3xhxgdlhd0azjmhqiisc6bzcpwsf4q9jq42vwj";
+          rev = "5b523de1151f2109fdd6a8114d0af12eef83d3c5";
+          sha256 = "18crb4zh2pjf0cmv3b913m9vfng27girjwfqc3mk7vqd1r5a49yk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7bfef855e071442d2b9d1e0ce9b5706937bffc53/recipes/ivy-pass";
@@ -38636,8 +38720,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
-          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
+          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
+          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -39720,12 +39804,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170804.335";
+        version = "20170812.1419";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "91c745ad062d454834f646dcd16be6856a1db8b3";
-          sha256 = "0qr2pd2zhhwl6jw8mqy25wnig9v9nicc7plan0ni4dlbhljrx3rh";
+          rev = "048da26e17a1011f1466794218ff175acd503c31";
+          sha256 = "17hnal44lcbdb5cma1mlbf1flc73vnsbyjhd56hh4bw2qz47zvz9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -40159,12 +40243,12 @@
     jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jump-tree";
-        version = "20170809.708";
+        version = "20170812.2310";
         src = fetchFromGitHub {
           owner = "yangwen0228";
           repo = "jump-tree";
-          rev = "ff010ee6acfa9bee2486dd7b3384c12a802b0191";
-          sha256 = "1w7sncr5gdlyqk3bvm7zjif5yxp9sa6v82kk5zx04qdbsn9dn308";
+          rev = "d74a10e86dde8f54b9c3c5392735c0e4d2fc26cc";
+          sha256 = "1vqzy9ddmy8jsacxfd94qsdxcx5w310wdnsw115lvm7cl93l8jjl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree";
@@ -40896,8 +40980,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "4b77edeaf193c1e7dd2078b9516ce2cd20fe99f9";
-          sha256 = "0s1g1fkq0m68l7ly0i1jhf1jk7abpx0kiwgcv734gb4b2ddc625n";
+          rev = "0cc3a981220c228d68ce371c929808ce328a0b12";
+          sha256 = "1lxgp5isrl6c0zd03gv6r84qlgqqx4gf6b22yshhg333wccfl3h7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40976,12 +41060,12 @@
     kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20170719.1038";
+        version = "20170811.105";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "9a8472df0c89af867495541f1265cceccabb1eba";
-          sha256 = "0cw1lnclawc19ianjq0yhf1cnmcfcfv81158zjg9mnv4mgl6hzjl";
+          rev = "56440a40e0b43e639e0530414940b21cf4c24280";
+          sha256 = "0a1ld6kr244957yh2nlqcr9xf77kzgn9p2b5mhbmwphvfc0r3a1x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -41876,12 +41960,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170508.1319";
+        version = "20170809.1329";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "185e19f49ad05e9d813c10d24381f3e35b8c719e";
-          sha256 = "1vxfw5nqvbv12wp0015fg5cm8z1zirya4sbr1xbakc758fq5q8j3";
+          rev = "23d15ff1a54b8f034fa21bc597f680a37310dd8a";
+          sha256 = "1qlympn43shsx44clsgsdc88cdpqlwc1mwvdjkimypvpys5p6swz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -42258,12 +42342,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170731.842";
+        version = "20170813.913";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "3f7a041410a16bff68611a06f8d0bba766159f07";
-          sha256 = "165il7rpwwz2xc3cx49xshpkmd0zf8i97zj5p187hi62z7pi2xyn";
+          rev = "15017ccd229644a3b253937f2bb5e1420f197d6f";
+          sha256 = "1lldyv3ixgy3rsxyp6rfz5427vd9bds90rzvjxf747hn5ws6m110";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -42597,8 +42681,8 @@
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "c1a2903fbe4c7212960c886143105caceb3faff2";
-          sha256 = "1xv5yid7hzja97lvsfycpw9ss2yd69dzvjp9a54xp79ydvxwcc0m";
+          rev = "467285fa70dc5f349f2deb0d2950df037fb89f2d";
+          sha256 = "0sm2k5988rf0q1zwqsnklx5p7wp4wrma0h11q7jd8j7v8vniqryz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -42701,8 +42785,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "https://llvm.org/git/llvm";
-          rev = "c85760a9a3e892fb31ee1fab1e16393c5bb1ff1e";
-          sha256 = "0p7kja62xph1nmmpa4mbi3n8ipp5pjb8xvwbn6rfw3s2m8vmwjqg";
+          rev = "ef4534aee526b0ef3563e578644b0092057089fa";
+          sha256 = "057ag54lav5kv14c18hmf8x5d7fryc64afnn9kzlc260m4qkniw2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
@@ -43554,12 +43638,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170803.828";
+        version = "20170808.1712";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d";
-          sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd";
+          rev = "5c05bdb9de39872649821ea3c70f3489741bcc66";
+          sha256 = "0g6578fpycfg7f5v3a7q6vaqgvcnxyf90yzg9mkjgis7b3im8jb7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43771,12 +43855,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170730.2139";
+        version = "20170810.917";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d";
-          sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd";
+          rev = "5c05bdb9de39872649821ea3c70f3489741bcc66";
+          sha256 = "0g6578fpycfg7f5v3a7q6vaqgvcnxyf90yzg9mkjgis7b3im8jb7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43897,12 +43981,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "magithub";
-        version = "20170809.657";
+        version = "20170810.1947";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "5c3eed698fcbae53399e8c9d7d728943a516adb7";
-          sha256 = "1jgc0w5mwy2pg51yhca4hdhrdqkv7k33pbj1151wgway2zil00yh";
+          rev = "dccda82fff3532ac6af262f3020b4b063a223045";
+          sha256 = "1mn53vqxf8al0a8plx1wv502iglvgnlbi2adlllyh8vjjgfk3w9m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -44451,12 +44535,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170803.1101";
+        version = "20170812.1201";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "40dbc48c0db151b687d3a549df29c60383261089";
-          sha256 = "1jpc4yhiq6m8lyz0s26akbkd0ggnhky6i1c8711f1ci8rqm5ckha";
+          rev = "c79ab7eac618f54c73ffade336e043dc397ca032";
+          sha256 = "12m1hvm918gw5v1xgyc6yhlijsrq0l0875fyv5zbjs88svw52r7i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -45001,12 +45085,12 @@
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
-        version = "20170418.1035";
+        version = "20170812.2255";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "e1adf088e621c3446d04cb2222756edcb03eb363";
-          sha256 = "00yh92g9if4vgh2qzgf9ji8k88gj9k2k9ap055r4mlg3fcyf1r4n";
+          rev = "8473e12d1839f5287a4227586bf117dad820f867";
+          sha256 = "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
@@ -46039,12 +46123,12 @@
     mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "mocha";
-        version = "20170712.907";
+        version = "20170813.1957";
         src = fetchFromGitHub {
           owner = "scottaj";
           repo = "mocha.el";
-          rev = "60189c67a4800059411f71ca800d911240e8d22e";
-          sha256 = "1hqyy7piaara1hgba2jys923y395kpcf6i312zaw472ksixqhw7y";
+          rev = "ce9e42adf9333c68967597c17272b3a3c7564cea";
+          sha256 = "1cl4ncmynhrvmllbkkwnw3064vw93xalk4zzy4bpb2zf74vwl1gy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -47141,12 +47225,12 @@
     multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multiple-cursors";
-        version = "20170713.1847";
+        version = "20170813.38";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "e14fdb77a1f65465a61e8f69180505095cc2b7dd";
-          sha256 = "0ahy9sv57wc0djaxi9740z37pnwjk3a436zgmabj85ib6ykmla1y";
+          rev = "18f992bff596609091afca128b51a7d2e919ac40";
+          sha256 = "01xlbvnc74h450wm6falpj839nz04dmc2ll083zkndd3gfjk6g3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -48307,26 +48391,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "nikola";
-        version = "20170703.1321";
-        src = fetchgit {
-          url = "https://git.daemons.cf/drymer/nikola.el/";
-          rev = "964715ac30943c9d6976999cad208dc60d09def0";
-          sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola";
-          sha256 = "1i6z4gkh52fr9s506dqr3ccczank7c8zr0q1bg8ik5gbna0jv705";
-          name = "nikola";
-        };
-        packageRequires = [ async emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/nikola";
-          license = lib.licenses.free;
-        };
-      }) {};
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
@@ -48351,12 +48415,12 @@
     nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nimbus-theme";
-        version = "20170725.415";
+        version = "20170811.646";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "524e0a632b0932f269839c34c08bfd894719a75b";
-          sha256 = "1m4lh6hwzv4hmnh3zlic39df2bwqy5mpfgi8himyg4v3k0bdfskc";
+          rev = "26a5bd7d31d9c203aa4e1cc4961fb6cdf0ddc0f9";
+          sha256 = "1m326skvvirkf938ymch135p2gxxdyqx4plpvivp09qpfzrj0b1d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -48418,8 +48482,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "af765a8eab288eb638100e027b97a1d15e4e3026";
-          sha256 = "1mnzaa2c87pg12hgn5lfz1nxnyd8a9lfbar7imwr4jxih54ibdna";
+          rev = "f76e85d8f581cc8f71b66386e86ed93c2c3d6992";
+          sha256 = "0fh790mwr8q9ch0rvf3sp9mwrq5iya8w2dpbpazkl2lsll7d3nyi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -48771,8 +48835,8 @@
         version = "20170720.301";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "0967e46475be71d39daf928c9370af20b416f102";
-          sha256 = "045xazhax0svalzr4hiv7yd0373q1dfdgq9mdk6avx6xdpk2fqcf";
+          rev = "178d62cf9c9959fe603c9ffef9fa90f65b67dcd5";
+          sha256 = "12f91c5a11f4sn27a259h5mv1jw4s71gh27caq5nk8ixr1ra9ikm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -49314,8 +49378,8 @@
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "ob-coffeescript";
-          rev = "219c83f6c44e3612a7718c996365df1de747127d";
-          sha256 = "14va23m0wab1jf6jc5m61y2c0kcmc8dha463vyci1mvs3p1psjr8";
+          rev = "b70f3d822c707cb02333fcb739ba4874614cad2a";
+          sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
@@ -49328,6 +49392,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-crystal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-crystal";
+        version = "20170811.57";
+        src = fetchFromGitHub {
+          owner = "brantou";
+          repo = "ob-crystal";
+          rev = "4bfd36c922d28e8a204218bde0e889cd1097ec04";
+          sha256 = "00rlxm0gj2arcnjhy824id08gxpha73ikfipar780xm845ripm3j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal";
+          sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n";
+          name = "ob-crystal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ob-crystal";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-cypher";
@@ -50150,12 +50235,12 @@
     octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "octopress";
-        version = "20161222.343";
+        version = "20170813.615";
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "octopress.el";
-          rev = "85bab12adbd985767233eb1622c4b8f7c1fe7e1a";
-          sha256 = "012g0mf8g602f53x3bc35ahy4bq31s3m7cv13hm46zj8syvdckvq";
+          rev = "b4c25df9e3ccf49ac27c0a152daa4e27d1247d56";
+          sha256 = "0zidh929sc1wi695ibzglbybfvxz2rj1365mij97088wwdk5dyz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress";
@@ -50381,12 +50466,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170804.158";
+        version = "20170813.2215";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e";
-          sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01";
+          rev = "a9a66b047606c6b5dc48abdb0eb70a1f9dcd08f2";
+          sha256 = "0m1f62cr0h426g66c7r36v3yr2bdakkjwxzdvpd0gh81xazn8yjz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50913,12 +50998,12 @@
     org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-brain";
-        version = "20170809.633";
+        version = "20170814.404";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "org-brain";
-          rev = "7a35d6043a1ffb5d2fff14bface51a57d4f7ab2b";
-          sha256 = "0mcrlh3y3jqffn6d92gyi3c1nh4vn4b1xclmhh2dmbl4haypk40b";
+          rev = "f572bf29d6592f587b671b215394cf459dd574b9";
+          sha256 = "0f8nf4mljf2xfkwvn9n2d612sy02mk4m19lnx5pidjmm5a50id6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -51001,8 +51086,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184";
-          sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv";
+          rev = "480408737e8110a13ac5282588f1a4a5b86cd0e0";
+          sha256 = "121gx8wp38j4j2sqcx5jb91l7pq5214h2cc9qs1sh293a481wl24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
@@ -51081,12 +51166,12 @@
     org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-clock-csv";
-        version = "20170326.1041";
+        version = "20170813.1602";
         src = fetchFromGitHub {
           owner = "atheriel";
           repo = "org-clock-csv";
-          rev = "0bae215df11e5602b07294e83b595447ae73ca0d";
-          sha256 = "17im4njl1w5wm0rxvib2g7v0ibg1p6n0ibq480wwz204jd98q4gv";
+          rev = "e45d277a8811ee228119349f51af9788befb3b22";
+          sha256 = "0fg1ky6aw0hmm6a6zv0i4f8h9xam4d65cnpm2k2a3p1zpn0yzdk7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -51358,8 +51443,8 @@
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "2f645cf910b21d0ea63da58ad32f02cf8a6fb178";
-          sha256 = "0qkdyfkk6xflhsb127208623qbhxcxcvagw0v8yksw2ypdaypd4x";
+          rev = "4c22ff6d63f2126f2526b68201ecb5a379812534";
+          sha256 = "0q20hz14pghlxi1df8qpdr3jkz3ph87c5qv1s264kkhjknip1yn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
@@ -51692,8 +51777,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "8ab9a82be2a6178063e395a6ab3d2b9e083059c3";
-          sha256 = "0314hjdlvwgc2zp7vicg8afnmd3dggj22h26dwmq5ngd3vwih4yg";
+          rev = "39b7357eea3550a695ec36d2810e31e89d8d0953";
+          sha256 = "0wch4wyn7k86xy7nc2rjszkkd73k80jl9dafhj0ihkvgf3za10bh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -51712,8 +51797,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "8ab9a82be2a6178063e395a6ab3d2b9e083059c3";
-          sha256 = "0314hjdlvwgc2zp7vicg8afnmd3dggj22h26dwmq5ngd3vwih4yg";
+          rev = "39b7357eea3550a695ec36d2810e31e89d8d0953";
+          sha256 = "0wch4wyn7k86xy7nc2rjszkkd73k80jl9dafhj0ihkvgf3za10bh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51906,11 +51991,11 @@
     org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-parser";
-        version = "20170728.2120";
+        version = "20170811.2231";
         src = fetchhg {
           url = "https://bitbucket.com/zck/org-parser.el";
-          rev = "0febaec75eda";
-          sha256 = "1vvxpldjd2y95y3935z16g4v6agz02k1d9c0pb0pr41ms60q0b9w";
+          rev = "018959e57cf5";
+          sha256 = "0xyw7k195bvx7c0cmhwfjc89v7b0gfybsl4hgaid71fz2czjhx6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -52030,12 +52115,12 @@
     org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
     melpaBuild {
         pname = "org-projectile";
-        version = "20170803.634";
+        version = "20170812.1500";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184";
-          sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv";
+          rev = "480408737e8110a13ac5282588f1a4a5b86cd0e0";
+          sha256 = "121gx8wp38j4j2sqcx5jb91l7pq5214h2cc9qs1sh293a481wl24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
@@ -52055,8 +52140,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184";
-          sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv";
+          rev = "480408737e8110a13ac5282588f1a4a5b86cd0e0";
+          sha256 = "121gx8wp38j4j2sqcx5jb91l7pq5214h2cc9qs1sh293a481wl24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
@@ -52345,8 +52430,8 @@
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-super-agenda";
-          rev = "fd3b18dd2a4b0aa77d60e4b3af4288b62cae9517";
-          sha256 = "0cr6jv58lj7483vwm75yc4nncjkw4723dizdysd6qypq5px65zr6";
+          rev = "98684212cc0879b8c24b21d5047181fcca24bd9d";
+          sha256 = "09zpyqgg2bcad793qi2kw2zb3dn03g7x8fx3a6mjyh0jvfqaaqz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
@@ -54009,12 +54094,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170807.1657";
+        version = "20170814.616";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "421e03d4faabea31b9135f7e2d1fd3a8cb3649f8";
-          sha256 = "1md21a3clabc1xcs94gqy671wpxsbjr009c5dv2sxrq6xrdg1isz";
+          rev = "c01d652cefa29df27139e52468f39fd98337746b";
+          sha256 = "0l6lr4bmfcdr1mviyqiwzbkylag1avy0wja4il4x4ia2r92jw89h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -55242,12 +55327,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20170809.1007";
+        version = "20170813.731";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "a5dfc038e989af2a4b48265a07d26222c9d1212b";
-          sha256 = "1zjws8yafh3zwnfm1jw92w6f5f1vdcbyj1h7v3i19ixf19h2af76";
+          rev = "0bff9727b7109f5303c4172f1f7b603e8e484c91";
+          sha256 = "0gdxvmzsf7v621y32ir33rn26qs75i59jvi2b2ji18xh32znqmb1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -55618,12 +55703,12 @@
     perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "perspeen";
-        version = "20170711.2304";
+        version = "20170813.1754";
         src = fetchFromGitHub {
           owner = "seudut";
           repo = "perspeen";
-          rev = "d69a7bb554d6eb003b7c5c222cbdbaacc7e01df0";
-          sha256 = "1r3c352i4vkzqi5rcyniaa2x05jjpq9x8j43bbs4m63lczik75mz";
+          rev = "6b3a3b0468199a8db10a73d119dfcd8833d181b6";
+          sha256 = "13rivw5rafl4pb68l500ksbzpz00yp7lx9wi9vy8nz0hwr80jd0p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
@@ -58185,12 +58270,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170704.2358";
+        version = "20170814.522";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "c917c6e188de27331815f39511ed45a408de22d0";
-          sha256 = "11f52g8r5zb34nigm68gm8hwgkw184psknd7zqya0l1ipwkhhrif";
+          rev = "d1dbd67ebdee9405ac95b0fbd71210df54457fb1";
+          sha256 = "06v3wix90y92rjp769hrl92p57p60acf1b9mpdllcy48l6q0p074";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -58210,8 +58295,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e";
-          sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9";
+          rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
+          sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
@@ -58504,8 +58589,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "35db2675b418ea105ef89f88fd1bf0257eb8a3ff";
-          sha256 = "0xfrbz1xal8xkg1s9z5mlzqc6qvrjdy9i98g4crmwhvjvv58wff0";
+          rev = "e0d24cc84a81d236daf0bbf783037c8c8c24d814";
+          sha256 = "1pw89g82cc7687n3ffap9pzj3af1zagpx2j880dayii1hrgk1p7i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58766,8 +58851,8 @@
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "2fdd31ff1ae1ab23eeb08d5af936b1bb9b3e51b6";
-          sha256 = "017f899qg3pdm18mb3i7v3x2j4gpqcinscxds8jwjq2ll5d5qf2j";
+          rev = "fb1b683191d767eab312ea424de3517062d86420";
+          sha256 = "12kxxgm61myna4wf3hgai8dgrssc9dnv75fh2mbcgwqggbfv8wlv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -59373,8 +59458,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "62dc3d2f5eb57a70088a9b9959b6eb139cca227c";
-          sha256 = "1cjdn499i5cn6lindzgnmhp9370pg9fqjpvngkyry16xs57fmz4a";
+          rev = "8b4c0717fe6b73d329532ca74d408790c64a2b6e";
+          sha256 = "08v7cskyq6l9d6idw0piz54gz1xw1dqhl21r0xnhh16nza0ihrvf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -59516,12 +59601,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170803.405";
+        version = "20170813.50";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "85978be547434adc9c673cb3cfb7e7cf8729d514";
-          sha256 = "0diczpxf8ax6ci8j18ac92nslj7l6spl9a8fazdy1w9j9dmgc7s6";
+          rev = "8c3d55344fecd2837a3f268472f89866365fb54b";
+          sha256 = "0cnzj17wrs5590kc84kywdk5xbs2149kygb3ys74jcli7zvg8bbh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -60988,12 +61073,12 @@
     redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redprl";
-        version = "20170808.515";
+        version = "20170810.2004";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "0b881a3f73cd6fafddfbd602a1abda5f8fc7ab98";
-          sha256 = "0s4iakcpjiwvxjdcmn22yfsr0ya0h4xvpr713d0h9yjdbblx1m20";
+          rev = "41370a8b7ae0d6273dd096d1f639485531f02859";
+          sha256 = "1gp8lcavxg9v3wll2kk1gcd63p0zlcxg7vc9753k7nk741rc2m1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -61883,12 +61968,12 @@
     rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rich-minority";
-        version = "20160725.1255";
+        version = "20170813.622";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "rich-minority";
-          rev = "478f0fbc0dbba6619a96a471b9b295f2f436475f";
-          sha256 = "1n07bvjaz468zbd7am3rmw98a97clz8p4x6ryhbd4riqmfh845wi";
+          rev = "333e4669f76a0fb68b433117d377711e418a525e";
+          sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@@ -61922,6 +62007,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rimero-theme";
+        version = "20170813.556";
+        src = fetchFromGitHub {
+          owner = "yveszoundi";
+          repo = "emacs-rimero-theme";
+          rev = "ed6ad6ac4c67366f7fbdcf94bfe74b2f6683b395";
+          sha256 = "06ifk0i13zy915zv46wam3pyv92xn5sjil02kdgxzn68ry76xddz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme";
+          sha256 = "0jbknrp9hc8s956cy2gqffxnx0fgnhmjqp2i4vyp0ywh45wrls5r";
+          name = "rimero-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/rimero-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }:
     melpaBuild {
         pname = "rinari";
@@ -61967,12 +62073,12 @@
     ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ripgrep";
-        version = "20170602.152";
+        version = "20170810.1118";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e";
-          sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9";
+          rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
+          sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -62244,8 +62350,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638";
-          sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m";
+          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
+          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -62306,8 +62412,8 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59553";
-          sha256 = "00lwwhwq1bzmkr97q22frmzwm4g1kddgiyzlmfwv16k0g3ihwydg";
+          rev = "59588";
+          sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
@@ -62384,12 +62490,12 @@
     ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-electric";
-        version = "20170808.2046";
+        version = "20170810.430";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "ruby-electric.el";
-          rev = "d04313dbee42c0d1009558a7c9424e4ae8611908";
-          sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm";
+          rev = "3553448a780a1ea5c3b0e9becd820d4762876593";
+          sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
@@ -62657,12 +62763,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170805.952";
+        version = "20170813.2341";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "b10ad4177786a139623984c4855eb9de3864c697";
-          sha256 = "1dxsw71yxqzpnsr2cy7ba3mmzsnjp8kw0la6d7wc67m704fxymz3";
+          rev = "6e9db4665036ca6f0fe8eecf55cd243eaebccc62";
+          sha256 = "1j9zl6maz8glrr0ri4hsw56sdf8s93f2n908j43ix6hy2qnaxfi3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -63639,11 +63745,11 @@
     secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "secretaria";
-        version = "20170430.1724";
+        version = "20170813.1107";
         src = fetchgit {
           url = "https://bitbucket.org/shackra/secretaria.el";
-          rev = "7551dfa21a4a796e0306041145c32c2ec8738028";
-          sha256 = "1wiqk8ja3wjv7kmnnd93fg9rync08wjyhy1ssxan5csqfg89vw5a";
+          rev = "7bd1cf591528b18a153e15a260d7817b72c900f2";
+          sha256 = "0n9mj2g59yiqbg81rk0gglbgpvfs550r4y26n8nf5pyxpxfllv5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@@ -63852,8 +63958,8 @@
         src = fetchFromGitHub {
           owner = "sbelak";
           repo = "sentence-highlight";
-          rev = "f47839853455d0f4ffe50b3b0f9d3e7a15ace1fa";
-          sha256 = "11s5zvwklf5vzwiiwmcw5c93qjvf5nxclbbk8hlj8fg88c5ssbzd";
+          rev = "c7a501f38de5a9b52b1f30e21299fe1c374a27c7";
+          sha256 = "13idmpw7nz75bpjbi85pv89annqqffc0gjizsazbzfdm21i8p7y6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight";
@@ -64659,6 +64765,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    shrink-path = callPackage ({ dash, emacs, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "shrink-path";
+        version = "20170812.1947";
+        src = fetchFromGitLab {
+          owner = "bennya";
+          repo = "shrink-path.el";
+          rev = "9d06c453d1537df46a4b703a29213cc7f7857aa0";
+          sha256 = "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path";
+          sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb";
+          name = "shrink-path";
+        };
+        packageRequires = [ dash emacs f s ];
+        meta = {
+          homepage = "https://melpa.org/#/shrink-path";
+          license = lib.licenses.free;
+        };
+      }) {};
     shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shrink-whitespace";
@@ -65228,12 +65355,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170807.711";
+        version = "20170814.116";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "e9cdebc689bb7780d0c278bf63577103fffc4aeb";
-          sha256 = "1yys57pn7bym8galpf1k88xc5gs70xsv5fd1bdpq5k93is135js1";
+          rev = "b5ca813fa5c56f65fd1302d29f5babd0965a0751";
+          sha256 = "128wggbny4z6zhr9ldw3blrj5mbgvdl5bfap7i7v8pnzz660z9wy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -65484,8 +65611,8 @@
         src = fetchFromGitHub {
           owner = "davep";
           repo = "slstats.el";
-          rev = "ebadbf5e3ffddee788f5ec09f759ed7eef6e1dae";
-          sha256 = "1dn81r7dkj5pbl4adps7gcwn2yrxmap0ds6ninjzyr18m4lca7zb";
+          rev = "5e86904ae3facafb3204607c08f8b14aa53fabec";
+          sha256 = "05h5wsv2a4maqrsvr5klj1pqnhaj0cxlzyv7dvs5vb9wkd0mblzc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -66995,12 +67122,12 @@
     spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spaces";
-        version = "20130610.49";
+        version = "20170809.1508";
         src = fetchFromGitHub {
           owner = "chumpage";
           repo = "chumpy-windows";
-          rev = "164be41b588b615864258c502583100d3ccfe13e";
-          sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
+          rev = "6bdb51e9a346907d60a9625f6180bddd06be6674";
+          sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa5d57074f73cf11607f2f1610f92a0c77367f2a/recipes/spaces";
@@ -67286,12 +67413,12 @@
     splitter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "splitter";
-        version = "20130705.50";
+        version = "20170809.1508";
         src = fetchFromGitHub {
           owner = "chumpage";
           repo = "chumpy-windows";
-          rev = "164be41b588b615864258c502583100d3ccfe13e";
-          sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
+          rev = "6bdb51e9a346907d60a9625f6180bddd06be6674";
+          sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/129f0d20616226c449bdaf672c43a06e8f281869/recipes/splitter";
@@ -68891,8 +69018,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "9b071a8fb130fe8391d445706711bcc4de2b3998";
-          sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz";
+          rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
+          sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -69346,12 +69473,12 @@
     systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "systemd";
-        version = "20170708.1534";
+        version = "20170727.504";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "systemd-mode";
-          rev = "9cfd31533742859fa081b79aceafac315444a4b3";
-          sha256 = "0gckwjzqlqyl740r73bh3x5x4wina0irc7krgj2xp68xh4x7nw8y";
+          rev = "2c71ec55291eca382305b1f31020e0396907534d";
+          sha256 = "1fj7hh0p33kscjbcqkf91p2bg1fq1jgfq1i5wkgjdgwg6rg2rb62";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -70560,8 +70687,8 @@
         src = fetchFromGitHub {
           owner = "davep";
           repo = "thinks.el";
-          rev = "15e0437f5b635bdcf738ca092e26aa6d8ecdba36";
-          sha256 = "1i2i8c53z8n48407jaz641adszv13yjg8cvq4k3hijddp651k555";
+          rev = "c02f236abc8c2025d9f01460b09b89ebdc96e28d";
+          sha256 = "0g4ls668kyqnh4xkvz1s1z9j6n0a1gkgrzgl98hys7hny6zrk7aa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@@ -70623,8 +70750,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "0a8c34ceedf0f9272fb6d3519596ddf90cffcac2";
-          sha256 = "1bhcn79l52m5ad4z8sv9165vsib2rvmqcf1sdaisrk7nfqwvy8sc";
+          rev = "ec64f23d236d7874e3b28ae86c833f57c7aa3389";
+          sha256 = "0b819jbs0318dap8nfvs6ljfiw5qiqbhgda3czq4vns728m0rqsa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -71484,22 +71611,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    tramp-hdfs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    tramp-hdfs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tramp-hdfs";
-        version = "20151028.2036";
+        version = "20170809.1508";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "tramp-hdfs";
-          rev = "82683b45eabc09f327ea45a9e8faba0524eada29";
-          sha256 = "0llzfn9y3yyz2wwdbv8whx8vy2lazbnww6hjj0r621gkfxjml7wd";
+          rev = "c8eed61e56b06a23ec631ad3c29e61b230a0eda1";
+          sha256 = "1k7mzs7mlixlf2v4h3s794b5b4r7pikdkq5b21zwhdmhgqhmrgcn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs";
           sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b";
           name = "tramp-hdfs";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/tramp-hdfs";
           license = lib.licenses.free;
@@ -71550,12 +71677,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170804.559";
+        version = "20170807.823";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "c9de81914e2688dc1c6a3b2bf70013a2a5ed0b63";
-          sha256 = "1vlla25lk75s84ns2svxdnvwfwhwp6jigmsq5v4s7k9xq5py0df7";
+          rev = "b165329a21b9d2693661372f4802208f52029c7a";
+          sha256 = "1lksw9nxvaml4ykhr6m8na3dcwk13r1q86hncyk3ybrg5w9663bq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -71655,12 +71782,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170809.1104";
+        version = "20170812.134";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "0b413fc58d9bffd30132ee33dc4c98f9717e53df";
-          sha256 = "0lwy721n9f18mxs5xz9cgfc2rpqrz44yiw6vvy9bxmdfhq51rlaf";
+          rev = "a984df7da28625704544f9e344bc1653c7b35f87";
+          sha256 = "1y6il029nj7s6ik1z92rcxg3vdnny4jx5zbjhqi0i62qrs44r58m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -71680,8 +71807,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "0b413fc58d9bffd30132ee33dc4c98f9717e53df";
-          sha256 = "0lwy721n9f18mxs5xz9cgfc2rpqrz44yiw6vvy9bxmdfhq51rlaf";
+          rev = "a984df7da28625704544f9e344bc1653c7b35f87";
+          sha256 = "1y6il029nj7s6ik1z92rcxg3vdnny4jx5zbjhqi0i62qrs44r58m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71905,12 +72032,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170803.331";
+        version = "20170813.1222";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "3dd1684db5d085f1b668d19646a4051a3261f34e";
-          sha256 = "1d7yc0iqmxxqlcsbbci4wcz49sbfj6pdvbr7d98dsjxrg6pgjzjh";
+          rev = "94428c76d247e26e35964f68f9991e04f26007e8";
+          sha256 = "1q76jv34xm12hn8n362mlh1j44rj020nyc2cy7s30ayk750lklbp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -72178,12 +72305,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170710.427";
+        version = "20170813.1541";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "1cea84486f937946a90caacf2a7c86ca855d1c9d";
-          sha256 = "0s9gnlm52rsdda0qzfn89sjawd5r5qxdc878y11cak9zz4h6d706";
+          rev = "2c43dd034c156762589f80f7c6163a2bd35b51d0";
+          sha256 = "1xyalhrv7d8fa32xsyx044bxcxk7shm44hcjrncghps9w21zfdwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -72487,12 +72614,12 @@
     underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "underline-with-char";
-        version = "20170714.1511";
+        version = "20170814.223";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "underline-with-char";
-          rev = "b792d4f822bceb0ab0ee63ddcaeddc2085ed3188";
-          sha256 = "0s2p2kjw00p3j9z6hj0d89z3bbwcs12z0h0hg5bjxcb1580dqxhq";
+          rev = "6daeba77e17dc11558ca3ccb0495524f5104d581";
+          sha256 = "1i6qgkzn8rlv44mjc4b9sksr4wpnj9a1b6p1y3g6fqpvhy5pmygg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char";
@@ -72999,12 +73126,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170710.1234";
+        version = "20170812.2256";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "7b055494e39efba8b237202b7c97f40aa19e2579";
-          sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n";
+          rev = "360df30683a711c443f87e495ba14cdd125a505d";
+          sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -75009,12 +75136,12 @@
     whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "whole-line-or-region";
-        version = "20110901.130";
+        version = "20170814.20";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "whole-line-or-region";
-          rev = "a60e022b30c2f4d3118bcaef1adb77b90e0ca941";
-          sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
+          rev = "ef89af99009229af20a0a2f6c277138d92ed7085";
+          sha256 = "0by8lfkpzpmms57fj9mjimxmg3an9q7iyl3nghzdfhcngp0bprvy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region";
@@ -75095,8 +75222,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "38d2aca88b4afd2ade7f38df7275a3d31324df3b";
-          sha256 = "1bahwsx1cpima658bg62w63a4s24vp0qpw0gmxb245cyzpi8ng2j";
+          rev = "caa51fb2a48d79609bbbd3a012e149e4998a98c4";
+          sha256 = "0pky2xi1h3kzi0pykd5c568rhpq6bq2z2pknzw75rnd0h5j4sj59";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -75257,12 +75384,12 @@
     window-jump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "window-jump";
-        version = "20150213.1236";
+        version = "20170809.1508";
         src = fetchFromGitHub {
           owner = "chumpage";
           repo = "chumpy-windows";
-          rev = "164be41b588b615864258c502583100d3ccfe13e";
-          sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
+          rev = "6bdb51e9a346907d60a9625f6180bddd06be6674";
+          sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d44fc32e12f00bbaa799b4054e9ff0fc0d3bfbfb/recipes/window-jump";
@@ -75569,12 +75696,12 @@
     with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "with-simulated-input";
-        version = "20170807.1512";
+        version = "20170810.1158";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "with-simulated-input";
-          rev = "9efeb236c8f6887a8591d6241962c37266d8e726";
-          sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g";
+          rev = "5a0d3f039965667c6a8d36bd2cbfbd9c22299033";
+          sha256 = "16dx6fzla7jzjxv7yzn8b9qwj2ja17x02rxzglyrg9mf4kd1y9yp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
@@ -76073,12 +76200,12 @@
     xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-css-mode";
-        version = "20170804.2244";
+        version = "20170811.2157";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "a91d934e15343738393cb2dc7a75d712581d09eb";
-          sha256 = "14b1aw1iffhk7gk0fwyrjb40173cli968hy6x72mmgq3ry664h44";
+          rev = "ed30c4530647de0016e3e03b8f2880591b901a05";
+          sha256 = "1hfx3qy2wmxg75wfzjdglglpm1ai04jafqrv2qx4kh0q3ra7yzgq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -76094,12 +76221,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170804.2206";
+        version = "20170811.2138";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "174fdd95edb77820a03eb161e3ab6b867936f9fe";
-          sha256 = "1l3a6hkhv26ixkmjc1zfl43zx8s0c3czk8zgahydpjx111q5381d";
+          rev = "f9059b7a081da8981ed6ae4cb2f5a325e7775553";
+          sha256 = "10f3dna1mpnjia87w5gkqkqrvkrg1h5zm33znsmgzwlqgzkhq94d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -76115,12 +76242,12 @@
     xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-find";
-        version = "20170804.2234";
+        version = "20170811.2149";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "6b70b8122643402aedcc1cf88406330628d92286";
-          sha256 = "0gd7nsx205s33dxjx52cc4k8frdxrnwsvl7qkx8mckqvc1y2wxa1";
+          rev = "9783b74a5f3593db6c86e929b58f2cb9d5bc8624";
+          sha256 = "1ssd9kzn7nfqr01mb7shzkwkz61028580dkvzgxxs80403gs373q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
@@ -76136,12 +76263,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170804.2154";
+        version = "20170811.2147";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "4a7da476edf9eed9ad7725fe31113b87f97696bd";
-          sha256 = "140gxnnxqk649j60d3aibs42si95vakmy6m937gb25b2bmvhkwwh";
+          rev = "90eee20efad8cd6902ca6ce7426f62c934f047d8";
+          sha256 = "1wccz83nfig4i6xp8di1rvs678w9a20dbfd5j932hazvw3796gvj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -76157,12 +76284,12 @@
     xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-get-thing";
-        version = "20170804.2211";
+        version = "20170811.2155";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-get-thing-or-selection";
-          rev = "00aa90c74f6e23eb9dae3082a16454264f9d1ed8";
-          sha256 = "0xp8w9myhdwiw7m2zj9bd2kc93djx35s3iss5yrz92kcw6m3n53m";
+          rev = "4e0782af230292b18e787bee43d3c94750383a1b";
+          sha256 = "10xlxk95s7dxwmbylbhbwa3px5z6add8ash0gkgqjb4ibdfrclzi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -76178,12 +76305,12 @@
     xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-lookup";
-        version = "20170804.2259";
+        version = "20170811.2143";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "lookup-word-on-internet";
-          rev = "7f4e9252d5f84438c83912720bcd313092f8f44f";
-          sha256 = "17fq0b2rc9wjjii17mnybp8v3nvp297azkd2bwz952r0x9g2s92b";
+          rev = "feb480cdfd0b3e6751cc589fbf40538daa60b75b";
+          sha256 = "1x1pdpngv6k1gwi7x2nsqni778wssicgsrddxaskri8axkxdiq65";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup";
@@ -76199,12 +76326,12 @@
     xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-math-input";
-        version = "20170803.722";
+        version = "20170811.2145";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "8c988bc469209e7f393fa5a1ac4663bfb713c7a7";
-          sha256 = "1ndczz69v70c13jdb651yiqnk1avy78i11ydbvr0qf78gd859i5j";
+          rev = "2575611505d057061938ca21df621c6f9cac4cc5";
+          sha256 = "0mmbvyqihg0036cix3xh2phq68816zzcnp8cf4yc42hp1aksg770";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
@@ -76241,12 +76368,12 @@
     xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20170804.2216";
+        version = "20170811.2151";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "1249d62fe1d962e38ab8d9e48813c1ad5d21ae51";
-          sha256 = "0i8r7kv2kai1r1fs509j3lx4kzv8bv6qsb3882qh6hjcnlpf0pyy";
+          rev = "fb72b406ae171e840798172321e72e32ba904276";
+          sha256 = "01ilk5ic884nfili823zp05ylrnj9iqhwc2v8brc908f23mbdf79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -76560,8 +76687,8 @@
         src = fetchFromGitHub {
           owner = "CQQL";
           repo = "xresources-theme";
-          rev = "09a0bfc1684161dd1cdc899c027808a99646a652";
-          sha256 = "171vffga2yzxqmgh77vila6x96bz1i6818f1pfaxblw1hz2ga341";
+          rev = "feb0552d31cb54210eabbc1abe32c8ea62841b6f";
+          sha256 = "1dfksid7dc27dz43lrriyr724qs7pf7dqhkmcai6b5qbi893ib8y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cef3a5683ea572f823d915ec2a94d591ac915d6/recipes/xresources-theme";
@@ -76791,8 +76918,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "fdff36994bc59bb02c1968684862ded9003c6c7d";
-          sha256 = "0w38s7xl77ch8h65x2njn9nwvwdxjw7rz15gw2qmp69sjv4nvnna";
+          rev = "7652ce2c926084a893b26695a765ba8b8f4ba328";
+          sha256 = "09mzglx049b2xcrz8g7iywxbr79haf1xbcs8qnj1ljypmdmkq89a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -77097,6 +77224,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "yasnippet-snippets";
+        version = "20170813.416";
+        src = fetchFromGitHub {
+          owner = "AndreaCrotti";
+          repo = "yasnippet-snippets";
+          rev = "21fc956845bf7aff4a84511a813d3afd3a620a40";
+          sha256 = "00balpdz6gpyngzir0ddvw492bbv045spchaxkf1lxc0pl0ldjh9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
+          sha256 = "0i6rk50a9l26r47v9xsnx35ziz4spx5pml3ys8y30n0r0xjdsj51";
+          name = "yasnippet-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/yasnippet-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
     yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "yatemplate";
@@ -77442,12 +77590,12 @@
     zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "zephir-mode";
-        version = "20170808.1302";
+        version = "20170810.2302";
         src = fetchFromGitHub {
           owner = "sergeyklay";
           repo = "zephir-mode";
-          rev = "9295bb18b273502dfcc75c34c04ce9f48fe4e53a";
-          sha256 = "17wsl7c9fcr6qybr7qhlvkikb11n809cxi6ghgskh131a8mxb4fn";
+          rev = "5c8fcf633709b70f87015073a5d48556fc930b76";
+          sha256 = "1c671ncrb4dmrmbx5p7qqxv01wah63cjisn60mhrpzjcyg8w8hss";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";

From c20d41de0e3676c8e511428d93b3dbb11d21732b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 14 Aug 2017 09:42:41 -0500
Subject: [PATCH 2098/3246] Revert "busybox: downgrade 1.27.1 -> 1.26.2"

This reverts commit 9c3702ad35b796a8799ffd6424ede60947ef8e99.
---
 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 8adad41fb3b..bab8c5502de 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -27,11 +27,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.26.2";
+  name = "busybox-1.27.1";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns";
+    sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

From 3e8d68e5140ef491fb6288c0093e24697b5171e1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 14 Aug 2017 09:41:48 -0500
Subject: [PATCH 2099/3246] make-bootstrap-tools: Fix config opts for ash
 builtins after upgrade

---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 2ce73eb781d..c8cddf248ab 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -21,8 +21,8 @@ rec {
     enableMinimal = true;
     extraConfig = ''
       CONFIG_ASH y
-      CONFIG_ASH_BUILTIN_ECHO y
-      CONFIG_ASH_BUILTIN_TEST y
+      CONFIG_ASH_ECHO y
+      CONFIG_ASH_TEST y
       CONFIG_ASH_OPTIMIZE_FOR_SIZE y
       CONFIG_MKDIR y
       CONFIG_TAR y

From 59ad93a4f37bacdf442090181102beaf9b7bf53f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 14 Aug 2017 22:58:12 +0300
Subject: [PATCH 2100/3246] travis: Hide more unnecessary build spam from
 installing nox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should avoid the 28 lines of unnecessary spam about fetching stdenv
and bash:

````
=== Building pull request #28261
these paths will be fetched (0.51 MiB download, 2.50 MiB unpacked):
  /nix/store/2pm24nzym7z11nddnf6vmqhsqmzx9h3g-bash-4.4-p12-dev
  /nix/store/3n6g5nmyn63gsgjc7z03rsd88s2q7b7i-stdenv
  /nix/store/7mpcc6x6b3db595rsqr1qjckpaj1dym8-bash-4.4-p12-info
  /nix/store/d9hb8f6j2syq08hw97qajdcdkl9lwg9n-bash-4.4-p12-doc
fetching path ‘/nix/store/d9hb8f6j2syq08hw97qajdcdkl9lwg9n-bash-4.4-p12-doc’...
*** Downloading ‘https://cache.nixos.org/nar/013kcshsm2hzpngmrf4izq3ag8s9avrkhz5z8l8mgnxay1lxlz99.nar.xz’ to ‘/nix/store/d9hb8f6j2syq08hw97qajdcdkl9lwg9n-bash-4.4-p12-doc’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  357k  100  357k    0     0  3342k      0 --:--:-- --:--:-- --:--:-- 3408k
fetching path ‘/nix/store/2pm24nzym7z11nddnf6vmqhsqmzx9h3g-bash-4.4-p12-dev’...
*** Downloading ‘https://cache.nixos.org/nar/1225myjpymp5bv0x5zl08dmdz786jf86fshc2dwa3zgxasrppcfi.nar.xz’ to ‘/nix/store/2pm24nzym7z11nddnf6vmqhsqmzx9h3g-bash-4.4-p12-dev’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 54312  100 54312    0     0   231k      0 --:--:-- --:--:-- --:--:--  232k
fetching path ‘/nix/store/7mpcc6x6b3db595rsqr1qjckpaj1dym8-bash-4.4-p12-info’...
*** Downloading ‘https://cache.nixos.org/nar/04dzl4jlhxhisiby9lyw2k6q2w5ns3xy1h6gfdc14qn649lshy2f.nar.xz’ to ‘/nix/store/7mpcc6x6b3db595rsqr1qjckpaj1dym8-bash-4.4-p12-info’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  107k  100  107k    0     0  1179k      0 --:--:-- --:--:-- --:--:-- 1198k
fetching path ‘/nix/store/3n6g5nmyn63gsgjc7z03rsd88s2q7b7i-stdenv’...
*** Downloading ‘https://cache.nixos.org/nar/013xg2cnv9wf3fkhcl3b3b6iihqnwhy65m6ijb6ynwavy584w2xi.nar.xz’ to ‘/nix/store/3n6g5nmyn63gsgjc7z03rsd88s2q7b7i-stdenv’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  8640  100  8640    0     0   143k      0 --:--:-- --:--:-- --:--:--  148k
=== Reviewing PR 28261 : busybox: 1.26.2 -> 1.27.1, fix bootstrap
````

(From https://travis-ci.org/NixOS/nixpkgs/jobs/264390932)
---
 maintainers/scripts/travis-nox-review-pr.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 649798ec76b..4da4f7dacfa 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -53,8 +53,8 @@ while test -n "$1"; do
         nox)
             echo "=== Fetching Nox from binary cache"
 
-            # build nox silently so it's not in the log
-            nix-build "<nixpkgs>" -A nox -A stdenv
+            # build nox (+ a basic nix-shell env) silently so it's not in the log
+            nix-shell -p nox stdenv --command true
             ;;
 
         pr)

From fe078d796d517f274257aaadbd5f0c03e0ec5aa9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 14 Aug 2017 23:05:55 +0300
Subject: [PATCH 2101/3246] travis: Add dummy environment variables as build
 labels

Travis doesn't have explicit support for labeling builds
in a build matrix, so use a dummy environment variable as a poor man's
label.

Before: https://travis-ci.org/NixOS/nixpkgs/builds/264390928
After: https://travis-ci.org/NixOS/nixpkgs/builds/264499784
---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8ecd12642a7..e746d390e76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,15 +12,21 @@ matrix:
           script:
               - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
               - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual
+          env:
+            - BUILD_TYPE="Test Nixpkgs evaluation & NixOS manual build"
         - os: linux
           sudo: required
           dist: trusty
           before_script:
               - sudo mount -o remount,exec,size=2G,mode=755 /run/user
           script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
+          env:
+            - BUILD_TYPE="Build affected packages (Linux)"
         - os: osx
           osx_image: xcode7.3
           script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
+          env:
+            - BUILD_TYPE="Build affected packages (macOS)"
 env:
     global:
         - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f

From 310746b6dbdb1f5c644357c6b86d51281b8c31aa Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 15 Aug 2017 06:51:41 +1000
Subject: [PATCH 2102/3246] gpxsee: 4.8 -> 4.9

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 16147715705..6da16545aa7 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
-  version = "4.8";
+  version = "4.9";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
+    sha256 = "0jk99yhrms1wzqpcnsjydcl2nysidv639s2j7l53yp60g0zz8174";
   };
 
   nativeBuildInputs = [ qmake qttools ];

From 55a642f5cfbe506e9631bd09eed644ff5eaf7a13 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 15 Aug 2017 01:07:50 +0300
Subject: [PATCH 2103/3246] linuxHeaders: Remove cruft

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b507cfe74d..f73c0b0f339 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12007,17 +12007,7 @@ with pkgs;
   linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
     cross = if targetPlatform != hostPlatform then targetPlatform else null;
   };
-
-  # We can choose:
-  linuxHeaders =
-    if targetPlatform != hostPlatform
-    then
-      { # switch
-        "4.4" = linuxHeaders_4_4;
-      }.${targetPlatform.platform.kernelMajor}
-        or (throw "Unknown linux kernel version")
-    else
-      linuxHeaders_4_4;
+  linuxHeaders = linuxHeaders_4_4;
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 

From a1bb61312c3b4d64a75b61369a2011b0d6e274bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 15 Aug 2017 08:08:12 +0200
Subject: [PATCH 2104/3246] stdenv: fixup allowedRequisites on aarch64-linux

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

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 0aeb292e316..61262e1a64e 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -313,7 +313,8 @@ in
             glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
             gcc gcc.cc gcc.cc.lib gcc.expandResponseParams
           ]
-        ++ lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
+          ++ lib.optionals (system == "aarch64-linux")
+            [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];
 
       overrides = self: super: {
         inherit (prevStage)

From 698efcb7b5e556e36711ec7a612b1fccdb3eb47f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 15 Aug 2017 17:04:04 +0800
Subject: [PATCH 2105/3246] open-vm-tools: do not pull x dependencies
 unconditionally

The "headless" configuration option is ignored because we unconditionally
reference pkgs.open-vm-tools.

This fixes that.
---
 nixos/modules/virtualisation/vmware-guest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index ce1224a8f13..68930a0e325 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -33,7 +33,7 @@ in
         serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";
       };
 
-    environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*";
+    environment.etc."vmware-tools".source = "${open-vm-tools}/etc/vmware-tools/*";
 
     services.xserver = mkIf (!cfg.headless) {
       videoDrivers = mkOverride 50 [ "vmware" ];

From 2dfba8529b92a18df00428b56fd237aaf333575c Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 26 May 2017 22:05:43 +0200
Subject: [PATCH 2106/3246] epkowa: init at 2.30.3-1

---
 pkgs/misc/drivers/epkowa/default.nix          | 142 ++++++++++++++++++
 .../drivers/epkowa/firmware_location.patch    |  19 +++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 163 insertions(+)
 create mode 100644 pkgs/misc/drivers/epkowa/default.nix
 create mode 100644 pkgs/misc/drivers/epkowa/firmware_location.patch

diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
new file mode 100644
index 00000000000..38cfb75fa09
--- /dev/null
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -0,0 +1,142 @@
+{stdenv, fetchurl, fetchpatch, makeWrapper, symlinkJoin,
+pkgconfig, libtool,
+gtk2,
+libxml2,
+libxslt,
+libusb,
+sane-backends,
+rpm, cpio,
+eject,
+patchelf, gcc
+}:
+
+let common_meta = {
+    homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX";
+    license = with stdenv.lib.licenses; epson;
+    platforms = with stdenv.lib.platforms; linux;
+   };
+in
+############################
+#
+#  PLUGINS
+#
+############################
+
+# adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test...
+
+let plugins = {
+  f720 = stdenv.mkDerivation rec {
+    name = "iscan-gt-f720-bundle";
+    version = "1.0.1";
+    pluginVersion = "0.1.1-2";
+
+    buildInputs = [ patchelf ];
+    src = fetchurl {
+      url = "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz";
+      sha256 = "0dvikq5ad6wid3lxw1amar8lsbr50g39g6zlmcjxdcsg0wb1qspp";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      '';
+    preFixup = ''
+      lib=$out/lib/esci/libesci-interpreter-gt-f720.so
+      rpath=${gcc.cc.lib}/lib/
+      patchelf --set-rpath $rpath $lib
+      '';
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin"
+        '';
+      hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo";
+      };
+
+    meta = common_meta // { description = "iscan esci f720 plugin for "+passthru.hw; };
+  };
+};
+in
+
+
+
+let fwdir = symlinkJoin {
+  name = "esci-firmware-dir";
+  paths = stdenv.lib.mapAttrsToList (name: value: value + /share/esci) plugins;
+};
+in
+let iscan-data = stdenv.mkDerivation rec {
+  name = "iscan-data-${version}";
+  version = "1.39.0-1";
+
+  src = fetchurl {
+    url = "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz";
+    sha256 = "0pvm67gqyvzhnv5qyfbaz802l4sbgvaf0zb8wz60k1wcasb99vv1";
+  };
+
+  buildInputs = [
+    libxslt
+  ];
+
+  meta = common_meta;
+};
+in
+stdenv.mkDerivation rec {
+  name = "iscan-${version}";
+  version = "2.30.3-1";
+
+  src = fetchurl {
+    url = "http://support.epson.net/linux/src/scanner/iscan/iscan_${version}.tar.gz";
+    sha256 = "0ryy946h7ddmxh866hfszqfyff1qy4svpsk7w3739v75f4awr9li";
+  };
+
+  buildInputs = [
+    pkgconfig
+    gtk2
+    libxml2
+    libtool
+    libusb
+    sane-backends
+    makeWrapper
+  ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch";
+      sha256 = "04y70qjd220dpyh771fiq50lha16pms98mfigwjczdfmx6kpj1jd";
+    })
+    ./firmware_location.patch
+    ];
+  patchFlags = "-p0";
+
+  configureFlags = [ "--disable-static" "--enable-dependency-reduction" "--disable-frontend"];
+
+  postConfigure = ''
+    echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h
+    '';
+
+  postInstall = ''
+    mkdir -p $out/etc/sane.d
+    cp backend/epkowa.conf $out/etc/sane.d
+    echo "epkowa" > $out/etc/sane.d/dll.conf
+    ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data
+    '';
+  postFixup = ''
+    # iscan-registry is a shell script requiring getopt
+    wrapProgram $out/bin/iscan-registry --prefix PATH : ${eject}/bin
+    registry=$out/bin/iscan-registry;
+    '' +
+    stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: ''
+    plugin=${value};
+    ${value.passthru.registrationCommand}
+    '') plugins);
+  meta = common_meta // {
+    description = "sane-epkowa backend for some epson scanners.";
+    longDescription = ''
+      Includes gui-less iscan (aka. Image Scan! for Linux).
+      Supported hardware: at least :
+    '' +
+    stdenv.lib.concatStringsSep ", " (stdenv.lib.mapAttrsToList (name: value: value.passthru.hw) plugins);
+  };
+}
diff --git a/pkgs/misc/drivers/epkowa/firmware_location.patch b/pkgs/misc/drivers/epkowa/firmware_location.patch
new file mode 100644
index 00000000000..7f67d9cf457
--- /dev/null
+++ b/pkgs/misc/drivers/epkowa/firmware_location.patch
@@ -0,0 +1,19 @@
+Explanation:
+in libesci-interpreter-gt-f720.so in
+libesci_interpreter_gt_f720_342::libesci_interpreter_gt_f720_348 at 0xdf74: the
+binary blob esfw8b.bin is searched either in /usr/share/esci/ or in
+$ESCI_FIRMWARE_DIR. But since this library is to be used wia libsane.so in
+every binary in the system, we can't wrapProgram the relevant executables to
+set this environment variable. Instead, we patch iscan to set this variable
+before loading libesci-interpreter-gt-f720.so.
+--- backend/channel-usb.c.orig	2017-08-14 11:24:27.669582456 +0200
++++ backend/channel-usb.c	2017-08-14 11:31:40.509010897 +0200
+@@ -169,6 +169,8 @@
+ {
+   SANE_Status s;
+ 
++  setenv("ESCI_FIRMWARE_DIR", NIX_ESCI_PREFIX, 1);
++
+   s = sanei_usb_open (self->name, &self->fd);
+ 
+   if (SANE_STATUS_GOOD == s)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f73c0b0f339..26602060e58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18605,6 +18605,8 @@ with pkgs;
   hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { };
 
   hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; };
+  
+  epkowa = callPackage ../misc/drivers/epkowa { };
 
   illum = callPackage ../tools/system/illum { };
 

From 4fb22bb622c59dabf9392d8f7169902a2f3f621d Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 14 Aug 2017 20:15:15 +0200
Subject: [PATCH 2107/3246] meson: 0.40.0 -> 0.41.2

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

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index d4dbc6b46d2..1855985f09f 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,12 +1,12 @@
 { lib, python3Packages }:
 python3Packages.buildPythonApplication rec {
-  version = "0.40.0";
+  version = "0.41.2";
   pname = "meson";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1hb6y5phzd5738rlpz78w8hfzk7sbxj81551mb7bbkkqz8ql1gjw";
+    sha256 = "0p69hir68ar3nzrjn0zjsnyzq181b0kq6arrcmxqpzl7g5qhf5xd";
   };
 
   postFixup = ''

From da8712e4e918d7ce0893d499a16a48b0873f223f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 15 Aug 2017 06:02:19 +0200
Subject: [PATCH 2108/3246] haskellPackages.shell-conduit: fix failing test

---
 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 9d916e70645..cc1adff9547 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -87,6 +87,11 @@ self: super: {
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
   };
 
+  # Fix test trying to access /home directory
+  shell-conduit = (overrideCabal super.shell-conduit (drv: {
+    postPatch = "sed -i s/home/tmp/ test/Spec.hs";
+  }));
+
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;
 

From cfda60042d9ecab8809e3dc0694908c6c39099c2 Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Tue, 15 Aug 2017 09:44:28 +0200
Subject: [PATCH 2109/3246] hyperlink: init at 17.3.0

---
 .../python-modules/hyperlink/default.nix      | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/hyperlink/default.nix

diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
new file mode 100644
index 00000000000..ca09c271dda
--- /dev/null
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl, pytest }:
+buildPythonPackage rec {
+  name = "hyperlink-${version}";
+  version = "17.3.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/h/hyperlink/${name}.tar.gz";
+    sha256 = "06mgnxwjzx8hv34bifc7jvgxz21ixhk5s6xy2kd84hdrlbfvpbfx";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A featureful, correct URL for Python";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ apeschar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c053ca7450c..806526a31ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8355,6 +8355,7 @@ in {
     };
   };
 
+  hyperlink = callPackage ../development/python-modules/hyperlink {};
 
   zope_copy = buildPythonPackage rec {
     name = "zope.copy-4.0.2";

From 1e9606adb76a13c18ef876a72eb6ae5e68c6a76c Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Tue, 15 Aug 2017 08:29:03 +0200
Subject: [PATCH 2110/3246] keepalived: 1.3.5 -> 1.3.6

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

diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 0e4842ec24d..fe8988dc41d 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "keepalived-${version}";
-  version = "1.3.5";
+  version = "1.3.6";
 
   src = fetchFromGitHub {
     owner = "acassen";
     repo = "keepalived";
     rev = "v${version}";
-    sha256 = "0lbzbw5giddr4rrhppdpsswh88x86ywxrl01vm8z5am7acixn1zr";
+    sha256 = "05088vv510dlflzyg8sh8l8qfscnvxl6n6pw9ycp27zhb6r5cr5y";
   };
 
   buildInputs = [

From 22fc62eec3ced449e2457c73efbd12964f99aa66 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Tue, 15 Aug 2017 11:22:27 +0200
Subject: [PATCH 2111/3246] gitlab-runner: 9.3.0 -> 9.4.2

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

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index c371844d133..4d827471687 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 = "9.3.0";
+  version = "9.4.2";
   # 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 = "1svml4k1zkmnw49sg4ipzl4fzvxx9rbj0643lwf6vm55j8xykhrq";
+    sha256 = "1cf8iasn47dlnbchh389ishzx5dqbyzg94w83j1w2ik4z0na6b7g";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "0xbbbjd7hvhlzi47rzf09fzcpkd7jrf80xk1y736px75yyvq3jr2";
+    sha256 = "120rvxlksza9zpjin0awq8gnnplnv6qmqlidgnxs63c71kyjiwf3";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "0ddsh31sqjp9xs6mv5jbmqvjq2hcy6j21grrn1m73z8blk4ylxsd";
+    sha256 = "06g4y6vn99b0g0k2als7fz5y2f87pg1cfwsxs8psqgl7nxmhw3i6";
   };
 
   patches = [ ./fix-shell-path.patch ];

From cdfa4882e429455d185739b226180267ed6daeda Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 15 Aug 2017 09:42:11 +0200
Subject: [PATCH 2112/3246] das_watchdog: git-2015-04-02 -> git-2015-09-12

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

diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix
index 465ae48063b..fbca63b0e0a 100644
--- a/pkgs/tools/system/das_watchdog/default.nix
+++ b/pkgs/tools/system/das_watchdog/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "das_watchdog-${version}";
-  version = "git-2015-04-02";
+  version = "git-2015-09-12";
 
   src = fetchgit {
     url = "https://github.com/kmatheussen/das_watchdog.git";
-    rev = "1c203d9a55455c4670c164f945ea2dd9fd197ba9";
-    sha256 = "c817491d67d31297dcd6177b9c33b5c3977c1c383eac588026631dd6961ba6bf";
+    rev = "5ac0db0b98e5b4e690aca0aa7fb6ec60ceddcb06";
+    sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr";
   };
 
   buildInputs = [ libgtop xmessage which pkgconfig ];

From f9eef3ca797369f1abfe3115fb2740d10fc47eda Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 15 Aug 2017 08:32:12 -0300
Subject: [PATCH 2113/3246] cbatticon: 1.6.5 -> 1.6.6

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

diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix
index efe2b2863ac..1aeb45f1e20 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/pkgs/applications/misc/cbatticon/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "cbatticon-${version}";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "valr";
     repo = "cbatticon";
     rev = version;
-    sha256 = "1j7gbmmygvbrawqn1bbaf47lb600lylslzqbvfwlhifmi7qnm6ca";
+    sha256 = "0gphijkjmg5q349ffhnx12dppg6hajkr90n0x5b6s9cad5b4q0kq";
   };
 
   makeFlags = "PREFIX=$(out)";

From cc92326e121b6058bbb1c929ce87dde5ed99e1e4 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Mon, 14 Aug 2017 20:10:13 +0200
Subject: [PATCH 2114/3246] grisbi: init at 1.0.2

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

diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
new file mode 100644
index 00000000000..29c30204ddb
--- /dev/null
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
+, hicolor_icon_theme, libsoup, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "grisbi-${version}";
+  version = "1.0.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/grisbi/${name}.tar.bz2";
+    sha256 = "1m31a1h4i59z36ri4a22rrd29byg6wnxq37559042hdhn557kazm";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup
+    gnome3.defaultIconTheme ];
+
+  meta = with stdenv.lib; {
+    description = "A personnal accounting application.";
+    longDescription = ''
+      Grisbi is an application written by French developers, so it perfectly
+      respects French accounting rules. Grisbi can manage multiple accounts,
+      currencies and users. It manages third party, expenditure and receipt
+      categories, budgetary lines, financial years, budget estimates, bankcard
+      management and other information that make Grisbi adapted for
+      associations.
+    '';
+    homepage = "http://grisbi.org";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ layus ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f73c0b0f339..342a3b620d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14469,6 +14469,8 @@ with pkgs;
   graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
   graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };
 
+  grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
+
   gtkpod = callPackage ../applications/audio/gtkpod {
     gnome = gnome3;
     inherit (gnome2) libglade;

From 9e9b1775752ad93cd7a2834d39f6021968fbdb42 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 15 Aug 2017 14:53:17 +0200
Subject: [PATCH 2115/3246] http-prompt: 0.9.1 -> 0.10.2

---
 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 2882a88b7d0..5f6f0466f63 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.9.1";
+  version = "0.10.2";
   name = "http-prompt";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     repo = "http-prompt";
     owner = "eliangcs";
-    sha256 = "0s2syjjz5n7256a4hn8gv3xfr0zd3qqimf4w8l188dbfvx8b8s06";
+    sha256 = "0c03n1ll61zd4f60kzih3skl0hspck5hhpcf74h5l6v5as7qdbi2";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 2fca91cbb2baf04ef01b981d563afe5e913eda4b Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Tue, 15 Aug 2017 11:46:00 +0200
Subject: [PATCH 2116/3246] keybase: 1.0.22 -> 1.0.27

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

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index e4fa484b08e..474455258a4 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "keybase-${version}";
-  version = "1.0.22";
+  version = "1.0.27";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/keybase" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner  = "keybase";
     repo   = "client";
     rev    = "v${version}";
-    sha256 = "1642d11gjgkdklppmm1j3vwc2r3qg9qqw5x07jnqs819i57mr47f";
+    sha256 = "0s68awgaq32hl5rvcrnhn9i98dwh23kws0l4czcghyn6imx8h89i";
   };
 
   buildFlags = [ "-tags production" ];

From ceed8ad8a16d6a892ce9b981d05475dd1669cc15 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 15 Aug 2017 00:15:48 -0700
Subject: [PATCH 2117/3246] ucl: modify cflags so gcc6 compiles successfully

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

diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix
index c9133b64846..ceb97b6088b 100644
--- a/pkgs/development/libraries/ucl/default.nix
+++ b/pkgs/development/libraries/ucl/default.nix
@@ -7,6 +7,9 @@ stdenv.mkDerivation {
     sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348";
   };
 
+  # needed to successfully compile with gcc 6
+  NIX_CFLAGS_COMPILE = "-std=c90 -fPIC";
+
   meta = {
     homepage = http://www.oberhumer.com/opensource/ucl/;
     description = "Portable lossless data compression library";

From 9ca7f38ce90b97f4e389c2976514409f25bc0e4f Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 14 Aug 2017 09:52:31 +0200
Subject: [PATCH 2118/3246] pony-stable: unstable-2017-07-26 -> 0.0.1

---
 pkgs/development/compilers/ponyc/pony-stable.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 46d91fc36e0..4353c425489 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,13 +1,14 @@
 {stdenv, fetchFromGitHub, ponyc }:
 
-stdenv.mkDerivation {
-  name = "pony-stable-unstable-2017-07-26";
+stdenv.mkDerivation rec {
+  name = "pony-stable-${version}";
+  version = "0.0.1";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "pony-stable";
-    rev = "4016f9253a4e3114ee69100d3d02154ffd3fd7e4";
-    sha256 = "0xz5syjn2f8k31vny49k3jm8zisa15ly4hbcb3rh4jvq8jjp1ldr";
+    rev = version;
+    sha256 = "0q05135mnzzdwam7cnmxq34clqhmc83yp2gi63sx20c74rcw3p6v";
   };
 
   buildInputs = [ ponyc ];
@@ -20,7 +21,7 @@ stdenv.mkDerivation {
     description = "A simple dependency manager for the Pony language.";
     homepage = http://www.ponylang.org;
     license = stdenv.lib.licenses.bsd2;
-    maintainers = [ stdenv.lib.maintainers.dipinhora ];
+    maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

From 865765aece83690d673f2db2533300eb36fdb6b8 Mon Sep 17 00:00:00 2001
From: nonsequitur <cornelius.mika@gmail.com>
Date: Mon, 14 Aug 2017 10:10:14 +0200
Subject: [PATCH 2119/3246] ruby docs: improve example

1. Call `nix-build` with `--no-out-link` to avoid cluttering the source dir.
2. Re-add `patchShebangs`, since `buildCommand` doesn't imply a patch phase. (It was my fault to remove this in the first place, sorry!)
---
 doc/languages-frameworks/ruby.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index 647a30481e3..6bb809192f8 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -20,7 +20,7 @@ $ cd sensu
 $ cat > Gemfile
 source 'https://rubygems.org'
 gem 'sensu'
-$ $(nix-build '<nixpkgs>' -A bundix)/bin/bundix --magic
+$ $(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic
 $ cat > default.nix
 { lib, bundlerEnv, ruby }:
 
@@ -114,6 +114,7 @@ in stdenv.mkDerivation {
   script = ./my-script.rb;
   buildCommand = ''
     install -D -m755 $script $out/bin/my-script
+    patchShebangs $out/bin/my-script
   '';
 }]]>
 </programlisting>

From de575055be7b960459d065076b5d782b7f070323 Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Tue, 15 Aug 2017 10:02:16 +0200
Subject: [PATCH 2120/3246] twisted: update to 17.5.0

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

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 6898863e8af..66a6022802f 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -1,17 +1,17 @@
 { stdenv, buildPythonPackage, fetchurl, python,
-  zope_interface, incremental, automat, constantly
+  zope_interface, incremental, automat, constantly, hyperlink
 }:
 buildPythonPackage rec {
   pname = "Twisted";
   name = "${pname}-${version}";
-  version = "17.1.0";
+  version = "17.5.0";
 
   src = fetchurl {
     url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
-    sha256 = "1p245mg15hkxp7hy5cyq2fgvlgjkb4cg0gwkwd148nzy1bbi3wnv";
+    sha256 = "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i";
   };
 
-  propagatedBuildInputs = [ zope_interface incremental automat constantly ];
+  propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ];
 
   # Patch t.p._inotify to point to libc. Without this,
   # twisted.python.runtime.platform.supportsINotify() == False

From a8fefd4ca8b7bdea9c968ff08be46d862800f18f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 13 Aug 2017 01:57:33 +0200
Subject: [PATCH 2121/3246] portaudio: 19-20140130 -> 190600-20161030, add jack

---
 pkgs/development/libraries/portaudio/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 3882e1fb08a..41f29a1a6b1 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, alsaLib, pkgconfig
+{ stdenv, fetchurl, alsaLib, pkgconfig, libjack2
 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
 
 stdenv.mkDerivation rec {
-  name = "portaudio-19-20140130";
-  
+  name = "portaudio-190600-20161030";
+
   src = fetchurl {
-    url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz;
-    sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g";
+    url = http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz;
+    sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm";
   };
 
-  buildInputs = [ pkgconfig ]
+  buildInputs = [ pkgconfig libjack2 ]
     ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   configureFlags = [ "--disable-mac-universal" ];

From e6785422ae213dffe19bc2a2bb6b2dd275799be0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Aug 2017 14:28:25 +0200
Subject: [PATCH 2122/3246] module gitlab-runner: introduce configOptions and
 configFile

Also removes configText, functionality is now provided more conveniently by configOptions.
Keep in mind that this breaks compatibility with previous configurations,
configFile provides a means to protect the CI token from being written into the nix store.
---
 .../continuous-integration/gitlab-runner.nix  | 56 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index b11bc031b3f..ce0583dad54 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -4,15 +4,65 @@ with lib;
 
 let
   cfg = config.services.gitlab-runner;
-  configFile = pkgs.writeText "config.toml" cfg.configText;
+  configFile =
+    if (cfg.configFile == null) then
+      (pkgs.runCommand "config.toml" {
+        buildInputs = [ pkgs.remarshal ];
+      } ''
+        remarshal -if json -of toml \
+          < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \
+          > $out
+      '')
+    else
+      cfg.configFile;
   hasDocker = config.virtualisation.docker.enable;
 in
 {
   options.services.gitlab-runner = {
     enable = mkEnableOption "Gitlab Runner";
 
-    configText = mkOption {
-      description = "Verbatim config.toml to use";
+    configFile = mkOption {
+      default = null;
+      description = ''
+        Configuration file for gitlab-runner.
+        Use this option in favor of configOptions to avoid placing CI tokens in the nix store.
+
+        <option>configFile</option> takes precedence over <option>configOptions</option>.
+
+        Warning: Not using <option>configFile</option> will potentially result in secrets
+        leaking into the WORLD-READABLE nix store.
+      '';
+      type = types.nullOr types.path;
+    };
+
+    configOptions = mkOption {
+      description = ''
+        Configuration for gitlab-runner
+        <option>configFile</option> will take precedence over this option.
+
+        Warning: all Configuration, especially CI token, will be stored in a
+        WORLD-READABLE file in the Nix Store.
+
+        If you want to protect your CI token use <option>configFile</option> instead.
+      '';
+      type = types.attrs;
+      example = {
+        concurrent = 2;
+        runners = [{
+          name = "docker-nix-1.11";
+          url = "https://CI/";
+          token = "TOKEN";
+          executor = "docker";
+          builds_dir = "";
+          docker = {
+            host = "";
+            image = "nixos/nix:1.11";
+            privileged = true;
+            disable_cache = true;
+            cache_dir = "";
+          };
+        }];
+      };
     };
 
     gracefulTermination = mkOption {

From 518fb60797d5192ba03a4bd03556d3e5230c4849 Mon Sep 17 00:00:00 2001
From: "James D. Trotter" <james@simula.no>
Date: Mon, 14 Aug 2017 14:32:07 +0200
Subject: [PATCH 2123/3246] fenics: init at 2017.1.0

---
 .../libraries/science/math/fenics/default.nix | 164 ++++++++++++++++++
 .../science/math/fenics/unicode.patch         |  67 +++++++
 pkgs/top-level/all-packages.nix               |   7 +
 3 files changed, 238 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/fenics/default.nix
 create mode 100644 pkgs/development/libraries/science/math/fenics/unicode.patch

diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix
new file mode 100644
index 00000000000..9d40baafe65
--- /dev/null
+++ b/pkgs/development/libraries/science/math/fenics/default.nix
@@ -0,0 +1,164 @@
+{ stdenv
+, fetchurl
+, boost
+, cmake
+, doxygen
+, eigen
+, numpy
+, pkgconfig
+, pytest
+, pythonPackages
+, six
+, sympy
+, gtest ? null
+, hdf5 ? null
+, mpi ? null
+, ply ? null
+, python ? null
+, sphinx ? null
+, suitesparse ? null
+, swig ? null
+, vtk ? null
+, zlib ? null
+, docs ? false
+, pythonBindings ? false
+, doCheck ? true }:
+
+assert pythonBindings -> python != null && ply != null && swig != null;
+
+let
+  version = "2017.1.0";
+
+  dijitso = pythonPackages.buildPythonPackage {
+    name = "dijitso-${version}";
+    src = fetchurl {
+      url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz";
+      sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg";
+    };
+    buildInputs = [ numpy pytest six ];
+    checkPhase = ''
+      export HOME=$PWD
+      py.test test/
+    '';
+    meta = {
+      description = "Distributed just-in-time shared library building";
+      homepage = http://fenicsproject.org/;
+      platforms = stdenv.lib.platforms.all;
+      license = stdenv.lib.licenses.lgpl3;
+    };
+  };
+
+  fiat = pythonPackages.buildPythonPackage {
+    name = "fiat-${version}";
+    src = fetchurl {
+      url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz";
+      sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l";
+    };
+    buildInputs = [ numpy pytest six sympy ];
+    checkPhase = ''
+      py.test test/unit/
+    '';
+    meta = {
+      description = "Automatic generation of finite element basis functions";
+      homepage = http://fenicsproject.org/;
+      platforms = stdenv.lib.platforms.all;
+      license = stdenv.lib.licenses.lgpl3;
+    };
+  };
+
+  ufl = pythonPackages.buildPythonPackage {
+    name = "ufl-${version}";
+    src = fetchurl {
+      url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz";
+      sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg";
+    };
+    buildInputs = [ numpy pytest six ];
+    checkPhase = ''
+      py.test test/
+    '';
+    meta = {
+      description = "A domain-specific language for finite element variational forms";
+      homepage = http://fenicsproject.org/;
+      platforms = stdenv.lib.platforms.all;
+      license = stdenv.lib.licenses.lgpl3;
+    };
+  };
+
+  ffc = pythonPackages.buildPythonPackage {
+    name = "ffc-${version}";
+    src = fetchurl {
+      url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz";
+      sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0";
+    };
+    buildInputs = [ dijitso fiat numpy pytest six sympy ufl ];
+    checkPhase = ''
+      export HOME=$PWD
+      py.test test/unit/
+    '';
+    meta = {
+      description = "A compiler for finite element variational forms";
+      homepage = http://fenicsproject.org/;
+      platforms = stdenv.lib.platforms.all;
+      license = stdenv.lib.licenses.lgpl3;
+    };
+  };
+
+  instant = pythonPackages.buildPythonPackage {
+    name = "instant-${version}";
+    src = fetchurl {
+      url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz";
+      sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q";
+    };
+    buildInputs = [ numpy six ];
+    meta = {
+      description = "Instant inlining of C and C++ code in Python";
+      homepage = http://fenicsproject.org/;
+      platforms = stdenv.lib.platforms.all;
+      license = stdenv.lib.licenses.lgpl3;
+    };
+  };
+
+in
+stdenv.mkDerivation {
+  name = "dolfin-${version}";
+  src = fetchurl {
+    url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz";
+    sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds";
+  };
+  propagatedBuildInputs = [ dijitso fiat numpy six ufl ];
+  buildInputs = [
+    boost cmake dijitso doxygen eigen ffc fiat gtest hdf5 instant mpi
+    numpy pkgconfig six sphinx suitesparse sympy ufl vtk zlib
+    ] ++ stdenv.lib.optionals pythonBindings [ ply python numpy swig ];
+  patches = [ ./unicode.patch ];
+  cmakeFlags = "-DDOLFIN_CXX_FLAGS=-std=c++11"
+    + " -DDOLFIN_AUTO_DETECT_MPI=OFF"
+    + " -DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_PARMETIS=OFF"
+    + " -DDOLFIN_ENABLE_PETSC4PY=OFF"
+    + " -DDOLFIN_ENABLE_PETSC=OFF"
+    + " -DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_SCOTCH=OFF"
+    + " -DDOLFIN_ENABLE_SLEPC4PY=OFF"
+    + " -DDOLFIN_ENABLE_SLEPC=OFF"
+    + " -DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_TRILINOS=OFF"
+    + " -DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF")
+    + " -DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF");
+  checkPhase = ''
+    make runtests
+  '';
+  postInstall = "source $out/share/dolfin/dolfin.conf";
+  meta = {
+    description = "The FEniCS Problem Solving Environment in Python and C++";
+    homepage = http://fenicsproject.org/;
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.lgpl3;
+  };
+}
diff --git a/pkgs/development/libraries/science/math/fenics/unicode.patch b/pkgs/development/libraries/science/math/fenics/unicode.patch
new file mode 100644
index 00000000000..2ef2709263a
--- /dev/null
+++ b/pkgs/development/libraries/science/math/fenics/unicode.patch
@@ -0,0 +1,67 @@
+From 0cc9e68de1181d950d4185bf3a87b69a87e4358f Mon Sep 17 00:00:00 2001
+From: "James D. Trotter" <james@simula.no>
+Date: Mon, 14 Aug 2017 16:43:53 +0200
+Subject: [PATCH] Use a UTF-8 encoding to avoid errors with decoding non-ascii
+ characters
+
+---
+ cmake/scripts/generate-swig-interface.py |  6 +++---
+ utils/pylit/pylit.py                     | 10 +++++++---
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/scripts/generate-swig-interface.py b/cmake/scripts/generate-swig-interface.py
+index 843a49229..7b85453d0 100644
+--- a/cmake/scripts/generate-swig-interface.py
++++ b/cmake/scripts/generate-swig-interface.py
+@@ -212,10 +212,10 @@ def extract_swig_modules_dependencies(module_to_submodules, submodule_info):
+                     continue
+ 
+                 # Read code
+-                with open(header_file) as f:
+-                    code = f.read()
+-
+                 try:
++                    with open(header_file, encoding='utf-8') as f:
++                        code = f.read()
++
+                     # Extract type info
+                     used_types, declared_types = parse_and_extract_type_info(code)
+                 except Exception as e:
+diff --git a/utils/pylit/pylit.py b/utils/pylit/pylit.py
+index bcd8ec5e0..8c2964fbd 100755
+--- a/utils/pylit/pylit.py
++++ b/utils/pylit/pylit.py
+@@ -1496,7 +1496,7 @@ def open_streams(infile = '-', outfile = '-', overwrite='update', **keyw):
+     if infile == '-':
+         in_stream = sys.stdin
+     else:
+-        in_stream = open(infile, 'r')
++        in_stream = open(infile, 'r', encoding='utf-8')
+ 
+     if outfile == '-':
+         out_stream = sys.stdout
+@@ -1505,7 +1505,7 @@ def open_streams(infile = '-', outfile = '-', overwrite='update', **keyw):
+     elif overwrite == 'update' and is_newer(outfile, infile):
+         raise IOError((1, "Output file is newer than input file!", outfile))
+     else:
+-        out_stream = open(outfile, 'w')
++        out_stream = open(outfile, 'w', encoding='utf-8')
+     return (in_stream, out_stream)
+ 
+ # is_newer
+@@ -1731,7 +1731,11 @@ def main(args=sys.argv[1:], **defaults):
+ 
+ # Convert and write to out_stream::
+ 
+-    out_stream.write(str(converter))
++    try:
++        out_stream.write(str(converter))
++    except Exception as e:
++        print("Failed to write extract to", out_stream.name)
++        raise
+ 
+     if out_stream is not sys.stdout:
+         print("extract written to", out_stream.name)
+-- 
+2.14.0
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f73c0b0f339..a50383040f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17910,6 +17910,13 @@ with pkgs;
 
   openspecfun = callPackage ../development/libraries/science/math/openspecfun {};
 
+  fenics = callPackage ../development/libraries/science/math/fenics {
+    inherit (python3Packages) numpy ply pytest python six sympy;
+    pythonPackages = python3Packages;
+    pythonBindings = true;
+    docs = true;
+  };
+
   lie = callPackage ../applications/science/math/LiE { };
 
   magma = callPackage ../development/libraries/science/math/magma { };

From 78b6d45921aba45ce61592bf18ac9f09b70a1929 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Tue, 15 Aug 2017 17:34:55 +0100
Subject: [PATCH 2124/3246] syncthing-tray: init at v0.7

---
 .../misc/syncthing-tray/default.nix           | 27 ++++++
 .../applications/misc/syncthing-tray/deps.nix | 93 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 122 insertions(+)
 create mode 100644 pkgs/applications/misc/syncthing-tray/default.nix
 create mode 100644 pkgs/applications/misc/syncthing-tray/deps.nix

diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix
new file mode 100644
index 00000000000..f9d1039a292
--- /dev/null
+++ b/pkgs/applications/misc/syncthing-tray/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }:
+
+buildGoPackage rec {
+  name = "syncthing-tray-${version}";
+  version = "0.7";
+
+  goPackagePath = "github.com/alex2108/syncthing-tray";
+
+  src = fetchFromGitHub {
+    owner = "alex2108";
+    repo = "syncthing-tray";
+    rev = "v${version}";
+    sha256 = "0869kinnsfzb8ydd0sv9fgqsi1sy5rhqg4whfdnrv82xjc71xyw3";
+  };
+
+  goDeps = ./deps.nix;
+
+  buildInputs = [ pkgconfig libappindicator-gtk3 ];
+
+  meta = with stdenv.lib; {
+    description = "Simple application tray for syncthing";
+    homepage = https://github.com/alex2108/syncthing-tray;
+    license = licenses.mit;
+    maintainers = with maintainers; [ nickhu ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/misc/syncthing-tray/deps.nix b/pkgs/applications/misc/syncthing-tray/deps.nix
new file mode 100644
index 00000000000..1103146ed1b
--- /dev/null
+++ b/pkgs/applications/misc/syncthing-tray/deps.nix
@@ -0,0 +1,93 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/alex2108/systray";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alex2108/systray";
+      rev = "40e874866be2dc2c57ab031bcbde27a76b90721a";
+      sha256 = "1bxnb6skb9ss0lwlwswql07ardkhm28nxglvlsxkdlmzv1dcwy1q";
+    };
+  }
+  {
+    goPackagePath = "github.com/getlantern/context";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/context";
+      rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775";
+      sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b";
+    };
+  }
+  {
+    goPackagePath = "github.com/getlantern/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/errors";
+      rev = "99fa440517e8f3d1e4cd8d6dbed6b41f4c1ed3d6";
+      sha256 = "08rl32l5ks67hcgjxik62nd5g558mv4101kmz1ak7d3vfgg3m6i3";
+    };
+  }
+  {
+    goPackagePath = "github.com/getlantern/golog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/golog";
+      rev = "cca714f7feb5df8e455f409b549d384441ac4578";
+      sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q";
+    };
+  }
+  {
+    goPackagePath = "github.com/getlantern/hex";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/hex";
+      rev = "083fba3033ad473db3dd31c9bb368473d37581a7";
+      sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77";
+    };
+  }
+  {
+    goPackagePath = "github.com/getlantern/hidden";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/hidden";
+      rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7";
+      sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi";
+    };
+  }
+  {
+    goPackagePath = "github.com/getlantern/ops";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/ops";
+      rev = "b70875f5d689a9438bca72aefd7142a2af889b18";
+      sha256 = "0cfa2bbkykbzbskmgd2an34him72z6f3y88ag1v5ffpb0d6bnar7";
+    };
+  }
+  {
+    goPackagePath = "github.com/getlantern/stack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/stack";
+      rev = "02f928aad224fbccd50d66edd776fc9d1e9f2f2b";
+      sha256 = "0ddl5r4iw3c7p4drh4d8phl7d0ssdddsnd3xjm1lzgxylqq6r568";
+    };
+  }
+  {
+    goPackagePath = "github.com/oxtoacart/bpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/oxtoacart/bpool";
+      rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6";
+      sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95";
+    };
+  }
+  {
+    goPackagePath = "github.com/toqueteos/webbrowser";
+    fetch = {
+      type = "git";
+      url = "https://github.com/toqueteos/webbrowser";
+      rev = "e2ebfdc6cb1a3fdc4fc4dbd20a0cae0c2e406792";
+      sha256 = "0sgjnxrq0jgipkij8b6xiy4am9bv9zziqxxdhw15rdjc5piyk3a2";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 342a3b620d5..2cd1f94a147 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16183,6 +16183,8 @@ with pkgs;
 
   syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { };
 
+  syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
+
   # linux only by now
   synergy = callPackage ../applications/misc/synergy { };
 

From 2b0f79e5c24b2a3f34d93704cbab738813f0f53c Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Tue, 15 Aug 2017 14:34:10 -0400
Subject: [PATCH 2125/3246] sublime3: fix package re-zipping

The previous zip command wasn't including directories. This Sublime package only
has one directory in it, so the resulting bug was subtle. The directory
contained the send2trash Python package, so the result was that file deletion
didn't work.
---
 .../applications/editors/sublime3/default.nix | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 0b8ecda6230..c295313621e 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -31,20 +31,19 @@ in let
 
     dontStrip = true;
     dontPatchELF = true;
-    buildInputs = [ makeWrapper ];
+    buildInputs = [ makeWrapper zip unzip ];
 
     # make exec.py in Default.sublime-package use own bash with
     # an LD_PRELOAD instead of "/bin/bash"
     patchPhase = ''
       mkdir Default.sublime-package-fix
       ( cd Default.sublime-package-fix
-        ${unzip}/bin/unzip ../Packages/Default.sublime-package > /dev/null
+        unzip -q ../Packages/Default.sublime-package
         substituteInPlace "exec.py" --replace \
           "[\"/bin/bash\"" \
           "[\"$out/sublime_bash\""
+        zip -q ../Packages/Default.sublime-package **/*
       )
-      ${zip}/bin/zip -j Default.sublime-package.zip Default.sublime-package-fix/* > /dev/null
-      mv Default.sublime-package.zip Packages/Default.sublime-package
       rm -r Default.sublime-package-fix
     '';
 
@@ -85,14 +84,17 @@ in stdenv.mkDerivation {
   name = "sublimetext3-${build}";
 
   phases = [ "installPhase" ];
+
+  inherit sublime;
+
   installPhase = ''
     mkdir -p $out/bin
-    ln -s ${sublime}/sublime_text $out/bin/subl
-    ln -s ${sublime}/sublime_text $out/bin/sublime
-    ln -s ${sublime}/sublime_text $out/bin/sublime3
+    ln -s $sublime/sublime_text $out/bin/subl
+    ln -s $sublime/sublime_text $out/bin/sublime
+    ln -s $sublime/sublime_text $out/bin/sublime3
     mkdir -p $out/share/applications
-    ln -s ${sublime}/sublime_text.desktop $out/share/applications/sublime_text.desktop
-    ln -s ${sublime}/Icon/256x256/ $out/share/icons
+    ln -s $sublime/sublime_text.desktop $out/share/applications/sublime_text.desktop
+    ln -s $sublime/Icon/256x256/ $out/share/icons
   '';
 
   meta = with stdenv.lib; {

From 97db36a70765b43fbbd1e0d31b6c25d8a6c1e700 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 15 Aug 2017 18:41:56 +0000
Subject: [PATCH 2126/3246] use sed instead of patch

---
 pkgs/tools/misc/fontforge/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 04abaa87611..ee7854c539e 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -18,15 +18,16 @@ stdenv.mkDerivation rec {
     sha256 = "15k6x97383p8l40jvcivalhwgbbcdg5vciyjz6m9r0lrlnjqkv99";
   };
 
-  patches = [
-    ./fontforge-20140813-use-system-uthash.patch
+  patches = [ ./fontforge-20140813-use-system-uthash.patch ];
 
-    (fetchpatch {
-       url = "https://github.com/fontforge/fontforge/compare/${version}...volth:rb-${version}.patch";
-       name = "fontforge-${version}-reproducible-build.patch";
-       sha256 = "089w94xnc0ik3rfx9b7q124x9n1nzbyzzcyynl1x31d22byxgl34";
-     })
-  ];
+  # use $SOURCE_DATE_EPOCH instead of non-determenistic timestamps
+  postPatch = ''
+    find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \;
+    sed -r -i 's#author\s*!=\s*NULL#& \&\& !getenv("SOURCE_DATE_EPOCH")#g'                            fontforge/cvexport.c fontforge/dumppfa.c fontforge/print.c fontforge/svg.c fontforge/splineutil2.c
+    sed -r -i 's#\bb.st_mtime#getenv("SOURCE_DATE_EPOCH") ? atol(getenv("SOURCE_DATE_EPOCH")) : &#g'  fontforge/parsepfa.c fontforge/sfd.c fontforge/svg.c
+    sed -r -i 's#^\s*ttf_fftm_dump#if (!getenv("SOURCE_DATE_EPOCH")) ttf_fftm_dump#g'                 fontforge/tottf.c
+    sed -r -i 's#sprintf\(.+ author \);#if (!getenv("SOURCE_DATE_EPOCH")) &#g'                        fontforgeexe/fontinfo.c
+  '';
 
   # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries
   NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-msse2" "-mfpmath=sse" ];

From 43cea71d5bb46a77e4ac485e4c70a24d8da5c70d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 15 Aug 2017 13:18:27 -0500
Subject: [PATCH 2127/3246] jdk8: add cflags to fix build w/gcc6

---
 pkgs/development/compilers/openjdk/8.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 838c02ce7e8..3355304b3bb 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -98,6 +98,10 @@ let
       substituteInPlace configure --replace /bin/bash "$shell"
       substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell"
       substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
+    ''
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+    + stdenv.lib.optionalString stdenv.cc.isGNU ''
+      NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks"
     '';
 
     configureFlags = [

From 5ac2ad11ad3d1d81119034188e80d22715c4f08b Mon Sep 17 00:00:00 2001
From: vinymeuh <vinymeuh@gmail.com>
Date: Thu, 3 Aug 2017 14:01:02 +0200
Subject: [PATCH 2128/3246] maintainers: add vinymeuh

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5efd472d5f8..5762982273b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -602,6 +602,7 @@
   vdemeester = "Vincent Demeester <vincent@sbr.pm>";
   veprbl = "Dmitry Kalinkin <veprbl@gmail.com>";
   vifino = "Adrian Pistol <vifino@tty.sh>";
+  vinymeuh = "VinyMeuh <vinymeuh@gmail.com>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
   vizanto = "Danny Wilson <danny@prime.vc>";
   vklquevs = "vklquevs <vklquevs@gmail.com>";

From 9e1cde78b80a0b039ffea7e4a4d4d602026be6ba Mon Sep 17 00:00:00 2001
From: vinymeuh <vinymeuh@gmail.com>
Date: Wed, 2 Aug 2017 00:21:23 +0200
Subject: [PATCH 2129/3246] gcc-arm-embedded: 5-2016-q2-update ->
 6-2017-q2-update

---
 .../compilers/gcc-arm-embedded/6/default.nix  | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc-arm-embedded/6/default.nix

diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
new file mode 100644
index 00000000000..945649b2978
--- /dev/null
+++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, ncurses5, python27 }:
+
+stdenv.mkDerivation rec {
+  name = "gcc-arm-embedded-${version}";
+  version = "6-2017-q2-update";
+  subdir = "6-2017q2";
+
+  platformString =
+    if stdenv.isLinux then "linux"
+    else if stdenv.isDarwin then "mac"
+    else throw "unsupported platform";
+
+  urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${platformString}.tar.bz2";
+
+  src =
+    if stdenv.isLinux then fetchurl { url=urlString; sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; }
+    else if stdenv.isDarwin then fetchurl { url=urlString; sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; }
+    else throw "unsupported platform";
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r * $out
+  '';
+
+  dontPatchELF = true;
+  dontStrip = true;
+
+  preFixup = ''
+    find $out -type f | while read f; do
+      patchelf $f > /dev/null 2>&1 || continue
+      patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+    done
+  '';
+
+  meta = {
+    description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)";
+    homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm;
+    license = with stdenv.lib.licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
+    maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 342a3b620d5..0cb6d1277ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5541,7 +5541,8 @@ with pkgs;
     sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r";
     ncurses = pkgsi686Linux.ncurses5;
   };
-  gcc-arm-embedded = gcc-arm-embedded-5;
+  gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {};
+  gcc-arm-embedded = gcc-arm-embedded-6;
 
   gforth = callPackage ../development/compilers/gforth {};
 

From ed0f2641cb026a87151b81c94cb4e64f8dca9535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 15 Aug 2017 21:57:57 +0200
Subject: [PATCH 2130/3246] apcupsd: unbreak build

Fix build since commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98
("cc-wrapper: Always export environment variables for binutils").

The apcupsd build system uses "$(STRIP)" as flags for the "install"
program. Now that $STRIP is the path to the strip binary, we cannot pass
that to "install". Fixes this:

  ...
  COPY  multimon.cgi => /nix/store/...-apcupsd-3.14.14/libexec/cgi-bin
/nix/store/...-coreutils-8.27/bin/install: cannot stat 'strip': No such file or directory
---
 pkgs/servers/apcupsd/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 72951c168dc..e5c545c37bb 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
 
+  prePatch = ''
+    sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \
+        -i ./src/apcagent/Makefile ./autoconf/targets.mak
+  '';
+
   # ./configure ignores --prefix, so we must specify some paths manually
   # There is no real reason for a bin/sbin split, so just use bin.
   preConfigure = ''

From a71cf06b162b98282a7688f8ac221498cfd6a7e2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 15 Aug 2017 16:13:30 -0400
Subject: [PATCH 2131/3246] mkDerivation: Simply Nix

No hashes were changed by this
---
 pkgs/stdenv/generic/make-derivation.nix | 34 ++++++++++---------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index be271daf8c8..74d387e353c 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -43,29 +43,21 @@ rec {
     , propagatedSandboxProfile ? ""
     , ... } @ attrs:
     let
-      dependencies = [
-        (map (drv: drv.nativeDrv or drv) nativeBuildInputs)
+      dependencies = map lib.chooseDevOutputs [
+        (map (drv: drv.nativeDrv or drv) nativeBuildInputs
+           ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
+           ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh)
         (map (drv: drv.crossDrv or drv) buildInputs)
       ];
-      propagatedDependencies = [
+      propagatedDependencies = map lib.chooseDevOutputs [
         (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)
         (map (drv: drv.crossDrv or drv) propagatedBuildInputs)
       ];
-    in let
 
       outputs' =
         outputs ++
         (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []);
 
-      dependencies' = let
-          justMap = map lib.chooseDevOutputs dependencies;
-          nativeBuildInputs = lib.head justMap
-            ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
-            ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh;
-        in [ nativeBuildInputs ] ++ lib.tail justMap;
-
-      propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies;
-
       derivationArg =
         (removeAttrs attrs
           ["meta" "passthru" "crossAttrs" "pos"
@@ -73,13 +65,13 @@ rec {
            "sandboxProfile" "propagatedSandboxProfile"])
         // (let
           computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies');
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies);
           computedPropagatedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies');
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies);
           computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies'));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies));
           computedPropagatedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies'));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies));
         in
         {
           name = name + lib.optionalString
@@ -92,11 +84,11 @@ rec {
           userHook = config.stdenv.userHook or null;
           __ignoreNulls = true;
 
-          nativeBuildInputs = lib.elemAt dependencies' 0;
-          buildInputs = lib.elemAt dependencies' 1;
+          nativeBuildInputs = lib.elemAt dependencies 0;
+          buildInputs = lib.elemAt dependencies 1;
 
-          propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0;
-          propagatedBuildInputs = lib.elemAt propagatedDependencies' 1;
+          propagatedNativeBuildInputs = lib.elemAt propagatedDependencies 0;
+          propagatedBuildInputs = lib.elemAt propagatedDependencies 1;
 
           # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
           configureFlags = let inherit (lib) optional elem; in

From c957ae9da94687d5e62fa397ca4fa2ade7a08474 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 16 Aug 2017 00:07:14 +0200
Subject: [PATCH 2132/3246] perl-Test-Needs: init at 0.002005

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 63e88316aae..328f5c916a1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13556,6 +13556,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestNeeds = buildPerlPackage rec {
+    name = "Test-Needs-0.002005";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
+      sha256 = "5a4f33983586edacdbe00a3b429a9834190140190dab28d0f873c394eb7df399";
+    };
+    meta = {
+      description = "Skip tests when modules not available";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   TestNoTabs = buildPerlPackage {
     name = "Test-NoTabs-1.3";
     src = fetchurl {

From f7f43ad554e0ce20d3bd631133187bc5b26942f5 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 16 Aug 2017 00:08:10 +0200
Subject: [PATCH 2133/3246] perl-URI: 1.71 -> 1.72

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 328f5c916a1..4c0589d4b2d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15134,15 +15134,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   URI = buildPerlPackage rec {
-    name = "URI-1.71";
+    name = "URI-1.72";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "9c8eca0d7f39e74bbc14706293e653b699238eeb1a7690cc9c136fb8c2644115";
+      sha256 = "35f14431d4b300de4be1163b0b5332de2d7fbda4f05ff1ed198a8e9330d40a32";
     };
+    buildInputs = [ TestNeeds ];
     meta = {
+      homepage = https://github.com/libwww-perl/URI;
       description = "Uniform Resource Identifiers (absolute and relative)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From eeabf85780e7fccc0289b4015b695e28ef166ab7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 15 Aug 2017 11:30:45 -0400
Subject: [PATCH 2134/3246] stdenvs: Distinguish between `extraBuildInputs` and
 `extraNativeBuildInputs`

Additionally, instead of pulling them from `setup.sh`, route them via
Nix. This gets us one step closer to making stdenv be a plain attribute
set instead of a derivation.
---
 pkgs/stdenv/darwin/default.nix          | 15 +++++++++++----
 pkgs/stdenv/generic/builder.sh          | 11 ++++++++---
 pkgs/stdenv/generic/default.nix         | 18 +++++++++++++-----
 pkgs/stdenv/generic/make-derivation.nix |  8 ++++----
 pkgs/stdenv/generic/setup.sh            |  5 ++---
 pkgs/stdenv/linux/default.nix           | 10 +++++-----
 pkgs/stdenv/native/default.nix          |  8 ++++----
 7 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 74dcf2f009b..2eeab14b1c7 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -59,11 +59,12 @@ in rec {
   stageFun = step: last: {shell             ? "${bootstrapTools}/bin/bash",
                           overrides         ? (self: super: {}),
                           extraPreHook      ? "",
+                          extraNativeBuildInputs,
                           extraBuildInputs,
                           allowedRequisites ? null}:
     let
       thisStdenv = import ../generic {
-        inherit config shell extraBuildInputs;
+        inherit config shell extraNativeBuildInputs extraBuildInputs;
         allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
           thisStdenv.cc.expand-response-params
         ];
@@ -162,6 +163,7 @@ in rec {
 
     };
 
+    extraNativeBuildInputs = [];
     extraBuildInputs = [];
   };
 
@@ -169,6 +171,7 @@ in rec {
 
   stage1 = prevStage: with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
+    extraNativeBuildInputs = [];
     extraBuildInputs = [ pkgs.libcxx ];
 
     allowedRequisites =
@@ -195,7 +198,8 @@ in rec {
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
 
-    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx ];
+    extraNativeBuildInputs = [ pkgs.xz ];
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     allowedRequisites =
       [ bootstrapTools ] ++
@@ -226,7 +230,8 @@ in rec {
     # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
     # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
     # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
-    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
+    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     extraPreHook = ''
       export PATH=${pkgs.bash}/bin:$PATH
@@ -260,7 +265,8 @@ in rec {
 
   stage4 = prevStage: with prevStage; stageFun 4 prevStage {
     shell = "${pkgs.bash}/bin/bash";
-    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
+    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
@@ -321,6 +327,7 @@ in rec {
       libc = pkgs.darwin.Libsystem;
     };
 
+    extraNativeBuildInputs = [];
     extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     extraAttrs = {
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 42e1a029e58..bc8f23333f7 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -6,15 +6,20 @@ done
 
 mkdir $out
 
+# Buid the setup script
 echo "export SHELL=$shell" > $out/setup
 echo "initialPath=\"$initialPath\"" >> $out/setup
-echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup
 echo "$preHook" >> $out/setup
 cat "$setup" >> $out/setup
 
 # Allow the user to install stdenv using nix-env and get the packages
 # in stdenv.
-mkdir $out/nix-support
+mkdir -p "$out/nix-support"
+echo '# Hack to induce runtime dependencies on the default inputs' \
+    > "$out/nix-support/default-inputs.txt"
+printf '%s\n' $defaultNativeBuildInputs $defaultBuildInputs \
+    >> "$out/nix-support/default-inputs.txt"
 if [ "$propagatedUserEnvPkgs" ]; then
-    printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
+    printf '%s ' $propagatedUserEnvPkgs \
+        > "$out/nix-support/propagated-user-env-packages"
 fi
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index a5d3c5a8ff5..17bf1f8b428 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -9,6 +9,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 
 , setupScript ? ./setup.sh
 
+, extraNativeBuildInputs ? []
 , extraBuildInputs ? []
 , __stdenvImpureHostDeps ? []
 , __extraImpureHostDeps ? []
@@ -41,7 +42,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 }:
 
 let
-  defaultNativeBuildInputs = extraBuildInputs ++
+  defaultNativeBuildInputs = extraNativeBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
       ../../build-support/setup-hooks/strip.sh
@@ -58,11 +59,16 @@ let
       cc
     ];
 
+  defaultBuildInputs = extraBuildInputs;
+
   # The stdenv that we are producing.
   stdenv =
     derivation (
-    (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
-    {
+    lib.optionalAttrs (allowedRequisites != null) {
+      allowedRequisites = allowedRequisites
+        ++ defaultNativeBuildInputs ++ defaultBuildInputs;
+    }
+    // {
       inherit name;
 
       # Nix itself uses the `system` field of a derivation to decide where to
@@ -75,7 +81,8 @@ let
 
       setup = setupScript;
 
-      inherit preHook initialPath shell defaultNativeBuildInputs;
+      inherit preHook initialPath shell
+        defaultNativeBuildInputs defaultBuildInputs;
     }
     // lib.optionalAttrs buildPlatform.isDarwin {
       __sandboxProfile = stdenvSandboxProfile;
@@ -91,7 +98,8 @@ let
 
       inherit buildPlatform hostPlatform targetPlatform;
 
-      inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile;
+      inherit extraNativeBuildInputs extraBuildInputs
+        __extraImpureHostDeps extraSandboxProfile;
 
       # Utility flags to test the type of platform.
       inherit (hostPlatform)
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 74d387e353c..0f76e09469f 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -44,10 +44,10 @@ rec {
     , ... } @ attrs:
     let
       dependencies = map lib.chooseDevOutputs [
-        (map (drv: drv.nativeDrv or drv) nativeBuildInputs
+        (map (drv: drv.nativeDrv or drv) (nativeBuildInputs ++ stdenv.defaultNativeBuildInputs)
            ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
            ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh)
-        (map (drv: drv.crossDrv or drv) buildInputs)
+        (map (drv: drv.crossDrv or drv) (buildInputs ++ stdenv.defaultBuildInputs))
       ];
       propagatedDependencies = map lib.chooseDevOutputs [
         (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)
@@ -65,11 +65,11 @@ rec {
            "sandboxProfile" "propagatedSandboxProfile"])
         // (let
           computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies);
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists dependencies);
           computedPropagatedSandboxProfile =
             lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies);
           computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists dependencies));
           computedPropagatedImpureHostDeps =
             lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies));
         in
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b6bca3e1f56..c8313b7ce23 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -317,18 +317,17 @@ if [ -z "$crossConfig" ]; then
     # are handled identically to nativeBuildInputs
     declare -a nativePkgs
     for i in $nativeBuildInputs $buildInputs \
-             $defaultNativeBuildInputs $defaultBuildInputs \
              $propagatedNativeBuildInputs $propagatedBuildInputs; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 else
     declare -a crossPkgs
-    for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
+    for i in $buildInputs $propagatedBuildInputs; do
         findInputs "$i" crossPkgs propagated-build-inputs
     done
 
     declare -a nativePkgs
-    for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
+    for i in $nativeBuildInputs $propagatedNativeBuildInputs; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 fi
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 61262e1a64e..0167e51f2fd 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -47,7 +47,7 @@ let
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
   stageFun = prevStage:
-    { name, overrides ? (self: super: {}), extraBuildInputs ? [] }:
+    { name, overrides ? (self: super: {}), extraNativeBuildInputs ? [] }:
 
     let
 
@@ -56,7 +56,7 @@ let
         buildPlatform = localSystem;
         hostPlatform = localSystem;
         targetPlatform = localSystem;
-        inherit config extraBuildInputs;
+        inherit config extraNativeBuildInputs;
         preHook =
           ''
             # Don't patch #!/interpreter because it leads to retained
@@ -219,7 +219,7 @@ in
         isl = isl_0_14;
       };
     };
-    extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+    extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
       lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
@@ -253,7 +253,7 @@ in
         shell = self.bash + "/bin/bash";
       };
     };
-    extraBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
+    extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
       lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
@@ -283,7 +283,7 @@ in
       initialPath =
         ((import ../common-path.nix) {pkgs = prevStage;});
 
-      extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+      extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
         # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
         lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
 
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 02734f2f3e5..9ecb56028bc 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -66,7 +66,7 @@ let
     export lt_cv_deplibs_check_method=pass_all
   '';
 
-  extraBuildInputsCygwin = [
+  extraNativeBuildInputsCygwin = [
     ../cygwin/all-buildinputs-as-runtimedep.sh
     ../cygwin/wrap-exes-to-find-dlls.sh
   ] ++ (if system == "i686-cygwin" then [
@@ -94,9 +94,9 @@ let
         if system == "x86_64-cygwin" then prehookCygwin else
         prehookBase;
 
-      extraBuildInputs =
-        if system == "i686-cygwin" then extraBuildInputsCygwin else
-        if system == "x86_64-cygwin" then extraBuildInputsCygwin else
+      extraNativeBuildInputs =
+        if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
+        if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else
         [];
 
       initialPath = extraPath ++ path;

From 1b262de7ee0fd6cb8cbcb9c8e0b76557b46177aa Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michaelpj@gmail.com>
Date: Tue, 15 Aug 2017 23:40:52 +0100
Subject: [PATCH 2135/3246] Factorio: 0.15.31 -> 0.15.33

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

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index fc1e0ee535b..fca28b17223 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de
 
 with stdenv.lib;
 let
-  version = if releaseType != "demo" then "0.15.31" else "0.15.31";
+  version = if releaseType != "demo" then "0.15.33" else "0.15.33";
 
   arch = if stdenv.system == "x86_64-linux" then {
     inUrl = "linux64";
@@ -26,9 +26,9 @@ let
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
     name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
     x64 = {
-      headless =           fetchurl { inherit name url; sha256 = "1kbf6pj0rdiydx7g3xaqhnvvjr01g1afys2flw8x5myanffhql9x"; };
-      alpha    = authenticatedFetch { inherit name url; sha256 = "0mz7x0hc3kvs6l1isnryld08sfy8gkgq81vvmmssa3ayp5y67rh4"; };
-      demo     =           fetchurl { inherit name url; sha256 = "0zsjlgys96qlqs79m634wh36vx5d7faq4749i9lsxm88b6fylfaf"; };
+      headless =           fetchurl { inherit name url; sha256 = "17x0dlmfd7jwmpmn5i8wag28rl01iysqz3ri6g6msxjnvj5l6byn"; };
+      alpha    = authenticatedFetch { inherit name url; sha256 = "1m2r0n99ngqq47s9fzr09d347i15an6x9v1qlij8yf8w7lyrdy4z"; };
+      demo     =           fetchurl { inherit name url; sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; };
     };
     i386 = {
       headless = abort "Factorio 32-bit headless binaries are not available for download.";

From d32bf457ef6076357036da7ed5164accfd910d60 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 Aug 2017 08:39:22 +0800
Subject: [PATCH 2136/3246] wp-cli: 1.2.1 -> 1.3.0

---
 pkgs/development/tools/wp-cli/default.nix | 54 +++++++++++------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix
index 6603ac510b7..779aed7fea3 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/pkgs/development/tools/wp-cli/default.nix
@@ -1,51 +1,49 @@
-{ stdenv, lib, fetchurl, php }:
+{ stdenv, lib, fetchurl, writeScript, writeText, php }:
 
 let
-  version = "1.2.1";
+  name = "wp-cli-${version}";
+  version = "1.3.0";
 
-  bin  = "bin/wp";
-  ini  = "etc/php/wp-cli.ini";
-  phar = "share/wp-cli/wp-cli.phar";
+  src = fetchurl {
+    url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
+    sha256 = "0q5d32jq7a6rba77sr1yyj6ib6x838hw14mm186ah1xxgnn7rnry";
+  };
 
   completion = fetchurl {
     url    = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
     sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24";
   };
 
-in stdenv.mkDerivation rec {
-  name = "wp-cli-${version}";
+  bin = writeScript "wp" ''
+    #! ${stdenv.shell}
 
-  src = fetchurl {
-    url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
-    sha256 = "1ds9nhm0akajwykblg0s131vki02k3rpf72a851r3wjw2qv116wz";
-  };
+    set -euo pipefail
 
-  buildCommand = ''
-    mkdir -p $out/bin $out/etc/php
+    exec ${lib.getBin php}/bin/php \
+      -c ${ini} \
+      -f ${src} -- "$@"
+  '';
 
-    cat <<_EOF > $out/${bin}
-    #! ${stdenv.shell} -eu
-    exec ${lib.getBin php}/bin/php \\
-      -c $out/${ini} \\
-      -f $out/${phar} "\$@"
-    _EOF
-    chmod 755 $out/${bin}
-
-    cat <<_EOF > $out/${ini}
+  ini = writeText "wp-cli.ini" ''
     [Phar]
     phar.readonly = Off
-    _EOF
-    chmod 644 $out/${ini}
+  '';
 
-    install -Dm644 ${src}        $out/${phar}
+in stdenv.mkDerivation rec {
+  inherit name version;
+
+  buildCommand = ''
+    mkdir -p $out/{bin,share/bash-completion/completions}
+
+    ln      -s     ${bin}        $out/bin/wp
     install -Dm644 ${completion} $out/share/bash-completion/completions/wp
   '';
 
   meta = with stdenv.lib; {
     description = "A command line interface for WordPress";
+    homepage    = https://wp-cli.org;
+    license     = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.all;
-    homepage = https://wp-cli.org;
-    license = licenses.mit;
+    platforms   = platforms.all;
   };
 }

From 378c6d70634bdfd6319278a9ed10a84d8fe72bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 16 Aug 2017 08:24:05 +0200
Subject: [PATCH 2137/3246] knot-dns: try to fixup on Darwin

---
 pkgs/servers/dns/knot-dns/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index d9b47e06ae4..0b556a0859c 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
-, systemd, nettle, libedit, zlib, libiconv, fetchpatch
+, systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty
 }:
 
 let inherit (stdenv.lib) optional optionals; in
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
   ]
     # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
     ++ optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
+    ++ libintlOrEmpty
     ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls
 
   # Not ideal but seems to work on Linux.

From 0c1c3d2b996cff8b96b3f9b53e7780c88e1b4d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20J=C3=A4ger?= <jger.tm@gmail.com>
Date: Sun, 6 Aug 2017 20:19:32 -0700
Subject: [PATCH 2138/3246] qemu: fix HDA recording latency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Very long latency occurs for audio inputs when simulating an Intel HDA device.

Patch courtesy of Volker Rümeling.
https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03336.html
---
 .../virtualization/qemu/default.nix           |  3 +-
 .../qemu/fix-hda-recording.patch              | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/virtualization/qemu/fix-hda-recording.patch

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 8277261a150..5da9db91855 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [ ./no-etc-install.patch ]
-    ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
+    ++ optional nixosTestRunner ./force-uid0-on-9p.patch
+    ++ optional pulseSupport ./fix-hda-recording.patch;
 
   hardeningDisable = [ "stackprotector" ];
 
diff --git a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch b/pkgs/applications/virtualization/qemu/fix-hda-recording.patch
new file mode 100644
index 00000000000..b4e21f4f347
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/fix-hda-recording.patch
@@ -0,0 +1,34 @@
+diff --git a/audio/paaudio.c b/audio/paaudio.c
+index fea6071..c1169d4 100644
+--- a/audio/paaudio.c
++++ b/audio/paaudio.c
+@@ -608,6 +608,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
+ {
+     int error;
+     pa_sample_spec ss;
++    pa_buffer_attr ba;
+     struct audsettings obt_as = *as;
+     PAVoiceIn *pa = (PAVoiceIn *) hw;
+     paaudio *g = pa->g = drv_opaque;
+@@ -616,6 +617,12 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
+     ss.channels = as->nchannels;
+     ss.rate = as->freq;
+
++    ba.fragsize = pa_frame_size (&ss) * g->conf.samples;
++    ba.maxlength = 5 * ba.fragsize;
++    ba.tlength = -1;
++    ba.prebuf = -1;
++    ba.minreq = -1;
++
+     obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness);
+
+     pa->stream = qpa_simple_new (
+@@ -625,7 +632,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
+         g->conf.source,
+         &ss,
+         NULL,                   /* channel map */
+-        NULL,                   /* buffering attributes */
++        &ba,                    /* buffering attributes */
+         &error
+         );
+     if (!pa->stream) {

From 9fab349ef58040ac5cb7db3c291d0b6cfc6cdffe Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 16 Aug 2017 10:25:02 +0200
Subject: [PATCH 2139/3246] optipng: Workaround for issue 28106.

---
 pkgs/tools/graphics/optipng/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix
index 471e8ee8df4..f9b82a38344 100644
--- a/pkgs/tools/graphics/optipng/default.nix
+++ b/pkgs/tools/graphics/optipng/default.nix
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpng ];
 
   LDFLAGS = optional static "-static";
+  # Workaround for crash in cexcept.h. See
+  # https://github.com/NixOS/nixpkgs/issues/28106
+  preConfigure = ''
+    export LD=$CC
+  '';
+
   configureFlags = [
     "--with-system-zlib"
     "--with-system-libpng"

From bc24294ea5dda1fea5759694be09d89e4208da9a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 16 Aug 2017 10:36:28 +0200
Subject: [PATCH 2140/3246] maim: 5.4.67 -> 5.4.68

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

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index 3d278cbce6f..aaf7b68d177 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.4.67";
+  version = "5.4.68";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "1p72pkfnzhxxmlnryjyvgr6cgjm5ww10xr35si9mx9s4b9pz38jd";
+    sha256 = "12jvfxzfhh6cbk6ygliwnkvm3mb7rca60k6x9qdzm17jsz65xhh0";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 7bd8ac64c3a48b5f9b50480a196498f54b9ed153 Mon Sep 17 00:00:00 2001
From: Svintsov Dmitry <root@uralbash.ru>
Date: Fri, 11 Aug 2017 14:20:26 +0500
Subject: [PATCH 2141/3246] red: init at 0.6.3

---
 pkgs/development/interpreters/red/default.nix | 92 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 94 insertions(+)
 create mode 100644 pkgs/development/interpreters/red/default.nix

diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix
new file mode 100644
index 00000000000..01b95adf92f
--- /dev/null
+++ b/pkgs/development/interpreters/red/default.nix
@@ -0,0 +1,92 @@
+{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "red-v${version}";
+  version = "0.6.3";
+  src = fetchFromGitHub {
+    rev = "6a43c767fa2e85d668b83f749158a18e62c30f70";
+    owner = "red";
+    repo = "red";
+    sha256 = "1zh6xc728bs7r4v5jz1jjrdk0xd838xsxmvy9gfg75a3zffm0slr";
+  };
+
+  rebol = fetchurl {
+    url = "http://www.rebol.com/downloads/v278/rebol-core-278-4-2.tar.gz";
+    sha256 = "1c1v0pyhf3d8z98qc93a5zmx0bbl0qq5lr8mbkdgygqsq2bv2xbz";
+  };
+
+  buildInputs = [ pkgsi686Linux.curl stdenv_32bit ];
+
+  r2 = "./rebol/releases/rebol-core/rebol";
+
+  configurePhase = ''
+    # Download rebol
+    mkdir rebol/
+    tar -xzvf ${rebol} -C rebol/
+    patchelf --set-interpreter \
+        ${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \
+        ${r2}
+  '';
+
+  buildPhase = ''
+    # Do tests
+    #${r2} -qw run-all.r
+
+    # Build test
+    ${r2} -qw red.r tests/hello.red
+
+    # Compiling the Red console...
+    ${r2} -qw red.r -r environment/console/console.red
+
+    # Generating docs...
+    cd docs
+    ../${r2} -qw makedoc2.r red-system-specs.txt
+    ../${r2} -qw makedoc2.r red-system-quick-test.txt
+    cd ../
+  '';
+
+  installPhase = ''
+    mkdir $out
+
+    # Install
+    install -d $out/opt/red
+    find quick-test -type f -executable -print0 | xargs -0 rm
+    cp -R * $out/opt/red/
+    rm -rf $out/opt/red/rebol
+    install -Dm755 console $out/bin/red
+    install -Dm644 BSD-3-License.txt                          \
+        $out/share/licenses/${name}/BSD-3-License.txt
+    install -Dm644 BSL-License.txt                            \
+        $out/share/licenses/${name}/BSL-License.txt
+    install -Dm644 docs/red-system-quick-test.html            \
+        $out/share/doc/${name}/red-system-quick-test.html
+    install -Dm644 docs/red-system-specs.html                 \
+        $out/share/doc/${name}/red-system-specs.html
+
+    # PathElf
+    patchelf --set-interpreter                            \
+        ${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2  \
+        $out/opt/red/console
+    patchelf --set-rpath ${pkgsi686Linux.curl.out}/lib \
+        $out/opt/red/console
+    patchelf --set-interpreter                            \
+        ${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2  \
+        $out/bin/red
+    patchelf --set-rpath ${pkgsi686Linux.curl.out}/lib \
+        $out/bin/red
+
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      New programming language strongly inspired by Rebol, but with a
+      broader field of usage thanks to its native-code compiler, from system
+      programming to high-level scripting, while providing modern support for
+      concurrency and multi-core CPUs
+    '';
+    maintainers = with maintainers; [ uralbash ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    license = licenses.bsd3;
+    homepage = http://www.red-lang.org/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a31aefbab69..74ce87c9196 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6401,6 +6401,8 @@ with pkgs;
 
   rascal = callPackage ../development/interpreters/rascal { };
 
+  red = callPackage ../development/interpreters/red { };
+
   regina = callPackage ../development/interpreters/regina { };
 
   inherit (ocamlPackages) reason;

From 105864a24df45b2f159cf3981cdd81e491f04197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 16 Aug 2017 15:44:10 +0200
Subject: [PATCH 2142/3246] purescript: fix building #28296

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cc1adff9547..fc39b62402a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,6 +422,9 @@ self: super: {
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;
 
+  # https://github.com/purescript/purescript/pull/3041
+  purescript = doJailbreak super.purescript;
+
   # Missing module.
   rematch = dontCheck super.rematch;            # https://github.com/tcrayford/rematch/issues/5
   rematch-text = dontCheck super.rematch-text;  # https://github.com/tcrayford/rematch/issues/6

From 280aff8ea11e56953b92d54c6e5fa9e91da14a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <bjarki.agust@gmail.com>
Date: Wed, 16 Aug 2017 14:11:19 +0000
Subject: [PATCH 2143/3246] google-play-music-desktop-player: 4.3.0 -> 4.4.0

---
 .../audio/google-play-music-desktop-player/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 47b85af724a..ba9bd0338f5 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "4.3.0";
+  version = "4.4.0";
 
   deps = [
     alsaLib
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
-    sha256 = "0mbrfnsnajmpwyqyrjmcv84ywzimjmm2b8faxqiwfcikdgpm9amb";
+    sha256 = "01a52rsp0a9k47mm3wqnhnmlnd7fw6xmdrn882msldijjgwsq5cc";
   };
 
   dontBuild = true;

From 220e3817b8c637b60783946003899c419aa3303b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 Aug 2017 18:12:09 -0400
Subject: [PATCH 2144/3246] findutils: Manually specify sort's location

Run-time deps aren't necessarily on the PATH, so we cannot rely on
configure finding it.

N.B. on cross `-z` support is assumed missing, which is an incorrect
assumption.
---
 pkgs/tools/misc/findutils/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 06a140fed50..4eef3f7a9d5 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./memory-leak.patch ./no-install-statedir.patch ];
 
-  buildInputs = optionals (hostPlatform == buildPlatform) [ coreutils ]; # bin/updatedb script needs to call sort
+  buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
 
   # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
   doCheck
@@ -25,7 +25,12 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "info" ];
 
-  configureFlags = [ "--localstatedir=/var/cache" ];
+  configureFlags = [
+    # "sort" need not be on the PATH as a run-time dep, so we need to tell
+    # configure where it is. Covers the cross and native case alike.
+    "SORT=${coreutils}/bin/sort"
+    "--localstatedir=/var/cache"
+  ];
 
   enableParallelBuilding = true;
 

From 63428ebab97e917cbd5820215c49ead6fb91e7d3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 16 Aug 2017 11:27:44 -0400
Subject: [PATCH 2145/3246] diffutils: coreutils is a run-time dep; specify
 pr's location

---
 pkgs/tools/text/diffutils/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 787750c8ecf..cd64bd1566b 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -10,8 +10,14 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "info" ];
 
+  nativeBuildInputs = [ xz.bin ];
   /* If no explicit coreutils is given, use the one from stdenv. */
-  nativeBuildInputs = [ xz.bin coreutils ];
+  buildInputs = [ coreutils ];
+
+  configureFlags =
+    # "pr" need not be on the PATH as a run-time dep, so we need to tell
+    # configure where it is. Covers the cross and native case alike.
+    stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr";
 
   meta = {
     homepage = http://www.gnu.org/software/diffutils/diffutils.html;

From 7fdf6e6b99f58f88973b31f74c2ca13961405ebd Mon Sep 17 00:00:00 2001
From: koenigmaximilian <github@koenigmaximilian.de>
Date: Tue, 15 Aug 2017 00:36:19 +0000
Subject: [PATCH 2146/3246] palemoon: 27.2.1 -> 27.4.1

---
 .../applications/networking/browsers/palemoon/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index bd334356df5..bd841ba8110 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -5,19 +5,19 @@
 , gtk2, hunspell, icu, libevent, libjpeg, libnotify
 , libstartup_notification, libvpx, makeWrapper, mesa
 , nspr, nss, pango, perl, python, libpulseaudio, sqlite
-, unzip, xlibs, which, yasm, zip, zlib
+, unzip, xlibs, which, yasm, zip, zlib, gcc
 }:
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.2.1";
+  version = "27.4.1";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
     rev    = version + "_Release";
-    sha256 = "1yyipxd5lmavf4aca4vrcnp7hb8zkn4sv2zp6n2cm6w4pxlza0g4";
+    sha256 = "0sgy0iq038pj676w6k5nwbavrdmrznhydjibdpj6irdz5qxxdgjn";
   };
 
   desktopItem = makeDesktopItem {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
     hunspell icu libevent libjpeg libnotify libstartup_notification
     libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
-    libpulseaudio sqlite unzip which yasm zip zlib
+    libpulseaudio sqlite unzip which yasm zip zlib gcc
   ] ++ (with xlibs; [
     libX11 libXext libXft libXi libXrender libXScrnSaver
     libXt pixman scrnsaverproto xextproto

From a3dec324633727e7c541f6ef40aa0a8e80f66549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 16 Aug 2017 18:06:12 +0100
Subject: [PATCH 2147/3246] octoprint: fix hash

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

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index b7a11f988af..7c8eab9f11e 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -60,7 +60,7 @@ in pythonPackages.buildPythonApplication rec {
     owner = "foosel";
     repo = "OctoPrint";
     rev = version;
-    sha256 = "06l8khbq3waaaa4cqpv6056w1ziylkfgzlb28v30i1h234rlkknq";
+    sha256 = "1hci8cfmbzcghla1vmrcn6zicm8nj50drm7gp2hkr0drglq5fgr2";
   };
 
   # We need old Tornado

From 7ecb287ce9304d44deb078e88bda763da5f9badd Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 16 Aug 2017 18:21:31 +0200
Subject: [PATCH 2148/3246] distrho: unstable-2016-06-26 -> unstable-2017-08-04

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

diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 5d4e19700d8..9d157833c0d 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -2,12 +2,12 @@
 , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
 
 stdenv.mkDerivation rec {
-  name = "distrho-ports-unstable-2016-06-26";
+  name = "distrho-ports-unstable-2017-08-04";
 
   src = fetchgit {
     url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
-    rev = "e3969853ec9ba897c50ac060f0167313e2a18b29";
-    sha256 = "0id4p8dlnlv5271yvmyawfr754nzah7xhvjkj633lw5yr3mq707m";
+    rev = "f591a1066cd3929536699bb516caa4b5efd9d025";
+    sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9";
   };
 
   patchPhase = ''

From 85a1a59e671eeed448fa827e228176fc384cf197 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 17 Aug 2017 03:12:41 +0900
Subject: [PATCH 2149/3246] firefox-bin: 55.0 -> 55.0.2

---
 .../browsers/firefox-bin/release_sources.nix  | 762 +++++++++---------
 1 file changed, 381 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 2d076828694..cba850e33d5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,955 +1,955 @@
 {
-  version = "55.0.1";
+  version = "55.0.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ach/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ach/firefox-55.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "c991a8c53d1f415253a66fdf337e082a3cb75f30b9b340ed29b059e2a6f50d67c320bcfa9584206f1e23c1af5d3e8b825e30ee009f7d8130318cc356d8550316";
+      sha512 = "3824d633f5aec2bf1f9c6809ddde44a85081dcceee05898275b8c4c6dc26113e453ad701d4c05b5a81c81fe2ac42baf37fa2fa9c22129451435eb78791df51b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/af/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/af/firefox-55.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8112c343179b1bd61f03cb67a0712ef5584848bd2dfb28dc46ccabfc66eb803ef9f23d023c6f22c6cadf715ba459f36e99bae5be8f6c62af772a7f67f724767e";
+      sha512 = "e3ad3df3469ced1f12fad5a6cc16c7be6754867bbd2871aaa07a9f49a26c3d8c07363892cfae0e8245d9020c5448e82d01d4d2b6c7fd93a7083b2d6480aec689";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/an/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/an/firefox-55.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "41899ad93e627e851423ec8b5acd6bd940a10dbe80e98377e7d4080b31e9a8f5ceb51eec46931429688a4b56065af2a3595f51c3ef2c51561dd5a06d0c0cb347";
+      sha512 = "1ace2fbf01cc30f70ba7dba7803f4052ec8c05f93e174225e9aff14a67e8b7214dfba43080b4c50c761b80801a9e16a92c0f753734cdc34dd7b482cf023ff0b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ar/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ar/firefox-55.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "ba4bf0c1ede64f3c11d00b5ef3b193d4e36bfc49687572050b22cbd0bc30be050a7df3401eb20e869b1f33ab16988701392b845f89d4693a589be589eda54ecd";
+      sha512 = "a1dd8e128bec748c37b849c8c480c9f106c614440bc4f8d3b17b28cbf0558b8e6524a0b459d2ed5f6031133056f0f73826691b9ccc1a9efd216ffbc3f64a6eb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/as/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/as/firefox-55.0.2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b3ae2fad8940ddaa16102f9d43bc5113a5f4f38a4527c43e1a4b88a63015d128a201b68b72377c23274023b7486829181bb44ecec43ba50fe1bc438d30da8349";
+      sha512 = "995993ac28d2ef309e025d15f75ce29c3cd028f79bcbc4aab65d1e10efda2887faaabc6beb8277baf81ef256d8365c062e6362f2dfa91b37a65930ba5cb59c0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ast/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ast/firefox-55.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "80688f5eb65f4fe09a840d5f3ba2516bbe45dbb2f2b96cb4f8af38900880dea22f3b8e040491d81c96abb4fa1d50815e86b5806dc8e31148c0235b0a72bafb12";
+      sha512 = "8bd9c1dbc549b7b8024c28f026e2b9b5a099b80904938955372e157016b4ddc729a378502fb7973a9352bbdd09646942241eb23d8a7528874ff500b0aaade77b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/az/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/az/firefox-55.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "0e8d42394d79c3a8f8f9f7a7ddf5894adbd89627832908e2f82b4712bd3260e8b10e04eb0166ee8c2a1010cd9dc4836ccbf99d3af794187ee90f06142286bed1";
+      sha512 = "38ba0acf054195274043470d4c71c8f2800ea543806ab0d6f39b0545fe634c742072900075c319593e5a75b8403dc2228c049cd9c359497a71627d74bb750bbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/be/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/be/firefox-55.0.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "c13a53874775cf3e2da703dc7ca5c1f9d69e3af9050b7f58cf903f87a2ee7643e7db361d3d3628e470d808ce1b412d355653cf2d67691e1e89c584a9709cfe41";
+      sha512 = "dde5852d9d000b81ef460e49c540fdf2731ba836d5df50771c551b96f857263552389dbe97289b6d95019630774c1e8b8a85a90ca94ac275410c1ea18bcde833";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bg/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bg/firefox-55.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "8a6a34f0a31793e70edfd44edb54d3709a3960c3625f5856626c28f0df0e93d18d0190d3161c18315df678328918fd4029de9be9db7a6ee426a9054dc5d9c50e";
+      sha512 = "e0e642f9a7e6c1968f77cd34722acc77de84994b92745048093abb123d79ce9206945c9eea519b10a293ea349c7922937c27e6d9e7b6709b6aef388058f6e6ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bn-BD/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bn-BD/firefox-55.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "17e2b8046b6dfe2bef7c8dd7027fa2fe2c008672b7d5a9676a9b6ece12b7b3bf7fe61a5d5378f1974f530199739982a83b421b7cf4643c9bd654a4b2235f3bc2";
+      sha512 = "49834af50d8f8e547f504a504d6161c07675cdcd98bb8d964d5f6c72c76d22925865677e64a90175ddb3312c8a9efc1d113e76aaa914e9d6315f635dc3095bac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bn-IN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bn-IN/firefox-55.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "39a5c15019881507552a583053fe601dbc04e0de410dad3ce7727ddcdb128b28c5becfc748a1c5b89bb272db66f2bcb4eb6ea1b8a3cd37c1d10156ba29b3165d";
+      sha512 = "664692ced004e94e61ff9c44618931f62b316ddf0b56eb83dab7d4fe69a5016b3b5efd5a02c49e3ba41cb51b2298096c74ff2fa8131731bf79708a23203ce350";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/br/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/br/firefox-55.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7ee7d1fcffbaa0791c88338a8b471bc20747abed505ece15f74f58b747eb56b300b71ff15e72e56d5deaf75d98ccbe93bf8c1e0ad3038238913f72f9156f8790";
+      sha512 = "e9ba0f8bfff1929820ca0cca3de5c377c8c483e4ba46b3064cb210f971aebbf2f5cc67d13a05e1c19e988006ff37dfee607d00317162f5146dd8a1b7e167ee83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bs/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bs/firefox-55.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "038c185cd6fd2efb1dc51c9e2275d98fa0040e68de306d5cc3d799893a69f937353c94c00bfb9fcfef2a2c6099149926ce30ecfbd972170cea501f9c44c836c4";
+      sha512 = "41fc17c916c3c23cbbcccdad686ebbbee3ff9d68b0b72f8e8e8819e438df2fda7aa954be3a0076d91fb5c05b507873a2bca90e2b661542b86ffb0bee3cf6bb77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ca/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ca/firefox-55.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "be717242a9c93705234d87d0b091925f1b07e60130aa06ef19b72283f0594abafed577b6d98eaa9fab6941d1f8c2f43292de20b9476312aebe0fc51d368ac50d";
+      sha512 = "d0880ef0357a3e8d9f3d419390b8bbd95c75d6f50469a63e7c1e0182cf98e85c942d75dd1c3736c856deace3f49c6751f9e8e1b320fb0aa73a78129340e5467e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cak/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/cak/firefox-55.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "1b9ea57bd4164862c9c29e3fa16200aa7ca15c277f00b838439edba4256e323aff97d27264bbd20a5e08ed70e4f897611505570eb01a2ce0f9cb30c2c611d065";
+      sha512 = "62a6e53dd82ef2bc2881c1aa912bdcd9628123b13a769f43d640c05c1a02dde9ad5d69f486c2858c68ddac7dcd2275fd3970e56d48f4e842a3757f453e6843fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cs/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/cs/firefox-55.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "ee32ed99d5d4b05d6a9ca4d6d274e16ada833dfc9f5735898eebcffa7925d1ac1229ab671af9f8eaad7d4fd6d2135e58c8f6266e1173a8797a513b977235ec0b";
+      sha512 = "719e052b32b1e080b4627f286bacd9b3bc2b8f40cf8b79ba2643f08220a05201e649fa98f679c4fb926a23355a12ef744ff7b5ef819d9b825d5a5ae790f7a6ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cy/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/cy/firefox-55.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "29302ad22573fc52e0764b89848ea43ebff98ffe94d3d91d1aafa05e063cf9c5580c9e79e0b987f18a87a648a6076f98c48d20d5621ebd46be02fcf41ce19779";
+      sha512 = "ffbb24e8720f354c2a20d5d13d6b3f003a0b3d1606da231cc9c4750d837efeedb4a789fc4b787463d0e6f0fd9492583fc24b791de6ab4eeff6f2258dc2206f93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/da/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/da/firefox-55.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "25f8252bac8b1b4e353dc8be0945820bb9e013dfb30866b14d6109026c122cd9038e0e70d54f959a59dbf99fbbee48d0e3254f7e1091b2e2e2811b83498e36d1";
+      sha512 = "62a53b150f4dce8d09e63c44bc4ec5d3657b8db624a71415b666101b5a4ff2c98da3ab4e0587bef824ad0303da78060c6ac5409747291dd021d2d62437417928";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/de/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/de/firefox-55.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "2d013bd921ea9758807e64588f887fd841c6b8b32a18b9eab3b2ac1f598c4d7acb27b2defd4a836bedac238c96cc7bf700ef87f973a39d21e87ddbb7e27be1ff";
+      sha512 = "feddf89febf177d83e816900cdfcfc03c119c4aebb026586cee127d541db7d7c37c6d47e989402a657e51d66d7564e13016926f16cd3510ae0cbf6b4f767aeba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/dsb/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/dsb/firefox-55.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "f640fd20c2beb5cf6aaf402fa220a01176e0eb74d4429cc10f76bfca9a8579e17e490bb2f045ca6e61de4ab49703c68571c4dd7ee82c438b2f8ab94ecf53ec0c";
+      sha512 = "ceb9fe65ef661d721c43879082c1d99c90f293ff38137c7ff2994f0a7b53086452f139f3ccd2c15fdba1b09a16abe560d4a81499926830f06b5311eb05746157";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/el/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/el/firefox-55.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "6d1f68305ef9faf6c0d304b8ed4b4c093375c03b95b01ea7c61fd421cefbc84b8fb878cf49fdc5f3ec8552b277dc351f201470c5c4f45a249b3e010a863dd65b";
+      sha512 = "13c7ffaa22e1b9968b643d4cd6e4b46310476592ec894293be1f0179e9c16c02944c34e2b25fb5a0dcea5d374c8bd5258a370df1539b967b96b6781fdfbde753";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-GB/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/en-GB/firefox-55.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "e4bb9746e00490bac82750130284847d845ee8c85d48d84b799d725a3dd82ce68046bb2c9bcfa4c92070383a4f439766abe58dbfc9346cb51aabdc730b3e8ea8";
+      sha512 = "566ff317b62ad2158866ca7f50509eed0272e00029686719c1843ea742d252c45137f9d6f867b0ca88e63e84a7f46444b9f6d669bca31f6bb2566edffa167f75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-US/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/en-US/firefox-55.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "13598109ae60682bfa122925874173749114a093f7989bf0a4cac4def59db5ad53db61546d28ce09482cab1225924c7d35bf4efa8b3051e78ad760f892050a35";
+      sha512 = "93092a136943c8901a1d62d34582dc3d6c5a71629a274e54650901eddde89287d489572605a0d937f16d3ff9cf2b0e95ec8dd90acaf7da979f599623d1b9ff99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-ZA/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/en-ZA/firefox-55.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "5d7dd0d6b2e06dc2c3ab94cdeefd168c005703cc3c632aafd7896bc631002ebe26c1c0103307f3165b720cfe79e63fdc9b37429885a2eefdba492b714ab308ef";
+      sha512 = "5898f88d188daed37bd8b5bf523d94bc3ae8064a3a020b463658f333140c4cbdecc24f053bc898dd2e81f3e945a2d0ae63a05bbeaf27f8ac94a7477f697e354a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/eo/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/eo/firefox-55.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "1f67bfb98891effb2ecfb127b9ab9ffda714187a34265277fb7841f41d5a4ddfb81ead7f4cc1d38af290feaeb36c315b2050a889b6e9b9bd7b9cdd51ba0cbb6f";
+      sha512 = "ca234eba852ce9ed736490e3db9185baba4d190fc631133747219dce7b24fdcb4fc3bf348de21bc81cc02cd818660158a94f0d2129a6869e9dc88f0b7a426c95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-AR/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-AR/firefox-55.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "011b4f49e90ad091be5e8d932ee9a76b1653f307db328ee6770b99ef37f57e62477ca7529d182f328203523f9d0160f337748166691921d5720640c634522515";
+      sha512 = "c86897d532114b6e9039e4eff546e724177b9de1049af2634580e8ed8f2de54484fc9573fca1640ad544b8db092a477f3d855227ae1ddf2766fb5c453cfea876";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-CL/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-CL/firefox-55.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "ef29baee74951692720c32522bec81330911ac0366e9bbd816a5bdf0738e064268af2f63ea5b3542e51eed21775cde8b4d60f6cb47bb18b94315afcd078a1c84";
+      sha512 = "868ab44893d60c66da1389dd36c8b84bb44a52f0daae20a7de247bd22aa4fe3b9c5d22dd75fcfaf3b36933fdfd91f694d9758ec9ea6cd40f1882a3a721889742";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-ES/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-ES/firefox-55.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "8f21e0632e2b4d86883b139f5992becd89a8c243afd131e2f9dd863e2fb21279bd858f618789a73d46218de3bd59a5c4b017dcdda5b1db9a3400e0e0ace3c9c0";
+      sha512 = "39c9841c7a1f6e1bd9028410b49f83d57193a6995053e7056d2f1884ac6706bc54972a531031b8e14a2aabeb0c8cc1f297bb580676b4c6e0b33edd5dbd6e43eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-MX/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-MX/firefox-55.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "9d59bfffc685aee31004894e81dda5efa3c512bfe61dbf5d224b31cdff6a859598287a8a80e7d96645718689df2dfee3b4a79c064e789d246cf32138b9346f5b";
+      sha512 = "d20bf48f886f739215fe2e46c30b355fb6113859ddc6c917c6936c119e3aa105161174f74d77e63f7bd59619b85f21353dba19be4f98d114551d585eccb70004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/et/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/et/firefox-55.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "a833839e8243760942337161192fdcddcdd7ccffd3b5ce3c7dc939492366e8579e0deabc933a607885f20059e40dabffd389a52db05ea6bdbc794d9e15a1c9e7";
+      sha512 = "a794a793a7e430c643007d20898ff21f25a364d0629c022073747d15882f1470ee6b50c1bc6ba2d4830d09598044086d81f6f81555e23c7f3492eb8ee7b29835";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/eu/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/eu/firefox-55.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "0415c1f00f612d080dccfc3829c3f89de4fc5921ad8603c7eda0aaf9ca57b055c66a4a0f44782a8b381e4e166964f5cc805b65b84525a073a1fa3e605bd07aaa";
+      sha512 = "ae8b65527a12e8db514dcdea7d533edb52a39426e96f50707374395cc88f427e6370e864c9d55da93b02e2c92443c2f06dcda4aacb882be0a4982408678a05c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fa/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fa/firefox-55.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "699be76441b245de502cf0b9ac44fe3c454fd11fa00d6ad590b2a393a31f4f291c3b5b7075741c82c28a721eb38a11a3627e71b42e910fbc2f474f2284820f86";
+      sha512 = "ce8df8ad73cb30195a444dc9ca9f1514081315fa4a927af79eda41ea1b2fe22c67825157cae641f80b3dd8760bf8d3d26a538a211c5828b41458ff60337c6166";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ff/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ff/firefox-55.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "910928159d16269784d3a41b8a423138060bdedc7e190c80e5bc95bb9358b6e8fd08c519106d68326eea4bc8f5c54157cda151fcb72d5bb1d19f82696297760b";
+      sha512 = "d896277ff916832466ae58f567cac018d259b08df13b59433707bcf60f5e75975678a25fb8bc138d3e705310e10d0cce06118f6581760fc9c1e8e076e4a5c355";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fi/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fi/firefox-55.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "1085f674e3fd557d62d29c81d52dbabbf09229a03d38d8eba1886a98937c560e91b8a5cd5fac1d313946eba6622eb21462bb1227cd35dfef523b34e8928b7f3a";
+      sha512 = "adc3dce086ea0113b8daf96e1ebc5d292d35007ef59b0febdf72868350e98696c4efc25ad9dc9cbee908a0721829a106ca4d72690f5e9295077e7971bc9950d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fr/firefox-55.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "038f8198004d38ad9e2814bd55b2ef1d6e3af3f8f3369a90b41e44421b94ae960380ab65367375e15eeb1d0af72343874314c1005aee18dc86cf079fdc19fb80";
+      sha512 = "2446635b7fc3b76e3fdd15634c7563483fe6bdb3c26e98cbcfb0f025567a5a003bddeca68fb87a6119e46da7325b50bb429444a30b92137f7e7aac8a57ed382b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fy-NL/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fy-NL/firefox-55.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "83eb5df7022ad9adce4ab7966fc4979aad7f6d1bf2b47001105d67d7933feb8c264708938b87fac3908a65adcebf72f6af9d5623fa6026458dad76a360f0608d";
+      sha512 = "fb02a7d115c00f36680d9b33a65b8ce459a2607e8c9bfc9ecb70b6712a59185e990415b4998583da70996331fe3ac7230b5f2c540d27e0d04c193940b398585a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ga-IE/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ga-IE/firefox-55.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "34f3bf3ecfc264bcbde3bbca80bf138d1f7f925ce6606d6c588f0df25f22eb912dd3d0388a6798091cb88b51a22380e01fe984bc80edf95c76e301e7cac2b2cb";
+      sha512 = "02f16ddfede728b0a1b103266805263414b2ffa959ee5e5b41d4d542c747ec2b819e4e4b1b6d30173f76d91eba388572ff4a84433b05ec7d02b7ea3d351232c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gd/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gd/firefox-55.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "4d2f04c7cf06c6f8efed7abe74f8ab27794c01aba57ae2f45bbd1a749295ed7b6db4389b1c93148330695c6d213642dd9046068f0bd23ed3920bfcc7fb9dd4f6";
+      sha512 = "e1e25afce2d91f582a2cd93cab594f08f47ea5bebf273db47b79950a674e39b580e8efc477611e5f0e288593508e9cc583c6a9509f08357e9c717c84fa54acb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gl/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gl/firefox-55.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "d70c3cd99be7dd1d80c070d5301a1d84f33f1b626e0471861980512c81672066a7869a5d289cf862ff4d0ff6f488b0a7cc298675aa9afb0a62a191ac476b71b1";
+      sha512 = "f077016885b4780b91e9be185fce08398be4b34e496afba3b41c9dadea4d191d4c93a36f31ec094b0e57fe0636bcf1b38c67ad5180bd63086fc07800e90f076a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gn/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gn/firefox-55.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "f183e3c3ef451367362aad3bc96cf1500fce451d3c0f467822e756266bc48d7d9d7952e82f171db2d8bf23d41bf58cef34f67da7211d31335f86574abaee567f";
+      sha512 = "c935d587a2d5d5ef9278d265fe6d7225c4568e2f9058bddef99c677e9b89ab286bece8b066a44bc4ca6d155d83ccc14382e80f2fba4a44aaaf272cfce178f5f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gu-IN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gu-IN/firefox-55.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "31afdd21bc2d9af1a52cd24f74c76480658fb0506f38e6fd5f5f85bd66eedae49cef89aed9060f1255c515d24b2998cbf9eb449b5083bc6f2bf1805d152197ea";
+      sha512 = "9afa840dcf0de2386923186f6f3b2da1c78d3a31eb794b3aa1caa0092e90a8f7594b729970de8bb410457ec88b681abd99bb9be7eaabd8496bcfcd521ed0f14e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/he/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/he/firefox-55.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c68c416515336a6c2c8ae69151c1b8c972f24671d354929eaf3eb647944d6e99085b5768a8156e59015401a33174fac774f0bdacc6005c3ad23a008009653fb2";
+      sha512 = "41eefbde51929a1642310b62fc61881a16643372a94b9109dec6668e28ee71d3acfc154ff26052cf4702504523ea39e5e14679b14956dfaa21628717f66a5f10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hi-IN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hi-IN/firefox-55.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "2e62b66e9d34c9a7d9472726dc322746ef399b24400b9315dcd15f010d0bdf80d8f0c1ca912ce3275770ad925f47d576b59484b3acd861d1f3fae9e2ffe5277f";
+      sha512 = "4ab94bfa479c1dc703206fd5529ba9821afe9f388cc18a80512c5beb9411c3476ba4db7b859df4556e8382c1fa5a521e6f6682021daa46510c3497deeaad1ec4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hr/firefox-55.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "a5caa5839d7ba556314c513a9599ebdae05de41f5b3289987a1f1d1dee030b53da07773fd6517f42899ef443770ec3549f4160c77e26f68a1e1bb3ca598bd866";
+      sha512 = "7a0048bef5a50588220be7145a2449e2f2f16a2542e5e2af17bdf5fab10a7ca9f9441ee52bf8c274fa462d4590be6269129db5dbf3f55574b8e3257f80d2604c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hsb/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hsb/firefox-55.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "df83ae1a93cbed29c85d75add44b70fde9c187953fa169cbdc106ecb722ec845b129fb762325f08d0ecca188ac6bac43c6662059a6694d43ed90472ee8eb23de";
+      sha512 = "d21ba3b5344ab0f105cc6f6c426dffb553f4b98d1b6c125266d8f53209ebb58011e41d72b431945656a2c619347e309ab57252c4ed7189f6160d61379017e062";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hu/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hu/firefox-55.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "c5787634d4fcff538423fdd9761989ef341058fb129f33bb729686cbe5319aad7d67c8d19d9e42b7d81ac08381cd0d07504fe413a9c38c310ba3d7440ceb6934";
+      sha512 = "5bb2e9c79cc08ca3b9e4c47e85daf351e411899318abd6f97bc715a1c4134ff271f7c1830eab1da9465c975d2c1abaaac0c490b7c2504f175b3b468b7824b622";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hy-AM/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hy-AM/firefox-55.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "6318a512fee633ce49a2ac6cf3b3295e74624bd935e9979193796956c11239f1da3ebeb99b5547e3aaaf339c4f87d0e4501edacc13fd11435abf000a9e119ed2";
+      sha512 = "25191d401eabab8adf1d603b4838ef5fd42630e5109cdc7fbdd638cb9537f91c16fc559dead9084ebc703f3ea0b3282c9ba72bc579466ac501b2d9446e398e21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/id/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/id/firefox-55.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "2c7d0de71a675a0d6abe14037db11087ad9a2825bc2d9bbd863f209b86d9875da08eb2005590418262b63bdb12a9b122e54230824d5916059f3855b628eec8de";
+      sha512 = "0c681e3f08b80e94b8b3c3c8fc2408e6161c3c8a665c6eaa29d5c33eaf508bcb8426dfdb0a3218d15c88b6a414e55d27468aaed43c2b87f8ccfb1ccd26f07817";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/is/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/is/firefox-55.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "a1dc23e047cb7bc21f3c1a888cd8f9168161296a47148c2296e4f033d7038fed83566a429610fb35b514aa8a902839a00201901d46361205e5e292eca7418813";
+      sha512 = "6bd3b4233ed6efa88b32047705ae9f5250cbf58f93e134924a0adb0ae7f569123b5d085011c35c0f022f37096fb812811f0fec0bf781e355a5342650820b269c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/it/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/it/firefox-55.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "cb2bd028873e28aa197e3f599b2d1aed913273f888cc2eb69775b1936763011baec1f03bc57e3da6b2088a8ff37d08ab014bdce8161bf6929c57f658772af8fe";
+      sha512 = "cf8bfaeef210cc2f94fc9405a9dcb8dda331fedb82e4743cbe6b75eb0eeca13b77a30fec648806057e0e8ec95bd957a4003e4210e38e9d122df50ee6c0c31b79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ja/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ja/firefox-55.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "dda54f19f4a5a493b7ae6167955c9ff4c503d8cf239fe6b993a87d3f73171162e29270366bb3f2f1f1afea80e3332928417bb3e26fc414d6543e9ab2e1a2008a";
+      sha512 = "ed12eef067d9505266b27bbf856be093bd3f6bd2b82c355a3c75db0d964ba3a86838cfc976cd142c142dd77b90d5a878615577c57e7861b41a4ae6ba69bb9933";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ka/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ka/firefox-55.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "9e0a7042225361addf1fe41c13e0e3df869e41c1a88b4adfa64cd4912c4cc113804dac23ef5ac7a8a196ebb8552a2baf988aa9da618ab1a64e307d02c15177c6";
+      sha512 = "594f2a455ec525956e92e77e5de1f54f8cd7bc615567ebb4bb9b938d1978df1bd87f9865e6311cb4280d0b1d435cc8a522b7d7b5fe6279aa3f387a288df81d60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kab/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/kab/firefox-55.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "27f319c418dc54296f616b9fc2b6069f1f0da92b2eb95d872b4fa582f494f0339cbe40fe0427ae1cf8a1ddb1ee436ae56773c7413591f4bd76f027916bcef187";
+      sha512 = "b7d3d54e7bff659074bfbab859acc3bb6c2141e9111fd0b207ec3ae81179356942f48ecae75a8f87af0514a79179e77f088be810cafe23eb234e85bebfffc798";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kk/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/kk/firefox-55.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "7d5664fb243b214846fbf2a1772be96df94345bbc6cb076b9e75ea0dc126e3113faab67ee935792df48a915aa7274acc1d4ce48bf09f17f662341b2235ef6d1b";
+      sha512 = "0cabe96911784264c984e23831b8e8170fa27af03b15c85706c20059f5e935910deab728e2e8b68e00b62d4f073f4d8e156e302bccaef6794de07fce48f99255";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/km/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/km/firefox-55.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "7df87f956678f7f90df95f5bbe1309eba7f89ec2e1030746f56df0e14cdce200a1204bb73f8db68b02655db36d13941cd0887116e974df2e11d8d222f5dfb6b6";
+      sha512 = "e62980ea8f48280dfa8123e4ba8bfbf7627bcab855e2869ffc947c9538377721fa6ab52b9bb209f7e2db859a5f606232e39248d7da3020693f4d7de1125b8a2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kn/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/kn/firefox-55.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "532c5d7a67d6508188628b9728fb6a1339ed9c789fd8cc58c33a9b9495e8ba8b979c631bfae66096b164c277dc0eeca167911aa4b856a1d6d437bd5a60103a3f";
+      sha512 = "b5bd9a15cb1526dc39bfe15c9bf5c8624eb919f85c0f61f83da0477afed65aaa3a2af71a0118fd48fdcc7a73da778b9781d56f41d70971e52799ac04f3a8ee78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ko/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ko/firefox-55.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c1170288dfe6d2ea418d93e3d401a2746c88df77cd8ededd70b17dac4652488b20966aa472f7e929662a8305fc03f7153b534d79d6e8dc62dfb0b468a417317c";
+      sha512 = "59462a1891d08c109827b1e92a267c28427222e62b945194d4c5610f823489e645714bc6a1975b42b3aed3b809c46f01670484ba8043538465a20c21b6519263";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lij/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/lij/firefox-55.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "3f2b8227f04064ea5507774848296fb12d4e17b806cea7a356c36995648a4db740d68382ab6d6417d745dc278b6cddc6f18cfc6fbbeb60480106d726715c0d1d";
+      sha512 = "b0c1dfacb6a1333306dca3b16bc815d707ede40b96511c6e130ec76572e0ebef264537b458c4040d45790868114f8f652c84b525e1cf92b05785631a67de2196";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lt/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/lt/firefox-55.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "24d0621a76f53b2a4fc7f3b4d97a1a066ff6fb7c7e1dba9028ef719a38042271412068a7a874862ccbbaf010a7491088e231036271c54e51c624bb82937b139f";
+      sha512 = "ea0f17e1b5f28e5ed0033ea5bdf8ef8461cb861123688dacc908e37670b22be9d115c3dbe8e92543a7b5234c3a45d159aa0c486eddb3348acd21f7430e5b3cdd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lv/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/lv/firefox-55.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "c36c40e21e305373e7d4ddb67702055cdef28f880739c2339c5e75a0f1d30c2e73316f65badd69dc93552ae33a1f493658002d73caac5a97b8d03e3e4365e6fc";
+      sha512 = "2a6a5ede69b3280b43de68ad3c1082a4f46d606cd0e78a1968ab984b8b3aa8a455b809b3a6ecd9f8ffb2c296206e68446b2139a1739fdbc4f3fe8e6a736091a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mai/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/mai/firefox-55.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "f033e7d1cf52486775ec614bf6272cdde3cbb17a00aad49c8c7739d72488c03d9803c860aed581640689e336bc55799521da4bb0b3a6c9cedd3af38f94c944f2";
+      sha512 = "178d8d1446287d0f163166851f7ec2d404d4328fe6b901c6227cf4d195de7e97e5097477d0f2a9cd4c2c492ac27fb15d3dbc90b798d3ea05c3e2d2a017ab3ae5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mk/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/mk/firefox-55.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "d01f9acf588e5067681422daff9be1f2e033b91ab2dba9a979dfd9bd918b1a20e5ace64739ebccffe025e03b80a2f3a955cbf5940ee9341e2f62053ffcbdc408";
+      sha512 = "52673259ddf45b072037c28f872a03b75a3a948517a27514b6623bc5a975c0d745340638b04a5c9d16503bb0ab62e08795d1e387ea37a69e796fe0842c3957d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ml/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ml/firefox-55.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "95a6cabe1b0fa984de1df148207d22b570a09a5c1fe95e898a33e0e0c905b9f868586294032712339562d8f5cc78961a7fed5aa3c1a5c1a77ea5a5f3197b520d";
+      sha512 = "a58262f6788002550220861c1a501fd9d15b7967bb538da738b831be91787e04c2f42ce5dcb045910ee022556af9330df4d0b985702995ec40f3368a3a52eb7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/mr/firefox-55.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "59053496d9d37cec07ed1dde98ae07db593726d49fe97399e97e4a6ac667835cb34db4864c5e67bffd1a9c1727c1af2feb19fea0685fdd2f6b5226ad24022656";
+      sha512 = "c927b197ed833cb3beece57d247107865d6c1d9ddcf01292f28927ec4ad8cb325c8b75cc50e1bf9b31eaffef31a3d472c55338667c64425f80934534bd6b6f3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ms/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ms/firefox-55.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "c3a23a7165b0f233fa606e622868690f696b262f33a2c1f2b23ab37f392e71bac7cfd04f9e240660ed5f6075cd3192d9ce1be46a649d5abfb7beb9a16ff91e7d";
+      sha512 = "1b0227782120185c60cfc18f60fa592340fe5ff875d130d0d786b055c475dea9210e98867b8ac2c9c63273f138763cd73c2fc5e5085000af06aacfdcc9d69179";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/my/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/my/firefox-55.0.2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "493e5d971b55696121edcd72712120caf638aa13d2654e8f4db4e814a7b8c4cc2c7b89622b385029ed1a9ca14294cc39d8522784000708f418205c36b1f2fa64";
+      sha512 = "a18326b32fd45e968dfdb4800209ad76265e8c72237fe3e0d799c7a66456d3020722a1ef702a349a0d19411c5645e7d286a2c523cdd826d474d40f02faffb129";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nb-NO/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/nb-NO/firefox-55.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "c7c3e85d2749bbdc75a359ff5285ef3cee14b710aaa6e0f39415cd72693f219589b64d26cbf15020c380b51ac0d4a6d41e730af9991cca1b4d5f1ddae4c63dee";
+      sha512 = "6652b0cc7aef35e81e0bf1a4aa3ee26516a874338d23a9d216e4c8003bf86f4f73b1872d39969f77e878e9894f66c23f930cc133b666a4b1cb5490668153d653";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nl/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/nl/firefox-55.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "1d77c158ebfdb65004f5c999e6da15ba2cef2dc998c69bbf5477bdb8b41131e968187017783c65103f2040db2154833857790ab9c6aa705b866b60683f0c4ac5";
+      sha512 = "d6bb770bf841f7882ea61a2e780247d94333a8df7e72e99ce3574d9216b149fbf2d1c87cd385436492680c5c0e4d1cf897ce0987c43a15bb2776c4a80799229f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nn-NO/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/nn-NO/firefox-55.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "37630d6abf1db435bbff8ea2821966ea58fcc3326199dcfc0e95833732c9ad767610781046ba4b031b516f5dc301e7a7d699699ad7b39efd2e9cf3df05bc3637";
+      sha512 = "117ae9c5939cd7f4eaf6b353b2e14b2680114be27066782b2348f56f8ab7b72bc37f48043e382adc40f6315167035afb33a40437b86560100563f1e5e752abef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/or/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/or/firefox-55.0.2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "bec28704aff4671d2ee5413a29335f84bb04b4d5dfbd108988e1772c68486e1f5bdb2b7b799792343b1191b768cee7cda59aad0efbc0dbc45def3149e7eb41a5";
+      sha512 = "c58300fe25da662c6227c89189a6e17666a8d0482d56fabf5a3bc1a3001a1d9b62e0c7ad55c8eac7b8294153ef12adcf1a61067a697011b7ea74e23060449ccb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pa-IN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pa-IN/firefox-55.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "eeb9a7a8400e14241296ea75c55fbc17461d298bf7d4a4b57e26cec434e398d070b9207d6d19a3038b65fec4792f9eff47b758f5e5b0ff373b349f67f44ee1c3";
+      sha512 = "b2c5f59305be66f6c3bb4bc2bd67e787e56461ae1be29efebf4880bee2378f567cb719f6cbce90502cb0df6645239d2abaf101bf4c171efb226c28821544bd16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pl/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pl/firefox-55.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "560a7fe08b460f99e6d166caa8fd442ea343a1eff9c5643b96ce9085fbd76cc27eb3b2ccda59172c5e7542bfecdc3cad39257506531c51350f655744bfe166f0";
+      sha512 = "c7e062eac501d08bda55d0e2f642dcae3a3fff8e228521719999386e6b910ac9a0f101e36845a0cda326970aa7c6ada16d56a44ea27d5ce7deac773328272710";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pt-BR/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pt-BR/firefox-55.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "452bdb25f38b31af0ed6cb1f2636ce238ab898065b8f61f505206e1dde12555a18d491b5895b549e1d5efef94144b99988a69e19f9ccc068c76474bc0898aca2";
+      sha512 = "854054e7a77ae695f0344fa19d2c16afd112dd965f511c4d3d0a22d3e52e790e8adc1f86fe951f1daba7c390c851607af87a1886b6ca2970f4b4d921d7ee3998";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pt-PT/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pt-PT/firefox-55.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "54c6b9bae229fbdbe366fac25e9a3b89f48d85f41f715f9db1f3f1b4fd210056f642549a982eff9ac4e2b68640ab01517ff9756cd63b72045f11c07619b59761";
+      sha512 = "e490aaac75a1d7022ed79ec888963730cbe995a31755c62d431eed9cd7573cf607d361d190452fb1bbbcdf0e246fc52c0132637a2b58b6934e3564e221692efe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/rm/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/rm/firefox-55.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "075a161ab0cbc6417dbfb4873c8ade404a2fc911f2da9e0149d90b04b32f6c9ccbf42b22f2abaf13ef4f9cb4d8330a90054517a651d0c0f1f940431ece8b2518";
+      sha512 = "010c815bc7ff3b779f1d393e593eab21cb4740cf1ffa2eef670b508fa0915ad65bec15cdd916f6c4a6c1823fc800aa6f70c0c004e6c6910645e5dc9c109705f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ro/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ro/firefox-55.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "5c1eea33100fe2bd020f9d1ac2bb781ec04b25a12d271d3dbc311319f7a688f245e2d7357055bd8321ead58923857f689e417827ac3125ec206975134e4203cd";
+      sha512 = "970a35a149c512d30efc1842748a26febe4c323c8682791396354c80d5b9e71a1e6a1d2c918a4552229dffdd26982665f8c339f483a179002edcce05d6ef3fe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ru/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ru/firefox-55.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "c9d99eaa7ad17a29cfd860c343581654da5daf15db5bf653a3d0b13b03d1914fafe7f6801810b3ee06abcf687c71cc1f9d20cd727b10cbe91e7bb6c977aa279b";
+      sha512 = "02ece7c9664416da2be2042676d60e6dbfcc27568d74bf23f64517255675e19fd52f031c6579a9ef08f7ebf3d94b92426f3f8dc74fdb3843634e958597bb30c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/si/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/si/firefox-55.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e36e3e4767f9afd211dd4333bee2ca4ad3d9ccc7081b1cd008098263570aad4272eab91032527c3f6f0a70e54953dc806cfc00a08627ebd81943195add184603";
+      sha512 = "0f2f273b7912f73e8b022e5101ca40603a272914deb49159529fd96ac627fc106f039454941b902e5d9fdbf6aede57f38f263c93ea561fa9bd933acc21c329c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sk/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sk/firefox-55.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "148b8ebbaba7d111234108758fb48ddc883c6d9094e8f22680d65cb9ef05fb34eeec4e09c141e7523ff511fbbc2db84b0eef31efa92730ab30a4830192875c51";
+      sha512 = "fa95f13fc3cc513fa22012598a6bbd82b23b8e0d19d19aff100dddc1b0f123098db8306582b8ff27bc2e6188b579a2fa22d7205aa04e718f622c723df0ae78dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sl/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sl/firefox-55.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "fd0f058fb2a7fd304d08fc4966c7235c557d869b0a02955a3459b354793a1c2245e45ecffe9d0b251357062cd81db10b5d3f982ab15abcdf275af31d91038f9b";
+      sha512 = "eddc485ee09e45685a99715ed62921453f3d647e4f2c10b152d6e3faf626c4e1e12cc5ca76403c10cc94ebdee7dd999faf35b3e4e6d544628fabc760c07e7fd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/son/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/son/firefox-55.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "4e6bc840e788b0a3a9cbeca86969d3a37afcf600b583777de84cd77d21010360afa39dc2ab4809b12cd798307cb84c6f10e7760395b2fd2aedabfc6419b02d18";
+      sha512 = "0a6b22284b2f65ce7cf8911b05a00df7675b042f7db31f8cbd9440929f4bd32a05b463a8c26399495847dd14881fa3fa1fd00309fa404b0cd12ffd24eb97131f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sq/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sq/firefox-55.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "e852af7925a2a5a0c59cc54137d1a574d5cadd831929ddbf375b726b1241dcf901b18f97f030a5ca08283453ee86ddfa113488adeac6fb974524911e354cb763";
+      sha512 = "fce71fb0cefa5d975d0eb22a0a32cf99e3a6448b206170b260b68f6bc08957ee5fe7fc83fe3bd29a3ccefebb5faf731e9fbef2b642a99adb48deb9c0fa934374";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sr/firefox-55.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "99b3f089f8c17701ddedb41add217ff5395b3f942e7f455c19f63e49a499282a2432d9f198eb4ca219cf25656ac90c803c4cb7be01975be307b7835b2ad0561b";
+      sha512 = "21667d882d2065d7106077fe280dd07afbbfffef1cd5625f830fc76ba8798ff45c4af9bab382af3eb390f63cb94de108aa113caeb3cb07bbea3ccd6c51333aa8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sv-SE/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sv-SE/firefox-55.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "f5f91a85e7ed10c2734779586e69856903051074ac76dd186d1816253e4d7441d60cad5172c1dc2496e0cb660dbc40fef4bc586e8e7bd19f7145f3b53f2c2736";
+      sha512 = "691cb5961830be2a7813a3e5c67af793e1f716f916fdebadd4031f288d8439403b3f49abedb4410a30317fa4fc51446638e7f18d4b33bbe0f94a93ee9c4dcb21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ta/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ta/firefox-55.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "291bd760b10656f5cf7df91e5c978e3caf8748180aa98507e378ee90033df8b971a020b253d5ea691067eb7d08a3ac3f998b64860b49bdf7b2b8eeb29d18b737";
+      sha512 = "bed2f31f934f5feca3189e6064490c7e90401fc0373b8a46f9e3f19fc5245830fbec1bf84de63a5cda2c71577fc8e0cd834e60c722b2e6a4634f9cec3bb3912a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/te/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/te/firefox-55.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "4b24c2f7a8e9b660285a9a8e14789bf18fe42bdd484dabf68a99b502a52eacce81df5d5375321cdc5c1b69988e35f0e9e3d2d2cfacaee72033a2c68af0b25a6d";
+      sha512 = "6a43c634e534daf172ad8847e442c577172eae5478896bb01e34ef941156664ec55c633195e1fe82677fc0cf481ddaf847229f7029d279bb0a0bab256fb3b239";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/th/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/th/firefox-55.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "a479f709c4c512dd3906e9694ffc454ae315855b4a37740619b8536d1dd98764ad191944617351243eba474ec44c95d3153efb69d4dc13aa8047bbc477feabec";
+      sha512 = "9c91a5c6d2304b92111c392fd3d7b017b38c1c686df5f55073237a6655c4780d6c90100ddd13d6a7569f1b82797be8452aa6df0a4a22ceb3320d69bc902641c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/tr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/tr/firefox-55.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1e12a004cd63cd547cd925736a2cec78ffb98d5f395474c9e8fc96752cf621a2311d638d96444afb593f113c6ec46a892fe96fba882ed7b7c49aa05d4685e70c";
+      sha512 = "d38f8e7097164075bc5e6866968403acd5dd91d67782eee968065ee5f2eb0a6204d207b8249d97efcf955f52d510410b6b868712a3796796c0eeefebb0f6e5d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/uk/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/uk/firefox-55.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "0634489527974d7c7afbe2c55d054f9dd50ebfeb2777944dcb8d4a14ba5171230540c17172c5b0d5df64d99fd23d7b9ce384657e1e1b25b73118b9b66b748613";
+      sha512 = "bf10105b97b89bb8ddd4769ec0428d938843b9d2ceab2d63851fa0a6698c6d10241b65a3f2068503a4a41bf9d50811a7aaf01105918b8afa92879be96f043dfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ur/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ur/firefox-55.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "8a519683ea1d611f6932e651dd0e400596529ae428700ddf8929924910614598f8d8c660e317357520d31bf1347d1f90c1e89b91eb74b339eedb981da032af4c";
+      sha512 = "b241c882c867a5ee808e9ac37cd14dffd17d8eabd241e4e01ef4573f7d4641007d58fbaa8875284ac640d1ec8f013b7a7278f19768b07d388b5f30c4d943955d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/uz/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/uz/firefox-55.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "964afe349e8b7f908f520d039fd1da6c8ee245b68dc8957a04222ff281a077f86e7b8185850ef7a4b741a697832bc36bbfda39051409a9c3adb74f2def64b621";
+      sha512 = "357ef3d85e8174e765682b9bd99b5865994119c73d41eafe3c6ce17e3430a1eabe358a1ae8c4af6d2d9562673a6ee65e469ca423ef7e0b135b8f79df4643112f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/vi/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/vi/firefox-55.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "ae9dc4d2be8d82cd82dbcfe638d021713e8559fae2d14847aec687fa90d90afbbb206bfbabaa15ed00ba8c4ac058f4c950bfd320c307b968246968fdd30748de";
+      sha512 = "606c28e1777af2364c4a85557f6b173baa2f07ae198da154655d949b4999289e1a9de3ccf8086c771167abf70d74c576a4440a73cd1a34c3d1bb5e13f91da307";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/xh/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/xh/firefox-55.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "f9f0c35d0446da3bcc57b0b2dd9cd622de5a3fbb0a6daa987d2de6fcb2804be9020ca190c8b318375fb255d7ff86b265a65e7d0fd819f9004fbeab1546cb62c0";
+      sha512 = "2dd2317e3cf7a487730cba41d24db990844fac4b5f5c2b93e70fa5cf635478e26a60aa2ec60a98f670419c72564dde487050c1bf1d662cf7bc8440654cab2ca7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/zh-CN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/zh-CN/firefox-55.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "f67ba436854973c9a809b78c3a2511aed27b6c4532304464220841a2159f851e84bdf0fe394527aeea48238802fc5c7336b2399078a8891d4c76554e8067038e";
+      sha512 = "714ef62fb08db12559e20d1bb6c7e253c4a12b275ad1db8279982ef5df9854e647241d9cfa15085620f12e894cc84a8d60da9b150cac222ca4b454e048e6ee68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/zh-TW/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/zh-TW/firefox-55.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "ef0e3fc59630c9ab9072142651420151b897b048af3eac878c8222bdba76d47e2e45160227a2a58862a55ccce954451b892b4f5b5c6062d769dbd940edfefdfe";
+      sha512 = "ca5852892d7ab49bb1473425bc5b1e158b045f647ed33fda1b22d0e25267f45a87cd4ea296c58a4f1b502e6e0ca8c82ecca25720e61596e49508a550ba43f9bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ach/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ach/firefox-55.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "cfd977fb5aea5c5b707df817993d547aae8b8c04293c3f57dfb630fcb2a0e85b5deb79253da544b7c3a92ec5319989fa148ad3b1ce950d6bafc7d4fe8f1bd2d0";
+      sha512 = "3819fa366f4f5ca40276a30cc5a7e90325d40ddd281160948c06e9db8eba05b51b5e0f230a3c5113eb21e9638374d383b318df3905877d14b654874c83db0934";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/af/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/af/firefox-55.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "b6c671a746691cea4d4cf6d5b9932b0f1c025f04e11e7ecd38a53c0c2759d3a3ca82e6d00febd1f644fc18730b2f6538734adc02c9e18094f7533f81a955088d";
+      sha512 = "eb7b48ee9ce0b7c08f96f5d09b51e1819d38fccf7c71cfcfae72e3189ebc928ec4692a7a10964d6dbb42fc2ff04da13d5f058084e6376b67b0a1f4818922ab45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/an/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/an/firefox-55.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "51f824b2208b18939ac12a6d63507186d20e8e66e0fd9ff030c1bc637a14d987ba85ad5b2425883d90f88952fde84f43e291e68da004e8114d854965421ba9b2";
+      sha512 = "956bf6e053fb566f4a6506f672e7102c37548af41807797078b2cd7560fa4dc17cefde0b21939a5fad75005a98adcc58893ef01d170c312065c2fb1904102bb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ar/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ar/firefox-55.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "411b0f01d5f6a4f8915f51960b0d7d62a1b9cd9c3de665674a019d356677e9ea82720df4b715523ddc87458dc3edabd8945b7d1e41574a22dc4df5c0b62ed869";
+      sha512 = "a05cfaf18d92d8b0a43587cb685e192c69cae3603c94bb60f9b7d5c3380d498dd050559fc1d041860893fa52651fd30f7a734cb98699348587f3211625e880df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/as/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/as/firefox-55.0.2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "18d6094a2780759e97b4556fad1d504ee1c1cb41a5ceb8481599f2a41458b5c0100b1fd2a0911f1e125b4089b093f1a306bf838e1c00bbd1bd5c482e0f894881";
+      sha512 = "b855da6d338d80a58aa9dc6f4a39ee9a5d21c92b25f5a4b349f83070fca7e27cda8c7d070b2c543723f6cd061949e6c91f79979edc45c0dba9dab3dbc81fe4bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ast/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ast/firefox-55.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "ec88a6ae8ef64aa01b2c03feed80ece24ddbe19f2c1abe38f5e2b21554b782ee52331175ccada48f47d60c56d4c9a36b28b6d62b332dfe64f033ff9a90581449";
+      sha512 = "57f498045089ee3e96b5f3f80caf3919d39c3a40ebf68b1b578e1bfb14555635fc216956387ee417cc1bd05cfee7bba3260890d161fc1ea8471bd73399a0ad41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/az/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/az/firefox-55.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "e58a646b68a068de0c5b96f088770383345fe46661d667e6d9cc1b7fb0384351dbb10caca6eec618303ab8dfaa82708a71d9376e16017173710f41e0b7d55357";
+      sha512 = "38399cf0c73942f96df9a4a599092fcac64956353d14e6395a1c0507fd0c7cadd566f571c12bfe06275446a5412e69c29bae95dd86aec42b97acf960026b16f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/be/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/be/firefox-55.0.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "e4d8d905eab7b69c78864cbf268ff8e8246f5792e3e55d28e8a44c12027ae8269738a0ddd0fddd4282dd7536e1266e58461553334f1287f7416c9fd5dd29e2d0";
+      sha512 = "047c06fb4ec91013521b237592af85715140ae17a10f095f5b8d54516f6b62a4dd90c262294702258161bf781a6babdf7ead4b2c5f7211cb5e87a332c552ed0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bg/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bg/firefox-55.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "62ae8fab0c91d585234f7eda98a4a7075956b00bbcee5ba06d1dacc2262b32eae37ef3cd1b66da34b02bc309b1b704a2b97c297e3c189de6eb2c969dc1100626";
+      sha512 = "9a823d322edb570bc53c07eb63414b65baf82df2f37c7d2a6d52221b6b23d0804c890af9c3ecf66032035505ec246e096864754930426aef4be008f5969fee67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bn-BD/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bn-BD/firefox-55.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "0cce61b9d0f88911abe306140de86964808d8e94880287e1d3ca6dec6b3c36b79143d03d46bc366809e69b70492ae648aa80bc57897d38c92bd76ab56b36a24e";
+      sha512 = "a5f8b004170993b4317044df0c65711597b5eb8f046cc1115cd047835b90045bd16740c47901b8e261a037be9592493c11cd527f80465d46d19c06b692139103";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bn-IN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bn-IN/firefox-55.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "53f25ae4f49e125b7757740a5f5ec9d08687871d4ab56ae3f4f4506bee2d1453c24c99022a4be0e07f6376bce3b0c0063b7155ec7decff8e2ad61ca456def7e7";
+      sha512 = "2f161b15a10577a48386cf3277c027d2c0103c881ec33b57e87824b4e40f000348356ca0a6caaf20d50263c5d203ce02a6a734059ae477b72dd8b55e17bcbbbc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/br/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/br/firefox-55.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "98d83c45d5599bbc62db2204f177b2ff4b710a75ccbbe6d67c8d16829504b8f4a2dbfd2940e583514e41147811c4b3cc4f74637b3212e018eacad85f6f56e892";
+      sha512 = "1a99b157661a90607af89117321f1fbda167bc6804ac95434c6a17859c8c66d86bc957cc95d46e47c69f42b5f513dd39a876881ca69221adba9f7790da7e965f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bs/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bs/firefox-55.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "7691546b4cb9cc4de8f0544e42528704f5c204b382b195da7ef2764faf5e2b6cc58285da890e800ed83e82be01924db0e219d1523959c04faa24a11e3e16b04b";
+      sha512 = "f850f28cfb54798e0305dfc2525ae59f1568ae93133fef2fcaa5e30063d980263e47324a3bb038ba3a9512aa621d2232475d5c0098d4d5914d661d5f36e9b51a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ca/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ca/firefox-55.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "21d664d5a589ef1f0f41a936d8e46a3b220d7b1c6e996f639556986e36097144b82dce5dcec1807b3191e5dc3835df6007e845c847bafcffb0e456777cfcbb67";
+      sha512 = "5b67953d4fd2ef7235fab59b83a17814d9edf106183983dde21746ae1330c9a9169cffaba21b7cb9623d93a82b67c9c249800892601db58b4e42efb8323cb7e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cak/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/cak/firefox-55.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "a2a289569ed8ce5fd9916d11bab43a0f4166c2878095f2a30fc8ed587eabad7ddcd5fa7a43070eb54daf8549e5f19a3c12d103d1cee493eac2e1adc3b536a952";
+      sha512 = "05ac251aae543a91755b927db98ae44aa07b06ba824d784e72c91c8aed741eb54d0e4b27167dc11a96bbdb765c6daffefe6ad16982812664070d07b5b6a8dfc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cs/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/cs/firefox-55.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "a24dcacc4f5de63f335e44087f40c203de5ffd482232e691f1f1cd576bd4d41ab949c3d07ad8c1aeeba38863b1a9ce69380079a3cfa0ae7ea3dffebe7d964972";
+      sha512 = "c0789840e6a3bcc626ce99bc94db727c09d9b6e3b750dbe3c7e2310d00f3d3ef06d2dd3c755daf7e7081f7fa6d059a4e5b0982b513ce5cd4f4dcb2a63630743d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cy/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/cy/firefox-55.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "7e961c9366d3c0fb2668d6f8d9d874bd7d52e28ed53a461afc234375a5d06239fdb866c12d53f41027672afb889e257075bb59ad869c56a54b409bcb3a4e0ab0";
+      sha512 = "8b8c1d7f561649f37b589cb11f4117a762e704a7374ff4f6aac1594d95482f13c7dc00924ffef76b41ad9c00780592c16f38fdecb60975de6d45f6d1b5e6a97f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/da/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/da/firefox-55.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "a058ea5cde4277a26d6f3592b281212087511e8efd79dbd05a59696c81e762949709e12f94f794b252abbfb810a410f95c103b52cfcba34d2397a0b0ca51ad96";
+      sha512 = "42312ed0a97b2bc03a37cbbefb8027d373c0e1894a3b37e78a6bb8ee5f72a846d4e14835507ad771fbf4be60ef34768d5e866a4f691a0af827d3667f7b1c01e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/de/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/de/firefox-55.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "22788aa3f8bf59a1366ef4bcf3250f2d6155d7ee3de8b2b019dda6a294e6fef58ce1ec6bd0d54b41e8618491de872249f4fe1618779edc418a43d2a5189f4b99";
+      sha512 = "9a228c3e177b11539666b9c5f0a4ec19ff86da023f5a302c81266d85ade1c8e39be861e43e143bc0247f09af85863aed224011bfdb4c64bc2dac267fa1e548f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/dsb/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/dsb/firefox-55.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "bbafd69ddb7f73c4b3fa272fdf91352a9db8b9ab57d56d2d5e743738026e6e5f811c0bda9a69b1db4d533ca8c6de1b5bece1f0f4784092b3b3e8672bb30c3876";
+      sha512 = "d8c791da0654bd46fb52c866ca89399a65186d63e0262536ede7263ca3fb7af852281e50faff750e2d3020f16d4f85caef8e5d33629ff0019e249bfdd87bf439";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/el/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/el/firefox-55.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "650b3add1753bbad904bb2c1577ee28598f0a0588e38a219b29ca1cb333e9e561c17e560e4e00ba6c861d89ddb70bd7352289b5711c0e24f6f78d37e53e02683";
+      sha512 = "9e466913d7d84dae64d0e537093cfcd46128f3ef9fef10f8ba675195e83e2fd0a32a4602231206cde599ee8be7e246e64e0858dba36c6e283649c59ac990db5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-GB/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/en-GB/firefox-55.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "e82dc2a34212a8346bee261ecfb07e82aca6b09582a652f1f9ff90df6f5a5fb9f44c284eb27db4aeba743239262a87faa0e4f6ee3fec66fa97788e66c4e83bfb";
+      sha512 = "5f4199493fc4c55c1b247cb729c65b83ed668c65704284dbe2206178e4264df852a73925a1adf1d079f77560c9538427544826af8ec311bfb604bc7a5c691073";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-US/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/en-US/firefox-55.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "763f0b2294085215282852ce482f2be625efe355138ae709c84ed65ef4ba28908115fe3027eece41e3b5fd1fc164c050d150fefb4fb142eb6652229c021bfe7c";
+      sha512 = "51cbedf391e4b2b33c4bf4882a6183084291136064d2125e14da6cd86cbed8f979e20adbe386848d1a22c2a4c567b99cb68bff51668e53b6dcb85e92c73e47f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-ZA/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/en-ZA/firefox-55.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "9ca62fc6eac9050a7141ad4025e6fd6e3a703e18c3a184ecd1620fa8cf098867ce4886774673e0c10833ca1312b555f02d436b5d8088b78963b682a5de1537bc";
+      sha512 = "33b6fcefc6d4867a670531e3de4d4a926c934a297b890fc60b3c4e6acb6237d2c2fc1d0655b8da42406ee4ed62fa98bac0a94fa7cdd3f70a918232e95df3a317";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/eo/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/eo/firefox-55.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "3dd8d02a132d96913e017aa4194ab496c21a7b708c5ee1e02bec3c7bcc769a7f53c8908bd56a71918e55b49201f645f68ece3e0eb522fe0719a152bd6067245b";
+      sha512 = "64d93eff3cb4f19185975b830e4f956d2d76e8bb600176a322a57f873e7bf8856582149b9c86d7af7652e2e0ee2a355f821607810713bd95e5738ef1b436a7d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-AR/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-AR/firefox-55.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "aa8ab141a092b481cfb9fa72f2226913ab7672260b2fd0dbee894215ce373d7cbc1ed7451cd1c1010ff079d14cf9f2e992cc32e981b44360b82d867fb4709d85";
+      sha512 = "6ac236b635ecdafd0864711c56bb3a4d339cb9540d5cfb4836c437f8df9c9fe9d6b65c4c8b1bcd68e2e04ae86f3e70edb5e704042c2ba00611b7f60fe0b3d071";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-CL/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-CL/firefox-55.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "73d2ae9ad8442a49700341127e7ba31ecba568e558d27b607c5a6bf8e89a9e515c3bf6b9946f094ba4640cf5bea970e5f8473a5ce953a09c1fdcabd2a68d7a7c";
+      sha512 = "0ba857c7d7f1ed986110ec356cb4db75f7ac6291ba0684add7cc56f4505fb946ddac3c603f3bda2a9fe91b2a3031a7cf4dac59bd781dc148c09dfce4d4837e3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-ES/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-ES/firefox-55.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "213f71697b99bb7dcc978bca57fe119940f8197b75b5aed3964db89859fdbaaa0968829269c5a8d6f01bf21f670f85bcbdc9f7d4f6b111971636e44580b67003";
+      sha512 = "0440a2e9eea08a43431c377bb4e8f4e747dcc8b608b68a2289ada27bd4b3950feb4ed2946845d725be15fb6fb910f984e791229631100d3cdfb39f9ab398780f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-MX/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-MX/firefox-55.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "d12e8f13fd94c3c6f93f5e20ef5cfeb5c3f82a479baa5bca5a5517dd55bd048db59454a56730e69f6bf051a81b5d2bad239ce0fe8975aa00c863667b464503cc";
+      sha512 = "7c9ef5df8bf96ac277e7488c2ac0743afb72165ffdc5723b4bc4c64e1c4f7d338f453fb50a7d938bec39cf04217b903a56b86ffe3856f8437ddb17f53a48f32d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/et/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/et/firefox-55.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "8f6a6393f009b19743debdaf1bf3cbe12e566a4288f8fdacbb0119961542fcbf082aff03ebe79f54311ba00017851ca4ec4efab9553ea2e1178b6dba9677e31e";
+      sha512 = "297fa442fbdc2042b3b7756de00f2573da9c5544a4d83a6409808ee929d441bbb7fafefa023f4d858f0fe55f08e6cf6397ad2732ee197d01d4a03ac504e62087";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/eu/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/eu/firefox-55.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "7b1f3af68205e3688bfc0e519f9cc6f796477d2f8b11f0c7e035fab1ce917e713b6b18dd498c5d04da3c51a50dda01132268a24180ebcdc15f452bb25d0dab0e";
+      sha512 = "fc79272cb8d9c22607fdf0075681abfa34ccc78bcba8801e1181dc46ac9ce420dc3b789a4964fac37bd89fc9e8b03af8b09bf5353f7b3784014c8327deca28f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fa/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fa/firefox-55.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "1379243d07c5216b31ae2689b11d8729d0905ace42e4bc8ba40289bd39509020ae551e2fd0f5a16b883486ae0bc20c33ee2902650304cf628a239ce3071ed683";
+      sha512 = "ec6429c1d78e9b5e1e174c7e13d8d99a8358289f67c76d2ba3c3bf096d9fef7558969df37693b86d7ff077206d35934187906f82edefa0634a3b2b111f42cc1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ff/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ff/firefox-55.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "3bf4eec5d5a3c4da765db6997a57dca3f67d52ef302cd38db759592b9904e7b357870d39920bd75b805700ec4b9f4a94400111a321518c5d4f31690ece946289";
+      sha512 = "fc7287c16143ce71075b2f0bd5724cc6568e4c7ccd08ef81d1f46f945b6af18615c0b465bdbd358919af03ee956437cdb912e41c94741ad916d5e0ed993fb37c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fi/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fi/firefox-55.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1a33cd82fbda2554fa76684afbf3a843babd5872459026f1f32fe496e99ed631252ec63933a291214535476f8858d03aea26b7cf2108a029ab5f99ea8c229650";
+      sha512 = "2a73b783ac0c9728385d7a47e94a430bb04c3d8d50f7d35fc8256551788f2b23156e0d8cd73595c2d11af26060a4f5caf9c711a2542d9d68197e5773fcd03cae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fr/firefox-55.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "c92bf5cfce5b5114342d98d526e287ded4d82516f008e705ded1ddbf11c1cccd8ba3d3ba777f6be0727f7aca776ac7312fc7e5ce3c2f77ae69420541471d0289";
+      sha512 = "c8c0fd587e0947793c734e8b8a71f50f8d9321e8ea5214290bfe721a95e7ddb5904a7254a39d1ce395cd674c47ee34e613e09174528fb5c5a94323018d03faed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fy-NL/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fy-NL/firefox-55.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "16973677379fa16283956fd31a73da2697c4f38b41618e14bcaef4fd3e68430c15ca5327f6752d8123c137b3e026ff682d534e7819f87d8cc3ebe7a7ca865b87";
+      sha512 = "965e29af8153a239da08de82ce52acf78a76a02634daafdb8919c2c8c82c553ad989c7d893c6e9c0f9c10b9540762997c2ecb4d41f0411593588edef34eeae22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ga-IE/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ga-IE/firefox-55.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a26c96dccb61b5e7685a9914f68e40e3ca468438438bbb07f9b524a9a2f3b26959b7a359b332eeb7da47f7a8ffee5f8811115e857406e99abd7f170b64fa26b9";
+      sha512 = "7abe283e1898c11bfe5df5a5ef629a0d08887e12606648c39a21eac4c96235c2ea5e2493ac1515d4ed8aaba638cd14f85c929fd08d8f79d933428823e7096266";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gd/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gd/firefox-55.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "d2e4578150f8ad0166c48f6fcad2f735ddc982af2cca30aa694e44e593f4033c259e7f7aee1fd1941fded86d2937464bf11e8a906fb732ca2084632ffc7d642a";
+      sha512 = "f980334b4576c3ffabcc41431a90379ac8d13e1bc493d39928f30faaf343bfeff9cdf897551b21548b4556df43eb27103f2836b9797331304be2dea536b63a57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gl/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gl/firefox-55.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "999546c43bb56cf95509a8e9b122e649e4ca608fc4e0a3b8e82e9f58c334460420c58650a8837e4247b63eee6f840def3bb80e6c517badd50449e0dfc471d661";
+      sha512 = "5fb1d134a6ad89556880d3df3208c796a14773e1c7a62f4191726d6eb24c13c2e76c9a4aba3927032da4865786b936667dd6f96b8ca49224494ceb0f08ee759e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gn/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gn/firefox-55.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "caeec1355d3bd3331241fec97b0c6008b8f3c42c1d56b1796a7be4c2ae994569a5d2011fd5b723ca3e560bf07fb1de50523ad2736345aee753f37d6cf5ae7f09";
+      sha512 = "508a04bef58c1042cf04f47134e615cafe26497ebe1ec0401f9d12c3fb21f87386a01859ba26226c9d0267c40cf6e5843349035c1a3e2f49c7c9f9d1439abd25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gu-IN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gu-IN/firefox-55.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "1e3feebb32c4240d5c15b0c915b92eff9f63b266ed74b32e1df9fe824b27a3c4d2d06492c9b9d47ba22460e0c2cc854322250edcc1a54e4b6346ac9ee0048b51";
+      sha512 = "5d44ee3027a37c8251a8c612a08d8f6916f809cc0d86f8906295a82efc6d98f475bb80c0f961bf95871e7b2dfed8faf151ecf43136a022a2f7796070625ac71d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/he/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/he/firefox-55.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "5d83b761b3f8653e1701e75a66c3741a9dc7e377fdb2d7b66a23bcf314f3993e45293d8682e65fb58f2d6a720ecffb0b2568aedcc89804da1efad0590629c3a3";
+      sha512 = "62d08c2ee0b7015808883e66e5c54ed09a5ecf3a0b730efd5a89bc8d4cd35aea9ad6dd9fbfe394f12c2846923f47fb66e393c41cf4c273590a890ef1701fb7a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hi-IN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hi-IN/firefox-55.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "9c59cba32c02786bed46c01797e7bbf3d745f90da98cd07ce6ccb578c402bdc8cf3d8887a57b5523a072ddc6d98dcd9761862f32c59570160c732b8408f182c2";
+      sha512 = "b6b21ed97830233ce22658e4bd7637a6449f53e095cc92b7381afa30f4d74c8df5b1082bcf1704aa75b53c0dcd75ad509774e818ee4073bfe6986ae4e93538a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hr/firefox-55.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "20684ed388fffc81fd7b8d88f4d57f4bb130ea4671a60d4dd70d1bd5250b491a36cb0eff0b7820a26f24695d30afd5c909709b6e8ab27f9e24ae1381a8b4dbc8";
+      sha512 = "124965251c04b4db521b79102be73b88d747d0ab47898b2929ab867b24cce50768f62b61afcd3e03d338c958065c429524ef61ccaa0ae80fa1ad7c3def20e1d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hsb/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hsb/firefox-55.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "996ee7693cdb808ede4df1c6d8533a964f0bd98a4026067bfcdad8d1c78b232cdd83f1fa7fceb532deb9197ccde437d42d13449c8ad0fe9cde3dec1f3006a775";
+      sha512 = "aa08c3616051ff566576776977af5a5827c5dcb68472ca48af5adcf0a107325395f9fae8a51f824e126b74fc9f6816401acedc0bc61783a8416e6ea3431fdf85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hu/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hu/firefox-55.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "faaf14a3f2aaefdada31761bca2056d2592bdb6ec5a053d7c8efe871b0b2ff191b152fc240782b24f3954b4913501efd303bdb301b4a69140e6c47a3fa6856a3";
+      sha512 = "5b7e3c318657e20bc012f1324928c43b950cb1fc860ecad40fe6a64e4cf8ce30e4a32bf617b02e397dda7a1f8bfc40c8709ba09144ae1bf5676104fad1763798";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hy-AM/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hy-AM/firefox-55.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "9190ade1a9885ebbfd0090ee926e0d5e31da61a7c98f874916c423a60328c5f936f29fb60949c1ebf9d726f07f097312c64a67dc193d71537d4adf4a9b7729c4";
+      sha512 = "31e5389d610ccc05d387ae23676bead9176d87ada142fc545e571ddf296a4bfe396725982f011a2c0b35dec8f8d06e97aad8b42235cb98aa9db5f0352356b3fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/id/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/id/firefox-55.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "88fe78ccc643a704e068a32d2fc60624a23c269b85bf0c96c8538fb5243c1db93578f1a91993537bd7dc672acb9dc6f4cc75ed444774ff74c7abaf621226b43e";
+      sha512 = "b037671a6d63e0a55564987dfcd1b3bee1347c180e29a6e6df80db0d6cda284e08a6eb5b31a37a1eff208030aea3cd3d4ef0ed711ec1c936c746efa870e5bd46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/is/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/is/firefox-55.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "969e28b5d8696fe735063161b4848fb3a8cc400ca2f2e3db246dbe68d301c7da3adad7bfda61eed10c85ac028582b2568f57d0c727abd184be2850d44bea427e";
+      sha512 = "6a681a05885574a163d7603edf61a0d075728c7eb50d8e78690c0828d5189ee757cc225913f060b27a254f2a19d03eb63525fd5f305377e45ee4ce5c729ba397";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/it/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/it/firefox-55.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "59b389ae6710bfe3d8c62b9b482bf44af419446db0ff5278b1c18bb45eaf122f5b3b47d32b19eb3686cd965bf1e51643221bb01fd6be6990f8ef14159ae6477a";
+      sha512 = "5e37dde84cd5b7a162438d2d418fa80f8529cc3ff3b28bd37b0826d8f5981ffec6fcfbe7b41cbba92d7c921bdb1249e6b0f5188ef983187e7b60bde08e80bb24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ja/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ja/firefox-55.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f79c322f4d2d23efc682ca4e02d114583008f2797e5672022d412b27356a1bd34f4c216545ef8c8f00fef17be0fb405384d98f4e44679372b9cf7953e2e8af78";
+      sha512 = "f59fe7957981b362d01f33483bb43ade19894c0f80fc2a1b889e3348b27876f54b7de20e9a67915bf8a4e0c4d89cefc87911841637c63f987b0aea183bba4ed4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ka/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ka/firefox-55.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "a5f440758bc4607955911d0fb2320036b4d9a06dea07c7cbfe9fd67b767a544cc0df582af329e4c99f3eeb065627e90a989368d26a14530fc94a28d6fe65c7c1";
+      sha512 = "381f250da469df0245bf6a41165955b0dbac3a14268b9a9bd59836d3094695ac6ae434eaafd41138b24fec3507a6d020ec2bcde740865ec3605a554a1c7ca0e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kab/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/kab/firefox-55.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1f9d2fd390226d06f0165d9a5f53c5b9d67a424969b7881b91374867179ed09efd05cf404de086734165312cfe09131692874632359c9a9fd323a6a9b7dec101";
+      sha512 = "5f33d95c60567e02fd4f721a5a0084a255a16bb130737c7dc8e4ee3334f2eab33d4a415ef306bedf55f7f0aaca7e615bd5cc175a08edcbfd770c035ce928bca1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kk/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/kk/firefox-55.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "faa9e21a95a41d8c846a5cec6f7cd0d2cdb0a382593e91e824e1d8013af146378c965b28cd44953702167e2e355436a2f5042ae727cf6c95ca75d0eb57f92119";
+      sha512 = "ba2006d6b797fb63bdeb285d7eb5f91374f2b8df7593f712a6b5fd185bfbf8af082f7e2db1f7a79a15cc34a95458ed114b78daf89b362dffc7238a253421ddd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/km/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/km/firefox-55.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "514bccf7cf2c433d846c7307c75b512f20c6ca4deef5f8f59f744656a81e514a9e62fd4336e223fdb59698b6dc00db0aeec51da4518f0d3467b5a3f06598ef42";
+      sha512 = "ff67a4724bd50795aa8161b74382f9b53caab3b98f6950b4d3285c0f8ea636c4b6626a4d3e8ed03c633f756ed9738b4ce69e6cffdd034aece4515ab7bb9ece07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kn/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/kn/firefox-55.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "814b1fcdd19fa4044ab760818ffc6e246ea2cea36b89785069af857763b23623f4e9cc50a6aa19a77a00a61b501c26182d7296706b7d01bc9a25006c03580058";
+      sha512 = "42eae0cb137fecfadc72dcbb0e7ff62e7b6701d1ebbf4190e1d20a1211d200b54989f15889f260566002a83d672b105453cdf23c2094af0f55cf4300381e9c81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ko/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ko/firefox-55.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "462747db276da856fffb562036367b947822f18513c2eb7cf70d6d3ac31438b59896ebf9c12e9e61abd5adb0b761774ad90cb41eb59789beb994c8dba11fe8bb";
+      sha512 = "8fcb7965e550c9fd510bf782f54a60bdc38f3707874c6f24d1a24de7ddd5eec2736490c6cdc2ed1206e99a75b3d7267a216bd6003652375841789c0d0e0ed71d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lij/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/lij/firefox-55.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "04802af2002399a7540f7ea5e5dbb23cb02d30f567a0afb64fdbc45645251d8bdd6e9563f4b5f5c324c267828115c719b161b074b80f7b9ba8ad4a1a0b24f371";
+      sha512 = "0dc0d54b31816be522fda4572347f6c4f1c244b0a919650500cc66beb39da1e46637db089cb595228213cd4e99262bfe4689f6315f25f6e359ad299bd9d202db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lt/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/lt/firefox-55.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "968e19afc7f0613fc184632529b379334d2409d5d0da5b24117748cbdfac714e8465267b65d2674f8721b47e969279c054add60f2a060331617ac2a02e97d032";
+      sha512 = "9b498e3adc4d069e219af0034a69fddff2d70e7a28dee522448a2c4586e26b6b905ba8f501f5c9b83b9ff8a2888d7025171aefa002a815fb6d352889cad95016";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lv/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/lv/firefox-55.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b6ec789c77040508706702d1fff20f0a277c8a5a1f28a375eedef91e0d7cf29a58b3f2027ce1ad2bf8a25ea5043751ee52b8468c4cfc516e1859570a1dad02d9";
+      sha512 = "2246366ee92a315330a4e8d1e77e21cbf875d599c169bffdcf32eace63b5794ca106d5801523bcf547dbb26ed24aab3ad108e461a8cfce0254b6389f6b1df077";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mai/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/mai/firefox-55.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "1ca567163688b14cfd4deb5cd2f0739807807060dde26508d87c8590cb8ebc9010edd7dc92869de6af2928eab32d42fad5da94a74ebb3bf96cdb7883cf2f9225";
+      sha512 = "ca5bc8eee4fe7643c98a3c93381a7156373b1ec94c86d8601d1529daf8cb225ee12d813fa2d310384d99cfd130dc3480ff243017a15739533d7cf7552052f12c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mk/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/mk/firefox-55.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "87ad815c0aa9e45507ef044248fb961b7bb98b4d4b10426aa448f41d129a162bc1d3f6106016c7cd92cf03b63c1682224aedfea9093030561b13dca79c6d11f4";
+      sha512 = "ca81a90c97feedc7bda3ce61f5dccc0e3c2563d284a8e10c4ddd16a3d93042e3fa38f10dfbb0218df9fa83051b778ffa629d5f57735de85e44b74b820d180018";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ml/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ml/firefox-55.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "85fe206ba0b20d8eb6c3846685c851ec579d8f188a5d6626ec56c9840bf8a76a0616457ee687cb4d395ac0e71978f9403832207a4675c560546c7ea813014aca";
+      sha512 = "7668eff72251028c9392774cb84742ed5027d4e0b617b4864b0e3d079061c95ab81c0a2471466a1b69a8e0e5d331b6b75c6a63be2411ff90bab48b3acab28ca6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/mr/firefox-55.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "c41938fdc8a19a49a6100ebf2d452750069e3038d8dbaeab4397f2289622963fa6d74a3c96419eb6cfe7e14bafcbf4b3b4a1f85638f1a402c2cb69daf720b740";
+      sha512 = "27f6410bd1da1e7360cd86c493aaf7ec406a30957fa41b35c5ac8b7a5c32eae2da0b5197a018379215bfed60032c8291446d9e3a10f5b371675154cb54b8d0bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ms/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ms/firefox-55.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "f37a606f1713e2f680b32ebcd5bb90f68cf324f26512bfeb628a4d9e71d138004bf08082fad8fa961b2ff28ae3d34c453d890c37b9f775fe27944bb7a5c013f5";
+      sha512 = "cb1718ed34f2e1a48a2ac2f69a00d477cd3aacab7a6b0d149f240ddaacf04993c44403f68c9d5cbac95e03db893c8b713208466784f867d4b00b0122b9de5c39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/my/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/my/firefox-55.0.2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "fa730b3568f06a8350372ac88d3ed7738cd254406a65c36570efbb502a61a60a1a4ab14bf587b4ffe365d3133eb76c841540248402dc87db0d3607235f2878c3";
+      sha512 = "9fa2f51c3666a7536dcfb8fa769645117c98eff0af9969bd0e54853c42345ad407b102db952ae2a9cbf286c221b0a821f56f3f67caf114fb62990b0564aacba8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nb-NO/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/nb-NO/firefox-55.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "5e1fb7632da3755454deca4169802694051c769b0da75978b1762694e0516b202198b74b306d2670c9d05f7237faead7ba15cb55272cc8b3c7cdf14c0a44ce8f";
+      sha512 = "230afe8420be9daeb270fbc836de70ae2eb197c2b1b9f8d7606d16c73c718190ebde135bdb8a78ef29b1b271a30bca3f5438434c54e76dd3f86076dc77fc5b6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nl/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/nl/firefox-55.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "5e6dc41cb51190786724b34a566ffa8b16314f54200b7bc2130a6178f0d3693df0fefc7a3935db13e9cd27ff5ade21927900680e9cd6c964ac7a23961d72214d";
+      sha512 = "8d8ba124d9efd39a2faee19d2e37fa11506a135aaf70fa780471a7ff763c943e943ff970a70023d4431da50f5e7f842382bef66eea6ddd07f3deac05850761ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nn-NO/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/nn-NO/firefox-55.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "2d95d711b99a9e94bcb0e2cb923fa584d7a1e7ca2d2b3d289b20f78a8f8c0bf909a26d45a1feb540bcc4c9e983e40d0eecd24b16d0227d5155f7ad684705215c";
+      sha512 = "ee7125a2cbb47d1ad7b541ccd4480eae05ce5b94d8a280f8f99cc45a29e23480f3ba5610d5f97e2b5ad677a2d6b79b72162707fda851f5930b8f38ba030abdc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/or/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/or/firefox-55.0.2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "d9bb706c45c5e7a822f106888f47615c1948ee74d8bb5a179ba838634262862a561fcf8d0b79a86089b08f0213cf1ee21387bd4e7de1b47719fd76ef607234ff";
+      sha512 = "f7dee58fa33c741aeb0a85e5d9a2787e6af7a74e48cf41f76fb381f8761ce5883b639e023246ad94efa42c51da88dbc1bf5c1af25832c01e71915a9156e07a42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pa-IN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pa-IN/firefox-55.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ca8121c9ab978cd044bf8efd5c0ad07d7e790cfd1cd6121413d2508d6ddf8fa75e510cf866b5e8506312b1b22fdbc95e3af9008440fdfb8c392dbefeb81ad3a1";
+      sha512 = "28f22dacd509e904a61c915f40abfe315f724f919a1ef31d338173ba92df4e7977f77b48f7aac999a89b170f845d0bd1e21e07090189193a10568ed14749213a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pl/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pl/firefox-55.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d83d65bf5f0ed37a7f5a2b66e075aaf4caea91240763e537d0198369e93d0c64b1526f14023d7daa697ac6678728f6d7520aa66bcec7ea282760116642b00c05";
+      sha512 = "712433bd8d4cc1d1a29adfd2c3de423f355dfe92ea9c341b1315272f22ae4c1a1b7cb34a9320e8ba2479652e99401b0d449824fca23b4a61bd2763265ccf401a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pt-BR/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pt-BR/firefox-55.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "2184c06f9f205b624f2fa7e9437311c9dd3100135061cb0eb94dabafa27e9b5c5da5aa31e97a70e6f8b773b1c1704472a4cd87d30d6dd463eaad3d8eda009254";
+      sha512 = "50701c3deac2821de87dde0858804bfe2e5ed25eaff5ab599a5a6fd03fc94ccbcae781f4b127bf4eee2cd068415d78535dc6f029ba472ab6060b803b815c33af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pt-PT/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pt-PT/firefox-55.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "c40aea22fe64588eae5510b0c047c2d42673b7f22ef17a126bd642a2cfa9fa6ee27e7480089b381d4ceaedec2508ca6685f8301631948624f85b024403456d6d";
+      sha512 = "4a03a6ee97a7576475c47c1eb9f4148fc242dab79f80013cc720f3e4f31a176d59ebbba9aa53e0ef72a3b890ac3c8d3905e22eabbac61b0c95bb50e8fd4aa2c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/rm/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/rm/firefox-55.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "235cf224fa8f78561ce0f1178dbaf3ac0798cbfd3c3da97069e74aadfb38c6fdc90c3e01d45a5346588bc001f5f82e5fbed73672e7bae6fd2ce721d99416c1ff";
+      sha512 = "868cf77f91cfba14156e5e053891407a831aa6e24c8050d20e7772a0e7d8f06b831d83134f177fa7fa1fe2fafa815036e7b9a6a5c3b1814d191aec9ffeede3a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ro/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ro/firefox-55.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "f6f3ba58b8241678c4a82d03433e2f58ead36037068809c404e930afb335fcd4057f3db6a5266785fd573271e66dd98d4987d6524c2b0fa2d01fb05b5671432f";
+      sha512 = "a30d9ee09a94830d1196ea2ce0e92e304a28c696a8b8ccc9066ab67b03452fec4f93bd3c5975f9db22a8dba0cffd115000efad815fd9ae1a1a892cd5a3d87bc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ru/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ru/firefox-55.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "c7f9833724b30b81a58c6efb00ae57a69b32c2e7590d6ca0ccdc65d8960336068daf7b8f4e305a466c054f8f4897464cadb3fea48ac05aecef14e18c121a64ef";
+      sha512 = "de5678325845a719fdadc26928a6691887711e08a3067f2ad2c658db19e68a019b567e6916673ba6b869b8174cf9729015400feb7aae5cd9f7ea55e85d085348";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/si/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/si/firefox-55.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "669762fb074a3d7da7ae00c753863519e1d8afe68a183e7f6bd83d8e4305f2db7e1bb8b9a8e64aec20d3b735196bd55874573cca257d4a2de5f59b3d6d7aaee2";
+      sha512 = "0942c285a4e4a5dee08bca7709337f01d03624287a0ff8030309d1f503da4ac13c0df8314c2eac4be3a13a9842ba8e9fc2b3ebaf6a7d405e733afb8ff1bc3d8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sk/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sk/firefox-55.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "beb2861f5127b121fce3ef6811de7d801c5ec3cd05c832c16b2839c08a925d2e34a8106270ec956e5f45d6062e9d5cbf72ae4d7d9ed894d9cb44d5914f0a41dc";
+      sha512 = "881bf74e210e0b3430060644429bb77447014381e6aacee6901dfc35dfcd260e719e39dcd158fb7624261ca62c68587c12fc178ee62548f4a1f0844c8a9c1eea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sl/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sl/firefox-55.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "687b20e50fae586cfff1426e189f28d54aecdeacef80b3f68caacf002f52cb7141fe34803dd1e1d8664efc8500987c752e616e26aaa15b3f051afe878e3a82af";
+      sha512 = "f813a8dbef0506e281c3e347d8a240da65940c7fcb0609a9510ab3c83f2fd13462d1ad749bbe768ca65b92ae1d9dab72880f5592b430d796fd377748291ba41e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/son/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/son/firefox-55.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "92b0b4353fb0e858e3998903c5d2ef82e38259ce1d9560abf06ec6b55174d17db871d967cdb62b4ad23bfbcbb10a2541d14f0b2886f73d6b2d670c93fc48220d";
+      sha512 = "61c75236138087ba7b56eaa5fcf4360fb869dcee60dd1f431b92a613ca00a64172bb48e9ff3a649e5e616566967ea0f254517ac1c98875efe2972bc9d2075b96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sq/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sq/firefox-55.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "d9ec031149f9a845e6f11c34a96aa54cc14566e569b1395a83158fe32f433c51a95b1e16e99706f92973661c48856372b134c43b2ebbdc8d358108dc0998033c";
+      sha512 = "072fc33249af1ffe150ef5ab2ccf79322227844e1adc4928947b43b7956b98812ed80b1995e06d5e731f107e58cd1bb1d26eba1b9695fff7a69e00010c364e0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sr/firefox-55.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "cbb81a562427e4773a4c971d24bfc5f9ac689f8f85b6edc2a2b32572f10b202e8b16de562cae85cfe1a9e86eafa3bd60c8bcbfc2b3675128c96c73c223894f08";
+      sha512 = "bac3cfc1adf91712b58777b26fc506e1db025a58f94aef8016904d957cd8dbb2f91950ae652e076b27d4e6624458c1f10d60ca0e2906440663bfb9e239916e04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sv-SE/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sv-SE/firefox-55.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "f46223ace271fcd4ca96ac6724bf60d99da5e80dcf00d6f2889cfdb41d1ca8c03ea3ca5ba61f6cc855c9cc2b62e4602628847d641f85d8bf2c6dd33cdd208b0a";
+      sha512 = "57499d98d877bbe491737ebf1b799ffef61ea41f7c903b3fc298c7006fb3a1d791cb716487f4b4fcd32d230f0fe8466ee1f36cdfd3832d920928bcdc62586ef5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ta/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ta/firefox-55.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "cd3297d41e6524eb7ce5d398b8a95ee0ab008a626b1846e50096343aa5f469149a2a5c0f3d452d0f10ebe6f397e68d76dda4eaa9f3c10b0fa2b6a0d5d60bfa2e";
+      sha512 = "dfc1348f2239d917c19aee05f2b0d181b8028ab14b5b60fef2d8eba955fe1cb50a1400f8b5639f86c2aa8b82cc3a248224dd126d3313a5dc2f2f16014db1d0dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/te/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/te/firefox-55.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "ac7a7ffe87187610a861e32a1a314ab0dc3141eb0910a1987946adccc686cbd1b58ccd996009fef49d642f3ae0568cf429811e652f4fa23b1f5381f3511fb65c";
+      sha512 = "50e89852e7799661c506f313440c7ef10ce96fa7562452cf9f6685a93d8d2f8ec15b8984d6fe971e9fe16b4ab916b665c1e4343e37a5cd4b75f0227dd2530915";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/th/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/th/firefox-55.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "2dc3ed9875d863b27151ae75dc83b5f2f738f0fac24f5fd1b3ba9f7a4aed1c2e77aaaf588bdca534b2a4078a086558ed820cbfd6e852244897dda7601bd5091f";
+      sha512 = "d1538447ed93bc652131e6d608a784294cf5f6b828e88109ff452d8f8e537dd76f9fca95b29c7eb3874c1e0b284b8ff45680783282945820fce1609c2c1cd116";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/tr/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/tr/firefox-55.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "869d654afeb246281be5b287ae76749e25da2e15d7d456cb5848281153307ca50f35a2c62dba0014b90ecf322a85ae8b7daa12ca156e8f5ac33854f6a890f19e";
+      sha512 = "7e6984a3364c1da09ada8f4aff6c2e1c371b5a4a6ee64b13afd3144d8e221081248aad6baf0d5399c3dc8a9891b184ac9fb74c9572b66007b1f1fc29642c16d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/uk/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/uk/firefox-55.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "709a5b8889c4a871dfa15c46bc7eee38986f4b76eef4bade78daf88f46e0ee50a815c54c0bf1e77924d1ae04d464de3a4d1c03494bb2781df11ab32d9e4766ec";
+      sha512 = "98ffd7e12a77387cb503d8c91cad07385d6d151319afd6c109712638e83ff2391555906c762c4127455487d5d9dc0ee68a20a0865791b4ebad3deb1bf9bae04a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ur/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ur/firefox-55.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "d7a0481116d791eebc511ef35a79dad263bcbcde54838a03b86fd5864746c4353cea4e8ee7998b18b266509e2ce584da0cfed39c324c79b847b44ecb043ccf8e";
+      sha512 = "2e1de51b606d155bb05c6e6f51dbfa0932ec0d9d521e3904859e0c3a98ecdcd174efe865ccf44f54814530c8a979d00508d7edd25fd3d8b2e2824dc2576898fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/uz/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/uz/firefox-55.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "5102829f08869d90f362c8da8a6947c23b23c616b6c3cca58e4a8fc9ba68573e8d74238029ad51ca2439f7946359903bbf03c2468c86bfa7f7679580f9a60649";
+      sha512 = "850fed3fbca540e717bfc6941f1d41067e596b338173924cfd2bb4109f6c52d0eb83d0f5c405f3aa3074e853dc1f1cce205f1e599ea5a2dd1422ee37fc40b691";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/vi/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/vi/firefox-55.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "a4a936439a729142af19aa2db02a6e769bfe6c653e6d54381b7d80756968b6ebe6dbad51a267936e173b49d3f92b94e89012fd35c54aa790f17217b001b7dc3d";
+      sha512 = "aa512af12c17bf2703798b3e4bd846fcaaac2230be4062f1804b73461b78f9ea8fadec137783c8f7c6ecdb11d1a1f324c57884dd3e3deb7591c4203603887d73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/xh/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/xh/firefox-55.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "9ac4a54cb66cdbc720e263277dbeee14d243c025ee63f6a1ee4990575fbbb333a0979a19615c226fe1486d9896d6754b5485dedcffb576511754d6781c572dc8";
+      sha512 = "72273bedebc546a1fcb1869154cefe7cd542348e20d01a23a3cefa8eb8bd0766159d46d69759a7d444b8d28f9769d1ef693b9f16e4fded27eca2b1a93ace6ffd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/zh-CN/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/zh-CN/firefox-55.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "e007854739c12502665418c3e0470940cb9df0314537275dac5d3c80923a756dda14b7161196b7289187d6706d58f887f59f47e07f764714298e5da1a41a0979";
+      sha512 = "ef38cb84527c941be98315db0f9f6dd6c30a7eaf2ab8830429d79341e6af3ed919ae046b6e42d08e07990d2255b2600cb7dd3b3f24c36cb985d57e7828ab7f53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/zh-TW/firefox-55.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/zh-TW/firefox-55.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f414e7c6da2b2b5a1871f25def1ee055f7cdb66a6e76ee66848c26e2eb2d999e65070a816067990cb9d855420392e4b84b52b957e6dca063f8a011f2ddb4bbe6";
+      sha512 = "b7aa08e3e983c0453ae2d4482ab3d15c7a0a814cef78cb2103539a2771555e0c2c8675e3f8bebcbfb7c801bb2b1399e321b805d99aa28dcb3aee104d887cd6ac";
     }
     ];
 }

From f175cdc4117d086513995c6b3b7c9c7e42ed2b0e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 17 Aug 2017 03:12:56 +0900
Subject: [PATCH 2150/3246] firefox: 55.0 -> 55.0.2

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index a5256e19e1b..a0a1b304d6c 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,10 +6,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "55.0.1";
+    version = "55.0.2";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "2c15cb3e1a9f464f63ff7ac8ccf0625ed845a5cb9b186d7acf121c439cec38bcdeee93630e99dbfd336f1b7e60a7c09822a1eba59f308bba8866f155b2ed1c47";
+      sha512 = "a27722cb5840aac89752fea0880a7e093e84b50dc78a36dc8c4bd493ffda10fa61446007f680bfe65db7a0debe4c21e6f0bf9f0de9876bba067abdda6fed7be4";
     };
 
     patches = lib.optional stdenv.isi686 (fetchpatch {

From 5d3527c148f73c43d5dc0e97aeeb0678f78622c2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 13 Aug 2017 16:14:29 +0200
Subject: [PATCH 2151/3246] cc-wrapper: don't export CPP

CPP defaults to $(CC) -E and setting it explicitly seems to cause
issues in a number of packages like gcc and gdb.

https://www.gnu.org/software/make/manual/html_node/Implicit-Variables.html
---
 pkgs/build-support/cc-wrapper/setup-hook.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index c6abd6281d2..e43c1609edb 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -139,7 +139,6 @@ export ${role}CC=@named_cc@
 export ${role}CXX=@named_cxx@
 
 for CMD in \
-    cpp \
     ar as nm objcopy ranlib strip strings size ld windres
 do
     if

From 8932357e04d0bc432a7ea9524efc66dcb8b964ab Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 15 Aug 2017 17:05:29 +0200
Subject: [PATCH 2152/3246] gdb: remove CPP workaround

---
 pkgs/development/tools/misc/gdb/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 410fd36ef25..02ff52155b1 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -66,13 +66,6 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (!pythonSupport) "--without-python"
     ++ stdenv.lib.optional multitarget "--enable-targets=all";
 
-  preConfigure =
-    # Not sure why this is causing problems, now that the stdenv
-    # exports CPP=cpp the build fails with strange errors on darwin.
-    stdenv.lib.optionalString stdenv.cc.isClang ''
-      unset CPP
-    '';
-
   postInstall =
     '' # Remove Info files already provided by Binutils and other packages.
        rm -v $out/share/info/bfd.info

From 6e245440d427a3ad08c73a037ba2f7706b884051 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 15 Aug 2017 18:57:42 +0200
Subject: [PATCH 2153/3246] gcc: remove CPP workaround

---
 pkgs/development/compilers/gcc/5/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index c9780077835..e95ef92c3f6 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -325,13 +325,7 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure =
-    # Not sure why this is causing problems, now that the stdenv
-    # exports CPP=cpp the build fails with strange errors on darwin.
-    # https://github.com/NixOS/nixpkgs/issues/27889
-    stdenv.lib.optionalString stdenv.cc.isClang ''
-    unset CPP
-  '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

From 61d241f405ad960e111848a60477fd5792913366 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 16 Aug 2017 16:36:21 -0400
Subject: [PATCH 2154/3246] darwin stdenv: Float `persistentN` bindings into
 per-stage `let`s

---
 pkgs/stdenv/darwin/default.nix | 133 +++++++++++++++++----------------
 1 file changed, 67 insertions(+), 66 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 74dcf2f009b..4994de8bc03 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -165,32 +165,32 @@ in rec {
     extraBuildInputs = [];
   };
 
-  persistent0 = _: _: _: {};
-
-  stage1 = prevStage: with prevStage; stageFun 1 prevStage {
+  stage1 = prevStage: let
+    persistent = _: _: {};
+  in 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 prevStage;
+    overrides = persistent;
   };
 
-  persistent1 = prevStage: self: super: with prevStage; {
-    inherit
-      zlib patchutils m4 scons flex perl bison unifdef unzip openssl 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;
+  stage2 = prevStage: let
+    persistent = self: super: with prevStage; {
+      inherit
+        zlib patchutils m4 scons flex perl bison unifdef unzip openssl 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 = super.darwin // {
-      inherit (darwin)
-        dyld Libsystem xnu configd ICU libdispatch libclosure launchd;
+      darwin = super.darwin // {
+        inherit (darwin)
+          dyld Libsystem xnu configd ICU libdispatch libclosure launchd;
+      };
     };
-  };
-
-  stage2 = prevStage: with prevStage; stageFun 2 prevStage {
+  in with prevStage; stageFun 2 prevStage {
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
@@ -202,24 +202,24 @@ in rec {
       (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
       (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
 
-    overrides = persistent1 prevStage;
+    overrides = persistent;
   };
 
-  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
-      openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
-      findfreetype libssh curl cmake autoconf automake libtool cpio
-      libcxx libcxxabi;
+  stage3 = prevStage: let
+    persistent = self: super: with prevStage; {
+      inherit
+        patchutils m4 scons flex perl bison unifdef unzip openssl python
+        gettext sharutils libarchive pkg-config groff bash subversion
+        openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
+        findfreetype libssh curl cmake autoconf automake libtool cpio
+        libcxx libcxxabi;
 
-    darwin = super.darwin // {
-      inherit (darwin)
-        dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale;
+      darwin = super.darwin // {
+        inherit (darwin)
+          dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale;
+      };
     };
-  };
-
-  stage3 = prevStage: with prevStage; stageFun 3 prevStage {
+  in 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
@@ -238,54 +238,55 @@ in rec {
       (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
       (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
 
-    overrides = persistent2 prevStage;
+    overrides = persistent;
   };
 
-  persistent3 = prevStage: self: super: with prevStage; {
-    inherit
-      gnumake gzip gnused bzip2 gawk ed xz patch bash
-      libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
-      coreutils findutils diffutils patchutils;
+  stage4 = prevStage: let
+    persistent = self: super: with prevStage; {
+      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 super.llvmPackages // {
-       llvm = llvmOverride;
-       clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; };
-     };
+       llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; };
+       in super.llvmPackages // {
+         llvm = llvmOverride;
+         clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; };
+       };
 
-    darwin = super.darwin // {
-      inherit (darwin) dyld Libsystem libiconv locale;
+      darwin = super.darwin // {
+        inherit (darwin) dyld Libsystem libiconv locale;
+      };
     };
-  };
-
-  stage4 = prevStage: with prevStage; stageFun 4 prevStage {
+  in 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 prevStage;
+    overrides = persistent;
   };
 
-  persistent4 = prevStage: self: super: with prevStage; {
-    inherit
-      gnumake gzip gnused bzip2 gawk ed xz patch bash
-      libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
-      coreutils findutils diffutils patchutils;
+  stdenvDarwin = prevStage: let
+    pkgs = prevStage;
+    persistent = self: super: with prevStage; {
+      inherit
+        gnumake gzip gnused bzip2 gawk ed xz patch bash
+        libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
+        coreutils findutils diffutils patchutils;
 
-    llvmPackages = super.llvmPackages // {
-      inherit (llvmPackages) llvm clang-unwrapped;
+      llvmPackages = super.llvmPackages // {
+        inherit (llvmPackages) llvm clang-unwrapped;
+      };
+
+      darwin = super.darwin // {
+        inherit (darwin) dyld ICU Libsystem cctools libiconv;
+      };
+    } // lib.optionalAttrs (super.targetPlatform == localSystem) {
+      # Need to get rid of these when cross-compiling.
+      inherit binutils binutils-raw;
     };
-
-    darwin = super.darwin // {
-      inherit (darwin) dyld ICU Libsystem cctools libiconv;
-    };
-  } // lib.optionalAttrs (super.targetPlatform == localSystem) {
-    # Need to get rid of these when cross-compiling.
-    inherit binutils binutils-raw;
-  };
-
-  stdenvDarwin = prevStage: let pkgs = prevStage; in import ../generic rec {
+  in import ../generic rec {
     inherit config;
     inherit (pkgs.stdenv) fetchurlBoot;
 
@@ -344,9 +345,9 @@ in rec {
     ]);
 
     overrides = self: super:
-      let persistent = persistent4 prevStage self super; in persistent // {
+      let persistent' = persistent self super; in persistent' // {
         clang = cc;
-        llvmPackages = persistent.llvmPackages // { clang = cc; };
+        llvmPackages = persistent'.llvmPackages // { clang = cc; };
         inherit cc;
       };
   };

From a6415eb14328cc874a678a0e0abbf82369081c6c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 16 Aug 2017 19:11:14 +0200
Subject: [PATCH 2155/3246] ardour: 5.10 -> 5.11

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

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index c447863e149..a1cca6ee162 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.10";
+  tag = "5.11";
 
 in
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    rev = "9c629c0c76808cc3e8f05e43bc760f849566dce6";
-    sha256 = "062igiaaj18kbismrpzbafyq1ryyqj3lh0ajqqs2s8ms675x33sl";
+    rev = "bd40b9132cbac2d2b79ba0ef480bd41d837f8f71";
+    sha256 = "0xxxjg90jzj5cj364mlhk8srkgaghxif2jj1015bra25pffk41ay";
   };
 
   buildInputs =

From 37dff6bdcc9dd7d912e2811fc86d03b4da9187ee Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 17 Aug 2017 09:12:32 +0900
Subject: [PATCH 2156/3246] thunderbird-bin: 52.2.1 -> 52.3.0

---
 .../thunderbird-bin/release_sources.nix       | 474 +++++++++---------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index c3ce77adb9e..ed811cf82ae 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,595 +1,595 @@
 {
-  version = "52.2.1";
+  version = "52.3.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ar/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ar/thunderbird-52.3.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "5b19b8fb7b7a6a4dd03ee5ab163f07ee664dd7b6d701571e57b6b3943d8aebf69291958d9a51b7720c5e5935daabacfd6149229e7626557927133b00a6c8750d";
+      sha512 = "55c80c62ad45ece24f90b99a994d35aa130e2a42be5512e6efcebbcf66a6b26905cd28a42944bddc1b1c0c6ba9c488331c88ff478983c8ff8ab61c3fa7c6d234";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ast/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ast/thunderbird-52.3.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "d0d2a562834e865cb31648255a94b120419c7cf4bba20d0a43368a05c3590333443da9416f7940eb0ed1fd774bd161d85585154b389d01b468124b6da310d5a9";
+      sha512 = "714006603d091000b777130c45bfb5a0e4e2ed3c782d7bf17c1244d4c860a13dc0be58adaf447307149a2a5da90a1a08c3aac0a598c764d2bd491eef5c161c1e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/be/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/be/thunderbird-52.3.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "2809c98f9b64b778c1bced8f91657a9cb8e57963d273ff380740db9be2aa999df5c32eeca7b6e63a4db65854f4e5654cc81f58a35e26eec8038520a9e78f263e";
+      sha512 = "be529be10ab41deab394e8a2b18f5247e64dd00fccb16cd3f95924baf0a9f1924a05f1fea97346ea171d416d44b4cdb9e5d38ea678ad1f64912aac0224f4ee63";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/bg/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bg/thunderbird-52.3.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "cd6a67c530f7ce0e3da897ed5701ce2b85f5bcb30df8db85af38918e951e7cc75e446f5709d7b02b1f54092cd8cc54c15ec46e5bfe893cd85fccdb0851a4579c";
+      sha512 = "4726efa8ca6b72fea6acec1f8c0aec6b208f495b3dfaa68d6e26797f4998c5e3150e4e3b725e0042dc953c7b9d88c97468fa03e382b636b057c8dd451126710c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/bn-BD/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bn-BD/thunderbird-52.3.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "f117b3f56a79b5fd4a947a83ae6a3d28f0bd83f5ecb65cde674c12191517f51956535e1872547b985a35a9c0c398abc610a3f2fc2d7c9893bf7299222e5fbad7";
+      sha512 = "d0f16014b3dce0b6de06233038a8585ee6a8ec2b7a45ae406dbb71370d931bdd51100d1d68ce29ddd2329efb6eed033d1856ddf29b6515484247e6f11c4f7dd7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/br/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/br/thunderbird-52.3.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "72af56a4376a28ec2f3c091614b2d5907b12c2e66f2d3dda27b46ceb8b199a32d495454a2ea167180e44b1f9ef7aba89aea47bfed0976892d5d9af7102d5f5df";
+      sha512 = "c52c416dda11dd69e78a7ace3d6309b1cc8327adaac74cf831af42b75bf4da9dabec50771014189128dec79487d224f0ad6e9c335a5343c75bf54f828829058d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ca/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ca/thunderbird-52.3.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "85da428c53f3a2467f5be661c4f40e0f9434609fd6509e01e3c28dec522f5342d225a4f19c30a59187e42540905f156897b1f0e0ab76b2419d263923be844b3f";
+      sha512 = "d0ab90bd0262476565ac48d597c699529cdfa2d4773397f1a458f7d97989b982bd9dc34c2a689d03a1a0f67c53d67ff86af1010bb0e5db55f61bfc68db96011b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/cs/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cs/thunderbird-52.3.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "f1fc63e25fd30b1f379689fbc9d7f24e94f061b39d3b0494226f25702dd6bd610dc031e2105957e2abefab1d7f8e90e81f4381f6d69cb43b815d8b80b9588715";
+      sha512 = "ae3e3c12f0e75b449ea6d6d24858bf6036e9db8b7d6a08156d5a9026cbdb53d736a1b459109cc6dddae3d0d6c08856e829beabc8a53c20ba8741cfc0c18d395f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/cy/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cy/thunderbird-52.3.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "b15b4c2766ef32b5e8023e8002f05fa82fd1e71784d5b5f2d63c62c4b20076c46d470a253f8e0a59f1bb1425a2d297b403c32117e43ce2e4851795511604cfb2";
+      sha512 = "c6ff55856517ed5b99ad30e649b1ac31d7d529706eb8154eb235817f4b168331e57e845d6648e2bcea574b3233587cadb63c118614598e0dcfabe3ae3d5370b1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/da/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/da/thunderbird-52.3.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "98750936e15b469d489e31eb65935d9013a0f4250543267f03b5eb9615587f8fe592b84bddf51176ecfe0864bc5c35ad5408e42861d45ed3af61f43764f5f9b0";
+      sha512 = "c0bff66366fcd9b7c62c352dbd25bec95a444b3bcc513598ec834191e7eef47a07cd0ab6a72dbe7b9f14dd323c085f4b8bb4b31ac0f2536d08b08d1c86693bb6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/de/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/de/thunderbird-52.3.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "7653e5e9e02aba7cacaaeb82e7106dfd7e49e4611eb3fb347c8192fcab3749ed98b2a2342788fe8f0e23c932ae5f9ae71266464d3d6b83629231f83ef8efa7c8";
+      sha512 = "010b56755f7107e32df25481a2febc7d0468bd27a6ec5521af32d80382c96653a2989a70e2dd7350452ebfb25f5691a161ff5fd74228b9b3670475942f7b0f6b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/dsb/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/dsb/thunderbird-52.3.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "abf52e2f55f9582a5a1f5243a35e3fc2196beddb128a690479d6e82ac5f3cb7967640418f02fcc57c5525debce716345da23e4105e551ab0682dc5df5b6b3cc1";
+      sha512 = "735d07ecbbff46b242a103676fb8190e082fe71f8a64f19f82f18a42dae50328cd4e473bd06722a20521cbce50afceb24b61d144b4ebdd1cb83a8ff3b041530a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/el/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/el/thunderbird-52.3.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e86bfe27cddf7b1deb2fe499df2c37488863e5af24614986ced8f9063eb8494f64e637691fe3f69f6b448a50a655725f866313cf0a881425ba5cb669c9fb9940";
+      sha512 = "29361a698dab6b4d3f369393ec4c06797c1a37fe4bbce8b48f0f5216225fb26125b4f0c814255c0c964a24fb37c2865dce64197d1584385c01f0e655947d9884";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/en-GB/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-GB/thunderbird-52.3.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "57970ed60a24e6c02383b99ff4886ea9d90f49fe466f8175b3b9ec16294acd5900191b4a8fd7be08f5d987eebe547a9fd5004e516d13da8bfd702b82baeb7b8b";
+      sha512 = "8d3fc25a21aa2f38089bbfa8013104de0c6c6e95407289ecc82f5c003e732d51bf160106dff07b202d6a6d0fee989a08e75bf616cd98ac1b080605b631c2be69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/en-US/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-US/thunderbird-52.3.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "787b0c18e5cf7115ee7f317d0949f7c8d35be15f3f0c6a07b75372c07992601194a860568879164b2c5a49c276b1b48c4a723b68be46b8cd4d3bdb4144db2606";
+      sha512 = "ce05330aa7032f0cae542578cb49f7e8bbc7971be455817126bc77212ebd35ec701691ed91758e7c5b663f4731ed19c2864728908816e71023be36d13ba98bfb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/es-AR/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-AR/thunderbird-52.3.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "65e6d0726d733b9f4929a946bc9890e5eff5ad9e22d50bbaad40d2dc259028643e666b619eef25ba7d906f5a05d0e9ea456ab0d298cab5ecccc9a4a494a6f4bf";
+      sha512 = "52058cd4b0eaa68756fd7b7ffa294fe0720a876fe176199cc67892b3d33615a92238c4fc90ce7cf9b70b3a57f3272ca7bdab8499b3d6d864775e97ab2f91c68a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/es-ES/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-ES/thunderbird-52.3.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "7266fe0dfcdc7f119e521873ea0ddc3106c6ca3d147a9cc8f9a88d563a6647d97f4c46d26547a24afaa6b10d115a3d4effc58fe2621c62395c7fc99f9587e2d1";
+      sha512 = "f447cfcf7c4febbe5244f5004e2b6a19bd03a7dc1cac5b609af8726bf9cd915e1ca2ff81aac65ac62386390b28aa1d3a6f2283d8c479b4d97c6df34e54918544";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/et/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/et/thunderbird-52.3.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "048cd4d824ddc0b075bcc6d9e7a8a3905031c3333ab8bc55893278435316fd310d6002b9fa1d7b270f8b94f3bf79679e96571b083305d687c36106b903389066";
+      sha512 = "46744b2d6cd187ae58967e1be2962ae7cc4e3d4a32d195767777634d4c8b9843979896524ec90a00fe8bb1d367c7ae9d540da5705a9529d0126a165b4b7148d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/eu/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/eu/thunderbird-52.3.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "09b4d12b0a09de492082dc315173baccf603b387d391317a350fa67c04339b0d720a6c682e4d1c7fc7ea54e04569b004b6697d9e27a14c4f5095449f2f4e4471";
+      sha512 = "c00558d88e6f8d9e89dc5717d677caa2a1bcb319a06b03f20e951b94d8dd79bb6d2d8875dde07f59be344330a8b36db00d0c57c7542877207f344e25dda91488";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fi/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fi/thunderbird-52.3.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "21f1069f46a8dd2dc54326bfa32d0722dd5d139f3ac10702a3cfba7d5ba462362c126ac2656ddae8c2071b20e7f96ce8fddd8049b4df9d66438e7f32f53f9316";
+      sha512 = "668d7f4793fa0c700b1abb75f185a26b9734da8f9d9faf327ad08503802017e93726de3124818650099570de58650709f3886dc6d8af24731d83c16486a54acd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fr/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fr/thunderbird-52.3.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "ae30bd2a9eccb925ed4cf6acda17363e9cbbca0b185b9477a9b5611b613e332647907bc4653f6d677677dfca9347026d02f0aec3a42f29ed532a4b71b2c207ce";
+      sha512 = "aabeea2843ac8c126c53d862054b27263b03f65f3ba848445a55615ef7e6f972792b2e634133877cbeeabd74e455a2b47d36ff76e5a4162fb7caeac3856f10d1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fy-NL/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fy-NL/thunderbird-52.3.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "7d35d3a78f9ab79fa8528260160d8b5fa1ee0198b53b94fdeb86e400f95320aa0d695bf1b4e1c73733ba09d6bc78d8d39f1825744e49cef1a22873f35d8a30fb";
+      sha512 = "a0e1132009e63654dc5fdde6989f758c88ce02327dc4b2e870c925886fd350867ee78958095743b582bfa77af4f2f80a497980cb3e5308dac47bcdeef88c493e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ga-IE/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ga-IE/thunderbird-52.3.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "9886d5b9654e7cfaedd5dd60c59a6888929bc2001d4c43a2cf40f92a098ca725cfee8fc819af13c5ea2c9eeeeb3d6103289124b8fd05a234eba04f4570b5986c";
+      sha512 = "ff43e823765ec9354edc3c0009ec5a2e004e31c01602b875f538b01957bb4953e15f8a60c4ea5695af6e541566d21e4d4ea7ef4d8d3464f4dd59072269cc2eec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/gd/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gd/thunderbird-52.3.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "18f62933d213197ae618226aea192e30875f76568fc0a17343b49152526a32c10ad79ed4d6eb36feda0c8e287d915a99bdbff70ca942b4a313ea81ca04b257c8";
+      sha512 = "d2f1c25cef09c4e3946050af1bfadb3f8ee70bea6c9ac2d8c25e2f422a160c3cabd76373679b4fefdfe838722f69e4ce138c50c03de221c31e71878d66377d22";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/gl/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gl/thunderbird-52.3.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "c6e447722e284beba304b42d643a16b835f525d053714577425660087b03aebdcb93c57071a2e9f143ec5393616f7a0cde9a52f5bdaf42c9df1aed8b509de415";
+      sha512 = "3ef058fa97459f41f204ea80393f27a0b572039bec4a49eef80db0402579620e28acda8613adbfe6c2cc267386a5cdb8d95fac4dfff2358a9bf4ba22a1bc24c5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/he/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/he/thunderbird-52.3.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7445dc1299038b412a39baf594c11444875d29332afd1c36a8ec603893c3f34d442566c2c18cfcee60c5b84e1bd1bf53675d1a32530dee7fc801554605d7fe4b";
+      sha512 = "b54188bf2ba0e2e6470db0a938c77710c66e1b1d359be2ae3f306a7a2ecf34501f797baf9348609c63fdc68d1374382855509ccfe619c444150a4214ee819bf2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hr/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hr/thunderbird-52.3.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "9812c41f77cc76a6de78ca009989623071a3b95f992658f584bfc58b5be65a3db48d9135025f578f8877bc2f9426182f3f2dff39f50f1018ffb7b6ff272affc3";
+      sha512 = "bc5ca4099fa6d5f7884f7fefb1942aecac4aa6cdc338d8608433f3aca9ce14c8838e68aa79e48e88b453498d5d0b992a583daf6abf6f97bb4cda5d7ffdcf8194";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hsb/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hsb/thunderbird-52.3.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "af4fb4ca49ac982e28fb5b77d1ec7ec5be69cb097138bb7de865d8a0167b8ce13074d2b2ca80e11dbd68c7fec8533163b9285ed4495545da833f726dac484e7c";
+      sha512 = "5b8c7468fd777d9a4f046224ad516a740fd4acabc5dd30578dfc843f772dc1d0f08b4fb257db7d4d39d58eeb6468126ddd9267c1562e8ee7d23f07e02e4babbe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hu/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hu/thunderbird-52.3.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "f1026a8fb44424b95e29051ab778313c417b6119fb9959d3116d6fcace96f1786f26b419eedd7f83790c13c89aba2c339c52ca5b5cfa2d62572518cebd12db9a";
+      sha512 = "3dfb629b804513e40852d810ce5ed3e0af0cd8c7bb92a44dc6c08f2e3a45de45d2c3ccb75616a9f9d7019a8ce9b4856e27baa283647eb63e953071fd410dd418";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hy-AM/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hy-AM/thunderbird-52.3.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "fa18a6113852d231dfcecdf682c6c1fd18f2ec5176fd9fd694a3134deb511ebaf01e00c0a336dac4a79918606136232d62f2b443ba60d25e40c573f696fca7ea";
+      sha512 = "4dfc61099b3f8502add36f3b215283140b8084504048d95ac31b948cb8e53fca658076fc7164cd2c20742edafb8f7ad5e08f2cdcb8c9cc764573e2e065364b20";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/id/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/id/thunderbird-52.3.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "313e713ae5d1b4bc48789c2c33850b5177d8f497d9965606ad2530f26075cded2943351da7c13057aaeab72a60d4dca193b2fc8c4b8cc97734132b721d4df8fe";
+      sha512 = "5525d0507fbf7c7503b9a58c50ec248932e70d899ff88c1b8cdb18484d3cf4ce76fa1121a7cb5adfa3c19e1c83ecc5e888d652275400a2f92dce3e0fdbe51353";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/is/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/is/thunderbird-52.3.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "6f0f8444d230cbdb5dcc81530cd05fe08ea9e2482ea7560157ece9ef938d12b7cf86a259bcc72e132717ac143a6f3e203c869f1c37715bb87fd7b248366c7554";
+      sha512 = "1fe92018d666ccfe1bf063dd191d88f3c9fbd452e7820065e45b79de534baad9d8750d4cefbc39902d49d532fd5500f4b3a167ddd7dcec61677f490daad01d9e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/it/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/it/thunderbird-52.3.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "f0633c2a46c66b4db18b2e70fffd9459d1c6732e872afaf8a1ef7fcac20114a09d32ec666305963acefa6caf6ec9b902d3f9d2143f68951674c12af462cb3673";
+      sha512 = "80d6036462d74bb180b0f3d4d384be3b644dda9b3fc008a8d63478ec877462defc88b6f3dc2eb2358489956ef20e057975fbff9f7cf5afd0d894926e617d3225";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ja/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ja/thunderbird-52.3.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "5893bd100cc44aefe160a8ecfc5e9e5b581e1b9c59a1aab02ea9c63f8c062d8dc0f0c069a4a8adf4b11e5be614b3390d195df91ba3c2f3845f13ae7734e7295e";
+      sha512 = "d1185fda652104759bc84a095b289ccf6a3721425d60c8f0781578eaf113349de9fca18dd1138f73dd13081ea5388d0f04fd0cfb47142236c1354a167d0362d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/kab/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/kab/thunderbird-52.3.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "3777a5caf8208f429db9e828b6812dd16c549511e539375ff2ecb74ddeea8b8823f93194c73fc8e708ab17f8fe37c72af6ca36b5ed0ecaa2994620be7ab21de9";
+      sha512 = "4bb2184a4a968f6b33c29fab44b11f06743f88b8ecb8d83e5a892c608a03dbe3f643c2e8b5a5fc9ef844801b8bfc2891c9bbbbb306b94698bac5441051c22783";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ko/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ko/thunderbird-52.3.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "6a3e800d909db23c7abcc10a9e07feb5df47c57c072544ba84246c84ad364c8027e6b383a65867d9d0f1523682c45a929fb1c628999b18df2c959e32d374a15a";
+      sha512 = "49dc08f3a98205e433e81c9bdbeab3f6ed7dca5f3df9af1b6a01470dcfb1a3fb72ce3447ead492fd8f0d49dfcf9028194c94a4cc6e20b1b4c28c64a706975615";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/lt/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/lt/thunderbird-52.3.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "486691138c9548343e6841ab1e84d2e795f280fbcfbef06769c7ad816e2dec79381a1d7bc0a4bdf0d5723d48f62ffa1acb7170ff6f1f1a5364ba6872a7b34fbc";
+      sha512 = "e8b35d834e122dce0b9996060b7582a5b2c0bcd06e1ee7a4b12298bc4aa501ab18bc140fe0f0e2fd63ffad97ec9d287d1614ed76718525c86296ad1167658f9a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nb-NO/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nb-NO/thunderbird-52.3.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "0f3745ef22be9cb7fab9d5540a1ba9433e4450511398442debce3909577ca97e1ad5ec3a41c834b31ff60852a8479321dba44559fa2262afeadc16947f69eca9";
+      sha512 = "5efba8423c744c61be72d679e4943e901488984415cbdae9533ef5a26010d0ba072f107cf8a53389f831559e8093b35c01f6eddc76b8a361f60af8166c781207";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nl/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nl/thunderbird-52.3.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "6ad18ac7eb19eee591b64d6118de057ec49736e93f60b18ad979536a722a2d5df4b55a8b3d69a335eb0ef96451d2516c0a160a9218fd2ccd92c290752fca61fa";
+      sha512 = "b4c6c95cf6df97ffc65d03f04af7221d819ec28b464fcb8173beebb9d810af9b78f64b39e0750d11446ff88a209677512f3735d8f38ebe91ab9842abbf183e65";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nn-NO/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nn-NO/thunderbird-52.3.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "879e402e2dade3acaf1354b8566d1abc11994b749c90f5c1169b1fdff5ea5dd19ae31fbfd1628adaa02c93f2346c02cc69a8625de8302e9965724d8f79c5d384";
+      sha512 = "3bc0ea3e17a1161345d4c1313c774a312e591248f07be7c11d9b6c738aea2d91aeee202f2a67ad38df9fda43f5f853aa162990475dcf9248667fc546370b4083";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pa-IN/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pa-IN/thunderbird-52.3.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "f23942c425238016e1a13b84e6407badac50efa6f11960c9996e4bf7845d3a56537721bb4b6e1c1002870739534f2dd7ce6fb74781bb8e9986e744f36b704c8f";
+      sha512 = "2fef099c73db55dd082f4a9e207ff47096870caef6ef4e9346c7faf3e40dab4d3b0e1e68d1a9dd7a427d97ae65aa347976641aef1872a4c7a6764e8a8c2cfe5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pl/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pl/thunderbird-52.3.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "0ce3854480f0d9969e6c836e92ba7aecca8f662aec5c7784d8e0e9986239cd8e721baf0aae1142f43dcdc54d66708fe7b7d8f1d32c3410c69306e57e1d663159";
+      sha512 = "f523fd0d1b1656e80b52dcd8d2f52f7403c22f46eeea850c75c78fb3c1903ba4edc44ae69db755c0a105379855c0c9c33f149fb83d8016a182a32cd5bbea113f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pt-BR/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-BR/thunderbird-52.3.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "13d2b36dcbc85016066b4fecd61b695eabdcfdf729996eb37ee3aabac3b6b06fb619db915fbca6d59e4827b9e724e9ce0f8308e033c5469ac906d8766bf7021c";
+      sha512 = "6428f601375bc877def880aef3ff6b8ff4856696a2040381ca22c60df8e1364cef12e1c878db6b7863d10f8cb02143c06cc58d5df6cc83d1c25e90c846be3fc4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pt-PT/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-PT/thunderbird-52.3.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "9bce5873c1266fece8d14df41d44dfed545eaa7a9435336650cf102f765a99978d117c787d1ea0f0987407139bfd07765728c6fb188699e8e70dea557e4b4f12";
+      sha512 = "6dc2fed4b003f4f120c79a0673d9d7455c0b6362dadc06e15ff612a29758c521d87cea073ca0b81018e57872e6262a09c5efc6e9fdf7b494c152ae4e992260de";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/rm/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/rm/thunderbird-52.3.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "d15bcd925d9be3d0a27478c62d178c99ed1ee474799dfb1a63b505cff3560f1d4a287a5067d6ed4b67cd05c6e8a7398a09468269f262fc001b934e5e6cef1bc7";
+      sha512 = "b22bcdbe338fec3267f352ec5554b8e5bd732961917496c6d06a6eef188cabe337bf3fcaac1afce49cd16c891fe7604fa77c13b3eedc7706b262957d5d01171f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ro/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ro/thunderbird-52.3.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "7ef381e722553644d8f3842be5c0fcd1c2f08b4128a53380a6aeb54f4d7d8dba5f73ccecc60d5212429ccac96045eb9dffd77b39b42b637020ea0142daf98097";
+      sha512 = "cd2f67456fcd20ed48effa2363f4088e48d91f93df66e803527e83a3f8f2f3a74ba22fc0d5c4ef736bc38ad6a6416830833948210ee900600bc36ebde81a9976";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ru/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ru/thunderbird-52.3.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "1f71926edd82ba36e98045e8135b4c60fcc59ab0b0a097385231a5dcc40a2d7628d6f3f3691981056f013d01a4a3b1765a58d3cab683ecd55fcfdbf1b974d138";
+      sha512 = "1b6b0adb47f3c52230297b86ead0d259acd12fc56353ed5de9afb84042d82d74193785b4cbb4be2caad302283ff54f8630b69fcc9b846009fa7dc6fdcd7e2525";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/si/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/si/thunderbird-52.3.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "453b2d6898cfe04580f2846da0d534eedb77aa9627a39d7e7b6af1287c9e2feb695bf3d1e5b51b9d15f293579df2ebb1d2f9afb6cfdc3071ad24618e43ae925c";
+      sha512 = "95c4864692410aa7f9a071f9d4629614b52a05a4a2d8f3d898feb7bbb75e766a8efb8daec9e3badb32c3dc8b4bb1a2b3be80452dbc9bbeb625c9275862396d95";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sk/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sk/thunderbird-52.3.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "c604c83470157e881f3563c04e3e5ad368fb2d0d1cc3fb58b176cfd03953141fe037baa14120f857e238071f55ab1a3d2c1ca06c847eaabf8012b96de1409c8c";
+      sha512 = "04d594a095a4862ac32e8385ad7740afb2033d0601f520206ea504c9b367d685a2c84c43a0279f39105ef56628b66f13f2875c5b6f19f5252a3b63f6d549d876";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sl/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sl/thunderbird-52.3.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "da7a37a7fe21a338ed2ebbe13e46a2395cebde8036a5544e8678083cddf092fd47ee80ad7e7fef66dcae59567cecb1bd15b99d470d4ee083d328e5c2932ad518";
+      sha512 = "fe46ca8960024da81fcef7b2aad12bb58431f0cbb4d4c107fdfa8096764221f07feba468bdd2ef5d99665afd0404ae286b37bf2afe8cb6e6fc2a8ae98f9a0ef6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sq/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sq/thunderbird-52.3.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "1b1e592b2eeab57e843eb4fd6745886946dbba451b5bc78e2212400a4e10fffaa5159034e8ea5d32a0f3dab7527e91b642209a7233140e0fd9c1c44363da9fef";
+      sha512 = "f44325e596690d0f383699debeb8450f02b7969232f1291ba0b02f657a80552ea09caa899948506674818159a98b646217d53c386908cfbb926791dc61a36e82";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sr/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sr/thunderbird-52.3.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "836d1b2c786e787e07be4df837efb2051f8fb5a964facc94e82cbc05aca77ae54e1553e285a868f4703b48e72e2a0b739ae5e92e7b3da55e4ffc70567e1ce992";
+      sha512 = "67ceca6c23768094799eb266cfc09a7340941fc49ae82c608ae6593a7bb1c9d22cf5525577e7815a1c5c8ee64744d7f6c5b790b3e5b46ceef1fde0001a9209ad";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sv-SE/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sv-SE/thunderbird-52.3.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "ddb52211226353c021350dd94014061a42ce1ee06d2b4e8c612bcfb5e17525bf41ead152f91c466e69ae3041136fb7350ec58de21ed2726cab2d6695dacac332";
+      sha512 = "7f4ca5dca587ccc3a20c9e962d266ed1f7127d9e0707f585407efc58596e590d6650e8322bd13889afff73eeb7025942d636f3a17c327f9c2dece946ca67e50b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ta-LK/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ta-LK/thunderbird-52.3.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "c8c79641c7d80391d5007155b4ec3bb0ff36c2ae3e1dfb908013274ce6c64e03563a68a2ed4fbfed8e4684c4c49e7f9710050aab6851cbff2e77609ce6e25f34";
+      sha512 = "6a0024f3da37a0ecd2015c9fc574ef3ca3d3f62d75324b006bc32c3be901054549525cef79597489edf22c5de1cd65c1826167132d1e5f7e62a23f12bc966ea3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/tr/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/tr/thunderbird-52.3.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "3c6740c9512b0d2d7f809312ba9f375be8635dc41a477e5084007cdffec9fae3c3677faf96745b61a384a4b899f48c5e9c239f52549faea00e198539181f8ba8";
+      sha512 = "fc897cc02261f65d45ce243367f6cec3f08f08d6e6f64083e81a848c3efbc9098228e3b1bb0d4f9914fe5315748cc8b07d662a204ac4ee2e0e1bd075070614d5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/uk/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/uk/thunderbird-52.3.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "0950bfca73dd4907e493e9b15667f70be1f1174ca755baeefbd2ed40160bec3f41e1c67207454e31afed919bc72314e671ed47492509c9b2c0c207bfe3e22088";
+      sha512 = "9c1aa0abdc9d008a40c5681ceac5add498f91fa9454b1b46ac199609e714d01a941705f729f99bc478a37db53cbf0e3c2f2c49e5d4b04a25b629f3fcfa29ad7b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/vi/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/vi/thunderbird-52.3.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "0107c16694feaffb18160e4eac666ec840b7efda706ddd04596cd4f54feaad07a95e9168eb8eb78cf800b4c60f3f4d229d6d217e3d3c681d2a2b0182ff65251b";
+      sha512 = "84441bc6c6a9882e0b90f9942148e70a5fe3a5d353819fed7aaaf38a7ec985d061e89a99c46e6d42c3c057dd07b44c8123f85a3db0f62b630575e51703d138d6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/zh-CN/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-CN/thunderbird-52.3.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "879cd62661967b85919fddc90658d40a3119715eb2cfa95edfa60e7ef3dbc3eb23c2d317a9c632d1c2055900f03e8437af635d72efbf14d7b9fee7f87ed5b19e";
+      sha512 = "c1cd1d26ffc425986abdd08b1c3695bb9904087de1f6f192e2bb7ec187f0f433faacd6bc98700b31a11d75e28cb4c9e6f7dd2239d79ef2d0a5b866a58badb9b2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/zh-TW/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-TW/thunderbird-52.3.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "2c26ff8ed886aa5abf82511bb61fe96fc5817b211dcbfaf91deabb992b1cc968baccafcf1787b6f11b26052e18ff7f0da1d86de7ce45579bf2f6f403b11e9613";
+      sha512 = "dae4fff5b67b90db1e1e48ca24d63c294b8628cfc64f90227e2100d5f02459757131c7cf51efeba166273fa25a38d5addc035ebb5e945b31826d152f140eb3cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ar/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ar/thunderbird-52.3.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "5d0971ab1c51c50a9f44967a13ea7c8cd7828f14625c5d5fc02ef001adbf69f7895ec6aa691a05c7a5ce5b038854d4dcfda0204c50533b028c2458adf5a6de97";
+      sha512 = "1bc9384d57827d3d42ba4b2ccaf1ee83077301c855cb98c9ebb58453f96c37429387df7cebbf381fd6a711263584c857e5f6f1c52c915584c97f56051cb03df4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ast/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ast/thunderbird-52.3.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "26e55787bc6e7a9fa8e3a40d0cee9912201026ec04454cbb117dbbad97d448dab1de9aba0c84e8cb10dda5cf818fd0c98116590b9e62849b5b714e63029d0fd7";
+      sha512 = "11f718f280c3cb0e1b759b721d4133dd76cae85e6e1217f66403956cb08c637de99cecc4954e58f6f1d9e8275dc8607e501e6fbbe3bf71051831336d583042ca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/be/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/be/thunderbird-52.3.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "432295c9cbcbd59ea6bfca3d3509f9ba3ea07bc4004cd96bdfaff468210f30f9401e372c1f19c6504895e35db907d35c282d39666eb1c99e5362f46fe6dd9ecd";
+      sha512 = "fc376bcd502ae98da16e48e72234e1b8c860aa9e42153c7e89d6ad829d9f4b2696aa7dee75bd240fc25cc7aa291a808184236ace14978a6f203997433db24148";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/bg/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bg/thunderbird-52.3.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "137f4baad093df14da263ec707aaa64edfe0972b36e6441b864722a1577cc1683d4205649f79fac9262c5a53f7adcf045991bbdd3168cde74365ca2938bc8df5";
+      sha512 = "076184b227fdb364fa8f09f121735a6b6752b11c4f8537b45374db550c2fa9f6e81bb0c2cd145508973df8cbc2901de793d1f4c47696ab2165f5c819db659640";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/bn-BD/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bn-BD/thunderbird-52.3.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "fc33faeec367b1161c969b82c0ec703fd4f443908284b0cae309f44942473cf6042723de8895442ca21da40d404f24a8c1a490313352b95cb949e568db56b953";
+      sha512 = "604fb9985b6a69cf563b86bbaabd890f487ca3e510a93b612949af5759b339e10b67c70c17aab9b35d1fe8ac126e69ea1a6123aae75a0eca6a9b4f133fbe1fd9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/br/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/br/thunderbird-52.3.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "69c71b3af91d6bd5c63198937f43d5ac4c29c1c075b9faa64a94362cc544d5abd9182b339936a88da87bb69ec3201c6b54185c67d0dff1defede541a48d721a5";
+      sha512 = "f5706905bb9da0c3ec9e841b7694619db321ecedc85ab20e52fe9bd2e2ea2e1ad0cd9e0dbaee4159237881000fd2d3d4eeb1c86911c0c5ca13fb718c7cbf75e3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ca/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ca/thunderbird-52.3.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "b3b33c69e411cb4e920a72cb9a4eaf41469c709e0b04199e53094856121ed7fefe84d3987045442317dfed27069686692e9e0ea00562856a15c916c74c4f8e90";
+      sha512 = "a240c6653153c35f4cf40c7266eda3ebf499cd95cae7a62e0f2025bfb8b0c46538710a9b3b5486e1fea88354d7bd654f50faa06a6d246d2c97c0913e51e62257";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/cs/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cs/thunderbird-52.3.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "c38deac7a95fe30166f8a22e6e4c76039fa3ec31ddc4ffb4e84f78c549bd76ced476efeb0b4abac0d73b4f5ab54e6f9a7181804450f882c123f41b8c2dfa9f25";
+      sha512 = "3f639e7244a32891c2cbe0059456edb241895d7f5f5aeb2636699dccb5b71d4bae855f31352575957c7edbcf4925506e76ddfa0f0b83a81a61d9a8d9b543c564";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/cy/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cy/thunderbird-52.3.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "0ad5a4e40d03d0f329c479c56ad43a6151e262faa225e6f0280e4e60c7a13dd2ea949695f84514034031b796a8cf190fdab519cd58d998a254ad9238c337057e";
+      sha512 = "26c6ae97d0982d9e91bffe04918b27da55489ec00fbfa1783acfe69cd2136bd139fa9cb434a473b5f63097adb2768e73a929f8f06bec97a13ad6750837f1cf5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/da/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/da/thunderbird-52.3.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "e681d601bbeebad6c2abbd7784041b700bf0d2abcd490fa41165b608334e3a98ab2a8bd2291935622788c506c475de89ab5a868be734225219c499ad147d02be";
+      sha512 = "f516ecbf3124df27cb5c4dcc00505f2a1ab8806c3965755ae28ea3db7e06be173a82e5b171493af977686e31bd623984a0428d5781268cd7ab4094510ee88ec9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/de/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/de/thunderbird-52.3.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "f6388f6992e1057906e5343adcef5d3cc08c983d3319b2880190d7ad3a42266c1635f5a04914f44edea6487dbba64ec8a916383938d6c1c064eb06ead06da39d";
+      sha512 = "053ddf755cdb5b76174b18f674169c1b478b636ac90af21d5c5108a7fb9463e4e247567421abe1fdb6cf1cab1f83b2426e2fad5d0d0a2b259b3526f5dc477bd9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/dsb/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/dsb/thunderbird-52.3.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "661f1eef600803d2c76f623be25a0b3143dceda01e146c12075b8aab32112922bdfbdafcb0d1f9be88ec1414f8447a7804494d1b5e6ab91873eb5ab00039e29b";
+      sha512 = "0217fa4e1ceb68a9bdd8d99d93bd2d523c2ecc649154eb7c22b970389a285efaaa8b2dd20f590214483cfbabdec5cac8b6120315d9b500d80038e85bf8dda80f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/el/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/el/thunderbird-52.3.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "7c6cfdd5c97c7a721ccd02ecc6d000d759aafd9c1a05dd77da09ff077f2a284a5349a5c14371af35a5a9ab4829e4fb93d93042d75fd9eeefb95e2fc368dc458f";
+      sha512 = "8fea2697ca07a8f0007a5987e59ee2ab56d9f7a4753f3e4656e872e7201f001eb80831eba64167444d0391cf05c8af5f3d44f3aaedcd8b2d8fe48838e5097240";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/en-GB/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-GB/thunderbird-52.3.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "a76afaab47e279ebf5ebacf510a1ad39cebc7f1abfda826bb9b5a6af9d4de9a02066f040affe33238aba40e875402a35aa819ab1f4895ebafe370bb3d32e7d74";
+      sha512 = "269217e4eddac4a29a4c3b045240b63cf623e276d6dfbf7d874ed732fb63748ab82072ca1a482012c8d25d5852ddd0b9bef8fa756723372d4be35ef4b067fca8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/en-US/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-US/thunderbird-52.3.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "09e72c7a26e52973bf63e18e8c85f49c0aed00a7b4ea238bcb82c55964a019965cc24f5e71d3a7ab6f5d8f288a64609ce15bb584a2fddc08aea03ff5e6d071b3";
+      sha512 = "c436d084accd3b195f9dd0b9c96d9e45ecaec730bf5a35e35db65c7ef6328383fa82ebeb3b143f2c92bfbcb3f7983f451e35e68443f6fe24fc43baf686610207";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/es-AR/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-AR/thunderbird-52.3.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "412cf566707a02d62cc8a60d65a1974c608eaaf4ed666830facf137f7611a0346319a2cb560ae04742bffe776299facb7ea214e637248774bf406d5e7aab08ba";
+      sha512 = "8d6491206cc1bb41132da43eb812d1f548e7ff8414b7644809d2f42819b94c583793baafc94815b70345b43c2ad3922c5d116379a6fe0c85e1c09c7cf7431067";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/es-ES/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-ES/thunderbird-52.3.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "a56988ffdae668c2321f999b0cebf8008bbddbfc3469f053135d848d4cbfaccfac75ae2db325b6a080eacdb8ede5dc91e8c2fa2be255b2e72c3a47c761e63f02";
+      sha512 = "21ffc568d5aaf6ff9188846c9b6ab0483831d5c6db84c0504cbe95a5ccc2dee3ae4a8df2ddbf81a9a02c328fbf452d569cfae5f0b85f029bd62836795db41e0c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/et/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/et/thunderbird-52.3.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "0df3306cebff726d26cd3b46e8ef14ccbe730ff2002b80c463185c6fa1b491eec1c3262dc792db8fd96da2b4394e00ed8abe21700f85cf2f969dc8bc9b548421";
+      sha512 = "aa73dd4e5cc8ba643584b88fef3accd56b71b030a91035aca342ce4281b79372af8ee9a67a9fdb9eec2b869d0d9815f00a40e1ca6988b71f174b6e0412a31d40";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/eu/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/eu/thunderbird-52.3.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "ddf6542c17196aa7877409a4e37948eb351ea4fa7e10dfae21e4b8c21aa92b8bb3065c504b526784efcaa41c621889bc5ecebe4cf95ff56b0f2788d3b5cb7190";
+      sha512 = "53f6223554a11340ff5f435438e31406682bb5364bd4cc69a9909b42293095fb4a040882cc038d95ca8ea3b85dbaef31d6e6a3ce5de58e99fb5a5b7427501052";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fi/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fi/thunderbird-52.3.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "e86c14d4416939cd04d2a23849afc3cb991c352b9bdc3ecbc8f83aaa14360b30c706aa74ffbfef2bd369f62610c057232ec9e621871010d187965c177ed06e85";
+      sha512 = "eb143cc250bca4043476764e08ad1d7d8020318db832a4be7577036be2ec933518c5c2c9ceb2cb3c11d5e402aaf9ba41e251b95f505c6eca63cd28d52bec7ebf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fr/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fr/thunderbird-52.3.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b0fdd4da60b3278e4639a17e896d1c817ab80a44207edf21845614a8c32c70bc2094184e8d90e1b831a3516dd5b18088f21a35b09e9e8c52d72ee41764bb45d2";
+      sha512 = "16bed03812d5a4163a5d52e35ab1b9b8d91be8d772929730cd5dc92bfc62139d0778526e6e9d88d40ddb981020f6b02a19915f5dfd8993f0f477589a873c2435";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fy-NL/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fy-NL/thunderbird-52.3.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "b314386f0cf27ee7f46f703c50eec9bbd879e0bc6c304c07f75f2b1455bb29c067c9c3c3d168fe3986f3018c406cf10815edde01a74764aa6d3f48a3999ff409";
+      sha512 = "3c1093eab90febc62ddbd69cdeb559fc95fa6b2e67893b2d9e8ee38e67387825cfd0b50475268b7b489ad69c80f2667abbbc4cc5be3a2b81747b5858d5cf0126";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ga-IE/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ga-IE/thunderbird-52.3.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "0dafbe71c9f8da9bb6b2c2ea29498a9e6f120e59d6f352d96c89a2e3c5ea1b2b072e91943490320ba52e070fe5b2a39332945edf34c729b672a83a2afe16a86c";
+      sha512 = "153dc5005e913f36dbe1840d46a91d235207fc393a7f8f294518f1095ff590f706ff7015c823dda5da6e200a43b2f278c93f910d97517452eaab972ccedc6bef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/gd/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gd/thunderbird-52.3.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "50809368c1fdde1181e163c9d77c79191454a68d0ebf4429d52c4e95ebf651adbfb7769b07ba4e3b365312ff12ed2fbb96be60dc3d90c6b8fc6fe35f3ea8c1de";
+      sha512 = "253a9cecce89ffdd771c70b06d23216046689a0a8e70dd922328590a4a39137d93919b4052c7e928b180f2c8fe088199583c67f96602e9de150927ea08be65b4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/gl/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gl/thunderbird-52.3.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "f08d5bf61cca0e2fce5894619736a267be1851e8ad66fe2800b7a1dea2d847300bfa434c9dd539eaf966a63ee32a383cdede9029ce71758fb88e3fa6b35670d7";
+      sha512 = "b77978888a918d297419897f008f0fe05a09903d7a0364c43b20adcad883f926a9c51af3e7132825bf19dd487d7058c83209112d5ebb09f202c49a5c8e126f58";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/he/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/he/thunderbird-52.3.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "0a0a502e8da5945057c30f5a3de0fb623111e48d585cb7707addf0ea608e8683a882c0525e19ef4300f3d827e8d7989f09ff643955b3dc9379fcd6506e1415f9";
+      sha512 = "56f1b9204c0ad5251011abf388cd3ed95b2e6cbddbb7993f967c68c8f8258c3695550025f437ddc3db455c3cbf0efbe146d0612bc40d8ad3a3482648c4bace46";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hr/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hr/thunderbird-52.3.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "954cc5c1f3687945c6a66698ddb45ce74731bdc72f34b9ed874883b732149ad9a50773acfa1f19eec16840be3aeeec7d37ca140158def750c68d7ef6d5a2ffd4";
+      sha512 = "c225c39f93bd12f822fdb523bdce20ca64266d81f007acba861466d61d155bded183e305bbb829aafdd0b64cc10d6d7054752bc3e99286b90a29864425cdf6b7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hsb/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hsb/thunderbird-52.3.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "15b7f0ae3741e6578e492b14ba3e43dd60e6d9f3768053cb43cd88d91d40fa247b6035b9746c173d272f752d86da2f5778779b3e3677792b976da68ff460c542";
+      sha512 = "b7c85448a5dbc2f820d866d8e307e8221ae58d66187ae259df3d93e761fa484e0c7909c61030682efa5817613104d88813c1fb7e7286d0d7c45f6ee9dc4c5ccc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hu/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hu/thunderbird-52.3.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "32938f7f6a4f2f611a6e057a5eef8a1af67eee710f8de6053d4c9d1ef9b92fef5af29dfcc3c37939811f07dbdf89c529a9481ef4823aacfab7fa753f47144a5b";
+      sha512 = "6291b35868569e924a3efa54abded62742d7212d4a7dc039e09baa00d77ab3595a22adb042be753b75c1ce50342c20781931e366fe2b73d4b598065fb02a1d0f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hy-AM/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hy-AM/thunderbird-52.3.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "0cceb38a1b6d679b3a5dfa63a44b90255a271ad0b9808d55408fb18cfa1e034b7010365b32a86cd72a29020fe211f404b7fc640f2b24428c3bc3945b4970ce8f";
+      sha512 = "ee0193ec3e1df85c3cfbc9118d479078ae3d61a70b36c582ea222338b49db4c5c2c8b0d10a0663154fdc465b23184e204b509734d2b55862c6075d1b48fd29d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/id/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/id/thunderbird-52.3.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "89b8172a07ae809b153ea6c48dca1bf0ae7fcbc7dea6e13b78bce99f2e84d6bb3d23e3d7955344e71c918b1c26729b920429c1efdb6a4bd5db1bb24001220ccd";
+      sha512 = "a882202254e23635dc51c10b332ae8953e61c6ffcdf42f9d5794cf3c2a7c665bb350171bda84da8388d2323b0359b1e0c3fd44a838c0979c35fa80387b312a21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/is/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/is/thunderbird-52.3.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "54875ec1b89501f52ad3525233ee8f7c9f50b1cf0b3061dc734a0733c0cf72c537f7279729b1c3afcfcdc411f708a519a4585877858c5c040e7455a0c5d30342";
+      sha512 = "69ad01aa6a7a84630bfaf10f4eda5b8d04af7bf5cba742943fb474ea32e926908db0f94877c1d6f9904063802dd9e219b20fbcf597aa291490726f15f6ca1379";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/it/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/it/thunderbird-52.3.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "4766a810c7c49049ff20e52045100ab4a46a687e37613cb6161e680cdffe6fce708251a830c2b38f9fa5e93d6c31c5afa0856a79a20a9ac972c1624e77da932e";
+      sha512 = "d9a1897dc1665d69868dcf0b5d4998316a76a721ca67c5729d0b5cf2a8de516d7ec1ff92a6db1cf29dabe6544ea10482dc8ec58740fab8ee704a98596c69573b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ja/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ja/thunderbird-52.3.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "ef031bb68f1edf02c43887ec3c7d092c43e3b0694b18951997a3e2356675e09cd1f6be12a33945f8ebf877678c86266e61e1d3802ffbb42c7a7d1c3832f25eed";
+      sha512 = "c9b7e197cf9fb00292b39a7769dd06be243d3ac46ed90f5db19b612823872bebc06b330eab087295a6d91edc48ed8c40af04ac69a0b5ead05a11ad960dc36aba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/kab/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/kab/thunderbird-52.3.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "6876c464c3e23640a3a03cc977b727fd1fea9925efacf9bb8a14afa575ef88041b85dc30569035fab700663eca1224928584b98b99735fdd6a68d9f00071e75a";
+      sha512 = "065d73e3cb20593a18a556535aba02ee5b01e5aa07c146a02a76130ab9474962fcbf56ed5f5733638e2c73af1cfcccf9684b6799a30112e8e6da32069bea87ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ko/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ko/thunderbird-52.3.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "0e2f64e9499d0cfc7597fe76214de6d9312804eaafdaef07d95e8ab84927db1d27232c9ac8b9283f24cf04e8bfac8667a253e7e229116e9241005ea433476019";
+      sha512 = "1260ecda4f82475857ac17c8e4825bb9e8aae458797a8fb92ce6fd90220dc2eafdc03447116f2063e5a66661a8869b10a4280bb481f3278b08e135466a0ab74b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/lt/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/lt/thunderbird-52.3.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "6e3c400dacb213a767699263a7106e08183d7c8b0fa06976ff5626aeb35be1d839a4383fb7cd61cf2437a1ab33e6315fdac8b921b2f0967bfd991a90ca2fe157";
+      sha512 = "3437bdfcd7ff3ed1f628558dfe34b82319fefb4f133062ffe8a04ddf1bb554b1d5ab881cc2a288cfe494c7e4520147bbf4c23fe38b7c0b0ddaae8a061d7ba839";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nb-NO/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nb-NO/thunderbird-52.3.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "dce647bac69f3d7d7bee0e3ef622eedc6f7d97adf991a244718f24d8ba2c33a75c470c05e95d66109535a832c65d6cd2c064157e4e9806e44cd0f6f950de6de6";
+      sha512 = "e321b1ce86913287ad239f235f97e481c1f1a26931da1f17ac4827767735208a31ac0c418301476551ad1c73781dbae890da15ebd8113a59d11e45359d592537";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nl/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nl/thunderbird-52.3.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "e797cf5d6300b6478435c554ed39d4d1ef5ff9a61cd47557a2db1766912f8da9b1e60599b66e35ca9138d3e04e234b2f443a675d0329639b21f37cd787faea4c";
+      sha512 = "656e6bec81d40f1dee9bd51d5313f6625485458f47c45a4f77b8f114df9463257765870982bf704f108f84df064d51a7c5c5500440e3b66a690b15d248977070";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nn-NO/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nn-NO/thunderbird-52.3.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "f30cf85b92a024a2c7133e97203c60ed18d2ddba2ddf081779962ea1af2be893cd820638b08dbbb09304ff1412df94a4dd5f6e9e05b49527a5d6d15011a4f024";
+      sha512 = "d7a460705e2debb51423612059425094e88a0ee552ce8b75097845763d4c65039fffabcba2f0d95bc655a84f3d1d1c7e1290905f56c5c8c461e14a9eaf87efc7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pa-IN/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pa-IN/thunderbird-52.3.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "b6256747abfe759c0c65a0dd3431e9e498339259caff450b0988e1936ce10e9f2f019a241b21d7f2c1e9911e4396a055ab9640fcfd9a22d5f520ed461d476411";
+      sha512 = "ab12d8a23b649b5fd7cc71caa71dc0cf15f4a5baab69be44ec71daa4f643a2f5dd83974d88e6d5deb06c9e89bb7f39af3940edd551588c28d42d1304bc092f53";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pl/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pl/thunderbird-52.3.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a6cd073fd83eb0a31e1cbcadd149e5c1be90e0bd8d890cde0ceec19bf4be15582fcceb5d6987c1682492a4e6370c215995c3ea49f3ae25529be6c5b1534c198b";
+      sha512 = "f85deb706d0ae38c53965951c09991bac85a05486b23e6c364871d9d68dab057b4ad963d4287bab4f1d6c3ba60841827ad6b1861c3dda15dbd29f42c9442dbf1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pt-BR/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-BR/thunderbird-52.3.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "016eeaa8804945f34a89d0fbb60133f1e0beca5c6ccd695201f09ab8fe529b85f98f0d992875ba8ce866d147ce9f92807773d44f9932ba1de73fdb1398fdece1";
+      sha512 = "a3e955d25fc48b8e2051a131c437b1075a773b69fbc17f4cbb8ff60548d47449be70e3aab97d569802c925ffb57462bd144f3eeb0cdde7b2508ecff536a9193f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pt-PT/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-PT/thunderbird-52.3.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "e76b5313089da90a6cb34190bd07e65cb7fda4a34ee0581009fcdf9d0135c42b698f2a6c575cc13e63d749ca0ee0f3485fb05308419b5f7e72c9a1ff89601a69";
+      sha512 = "051f55a3530c7d90a0f7791d6bf2ed1af015eb6813ffe3f1b43d7fd4da992c079bc6836e38eb027f7246aef7245f480e9300dfca9c512f55e62c3d851c7d9b16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/rm/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/rm/thunderbird-52.3.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "fcb0fc5ef00a370396f01bdb885f3bedd551344849f6eba53057506a573486af5ec781f2850aaf1e6fede9a3613c9c94629511c0a7d445565db8fe1cabcec29c";
+      sha512 = "f42c1f0cbd76b7425d986b26a1e2d0342c4c99c7d283bd2d6719179c5b14912853b7af20de214dcf06ef1f89bfa9d5a9eb0052effecab505738c80abf168b67b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ro/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ro/thunderbird-52.3.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "fafff899f366c17bc81b4432a4b1c6cae8fd6bff6c307bd377a314b9b4f520fbce4ba23b144a816d24fad65e90b33e17b25767c60f4ef10136dac6701f3d326f";
+      sha512 = "30cd95effe6597aeb0e686511a3b59f064269562337c924af06198600a9c19dee54931255cb9e5400e034de8d9c08f2e99943084ad9360eeedbd0615339df3fd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ru/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ru/thunderbird-52.3.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "0a0598479ced443e18d9b29bd0e0deca39176303f81e25999282af9fa1d67ffe5d0e66ad4f4461a24fbd94ca960876e2836ad2d69ba0fb4bbe81c1e471555625";
+      sha512 = "3e8a7501295ad1a41f3b79efaff4c76c25e5201f2ddfb02749ce950b66d81b8cfd870da2570eddf4381e8928a6a355dae06906043bc6912da23feda3706ac12d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/si/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/si/thunderbird-52.3.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "5aff4f01e7902140e817b206dd543a73b003a808bea448478918be7214de0601568151814baa96c4ae2ea193c76e7c8daa411f742b719df34dc275b4e9f8d52b";
+      sha512 = "ddaf492f1d6c219ff503fa50ae1f415c7d24dd6431cd55d02a222e5eec7265b80e96fcfb0ca38092e06aeea78f698ed5b229d8527785e90b49fed6ca69acb9a2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sk/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sk/thunderbird-52.3.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "560557b1662f58311a2ba694544a6b329a4fa709bc1702e12351c90b2647b974ffca4ac7c78e0c2430193cd6fcf194fb40f078c8c7c4cbb628e9b8e4a8abc37f";
+      sha512 = "dec6bfebf69c1db120ebee8b61cec49eb3c27209f9bbc0fd914c4f22956829cd9759f0671cd7b6ca24dda6598dd45791d566a55db5395cc089ea15696d791a3a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sl/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sl/thunderbird-52.3.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "c3689c69bad7cd2f8ae58e430de4141b593db86adfc58e1f4b65258aa2a74c68595bbdaa966437a732502aae8f8c6952e10a27e453e632e2a162457261426a55";
+      sha512 = "3fd4b5dcc631b65f0509272156be238d4c9f99835fb7d23730d99267351f9ac58d370cc95f3a4839bf0b1a45fc0fd34b1b6cdb9efa88b75f991aa5fedf74521f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sq/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sq/thunderbird-52.3.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "6ab246a7878e68204c2d4548a1583edb7293a7d7c671ad2be4767e098d7e5ab2308e5f5d8f02a7081bf6aead42207e88b16a38667ebde5f76bfb8fcf398545d3";
+      sha512 = "a72d7db408855d53eda896280a114dbe667a914a5c5d17da7a242697a44b974f54f0b02d0884150c1f27602296df17cadc96f4b27057ae094df9680d3b48f6bb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sr/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sr/thunderbird-52.3.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "923fd4d862bb8c363f20a5f05dc67a98de3266b961790299c667492c1c528b860524bf7197377c73f68c849dca8a96ac7adccfd32b0e9513d631550e786c43b6";
+      sha512 = "dbd9862ca22f038defb83b8df9cde748eaab1a4d68afbbbe6dfe45c73334616bf7f64536d6ab2d42166d1196e548acf697fa29a5d37184e9ccb198bc713ecae8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sv-SE/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sv-SE/thunderbird-52.3.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "81d7662ebaa211208f435b8d66a5766289ca9bc897c81aeef9666f10157a5c6b3cd5226585e144ceb2ac3a2ca9edb336e82e4b3d9097e4a4097e5b6de5626e1a";
+      sha512 = "7c3804d7681cffc6e979975a898b1cc2b1bac0d2e6a17058025629b8ad308cade808401f99e43cf0c1662a9597f2f6848d12839c3e1fe7606fca5926e6b484cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ta-LK/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ta-LK/thunderbird-52.3.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "dd8bd65fe029cb0fa7016119b354fc0e2d1a3bac2b89e899edcdc03e3514aad4ae91707f72d19156b1d24e778f0b7a54fbbdff049e553a3daeaf56c6486dec47";
+      sha512 = "38e8a0370c8ea7c7b7936da47dea583dbd282eb0cbe504337ac9e35efaf67cb1e6e9d7220efec243581d7a04a19e4f6f78892fd1a84461b30035d01ab225920a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/tr/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/tr/thunderbird-52.3.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "3a71dcf6e9562d2e196e7bd76c662f5181f11cc6cc121a1ed1724e13e5e897777f1c36a4eeef36bf8a606ab8f13fbe8c4b3b345e9c70f42f8c22155ac7da3963";
+      sha512 = "053e0e6e88c92c6c8d398cb8c38d8ce9b1340c4ff4455a7c4b1225090d5d10387b8b14e6f71dfee2a159329478cada995f05b75986c6a57d01ae7c1e1a65772b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/uk/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/uk/thunderbird-52.3.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "6094592ebae6b37073e7c15da36f5fd39ccbbfbc104dac8faea889ebf00f9c6e7cd5f0a2bbd54b53c0495a7166ed871b7aa4c3abe4b97827d15646b4d002b010";
+      sha512 = "98cabbbd8314ba80d74a0f3a9b17ee49aced8b5832f13e5b6060896dd9dee4abff8a15e1b509387254416f6e49652fcf797a1cb6934b7ae6f65909ba85a8e01d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/vi/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/vi/thunderbird-52.3.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "f96d09771ebd3ff63d35f95e42e77b2227c5b48a459f6e1e782a1259a845c2d6d819afb3a12333f19d5440cc6098db98b502514c5bb68c509a5a4778a5b88501";
+      sha512 = "2937330459ec576ba9678c465bd5aea7cb536002574a23e3043363d562bee2d1c58de1a6a73870ee27e363b9a64b82ae2a483dd21e3b6fc3b28bdda5d8c349f5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/zh-CN/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-CN/thunderbird-52.3.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "eba8d0ee4cc69f386dc114019501fac6b5ebeb3828755062167519ca062fa1e60d2327aec6db647459efd9ce83d31dbfeff28ea7821f52e9254de362a46ee472";
+      sha512 = "80e640c07514c215f170606353a97b058fe2b6b8f03adeb1526d3f5e237cfe71123b945b82b00726b00101a11a3207930af622775e4a0b5c5f9c464aca34aad0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/zh-TW/thunderbird-52.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-TW/thunderbird-52.3.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f0af41f4faa7259f6caa2a675e60880aea434b0f2bcbde3db00001c32362c001c92b10c14d06d1ea344390d16e20f87f0cb5a7e7ecfcfbb0b3ec1da9ece8f5dd";
+      sha512 = "9ea9bb1121f3f1731d3e1748af70ebce153a7cdf8bc44034928f618e21f2c1c1ac50f13f2e42d42e3105fbabe7cbb919bf785de032b615b2a1e732700c436ad9";
     }
     ];
 }

From 395d15eeb730af3aae323c59ce3ae070f9e5d007 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 17 Aug 2017 09:12:39 +0900
Subject: [PATCH 2157/3246] thunderbird: 52.2.1 -> 52.3.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 4374e51f6d1..51d90d11707 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.2.1";
+  version = "52.3.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "f30ba358b1bfc57265b26da3d2205a8a77c6cd1987278de40cde6c1c1241db3c2fedc60aebb6ff56ffb340492c5580294420158f4b7c4787f558e79f72e3d7fb";
+    sha512 = "10e6495d207328aae325a797be1de5e535b5d967df929b0af9d7554d0473b5a7931c8f9cb1793e843b1913f441f790169dd4ac1ad9e0e53e66bc8e1c1dd60e66";
   };
 
   # New sed no longer tolerates this mistake.

From 0f02879e010a1a091b00965ab9d31787f5fabc1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Sat, 12 Aug 2017 15:40:05 +0200
Subject: [PATCH 2158/3246] ipfs: added defaultMode, added norouting service

---
 .../services/network-filesystems/ipfs.nix     | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 10c1d751ac5..60822b5b547 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -49,6 +49,12 @@ in
         description = "The data dir for IPFS";
       };
 
+      defaultMode = mkOption {
+        description = "systemd service that is enabled by default";
+        type = types.enum [ "online" "offline" "norouting" ];
+        default = "online";
+      };
+
       autoMigrate = mkOption {
         type = types.bool;
         default = false;
@@ -147,10 +153,11 @@ in
     systemd.services.ipfs = {
       description = "IPFS Daemon";
 
-      wantedBy = [ "multi-user.target" ];
+      wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];
+
       after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
 
-      conflicts = [ "ipfs-offline.service" ];
+      conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
       wants = [ "ipfs-init.service" ];
 
       environment.IPFS_PATH = cfg.dataDir;
@@ -169,9 +176,11 @@ in
     systemd.services.ipfs-offline = {
       description = "IPFS Daemon (offline mode)";
 
+      wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ];
+
       after = [ "local-fs.target" "ipfs-init.service" ];
 
-      conflicts = [ "ipfs.service" ];
+      conflicts = [ "ipfs.service" "ipfs-norouting.service"];
       wants = [ "ipfs-init.service" ];
 
       environment.IPFS_PATH = cfg.dataDir;
@@ -186,5 +195,29 @@ in
         RestartSec = 1;
       };
     };
+
+    systemd.services.ipfs-norouting = {
+      description = "IPFS Daemon (no routing mode)";
+
+      wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ];
+
+      after = [ "local-fs.target" "ipfs-init.service" ];
+
+      conflicts = [ "ipfs.service" "ipfs-offline.service"];
+      wants = [ "ipfs-init.service" ];
+
+      environment.IPFS_PATH = cfg.dataDir;
+
+      path  = [ pkgs.ipfs ];
+
+      serviceConfig = {
+        ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --routing=none";
+        User = cfg.user;
+        Group = cfg.group;
+        Restart = "on-failure";
+        RestartSec = 1;
+      };
+    };
+
   };
 }

From 57ee7283d2ad14138e4ebb70977fb9f450273e1d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 17 Aug 2017 09:48:21 +0800
Subject: [PATCH 2159/3246] msgviewer: init at 1.9

---
 .../mailreaders/msgviewer/default.nix         | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++-
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/mailreaders/msgviewer/default.nix

diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
new file mode 100644
index 00000000000..741f89eef05
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, makeWrapper, writeScript, unzip, jre }:
+
+let
+  version = "1.9";
+  name = "msgviewer-${version}";
+  uname = "MSGViewer-${version}";
+
+in stdenv.mkDerivation rec {
+  inherit name;
+
+  src = fetchurl {
+    url    = "mirror://sourceforge/msgviewer/${uname}/${uname}.zip";
+    sha256 = "0igmr8c0757xsc94xlv2470zv2mz57zaj52dwr9wj8agmj23jbjz";
+  };
+
+  buildCommand = ''
+    dir=$out/lib/msgviewer
+    mkdir -p $out/bin $dir
+    unzip $src -d $dir
+    mv $dir/${uname}/* $dir
+    rmdir $dir/${uname}
+    cat <<_EOF > $out/bin/msgviewer
+#!${stdenv.shell} -eu
+${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar $@
+_EOF
+    chmod 755 $out/bin/msgviewer
+  '';
+
+  nativeBuildInputs = [ makeWrapper unzip ];
+
+  meta = with stdenv.lib; {
+    description = "Viewer for .msg files (MS Outlook)";
+    homepage    = https://www.washington.edu/alpine/;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8ca41e2237..ad3846470e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9654,7 +9654,7 @@ with pkgs;
   opencollada = callPackage ../development/libraries/opencollada { };
 
   opencore-amr = callPackage ../development/libraries/opencore-amr { };
-  
+
   opencsg = callPackage ../development/libraries/opencsg { };
 
   openct = callPackage ../development/libraries/openct { };
@@ -11366,7 +11366,7 @@ with pkgs;
   munin = callPackage ../servers/monitoring/munin { };
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
-  
+
   checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
 
   neo4j = callPackage ../servers/nosql/neo4j { };
@@ -13272,6 +13272,8 @@ with pkgs;
     tcl = tcl-8_5;
   };
 
+  msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
+
   amarok = kde4.callPackage ../applications/audio/amarok {
     ffmpeg = ffmpeg_2;
   };

From 676e90564f64c08e1fe654de830ee5bccd3d3986 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 17 Aug 2017 11:24:28 +0800
Subject: [PATCH 2160/3246] perlPackages.Carp: 1.36 -> 1.38

Version 1.36 is no longer available upstream.
---
 pkgs/top-level/perl-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8601f266186..13c0497d6db 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -946,15 +946,15 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Carp = buildPerlPackage {
-    name = "Carp-1.36";
+  Carp = buildPerlPackage rec {
+    name = "Carp-1.38";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Carp-1.36.tar.gz;
-      sha256 = "dcc789935126461c80df0653f98c1d8d0b936dcc3d04174287cb02767eca123c";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "00bijwwc0ix27h2ma3lvsf3b56biar96bl9dikxgx7cmpcycxad5";
     };
-    meta = {
+    meta = with stdenv.lib; {
       description = "Alternative warn and die for modules";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      license = with licenses; [ artistic1 gpl1Plus ];
     };
   };
 

From 824b8e4c6a2ac49dc9867dc9105372b15d5378f6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 17 Aug 2017 11:24:57 +0800
Subject: [PATCH 2161/3246] perlPackages.EmailOutlookMessage: init at 0.918

This tool is used for converting .msg files to .eml
---
 pkgs/top-level/perl-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 13c0497d6db..259bf8b7e47 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4667,6 +4667,26 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  EmailOutlookMessage = buildPerlPackage rec {
+    name = "Email-Outlook-Message-${version}";
+    version = "0.918";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MV/MVZ/${name}.tar.gz";
+      sha256 = "1w1s858xzp3vbi91qa01qnmk4n78fmvl4a7axrx2r15vr3s2k2pv";
+    };
+    propagatedBuildInputs = [
+      Carp Encode EmailMIME EmailMIMEContentType EmailSender
+      EmailSimple GetoptLong IOString OLEStorage_Lite PodUsage
+    ];
+    buildInputs = [ TestMore IOAll ];
+    meta = with stdenv.lib; {
+      homepage = http://www.matijs.net/software/msgconv/;
+      description = "Simply Sending Email";
+      license = licenses.perl;
+      maintainers = with maintainers; [ peterhoeg ];
+    };
+  };
+
   EmailSender = buildPerlPackage rec {
     name = "Email-Sender-1.300028";
     src = fetchurl {

From 39bf20e7a3d9828822fcb1c531c2abdb54dc7bd9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 7 Aug 2017 22:56:15 +0800
Subject: [PATCH 2162/3246] check-nwc-health and check-ups-health: init at
 20170804

---
 .../monitoring/plugins/labs_consol_de.nix     | 72 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/servers/monitoring/plugins/labs_consol_de.nix

diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
new file mode 100644
index 00000000000..441d9595bbd
--- /dev/null
+++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchFromGitHub, buildPerlPackage, autoreconfHook, makeWrapper
+, perl, NetSNMP, coreutils, gnused, gnugrep }:
+
+let
+  owner = "lausser";
+
+  glplugin = fetchFromGitHub {
+    repo   = "GLPlugin";
+    rev    = "b92a261ca4bf84e5b20d3025cc9a31ade03c474b";
+    sha256 = "0kflnmpjmklq8fy2vf2h8qyvaiznymdi09z2h5qscrfi51xc9gmh";
+    inherit owner;
+  };
+
+  generic = { pname, version, rev, sha256, description, ... } @ attrs:
+  let
+    attrs' = builtins.removeAttrs attrs [ "pname" "version" "rev" "sha256"];
+  in perl.stdenv.mkDerivation rec {
+    name = stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}-${version}";
+
+    src = fetchFromGitHub {
+      repo   = pname;
+      inherit owner rev sha256;
+    };
+
+    buildInputs = [ perl NetSNMP ];
+
+    nativeBuildInputs = [ autoreconfHook makeWrapper ];
+
+    prePatch = with stdenv.lib; ''
+      ln -s ${glplugin}/* GLPlugin
+      substituteInPlace plugins-scripts/Makefile.am \
+        --replace /bin/cat  ${getBin coreutils}/bin/cat \
+        --replace /bin/echo ${getBin coreutils}/bin/echo \
+        --replace /bin/grep ${getBin gnugrep}/bin/grep \
+        --replace /bin/sed  ${getBin gnused}/bin/sed
+    '';
+
+    postInstall = ''
+      test -d $out/libexec && ln -sr $out/libexec $out/bin
+    '';
+
+    postFixup = ''
+      for f in $out/bin/* ; do
+        wrapProgram $f --prefix PERL5LIB : $PERL5LIB
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      homepage   = https://labs.consol.de/;
+      license    = licenses.gpl2;
+      maintainer = with maintainers; [ peterhoeg ];
+      inherit description;
+    };
+  };
+
+in {
+  check-nwc-health = generic {
+    pname       = "check_nwc_health";
+    version     = "20170804";
+    rev         = "e959b412b5cf027c82a446668e026214fdcf8df3";
+    sha256      = "11l74xw62g15rqrbf9ff2bfd5iw159gwhhgbkxwdqi8sp9j6navk";
+    description = "Check plugin for network equipment.";
+  };
+
+  check-ups-health = generic {
+    pname       = "check_ups_health";
+    version     = "20170804";
+    rev         = "32a8a359ea46ec0d6f3b7aea19ddedaad63b04b9";
+    sha256      = "05na48dxfxrg0i9185j1ck2795p0rw1zwcs8ra0f14cm0qw0lp4l";
+    description = "Check plugin for UPSs.";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c26ba7c826..2dc4b9c0ee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11340,6 +11340,9 @@ with pkgs;
   munin = callPackage ../servers/monitoring/munin { };
 
   nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
+  inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; })
+    check-nwc-health
+    check-ups-health;
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 

From 6ddd4cec8051cfa02cca88b142c2a4eaf4499d7a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 7 Aug 2017 23:24:07 +0800
Subject: [PATCH 2163/3246] check-esxi-hardware: init at 20161013

---
 pkgs/servers/monitoring/plugins/esxi.nix | 37 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/servers/monitoring/plugins/esxi.nix

diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix
new file mode 100644
index 00000000000..312caab954b
--- /dev/null
+++ b/pkgs/servers/monitoring/plugins/esxi.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, python2Packages }:
+
+let
+  bName = "check_esxi_hardware";
+  pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] "${bName}";
+
+in python2Packages.buildPythonApplication rec {
+  name = "${pName}-${version}";
+  version = "20161013";
+
+  src = fetchFromGitHub {
+    owner  = "Napsty";
+    repo   = bName;
+    rev    = version;
+    sha256 = "19zybcg62dqcinixnp1p8zw916x3w7xvy6dlsmn347iigfa5s55s";
+  };
+
+  dontBuild = true;
+  doCheck = false;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 -t $out/bin                ${bName}.py
+    install -Dm644 -t $out/share/doc/${pName} README.md
+
+    runHook postInstall
+  '';
+
+  propagatedBuildInputs = with python2Packages; [ pywbem ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.claudiokuenzler.com/nagios-plugins/;
+    license = licenses.gpl2;
+    maintainer = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dc4b9c0ee7..c2ad6955a4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11346,6 +11346,8 @@ with pkgs;
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 
+  check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {};
+
   net_snmp = callPackage ../servers/monitoring/net-snmp {
     # https://sourceforge.net/p/net-snmp/bugs/2712/
     # remove after net-snmp > 5.7.3

From f49aa9029755bb0b0bd2a964528c7731b2d3f969 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 7 Aug 2017 22:56:54 +0800
Subject: [PATCH 2164/3246] monitoring-plugins: rename from
 nagiosPluginsOfficial

The upstream project has renamed itself.

We now stick this into a folder where we can keep other shared monitoring plugins.
---
 .../nagios/plugins/official-2.x.nix           | 36 ----------
 pkgs/servers/monitoring/plugins/default.nix   | 71 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 74 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
 create mode 100644 pkgs/servers/monitoring/plugins/default.nix

diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
deleted file mode 100644
index 67c3954ef56..00000000000
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, openssh, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "nagios-plugins-${version}";
-  version = "2.2.0";
-
-  src = fetchurl {
-    url = "http://nagios-plugins.org/download/${name}.tar.gz";
-    sha256 = "074yia04py5y07sbgkvri10dv8nf41kqq1x6kmwqcix5vvm9qyy3";
-  };
-
-  # !!! Awful hack. Grrr... this of course only works on NixOS.
-  # Anyway the check that configure performs to figure out the ping
-  # syntax is totally impure, because it runs an actual ping to
-  # localhost (which won't work for ping6 if IPv6 support isn't
-  # configured on the build machine).
-  preConfigure= "
-    configureFlagsArray=(
-      --with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s'
-      --with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s'
-    )
-  ";
-
-  postInstall = "ln -s libexec $out/bin";
-
-  # !!! make openssh a runtime dependency only
-  buildInputs = [ openssh openssl ];
-
-  meta = {
-    description = "Official plugins for Nagios";
-    homepage    = http://www.nagios.org/download/plugins;
-    license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ];
-  };
-}
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix
new file mode 100644
index 00000000000..808257ca121
--- /dev/null
+++ b/pkgs/servers/monitoring/plugins/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchFromGitHub, autoreconfHook
+, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl }:
+
+with stdenv.lib;
+
+let
+  majorVersion = "2.2";
+  minorVersion = ".0";
+
+  binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp ];
+
+in stdenv.mkDerivation rec {
+  name = "monitoring-plugins-${majorVersion}${minorVersion}";
+
+  src = fetchFromGitHub {
+    owner  = "monitoring-plugins";
+    repo   = "monitoring-plugins";
+    rev    = "v${majorVersion}";
+    sha256 = "1pw7i6d2cnb5nxi2lbkwps2qzz04j9zd86fzpv9ka896b4aqrwv1";
+  };
+
+  # !!! Awful hack. Grrr... this of course only works on NixOS.
+  # Anyway the check that configure performs to figure out the ping
+  # syntax is totally impure, because it runs an actual ping to
+  # localhost (which won't work for ping6 if IPv6 support isn't
+  # configured on the build machine).
+  preConfigure= ''
+    substituteInPlace po/Makefile.in.in \
+      --replace /bin/sh ${stdenv.shell}
+
+    sed -i configure.ac \
+      -e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"\$out/bin:/run/wrappers/bin:${binPath}\"|'
+
+    configureFlagsArray=(
+      --with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s'
+      --with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s'
+    )
+  '';
+
+  # !!! make openssh a runtime dependency only
+  buildInputs = [ net_snmp openssh openssl perl ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
+  # For unknown reasons the installer tries executing $out/share and fails if
+  # it doesn't succeed.
+  # So we create it and remove it again later.
+  preBuild = ''
+    mkdir -p $out
+    cat <<_EOF > $out/share
+#!${stdenv.shell}
+exit 0
+_EOF
+    chmod 755 $out/share
+  '';
+
+  postInstall = ''
+    rm $out/share
+    ln -s libexec $out/bin
+  '';
+
+  meta = {
+    description = "Official monitoring plugins for Nagios/Ichinga/Sensu and others.";
+    homepage    = https://www.monitoring-plugins.org;
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice relrod ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2ad6955a4e..2bf6c719145 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11339,7 +11339,9 @@ with pkgs;
 
   munin = callPackage ../servers/monitoring/munin { };
 
-  nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
+  monitoring-plugins = callPackage ../servers/monitoring/plugins { };
+  nagiosPluginsOfficial = monitoring-plugins;
+
   inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; })
     check-nwc-health
     check-ups-health;

From b6941c45009b5e02d2de7a89d3319df03d11ecf8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 7 Aug 2017 23:23:48 +0800
Subject: [PATCH 2165/3246] pywbem: init at 0.10.0

---
 .../python-modules/pywbem/default.nix         | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/pywbem/default.nix

diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
new file mode 100644
index 00000000000..b728d4f6b94
--- /dev/null
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
+, m2crypto, ply, pyyaml, six
+, httpretty, lxml, mock, pytest, requests
+}:
+
+buildPythonPackage rec {
+  name  = "pywbem-${version}";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner  = "pywbem";
+    repo   = "pywbem";
+    rev    = "v${version}";
+    sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym";
+  };
+
+  propagatedBuildInputs = [ m2crypto ply pyyaml six ];
+
+  checkInputs = [ httpretty lxml mock pytest requests ];
+
+  # 1 test fails because it doesn't like running in our sandbox. Deleting the
+  # whole file is admittedly a little heavy-handed but at least the vast
+  # majority of tests are run.
+  checkPhase = ''
+    rm testsuite/testclient/networkerror.yaml
+
+    substituteInPlace makefile \
+      --replace "PYTHONPATH=." "" \
+      --replace '--cov $(package_name) --cov-config coveragerc' ""
+
+    for f in testsuite/test_cim_xml.py testsuite/validate.py ; do
+      substituteInPlace $f --replace "'xmllint" "'${stdenv.lib.getBin libxml2}/bin/xmllint"
+    done
+
+    make PATH=$PATH:${stdenv.lib.getBin libxml2}/bin test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Support for the WBEM standard for systems management.";
+    homepage = http://pywbem.github.io/pywbem/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a817b75292..6aca05cf2c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29464,6 +29464,9 @@ EOF
     };
   };
 
+  # We need "normal" libxml2 and not the python package by the same name.
+  pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };
+
   unicorn = buildPythonPackage rec {
     name  = "unicorn-${version}";
     version = "1.0.1";

From 1f9d9deb8aaa25225d2e171381ad4ddca85e4a12 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 16 Aug 2017 15:10:09 +0200
Subject: [PATCH 2166/3246] libxslt: Patch for CVE-2017-5029

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

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 118b8af5a6f..07f96fad33e 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -17,7 +17,14 @@ stdenv.mkDerivation rec {
     sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm";
   };
 
-  patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch;
+  patches = [
+    (fetchpatch {
+      name = "CVE-2017-5029";
+      url = "https://git.gnome.org/browse/libxslt/"
+        + "patch/?id=08ab2774b870de1c7b5a48693df75e8154addae5";
+      sha256 = "10azfmyffjf9d7b5js4ipxw9f20qi0kw3zq34bpqmbcpq3l338ky";
+    })
+  ] ++ stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch;
 
   # fixes: can't build x86_64-unknown-cygwin shared library unless -no-undefined is specified
   postPatch = optionalString hostPlatform.isCygwin ''

From 5f8a45c136ebb99283f2b9eb724835b22f6829be Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 16 Aug 2017 15:10:50 +0200
Subject: [PATCH 2167/3246] shadow: 4.4 -> 4.5

Fixes CVE-2017-12424
---
 pkgs/os-specific/linux/shadow/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 0c0edde05e2..64d7a694fc1 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -20,13 +20,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "shadow-${version}";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = "shadow";
     rev = "${version}";
-    sha256 = "005qk3n86chc8mlg86qhrns2kpl52n5f3las3m5s6266xij3qwka";
+    sha256 = "1aj7s2arnsfqf34ak40is2zmwm666l28pay6rv1ffx46j0wj4hws";
   };
 
   buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
@@ -37,10 +37,6 @@ stdenv.mkDerivation rec {
   patches =
     [ ./keep-path.patch
       dots_in_usernames
-      (fetchpatch {
-        url = https://github.com/shadow-maint/shadow/commit/507f96cdeb54079fb636c7ce21e371f7a16a520e.patch;
-        sha256 = "10k70fx3z051f83p1k7ljjaawbykhn7cy6fg1zy04jp3xkvdwxc7";
-      })
     ];
 
   # The nix daemon often forbids even creating set[ug]id files.

From 6502f59ae0b00666885e24b95f5eb22e656e3202 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 17 Aug 2017 20:02:02 +0800
Subject: [PATCH 2168/3246] perlPackages.EmailOutlookMessage: fix license and
 descripton

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 259bf8b7e47..4ecaf3e5246 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4681,8 +4681,8 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestMore IOAll ];
     meta = with stdenv.lib; {
       homepage = http://www.matijs.net/software/msgconv/;
-      description = "Simply Sending Email";
-      license = licenses.perl;
+      description = "A .MSG to mbox converter";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ peterhoeg ];
     };
   };

From 208ca7ad9697d75e3c03bf26e64056f7407eecf2 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Thu, 17 Aug 2017 14:10:47 +0200
Subject: [PATCH 2169/3246] solvespace: 2.3-20170416 -> 2.3-20170808

---
 pkgs/applications/graphics/solvespace/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index 9026fc5d7cb..f8db30675b1 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype
-, json_c, fontconfig, gtkmm2, pangomm, glew, mesa_glu, xlibs, pcre
+, json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre
 }:
 stdenv.mkDerivation rec {
-  name = "solvespace-2.3-20170416";
-  rev = "b1d87bf284b32e875c8edba592113e691ea10bcd";
+  name = "solvespace-2.3-20170808";
+  rev = "16540b1b2c540a4b44500ac02aaa4493bccfba7e";
   src = fetchgit {
     url = https://github.com/solvespace/solvespace;
     inherit rev;
-    sha256 = "160qam04pfrwkh9qskfmjkj01wrjwhl09xi6jjxi009yqg3cff9l";
+    sha256 = "1z10i21xf3yagd984lp1hwasnsizx2s3faq3wdzzjngrikr2zn70";
     fetchSubmodules = true;
   };
 
   buildInputs = [
     cmake pkgconfig zlib libpng cairo freetype
-    json_c fontconfig gtkmm2 pangomm glew mesa_glu
+    json_c fontconfig gtkmm3 pangomm glew mesa_glu
     xlibs.libpthreadstubs xlibs.libXdmcp pcre
   ];
   enableParallelBuilding = true;

From afc8405a7a3ca7386e5ef442ee06aaac1ef978fe Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 9 Aug 2017 14:34:43 +0000
Subject: [PATCH 2170/3246] dns-root-data: use https

---
 pkgs/data/misc/dns-root-data/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix
index 1786d877dbc..3d3bca29d15 100644
--- a/pkgs/data/misc/dns-root-data/default.nix
+++ b/pkgs/data/misc/dns-root-data/default.nix
@@ -3,7 +3,7 @@
 let
 
   rootHints = fetchurl {
-    url = "http://www.internic.net/domain/named.root";
+    url = "https://www.internic.net/domain/named.root";
     sha256 = "0qsyxpj5b3i7n162qfyv76ljqbvnwjii7jk8mpfinklx0sk01473";
   };
 

From b5af77004ad39ec7461e07c9eadec2d21f13f6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 17 Aug 2017 14:22:25 +0200
Subject: [PATCH 2171/3246] python3Packages.breathe: enable with python3

The tests don't work (not sure why), but sphinx seems to work OK.
---
 pkgs/development/python-modules/breathe/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 08d66e539ad..9f4d89da90c 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ docutils six sphinx ];
 
-  disabled = isPy3k;
+  doCheck = !isPy3k;
 
   meta = {
     homepage = https://github.com/michaeljones/breathe;

From 612f8a5f3e27f5d2e6d515948dfb9dec0ec1444b Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Thu, 17 Aug 2017 16:29:44 +0200
Subject: [PATCH 2172/3246] tasksh: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index 333ed411941..8c7bd107c8a 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tasksh-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
     url = "http://taskwarrior.org/download/${name}.tar.gz";
-    sha256 = "0900nzfgvhcc106pl68d0v0qszvdc34yi59mw70b34b2gmkwdxzf";
+    sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf";
   };
 
   nativeBuildInputs = [ cmake ];

From 7326ab13a90565ff4e23fbcd5f092dd8cda275dc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Aug 2017 17:04:41 +0200
Subject: [PATCH 2173/3246] lispPackages: save more of the require cc-wrapper
 environment

---
 pkgs/development/lisp-modules/define-package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 83bbdf3b8f9..2af5530aa5c 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -20,6 +20,7 @@ let
     echo "export NIX_LDFLAGS='$NIX_LDFLAGS'\"\''${NIX_LDFLAGS:+ \$NIX_LDFLAGS}\"" >> "$config_script"
     echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script"
     echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script"
+    set | grep NIX_CC_WRAPPER_ | sed -e 's@^NIX_CC_WRAPPER@export &@' >> "$config_script"
     echo "export PATH=\"\''${PATH:+\$PATH:}$PATH\"" >> "$config_script"
     echo "echo \"\$ASDF_OUTPUT_TRANSLATIONS\" | grep -E '(^|:)$store_translation(:|\$)' >/dev/null || export ASDF_OUTPUT_TRANSLATIONS=\"\''${ASDF_OUTPUT_TRANSLATIONS:+\$ASDF_OUTPUT_TRANSLATIONS:}\"'$store_translation'" >> "$config_script"
     echo "source '$path_config_script'" >> "$config_script"

From a13e4ad1f59d1e40f8d1b8ab259e5f5fec7d00a7 Mon Sep 17 00:00:00 2001
From: Ryan Bernstein <ryanbernstein1@gmail.com>
Date: Thu, 17 Aug 2017 11:17:30 -0400
Subject: [PATCH 2174/3246] poretools: init at 0.6.0

---
 .../science/biology/poretools/default.nix     | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100755 pkgs/applications/science/biology/poretools/default.nix

diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix
new file mode 100755
index 00000000000..520c508e2ac
--- /dev/null
+++ b/pkgs/applications/science/biology/poretools/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonPackage rec {
+  pname = "poretools";
+  version = "0.6.0";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "arq5x";
+    rev = "e426b1f09e86ac259a00c261c79df91510777407";
+    sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am";
+  };
+
+  propagatedBuildInputs = [pythonPackages.h5py pythonPackages.matplotlib pythonPackages.seaborn pythonPackages.pandas];
+
+  meta = {
+    description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore";
+    license = stdenv.lib.licenses.mit;
+    homepage = http://poretools.readthedocs.io/en/latest/;
+    maintainers = [stdenv.lib.maintainers.rybern];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 342a3b620d5..74bb19dee48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3827,6 +3827,8 @@ with pkgs;
 
   popfile = callPackage ../tools/text/popfile { };
 
+  poretools = callPackage ../applications/science/biology/poretools { };
+
   postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { };
 
   povray = callPackage ../tools/graphics/povray { };

From 0fb920b4749f6bc3b0ed718bce860eb442920516 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 17 Aug 2017 12:11:02 -0300
Subject: [PATCH 2175/3246] efl: add version 1.20.2

- Add the new version 1.20.2.

- Keep version 1.19.1 for now because ephoto still needs it. As soon
  as a new release o ephoto which works with efl-1.20.x is availaible,
  efl-1.19.x may be removed.
---
 pkgs/desktops/enlightenment/default.nix | 3 ++-
 pkgs/desktops/enlightenment/efl.nix     | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index a8b5e08abd6..c132f565632 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -2,6 +2,7 @@
 rec {
   #### CORE EFL
   efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
+  efl_1_19 = callPackage ./efl.nix { eflVersion = "1.19.1"; openjpeg = pkgs.openjpeg_1; };
 
   #### WINDOW MANAGER
   enlightenment = callPackage ./enlightenment.nix { };
@@ -10,5 +11,5 @@ rec {
   econnman = callPackage ./econnman.nix { };
   terminology = callPackage ./terminology.nix { };
   rage = callPackage ./rage.nix { };
-  ephoto = callPackage ./ephoto.nix { };
+  ephoto = callPackage ./ephoto.nix { efl = efl_1_19; };
 }
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index e9302fca674..00980d4a94d 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -4,15 +4,20 @@
 , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
 , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
 , curl, libinput, systemd, writeText
+# Support more than one version because for now ephoto does not work with efl-1.20.x
+, eflVersion ? "1.20.2"
 }:
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.19.1";
+  version = eflVersion;
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "0fndwraca9rg0bz3al4isdprvyw56szr88qiyvglb4j8ygsylscc";
+    sha256 = {
+      "1.19.1" = "0fndwraca9rg0bz3al4isdprvyw56szr88qiyvglb4j8ygsylscc";
+      "1.20.2" = "0zll6k4xbbdsxqg53g8jddgv889g5m1xh20i03iz5a52y2bcnh55";
+    }.${version};
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e78a08be8b443e9e18784b9165aa37a1a03bb162 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 17 Aug 2017 12:12:28 -0300
Subject: [PATCH 2176/3246] enlightenment: 0.21.8 -> 0.21.9

---
 pkgs/desktops/enlightenment/enlightenment.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 968cf8baf6a..7976176af1b 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, efl, xcbutilkeysyms, libXrandr, libXdmcp,
 libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap,
-mesa_glu , xkeyboard_config }:
+mesa_glu, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.21.8";
+  version = "0.21.9";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "0cjjiip12hd8bfjl9ccl3vzl81pxh1wpymxk2yvrzf6ap5girhps";
+    sha256 = "0w5f3707hyfc20i6xqh4jlr5p2yhy1z794061mjsz2rp4w00qmpb";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 0fe0d7c6204d795f73f58c511214f3775ec5e3aa Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 17 Aug 2017 12:12:53 -0300
Subject: [PATCH 2177/3246] pythonefl: 1.19.1 -> 1.20.0

- Update to version 1.20.0.

- The hardening checking -Werror=format-string does not work with
  python-efl, so disable it.
---
 pkgs/top-level/python-packages.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df15a5c207d..19ce8940735 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26490,12 +26490,14 @@ EOF
   # Should be bumped along with EFL!
   pythonefl = buildPythonPackage rec {
     name = "python-efl-${version}";
-    version = "1.19.0";
+    version = "1.20.0";
     src = pkgs.fetchurl {
       url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
-      sha256 = "105qykdd04mlyzwzyscw6mlc7ajl4wbwhq87ncy1jvw8jjh6jads";
+      sha256 = "18qfqdkkjydqjk0nxs7wnnzdnqlbj3fhkjm0bbd927myzbihxpkh";
     };
 
+    hardeningDisable = [ "format" ];
+
     preConfigure = ''
       export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
     '';

From f660f58c83032022f9a8dd0646581f7601afe3bb Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 17 Aug 2017 00:59:11 +0300
Subject: [PATCH 2178/3246] Revert "binutils: add missing patches..."

This reverts commit ad83979e5986fa3bb0d254c2be9482c12a8743b9.

Downgrading to 2.28.1, 2.29 is too buggy.
---
 .../binutils/elf-check-orphan-input.patch     |  99 -----------
 .../binutils/elf-check-orphan-placement.patch | 161 ------------------
 2 files changed, 260 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch
 delete mode 100644 pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch

diff --git a/pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch b/pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch
deleted file mode 100644
index 2ec90128347..00000000000
--- a/pkgs/development/tools/misc/binutils/elf-check-orphan-input.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From a388b7afeffad6411686d39dc1c62294da48a814 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Wed, 2 Aug 2017 05:10:29 -0700
-Subject: [PATCH] Check ELF section header only for ELF output
-
-When placing an orphan input section, check ELF section header only for
-ELF output.
-
-	PR ld/21884
-	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Check
-	ELF section header only for ELF output.
-	* testsuite/ld-elf/pr21884.d: New test.
-	* testsuite/ld-elf/pr21884.t: Likewise.
-	* testsuite/ld-elf/pr21884a.s: Likewise.
-	* testsuite/ld-elf/pr21884b.s: Likewise.
-
-(cherry picked from commit db99ecc08f5b66fbe9cb72e90352c7f77ec71a6e)
----
- ld/ChangeLog                   | 10 ++++++++++
- ld/emultempl/elf32.em          |  3 ++-
- ld/testsuite/ld-elf/pr21884.d  | 11 +++++++++++
- ld/testsuite/ld-elf/pr21884.t  |  7 +++++++
- ld/testsuite/ld-elf/pr21884a.s |  5 +++++
- ld/testsuite/ld-elf/pr21884b.s |  5 +++++
- 6 files changed, 40 insertions(+), 1 deletion(-)
- create mode 100644 ld/testsuite/ld-elf/pr21884.d
- create mode 100644 ld/testsuite/ld-elf/pr21884.t
- create mode 100644 ld/testsuite/ld-elf/pr21884a.s
- create mode 100644 ld/testsuite/ld-elf/pr21884b.s
-
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index d2551b6..75ded12 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -2136,7 +2136,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
-     }
- 
-   /* Look through the script to see where to place this section.  */
--  if (constraint == 0)
-+  if (constraint == 0
-+      && link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour)
-     for (os = lang_output_section_find (secname);
- 	 os != NULL;
- 	 os = next_matching_output_section_statement (os, 0))
-diff --git a/ld/testsuite/ld-elf/pr21884.d b/ld/testsuite/ld-elf/pr21884.d
-new file mode 100644
-index 0000000..52cd2c1
---- /dev/null
-+++ b/ld/testsuite/ld-elf/pr21884.d
-@@ -0,0 +1,11 @@
-+#source: pr21884a.s
-+#source: pr21884b.s
-+#ld: -T pr21884.t
-+#objdump: -b binary -s
-+#notarget: aarch64*-*-* arm*-*-* nds32*-*-*
-+# Skip targets which can't change output format to binary.
-+
-+.*:     file format binary
-+
-+Contents of section .data:
-+#pass
-diff --git a/ld/testsuite/ld-elf/pr21884.t b/ld/testsuite/ld-elf/pr21884.t
-new file mode 100644
-index 0000000..d483911
---- /dev/null
-+++ b/ld/testsuite/ld-elf/pr21884.t
-@@ -0,0 +1,7 @@
-+OUTPUT_FORMAT("binary")
-+
-+ENTRY(_main);
-+SECTIONS {
-+	. = 0;
-+	.setup : { *(.setup) }
-+}
-diff --git a/ld/testsuite/ld-elf/pr21884a.s b/ld/testsuite/ld-elf/pr21884a.s
-new file mode 100644
-index 0000000..a3361b2
---- /dev/null
-+++ b/ld/testsuite/ld-elf/pr21884a.s
-@@ -0,0 +1,5 @@
-+	.text
-+	.globl	_main
-+	.type _main,%function
-+_main:
-+	.dc.a bar
-diff --git a/ld/testsuite/ld-elf/pr21884b.s b/ld/testsuite/ld-elf/pr21884b.s
-new file mode 100644
-index 0000000..e533837
---- /dev/null
-+++ b/ld/testsuite/ld-elf/pr21884b.s
-@@ -0,0 +1,5 @@
-+	.text
-+	.globl	bar
-+	.type bar,%function
-+bar:
-+	.byte 0
--- 
-2.9.3
-
diff --git a/pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch b/pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch
deleted file mode 100644
index 7e7566aec43..00000000000
--- a/pkgs/development/tools/misc/binutils/elf-check-orphan-placement.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 36088682f447540fd8666a2c437fa232064044a7 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Thu, 3 Aug 2017 14:01:34 +0930
-Subject: [PATCH] ELF checks for orphan placement
-
-The loop checking for previous orphan placement should run even when
-the output is non-ELF.
-
-	PR ld/21884
-	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Revert
-	last change.  Rename iself to elfinput.  Expand comments.  Condition
-	ELF checks on having both input and output ELF files.  Extract..
-	(elf_orphan_compatible): ..this new function.
----
- ld/ChangeLog          |  8 ++++++
- ld/emultempl/elf32.em | 76 +++++++++++++++++++++++++++++++--------------------
- 2 files changed, 55 insertions(+), 29 deletions(-)
-
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 75ded12..9ac1840 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -2008,6 +2008,29 @@ output_rel_find (asection *sec, int isdyn)
-   return last;
- }
- 
-+/* Return whether IN is suitable to be part of OUT.  */
-+
-+static bfd_boolean
-+elf_orphan_compatible (asection *in, asection *out)
-+{
-+  /* Non-zero sh_info implies a section with SHF_INFO_LINK with
-+     unknown semantics for the generic linker, or a SHT_REL/SHT_RELA
-+     section where sh_info specifies a symbol table.  (We won't see
-+     SHT_GROUP, SHT_SYMTAB or SHT_DYNSYM sections here.)  We clearly
-+     can't merge SHT_REL/SHT_RELA using differing symbol tables, and
-+     shouldn't merge sections with differing unknown semantics.  */
-+  if (elf_section_data (out)->this_hdr.sh_info
-+      != elf_section_data (in)->this_hdr.sh_info)
-+    return FALSE;
-+  /* We can't merge two sections with differing SHF_EXCLUDE when doing
-+     a relocatable link.  */
-+  if (bfd_link_relocatable (&link_info)
-+      && ((elf_section_flags (out) ^ elf_section_flags (in)) & SHF_EXCLUDE) != 0)
-+    return FALSE;
-+  return _bfd_elf_match_sections_by_type (link_info.output_bfd, out,
-+					  in->owner, in);
-+}
-+
- /* Place an orphan section.  We use this to put random SHF_ALLOC
-    sections in the right segment.  */
- 
-@@ -2064,8 +2087,9 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
-   lang_output_section_statement_type *os;
-   lang_output_section_statement_type *match_by_name = NULL;
-   int isdyn = 0;
--  int iself = s->owner->xvec->flavour == bfd_target_elf_flavour;
--  unsigned int sh_type = iself ? elf_section_type (s) : SHT_NULL;
-+  int elfinput = s->owner->xvec->flavour == bfd_target_elf_flavour;
-+  int elfoutput = link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour;
-+  unsigned int sh_type = elfinput ? elf_section_type (s) : SHT_NULL;
-   flagword flags;
-   asection *nexts;
- 
-@@ -2073,7 +2097,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
-       && link_info.combreloc
-       && (s->flags & SEC_ALLOC))
-     {
--      if (iself)
-+      if (elfinput)
- 	switch (sh_type)
- 	  {
- 	  case SHT_RELA:
-@@ -2095,6 +2119,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
-     }
- 
-   if (!bfd_link_relocatable (&link_info)
-+      && elfinput
-+      && elfoutput
-       && (s->flags & SEC_ALLOC) != 0
-       && (elf_section_flags (s) & SHF_GNU_MBIND) != 0)
-     {
-@@ -2135,9 +2161,11 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
- 	secname = ".mbind.text";
-     }
- 
--  /* Look through the script to see where to place this section.  */
--  if (constraint == 0
--      && link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour)
-+  /* Look through the script to see where to place this section.  The
-+     script includes entries added by previous lang_insert_orphan
-+     calls, so this loop puts multiple compatible orphans of the same
-+     name into a single output section.  */
-+  if (constraint == 0)
-     for (os = lang_output_section_find (secname);
- 	 os != NULL;
- 	 os = next_matching_output_section_statement (os, 0))
-@@ -2146,29 +2174,19 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
- 	   lang_insert_orphan to create a new output section.  */
- 	constraint = SPECIAL;
- 
--	/* SEC_EXCLUDE is cleared when doing a relocatable link.  But
--	   we can't merge 2 input sections with the same name when only
--	   one of them has SHF_EXCLUDE.  Don't merge 2 sections with
--	   different sh_info.  */
-+	/* Check to see if we already have an output section statement
-+	   with this name, and its bfd section has compatible flags.
-+	   If the section already exists but does not have any flags
-+	   set, then it has been created by the linker, possibly as a
-+	   result of a --section-start command line switch.  */
- 	if (os->bfd_section != NULL
--	    && (elf_section_data (os->bfd_section)->this_hdr.sh_info
--		== elf_section_data (s)->this_hdr.sh_info)
- 	    && (os->bfd_section->flags == 0
--		|| ((!bfd_link_relocatable (&link_info)
--		     || (iself && (((elf_section_flags (s)
--				     ^ elf_section_flags (os->bfd_section))
--				    & SHF_EXCLUDE) == 0)))
--		    && ((s->flags ^ os->bfd_section->flags)
-+		|| (((s->flags ^ os->bfd_section->flags)
- 		     & (SEC_LOAD | SEC_ALLOC)) == 0
--		    && _bfd_elf_match_sections_by_type (link_info.output_bfd,
--							os->bfd_section,
--							s->owner, s))))
-+		    && (!elfinput
-+			|| !elfoutput
-+			|| elf_orphan_compatible (s, os->bfd_section)))))
- 	  {
--	    /* We already have an output section statement with this
--	       name, and its bfd section has compatible flags.
--	       If the section already exists but does not have any flags
--	       set, then it has been created by the linker, probably as a
--	       result of a --section-start command line switch.  */
- 	    lang_add_section (&os->children, s, NULL, os);
- 	    return os;
- 	  }
-@@ -2244,8 +2262,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
-   else if ((flags & SEC_ALLOC) == 0)
-     ;
-   else if ((flags & SEC_LOAD) != 0
--	   && ((iself && sh_type == SHT_NOTE)
--	       || (!iself && CONST_STRNEQ (secname, ".note"))))
-+	   && ((elfinput && sh_type == SHT_NOTE)
-+	       || (!elfinput && CONST_STRNEQ (secname, ".note"))))
-     place = &hold[orphan_interp];
-   else if ((flags & (SEC_LOAD | SEC_HAS_CONTENTS | SEC_THREAD_LOCAL)) == 0)
-     place = &hold[orphan_bss];
-@@ -2255,8 +2273,8 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
-     place = &hold[orphan_tdata];
-   else if ((flags & SEC_READONLY) == 0)
-     place = &hold[orphan_data];
--  else if (((iself && (sh_type == SHT_RELA || sh_type == SHT_REL))
--	    || (!iself && CONST_STRNEQ (secname, ".rel")))
-+  else if (((elfinput && (sh_type == SHT_RELA || sh_type == SHT_REL))
-+	    || (!elfinput && CONST_STRNEQ (secname, ".rel")))
- 	   && (flags & SEC_LOAD) != 0)
-     place = &hold[orphan_rel];
-   else if ((flags & SEC_CODE) == 0)
--- 
-2.9.3
-

From 23547ac24a71699495d0e835f924872c17feeafe Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 17 Aug 2017 00:59:18 +0300
Subject: [PATCH 2179/3246] Revert "binutils: patch bugs in 2.29"

This reverts commit 0e18f28cecdc53191c6c9db1f4c86fe22b3bdfb5.

Downgrading to 2.28.1, 2.29 is too buggy.
---
 pkgs/development/tools/misc/binutils/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index dda2a78097a..5efe8be2c4d 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -45,15 +45,6 @@ stdenv.mkDerivation rec {
     # there) and causes a cycle between the lib and bin outputs, so
     # get rid of it.
     ./no-plugins.patch
-
-    # remove after 2.29.1/2.30
-    (fetchurl {
-      url = "https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=c6b78c965a96fb152fbd58926edccb5dee2707a5";
-      sha256 = "0rkbq5pf7ffgcggfk4czkxin1091bqjj92an9wxnqkgqwq6cx5yr";
-      name = "readelf-empty-sections.patch";
-    })
-    ./elf-check-orphan-input.patch
-    ./elf-check-orphan-placement.patch
   ];
 
   outputs = [ "out" ]

From f9b2d7b4ddf99a9ae23329b710f4d58cf6e93a61 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 17 Aug 2017 00:59:37 +0300
Subject: [PATCH 2180/3246] Revert "binutils: 2.28 -> 2.29"

This reverts commit 733e20fee4a6700510f71fbe1a58ac23ea202f6a.

Downgrading to 2.28.1, 2.29 is too buggy.
---
 .../glibc/avoid-semver-on-common.patch        | 65 -------------------
 pkgs/development/libraries/glibc/common.nix   |  3 -
 .../tools/misc/binutils/default.nix           |  4 +-
 3 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc/avoid-semver-on-common.patch

diff --git a/pkgs/development/libraries/glibc/avoid-semver-on-common.patch b/pkgs/development/libraries/glibc/avoid-semver-on-common.patch
deleted file mode 100644
index 966325d6f18..00000000000
--- a/pkgs/development/libraries/glibc/avoid-semver-on-common.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0edeadc0d396aa713b808ae50a0058aca5d3837e Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Wed, 26 Jul 2017 10:08:46 -0700
-Subject: [PATCH] Avoid .symver on common symbols [BZ #21666]
-
-The .symver directive on common symbol just creates a new common symbol,
-not an alias and the newer assembler with the bug fix for
-
-https://sourceware.org/bugzilla/show_bug.cgi?id=21661
-
-will issue an error.  Before the fix, we got
-
-$ readelf -sW libc.so | grep "loc[12s]"
-  5109: 00000000003a0608     8 OBJECT  LOCAL  DEFAULT   36 loc1
-  5188: 00000000003a0610     8 OBJECT  LOCAL  DEFAULT   36 loc2
-  5455: 00000000003a0618     8 OBJECT  LOCAL  DEFAULT   36 locs
-  6575: 00000000003a05f0     8 OBJECT  GLOBAL DEFAULT   36 locs@GLIBC_2.2.5
-  7156: 00000000003a05f8     8 OBJECT  GLOBAL DEFAULT   36 loc1@GLIBC_2.2.5
-  7312: 00000000003a0600     8 OBJECT  GLOBAL DEFAULT   36 loc2@GLIBC_2.2.5
-
-in libc.so.  The versioned loc1, loc2 and locs have the wrong addresses.
-After the fix, we got
-
-$ readelf -sW libc.so | grep "loc[12s]"
-  6570: 000000000039e3b8     8 OBJECT  GLOBAL DEFAULT   34 locs@GLIBC_2.2.5
-  7151: 000000000039e3c8     8 OBJECT  GLOBAL DEFAULT   34 loc1@GLIBC_2.2.5
-  7307: 000000000039e3c0     8 OBJECT  GLOBAL DEFAULT   34 loc2@GLIBC_2.2.5
-
-	[BZ #21666]
-	* misc/regexp.c (loc1): Add __attribute__ ((nocommon));
-	(loc2): Likewise.
-	(locs): Likewise.
-
-(cherry picked from commit 388b4f1a02f3a801965028bbfcd48d905638b797)
----
- ChangeLog     | 7 +++++++
- misc/regexp.c | 9 +++++----
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/misc/regexp.c b/misc/regexp.c
-index 19d76c0..eaea7c3 100644
---- a/misc/regexp.c
-+++ b/misc/regexp.c
-@@ -29,14 +29,15 @@
-
- #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
-
--/* Define the variables used for the interface.  */
--char *loc1;
--char *loc2;
-+/* Define the variables used for the interface.  Avoid .symver on common
-+   symbol, which just creates a new common symbol, not an alias.  */
-+char *loc1 __attribute__ ((nocommon));
-+char *loc2 __attribute__ ((nocommon));
- compat_symbol (libc, loc1, loc1, GLIBC_2_0);
- compat_symbol (libc, loc2, loc2, GLIBC_2_0);
-
- /* Although we do not support the use we define this variable as well.  */
--char *locs;
-+char *locs __attribute__ ((nocommon));
- compat_symbol (libc, locs, locs, GLIBC_2_0);
-
-
---
-2.9.3
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d1c5446e807..1b53acf12b1 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -64,9 +64,6 @@ stdenv.mkDerivation ({
       ./CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch
       ./CVE-2017-1000366-rtld-LD_PRELOAD.patch
       ./CVE-2017-1000366-rtld-LD_AUDIT.patch
-
-      /* https://sourceware.org/bugzilla/show_bug.cgi?id=21666 */
-      ./avoid-semver-on-common.patch
     ]
     ++ lib.optionals stdenv.isi686 [
       ./fix-i686-memchr.patch
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 5efe8be2c4d..d13ea9390da 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "2.29";
+  version = "2.28";
   basename = "binutils-${version}";
   inherit (stdenv.lib) optional optionals optionalString;
   # The prefix prepended to binary names to allow multiple binuntils on the
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
-    sha256 = "1gqfyksdnj3iir5gzyvlp785mnk60g1pll6zbzbslfchhr4rb8i9";
+    sha256 = "0wiasgns7i8km8nrxas265sh2dfpsw93b3qw195ipc90w4z475v2";
   };
 
   patches = [

From 390ccbbf29c161bc2b63dc7e144c872fbeb09e77 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 17 Aug 2017 01:02:35 +0300
Subject: [PATCH 2181/3246] binutils: 2.28 -> 2.28.1

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

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index d13ea9390da..d83a4a625a9 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "2.28";
+  version = "2.28.1";
   basename = "binutils-${version}";
   inherit (stdenv.lib) optional optionals optionalString;
   # The prefix prepended to binary names to allow multiple binuntils on the
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
-    sha256 = "0wiasgns7i8km8nrxas265sh2dfpsw93b3qw195ipc90w4z475v2";
+    sha256 = "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939";
   };
 
   patches = [

From d8bea2498d022adb183e57a035c91ed60b483b1f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 17 Aug 2017 01:09:51 +0300
Subject: [PATCH 2182/3246] binutils: Add upgrade notes

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

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index d83a4a625a9..390acab15b8 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -5,6 +5,9 @@
 }:
 
 let
+  # Note to whoever is upgrading this: 2.29 is broken.
+  # ('nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test' segfaults on aarch64)
+  # Also glibc might need patching, see commit 733e20fee4a6700510f71fbe1a58ac23ea202f6a.
   version = "2.28.1";
   basename = "binutils-${version}";
   inherit (stdenv.lib) optional optionals optionalString;

From 88efc22b44dedf423398491f9a55d1631b0b50ff Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 17 Aug 2017 18:24:07 +0300
Subject: [PATCH 2183/3246] binutils: Don't pass --host etc. when not
 cross-compiling

Or linuxHeaders build fails on ARM (non-cross) since e826a6a2477404:

````
  HOSTCC  scripts/basic/fixdep
/nix/store/9glws7v2j28blv1n7azqr3b43qadjd1j-binutils-2.28.1/bin/ld: unrecognised emulation mode: armelf_linux_eabi
Supported emulations: armelf_linux armelf armelfb armelfb_linux
collect2: error: ld returned 1 exit status
````
---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 390acab15b8..e02cf1667cd 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     else "-static-libgcc";
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = stdenv.lib.optionals (targetPlatform != hostPlatform) [ "build" "host" "target" ];
   configureFlags =
     [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"

From 37e73450d606b459c264c438fc905077c2dbe22e Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 17 Aug 2017 15:46:01 +0000
Subject: [PATCH 2184/3246] androidndk: wrap scripts in $out/libexec

---
 pkgs/development/mobile/androidenv/androidndk.nix     | 10 +++++-----
 pkgs/development/mobile/androidenv/androidndk_r8e.nix | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index c6ee22e4d3c..8ef58471d6a 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -64,6 +64,11 @@ stdenv.mkDerivation rec {
     sed -i -e ${sed_script_2} ndk-which
     # a bash script
     patchShebangs ndk-which
+    # wrap
+    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
+    do
+        wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
+    done
     # make some executables available in PATH
     mkdir -pv ${bin_path}
     for i in \
@@ -71,11 +76,6 @@ stdenv.mkDerivation rec {
     do
         ln -sf ${pkg_path}/$i ${bin_path}/$i
     done
-    # wrap
-    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
-    do
-        wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}"
-    done
   '';
 
     meta = {
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index 4239dc55e7c..ccf22d6b953 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -64,6 +64,11 @@ stdenv.mkDerivation rec {
     sed -i -e ${sed_script_2} ndk-which
     # a bash script
     patchShebangs ndk-which
+    # wrap
+    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
+    do
+        wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
+    done
     # make some executables available in PATH
     mkdir -pv ${bin_path}
     for i in \
@@ -71,10 +76,5 @@ stdenv.mkDerivation rec {
     do
         ln -sf ${pkg_path}/$i ${bin_path}/$i
     done
-    # wrap
-    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
-    do
-        wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}"
-    done
   '';
 }

From 31eea73f994b8cca50d3f88d6a4fadd98e09e798 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 17 Aug 2017 18:31:29 +0200
Subject: [PATCH 2185/3246] libsndfile: Security patches

Fixes CVE-2017-12562, CVE-2017-6892, CVE-2017-8361, CVE-2017-8363,
CVE-2017-8363, CVE-2017-8362
---
 .../libraries/libsndfile/default.nix          | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 180d217ddf1..597f74feb54 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -10,6 +10,29 @@ stdenv.mkDerivation rec {
     sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz";
   };
 
+  patches = [
+    # CVE-2017-12562
+    (fetchurl {
+       url = "https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8.patch";
+       sha256 = "1jg3wq30wdn9nv52mcyv6jyi4d80h4r1h9p96czcria7l91yh4sy";
+    })
+    # CVE-2017-6892
+    (fetchurl {
+       url = "https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748.patch";
+       sha256 = "05xkmz2ihc1zcj73sbmj1ikrv9qlcym2bkp1v6ak7w53ky619mwq";
+    })
+    # CVE-2017-8361, CVE-2017-8363, CVE-2017-8363
+    (fetchurl {
+       url = "https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3.patch";
+       sha256 = "0ccndnvjzx5fw18zvy03vnb29rr81h5vsh1m16msqbxk8ibndln2";
+    })
+    # CVE-2017-8362
+    (fetchurl {
+       url = "https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808.patch";
+       sha256 = "1xyv30ga71cpy4wx5f76sc4dma91la2lcc6s9f3pk9rndyi7gj9x";
+    })
+  ];
+
   buildInputs = [ pkgconfig flac libogg libvorbis ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];
 

From c47fcbf2938d113cfe903ebda5c6927f681027b4 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 17 Aug 2017 18:37:28 +0200
Subject: [PATCH 2186/3246] lynx: remove unwanted references to build-time only
 inputs

The binary embeds a listing of build-time dependencies derived from
config.cache.  Fix by nuking references in the derived header prior to
building.

Reduces size from ~102MB to ~51MB.
---
 .../applications/networking/browsers/lynx/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index bbf034a1342..aca0c735f0f 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -2,6 +2,7 @@
 , fetchurl, pkgconfig, ncurses, gzip
 , sslSupport ? true, openssl ? null
 , buildPlatform, hostPlatform
+, nukeReferences
 }:
 
 assert sslSupport -> openssl != null;
@@ -18,10 +19,18 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
 
   nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig
-    ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc
+    ++ [ nukeReferences ];
 
   buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;
 
+  # cfg_defs.h captures lots of references to build-only dependencies, derived
+  # from config.cache.
+  postConfigure = ''
+    make cfg_defs.h
+    nuke-refs cfg_defs.h
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://lynx.isc.org/;
     description = "A text-mode web browser";

From 7c09434756e99fa5fb2e8cfb2fd72a9172d7682a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 17 Aug 2017 18:45:07 +0200
Subject: [PATCH 2187/3246] lynx: enable pie

---
 pkgs/applications/networking/browsers/lynx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index aca0c735f0f..cb0adc71913 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a";
   };
 
+  hardeningEnable = [ "pie" ];
+
   configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
 
   nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig

From 21eade1b02a9db0c2901b2ef560f106fb84723aa Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 17 Aug 2017 18:45:14 +0200
Subject: [PATCH 2188/3246] lynx: enable parallel building

---
 pkgs/applications/networking/browsers/lynx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index cb0adc71913..58e4fd815fc 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a";
   };
 
+  enableParallelBuilding = true;
+
   hardeningEnable = [ "pie" ];
 
   configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";

From 6ebf2d4fc7496c18121c89e752f8780b218e683d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 17 Aug 2017 18:50:26 +0200
Subject: [PATCH 2189/3246] lynx: meta fixups

---
 pkgs/applications/networking/browsers/lynx/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 58e4fd815fc..ff09245ca51 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -36,8 +36,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://lynx.isc.org/;
     description = "A text-mode web browser";
+    homepage = http://lynx.invisible-island.net/;
+    license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
 }

From cc0434863b7cbbf21ee7b5c144f205835aeabb6e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 17 Aug 2017 18:50:50 +0200
Subject: [PATCH 2190/3246] lynx: 2.8.9dev.11 -> 2.8.9dev.16

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

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index ff09245ca51..0f6c4ed36d4 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -9,11 +9,11 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
   name = "lynx-${version}";
-  version = "2.8.9dev.11";
+  version = "2.8.9dev.16";
 
   src = fetchurl {
     url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2";
-    sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a";
+    sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84";
   };
 
   enableParallelBuilding = true;

From 261cbdbe194f9d80b8e6d710c21000ded15389cf Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 16 Aug 2017 22:35:06 +0200
Subject: [PATCH 2191/3246] gcc6: port darwin changes from 5.x

---
 pkgs/development/compilers/gcc/6/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index b091fd1ae37..71e2238a27f 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -226,6 +226,19 @@ stdenv.mkDerivation ({
 
   hardeningDisable = [ "format" ];
 
+  # This should kill all the stdinc frameworks that gcc and friends like to
+  # insert into default search paths.
+  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+    substituteInPlace gcc/config/darwin-c.c \
+      --replace 'if (stdinc)' 'if (0)'
+
+    substituteInPlace libgcc/config/t-slibgcc-darwin \
+      --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
+
+    substituteInPlace libgfortran/configure \
+      --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
+  '';
+
   postPatch =
     if (hostPlatform.isHurd
         || (libcCross != null                  # e.g., building `gcc.crossDrv'

From 1b89036cdf0f86e3166d85d10d83e81d5e6c6839 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 17 Aug 2017 19:17:26 +0200
Subject: [PATCH 2192/3246] gcc7: port darwin changes from 5.x

---
 pkgs/development/compilers/gcc/7/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 5d3126ea0e9..0ef71a636e2 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -228,6 +228,19 @@ stdenv.mkDerivation ({
 
   hardeningDisable = [ "format" ];
 
+  # This should kill all the stdinc frameworks that gcc and friends like to
+  # insert into default search paths.
+  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+    substituteInPlace gcc/config/darwin-c.c \
+      --replace 'if (stdinc)' 'if (0)'
+
+    substituteInPlace libgcc/config/t-slibgcc-darwin \
+      --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
+
+    substituteInPlace libgfortran/configure \
+      --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
+  '';
+
   postPatch =
     if (hostPlatform.isHurd
         || (libcCross != null                  # e.g., building `gcc.crossDrv'

From 4cce954c50f295af815d2966f0e5cf579657050d Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Thu, 17 Aug 2017 21:09:21 +0200
Subject: [PATCH 2193/3246] ttylog: fix typo in homepage

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

diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
index 99a648ef5bc..fa45b0f8bd2 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
-    homepage = http://ttylog.sourceforg.net;
+    homepage = http://ttylog.sourceforge.net;
     description = "Simple serial port logger";
     longDescription = ''
       A serial port logger which can be used to print everything to stdout

From 49c83c0e29b07d97833ffaa1750a86d0a03070dd Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 17 Aug 2017 21:21:26 +0200
Subject: [PATCH 2194/3246] nodePackages: regenerate with node2nix 1.3.0

---
 .../node-packages/composition-v4.nix          |    2 +-
 .../node-packages/composition-v6.nix          |    2 +-
 .../node-packages/node-packages-v4.nix        |  163 +--
 .../node-packages/node-packages-v6.nix        | 1281 +++++++++--------
 4 files changed, 745 insertions(+), 703 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index 8c4a5390f55..dc5899ebf1a 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.3.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index ea30c5b04c4..0c01a169af4 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.3.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index c8924937cac..e2d9b5c348e 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.3.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -73,7 +73,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
       };
     };
     "once-1.4.0" = {
@@ -640,7 +640,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
-        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
+        sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv";
       };
     };
     "xtend-4.0.1" = {
@@ -676,7 +676,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha1 = "893312af69b2123def71f57889001671eeb2c853";
+        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
       };
     };
     "string_decoder-1.0.3" = {
@@ -685,7 +685,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
+        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -793,7 +793,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
-        sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86";
+        sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9";
       };
     };
     "detect-file-0.1.0" = {
@@ -955,7 +955,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
+        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
       };
     };
     "expand-range-1.8.2" = {
@@ -1018,7 +1018,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
-        sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c";
+        sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg";
       };
     };
     "repeat-string-1.6.1" = {
@@ -1066,13 +1066,13 @@ let
         sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
       };
     };
-    "remove-trailing-separator-1.0.2" = {
+    "remove-trailing-separator-1.1.0" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz";
-        sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511";
+        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
+        sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
     "for-own-0.1.5" = {
@@ -1216,7 +1216,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
-        sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a";
+        sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -1252,7 +1252,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
+        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
       };
     };
     "object.defaults-1.1.0" = {
@@ -1711,7 +1711,7 @@ let
       version = "7.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
+        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
       };
     };
     "graceful-fs-4.1.11" = {
@@ -1729,7 +1729,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
+        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
       };
     };
     "osenv-0.1.4" = {
@@ -1837,7 +1837,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
-        sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1";
+        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
       };
     };
     "has-unicode-2.0.1" = {
@@ -1882,7 +1882,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
+        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
     "code-point-at-1.1.0" = {
@@ -2098,7 +2098,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
+        sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -2665,7 +2665,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
+        sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n";
       };
     };
     "read-pkg-up-1.0.1" = {
@@ -2728,7 +2728,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
+        sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3043,7 +3043,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz";
-        sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7";
+        sha512 = "2vbps6iw562i2zxd973z5mmbs8ggx3wbz4g1jqwvkjibiwrk9ym8bxcvvwnlmxqad92x120x5xz5nyfq68nd8akk355bkk0qjppzafp";
       };
     };
     "fresh-0.5.0" = {
@@ -3115,7 +3115,7 @@ let
       version = "6.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
-        sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49";
+        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
       };
     };
     "range-parser-1.2.0" = {
@@ -3340,7 +3340,7 @@ let
       version = "5.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
+        sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
       };
     };
     "tar-pack-3.4.0" = {
@@ -3502,7 +3502,7 @@ let
       version = "9.2.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
-        sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd";
+        sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642";
       };
     };
     "call-limit-1.1.0" = {
@@ -3601,7 +3601,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
-        sha1 = "08c4a452f789dcbac4c89a4563c902b2c862fd5b";
+        sha512 = "07r7qvmx5fjjk2ra3hjrz31ciy4vhfq2k8a3wjscjl7y52885zwfvz4caa5xr3kab8l3y4c9rsz1nkpjl530irrs6q5l3z6yadyj4c8";
       };
     };
     "iferr-0.1.5" = {
@@ -3637,7 +3637,7 @@ let
       version = "9.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz";
-        sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304";
+        sha512 = "0ki52cm2pf27r9pkpfbrx6y1myg7yx1mghwnvv6mw4kmgscif08qlj0xzlc88kpfl549xip4z1ap64s22l7v3q26ygz6x12cch87wsr";
       };
     };
     "lockfile-1.0.3" = {
@@ -3700,7 +3700,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz";
-        sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55";
+        sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb";
       };
     };
     "mississippi-1.3.0" = {
@@ -3754,7 +3754,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
+        sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
       };
     };
     "npm-registry-client-8.4.0" = {
@@ -3763,7 +3763,7 @@ let
       version = "8.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
-        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
+        sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx";
       };
     };
     "npm-user-validate-1.0.0" = {
@@ -3790,7 +3790,7 @@ let
       version = "2.7.38";
       src = fetchurl {
         url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz";
-        sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1";
+        sha512 = "0a0ar6lns179qdszia13prhj7gjpdjy334xafq791h48q00259lr6gpkzp17dagfcnff9pgcgxm7b68nidpj5qs0yah1v81fk4d84az";
       };
     };
     "path-is-inside-1.0.2" = {
@@ -3838,13 +3838,13 @@ let
         sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
       };
     };
-    "read-package-json-2.0.10" = {
+    "read-package-json-2.0.11" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.10";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.10.tgz";
-        sha1 = "dc0229f6dde6b4b705b39e25b2d970ebe95685ae";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.11.tgz";
+        sha512 = "1y74w8zm70x1zc7qgg6fxg72pb78dmafg2bf5x4gn1z8d4amjrw2q3d4j9035ginsrigk372scwj57p0ll5ck9yxdgnyjpzcd5fj7wy";
       };
     };
     "read-package-tree-5.1.6" = {
@@ -3853,7 +3853,7 @@ let
       version = "5.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
-        sha1 = "4f03e83d0486856fb60d97c94882841c2a7b1b7a";
+        sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l";
       };
     };
     "retry-0.10.1" = {
@@ -3907,7 +3907,7 @@ let
       version = "4.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
+        sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -3979,7 +3979,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz";
-        sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8";
+        sha512 = "0vh5z2d6q3zgf7j3g5ngyq4piqq1y613wacfyildfnm2c2klb4h2gw32grgk6pv9ssyiliyfvj4p4alpaa85cqcj2nznb4q0fv400dn";
       };
     };
     "write-file-atomic-2.1.0" = {
@@ -3988,7 +3988,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
+        sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni";
       };
     };
     "debuglog-1.0.1" = {
@@ -4150,7 +4150,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
+        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
       };
     };
     "read-pkg-up-2.0.0" = {
@@ -4186,7 +4186,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
+        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
       };
     };
     "which-module-2.0.0" = {
@@ -4447,7 +4447,7 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz";
-        sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd";
+        sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g";
       };
     };
     "end-of-stream-1.4.0" = {
@@ -4564,7 +4564,7 @@ let
       version = "2.4.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.13.tgz";
-        sha1 = "3139ba2f4230a8384e7ba394534816c872ecbf4b";
+        sha512 = "0j8sgm5sh7lb4mdpg52yz9rv0jpgkd3bf701i30gd5s3aqxb0i2lq8qm4bndqqfcb8jgiw8wj6dwpv2497khvxmmx3bfj0iad7aqw7g";
       };
     };
     "npm-pick-manifest-1.0.4" = {
@@ -4573,7 +4573,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8";
+        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
       };
     };
     "promise-retry-1.1.1" = {
@@ -4618,7 +4618,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
-        sha1 = "6d5de5829afd3be2712201a39275fd11c651857c";
+        sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -4645,16 +4645,16 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443";
+        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
       };
     };
-    "node-fetch-npm-2.0.1" = {
+    "node-fetch-npm-2.0.2" = {
       name = "node-fetch-npm";
       packageName = "node-fetch-npm";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.1.tgz";
-        sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465";
+        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz";
+        sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
       };
     };
     "socks-proxy-agent-3.0.0" = {
@@ -4663,7 +4663,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz";
-        sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245";
+        sha512 = "3zn9cz2ry5m1akapj7hvhgkxfq7ffwynia46lmwipsw2jk5sv8dvs32dc4hfx3xvp34i1jff1bg870a1xnknsgk5dl021jd4gwi75v0";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -4681,7 +4681,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
-        sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4";
+        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -4699,7 +4699,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
-        sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a";
+        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
       };
     };
     "encoding-0.1.12" = {
@@ -4711,13 +4711,13 @@ let
         sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
       };
     };
-    "json-parse-helpfulerror-1.0.3" = {
-      name = "json-parse-helpfulerror";
-      packageName = "json-parse-helpfulerror";
-      version = "1.0.3";
+    "json-parse-better-errors-1.0.1" = {
+      name = "json-parse-better-errors";
+      packageName = "json-parse-better-errors";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz";
-        sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc";
+        url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz";
+        sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967";
       };
     };
     "iconv-lite-0.4.18" = {
@@ -4726,16 +4726,7 @@ let
       version = "0.4.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
-        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
-      };
-    };
-    "jju-1.3.0" = {
-      name = "jju";
-      packageName = "jju";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz";
-        sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa";
+        sha512 = "2l97vd6kax8syr9aggcqhiyhd3b2rf506wdq6wapfrc74qwpdzqf2a3891kq9ri3g5sdzayph2sz4zkr8kbbps58z9h2lvpk115kgdj";
       };
     };
     "socks-1.1.10" = {
@@ -4852,7 +4843,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
-        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
+        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
       };
     };
     "import-lazy-2.1.0" = {
@@ -4915,7 +4906,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e";
+        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
       };
     };
     "cli-boxes-1.0.0" = {
@@ -4951,7 +4942,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88";
+        sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
     "supports-color-4.2.1" = {
@@ -4960,7 +4951,7 @@ let
       version = "4.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
-        sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836";
+        sha512 = "1ldz0jkrkclywnr7gwh85p6kljs5rm4jczbpj55vb9w5c81iyrf1ahgkw88nnzahgw2xvlg041vqk7gynxkwcqkzfagxjpphsrdh75b";
       };
     };
     "color-convert-1.9.0" = {
@@ -4996,7 +4987,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
+        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
       };
     };
     "make-dir-1.0.0" = {
@@ -5590,7 +5581,7 @@ let
       version = "2.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563";
+        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
       };
     };
     "is-my-json-valid-2.16.0" = {
@@ -5710,7 +5701,7 @@ in
     version = "1.12.7";
     src = fetchurl {
       url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
+      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -5973,7 +5964,7 @@ in
                   })
                   (sources."normalize-path-2.1.1" // {
                     dependencies = [
-                      sources."remove-trailing-separator-1.0.2"
+                      sources."remove-trailing-separator-1.1.0"
                     ];
                   })
                   (sources."object.omit-2.0.1" // {
@@ -7614,7 +7605,7 @@ in
     version = "5.3.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz";
-      sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17";
+      sha512 = "29izly6jqqdaslak9xz3i3bsr7qgg5vjcbzf55as0hh630z4aml48n5a7dz6skqn34d02fg3bk2zwkq7n67z787wn14vr3na9chx6v4";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -8031,18 +8022,14 @@ in
                   })
                 ];
               })
-              (sources."node-fetch-npm-2.0.1" // {
+              (sources."node-fetch-npm-2.0.2" // {
                 dependencies = [
                   (sources."encoding-0.1.12" // {
                     dependencies = [
                       sources."iconv-lite-0.4.18"
                     ];
                   })
-                  (sources."json-parse-helpfulerror-1.0.3" // {
-                    dependencies = [
-                      sources."jju-1.3.0"
-                    ];
-                  })
+                  sources."json-parse-better-errors-1.0.1"
                 ];
               })
               (sources."socks-proxy-agent-3.0.0" // {
@@ -8118,13 +8105,9 @@ in
           sources."util-extend-1.0.3"
         ];
       })
-      (sources."read-package-json-2.0.10" // {
+      (sources."read-package-json-2.0.11" // {
         dependencies = [
-          (sources."json-parse-helpfulerror-1.0.3" // {
-            dependencies = [
-              sources."jju-1.3.0"
-            ];
-          })
+          sources."json-parse-better-errors-1.0.1"
         ];
       })
       sources."read-package-tree-5.1.6"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index bff856d910d..da1d79e02ed 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.3.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -82,7 +82,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
-        sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86";
+        sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9";
       };
     };
     "global-paths-0.1.2" = {
@@ -424,7 +424,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
-        sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a";
+        sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -1162,7 +1162,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
+        sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
       };
     };
     "validator-5.2.0" = {
@@ -1270,7 +1270,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha1 = "893312af69b2123def71f57889001671eeb2c853";
+        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
       };
     };
     "buffer-equal-constant-time-1.0.1" = {
@@ -1615,13 +1615,13 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "@types/node-7.0.39" = {
+    "@types/node-7.0.42" = {
       name = "@types/node";
       packageName = "@types/node";
-      version = "7.0.39";
+      version = "7.0.42";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-7.0.39.tgz";
-        sha1 = "8aced4196387038113f6f9aa4014ab4c51edab3c";
+        url = "https://registry.npmjs.org/@types/node/-/node-7.0.42.tgz";
+        sha512 = "3qxigqldpssvqrmzvaq4zsshk19240ad5284716hgf2h1ibp97pbqcjxxpx1zc0kkcpx2vf2zf7mk5a3cdahhvxgabywkh8f94gcpvh";
       };
     };
     "@types/request-0.0.45" = {
@@ -1630,7 +1630,7 @@ let
       version = "0.0.45";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/request/-/request-0.0.45.tgz";
-        sha1 = "c6e52be8b108eb035c35aa9af56a38a260c3e7e6";
+        sha512 = "37apdgz29nhb3cpz9l2m1j1vj646727yzrk6ch66ji4yz0al4529gp3zlwdqcsi2w1kw43n2jsr2jq4vs9n7i4qgklrkwpr6h9130iq";
       };
     };
     "@types/uuid-2.0.30" = {
@@ -1639,7 +1639,7 @@ let
       version = "2.0.30";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz";
-        sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5";
+        sha512 = "117asm25fci0i0w2igvz0mxydd0m4vsz1l55kibx36d19j8md4s9fmvispcy83m7zlf9w9s4di7v0j8rawnyn67xci916gn0b88jr4y";
       };
     };
     "is-stream-1.1.0" = {
@@ -1657,7 +1657,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.0.tgz";
-        sha1 = "a98aac91dc99857b6af24caef7ca6df302f31565";
+        sha512 = "26fb719b154ab3x89bbgpp3fk4jcrfal0y909ik8zss3d8ykn1dsh9wm3q08j5pzpy3wvfy41h0yzfhbl7k3lb4zjqm9swwq8d4wvmy";
       };
     };
     "debug-0.7.4" = {
@@ -1774,7 +1774,7 @@ let
       version = "7.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
+        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -1801,7 +1801,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
       };
     };
     "once-1.4.0" = {
@@ -2089,7 +2089,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz";
-        sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d";
+        sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv";
       };
     };
     "lodash-4.17.4" = {
@@ -2116,7 +2116,7 @@ let
       version = "2.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563";
+        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
       };
     };
     "is-my-json-valid-2.16.0" = {
@@ -2512,7 +2512,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
-        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
+        sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv";
       };
     };
     "string_decoder-1.0.3" = {
@@ -2521,7 +2521,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
+        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
       };
     };
     "http-basic-2.5.1" = {
@@ -2539,7 +2539,7 @@ let
       version = "7.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
+        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
       };
     };
     "asap-2.0.6" = {
@@ -2665,7 +2665,7 @@ let
       version = "5.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
+        sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
       };
     };
     "temp-0.8.3" = {
@@ -2746,7 +2746,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz";
-        sha1 = "0b98e64ed82f5acf0f2931babf69212ef52ddd37";
+        sha512 = "0a77zmipy5silq8yx7adj0hw82ccvshbs5alv3h8l0vk83lkm5m7pw6y2781wnbks8h98ixyn2q3q065l6m8pwbrhxa3bcvrf191r5v";
       };
     };
     "meow-3.7.0" = {
@@ -2809,7 +2809,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
+        sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n";
       };
     };
     "object-assign-4.1.1" = {
@@ -2890,7 +2890,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
+        sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3250,7 +3250,7 @@ let
       version = "5.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer/-/buffer-5.0.7.tgz";
-        sha1 = "570a290b625cf2603290c1149223d27ccf04db97";
+        sha512 = "2p32xxvhb1b3dp3hjy1ga0iajddqfxqi25wx44lhd94jjry1g758zywadx6hq04c8zsrcnmjyjrlymxrfmgyxib837jd93rd1fqgrrm";
       };
     };
     "cached-path-relative-1.0.1" = {
@@ -3295,7 +3295,7 @@ let
       version = "3.11.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz";
-        sha1 = "948945efc6757a400d6e5e5af47194d10064279f";
+        sha512 = "2alsgx5iqvf0nr641lz4g24bpvfgv6lza2h9n34d24jhvs3s0dklnds2x2nzs2w9sfiadi6zy93c2szm5ajn50wwnb8dalf02bxkbim";
       };
     };
     "defined-1.0.0" = {
@@ -3484,7 +3484,7 @@ let
       version = "2.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz";
-        sha1 = "40a050ec8dc3b53b33d9909415c02c0bf1abfbad";
+        sha512 = "09n1hj53jy075fnbsaaiknry7in0l4yarh912abwgvk4hwl33lvn8wrfw891zg5bkfa7sxlmd5yz3xxd4dmcln19bnkahyvd87r6k3k";
       };
     };
     "subarg-1.0.0" = {
@@ -3646,7 +3646,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz";
-        sha1 = "a91947da1f4a516ea38e5b4ec0ec3773675e0886";
+        sha512 = "0dhi66vsajfcm04s11xqklh5lj3abs4ncnl8h3689964aqam3ps9spmc454hz94rz3x1x5l1ad03jrba67mq9zc9vq9a1gchma581bp";
       };
     };
     "ieee754-1.1.8" = {
@@ -3727,7 +3727,7 @@ let
       version = "3.0.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz";
-        sha1 = "c37d295531e786b1da3e3eadc840426accb0ae25";
+        sha512 = "3crgpf13g3zshm39jjfgnp4lfg5jilllwk6ixi07nzyf4yghmxrhrdmhsgr5jr855ma790a21hd4bcvpx8bv9h5irnk6xpy6728gl7r";
       };
     };
     "public-encrypt-4.0.0" = {
@@ -3745,7 +3745,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz";
-        sha1 = "dc009a246b8d09a177b4b7a0ae77bc570f4b1b79";
+        sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi";
       };
     };
     "browserify-aes-1.0.6" = {
@@ -3790,7 +3790,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
-        sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de";
+        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
       };
     };
     "des.js-1.0.0" = {
@@ -3817,7 +3817,7 @@ let
       version = "4.11.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
-        sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f";
+        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
       };
     };
     "browserify-rsa-4.0.1" = {
@@ -3862,7 +3862,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz";
-        sha1 = "340dedbe6290187151c1ea1d777a3448935df846";
+        sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx";
       };
     };
     "hmac-drbg-1.0.1" = {
@@ -4270,13 +4270,13 @@ let
         sha1 = "68261be4efb48840239b5791af23ee3b8bd79808";
       };
     };
-    "xml2js-0.4.17" = {
+    "xml2js-0.4.18" = {
       name = "xml2js";
       packageName = "xml2js";
-      version = "0.4.17";
+      version = "0.4.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz";
-        sha1 = "17be93eaae3f3b779359c795b419705a8817e868";
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.18.tgz";
+        sha512 = "2hgm5fp1zqiy89nn0i4j11j3h53h1hh0w2kbnfja16f8xbzkam62blrvz46xm8jnnaixwpxg8ydifvzmmyly0aml2c7k8gj1a9jvi9h";
       };
     };
     "xspfr-0.3.1" = {
@@ -4780,7 +4780,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz";
-        sha1 = "3e2ab0a464a803cc35d1357a1029d1cbd11dae37";
+        sha512 = "2shaz6cv4fgbmy1hq6hc59spkja51qg0vvx514r1nqsspdnsq6xzxabk0gs17x3n8s03y9mj8hx1xn5c0bkq9fvx59sxms2a4mlig9r";
       };
     };
     "simple-get-2.6.0" = {
@@ -4816,7 +4816,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz";
-        sha1 = "0b83aea885b3547b579ada0c6a5e7739fe4d073e";
+        sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p";
       };
     };
     "simple-sha1-2.1.0" = {
@@ -5023,7 +5023,7 @@ let
       version = "1.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz";
-        sha1 = "b1a54a0f924fbd4d45731a5771aea36be2166532";
+        sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5257,7 +5257,7 @@ let
       version = "1.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.1.tgz";
-        sha1 = "e6e92a00b2c74906ad69c42b6ea213dce8914d95";
+        sha512 = "1xigw4j1na5gxiff1dad35vn0h91i77a9jzwsczl47rypanm2vfwyx2zchzdgny7mrxrn14bk9xss16nj2k3vng60v8pc7snjdc6q8n";
       };
     };
     "bencode-0.8.0" = {
@@ -5671,7 +5671,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz";
-        sha1 = "5465c0ce11d0881f7d8e36d8ca587043f33a25ae";
+        sha512 = "1zss1rcd373slj9qjmy4zp7ann95isbkvjlrgp2dirpazvn1sy23hgnw6p72w0mj8hcgqpxvs0ls035zmb8isilqhqqpkmya9d3234r";
       };
     };
     "exit-on-epipe-1.0.1" = {
@@ -5680,7 +5680,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz";
-        sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692";
+        sha512 = "2kxcf7dq1q9z2wqwwfjagn77kpzg2zpjqf2kd3vj5drx576gwglbsfly2b1imabj3svgcz5xsx79kspq1xsdgm4wwg1fksfnjdgjv47";
       };
     };
     "sax-1.2.4" = {
@@ -5689,16 +5689,16 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
+        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
       };
     };
-    "xmlbuilder-4.2.1" = {
+    "xmlbuilder-9.0.4" = {
       name = "xmlbuilder";
       packageName = "xmlbuilder";
-      version = "4.2.1";
+      version = "9.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz";
-        sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5";
+        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz";
+        sha1 = "519cb4ca686d005a8420d3496f3f0caeecca580f";
       };
     };
     "configstore-2.1.0" = {
@@ -6157,7 +6157,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz";
-        sha1 = "53fe161111f912ab999ee887a90a0bc52822fd75";
+        sha512 = "1rkrq8iizbb4v8qv16qdknj2m9cjbxyl6d0jlp1jsnkys56b7xnn50f7qxbcsmz5z1m9r8j1pas6ai7bnhlmvmv88pyvdhw8fw3msdw";
       };
     };
     "foreach-2.0.5" = {
@@ -6427,7 +6427,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz";
-        sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7";
+        sha512 = "2vbps6iw562i2zxd973z5mmbs8ggx3wbz4g1jqwvkjibiwrk9ym8bxcvvwnlmxqad92x120x5xz5nyfq68nd8akk355bkk0qjppzafp";
       };
     };
     "fresh-0.5.0" = {
@@ -6499,7 +6499,7 @@ let
       version = "6.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
-        sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49";
+        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
       };
     };
     "send-0.15.4" = {
@@ -6634,7 +6634,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
+        sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
       };
     };
     "promzard-0.3.0" = {
@@ -6646,13 +6646,13 @@ let
         sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
       };
     };
-    "read-package-json-2.0.10" = {
+    "read-package-json-2.0.11" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.10";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.10.tgz";
-        sha1 = "dc0229f6dde6b4b705b39e25b2d970ebe95685ae";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.11.tgz";
+        sha512 = "1y74w8zm70x1zc7qgg6fxg72pb78dmafg2bf5x4gn1z8d4amjrw2q3d4j9035ginsrigk372scwj57p0ll5ck9yxdgnyjpzcd5fj7wy";
       };
     };
     "validate-npm-package-name-3.0.0" = {
@@ -6664,22 +6664,13 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
-    "json-parse-helpfulerror-1.0.3" = {
-      name = "json-parse-helpfulerror";
-      packageName = "json-parse-helpfulerror";
-      version = "1.0.3";
+    "json-parse-better-errors-1.0.1" = {
+      name = "json-parse-better-errors";
+      packageName = "json-parse-better-errors";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz";
-        sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc";
-      };
-    };
-    "jju-1.3.0" = {
-      name = "jju";
-      packageName = "jju";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz";
-        sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa";
+        url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz";
+        sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967";
       };
     };
     "builtins-1.0.3" = {
@@ -7633,7 +7624,7 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz";
-        sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd";
+        sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g";
       };
     };
     "infinity-agent-2.0.3" = {
@@ -8165,7 +8156,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz";
-        sha1 = "b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7";
+        sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf";
       };
     };
     "nan-2.6.2" = {
@@ -8900,13 +8891,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.95.0" = {
+    "aws-sdk-2.100.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.95.0";
+      version = "2.100.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.95.0.tgz";
-        sha1 = "26e21db149443b1f063949dc87984f0d17700e6a";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.100.0.tgz";
+        sha1 = "fc0fbca7690d6c28effd28bd51fe85f7dba42bff";
       };
     };
     "request-2.81.0" = {
@@ -8954,6 +8945,24 @@ let
         sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
       };
     };
+    "xml2js-0.4.17" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.4.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz";
+        sha1 = "17be93eaae3f3b779359c795b419705a8817e868";
+      };
+    };
+    "xmlbuilder-4.2.1" = {
+      name = "xmlbuilder";
+      packageName = "xmlbuilder";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz";
+        sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5";
+      };
+    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -9059,7 +9068,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/conf/-/conf-1.1.2.tgz";
-        sha1 = "a164003022dd1643cd5abd9653071bd3b0a19f50";
+        sha512 = "0x5jhmsdnq5y7m1wdvvcdg2rxf6435lw7s00gim8zsb4l2z4slvb2g7macl1376v9mcznfvl9p65m7xzm6f3cb20yfq3v2xi1qfd6yi";
       };
     };
     "got-7.1.0" = {
@@ -9068,7 +9077,7 @@ let
       version = "7.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz";
-        sha1 = "05450fd84094e6bbea56f451a43a9c289166385a";
+        sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3";
       };
     };
     "has-ansi-3.0.0" = {
@@ -9086,7 +9095,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz";
-        sha1 = "079df1da943b3274f46932fb740c9b56dd6351fb";
+        sha512 = "26xxz57vqm8p6mg0syr21risma4h5h9n8kn4zv4pcxqap4zxicc210w5m7vz6a4zldhd102sbi7giwzmw0wjlpr6rb1hycr8iv703b1";
       };
     };
     "ink-0.3.1" = {
@@ -9095,7 +9104,7 @@ let
       version = "0.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz";
-        sha1 = "551047276cb93baa3f14eafaef2ae5b1526e8213";
+        sha512 = "0km0z5smnzrh4c5386h3vbmvps6m45m6hbbf62as9wl4vw370q411gpxxhqz3i83n0qjds7py2ylgjx2y3915m5v77c1sf428w4wwkv";
       };
     };
     "ink-text-input-1.1.0" = {
@@ -9104,7 +9113,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.0.tgz";
-        sha1 = "887a9623c23fd5c6f173b9704e6cc6029d0a15c1";
+        sha512 = "3dlsk820l687ixfmi4qx8czzb7cr0hfz5gijxvm5x0qrnhrcg4kqzhvph2hrf50whjj3cxcbyx6ldqxnp6msw7ai5rs3b4vs50vcpak";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -9194,7 +9203,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz";
-        sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55";
+        sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb";
       };
     };
     "shebang-command-1.2.0" = {
@@ -9230,7 +9239,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
+        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
       };
     };
     "env-paths-1.0.0" = {
@@ -9338,7 +9347,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
-        sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67";
+        sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl";
       };
     };
     "p-cancelable-0.3.0" = {
@@ -9347,7 +9356,7 @@ let
       version = "0.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz";
-        sha1 = "b9e123800bcebb7ac13a479be195b507b98d30fa";
+        sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5";
       };
     };
     "p-timeout-1.2.0" = {
@@ -9401,7 +9410,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.0.tgz";
-        sha1 = "49d7bcde85c2409be38ac327e3e119a451657c7b";
+        sha512 = "0ldd58k8nhlbx35b3bbvyq9w38sdg9ac3334s6bxjw2zn803aa8zal9jvg793561g11yhwrlj4bw160ppmmswidhpwh3s33zww9sws7";
       };
     };
     "is-object-1.0.1" = {
@@ -9419,7 +9428,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.0.tgz";
-        sha1 = "442d89b1d0ac6cf5ff2f7b916ee539869b93a256";
+        sha512 = "14khsaf360hn87pdlz9scgn3c5s1ndihc6prcsi5k2rkiapz4ag3lg448a69srpsvdk7jyp4hf4a9fp113nkprdmnadrx2n7cn6slqp";
       };
     };
     "ansi-regex-3.0.0" = {
@@ -9431,13 +9440,13 @@ let
         sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
       };
     };
-    "babel-core-6.25.0" = {
+    "babel-core-6.26.0" = {
       name = "babel-core";
       packageName = "babel-core";
-      version = "6.25.0";
+      version = "6.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz";
-        sha1 = "7dd42b0463c742e9d5296deb3ec67a9322dad729";
+        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz";
+        sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8";
       };
     };
     "babel-plugin-transform-es2015-destructuring-6.23.0" = {
@@ -9449,13 +9458,13 @@ let
         sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d";
       };
     };
-    "babel-plugin-transform-object-rest-spread-6.23.0" = {
+    "babel-plugin-transform-object-rest-spread-6.26.0" = {
       name = "babel-plugin-transform-object-rest-spread";
       packageName = "babel-plugin-transform-object-rest-spread";
-      version = "6.23.0";
+      version = "6.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz";
-        sha1 = "875d6bc9be761c58a2ae3feee5dc4895d8c7f921";
+        url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz";
+        sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06";
       };
     };
     "babel-plugin-transform-react-jsx-6.24.1" = {
@@ -9494,22 +9503,22 @@ let
         sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
       };
     };
-    "babel-code-frame-6.22.0" = {
+    "babel-code-frame-6.26.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
-      version = "6.22.0";
+      version = "6.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz";
-        sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz";
+        sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b";
       };
     };
-    "babel-generator-6.25.0" = {
+    "babel-generator-6.26.0" = {
       name = "babel-generator";
       packageName = "babel-generator";
-      version = "6.25.0";
+      version = "6.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz";
-        sha1 = "33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc";
+        url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz";
+        sha1 = "ac1ae20070b79f6e3ca1d3269613053774f20dc5";
       };
     };
     "babel-helpers-6.24.1" = {
@@ -9530,58 +9539,58 @@ let
         sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
       };
     };
-    "babel-template-6.25.0" = {
-      name = "babel-template";
-      packageName = "babel-template";
-      version = "6.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz";
-        sha1 = "665241166b7c2aa4c619d71e192969552b10c071";
-      };
-    };
-    "babel-runtime-6.25.0" = {
-      name = "babel-runtime";
-      packageName = "babel-runtime";
-      version = "6.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz";
-        sha1 = "33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c";
-      };
-    };
-    "babel-register-6.24.1" = {
+    "babel-register-6.26.0" = {
       name = "babel-register";
       packageName = "babel-register";
-      version = "6.24.1";
+      version = "6.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz";
-        sha1 = "7e10e13a2f71065bdfad5a1787ba45bca6ded75f";
+        url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz";
+        sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071";
       };
     };
-    "babel-traverse-6.25.0" = {
+    "babel-runtime-6.26.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
+        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+      };
+    };
+    "babel-template-6.26.0" = {
+      name = "babel-template";
+      packageName = "babel-template";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz";
+        sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02";
+      };
+    };
+    "babel-traverse-6.26.0" = {
       name = "babel-traverse";
       packageName = "babel-traverse";
-      version = "6.25.0";
+      version = "6.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz";
-        sha1 = "2257497e2fcd19b89edc13c4c91381f9512496f1";
+        url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz";
+        sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee";
       };
     };
-    "babel-types-6.25.0" = {
+    "babel-types-6.26.0" = {
       name = "babel-types";
       packageName = "babel-types";
-      version = "6.25.0";
+      version = "6.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz";
-        sha1 = "70afb248d5660e5d18f811d91c8303b54134a18e";
+        url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz";
+        sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497";
       };
     };
-    "babylon-6.17.4" = {
+    "babylon-6.18.0" = {
       name = "babylon";
       packageName = "babylon";
-      version = "6.17.4";
+      version = "6.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz";
-        sha1 = "3e8b7402b88d22c3423e137a1577883b15ff869a";
+        url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz";
+        sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb";
       };
     };
     "convert-source-map-1.5.0" = {
@@ -9674,15 +9683,6 @@ let
         sha1 = "569c050918be6486b3837552028ae0466b717086";
       };
     };
-    "regenerator-runtime-0.10.5" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.10.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
-        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
-      };
-    };
     "home-or-tmp-2.0.0" = {
       name = "home-or-tmp";
       packageName = "home-or-tmp";
@@ -9692,13 +9692,22 @@ let
         sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
       };
     };
-    "source-map-support-0.4.15" = {
+    "source-map-support-0.4.16" = {
       name = "source-map-support";
       packageName = "source-map-support";
-      version = "0.4.15";
+      version = "0.4.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz";
-        sha1 = "03202df65c06d2bd8c7ec2362a193056fef8d3b1";
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.16.tgz";
+        sha512 = "2p8x22bgrc6cyxz8j73zzcwpqcb7fszycq7qrvbb0wd4g5wvdrz40lv3hyagx5if3xw0x1sjisx1a298gl51xl2mxizj7rvsv4ybaq3";
+      };
+    };
+    "regenerator-runtime-0.11.0" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz";
+        sha512 = "3a1pn2aankj443h5v8png8dbgrlyb7fcdn66vjglxwqvdpivpq959qsl2n44i6zwf1k5y6y23xwhim0x077yy275dyr6vwiny83987x";
       };
     };
     "globals-9.18.0" = {
@@ -9707,7 +9716,7 @@ let
       version = "9.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a";
+        sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab";
       };
     };
     "invariant-2.2.2" = {
@@ -9746,13 +9755,13 @@ let
         sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5";
       };
     };
-    "babel-helper-builder-react-jsx-6.24.1" = {
+    "babel-helper-builder-react-jsx-6.26.0" = {
       name = "babel-helper-builder-react-jsx";
       packageName = "babel-helper-builder-react-jsx";
-      version = "6.24.1";
+      version = "6.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz";
-        sha1 = "0ad7917e33c8d751e646daca4e77cc19377d2cbc";
+        url = "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz";
+        sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0";
       };
     };
     "babel-plugin-syntax-jsx-6.18.0" = {
@@ -9797,7 +9806,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e";
+        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
       };
     };
     "indent-string-3.2.0" = {
@@ -9851,7 +9860,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88";
+        sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
     "supports-color-4.2.1" = {
@@ -9860,7 +9869,7 @@ let
       version = "4.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
-        sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836";
+        sha512 = "1ldz0jkrkclywnr7gwh85p6kljs5rm4jczbpj55vb9w5c81iyrf1ahgkw88nnzahgw2xvlg041vqk7gynxkwcqkzfagxjpphsrdh75b";
       };
     };
     "color-convert-1.9.0" = {
@@ -9950,7 +9959,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
+        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -10022,7 +10031,7 @@ let
       version = "1.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz";
-        sha1 = "c54e9aac57e432875233525f3c891c4159ffefd7";
+        sha512 = "250k1k343w8g1ndd16h1lqcdvp989id6agsppfqi9a6lcqk89ga56xjz78hhy1dqn86vha8n8s551pwpyd1n87mkw4a7143djmm95n5";
       };
     };
     "whatwg-fetch-2.0.3" = {
@@ -10049,7 +10058,7 @@ let
       version = "0.4.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
-        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
+        sha512 = "2l97vd6kax8syr9aggcqhiyhd3b2rf506wdq6wapfrc74qwpdzqf2a3891kq9ri3g5sdzayph2sz4zkr8kbbps58z9h2lvpk115kgdj";
       };
     };
     "unicode-emoji-modifier-base-1.0.0" = {
@@ -10142,13 +10151,13 @@ let
         sha1 = "432352e57accd87ab3110e82d3fea0e47812156d";
       };
     };
-    "inquirer-3.2.1" = {
+    "inquirer-3.2.2" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.1.tgz";
-        sha1 = "06ceb0f540f45ca548c17d6840959878265fa175";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.2.tgz";
+        sha512 = "0gsmdyd280pgvy7aqam9hdjhpljwmyn2axwmf2gp6qrc8cxrykrshan1kr1s1f9cb8pf13m3jav92df9dbn1gwkk7i08m698768nckd";
       };
     };
     "is-resolvable-1.0.0" = {
@@ -10166,7 +10175,7 @@ let
       version = "3.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz";
-        sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0";
+        sha512 = "31wxw267vdf4nnjpksnzcb4i603366sjrw7g08bkxi3cwlrfl67458v7rvj72vbxcycq43z4ldkrfvqjrsvrjqrb2kfzmabpzghddq9";
       };
     };
     "levn-0.3.0" = {
@@ -10292,7 +10301,7 @@ let
       version = "0.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz";
-        sha1 = "815c99ea84f6809529d2f45791bdf82711352d66";
+        sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji";
       };
     };
     "del-2.2.2" = {
@@ -10427,7 +10436,7 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz";
-        sha1 = "c519f629f86b3a5bedba58a88d311309eec097f9";
+        sha512 = "3c44v9rz6j4z6i7gj2v3wmfcqv5i47psysgd1p4jcgz114vfk99fif1n1r08jbsdkp4g3smv1wx7x4ikwa7q9dp5i1bc77la17s2kdw";
       };
     };
     "tmp-0.0.31" = {
@@ -10472,7 +10481,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
-        sha1 = "4499eddcd1110e0b218bacf2fa7f7f59f55ca804";
+        sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -10610,13 +10619,13 @@ let
         sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a";
       };
     };
-    "phantomjs-prebuilt-2.1.14" = {
+    "phantomjs-prebuilt-2.1.15" = {
       name = "phantomjs-prebuilt";
       packageName = "phantomjs-prebuilt";
-      version = "2.1.14";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz";
-        sha1 = "d53d311fcfb7d1d08ddb24014558f1188c516da0";
+        url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz";
+        sha1 = "20f86e82d3349c505917527745b7a411e08b3903";
       };
     };
     "promise-phantom-3.1.6" = {
@@ -10634,7 +10643,7 @@ let
       version = "0.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz";
-        sha1 = "845a1cfda804a13419ec8ec12343e1f4c45cd07a";
+        sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf";
       };
     };
     "cli-spinners-1.0.0" = {
@@ -10664,13 +10673,13 @@ let
         sha1 = "7882f30adde5b240ccfa7f7d78c548330951ae42";
       };
     };
-    "extract-zip-1.5.0" = {
+    "extract-zip-1.6.5" = {
       name = "extract-zip";
       packageName = "extract-zip";
-      version = "1.5.0";
+      version = "1.6.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz";
-        sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz";
+        sha1 = "99a06735b6ea20ea9b705d779acffcc87cff0440";
       };
     };
     "fs-extra-1.0.0" = {
@@ -10709,13 +10718,13 @@ let
         sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
       };
     };
-    "concat-stream-1.5.0" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.5.0";
+    "debug-2.2.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz";
-        sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611";
+        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
       };
     };
     "mkdirp-0.5.0" = {
@@ -10736,6 +10745,15 @@ let
         sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
       };
     };
+    "ms-0.7.1" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+      };
+    };
     "fd-slicer-1.0.1" = {
       name = "fd-slicer";
       packageName = "fd-slicer";
@@ -10949,7 +10967,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz";
-        sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a";
+        sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi";
       };
     };
     "async-each-1.0.1" = {
@@ -11003,7 +11021,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz";
-        sha1 = "3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4";
+        sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja";
       };
     };
     "micromatch-2.3.11" = {
@@ -11111,7 +11129,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
+        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
       };
     };
     "expand-range-1.8.2" = {
@@ -11174,7 +11192,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
-        sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c";
+        sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg";
       };
     };
     "is-number-3.0.0" = {
@@ -11267,22 +11285,22 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "remove-trailing-separator-1.0.2" = {
+    "remove-trailing-separator-1.1.0" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz";
-        sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511";
+        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
+        sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "binary-extensions-1.9.0" = {
+    "binary-extensions-1.10.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.9.0";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.9.0.tgz";
-        sha1 = "66506c16ce6f4d6928a5b3cd6a33ca41e941e37b";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz";
+        sha1 = "9aeb9a6c5e88638aad171e167f5900abe24835d0";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -11309,7 +11327,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
+        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
       };
     };
     "tar-pack-3.4.0" = {
@@ -11354,7 +11372,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
-        sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1";
+        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
       };
     };
     "string-width-1.0.2" = {
@@ -11372,7 +11390,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
+        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
     "event-stream-0.5.3" = {
@@ -11526,7 +11544,7 @@ let
       version = "1.12.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-        sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
+        sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
       };
     };
     "jade-1.11.0" = {
@@ -12237,7 +12255,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
+        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
       };
     };
     "object.defaults-1.1.0" = {
@@ -12789,13 +12807,13 @@ let
         sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d";
       };
     };
-    "@reactivex/rxjs-5.4.2" = {
+    "@reactivex/rxjs-5.4.3" = {
       name = "@reactivex/rxjs";
       packageName = "@reactivex/rxjs";
-      version = "5.4.2";
+      version = "5.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.2.tgz";
-        sha1 = "ab530dbbdab71071369828ef11c8d7ae558d5116";
+        url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.3.tgz";
+        sha512 = "20pswi06vxjrv64d6i7z1zcsml98fma05a3xbyaycyfn7xmhbg8zwhnswx9pd03hrlxr4ypgikjgr65a0kkycjcyw9819gffaw95jvm";
       };
     };
     "chai-4.1.1" = {
@@ -12813,7 +12831,7 @@ let
       version = "7.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz";
-        sha1 = "08645d825deb8696ee61725dbf590c012eb00ca0";
+        sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb";
       };
     };
     "fast-json-patch-2.0.4" = {
@@ -12834,6 +12852,15 @@ let
         sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad";
       };
     };
+    "jaeger-client-3.5.3" = {
+      name = "jaeger-client";
+      packageName = "jaeger-client";
+      version = "3.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.5.3.tgz";
+        sha1 = "30a3989642ee3e8ea06d10c2b9f9e046d424d8ed";
+      };
+    };
     "mz-2.6.0" = {
       name = "mz";
       packageName = "mz";
@@ -12894,7 +12921,7 @@ let
       version = "3.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz";
-        sha1 = "b7857be58b97af664a8cdd071c91891d6c7d6a67";
+        sha512 = "1dwznr02qr6wd7886k3i7y3vxgzqdm14gc5vs892vrc8azhh6hl79bvl5lgc05004lzqbazj9p7vdkbms62f1iys92h5w1xpvdldfc8";
       };
     };
     "vscode-languageserver-3.3.0" = {
@@ -12903,7 +12930,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.3.0.tgz";
-        sha1 = "f547d4f0e5702f88ff3695bae5905f9604c8cc62";
+        sha512 = "380fi37ifwdgndnglvymyrb844aybpm5mjpwmq4p3dm1b93iqdfr00pr2b692d15k5hn9x82h98zw0bs0k7287pwdvdkv3v75pc92zi";
       };
     };
     "vscode-languageserver-types-3.3.0" = {
@@ -12912,7 +12939,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz";
-        sha1 = "8964dc7c2247536fbefd2d6836bf3febac80dd00";
+        sha512 = "1xjiay30jyp6sj9nq55zwjmxyq5ajcdrv4bw9ypkplv7mg57h4skiqvcsd6wbizidpx3xanqmnl04l66491fmlrwijn9ph3rsa044z4";
       };
     };
     "symbol-observable-1.0.4" = {
@@ -12987,6 +13014,78 @@ let
         sha1 = "46d0cc8553abb7b13a352b0d6dea2fd58f2d9b55";
       };
     };
+    "node-int64-0.4.0" = {
+      name = "node-int64";
+      packageName = "node-int64";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz";
+        sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
+      };
+    };
+    "thriftrw-3.11.1" = {
+      name = "thriftrw";
+      packageName = "thriftrw";
+      version = "3.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.1.tgz";
+        sha1 = "5a2f5165d665bb195e665e5b5b9f8897dac23acc";
+      };
+    };
+    "xorshift-0.2.1" = {
+      name = "xorshift";
+      packageName = "xorshift";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xorshift/-/xorshift-0.2.1.tgz";
+        sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a";
+      };
+    };
+    "opentracing-0.13.0" = {
+      name = "opentracing";
+      packageName = "opentracing";
+      version = "0.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opentracing/-/opentracing-0.13.0.tgz";
+        sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab";
+      };
+    };
+    "bufrw-1.2.1" = {
+      name = "bufrw";
+      packageName = "bufrw";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufrw/-/bufrw-1.2.1.tgz";
+        sha1 = "93f222229b4f5f5e2cd559236891407f9853663b";
+      };
+    };
+    "error-7.0.2" = {
+      name = "error";
+      packageName = "error";
+      version = "7.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/error/-/error-7.0.2.tgz";
+        sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02";
+      };
+    };
+    "ansi-color-0.2.1" = {
+      name = "ansi-color";
+      packageName = "ansi-color";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz";
+        sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a";
+      };
+    };
+    "string-template-0.2.1" = {
+      name = "string-template";
+      packageName = "string-template";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz";
+        sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
+      };
+    };
     "any-promise-1.3.0" = {
       name = "any-promise";
       packageName = "any-promise";
@@ -13032,13 +13131,13 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "editorconfig-0.13.2" = {
+    "editorconfig-0.13.3" = {
       name = "editorconfig";
       packageName = "editorconfig";
-      version = "0.13.2";
+      version = "0.13.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.2.tgz";
-        sha1 = "8e57926d9ee69ab6cb999f027c2171467acceb35";
+        url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz";
+        sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s";
       };
     };
     "bluebird-3.5.0" = {
@@ -13185,6 +13284,15 @@ let
         sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb";
       };
     };
+    "json-parse-helpfulerror-1.0.3" = {
+      name = "json-parse-helpfulerror";
+      packageName = "json-parse-helpfulerror";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz";
+        sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc";
+      };
+    };
     "lodash-id-0.13.0" = {
       name = "lodash-id";
       packageName = "lodash-id";
@@ -13320,6 +13428,15 @@ let
         sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
       };
     };
+    "jju-1.3.0" = {
+      name = "jju";
+      packageName = "jju";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz";
+        sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa";
+      };
+    };
     "steno-0.4.4" = {
       name = "steno";
       packageName = "steno";
@@ -13587,7 +13704,7 @@ let
       version = "3.6.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/connect/-/connect-3.6.3.tgz";
-        sha1 = "f7320d46a25b4be7b483a2236517f24b1e27e301";
+        sha512 = "2fkfixwv0fqqxw5rhmzrczj8ayxccwnxwkgyv4w8sxnkz52sl6dsx2nirg1vryxxqdlwph4ag9vc17yzzydmzshc73gpi6m12m9kd0q";
       };
     };
     "di-0.0.1" = {
@@ -14022,15 +14139,6 @@ let
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
-    "debug-2.2.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
-      };
-    };
     "json3-3.3.2" = {
       name = "json3";
       packageName = "json3";
@@ -14040,15 +14148,6 @@ let
         sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
       };
     };
-    "ms-0.7.1" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
-      };
-    };
     "lru-cache-2.2.4" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -14067,13 +14166,13 @@ let
         sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
       };
     };
-    "passport-0.3.2" = {
+    "passport-0.4.0" = {
       name = "passport";
       packageName = "passport";
-      version = "0.3.2";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz";
-        sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102";
+        url = "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz";
+        sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811";
       };
     };
     "passport-google-oauth-1.0.0" = {
@@ -14568,7 +14667,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz";
-        sha1 = "33abf2b5720a9b094df38e81741ccb502e1a4125";
+        sha512 = "0mvmzv0c23159jkmwd32hlbilf9lby2iz7xpmxi6i5ym75am5m355dpfv0wwkw2s41f8lncgnx6plxl361bqkfbmds8083llmf6dkv7";
       };
     };
     "conventional-recommended-bump-1.0.1" = {
@@ -14577,7 +14676,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz";
-        sha1 = "56b8ae553a8a1152fa069e767599e1f6948bd36c";
+        sha512 = "0cn224cp4qa787r0gkxg66f8m3s6l4nimfi2hm9mi5b0fh1365nqcipq3p5g1l82lkz6xdc9ihv46pvrx7gr8l0lh563dvh8bqw8nnq";
       };
     };
     "dedent-0.7.0" = {
@@ -14676,7 +14775,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
+        sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni";
       };
     };
     "write-json-file-2.2.0" = {
@@ -14739,7 +14838,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz";
-        sha1 = "118b9f7d41a3d99500bfb6bea1f3525e055e8b9b";
+        sha512 = "2cp0yhzf0kjmhawbj1v8kq71ddksbx8g7k1h7snwxijqy2xdgl6y6c63q6qg8ck3ar6n6wcs7yxzrq6kc9ddphclaqdg5s9d7drfhms";
       };
     };
     "conventional-changelog-atom-0.1.1" = {
@@ -14748,7 +14847,7 @@ let
       version = "0.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz";
-        sha1 = "d40a9b297961b53c745e5d1718fd1a3379f6a92f";
+        sha512 = "0h2y3wj5pfwir1ynh6i7qibcv30z2vy6l6q11nh9z9vzl15433c00bvjy1iz9zirkb57g4xyilak59hdzfzinadxqi8h3r2wgznxng8";
       };
     };
     "conventional-changelog-codemirror-0.1.0" = {
@@ -14919,7 +15018,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz";
-        sha1 = "6ccd2a52e735b736748dc762444fcd9588e27490";
+        sha512 = "16mn1j3vray2l88lrl57pkaxz3bvv4ahnx3qr6r3hkdjarzqn1d8w99n44mn39y4kdmcva1z6annx92h06r870yq05382f76jvv2p3w";
       };
     };
     "conventional-commits-filter-1.0.0" = {
@@ -14937,7 +15036,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
-        sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9";
+        sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r";
       };
     };
     "is-subset-0.1.1" = {
@@ -15036,7 +15135,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz";
-        sha1 = "71d01910cb0a99aeb20c144e50f81f4df3178447";
+        sha512 = "0mh43bfdx21ll5dn629cyh7p65drm2zcrazqvi6kq0m17h0y27brzsf8shjpi4idj3h9sqqa1dnq47xdwa00y4saswih5iqmy1pm1zj";
       };
     };
     "jsonfile-3.0.1" = {
@@ -15144,7 +15243,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
+        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
       };
     };
     "which-module-2.0.0" = {
@@ -15543,40 +15642,40 @@ let
         sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
       };
     };
-    "npm-registry-client-7.1.2" = {
+    "npm-registry-client-8.4.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.1.2";
+      version = "8.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz";
-        sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
+        sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx";
       };
     };
-    "npmconf-2.0.9" = {
+    "npmconf-2.1.2" = {
       name = "npmconf";
       packageName = "npmconf";
-      version = "2.0.9";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz";
-        sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2";
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
+        sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
       };
     };
-    "tar-1.0.3" = {
+    "tar-3.1.15" = {
       name = "tar";
       packageName = "tar";
-      version = "1.0.3";
+      version = "3.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz";
-        sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44";
+        url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
+        sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5";
       };
     };
-    "fs.extra-1.2.1" = {
+    "fs.extra-1.3.2" = {
       name = "fs.extra";
       packageName = "fs.extra";
-      version = "1.2.1";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz";
-        sha1 = "060bf20264f35e39ad247e5e9d2121a2a75a1733";
+        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
+        sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
       };
     };
     "findit-2.0.0" = {
@@ -15597,31 +15696,13 @@ let
         sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
       };
     };
-    "retry-0.8.0" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.8.0";
+    "ssri-4.1.6" = {
+      name = "ssri";
+      packageName = "ssri";
+      version = "4.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz";
-        sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f";
-      };
-    };
-    "npmlog-3.1.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz";
-        sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873";
-      };
-    };
-    "gauge-2.6.0" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
-        sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
+        sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr";
       };
     };
     "uid-number-0.0.5" = {
@@ -15633,6 +15714,33 @@ let
         sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
       };
     };
+    "minipass-2.2.1" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
+        sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
+      };
+    };
+    "minizlib-1.0.3" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz";
+        sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5";
+      };
+    };
+    "yallist-3.0.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
+        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
+      };
+    };
     "fs-extra-0.6.4" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -15642,13 +15750,13 @@ let
         sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
       };
     };
-    "walk-2.2.1" = {
+    "walk-2.3.9" = {
       name = "walk";
       packageName = "walk";
-      version = "2.2.1";
+      version = "2.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/walk/-/walk-2.2.1.tgz";
-        sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016";
+        url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
+        sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
       };
     };
     "jsonfile-1.0.1" = {
@@ -15660,22 +15768,13 @@ let
         sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
       };
     };
-    "forEachAsync-2.2.1" = {
-      name = "forEachAsync";
-      packageName = "forEachAsync";
-      version = "2.2.1";
+    "foreachasync-3.0.0" = {
+      name = "foreachasync";
+      packageName = "foreachasync";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz";
-        sha1 = "e3723f00903910e1eb4b1db3ad51b5c64a319fec";
-      };
-    };
-    "sequence-2.2.1" = {
-      name = "sequence";
-      packageName = "sequence";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
-        sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+        url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
+        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
       };
     };
     "biased-opener-0.2.8" = {
@@ -15990,7 +16089,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz";
-        sha1 = "355e8f4d16876b43f577b0d5ce2668b9723214ea";
+        sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a";
       };
     };
     "fs.notify-0.0.4" = {
@@ -16035,7 +16134,7 @@ let
       version = "1.2.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz";
-        sha1 = "d44fea5a54145600c1a3875e942ab6727adbddb5";
+        sha512 = "3bpyhs9imacbmpq0r7l65qvkx0dfnx92qz5vm59i983h2xvw2yrr1934i979accigkr33b65n51m5zx73glbi3pwl8n6zm5b3y74a8a";
       };
     };
     "mqtt-2.9.0" = {
@@ -16044,7 +16143,7 @@ let
       version = "2.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz";
-        sha1 = "379ceb787a52fc15cb8fc96d558a32c123f12a9d";
+        sha512 = "181qi8xb0lxxqvwq2xcslv35dbhphyr67w02bad6n4rlibcm6z0j055dyfpdh12mrrvgjzfj11cjylsj26y7vr17cvk1kbgkiqgzpb9";
       };
     };
     "multer-1.3.0" = {
@@ -16074,6 +16173,15 @@ let
         sha1 = "f2ddc0115d635d0480746249c00f0ea1a9c51ba8";
       };
     };
+    "passport-0.3.2" = {
+      name = "passport";
+      packageName = "passport";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz";
+        sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102";
+      };
+    };
     "passport-http-bearer-1.0.1" = {
       name = "passport-http-bearer";
       packageName = "passport-http-bearer";
@@ -16107,7 +16215,7 @@ let
       version = "3.0.20";
       src = fetchurl {
         url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz";
-        sha1 = "cb35b2bcfe478051b6f3282be8db4e4add49a1e5";
+        sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv";
       };
     };
     "when-3.7.8" = {
@@ -16386,7 +16494,7 @@ let
       version = "2.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz";
-        sha1 = "2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a";
+        sha512 = "2h6492mk9v9dzy26i5wfajinhi2pg729ksbcsmm0sp8s32hlr432q19g97qghfp5x98hsm77hmzwdzhgi3vhm2drz53ax7rabhydw98";
       };
     };
     "retry-0.6.1" = {
@@ -16467,7 +16575,7 @@ let
       version = "5.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz";
-        sha1 = "387104c06aa68fbb9f8159d0c722dd5c3e45df22";
+        sha512 = "2d1hvibps8d4xlw8wm937ykc76yb02rp2065hd6186vygjx3wixjjzrn3fia4wfj7d38ic8gh5ij5rsi9389kl6gpxxjbdcbjwpn8yf";
       };
     };
     "reinterval-1.1.0" = {
@@ -16485,7 +16593,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.1.tgz";
-        sha1 = "51cb992988c2eeb4525ccd90eafbac52a5ac6700";
+        sha512 = "3w842xsi7pgjjr5fkdzbx9dfsjl87x6c8wrvxgy8i1lr399yjiggbwrfdvpccv698f7n4ywvf7dbc8g61ly99yw1lf7fwpfrypg8x9p";
       };
     };
     "leven-1.0.2" = {
@@ -16548,7 +16656,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-3.1.0.tgz";
-        sha1 = "8afafecdeab46d572e5397ee880739367aa2f41c";
+        sha512 = "07wdh2llaz8j5nbjpvl1zbbksw2pikqnw243c6a1ifmshp095hgam79vv5nbp1pjwnlm120m4d3sih9iwm5mkc46im03jb5l6l3ykjd";
       };
     };
     "append-field-0.1.0" = {
@@ -17133,7 +17241,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-3.0.0.tgz";
-        sha1 = "1d2feae53349047b08b264ec41906ba17a8516e4";
+        sha512 = "3ra092awfmss9asigji0v03n1n27376c2h94zyzv5sr206nd0p3p6hyzaadlyfz8vj1pcypk2bmjqmnx1v0iasvrkz2dc4v3b3hf2ax";
       };
     };
     "qs-0.5.1" = {
@@ -17466,7 +17574,7 @@ let
       version = "9.2.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
-        sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd";
+        sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642";
       };
     };
     "call-limit-1.1.0" = {
@@ -17484,7 +17592,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
-        sha1 = "08c4a452f789dcbac4c89a4563c902b2c862fd5b";
+        sha512 = "07r7qvmx5fjjk2ra3hjrz31ciy4vhfq2k8a3wjscjl7y52885zwfvz4caa5xr3kab8l3y4c9rsz1nkpjl530irrs6q5l3z6yadyj4c8";
       };
     };
     "lazy-property-1.0.0" = {
@@ -17502,7 +17610,7 @@ let
       version = "9.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz";
-        sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304";
+        sha512 = "0ki52cm2pf27r9pkpfbrx6y1myg7yx1mghwnvv6mw4kmgscif08qlj0xzlc88kpfl549xip4z1ap64s22l7v3q26ygz6x12cch87wsr";
       };
     };
     "lodash._baseuniq-4.6.0" = {
@@ -17577,15 +17685,6 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-8.4.0" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
-        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
-      };
-    };
     "npm-user-validate-1.0.0" = {
       name = "npm-user-validate";
       packageName = "npm-user-validate";
@@ -17610,7 +17709,7 @@ let
       version = "2.7.38";
       src = fetchurl {
         url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz";
-        sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1";
+        sha512 = "0a0ar6lns179qdszia13prhj7gjpdjy334xafq791h48q00259lr6gpkzp17dagfcnff9pgcgxm7b68nidpj5qs0yah1v81fk4d84az";
       };
     };
     "promise-inflight-1.0.1" = {
@@ -17628,7 +17727,7 @@ let
       version = "5.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
-        sha1 = "4f03e83d0486856fb60d97c94882841c2a7b1b7a";
+        sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l";
       };
     };
     "sorted-union-stream-2.1.3" = {
@@ -17640,15 +17739,6 @@ let
         sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
       };
     };
-    "ssri-4.1.6" = {
-      name = "ssri";
-      packageName = "ssri";
-      version = "4.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
-      };
-    };
     "unique-filename-1.1.0" = {
       name = "unique-filename";
       packageName = "unique-filename";
@@ -17673,7 +17763,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz";
-        sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8";
+        sha512 = "0vh5z2d6q3zgf7j3g5ngyq4piqq1y613wacfyildfnm2c2klb4h2gw32grgk6pv9ssyiliyfvj4p4alpaa85cqcj2nznb4q0fv400dn";
       };
     };
     "lodash._baseindexof-3.1.0" = {
@@ -17790,7 +17880,7 @@ let
       version = "2.4.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.13.tgz";
-        sha1 = "3139ba2f4230a8384e7ba394534816c872ecbf4b";
+        sha512 = "0j8sgm5sh7lb4mdpg52yz9rv0jpgkd3bf701i30gd5s3aqxb0i2lq8qm4bndqqfcb8jgiw8wj6dwpv2497khvxmmx3bfj0iad7aqw7g";
       };
     };
     "npm-pick-manifest-1.0.4" = {
@@ -17799,7 +17889,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8";
+        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
       };
     };
     "promise-retry-1.1.1" = {
@@ -17835,7 +17925,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
-        sha1 = "6d5de5829afd3be2712201a39275fd11c651857c";
+        sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -17862,16 +17952,16 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443";
+        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
       };
     };
-    "node-fetch-npm-2.0.1" = {
+    "node-fetch-npm-2.0.2" = {
       name = "node-fetch-npm";
       packageName = "node-fetch-npm";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.1.tgz";
-        sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465";
+        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz";
+        sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
       };
     };
     "socks-proxy-agent-3.0.0" = {
@@ -17880,7 +17970,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz";
-        sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245";
+        sha512 = "3zn9cz2ry5m1akapj7hvhgkxfq7ffwynia46lmwipsw2jk5sv8dvs32dc4hfx3xvp34i1jff1bg870a1xnknsgk5dl021jd4gwi75v0";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -17898,7 +17988,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
-        sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4";
+        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -17916,7 +18006,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
-        sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a";
+        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
       };
     };
     "socks-1.1.10" = {
@@ -17988,7 +18078,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
-        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
+        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
       };
     };
     "import-lazy-2.1.0" = {
@@ -18117,15 +18207,6 @@ let
         sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07";
       };
     };
-    "fs.extra-1.3.2" = {
-      name = "fs.extra";
-      packageName = "fs.extra";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
-        sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
-      };
-    };
     "findit-1.2.0" = {
       name = "findit";
       packageName = "findit";
@@ -18234,24 +18315,6 @@ let
         sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
       };
     };
-    "walk-2.3.9" = {
-      name = "walk";
-      packageName = "walk";
-      version = "2.3.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
-        sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
-      };
-    };
-    "foreachasync-3.0.0" = {
-      name = "foreachasync";
-      packageName = "foreachasync";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
-        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
-      };
-    };
     "cint-8.2.1" = {
       name = "cint";
       packageName = "cint";
@@ -18324,13 +18387,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.38.1" = {
+    "snyk-1.38.3" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.38.1";
+      version = "1.38.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.38.1.tgz";
-        sha1 = "8a7527cc89811daa400780ea9051f5a73e737f23";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.38.3.tgz";
+        sha1 = "76988492a24030ee1b496fd6c0b45aedaf349ec4";
       };
     };
     "spawn-please-0.3.0" = {
@@ -18387,6 +18450,15 @@ let
         sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
       };
     };
+    "npmlog-3.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz";
+        sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873";
+      };
+    };
     "path-array-1.0.1" = {
       name = "path-array";
       packageName = "path-array";
@@ -18396,6 +18468,15 @@ let
         sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271";
       };
     };
+    "gauge-2.6.0" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
+        sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+      };
+    };
     "array-index-1.0.0" = {
       name = "array-index";
       packageName = "array-index";
@@ -18423,13 +18504,13 @@ let
         sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
       };
     };
-    "es5-ext-0.10.26" = {
+    "es5-ext-0.10.27" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.26";
+      version = "0.10.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.26.tgz";
-        sha1 = "51b2128a531b70c4f6764093a73cbebb82186372";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.27.tgz";
+        sha512 = "39v1b13qiq02g8qwdjqnnqla20yy3bbhvvk66vhjyywbha8bjb9ry6q4hk8zlckvws880azkrxyw994dkkfcwpiqmxkfpfaii2wk9fw";
       };
     };
     "es6-iterator-2.0.1" = {
@@ -18483,7 +18564,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.0.3.tgz";
-        sha1 = "9583df8bda478d4a20070d577b1da2e1cb6499ef";
+        sha512 = "0mfvgmyrysvs5vfwnv6scysgkjq2917zay5s5x884a0xv0rdzr6rcc283lmkzm9g4rwikf06mz5aq99j59vl168iwpcfdk2q4w0l8l9";
       };
     };
     "snyk-module-1.8.1" = {
@@ -18501,7 +18582,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.0.tgz";
-        sha1 = "99ae297b7ae40fa8df78a39fa13816dc513c2d10";
+        sha512 = "01vcacjw51v7n21nb72chxlgqnzslg4dxqf2m5v4dlig0mk03jbvhhib2a48ji9kda2gplnq94xnjgqkc6ckp4xjyv7ajqacdabfwnv";
       };
     };
     "snyk-policy-1.7.1" = {
@@ -18513,13 +18594,13 @@ let
         sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
       };
     };
-    "snyk-python-plugin-1.2.2" = {
+    "snyk-python-plugin-1.2.3" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.2.tgz";
-        sha1 = "296948cba5ac80d2ce178a5cb7ecfcff88fdf263";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.3.tgz";
+        sha512 = "32brr3jb8vs1253ls0bmhmnp26873sc40805wvxl3x40i84czzr5nrnf5x2ikwk8hb4nwcy5bwpm192wj43z7g0gcd2k19afq8ixifn";
       };
     };
     "snyk-recursive-readdir-2.0.0" = {
@@ -18555,7 +18636,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.1.0.tgz";
-        sha1 = "922bc70220ee95f26fbb1e482ff1dcbccdd1f050";
+        sha512 = "20rfszcqyzsbkrq0289dg335kdls788r81chv7kwhp440hj7aqckzydc1hdgkcqpq7qic1v6bzknl06jkrbh5mb1nysxi3qz8y11333";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -19108,7 +19189,7 @@ let
       version = "3.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.0.tgz";
-        sha1 = "193b3e864959a826d33074460c2651d1ed04b07a";
+        sha512 = "2sgk5bgncdhki1x3pl5lc9l4j1p1p9v2nkrc24gb1gkmycc8svqgx3712h0nmb00zbn1nkzgfzrsy708cpgxfmwkyvbvb9q56nvys2f";
       };
     };
     "dom-storage-2.0.2" = {
@@ -19345,13 +19426,13 @@ let
         sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901";
       };
     };
-    "dns-packet-1.1.1" = {
+    "dns-packet-1.2.2" = {
       name = "dns-packet";
       packageName = "dns-packet";
-      version = "1.1.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz";
-        sha1 = "2369d45038af045f3898e6fa56862aed3f40296c";
+        url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz";
+        sha512 = "0770ymyc0rv6a11mj3990d0z1jl1b2qxp4bapqa819y269sszfd96wn2y7pb6aw8bdgsn3bvpr7bmig5lcmkrxya13d5vc5y66q7pwh";
       };
     };
     "external-editor-1.1.1" = {
@@ -19453,6 +19534,15 @@ let
         sha1 = "9fe85dee25853ca6babe25bd2ad68710863e91c2";
       };
     };
+    "extract-zip-1.5.0" = {
+      name = "extract-zip";
+      packageName = "extract-zip";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz";
+        sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
+      };
+    };
     "request-2.67.0" = {
       name = "request";
       packageName = "request";
@@ -19462,6 +19552,15 @@ let
         sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
       };
     };
+    "concat-stream-1.5.0" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz";
+        sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611";
+      };
+    };
     "bl-1.0.3" = {
       name = "bl";
       packageName = "bl";
@@ -20594,7 +20693,7 @@ let
       version = "1.15.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/express-session/-/express-session-1.15.5.tgz";
-        sha1 = "f49a18227263b316f6f8544da5fee25a540259ec";
+        sha512 = "0xr0b4wp67nzril9h59g1ag2siwazl9kkfy45cq317w0x9q6apr82i9hvqrmjpp9zfvzfidz0vvd1pczsa7namwsdwk1anp9zl74584";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -20687,13 +20786,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-2.1.1" = {
+    "raven-2.1.2" = {
       name = "raven";
       packageName = "raven";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-2.1.1.tgz";
-        sha1 = "b3a974c6c29315c677c079e168435ead196525cd";
+        url = "https://registry.npmjs.org/raven/-/raven-2.1.2.tgz";
+        sha512 = "136ylazswrblh2b1kc29xsmzk3i3bhm6vcirl1zb60fv9h0nf3hipz7qm91vs6my1lry00xrzpy1x96y51siciwwq7k3fs0ynl2j6m4";
       };
     };
     "signals-1.0.0" = {
@@ -20765,7 +20864,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz";
-        sha1 = "056695150d7aa93237ca7e378ac3b1682b7963b9";
+        sha512 = "0vcr20wa3j8j9b5xs7d5wnkm74g7ka45zfmw813s6ibwk8gbzyj87ifas3qklfdj7ydrqjfcylhazar038qzaf6jqfl17snn6wxjif3";
       };
     };
     "hogan.js-3.0.2" = {
@@ -20927,7 +21026,7 @@ let
       version = "2.2.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz";
-        sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72";
+        sha512 = "3sn0n3ncghvdrhy082cysiswswps9d5824ppjkl7gl1z1r6f11ij6z9nvs3l8gbp7vys1kgamrnikas3azjh7dwaqi1j4haffpkxvw7";
       };
     };
     "update-notifier-2.1.0" = {
@@ -21101,6 +21200,15 @@ let
         sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
       };
     };
+    "tmp-0.0.33" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.33";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
+        sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d";
+      };
+    };
     "follow-redirects-0.0.3" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -21152,7 +21260,7 @@ let
       version = "0.5.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz";
-        sha1 = "dca14a70235ff82f0ac9a3abeb60d337a365185d";
+        sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0";
       };
     };
     "loader-runner-2.3.0" = {
@@ -21215,7 +21323,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz";
-        sha1 = "c7356436a4d13123be2e2426a05d1dad9cbe65cf";
+        sha512 = "27l6lhqai0bhgk7mbchvf608bgmrgbqmgjd07k1rsg7xh12lnaflr459cy7ay108jr7dk8g5ybx70xi7cbz6lm5c7m022sl5b34r6yk";
       };
     };
     "es6-map-0.1.5" = {
@@ -21281,49 +21389,13 @@ let
         sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
       };
     };
-    "timers-browserify-2.0.3" = {
+    "timers-browserify-2.0.4" = {
       name = "timers-browserify";
       packageName = "timers-browserify";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz";
-        sha1 = "41fd0bdc926a5feedc33a17a8e1f7d491925f7fc";
-      };
-    };
-    "global-4.3.2" = {
-      name = "global";
-      packageName = "global";
-      version = "4.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/global/-/global-4.3.2.tgz";
-        sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
-      };
-    };
-    "min-document-2.19.0" = {
-      name = "min-document";
-      packageName = "min-document";
-      version = "2.19.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz";
-        sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685";
-      };
-    };
-    "process-0.5.2" = {
-      name = "process";
-      packageName = "process";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process/-/process-0.5.2.tgz";
-        sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf";
-      };
-    };
-    "dom-walk-0.1.1" = {
-      name = "dom-walk";
-      packageName = "dom-walk";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz";
-        sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz";
+        sha512 = "2pddj1k7206wrs3q5z7dzwc657rbdd2m00llzz0h1241fp0y5i32qi2slmfys217hqszbqmvnmjr32msgbjgzh33nxw6py49p4j35mr";
       };
     };
     "source-list-map-2.0.0" = {
@@ -21332,7 +21404,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz";
-        sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085";
+        sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93";
       };
     };
     "death-1.1.0" = {
@@ -21350,7 +21422,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz";
-        sha1 = "39c72ed89d1b49ba708e18776500488902a52027";
+        sha512 = "3d6jyhcq21cxy2n6mnalnxcdxl9i00n8qka7awrqamggss8yllz57msx7c480knv037snkzkymq6npl36wlpl71h54x511dlchavnxa";
       };
     };
     "leven-2.1.0" = {
@@ -21368,7 +21440,7 @@ let
       version = "1.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz";
-        sha1 = "6eec6bfb07421e2148c75c6bba72421f8530a826";
+        sha512 = "1bdm7sms59bj5fa575nda007mvn4nibjla4hm9bf9ry70kgqw7slmz3l4md4cyx2j4zda0dh0mcjildkzq7ba3i9qzapha93l14qjzs";
       };
     };
     "object-path-0.11.4" = {
@@ -21566,7 +21638,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.2.tgz";
-        sha1 = "504ece28e11b5ac487e90b97d8189afa38db4331";
+        sha512 = "2wkqnb0q3hbfvgxiyi21kaw7rcn4grpxaajnhxry03y05xfr39xh25c9nqj4drp6c89snssd741ra24v5ibngj460hgs4ldsz90w5r0";
       };
     };
     "yosay-2.0.1" = {
@@ -21575,7 +21647,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yosay/-/yosay-2.0.1.tgz";
-        sha1 = "078167f0365732e5c82d3f64633f9cd3a0526d2f";
+        sha512 = "1n6z65vkm1r31a1ms8wn32m9q61vrlz9isn43lm00qka1zvnich78zbnp29xwy72z361is2yimrpglmc55w97hbi9pas5pqlnvqbpw4";
       };
     };
     "filter-obj-1.1.0" = {
@@ -21593,7 +21665,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz";
-        sha1 = "1d03835c7eed1e34b8e539c47b7b60d0d015d4e1";
+        sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i";
       };
     };
     "p-try-1.0.0" = {
@@ -21620,7 +21692,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz";
-        sha1 = "60b408e21f5da11a417fad13740bf20f9024ab3b";
+        sha512 = "23lpz1jyj01f06bndx53w1k931l6ki6m94mgf9lqpxka3366q0w1ql0igm7bj5nc0imzdjv3x5825c05mjnhkgahw99hd0h1kk5ri0a";
       };
     };
     "aggregate-error-1.0.0" = {
@@ -22292,7 +22364,7 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
-      sources."@types/node-7.0.39"
+      sources."@types/node-7.0.42"
       sources."@types/request-0.0.45"
       sources."@types/uuid-2.0.30"
       sources."is-buffer-1.1.5"
@@ -22800,10 +22872,9 @@ in
       sources."router-0.6.2"
       sources."srt2vtt-1.3.1"
       sources."stream-transcoder-0.0.5"
-      (sources."xml2js-0.4.17" // {
+      (sources."xml2js-0.4.18" // {
         dependencies = [
-          sources."xmlbuilder-4.2.1"
-          sources."lodash-4.17.4"
+          sources."xmlbuilder-9.0.4"
         ];
       })
       sources."xspfr-0.3.1"
@@ -23126,7 +23197,7 @@ in
     version = "1.12.7";
     src = fetchurl {
       url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
+      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -23511,7 +23582,7 @@ in
       sources."npm-package-arg-5.1.2"
       sources."promzard-0.3.0"
       sources."read-1.0.7"
-      (sources."read-package-json-2.0.10" // {
+      (sources."read-package-json-2.0.11" // {
         dependencies = [
           sources."glob-7.1.2"
         ];
@@ -23520,9 +23591,8 @@ in
       sources."validate-npm-package-name-3.0.0"
       sources."hosted-git-info-2.5.0"
       sources."mute-stream-0.0.7"
-      sources."json-parse-helpfulerror-1.0.3"
+      sources."json-parse-better-errors-1.0.1"
       sources."normalize-package-data-2.4.0"
-      sources."jju-1.3.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       sources."spdx-correct-1.0.2"
@@ -23786,7 +23856,7 @@ in
     version = "0.2.9";
     src = fetchurl {
       url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.9.tgz";
-      sha1 = "204208be1cef2788d528744fb263f60a528363a2";
+      sha512 = "0xvz5ppq82s4yhrp4alp1ni696v960p9a8hycwns0bj33qjdsd2nn9h2xzpgssn9c27jbr91h9fr851rnc7sz7nd2ycblcsfy193sj0";
     };
     dependencies = [
       sources."minimist-1.2.0"
@@ -24097,13 +24167,13 @@ in
     version = "3.3.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.1.tgz";
-      sha1 = "84218b1184cec4859e63ae2ef44b5a7d877e4fe4";
+      sha512 = "21mmlyi12vnfg5s88vh8i7jk43m69bp4qhgkch8i2qbzf9fv4hqn7b6wcxkbbdxzdvnkkpklb2xxpxi5nflwl513w08d6ykvac2ambh";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.95.0"
+      sources."aws-sdk-2.100.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
@@ -24211,7 +24281,7 @@ in
     version = "2.0.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz";
-      sha1 = "6f6faf41a8f48e6080bffb2012041fc89491dd9f";
+      sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z";
     };
     dependencies = [
       sources."auto-bind-1.1.0"
@@ -24281,23 +24351,23 @@ in
       sources."has-symbol-support-x-1.4.0"
       sources."prepend-http-1.0.4"
       sources."ansi-regex-3.0.0"
-      sources."babel-core-6.25.0"
+      sources."babel-core-6.26.0"
       sources."babel-plugin-transform-es2015-destructuring-6.23.0"
-      sources."babel-plugin-transform-object-rest-spread-6.23.0"
+      sources."babel-plugin-transform-object-rest-spread-6.26.0"
       sources."babel-plugin-transform-react-jsx-6.24.1"
       sources."caller-path-2.0.0"
       sources."require-from-string-1.2.1"
       sources."resolve-from-3.0.0"
-      sources."babel-code-frame-6.22.0"
-      sources."babel-generator-6.25.0"
+      sources."babel-code-frame-6.26.0"
+      sources."babel-generator-6.26.0"
       sources."babel-helpers-6.24.1"
       sources."babel-messages-6.23.0"
-      sources."babel-template-6.25.0"
-      sources."babel-runtime-6.25.0"
-      sources."babel-register-6.24.1"
-      sources."babel-traverse-6.25.0"
-      sources."babel-types-6.25.0"
-      sources."babylon-6.17.4"
+      sources."babel-register-6.26.0"
+      sources."babel-runtime-6.26.0"
+      sources."babel-template-6.26.0"
+      sources."babel-traverse-6.26.0"
+      sources."babel-types-6.26.0"
+      sources."babylon-6.18.0"
       sources."convert-source-map-1.5.0"
       sources."debug-2.6.8"
       sources."json5-0.5.1"
@@ -24330,13 +24400,13 @@ in
       sources."is-finite-1.0.2"
       sources."number-is-nan-1.0.1"
       sources."core-js-2.5.0"
-      sources."regenerator-runtime-0.10.5"
       sources."home-or-tmp-2.0.0"
       sources."mkdirp-0.5.1"
-      sources."source-map-support-0.4.15"
+      sources."source-map-support-0.4.16"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."minimist-0.0.8"
+      sources."regenerator-runtime-0.11.0"
       sources."globals-9.18.0"
       sources."invariant-2.2.2"
       sources."loose-envify-1.3.1"
@@ -24346,7 +24416,7 @@ in
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."babel-plugin-syntax-object-rest-spread-6.13.0"
-      sources."babel-helper-builder-react-jsx-6.24.1"
+      sources."babel-helper-builder-react-jsx-6.26.0"
       sources."babel-plugin-syntax-jsx-6.18.0"
       sources."caller-callsite-2.0.0"
       sources."callsites-2.0.0"
@@ -24451,7 +24521,7 @@ in
     };
     dependencies = [
       sources."ajv-5.2.2"
-      sources."babel-code-frame-6.22.0"
+      sources."babel-code-frame-6.26.0"
       sources."chalk-1.1.3"
       sources."concat-stream-1.6.0"
       sources."cross-spawn-5.1.0"
@@ -24468,7 +24538,7 @@ in
       sources."globals-9.18.0"
       sources."ignore-3.3.3"
       sources."imurmurhash-0.1.4"
-      (sources."inquirer-3.2.1" // {
+      (sources."inquirer-3.2.2" // {
         dependencies = [
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
@@ -24617,7 +24687,7 @@ in
     version = "5.1.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.1.0.tgz";
-      sha1 = "937da79d43f4411c92837c8aec22cf307bc6a572";
+      sha512 = "3a69fni3gypbhmr458lzxnz7qpik5v7zsxhv4sfb85a7ygngibaxazv5z4i39zvcyivab5z8mnayn496z7v6m0r8j0zkfm39d6i5gwq";
     };
     dependencies = [
       (sources."chalk-1.1.3" // {
@@ -24639,7 +24709,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."ansi-regex-2.1.1"
       sources."ajv-5.2.2"
-      sources."babel-code-frame-6.22.0"
+      sources."babel-code-frame-6.26.0"
       sources."concat-stream-1.6.0"
       sources."cross-spawn-5.1.0"
       sources."debug-2.6.8"
@@ -24655,7 +24725,7 @@ in
       sources."globals-9.18.0"
       sources."ignore-3.3.3"
       sources."imurmurhash-0.1.4"
-      (sources."inquirer-3.2.1" // {
+      (sources."inquirer-3.2.2" // {
         dependencies = [
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
@@ -24826,7 +24896,7 @@ in
           sources."onetime-2.0.1"
         ];
       })
-      sources."phantomjs-prebuilt-2.1.14"
+      sources."phantomjs-prebuilt-2.1.15"
       sources."promise-phantom-3.1.6"
       sources."zen-observable-0.5.2"
       sources."ansi-styles-2.2.1"
@@ -24886,16 +24956,16 @@ in
       sources."log-symbols-1.0.2"
       sources."mimic-fn-1.1.0"
       sources."es6-promise-4.0.5"
-      sources."extract-zip-1.5.0"
+      sources."extract-zip-1.6.5"
       sources."fs-extra-1.0.0"
       sources."hasha-2.2.0"
       sources."kew-0.7.0"
       sources."progress-1.1.8"
-      sources."request-2.79.0"
+      sources."request-2.81.0"
       sources."request-progress-2.0.1"
       sources."which-1.2.14"
-      sources."concat-stream-1.5.0"
-      sources."debug-0.7.4"
+      sources."concat-stream-1.6.0"
+      sources."debug-2.2.0"
       (sources."mkdirp-0.5.0" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -24904,12 +24974,14 @@ in
       sources."yauzl-2.4.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.3.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
+      sources."ms-0.7.1"
       sources."fd-slicer-1.0.1"
       sources."pend-1.2.0"
       sources."jsonfile-2.4.0"
@@ -24917,12 +24989,12 @@ in
       sources."is-stream-1.1.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
-      sources."caseless-0.11.0"
+      sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
-      sources."har-validator-2.0.6"
+      sources."har-validator-4.2.1"
       sources."hawk-3.1.3"
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
@@ -24930,20 +25002,19 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.16"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.2"
+      sources."performance-now-0.2.0"
+      sources."qs-6.4.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."commander-2.11.0"
-      sources."is-my-json-valid-2.16.0"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
       sources."cryptiles-2.0.5"
@@ -24985,15 +25056,9 @@ in
       sources."punycode-1.4.1"
       sources."throttleit-1.0.0"
       sources."isexe-2.0.0"
-      sources."co-4.6.0"
       sources."mkpath-1.0.0"
-      (sources."node-phantom-simple-2.2.4" // {
-        dependencies = [
-          sources."debug-2.6.8"
-        ];
-      })
+      sources."node-phantom-simple-2.2.4"
       sources."tmp-0.0.31"
-      sources."ms-2.0.0"
       sources."os-tmpdir-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -25146,8 +25211,8 @@ in
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."remove-trailing-separator-1.0.2"
-      sources."binary-extensions-1.9.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."binary-extensions-1.10.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
@@ -25398,7 +25463,7 @@ in
           sources."asap-2.0.6"
         ];
       })
-      sources."xml2js-0.4.17"
+      sources."xml2js-0.4.18"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
       (sources."clean-css-3.4.28" // {
@@ -25464,8 +25529,7 @@ in
       sources."pop-iterate-1.0.1"
       sources."weak-map-1.0.5"
       sources."sax-1.2.4"
-      sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.4"
+      sources."xmlbuilder-9.0.4"
       sources."nan-2.6.2"
     ];
     buildInputs = globalBuildInputs;
@@ -25613,7 +25677,7 @@ in
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
       sources."is-posix-bracket-0.1.1"
-      sources."remove-trailing-separator-1.0.2"
+      sources."remove-trailing-separator-1.1.0"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -25921,13 +25985,13 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-    version = "2.1.0";
+    version = "2.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.1.0.tgz";
-      sha1 = "439c52c899e6f722276739dbb52b3211fc868caf";
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.2.1.tgz";
+      sha1 = "26c2f378cad3ad94282f8dcf0f2b1b8ddc33c612";
     };
     dependencies = [
-      sources."@reactivex/rxjs-5.4.2"
+      sources."@reactivex/rxjs-5.4.3"
       sources."chai-4.1.1"
       sources."chai-as-promised-7.1.1"
       sources."chalk-2.1.0"
@@ -25935,6 +25999,11 @@ in
       sources."fast-json-patch-2.0.4"
       sources."glob-7.1.2"
       sources."iterare-0.0.8"
+      (sources."jaeger-client-3.5.3" // {
+        dependencies = [
+          sources."opentracing-0.13.0"
+        ];
+      })
       sources."lodash-4.17.4"
       sources."mz-2.6.0"
       sources."object-hash-1.1.8"
@@ -25973,6 +26042,15 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
+      sources."node-int64-0.4.0"
+      sources."thriftrw-3.11.1"
+      sources."xorshift-0.2.1"
+      sources."bufrw-1.2.1"
+      sources."error-7.0.2"
+      sources."long-2.4.0"
+      sources."ansi-color-0.2.1"
+      sources."xtend-4.0.1"
+      sources."string-template-0.2.1"
       sources."any-promise-1.3.0"
       sources."object-assign-4.1.1"
       sources."thenify-all-1.6.0"
@@ -25992,7 +26070,7 @@ in
     version = "0.3.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz";
-      sha1 = "7630ef74577274e95ad6d386ddfa091fcee8df4b";
+      sha512 = "0v4070gii05w3qhq7bnl5jp358f3dibvjml3vnmphqhgdn2g9i94a2mrvmcyrhpa7k9f3gp63p6vgpmhihja5b3is5xc8mv4vdy8wjh";
     };
     dependencies = [
       sources."when-3.4.6"
@@ -26081,7 +26159,7 @@ in
     };
     dependencies = [
       sources."config-chain-1.1.11"
-      sources."editorconfig-0.13.2"
+      sources."editorconfig-0.13.3"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."proto-list-1.2.4"
@@ -26089,6 +26167,7 @@ in
       sources."bluebird-3.5.0"
       sources."commander-2.11.0"
       sources."lru-cache-3.2.0"
+      sources."semver-5.4.1"
       sources."sigmund-1.0.1"
       sources."pseudomap-1.0.2"
       sources."minimist-0.0.8"
@@ -26201,7 +26280,7 @@ in
     version = "0.12.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/json-server/-/json-server-0.12.0.tgz";
-      sha1 = "e8764bcb2fccbbe2a0c3bc406ea1ef04e9007308";
+      sha512 = "2iqk65hy94j010zlqsl4rzfkz4f9ic1pqbvsf5w1lrgmda9wmhxl5kmvnmwikjilmn6kz9kniqzl7rpq3xv3cmpx8rppb7ipk5ddhzj";
     };
     dependencies = [
       sources."body-parser-1.17.2"
@@ -26504,7 +26583,7 @@ in
     version = "3.9.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz";
-      sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0";
+      sha512 = "31wxw267vdf4nnjpksnzcb4i603366sjrw7g08bkxi3cwlrfl67458v7rvj72vbxcycq43z4ldkrfvqjrsvrjqrb2kfzmabpzghddq9";
     };
     dependencies = [
       sources."argparse-1.0.9"
@@ -26651,8 +26730,8 @@ in
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."remove-trailing-separator-1.0.2"
-      sources."binary-extensions-1.9.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."binary-extensions-1.10.0"
       sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
       sources."core-util-is-1.0.2"
@@ -26875,14 +26954,14 @@ in
     };
     dependencies = [
       sources."express-3.21.2"
-      (sources."passport-0.3.2" // {
+      (sources."passport-0.4.0" // {
         dependencies = [
           sources."pause-0.0.1"
         ];
       })
       sources."passport-google-oauth-1.0.0"
       sources."connect-restreamer-1.0.3"
-      sources."xml2js-0.4.17"
+      sources."xml2js-0.4.18"
       sources."basic-auth-1.0.4"
       sources."connect-2.30.2"
       sources."content-disposition-0.5.0"
@@ -27012,8 +27091,7 @@ in
       sources."passport-oauth2-1.4.0"
       sources."uid2-0.0.3"
       sources."sax-1.2.4"
-      sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.4"
+      sources."xmlbuilder-9.0.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27050,7 +27128,7 @@ in
       sources."glob-7.1.2"
       sources."globby-6.1.0"
       sources."graceful-fs-4.1.11"
-      (sources."inquirer-3.2.1" // {
+      (sources."inquirer-3.2.2" // {
         dependencies = [
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
@@ -27486,7 +27564,7 @@ in
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
       sources."is-posix-bracket-0.1.1"
-      sources."remove-trailing-separator-1.0.2"
+      sources."remove-trailing-separator-1.1.0"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -27558,7 +27636,7 @@ in
     version = "3.5.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz";
-      sha1 = "1328567d2717f997030f8006234bce9b8cd72465";
+      sha512 = "0ygdqmd1pxvdrgyympyhfy8cg90632jkggbv7l7irnzl0gaxdmyrrs9bf634046q8xq41bfxysabapgwdy8ssd58vc8nggbk0y3d1d4";
     };
     dependencies = [
       sources."browser-stdout-1.3.0"
@@ -27626,47 +27704,42 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.2.0";
+    version = "1.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.2.0.tgz";
-      sha1 = "3c0a578ffebc231a14f0c0e9078b8063ff776408";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.3.0.tgz";
+      sha1 = "e830a3bc5880dd22ae47be71a147f776542850cc";
     };
     dependencies = [
       sources."optparse-1.0.5"
-      sources."semver-5.3.0"
-      sources."npm-registry-client-7.1.2"
-      (sources."npmconf-2.0.9" // {
+      sources."semver-5.4.1"
+      sources."npm-registry-client-8.4.0"
+      (sources."npmconf-2.1.2" // {
         dependencies = [
           sources."once-1.3.3"
           sources."semver-4.3.6"
         ];
       })
-      sources."tar-1.0.3"
-      (sources."temp-0.8.3" // {
-        dependencies = [
-          sources."rimraf-2.2.8"
-        ];
-      })
-      (sources."fs.extra-1.2.1" // {
+      sources."tar-3.1.15"
+      sources."temp-0.8.3"
+      (sources."fs.extra-1.3.2" // {
         dependencies = [
           sources."mkdirp-0.3.5"
         ];
       })
       sources."findit-2.0.0"
+      sources."base64-js-1.2.1"
       sources."slasp-0.0.4"
       sources."nijs-0.0.23"
-      sources."chownr-1.0.1"
       sources."concat-stream-1.6.0"
       sources."graceful-fs-4.1.11"
-      sources."mkdirp-0.5.1"
       sources."normalize-package-data-2.4.0"
-      sources."npm-package-arg-4.2.1"
+      sources."npm-package-arg-5.1.2"
       sources."once-1.4.0"
       sources."request-2.81.0"
-      sources."retry-0.8.0"
-      sources."rimraf-2.6.1"
+      sources."retry-0.10.1"
       sources."slide-1.1.6"
-      sources."npmlog-3.1.2"
+      sources."ssri-4.1.6"
+      sources."npmlog-4.1.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
       sources."readable-stream-2.3.3"
@@ -27676,7 +27749,6 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."minimist-0.0.8"
       sources."hosted-git-info-2.5.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
@@ -27684,6 +27756,11 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
+      sources."osenv-0.1.4"
+      sources."validate-npm-package-name-3.0.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."builtins-1.0.3"
       sources."wrappy-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -27752,21 +27829,12 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.29.0"
       sources."punycode-1.4.1"
-      sources."glob-7.1.2"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."minimatch-3.0.4"
-      sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.4"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.1.2"
-      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -27779,26 +27847,25 @@ in
       sources."ansi-regex-2.1.1"
       sources."config-chain-1.1.11"
       sources."ini-1.3.4"
+      sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."osenv-0.1.4"
       sources."uid-number-0.0.5"
       sources."proto-list-1.2.4"
+      sources."minimist-0.0.8"
       sources."abbrev-1.1.0"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."block-stream-0.0.9"
-      sources."fstream-1.0.11"
+      sources."minipass-2.2.1"
+      sources."minizlib-1.0.3"
+      sources."yallist-3.0.2"
+      sources."rimraf-2.2.8"
       (sources."fs-extra-0.6.4" // {
         dependencies = [
           sources."mkdirp-0.3.5"
-          sources."rimraf-2.2.8"
         ];
       })
-      sources."walk-2.2.1"
+      sources."walk-2.3.9"
       sources."ncp-0.4.2"
       sources."jsonfile-1.0.1"
-      sources."forEachAsync-2.2.1"
-      sources."sequence-2.2.1"
+      sources."foreachasync-3.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -28452,8 +28519,8 @@ in
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."remove-trailing-separator-1.0.2"
-      sources."binary-extensions-1.9.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."binary-extensions-1.10.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.3.3"
       sources."set-immediate-shim-1.0.1"
@@ -28845,7 +28912,7 @@ in
       sources."is-negated-glob-1.0.0"
       sources."ordered-read-streams-1.0.1"
       sources."pumpify-1.3.5"
-      sources."remove-trailing-separator-1.0.2"
+      sources."remove-trailing-separator-1.1.0"
       sources."to-absolute-glob-2.0.1"
       sources."unique-stream-2.2.1"
       sources."fs.realpath-1.0.0"
@@ -29232,7 +29299,7 @@ in
     version = "5.3.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz";
-      sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17";
+      sha512 = "29izly6jqqdaslak9xz3i3bsr7qgg5vjcbzf55as0hh630z4aml48n5a7dz6skqn34d02fg3bk2zwkq7n67z787wn14vr3na9chx6v4";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -29304,7 +29371,7 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.10"
+      sources."read-package-json-2.0.11"
       sources."read-package-tree-5.1.6"
       sources."readable-stream-2.3.3"
       sources."request-2.81.0"
@@ -29479,7 +29546,7 @@ in
       sources."http-cache-semantics-3.7.3"
       sources."http-proxy-agent-2.0.0"
       sources."https-proxy-agent-2.1.0"
-      sources."node-fetch-npm-2.0.1"
+      sources."node-fetch-npm-2.0.2"
       sources."socks-proxy-agent-3.0.0"
       sources."humanize-ms-1.2.1"
       sources."ms-2.0.0"
@@ -29488,9 +29555,8 @@ in
       sources."es6-promisify-5.0.0"
       sources."es6-promise-4.1.1"
       sources."encoding-0.1.12"
-      sources."json-parse-helpfulerror-1.0.3"
+      sources."json-parse-better-errors-1.0.1"
       sources."iconv-lite-0.4.18"
-      sources."jju-1.3.0"
       sources."socks-1.1.10"
       sources."ip-1.1.5"
       sources."smart-buffer-1.1.15"
@@ -29847,7 +29913,7 @@ in
     version = "2.12.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.12.1.tgz";
-      sha1 = "9a41006f5186e8a59da7fd2b466fee9e896d865d";
+      sha512 = "2p62mjf7a9bjycq3x1jbp3vsvn8ww3ccrfx96syp7p19bzgg58q80didz4ygwn8cf1xxiyqhr3v3mwi7v9v90gnb8lsas4yz62z55ac";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -29874,7 +29940,7 @@ in
       sources."require-dir-0.3.2"
       sources."semver-5.4.1"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.38.1" // {
+      (sources."snyk-1.38.3" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -29987,7 +30053,7 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.10"
+      sources."read-package-json-2.0.11"
       sources."read-package-tree-5.1.6"
       (sources."readable-stream-2.1.5" // {
         dependencies = [
@@ -30060,7 +30126,7 @@ in
       sources."es6-symbol-3.1.1"
       sources."ms-2.0.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.26"
+      sources."es5-ext-0.10.27"
       sources."es6-iterator-2.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
@@ -30080,6 +30146,7 @@ in
       sources."os-tmpdir-1.0.2"
       sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
+      sources."json-parse-better-errors-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -30180,7 +30247,7 @@ in
       sources."snyk-module-1.8.1"
       sources."snyk-mvn-plugin-1.0.0"
       sources."snyk-policy-1.7.1"
-      sources."snyk-python-plugin-1.2.2"
+      sources."snyk-python-plugin-1.2.3"
       (sources."snyk-recursive-readdir-2.0.0" // {
         dependencies = [
           sources."minimatch-3.0.2"
@@ -30759,7 +30826,7 @@ in
     version = "0.37.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz";
-      sha1 = "535019f8dcbae8932bd38b28533bf61c0f979048";
+      sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf";
     };
     dependencies = [
       sources."airplayer-2.0.0"
@@ -30851,7 +30918,7 @@ in
       sources."dns-txt-2.0.2"
       sources."multicast-dns-6.1.1"
       sources."multicast-dns-service-types-1.1.0"
-      sources."dns-packet-1.1.1"
+      sources."dns-packet-1.2.2"
       sources."thunky-0.1.0"
       sources."ip-1.1.5"
       sources."meow-3.7.0"
@@ -31758,7 +31825,7 @@ in
     version = "5.4.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-      sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
+      sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -32339,7 +32406,7 @@ in
     version = "3.0.27";
     src = fetchurl {
       url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.27.tgz";
-      sha1 = "a97db8c8ba6b9dba4e2f88d86aa9548fa6320034";
+      sha512 = "111q9l8r0c6pfhpdpx4wi99f71n1ykfdc2h73ycdy0q1cnk78qvw837j0994nf337bm1irdj1mgzhrillmplw4vpyv8wl6p2fdh4gqw";
     };
     dependencies = [
       sources."commander-2.11.0"
@@ -32456,7 +32523,7 @@ in
       sources."os-homedir-1.0.2"
       sources."passport-0.3.2"
       sources."passport-local-1.0.0"
-      (sources."raven-2.1.1" // {
+      (sources."raven-2.1.2" // {
         dependencies = [
           sources."json-stringify-safe-5.0.1"
           sources."stack-trace-0.0.9"
@@ -32728,7 +32795,7 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.10"
+      sources."read-package-json-2.0.11"
       sources."read-package-tree-5.1.6"
       sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.1"
@@ -32869,8 +32936,7 @@ in
       sources."os-tmpdir-1.0.2"
       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."json-parse-better-errors-1.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -33127,7 +33193,7 @@ in
           sources."kew-0.7.0"
         ];
       })
-      sources."tmp-0.0.31"
+      sources."tmp-0.0.33"
       sources."follow-redirects-0.0.3"
       (sources."config-chain-1.1.11" // {
         dependencies = [
@@ -33273,10 +33339,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "3.5.2";
+    version = "3.5.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-3.5.2.tgz";
-      sha1 = "a9601066e23af3c80f3bf9758fd794ca9778f251";
+      url = "https://registry.npmjs.org/webpack/-/webpack-3.5.5.tgz";
+      sha512 = "079rx5l3h8prapxbrdddakxp5s7cbcmzy2hlmzvydmn7c4cpnlba7cprhxqazzs26iv63hm8lrc3crrwk6lx3davvwv4y0vfbi33rd9";
     };
     dependencies = [
       sources."acorn-5.1.1"
@@ -33335,7 +33401,7 @@ in
       sources."esrecurse-4.2.0"
       sources."estraverse-4.2.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.26"
+      sources."es5-ext-0.10.27"
       sources."es6-iterator-2.0.1"
       sources."es6-set-0.1.5"
       sources."es6-symbol-3.1.1"
@@ -33369,7 +33435,7 @@ in
       sources."querystring-es3-0.2.1"
       sources."stream-browserify-2.0.1"
       sources."stream-http-2.7.2"
-      sources."timers-browserify-2.0.3"
+      sources."timers-browserify-2.0.4"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -33418,14 +33484,7 @@ in
       sources."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
       sources."xtend-4.0.1"
-      (sources."global-4.3.2" // {
-        dependencies = [
-          sources."process-0.5.2"
-        ];
-      })
       sources."setimmediate-1.0.5"
-      sources."min-document-2.19.0"
-      sources."dom-walk-0.1.1"
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
       sources."has-flag-2.0.0"
@@ -33494,8 +33553,8 @@ in
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."remove-trailing-separator-1.0.2"
-      sources."binary-extensions-1.9.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."binary-extensions-1.10.0"
       sources."minimatch-3.0.4"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.8"
@@ -33702,7 +33761,7 @@ in
       sha1 = "06fe67d8040802993f9f1e1923d671cbf9ead5d1";
     };
     dependencies = [
-      sources."babel-runtime-6.25.0"
+      sources."babel-runtime-6.26.0"
       sources."bytes-2.5.0"
       sources."camelcase-4.1.0"
       sources."chalk-1.1.3"
@@ -33714,7 +33773,7 @@ in
       sources."glob-7.1.2"
       sources."gunzip-maybe-1.4.1"
       sources."ini-1.3.4"
-      (sources."inquirer-3.2.1" // {
+      (sources."inquirer-3.2.2" // {
         dependencies = [
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
@@ -33745,7 +33804,7 @@ in
       sources."v8-compile-cache-1.1.0"
       sources."validate-npm-package-license-3.0.1"
       sources."core-js-2.5.0"
-      sources."regenerator-runtime-0.10.5"
+      sources."regenerator-runtime-0.11.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -33852,7 +33911,7 @@ in
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
       sources."is-posix-bracket-0.1.1"
-      sources."remove-trailing-separator-1.0.2"
+      sources."remove-trailing-separator-1.1.0"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -33950,7 +34009,7 @@ in
     version = "2.0.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/yo/-/yo-2.0.0.tgz";
-      sha1 = "0cd75211379ed87105f99510885759062147b517";
+      sha512 = "3maxk0a2p7xyz9bkfyx3jd0inm9y7a3wc8b7rqx8p5fsmx8qkqnbvhxwn4210l689vd5p3xphn147dyclqsqmmgp7cqyswyyfsmm1lr";
     };
     dependencies = [
       sources."async-2.5.0"
@@ -33962,7 +34021,7 @@ in
       sources."fullname-3.3.0"
       sources."got-6.7.1"
       sources."humanize-string-1.0.1"
-      (sources."inquirer-3.2.1" // {
+      (sources."inquirer-3.2.2" // {
         dependencies = [
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"

From 6ff62030d989adf14fe872098480feaf05324284 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Aug 2017 09:54:27 +0200
Subject: [PATCH 2195/3246] LTS Haskell 9.1

---
 .../configuration-hackage2nix.yaml            | 483 +++++++++---------
 1 file changed, 242 insertions(+), 241 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 30ff85aed82..b8a361c3c96 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 9.0
+  # LTS Haskell 9.1
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -47,14 +47,14 @@ default-package-overrides:
   - ace ==0.6
   - action-permutations ==0.0.0.1
   - active ==0.2.0.13
-  - ad ==4.3.3
+  - ad ==4.3.4
   - adjunctions ==4.3
   - adler32 ==0.1.1.0
   - aeson ==1.1.2.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
   - aeson-compat ==0.3.6
-  - aeson-diff ==1.1.0.2
+  - aeson-diff ==1.1.0.3
   - aeson-extra ==0.4.0.0
   - aeson-generic-compat ==0.0.1.0
   - aeson-injector ==1.0.8.0
@@ -64,10 +64,10 @@ default-package-overrides:
   - aeson-utils ==0.3.0.2
   - Agda ==2.5.2
   - airship ==0.6.0
-  - alarmclock ==0.4.0.2
+  - alarmclock ==0.4.0.3
   - alerta ==0.1.0.4
   - alex ==3.2.1
-  - algebraic-graphs ==0.0.4
+  - algebraic-graphs ==0.0.5
   - alsa-core ==0.5.0.1
   - alsa-mixer ==0.2.0.3
   - alsa-pcm ==0.6.0.4
@@ -169,18 +169,18 @@ default-package-overrides:
   - anonymous-sums ==0.6.0.0
   - ansi-terminal ==0.6.3.1
   - ansi-wl-pprint ==0.6.7.3
-  - ansigraph ==0.3.0.2
+  - ansigraph ==0.3.0.3
   - api-field-json-th ==0.1.0.2
   - app-settings ==0.2.0.11
   - appar ==0.1.4
   - apportionment ==0.0.0.2
-  - approximate ==0.3
+  - approximate ==0.3.1
   - arbtt ==0.9.0.13
   - arithmoi ==0.5.0.0
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - arrow-list ==0.7
-  - arrowp-qq ==0.1
+  - arrowp-qq ==0.1.1
   - ascii-progress ==0.3.3.0
   - asciidiagram ==1.3.3
   - asn1-encoding ==0.9.5
@@ -195,7 +195,7 @@ default-package-overrides:
   - async-timer ==0.1.4.0
   - atom-basic ==0.2.5
   - atom-conduit ==0.4.0.3
-  - atomic-primops ==0.8.0.4
+  - atomic-primops ==0.8.1
   - atomic-write ==0.2.0.5
   - attoparsec ==0.13.1.0
   - attoparsec-binary ==0.2
@@ -207,18 +207,18 @@ default-package-overrides:
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
   - auto-update ==0.1.4
-  - autoexporter ==1.1.1
+  - autoexporter ==1.1.2
   - avers ==0.0.17.1
   - avers-api ==0.0.18.0
   - avers-api-docs ==0.0.18.0
   - avers-server ==0.0.19.0
   - avwx ==0.3.0.2
   - aws ==0.16
-  - axiom ==0.4.5
+  - axiom ==0.4.6
   - b9 ==0.5.32
   - backprop ==0.0.3.0
   - bake ==0.5
-  - bank-holidays-england ==0.1.0.5
+  - bank-holidays-england ==0.1.0.6
   - base-compat ==0.9.3
   - base-noprelude ==4.9.1.0
   - base-orphans ==0.6
@@ -231,8 +231,8 @@ default-package-overrides:
   - base64-string ==0.2
   - basic-prelude ==0.6.1.1
   - bcrypt ==0.0.10
-  - bench ==1.0.5
-  - benchpress ==0.2.2.9
+  - bench ==1.0.6
+  - benchpress ==0.2.2.10
   - bencode ==0.6.0.0
   - bento ==0.1.0
   - between ==0.11.0.0
@@ -241,7 +241,7 @@ default-package-overrides:
   - bimap ==0.3.3
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
-  - binary-conduit ==1.2.4.1
+  - binary-conduit ==1.2.5
   - binary-ieee754 ==0.1.0.0
   - binary-list ==1.1.1.2
   - binary-orphans ==0.1.6.0
@@ -288,14 +288,14 @@ default-package-overrides:
   - bno055-haskell ==0.1.0
   - board-games ==0.1.0.6
   - boltzmann-samplers ==0.1.0.0
-  - bookkeeping ==0.2.1.1
+  - bookkeeping ==0.2.1.4
   - bool-extras ==0.4.0
   - Boolean ==0.2.4
   - boolean-like ==0.1.1.0
   - boolsimplifier ==0.1.8
-  - boomerang ==1.4.5.2
+  - boomerang ==1.4.5.3
   - both ==0.1.1.0
-  - bound ==2
+  - bound ==2.0.1
   - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
@@ -329,7 +329,7 @@ default-package-overrides:
   - cabal-doctest ==1.0.2
   - cabal-file-th ==0.2.4
   - cabal-helper ==0.7.3.0
-  - cabal-rpm ==0.11.1
+  - cabal-rpm ==0.11.2
   - cache ==0.1.0.0
   - cacophony ==0.10.0
   - cairo ==0.13.3.1
@@ -395,7 +395,7 @@ default-package-overrides:
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.2.1
   - clustering ==0.3.1
-  - cmark ==0.5.5.1
+  - cmark ==0.5.6
   - cmark-highlight ==0.2.0.0
   - cmark-lucid ==0.1.0.0
   - cmdargs ==0.10.17
@@ -406,11 +406,11 @@ default-package-overrides:
   - colour ==2.3.3
   - comfort-graph ==0.0.2
   - commutative ==0.0.1.4
-  - comonad ==5.0.1
+  - comonad ==5.0.2
   - comonad-transformers ==4.0
   - comonads-fd ==4.0
-  - compactmap ==0.1.4.2
-  - compensated ==0.7.1
+  - compactmap ==0.1.4.2.1
+  - compensated ==0.7.2
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
   - concise ==0.1.0.0
@@ -422,7 +422,7 @@ default-package-overrides:
   - conduit-combinators ==1.1.1
   - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.16
-  - conduit-iconv ==0.1.1.1
+  - conduit-iconv ==0.1.1.2
   - conduit-parse ==0.1.2.1
   - ConfigFile ==1.1.4
   - configuration-tools ==0.2.15
@@ -478,7 +478,7 @@ default-package-overrides:
   - csv ==0.1.2
   - csv-conduit ==0.6.7
   - ctrie ==0.1.1.0
-  - cubicbezier ==0.6.0.3
+  - cubicbezier ==0.6.0.4
   - cubicspline ==0.1.2
   - cue-sheet ==0.1.1
   - curl ==1.3.8
@@ -486,7 +486,7 @@ default-package-overrides:
   - darcs ==2.12.5
   - data-accessor ==0.2.2.7
   - data-accessor-mtl ==0.2.0.4
-  - data-accessor-template ==0.2.1.13
+  - data-accessor-template ==0.2.1.14
   - data-accessor-transformers ==0.2.1.7
   - data-binary-ieee754 ==0.4.4
   - data-bword ==0.1.0.1
@@ -523,10 +523,10 @@ default-package-overrides:
   - Decimal ==0.4.2
   - declarative ==0.5.1
   - deepseq-generics ==0.2.0.0
-  - dejafu ==0.7.0.2
+  - dejafu ==0.7.1.1
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
-  - derive ==2.6.2
+  - derive ==2.6.3
   - deriving-compat ==0.3.6
   - descriptive ==0.9.4
   - diagrams ==1.4
@@ -542,7 +542,7 @@ default-package-overrides:
   - diagrams-rasterific ==1.4
   - diagrams-solve ==0.1.1
   - diagrams-svg ==1.4.1
-  - dictionaries ==0.2.0.2
+  - dictionaries ==0.2.0.3
   - Diff ==0.3.4
   - diff3 ==0.3.0
   - digest ==0.0.1.2
@@ -561,18 +561,18 @@ default-package-overrides:
   - distributed-closure ==0.3.4.0
   - distributed-static ==0.3.5.0
   - distribution ==1.1.1.0
-  - distributive ==0.5.2
+  - distributive ==0.5.3
   - diversity ==0.8.0.2
   - djinn-ghc ==0.0.2.3
   - djinn-lib ==0.0.1.2
   - dlist ==0.8.0.3
   - dlist-instances ==0.1.1.1
-  - dlist-nonempty ==0.1
+  - dlist-nonempty ==0.1.1
   - dmenu ==0.3.1.1
   - dmenu-pkill ==0.1.0.1
   - dmenu-pmount ==0.1.0.1
   - dmenu-search ==0.1.0.1
-  - dns ==2.0.10
+  - dns ==2.0.12
   - do-list ==1.0.1
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
@@ -586,14 +586,14 @@ default-package-overrides:
   - dpor ==0.2.0.0
   - drawille ==0.1.2.0
   - DRBG ==0.5.5
-  - drifter ==0.2.2
+  - drifter ==0.2.3
   - drifter-postgresql ==0.1.0
   - dsp ==0.2.3.1
   - dual-tree ==0.2.1
   - dvorak ==0.1.0.0
   - dynamic-state ==0.2.2.0
   - dyre ==0.8.12
-  - Earley ==0.12.0.0
+  - Earley ==0.12.0.1
   - easy-file ==0.2.1
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
@@ -605,26 +605,26 @@ default-package-overrides:
   - edit-distance-vector ==1.0.0.4
   - editor-open ==0.6.0.0
   - effect-handlers ==0.1.0.8
-  - effin ==0.3.0.2
+  - effin ==0.3.0.3
   - either ==4.4.1.1
   - either-unwrap ==1.1
-  - ekg ==0.4.0.13
-  - ekg-core ==0.1.1.1
-  - ekg-json ==0.1.0.5
-  - ekg-statsd ==0.2.1.0
-  - ekg-wai ==0.1.0.1
+  - ekg ==0.4.0.14
+  - ekg-core ==0.1.1.2
+  - ekg-json ==0.1.0.6
+  - ekg-statsd ==0.2.1.1
+  - ekg-wai ==0.1.0.2
   - elerea ==2.9.0
   - elm-bridge ==0.4.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - elm-export-persistent ==0.1.2
-  - email-validate ==2.3
+  - email-validate ==2.3.1
   - emailaddress ==0.2.0.0
   - enclosed-exceptions ==1.0.2
   - encoding-io ==0.0.1
   - engine-io ==1.2.17
   - engine-io-wai ==1.0.6
-  - EntrezHTTP ==1.0.3
+  - EntrezHTTP ==1.0.4
   - entropy ==0.3.8
   - enummapset ==0.5.2.1
   - enummapset-th ==0.6.1.1
@@ -638,7 +638,7 @@ default-package-overrides:
   - equivalence ==0.3.2
   - erf ==2.0.0.0
   - errors ==2.2.1
-  - ersatz ==0.4
+  - ersatz ==0.4.1
   - esqueleto ==2.5.3
   - etc ==0.2.0.0
   - etcd ==1.0.5
@@ -653,7 +653,7 @@ default-package-overrides:
   - eventful-sql-common ==0.1.3
   - eventful-sqlite ==0.1.3
   - eventful-test-helpers ==0.1.3
-  - eventstore ==0.15.0.1
+  - eventstore ==0.15.0.2
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.2
   - exception-mtl ==0.4.0.1
@@ -666,7 +666,7 @@ default-package-overrides:
   - exp-pairs ==0.1.5.2
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9
-  - extensible ==0.4.2
+  - extensible ==0.4.3
   - extensible-effects ==1.11.1.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.5.3
@@ -685,23 +685,23 @@ default-package-overrides:
   - feed ==0.3.12.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
-  - fgl ==5.5.3.1
+  - fgl ==5.5.4.0
   - fgl-arbitrary ==0.2.0.3
   - file-embed ==0.0.10
   - file-modules ==0.1.2.4
   - filecache ==0.2.9
-  - filelock ==0.1.0.1
+  - filelock ==0.1.1.2
   - filemanip ==0.3.6.3
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
-  - find-clumpiness ==0.2.1.3
+  - find-clumpiness ==0.2.2.0
   - fingertree ==0.1.1.0
   - fingertree-psqueue ==0.3
   - finite-typelits ==0.1.2.0
   - fixed ==0.2.1.1
   - fixed-length ==0.2
   - fixed-vector ==0.9.0.0
-  - fixed-vector-hetero ==0.3.1.1
+  - fixed-vector-hetero ==0.3.1.2
   - flac ==0.1.2
   - flac-picture ==0.1.1
   - flat ==0.3
@@ -709,16 +709,16 @@ default-package-overrides:
   - flexible-defaults ==0.0.1.2
   - floatshow ==0.2.4
   - flock ==0.3.1.8
-  - flow ==1.0.7
+  - flow ==1.0.8
   - fmlist ==0.9
   - fmt ==0.3.0.0
   - fn ==0.3.0.1
-  - focus ==0.1.5
+  - focus ==0.1.5.2
   - fold-debounce ==0.2.0.6
   - fold-debounce-conduit ==0.1.0.5
   - foldl ==1.2.5
   - foldl-statistics ==0.1.4.6
-  - folds ==0.7.3
+  - folds ==0.7.4
   - FontyFruity ==0.5.3.3
   - force-layout ==0.4.0.6
   - foreign-store ==0.2
@@ -738,7 +738,7 @@ default-package-overrides:
   - frisby ==0.2
   - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
-  - fsnotify ==0.2.1
+  - fsnotify ==0.2.1.1
   - fsnotify-conduit ==0.1.0.0
   - funcmp ==1.8
   - functor-classes-compat ==1
@@ -760,9 +760,9 @@ default-package-overrides:
   - ghc-exactprint ==0.5.5.0
   - ghc-heap-view ==0.5.9
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.0.1
+  - ghc-prof ==1.4.0.2
   - ghc-syb-utils ==0.2.3.2
-  - ghc-tcplugins-extra ==0.2
+  - ghc-tcplugins-extra ==0.2.1
   - ghc-typelits-extra ==0.2.3
   - ghc-typelits-knownnat ==0.3
   - ghc-typelits-natnormalise ==0.5.3
@@ -770,25 +770,25 @@ default-package-overrides:
   - ghcjs-base-stub ==0.1.0.2
   - ghcjs-codemirror ==0.0.0.1
   - ghcjs-perch ==0.3.3.2
-  - gi-atk ==2.0.12
-  - gi-cairo ==1.0.12
-  - gi-gdk ==3.0.12
-  - gi-gdkpixbuf ==2.0.12
-  - gi-gio ==2.0.12
-  - gi-glib ==2.0.12
-  - gi-gobject ==2.0.12
-  - gi-gtk ==3.0.15
-  - gi-javascriptcore ==3.0.12
-  - gi-pango ==1.0.13
-  - gi-soup ==2.4.12
-  - gi-webkit ==3.0.12
+  - gi-atk ==2.0.14
+  - gi-cairo ==1.0.14
+  - gi-gdk ==3.0.14
+  - gi-gdkpixbuf ==2.0.14
+  - gi-gio ==2.0.14
+  - gi-glib ==2.0.14
+  - gi-gobject ==2.0.14
+  - gi-gtk ==3.0.17
+  - gi-javascriptcore ==3.0.14
+  - gi-pango ==1.0.15
+  - gi-soup ==2.4.14
+  - gi-webkit ==3.0.14
   - ginger ==0.5.3.0
   - gio ==0.13.3.1
   - giphy-api ==0.5.2.0
   - git ==0.2.0
   - git-annex ==6.20170520
   - github ==0.16.0
-  - github-release ==1.0.4
+  - github-release ==1.0.5
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
@@ -813,7 +813,7 @@ default-package-overrides:
   - GLURaw ==2.0.0.3
   - GLUT ==2.7.0.12
   - gluturtle ==0.0.58.1
-  - gnuplot ==0.5.4.1
+  - gnuplot ==0.5.4.2
   - gogol ==0.3.0
   - gogol-adexchange-buyer ==0.3.0
   - gogol-adexchange-seller ==0.3.0
@@ -914,7 +914,7 @@ default-package-overrides:
   - google-cloud ==0.0.4
   - google-oauth2-jwt ==0.2.2
   - GPipe ==2.2.1
-  - GPipe-GLFW ==1.4.1
+  - GPipe-GLFW ==1.4.1.1
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graph-wrapper ==0.2.5.1
@@ -924,7 +924,7 @@ default-package-overrides:
   - graylog ==0.1.0.1
   - groom ==0.1.2.1
   - groundhog ==0.8
-  - groundhog-inspector ==0.8
+  - groundhog-inspector ==0.8.0.2
   - groundhog-mysql ==0.8
   - groundhog-postgresql ==0.8.0.1
   - groundhog-sqlite ==0.8
@@ -946,7 +946,7 @@ default-package-overrides:
   - haddock-api ==2.17.4
   - haddock-library ==1.4.3
   - haddock-test ==0.0.1
-  - hailgun ==0.4.1.4
+  - hailgun ==0.4.1.5
   - hailgun-simple ==0.1.0.0
   - hakyll ==4.9.8.0
   - hakyll-favicon ==0.1.0
@@ -955,11 +955,11 @@ default-package-overrides:
   - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.2.2
+  - hapistrano ==0.3.2.4
   - happstack-hsp ==7.3.7.3
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.4.6.4
-  - happstack-server-tls ==7.1.6.3
+  - happstack-server-tls ==7.1.6.4
   - happy ==1.19.5
   - harp ==0.4.2
   - hasbolt ==0.1.2.1
@@ -968,8 +968,9 @@ default-package-overrides:
   - hashmap ==1.3.2
   - hashtables ==1.2.1.1
   - haskeline ==0.7.4.0
-  - haskell-gi ==0.20.2
-  - haskell-gi-base ==0.20.3
+  - haskell-gi ==0.20.3
+  - haskell-gi-base ==0.20.4
+  - haskell-gi-overloading ==1.0
   - haskell-import-graph ==1.0.2
   - haskell-lexer ==1.0.1
   - haskell-lsp ==0.1.0.0
@@ -980,28 +981,28 @@ default-package-overrides:
   - haskell-src-exts ==1.18.2
   - haskell-src-exts-simple ==1.19.0.0
   - haskell-src-meta ==0.8.0.1
-  - haskell-tools-ast ==0.8.0.0
-  - haskell-tools-backend-ghc ==0.8.0.0
+  - haskell-tools-ast ==0.8.1.0
+  - haskell-tools-backend-ghc ==0.8.1.0
   - haskell-tools-cli ==0.8.0.0
-  - haskell-tools-daemon ==0.8.0.0
-  - haskell-tools-debug ==0.8.0.0
-  - haskell-tools-demo ==0.8.0.0
-  - haskell-tools-prettyprint ==0.8.0.0
-  - haskell-tools-refactor ==0.8.0.0
-  - haskell-tools-rewrite ==0.8.0.0
+  - haskell-tools-daemon ==0.8.1.0
+  - haskell-tools-debug ==0.8.1.0
+  - haskell-tools-demo ==0.8.1.0
+  - haskell-tools-prettyprint ==0.8.1.0
+  - haskell-tools-refactor ==0.8.1.0
+  - haskell-tools-rewrite ==0.8.1.0
   - HaskellNet ==0.5.1
-  - HaskellNet-SSL ==0.3.3.0
+  - HaskellNet-SSL ==0.3.4.0
   - haskintex ==0.7.0.1
-  - hasmin ==0.3.2.2
-  - hasql ==0.19.18
+  - hasmin ==0.3.2.4
+  - hasql ==0.19.18.1
   - hasql-migration ==0.1.3
   - hasql-pool ==0.4.1
   - hasql-transaction ==0.5
   - hastache ==0.6.1
   - hasty-hamiltonian ==1.3.0
-  - HaTeX ==3.17.3.0
+  - HaTeX ==3.17.3.1
   - hatex-guide ==1.3.1.6
-  - haxl ==0.5.0.0
+  - haxl ==0.5.1.0
   - haxl-amazonka ==0.1.1
   - HaXml ==1.25.4
   - haxr ==3000.11.2
@@ -1013,14 +1014,14 @@ default-package-overrides:
   - HDBC-mysql ==0.7.1.0
   - HDBC-session ==0.1.1.1
   - hdevtools ==0.1.5.0
-  - hdocs ==0.5.2.0
+  - hdocs ==0.5.2.1
   - heap ==1.0.3
-  - heaps ==0.3.4.1
+  - heaps ==0.3.5
   - heatshrink ==0.1.0.0
   - hebrew-time ==0.1.1
   - hedgehog ==0.5
   - hedgehog-quickcheck ==0.1
-  - hedis ==0.9.8
+  - hedis ==0.9.9
   - here ==1.2.11
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.0
@@ -1048,13 +1049,13 @@ default-package-overrides:
   - hjsonpointer ==1.2.0
   - hjsonschema ==1.6.3
   - hlibgit2 ==0.18.0.16
-  - hlibsass ==0.1.6.0
+  - hlibsass ==0.1.6.1
   - hlint ==2.0.9
   - hmatrix ==0.18.0.0
   - hmatrix-gsl ==0.18.0.1
   - hmatrix-gsl-stats ==0.4.1.6
   - hmatrix-special ==0.4.0.1
-  - hmpfr ==0.4.2.1
+  - hmpfr ==0.4.3
   - hoauth2 ==1.3.0
   - hocilib ==0.2.0
   - holy-project ==0.2.0.1
@@ -1070,7 +1071,7 @@ default-package-overrides:
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
   - hpio ==0.8.0.10
-  - hpp ==0.4.0
+  - hpp ==0.4.1
   - hpqtypes ==1.5.1.1
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
@@ -1082,14 +1083,14 @@ default-package-overrides:
   - hsb2hs ==0.3.1
   - hscolour ==1.24.1
   - hscurses ==1.4.2.0
-  - hsdev ==0.2.5.0
+  - hsdev ==0.2.5.1
   - hsdns ==1.7
   - hse-cpp ==0.2
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
   - HSet ==0.0.1
   - hset ==2.2.0
-  - hsexif ==0.6.1.1
+  - hsexif ==0.6.1.2
   - hsignal ==0.2.7.5
   - hsinstall ==1.6
   - hslogger ==1.2.10
@@ -1097,7 +1098,7 @@ default-package-overrides:
   - hslua-aeson ==0.1.0.4
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.9
+  - HsOpenSSL ==0.11.4.11
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.4.4
@@ -1123,10 +1124,10 @@ default-package-overrides:
   - hstatsd ==0.1
   - HStringTemplate ==0.8.6
   - hsx-jmacro ==7.3.8
-  - hsx2hs ==0.14.1
+  - hsx2hs ==0.14.1.1
   - hsyslog ==5.0.1
   - htaglib ==1.1.1
-  - HTF ==0.13.1.0
+  - HTF ==0.13.2.2
   - html ==1.0.1.2
   - html-conduit ==1.2.1.1
   - html-email-validate ==0.2.0.0
@@ -1152,14 +1153,14 @@ default-package-overrides:
   - hunit-dejafu ==0.6.0.0
   - hvect ==0.4.0.0
   - hw-balancedparens ==0.1.0.2
-  - hw-bits ==0.5.0.2
+  - hw-bits ==0.5.0.3
   - hw-diagnostics ==0.0.0.5
   - hw-excess ==0.1.0.1
   - hw-int ==0.0.0.1
   - hw-parser ==0.0.0.2
   - hw-prim ==0.4.0.3
-  - hw-rankselect ==0.8.0.1
-  - hw-rankselect-base ==0.2.0.0
+  - hw-rankselect ==0.8.0.2
+  - hw-rankselect-base ==0.2.0.1
   - hw-string-parse ==0.0.0.3
   - hw-succinct ==0.1.0.1
   - hweblib ==0.6.3
@@ -1175,7 +1176,7 @@ default-package-overrides:
   - hxt-tagsoup ==9.1.4
   - hxt-unicode ==9.0.2.4
   - hybrid-vectors ==0.2.1
-  - hyperloglog ==0.4.1
+  - hyperloglog ==0.4.2
   - hyphenation ==0.7
   - ical ==0.0.1
   - iconv ==0.4.1.3
@@ -1186,7 +1187,7 @@ default-package-overrides:
   - IfElse ==0.85
   - iff ==0.0.6
   - ignore ==0.1.1.0
-  - ihs ==0.1.0.0
+  - ihs ==0.1.0.1
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
   - Imlib ==0.1.2
@@ -1207,14 +1208,14 @@ default-package-overrides:
   - instance-control ==0.1.1.1
   - integer-logarithms ==1.0.2
   - integration ==0.2.1
-  - intero ==0.1.20
+  - intero ==0.1.21
   - interpolate ==0.1.1
   - interpolatedstring-perl6 ==1.0.0
   - interpolation ==0.1.0.1
   - IntervalMap ==0.5.2.0
-  - intervals ==0.8
+  - intervals ==0.8.1
   - intro ==0.3.0.1
-  - invariant ==0.4.2
+  - invariant ==0.4.3
   - invertible ==0.2.0.2
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
@@ -1222,15 +1223,15 @@ default-package-overrides:
   - io-memoize ==1.1.1.0
   - io-region ==0.1.1
   - io-storage ==0.3
-  - io-streams ==1.4.0.0
+  - io-streams ==1.4.1.0
   - io-streams-haproxy ==1.0.0.1
   - ip6addr ==0.5.3
   - iproute ==1.7.1
   - IPv6Addr ==1.0.1
   - IPv6DB ==0.2.1
   - irc ==0.6.1.0
-  - irc-client ==0.4.4.2
-  - irc-conduit ==0.2.2.1
+  - irc-client ==0.4.4.4
+  - irc-conduit ==0.2.2.3
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
   - islink ==0.1.0.0
@@ -1240,7 +1241,7 @@ default-package-overrides:
   - isotope ==0.5.0.1
   - iterable ==3.0
   - ix-shapable ==0.1.0
-  - ixset-typed ==0.3.1
+  - ixset-typed ==0.3.1.1
   - jack ==0.7.1.1
   - jailbreak-cabal ==1.3.2
   - javascript-extras ==0.3.1.0
@@ -1281,7 +1282,7 @@ default-package-overrides:
   - lackey ==0.4.3
   - lame ==0.1.1
   - language-c ==0.6.1
-  - language-c-quote ==0.12
+  - language-c-quote ==0.12.1
   - language-dockerfile ==0.3.6.0
   - language-ecmascript ==0.17.2.0
   - language-fortran ==0.5.1
@@ -1298,16 +1299,16 @@ default-package-overrides:
   - lattices ==1.5.0
   - lazyio ==0.1.0.4
   - lca ==0.3
-  - leancheck ==0.6.3
+  - leancheck ==0.6.4
   - leapseconds-announced ==2017
-  - lens ==4.15.3
-  - lens-action ==0.2.1
-  - lens-aeson ==1.0.1
+  - lens ==4.15.4
+  - lens-action ==0.2.2
+  - lens-aeson ==1.0.2
   - lens-datetime ==0.3
   - lens-family ==1.2.1
   - lens-family-core ==1.2.1
-  - lens-family-th ==0.5.0.0
-  - lens-labels ==0.1.0.1
+  - lens-family-th ==0.5.0.1
+  - lens-labels ==0.1.0.2
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
   - lentil ==1.0.9.0
@@ -1317,7 +1318,7 @@ default-package-overrides:
   - libffi ==0.1
   - libgit ==0.3.1
   - libinfluxdb ==0.0.4
-  - libmpd ==0.9.0.6
+  - libmpd ==0.9.0.7
   - libnotify ==0.2
   - librato ==0.2.0.1
   - libsystemd-journal ==1.4.2
@@ -1328,15 +1329,15 @@ default-package-overrides:
   - lifted-async ==0.9.3
   - lifted-base ==0.2.3.11
   - line ==3.1.0
-  - linear ==1.20.6
-  - linear-accelerate ==0.4
+  - linear ==1.20.7
+  - linear-accelerate ==0.4.1
   - linked-list-with-iterator ==0.1.1.0
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.2.0
   - List ==0.6.0
   - list-fusion-probe ==0.1.0.6
   - list-prompt ==0.1.1.0
-  - list-t ==1
+  - list-t ==1.0.0.1
   - ListLike ==4.5.1
   - listsafe ==0.1.0.1
   - llvm-hs ==4.2.0
@@ -1344,10 +1345,10 @@ default-package-overrides:
   - lmdb ==0.2.5
   - loch-th ==0.2.1
   - log ==0.9.0.1
-  - log-base ==0.7.1.1
-  - log-domain ==0.11.1
-  - log-elasticsearch ==0.9.0.1
-  - log-postgres ==0.7.0.1
+  - log-base ==0.7.2.0
+  - log-domain ==0.11.2
+  - log-elasticsearch ==0.9.1.0
+  - log-postgres ==0.7.0.2
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
   - logging-effect ==1.2.0
@@ -1359,8 +1360,8 @@ default-package-overrides:
   - lrucaching ==0.3.2
   - lucid ==2.9.8.1
   - lucid-svg ==0.7.0.0
-  - lzma-conduit ==1.1.3.1
-  - machines ==0.6.2
+  - lzma-conduit ==1.1.3.3
+  - machines ==0.6.3
   - machines-binary ==0.3.0.3
   - machines-directory ==0.2.1.0
   - machines-io ==0.2.0.13
@@ -1384,10 +1385,10 @@ default-package-overrides:
   - matrix ==0.3.5.0
   - matrix-market-attoparsec ==0.1.0.8
   - maximal-cliques ==0.1.1
-  - mbox ==0.3.3
+  - mbox ==0.3.4
   - mbox-utility ==0.0.1
   - mcmc-types ==1.0.3
-  - med-module ==0.1
+  - med-module ==0.1.1
   - mediabus ==0.4.0.1
   - mediabus-rtp ==0.4.0.1
   - median-stream ==0.7.0.0
@@ -1398,11 +1399,11 @@ default-package-overrides:
   - mersenne-random-pure64 ==0.2.2.0
   - messagepack ==0.5.4
   - messagepack-rpc ==0.5.1
-  - metrics ==0.4.0.1
+  - metrics ==0.4.1.1
   - MFlow ==0.4.6.0
   - mfsolve ==0.3.2.0
   - microformats2-parser ==1.0.1.7
-  - microlens ==0.4.8.0
+  - microlens ==0.4.8.1
   - microlens-aeson ==2.2.0.1
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.8.0
@@ -1413,7 +1414,7 @@ default-package-overrides:
   - midi ==0.2.2.1
   - midi-music-box ==0.0.0.4
   - mighty-metropolis ==1.2.0
-  - mime-mail ==0.4.13.1
+  - mime-mail ==0.4.14
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
   - minio-hs ==0.3.0
@@ -1429,12 +1430,12 @@ default-package-overrides:
   - mockery ==0.3.5
   - model ==0.3
   - modify-fasta ==0.8.2.3
-  - monad-control ==1.0.2.1
+  - monad-control ==1.0.2.2
   - monad-coroutine ==0.9.0.3
   - monad-extras ==0.6.0
   - monad-http ==0.1.0.0
   - monad-journal ==0.7.2
-  - monad-logger ==0.3.24
+  - monad-logger ==0.3.25
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.6
   - monad-logger-syslog ==0.1.4.0
@@ -1445,7 +1446,7 @@ default-package-overrides:
   - monad-parallel ==0.7.2.2
   - monad-peel ==0.2.1.2
   - monad-products ==4.0.1
-  - monad-skeleton ==0.1.4
+  - monad-skeleton ==0.1.5
   - monad-time ==0.2
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.0
@@ -1457,12 +1458,12 @@ default-package-overrides:
   - MonadRandom ==0.5.1
   - monads-tf ==0.1.0.3
   - mongoDB ==2.3.0
-  - mono-traversable ==1.0.2
+  - mono-traversable ==1.0.2.1
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
-  - monoid-subclasses ==0.4.3.2
+  - monoid-subclasses ==0.4.4
   - monoid-transformer ==0.0.3
-  - monoidal-containers ==0.3.0.1
+  - monoidal-containers ==0.3.0.2
   - morte ==1.6.9
   - mountpoints ==1.0.2
   - mstate ==0.2.7
@@ -1473,7 +1474,7 @@ default-package-overrides:
   - multimap ==1.2.1
   - multipart ==0.1.2
   - multiset ==0.3.3
-  - multistate ==0.7.1.1
+  - multistate ==0.7.1.2
   - murmur-hash ==0.1.0.9
   - mushu ==0.1.1
   - MusicBrainz ==0.3
@@ -1507,7 +1508,7 @@ default-package-overrides:
   - network-conduit-tls ==1.2.2
   - network-house ==0.1.0.2
   - network-info ==0.2.0.8
-  - network-ip ==0.3
+  - network-ip ==0.3.0.2
   - network-msgpack-rpc ==0.0.3
   - network-multicast ==0.2.0
   - Network-NineP ==0.4.1
@@ -1527,7 +1528,7 @@ default-package-overrides:
   - nix-paths ==1.0.0.1
   - non-empty ==0.3
   - non-empty-sequence ==0.2.0.2
-  - non-negative ==0.1.1
+  - non-negative ==0.1.1.2
   - nonce ==1.0.4
   - nondeterminism ==1.4
   - NoTrace ==0.3.0.1
@@ -1536,17 +1537,17 @@ default-package-overrides:
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.2
   - numeric-quest ==0.2.0.1
-  - numhask ==0.0.7
+  - numhask ==0.0.9
   - numhask-range ==0.0.4
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
-  - nvim-hs ==0.2.2
+  - nvim-hs ==0.2.4
   - nvim-hs-contrib ==0.2.0
   - nvim-hs-ghcid ==0.2.0
   - oanda-rest-api ==0.4.1
   - objective ==1.1.1
   - ObjectName ==1.1.0.1
-  - octane ==0.20.0
+  - octane ==0.20.2
   - Octree ==0.5.4.3
   - oeis ==0.3.9
   - ofx ==0.4.2.0
@@ -1558,10 +1559,10 @@ default-package-overrides:
   - online ==0.2.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
-  - opaleye ==0.5.3.0
+  - opaleye ==0.5.4.0
   - opaleye-trans ==0.3.5
   - open-browser ==0.2.1.0
-  - open-witness ==0.4
+  - open-witness ==0.4.0.1
   - OpenAL ==1.7.0.4
   - openexr-write ==0.1.0.1
   - OpenGL ==3.0.2.0
@@ -1586,7 +1587,7 @@ default-package-overrides:
   - packunused ==0.1.2
   - pager ==0.1.1.0
   - pagerduty ==0.0.8
-  - pagination ==0.2.0
+  - pagination ==0.2.1
   - palette ==0.1.0.4
   - pandoc ==1.19.2.1
   - pandoc-citeproc ==0.10.5.1
@@ -1600,7 +1601,7 @@ default-package-overrides:
   - parsec-numeric ==0.1.0.0
   - ParsecTools ==0.0.2.0
   - parser-combinators ==0.1.0
-  - parsers ==0.12.5
+  - parsers ==0.12.7
   - partial-handler ==1.0.2
   - partial-isomorphisms ==0.2.2.1
   - partial-order ==0.1.2.1
@@ -1615,7 +1616,7 @@ default-package-overrides:
   - pattern-arrows ==0.0.2
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.0.4
-  - pcre-utils ==0.1.8.1
+  - pcre-utils ==0.1.8.1.1
   - pdf-toolbox-content ==0.0.5.1
   - pdf-toolbox-core ==0.0.4.1
   - pdf-toolbox-document ==0.0.7.1
@@ -1640,7 +1641,7 @@ default-package-overrides:
   - picoparsec ==0.1.2.3
   - picosat ==0.1.4
   - pid1 ==0.1.2.0
-  - pinboard ==0.9.12.4
+  - pinboard ==0.9.12.5
   - pinch ==0.3.2.0
   - pinchot ==0.24.0.0
   - pipes ==4.3.4
@@ -1651,7 +1652,7 @@ default-package-overrides:
   - pipes-concurrency ==2.0.7
   - pipes-extras ==1.0.10
   - pipes-fluid ==0.5.0.3
-  - pipes-group ==1.0.6
+  - pipes-group ==1.0.7
   - pipes-misc ==0.3.0.0
   - pipes-mongodb ==0.1.0.0
   - pipes-parse ==3.0.8
@@ -1667,7 +1668,7 @@ default-package-overrides:
   - plot-gtk ==0.2.0.4
   - plot-gtk-ui ==0.3.0.2
   - plot-gtk3 ==0.1.0.2
-  - plot-light ==0.2.4
+  - plot-light ==0.2.7
   - point-octree ==0.5.5.3
   - pointed ==5
   - pointedlist ==0.6.1
@@ -1685,13 +1686,13 @@ default-package-overrides:
   - postgresql-libpq ==0.9.3.1
   - postgresql-schema ==0.1.11
   - postgresql-simple ==0.5.3.0
-  - postgresql-simple-migration ==0.1.9.0
+  - postgresql-simple-migration ==0.1.11.0
   - postgresql-simple-opts ==0.2.0.2
-  - postgresql-simple-queue ==0.5.0.0
+  - postgresql-simple-queue ==0.5.0.1
   - postgresql-simple-url ==0.2.0.0
   - postgresql-transactional ==1.1.1
   - postgresql-typed ==0.5.1
-  - pqueue ==1.3.2.2
+  - pqueue ==1.3.2.3
   - pred-set ==0.0.1
   - pred-trie ==0.5.1.2
   - prednote ==0.36.0.4
@@ -1707,8 +1708,8 @@ default-package-overrides:
   - pretty-simple ==2.0.0.0
   - pretty-types ==0.2.3.1
   - prettyclass ==1.0.0.0
-  - prettyprinter ==1.1
-  - prettyprinter-ansi-terminal ==1.1
+  - prettyprinter ==1.1.1
+  - prettyprinter-ansi-terminal ==1.1.1.1
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
@@ -1721,23 +1722,23 @@ default-package-overrides:
   - profiterole ==0.1
   - profiteur ==0.4.3.0
   - profunctor-extras ==4.0
-  - profunctors ==5.2
+  - profunctors ==5.2.1
   - project-template ==0.2.0
   - projectroot ==0.2.0.1
   - prometheus-client ==0.2.0
   - prometheus-metrics-ghc ==0.2.0
   - prompt ==0.1.1.2
   - proto-lens ==0.2.1.0
-  - proto-lens-arbitrary ==0.1.1.0
+  - proto-lens-arbitrary ==0.1.1.1
   - proto-lens-combinators ==0.1.0.7
   - proto-lens-descriptors ==0.2.1.0
-  - proto-lens-optparse ==0.1.0.3
+  - proto-lens-optparse ==0.1.0.4
   - proto-lens-protobuf-types ==0.2.1.0
   - proto-lens-protoc ==0.2.1.0
   - protobuf ==0.2.1.1
   - protobuf-simple ==0.1.0.4
-  - protocol-buffers ==2.4.2
-  - protocol-buffers-descriptor ==2.4.2
+  - protocol-buffers ==2.4.3
+  - protocol-buffers-descriptor ==2.4.3
   - protolude ==0.1.10
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
@@ -1776,8 +1777,8 @@ default-package-overrides:
   - rank-product ==0.2.0.1
   - rank1dynamic ==0.3.3.0
   - Rasterific ==0.7.2.1
-  - rasterific-svg ==0.3.2.1
-  - ratel ==0.3.4
+  - rasterific-svg ==0.3.3
+  - ratel ==0.3.5
   - ratel-wai ==0.2.0
   - rattletrap ==2.5.0
   - raw-strings-qq ==1.1
@@ -1791,14 +1792,14 @@ default-package-overrides:
   - readable ==0.3.1
   - ReadArgs ==1.2.3
   - readline ==1.0.3.0
-  - rebase ==1.0.8
+  - rebase ==1.0.8.1
   - recursion-schemes ==5.0.2
   - redis-io ==0.7.0
   - redis-resp ==0.4.0
   - reducers ==3.12.1
   - ref-fd ==0.4.0.1
   - refact ==0.3.0.2
-  - references ==0.3.2.1
+  - references ==0.3.2.2
   - refined ==0.1.2.1
   - reflection ==2.1.2
   - reform ==0.2.7.1
@@ -1837,7 +1838,7 @@ default-package-overrides:
   - resourcet ==1.1.9
   - rest-client ==0.5.1.1
   - rest-core ==0.39
-  - rest-gen ==0.20.0.0
+  - rest-gen ==0.20.0.1
   - rest-happstack ==0.3.1.1
   - rest-snap ==0.2.0.1
   - rest-stringmap ==0.2.0.6
@@ -1845,7 +1846,7 @@ default-package-overrides:
   - rest-wai ==0.2.0.1
   - result ==0.2.6.0
   - rethinkdb ==2.2.0.10
-  - rethinkdb-client-driver ==0.0.23
+  - rethinkdb-client-driver ==0.0.24
   - retry ==0.7.4.2
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
@@ -1854,7 +1855,7 @@ default-package-overrides:
   - rot13 ==0.2.0.1
   - rotating-log ==0.4.2
   - RSA ==2.3.0
-  - rss-conduit ==0.3.1.1
+  - rss-conduit ==0.3.1.2
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
@@ -1862,12 +1863,12 @@ default-package-overrides:
   - safe-exceptions ==0.1.6.0
   - safe-exceptions-checked ==0.1.0
   - safecopy ==0.9.3.2
-  - safeio ==0.0.2.0
+  - safeio ==0.0.3.0
   - SafeSemaphore ==0.10.1
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.2
-  - sandi ==0.4.0
+  - sandi ==0.4.1
   - sandman ==0.2.0.1
   - say ==0.1.0.0
   - scalpel ==0.5.1
@@ -1886,11 +1887,11 @@ default-package-overrides:
   - search-algorithms ==0.2.0
   - securemem ==0.1.9
   - SegmentTree ==0.3
-  - selda ==0.1.9.0
-  - selda-postgresql ==0.1.5.1
-  - selda-sqlite ==0.1.5.1
+  - selda ==0.1.10.1
+  - selda-postgresql ==0.1.6.0
+  - selda-sqlite ==0.1.6.0
   - semigroupoid-extras ==5
-  - semigroupoids ==5.2
+  - semigroupoids ==5.2.1
   - semigroups ==0.18.3
   - semiring-simple ==1.0.0.1
   - semver ==0.3.3.1
@@ -1915,7 +1916,7 @@ default-package-overrides:
   - servant-purescript ==0.8.0.0
   - servant-ruby ==0.2.1.0
   - servant-server ==0.11
-  - servant-static-th ==0.1.0.4
+  - servant-static-th ==0.1.0.5
   - servant-subscriber ==0.6.0.0
   - servant-swagger ==1.1.3.1
   - servant-swagger-ui ==0.2.4.3.0.20
@@ -1940,11 +1941,11 @@ default-package-overrides:
   - should-not-typecheck ==2.1.0
   - show-prettyprint ==0.2
   - sibe ==0.2.0.5
-  - signal ==0.1.0.3
+  - signal ==0.1.0.4
   - silently ==1.2.5
   - simple ==0.11.2
   - simple-download ==0.0.2
-  - simple-log ==0.9.2
+  - simple-log ==0.9.3
   - simple-reflect ==0.3.2
   - simple-sendfile ==0.2.25
   - simple-session ==0.10.1.1
@@ -1958,15 +1959,15 @@ default-package-overrides:
   - slave-thread ==1.0.2
   - slug ==0.1.7
   - smallcaps ==0.6.0.4
-  - smallcheck ==1.1.1
+  - smallcheck ==1.1.2
   - smallcheck-series ==0.6
   - smoothie ==0.4.2.7
   - smtp-mail ==0.1.4.6
   - snap-blaze ==0.2.1.5
-  - snap-core ==1.0.2.1
-  - snap-server ==1.0.2.2
+  - snap-core ==1.0.3.0
+  - snap-server ==1.0.3.0
   - snowflake ==0.1.1.1
-  - snowtify ==0.1.0.0
+  - snowtify ==0.1.0.3
   - soap ==0.2.3.5
   - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.2
@@ -1979,7 +1980,7 @@ default-package-overrides:
   - sorted-list ==0.2.0.0
   - sound-collage ==0.2.0.1
   - sourcemap ==0.1.6
-  - sox ==0.2.2.6
+  - sox ==0.2.2.7
   - soxlib ==0.0.3
   - sparkle ==0.5.0.1
   - sparse-linear-algebra ==0.2.9.7
@@ -1996,7 +1997,7 @@ default-package-overrides:
   - Spock-api ==0.12.0.0
   - Spock-api-server ==0.12.0.0
   - Spock-core ==0.12.0.0
-  - Spock-lucid ==0.4.0.0
+  - Spock-lucid ==0.4.0.1
   - Spock-worker ==0.3.1.0
   - spool ==0.1
   - spreadsheet ==0.1.3.5
@@ -2013,14 +2014,14 @@ default-package-overrides:
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.0.4
-  - stateWriter ==0.2.8
+  - stateWriter ==0.2.8.2
   - static-canvas ==0.2.0.3
   - statistics ==0.13.3.0
   - stemmer ==0.5.2
   - stm ==2.4.4.1
   - stm-chans ==3.0.0.4
   - stm-conduit ==3.0.0
-  - stm-containers ==0.2.15
+  - stm-containers ==0.2.16
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.2
   - stm-split ==0.0.2
@@ -2032,7 +2033,7 @@ default-package-overrides:
   - storable-endian ==0.2.6
   - storable-record ==0.0.3.1
   - storable-tuple ==0.0.3.2
-  - storablevector ==0.2.12
+  - storablevector ==0.2.12.1
   - storablevector-carray ==0.0
   - store ==0.4.3.1
   - store-core ==0.4.1
@@ -2056,21 +2057,21 @@ default-package-overrides:
   - stringable ==0.1.3
   - stringbuilder ==0.5.0
   - stringsearch ==0.3.6.6
-  - strive ==3.0.3
+  - strive ==3.0.4
   - stylish-haskell ==0.8.1.0
-  - sum-type-boilerplate ==0.1.0
+  - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
   - superrecord ==0.3.0.0
   - svg-builder ==0.1.0.2
-  - svg-tree ==0.6.1
+  - svg-tree ==0.6.2
   - SVGFonts ==1.6.0.1
   - swagger ==0.3.0
   - swagger2 ==2.1.4.1
   - syb ==0.7
   - symbol ==0.2.4
   - symengine ==0.1.2.0
-  - synthesizer-core ==0.8.1
+  - synthesizer-core ==0.8.1.1
   - synthesizer-dimensional ==0.8.0.2
   - synthesizer-midi ==0.6.0.4
   - sysinfo ==0.1.1
@@ -2081,7 +2082,7 @@ default-package-overrides:
   - tabular ==0.2.2.7
   - tagchup ==0.4.1
   - tagged ==0.8.5
-  - tagged-binary ==0.2.0.0
+  - tagged-binary ==0.2.0.1
   - tagged-identity ==0.1.2
   - tagshare ==0.0
   - tagsoup ==0.14.1
@@ -2089,7 +2090,7 @@ default-package-overrides:
   - tar ==0.5.0.3
   - tar-conduit ==0.1.1
   - tardis ==0.4.1.0
-  - tasty ==0.11.2.3
+  - tasty ==0.11.2.5
   - tasty-ant-xml ==1.1.0
   - tasty-auto ==0.2.0.0
   - tasty-dejafu ==0.6.0.0
@@ -2106,10 +2107,10 @@ default-package-overrides:
   - tasty-rerun ==1.1.7
   - tasty-silver ==3.1.10
   - tasty-smallcheck ==0.8.1
-  - tasty-stats ==0.2.0.2
+  - tasty-stats ==0.2.0.3
   - tasty-tap ==0.0.4
   - tasty-th ==0.1.7
-  - Taxonomy ==1.0.2
+  - Taxonomy ==1.0.3
   - TCache ==0.12.1
   - tce-conf ==1.3
   - tcp-streams ==0.6.0.0
@@ -2118,7 +2119,7 @@ default-package-overrides:
   - tdigest-Chart ==0
   - teardown ==0.1.0.1
   - template ==0.2.0.10
-  - temporary ==1.2.1
+  - temporary ==1.2.1.1
   - temporary-rc ==1.2.0.3
   - tensorflow ==0.1.0.2
   - tensorflow-core-ops ==0.1.0.0
@@ -2130,7 +2131,7 @@ default-package-overrides:
   - terminal-progress-bar ==0.1.1.1
   - terminal-size ==0.3.2.1
   - terminfo ==0.4.1.0
-  - test-fixture ==0.5.0.1
+  - test-fixture ==0.5.0.2
   - test-framework ==0.8.1.1
   - test-framework-hunit ==0.3.0.2
   - test-framework-quickcheck2 ==0.3.0.4
@@ -2158,17 +2159,17 @@ default-package-overrides:
   - textlocal ==0.1.0.5
   - tf-random ==0.5
   - tfp ==1.0.0.2
-  - th-abstraction ==0.2.3.0
+  - th-abstraction ==0.2.5.0
   - th-data-compat ==0.0.2.4
   - th-desugar ==1.6
   - th-expand-syns ==0.4.3.0
   - th-extras ==0.0.0.4
   - th-lift ==0.7.7
   - th-lift-instances ==0.1.11
-  - th-orphans ==0.13.3
+  - th-orphans ==0.13.4
   - th-reify-compat ==0.0.1.2
-  - th-reify-many ==0.1.7
-  - th-to-exp ==0.0.1.0
+  - th-reify-many ==0.1.8
+  - th-to-exp ==0.0.1.1
   - th-utilities ==0.2.0.1
   - these ==0.7.3
   - thread-local-storage ==0.1.1
@@ -2207,8 +2208,8 @@ default-package-overrides:
   - transformers-base ==0.4.4
   - transformers-compat ==0.5.1.4
   - transformers-lift ==0.2.0.1
-  - transient ==0.5.8
-  - transient-universe ==0.4.6
+  - transient ==0.5.9.2
+  - transient-universe ==0.4.6.1
   - traverse-with-class ==1.0.0.0
   - tree-fun ==0.8.1.0
   - tries ==0.0.4.2
@@ -2242,8 +2243,8 @@ default-package-overrides:
   - typed-process ==0.1.0.0
   - typelits-witnesses ==0.2.3.0
   - typography-geometry ==1.0.0.1
-  - tz ==0.1.2.1
-  - tzdata ==0.1.20161123.0
+  - tz ==0.1.3.0
+  - tzdata ==0.1.20170320.0
   - ua-parser ==0.7.4
   - uglymemo ==0.1.0.1
   - unbound ==0.5.1
@@ -2255,9 +2256,9 @@ default-package-overrides:
   - unfoldable-restricted ==0.0.3
   - unicode ==0.0
   - unicode-show ==0.1.0.2
-  - unicode-transforms ==0.3.2
+  - unicode-transforms ==0.3.3
   - unification-fd ==0.10.0.1
-  - union ==0.1.1.1
+  - union ==0.1.1.2
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
@@ -2266,7 +2267,7 @@ default-package-overrides:
   - unit-constraint ==0.0.0
   - units ==2.4
   - units-defs ==2.0.1.1
-  - units-parser ==0.1.0.0
+  - units-parser ==0.1.0.1
   - universe ==1.0
   - universe-base ==1.0.2.1
   - universe-instances-base ==1.0
@@ -2282,7 +2283,7 @@ default-package-overrides:
   - unordered-containers ==0.2.8.0
   - unsafe ==0.0
   - uri-bytestring ==0.2.3.3
-  - uri-bytestring-aeson ==0.1.0.1
+  - uri-bytestring-aeson ==0.1.0.2
   - uri-encode ==1.5.0.5
   - uri-templater ==0.2.1.0
   - url ==2.1.3
@@ -2297,13 +2298,13 @@ default-package-overrides:
   - uu-parsinglib ==2.9.1.1
   - uuid ==1.3.13
   - uuid-types ==1.0.3
-  - vado ==0.0.8
+  - vado ==0.0.9
   - validate-input ==0.4.0.0
   - validation ==0.5.4
   - validationt ==0.2.0.0
   - varying ==0.7.0.3
   - vault ==0.3.0.7
-  - vcswrapper ==0.1.5
+  - vcswrapper ==0.1.6
   - vector ==0.12.0.1
   - vector-algorithms ==0.7.0.1
   - vector-binary-instances ==0.2.3.5
@@ -2319,7 +2320,7 @@ default-package-overrides:
   - versions ==3.1.1
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.2
-  - viewprof ==0.0.0.6
+  - viewprof ==0.0.0.8
   - vinyl ==0.5.3
   - vinyl-utils ==0.3.0.0
   - void ==0.7.2
@@ -2364,7 +2365,7 @@ default-package-overrides:
   - web-routes-boomerang ==0.28.4.2
   - web-routes-happstack ==0.23.11
   - web-routes-hsp ==0.24.6.1
-  - web-routes-th ==0.22.6.1
+  - web-routes-th ==0.22.6.2
   - web-routes-wai ==0.24.3
   - webdriver ==0.8.5
   - webdriver-angular ==0.1.11
@@ -2376,8 +2377,8 @@ default-package-overrides:
   - websockets-rpc ==0.4.0
   - websockets-simple ==0.0.2
   - websockets-snap ==0.10.2.3
-  - weeder ==0.1.6
-  - weigh ==0.0.4
+  - weeder ==0.1.7
+  - weigh ==0.0.5
   - wikicfp-scraper ==0.1.0.9
   - wild-bind ==0.1.0.3
   - wild-bind-indicator ==0.1.0.1
@@ -2388,7 +2389,7 @@ default-package-overrides:
   - Win32-notify ==0.3.0.1
   - wire-streams ==0.1.1.0
   - with-location ==0.1.0
-  - withdependencies ==0.2.4
+  - withdependencies ==0.2.4.1
   - witherable ==0.1.3.4
   - witness ==0.4
   - wizards ==1.0.2
@@ -2400,7 +2401,7 @@ default-package-overrides:
   - wl-pprint-text ==1.1.1.0
   - word-trie ==0.3.0
   - word24 ==2.0.1
-  - word8 ==0.1.2
+  - word8 ==0.1.3
   - Workflow ==0.8.3
   - wrap ==0.0.0
   - wreq ==0.5.0.1
@@ -2413,10 +2414,10 @@ default-package-overrides:
   - X11 ==1.8
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
-  - x509 ==1.7.1
-  - x509-store ==1.6.3
-  - x509-system ==1.6.5
-  - x509-validation ==1.6.8
+  - x509 ==1.7.2
+  - x509-store ==1.6.5
+  - x509-system ==1.6.6
+  - x509-validation ==1.6.9
   - Xauth ==0.1
   - xdcc ==1.1.4
   - xdg-basedir ==0.2.2
@@ -2456,14 +2457,14 @@ default-package-overrides:
   - yesod-auth-basic ==0.1.0.2
   - yesod-auth-fb ==1.8.1
   - yesod-auth-hashdb ==1.6.1
-  - yesod-bin ==1.5.2.3
-  - yesod-core ==1.4.35.1
+  - yesod-bin ==1.5.2.5
+  - yesod-core ==1.4.36
   - yesod-default ==1.2.0
   - yesod-eventsource ==1.4.1
   - yesod-fb ==0.4.0
   - yesod-form ==1.4.13
-  - yesod-form-bootstrap4 ==0.1.0.0
-  - yesod-form-richtext ==0.1.0.1
+  - yesod-form-bootstrap4 ==0.1.0.1
+  - yesod-form-richtext ==0.1.0.2
   - yesod-gitrepo ==0.2.1.0
   - yesod-gitrev ==0.1.0.0
   - yesod-job-queue ==0.3.0.4
@@ -2477,28 +2478,28 @@ default-package-overrides:
   - yesod-table ==2.0.3
   - yesod-test ==1.5.8
   - yesod-websockets ==0.2.6
-  - yi-core ==0.14.0
-  - yi-frontend-vty ==0.14.0
-  - yi-fuzzy-open ==0.14.0
-  - yi-ireader ==0.14.0
-  - yi-keymap-cua ==0.14.0
-  - yi-keymap-emacs ==0.14.0
-  - yi-keymap-vim ==0.14.0
-  - yi-language ==0.14.0
-  - yi-misc-modes ==0.14.0
-  - yi-mode-haskell ==0.14.0
-  - yi-mode-javascript ==0.14.0
+  - yi-core ==0.14.1
+  - yi-frontend-vty ==0.14.1
+  - yi-fuzzy-open ==0.14.1
+  - yi-ireader ==0.14.1
+  - yi-keymap-cua ==0.14.1
+  - yi-keymap-emacs ==0.14.1
+  - yi-keymap-vim ==0.14.1
+  - yi-language ==0.14.1
+  - yi-misc-modes ==0.14.1
+  - yi-mode-haskell ==0.14.1
+  - yi-mode-javascript ==0.14.1
   - yi-rope ==0.9
-  - yi-snippet ==0.14.0
+  - yi-snippet ==0.14.1
   - yjsvg ==0.2.0.1
   - yjtools ==0.9.18
   - yoga ==0.0.0.1
-  - youtube ==0.2.1
+  - youtube ==0.2.1.1
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.7
   - zip ==0.1.11
   - zip-archive ==0.3.1.1
-  - zippers ==0.2.3
+  - zippers ==0.2.4
   - ziptastic-client ==0.3.0.3
   - ziptastic-core ==0.2.0.3
   - zlib ==0.6.1.2

From 7b73fb3b8a5a5f074b65ccf2f1c62835b9a642d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Aug 2017 03:00:32 +0200
Subject: [PATCH 2196/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4.1-4-g53777ef from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/79410fccc7b8142a93f10445d4e0911a2690b750.
---
 .../haskell-modules/hackage-packages.nix      | 5631 +++--------------
 1 file changed, 874 insertions(+), 4757 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3590fed19d2..c0d8bb23bd4 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3975,8 +3975,8 @@ self: {
      }:
      mkDerivation {
        pname = "DeepDarkFantasy";
-       version = "0.2017.8.11";
-       sha256 = "14ibpvqy8awv6mcdm7ywybq5pk6wf6hwqq18mq8l116jgi7c9vvr";
+       version = "0.2017.8.16";
+       sha256 = "1gkvg5vd1r9a6zxz7q7w9096015k1bjqay1y58k9w3v8b1iw3w02";
        libraryHaskellDepends = [
          base bimap constraints containers mtl random recursion-schemes
          template-haskell
@@ -4575,29 +4575,6 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "Earley";
-       version = "0.12.0.0";
-       sha256 = "0drkf9jc99vb82h0mb6x8plj1sn0ysdkmq5pqdyz7xq4ghj7srcq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ListLike ];
-       executableHaskellDepends = [ base unordered-containers ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq ListLike parsec
-       ];
-       description = "Parsing all context-free grammars using Earley's algorithm";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Earley_0_12_0_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      , unordered-containers
@@ -4618,7 +4595,6 @@ self: {
        ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ebnf2ps" = callPackage
@@ -4791,23 +4767,6 @@ self: {
      }) {};
 
   "EntrezHTTP" = callPackage
-    ({ mkDerivation, base, biocore, bytestring, conduit, HTTP
-     , http-conduit, hxt, mtl, network, Taxonomy, text, transformers
-     }:
-     mkDerivation {
-       pname = "EntrezHTTP";
-       version = "1.0.3";
-       sha256 = "16x8z6s17wgf53wmp8lib9nr7a2jsa1n95714q4gqs2vif646p1r";
-       libraryHaskellDepends = [
-         base biocore bytestring conduit HTTP http-conduit hxt mtl network
-         Taxonomy text transformers
-       ];
-       homepage = "https://github.com/eggzilla/EntrezHTTP";
-       description = "Libary to interface with the NCBI Entrez REST service";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "EntrezHTTP_1_0_4" = callPackage
     ({ mkDerivation, base, biocore, bytestring, conduit, HTTP
      , http-conduit, hxt, mtl, network, Taxonomy, text, transformers
      }:
@@ -4822,7 +4781,6 @@ self: {
        homepage = "https://github.com/eggzilla/EntrezHTTP";
        description = "Libary to interface with the NCBI Entrez REST service";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EnumContainers" = callPackage
@@ -6148,18 +6106,6 @@ self: {
      }) {};
 
   "GPipe-GLFW" = callPackage
-    ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }:
-     mkDerivation {
-       pname = "GPipe-GLFW";
-       version = "1.4.1";
-       sha256 = "0is6f58rs68pqnhqr26wj0nsaf2m6x40iaxvlq1w4m62f8n1g1kb";
-       libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
-       homepage = "https://github.com/plredmond/GPipe-GLFW";
-       description = "GLFW OpenGL context creation for GPipe";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "GPipe-GLFW_1_4_1_1" = callPackage
     ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }:
      mkDerivation {
        pname = "GPipe-GLFW";
@@ -6170,7 +6116,6 @@ self: {
        homepage = "https://github.com/plredmond/GPipe-GLFW";
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPipe-TextureLoad" = callPackage
@@ -8533,8 +8478,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "HSvm";
-       version = "0.1.0.2.89";
-       sha256 = "1mb8kclb7631ihj356g5ddf758cnwz9y6r5ck72daa7vndz01aa9";
+       version = "0.1.0.3.22";
+       sha256 = "015b1l2grjx79rvn17nmjnzdc5zh30v30f21svr7a9kn7ic8mb4d";
        libraryHaskellDepends = [ base containers ];
        description = "Haskell Bindings for libsvm";
        license = stdenv.lib.licenses.bsd3;
@@ -8542,39 +8487,6 @@ self: {
      }) {};
 
   "HTF" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, array, base
-     , base64-bytestring, bytestring, containers, cpphs, Diff, directory
-     , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl
-     , old-time, pretty, process, QuickCheck, random, regex-compat
-     , template-haskell, temporary, text, time, unix
-     , unordered-containers, vector, xmlgen
-     }:
-     mkDerivation {
-       pname = "HTF";
-       version = "0.13.1.0";
-       sha256 = "0iz81pmc5prl0643jg53ywa65h7s16blchpvasnvfvvn47p6kd0w";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring bytestring containers cpphs Diff
-         directory haskell-src HUnit lifted-base monad-control mtl old-time
-         pretty process QuickCheck random regex-compat text time unix vector
-         xmlgen
-       ];
-       executableHaskellDepends = [
-         array base cpphs directory HUnit mtl old-time random text
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring directory filepath HUnit mtl
-         process random regex-compat template-haskell temporary text
-         unordered-containers
-       ];
-       homepage = "https://github.com/skogsbaer/HTF/";
-       description = "The Haskell Test Framework";
-       license = "LGPL";
-     }) {};
-
-  "HTF_0_13_2_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base
      , base64-bytestring, bytestring, containers, cpphs, Diff, directory
      , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl
@@ -8605,7 +8517,6 @@ self: {
        homepage = "https://github.com/skogsbaer/HTF/";
        description = "The Haskell Test Framework";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTTP" = callPackage
@@ -8891,14 +8802,14 @@ self: {
      }:
      mkDerivation {
        pname = "HaTeX";
-       version = "3.17.3.0";
-       sha256 = "1p1nimr7cjn7iizdkpxfr97c8ycz6gpn6jm6qgyllmwp3bnzkial";
+       version = "3.17.3.1";
+       sha256 = "1vq22yf90cxq6a224zw73c1iqqbcsa2swasds605y9kwp9wzf6db";
        libraryHaskellDepends = [
          base bytestring containers hashable matrix parsec QuickCheck text
          transformers wl-pprint-extras
        ];
        testHaskellDepends = [
-         base QuickCheck tasty tasty-quickcheck text
+         base parsec QuickCheck tasty tasty-quickcheck text
        ];
        homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
        description = "The Haskell LaTeX library";
@@ -9280,23 +9191,6 @@ self: {
      }) {};
 
   "HaskellNet-SSL" = callPackage
-    ({ mkDerivation, base, bytestring, connection, data-default
-     , HaskellNet, network, tls
-     }:
-     mkDerivation {
-       pname = "HaskellNet-SSL";
-       version = "0.3.3.0";
-       sha256 = "1x6miw5ph4qndsy345yym209r5lxsjsmmgyap6x1xjwxjcmlcz8p";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring connection data-default HaskellNet network tls
-       ];
-       homepage = "https://github.com/dpwright/HaskellNet-SSL";
-       description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HaskellNet-SSL_0_3_4_0" = callPackage
     ({ mkDerivation, base, bytestring, connection, data-default
      , HaskellNet, network, tls
      }:
@@ -9311,7 +9205,6 @@ self: {
        homepage = "https://github.com/dpwright/HaskellNet-SSL";
        description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskellTorrent" = callPackage
@@ -9898,8 +9791,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsHTSLib";
-       version = "1.3.2.1";
-       sha256 = "03qxsld5rw3j5wqm9zqfb51msyw22976ga0zibmaxc9slm684lyk";
+       version = "1.3.2.2";
+       sha256 = "0i4lflc8s8byvsc4idh4fm6yzdspx0v4mahwrqrk7i2dbs84fpkw";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing conduit-combinators containers
          inline-c mtl template-haskell
@@ -9960,10 +9853,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsOpenSSL";
-       version = "0.11.4.9";
-       sha256 = "0y5khy8a1anisa8s1zysz763yg29mr6c9zcx4bjszaba5axyj3za";
-       revision = "1";
-       editedCabalFile = "0hxqmki50di5vkkfhb684kz3dvqx7gw7cxzdq2h3q10gdjki0avp";
+       version = "0.11.4.11";
+       sha256 = "0dgywjkvzxwpr33l642cw8v2gqn3s8kclg97xs1w8a5pqcg647pp";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring integer-gmp network time
@@ -9975,26 +9866,6 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) openssl;};
 
-  "HsOpenSSL_0_11_4_10" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
-     , openssl, time
-     }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.4.10";
-       sha256 = "1jlyjyfv421k176y4mjdxgvj3cp2a05xqwy0qlihbf9j385fz0l7";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         base bytestring integer-gmp network time
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/vshabanov/HsOpenSSL";
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
@@ -15851,8 +15722,8 @@ self: {
     ({ mkDerivation, base, containers, ghc, ghc-paths }:
      mkDerivation {
        pname = "SSTG";
-       version = "0.1.1.5";
-       sha256 = "06rc050abq6vfgn0ylfrycp6m3631ji0mq9jwz5cnlhnrhpzfn5j";
+       version = "0.1.1.7";
+       sha256 = "1qgkqd025cd9q0la36i45kd356n8sxnzgnq40v71sdbv8f7wb4yh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ghc ghc-paths ];
@@ -16042,20 +15913,23 @@ self: {
      }) {};
 
   "SciFlow" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, directory
-     , exceptions, executable-path, fgl, graphviz, lens, lifted-async
-     , mtl, optparse-applicative, rainbow, shelly, split, sqlite-simple
-     , template-haskell, text, th-lift, transformers, yaml
+    ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
+     , containers, data-default-class, directory, exceptions
+     , executable-path, fgl, graphviz, lens, lifted-async, mtl, network
+     , optparse-applicative, rainbow, split, sqlite-simple
+     , template-haskell, temporary, text, th-lift, th-lift-instances
+     , time, transformers, yaml
      }:
      mkDerivation {
        pname = "SciFlow";
-       version = "0.5.3.1";
-       sha256 = "1w6vdzbcznfkncad1qpigx89r5a469ryszapcvm4bcjpgq20i14d";
+       version = "0.6.0";
+       sha256 = "1b57sa2gx3jj00239sq62qmywjykc80lkk587lwzrdp9w5ycl4sb";
        libraryHaskellDepends = [
-         base bytestring cereal containers directory exceptions
-         executable-path fgl graphviz lens lifted-async mtl
-         optparse-applicative rainbow shelly split sqlite-simple
-         template-haskell text th-lift transformers yaml
+         aeson base bytestring cereal cereal-text containers
+         data-default-class directory exceptions executable-path fgl
+         graphviz lens lifted-async mtl network optparse-applicative rainbow
+         split sqlite-simple template-haskell temporary text th-lift
+         th-lift-instances time transformers yaml
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
@@ -16865,18 +16739,6 @@ self: {
      }) {};
 
   "Spock-lucid" = callPackage
-    ({ mkDerivation, base, lucid, Spock, transformers }:
-     mkDerivation {
-       pname = "Spock-lucid";
-       version = "0.4.0.0";
-       sha256 = "0v7jmfnmxmcqz8c490xb6wikb2rfb4zqjnjx8syw3mvdqpd1mjh9";
-       libraryHaskellDepends = [ base lucid Spock transformers ];
-       homepage = "http://github.com/aelve/Spock-lucid";
-       description = "Lucid support for Spock";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock-lucid_0_4_0_1" = callPackage
     ({ mkDerivation, base, lucid, Spock, transformers }:
      mkDerivation {
        pname = "Spock-lucid";
@@ -16886,7 +16748,6 @@ self: {
        homepage = "http://github.com/aelve/Spock-lucid";
        description = "Lucid support for Spock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-worker" = callPackage
@@ -17432,21 +17293,6 @@ self: {
      }) {};
 
   "Taxonomy" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl
-     , graphviz, parsec, text, vector
-     }:
-     mkDerivation {
-       pname = "Taxonomy";
-       version = "1.0.2";
-       sha256 = "076j2jj45insbj9v98iygm7ighk210xja3dm8ar9jnjmrpar8gil";
-       libraryHaskellDepends = [
-         aeson base bytestring either-unwrap fgl graphviz parsec text vector
-       ];
-       description = "Libary for parsing, processing and vizualization of taxonomy data";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "Taxonomy_1_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl
      , graphviz, parsec, text, vector
      }:
@@ -17459,7 +17305,6 @@ self: {
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TaxonomyTools" = callPackage
@@ -18339,8 +18184,8 @@ self: {
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.1.1";
-       sha256 = "0zba13j6va4bnyxgkp7yq5y7mvyw94x0932kf75b33bw3pan04hz";
+       version = "0.1.1.4";
+       sha256 = "0rdklpqa0g7fv2ah8khbgjngaxp8lfvf9i4wlmbg1755r6irhz9a";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -19336,6 +19181,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Yampa_0_10_6_1" = callPackage
+    ({ mkDerivation, base, deepseq, hcwiid, random, SDL }:
+     mkDerivation {
+       pname = "Yampa";
+       version = "0.10.6.1";
+       sha256 = "108rn0hc5xqw8pmadaddgawxpsznhjg8kbn9m30lwz04hv2ivjrv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base deepseq random ];
+       executableHaskellDepends = [ base deepseq hcwiid random SDL ];
+       testHaskellDepends = [ base ];
+       homepage = "http://www.haskell.org/haskellwiki/Yampa";
+       description = "Library for programming hybrid systems";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Yampa-core" = callPackage
     ({ mkDerivation, base, deepseq, random, vector-space }:
      mkDerivation {
@@ -20919,27 +20781,6 @@ self: {
      }) {};
 
   "ad" = callPackage
-    ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad
-     , containers, criterion, data-reify, directory, doctest, erf
-     , filepath, free, nats, reflection, transformers
-     }:
-     mkDerivation {
-       pname = "ad";
-       version = "4.3.3";
-       sha256 = "0anvcw3zdslmbjra8h75s5fwcl7d1i79ydvdcd0vwz6m0cbqrf3j";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         array base comonad containers data-reify erf free nats reflection
-         transformers
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       benchmarkHaskellDepends = [ base criterion erf ];
-       homepage = "http://github.com/ekmett/ad";
-       description = "Automatic Differentiation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ad_4_3_4" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad
      , containers, criterion, data-reify, directory, doctest, erf
      , filepath, free, nats, reflection, transformers
@@ -20960,7 +20801,6 @@ self: {
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adaptive-containers" = callPackage
@@ -21440,7 +21280,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-diff" = callPackage
+  "aeson-diff_1_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
      , optparse-applicative, QuickCheck, quickcheck-instances
@@ -21466,6 +21306,35 @@ self: {
        homepage = "https://github.com/thsutton/aeson-diff";
        description = "Extract and apply patches to JSON documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "aeson-diff" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest
+     , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
+     , optparse-applicative, QuickCheck, quickcheck-instances
+     , scientific, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-diff";
+       version = "1.1.0.3";
+       sha256 = "13fbb270zaljgimy6pnyy2n8iwcxnb2pgs9b55qr94k3jnrjnl0g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring edit-distance-vector hashable mtl scientific
+         text unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory doctest filepath Glob hlint
+         QuickCheck quickcheck-instances text unordered-containers vector
+       ];
+       homepage = "https://github.com/thsutton/aeson-diff";
+       description = "Extract and apply patches to JSON documents";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "aeson-extra" = callPackage
@@ -22549,20 +22418,6 @@ self: {
      }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
-    ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }:
-     mkDerivation {
-       pname = "alarmclock";
-       version = "0.4.0.2";
-       sha256 = "077950dzy89042l8dbm1vc7mvqrkbsdmrq3cj78j3lfyr4m42k58";
-       libraryHaskellDepends = [
-         async base clock stm time unbounded-delays
-       ];
-       homepage = "https://bitbucket.org/davecturner/alarmclock";
-       description = "Wake up and perform an action at a certain time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "alarmclock_0_4_0_3" = callPackage
     ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }:
      mkDerivation {
        pname = "alarmclock";
@@ -22574,7 +22429,6 @@ self: {
        homepage = "https://bitbucket.org/davecturner/alarmclock";
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alea" = callPackage
@@ -22798,22 +22652,6 @@ self: {
      }) {};
 
   "algebraic-graphs" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, extra
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "algebraic-graphs";
-       version = "0.0.4";
-       sha256 = "1d8f92vlq7j0k578qkx92ffavwjxmdry8zncjm0vmvkl3nb4i4zm";
-       libraryHaskellDepends = [ array base containers ];
-       testHaskellDepends = [ base containers extra QuickCheck ];
-       benchmarkHaskellDepends = [ base containers criterion ];
-       homepage = "https://github.com/snowleopard/alga";
-       description = "A library for algebraic graph construction and transformation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "algebraic-graphs_0_0_5" = callPackage
     ({ mkDerivation, array, base, containers, criterion, extra
      , QuickCheck
      }:
@@ -22827,7 +22665,6 @@ self: {
        homepage = "https://github.com/snowleopard/alga";
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic-prelude" = callPackage
@@ -25578,19 +25415,6 @@ self: {
      }) {};
 
   "ansigraph" = callPackage
-    ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "ansigraph";
-       version = "0.3.0.2";
-       sha256 = "082sy0fwhr41qg9q3igc31rc56sfw1lijqnahlv4fl87f52zrknk";
-       libraryHaskellDepends = [ ansi-terminal base ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/BlackBrane/ansigraph";
-       description = "Terminal-based graphing via ANSI and Unicode";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ansigraph_0_3_0_3" = callPackage
     ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "ansigraph";
@@ -25601,7 +25425,6 @@ self: {
        homepage = "https://github.com/BlackBrane/ansigraph";
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antagonist" = callPackage
@@ -26600,29 +26423,6 @@ self: {
      }) {};
 
   "approximate" = callPackage
-    ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
-     , comonad, deepseq, directory, doctest, filepath, ghc-prim
-     , hashable, lens, log-domain, pointed, safecopy, semigroupoids
-     , semigroups, simple-reflect, vector
-     }:
-     mkDerivation {
-       pname = "approximate";
-       version = "0.3";
-       sha256 = "0zg94yqbm6iasjkf8bxz1bnwc3gx5lh6603cvab8rrxz4xm7k27j";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base binary bytes cereal comonad deepseq ghc-prim hashable lens
-         log-domain pointed safecopy semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base directory doctest filepath semigroups simple-reflect
-       ];
-       homepage = "http://github.com/analytics/approximate/";
-       description = "Approximate discrete values and numbers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "approximate_0_3_1" = callPackage
     ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
      , comonad, deepseq, directory, doctest, filepath, ghc-prim
      , hashable, lens, log-domain, pointed, safecopy, semigroupoids
@@ -26643,7 +26443,6 @@ self: {
        homepage = "http://github.com/analytics/approximate/";
        description = "Approximate discrete values and numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "approximate-equality" = callPackage
@@ -27350,23 +27149,6 @@ self: {
      }) {};
 
   "arrowp-qq" = callPackage
-    ({ mkDerivation, array, base, containers, haskell-src
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "arrowp-qq";
-       version = "0.1";
-       sha256 = "05cj6drvnk74bcjkr1pqj65c57y09gwmribii887jvg6p77abkgv";
-       libraryHaskellDepends = [
-         array base containers haskell-src template-haskell transformers
-       ];
-       homepage = "http://www.haskell.org/arrows/";
-       description = "quasiquoter translating arrow notation into Haskell 98";
-       license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "arrowp-qq_0_1_1" = callPackage
     ({ mkDerivation, array, base, containers, haskell-src
      , template-haskell, transformers
      }:
@@ -27652,6 +27434,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "asn1-codec" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , containers, contravariant, cryptonite, directory, hashable, HUnit
+     , integer-gmp, memory, network, pretty, stm, test-framework
+     , test-framework-hunit, text, vector
+     }:
+     mkDerivation {
+       pname = "asn1-codec";
+       version = "0.1.0";
+       sha256 = "1l3ka458aggj04zn2sn3p1mzkrjsgy8p7rg45031cxr401msks5b";
+       libraryHaskellDepends = [
+         base bytestring containers contravariant cryptonite hashable
+         integer-gmp memory network pretty stm text vector
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring directory HUnit
+         test-framework test-framework-hunit text vector
+       ];
+       homepage = "https://github.com/andrewthad/asn1-codec";
+       description = "Encode and decode ASN.1";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "asn1-data" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, text }:
      mkDerivation {
@@ -28361,18 +28166,6 @@ self: {
      }) {};
 
   "atomic-primops" = callPackage
-    ({ mkDerivation, base, ghc-prim, primitive }:
-     mkDerivation {
-       pname = "atomic-primops";
-       version = "0.8.0.4";
-       sha256 = "0r4qvf9cgv5a2h0dk6blxhahk808pmihma9k2ym3h1cchj9y7qa7";
-       libraryHaskellDepends = [ base ghc-prim primitive ];
-       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
-       description = "A safe approach to CAS and other atomic ops in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "atomic-primops_0_8_1" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive }:
      mkDerivation {
        pname = "atomic-primops";
@@ -28382,7 +28175,6 @@ self: {
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "A safe approach to CAS and other atomic ops in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-primops-foreign" = callPackage
@@ -29097,23 +28889,6 @@ self: {
      }) {};
 
   "autoexporter" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "autoexporter";
-       version = "1.1.1";
-       sha256 = "004wbgdnyxdwrx9z6l9920m63s1xs61q5ilazyg4f2mqmm9svw6j";
-       revision = "1";
-       editedCabalFile = "0a4ffbggz52wc0ki44bvqdsiqpbydsbhh0cc9vjw8lhja1y8fpif";
-       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;
-     }) {};
-
-  "autoexporter_1_1_2" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
@@ -29126,7 +28901,6 @@ self: {
        homepage = "https://github.com/tfausak/autoexporter#readme";
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autom" = callPackage
@@ -30069,8 +29843,8 @@ self: {
      }:
      mkDerivation {
        pname = "axiom";
-       version = "0.4.5";
-       sha256 = "0z08zgqab3i3ipwry828fy5j1m1r5n6lw4mjsria07crq7ny8z3i";
+       version = "0.4.6";
+       sha256 = "0i78rbkzmlfr9454m6ax1wk2f76ks5mc2qp0zqir0ds1x2614rc3";
        libraryHaskellDepends = [
          base bytestring containers directory ghcjs-perch mtl transformers
          transient transient-universe
@@ -30435,8 +30209,8 @@ self: {
        pname = "ballast";
        version = "0.1.0.0";
        sha256 = "1skzfj5l4j1jgpc0dlqmwpysa4bf9f9jpllz6zqb17zknicd77qf";
-       revision = "1";
-       editedCabalFile = "0lcxvxrpsbr5ibcwda6vrhrsc55grwabfikw34bc9r1rv293399i";
+       revision = "2";
+       editedCabalFile = "1xpw3rpr0fb6k4q1nzcjl1mqq62pbd0gwwa808nwdk9533mpjfyf";
        libraryHaskellDepends = [
          aeson base bytestring either-unwrap hspec hspec-expectations
          http-client http-client-tls http-types text time transformers
@@ -30625,19 +30399,6 @@ self: {
      }) {};
 
   "bank-holidays-england" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
-     mkDerivation {
-       pname = "bank-holidays-england";
-       version = "0.1.0.5";
-       sha256 = "0q1pm1bx7nz3vxrn04ikswjnbql1mny4shyv92ps6bkn29wdn686";
-       libraryHaskellDepends = [ base containers time ];
-       testHaskellDepends = [ base containers hspec QuickCheck time ];
-       homepage = "https://bitbucket.org/davecturner/bank-holidays-england";
-       description = "Calculation of bank holidays in England and Wales";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bank-holidays-england_0_1_0_6" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
        pname = "bank-holidays-england";
@@ -30648,7 +30409,6 @@ self: {
        homepage = "https://bitbucket.org/davecturner/bank-holidays-england";
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "banwords" = callPackage
@@ -31572,24 +31332,6 @@ self: {
      }) {};
 
   "bench" = callPackage
-    ({ mkDerivation, base, criterion, optparse-applicative, silently
-     , text, turtle
-     }:
-     mkDerivation {
-       pname = "bench";
-       version = "1.0.5";
-       sha256 = "0fm92vwavgnh7pm0491vy5x21wylckga4a2n765nbw5hzmk9pz92";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base criterion optparse-applicative silently text turtle
-       ];
-       homepage = "https://github.com/Gabriel439/bench";
-       description = "Command-line benchmark tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bench_1_0_6" = callPackage
     ({ mkDerivation, base, criterion, optparse-applicative, silently
      , text, turtle
      }:
@@ -31602,10 +31344,9 @@ self: {
        executableHaskellDepends = [
          base criterion optparse-applicative silently text turtle
        ];
-       homepage = "https://github.com/Gabriel439/bench";
+       homepage = "http://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "benchmark-function" = callPackage
@@ -31621,21 +31362,6 @@ self: {
      }) {};
 
   "benchpress" = callPackage
-    ({ mkDerivation, base, bytestring, mtl, time }:
-     mkDerivation {
-       pname = "benchpress";
-       version = "0.2.2.9";
-       sha256 = "1asabacjv8x61w6qpkqlxr5w1j6fcppiva1k2vrsr8brvsyrdihm";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base mtl time ];
-       executableHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/WillSewell/benchpress";
-       description = "Micro-benchmarking with detailed statistics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "benchpress_0_2_2_10" = callPackage
     ({ mkDerivation, base, bytestring, mtl, time }:
      mkDerivation {
        pname = "benchpress";
@@ -31648,7 +31374,6 @@ self: {
        homepage = "https://github.com/WillSewell/benchpress";
        description = "Micro-benchmarking with detailed statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bencode" = callPackage
@@ -32280,26 +32005,6 @@ self: {
      }) {};
 
   "binary-conduit" = callPackage
-    ({ mkDerivation, base, binary, bytestring, conduit, hspec
-     , QuickCheck, quickcheck-assertions, resourcet, vector
-     }:
-     mkDerivation {
-       pname = "binary-conduit";
-       version = "1.2.4.1";
-       sha256 = "10nalqf3zhg49b5drhw4y8zv9c3nsnlbc7bvw9la8vgzpihbnp24";
-       libraryHaskellDepends = [
-         base binary bytestring conduit resourcet vector
-       ];
-       testHaskellDepends = [
-         base binary bytestring conduit hspec QuickCheck
-         quickcheck-assertions resourcet
-       ];
-       homepage = "http://github.com/qnikst/binary-conduit/";
-       description = "data serialization/deserialization conduit library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "binary-conduit_1_2_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, conduit, hspec
      , QuickCheck, quickcheck-assertions, resourcet, vector
      }:
@@ -32317,7 +32022,6 @@ self: {
        homepage = "http://github.com/qnikst/binary-conduit/";
        description = "data serialization/deserialization conduit library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-derive" = callPackage
@@ -33238,13 +32942,13 @@ self: {
     ({ mkDerivation, base, bindings-DSL, g15 }:
      mkDerivation {
        pname = "bindings-libg15";
-       version = "0.1.0.0";
-       sha256 = "0vaayi9vnis9d35yrym67ihghfqyz4d13h86m3b27znwk7fqsz0d";
+       version = "0.2.0.0";
+       sha256 = "1dy4z0m7r7sicqzx4lfibi4nbx6vaq31x93h38v90vn5i4n903vs";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ g15 ];
        homepage = "https://github.com/Xandaros/bindings-libg15#readme";
        description = "Bindings to libg15";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {g15 = null;};
 
@@ -35786,19 +35490,6 @@ self: {
      }) {};
 
   "bookkeeping" = callPackage
-    ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }:
-     mkDerivation {
-       pname = "bookkeeping";
-       version = "0.2.1.1";
-       sha256 = "1dbzw6q35v35xvrcs9q2digiv0r8h32f4yby2kw5m8qiba3cf86r";
-       libraryHaskellDepends = [ base dlist mtl text time ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
-       description = "A module for bookkeeping by double entry";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "bookkeeping_0_2_1_4" = callPackage
     ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }:
      mkDerivation {
        pname = "bookkeeping";
@@ -35809,7 +35500,6 @@ self: {
        homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
        description = "A module for bookkeeping by double entry";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bookkeeping-jp" = callPackage
@@ -35959,17 +35649,6 @@ self: {
      }) {};
 
   "boomerang" = callPackage
-    ({ mkDerivation, base, mtl, template-haskell, text }:
-     mkDerivation {
-       pname = "boomerang";
-       version = "1.4.5.2";
-       sha256 = "1gm2l34f5vzxh78vx02hwg7b19q3qvynff0y8kss5svx83a4bpl6";
-       libraryHaskellDepends = [ base mtl template-haskell text ];
-       description = "Library for invertible parsing and printing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "boomerang_1_4_5_3" = callPackage
     ({ mkDerivation, base, mtl, template-haskell, text }:
      mkDerivation {
        pname = "boomerang";
@@ -35978,7 +35657,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell text ];
        description = "Library for invertible parsing and printing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boomslang" = callPackage
@@ -36117,32 +35795,6 @@ self: {
      }) {};
 
   "bound" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
-     , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest
-     , functor-classes-compat, hashable, mmorph, profunctors
-     , template-haskell, transformers, transformers-compat, vector, void
-     }:
-     mkDerivation {
-       pname = "bound";
-       version = "2";
-       sha256 = "0z63k6kkj43rvwzsy7rbrxz97f8clq87ajbdv7768xziw4mb022x";
-       revision = "1";
-       editedCabalFile = "1sdsshbvhv955ncgxygzl4mfkkk76rdkilwc70w04j9jmbvj5p6j";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base bifunctors binary bytes cereal comonad deepseq hashable mmorph
-         profunctors template-haskell transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base deriving-compat doctest functor-classes-compat transformers
-         transformers-compat vector void
-       ];
-       homepage = "http://github.com/ekmett/bound/";
-       description = "Making de Bruijn Succ Less";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bound_2_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
      , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest
      , functor-classes-compat, hashable, mmorph, profunctors
@@ -36166,7 +35818,6 @@ self: {
        homepage = "http://github.com/ekmett/bound/";
        description = "Making de Bruijn Succ Less";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bound-gen" = callPackage
@@ -38560,12 +38211,13 @@ self: {
 
   "cabal-plan" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring
-     , bytestring, containers, directory, filepath, mtl, text
+     , bytestring, containers, directory, filepath, mtl
+     , optparse-applicative, text
      }:
      mkDerivation {
        pname = "cabal-plan";
-       version = "0.1.1.0";
-       sha256 = "0sgaysfgv6z0mvyvzrly4xmj273mwq96zygbq6j5vjhqp1zdacxa";
+       version = "0.2.0.0";
+       sha256 = "1hxsrk6avv69gqajx94n2nzlivhy3ywwmlx6c0w2nnaz854j1ya0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38573,7 +38225,8 @@ self: {
          filepath text
        ];
        executableHaskellDepends = [
-         ansi-terminal base bytestring containers mtl text
+         ansi-terminal base bytestring containers mtl optparse-applicative
+         text
        ];
        homepage = "https://github.com/hvr/cabal-plan";
        description = "Library and utiltity for processing cabal's plan.json file";
@@ -38613,24 +38266,6 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
-     , process, time, unix
-     }:
-     mkDerivation {
-       pname = "cabal-rpm";
-       version = "0.11.1";
-       sha256 = "1pqj1i22icx6fzhfy1nmkcnfazakx0240i9dg6pm9q0g97cqaknv";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal directory filepath old-locale process time unix
-       ];
-       homepage = "https://github.com/juhp/cabal-rpm";
-       description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "cabal-rpm_0_11_2" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, old-locale
      , process, time, unix
      }:
@@ -38646,7 +38281,6 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -39257,6 +38891,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cairo-canvas" = callPackage
+    ({ mkDerivation, base, cairo, linear, mtl, random, time }:
+     mkDerivation {
+       pname = "cairo-canvas";
+       version = "0.1.0.0";
+       sha256 = "11qi0lnd8wlv2zz44lvd6336a6iz634n2rfk69qsh72vxrb3hd99";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base cairo linear mtl random time ];
+       description = "Simpler drawing API for Cairo";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cake" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cmdargs
      , containers, derive, directory, filepath, mtl, parsek, process
@@ -40459,24 +40106,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "cassava_0_5_0_0" = callPackage
+  "cassava_0_5_1_0" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring
      , bytestring-builder, containers, deepseq, hashable, HUnit, Only
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, unordered-containers, vector
+     , QuickCheck, quickcheck-instances, scientific, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "cassava";
-       version = "0.5.0.0";
-       sha256 = "1fdydyl2qn8qgjcrdij3gff13zwzp2fqmr3a8g0j35qfhq4lnzl4";
+       version = "0.5.1.0";
+       sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n";
        libraryHaskellDepends = [
          array attoparsec base bytestring bytestring-builder containers
-         deepseq hashable Only text unordered-containers vector
+         deepseq hashable Only scientific text unordered-containers vector
        ];
        testHaskellDepends = [
-         attoparsec base bytestring hashable HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 text
-         unordered-containers vector
+         attoparsec base bytestring hashable HUnit QuickCheck
+         quickcheck-instances scientific test-framework test-framework-hunit
+         test-framework-quickcheck2 text unordered-containers vector
        ];
        homepage = "https://github.com/hvr/cassava";
        description = "A CSV parsing and encoding library";
@@ -42106,6 +41754,19 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "choice_0_2_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "choice";
+       version = "0.2.2";
+       sha256 = "0qcyf6nqi0nyhbf3xwyib95y29j5ir94d5vg449mkpr92crf8ryk";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mboes/choice#readme";
+       description = "A solution to boolean blindness";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "choose" = callPackage
     ({ mkDerivation, base, MonadRandom }:
      mkDerivation {
@@ -44414,24 +44075,6 @@ self: {
      }) {};
 
   "cmark" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, cheapskate
-     , criterion, discount, HUnit, markdown, sundown, text
-     }:
-     mkDerivation {
-       pname = "cmark";
-       version = "0.5.5.1";
-       sha256 = "03asbd7vnjjnxppvaxz8jinkafh53kqrhp1ji051yq8amgr63d32";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [ base HUnit text ];
-       benchmarkHaskellDepends = [
-         base blaze-html cheapskate criterion discount markdown sundown text
-       ];
-       homepage = "https://github.com/jgm/cmark-hs";
-       description = "Fast, accurate CommonMark (Markdown) parser and renderer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cmark_0_5_6" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, cheapskate
      , criterion, discount, HUnit, markdown, sundown, text
      }:
@@ -44447,7 +44090,6 @@ self: {
        homepage = "https://github.com/jgm/cmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmark-gfm" = callPackage
@@ -45774,26 +45416,6 @@ self: {
      }) {};
 
   "comonad" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, containers
-     , contravariant, distributive, doctest, semigroups, tagged
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "comonad";
-       version = "5.0.1";
-       sha256 = "0ga67ynh1j4ylbn3awjh7iga09fypbh4fsa21mylcf4xgmlzs7sn";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base containers contravariant distributive semigroups tagged
-         transformers transformers-compat
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/comonad/";
-       description = "Comonads";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "comonad_5_0_2" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, containers
      , contravariant, distributive, doctest, semigroups, tagged
      , transformers, transformers-compat
@@ -45813,7 +45435,6 @@ self: {
        homepage = "http://github.com/ekmett/comonad/";
        description = "Comonads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad-extras" = callPackage
@@ -45978,18 +45599,6 @@ self: {
      }) {};
 
   "compactmap" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, vector }:
-     mkDerivation {
-       pname = "compactmap";
-       version = "0.1.4.2";
-       sha256 = "1v7ndhp36sx67r3f6sj5iiqs2sfqx4niidy3hfhvnillyb181z9n";
-       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_1" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, vector }:
      mkDerivation {
        pname = "compactmap";
@@ -45999,7 +45608,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
@@ -46102,29 +45710,6 @@ self: {
      }) {};
 
   "compensated" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
-     , cabal-doctest, cereal, comonad, deepseq, distributive, doctest
-     , generic-deriving, hashable, lens, log-domain, safecopy
-     , semigroupoids, semigroups, simple-reflect, vector
-     }:
-     mkDerivation {
-       pname = "compensated";
-       version = "0.7.1";
-       sha256 = "05vpx3jqb8m1naz1ka88kl2jfcf9snfhizb5mg6z2vf1w4axj7w6";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base bifunctors binary bytes cereal comonad deepseq distributive
-         hashable lens log-domain safecopy semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base doctest generic-deriving semigroups simple-reflect
-       ];
-       homepage = "http://github.com/analytics/compensated/";
-       description = "Compensated floating-point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "compensated_0_7_2" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
      , cabal-doctest, cereal, comonad, deepseq, distributive, doctest
      , generic-deriving, hashable, lens, log-domain, safecopy
@@ -46145,7 +45730,6 @@ self: {
        homepage = "http://github.com/analytics/compensated/";
        description = "Compensated floating-point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "competition" = callPackage
@@ -46421,8 +46005,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "0.1.0.1";
-       sha256 = "0a020wl2i84f30y21yywdb4qhr3a1lrjmmcw25kfjg011gdxggf4";
+       version = "0.1.0.4";
+       sha256 = "1246cp3b8rg923qd9nvar5h9ph2zlbgsxn08xl408fj0cp1l2l3p";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/composition-prelude#readme";
        description = "Higher-order function combinators";
@@ -47376,27 +46960,6 @@ self: {
      }) {};
 
   "conduit-iconv" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, criterion, mtl
-     , QuickCheck, test-framework, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "conduit-iconv";
-       version = "0.1.1.1";
-       sha256 = "01dcnvs82mvp7wv5vbkwhq2sary87mss71mc6mmhlngkyis558jl";
-       libraryHaskellDepends = [ base bytestring conduit ];
-       testHaskellDepends = [
-         base bytestring conduit mtl QuickCheck test-framework
-         test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring conduit criterion mtl text
-       ];
-       homepage = "https://github.com/sdroege/conduit-iconv";
-       description = "Conduit for character encoding conversion";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "conduit-iconv_0_1_1_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, mtl
      , QuickCheck, test-framework, test-framework-quickcheck2, text
      }:
@@ -47415,7 +46978,6 @@ self: {
        homepage = "https://github.com/sdroege/conduit-iconv";
        description = "Conduit for character encoding conversion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-merge" = callPackage
@@ -48476,6 +48038,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "control-dotdotdot" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "control-dotdotdot";
+       version = "0.1.0.0";
+       sha256 = "0wacfs0s0dy2vzj8yxm3zqsjc93fm8m4iiw5x92wpiz2z2lm3k8d";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/erisco/control-dotdotdot";
+       description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "control-event" = callPackage
     ({ mkDerivation, base, containers, stm, time }:
      mkDerivation {
@@ -50113,8 +49687,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.19";
-       sha256 = "1ar2zbjan63bcwinp3vxxgbpvlr2vffk26b3vr479gdw0mngwa91";
+       version = "5.9.20";
+       sha256 = "08cvagp0v98s8x99cdq86yk1i33fcpgxq3zdm414lf6cpjq80qa1";
        libraryHaskellDepends = [
          array base binary bytestring cereal cond directory exceptions
          filepath gray-extended hdaemonize hsyslog MonadRandom mtl
@@ -51735,8 +51309,8 @@ self: {
      }:
      mkDerivation {
        pname = "cubicbezier";
-       version = "0.6.0.3";
-       sha256 = "05bkjjfbmmfc4mwvcpsnr3wrwf07bv9xdv3v6n7gwblnx5ywapjn";
+       version = "0.6.0.4";
+       sha256 = "1bdrl26fm09vmmwdlg09ihq3b42qbz7dphzq03b983zlzrj1064f";
        libraryHaskellDepends = [
          base containers fast-math integration matrices microlens
          microlens-mtl microlens-th mtl vector vector-space
@@ -52865,21 +52439,6 @@ self: {
      }) {};
 
   "data-accessor-template" = callPackage
-    ({ mkDerivation, base, data-accessor, template-haskell, utility-ht
-     }:
-     mkDerivation {
-       pname = "data-accessor-template";
-       version = "0.2.1.13";
-       sha256 = "0n1rg8g1ln2kncbv16dr93sqj624bfyic4r253vfr731sf2p757a";
-       libraryHaskellDepends = [
-         base data-accessor template-haskell utility-ht
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Record_access";
-       description = "Utilities for accessing and manipulating fields of records";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-accessor-template_0_2_1_14" = callPackage
     ({ mkDerivation, base, data-accessor, template-haskell, utility-ht
      }:
      mkDerivation {
@@ -52892,7 +52451,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-accessor-transformers" = callPackage
@@ -55996,8 +55554,8 @@ self: {
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.7.0.2";
-       sha256 = "0l2as53zmsr94sf2kh1h5mj1ra1gpnzik2yqj0nj56cxys6sm6iy";
+       version = "0.7.1.1";
+       sha256 = "0mqi2jswdk9qid8h5q24ay2h0p3x48i8yz5m0hnwnvqv966lgq7v";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck mtl random
          ref-fd semigroups transformers transformers-base
@@ -56007,25 +55565,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_0_7_1_0" = callPackage
-    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, mtl, random, ref-fd, semigroups, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "dejafu";
-       version = "0.7.1.0";
-       sha256 = "058vdwsjjh5pbjbnsr8jfx7n84d4w79r7fkavlzy0a9a2cvb3nia";
-       libraryHaskellDepends = [
-         base concurrency containers deepseq exceptions leancheck mtl random
-         ref-fd semigroups transformers transformers-base
-       ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Systematic testing for Haskell concurrency";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -56402,27 +55941,6 @@ self: {
      }) {};
 
   "derive" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , haskell-src-exts, pretty, process, syb, template-haskell
-     , transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "derive";
-       version = "2.6.2";
-       sha256 = "0chig7nl4d6j4asvkk9sd4pyg647ca09mwwzzg5bkh6y91aj161g";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath haskell-src-exts
-         pretty process syb template-haskell transformers uniplate
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ndmitchell/derive#readme";
-       description = "A program and library to derive instances for data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "derive_2_6_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src-exts, pretty, process, syb, template-haskell
      , transformers, uniplate
@@ -56441,7 +55959,6 @@ self: {
        homepage = "https://github.com/ndmitchell/derive#readme";
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-IG" = callPackage
@@ -56885,8 +56402,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.4";
-       sha256 = "0kwr1sj9llkgj68b59ih2lp9p0mav31yk7wfk5m8cq4xp33qrl30";
+       version = "1.0.5";
+       sha256 = "00f57ah2s43x2n4f3ykl9bjkh3yik8h47br7s63061xl49m4q4k8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -57618,34 +57135,6 @@ self: {
      }) {};
 
   "dictionaries" = callPackage
-    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
-     , criterion, data-default, deepseq, directory, exceptions, filepath
-     , hspec, QuickCheck, random, random-shuffle, tagged, text, time
-     , transformers, zlib
-     }:
-     mkDerivation {
-       pname = "dictionaries";
-       version = "0.2.0.2";
-       sha256 = "0zzzlk2479kk321f06aw5j5fkrza7nmg41f886b47bzd6mzmmnq8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base binary bytestring containers data-default deepseq
-         directory exceptions filepath tagged text time transformers zlib
-       ];
-       executableHaskellDepends = [
-         base bytestring containers criterion deepseq directory exceptions
-         filepath random random-shuffle tagged text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory filepath hspec QuickCheck
-         random tagged text time
-       ];
-       description = "Tools to handle StarDict dictionaries";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dictionaries_0_2_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
      , criterion, data-default, deepseq, directory, exceptions, filepath
      , hspec, QuickCheck, random, random-shuffle, tagged, text, time
@@ -57671,7 +57160,6 @@ self: {
        ];
        description = "Tools to handle StarDict dictionaries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dictionary-sharing" = callPackage
@@ -58070,15 +57558,15 @@ self: {
      }:
      mkDerivation {
        pname = "digit";
-       version = "0.2.9";
-       sha256 = "1y8mhzzj4sxjxqrzprfckmppdmw4d61n4jgxy64w48qalmqsr8ig";
+       version = "0.3.0";
+       sha256 = "1qp5vdl5mqy4q440zjyz6cb8mxvnsrw1pfxbghf84alary6rcdiz";
        libraryHaskellDepends = [
          base lens papa parsers semigroups template-haskell
        ];
        testHaskellDepends = [
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
-       homepage = "https://github.com/NICTA/digit";
+       homepage = "https://github.com/qfpl/digit";
        description = "A data-type representing digits 0-9 and other combinations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59463,27 +58951,6 @@ self: {
      }) {};
 
   "distributive" = callPackage
-    ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest
-     , generic-deriving, hspec, tagged, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "distributive";
-       version = "0.5.2";
-       sha256 = "1nbcyysnrkliy7xwx6f39p80kkp0vlvq14wdj6r0m5c1brmbxqmd";
-       revision = "2";
-       editedCabalFile = "1wp2wqhsshiyxxwil3q0az35vijn8cyd2g6866i32j3p9g01mkr9";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-orphans tagged transformers transformers-compat
-       ];
-       testHaskellDepends = [ base doctest generic-deriving hspec ];
-       homepage = "http://github.com/ekmett/distributive/";
-       description = "Distributive functors -- Dual to Traversable";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributive_0_5_3" = callPackage
     ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest
      , generic-deriving, hspec, tagged, transformers
      , transformers-compat
@@ -59502,7 +58969,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
@@ -59671,31 +59137,6 @@ self: {
      }) {};
 
   "dlist-nonempty" = callPackage
-    ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq
-     , dlist, dlist-instances, QuickCheck, quickcheck-instances
-     , semigroupoids
-     }:
-     mkDerivation {
-       pname = "dlist-nonempty";
-       version = "0.1";
-       sha256 = "13nkf2kgm8pd1vicd2lm2z99m04bs65pm1kjn4k4a2259h3hd0m8";
-       revision = "1";
-       editedCabalFile = "1nvxf1dyqvanx7vfr4q7li2jj5vr543lc2fkkwajsm0z75vcibz4";
-       libraryHaskellDepends = [
-         base base-compat deepseq dlist semigroupoids
-       ];
-       testHaskellDepends = [
-         base Cabal QuickCheck quickcheck-instances
-       ];
-       benchmarkHaskellDepends = [
-         base base-compat criterion dlist dlist-instances
-       ];
-       homepage = "https://github.com/phadej/dlist-nonempty";
-       description = "Non-empty difference lists";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dlist-nonempty_0_1_1" = callPackage
     ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq
      , dlist, dlist-instances, QuickCheck, quickcheck-instances
      , semigroupoids
@@ -59716,7 +59157,6 @@ self: {
        homepage = "https://github.com/phadej/dlist-nonempty";
        description = "Non-empty difference lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dmc" = callPackage
@@ -59805,29 +59245,6 @@ self: {
      }) {};
 
   "dns" = callPackage
-    ({ mkDerivation, attoparsec, base, binary, bytestring
-     , bytestring-builder, conduit, conduit-extra, containers, doctest
-     , hspec, iproute, mtl, network, random, resourcet, safe, word8
-     }:
-     mkDerivation {
-       pname = "dns";
-       version = "2.0.10";
-       sha256 = "18x6ka23khkjr9f2s7hqk2q5q93sf2srwml8cl3gsn2vwa7vq0xs";
-       libraryHaskellDepends = [
-         attoparsec base binary bytestring bytestring-builder conduit
-         conduit-extra containers iproute mtl network random resourcet safe
-       ];
-       testHaskellDepends = [
-         attoparsec base binary bytestring bytestring-builder conduit
-         conduit-extra containers doctest hspec iproute mtl network random
-         resourcet safe word8
-       ];
-       testTarget = "spec";
-       description = "DNS library in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dns_2_0_12" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring
      , bytestring-builder, conduit, conduit-extra, containers, doctest
      , hspec, iproute, mtl, network, random, resourcet, safe, word8
@@ -59848,7 +59265,6 @@ self: {
        testTarget = "spec";
        description = "DNS library in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dnscache" = callPackage
@@ -61000,23 +60416,6 @@ self: {
      }) {};
 
   "drifter" = callPackage
-    ({ mkDerivation, base, containers, fgl, tasty, tasty-hunit
-     , tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "drifter";
-       version = "0.2.2";
-       sha256 = "1q8i6f6y0wzvn4nawzc47h90qbq5ycd6m73ih7336kpzyzphqzp4";
-       libraryHaskellDepends = [ base containers fgl text ];
-       testHaskellDepends = [
-         base tasty tasty-hunit tasty-quickcheck text
-       ];
-       homepage = "https://github.com/AndrewRademacher/drifter";
-       description = "Simple schema management for arbitrary databases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "drifter_0_2_3" = callPackage
     ({ mkDerivation, base, containers, fgl, tasty, tasty-hunit
      , tasty-quickcheck, text
      }:
@@ -61031,7 +60430,6 @@ self: {
        homepage = "https://github.com/AndrewRademacher/drifter";
        description = "Simple schema management for arbitrary databases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "drifter-postgresql" = callPackage
@@ -61659,8 +61057,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "dwergaz";
-       version = "0.2.0.0";
-       sha256 = "02yp4z20sw1dm7dzi8gsp0qiziyaw1wqr9zgx47sr4cz071ibg8q";
+       version = "0.2.0.1";
+       sha256 = "117f3s3rvka5m9zk8lhwxmqx3slxpf040r7485x6gz58ra33dsg9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/xngns/dwergaz";
@@ -62727,18 +62125,6 @@ self: {
      }) {};
 
   "effin" = callPackage
-    ({ mkDerivation, base, mtl }:
-     mkDerivation {
-       pname = "effin";
-       version = "0.3.0.2";
-       sha256 = "057hhpbxzhyinknbacbs12k3aq7jixg3pzyqcl49k1vrqm9y82fx";
-       libraryHaskellDepends = [ base mtl ];
-       homepage = "https://github.com/YellPika/effin";
-       description = "A Typeable-free implementation of extensible effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "effin_0_3_0_3" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "effin";
@@ -62748,7 +62134,6 @@ self: {
        homepage = "https://github.com/YellPika/effin";
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison" = callPackage
@@ -62950,25 +62335,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.13";
-       sha256 = "13xlggjcfmp8hr8sz74r0xms36rrfa86znazy2m6304dgscdbca4";
-       enableSeparateDataOutput = true;
-       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;
-     }) {};
-
-  "ekg_0_4_0_14" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, network, snap-core, snap-server, text, time
      , transformers, unordered-containers
@@ -62987,7 +62353,6 @@ self: {
        homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-bosun" = callPackage
@@ -63047,23 +62412,6 @@ self: {
      }) {};
 
   "ekg-core" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg-core";
-       version = "0.1.1.1";
-       sha256 = "1mir54l783pwy4fbz5bdbckz6d41iim4zdk06wpsl9xhn7s3vpjl";
-       libraryHaskellDepends = [
-         base containers ghc-prim text unordered-containers
-       ];
-       benchmarkHaskellDepends = [ base ];
-       homepage = "https://github.com/tibbe/ekg-core";
-       description = "Tracking of system metrics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg-core_0_1_1_2" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, text
      , unordered-containers
      }:
@@ -63078,7 +62426,6 @@ self: {
        homepage = "https://github.com/tibbe/ekg-core";
        description = "Tracking of system metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-elastic" = callPackage
@@ -63133,21 +62480,6 @@ self: {
      }) {};
 
   "ekg-json" = callPackage
-    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg-json";
-       version = "0.1.0.5";
-       sha256 = "0ml5pqp918k2zgpw10sjn0nca0ivzb871zxcg73samm1aypfrm8c";
-       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_6" = callPackage
     ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
      }:
      mkDerivation {
@@ -63160,7 +62492,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
@@ -63242,22 +62573,6 @@ self: {
      }) {};
 
   "ekg-statsd" = callPackage
-    ({ mkDerivation, base, bytestring, ekg-core, network, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg-statsd";
-       version = "0.2.1.0";
-       sha256 = "04bpdmk3ma4fnylipg4hkq3jfkrw5f009vbns6vah0znawkpjhnh";
-       libraryHaskellDepends = [
-         base bytestring ekg-core network text time unordered-containers
-       ];
-       homepage = "https://github.com/tibbe/ekg-statsd";
-       description = "Push metrics to statsd";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg-statsd_0_2_1_1" = callPackage
     ({ mkDerivation, base, bytestring, ekg-core, network, text, time
      , unordered-containers
      }:
@@ -63271,7 +62586,6 @@ self: {
        homepage = "https://github.com/tibbe/ekg-statsd";
        description = "Push metrics to statsd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-wai" = callPackage
@@ -63281,8 +62595,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-wai";
-       version = "0.1.0.1";
-       sha256 = "14vl5k7jq7p7fiwj9rbw3ng7j8cagydpw7zvf8qxbwxdz9xr655q";
+       version = "0.1.0.2";
+       sha256 = "1ridcn930lf8gjj7lqdbhzzmz0i6r668bhid72anbq3v1h6fnhnw";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath http-types network
@@ -63655,7 +62969,7 @@ self: {
          http-types mtl network optparse-applicative pretty process text
          time unordered-containers vector zip-archive
        ];
-       homepage = "https://github.com/elm-lang/elm-package";
+       homepage = "http://github.com/elm-lang/elm-package";
        description = "Package manager for Elm libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -63881,23 +63195,6 @@ self: {
      }) {};
 
   "email-validate" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
-     , QuickCheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "email-validate";
-       version = "2.3";
-       sha256 = "1zm6sqvaa3r412cz5ga7hcjl3b26hi4l8fc8z5im476rsjib8jf1";
-       libraryHaskellDepends = [
-         attoparsec base bytestring template-haskell
-       ];
-       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
-       homepage = "https://github.com/Porges/email-validate-hs";
-       description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "email-validate_2_3_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
      , QuickCheck, template-haskell
      }:
@@ -63912,7 +63209,6 @@ self: {
        homepage = "https://github.com/Porges/email-validate-hs";
        description = "Email address validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate-json" = callPackage
@@ -65086,34 +64382,6 @@ self: {
      }) {};
 
   "ersatz" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, containers, data-default, directory, doctest
-     , filepath, lens, mtl, parsec, process, temporary, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "ersatz";
-       version = "0.4";
-       sha256 = "173k73dvbv528q6072b8k7xy9q6558rlmz7llkiym4g1j2xi37cf";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         array attoparsec base bytestring containers data-default lens mtl
-         process temporary transformers unordered-containers
-       ];
-       executableHaskellDepends = [
-         array base containers lens mtl parsec
-       ];
-       testHaskellDepends = [ array base directory doctest filepath mtl ];
-       homepage = "http://github.com/ekmett/ersatz";
-       description = "A monad for expressing SAT or QSAT problems using observable sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ersatz_0_4_1" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
      , cabal-doctest, containers, data-default, directory, doctest
      , filepath, lens, mtl, parsec, process, temporary, transformers
@@ -66104,13 +65372,13 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-api";
-       version = "1.1.0";
-       sha256 = "0khdp8z2lbp9337wxsqfb3dlnmjw8shwjaldx0xqikwyh6rrmix9";
+       version = "1.1.1";
+       sha256 = "0zy59m7iwxwy5c4l15kvj98fk7vrjwhxp0scc3r3v37cxkakg01h";
        libraryHaskellDepends = [
          aeson base containers mtl protolude unordered-containers uuid
        ];
        homepage = "https://github.com/YoEight/eventsource-api#readme";
-       description = "Provides a eventsourcing high level API";
+       description = "Provides an eventsourcing high level API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -66121,8 +65389,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-geteventstore-store";
-       version = "1.0.1";
-       sha256 = "19h7vvd2b52915i61lpaa0k3hgvhdz55y5rsp0aznv1m2f613nnh";
+       version = "1.0.4";
+       sha256 = "0fn75hwarhjnrjalv7i16ry1wnr2z2gqvpj3ls2faappz1drhxmp";
        libraryHaskellDepends = [
          aeson base eventsource-api eventstore mtl protolude
        ];
@@ -66142,8 +65410,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-store-specs";
-       version = "1.0.0";
-       sha256 = "0iwh779mv4wvdfgdgd4rizvpmpj19qppndn7wqx56wa5119k9ahi";
+       version = "1.0.1";
+       sha256 = "0fg6rma02vp3iij93xgccqivqfx3h9675203jlmk6073mhg2i5id";
        libraryHaskellDepends = [
          aeson base eventsource-api mtl protolude tasty tasty-hspec uuid
        ];
@@ -66153,18 +65421,19 @@ self: {
      }) {};
 
   "eventsource-stub-store" = callPackage
-    ({ mkDerivation, base, containers, eventsource-api
+    ({ mkDerivation, aeson, base, containers, eventsource-api
      , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec
      }:
      mkDerivation {
        pname = "eventsource-stub-store";
-       version = "1.0.1";
-       sha256 = "0knmyykgxs6fy4xpmn7zcm8h1psirgizfrk6iaisfncjw9xy387k";
+       version = "1.0.2";
+       sha256 = "10c853i9k91gc42jbqzxx3scip2hr1ahwkhzvcryhiw3745qsidr";
        libraryHaskellDepends = [
          base containers eventsource-api mtl protolude stm
        ];
        testHaskellDepends = [
-         base eventsource-store-specs protolude tasty tasty-hspec
+         aeson base eventsource-api eventsource-store-specs protolude tasty
+         tasty-hspec
        ];
        homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "An in-memory stub store implementation";
@@ -66205,8 +65474,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.15.0.1";
-       sha256 = "0h6747m8xc1w37wqwjxy3w549cpmivjhrnmcfc3i7yn54rcyn3lv";
+       version = "0.15.0.2";
+       sha256 = "00mamlf121c3dsigpxvshj1mbm2b4hdbil02zyhz7jc6kccgbjwx";
        libraryHaskellDepends = [
          aeson array base bifunctors bytestring cereal clock connection
          containers dns dotnet-timespan ekg-core exceptions fast-logger
@@ -67096,30 +66365,6 @@ self: {
      }) {};
 
   "extensible" = callPackage
-    ({ mkDerivation, base, comonad, constraints, criterion, deepseq
-     , effin, extensible-effects, freer, ghc-prim, lens, monad-skeleton
-     , mtl, primitive, profunctors, semigroups, tagged, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "extensible";
-       version = "0.4.2";
-       sha256 = "1djsc3g3kvrm8n5sl5hbjv40fmclrdss9m9fdyl5cski1j94dhhk";
-       libraryHaskellDepends = [
-         base comonad constraints deepseq ghc-prim monad-skeleton mtl
-         primitive profunctors semigroups tagged template-haskell
-         transformers
-       ];
-       testHaskellDepends = [ base ];
-       benchmarkHaskellDepends = [
-         base criterion effin extensible-effects freer lens mtl
-       ];
-       homepage = "https://github.com/fumieval/extensible";
-       description = "Extensible, efficient, optics-friendly data types and effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extensible_0_4_3" = callPackage
     ({ mkDerivation, base, comonad, constraints, criterion, deepseq
      , effin, extensible-effects, freer-effects, ghc-prim, lens
      , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar
@@ -67141,7 +66386,6 @@ self: {
        homepage = "https://github.com/fumieval/extensible";
        description = "Extensible, efficient, optics-friendly data types and effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-data" = callPackage
@@ -68892,10 +68136,8 @@ self: {
      }:
      mkDerivation {
        pname = "fgl";
-       version = "5.5.3.1";
-       sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy";
-       revision = "1";
-       editedCabalFile = "00bw87y97ym844ir4mdq0vx5kfb0brzlqmrbqa0iq35lkwsd4k3g";
+       version = "5.5.4.0";
+       sha256 = "04bjm44qr63cl0g5lh07hbq78x5sbvdjf6ryymysi658q0fqjxji";
        libraryHaskellDepends = [
          array base containers deepseq transformers
        ];
@@ -69245,18 +68487,6 @@ self: {
      }) {};
 
   "filelock" = callPackage
-    ({ mkDerivation, base, unix }:
-     mkDerivation {
-       pname = "filelock";
-       version = "0.1.0.1";
-       sha256 = "0qypjnbkfayqyaymx8qrq4abddlrlzanf6lqhfn9cqzcgzr6735d";
-       libraryHaskellDepends = [ base unix ];
-       homepage = "http://github.com/takano-akio/filelock";
-       description = "Portable interface to file locking (flock / LockFileEx)";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "filelock_0_1_1_2" = callPackage
     ({ mkDerivation, async, base, process, unix }:
      mkDerivation {
        pname = "filelock";
@@ -69267,7 +68497,6 @@ self: {
        homepage = "http://github.com/takano-akio/filelock";
        description = "Portable interface to file locking (flock / LockFileEx)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filemanip" = callPackage
@@ -69500,30 +68729,6 @@ self: {
      }) {};
 
   "find-clumpiness" = callPackage
-    ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness
-     , containers, listsafe, optparse-applicative, text, text-show
-     , tree-fun, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "find-clumpiness";
-       version = "0.2.1.3";
-       sha256 = "08jkzkq7xw9nfv30qc9xh5nf31lqbd92smx95an6ch74hf7jb7p7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base BiobaseNewick bytestring clumpiness containers listsafe
-         text text-show tree-fun unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base BiobaseNewick bytestring clumpiness containers
-         optparse-applicative text tree-fun unordered-containers
-       ];
-       homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme";
-       description = "Find the clumpiness of labels in a tree";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "find-clumpiness_0_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness
      , containers, listsafe, mtl, optparse-applicative, text, text-show
      , tree-fun, unordered-containers, vector
@@ -69545,7 +68750,6 @@ self: {
        homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme";
        description = "Find the clumpiness of labels in a tree";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "find-conduit" = callPackage
@@ -69978,22 +69182,6 @@ self: {
      }) {};
 
   "fixed-vector-hetero" = callPackage
-    ({ mkDerivation, base, deepseq, fixed-vector, ghc-prim, primitive
-     , transformers
-     }:
-     mkDerivation {
-       pname = "fixed-vector-hetero";
-       version = "0.3.1.1";
-       sha256 = "1byy8md3da7brf452d69fkwykip5jkn5j1837vf2c0r7x9j76k49";
-       libraryHaskellDepends = [
-         base deepseq fixed-vector ghc-prim primitive transformers
-       ];
-       homepage = "http://github.org/Shimuuar/fixed-vector-hetero";
-       description = "Generic heterogeneous vectors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fixed-vector-hetero_0_3_1_2" = callPackage
     ({ mkDerivation, base, deepseq, fixed-vector, ghc-prim, primitive
      , transformers
      }:
@@ -70007,7 +69195,6 @@ self: {
        homepage = "http://github.org/Shimuuar/fixed-vector-hetero";
        description = "Generic heterogeneous vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-width" = callPackage
@@ -70596,19 +69783,6 @@ self: {
      }) {};
 
   "flow" = callPackage
-    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
-     mkDerivation {
-       pname = "flow";
-       version = "1.0.7";
-       sha256 = "0qhz3cplnpdj6c4hr576adcv4l4pmakncbqcc541gn5vql9lk5pi";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       homepage = "https://github.com/tfausak/flow#readme";
-       description = "Write more understandable Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "flow_1_0_8" = callPackage
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
@@ -70619,7 +69793,6 @@ self: {
        homepage = "https://github.com/tfausak/flow#readme";
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow-er" = callPackage
@@ -71058,18 +70231,6 @@ self: {
      }) {};
 
   "focus" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "focus";
-       version = "0.1.5";
-       sha256 = "1cg7mkhv3ip87952k8kcjl1gx1nvcbhbq71czhxlnzi00qg68jzg";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nikita-volkov/focus";
-       description = "A general abstraction for manipulating elements of container data structures";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "focus_0_1_5_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "focus";
@@ -71079,7 +70240,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/focus";
        description = "A general abstraction for manipulating elements of container data structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fold-debounce" = callPackage
@@ -71252,32 +70412,6 @@ self: {
      }) {};
 
   "folds" = callPackage
-    ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal
-     , cabal-doctest, comonad, constraints, contravariant, data-reify
-     , deepseq, directory, distributive, doctest, filepath, lens, mtl
-     , pointed, profunctors, reflection, semigroupoids, semigroups
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "folds";
-       version = "0.7.3";
-       sha256 = "028akichhx88kyvl05c4yl4y89wwird76gjh8nmghzcdbylcpig7";
-       configureFlags = [ "-f-test-hlint" ];
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         adjunctions base bifunctors comonad constraints contravariant
-         data-reify distributive lens mtl pointed profunctors reflection
-         semigroupoids transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring deepseq directory doctest filepath mtl semigroups
-       ];
-       homepage = "http://github.com/ekmett/folds";
-       description = "Beautiful Folding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "folds_0_7_4" = callPackage
     ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal
      , cabal-doctest, comonad, constraints, contravariant, data-reify
      , deepseq, directory, distributive, doctest, filepath, lens, mtl
@@ -71301,7 +70435,6 @@ self: {
        homepage = "http://github.com/ekmett/folds";
        description = "Beautiful Folding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "folds-common" = callPackage
@@ -72970,28 +72103,6 @@ self: {
      }) {};
 
   "fsnotify" = callPackage
-    ({ mkDerivation, async, base, containers, directory, filepath
-     , hinotify, tasty, tasty-hunit, temporary-rc, text, time
-     , unix-compat
-     }:
-     mkDerivation {
-       pname = "fsnotify";
-       version = "0.2.1";
-       sha256 = "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb";
-       libraryHaskellDepends = [
-         async base containers directory filepath hinotify text time
-         unix-compat
-       ];
-       testHaskellDepends = [
-         async base directory filepath tasty tasty-hunit temporary-rc
-         unix-compat
-       ];
-       homepage = "https://github.com/haskell-fswatch/hfsnotify";
-       description = "Cross platform library for file change notification";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fsnotify_0_2_1_1" = callPackage
     ({ mkDerivation, async, base, containers, directory, filepath
      , hinotify, tasty, tasty-hunit, temporary, text, time, unix-compat
      }:
@@ -73010,7 +72121,6 @@ self: {
        homepage = "https://github.com/haskell-fswatch/hfsnotify";
        description = "Cross platform library for file change notification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fsnotify-conduit" = callPackage
@@ -75451,8 +74561,8 @@ self: {
      }:
      mkDerivation {
        pname = "geoip2";
-       version = "0.2.2.0";
-       sha256 = "0gnh9gwgb9lkjdp8j5ajdd4qqnm92821q12z3jzxigrwkxr9z8h4";
+       version = "0.3.0.0";
+       sha256 = "1yazd4wgf4ivk2x3apymddcww24z7a4b0jxzph7l8273wd8dy8zg";
        libraryHaskellDepends = [
          base bytestring cereal containers iproute mmap reinterpret-cast
          text
@@ -75602,8 +74712,8 @@ self: {
      }:
      mkDerivation {
        pname = "gf";
-       version = "3.8";
-       sha256 = "02ds6pm7lv5ijkjh1xikglibnnapk72rz78l5kv5ikzxahhgslbg";
+       version = "3.9";
+       sha256 = "11g57vhb89s3wi6ny88la9mxwg5vivr9fjxsmm9i644pys7kg84i";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -76203,29 +75313,6 @@ self: {
      }) {};
 
   "ghc-prof" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
-       version = "1.4.0.1";
-       sha256 = "1q09v2b2nzddwwj76ig7d6ikxv8dnw7v3ngg781fsjvy14cljbmg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       executableHaskellDepends = [ base containers scientific text ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       homepage = "https://github.com/maoe/ghc-prof";
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
@@ -76246,7 +75333,6 @@ self: {
        homepage = "https://github.com/maoe/ghc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-flamegraph" = callPackage
@@ -76356,8 +75442,8 @@ self: {
     ({ mkDerivation, base, ghc }:
      mkDerivation {
        pname = "ghc-tcplugins-extra";
-       version = "0.2";
-       sha256 = "0x3kd39jlhkgx3p2hm0a1wy571fis529jn2iz0jkw3mj6ikjnm7k";
+       version = "0.2.1";
+       sha256 = "04m8cblgxb3axjhsbwlb18jmlcfhcllm68c1d5pzv6av404ild4z";
        libraryHaskellDepends = [ base ghc ];
        homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
        description = "Utilities for writing GHC type-checker plugins";
@@ -76428,6 +75514,8 @@ self: {
        pname = "ghc-typelits-knownnat";
        version = "0.3";
        sha256 = "0dq419pd8mf8x48wcr3ciygrwy40kvcl5iq307836ss2r506nrqc";
+       revision = "1";
+       editedCabalFile = "17k7rarp56ljxz2j7p17jh1wgbqfcv9l1pj8vrffidb9r8sj448q";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons
          template-haskell transformers
@@ -76699,8 +75787,8 @@ self: {
     ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
      mkDerivation {
        pname = "ghcjs-dom";
-       version = "0.9.1.1";
-       sha256 = "1932qq067cfl0g87457qgk4zdxxr4fx2an37z8l0zw1x221yi696";
+       version = "0.9.2.0";
+       sha256 = "0yhvnxrh68rc33h3m6zg6vzc4byr1yg09zfxn7g39skzn1mrj0aa";
        libraryHaskellDepends = [
          base ghcjs-dom-jsaddle text transformers
        ];
@@ -76737,8 +75825,8 @@ self: {
     ({ mkDerivation, jsaddle-dom }:
      mkDerivation {
        pname = "ghcjs-dom-jsaddle";
-       version = "0.9.1.0";
-       sha256 = "120i3j07lk75lk59gi6pg56dka35r0vh97kj22cj4472qz0ix3sp";
+       version = "0.9.2.0";
+       sha256 = "05ings3n2zlgnwg9a17s21yzh4pnag1cz62yyddaxbqpxn4xkj6l";
        libraryHaskellDepends = [ jsaddle-dom ];
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -76751,8 +75839,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcjs-dom-jsffi";
-       version = "0.9.1.1";
-       sha256 = "1hx8w7x5j2gznkk32yplnnm657hyfk41lcxl4iinsjkm0lrlq54i";
+       version = "0.9.2.0";
+       sha256 = "1xj94izrypxnb91lgsq0lfzqqs11sxbs24nkw8sn2wkmmh5pd8vd";
        libraryHaskellDepends = [
          base ghc-prim ghcjs-base ghcjs-prim text transformers
        ];
@@ -76938,26 +76026,6 @@ self: {
      }) {};
 
   "gi-atk" = 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.12";
-       sha256 = "1d15ylg9p46csmb8nicir1bg011gd4h123xfmvq8ksm7g85an9hk";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ atk ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Atk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) atk;};
-
-  "gi-atk_2_0_14" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers
@@ -76976,34 +76044,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
-     , haskell-gi, haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-cairo";
-       version = "1.0.12";
-       sha256 = "1q1bc1fqbk4cxqp99wyjhdp2wpgr9pakrr0pfsss9s9amb0kw98k";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ cairo ];
-       doHaddock = false;
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Cairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo;};
-
-  "gi-cairo_1_0_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -77026,31 +76069,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
   "gi-gdk" = 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.12";
-       sha256 = "1ridy0bj5s0zfawy7i1qf7n24d0wwbmyr04h1ss03zsx1jg5y66q";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-pango haskell-gi haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gdk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {gtk3 = pkgs.gnome3.gtk;};
-
-  "gi-gdk_3_0_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
@@ -77071,31 +76092,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gdkpixbuf" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
-     , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gdkpixbuf";
-       version = "2.0.12";
-       sha256 = "0kxqg74rxv5z3bd5sgx5rzm2hhc565nm4ab2vhfdy4lvmscwq9gr";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ gdk_pixbuf ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GdkPixbuf bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gdk_pixbuf;};
-
-  "gi-gdkpixbuf_2_0_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
@@ -77114,7 +76113,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gdk_pixbuf;};
 
   "gi-ggit" = callPackage
@@ -77140,26 +76138,6 @@ self: {
      }) {inherit (pkgs.gnome3) libgit2-glib;};
 
   "gi-gio" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gio";
-       version = "2.0.12";
-       sha256 = "13ancpyxlzrqyz8jwjizs7nmys9wmmh1k90armmlah03xlsssjz6";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gio bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-gio_2_0_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
@@ -77178,7 +76156,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gio bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
@@ -77203,26 +76180,6 @@ self: {
      }) {inherit (pkgs) gobjectIntrospection;};
 
   "gi-glib" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, glib
-     , haskell-gi, haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-glib";
-       version = "2.0.12";
-       sha256 = "0pbfr8jgavg3csxbmjq6rv7hqj9g2h8b02ji1d3pjcpdmnzhh3mx";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GLib bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-glib_2_0_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -77241,30 +76198,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
-     , haskell-gi, haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gobject";
-       version = "2.0.12";
-       sha256 = "19d9agggpldzifjgc7g84lqk4vp3jd9lbbnrw5k8h4f37hq0n4c2";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-gobject_2_0_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -77283,7 +76219,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gst" = callPackage
@@ -77417,28 +76352,6 @@ self: {
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = 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.15";
-       sha256 = "176hvvrl2w71dy096irazr83v07qd8nixl6gsihn2i9caaxn4scb";
-       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 haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {gtk3 = pkgs.gnome3.gtk;};
-
-  "gi-gtk_3_0_17" = 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
@@ -77459,7 +76372,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gtk-hs" = callPackage
@@ -77527,16 +76439,17 @@ self: {
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, text, transformers, webkitgtk24x-gtk3
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
+     , webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "3.0.12";
-       sha256 = "1wfcl5b8kwngy433k74r0nfyx170wyyg9qx5axalvwxk7n3vjyz6";
+       version = "3.0.14";
+       sha256 = "1r2q176a38ylbawkrd17vdiqg0cnk5vzbp4rfgrlzfz6vp6gimi4";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base text
-         transformers
+         base bytestring containers haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        doHaddock = false;
@@ -77613,31 +76526,6 @@ self: {
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, pango, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-pango";
-       version = "1.0.13";
-       sha256 = "0nrkaq135gb14zahd5805lkbi81vavbzs9cdxw5p33im62dihbzl";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ cairo pango ];
-       doHaddock = false;
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Pango bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
-
-  "gi-pango_1_0_15" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, pango, text, transformers
@@ -77660,7 +76548,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Pango bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
   "gi-pangocairo" = callPackage
@@ -77733,27 +76620,6 @@ self: {
      }) {inherit (pkgs) libsecret;};
 
   "gi-soup" = 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.12";
-       sha256 = "04jzgcbacs3ynn7flg94a2vggf6npb9iv6nfvjbzkghrdw0ncp97";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ libsoup ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Libsoup bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome2) libsoup;};
-
-  "gi-soup_2_4_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, libsoup, text, transformers
@@ -77772,7 +76638,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome2) libsoup;};
 
   "gi-vte" = callPackage
@@ -77799,30 +76664,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "gi-webkit" = 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
-     , text, transformers, webkitgtk24x-gtk3
-     }:
-     mkDerivation {
-       pname = "gi-webkit";
-       version = "3.0.12";
-       sha256 = "0r195s3fx2nkks4mzv4zi7a9isd4qkwvxfb9v5fknz46virppm01";
-       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 haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "WebKit bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x-gtk3;};
-
-  "gi-webkit_3_0_14" = 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
@@ -78444,26 +77285,27 @@ self: {
 
   "git-vogue" = callPackage
     ({ mkDerivation, base, bifunctors, Cabal, containers, cpphs, Diff
-     , directory, filepath, formatting, ghc-mod, git, haskell-src-exts
-     , hlint, hscolour, hspec, optparse-applicative, process, split
-     , strict, stylish-haskell, temporary, text, transformers, unix
+     , directory, extra, filepath, formatting, ghc-mod, git
+     , haskell-src-exts, hlint, hscolour, hspec, optparse-applicative
+     , process, split, strict, stylish-haskell, temporary, text
+     , transformers, unix
      }:
      mkDerivation {
        pname = "git-vogue";
-       version = "0.2.1.1";
-       sha256 = "1mah90zlpvg8lajvh530bkvak5zs8nirxlj9xx3wmvwxw862c6mh";
-       revision = "1";
-       editedCabalFile = "00pqgbjdzzqf10201yv934llaq2xflad9djix21f05nk7qq62g0r";
+       version = "0.2.2.1";
+       sha256 = "1gx96rh97gbbf2h64rpar00pdph4vdvhwpw7hmmi1vh5ynqp4zrs";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
-         base containers directory filepath formatting optparse-applicative
-         process split text transformers unix
+         base containers directory extra filepath formatting
+         optparse-applicative process split text transformers unix
        ];
        executableHaskellDepends = [
          base bifunctors Cabal cpphs Diff directory ghc-mod haskell-src-exts
-         hlint hscolour optparse-applicative strict stylish-haskell text
+         hlint hscolour optparse-applicative process strict stylish-haskell
+         text
        ];
        testHaskellDepends = [
          base containers directory filepath hspec process temporary
@@ -78618,8 +77460,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-release";
-       version = "1.0.4";
-       sha256 = "00iibn9fh0g8ch8v544v47jvjfar8p86kpaq85x1mvjp1f9m554c";
+       version = "1.0.5";
+       sha256 = "1dmilm5mwgb975f6n34x3ylnkipqrvxcimkvj6pyfw97bdcclacb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80025,27 +78867,6 @@ self: {
      }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
-    ({ mkDerivation, array, base, containers, data-accessor
-     , data-accessor-transformers, deepseq, filepath, process, temporary
-     , time, transformers, utility-ht
-     }:
-     mkDerivation {
-       pname = "gnuplot";
-       version = "0.5.4.1";
-       sha256 = "1xz8prw9xjk0rsyrkp9bsmxykzrbhpv9qhhkdapy75mdbmgwjm7s";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base containers data-accessor data-accessor-transformers
-         deepseq filepath process temporary time transformers utility-ht
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
-       description = "2D and 3D plots using gnuplot";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "gnuplot_0_5_4_2" = callPackage
     ({ mkDerivation, array, base, containers, data-accessor
      , data-accessor-transformers, deepseq, filepath, process, temporary
      , time, transformers, utility-ht
@@ -80064,7 +78885,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
        description = "2D and 3D plots using gnuplot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnutls" = callPackage
@@ -83206,8 +82026,8 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.8.8";
-       sha256 = "174x6x4aflv75k89nvpnpwd5201c5375vb0yk4p0ilidqi7kza90";
+       version = "7.8.9";
+       sha256 = "1gzf8k4v16aavz63fcl0byqxzha796g77dng7rsxjm8zsgzlicy0";
        libraryHaskellDepends = [ base cereal containers ];
        testHaskellDepends = [
          base containers QuickCheck test-framework
@@ -83372,30 +82192,6 @@ self: {
      }) {};
 
   "groundhog-inspector" = callPackage
-    ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
-     , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
-     , regex-compat, syb, template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "groundhog-inspector";
-       version = "0.8";
-       sha256 = "0vh71ds4ff89skm2ib55q9zfsgjxwlshz1gn3ncahcpb7wgzagfl";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson-pretty base bytestring containers groundhog groundhog-th
-         regex-compat syb template-haskell text time transformers
-       ];
-       executableHaskellDepends = [
-         base bytestring cmdargs containers groundhog groundhog-sqlite
-         groundhog-th mtl
-       ];
-       homepage = "http://github.com/lykahb/groundhog";
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-inspector_0_8_0_2" = callPackage
     ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
      , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
      , regex-compat, syb, template-haskell, text, time, transformers
@@ -83417,7 +82213,6 @@ self: {
        homepage = "http://github.com/lykahb/groundhog";
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-mysql" = callPackage
@@ -83875,7 +82670,7 @@ self: {
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
        homepage = "http://www.haskell.org/gtk2hs/";
-       description = "Bindings for the Gtk/macOS integration library";
+       description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk-mac-integration-gtk2 = null;};
@@ -84139,7 +82934,7 @@ self: {
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        homepage = "http://www.haskell.org/gtk2hs/";
-       description = "Bindings for the Gtk/macOS integration library";
+       description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk-mac-integration-gtk3 = null;};
@@ -86062,8 +84857,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddocset";
-       version = "0.4.2";
-       sha256 = "140ja5i6l3dfy8pz8vrx8z2adx2mvr5y0252avf8b6lqjsxqgxm8";
+       version = "0.4.3";
+       sha256 = "0fy4vx7jig9zkg4i8fajrz1mz72cdi0y6qk1h152x7nlz26f7ymk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -86269,25 +85064,6 @@ self: {
      }) {};
 
   "hailgun" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, email-validate
-     , exceptions, filepath, http-client, http-client-tls, http-types
-     , tagsoup, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "hailgun";
-       version = "0.4.1.4";
-       sha256 = "0qcfhprg5x0wb28zgn80x808a1w6il2hc6mykq8wv0ranmwj1lrx";
-       libraryHaskellDepends = [
-         aeson base bytestring email-validate exceptions filepath
-         http-client http-client-tls http-types tagsoup text time
-         transformers
-       ];
-       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
-       description = "Mailgun REST api interface for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hailgun_0_4_1_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
      , tagsoup, text, time, transformers
@@ -86304,7 +85080,6 @@ self: {
        homepage = "https://bitbucket.org/robertmassaioli/hailgun";
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun-send" = callPackage
@@ -87427,34 +86202,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath, hspec
-     , mtl, optparse-applicative, path, path-io, process, stm, temporary
-     , time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.2.2";
-       sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7";
-       revision = "1";
-       editedCabalFile = "0rx3hs8z717cmx3l97fjmyz94i0n25f69x2rk3nvgnldskvjxswv";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base optparse-applicative path path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       homepage = "https://github.com/stackbuilders/hapistrano";
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_2_4" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath, hspec
      , mtl, optparse-applicative, path, path-io, process, stm, temporary
      , time, transformers, yaml
@@ -87480,7 +86227,6 @@ self: {
        homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -88069,25 +86815,6 @@ self: {
      }) {};
 
   "happstack-server-tls" = callPackage
-    ({ mkDerivation, base, bytestring, extensible-exceptions
-     , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
-     , time, unix
-     }:
-     mkDerivation {
-       pname = "happstack-server-tls";
-       version = "7.1.6.3";
-       sha256 = "0bpa0clcfq0jgb6y8wm331411w5mryjj4aknnn0sb74dx122lhyz";
-       libraryHaskellDepends = [
-         base bytestring extensible-exceptions happstack-server hslogger
-         HsOpenSSL network sendfile time unix
-       ];
-       librarySystemDepends = [ openssl ];
-       homepage = "http://www.happstack.com/";
-       description = "extend happstack-server with https:// support (TLS/SSL)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) openssl;};
-
-  "happstack-server-tls_7_1_6_4" = callPackage
     ({ mkDerivation, base, bytestring, extensible-exceptions
      , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
      , time, unix
@@ -88104,7 +86831,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "extend happstack-server with https:// support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "happstack-server-tls-cryptonite" = callPackage
@@ -88591,8 +87317,8 @@ self: {
      }:
      mkDerivation {
        pname = "hascar";
-       version = "0.2.1.1";
-       sha256 = "11j0bixpl2fyn5xxyjzh2d42c6hv5scpsjqr6akszfcmjlx1r07z";
+       version = "0.2.1.2";
+       sha256 = "1x04yddy74vj7sxwsmq411z4s02n5asb17vc5290ha7s257fr81j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89651,33 +88377,6 @@ self: {
      }) {};
 
   "haskell-gi" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
-     , directory, doctest, filepath, glib, gobjectIntrospection
-     , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
-     , text, transformers, xdg-basedir, xml-conduit
-     }:
-     mkDerivation {
-       pname = "haskell-gi";
-       version = "0.20.2";
-       sha256 = "1dnavj0qpcljakmb5jnv0hqds8a0zqn5ycn0xq5fls20fmw9j5gh";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring Cabal containers directory filepath
-         haskell-gi-base mtl pretty-show process regex-tdfa safe text
-         transformers xdg-basedir xml-conduit
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       executableHaskellDepends = [
-         base containers directory filepath haskell-gi-base pretty-show text
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "haskell-gi_0_20_3" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
      , directory, doctest, filepath, glib, gobjectIntrospection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
@@ -89702,23 +88401,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "haskell-gi-base" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.20.3";
-       sha256 = "07ggfmbr9s4c1ql4cyyk64fbig5k2mpc25371zrrj44yc6ai2xz1";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       homepage = "https://github.com/haskell-gi/haskell-gi-base";
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "haskell-gi-base_0_20_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
@@ -89729,7 +88414,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi-base";
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "haskell-gi-overloading" = callPackage
@@ -90410,22 +89094,6 @@ self: {
      }) {};
 
   "haskell-tools-ast" = callPackage
-    ({ mkDerivation, base, ghc, mtl, references, template-haskell
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-ast";
-       version = "0.8.0.0";
-       sha256 = "15d588xnmghq116g4bg0jv10z5xzs54ln4da58dzm0d8241bmcd0";
-       libraryHaskellDepends = [
-         base ghc mtl references template-haskell uniplate
-       ];
-       homepage = "https://github.com/nboldi/haskell-tools";
-       description = "Haskell AST for efficient tooling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-ast_0_8_1_0" = callPackage
     ({ mkDerivation, base, ghc, mtl, references, template-haskell
      , uniplate
      }:
@@ -90439,7 +89107,6 @@ self: {
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-ast-fromghc" = callPackage
@@ -90497,24 +89164,6 @@ self: {
      }) {};
 
   "haskell-tools-backend-ghc" = callPackage
-    ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
-     , haskell-tools-ast, mtl, references, safe, split, template-haskell
-     , transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-backend-ghc";
-       version = "0.8.0.0";
-       sha256 = "076kb9hcjina0d5dcwslbxhkja3p2m2fyxs88ywyqlciry2wdw2n";
-       libraryHaskellDepends = [
-         base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
-         references safe split template-haskell transformers uniplate
-       ];
-       homepage = "https://github.com/nboldi/haskell-tools";
-       description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-backend-ghc_0_8_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
      , transformers, uniplate
@@ -90530,7 +89179,6 @@ self: {
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-cli" = callPackage
@@ -90564,33 +89212,6 @@ self: {
      }) {};
 
   "haskell-tools-daemon" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, Diff
-     , directory, filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl
-     , network, process, references, split, strict, tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "haskell-tools-daemon";
-       version = "0.8.0.0";
-       sha256 = "0fd9pxyxsfy09ks21nsk6khx97mb73kvjk6hg3wc8qcffxng9m69";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers Diff directory filepath ghc
-         ghc-paths haskell-tools-ast haskell-tools-prettyprint
-         haskell-tools-refactor mtl network process references split strict
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath ghc 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";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-daemon_0_8_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, Diff
      , directory, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl
@@ -90615,32 +89236,9 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Background process for Haskell-tools refactor that editors can connect to";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-debug" = callPackage
-    ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-refactor, references, template-haskell
-     }:
-     mkDerivation {
-       pname = "haskell-tools-debug";
-       version = "0.8.0.0";
-       sha256 = "0j9gd562kmmanqx9kbs1kks68pksnxgf55rghl8ip3j8a3h93smy";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base filepath ghc ghc-paths haskell-tools-ast
-         haskell-tools-backend-ghc haskell-tools-prettyprint
-         haskell-tools-refactor references template-haskell
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Debugging Tools for Haskell-tools";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-debug_0_8_1_0" = callPackage
     ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
      , haskell-tools-refactor, references, template-haskell
@@ -90660,40 +89258,9 @@ 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
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-refactor, http-types, HUnit, mtl, network
-     , references, tasty, tasty-hunit, transformers, wai, wai-websockets
-     , warp, websockets
-     }:
-     mkDerivation {
-       pname = "haskell-tools-demo";
-       version = "0.8.0.0";
-       sha256 = "14l8zwzi4nzx1ddq2sbazr5faf0y241ppx9df5q9n0v24aclmxd6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor http-types mtl
-         references transformers wai wai-websockets warp websockets
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath HUnit network tasty
-         tasty-hunit websockets
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "A web-based demo for Haskell-tools Refactor";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-demo_0_8_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -90721,27 +89288,9 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "A web-based demo for Haskell-tools Refactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
-    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
-     , references, split, text, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-prettyprint";
-       version = "0.8.0.0";
-       sha256 = "19bx0fzgvin78iilw32klmjr0z0c9cw1x0xx1nj8mbi44c5rcb64";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast mtl references split text
-         uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Pretty printing of Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-prettyprint_0_8_1_0" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, text, uniplate
      }:
@@ -90756,40 +89305,9 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-refactor" = callPackage
-    ({ 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
-     }:
-     mkDerivation {
-       pname = "haskell-tools-refactor";
-       version = "0.8.0.0";
-       sha256 = "1k9mq164v7nm83dykdgmzxfdqmyk5p35lgzvnmw9mh43rrnnw8vd";
-       libraryHaskellDepends = [
-         base Cabal containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl references
-         split template-haskell transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
-         polyparse references split tasty tasty-hunit template-haskell time
-         transformers uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-refactor_0_8_1_0" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -90817,32 +89335,9 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-rewrite" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, ghc
-     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
-     , tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "haskell-tools-rewrite";
-       version = "0.8.0.0";
-       sha256 = "076dc91swh42rs80ijbjrbzab1m9vjdzvy7z9r7znmrhy951ck5c";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
-         references
-       ];
-       testHaskellDepends = [
-         base directory filepath haskell-tools-ast haskell-tools-prettyprint
-         tasty tasty-hunit
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-rewrite_0_8_1_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
      , tasty, tasty-hunit
@@ -90862,7 +89357,6 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tor" = callPackage
@@ -92107,36 +90601,6 @@ self: {
      }) {};
 
   "hasmin" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , criterion, directory, doctest, doctest-discover, gitrev, hopfli
-     , hspec, hspec-attoparsec, matrix, mtl, numbers
-     , optparse-applicative, parsers, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "hasmin";
-       version = "0.3.2.2";
-       sha256 = "0522rp8cicvizvr183vfr07a5c8a98hz7g6m6pjjk1vzf95b7w20";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers matrix mtl numbers parsers
-         text
-       ];
-       executableHaskellDepends = [
-         attoparsec base bytestring containers gitrev hopfli matrix mtl
-         numbers optparse-applicative parsers text
-       ];
-       testHaskellDepends = [
-         attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
-         QuickCheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion directory text ];
-       homepage = "https://github.com/contivero/hasmin#readme";
-       description = "\"A CSS Minifier\"";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hasmin_0_3_2_4" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , criterion, directory, doctest, doctest-discover, gitrev, hopfli
      , hspec, hspec-attoparsec, matrix, mtl, numbers
@@ -92164,7 +90628,6 @@ self: {
        homepage = "https://github.com/contivero/hasmin#readme";
        description = "CSS Minifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasparql-client" = callPackage
@@ -92194,40 +90657,6 @@ self: {
      }) {inherit (pkgs) aspell;};
 
   "hasql" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, bytestring
-     , bytestring-strict-builder, contravariant, contravariant-extras
-     , criterion, data-default-class, deepseq, dlist, either, hashable
-     , hashtables, loch-th, mtl, placeholders, postgresql-binary
-     , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances
-     , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , uuid, vector
-     }:
-     mkDerivation {
-       pname = "hasql";
-       version = "0.19.18";
-       sha256 = "0k922mrj055rklb071z50m0y84wrfyivpm06k4fnxqwph728nzm6";
-       libraryHaskellDepends = [
-         attoparsec base base-prelude bytestring bytestring-strict-builder
-         contravariant contravariant-extras data-default-class dlist either
-         hashable hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors semigroups text transformers vector
-       ];
-       testHaskellDepends = [
-         data-default-class QuickCheck quickcheck-instances rebase rerebase
-         tasty tasty-hunit tasty-quickcheck tasty-smallcheck
-       ];
-       benchmarkHaskellDepends = [
-         base base-prelude bytestring contravariant contravariant-extras
-         criterion data-default-class deepseq dlist either hashable
-         profunctors scientific text time transformers uuid vector
-       ];
-       homepage = "https://github.com/nikita-volkov/hasql";
-       description = "An efficient PostgreSQL driver and a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hasql_0_19_18_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
      , bytestring-strict-builder, contravariant, contravariant-extras
      , criterion, data-default-class, dlist, either, hashable
@@ -92254,7 +90683,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "An efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend" = callPackage
@@ -92893,33 +91321,6 @@ self: {
      }) {};
 
   "haxl" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
-     , test-framework, test-framework-hunit, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "haxl";
-       version = "0.5.0.0";
-       sha256 = "1s6idnlykwi16d9yikmbx3hc1blcvnvyx7pjwqh9n59sb64l1jfw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base binary bytestring containers deepseq exceptions filepath
-         ghc-prim hashable HUnit pretty text time transformers
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [ base hashable time ];
-       testHaskellDepends = [
-         aeson base binary bytestring containers deepseq filepath hashable
-         HUnit test-framework test-framework-hunit text unordered-containers
-       ];
-       homepage = "https://github.com/facebook/Haxl";
-       description = "A Haskell library for efficient, concurrent, and concise data access";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haxl_0_5_1_0" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
      , test-framework, test-framework-hunit, text, time, transformers
@@ -92945,7 +91346,6 @@ self: {
        homepage = "https://github.com/facebook/Haxl";
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxl-amazonka" = callPackage
@@ -93898,8 +92298,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.5.2.0";
-       sha256 = "144ap99ps0hicmndd0zk3ywbangjyrd9c7h90cxn5ikjp78h58xc";
+       version = "0.5.2.1";
+       sha256 = "1b8qrkfryyj8fg07vzl4cq4rwsbhlaqm5l477ld4mmgcgk4infi8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94018,22 +92418,6 @@ self: {
      }) {};
 
   "heaps" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest
-     , filepath
-     }:
-     mkDerivation {
-       pname = "heaps";
-       version = "0.3.4.1";
-       sha256 = "1y9g3hkwxqy38js24954yprbhryv7bpa7xhxwv7fhnc4bc4nf9bw";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/heaps/";
-       description = "Asymptotically optimal Brodal/Okasaki heaps";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "heaps_0_3_5" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest
      , filepath
      }:
@@ -94049,7 +92433,6 @@ self: {
        homepage = "http://github.com/ekmett/heaps/";
        description = "Asymptotically optimal Brodal/Okasaki heaps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heapsort" = callPackage
@@ -94182,8 +92565,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.9.8";
-       sha256 = "0qmfscq26f5n3a7xvc2ffg20gcg73y85w01s1vgpwpz55y62jbl2";
+       version = "0.9.9";
+       sha256 = "1va4lk0pjf3hcw4ap3s35c1slpbrb898g9x01az7g1xgwxq4y2jl";
        libraryHaskellDepends = [
          async base bytestring bytestring-lexing deepseq mtl network
          resource-pool scanner stm text time unordered-containers vector
@@ -94359,8 +92742,8 @@ self: {
        pname = "heist";
        version = "1.0.1.0";
        sha256 = "1jwbqr2n7jv8cykjgg1a0bdwjszmrbg5qflikvmkyiy1pz0z6kzx";
-       revision = "4";
-       editedCabalFile = "1swhqpm0sb6mvqgzy7cf8p7alvsy5qvcx1kdl5rnqq71vql5v4nn";
+       revision = "5";
+       editedCabalFile = "02vsrjfcbzfi27992dv60cakb2s1z6ci13x01cvgdskcm8w81yl6";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
@@ -95677,7 +94060,7 @@ self: {
        librarySystemDepends = [ Cocoa ];
        libraryToolDepends = [ CoreServices ];
        homepage = "http://github.com/luite/hfsevents";
-       description = "File/folder watching for macOS";
+       description = "File/folder watching for OS X";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" ];
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97888,23 +96271,6 @@ self: {
      }) {inherit (pkgs) git; inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
-    ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
-     mkDerivation {
-       pname = "hlibsass";
-       version = "0.1.6.0";
-       sha256 = "1plw99ri6xnrjdgrbmwzrw0hdr2m0f38zwr6yagigqfq2b72d21x";
-       configureFlags = [ "-fexternallibsass" ];
-       setupHaskellDepends = [ base Cabal directory ];
-       libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ libsass ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/jakubfijalkowski/hlibsass";
-       description = "Low-level bindings to Libsass";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) libsass;};
-
-  "hlibsass_0_1_6_1" = callPackage
     ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
      mkDerivation {
        pname = "hlibsass";
@@ -98075,6 +96441,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openblasCompat;};
 
+  "hmatrix_0_18_1_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , openblasCompat, random, split, storable-complex, vector
+     }:
+     mkDerivation {
+       pname = "hmatrix";
+       version = "0.18.1.0";
+       sha256 = "07zkwvg872hfk6jyn4s54ws8mvclynazaxf7fsbqi16dmf9dn61c";
+       configureFlags = [ "-fopenblas" ];
+       libraryHaskellDepends = [
+         array base binary bytestring deepseq random split storable-complex
+         vector
+       ];
+       librarySystemDepends = [ openblasCompat ];
+       preConfigure = "sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'";
+       homepage = "https://github.com/albertoruiz/hmatrix";
+       description = "Numeric Linear Algebra";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openblasCompat;};
+
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, liblapack, transformers }:
      mkDerivation {
@@ -98454,20 +96841,6 @@ self: {
      }) {inherit (pkgs) ncurses;};
 
   "hmpfr" = callPackage
-    ({ mkDerivation, base, integer-gmp, mpfr }:
-     mkDerivation {
-       pname = "hmpfr";
-       version = "0.4.2.1";
-       sha256 = "048amh4w9vjrihahhb3rw0gbk3yp7qvjf6vcp9c5pq2kc3n7vcnc";
-       enableSeparateDataOutput = true;
-       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_3" = callPackage
     ({ mkDerivation, base, integer-gmp, mpfr }:
      mkDerivation {
        pname = "hmpfr";
@@ -98479,7 +96852,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
@@ -100588,26 +98960,6 @@ self: {
      }) {};
 
   "hpp" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-trie, directory
-     , filepath, ghc-prim, time, transformers
-     }:
-     mkDerivation {
-       pname = "hpp";
-       version = "0.4.0";
-       sha256 = "0pcz89zw3asc1vm0w6f6qk6y6bvqnsr3wailzx89ym60minkx4h5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring bytestring-trie directory filepath ghc-prim time
-         transformers
-       ];
-       executableHaskellDepends = [ base directory filepath time ];
-       homepage = "https://github.com/acowley/hpp";
-       description = "A Haskell pre-processor";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hpp_0_4_1" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, directory
      , filepath, ghc-prim, time, transformers
      }:
@@ -100625,7 +98977,6 @@ self: {
        homepage = "https://github.com/acowley/hpp";
        description = "A Haskell pre-processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpqtypes" = callPackage
@@ -102490,8 +100841,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.2.5.0";
-       sha256 = "12x26y11xd5h0j3s2j3pvfjak6mbdc417brhx6zva9k1x4lijagm";
+       version = "0.2.5.1";
+       sha256 = "15rr12mric0gm4xfskwsqh89kdiqxzvg47nkddbyr7hah1rjmcn4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102689,25 +101040,6 @@ self: {
      }) {};
 
   "hsexif" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
-     , iconv, text, time
-     }:
-     mkDerivation {
-       pname = "hsexif";
-       version = "0.6.1.1";
-       sha256 = "029zlchaijhv5rmd0llmqp1wpaskjfp8alhqh0bisz4sjgk2qw1p";
-       libraryHaskellDepends = [
-         base binary bytestring containers iconv text time
-       ];
-       testHaskellDepends = [
-         base binary bytestring containers hspec HUnit iconv text time
-       ];
-       homepage = "https://github.com/emmanueltouzery/hsexif";
-       description = "EXIF handling library in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsexif_0_6_1_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
      , iconv, text, time
      }:
@@ -102724,7 +101056,6 @@ self: {
        homepage = "https://github.com/emmanueltouzery/hsexif";
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsfacter" = callPackage
@@ -103017,8 +101348,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslogger-reader";
-       version = "1.0.2";
-       sha256 = "0kr07kw18ydn3l22dis7nfym4x5gi909riv2vs6s63szyghmj5dl";
+       version = "1.0.3";
+       sha256 = "18yvks9v8z27jjrfwmczrnhkpx9q33v2l6vfwisrx4a7sv7mc0fp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base hslogger text time ];
@@ -103102,15 +101433,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) lua5_1;};
 
-  "hslua_0_6_0" = callPackage
+  "hslua_0_8_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, fail
      , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty
      , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "hslua";
-       version = "0.6.0";
-       sha256 = "1dbnvks02q2hayp9w5n3cj01y52lh7s7z9amhhi4fymrsb1d700l";
+       version = "0.8.0";
+       sha256 = "0zl7znhbwnqcdvy9v18x3ch8vxk719k5lx55nr65996wb193nwmc";
        configureFlags = [ "-fsystem-lua" ];
        libraryHaskellDepends = [
          base bytestring containers exceptions fail mtl text
@@ -103441,8 +101772,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsparql";
-       version = "0.3.4";
-       sha256 = "0nxj9aq59c02sdhz5nz5c3klcsglb4gpchah0b82fjbiphbs8sxb";
+       version = "0.3.5";
+       sha256 = "0557c81wgk930x2bq72f2f3kycanxxvk1s5nrfxn56lmgijzkkqz";
        libraryHaskellDepends = [
          base bytestring HTTP MissingH mtl network network-uri rdf4h text
          xml
@@ -104885,25 +103216,6 @@ self: {
      }) {};
 
   "hsx2hs" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-exts
-     , haskell-src-meta, mtl, template-haskell, utf8-string
-     }:
-     mkDerivation {
-       pname = "hsx2hs";
-       version = "0.14.1";
-       sha256 = "191rzsxnilkps20pp124pfbq8blf6g1b3gj1z6h0aa73hhf07c73";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring haskell-src-exts haskell-src-meta mtl
-         template-haskell utf8-string
-       ];
-       homepage = "https://github.com/seereason/hsx2hs";
-       description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsx2hs_0_14_1_1" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-exts
      , haskell-src-meta, mtl, template-haskell, utf8-string
      }:
@@ -104920,7 +103232,6 @@ self: {
        homepage = "https://github.com/seereason/hsx2hs";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsyscall" = callPackage
@@ -106378,6 +104689,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http2-client" = callPackage
+    ({ mkDerivation, async, base, bytestring, connection, containers
+     , data-default-class, http2, network, optparse-applicative, time
+     , tls
+     }:
+     mkDerivation {
+       pname = "http2-client";
+       version = "0.2.0.1";
+       sha256 = "14w56b2lzjqwyh2vfqp3q27wsh6yzldrk073msszn0af0wrjv39p";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring connection containers http2 network time tls
+       ];
+       executableHaskellDepends = [
+         async base bytestring data-default-class http2 optparse-applicative
+         time tls
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/lucasdicioccio/http2-client";
+       description = "A native HTTP2 client library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "httpd-shed" = callPackage
     ({ mkDerivation, base, network, network-uri }:
      mkDerivation {
@@ -107122,8 +105457,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-bits";
-       version = "0.5.0.2";
-       sha256 = "14szmh7wqbwzivc20bmavgcsp286n2kvxxz88qhl4mza5jxi6dhf";
+       version = "0.5.0.3";
+       sha256 = "1xkzxfz25ah7p4zybdm0c1081kkca7515jh1d7vjysxs34w8h1yn";
        libraryHaskellDepends = [
          base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
@@ -107521,8 +105856,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.8.0.1";
-       sha256 = "1m05w2x5nmja0k1li90vx9ifzs11h8xxbpi25rsk4zalghy8gn6g";
+       version = "0.8.0.2";
+       sha256 = "0b9ki066c5nypy81dqyj91ghj00p1y5glhg1jpf267q6r0mjkwcm";
        libraryHaskellDepends = [
          base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector
        ];
@@ -107573,8 +105908,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect-base";
-       version = "0.2.0.0";
-       sha256 = "195g51py2kx0nx0kc67nhswmpq6r8dlb6p9i1y53hyis1ygc2ly8";
+       version = "0.2.0.1";
+       sha256 = "0nkbq0wzljhdjvcn04wkysqa357qhzacisimqpj8k5nbf3rkrlvj";
        libraryHaskellDepends = [
          base hw-bits hw-int hw-prim hw-string-parse safe vector
        ];
@@ -108648,32 +106983,6 @@ self: {
      }) {};
 
   "hyperloglog" = callPackage
-    ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal
-     , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory
-     , distributive, doctest, filepath, generic-deriving, hashable, lens
-     , reflection, safecopy, semigroupoids, semigroups, simple-reflect
-     , siphash, tagged, vector
-     }:
-     mkDerivation {
-       pname = "hyperloglog";
-       version = "0.4.1";
-       sha256 = "08r0yrnfjcfv0p14p69dqjrsmff4alx5yykkq06mig0wycl4v4q0";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         approximate base binary bits bytes cereal cereal-vector comonad
-         deepseq distributive hashable lens reflection safecopy
-         semigroupoids semigroups siphash tagged vector
-       ];
-       testHaskellDepends = [
-         base directory doctest filepath generic-deriving semigroups
-         simple-reflect
-       ];
-       homepage = "http://github.com/analytics/hyperloglog";
-       description = "An approximate streaming (constant space) unique object counter";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hyperloglog_0_4_2" = callPackage
     ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal
      , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory
      , distributive, doctest, filepath, generic-deriving, hashable, lens
@@ -108697,7 +107006,6 @@ self: {
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperloglogplus" = callPackage
@@ -109571,7 +107879,7 @@ self: {
        libraryPkgconfigDepends = [ ige-mac-integration ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
-       description = "Bindings for the Gtk/macOS integration library";
+       description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {ige-mac-integration = null;};
@@ -109897,20 +108205,6 @@ self: {
      }) {};
 
   "ihs" = callPackage
-    ({ mkDerivation, base, process }:
-     mkDerivation {
-       pname = "ihs";
-       version = "0.1.0.0";
-       sha256 = "178psggvaad58kxfjgg3i4a8xgggn3gjcsi8y2f302dfza8kvlwa";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base process ];
-       homepage = "https://github.com/minad/ihs";
-       description = "Interpolated Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "ihs_0_1_0_1" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "ihs";
@@ -109922,7 +108216,6 @@ self: {
        homepage = "https://github.com/minad/ihs";
        description = "Interpolated Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihttp" = callPackage
@@ -111193,14 +109486,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "inline-c-cpp_0_2_0_2" = callPackage
-    ({ mkDerivation, base, inline-c, template-haskell }:
+  "inline-c-cpp_0_2_1_0" = callPackage
+    ({ mkDerivation, base, hspec, inline-c, safe-exceptions
+     , template-haskell
+     }:
      mkDerivation {
        pname = "inline-c-cpp";
-       version = "0.2.0.2";
-       sha256 = "1zmqj47snxa0hxw3scz2mqgb1axfwqya5n1hi72x7abcx0nzfc2q";
-       libraryHaskellDepends = [ base inline-c template-haskell ];
-       testHaskellDepends = [ base ];
+       version = "0.2.1.0";
+       sha256 = "02m7w3n9rjynirniplp2gc2vy7c1jyalsqznh5mz366ps6vr19ip";
+       libraryHaskellDepends = [
+         base inline-c safe-exceptions template-haskell
+       ];
+       testHaskellDepends = [ base hspec inline-c safe-exceptions ];
        description = "Lets you embed C++ code into Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111772,10 +110069,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.20";
-       sha256 = "0xysd4afdvrqbbndby0ylm8qph190d5sj81l42hcdl9w7bgx4gz9";
-       revision = "1";
-       editedCabalFile = "1fgqd3qkws9yb3vj8ay695ym5cgifi082wryh68dp0qqh7agwkhl";
+       version = "0.1.21";
+       sha256 = "1fr855gbz0ypxa73d5f74wp2sr3q67wdv6g4bpckj682c1x7dr73";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -111946,25 +110241,6 @@ self: {
      }) {};
 
   "intervals" = callPackage
-    ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
-     , distributive, doctest, filepath, ghc-prim, QuickCheck
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "intervals";
-       version = "0.8";
-       sha256 = "1i78h7plzckdjs9qr2p1qldhb5gv7v1cl01r27sf1hg2x9gr88v4";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ array base distributive ghc-prim ];
-       testHaskellDepends = [
-         base directory doctest filepath QuickCheck template-haskell
-       ];
-       homepage = "http://github.com/ekmett/intervals";
-       description = "Interval Arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "intervals_0_8_1" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
      , distributive, doctest, filepath, ghc-prim, QuickCheck
      , template-haskell
@@ -111983,7 +110259,6 @@ self: {
        homepage = "http://github.com/ekmett/intervals";
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intricacy" = callPackage
@@ -112116,27 +110391,6 @@ self: {
      }) {};
 
   "invariant" = callPackage
-    ({ mkDerivation, array, base, bifunctors, comonad, containers
-     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
-     , semigroups, StateVar, stm, tagged, template-haskell, transformers
-     , transformers-compat, unordered-containers
-     }:
-     mkDerivation {
-       pname = "invariant";
-       version = "0.4.2";
-       sha256 = "1m5iaj7w4srg0qcd5dga8aphkwapxmhh54f4pi1bc67i17zl99ss";
-       libraryHaskellDepends = [
-         array base bifunctors comonad containers contravariant ghc-prim
-         profunctors semigroups StateVar stm tagged template-haskell
-         transformers transformers-compat unordered-containers
-       ];
-       testHaskellDepends = [ base hspec QuickCheck template-haskell ];
-       homepage = "https://github.com/nfrisby/invariant-functors";
-       description = "Haskell98 invariant functors";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "invariant_0_4_3" = callPackage
     ({ mkDerivation, array, base, bifunctors, comonad, containers
      , contravariant, ghc-prim, hspec, profunctors, QuickCheck
      , semigroups, StateVar, stm, tagged, template-haskell
@@ -112157,7 +110411,6 @@ self: {
        homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell98 invariant functors";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible" = callPackage
@@ -112336,32 +110589,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.4.0.0";
-       sha256 = "03lk73smhqvw6lxp4j0kxlkd87vaxaz2avpy7k533fxv1jk3sfbd";
-       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_4_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , deepseq, directory, filepath, HUnit, mtl, network, primitive
      , process, QuickCheck, test-framework, test-framework-hunit
@@ -112385,7 +110612,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
@@ -112794,25 +111020,6 @@ self: {
      }) {};
 
   "irc-client" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
-     , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
-     , time, tls, transformers, x509, x509-store, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-client";
-       version = "0.4.4.2";
-       sha256 = "07rijsr4sbh9hsj83kazgxrwl7vamxa3d6hd71bdsq485ghkkphq";
-       libraryHaskellDepends = [
-         base bytestring conduit connection irc-conduit irc-ctcp
-         network-conduit-tls old-locale stm stm-conduit text time tls
-         transformers x509 x509-store x509-validation
-       ];
-       homepage = "https://github.com/barrucadu/irc-client";
-       description = "An IRC client library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-client_0_4_4_4" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
      , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
      , time, tls, transformers, x509, x509-store, x509-validation
@@ -112829,7 +111036,6 @@ self: {
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-colors" = callPackage
@@ -112844,25 +111050,6 @@ self: {
      }) {};
 
   "irc-conduit" = 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.1";
-       sha256 = "06kjl5b5i1s1pazn8yp2sr9f1mlgaibkgjvpd2z2q9kzy8kchh4n";
-       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;
-     }) {};
-
-  "irc-conduit_0_2_2_3" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
      , time, tls, transformers, x509-validation
@@ -112879,7 +111066,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
@@ -113882,8 +112068,8 @@ self: {
      }:
      mkDerivation {
        pname = "ixset-typed";
-       version = "0.3.1";
-       sha256 = "0xdm036vd6p7ax6dqziccrgzh45hv5zzg747s25hsihhjv46665l";
+       version = "0.3.1.1";
+       sha256 = "04nwmmw9rfvz7bm7vqlahyfx7rxn7qx9zdyh6m8g2vf55in4csyh";
        libraryHaskellDepends = [
          base containers deepseq safecopy syb template-haskell
        ];
@@ -114771,8 +112957,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.9.3.0";
-       sha256 = "1c96b2zxa8x4p28rxjnj9nz5999d4f8nfwj38yws0h2c3lwsm740";
+       version = "0.9.4.0";
+       sha256 = "0lk4cbvl2n3zcc709hjcnxw3wm1vd49dqlm12cwy9im4aif1zbq1";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          deepseq filepath ghc-prim http-types lens primitive process random
@@ -114804,8 +112990,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.9.1.0";
-       sha256 = "16dgcdj1x58gpkqvz434f0ysyhwpy1dwqxs6bd24875n1hxjim77";
+       version = "0.9.2.0";
+       sha256 = "14m752vj4lpdwa0cbziz1wynjf836f3khrmfdz702c0d0als3j0q";
        libraryHaskellDepends = [
          base base-compat jsaddle lens text transformers
        ];
@@ -114837,8 +113023,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-warp";
-       version = "0.9.3.0";
-       sha256 = "0lcwg3lgh6bah8zqjzk7hfy8pcjhjlq5a22y83332qn4ms9hfw8l";
+       version = "0.9.4.0";
+       sha256 = "0asl6jw6ymc9iw5g45qihxhfb59fhsxj7bxzgnvsqrxq4kdfv0a6";
        libraryHaskellDepends = [
          aeson base bytestring containers foreign-store http-types jsaddle
          stm text time transformers wai wai-websockets warp websockets
@@ -114857,16 +113043,17 @@ self: {
   "jsaddle-webkit2gtk" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, gi-gio
      , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base
-     , jsaddle, text, unix, webkit2gtk3-javascriptcore
+     , haskell-gi-overloading, jsaddle, text, unix
+     , webkit2gtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsaddle-webkit2gtk";
-       version = "0.9.0.0";
-       sha256 = "1qrrvfr9ha5v43940ppdf3ngrig1s324482aaxsnpj2s7jxmqsa6";
+       version = "0.9.4.0";
+       sha256 = "0mw43kmamp1spw6zfdbm76apn79n7y9inb0c1c8fkfczbjd8b759";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-gio gi-glib gi-gtk
-         gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix
-         webkit2gtk3-javascriptcore
+         gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading
+         jsaddle text unix webkit2gtk3-javascriptcore
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -114898,8 +113085,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-wkwebview";
-       version = "0.9.0.0";
-       sha256 = "1yy7m60h6kcqb97qwhrh3kbxrz981njff2f23x1axfrb2jc3mby4";
+       version = "0.9.4.0";
+       sha256 = "05braj7m2z0r5vqq1y1sp6kh11b8z269lvznysmsqay31wccbyvx";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default jsaddle
        ];
@@ -115924,8 +114111,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.17";
-       sha256 = "0r57bcg21pnw9qgqp82c60lr8p4m4xv0ml01l3wzzb7vahnxalir";
+       version = "0.2.19";
+       sha256 = "0f3iibpxgr2f7mvl6x4719gvjd4dcd5ajiz3y985rng6d7n5sbya";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118196,8 +116383,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambda-sampler";
-       version = "1.0";
-       sha256 = "1whs5phj8dd11af8sadnwyxpv4r4bmklqvpqiwdai7639lldk86a";
+       version = "1.1";
+       sha256 = "0vfin9f9mhxq7r63pyl3rpipb5z7dbyhwbf02y6h7brjq8wg9gx8";
        libraryHaskellDepends = [ base MonadRandom mtl transformers ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -118983,31 +117170,6 @@ self: {
      }) {};
 
   "language-c-quote" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , exception-mtl, exception-transformers, filepath, happy
-     , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
-     , symbol, template-haskell, test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "language-c-quote";
-       version = "0.12";
-       sha256 = "14wxbis9zm3zlc3q430is50nk5k2hqx4lracwm2ca7qlg854h2hj";
-       libraryHaskellDepends = [
-         array base bytestring containers exception-mtl
-         exception-transformers filepath haskell-src-meta mainland-pretty
-         mtl srcloc syb symbol template-haskell
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         base bytestring HUnit mainland-pretty srcloc symbol test-framework
-         test-framework-hunit
-       ];
-       homepage = "https://github.com/mainland/language-c-quote";
-       description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-c-quote_0_12_1" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , exception-mtl, exception-transformers, filepath, happy
      , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
@@ -119030,7 +117192,6 @@ self: {
        homepage = "https://github.com/mainland/language-c-quote";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-cil" = callPackage
@@ -119408,8 +117569,8 @@ self: {
        pname = "language-lua";
        version = "0.10.0";
        sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c";
-       revision = "1";
-       editedCabalFile = "0l90w79xn0k1wqhz7gb2ih33nja3w9m8pp11d9dxdg5am05fyhm2";
+       revision = "2";
+       editedCabalFile = "08c0ivrp357lpxhxqq78z8wqnhwdd3gycsn6yhmf8xnk8bv6yz7h";
        libraryHaskellDepends = [ array base bytestring deepseq text ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
@@ -120570,19 +118731,6 @@ self: {
      }) {};
 
   "leancheck" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "leancheck";
-       version = "0.6.3";
-       sha256 = "0qcmpm7x5fsiqvwnsih2xqy9liy23vv96i88460kjr19lvscglhj";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/rudymatela/leancheck#readme";
-       description = "Cholesterol-free property-based testing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "leancheck_0_6_4" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
@@ -120593,7 +118741,6 @@ self: {
        homepage = "https://github.com/rudymatela/leancheck#readme";
        description = "Cholesterol-free property-based testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leankit-api" = callPackage
@@ -120785,16 +118932,17 @@ self: {
 
   "legion-discovery-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , http-client, http-types, load-balancing, resourcet, text
-     , transformers
+     , http-client, http-types, load-balancing, monad-logger, resourcet
+     , safe-exceptions, text, text-show, transformers
      }:
      mkDerivation {
        pname = "legion-discovery-client";
-       version = "0.1.1.1";
-       sha256 = "096zj3rc63wci6z1pqlwsmn22gn71rs1pildlizydf6xbpim0w95";
+       version = "0.2.0.1";
+       sha256 = "0wvm0y5gpriq17jvvczij83sh8cwkijv7w3ayx6yqkyjhwwlljdi";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers http-client http-types
-         load-balancing resourcet text transformers
+         load-balancing monad-logger resourcet safe-exceptions text
+         text-show transformers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/owensmurray/legion-discovery-client#readme";
@@ -120829,87 +118977,79 @@ self: {
   "leksah" = callPackage
     ({ mkDerivation, array, base, base-compat, binary, binary-shared
      , blaze-html, bytestring, Cabal, conduit, containers, cpphs
-     , deepseq, directory, executable-path, filepath, ghc
-     , ghcjs-codemirror, ghcjs-dom, gio, glib, gtk3, gtksourceview3
-     , haskell-src-exts, hlint, hslogger, jsaddle, leksah-server, lens
-     , ltk, monad-loops, mtl, network, network-uri, old-time, parsec
-     , pretty, pretty-show, QuickCheck, regex-base, regex-tdfa
-     , regex-tdfa-text, shakespeare, stm, strict, text, time
-     , transformers, unix, utf8-string, vado, vcsgui, vcswrapper
-     , webkitgtk3, webkitgtk3-javascriptcore
+     , deepseq, directory, executable-path, filepath, fsnotify, ghc
+     , ghcjs-codemirror, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib
+     , gi-gobject, gi-gtk, gi-gtk-hs, gi-gtksource, gi-pango, gi-webkit2
+     , gtk3, haskell-gi-base, haskell-gi-overloading, haskell-src-exts
+     , hlint, hslogger, HTTP, leksah-server, ltk, mtl, network
+     , network-uri, old-time, parsec, pretty, pretty-show, QuickCheck
+     , regex-base, regex-tdfa, regex-tdfa-text, shakespeare, split, stm
+     , strict, text, time, transformers, unix, utf8-string, vado, vcsgui
+     , vcswrapper
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.2.0";
-       sha256 = "01ln9rnv7af6jjcvmsd46g02g6ws5mvrgx7vvn1v67q9nx78bgj4";
-       revision = "1";
-       editedCabalFile = "0iqg1qlfh6knmlq29ydzp2qs75aa6a2rpl5l5fzp1b1lcsh8njdm";
+       version = "0.16.2.2";
+       sha256 = "11b1im02687snpw1d6bbprnczrc11s2qr8k2jvcdl5bbzi1hjnw7";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base base-compat binary binary-shared blaze-html bytestring
          Cabal conduit containers cpphs deepseq directory executable-path
-         filepath ghc ghcjs-codemirror gio glib gtk3 gtksourceview3
-         haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl
-         network network-uri old-time parsec pretty pretty-show QuickCheck
-         regex-base regex-tdfa regex-tdfa-text shakespeare stm strict text
-         time transformers unix utf8-string vado vcsgui vcswrapper
-         webkitgtk3 webkitgtk3-javascriptcore
-       ];
-       executableHaskellDepends = [
-         base ghcjs-dom gtk3 gtksourceview3 jsaddle stm webkitgtk3
-         webkitgtk3-javascriptcore
-       ];
-       testHaskellDepends = [
-         base Cabal containers glib gtk3 gtksourceview3 hslogger
-         leksah-server ltk monad-loops QuickCheck stm text transformers
-         webkitgtk3
+         filepath fsnotify ghc ghcjs-codemirror gi-cairo gi-gdk gi-gdkpixbuf
+         gi-gio gi-glib gi-gobject gi-gtk gi-gtk-hs gi-gtksource gi-pango
+         gi-webkit2 haskell-gi-base haskell-gi-overloading haskell-src-exts
+         hlint hslogger HTTP leksah-server ltk mtl network network-uri
+         old-time parsec pretty pretty-show QuickCheck regex-base regex-tdfa
+         regex-tdfa-text shakespeare split stm strict text time transformers
+         unix utf8-string vado vcsgui vcswrapper
        ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       executableHaskellDepends = [ base gi-gtk-hs leksah-server stm ];
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {gtk3 = pkgs.gnome3.gtk;};
 
   "leksah-server" = callPackage
-    ({ mkDerivation, attoparsec, base, bin-package-db, binary
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, binary
      , binary-shared, bytestring, Cabal, conduit, conduit-extra
-     , containers, deepseq, directory, executable-path, filepath, ghc
-     , haddock-api, haddock-library, hslogger, HTTP, HUnit, ltk, network
-     , network-uri, parsec, pretty, process, resourcet, strict, text
-     , time, transformers, unix
+     , containers, deepseq, directory, doctest, executable-path
+     , filepath, ghc, ghc-boot, haddock-api, haddock-library, hslogger
+     , HTTP, HUnit, ltk, network, network-uri, parsec, pretty, process
+     , resourcet, strict, text, time, transformers, unix
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.2.0";
-       sha256 = "0haj6pi593x0chkvkvvv6d523fmg8vd0hjzkj8sjf8h8ys0sg9k2";
+       version = "0.16.2.0";
+       sha256 = "0wfikbv98p29rv2cl1wwnac82g5vj1w70hy4m40vxgag3qpnr6iw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         attoparsec base bin-package-db binary binary-shared bytestring
+         aeson attoparsec base base-compat binary binary-shared bytestring
          Cabal conduit conduit-extra containers deepseq directory
-         executable-path filepath ghc haddock-api haddock-library hslogger
-         HTTP ltk network network-uri parsec pretty process resourcet strict
-         text time transformers unix
+         executable-path filepath ghc ghc-boot haddock-api haddock-library
+         hslogger HTTP ltk network network-uri parsec pretty process
+         resourcet strict text time transformers unix
        ];
        executableHaskellDepends = [
-         attoparsec base bin-package-db binary binary-shared bytestring
-         Cabal conduit conduit-extra containers deepseq directory
-         executable-path filepath ghc haddock-api haddock-library hslogger
-         HTTP ltk network network-uri parsec pretty process resourcet strict
-         text time transformers unix
+         attoparsec base base-compat binary binary-shared bytestring Cabal
+         conduit conduit-extra containers deepseq directory executable-path
+         filepath ghc ghc-boot haddock-api haddock-library hslogger HTTP ltk
+         network network-uri parsec pretty process resourcet strict text
+         time transformers unix
        ];
        testHaskellDepends = [
-         base conduit conduit-extra hslogger HUnit process resourcet
-         transformers
+         base conduit conduit-extra directory doctest filepath hslogger
+         HUnit process resourcet text transformers
        ];
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
-       broken = true;
-     }) {bin-package-db = null;};
+     }) {};
 
   "lendingclub" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, HsOpenSSL
@@ -120930,47 +119070,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , Cabal, cabal-doctest, comonad, containers, contravariant
-     , criterion, deepseq, directory, distributive, doctest, exceptions
-     , filepath, free, generic-deriving, ghc-prim, hashable, hlint
-     , HUnit, kan-extensions, mtl, nats, parallel, profunctors
-     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
-     , tagged, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text
-     , th-abstraction, transformers, transformers-compat
-     , unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.15.3";
-       sha256 = "0znd63nkpdndpdgpvcwnqm31v4w2d1ipkj8lnnbsabbrhywknqd2";
-       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring comonad containers
-         contravariant distributive exceptions filepath free ghc-prim
-         hashable kan-extensions mtl parallel profunctors reflection
-         semigroupoids semigroups tagged template-haskell text
-         th-abstraction transformers transformers-compat
-         unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory doctest filepath
-         generic-deriving hlint HUnit mtl nats parallel QuickCheck
-         semigroups simple-reflect test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th text transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring comonad containers criterion deepseq
-         generic-deriving transformers unordered-containers vector
-       ];
-       homepage = "http://github.com/ekmett/lens/";
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "lens_4_15_4" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , Cabal, cabal-doctest, call-stack, comonad, containers
      , contravariant, criterion, deepseq, directory, distributive
@@ -121009,7 +119108,6 @@ self: {
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -121025,26 +119123,6 @@ self: {
      }) {};
 
   "lens-action" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant
-     , directory, doctest, filepath, lens, mtl, profunctors
-     , semigroupoids, semigroups, transformers
-     }:
-     mkDerivation {
-       pname = "lens-action";
-       version = "0.2.1";
-       sha256 = "07b5bh9m7brhwkpc0x3k9k4xvvs6r4g51fflsay1r4b1kl6zaabk";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base comonad contravariant lens mtl profunctors semigroupoids
-         semigroups transformers
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/lens-action/";
-       description = "Monadic Getters and Folds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens-action_0_2_2" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant
      , directory, doctest, filepath, lens, mtl, profunctors
      , semigroupoids, semigroups, transformers
@@ -121062,32 +119140,9 @@ self: {
        homepage = "http://github.com/ekmett/lens-action/";
        description = "Monadic Getters and Folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-aeson" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, doctest, generic-deriving, lens, scientific
-     , semigroups, simple-reflect, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "lens-aeson";
-       version = "1.0.1";
-       sha256 = "1g8d6a7lhg6i1v56afm6x102pcxk0dxcyh2j7qqi62vp12kamljx";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring lens scientific text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base doctest generic-deriving semigroups simple-reflect
-       ];
-       homepage = "http://github.com/lens/lens-aeson/";
-       description = "Law-abiding lenses for aeson";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lens-aeson_1_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, doctest, generic-deriving, lens, scientific
      , semigroups, simple-reflect, text, unordered-containers, vector
@@ -121109,7 +119164,6 @@ self: {
        homepage = "http://github.com/lens/lens-aeson/";
        description = "Law-abiding lenses for aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-datetime" = callPackage
@@ -121151,18 +119205,6 @@ self: {
      }) {};
 
   "lens-family-th" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "lens-family-th";
-       version = "0.5.0.0";
-       sha256 = "17lmvsj4jar5qkscz804infivv77cfx5c8yh6raxnscq1b9nm3ll";
-       libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/DanBurton/lens-family-th#readme";
-       description = "Generate lens-family style lenses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens-family-th_0_5_0_1" = callPackage
     ({ mkDerivation, base, hspec, lens-family, template-haskell }:
      mkDerivation {
        pname = "lens-family-th";
@@ -121173,22 +119215,9 @@ self: {
        homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-labels" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "lens-labels";
-       version = "0.1.0.1";
-       sha256 = "0yskbghzi5cqiqcrw1d6h98kd9m5i76xi6x343rflfkkng3725rl";
-       libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/google/proto-lens";
-       description = "Integration of lenses with OverloadedLabels";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens-labels_0_1_0_2" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "lens-labels";
@@ -121198,7 +119227,6 @@ self: {
        homepage = "https://github.com/google/proto-lens";
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-prelude" = callPackage
@@ -121307,6 +119335,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lens-toml-parser" = callPackage
+    ({ mkDerivation, base, containers, dwergaz, hlint, lens-simple
+     , profunctors, text, time, toml-parser
+     }:
+     mkDerivation {
+       pname = "lens-toml-parser";
+       version = "0.1.0.0";
+       sha256 = "17i3da42gahf9ni29mk369jq2pgbgdimvwszgj6dzywxv1yflldb";
+       libraryHaskellDepends = [ base profunctors text time toml-parser ];
+       testHaskellDepends = [
+         base containers dwergaz hlint lens-simple text toml-parser
+       ];
+       homepage = "https://github.com/xngns/lens-toml-parser";
+       description = "Lenses for toml-parser";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "lens-tutorial" = callPackage
     ({ mkDerivation, base, doctest, lens }:
      mkDerivation {
@@ -122064,28 +120109,6 @@ self: {
      }) {};
 
   "libmpd" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-default-class, filepath, hspec, mtl, network, old-locale
-     , QuickCheck, text, time, unix, utf8-string
-     }:
-     mkDerivation {
-       pname = "libmpd";
-       version = "0.9.0.6";
-       sha256 = "0dy9j12mw3d2j2ixj1nq3s6g59zgwzr1xmqjvs2ysy50pd3bksxx";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers data-default-class filepath
-         mtl network old-locale text time utf8-string
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring containers data-default-class filepath
-         hspec mtl network old-locale QuickCheck text time unix utf8-string
-       ];
-       homepage = "http://github.com/vimus/libmpd-haskell#readme";
-       description = "An MPD client library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "libmpd_0_9_0_7" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default-class, filepath, hspec, mtl, network, old-locale
      , QuickCheck, text, time, unix, utf8-string
@@ -122105,7 +120128,6 @@ self: {
        homepage = "http://github.com/vimus/libmpd-haskell#readme";
        description = "An MPD client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libnotify" = callPackage
@@ -122886,37 +120908,6 @@ self: {
      }) {};
 
   "linear" = callPackage
-    ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
-     , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq
-     , distributive, doctest, ghc-prim, hashable, HUnit, lens
-     , reflection, semigroupoids, semigroups, simple-reflect, tagged
-     , template-haskell, test-framework, test-framework-hunit
-     , transformers, transformers-compat, unordered-containers, vector
-     , void
-     }:
-     mkDerivation {
-       pname = "linear";
-       version = "1.20.6";
-       sha256 = "1xcr36g6rr7k0vlzsh6szzxxrdi1f6vb9sxdilcpsb8xjvkk258m";
-       revision = "1";
-       editedCabalFile = "0jgfgn0i5882yhmbqc1w9g7gk713l5r66xyaxiwg7nmw82smmakk";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         adjunctions base base-orphans binary bytes cereal containers
-         deepseq distributive ghc-prim hashable lens reflection
-         semigroupoids semigroups tagged template-haskell transformers
-         transformers-compat unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base binary bytestring deepseq doctest HUnit lens reflection
-         simple-reflect test-framework test-framework-hunit vector
-       ];
-       homepage = "http://github.com/ekmett/linear/";
-       description = "Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "linear_1_20_7" = callPackage
     ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
      , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq
      , distributive, doctest, ghc-prim, hashable, HUnit, lens
@@ -122945,7 +120936,6 @@ self: {
        homepage = "http://github.com/ekmett/linear/";
        description = "Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-accelerate" = callPackage
@@ -122954,8 +120944,10 @@ self: {
      }:
      mkDerivation {
        pname = "linear-accelerate";
-       version = "0.4";
-       sha256 = "03pma42zkk6cfisyfsjmb8496jkfqiab3my4wdahk8z9shmqa3rg";
+       version = "0.4.1";
+       sha256 = "1hhmn446ggm66r3aibg8dyc923lw68fmkb1y8q37jsw13s1lkdlp";
+       revision = "1";
+       editedCabalFile = "18bll3ay0d1586jhfnzw93glv6f4bvz57va46jc2wm2hdfbnvy6d";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          accelerate base distributive lens linear
@@ -123833,24 +121825,6 @@ self: {
      }) {};
 
   "list-t" = callPackage
-    ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
-     , mtl, mtl-prelude, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "list-t";
-       version = "1";
-       sha256 = "05ccx0l6rc97ls0jy7hfma5g0fa10s0h0kik1m596lk41776i6ji";
-       libraryHaskellDepends = [
-         base base-prelude mmorph monad-control mtl transformers
-         transformers-base
-       ];
-       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
-       homepage = "https://github.com/nikita-volkov/list-t";
-       description = "ListT done right";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "list-t_1_0_0_1" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
      , mtl, mtl-prelude, transformers, transformers-base
      }:
@@ -123866,7 +121840,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -123973,8 +121946,8 @@ self: {
     ({ mkDerivation, base, doctest, mtl }:
      mkDerivation {
        pname = "list-transformer";
-       version = "1.0.2";
-       sha256 = "081sik71mli28lvai34zymcl58fiqcrbhzxdi6phmjizm5wj4pqi";
+       version = "1.0.3";
+       sha256 = "13pasfggjbzldy85d0kaydw95myxna63299k021fmbaifz26q2fx";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/Gabriel439/Haskell-List-Transformer-Library";
@@ -124957,25 +122930,6 @@ self: {
      }) {};
 
   "log-base" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
-     , exceptions, monad-control, monad-time, mtl, semigroups, stm, text
-     , time, transformers-base, unordered-containers
-     }:
-     mkDerivation {
-       pname = "log-base";
-       version = "0.7.1.1";
-       sha256 = "0kxng0pvql8sv4wk3x1bx0a0mqjsr3ynbixps9l1zrmsisp01344";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring deepseq exceptions monad-control
-         monad-time mtl semigroups stm text time transformers-base
-         unordered-containers
-       ];
-       homepage = "https://github.com/scrive/log";
-       description = "Structured logging solution (base package)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-base_0_7_2_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
      , exceptions, mmorph, monad-control, monad-time, mtl, semigroups
      , stm, text, time, transformers-base, unordered-containers
@@ -124994,33 +122948,9 @@ self: {
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution (base package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-domain" = callPackage
-    ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
-     , comonad, deepseq, distributive, doctest, generic-deriving
-     , hashable, safecopy, semigroupoids, semigroups, simple-reflect
-     , vector
-     }:
-     mkDerivation {
-       pname = "log-domain";
-       version = "0.11.1";
-       sha256 = "0zbwnx6bs417g67m0hr9n4lk9iwpcm0ivmfhjgaz98hryxx3s8wc";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base binary bytes cereal comonad deepseq distributive hashable
-         safecopy semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base doctest generic-deriving semigroups simple-reflect
-       ];
-       homepage = "http://github.com/ekmett/log-domain/";
-       description = "Log-domain arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-domain_0_11_2" = callPackage
     ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
      , comonad, deepseq, distributive, doctest, generic-deriving
      , hashable, safecopy, semigroupoids, semigroups, simple-reflect
@@ -125043,7 +122973,6 @@ self: {
        homepage = "http://github.com/ekmett/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-effect" = callPackage
@@ -125064,26 +122993,6 @@ self: {
      }) {};
 
   "log-elasticsearch" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , bloodhound, bytestring, deepseq, http-client, http-client-tls
-     , log-base, semigroups, text, text-show, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "log-elasticsearch";
-       version = "0.9.0.1";
-       sha256 = "01xfr3rq3s1zp7fw60857c4jvlliy6v9dzx6sip3sbzl3b4hcg1x";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring bloodhound bytestring
-         deepseq http-client http-client-tls log-base semigroups text
-         text-show time transformers unordered-containers vector
-       ];
-       homepage = "https://github.com/scrive/log";
-       description = "Structured logging solution (Elasticsearch back end)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-elasticsearch_0_9_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bloodhound, bytestring, deepseq, http-client, http-client-tls
      , log-base, semigroups, text, text-show, time, transformers
@@ -125103,31 +123012,9 @@ self: {
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution (Elasticsearch back end)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-postgres" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base
-     , mtl, semigroups, split, text, text-show, time
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "log-postgres";
-       version = "0.7.0.1";
-       sha256 = "0gfb7xss31fqjlvxs8pywlhzmckgz98srimwhsp819mb9vrysjrn";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring bytestring deepseq
-         hpqtypes http-client lifted-base log-base mtl semigroups split text
-         text-show time unordered-containers vector
-       ];
-       homepage = "https://github.com/scrive/log";
-       description = "Structured logging solution (PostgreSQL back end)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "log-postgres_0_7_0_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base
      , mtl, semigroups, split, text, text-show, time
@@ -126197,22 +124084,26 @@ self: {
      }) {};
 
   "ltk" = callPackage
-    ({ mkDerivation, base, Cabal, containers, filepath, ghc, glib, gtk3
-     , mtl, parsec, pretty, text, transformers
+    ({ mkDerivation, base, base-compat, Cabal, containers, filepath
+     , ghc, gi-cairo, gi-gdk, gi-glib, gi-gobject, gi-gtk, gi-gtk-hs
+     , gtk3, haskell-gi-base, haskell-gi-overloading, mtl, parsec
+     , pretty, text, transformers
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.15.0.5";
-       sha256 = "18niv2rr06nms5g7vjk7ki52s7dfbkdbw52w55p79s9n6gj1q424";
+       version = "0.16.1.0";
+       sha256 = "00vxsp5w38wv12wl09z6wa72kpczd6k5g9m02clshaq3ai6cyg1a";
        libraryHaskellDepends = [
-         base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
-         transformers
+         base base-compat Cabal containers filepath ghc gi-cairo gi-gdk
+         gi-glib gi-gobject gi-gtk gi-gtk-hs haskell-gi-base
+         haskell-gi-overloading mtl parsec pretty text transformers
        ];
+       libraryPkgconfigDepends = [ gtk3 ];
        homepage = "http://www.leksah.org";
        description = "Leksah tool kit";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {gtk3 = pkgs.gnome3.gtk;};
 
   "ltl" = callPackage
     ({ mkDerivation, base, vcd }:
@@ -126686,21 +124577,21 @@ self: {
      }) {};
 
   "lzma-conduit" = callPackage
-    ({ mkDerivation, base, bindings-DSL, bytestring, conduit, HUnit
-     , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, transformers
+    ({ mkDerivation, base, base-compat, bindings-DSL, bytestring
+     , conduit, HUnit, lzma, QuickCheck, resourcet, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "lzma-conduit";
-       version = "1.1.3.1";
-       sha256 = "0bb1ilwb0v4b79gbaz1ckykmqg43y805m00y4w498768wbn1l61c";
+       version = "1.1.3.3";
+       sha256 = "19bdjgr394cji254y2qp1ibdiyqlys2vf0g1v9psi4cqcdlhdk0p";
        libraryHaskellDepends = [
          base bindings-DSL bytestring conduit resourcet transformers
        ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
-         base bytestring conduit HUnit QuickCheck resourcet test-framework
-         test-framework-hunit test-framework-quickcheck2
+         base base-compat bytestring conduit HUnit QuickCheck resourcet
+         test-framework test-framework-hunit test-framework-quickcheck2
        ];
        homepage = "http://github.com/alphaHeavy/lzma-conduit";
        description = "Conduit interface for lzma/xz compression";
@@ -126858,33 +124749,6 @@ self: {
      }) {};
 
   "machines" = callPackage
-    ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
-     , conduit, conduit-combinators, containers, criterion, distributive
-     , doctest, mtl, pipes, pointed, profunctors, semigroupoids
-     , semigroups, transformers, transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "machines";
-       version = "0.6.2";
-       sha256 = "0p346dr68qmaiyhfn697nb13fwl07f5b945bihfwk7r8pjsl6l0w";
-       revision = "1";
-       editedCabalFile = "1aj0admkxs91x3bax0rsz073m8rpfingrwggj3hi4f7zprmynjj1";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         adjunctions base comonad containers distributive mtl pointed
-         profunctors semigroupoids semigroups transformers
-         transformers-compat void
-       ];
-       testHaskellDepends = [ base doctest ];
-       benchmarkHaskellDepends = [
-         base conduit conduit-combinators criterion mtl pipes
-       ];
-       homepage = "http://github.com/ekmett/machines/";
-       description = "Networked stream transducers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "machines_0_6_3" = callPackage
     ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
      , conduit, conduit-combinators, containers, criterion, distributive
      , doctest, mtl, pipes, pointed, profunctors, semigroupoids
@@ -126909,7 +124773,6 @@ self: {
        homepage = "http://github.com/ekmett/machines/";
        description = "Networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines-amazonka" = callPackage
@@ -128460,6 +126323,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "master-plan" = callPackage
+    ({ mkDerivation, base, containers, diagrams, diagrams-lib
+     , diagrams-rasterific, hspec, megaparsec, mtl, optparse-applicative
+     , QuickCheck, quickcheck-instances, random, random-shuffle, syb
+     , text
+     }:
+     mkDerivation {
+       pname = "master-plan";
+       version = "0.2.0.0";
+       sha256 = "1179ladw94bjzkb63dz6x6n8lxck6424jamvb5mmzid7w13ibhxg";
+       revision = "1";
+       editedCabalFile = "03xb10qnjqby8qisvlqhli9g9avyl83h47a9q8xm2ycv4r63l6cv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers diagrams diagrams-lib diagrams-rasterific
+         megaparsec mtl syb text
+       ];
+       executableHaskellDepends = [
+         base containers optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base containers hspec mtl QuickCheck quickcheck-instances random
+         random-shuffle text
+       ];
+       homepage = "https://github.com/rodrigosetti/master-plan";
+       description = "The project management tool for hackers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mastermind" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -129018,8 +126911,8 @@ self: {
     ({ mkDerivation, base, safe, text, time, time-locale-compat }:
      mkDerivation {
        pname = "mbox";
-       version = "0.3.3";
-       sha256 = "1r8r5y2a69aralqz3mjhkq9dnb9jq1z1v1s2y1dpvx2alapkw2h8";
+       version = "0.3.4";
+       sha256 = "1pkiagxb013an71d3si3kldgn7rl9l5zi2s3s6hjhfg0pcwbbr6w";
        libraryHaskellDepends = [ base safe text time time-locale-compat ];
        description = "Read and write standard mailbox files";
        license = stdenv.lib.licenses.bsd3;
@@ -129363,23 +127256,6 @@ self: {
      }) {};
 
   "med-module" = callPackage
-    ({ mkDerivation, base, bytestring, storable-endian, transformers
-     , utility-ht
-     }:
-     mkDerivation {
-       pname = "med-module";
-       version = "0.1";
-       sha256 = "0qln8b2vfmmfx2700vybd895j22a82l4k95nk7kwpkilsf0h6vji";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring storable-endian transformers utility-ht
-       ];
-       description = "Parse song module files from Amiga MED and OctaMED";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "med-module_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, storable-endian, transformers
      , utility-ht
      }:
@@ -129394,7 +127270,6 @@ self: {
        ];
        description = "Parse song module files from Amiga MED and OctaMED";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mediabus" = callPackage
@@ -129634,7 +127509,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_6_1_0" = callPackage
+  "megaparsec_6_1_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -129642,8 +127517,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "6.1.0";
-       sha256 = "1096frlw1q7mgr87ndbwbg26dcmj1yv8a88xwwwy4p2f5m4df0fd";
+       version = "6.1.1";
+       sha256 = "08vwcxh3538bsgcmghssg87p7nvyi49vmr3zf8mqh52wxh65ygl4";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -130292,29 +128167,6 @@ self: {
      }) {};
 
   "metrics" = 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 = "1ry77ia5jd3a8rjb7mz5bzaqi42v1q0ngx2vj8yc709vlkdfs66v";
-       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;
-     }) {};
-
-  "metrics_0_4_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , HUnit, lens, mwc-random, primitive, QuickCheck, text, time
      , transformers, transformers-base, unix-compat
@@ -130511,18 +128363,6 @@ self: {
      }) {};
 
   "microlens" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "microlens";
-       version = "0.4.8.0";
-       sha256 = "1xbspqq1sgw6p16rwmdlwprjpcj2p0ppd1nn5iz3ynbifrqi42xa";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/aelve/microlens";
-       description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens_0_4_8_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
@@ -130532,7 +128372,6 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-aeson" = callPackage
@@ -130995,17 +128834,21 @@ self: {
   "mikrokosmos" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, directory
      , haskeline, HUnit, mtl, multimap, options, parsec, tasty
-     , tasty-hunit
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "mikrokosmos";
-       version = "0.5.0";
-       sha256 = "04hm0bz3hhxb11x1cfk129sv8x9dqjyvbagpr250cha47wws3sal";
+       version = "0.6.0";
+       sha256 = "12rqvk6czgmvcga1sh97vymxfqfga3a51xwyf6n7m4npza9pyqrr";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal base containers directory haskeline HUnit mtl
-         multimap options parsec tasty tasty-hunit
+         multimap options parsec tasty tasty-hunit tasty-quickcheck
+       ];
+       testHaskellDepends = [
+         ansi-terminal base containers directory haskeline HUnit mtl
+         multimap options parsec tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/M42/mikrokosmos";
        description = "Lambda calculus interpreter";
@@ -131086,10 +128929,8 @@ self: {
      }:
      mkDerivation {
        pname = "mime-mail";
-       version = "0.4.13.1";
-       sha256 = "05sri6sszmnyxsnrnk5j1wwqf0bawpfb179wjqfsp7bkj886g0cl";
-       revision = "6";
-       editedCabalFile = "0v9kc1p8lhg9zfh7c7x6x71rd7k7y6bpw4112ax9995w0aq09dk1";
+       version = "0.4.14";
+       sha256 = "0gmapbjci8nclwm8syg5xfci4nj8cpchb9ry1b7gwhcp9kaw6cln";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -131120,6 +128961,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mime-mail-ses_0_4_0_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, byteable, bytestring
+     , conduit, cryptohash, http-client, http-conduit, http-types
+     , mime-mail, old-locale, text, time, transformers, xml-conduit
+     , xml-types
+     }:
+     mkDerivation {
+       pname = "mime-mail-ses";
+       version = "0.4.0.0";
+       sha256 = "0w87ba8a5kli7xv7d8x5viz1c2rmm3ahaxp5d797n8bb13yn09mw";
+       libraryHaskellDepends = [
+         base base64-bytestring byteable bytestring conduit cryptohash
+         http-client http-conduit http-types mime-mail old-locale text time
+         transformers xml-conduit xml-types
+       ];
+       homepage = "http://github.com/snoyberg/mime-mail";
+       description = "Send mime-mail messages via Amazon SES";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mime-string" = callPackage
     ({ mkDerivation, base, base64-string, bytestring, iconv, mtl
      , network, old-time
@@ -131293,7 +129155,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT haskell98 unix ];
-       description = "Shows how to run grabber on macOS";
+       description = "Shows how to run grabber on Mac OS X";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -131587,14 +129449,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_7_0_0" = callPackage
+  "miso_0_7_2_0" = callPackage
     ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers
      , lucid, servant, servant-lucid, text, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.7.0.0";
-       sha256 = "0zakd08mfrzhdi9wqzj7vs62wlnhzkakbx0yqa9qgzfz4x6pi1j8";
+       version = "0.7.2.0";
+       sha256 = "1xg2bvavgpz3b8sgp4lbxszznvcbhhrzsy31lwalv5w1vcfjkwsw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131681,14 +129543,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mixed-types-num_0_3_0_1" = callPackage
+  "mixed-types-num_0_3_1_2" = callPackage
     ({ mkDerivation, base, convertible, hspec, hspec-smallcheck
      , QuickCheck, smallcheck, template-haskell
      }:
      mkDerivation {
        pname = "mixed-types-num";
-       version = "0.3.0.1";
-       sha256 = "00qvb1himrrdpasfc44bblydgc1hmhnbfmcprq6yzdz7lb1f8x6x";
+       version = "0.3.1.2";
+       sha256 = "1f0mvk9vkv1zx2a42ljr4dxh1pzg1lh1kgrjydxynwpwrmk7r6km";
        libraryHaskellDepends = [
          base convertible hspec hspec-smallcheck QuickCheck smallcheck
          template-haskell
@@ -131710,7 +129572,7 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath haskell98 ];
-       description = "Makes an macOS .app bundle from a binary.";
+       description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -132386,22 +130248,6 @@ self: {
      }) {};
 
   "monad-control" = callPackage
-    ({ mkDerivation, base, stm, transformers, transformers-base
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "monad-control";
-       version = "1.0.2.1";
-       sha256 = "1hjq0d1y18yyw3p4g78r7k88xy92pzxiqchqll7rqj8lnwnwnknc";
-       libraryHaskellDepends = [
-         base stm transformers transformers-base transformers-compat
-       ];
-       homepage = "https://github.com/basvandijk/monad-control";
-       description = "Lift control operations, like exception catching, through monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-control_1_0_2_2" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
      }:
@@ -132415,7 +130261,6 @@ self: {
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-control-aligned" = callPackage
@@ -132646,28 +130491,6 @@ self: {
      }) {};
 
   "monad-logger" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, conduit
-     , conduit-extra, exceptions, fast-logger, lifted-base
-     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
-     , template-haskell, text, transformers, transformers-base
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "monad-logger";
-       version = "0.3.24";
-       sha256 = "1r786v5ndnkfdy9v6h26wsbphjc2ar3zcsxz3ij9sxk860cpkr85";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra exceptions
-         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
-         stm-chans template-haskell text transformers transformers-base
-         transformers-compat
-       ];
-       homepage = "https://github.com/kazu-yamamoto/logger";
-       description = "A class of monads which can log messages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-logger_0_3_25" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, lifted-base
      , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
@@ -132687,7 +130510,6 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -133060,18 +130882,6 @@ self: {
      }) {};
 
   "monad-skeleton" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "monad-skeleton";
-       version = "0.1.4";
-       sha256 = "1fz8x3lcxp1az4sdbndzkg1w0ik8rddf6p7wd4j4fkbxffvcllri";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/fumieval/monad-skeleton";
-       description = "Monads of program skeleta";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-skeleton_0_1_5" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "monad-skeleton";
@@ -133081,7 +130891,6 @@ self: {
        homepage = "https://github.com/fumieval/monad-skeleton";
        description = "Monads of program skeleta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-st" = callPackage
@@ -133762,30 +131571,6 @@ self: {
      }) {};
 
   "mono-traversable" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, foldl
-     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
-     , text, transformers, unordered-containers, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "mono-traversable";
-       version = "1.0.2";
-       sha256 = "0crn1gd9jnf1j9n3dx9brw6dc4vfsydy0n3qs7hg49mp10ghl4da";
-       libraryHaskellDepends = [
-         base bytestring containers hashable split text transformers
-         unordered-containers vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec HUnit QuickCheck semigroups
-         text transformers unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Type classes for mapping, folding, and traversing monomorphic containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mono-traversable_1_0_2_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, foldl
      , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
      , text, transformers, unordered-containers, vector
@@ -133807,7 +131592,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable-instances" = callPackage
@@ -133905,26 +131689,6 @@ self: {
      }) {};
 
   "monoid-subclasses" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
-     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
-     }:
-     mkDerivation {
-       pname = "monoid-subclasses";
-       version = "0.4.3.2";
-       sha256 = "1n13a3nj1hzlbpanl6d1ak3j2vnjy8mb5p5gp7y5hfhrpiymhbgi";
-       libraryHaskellDepends = [
-         base bytestring containers primes text vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers primes QuickCheck quickcheck-instances
-         tasty tasty-quickcheck text vector
-       ];
-       homepage = "https://github.com/blamario/monoid-subclasses/";
-       description = "Subclasses of Monoid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoid-subclasses_0_4_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
@@ -133942,7 +131706,6 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -133957,22 +131720,6 @@ self: {
      }) {};
 
   "monoidal-containers" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "monoidal-containers";
-       version = "0.3.0.1";
-       sha256 = "1754bn5kxp7zqprgjkl5w6az4h64iz6hc3wn711s46p7b9llcaps";
-       libraryHaskellDepends = [
-         base containers deepseq hashable lens newtype unordered-containers
-       ];
-       homepage = "http://github.com/bgamari/monoidal-containers";
-       description = "Containers with monoidal accumulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoidal-containers_0_3_0_2" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
      , unordered-containers
      }:
@@ -133986,7 +131733,6 @@ self: {
        homepage = "http://github.com/bgamari/monoidal-containers";
        description = "Containers with monoidal accumulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoidplus" = callPackage
@@ -135435,28 +133181,6 @@ self: {
      }) {};
 
   "multistate" = callPackage
-    ({ mkDerivation, base, hspec, monad-control, mtl, tagged
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "multistate";
-       version = "0.7.1.1";
-       sha256 = "19mqzz2mgw0sx92xs8abwqkj2wznnixzvqsbniswf0nipz5m15k0";
-       revision = "1";
-       editedCabalFile = "0fz1gbiv0fdbmng6kinj3pzc3s6w06lgqgriln5lzrqrp4g5ggd5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base monad-control mtl tagged transformers transformers-base
-       ];
-       testHaskellDepends = [ base hspec transformers ];
-       homepage = "https://github.com/lspitzner/multistate";
-       description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "multistate_0_7_1_2" = callPackage
     ({ mkDerivation, base, hspec, monad-control, mtl, tagged
      , transformers, transformers-base
      }:
@@ -138379,28 +136103,6 @@ self: {
      }) {};
 
   "network-ip" = callPackage
-    ({ mkDerivation, base, data-default-class, data-dword, data-endian
-     , data-serializer, data-textual, hashable, parsers, tasty
-     , tasty-quickcheck, text-printer, type-hint
-     }:
-     mkDerivation {
-       pname = "network-ip";
-       version = "0.3";
-       sha256 = "0lwgixrcxnr9xl4ayrk1p4k15ryw02ighc7ylrmkamyzly2i0872";
-       libraryHaskellDepends = [
-         base data-default-class data-dword data-endian data-serializer
-         data-textual hashable parsers text-printer type-hint
-       ];
-       testHaskellDepends = [
-         base data-dword data-textual parsers tasty tasty-quickcheck
-         text-printer
-       ];
-       homepage = "https://github.com/mvv/network-ip";
-       description = "Internet Protocol data structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-ip_0_3_0_2" = callPackage
     ({ mkDerivation, base, data-default-class, data-dword, data-endian
      , data-serializer, data-textual, hashable, parsers, tasty
      , tasty-quickcheck, text-printer, type-hint
@@ -138420,7 +136122,6 @@ self: {
        homepage = "https://github.com/mvv/network-ip";
        description = "Internet Protocol data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-metrics" = callPackage
@@ -139156,6 +136857,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "newtype-generics_0_5_0_1" = callPackage
+    ({ mkDerivation, base, hspec, HUnit }:
+     mkDerivation {
+       pname = "newtype-generics";
+       version = "0.5.0.1";
+       sha256 = "1kgcficlphwp0rfp8ygny1dabfxi5kxs4qyhmfaxhnwaignxsn5k";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit ];
+       description = "A typeclass and set of functions for working with newtypes, with generics support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "newtype-th" = callPackage
     ({ mkDerivation, base, haskell-src-meta, newtype, syb
      , template-haskell
@@ -139632,6 +137346,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nmis-parser" = callPackage
+    ({ mkDerivation, base, containers, megaparsec, Nmis }:
+     mkDerivation {
+       pname = "nmis-parser";
+       version = "0.1.0.1";
+       sha256 = "0fgh0x2b468j3pxx5nqkvq1wavgap9q7hdnypmdqn5v5jp45l36z";
+       libraryHaskellDepends = [ base containers megaparsec ];
+       testHaskellDepends = [ base Nmis ];
+       homepage = "https://github.com/v0d1ch/nmis-parser#readme";
+       description = "NMIS file parser";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {Nmis = null;};
+
   "nntp" = callPackage
     ({ mkDerivation, base, bytestring, monad-loops, mtl, network
      , old-locale, parsec, time
@@ -139934,19 +137662,6 @@ self: {
      }) {};
 
   "non-negative" = callPackage
-    ({ mkDerivation, base, QuickCheck, utility-ht }:
-     mkDerivation {
-       pname = "non-negative";
-       version = "0.1.1";
-       sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7";
-       libraryHaskellDepends = [ base QuickCheck utility-ht ];
-       testHaskellDepends = [ base QuickCheck utility-ht ];
-       homepage = "http://code.haskell.org/~thielema/non-negative/";
-       description = "Non-negative numbers";
-       license = "GPL";
-     }) {};
-
-  "non-negative_0_1_1_2" = callPackage
     ({ mkDerivation, base, QuickCheck, utility-ht }:
      mkDerivation {
        pname = "non-negative";
@@ -139957,7 +137672,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/non-negative/";
        description = "Non-negative numbers";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nonce" = callPackage
@@ -140715,24 +138429,6 @@ self: {
      }) {};
 
   "numhask" = callPackage
-    ({ mkDerivation, adjunctions, base, distributive, doctest
-     , protolude, QuickCheck, tasty, tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "numhask";
-       version = "0.0.7";
-       sha256 = "03m6v5cy1hmrzv5c8vsbnx54bsi53cl63c7m1c8mxn4n3i1hl9n0";
-       libraryHaskellDepends = [
-         adjunctions base distributive protolude QuickCheck vector
-       ];
-       testHaskellDepends = [ base doctest tasty tasty-quickcheck ];
-       homepage = "https://github.com/tonyday567/numhask";
-       description = "A numeric prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "numhask_0_0_9" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest
      , protolude, QuickCheck, tasty, tasty-quickcheck, vector
      }:
@@ -140860,45 +138556,6 @@ self: {
      }) {};
 
   "nvim-hs" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
-     , cereal-conduit, conduit, conduit-extra, containers, data-default
-     , deepseq, directory, dyre, exceptions, filepath, foreign-store
-     , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec
-     , messagepack, monad-control, mtl, network, optparse-applicative
-     , process, QuickCheck, resourcet, setenv, stm, streaming-commons
-     , template-haskell, text, time, time-locale-compat, transformers
-     , transformers-base, utf8-string
-     }:
-     mkDerivation {
-       pname = "nvim-hs";
-       version = "0.2.2";
-       sha256 = "1sp8z8nyxhqywcdyxiyw9yz0mnrbyvgnjg5wr2p5371z3dwbhz8n";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default deepseq directory dyre
-         exceptions filepath foreign-store hslogger lifted-base megaparsec
-         messagepack monad-control mtl network optparse-applicative process
-         resourcet setenv stm streaming-commons template-haskell text time
-         time-locale-compat transformers transformers-base utf8-string
-       ];
-       executableHaskellDepends = [ base data-default ];
-       testHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default directory dyre exceptions
-         filepath foreign-store hslogger hspec hspec-discover HUnit
-         lifted-base megaparsec messagepack mtl network optparse-applicative
-         process QuickCheck resourcet setenv stm streaming-commons
-         template-haskell text time time-locale-compat transformers
-         transformers-base utf8-string
-       ];
-       homepage = "https://github.com/neovimhaskell/nvim-hs";
-       description = "Haskell plugin backend for neovim";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "nvim-hs_0_2_4" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
      , cereal-conduit, conduit, conduit-extra, containers, data-default
      , deepseq, directory, dyre, exceptions, filepath, foreign-store
@@ -140935,7 +138592,6 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -141264,8 +138920,8 @@ self: {
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.20.0";
-       sha256 = "1lgvx8nkfjh7x7hnpn689499gcx3hwq13s4kh4j74q1xfhmawwyv";
+       version = "0.20.2";
+       sha256 = "09z69sl782i7ky4dr9aw1ikjaqpwsp0b92x3m2pqlzg4bdfz7s7z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141280,30 +138936,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "octane_0_20_1" = 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.20.1";
-       sha256 = "0gaynwg4r5rjdbppcs0cdqq7fbl51y8bqm149bynkgwrbgs4dbfm";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bimap binary bytestring containers data-default-class
-         file-embed overloaded-records rattletrap text
-       ];
-       executableHaskellDepends = [
-         aeson base binary bytestring http-client http-client-tls
-       ];
-       homepage = "https://github.com/tfausak/octane#readme";
-       description = "Parse Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -141885,34 +139517,6 @@ self: {
      }) {};
 
   "opaleye" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, case-insensitive, containers, contravariant, multiset
-     , postgresql-simple, pretty, product-profunctors, profunctors
-     , QuickCheck, semigroups, text, time, time-locale-compat
-     , transformers, uuid, void
-     }:
-     mkDerivation {
-       pname = "opaleye";
-       version = "0.5.3.0";
-       sha256 = "0wrxfqd1f6m8pb8bpx3n7s2gbw3r0dx2ryw2f5a0nnvwv5cagvbc";
-       revision = "2";
-       editedCabalFile = "1nzwk9mpgnwqmdna35mn0q4b50x1hch9q1pfdqdsz87b9308fb1q";
-       libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring bytestring case-insensitive
-         contravariant postgresql-simple pretty product-profunctors
-         profunctors semigroups text time time-locale-compat transformers
-         uuid void
-       ];
-       testHaskellDepends = [
-         aeson base containers contravariant multiset postgresql-simple
-         product-profunctors profunctors QuickCheck semigroups text time
-       ];
-       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
-       description = "An SQL-generating DSL targeting PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "opaleye_0_5_4_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, case-insensitive, containers, contravariant, dotenv
      , hspec, hspec-discover, multiset, postgresql-simple, pretty
@@ -141937,7 +139541,6 @@ self: {
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -142118,24 +139721,6 @@ self: {
      }) {};
 
   "open-witness" = callPackage
-    ({ mkDerivation, base, constraints, hashable, mtl, random, tasty
-     , tasty-hunit, template-haskell, transformers, witness
-     }:
-     mkDerivation {
-       pname = "open-witness";
-       version = "0.4";
-       sha256 = "086b984ys88962f320zl287a5yhirgxi75l2xnzrb9xr2d196nsv";
-       libraryHaskellDepends = [
-         base constraints hashable random template-haskell transformers
-         witness
-       ];
-       testHaskellDepends = [ base mtl tasty tasty-hunit witness ];
-       homepage = "https://github.com/AshleyYakeley/open-witness";
-       description = "open witnesses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "open-witness_0_4_0_1" = callPackage
     ({ mkDerivation, base, constraints, hashable, mtl, random, tasty
      , tasty-hunit, template-haskell, transformers, witness
      }:
@@ -142151,7 +139736,6 @@ self: {
        homepage = "https://github.com/AshleyYakeley/open-witness";
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opench-meteo" = callPackage
@@ -143508,8 +141092,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgstat";
-       version = "0.0.3";
-       sha256 = "1cxqndv7ffrqb749czz5x7g59q7nmq4xbnyaaajf5q27wmqfiwi8";
+       version = "0.0.4";
+       sha256 = "1229av0i3j69wcnzpxz21z3j02sr2wl491swidfqzp9ifjk4w5l3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143712,7 +141296,7 @@ self: {
        sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
-       description = "Parser for macOS static archive format";
+       description = "Parser for OS X static archive format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -144146,19 +141730,6 @@ self: {
      }) {};
 
   "pagination" = callPackage
-    ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "pagination";
-       version = "0.2.0";
-       sha256 = "04jzwg9r0f8rza9zkzqfynx76snfw54kppfk9z5bjgqw6pqpx2jh";
-       libraryHaskellDepends = [ base deepseq exceptions ];
-       testHaskellDepends = [ base exceptions hspec QuickCheck ];
-       homepage = "https://github.com/mrkkrp/pagination";
-       description = "Framework-agnostic pagination boilerplate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pagination_0_2_1" = callPackage
     ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }:
      mkDerivation {
        pname = "pagination";
@@ -144169,7 +141740,6 @@ self: {
        homepage = "https://github.com/mrkkrp/pagination";
        description = "Framework-agnostic pagination boilerplate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagure-hook-receiver" = callPackage
@@ -144316,8 +141886,8 @@ self: {
 
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , containers, data-default, directory, filepath, hs-bibutils, mtl
-     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , Cabal, containers, data-default, directory, filepath, hs-bibutils
+     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
      , setenv, split, syb, tagsoup, temporary, text, time
      , unordered-containers, vector, xml-conduit, yaml
      }:
@@ -144325,6 +141895,44 @@ self: {
        pname = "pandoc-citeproc";
        version = "0.10.5.1";
        sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9";
+       revision = "1";
+       editedCabalFile = "0w8r8z34m934cbja0qkhna04aac97k9i899l4c59cd0ym21148cz";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath mtl pandoc pandoc-types process syb temporary text vector
+         yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath mtl pandoc pandoc-types
+         process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pandoc-citeproc_0_11" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hs-bibutils, mtl
+     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.11";
+       sha256 = "1c4ja3lkmsgp5wa1cqbh45x5jd7x709s0rfpldhyh63xxrjp5qgs";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -144347,6 +141955,7 @@ self: {
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -144547,6 +142156,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pandoc-sidenote" = callPackage
+    ({ mkDerivation, base, monad-gen, pandoc, pandoc-types }:
+     mkDerivation {
+       pname = "pandoc-sidenote";
+       version = "0.19.0.0";
+       sha256 = "0vz8w1dgzm0hipwfz5a1m41xkjdindr3373x6ip6vqv9h2gzzbb3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base monad-gen pandoc pandoc-types ];
+       executableHaskellDepends = [ base pandoc-types ];
+       homepage = "https://github.com/jez/pandoc-sidenote#readme";
+       description = "Convert Pandoc Markdown-style footnotes into sidenotes";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pandoc-stylefrommeta" = callPackage
     ({ mkDerivation, base, containers, HaTeX, MissingH, pandoc
      , pandoc-types
@@ -145898,17 +143522,17 @@ self: {
   "parsers" = callPackage
     ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal
      , cabal-doctest, charset, containers, directory, doctest, filepath
-     , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text
-     , transformers, unordered-containers
+     , mtl, parsec, QuickCheck, quickcheck-instances, scientific
+     , semigroups, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "parsers";
-       version = "0.12.5";
-       sha256 = "1azwy5wfjv75kjwcyrglq70dmc8f6a091bgyv0wsls4f5zv0qb3k";
+       version = "0.12.7";
+       sha256 = "032dgh0ydy4cbvnjhgp0krnqnvlibphvm30gvmqvpxk9l4pmn435";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec base base-orphans charset containers mtl parsec
-         scientific text transformers unordered-containers
+         scientific semigroups text transformers unordered-containers
        ];
        testHaskellDepends = [
          attoparsec base bytestring containers directory doctest filepath
@@ -145919,31 +143543,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "parsers_0_12_6" = callPackage
-    ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal
-     , cabal-doctest, charset, containers, directory, doctest, filepath
-     , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "parsers";
-       version = "0.12.6";
-       sha256 = "1jyffc1i9vihhxk5r69qmrnhsjsw2g7r0yxh3svvy1wrcz1vfcik";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         attoparsec base base-orphans charset containers mtl parsec
-         scientific text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring containers directory doctest filepath
-         parsec QuickCheck quickcheck-instances
-       ];
-       homepage = "http://github.com/ekmett/parsers/";
-       description = "Parsing combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "parsestar" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, bytestring-mmap
      , bytestring-nums, bytestring-show, containers, deepseq, derive
@@ -146814,23 +144413,6 @@ self: {
      }) {};
 
   "pcre-utils" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, HUnit, mtl
-     , regex-pcre-builtin, vector
-     }:
-     mkDerivation {
-       pname = "pcre-utils";
-       version = "0.1.8.1";
-       sha256 = "1mqyjzccpj2ybwjhjx68bisn1zm9zwmf73hqkyqb5q5k2d7c2bvc";
-       libraryHaskellDepends = [
-         array attoparsec base bytestring mtl regex-pcre-builtin vector
-       ];
-       testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ];
-       homepage = "https://github.com/bartavelle/pcre-utils";
-       description = "Perl-like substitute and split for PCRE regexps";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pcre-utils_0_1_8_1_1" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, HUnit, mtl
      , regex-pcre-builtin, vector
      }:
@@ -146845,7 +144427,6 @@ self: {
        homepage = "https://github.com/bartavelle/pcre-utils";
        description = "Perl-like substitute and split for PCRE regexps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-slave" = callPackage
@@ -148560,20 +146141,19 @@ self: {
   "phoityne-vscode" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, cmdargs, conduit
      , conduit-extra, ConfigFile, containers, directory, filepath
-     , fsnotify, hslogger, HStringTemplate, MissingH, mtl, parsec
-     , process, resourcet, safe, split, text, transformers
+     , fsnotify, hslogger, MissingH, mtl, parsec, process, resourcet
+     , safe, split, text, transformers
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.14.0";
-       sha256 = "1csz0h91yka230vab626dc5qqay00ircgfs2x5z4gj3s67wh5fg5";
+       version = "0.0.15.0";
+       sha256 = "1r4wbf6x19gzmz88f770si5mvrya9adgilgs76kc36ynlsz5jyrp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base bytestring Cabal cmdargs conduit conduit-extra
-         ConfigFile containers directory filepath fsnotify hslogger
-         HStringTemplate MissingH mtl parsec process resourcet safe split
-         text transformers
+         ConfigFile containers directory filepath fsnotify hslogger MissingH
+         mtl parsec process resourcet safe split text transformers
        ];
        homepage = "https://github.com/phoityne/phoityne-vscode";
        description = "ghci debug viewer on Visual Studio Code";
@@ -148998,32 +146578,6 @@ self: {
      }) {};
 
   "pinboard" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , http-client, http-client-tls, http-types, monad-logger, mtl
-     , network, profunctors, QuickCheck, random, safe-exceptions
-     , semigroups, text, time, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "pinboard";
-       version = "0.9.12.4";
-       sha256 = "168yb6pgab0aildg0mj8707q7xyr4firf23a810y7nxy36mksk56";
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-client http-client-tls
-         http-types monad-logger mtl network profunctors random
-         safe-exceptions text time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers hspec mtl QuickCheck
-         safe-exceptions semigroups text time transformers
-         unordered-containers
-       ];
-       homepage = "https://github.com/jonschoning/pinboard";
-       description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pinboard_0_9_12_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -149047,7 +146601,6 @@ self: {
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinch" = callPackage
@@ -149630,22 +147183,6 @@ self: {
      }) {};
 
   "pipes-group" = callPackage
-    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
-     , pipes-parse, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-group";
-       version = "1.0.6";
-       sha256 = "0rmpi9gb151gsmvx9f0q9vssd6fsf08ifxxynfp5jnv7lxmnzb87";
-       libraryHaskellDepends = [
-         base free pipes pipes-parse transformers
-       ];
-       testHaskellDepends = [ base doctest lens-family-core ];
-       description = "Group streams into substreams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-group_1_0_7" = callPackage
     ({ mkDerivation, base, doctest, free, lens-family-core, pipes
      , pipes-parse, transformers
      }:
@@ -149659,7 +147196,6 @@ self: {
        testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-http" = callPackage
@@ -150537,7 +148073,7 @@ self: {
        sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
-       description = "Generate and parse macOS property list format";
+       description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -150678,30 +148214,6 @@ self: {
      }) {};
 
   "plot-light" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg
-     , colour, hspec, palette, QuickCheck, scientific, text, time
-     }:
-     mkDerivation {
-       pname = "plot-light";
-       version = "0.2.4";
-       sha256 = "0zwp8n9xx1ljh65as4s6lqj4a3nrz3hfg53x8zcba96ic9jkadn0";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base blaze-svg colour palette scientific text time
-       ];
-       executableHaskellDepends = [
-         attoparsec attoparsec-time base blaze-svg colour palette scientific
-         text time
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/ocramz/plot-light";
-       description = "A lightweight plotting library, exporting to SVG";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "plot-light_0_2_7" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg
      , colour, hspec, mtl, palette, QuickCheck, scientific, text, time
      }:
@@ -150723,7 +148235,6 @@ self: {
        homepage = "https://github.com/ocramz/plot-light";
        description = "A lightweight plotting library, exporting to SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plotfont" = callPackage
@@ -152340,30 +149851,6 @@ self: {
      }) {};
 
   "postgresql-simple-migration" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
-     , directory, hspec, postgresql-simple, text, time
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-migration";
-       version = "0.1.9.0";
-       sha256 = "0skjc5ivcrhi0f49p0j2f0k69qfv4argvkz5mvd8kn5q381jyp80";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple time
-       ];
-       executableHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple text time
-       ];
-       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
-       homepage = "https://github.com/ameingast/postgresql-simple-migration";
-       description = "PostgreSQL Schema Migrations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "postgresql-simple-migration_0_1_11_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
      , directory, hspec, postgresql-simple, text, time
      }:
@@ -152385,7 +149872,6 @@ self: {
        homepage = "https://github.com/ameingast/postgresql-simple-migration";
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-opts" = callPackage
@@ -152409,31 +149895,6 @@ self: {
      }) {};
 
   "postgresql-simple-queue" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
-     , hspec-discover, hspec-expectations-lifted, hspec-pg-transact
-     , monad-control, pg-transact, postgresql-simple, random, text, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-queue";
-       version = "0.5.0.0";
-       sha256 = "0yzzbx62sapj3ikym286g5ary1ha28ixcknn890kgbcb0f1xw5rh";
-       libraryHaskellDepends = [
-         aeson base bytestring exceptions monad-control pg-transact
-         postgresql-simple random text time transformers
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring hspec hspec-discover
-         hspec-expectations-lifted hspec-pg-transact pg-transact
-         postgresql-simple
-       ];
-       homepage = "https://github.com/jfischoff/postgresql-queue#readme";
-       description = "A PostgreSQL backed queue";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "postgresql-simple-queue_0_5_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
      , hspec-discover, hspec-expectations-lifted, hspec-pg-transact
      , monad-control, pg-transact, postgresql-simple, random, text, time
@@ -152940,18 +150401,6 @@ self: {
      }) {};
 
   "pqueue" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "pqueue";
-       version = "1.3.2.2";
-       sha256 = "0daha45lb7k372nv3nd29lbl7qmz4yp7hwa4p2w0yp1j8mwvbd97";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       description = "Reliable, persistent, fast priority queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pqueue_1_3_2_3" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "pqueue";
@@ -152961,7 +150410,6 @@ self: {
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqueue-mtl" = callPackage
@@ -153699,34 +151147,6 @@ self: {
      }) {};
 
   "prettyprinter" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, criterion
-     , doctest, mtl, pgp-wordlist, QuickCheck, random, tasty
-     , tasty-hunit, tasty-quickcheck, template-haskell, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "prettyprinter";
-       version = "1.1";
-       sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y";
-       revision = "3";
-       editedCabalFile = "0y6qhf5bxbwxpy4xma05h806mxfn52kvf5f29r1hdpm2xlcab5hx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base text ];
-       executableHaskellDepends = [ base template-haskell text ];
-       testHaskellDepends = [
-         base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         ansi-wl-pprint base criterion mtl random text transformers
-       ];
-       homepage = "http://github.com/quchen/prettyprinter";
-       description = "A modern, easy to use, well-documented, extensible prettyprinter";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "prettyprinter_1_1_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
      , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -153751,24 +151171,9 @@ self: {
        homepage = "http://github.com/quchen/prettyprinter";
        description = "A modern, easy to use, well-documented, extensible prettyprinter";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettyprinter-ansi-terminal" = callPackage
-    ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text
-     }:
-     mkDerivation {
-       pname = "prettyprinter-ansi-terminal";
-       version = "1.1";
-       sha256 = "0z2vi26qhrw5z36yy449x5yynv3wyx1c02z4m2lf7la7r9jwwfbj";
-       libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/quchen/prettyprinter";
-       description = "ANSI terminal backend for the »prettyprinter« package";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "prettyprinter-ansi-terminal_1_1_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text
      }:
      mkDerivation {
@@ -153782,7 +151187,6 @@ self: {
        homepage = "http://github.com/quchen/prettyprinter";
        description = "ANSI terminal backend for the »prettyprinter« package";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettyprinter-compat-annotated-wl-pprint" = callPackage
@@ -154625,25 +152029,6 @@ self: {
      }) {};
 
   "profunctors" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, comonad
-     , contravariant, distributive, tagged, transformers
-     }:
-     mkDerivation {
-       pname = "profunctors";
-       version = "5.2";
-       sha256 = "1905xv9y2sx1iya0zlrx7nxhlwap5vn144nxg7s8zsj58xff59w7";
-       revision = "1";
-       editedCabalFile = "1q0zva60kqb560fr0ii0gm227sg6q7ddbhriv64l6nfv509vw32k";
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad contravariant distributive
-         tagged transformers
-       ];
-       homepage = "http://github.com/ekmett/profunctors/";
-       description = "Profunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "profunctors_5_2_1" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, comonad
      , contravariant, distributive, tagged, transformers
      }:
@@ -154658,7 +152043,6 @@ self: {
        homepage = "http://github.com/ekmett/profunctors/";
        description = "Profunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progress" = callPackage
@@ -155222,22 +152606,6 @@ self: {
      }) {};
 
   "proto-lens-arbitrary" = callPackage
-    ({ mkDerivation, base, bytestring, containers, lens-family
-     , proto-lens, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-arbitrary";
-       version = "0.1.1.0";
-       sha256 = "0bqd6xfak7x5pvaa0znq57yr6a6iw2p97ssb87pcsmv34cfw0l16";
-       libraryHaskellDepends = [
-         base bytestring containers lens-family proto-lens QuickCheck text
-       ];
-       homepage = "https://github.com/google/proto-lens";
-       description = "Arbitrary instances for proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-arbitrary_0_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
      }:
@@ -155251,7 +152619,6 @@ self: {
        homepage = "https://github.com/google/proto-lens";
        description = "Arbitrary instances for proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-combinators" = callPackage
@@ -155336,20 +152703,6 @@ self: {
      }) {};
 
   "proto-lens-optparse" = callPackage
-    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
-     mkDerivation {
-       pname = "proto-lens-optparse";
-       version = "0.1.0.3";
-       sha256 = "16wk5paba9p7rz1z614d9byszygkqvxca78zwxyzjgvyjw1yssyl";
-       libraryHaskellDepends = [
-         base optparse-applicative proto-lens text
-       ];
-       homepage = "https://github.com/google/proto-lens";
-       description = "Adapting proto-lens to optparse-applicative ReadMs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-optparse_0_1_0_4" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
@@ -155361,7 +152714,6 @@ self: {
        homepage = "https://github.com/google/proto-lens";
        description = "Adapting proto-lens to optparse-applicative ReadMs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-protobuf-types" = callPackage
@@ -155521,23 +152873,6 @@ self: {
      }) {};
 
   "protocol-buffers" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, filepath, mtl, parsec, syb, utf8-string
-     }:
-     mkDerivation {
-       pname = "protocol-buffers";
-       version = "2.4.2";
-       sha256 = "13z1sh8z5b3nlscqnzw137k3979d4war3yzhxclljqq2z88rm1bv";
-       libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath mtl
-         parsec syb utf8-string
-       ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers_2_4_3" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, parsec, syb, utf8-string
      }:
@@ -155552,25 +152887,9 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
-    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
-     mkDerivation {
-       pname = "protocol-buffers-descriptor";
-       version = "2.4.2";
-       sha256 = "0r7n1pnkabzksik9zrqif490g135hcjgvc40zm5c0b3dpq64r4lb";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers protocol-buffers
-       ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers-descriptor_2_4_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
@@ -155583,7 +152902,6 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -159421,10 +156739,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasterific-svg";
-       version = "0.3.2.1";
-       sha256 = "1pxgazmyl9ky08vx2nnf5k7bw183ljpvzggvddrdlpwzczm8fzki";
-       revision = "1";
-       editedCabalFile = "19w6f01qc1ahwfsqnqb6ajsgv4wqy5vfy54f6x15z1pivnyw37sk";
+       version = "0.3.3";
+       sha256 = "0jqdqf3y61z98sxdziqhafgsf5m01a00gkfdnv1w4vd6zli8xpaa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159453,25 +156769,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.4";
-       sha256 = "1j589qm8711h2ycy19s7i25sx217v5y5c1h4ks6x4dkpzk33c1hm";
-       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_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, http-client, http-client-tls, http-types
      , tasty, tasty-hspec, text, uuid
@@ -159488,7 +156785,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
@@ -160554,8 +157850,8 @@ self: {
      }:
      mkDerivation {
        pname = "rebase";
-       version = "1.0.8";
-       sha256 = "1gdqrzbpqpm5vl7hnh7q875hsazibqw1lfwnkzqs2gv6w3wa3lw4";
+       version = "1.0.8.1";
+       sha256 = "111wslzm76qrabpdbsnpb3sydbd3vc71d3mf088klkgbb0k2arxp";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring containers contravariant
          contravariant-extras deepseq dlist either fail hashable mtl
@@ -160788,15 +158084,15 @@ self: {
      }) {};
 
   "recursion-schemes-ext" = callPackage
-    ({ mkDerivation, base, composition-prelude, criterion, hspec
-     , recursion-schemes
+    ({ mkDerivation, base, composition-prelude, criterion, deepseq
+     , hspec, recursion-schemes, template-haskell
      }:
      mkDerivation {
        pname = "recursion-schemes-ext";
-       version = "0.1.0.1";
-       sha256 = "1g24mcb6qdpq6ggnixbb82iq3b3fhrgpspgrblk9cwwrpl1arnhg";
+       version = "0.1.1.0";
+       sha256 = "15l21v5kppvsh79v4q421dhrlc571mah2pcbnvvpakb796zldi6n";
        libraryHaskellDepends = [
-         base composition-prelude recursion-schemes
+         base composition-prelude deepseq recursion-schemes template-haskell
        ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -161190,29 +158486,6 @@ self: {
      }) {};
 
   "references" = callPackage
-    ({ mkDerivation, array, base, containers, directory, either
-     , filepath, HUnit, instance-control, lens, mtl, template-haskell
-     , text, transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "references";
-       version = "0.3.2.1";
-       sha256 = "093nsbnr5vax4h0ki51xqa0gaf58fr09q3rmksxqcghzgphj0h0q";
-       libraryHaskellDepends = [
-         array base containers directory either filepath instance-control
-         mtl template-haskell text transformers uniplate
-       ];
-       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";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "references_0_3_2_2" = callPackage
     ({ mkDerivation, array, base, containers, directory, either
      , filepath, HUnit, instance-control, lens, mtl, template-haskell
      , text, transformers, uniplate
@@ -161233,7 +158506,6 @@ self: {
        homepage = "https://github.com/lazac/references";
        description = "Selectors for reading and updating data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "refh" = callPackage
@@ -162024,8 +159296,8 @@ self: {
     ({ mkDerivation, base, regex-tdfa, template-haskell }:
      mkDerivation {
        pname = "regex-tdfa-quasiquoter";
-       version = "0.2.0.0";
-       sha256 = "0qc35kxwc2pbjridiiwyi1xzcx3f02fy1lpqv7rpwddpjxi6mqca";
+       version = "0.2.1.0";
+       sha256 = "1l0yk2m2k4ybjx3pidcn2xpij9cnyi76ar74llf09vwv764mh36f";
        libraryHaskellDepends = [ base regex-tdfa template-haskell ];
        homepage = "http://github.com/erisco/regex-tdfa-quasiquoter";
        description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
@@ -164008,35 +161280,6 @@ self: {
      }) {};
 
   "rest-gen" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
-     , code-builder, directory, fclabels, filepath, hashable
-     , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
-     , pretty, process, rest-core, safe, scientific, semigroups, split
-     , test-framework, test-framework-hunit, text, uniplate
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "rest-gen";
-       version = "0.20.0.0";
-       sha256 = "0hnmd37c6n61gkqi3assspkmh15q93id7yaq30vp65zr6rhliac1";
-       revision = "8";
-       editedCabalFile = "1x18sva575kcg9gg4brf17zbvvkzs0qi2rgkab5ijr4pnmhpwc62";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base base-compat blaze-html Cabal code-builder directory
-         fclabels filepath hashable haskell-src-exts HStringTemplate hxt
-         json-schema pretty process rest-core safe scientific semigroups
-         split text uniplate unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base fclabels haskell-src-exts HUnit rest-core test-framework
-         test-framework-hunit
-       ];
-       description = "Documentation and client generation from rest definition";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rest-gen_0_20_0_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
      , code-builder, directory, fclabels, filepath, hashable
      , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
@@ -164061,7 +161304,6 @@ self: {
        ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-happstack" = callPackage
@@ -164260,36 +161502,6 @@ self: {
      }) {};
 
   "rethinkdb-client-driver" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , criterion, hashable, hspec, hspec-smallcheck, mtl, network
-     , old-locale, scientific, smallcheck, stm, template-haskell, text
-     , time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "rethinkdb-client-driver";
-       version = "0.0.23";
-       sha256 = "0hq4q9xb6aila7y3ia948mizlha6saj1cqj1smprxd1vag5s7rff";
-       revision = "1";
-       editedCabalFile = "1vgv2zfdkpxbrg8nssas8x85cbmah8d59ks9744hd7zc461kgfzl";
-       libraryHaskellDepends = [
-         aeson base binary bytestring containers hashable mtl network
-         old-locale scientific stm template-haskell text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base hspec hspec-smallcheck smallcheck text time
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base criterion text time unordered-containers vector
-       ];
-       homepage = "https://github.com/wereHamster/rethinkdb-client-driver";
-       description = "Client driver for RethinkDB";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "rethinkdb-client-driver_0_0_24" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , criterion, hashable, hspec, hspec-smallcheck, mtl, network
      , old-locale, scientific, smallcheck, stm, template-haskell, text
@@ -165327,8 +162539,8 @@ self: {
      }:
      mkDerivation {
        pname = "rollbar";
-       version = "0.4.1";
-       sha256 = "0gl1q1f8n2xngb665hkqncqj1ymm7kymhhgp0qwdhdi3gnm8kymp";
+       version = "1.0.0";
+       sha256 = "01rljwfb7cgw544pk6iwmxlxzid51q7ig8f5y8v9i75vskqkip7j";
        libraryHaskellDepends = [
          aeson base basic-prelude http-conduit monad-control network
          resourcet text vector
@@ -165970,8 +163182,8 @@ self: {
      }:
      mkDerivation {
        pname = "rss-conduit";
-       version = "0.3.1.1";
-       sha256 = "16pghxkk9pyskhp73sz43nw84w7qw62sdlwqpsrrfs2wr2ab71bd";
+       version = "0.3.1.2";
+       sha256 = "19a2x5xkfbkzz36l47v4m0fd7qp0pn3r4r77jaca0a3m7k74rxf1";
        libraryHaskellDepends = [
          base conduit conduit-combinators containers lens-simple
          mono-traversable safe safe-exceptions text time timerep
@@ -165987,6 +163199,33 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "rss-conduit_0_3_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , containers, data-default, hlint, lens-simple, mono-traversable
+     , QuickCheck, quickcheck-instances, resourcet, safe
+     , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , timerep, uri-bytestring, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "rss-conduit";
+       version = "0.3.2.0";
+       sha256 = "0ps0ynn0d0nz4m556i5w39bwx4m6wfsv3c9a269rkq821z844f3n";
+       libraryHaskellDepends = [
+         base conduit conduit-combinators containers lens-simple
+         mono-traversable safe safe-exceptions text time timerep
+         uri-bytestring xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators data-default hlint
+         lens-simple mono-traversable QuickCheck quickcheck-instances
+         resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text
+         time uri-bytestring xml-conduit xml-types
+       ];
+       description = "Streaming parser/renderer for the RSS standard";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rss2irc" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq
      , feed, http-client, http-conduit, http-types, io-storage, irc
@@ -166735,28 +163974,6 @@ self: {
      }) {};
 
   "safeio" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
-     , directory, filepath, HUnit, resourcet, test-framework
-     , test-framework-hunit, test-framework-th, unix
-     }:
-     mkDerivation {
-       pname = "safeio";
-       version = "0.0.2.0";
-       sha256 = "0ajz4hd3dycy10abngccqdbkj1356d2sggsnrlc34s370381hi9w";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-combinators directory filepath
-         resourcet unix
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-combinators directory filepath
-         HUnit resourcet test-framework test-framework-hunit
-         test-framework-th unix
-       ];
-       description = "Write output to disk atomically";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "safeio_0_0_3_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , directory, filepath, HUnit, resourcet, test-framework
      , test-framework-hunit, test-framework-th, unix
@@ -166776,7 +163993,6 @@ self: {
        ];
        description = "Write output to disk atomically";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safepath" = callPackage
@@ -167157,27 +164373,6 @@ self: {
      }) {};
 
   "sandi" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, criterion, exceptions
-     , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-th
-     }:
-     mkDerivation {
-       pname = "sandi";
-       version = "0.4.0";
-       sha256 = "1smf3bq44qni4zbgxpw7cy7b9g95fbrr73j8njjf6139naj9bj20";
-       libraryHaskellDepends = [
-         base bytestring conduit exceptions stringsearch
-       ];
-       testHaskellDepends = [
-         base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "http://hackage.haskell.org/package/sandi";
-       description = "Data encoding library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sandi_0_4_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, exceptions
      , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck
      , tasty-th
@@ -167196,7 +164391,6 @@ self: {
        homepage = "http://hackage.haskell.org/package/sandi";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sandlib" = callPackage
@@ -168713,16 +165907,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
-  "sdl2-cairo" = callPackage
-    ({ mkDerivation, base, cairo, linear, mtl, random, sdl2, time }:
+  "sdl2_2_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
+     , StateVar, text, transformers, vector
+     }:
      mkDerivation {
-       pname = "sdl2-cairo";
-       version = "0.1.1.0";
-       sha256 = "08i7vbibak0y760j2cibwdn2yhgkp2xv2j325mimvdqcp44x0rz0";
+       pname = "sdl2";
+       version = "2.3.0";
+       sha256 = "0av74p5m93c3g490pcz9042f9sfjknxbh5cvwvakhcfrkvfdlva4";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
-       description = "Render with Cairo on SDL textures. Includes optional convenience drawing API.";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring exceptions linear StateVar text transformers vector
+       ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2;};
+
+  "sdl2-cairo" = callPackage
+    ({ mkDerivation, base, cairo, linear, sdl2 }:
+     mkDerivation {
+       pname = "sdl2-cairo";
+       version = "0.2";
+       sha256 = "1diz8irrrc7mvy5fnm679xpl3dyy9ynr7a6d900yi3dn0zamq939";
+       libraryHaskellDepends = [ base cairo linear sdl2 ];
+       description = "Render with Cairo on SDL textures";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -169228,23 +166441,6 @@ self: {
      }) {sedna = null;};
 
   "selda" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
-     , psqueues, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "selda";
-       version = "0.1.9.0";
-       sha256 = "0c69aaalxi4b42y6y9y12wcxxyjnb3arc196kj0c1q6xdwh9fpk4";
-       libraryHaskellDepends = [
-         base bytestring exceptions hashable mtl psqueues text time
-         unordered-containers
-       ];
-       homepage = "https://selda.link";
-       description = "Type-safe, high-level EDSL for interacting with relational databases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda_0_1_10_1" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
      , psqueues, text, time, unordered-containers
      }:
@@ -169259,26 +166455,9 @@ self: {
        homepage = "https://selda.link";
        description = "Type-safe, high-level EDSL for interacting with relational databases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selda-postgresql" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
-     , selda, text
-     }:
-     mkDerivation {
-       pname = "selda-postgresql";
-       version = "0.1.5.1";
-       sha256 = "1462rcvyf79p80b17hkgkgb2jfzhkdq8vj0y001jy5wzl6gs7b8d";
-       libraryHaskellDepends = [
-         base bytestring exceptions postgresql-libpq selda text
-       ];
-       homepage = "https://github.com/valderman/selda";
-       description = "PostgreSQL backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda-postgresql_0_1_6_0" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
      , selda, text
      }:
@@ -169292,26 +166471,9 @@ self: {
        homepage = "https://github.com/valderman/selda";
        description = "PostgreSQL backend for the Selda database EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selda-sqlite" = callPackage
-    ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda
-     , text
-     }:
-     mkDerivation {
-       pname = "selda-sqlite";
-       version = "0.1.5.1";
-       sha256 = "1r81qidwqp5smi3h7awrbxhvlclm5dgvrmi56irghvh960h720j3";
-       libraryHaskellDepends = [
-         base direct-sqlite directory exceptions selda text
-       ];
-       homepage = "https://github.com/valderman/selda";
-       description = "SQLite backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda-sqlite_0_1_6_0" = callPackage
     ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda
      , text
      }:
@@ -169325,7 +166487,6 @@ self: {
        homepage = "https://github.com/valderman/selda";
        description = "SQLite backend for the Selda database EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "select" = callPackage
@@ -169341,12 +166502,12 @@ self: {
      }) {};
 
   "selections" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad }:
+    ({ mkDerivation, base, bifunctors, comonad, profunctors }:
      mkDerivation {
        pname = "selections";
-       version = "0.1.0.3";
-       sha256 = "1g7p30mjvkq8ymmjdhh54bhyjs2dvz7v860mr1f8qs35j31bkabd";
-       libraryHaskellDepends = [ base bifunctors comonad ];
+       version = "0.2.0.0";
+       sha256 = "000hdwdp56pc67j1iw0mc6m74dfim67g16ib4yr7vyilq8rfccb0";
+       libraryHaskellDepends = [ base bifunctors comonad profunctors ];
        homepage = "https://github.com/ChrisPenner/selections#readme";
        description = "Combinators for operating with selections over an underlying functor";
        license = stdenv.lib.licenses.bsd3;
@@ -169504,26 +166665,6 @@ self: {
      }) {};
 
   "semigroupoids" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, Cabal
-     , cabal-doctest, comonad, containers, contravariant, distributive
-     , doctest, semigroups, tagged, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "semigroupoids";
-       version = "5.2";
-       sha256 = "1g4ifzwsdpbkq50xrpd03vbdb75s5nwwmvb8xy2jpp509j0ghmyr";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad containers contravariant
-         distributive semigroups tagged transformers transformers-compat
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/semigroupoids";
-       description = "Semigroupoids: Category sans id";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semigroupoids_5_2_1" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, Cabal
      , cabal-doctest, comonad, containers, contravariant, distributive
      , doctest, hashable, semigroups, tagged, transformers
@@ -169545,7 +166686,6 @@ self: {
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoids-syntax" = callPackage
@@ -170203,8 +167343,8 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.3.1";
-       sha256 = "01wjr1xlnvz2ml7iiarbbl1h8p4ax457nq1n6xxx070d08l4iq33";
+       version = "0.4.0";
+       sha256 = "1hql9cmw43cq9dsrkd0qwy1ycj6srsc2sr32grcfvh2j350k2m0p";
        libraryHaskellDepends = [
          acid-state aeson ansi-terminal base base16-bytestring
          base64-bytestring bytestring clock containers deepseq directory
@@ -171630,8 +168770,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-static-th";
-       version = "0.1.0.4";
-       sha256 = "029xm7znkqd5sh7yhrblf9marwyd29iiqnar4kaf6awllxxkk1aq";
+       version = "0.1.0.5";
+       sha256 = "1i1xyn14nc2jg1b6y926pz3dp4hlgg54q3lzzg9zza1jnh6ncjrp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -171757,6 +168897,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-websockets" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, conduit
+     , exceptions, resourcet, servant-server, text, wai, wai-websockets
+     , warp, websockets
+     }:
+     mkDerivation {
+       pname = "servant-websockets";
+       version = "1.0.0";
+       sha256 = "05y9yyrg5c99xdlyfzwddylrklpspabijdd08f5c75bhdi2i4cb2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring conduit exceptions resourcet
+         servant-server text wai wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [
+         aeson base conduit servant-server text wai warp websockets
+       ];
+       homepage = "https://github.com/moesenle/servant-websockets#readme";
+       description = "Small library providing WebSocket endpoints for servant";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-yaml" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
      , servant, servant-server, wai, warp, yaml
@@ -172230,6 +169393,8 @@ self: {
        pname = "setgame";
        version = "1.1";
        sha256 = "1hr2kb4d7m22d48gh74h5z8c6shkprincf0qb9wc2fq2hj7c3c1l";
+       revision = "1";
+       editedCabalFile = "1shkmfmjnvc47gy9ck6knf94571if4qjm92c1p8kji9v0n24yzfw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base random vty ];
@@ -172881,6 +170046,33 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "shakespeare_2_0_14" = 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.14";
+       sha256 = "0j5zx8ka7d7scvb9shm7k3376qzl3k4kpim9aqqfs6n86901zpl4";
+       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
@@ -173868,21 +171060,6 @@ self: {
      }) {};
 
   "signal" = callPackage
-    ({ mkDerivation, base, unix }:
-     mkDerivation {
-       pname = "signal";
-       version = "0.1.0.3";
-       sha256 = "1iwa707xd4g4lycdjr72ygrjy68gyqyvhvl2bbxswgpfxy5i1x8x";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base unix ];
-       executableHaskellDepends = [ base ];
-       homepage = "http://github.com/pmlodawski/signal";
-       description = "Multiplatform signal support for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "signal_0_1_0_4" = callPackage
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "signal";
@@ -173895,7 +171072,6 @@ self: {
        homepage = "http://github.com/pmlodawski/signal";
        description = "Multiplatform signal support for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "signals" = callPackage
@@ -174294,8 +171470,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.9.2";
-       sha256 = "13a1rqbig0q0nkkwk33vq7vp6w4dvm8famf5dpydw3vlizwh4db9";
+       version = "0.9.3";
+       sha256 = "0i58x3gasg1gda7yx9r155ap6w7mamafcqi5jpq4adm9wx4gy4ph";
        libraryHaskellDepends = [
          async base base-unicode-symbols containers data-default deepseq
          directory exceptions filepath hformat microlens microlens-platform
@@ -175582,17 +172758,22 @@ self: {
      }) {};
 
   "slack-web" = callPackage
-    ({ mkDerivation, aeson, base, generics-sop, http-api-data
-     , http-client, http-client-tls, servant, servant-client, text
-     , transformers
+    ({ mkDerivation, aeson, base, containers, errors, hspec
+     , http-api-data, http-client, http-client-tls, megaparsec, mtl
+     , servant, servant-client, text, time, transformers
      }:
      mkDerivation {
        pname = "slack-web";
-       version = "0.1.0";
-       sha256 = "107knm7ldy14n0nb474xa5sha6z6b413pmf96ih8amv8zs5nq642";
+       version = "0.2.0.1";
+       sha256 = "1v1w6szcjy4qgdx66754vkp7w4fnkyg0pngijy2v422pqmc4jpr9";
        libraryHaskellDepends = [
-         aeson base generics-sop http-api-data http-client http-client-tls
-         servant servant-client text transformers
+         aeson base containers errors http-api-data http-client
+         http-client-tls megaparsec mtl servant servant-client text time
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson base containers errors hspec http-api-data megaparsec text
+         time
        ];
        homepage = "https://github.com/jpvillaisaza/slack-web";
        description = "Bindings for the Slack web API";
@@ -175815,20 +172996,6 @@ self: {
      }) {};
 
   "smallcheck" = callPackage
-    ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
-     mkDerivation {
-       pname = "smallcheck";
-       version = "1.1.1";
-       sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd";
-       revision = "1";
-       editedCabalFile = "1ykq0hqs1alw86p0ssa6dhsb1a8d4m6bqwibkhvzcd6c28dq975i";
-       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
-       homepage = "https://github.com/feuerbach/smallcheck";
-       description = "A property-based testing library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smallcheck_1_1_2" = callPackage
     ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
      mkDerivation {
        pname = "smallcheck";
@@ -175838,7 +173005,6 @@ self: {
        homepage = "https://github.com/feuerbach/smallcheck";
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallcheck-laws" = callPackage
@@ -176040,8 +173206,8 @@ self: {
     ({ mkDerivation, base, hspec, megaparsec, QuickCheck, text }:
      mkDerivation {
        pname = "smiles";
-       version = "0.1.1.0";
-       sha256 = "054s7c6xbakbv0kc64iyv1gsqnddgv8kc07hplk8ksbzg8q5x8jz";
+       version = "0.2.0.0";
+       sha256 = "0k1yy1bhgavsmm40zz1i6ihyfksb6fr06wxlbqyj1y0igmrrrlrw";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
        homepage = "https://github.com/zmactep/smiles#readme";
@@ -176421,8 +173587,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-core";
-       version = "1.0.2.1";
-       sha256 = "07d1rk6jr5yk74v3g53ncal5f44hyi1486xlxg7lj3v4qifkv46y";
+       version = "1.0.3.0";
+       sha256 = "0vkla7rfrwyhk31nign8ccjfhp7f0nqjhmg6hb7rq7ggblgwgnr4";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder case-insensitive
          containers directory filepath hashable HUnit io-streams lifted-base
@@ -176552,6 +173718,8 @@ self: {
        pname = "snap-loader-dynamic";
        version = "1.0.0.0";
        sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg";
+       revision = "1";
+       editedCabalFile = "0zgnlfp4rlj5c40ma75fdc7csbjn9p84x6a7fiwc7lqd1iqk4rbj";
        libraryHaskellDepends = [
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
@@ -176630,10 +173798,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-server";
-       version = "1.0.2.2";
-       sha256 = "0zw3z9s61kkfmlvrg3sfqvd0c3mzg9zjwp01hm1br3z8cawmzpi7";
-       revision = "2";
-       editedCabalFile = "032m1c42qm4b07s835aa9jl2n7r7py8cdz3fdfqi6qd68z7lqrb5";
+       version = "1.0.3.0";
+       sha256 = "1lvwfrirf6gq6nr6ias0i0xynq62s9myrj4203wdwq0y4c40nhqc";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -177849,23 +175015,6 @@ self: {
      }) {};
 
   "snowtify" = callPackage
-    ({ mkDerivation, base, either, safe, safe-exceptions, text, turtle
-     }:
-     mkDerivation {
-       pname = "snowtify";
-       version = "0.1.0.0";
-       sha256 = "1dfs4nghjxqdfpd3hpkbxg9yn5sgn2s0l3l70xxsrzpi5xz6lvrj";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base either safe safe-exceptions text turtle
-       ];
-       homepage = "https://github.com/aiya000/hs-snowtify#README.md";
-       description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "snowtify_0_1_0_3" = callPackage
     ({ mkDerivation, base, either, safe, safe-exceptions, text, turtle
      }:
      mkDerivation {
@@ -177880,7 +175029,6 @@ self: {
        homepage = "https://github.com/aiya000/hs-snowtify#README.md";
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap" = callPackage
@@ -178468,24 +175616,6 @@ self: {
      }) {};
 
   "sox" = callPackage
-    ({ mkDerivation, base, containers, explicit-exception
-     , extensible-exceptions, process, sample-frame, transformers, unix
-     , utility-ht
-     }:
-     mkDerivation {
-       pname = "sox";
-       version = "0.2.2.6";
-       sha256 = "04pvz62r7dafiabvq18lmyl64s8n0lb7mb0l9mqpzg379phqdx6l";
-       libraryHaskellDepends = [
-         base containers explicit-exception extensible-exceptions process
-         sample-frame transformers unix utility-ht
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Sox";
-       description = "Play, write, read, convert audio signals using Sox";
-       license = "GPL";
-     }) {};
-
-  "sox_0_2_2_7" = callPackage
     ({ mkDerivation, base, containers, explicit-exception
      , extensible-exceptions, process, sample-frame, transformers, unix
      , utility-ht
@@ -178501,7 +175631,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Sox";
        description = "Play, write, read, convert audio signals using Sox";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soxlib" = callPackage
@@ -178679,6 +175808,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sparkle_0_6" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, choice
+     , distributed-closure, filepath, inline-java, jni, jvm
+     , jvm-streaming, process, regex-tdfa, singletons, streaming, text
+     , vector, zip-archive
+     }:
+     mkDerivation {
+       pname = "sparkle";
+       version = "0.6";
+       sha256 = "11i0bk9yl8ba84xm2hfxlnspygfafdannafg42iqfg1q6f8h2y7w";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal inline-java ];
+       libraryHaskellDepends = [
+         base binary bytestring choice distributed-closure inline-java jni
+         jvm jvm-streaming singletons streaming text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring filepath process regex-tdfa text zip-archive
+       ];
+       homepage = "http://github.com/tweag/sparkle#readme";
+       description = "Distributed Apache Spark applications in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sparse" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, contravariant
      , criterion, deepseq, directory, doctest, filepath, hlint
@@ -179628,7 +176784,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time unix
        ];
        homepage = "https://bitbucket.org/ssaasen/spy";
-       description = "A compact file system watcher for macOS, Linux and Windows";
+       description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -180996,24 +178152,6 @@ self: {
      }) {};
 
   "stateWriter" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, dlist, free
-     , hspec, lens, mtl, QuickCheck, transformers, vector
-     }:
-     mkDerivation {
-       pname = "stateWriter";
-       version = "0.2.8";
-       sha256 = "1qn6rj13cn71bmradmy0frmlz1s925ssp233qnr53dshqfg21vfv";
-       libraryHaskellDepends = [ base mtl transformers ];
-       testHaskellDepends = [ base free hspec mtl QuickCheck ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq dlist lens mtl transformers
-         vector
-       ];
-       description = "A faster variant of the RWS monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stateWriter_0_2_8_2" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, dlist, free
      , hspec, lens, mtl, QuickCheck, transformers, vector
      }:
@@ -181029,7 +178167,6 @@ self: {
        ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statechart" = callPackage
@@ -181697,34 +178834,6 @@ self: {
      }) {};
 
   "stm-containers" = callPackage
-    ({ mkDerivation, async, base, base-prelude, containers, criterion
-     , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl
-     , mtl-prelude, mwc-random, mwc-random-monad, placeholders
-     , primitive, QuickCheck, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "stm-containers";
-       version = "0.2.15";
-       sha256 = "1q5jsrmvmqlw6xjh6gj94qz1l0a37iybcqx42v17a50kpsy86925";
-       libraryHaskellDepends = [
-         base base-prelude focus hashable list-t primitive transformers
-       ];
-       testHaskellDepends = [
-         base base-prelude focus free hashable HTF list-t loch-th mtl
-         mtl-prelude placeholders primitive QuickCheck transformers
-         unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         async base base-prelude containers criterion focus free hashable
-         hashtables list-t loch-th mtl mtl-prelude mwc-random
-         mwc-random-monad placeholders text unordered-containers
-       ];
-       homepage = "https://github.com/nikita-volkov/stm-containers";
-       description = "Containers for STM";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stm-containers_0_2_16" = callPackage
     ({ mkDerivation, async, base, base-prelude, containers, criterion
      , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl
      , mtl-prelude, mwc-random, mwc-random-monad, placeholders
@@ -181751,7 +178860,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/stm-containers";
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-delay" = callPackage
@@ -182121,28 +179229,6 @@ self: {
      }) {};
 
   "storablevector" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, non-negative
-     , QuickCheck, random, sample-frame, syb, transformers, unsafe
-     , utility-ht
-     }:
-     mkDerivation {
-       pname = "storablevector";
-       version = "0.2.12";
-       sha256 = "19p8yz7amvf9sd3kgx2hhh6nifkbjxj43s6i1279qq1v46x9wznb";
-       libraryHaskellDepends = [
-         base deepseq non-negative QuickCheck syb transformers unsafe
-         utility-ht
-       ];
-       testHaskellDepends = [
-         base bytestring QuickCheck random utility-ht
-       ];
-       benchmarkHaskellDepends = [ base deepseq sample-frame utility-ht ];
-       homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
-       description = "Fast, packed, strict storable arrays with a list interface like ByteString";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "storablevector_0_2_12_1" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, non-negative
      , QuickCheck, random, sample-frame, syb, transformers, unsafe
      , utility-ht
@@ -182164,7 +179250,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storablevector-carray" = callPackage
@@ -183462,25 +180547,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.3";
-       sha256 = "0g98wsc1afjjlw0sjhnsjd4xv8akid1xr4gc16jcdy9wfv32rb4m";
-       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_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
@@ -183497,7 +180563,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
@@ -184012,19 +181077,6 @@ self: {
      }) {};
 
   "sum-type-boilerplate" = callPackage
-    ({ mkDerivation, base, hlint, hspec, HUnit, template-haskell }:
-     mkDerivation {
-       pname = "sum-type-boilerplate";
-       version = "0.1.0";
-       sha256 = "1nibnrnj35sdi6jywjlg5f41138a22q2vg7hn0vqczynzswjb5y8";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base hlint hspec HUnit template-haskell ];
-       homepage = "https://github.com/jdreaver/sum-type-boilerplate#readme";
-       description = "Library for reducing the boilerplate involved with sum types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "sum-type-boilerplate_0_1_1" = callPackage
     ({ mkDerivation, base, hspec, template-haskell }:
      mkDerivation {
        pname = "sum-type-boilerplate";
@@ -184035,7 +181087,6 @@ self: {
        homepage = "https://github.com/jdreaver/sum-type-boilerplate#readme";
        description = "Library for reducing the boilerplate involved with sum types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sump" = callPackage
@@ -184430,8 +181481,8 @@ self: {
      }:
      mkDerivation {
        pname = "svg-tree";
-       version = "0.6.1";
-       sha256 = "0lap0il6bfdlv3yv71xh8sczg9jmfkbx25vbw5sjcgkxamaqrxcv";
+       version = "0.6.2";
+       sha256 = "1vrrjdid864s86dqs9a37s8jw7a4pb3ghfxii45dd9phwnd5vr1b";
        libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
@@ -185349,38 +182400,6 @@ self: {
      }) {};
 
   "synthesizer-core" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, directory, event-list, explicit-exception, filepath
-     , non-empty, non-negative, numeric-prelude, numeric-quest, old-time
-     , process, QuickCheck, random, sample-frame-np, sox
-     , storable-record, storable-tuple, storablevector, timeit
-     , transformers, utility-ht
-     }:
-     mkDerivation {
-       pname = "synthesizer-core";
-       version = "0.8.1";
-       sha256 = "1lhsg33xw1xb3smhr67gxdl6ap1azshyxqvy0p288p9i70hxqa79";
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq event-list
-         explicit-exception filepath non-empty non-negative numeric-prelude
-         numeric-quest process QuickCheck random sample-frame-np sox
-         storable-record storable-tuple storablevector transformers
-         utility-ht
-       ];
-       testHaskellDepends = [
-         base containers event-list non-empty non-negative numeric-prelude
-         QuickCheck random storable-tuple storablevector utility-ht
-       ];
-       benchmarkHaskellDepends = [
-         array base binary bytestring directory numeric-prelude old-time
-         storable-tuple storablevector timeit utility-ht
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
-       description = "Audio signal processing coded in Haskell: Low level part";
-       license = "GPL";
-     }) {};
-
-  "synthesizer-core_0_8_1_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , deepseq, directory, event-list, explicit-exception, filepath
      , non-empty, non-negative, numeric-prelude, numeric-quest, old-time
@@ -185410,7 +182429,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Low level part";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-dimensional" = callPackage
@@ -186307,17 +183325,6 @@ self: {
      }) {};
 
   "tagged-binary" = callPackage
-    ({ mkDerivation, base, binary, bytestring, pureMD5 }:
-     mkDerivation {
-       pname = "tagged-binary";
-       version = "0.2.0.0";
-       sha256 = "0ibp4hmzg4c4dn88ws7x1j5wc6cbz3j2hymyaw2qkac3j4phzqrm";
-       libraryHaskellDepends = [ base binary bytestring pureMD5 ];
-       description = "Provides tools for serializing data tagged with type information";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tagged-binary_0_2_0_1" = callPackage
     ({ mkDerivation, base, base-compat, binary, bytestring, pureMD5 }:
      mkDerivation {
        pname = "tagged-binary";
@@ -186328,7 +183335,6 @@ self: {
        ];
        description = "Provides tools for serializing data tagged with type information";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-exception-core" = callPackage
@@ -187081,15 +184087,15 @@ self: {
   "tasty" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers
      , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
-     , unbounded-delays
+     , unbounded-delays, unix
      }:
      mkDerivation {
        pname = "tasty";
-       version = "0.11.2.3";
-       sha256 = "0rsi8k3snw37nc196d59spmsp2xnmhbfbiqdb475qdg7a2i922k1";
+       version = "0.11.2.5";
+       sha256 = "09qg2ssack4y3vy5dppjpprvg7gss970a0nfv0rq2m87gw5r3i1h";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers deepseq mtl
-         optparse-applicative regex-tdfa stm tagged unbounded-delays
+         optparse-applicative regex-tdfa stm tagged unbounded-delays unix
        ];
        homepage = "https://github.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
@@ -187518,22 +184524,6 @@ self: {
      }) {};
 
   "tasty-stats" = callPackage
-    ({ mkDerivation, base, containers, directory, process, stm, tagged
-     , tasty, time
-     }:
-     mkDerivation {
-       pname = "tasty-stats";
-       version = "0.2.0.2";
-       sha256 = "19f6ipaq0vkamg7c38jh4jy12migfichq1455n065kipisq1v1zn";
-       libraryHaskellDepends = [
-         base containers directory process stm tagged tasty time
-       ];
-       homepage = "https://github.com/minad/tasty-stats#readme";
-       description = "Collect statistics of your Tasty testsuite in a CSV file";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-stats_0_2_0_3" = callPackage
     ({ mkDerivation, base, containers, directory, process, stm, tagged
      , tasty, time
      }:
@@ -187547,7 +184537,6 @@ self: {
        homepage = "https://github.com/minad/tasty-stats#readme";
        description = "Collect statistics of your Tasty testsuite in a CSV file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-tap" = callPackage
@@ -187680,6 +184669,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tcod-haskell" = callPackage
+    ({ mkDerivation, base, bytestring, containers, inline-c, repa, sdl2
+     , tcod, vector
+     }:
+     mkDerivation {
+       pname = "tcod-haskell";
+       version = "0.2.0.0";
+       sha256 = "131qdd7h2890as35lfb3kx37j3vrz33ajxp5n4cl65rdrdk5vfxc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers inline-c repa sdl2 vector
+       ];
+       librarySystemDepends = [ tcod ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ncrashed/tcod-haskell#readme";
+       description = "Bindings to libtcod roguelike engine";
+       license = stdenv.lib.licenses.bsd3;
+     }) {tcod = null;};
+
   "tconfig" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -188356,25 +185365,6 @@ self: {
      }) {};
 
   "temporary" = callPackage
-    ({ mkDerivation, base, base-compat, directory, exceptions, filepath
-     , tasty, tasty-hunit, transformers, unix
-     }:
-     mkDerivation {
-       pname = "temporary";
-       version = "1.2.1";
-       sha256 = "1y54fx183sfmpd3xj94c74z9v42y1d7ski3jqrfrd7pnbh38ikwy";
-       libraryHaskellDepends = [
-         base directory exceptions filepath transformers unix
-       ];
-       testHaskellDepends = [
-         base base-compat directory filepath tasty tasty-hunit unix
-       ];
-       homepage = "https://github.com/feuerbach/temporary";
-       description = "Portable temporary file and directory support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "temporary_1_2_1_1" = callPackage
     ({ mkDerivation, base, base-compat, directory, exceptions, filepath
      , tasty, tasty-hunit, transformers, unix
      }:
@@ -188391,7 +185381,6 @@ self: {
        homepage = "https://github.com/feuerbach/temporary";
        description = "Portable temporary file and directory support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporary-rc" = callPackage
@@ -188871,27 +185860,6 @@ self: {
      }) {};
 
   "test-fixture" = callPackage
-    ({ mkDerivation, base, data-default-class, haskell-src-exts
-     , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell
-     , th-orphans, transformers
-     }:
-     mkDerivation {
-       pname = "test-fixture";
-       version = "0.5.0.1";
-       sha256 = "0gnvz4paxr2wamdp01fnflhifbmsgxpmhg6l3a8nqmi32wgrwy6m";
-       libraryHaskellDepends = [
-         base data-default-class haskell-src-exts haskell-src-meta mtl
-         template-haskell th-orphans
-       ];
-       testHaskellDepends = [
-         base hspec hspec-discover mtl template-haskell transformers
-       ];
-       homepage = "http://github.com/cjdev/test-fixture#readme";
-       description = "Test monadic side-effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "test-fixture_0_5_0_2" = callPackage
     ({ mkDerivation, base, data-default-class, haskell-src-exts
      , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell
      , th-orphans, transformers
@@ -188910,7 +185878,6 @@ self: {
        homepage = "http://github.com/cjdev/test-fixture#readme";
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework" = callPackage
@@ -190500,21 +187467,6 @@ self: {
      }) {};
 
   "th-abstraction" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "th-abstraction";
-       version = "0.2.3.0";
-       sha256 = "00yy303rrnx26z9aam33j8m1v0dq5wxk71901fbl50jm9mdg4jwm";
-       libraryHaskellDepends = [
-         base containers ghc-prim template-haskell
-       ];
-       testHaskellDepends = [ base containers template-haskell ];
-       homepage = "https://github.com/glguy/th-abstraction";
-       description = "Nicer interface for reified information about data types";
-       license = stdenv.lib.licenses.isc;
-     }) {};
-
-  "th-abstraction_0_2_5_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
@@ -190527,7 +187479,6 @@ self: {
        homepage = "https://github.com/glguy/th-abstraction";
        description = "Nicer interface for reified information about data types";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-alpha" = callPackage
@@ -190818,22 +187769,6 @@ self: {
      }) {};
 
   "th-orphans" = callPackage
-    ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift
-     , th-lift-instances, th-reify-many
-     }:
-     mkDerivation {
-       pname = "th-orphans";
-       version = "0.13.3";
-       sha256 = "0vf4g2pwhgh242512cssbzsgbpfrnn1fj5kv7qw4wx8cdnvdb03k";
-       libraryHaskellDepends = [
-         base mtl template-haskell th-lift th-lift-instances th-reify-many
-       ];
-       testHaskellDepends = [ base hspec template-haskell ];
-       description = "Orphan instances for TH datatypes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-orphans_0_13_4" = callPackage
     ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift
      , th-lift-instances, th-reify-many
      }:
@@ -190847,7 +187782,6 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-printf" = callPackage
@@ -190882,23 +187816,6 @@ self: {
      }) {};
 
   "th-reify-many" = callPackage
-    ({ mkDerivation, base, containers, mtl, safe, template-haskell
-     , th-expand-syns
-     }:
-     mkDerivation {
-       pname = "th-reify-many";
-       version = "0.1.7";
-       sha256 = "1sa4gxkkv30h6g12cqss3qffmphcamfqmvnn69ix2w0wlsya81m8";
-       libraryHaskellDepends = [
-         base containers mtl safe template-haskell th-expand-syns
-       ];
-       testHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/mgsloan/th-reify-many";
-       description = "Recurseively reify template haskell datatype info";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-reify-many_0_1_8" = callPackage
     ({ mkDerivation, base, containers, mtl, safe, template-haskell
      , th-expand-syns
      }:
@@ -190913,7 +187830,6 @@ self: {
        homepage = "http://github.com/mgsloan/th-reify-many";
        description = "Recurseively reify template haskell datatype info";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-sccs" = callPackage
@@ -190929,21 +187845,6 @@ self: {
      }) {};
 
   "th-to-exp" = callPackage
-    ({ mkDerivation, base, hspec, template-haskell }:
-     mkDerivation {
-       pname = "th-to-exp";
-       version = "0.0.1.0";
-       sha256 = "0mmz37jlkzpw47gsjzfr182kiwwdwxdl19bpiw28m944m75ksa1h";
-       revision = "1";
-       editedCabalFile = "0lnknwrvaj8q2i68g09rakg8rdyi5860xia5p5jb2r1z0ggwbbwi";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base hspec template-haskell ];
-       homepage = "https://github.com/lexi-lambda/th-to-exp#readme";
-       description = "Provides a way to persist data from compile-time to runtime";
-       license = stdenv.lib.licenses.isc;
-     }) {};
-
-  "th-to-exp_0_0_1_1" = callPackage
     ({ mkDerivation, base, hspec, template-haskell }:
      mkDerivation {
        pname = "th-to-exp";
@@ -190954,7 +187855,6 @@ self: {
        homepage = "https://github.com/lexi-lambda/th-to-exp#readme";
        description = "Provides a way to persist data from compile-time to runtime";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-traced" = callPackage
@@ -191425,14 +188325,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "threepenny-editors_0_5_1" = callPackage
+  "threepenny-editors_0_5_2" = callPackage
     ({ mkDerivation, base, bifunctors, casing, containers, data-default
      , generics-sop, lens, profunctors, threepenny-gui
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.5.1";
-       sha256 = "07vg5xzrw7ll5kvbgi2masgbzicp0gfvzm7yrxhdkchdrlkrp1cv";
+       version = "0.5.2";
+       sha256 = "131gczj4nwcip1m2pry8h340mivpm4skydw0r8ir7mfr4pc6a1wj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191704,8 +188604,8 @@ self: {
      }:
      mkDerivation {
        pname = "tibetan-utils";
-       version = "0.1.1.3";
-       sha256 = "0jd6w07sks4v9x7m77dz3r59ri2vsmmbv82yi457bn9szdy0jz2x";
+       version = "0.1.1.4";
+       sha256 = "0xr31py60q915a8qg590c55mjprf7w5w4cdlcjg1gz6wqq9kdjam";
        libraryHaskellDepends = [
          base composition either megaparsec text text-show
        ];
@@ -194255,34 +191155,13 @@ self: {
      }) {};
 
   "transient" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, mtl
-     , random, stm, time, transformers
-     }:
-     mkDerivation {
-       pname = "transient";
-       version = "0.5.8";
-       sha256 = "04n43yddamgk7han7kmhz57v2vrp3cazqkgy4xnkdfgr10z8pppx";
-       libraryHaskellDepends = [
-         base bytestring containers directory mtl random stm time
-         transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory mtl random stm time
-         transformers
-       ];
-       homepage = "http://www.fpcomplete.com/user/agocorona";
-       description = "composing programs with multithreading, events and distributed computing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "transient_0_5_9_1" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, containers
      , directory, mtl, random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.5.9.1";
-       sha256 = "0dvv03lshvwvfjv9p54jbcihz8w96k33772msx03qqdnr8n9iql7";
+       version = "0.5.9.2";
+       sha256 = "0ij3ycc1zln9vnjp66d5mxsgwpzmfswbz018ci6w8m885zdf9dr2";
        libraryHaskellDepends = [
          atomic-primops base bytestring containers directory mtl random stm
          time transformers
@@ -194294,7 +191173,6 @@ self: {
        homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "composing programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transient-universe" = callPackage
@@ -194305,8 +191183,8 @@ self: {
      }:
      mkDerivation {
        pname = "transient-universe";
-       version = "0.4.6";
-       sha256 = "0as7930b9mwy86rcly957q9yslqd2rflakmxnl1njnqm2cr2dx7m";
+       version = "0.4.6.1";
+       sha256 = "1bsx6a0bkys99xwrz78nnd1f8y2ixzcbng0smh1kb6xrac8b1jin";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194777,6 +191655,8 @@ self: {
        pname = "trifecta";
        version = "1.6.2.1";
        sha256 = "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs";
+       revision = "1";
+       editedCabalFile = "0qy2nqxn2h20fp9gf5chvgimb2281pjwm075ap7ar7pk2k4n8ljr";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
          blaze-markup bytestring charset comonad containers deepseq
@@ -195596,8 +192476,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.1";
-       sha256 = "1vcwyhwvh3xfm8n2xlic12in6ybkq11nsafqv0fhbdzhscxgqhqs";
+       version = "1.0.1.2";
+       sha256 = "0rzkb2mv19jafswc3cww7zp1flbz87pyn4mkw16sf3gjar2k9h8l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195900,8 +192780,8 @@ self: {
      }:
      mkDerivation {
        pname = "twiml";
-       version = "0.2.0.0";
-       sha256 = "12vavc02rpdrgdcnbd1jzn9lllzx4fghczdrpjr2icn8bkrgkqi5";
+       version = "0.2.0.1";
+       sha256 = "1x4jhvz0590zlpy74yjwjxkrllk7yvpgf2srkisi10klmarsjygd";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base data-default deepseq lens network-uri parsec template-haskell
@@ -197157,34 +194037,6 @@ self: {
      }) {};
 
   "tz" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, thyme, time, timezone-olson, timezone-series
-     , tzdata, vector
-     }:
-     mkDerivation {
-       pname = "tz";
-       version = "0.1.2.1";
-       sha256 = "14n44wbz2cjvzhv8zd6bddmbivxyw04xwd7p1jkm5d0v1jggb1yi";
-       libraryHaskellDepends = [
-         base binary bytestring containers data-default deepseq
-         template-haskell time tzdata vector
-       ];
-       testHaskellDepends = [
-         base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th time tzdata
-       ];
-       benchmarkHaskellDepends = [
-         base criterion lens thyme time timezone-olson timezone-series
-       ];
-       preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
-       homepage = "https://github.com/nilcons/haskell-tz";
-       description = "Efficient time zone handling";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "tz_0_1_3_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -197210,32 +194062,9 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tzdata" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
-     , test-framework, test-framework-hunit, test-framework-th, unix
-     , vector
-     }:
-     mkDerivation {
-       pname = "tzdata";
-       version = "0.1.20161123.0";
-       sha256 = "1dnc9m3396bxps84xgxfzrx928yh7vxd8pdim63a5xrydcfp16fb";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers deepseq vector
-       ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit
-         test-framework-th unix
-       ];
-       homepage = "https://github.com/nilcons/haskell-tzdata";
-       description = "Time zone database (as files and as a module)";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "tzdata_0_1_20170320_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , test-framework, test-framework-hunit, test-framework-th, unix
      , vector
@@ -197255,7 +194084,6 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tzdata";
        description = "Time zone database (as files and as a module)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "u2f" = callPackage
@@ -198110,28 +194938,6 @@ self: {
      }) {};
 
   "unicode-transforms" = callPackage
-    ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
-     , filepath, getopt-generics, optparse-applicative, path, path-io
-     , QuickCheck, split, text
-     }:
-     mkDerivation {
-       pname = "unicode-transforms";
-       version = "0.3.2";
-       sha256 = "15v5c0gn10k5im0x3b04z3hilwgafx6sk61hxmp0p36l1zqa5ch0";
-       libraryHaskellDepends = [ base bitarray bytestring text ];
-       testHaskellDepends = [
-         base deepseq getopt-generics QuickCheck split text
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq filepath optparse-applicative path path-io
-         text
-       ];
-       homepage = "http://github.com/harendra-kumar/unicode-transforms";
-       description = "Unicode normalization";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unicode-transforms_0_3_3" = callPackage
     ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
      , filepath, getopt-generics, optparse-applicative, path, path-io
      , QuickCheck, split, text
@@ -198151,7 +194957,6 @@ self: {
        homepage = "http://github.com/harendra-kumar/unicode-transforms";
        description = "Unicode normalization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicoder" = callPackage
@@ -198237,22 +195042,6 @@ self: {
      }) {};
 
   "union" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, lens, profunctors
-     , tagged, vinyl
-     }:
-     mkDerivation {
-       pname = "union";
-       version = "0.1.1.1";
-       sha256 = "1x24raarjj62z3afmf443kkcdslskz554sky8rcfkkb1j11mg7l1";
-       revision = "2";
-       editedCabalFile = "0wxjv55bbjknyfn9489s77b22r31qwab6v16687mfj24a1cliad8";
-       libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
-       benchmarkHaskellDepends = [ base criterion deepseq lens ];
-       description = "Extensible type-safe unions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "union_0_1_1_2" = callPackage
     ({ mkDerivation, base, criterion, deepseq, lens, profunctors
      , tagged, vinyl
      }:
@@ -198266,7 +195055,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "union-find" = callPackage
@@ -198480,23 +195268,6 @@ self: {
      }) {};
 
   "units-parser" = callPackage
-    ({ mkDerivation, base, containers, mtl, multimap, parsec, syb
-     , tasty, tasty-hunit, template-haskell
-     }:
-     mkDerivation {
-       pname = "units-parser";
-       version = "0.1.0.0";
-       sha256 = "0ha1saapphk15xk10a36k5qmn01nqpz10f8gi35ra9zqlhv8amfq";
-       libraryHaskellDepends = [ base containers mtl multimap parsec ];
-       testHaskellDepends = [
-         base containers mtl multimap parsec syb tasty tasty-hunit
-         template-haskell
-       ];
-       description = "A parser for units of measure";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "units-parser_0_1_0_1" = callPackage
     ({ mkDerivation, base, containers, mtl, multimap, parsec, syb
      , tasty, tasty-hunit, template-haskell
      }:
@@ -198511,7 +195282,6 @@ self: {
        ];
        description = "A parser for units of measure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unittyped" = callPackage
@@ -198576,7 +195346,7 @@ self: {
        sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
-       description = "Parser for macOS Universal Binary format";
+       description = "Parser for OS X Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -199409,20 +196179,6 @@ self: {
      }) {};
 
   "uri-bytestring-aeson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
-     mkDerivation {
-       pname = "uri-bytestring-aeson";
-       version = "0.1.0.1";
-       sha256 = "1zi5jl2ksjmvflfzff0hqy7a66ma6xifl2nycb1f6qd0fsrc6hpg";
-       libraryHaskellDepends = [
-         aeson base bytestring text uri-bytestring
-       ];
-       homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
-       description = "Aeson instances for URI Bytestring";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "uri-bytestring-aeson_0_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
      mkDerivation {
        pname = "uri-bytestring-aeson";
@@ -199434,7 +196190,6 @@ self: {
        homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
        description = "Aeson instances for URI Bytestring";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-conduit" = callPackage
@@ -200517,30 +197272,6 @@ self: {
      }) {};
 
   "vado" = callPackage
-    ({ mkDerivation, attoparsec, base, directory, filepath, process
-     , QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "vado";
-       version = "0.0.8";
-       sha256 = "0mn2mhjnwkmzpb9d7qc5bb8qp22gdmrhwb7d7gf8mh07p1i5025v";
-       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_9" = callPackage
     ({ mkDerivation, attoparsec, base, directory, filepath, process
      , QuickCheck, text
      }:
@@ -200562,7 +197293,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
@@ -201157,8 +197887,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcsgui";
-       version = "0.2.1.2";
-       sha256 = "1qf5insiqgl3p9bg6m1igl24lghzbb3y50acwxgcpbcbdcaw13z5";
+       version = "0.2.2.0";
+       sha256 = "0s7vmlbggmwaj6mlhmj1vkri6af16xpsanwyr2jip5hdpn8gpjv2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -201181,8 +197911,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcswrapper";
-       version = "0.1.5";
-       sha256 = "0yzin613nzvnklkb3j29vzy4rfladb3cy3sy6ic0mi6lxhilan2n";
+       version = "0.1.6";
+       sha256 = "0givnl1716ymjz5a5n4wdy61hg8zhfxb66vx9bzkziavzni2dfif";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -201929,25 +198659,6 @@ self: {
      }) {};
 
   "viewprof" = callPackage
-    ({ mkDerivation, base, brick, containers, ghc-prof, lens
-     , scientific, text, vector, vector-algorithms, vty
-     }:
-     mkDerivation {
-       pname = "viewprof";
-       version = "0.0.0.6";
-       sha256 = "0a9jbfa2sr3rvpp51kd9c3b9rax7b6wly4ly4dmn5k3z8fr0z31l";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base brick containers ghc-prof lens scientific text vector
-         vector-algorithms vty
-       ];
-       homepage = "https://github.com/maoe/viewprof";
-       description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "viewprof_0_0_0_8" = callPackage
     ({ mkDerivation, base, brick, containers, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
@@ -201964,7 +198675,6 @@ self: {
        homepage = "https://github.com/maoe/viewprof";
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -205049,23 +201759,6 @@ self: {
      }) {};
 
   "web-routes-th" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split
-     , template-haskell, text, web-routes
-     }:
-     mkDerivation {
-       pname = "web-routes-th";
-       version = "0.22.6.1";
-       sha256 = "1li1mb6h14gw2lr2fvv7cc6ykqh5l5zx0k956fasc8h9w2xlg6r4";
-       libraryHaskellDepends = [
-         base parsec split template-haskell text web-routes
-       ];
-       testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ];
-       homepage = "https://github.com/happstack/web-routes-th";
-       description = "Support for deriving PathInfo using Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "web-routes-th_0_22_6_2" = callPackage
     ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split
      , template-haskell, text, web-routes
      }:
@@ -205080,7 +201773,6 @@ self: {
        homepage = "https://github.com/happstack/web-routes-th";
        description = "Support for deriving PathInfo using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-transformers" = callPackage
@@ -205802,25 +202494,6 @@ self: {
      }) {};
 
   "weeder" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cmdargs, extra, filepath
-     , hashable, process, text, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "weeder";
-       version = "0.1.6";
-       sha256 = "1ss78jqiygypr8j4n2nj9b5dhxly6gmnf5qlil4cj8kb0pzr1q7b";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring cmdargs extra filepath hashable process text
-         unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/ndmitchell/weeder#readme";
-       description = "Detect dead code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "weeder_0_1_7" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq
      , directory, extra, filepath, foundation, hashable, process, text
      , unordered-containers, vector, yaml
@@ -205838,30 +202511,9 @@ self: {
        homepage = "https://github.com/ndmitchell/weeder#readme";
        description = "Detect dead code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weigh" = callPackage
-    ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
-     , process, random, split, template-haskell, temporary
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "weigh";
-       version = "0.0.4";
-       sha256 = "1qzc3h3a8z4wmv2mgmaq6k971xiiyp58qr36i7j1nh5187ihqdib";
-       libraryHaskellDepends = [
-         base deepseq mtl process split template-haskell temporary
-       ];
-       testHaskellDepends = [
-         base bytestring-trie containers deepseq random unordered-containers
-       ];
-       homepage = "https://github.com/fpco/weigh#readme";
-       description = "Measure allocations of a Haskell functions/values";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "weigh_0_0_5" = callPackage
     ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
      , process, random, split, template-haskell, temporary
      , unordered-containers
@@ -205879,7 +202531,6 @@ self: {
        homepage = "https://github.com/fpco/weigh#readme";
        description = "Measure allocations of a Haskell functions/values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted" = callPackage
@@ -206437,23 +203088,6 @@ self: {
      }) {};
 
   "withdependencies" = callPackage
-    ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
-     , profunctors
-     }:
-     mkDerivation {
-       pname = "withdependencies";
-       version = "0.2.4";
-       sha256 = "0zr6zqkhflgynfhsc6wqly35psxw97nrna7pmc2141p5zk4dsgm1";
-       libraryHaskellDepends = [
-         base conduit containers mtl profunctors
-       ];
-       testHaskellDepends = [ base conduit hspec HUnit mtl ];
-       homepage = "https://github.com/bartavelle/withdependencies";
-       description = "Run computations that depend on one or more elements in a stream";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "withdependencies_0_2_4_1" = callPackage
     ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
      , profunctors
      }:
@@ -206468,7 +203102,6 @@ self: {
        homepage = "https://github.com/bartavelle/withdependencies";
        description = "Run computations that depend on one or more elements in a stream";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "witherable" = callPackage
@@ -206850,19 +203483,6 @@ self: {
      }) {};
 
   "word8" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec }:
-     mkDerivation {
-       pname = "word8";
-       version = "0.1.2";
-       sha256 = "1pbn8ra3qhwvw07p375cdmp7jzlg07hgdcr4cpscz3h7b9sy7fiw";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
-       description = "Word8 library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "word8_0_1_3" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec }:
      mkDerivation {
        pname = "word8";
@@ -206873,7 +203493,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Word8 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wordchoice" = callPackage
@@ -206883,8 +203502,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordchoice";
-       version = "0.1.1.0";
-       sha256 = "1san5jgb2nc0shjk38jxgnqdj0mq248gqsn9zc1ldhai1qqy490h";
+       version = "0.1.1.1";
+       sha256 = "1n1frb1c3fv808sb5w7j8gv86pva7fryq6f3j2c7z1p32v9xcnza";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -207177,44 +203796,45 @@ self: {
 
   "wrecker" = callPackage
     ({ mkDerivation, aeson, aeson-qq, ansi-terminal, ansigraph, array
-     , base, base64-bytestring, blaze-builder, bytestring
-     , case-insensitive, clock, clock-extras, connection, containers
-     , cookie, cryptonite, data-default, data-default-class, deepseq
-     , exceptions, filepath, hspec, hspec-discover, http-client
-     , http-types, immortal, lens, markdown-unlit, memory, mime-types
-     , network, network-uri, next-ref, optparse-applicative, random
-     , scotty, statistics, stm, stm-chans, streaming-commons, tabular
-     , text, threads, threads-extras, time, tls, transformers
-     , unagi-chan, unix, unordered-containers, vector, vty, wai, warp
-     , wreq
+     , authenticate-oauth, base, base64-bytestring, blaze-builder
+     , bytestring, case-insensitive, clock, clock-extras, connection
+     , containers, cookie, cryptonite, data-default, data-default-class
+     , deepseq, exceptions, filepath, hspec, hspec-discover, http-client
+     , http-client-tls, http-types, immortal, lens, markdown-unlit
+     , memory, mime-types, network, network-uri, next-ref
+     , optparse-applicative, random, scotty, statistics, stm, stm-chans
+     , streaming-commons, tabular, tdigest, text, threads
+     , threads-extras, time, tls, transformers, unagi-chan, unix
+     , unordered-containers, vector, vty, wai, warp, wreq
      }:
      mkDerivation {
        pname = "wrecker";
-       version = "0.1.3.3";
-       sha256 = "1bg4f0i74r82a21dv13ir3j05czkld4lcrvz4ib55lb5jsngqsdy";
+       version = "1.0.0.2";
+       sha256 = "0ydmwxixgxryiq4nf4lxds30zmx4hhhm1w6fyk4h1hva01vrybr8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal ansigraph array base base64-bytestring
-         blaze-builder bytestring case-insensitive clock clock-extras
-         connection containers cookie cryptonite data-default
+         aeson ansi-terminal ansigraph array authenticate-oauth base
+         base64-bytestring blaze-builder bytestring case-insensitive clock
+         clock-extras connection containers cookie cryptonite data-default
          data-default-class deepseq exceptions filepath http-client
-         http-types immortal memory mime-types network network-uri next-ref
-         optparse-applicative random statistics stm stm-chans
-         streaming-commons tabular text threads threads-extras time tls
-         transformers unagi-chan unix unordered-containers vector vty wreq
+         http-client-tls http-types immortal memory mime-types network
+         network-uri next-ref optparse-applicative random statistics stm
+         stm-chans streaming-commons tabular tdigest text threads
+         threads-extras time tls transformers unagi-chan unix
+         unordered-containers vector vty wreq
        ];
        executableHaskellDepends = [
-         aeson aeson-qq base bytestring connection http-client immortal lens
-         markdown-unlit network next-ref optparse-applicative scotty text
-         transformers wai warp wreq
+         aeson aeson-qq base bytestring connection http-client
+         http-client-tls immortal lens markdown-unlit network next-ref
+         optparse-applicative scotty text transformers wai warp wreq
        ];
        testHaskellDepends = [
          aeson aeson-qq base bytestring connection hspec hspec-discover
          http-client immortal markdown-unlit network next-ref scotty text
          transformers unordered-containers wai warp wreq
        ];
-       homepage = "https://github.com/skedgeme/wrecker#readme";
+       homepage = "https://github.com/lorenzo/wrecker#readme";
        description = "An HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207926,30 +204546,6 @@ self: {
      }) {inherit (pkgs.xorg) libXi;};
 
   "x509" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
-     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
-     , tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "x509";
-       version = "1.7.1";
-       sha256 = "0rz4z1gna5pqhvicsvfgvf7lk2f924hqvkzjapq4727gq6q6crgr";
-       revision = "1";
-       editedCabalFile = "0hmq9gb6c2cid7kpblxax631mcqxj3p2j8br4n1fqn1jdp832y8v";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-parse asn1-types base bytestring containers
-         cryptonite hourglass memory mtl pem
-       ];
-       testHaskellDepends = [
-         asn1-types base bytestring cryptonite hourglass mtl tasty
-         tasty-quickcheck
-       ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
-       description = "X509 reader and writer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "x509_1_7_2" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
      , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
      , tasty, tasty-quickcheck
@@ -207971,27 +204567,9 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X509 reader and writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-store" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
-     , containers, cryptonite, directory, filepath, mtl, pem, x509
-     }:
-     mkDerivation {
-       pname = "x509-store";
-       version = "1.6.3";
-       sha256 = "09adqiwhl85f2kj77v08dgqzizs4cf0ks01q5q793c39wfacy2fp";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-types base bytestring containers cryptonite
-         directory filepath mtl pem x509
-       ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
-       description = "X.509 collection accessing and storing methods";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "x509-store_1_6_5" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, directory, filepath, mtl, pem, tasty
      , tasty-hunit, x509
@@ -208008,27 +204586,9 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 collection accessing and storing methods";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-system" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pem, process, x509, x509-store
-     }:
-     mkDerivation {
-       pname = "x509-system";
-       version = "1.6.5";
-       sha256 = "0vrw8a63lh8d5nr4qc9ch97ng1r54n2ppnh7g1cnhrgnkbgkp1fa";
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath mtl pem process x509
-         x509-store
-       ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
-       description = "Handle per-operating-system X.509 accessors and storage";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "x509-system_1_6_6" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pem, process, x509, x509-store
      }:
@@ -208043,7 +204603,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Handle per-operating-system X.509 accessors and storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-util" = callPackage
@@ -208068,29 +204627,6 @@ self: {
      }) {};
 
   "x509-validation" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
-     , bytestring, containers, cryptonite, data-default-class, hourglass
-     , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
-     }:
-     mkDerivation {
-       pname = "x509-validation";
-       version = "1.6.8";
-       sha256 = "19ym8lj5r36f1fiq4x1f2pwxv4jplb3pwzy6hgfzva5s1vvyhj3s";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-types base byteable bytestring containers
-         cryptonite data-default-class hourglass memory mtl pem x509
-         x509-store
-       ];
-       testHaskellDepends = [
-         asn1-encoding asn1-types base bytestring cryptonite
-         data-default-class hourglass tasty tasty-hunit x509 x509-store
-       ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
-       description = "X.509 Certificate and CRL validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "x509-validation_1_6_9" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
      , bytestring, containers, cryptonite, data-default-class, hourglass
      , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
@@ -208113,7 +204649,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 Certificate and CRL validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x86-64bit" = callPackage
@@ -209351,20 +205886,20 @@ self: {
 
   "xmlhtml" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
-     , bytestring, containers, directory, HUnit, parsec, test-framework
-     , test-framework-hunit, text, unordered-containers
+     , bytestring, bytestring-builder, containers, directory, hspec
+     , HUnit, parsec, text, unordered-containers
      }:
      mkDerivation {
        pname = "xmlhtml";
-       version = "0.2.4";
-       sha256 = "172kwkgpghmda42dj5ppfbdj2m5kh692rlim2hy2x00hzrs06440";
+       version = "0.2.5";
+       sha256 = "0760gankqpb9ljh5plj8kzfpixh4lq02p8d4h1j0bb6vhxg107df";
        libraryHaskellDepends = [
-         base blaze-builder blaze-html blaze-markup bytestring containers
-         parsec text unordered-containers
+         base blaze-builder blaze-html blaze-markup bytestring
+         bytestring-builder containers parsec text unordered-containers
        ];
        testHaskellDepends = [
-         base blaze-builder blaze-html blaze-markup bytestring directory
-         HUnit test-framework test-framework-hunit text
+         base blaze-builder blaze-html blaze-markup bytestring
+         bytestring-builder directory hspec HUnit text
        ];
        homepage = "https://github.com/snapframework/xmlhtml";
        description = "XML parser and renderer with HTML 5 quirks mode";
@@ -209644,17 +206179,18 @@ self: {
      }) {};
 
   "xmonad-vanessa" = callPackage
-    ({ mkDerivation, base, containers, hspec, process, transformers
-     , X11, xmonad, xmonad-contrib
+    ({ mkDerivation, base, composition, containers, hspec, process
+     , transformers, X11, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.1.2";
-       sha256 = "065kcsr7s114sw8g8hdl2i5w0543r9f9ypirvh3bn38x2lv4f9ng";
+       version = "0.1.1.4";
+       sha256 = "1qbapbb72qa78n174x8y9q2zzb1g1bw6dgg260hxxzc7v9kb88xm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers process transformers X11 xmonad xmonad-contrib
+         base composition containers process transformers X11 xmonad
+         xmonad-contrib
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec xmonad ];
@@ -210513,21 +207049,20 @@ self: {
      }) {};
 
   "yarn-lock" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, megaparsec
-     , protolude, tasty, tasty-hunit, tasty-th, text
+    ({ mkDerivation, ansi-wl-pprint, base, containers, either
+     , megaparsec, neat-interpolation, protolude, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text
      }:
      mkDerivation {
        pname = "yarn-lock";
-       version = "0.2.0";
-       sha256 = "0jily4hrxbj487450amx6nayxpcm0giwrv0zn3mld906lqr2f990";
-       revision = "1";
-       editedCabalFile = "1ji64dab6wf59l9yi1czm81xgnx86qgvcawnxwa83wp1fa3flics";
+       version = "0.3.1";
+       sha256 = "0plsv7qhl43y85dwzybbik2fx1bm23lz8m5l1fyhd363v9f2df7x";
        libraryHaskellDepends = [
-         base containers megaparsec protolude text
+         base containers either megaparsec protolude text
        ];
        testHaskellDepends = [
-         ansi-wl-pprint base containers megaparsec protolude tasty
-         tasty-hunit tasty-th text
+         ansi-wl-pprint base containers either megaparsec neat-interpolation
+         protolude tasty tasty-hunit tasty-quickcheck tasty-th text
        ];
        homepage = "https://github.com/Profpatsch/yarn-lock#readme";
        description = "Represent and parse yarn.lock files";
@@ -211183,40 +207718,6 @@ self: {
      }) {};
 
   "yesod-bin" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
-     , containers, data-default-class, deepseq, directory, file-embed
-     , filepath, fsnotify, http-client, http-client-tls
-     , http-reverse-proxy, http-types, lifted-base, network
-     , optparse-applicative, parsec, process, project-template
-     , resourcet, safe-exceptions, say, shakespeare, split, stm
-     , streaming-commons, tar, template-haskell, text, time
-     , transformers, transformers-compat, typed-process, unix-compat
-     , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "yesod-bin";
-       version = "1.5.2.3";
-       sha256 = "1xi3s79j14sa7wav8i1vpp14ry2jgkrbvich13yccd3qkmbw7azf";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         async attoparsec base base64-bytestring blaze-builder bytestring
-         Cabal conduit conduit-extra containers data-default-class deepseq
-         directory file-embed filepath fsnotify http-client http-client-tls
-         http-reverse-proxy http-types lifted-base network
-         optparse-applicative parsec process project-template resourcet
-         safe-exceptions say shakespeare split stm streaming-commons tar
-         template-haskell text time transformers transformers-compat
-         typed-process unix-compat unordered-containers wai wai-extra warp
-         warp-tls yaml zlib
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "The yesod helper executable";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-bin_1_5_2_5" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -211248,7 +207749,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -211349,49 +207849,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
-     , cereal, clientsession, conduit, conduit-extra, containers, cookie
-     , criterion, data-default, deepseq, deepseq-generics, directory
-     , exceptions, fast-logger, hspec, hspec-expectations, http-types
-     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
-     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
-     , random, resourcet, safe, semigroups, shakespeare
-     , streaming-commons, template-haskell, text, time, transformers
-     , transformers-base, unix-compat, unordered-containers, vector, wai
-     , wai-extra, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.4.35.1";
-       sha256 = "0m91b4w3yixlsc9y07n0s8k4nzsqk8m8fz2gpxk1rhv6pp1k25cx";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-builder blaze-html blaze-markup
-         byteable bytestring case-insensitive cereal clientsession conduit
-         conduit-extra containers cookie data-default deepseq
-         deepseq-generics directory exceptions fast-logger http-types
-         lifted-base monad-control monad-logger mtl mwc-random old-locale
-         parsec path-pieces primitive random resourcet safe semigroups
-         shakespeare template-haskell text time transformers
-         transformers-base unix-compat unordered-containers vector wai
-         wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring clientsession conduit
-         conduit-extra containers cookie hspec hspec-expectations http-types
-         HUnit lifted-base mwc-random network path-pieces QuickCheck random
-         resourcet shakespeare streaming-commons template-haskell text
-         transformers wai wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion shakespeare text transformers
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_4_36" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -211432,7 +207889,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-crud" = callPackage
@@ -211697,18 +208153,6 @@ self: {
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
-    ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
-     mkDerivation {
-       pname = "yesod-form-bootstrap4";
-       version = "0.1.0.0";
-       sha256 = "0n8pqa94v3ffx0225zv9mqlknwcwicdwrc0l3vj7iw4dggn1qy81";
-       libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ];
-       homepage = "https://github.com/ncaq/yesod-form-bootstrap4.git#readme";
-       description = "renderBootstrap4";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form-bootstrap4_0_1_0_1" = callPackage
     ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
      mkDerivation {
        pname = "yesod-form-bootstrap4";
@@ -211718,7 +208162,6 @@ self: {
        homepage = "https://github.com/ncaq/yesod-form-bootstrap4.git#readme";
        description = "renderBootstrap4";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-json" = callPackage
@@ -211738,23 +208181,6 @@ self: {
      }) {};
 
   "yesod-form-richtext" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text
-     , xss-sanitize, yesod-core, yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-form-richtext";
-       version = "0.1.0.1";
-       sha256 = "0bmngw13lgacni8xn5jwpnf77qf0nmg3cqhb0mshp7cccky7cg7y";
-       libraryHaskellDepends = [
-         base blaze-builder blaze-html shakespeare text xss-sanitize
-         yesod-core yesod-form
-       ];
-       homepage = "http://github.com/geraldus/yesod-form-richtext#readme";
-       description = "Various rich-text WYSIWYG editors for Yesod forms";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form-richtext_0_1_0_2" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text
      , xss-sanitize, yesod-core, yesod-form
      }:
@@ -211769,7 +208195,6 @@ self: {
        homepage = "http://github.com/geraldus/yesod-form-richtext#readme";
        description = "Various rich-text WYSIWYG editors for Yesod forms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-gitrepo" = callPackage
@@ -212844,49 +209269,6 @@ self: {
      }) {};
 
   "yi-core" = callPackage
-    ({ mkDerivation, array, attoparsec, base, binary, bytestring
-     , containers, criterion, data-default, deepseq, directory, dlist
-     , dynamic-state, dyre, filepath, hashable, ListLike
-     , microlens-platform, mtl, old-locale, oo-prototypes, parsec
-     , pointedlist, process, process-extras, quickcheck-text, semigroups
-     , split, tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time
-     , transformers-base, unix, unix-compat, unordered-containers
-     , xdg-basedir, yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-core";
-       version = "0.14.0";
-       sha256 = "176frh7q1bd4sa1fx2dgip70a4vyla09qw5n2v58qwhpfq14zwi0";
-       libraryHaskellDepends = [
-         array attoparsec base binary bytestring containers data-default
-         directory dlist dynamic-state dyre filepath hashable ListLike
-         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
-         process process-extras semigroups split text text-icu time
-         transformers-base unix unix-compat unordered-containers xdg-basedir
-         yi-language yi-rope
-       ];
-       testHaskellDepends = [
-         array attoparsec base binary bytestring containers data-default
-         directory dlist dynamic-state filepath hashable ListLike
-         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
-         process process-extras quickcheck-text split tasty tasty-hunit
-         tasty-quickcheck text text-icu time transformers-base unix
-         unix-compat unordered-containers xdg-basedir yi-language yi-rope
-       ];
-       benchmarkHaskellDepends = [
-         array attoparsec base binary bytestring containers criterion
-         data-default deepseq directory dlist dynamic-state filepath
-         hashable ListLike microlens-platform mtl old-locale oo-prototypes
-         parsec pointedlist process process-extras split text text-icu time
-         transformers-base unix unix-compat unordered-containers xdg-basedir
-         yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor core library";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-core_0_14_1" = callPackage
     ({ mkDerivation, array, attoparsec, base, binary, bytestring
      , containers, criterion, data-default, deepseq, directory, dlist
      , dynamic-state, filepath, hashable, ListLike, microlens-platform
@@ -212927,7 +209309,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor core library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-dynamic-configuration" = callPackage
@@ -212981,24 +209362,6 @@ self: {
      }) {};
 
   "yi-frontend-vty" = callPackage
-    ({ mkDerivation, base, containers, data-default, dlist
-     , microlens-platform, pointedlist, stm, text, vty, yi-core
-     , yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-frontend-vty";
-       version = "0.14.0";
-       sha256 = "0055npls7dhlx68fwnhfb7kk4nzpy8vvmlpplm3m36rlvk85gyma";
-       libraryHaskellDepends = [
-         base containers data-default dlist microlens-platform pointedlist
-         stm text vty yi-core yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Vty frontend for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-frontend-vty_0_14_1" = callPackage
     ({ mkDerivation, base, containers, data-default, dlist
      , microlens-platform, pointedlist, stm, text, vty, yi-core
      , yi-language, yi-rope
@@ -213014,28 +209377,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Vty frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-fuzzy-open" = callPackage
-    ({ mkDerivation, base, binary, containers, data-default, directory
-     , filepath, mtl, text, transformers-base, vector, yi-core
-     , yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-fuzzy-open";
-       version = "0.14.0";
-       sha256 = "0plpxc4p3wa2ak32j0s8y0z6ha5x8wgnzpgzj71bs7rkaf5bf8dd";
-       libraryHaskellDepends = [
-         base binary containers data-default directory filepath mtl text
-         transformers-base vector yi-core yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Fuzzy open plugin for yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-fuzzy-open_0_14_1" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
      , yi-language, yi-rope
@@ -213051,7 +209395,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-gtk" = callPackage
@@ -213067,23 +209410,6 @@ self: {
      }) {};
 
   "yi-ireader" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, data-default
-     , microlens-platform, text, yi-core, yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-ireader";
-       version = "0.14.0";
-       sha256 = "0lqxa4m4agha9fd9lwf8xf2cxpj8mh2q93rkjchlksrjav3khz6q";
-       libraryHaskellDepends = [
-         base binary bytestring containers data-default microlens-platform
-         text yi-core yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor incremental reader";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-ireader_0_14_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, data-default
      , microlens-platform, text, yi-core, yi-language, yi-rope
      }:
@@ -213098,26 +209424,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor incremental reader";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-cua" = callPackage
-    ({ mkDerivation, base, microlens-platform, text, yi-core
-     , yi-keymap-emacs, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-keymap-cua";
-       version = "0.14.0";
-       sha256 = "0l7r8vyigmcmp9biskf13qnn8in16s6pliwrc12lxa5ikym7r59r";
-       libraryHaskellDepends = [
-         base microlens-platform text yi-core yi-keymap-emacs yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Cua keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-keymap-cua_0_14_1" = callPackage
     ({ mkDerivation, base, microlens-platform, text, yi-core
      , yi-keymap-emacs, yi-rope
      }:
@@ -213131,29 +209440,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Cua keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-emacs" = callPackage
-    ({ mkDerivation, base, containers, filepath, Hclip
-     , microlens-platform, mtl, oo-prototypes, semigroups, text
-     , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-keymap-emacs";
-       version = "0.14.0";
-       sha256 = "0mlizcb2aj10kfmcavdzbdli0sxq0id02ihnpr23ix4dk3wgznqn";
-       libraryHaskellDepends = [
-         base containers filepath Hclip microlens-platform mtl oo-prototypes
-         semigroups text transformers-base yi-core yi-language yi-misc-modes
-         yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Emacs keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-keymap-emacs_0_14_1" = callPackage
     ({ mkDerivation, base, containers, filepath, Hclip
      , microlens-platform, mtl, oo-prototypes, semigroups, text
      , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope
@@ -213170,39 +209459,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Emacs keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-keymap-vim" = callPackage
-    ({ mkDerivation, attoparsec, base, binary, containers, data-default
-     , directory, filepath, Hclip, microlens-platform, mtl
-     , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers-base
-     , unordered-containers, yi-core, yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-keymap-vim";
-       version = "0.14.0";
-       sha256 = "1hy36q69a0yhkg5v0n2f2gkmbf85a9y6k5b38gdg18kdnil974q4";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base binary containers data-default directory filepath
-         Hclip microlens-platform mtl oo-prototypes pointedlist safe
-         semigroups text transformers-base unordered-containers yi-core
-         yi-language yi-rope
-       ];
-       testHaskellDepends = [
-         attoparsec base binary containers data-default directory filepath
-         Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck
-         safe semigroups tasty tasty-hunit tasty-quickcheck text
-         transformers-base unordered-containers yi-core yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Vim keymap for Yi editor";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-keymap-vim_0_14_1" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, data-default
      , directory, filepath, Hclip, microlens-platform, mtl
      , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty
@@ -213229,38 +209488,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Vim keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-language" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers
-     , data-default, hashable, microlens-platform, oo-prototypes
-     , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
-     , tasty-quickcheck, template-haskell, transformers-base
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "yi-language";
-       version = "0.14.0";
-       sha256 = "1dpiqh46b2z627ry0smq4a0ynna1m166qf0yqhlh80v67myyg9jr";
-       libraryHaskellDepends = [
-         array base binary containers data-default hashable
-         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
-         template-haskell transformers-base unordered-containers
-       ];
-       libraryToolDepends = [ alex ];
-       testHaskellDepends = [
-         array base binary containers data-default hashable
-         microlens-platform pointedlist regex-base regex-tdfa tasty
-         tasty-hspec tasty-quickcheck template-haskell transformers-base
-         unordered-containers
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Collection of language-related Yi libraries";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-language_0_14_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
      , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -213286,29 +209516,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-misc-modes" = callPackage
-    ({ mkDerivation, alex, array, base, binary, data-default, filepath
-     , microlens-platform, semigroups, text, yi-core, yi-language
-     , yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-misc-modes";
-       version = "0.14.0";
-       sha256 = "0khyy4iacp8fah1lrp6ffvn2vy5xxrgizd4mzdlb6shc7sliaifz";
-       libraryHaskellDepends = [
-         array base binary data-default filepath microlens-platform
-         semigroups text yi-core yi-language yi-rope
-       ];
-       libraryToolDepends = [ alex ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor miscellaneous modes";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-misc-modes_0_14_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, semigroups, text, yi-core, yi-language
      , yi-rope
@@ -213325,28 +209535,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor miscellaneous modes";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-mode-haskell" = callPackage
-    ({ mkDerivation, alex, array, base, binary, data-default, filepath
-     , microlens-platform, text, yi-core, yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-mode-haskell";
-       version = "0.14.0";
-       sha256 = "0yqwshj1hms1q2r78fi0hsqyrazy5cyv0znxcjpmx2f6mnifjxd9";
-       libraryHaskellDepends = [
-         array base binary data-default filepath microlens-platform text
-         yi-core yi-language yi-rope
-       ];
-       libraryToolDepends = [ alex ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor haskell mode";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-mode-haskell_0_14_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, text, yi-core, yi-language, yi-rope
      }:
@@ -213362,29 +209553,9 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor haskell mode";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-mode-javascript" = callPackage
-    ({ mkDerivation, alex, array, base, binary, data-default, dlist
-     , filepath, microlens-platform, mtl, text, yi-core, yi-language
-     , yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-mode-javascript";
-       version = "0.14.0";
-       sha256 = "00ap00h9lz0b2r75m0dn741aasi18455srwq6mcpbbq6j4v3jzfz";
-       libraryHaskellDepends = [
-         array base binary data-default dlist filepath microlens-platform
-         mtl text yi-core yi-language yi-rope
-       ];
-       libraryToolDepends = [ alex ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Yi editor javascript mode";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-mode-javascript_0_14_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, dlist
      , filepath, microlens-platform, mtl, text, yi-core, yi-language
      , yi-rope
@@ -213401,7 +209572,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor javascript mode";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-monokai" = callPackage
@@ -213439,27 +209609,6 @@ self: {
      }) {};
 
   "yi-snippet" = callPackage
-    ({ mkDerivation, base, binary, containers, data-default, free
-     , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
-     , yi-core, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-snippet";
-       version = "0.14.0";
-       sha256 = "152g3bsy50viydnhhx4b7vyyaq4frw43cbb9r3pm56wmnk4ixn7k";
-       libraryHaskellDepends = [
-         base binary containers data-default free microlens-platform mtl
-         text vector yi-core yi-rope
-       ];
-       testHaskellDepends = [
-         base containers tasty-hunit tasty-th yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi#readme";
-       description = "Snippet support for yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-snippet_0_14_1" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, free
      , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
      , yi-core, yi-rope
@@ -213478,7 +209627,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Snippet support for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-solarized" = callPackage
@@ -213703,20 +209851,6 @@ self: {
      }) {};
 
   "youtube" = callPackage
-    ({ mkDerivation, base, bytestring, process, utility-ht }:
-     mkDerivation {
-       pname = "youtube";
-       version = "0.2.1";
-       sha256 = "1lb50xpz032nrxbcfihj08cwbw2cn22sf8f4xlpfqnp36jvn1rvx";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [ base bytestring process utility-ht ];
-       description = "Upload video to YouTube via YouTube API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "youtube_0_2_1_1" = callPackage
     ({ mkDerivation, base, bytestring, process, utility-ht }:
      mkDerivation {
        pname = "youtube";
@@ -213728,7 +209862,6 @@ self: {
        executableHaskellDepends = [ base bytestring process utility-ht ];
        description = "Upload video to YouTube via YouTube API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yql" = callPackage
@@ -214288,8 +210421,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-stack";
-       version = "0.0.0.4";
-       sha256 = "0vgklhbq846xh020n4mp4j96zbpc2asnsn1zk716pfnkgvk9syqn";
+       version = "0.0.0.5";
+       sha256 = "01j6gm276xwlclkanai1hb93q83ml62njw8nsnnjk313jwds6151";
        libraryHaskellDepends = [
          base Cabal directory filepath path path-io process safe zifter
        ];
@@ -214400,6 +210533,8 @@ self: {
        pname = "zip-archive";
        version = "0.3.1.1";
        sha256 = "09c3y13r77shyamibr298i4l0rp31i41w3rg1ksnrl3gkrj8x1ly";
+       revision = "1";
+       editedCabalFile = "0n8f1075gz5q2k9mqzadca6is0fi1bgi91sfw1yq2kqakkbrbkqy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -214516,23 +210651,6 @@ self: {
      }) {};
 
   "zippers" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest
-     , lens, profunctors, semigroupoids
-     }:
-     mkDerivation {
-       pname = "zippers";
-       version = "0.2.3";
-       sha256 = "0pgb33nr1cc6krvzl4wks9mhy5ikbgji8546fhmydqxw4ywlr9qv";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base lens profunctors semigroupoids ];
-       testHaskellDepends = [ base doctest ];
-       benchmarkHaskellDepends = [ base criterion lens ];
-       homepage = "http://github.com/ekmett/zippers/";
-       description = "Traversal based zippers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "zippers_0_2_4" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest
      , lens, profunctors, semigroupoids
      }:
@@ -214549,7 +210667,6 @@ self: {
        homepage = "http://github.com/ekmett/zippers/";
        description = "Traversal based zippers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zippo" = callPackage

From 33df3be87b5895c5670fc01b93140ba0fbec7847 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 9 Aug 2017 14:35:31 +0000
Subject: [PATCH 2197/3246] perl-HTML-Parser: 3.71 -> 3.72

---
 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 4ecaf3e5246..a92661e64dd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6492,11 +6492,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  HTMLParser = buildPerlPackage {
-    name = "HTML-Parser-3.71";
+  HTMLParser = buildPerlPackage rec {
+    name = "HTML-Parser-3.72";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.71.tar.gz;
-      sha256 = "00nqzdgl7c3jilx7mil19k5jwcw3as14pvkjgxi97zyk94vqp4dy";
+      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
+      sha256 = "12v05ywlnsi9lc17z32k9jxx3sj1viy7y1wpl7n4az76v7hwfa7c";
     };
     propagatedBuildInputs = [ HTMLTagset ];
     meta = {

From fc5e6ce9ce796300f9657abeae97637fc70d1574 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 9 Aug 2017 14:35:50 +0000
Subject: [PATCH 2198/3246] perl-CGI: 4.35 -> 4.36

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a92661e64dd..0e54b09b7f1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1609,10 +1609,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CGI = buildPerlPackage rec {
-    name = "CGI-4.35";
+    name = "CGI-4.36";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
-      sha256 = "07gwnlc7vq58fjwmfsrv0hfyirqqdrpjhf89caq34rjrkz2wsd0b";
+      sha256 = "142la7jagpni5z7m4s9h9v5vpg0pisc3y3z8kdzqc7j6yba89zpy";
     };
     buildInputs = [ TestDeep TestWarn ];
     propagatedBuildInputs = [ HTMLParser self."if" ];

From 1ec12e2016fc1d8790330e8b5bd694d8bd910a56 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Aug 2017 21:49:26 +0200
Subject: [PATCH 2199/3246] paper over more dependency issues

---
 .../quicklisp-to-nix-overrides.nix            | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index a760e0cb684..478252eb76c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -54,6 +54,25 @@ in
       sha256 = "0pa86bf3jrysnmhasbc0lm6cid9xzril4jsg02g3gziav1xw5x2m";
     };
   };
+  iolib_slash_syscalls = x: rec {
+    propagatedBuildInputs = (x.propagatedBuildInputs or [])
+     ++ (with pkgs; [libfixposix gcc])
+     ++ (with qlnp; [
+       alexandria split-sequence cffi bordeaux-threads idna swap-bytes
+     ])
+     ;
+    testSystems = ["iolib" "iolib/syscalls" "iolib/multiplex" "iolib/streams"
+      "iolib/zstreams" "iolib/sockets" "iolib/trivial-sockets"
+      "iolib/pathnames" "iolib/os"];
+
+    version = "0.8.3";
+    src = pkgs.fetchFromGitHub {
+      owner = "sionescu";
+      repo = "iolib";
+      rev = "v${version}";
+      sha256 = "0pa86bf3jrysnmhasbc0lm6cid9xzril4jsg02g3gziav1xw5x2m";
+    };
+  };
   cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
   clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
   clack-v1-compat =  addDeps (with qlnp;[

From 182c5c1fc64f9176521a3cae214038232677391d Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Thu, 17 Aug 2017 22:06:19 +0200
Subject: [PATCH 2200/3246] gnonlin: use httpS to fetch archive

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

diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
index 16882c8a57d..608be653889 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2"
+      "https://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
     sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4";

From 41bad11dde627d71c6ebab0b2738f972d01d1d43 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Thu, 17 Aug 2017 22:13:32 +0200
Subject: [PATCH 2201/3246] godot: homepage link with httpS

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 62bf6557f68..d9171ca09f2 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage    = "http://godotengine.org";
+    homepage    = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux;

From 737523ea04da2116f3f9ce9fb7610d89a685699f Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Thu, 17 Aug 2017 22:38:51 +0200
Subject: [PATCH 2202/3246] gstreamer: fetch archive with httpS instead of http

---
 .../libraries/gstreamer/legacy/gstreamer/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
index 304d02087b4..c20d32e810c 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org;
+    homepage = https://gstreamer.freedesktop.org;
 
     description = "Library for constructing graphs of media-handling components";
 

From d491eebffdb387fa80918e06f8e8bc4be2300687 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 17 Aug 2017 22:43:15 +0200
Subject: [PATCH 2203/3246] haskell-packages: fix evaluation

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 77e57ed7324..36f5f28f2f8 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -452,7 +452,7 @@ self: super: builtins.intersectAttrs super {
   haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
 
   # Requires gi-javascriptcore API version 4
-  gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_12; };
+  gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_14; };
 
   # requires valid, writeable $HOME
   hatex-guide = overrideCabal super.hatex-guide (drv: {

From 10241b3c5981d434cea1ad3f6360f84316eff466 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:12:51 -0700
Subject: [PATCH 2204/3246] release.nix: disable private apple sdks in release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

we shouldn’t let it get into the release. This includes:

- darwin.cf-private
- darwin.osx_private_sdk
- xcode
---
 pkgs/top-level/release.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 4a946a93003..86f98d7662e 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -126,6 +126,12 @@ let
         pandas = unix;
         scikitlearn = unix;
       };
+
+      darwin = packagePlatforms pkgs.darwin // {
+        cf-private = {};
+        osx_private_sdk = {};
+        xcode = {};
+      };
     } ));
 
 in jobs

From 1c4171c5cabae57ae14eb7d11fe52fc0a3dbf76c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:51:32 -0700
Subject: [PATCH 2205/3246] cryptop: https

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

diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix
index a37ff5639d9..0136ab18cea 100644
--- a/pkgs/applications/altcoins/cryptop/default.nix
+++ b/pkgs/applications/altcoins/cryptop/default.nix
@@ -16,7 +16,7 @@ python2.pkgs.buildPythonApplication rec {
   doCheck = false;
 
   meta = {
-    homepage = http://github.com/huwwp/cryptop;
+    homepage = https://github.com/huwwp/cryptop;
     description = "Command line Cryptocurrency Portfolio";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ bhipple ];

From 20b9c32856f78edd1ec06d28f0d9297b440e68bf Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:51:53 -0700
Subject: [PATCH 2206/3246] amarok: use https for homepage

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

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 3b675cd9020..022e33991f9 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     repositories.git = git://anongit.kde.org/amarok.git;
     description = "Popular music player for KDE";
     license = "GPL";
-    homepage = http://amarok.kde.org;
+    homepage = https://amarok.kde.org;
     inherit (kdelibs4.meta) platforms;
   };
 }

From 99c868c0103611c4286b8a612ec793b2d9d66885 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:53:40 -0700
Subject: [PATCH 2207/3246] use https://github.com for all homepages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GitHub does a redirect to https:// when you use http://

repology complains with:

“Homepage link "https://github.com/…" is dead (HTTP error 404) for more than a month.”

This will fix some of them (not all though)
---
 pkgs/applications/audio/ponymix/default.nix    |  2 +-
 .../editors/emacs-modes/erlang/default.nix     |  2 +-
 .../editors/emacs-modes/haskell/default.nix    |  2 +-
 pkgs/applications/editors/vis/default.nix      |  2 +-
 pkgs/applications/graphics/pencil/default.nix  |  2 +-
 pkgs/applications/misc/milu/default.nix        |  2 +-
 pkgs/applications/science/logic/z3/default.nix |  2 +-
 .../science/logic/z3_opt/default.nix           |  2 +-
 .../window-managers/sxhkd/default.nix          |  2 +-
 .../window-managers/trayer/default.nix         |  2 +-
 .../xmonad-log-applet/default.nix              |  2 +-
 pkgs/development/beam-modules/hex-packages.nix | 18 +++++++++---------
 pkgs/development/compilers/halvm/2.4.0.nix     |  2 +-
 13 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix
index ff688f7b3dc..5cfbb7bf5a4 100644
--- a/pkgs/applications/audio/ponymix/default.nix
+++ b/pkgs/applications/audio/ponymix/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "CLI PulseAudio Volume Control";
-    homepage = http://github.com/falconindy/ponymix;
+    homepage = https://github.com/falconindy/ponymix;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ericsagnes ];
diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix
index 496c79543a9..463d7fc7e15 100644
--- a/pkgs/applications/editors/emacs-modes/erlang/default.nix
+++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   # emacs highlighting */
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/erlang/otp;
+    homepage = https://github.com/erlang/otp;
     description = "Erlang mode for Emacs";
     license = licenses.asl20;
     platforms = platforms.unix;
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 30917a41bd4..6f998300290 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   installCheckTarget = "check";
 
   meta = {
-    homepage = http://github.com/haskell/haskell-mode;
+    homepage = https://github.com/haskell/haskell-mode;
     description = "Haskell mode for Emacs";
 
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 291c7b1b412..eef1746ff38 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A vim like editor";
-    homepage = http://github.com/martanne/vis;
+    homepage = https://github.com/martanne/vis;
     license = licenses.isc;
     maintainers = with maintainers; [ vrthra ramkromberg ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index 5b1f79a6c4f..f7175f9d2b8 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GUI prototyping/mockup tool";
-    homepage = http://github.com/prikhi/pencil;
+    homepage = https://github.com/prikhi/pencil;
     license = licenses.gpl2; # Commercial license is also available
     maintainers = with maintainers; [ bjornfor prikhi ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index b8ccbe77cf5..9f98376a51b 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Higher Order Mutation Testing Tool for C and C++ programs";
-    homepage = http://github.com/yuejia/Milu;
+    homepage = https://github.com/yuejia/Milu;
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.vrthra ];
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 9683579af47..a6b89f90ef6 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "A high-performance theorem prover and SMT solver";
-    homepage    = "http://github.com/Z3Prover/z3";
+    homepage    = "https://github.com/Z3Prover/z3";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
diff --git a/pkgs/applications/science/logic/z3_opt/default.nix b/pkgs/applications/science/logic/z3_opt/default.nix
index 1b989097758..d3d63795d69 100644
--- a/pkgs/applications/science/logic/z3_opt/default.nix
+++ b/pkgs/applications/science/logic/z3_opt/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "A high-performance theorem prover and SMT solver, optimization edition";
-    homepage    = "http://github.com/Z3Prover/z3";
+    homepage    = "https://github.com/Z3Prover/z3";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice sheganinans ];
diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix
index b78b15f7914..41a50668f19 100644
--- a/pkgs/applications/window-managers/sxhkd/default.nix
+++ b/pkgs/applications/window-managers/sxhkd/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Simple X hotkey daemon";
-    homepage = http://github.com/baskerville/sxhkd/;
+    homepage = https://github.com/baskerville/sxhkd/;
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index 146bd7e1438..79c73d80789 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/sargon/trayer-srg;
+    homepage = https://github.com/sargon/trayer-srg;
     license = licenses.mit;
     description = "A lightweight GTK2-based systray for UNIX desktop";
     platforms = platforms.linux;
diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix
index f27e7a953dd..906ba0efda2 100644
--- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   patches = [ ./fix-paths.patch ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/alexkay/xmonad-log-applet;
+    homepage = https://github.com/alexkay/xmonad-log-applet;
     license = licenses.bsd3;
     description = "An applet that will display XMonad log information (${desktopSupport} version)";
     platforms = platforms.linux;
diff --git a/pkgs/development/beam-modules/hex-packages.nix b/pkgs/development/beam-modules/hex-packages.nix
index b77d5e6c589..d8d55c01120 100644
--- a/pkgs/development/beam-modules/hex-packages.nix
+++ b/pkgs/development/beam-modules/hex-packages.nix
@@ -1182,7 +1182,7 @@ let
                                 systems to query, augment and transform data
                                 according to Elixir matching rules. '';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/awetzel/adap";
+              homepage = "https://github.com/awetzel/adap";
             };
           } // packageOverrides)
       ) {};
@@ -6660,7 +6660,7 @@ let
                                 requests and responds to preflight requests
                                 (OPTIONS)'';
               license = stdenv.lib.licenses.asl20;
-              homepage = "http://github.com/mschae/cors_plug";
+              homepage = "https://github.com/mschae/cors_plug";
             };
           } // packageOverrides)
       ) {};
@@ -9498,7 +9498,7 @@ let
                                 H-metric are abstracted away - you provide them
                                 as functions.'';
               license = stdenv.lib.licenses.bsd3;
-              homepage = "http://github.com/herenowcoder/eastar";
+              homepage = "https://github.com/herenowcoder/eastar";
             };
           } // packageOverrides)
       ) {};
@@ -12266,7 +12266,7 @@ let
                                 response. This project is a rewrite for Elixir
                                 and Plug of basho webmachine.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/awetzel/ewebmachine";
+              homepage = "https://github.com/awetzel/ewebmachine";
             };
           } // packageOverrides)
       ) {};
@@ -22613,7 +22613,7 @@ let
             meta = {
               description = ''JWT decoding library for Elixir'';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/mschae/jwtex";
+              homepage = "https://github.com/mschae/jwtex";
             };
           } // packageOverrides)
       ) {};
@@ -30269,7 +30269,7 @@ let
                                 according to rfc7239 and fill `conn.remote_ip`
                                 with the root client ip.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/awetzel/plug_forwarded_peer";
+              homepage = "https://github.com/awetzel/plug_forwarded_peer";
             };
           } // packageOverrides)
       ) {};
@@ -30472,7 +30472,7 @@ let
             meta = {
               description = ''An elixir plug that serves HTTP range requests'';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/TheSquad/plug_range";
+              homepage = "https://github.com/TheSquad/plug_range";
             };
           } // packageOverrides)
       ) {};
@@ -36106,7 +36106,7 @@ let
                                 use a rails-like trailing format:
                                 http://api.dev/resources.format'';
               license = stdenv.lib.licenses.asl20;
-              homepage = "http://github.com/mschae/trailing_format_plug";
+              homepage = "https://github.com/mschae/trailing_format_plug";
             };
           } // packageOverrides)
       ) {};
@@ -38938,7 +38938,7 @@ let
             meta = {
               description = ''stream zip archives while building them'';
               license = stdenv.lib.licenses.bsd3;
-              homepage = "http://github.com/dgvncsz0f/zipflow";
+              homepage = "https://github.com/dgvncsz0f/zipflow";
             };
           } // packageOverrides)
       ) {};
diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index dd81d780838..b88ac73c7e4 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = http://github.com/GaloisInc/HaLVM;
+    homepage = https://github.com/GaloisInc/HaLVM;
     description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen";
     platforms = ["x86_64-linux"];       # other platforms don't have Xen
     maintainers = with stdenv.lib.maintainers; [ dmjio ];

From 5cfe844bd65b553c224d0b9e188b44c5da949252 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:55:43 -0700
Subject: [PATCH 2208/3246] passwordstore: use https for homepage

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

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 331a75495ed..24922db2e77 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -84,7 +84,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Stores, retrieves, generates, and synchronizes passwords securely";
-    homepage    = http://www.passwordstore.org/;
+    homepage    = https://www.passwordstore.org/;
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ lovek323 the-kenny fpletz ];
     platforms   = platforms.unix;

From 3f85411ba556816e7ed09ec7affb228baaf28e50 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:56:10 -0700
Subject: [PATCH 2209/3246] dd-agent: use https for homepage

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

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index d1171a3c835..805b0dddcac 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "Event collector for the DataDog analysis service";
-    homepage    = http://www.datadoghq.com;
+    homepage    = https://www.datadoghq.com;
     license     = stdenv.lib.licenses.bsd3;
     platforms   = stdenv.lib.platforms.all;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice domenkozar ];

From 269f057be37bab987a54e48f098e6c5ca17c3412 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:56:35 -0700
Subject: [PATCH 2210/3246] openssl: use https for homepage

---
 pkgs/development/libraries/openssl/chacha.nix  | 2 +-
 pkgs/development/libraries/openssl/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index 34721700652..86015abb981 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.openssl.org/;
+    homepage = https://www.openssl.org/;
     description = "A cryptographic library that implements the SSL and TLS protocols";
     platforms = [ "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.cstrahan ];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 394eab6c9db..5a4d23b6a39 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -96,7 +96,7 @@ let
     };
 
     meta = {
-      homepage = http://www.openssl.org/;
+      homepage = https://www.openssl.org/;
       description = "A cryptographic library that implements the SSL and TLS protocols";
       platforms = stdenv.lib.platforms.all;
       maintainers = [ stdenv.lib.maintainers.peti ];

From 351277ae7c2e0328587d0f1e092747fae930956b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:57:16 -0700
Subject: [PATCH 2211/3246] opencpn: use https for homepage

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

diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 01cebe95954..056649ad3d2 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.kragniz ];
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl2;
-    homepage = http://opencpn.org/;
+    homepage = https://opencpn.org/;
   };
 }

From 59c5f52f673a47ff2a0986335664052d49fb3ea1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:57:38 -0700
Subject: [PATCH 2212/3246] caneda: use caneda.org for homepage

---
 pkgs/applications/science/electronics/caneda/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index dc00cef8898..399815f943a 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Open source EDA software focused on easy of use and portability";
-    homepage = http://caneda.tuxfamily.org;
+    homepage = http://caneda.org;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;

From b3d8c08a55db14011c961fb88f47ce08c8002ca6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:58:03 -0700
Subject: [PATCH 2213/3246] acgtk: fix homepage url

---
 pkgs/applications/science/logic/acgtk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index 94b292d6588..bd4ccea231b 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
                  + " " + optionalString installEmacsMode "install-emacs";
 
   meta = with stdenv.lib; {
-    homepage = http://www.loria.fr/equipes/calligramme/acg;
+    homepage = http://calligramme.loria.fr/acg/;
     description = "A toolkit for developing ACG signatures and lexicon";
     license = licenses.cecill20;
     platforms = ocaml.meta.platforms or [];

From 725f7ca2ef80831e0616a4efe66bbc71202aa881 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:58:28 -0700
Subject: [PATCH 2214/3246] coreboot: use https for homepage

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

diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix
index b7bbeb158c6..d02d7860654 100644
--- a/pkgs/applications/virtualization/cbfstool/default.nix
+++ b/pkgs/applications/virtualization/cbfstool/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Management utility for CBFS formatted ROM images";
-    homepage = http://www.coreboot.org;
+    homepage = https://www.coreboot.org;
     license = licenses.gpl2;
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;

From 4005b00283978e79c5d695aa2160eadea26f5ff8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:58:43 -0700
Subject: [PATCH 2215/3246] andagii: fix homepage link

old link was broken
---
 pkgs/data/fonts/andagii/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix
index 5c708457f8d..ba0bab61eec 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -18,7 +18,7 @@ in fetchzip {
   # package; but I cannot find the original source, so use it on your
   # own risk Debian claims it is GPL - good enough for me.
   meta = with stdenv.lib; {
-    homepage = http://www.i18nguy.com/unicode/unicode-font.HTML;
+    homepage = http://www.i18nguy.com/unicode/unicode-font.html;
     description = "Unicode Plane 1 Osmanya script font";
     maintainers = with maintainers; [ raskin rycee ];
     license = "unknown";

From dea48e68b9ee7649a03fed1535483f9e148250e9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:59:09 -0700
Subject: [PATCH 2216/3246] paper-icon-theme: use https for homepage

---
 pkgs/data/icons/paper-icon-theme/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index e0ea56831b4..9e793caf9de 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Modern icon theme designed around bold colours and simple geometric shapes";
-    homepage = http://snwh.org/paper;
+    homepage = https://snwh.org/paper;
     license = with licenses; [ cc-by-sa-40 lgpl3 ];
     platforms = platforms.all;
     maintainers = with maintainers; [ romildo ];

From 3fcbc66a4b93ffb2725ba1553b3be4ad5b2a5969 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:59:26 -0700
Subject: [PATCH 2217/3246] poppler: use https for homepage

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

diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index 59f4724e1be..f0f6505cb24 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "prefix=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = http://poppler.freedesktop.org/;
+    homepage = https://poppler.freedesktop.org/;
     description = "Encoding files for Poppler, a PDF rendering library";
     platforms = platforms.all;
     license = licenses.free; # more free licenses combined

From 278de152cf3b89e0fd39907b29f8ece4118ff818 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:59:43 -0700
Subject: [PATCH 2218/3246] adobe-flex-sdk: fix homepage link

old link was broken
---
 pkgs/development/compilers/adobe-flex-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix
index 03cfee61ce4..ccb366ffe1c 100644
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix
@@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = { 
+  meta = {
     description = "Flex SDK for Adobe Flash / ActionScript";
-    homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation";
+    homepage = "http://www.adobe.com/products/flex.html";
     license = stdenv.lib.licenses.mpl11;
     platforms = stdenv.lib.platforms.unix;
   };

From f2141a96e526da36ae9f4932aa4ec2c196ab3556 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 14:59:59 -0700
Subject: [PATCH 2219/3246] cargo: use https://crates.io for homepage

---
 pkgs/development/compilers/rust/cargo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 2d4d6ad4db1..ac4102c9a63 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = http://crates.io;
+    homepage = https://crates.io;
     description = "Downloads your Rust project's dependencies and builds your project";
     maintainers = with maintainers; [ wizeman retrry ];
     license = [ licenses.mit licenses.asl20 ];

From 1a9a06e8e76c852503bae5d1b5044bbd830b549c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 15:00:37 -0700
Subject: [PATCH 2220/3246] boolstuff: fix homepage url

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

diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix
index 62d61e6cb5d..0f899e4324c 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/pkgs/development/libraries/boolstuff/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig }:
 
-let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in
+let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in
 
 stdenv.mkDerivation rec {
   name = "boolstuff-0.1.15";

From c210fc44582dbfaad42ac9f554430ccc2438488d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 15:00:50 -0700
Subject: [PATCH 2221/3246] c-ares: use https for homepage

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

diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 025e11e0755..14ff7a5f16c 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A C library for asynchronous DNS requests";
-    homepage = http://c-ares.haxx.se;
+    homepage = https://c-ares.haxx.se;
     license = licenses.mit;
     platforms = platforms.all;
   };

From ed180d21eaf6870614405af2dab78d02995813fa Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 15:01:11 -0700
Subject: [PATCH 2222/3246] acpitool: use sourceforge.net for project page

old url was broken
---
 pkgs/os-specific/linux/acpitool/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix
index 9b2a984f3ae..ce47932587c 100644
--- a/pkgs/os-specific/linux/acpitool/default.nix
+++ b/pkgs/os-specific/linux/acpitool/default.nix
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "A small, convenient command-line ACPI client with a lot of features";
-    homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml;
+    homepage = https://sourceforge.net/projects/acpitool/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.guibert ];
     platforms = stdenv.lib.platforms.unix;

From 82f4a96b00de7299ef06f35fe06e84eb06682f67 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 15:01:30 -0700
Subject: [PATCH 2223/3246] charybdis: use new homepage link

---
 pkgs/servers/irc/charybdis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index b2288336d57..befb4039ea0 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "IRCv3 server designed to be highly scalable";
-    homepage    = http://www.charybdis.io/;
+    homepage    = http://atheme.org/projects/charybdis.html;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lassulus fpletz ];
     platforms   = platforms.unix;

From 42ca24dad5b16513318ec588a0534f84730d16ac Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 15:01:41 -0700
Subject: [PATCH 2224/3246] paper: use https for homepage

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

diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix
index 3a337520d93..8bcb48812a3 100644
--- a/pkgs/misc/themes/paper/default.nix
+++ b/pkgs/misc/themes/paper/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
-    homepage = http://snwh.org/paper;
+    homepage = https://snwh.org/paper;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.simonvandel maintainers.romildo ];

From 3ce33633c4d4f906b955d1d8563dece931e65e24 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 15:01:56 -0700
Subject: [PATCH 2225/3246] albatross: link to github homepage

the old homepage is a 404
---
 pkgs/misc/themes/albatross/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix
index 965ee82a826..14fe0f21d80 100644
--- a/pkgs/misc/themes/albatross/default.nix
+++ b/pkgs/misc/themes/albatross/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A desktop Suite for Xfce";
-    homepage = http://shimmerproject.org/our-projects/albatross/;
+    homepage = https://github.com/shimmerproject/Albatross;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
   };

From 16392e0ae8a2d8d963754044fa62257456305e30 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 15:02:23 -0700
Subject: [PATCH 2226/3246] accounts-sso: use gitlab link

google code is discontinued
---
 pkgs/development/libraries/accounts-qt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index dc803bf1c37..e45a9f2f387 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Qt library for accessing the online accounts database";
-    homepage = http://code.google.com/p/accounts-sso/;
+    homepage = https://gitlab.com/accounts-sso;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ nckx ];
     platforms = with platforms; linux;

From 39fca7714ff1b61d52b6ff4789eb58d680636a90 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 Aug 2017 15:02:38 -0700
Subject: [PATCH 2227/3246] poppler: use https link

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

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index e8edee3ba18..5fcb7d386fa 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
       "sed '/^SUBDIRS =/s/ test / /' -i Makefile.in";
 
   meta = with lib; {
-    homepage = http://poppler.freedesktop.org/;
+    homepage = https://poppler.freedesktop.org/;
     description = "A PDF rendering library";
 
     longDescription = ''

From 9235ff1259bb9425c58ac3b3322ddf83e74a4255 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michaelpj@gmail.com>
Date: Wed, 9 Aug 2017 19:47:27 +0100
Subject: [PATCH 2228/3246] Overlays: allow overlays to be specified in a file

---
 doc/overlays.xml          | 56 ++++++++++++++++++++++++++++-----------
 pkgs/top-level/impure.nix | 40 ++++++++++++++++++++--------
 2 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index ad31b90299e..cc0aef447d2 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -17,42 +17,68 @@ if multiple layers override the same package.</para>
 <section xml:id="sec-overlays-install">
 <title>Installing overlays</title>
 
-<para>The list of overlays is determined as follows:
+<para>The list of overlays is determined as follows.</para>
+
+<para>If the <varname>overlays</varname> argument is not provided explicitly, we look for overlays in a path. The path
+is determined as follows:
 
 <orderedlist>
 
   <listitem>
     <para>First, if an <varname>overlays</varname> argument to the nixpkgs function itself is given,
-    then that is used. This can be passed explicitly when importing nipxkgs, for example 
-    <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ] }</literal>.</para>
+    then that is used.</para>
 
-    <para>On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present, 
-    is passed to the system Nixpkgs in this way. Note that this does not affect the overlays for
-    non-NixOS operations (e.g. <literal>nix-env</literal>), which are looked up independently.</para>
+    <para>This can be passed explicitly when importing nipxkgs, for example 
+    <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ]; }</literal>.</para>
   </listitem>
 
   <listitem>
-    <para>Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal> exists and is a 
-    directory, then the result is the set of overlays found in that directory, ordered lexicographically.</para> 
+    <para>Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal> exists, we look for overlays
+    at that path, as described below.</para>
 
     <para>See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to 
     set a value for <literal>&lt;nixpkgs-overlays>.</literal></para>
   </listitem>
 
   <listitem>
-    <para>Otherwise, if <filename>~/.config/nixpkgs/overlays/</filename> exists and is a directory, then
-    the result is the set of overlays found in that directory, ordered lexicographically.</para>
+    <para>If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
+    <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for overlays at that path, as
+    described below. It is an error if both exist.</para>
   </listitem>
 
 </orderedlist>
 </para>
 
-<para>For the second and third options, overlays are extracted from the given directory as files, 
-directories containing a <filename>default.nix</filename>, or symlinks to one of those.</para>
+<para>If we are looking for overlays at a path, then there are two cases:
+<itemizedlist>
+  <listitem>
+    <para>If the path is a file, then the file is imported as a Nix expression and used as the list of
+    overlays.</para>
+  </listitem>
 
-<para>The last option provides a convenient way to install an overlay from a repository, 
-by cloning the overlay's repository and adding a symbolic link to it in 
-<filename>~/.config/nixpkgs/overlays/</filename>.</para>
+  <listitem>
+    <para>If the path is a directory, then we take the content of the directory, order it
+    lexicographically, and attempt to interpret each as an overlay by:
+    <itemizedlist>
+      <listitem>
+        <para>Importing the file, if it is a <literal>.nix</literal> file.</para>
+      </listitem>
+      <listitem>
+        <para>Importing a top-level <filename>default.nix</filename> file, if it is a directory.</para>
+      </listitem>
+    </itemizedlist>
+    </para>
+  </listitem>
+</itemizedlist>
+</para>
+
+<para>On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present, 
+is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for
+non-NixOS operations (e.g. <literal>nix-env</literal>), which are looked up independently.</para>
+
+<para>The <filename>overlays.nix</filename> option therefore provides a convenient way to use the same
+overlays for a NixOS system configuration and user configuration: the same file can be used
+as <filename>overlays.nix</filename> and imported as the value of <literal>nixpkgs.overlays</literal>.</para>
 
 </section>
 
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index c0cf8fb0911..a4d313a1b99 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -40,18 +40,36 @@ in
   # collections of packages.  These collection of packages are part of the
   # fix-point made by Nixpkgs.
   overlays ? let
-      dirPath = try (if pathExists <nixpkgs-overlays> then <nixpkgs-overlays> else "") "";
-      dirHome = homeDir + "/.config/nixpkgs/overlays";
-      dirCheck = dir: dir != "" && pathExists (dir + "/.");
-      overlays = dir:
-        let content = readDir dir; in
-        map (n: import (dir + ("/" + n)))
-          (builtins.filter (n: builtins.match ".*\.nix" n != null || pathExists (dir + ("/" + n + "/default.nix")))
-            (attrNames content));
+      isDir = path: pathExists (path + "/.");
+      pathOverlays = try <nixpkgs-overlays> "";
+      homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix";
+      homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays";
+      overlays = path:
+        # check if the path is a directory or a file
+        if isDir path then
+          # it's a directory, so the set of overlays from the directory, ordered lexicographically
+          let content = readDir path; in
+          map (n: import (path + ("/" + n)))
+            (builtins.filter (n: builtins.match ".*\.nix" n != null || pathExists (path + ("/" + n + "/default.nix")))
+              (attrNames content))
+        else 
+          # it's a file, so the result is the contents of the file itself
+          import path;
     in
-      if dirPath != "" then
-        overlays dirPath
-      else if dirCheck dirHome then overlays dirHome
+      if pathOverlays != "" && pathExists pathOverlays then overlays pathOverlays
+      else if pathExists homeOverlaysFile && pathExists homeOverlaysDir then 
+        throw ''
+          Nixpkgs overlays can be specified with ${homeOverlaysFile} or ${homeOverlaysDir}, but not both.
+          Please remove one of them and try again.
+        ''
+      else if pathExists homeOverlaysFile then 
+        if isDir homeOverlaysFile then 
+          throw (homeOverlaysFile + " should be a file")
+        else overlays homeOverlaysFile
+      else if pathExists homeOverlaysDir then
+        if !(isDir homeOverlaysDir) then 
+          throw (homeOverlaysDir + " should be a directory")
+        else overlays homeOverlaysDir
       else []
 
 , ...

From e675296a9ce924cbfab83e35c6f652859c5bbfd6 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michaelpj@gmail.com>
Date: Wed, 16 Aug 2017 22:16:08 +0100
Subject: [PATCH 2229/3246] Release notes: add note for overlays via file

---
 nixos/doc/manual/release-notes/rl-1709.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index a32f9963d1c..0cd9e957188 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -196,6 +196,17 @@ rmdir /var/lib/ipfs/.ipfs
       is still UTC.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      Nixpkgs overlays may now be specified with a file as well as a directory. The
+      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and 
+      <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the
+      <filename>~/.config/nixpkgs/overalys</filename> directory.
+    </para>
+    <para>
+      See the overlays chapter of the Nixpkgs manual for more details.
+    </para>
+  </listitem>
 
 </itemizedlist>
 

From efc95339c0604e5c562a362312c9c476411f99cb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Aug 2017 02:21:45 +0200
Subject: [PATCH 2230/3246] Do an ASDF build of StumpWM in quicklisp-converted
 version

---
 .../lisp-modules/quicklisp-to-nix-overrides.nix            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 478252eb76c..877389811d0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -15,6 +15,13 @@ in
       preConfigure = ''
         export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh";
       '';
+      postInstall = ''
+        "$out/bin/stumpwm-lisp-launcher.sh" --eval '(asdf:make :stumpwm)' \
+          --eval '(setf (asdf/system:component-entry-point (asdf:find-system :stumpwm)) (function stumpwm:stumpwm))' \
+          --eval '(asdf:perform (quote asdf:program-op) :stumpwm)'
+
+        cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin"
+      '';
     };
     propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [
       alexandria cl-ppcre clx

From a0d87c6885fd24cc26683b83401edbf58343aacf Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 18 Aug 2017 01:46:50 +0000
Subject: [PATCH 2231/3246] Delete 2.5.nix

delete orphan file

```gradle_2_5``` is in ```default.nix```
---
 .../tools/build-managers/gradle/2.5.nix       | 39 -------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/gradle/2.5.nix

diff --git a/pkgs/development/tools/build-managers/gradle/2.5.nix b/pkgs/development/tools/build-managers/gradle/2.5.nix
deleted file mode 100644
index b140a07609e..00000000000
--- a/pkgs/development/tools/build-managers/gradle/2.5.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, unzip, jdk, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "gradle-2.5";
-
-  src = fetchurl {
-    url = "http://services.gradle.org/distributions/${name}-bin.zip";
-    sha256 = "0mc5lf6phkncx77r0papzmfvyiqm0y26x50ipvmzkcsbn463x59z";
-  };
-
-  installPhase = ''
-    mkdir -pv $out/gradle
-    cp -rv lib $out/gradle
-
-    gradle_launcher_jar=$(echo $out/gradle/lib/gradle-launcher-*.jar)
-    test -f $gradle_launcher_jar
-    makeWrapper ${jdk}/bin/java $out/bin/gradle \
-      --set JAVA_HOME ${jdk} \
-      --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain"
-  '';
-
-  phases = "unpackPhase installPhase";
-
-  buildInputs = [ unzip jdk makeWrapper ];
-
-  meta = {
-    description = "Enterprise-grade build system";
-    longDescription = ''
-      Gradle is a build system which offers you ease, power and freedom.
-      You can choose the balance for yourself. It has powerful multi-project
-      build support. It has a layer on top of Ivy that provides a 
-      build-by-convention integration for Ivy. It gives you always the choice
-      between the flexibility of Ant and the convenience of a 
-      build-by-convention behavior.
-    '';
-    homepage = http://www.gradle.org/;
-    license = stdenv.lib.licenses.asl20;
-  };
-}

From 9af4150f38376207adc340e633648a7d62cf5d77 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 18 Aug 2017 01:53:24 +0000
Subject: [PATCH 2232/3246] radare2: 1.4.0 -> 1.6.0

---
 .../tools/analysis/radare2/default.nix        | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 0d4b55bb472..1572fff40b9 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
+{stdenv, fetchFromGitHub, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
 gtk2 ? null, vte ? null, gtkdialog ? null,
 python ? null,
 ruby ? null,
@@ -10,17 +10,35 @@ assert rubyBindings -> ruby != null;
 assert pythonBindings -> python != null;
 
 let
-  optional = stdenv.lib.optional;
+  inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  version = "1.4.0";
+  version = "1.6.0";
   name = "radare2-${version}";
 
-  src = fetchurl {
-    url = "http://cloud.radare.org/get/${version}/${name}.tar.gz";
-    sha256 = "bf6e9ad94fd5828d3936563b8b13218433fbf44231cacfdf37a7312ae2b3e93e";
+  src = fetchFromGitHub {
+    owner = "radare";
+    repo = "radare2";
+    rev = version;
+    sha256 = "0kb7y0b5kw2p1kxpzjgc8pnwdkqyzkijzp5d2a9zs2ira96668zd";
   };
 
+  postPatch = let
+    cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile
+    capstone = fetchurl {
+      url = "https://github.com/aquynh/capstone/archive/${cs_ver}.tar.gz";
+      sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
+    };
+  in ''
+    if ! grep -F "CS_VER=${cs_ver}" shlr/Makefile; then echo "CS_VER mismatch"; exit 1; fi
+    substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1
+    cp ${capstone} shlr/capstone-${cs_ver}.tar.gz
+
+    # make compiler happy (fixed in upstream 2017-08-11)
+    substituteInPlace libr/asm/arch/hexagon/gnu/hexagon-dis.c --replace \
+      '(*info->fprintf_func) (info->stream, errmsg);' \
+      '(*info->fprintf_func) (info->stream, "%s", errmsg);'
+  '';
 
   buildInputs = [pkgconfig readline libusb libewf perl zlib openssl]
     ++ optional useX11 [gtkdialog vte gtk2]
@@ -28,6 +46,13 @@ stdenv.mkDerivation rec {
     ++ optional pythonBindings [python]
     ++ optional luaBindings [lua];
 
+  postInstall = ''
+    # replace symlinks pointing into the build directory with the files they point to
+    rm $out/bin/{r2-docker,r2-indent}
+    cp sys/r2-docker.sh $out/bin/r2-docker
+    cp sys/indent.sh    $out/bin/r2-indent
+  '';
+
   meta = {
     description = "unix-like reverse engineering framework and commandline tools";
     homepage = http://radare.org/;

From 1a0465290033818638adc56c3c35b6724eaa39ac Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 18 Aug 2017 00:16:18 -0300
Subject: [PATCH 2233/3246] caja-extensions: init at 1.18.1

---
 .../desktops/mate/caja-extensions/default.nix | 43 +++++++++++++++++++
 pkgs/desktops/mate/default.nix                |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/desktops/mate/caja-extensions/default.nix

diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
new file mode 100644
index 00000000000..ab2831159f9
--- /dev/null
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick }:
+
+stdenv.mkDerivation rec {
+  name = "caja-extensions-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0hgala7zkfsa60jflq3s4n9yd11dhfdcla40l83cmgc3r1az7cmw";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+  ];
+
+  buildInputs = [
+    gtk3
+    dbus_glib
+    gupnp
+    mate.caja
+    mate.mate-desktop
+    imagemagick
+  ];
+
+  postPatch = ''
+    for f in image-converter/caja-image-{resizer,rotator}.c; do
+      substituteInPlace $f --replace "/usr/bin/convert" "${imagemagick}/bin/convert"
+    done
+  '';
+  
+  configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
+
+  meta = with stdenv.lib; {
+    description = "Set of extensions for Caja file manager";
+    homepage = http://mate-desktop.org;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 81839930664..5131af9a685 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -2,6 +2,7 @@
 rec {
   atril = callPackage ./atril { };
   caja = callPackage ./caja { };
+  caja-extensions = callPackage ./caja-extensions { };
   eom = callPackage ./eom { };
   pluma = callPackage ./pluma { };
   mate-common = callPackage ./mate-common { };

From b5eab8f94334aa01086a42704565b5e610e4b302 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 18 Aug 2017 00:19:58 -0300
Subject: [PATCH 2234/3246] cajaWithExtensions: init at 1.18.3

---
 .../mate/caja/caja-extension-dirs.patch       | 30 +++++++++++++++++++
 .../desktops/mate/caja/cajaWithExtensions.nix | 11 +++++++
 pkgs/desktops/mate/caja/default.nix           |  4 +++
 pkgs/desktops/mate/default.nix                |  3 ++
 4 files changed, 48 insertions(+)
 create mode 100644 pkgs/desktops/mate/caja/caja-extension-dirs.patch
 create mode 100644 pkgs/desktops/mate/caja/cajaWithExtensions.nix

diff --git a/pkgs/desktops/mate/caja/caja-extension-dirs.patch b/pkgs/desktops/mate/caja/caja-extension-dirs.patch
new file mode 100644
index 00000000000..7490a368efd
--- /dev/null
+++ b/pkgs/desktops/mate/caja/caja-extension-dirs.patch
@@ -0,0 +1,30 @@
+diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
+index 023c22e..414913b 100644
+--- a/libcaja-private/caja-module.c
++++ b/libcaja-private/caja-module.c
+@@ -258,11 +258,25 @@ caja_module_setup (void)
+ {
+     static gboolean initialized = FALSE;
+     GList *res;
++    gchar *caja_extension_dirs;
++    gchar **dir_vector;
+ 
+     if (!initialized)
+     {
+         initialized = TRUE;
+ 
++        caja_extension_dirs = (gchar *) g_getenv ("CAJA_EXTENSION_DIRS");
++
++        if (caja_extension_dirs)
++        {
++            dir_vector = g_strsplit (caja_extension_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
++
++            for (gchar **dir = dir_vector; *dir != NULL; ++ dir)
++                load_module_dir (*dir);
++
++            g_strfreev(dir_vector);
++        }
++
+         load_module_dir (CAJA_EXTENSIONDIR);
+ 
+         eel_debug_call_at_shutdown (free_module_objects);
diff --git a/pkgs/desktops/mate/caja/cajaWithExtensions.nix b/pkgs/desktops/mate/caja/cajaWithExtensions.nix
new file mode 100644
index 00000000000..cb315d7f09a
--- /dev/null
+++ b/pkgs/desktops/mate/caja/cajaWithExtensions.nix
@@ -0,0 +1,11 @@
+{ buildEnv, makeWrapper, caja, extensions ? [] }:
+
+buildEnv {
+  name = "cajaWithExtensions-${caja.version}";
+  meta = caja.meta // { description = "File manager (including extensions) for the MATE desktop"; };
+  paths = [ caja ] ++ extensions;
+  buildInputs = [ makeWrapper ];
+  postBuild = ''
+    wrapProgram "$out/bin/caja" --set CAJA_EXTENSION_DIRS "$out/lib/caja/extensions-2.0"
+  '';
+}
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index 07c7d0662a9..8f38a5ef7e6 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
     mate.mate-desktop
   ];
 
+  patches = [
+    ./caja-extension-dirs.patch
+  ];
+  
   configureFlags = [ "--disable-update-mimedb" ];
   
   meta = {
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 5131af9a685..58b4f405cc8 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -3,6 +3,9 @@ rec {
   atril = callPackage ./atril { };
   caja = callPackage ./caja { };
   caja-extensions = callPackage ./caja-extensions { };
+  cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
+    extensions = [ caja-extensions ];
+  };
   eom = callPackage ./eom { };
   pluma = callPackage ./pluma { };
   mate-common = callPackage ./mate-common { };

From 9a67c8e56d3040d14d5f8f2ad648f33f1303a8a4 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 18 Aug 2017 08:25:41 +0200
Subject: [PATCH 2235/3246] perlPackages.TextBibTeX: do not hardcode gcc

See https://github.com/NixOS/nixpkgs/commit/e619ace733fee725da5a1b84e5cce68d610ba35e##commitcomment-23660930
---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0e54b09b7f1..dd39fa078b9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14209,7 +14209,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz";
       sha256 = "0dig1zlglm8rwm8fhnz087lx6gixj9jx10kxn1fx3swdkfblhsmf";
     };
-    perlPreHook = "export LD=gcc";
+    perlPreHook = "export LD=$CC";
     meta = {
       description = "Interface to read and parse BibTeX files";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From f1666a3aaf2214b70a2eec11a9a99abc88574e07 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 18 Aug 2017 08:28:58 +0200
Subject: [PATCH 2236/3246] perlPackages.ExtUtilsLibBuilder: 0.04 -> 0.08

---
 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 dd39fa078b9..09a56bc0f07 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5113,11 +5113,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ExtUtilsLibBuilder = buildPerlModule {
-    name = "ExtUtils-LibBuilder-0.04";
+  ExtUtilsLibBuilder = buildPerlModule rec {
+    name = "ExtUtils-LibBuilder-0.08";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils/ExtUtils-LibBuilder-0.04.tar.gz;
-      sha256 = "0j4rhx3w6nbvmxqjg6q09gm10nnpkcmqmh29cgxsfc9k14d8bb6w";
+      url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz";
+      sha256 = "1lmmfcjxvsvhn4f3v2lyylgr8dzcf5j7mnd1pkq3jc75dph724f5";
     };
     meta = {
       description = "A tool to build C libraries";

From 53d67bcc26ceff38454b97ebafd49a5df0d0733e Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Thu, 17 Aug 2017 16:46:04 +0200
Subject: [PATCH 2237/3246] readline 7.0 -> 7.0.3

Discussion: https://groups.google.com/forum/#!topic/nix-devel/agupzdm352Q
---
 lib/maintainers.nix                           |  1 +
 pkgs/development/libraries/readline/7.0.nix   | 19 +++++++++----------
 .../readline/readline-7.0-patches.nix         |  7 +++++++
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/readline/readline-7.0-patches.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5762982273b..727fd2091c9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -595,6 +595,7 @@
   uwap = "uwap <me@uwap.name>";
   vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
+  vanschelven = "Klaas van Schelven <klaas@vanschelven.com>";
   vanzef = "Ivan Solyankin <vanzef@gmail.com>";
   vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";
   vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 7cc76e08768..ed6e0cb153c 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "readline-${version}";
-  version = "7.0p0";
+  version = "7.0p${toString (builtins.length upstreamPatches)}";
 
   src = fetchurl {
     url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz";
@@ -17,13 +17,7 @@ stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
 
-  patches =
-    [ ./link-against-ncurses.patch
-      ./no-arch_only-6.3.patch
-    ]
-    ;
-    /*
-    ++
+  upstreamPatches =
     (let
        patch = nr: sha256:
          fetchurl {
@@ -32,7 +26,12 @@ stdenv.mkDerivation rec {
          };
      in
        import ./readline-7.0-patches.nix patch);
-    */
+
+  patches =
+    [ ./link-against-ncurses.patch
+      ./no-arch_only-6.3.patch
+    ]
+    ++ upstreamPatches;
 
   # Don't run the native `strip' when cross-compiling.
   dontStrip = hostPlatform != buildPlatform;
@@ -60,7 +59,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    maintainers = [ ];
+    maintainers = [ vanschelven ];
 
     platforms = platforms.unix;
     branch = "7.0";
diff --git a/pkgs/development/libraries/readline/readline-7.0-patches.nix b/pkgs/development/libraries/readline/readline-7.0-patches.nix
new file mode 100644
index 00000000000..45bec6b6481
--- /dev/null
+++ b/pkgs/development/libraries/readline/readline-7.0-patches.nix
@@ -0,0 +1,7 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+(patch "001" "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs")
+(patch "002" "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7")
+(patch "003" "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy")
+]

From f179b27e89b0e98a75922b9a8327d5839f8eeb3b Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 18 Aug 2017 09:16:29 +0200
Subject: [PATCH 2238/3246] plowshare: 2.1.6 -> 2.1.7

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

diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 8282c2a1cd9..191f8980d83 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "plowshare-${version}";
-  version = "2.1.6";
+  version = "2.1.7";
 
   src = fetchFromGitHub {
     owner = "mcrapet";
     repo = "plowshare";
     rev = "v${version}";
-    sha256 = "116291w0z1r61xm3a3zjlh85f05pk4ng9f1wbj9kv1j3xrjn4v4c";
+    sha256 = "1p8s60dlzaldp006yj710s371aan915asyjhd99188vrj4jj1x79";
   };
 
   buildInputs = [ makeWrapper ];

From d17782eb5f5b0619c411d56c70333c168215c25e Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 18 Aug 2017 10:46:03 +0300
Subject: [PATCH 2239/3246] pythonPackages.zc_buildout_nix: 2.5.3 -> 2.9.4

---
 .../python-modules/buildout-nix/default.nix   | 10 ++++++----
 .../python-modules/buildout-nix/nix.patch     | 19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 9ff8df02ac9..fcb46f4bac1 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -1,11 +1,13 @@
 { fetchurl, stdenv, buildPythonPackage }:
 
-buildPythonPackage {
-  name = "zc.buildout-nix-2.5.3";
+buildPythonPackage rec {
+  pname = "zc.buildout";
+  version = "2.9.4";
+  name = "${pname}-nix-${version}";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/e4/7b/63863f09bec5f5d7b9474209a6d4d3fc1e0bca02ecfb4c17f0cdd7b554b6/zc.buildout-2.5.3.tar.gz";
-    sha256 = "3e5f3afcc64416604c5efc554c2fa0901b60657e012a710c320e2eb510efcfb9";
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "df56cc55735e984510986c633090ad0d64f59d7e42d1aac57ecf04ab183d1053";
   };
 
   patches = [ ./nix.patch ];
diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch
index f358544d36a..49f3c6d90f0 100644
--- a/pkgs/development/python-modules/buildout-nix/nix.patch
+++ b/pkgs/development/python-modules/buildout-nix/nix.patch
@@ -1,6 +1,19 @@
---- a/src/zc/buildout/easy_install.py	2013-08-27 22:28:40.233718116 +0200
-+++ b/src/zc/buildout/easy_install.py   2013-10-07 00:29:31.077413935 +0200
-@@ -227,6 +227,12 @@
+--- a/src/zc/buildout/buildout.py       2017-08-18 10:06:24.946428977 +0300
++++ b/src/zc/buildout/buildout.py       2017-08-18 10:08:49.115613364 +0300
+@@ -382,6 +382,10 @@
+                  if k not in versions
+                  ))
+ 
++        # Override versions with available (nix) system packages
++        for dist in pkg_resources.working_set:
++             versions[dist.project_name] = SectionKey(dist.version, dist.location)
++
+         # Absolutize some particular directory, handling also the ~/foo form,
+         # and considering the location of the configuration file that generated
+         # the setting as the base path, falling back to the main configuration
+--- a/src/zc/buildout/easy_install.py   2017-08-18 10:06:24.948428980 +0300
++++ b/src/zc/buildout/easy_install.py   2017-08-18 10:07:37.462521740 +0300
+@@ -321,6 +321,12 @@
  
      def _satisfied(self, req, source=None):
          dists = [dist for dist in self._env[req.project_name] if dist in req]

From 3c65062a43653a4bbd4d33158d35dae6e7f925c5 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Thu, 17 Aug 2017 21:34:35 +0200
Subject: [PATCH 2240/3246] bash: cleanup unused file

The only usage location was removed in f803270b7e00fa7124282809838d5652083b6aad
Grepping for bash-4.3 yields no results
---
 pkgs/shells/bash/bash-4.3-patches.nix | 52 ---------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 pkgs/shells/bash/bash-4.3-patches.nix

diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix
deleted file mode 100644
index a09e56e4699..00000000000
--- a/pkgs/shells/bash/bash-4.3-patches.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-# Automatically generated by `update-patch-set.sh'; do not edit.
-
-patch: [
-(patch "001" "0hip2n2s5hws8p4nfcz37379zn6cak83ljsm64z52rw6ckrdzczc")
-(patch "002" "0ashj5d1g3zbyr7zf0r72s5wnk96cz1xj919y3jajadbc9qcvrzf")
-(patch "003" "0z88q4daq7dmw93iqd9c5i5d1sndklih3nrh0v75746da2n6w3h0")
-(patch "004" "0f0kh9j5k4ym6knshscx31przm50x5cc7ifkwqk0swh6clna982y")
-(patch "005" "1ym3b8b7lgmdp3dklp8qaqhyq965wd5392namq8mz7rb0d231j0s")
-(patch "006" "04q20igq49py49ynb0f83f6f52cdkyqwd9bpic6akr0m5pkqwr50")
-(patch "007" "18zkz23d9myshrwfcwcdjk7qmkqp8az5n91ni9jaixlwqlhy64qi")
-(patch "008" "0pprcwvh7ngdli0x95pc1cpssg4qg7layi9xrv2jq6c7965ajhcr")
-(patch "009" "19a0pf0alp30d1bjj0zf3zq2f5n0s6y91w7brm9jyswl51kns8n0")
-(patch "010" "1dzhr5ammyijisz48cqi5vaw26hfr5vh9smnqxq4qc9p06f7j1ff")
-(patch "011" "0fvzdzzi142a8rf3v965r6gbpn0k7fv2gif1yq8a4160vcn40qvw")
-(patch "012" "04lcgfcyz7p3zagb4hkia3hkpd7lii9m8ycy9qqwzyrm1c1pj4ry")
-(patch "013" "0y9cqi378z6flapkd5k5lfl4lq3ivzg4njj3i3wmw7xb6r9wma5z")
-(patch "014" "04xcb0k9fxxq4vashgzb98567xzdnm4655nlm4jvfvjv6si6ykas")
-(patch "015" "13ay6lldy1p00xj41nfjpq8lai3vw2qwca79gx6s80z04j53wa8k")
-(patch "016" "0wq7bvx3pfw90pnfb86yg5nr9jgjsvm2nq5rrkqxf6zn977hpmlj")
-(patch "017" "103p7sibihv6cshqj12k546zsbz0dnd5cv5vlx1719avddfc4rqj")
-(patch "018" "0n1x3812y1brb9xbabaj3fvr4cpvm2225iwckmqk2fcpkq5b9a3s")
-(patch "019" "08rd1p7zpzgbpmmmnj2im8wj2pcwmbbx51psr9vdc5c049si9ad7")
-(patch "020" "163c6g05qpag2plx5q795pmw3f3m904jy7z93xj2i08pgzc8cpna")
-(patch "021" "1a90cl3h10dh8k9f2ddrsjmw5ywaw2d5x78xb4fd2sryi039yhs1")
-(patch "022" "120s0s4qcqd0q12j1iv0hkpf9fp3w5jnqw646kv66n66jnxlfkgx")
-(patch "023" "1m00sfi88p2akgiyrg4hw0gvz3s1586pkzjdr3dm73vs773m1hls")
-(patch "024" "0v0gjqzjsqjfgj5x17fq7g649k94jn8zq92qsxkhc2d6l215hl1v")
-(patch "025" "0lcj96i659q35f1jcmwwbnw3p7w7vvlxjxqi989vn6d6qksqcl8y")
-(patch "026" "0k919ir0inwn4wai2vdzpbwqq5h54fnrlkmgccxjg91v3ch15k1f")
-(patch "027" "1gnsfvq6bhb3srlbh0cannj2hackdsipcg7z0ds7zlk1hp96mdqy")
-(patch "028" "17a65c4fn4c5rgsiw9gqqnzhznh3gwnd2xzzv2dppyi48znxpc78")
-(patch "029" "14k27p28r5l2fz3r03kd0x72vvsq8bja8c6hjz5kxikbzsbs7i2c")
-(patch "030" "0nrqb0m7s89qsrbfaffpilc5gcf82bx9yvgzld4hr79p5y54yhw5")
-(patch "031" "07d62bl3z7qa8v6kgk47vzzazw563mlk9zhrsr4xsbqgvmcrylnd")
-(patch "032" "0jjgapfq4qhmndfrw8c3q3lva8xjdhlbd9cc631v41b0kb95g4w8")
-(patch "033" "05ma5rlxiadnfh925p4y7s0vvk917kmsdb1mfdx05gizl63pfapv")
-(patch "034" "12gq9whkq3naa3iy7c7x5pfpvrg7d0kwqld8609zxphhy424ysgi")
-(patch "035" "1qy1jflmbazjykq766gwabkaiswnx7pwa66whqiny0w02zjqa39p")
-(patch "036" "0z6jbyy70lfdm6d3x0sbazbqdxb3xnpn9bmz7madpvrnbd284pxc")
-(patch "037" "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k")
-(patch "038" "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd")
-(patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b")
-(patch "040" "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4")
-(patch "041" "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f")
-(patch "042" "06a90k0p6bqc4wk2dsmapna69124an76xvlnlj3xm497vci968dc")
-(patch "043" "1031g97w8gamimb41jr9r2qm7mn10k5mr3sd3y12avml0p0a7a27")
-(patch "044" "16bzaq9fs2kaw2n2k6vvljkjw5k5kx06isnq8hxkfrxz60384f4k")
-(patch "045" "08q02mj9imp2njpgm6f5q5m61i7qzp33rbxxzarixalyisbw6vms")
-(patch "046" "13v8dymwj83wcvrfayjqrs5kqar05bcj4zpiacrjkkchnsk5dd5k")
-(patch "047" "0jkwqviwkqdc13wv3q0g0kapjr68ggs1xzhqy696pfkqgvg4i4n6")
-(patch "048" "18nzlk1idwkq0xd54s83lx8kam8kcvz7yc0mw6hnq2ax3i2ib0jv")
-]

From 7320fa9d4581e634fec4db848d7a4d157a51303d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 18 Aug 2017 05:07:03 +0300
Subject: [PATCH 2241/3246] Revert "stdenvs: Distinguish between
 `extraBuildInputs` and `extraNativeBuildInputs`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit eeabf85780e7fccc0289b4015b695e28ef166ab7.

This change suddenly makes tons of stdenv internals visible in
nativeBuildInputs of every derivation, which doesn't seem desirable.
E.g:

````
nix-repl> hello.nativeBuildInputs
[ «derivation /nix/store/bcfkyf6bhssxd2vzwgzmsbn7b5b9rpxc-patchelf-0.9.drv»
  «derivation /nix/store/4wnshnz9wwanpfzcrdd76rri7pyqn9sk-paxctl-0.9.drv»
  << snip 10+ lines >>
  «derivation /nix/store/d35pgh1lcg5nm0x28d899pxj30b8c9b2-gcc-wrapper-6.4.0.drv»
]
````
---
 pkgs/stdenv/darwin/default.nix          | 15 ++++-----------
 pkgs/stdenv/generic/builder.sh          | 11 +++--------
 pkgs/stdenv/generic/default.nix         | 18 +++++-------------
 pkgs/stdenv/generic/make-derivation.nix |  8 ++++----
 pkgs/stdenv/generic/setup.sh            |  5 +++--
 pkgs/stdenv/linux/default.nix           | 10 +++++-----
 pkgs/stdenv/native/default.nix          |  8 ++++----
 7 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 2eeab14b1c7..74dcf2f009b 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -59,12 +59,11 @@ in rec {
   stageFun = step: last: {shell             ? "${bootstrapTools}/bin/bash",
                           overrides         ? (self: super: {}),
                           extraPreHook      ? "",
-                          extraNativeBuildInputs,
                           extraBuildInputs,
                           allowedRequisites ? null}:
     let
       thisStdenv = import ../generic {
-        inherit config shell extraNativeBuildInputs extraBuildInputs;
+        inherit config shell extraBuildInputs;
         allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
           thisStdenv.cc.expand-response-params
         ];
@@ -163,7 +162,6 @@ in rec {
 
     };
 
-    extraNativeBuildInputs = [];
     extraBuildInputs = [];
   };
 
@@ -171,7 +169,6 @@ in rec {
 
   stage1 = prevStage: with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
-    extraNativeBuildInputs = [];
     extraBuildInputs = [ pkgs.libcxx ];
 
     allowedRequisites =
@@ -198,8 +195,7 @@ in rec {
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
 
-    extraNativeBuildInputs = [ pkgs.xz ];
-    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
+    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx ];
 
     allowedRequisites =
       [ bootstrapTools ] ++
@@ -230,8 +226,7 @@ in rec {
     # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
     # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
     # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
-    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
-    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
+    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
 
     extraPreHook = ''
       export PATH=${pkgs.bash}/bin:$PATH
@@ -265,8 +260,7 @@ in rec {
 
   stage4 = prevStage: with prevStage; stageFun 4 prevStage {
     shell = "${pkgs.bash}/bin/bash";
-    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
-    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
+    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
@@ -327,7 +321,6 @@ in rec {
       libc = pkgs.darwin.Libsystem;
     };
 
-    extraNativeBuildInputs = [];
     extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     extraAttrs = {
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index bc8f23333f7..42e1a029e58 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -6,20 +6,15 @@ done
 
 mkdir $out
 
-# Buid the setup script
 echo "export SHELL=$shell" > $out/setup
 echo "initialPath=\"$initialPath\"" >> $out/setup
+echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup
 echo "$preHook" >> $out/setup
 cat "$setup" >> $out/setup
 
 # Allow the user to install stdenv using nix-env and get the packages
 # in stdenv.
-mkdir -p "$out/nix-support"
-echo '# Hack to induce runtime dependencies on the default inputs' \
-    > "$out/nix-support/default-inputs.txt"
-printf '%s\n' $defaultNativeBuildInputs $defaultBuildInputs \
-    >> "$out/nix-support/default-inputs.txt"
+mkdir $out/nix-support
 if [ "$propagatedUserEnvPkgs" ]; then
-    printf '%s ' $propagatedUserEnvPkgs \
-        > "$out/nix-support/propagated-user-env-packages"
+    printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
 fi
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 17bf1f8b428..a5d3c5a8ff5 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -9,7 +9,6 @@ let lib = import ../../../lib; in lib.makeOverridable (
 
 , setupScript ? ./setup.sh
 
-, extraNativeBuildInputs ? []
 , extraBuildInputs ? []
 , __stdenvImpureHostDeps ? []
 , __extraImpureHostDeps ? []
@@ -42,7 +41,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 }:
 
 let
-  defaultNativeBuildInputs = extraNativeBuildInputs ++
+  defaultNativeBuildInputs = extraBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
       ../../build-support/setup-hooks/strip.sh
@@ -59,16 +58,11 @@ let
       cc
     ];
 
-  defaultBuildInputs = extraBuildInputs;
-
   # The stdenv that we are producing.
   stdenv =
     derivation (
-    lib.optionalAttrs (allowedRequisites != null) {
-      allowedRequisites = allowedRequisites
-        ++ defaultNativeBuildInputs ++ defaultBuildInputs;
-    }
-    // {
+    (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
+    {
       inherit name;
 
       # Nix itself uses the `system` field of a derivation to decide where to
@@ -81,8 +75,7 @@ let
 
       setup = setupScript;
 
-      inherit preHook initialPath shell
-        defaultNativeBuildInputs defaultBuildInputs;
+      inherit preHook initialPath shell defaultNativeBuildInputs;
     }
     // lib.optionalAttrs buildPlatform.isDarwin {
       __sandboxProfile = stdenvSandboxProfile;
@@ -98,8 +91,7 @@ let
 
       inherit buildPlatform hostPlatform targetPlatform;
 
-      inherit extraNativeBuildInputs extraBuildInputs
-        __extraImpureHostDeps extraSandboxProfile;
+      inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile;
 
       # Utility flags to test the type of platform.
       inherit (hostPlatform)
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 0f76e09469f..74d387e353c 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -44,10 +44,10 @@ rec {
     , ... } @ attrs:
     let
       dependencies = map lib.chooseDevOutputs [
-        (map (drv: drv.nativeDrv or drv) (nativeBuildInputs ++ stdenv.defaultNativeBuildInputs)
+        (map (drv: drv.nativeDrv or drv) nativeBuildInputs
            ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
            ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh)
-        (map (drv: drv.crossDrv or drv) (buildInputs ++ stdenv.defaultBuildInputs))
+        (map (drv: drv.crossDrv or drv) buildInputs)
       ];
       propagatedDependencies = map lib.chooseDevOutputs [
         (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)
@@ -65,11 +65,11 @@ rec {
            "sandboxProfile" "propagatedSandboxProfile"])
         // (let
           computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists dependencies);
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies);
           computedPropagatedSandboxProfile =
             lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies);
           computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists dependencies));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies));
           computedPropagatedImpureHostDeps =
             lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies));
         in
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index c8313b7ce23..b6bca3e1f56 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -317,17 +317,18 @@ if [ -z "$crossConfig" ]; then
     # are handled identically to nativeBuildInputs
     declare -a nativePkgs
     for i in $nativeBuildInputs $buildInputs \
+             $defaultNativeBuildInputs $defaultBuildInputs \
              $propagatedNativeBuildInputs $propagatedBuildInputs; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 else
     declare -a crossPkgs
-    for i in $buildInputs $propagatedBuildInputs; do
+    for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
         findInputs "$i" crossPkgs propagated-build-inputs
     done
 
     declare -a nativePkgs
-    for i in $nativeBuildInputs $propagatedNativeBuildInputs; do
+    for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 fi
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 0167e51f2fd..61262e1a64e 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -47,7 +47,7 @@ let
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
   stageFun = prevStage:
-    { name, overrides ? (self: super: {}), extraNativeBuildInputs ? [] }:
+    { name, overrides ? (self: super: {}), extraBuildInputs ? [] }:
 
     let
 
@@ -56,7 +56,7 @@ let
         buildPlatform = localSystem;
         hostPlatform = localSystem;
         targetPlatform = localSystem;
-        inherit config extraNativeBuildInputs;
+        inherit config extraBuildInputs;
         preHook =
           ''
             # Don't patch #!/interpreter because it leads to retained
@@ -219,7 +219,7 @@ in
         isl = isl_0_14;
       };
     };
-    extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+    extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
       lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
@@ -253,7 +253,7 @@ in
         shell = self.bash + "/bin/bash";
       };
     };
-    extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
+    extraBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
       lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
@@ -283,7 +283,7 @@ in
       initialPath =
         ((import ../common-path.nix) {pkgs = prevStage;});
 
-      extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+      extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
         # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
         lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
 
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 9ecb56028bc..02734f2f3e5 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -66,7 +66,7 @@ let
     export lt_cv_deplibs_check_method=pass_all
   '';
 
-  extraNativeBuildInputsCygwin = [
+  extraBuildInputsCygwin = [
     ../cygwin/all-buildinputs-as-runtimedep.sh
     ../cygwin/wrap-exes-to-find-dlls.sh
   ] ++ (if system == "i686-cygwin" then [
@@ -94,9 +94,9 @@ let
         if system == "x86_64-cygwin" then prehookCygwin else
         prehookBase;
 
-      extraNativeBuildInputs =
-        if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
-        if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else
+      extraBuildInputs =
+        if system == "i686-cygwin" then extraBuildInputsCygwin else
+        if system == "x86_64-cygwin" then extraBuildInputsCygwin else
         [];
 
       initialPath = extraPath ++ path;

From cc1c817fdc8b8d48a69722518d1e923e8b648b92 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 18 Aug 2017 12:25:10 +0200
Subject: [PATCH 2242/3246] libmspack: 0.5alpha -> 0.6alpha

Fixes CVE-2017-6419 & CVE-2017-11423.
---
 pkgs/development/libraries/libmspack/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index 67aec7fc974..ce58b2cd333 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -1,9 +1,10 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "libmspack-0.5alpha";
+stdenv.mkDerivation rec {
+  name = "libmspack-0.6alpha";
+
   src = fetchurl {
-    url = "http://www.cabextract.org.uk/libmspack/libmspack-0.5alpha.tar.gz";
+    url = "http://www.cabextract.org.uk/libmspack/${name}.tar.gz";
     sha256 = "04413hynb7zizxnkgy9riik3612dwirkpr6fcjrnfl2za9sz4rw9";
   };
 

From 0842a451ef6d5f24f40f3ccb913311757b7ba407 Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Sat, 29 Jul 2017 17:24:51 +0200
Subject: [PATCH 2243/3246] dmd: Updating (2.070.2 -> 2.075.1), fixing and
 improving. PR #27743

---
 pkgs/development/compilers/dmd/2.067.1.nix | 144 ++++++++++++++++-----
 pkgs/development/compilers/dmd/default.nix | 138 ++++++++++++++++----
 2 files changed, 223 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix
index 4dbe922ce81..3cf530e9e5e 100644
--- a/pkgs/development/compilers/dmd/2.067.1.nix
+++ b/pkgs/development/compilers/dmd/2.067.1.nix
@@ -1,47 +1,122 @@
-{ stdenv, fetchurl, unzip, makeWrapper }:
+{ stdenv, fetchFromGitHub
+, makeWrapper, unzip, which
+, curl, tzdata
+}:
 
-stdenv.mkDerivation {
-  name = "dmd-2.067.1";
+stdenv.mkDerivation rec {
+  name = "dmd-${version}";
+  # This is the last version of dmd which is buildable without a D compiler.
+  # So we use this as a bootstrap version.
+  # The DMD frontend has been ported to D in 2.069.0 but idgen was already
+  # ported in 2.068.0.
+  version = "2.067.1";
 
-  src = fetchurl {
-    url = http://downloads.dlang.org/releases/2015/dmd.2.067.1.zip;
-    sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94";
-  };
+  srcs = [
+  (fetchFromGitHub {
+    owner = "dlang";
+    repo = "dmd";
+    rev = "v${version}";
+    sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz";
+  })
+  (fetchFromGitHub {
+    owner = "dlang";
+    repo = "druntime";
+    rev = "v${version}";
+    sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02";
+  })
+  (fetchFromGitHub {
+    owner = "dlang";
+    repo = "phobos";
+    rev = "v${version}";
+    sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1";
+  })
+  ];
 
-  nativeBuildInputs = [ unzip makeWrapper ];
+  sourceRoot = ".";
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-      # Allow to use "clang++", commented in Makefile
-      substituteInPlace src/dmd/posix.mak \
-          --replace g++ clang++ \
-          --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
+  postUnpack = ''
+      mv dmd-v${version}-src dmd
+      mv druntime-v${version}-src druntime
+      mv phobos-v${version}-src phobos
+  '';
 
-      # Was not able to compile on darwin due to "__inline_isnanl"
-      # being undefined.
-      substituteInPlace src/dmd/root/port.c --replace __inline_isnanl __inline_isnan
+  # Compile with PIC to prevent colliding modules with binutils 2.28.
+  # https://issues.dlang.org/show_bug.cgi?id=17375
+  usePIC = "-fPIC";
+
+  postPatch = ''
+      # Ugly hack so the dlopen call has a chance to succeed.
+      # https://issues.dlang.org/show_bug.cgi?id=15391
+      substituteInPlace phobos/std/net/curl.d \
+          --replace libcurl.so ${curl.out}/lib/libcurl.so
+
+      # Ugly hack to fix the hardcoded path to zoneinfo in the source file.
+      # https://issues.dlang.org/show_bug.cgi?id=15391
+      substituteInPlace phobos/std/datetime.d \
+          --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/
+
+      substituteInPlace druntime/test/shared/Makefile \
+          --replace "DFLAGS:=" "DFLAGS:=${usePIC} "
+
+      # phobos uses curl, so we need to patch the path to the lib.
+      substituteInPlace phobos/posix.mak \
+          --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4"
+
+      # Use proper C++ compiler
+      substituteInPlace dmd/src/posix.mak \
+          --replace g++ $CXX
   ''
-    + stdenv.lib.optionalString stdenv.isLinux ''
-        substituteInPlace src/dmd/root/port.c \
+
+    + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+        substituteInPlace dmd/src/root/port.c \
           --replace "#include <bits/mathdef.h>" "#include <complex.h>"
-      '';
+    ''
+
+    + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+        substituteInPlace dmd/src/posix.mak \
+            --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
+
+        # Was not able to compile on darwin due to "__inline_isnanl"
+        # being undefined.
+        substituteInPlace dmd/src/root/port.c --replace __inline_isnanl __inline_isnan
+    '';
+
+  nativeBuildInputs = [ makeWrapper unzip which ];
+  buildInputs = [ curl tzdata ];
 
   # Buid and install are based on http://wiki.dlang.org/Building_DMD
   buildPhase = ''
-      cd src/dmd
+      cd dmd
       make -f posix.mak INSTALL_DIR=$out
-      export DMD=$PWD/dmd
+      export DMD=$PWD/src/dmd
       cd ../druntime
-      make -f posix.mak INSTALL_DIR=$out DMD=$DMD
+      make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD
       cd ../phobos
-      make -f posix.mak INSTALL_DIR=$out DMD=$DMD
-      cd ../..
+      make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD
+      cd ..
+  '';
+
+  doCheck = true;
+
+  checkPhase = ''
+      cd dmd
+      export DMD=$PWD/src/dmd
+      cd ../druntime
+      make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release
+      cd ../phobos
+      make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release
+      cd ..
   '';
 
   installPhase = ''
-      cd src/dmd
+      cd dmd
       mkdir $out
       mkdir $out/bin
-      cp dmd $out/bin
+      cp $PWD/src/dmd $out/bin
+      mkdir -p $out/share/man/man1
+      mkdir -p $out/share/man/man5
+      cp -r docs/man/man1/* $out/share/man/man1/
+      cp -r docs/man/man5/* $out/share/man/man5/
 
       cd ../druntime
       mkdir $out/include
@@ -50,9 +125,11 @@ stdenv.mkDerivation {
 
       cd ../phobos
       mkdir $out/lib
-      ${let bits = if stdenv.is64bit then "64" else "32";
-            osname = if stdenv.isDarwin then "osx" else "linux"; in
-      "cp generated/${osname}/release/${bits}/libphobos2.a $out/lib"
+      ${
+          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
+          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name;
+          extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; in
+          "cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib"
       }
 
       cp -r std $out/include/d2
@@ -65,14 +142,17 @@ stdenv.mkDerivation {
       cd $out/bin
       tee dmd.conf << EOF
       [Environment]
-      DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--no-warn-search-mismatch -L--export-dynamic"}
+      DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
       EOF
   '';
 
   meta = with stdenv.lib; {
-    description = "D language compiler";
+    description = "Official reference compiler for the D language";
     homepage = http://dlang.org/;
-    license = licenses.free; # parts under different licenses
+    # Everything is now Boost licensed, even the backend.
+    # https://github.com/dlang/dmd/pull/6680
+    license = licenses.boost;
     platforms = platforms.unix;
   };
 }
+
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 41162c4e50e..278a77f6290 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -1,44 +1,123 @@
-{ stdenv, fetchurl
+{ stdenv, fetchFromGitHub
 , makeWrapper, unzip, which
-
+, curl, tzdata
 # Versions 2.070.2 and up require a working dmd compiler to build:
 , bootstrapDmd }:
 
 stdenv.mkDerivation rec {
   name = "dmd-${version}";
-  version = "2.070.2";
+  version = "2.075.1";
 
-  src = fetchurl {
-    url = "http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.zip";
-    sha256 = "1pbhxxf41v816j0aky3q2pcd8a6phy3363l7vr5r5pg8ps3gl701";
-  };
+  srcs = [
+  (fetchFromGitHub {
+    owner = "dlang";
+    repo = "dmd";
+    rev = "v${version}";
+    sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5";
+  })
+  (fetchFromGitHub {
+    owner = "dlang";
+    repo = "druntime";
+    rev = "v${version}";
+    sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j";
+  })
+  (fetchFromGitHub {
+    owner = "dlang";
+    repo = "phobos";
+    rev = "v${version}";
+    sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04";
+  })
+  ];
+
+  sourceRoot = ".";
+
+  postUnpack = ''
+      mv dmd-v${version}-src dmd
+      mv druntime-v${version}-src druntime
+      mv phobos-v${version}-src phobos
+  '';
+
+  # Compile with PIC to prevent colliding modules with binutils 2.28.
+  # https://issues.dlang.org/show_bug.cgi?id=17375
+  usePIC = "-fPIC";
+
+  postPatch = ''
+      # Ugly hack so the dlopen call has a chance to succeed.
+      # https://issues.dlang.org/show_bug.cgi?id=15391
+      substituteInPlace phobos/std/net/curl.d \
+          --replace libcurl.so ${curl.out}/lib/libcurl.so
+
+      # Ugly hack to fix the hardcoded path to zoneinfo in the source file.
+      # https://issues.dlang.org/show_bug.cgi?id=15391
+      substituteInPlace phobos/std/datetime/timezone.d \
+          --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/
+
+      substituteInPlace druntime/test/common.mak \
+          --replace "DFLAGS:=" "DFLAGS:=${usePIC} "
+
+      # phobos uses curl, so we need to patch the path to the lib.
+      substituteInPlace phobos/posix.mak \
+          --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4"
+
+      # Use proper C++ compiler
+      substituteInPlace dmd/posix.mak \
+          --replace g++ $CXX
+  ''
+
+    + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+        substituteInPlace dmd/posix.mak \
+            --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
+    '';
 
   nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which ];
-
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-      # Allow to use "clang++", commented in Makefile
-      substituteInPlace src/dmd/posix.mak \
-          --replace g++ clang++ \
-          --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
-  '';
+  buildInputs = [ curl tzdata ];
 
   # Buid and install are based on http://wiki.dlang.org/Building_DMD
   buildPhase = ''
-      cd src/dmd
+      cd dmd
       make -f posix.mak INSTALL_DIR=$out
-      export DMD=$PWD/dmd
+      ${
+          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
+          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in
+          "export DMD=$PWD/generated/${osname}/release/${bits}/dmd"
+      }
       cd ../druntime
-      make -f posix.mak INSTALL_DIR=$out DMD=$DMD
+      make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD
       cd ../phobos
-      make -f posix.mak INSTALL_DIR=$out DMD=$DMD
-      cd ../..
+      make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD
+      cd ..
+  '';
+
+  doCheck = true;
+
+  checkPhase = ''
+      cd dmd
+      ${
+          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
+          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in
+          "export DMD=$PWD/generated/${osname}/release/${bits}/dmd"
+      }
+      cd ../druntime
+      make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release
+      cd ../phobos
+      make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release
+      cd ..
   '';
 
   installPhase = ''
-      cd src/dmd
+      cd dmd
       mkdir $out
       mkdir $out/bin
-      cp dmd $out/bin
+      ${
+          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
+          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in
+          "cp $PWD/generated/${osname}/release/${bits}/dmd $out/bin"
+      }
+
+      mkdir -p $out/share/man/man1
+      mkdir -p $out/share/man/man5
+      cp -r docs/man/man1/* $out/share/man/man1/
+      cp -r docs/man/man5/* $out/share/man/man5/
 
       cd ../druntime
       mkdir $out/include
@@ -47,9 +126,11 @@ stdenv.mkDerivation rec {
 
       cd ../phobos
       mkdir $out/lib
-      ${let bits = if stdenv.is64bit then "64" else "32";
-            osname = if stdenv.isDarwin then "osx" else "linux"; in
-      "cp generated/${osname}/release/${bits}/libphobos2.a $out/lib"
+      ${
+          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
+          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name;
+          extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; in
+          "cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib"
       }
 
       cp -r std $out/include/d2
@@ -62,14 +143,17 @@ stdenv.mkDerivation rec {
       cd $out/bin
       tee dmd.conf << EOF
       [Environment]
-      DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--no-warn-search-mismatch -L--export-dynamic"}
+      DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
       EOF
   '';
 
   meta = with stdenv.lib; {
-    description = "D language compiler";
+    description = "Official reference compiler for the D language";
     homepage = http://dlang.org/;
-    license = licenses.free; # parts under different licenses
+    # Everything is now Boost licensed, even the backend.
+    # https://github.com/dlang/dmd/pull/6680
+    license = licenses.boost;
     platforms = platforms.unix;
   };
 }
+

From fb70d08232914ccdbcf0c25744f978d9b9173b31 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 18 Aug 2017 20:04:09 +0800
Subject: [PATCH 2244/3246] msgviewer: indent

---
 .../networking/mailreaders/msgviewer/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index 741f89eef05..487b2799b98 100644
--- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix
+++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
@@ -20,9 +20,9 @@ in stdenv.mkDerivation rec {
     mv $dir/${uname}/* $dir
     rmdir $dir/${uname}
     cat <<_EOF > $out/bin/msgviewer
-#!${stdenv.shell} -eu
-${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar $@
-_EOF
+    #!${stdenv.shell} -eu
+    exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@"
+    _EOF
     chmod 755 $out/bin/msgviewer
   '';
 

From e04c4d0fbb83423cb05f54d300d0c1070a11a514 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 18 Aug 2017 09:57:19 -0300
Subject: [PATCH 2245/3246] engrampa: init at 1.18.2

---
 pkgs/desktops/mate/default.nix          |  1 +
 pkgs/desktops/mate/engrampa/default.nix | 37 +++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/desktops/mate/engrampa/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 58b4f405cc8..fd326b6bbbb 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -6,6 +6,7 @@ rec {
   cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
     extensions = [ caja-extensions ];
   };
+  engrampa = callPackage ./engrampa { };
   eom = callPackage ./eom { };
   pluma = callPackage ./pluma { };
   mate-common = callPackage ./mate-common { };
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
new file mode 100644
index 00000000000..dea2bea5ee9
--- /dev/null
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "engrampa-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0d98zhqqc7qdnxcf0195kd04xmhijc0w2qrn6q61zd0daiswnv98";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    libxml2
+    gnome3.gtk
+    mate.caja
+    mate.mate-desktop
+  ];
+
+  configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
+
+  meta = {
+    description = "Archive Manager for MATE";
+    homepage = http://mate-desktop.org;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}

From 8d53bfe51b5b570dcd5a1f7d47de2f7a16240864 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 18 Aug 2017 15:45:31 +0200
Subject: [PATCH 2246/3246] libmspack: fix hash

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

diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index ce58b2cd333..79d4c056341 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.cabextract.org.uk/libmspack/${name}.tar.gz";
-    sha256 = "04413hynb7zizxnkgy9riik3612dwirkpr6fcjrnfl2za9sz4rw9";
+    sha256 = "08gr2pcinas6bdqz3k0286g5cnksmcx813skmdwyca6bmj1fxnqy";
   };
 
   meta = {

From b4c7d595c859c5c4ef57d2fa50bb16c207d29b3c Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Thu, 17 Aug 2017 11:09:45 +0800
Subject: [PATCH 2247/3246] imagemagick: 6.9.9-3 -> 6.9.9-7

The old release has been removed from https://www.imagemagick.org/download/releases/ causing new builds to fail.
---
 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 48a29e147f0..e31c249bb93 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -13,8 +13,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.9-3";
-    sha256 = "1bfg334nxkxhsm6h0hb0vwd9aiz031qa0w8w8hmhdk8m4wawshrg";
+    version = "6.9.9-7";
+    sha256 = "1lwsz9b8clygdppgawv2hsry4aykgmawjlwhg3fj70rndv4a8rw4";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.

From 749e702a4602f53f882ff71f43f21cd5f65b1bb1 Mon Sep 17 00:00:00 2001
From: Ryan Bernstein <ryanbernstein1@gmail.com>
Date: Fri, 18 Aug 2017 09:59:26 -0400
Subject: [PATCH 2248/3246] poretools: version number to commit date

---
 pkgs/applications/science/biology/poretools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix
index 520c508e2ac..3bb9ea06fd4 100755
--- a/pkgs/applications/science/biology/poretools/default.nix
+++ b/pkgs/applications/science/biology/poretools/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonPackage rec {
   pname = "poretools";
-  version = "0.6.0";
+  version = "unstable-2016-07-10";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {

From 2a9cb9d36db13a29222cec66802b47a354ccf980 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Sat, 12 Aug 2017 00:27:17 -0400
Subject: [PATCH 2249/3246] vscode-with-extensions: init at 1.10.2

---
 .../vscode-with-extensions/default.nix        | 82 +++++++++++++++++
 pkgs/misc/vscode-extensions/default.nix       | 18 ++++
 pkgs/misc/vscode-extensions/vscode-utils.nix  | 92 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++
 4 files changed, 198 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode-with-extensions/default.nix
 create mode 100644 pkgs/misc/vscode-extensions/default.nix
 create mode 100644 pkgs/misc/vscode-extensions/vscode-utils.nix

diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode-with-extensions/default.nix
new file mode 100644
index 00000000000..983acbbac19
--- /dev/null
+++ b/pkgs/applications/editors/vscode-with-extensions/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript
+, vscodeExtensions ? [] }:
+
+/*
+  `vsixExtensions`
+   :  A set of vscode extensions to be installed alongside the editor. Here's a an
+      example:
+
+      ~~~
+      vscode-with-extensions.override {
+
+        # When the extension is already available in the default extensions set.
+        vscodeExtensions = with vscodeExtensions; [
+          nix
+        ]   
+
+        # Concise version from the vscode market place when not available in the default set.
+        ++ vscodeUtils.extensionsFromVscodeMarketplace [
+          {
+            name = "code-runner";
+            publisher = "formulahendry";
+            version = "0.6.33";
+            sha256 = "166ia73vrcl5c9hm4q1a73qdn56m0jc7flfsk5p5q41na9f10lb0";
+          }
+        ];
+      }
+      ~~~
+
+      This expression should fetch 
+       -  the *nix* vscode extension from whatever source defined in the
+          default nixpkgs extensions set `vscodeExtensions`.
+
+       -  the *code-runner* vscode extension from the marketplace using the 
+          following url:
+
+          ~~~
+          https://bbenoist.gallery.vsassets.io/_apis/public/gallery/publisher/bbenoist/extension/nix/1.0.1/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage
+          ~~~
+
+      The original `code` executable will be wrapped so that it uses the set of pre-installed / unpacked
+      extensions as its `--extensions-dir`.
+*/
+
+let
+
+  wrappedPkgVersion = lib.getVersion vscode;
+  wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name;
+
+  combinedExtensionsDrv = buildEnv {
+    name = "${wrappedPkgName}-extensions-${wrappedPkgVersion}";
+    paths = vscodeExtensions;
+  };
+
+  wrappedExeName = "code";
+  exeName = wrappedExeName;
+
+  wrapperExeFile = writeScript "${exeName}" ''
+    #!${stdenv.shell}
+    exec ${vscode}/bin/${wrappedExeName} \
+      --extensions-dir "${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" \
+      "$@"
+  '';
+
+in
+
+# When no extensions are requested, we simply redirect to the original
+# non-wrapped vscode executable.
+runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
+  buildInputs = [ vscode which ];
+  dontPatchELF = true;
+  dontStrip = true;
+  meta = vscode.meta;
+} ''
+  mkdir -p "$out/bin"
+  ${if [] == vscodeExtensions
+    then ''
+      ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}"
+    ''
+    else ''
+      ln -sT "${wrapperExeFile}" "$out/bin/${exeName}"
+    ''}
+''
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
new file mode 100644
index 00000000000..12900907c00
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, lib, fetchurl, vscode-utils }:
+
+let
+  inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension;
+in
+
+rec {
+  nix = buildVscodeMarketplaceExtension {
+    mktplcRef = {
+        name = "nix";
+        publisher = "bbenoist";
+        version = "1.0.1";
+        sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b";
+    };
+
+    # TODO: Fill meta with appropriate information.
+  };
+}
\ No newline at end of file
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix
new file mode 100644
index 00000000000..759449a745b
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/vscode-utils.nix
@@ -0,0 +1,92 @@
+{ stdenv, lib, fetchurl, runCommand, vscode, which }:
+
+let
+  extendedPkgVersion = lib.getVersion vscode;
+  extendedPkgName = lib.removeSuffix "-${extendedPkgVersion}" vscode.name;
+
+  mktplcExtRefToFetchArgs = ext: {
+    url = "https://${ext.publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${ext.publisher}/extension/${ext.name}/${ext.version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage";
+    sha256 = ext.sha256;
+    name = "${ext.name}.vsix";
+  };
+
+  buildVscodeExtension = a@{
+    name,
+    namePrefix ? "${extendedPkgName}-extension-",
+    src,
+    configurePhase ? ":",
+    buildPhase ? ":",
+    dontPatchELF ? true,
+    dontStrip ? true,
+    buildInputs ? [],
+    ...
+  }:
+  stdenv.mkDerivation (a // {
+
+    name = namePrefix + name;
+
+    inherit configurePhase buildPhase dontPatchELF dontStrip;
+
+    # TODO: `which` is an encapsulation leak. It should have been hardwired
+    #       as part of the `code` wrapper. 
+    buildInputs = [ vscode which ] ++ buildInputs;
+
+    unpackPhase = ''
+      # TODO: Unfortunately, 'code' systematically creates its '.vscode' directory
+      # even tough it has nothing to write in it. We need to redirect this
+      # to a writeable location as the nix environment already has (but
+      # to a non writeable one) otherwise the write will fail.
+      # It would be preferrable if we could intercept / fix this at the source.
+      HOME="$PWD/code_null_home" code \
+        --extensions-dir "$PWD" \
+        --install-extension "${toString src}"
+
+      rm -Rf "$PWD/code_null_home"
+      cd "$(find . -mindepth 1 -type d -print -quit)"
+      ls -la
+    '';
+
+
+    installPhase = ''
+      mkdir -p "$out/share/${extendedPkgName}/extensions/${name}"
+      find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${name}/"
+    '';
+
+  });
+
+
+  fetchVsixFromVscodeMarketplace = mktplcExtRef:
+    fetchurl((mktplcExtRefToFetchArgs mktplcExtRef));
+
+  buildVscodeMarketplaceExtension = a@{
+    name ? "",
+    src ? null,
+    mktplcRef,
+    ...
+  }: assert "" == name; assert null == src;
+  buildVscodeExtension ((removeAttrs a [ "mktplcRef" ]) // {
+    name = "${mktplcRef.name}-${mktplcRef.version}";
+    src = fetchVsixFromVscodeMarketplace mktplcRef;
+  });
+
+  mktplcRefAttrList = [
+    "name"
+    "publisher"
+    "version"
+    "sha256"
+  ];
+
+  mktplcExtRefToExtDrv = ext: 
+    buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // { 
+      mktplcRef = ext; 
+    }); 
+
+  extensionsFromVscodeMarketplace = mktplcExtRefList:
+    builtins.map mktplcExtRefToExtDrv mktplcExtRefList;
+
+in
+
+{
+  inherit fetchVsixFromVscodeMarketplace buildVscodeExtension 
+          buildVscodeMarketplaceExtension extensionsFromVscodeMarketplace;
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33add0fca07..2c37ffb7e3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16565,6 +16565,12 @@ with pkgs;
 
   vscode = callPackage ../applications/editors/vscode { };
 
+  vscode-with-extensions = callPackage ../applications/editors/vscode-with-extensions {};
+
+  vscode-utils = callPackage ../misc/vscode-extensions/vscode-utils.nix {};
+
+  vscode-extensions = recurseIntoAttrs (callPackage ../misc/vscode-extensions {});
+
   vue = callPackage ../applications/misc/vue { };
 
   vwm = callPackage ../applications/window-managers/vwm { };

From fbab1d485b60f30af7f2403085c269dfa24b9984 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 15 Aug 2017 11:30:45 -0400
Subject: [PATCH 2250/3246] stdenvs: Distinguish between `extraBuildInputs` and
 `extraNativeBuildInputs`

This version continues to use bash + stdenv/setup for the default
inputs.
---
 pkgs/stdenv/darwin/default.nix          | 15 +++++++++++----
 pkgs/stdenv/generic/builder.sh          |  1 +
 pkgs/stdenv/generic/default.nix         | 18 +++++++++++++-----
 pkgs/stdenv/generic/make-derivation.nix | 16 ++++++++++++----
 pkgs/stdenv/linux/default.nix           | 10 +++++-----
 pkgs/stdenv/native/default.nix          |  8 ++++----
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 74dcf2f009b..2eeab14b1c7 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -59,11 +59,12 @@ in rec {
   stageFun = step: last: {shell             ? "${bootstrapTools}/bin/bash",
                           overrides         ? (self: super: {}),
                           extraPreHook      ? "",
+                          extraNativeBuildInputs,
                           extraBuildInputs,
                           allowedRequisites ? null}:
     let
       thisStdenv = import ../generic {
-        inherit config shell extraBuildInputs;
+        inherit config shell extraNativeBuildInputs extraBuildInputs;
         allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
           thisStdenv.cc.expand-response-params
         ];
@@ -162,6 +163,7 @@ in rec {
 
     };
 
+    extraNativeBuildInputs = [];
     extraBuildInputs = [];
   };
 
@@ -169,6 +171,7 @@ in rec {
 
   stage1 = prevStage: with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
+    extraNativeBuildInputs = [];
     extraBuildInputs = [ pkgs.libcxx ];
 
     allowedRequisites =
@@ -195,7 +198,8 @@ in rec {
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
 
-    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx ];
+    extraNativeBuildInputs = [ pkgs.xz ];
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     allowedRequisites =
       [ bootstrapTools ] ++
@@ -226,7 +230,8 @@ in rec {
     # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
     # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
     # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
-    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
+    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     extraPreHook = ''
       export PATH=${pkgs.bash}/bin:$PATH
@@ -260,7 +265,8 @@ in rec {
 
   stage4 = prevStage: with prevStage; stageFun 4 prevStage {
     shell = "${pkgs.bash}/bin/bash";
-    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
+    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
@@ -321,6 +327,7 @@ in rec {
       libc = pkgs.darwin.Libsystem;
     };
 
+    extraNativeBuildInputs = [];
     extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     extraAttrs = {
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 42e1a029e58..79bf21ab473 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -9,6 +9,7 @@ mkdir $out
 echo "export SHELL=$shell" > $out/setup
 echo "initialPath=\"$initialPath\"" >> $out/setup
 echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup
+echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup
 echo "$preHook" >> $out/setup
 cat "$setup" >> $out/setup
 
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index a5d3c5a8ff5..17bf1f8b428 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -9,6 +9,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 
 , setupScript ? ./setup.sh
 
+, extraNativeBuildInputs ? []
 , extraBuildInputs ? []
 , __stdenvImpureHostDeps ? []
 , __extraImpureHostDeps ? []
@@ -41,7 +42,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 }:
 
 let
-  defaultNativeBuildInputs = extraBuildInputs ++
+  defaultNativeBuildInputs = extraNativeBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
       ../../build-support/setup-hooks/strip.sh
@@ -58,11 +59,16 @@ let
       cc
     ];
 
+  defaultBuildInputs = extraBuildInputs;
+
   # The stdenv that we are producing.
   stdenv =
     derivation (
-    (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
-    {
+    lib.optionalAttrs (allowedRequisites != null) {
+      allowedRequisites = allowedRequisites
+        ++ defaultNativeBuildInputs ++ defaultBuildInputs;
+    }
+    // {
       inherit name;
 
       # Nix itself uses the `system` field of a derivation to decide where to
@@ -75,7 +81,8 @@ let
 
       setup = setupScript;
 
-      inherit preHook initialPath shell defaultNativeBuildInputs;
+      inherit preHook initialPath shell
+        defaultNativeBuildInputs defaultBuildInputs;
     }
     // lib.optionalAttrs buildPlatform.isDarwin {
       __sandboxProfile = stdenvSandboxProfile;
@@ -91,7 +98,8 @@ let
 
       inherit buildPlatform hostPlatform targetPlatform;
 
-      inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile;
+      inherit extraNativeBuildInputs extraBuildInputs
+        __extraImpureHostDeps extraSandboxProfile;
 
       # Utility flags to test the type of platform.
       inherit (hostPlatform)
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 74d387e353c..2fbaa76c6a4 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -65,13 +65,21 @@ rec {
            "sandboxProfile" "propagatedSandboxProfile"])
         // (let
           computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies);
+            lib.concatMap (input: input.__propagatedSandboxProfile or [])
+              (stdenv.extraNativeBuildInputs
+               ++ stdenv.extraBuildInputs
+               ++ lib.concatLists dependencies);
           computedPropagatedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies);
+            lib.concatMap (input: input.__propagatedSandboxProfile or [])
+              (lib.concatLists propagatedDependencies);
           computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+              (stdenv.extraNativeBuildInputs
+               ++ stdenv.extraBuildInputs
+               ++ lib.concatLists dependencies));
           computedPropagatedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+              (lib.concatLists propagatedDependencies));
         in
         {
           name = name + lib.optionalString
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 61262e1a64e..0167e51f2fd 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -47,7 +47,7 @@ let
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
   stageFun = prevStage:
-    { name, overrides ? (self: super: {}), extraBuildInputs ? [] }:
+    { name, overrides ? (self: super: {}), extraNativeBuildInputs ? [] }:
 
     let
 
@@ -56,7 +56,7 @@ let
         buildPlatform = localSystem;
         hostPlatform = localSystem;
         targetPlatform = localSystem;
-        inherit config extraBuildInputs;
+        inherit config extraNativeBuildInputs;
         preHook =
           ''
             # Don't patch #!/interpreter because it leads to retained
@@ -219,7 +219,7 @@ in
         isl = isl_0_14;
       };
     };
-    extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+    extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
       lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
@@ -253,7 +253,7 @@ in
         shell = self.bash + "/bin/bash";
       };
     };
-    extraBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
+    extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
       lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
@@ -283,7 +283,7 @@ in
       initialPath =
         ((import ../common-path.nix) {pkgs = prevStage;});
 
-      extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+      extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
         # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
         lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
 
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 02734f2f3e5..9ecb56028bc 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -66,7 +66,7 @@ let
     export lt_cv_deplibs_check_method=pass_all
   '';
 
-  extraBuildInputsCygwin = [
+  extraNativeBuildInputsCygwin = [
     ../cygwin/all-buildinputs-as-runtimedep.sh
     ../cygwin/wrap-exes-to-find-dlls.sh
   ] ++ (if system == "i686-cygwin" then [
@@ -94,9 +94,9 @@ let
         if system == "x86_64-cygwin" then prehookCygwin else
         prehookBase;
 
-      extraBuildInputs =
-        if system == "i686-cygwin" then extraBuildInputsCygwin else
-        if system == "x86_64-cygwin" then extraBuildInputsCygwin else
+      extraNativeBuildInputs =
+        if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
+        if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else
         [];
 
       initialPath = extraPath ++ path;

From 41abe41fd946c567f80356d6cc439b13970c6924 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 18 Aug 2017 13:00:24 -0400
Subject: [PATCH 2251/3246] binutils: Pass --build --host on non-arm

This is needed for build != host == target builds. Moreoever, we want
to move towards always passing all 3, and the previous change to
unbreak Arm moved us away from that.
---
 pkgs/development/tools/misc/binutils/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index e02cf1667cd..a528cb0bba9 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -84,7 +84,12 @@ stdenv.mkDerivation rec {
     else "-static-libgcc";
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = stdenv.lib.optionals (targetPlatform != hostPlatform) [ "build" "host" "target" ];
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags =
     [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"

From b11889e6a4f86918462bf60040c229dc07eb66fa Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 18 Aug 2017 10:54:22 -0400
Subject: [PATCH 2252/3246] gcc: Homogenize syntax in one small spot

Less noise in the diff help maintain these behemoths.
---
 pkgs/development/compilers/gcc/4.5/default.nix      | 3 +--
 pkgs/development/compilers/gcc/4.8/default.nix      | 2 +-
 pkgs/development/compilers/gcc/4.9/default.nix      | 2 +-
 pkgs/development/compilers/gcc/5/default.nix        | 2 +-
 pkgs/development/compilers/gcc/6/default.nix        | 2 +-
 pkgs/development/compilers/gcc/7/default.nix        | 2 +-
 pkgs/development/compilers/gcc/snapshot/default.nix | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 01ce4bde096..971726b8ab9 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -344,8 +344,7 @@ stdenv.mkDerivation ({
 
     # On GNU/Hurd glibc refers to Mach & Hurd
     # headers.
-    ++ optionals (libcCross != null &&
-                  hasAttr "propagatedBuildInputs" libcCross)
+    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
                  libcCross.propagatedBuildInputs);
 
   LIBRARY_PATH = makeLibraryPath ([]
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 38ff23f86a6..ee7ddccced7 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -467,7 +467,7 @@ stdenv.mkDerivation ({
 
     # On GNU/Hurd glibc refers to Mach & Hurd
     # headers.
-    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )
+    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
                  libcCross.propagatedBuildInputs);
 
   LIBRARY_PATH = makeLibraryPath ([]
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 04e67e44f77..1380d36725a 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -473,7 +473,7 @@ stdenv.mkDerivation ({
 
     # On GNU/Hurd glibc refers to Mach & Hurd
     # headers.
-    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )
+    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
                  libcCross.propagatedBuildInputs);
 
   LIBRARY_PATH = makeLibraryPath ([]
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e95ef92c3f6..536433ff3c6 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -491,7 +491,7 @@ stdenv.mkDerivation ({
 
     # On GNU/Hurd glibc refers to Mach & Hurd
     # headers.
-    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )
+    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")
                  libcCross.propagatedBuildInputs);
 
   LIBRARY_PATH = makeLibraryPath ([]
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 71e2238a27f..fa42bb5b851 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -481,7 +481,7 @@ stdenv.mkDerivation ({
 
     # On GNU/Hurd glibc refers to Mach & Hurd
     # headers.
-    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")
+    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
                  libcCross.propagatedBuildInputs);
 
   LIBRARY_PATH = makeLibraryPath ([]
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 0ef71a636e2..67b7dee446f 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -483,7 +483,7 @@ stdenv.mkDerivation ({
 
     # On GNU/Hurd glibc refers to Mach & Hurd
     # headers.
-    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")
+    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
                  libcCross.propagatedBuildInputs);
 
   LIBRARY_PATH = makeLibraryPath ([]
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index f3d8d27d90c..518ee5c7054 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -470,7 +470,7 @@ stdenv.mkDerivation ({
 
     # On GNU/Hurd glibc refers to Mach & Hurd
     # headers.
-    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")
+    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
                  libcCross.propagatedBuildInputs);
 
   LIBRARY_PATH = makeLibraryPath ([]

From 0a4d102b98e2b503f2717588248a8730e87712ce Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 18 Aug 2017 14:07:10 -0400
Subject: [PATCH 2253/3246] gcc 5: Don't quote `propagatedBuildInputs` in
 ?-check for consistency

Forgot to do this in last commit.
---
 pkgs/development/compilers/gcc/5/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 536433ff3c6..57b68d1a11f 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -491,7 +491,7 @@ stdenv.mkDerivation ({
 
     # On GNU/Hurd glibc refers to Mach & Hurd
     # headers.
-    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")
+    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
                  libcCross.propagatedBuildInputs);
 
   LIBRARY_PATH = makeLibraryPath ([]

From 2bbd1d877b971801020bb7a84341c0463934a569 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 18 Aug 2017 15:08:26 -0400
Subject: [PATCH 2254/3246] perl-ExtUtils-LibBuilder: Use the C compiler to
 link

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dd39fa078b9..781d3f89bbf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5119,6 +5119,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils/ExtUtils-LibBuilder-0.04.tar.gz;
       sha256 = "0j4rhx3w6nbvmxqjg6q09gm10nnpkcmqmh29cgxsfc9k14d8bb6w";
     };
+    perlPreHook = "export LD=$CC";
     meta = {
       description = "A tool to build C libraries";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From a5f01aa745ddc134cf0e2074f6e1f4c214bd00b1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 18 Aug 2017 15:30:37 -0400
Subject: [PATCH 2255/3246] linux: 4.9.43 -> 4.9.44

---
 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 40c99cbfd88..0c5a82c0290 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.43";
+  version = "4.9.44";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1h0fv24pmrwmnpa6zzknqk7swq15z7dhkvy1hvzkjz4bfqgb28mx";
+    sha256 = "18z3ijxdb6gmk6n37016233hq15bf9wkfqrkw67xlhyqa1hki9j4";
   };
 
   kernelPatches = args.kernelPatches;

From 9281b05c7f99f7893ea47aa778881d65146f5425 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 18 Aug 2017 15:33:53 -0400
Subject: [PATCH 2256/3246] linux: 4.12.7 -> 4.12.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index a7b6442cb6e..c223584c92d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.7";
+  version = "4.12.8";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14xyh5wyvp4pmvw4mz9lccw1ijshm7500ijmxzhc9ipjnmp5rhky";
+    sha256 = "0z4viglsqk9mv3hp6svwihncpxdgxdkzap74say1cqlbm1dqrdyi";
   };
 
   kernelPatches = args.kernelPatches;

From 242d950ab3f3d7b59551f9028c3f039283f1ac84 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 18 Aug 2017 21:40:58 +0200
Subject: [PATCH 2257/3246] geogebra: 5-0-377-0 -> 5-0-382-0

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

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index ec3d265fb80..aa1ede26f06 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-377-0";
+  version = "5-0-382-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "0rvsjpf7pyz8z5yrqmc5ixzq7mnf1pyp00i914qd6wn5bx0apkxv";
+    sha256 = "0xqln1ssm35q8ry4a0ly8rkgw41brmrhn26l6q6r0qqrnw85cnyv";
   };
 
   srcIcon = fetchurl {

From 319dac82d1c414a719d5974063239ebc414bf227 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 18 Aug 2017 21:42:50 +0200
Subject: [PATCH 2258/3246] geogebra: fallback to web.archive.org

---
 pkgs/applications/science/math/geogebra/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index aa1ede26f06..ef6b266eaaf 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -7,7 +7,14 @@ stdenv.mkDerivation rec {
   preferLocalBuild = true;
 
   src = fetchurl {
-    url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
+    urls = [
+      "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
+
+      # Fallback for 5-0-382-0
+      # To avoid breaks when latest geogebra version is
+      # removed from `download.geogebra.org`
+      "http://web.archive.org/web/20170818191250/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-382-0.tar.bz2"
+    ];
     sha256 = "0xqln1ssm35q8ry4a0ly8rkgw41brmrhn26l6q6r0qqrnw85cnyv";
   };
 

From 7209ed6d4ba2fb150107698b4c90736dc7596c40 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 18 Aug 2017 15:47:03 -0400
Subject: [PATCH 2259/3246] linux-copperhead: 4.12.7.a -> 4.12.8.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 1e54985ba59..9e0c55fed6e 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.12.7";
+  version = "4.12.8";
   revision = "a";
-  sha256 = "1kj0s5r7fx2d0crak7576jv9r6q7yx4aqmxpib6mhj1zfhsczdp0";
+  sha256 = "03ldbgs4w70q756bl5gsxr2z428njnlslh6293y34r54gz5li9a3";
 in
 
 import ./generic.nix (args // {

From a73c721f3fa726d2f7d29e46289913ad2d519e0f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 18 Aug 2017 21:48:38 +0200
Subject: [PATCH 2260/3246] programs.zsh: move evlauation of `${zshAliases}`
 after `cfg.interactiveShellInit`

`cfg.interactiveShellInit` is used by modules like
`programs.zsh.oh-my-zsh`. This means that all aliases defined in
`programs.zsh.shellAliases` might be overriden which is highly
unpredictable
---
 nixos/modules/programs/zsh/zsh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index a055291282c..5d3fa37df8c 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -164,12 +164,12 @@ in
           "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
         }
 
-        ${zshAliases}
-
         ${cfge.interactiveShellInit}
 
         ${cfg.interactiveShellInit}
 
+        ${zshAliases}
+
         ${cfg.promptInit}
 
         # Tell zsh how to find installed completions

From 5b1134cb796a1d6befbaf213fae7e16c87d8a094 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 18 Aug 2017 16:39:43 -0400
Subject: [PATCH 2261/3246] docker: 17.06.0-ce -> 17.06.1-ce

---
 pkgs/applications/virtualization/docker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index b381a2547be..e1935f39092 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -170,13 +170,13 @@ rec {
   };
 
   docker_17_06 = dockerGen rec {
-    version = "17.06.0-ce";
-    rev = "02c1d876176546b5f069dae758d6a7d2ead6bd48"; # git commit
-    sha256 = "0wrg4ygcq4c7f2bwa7pgc7y33idg0hijavx40588jaglz4k8sqpm";
+    version = "17.06.1-ce";
+    rev = "874a7374f31c77aca693d025101b2de1b20b96c2"; # git commit
+    sha256 = "08xhww2rhpyj73zgh5maycs85zpc0sm3ak8yyyd92dwgncmyi2im";
     runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4";
     runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq";
-    containerdRev = "cfb82a876ecc11b5ca0977d1733adbe58599088a";
-    containerdSha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552";
+    containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429";
+    containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j";
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };

From b76acc95222e6ed11c6f051cb1bce091deb50aed Mon Sep 17 00:00:00 2001
From: Ben Darwin <ben@ramanujan>
Date: Fri, 11 Aug 2017 14:08:22 -0400
Subject: [PATCH 2262/3246] gpy: init at 1.7.7

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

diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
new file mode 100644
index 00000000000..0bdc7247b3d
--- /dev/null
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, numpy, scipy, six, paramz, nose, matplotlib, cython }:
+
+buildPythonPackage rec {
+  pname = "GPy";
+  version = "1.7.7";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b4siirlkqic1lsn9bi9mnp8fpbpw1ijwv0z2i6r2zdrk3d6szs1";
+  };
+
+  # running tests produces "ImportError: cannot import name 'linalg_cython'"
+  # even though Cython has run
+  checkPhase = "nosetests -d";
+  doCheck = false;
+
+  checkInputs = [ nose ];
+
+  buildInputs = [ cython ];
+
+  propagatedBuildInputs = [ numpy scipy six paramz matplotlib ];
+
+  meta = with stdenv.lib; {
+    description = "Gaussian process framework in Python";
+    homepage = https://sheffieldml.github.io/GPy;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c5fe359981..1eb177aec65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6406,6 +6406,8 @@ in {
     '';
   };
 
+  gpy = callPackage ../development/python-modules/gpy { };
+
   gitdb = buildPythonPackage rec {
     name = "gitdb-0.6.4";
 

From dd809b930e4e1d5de7d1dd33310a8c28d9515992 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 19 Aug 2017 10:22:23 +0900
Subject: [PATCH 2263/3246] pytorch: 0.1.12 -> 0.2.0

---
 pkgs/development/python-modules/pytorch/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 2088b2e0b10..64175ea6d6d 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -2,15 +2,15 @@
   git, stdenv }:
 
 buildPythonPackage rec {
-  version = "0.1.12";
+  version = "0.2.0";
   pname = "pytorch";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
-    owner = "pytorch";
-    repo = "pytorch";
-    rev = "v${version}";
-    sha256 = "0r8mf4xya76gz83y5z3hfxh0rydkydafhipl8g7d0bfrgw961jy9";
+    owner  = "pytorch";
+    repo   = "pytorch";
+    rev    = "v${version}";
+    sha256 = "112mp3r70d8f15dhxm6k7912b5i6c2q8hv9462s808y84grr2jdm";
   };
 
   checkPhase = ''

From 69a9a2a40c8c5571f07c62764fc940f6fb2e13f0 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Fri, 18 Aug 2017 23:39:18 -0400
Subject: [PATCH 2264/3246] vscode: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index a22f4627c99..5db2a1aaece 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.15.0";
+  version = "1.15.1";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "1ny4n6xbwvw88fy6k59dd2g4h8z9a9r7m6fbpgs6lwv0a6cill01";
-    "x86_64-linux" = "16mm9yks271p81nsp6yhfgdy5b1w7cs12cwn2z919kj0i4i09fk1";
-    "x86_64-darwin" = "1dwpnllff72yd8a6gc9xv4j7fxwsjgwjvdss0ld4m6kx17zm43qm";
+    "i686-linux" = "09vvq02bsq6fdb0ibshn97kll43dpfmyq2dahl9gj02jlwardq27";
+    "x86_64-linux" = "1kg25i4kavmgivnk4w3dsbsnn9vncl5d2m0ds93f8qvmxpizwg21";
+    "x86_64-darwin" = "1fgjg7c9appp8v0ir7m2r3a3x4z0gx4na0p3d8j1x4pcs0kqy0qp";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 9e00c643d823b9c7483c13cc338c6a3322102a9c Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 19 Aug 2017 06:21:13 +0000
Subject: [PATCH 2265/3246] boot.kernelParams: dedup and sort

dedup and sort boot.kernelParams  to avoid restarting services on eval order change
Fixes https://github.com/NixOS/nixpkgs/issues/28277
---
 nixos/modules/system/boot/kernel.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index cf70a891c0c..cc68be781fc 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -57,6 +57,7 @@ in
       type = types.listOf types.str;
       default = [ ];
       description = "Parameters added to the kernel command line.";
+      apply = list: attrNames (genAttrs list (_: true)); # dedup and sort to avoid restarting services on eval order change
     };
 
     boot.consoleLogLevel = mkOption {

From 94cddde66f732cefcb850773d245bdab8d541159 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 19 Aug 2017 06:27:59 +0000
Subject: [PATCH 2266/3246] liberation_ttf: make derivation fixed-output

- [x] make derivation fixed-output
- [x] change upstream domain. fedorahosted.org -> pagure.{org,io}
---
 .../fonts/redhat-liberation-fonts/default.nix | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index a0511c6a353..3fbcefc3187 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -4,23 +4,27 @@ let
   inherit (python2.pkgs) fonttools;
 
   common =
-    {version, url, sha256, buildInputs}:
+    {version, url, sha256, buildInputs, postPatch ? null, outputHash}:
     stdenv.mkDerivation rec {
       name = "liberation-fonts-${version}";
       src = fetchurl {
         inherit url sha256;
       };
 
-      inherit buildInputs;
+      inherit buildInputs postPatch;
 
       installPhase = ''
         mkdir -p $out/share/fonts/truetype
         cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
 
-        mkdir -p "$out/doc/${name}"
-        cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
+        mkdir -p "$out/share/doc/${name}"
+        cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${name}" || true
       '';
 
+      outputHashAlgo = "sha256";
+      outputHashMode = "recursive";
+      inherit outputHash;
+
       meta = with stdenv.lib; {
         description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
         longDescription = ''
@@ -36,7 +40,7 @@ let
         '';
 
         license = licenses.ofl;
-        homepage = https://fedorahosted.org/liberation-fonts/;
+        homepage = https://pagure.io/liberation-fonts/;
         maintainers = [
           maintainers.raskin
         ];
@@ -47,26 +51,35 @@ let
 in {
   liberation_ttf_v1_from_source = common rec {
     version = "1.07.4";
-    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz";
+    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
     sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d";
-    buildInputs = [ fontforge fonttools ];
+    buildInputs = [ fontforge ];
+    outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p";
   };
   liberation_ttf_v1_binary = common rec {
     version = "1.07.4";
-    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
+    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
     sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1";
     buildInputs = [ ];
+    outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab";
   };
   liberation_ttf_v2_from_source = common rec {
     version = "2.00.1";
-    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz";
+    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
     sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
     buildInputs = [ fontforge fonttools ];
+    postPatch = ''
+      substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
+        'font = ttLib.TTFont(fontfile)' \
+        'font = ttLib.TTFont(fontfile, recalcTimestamp=False)'
+    '';
+    outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn";
   };
   liberation_ttf_v2_binary = common rec {
     version = "2.00.1";
-    url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
+    url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
     sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
     buildInputs = [ ];
+    outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk";
   };
 }

From 5342bffc1571a28641b93ca51f859aafe7c958d5 Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Fri, 18 Aug 2017 18:01:05 -0500
Subject: [PATCH 2267/3246] remove collection-json from
 dont-distribute-packages

I believe I've fixed the build issues for collection-json and would like
to see it make it into the next stable release of NixOS.  I'm also
adding myself as maintainer.

Let me know if there is anything I did incorrectly or missed.
---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b8a361c3c96..fc46f4a50a4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2594,6 +2594,8 @@ package-maintainers:
   abbradar:
     - Agda
     - lambdabot
+  alunduil:
+    - collection-json
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
@@ -3433,7 +3435,6 @@ dont-distribute-packages:
   collada-output:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   collada-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   collapse-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collection-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections-base-instances:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]

From 0488cb18025a285475cde07112ddec00fb921b06 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 18 Aug 2017 15:07:03 +0300
Subject: [PATCH 2268/3246] tests/installer: Rename simpleUefiGummiboot ->
 simpleUefiSystemdBoot

It hasn't been called Gummiboot for ages.
---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index a6afe8a4b72..d1fc3c85e99 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -270,7 +270,7 @@ in {
     };
 
   # Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem
-  simpleUefiGummiboot = makeInstallerTest "simpleUefiGummiboot"
+  simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot"
     { createPartitions =
         ''
           $machine->succeed(

From affcf9228745cbcb2a0a521e120273f1cb209a3d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 18 Aug 2017 15:14:18 +0300
Subject: [PATCH 2269/3246] nixos/tests: Make the UEFI boot test
 release-critical

Seems to be working fine, based on the history:
https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.installer.simpleUefiGummiboot.i686-linux/all
https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.installer.simpleUefiGummiboot.x86_64-linux/all
---
 nixos/release-combined.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 26e689a7c92..54fd4a15ffc 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -70,6 +70,7 @@ in rec {
         (all nixos.tests.installer.simple)
         (all nixos.tests.installer.simpleLabels)
         (all nixos.tests.installer.simpleProvided)
+        (all nixos.tests.installer.simpleUefiSystemdBoot)
         (all nixos.tests.installer.swraid)
         (all nixos.tests.installer.btrfsSimple)
         (all nixos.tests.installer.btrfsSubvols)

From d79530dd1b3733af4aa59841ff39734fb8276b86 Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Sat, 19 Aug 2017 15:58:59 +0900
Subject: [PATCH 2270/3246] tilix: 1.6.1 -> 1.6.4

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

diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 63b3430cbe3..51efed022e7 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "tilix-${version}";
-  version = "1.6.1";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "gnunn1";
     repo = "tilix";
     rev = "${version}";
-    sha256 = "10nw3q6s941dm44bkfryl1xclr1xy1vjr2n8w7g6kfahpcazf8f8";
+    sha256 = "1vqi68jlbbaky1569kd4lr6p02zsiv7v2rfb8j1pzwj7gydblaac";
   };
 
   nativeBuildInputs = [

From ff01459e6cf00b3abeb3f5bbec4b7ed297968ab8 Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Sat, 19 Aug 2017 16:37:27 +0900
Subject: [PATCH 2271/3246] tilix: Disable DBusActivatable in the desktop entry

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

diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 51efed022e7..2128c260b80 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \
       --replace "Exec=tilix" "Exec=$out/bin/tilix"
+    sed -i '/^DBusActivatable=/d' $out/share/applications/com.gexperts.Tilix.desktop
   '';
 
   meta = with stdenv.lib; {

From 14eb44d2b8b84c86b4a80fbb38304620b6cf4cab Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 19 Aug 2017 09:08:44 -0400
Subject: [PATCH 2272/3246] minikube-kubernetes: 1.7.0 -> 1.7.3

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

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 081811ecd64..0a3cede66f3 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,10 +14,10 @@ let
   # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
   # currently https://storage.googleapis.com/minikube/k8s_releases.json
 
-  localkube-version = "1.7.0";
+  localkube-version = "1.7.3";
   localkube-binary = fetchurl {
     url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
-    sha256 = "1pp5bi0bpxxzrshvkv47hqs20jfx3gp1i1p3pw1rvzm5n1fn2q1a";
+    sha256 = "1ay11321kg3waxzi9d885pr08hz97a8ajwk31kbfxlm3x5bk3jii";
   };
 in buildGoPackage rec {
   pname   = "minikube";

From a741ac5a1ee7021c634170c75887db1547844c07 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 19 Aug 2017 09:09:57 -0400
Subject: [PATCH 2273/3246] kotlin: 1.1.2-5 -> 1.1.4-2

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index e23bee15e1b..65c2125dfbc 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.2-5";
+  version = "1.1.4-2";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0whfnn7wf8nil9lb8hl9bccjrzwf9zpbf8pz607zg9x3q8g01p9d";
+    sha256 = "09sikwk5xxn4b30icbq28mjs4lm9xbj0bv5yjx75r165iz65g2cv";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 72278d2fd96e949fda0b54a136707dc4bbf88471 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 19 Aug 2017 09:07:54 -0400
Subject: [PATCH 2274/3246] atom: 1.19.0 -> 1.19.2

---
 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 ec8bef7deee..31e6476d282 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.19.0";
+  version = "1.19.2";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1gdasqpmbyasd05p5920aw6bf8j58crs51gxjslsgbl1azi4yfh2";
+    sha256 = "0bfhcxhjsa7p35s5dz3zjxm4wc802m3k137p04l9anr3v5hrgqmb";
     name = "${name}.deb";
   };
 

From acf01cbc6ca8523615f672af95c048c0791ad240 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 19 Aug 2017 15:24:35 +0200
Subject: [PATCH 2275/3246] lean2: 2016-11-29 -> 2017-07-22

This will also fix the build issues with GCC 6.
---
 pkgs/applications/science/logic/lean2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
index a938af72f58..f45f65e9082 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "lean2-${version}";
-  version = "2016-11-29";
+  version = "2017-07-22";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean2";
-    rev    = "a086fb334838c427bbc8f984eb44a4cbbe013a6b";
-    sha256 = "0qlvhnb37amclgcyizl8bfab33b0a3jk54br9gsrik8cq76lkwwx";
+    rev    = "34dbd6c3ae612186b8f0f80d12fbf5ae7a059ec9";
+    sha256 = "1xv3j487zhh1zf2b4v19xzw63s2sgjhg8d62a0kxxyknfmdf3khl";
   };
 
   buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ];

From dd72f175343650291b2d261f04c84994353a0e49 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 19 Aug 2017 13:27:26 +0000
Subject: [PATCH 2276/3246] dejavu_fonts: made derivation fixed-output

---
 pkgs/data/fonts/dejavu-fonts/default.nix | 81 +++++++++++++++---------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 267a0b80a1f..1e888fe0784 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -1,34 +1,7 @@
 {fetchFromGitHub, stdenv, fontforge, perl, FontTTF}:
 
-let version = "2.37" ; in
-
-stdenv.mkDerivation rec {
-  name = "dejavu-fonts-${version}";
-  buildInputs = [fontforge perl FontTTF];
-
-  src = fetchFromGitHub {
-    owner = "dejavu-fonts";
-    repo = "dejavu-fonts";
-    rev = "version_${stdenv.lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk";
-  };
-
-  outputs = [ "out" "minimal" ];
-
-  buildFlags = "full-ttf";
-
-  preBuild = "patchShebangs scripts";
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    for i in $(find build -name '*.ttf'); do
-        cp $i $out/share/fonts/truetype;
-    done;
-  '' + ''
-    local fname=share/fonts/truetype/DejaVuSans.ttf
-    moveToOutput "$fname" "$minimal"
-    ln -s "$minimal/$fname" "$out/$fname"
-  '';
+let
+  version = "2.37";
 
   meta = {
     description = "A typeface family based on the Bitstream Vera fonts";
@@ -49,4 +22,54 @@ stdenv.mkDerivation rec {
 
     platforms = stdenv.lib.platforms.unix;
   };
+
+  full-ttf = stdenv.mkDerivation {
+    name = "dejavu-fonts-full-${version}";
+    buildInputs = [fontforge perl FontTTF];
+
+    src = fetchFromGitHub {
+      owner = "dejavu-fonts";
+      repo = "dejavu-fonts";
+      rev = "version_${stdenv.lib.replaceStrings ["."] ["_"] version}";
+      sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk";
+    };
+
+    buildFlags = "full-ttf";
+
+    preBuild = "patchShebangs scripts";
+
+    installPhase = ''
+      mkdir -p $out/share/fonts/truetype
+      cp build/*.ttf $out/share/fonts/truetype/
+    '';
+
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = "1cxprzsr826d888ha4zxx28i9jfj1k74q9kfv3v2rf603460iha9";
+    inherit meta;
+  };
+
+  minimal = stdenv.mkDerivation {
+    name = "dejavu-fonts-minimal-${version}";
+    buildCommand = ''
+      install -D ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf $out/share/fonts/truetype/DejaVuSans.ttf
+    '';
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = "0ybsynp9904vmd3qv5b438swhx43m5q6gfih3i32iw33rks8nkpj";
+    inherit meta;
+  };
+in stdenv.mkDerivation {
+  name = "dejavu-fonts-${version}";
+  buildCommand = ''
+    mkdir -p $out/share/fonts/truetype
+    cp ${full-ttf}/share/fonts/truetype/*.ttf $out/share/fonts/truetype/
+    ln -s --force ${minimal}/share/fonts/truetype/DejaVuSans.ttf $out/share/fonts/truetype/DejaVuSans.ttf
+  '';
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1nf0h15p8yvjx36syq1034i3hix99lm8p54iyjw8dpa19i9jfkmd";
+  inherit meta;
+
+  passthru.minimal = minimal;
 }

From 95bb851d80391bd957ce3ea85fa5b1057029fe4f Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 19 Aug 2017 15:38:38 +0200
Subject: [PATCH 2277/3246] fcitx-engines.mozc, ibus-engines.mozc: fix build

This is a temporary workaround for
https://github.com/NixOS/nixpkgs/issues/28223
---
 pkgs/top-level/all-packages.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 896dc4e8e5e..4081fad4ffb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1427,10 +1427,11 @@ with pkgs;
 
     m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
 
-    mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
+    mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec {
+      clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223
       python = python2;
       inherit (python2Packages) gyp;
-      protobuf = protobuf3_2.override { stdenv = clangStdenv; };
+      protobuf = protobuf3_2.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
     };
 
     table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
@@ -1900,10 +1901,11 @@ with pkgs;
 
     m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { };
 
-    mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
+    mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec {
+      clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223
       python = python2;
       inherit (python2Packages) gyp;
-      protobuf = protobuf3_2.override { stdenv = clangStdenv; };
+      protobuf = protobuf3_2.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
     };
 
     table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };

From 8b4f5376ff1f1ad6898febe99941bd9a4c890f6b Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 15 Jul 2017 21:50:30 +0000
Subject: [PATCH 2278/3246] geoip: set default dir to
 '/var/lib/geoip-databases'

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

diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index bf671ebecd1..60d40b10aa4 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -1,10 +1,10 @@
 # in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP
 # e.g. geolite-legacy
-{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? null }:
+{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }:
 
-let version = "1.6.2"; in
-
-stdenv.mkDerivation {
+let version = "1.6.2";
+    dataDir = if (stdenv.lib.isDerivation geoipDatabase) then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase;
+in stdenv.mkDerivation {
   name = "${drvName}-${version}";
 
   src = fetchurl {
@@ -12,11 +12,8 @@ stdenv.mkDerivation {
     sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
   };
 
-  postInstall = ''
-    DB=${toString geoipDatabase}
-    if [ -n "$DB" ]; then
-      ln -s $DB/share/GeoIP $out/share/GeoIP
-    fi
+  postPatch = ''
+    find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \;
   '';
 
   meta = {

From 1ddf621b4ede470ccb430e7e46f350df8f5b9438 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 18 Aug 2017 03:00:32 +0200
Subject: [PATCH 2279/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4.1-4-g53777ef from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/cf0ce689623ba59cf168a99b6af8fb78994d7dcc.
---
 .../haskell-modules/hackage-packages.nix      | 506 +++++++++++++++---
 1 file changed, 424 insertions(+), 82 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c0d8bb23bd4..b75b805c630 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3975,8 +3975,8 @@ self: {
      }:
      mkDerivation {
        pname = "DeepDarkFantasy";
-       version = "0.2017.8.16";
-       sha256 = "1gkvg5vd1r9a6zxz7q7w9096015k1bjqay1y58k9w3v8b1iw3w02";
+       version = "0.2017.8.18";
+       sha256 = "1gm86c03b06hjv83g4mmyilhcryz2gqygbcwlkg5mibvi1wixqqf";
        libraryHaskellDepends = [
          base bimap constraints containers mtl random recursion-schemes
          template-haskell
@@ -10953,7 +10953,7 @@ self: {
      }) {inherit (pkgs) openblasCompat;};
 
   "LDAP" = callPackage
-    ({ mkDerivation, base, HUnit, lber, openldap }:
+    ({ mkDerivation, base, HUnit, openldap }:
      mkDerivation {
        pname = "LDAP";
        version = "0.6.11";
@@ -10961,15 +10961,15 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ lber openldap ];
+       librarySystemDepends = [ openldap ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
-       testSystemDepends = [ lber openldap ];
+       testSystemDepends = [ openldap ];
        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;};
+     }) {inherit (pkgs) openldap;};
 
   "LRU" = callPackage
     ({ mkDerivation, base, containers, QuickCheck }:
@@ -12914,6 +12914,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "NoHoed" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "NoHoed";
+       version = "0.1.0";
+       sha256 = "1xrdd45rr0b1zi8ig5wjig1dyh2x1va84gqglf10yb5r0x4rzm93";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/pepeiborra/NoHoed";
+       description = "Placeholder package to preserve debug ability via conditional builds";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "NoSlow" = callPackage
     ({ mkDerivation, array, base, containers, criterion, dph-base
      , dph-prim-seq, statistics, storablevector, template-haskell
@@ -19669,6 +19681,8 @@ self: {
        pname = "accelerate-bignum";
        version = "0.1.0.0";
        sha256 = "199h9vq62hxs7pdwch8xh8zcx9kz9x6195yi389k1va6srkw863w";
+       revision = "1";
+       editedCabalFile = "0gwfw6bzy00spi0nm82p63fjc7sigk733ysnla64znqilca8nrmv";
        libraryHaskellDepends = [
          accelerate accelerate-llvm accelerate-llvm-native
          accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell
@@ -19814,8 +19828,8 @@ self: {
        pname = "accelerate-fft";
        version = "1.0.0.0";
        sha256 = "1qw4ln9xamv86lvb7y5xfzs12br4jbszai17jlagffmc6rnlhjkq";
-       revision = "1";
-       editedCabalFile = "101gc2wjisilgs0mib8l31sy6m6w04c0jp0zzr20p5j1gr3qjlnd";
+       revision = "2";
+       editedCabalFile = "0vycxsl60rd87ypcbmfkj1sjl4bz60n5lj4bdv6p7f8qpa1hgya1";
        libraryHaskellDepends = [
          accelerate accelerate-llvm accelerate-llvm-native
          accelerate-llvm-ptx base bytestring carray cuda cufft fft
@@ -19899,6 +19913,8 @@ self: {
        pname = "accelerate-io";
        version = "1.0.0.0";
        sha256 = "0h5nr0n1cdch20ld7s7mchr7wciasac4rmf4w2z61a48nj2knayi";
+       revision = "1";
+       editedCabalFile = "0k8zwri66bsjiarmp0s4lvv67ja8ip8qg5kzhzw17n22m21ww0dq";
        libraryHaskellDepends = [
          accelerate array base bmp bytestring repa vector
        ];
@@ -30207,17 +30223,16 @@ self: {
      }:
      mkDerivation {
        pname = "ballast";
-       version = "0.1.0.0";
-       sha256 = "1skzfj5l4j1jgpc0dlqmwpysa4bf9f9jpllz6zqb17zknicd77qf";
-       revision = "2";
-       editedCabalFile = "1xpw3rpr0fb6k4q1nzcjl1mqq62pbd0gwwa808nwdk9533mpjfyf";
+       version = "0.2.0.0";
+       sha256 = "1l5d4ngbvmdba2gm2819mf0lb0bs8c19gvjqkxgb59i9y6qb0n6n";
        libraryHaskellDepends = [
          aeson base bytestring either-unwrap hspec hspec-expectations
          http-client http-client-tls http-types text time transformers
          unordered-containers utf8-string vector
        ];
        testHaskellDepends = [
-         base bytestring either-unwrap hspec hspec-expectations text time
+         base bytestring either-unwrap hspec hspec-expectations http-client
+         http-client-tls text time
        ];
        homepage = "https://github.com/alexeyzab/ballast#readme";
        description = "Shipwire API client";
@@ -43453,6 +43468,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clingo" = callPackage
+    ({ mkDerivation, base, bifunctors, clingo, deepseq, exceptions
+     , hashable, mtl, StateVar, text, transformers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clingo";
+       version = "0.2.0.0";
+       sha256 = "1swc0fkzfsrg29jcncaskj167j0bk4y21irna8p7v9b1wp4yhnc3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bifunctors deepseq exceptions hashable mtl StateVar text
+         transformers wl-pprint-text
+       ];
+       librarySystemDepends = [ clingo ];
+       homepage = "https://github.com/tsahyt/clingo-haskell#readme";
+       description = "Haskell bindings to the Clingo ASP solver";
+       license = stdenv.lib.licenses.mit;
+     }) {clingo = null;};
+
   "clippard" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
@@ -45070,6 +45105,8 @@ self: {
        pname = "colour-accelerate";
        version = "0.1.0.0";
        sha256 = "1clcn0ipcrifcxqqb72k1xnga005v1ih79q8164ycsh2hgkdm4ij";
+       revision = "2";
+       editedCabalFile = "0izp44hlzg267mi2hrf96mfzpyvk8jp0b0p6y9lb1vs624a1gy4c";
        libraryHaskellDepends = [ accelerate base ];
        homepage = "https://github.com/tmcdonell/colour-accelerate";
        description = "Working with colours in Accelerate";
@@ -46305,37 +46342,31 @@ self: {
      , concrete-haskell-autogen, containers, directory, filepath
      , hashable, megaparsec, monad-extras, mtl, network
      , optparse-generic, path, path-io, process, QuickCheck, scientific
-     , tar, text, thrift, time, unordered-containers, uuid, vector, zip
-     , zlib
+     , stm, tar, text, thrift, time, unordered-containers, uuid, vector
+     , zip, zlib
      }:
      mkDerivation {
        pname = "concrete-haskell";
-       version = "0.1.0.14";
-       sha256 = "1qmnmwdk1gz6kn35j150xgdz3fiz895l3qn1km11i6g3ns46rjvj";
+       version = "0.1.0.15";
+       sha256 = "1g6nqr82gr5937irjs2h6ybp024k6gzpmpx1lsri8yw70kxgryjl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring bzlib concrete-haskell-autogen containers
          directory filepath hashable megaparsec monad-extras mtl network
-         optparse-generic path path-io process QuickCheck scientific tar
+         optparse-generic path path-io process QuickCheck scientific stm tar
          text thrift time unordered-containers uuid vector zip zlib
        ];
        executableHaskellDepends = [
          base binary bytestring bzlib concrete-haskell-autogen containers
          directory filepath hashable megaparsec monad-extras mtl network
-         optparse-generic path path-io process QuickCheck scientific tar
+         optparse-generic path path-io process QuickCheck scientific stm tar
          text thrift time unordered-containers uuid vector zip zlib
        ];
        testHaskellDepends = [
          base binary bytestring bzlib concrete-haskell-autogen containers
          directory filepath hashable megaparsec monad-extras mtl network
-         optparse-generic path path-io process QuickCheck scientific tar
-         text thrift time unordered-containers uuid vector zip zlib
-       ];
-       benchmarkHaskellDepends = [
-         base binary bytestring bzlib concrete-haskell-autogen containers
-         directory filepath hashable megaparsec monad-extras mtl network
-         optparse-generic path path-io process QuickCheck scientific tar
+         optparse-generic path path-io process QuickCheck scientific stm tar
          text thrift time unordered-containers uuid vector zip zlib
        ];
        homepage = "https://github.com/hltcoe";
@@ -53231,6 +53262,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-has_0_3_0_0" = callPackage
+    ({ mkDerivation, base, criterion, transformers }:
+     mkDerivation {
+       pname = "data-has";
+       version = "0.3.0.0";
+       sha256 = "0ybkm9zvl0l60f44p80fislbdmwwhavqz31wymnikjsyc01x899w";
+       libraryHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion transformers ];
+       homepage = "https://github.com/winterland1989/data-has";
+       description = "Simple extensible product";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-hash" = callPackage
     ({ mkDerivation, array, base, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -55135,13 +55180,15 @@ self: {
      }) {};
 
   "decimal-arithmetic" = callPackage
-    ({ mkDerivation, base, doctest, mtl, QuickCheck }:
+    ({ mkDerivation, base, binary, binary-bits, deepseq, doctest, hspec
+     , mtl, QuickCheck
+     }:
      mkDerivation {
        pname = "decimal-arithmetic";
-       version = "0.4.0.0";
-       sha256 = "03sd7d8lq9k8laqxvlfablrzfxb0kjrb48gby3sbdf0qrhplccmn";
-       libraryHaskellDepends = [ base mtl ];
-       testHaskellDepends = [ base doctest QuickCheck ];
+       version = "0.5.0.0";
+       sha256 = "0l740xpnqs5m67hwp3p6l5mzyhs9si39mp5z2x57mnrhvjdydq1j";
+       libraryHaskellDepends = [ base binary binary-bits deepseq mtl ];
+       testHaskellDepends = [ base binary doctest hspec QuickCheck ];
        homepage = "https://github.com/verement/decimal-arithmetic#readme";
        description = "An implementation of the General Decimal Arithmetic Specification";
        license = stdenv.lib.licenses.bsd3;
@@ -57554,14 +57601,15 @@ self: {
 
   "digit" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, lens, papa
-     , parsec, parsers, QuickCheck, semigroups, template-haskell
+     , parsec, parsers, QuickCheck, semigroupoids, semigroups
+     , template-haskell
      }:
      mkDerivation {
        pname = "digit";
-       version = "0.3.0";
-       sha256 = "1qp5vdl5mqy4q440zjyz6cb8mxvnsrw1pfxbghf84alary6rcdiz";
+       version = "0.4.0";
+       sha256 = "1c7d35134b8fj1fqmph9gbi5rhix23d8k3y99af0slk5nfkk5wl3";
        libraryHaskellDepends = [
-         base lens papa parsers semigroups template-haskell
+         base lens papa parsers semigroupoids semigroups template-haskell
        ];
        testHaskellDepends = [
          base directory doctest filepath parsec QuickCheck template-haskell
@@ -72370,6 +72418,8 @@ self: {
        pname = "full-text-search";
        version = "0.2.1.3";
        sha256 = "0s537hzb21w506bp4i6v7k5sbk905s9950gihh99r0b7id185ppk";
+       revision = "2";
+       editedCabalFile = "1y89g5crlnfxhmxxijhw4ij89bg08ygcipkxb8byjiqhhh8y0r1g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers text vector ];
@@ -75529,6 +75579,29 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-knownnat_0_3_1" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-knownnat";
+       version = "0.3.1";
+       sha256 = "1kprh0fahkbpf7rqbgi8l6883784a8n7k8g40nkdhii7gal9715g";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons
+         template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-natnormalise singletons tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       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
@@ -76800,6 +76873,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ginger_0_6_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, filepath
+     , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "ginger";
+       version = "0.6.0.1";
+       sha256 = "0c843zx5jnw1z0gbiyq5asx5amz6bh87kn1f7359p4p1l4qg44sk";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring data-default filepath http-types mtl parsec
+         safe scientific text time transformers unordered-containers
+         utf8-string vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring data-default text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring data-default mtl tasty tasty-hunit
+         tasty-quickcheck text time transformers unordered-containers
+         utf8-string
+       ];
+       homepage = "https://bitbucket.org/tdammers/ginger";
+       description = "An implementation of the Jinja2 template language in Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ginsu" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, containers
      , directory, hashable, hashtables, mtl, network, old-locale
@@ -77033,6 +77139,82 @@ self: {
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
+  "git-annex_6_20170818" = callPackage
+    ({ mkDerivation, aeson, async, aws, base, blaze-builder
+     , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
+     , 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
+     , hinotify, hslogger, http-client, http-conduit, http-types, IfElse
+     , lsof, magic, memory, monad-control, monad-logger, mountpoints
+     , 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, split, 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.20170818";
+       sha256 = "0ybxixbqvy4rx6mq9s02rh349rbr04hb17z4bfayin0qwa5kzpvx";
+       configureFlags = [
+         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
+         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
+         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
+         "-fwebapp-secure" "-fwebdav" "-fxmpp"
+       ];
+       isLibrary = false;
+       isExecutable = true;
+       setupHaskellDepends = [
+         base bytestring Cabal data-default directory exceptions filepath
+         hslogger IfElse process split unix unix-compat
+       ];
+       executableHaskellDepends = [
+         aeson async aws base blaze-builder bloomfilter byteable bytestring
+         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 hinotify hslogger
+         http-client http-conduit http-types IfElse magic memory
+         monad-control monad-logger mountpoints mtl network network-info
+         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 split 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
+       ];
+       preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
+       installPhase = "make PREFIX=$out BUILDER=: install";
+       checkPhase = ''
+         ln -sf dist/build/git-annex/git-annex git-annex
+         ln -sf git-annex git-annex-shell
+         export PATH+=":$PWD"
+         git-annex test
+       '';
+       enableSharedExecutables = false;
+       homepage = "http://git-annex.branchable.com/";
+       description = "manage files with git, without checking their contents into git";
+       license = stdenv.lib.licenses.gpl3;
+       platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
+         inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
+         inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
+         inherit (pkgs) which;};
+
   "git-checklist" = callPackage
     ({ mkDerivation, base, directory, filepath, optparse-applicative
      , parsec, pretty, process
@@ -78421,6 +78603,8 @@ self: {
        pname = "gloss-accelerate";
        version = "2.0.0.0";
        sha256 = "1hfiy2j7850yisbakz5nadr6l9k5maqq5mvg1xhak9jj1k1ji9if";
+       revision = "1";
+       editedCabalFile = "1arsf3j8b59qr5z5sy5sxx5mdddagjginrqs3jb9lpj1s3c3672b";
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
@@ -78546,6 +78730,8 @@ self: {
        pname = "gloss-raster-accelerate";
        version = "2.0.0.0";
        sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d";
+       revision = "1";
+       editedCabalFile = "07c56r31akmq7hq0cyw4lc4h5370laand231wjd5ffwk369x2prg";
        libraryHaskellDepends = [
          accelerate base colour-accelerate gloss gloss-accelerate
        ];
@@ -85844,6 +86030,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hamilton_0_1_0_1" = callPackage
+    ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers
+     , free, hmatrix, hmatrix-gsl, optparse-applicative
+     , typelits-witnesses, vector, vector-sized, vty
+     }:
+     mkDerivation {
+       pname = "hamilton";
+       version = "0.1.0.1";
+       sha256 = "12wp6z2dhcpyijvf1bqcx1bamw19crm23wvzgbpbjw3azyi72sn3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ad base comonad free hmatrix hmatrix-gsl typelits-witnesses
+         vector-sized
+       ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base containers hmatrix optparse-applicative vector
+         vector-sized vty
+       ];
+       homepage = "https://github.com/mstksg/hamilton";
+       description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hamlet" = callPackage
     ({ mkDerivation, base, shakespeare }:
      mkDerivation {
@@ -88974,6 +89185,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-src-exts-observe" = callPackage
+    ({ mkDerivation, base, haskell-src-exts, Hoed }:
+     mkDerivation {
+       pname = "haskell-src-exts-observe";
+       version = "0.1.0";
+       sha256 = "06vqd9ljmlx96xx6gyhfag2fsxwdzab0sy1gry2d24mbppbaa1x1";
+       libraryHaskellDepends = [ base haskell-src-exts Hoed ];
+       homepage = "https://github.com/pepeiborra/haskell-src-exts-observe";
+       description = "Observable orphan instances for haskell-src-exts";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-src-exts-prisms" = callPackage
     ({ mkDerivation, base, haskell-src-exts, lens, template-haskell }:
      mkDerivation {
@@ -93664,19 +93887,21 @@ self: {
      }) {};
 
   "hexml-lens" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, foundation, hexml, lens
-     , QuickCheck, text
+    ({ mkDerivation, base, bytestring, contravariant, doctest
+     , foundation, hexml, hspec, lens, profunctors, QuickCheck, text
+     , wreq
      }:
      mkDerivation {
        pname = "hexml-lens";
-       version = "0.2.0";
-       sha256 = "1rj45rghjzcgdllrcz2qm1sixjl73ncij5bh5qnkdb65b5hkfhfp";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.1";
+       sha256 = "0ss9riq7ppmqav4p38ckk479ggq7iy7xm0wsanr29ybg43vlx8xs";
        libraryHaskellDepends = [
-         base bytestring foundation hexml lens text
+         base bytestring contravariant foundation hexml lens profunctors
+         text
+       ];
+       testHaskellDepends = [
+         base bytestring doctest hexml hspec lens QuickCheck wreq
        ];
-       testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "https://github.com/pepeiborra/hexml-lens#readme";
        description = "Lenses for the hexml package";
        license = stdenv.lib.licenses.bsd3;
@@ -95191,6 +95416,8 @@ self: {
        pname = "hint";
        version = "0.7.0";
        sha256 = "0mc17qdq0wb57zgh755viwcnby2jkmyv9r7fvq5jwsxx91c776i9";
+       revision = "1";
+       editedCabalFile = "07afndz6accq6g4d90xhvjh84ybhbffk5xl1qb3jrymf9vj5ad50";
        libraryHaskellDepends = [
          base directory exceptions filepath ghc ghc-paths mtl random unix
        ];
@@ -101478,6 +101705,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hslua-aeson_0_3_0" = callPackage
+    ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
+     , ieee754, QuickCheck, quickcheck-instances, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hslua-aeson";
+       version = "0.3.0";
+       sha256 = "1vsgncxxdwachbqp7pbckij94621zccz001hs774asvyc12anp38";
+       libraryHaskellDepends = [
+         aeson base hashable hslua scientific text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base hashable hslua hspec HUnit ieee754 QuickCheck
+         quickcheck-instances scientific text unordered-containers vector
+       ];
+       homepage = "https://github.com/tarleb/hslua-aeson#readme";
+       description = "Allow aeson data types to be used with lua";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsmagick" = callPackage
     ({ mkDerivation, base, bytestring, bzip2, directory, filepath
      , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2
@@ -104514,6 +104764,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-reverse-proxy_0_4_5" = callPackage
+    ({ mkDerivation, async, base, blaze-builder, bytestring
+     , case-insensitive, conduit, conduit-extra, containers
+     , data-default-class, hspec, http-client, http-conduit, http-types
+     , lifted-base, monad-control, network, resourcet, streaming-commons
+     , text, transformers, wai, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "http-reverse-proxy";
+       version = "0.4.5";
+       sha256 = "0v1f1z3gmc51sbxmxhnp4sspzj6mdm0ihl5x30218p1ynz9ssxjn";
+       libraryHaskellDepends = [
+         async base blaze-builder bytestring case-insensitive conduit
+         conduit-extra containers data-default-class http-client http-types
+         lifted-base monad-control network resourcet streaming-commons text
+         transformers wai wai-logger word8
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra hspec
+         http-conduit http-types lifted-base network resourcet
+         streaming-commons transformers wai warp
+       ];
+       homepage = "https://github.com/fpco/http-reverse-proxy";
+       description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-server" = callPackage
     ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix
      , url, utf8-string
@@ -105869,7 +106147,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect_0_10_0_1" = callPackage
+  "hw-rankselect_0_10_0_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap
@@ -105877,8 +106155,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.10.0.1";
-       sha256 = "0xpgm2r05cshsn7ddkx6pxfj80y5fgpvi1r11iqxvdgnfdhpv780";
+       version = "0.10.0.2";
+       sha256 = "1l3s40jk6nsq87q83mj4kalzn4kphxkpy4h89bw4jzzlykqwpcz9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109529,6 +109807,8 @@ self: {
        pname = "inline-java";
        version = "0.6.5";
        sha256 = "1pqai3jblcz52z76hwshzzajpnb5c62bs0i1b87hk8f8s0isask9";
+       revision = "1";
+       editedCabalFile = "1va62gdb22sjq5z3ydl9nbcdy1x8935q3zsdn9dibp6af1v45f5b";
        libraryHaskellDepends = [
          base binary bytestring Cabal containers directory
          distributed-closure filepath ghc-heap-view inline-c jni jvm
@@ -115477,8 +115757,8 @@ self: {
      }:
      mkDerivation {
        pname = "keystore";
-       version = "0.8.0.0";
-       sha256 = "04lyrd78fkybh07y9xnbnk3ai1nsig55wr1i0p1c63v9sgzpria5";
+       version = "0.8.0.1";
+       sha256 = "0mfq4i1bn4zbfvxi45d7k8g3xiljv24vicc62535csdp68i5sh3i";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -119116,6 +119396,8 @@ self: {
        pname = "lens-accelerate";
        version = "0.1.0.0";
        sha256 = "0j4mbkpdwycpc4m9vh43ylxw1k7ayhbjm8r50jb1dha24fb3d9z4";
+       revision = "1";
+       editedCabalFile = "0mgh4px2gpbny3fnbxv91ml5anvq3gmxs3w3q0zgsbnhaw73w4cf";
        libraryHaskellDepends = [ accelerate base lens ];
        homepage = "https://github.com/tmcdonell/lens-accelerate";
        description = "Instances to mix lens with accelerate";
@@ -121986,6 +122268,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "listenbrainz-client" = callPackage
+    ({ mkDerivation, aeson, base, free, freer-effects, http-client
+     , kan-extensions, mtl, servant, servant-client, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "listenbrainz-client";
+       version = "1.0.0";
+       sha256 = "1bqw4n99j9x44j06q94gzvvr3jyrq8vhg4yzgy2cf2wbijahzizr";
+       libraryHaskellDepends = [
+         aeson base free freer-effects http-client kan-extensions mtl
+         servant servant-client text time transformers
+       ];
+       homepage = "https://github.com/ocharles/listenbrainz-client";
+       description = "A client library to the ListenBrainz project";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "listlike-instances" = callPackage
     ({ mkDerivation, base, bytestring, ListLike, text, vector }:
      mkDerivation {
@@ -126324,28 +126624,23 @@ self: {
      }) {};
 
   "master-plan" = callPackage
-    ({ mkDerivation, base, containers, diagrams, diagrams-lib
-     , diagrams-rasterific, hspec, megaparsec, mtl, optparse-applicative
-     , QuickCheck, quickcheck-instances, random, random-shuffle, syb
-     , text
+    ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific
+     , hspec, megaparsec, mtl, optparse-applicative, QuickCheck
+     , quickcheck-instances, random, random-shuffle, syb, text
      }:
      mkDerivation {
        pname = "master-plan";
-       version = "0.2.0.0";
-       sha256 = "1179ladw94bjzkb63dz6x6n8lxck6424jamvb5mmzid7w13ibhxg";
-       revision = "1";
-       editedCabalFile = "03xb10qnjqby8qisvlqhli9g9avyl83h47a9q8xm2ycv4r63l6cv";
+       version = "0.3.1";
+       sha256 = "1gkbvs4jl5y4pl699ncwfdl3syhyss51adkjm8mszr18w9jlhs34";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers diagrams diagrams-lib diagrams-rasterific
-         megaparsec mtl syb text
-       ];
-       executableHaskellDepends = [
-         base containers optparse-applicative text
+         base diagrams diagrams-lib diagrams-rasterific megaparsec mtl syb
+         text
        ];
+       executableHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [
-         base containers hspec mtl QuickCheck quickcheck-instances random
+         base hspec mtl QuickCheck quickcheck-instances random
          random-shuffle text
        ];
        homepage = "https://github.com/rodrigosetti/master-plan";
@@ -133900,6 +134195,8 @@ self: {
        pname = "mwc-random-accelerate";
        version = "0.1.0.0";
        sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih";
+       revision = "1";
+       editedCabalFile = "0xgl1glq4jxs48x7wp8wh6pk3zad8483bvppwp89p3k0vlh6yqq3";
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -136857,13 +137154,13 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "newtype-generics_0_5_0_1" = callPackage
-    ({ mkDerivation, base, hspec, HUnit }:
+  "newtype-generics_0_5_1" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, transformers }:
      mkDerivation {
        pname = "newtype-generics";
-       version = "0.5.0.1";
-       sha256 = "1kgcficlphwp0rfp8ygny1dabfxi5kxs4qyhmfaxhnwaignxsn5k";
-       libraryHaskellDepends = [ base ];
+       version = "0.5.1";
+       sha256 = "1cm9v5agz6dmqd2ijwl1llgabihk49zjvx0wxrvhlmdfj6b44gr7";
+       libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
@@ -139078,8 +139375,8 @@ self: {
      }:
      mkDerivation {
        pname = "ogmarkup";
-       version = "3.0.0";
-       sha256 = "064pflgipy6a28ajz57k2fh4pqz8gsyxc83ig5iiks0yy2av6f9f";
+       version = "3.1.0";
+       sha256 = "0za23qz85r9xmw57gxi84x2zy8ddxwcdphawyfzkmxqny9kplx1r";
        libraryHaskellDepends = [ base megaparsec mtl ];
        testHaskellDepends = [
          base hspec hspec-megaparsec megaparsec shakespeare text
@@ -141922,7 +142219,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-citeproc_0_11" = callPackage
+  "pandoc-citeproc_0_11_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
      , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -141931,8 +142228,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.11";
-       sha256 = "1c4ja3lkmsgp5wa1cqbh45x5jd7x709s0rfpldhyh63xxrjp5qgs";
+       version = "0.11.1";
+       sha256 = "0si9xc1f1rhli2pqanvbran150mnj465a5d5psd4jxc82y5bha2f";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -157157,6 +157454,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rdf_0_1_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq
+     , dlist, fgl, text, transformers
+     }:
+     mkDerivation {
+       pname = "rdf";
+       version = "0.1.0.2";
+       sha256 = "0vqznprx5r7lqyj8b850pfyy7mvin55l1v4krmi1wyacynv977c8";
+       libraryHaskellDepends = [
+         attoparsec base bytestring deepseq dlist fgl text transformers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq text
+       ];
+       homepage = "https://github.com/traviswhitaker/rdf";
+       description = "Representation and Incremental Processing of RDF Data";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rdf4h" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, directory, hashable, hgal, HTTP, HUnit, hxt, network
@@ -158089,8 +158406,8 @@ self: {
      }:
      mkDerivation {
        pname = "recursion-schemes-ext";
-       version = "0.1.1.0";
-       sha256 = "15l21v5kppvsh79v4q421dhrlc571mah2pcbnvvpakb796zldi6n";
+       version = "0.1.1.1";
+       sha256 = "10jyylpbcahxp64gnvb1pplvkrgga65nj4lapws5kl52jw1bf5z4";
        libraryHaskellDepends = [
          base composition-prelude deepseq recursion-schemes template-haskell
        ];
@@ -173461,10 +173778,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap";
-       version = "1.0.0.1";
-       sha256 = "1f1d69900rdvsi323cc23pfgacmvgclbdaw57lfi54s7830icgr9";
-       revision = "5";
-       editedCabalFile = "0kka00b4xvskfcfva1zvbd7sp2sa5mplvgaihcagjsim96124bsp";
+       version = "1.0.0.2";
+       sha256 = "0jx2prq0lxq9jqxqk8f059lwjm2yqxzwb9lx6iviq57flx4zxyqq";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist filepath hashable heist
@@ -176093,11 +176408,11 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.2.7";
-       sha256 = "0n5lrwlagb6clj3sarmdzy43n9dyfj6rz1rnyj8d63s57fk7jpl5";
+       version = "0.2.8";
+       sha256 = "1xv3pciz0badd4wbijw8zmiwr656gjimv7lxccggm2q3nsqnq9gz";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
-       testHaskellDepends = [ base cmdargs containers leancheck ];
-       benchmarkHaskellDepends = [ base cmdargs containers leancheck ];
+       testHaskellDepends = [ base leancheck ];
+       benchmarkHaskellDepends = [ base leancheck ];
        homepage = "https://github.com/rudymatela/speculate#readme";
        description = "discovery of properties about Haskell functions";
        license = stdenv.lib.licenses.bsd3;
@@ -204372,6 +204687,8 @@ self: {
        pname = "wxc";
        version = "0.92.3.0";
        sha256 = "0i7z4avy57qzrykz3kddfn313zddp3lnyl9a0krx5f2k3b2pz8i8";
+       revision = "1";
+       editedCabalFile = "1cgq577ddskmp1xdlnlz0581r8hsqblgxc7wy0avb7sgf181cbd4";
        setupHaskellDepends = [
          base bytestring Cabal directory filepath process split
        ];
@@ -205317,6 +205634,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xml-conduit_1_6_0" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , data-default-class, deepseq, hspec, HUnit, monad-control
+     , resourcet, text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.6.0";
+       sha256 = "042cq7i988jxfwayndzpk2mygfs73709xmzi875imhmar10nv914";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         conduit conduit-extra containers data-default-class deepseq
+         monad-control resourcet text transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       homepage = "http://github.com/snoyberg/xml";
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-conduit-decode" = callPackage
     ({ mkDerivation, base, bifunctors, data-default, lens, semigroups
      , tasty, tasty-hunit, text, time, xml-conduit, xml-types

From 01b8c4c9e54082f9ddd01b3d6fe6e3a54ba9996f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 19 Aug 2017 16:37:56 +0200
Subject: [PATCH 2280/3246] ghcWithHoogle: cosmetic for the sake of Emacs
 syntax highlighting

---
 pkgs/development/haskell-modules/hoogle.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 65124d4c700..a0057c141f2 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
     mkdir -p $out/share/doc/hoogle
 
     echo importing builtin packages
-    for docdir in ${ghcDocLibDir}/*; do
+    for docdir in ${ghcDocLibDir}"/"*; do
       name="$(basename $docdir)"
       ${opts isGhcjs ''docdir="$docdir/html"''}
       if [[ -d $docdir ]]; then
@@ -99,8 +99,7 @@ stdenv.mkDerivation {
     cd $out/share/doc/hoogle
 
     args=
-    for hdfile in `ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort`
-    do
+    for hdfile in $(ls -1 *"/"*.haddock | grep -v '/ghc\.haddock' | sort); do
         name_version=`echo "$hdfile" | sed 's#/.*##'`
         args="$args --read-interface=$name_version,$hdfile"
     done

From 6fe751fb5c6c1c492c7d99a9007945f3f4c9a9e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 19 Aug 2017 17:20:39 +0200
Subject: [PATCH 2281/3246] ghcWithHoogle: deal gracefully with packages that
 have no haddockDir attribute

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

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index a0057c141f2..38e8dfd24c4 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
         ln -sfn ${el.haddockDir} "$out/share/doc/hoogle/${el.name}"
       '')
       (lib.filter (el: el.haddockDir != null)
-        (builtins.map (p: { haddockDir = p.haddockDir p;
+        (builtins.map (p: { haddockDir = if p ? haddockDir then p.haddockDir p else null;
                             name = p.pname; })
           docPackages))}
 

From e573c4ad9028a3b46ca788b1b5bf792ae9ff074b Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@teamviewer.com>
Date: Wed, 16 Aug 2017 14:34:14 +0200
Subject: [PATCH 2282/3246] sqlmap: 1.0.11 -> 1.1

Additionally disable sqlmap for python3 as it is incompatible:
"[CRITICAL] incompatible Python version detected ('3.6.1'). For successfully running sqlmap you'll have to use version 2.6 or 2.7 (visit 'http://www.python.org/download/')"
---
 pkgs/applications/misc/sqlmap/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 pkgs/top-level/python-packages.nix        | 16 ----------------
 3 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/applications/misc/sqlmap/default.nix

diff --git a/pkgs/applications/misc/sqlmap/default.nix b/pkgs/applications/misc/sqlmap/default.nix
new file mode 100644
index 00000000000..f9150eb33af
--- /dev/null
+++ b/pkgs/applications/misc/sqlmap/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, pythonPackages, pkgs }:
+
+pythonPackages.buildPythonPackage {
+  name = "sqlmap-1.1";
+
+  disabled = pythonPackages.isPy3k;
+
+  src = pkgs.fetchurl {
+    url = "mirror://pypi/s/sqlmap/sqlmap-1.1.tar.gz";
+    sha256 = "0px72p52w76cylr68i69kz0kagmbrslgx2221yi77322fih0mngi";
+  };
+
+  meta = with pkgs.stdenv.lib; {
+    homepage = "http://sqlmap.org";
+    license = licenses.gpl2;
+    description = "Automatic SQL injection and database takeover tool";
+    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8319ce5d22f..db7bb4df4ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4281,6 +4281,8 @@ with pkgs;
 
   sqliteman = callPackage ../applications/misc/sqliteman { };
 
+  sqlmap = callPackage ../applications/misc/sqlmap { };
+
   stdman = callPackage ../data/documentation/stdman { };
 
   storebrowse = callPackage ../tools/system/storebrowse { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 806526a31ff..7dd98a1307d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21393,22 +21393,6 @@ in {
     };
   };
 
-  sqlmap = buildPythonPackage {
-    name = "sqlmap-1.0.11";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sqlmap/sqlmap-1.0.11.tar.gz";
-      sha256 = "1x4amyjqnd9j5g2kp9nvg8pr5sqzbhr8gd0m6d671bshvgj568vr";
-    };
-
-    meta = with pkgs.stdenv.lib; {
-      homepage = "http://sqlmap.org";
-      license = licenses.gpl2;
-      description = "Automatic SQL injection and database takeover tool";
-      maintainers = with stdenv.lib.maintainers; [ bennofs ];
-    };
-  };
-
   pgpdump = self.buildPythonPackage rec {
     name = "pgpdump-1.5";
 

From a1601cf2bc322515399255590b39e9d01fd2ebf5 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 19 Aug 2017 18:54:59 +0200
Subject: [PATCH 2283/3246] ponyc: 0.17.0 -> 0.18.0

https://github.com/ponylang/ponyc/issues/2180
---
 pkgs/development/compilers/ponyc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index ab7881a2151..f605f31c06d 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "06g811x7vc275ypn3laqcsq7lmp2w8al6ipkpknhpq9c6lf7dvcp";
+    sha256 = "0favj1895fp5j5i23cmjn9wvrrlchr2dmc18grlvbjr2cg2c76mg";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From 0e5ff829543ffa1e17527763175166b6ba1d9f38 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 19 Aug 2017 05:58:12 +0000
Subject: [PATCH 2284/3246] perlPackages.CompressRawZlib: 2.071 -> 2.074

---
 .../perl-modules/Compress-Raw-Zlib/default.nix            | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index 5cd197b9d3f..a136e61e554 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.071";
+  name = "Compress-Raw-Zlib-2.074";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "0dk7pcmhnl7n811q3p4rrz5ijdhz6jx367h6rypgvg1y39z4arfs";
+    sha256 = "08bpx9v6i40n54rdcj6invlj294z20amrl8wvwf9b83aldwdwsd3";
   };
 
   preConfigure = ''
@@ -18,9 +18,7 @@ buildPerlPackage rec {
     EOF
   '';
 
-  # Try untested for now.  Upstream bug:
-  # https://rt.cpan.org/Public/Bug/Display.html?id=119762
-  doCheck = false && !stdenv.isDarwin;
+  doCheck = !stdenv.isDarwin;
 
   meta = {
     license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 83370e5b4c95d546aacde898ae3966bd91f95ef7 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Fri, 11 Aug 2017 10:32:17 +0200
Subject: [PATCH 2285/3246] browserpass: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index 9f8a00c5956..c078c3a21c5 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "browserpass-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
 
   goPackagePath = "github.com/dannyvankooten/browserpass";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     repo = "browserpass";
     owner = "dannyvankooten";
     rev = version;
-    sha256 = "1r9x1asgblay7pry2jpgfisfgb3423x3cqd3g68q8b98zvc9l9lz";
+    sha256 = "07wkvwb9klzxnlrm9a07kxzj3skpy0lymc9ijr8ykfbz6l0bpbqy";
   };
 
   postInstall = ''
@@ -31,5 +31,6 @@ buildGoPackage rec {
     homepage = https://github.com/dannyvankooten/browserpass;
     license = licenses.mit;
     platforms = with platforms; linux ++ darwin ++ openbsd;
+    maintainers = with maintainers; [ rvolosatovs ];
   };
 }

From 163e648be10763488ef5b0bb4d37e457b1c6965a Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sat, 19 Aug 2017 18:20:31 +0200
Subject: [PATCH 2286/3246] mopidy-iris: 3.1.3 -> 3.2.0

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

diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index cca2e1730f3..32d7bf78730 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-iris-${version}";
-  version = "3.1.3";
+  version = "3.2.0";
 
   src = pythonPackages.fetchPypi {
     inherit version;
     pname = "Mopidy-Iris";
-    sha256 = "144q83cfgdwlj5gv9wyi902xfjybsaa9n7d5azs14jpbnmmbj61f";
+    sha256 = "cb97cb14b2d6836f3c28c5fd0ada44b4a33f2e74380f44bd5d03beffa5f67b30";
   };
 
   propagatedBuildInputs = [

From 5791a2574e1c04902eed97c318404337a49907ed Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sat, 19 Aug 2017 21:32:54 +0200
Subject: [PATCH 2287/3246] keybase: 1.0.27 -> 1.0.28

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

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 474455258a4..5294f32864d 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "keybase-${version}";
-  version = "1.0.27";
+  version = "1.0.28";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/keybase" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner  = "keybase";
     repo   = "client";
     rev    = "v${version}";
-    sha256 = "0s68awgaq32hl5rvcrnhn9i98dwh23kws0l4czcghyn6imx8h89i";
+    sha256 = "03ldg7r0d9glccbx2xb3g3xyla82j5hkmmwfvzdqg43740l51mci";
   };
 
   buildFlags = [ "-tags production" ];
@@ -22,6 +22,6 @@ buildGoPackage rec {
     homepage = https://www.keybase.io/;
     description = "The Keybase official command-line utility and service.";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ carlsverre np ];
+    maintainers = with maintainers; [ carlsverre np rvolosatovs ];
   };
 }

From 58ed023bc63a30d758116113891cf3fb3d1946a9 Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Sat, 19 Aug 2017 17:20:34 +0200
Subject: [PATCH 2288/3246] dtools: rdmd -> dtools - Remove single rdmd
 derivation and introduce new dtools derivation with more tools from the
 repository. - Update rdmd/dtools 2.067.0 -> 2.075.1 - Adding checkPhase -
 Fixing dependencies - Update derivation description

---
 pkgs/development/compilers/rdmd/default.nix | 28 -----------
 pkgs/development/tools/dtools/default.nix   | 54 +++++++++++++++++++++
 pkgs/top-level/aliases.nix                  |  1 +
 pkgs/top-level/all-packages.nix             |  4 +-
 4 files changed, 57 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/compilers/rdmd/default.nix
 create mode 100644 pkgs/development/tools/dtools/default.nix

diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix
deleted file mode 100644
index 38473897698..00000000000
--- a/pkgs/development/compilers/rdmd/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{stdenv, lib, fetchurl, dmd}:
-
-stdenv.mkDerivation {
-  name = "rdmd-2.067.0";
-
-  buildInputs = [ dmd ];
-
-  src = fetchurl {
-    url = "https://github.com/D-Programming-Language/tools/archive/v2.067.0.tar.gz";
-    sha256 = "2702ecda0427c675084d9b688449bc8c8392fd73e30257d79e2488640d5a9982";
-  };
-
-  buildPhase = ''
-    dmd rdmd.d
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp rdmd $out/bin/
-	'';
-
-  meta = {
-    description = "Wrapper for D language compiler";
-    homepage = http://dlang.org/rdmd.html;
-    license = lib.licenses.boost;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
new file mode 100644
index 00000000000..28d0c57f2e3
--- /dev/null
+++ b/pkgs/development/tools/dtools/default.nix
@@ -0,0 +1,54 @@
+{stdenv, lib, fetchFromGitHub, dmd, curl}:
+
+stdenv.mkDerivation rec {
+  name = "dtools-${version}";
+  version = "2.075.1";
+
+  src = fetchFromGitHub {
+    owner = "dlang";
+    repo = "tools";
+    rev = "v${version}";
+    sha256 = "0lxn400s9las9hq6h9vj4mis2jr662k2yw0zcrvqcm1yg9pd245d";
+  };
+
+  postPatch = ''
+      substituteInPlace posix.mak \
+          --replace "../dmd/generated/\$(OS)/release/\$(MODEL)/dmd" ${dmd.out}/bin/dmd
+
+      substituteInPlace posix.mak \
+          --replace gcc $CC
+  '';
+
+  nativeBuildInputs = [ dmd ];
+  buildInputs = [ curl ];
+
+  buildPhase = ''
+    make -f posix.mak DMD=${dmd.out}/bin/dmd INSTALL_DIR=$out
+  '';
+
+  doCheck = true;
+
+  checkPhase = ''
+      export BITS=${builtins.toString stdenv.hostPlatform.parsed.cpu.bits}
+      export OSNAME=${if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name}
+      ./generated/$OSNAME/$BITS/rdmd -main -unittest rdmd.d
+      ${dmd.out}/bin/dmd rdmd_test.d
+      ./rdmd_test
+    '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ${
+      let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
+      osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in
+      "find $PWD/generated/${osname}/${bits} -perm /a+x -type f -exec cp {} $out/bin \\;"
+    }
+	'';
+
+  meta = {
+    description = "Ancillary tools for the D programming language compiler";
+    homepage = https://github.com/dlang/tools;
+    license = lib.licenses.boost;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 49ba2d0ccdf..94533877ad2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -119,6 +119,7 @@ mapAliases (rec {
   quake3game = ioquake3; # added 2016-01-14
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
+  rdmd = dtools;  # added 2017-08-19
   rssglx = rss-glx; #added 2015-03-25
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
   rustUnstable = rustNightly; # added 2016-11-29
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05ff56aef28..e339a6aabd2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -963,6 +963,8 @@ with pkgs;
     gtk = gtk3;
   };
 
+  dtools = callPackage ../development/tools/dtools { };
+
   dtrx = callPackage ../tools/compression/dtrx { };
 
   duperemove = callPackage ../tools/filesystems/duperemove { };
@@ -4037,8 +4039,6 @@ with pkgs;
 
   rdfind = callPackage ../tools/filesystems/rdfind { };
 
-  rdmd = callPackage ../development/compilers/rdmd { };
-
   rhash = callPackage ../tools/security/rhash { };
 
   riemann_c_client = callPackage ../tools/misc/riemann-c-client { };

From fe5faecab1954262194391df17bd99c88c570d0e Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Sun, 20 Aug 2017 02:48:45 +0200
Subject: [PATCH 2289/3246] vscode: 1.14.2 -> 1.15.1

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 18eb1803fd6..420fa23a10b 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.14.2";
+  version = "1.15.1";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0ladqwgy37imq957mmbdfslaxcnx8gcl9nb1q5p8r91vldvf31zd";
-    "x86_64-linux" = "1nb9n6511v2p1nwcwh6kbpxgydfs66yn7q2nf1rmh42ha5yzqkja";
-    "x86_64-darwin" = "0yk2yd8rzhmsh276xfgywp1gjjkvxypgnjhs8jaxvrgsj7aw1s39";
+    "i686-linux" = "09vvq02bsq6fdb0ibshn97kll43dpfmyq2dahl9gj02jlwardq27";
+    "x86_64-linux" = "1kg25i4kavmgivnk4w3dsbsnn9vncl5d2m0ds93f8qvmxpizwg21";
+    "x86_64-darwin" = "1fgjg7c9appp8v0ir7m2r3a3x4z0gx4na0p3d8j1x4pcs0kqy0qp";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From b744ee2d939aa1af64795330c9671971db66f7bd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 20 Aug 2017 04:39:14 +0000
Subject: [PATCH 2290/3246] ocamlPackages.ocamlnet: 4.1.{2,3} -> 4.1.4

---
 .../ocaml-modules/ocamlnet/default.nix          | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 7e0cad538d5..51a30d7c91a 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -1,23 +1,14 @@
 { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
 , gnutls, nettle }:
 
-let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.03"
-  then {
-    version = "4.1.3";
-    sha256 = "1ifm3izml9hnr7cic1413spnd8x8ka795awsm2xpam3cs8z3j0ca";
-  } else {
-    version = "4.1.2";
-    sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i";
-  };
-in
+let version = "4.1.4"; in
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ocamlnet-${param.version}";
+  name = "ocaml${ocaml.version}-ocamlnet-${version}";
 
   src = fetchurl {
-    url = "http://download.camlcity.org/download/ocamlnet-${param.version}.tar.gz";
-    inherit (param) sha256;
+    url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
+    sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6";
   };
 
   buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ];

From c19d06b70b9267cac524cdb253a919a799ef5019 Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Sun, 20 Aug 2017 13:33:01 +0800
Subject: [PATCH 2291/3246] microcode-intel: 2017-05-11 -> 2017-07-07

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

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index facab712826..19425f810d0 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "microcode-intel-${version}";
-  version = "20170511";
+  version = "20170707";
 
   src = fetchurl {
-    url = "http://downloadmirror.intel.com/26798/eng/microcode-${version}.tgz";
-    sha256 = "18w1ysklvkf4l9xgnl1wvhbgr3wbdaiphv56056pafs0hwnzsxrg";
+    url = "https://downloadmirror.intel.com/26925/eng/microcode-${version}.tgz";
+    sha256 = "14zf7fbhg0msa3bm0kl139pclmkfm83s6l86x48sr9sjpxllgm2g";
   };
 
   buildInputs = [ libarchive ];

From b427d4a4bbd401e401e92fde249af00b5b22d71b Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 19 Aug 2017 23:10:55 -0700
Subject: [PATCH 2292/3246] discord: work around upstream bug via pulseaudio

upstream bug causes large ping/high cpu usage when when using voice chat
if pulseaudio is not available at runtime, even though the executable
only explicitly needs ALSA

after a fix hits upstream, I will make pulseaudio support optional and
return the default to alsa

https://github.com/crmarsh/discord-linux-bugs/issues/16
---
 .../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 f787f3f26e9..6267a3c8eb7 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -2,7 +2,7 @@
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
 , glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
 , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
-, pango, systemd, libXScrnSaver, libcxx }:
+, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
 
 stdenv.mkDerivation rec {
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
         paxmark m $out/opt/Discord
 
-        wrapProgram $out/opt/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib"
+        wrapProgram $out/opt/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib:${libpulseaudio}/lib"
 
         ln -s $out/opt/Discord $out/bin/
         ln -s $out/opt/discord.png $out/share/pixmaps

From 7c7c83e2335c3aa6f26a4f9c905c49c430b5be09 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 Aug 2017 08:07:29 +0200
Subject: [PATCH 2293/3246] buildLinux: allow overriding stdenv on each call

---
 nixos/modules/testing/minimal-kernel.nix        | 2 +-
 pkgs/os-specific/linux/kernel/generic.nix       | 2 +-
 pkgs/os-specific/linux/kernel/manual-config.nix | 4 +++-
 pkgs/top-level/all-packages.nix                 | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix
index a463cb803ad..7c2b9c05cf9 100644
--- a/nixos/modules/testing/minimal-kernel.nix
+++ b/nixos/modules/testing/minimal-kernel.nix
@@ -6,7 +6,7 @@ let
   );
 
   origKernel = pkgs.buildLinux {
-    inherit (pkgs.linux) src version;
+    inherit (pkgs.linux) src version stdenv;
     inherit configfile;
     allowImportFromDerivation = true;
     kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ];
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index bbe86792692..379d3cad970 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -103,7 +103,7 @@ let
   };
 
   kernel = buildLinux {
-    inherit version modDirVersion src kernelPatches;
+    inherit version modDirVersion src kernelPatches stdenv;
 
     configfile = configfile.nativeDrv or configfile;
 
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 70544ff9294..8227475f1b1 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,4 +1,4 @@
-{ stdenv, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
+{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
 , writeTextFile, ubootChooser
 , hostPlatform
 }:
@@ -14,6 +14,8 @@ let
     echo "}" >> $out
   '').outPath;
 in {
+  # Allow overriding stdenv on each buildLinux call
+  stdenv,
   # The kernel version
   version,
   # The version of the kernel module directory
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84db868ced3..7e35bd05291 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12281,7 +12281,7 @@ with pkgs;
 
   linuxPackages_custom = { version, src, configfile }:
     recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig {
-      inherit version src configfile;
+      inherit version src configfile stdenv;
       allowImportFromDerivation = true;
     }));
 

From a1bef771ee6cf120e3073b28961f160e221bc25b 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 Aug 2017 08:26:02 +0200
Subject: [PATCH 2294/3246] linuxPackages_chromiumos*: fixup by building with
 gcc5

---
 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 7e35bd05291..7fb6382241a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12119,6 +12119,8 @@ with pkgs;
                       kernelPatches.genksyms_fix_segfault
                       kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
                     ];
+    # compiler-gcc.h:107:30: fatal error: linux/compiler-gcc6.h: No such file or directory
+    stdenv = overrideCC stdenv gcc5;
   };
 
   linux_chromiumos_latest = linux_chromiumos_3_18;

From 68c003b256ad6a5abff2e36ebcf0e96320bca416 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 Aug 2017 09:01:11 +0200
Subject: [PATCH 2295/3246] motif: fixup build after automake update #28232

It seemed easiest to avoid the need to autoreconf.
---
 .../libraries/motif/Do-not-compile-demos.patch      | 11 -----------
 pkgs/development/libraries/motif/default.nix        | 13 ++++++++-----
 2 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/motif/Do-not-compile-demos.patch

diff --git a/pkgs/development/libraries/motif/Do-not-compile-demos.patch b/pkgs/development/libraries/motif/Do-not-compile-demos.patch
deleted file mode 100644
index 1b8df94d007..00000000000
--- a/pkgs/development/libraries/motif/Do-not-compile-demos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,7 +27,6 @@ SUBDIRS   = bindings bitmaps \
-              include \
-              tools \
-              clients \
--             doc \
--             demos
-+             doc
- AUTOMAKE_OPTIONS = 1.4
- ACLOCAL_AMFLAGS = -I .
diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix
index 1f86af0a2e8..c57353ccbd4 100644
--- a/pkgs/development/libraries/motif/default.nix
+++ b/pkgs/development/libraries/motif/default.nix
@@ -3,7 +3,7 @@
 , expat, libjpeg, libpng, libiconv
 , flex
 , libXp, libXau
-, demoSupport ? false, autoconf, automake
+, demoSupport ? false
 }:
 # refer to the gentoo package
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     expat libjpeg libpng libiconv
   ];
 
-  nativeBuildInputs = [ pkgconfig flex ] ++ stdenv.lib.optionals (!demoSupport) [ autoconf automake ];
+  nativeBuildInputs = [ pkgconfig flex ];
 
   propagatedBuildInputs = [ libXp libXau ];
 
@@ -30,13 +30,16 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "CFLAGS=-fno-strict-aliasing" ];
 
-  prePatch = ''rm lib/Xm/Xm.h'';
+  prePatch = ''
+    rm lib/Xm/Xm.h
+  '' + stdenv.lib.optionalString (!demoSupport) ''
+    sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in}
+  '';
 
   patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch
               ./Use-correct-header-for-malloc.patch
               ./Add-X.Org-to-bindings-file.patch
-            ]
-            ++ stdenv.lib.optional (!demoSupport) ./Do-not-compile-demos.patch;
+            ];
 
   meta = with stdenv.lib; {
     homepage = http://motif.ics.com;

From 76e6863cb18a505b6c59c78d85e8fe7aa3b0b8c2 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 Aug 2017 09:19:30 +0200
Subject: [PATCH 2296/3246] lzop: 1.03 -> 1.04

This fixes build with gcc6.
---
 pkgs/tools/compression/lzop/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix
index a929ca4dfd7..72be1d28d24 100644
--- a/pkgs/tools/compression/lzop/default.nix
+++ b/pkgs/tools/compression/lzop/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lzo}:
 
-stdenv.mkDerivation {
-  name = "lzop-1.03";
+stdenv.mkDerivation rec {
+  name = "lzop-1.04";
   src = fetchurl {
-    url = http://www.lzop.org/download/lzop-1.03.tar.gz;
-    sha256 = "1jdjvc4yjndf7ihmlcsyln2rbnbaxa86q4jskmkmm7ylfy65nhn1";
+    url = "http://www.lzop.org/download/${name}.tar.gz";
+    sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky";
   };
 
   buildInputs = [ lzo ];

From ff1bb5c854654922be7b551753c3ad87025794b0 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 Aug 2017 09:22:52 +0200
Subject: [PATCH 2297/3246] intel-gpu-tools: fixup build after automake update
 #28232

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

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index d1aef990230..ed3f1b46947 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
-, procps, autoconf, automake }:
+, procps, autoreconfHook, utilmacros }:
 
 stdenv.mkDerivation rec {
   name = "intel-gpu-tools-1.19";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wdhwf3im6ids95qw5r9hjj9hvp0qhzgi4llrlriy723q3kqm754";
   };
 
-  nativeBuildInputs = [ pkgconfig autoconf automake ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook utilmacros ];
   buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
     libXext libXv libXrandr glib bison libunwind python3 procps ];
 

From bb244349041d76bb5ce539aa8e1df2d9255f536d 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 Aug 2017 09:34:07 +0200
Subject: [PATCH 2298/3246] kyotocabinet: fixup build with gcc6 by a Fedora
 patch

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

diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix
index 8e7971d8087..11388f25a99 100644
--- a/pkgs/development/libraries/kyotocabinet/default.nix
+++ b/pkgs/development/libraries/kyotocabinet/default.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
     substituteInPlace configure --replace stdc++ c++
   '';
 
+  patches = [(fetchurl {
+    name = "gcc6.patch";
+    url = "http://pkgs.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch";
+    sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23";
+  })];
+
   buildInputs = [ zlib ];
 
   meta = with stdenv.lib; {

From 2d55ee40fa8ce0eb0b8258ae6282b7b904e31e0d 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 Aug 2017 09:43:05 +0200
Subject: [PATCH 2299/3246] colord: fixup build after automake update #28232

It was enough to switch the order of patching to avoid the need to
autoreconf.
---
 pkgs/tools/misc/colord/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 6dc2c371e46..65c71d349f0 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, fetchgit, bash-completion
+{ stdenv, fetchzip, bash-completion
 , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
-, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms
+, gtk_doc, gobjectIntrospection, argyllcms
 , libgudev, sane-backends }:
 
 stdenv.mkDerivation rec {
@@ -23,12 +23,11 @@ stdenv.mkDerivation rec {
 
   # don't touch /var at install time, colord creates what it needs at runtime
   postPatch = ''
-    sed -i -e "s|if test -w .*;|if false;|" src/Makefile.in
-    sed -i -e "s|if test -w .*;|if false;|" src/Makefile.am
+    sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
   '';
 
   buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
-                  bash-completion argyllcms automake autoconf libgudev sane-backends ];
+                  bash-completion argyllcms libgudev sane-backends ];
 
   postInstall = ''
     mkdir -p $out/etc/bash_completion.d

From 3b29468313bc8604fe8f85c8d9316fd276d3985c 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 Aug 2017 09:45:30 +0200
Subject: [PATCH 2300/3246] colord: fetchzip -> fetchurl

I see no benefit in fetchzip here, as it's a standard release tarball.
---
 pkgs/tools/misc/colord/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 65c71d349f0..222b04db0d0 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, bash-completion
+{ stdenv, fetchurl, bash-completion
 , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
 , gtk_doc, gobjectIntrospection, argyllcms
 , libgudev, sane-backends }:
@@ -6,9 +6,9 @@
 stdenv.mkDerivation rec {
   name = "colord-1.2.12";
 
-  src = fetchzip {
+  src = fetchurl {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
-    sha256 = "0rvvbpxd5x479v4p6pck317mlf3j29s154i1n8hlx8n4znhwrb0k";
+    sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";
   };
 
   enableParallelBuilding = true;

From 7da15a071df26ebc7373be0c3c54b61eccdc04d2 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 20 Aug 2017 10:18:53 +0200
Subject: [PATCH 2301/3246] open-wbo: init at 2.0

---
 .../science/logic/open-wbo/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/science/logic/open-wbo/default.nix

diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix
new file mode 100644
index 00000000000..48546a86112
--- /dev/null
+++ b/pkgs/applications/science/logic/open-wbo/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, zlib, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "open-wbo-2.0";
+
+  src = fetchFromGitHub {
+    owner = "sat-group";
+    repo = "open-wbo";
+    rev = "f193a3bd802551b13d6424bc1baba6ad35ec6ba6";
+    sha256 = "1742i15qfsbf49c4r837wz35c1p7yafvz7ar6vmgcj6cmfwr8jb4";
+  };
+
+  buildInputs = [ zlib gmp ];
+
+  makeFlags = [ "r" ];
+  installPhase = ''
+    install -Dm0755 open-wbo_release $out/bin/open-wbo
+  '';
+
+  meta = with stdenv.lib; {
+    description = "State-of-the-art MaxSAT and Pseudo-Boolean solver";
+    maintainers = with maintainers; [ gebner ];
+    platforms = platforms.unix;
+    license = licenses.mit;
+    homepage = http://sat.inesc-id.pt/open-wbo/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4081fad4ffb..db2c99497f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9731,6 +9731,8 @@ with pkgs;
     cmake = cmake_2_8;
   };
 
+  open-wbo = callPackage ../applications/science/logic/open-wbo {};
+
   openwsman = callPackage ../development/libraries/openwsman {};
 
   ortp = callPackage ../development/libraries/ortp { };

From 956c266fb7ec02c142933da668d3d8e24ba905cb 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 Aug 2017 10:30:34 +0200
Subject: [PATCH 2302/3246] gcc49: remove Darwin patch that's included in 4.9

---
 pkgs/development/compilers/gcc/4.9/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 1380d36725a..e45ee0bcc6a 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -72,8 +72,7 @@ let version = "4.9.4";
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
-      # The NXConstStr.patch can be removed at 4.9.4
-      ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch;
+      ;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at

From d25a9f57e380e780765f9ee54ad86b68515b4b48 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 20 Aug 2017 10:39:57 +0200
Subject: [PATCH 2303/3246] pythonPackages.html5lib_0_9999999: Fix build

Regression introduced by 345b35c48af0c6534fc649ef4b2050ebf0b91d50.

The commit in question switched the implementation of buildPythonPackage
so that .override now is behaving the same way as for other packages
that are using callPackage.

So the fix for html5lib_0_9999999 is to just use .overridePythonAttrs
instead of .override.

Note that the mentioned commit initially introduced this as
overridePythonPackage but it got later renamed to overridePythonAttrs in
abdb58e407d0351894ea1ee32c3484a89f1e53cd.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 d745a065d10..e04eeb770c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2070,7 +2070,7 @@ in {
   blaze = callPackage ../development/python-modules/blaze { };
 
   # Needed for FlexGet 1.2.337 and calibre 2.76.0
-  html5lib_0_9999999 = self.html5lib.override rec {
+  html5lib_0_9999999 = self.html5lib.overridePythonAttrs rec {
     name = "html5lib-${version}";
     buildInputs = with self; [ nose flake8 ];
     propagatedBuildInputs = with self; [ six ];

From dbc9f3b10df818b6277c8343cf6099e28ff1c563 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 Aug 2017 10:40:51 +0200
Subject: [PATCH 2304/3246] fftw: fix on Darwin (hopefully)

It won't produce the $info output.
---
 pkgs/development/libraries/fftw/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index d4d8c7f8aee..5cf83752aa7 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -4,7 +4,10 @@ with lib;
 
 assert elem precision [ "single" "double" "long-double" "quad-precision" ];
 
-let version = "3.3.6-pl1"; in
+let
+  version = "3.3.6-pl1";
+  withDoc = stdenv.cc.isGNU;
+in
 
 stdenv.mkDerivation rec {
   name = "fftw-${precision}-${version}";
@@ -14,7 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "0g8qk98lgq770ixdf7n36yd5xjsgm2v3wzvnphwmhy6r4y2amx0y";
   };
 
-  outputs = [ "out" "dev" "man" "info" ]; # it's dev-doc only
+  outputs = [ "out" "dev" "man" ]
+    ++ optional withDoc "info"; # it's dev-doc only
   outputBin = "dev"; # fftw-wisdom
 
   configureFlags =
@@ -27,7 +31,7 @@ stdenv.mkDerivation rec {
     ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") )  "--enable-sse2"
     ++ optional stdenv.cc.isGNU "--enable-openmp"
     # doc generation causes Fortran wrapper generation which hard-codes gcc
-    ++ optional (!stdenv.cc.isGNU) "--disable-doc";
+    ++ optional (!withDoc) "--disable-doc";
 
   enableParallelBuilding = true;
 

From 1919bb504360272242a6856b995df8d291adcecc 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 Aug 2017 10:52:30 +0200
Subject: [PATCH 2305/3246] gnome3.caribou: fixup build after automake update
 #28232

/cc gnome update #28053.
---
 pkgs/desktops/gnome-3/3.22/core/caribou/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
index d63b6e86af3..2d71f1da592 100644
--- a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
-, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake }:
+{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
+, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }:
 
 let
   majorVersion = "0.4";
@@ -12,13 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
   };
 
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = with gnome3;
-    [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake
-      pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ];
+    [ glib gtk clutter at_spi2_core dbus pythonPackages.python
+      pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];
 
   propagatedBuildInputs = [ gnome3.libgee libxklavier ];
 
-  preBuild = ''
+  postPatch = ''
     patchShebangs .
     substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
   '';

From beaad855004c60ba00989dbc5525b7d28933e1cd 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 Aug 2017 11:11:44 +0200
Subject: [PATCH 2306/3246] gcc-4.8: fix build

Problems: building with gcc-6 now, and fallout after output changes #27424.
---
 pkgs/development/compilers/gcc/4.8/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index ee7ddccced7..7a41ba38e51 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, noSysDirs
+{ stdenv, fetchurl, fetchpatch, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
@@ -71,7 +71,14 @@ let version = "4.8.5";
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
-      ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch;
+      ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch
+      ++ [(fetchpatch {
+          name = "libc_name_p.diff"; # needed to build with gcc6
+          url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f1";
+          sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl";
+          excludes = [ "gcc/cp/ChangeLog" ];
+        })]
+      ;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -218,7 +225,7 @@ stdenv.mkDerivation ({
 
   hardeningDisable = [ "format" ];
 
-  outputs = [ "out" "lib" "doc" ];
+  outputs = [ "out" "lib" "man" "info" ];
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 

From fecc1f8b70b6fe4bd296956e04f034c4e6f0011a Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Sun, 20 Aug 2017 17:35:01 +0800
Subject: [PATCH 2307/3246] rstudio: fix build

---
 pkgs/applications/editors/rstudio/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 9ac91e7086a..efb0a6f624d 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
   name = "RStudio-${version}";
 
   buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ];
-  nativeBuildInputs = [ qt5.qmake ];
 
   src = fetchurl {
     url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
@@ -91,7 +90,7 @@ stdenv.mkDerivation rec {
       cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
     '';
 
-  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ];
+  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
 
   desktopItem = makeDesktopItem {
     name = name;

From 785ceea7bade1d7868e203a0f5eb392fe9b4def7 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 Aug 2017 11:49:26 +0200
Subject: [PATCH 2308/3246] libreoffice: fixup by building with gcc-5

I was lazy to try to find another solution.
/cc maintainers: @7c6f434c, @viric.
---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fb6382241a..191aace1968 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14961,6 +14961,8 @@ with pkgs;
     harfbuzz = harfbuzz.override {
       withIcu = true; withGraphite2 = true;
     };
+    # checking whether g++ supports C++14 or C++11... configure: error: no
+    stdenv = overrideCC stdenv gcc5;
   });
 
   libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix {
@@ -14980,6 +14982,8 @@ with pkgs;
     harfbuzz = harfbuzz.override {
       withIcu = true; withGraphite2 = true;
     };
+    # checking whether g++ supports C++14 or C++11... configure: error: no
+    stdenv = overrideCC stdenv gcc5;
   });
 
 

From d2e9836aa66378ec846d8d317e21a70709ba93d2 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 Aug 2017 12:04:36 +0200
Subject: [PATCH 2309/3246] apt: fixup by building with gcc-5

I was lazy to try to find another solution.
---
 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 191aace1968..73c2ffce527 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -539,6 +539,8 @@ with pkgs;
 
   apt = callPackage ../tools/package-management/apt {
     inherit (perlPackages) Po4a;
+    # include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
+    stdenv = overrideCC stdenv gcc5;
   };
 
   autorevision = callPackage ../tools/misc/autorevision { };

From d195a98504a4ed80ce3e3929fe065da962753ab3 Mon Sep 17 00:00:00 2001
From: David Izquierdo <david@izquierdofernandez.com>
Date: Sun, 30 Jul 2017 20:46:00 +0200
Subject: [PATCH 2310/3246] tdesktop: update 1.1.7 -> 1.1.19

---
 .../telegram/tdesktop/default.nix                 | 15 ++++++++-------
 1 file changed, 8 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 fed8dd223d6..90fc4944d80 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
+{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake
 , qtbase, qtimageformats
 , breakpad, gtk3, libappindicator-gtk3, dee
 , ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio
@@ -7,19 +7,20 @@
 
 mkDerivation rec {
   name = "telegram-desktop-${version}";
-  version = "1.1.7";
+  version = "1.1.19";
 
   # Submodules
   src = fetchgit {
-    url = "https://github.com/telegramdesktop/tdesktop";
-    rev = "refs/tags/v${version}";
-    sha256 = "0y0nc8d4vlhsmzayy26zdxc5jaiwcv0rb2s1v5fwnnx71gf89m2w";
+    url = "git://github.com/telegramdesktop/tdesktop";
+    rev = "v${version}";
+    sha256 = "1zpl71k2lq861k89yp6nzkm4jm6szxrzigmmbxx63rh4v03di3b6";
+    fetchSubmodules = true;
   };
 
   tgaur = fetchgit {
     url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
-    rev = "83af81905de7fc5dc9fbea8f5318d56fa8a6efc6";
-    sha256 = "0v7g7y5cmxzp2yrcj6ylwzxlzr9yrqs2badzplm7sg012nc69yf9";
+    rev = "a4ba392309116003bc2b75c1c4c12dc733168d6f";
+    sha256 = "1n0yar8pm050770x36kjr4iap773xjigfbnrk289b51i5vijwhsv";
   };
 
   buildInputs = [

From b71ce3fb1449e8c7a41db2d9a5360d1a565fe001 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 Aug 2017 13:24:56 +0200
Subject: [PATCH 2311/3246] readline-7.0: fixup meta evaluation

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

diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index ed6e0cb153c..c40dfc1025a 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    maintainers = [ vanschelven ];
+    maintainers = [ maintainers.vanschelven ];
 
     platforms = platforms.unix;
     branch = "7.0";

From a0306821fdc62d92ec51995f227273cbdbce2572 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 20 Aug 2017 18:27:16 +0200
Subject: [PATCH 2312/3246] xzoom: init at 0.3.24

---
 pkgs/tools/X11/xzoom/default.nix | 33 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/X11/xzoom/default.nix

diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix
new file mode 100644
index 00000000000..05154e28263
--- /dev/null
+++ b/pkgs/tools/X11/xzoom/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, libX11, imake, libXext, libXt}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}.${patchlevel}";
+  pname = "xzoom";
+  version = "0.3";
+  patchlevel = "24";
+
+  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+  src = fetchurl {
+    url = "http://www.ibiblio.org/pub/linux/libs/X/${pname}-${version}.tgz";
+    sha256 = "0jzl5py4ny4n4i58lxx2hdwq9zphqf7h3m14spl3079y5mlzssxj";
+  };
+  patches = [
+    (fetchurl {
+       url = "http://http.debian.net/debian/pool/main/x/xzoom/xzoom_${version}-${patchlevel}.diff.gz";
+       sha256 = "0zhc06whbvaz987bzzzi2bz6h9jp6rv812qs7b71drivvd820qbh";
+    })
+  ];
+  buildInputs = [libX11 imake libXext libXt];
+
+  configurePhase = ''
+    xmkmf
+    makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANPATH=$out/share/man"
+  '';
+
+  meta = {
+    inherit version;
+    description = "An X11 screen zoom tool";
+    license = stdenv.lib.licenses.free ;
+    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 e394087ab56..5227266df01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19097,6 +19097,8 @@ with pkgs;
     };
   };
 
+  xzoom = callPackage ../tools/X11/xzoom {};
+
   yabause = callPackage ../misc/emulators/yabause {
     qt = qt4;
   };

From 0578dda8e1c7159f65a33d9b88e020ecfebff1b4 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 18 Aug 2017 17:48:30 -0400
Subject: [PATCH 2313/3246] doc: Describe CC Wrapper in more detail

The main motivation for this is to have something to google for LD=$CC.

Eventually, this should probably be moved to another section, but we
can deal with that later.
---
 doc/stdenv.xml | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index e637962fbb7..dac53bc2b80 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1,3 +1,4 @@
+
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-stdenv">
@@ -1153,7 +1154,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
 
     </listitem>
   </varlistentry>
-  
+
 
   <varlistentry xml:id='fun-substitute'>
     <term><function>substitute</function>
@@ -1312,7 +1313,7 @@ someVar=$(stripHash $name)
 
     </para></listitem>
   </varlistentry>
-  
+
 
   <varlistentry xml:id='fun-wrapProgram'>
     <term><function>wrapProgram</function>
@@ -1342,12 +1343,34 @@ someVar=$(stripHash $name)
 <variablelist>
 
   <varlistentry>
-    <term>GCC wrapper</term>
-    <listitem><para>Adds the <filename>include</filename> subdirectory
-    of each build input to the <envar>NIX_CFLAGS_COMPILE</envar>
-    environment variable, and the <filename>lib</filename> and
-    <filename>lib64</filename> subdirectories to
-    <envar>NIX_LDFLAGS</envar>.</para></listitem>
+    <term>CC Wrapper</term>
+    <listitem>
+      <para>
+        CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
+        Specifically, a C compiler (GCC or Clang), Binutils (or the CCTools + binutils mashup when targetting Darwin), and a C standard library (glibc or Darwin's libSystem) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper.
+        Packages typically depend on only CC Wrapper, instead of those 3 inputs directly.
+      </para>
+      <para>
+        Dependency finding is undoubtedly the main task of CC wrapper.
+        It is currently accomplished by collecting directories of host-platform dependencies (i.e. <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>) in environment variables.
+        CC wrapper's setup hook causes any <filename>include</filename> subdirectory of such a dependency to be added to <envar>NIX_CFLAGS_COMPILE</envar>, and any <filename>lib</filename> and <filename>lib64</filename> subdirectories to <envar>NIX_LDFLAGS</envar>.
+        The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
+      </para>
+      <para>
+        A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose.
+        They are defined to just be the base name of the tools, under the assumption that CC Wrapper's binaries will be on the path.
+        Firstly, this helps poorly-written packages, e.g. ones that look for just <command>gcc</command> when <envar>CC</envar> isn't defined yet <command>clang</command> is to be used.
+        Secondly, this helps packages not get confused when cross-compiling, in which case multiple CC wrappers may be simultaneous in use (targeting different platforms).
+        <envar>BUILD_</envar>- and <envar>TARGET_</envar>-prefixed versions of the normal environment variable are defined for the additional CC Wrappers, properly disambiguating them.
+      </para>
+      <para>
+        A problem with this final task is that CC Wrapper is honest and defines <envar>LD</envar> as <command>ld</command>.
+        Most packages, however, firstly use the C compiler for linking, secondly use <envar>LD</envar> anyways, defining it as the C compiler, and thirdly, only so define <envar>LD</envar> when it is undefined as a fallback.
+        This triple-threat means CC Wrapper will break those packages, as LD is already defined as the actually linker which the package won't override yet doesn't want to use.
+        The workaround is to define, just for the problematic package, <envar>LD</envar> as the C compiler.
+        A good way to do this would be <command>preConfigure = "LD=$CC"</command>.
+      </para>
+    </listitem>
   </varlistentry>
 
   <varlistentry>

From 7120479e5b1747379fa699c00e898c2a3a279b04 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 20 Aug 2017 16:22:59 -0400
Subject: [PATCH 2314/3246] 389-ds-base: 1.3.5.17 -> 1.3.5.19

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

diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 3b104232673..a2571600dfe 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -2,14 +2,14 @@
 , db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
 }:
 let
-  version = "1.3.5.15";
+  version = "1.3.5.19";
 in
 stdenv.mkDerivation rec {
   name = "389-ds-base-${version}";
 
   src = fetchurl {
     url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2";
-    sha256 = "1z17nnr4axndjyp413kyxb6iwdfky7nlsjhlc0klvdi2ai983p91";
+    sha256 = "1r1n44xfvy51r4r1180dfmjziyj3pqxwmnv6rjvvvjjm87fslmdd";
   };
 
   buildInputs = [

From ae02dd2d0a272142b97a007936a88922422bacb3 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Sun, 20 Aug 2017 13:34:34 -0700
Subject: [PATCH 2315/3246] nixos/mpd: allow configuring playlist directory
 (#28252)

---
 nixos/modules/services/audio/mpd.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index bd6c316243c..5f379b392ea 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -10,11 +10,9 @@ let
   gid = config.ids.gids.mpd;
   cfg = config.services.mpd;
 
-  playlistDir = "${cfg.dataDir}/playlists";
-
   mpdConf = pkgs.writeText "mpd.conf" ''
     music_directory     "${cfg.musicDirectory}"
-    playlist_directory  "${playlistDir}"
+    playlist_directory  "${cfg.playlistDirectory}"
     db_file             "${cfg.dbFile}"
     state_file          "${cfg.dataDir}/state"
     sticker_file        "${cfg.dataDir}/sticker.sql"
@@ -57,11 +55,21 @@ in {
       musicDirectory = mkOption {
         type = types.path;
         default = "${cfg.dataDir}/music";
+        defaultText = ''''${dataDir}/music'';
         description = ''
           The directory where mpd reads music from.
         '';
       };
 
+      playlistDirectory = mkOption {
+        type = types.path;
+        default = "${cfg.dataDir}/playlists";
+        defaultText = ''''${dataDir}/playlists'';
+        description = ''
+          The directory where mpd stores playlists.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -120,6 +128,7 @@ in {
       dbFile = mkOption {
         type = types.str;
         default = "${cfg.dataDir}/tag_cache";
+        defaultText = ''''${dataDir}/tag_cache'';
         description = ''
           The path to MPD's database.
         '';
@@ -153,7 +162,7 @@ in {
 
       preStart = ''
         mkdir -p "${cfg.dataDir}" && chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}"
-        mkdir -p "${playlistDir}" && chown -R ${cfg.user}:${cfg.group} "${playlistDir}"
+        mkdir -p "${cfg.playlistDirectory}" && chown -R ${cfg.user}:${cfg.group} "${cfg.playlistDirectory}"
       '';
       serviceConfig = {
         User = "${cfg.user}";

From 4c623b3d92fa7a8d34d4b7e3c1f152f0040e16f4 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Sun, 20 Aug 2017 14:35:06 -0400
Subject: [PATCH 2316/3246] python-packages easydict: init at 1.7

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

diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix
new file mode 100644
index 00000000000..12e0f6934d9
--- /dev/null
+++ b/pkgs/development/python-modules/easydict/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "easydict";
+  version = "1.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1xpnwjdw4x5kficjgcajqcal6bxcb0ax8l6hdkww9fp6lrh28x8v";
+  };
+
+  docheck = false; # No tests in archive
+
+  meta = {
+    homepage = https://github.com/makinacorpus/easydict;
+    license = with stdenv.lib; licenses.lgpl3;
+    description = "Access dict values as attributes (works recursively)";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e04eeb770c8..f808de45db2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5457,6 +5457,8 @@ in {
     };
   };
 
+  easydict = callPackage ../development/python-modules/easydict { };
+  
   EasyProcess = buildPythonPackage rec {
     name = "EasyProcess-0.2.3";
 

From 96457d26dded05bcba8e9fbb9bf0255596654aab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 21 Aug 2017 03:32:34 +0200
Subject: [PATCH 2317/3246] aspellWithDicts: fixes #28318

---
 pkgs/development/libraries/aspell/aspell-with-dicts.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix
index eb96070f4fd..96acfe6c2a8 100644
--- a/pkgs/development/libraries/aspell/aspell-with-dicts.nix
+++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix
@@ -28,7 +28,7 @@ in runCommand "aspell-env" {
   pushd "${aspell}/bin"
   for prg in *; do
     if [ -f "$prg" ]; then
-      makeWrapper "${aspell}/bin/$prg" "$out/bin/$prg" --set ASPELL_CONF "data-dir ${dictEnv}/lib/aspell"
+      makeWrapper "${aspell}/bin/$prg" "$out/bin/$prg" --set ASPELL_CONF "dict-dir ${dictEnv}/lib/aspell"
     fi
   done
   popd

From 8e3e2ccd7fab9b564e94c12b86cef128dc8178df Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 Aug 2017 02:53:59 -0400
Subject: [PATCH 2318/3246] abcde: 2.7.2 -> 2.8.1

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

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 6cb1ae6de71..a23af5b5caf 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -3,13 +3,13 @@
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
-let version = "2.7.2";
+let version = "2.8.1";
 in
   stdenv.mkDerivation {
     name = "abcde-${version}";
     src = fetchurl {
       url = "http://abcde.einval.com/download/abcde-${version}.tar.gz";
-      sha256 = "1pakpi41k8yd780mfp0snhia6mmwjwxk9lcrq6gynimch8b8hfda";
+      sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774";
     };
 
     # FIXME: This package does not support `distmp3', `eject', etc.

From 061d934a57999007ea48a8e69554c938a84db0a0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 Aug 2017 03:04:43 -0400
Subject: [PATCH 2319/3246] abcl: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index 678cdcc22cc..c48b36e5aba 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "abcl";
-  version = "1.4.0";
+  version = "1.5.0";
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
     url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
-    sha256 = "1y4nixm1459ch6226ikdilcsf91c2rg1d82cqqmcn24kfjl1m62i";
+    sha256 = "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj";
   };
   configurePhase = ''
     mkdir nix-tools

From 746979e0fc0c5043838962a67afd1baad017ee96 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 Aug 2017 03:11:00 -0400
Subject: [PATCH 2320/3246] busybox: 1.27.1 -> 1.27.2

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

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index bab8c5502de..ee897fc3781 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -27,11 +27,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.27.1";
+  name = "busybox-1.27.2";
 
+  # Note to whoever is updating busybox: please verify that:
+  # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
+  # still builds after the update.
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468";
+    sha256 = "1pv3vs2w4l2wnw5qb0rkbpvjjdd1fwjv87miavqq0r0ynqbfajwx";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

From 2a62e931c104ce07fd8e39944ab4b9bd4f31e0cd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 21 Aug 2017 07:55:59 +0200
Subject: [PATCH 2321/3246] ocamlPackages.qtest: 2.2 -> 2.6

ocamlPackages.batteries: 2.6.0 -> 2.7.0
---
 pkgs/development/ocaml-modules/batteries/default.nix | 4 ++--
 pkgs/development/ocaml-modules/qtest/default.nix     | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index b3e657842f8..7c8dc08c488 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }:
 
-let version = "2.6.0"; in
+let version = "2.7.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-batteries-${version}";
 
   src = fetchzip {
     url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
-    sha256 = "1nnypfxm3zkahjkzll5qn4ngpqvbxlwg9qdp8qdqvq2vl76w0672";
+    sha256 = "02rgfylz6x4y2030cclf9zwk2i8xqsydn1y9hjkja2qsk895bwfb";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ];
diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix
index 4d3ab0ddb4f..eb65384fc97 100644
--- a/pkgs/development/ocaml-modules/qtest/default.nix
+++ b/pkgs/development/ocaml-modules/qtest/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qcheck, ounit }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4"
 then throw "qtest is not available for OCaml ${ocaml.version}"
 else
 
-let version = "2.2"; in
+let version = "2.6"; in
 
 stdenv.mkDerivation {
   name = "ocaml-qtest-${version}";
   src = fetchzip {
     url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz";
-    sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz";
+    sha256 = "1v5c1n5p8rhnisn606fs05q8764lqwgw08w66y5dm8wgmxgmsb3k";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ];
-  propagatedBuildInputs = [ ounit ];
+  propagatedBuildInputs = [ qcheck ounit ];
 
-  createFindlibDestdir = true;
   installFlags = [ "BIN=$(out)/bin" ];
   preInstall = "mkdir -p $out/bin";
 

From c3acd48763ba47277407f3d477f7f959f59fcb2b Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Mon, 14 Aug 2017 12:30:51 +0100
Subject: [PATCH 2322/3246] perlPackages.ImageExifTool: 10.55 -> 10.60

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f23ed5a9b5c..b570e6d22de 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7241,11 +7241,11 @@ let self = _self // overrides; _self = with self; {
 
   ImageExifTool = buildPerlPackage rec {
     name = "Image-ExifTool-${version}";
-    version = "10.55";
+    version = "10.60";
 
     src = fetchurl {
       url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz";
-      sha256 = "0z8zwjjfvyllnhsafhddbybywpgqv0pl1dbn1g034cs27yj836q2";
+      sha256 = "1ymcnxf8miw0c1nadpxmvzabmaz837afrwp1k5khhv0s1vv8h2fz";
     };
 
     meta = with stdenv.lib; {
@@ -7266,7 +7266,7 @@ let self = _self // overrides; _self = with self; {
 
       license = with licenses; [ gpl1Plus /* or */ artistic2 ];
 
-      maintainers = [ ];
+      maintainers = [ maintainers.kiloreux ];
       platforms = platforms.unix;
     };
   };

From 4ab93f82364c741c2abc705c1f09618f4e77cec4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 Aug 2017 04:10:42 -0400
Subject: [PATCH 2323/3246] expat: 2.2.3 -> 2.2.4

---
 pkgs/development/libraries/expat/default.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 0a2deab796b..6533997de2f 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,33 +1,26 @@
 { stdenv, fetchpatch, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.3";
+  name = "expat-2.2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "0pyfma0sv4vif17kfv7xh2l2hl6skgw266a9cwm00p7q0bxr065k";
+    sha256 = "17h1fb9zvqvf0sr78j211bngc6jpql5wzar8fg9b52jzjvdqbb83";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
   outputBin = "dev";
 
-  patches = [
-    (fetchpatch {
-      name = "fix-aarch-build.patch";
-      url = "https://github.com/libexpat/libexpat/commit/d98d4399174fd6f71d70e7bd89993a0e7346753d.patch";
-      sha256 = "0z89wb4mzyf7vvl6kbflk5w1z7yc39jwvs3mkznin5agj34x063w";
-      stripLen = 1;
-      excludes = [ "coverage.sh" ];
-    })
-  ];
-
   configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   outputMan = "dev"; # tiny page for a dev tool
 
   doCheck = true;
 
-  preCheck = "patchShebangs ./run.sh";
+  preCheck = ''
+    patchShebangs ./run.sh
+    patchShebangs ./test-driver-wrapper.sh
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;

From ad8d5649a24b6438ceda0fe36aab82ef2428f5db Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Sat, 19 Aug 2017 22:16:35 +0100
Subject: [PATCH 2324/3246] set +u workaround for empty arrays

libDirs can be empty, which in combination with "set -u" of
9f1e009975dc2d58541de435c74a26afe011542a will cause a variable unbound
error on old bash versions
---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index d5fdc837cf5..a775b6da823 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -121,7 +121,7 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
     # It's important to add the rpath in the order of -L..., so
     # the link time chosen objects will be those of runtime linking.
     declare -A rpaths
-    for dir in "${libDirs[@]}"; do
+    for dir in ${libDirs+"${libDirs[@]}"}; do
         if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then
             dir="$dir2"
         fi

From 14ce4217e31bb2c3e1dddc198b3b8110d868c690 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 19 Aug 2017 16:47:23 +0900
Subject: [PATCH 2325/3246] torchvision: init at 0.1.9

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

diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
new file mode 100644
index 00000000000..ebda3a92fc4
--- /dev/null
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage
+, fetchPypi
+, six
+, numpy
+, pillow
+, pytorch
+, lib }:
+
+buildPythonPackage rec {
+  version = "0.1.9";
+  pname   = "torchvision";
+  name    = "${pname}-${version}";
+
+  format = "wheel";
+
+  src = fetchPypi {
+    inherit pname version;
+    format = "wheel";
+    sha256 = "016rjfh9w1x4xpw15ryxsvq3j2li17nd3a7qslnf3241hc6vdcwf";
+  };
+
+  propagatedBuildInputs = [ six numpy pillow pytorch ];
+
+  meta = {
+    description = "PyTorch vision library";
+    homepage    = http://pytorch.org/;
+    license     = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ericsagnes ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d745a065d10..185ef93aafb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27064,6 +27064,8 @@ EOF
     };
   };
 
+  torchvision = callPackage ../development/python-modules/torchvision { };
+
   jenkinsapi = buildPythonPackage rec {
     name = "jenkinsapi-${version}";
     version = "0.2.32";

From 27532073dd450429084b55357ace61cc4dd98d60 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:37:02 -0500
Subject: [PATCH 2326/3246] kdeApplications: add kdepimTeam maintainer list

---
 pkgs/applications/kde/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 207228a65b0..90af8bf1611 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -40,6 +40,9 @@ let
   packages = self: with self;
     let
       callPackage = self.newScope {
+        # Team of maintainers assigned to the KDE PIM suite
+        kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
+
         mkDerivation = import ./build-support/application.nix {
           inherit lib;
           inherit srcs;

From 066f2734050ced20f90d6dac17ca8e280bc223da Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:37:20 -0500
Subject: [PATCH 2327/3246] akonadi-contacts: assign to kdepimTeam

---
 pkgs/applications/kde/akonadi-contacts.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index 3f410b7b8b9..1f618567e11 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, kdepimTeam,
   extra-cmake-modules,
   akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes,
   kio, kitemmodels, kmime, ktextwidgets, qtwebengine,
@@ -9,7 +9,7 @@ mkDerivation {
   name = "akonadi-contacts";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = kdepimTeam;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [

From d1e30e5c34d573bcfa9d0b23528b7d3a0be09b60 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:38:13 -0500
Subject: [PATCH 2328/3246] akonadi-mime: assign to kdepimTeam

---
 pkgs/applications/kde/akonadi-mime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index 98a341da6b6..e47645518d0 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, kdepimTeam,
   extra-cmake-modules,
   akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime,
   shared_mime_info
@@ -9,7 +9,7 @@ mkDerivation {
   name = "akonadi-mime";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = kdepimTeam;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ akonadi shared_mime_info

From e17f125214931809fbf8a2009d9cef0713324008 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:38:39 -0500
Subject: [PATCH 2329/3246] akonadi: assign to kdepimTeam

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

diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index c2e34428474..b69b6b1e407 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, copyPathsToStore, lib,
+  mkDerivation, copyPathsToStore, lib, kdepimTeam,
   extra-cmake-modules,
   kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
   kwindowsystem, kcrash, kio,
@@ -11,7 +11,7 @@ mkDerivation {
   name = "akonadi";
   meta = {
     license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = kdepimTeam;
   };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];

From 39f9ff0263a31eb979f0d92ad00cfcc4ac29bf10 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:38:51 -0500
Subject: [PATCH 2330/3246] kcontacts: assign to kdepimTeam

---
 pkgs/applications/kde/kcontacts.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index 96828af9d17..d73f7f64625 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, kdepimTeam,
   extra-cmake-modules,
   kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
 }:
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kcontacts";
   meta = {
     license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = kdepimTeam;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];

From 5fa44742b9ced69b7013e1ffcc3cd2eff1b52e47 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:39:02 -0500
Subject: [PATCH 2331/3246] kmime: assign to kdepimTeam

---
 pkgs/applications/kde/kmime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index b14e0abcc3f..a5f7b11101e 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, ki18n,
   kcodecs, qtbase,
 }:
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kmime";
   meta = {
     license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
+    maintainers = kdepimTeam;
   };
   nativeBuildInputs = [ extra-cmake-modules ki18n ];
   buildInputs = [ kcodecs qtbase ];

From 816a7683aaa5dcbe571d7c048115ce058476b959 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:44:15 -0500
Subject: [PATCH 2332/3246] akonadi-contacts: fixup inputs and outputs

---
 pkgs/applications/kde/akonadi-contacts.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index 1f618567e11..b09058b60be 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
@@ -1,8 +1,10 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules,
-  akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes,
-  kio, kitemmodels, kmime, ktextwidgets, qtwebengine,
+  qtwebengine,
+  grantlee,
+  kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison,
+  akonadi, akonadi-mime, kcontacts, kmime,
 }:
 
 mkDerivation {
@@ -13,8 +15,10 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio
-    kitemmodels kmime ktextwidgets qtwebengine
+    qtwebengine
+    grantlee
+    kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison
+    akonadi-mime kcontacts kmime
   ];
   propagatedBuildInputs = [ akonadi ];
   outputs = [ "out" "dev" ];

From 67226f34bea2a25edb7747dd63f8f284df13f0ae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:44:30 -0500
Subject: [PATCH 2333/3246] akonadi-mime: fixup inputs and outputs

---
 pkgs/applications/kde/akonadi-mime.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index e47645518d0..52a17f5cbeb 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,8 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
-  extra-cmake-modules,
-  akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime,
-  shared_mime_info
+  extra-cmake-modules, shared_mime_info,
+  akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
 }:
 
 mkDerivation {
@@ -11,8 +10,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 ];
     maintainers = kdepimTeam;
   };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ akonadi shared_mime_info
-                  kdbusaddons ki18n kio kitemmodels kmime ];
+  nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
+  buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
   outputs = [ "out" "dev" ];
 }

From 284466837afe944229e9925a03ad969e225e8302 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:44:44 -0500
Subject: [PATCH 2334/3246] akonadi: fixup inputs and outputs

---
 pkgs/applications/kde/akonadi/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index b69b6b1e407..d6ba0abd226 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -1,10 +1,8 @@
 {
   mkDerivation, copyPathsToStore, lib, kdepimTeam,
-  extra-cmake-modules,
-  kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
-  kwindowsystem, kcrash, kio,
-  boost, kitemmodels, shared_mime_info,
-  mysql
+  extra-cmake-modules, shared_mime_info,
+  boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,
+  ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
 }:
 
 mkDerivation {
@@ -14,12 +12,13 @@ mkDerivation {
     maintainers = kdepimTeam;
   };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
   buildInputs = [
-    kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
-    kwindowsystem kcrash shared_mime_info
+    kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n
+    kiconthemes kio kwindowsystem qttools
   ];
   propagatedBuildInputs = [ boost kitemmodels ];
+  outputs = [ "out" "dev" ];
   cmakeFlags = [
     "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld"
   ];

From da47cdfffb0c795ac38cb2ddf59c2cc1d4b09910 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:45:02 -0500
Subject: [PATCH 2335/3246] ffmpegthumbs: fixup inputs and outputs

---
 pkgs/applications/kde/ffmpegthumbs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix
index 4e915422d14..aa03425f36a 100644
--- a/pkgs/applications/kde/ffmpegthumbs.nix
+++ b/pkgs/applications/kde/ffmpegthumbs.nix
@@ -11,5 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ffmpeg kio ];
+  buildInputs = [ ffmpeg kio ];
 }

From 79a882da54819cd31f68b1eb2f22c0cb4d65d8de Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:45:18 -0500
Subject: [PATCH 2336/3246] kcachegrind: fixup inputs and outputs

---
 pkgs/applications/kde/kcachegrind.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index 19e01aeebe9..91faaef623a 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,8 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kio, ki18n, karchive, qttools,
-  perl, python, php
+  karchive, ki18n, kio, perl, python, php, qttools,
 }:
 
 mkDerivation {
@@ -12,6 +11,5 @@ mkDerivation {
     maintainers = with lib.maintainers; [ orivej ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kio ];
-  buildInputs = [ perl python php ki18n karchive qttools ];
+  buildInputs = [ karchive ki18n kio perl python php qttools ];
 }

From 1277814070025fab755673621650d5ab9a8d27ea Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:45:30 -0500
Subject: [PATCH 2337/3246] kcalc: fixup inputs and outputs

---
 pkgs/applications/kde/kcalc.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 856da42c835..2d902c220af 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,7 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
+  gmp, kconfig, kconfigwidgets, kguiaddons, ki18n, kinit, knotifications,
+  kxmlgui,
 }:
 
 mkDerivation {
@@ -11,8 +12,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.fridh ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ gmp ];
-  propagatedBuildInputs = [
-    kconfig kconfigwidgets kguiaddons kinit knotifications
+  buildInputs = [
+    gmp kconfig kconfigwidgets kguiaddons ki18n kinit knotifications kxmlgui
   ];
 }

From 6e96de513b742640494462521171253e51430895 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:45:41 -0500
Subject: [PATCH 2338/3246] kcolorchooser: fixup inputs and outputs

---
 pkgs/applications/kde/kcolorchooser.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index 186505a050c..45b32fbe832 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -11,6 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n ];
-  propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
+  buildInputs = [ ki18n kwidgetsaddons kxmlgui ];
 }

From b5cef7ebc6c71296005fa231387f370f524e927d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:45:50 -0500
Subject: [PATCH 2339/3246] kcontacts: fixup inputs and outputs

---
 pkgs/applications/kde/kcontacts.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index d73f7f64625..12b3198a26b 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -12,4 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
+  outputs = [ "out" "dev" ];
 }

From 7378747c40ff90f586c4e9134c7f9cba36f56862 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:46:00 -0500
Subject: [PATCH 2340/3246] kdegraphics-mobipocket: fixup inputs and outputs

---
 pkgs/applications/kde/kdegraphics-mobipocket.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix
index 09f761df851..e5f5b88ec44 100644
--- a/pkgs/applications/kde/kdegraphics-mobipocket.nix
+++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix
@@ -12,4 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kio ];
+  outputs = [ "out" "dev" ];
 }

From c54222a1941f24a31ffb98228b0ae0727e7e686f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:46:13 -0500
Subject: [PATCH 2341/3246] kdegraphics-thumbnailers: fixup inputs and outputs

---
 pkgs/applications/kde/kdegraphics-thumbnailers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
index 3302681bd85..2e43e946d7f 100644
--- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix
+++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
@@ -10,5 +10,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kio libkexiv2 libkdcraw ];
+  buildInputs = [ kio libkexiv2 libkdcraw ];
 }

From 90a72a506534e6ac9adeaecc28acd2ac014e81fa Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:49:20 -0500
Subject: [PATCH 2342/3246] kdenetwork-filesharing: fixup inputs and outputs

---
 pkgs/applications/kde/kdenetwork-filesharing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix
index 62176f3f3bb..d251eb74f27 100644
--- a/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ b/pkgs/applications/kde/kdenetwork-filesharing.nix
@@ -11,5 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
+  buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
 }

From fcd152534565937d790497f1b10b40b2909389bb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:49:51 -0500
Subject: [PATCH 2343/3246] kdf: fixup inputs and outputs

---
 pkgs/applications/kde/kdf.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
index 333fea3df53..eef94fd5eb2 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kcmutils
+  kcmutils, ki18n, kiconthemes, kio, knotifications, kxmlgui,
 }:
 
 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.peterhoeg ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kcmutils ];
+  buildInputs = [ kcmutils ki18n kiconthemes kio knotifications kxmlgui ];
 }

From c173140843dd5996c229eaf56b834cb8b77e951f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:50:00 -0500
Subject: [PATCH 2344/3246] kgpg: fixup inputs and outputs

---
 pkgs/applications/kde/kgpg.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index ca495a1ae26..33813f376a5 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,19 +1,18 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools, ki18n, makeWrapper,
-  akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons,
+  akonadi-contacts, gnupg1, karchive, kcodecs, kcontacts, kcoreaddons,
   kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
-  ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
+  ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem, qgpgme,
 }:
 
 mkDerivation {
   name = "kgpg";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
-  buildInputs = [ gnupg1 gpgme ki18n ];
-  propagatedBuildInputs = [
-    akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
-    kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
-    kwidgetsaddons kwindowsystem
+  buildInputs = [
+    akonadi-contacts gnupg1 karchive kcodecs kcontacts kcoreaddons kcrash
+    kdbusaddons ki18n kiconthemes kjobwidgets kio knotifications kservice
+    ktextwidgets kxmlgui kwidgetsaddons kwindowsystem qgpgme
   ];
   postFixup = ''
     wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}"

From cf91cbbe52bc17eb7e7a945609cea1d9c06a3955 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:50:10 -0500
Subject: [PATCH 2345/3246] khelpcenter: fixup inputs and outputs

---
 pkgs/applications/kde/khelpcenter.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index db68cec976e..69b629bbeb9 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,16 +1,15 @@
 {
   mkDerivation,
   extra-cmake-modules, kdoctools,
-  grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
-  kdelibs4support, khtml, kservice, xapian
+  grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, kdelibs4support, ki18n,
+  kinit, khtml, kservice, xapian
 }:
 
 mkDerivation {
   name = "khelpcenter";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ ki18n xapian ];
-  propagatedBuildInputs = [
-    grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons
-    kinit kcmutils kservice
+  buildInputs = [
+    grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml
+    ki18n kinit kservice xapian
   ];
 }

From d732dd9c98f4471e7fbad52a7cea2951d7c80633 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:50:20 -0500
Subject: [PATCH 2346/3246] kig: fixup inputs and outputs

---
 pkgs/applications/kde/kig.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 34b32896209..7b858907795 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,8 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kparts, qtsvg, qtxmlpatterns, ktexteditor, boost,
-  karchive, kcrash
+  boost, karchive, kcrash, kiconthemes, kparts, ktexteditor, qtsvg,
+  qtxmlpatterns,
 }:
 
 mkDerivation {
@@ -12,9 +12,8 @@ mkDerivation {
     maintainers = with lib.maintainers; [ raskin ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ boost ];
-  propagatedBuildInputs = [
-    kparts qtsvg qtxmlpatterns ktexteditor karchive kcrash
+  buildInputs = [
+    boost karchive kcrash kiconthemes kparts ktexteditor qtsvg qtxmlpatterns
   ];
 }
 

From b2f6848e34188e7edb8df2ee8b45e1cbcc06b84f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:50:29 -0500
Subject: [PATCH 2347/3246] kio-extras: fixup inputs and outputs

---
 pkgs/applications/kde/kio-extras.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index 50709a7ddef..a78da6f48ca 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -13,7 +13,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
-  propagatedBuildInputs = [
+  buildInputs = [
     exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
     kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
     kpty libmtp libssh openexr openslp phonon qtsvg samba solid

From f86b67d0a5ecf05c8ffeaf0074054b312386e3af Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:50:47 -0500
Subject: [PATCH 2348/3246] kmime: fixup inputs and outputs

---
 pkgs/applications/kde/kmime.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index a5f7b11101e..b18a3f7fdc1 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -12,4 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ki18n ];
   buildInputs = [ kcodecs qtbase ];
+  outputs = [ "out" "dev" ];
 }

From 35818ba666ddbf1e9d0bd629d7e4012a6d460ebf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:50:56 -0500
Subject: [PATCH 2349/3246] kmix: fixup inputs and outputs

---
 pkgs/applications/kde/kmix.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index 058fd8178c4..8010c57d927 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -12,12 +12,9 @@ mkDerivation {
     maintainers = [ lib.maintainers.rongcuid ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
-  propagatedBuildInputs = [
-    kglobalaccel kxmlgui kcoreaddons kdelibs4support
-    plasma-framework
-  ];
-  cmakeFlags = [
-    "-DKMIX_KF5_BUILD=1"
+  buildInputs = [
+    alsaLib kglobalaccel kxmlgui kcoreaddons kdelibs4support
+    libcanberra_kde libpulseaudio plasma-framework
   ];
+  cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ];
 }

From 27bc86a5c878df153693fd2ff17ec96b52076ccf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:51:11 -0500
Subject: [PATCH 2350/3246] kolourpaint: fixup inputs and outputs

---
 pkgs/applications/kde/kolourpaint.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
index db4cb75cc35..4501324a871 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -9,7 +9,7 @@
 mkDerivation {
   name = "kolourpaint";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
+  buildInputs = [ kdelibs4support libkexiv2 ];
   meta = {
     maintainers = [ lib.maintainers.fridh ];
     license = with lib.licenses; [ gpl2 ];

From 93478529d0a9de4e0c23d796e6278e15203f15b7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:51:21 -0500
Subject: [PATCH 2351/3246] kompare: fixup inputs and outputs

---
 pkgs/applications/kde/kompare.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index cf2fa2e6a10..bbaad3a02f8 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,14 +1,15 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kparts, ktexteditor, kwidgetsaddons, libkomparediff2
+  kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
 mkDerivation {
   name = "kompare";
   meta = { license = with lib.licenses; [ gpl2 ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kparts ktexteditor kwidgetsaddons libkomparediff2
+  buildInputs = [
+    kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
   ];
+  outputs = [ "out" "dev" ];
 }

From fd630ab1cc66a0e6dc5d3a4e6bb23a763517044f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:51:31 -0500
Subject: [PATCH 2352/3246] konsole: fixup inputs and outputs

---
 pkgs/applications/kde/konsole.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index d2d60adda2c..5269941fa11 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -14,10 +14,9 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ ki18n ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
-    kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty
+    kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
     kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
   ];
   propagatedUserEnvPkgs = [ (lib.getBin kinit) ];

From 0ba1b29ea3c99cae8d8259929129c74fe7dcec1c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:51:42 -0500
Subject: [PATCH 2353/3246] libkdcraw: fixup inputs and outputs

---
 pkgs/applications/kde/libkdcraw.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix
index 383bd3b6703..70e3cb0e195 100644
--- a/pkgs/applications/kde/libkdcraw.nix
+++ b/pkgs/applications/kde/libkdcraw.nix
@@ -9,4 +9,5 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
   propagatedBuildInputs = [ libraw ];
+  outputs = [ "out" "dev" ];
 }

From 2f3085cb8d57390eeea4b1864d43e04932f637d6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:51:53 -0500
Subject: [PATCH 2354/3246] libkexiv2: fixup inputs and outputs

---
 pkgs/applications/kde/libkexiv2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix
index 816d4168967..8c8d244d6f6 100644
--- a/pkgs/applications/kde/libkexiv2.nix
+++ b/pkgs/applications/kde/libkexiv2.nix
@@ -9,4 +9,5 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
   propagatedBuildInputs = [ exiv2 ];
+  outputs = [ "out" "dev" ];
 }

From 612a7bb45e55621aba900f3e65a4207d703fdb82 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:52:04 -0500
Subject: [PATCH 2355/3246] libkipi: fixup inputs and outputs

---
 pkgs/applications/kde/libkipi.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix
index 3a28d8c2e8c..c70d8407fc7 100644
--- a/pkgs/applications/kde/libkipi.nix
+++ b/pkgs/applications/kde/libkipi.nix
@@ -7,5 +7,6 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ];
+  buildInputs = [ kconfig ki18n kservice kxmlgui ];
+  outputs = [ "out" "dev" ];
 }

From 668b0aa1a8d575b40f37c9779c63e43da6021711 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 08:52:16 -0500
Subject: [PATCH 2356/3246] spectacle: fixup inputs and outputs

---
 pkgs/applications/kde/spectacle.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 1be07fe6fe8..6deec6aaabb 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -11,10 +11,9 @@ mkDerivation {
   name = "spectacle";
   meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ ki18n xcb-util-cursor ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
-    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras
+  buildInputs = [
+    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
   ];
   propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
 }

From 47c74997a46e3c74916d668fab06902718672b44 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:28:45 -0500
Subject: [PATCH 2357/3246] kmbox: init at 17.04.0

---
 pkgs/applications/kde/default.nix |  5 +++--
 pkgs/applications/kde/kmbox.nix   | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/kde/kmbox.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 90af8bf1611..1864605daf9 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -63,19 +63,20 @@ let
       gwenview = callPackage ./gwenview.nix {};
       k3b = callPackage ./k3b.nix {};
       kate = callPackage ./kate.nix {};
-      kdenlive = callPackage ./kdenlive.nix {};
-      kcalc = callPackage ./kcalc.nix {};
       kcachegrind = callPackage ./kcachegrind.nix {};
+      kcalc = callPackage ./kcalc.nix {};
       kcolorchooser = callPackage ./kcolorchooser.nix {};
       kcontacts = callPackage ./kcontacts.nix {};
       kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
       kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
       kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
+      kdenlive = callPackage ./kdenlive.nix {};
       kdf = callPackage ./kdf.nix {};
       kgpg = callPackage ./kgpg.nix {};
       khelpcenter = callPackage ./khelpcenter.nix {};
       kig = callPackage ./kig.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
+      kmbox = callPackage ./kmbox.nix {};
       kmime = callPackage ./kmime.nix {};
       kmix = callPackage ./kmix.nix {};
       kolourpaint = callPackage ./kolourpaint.nix {};
diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix
new file mode 100644
index 00000000000..4b6b72a3734
--- /dev/null
+++ b/pkgs/applications/kde/kmbox.nix
@@ -0,0 +1,16 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kmime, qtbase,
+}:
+
+mkDerivation {
+  name = "kmbox";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kmime qtbase ];
+  outputs = [ "out" "dev" ];
+}

From 0d21d80618a5f03c4b02a0459d2d09c4ab7aae4c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:29:48 -0500
Subject: [PATCH 2358/3246] kmailtransport: init at 17.04.0

---
 pkgs/applications/kde/default.nix        |  1 +
 pkgs/applications/kde/kmailtransport.nix | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/kde/kmailtransport.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 1864605daf9..718ac70c80b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -76,6 +76,7 @@ let
       khelpcenter = callPackage ./khelpcenter.nix {};
       kig = callPackage ./kig.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
+      kmailtransport = callPackage ./kmailtransport.nix {};
       kmbox = callPackage ./kmbox.nix {};
       kmime = callPackage ./kmime.nix {};
       kmix = callPackage ./kmix.nix {};
diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix
new file mode 100644
index 00000000000..19ce2ba94f3
--- /dev/null
+++ b/pkgs/applications/kde/kmailtransport.nix
@@ -0,0 +1,17 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,
+}:
+
+mkDerivation {
+  name = "kmailtransport";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ akonadi kcmutils ki18n kio ];
+  propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
+  outputs = [ "out" "dev" ];
+}

From 4caf71456c63ea957a53f9fda8e7c1966ae2def9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:30:24 -0500
Subject: [PATCH 2359/3246] kcalcore: init at 17.04.0

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/kcalcore.nix | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/kde/kcalcore.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 718ac70c80b..5cff7241c9b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -65,6 +65,7 @@ let
       kate = callPackage ./kate.nix {};
       kcachegrind = callPackage ./kcachegrind.nix {};
       kcalc = callPackage ./kcalc.nix {};
+      kcalcore = callPackage ./kcalcore.nix {};
       kcolorchooser = callPackage ./kcolorchooser.nix {};
       kcontacts = callPackage ./kcontacts.nix {};
       kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
diff --git a/pkgs/applications/kde/kcalcore.nix b/pkgs/applications/kde/kcalcore.nix
new file mode 100644
index 00000000000..4ac9c9b925a
--- /dev/null
+++ b/pkgs/applications/kde/kcalcore.nix
@@ -0,0 +1,16 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kdelibs4support, libical
+}:
+
+mkDerivation {
+  name = "kcalcore";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [ kdelibs4support libical ];
+  outputs = [ "out" "dev" ];
+}

From a40f04d8dc05a8a4f8934c76fb09a7718cfca59d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:30:51 -0500
Subject: [PATCH 2360/3246] kpimtextedit: init at 17.04.0

---
 pkgs/applications/kde/default.nix      |  1 +
 pkgs/applications/kde/kpimtextedit.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/kde/kpimtextedit.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5cff7241c9b..062a2b03b09 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -84,6 +84,7 @@ let
       kolourpaint = callPackage ./kolourpaint.nix {};
       kompare = callPackage ./kompare.nix {};
       konsole = callPackage ./konsole.nix {};
+      kpimtextedit = callPackage ./kpimtextedit.nix {};
       krfb = callPackage ./krfb.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
       libkcddb = callPackage ./libkcddb.nix {};
diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix
new file mode 100644
index 00000000000..17c960d1762
--- /dev/null
+++ b/pkgs/applications/kde/kpimtextedit.nix
@@ -0,0 +1,21 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
+  kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
+}:
+
+mkDerivation {
+  name = "kpimtextedit";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
+    sonnet syntax-highlighting qttools
+  ];
+  propagatedBuildInputs = [ ktextwidgets ];
+  outputs = [ "out" "dev" ];
+}

From 0601524c047a68914e65021e94ca8ca0e96a935a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:31:14 -0500
Subject: [PATCH 2361/3246] kontactinterface: init at 17.04.0

---
 pkgs/applications/kde/default.nix          |  1 +
 pkgs/applications/kde/kontactinterface.nix | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/kde/kontactinterface.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 062a2b03b09..ae2edf3bf61 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -84,6 +84,7 @@ let
       kolourpaint = callPackage ./kolourpaint.nix {};
       kompare = callPackage ./kompare.nix {};
       konsole = callPackage ./konsole.nix {};
+      kontactinterface = callPackage ./kontactinterface.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       krfb = callPackage ./krfb.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix
new file mode 100644
index 00000000000..f2df628f301
--- /dev/null
+++ b/pkgs/applications/kde/kontactinterface.nix
@@ -0,0 +1,17 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kiconthemes, kparts, kwindowsystem, kxmlgui
+}:
+
+mkDerivation {
+  name = "kontactinterface";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kiconthemes kparts kwindowsystem kxmlgui
+  ];
+}

From 2d60e62d3676d2c65970ab384505026b4f6132d6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:31:45 -0500
Subject: [PATCH 2362/3246] kldap: init at 17.04.0

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kldap.nix   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/kde/kldap.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index ae2edf3bf61..52b612095ef 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -77,6 +77,7 @@ let
       khelpcenter = callPackage ./khelpcenter.nix {};
       kig = callPackage ./kig.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
+      kldap = callPackage ./kldap.nix {};
       kmailtransport = callPackage ./kmailtransport.nix {};
       kmbox = callPackage ./kmbox.nix {};
       kmime = callPackage ./kmime.nix {};
diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix
new file mode 100644
index 00000000000..14a8aea5e67
--- /dev/null
+++ b/pkgs/applications/kde/kldap.nix
@@ -0,0 +1,17 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  cyrus_sasl, ki18n, kio, kmbox, openldap
+}:
+
+mkDerivation {
+  name = "kldap";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ ki18n kio kmbox ];
+  propagatedBuildInputs = [ cyrus_sasl openldap ];
+  outputs = [ "out" "dev" ];
+}

From a5dd08bb8fa04462f9b96fefe468228722cb1088 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:32:18 -0500
Subject: [PATCH 2363/3246] libkdepim: init at 17.04.0

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/libkdepim.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/kde/libkdepim.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 52b612095ef..5c62edd6cdb 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -91,6 +91,7 @@ let
       kwalletmanager = callPackage ./kwalletmanager.nix {};
       libkcddb = callPackage ./libkcddb.nix {};
       libkdcraw = callPackage ./libkdcraw.nix {};
+      libkdepim = callPackage ./libkdepim.nix {};
       libkexiv2 = callPackage ./libkexiv2.nix {};
       libkipi = callPackage ./libkipi.nix {};
       libkomparediff2 = callPackage ./libkomparediff2.nix {};
diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix
new file mode 100644
index 00000000000..92716e40a34
--- /dev/null
+++ b/pkgs/applications/kde/libkdepim.nix
@@ -0,0 +1,21 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-contacts, akonadi-search, kcmutils, kcodecs, kcompletion,
+  kconfigwidgets, kcontacts, ki18n, kiconthemes, kio, kitemviews, kjobwidgets,
+  kldap, kwallet,
+}:
+
+mkDerivation {
+  name = "libkdepim";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi akonadi-contacts akonadi-search kcmutils kcodecs kcompletion
+    kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap
+    kwallet
+  ];
+}

From 5417bb6b814c18da1427b4aea4e651be2d6a98d0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:32:38 -0500
Subject: [PATCH 2364/3246] libkleo: init at 17.04.0

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/libkleo.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/kde/libkleo.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5c62edd6cdb..37769d24a1a 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -94,6 +94,7 @@ let
       libkdepim = callPackage ./libkdepim.nix {};
       libkexiv2 = callPackage ./libkexiv2.nix {};
       libkipi = callPackage ./libkipi.nix {};
+      libkleo = callPackage ./libkleo.nix {};
       libkomparediff2 = callPackage ./libkomparediff2.nix {};
       marble = callPackage ./marble.nix {};
       okteta = callPackage ./okteta.nix {};
diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix
new file mode 100644
index 00000000000..0958a0e605f
--- /dev/null
+++ b/pkgs/applications/kde/libkleo.nix
@@ -0,0 +1,21 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  boost, qgpgme, kcodecs, kcompletion, kconfig, kcoreaddons, ki18n, kitemmodels,
+  kpimtextedit, kwidgetsaddons, kwindowsystem
+}:
+
+mkDerivation {
+  name = "libkleo";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    boost kcodecs kcompletion kconfig kcoreaddons ki18n kitemmodels
+    kpimtextedit kwidgetsaddons kwindowsystem
+  ];
+  propagatedBuildInputs = [ qgpgme ];
+  outputs = [ "out" "dev" ];
+}

From 8c36d47804666e90b62c427dab53dcd0eaca753c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:33:11 -0500
Subject: [PATCH 2365/3246] kidentitymanagement: init at 17.04.0

---
 pkgs/applications/kde/default.nix             |  1 +
 pkgs/applications/kde/kidentitymanagement.nix | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/kidentitymanagement.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 37769d24a1a..2afb85615de 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -75,6 +75,7 @@ let
       kdf = callPackage ./kdf.nix {};
       kgpg = callPackage ./kgpg.nix {};
       khelpcenter = callPackage ./khelpcenter.nix {};
+      kidentitymanagement = callPackage ./kidentitymanagement.nix {};
       kig = callPackage ./kig.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
       kldap = callPackage ./kldap.nix {};
diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix
new file mode 100644
index 00000000000..92fcc238779
--- /dev/null
+++ b/pkgs/applications/kde/kidentitymanagement.nix
@@ -0,0 +1,20 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kcompletion, kcoreaddons, kemoticons, kiconthemes, kio, kpimtextedit,
+  ktextwidgets, kxmlgui
+}:
+
+mkDerivation {
+  name = "kidentitymanagement";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kcompletion kemoticons kiconthemes kio ktextwidgets kxmlgui
+  ];
+  propagatedBuildInputs = [ kcoreaddons kpimtextedit ];
+  outputs = [ "out" "dev" ];
+}

From 9e4cf7e36b0d4ecfcdb757d661de7e7a82d3a050 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:33:33 -0500
Subject: [PATCH 2366/3246] kcalutils: init at 17.04.0

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/kcalutils.nix | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/kcalutils.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 2afb85615de..3d11bdb6359 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -66,6 +66,7 @@ let
       kcachegrind = callPackage ./kcachegrind.nix {};
       kcalc = callPackage ./kcalc.nix {};
       kcalcore = callPackage ./kcalcore.nix {};
+      kcalutils = callPackage ./kcalutils.nix {};
       kcolorchooser = callPackage ./kcolorchooser.nix {};
       kcontacts = callPackage ./kcontacts.nix {};
       kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix
new file mode 100644
index 00000000000..3f6821e08ea
--- /dev/null
+++ b/pkgs/applications/kde/kcalutils.nix
@@ -0,0 +1,20 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
+  kidentitymanagement, kpimtextedit,
+}:
+
+mkDerivation {
+  name = "kcalutils";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
+    kidentitymanagement kpimtextedit
+  ];
+  outputs = [ "out" "dev" ];
+}

From 2dfa7a0af2965084eb4cd78beb0d2c2c98d04294 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:33:55 -0500
Subject: [PATCH 2367/3246] grantleetheme: init at 17.04.0

---
 pkgs/applications/kde/default.nix       |  1 +
 pkgs/applications/kde/grantleetheme.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/kde/grantleetheme.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 3d11bdb6359..28fba34baa4 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -60,6 +60,7 @@ let
       dolphin-plugins = callPackage ./dolphin-plugins.nix {};
       ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
       filelight = callPackage ./filelight.nix {};
+      grantleetheme = callPackage ./grantleetheme.nix {};
       gwenview = callPackage ./gwenview.nix {};
       k3b = callPackage ./k3b.nix {};
       kate = callPackage ./kate.nix {};
diff --git a/pkgs/applications/kde/grantleetheme.nix b/pkgs/applications/kde/grantleetheme.nix
new file mode 100644
index 00000000000..9555e153a30
--- /dev/null
+++ b/pkgs/applications/kde/grantleetheme.nix
@@ -0,0 +1,18 @@
+{
+  mkDerivation, copyPathsToStore, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
+}:
+
+mkDerivation {
+  name = "grantleetheme";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase
+  ];
+  output = [ "out" "dev" ];
+}

From a731f3f82442a3c83b2d7b9efbf30e1a106bd9f5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:34:19 -0500
Subject: [PATCH 2368/3246] pimcommon: init at 17.04.0

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/pimcommon.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/kde/pimcommon.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 28fba34baa4..31ccac2bbbe 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -102,6 +102,7 @@ let
       marble = callPackage ./marble.nix {};
       okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
+      pimcommon = callPackage ./pimcommon.nix {};
       print-manager = callPackage ./print-manager.nix {};
       spectacle = callPackage ./spectacle.nix {};
 
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
new file mode 100644
index 00000000000..02e9a47274b
--- /dev/null
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -0,0 +1,26 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
+  kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin,
+  kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
+  kwallet, kwindowsystem, libkdepim, qtwebengine
+}:
+
+mkDerivation {
+  name = "pimcommon";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
+    kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
+    kwallet kwindowsystem libkdepim qtwebengine
+  ];
+  propagatedBuildInputs = [
+    akonadi akonadi-contacts kconfig kcontacts kimap
+  ];
+  outputs = [ "out" "dev" ];
+}

From e95b0be376a0c992cf3547ea4654e89b82a990ff Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:34:43 -0500
Subject: [PATCH 2369/3246] libgravatar: init at 17.04.0

---
 pkgs/applications/kde/default.nix     |  1 +
 pkgs/applications/kde/libgravatar.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/kde/libgravatar.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 31ccac2bbbe..b71b7661f00 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -92,6 +92,7 @@ let
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       krfb = callPackage ./krfb.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
+      libgravatar = callPackage ./libgravatar.nix {};
       libkcddb = callPackage ./libkcddb.nix {};
       libkdcraw = callPackage ./libkdcraw.nix {};
       libkdepim = callPackage ./libkdepim.nix {};
diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix
new file mode 100644
index 00000000000..69a1b9e99cb
--- /dev/null
+++ b/pkgs/applications/kde/libgravatar.nix
@@ -0,0 +1,18 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kconfig, kio, ktextwidgets, kwidgetsaddons, pimcommon
+}:
+
+mkDerivation {
+  name = "libgravatar";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [
+    kconfig kio ktextwidgets kwidgetsaddons pimcommon
+  ];
+  outputs = [ "out" "dev" ];
+}

From 2b2a98f9d0e59a4ff251523b58a943cdaeb94c84 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:35:06 -0500
Subject: [PATCH 2370/3246] messagelib: init at 17.04.0

---
 pkgs/applications/kde/default.nix    |  1 +
 pkgs/applications/kde/messagelib.nix | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/kde/messagelib.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index b71b7661f00..487d5bcb0d5 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -101,6 +101,7 @@ let
       libkleo = callPackage ./libkleo.nix {};
       libkomparediff2 = callPackage ./libkomparediff2.nix {};
       marble = callPackage ./marble.nix {};
+      messagelib = callPackage ./messagelib.nix {};
       okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
       pimcommon = callPackage ./pimcommon.nix {};
diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix
new file mode 100644
index 00000000000..f12158a1f71
--- /dev/null
+++ b/pkgs/applications/kde/messagelib.nix
@@ -0,0 +1,29 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5,
+  grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
+  kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
+  kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
+  pimcommon, qtwebengine, qtwebkit, syntax-highlighting
+}:
+
+mkDerivation {
+  name = "messagelib";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs
+    kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
+    kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit
+    syntax-highlighting
+  ];
+  propagatedBuildInputs = [
+    akonadi akonadi-mime kcontacts kidentitymanagement kmime libkleo pimcommon
+    qtwebengine
+  ];
+  outputs = [ "out" "dev" ];
+}

From 16675033bbcbf0be13a06acb830e6cd8ab0d153b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:35:26 -0500
Subject: [PATCH 2371/3246] mailimporter: init at 17.04.0

---
 pkgs/applications/kde/default.nix      |  1 +
 pkgs/applications/kde/mailimporter.nix | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/kde/mailimporter.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 487d5bcb0d5..dc549ecb376 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -100,6 +100,7 @@ let
       libkipi = callPackage ./libkipi.nix {};
       libkleo = callPackage ./libkleo.nix {};
       libkomparediff2 = callPackage ./libkomparediff2.nix {};
+      mailimporter = callPackage ./mailimporter.nix {};
       marble = callPackage ./marble.nix {};
       messagelib = callPackage ./messagelib.nix {};
       okteta = callPackage ./okteta.nix {};
diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix
new file mode 100644
index 00000000000..f002ff0f340
--- /dev/null
+++ b/pkgs/applications/kde/mailimporter.nix
@@ -0,0 +1,19 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n,
+  kmime, kxmlgui, libkdepim
+}:
+
+mkDerivation {
+  name = "mailimporter";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
+    kxmlgui libkdepim
+  ];
+}

From 1e5a96ea1a5ecf6fb91d0db6a5a0fcfd2b609e9b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:35:46 -0500
Subject: [PATCH 2372/3246] mailcommon: init at 17.04.0

---
 pkgs/applications/kde/default.nix    |  1 +
 pkgs/applications/kde/mailcommon.nix | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/kde/mailcommon.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index dc549ecb376..5b23a32a5fa 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -100,6 +100,7 @@ let
       libkipi = callPackage ./libkipi.nix {};
       libkleo = callPackage ./libkleo.nix {};
       libkomparediff2 = callPackage ./libkomparediff2.nix {};
+      mailcommon = callPackage ./mailcommon.nix {};
       mailimporter = callPackage ./mailimporter.nix {};
       marble = callPackage ./marble.nix {};
       messagelib = callPackage ./messagelib.nix {};
diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix
new file mode 100644
index 00000000000..ee958d701b3
--- /dev/null
+++ b/pkgs/applications/kde/mailcommon.nix
@@ -0,0 +1,22 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets,
+  kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap,
+  kmailtransport, kwindowsystem, mailimporter, messagelib, phonon,
+}:
+
+mkDerivation {
+  name = "mailcommon";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons
+    kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport
+    kwindowsystem mailimporter messagelib phonon
+  ];
+  outputs = [ "out" "dev" ];
+}

From 4e88274bf3d99ad9bf665082759e7cb9cdf4f3e1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:36:05 -0500
Subject: [PATCH 2373/3246] libksieve: init at 17.04.0

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/libksieve.nix | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/kde/libksieve.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5b23a32a5fa..bb04f44d28c 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -100,6 +100,7 @@ let
       libkipi = callPackage ./libkipi.nix {};
       libkleo = callPackage ./libkleo.nix {};
       libkomparediff2 = callPackage ./libkomparediff2.nix {};
+      libksieve = callPackage ./libksieve.nix {};
       mailcommon = callPackage ./mailcommon.nix {};
       mailimporter = callPackage ./mailimporter.nix {};
       marble = callPackage ./marble.nix {};
diff --git a/pkgs/applications/kde/libksieve.nix b/pkgs/applications/kde/libksieve.nix
new file mode 100644
index 00000000000..dd33f759c31
--- /dev/null
+++ b/pkgs/applications/kde/libksieve.nix
@@ -0,0 +1,23 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, karchive, kcompletion, kiconthemes, kidentitymanagement, kio,
+  kmailtransport, knewstuff, kwindowsystem, kxmlgui, libkdepim, pimcommon,
+  qtwebengine, syntax-highlighting,
+}:
+
+mkDerivation {
+  name = "libksieve";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  outputs = [ "out" "dev" ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi karchive kcompletion kiconthemes kidentitymanagement kio
+    kmailtransport knewstuff kwindowsystem kxmlgui libkdepim pimcommon
+    qtwebengine
+  ];
+  propagatedBuildInputs = [ syntax-highlighting ];
+}

From 551604e0456f680775b482cd0cd72d924a4399e5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:36:20 -0500
Subject: [PATCH 2374/3246] ktnef: init at 17.04.0

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/ktnef.nix   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/kde/ktnef.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index bb04f44d28c..f6662d08d3d 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -91,6 +91,7 @@ let
       kontactinterface = callPackage ./kontactinterface.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       krfb = callPackage ./krfb.nix {};
+      ktnef = callPackage ./ktnef.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
       libgravatar = callPackage ./libgravatar.nix {};
       libkcddb = callPackage ./libkcddb.nix {};
diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix
new file mode 100644
index 00000000000..b5a3834869d
--- /dev/null
+++ b/pkgs/applications/kde/ktnef.nix
@@ -0,0 +1,18 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kcalcore, kcalutils, kcontacts, kdelibs4support
+}:
+
+mkDerivation {
+  name = "ktnef";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [
+    kcalcore kcalutils kcontacts kdelibs4support
+  ];
+  outputs = [ "out" "dev" ];
+}

From 2dd147c9a789099db9a1352150e1a2fa27d7fd74 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:36:38 -0500
Subject: [PATCH 2375/3246] kimap: init at 17.04.0

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kimap.nix   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/kde/kimap.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index f6662d08d3d..0db8df42805 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -79,6 +79,7 @@ let
       khelpcenter = callPackage ./khelpcenter.nix {};
       kidentitymanagement = callPackage ./kidentitymanagement.nix {};
       kig = callPackage ./kig.nix {};
+      kimap = callPackage ./kimap.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
       kldap = callPackage ./kldap.nix {};
       kmailtransport = callPackage ./kmailtransport.nix {};
diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix
new file mode 100644
index 00000000000..9e42c571058
--- /dev/null
+++ b/pkgs/applications/kde/kimap.nix
@@ -0,0 +1,17 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  cyrus_sasl, kcoreaddons, ki18n, kio, kmime
+}:
+
+mkDerivation {
+  name = "kimap";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ ki18n kio ];
+  propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ];
+  outputs = [ "out" "dev" ];
+}

From 59c0f98a4cbca8170cb9b4de10da9dab00151ecb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:37:10 -0500
Subject: [PATCH 2376/3246] akonadi-search: init at 17.04.0

---
 pkgs/applications/kde/akonadi-search.nix | 20 ++++++++++++++++++++
 pkgs/applications/kde/default.nix        |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/akonadi-search.nix

diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix
new file mode 100644
index 00000000000..617c086ad9c
--- /dev/null
+++ b/pkgs/applications/kde/akonadi-search.nix
@@ -0,0 +1,20 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime,
+  krunner, qtbase, xapian
+}:
+
+mkDerivation {
+  name = "akonadi-search";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcmutils krunner xapian ];
+  propagatedBuildInputs = [
+    akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase
+  ];
+  outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 0db8df42805..b4dcb341a3a 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -54,6 +54,7 @@ let
       akonadi = callPackage ./akonadi {};
       akonadi-contacts = callPackage ./akonadi-contacts.nix {};
       akonadi-mime = callPackage ./akonadi-mime.nix {};
+      akonadi-search = callPackage ./akonadi-search.nix {};
       ark = callPackage ./ark/default.nix {};
       baloo-widgets = callPackage ./baloo-widgets.nix {};
       dolphin = callPackage ./dolphin.nix {};

From 8d26f93e8ceb0b7105b20defd057235fa857d6e5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:37:29 -0500
Subject: [PATCH 2377/3246] akonadi-notes: init at 17.04.0

---
 pkgs/applications/kde/akonadi-notes.nix | 18 ++++++++++++++++++
 pkgs/applications/kde/default.nix       |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/kde/akonadi-notes.nix

diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix
new file mode 100644
index 00000000000..72c4d799239
--- /dev/null
+++ b/pkgs/applications/kde/akonadi-notes.nix
@@ -0,0 +1,18 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, kcompletion, ki18n, kitemmodels, kmime, kxmlgui
+}:
+
+mkDerivation {
+  name = "akonadi-notes";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi kcompletion ki18n kitemmodels kmime kxmlgui
+  ];
+  outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index b4dcb341a3a..d4772fa7176 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -54,6 +54,7 @@ let
       akonadi = callPackage ./akonadi {};
       akonadi-contacts = callPackage ./akonadi-contacts.nix {};
       akonadi-mime = callPackage ./akonadi-mime.nix {};
+      akonadi-notes = callPackage ./akonadi-notes.nix {};
       akonadi-search = callPackage ./akonadi-search.nix {};
       ark = callPackage ./ark/default.nix {};
       baloo-widgets = callPackage ./baloo-widgets.nix {};

From fa8d2401880c6b8185891005a9ea9b99dafaaef8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:37:41 -0500
Subject: [PATCH 2378/3246] kmail: init at 17.04.0

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kmail.nix   | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  4 ++--
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/kde/kmail.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index d4772fa7176..2a2cad01225 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -84,6 +84,7 @@ let
       kimap = callPackage ./kimap.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
       kldap = callPackage ./kldap.nix {};
+      kmail = callPackage ./kmail.nix {};
       kmailtransport = callPackage ./kmailtransport.nix {};
       kmbox = callPackage ./kmbox.nix {};
       kmime = callPackage ./kmime.nix {};
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
new file mode 100644
index 00000000000..ec8c9892779
--- /dev/null
+++ b/pkgs/applications/kde/kmail.nix
@@ -0,0 +1,29 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
+  kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs,
+  kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap,
+  kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
+  kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
+  kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon,
+  messagelib, pim-sieve-editor, qtscript, qtwebengine,
+}:
+
+mkDerivation {
+  name = "kmail";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig
+    kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n
+    kiconthemes kinit kio kldap kmail-account-wizard kmailtransport
+    knotifications knotifyconfig kontactinterface kparts kpty kservice
+    ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
+    libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
+  ];
+  propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 372d346aeec..a53c411753a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14841,8 +14841,8 @@ with pkgs;
 
   inherit (kdeApplications)
     akonadi ark dolphin ffmpegthumbs filelight gwenview kate kdenlive
-    kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmix
-    kolourpaint kompare konsole krfb kwalletmanager marble okteta okular
+    kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmail
+    kmix kolourpaint kompare konsole krfb kwalletmanager marble okteta okular
     spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };

From 828124b4201483bcbf84216ea2d32636eac645c9 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Tue, 18 Apr 2017 09:40:22 +0200
Subject: [PATCH 2379/3246] grantleetheme: check for a null pointer

---
 pkgs/applications/kde/grantleetheme.nix       |  4 ++-
 .../kde/grantleetheme_check_null.patch        | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/grantleetheme_check_null.patch

diff --git a/pkgs/applications/kde/grantleetheme.nix b/pkgs/applications/kde/grantleetheme.nix
index 9555e153a30..976ccbe28ce 100644
--- a/pkgs/applications/kde/grantleetheme.nix
+++ b/pkgs/applications/kde/grantleetheme.nix
@@ -10,9 +10,11 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = kdepimTeam;
   };
+  output = [ "out" "dev" ];
+  patches = [ ./grantleetheme_check_null.patch ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase
   ];
-  output = [ "out" "dev" ];
+  propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ];
 }
diff --git a/pkgs/applications/kde/grantleetheme_check_null.patch b/pkgs/applications/kde/grantleetheme_check_null.patch
new file mode 100644
index 00000000000..730d5b0fe26
--- /dev/null
+++ b/pkgs/applications/kde/grantleetheme_check_null.patch
@@ -0,0 +1,25 @@
+diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
+index b86fc3a..8af72f4 100644
+--- a/src/grantleetheme.cpp
++++ b/src/grantleetheme.cpp
+@@ -102,7 +102,10 @@ QString ThemePrivate::errorTemplate(const QString &reason,
+     Grantlee::Context ctx = createContext();
+     ctx.insert(QStringLiteral("error"), reason);
+     ctx.insert(QStringLiteral("templateName"), origTemplateName);
+-    ctx.insert(QStringLiteral("errorMessage"), failedTemplate->errorString());
++    const QString errorString = failedTemplate
++            ? failedTemplate->errorString()
++            : QStringLiteral("(null template)");
++    ctx.insert(QStringLiteral("errorMessage"), errorString);
+     return tpl->render(&ctx);
+ }
+ 
+@@ -208,7 +211,7 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
+     }
+ 
+     Grantlee::Template tpl = d->loader->loadByName(templateName, ThemePrivate::sEngine);
+-    if (tpl->error()) {
++    if (!tpl || tpl->error()) {
+         return d->errorTemplate(i18n("Template parsing error"), templateName, tpl);
+     }
+ 

From 126da861bebd1549c0736cd8e62aed0fe7dbc958 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 22 May 2017 12:30:11 -0500
Subject: [PATCH 2380/3246] kmail-account-wizard: init at 17.04.0

---
 pkgs/applications/kde/default.nix             |  1 +
 .../applications/kde/kmail-account-wizard.nix | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/kde/kmail-account-wizard.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 2a2cad01225..8501fe3e988 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -85,6 +85,7 @@ let
       kio-extras = callPackage ./kio-extras.nix {};
       kldap = callPackage ./kldap.nix {};
       kmail = callPackage ./kmail.nix {};
+      kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};
       kmailtransport = callPackage ./kmailtransport.nix {};
       kmbox = callPackage ./kmbox.nix {};
       kmime = callPackage ./kmime.nix {};
diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix
new file mode 100644
index 00000000000..9f3d5e2ea01
--- /dev/null
+++ b/pkgs/applications/kde/kmail-account-wizard.nix
@@ -0,0 +1,21 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools, shared_mime_info,
+  akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
+  kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
+  kwallet, libkdepim, libkleo, pimcommon, qttools,
+}:
+
+mkDerivation {
+  name = "kmail-account-wizard";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
+  buildInputs = [
+    akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport
+    knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim
+    libkleo pimcommon qttools
+  ];
+}

From cf2d844cc2edd60d1b215f12626895983c58c7aa Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 22 May 2017 12:30:34 -0500
Subject: [PATCH 2381/3246] mbox-importer: init at 17.04.0

---
 pkgs/applications/kde/default.nix       |  1 +
 pkgs/applications/kde/mbox-importer.nix | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/mbox-importer.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 8501fe3e988..500f6017fae 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -110,6 +110,7 @@ let
       mailcommon = callPackage ./mailcommon.nix {};
       mailimporter = callPackage ./mailimporter.nix {};
       marble = callPackage ./marble.nix {};
+      mbox-importer = callPackage ./mbox-importer.nix {};
       messagelib = callPackage ./messagelib.nix {};
       okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix
new file mode 100644
index 00000000000..aa637d440bd
--- /dev/null
+++ b/pkgs/applications/kde/mbox-importer.nix
@@ -0,0 +1,20 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-search, kconfig, kservice, kio, mailcommon, mailimporter, messagelib
+}:
+
+mkDerivation {
+  name = "mbox-importer";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib
+  ];
+  preHook = ''
+    set -x
+  '';
+}

From 6caaa1fc480d0cf139a274ec2ad93e57d1bbdc20 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 22 May 2017 12:30:55 -0500
Subject: [PATCH 2382/3246] pim-sieve-editor: init at 17.04.0

---
 pkgs/applications/kde/default.nix          |  1 +
 pkgs/applications/kde/pim-sieve-editor.nix | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/kde/pim-sieve-editor.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 500f6017fae..ed2aefd77b7 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -115,6 +115,7 @@ let
       okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
       pimcommon = callPackage ./pimcommon.nix {};
+      pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
       print-manager = callPackage ./print-manager.nix {};
       spectacle = callPackage ./spectacle.nix {};
 
diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix
new file mode 100644
index 00000000000..c83df2e0e49
--- /dev/null
+++ b/pkgs/applications/kde/pim-sieve-editor.nix
@@ -0,0 +1,19 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kdbusaddons, kcrash, kbookmarks, kiconthemes, kio, kpimtextedit,
+  kmailtransport, pimcommon, libksieve
+}:
+
+mkDerivation {
+  name = "pim-sieve-editor";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kdbusaddons kcrash kbookmarks kiconthemes kio kpimtextedit kmailtransport
+    pimcommon libksieve
+  ];
+}

From 463569f763023188b5cf6bc22cbbfb39faee2dc8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 11:00:43 -0500
Subject: [PATCH 2383/3246] kdav: init at 17.04.0

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kdav.nix    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/kde/kdav.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index ed2aefd77b7..5ded354e9e5 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -72,6 +72,7 @@ let
       kcalutils = callPackage ./kcalutils.nix {};
       kcolorchooser = callPackage ./kcolorchooser.nix {};
       kcontacts = callPackage ./kcontacts.nix {};
+      kdav = callPackage ./kdav.nix {};
       kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
       kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
       kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
diff --git a/pkgs/applications/kde/kdav.nix b/pkgs/applications/kde/kdav.nix
new file mode 100644
index 00000000000..800c92511de
--- /dev/null
+++ b/pkgs/applications/kde/kdav.nix
@@ -0,0 +1,16 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kcoreaddons, kio, qtxmlpatterns,
+}:
+
+mkDerivation {
+  name = "kdav";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcoreaddons kio qtxmlpatterns ];
+  outputs = [ "out" "dev" ];
+}

From 7872516b99ebfb28d3762ce12bf47d029860f4c6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 11:11:21 -0500
Subject: [PATCH 2384/3246] kholidays: init at 17.04.0

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/kholidays.nix | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/kde/kholidays.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5ded354e9e5..57f2ee3887b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -80,6 +80,7 @@ let
       kdf = callPackage ./kdf.nix {};
       kgpg = callPackage ./kgpg.nix {};
       khelpcenter = callPackage ./khelpcenter.nix {};
+      kholidays = callPackage ./kholidays.nix {};
       kidentitymanagement = callPackage ./kidentitymanagement.nix {};
       kig = callPackage ./kig.nix {};
       kimap = callPackage ./kimap.nix {};
diff --git a/pkgs/applications/kde/kholidays.nix b/pkgs/applications/kde/kholidays.nix
new file mode 100644
index 00000000000..352bec09492
--- /dev/null
+++ b/pkgs/applications/kde/kholidays.nix
@@ -0,0 +1,16 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  qtbase, qtdeclarative, qttools,
+}:
+
+mkDerivation {
+  name = "kholidays";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ qtbase qtdeclarative qttools ];
+  outputs = [ "out" "dev" ];
+}

From 87588ff4831e05e178bf4c82fc9d0d874f7941e2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 11:11:49 -0500
Subject: [PATCH 2385/3246] kalarmcal: init at 17.04.0

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/kalarmcal.nix | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/kde/kalarmcal.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 57f2ee3887b..89ca6fe758e 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -65,6 +65,7 @@ let
       grantleetheme = callPackage ./grantleetheme.nix {};
       gwenview = callPackage ./gwenview.nix {};
       k3b = callPackage ./k3b.nix {};
+      kalarmcal = callPackage ./kalarmcal.nix {};
       kate = callPackage ./kate.nix {};
       kcachegrind = callPackage ./kcachegrind.nix {};
       kcalc = callPackage ./kcalc.nix {};
diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix
new file mode 100644
index 00000000000..f2fb6f4d8bb
--- /dev/null
+++ b/pkgs/applications/kde/kalarmcal.nix
@@ -0,0 +1,19 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,
+  kpimtextedit,
+}:
+
+mkDerivation {
+  name = "kalarmcal";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [
+    akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit
+  ];
+  outputs = [ "out" "dev" ];
+}

From 5e860b04610fa1e766929d11807fdd20b6fbe18d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 11:37:46 -0500
Subject: [PATCH 2386/3246] akonadi-calendar: init at 17.04.0

---
 pkgs/applications/kde/akonadi-calendar.nix | 20 ++++++++++++++++++++
 pkgs/applications/kde/default.nix          |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/akonadi-calendar.nix

diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix
new file mode 100644
index 00000000000..ce6b6f75f93
--- /dev/null
+++ b/pkgs/applications/kde/akonadi-calendar.nix
@@ -0,0 +1,20 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts,
+  kidentitymanagement, kio, kmailtransport,
+}:
+
+mkDerivation {
+  name = "akonadi-calendar";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [
+    akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement
+    kio kmailtransport
+  ];
+  outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 89ca6fe758e..342574cd2db 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -52,6 +52,7 @@ let
     in {
       kdelibs = callPackage ./kdelibs { inherit attica phonon; };
       akonadi = callPackage ./akonadi {};
+      akonadi-calendar = callPackage ./akonadi-calendar.nix {};
       akonadi-contacts = callPackage ./akonadi-contacts.nix {};
       akonadi-mime = callPackage ./akonadi-mime.nix {};
       akonadi-notes = callPackage ./akonadi-notes.nix {};

From d47e75a4604d80d42915c689a8a139cbf7280ebf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 11:41:07 -0500
Subject: [PATCH 2387/3246] kdepim-runtime: init at 17.04.0

---
 pkgs/applications/kde/default.nix        |  1 +
 pkgs/applications/kde/kdepim-runtime.nix | 25 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/kde/kdepim-runtime.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 342574cd2db..9f056e3c6cd 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -79,6 +79,7 @@ let
       kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
       kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
       kdenlive = callPackage ./kdenlive.nix {};
+      kdepim-runtime = callPackage ./kdepim-runtime.nix {};
       kdf = callPackage ./kdf.nix {};
       kgpg = callPackage ./kgpg.nix {};
       khelpcenter = callPackage ./khelpcenter.nix {};
diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix
new file mode 100644
index 00000000000..01683a6315c
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-runtime.nix
@@ -0,0 +1,25 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  shared_mime_info,
+  akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
+  kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
+  kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
+  qtwebengine,
+}:
+
+mkDerivation {
+  name = "kdepim-runtime";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
+  buildInputs = [
+    akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
+    kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
+    kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
+  ];
+  # Attempts to build some files before dependencies have been generated
+  enableParallelBuilding = false;
+}

From f3324a806a2e9e68f7cb86bed07471e7bbe4035a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 13:04:13 -0500
Subject: [PATCH 2388/3246] ark: do not callPackage default.nix directly

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

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 9f056e3c6cd..11e4da36638 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -57,7 +57,7 @@ let
       akonadi-mime = callPackage ./akonadi-mime.nix {};
       akonadi-notes = callPackage ./akonadi-notes.nix {};
       akonadi-search = callPackage ./akonadi-search.nix {};
-      ark = callPackage ./ark/default.nix {};
+      ark = callPackage ./ark {};
       baloo-widgets = callPackage ./baloo-widgets.nix {};
       dolphin = callPackage ./dolphin.nix {};
       dolphin-plugins = callPackage ./dolphin-plugins.nix {};

From 4e799eb5bd2ac7ea7bc0477712674b4f6781688a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 13:35:24 -0500
Subject: [PATCH 2389/3246] calendarsupport: init at 17.04.0

---
 pkgs/applications/kde/calendarsupport.nix | 20 ++++++++++++++++++++
 pkgs/applications/kde/default.nix         |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/calendarsupport.nix

diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix
new file mode 100644
index 00000000000..485397ec4aa
--- /dev/null
+++ b/pkgs/applications/kde/calendarsupport.nix
@@ -0,0 +1,20 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs,
+  kholidays, kidentitymanagement, kmime, pimcommon, qttools,
+}:
+
+mkDerivation {
+  name = "calendarsupport";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools
+  ];
+  propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
+  outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 11e4da36638..fd9deedbddf 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -59,6 +59,7 @@ let
       akonadi-search = callPackage ./akonadi-search.nix {};
       ark = callPackage ./ark {};
       baloo-widgets = callPackage ./baloo-widgets.nix {};
+      calendarsupport = callPackage ./calendarsupport.nix {};
       dolphin = callPackage ./dolphin.nix {};
       dolphin-plugins = callPackage ./dolphin-plugins.nix {};
       ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };

From d5468a51fb5afb3c812d8cf8abf950b85d2454ce Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 13:35:34 -0500
Subject: [PATCH 2390/3246] akonadiconsole: init at 17.04.0

---
 pkgs/applications/kde/akonadiconsole.nix | 21 +++++++++++++++++++++
 pkgs/applications/kde/default.nix        |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/kde/akonadiconsole.nix

diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix
new file mode 100644
index 00000000000..844cbc7d17f
--- /dev/null
+++ b/pkgs/applications/kde/akonadiconsole.nix
@@ -0,0 +1,21 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
+  kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit,
+  ktextwidgets, kxmlgui, messagelib, qtbase,
+}:
+
+mkDerivation {
+  name = "akonadiconsole";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
+    kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
+    messagelib qtbase
+  ];
+}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index fd9deedbddf..d98c3cf3e56 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -57,6 +57,7 @@ let
       akonadi-mime = callPackage ./akonadi-mime.nix {};
       akonadi-notes = callPackage ./akonadi-notes.nix {};
       akonadi-search = callPackage ./akonadi-search.nix {};
+      akonadiconsole = callPackage ./akonadiconsole.nix {};
       ark = callPackage ./ark {};
       baloo-widgets = callPackage ./baloo-widgets.nix {};
       calendarsupport = callPackage ./calendarsupport.nix {};

From 71827091742d065d24498f3f5736cf58c31dea4f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 16:20:11 -0500
Subject: [PATCH 2391/3246] grantlee: search profile library paths for plugins

---
 .../grantlee/{5.x.nix => 5/default.nix}       |  8 +++++---
 .../grantlee/5/grantlee-nix-profiles.patch    | 19 +++++++++++++++++++
 pkgs/development/libraries/grantlee/5/series  |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/grantlee/{5.x.nix => 5/default.nix} (81%)
 create mode 100644 pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch
 create mode 100644 pkgs/development/libraries/grantlee/5/series

diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5/default.nix
similarity index 81%
rename from pkgs/development/libraries/grantlee/5.x.nix
rename to pkgs/development/libraries/grantlee/5/default.nix
index fb6af9c895d..7025877c847 100644
--- a/pkgs/development/libraries/grantlee/5.x.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtscript, cmake }:
+{ stdenv, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }:
 
 stdenv.mkDerivation rec {
   name = "grantlee-${version}";
@@ -10,10 +10,12 @@ stdenv.mkDerivation rec {
     name = "${name}.tar.gz";
   };
 
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
   buildInputs = [ qtbase qtscript ];
   nativeBuildInputs = [ cmake ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Qt5 port of Django template system";
     longDescription = ''
       Grantlee is a plugin based String Template system written using the Qt
@@ -25,7 +27,7 @@ stdenv.mkDerivation rec {
       and the design of Django is reused in Grantlee.'';
 
     homepage = http://gitorious.org/grantlee;
-    maintainers = [ ];
+    maintainers = [ maintainers.ttuegel ];
     inherit (qtbase.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch b/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch
new file mode 100644
index 00000000000..f6c13dbd6d5
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch
@@ -0,0 +1,19 @@
+Index: grantlee-5.1.0/templates/lib/engine.cpp
+===================================================================
+--- grantlee-5.1.0.orig/templates/lib/engine.cpp
++++ grantlee-5.1.0/templates/lib/engine.cpp
+@@ -48,6 +48,14 @@ Engine::Engine(QObject *parent)
+ 
+   d_ptr->m_pluginDirs = QCoreApplication::instance()->libraryPaths();
+   d_ptr->m_pluginDirs << QString::fromLocal8Bit(GRANTLEE_PLUGIN_PATH);
++
++  // Add library paths derived from NIX_PROFILES.
++  const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
++  for (const QByteArray &profile: profiles) {
++    if (!profile.isEmpty()) {
++      d_ptr->m_pluginDirs << (QFile::decodeName(profile) + QStringLiteral("/lib"));
++    }
++  }
+ }
+ 
+ Engine::~Engine()
diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series
new file mode 100644
index 00000000000..16f04d44562
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5/series
@@ -0,0 +1 @@
+grantlee-nix-profiles.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a53c411753a..811d5f1745c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9979,7 +9979,7 @@ with pkgs;
 
     qgpgme = callPackage ../development/libraries/gpgme { };
 
-    grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
+    grantlee = callPackage ../development/libraries/grantlee/5 { };
 
     inherit (callPackage ../development/libraries/kirigami { })
       kirigami_1

From 7640cae5b04c88d8b8b97a628a0f10fd7cecffef Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 7 Apr 2017 20:06:26 +0200
Subject: [PATCH 2392/3246] akregator: init at 17.04.0

---
 pkgs/applications/kde/akregator.nix   | 30 +++++++++++++++++++++++++++
 pkgs/applications/kde/default.nix     |  2 ++
 pkgs/applications/kde/syndication.nix | 15 ++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/kde/akregator.nix
 create mode 100644 pkgs/applications/kde/syndication.nix

diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix
new file mode 100644
index 00000000000..98d53bc8083
--- /dev/null
+++ b/pkgs/applications/kde/akregator.nix
@@ -0,0 +1,30 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  qtwebengine,
+  grantlee,
+  kcmutils, kcrash, kiconthemes, knotifyconfig, kparts, ktexteditor,
+  kwindowsystem,
+  akonadi, akonadi-mime, grantleetheme, kontactinterface, libkdepim, libkleo,
+  messagelib, syndication
+}:
+
+mkDerivation {
+  name = "akregator";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    qtwebengine
+
+    grantlee
+
+    kcmutils kcrash kiconthemes knotifyconfig kparts ktexteditor kwindowsystem
+
+    akonadi akonadi-mime grantleetheme kontactinterface libkdepim libkleo
+    messagelib syndication
+  ];
+  outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index d98c3cf3e56..c7e43f5820d 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -58,6 +58,7 @@ let
       akonadi-notes = callPackage ./akonadi-notes.nix {};
       akonadi-search = callPackage ./akonadi-search.nix {};
       akonadiconsole = callPackage ./akonadiconsole.nix {};
+      akregator = callPackage ./akregator.nix {};
       ark = callPackage ./ark {};
       baloo-widgets = callPackage ./baloo-widgets.nix {};
       calendarsupport = callPackage ./calendarsupport.nix {};
@@ -125,6 +126,7 @@ let
       pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
       print-manager = callPackage ./print-manager.nix {};
       spectacle = callPackage ./spectacle.nix {};
+      syndication = callPackage ./syndication.nix {};
 
       l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
     };
diff --git a/pkgs/applications/kde/syndication.nix b/pkgs/applications/kde/syndication.nix
new file mode 100644
index 00000000000..43a4ea005bd
--- /dev/null
+++ b/pkgs/applications/kde/syndication.nix
@@ -0,0 +1,15 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kio
+}:
+
+mkDerivation {
+  name = "syndication";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [ kio ];
+}

From 4b032f12eaf2167694098b2ae312dc508635a889 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 22 May 2017 12:36:13 -0500
Subject: [PATCH 2393/3246] kdepim-apps-libs: init at 17.04.0

---
 pkgs/applications/kde/default.nix             |  1 +
 .../kde/kdepim-apps-libs/default.nix          | 21 +++++++
 ...-apps-libs-grantlee-merge-theme-dirs.patch | 62 +++++++++++++++++++
 pkgs/applications/kde/kdepim-apps-libs/series |  1 +
 4 files changed, 85 insertions(+)
 create mode 100644 pkgs/applications/kde/kdepim-apps-libs/default.nix
 create mode 100644 pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
 create mode 100644 pkgs/applications/kde/kdepim-apps-libs/series

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index c7e43f5820d..8af03708774 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -83,6 +83,7 @@ let
       kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
       kdenlive = callPackage ./kdenlive.nix {};
       kdepim-runtime = callPackage ./kdepim-runtime.nix {};
+      kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
       kdf = callPackage ./kdf.nix {};
       kgpg = callPackage ./kgpg.nix {};
       khelpcenter = callPackage ./khelpcenter.nix {};
diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix
new file mode 100644
index 00000000000..6189e8706db
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix
@@ -0,0 +1,21 @@
+{
+  mkDerivation, copyPathsToStore, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets,
+  kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison,
+}:
+
+mkDerivation {
+  name = "kdepim-apps-libs";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
+    kcontacts ki18n kiconthemes kio libkleo pimcommon prison
+  ];
+  outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
new file mode 100644
index 00000000000..02c369cc4ee
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
@@ -0,0 +1,62 @@
+Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
+===================================================================
+--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
+@@ -50,9 +50,9 @@ public:
+         mTemplateLoader.clear();
+     }
+ 
+-    void changeGrantleePath(const QString &path)
++    void changeGrantleePath(const QStringList &paths)
+     {
+-        mTemplateLoader->setTemplateDirs(QStringList() << path);
++        mTemplateLoader->setTemplateDirs(paths);
+         mEngine->addTemplateLoader(mTemplateLoader);
+ 
+         mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));
+@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee
+ 
+ void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)
+ {
+-    d->changeGrantleePath(path);
++    d->changeGrantleePath(QStringList(path));
+ }
+ 
+ void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
+ {
+-    d->changeGrantleePath(theme.absolutePath());
++    d->changeGrantleePath(theme.absolutePaths());
+ }
+ 
+ inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)
+Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
+===================================================================
+--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
+@@ -74,9 +74,9 @@ public:
+         mTemplateLoader.clear();
+     }
+ 
+-    void changeGrantleePath(const QString &path)
++    void changeGrantleePath(const QStringList &paths)
+     {
+-        mTemplateLoader->setTemplateDirs(QStringList() << path);
++        mTemplateLoader->setTemplateDirs(paths);
+         mEngine->addTemplateLoader(mTemplateLoader);
+ 
+         mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));
+@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta
+ 
+ void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)
+ {
+-    d->changeGrantleePath(path);
++    d->changeGrantleePath(QStringList(path));
+ }
+ 
+ void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
+ {
+-    d->changeGrantleePath(theme.absolutePath());
++    d->changeGrantleePath(theme.absolutePaths());
+ }
+ 
+ void GrantleeContactFormatter::setForceDisableQRCode(bool b)
diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series
new file mode 100644
index 00000000000..1e8a52b55e9
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-apps-libs/series
@@ -0,0 +1 @@
+kdepim-apps-libs-grantlee-merge-theme-dirs.patch

From e6b42d7403cc0802c1264952fb19044eba8475e8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 12 May 2017 11:00:47 -0500
Subject: [PATCH 2394/3246] grantleetheme: merge themes across multiple
 prefixes

---
 pkgs/applications/kde/default.nix             |   2 +-
 .../default.nix}                              |   2 +-
 .../grantlee-merge-theme-dirs.patch           | 166 ++++++++++++++++++
 .../grantleetheme_check_null.patch            |   0
 pkgs/applications/kde/grantleetheme/series    |   2 +
 5 files changed, 170 insertions(+), 2 deletions(-)
 rename pkgs/applications/kde/{grantleetheme.nix => grantleetheme/default.nix} (89%)
 create mode 100644 pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
 rename pkgs/applications/kde/{ => grantleetheme}/grantleetheme_check_null.patch (100%)
 create mode 100644 pkgs/applications/kde/grantleetheme/series

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 8af03708774..a5504a2813f 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -66,7 +66,7 @@ let
       dolphin-plugins = callPackage ./dolphin-plugins.nix {};
       ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
       filelight = callPackage ./filelight.nix {};
-      grantleetheme = callPackage ./grantleetheme.nix {};
+      grantleetheme = callPackage ./grantleetheme {};
       gwenview = callPackage ./gwenview.nix {};
       k3b = callPackage ./k3b.nix {};
       kalarmcal = callPackage ./kalarmcal.nix {};
diff --git a/pkgs/applications/kde/grantleetheme.nix b/pkgs/applications/kde/grantleetheme/default.nix
similarity index 89%
rename from pkgs/applications/kde/grantleetheme.nix
rename to pkgs/applications/kde/grantleetheme/default.nix
index 976ccbe28ce..5035685c64f 100644
--- a/pkgs/applications/kde/grantleetheme.nix
+++ b/pkgs/applications/kde/grantleetheme/default.nix
@@ -11,7 +11,7 @@ mkDerivation {
     maintainers = kdepimTeam;
   };
   output = [ "out" "dev" ];
-  patches = [ ./grantleetheme_check_null.patch ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase
diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
new file mode 100644
index 00000000000..76b65a44475
--- /dev/null
+++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
@@ -0,0 +1,166 @@
+Index: grantleetheme-17.04.0/src/grantleetheme_p.h
+===================================================================
+--- grantleetheme-17.04.0.orig/src/grantleetheme_p.h
++++ grantleetheme-17.04.0/src/grantleetheme_p.h
+@@ -47,7 +47,7 @@ public:
+     QString description;
+     QString name;
+     QString dirName;
+-    QString absolutePath;
++    QStringList absolutePaths;
+     QString author;
+     QString email;
+ 
+Index: grantleetheme-17.04.0/src/grantleetheme.cpp
+===================================================================
+--- grantleetheme-17.04.0.orig/src/grantleetheme.cpp
++++ grantleetheme-17.04.0/src/grantleetheme.cpp
+@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr
+     , description(other.description)
+     , name(other.name)
+     , dirName(other.dirName)
+-    , absolutePath(other.absolutePath)
++    , absolutePaths(other.absolutePaths)
+     , author(other.author)
+     , email(other.email)
+     , loader(other.loader)
+@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine()
+ 
+ void ThemePrivate::setupLoader()
+ {
+-    // Get the parent dir with themes, we set the theme directory separately
+-    QDir dir(absolutePath);
+-    dir.cdUp();
++    QStringList templateDirs;
++    for (const QString& path : absolutePaths) {
++        QDir dir(path);
++        dir.cdUp();
++        templateDirs << dir.absolutePath();
++    }
+ 
+     loader = QSharedPointer<Grantlee::FileSystemTemplateLoader>::create();
+-    loader->setTemplateDirs({ dir.absolutePath() });
++    loader->setTemplateDirs(templateDirs);
+     loader->setTheme(dirName);
+ 
+     if (!sEngine) {
+@@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons
+     Grantlee::Context ctx = createContext();
+     ctx.insert(QStringLiteral("error"), reason);
+     ctx.insert(QStringLiteral("templateName"), origTemplateName);
+-    const QString errorString = failedTemplate
+-            ? failedTemplate->errorString()
+-            : QStringLiteral("(null template)");
++    const QString errorString = failedTemplate->errorString();
+     ctx.insert(QStringLiteral("errorMessage"), errorString);
+     return tpl->render(&ctx);
+ }
+@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c
+     KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
+     if (group.isValid()) {
+         d->dirName = dirName;
+-        d->absolutePath = themePath;
++        d->absolutePaths = QStringList(themePath);
+         d->name = group.readEntry("Name", QString());
+         d->description = group.readEntry("Description", QString());
+         d->themeFileName = group.readEntry("FileName", QString());
+@@ -141,7 +142,7 @@ Theme::~Theme()
+ 
+ bool Theme::operator==(const Theme &other) const
+ {
+-    return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
++    return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
+ }
+ 
+ Theme &Theme::operator=(const Theme &other)
+@@ -185,7 +186,12 @@ QString Theme::dirName() const
+ 
+ QString Theme::absolutePath() const
+ {
+-    return d->absolutePath;
++    return d->absolutePaths.first();
++}
++
++QStringList Theme::absolutePaths() const
++{
++    return d->absolutePaths;
+ }
+ 
+ QString Theme::author() const
+@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem
+     return result;
+ }
+ 
++void Theme::addThemeDir(const QString& path)
++{
++    QDir dir(path);
++    dir.cdUp();
++    d->absolutePaths << dir.absolutePath();
++}
++
+ void Theme::addPluginPath(const QString &path)
+ {
+     if (!ThemePrivate::sEngine) {
+Index: grantleetheme-17.04.0/src/grantleetheme.h
+===================================================================
+--- grantleetheme-17.04.0.orig/src/grantleetheme.h
++++ grantleetheme-17.04.0/src/grantleetheme.h
+@@ -50,11 +50,14 @@ public:
+     QStringList displayExtraVariables() const;
+     QString dirName() const;
+     QString absolutePath() const;
++    QStringList absolutePaths() const;
+     QString author() const;
+     QString authorEmail() const;
+ 
+     QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
+ 
++    void addThemeDir(const QString&);
++
+     static void addPluginPath(const QString &path);
+ 
+ private:
+Index: grantleetheme-17.04.0/src/grantleethememanager.cpp
+===================================================================
+--- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp
++++ grantleetheme-17.04.0/src/grantleethememanager.cpp
+@@ -142,25 +142,18 @@ public:
+ 
+         for (const QString &directory : qAsConst(themesDirectories)) {
+             QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
+-            QStringList alreadyLoadedThemeName;
+             while (dirIt.hasNext()) {
+                 dirIt.next();
+                 const QString dirName = dirIt.fileName();
+                 GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
+                 if (theme.isValid()) {
+                     QString themeName = theme.name();
+-                    if (alreadyLoadedThemeName.contains(themeName)) {
+-                        int i = 2;
+-                        const QString originalName(theme.name());
+-                        while (alreadyLoadedThemeName.contains(themeName)) {
+-                            themeName = originalName + QStringLiteral(" (%1)").arg(i);
+-                            ++i;
+-                        }
+-                        theme.d->name = themeName;
++                    QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName);
++                    if (i != themes.end()) {
++                        i.value().addThemeDir(dirIt.filePath());
++                    } else {
++                        themes.insert(dirName, theme);
+                     }
+-                    alreadyLoadedThemeName << themeName;
+-                    themes.insert(dirName, theme);
+-                    //qDebug()<<" theme.name()"<<theme.name();
+                 }
+             }
+             watch->addDir(directory);
+@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con
+                 GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
+                 if (theme.isValid()) {
+                     if (dirName == themeName) {
+-                        return theme.absolutePath();
++                        return theme.absolutePaths().first();
+                     }
+                 }
+             }
diff --git a/pkgs/applications/kde/grantleetheme_check_null.patch b/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch
similarity index 100%
rename from pkgs/applications/kde/grantleetheme_check_null.patch
rename to pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch
diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series
new file mode 100644
index 00000000000..5c38848de71
--- /dev/null
+++ b/pkgs/applications/kde/grantleetheme/series
@@ -0,0 +1,2 @@
+grantleetheme_check_null.patch
+grantlee-merge-theme-dirs.patch

From 58cf19a98ac96f650f0b8dee28e02a71d6ce6d9b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 12 May 2017 11:01:31 -0500
Subject: [PATCH 2395/3246] grantlee: don't canonicalize template paths

---
 .../5/grantlee-no-canonicalize-filepath.patch | 27 +++++++++++++++++++
 pkgs/development/libraries/grantlee/5/series  |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch

diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch
new file mode 100644
index 00000000000..d78ef74ce35
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch
@@ -0,0 +1,27 @@
+Index: grantlee-5.1.0/templates/lib/templateloader.cpp
+===================================================================
+--- grantlee-5.1.0.orig/templates/lib/templateloader.cpp
++++ grantlee-5.1.0/templates/lib/templateloader.cpp
+@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB
+                      + QLatin1Char('/') + fileName);
+     const QFileInfo fi(file);
+ 
+-    if (file.exists()
+-        && !fi.canonicalFilePath().contains(
+-               QDir(d->m_templateDirs.at(i)).canonicalPath()))
+-      return Template();
+     ++i;
+   }
+ 
+@@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co
+                      + QLatin1Char('/') + fileName);
+ 
+     const QFileInfo fi(file);
+-    if (!fi.canonicalFilePath().contains(
+-            QDir(d->m_templateDirs.at(i)).canonicalPath())) {
+-      ++i;
+-      continue;
+-    }
+ 
+     if (file.exists()) {
+       auto path = fi.absoluteFilePath();
diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series
index 16f04d44562..9c4015a1c19 100644
--- a/pkgs/development/libraries/grantlee/5/series
+++ b/pkgs/development/libraries/grantlee/5/series
@@ -1 +1,2 @@
 grantlee-nix-profiles.patch
+grantlee-no-canonicalize-filepath.patch

From 60f56bac82c3ad11f10dfa20f6cd41012a38794b Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 7 Apr 2017 20:21:08 +0200
Subject: [PATCH 2396/3246] kleopatra: init at 17.04.0

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/kleopatra.nix | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/kde/kleopatra.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index a5504a2813f..947c8afdb73 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -93,6 +93,7 @@ let
       kimap = callPackage ./kimap.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
       kldap = callPackage ./kldap.nix {};
+      kleopatra = callPackage ./kleopatra.nix {};
       kmail = callPackage ./kmail.nix {};
       kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};
       kmailtransport = callPackage ./kmailtransport.nix {};
diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix
new file mode 100644
index 00000000000..a19fef9c9ed
--- /dev/null
+++ b/pkgs/applications/kde/kleopatra.nix
@@ -0,0 +1,19 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime,
+  knotifications, kwindowsystem, kxmlgui, libkleo
+}:
+
+mkDerivation {
+  name = "kleopatra";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime
+    knotifications kwindowsystem kxmlgui libkleo
+  ];
+}

From 7fe86510c1fb8be35ae72dd1e1fb4ed0c37ff483 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 7 Apr 2017 20:54:27 +0200
Subject: [PATCH 2397/3246] kaddressbook: init at 17.04.0

---
 pkgs/applications/kde/default.nix      |  1 +
 pkgs/applications/kde/kaddressbook.nix | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/kde/kaddressbook.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 947c8afdb73..a2b8868c5d6 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -69,6 +69,7 @@ let
       grantleetheme = callPackage ./grantleetheme {};
       gwenview = callPackage ./gwenview.nix {};
       k3b = callPackage ./k3b.nix {};
+      kaddressbook = callPackage ./kaddressbook.nix {};
       kalarmcal = callPackage ./kalarmcal.nix {};
       kate = callPackage ./kate.nix {};
       kcachegrind = callPackage ./kcachegrind.nix {};
diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix
new file mode 100644
index 00000000000..b4b0450e78b
--- /dev/null
+++ b/pkgs/applications/kde/kaddressbook.nix
@@ -0,0 +1,22 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
+  kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts,
+  kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison,
+  qgpgme, qtbase,
+}:
+
+mkDerivation {
+  name = "kaddressbook";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash
+    kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit
+    kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
+  ];
+}

From 129413c4742623df72d449daf9174ff215dafd4c Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sat, 8 Apr 2017 01:18:27 +0200
Subject: [PATCH 2398/3246] kontact: init at 17.04.0

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/kontact.nix | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/kde/kontact.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index a2b8868c5d6..92b3af5834e 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -104,6 +104,7 @@ let
       kolourpaint = callPackage ./kolourpaint.nix {};
       kompare = callPackage ./kompare.nix {};
       konsole = callPackage ./konsole.nix {};
+      kontact = callPackage ./kontact.nix {};
       kontactinterface = callPackage ./kontactinterface.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       krfb = callPackage ./krfb.nix {};
diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
new file mode 100644
index 00000000000..4bbee9c3ffa
--- /dev/null
+++ b/pkgs/applications/kde/kontact.nix
@@ -0,0 +1,23 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  qtwebengine,
+  kcmutils, kcrash, kdbusaddons, kwindowsystem,
+  akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
+  mailcommon,
+}:
+
+mkDerivation {
+  name = "kontact";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    qtwebengine
+    kcmutils kcrash kdbusaddons kwindowsystem
+    akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
+    mailcommon
+  ];
+}

From b7493e13618e739a386f7a2d2f11db3ed8fb0118 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 12 May 2017 12:55:10 -0500
Subject: [PATCH 2399/3246] kdiagram: init at 2.6.0

---
 .../libraries/kdiagram/default.nix            | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/kdiagram/default.nix

diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix
new file mode 100644
index 00000000000..853f02f566a
--- /dev/null
+++ b/pkgs/development/libraries/kdiagram/default.nix
@@ -0,0 +1,21 @@
+{
+  mkDerivation, fetchurl, lib,
+  extra-cmake-modules, qttools,
+  qtbase, qtsvg,
+}:
+
+mkDerivation {
+  name = "kdiagram-2.6.0";
+  src = fetchurl {
+    url = "https://download.kde.org/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz";
+    sha256 = "10hqk12wwgbiq4q5145s8v7v96j621ckq1yil9s4pihmgsnqsy02";
+  };
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  propagatedBuildInputs = [ qtbase qtsvg ];
+  meta = {
+    shortDescription = "Libraries for creating business diagrams";
+    license = lib.licenses.gpl2;
+    platforms = qtbase.meta.platforms;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 811d5f1745c..4b67fbe5107 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9985,6 +9985,8 @@ with pkgs;
       kirigami_1
       kirigami_2;
 
+    kdiagram = callPackage ../development/libraries/kdiagram { };
+
     kirigami = kirigami_1;
 
     libcommuni = callPackage ../development/libraries/libcommuni { };

From 3ca93ebb4ba5f69e6baaa24a804705388590a356 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 12 May 2017 12:55:26 -0500
Subject: [PATCH 2400/3246] kqtquickcharts: init at 17.04.0

---
 pkgs/applications/kde/default.nix        |  1 +
 pkgs/applications/kde/kqtquickcharts.nix | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/applications/kde/kqtquickcharts.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 92b3af5834e..288f9c66a1d 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -107,6 +107,7 @@ let
       kontact = callPackage ./kontact.nix {};
       kontactinterface = callPackage ./kontactinterface.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
+      kqtquickcharts = callPackage ./kqtquickcharts.nix {};
       krfb = callPackage ./krfb.nix {};
       ktnef = callPackage ./ktnef.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix
new file mode 100644
index 00000000000..2b3dc5313d9
--- /dev/null
+++ b/pkgs/applications/kde/kqtquickcharts.nix
@@ -0,0 +1,15 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qtdeclarative,
+}:
+
+mkDerivation {
+  name = "kqtquickcharts";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ qtbase qtdeclarative ];
+}

From 95eee6b49ba94045d4ab3cb6b57ee28d96d94fc0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 12 May 2017 12:55:42 -0500
Subject: [PATCH 2401/3246] eventviews: init at 17.04.0

---
 pkgs/applications/kde/default.nix    |  1 +
 pkgs/applications/kde/eventviews.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/kde/eventviews.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 288f9c66a1d..c0aaaed3e03 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -64,6 +64,7 @@ let
       calendarsupport = callPackage ./calendarsupport.nix {};
       dolphin = callPackage ./dolphin.nix {};
       dolphin-plugins = callPackage ./dolphin-plugins.nix {};
+      eventviews = callPackage ./eventviews.nix {};
       ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
       filelight = callPackage ./filelight.nix {};
       grantleetheme = callPackage ./grantleetheme {};
diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix
new file mode 100644
index 00000000000..cc1e83f6581
--- /dev/null
+++ b/pkgs/applications/kde/eventviews.nix
@@ -0,0 +1,18 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, calendarsupport, kcalutils, kdiagram, libkdepim, qtbase, qttools,
+}:
+
+mkDerivation {
+  name = "eventviews";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi calendarsupport kcalutils kdiagram libkdepim qtbase qttools
+  ];
+  outputs = [ "out" "dev" ];
+}

From c3101965d4681dc7e914559612a17232d0a7f141 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 12 May 2017 13:00:02 -0500
Subject: [PATCH 2402/3246] incidenceeditor: init at 17.04.0

---
 pkgs/applications/kde/default.nix         |  1 +
 pkgs/applications/kde/incidenceeditor.nix | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/incidenceeditor.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index c0aaaed3e03..f8a8ecd1c06 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -69,6 +69,7 @@ let
       filelight = callPackage ./filelight.nix {};
       grantleetheme = callPackage ./grantleetheme {};
       gwenview = callPackage ./gwenview.nix {};
+      incidenceeditor = callPackage ./incidenceeditor.nix {};
       k3b = callPackage ./k3b.nix {};
       kaddressbook = callPackage ./kaddressbook.nix {};
       kalarmcal = callPackage ./kalarmcal.nix {};
diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix
new file mode 100644
index 00000000000..8224b98253b
--- /dev/null
+++ b/pkgs/applications/kde/incidenceeditor.nix
@@ -0,0 +1,20 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
+  kdiagram, kldap, kmime, qtbase,
+}:
+
+mkDerivation {
+  name = "incidenceeditor";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
+    kldap kmime qtbase
+  ];
+  outputs = [ "out" "dev" ];
+}

From 548f52c0a3b7861f2895843bf0c6de9111ec3985 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 12 May 2017 13:38:35 -0500
Subject: [PATCH 2403/3246] korganizer: init at 17.04.0

---
 pkgs/applications/kde/default.nix    |  1 +
 pkgs/applications/kde/korganizer.nix | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/kde/korganizer.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index f8a8ecd1c06..a9e11c7ba24 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -108,6 +108,7 @@ let
       konsole = callPackage ./konsole.nix {};
       kontact = callPackage ./kontact.nix {};
       kontactinterface = callPackage ./kontactinterface.nix {};
+      korganizer = callPackage ./korganizer.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       kqtquickcharts = callPackage ./kqtquickcharts.nix {};
       krfb = callPackage ./krfb.nix {};
diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix
new file mode 100644
index 00000000000..2f37a1bac0f
--- /dev/null
+++ b/pkgs/applications/kde/korganizer.nix
@@ -0,0 +1,29 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  qtbase, qttools,
+  phonon,
+  knewstuff,
+  akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search,
+  calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs,
+  kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface,
+  kpimtextedit, pimcommon,
+}:
+
+mkDerivation {
+  name = "korganizer";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [
+    qtbase qttools
+    phonon
+    knewstuff
+    akonadi-calendar akonadi-contacts akonadi-notes akonadi-search
+    calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs
+    kholidays kidentitymanagement kldap kmailtransport kontactinterface
+    kpimtextedit pimcommon
+  ];
+}

From 5a609e389a28915c949c4c37d304c6ebf52adbb2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 19 May 2017 09:16:26 -0500
Subject: [PATCH 2404/3246] grantlee5: multiple outputs

---
 .../libraries/grantlee/5/default.nix          | 23 ++++++++++++++++---
 .../libraries/grantlee/5/setup-hook.sh        | 23 +++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/grantlee/5/setup-hook.sh

diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 7025877c847..571ad98c38c 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }:
+{ mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "grantlee-${version}";
   version = "5.1.0";
+  grantleeCompatVersion = "5.1";
+  grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}";
 
   src = fetchurl {
     url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
@@ -15,7 +17,22 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase qtscript ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$grantleePluginPrefix" "$bin"
+
+    # CMake checks that the provided libraries and plugins exist
+    # Link libraries into $dev to satisfy CMake
+    mkdir -p $dev/lib
+    find $out/lib -name '*.so.*' -exec ln -s \{\} $dev/lib \;
+
+    # Link plugins into $dev to satisfy CMake
+    ln -s $bin/lib/grantlee $dev/lib
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  meta = with lib; {
     description = "Qt5 port of Django template system";
     longDescription = ''
       Grantlee is a plugin based String Template system written using the Qt
diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh
new file mode 100644
index 00000000000..d11ef5883a1
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh
@@ -0,0 +1,23 @@
+grantleePluginPrefix=@grantleePluginPrefix@
+
+providesGrantleeRuntime() {
+    [ -d "$1/$grantleePluginPrefix" ]
+}
+
+_grantleeCrossEnvHook() {
+    if providesQtRuntime "$1"; then
+        propagatedBuildInputs+=" $1"
+        propagatedUserEnvPkgs+=" $1"
+    fi
+}
+crossEnvHooks+=(_grantleeCrossEnvHook)
+
+_grantleeEnvHook() {
+    if providesGrantleeRuntime "$1"; then
+        propagatedNativeBuildInputs+=" $1"
+        if [ -z "$crossConfig" ]; then
+        propagatedUserEnvPkgs+=" $1"
+        fi
+    fi
+}
+envHooks+=(_grantleeEnvHook)

From 597a1c6a9edd76ef9e32ee3f0122e758d2205756 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 21 May 2017 13:59:37 -0500
Subject: [PATCH 2405/3246] kwallet: remove legacy D-Bus service

---
 pkgs/development/libraries/kde-frameworks/kwallet.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index ece915071ad..66c8301215b 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -16,4 +16,7 @@ mkDerivation {
   ];
   propagatedBuildInputs = [ qtbase ];
   patches = [ ./kwallet-dbus.patch ];
+  postFixup = ''
+    rm "''${!outputBin}/share/dbus-1/services/org.kde.kwalletd.service"
+  '';
 }

From b3ffeab007b4785545f6c96e4e9cb60b83bb384b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 21 May 2017 08:32:51 -0500
Subject: [PATCH 2406/3246] kdeApplications: move mkDerivation

---
 .../kde/build-support/application.nix         | 20 -------------
 pkgs/applications/kde/default.nix             | 29 ++++++++++++++-----
 2 files changed, 21 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/applications/kde/build-support/application.nix

diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix
deleted file mode 100644
index 087f355b4fa..00000000000
--- a/pkgs/applications/kde/build-support/application.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, lib, srcs }:
-
-args:
-
-let
-  inherit (args) name;
-  sname = args.sname or name;
-  inherit (srcs."${sname}") src version;
-in
-mkDerivation (args // {
-  name = "${name}-${version}";
-  inherit src;
-
-  outputs = args.outputs or [ "out" "dev" ];
-
-  meta = {
-    platforms = lib.platforms.linux;
-    homepage = http://www.kde.org;
-  } // (args.meta or {});
-})
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index a9e11c7ba24..24b73f415ad 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -33,21 +33,34 @@ still shows most of the available features is in `./gwenview.nix`.
 let
   mirror = "mirror://kde";
   srcs = import ./srcs.nix { inherit fetchurl mirror; };
-in
 
-let
+  mkDerivation = args:
+    let
+      inherit (args) name;
+      sname = args.sname or name;
+      inherit (srcs."${sname}") src version;
+      mkDerivation =
+        libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+    in
+      mkDerivation (args // {
+        name = "${name}-${version}";
+        inherit src;
+
+        outputs = args.outputs or [ "out" ];
+
+        meta = {
+          platforms = lib.platforms.linux;
+          homepage = "http://www.kde.org";
+        } // (args.meta or {});
+      });
 
   packages = self: with self;
     let
       callPackage = self.newScope {
+        inherit mkDerivation;
+
         # Team of maintainers assigned to the KDE PIM suite
         kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
-
-        mkDerivation = import ./build-support/application.nix {
-          inherit lib;
-          inherit srcs;
-          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
-        };
       };
     in {
       kdelibs = callPackage ./kdelibs { inherit attica phonon; };

From 88d29f80c1ac483c6f62a04de2a9ca7b9ea4f128 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 06:15:04 -0500
Subject: [PATCH 2407/3246] qttools: move qdbusviewer to runtime output

---
 pkgs/development/libraries/qt-5/5.6/qttools/default.nix | 1 +
 pkgs/development/libraries/qt-5/5.9/qttools/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.6/qttools/default.nix b/pkgs/development/libraries/qt-5/5.6/qttools/default.nix
index d72d7b6c64c..57b1b46a9c5 100644
--- a/pkgs/development/libraries/qt-5/5.6/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qttools/default.nix
@@ -6,6 +6,7 @@ qtSubmodule {
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postFixup = ''
     moveToOutput "bin/qdbus" "$out"
+    moveToOutput "bin/qdbusviewer" "$out"
     moveToOutput "bin/qtpaths" "$out"
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix
index 8c231271607..012e8bca75d 100644
--- a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix
@@ -10,6 +10,7 @@ qtSubmodule {
   # qmake moves all binaries to $dev in preFixup
   postFixup = ''
     moveToOutput "bin/qdbus" "$bin"
+    moveToOutput "bin/qdbusviewer" "$bin"
     moveToOutput "bin/qtpaths" "$bin"
   '';
 }

From fa2f19467f76aa6b4c9e943ea49db415499f5ae7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 06:55:36 -0500
Subject: [PATCH 2408/3246] akonadi: use QLatin1String instead of
 QStringLiteral

QStringLiteral stores strings in UTF-16 encoding. Nix cannot decode such paths,
so we must use QLatin1String for strings that may be paths, or the dependency
graph will be broken!
---
 .../kde/akonadi/akonadi-paths.patch           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index f1ae1f23cc9..91fd934b1ec 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -33,7 +33,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
 -    }
  
 -    const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
-+    const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);
++    const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
      if (!mysqladminPath.isEmpty()) {
  #ifndef Q_OS_WIN
          defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
@@ -42,11 +42,11 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
      }
  
 -    mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath);
-+    mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
++    mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
      qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
  
 -    mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath);
-+    mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK);
++    mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
      qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
  
      mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
@@ -55,7 +55,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
 -    mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
-+    mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
++    mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD);
      mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
      settings.endGroup();
  
@@ -84,7 +84,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
  
      // generate config file
 -    const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
-+    const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
++    const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
      const QString localConfig  = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf"));
      const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
      if (globalConfig.isEmpty()) {
@@ -133,7 +133,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
 -
 -        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
 -        defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
-+        defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB);
++        defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
          defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
          defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
      }
@@ -145,7 +145,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
 -    if (mInternalServer && mServerPath.isEmpty()) {
 -        mServerPath = defaultServerPath;
 -    }
-+    mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
++    mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL);
      qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
      mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
      if (mInternalServer && mInitDbPath.isEmpty()) {
@@ -166,7 +166,7 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
          Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
          const QStringList arguments = QStringList() << executable << identifier();
 -        const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher"));
-+        const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher");
++        const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
          mController->start(agentLauncherExec, arguments);
      }
      return true;
@@ -179,13 +179,13 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
      mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld
      connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
 -    mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+    mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++    mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
  
      if (mAgentServerEnabled) {
          mAgentServer = new Akonadi::ProcessControl;
          connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
 -        mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+        mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++        mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
      }
  
  #ifndef QT_NO_DEBUG

From 22b6a93fadb9cb6aebc8bf0aecdfdc8ae60ae155 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 06:57:06 -0500
Subject: [PATCH 2409/3246] akonadi: no need to set MYSQLD_EXECUTABLE

---
 pkgs/applications/kde/akonadi/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index d6ba0abd226..bb7dac1b62a 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -19,9 +19,6 @@ mkDerivation {
   ];
   propagatedBuildInputs = [ boost kitemmodels ];
   outputs = [ "out" "dev" ];
-  cmakeFlags = [
-    "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld"
-  ];
   NIX_CFLAGS_COMPILE = [
     ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"''
     ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"''

From 5ba0dd1ad7aa54b2d695d4c91251c73b7d2551b2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 09:51:38 -0500
Subject: [PATCH 2410/3246] qgpgme: build with -DQT_NO_DEBUG

qgpgme uses Q_ASSERT which causes build inputs to be retained unnecessarily at
runtime unless debugging is disabled.
---
 pkgs/development/libraries/gpgme/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index aae24587302..9773ef8b896 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -32,9 +32,12 @@ stdenv.mkDerivation rec {
     "--enable-fixed-path=${gnupg}/bin"
   ];
 
-  # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
   NIX_CFLAGS_COMPILE =
-    lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
+    # qgpgme uses Q_ASSERT which retains build inputs at runtime unless
+    # debugging is disabled
+    lib.optional (qtbase != null) "-DQT_NO_DEBUG"
+    # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
+    ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
 
   meta = with stdenv.lib; {
     homepage = https://gnupg.org/software/gpgme/index.html;

From 55e6c1b8e1e189d3a3166752e5ecc620133225ae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:18:52 -0500
Subject: [PATCH 2411/3246] kholidays: add to libsForQt5

---
 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 4b67fbe5107..11dabac2ea7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9969,7 +9969,7 @@ with pkgs;
     ### KDE APPLICATIONS
 
     inherit (kdeApplications.override { libsForQt5 = self; })
-      libkdcraw libkexiv2 libkipi libkomparediff2;
+      kholidays libkdcraw libkexiv2 libkipi libkomparediff2;
 
     ### LIBRARIES
 

From b4780249c64548dff25387d527f193a3b4f555bf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 16:20:45 -0500
Subject: [PATCH 2412/3246] grantlee5: don't link plugins into $dev

---
 .../libraries/grantlee/5/default.nix          | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 571ad98c38c..6fae90a8d89 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -12,23 +12,18 @@ mkDerivation rec {
     name = "${name}.tar.gz";
   };
 
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-
   buildInputs = [ qtbase qtscript ];
   nativeBuildInputs = [ cmake ];
 
-  outputs = [ "out" "dev" "bin" ];
-  postInstall = ''
-    moveToOutput "$grantleePluginPrefix" "$bin"
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 
-    # CMake checks that the provided libraries and plugins exist
-    # Link libraries into $dev to satisfy CMake
-    mkdir -p $dev/lib
-    find $out/lib -name '*.so.*' -exec ln -s \{\} $dev/lib \;
-
-    # Link plugins into $dev to satisfy CMake
-    ln -s $bin/lib/grantlee $dev/lib
-  '';
+  outputs = [ "out" "dev" ];
+  postFixup =
+    # Disabuse CMake of the notion that libraries are in $dev
+    ''
+      sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \
+          -e "s|\''${_IMPORT_PREFIX}|$out|"
+    '';
 
   setupHook = ./setup-hook.sh;
 

From d0337b0874e530e87bf34fb1b90366400ae54c1b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 16:25:13 -0500
Subject: [PATCH 2413/3246] libgnome-keyring: separate $dev output

---
 pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix
index c6c9323c010..689ece9ad78 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
   };
 
+  outputs = [ "out" "dev" ];
+
   propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
   nativeBuildInputs = [ pkgconfig intltool ];
 

From 2978918f63c73e2703fbb438dcc88ef2db3fa398 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 16:56:54 -0500
Subject: [PATCH 2414/3246] kdesignerplugin: propagate qttools build input

---
 pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
index 91b596cc4d3..8418863eabb 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
@@ -11,6 +11,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews
-    kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet
+    kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
   ];
+  propagatedBuildInputs = [ qttools ];
 }

From dd3f3de3e3d746522a854a7fd695eeeeb6008a71 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 16:57:41 -0500
Subject: [PATCH 2415/3246] syndication: multiple outputs

---
 pkgs/applications/kde/syndication.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde/syndication.nix b/pkgs/applications/kde/syndication.nix
index 43a4ea005bd..42782d449d5 100644
--- a/pkgs/applications/kde/syndication.nix
+++ b/pkgs/applications/kde/syndication.nix
@@ -12,4 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kio ];
+  outputs = [ "out" "dev" ];
 }

From 91b99ec9296536e1a6090d269564330502996ce2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 18:27:57 -0500
Subject: [PATCH 2416/3246] sddm: no propagatedBuildInputs

---
 pkgs/applications/display-managers/sddm/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index dd9cae32ba4..920e5ba9abd 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -14,7 +14,7 @@ let
   };
 
 in mkDerivation rec {
-  name = "sddm-unwrapped-${version}";
+  name = "sddm-${version}";
 
   src = fetchFromGitHub {
     owner = "sddm";
@@ -36,11 +36,7 @@ in mkDerivation rec {
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
 
   buildInputs = [
-    libxcb libpthreadstubs libXdmcp libXau pam systemd
-  ];
-
-  propagatedBuildInputs = [
-    qtbase qtdeclarative
+    libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd
   ];
 
   cmakeFlags = [

From 7c850a0fd6ada32eb3e24b63222caa32f9de960b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 May 2017 16:22:27 -0500
Subject: [PATCH 2417/3246] libkscreen: fix circular references

---
 pkgs/desktops/plasma-5/default.nix            | 2 ++
 pkgs/desktops/plasma-5/libkscreen/default.nix | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index e386f3a319a..a962d3054f8 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -71,6 +71,8 @@ let
       propagateBin = propagate "bin";
 
       callPackage = self.newScope {
+        inherit propagate propagateBin;
+
         mkDerivation = args:
           let
             inherit (args) name;
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index b81755ed757..5625aa656ce 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore, propagate,
   extra-cmake-modules,
   kwayland, libXrandr, qtx11extras
 }:
@@ -13,4 +13,5 @@ mkDerivation {
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\""
   '';
+  setupHook = propagate "out";
 }

From 6ba0ab1b92c89aa09847e06df27dda0938a3a45c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 27 May 2017 13:13:07 -0500
Subject: [PATCH 2418/3246] Revert "kcmutils: fix kcm plugin path"

This reverts commit cb922bbd5855aba00b96f223dce50c4556472a25.
---
 .../kcmutils/kcmutils-fix-plugin-path.patch         | 13 -------------
 .../libraries/kde-frameworks/kcmutils/series        |  1 -
 2 files changed, 14 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch

diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch
deleted file mode 100644
index e82ce7d592c..00000000000
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
-===================================================================
---- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
-+++ kcmutils-5.33.0/src/kcmoduleloader.cpp
-@@ -93,7 +93,7 @@ KCModule *KCModuleLoader::loadModule(con
-         if (module) {
-             return module;
-         } else {
--            KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
-+            KPluginLoader loader(KPluginLoader::findPlugin(mod.service()->library()));
-             KPluginFactory* factory = loader.factory();
-             if (!factory) {
-                 qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/series b/pkgs/development/libraries/kde-frameworks/kcmutils/series
index 6fbc4ca6563..f2c22554a45 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/series
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/series
@@ -1,3 +1,2 @@
 kcmutils-follow-symlinks.patch
 kcmutils-debug-module-loader.patch
-kcmutils-fix-plugin-path.patch

From 96e2a3bd85b50aa074eb6f36c9e600c3257d59e3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 27 May 2017 16:19:26 -0500
Subject: [PATCH 2419/3246] grantlee5: update meta.homepage

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

diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 6fae90a8d89..13c350f2ecf 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -21,8 +21,9 @@ mkDerivation rec {
   postFixup =
     # Disabuse CMake of the notion that libraries are in $dev
     ''
-      sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \
-          -e "s|\''${_IMPORT_PREFIX}|$out|"
+      for mod in $dev/lib/cmake/Grantlee5/GrantleeTargets-*.cmake; do
+          sed -i $mod -e "s|\''${_IMPORT_PREFIX}|$out|"
+      done
     '';
 
   setupHook = ./setup-hook.sh;

From d143269ea87f757df1b01e4137f202998b5b1eda Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 27 May 2017 16:20:57 -0500
Subject: [PATCH 2420/3246] grantlee5: patch CMake module correctly in release
 or debug build

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

diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 13c350f2ecf..6fae90a8d89 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -21,9 +21,8 @@ mkDerivation rec {
   postFixup =
     # Disabuse CMake of the notion that libraries are in $dev
     ''
-      for mod in $dev/lib/cmake/Grantlee5/GrantleeTargets-*.cmake; do
-          sed -i $mod -e "s|\''${_IMPORT_PREFIX}|$out|"
-      done
+      sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \
+          -e "s|\''${_IMPORT_PREFIX}|$out|"
     '';
 
   setupHook = ./setup-hook.sh;

From ca324e54dd25150eb728b1aad130197281bff9f8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 May 2017 08:34:40 -0500
Subject: [PATCH 2421/3246] kdepim-runtime: patch from upstream to fix IMAP
 resource crash

---
 pkgs/applications/kde/kdepim-runtime.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix
index 01683a6315c..f267c6a8306 100644
--- a/pkgs/applications/kde/kdepim-runtime.nix
+++ b/pkgs/applications/kde/kdepim-runtime.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, kdepimTeam,
+  mkDerivation, lib, kdepimTeam, fetchpatch,
   extra-cmake-modules, kdoctools,
   shared_mime_info,
   akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
@@ -20,6 +20,13 @@ mkDerivation {
     kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
     kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
   ];
+  patches = [
+    # Fix crash in IMAP Akonadi resource
+    (fetchpatch {
+      url = "https://cgit.kde.org/kdepim-runtime.git/patch/?id=611510d0a005bc93102aa4b9f1a5b5f9905c4179";
+      sha256 = "1zidfqwzj5waq01iqzgq1imr8aq7a2h5aysygi4ynakwgr4ypxcj";
+    })
+  ];
   # Attempts to build some files before dependencies have been generated
   enableParallelBuilding = false;
 }

From 5f3732f81567613e5f3853dee7f0bc9badd2efc6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 21 Jun 2017 19:30:55 -0500
Subject: [PATCH 2422/3246] Revert "kdepim-runtime: patch from upstream to fix
 IMAP resource crash"

This reverts commit a6d746fbd12a6633e775e2cb52793f4baa8bab36.
---
 pkgs/applications/kde/kdepim-runtime.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix
index f267c6a8306..01683a6315c 100644
--- a/pkgs/applications/kde/kdepim-runtime.nix
+++ b/pkgs/applications/kde/kdepim-runtime.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, kdepimTeam, fetchpatch,
+  mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   shared_mime_info,
   akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
@@ -20,13 +20,6 @@ mkDerivation {
     kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
     kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
   ];
-  patches = [
-    # Fix crash in IMAP Akonadi resource
-    (fetchpatch {
-      url = "https://cgit.kde.org/kdepim-runtime.git/patch/?id=611510d0a005bc93102aa4b9f1a5b5f9905c4179";
-      sha256 = "1zidfqwzj5waq01iqzgq1imr8aq7a2h5aysygi4ynakwgr4ypxcj";
-    })
-  ];
   # Attempts to build some files before dependencies have been generated
   enableParallelBuilding = false;
 }

From 4fd2820dcd020525c5968e67b8820bc35f735dd8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 22 Jun 2017 08:29:48 -0500
Subject: [PATCH 2423/3246] k3b: fixup inputs

---
 pkgs/applications/kde/k3b.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index cfe7327ac72..c70c3ea877b 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -15,7 +15,7 @@ mkDerivation {
     maintainers = with maintainers; [ sander phreedom ];
     platforms = platforms.linux;
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper shared_mime_info ];
   propagatedBuildInputs = [
     # qt
     qtwebkit

From 46ecfa19085d74cad42b9c0a2a22733cbe497323 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 22 Jun 2017 08:30:31 -0500
Subject: [PATCH 2424/3246] okteta: fixup inputs

---
 pkgs/applications/kde/okteta.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 1d44bb27fa3..b985d7170d9 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,9 +1,7 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  qtscript, kconfig, kinit, karchive,
-  kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
-  shared_mime_info
+  extra-cmake-modules, kdoctools, shared_mime_info,
+  kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, qtscript
 }:
 
 mkDerivation {
@@ -12,10 +10,8 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ peterhoeg ];
   };
-  nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
-  buildInputs = [ shared_mime_info ];
-  propagatedBuildInputs = [
-    kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
-    karchive
+  nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
+  buildInputs = [
+    kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 qtscript
   ];
 }

From 933f384fc72008ea60b4772be1f2a5cd0e01da1e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 7 Jul 2017 15:23:03 -0500
Subject: [PATCH 2425/3246] ark: use plain unzip

Use plain unzip instead of unzipNLS, which is unnecessary and also broken.
---
 pkgs/applications/kde/ark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index df15f6b0f18..013e2e63f59 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -7,7 +7,7 @@
   khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive,
 
   # Archive tools
-  p7zip, unzipNLS, zip,
+  p7zip, unzip, zip,
 
   # Unfree tools
   unfreeEnableUnrar ? false, unrar,
@@ -25,7 +25,7 @@ mkDerivation {
     let
       PATH =
         lib.makeBinPath
-        ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
+        ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar);
     in ''
       wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
     '';

From 37c340728eb0be40ff1b78b4f855a6625ff58475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 21 Aug 2017 14:41:48 +0200
Subject: [PATCH 2426/3246] servant-auth: tests pass for a while now

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8ab751166c5..69be69fd918 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -727,9 +727,8 @@ self: super: {
       '';
     });
 
-
-  # https://github.com/plow-technologies/servant-auth/issues/20
-  servant-auth = dontCheck super.servant-auth;
+  # Glob == 0.7.x
+  servant-auth = doJailbreak super.servant-auth;
 
   # https://github.com/pontarius/pontarius-xmpp/issues/105
   pontarius-xmpp = dontCheck super.pontarius-xmpp;

From 056a389d3b8523d5234b570c43080ce45f7de7a4 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 21 Aug 2017 11:50:29 -0400
Subject: [PATCH 2427/3246] ios cross cc-wrapper: Fail assertion to avoid
 breaking tarball job

Previously, this wasn't being evaluated by CI.
---
 pkgs/os-specific/darwin/ios-cross/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
index f56c8148317..175e9738ef9 100644
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ b/pkgs/os-specific/darwin/ios-cross/default.nix
@@ -18,6 +18,11 @@
  * x86_64-apple-darwin14  | x86_64 | true
  */
 
+# Apple uses somewhat non-standard names for this. We could fall back on
+# `targetPlatform.parsed.cpu.name`, but that would be a more standard one and
+# likely to fail. Better just to require something manual.
+assert targetPlatform ? arch;
+
 let
 
   prefix = targetPlatform.config;

From 775a7944c56f5348d7b8ecbff6f1938a4098341d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 18 Aug 2017 16:07:02 +0200
Subject: [PATCH 2428/3246] kanboard: 1.0.44 -> 1.0.46

Fixes CVE-2017-12850 & CVE-2017-12851.
---
 pkgs/applications/misc/kanboard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index 9c86b96f4c0..b37d12c362f 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "kanboard-${version}";
-  version = "1.0.44";
+  version = "1.0.46";
 
   src = fetchzip {
     url = "https://kanboard.net/${name}.zip";
-    sha256 = "1cwk9gcwddwbbw6hz2iqmkmy90rwddy79b9vi6fj9cl03zswypgn";
+    sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a";
   };
 
   dontBuild = true;

From cfb716e6a5c5dd512b15e9dbbdd3b53b77b46ae7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 21 Aug 2017 19:24:17 +0200
Subject: [PATCH 2429/3246] phpfpm service: remove NoNewPrivileges systemd
 option

This interferes with sendmail because suid won't work. Fixes #26611.
---
 nixos/modules/services/web-servers/phpfpm/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index 26f54602203..f9febbfbacd 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -150,7 +150,6 @@ in {
           PrivateDevices = true;
           ProtectSystem = "full";
           ProtectHome = true;
-          NoNewPrivileges = true;
           RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
           Type = "notify";
           ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";

From 9459dd27ec4c1249d38e62388b02f4c19a659a24 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 16 Aug 2017 15:30:44 +0200
Subject: [PATCH 2430/3246] liquibase: clean up installed documentation

Fixes #28281.
---
 pkgs/development/tools/database/liquibase/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 22b83a7569e..11932965af4 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -35,6 +35,15 @@ stdenv.mkDerivation rec {
       mkdir -p $out/{bin,lib,sdk}
       mv ./* $out/
 
+      # Clean up documentation.
+      mkdir -p $out/share/doc/${name}
+      mv $out/LICENSE.txt \
+         $out/README.txt \
+         $out/share/doc/${name}
+
+      # Remove silly files.
+      rm $out/liquibase.bat $out/liquibase.spec
+
       # we provide our own script
       rm $out/liquibase
 

From 4d192a3522576c1685abc78b0f0479afab1be9ce Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 16 Aug 2017 15:22:27 +0200
Subject: [PATCH 2431/3246] cassandra: clean up installed documentation

Fixes #28281.
---
 pkgs/servers/nosql/cassandra/generic.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 7541f76b40e..848d181867e 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -26,6 +26,21 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir $out
     mv * $out
+
+    # Clean up documentation.
+    mkdir -p $out/share/doc/${name}
+    mv $out/CHANGES.txt \
+       $out/LICENSE.txt \
+       $out/NEWS.txt \
+       $out/NOTICE.txt \
+       $out/javadoc \
+       $out/share/doc/${name}
+
+    if [[ -d $out/doc ]]; then
+      mv "$out/doc/"* $out/share/doc/${name}
+      rmdir $out/doc
+    fi
+
     for cmd in bin/cassandra bin/nodetool bin/sstablekeys \
       bin/sstableloader bin/sstableupgrade \
       tools/bin/cassandra-stress tools/bin/cassandra-stressd \

From 12e0e9d31c8a759fc2f01b3b15b70e7f2303b764 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 19 Aug 2017 23:32:48 +0200
Subject: [PATCH 2432/3246] nginx: remove deprecated ipv6 compile flag

The build process for both mainline and stable print a warning that
"--with-ipv6" is deprecated
---
 pkgs/servers/http/nginx/generic.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index dfde2045272..a9d84ac144d 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -39,7 +39,6 @@ stdenv.mkDerivation {
     "--with-http_secure_link_module"
     "--with-http_degradation_module"
     "--with-http_stub_status_module"
-    "--with-ipv6"
     # Install destination problems
     # "--with-http_perl_module"
   ] ++ optional withStream "--with-stream"

From e309c318c607b318d354e0837635a2bf450a7fe7 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 19 Aug 2017 23:34:19 +0200
Subject: [PATCH 2433/3246] nginx: enable additional compile flags

These flags can increase performance.

They are also enabled by default on Debian and Archlinux
---
 pkgs/servers/http/nginx/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index a9d84ac144d..47221609590 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
     "--with-http_secure_link_module"
     "--with-http_degradation_module"
     "--with-http_stub_status_module"
+    "--with-threads"
+    "--with-pcre-jit"
     # Install destination problems
     # "--with-http_perl_module"
   ] ++ optional withStream "--with-stream"

From 1d8412d17aff5ef773a9ab3d1bb58929ec8e2531 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 19 Aug 2017 23:35:24 +0200
Subject: [PATCH 2434/3246] nginx: add additional features when streams are
 enabled

This allows nginx to work as a TCP load balancer including
TLS and geo IP routing support
---
 pkgs/servers/http/nginx/generic.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 47221609590..41623c600f6 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -43,7 +43,12 @@ stdenv.mkDerivation {
     "--with-pcre-jit"
     # Install destination problems
     # "--with-http_perl_module"
-  ] ++ optional withStream "--with-stream"
+  ] ++ optional withStream [
+    "--with-stream"
+    "--with-stream_geoip_module"
+    "--with-stream_realip_module"
+    "--with-stream_ssl_module"
+    "--with-stream_ssl_preread_module"
     ++ 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 ec779fb2c30bfc9a9a80765d246a23f239eee49f Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 19 Aug 2017 23:38:17 +0200
Subject: [PATCH 2435/3246] nginx: enable stream support by default

TCP proxying should be a default feature of nginx
---
 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 0f467efc26a..c79bbc989bc 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
 , gd, geoip
-, withStream ? false
+, withStream ? true
 , withMail ? false
 , modules ? []
 , hardening ? true

From 6de00c1cb2377437228e726bfe7f7018f283f45a Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 19 Aug 2017 23:36:37 +0200
Subject: [PATCH 2436/3246] nginx: add possibility to compile reverse proxy
 with mail support

---
 pkgs/servers/http/nginx/generic.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 41623c600f6..0f467efc26a 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
 , gd, geoip
 , withStream ? false
+, withMail ? false
 , modules ? []
 , hardening ? true
 , version, sha256, ...
@@ -49,6 +50,10 @@ stdenv.mkDerivation {
     "--with-stream_realip_module"
     "--with-stream_ssl_module"
     "--with-stream_ssl_preread_module"
+  ] ++ optional withMail [
+    "--with-mail"
+    "--with-mail_ssl_module"
+  ]
     ++ 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 e20afe8d2e11ebb58458b94c14201b5787cf8c9b Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 18 Aug 2017 19:27:38 +0200
Subject: [PATCH 2437/3246] kde-frameworks: 5.36 -> 5.37

---
 pkgs/desktops/plasma-5/milou.nix              |   2 +-
 pkgs/desktops/plasma-5/plasma-pa.nix          |   4 +-
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/krunner.nix      |   4 +-
 .../kde-frameworks/kwallet-dbus.patch         |   9 -
 .../libraries/kde-frameworks/kwallet.nix      |   4 -
 .../libraries/kde-frameworks/srcs.nix         | 600 +++++++++---------
 7 files changed, 310 insertions(+), 315 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch

diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index fa4ad3fcd29..db019db358b 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework,
-  qtscript, qtdeclarative,
+  qtscript, qtdeclarative
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index 50f53d70a98..0bfad2b5c8e 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules, kdoctools,
   gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,
-  libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative
+  libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem
 }:
 
 mkDerivation {
@@ -10,6 +10,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n
-    libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative
+    libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 37aaeb29e7a..a0fe6a17e8d 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.36/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.37/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index 9782320a487..826999f2f9b 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib,
   extra-cmake-modules,
   kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase,
-  qtdeclarative, solid, threadweaver
+  qtdeclarative, solid, threadweaver, kwindowsystem
 }:
 
 mkDerivation {
@@ -13,5 +13,5 @@ mkDerivation {
     kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
     threadweaver
   ];
-  propagatedBuildInputs = [ plasma-framework qtbase ];
+  propagatedBuildInputs = [ plasma-framework qtbase kwindowsystem ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch
deleted file mode 100644
index 00f3d8baedf..00000000000
--- a/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/runtime/kwalletd/org.kde.kwalletd5.service.in b/src/runtime/kwalletd/org.kde.kwalletd5.service.in
-index 76eb90e..7a78e83 100644
---- a/src/runtime/kwalletd/org.kde.kwalletd5.service.in
-+++ b/src/runtime/kwalletd/org.kde.kwalletd5.service.in
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.kde.kwalletd5
--Exec=@CMAKE_INSTALL_PREFIX@/bin/kwalletd5
-+Exec=@CMAKE_INSTALL_BINDIR@/kwalletd5
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index 66c8301215b..fca0dedd083 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -15,8 +15,4 @@ mkDerivation {
     knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme
   ];
   propagatedBuildInputs = [ qtbase ];
-  patches = [ ./kwallet-dbus.patch ];
-  postFixup = ''
-    rm "''${!outputBin}/share/dbus-1/services/org.kde.kwalletd.service"
-  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index ee6ece8fe27..090478ad04d 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,595 +3,603 @@
 
 {
   attica = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/attica-5.36.0.tar.xz";
-      sha256 = "12i5ky68aaxfxb0x6ixcjjqcdw87b435yf06qiz74pwvbj7rklld";
-      name = "attica-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/attica-5.37.0.tar.xz";
+      sha256 = "13jqk4w9crh8pca6n9334l1gb8bmwf86pa36k0mfh5j19dq72g2p";
+      name = "attica-5.37.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/baloo-5.36.0.tar.xz";
-      sha256 = "1zrikrzg4v8mh3w1wln6dqx4jazjqkx0k3482gxf71g7gi9xj8gi";
-      name = "baloo-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/baloo-5.37.0.tar.xz";
+      sha256 = "19sl07lhjrri40vfi8wl6azgmg08lgfb98xx110j6spjbbbnww79";
+      name = "baloo-5.37.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/bluez-qt-5.36.0.tar.xz";
-      sha256 = "1r3g5f2ll4flav9vjrxzh35y0w38h5fkg89h3s88pldshvgg208w";
-      name = "bluez-qt-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/bluez-qt-5.37.0.tar.xz";
+      sha256 = "1x6nj7vsn0sp9rckzkcbl6fwm7qzj5w98w2qys1fndb1spl7av8s";
+      name = "bluez-qt-5.37.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/breeze-icons-5.36.0.tar.xz";
-      sha256 = "19b6jpy3zaawll53fg4cm50p93128bw483y1bjn82ghs7yqmp7f3";
-      name = "breeze-icons-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/breeze-icons-5.37.0.tar.xz";
+      sha256 = "17nr2phd0nxyx49igvl170ksikapgc4365z26pw0dmmw41llcbxw";
+      name = "breeze-icons-5.37.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/extra-cmake-modules-5.36.0.tar.xz";
-      sha256 = "1bsxdlk08zn98isbycm982xz67d40c63qsgghfambvqi0js0n4kf";
-      name = "extra-cmake-modules-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/extra-cmake-modules-5.37.0.tar.xz";
+      sha256 = "1jr7nmhh4kyz1g454qkldfhimfjvvylqa19zna5iak08bkq8q696";
+      name = "extra-cmake-modules-5.37.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/frameworkintegration-5.36.0.tar.xz";
-      sha256 = "1qa325fsdqk30v310qmira6j9cr5ij4bbj7yxyp4m1jzbp16sprl";
-      name = "frameworkintegration-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/frameworkintegration-5.37.0.tar.xz";
+      sha256 = "0pcy3hjqbahbx65yxz5bl0h2ah4y3fb7mq3pj1rrp2cpp92s135a";
+      name = "frameworkintegration-5.37.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kactivities-5.36.0.tar.xz";
-      sha256 = "0h13jl5f35g24flwx19sxpknc7f5mx25nnwy0xdrhkbd6dknkss7";
-      name = "kactivities-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kactivities-5.37.0.tar.xz";
+      sha256 = "005xvzp10kvwcsl2w6ghcqgqnr2rdvv9w61i4y44y25vcb85g26v";
+      name = "kactivities-5.37.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kactivities-stats-5.36.0.tar.xz";
-      sha256 = "1hgpvga64244kh70ad0iwfl60bqpdly78db57hdh3b4as3mc7z8h";
-      name = "kactivities-stats-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kactivities-stats-5.37.0.tar.xz";
+      sha256 = "09zsdzf77palmww7x3dzinl0hxrm4z0q0yc2fmf0d7z6cfl695y2";
+      name = "kactivities-stats-5.37.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kapidox-5.36.0.tar.xz";
-      sha256 = "181zgybsavvn2pdg9acyg7d2wspy8myf79qxbc8mb9zp5vnhb9br";
-      name = "kapidox-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kapidox-5.37.0.tar.xz";
+      sha256 = "1xwkaamifxjghv158rwslndfd9z70rm9ixnp1mmkgw8radwsqg5v";
+      name = "kapidox-5.37.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/karchive-5.36.0.tar.xz";
-      sha256 = "0l93ws6c09hm2qrhbc2r71qjgf27mv36ahnisygamfwh754n4700";
-      name = "karchive-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/karchive-5.37.0.tar.xz";
+      sha256 = "1599lql0kcx705313bfvbazr7rayr6vsiwrpiq6iwljzc7lli1im";
+      name = "karchive-5.37.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kauth-5.36.0.tar.xz";
-      sha256 = "0a3xcl1wqb2ggw5lcll4i95jpi68zvmyyd7jb57qk1ags49l3yfk";
-      name = "kauth-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kauth-5.37.0.tar.xz";
+      sha256 = "0ciz28bvbvxlv0iz0cgs31x2m1czkki21ypzqj8rg2ix8jw2p65w";
+      name = "kauth-5.37.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kbookmarks-5.36.0.tar.xz";
-      sha256 = "1176bily8w0q9l2k070rcgvki5mcjz8kh9nlvrgnch17bzqrwcsr";
-      name = "kbookmarks-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kbookmarks-5.37.0.tar.xz";
+      sha256 = "0l6rkj0b7hk2wg6dypj1dkl8pcd1vx89gaiixbhkd3vf7jp46n41";
+      name = "kbookmarks-5.37.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kcmutils-5.36.0.tar.xz";
-      sha256 = "0rifncrndad2fr4b2imrshlhmzapw7zq05z52dyp0i5fdmznc8fz";
-      name = "kcmutils-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kcmutils-5.37.0.tar.xz";
+      sha256 = "1ik1505f16swsmvrv62dacis33f1ccnmkw3zbhb84vbrbqyskvzx";
+      name = "kcmutils-5.37.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kcodecs-5.36.0.tar.xz";
-      sha256 = "0v5yv988ixdwbz0bbybia3f9y64k17ic935dr84kaqndz643xzvc";
-      name = "kcodecs-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kcodecs-5.37.0.tar.xz";
+      sha256 = "0kmk97b5vbnyb3xjxwmg3l47aka8mkf50g4p7wvr096qwplffbva";
+      name = "kcodecs-5.37.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kcompletion-5.36.0.tar.xz";
-      sha256 = "1wi0fcrzxk27a1r0arrylxqyx4jpz1scj8pwf6whnpl56vmh6w9p";
-      name = "kcompletion-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kcompletion-5.37.0.tar.xz";
+      sha256 = "0qhjkqmd1jjy50hlzsdxwgnjwpfdrz3njl5n88h3nzp83yjv1ljz";
+      name = "kcompletion-5.37.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kconfig-5.36.0.tar.xz";
-      sha256 = "0m6n6dw4sgc1mr84dlg3lsbm080jqwrqd0mil15c33gsjn2kl7mk";
-      name = "kconfig-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kconfig-5.37.0.tar.xz";
+      sha256 = "1f0y2gmwy05b17clr7vg1zp18l1z0fd757v02ha7cwd64yznyr5d";
+      name = "kconfig-5.37.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kconfigwidgets-5.36.0.tar.xz";
-      sha256 = "0siw3rhl8pjm6hnxis22rfdji28svp8q27991wsdmm7d5m284hx5";
-      name = "kconfigwidgets-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kconfigwidgets-5.37.0.tar.xz";
+      sha256 = "001d1nj8q6xpl71rwm15rnvy5ajyxpvknvf4ic7p5pbik3021bs6";
+      name = "kconfigwidgets-5.37.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kcoreaddons-5.36.0.tar.xz";
-      sha256 = "152mkf75bvn95viz3cz54cmssp1j89wp591sycvnqcni4azjcjwx";
-      name = "kcoreaddons-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kcoreaddons-5.37.0.tar.xz";
+      sha256 = "0a45sz11d7b2d8sbr9z57mv337nbhd94fiqk3issw470n0y46g3y";
+      name = "kcoreaddons-5.37.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kcrash-5.36.0.tar.xz";
-      sha256 = "0f6sbs91qykh0c4fs1lvdz89jn8rhnfg0v6dd3pkqm5q2fcdv3id";
-      name = "kcrash-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kcrash-5.37.0.tar.xz";
+      sha256 = "16k2pwf3s3adgayd9vq7kk8c5gnq9g6wra4psrvs3a3c5k5am5y0";
+      name = "kcrash-5.37.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kdbusaddons-5.36.0.tar.xz";
-      sha256 = "012fbzdpzamc2nvbfhzv2270p4jsxiwa552mmmj16yxnrjrwycw4";
-      name = "kdbusaddons-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kdbusaddons-5.37.0.tar.xz";
+      sha256 = "0745arkp4wnpwyhjq02h7lfac049cmlg5qwhf96i7ss0w54vch4i";
+      name = "kdbusaddons-5.37.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kdeclarative-5.36.0.tar.xz";
-      sha256 = "0ljx1841490sl1qsi8304whczxgj4q4irm8z720bkjqh0c8i5pid";
-      name = "kdeclarative-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kdeclarative-5.37.0.tar.xz";
+      sha256 = "1ish46m2dpnpqjnf8g660clcg7ky65w11cbk2m79pwyhqvhxgggj";
+      name = "kdeclarative-5.37.0.tar.xz";
     };
   };
   kded = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kded-5.36.0.tar.xz";
-      sha256 = "0y44rgrxh47bj4ljpxs6gdib4fhzyz6pvi5l2hnacwr2l1vnfcs4";
-      name = "kded-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kded-5.37.0.tar.xz";
+      sha256 = "162s5qx2qb0bi889f8jjvd3ci31azd8iwp25i04vwi0lzglwb8gy";
+      name = "kded-5.37.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/portingAids/kdelibs4support-5.36.0.tar.xz";
-      sha256 = "041ygn0yd5r91j9ppv63xwj21c4ny56qlmkv2hmpanl05y94bpnq";
-      name = "kdelibs4support-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/portingAids/kdelibs4support-5.37.0.tar.xz";
+      sha256 = "1zz100m1sqfmg3ni7023b99qn79jhdd2ryw6534axl5zgn0sglh9";
+      name = "kdelibs4support-5.37.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kdesignerplugin-5.36.0.tar.xz";
-      sha256 = "1ksa8f6ivjlmm6rlm20vmrlqw58rf1k4ry3mk60b073fni2779hv";
-      name = "kdesignerplugin-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kdesignerplugin-5.37.0.tar.xz";
+      sha256 = "1197003bqcdpsyn6faasr2nhaadh7ryg92vjpqim78af3vwinsdw";
+      name = "kdesignerplugin-5.37.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kdesu-5.36.0.tar.xz";
-      sha256 = "01lg36m19qsa8ipwyx85jr38jh9ddcl6cvs4z3jmhg2nl467pwwa";
-      name = "kdesu-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kdesu-5.37.0.tar.xz";
+      sha256 = "1qfhkzk6l9rfdyiad8y6k30zlhziz3q2dxvxkmnghxmkg98yhdza";
+      name = "kdesu-5.37.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kdewebkit-5.36.0.tar.xz";
-      sha256 = "1x53gzn1qyyvlx36qfjl6297v4862qqr8cmld32qaqxsgqc11b9s";
-      name = "kdewebkit-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kdewebkit-5.37.0.tar.xz";
+      sha256 = "1ph3a50wix42hmsbc9jbfxla172aihjx9yzp9rza09j1a7va3hg1";
+      name = "kdewebkit-5.37.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kdnssd-5.36.0.tar.xz";
-      sha256 = "07lfwbw546qsx2rss0ajblaqi9db2dz07s0vki1w9q17nf4lnl2p";
-      name = "kdnssd-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kdnssd-5.37.0.tar.xz";
+      sha256 = "03rd6znn2qwndn4m3bb03slwyic06ry535rawgyh06lfps0fcc5z";
+      name = "kdnssd-5.37.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kdoctools-5.36.0.tar.xz";
-      sha256 = "0sgvxp90141y11lz2vm8y78ymny8krq493w4xxaj9blzgfyr0yrj";
-      name = "kdoctools-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kdoctools-5.37.0.tar.xz";
+      sha256 = "0gbc5qqim6262hvkl9pf6rynnblxb3hsw3c4ars03ip7n761y0zl";
+      name = "kdoctools-5.37.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kemoticons-5.36.0.tar.xz";
-      sha256 = "0bwag8x27dfshhd42340zr591l4nxhj58qlzdz64q4h3rhvibk5f";
-      name = "kemoticons-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kemoticons-5.37.0.tar.xz";
+      sha256 = "1cx978s1dm3v1jh4aymncxs44iizdqp174dqg9m5mf043fcvvinq";
+      name = "kemoticons-5.37.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kfilemetadata-5.36.0.tar.xz";
-      sha256 = "17967dl9r2fipagdb3xknfv8p3cqi2mhxmpw1ghmw9mdid01y33m";
-      name = "kfilemetadata-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kfilemetadata-5.37.0.tar.xz";
+      sha256 = "17mbm6pdi6ac61kj2qzxf7y3rbxhxg9rwqr7qy766gh3img2vq8p";
+      name = "kfilemetadata-5.37.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kglobalaccel-5.36.0.tar.xz";
-      sha256 = "1nkm2w38n8f5wq446g9kng8xy7vd4y0acfbsnlc9zshzmbf655bj";
-      name = "kglobalaccel-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kglobalaccel-5.37.0.tar.xz";
+      sha256 = "1d84q3r6q5n2lclym9a9m1brfqnq3p3dykfpzvhcba3bjxh3cdsb";
+      name = "kglobalaccel-5.37.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kguiaddons-5.36.0.tar.xz";
-      sha256 = "1xliia9zfg9kcgi78pkrlvb1nqj3h1cms7pccrnqgfgszm3j2y4c";
-      name = "kguiaddons-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kguiaddons-5.37.0.tar.xz";
+      sha256 = "13g6nlw8fk135i6z3f8ichy8whxd6v4rycg80dlvm25h66rg6vn5";
+      name = "kguiaddons-5.37.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/portingAids/khtml-5.36.0.tar.xz";
-      sha256 = "15akih9pn3yzx4vskvq5vqrgq64vxfprvbfh00ir7bgl8rzrrngs";
-      name = "khtml-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/portingAids/khtml-5.37.0.tar.xz";
+      sha256 = "1n0mx2xy9n5ffhvh58z3kn61aa7dhppsrwgxk697pybqy1h45ah2";
+      name = "khtml-5.37.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/ki18n-5.36.0.tar.xz";
-      sha256 = "12sm340y2qvxlw7cac9mwq5ps4px4z607a9lx4q0ckaggix8gjf0";
-      name = "ki18n-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/ki18n-5.37.0.tar.xz";
+      sha256 = "1c1sy4pbhlwsajs2972brdmma5val72gkil6k0a0f58nfvvg952d";
+      name = "ki18n-5.37.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kiconthemes-5.36.0.tar.xz";
-      sha256 = "0a9dkn20siymgwy1fsnf98qbg14v0rfyrf96vrz1378vkyh37j2l";
-      name = "kiconthemes-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kiconthemes-5.37.0.tar.xz";
+      sha256 = "1j7mgfsvxa24nf1d9xyn2jv9y9j523vghsvsm73x8d3ijibchfxq";
+      name = "kiconthemes-5.37.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kidletime-5.36.0.tar.xz";
-      sha256 = "1dhszas2fai5pv0lhk26w93ankp1x56nq8zlqdqs77z6fihmnc9l";
-      name = "kidletime-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kidletime-5.37.0.tar.xz";
+      sha256 = "01m4q3l2yq83f2dpbv6jry7cjkj6bqdgfpy5b8byaf1gf9w2firs";
+      name = "kidletime-5.37.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kimageformats-5.36.0.tar.xz";
-      sha256 = "1j106d9m2z3dgz7ibff4cfzndann1yaf57c449s5l7gsdg229p89";
-      name = "kimageformats-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kimageformats-5.37.0.tar.xz";
+      sha256 = "1knha6wjzjs0vnkljwpfinzg3hg2jyh9c07ifqvd47cprl96ickg";
+      name = "kimageformats-5.37.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kinit-5.36.0.tar.xz";
-      sha256 = "0499wjpjpba3kgprs2pvvrply1mbnvm7pppncv4jh7ynhqkjvm94";
-      name = "kinit-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kinit-5.37.0.tar.xz";
+      sha256 = "0b7dyy4hqyf6wk7gg2l23ldnji2zl8vzyj5wd5qh4yi7rdl6js5r";
+      name = "kinit-5.37.0.tar.xz";
     };
   };
   kio = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kio-5.36.0.tar.xz";
-      sha256 = "1j23nxmsdivia5hrfdq42p4bdz5r0r739rr1px9dwmjiv3am33zi";
-      name = "kio-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kio-5.37.0.tar.xz";
+      sha256 = "0nxchbhs8p2d4243dyp7qa65g1p6r3ic2h6dz7w0aa0qzsy8wi29";
+      name = "kio-5.37.0.tar.xz";
+    };
+  };
+  kirigami2 = {
+    version = "5.37.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.37/kirigami2-5.37.0.tar.xz";
+      sha256 = "1z42rsi8nzshrbv8m8vxkay4dq46kggglhgxbbgg2q00y8gjq9dd";
+      name = "kirigami2-5.37.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kitemmodels-5.36.0.tar.xz";
-      sha256 = "08vbjardjnj7bz8ah089gpljc05h67q15g2xa7h5swkvh0pvq19a";
-      name = "kitemmodels-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kitemmodels-5.37.0.tar.xz";
+      sha256 = "1nlpzzp4m0ghfz1p2hrwn4lbhjhxc8b8q8kbzqbh9hmwmimbzzrr";
+      name = "kitemmodels-5.37.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kitemviews-5.36.0.tar.xz";
-      sha256 = "01iayb6r8w4cnq3qpcs6c8cxmnjzp7mznk7s9d0djijplrcdgskl";
-      name = "kitemviews-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kitemviews-5.37.0.tar.xz";
+      sha256 = "17r7vnlyiiifhrz4gb4fifshn1jb4c67lhadczi8d301rzk7wwsm";
+      name = "kitemviews-5.37.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kjobwidgets-5.36.0.tar.xz";
-      sha256 = "1m4wsvpw4k7x7v32hxkk7dvs9gsnnwwzvgk81d86kvzdipkrbbcp";
-      name = "kjobwidgets-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kjobwidgets-5.37.0.tar.xz";
+      sha256 = "1162dxhpspd7p1735npp0amrxr5b0j467f5651k2rv6mvqfmqr4b";
+      name = "kjobwidgets-5.37.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/portingAids/kjs-5.36.0.tar.xz";
-      sha256 = "06pzx7jajhk3yd01hxkia4lh85mdc9a5m2jd0bl1sk1q42hrm4n6";
-      name = "kjs-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/portingAids/kjs-5.37.0.tar.xz";
+      sha256 = "046hy8ji4i6p2xp5gnqa8dk82sv6sbh4xg67y79i82bbi97dvq9b";
+      name = "kjs-5.37.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/portingAids/kjsembed-5.36.0.tar.xz";
-      sha256 = "1045jfxky4hnld24lg3qy7j4v0aa0n9fgwa13fm7sz923ylh3gs9";
-      name = "kjsembed-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/portingAids/kjsembed-5.37.0.tar.xz";
+      sha256 = "0w2wk5azf1b45db58qj0cdc1l056x9s1xcd09ibavx5xmdvq6br0";
+      name = "kjsembed-5.37.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/portingAids/kmediaplayer-5.36.0.tar.xz";
-      sha256 = "1pqg8ycsasn3sxh1r1wmrrz9431whylr77z8bvikj9x0w28fwnkm";
-      name = "kmediaplayer-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/portingAids/kmediaplayer-5.37.0.tar.xz";
+      sha256 = "0fqxrkcwwzg11zsax9q169lisnfp9jsqg4ccd6xvv8kpkz3g04jp";
+      name = "kmediaplayer-5.37.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/knewstuff-5.36.0.tar.xz";
-      sha256 = "0pfshizab7xkj71hjm69kqd63wvsmn4fpyhz7r1s9hsj136cjyzi";
-      name = "knewstuff-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/knewstuff-5.37.0.tar.xz";
+      sha256 = "1scnxhxx4g8j4wml6x8i5v00rpaxyzzcm7vqbra2axbql5d8g8ny";
+      name = "knewstuff-5.37.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/knotifications-5.36.0.tar.xz";
-      sha256 = "1hlyllhfdd4pgj7q9k76wsf58h6m9vls1iz6ah20qivbkkwls074";
-      name = "knotifications-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/knotifications-5.37.0.tar.xz";
+      sha256 = "0gvv6jal7n4m3y30ragjlyhghq3y2782d422im9klxqzlgdgvkb6";
+      name = "knotifications-5.37.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/knotifyconfig-5.36.0.tar.xz";
-      sha256 = "04cqyhbz6vfcwgd82jniwcc23sw7hzhrcfh5a3nlbx4yl0bifb3w";
-      name = "knotifyconfig-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/knotifyconfig-5.37.0.tar.xz";
+      sha256 = "14kjckynszv8015p17j578l3knmkmw25d8r8ks4wavgj3db9bik5";
+      name = "knotifyconfig-5.37.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kpackage-5.36.0.tar.xz";
-      sha256 = "0bwa588wj0nwvbnblzfqx0qz1cc7a43p4dk1pc95rvzf00h8i1q8";
-      name = "kpackage-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kpackage-5.37.0.tar.xz";
+      sha256 = "1ikf55q2pk8vm70pqm7rmakja309zjh9z1lg0xqslq1pqd6xki7s";
+      name = "kpackage-5.37.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kparts-5.36.0.tar.xz";
-      sha256 = "0ph5g1chbzlwb1x4iwvdcq56ya8pp7j0n56r9h2n2g0ybg4mmrzk";
-      name = "kparts-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kparts-5.37.0.tar.xz";
+      sha256 = "0jrd8idkz8nhkda2rwgf8rysqngiv4r5ajmrzp2kfz1pr91a6l5h";
+      name = "kparts-5.37.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kpeople-5.36.0.tar.xz";
-      sha256 = "0wifh4xp43h5q0iyb281pa50p6ww3ymnayq206675l07c84h021a";
-      name = "kpeople-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kpeople-5.37.0.tar.xz";
+      sha256 = "1qgp4wqp985ac1m9wakpsvk3c2driwkwrjkc3aic7dyr1p456qsf";
+      name = "kpeople-5.37.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kplotting-5.36.0.tar.xz";
-      sha256 = "0gabk9x7mqql2cdafigcrp5ciyd8839arrrnxjq9gb02087v1rx7";
-      name = "kplotting-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kplotting-5.37.0.tar.xz";
+      sha256 = "0k4s0qvhjm9h1bmg16l32g4bsdrp2jrcila4dgzvrb56447px0zw";
+      name = "kplotting-5.37.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kpty-5.36.0.tar.xz";
-      sha256 = "1z5adph6i7wpwk1rlbrmmwczmfp41h8lj1ifzpnp082wj5a5khk4";
-      name = "kpty-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kpty-5.37.0.tar.xz";
+      sha256 = "0wb873r1ycgi11s0qx3lhvz54703yz5sax6fb6wdmri5c05gzd5a";
+      name = "kpty-5.37.0.tar.xz";
     };
   };
   kross = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/portingAids/kross-5.36.0.tar.xz";
-      sha256 = "0yhjzzkpwd406h265fczvlrnwddn2b24mw21gy6x8kcjmdl0ssjq";
-      name = "kross-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/portingAids/kross-5.37.0.tar.xz";
+      sha256 = "06pk6f6v82pd7x9rsmkhkp5r9sgcbrc503lqckl8d7argbb7j4k1";
+      name = "kross-5.37.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/krunner-5.36.0.tar.xz";
-      sha256 = "0r91wd8dc9798j2ghiyxa2b46xvk9ns2rzk3yjaavmnq5xxf2mhq";
-      name = "krunner-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/krunner-5.37.0.tar.xz";
+      sha256 = "171qbhr1yszl2gcffm47p5wiwj71w9yhvk6srhvfpiwfyh61a4ld";
+      name = "krunner-5.37.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kservice-5.36.0.tar.xz";
-      sha256 = "19hhvbs0f7494xhmk7nx72lmff1hpnhin0y1my1xbw03l3f0l4wh";
-      name = "kservice-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kservice-5.37.0.tar.xz";
+      sha256 = "1zxs5yzd3rmy33vsip4c4igk9g38kzaggw8c29sxmgr8vgdrnvhr";
+      name = "kservice-5.37.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/ktexteditor-5.36.0.tar.xz";
-      sha256 = "02c6l6sl9ps1aly46p23wzfpgfc112fhjvhq53smw5qqzyd1187r";
-      name = "ktexteditor-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/ktexteditor-5.37.0.tar.xz";
+      sha256 = "0y04s1nwkf0np6iymjxf0jssin28qw2901kpb3iw8gd52ni5rrks";
+      name = "ktexteditor-5.37.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/ktextwidgets-5.36.0.tar.xz";
-      sha256 = "0b8w0gym1mmbsy1xic6nc76yqa5rwk8nmcjln2z5ri7cg20nxywa";
-      name = "ktextwidgets-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/ktextwidgets-5.37.0.tar.xz";
+      sha256 = "1p8ns75sbnapm6ds16hx36q9vlnz9phgy28rx0gm1ckxqvm4yzr5";
+      name = "ktextwidgets-5.37.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kunitconversion-5.36.0.tar.xz";
-      sha256 = "1xa2n3h13i6lrlxmhvvvgpmcdmr01gskim8wcy5gf0nl23v8bcmh";
-      name = "kunitconversion-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kunitconversion-5.37.0.tar.xz";
+      sha256 = "1qvq61sbv9naj5ndi5xjwx7ami0xa6bqiajr912kbbbp2257cjsi";
+      name = "kunitconversion-5.37.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kwallet-5.36.0.tar.xz";
-      sha256 = "1fyaki8j43i4q0spmgqbzhgv17ziib9g3pcf9jl6gnkmipmwm0l7";
-      name = "kwallet-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kwallet-5.37.0.tar.xz";
+      sha256 = "1l7jl3y0rzx2whnbp6w5p6kg71vwyccp2nwxxgcxr6541m0nihsz";
+      name = "kwallet-5.37.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kwayland-5.36.0.tar.xz";
-      sha256 = "0h9k8m9vb1y1w5gvhgs2fj1iqg64fc9zl4rqnssqgz6fyp3p7i52";
-      name = "kwayland-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kwayland-5.37.0.tar.xz";
+      sha256 = "0d4c8l8k38pgj73kzlf1hsq52w31wy9wgpwph1bv0cq5yn2rjiyr";
+      name = "kwayland-5.37.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kwidgetsaddons-5.36.0.tar.xz";
-      sha256 = "02x232rfagd7xv5m9jwyr5h0cr6g8ibr27s86240xpbb9z9656mw";
-      name = "kwidgetsaddons-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kwidgetsaddons-5.37.0.tar.xz";
+      sha256 = "1jmk377r1h4is2il7chh6bq8wbj21psf4b1yiw84iivg38vlpid4";
+      name = "kwidgetsaddons-5.37.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kwindowsystem-5.36.0.tar.xz";
-      sha256 = "0whih8hhlrqsfadqmh6msw8xv7pmmlk6v4zahlhalkfpdvir26ca";
-      name = "kwindowsystem-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kwindowsystem-5.37.0.tar.xz";
+      sha256 = "0pd2n0j5pdv1x7wf4mwcpimnah73g6l0xidhqbpg37p829jix2k2";
+      name = "kwindowsystem-5.37.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kxmlgui-5.36.0.tar.xz";
-      sha256 = "0c8fvawbcz4v2dcnb77vk7c49l9bd7v8jgg8r8763lwksdckyyz7";
-      name = "kxmlgui-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kxmlgui-5.37.0.tar.xz";
+      sha256 = "0jrvjlxkg9knj61b2gj2w6l96jlmww9kn4ij808ir35365x3cdg2";
+      name = "kxmlgui-5.37.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/kxmlrpcclient-5.36.0.tar.xz";
-      sha256 = "14x7xi2h1208wzj5jnxawz7frjvvkqargiv0v44p699s157bb0d1";
-      name = "kxmlrpcclient-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/kxmlrpcclient-5.37.0.tar.xz";
+      sha256 = "1jn9v86dpfx43qcdcsp6lpnga9q6aa5vxjkkg4wg0wbxmw4w9gvq";
+      name = "kxmlrpcclient-5.37.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/modemmanager-qt-5.36.0.tar.xz";
-      sha256 = "0l9g374xwfhfjdniyrjyy8f3xkzdiiqzzpzwx2929h6jml0nr00f";
-      name = "modemmanager-qt-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/modemmanager-qt-5.37.0.tar.xz";
+      sha256 = "1fqf43kvj1v1mcdlbfxbh6sh3ycvg35aml2ywh2a684iz4qzq1aq";
+      name = "modemmanager-qt-5.37.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/networkmanager-qt-5.36.0.tar.xz";
-      sha256 = "1mii9qai7vkwj7x6g3yiqiqk5kzc7im27fg2dhzwgq95dgm4aa2x";
-      name = "networkmanager-qt-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/networkmanager-qt-5.37.0.tar.xz";
+      sha256 = "01px9n97gyvyyfg3dp1k7dik9fprgx9i28hg8wjr2rb5dlr99jd1";
+      name = "networkmanager-qt-5.37.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/oxygen-icons5-5.36.0.tar.xz";
-      sha256 = "042ry8g1v71ifb4yhdi3k6x64sbc0lfyzinyjz78l2zf154l3d9g";
-      name = "oxygen-icons5-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/oxygen-icons5-5.37.0.tar.xz";
+      sha256 = "1rns7n93f83qp5q11a7r5y87y0hvc0q95ar57cqy0fxsqrg4614h";
+      name = "oxygen-icons5-5.37.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/plasma-framework-5.36.0.tar.xz";
-      sha256 = "05wzhnn78f5fi8wwpdrcvjfdv3p14868wlk714shmc5q3svfaq3h";
-      name = "plasma-framework-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/plasma-framework-5.37.0.tar.xz";
+      sha256 = "0kamvxfzrbx3msn0cp3k20clqchz9jg5wlazz3h6p6zmrk5v16bh";
+      name = "plasma-framework-5.37.0.tar.xz";
     };
   };
   prison = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/prison-5.36.0.tar.xz";
-      sha256 = "0f52gmmvga0rd7d7m357dgbwxlwk7sq5mxakhjhwdgjgj1vjx0z3";
-      name = "prison-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/prison-5.37.0.tar.xz";
+      sha256 = "1icsirwfh7zscm8x9g2gp7aqzhs81ahhjflwjcwpz9bh0r9f1wb7";
+      name = "prison-5.37.0.tar.xz";
     };
   };
   solid = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/solid-5.36.0.tar.xz";
-      sha256 = "1b7g0gph6x353amnjskv40a037r7likanx9m52gdsc0z3dg3s3di";
-      name = "solid-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/solid-5.37.0.tar.xz";
+      sha256 = "1gb9gnp1a11q5abl97b7sq1if2rqcrcs0f33sakpxf1z9y0ppg8l";
+      name = "solid-5.37.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/sonnet-5.36.0.tar.xz";
-      sha256 = "1vb6jccfh5pxjb3r43qrqig3h0z8cr0pw27sb116igssc4j0gkxc";
-      name = "sonnet-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/sonnet-5.37.0.tar.xz";
+      sha256 = "0sb6i464riadgb2q73nj0vy6xavr2m1sszrvghr20nj7i64f3kk0";
+      name = "sonnet-5.37.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/syntax-highlighting-5.36.0.tar.xz";
-      sha256 = "1igxjkx8sphxaf4y07d78lnn2nad6q7siarsflh1f79srm2qhnlj";
-      name = "syntax-highlighting-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/syntax-highlighting-5.37.0.tar.xz";
+      sha256 = "1l56pb84z7sy0qq8xkd5w5v5418bm9n4qds0vd39ch655d47bl72";
+      name = "syntax-highlighting-5.37.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.36.0";
+    version = "5.37.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.36/threadweaver-5.36.0.tar.xz";
-      sha256 = "19z97ddba9pkv4j5p2iyr02khqmlgizky306irhhlwdw3y0m4pm1";
-      name = "threadweaver-5.36.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.37/threadweaver-5.37.0.tar.xz";
+      sha256 = "1hb3721r1zbbyj211886sfkcxk18k0rsdhcg9ssagx10f29rpxx4";
+      name = "threadweaver-5.37.0.tar.xz";
     };
   };
 }

From df3e7beedec0d33712c08d78277ea7dab0ef9a18 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 18 Aug 2017 19:28:05 +0200
Subject: [PATCH 2438/3246] kde-applications: 17.04.3 -> 17.08.0

---
 pkgs/applications/kde/fetch.sh                |    2 +-
 pkgs/applications/kde/khelpcenter.nix         |    1 +
 .../kde/khelpcenter_kcoreaddons.patch         |   13 +
 pkgs/applications/kde/okteta.nix              |   14 +-
 pkgs/applications/kde/srcs.nix                | 2328 ++++++++---------
 5 files changed, 1188 insertions(+), 1170 deletions(-)
 create mode 100644 pkgs/applications/kde/khelpcenter_kcoreaddons.patch

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 929771ed5fa..c1b2c79c849 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.04.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.08.0/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index 69b629bbeb9..eae151e1225 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -12,4 +12,5 @@ mkDerivation {
     grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml
     ki18n kinit kservice xapian
   ];
+  patches = [ ./khelpcenter_kcoreaddons.patch ];
 }
diff --git a/pkgs/applications/kde/khelpcenter_kcoreaddons.patch b/pkgs/applications/kde/khelpcenter_kcoreaddons.patch
new file mode 100644
index 00000000000..c5380cb48e5
--- /dev/null
+++ b/pkgs/applications/kde/khelpcenter_kcoreaddons.patch
@@ -0,0 +1,13 @@
+diff --git a/searchhandlers/CMakeLists.txt b/searchhandlers/CMakeLists.txt
+index 298a32e..b9e06c6 100644
+--- a/searchhandlers/CMakeLists.txt
++++ b/searchhandlers/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(khc_xapianindexer_SOURCES
+ add_executable(khc_xapianindexer ${khc_xapianindexer_SOURCES})
+ kde_target_enable_exceptions(khc_xapianindexer PRIVATE)
+ ecm_mark_nongui_executable(khc_xapianindexer)
+-target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES})
++target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive KF5::CoreAddons ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES})
+ if (${KF5_VERSION} VERSION_GREATER 5.35.0)
+     # practically means >=5.36
+     target_link_libraries(khc_xapianindexer KF5::DocTools)
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index b985d7170d9..422968be35a 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,7 +1,9 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, shared_mime_info,
-  kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, qtscript
+  extra-cmake-modules, kdoctools,
+  qtscript, kconfig, kinit, karchive, kcrash,
+  kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
+  shared_mime_info
 }:
 
 mkDerivation {
@@ -10,8 +12,10 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ peterhoeg ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
-  buildInputs = [
-    kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 qtscript
+  nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
+  buildInputs = [ shared_mime_info ];
+  propagatedBuildInputs = [
+    kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
+    karchive kcrash
   ];
 }
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index ec3628abef2..ad7a73588b0 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
 
 {
   akonadi = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akonadi-17.04.3.tar.xz";
-      sha256 = "0cddlz5v25ak9x1f682rjm3vlaqfm9n9y1bfd3h3md59j9l4gq49";
-      name = "akonadi-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/akonadi-17.08.0.tar.xz";
+      sha256 = "00mj3gvlv1cgb7dxzjym87404laxsk7insykbb12zj4wlhzakznp";
+      name = "akonadi-17.08.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akonadi-calendar-17.04.3.tar.xz";
-      sha256 = "0543wixfwy80sx0lsy8jwlbyr3cxl3jyf04n644zyrkl461lv637";
-      name = "akonadi-calendar-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/akonadi-calendar-17.08.0.tar.xz";
+      sha256 = "0mv41pkn24rdbg5xyz7vxaihma02qry3sladgpffg27yw56xp5x4";
+      name = "akonadi-calendar-17.08.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akonadi-calendar-tools-17.04.3.tar.xz";
-      sha256 = "1yzfv80lyair5nkyql17ijnbcp9iyidhwrff6if9kn87sv5i9b4v";
-      name = "akonadi-calendar-tools-17.04.3.tar.xz";
-    };
-  };
-  akonadiconsole = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akonadiconsole-17.04.3.tar.xz";
-      sha256 = "1v449q0d1ld84jjy0bshnf99ss5qq9mg2vp9c2wl2i8f640k7f0v";
-      name = "akonadiconsole-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/akonadi-calendar-tools-17.08.0.tar.xz";
+      sha256 = "1vzmdgbn6hjjv74837s18kfif7s2gak5jbag2l1kqdj9lgwi4lv0";
+      name = "akonadi-calendar-tools-17.08.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akonadi-contacts-17.04.3.tar.xz";
-      sha256 = "03sffvybravzmg8qjqylgvfrn7ajvahkm7qnr8k44b9i9cy676ak";
-      name = "akonadi-contacts-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/akonadi-contacts-17.08.0.tar.xz";
+      sha256 = "0j49zf83bfzrxygdg98cijjjva96niv24312ng7f8hckm369zc91";
+      name = "akonadi-contacts-17.08.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akonadi-import-wizard-17.04.3.tar.xz";
-      sha256 = "0gb2vzvznmyc3qvrzaka5q43qp982izm4yf7i340yi780qaixz18";
-      name = "akonadi-import-wizard-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/akonadi-import-wizard-17.08.0.tar.xz";
+      sha256 = "0hhi8l94fariz6q2zazxsqnm08scfqsc3sm8azklj24gbz59qzzf";
+      name = "akonadi-import-wizard-17.08.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akonadi-mime-17.04.3.tar.xz";
-      sha256 = "050kn3shqnzk22bx2h83b6qymn3npscnjqd2vrrwvbwh1b2ww2si";
-      name = "akonadi-mime-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/akonadi-mime-17.08.0.tar.xz";
+      sha256 = "0lg0rqikgdbdvh44p52m7acw6ni5wi1rsgx93wn1nki4rhnsgndp";
+      name = "akonadi-mime-17.08.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akonadi-notes-17.04.3.tar.xz";
-      sha256 = "1l8rhfvl8fh04igldggcq1fz1f6s595c89hzzza75qqbcs2azfps";
-      name = "akonadi-notes-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/akonadi-notes-17.08.0.tar.xz";
+      sha256 = "1d17403bhbh7nk73vcq86dilfancb31fdz2al6pr7xrkxm5nql0v";
+      name = "akonadi-notes-17.08.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akonadi-search-17.04.3.tar.xz";
-      sha256 = "0b4magnl3lrlnfsnsw46vkbhkp1bbxf2fgjfm84vndmwyglj1605";
-      name = "akonadi-search-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/akonadi-search-17.08.0.tar.xz";
+      sha256 = "1i6v4mvm2g0v4kzbs6rla9gf16lswg4xghsam9k1cpqpakkaqf84";
+      name = "akonadi-search-17.08.0.tar.xz";
+    };
+  };
+  akonadiconsole = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/akonadiconsole-17.08.0.tar.xz";
+      sha256 = "0a0gvw6xn4wcl5hzxnv4170n1yq0ycmfs6nyff4x8fcj0ffl6rqv";
+      name = "akonadiconsole-17.08.0.tar.xz";
     };
   };
   akregator = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/akregator-17.04.3.tar.xz";
-      sha256 = "12wajdwn3pp2prl9b2wlx1326b9w75j04yhg6q3082nrhlgmcnm2";
-      name = "akregator-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/akregator-17.08.0.tar.xz";
+      sha256 = "16ss44md7vnz6nclhza7ygvfaqr8dpd2lq1cz4szm0qwwiciwxkc";
+      name = "akregator-17.08.0.tar.xz";
     };
   };
   analitza = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/analitza-17.04.3.tar.xz";
-      sha256 = "0scz8qi25gk1p8n6134wbcrknvxihyjkwvs6x22606nnrghlfc1b";
-      name = "analitza-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/analitza-17.08.0.tar.xz";
+      sha256 = "1qmh4xc912bw5m07pnqdp6pmjiba6mirlwhgbl6wqvzi97cjrsxq";
+      name = "analitza-17.08.0.tar.xz";
     };
   };
   ark = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ark-17.04.3.tar.xz";
-      sha256 = "1b9kadiz91d86q3hrailzd56pbaxzh7jmvy317nfiqrflw541sin";
-      name = "ark-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ark-17.08.0.tar.xz";
+      sha256 = "1d3p4y1bchnqza2xxmd7z3ys66373mgvdr8xa5z2n2pq55qnvrx1";
+      name = "ark-17.08.0.tar.xz";
     };
   };
   artikulate = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/artikulate-17.04.3.tar.xz";
-      sha256 = "0axc54cqyhmb28rzxlflmms4cfv2539wwb4lmgm99z8kgg7634g6";
-      name = "artikulate-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/artikulate-17.08.0.tar.xz";
+      sha256 = "0gybg5aw8gbrmfg46985p2xmdz624vjc6rkkh2f2dvrijx9z82sf";
+      name = "artikulate-17.08.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/audiocd-kio-17.04.3.tar.xz";
-      sha256 = "1q1zlp2p94044p0gb6vwzybvj3g2c1lwnyj4x2kim6wkj2x9pqrf";
-      name = "audiocd-kio-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/audiocd-kio-17.08.0.tar.xz";
+      sha256 = "05h1rp7f3jqx9jzn3x48sdd0ycb0ksflyy8ncy9bb72ky3j3f986";
+      name = "audiocd-kio-17.08.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/baloo-widgets-17.04.3.tar.xz";
-      sha256 = "1awhqv8gqjkdcblsq9sn6wd2f2693niyk59x0vhf3ml87sqmhki4";
-      name = "baloo-widgets-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/baloo-widgets-17.08.0.tar.xz";
+      sha256 = "0z5lpmca6w691ckyhhr99ky0fjli7sk8riarhrr65hk6zyf3djmx";
+      name = "baloo-widgets-17.08.0.tar.xz";
     };
   };
   blinken = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/blinken-17.04.3.tar.xz";
-      sha256 = "13m0854d4bahhcpfq7v04ydhvxs79x9h0rhhvp9zapzq8kvhc6s0";
-      name = "blinken-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/blinken-17.08.0.tar.xz";
+      sha256 = "0p2yx91sggn908i24lqjkd5lw5djidwdfybf6dvdz916bv2ypf90";
+      name = "blinken-17.08.0.tar.xz";
     };
   };
   blogilo = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/blogilo-17.04.3.tar.xz";
-      sha256 = "1ziipi55hwmkmf7pr9j64qhc0px3v4pzd3b4b2gqz4fjg2sggp12";
-      name = "blogilo-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/blogilo-17.08.0.tar.xz";
+      sha256 = "1dabq57krzjkrs5xpgarisik66n0cvk097y9szxbmw1ghmw871cf";
+      name = "blogilo-17.08.0.tar.xz";
     };
   };
   bomber = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/bomber-17.04.3.tar.xz";
-      sha256 = "13z4zs9mvcwlidxx17nx6qzbdcc7r15adh5awxnjxnqv0akmqj7p";
-      name = "bomber-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/bomber-17.08.0.tar.xz";
+      sha256 = "0ydg1is0ayscj275177ivkzqdhc1mkqwbjfq5wdwiqdmh4p2dgzh";
+      name = "bomber-17.08.0.tar.xz";
     };
   };
   bovo = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/bovo-17.04.3.tar.xz";
-      sha256 = "0a27n64krkj6nmkzyi5vww6nsc2bzjlfzh8k32r8fjix500263i1";
-      name = "bovo-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/bovo-17.08.0.tar.xz";
+      sha256 = "1fl7cq27y3n0nzabh7xxwdipczww7pcck8nk2vrxzpnnwyzc4hjn";
+      name = "bovo-17.08.0.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/calendarsupport-17.04.3.tar.xz";
-      sha256 = "1xv8n8hc5kp0cvbj7fpd065sb329ps3sazfmrf4h4gkh1zj5i8wi";
-      name = "calendarsupport-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/calendarsupport-17.08.0.tar.xz";
+      sha256 = "01fw1ddd6xhv84557214ilj088cdczv26whl6q4wm7c4wyicrrxs";
+      name = "calendarsupport-17.08.0.tar.xz";
     };
   };
   cantor = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/cantor-17.04.3.tar.xz";
-      sha256 = "0lcvhc2pyhyzlj9px6cni99l0zddyv32gk32s3wg7pz71msaw91w";
-      name = "cantor-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/cantor-17.08.0.tar.xz";
+      sha256 = "0mv7qx5zam6mcri3j3jqci70bxxzrf3f7vdpmsmwcm2w0isv02x0";
+      name = "cantor-17.08.0.tar.xz";
     };
   };
   cervisia = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/cervisia-17.04.3.tar.xz";
-      sha256 = "1hrik6r87sx2d99fnn89k48mf76xnrq4wgh2zg03hmf327ydviq2";
-      name = "cervisia-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/cervisia-17.08.0.tar.xz";
+      sha256 = "0pz6qqq5nayw68z30gf0bxjm8lz0hn2cswvdyc0b505p2gkq1ika";
+      name = "cervisia-17.08.0.tar.xz";
     };
   };
   dolphin = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/dolphin-17.04.3.tar.xz";
-      sha256 = "1q8pj2wh186l76cg5ir3l9f6xma1kjgbrk9kfd9br400dx2pz62a";
-      name = "dolphin-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/dolphin-17.08.0.tar.xz";
+      sha256 = "1fxga83magv47jpmrbcyyxblxyws0n6mp8vjv8pa5jzwywsxg09r";
+      name = "dolphin-17.08.0.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/dolphin-plugins-17.04.3.tar.xz";
-      sha256 = "1is11ja2lzqxnsmj6kkr1q9l9csjy4ymv869yrgsbid0xjc2krj3";
-      name = "dolphin-plugins-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/dolphin-plugins-17.08.0.tar.xz";
+      sha256 = "1vb0flj4151d1h4x7rgfn79hcqk1pal9hxdi5wmkzjy3aj702gcc";
+      name = "dolphin-plugins-17.08.0.tar.xz";
     };
   };
   dragon = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/dragon-17.04.3.tar.xz";
-      sha256 = "1raki9yp51s73ca6fv093pbhwjfw3hbiazbhfwf6f3dqag24w11w";
-      name = "dragon-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/dragon-17.08.0.tar.xz";
+      sha256 = "0h9ysyjpcj8hlsbp622dzpzjvilad1qrjflhmx71gaan2dyq0jd0";
+      name = "dragon-17.08.0.tar.xz";
     };
   };
   eventviews = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/eventviews-17.04.3.tar.xz";
-      sha256 = "18j8xikfxn2mpx61d4ynahai9s6gwi0x5xsfvnyrc2v43a69w7ks";
-      name = "eventviews-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/eventviews-17.08.0.tar.xz";
+      sha256 = "166jsnyv3xwhli931xwh18cy6alkj7w2lc3bqzkch0bc4gd2w8ba";
+      name = "eventviews-17.08.0.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ffmpegthumbs-17.04.3.tar.xz";
-      sha256 = "1f8xrga8v045g5drcls87m9w5d00887sglk274gi1jmf60sy55jk";
-      name = "ffmpegthumbs-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ffmpegthumbs-17.08.0.tar.xz";
+      sha256 = "1771abzrfifvw2c34vl1j0xl5j9lv9q2cwfyan3bzviwyyca0gka";
+      name = "ffmpegthumbs-17.08.0.tar.xz";
     };
   };
   filelight = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/filelight-17.04.3.tar.xz";
-      sha256 = "0srwhi3zi3gv8iid21f9gk709w59r4l7z560piywfgdmpp9spmgg";
-      name = "filelight-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/filelight-17.08.0.tar.xz";
+      sha256 = "1y6b705q04hjzdyy3k3dps9rgvaqlvy232f3m0qg1j9kjy0hs7kb";
+      name = "filelight-17.08.0.tar.xz";
     };
   };
   granatier = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/granatier-17.04.3.tar.xz";
-      sha256 = "1gv4xikxkqfw54pcgrkj5l2m84fc39pckyg495aid3fbh73pgi7i";
-      name = "granatier-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/granatier-17.08.0.tar.xz";
+      sha256 = "1i55hqgn69c1y03wwnm360bmw3v0nsn5wi1nd4p5na4vxcr7ly03";
+      name = "granatier-17.08.0.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/grantlee-editor-17.04.3.tar.xz";
-      sha256 = "0lm97icf22gbrq9pgj8cmwcgpqb5nsgwv78ldz8hp1s9x05qck2v";
-      name = "grantlee-editor-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/grantlee-editor-17.08.0.tar.xz";
+      sha256 = "1kvkbjicfnl8r13gzlb85d4c4allz6257285rmm3anhp12k84z31";
+      name = "grantlee-editor-17.08.0.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/grantleetheme-17.04.3.tar.xz";
-      sha256 = "0jbgxjlsih2alc5ylbkrwwc2ij11ywsynlz1vsm0qzrfb7j534si";
-      name = "grantleetheme-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/grantleetheme-17.08.0.tar.xz";
+      sha256 = "04q29qvibxzxi9s9jldjvnx8x7x76ybcy7964im303zhcf3djmm5";
+      name = "grantleetheme-17.08.0.tar.xz";
     };
   };
   gwenview = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/gwenview-17.04.3.tar.xz";
-      sha256 = "12dy8hicrbns40gjnz2j60cqyjmrz5ci8sq2npblq5gr3avhdgla";
-      name = "gwenview-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/gwenview-17.08.0.tar.xz";
+      sha256 = "1xqma79v0sd48fsslblqaw5rbz80p2qi9rmwgv4adr1cd4n69f5i";
+      name = "gwenview-17.08.0.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/incidenceeditor-17.04.3.tar.xz";
-      sha256 = "1xjgmz23q45s5m3kzfdr3k94l711i672m8cp5lfv9sczv4lgi45y";
-      name = "incidenceeditor-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/incidenceeditor-17.08.0.tar.xz";
+      sha256 = "0pl9qza8bmbr6f29iaq9afhr89nkap8yzf36qn0i0fvc2x1940wk";
+      name = "incidenceeditor-17.08.0.tar.xz";
     };
   };
   jovie = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/jovie-17.04.3.tar.xz";
-      sha256 = "0v9ndwp7phd62vnp3qv3ax9khrzbqwhs0mv2glf8r8w4qqv39gsq";
-      name = "jovie-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/jovie-17.08.0.tar.xz";
+      sha256 = "1q8l5xm93x2kacz8ay2ra6jg0q24r22y8lxfpqzb8l8sz7gy81qa";
+      name = "jovie-17.08.0.tar.xz";
     };
   };
   juk = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/juk-17.04.3.tar.xz";
-      sha256 = "1kff1rcipw1m19w7dij3fjzqm4xkgzzy3qanhwhbicy77pkmcwjp";
-      name = "juk-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/juk-17.08.0.tar.xz";
+      sha256 = "0dzhn7x4r32smfil8v5afrl4d3xlx0c23f21rbj8gnnbiz3033iw";
+      name = "juk-17.08.0.tar.xz";
     };
   };
   k3b = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/k3b-17.04.3.tar.xz";
-      sha256 = "0a1hk0is5iswbvrq1zlj8fgr02dg94nm1393s3j1ashgvxsfzmfk";
-      name = "k3b-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/k3b-17.08.0.tar.xz";
+      sha256 = "1n0jvvd414mmfpljj1ja2ik7hcf3ih6i5ghcsq6irq6ijxibrkdd";
+      name = "k3b-17.08.0.tar.xz";
     };
   };
   kaccessible = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kaccessible-17.04.3.tar.xz";
-      sha256 = "1iik3dbdxqr9702mcrvij56j3w5wr4vmylnpkr9lm46pf0kpxyby";
-      name = "kaccessible-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kaccessible-17.08.0.tar.xz";
+      sha256 = "0xnlirxm5bp7wbvalml4z9l7yrnkxi7966dxb2a6n140xbnzy3f5";
+      name = "kaccessible-17.08.0.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kaccounts-integration-17.04.3.tar.xz";
-      sha256 = "0s67vgk2sh11gf2icg5syk3zy66ilkdnjspahhfsmvqkgpgcr3w7";
-      name = "kaccounts-integration-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kaccounts-integration-17.08.0.tar.xz";
+      sha256 = "181324pacp8nvnzyivwr657qi4jsbi5c1hv7yi5m9z0lw0b0h515";
+      name = "kaccounts-integration-17.08.0.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kaccounts-providers-17.04.3.tar.xz";
-      sha256 = "0j3w66gvvaa1fsncr2h15lw3fk4m1qzkhzaxp13yg5cig3mkg3bb";
-      name = "kaccounts-providers-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kaccounts-providers-17.08.0.tar.xz";
+      sha256 = "1428vak366hkx54shpymsg6xk1f92hkz2hgbipim5rddgjqpa9w4";
+      name = "kaccounts-providers-17.08.0.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kaddressbook-17.04.3.tar.xz";
-      sha256 = "0gr3g0vi2h9qy4fw82g997wq2snam71qivqg5fk7bdgvzi3qm2d0";
-      name = "kaddressbook-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kaddressbook-17.08.0.tar.xz";
+      sha256 = "1m6k5gadrq5l6grw9y677360lxxcvz4axhr0rkpamvf0vy92iy8w";
+      name = "kaddressbook-17.08.0.tar.xz";
     };
   };
   kajongg = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kajongg-17.04.3.tar.xz";
-      sha256 = "0clq9gvxn8lma5s1qxl2j56nylbs1vijqlw1xplxi4pfwzv2d09g";
-      name = "kajongg-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kajongg-17.08.0.tar.xz";
+      sha256 = "0nf1p3gm9mq4szq49wmc39hjk52v4x5x7fn35sgmfi0dprz9i8y1";
+      name = "kajongg-17.08.0.tar.xz";
     };
   };
   kalarm = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kalarm-17.04.3.tar.xz";
-      sha256 = "00h90n9r05ffgca34fz1f5vr4c95xgq6ay6a0y7p7bda2kvl2rwg";
-      name = "kalarm-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kalarm-17.08.0.tar.xz";
+      sha256 = "1680i011p15pra6cb95icz788v7qivc3l8d9fngw9hg03i33y118";
+      name = "kalarm-17.08.0.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kalarmcal-17.04.3.tar.xz";
-      sha256 = "1qn9idrjql02fzbvjdk70jqp1c4npjmbjgfbnjg2m4jnd98xd7yr";
-      name = "kalarmcal-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kalarmcal-17.08.0.tar.xz";
+      sha256 = "0wwb2xx6avjaqkfsf2jnxbk31i4dss3j1gp1rjb608slq8kpwyy0";
+      name = "kalarmcal-17.08.0.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kalgebra-17.04.3.tar.xz";
-      sha256 = "0hcybpy7bjmxym09xlv4mi4fidl8l130c0ghbigw8774f11k6vp5";
-      name = "kalgebra-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kalgebra-17.08.0.tar.xz";
+      sha256 = "1i8b9cv1qv8vhfbx0qa3ka08qgyyp6h474v9x504ypsx8124f8g4";
+      name = "kalgebra-17.08.0.tar.xz";
     };
   };
   kalzium = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kalzium-17.04.3.tar.xz";
-      sha256 = "0pwxbb1qgkbx9y3320hwx96ymy91p6ycarvx731cyinp6v9lizld";
-      name = "kalzium-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kalzium-17.08.0.tar.xz";
+      sha256 = "01xvnczj6dhjx37f2i1dil31zc5bff25p3i0mk01dgnvzcq7cflf";
+      name = "kalzium-17.08.0.tar.xz";
     };
   };
   kamera = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kamera-17.04.3.tar.xz";
-      sha256 = "0gjxv55lzdfwxk7cm8s9yzk5z6lqb64irx57682l76an3azkjwsf";
-      name = "kamera-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kamera-17.08.0.tar.xz";
+      sha256 = "14krfdwraffbhsqhmi0h91mmpxx4952vbmilbp6955psz7cn8xyi";
+      name = "kamera-17.08.0.tar.xz";
     };
   };
   kanagram = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kanagram-17.04.3.tar.xz";
-      sha256 = "01479ryshlaf9kqd3nlhdrx02i8xp7sn7n1ir4cdxpnm8jg28x0c";
-      name = "kanagram-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kanagram-17.08.0.tar.xz";
+      sha256 = "1szksc9w22dzkwhsgpbd5xrrg1iwn13wdcdhhc5g2mcx1xgwksr0";
+      name = "kanagram-17.08.0.tar.xz";
     };
   };
   kapman = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kapman-17.04.3.tar.xz";
-      sha256 = "0llrh5g52gzvyxa5l3ardjv17msy2zj83in2g4cy094g1zciyk40";
-      name = "kapman-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kapman-17.08.0.tar.xz";
+      sha256 = "042lczwbcb7nrbw2wx486mg9qmlx1kcxjdwab10gmy0hvx83p0m3";
+      name = "kapman-17.08.0.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kapptemplate-17.04.3.tar.xz";
-      sha256 = "0r4s5lfggv3nbqgi2y5y9zbyqp3fc7hlhlbdfr24cyljagmi8hgw";
-      name = "kapptemplate-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kapptemplate-17.08.0.tar.xz";
+      sha256 = "1i2w06fb6i0b5yhawms9a0qmis1kz8hyyg8hhnfwcsb0frp4sp7s";
+      name = "kapptemplate-17.08.0.tar.xz";
     };
   };
   kate = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kate-17.04.3.tar.xz";
-      sha256 = "1p6sfn80f8hvkgrg6z2yk7h23v403695sp39fb7s3q4cn5a0sch8";
-      name = "kate-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kate-17.08.0.tar.xz";
+      sha256 = "0zb6w346y5lz4bfvgvnkr9x1vkv6nblc2lrdx103jwbjwb3kjnpj";
+      name = "kate-17.08.0.tar.xz";
     };
   };
   katomic = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/katomic-17.04.3.tar.xz";
-      sha256 = "0rm2alxjmr74m2nxf5vwg3j5ynajz4c5z57cnpmzwvxgdh2c49p0";
-      name = "katomic-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/katomic-17.08.0.tar.xz";
+      sha256 = "0csnag857syf1966b8r1z8xhrcddy1r4qnk0lxgf326w1z33lyl3";
+      name = "katomic-17.08.0.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kblackbox-17.04.3.tar.xz";
-      sha256 = "183yvajbg8h48h4zwzm55zdajjan84dsnndg1db4n8gyibkv3f9d";
-      name = "kblackbox-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kblackbox-17.08.0.tar.xz";
+      sha256 = "10n6an0m5q11i8jlg1v3fz5ib8mhwifalhkj3syda4wjnc6i98g0";
+      name = "kblackbox-17.08.0.tar.xz";
     };
   };
   kblocks = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kblocks-17.04.3.tar.xz";
-      sha256 = "0j66756d66ravgiq4ybfyhm4hacmys9snjyadr035103j26z89pw";
-      name = "kblocks-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kblocks-17.08.0.tar.xz";
+      sha256 = "0ahc5pyrhfx49pyyj5i7kp7jj5y9dkxd12xbrmv3hyqips1q83ds";
+      name = "kblocks-17.08.0.tar.xz";
     };
   };
   kblog = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kblog-17.04.3.tar.xz";
-      sha256 = "10ngg2b83mczd937ikwzbwdqlrvlxsqzgrz95454x3s3j649hcy9";
-      name = "kblog-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kblog-17.08.0.tar.xz";
+      sha256 = "0hspjg73yjqsxykc2spsva4bc33bn0rxbdjn33fhzyz31n2cv6km";
+      name = "kblog-17.08.0.tar.xz";
     };
   };
   kbounce = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kbounce-17.04.3.tar.xz";
-      sha256 = "1f9np47ddhybnmm0m98fwpy51d9c8zgl7qrlj8g3diia45hy1s39";
-      name = "kbounce-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kbounce-17.08.0.tar.xz";
+      sha256 = "0269mfnzkvf25j60hj1mpg1wsjd2a90llcqxfzc9bi3kfvg9k11f";
+      name = "kbounce-17.08.0.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kbreakout-17.04.3.tar.xz";
-      sha256 = "0s7khwg6sl709gjzf5ymq5l79iilnfx14jp5bnck0ir568vhybkf";
-      name = "kbreakout-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kbreakout-17.08.0.tar.xz";
+      sha256 = "1vcknsahyaya6mk81mzbv56924k55yzhkfiv389bwj8gfg0983a0";
+      name = "kbreakout-17.08.0.tar.xz";
     };
   };
   kbruch = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kbruch-17.04.3.tar.xz";
-      sha256 = "11r50x5yp7s749prqwkxf3k5pm93pmk0h3b0i9c5507nbh2b2x9b";
-      name = "kbruch-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kbruch-17.08.0.tar.xz";
+      sha256 = "0gdz4ayk7bpc3w0pw8a4k742hxp7qh6a0j5b21qfhjzlhbpb4y4r";
+      name = "kbruch-17.08.0.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kcachegrind-17.04.3.tar.xz";
-      sha256 = "0wcjvmdsqg27b2d4rzvrl98nqj5k7hp02d1w136fklfsh5mzxbxn";
-      name = "kcachegrind-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kcachegrind-17.08.0.tar.xz";
+      sha256 = "0n0sj9vpawjanj92jkbkvb4njr6qy3v5j2npglg2skv1brqhn55h";
+      name = "kcachegrind-17.08.0.tar.xz";
     };
   };
   kcalc = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kcalc-17.04.3.tar.xz";
-      sha256 = "1zshisq51vwsd04fxc5pw7lywrimpz04v2c9ad6lxwppmxcjr177";
-      name = "kcalc-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kcalc-17.08.0.tar.xz";
+      sha256 = "03xiwv8c86p3s640a35021z5varqkfrgpkrlc5gyxd2nnjldy9ky";
+      name = "kcalc-17.08.0.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kcalcore-17.04.3.tar.xz";
-      sha256 = "17i7d29yq06his3qjn5jblbdzf04500q9sdh7cr7xffdr3rpahdc";
-      name = "kcalcore-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kcalcore-17.08.0.tar.xz";
+      sha256 = "1vpyzbv6lv29ihzwrwd0nsb9vmy6iswka244fixa278218g2lfix";
+      name = "kcalcore-17.08.0.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kcalutils-17.04.3.tar.xz";
-      sha256 = "07k0vx3rdn1dvg16b3ipwng87aibr9g1jv9wg0hnk0fydsrpf99n";
-      name = "kcalutils-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kcalutils-17.08.0.tar.xz";
+      sha256 = "1s90arpxjnbzikpy1j1rcbvljcjgq5pgvmsr852r8qgw7s9dkpmh";
+      name = "kcalutils-17.08.0.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kcharselect-17.04.3.tar.xz";
-      sha256 = "1cy3ljdmip0zqqmyqjj2d5jd5q0hyxiqkl8pcgl2hb7ypx5c06sx";
-      name = "kcharselect-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kcharselect-17.08.0.tar.xz";
+      sha256 = "16hgzm3v84xkq4s68cpz73b4vgw1sarlgab0f2qkacvggpa0gkb6";
+      name = "kcharselect-17.08.0.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kcolorchooser-17.04.3.tar.xz";
-      sha256 = "0jc7cynzbvc1r743fzqlfl5ck0cdd7m63lh27i033c4fpvvi4f6k";
-      name = "kcolorchooser-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kcolorchooser-17.08.0.tar.xz";
+      sha256 = "177v2wi0dwzydbi1xwqq34s38rlgqifirm6r4frbxzbxzi1bpvw0";
+      name = "kcolorchooser-17.08.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kcontacts-17.04.3.tar.xz";
-      sha256 = "0y0vnpk09bk8w5dx8a2zpng2phdzlrs2s380saf06h01n0ni9g01";
-      name = "kcontacts-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kcontacts-17.08.0.tar.xz";
+      sha256 = "0852x0nindb8daczdhyiqahyqq0r60gmpyhsymccpz8jzirxlbfv";
+      name = "kcontacts-17.08.0.tar.xz";
     };
   };
   kcron = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kcron-17.04.3.tar.xz";
-      sha256 = "11sbb1wvl1v6z0059hkmg3p29p8b77ij51kvkv3dicyvh7xzc4f8";
-      name = "kcron-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kcron-17.08.0.tar.xz";
+      sha256 = "0fmzikk0zyhf41k7mxwyzlxr67jg3ffjj0jilskzdq6ffsnc7m08";
+      name = "kcron-17.08.0.tar.xz";
     };
   };
   kdav = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdav-17.04.3.tar.xz";
-      sha256 = "1yv8jhfak671k1s0fsy3j4bj7y64shhipp9k67v34q5cgg0q4hwl";
-      name = "kdav-17.04.3.tar.xz";
-    };
-  };
-  kdebugsettings = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdebugsettings-17.04.3.tar.xz";
-      sha256 = "1l2jg75jfvbf9ixs2spg4b284vimsf0hz04yhfcqicljykrwlwq4";
-      name = "kdebugsettings-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kdav-17.08.0.tar.xz";
+      sha256 = "066hhcf8n6wnm4f76f24xq9hy0x9771kvbmappaicwnlza71v0i1";
+      name = "kdav-17.08.0.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-dev-scripts-17.04.3.tar.xz";
-      sha256 = "0cshxm7s2ivvj1baciy3il8vbk9qby9ybdclrhkq6n7a7li5w1lm";
-      name = "kde-dev-scripts-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-dev-scripts-17.08.0.tar.xz";
+      sha256 = "1skvgaj54a9apvwbjwpzvqyk1cqg3mf8p0h2fyp0k1i1f3ig8qrb";
+      name = "kde-dev-scripts-17.08.0.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-dev-utils-17.04.3.tar.xz";
-      sha256 = "02d0fm4dv5vl5zi3xp608m9c8rnv00x7wk3hkv4mdvi7li5h62j4";
-      name = "kde-dev-utils-17.04.3.tar.xz";
-    };
-  };
-  kdeedu-data = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdeedu-data-17.04.3.tar.xz";
-      sha256 = "01vv6x600hpqpvg25aa07mbsjsnv83jqghna1bwqxgwrx1p3z8nd";
-      name = "kdeedu-data-17.04.3.tar.xz";
-    };
-  };
-  kdegraphics-mobipocket = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdegraphics-mobipocket-17.04.3.tar.xz";
-      sha256 = "1nir7k3sf8q0k8ancs5mhp4qs5v405mjdiwnqf92mpmpfv6gw7ba";
-      name = "kdegraphics-mobipocket-17.04.3.tar.xz";
-    };
-  };
-  kdegraphics-thumbnailers = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdegraphics-thumbnailers-17.04.3.tar.xz";
-      sha256 = "041bd8in0kwma5xkdwv9304r49rim4sxc977l7dnpyf306dx48rr";
-      name = "kdegraphics-thumbnailers-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-dev-utils-17.08.0.tar.xz";
+      sha256 = "00xz7n5bjss2im106n7r8zncan9v1mxmlfl27if1wff0nflbnfcm";
+      name = "kde-dev-utils-17.08.0.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ar-17.04.3.tar.xz";
-      sha256 = "1z72mz94c95m2fq4k1aaqga8j9pnf4735radlny9ybfvv3wyliyb";
-      name = "kde-l10n-ar-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ar-17.08.0.tar.xz";
+      sha256 = "0jp0zcc8m0zmi342y8656z6gw93drnripfj0qbkblqj7fmqbgjf4";
+      name = "kde-l10n-ar-17.08.0.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ast-17.04.3.tar.xz";
-      sha256 = "0r4srnzb30c0616zl15qbadb9rpkskvdhrqhxmy5pj0vaq349y8p";
-      name = "kde-l10n-ast-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ast-17.08.0.tar.xz";
+      sha256 = "03pzn3pa39350njjww36mk6l809bnx332v1y0hic0rrpbnscmbfk";
+      name = "kde-l10n-ast-17.08.0.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bg-17.04.3.tar.xz";
-      sha256 = "15ffbpsynzqinjvirn4aa7ij87awq4b2kv8bx6bbnpv727b34cm8";
-      name = "kde-l10n-bg-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-bg-17.08.0.tar.xz";
+      sha256 = "15a14mwyi29pc66mx02axsham6mgqw7bmd54rinhafhwcdsdyhia";
+      name = "kde-l10n-bg-17.08.0.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bs-17.04.3.tar.xz";
-      sha256 = "0hc9gsw7i1wmvxd5lg3xd14njsdnfpf82km3hny46lyiqki1riyd";
-      name = "kde-l10n-bs-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-bs-17.08.0.tar.xz";
+      sha256 = "17irsp0zdk66k66rg2an3bdx38y8d64zijh4fm7kr0nx3vm1gzxp";
+      name = "kde-l10n-bs-17.08.0.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca-17.04.3.tar.xz";
-      sha256 = "0h6aj2hi1gyjq7prza9v207ipcis32hr2a76i5rrbnf5c8hpih1r";
-      name = "kde-l10n-ca-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ca-17.08.0.tar.xz";
+      sha256 = "0yhr0yrxxbzkp2aby7kfkscf4rrk12myhqqvcy4v1acqywqn3zrs";
+      name = "kde-l10n-ca-17.08.0.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-17.04.3";
+    version = "ca_valencia-17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca@valencia-17.04.3.tar.xz";
-      sha256 = "1bvl1v9niqb9h2ilji70qfcybx7lraszkimbi6zawvimj5y68jfg";
-      name = "kde-l10n-ca_valencia-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ca@valencia-17.08.0.tar.xz";
+      sha256 = "0khslngsws4z0frc93w0yj3lgi9164j94pknwzhiq6h39bdy5jha";
+      name = "kde-l10n-ca_valencia-17.08.0.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-cs-17.04.3.tar.xz";
-      sha256 = "0miqxwhbcqzds8lgq5g7zb2w0gkx3y7g45vq989641jaqqlfca1c";
-      name = "kde-l10n-cs-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-cs-17.08.0.tar.xz";
+      sha256 = "0ia1lysymd87z1a7hcg95v30q8gwlx1f2m5brkh1s1fdkl4hf7zc";
+      name = "kde-l10n-cs-17.08.0.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-da-17.04.3.tar.xz";
-      sha256 = "0j7j9b9i81984fyh7g5yv9j0gasws9hz648ycqi96k43zs80cahb";
-      name = "kde-l10n-da-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-da-17.08.0.tar.xz";
+      sha256 = "1fzmzhnsp6jfiahga685dnn8li24lhyq0pdvpbmx2fsq8izg449s";
+      name = "kde-l10n-da-17.08.0.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-de-17.04.3.tar.xz";
-      sha256 = "0ra0idakfiggiw8x67iw4jbv9g2g0ypcskgcjzvwm61q9dqnr6hy";
-      name = "kde-l10n-de-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-de-17.08.0.tar.xz";
+      sha256 = "1zaypk1y6bmpbrymds5iiq0gcc1fcja61fpm9iqc76s3x22walw3";
+      name = "kde-l10n-de-17.08.0.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-el-17.04.3.tar.xz";
-      sha256 = "1lmxrx7vkdpa9m730his0z9ry6nvycp4428waz0r4wxqqfz1acwr";
-      name = "kde-l10n-el-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-el-17.08.0.tar.xz";
+      sha256 = "0440flgz1sfs8b8qrvzn2gh14z25pivvxgcv2kgsgb6lq9b98bhg";
+      name = "kde-l10n-el-17.08.0.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-17.04.3";
+    version = "en_GB-17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-en_GB-17.04.3.tar.xz";
-      sha256 = "1mr9rgxklfnmhd7yb5h3hddjjn1qxxbqw16sn5d1d077p3wz6896";
-      name = "kde-l10n-en_GB-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-en_GB-17.08.0.tar.xz";
+      sha256 = "1w11hbr3sdrr724qvfh15ppyg0r4003110v876xqy2f2d5z2v9mq";
+      name = "kde-l10n-en_GB-17.08.0.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eo-17.04.3.tar.xz";
-      sha256 = "1aq501z6mnpp8h354p45wwxs4fbfawm0dj67xh74xcr6sh0nj3ap";
-      name = "kde-l10n-eo-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-eo-17.08.0.tar.xz";
+      sha256 = "0w034zx2qmwimq5p8gr0dgh1d51bhwnqc1db9jszr0hv891fji8v";
+      name = "kde-l10n-eo-17.08.0.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-es-17.04.3.tar.xz";
-      sha256 = "1hk8731avlmirzhv2sckrqaf4ykgvy2brnq0a86dr4n95138hhmw";
-      name = "kde-l10n-es-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-es-17.08.0.tar.xz";
+      sha256 = "1428jqjqmxh1fql39af52f0g8ha7jlnmkpkb45x9k95cfbm0hccn";
+      name = "kde-l10n-es-17.08.0.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-et-17.04.3.tar.xz";
-      sha256 = "0cdy7mmjg8q5s19lqjsbhn64h3fk6f8y0j3ldvnmc4wj24gfnc5n";
-      name = "kde-l10n-et-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-et-17.08.0.tar.xz";
+      sha256 = "0iqs6636jfxyhdiifx9nzxg1z7z4rb9parj93njhb6x34kpa6b4v";
+      name = "kde-l10n-et-17.08.0.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eu-17.04.3.tar.xz";
-      sha256 = "06c2940qsqf03acly35jpcnsljzq20mljmlzx9234i7gqr88g74r";
-      name = "kde-l10n-eu-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-eu-17.08.0.tar.xz";
+      sha256 = "1x3r1m0yivvasv7832v2my2nn8kgdfp8326dmjz1fcgs7cnnv4ab";
+      name = "kde-l10n-eu-17.08.0.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fa-17.04.3.tar.xz";
-      sha256 = "1q3a2dyvrk22azj0rngb8h0dh88aczsxys7aaf4yvvwsdm7zbj8k";
-      name = "kde-l10n-fa-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-fa-17.08.0.tar.xz";
+      sha256 = "1kaibymfrpa5c6pmq3rkxnnl532s19bg60nzq0iirn3n0kgplwy2";
+      name = "kde-l10n-fa-17.08.0.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fi-17.04.3.tar.xz";
-      sha256 = "0hfzs1g5ikz6cgjss7kibxx2vd0zxn9rny7br4ysp1x89nz5qb34";
-      name = "kde-l10n-fi-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-fi-17.08.0.tar.xz";
+      sha256 = "0yml2hpg0b48rknik9kfhdgn6znwjqxg43gaglglm79d68a7xdng";
+      name = "kde-l10n-fi-17.08.0.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fr-17.04.3.tar.xz";
-      sha256 = "14i752qqdzdgbxh8r9rmjmjjsmhhh6vpcna3gp8g577r7y8rqpwk";
-      name = "kde-l10n-fr-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-fr-17.08.0.tar.xz";
+      sha256 = "1r97zi8p1jha99r5k2qljrypmyzdrmpz0r60bv1b7nhx7m6ix503";
+      name = "kde-l10n-fr-17.08.0.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ga-17.04.3.tar.xz";
-      sha256 = "164jc111sgj8mqcvvqx8yccjjinvk5h7g5z4a964dwhh587xir1h";
-      name = "kde-l10n-ga-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ga-17.08.0.tar.xz";
+      sha256 = "1y43njj4k79mzcvhg8ycr7641js698kda762jffdzfl2navx2f7r";
+      name = "kde-l10n-ga-17.08.0.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-gl-17.04.3.tar.xz";
-      sha256 = "1c5vz652fd91pxx8p5savcfjg40ks96qay8djjvjznhs8rpkmxf9";
-      name = "kde-l10n-gl-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-gl-17.08.0.tar.xz";
+      sha256 = "053x6v84bpa8cnl6v95kfks7b914b9jy1wd41lyxd9a8z5nh04yp";
+      name = "kde-l10n-gl-17.08.0.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-he-17.04.3.tar.xz";
-      sha256 = "142np920w44jwrkkrbplnfdyxpf72c0r86zwfdps7cc2giycj793";
-      name = "kde-l10n-he-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-he-17.08.0.tar.xz";
+      sha256 = "08fq8v7af2j2iqnwja3pznklizxib7v4zs22i359iql05iayd0wy";
+      name = "kde-l10n-he-17.08.0.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hi-17.04.3.tar.xz";
-      sha256 = "17r2rfzk7773zxj454zm33fysd0jfc0kaji2pcpi27skypxcrsl7";
-      name = "kde-l10n-hi-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-hi-17.08.0.tar.xz";
+      sha256 = "0zizfvwiwix937iczh186w42ydsvyp3h4pyk2r05ds4hbz6jw4yd";
+      name = "kde-l10n-hi-17.08.0.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hr-17.04.3.tar.xz";
-      sha256 = "08fak1f5f5228djl28l8xx026mxq5khklvklss8fi42l57091azv";
-      name = "kde-l10n-hr-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-hr-17.08.0.tar.xz";
+      sha256 = "18fdby0dpgymrya63cks23k5nq4ni9n7nymvx65z7bn8h7r8cbmc";
+      name = "kde-l10n-hr-17.08.0.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hu-17.04.3.tar.xz";
-      sha256 = "0i5lgkdxs81kjhjrhzjdk0ayp28vdigrsfv1n6k0aqj3jzfpbhbz";
-      name = "kde-l10n-hu-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-hu-17.08.0.tar.xz";
+      sha256 = "1gcqmf4vbmwah8yi78inb9miirs13r80wjfif5c8vblhvdmlbrc1";
+      name = "kde-l10n-hu-17.08.0.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ia-17.04.3.tar.xz";
-      sha256 = "18bgdyazgqcslyajz97g0s96linx89ngr916zqknz64xqhxdhvdy";
-      name = "kde-l10n-ia-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ia-17.08.0.tar.xz";
+      sha256 = "11ljcxwsq09885rdd3kszfchjdi4g3359b88rfsq4dn11bnmm50s";
+      name = "kde-l10n-ia-17.08.0.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-id-17.04.3.tar.xz";
-      sha256 = "0dncq9p12bgn4d6zra4skk6mb1ivnswn0z51llqrma90271ibflr";
-      name = "kde-l10n-id-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-id-17.08.0.tar.xz";
+      sha256 = "005563k8bdqzyhm3l231vlc96iwc4sg9f0932y9w1nmlxkh0n02f";
+      name = "kde-l10n-id-17.08.0.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-is-17.04.3.tar.xz";
-      sha256 = "1pkp87di1da6f2f9jjsj7li19d8pcn5ljhk1fhbrqc9b3whaansm";
-      name = "kde-l10n-is-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-is-17.08.0.tar.xz";
+      sha256 = "143zja0j77lgmkb34lycrdzkpsffzljmlmmiaisjpb1bj664sk9d";
+      name = "kde-l10n-is-17.08.0.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-it-17.04.3.tar.xz";
-      sha256 = "0n468q4z29mfl9b4a4clmv643p6fhlhf5mhsfl6dsi4l0v9a15mk";
-      name = "kde-l10n-it-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-it-17.08.0.tar.xz";
+      sha256 = "0ppd16w8zdpslz8p6yrhw4dl7pm0i3a6wpin3kvqxaxd87vxzzvb";
+      name = "kde-l10n-it-17.08.0.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ja-17.04.3.tar.xz";
-      sha256 = "00q937jdq6c2q2x75ky2xyfij0654xfzjm904j6kimvmpkyc33xk";
-      name = "kde-l10n-ja-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ja-17.08.0.tar.xz";
+      sha256 = "0qq88f5gm3ifw1l5m2xq8x6ajqj6ngfpydbrz5ry62nz8mi0w1i0";
+      name = "kde-l10n-ja-17.08.0.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-kk-17.04.3.tar.xz";
-      sha256 = "1srjbxg969rhzqw81vy8kab9pkasp061i4r5ark8rg8k7agjdcml";
-      name = "kde-l10n-kk-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-kk-17.08.0.tar.xz";
+      sha256 = "0w953g4hvhisawb3423c9dd1vin8zxk3643ilkrf3mlkx972ib5m";
+      name = "kde-l10n-kk-17.08.0.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-km-17.04.3.tar.xz";
-      sha256 = "1szigmhybhfa70lg2wzpkzja73c20szzr8wawjzy869ql8fcip3w";
-      name = "kde-l10n-km-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-km-17.08.0.tar.xz";
+      sha256 = "1xhmmnxsd0lcr68zz5x68cs4gxxlxm71p30zj3cm188dq756c9a9";
+      name = "kde-l10n-km-17.08.0.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ko-17.04.3.tar.xz";
-      sha256 = "1j9zgf9pl3nns5a8jdd2ggragq2ln3x11h7y2apkffihyd0kz40v";
-      name = "kde-l10n-ko-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ko-17.08.0.tar.xz";
+      sha256 = "1c6arfbp06kmapxp8ass37sb250pbsvfhwjqn57yaya0hvf3my82";
+      name = "kde-l10n-ko-17.08.0.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lt-17.04.3.tar.xz";
-      sha256 = "1rpia72cz2a3knxzzanhhpqp3r89mj5dn4yh9ym81xw6s4acz5fg";
-      name = "kde-l10n-lt-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-lt-17.08.0.tar.xz";
+      sha256 = "09cidww52igwav358a1f1gm7djcrpnl7d3wc11w2v7hn76cabjmx";
+      name = "kde-l10n-lt-17.08.0.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lv-17.04.3.tar.xz";
-      sha256 = "1vpdgq90ph7c6yjvn0ijdq7ry699m03i7857sxq9vsgy4hi7xi14";
-      name = "kde-l10n-lv-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-lv-17.08.0.tar.xz";
+      sha256 = "148sfbalalp3calzgl4kga1bcj1sqgkwdgx07bsqza9q142z5xjs";
+      name = "kde-l10n-lv-17.08.0.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-mr-17.04.3.tar.xz";
-      sha256 = "1rfp5bi6xpdc503id328h8jl6z8alzjvg24dspaj209390hvldqv";
-      name = "kde-l10n-mr-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-mr-17.08.0.tar.xz";
+      sha256 = "1m8la1a1fyfm5k732hnm3ybxqmah7mdf6f3nhxisr3c2h3gxqysk";
+      name = "kde-l10n-mr-17.08.0.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nb-17.04.3.tar.xz";
-      sha256 = "1d25ffix6pakdcpcr2qz1h6729550l9ba93z545n0psjgqpwvmmr";
-      name = "kde-l10n-nb-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nb-17.08.0.tar.xz";
+      sha256 = "13r7dzwbr1qggwbh4lbb45xy7qck04waxjsaj66d5zv7gw9hc2gp";
+      name = "kde-l10n-nb-17.08.0.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nds-17.04.3.tar.xz";
-      sha256 = "0pvx1rm6bx9xwyl4zfcw52mwif06350i9wmwz0kxxg3zs7lqb7h3";
-      name = "kde-l10n-nds-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nds-17.08.0.tar.xz";
+      sha256 = "19mrs2l6z6ypr1h4ppw0v588hj46nngzanlq5rcznimf9v1b4jwr";
+      name = "kde-l10n-nds-17.08.0.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nl-17.04.3.tar.xz";
-      sha256 = "1ivm2qsl0dmkrgmddnp3cjmcjc6jag0wawhklacp1c9iscfcrppm";
-      name = "kde-l10n-nl-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nl-17.08.0.tar.xz";
+      sha256 = "1lvqjgjk2qfbvlkjyp0pkdp015dcxmc4db0zy077fy1vbrcclj54";
+      name = "kde-l10n-nl-17.08.0.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nn-17.04.3.tar.xz";
-      sha256 = "0jsx980g7zn8m9xd7ljiqz1w9cvlgy84bl6hjhi0a89mfwkd27lg";
-      name = "kde-l10n-nn-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nn-17.08.0.tar.xz";
+      sha256 = "1vk504hjrai30rbr7v9fkyf8yj4ms33ck7c32xk5jxq0avd3yyj7";
+      name = "kde-l10n-nn-17.08.0.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pa-17.04.3.tar.xz";
-      sha256 = "149d7pdxb0543c36gyxidd7z4j2jw5nbilv7c561j3zazbbcg4nm";
-      name = "kde-l10n-pa-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pa-17.08.0.tar.xz";
+      sha256 = "0vh52aqbd66mrb492d2h8gihbs6wql6q0yjvk0ixhhi2b9cykzi0";
+      name = "kde-l10n-pa-17.08.0.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pl-17.04.3.tar.xz";
-      sha256 = "04zxzx8586328v9dw6w5igxa95i7raqzpvdxshphv3wfnjgbzad5";
-      name = "kde-l10n-pl-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pl-17.08.0.tar.xz";
+      sha256 = "1mfjjvm41cd4z1bvnrhpjbwcp2czw70mp3p3snyb7397d2c786f1";
+      name = "kde-l10n-pl-17.08.0.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt-17.04.3.tar.xz";
-      sha256 = "009dnijcznzaf6p85mg3j7s4zhjfmk4smk8bkns6pjn1r2wdpfbi";
-      name = "kde-l10n-pt-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pt-17.08.0.tar.xz";
+      sha256 = "1z44l4qa8ks9r7bwa7dgp43nlcymkdkz31jl7qvgy8c8lil8a6vy";
+      name = "kde-l10n-pt-17.08.0.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-17.04.3";
+    version = "pt_BR-17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt_BR-17.04.3.tar.xz";
-      sha256 = "07ird1j382m8c9459nvhmw0jy8i8ri5wmh6h7m36b8m4i7cbfdcx";
-      name = "kde-l10n-pt_BR-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pt_BR-17.08.0.tar.xz";
+      sha256 = "1hgbw89f7slscc7cgfsxdk0l3y5szsqsidq9grj0j4v2v1qfy320";
+      name = "kde-l10n-pt_BR-17.08.0.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ro-17.04.3.tar.xz";
-      sha256 = "1zs9yxv7566yi7rz9z9zk7mzq2rkh50y6s92sp52wyzsr3q4pl9j";
-      name = "kde-l10n-ro-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ro-17.08.0.tar.xz";
+      sha256 = "0y3mpa1jckzl76yz3fal05dprpmch0m7y03q83yzgb6xdr021bds";
+      name = "kde-l10n-ro-17.08.0.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ru-17.04.3.tar.xz";
-      sha256 = "12a5s73rwnx25vvwdgqis24q26x8kg6zrin3gili4kdmfxr0x27i";
-      name = "kde-l10n-ru-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ru-17.08.0.tar.xz";
+      sha256 = "0ixs6n9jz2i570i5qfd36pjg8jldlgsrwbdb8n82h9c9mjyc7if9";
+      name = "kde-l10n-ru-17.08.0.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sk-17.04.3.tar.xz";
-      sha256 = "0s3s94nb7dl7pdfm5pa7cw66q4vvjqqmv6rrzriia3z1dgg0n9y4";
-      name = "kde-l10n-sk-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sk-17.08.0.tar.xz";
+      sha256 = "0g60hxlbck1rjjmwx0wvxzzgqjmi6wc1n5s6i2230150apas9dh1";
+      name = "kde-l10n-sk-17.08.0.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sl-17.04.3.tar.xz";
-      sha256 = "1n0bj63inj5j9zxqfimza7frqikzyxjr7cyfaqa46ck2wcawhmwm";
-      name = "kde-l10n-sl-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sl-17.08.0.tar.xz";
+      sha256 = "0vs0kvyxb5yc0qwsdf9rg49gvzd5mwd9bag5mvwp4hcrcn3i7db0";
+      name = "kde-l10n-sl-17.08.0.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sr-17.04.3.tar.xz";
-      sha256 = "0cs5rab87yydwpg6pql67x05802yzdj28y6rfzc0z0kr4diay34h";
-      name = "kde-l10n-sr-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sr-17.08.0.tar.xz";
+      sha256 = "0wq1n8ygcz1jpxi3qf0q9qj07vb1p4agn1hjfyy4bjzm3kdy2jkw";
+      name = "kde-l10n-sr-17.08.0.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sv-17.04.3.tar.xz";
-      sha256 = "01f8zr3rf8zvsd0v69vyy45nn7bq9zlxf6f5lgr0i1yd4xjz6fvn";
-      name = "kde-l10n-sv-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sv-17.08.0.tar.xz";
+      sha256 = "09h9d65idax2d10gzwrff96a2si1anc827j2b9r1d559gx9imy0w";
+      name = "kde-l10n-sv-17.08.0.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-tr-17.04.3.tar.xz";
-      sha256 = "082xrk31hajdq9hhnxh7z6ngn56q2adn8xjwkfizjyl3frf8ksya";
-      name = "kde-l10n-tr-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-tr-17.08.0.tar.xz";
+      sha256 = "1dg4l6cy2qn9zvspwf7hfn2p0aad3x3zq0jhipdh4n00gykwh3sm";
+      name = "kde-l10n-tr-17.08.0.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ug-17.04.3.tar.xz";
-      sha256 = "01k9mchkkwyka0sgwg1mx0j1sax227s4mnm74vmpshj651nxqm3r";
-      name = "kde-l10n-ug-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ug-17.08.0.tar.xz";
+      sha256 = "00732l2qisn2kaal3k19f6bnf8ynxalfvmazapbcn3hbcig8cyi5";
+      name = "kde-l10n-ug-17.08.0.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-uk-17.04.3.tar.xz";
-      sha256 = "1nwlqbr8cxcs2ny85bmzn549j66b1d7fiswlwgrvjlqj4mav3cwz";
-      name = "kde-l10n-uk-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-uk-17.08.0.tar.xz";
+      sha256 = "10jrvzy4kfbcn0vcbyir967vhbmk05kzjc7sydx3mg98b0j6qicz";
+      name = "kde-l10n-uk-17.08.0.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-wa-17.04.3.tar.xz";
-      sha256 = "13flih2ca2r8l3favp0xw1hcvwd07dsj64rmg6s2ysk3pcizy3i8";
-      name = "kde-l10n-wa-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-wa-17.08.0.tar.xz";
+      sha256 = "0p595ra21jn72r46haiwi4h8a3gia96qv0lsdfsi8s6lyqqca0i1";
+      name = "kde-l10n-wa-17.08.0.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-17.04.3";
+    version = "zh_CN-17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_CN-17.04.3.tar.xz";
-      sha256 = "02gzlwbq1zqaa1kqk7pd55yv7agg7igbb2147yvdj9462igpzjyi";
-      name = "kde-l10n-zh_CN-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-zh_CN-17.08.0.tar.xz";
+      sha256 = "08fxsafnmzizfhr2i63p41jgkjgnkrb07s6mpdrxklkhafl8bmg8";
+      name = "kde-l10n-zh_CN-17.08.0.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-17.04.3";
+    version = "zh_TW-17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_TW-17.04.3.tar.xz";
-      sha256 = "0x1nwahmh6142g21a949hibmx2slgbvrp5iwq137zmzmxffp7y9h";
-      name = "kde-l10n-zh_TW-17.04.3.tar.xz";
-    };
-  };
-  kdelibs = {
-    version = "4.14.34";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdelibs-4.14.34.tar.xz";
-      sha256 = "1yxwz6dln7km22cwxsns2rxxmw5p1c126xqnczz5fcjvalrk8zbp";
-      name = "kdelibs-4.14.34.tar.xz";
-    };
-  };
-  kdenetwork-filesharing = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdenetwork-filesharing-17.04.3.tar.xz";
-      sha256 = "0r16jgsp45cf7gyjii04gq12wm68j86mrz4502szq0c02hfnmrsd";
-      name = "kdenetwork-filesharing-17.04.3.tar.xz";
-    };
-  };
-  kdenlive = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdenlive-17.04.3.tar.xz";
-      sha256 = "1n4x12pri0kw0lk3376l2059rnabi4c54ax8bdmx39hhn7lqxv45";
-      name = "kdenlive-17.04.3.tar.xz";
-    };
-  };
-  kdepim-addons = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdepim-addons-17.04.3.tar.xz";
-      sha256 = "118n8jdpjr50wgf45y2gzbqljbyichg4a6df014cdi0qcc55mcdl";
-      name = "kdepim-addons-17.04.3.tar.xz";
-    };
-  };
-  kdepim-apps-libs = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdepim-apps-libs-17.04.3.tar.xz";
-      sha256 = "154057mxhkhm4lwlm49lx2m02qkddv0w96ikani7prb5p0kdw09i";
-      name = "kdepim-apps-libs-17.04.3.tar.xz";
-    };
-  };
-  kdepim-runtime = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdepim-runtime-17.04.3.tar.xz";
-      sha256 = "07fcrvs9aqjxn7big60hh9hcd6mg211cmk69wdhhi455arjsfpzq";
-      name = "kdepim-runtime-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-zh_TW-17.08.0.tar.xz";
+      sha256 = "04qq28sf2pjb4rc32j5j9cnhw0h4hpw69gikb5s06324mmmvap0f";
+      name = "kde-l10n-zh_TW-17.08.0.tar.xz";
     };
   };
   kde-runtime = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kde-runtime-17.04.3.tar.xz";
-      sha256 = "05dshxx8bx872c4vp42i9n0dv19zq79p5m1lpd9kvmfpk3cvpxin";
-      name = "kde-runtime-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kde-runtime-17.08.0.tar.xz";
+      sha256 = "14j61bsrrpajw5djk7aa49xid2lg51a886y3q1xdv3dnflmldm70";
+      name = "kde-runtime-17.08.0.tar.xz";
+    };
+  };
+  kdebugsettings = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdebugsettings-17.08.0.tar.xz";
+      sha256 = "057z4bi9mlpdyb8giq5zsgm1fzfq7sz05a0p4is8cawlyjji8qd3";
+      name = "kdebugsettings-17.08.0.tar.xz";
+    };
+  };
+  kdeedu-data = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdeedu-data-17.08.0.tar.xz";
+      sha256 = "1w5zvzgqa8jzvqkgc16sffj6fygrizqmy5lzmxhisnph8im5rxyp";
+      name = "kdeedu-data-17.08.0.tar.xz";
+    };
+  };
+  kdegraphics-mobipocket = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdegraphics-mobipocket-17.08.0.tar.xz";
+      sha256 = "1r66s3yay2pvy77pfa8g1s07iq4v2fiz9nl4lxhd8lvdg7jxa88i";
+      name = "kdegraphics-mobipocket-17.08.0.tar.xz";
+    };
+  };
+  kdegraphics-thumbnailers = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdegraphics-thumbnailers-17.08.0.tar.xz";
+      sha256 = "0cp2p5nmxxg09wfrhg7qzz781rbxyml42y6l42njqfphgxsyqs5h";
+      name = "kdegraphics-thumbnailers-17.08.0.tar.xz";
+    };
+  };
+  kdelibs = {
+    version = "4.14.35";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdelibs-4.14.35.tar.xz";
+      sha256 = "00zkbamzqw1jmxc344dlwvprhdd59bblkj2yalxhc7fy11sbsclp";
+      name = "kdelibs-4.14.35.tar.xz";
+    };
+  };
+  kdenetwork-filesharing = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdenetwork-filesharing-17.08.0.tar.xz";
+      sha256 = "0m4z3mf40sp874ml128489isqjihn5a92gpcn1wbx6j9d37g0aah";
+      name = "kdenetwork-filesharing-17.08.0.tar.xz";
+    };
+  };
+  kdenlive = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdenlive-17.08.0.tar.xz";
+      sha256 = "0dnapnr7fdqf0ng99q7wvzyipvkpzb75xm379jynwv15x5isc7di";
+      name = "kdenlive-17.08.0.tar.xz";
+    };
+  };
+  kdepim-addons = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdepim-addons-17.08.0.tar.xz";
+      sha256 = "0ksa8k1hssclq4q6q14gc9jjg7k8iy6fq2wsxv6i3yjvbslkiyzd";
+      name = "kdepim-addons-17.08.0.tar.xz";
+    };
+  };
+  kdepim-apps-libs = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdepim-apps-libs-17.08.0.tar.xz";
+      sha256 = "0zlg5d4arf0qqdys5p30965868hwb24cj39h2xfbb4jqi7gh3nvv";
+      name = "kdepim-apps-libs-17.08.0.tar.xz";
+    };
+  };
+  kdepim-runtime = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/kdepim-runtime-17.08.0.tar.xz";
+      sha256 = "0mdw7m16pl3z32ri0hng08apg045f0dhr3q68alq6cs743b74dy3";
+      name = "kdepim-runtime-17.08.0.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdesdk-kioslaves-17.04.3.tar.xz";
-      sha256 = "1j9m08r8jpdq5fqp9irvbqyb37maah1wz2xg4byinrn9qqp76dfl";
-      name = "kdesdk-kioslaves-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kdesdk-kioslaves-17.08.0.tar.xz";
+      sha256 = "0jpbv0rjc5pw1ym74khdkg0jm5qhszamb5ahj0l7da9bphshdj3v";
+      name = "kdesdk-kioslaves-17.08.0.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdesdk-thumbnailers-17.04.3.tar.xz";
-      sha256 = "0jjaajz3yxghm7phzhw3cgc0y4kgsc1vs0yc1w4cn8kmipal0x1q";
-      name = "kdesdk-thumbnailers-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kdesdk-thumbnailers-17.08.0.tar.xz";
+      sha256 = "09hh2m6mbblsj7a9wy9xpsl9irdw4agadwgrgpzi75ixdfwl998y";
+      name = "kdesdk-thumbnailers-17.08.0.tar.xz";
     };
   };
   kdf = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdf-17.04.3.tar.xz";
-      sha256 = "1d5nrp3x7r5fvghj7acrjhbz6n2cvd2qr60s6i0za7703b5iflyr";
-      name = "kdf-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kdf-17.08.0.tar.xz";
+      sha256 = "1qqr4a65p9bxkmv6rnyy0qlg21nqi59zxaxg6p2qb35vy19n1izd";
+      name = "kdf-17.08.0.tar.xz";
     };
   };
   kdialog = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdialog-17.04.3.tar.xz";
-      sha256 = "15b5qhxy387wpv2hx6hw31r3lyh7j30vwzn9q474vsmp6jj2zq5m";
-      name = "kdialog-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kdialog-17.08.0.tar.xz";
+      sha256 = "166q8nhxcnw4g727nq89vva7sidrg6jxi6v54rhdnlgqdvf1y5kb";
+      name = "kdialog-17.08.0.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kdiamond-17.04.3.tar.xz";
-      sha256 = "0ri611bmqa81qlsfqmza4n5m14hlcrljhi4xlq2h5pcmg3j8ihyj";
-      name = "kdiamond-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kdiamond-17.08.0.tar.xz";
+      sha256 = "0hz34w1anpihcb0wdx2kyp7ypi7ama48vjhax2520h5gaxfpy8lj";
+      name = "kdiamond-17.08.0.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/keditbookmarks-17.04.3.tar.xz";
-      sha256 = "0pxrf18rml40lh2z3l8kk1nlzpdbwf3jdlzjy745fdc9x9q3phhm";
-      name = "keditbookmarks-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/keditbookmarks-17.08.0.tar.xz";
+      sha256 = "0l26chf97ak4vqil8v5ya62376j7hh0xgabbav5ay8i1d0sk6p6z";
+      name = "keditbookmarks-17.08.0.tar.xz";
     };
   };
   kfilereplace = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kfilereplace-17.04.3.tar.xz";
-      sha256 = "115p6kjax7rhz646pvfi1av7pbllh42fmykzk4ld4mblgs56nj1j";
-      name = "kfilereplace-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kfilereplace-17.08.0.tar.xz";
+      sha256 = "1a1hfjzv9vgfyf1n1ihr5rqzc5javpn4y7h70babl37s54i9k3xj";
+      name = "kfilereplace-17.08.0.tar.xz";
     };
   };
   kfind = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kfind-17.04.3.tar.xz";
-      sha256 = "12iaj6f1b1w3b8jnhdh0gg9k57qxmicsxw68bi0ha4i8lw6dmfc5";
-      name = "kfind-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kfind-17.08.0.tar.xz";
+      sha256 = "1ryl0xwpyww8sipignr8j3dfq79cf1apm47vc4r8dk1704qzm4v9";
+      name = "kfind-17.08.0.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kfloppy-17.04.3.tar.xz";
-      sha256 = "0ayaslvnfhf3v082dfv62ml5ss185jkm1cx7jlqqvpn84l6vykmk";
-      name = "kfloppy-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kfloppy-17.08.0.tar.xz";
+      sha256 = "1gyrgii897r4habi9kmls258pv40zs6hrgyfhcyqibl3vk4ndgfb";
+      name = "kfloppy-17.08.0.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kfourinline-17.04.3.tar.xz";
-      sha256 = "00ci1vbnqvr84ihdh6dcp7dw5pjqx3s40j5fafym0q2mji1q0cwj";
-      name = "kfourinline-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kfourinline-17.08.0.tar.xz";
+      sha256 = "02zbriz434n9xk5rrb3y0y76hrizbf0mq3pl679fa89jcqaml1fj";
+      name = "kfourinline-17.08.0.tar.xz";
     };
   };
   kgeography = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kgeography-17.04.3.tar.xz";
-      sha256 = "0l9923fzpq5dxjvhsbxb03fh717yrys1najqdfyw1f9vs3fmkws9";
-      name = "kgeography-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kgeography-17.08.0.tar.xz";
+      sha256 = "03xwpdngikjiml4kxbp0n893xzvb21h6cyj4xp09j19db9gj0jd7";
+      name = "kgeography-17.08.0.tar.xz";
     };
   };
   kget = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kget-17.04.3.tar.xz";
-      sha256 = "1fffkpnzhi9gl9xib398l8az16wyysjlphqga0a9a0bfkk6h884k";
-      name = "kget-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kget-17.08.0.tar.xz";
+      sha256 = "1h1svqyj2d8qpw65zidzk90smh0d4dbxzzsi8ar0hvgr8d0lq157";
+      name = "kget-17.08.0.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kgoldrunner-17.04.3.tar.xz";
-      sha256 = "15sjikgk1qr36r5z6fbx535i6dj1l08klihrzyymmnr1vl5s02pr";
-      name = "kgoldrunner-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kgoldrunner-17.08.0.tar.xz";
+      sha256 = "0iw7f8760fgy08g9pncnvfv8ynj673glfb8bf6hmwylpa3nddz54";
+      name = "kgoldrunner-17.08.0.tar.xz";
     };
   };
   kgpg = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kgpg-17.04.3.tar.xz";
-      sha256 = "1xdnpmrb6kd48ppvim2bs9c2abhr55f5ha25xr3r89blawmw16w0";
-      name = "kgpg-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kgpg-17.08.0.tar.xz";
+      sha256 = "1kbndyswhx5l5s566gg22n8yqk372gpk53iiksizr6mrjx3wjvf8";
+      name = "kgpg-17.08.0.tar.xz";
     };
   };
   khangman = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/khangman-17.04.3.tar.xz";
-      sha256 = "0n49zhwcsb8mgn416kzvq0x97b3x8mnln480wf8nd58f63hd4hdn";
-      name = "khangman-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/khangman-17.08.0.tar.xz";
+      sha256 = "1wvz8p05lsmip65wcwsxzii6sgk48vqw8plghafd7x2dlbzwv3bi";
+      name = "khangman-17.08.0.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/khelpcenter-17.04.3.tar.xz";
-      sha256 = "1sri5vb730k5n03kiykds024kl2hyw4bhzclxy5v0x36sjdqyz1z";
-      name = "khelpcenter-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/khelpcenter-17.08.0.tar.xz";
+      sha256 = "00i9nq837z6khvz06bvfndv37vhpl72dg0mx9s8wnifni5nixshm";
+      name = "khelpcenter-17.08.0.tar.xz";
     };
   };
   kholidays = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kholidays-17.04.3.tar.xz";
-      sha256 = "1hljhvlk6z3a4injfafwazai25qicmbdazj12pxb0wn5s538m9nw";
-      name = "kholidays-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kholidays-17.08.0.tar.xz";
+      sha256 = "1dyy03dcm6j0wrn71pxmdfhxph7hgvdnkcsrl0q6g2br01yjy7fl";
+      name = "kholidays-17.08.0.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kidentitymanagement-17.04.3.tar.xz";
-      sha256 = "17n7shm642jxnbzz11k9xrb7c3lmhzi3dabrl4qwxam1vf4zli6a";
-      name = "kidentitymanagement-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kidentitymanagement-17.08.0.tar.xz";
+      sha256 = "0xwnydrsw4g8ym415qi93hkhmghspwrdyzl5kw6vhl8xwm67h7i5";
+      name = "kidentitymanagement-17.08.0.tar.xz";
     };
   };
   kig = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kig-17.04.3.tar.xz";
-      sha256 = "1r8w0b99fi0jj8ah2sxgzpz93b1324d4vrrjvgz1wjcwskwqmbld";
-      name = "kig-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kig-17.08.0.tar.xz";
+      sha256 = "1f7w40glwbpqv33alpssg8vapx7sw6q3wbdw22r3ivlrqfy3lfmb";
+      name = "kig-17.08.0.tar.xz";
     };
   };
   kigo = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kigo-17.04.3.tar.xz";
-      sha256 = "0qx4bccniavbsy4icy98r4i3rgqcq3vw4fim9ad1ibmwsakzwrb9";
-      name = "kigo-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kigo-17.08.0.tar.xz";
+      sha256 = "04d4dg9w57cl6hfhwxc7l6hfas19q02l4wszvqbnagci333nqbsm";
+      name = "kigo-17.08.0.tar.xz";
     };
   };
   killbots = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/killbots-17.04.3.tar.xz";
-      sha256 = "0hjpzkdc0rgqiawy8vqh54bb693lhps9h2x9gxjsdhmk225l44b1";
-      name = "killbots-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/killbots-17.08.0.tar.xz";
+      sha256 = "1h5z310nvkn8dsamzifr4njwasyv9w32dy1i0qwkc6x8672n4xhi";
+      name = "killbots-17.08.0.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kimagemapeditor-17.04.3.tar.xz";
-      sha256 = "1c1gv3bac40a4ix45ydxbn5rys1z33c3ycxvii17cgv591yqrana";
-      name = "kimagemapeditor-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kimagemapeditor-17.08.0.tar.xz";
+      sha256 = "0klal67dzrr8l9x3xw4z54llwgf2r19xc2jfi4a8qmn3kqm2inmm";
+      name = "kimagemapeditor-17.08.0.tar.xz";
     };
   };
   kimap = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kimap-17.04.3.tar.xz";
-      sha256 = "0bdcxlwlr8k2ydmaimm4ja2kgg93qp0bjfl2cpsrzsfrp7fky5q2";
-      name = "kimap-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kimap-17.08.0.tar.xz";
+      sha256 = "0s2sfdlzaz6bj5rz077hnli500ddx53j6lvka1pyz7pc2qfj5lpp";
+      name = "kimap-17.08.0.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kio-extras-17.04.3.tar.xz";
-      sha256 = "10zr3gafwswnk9qzb2f0ysllzbxfzq3l482f75sfzn8i2ripd3z1";
-      name = "kio-extras-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kio-extras-17.08.0.tar.xz";
+      sha256 = "0yfg3jjzblrpsi0mc08sfg5lyzr4q4bqg23vha1b4wk323kx758f";
+      name = "kio-extras-17.08.0.tar.xz";
     };
   };
   kiriki = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kiriki-17.04.3.tar.xz";
-      sha256 = "1a4bnxv7y55fgkb0p0x7i09sqajsxg599zxqdfhsrm4ak6cqgkrg";
-      name = "kiriki-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kiriki-17.08.0.tar.xz";
+      sha256 = "10f7qydq97l65wrcxfvjvd0amal5achp6zdl33k04sx3dv62wb63";
+      name = "kiriki-17.08.0.tar.xz";
     };
   };
   kiten = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kiten-17.04.3.tar.xz";
-      sha256 = "1bxj013cb9jbahjghrdiq544zm7z4l4m1yd0zm0g9in9kp7rimzz";
-      name = "kiten-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kiten-17.08.0.tar.xz";
+      sha256 = "1j1qqz1vxgc8746qn9ss8p2qy8c099pfwscfsmd6fj3p04hm0xp7";
+      name = "kiten-17.08.0.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kjumpingcube-17.04.3.tar.xz";
-      sha256 = "0n1lpp6mvhj65zdw19hqsi21fwmfrxng570w1sbc4nr2xq5axibn";
-      name = "kjumpingcube-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kjumpingcube-17.08.0.tar.xz";
+      sha256 = "1a3lyyx7gx3brwyz3dzzf193088v510vjjr6vvlp7p1af0y5rxjp";
+      name = "kjumpingcube-17.08.0.tar.xz";
     };
   };
   kldap = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kldap-17.04.3.tar.xz";
-      sha256 = "03ynbrf5slmkdigp4wpwys1gn6iyd9n6b2ki3adcff9vb6k636kc";
-      name = "kldap-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kldap-17.08.0.tar.xz";
+      sha256 = "1dn37m64sqp816c2mnjcd7vb58bl9zy3zpmf4zghyhnln4hljnjq";
+      name = "kldap-17.08.0.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kleopatra-17.04.3.tar.xz";
-      sha256 = "08v1gldjk0f6d3card84ml4654irxswmvcizg5zbd8cbqb3mxzpw";
-      name = "kleopatra-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kleopatra-17.08.0.tar.xz";
+      sha256 = "0bx4bs2ssjhasbfhvjkhwf4p22wiyfrdkkazp79vs2i1z2anjsqm";
+      name = "kleopatra-17.08.0.tar.xz";
     };
   };
   klettres = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/klettres-17.04.3.tar.xz";
-      sha256 = "1gc1haxgx380q5chzm6l7hwf9laimjff3j2dvlfcqjq6hjjdasfw";
-      name = "klettres-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/klettres-17.08.0.tar.xz";
+      sha256 = "12vsp99x2j7xndgm31lhjxcvzp9v4plxmzjr9yn7l72ayvgf5s61";
+      name = "klettres-17.08.0.tar.xz";
     };
   };
   klickety = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/klickety-17.04.3.tar.xz";
-      sha256 = "1622y0ijw9y28i7fqbxlxj7hi1g1p5ff8dgn9f7bz02a67pdpxxz";
-      name = "klickety-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/klickety-17.08.0.tar.xz";
+      sha256 = "1nsf7yiqp1i0hzh053qr6b3pb6p25nr6w0z5kv6jnjpcvis1w3dj";
+      name = "klickety-17.08.0.tar.xz";
     };
   };
   klines = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/klines-17.04.3.tar.xz";
-      sha256 = "1rzp34309ay7hrrjh6ya0ghr167dkxpkizvhz7l7dzrqv9r216wg";
-      name = "klines-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/klines-17.08.0.tar.xz";
+      sha256 = "1w9hyxy4fdf9cj7c97lx8553phdp2gcx3z0c2y6gb3ic6nign4x7";
+      name = "klines-17.08.0.tar.xz";
     };
   };
   klinkstatus = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/klinkstatus-17.04.3.tar.xz";
-      sha256 = "0lx9f382nsl008r796bpck5f6q8iw6kh46kzkbxn6ygcc6fxz4nk";
-      name = "klinkstatus-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/klinkstatus-17.08.0.tar.xz";
+      sha256 = "07zzi44x2s3sfnp373san27dbbcpcph2l6l7z5b31vmqbcr2fia1";
+      name = "klinkstatus-17.08.0.tar.xz";
     };
   };
   kmag = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmag-17.04.3.tar.xz";
-      sha256 = "0frj2nzmkc0k8vmhhan0qb5qq519msjyz8g16yxip2wgw98n7z8w";
-      name = "kmag-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmag-17.08.0.tar.xz";
+      sha256 = "0fr4p707qhwnqz7nb52rh0xzrxwj5vxq64zpxcdxplapbhqczqkv";
+      name = "kmag-17.08.0.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmahjongg-17.04.3.tar.xz";
-      sha256 = "14afsfnnkdwhwqlyxvi16aldwanvn6s5nip6dy6k6aprap03y600";
-      name = "kmahjongg-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmahjongg-17.08.0.tar.xz";
+      sha256 = "0z6k2nc11h1y8qby9knwwzppnbsl6rw0x52a571ikidakm5jg2j8";
+      name = "kmahjongg-17.08.0.tar.xz";
     };
   };
   kmail = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmail-17.04.3.tar.xz";
-      sha256 = "0ml3vkk8d8hhhl3ir09dfn17vnkc94m8vr7fln3246w8rajzcnxb";
-      name = "kmail-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmail-17.08.0.tar.xz";
+      sha256 = "1vdypb5a9fswnw4z6bj1mjmcp1kdrb0sc9yxigrj572w4hg31hjp";
+      name = "kmail-17.08.0.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmail-account-wizard-17.04.3.tar.xz";
-      sha256 = "1d03kvjx92bqqh7b57kpfcy5viwkxwv4f113hw57bm6myfbv430z";
-      name = "kmail-account-wizard-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmail-account-wizard-17.08.0.tar.xz";
+      sha256 = "06f0fa727fxzjbxch18lhnch9krcly0crk7waciajg4jnmg1v77b";
+      name = "kmail-account-wizard-17.08.0.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmailtransport-17.04.3.tar.xz";
-      sha256 = "0d8w2xq0zjmk3h0hawsbacfvwb3s5qkzqns5hsdrf1dv7mx4w76r";
-      name = "kmailtransport-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmailtransport-17.08.0.tar.xz";
+      sha256 = "1liqqrk5xpzaim8kj87acavry33m5pidx7ajmbmk2hb01dhiq20z";
+      name = "kmailtransport-17.08.0.tar.xz";
     };
   };
   kmbox = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmbox-17.04.3.tar.xz";
-      sha256 = "1r457xa9s30hpm92cd5lga89g1y256macfmi9kj4l0vjvjphligh";
-      name = "kmbox-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmbox-17.08.0.tar.xz";
+      sha256 = "1cg9cl6a4z09adyyim7yahlg95slsw4zw4r9lqhqznmjr5nyf9bq";
+      name = "kmbox-17.08.0.tar.xz";
     };
   };
   kmime = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmime-17.04.3.tar.xz";
-      sha256 = "107ylqgnc63l4a554c4rxp4ckyq33bgy6rwmgihysyy8ff4gfa9a";
-      name = "kmime-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmime-17.08.0.tar.xz";
+      sha256 = "1k4xicq14i35f2x3xkkhqrs2darql5rw2i2j3zd73gkmd37gdrai";
+      name = "kmime-17.08.0.tar.xz";
     };
   };
   kmines = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmines-17.04.3.tar.xz";
-      sha256 = "0m42zmfy51qricg9k1rf3b0bcl4cg982iazrh85qcgvpjlgba70n";
-      name = "kmines-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmines-17.08.0.tar.xz";
+      sha256 = "1wci2wrkj96ywwvvdpbjf4270qq8x7gdbppy9la860x5nvp34xvx";
+      name = "kmines-17.08.0.tar.xz";
     };
   };
   kmix = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmix-17.04.3.tar.xz";
-      sha256 = "1q5pk99hn4shfrbcfab8d1bh79i77v16q3ss2cfa6y8xkrny05rd";
-      name = "kmix-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmix-17.08.0.tar.xz";
+      sha256 = "1s3hmg2wdav2mn9ddcp2lp147xz1k5y52jql0q2w65i5dzcpav3a";
+      name = "kmix-17.08.0.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmousetool-17.04.3.tar.xz";
-      sha256 = "08f7lvvqks75g0bcjd0cylixa93fr85rnc5jni0ygvi02b9fiy5a";
-      name = "kmousetool-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmousetool-17.08.0.tar.xz";
+      sha256 = "0287rgx7rgwa95zfhwl6754ia58scq86qd18max8yg6l5mwjny8v";
+      name = "kmousetool-17.08.0.tar.xz";
     };
   };
   kmouth = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmouth-17.04.3.tar.xz";
-      sha256 = "1x1g29ipq8v6zshhybwsm9ib8f0ks8rxyc0wjn0ncyirvrwr1ka3";
-      name = "kmouth-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmouth-17.08.0.tar.xz";
+      sha256 = "1gfh2akqxq4w9k8y4xpmafrn9q17c5xyc3f7vgl9r0h9jfrnndx8";
+      name = "kmouth-17.08.0.tar.xz";
     };
   };
   kmplot = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kmplot-17.04.3.tar.xz";
-      sha256 = "0v8v2bqarn34xahnprpyi66szaq0kjp16cqz90kk8d4ch4xnvhjv";
-      name = "kmplot-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kmplot-17.08.0.tar.xz";
+      sha256 = "1bvx0298n3aa39qsnlzxv431w2ayhkinin1sj1indpjzs3qia8li";
+      name = "kmplot-17.08.0.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/knavalbattle-17.04.3.tar.xz";
-      sha256 = "1qkpzd0fdnz6cdd308xsrk2g6s5lfpq8v5nl6rd6h6ksv599017n";
-      name = "knavalbattle-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/knavalbattle-17.08.0.tar.xz";
+      sha256 = "1v52g5jr201cyvjdhd70vsjrxa75j95d8ssy5pqfvzdb0251pxdi";
+      name = "knavalbattle-17.08.0.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/knetwalk-17.04.3.tar.xz";
-      sha256 = "16p7lxc4qzs4r2yjgshc8pcgpdi714rll6x0mzgsb0fdpdk3wrjg";
-      name = "knetwalk-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/knetwalk-17.08.0.tar.xz";
+      sha256 = "0aiasbf6ww9ccqsamvn2kljyjh4bzxccp5clysglhmliv1g6qx44";
+      name = "knetwalk-17.08.0.tar.xz";
     };
   };
   knotes = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/knotes-17.04.3.tar.xz";
-      sha256 = "0x6ymg6x3yiaz3gz9kaj88clw7ra0bbmyh230hi0s9v0x085slp3";
-      name = "knotes-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/knotes-17.08.0.tar.xz";
+      sha256 = "07cbhgxsf1qdayzxvwv6ihlz1jfq3nn0csf1qscx7qj1a2jypcv6";
+      name = "knotes-17.08.0.tar.xz";
     };
   };
   kolf = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kolf-17.04.3.tar.xz";
-      sha256 = "15l4pgidr6r4hh6q6c7gslh7027j1f5xxzwh5w76vlx3j0spzm7l";
-      name = "kolf-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kolf-17.08.0.tar.xz";
+      sha256 = "1y2dk5rfssnnl93wilmz3bkvk6jllyq3isy4aj6dp8v1qrisna0m";
+      name = "kolf-17.08.0.tar.xz";
     };
   };
   kollision = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kollision-17.04.3.tar.xz";
-      sha256 = "0wlwyayrcjrlgzvci3ih2as6dw38jm0j4s15c13ssr545r7mdd4m";
-      name = "kollision-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kollision-17.08.0.tar.xz";
+      sha256 = "1fqlxj4792g4k10pzfk53svvfp8kkaz126z7509qrwjngq8y4bji";
+      name = "kollision-17.08.0.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kolourpaint-17.04.3.tar.xz";
-      sha256 = "1xy95vmwajlzvmaqg02ywd8ar8j0ncv0qr5gm49qc57kxnylixhj";
-      name = "kolourpaint-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kolourpaint-17.08.0.tar.xz";
+      sha256 = "15xm9hf9b2bq4s66pbiqpjhshjfx7xf3gvk3cfc01xibly442xc9";
+      name = "kolourpaint-17.08.0.tar.xz";
     };
   };
   kompare = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kompare-17.04.3.tar.xz";
-      sha256 = "16wvfb337prnd9ncq1076hg3fz83lykpmaxmhznrjbiw8plc11n2";
-      name = "kompare-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kompare-17.08.0.tar.xz";
+      sha256 = "1rh71a152vnlhx7f5046ndlk4gb15p4jy7sqfrmnx1ssmi2vhs8g";
+      name = "kompare-17.08.0.tar.xz";
     };
   };
   konqueror = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/konqueror-17.04.3.tar.xz";
-      sha256 = "08dv4w507zm1qhzis543jamggpsl2rardcvkqanlrh24v83q9zl8";
-      name = "konqueror-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/konqueror-17.08.0.tar.xz";
+      sha256 = "1ir47i0g48rabjh86xy426imw682wr6kff9cwvbf7lgl6gqkpafw";
+      name = "konqueror-17.08.0.tar.xz";
     };
   };
   konquest = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/konquest-17.04.3.tar.xz";
-      sha256 = "0slnjkzlp0sk3sc5mjg27n918g4l4dsmz4ikz0cwbp46dbfz5y4c";
-      name = "konquest-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/konquest-17.08.0.tar.xz";
+      sha256 = "1b6bw8ga4wjaa7zw344y8cb3hiylpcq5m3mj96hasri6jyd1lwp8";
+      name = "konquest-17.08.0.tar.xz";
     };
   };
   konsole = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/konsole-17.04.3.tar.xz";
-      sha256 = "1dhjadpcfh4d7h3ll2sr387c3hgskx8as9p6rksjwkp05mkbgh79";
-      name = "konsole-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/konsole-17.08.0.tar.xz";
+      sha256 = "0il0hffq62plq7jdbq2a1y1djdb406639h2zz6jsmn6fbbrwxwh4";
+      name = "konsole-17.08.0.tar.xz";
     };
   };
   kontact = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kontact-17.04.3.tar.xz";
-      sha256 = "148b86fd192nfc8yp9x5h4wwv7cnlyci1y3fb0wfl85h96d8sa5n";
-      name = "kontact-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kontact-17.08.0.tar.xz";
+      sha256 = "0cs8sjq0dlhggly1kjcqsdsjxfg717mgjzg84ac64m2gdkk213sz";
+      name = "kontact-17.08.0.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kontactinterface-17.04.3.tar.xz";
-      sha256 = "0qlm7mfbhzbhfab0l9rfn5krnxlgbj9yny9bbn4isiyj8csjxmjy";
-      name = "kontactinterface-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kontactinterface-17.08.0.tar.xz";
+      sha256 = "01zz7zah35wfpqkmz46jxjljys4ngkh5m94ldirjg95pfrcxlsnc";
+      name = "kontactinterface-17.08.0.tar.xz";
     };
   };
   kopete = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kopete-17.04.3.tar.xz";
-      sha256 = "0gz47c9i9ziamh8295r407yamlwx3lqi6f2h9xrapsac8qm4cj7c";
-      name = "kopete-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kopete-17.08.0.tar.xz";
+      sha256 = "0f26ln78pxdj69rvsxpbzf8554hdwcij3z488pgv8j2h9j6pwgfd";
+      name = "kopete-17.08.0.tar.xz";
     };
   };
   korganizer = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/korganizer-17.04.3.tar.xz";
-      sha256 = "1z3vqlj1jhzvn9kq08hfpnw760yy8j4y82r151rb04c3k3x33mr7";
-      name = "korganizer-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/korganizer-17.08.0.tar.xz";
+      sha256 = "0mqzbjyxb8625m2m2js8pqj8m9k8q1ali46wj96prfk1y9abnp5i";
+      name = "korganizer-17.08.0.tar.xz";
     };
   };
   kpat = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kpat-17.04.3.tar.xz";
-      sha256 = "0j39nvb9nvgmg9lxw70q11vj1v08zy3dpbdrzx73v2grp7mvlc14";
-      name = "kpat-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kpat-17.08.0.tar.xz";
+      sha256 = "04phaqbbyys0zz7rqivifz620xmw32pvv2kkax3n37spsdiyaq5j";
+      name = "kpat-17.08.0.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kpimtextedit-17.04.3.tar.xz";
-      sha256 = "011y7f5aarznqs9ngbvi75h1z10avz1sp0286zmsi00g9733ap7h";
-      name = "kpimtextedit-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kpimtextedit-17.08.0.tar.xz";
+      sha256 = "01klpd4cqxq8cd0s32k9m44nly6w7ym41h385hw888xf356xsjpb";
+      name = "kpimtextedit-17.08.0.tar.xz";
     };
   };
   kppp = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kppp-17.04.3.tar.xz";
-      sha256 = "158zgjjlmnk2lh048c271ac9a1h70x0ihm77xr5bgnjg1yyp8lwj";
-      name = "kppp-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kppp-17.08.0.tar.xz";
+      sha256 = "1bzwsjw46vj36fwir0r6l26l1fr3mpj37g87wrg8zb3g9vz6ixnp";
+      name = "kppp-17.08.0.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kqtquickcharts-17.04.3.tar.xz";
-      sha256 = "1v7cllvz4bhkqnqfib723psvd053wvazvvniw1w6g69lv9a6kn88";
-      name = "kqtquickcharts-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kqtquickcharts-17.08.0.tar.xz";
+      sha256 = "1g487xniyv6yic2wyvd3rxn0rn95anrr4djf10nglvlxzcx3fnrc";
+      name = "kqtquickcharts-17.08.0.tar.xz";
     };
   };
   krdc = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/krdc-17.04.3.tar.xz";
-      sha256 = "0xi4s5w9wyrgcyqs4xixs8mcprnn3dp4p22fbgi8z8i25znd20d0";
-      name = "krdc-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/krdc-17.08.0.tar.xz";
+      sha256 = "0hsp05nns2ddvg4md6lwywh8c58vxzrb8r4d512mlcvprm8w6qb4";
+      name = "krdc-17.08.0.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kremotecontrol-17.04.3.tar.xz";
-      sha256 = "1m1yh4knmj5llrgv043j50azq5s7clfmlg8b86nasz78svbdhxwg";
-      name = "kremotecontrol-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kremotecontrol-17.08.0.tar.xz";
+      sha256 = "1vxb73zycw1d2spnkhv93ml1b1m8hw1g3lac77l1vq17g873ibg5";
+      name = "kremotecontrol-17.08.0.tar.xz";
     };
   };
   kreversi = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kreversi-17.04.3.tar.xz";
-      sha256 = "0splganr60x9nz59jj4ysl8dk867c54k68d3pc8ac2yxhgb7qg0i";
-      name = "kreversi-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kreversi-17.08.0.tar.xz";
+      sha256 = "1wi6s3rjqbc6269x856ri2a6iirnx1p9pizkqpq8yma7lpzl59ss";
+      name = "kreversi-17.08.0.tar.xz";
     };
   };
   krfb = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/krfb-17.04.3.tar.xz";
-      sha256 = "0yx19gf8mh6l5k4apfim48jw61hcllwb2nbk9d7k08nl635lxd7i";
-      name = "krfb-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/krfb-17.08.0.tar.xz";
+      sha256 = "0kyyl4zrrx4naj5nlczmc3fn0gbc7nrb42hm43hf4c0l5djsw4vj";
+      name = "krfb-17.08.0.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kross-interpreters-17.04.3.tar.xz";
-      sha256 = "1z7xnd4l1ksi0m4281pg9p0l2qv46acr1yijhrkg82va67y13r81";
-      name = "kross-interpreters-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kross-interpreters-17.08.0.tar.xz";
+      sha256 = "0k7p1c2lpknw0q45ahgld9pcxi5f3nsbl4hima10s6n3jf91d4v9";
+      name = "kross-interpreters-17.08.0.tar.xz";
     };
   };
   kruler = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kruler-17.04.3.tar.xz";
-      sha256 = "01pab2j5jpkqxmymhkkwlaw63idmbi9pdv0974ypg209lp51nw9i";
-      name = "kruler-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kruler-17.08.0.tar.xz";
+      sha256 = "0rfmn3wh1k8xigpk07mcj2xd0jq85jm81ymaka0pjm8ka98njbr6";
+      name = "kruler-17.08.0.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ksaneplugin-17.04.3.tar.xz";
-      sha256 = "0iyxzgxfvw8wk18bbhif5is8nj421rnf6hrm6jz8s1gzlamnmfkm";
-      name = "ksaneplugin-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ksaneplugin-17.08.0.tar.xz";
+      sha256 = "1dyifhfyzg7p8j8h45k8m4vkvrq7nbj07810j5r8hqcmbpbjw2m1";
+      name = "ksaneplugin-17.08.0.tar.xz";
     };
   };
   kscd = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kscd-17.04.3.tar.xz";
-      sha256 = "1c2w5kjm020930460iyq3q9jb1m3lz8cld4zmd2q7vr68ga31756";
-      name = "kscd-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kscd-17.08.0.tar.xz";
+      sha256 = "0bc6npz4s4fn2vzm3xpm0si06ql9k6a9gx9b1ghxn5y2dy3hjshy";
+      name = "kscd-17.08.0.tar.xz";
     };
   };
   kshisen = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kshisen-17.04.3.tar.xz";
-      sha256 = "14dswml5cgjr0q27gv7wgkl3mn3z2dvwa847k59s3mzpy7q45zyy";
-      name = "kshisen-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kshisen-17.08.0.tar.xz";
+      sha256 = "1b3q8fcm6pialqwljm2hwmk1k9fcwa77m55zxyb2wcyvgz9gpkjq";
+      name = "kshisen-17.08.0.tar.xz";
     };
   };
   ksirk = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ksirk-17.04.3.tar.xz";
-      sha256 = "16hibmv3697wzy62p51s5nkps942dav2wk7hllaykx3qzcr3dflf";
-      name = "ksirk-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ksirk-17.08.0.tar.xz";
+      sha256 = "1qcbr7lrj1zdbyb7agf2afnc39lvinam48yrzxbv0ry62l965c82";
+      name = "ksirk-17.08.0.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ksnakeduel-17.04.3.tar.xz";
-      sha256 = "08v2yr8n9px55c467wyji2lmiyl1d7m7qm5ll7vynxsdzz6g02wq";
-      name = "ksnakeduel-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ksnakeduel-17.08.0.tar.xz";
+      sha256 = "1vd9cspaxwxbs1lqbla292zwfyjj4giajx2n19m26x857xb6va0k";
+      name = "ksnakeduel-17.08.0.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kspaceduel-17.04.3.tar.xz";
-      sha256 = "0y5c4hbxyl7pi4fp2zkkjmzqy27mazyh4capjnyjckqy91n3cfwa";
-      name = "kspaceduel-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kspaceduel-17.08.0.tar.xz";
+      sha256 = "1y6nyyvig6y5s99bym21xyazxly0v7pdqygkwb3rq5152bf4xi78";
+      name = "kspaceduel-17.08.0.tar.xz";
     };
   };
   ksquares = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ksquares-17.04.3.tar.xz";
-      sha256 = "04531lg5xz9rk81l0xqvy8wlh1jmpgfc74i0drv4s712v0bvjixb";
-      name = "ksquares-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ksquares-17.08.0.tar.xz";
+      sha256 = "0fmx2zj5qrqyxg1yf2pbl2a4fq96rm088m7hmiq85ha7i1dd0wbw";
+      name = "ksquares-17.08.0.tar.xz";
     };
   };
   kstars = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kstars-17.04.3.tar.xz";
-      sha256 = "011ncpkly5x6js9vx5d8pnrd3z9iz3zqxivx7cibjbgmwrl80dn8";
-      name = "kstars-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kstars-17.08.0.tar.xz";
+      sha256 = "1k2rln20qw7rm7dxxyd3yrxbmpjhkpbqd0v82xfnqal6i3cx8xdb";
+      name = "kstars-17.08.0.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ksudoku-17.04.3.tar.xz";
-      sha256 = "0x54jmzjz01nlsxrn1hr6my54rb58v1qdibz03a8nl7pfndq6qhi";
-      name = "ksudoku-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ksudoku-17.08.0.tar.xz";
+      sha256 = "1lysfddiy12fxnwampy3djbkrabfqch4vsvxn6hclpii8a6sx5nr";
+      name = "ksudoku-17.08.0.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ksystemlog-17.04.3.tar.xz";
-      sha256 = "00g7cw2g2450x2m8wip62aajs2r6knw359s5lr5cl2llzasp297i";
-      name = "ksystemlog-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ksystemlog-17.08.0.tar.xz";
+      sha256 = "0n4387si8q8183rysmbdbyqs9d5x09qdrkd47g66bxn0w4qbwmkq";
+      name = "ksystemlog-17.08.0.tar.xz";
     };
   };
   kteatime = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kteatime-17.04.3.tar.xz";
-      sha256 = "1cm5bmb0n8b6pxq0zbdl01mhrzh50ccrywzn2zjscbsnasnbynxk";
-      name = "kteatime-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kteatime-17.08.0.tar.xz";
+      sha256 = "17jxrivkmrwnwrw641slm756lpqk5vg8chadn797b1w3ddr7vwl7";
+      name = "kteatime-17.08.0.tar.xz";
     };
   };
   ktimer = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktimer-17.04.3.tar.xz";
-      sha256 = "0s5xvm2fk0i5lyj2420c561xbf536508l1basv3dn12l9xixmbm4";
-      name = "ktimer-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktimer-17.08.0.tar.xz";
+      sha256 = "12aj0v1z3y797xs3bxqa3pd4z5k9bhjbpgp1v3kf87arpvrdb9q7";
+      name = "ktimer-17.08.0.tar.xz";
     };
   };
   ktnef = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktnef-17.04.3.tar.xz";
-      sha256 = "06gyfz2xil0p9y1442dcwj3ymi1py3wrdbgkccc9vy4zpmaqmk68";
-      name = "ktnef-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktnef-17.08.0.tar.xz";
+      sha256 = "1j4yaxmz8kcar2hmsd39l7l757ca16fdzlvhljhjpii4br2lp17s";
+      name = "ktnef-17.08.0.tar.xz";
     };
   };
   ktouch = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktouch-17.04.3.tar.xz";
-      sha256 = "0ms1cbmf21w0ypwkxi3flazkkx790kciblk1izwn3p6ywqdig0ih";
-      name = "ktouch-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktouch-17.08.0.tar.xz";
+      sha256 = "1g2kxdp0734yqz8044z7z1sgwyf0n7spql1r8vwzr6zisx6gy7pb";
+      name = "ktouch-17.08.0.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-accounts-kcm-17.04.3.tar.xz";
-      sha256 = "065gx0k28qialw41iqx3m25l1qppp77qssmhywb158pryy1v2clz";
-      name = "ktp-accounts-kcm-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-accounts-kcm-17.08.0.tar.xz";
+      sha256 = "11z8g0pcv04lh70qx4gb5226h7wm7g7bm7n14mpw8xbcnlh2sax8";
+      name = "ktp-accounts-kcm-17.08.0.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-approver-17.04.3.tar.xz";
-      sha256 = "11694778gg47fjq76rwxjibrcga7fqmnv88pmqvrb6hhskbnriav";
-      name = "ktp-approver-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-approver-17.08.0.tar.xz";
+      sha256 = "03v2mz29r3lzwwa5bis8sn8zjjr7vdpq2f39fzkyvb3vjnkb0kh8";
+      name = "ktp-approver-17.08.0.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-auth-handler-17.04.3.tar.xz";
-      sha256 = "0m3s8piyhi9r11pq202ky14drhm45gxvvvy30w2x57qz9k013c67";
-      name = "ktp-auth-handler-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-auth-handler-17.08.0.tar.xz";
+      sha256 = "1yj8cn4s0p1fdlcd1zn8ai2l1rfhzg2n3qny9s2q1jz1wnbhxj1z";
+      name = "ktp-auth-handler-17.08.0.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-call-ui-17.04.3.tar.xz";
-      sha256 = "16zz91kiyz1mnipl6sqxqrak6cfhcp195in45cvlpcm5pn7gn0x6";
-      name = "ktp-call-ui-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-call-ui-17.08.0.tar.xz";
+      sha256 = "1vddjzcq0qy25f8qqwhck2icl9v6arihlg63fdr4bz05cifhmip4";
+      name = "ktp-call-ui-17.08.0.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-common-internals-17.04.3.tar.xz";
-      sha256 = "12mwfd60f7iyb0f0y3yzscw38dygakhv9xlidwy4yxj6n7xylr0k";
-      name = "ktp-common-internals-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-common-internals-17.08.0.tar.xz";
+      sha256 = "1qw92sh1lhm3zmyj3jr4r1rhcnfbaipfnrr78bsfixdb784is7dk";
+      name = "ktp-common-internals-17.08.0.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-contact-list-17.04.3.tar.xz";
-      sha256 = "068m2nd969qrzsip4ks1zgcdardl4gzsdxm6jic04gxfhygrkllk";
-      name = "ktp-contact-list-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-contact-list-17.08.0.tar.xz";
+      sha256 = "162fzvs8x63091arc7c4njwzz1xn5bgzai0bh57va4fzqhzxs012";
+      name = "ktp-contact-list-17.08.0.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-contact-runner-17.04.3.tar.xz";
-      sha256 = "0qq1x1ip7vrjapq6aq8a7lbfcd6gn9cmal8g8247hilcjbmzlab2";
-      name = "ktp-contact-runner-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-contact-runner-17.08.0.tar.xz";
+      sha256 = "16j9ljcab4xmsjdbllr36a02s07w3xgpz0i4p0wzpwlfg42kb0nj";
+      name = "ktp-contact-runner-17.08.0.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-desktop-applets-17.04.3.tar.xz";
-      sha256 = "0jsza9vaz7vn108j9c49fyqwyy2v7yjrmn3kpxn9kd4jmz81z74s";
-      name = "ktp-desktop-applets-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-desktop-applets-17.08.0.tar.xz";
+      sha256 = "1n0f5a5lfb3zn8h9dvqm4c6gs39pvlnglr7lvcgqmabhvncwdxbp";
+      name = "ktp-desktop-applets-17.08.0.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-filetransfer-handler-17.04.3.tar.xz";
-      sha256 = "15bp0lrdingxz0sm9cxrjb3zhc1a56van2jl809v7703r3q6fliv";
-      name = "ktp-filetransfer-handler-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-filetransfer-handler-17.08.0.tar.xz";
+      sha256 = "1jprbcc3cnz1h9491bbmfxs6rbq6plpl7mrkfha7p3f1qn72w0h0";
+      name = "ktp-filetransfer-handler-17.08.0.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-kded-module-17.04.3.tar.xz";
-      sha256 = "14jksyvl41179fm53834finmmh7pg5lyhgalvaa88dch62f3s6r7";
-      name = "ktp-kded-module-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-kded-module-17.08.0.tar.xz";
+      sha256 = "1676s6w8wcwvbzgmg5vfw6i88smrzicgjbbg6q5k5hzp5xaxr8yk";
+      name = "ktp-kded-module-17.08.0.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-send-file-17.04.3.tar.xz";
-      sha256 = "10h7y12z4l05yblh4drngqzb77yijik28iilj619491w865kia90";
-      name = "ktp-send-file-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-send-file-17.08.0.tar.xz";
+      sha256 = "153v1yzhjxh1afkq5r7spp45f7lzj07x61ziv74ignpshm28a69l";
+      name = "ktp-send-file-17.08.0.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktp-text-ui-17.04.3.tar.xz";
-      sha256 = "1ggac4v9wiqdqihnp9ddfh20p7kli2yhikdkiv8wb2ia3836j6y1";
-      name = "ktp-text-ui-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktp-text-ui-17.08.0.tar.xz";
+      sha256 = "169lb6d07xra6v25wsdzmhbpj2lhbkjxdhvgyprwv3wlh7fyd6z2";
+      name = "ktp-text-ui-17.08.0.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/ktuberling-17.04.3.tar.xz";
-      sha256 = "0h66d6jhp9p47pb177hrjjkp0agwa4vzgjl53rib8lgv3ifyxq1d";
-      name = "ktuberling-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/ktuberling-17.08.0.tar.xz";
+      sha256 = "06iqdi5j7yywv4xfv6lciw8s80a1z41w0cw029l26r97yrm5qc3c";
+      name = "ktuberling-17.08.0.tar.xz";
     };
   };
   kturtle = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kturtle-17.04.3.tar.xz";
-      sha256 = "04sykc7bsvc20i0nq8h1w89gafz6cli9x1iphf0l6v8whvb7avmn";
-      name = "kturtle-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kturtle-17.08.0.tar.xz";
+      sha256 = "0ds7n7bpg4m5av48k9nqjaka94jddrxqxn61dn54c8yxx8zwka1j";
+      name = "kturtle-17.08.0.tar.xz";
     };
   };
   kubrick = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kubrick-17.04.3.tar.xz";
-      sha256 = "1zkjwsl7bsb170qac59psjkvdbqypfkp0s4snqvqw07jicbq75ss";
-      name = "kubrick-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kubrick-17.08.0.tar.xz";
+      sha256 = "1azzy536xwcpcf37hvkrvqg63l9jn67vsw1nxa68a7vh7pw104hi";
+      name = "kubrick-17.08.0.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kwalletmanager-17.04.3.tar.xz";
-      sha256 = "1wz27vg9h2g7q26ii1m358b3qdnra96zp3kwlz5yn5jkgv6500cr";
-      name = "kwalletmanager-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kwalletmanager-17.08.0.tar.xz";
+      sha256 = "03dam64smpw9fqpq4kqisn5kcwvwf2rl0x5jq1ws6pxdk72cn5wj";
+      name = "kwalletmanager-17.08.0.tar.xz";
     };
   };
   kwave = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kwave-17.04.3.tar.xz";
-      sha256 = "1mps4fq351fxqpsrv74hchn64qm5407jr9vlh169khvrcjbj72xn";
-      name = "kwave-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kwave-17.08.0.tar.xz";
+      sha256 = "0zqv5iqn3nzijvhlwx303dhjj0f9ha9fvg0infn9170vhcx2v2mn";
+      name = "kwave-17.08.0.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/kwordquiz-17.04.3.tar.xz";
-      sha256 = "0kacbsr56a063586vs4if4mcqp9fwics4344ha12zh2j2clr20h3";
-      name = "kwordquiz-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/kwordquiz-17.08.0.tar.xz";
+      sha256 = "0mxvx4br53grsp48mx1z5vf9awlrbj6s7yipz75mj1cskzq103pb";
+      name = "kwordquiz-17.08.0.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libgravatar-17.04.3.tar.xz";
-      sha256 = "0mdnvr7k67v2j9x5zwfsy2d3hw6j83npcv7546yqxfv6myb0ffvc";
-      name = "libgravatar-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libgravatar-17.08.0.tar.xz";
+      sha256 = "1wijd89xpg82p36f4c5y3lphdpgisj66408idar7x4wfsz6x9ypj";
+      name = "libgravatar-17.08.0.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkcddb-17.04.3.tar.xz";
-      sha256 = "01mmll75l2lv0djahfaikq5nc52z3k7zlc2hx3djw9xrhhvmd63k";
-      name = "libkcddb-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkcddb-17.08.0.tar.xz";
+      sha256 = "0cxhjf80kncmwl8gflf8mawghqz0bdwqb3sjipwy241p1irisyb4";
+      name = "libkcddb-17.08.0.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkcompactdisc-17.04.3.tar.xz";
-      sha256 = "0zr581qyf81v9sfh3qvhkjh0krzs35y0gpi4wp07df071hiddmvj";
-      name = "libkcompactdisc-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkcompactdisc-17.08.0.tar.xz";
+      sha256 = "16qa7mn9pxrghka56y4n3kg7i1wm9fp3njnpaczc5f8brl7fm8wk";
+      name = "libkcompactdisc-17.08.0.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkdcraw-17.04.3.tar.xz";
-      sha256 = "1w0zhz20vf2i55wywzf7ar5sp2paflbxjg3r35p6wpfrlafzvnjw";
-      name = "libkdcraw-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkdcraw-17.08.0.tar.xz";
+      sha256 = "0c76c055i2h4hwxp7xpnkpyn86mg8rs5z8wxzamc9yjynsym29k6";
+      name = "libkdcraw-17.08.0.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkdegames-17.04.3.tar.xz";
-      sha256 = "02j5kmbnxnmgf0vnmz6hzmkz5jc4aw2vm8gnjvs4l2hzcf7f82p8";
-      name = "libkdegames-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkdegames-17.08.0.tar.xz";
+      sha256 = "0zhfr0pq4vb7ax2wlspkczrfnqfs9w78r2l77777yhgha0mvs5hl";
+      name = "libkdegames-17.08.0.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkdepim-17.04.3.tar.xz";
-      sha256 = "0a0kxx99swyw31bf9npbfa5smavpar2qg593dvg1basdy102lpcv";
-      name = "libkdepim-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkdepim-17.08.0.tar.xz";
+      sha256 = "0xf1r07hzqwnjjwkbi0a61dpmpsa33a33ac41rlaknclpvmgakxl";
+      name = "libkdepim-17.08.0.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkeduvocdocument-17.04.3.tar.xz";
-      sha256 = "1z138s14cd7cfgv442i848m4w71f6442rjm8cghbd8m4kbd3m8yg";
-      name = "libkeduvocdocument-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkeduvocdocument-17.08.0.tar.xz";
+      sha256 = "1x779zxawd3zg341a5lph669afg8qnnbvrbblv9rd775bpygwkhj";
+      name = "libkeduvocdocument-17.08.0.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkexiv2-17.04.3.tar.xz";
-      sha256 = "035akzr9f7f9k86j1ihx9ql574vjfm3ai792k8h46xh9d7xn385q";
-      name = "libkexiv2-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkexiv2-17.08.0.tar.xz";
+      sha256 = "02i1nm4ggj72kgk8j0qkgqrc5kh4dg4qa62bp8q5lgi27fxijhxy";
+      name = "libkexiv2-17.08.0.tar.xz";
     };
   };
   libkface = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkface-17.04.3.tar.xz";
-      sha256 = "081ghj31f39xxq692ad5a32w8kaks7xyl3xmcmgl0sp7yac102ar";
-      name = "libkface-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkface-17.08.0.tar.xz";
+      sha256 = "08k7ci77lry0z5178w5fm0rf0rvsvfcdlhs70xg3iwzbhha3crz7";
+      name = "libkface-17.08.0.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkgapi-17.04.3.tar.xz";
-      sha256 = "1j6lg6mdd7bhapdkfpicksbd9y9b4qh0f9m3k3yddx318n49nl8r";
-      name = "libkgapi-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkgapi-17.08.0.tar.xz";
+      sha256 = "1i0z16x77wmxk11w75kp1j6w6v00kr9knpryg7n3gpp4kbpnkj8c";
+      name = "libkgapi-17.08.0.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkgeomap-17.04.3.tar.xz";
-      sha256 = "1zc4ja631f54xk1mycda1h4c3wdhq9ggn67xn68jrlv4wrsm3ly1";
-      name = "libkgeomap-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkgeomap-17.08.0.tar.xz";
+      sha256 = "02njkvk9qvd6zycfa1s85mlc66jal5icg23dbh5vliiwq3xqlyix";
+      name = "libkgeomap-17.08.0.tar.xz";
     };
   };
   libkipi = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkipi-17.04.3.tar.xz";
-      sha256 = "1qf1qpq1q65fk96c6rvq4avlbqnfa7cr58fkcv8c620j7fkhh3iv";
-      name = "libkipi-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkipi-17.08.0.tar.xz";
+      sha256 = "0z1vllhfimwp7dgf2hfxwhpvfg0j6kg6n7m166ji7nalb8p5avd4";
+      name = "libkipi-17.08.0.tar.xz";
     };
   };
   libkleo = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkleo-17.04.3.tar.xz";
-      sha256 = "1jk0qlsx6k77vg85xp1fjvz3b2h6f08zmwgjfh24gz9jacdps2bq";
-      name = "libkleo-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkleo-17.08.0.tar.xz";
+      sha256 = "0i747aq06yzl8rzznyrgwyypff4g5fdmdc1k5v63z99yf8rb0zqg";
+      name = "libkleo-17.08.0.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkmahjongg-17.04.3.tar.xz";
-      sha256 = "1bwgrvzzwqd1zp9qskss8l20ihxd8z7mn4ap7xr2snr7m6bzandx";
-      name = "libkmahjongg-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkmahjongg-17.08.0.tar.xz";
+      sha256 = "0cya2gnqr8cjgw2abpnwvyqa243zjdr89h1dwvjyag8s0aw595af";
+      name = "libkmahjongg-17.08.0.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libkomparediff2-17.04.3.tar.xz";
-      sha256 = "0jfhvp1dxbrblaqizflbs2c2r5ar1nd41rzhnrm4iwgafnpsa9av";
-      name = "libkomparediff2-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libkomparediff2-17.08.0.tar.xz";
+      sha256 = "0nrd6a5agvgmqcx5bvx11s4zal9ln6q6awavbyr5m1hvccch2k1r";
+      name = "libkomparediff2-17.08.0.tar.xz";
     };
   };
   libksane = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libksane-17.04.3.tar.xz";
-      sha256 = "0wvqdbi7a2ji2fhvxqn5iyab8qwq9ycb5lngj1wlyzp96c3lyz40";
-      name = "libksane-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libksane-17.08.0.tar.xz";
+      sha256 = "18s3d3m0ylbrrbf4vivc29lms9yz6ppkdb247kbmxxnwvzk867bl";
+      name = "libksane-17.08.0.tar.xz";
     };
   };
   libksieve = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/libksieve-17.04.3.tar.xz";
-      sha256 = "107bcfb3nvlwxhcwqdy90yki69xz2r7ipisb0dasxc70yvlkax83";
-      name = "libksieve-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/libksieve-17.08.0.tar.xz";
+      sha256 = "10864y6d473y93ikkw0kiz7rl85x2whb5c4ifl24w5njri3szl89";
+      name = "libksieve-17.08.0.tar.xz";
     };
   };
   lokalize = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/lokalize-17.04.3.tar.xz";
-      sha256 = "0v9q0xs6vgwxk6cpirpv41y49r7c74fwlqvrr23m70252781gx7a";
-      name = "lokalize-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/lokalize-17.08.0.tar.xz";
+      sha256 = "0aps3s5gbja1fngndfwbi21wg7kr8pr3l48hx5n4hgcpa4rxbf0n";
+      name = "lokalize-17.08.0.tar.xz";
     };
   };
   lskat = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/lskat-17.04.3.tar.xz";
-      sha256 = "1bzrfb51aq0ir0kjsmzfvdfvjsj81xrn3sv6vsp0wmq1510dz0qq";
-      name = "lskat-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/lskat-17.08.0.tar.xz";
+      sha256 = "0xwbyfjlkfxccnmi4kmvrar1jds7976j1m2s8sd69knfccj43n6a";
+      name = "lskat-17.08.0.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/mailcommon-17.04.3.tar.xz";
-      sha256 = "1zyjcdn2x70304l2gyijwyv5p1p3wqvvlx9b6aj2xmhm0yvsfibk";
-      name = "mailcommon-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/mailcommon-17.08.0.tar.xz";
+      sha256 = "1laqipa3mqyxzbx3xkg5jm6ah74a68fgyb37hjw52mkbf6jzqpsx";
+      name = "mailcommon-17.08.0.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/mailimporter-17.04.3.tar.xz";
-      sha256 = "0f5nipzfz505c3bibsw6v4qnqd7bkv4fy61dyapka0dy0sxlmgdk";
-      name = "mailimporter-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/mailimporter-17.08.0.tar.xz";
+      sha256 = "11677y558xy0rdn5g63cpjl3nz1w5x38dfr0ky0nsylary9diwwn";
+      name = "mailimporter-17.08.0.tar.xz";
     };
   };
   marble = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/marble-17.04.3.tar.xz";
-      sha256 = "0mlhngwscikcayi71kdsd6wbz2nj6gpzcib2gax32lnjdhx3zml3";
-      name = "marble-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/marble-17.08.0.tar.xz";
+      sha256 = "1qi4fiagxp2734myd2grg38sf9bdbfys46rhmn0jp8p39dqic4di";
+      name = "marble-17.08.0.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/mbox-importer-17.04.3.tar.xz";
-      sha256 = "03mah1djrmks8zvqhzds9r6gx4z6z9ngqc0ki4524pf1yshg4bic";
-      name = "mbox-importer-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/mbox-importer-17.08.0.tar.xz";
+      sha256 = "15iipvs5szfjnl1r0gfx30wr4rq1l5a74wywy8lm73ma9hgb0fpc";
+      name = "mbox-importer-17.08.0.tar.xz";
     };
   };
   messagelib = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/messagelib-17.04.3.tar.xz";
-      sha256 = "15jvx0f4dmkl7sp8qpijisamqvvz70x3xfk3q7n0cr81pdbc5s2k";
-      name = "messagelib-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/messagelib-17.08.0.tar.xz";
+      sha256 = "0qik1a4rka6qj28jdmdh5rk7m3p3gh27i0jcg9nxijrg7wz1hx98";
+      name = "messagelib-17.08.0.tar.xz";
     };
   };
   minuet = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/minuet-17.04.3.tar.xz";
-      sha256 = "16x4rbckwbiv77wvqyd60p34lds9pm5zhllzhzhlllz21m041z2p";
-      name = "minuet-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/minuet-17.08.0.tar.xz";
+      sha256 = "1f9pd9wzai2sqs87m70ywgqsn9azr2xnpaj2msii7cl2mn6km6wb";
+      name = "minuet-17.08.0.tar.xz";
     };
   };
   okteta = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/okteta-17.04.3.tar.xz";
-      sha256 = "01x9rp2h5ca85rriw8hz5qcmv4xm9isxvm8yc8b806kd08kwmhrv";
-      name = "okteta-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/okteta-17.08.0.tar.xz";
+      sha256 = "1f3041vn9p24avkj7svz9mb9sr5s5p16jvh9m7417svy307g1hii";
+      name = "okteta-17.08.0.tar.xz";
     };
   };
   okular = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/okular-17.04.3.tar.xz";
-      sha256 = "0c05ma4yi6yhibxqfl26y32792cv21kvxdxs2yxbhm1xy3b397iv";
-      name = "okular-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/okular-17.08.0.tar.xz";
+      sha256 = "0fghjj149ji6p1hi7zlzfmgsp7zrwyhz3989ff2an9yx5qvmwayg";
+      name = "okular-17.08.0.tar.xz";
     };
   };
   palapeli = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/palapeli-17.04.3.tar.xz";
-      sha256 = "1ixp23cp5qsil4dhvkq9q0d6cl3qyh6jard1zrd6qv3cz3586jsc";
-      name = "palapeli-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/palapeli-17.08.0.tar.xz";
+      sha256 = "1gv4hfjj9b7bgfsvpmdydvb8pmbqwvm2s0f0ip8mjxnfcayig4xn";
+      name = "palapeli-17.08.0.tar.xz";
     };
   };
   parley = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/parley-17.04.3.tar.xz";
-      sha256 = "1i4l18c5vndx6i3f4l6yyhgr4bmnvfwiqgjj01bicxzawnknv75m";
-      name = "parley-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/parley-17.08.0.tar.xz";
+      sha256 = "1qx10l0h4099w6xl5jnlp259glq0whqjsxl4b4a6kj4ddz55ysyr";
+      name = "parley-17.08.0.tar.xz";
     };
   };
   picmi = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/picmi-17.04.3.tar.xz";
-      sha256 = "0n1wrbscjdqs4cks9igxdhqh583ksdqsi339cnlqdnazcpjrb96n";
-      name = "picmi-17.04.3.tar.xz";
-    };
-  };
-  pimcommon = {
-    version = "17.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/pimcommon-17.04.3.tar.xz";
-      sha256 = "02wzindfacgj3f7a71h7wqa0jk0096xidw9bwdb5nvjnaigxxnx3";
-      name = "pimcommon-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/picmi-17.08.0.tar.xz";
+      sha256 = "03cl8hbxa5kfb9ji24x2svp2ids0jwyam847zncrdkg72gjmnjlb";
+      name = "picmi-17.08.0.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/pim-data-exporter-17.04.3.tar.xz";
-      sha256 = "1q4vjynfbwrdn9j7ggxfsrilzb3g5s1yqr51siiw17jr11xca3cb";
-      name = "pim-data-exporter-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/pim-data-exporter-17.08.0.tar.xz";
+      sha256 = "01n9m8ssyla5rz9cg61fv0rhl4gz02488cghak7idb18an36lfak";
+      name = "pim-data-exporter-17.08.0.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/pim-sieve-editor-17.04.3.tar.xz";
-      sha256 = "1dfksp7ric5na75i6hyj4q2sgzz7zdc9a0izpzhwzqbx86m56zd8";
-      name = "pim-sieve-editor-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/pim-sieve-editor-17.08.0.tar.xz";
+      sha256 = "0i3ry6hrdiz3wdjqw1b6mqrya3jxphrv9lx1px8grp0gs8ci0gc4";
+      name = "pim-sieve-editor-17.08.0.tar.xz";
+    };
+  };
+  pimcommon = {
+    version = "17.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.08.0/src/pimcommon-17.08.0.tar.xz";
+      sha256 = "0vv3fxf6d9vx75gxn2lwmv43ifman5av9xxy17yzxsmvjpvf2mmv";
+      name = "pimcommon-17.08.0.tar.xz";
     };
   };
   poxml = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/poxml-17.04.3.tar.xz";
-      sha256 = "18rpy9l1blmgzjhl0pw3gjfngzjylwkqiwzilb2pdijs1121sjhv";
-      name = "poxml-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/poxml-17.08.0.tar.xz";
+      sha256 = "1a68lddadm3iar64q4zfi4f0mp97zagfnfs3i1czdyq83hqp1c3x";
+      name = "poxml-17.08.0.tar.xz";
     };
   };
   print-manager = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/print-manager-17.04.3.tar.xz";
-      sha256 = "0w51wkh2rlbwsna4amfiav0pi89si5cx8g0krfr12hiji05w4van";
-      name = "print-manager-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/print-manager-17.08.0.tar.xz";
+      sha256 = "0cj8ijzl3xsxyrkcpigscqj84mza5lzwsaal586zqf1z2p8pabcx";
+      name = "print-manager-17.08.0.tar.xz";
     };
   };
   rocs = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/rocs-17.04.3.tar.xz";
-      sha256 = "078451k2vx4pryxs93hry41jd6w6i8nd9lifwivgs8nrrbk4pf5b";
-      name = "rocs-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/rocs-17.08.0.tar.xz";
+      sha256 = "0cjz0n4bk21c6csqhr937dfyzhn8i8viy7h94pr3813vfwffd0mn";
+      name = "rocs-17.08.0.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/signon-kwallet-extension-17.04.3.tar.xz";
-      sha256 = "0ahfzsr7xpnps14fwajc2fvgxd6jh18w9da40hc47pm5n8wwwbb0";
-      name = "signon-kwallet-extension-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/signon-kwallet-extension-17.08.0.tar.xz";
+      sha256 = "0nzgjrr8hgc2pmiwx3cdp9pcgw25hvr0y7mkjllyh2cigcnbw6dg";
+      name = "signon-kwallet-extension-17.08.0.tar.xz";
     };
   };
   spectacle = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/spectacle-17.04.3.tar.xz";
-      sha256 = "0xjclcvi5fq3aq0dz34cf4w6yvi9bjr3mwc0ywqfliw0j35r4iqv";
-      name = "spectacle-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/spectacle-17.08.0.tar.xz";
+      sha256 = "1lmh53rhgbkg81xxk1dhcsxwh7shzlxvfqfs3zflq88ghm53fnzf";
+      name = "spectacle-17.08.0.tar.xz";
     };
   };
   step = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/step-17.04.3.tar.xz";
-      sha256 = "111pqn908khirr66d9l4va2blcm2zcksb3w11lvwz7dfidag0bks";
-      name = "step-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/step-17.08.0.tar.xz";
+      sha256 = "0rqj6idzdlkljvfx6jwjlwc6ibpqmmb9w7fi4cax2h89s9fc4fqy";
+      name = "step-17.08.0.tar.xz";
     };
   };
   svgpart = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/svgpart-17.04.3.tar.xz";
-      sha256 = "101kll7q53qwhgjll4vrqdapag9bc5nwqnq14gxbmmyknpjpgxqh";
-      name = "svgpart-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/svgpart-17.08.0.tar.xz";
+      sha256 = "0gqzhm6shsirkb2h933n5slhm5kwhvjrszqbdlpm7a28643r0jgq";
+      name = "svgpart-17.08.0.tar.xz";
     };
   };
   sweeper = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/sweeper-17.04.3.tar.xz";
-      sha256 = "1ai6bhfq7g80y7w3jaqzhlq8z3krmpjjg9ap1p358485d6ja9i0k";
-      name = "sweeper-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/sweeper-17.08.0.tar.xz";
+      sha256 = "0hxkf65jdy5qirrycr55v3v0d63x4bh3hd49wjvbh0qx4sbkazhs";
+      name = "sweeper-17.08.0.tar.xz";
     };
   };
   syndication = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/syndication-17.04.3.tar.xz";
-      sha256 = "1d3nfzz2f0n31ivzrhld5gi1bk486i5dpp0v0b1wlnacm8z0ddy5";
-      name = "syndication-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/syndication-17.08.0.tar.xz";
+      sha256 = "0z5jpygkphmq2xvmnnj8nyagcx320ngnjjqphwfymp14y8yp8cla";
+      name = "syndication-17.08.0.tar.xz";
     };
   };
   umbrello = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/umbrello-17.04.3.tar.xz";
-      sha256 = "1v1694j5crffmy12qij1hrikrsn2irasjra11jcc4rx2klfhv2bs";
-      name = "umbrello-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/umbrello-17.08.0.tar.xz";
+      sha256 = "09dnmafzqbhjymqpb8lcspaqwkprma11r4l0dhlqfmlzwbdhp9vg";
+      name = "umbrello-17.08.0.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.04.3";
+    version = "17.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.3/src/zeroconf-ioslave-17.04.3.tar.xz";
-      sha256 = "04k2mc2kl3raiirpfq150zdxb4w86cg5m70xcw711qddw1fv0g3y";
-      name = "zeroconf-ioslave-17.04.3.tar.xz";
+      url = "${mirror}/stable/applications/17.08.0/src/zeroconf-ioslave-17.08.0.tar.xz";
+      sha256 = "16zw9gsd89qaadhlii5c5wjfd75c1jf9ivg55fmmfsqc5nqzjf4b";
+      name = "zeroconf-ioslave-17.08.0.tar.xz";
     };
   };
 }

From f23b1c4c4a7b974decf1456884634e9141e573c0 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sat, 19 Aug 2017 10:42:36 +0200
Subject: [PATCH 2439/3246] latte-dock: add missing build inputs

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

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 1b2cf94d173..e013754e097 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,4 +1,5 @@
-{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub }:
+{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub
+, extra-cmake-modules, karchive, kwindowsystem, qtx11extras }:
 
 let version = "0.6.0"; in
 
@@ -14,7 +15,8 @@ mkDerivation {
 
   buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem
+    qtx11extras ];
 
   meta = with lib; {
     description = "Dock-style app launcher based on Plasma frameworks";

From 161118af025d27bab97eab6bfbcf40853b2d6609 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 20 Aug 2017 01:12:32 +0200
Subject: [PATCH 2440/3246] lxqt-runner: add missing dependency

---
 pkgs/desktops/lxqt/core/lxqt-runner/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
index 550025f8e87..8e2332dad5c 100644
--- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys,
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, qtx11extras,
 menu-cache, muparser }:
 
 stdenv.mkDerivation rec {
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     qtbase
     qttools
     qtsvg
+    qtx11extras
     kwindowsystem
     liblxqt
     libqtxdg

From ca9056717427253098c353f2870f8816a24295df Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 20 Aug 2017 01:12:47 +0200
Subject: [PATCH 2441/3246] lxqt-notificationd: add missing dependency

---
 pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
index cb10df5a1b7..8aea9a6458b 100644
--- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, qtx11extras }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     liblxqt
     libqtxdg
     lxqt-common
+    qtx11extras
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

From dd557788be837cd617b3c62aa6ab9c95212e6d85 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Mon, 21 Aug 2017 22:01:46 +0200
Subject: [PATCH 2442/3246] mailman: 2.1.23 -> 2.1.24

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

diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index cc586dbbb92..d64e41f3007 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, python, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "mailman-2.1.23";
+  name = "mailman-${version}";
+  version = "2.1.24";
 
   src = fetchurl {
     url = "mirror://gnu/mailman/${name}.tgz";
-    sha256 = "0s9ywix4m3n7qa0baws744ildg48hsa87jahpsfiqqilhmpwl8mh";
+    sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7";
   };
 
   buildInputs = [ python pythonPackages.dns ];

From 6922a48fe13e7a79ff684cc89d5e0766062100de Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Mon, 21 Aug 2017 22:49:10 +0200
Subject: [PATCH 2443/3246] tectonic: init at 0.1.6

---
 pkgs/tools/typesetting/tectonic/default.nix | 33 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/typesetting/tectonic/default.nix

diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
new file mode 100644
index 00000000000..f6c3be63e03
--- /dev/null
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper
+, fontconfig, harfbuzz-icu, openssl, pkgconfig }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "tectonic-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "tectonic-typesetting";
+    repo = "tectonic";
+    rev = "v${version}";
+    sha256 = "0k5vkn112bjwh4wnxryzqz79dlja64k7s105mf3yaik136hqnmqv";
+  };
+
+  depsSha256 = "1vxvkh1v9x6j4ggbh6sysi5i3089hrs0mjbp910a1jljiav7l8nj";
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ fontconfig harfbuzz-icu openssl ];
+
+  # tests fail due to read-only nix store
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive";
+    homepage = https://tectonic-typesetting.github.io/;
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.lluchs ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11dabac2ea7..8c4b5f472ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10393,6 +10393,8 @@ with pkgs;
 
   tecla = callPackage ../development/libraries/tecla { };
 
+  tectonic = callPackage ../tools/typesetting/tectonic { };
+
   telepathy_glib = callPackage ../development/libraries/telepathy/glib { };
 
   telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {};

From 267efdc4750df6c6dbfaad9299b83f3d8f255669 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 20:34:03 +0200
Subject: [PATCH 2444/3246] valgrind: 3.12.0 -> 3.13.0

fetching from sourceware, as linked on http://valgrind.org/downloads/
---
 pkgs/development/tools/analysis/valgrind/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 80e3fdfc807..21dba34e884 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
 
 stdenv.mkDerivation rec {
-  name = "valgrind-3.12.0";
+  name = "valgrind-3.13.0";
 
   src = fetchurl {
-    url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "18bnrw9b1d55wi1wnl68n25achsp9w48n51n1xw4fwjjnaal7jk7";
+    url = "https://sourceware.org/pub/valgrind/${name}.tar.bz2";
+    sha256 = "0fqc3684grrbxwsic1rc5ryxzxmigzjx9p5vf3lxa37h0gpq0rnp";
   };
 
   outputs = [ "out" "dev" "man" "doc" ];

From c860c02deff91beefa6f96e48939b517542c6c85 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 19:55:42 +0200
Subject: [PATCH 2445/3246] tcpdump: 4.9.0 -> 4.9.1

- fetch from GitHub instead of debian mirror
---
 pkgs/tools/networking/tcpdump/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index a7130a3891b..77e74569ee5 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchurl, libpcap, enableStatic ? false
+{ stdenv, fetchFromGitHub, libpcap, enableStatic ? false
 , hostPlatform
 }:
 
 stdenv.mkDerivation rec {
   name = "tcpdump-${version}";
-  version = "4.9.0";
+  version = "4.9.1";
 
-  src = fetchurl {
-    #url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    url = "mirror://debian/pool/main/t/tcpdump/tcpdump_${version}.orig.tar.gz";
-    sha256 = "0pjsxsy8l71i813sa934cwf1ryp9xbr7nxwsvnzavjdirchq3sga";
+  src = fetchFromGitHub rec {
+    owner = "the-tcpdump-group";
+    repo = "tcpdump";
+    rev = "${repo}-${version}";
+    sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p";
   };
 
   buildInputs = [ libpcap ];

From f21a5c2f57131b77ba6174768d8664f3cc80fe75 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 18:50:47 +0200
Subject: [PATCH 2446/3246] qjson: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 6ab134a0306..29202396c05 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.1";
+  version = "0.9.0";
   name = "qjson-${version}";
 
   src = fetchFromGitHub {
     owner = "flavio";
     repo = "qjson";
     rev = "${version}";
-    sha256 = "1rb3ydrhyd4bczqzfv0kqpi2mx4hlpq1k8jvnwpcmvyaypqpqg59";
+    sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs";
   };
 
   buildInputs = [ cmake qt4 ];

From 50736110821fc671fbc322d322419387f23073b1 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 18:14:14 +0200
Subject: [PATCH 2447/3246] rmlint: 2.4.4 -> 2.6.1

- version bump: 2.4.4 -> 2.6.1
- fetchurl -> fetchFromGitHub
- hompage: http -> https
---
 pkgs/tools/misc/rmlint/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index e962bcb0155..e321670068c 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl
-, gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }:
+{ stdenv, fetchFromGitHub,
+  gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rmlint-${version}";
-  version = "2.4.4";
+  version = "2.6.1";
 
-  src = fetchurl {
-    url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
-    sha256 = "1g38wmf58m9lbdngfsbz3dbkd44yqxppzvgi5mwag0w7r7khhir9";
+  src = fetchFromGitHub {
+    owner = "sahib";
+    repo = "rmlint";
+    rev = "v${version}";
+    sha256 = "1j09qk3zypw4my713q9g36kq37ggqd5v9vrs3h821p6p3qmmkdn8";
   };
 
   configurePhase = "scons config";
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Extremely fast tool to remove duplicates and other lint from your filesystem";
-    homepage = http://rmlint.readthedocs.org;
+    homepage = https://rmlint.readthedocs.org;
     platforms = platforms.linux;
     license = licenses.gpl3;
     maintainers = [ maintainers.koral ];

From 221f5f00e30870dc4f1ea06e78b5e27b30ec9b16 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 17:49:14 +0200
Subject: [PATCH 2448/3246] rawdog: 2.21 -> 2.22, http -> https

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

diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 41f578759df..72a98a99604 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "rawdog-${version}";
-  version = "2.21";
+  version = "2.22";
 
   src = fetchurl {
-    url = "http://offog.org/files/${name}.tar.gz";
-    sha256 = "0f5z7b70pyhjl6s28hgxninsr86s4dj5ycd50sv6bfz4hm1c2030";
+    url = "https://offog.org/files/${name}.tar.gz";
+    sha256 = "01ircwl80xi5lamamsb22i7vmsh2ysq3chn9mbsdhqic2i32hcz0";
   };
 
   propagatedBuildInputs = with python2Packages; [ feedparser ];
@@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
   namePrefix = "";
 
   meta = with stdenv.lib; {
-    homepage = http://offog.org/code/rawdog/;
+    homepage = https://offog.org/code/rawdog/;
     description = "RSS Aggregator Without Delusions Of Grandeur";
     license = licenses.gpl2;
     platforms = platforms.unix;

From 706d45e4111073132a32e21f020c057a61527c5d Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Mon, 21 Aug 2017 13:43:59 -0800
Subject: [PATCH 2449/3246] zanshin: 0.3.1 -> 0.4.1

zanshin: 0.3.1 -> 0.4.1
---
 pkgs/applications/office/zanshin/default.nix | 46 +++++++++++++++-----
 pkgs/top-level/all-packages.nix              |  5 ++-
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 0cf85840db6..021e7f87eee 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -1,21 +1,45 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs4, kdepimlibs, boost, baloo }:
+{
+  stdenv,
+  fetchurl, fetchpatch,
+  extra-cmake-modules,
+  qtbase, boost,
+  akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap,
+  krunner, kwallet
+}:
 
 stdenv.mkDerivation rec {
-  name = "zanshin-0.3.1";
+  pname = "zanshin";
+  version = "0.4.1";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://files.kde.org/zanshin/${name}.tar.bz2";
-    sha256 = "1ck2ncz8i816d6d1gcsdrh6agd2zri24swgz3bhn8vzbk4215yzl";
+    url = "https://files.kde.org/${pname}/${name}.tar.bz2";
+    sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as";
   };
 
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+  patches = [
+    (fetchpatch {
+      name = "zanshin-fix-qt59-build.patch";
+      url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1";
+      sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x";
+    })
+  ];
 
-  buildInputs = [ kdelibs4 kdepimlibs boost baloo ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
 
-  meta = {
-    description = "GTD for KDE";
-    maintainers = [ ];
-    inherit (kdelibs4.meta) platforms;
+  buildInputs = [
+    qtbase boost
+    akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap
+    krunner kwallet
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A powerful yet simple application to manage your day to day actions, getting your mind like water";
+    homepage = https://zanshin.kde.org/;
+    maintainers = with maintainers; [ zraexy ];
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11dabac2ea7..246d8c43674 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17000,7 +17000,10 @@ with pkgs;
 
   zam-plugins = callPackage ../applications/audio/zam-plugins { };
 
-  zanshin = kde4.callPackage ../applications/office/zanshin { };
+  zanshin = libsForQt5.callPackage ../applications/office/zanshin {
+    inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap;
+    inherit (kdeFrameworks) krunner kwallet;
+  };
 
   zathura = callPackage ../applications/misc/zathura {
     useMupdf = config.zathura.useMupdf or true;

From 830d8b3b8fd507a5ec6610b476d2c5f7e0c8c3ea Mon Sep 17 00:00:00 2001
From: Sean Parsons <seanparsons@users.noreply.github.com>
Date: Mon, 21 Aug 2017 23:12:28 +0100
Subject: [PATCH 2450/3246] renoise: 3.0.1 -> 3.1.0 (#28380)

Replaced demo parameter with releasePath parameter.
---
 pkgs/applications/audio/renoise/default.nix | 37 ++++++++++-----------
 pkgs/top-level/all-packages.nix             |  4 +--
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 91e8f1be6ec..d02c551be8a 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -1,36 +1,35 @@
-{ stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }:
+{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }:
 
+# To use the full release version:
+# 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version
+#    for your machine to some stable location.
+# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
+# Note: Renoise creates an individual build for each license which screws somewhat with the
+# use of functions like requireFile as the hash will be different for every user.
+let fileversion = "3_1_0";
+in
 stdenv.mkDerivation rec {
   name = "renoise";
-
   buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
 
   src =
     if stdenv.system == "x86_64-linux" then
-        if demo then
+        if builtins.isNull releasePath then
         fetchurl {
-            url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2";
-            sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg";
+            url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2";
+            sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
         }
         else
-        requireFile {
-            url = "http://backstage.renoise.com/frontend/app/index.html#/login";
-            name = "rns_3_0_1_linux_x86_64.tar.gz";
-            sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd";
-        }
+        releasePath
     else if stdenv.system == "i686-linux" then
-        if demo then
+        if builtins.isNull releasePath then
         fetchurl {
-            url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2";
-            sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58";
+            url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2";
+            sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
         }
         else
-        requireFile {
-            url = "http://backstage.renoise.com/frontend/app/index.html#/login";
-            name = "rns_3_0_1_reg_x86.tar.gz";
-            sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7";
-        }
-    else throw "platform is not suppored by Renoise";
+        releasePath
+    else throw "Platform is not supported by Renoise";
 
   installPhase = ''
     cp -r Resources $out
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11dabac2ea7..61955eacccf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15823,9 +15823,7 @@ with pkgs;
     rancher-compose
     rancher-compose_0_10;
 
-  renoise = callPackage ../applications/audio/renoise {
-    demo = false;
-  };
+  renoise = callPackage ../applications/audio/renoise {};
 
   rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; };
 

From 4e026c7b94a27701f582db2d99f4c9f47b4cec8c Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 24 Jul 2017 13:38:07 +0200
Subject: [PATCH 2451/3246] pinentry: fix keyboard/pointer grabbing bugs

use debian patches to get the gtk2 version to work with various tiling
window managers

Related reports:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850708
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=851707
https://github.com/ch11ng/exwm/issues/263
https://github.com/ch11ng/exwm/issues/279
---
 pkgs/tools/security/pinentry/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 67b0b8aa2e2..667831373c5 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig
+{ fetchurl, fetchpatch, stdenv, lib, pkgconfig
 , libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null
 }:
 
@@ -23,6 +23,15 @@ stdenv.mkDerivation rec {
     substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses
   '';
 
+  patches = lib.optionals (gtk2 != null) [
+    (fetchpatch {
+       url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0006-gtk2-Fix-a-problem-with-fvwm.patch;
+       sha256 = "1w3y4brqp74hy3fbfxqnqp6jf985bd6667ivy1crz50r3z9zsy09";
+  })(fetchpatch {
+       url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch;
+       sha256 = "046jy7k0n7fj74s5w1h6sq1ljg8y77i0xwi301kv53bhsp0xsirx";
+  })];
+
   # configure cannot find moc on its own
   preConfigure = stdenv.lib.optionalString (qt4 != null) ''
     export QTDIR="${qt4}"

From 0ab717d5478dd608fe4e167016451e73d25d5469 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 22 Aug 2017 00:27:10 +0200
Subject: [PATCH 2452/3246] darwin: fix tarball evaluation

---
 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 61955eacccf..84a2398b43b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11775,7 +11775,7 @@ with pkgs;
 
   darwin = let
     apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
-  in recurseIntoAttrs (apple-source-releases // rec {
+  in (apple-source-releases // rec {
     cctools = callPackage ../os-specific/darwin/cctools/port.nix {
       inherit libobjc;
       stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;

From c03571107213331494fb5330fd2bb4129d19cdbc Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 21 Aug 2017 18:26:08 -0400
Subject: [PATCH 2453/3246] cc-wrapper: Remove unused params

Ensured hashes unchanged and eval succeeds in tarball job
---
 pkgs/build-support/cc-wrapper/default.nix |  4 +---
 pkgs/stdenv/darwin/default.nix            |  6 ------
 pkgs/stdenv/freebsd/default.nix           | 14 ++++----------
 pkgs/stdenv/linux/default.nix             |  4 ----
 pkgs/stdenv/nix/default.nix               |  8 ++------
 pkgs/top-level/all-packages.nix           |  2 --
 6 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 502362514eb..b3971808a2b 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -8,10 +8,8 @@
 { name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
 , zlib ? null, extraPackages ? [], extraBuildCommands ? ""
-, dyld ? null # TODO: should this be a setup-hook on dyld?
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
-, buildPackages ? {}, hostPlatform, targetPlatform
-, runCommand ? null
+, buildPackages ? {}
 , useMacosReexportHack ? false
 }:
 
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 4994de8bc03..fc0caeafc29 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -77,7 +77,6 @@ in rec {
         cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {
           inherit shell;
           inherit (last) stdenv;
-          inherit (last.pkgs.darwin) dyld;
 
           nativeTools  = true;
           nativePrefix = bootstrapTools;
@@ -85,8 +84,6 @@ in rec {
           buildPackages = lib.optionalAttrs (last ? stdenv) {
             inherit (last) stdenv;
           };
-          hostPlatform = localSystem;
-          targetPlatform = localSystem;
           libc         = last.pkgs.darwin.Libsystem;
           isClang      = true;
           cc           = { name = "clang-9.9.9"; outPath = bootstrapTools; };
@@ -314,10 +311,7 @@ in rec {
       buildPackages = {
         inherit (prevStage) stdenv;
       };
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
       inherit (pkgs) coreutils binutils gnugrep;
-      inherit (pkgs.darwin) dyld;
       cc   = pkgs.llvmPackages.clang-unwrapped;
       libc = pkgs.darwin.Libsystem;
     };
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index d15afe76189..c10d1515a3d 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -40,8 +40,6 @@ let inherit (localSystem) system; in
       targetPlatform = localSystem;
       inherit config;
       initialPath = [ "/" "/usr" ];
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
       shell = "${bootstrapTools}/bin/bash";
       fetchurlBoot = null;
       cc = null;
@@ -55,13 +53,11 @@ let inherit (localSystem) system; in
 
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-0";
-      buildPlatform = localSystem;
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
       inherit config;
       initialPath = [ prevStage.bootstrapTools ];
       inherit (prevStage.stdenv)
-        hostPlatform targetPlatform shell;
+        buildPlatform hostPlatform targetPlatform
+        shell;
       fetchurlBoot = prevStage.fetchurl;
       cc = null;
     };
@@ -71,13 +67,11 @@ let inherit (localSystem) system; in
     inherit config overlays;
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-3";
-      buildPlatform = localSystem;
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
       inherit config;
 
       inherit (prevStage.stdenv)
-        hostPlatform targetPlatform initialPath shell fetchurlBoot;
+        buildPlatform hostPlatform targetPlatform
+        initialPath shell fetchurlBoot;
 
       cc = import ../../build-support/cc-wrapper {
         nativeTools  = true;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 61262e1a64e..d8ee60af65e 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -79,8 +79,6 @@ let
           buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
             inherit (prevStage) stdenv;
           };
-          hostPlatform = localSystem;
-          targetPlatform = localSystem;
           cc = prevStage.gcc-unwrapped;
           isGNU = true;
           libc = prevStage.glibc;
@@ -244,8 +242,6 @@ in
         buildPackages = {
           inherit (prevStage) stdenv;
         };
-        hostPlatform = localSystem;
-        targetPlatform = localSystem;
         cc = prevStage.gcc-unwrapped;
         libc = self.glibc;
         inherit (self) stdenv binutils coreutils gnugrep;
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index aaf6c523ea4..c736442dc0a 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -13,12 +13,10 @@ bootStages ++ [
     inherit config overlays;
 
     stdenv = import ../generic rec {
-      buildPlatform = localSystem;
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
-
       inherit config;
 
+      inherit (prevStage.stdenv) buildPlatform hostPlatform targetPlatform;
+
       preHook = ''
         export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
         export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
@@ -27,8 +25,6 @@ bootStages ++ [
 
       initialPath = (import ../common-path.nix) { pkgs = prevStage; };
 
-      inherit (prevStage.stdenv) hostPlatform targetPlatform;
-
       cc = import ../../build-support/cc-wrapper {
         nativeTools = false;
         nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84a2398b43b..e8aeb8110c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6063,7 +6063,6 @@ with pkgs;
     nativeLibc = stdenv.cc.nativeLibc or false;
     nativePrefix = stdenv.cc.nativePrefix or "";
     cc = baseCC;
-    dyld = if stdenv.isDarwin then darwin.dyld else null;
     isGNU = baseCC.isGNU or false;
     isClang = baseCC.isClang or false;
     inherit libc extraBuildCommands;
@@ -6089,7 +6088,6 @@ with pkgs;
       nativeLibc = false;
       noLibc = (libc == null);
 
-      dyld = if stdenv.isDarwin then darwin.dyld else null;
       isGNU = cc.isGNU or false;
       isClang = cc.isClang or false;
 

From a49c1fc0b2cbb22353095fbdebdb145613589fd9 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 22 Aug 2017 00:30:39 +0200
Subject: [PATCH 2454/3246] caribou: fix build

---
 pkgs/desktops/gnome-3/3.22/core/caribou/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
index d63b6e86af3..3f2831a6985 100644
--- a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
+{ fetchurl, stdenv, autoreconfHook, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
 , libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake }:
 
 let
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake
       pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ];
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   propagatedBuildInputs = [ gnome3.libgee libxklavier ];
 
   preBuild = ''

From e6abf5e9e41dd055141b713fcaa15263b213083f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 21 Aug 2017 08:09:07 +0200
Subject: [PATCH 2455/3246] thunderbird: remove gcc6 patch, works now

---
 .../mailreaders/thunderbird/default.nix       |  2 -
 .../mailreaders/thunderbird/gcc6.patch        | 75 -------------------
 2 files changed, 77 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 0bcf1f4ceb7..51d90d11707 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -29,8 +29,6 @@ in stdenv.mkDerivation rec {
     sha512 = "10e6495d207328aae325a797be1de5e535b5d967df929b0af9d7554d0473b5a7931c8f9cb1793e843b1913f441f790169dd4ac1ad9e0e53e66bc8e1c1dd60e66";
   };
 
-  patches = [ ./gcc6.patch ];
-
   # New sed no longer tolerates this mistake.
   postPatch = ''
     for f in mozilla/{js/src,}/configure; do
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch b/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch
deleted file mode 100644
index bd102220285..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/gcc6.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1457596445 -32400
-# Node ID 55212130f19da3079167a6b0a5a0ed6689c9a71d
-# Parent  27c94617d7064d566c24a42e11cd4c7ef725923d
-Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj
-
-Our STL wrappers do various different things, one of which is including
-mozalloc.h for infallible operator new. mozalloc.h includes stdlib.h,
-which, in libstdc++ >= 6 is now itself a wrapper around cstdlib, which
-circles back to our STL wrapper.
-
-But of the things our STL wrappers do, including mozalloc.h is not one
-that is necessary for cstdlib. So skip including mozalloc.h in our
-cstdlib wrapper.
-
-Additionally, some C++ sources (in media/mtransport) are including
-headers in an extern "C" block, which end up including stdlib.h, which
-ends up including cstdlib because really, this is all C++, and our
-wrapper pre-includes <new> for mozalloc.h, which fails because templates
-don't work inside extern "C". So, don't pre-include <new> when we're not
-including mozalloc.h.
-
-
-diff --git a/mozilla/config/gcc-stl-wrapper.template.h b/mozilla/config/gcc-stl-wrapper.template.h
---- a/mozilla/config/gcc-stl-wrapper.template.h
-+++ b/mozilla/config/gcc-stl-wrapper.template.h
-@@ -12,33 +12,40 @@
- // compiling ObjC.
- #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
- #  error "STL code can only be used with -fno-exceptions"
- #endif
- 
- // Silence "warning: #include_next is a GCC extension"
- #pragma GCC system_header
- 
-+// Don't include mozalloc for cstdlib. See bug 1245076.
-+#ifndef moz_dont_include_mozalloc_for_cstdlib
-+#  define moz_dont_include_mozalloc_for_cstdlib
-+#endif
-+#ifndef moz_dont_include_mozalloc_for_${HEADER}
- // mozalloc.h wants <new>; break the cycle by always explicitly
- // including <new> here.  NB: this is a tad sneaky.  Sez the gcc docs:
- //
- //    `#include_next' does not distinguish between <file> and "file"
- //    inclusion, nor does it check that the file you specify has the
- //    same name as the current file. It simply looks for the file
- //    named, starting with the directory in the search path after the
- //    one where the current file was found.
--#include_next <new>
-+#  include_next <new>
- 
- // See if we're in code that can use mozalloc.  NB: this duplicates
- // code in nscore.h because nscore.h pulls in prtypes.h, and chromium
- // can't build with that being included before base/basictypes.h.
--#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
--#  include "mozilla/mozalloc.h"
--#else
--#  error "STL code can only be used with infallible ::operator new()"
-+#  if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
-+#    include "mozilla/mozalloc.h"
-+#  else
-+#    error "STL code can only be used with infallible ::operator new()"
-+#  endif
-+
- #endif
- 
- #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)
- // Enable checked iterators and other goodies
- //
- // FIXME/bug 551254: gcc's debug STL implementation requires -frtti.
- // Figure out how to resolve this with -fno-rtti.  Maybe build with
- // -frtti in DEBUG builds?
-

From 637e33e61614c803f5cc61bc8d4a58694d985e68 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 22 Aug 2017 00:55:31 +0200
Subject: [PATCH 2456/3246] llvm: disable failing tests on i686

---
 pkgs/development/compilers/llvm/4/llvm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index abfac1cce14..4978570334e 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -128,7 +128,7 @@ in stdenv.mkDerivation rec {
     ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
   '';
 
-  doCheck = stdenv.isLinux;
+  doCheck = stdenv.isLinux && (!stdenv.isi686);
 
   checkTarget = "check-all";
 

From 7354913c2d105e41d2486ff11305c0012302dafb Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Mon, 21 Aug 2017 22:19:39 +0200
Subject: [PATCH 2457/3246] sha1collisiondetection: 1.0.1 -> 1.0.3

---
 .../tools/security/sha1collisiondetection/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/tools/security/sha1collisiondetection/default.nix
index de1796f431d..38da1448414 100644
--- a/pkgs/tools/security/sha1collisiondetection/default.nix
+++ b/pkgs/tools/security/sha1collisiondetection/default.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchFromGitHub, libtool, which }:
 
 stdenv.mkDerivation  rec {
-  pname = "sha1collisiondetection";
-  version = "1.0.1";
-  name = "${pname}-${version}";
+  name = "sha1collisiondetection-${version}";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "cr-marcstevens";
-    repo = pname;
-    rev = "development-v${version}";
-    sha256 = "09vd5mgclcdx7yq3kwzxy1z7pbxcp0xljfly7hy4ixahmnn290h6";
+    repo = "sha1collisiondetection";
+    rev = "stable-v${version}";
+    sha256 = "0xn31hkkqs0kj9203rzx6w4nr0lq8fnrlm5i76g0px3q4v2dzw1s";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From a4594e21a85bccae1e5c3cda424bb938826cc147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Mon, 21 Aug 2017 14:06:45 +0200
Subject: [PATCH 2458/3246] yarn 0.27.5 -> 0.28.4

---
 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 8b6f751d3aa..26c0fe281e7 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.27.5";
+  version = "0.28.4";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "0djjbdbwzlhdh6aww6awfl63nz72kj109kjxvmwk25x8dkvw795a";
+    sha256 = "12l1ljgzk45i24d9x7036hdrb8f46in93xfc2z4wq94wzm24s2za";
   };
 
   buildInputs = [makeWrapper nodejs];

From 5404ac9ae00be305eb4dff926088a8113162d3e4 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Mon, 21 Aug 2017 08:32:47 -0400
Subject: [PATCH 2459/3246] atom: fixes #28436 - atom git integration

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 31e6476d282..07728ed7f3b 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
+{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
       --set-rpath "${atomEnv.libPath}" \
       $out/share/atom/resources/app/apm/bin/node
 
+    rm -f $out/share/atom/resources/app/node_modules/dugite/git/bin/git
+    ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app/node_modules/dugite/git/bin/git
+
     find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
 
     paxmark m $out/share/atom/atom

From e6661db29f05b4e18fb881b51c4a4d171318f56e Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Thu, 17 Aug 2017 10:19:08 +0200
Subject: [PATCH 2460/3246] ncurses: 6.0 -> 6.0-20170729

Bump version to include a patch that fixes #19785.
---
 pkgs/development/libraries/ncurses/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 827a556a468..e2c3907e856 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -9,19 +9,18 @@
 , buildPlatform, hostPlatform
 , buildPackages
 }:
-let
-  version = if abiVersion == "5" then "5.9" else "6.0";
-  sha256 = if abiVersion == "5"
-    then "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"
-    else "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm";
-in
+
 stdenv.mkDerivation rec {
+  version = if abiVersion == "5" then "5.9" else "6.0-20170729";
   name = "ncurses-${version}";
 
-  src = fetchurl {
+  src = fetchurl (if abiVersion == "5" then {
     url = "mirror://gnu/ncurses/${name}.tar.gz";
-    inherit sha256;
-  };
+    sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
+  } else {
+    url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz";
+    sha256 = "1cfdpl2gnj8szw28jmzrw47va0yqn16g03ywyzz3bjmaqxxmmwga";
+  });
 
   patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch;
 

From a379ee6863ee42eb66629b1f6d96d13456aa2fa8 Mon Sep 17 00:00:00 2001
From: Marko Poikonen <marko@poikonen.de>
Date: Sat, 19 Aug 2017 10:51:46 +0200
Subject: [PATCH 2461/3246] libraw: 0.17.2 -> 0.18.2

---
 pkgs/development/libraries/libraw/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 63a6b697eb2..351f839553b 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,20 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.17.2";
+  version = "0.18.2";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "0p6imxpsfn82i0i9w27fnzq6q6gwzvb9f7sygqqakv36fqnc9c4j";
+    sha256 = "1imby9x88pjx4ad1frdi3bfb8dw90ccyj5pb6w3i6i0iijrnndnf";
   };
 
-  patches =
-    [ (fetchurl {
-        url = https://anonscm.debian.org/cgit/pkg-phototools/libraw.git/plain/debian/patches/0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823;
-        sha256 = "1lcg5l0wmwiyzhhm67c1c7hy8py6ihxfmicnhrwpi3i6f16vq29w";
-      })
-    ];
-
   outputs = [ "out" "lib" "dev" "doc" ];
 
   buildInputs = [ jasper ];

From 9fbb6e8e3a84d958a4198956e30d9e64105c0fb0 Mon Sep 17 00:00:00 2001
From: Alvar <geistesk@users.noreply.github.com>
Date: Tue, 22 Aug 2017 03:38:46 +0200
Subject: [PATCH 2462/3246] mpfshell: init at 0.8.1 (#28384)

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

diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix
new file mode 100644
index 00000000000..b44e52aa2bf
--- /dev/null
+++ b/pkgs/development/tools/mpfshell/default.nix
@@ -0,0 +1,23 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonPackage rec {
+  name = "mpfshell-${version}";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "wendlers";
+    repo = "mpfshell";
+    rev = version;
+    sha256 = "1n4ap4yfii54y125f9n9krc0lc0drwg3hsq4z6g89xbswdx9sygr";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    pyserial colorama websocket_client
+  ];
+
+  meta = with lib; {
+    homepage = https://github.com/wendlers/mpfshell;
+    description = "A simple shell based file explorer for ESP8266 Micropython based devices";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8aeb8110c8..9e8f4a853e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8049,6 +8049,8 @@ with pkgs;
 
   mpfi = callPackage ../development/libraries/mpfi { };
 
+  mpfshell = callPackage ../development/tools/mpfshell { };
+
   # A GMP fork
   mpir = callPackage ../development/libraries/mpir {};
 

From 4098ddd6be0c7363f6be6965d863cc684b82671e Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Sat, 19 Aug 2017 00:13:40 +0200
Subject: [PATCH 2463/3246] mercurial: remove hardcoded linux-only cacert

This is no more needed since the introduction of NIX_SSL_CERT_PATH.
Furthermore, it breaks on darwin because the path does not exist.

Fixes #27928.
---
 pkgs/applications/version-management/mercurial/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 39d44ab145d..53947a95e9f 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -44,12 +44,6 @@ in python2Packages.buildPythonApplication {
           $WRAP_TK
       done
 
-      mkdir -p $out/etc/mercurial
-      cat >> $out/etc/mercurial/hgrc << EOF
-      [web]
-      cacerts = /etc/ssl/certs/ca-certificates.crt
-      EOF
-
       # copy hgweb.cgi to allow use in apache
       mkdir -p $out/share/cgi-bin
       cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin

From 12472460edd57a1a224e98ba6dcdcf9daeb62ce4 Mon Sep 17 00:00:00 2001
From: Kirill Boltaev <aske@fmap.me>
Date: Thu, 17 Aug 2017 21:01:38 +0300
Subject: [PATCH 2464/3246] pythonPackages.docker: 2.3.0 -> 2.4.2

---
 pkgs/development/python-modules/docker.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix
index 58c7da4cbe5..7364c5faed4 100644
--- a/pkgs/development/python-modules/docker.nix
+++ b/pkgs/development/python-modules/docker.nix
@@ -3,13 +3,13 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "2.3.0";
+  version = "2.4.2";
   pname = "docker";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/docker/${name}.tar.gz";
-    sha256 = "b0e3f353a3df3eedfbbcaf48235117263479b893edfa0cf6d8d056cca5edde1c";
+    sha256 = "11kl6kl82056bzcycvc2jpz59ra89vwbyzi0yaamixgcm9nzlvr1";
   };
 
   propagatedBuildInputs = [

From 46a3ba9070cc93941d606b6853d750b86be9b993 Mon Sep 17 00:00:00 2001
From: Kirill Boltaev <aske@fmap.me>
Date: Thu, 17 Aug 2017 21:09:56 +0300
Subject: [PATCH 2465/3246] pythonPackages.docker_compose: 1.13.0 -> 1.15.0

---
 pkgs/development/python-modules/docker_compose.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix
index 8cfedb82f6c..18d68e4ea5d 100644
--- a/pkgs/development/python-modules/docker_compose.nix
+++ b/pkgs/development/python-modules/docker_compose.nix
@@ -6,13 +6,13 @@
 , enum34, functools32
 }:
 buildPythonApplication rec {
-  version = "1.13.0";
+  version = "1.15.0";
   pname = "docker-compose";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
-    sha256 = "3c7b62cd0ab5f33d21db197d8a74739d320a6fe32e4ef8282c35d4dee5a7c77c";
+    sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg";
   };
 
   # lots of networking and other fails

From fd22d671ecad983fbbbd92c4626204f09c9af8ff Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 21 Aug 2017 00:06:20 -0400
Subject: [PATCH 2466/3246] root: 6.10.02 -> 6.10.04

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

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index cc961c8d392..86e074dbe5d 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "root-${version}";
-  version = "6.10.02";
+  version = "6.10.04";
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    sha256 = "1ryp9397xpbnxha6s222c10pa50lf2qf5s35n31lc29s90p8s9kc";
+    sha256 = "0nwg4bw02v6vahm2rwfaj7fzp3ffhjg5jk7h20il4246swhxw6s6";
   };
 
   buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ]

From 09779623b4c90aa8129fdb74cd6848afc47e19d4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 22 Aug 2017 05:52:49 +0200
Subject: [PATCH 2467/3246] ocamlPackages.qcheck: 0.6 -> 0.7

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

diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix
index 695a751c7a9..20100a9b2eb 100644
--- a/pkgs/development/ocaml-modules/qcheck/default.nix
+++ b/pkgs/development/ocaml-modules/qcheck/default.nix
@@ -4,10 +4,10 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
 
 stdenv.mkDerivation {
 
-  name = "ocaml${ocaml.version}-qcheck-0.6";
+  name = "ocaml${ocaml.version}-qcheck-0.7";
   src = fetchzip {
-    url = https://github.com/c-cube/qcheck/archive/0.6.tar.gz;
-    sha256 = "14rlg0jh4p12sd9xagppacsbfw0239anbq5r1aqhsqxlfmzbmi1p";
+    url = https://github.com/c-cube/qcheck/archive/0.7.tar.gz;
+    sha256 = "1afy7li74r3ivpvq670gvsj1rmglh5rnvb17p6w8gy5rh30aljah";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ounit ];

From cd85a704a52d3585940991f76e9c24eada7a955c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 22 Aug 2017 03:23:30 -0400
Subject: [PATCH 2468/3246] linux: 4.13-rc4 -> 4.13-rc6

---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 ++++
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index deb1d81775b..dfb5d2a43e1 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -642,6 +642,10 @@ with stdenv.lib;
   TEST_USER_COPY? n
   XZ_DEC_TEST? n
 
+  ${optionalString (versionAtLeast version "4.13") ''
+    TEST_KMOD n
+  ''}
+
   ${optionalString (versionOlder version "4.4") ''
     EFI_TEST? n
     RCU_PERF_TEST? n
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 281cc7186b6..5bbee02b9aa 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13-rc4";
-  modDirVersion = "4.13.0-rc4";
+  version = "4.13-rc6";
+  modDirVersion = "4.13.0-rc6";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "00yiihmgifvl4bas861p87166nb1mf59b6nm5jsfk2zr27pszlyx";
+    sha256 = "06jdbgihdjmq84d7km43f3w6d3hwmbnv3sgzip3nhx77l14cp7f2";
   };
 
   features.iwlwifi = true;

From e5a43bd40874dfc6c2d888cb7c58aa0c638aea15 Mon Sep 17 00:00:00 2001
From: Divam <dfordivam@gmail.com>
Date: Tue, 22 Aug 2017 16:39:22 +0900
Subject: [PATCH 2469/3246] openfst: init at 1.6.3 (#28430)

---
 lib/maintainers.nix                           |  1 +
 .../development/libraries/openfst/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/openfst/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 727fd2091c9..2bbb56aab5e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -144,6 +144,7 @@
   desiderius = "Didier J. Devroye <didier@devroye.name>";
   devhell = "devhell <\"^\"@regexmail.net>";
   dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";
+  dfordivam = "Divam <dfordivam+nixpkgs@gmail.com>";
   dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>";
   dgonyeo = "Derek Gonyeo <derek@gonyeo.com>";
   dipinhora = "Dipin Hora <dipinhora+github@gmail.com>";
diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
new file mode 100644
index 00000000000..690261438ab
--- /dev/null
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "openfst";
+  version = "1.6.3";
+
+  src = fetchurl {
+    url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz";
+    sha256 = "5c28b6ccd017fc6ff94ebd0c73ed8ab37d48f563dab1c603856fb05bc9333d99";
+  };
+  meta = {
+    description = "Library for working with finite-state transducers";
+    longDescription = ''
+      Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs).
+      FSTs have key applications in speech recognition and synthesis, machine translation, optical character recognition,
+      pattern matching, string processing, machine learning, information extraction and retrieval among others
+    '';
+    homepage = http://www.openfst.org/twiki/bin/view/FST/WebHome;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.dfordivam ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e8f4a853e9..3a881d28e51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19225,6 +19225,8 @@ with pkgs;
 
   xtermcontrol = callPackage ../applications/misc/xtermcontrol {};
 
+  openfst = callPackage ../development/libraries/openfst {};
+
   # `recurseIntoAttrs` for sake of hydra, not nix-env
   tests = recurseIntoAttrs {
     macOSSierraShared = callPackage ../test/macos-sierra-shared {};

From bfb0bf849edcfc2f179352de5a2101edf50144e8 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Tue, 22 Aug 2017 01:45:02 +0200
Subject: [PATCH 2470/3246] naev: add freetype dependency

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

diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix
index 1f033d49305..3fd20e6221e 100644
--- a/pkgs/games/naev/default.nix
+++ b/pkgs/games/naev/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis
-, libpng, mesa, makeWrapper, zlib }:
+, libpng, mesa, makeWrapper, zlib, freetype }:
 
 let
   pname = "naev";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb";
   };
 
-  buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib ];
+  buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib freetype ];
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
 

From 3b3f6d191a8fb4376e690beed52ae0b65fae0351 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Mon, 21 Aug 2017 23:29:17 -0400
Subject: [PATCH 2471/3246] zcash: 1.0.8 -> 1.0.11

---
 pkgs/applications/altcoins/zcash/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix
index 917e318c189..456ed41931c 100644
--- a/pkgs/applications/altcoins/zcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/default.nix
@@ -1,27 +1,27 @@
 { stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost
-, zlib, gtest, gmock, miniupnpc, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
+, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
 , withGui }:
 
 let libsnark     = callPackage ./libsnark { inherit boost openssl; };
     librustzcash = callPackage ./librustzcash {};
 in
 with stdenv.lib;
-stdenv.mkDerivation rec{
+stdenv.mkDerivation rec {
 
   name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "1.0.8";
+  version = "1.0.11";
 
   src = fetchFromGitHub {
     owner = "zcash";
     repo  = "zcash";
-    rev = "f630519d865ce22a6cf72a29785f2a876902f8e1";
-    sha256 = "1zjxg3dp0amjfs67469yp9b223v9hx29lkxid9wz2ivxj3paq7bv";
+    rev = "v${version}";
+    sha256 = "09474jdhsg30maqrwfxigbw3llqi8axhh82lz3a23ii2gj68ni55";
   };
 
   enableParallelBuilding = true;
 
   buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib
-                  miniupnpc protobuf libevent libsodium librustzcash ]
+                  protobuf libevent libsodium librustzcash ]
                   ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 

From aa49e36be0080c1b54ed41b8c45dc5d4d63d2ad6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 21 Aug 2017 12:41:48 -0400
Subject: [PATCH 2472/3246] elpa-packages: 2017-08-21

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index e3861c8c2f6..e605801fa80 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -372,6 +372,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "company-ebdb";
+        version = "1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/company-ebdb-1.el";
+          sha256 = "1awriwvjpf9k2r6hzawai5kxz28j40zk9fvpb946kd5yj0hxr9nc";
+        };
+        packageRequires = [ company ebdb ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/company-ebdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-math = callPackage ({ company, elpaBuild, fetchurl, lib, math-symbol-lists }:
     elpaBuild {
         pname = "company-math";
@@ -414,6 +428,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    counsel-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, ivy, lib }:
+    elpaBuild {
+        pname = "counsel-ebdb";
+        version = "1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/counsel-ebdb-1.el";
+          sha256 = "0p919gq871rxlrn6lpjbwws7h6i2gc9vgcxzj8bzgz8xk5hq9mis";
+        };
+        packageRequires = [ ebdb ivy ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/counsel-ebdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "crisp";
         version = "1.3.4";
@@ -524,10 +552,10 @@
     dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }:
     elpaBuild {
         pname = "dict-tree";
-        version = "0.12.8";
+        version = "0.14";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dict-tree-0.12.8.el";
-          sha256 = "08jaifqaq9cfz1z4fr4ib9l6lbx4x60q7d6gajx1cdhh18x6nys5";
+          url = "https://elpa.gnu.org/packages/dict-tree-0.14.el";
+          sha256 = "1k00k3510bgq7rijvrxbx4b7qlq2abq1dyyn51zgm8q0qk68p5jq";
         };
         packageRequires = [ heap tNFA trie ];
         meta = {
@@ -643,6 +671,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
+    elpaBuild {
+        pname = "ebdb";
+        version = "0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/ebdb-0.2.tar";
+          sha256 = "177qrjpdg14dpip2cn18csnlidv5f8cj3xpayz6jlpbfqzyfx8bi";
+        };
+        packageRequires = [ cl-lib emacs seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ebdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }:
+    elpaBuild {
+        pname = "ebdb-gnorb";
+        version = "1.0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el";
+          sha256 = "0bma7mqilp3lfgv0z2mk6nnqzh1nn1prkz2aiwrs4hxwydmda13i";
+        };
+        packageRequires = [ ebdb gnorb ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }:
+    elpaBuild {
+        pname = "ebdb-i18n-chn";
+        version = "1.0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.0.1.el";
+          sha256 = "1g84xllw2dz6lhzschkyflqpsh3xx167161y6vjzq6yqkfy3gh1r";
+        };
+        packageRequires = [ ebdb pyim ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "ediprolog";
         version = "1.2";
@@ -876,10 +946,10 @@
       }) {};
     heap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "heap";
-        version = "0.3";
+        version = "0.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/heap-0.3.el";
-          sha256 = "1347s06nv88zyhmbimvn13f13d1r147kn6kric1ki6n382zbw6k6";
+          url = "https://elpa.gnu.org/packages/heap-0.5.el";
+          sha256 = "13qv0w3fi87c85jcy7lv359r6rpsgnp5zzs2f2zq4dl3540wzrxg";
         };
         packageRequires = [];
         meta = {
@@ -887,6 +957,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, helm, lib }:
+    elpaBuild {
+        pname = "helm-ebdb";
+        version = "1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/helm-ebdb-1.el";
+          sha256 = "17gpna0hywxnhfwc9zsm2r35mskyfi416qqmmdba26r4zmpb9r63";
+        };
+        packageRequires = [ ebdb helm ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/helm-ebdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight-escape-sequences = callPackage ({ elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "highlight-escape-sequences";
@@ -1446,10 +1530,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170814";
+        version = "20170821";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170814.tar";
-          sha256 = "1rk3y4ns5f7f22vv0pg1x5mpn3vpm1123sxpd1ilbzajw3hfgwwn";
+          url = "https://elpa.gnu.org/packages/org-20170821.tar";
+          sha256 = "13214dfm6ixypsl0mj1wrdcs42w1qn5ig8m5sb6ih697i2kbxkgg";
         };
         packageRequires = [];
         meta = {
@@ -1579,10 +1663,10 @@
       }) {};
     queue = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "queue";
-        version = "0.1.1";
+        version = "0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/queue-0.1.1.el";
-          sha256 = "0jw24fxqnf9qcaf2nh09cnds1kqfk7hal35dw83x1ari95say391";
+          url = "https://elpa.gnu.org/packages/queue-0.2.el";
+          sha256 = "0cx2848sqnnkkr4zisvqadzxngjyhmb36mh0q3if7q19yjjhmrkb";
         };
         packageRequires = [];
         meta = {
@@ -1603,6 +1687,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "rcirc-color";
+        version = "0.3";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/rcirc-color-0.3.el";
+          sha256 = "1ya4agh63x60lv8qzrjrng02dnrc70ci0s05b800iq71k71ss3dl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "rcirc-menu";
+        version = "1.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/rcirc-menu-1.1.el";
+          sha256 = "0w77qlwlmx59v5894i96fldn6x4lliv4ddv8967vq1kfchn4w5mc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rcirc-menu.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }:
     elpaBuild {
         pname = "realgud";
@@ -1958,10 +2068,10 @@
       }) {};
     trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: elpaBuild {
         pname = "trie";
-        version = "0.2.6";
+        version = "0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/trie-0.2.6.el";
-          sha256 = "1q3i1dhq55c3b1hqpvmh924vzvhrgyp76hr1ci7bhjqvjmjx24ii";
+          url = "https://elpa.gnu.org/packages/trie-0.4.el";
+          sha256 = "0869fh3bghxil94wd9vgbb5bk1hx2qkh75vbvp0psmcima8dgzgw";
         };
         packageRequires = [ heap tNFA ];
         meta = {
@@ -1998,10 +2108,10 @@
     url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }:
     elpaBuild {
         pname = "url-http-ntlm";
-        version = "2.0.3";
+        version = "2.0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.3.el";
-          sha256 = "01ivfcxrxiqs8dlqg4s3q17y4mxx0kpin60fkwrs18pca4hni203";
+          url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.4.el";
+          sha256 = "1cakq2ykraci7d1gl8rnpv4f2f5ffyaidhqb1282g7i72adwmb98";
         };
         packageRequires = [ cl-lib ntlm ];
         meta = {
@@ -2115,6 +2225,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "which-key";
+        version = "3.0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/which-key-3.0.2.tar";
+          sha256 = "1s7bq7vq9xsf2pz1w03l743yzaxm9gk5qgympcwlkiq90ph13vcn";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/which-key.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "windresize";
         version = "0.1";

From ec4f63c87b2b0b4499bc71a8d745edb2f428153d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 21 Aug 2017 12:42:03 -0400
Subject: [PATCH 2473/3246] org-packages: 2017-08-21

---
 .../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 c3153b06e26..794c79d7151 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 = "20170814";
+        version = "20170821";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170814.tar";
-          sha256 = "1r55vfjbll18h1nb5a48293x9lwmcmxgpx8h20n77n3inqmc6yli";
+          url = "http://orgmode.org/elpa/org-20170821.tar";
+          sha256 = "0pfqm8r1hgk1mf57rwp1h46gc5dwsyfkgnpw01a8y5w35dcsvz4j";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170814";
+        version = "20170821";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170814.tar";
-          sha256 = "15v3944p1vnjqmy6il6gr1ipqw32cjzdq6w43rniwv2vr5lmh6iz";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170821.tar";
+          sha256 = "0m5zym1b4kr7q3ps41rhz92krbjmk9m220hc0rdym95gyjfzw62i";
         };
         packageRequires = [];
         meta = {

From 2263a7a11022806659034b3e63bd013a0cab7c26 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 21 Aug 2017 12:49:13 -0400
Subject: [PATCH 2474/3246] melpa-stable-packages: 2017-08-21

Removals:
 - ess-R-object-popup: removed from melpa
 - harvest: removed from melpa
 - imgix: removed from melpa
 - inline-crypt: removed from melpa
 - nyan-prompt: removed from melpa
 - pyim-greatdict: removed from melpa
 - slime-ritz: removed from melpa
 - sourcetalk: removed from melpa
 - stgit: removed from melpa
 - subshell-proc: removed from melpa
 - sudden-death: removed from melpa
 - uzumaki: removed from melpa
 - wordsmith-mode: removed from melpa
 - yatex: removed from melpa
---
 .../emacs-modes/melpa-stable-generated.nix    | 611 ++++++------------
 1 file changed, 213 insertions(+), 398 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 7cb801673ec..1c521d0c9db 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1732,12 +1732,12 @@
     apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apiwrap";
-        version = "0.1.2";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "apiwrap.el";
-          rev = "2feb4a9c58a105867197f92c0b27f1de8d213f45";
-          sha256 = "0yyl2zn02mnhpg6xfcywypg3yprabgkzi9spr407nia86ljrqqss";
+          rev = "1a3fff7a0265d1d13d6854b45e0c5ebe68a802de";
+          sha256 = "0pg67nlmdpfqlhljggm5id5pmddh8p6slgpwsqh1pmfqs328j5hq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -5617,6 +5617,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "copy-file-on-save";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emacs-auto-deployment";
+          rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487";
+          sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f99184ba41e9ab40b2fcff584421bbd933bffc72/recipes/copy-file-on-save";
+          sha256 = "07hm6ml9j9qwxbv9kv8w8i2x9js7fyrw3p7m219vpncka80qf6k3";
+          name = "copy-file-on-save";
+        };
+        packageRequires = [ cl-lib emacs f s ];
+        meta = {
+          homepage = "https://melpa.org/#/copy-file-on-save";
+          license = lib.licenses.free;
+        };
+      }) {};
     copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copyit";
@@ -6208,12 +6229,12 @@
     dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dad-joke";
-        version = "1.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "dad-joke.el";
-          rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9";
-          sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr";
+          rev = "92641503c7e93309db12380d5228f99dbe64a53c";
+          sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
@@ -6226,22 +6247,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dante";
-        version = "1.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "385dd8114bb9eaba44943f00f9f7aea71af7bf34";
-          sha256 = "1jkdq9li3vqzdmmznpaxak7mf9y9vlk0abdb7ffzvvlry19dvgs8";
+          rev = "6b260611dc08468fca9b9af132a00783dd2cf8d9";
+          sha256 = "0s5wi010sn3ng9fr7fqbc11kmjqirr28wya3rnnzzb3m5gyxs8id";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
           sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
           name = "dante";
         };
-        packageRequires = [ dash emacs flycheck ];
+        packageRequires = [ dash emacs f flycheck haskell-mode s ];
         meta = {
           homepage = "https://melpa.org/#/dante";
           license = lib.licenses.free;
@@ -7307,12 +7328,12 @@
     docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
     melpaBuild {
         pname = "docker-compose-mode";
-        version = "0.3.1";
+        version = "0.3.3";
         src = fetchFromGitHub {
           owner = "meqif";
           repo = "docker-compose-mode";
-          rev = "37d8afb6a72f829fdbc77e76f18587530ff319b4";
-          sha256 = "11283gl19iqm03a5l635qq36fpxlj05j7a6hlnv7v15n3h7d5512";
+          rev = "a002d5f9fb2cb1b0cac2cf512a672b69e7fd6d14";
+          sha256 = "0k7igf738wsgxiglafhby8rlqdhsm3vsgpq39frmrzgvrfs69lxs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -8272,12 +8293,12 @@
     eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eg";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "eg.el";
-          rev = "66c7bfd84151cac093090834919a615d5f824b42";
-          sha256 = "0pk8rvfdybkkrxb80yhj831gr3sj075gair9g7p60jfnyxwsgqw2";
+          rev = "0791452498719afb7409d1f723dbea2ec26d56f1";
+          sha256 = "1y16pah8f4jp117vihvlcwvsw2i85gdk45h9y9r1w9mslb24faac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
@@ -10220,27 +10241,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ess-R-object-popup = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
-        pname = "ess-R-object-popup";
-        version = "1.0";
-        src = fetchFromGitHub {
-          owner = "myuhe";
-          repo = "ess-R-object-popup.el";
-          rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948";
-          sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8783caab9019623ade5c369a4713eba996507bd0/recipes/ess-R-object-popup";
-          sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
-          name = "ess-R-object-popup";
-        };
-        packageRequires = [ ess popup ];
-        meta = {
-          homepage = "https://melpa.org/#/ess-R-object-popup";
-          license = lib.licenses.free;
-        };
-      }) {};
     ess-smart-underscore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ess-smart-underscore";
@@ -13355,6 +13355,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "frames-only-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "davidshepherd7";
+          repo = "frames-only-mode";
+          rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28";
+          sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
+          sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h";
+          name = "frames-only-mode";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "https://melpa.org/#/frames-only-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "free-keys";
@@ -13492,12 +13513,12 @@
     fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fullframe";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "fullframe";
-          rev = "3c046dd4c27a5c96d9dc3bc50a44eb1e7fd68912";
-          sha256 = "1narmlcd8ycwkmsrgk64l7q0ljsbq2fsikl8hjbrsc20nma032m4";
+          rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd";
+          sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe";
@@ -13510,22 +13531,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "function-args";
-        version = "0.5.1";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "function-args";
-          rev = "25e447d8a8930a8c515077de57a7693c6a642514";
-          sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
+          rev = "0b07db81c0c1fa88d1ec763219ee57640858f79d";
+          sha256 = "0lg9bhwn3za4jvz38zld389gdl48qf34nqqqrzj0r119g1jqdrg1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
-        packageRequires = [ swiper ];
+        packageRequires = [ ivy ];
         meta = {
           homepage = "https://melpa.org/#/function-args";
           license = lib.licenses.free;
@@ -13933,12 +13954,12 @@
     ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub-plus";
-        version = "0.1.4";
+        version = "0.1.5";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "ghub-plus";
-          rev = "44a5558eb299adee1463b7120c23b26b1d914ea8";
-          sha256 = "0fn5rb7ba4p39if68alvxv321918pki010vfylpp6jk98kzzh487";
+          rev = "f315677e3d35951021e1f10cc7b4f629814a13f0";
+          sha256 = "1k2583dnj9did2pnd3ma4rfrd2n6r83yjccf403sgxzi1p054yl4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -15892,27 +15913,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }:
-    melpaBuild {
-        pname = "harvest";
-        version = "0.3.8";
-        src = fetchFromGitHub {
-          owner = "kostajh";
-          repo = "harvest.el";
-          rev = "69041907bdca68d3ab6802e08ec698c3448f28a1";
-          sha256 = "0rqxi668wra1mfzq4fqscjghis5gqnwpazgidgix13brybaxydx4";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1dcfc8f0759792367ee49d2fe96e5bd7ca4105f/recipes/harvest";
-          sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd";
-          name = "harvest";
-        };
-        packageRequires = [ hydra s swiper ];
-        meta = {
-          homepage = "https://melpa.org/#/harvest";
-          license = lib.licenses.free;
-        };
-      }) {};
     haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-emacs";
@@ -16062,12 +16062,12 @@
     hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "hasky-stack";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-stack";
-          rev = "a11d1e00f41407ec77ea9e6eab93949a18f58069";
-          sha256 = "1bib7nic9by2vrqvrzpp62dk4apz2iyyprvk4hlgji2hkxyf2wpb";
+          rev = "e256e50fce9a65cad1754d863d9ed969b159cefe";
+          sha256 = "12rf51l5dg4c5jkn0rsyr47wfsw9qnmzl0hmsa8j04fm8nr978x7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -16125,12 +16125,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.8.1";
+        version = "2.8.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "c695a697461a48840f567bd5339909d4a80fa99f";
-          sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
+          rev = "d6bd5719dbe8b43f615245acf5846dfeca839867";
+          sha256 = "11fqhmyia8161hpsi2alfx3w32z573yl2sjkmn4n2kw8caa1l9x8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -16461,12 +16461,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.8.1";
+        version = "2.8.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "c695a697461a48840f567bd5339909d4a80fa99f";
-          sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
+          rev = "d6bd5719dbe8b43f615245acf5846dfeca839867";
+          sha256 = "11fqhmyia8161hpsi2alfx3w32z573yl2sjkmn4n2kw8caa1l9x8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -16839,12 +16839,12 @@
     helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hatena-bookmark";
-        version = "2.2.2";
+        version = "2.2.3";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-hatena-bookmark";
-          rev = "8350a600d3e03f1ec7dc899cc0b2e323b12518bb";
-          sha256 = "0hmvyyhddpf831cad35c9z9fv5mpdq6qg4nzbdghlqs9pf7ik6h2";
+          rev = "d64833a5bbb4ae112ed176f6473232e526138572";
+          sha256 = "01b6nlbidk93arnnd2irm088qlws4i4p1sagsh9v153x6sk0r38k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
@@ -17364,12 +17364,12 @@
     helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-qiita";
-        version = "1.0.1";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-qiita";
-          rev = "45e38ae7b816da5db38412b2992c6d1c7a6cc30a";
-          sha256 = "05394vf125qlgfrhkaqvly3340qp3zy7kldsnisms9gv0l1c60bq";
+          rev = "1eb97a44ba6fbfe61a0735b0c62171ee5217eda1";
+          sha256 = "1swkj65fhk48704ny3x6h95qqm2g21d94vzd8s8qqyjmnajj07i3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
@@ -18978,27 +18978,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    imgix = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild, s }:
-    melpaBuild {
-        pname = "imgix";
-        version = "1.0.0";
-        src = fetchFromGitHub {
-          owner = "imgix";
-          repo = "imgix-emacs";
-          rev = "cf3994f69b34a36f627e9ceaf3e6f4309ee9ec30";
-          sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix";
-          sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg";
-          name = "imgix";
-        };
-        packageRequires = [ cl-lib dash ht json s ];
-        meta = {
-          homepage = "https://melpa.org/#/imgix";
-          license = lib.licenses.free;
-        };
-      }) {};
     immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "immutant-server";
@@ -19314,27 +19293,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "inline-crypt";
-        version = "0.1.4";
-        src = fetchFromGitHub {
-          owner = "Sodel-the-Vociferous";
-          repo = "inline-crypt-el";
-          rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282";
-          sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5bf7761c9091260d378621907a1689498aedc098/recipes/inline-crypt";
-          sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
-          name = "inline-crypt";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/inline-crypt";
-          license = lib.licenses.free;
-        };
-      }) {};
     inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inlineR";
@@ -19757,12 +19715,12 @@
     ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
     melpaBuild {
         pname = "ivy-youtube";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "squiter";
           repo = "ivy-youtube";
-          rev = "32f609f1d1a3718739be5797e020d6266d8340d2";
-          sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd";
+          rev = "c80bbab9d499d96bee3eb9a6d9be74ad254ec86d";
+          sha256 = "0n2v1w2801yxc71xd0vwma7y4nzs2qgnwbmkkx3xiq4n049sqd8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
@@ -20112,12 +20070,12 @@
     js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-closure";
-        version = "2.1";
+        version = "2.2.1";
         src = fetchFromGitHub {
           owner = "jart";
           repo = "js2-closure";
-          rev = "6050abb334c228702c23fcb03bfdf1dfbd1d6b11";
-          sha256 = "1b4d13kz7afr5a6wyhq6vmwz8gsabdi86scw3q3v6l56hl2rgy46";
+          rev = "74a75f001a8bc2b9c02b9e8b4557f7ee3c5f84fb";
+          sha256 = "1gapx656s4ngy8s8y1p56xxnclwf4qqg83l3jizknxky7yhayyl9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure";
@@ -20973,12 +20931,12 @@
     latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-extra";
-        version = "1.13";
+        version = "1.14";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "latex-extra";
-          rev = "d5b759fa61da968c3ca998ba0d2ef4a73647e5fd";
-          sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a";
+          rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5";
+          sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra";
@@ -21502,6 +21460,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lively";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "lively";
+          rev = "6ec648fcde85e81393db1ed1364860f960179c92";
+          sha256 = "06sdaj2akwjg1a7yvmm3gsip66iaq9bhm3gr45szwg6z622q4gvf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively";
+          sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g";
+          name = "lively";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/lively";
+          license = lib.licenses.free;
+        };
+      }) {};
     lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lms";
@@ -22351,12 +22330,12 @@
     markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
     melpaBuild {
         pname = "markdown-preview-mode";
-        version = "0.8";
+        version = "0.9";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "65f48df07c87d37275cc6a135741df4b585f1836";
-          sha256 = "0gkfwm7zxwdi7x7xd6m9sl9q1p5f2q8mxryq6cd4xldbvbcki71f";
+          rev = "134fd336750b8b3165bc906f0a7161c25eb6f589";
+          sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
@@ -24139,22 +24118,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.13";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "NixOS";
-          repo = "nix";
-          rev = "0ec723375bc6008a8a88024962b052c3fbbaf4b8";
-          sha256 = "1wg622s0qvgdzry4mb6a7jjpql7la58kwhzpif0akyd689xf9d9s";
+          repo = "nix-mode";
+          rev = "d5e839692a1273b128003eaed543318e7e5965a7";
+          sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
-          sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
+          sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3";
           name = "nix-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/nix-mode";
           license = lib.licenses.free;
@@ -24492,27 +24471,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "nyan-prompt";
-        version = "0.2.0";
-        src = fetchFromGitHub {
-          owner = "PuercoPop";
-          repo = "nyan-prompt";
-          rev = "b5137f2ee9afe640f59786eed17b308df6356c73";
-          sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e3bf5fe2adaf557146df6f4e13aa6ffedb5d1e3/recipes/nyan-prompt";
-          sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
-          name = "nyan-prompt";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/nyan-prompt";
-          license = lib.licenses.free;
-        };
-      }) {};
     o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "o-blog";
@@ -24940,8 +24898,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "a9a66b047606c6b5dc48abdb0eb70a1f9dcd08f2";
-          sha256 = "0m1f62cr0h426g66c7r36v3yr2bdakkjwxzdvpd0gh81xazn8yjz";
+          rev = "46b2c3d16b83ce6e7e318d69ae74e1d7c4106549";
+          sha256 = "0g2zap8yyv31lkpmdnripg1q03xdb7sm3jzq7j17sgqak2a223xp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -25262,12 +25220,12 @@
     org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-category-capture";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
-          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+          rev = "48f621b595e748c5e03431f237facf258ffc9443";
+          sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
@@ -25701,12 +25659,12 @@
     org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
     melpaBuild {
         pname = "org-projectile";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
-          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+          rev = "48f621b595e748c5e03431f237facf258ffc9443";
+          sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
@@ -25722,12 +25680,12 @@
     org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
     melpaBuild {
         pname = "org-projectile-helm";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
-          sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+          rev = "48f621b595e748c5e03431f237facf258ffc9443";
+          sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
@@ -26560,7 +26518,7 @@
           sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -27888,22 +27846,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plantuml-mode";
-        version = "1.2.3";
+        version = "1.2.5";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "plantuml-mode";
-          rev = "eb380bac5663ec8e73482db6c6ba9d1394766eb3";
-          sha256 = "19zxwmn5mjbzqgk7l444h57ninrlhi22l85l9zphryx2992plf0k";
+          rev = "5a2e8d0dd2ba9286fc3c82d8689d25050290f68d";
+          sha256 = "1gcv5gmps371wd2sjbq4g5p2yj2ip8lpn81lypwb5xavqa7gjhlv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
           sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
           name = "plantuml-mode";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/plantuml-mode";
           license = lib.licenses.free;
@@ -28686,12 +28644,12 @@
     protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protobuf-mode";
-        version = "3.4.0pre3";
+        version = "3.4.0";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "eaeca0d42b1fc4a8023a7f90d889631eda9360a3";
-          sha256 = "02c360xhmnhcybl23fa0p7l3x3zn4mil1c7cnpilnv0bqxy5399n";
+          rev = "80a37e0782d2d702d52234b62dd4b9ec74fd2c95";
+          sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -28730,14 +28688,14 @@
         pname = "psci";
         version = "0.0.6";
         src = fetchFromGitHub {
-          owner = "ardumont";
+          owner = "purescript-emacs";
           repo = "emacs-psci";
           rev = "8c2d5a0ba604ec593f83f632b2830a87f41f84d4";
           sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a0f45269895b8e061c972da46f932c96eb0f5279/recipes/psci";
-          sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci";
+          sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9";
           name = "psci";
         };
         packageRequires = [ dash deferred f purescript-mode s ];
@@ -29103,27 +29061,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "pyim-greatdict";
-        version = "0.2";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "pyim-greatdict";
-          rev = "45fa4ff26f3444fb98c4dea460d84b740204d105";
-          sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-greatdict";
-          sha256 = "1bbindnklmmxdskv9vmjxhvlxxmaccgqn70prblhpg6n11bxjhl9";
-          name = "pyim-greatdict";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/pyim-greatdict";
-          license = lib.licenses.free;
-        };
-      }) {};
     pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
     melpaBuild {
         pname = "pyim-wbdict";
@@ -29376,6 +29313,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quiz";
+        version = "1.4";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "quiz.el";
+          rev = "69629937eaf994a51dad39c26355e1a56b9dcb95";
+          sha256 = "06k1kv9ijg9gx8c5jid8ckbmjkviyzh59rygp9drbkpihwdwyfmj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz";
+          sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg";
+          name = "quiz";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/quiz";
+          license = lib.licenses.free;
+        };
+      }) {};
     r-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "r-autoyas";
@@ -30219,12 +30177,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "1.3.0";
+        version = "1.3.1";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000";
-          sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr";
+          rev = "081685a8c624220ece68d6dca8d60016585b04ff";
+          sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -31603,12 +31561,12 @@
     shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
     melpaBuild {
         pname = "shr-tag-pre-highlight";
-        version = "1";
+        version = "2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "shr-tag-pre-highlight.el";
-          rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889";
-          sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6";
+          rev = "63eb0b2a4c1caf1004bac8e002ff8b7477871e36";
+          sha256 = "14b398k7rd0c2ymvg8wyq65fhggkm0camgvqr7j6ia2y0kairxba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
@@ -32041,27 +31999,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "slime-ritz";
-        version = "0.6.0";
-        src = fetchFromGitHub {
-          owner = "pallet";
-          repo = "ritz";
-          rev = "1cc6faedae26323994ea8dd1a4f555db8acbf244";
-          sha256 = "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/669a4ae76deea86084307ac3c2d26072e4b8fe17/recipes/slime-ritz";
-          sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
-          name = "slime-ritz";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/slime-ritz";
-          license = lib.licenses.free;
-        };
-      }) {};
     slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slime-volleyball";
@@ -32650,27 +32587,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
-        pname = "sourcetalk";
-        version = "1.2.0";
-        src = fetchFromGitHub {
-          owner = "malroc";
-          repo = "sourcetalk_emacs";
-          rev = "aced89fa8776e6d5e42dad4a863e159959f08de6";
-          sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e51aed64ffd0d2583c54035bd3e822f8adbaedde/recipes/sourcetalk";
-          sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
-          name = "sourcetalk";
-        };
-        packageRequires = [ request ];
-        meta = {
-          homepage = "https://melpa.org/#/sourcetalk";
-          license = lib.licenses.free;
-        };
-      }) {};
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
@@ -33133,25 +33049,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "stgit";
-        version = "0.17.1";
-        src = fetchgit {
-          url = "git://repo.or.cz/stgit.git";
-          rev = "48e5cef14cea5c810833d119900cd484c2a6ca85";
-          sha256 = "0hgqxhqnc93pnh6j3hyi92hfx1cbdjylzqb2nl6ldsz1g2wdcw9r";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit";
-          sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
-          name = "stgit";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/stgit";
-          license = lib.licenses.free;
-        };
-      }) {};
     string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "string-edit";
@@ -33340,48 +33237,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    subshell-proc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "subshell-proc";
-        version = "0.1";
-        src = fetchFromGitHub {
-          owner = "andrewmains12";
-          repo = "subshell-proc";
-          rev = "bf475eb7b0684af967755e91c9cabd19f953b03b";
-          sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc";
-          sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp";
-          name = "subshell-proc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/subshell-proc";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "sudden-death";
-        version = "0.2";
-        src = fetchFromGitHub {
-          owner = "yewton";
-          repo = "sudden-death.el";
-          rev = "c58fb9a672f306604dde4fbb0ff079e65a5e40be";
-          sha256 = "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/24c94bff44029b6493575a9e09d7deb78db095a9/recipes/sudden-death";
-          sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
-          name = "sudden-death";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/sudden-death";
-          license = lib.licenses.free;
-        };
-      }) {};
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
@@ -33498,8 +33353,8 @@
           sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a44a6577740b98749fe2703b32d70f15a473eb46/recipes/swbuff";
-          sha256 = "0pi816ljprpl8p2pigfyzm9ripvrc4hvnpkjdsg30mw8iyrk66yn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff";
+          sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk";
           name = "swbuff";
         };
         packageRequires = [];
@@ -34685,12 +34540,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "1.8.5";
+        version = "1.9";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4";
-          sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1";
+          rev = "c0e9b9407d9b752319ca5be4a6a0f8b06740ecda";
+          sha256 = "1993f06j1y5ch3v6gq3pp85r3bpv6cbnn19552jyl83lq0x5gi7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -34706,12 +34561,12 @@
     treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
     melpaBuild {
         pname = "treemacs-evil";
-        version = "1.8.5";
+        version = "1.9";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4";
-          sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1";
+          rev = "c0e9b9407d9b752319ca5be4a6a0f8b06740ecda";
+          sha256 = "1993f06j1y5ch3v6gq3pp85r3bpv6cbnn19552jyl83lq0x5gi7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -35360,27 +35215,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    uzumaki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "uzumaki";
-        version = "0.1";
-        src = fetchFromGitHub {
-          owner = "geyslan";
-          repo = "uzumaki";
-          rev = "a75956e1757f4b98aad3384a4616481aede70cb1";
-          sha256 = "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d63f9408e3bb581a47c8ab1f729f9ee087933d6/recipes/uzumaki";
-          sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
-          name = "uzumaki";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://melpa.org/#/uzumaki";
-          license = lib.licenses.free;
-        };
-      }) {};
     v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "v2ex-mode";
@@ -36245,12 +36079,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "3.0.1";
+        version = "3.0.2";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "3ff303b50495d492cfac70cc9f7321971928bdb1";
-          sha256 = "1q0rg13lq31fqnkpkss61pfyx7ib7i4r1jbcavpjyr5gqcb08fzm";
+          rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031";
+          sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -36539,11 +36373,11 @@
     wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wisp-mode";
-        version = "0.9.1";
+        version = "0.9.2";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "70b4ccc031bc";
-          sha256 = "1mbypvclk83lhwvdy6ancl4j9nysv47s8yp6baa8pi54zlc9w3i1";
+          rev = "e5a20c81c0bd";
+          sha256 = "13pb956f1yidwjh4imi01dghzs2wgd6r7n5bzhvpszvx4x1nw4z9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -36703,27 +36537,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "wordsmith-mode";
-        version = "1.0.0";
-        src = fetchFromGitHub {
-          owner = "istib";
-          repo = "wordsmith-mode";
-          rev = "41b10f2fe3589da9812395cb417c3dcf906f0969";
-          sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d9f8f01f1807de24fb6e92b355d05b81be4bab07/recipes/wordsmith-mode";
-          sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
-          name = "wordsmith-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/wordsmith-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "worf";
@@ -37186,6 +36999,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yard-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "pd";
+          repo = "yard-mode.el";
+          rev = "78792f6a6fbff4f1bc955f494fdb11378e7f8095";
+          sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode";
+          sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
+          name = "yard-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/yard-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yarn-mode";
@@ -37270,25 +37104,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "yatex";
-        version = "1.78";
-        src = fetchhg {
-          url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "4f8551386af2";
-          sha256 = "0qvp54pzc6m52j5xkwp25nwdlik6v879halmfvcpn3z0grhrslbn";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
-          sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
-          name = "yatex";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/yatex";
-          license = lib.licenses.free;
-        };
-      }) {};
     yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yaxception";
@@ -37478,7 +37293,7 @@
           sha256 = "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };

From 9af00c8d44f2c36988d9d3a3ae76841fc6a5d6c8 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 22 Aug 2017 05:28:45 -0400
Subject: [PATCH 2475/3246] melpa-packages: 2017-08-21

Removals:
 - achievements: removed from melpa
 - avk-emacs-themes
 - coq-commenter: removed from melpa
 - crab: removed from melpa
 - crontab-mode: removed from melpa
 - darkane-theme: removed from melpa
 - el-pocket: removed from melpa
 - ess-R-object-popup: removed from melpa
 - euslisp-mode: removed from melpa
 - firebelly-theme: removed from melpa
 - gap-mode: removed from melpa
 - ghost-blog: removed from melpa
 - harvest: removed from melpa
 - helm-ctest: removed from melpa
 - imgix: removed from melpa
 - inf-php: removed from melpa
 - inform7-mode: removed from melpa
 - inline-crypt: removed from melpa
 - jaunte: removed from melpa
 - mandoku-tls: removed from melpa
 - memento: removed from melpa
 - n3-mode: removed from melpa
 - niflheim-theme: removed from melpa
 - nyan-prompt: removed from melpa
 - org-jekyll: removed from melpa
 - pastels-on-dark-theme: removed from melpa
 - pyim-greatdict: removed from melpa
 - railgun: removed from melpa
 - rails-new: removed from melpa
 - refheap: removed from melpa
 - ruby-dev: removed from melpa
 - ruby-guard: removed from melpa
 - sicp: removed from melpa
 - slime-annot: removed from melpa
 - slime-ritz: removed from melpa
 - sly-repl-ansi-color: removed from melpa
 - smali-mode: removed from melpa
 - smartwin: removed from melpa
 - sourcetalk: removed from melpa
 - stgit: removed from melpa
 - subshell-proc: removed from melpa
 - sudden-death: removed from melpa
 - syslog-mode: removed from melpa
 - tj-mode: removed from melpa
 - tronesque-theme: removed from melpa
 - turkish: removed from melpa
 - uzumaki: removed from melpa
 - vimgolf: removed from melpa
 - wordsmith-mode: removed from melpa
 - yatex: removed from melpa
 - zig-mode: removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 2596 ++++++-----------
 1 file changed, 826 insertions(+), 1770 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 4f0839c7d88..694013823c3 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -759,8 +759,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
-          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+          rev = "5be2a4a9819f9685a1f6c464afd8bbc042d94575";
+          sha256 = "1khfh9fggs67fgz77yvlw8pw9gdbgy1dh4cbflccdbnjskrafnhl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -776,12 +776,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20170612.2134";
+        version = "20170814.2227";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
-          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+          rev = "5be2a4a9819f9685a1f6c464afd8bbc042d94575";
+          sha256 = "1khfh9fggs67fgz77yvlw8pw9gdbgy1dh4cbflccdbnjskrafnhl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -822,8 +822,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
-          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
+          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1130,26 +1130,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    achievements = callPackage ({ fetchhg, fetchurl, keyfreq, lib, melpaBuild }:
-    melpaBuild {
-        pname = "achievements";
-        version = "20150530.1126";
-        src = fetchhg {
-          url = "https://bitbucket.com/gvol/emacs-achievements";
-          rev = "5b4b7b6816aa";
-          sha256 = "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/achievements";
-          sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr";
-          name = "achievements";
-        };
-        packageRequires = [ keyfreq ];
-        meta = {
-          homepage = "https://melpa.org/#/achievements";
-          license = lib.licenses.free;
-        };
-      }) {};
     ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, mag-menu, melpaBuild }:
     melpaBuild {
         pname = "ack-menu";
@@ -1613,12 +1593,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170726.140";
+        version = "20170817.642";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "64fd8651fde0a25d55561517576d05c407373f8e";
-          sha256 = "0f57pym95bgb6s2mkwpk3jvsinwlz350k63xph6fkijygwzfkmwm";
+          rev = "d3550f8e0f8df6509e7f29a1ffbffc0f17144704";
+          sha256 = "09y1g4dphkhzrxym1bwxgx5f3hzvh1v4shbrr59bvdqymv93dagl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1794,8 +1774,8 @@
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "amx";
-          rev = "7a51b7854036cf6c5ecce8ff09ace2a9595c002f";
-          sha256 = "1x0f5wqyg56xw3byg18wlb16d5m6pn63axvdfiwibyqm9y1ljqm6";
+          rev = "04ac50cb85d27d885b083258a43533d4ae78c08b";
+          sha256 = "1lwx5230if67a3ixpvc1951wciwmk68fnq7c0j66qfpgmggzymbs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
@@ -2521,12 +2501,12 @@
     apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apiwrap";
-        version = "20170506.2356";
+        version = "20170814.1842";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "apiwrap.el";
-          rev = "8b60f9e9082583aa537369499506c70f192467ab";
-          sha256 = "13pr2hkn2jmg85299lga9rvllghkc0khfdgl3d8g2al9ib0il8pk";
+          rev = "1a3fff7a0265d1d13d6854b45e0c5ebe68a802de";
+          sha256 = "0pg67nlmdpfqlhljggm5id5pmddh8p6slgpwsqh1pmfqs328j5hq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -3207,12 +3187,12 @@
     auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
     melpaBuild {
         pname = "auto-compile";
-        version = "20170805.447";
+        version = "20170817.1437";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "auto-compile";
-          rev = "ef7d0fb0ac902e40a5010f8c54d3fe1f279723ef";
-          sha256 = "11ha04cfs8pm3f23hy4v8cfkfzkhig2mapwyq4brjcrbrwpac9zp";
+          rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a";
+          sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
@@ -4020,36 +4000,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "avk-emacs-themes";
-        version = "20170110.1046";
-        src = fetchFromGitHub {
-          owner = "avkoval";
-          repo = "avk-emacs-themes";
-          rev = "c75079ec9a84116c84c884c3bf258c95afcce7a7";
-          sha256 = "1s9hn4y918h1ly1s8gfkidlwqijdzpbkfx1px8xfkia3b35qinvv";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes";
-          sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144";
-          name = "avk-emacs-themes";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/avk-emacs-themes";
-          license = lib.licenses.free;
-        };
-      }) {};
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20170813.254";
+        version = "20170819.1039";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "8556274978be5ca2947777dc5e28f5487e069449";
-          sha256 = "0k0yw5vnv0f8xqly9s3ja90gcywnyg2b0pp3yxyk6r7qqns63pkj";
+          rev = "245b5d62feb6f276971be53e63311de4a243bfbc";
+          sha256 = "0r2p01hnflaa7dc0xfrrd5hgwgx530m4cxzpw3p1nmdajlk4mbyy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -4445,12 +4404,12 @@
     bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bash-completion";
-        version = "20170812.623";
+        version = "20170813.624";
         src = fetchFromGitHub {
           owner = "szermatt";
           repo = "emacs-bash-completion";
-          rev = "8ca917f4287c133e27f02fc7f3eda47e16d9ab12";
-          sha256 = "0bv0a3d6yk880zfql39xvjhpvw8x61qma57r4vgqk0lk0vqjcwq2";
+          rev = "318e32979fab4e1fcb4fdf400af0e30148544951";
+          sha256 = "0kdh87rvrvb2dgqkhaqv2wj6m2z0g13va1vk6p8d6q2x4a2mp9y1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -4693,12 +4652,12 @@
     bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bbyac";
-        version = "20170814.222";
+        version = "20170815.28";
         src = fetchFromGitHub {
           owner = "baohaojun";
           repo = "bbyac";
-          rev = "591b4668e80998c4aed85b55623a8f127e77792b";
-          sha256 = "1w3x74ca5gkjqzdj4sxy9syy55p1bw2r00hqw423bvv0jr20m6av";
+          rev = "e748e07bd77ef93f3c3110b5cde4e68f50b04efb";
+          sha256 = "1030gs02hb6kjd4w5iw0li8k7lcpklya37ybl62mkqhrzfri61bh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac";
@@ -5027,12 +4986,12 @@
     bibtex-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bibtex-utils";
-        version = "20170221.1757";
+        version = "20170817.1219";
         src = fetchFromGitHub {
           owner = "plantarum";
           repo = "bibtex-utils";
-          rev = "36953c6bd1e14eac553834720f383d4114585f55";
-          sha256 = "0z21p9j4wsbiygwk8lz9awwy1c2w2mnfyq501bvvd7r99k7hhy2k";
+          rev = "ed5ccce46c2088a28a2f0c49caa679d2f20567f0";
+          sha256 = "0cy0w4986lngzhzmfvk9r5xf0qa9bdz2ybzgv3nkwl48pjqvvi15";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5764b6a880e8143db66e9011cc1c2bf0bcd61082/recipes/bibtex-utils";
@@ -5466,12 +5425,12 @@
     bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bm";
-        version = "20170103.1424";
+        version = "20170815.1609";
         src = fetchFromGitHub {
           owner = "joodland";
           repo = "bm";
-          rev = "dd5dc454c62ceae6432cef6639e08db6ea6a865f";
-          sha256 = "0pjgiqhbch0kzlyqq0ij86nc8gjv5g9ammgx92z2k2pyj2zglh7h";
+          rev = "b1bc10b1e9f01c48a7eedb9b08a22d05e7baed3c";
+          sha256 = "16kfzi6chf28jyrsmz0jba3qq3mvxqambsdh09vr76ivmwbv48gh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -5737,15 +5696,15 @@
     bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bpr";
-        version = "20160514.458";
+        version = "20170820.354";
         src = fetchFromGitHub {
           owner = "ilya-babanov";
           repo = "emacs-bpr";
-          rev = "8efa52363ae8f86ff06f2677e2e0fb963aa4c186";
-          sha256 = "10178l56ryfxsrxysy9qb6vg71q1xavfw1sbchh0mrb90x12vilz";
+          rev = "9f4fac3f9cc9a44518d5c0f000b9a2c2b26d6b85";
+          sha256 = "0sn5xx3d461xm60hnj8jkr9rxnbs17kv8aq3br1qjy61yrg98gh7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/410d9d7d9de4d53f1b760081ff46764f121e8f1d/recipes/bpr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr";
           sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2";
           name = "bpr";
         };
@@ -6070,12 +6029,12 @@
     buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-manage";
-        version = "20170806.1436";
+        version = "20170818.738";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "buffer-manage";
-          rev = "df326e330ec6342648cc3c599155d7efc1eed5f9";
-          sha256 = "1y7k1d18a2w8jgqkbmzgvr4ws3yyymgphsnq0dmb3bi4a5q21n4n";
+          rev = "badab811809da6c1c05daa8dda7b464a6002cbf5";
+          sha256 = "1qjfykpli0qcv769gwas9j3rcsqp08ryqbyymadnmkbssvqhkg9h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
@@ -6951,8 +6910,8 @@
         src = fetchFromGitHub {
           owner = "cask";
           repo = "cask";
-          rev = "0a2e8436e02af6ca688b25ba90a19505a6113296";
-          sha256 = "1fjsss678dj6vikm0ig5jqksjlwgnwhpaqfy3dk56gnjc49nl29v";
+          rev = "07d8c963a4d349d856c51a471c60689734ebeda0";
+          sha256 = "15fyfzd0ssjyq8n77s8h8n0by33j5q0m4hs0v5k7m8zb3ca0w7mc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -7389,7 +7348,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12304";
+          rev = "12312";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7933,8 +7892,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "f2b198ed926b9c4deea63cc6a169a748d81c551f";
-          sha256 = "1flxbf19k048as38vr3vjcrf3xz2f41y4wfig1sbb7aiag63ahcm";
+          rev = "a1eee8c71237c98809c4852d9b1c799da903cd4f";
+          sha256 = "02nvrb40zk1wyw9v6wh0rnasv88phd3cn5kp1hmsspaa3sbyln1g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8205,7 +8164,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "310836";
+          rev = "311383";
           sha256 = "135p8ag315sh9zwssb6f9widiqh6xrcnry1r1v0ij8r94n7bw6la";
         };
         recipeFile = fetchurl {
@@ -8591,12 +8550,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170807.1610";
+        version = "20170819.2159";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172";
-          sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj";
+          rev = "a6f0592e9cabeb4e039e654bd30890a20208950e";
+          sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8616,8 +8575,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172";
-          sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj";
+          rev = "a6f0592e9cabeb4e039e654bd30890a20208950e";
+          sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8822,12 +8781,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20170804.430";
+        version = "20170818.907";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "69cfce070ee9e23f45736aec7c92c7ce7c86b479";
-          sha256 = "05qh9pigc37446x4ivpsi5j1q22jyjnmky5ja72dajibfrdg3zjp";
+          rev = "6489aabba8d124445ba72f55db9ef3bb2212b1b0";
+          sha256 = "0wh0z28nfb5kpm3jlkkgkxbhzyc8akyc6hs1fm8i7bxrslrj6ll0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8847,8 +8806,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "ce2750817b768cee6ae119747cdf806401f09332";
-          sha256 = "1kc7308y4y1684dl8nv8s6dy7p5m39dgyyvb3amd6cmfqka9010l";
+          rev = "9a0a6f91ae5c8e25197d50e7045b6c4418f607b2";
+          sha256 = "1l4x4xz1r1m8vf1klbpq98mzwkgxmpajwxl04vd8fxwv33pkyyxb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9218,12 +9177,12 @@
     color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-identifiers-mode";
-        version = "20170730.1852";
+        version = "20170814.1121";
         src = fetchFromGitHub {
           owner = "ankurdave";
           repo = "color-identifiers-mode";
-          rev = "2091833fde5e3877f966e987ee8e30a85c8e31ac";
-          sha256 = "0q2il3df7hm4nn3fpn82b9mz911yhzybzcizvhv6dpsdadbhidjr";
+          rev = "5750ee9e1ab8a6890381bb461982113b1eb98879";
+          sha256 = "17ry98s4lcl6g63bj8a0wd1rmh8whlxlmzfdjhp8mapdybqplcql";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
@@ -9534,8 +9493,8 @@
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "commander.el";
-          rev = "2a4f1fd6cf9aa1798559dbdd5fbd9dcd327cd859";
-          sha256 = "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1";
+          rev = "c93985dc318fe89e5a29abc21d19fb41e2fd14d2";
+          sha256 = "0mlabiraagqwl17payils5589fr2mivvkzrfic6ndsipryab6rfc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b308e05dd85856addbc04a9438f5026803cebd7/recipes/commander";
@@ -9635,12 +9594,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170715.1035";
+        version = "20170818.340";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56";
-          sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa";
+          rev = "ab2937a862541a66c149e1f95ca32eb2bd31b16b";
+          sha256 = "17mk0yfq2mdlhsxxsliy1qcmjl9fzqddrp6sw4p886v0f6w59br5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -10112,12 +10071,12 @@
     company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
     melpaBuild {
         pname = "company-irony";
-        version = "20170612.1308";
+        version = "20170821.1306";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "company-irony";
-          rev = "b8001ffc4da7403172835d47bc740cfbac35364d";
-          sha256 = "03ym65ckpx6n03l633lwvxiwvcdhm8kjsw91ql1y4f44vijlh2xi";
+          rev = "aa84766a4c878d0748d9d9734e312309bf2758dc";
+          sha256 = "0fcxxy7a3364qwpib3yjq6ps3z5q7gr0njf6jzwjvnrrn4m6dbga";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
@@ -10284,8 +10243,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
-          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+          rev = "5be2a4a9819f9685a1f6c464afd8bbc042d94575";
+          sha256 = "1khfh9fggs67fgz77yvlw8pw9gdbgy1dh4cbflccdbnjskrafnhl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10416,8 +10375,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
-          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
+          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10891,6 +10850,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "copy-file-on-save";
+        version = "20170817.2319";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emacs-auto-deployment";
+          rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487";
+          sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f99184ba41e9ab40b2fcff584421bbd933bffc72/recipes/copy-file-on-save";
+          sha256 = "07hm6ml9j9qwxbv9kv8w8i2x9js7fyrw3p7m219vpncka80qf6k3";
+          name = "copy-file-on-save";
+        };
+        packageRequires = [ cl-lib emacs f s ];
+        meta = {
+          homepage = "https://melpa.org/#/copy-file-on-save";
+          license = lib.licenses.free;
+        };
+      }) {};
     copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "copyit";
@@ -10933,27 +10913,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
-        pname = "coq-commenter";
-        version = "20170607.1355";
-        src = fetchFromGitHub {
-          owner = "ailrun";
-          repo = "coq-commenter";
-          rev = "6100933cadea289cdaabf2f56f2a0dd72385c1fe";
-          sha256 = "1b28gyyfjknjz23m18yhaj1ir72y8nl75cnam3ggygm9ax65h8i1";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coq-commenter";
-          sha256 = "07svxfh6wx78lg2r7jssdlipmcwzk8w14vry9fr5wxxi24y37nvg";
-          name = "coq-commenter";
-        };
-        packageRequires = [ cl-lib dash s ];
-        meta = {
-          homepage = "https://melpa.org/#/coq-commenter";
-          license = lib.licenses.free;
-        };
-      }) {};
     corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "corral";
@@ -10978,12 +10937,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170813.351";
+        version = "20170817.1000";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
-          sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
+          rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f";
+          sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11083,12 +11042,12 @@
     counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "counsel-projectile";
-        version = "20170814.341";
+        version = "20170816.200";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "280ead0e511904c67a9cb1686206efb65ba9c064";
-          sha256 = "1wybb8lh6cbkx9mqhs2nrfjab6p6mfj36c2n6pxps6jsgzb9syi5";
+          rev = "363c875df6ea658e543df59c11497f79bfa36b54";
+          sha256 = "1l6gd4ir5xh8ldw028i4s28jymd62926a7yzd0a52y5b2z7f4knr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -11230,12 +11189,12 @@
     cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cpputils-cmake";
-        version = "20170507.629";
+        version = "20170819.259";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cpputils-cmake";
-          rev = "0d4b22cbf548e0d1ce4e79cc82ada3747bb5d389";
-          sha256 = "0cg5cnvcd5nz15bpwi5h6972dlr2kxbzbz23lsq35hcbg3gj22k7";
+          rev = "4fa37dd075c716f98b67b96f3b6e022730df1c1b";
+          sha256 = "194vayk2hvqm2nv1rr3myiadrfvk8fpch1qlbic9bzbgfrl74i41";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake";
@@ -11269,27 +11228,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    crab = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, websocket }:
-    melpaBuild {
-        pname = "crab";
-        version = "20150126.2137";
-        src = fetchFromGitHub {
-          owner = "puffnfresh";
-          repo = "crab-emacs";
-          rev = "6d66844856c1864157cef3dea9332c319b05d7d5";
-          sha256 = "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/25f80586fb88ab5f0eb71d657d602d9faa1169ec/recipes/crab";
-          sha256 = "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj";
-          name = "crab";
-        };
-        packageRequires = [ json websocket ];
-        meta = {
-          homepage = "https://melpa.org/#/crab";
-          license = lib.licenses.free;
-        };
-      }) {};
     crappy-jsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "crappy-jsp-mode";
@@ -11437,27 +11375,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    crontab-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "crontab-mode";
-        version = "20090510.1355";
-        src = fetchFromGitHub {
-          owner = "emacsorphanage";
-          repo = "crontab-mode";
-          rev = "68341c82b26462a6af4a5e2b624b1c2165243b8e";
-          sha256 = "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/crontab-mode";
-          sha256 = "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci";
-          name = "crontab-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/crontab-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }:
     melpaBuild {
         pname = "crosshairs";
@@ -12065,8 +11982,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "91f2ad9f1285311058dfee641616053bc8d64eca";
-          sha256 = "0mb4kcvrwsvflywh5lnq20irmlgzgyqcjsmbmbhs21s3p6l9fh68";
+          rev = "f4faa0ee50916d5e042493827062a47ae6b1d988";
+          sha256 = "0l4p5sakw9mi15zss5b05m0ghix7vq3c4j5adbcg5hl8464gzvpn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12145,12 +12062,12 @@
     dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dad-joke";
-        version = "20170802.420";
+        version = "20170814.824";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "dad-joke.el";
-          rev = "973f66781bb4ccc01434d30bbff833cbbbfe1605";
-          sha256 = "0am97ls9z4awak4y78xhdyzbs93vwk5jks9c48lhjy7vq3vr21zf";
+          rev = "92641503c7e93309db12380d5228f99dbe64a53c";
+          sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
@@ -12229,12 +12146,12 @@
     dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dante";
-        version = "20170809.1326";
+        version = "20170821.708";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "ccb16d240504951ccd3fa71c533d3d7a06769562";
-          sha256 = "04gypz2i57zjhpj9khrfj0sr1c4hdf8yqxhlb9rwjknq3a807rr9";
+          rev = "dbfc2b8aad1ad0d3f01f58365de380d4fecf260b";
+          sha256 = "07wkrqlw3051qn3ycr2ianrm9q4kg0rcm3iy76adq9hxmnljc4zx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12331,27 +12248,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    darkane-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "darkane-theme";
-        version = "20161111.1304";
-        src = fetchFromGitHub {
-          owner = "FelixFortis";
-          repo = "emacs-darkane-theme";
-          rev = "afa346c793b74645392677b276c56b87c354b8ef";
-          sha256 = "1mi2k7llbk4n05mcy80lswv5vqlfca2izslds7z0sihik8fys4m6";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/826bd40f9da54e263dbad4bd861bd8227ea76656/recipes/darkane-theme";
-          sha256 = "1lnjjhy70bizqlpih9aqvv6hsx8lj4qa5klbd7mrldqywab8cpib";
-          name = "darkane-theme";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/darkane-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darkburn-theme";
@@ -12464,8 +12360,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "0df0ff1a65d54377381e50c08d88b247db44c3dd";
-          sha256 = "01v75zavzb476cn3c43h9m2wa7vxrsipaja6y1wib07bfbh6i5gm";
+          rev = "dcb0ec1623517e54551b801846a272dd07fd55b2";
+          sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12506,8 +12402,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "0df0ff1a65d54377381e50c08d88b247db44c3dd";
-          sha256 = "01v75zavzb476cn3c43h9m2wa7vxrsipaja6y1wib07bfbh6i5gm";
+          rev = "dcb0ec1623517e54551b801846a272dd07fd55b2";
+          sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -13468,8 +13364,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
-          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+          rev = "0521a3ad7bdf392991786596b04e7f1625d4802d";
+          sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13489,8 +13385,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
-          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+          rev = "0521a3ad7bdf392991786596b04e7f1625d4802d";
+          sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
@@ -13654,8 +13550,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
-          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+          rev = "0521a3ad7bdf392991786596b04e7f1625d4802d";
+          sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13675,8 +13571,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
-          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+          rev = "0521a3ad7bdf392991786596b04e7f1625d4802d";
+          sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13801,8 +13697,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
-          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+          rev = "0521a3ad7bdf392991786596b04e7f1625d4802d";
+          sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13822,8 +13718,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
-          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+          rev = "0521a3ad7bdf392991786596b04e7f1625d4802d";
+          sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13838,10 +13734,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170630.752";
+        version = "20170818.1411";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "1jl14z15ilkwl45xv34akabnx4430siqkjv14sqi33g3qmnln90y";
+          sha256 = "04yr4gwg5y6qjbjx2klharzf7s9n1akx2n14yddjrv7hr6rkxlrs";
           name = "dired+.el";
         };
         recipeFile = fetchurl {
@@ -13883,8 +13779,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
-          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+          rev = "0521a3ad7bdf392991786596b04e7f1625d4802d";
+          sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13904,8 +13800,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
-          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+          rev = "0521a3ad7bdf392991786596b04e7f1625d4802d";
+          sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -14004,8 +13900,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
-          sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+          rev = "0521a3ad7bdf392991786596b04e7f1625d4802d";
+          sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14824,12 +14720,12 @@
     docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
     melpaBuild {
         pname = "docker-compose-mode";
-        version = "20170812.1551";
+        version = "20170820.327";
         src = fetchFromGitHub {
           owner = "meqif";
           repo = "docker-compose-mode";
-          rev = "37d8afb6a72f829fdbc77e76f18587530ff319b4";
-          sha256 = "11283gl19iqm03a5l635qq36fpxlj05j7a6hlnv7v15n3h7d5512";
+          rev = "a002d5f9fb2cb1b0cac2cf512a672b69e7fd6d14";
+          sha256 = "0k7igf738wsgxiglafhby8rlqdhsm3vsgpq39frmrzgvrfs69lxs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -15091,12 +14987,12 @@
     dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dotnet";
-        version = "20170808.1423";
+        version = "20170819.642";
         src = fetchFromGitHub {
           owner = "julienXX";
           repo = "dotnet.el";
-          rev = "514d36ec1090f78c999a7d6614176f03a0065a9d";
-          sha256 = "1cg5hmkay5zj7ax8dnwipy5vsx2vg3ragvqbzizv71qasyr5vyjh";
+          rev = "e02b68a6823937023d8a2778e7e17d13ea2d9f1c";
+          sha256 = "1vmywfija3ip7q84zixnq4ax6j2n3qrvxy8r6gsj0yzfxv3915wl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet";
@@ -15263,8 +15159,8 @@
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "drag-stuff.el";
-          rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db";
-          sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka";
+          rev = "6d06d846cd37c052d79acd0f372c13006aa7e7c8";
+          sha256 = "1fsj88n1j50cxjzx62khzxrajsvf33si8iwgbaz6z7z8pwh91qcd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff";
@@ -15427,7 +15323,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1804990";
+          rev = "1805686";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15528,12 +15424,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170812.1308";
+        version = "20170821.13";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "7b6c37a2e4e5a4c3ad9fbcd89c8eba1b32709b6b";
-          sha256 = "0z4hgg7ya1x89gplk0hx4gi7div1bnqyi18hcj0zmgl9db0z333w";
+          rev = "497f5e68e01f71612f1d2d4040ed55e501c6ed03";
+          sha256 = "1b8gi0swzrsmb9x47xdsf7yjl0075vs7h34ifdks7izzr28n1pi2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15884,15 +15780,15 @@
     easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-after-load";
-        version = "20121224.1849";
+        version = "20170817.531";
         src = fetchFromGitHub {
           owner = "pd";
           repo = "easy-after-load";
-          rev = "f8e6e10725d80d3b7e8b1ca966de6190089d8f12";
-          sha256 = "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4";
+          rev = "29e20145da49ac9ea40463c552130777408040de";
+          sha256 = "00xgd39qc760lmxpbggzn98aks5nad08b5ry54pkszjlmh37yqj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2086675f58453a597c8bc904b2f6d56f4f4ca702/recipes/easy-after-load";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/easy-after-load";
           sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys";
           name = "easy-after-load";
         };
@@ -15926,12 +15822,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170812.1030";
+        version = "20170819.347";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "69c7c0df9c3d8b97b5a779c41460f6fb4f65ac75";
-          sha256 = "1rd7ssa3v3plpglqvpm03dlqfk8yyfwv0f8wqk1kr97yz7zxrp40";
+          rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2";
+          sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -16014,8 +15910,8 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "4d19565516785348894c4911e757e33a270b3efd";
-          sha256 = "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7";
+          rev = "65a131b95a1e934c0cab384ef533b0ac58961f0c";
+          sha256 = "1b8i7qh743lhmkrmw1ac486i8nk8fdxl0ayxjs2sfb8fk4621rfr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -16394,8 +16290,8 @@
           sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1737276c05491b53bf0c71e3aefe1480b3b99535/recipes/edit-at-point";
-          sha256 = "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/edit-at-point";
+          sha256 = "1mijasr4ww6vcjfyk7jdv4mh7w2rrspqbbmqayiy2918qg2x01df";
           name = "edit-at-point";
         };
         packageRequires = [];
@@ -16688,12 +16584,12 @@
     eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eg";
-        version = "20170812.407";
+        version = "20170816.235";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "eg.el";
-          rev = "69ba1defaf636452d46b948d22d8fefc6a937f81";
-          sha256 = "13ckp1jbzhq18fpzq670q2mmzka6wfyh8smxvx6msg72nnn740z5";
+          rev = "0791452498719afb7409d1f723dbea2ec26d56f1";
+          sha256 = "1y16pah8f4jp117vihvlcwvsw2i85gdk45h9y9r1w9mslb24faac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
@@ -16734,8 +16630,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "c06b457113a7e9484f8f4ae079cb257d8eb65396";
-          sha256 = "16gij5kc4r4x85d8pnpyfkb2z7fjlmfxc73vhd0hf76740kgnnxy";
+          rev = "170be423c79e8e28b99e5745bf7135ce3bf2de52";
+          sha256 = "1hi2ch08m48lpkhqz05ry736qj1mjva4krbqn2wkhcfdfrxpzhx6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16812,12 +16708,12 @@
     ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170803.629";
+        version = "20170810.1253";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "f47f020336f5ee32bfe7d27c53f6ca10eee2bc16";
-          sha256 = "0lpmg05yfza0c4bgj9gjgz3d48pnizvsjjdk3qdw6sz748k9k415";
+          rev = "606d4b32140414cf9ced2683f3532aad9ab0859a";
+          sha256 = "19idga81cl70cir6v55cqpkman4dhkjx1rvmmby7517phnpfnjpa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16938,8 +16834,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "99bc5e1814ffa302b8413e1d2adddd8c2113f75e";
-          sha256 = "06swrmpwfm6asiz3ggrbaa3l277g0xl43wiw6s8kzmqfh58r6837";
+          rev = "fe5c35f065c9ae0a1fcd13d866cd38038775cd95";
+          sha256 = "1whl866bz7cs07hixx1m4cvi8snrbi3cgv7f2k6wvxhwhxnrjkhm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -17036,27 +16932,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
-    melpaBuild {
-        pname = "el-pocket";
-        version = "20160528.951";
-        src = fetchFromGitHub {
-          owner = "pterygota";
-          repo = "el-pocket";
-          rev = "eb356e013c71903f2e946631ff58a1d0c2372389";
-          sha256 = "01dqksnz0nbfmp10sd3wwv1gffs60rk5v9rf2j3q2z13qsh8l2yy";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c3b8857bc84888a3f8566fab6288966e07d4201f/recipes/el-pocket";
-          sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
-          name = "el-pocket";
-        };
-        packageRequires = [ emacs web ];
-        meta = {
-          homepage = "https://melpa.org/#/el-pocket";
-          license = lib.licenses.free;
-        };
-      }) {};
     el-spec = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-spec";
@@ -18040,8 +17915,8 @@
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "elscreen-mew";
-          rev = "89871fad690ae161dc076e16ef481b1965612077";
-          sha256 = "14hwl5jzmm43qa4jbpsyswbz4hk1l2iwqh3ank6502bz58877k6c";
+          rev = "c90a23441d836da14a1cb12788432308ba58e2b6";
+          sha256 = "167kgbnh5q3pqirv0f7wpjn7yc76k8mz9qx45i7d4scmx8952d2g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47404ea3cfb591b780ca7e31095951a708b0a6b7/recipes/elscreen-mew";
@@ -18099,12 +17974,12 @@
     elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elvish-mode";
-        version = "20170813.1301";
+        version = "20170815.625";
         src = fetchFromGitHub {
           owner = "ALSchwalm";
           repo = "elvish-mode";
-          rev = "002f663fe01665b819711655aaaef2b891382d32";
-          sha256 = "1y634zc983yfi53q8sb2pp3h0s6ws3ypyqh3b9iw5jax6ia1h4ys";
+          rev = "d78a560b0aeba76ae09fb0885ca0cff2ee5b0d0d";
+          sha256 = "0fxmy0qfcapskbakin6p1hv9763yh4bxanlnak7p6dfmmw7mvz33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode";
@@ -18929,12 +18804,12 @@
     enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "enh-ruby-mode";
-        version = "20170810.1602";
+        version = "20170816.1713";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "23b00cce325453f644e10ea99ca15e9b115ba562";
-          sha256 = "0k5r6bip15lqd1c5fkjajrmjxjds3n4r48f4rljayf2acbf13mxa";
+          rev = "e0ea0270d34806cdbbdc442279ec9b94e6fef68d";
+          sha256 = "02aaj7zw0383ynm5ikvhxj8h1rq1qg05ri1y7w1k48ia9w5057m7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -18979,8 +18854,8 @@
           sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1cb55fa7c9bf6a7004011cb809b65bd430d83b31/recipes/eno";
-          sha256 = "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/eno";
+          sha256 = "1pcbvka3g32j1a2j7slw4jm80qpsk3ldziy5n4l02xpnqw6iwy6q";
           name = "eno";
         };
         packageRequires = [ dash edit-at-point ];
@@ -19013,12 +18888,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170808.1134";
+        version = "20170817.2325";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "08e6b4d98d1afeb637f27432349b4833320808a4";
-          sha256 = "0yr4bfp5shvm49qbr9k47ayglr7im65d0is770brjfbxcb68ry95";
+          rev = "fe816d36bce96151f90b76887a69f44100bd12da";
+          sha256 = "19id9s3wvwlqvcfngw32rd9fnq74nwyl5zlmyvr6i268rk4gm4lq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19126,12 +19001,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20170726.940";
+        version = "20170819.1411";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "f0959ca39cdbcb72049b31cab6e7c449749bfefe";
-          sha256 = "1pblli8g6ahsxgjk55yyzpdhlriq44i54yl27wdyvcyv2fffbdab";
+          rev = "7528d95ca296997ddc98427ff4ea547208848bef";
+          sha256 = "1b3xkbivwdzg9ndjwc3q1zq6swny0bd78b3f4ahplqqsrfgzksh4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19151,8 +19026,8 @@
         src = fetchFromGitHub {
           owner = "cask";
           repo = "epl";
-          rev = "a5ad061d0a5eb42f66c384e55d102da7d52c96b0";
-          sha256 = "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4";
+          rev = "83797835f729f39b80acba4c7e83d73a2e410e26";
+          sha256 = "1rgxvmz9nv7922c30xz8ax3cwj8mmwxfni3xjwnhpfa744in4441";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl";
@@ -19654,8 +19529,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "dac724923328ad0fd085a4d4e397dcbb12e30084";
-          sha256 = "0wc84i939819zbxciqkarfgvdipzhd169cykv1y0l40b21p0jlzx";
+          rev = "770454f0a32fbc0714c6762ed3e4d761b799814f";
+          sha256 = "1prg6xhj8dyvbhwwkjvnpmcwc0w145im6n0w5fx9kw9har9ch8cj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19775,12 +19650,12 @@
     ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "ert-runner";
-        version = "20161027.159";
+        version = "20170816.1112";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "ert-runner.el";
-          rev = "10628b8b90294077174f78e7b75e548f2a4b6f78";
-          sha256 = "0qq7yml7zlbgvfsdiai8qbvlalh42dghm2ahv9ql9xif3sqjcjiw";
+          rev = "edc21c0d473a16f0130e43962052db2123bb584b";
+          sha256 = "0ihvdcys73l16z180602k6nw9hyirn874li6fd9dp81zqmd9his4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner";
@@ -20241,8 +20116,8 @@
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "58c130a1bc13c8933bde229424d628ec2b6a6a97";
-          sha256 = "086isv62shvvf8sp5iicd45d3p1z071l5vik7445lbgind6wfbg5";
+          rev = "1f40b23d5b9d9b87cda741bd483e1dfb7fefd035";
+          sha256 = "0irwysn402spv5035dj6rngma4q5kx11zm5c9cas42v3wahpr9m8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20276,27 +20151,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ess-R-object-popup = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
-        pname = "ess-R-object-popup";
-        version = "20130302.336";
-        src = fetchFromGitHub {
-          owner = "myuhe";
-          repo = "ess-R-object-popup.el";
-          rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948";
-          sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8783caab9019623ade5c369a4713eba996507bd0/recipes/ess-R-object-popup";
-          sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
-          name = "ess-R-object-popup";
-        };
-        packageRequires = [ ess popup ];
-        meta = {
-          homepage = "https://melpa.org/#/ess-R-object-popup";
-          license = lib.licenses.free;
-        };
-      }) {};
     ess-smart-equals = callPackage ({ emacs, ess, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ess-smart-equals";
@@ -20482,27 +20336,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "euslisp-mode";
-        version = "20170807.1433";
-        src = fetchFromGitHub {
-          owner = "iory";
-          repo = "euslisp-mode";
-          rev = "f64c117b62a3715c438bfd85851029c1b4a45748";
-          sha256 = "1fqasd25hgif1q9j6rxqqwyrqg48ykb5g12w34jsm8zgg50n43n0";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode";
-          sha256 = "0m04a8k2z7inhfpqz68hv56h352ikcd39fg65dqvj79md05yila9";
-          name = "euslisp-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/euslisp-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     eval-expr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eval-expr";
@@ -20632,12 +20465,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170802.1333";
+        version = "20170815.1422";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "45712ad214b0ad2257814705d6baa3f9120574cd";
-          sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb";
+          rev = "744685cb55a4eb461430e91e287279812190ae7c";
+          sha256 = "0j5gfrisf9rhjz5p7vicp5cs0x9i73146hr1fqgryq27x96dax3b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -21304,12 +21137,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20170309.49";
+        version = "20170814.1947";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03";
-          sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m";
+          rev = "684f558931a8129bcc58bf9d31a6b2be1be56ec0";
+          sha256 = "12xly3kdm4p64bk46mj4cf67r65aznyj27v3zdm6ca1cfxvkm6ss";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -21665,8 +21498,8 @@
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "45712ad214b0ad2257814705d6baa3f9120574cd";
-          sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb";
+          rev = "744685cb55a4eb461430e91e287279812190ae7c";
+          sha256 = "0j5gfrisf9rhjz5p7vicp5cs0x9i73146hr1fqgryq27x96dax3b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -21975,12 +21808,12 @@
     exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exotica-theme";
-        version = "20170814.438";
+        version = "20170821.459";
         src = fetchFromGitHub {
           owner = "jbharat";
           repo = "exotica-theme";
-          rev = "c099e700e87638fa8cc45aa35e46952857ccf91d";
-          sha256 = "08i0d5f011wxvkd4njjabi986cjvf7c82i84jwkpdhv1gx67dmnb";
+          rev = "016e44ff8c812ca6e8c34e40beaaf6fa4cdc0c37";
+          sha256 = "0208ky004yhznhcwcn07v5l72w7g5kkjgpl98grwvqracp07glg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
@@ -22910,8 +22743,8 @@
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "2d3e8d095e0c36f927142e80c4330977be698568";
-          sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j";
+          rev = "584ebd41f51e86567375848f64b7c9d337125801";
+          sha256 = "1fwifcknkc6sxcn76c2qg8zz0ric5ppdqqxsdd28qicgjqnqrhkx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -23069,27 +22902,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    firebelly-theme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "firebelly-theme";
-        version = "20140410.155";
-        src = fetchFromGitHub {
-          owner = "startling";
-          repo = "firebelly";
-          rev = "5fd621102c676196319579b168da1476e8552d00";
-          sha256 = "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8f2b5ab0e75dccb9efb998cdc240303dc4a279/recipes/firebelly-theme";
-          sha256 = "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr";
-          name = "firebelly-theme";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://melpa.org/#/firebelly-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "firecode-theme";
@@ -23316,8 +23128,8 @@
           sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flappymacs";
-          sha256 = "0id3bz4h9wi4943kp2sab7240fw8hsnkpng02gij9ssyvjiii5cg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/flappymacs";
+          sha256 = "1rp4r5ldhm8nrj26y1vm5d5fj3kl7v45cj1naxczrqbcgkd0r404";
           name = "flappymacs";
         };
         packageRequires = [];
@@ -23662,12 +23474,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170802.22";
+        version = "20170817.57";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "ed08ce36e5cc97cfabb84ccaba84a00db917f082";
-          sha256 = "1r6lrxc8wv73fh4ybq83awci92ajrbgila8b86vxgvhvhl8jcj6d";
+          rev = "24534988d115754cda5f19943d2b4075e2b5c581";
+          sha256 = "0mb2rzqbi6a4wcn13kbwhff0z94z6n70lbx567i8lb484kf2kfaf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24124,12 +23936,12 @@
     flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dmd-dub";
-        version = "20170403.1116";
+        version = "20170816.648";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "flycheck-dmd-dub";
-          rev = "879c52116989f6041ccd20f5db210f5552d5c649";
-          sha256 = "12qblzrw99lcl8qccl26kwqiwscn04izvjrsq3mnp1r5q0s0jxl2";
+          rev = "5a2e65fbae90e1dd69cfa78e4af0bda25c7db973";
+          sha256 = "1zh6yb5snjrp09zh24fip97pqq7vk472g8nmjjqk0iq8m9i8sphs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -24292,12 +24104,12 @@
     flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-haskell";
-        version = "20170622.1248";
+        version = "20170815.44";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-haskell";
-          rev = "2aeb2ed5cdde7770cd5da9950981390d7b44f74c";
-          sha256 = "0h7zb1f0j3b44ad7ikdyv3mhddvh9hfg61g2aic3x3ms8rph86q5";
+          rev = "b313b62866b8a28cadc7331749e51eb32e4ddac2";
+          sha256 = "1r94y0wj0ssmamyqfxv0gm0l5qbfrfka8qgsd5mbsaw1lzk5ikfb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
@@ -24842,8 +24654,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
-          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
+          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -26390,10 +26202,10 @@
     frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-cmds";
-        version = "20170506.945";
+        version = "20170819.1358";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=93";
-          sha256 = "1ax9hcrhhwll4m4xi0dvsv4q498cngq5xzib6n2ka706fmnjj0rj";
+          url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=95";
+          sha256 = "169g11vs3d5gr8y1lwg7lgl21dpfca33m1c6w24mfmga4xr9042w";
           name = "frame-cmds.el";
         };
         recipeFile = fetchurl {
@@ -26645,12 +26457,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170809.1039";
+        version = "20170821.831";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "e4742d609b4da715bc23f3271cb3393e15c22291";
-          sha256 = "1rp67kpy9d5dkap80b2613kmplh3bbm0s46c4x8pdh8fy42vh2jv";
+          rev = "85e32ccf204fb8bc35954d6ca288c7b8a74531ac";
+          sha256 = "13m5axbwbxidhawma1wszfzfgdr2lhbi56y3l305csa4vaxq5cbi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26678,8 +26490,8 @@
         src = fetchFromGitHub {
           owner = "factor";
           repo = "factor";
-          rev = "3faad21b3d02fe81a2c0fae13ed14ad6652accc1";
-          sha256 = "14h2mwg0ny3mn7hjqgb9r5661ar2jwamz90v69bx0kz0lmr9drmz";
+          rev = "f8ce34b1dbe1780de135e2b7ba2250bde8fc604f";
+          sha256 = "0cv7mrbpks89qk7ivrc0m7kjfayqhnj1db8dh62sv7np2qh49cvv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -26737,12 +26549,12 @@
     fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fullframe";
-        version = "20160504.749";
+        version = "20170816.303";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "fullframe";
-          rev = "b91b0b128c08692c147394842a5e4eeb21ebe0b6";
-          sha256 = "0nhw708b5jjymbw3b7np11jlkzdrzq7qnnxdyl8nndsn1c3qcr0l";
+          rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd";
+          sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe";
@@ -26755,22 +26567,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "function-args";
-        version = "20170813.455";
+        version = "20170821.946";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "function-args";
-          rev = "e803dde6f2f96c4513e6d91af8d1aa859e584c57";
-          sha256 = "1bqkwn2nl8dgky73jxhhll26skiyalwl07337qdl7m8gjc25kcy8";
+          rev = "0b07db81c0c1fa88d1ec763219ee57640858f79d";
+          sha256 = "0lg9bhwn3za4jvz38zld389gdl48qf34nqqqrzj0r119g1jqdrg1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
-        packageRequires = [ swiper ];
+        packageRequires = [ ivy ];
         meta = {
           homepage = "https://melpa.org/#/function-args";
           license = lib.licenses.free;
@@ -26804,8 +26616,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "d49c88c9f71f2b3b20779c223d6c0f7e6e0134c8";
-          sha256 = "091p3anl6nqjmy9rlizrg1vmrd2n72gmar6g2hhiw611231z135d";
+          rev = "2cf02a412a445933f96b43283d38b6f61addbb0a";
+          sha256 = "1a4k2394ccz3c25kav3pl7g9s9b19w15pkvrm4svf3hsdxypaky1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -27024,25 +26836,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    gap-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "gap-mode";
-        version = "20160204.736";
-        src = fetchhg {
-          url = "https://bitbucket.com/gvol/gap-mode";
-          rev = "1de32f2ff384";
-          sha256 = "1jsw2mywc0y8sf7yl7y3i3l8vs3jv1srjf34lgb5xfz6p8wc5lc0";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/gap-mode";
-          sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2";
-          name = "gap-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/gap-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gather";
@@ -27323,8 +27116,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "3d9a3398691cb4cf476896994ab0e5640c69742f";
-          sha256 = "0w53xj2hlr1nc4sahxgajjl23zsqjjcvsfpafhkhszgprbjdjh31";
+          rev = "0d13786a4cc413cf12de0ace9ba6f43ddd7a032b";
+          sha256 = "1i6xjnkhkx406lia4f8qgyn27x20ridxkd4199wmdlf2w44fvpac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27400,27 +27193,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
-        pname = "ghost-blog";
-        version = "20160526.257";
-        src = fetchFromGitHub {
-          owner = "javaguirre";
-          repo = "ghost-blog-emacs";
-          rev = "d4e66d114ff7b846b967af4cff64dcafa381ead3";
-          sha256 = "174swf066vcf99g38c9x5lxp14fyh59cy9lriywhm6hk7mcaakng";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghost-blog";
-          sha256 = "0289hgvrx96bfpvpbidwi2761kmscg5nzny7g5gxmy3xzzm9bqkj";
-          name = "ghost-blog";
-        };
-        packageRequires = [ markdown-mode ];
-        meta = {
-          homepage = "https://melpa.org/#/ghost-blog";
-          license = lib.licenses.free;
-        };
-      }) {};
     ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ghq";
@@ -27466,12 +27238,12 @@
     ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub-plus";
-        version = "20170806.1323";
+        version = "20170819.1806";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "ghub-plus";
-          rev = "153c194718abc74a49078b056c87959a39b35627";
-          sha256 = "08svh16jdiz3rirk2wba6gwf8m3hhrhazlyb7idn4y22zc0am254";
+          rev = "d6ee1158676f6fb62601fc20f02f4cbb7f090085";
+          sha256 = "1r4zm1frbm2dwsnrfnsghfplxj81grwhhyjc421kjnfavkkflxnq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -27554,8 +27326,8 @@
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "git.el";
-          rev = "2b523c1975d4f258effaf826656c4b7120b2a19f";
-          sha256 = "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d";
+          rev = "a3396a7027a7d986598c6a2d6d5599bac918f3da";
+          sha256 = "10siqf21ay6vl1r1v2c93rajzyjc67m4wq9q88pbij0z18vkq2f0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce19d2716416295966716db47241a0e37b412ab5/recipes/git";
@@ -27655,12 +27427,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170609.2310";
+        version = "20170821.1159";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "5c05bdb9de39872649821ea3c70f3489741bcc66";
-          sha256 = "0g6578fpycfg7f5v3a7q6vaqgvcnxyf90yzg9mkjgis7b3im8jb7";
+          rev = "8810adb1ff5388c5e4e5a7671b4e207eb49985e2";
+          sha256 = "1q9bhy0ig5jg8wcq35pdpsmwwzl2vr2pbcd1zm2pc2c3ajgilkyk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28478,8 +28250,8 @@
         src = fetchFromGitHub {
           owner = "lokedhs";
           repo = "gnu-apl-mode";
-          rev = "72f6a7fc9153d141494b19ca7ff2c0d1e35c2a16";
-          sha256 = "12w5hnp5nnsy532kfwsp43n633k1n03hs1az6pd9sczjzhhz9ihb";
+          rev = "d79e519308727dec897f2574c938c6425b9a30c2";
+          sha256 = "1dr9wcj697d68dxg1026ggxvyvpxjdvydilmym3fhczijdpwm33y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
@@ -29253,8 +29025,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "77f7f28d314862754877bf19a8b032158522f7aa";
-          sha256 = "0354zk5j5fgin66vc9m63ca272bfq3vlqj5v34xqz26lqs3fpdb2";
+          rev = "62385582b8479bd523a21ffd414acdeaa1a98efb";
+          sha256 = "17nlq8jcdlrv1zi0hpmfgakw9g12m7gsnj9p13rg0vx063qfpvfq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -29524,8 +29296,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "2cad15190b417804d82edb4981e7b3e62907c4ee";
-          sha256 = "12zssdd23hm5l27lja8q8b78wzq8zwzx8sxpqaqsm53bq6w23jmp";
+          rev = "d7e841db6909ae5e9eb7493f7b1ea7d7b15101e3";
+          sha256 = "00mi0fscfcgw540b1lfq5xlv1cw7zxxr78q5vzfvhdgg3c2d2z7r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29650,8 +29422,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "606d6216c291c96f948e04ca481962c326771cf7";
-          sha256 = "0hkxdasgj8jn5dy7yjk3grgvxldic1azclnip24kyrmn36471n6j";
+          rev = "60e71008db67407de8abf897dbe36cdb66c16e72";
+          sha256 = "0zviwc49h80jlgp34ddg95lx4z4pasq5rxqj1dv3xcyaw8rkg4af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -30010,12 +29782,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170810.919";
+        version = "20170818.241";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "606d6216c291c96f948e04ca481962c326771cf7";
-          sha256 = "0hkxdasgj8jn5dy7yjk3grgvxldic1azclnip24kyrmn36471n6j";
+          rev = "60e71008db67407de8abf897dbe36cdb66c16e72";
+          sha256 = "0zviwc49h80jlgp34ddg95lx4z4pasq5rxqj1dv3xcyaw8rkg4af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -30073,12 +29845,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20170809.719";
+        version = "20170821.1241";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "061bad7cbb939540a559b412b1cf2df25b45cbff";
-          sha256 = "0wrqjmdipg515idi385d2yk0vxsq5dkdd0qg743ia90kndcfbwda";
+          rev = "d6b8d37f34e0be49b452d6017698afc48b8d61fb";
+          sha256 = "0ay8cv4n27rbkcfqxwf20cva6bjzwnf3yvdqg1q6b3cqmvak4mni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -30220,12 +29992,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170803.703";
+        version = "20170819.1015";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "f85e1bc2666a9d668c808984757862c9aa93d269";
-          sha256 = "00iggj2vnjf3sy276mq79ia86ll83p9g426miy3n6ig8pr333sz4";
+          rev = "2a1c00f81a2fe702e205f99ec4d235dfe468b426";
+          sha256 = "069n9226ndgadrdfv64wphnhp0g96q2wcnmwsqfw6iq1xyy08ckl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30637,27 +30409,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }:
-    melpaBuild {
-        pname = "harvest";
-        version = "20160811.1810";
-        src = fetchFromGitHub {
-          owner = "kostajh";
-          repo = "harvest.el";
-          rev = "384e1ae10dcbdec4a1e2097094a8160507ea46a6";
-          sha256 = "1bvgca35gl2daccpmhaa4q166iyaqachyd2k8n9vd6hlbbn4rrgl";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1dcfc8f0759792367ee49d2fe96e5bd7ca4105f/recipes/harvest";
-          sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd";
-          name = "harvest";
-        };
-        packageRequires = [ hydra s swiper ];
-        meta = {
-          homepage = "https://melpa.org/#/harvest";
-          license = lib.licenses.free;
-        };
-      }) {};
     haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-emacs";
@@ -30807,12 +30558,12 @@
     hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "hasky-stack";
-        version = "20170814.417";
+        version = "20170818.2201";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-stack";
-          rev = "bbbe58bf11f0188dfc71d3786a1bef73b9650fba";
-          sha256 = "0x31qljrp83r3c34j0npjw49sy491la894x8g8vh5gbih8xd72jm";
+          rev = "e256e50fce9a65cad1754d863d9ed969b159cefe";
+          sha256 = "12rf51l5dg4c5jkn0rsyr47wfsw9qnmzl0hmsa8j04fm8nr978x7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -31014,12 +30765,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170814.46";
+        version = "20170821.954";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "80dada6a077b29e2f05371b320ac4fcf7ab43b65";
-          sha256 = "10902xi9l4564qm4qv5vnw06xqgwl30i3cs9p6amlwcfcppwfmd4";
+          rev = "5e4081322f0f673e1709993ec3c59c33cd508fc3";
+          sha256 = "0hl9z0zwch78bmndrswcjgcl5wgai2pndm7qxnmxd7yh0bxv20kb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31333,8 +31084,8 @@
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-bundle-show";
-          rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a";
-          sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
+          rev = "850fecb36f609f1dfd5d20ca0170c9a6b7f90ab9";
+          sha256 = "06xi91dy88qnqwqsknhf695324vsiz1vn2fmwl6llywa03k0xnl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show";
@@ -31623,12 +31374,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170810.2231";
+        version = "20170821.1152";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "80dada6a077b29e2f05371b320ac4fcf7ab43b65";
-          sha256 = "10902xi9l4564qm4qv5vnw06xqgwl30i3cs9p6amlwcfcppwfmd4";
+          rev = "5e4081322f0f673e1709993ec3c59c33cd508fc3";
+          sha256 = "0hl9z0zwch78bmndrswcjgcl5wgai2pndm7qxnmxd7yh0bxv20kb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31683,27 +31434,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }:
-    melpaBuild {
-        pname = "helm-ctest";
-        version = "20150823.408";
-        src = fetchFromGitHub {
-          owner = "danlamanna";
-          repo = "helm-ctest";
-          rev = "973a138aa8ff4c6a1cd798779e8d0dd80522354d";
-          sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/03e17f3700cc531133990bc78ade09132f439664/recipes/helm-ctest";
-          sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
-          name = "helm-ctest";
-        };
-        packageRequires = [ dash helm-core s ];
-        meta = {
-          homepage = "https://melpa.org/#/helm-ctest";
-          license = lib.licenses.free;
-        };
-      }) {};
     helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dash";
@@ -32194,8 +31924,8 @@
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
-          sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
+          rev = "49481685adbb25b3f766aabfdb7472becc673a94";
+          sha256 = "1gxb4cqfzkdag8v6id7bvlv0bvqbfl8mdxphll4pkf1nqj9fk69j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
@@ -32463,12 +32193,12 @@
     helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hatena-bookmark";
-        version = "20160528.614";
+        version = "20170821.646";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-hatena-bookmark";
-          rev = "8350a600d3e03f1ec7dc899cc0b2e323b12518bb";
-          sha256 = "0hmvyyhddpf831cad35c9z9fv5mpdq6qg4nzbdghlqs9pf7ik6h2";
+          rev = "ee0d2554f573779210b0e2595e539b3e28461f1d";
+          sha256 = "12qb9jnqa2nl3asfa178ijjrrxkrwddlxf6y6m0d79j2fnqrgbr6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
@@ -33344,12 +33074,12 @@
     helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-qiita";
-        version = "20160528.611";
+        version = "20170821.609";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-qiita";
-          rev = "45e38ae7b816da5db38412b2992c6d1c7a6cc30a";
-          sha256 = "05394vf125qlgfrhkaqvly3340qp3zy7kldsnisms9gv0l1c60bq";
+          rev = "f00a61fc802d0f6442f07e7bd1c55fedf60f3895";
+          sha256 = "0z5xyb4kh3hwv8a869kgfx7hdzmja4ksvfkmc7v0xmxzjcg3nb7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
@@ -33537,8 +33267,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
-          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
+          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -34583,12 +34313,12 @@
     highlight-function-calls = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-function-calls";
-        version = "20170812.1913";
+        version = "20170819.2025";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "highlight-function-calls";
-          rev = "bbbbb7fdbcd853163a4bc821c56603164d35792e";
-          sha256 = "1a73v78w4ms2lghjai1dvk1kf8jgx7ab87vqk94x4a2xyrfhbf3x";
+          rev = "ab017fe1f6576c7183fe297cf4a77d370d0db426";
+          sha256 = "1jf7gln3fxfz3d0crr5jawlpi0ccazlahdmm5s1jb90b53rx40nx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1eed3f9af218d21ea8db37ee91888e23e59bd5/recipes/highlight-function-calls";
@@ -34667,12 +34397,12 @@
     highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }:
     melpaBuild {
         pname = "highlight-numbers";
-        version = "20160717.1228";
+        version = "20170815.1412";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "highlight-numbers";
-          rev = "b7adef0286aaa5bca8e98a12d0ffed3a880e25aa";
-          sha256 = "1r07mpyr7rhd7bkg778hx6vbhb4n9ixgzkpszhgks7ri6ia38pj8";
+          rev = "444614973a4af7c9ad2431bdaa2005d95db41ee7";
+          sha256 = "0f8sczh4vm18qq9w350jzd5gigqai3m00khw4b9j85v85czx4p7d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers";
@@ -34895,12 +34625,12 @@
     himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
     melpaBuild {
         pname = "himp";
-        version = "20170810.1117";
+        version = "20170814.1215";
         src = fetchFromGitHub {
           owner = "mkcms";
           repo = "himp";
-          rev = "687ed90cbb1566fe09f7fb917c131c9f906f521d";
-          sha256 = "08dblmc68q233glpc7chv79a06rwly5nhkzfp3rzjvfphvnlihmq";
+          rev = "140234b7f7cde03cf858c5011a2ab63e3bc802ec";
+          sha256 = "1g3ivash185anw8i67di1mxdfxa9py51prdy5ixl95vpqk5nmwbw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp";
@@ -35288,15 +35018,15 @@
     hlint-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hlint-refactor";
-        version = "20151124.1241";
+        version = "20170817.2148";
         src = fetchFromGitHub {
           owner = "mpickering";
           repo = "hlint-refactor-mode";
-          rev = "695d39b3434a5e35fab70aa5251f824ffaa30d6b";
-          sha256 = "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp";
+          rev = "92c69aa01c65968e86c15db087bb1ea785e4736c";
+          sha256 = "0khnn8qk0948hlq513i7nhf7vg09iwznmj3bgw1b5k5r8j6lhs0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/79363587b07f68e30a98698fd33ab39153bcb06c/recipes/hlint-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/hlint-refactor";
           sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq";
           name = "hlint-refactor";
         };
@@ -36309,12 +36039,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20170813.2325";
+        version = "20170819.1045";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "e7194753330fb5da295fbb5d1e819b9b4fd926b2";
-          sha256 = "1ll19xlchf4br27yxr2f8jb3q5d0cypjjjj852d8g8pgs565amaw";
+          rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1";
+          sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
@@ -36624,12 +36354,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20170813.946";
+        version = "20170819.1045";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "e7194753330fb5da295fbb5d1e819b9b4fd926b2";
-          sha256 = "1ll19xlchf4br27yxr2f8jb3q5d0cypjjjj852d8g8pgs565amaw";
+          rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1";
+          sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
@@ -36729,15 +36459,15 @@
     ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ids-edit";
-        version = "20170709.338";
+        version = "20170818.802";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ids-edit";
-          rev = "8d46429ef1a32c69d770f8187545588549086c91";
-          sha256 = "014apjzy6hgcg1mrvhkbp77baz59nafh96az2kfgixp8vwpmjyf4";
+          rev = "8562a6cbfb3f2d44bc6f62ab15081a80f8fee502";
+          sha256 = "10h64c5n9piq9ly7ipqq33ji8x8vwh9j1h7r05yab8a2sn0h8587";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a1aa957ef9ec3db055f439f1cee2994e65ee17ea/recipes/ids-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ids-edit";
           sha256 = "1n4gpcl3qj65cmaq9cdljsmrf84570z4chfvga6slsqjz5him8d1";
           name = "ids-edit";
         };
@@ -37056,27 +36786,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    imgix = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild, s }:
-    melpaBuild {
-        pname = "imgix";
-        version = "20141226.1332";
-        src = fetchFromGitHub {
-          owner = "imgix";
-          repo = "imgix-emacs";
-          rev = "4906ff0b4f7c9e84a5beb81630fe6d522ec91eaa";
-          sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix";
-          sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg";
-          name = "imgix";
-        };
-        packageRequires = [ cl-lib dash ht json s ];
-        meta = {
-          homepage = "https://melpa.org/#/imgix";
-          license = lib.licenses.free;
-        };
-      }) {};
     imgur = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imgur";
@@ -37289,12 +36998,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170808.1327";
+        version = "20170818.1523";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "ee843f08cf6f862b298728103c142ce56824dfc4";
-          sha256 = "070yw07fcimblzy94pg1mvf7n5dv91wwq7kwyys4zkm92ypl874l";
+          rev = "0bb43ddcf0e206d5144ce412c63a106556224fd0";
+          sha256 = "1g23y9j3inzl7fdyzcpn02r7fva0x6g4j8pcjjimpwi3z8h6aswm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -37378,27 +37087,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    inf-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
-    melpaBuild {
-        pname = "inf-php";
-        version = "20130414.21";
-        src = fetchFromGitHub {
-          owner = "taksatou";
-          repo = "inf-php";
-          rev = "4396022d6e169f0cf30cd9f68ca575d8b30c418a";
-          sha256 = "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/da48d14bd46f25976f7109306f335bd57b237ee5/recipes/inf-php";
-          sha256 = "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d";
-          name = "inf-php";
-        };
-        packageRequires = [ php-mode ];
-        meta = {
-          homepage = "https://melpa.org/#/inf-php";
-          license = lib.licenses.free;
-        };
-      }) {};
     inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-ruby";
@@ -37406,8 +37094,8 @@
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "c14a68d1643ac3f439234da6a8275b48cae970d3";
-          sha256 = "0b6qp9xljxn4mrh1xcv6fzklq963hrchq8iab4746kvylhn1xmsk";
+          rev = "674a2a837fccea88ada6634e981a656b41d16d8e";
+          sha256 = "09am0gq1sx0wv7bvcs7pp118brjj19qr7mis7cxjvrxbryc1mxf4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -37502,27 +37190,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    inform7-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
-    melpaBuild {
-        pname = "inform7-mode";
-        version = "20131009.2354";
-        src = fetchFromGitHub {
-          owner = "fred-o";
-          repo = "inform7-mode";
-          rev = "42458733947f2fbd44bc78f7264be247a5d8980b";
-          sha256 = "19kc6a8jkx22rg9xp862pqfhv0an7q6fs7v7i2kxp3ji55aq001w";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/inform7-mode";
-          sha256 = "0fpnf9rgizsfz9pn06k87v4s0dr7z1pn0gdxfi6hnnv68qni8hg3";
-          name = "inform7-mode";
-        };
-        packageRequires = [ sws-mode ];
-        meta = {
-          homepage = "https://melpa.org/#/inform7-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inherit-local";
@@ -37670,27 +37337,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "inline-crypt";
-        version = "20130409.507";
-        src = fetchFromGitHub {
-          owner = "Sodel-the-Vociferous";
-          repo = "inline-crypt-el";
-          rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282";
-          sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5bf7761c9091260d378621907a1689498aedc098/recipes/inline-crypt";
-          sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
-          name = "inline-crypt";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/inline-crypt";
-          license = lib.licenses.free;
-        };
-      }) {};
     inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inline-docs";
@@ -38174,12 +37820,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170725.1249";
+        version = "20170821.1300";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "d47bc8d94748dbd87fed9bf92cea85e115a39031";
-          sha256 = "1hmrpz8fv8prw5jwipfy56m4fw2sbx14nm251wjva5503bim3lw5";
+          rev = "f58f36253b697d2b3183f1a0b73a8a3af89360ef";
+          sha256 = "0509np04cw6sqlwgn837fjb4q0n48s481nv4mc2rngix5pjfpx3v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -38443,15 +38089,15 @@
     ivariants = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivs-edit, lib, melpaBuild }:
     melpaBuild {
         pname = "ivariants";
-        version = "20140720.2127";
+        version = "20170818.739";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "emacs-ivariants";
-          rev = "f9deff2e6fba5647f69771546fb2283136d0fb0d";
-          sha256 = "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si";
+          rev = "c056850745fcfa1e20aed9f6a7378869c623b5c7";
+          sha256 = "19dw5gg8zb27m5j7iwqzzbbbqy5nl6zysx0a1mv8fp68psapl0ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4caff7dc7c8b328c21a3c3cb51c505c21f044ee7/recipes/ivariants";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivariants";
           sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw";
           name = "ivariants";
         };
@@ -38464,15 +38110,15 @@
     ivs-edit = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivs-edit";
-        version = "20140720.346";
+        version = "20170818.741";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ivs-edit";
-          rev = "c496e85f93f6f00e723d9df0ea0703f6c672826b";
-          sha256 = "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva";
+          rev = "5db39c234aa7393b591168a4fd0a9a4cbbca347d";
+          sha256 = "1sdl83cf87zbv0ynvb6qlgbpm4d3dqhdn84jhhs5j247r5qzhmz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fd59ccf003a7fc4165dc7e34c1648e85abe378f/recipes/ivs-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivs-edit";
           sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2";
           name = "ivs-edit";
         };
@@ -38485,12 +38131,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170813.351";
+        version = "20170817.1000";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
-          sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
+          rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f";
+          sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38615,8 +38261,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
-          sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
+          rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f";
+          sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38720,8 +38366,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
-          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
+          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38779,12 +38425,12 @@
     ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
     melpaBuild {
         pname = "ivy-youtube";
-        version = "20170217.404";
+        version = "20170818.1432";
         src = fetchFromGitHub {
           owner = "squiter";
           repo = "ivy-youtube";
-          rev = "7e916dd531c52a2809188a99716aeff8446056cc";
-          sha256 = "1dia1m9fjxbd5lsf788bv7zpdbrwbjswd9m588iaijcdd2hnma8q";
+          rev = "c80bbab9d499d96bee3eb9a6d9be74ad254ec86d";
+          sha256 = "0n2v1w2801yxc71xd0vwma7y4nzs2qgnwbmkkx3xiq4n049sqd8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
@@ -39089,27 +38735,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    jaunte = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "jaunte";
-        version = "20130413.219";
-        src = fetchFromGitHub {
-          owner = "kawaguchi";
-          repo = "jaunte.el";
-          rev = "b719c2d4d5d70640d70978b661863d10d6be06fc";
-          sha256 = "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/jaunte";
-          sha256 = "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf";
-          name = "jaunte";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/jaunte";
-          license = lib.licenses.free;
-        };
-      }) {};
     java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "java-imports";
@@ -39239,12 +38864,12 @@
     jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jbeans-theme";
-        version = "20170413.901";
+        version = "20170816.754";
         src = fetchFromGitHub {
           owner = "synic";
           repo = "jbeans-emacs";
-          rev = "ee3c3b95e4a8697438d48757c604f9491b395417";
-          sha256 = "10zgdc4619y7w80w41jvr63s3wms52kfz011gaxwhzdgm2mdjqav";
+          rev = "19a09bebc20fc981e77950e8495162de49c824ae";
+          sha256 = "06my9qmj936f80gc9nn1akjr6fjal23125zkllz8csm1j83vqcvk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -39762,12 +39387,12 @@
     js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-closure";
-        version = "20160715.1536";
+        version = "20170816.1218";
         src = fetchFromGitHub {
           owner = "jart";
           repo = "js2-closure";
-          rev = "2b99540f43ddae123014d0fe20c66f5b536312cd";
-          sha256 = "0f280vk7mhslra793183jmi72hlhiq5mgjd0f0b6hr0gyj3iszb0";
+          rev = "f59db386d7d0693935d0bf52babcd2c203c06d04";
+          sha256 = "09zfmxi9m883lzsafnws06ifpq92b2i9q05pxk085vgkdpq35nss";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure";
@@ -39804,12 +39429,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170812.1419";
+        version = "20170815.1415";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "048da26e17a1011f1466794218ff175acd503c31";
-          sha256 = "17hnal44lcbdb5cma1mlbf1flc73vnsbyjhd56hh4bw2qz47zvz9";
+          rev = "df51992a648c7fb3e441106defdbffa2ef2f020d";
+          sha256 = "08k0szwbwsgx2q1qm356f88jif36yqz8lnpylib24jy2plx24j5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -40243,12 +39868,12 @@
     jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jump-tree";
-        version = "20170812.2310";
+        version = "20170819.2137";
         src = fetchFromGitHub {
           owner = "yangwen0228";
           repo = "jump-tree";
-          rev = "d74a10e86dde8f54b9c3c5392735c0e4d2fc26cc";
-          sha256 = "1vqzy9ddmy8jsacxfd94qsdxcx5w310wdnsw115lvm7cl93l8jjl";
+          rev = "70db2bed56e6e3433ae1f57df4aaa128e644faa7";
+          sha256 = "1w0a33mrg4dqkq7rfs182d57lg9r15ab48m7hzb9zm0i6c79aqzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree";
@@ -40980,8 +40605,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "0cc3a981220c228d68ce371c929808ce328a0b12";
-          sha256 = "1lxgp5isrl6c0zd03gv6r84qlgqqx4gf6b22yshhg333wccfl3h7";
+          rev = "5b9a1c94e36e38500d72379b50e091e5aca522a6";
+          sha256 = "0si4xbqz5pcwrikawwjp9yjcrfi1fpiarfnym0c9pbrdr77a8mv3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -41060,12 +40685,12 @@
     kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20170811.105";
+        version = "20170818.2206";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "56440a40e0b43e639e0530414940b21cf4c24280";
-          sha256 = "0a1ld6kr244957yh2nlqcr9xf77kzgn9p2b5mhbmwphvfc0r3a1x";
+          rev = "a032d13a3f39f260d7d00d62f32dce0f8a5927ab";
+          sha256 = "0c883yprblda22jq3jjdz9nd6ha6dbwfn6n8y448qln8dzj9sd7p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -41499,12 +41124,12 @@
     latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-extra";
-        version = "20160328.1721";
+        version = "20170816.1847";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "latex-extra";
-          rev = "9e89c5548298394aa47a5087a8e79655105a6f3d";
-          sha256 = "1gz2zay2wah56s0gkkfnhfmm0wr1w4gjz51pb1q72br0n4r01xq9";
+          rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5";
+          sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra";
@@ -41960,12 +41585,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170809.1329";
+        version = "20170818.250";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "23d15ff1a54b8f034fa21bc597f680a37310dd8a";
-          sha256 = "1qlympn43shsx44clsgsdc88cdpqlwc1mwvdjkimypvpys5p6swz";
+          rev = "26fbd23d7417ae59e2d034d1873d97418d462268";
+          sha256 = "184k26i3f69nas5iqzlmbd3b4414dvs3xshnj689w58p08qsqgcl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -42698,16 +42323,16 @@
     lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lively";
-        version = "20160208.1035";
+        version = "20170820.407";
         src = fetchFromGitHub {
-          owner = "emacsorphanage";
+          owner = "purcell";
           repo = "lively";
-          rev = "12df5ccaec03670de87c01b0b4cd3e2b96e0738a";
-          sha256 = "1qxw7i23z6c4yimrzpaqna8j39rashgbswdv4m0x4qg4sqc7szdp";
+          rev = "49cf43815c04f0b84d20b527f5d712544a13a4db";
+          sha256 = "02in5dj50c82h2bb7l47b00w3hpn3c2788aiyq2bln06vpj1qq4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/lively";
-          sha256 = "0qnyqlhqmmfq2f47zmy29hn6wqrx5yvsax8kn63nmxw380gw1z18";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively";
+          sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g";
           name = "lively";
         };
         packageRequires = [];
@@ -42785,8 +42410,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "https://llvm.org/git/llvm";
-          rev = "ef4534aee526b0ef3563e578644b0092057089fa";
-          sha256 = "057ag54lav5kv14c18hmf8x5d7fryc64afnn9kzlc260m4qkniw2";
+          rev = "854f9175285330ee09ccb5a3ff448bd6883111f3";
+          sha256 = "0z1kvki59hl0flqhx1p2vsgnxhxyifphp840sgzs7v56dw8bdjb1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
@@ -43220,12 +42845,12 @@
     lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }:
     melpaBuild {
         pname = "lsp-haskell";
-        version = "20170421.328";
+        version = "20170814.1358";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-haskell";
-          rev = "c22e6f4a70156e615e303d623e75362d3b14bcf4";
-          sha256 = "1iv1y1pri313m5h59a06cydj8kkzy6ig4mi3hnzz5nxkcynd2whz";
+          rev = "a556e93fbe3068e0c374e261f1c4880c0812c434";
+          sha256 = "0ns9b528rknw5j9dkswjd208rjd98qqvn4s6c8dyfqcx11gcf0hc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -43262,12 +42887,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170629.33";
+        version = "20170816.1123";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "3e93b3fd754931cfd122855659afbd070d844bac";
-          sha256 = "0g45zrch41041axpi5j6jbng1dbjqhpysr38cv2f1kqdmw9ybg9a";
+          rev = "460334192ad6c96c0d7204d537561477dcd80586";
+          sha256 = "1khwzn0z422is124pfl508c11v402ln4231bk2hq0dk9j6r1mrkm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -43287,8 +42912,8 @@
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-python";
-          rev = "5e032b39d74e63dee9157bf967f3902caa8524fa";
-          sha256 = "1rhk6hlcvvg9yqy3x9fx8qdvhyf2aih2k6m4x5cr80mzvczmxl31";
+          rev = "7057d3797ecfafab21f3365fd55ba14d44b278ec";
+          sha256 = "1gw8zfxd9chln8z8sdxy9xjzs74q5zbhsgl9zc3sl8d0ml027qar";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
@@ -43642,8 +43267,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "5c05bdb9de39872649821ea3c70f3489741bcc66";
-          sha256 = "0g6578fpycfg7f5v3a7q6vaqgvcnxyf90yzg9mkjgis7b3im8jb7";
+          rev = "8810adb1ff5388c5e4e5a7671b4e207eb49985e2";
+          sha256 = "1q9bhy0ig5jg8wcq35pdpsmwwzl2vr2pbcd1zm2pc2c3ajgilkyk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43859,8 +43484,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "5c05bdb9de39872649821ea3c70f3489741bcc66";
-          sha256 = "0g6578fpycfg7f5v3a7q6vaqgvcnxyf90yzg9mkjgis7b3im8jb7";
+          rev = "8810adb1ff5388c5e4e5a7671b4e207eb49985e2";
+          sha256 = "1q9bhy0ig5jg8wcq35pdpsmwwzl2vr2pbcd1zm2pc2c3ajgilkyk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43981,12 +43606,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "magithub";
-        version = "20170810.1947";
+        version = "20170820.956";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "dccda82fff3532ac6af262f3020b4b063a223045";
-          sha256 = "1mn53vqxf8al0a8plx1wv502iglvgnlbi2adlllyh8vjjgfk3w9m";
+          rev = "cd3b194f8f7f3a7f75f755552d48dfae9e5ed5cd";
+          sha256 = "08vgz3sg3c23cl20330zw19rd2vxnhx04b6k0rgyh95mv61lgy36";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -44377,35 +44002,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }:
-    melpaBuild {
-        pname = "mandoku-tls";
-        version = "20170611.6";
-        src = fetchFromGitHub {
-          owner = "mandoku";
-          repo = "mandoku-tls";
-          rev = "e21205ca9c1c053801190f291d6583ce057e8a65";
-          sha256 = "0yd33hflm1da61mc54y7yaaxb6y8gzv00n4ghcqn6rp4vlmi6534";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/mandoku-tls";
-          sha256 = "0zny1l548rvjsbbzj47wysz6gk1sqxvpj215r3w84vw5dyrn78bz";
-          name = "mandoku-tls";
-        };
-        packageRequires = [
-          emacs
-          github-clone
-          helm
-          helm-charinfo
-          hydra
-          mandoku
-          org
-        ];
-        meta = {
-          homepage = "https://melpa.org/#/mandoku-tls";
-          license = lib.licenses.free;
-        };
-      }) {};
     map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "map-progress";
@@ -44535,12 +44131,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170812.1201";
+        version = "20170817.822";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "c79ab7eac618f54c73ffade336e043dc397ca032";
-          sha256 = "12m1hvm918gw5v1xgyc6yhlijsrq0l0875fyv5zbjs88svw52r7i";
+          rev = "737a4fd5bf555aff5cfc6a19e82a7af527846702";
+          sha256 = "1y9nf7976x8c7d2m4pxsm6hlks3v5ra4cv8kqrcp1ly7wcjr4gm4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44598,12 +44194,12 @@
     markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
     melpaBuild {
         pname = "markdown-preview-mode";
-        version = "20161211.1443";
+        version = "20170820.459";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "50e5baed5ca3a1d2fed08f32802976a5ed358fed";
-          sha256 = "1p1npnhlh99m9pxvd1jhbzn9dxhg5fjml1bw8yakrv7k1h6zwrd3";
+          rev = "134fd336750b8b3165bc906f0a7161c25eb6f589";
+          sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
@@ -44836,12 +44432,12 @@
     math-symbols = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "math-symbols";
-        version = "20151121.1642";
+        version = "20170818.759";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "math-symbols";
-          rev = "666b1f00d9e106cf2a3a7d58c2262fe9a1404764";
-          sha256 = "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la";
+          rev = "3f8b466f002e1b28ddbe9a6f236c9a1352adb17d";
+          sha256 = "0r63acgicb43p05gsiz98m7077sj72c1miz18fi8qbzi02p9qjr7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7b0799bddbbbecd12bc1589b56a6250acf76407/recipes/math-symbols";
@@ -45187,27 +44783,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    memento = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "memento";
-        version = "20150823.339";
-        src = fetchFromGitHub {
-          owner = "ehartc";
-          repo = "memento";
-          rev = "35733b79101f694346792a57df686cbffe64bd79";
-          sha256 = "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3bee3cd6b491bf8813ec2332794b2548603014f4/recipes/memento";
-          sha256 = "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8";
-          name = "memento";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/memento";
-          license = lib.licenses.free;
-        };
-      }) {};
     memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "memoize";
@@ -45519,6 +45094,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mic-paren";
+        version = "20170731.1207";
+        src = fetchFromGitHub {
+          owner = "emacsattic";
+          repo = "mic-paren";
+          rev = "d0410c7d805c9aaf51a1bcefaaef092bed5824c4";
+          sha256 = "0f24ibzgra94bwal8b0dpjxa11n42gkmanqswfnjhlvx052v9dxr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0e54eac31fbbce9a778fb654f07e11aaaa46ca/recipes/mic-paren";
+          sha256 = "17j0b8jyr0zx6zds2dz5fzvarm2wh8l5hxds2s90kh5z0kk23r07";
+          name = "mic-paren";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/mic-paren";
+          license = lib.licenses.free;
+        };
+      }) {};
     micgoline = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "micgoline";
@@ -46291,8 +45887,8 @@
         src = fetchFromGitHub {
           owner = "ludwigpacifici";
           repo = "modern-cpp-font-lock";
-          rev = "0a5a4ae4d3115eb95ab6047faf8d1734a238ab70";
-          sha256 = "1ax7kvxj8z6ldfxr9017ws1lligjaxxdrcxb651i10m7jdw3bjd4";
+          rev = "b0a45dc1d7c49854988103c2570c783f46f44566";
+          sha256 = "1gh7l6c4xznpjialbmswhfm1cmmbzkl2s6acjcway0nb52rshgr6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock";
@@ -46438,12 +46034,12 @@
         src = fetchFromGitHub {
           owner = "fxn";
           repo = "monochrome-theme.el";
-          rev = "58fb4cf28c407f059b78bfd72c4dbced07638dd6";
-          sha256 = "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf";
+          rev = "bfca67fe7365310bc47ae9ca96c417caada54896";
+          sha256 = "0jvsss38rgry37dnshxbqxcj7qh1q6iyza58kix47h5wbnrpvszn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bd753349134f4db6f80b6e86d4facd1704e87ccc/recipes/monochrome-theme";
-          sha256 = "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/monochrome-theme";
+          sha256 = "0cq2clliwcwnn1spz1w6y5qw1lgqznw212rcc4q6f1kslq0jyk5x";
           name = "monochrome-theme";
         };
         packageRequires = [];
@@ -47556,27 +47152,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    n3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "n3-mode";
-        version = "20141027.1057";
-        src = fetchFromGitHub {
-          owner = "doriantaylor";
-          repo = "n3-mode-for-emacs";
-          rev = "0145e7938c30183edb03a55a4f16390dabd191ec";
-          sha256 = "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a71e3a572cb2ff58c731df9ff6a65b69ebd8f6eb/recipes/n3-mode";
-          sha256 = "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh";
-          name = "n3-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/n3-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     n4js = callPackage ({ cypher-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "n4js";
@@ -47849,10 +47424,10 @@
       }) {};
     narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "narrow-indirect";
-        version = "20170307.921";
+        version = "20170820.1748";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=13";
-          sha256 = "1sdyya2gmmd2h39kmijf514y3vln6ax5xdfsrkx1hcalw4l418gh";
+          url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=14";
+          sha256 = "16knfw5h15f7al6sn1n40bcw2ahqsy9ipkvfk0h7r1vlpb92w2fq";
           name = "narrow-indirect.el";
         };
         recipeFile = fetchurl {
@@ -48125,8 +47700,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "d0777b677c50714415174e407a321efc1e9bfdae";
-          sha256 = "19darrq975w11n4809f5blrc3paaxpdxmvwmsd96k8g5gwi0yf5m";
+          rev = "5809965fc8f4bc33133c10e49758cf60b069b82c";
+          sha256 = "1fmvdndnr1i5rywjc7r40y0cxshs06qvw488lhg15n5kl2z4271l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
@@ -48370,36 +47945,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    niflheim-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "niflheim-theme";
-        version = "20150630.821";
-        src = fetchFromGitHub {
-          owner = "niflheim-theme";
-          repo = "emacs";
-          rev = "5265e89164132fbdbc13146a79f0abce78bd0c5e";
-          sha256 = "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/36d82e64af02289f759239f24dd6d921a6eb3f0f/recipes/niflheim-theme";
-          sha256 = "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36";
-          name = "niflheim-theme";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/niflheim-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20170805.1240";
+        version = "20170820.1810";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "26a20424a087b0de16004b1e0186060d08d6baac";
-          sha256 = "1m6kxhy6cvcwcv9j9l8wgkgqy56yqmnqdlwr3hp22vbancvqfl16";
+          rev = "517f2682799bdead083e91de5eeac766dc8e34fa";
+          sha256 = "1hfvrcj9bhl2xc3hsg9q4kqwaj7saybpiq8fv1q3wz4k2y948cdy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -48475,22 +48029,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "20160502.637";
+        version = "20170811.1927";
         src = fetchFromGitHub {
           owner = "NixOS";
-          repo = "nix";
-          rev = "f76e85d8f581cc8f71b66386e86ed93c2c3d6992";
-          sha256 = "0fh790mwr8q9ch0rvf3sp9mwrq5iya8w2dpbpazkl2lsll7d3nyi";
+          repo = "nix-mode";
+          rev = "42632ee471aed3e8a1a6ef385d1ee8bc43938a42";
+          sha256 = "1ra37fszvhx8168c1vr0dpgjryz50mmwxm8yx2wqg9yggwwnyql3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
-          sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
+          sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3";
           name = "nix-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/nix-mode";
           license = lib.licenses.free;
@@ -48604,15 +48158,15 @@
     nnir-est = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nnir-est";
-        version = "20140301.602";
+        version = "20170818.746";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "nnir-est";
-          rev = "ba263fbd872fe05cfa6b3d815c0d98cdbe24b687";
-          sha256 = "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1";
+          rev = "dc1fee4757725b8171b755313d7bafbf1364f49a";
+          sha256 = "054mzb1h7smvvpzkg59pb4fd5rnig9j937wwvdr9s9222akyvkma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9ad5bcd7e5cc71bb40803b9b39c40310574f3450/recipes/nnir-est";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/nnir-est";
           sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv";
           name = "nnir-est";
         };
@@ -48625,12 +48179,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170805.450";
+        version = "20170815.119";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "no-littering";
-          rev = "d556a4cd3bfd3827c3d395ff6cd1e6086658589d";
-          sha256 = "0ybkiwidrmrnmf7sgd8vdfh5nhdi02yfw330rqr7xw5vf0k9fsap";
+          rev = "c9cd2fc9413a41a6c5240969cbe2ae9e47762b9d";
+          sha256 = "05n2wnk7x814fzpcmndiydhafgszz5h66vpa051qk3xcp6zn9i7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -48832,11 +48386,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170720.301";
+        version = "20170820.433";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "178d62cf9c9959fe603c9ffef9fa90f65b67dcd5";
-          sha256 = "12f91c5a11f4sn27a259h5mv1jw4s71gh27caq5nk8ixr1ra9ikm";
+          rev = "49d4f52f270773f86c90eb1c50805d1d7429d39b";
+          sha256 = "1f8jqkj5y2h95qz1zdzas0yrwjgxv3hdly6cscsm2qp0hkvzga0h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48997,12 +48551,12 @@
     nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, transpose-frame, undo-tree }:
     melpaBuild {
         pname = "nu-mode";
-        version = "20160520.614";
+        version = "20170816.1316";
         src = fetchFromGitHub {
           owner = "pyluyten";
           repo = "emacs-nu";
-          rev = "347f6c958f20d6e8e46bc7122556405b3a434242";
-          sha256 = "17nj8bkqw34hsbb8b51rl6221hlpxw265h2cwxqf64cswm22y313";
+          rev = "afc23383f0e3c4240d8d18ab7dd87edf595655ea";
+          sha256 = "0zp682b7w3ifni2x2x81xirg7f7kcx1jwqrxpx2j57lrvhszqg3l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode";
@@ -49183,27 +48737,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "nyan-prompt";
-        version = "20140809.2208";
-        src = fetchFromGitHub {
-          owner = "PuercoPop";
-          repo = "nyan-prompt";
-          rev = "b5137f2ee9afe640f59786eed17b308df6356c73";
-          sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e3bf5fe2adaf557146df6f4e13aa6ffedb5d1e3/recipes/nyan-prompt";
-          sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
-          name = "nyan-prompt";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/nyan-prompt";
-          license = lib.licenses.free;
-        };
-      }) {};
     o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "o-blog";
@@ -49689,12 +49222,12 @@
     ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-php";
-        version = "20160505.219";
+        version = "20170819.245";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "ob-php";
-          rev = "fd30c5e945a08b605725cf51808b3512ca885777";
-          sha256 = "02vmy3nnk4yyjbp3r7zzv9sb3frv7kbj4a2a855iqa0isp8nhyfi";
+          rev = "ffbda1f7df86778e3209ffeef832433f0eb25a69";
+          sha256 = "00ca5m6rmrxzy1aldmavv7f5i4pjfcyivrlgv2ri6dm8amvbk72r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php";
@@ -50274,6 +49807,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    old-norse-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "old-norse-input";
+        version = "20170816.1142";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "emacs-old-norse-input";
+          rev = "c2e21ee72c3768e9152aff6baf12a19cde1d0c53";
+          sha256 = "0zybr1v91884p4ncrpr962pr02qsns6hf7kc4c5gyad8sg4pbvxh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/84780a6ebd1b2294b86ae8c6df5bd6521cf4e85a/recipes/old-norse-input";
+          sha256 = "1g00h6ykf61ckr6f3r17j72w3h04p5q65aa3rhr5llk3jk1wv331";
+          name = "old-norse-input";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/old-norse-input";
+          license = lib.licenses.free;
+        };
+      }) {};
     oldlace-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "oldlace-theme";
@@ -50466,12 +50020,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170813.2215";
+        version = "20170821.1113";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "a9a66b047606c6b5dc48abdb0eb70a1f9dcd08f2";
-          sha256 = "0m1f62cr0h426g66c7r36v3yr2bdakkjwxzdvpd0gh81xazn8yjz";
+          rev = "46b2c3d16b83ce6e7e318d69ae74e1d7c4106549";
+          sha256 = "0g2zap8yyv31lkpmdnripg1q03xdb7sm3jzq7j17sgqak2a223xp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50685,12 +50239,12 @@
     opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "opencl-mode";
-        version = "20160220.909";
+        version = "20170816.549";
         src = fetchFromGitHub {
           owner = "salmanebah";
           repo = "opencl-mode";
-          rev = "bb39190bb4fdffa188ce4e6849853a07c682b999";
-          sha256 = "094r6fx1s76m8anqqg2qrddidn1dp08kmv8p8md27yy9mm49d91n";
+          rev = "6e69434d0fa6e11a542acad370611bba18d3bc5c";
+          sha256 = "00vhmbfh51mncx5xnzv96kbb5r6r27xw6xwvi7gf454zbvcibrws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d97575fdae88d55b55686aa6814f858813cad171/recipes/opencl-mode";
@@ -51082,12 +50636,12 @@
     org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-category-capture";
-        version = "20170731.2235";
+        version = "20170819.1047";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "480408737e8110a13ac5282588f1a4a5b86cd0e0";
-          sha256 = "121gx8wp38j4j2sqcx5jb91l7pq5214h2cc9qs1sh293a481wl24";
+          rev = "48f621b595e748c5e03431f237facf258ffc9443";
+          sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
@@ -51436,22 +50990,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-edit-latex";
-        version = "20170621.758";
+        version = "20170816.114";
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "4c22ff6d63f2126f2526b68201ecb5a379812534";
-          sha256 = "0q20hz14pghlxi1df8qpdr3jkz3ph87c5qv1s264kkhjknip1yn3";
+          rev = "11481d0b324433e58d3846d5da675be559be507a";
+          sha256 = "1j2klbyfjyk5ysvnv9xihbkcb3lbfijkqf4c8bp38n6lb9bdhlhc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
           sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry";
           name = "org-edit-latex";
         };
-        packageRequires = [ auctex emacs org ];
+        packageRequires = [ auctex emacs ];
         meta = {
           homepage = "https://melpa.org/#/org-edit-latex";
           license = lib.licenses.free;
@@ -51645,27 +51199,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
-        pname = "org-jekyll";
-        version = "20130508.239";
-        src = fetchFromGitHub {
-          owner = "juanre";
-          repo = "org-jekyll";
-          rev = "66300a1a6676ab168663178e7a7c954541a39992";
-          sha256 = "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8e6059b532fc95e0251a1edb7b1e29d03477b3f2/recipes/org-jekyll";
-          sha256 = "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i";
-          name = "org-jekyll";
-        };
-        packageRequires = [ org ];
-        meta = {
-          homepage = "https://melpa.org/#/org-jekyll";
-          license = lib.licenses.free;
-        };
-      }) {};
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
@@ -51777,8 +51310,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "39b7357eea3550a695ec36d2810e31e89d8d0953";
-          sha256 = "0wch4wyn7k86xy7nc2rjszkkd73k80jl9dafhj0ihkvgf3za10bh";
+          rev = "526b3d4b980317ef176869011b9b152ef85b5258";
+          sha256 = "1gn7w15g7rhm609pkmg4riq9xj5lfkwc1f52mlcsiczaqn6n1rbi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -51797,8 +51330,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "39b7357eea3550a695ec36d2810e31e89d8d0953";
-          sha256 = "0wch4wyn7k86xy7nc2rjszkkd73k80jl9dafhj0ihkvgf3za10bh";
+          rev = "526b3d4b980317ef176869011b9b152ef85b5258";
+          sha256 = "1gn7w15g7rhm609pkmg4riq9xj5lfkwc1f52mlcsiczaqn6n1rbi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51832,6 +51365,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-mind-map";
+        version = "20170813.631";
+        src = fetchFromGitHub {
+          owner = "theodorewiles";
+          repo = "org-mind-map";
+          rev = "baf46fa5cbdc545d13be78badac359cb50706c89";
+          sha256 = "0z1yvii2956nv27wkb6qwzb74vn8b09bgv3r8xq5b9xhcxm7x2aa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map";
+          sha256 = "07wffzf4dzfj8bplwhr9yscm6l9wbz8y01j0jc8cw943z5b8pdgs";
+          name = "org-mind-map";
+        };
+        packageRequires = [ dash emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-mind-map";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-mobile-sync";
@@ -51919,12 +51473,12 @@
     org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }:
     melpaBuild {
         pname = "org-octopress";
-        version = "20170315.441";
+        version = "20170820.2115";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "org-octopress";
-          rev = "a8a251d6940623daae58453dd91630593c2536c0";
-          sha256 = "14iqxg75x7iq0wbjsir6ijbmbkapzfcxjc64kzncwa5ixgdxph3j";
+          rev = "38598ef98d04076a8eb78d549907ddfde8d3a652";
+          sha256 = "0bmj5wkwidj1v3b8ipligr0nkfdaxm82717nz8fqidz967q4xbk6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fba6c3c645ba903f636814b5a2bb1baca0b5283b/recipes/org-octopress";
@@ -51991,11 +51545,11 @@
     org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-parser";
-        version = "20170811.2231";
+        version = "20170814.2016";
         src = fetchhg {
           url = "https://bitbucket.com/zck/org-parser.el";
-          rev = "018959e57cf5";
-          sha256 = "0xyw7k195bvx7c0cmhwfjc89v7b0gfybsl4hgaid71fz2czjhx6j";
+          rev = "f568dd98a8b2";
+          sha256 = "15lbanb14ip0xwcd3ddq5a0099f299blvf6j3g03hmnzfa4pm7cy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -52115,12 +51669,12 @@
     org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
     melpaBuild {
         pname = "org-projectile";
-        version = "20170812.1500";
+        version = "20170819.1047";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "480408737e8110a13ac5282588f1a4a5b86cd0e0";
-          sha256 = "121gx8wp38j4j2sqcx5jb91l7pq5214h2cc9qs1sh293a481wl24";
+          rev = "48f621b595e748c5e03431f237facf258ffc9443";
+          sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
@@ -52136,12 +51690,12 @@
     org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
     melpaBuild {
         pname = "org-projectile-helm";
-        version = "20170729.1153";
+        version = "20170819.826";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "480408737e8110a13ac5282588f1a4a5b86cd0e0";
-          sha256 = "121gx8wp38j4j2sqcx5jb91l7pq5214h2cc9qs1sh293a481wl24";
+          rev = "48f621b595e748c5e03431f237facf258ffc9443";
+          sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
@@ -52426,12 +51980,12 @@
     org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-super-agenda";
-        version = "20170805.1106";
+        version = "20170819.2228";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-super-agenda";
-          rev = "98684212cc0879b8c24b21d5047181fcca24bd9d";
-          sha256 = "09zpyqgg2bcad793qi2kw2zb3dn03g7x8fx3a6mjyh0jvfqaaqz8";
+          rev = "63a48409b1046b25fd51fb8e464e30b0b8a0857a";
+          sha256 = "0lxldd7s4wvv00ny5asqml4yglbf86l93fhp51wkffdxwh4h9l8c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
@@ -52787,8 +52341,8 @@
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "bc398e6bb529b6b0022c24d570f4d65bbfd70d5b";
-          sha256 = "0fkms3hci43rb4dv74rfglwjgqiw23ggxr2pc1zcr29q0fra7hdf";
+          rev = "8bcf98ea538c1397f9fbe2098dc836fe9e1dcdf9";
+          sha256 = "08ddhdhrs0jz22g8dv0dzyqpdqsjii4cfjax3xsij8qvs4h593cx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -52981,12 +52535,12 @@
     orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org, org-mac-link }:
     melpaBuild {
         pname = "orglue";
-        version = "20150430.513";
+        version = "20150503.114";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "orglue";
-          rev = "4732f8bfd6866e20230b36e5971f2492827c6944";
-          sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6";
+          rev = "1274652d527cb6afe45d1acb79f41be5a2886ee4";
+          sha256 = "0qf2k89nldfm3njcnygh8ak8fz5m9ykmpzfx1cnfffxcyi139s9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue";
@@ -53419,6 +52973,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "outrespace";
+        version = "20170818.1835";
+        src = fetchFromGitHub {
+          owner = "articuluxe";
+          repo = "outrespace";
+          rev = "47df84553ca3df0f42da19fa79e7ddff6e50ca35";
+          sha256 = "1fckl6jim7i63zpq6jadagpzcq65ds23ya3n4ajilw611bd0jn26";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace";
+          sha256 = "13xasp9vjb3n0smdhrh9pq1yhhrg3p6z14fmlvf6xqip52rx89hl";
+          name = "outrespace";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/outrespace";
+          license = lib.licenses.free;
+        };
+      }) {};
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
@@ -53779,15 +53354,15 @@
     ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-pandoc";
-        version = "20170706.431";
+        version = "20170818.747";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ox-pandoc";
-          rev = "1dd4370f52b6db999f3b5edbb146c26034024ef4";
-          sha256 = "0cm1a83jblrp76z5a9hmicsq2b3i5xwpyy1d08ahk0hffq0mbimq";
+          rev = "558661d1b6ba98ce2dd9b8a498a01db341bbbe31";
+          sha256 = "0if6d8c04m2rgv0abxrav04fqz8v2y1bgkcxkmj8x8xr3fk675p3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -54094,12 +53669,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170814.616";
+        version = "20170820.524";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "c01d652cefa29df27139e52468f39fd98337746b";
-          sha256 = "0l6lr4bmfcdr1mviyqiwzbkylag1avy0wja4il4x4ia2r92jw89h";
+          rev = "58d5fcd4ddcb023fbd74b0bdb304cd3037a955d3";
+          sha256 = "0yqnbvswps2244zsib3ym3cbmd94sqn3yznfry5rwbq30b9fya2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -54115,12 +53690,12 @@
     package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-plus";
-        version = "20170802.2039";
+        version = "20170815.1956";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "package";
-          rev = "09338e859168b45f1eb7386da184c48d31473068";
-          sha256 = "0wc21d33xlgnw8j5qiv4r1rp2wglk3qcqlr1xcs0rmb4i5cjwnrm";
+          rev = "9213f6134eabc2cff5826779ced437714324c066";
+          sha256 = "0b20mxr5xvkydxn9gv246xls52is3jyhm5ckmrhkb2dp9qc4hfa4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+";
@@ -54175,22 +53750,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "packed";
-        version = "20170805.449";
+        version = "20170819.942";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "packed";
-          rev = "e8b20e287222dbf08ebc46e405412c3213102a7e";
-          sha256 = "1a02s0ssci6fywk4k8kq5prwz5j4y1270v05qw9wwxa0fx083rn5";
+          rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a";
+          sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed";
           sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd";
           name = "packed";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/packed";
           license = lib.licenses.free;
@@ -54741,12 +54316,12 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "20170802.253";
+        version = "20170815.225";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "2bc78649614356eff88f8c826d08782f5f804378";
-          sha256 = "19awdplirf1s4ajmcvw6b2wlkmrvx5v8i8m4b8glp4wchx27czgn";
+          rev = "358070a74f5bf13c0707e7da13a51c3c41eb20cd";
+          sha256 = "19m7gsvaagql5n9q8l7dm2h9ir2mg9d3h7lxfwh2bvpl3c9vsh2i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -54968,26 +54543,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    pastels-on-dark-theme = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "pastels-on-dark-theme";
-        version = "20120304.1022";
-        src = fetchgit {
-          url = "https://gist.github.com/1974259.git";
-          rev = "854839a0b4bf8c3f6a7d947926bf41d690547002";
-          sha256 = "1ar6rf2ykd252y8ahx0lca7xsgfs6ff287q9iij79gs9fhn4yfy5";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ab432b0eac0bcf0d40c5b3c8a78475bc0fea47d2/recipes/pastels-on-dark-theme";
-          sha256 = "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh";
-          name = "pastels-on-dark-theme";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/pastels-on-dark-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "pastery";
@@ -55327,12 +54882,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20170813.731";
+        version = "20170820.1117";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "0bff9727b7109f5303c4172f1f7b603e8e484c91";
-          sha256 = "0gdxvmzsf7v621y32ir33rn26qs75i59jvi2b2ji18xh32znqmb1";
+          rev = "c70520068cb316f736811e922a015347fdbcd30b";
+          sha256 = "03ys82k68d4f5xvhwjq2i2qxh8r4scj49rvgv2bdrsmnmzcpxdrd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -55432,11 +54987,11 @@
     pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pelican-mode";
-        version = "20170808.252";
+        version = "20170818.1352";
         src = fetchgit {
           url = "https://git.korewanetadesu.com/pelican-mode.git";
-          rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c";
-          sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw";
+          rev = "9b2a64b9d57ee4eb95e40a309fbab4bcfa5b5fef";
+          sha256 = "19gqg2p56r0iz5l3p5y421c107f3jggwi60xk2wamx5jv9rbrn2d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
@@ -56312,12 +55867,12 @@
     picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "picpocket";
-        version = "20170723.509";
+        version = "20170820.309";
         src = fetchFromGitHub {
           owner = "johanclaesson";
           repo = "picpocket";
-          rev = "ab40afe0e13dff43518233f16e889b44a8a3819b";
-          sha256 = "0snq5wdmdzpbxslixi1vzyi0sccqy9k7m3hwxn540352rsz8zxcz";
+          rev = "e1f5c9421b53aa0edc44509b9c8c4b4cebd691d4";
+          sha256 = "14x0qg9254yx7zqlsrm2843691gv4a976qx7q84srn89xznmq99n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
@@ -56687,22 +56242,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plantuml-mode";
-        version = "20161225.1142";
+        version = "20170819.1033";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "plantuml-mode";
-          rev = "c7e83c260778467be5f82500a5541ce76da662ac";
-          sha256 = "0lf2438ia39idxbz2b7qaagajnlfgf74cgvwppdl53hsy12b421n";
+          rev = "fce628885b54635b0287b3337626752b2725369d";
+          sha256 = "1pcxl00iwhrsi57s6gbf3bch00pkdxbg46p8xryn1w5r16xzd9pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
           sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
           name = "plantuml-mode";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/plantuml-mode";
           license = lib.licenses.free;
@@ -56936,12 +56491,12 @@
     pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "pocket-api";
-        version = "20170315.1934";
+        version = "20170818.533";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "pocket-api.el";
-          rev = "de4c14122ffe6a04c93590da0ad4b8411801c6f5";
-          sha256 = "1f1frnxsi8pgbmiycssq1jh1qjp12yfy1hq6zqscj0v510c4kzcq";
+          rev = "26e4583311ebc472f7bba59a1189f04938f2c03e";
+          sha256 = "04cf97mwkp5rw0dvnspdbrycywjdv4mljl6lbjhbvlijj745d5xm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api";
@@ -57144,12 +56699,12 @@
     pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pomidor";
-        version = "20170310.634";
+        version = "20170817.2253";
         src = fetchFromGitHub {
           owner = "TatriX";
           repo = "pomidor";
-          rev = "bac68f7a1c72da3db6020d3bda45e38576c9c488";
-          sha256 = "13bq9cm9aclnlsjzw66kig2618xr2v5sfb12dff8ja5hmw0j2jla";
+          rev = "58a4368d91d472aa47a83f498be82db8929cf41a";
+          sha256 = "1g6mwx6gq6zlzn06izic81qf2ppqprfmap5hgsksx1xbickkmwdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -57957,12 +57512,12 @@
     prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "prodigy";
-        version = "20160929.2302";
+        version = "20170816.1114";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "prodigy.el";
-          rev = "50a5d4e0c720e73ef0919cf8019a32d934e86616";
-          sha256 = "1a9cbzfchbiv7kafmim1mbx38y2iscibbgg6i0aq3200b30mxk57";
+          rev = "94d4d2870b86af1185e6395dabf15b3695846f38";
+          sha256 = "017xw1havxq9v6vxwvarmvxwk41jsrjik1mak5habmpfpwv78k01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy";
@@ -58165,12 +57720,12 @@
     projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20170727.2351";
+        version = "20170820.2210";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "5e9249dd42245222b26779e50cf9d00cae80bcde";
-          sha256 = "04zvr24dxzi1z70z0vq218x14mva3z6s4my7wx6c6c9fwma1vbx4";
+          rev = "74bac5b5744ed293533966cc4959cb366029fa5c";
+          sha256 = "13yw4rjmjgsajab4njlq7g5g8xh97f2xwpq9f2qfbsavkbpbf2p2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -58589,8 +58144,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "e0d24cc84a81d236daf0bbf783037c8c8c24d814";
-          sha256 = "1pw89g82cc7687n3ffap9pzj3af1zagpx2j880dayii1hrgk1p7i";
+          rev = "ba4e54724d2e6a1881c4fe88664d81fbacaf8c08";
+          sha256 = "1qa6qjixgw82jd9zwi6c11lqh2qkc444pwp1lczjrw2fm4iyw549";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58627,15 +58182,15 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20170711.511";
+        version = "20170817.1206";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "0a0ead9f8098afbb2f5648bfbbd5c3b7646a1b77";
-          sha256 = "0xfkj9kdd7i0jcca8nhsp7bv0x7wsxi03ncln9y8d7c2g72fjkdd";
+          rev = "fb3040a1204c4a6f7a54abc499fb88074627cb3e";
+          sha256 = "0fh2xv0rz5mkhqvcaj55wpx39f953qalz5v46v35nzmhc0fpmzab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide";
           sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
           name = "psc-ide";
         };
@@ -58658,16 +58213,16 @@
     psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
     melpaBuild {
         pname = "psci";
-        version = "20160717.1125";
+        version = "20170818.1301";
         src = fetchFromGitHub {
-          owner = "ardumont";
+          owner = "purescript-emacs";
           repo = "emacs-psci";
-          rev = "d773b407f772e6ab3c40406c22824889e0fd14fe";
-          sha256 = "1kvw5qj975s7r58858aiql9861rglz1xgj9n69g5li9mcdxk0v2f";
+          rev = "875ea3231e4aceadf7718daef75a1426ff8e87e5";
+          sha256 = "11yihnlm7cawyhgava70xja8rf0gi6j1jf3z4x8ylf5wjj6fbbfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a0f45269895b8e061c972da46f932c96eb0f5279/recipes/psci";
-          sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci";
+          sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9";
           name = "psci";
         };
         packageRequires = [ dash f purescript-mode s ];
@@ -58952,14 +58507,14 @@
     pushover = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pushover";
-        version = "20160718.857";
+        version = "20170818.1403";
         src = fetchgit {
           url = "https://git.flintfam.org/swf-projects/emacs-pushover.git";
-          rev = "c43f149eaef832f6af399723a5a59424aa093aaa";
-          sha256 = "0vrx8m7jcxavbfsyh35mf289vfyal0yrfl6h2m2yfx81whbinb5j";
+          rev = "bbe3ac8df3c532a72da4552615af960b8a577588";
+          sha256 = "187bisngi37n66ik2dq7rg4hy4nlxl9pifqgqq08kf9238y8hd11";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/pushover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e9553cd029bc0733c89d2c790cb173d9668a9eba/recipes/pushover";
           sha256 = "0im5bf2r69s2jb6scm8xdk63y1xi5zm4kg9ghfixlvyvipfli4kl";
           name = "pushover";
         };
@@ -59014,15 +58569,15 @@
     py-gnitset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "py-gnitset";
-        version = "20140224.2010";
+        version = "20170821.1032";
         src = fetchFromGitHub {
           owner = "quodlibetor";
           repo = "py-gnitset";
-          rev = "471eb99b83eb9f6915d8ca241e9770ddd6244a78";
-          sha256 = "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6";
+          rev = "1e993cc29cbc31e06fe1e335dec198e21972fa55";
+          sha256 = "1hslq2bdk95cgza9qbskxf942ckhjb4bqi6nrhbmlnm9agmjqm59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/187d97c797818c4e0f61073b9e24baf925c437ff/recipes/py-gnitset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/py-gnitset";
           sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r";
           name = "py-gnitset";
         };
@@ -59367,27 +58922,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "pyim-greatdict";
-        version = "20170724.1525";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "pyim-greatdict";
-          rev = "45fa4ff26f3444fb98c4dea460d84b740204d105";
-          sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-greatdict";
-          sha256 = "1bbindnklmmxdskv9vmjxhvlxxmaccgqn70prblhpg6n11bxjhl9";
-          name = "pyim-greatdict";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/pyim-greatdict";
-          license = lib.licenses.free;
-        };
-      }) {};
     pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
     melpaBuild {
         pname = "pyim-wbdict";
@@ -59458,8 +58992,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "8b4c0717fe6b73d329532ca74d408790c64a2b6e";
-          sha256 = "08v7cskyq6l9d6idw0piz54gz1xw1dqhl21r0xnhh16nza0ihrvf";
+          rev = "3b56d183ca3b148d2ff092bbda5b061c20660a2c";
+          sha256 = "1q0z0pij051nv9yb60c7wcdirycz3p3nl63yhs58pvpw6hxnwcfp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -59937,12 +59471,12 @@
     quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "quickref";
-        version = "20160326.936";
+        version = "20170817.532";
         src = fetchFromGitHub {
           owner = "pd";
           repo = "quickref.el";
-          rev = "9cad569c6eaeacf0b393a2c520ba444f6521ff38";
-          sha256 = "13svdvww8dbv75lg66xhca6xi08k7k44rsx2ckdf82j9i52y5lw6";
+          rev = "f368c8b8219bb90498c5ab84e26f00eedaa234cf";
+          sha256 = "0nalnfb816qk1dfxjk9j8r5lvzv2k4jf747xdjbj2mcvv07g2jd2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/quickref";
@@ -59997,6 +59531,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quiz";
+        version = "20170818.415";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "quiz.el";
+          rev = "64bc2f4b72f70a6c9eab6ebeaa49afb5fc34b879";
+          sha256 = "0zx1ic6cn95wa7b8afq0v2cb7rf8w48gmjlp2dlhz06vk78j1w27";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz";
+          sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg";
+          name = "quiz";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/quiz";
+          license = lib.licenses.free;
+        };
+      }) {};
     r-autoyas = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "r-autoyas";
@@ -60042,12 +59597,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170617.1942";
+        version = "20170818.1226";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "9c5bcb7b7db979b34c6e99ade84b443651d62ab7";
-          sha256 = "1cxpjkds24afi5b9i13dkgzv0yy6cgg3r9vsrif8mfhhfrr7sx1y";
+          rev = "0f8f36e1726166b1974ebea0e4c2e43de8fe2509";
+          sha256 = "09iy75d47q8s9nxv6qww6v6l87jv5fcqbim81hc56f2fwq3akylk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -60060,27 +59615,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    railgun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "railgun";
-        version = "20121016.2257";
-        src = fetchFromGitHub {
-          owner = "mbriggs";
-          repo = "railgun.el";
-          rev = "66aaa1b091baef53a69d0d7425f48d184b865fb8";
-          sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ba60673f2cb04176ed734c6457a20211609118/recipes/railgun";
-          sha256 = "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0";
-          name = "railgun";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/railgun";
-          license = lib.licenses.free;
-        };
-      }) {};
     rails-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rails-log-mode";
@@ -60102,27 +59636,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    rails-new = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "rails-new";
-        version = "20141221.49";
-        src = fetchFromGitHub {
-          owner = "cheunghy";
-          repo = "rails-new";
-          rev = "b68055a99cde15f9d02ab36b8ad0ea7ab35b2283";
-          sha256 = "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f86ccce9ea4ef3cb7e162d4572609d3a8216cc/recipes/rails-new";
-          sha256 = "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h";
-          name = "rails-new";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/rails-new";
-          license = lib.licenses.free;
-        };
-      }) {};
     railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "railscasts-reloaded-theme";
@@ -60315,12 +59828,12 @@
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "20170703.2135";
+        version = "20170817.857";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "905bd8e17c48fc270e66b846e8ada81462623e81";
-          sha256 = "1h299kk8w162f9k588a4c4ikl3276y47si81p7jbda2fhf9s5lck";
+          rev = "6bbff5df2e55f56047fca5058d9ca93ba4963aef";
+          sha256 = "000dqqy5fbic8rwyndchj5pjmzad2yfa7z3xzi84dla6vhv15q6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -60357,12 +59870,12 @@
     rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "rats";
-        version = "20170505.245";
+        version = "20170818.313";
         src = fetchFromGitHub {
           owner = "ane";
           repo = "rats.el";
-          rev = "40aee473d369cd27593cb7709f4792d1006ca8f7";
-          sha256 = "0aqs4xja66iwbk39m8w2dm9lcisvjkwym65vinj2ywnp5mkr6jg6";
+          rev = "a6d55aebcc54f669c6c6ffedf84364c4097903cc";
+          sha256 = "0cskw05jb7wckhfs2qs9pn5icxa93ay2mw2i1brsmdd0igz34lg3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats";
@@ -60487,8 +60000,8 @@
         src = fetchFromGitHub {
           owner = "kensanata";
           repo = "rcirc-color";
-          rev = "a94c7811e6ab578a138eb582f7ce31d3568b5c4d";
-          sha256 = "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497";
+          rev = "9fa5150685fac91323e7e32a1df190270de2ac01";
+          sha256 = "08v3gldqdhrix7k1qw1in1c9kr0xa43dlnscq0lm63arlnmijh3c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/146b31de03f1f588fda3f7e27a538f87e71077f1/recipes/rcirc-color";
@@ -61077,8 +60590,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "41370a8b7ae0d6273dd096d1f639485531f02859";
-          sha256 = "1gp8lcavxg9v3wll2kk1gcd63p0zlcxg7vc9753k7nk741rc2m1q";
+          rev = "56916601db4797712c7f1f62b44a8ccd5de3c6f0";
+          sha256 = "0kpyfx228n0dj36h80hkhl23phx6cmgcadig9kn8gsz9j2icfrpa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -61132,27 +60645,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    refheap = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
-        pname = "refheap";
-        version = "20140902.1402";
-        src = fetchFromGitHub {
-          owner = "Raynes";
-          repo = "refheap.el";
-          rev = "d41f8efb8e913b29035f545914859e3f18287492";
-          sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/refheap";
-          sha256 = "11w2pmkz56141gvyzyims9rd42djizni3g6dw4qa48bvlqc56klh";
-          name = "refheap";
-        };
-        packageRequires = [ json ];
-        meta = {
-          homepage = "https://melpa.org/#/refheap";
-          license = lib.licenses.free;
-        };
-      }) {};
     refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "refine";
@@ -61411,8 +60903,8 @@
         src = fetchFromGitHub {
           owner = "willghatch";
           repo = "emacs-repeatable-motion";
-          rev = "77aa35b27c8a76dc8deef87c9f71ef7e6fd289ee";
-          sha256 = "0pm9z0w402430j66167s1az37jxw89sck1b7lm9gjnc3gslh0lpm";
+          rev = "f29effdc4121c2dc7e3fec9b3a62debce29cda9d";
+          sha256 = "11s7r5g0djj0yc8ll7jfw5v3m9kyvaiscndnfnvvjw5lwgfyh0v3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion";
@@ -62010,12 +61502,12 @@
     rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rimero-theme";
-        version = "20170813.556";
+        version = "20170819.648";
         src = fetchFromGitHub {
           owner = "yveszoundi";
           repo = "emacs-rimero-theme";
-          rev = "ed6ad6ac4c67366f7fbdcf94bfe74b2f6683b395";
-          sha256 = "06ifk0i13zy915zv46wam3pyv92xn5sjil02kdgxzn68ry76xddz";
+          rev = "451b9d30f7ef711ee8c9c304677c7dcac6c57cfb";
+          sha256 = "0442s4pj8v4ympf8nk1zgrvk3d16djgdhknlvkwi296db3zixbc4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme";
@@ -62346,12 +61838,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170731.1057";
+        version = "20170819.1611";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
-          sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
+          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -62412,7 +61904,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59588";
+          rev = "59630";
           sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr";
         };
         recipeFile = fetchurl {
@@ -62466,27 +61958,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-dev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "ruby-dev";
-        version = "20130811.151";
-        src = fetchFromGitHub {
-          owner = "Mon-Ouie";
-          repo = "ruby-dev.el";
-          rev = "3a6f6e489697916dd554852492bd325879be2e44";
-          sha256 = "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b6e0c48ac1fa26e027c6a17f20eee7c084568cae/recipes/ruby-dev";
-          sha256 = "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh";
-          name = "ruby-dev";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/ruby-dev";
-          license = lib.licenses.free;
-        };
-      }) {};
     ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-electric";
@@ -62515,8 +61986,8 @@
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "ruby-end.el";
-          rev = "ea453f5ac6259f09667fa26b865b6afacd06aa97";
-          sha256 = "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55";
+          rev = "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0";
+          sha256 = "1f530gaiy010qln51g83m1llazhyfi8ws0lvsb982fhi4dh1xfk5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-end";
@@ -62550,27 +62021,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-guard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "ruby-guard";
-        version = "20160131.1752";
-        src = fetchFromGitHub {
-          owner = "cheunghy";
-          repo = "ruby-guard";
-          rev = "bc864cadb241be855ada148f07e5048cce0991a0";
-          sha256 = "080hmrh7pgpaj33w1rkhcqb1yp70w4cap0rq9hsxaaajj0sn47z3";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d47bb7eb0f6c56fa7fcf84478aab34f938d195/recipes/ruby-guard";
-          sha256 = "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr";
-          name = "ruby-guard";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/ruby-guard";
-          license = lib.licenses.free;
-        };
-      }) {};
     ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-hash-syntax";
@@ -62763,12 +62213,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170813.2341";
+        version = "20170820.651";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "6e9db4665036ca6f0fe8eecf55cd243eaebccc62";
-          sha256 = "1j9zl6maz8glrr0ri4hsw56sdf8s93f2n908j43ix6hy2qnaxfi3";
+          rev = "f57a8ebfc33de72e0ca6fe61ed3d7a622510b5b3";
+          sha256 = "0f42sw2c20nv5nyamd6smbxfkqaygg3li511l5bmwmp557gkakl5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -63141,12 +62591,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170726.204";
+        version = "20170820.924";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "137845bffe904145c927a7f564bc9d6906e155ce";
-          sha256 = "1q5d1ah178xq16945hni3gm8lp17hamnc2ac4jzshkj36gm1a9wq";
+          rev = "bdf31a1ffe637d1445b149804d5f5cc29333a1bd";
+          sha256 = "0ygp0c2hy4zp5x0ghplxf2fhrf16cn37sk2zf6i43zqz6gydzq8a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -63166,8 +62616,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "9b0378836bd7af24fa67f93fa456c57cc3fdbbcb";
-          sha256 = "19js3vyi52xz83419x1n1nrwqvqsa5p8rf33z99bdmy1rj4xrfgk";
+          rev = "959b9c4b712ed5db6938fc6ebdf2c1cb58df6c4f";
+          sha256 = "1wjfxwd6xzc0yn1crrfw2a1j91sh9x6nxkm4rypkznj1qjwn7icq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -63933,12 +63383,12 @@
     sensitive = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sequences }:
     melpaBuild {
         pname = "sensitive";
-        version = "20131015.635";
+        version = "20170818.551";
         src = fetchFromGitHub {
           owner = "timvisher";
           repo = "sensitive.el";
-          rev = "7f2c77811e983234e1a93055d78cc4480ae807c3";
-          sha256 = "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3";
+          rev = "69dd6125a41d8b55f4b6ba61daa4d1aa1f716fa8";
+          sha256 = "0nj71ds4frfi16hsfswmp89rfxkvvdvhdlsqizzi9cbvr49s0l1f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e5468ce136fabe59e1434f8a7f265f41c5e64c1/recipes/sensitive";
@@ -64017,12 +63467,12 @@
     sequences = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sequences";
-        version = "20130908.1122";
+        version = "20170818.552";
         src = fetchFromGitHub {
           owner = "timvisher";
           repo = "sequences.el";
-          rev = "2bcc54a6738202fffb23e9579b9695337ba6ef26";
-          sha256 = "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl";
+          rev = "564ebbd93b0beea4e75acfbf824350e90b5d5738";
+          sha256 = "0ym2bl9dpsglz35is0iwxfw5w7zs9398bkln8lgv28nr6kw0ym4s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf716df68fb2d6a41fe75fac0b41e356bddcf30/recipes/sequences";
@@ -64747,12 +64197,12 @@
     shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
     melpaBuild {
         pname = "shr-tag-pre-highlight";
-        version = "20170801.2201";
+        version = "20170820.2127";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "shr-tag-pre-highlight.el";
-          rev = "8b102c4c42180b5e9fa9dbc776fb28f12afb38a0";
-          sha256 = "0z00k3rxz26dmn55mhrbv0p39xk3lwd66vmw0dm8m1lrkjxpsq8v";
+          rev = "63eb0b2a4c1caf1004bac8e002ff8b7477871e36";
+          sha256 = "14b398k7rd0c2ymvg8wyq65fhggkm0camgvqr7j6ia2y0kairxba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
@@ -64870,27 +64320,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "sicp";
-        version = "20170124.1650";
-        src = fetchFromGitHub {
-          owner = "webframp";
-          repo = "sicp-info";
-          rev = "935da01b7aa782a1a7f9fd17b5512132b197da8c";
-          sha256 = "0mgbhf5cp7z6yd5kl5x4whlc6nfm2lqq6khxcmilrbgv4was55sj";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp";
-          sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
-          name = "sicp";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/sicp";
-          license = lib.licenses.free;
-        };
-      }) {};
     sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sift";
@@ -65418,12 +64847,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170804.1113";
+        version = "20170820.1946";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "84e5a99f5e8caf4d42076681b9befb1bf80493bb";
-          sha256 = "1fw4biar85xy8as1smry8kzyfw0lbnbipzinbmpaliz2fljfnkqm";
+          rev = "5ba5e9036ac39fdb51a5d0c07ff794ec2c30eef4";
+          sha256 = "0f85rvsy2g136qwd3fkkxnf5ppkqnn1gvzc5qfzhl2y3fycy4vkm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -65436,27 +64865,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-annot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
-    melpaBuild {
-        pname = "slime-annot";
-        version = "20131230.1908";
-        src = fetchFromGitHub {
-          owner = "arielnetworks";
-          repo = "cl-annot";
-          rev = "c99e69c15d935eabc671b483349a406e0da9518d";
-          sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/498c938a9d5c51f0842fdae317f5b2fae33bb6d5/recipes/slime-annot";
-          sha256 = "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n";
-          name = "slime-annot";
-        };
-        packageRequires = [ slime ];
-        meta = {
-          homepage = "https://melpa.org/#/slime-annot";
-          license = lib.licenses.free;
-        };
-      }) {};
     slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
     melpaBuild {
         pname = "slime-company";
@@ -65499,27 +64907,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "slime-ritz";
-        version = "20130218.1537";
-        src = fetchFromGitHub {
-          owner = "pallet";
-          repo = "ritz";
-          rev = "4003fdaa5657d4ed1eeb0e244c46658cbb981667";
-          sha256 = "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/669a4ae76deea86084307ac3c2d26072e4b8fe17/recipes/slime-ritz";
-          sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
-          name = "slime-ritz";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/slime-ritz";
-          license = lib.licenses.free;
-        };
-      }) {};
     slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slime-theme";
@@ -65751,48 +65138,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
-    melpaBuild {
-        pname = "sly-repl-ansi-color";
-        version = "20160214.18";
-        src = fetchFromGitHub {
-          owner = "PuercoPop";
-          repo = "sly-repl-ansi-color";
-          rev = "505d162d52219654b57a455e26c9e02c7254a8f2";
-          sha256 = "194bdibpxpqsag86h583b62ybmfqmq4442a0czbijqwngbgjpj3l";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e2fc906b674e1829e023e6a1c0e4cf87830216a8/recipes/sly-repl-ansi-color";
-          sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi";
-          name = "sly-repl-ansi-color";
-        };
-        packageRequires = [ cl-lib sly ];
-        meta = {
-          homepage = "https://melpa.org/#/sly-repl-ansi-color";
-          license = lib.licenses.free;
-        };
-      }) {};
-    smali-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "smali-mode";
-        version = "20160406.1556";
-        src = fetchFromGitHub {
-          owner = "strazzere";
-          repo = "Emacs-Smali";
-          rev = "10437ab0b29994cf4bf67ec28ccf82a74b8c026b";
-          sha256 = "1ircjz571q1sgjkxryc3rlcpdrh6ac7ydnvclr7ldh3nhz77pm7p";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/90182e5bbf79c570b3cb59f541636d4aad5d8652/recipes/smali-mode";
-          sha256 = "17fcr66ky9hmj74i4wr3y9n1d9g8hib7l3gmr4jxj8vsjzfxy7h7";
-          name = "smali-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/smali-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smart-comment";
@@ -66133,8 +65478,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "25508600c0f715c9cba68b1902b537386b27b97c";
-          sha256 = "1r61pnf74x6faglyixfchzhpx8gp7k8aa1yq00vxpplj4flwyvpz";
+          rev = "6db99046471460716fde0b450ab92b849cb23a3e";
+          sha256 = "08blry9257jl301wg8hl79m78ngsnp0gq0vh5jr7cgg49a9ac45l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -66189,27 +65534,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    smartwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "smartwin";
-        version = "20160513.56";
-        src = fetchFromGitHub {
-          owner = "jerryxgh";
-          repo = "smartwin";
-          rev = "61528c1cf6c8d913a44e60c40fa8773b7e400eac";
-          sha256 = "1jcaspqrm23viigk0701711bmaqsyc5fbpkszf7bg7nvhkl4pfqy";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/29c5d92b518ad74f4dff2d83fb0230d49e76aaf1/recipes/smartwin";
-          sha256 = "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif";
-          name = "smartwin";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/smartwin";
-          license = lib.licenses.free;
-        };
-      }) {};
     smarty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smarty-mode";
@@ -66336,18 +65660,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    sml-modeline = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }:
+    sml-modeline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sml-modeline";
-        version = "20120110.1240";
-        src = fetchbzr {
-          url = "https://code.launchpad.net/~nxhtml/nxhtml/main";
-          rev = "835";
-          sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4";
+        version = "20170614.1411";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "sml-modeline";
+          rev = "d2f9f70174c4cf68c67eb3bb8088235735e34d9a";
+          sha256 = "18k2k213vgawxskp9m57r8qarg3pnza6nvbpyi6l03jnmf2kcw2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/sml-modeline";
-          sha256 = "0fvdaby49q34sa83i3mgwyzaf1rflcary9pqi2gvbiibcwmkg82b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4728fce21f03c95bcc2b562648e99c537fb09cd8/recipes/sml-modeline";
+          sha256 = "00kz03ixkfnm4id8dd8aij2rhakzd4arzd790jdac1y3yyd5pp3y";
           name = "sml-modeline";
         };
         packageRequires = [];
@@ -66695,12 +66020,12 @@
     solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
-        version = "20170430.800";
+        version = "20170818.447";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "8aa2ce76327dc7081b1c9a310e858fe2b854d899";
-          sha256 = "1a8hqagh4jjskyyc66s2xyspn9k4hvl430kfzgjcfzis889v19y7";
+          rev = "7bc1e83e7fc4fa1d6d02322ebab73b30d8b0ffdf";
+          sha256 = "1vs731wn7am01d510vxls0adyb7rc7mx7hfqy1xn1kfls4bmi4x7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -66993,27 +66318,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
-        pname = "sourcetalk";
-        version = "20140823.739";
-        src = fetchFromGitHub {
-          owner = "malroc";
-          repo = "sourcetalk_emacs";
-          rev = "aced89fa8776e6d5e42dad4a863e159959f08de6";
-          sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e51aed64ffd0d2583c54035bd3e822f8adbaedde/recipes/sourcetalk";
-          sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
-          name = "sourcetalk";
-        };
-        packageRequires = [ request ];
-        meta = {
-          homepage = "https://melpa.org/#/sourcetalk";
-          license = lib.licenses.free;
-        };
-      }) {};
     sourcetrail = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sourcetrail";
@@ -67747,12 +67051,12 @@
     ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssass-mode";
-        version = "20170310.2024";
+        version = "20170817.1216";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "ssass-mode";
-          rev = "c26852123436849367d826c370f24dd9f20cb501";
-          sha256 = "05wk2jfvzpzjpqz5vmv8b1yz8nnnix6lv9rh66vgddm794j92dkd";
+          rev = "d17d2de381ffc96e62e77435fb7b387bf59aceec";
+          sha256 = "1vw2mzn8yczgyspgmv4f621d7h10qxa8hfzalb14bvwqn4h37spy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode";
@@ -67789,12 +67093,12 @@
     ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-agency";
-        version = "20170205.1306";
+        version = "20170807.1152";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ssh-agency";
-          rev = "94abffa716aff963175196066526c7ee8b4efae7";
-          sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc";
+          rev = "e572e031852561f98a7053afcdc9a3796dde2137";
+          sha256 = "0z2ywkiwv983vz4bk5vc62p3xapp15a4715l9sp5c8x70nlq02y3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency";
@@ -68101,25 +67405,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "stgit";
-        version = "20140213.348";
-        src = fetchgit {
-          url = "git://repo.or.cz/stgit.git";
-          rev = "f248e80ec7ed418d23d47c8a6c147a8a42855d29";
-          sha256 = "1icm94ri23m66p0lmg0sdqi04m3vfwd2jcngym9gcg8p5gqq8j2g";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit";
-          sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
-          name = "stgit";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/stgit";
-          license = lib.licenses.free;
-        };
-      }) {};
     sticky = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "sticky";
         version = "20101129.1852";
@@ -68532,48 +67817,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    subshell-proc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "subshell-proc";
-        version = "20130122.1322";
-        src = fetchFromGitHub {
-          owner = "andrewmains12";
-          repo = "subshell-proc";
-          rev = "d18b20e03fc89ee08e8c6a968aba31a16b53287f";
-          sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc";
-          sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp";
-          name = "subshell-proc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/subshell-proc";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "sudden-death";
-        version = "20140829.538";
-        src = fetchFromGitHub {
-          owner = "yewton";
-          repo = "sudden-death.el";
-          rev = "beba6b4fb42b1e27575d3f722d23a0eb19666736";
-          sha256 = "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/24c94bff44029b6493575a9e09d7deb78db095a9/recipes/sudden-death";
-          sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
-          name = "sudden-death";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/sudden-death";
-          license = lib.licenses.free;
-        };
-      }) {};
     sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sudo-edit";
@@ -68911,16 +68154,16 @@
     swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swbuff";
-        version = "20160824.707";
+        version = "20041012.18";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "swbuff";
-          rev = "8d5b2bec12503509554f9dd83b97c198b259db2b";
-          sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5";
+          rev = "dcde4ddc7beafef3150e8c645724bdbbf8596028";
+          sha256 = "1hxwa3hdhdx3ikfkblda748assm0k5mgwpdjv3jif37n0lw0f435";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a44a6577740b98749fe2703b32d70f15a473eb46/recipes/swbuff";
-          sha256 = "0pi816ljprpl8p2pigfyzm9ripvrc4hvnpkjdsg30mw8iyrk66yn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff";
+          sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk";
           name = "swbuff";
         };
         packageRequires = [];
@@ -69014,12 +68257,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20170804.1038";
+        version = "20170817.1000";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
-          sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
+          rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f";
+          sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -69348,12 +68591,12 @@
     syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "syntactic-close";
-        version = "20170510.2348";
+        version = "20170816.258";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "syntactic-close";
-          rev = "83f6a212637175c8cfb1132eb40cdd4c3343040a";
-          sha256 = "0r5zff8fb0gid84f62l88lfh1hp8nkgf9cldnhmmv3icrhc2r0kc";
+          rev = "dcbdd3139e04b6f6ade034896643d6d176ad9918";
+          sha256 = "1g965a0ikva2gmpjzzdk39zq7907cw6wdsxb3k35hfwy7z2b45y7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -69407,27 +68650,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }:
-    melpaBuild {
-        pname = "syslog-mode";
-        version = "20170107.1517";
-        src = fetchFromGitHub {
-          owner = "vapniks";
-          repo = "syslog-mode";
-          rev = "e2ade4f27672a644fcb69ceaa8a08f04eaa2ccf2";
-          sha256 = "0b3p91f44ghzlma3vw607fsvzzgrfjq4k3zchv0drlga2kv771vw";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode";
-          sha256 = "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19";
-          name = "syslog-mode";
-        };
-        packageRequires = [ hide-lines ];
-        meta = {
-          homepage = "https://melpa.org/#/syslog-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "system-packages";
@@ -70704,12 +69926,12 @@
     thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thread-dump";
-        version = "20130323.1025";
+        version = "20170816.1150";
         src = fetchFromGitHub {
           owner = "nd";
           repo = "thread-dump.el";
-          rev = "1cee07775ac8c13bb52217be6c383562c617542b";
-          sha256 = "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p";
+          rev = "204c9600242756d4b514bb5ff6293e052bf4b49d";
+          sha256 = "11qx194gwizqg7p2mqy7mdfii85bdayabxfd388dmrm916i4w47n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/thread-dump";
@@ -70808,12 +70030,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170806.2049";
+        version = "20170819.2329";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "77e4fe848dd664ead1f6980a9a99d82e2bee75d7";
-          sha256 = "18n0w02h6wvp5gxnsm7lcwdg68sxcqz9sx6xpkxlidyhixk2iap9";
+          rev = "ed6cfafbed4d49f06015f2090682b218a4b001ec";
+          sha256 = "0cqg8yb52ljgvjz5f6fmxs2x5p19bj41x2myqarm2jdyy8j58yyx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -71085,27 +70307,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    tj-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, tern }:
-    melpaBuild {
-        pname = "tj-mode";
-        version = "20150826.851";
-        src = fetchFromGitHub {
-          owner = "katspaugh";
-          repo = "tj-mode";
-          rev = "361f5b0baa90f9d0b3fd92a3d9d557a1224b4308";
-          sha256 = "1zvykanmn065rlk9hlv85vary1l6y52bsnaa51fkpckpr6dicmcl";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b16dd25c0c1031923717d4fe23bbb9276f75885/recipes/tj-mode";
-          sha256 = "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf";
-          name = "tj-mode";
-        };
-        packageRequires = [ emacs js2-mode tern ];
-        meta = {
-          homepage = "https://melpa.org/#/tj-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tldr";
@@ -71614,12 +70815,12 @@
     tramp-hdfs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tramp-hdfs";
-        version = "20170809.1508";
+        version = "20170821.620";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "tramp-hdfs";
-          rev = "c8eed61e56b06a23ec631ad3c29e61b230a0eda1";
-          sha256 = "1k7mzs7mlixlf2v4h3s794b5b4r7pikdkq5b21zwhdmhgqhmrgcn";
+          rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35";
+          sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs";
@@ -71782,12 +70983,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170812.134";
+        version = "20170817.1155";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "a984df7da28625704544f9e344bc1653c7b35f87";
-          sha256 = "1y6il029nj7s6ik1z92rcxg3vdnny4jx5zbjhqi0i62qrs44r58m";
+          rev = "bda0fd59fa7b9d188227ef7ccb7c52a263769e27";
+          sha256 = "0lzfs6887hm8jkl4jz8q3256jpqp3h1zspd6ccn0pphlvmfv471g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -71807,8 +71008,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "a984df7da28625704544f9e344bc1653c7b35f87";
-          sha256 = "1y6il029nj7s6ik1z92rcxg3vdnny4jx5zbjhqi0i62qrs44r58m";
+          rev = "bda0fd59fa7b9d188227ef7ccb7c52a263769e27";
+          sha256 = "0lzfs6887hm8jkl4jz8q3256jpqp3h1zspd6ccn0pphlvmfv471g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71863,27 +71064,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    tronesque-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "tronesque-theme";
-        version = "20150125.241";
-        src = fetchFromGitHub {
-          owner = "aurelienbottazini";
-          repo = "tronesque";
-          rev = "42093c08a50c860601c364c8a746c803458c10ba";
-          sha256 = "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c7e488c08c56a879d0c20f0e8c271b7179faee8a/recipes/tronesque-theme";
-          sha256 = "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j";
-          name = "tronesque-theme";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/tronesque-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "trr";
@@ -72032,12 +71212,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170813.1222";
+        version = "20170814.933";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "94428c76d247e26e35964f68f9991e04f26007e8";
-          sha256 = "1q76jv34xm12hn8n362mlh1j44rj020nyc2cy7s30ayk750lklbp";
+          rev = "6b9b57ad4532abb369c374bab4f5b22e7f777b8c";
+          sha256 = "0lrx7d1cykrb9y6bbbmq2fax00k0mn0ahysayc47v9iz6w46rk06";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -72134,27 +71314,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "turkish";
-        version = "20160324.323";
-        src = fetchFromGitHub {
-          owner = "emres";
-          repo = "turkish-mode";
-          rev = "237b696e2f513149f1a77ef58b5ba7d44b6f4661";
-          sha256 = "1jb6par116mm5l4z27wk6m2sfh6j9nmgrya352sdagcvjbcpnzcl";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c305076082d17db90647577137d76128b15defa/recipes/turkish";
-          sha256 = "0pdapxjbpj3lg3hxvwjn9v51jqaiz7a8053z2bmk4485vzs34532";
-          name = "turkish";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/turkish";
-          license = lib.licenses.free;
-        };
-      }) {};
     turnip = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "turnip";
@@ -73228,27 +72387,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    uzumaki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "uzumaki";
-        version = "20150119.1706";
-        src = fetchFromGitHub {
-          owner = "geyslan";
-          repo = "uzumaki";
-          rev = "afae141588ef9407ff86ce1ae9a0f1860843c4a4";
-          sha256 = "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d63f9408e3bb581a47c8ab1f729f9ee087933d6/recipes/uzumaki";
-          sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
-          name = "uzumaki";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://melpa.org/#/uzumaki";
-          license = lib.licenses.free;
-        };
-      }) {};
     v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "v2ex-mode";
@@ -73837,27 +72975,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "vimgolf";
-        version = "20170323.600";
-        src = fetchFromGitHub {
-          owner = "timvisher";
-          repo = "vimgolf.el";
-          rev = "741e414ec24072af05471058a5719271bfcfe766";
-          sha256 = "0fs0gimry8xzydh7m305j86h1rq7qivsda19ah48sxbxks6xq5ax";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/50dc1c26cb848986dda3c930c8d9b421cd3b1d17/recipes/vimgolf";
-          sha256 = "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f";
-          name = "vimgolf";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/vimgolf";
-          license = lib.licenses.free;
-        };
-      }) {};
     vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vimish-fold";
@@ -73882,12 +72999,12 @@
     vimrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vimrc-mode";
-        version = "20150607.913";
+        version = "20170814.1837";
         src = fetchFromGitHub {
           owner = "mcandre";
           repo = "vimrc-mode";
-          rev = "fae7604e5ea6eef104d8c68598c3bbf9d798aa74";
-          sha256 = "02yhagnrq0zl19w7fh559fs6vm6b383k1r27alvixjfcm18p0fpg";
+          rev = "ba8140fba6e03a35b123acbd62fc8c6f0a03bf4a";
+          sha256 = "07pwmjaa24hh20bcanmxgnaf050c0j6190i0qfvpd0gpc4p80pxx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vimrc-mode";
@@ -74220,8 +73337,8 @@
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "3a3eab579361351b78a87bb5710d3bbfe351b993";
-          sha256 = "1b72vpg53whq3h85ck3c9if8km2rlzf8bvxkkv0j6zm66rvph0j3";
+          rev = "a680998d5e597e91be2e7e15e88bd83856a13c84";
+          sha256 = "1hmqwv4xdjmly1l4s1hkx1n28navnqy5nplas39pwywik2dlh2cs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -74657,8 +73774,8 @@
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "448c197fd78178bcf3e744c90b85a08f07bae3a0";
-          sha256 = "0vmh9cqhcw32qliqrlmkb9jwhi3m4iy5x5a96sk3f75zx14ryjr8";
+          rev = "b0c8db9b08978dd041c8a3ed41361afa9638d17d";
+          sha256 = "0cx038sychpx5jqdsx5llvmq98wwi3bdhwsi8hj0gw5pqc59vrx6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -74776,22 +73893,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "websocket";
-        version = "20170610.2117";
+        version = "20170819.1111";
         src = fetchFromGitHub {
           owner = "ahyatt";
           repo = "emacs-websocket";
-          rev = "ccbe93ac8b5858a85686b83642fbd6e828a47deb";
-          sha256 = "18aw5pmvz91gv9wlmna1i5sli6z3f6dqk0bc4wkc15zbsi1dmdlw";
+          rev = "b77aca6ccf0937601e53b53ec906f9ee4fc5d469";
+          sha256 = "1af8kx9b4fzvgpf4z486vlxg8r4ai046pmzl5v0i42ifnk2bsxli";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
           sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
           name = "websocket";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/websocket";
           license = lib.licenses.free;
@@ -74825,8 +73942,8 @@
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "a0d81074088d313dd596af6602e51d4253a55ca5";
-          sha256 = "08ibyabvdlmp74xa950al3axmzsqpcal30313ab5wgb746sh3dvm";
+          rev = "a1bda40513f0ea94a8a85ee122a475475a03f6ef";
+          sha256 = "05jnfrjrf1da038jkypvx3slyk39xlpak4n9s5vwmx7mgf4zg06y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -75010,12 +74127,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20170530.526";
+        version = "20170817.1107";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "3144b4c1fc774b63fc2350a0171e8ef01ab63298";
-          sha256 = "1fyg4b5ngf4k30x9rb5n62w2y9awc1lasrszxp9bg6ydmigncans";
+          rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031";
+          sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -75136,12 +74253,12 @@
     whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "whole-line-or-region";
-        version = "20170814.20";
+        version = "20170815.212";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "whole-line-or-region";
-          rev = "ef89af99009229af20a0a2f6c277138d92ed7085";
-          sha256 = "0by8lfkpzpmms57fj9mjimxmg3an9q7iyl3nghzdfhcngp0bprvy";
+          rev = "1220974153b7eaca5192ed87f86182d121e228e4";
+          sha256 = "1n44nn0zkk55cnwlincv5i8s36nymnh3bm6jd85h6m97jssxd85l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region";
@@ -75222,8 +74339,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "caa51fb2a48d79609bbbd3a012e149e4998a98c4";
-          sha256 = "0pky2xi1h3kzi0pykd5c568rhpq6bq2z2pknzw75rnd0h5j4sj59";
+          rev = "7bc9ba691c838650bd74848c7ebf0bc1ed6c3f2b";
+          sha256 = "18wwp5pp6s18f253xy9z2dhkxv7z3fxkgc8ayr3ypp8fskv78l34";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -75529,12 +74646,12 @@
     windwow = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "windwow";
-        version = "20170803.1748";
+        version = "20170815.1848";
         src = fetchFromGitHub {
           owner = "vijumathew";
           repo = "windwow";
-          rev = "717190e22aeb28130ce2a52470b7fb26b180e8dd";
-          sha256 = "0n2b2jaaqwc8z8rmfc7rqnk2sf875gp3xyjfgayvq7ya9c9bnv7g";
+          rev = "77bad26f651744b68d31b389389147014d250f23";
+          sha256 = "0vbmmf8wm76k389g5ncs0grwlpwp3glpwvhdi5dfxaqcp2phaaad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12aba18872021ce0affa96c46a17353c7d073ca2/recipes/windwow";
@@ -75616,8 +74733,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "70b4ccc031bc";
-          sha256 = "1mbypvclk83lhwvdy6ancl4j9nysv47s8yp6baa8pi54zlc9w3i1";
+          rev = "e5a20c81c0bd";
+          sha256 = "13pb956f1yidwjh4imi01dghzs2wgd6r7n5bzhvpszvx4x1nw4z9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -75654,12 +74771,12 @@
     with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20170803.917";
+        version = "20170817.1240";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "4d3d50b09dee3305a365d7eb005313d42dddd6ea";
-          sha256 = "11416ic4nf04fgd7947lxfc4c8g6lb4r2ickr5mydqw4wqzanqi9";
+          rev = "241726118dee067a8d9880d53c6a781d580ba8a1";
+          sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -75696,12 +74813,12 @@
     with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "with-simulated-input";
-        version = "20170810.1158";
+        version = "20170820.2317";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "with-simulated-input";
-          rev = "5a0d3f039965667c6a8d36bd2cbfbd9c22299033";
-          sha256 = "16dx6fzla7jzjxv7yzn8b9qwj2ja17x02rxzglyrg9mf4kd1y9yp";
+          rev = "1012ccbec77d7d162790706c07bb23c039ccc61f";
+          sha256 = "1489njq2xbsd89kh3z560vwm892zzjbs12lzk1pr0fajqvnm62r5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
@@ -75840,36 +74957,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "wordsmith-mode";
-        version = "20151117.236";
-        src = fetchFromGitHub {
-          owner = "istib";
-          repo = "wordsmith-mode";
-          rev = "597e1e7c7ef89b06ed8280251ecd8f40ce55e1bf";
-          sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d9f8f01f1807de24fb6e92b355d05b81be4bab07/recipes/wordsmith-mode";
-          sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
-          name = "wordsmith-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/wordsmith-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20170724.1132";
+        version = "20170818.1105";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "e66659923bd53be40a0f0ee1d7fe8a14d22f6973";
-          sha256 = "155sz3hl2ly9m4i8nr2bxham5vzpa2bi9cvgna35gbkp1d34mm41";
+          rev = "bf812a47e44dfbf4e166dbdbed7a97197bc1fc1d";
+          sha256 = "11miqpdg0v27fi6ksrqkqfyi2qrsgsv8jsqfw15nyhqmi3sgxzqh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -75973,8 +75069,8 @@
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "wrap-region.el";
-          rev = "0eff3165db36464d28ed303ab25b715307cbdee0";
-          sha256 = "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n";
+          rev = "fbae9b0f106187af19823f1a6260b5c68b7252e6";
+          sha256 = "1k5q925igdv5lnpbmy0c2f0j3rj7yh4l6bxbd61g9lcnyl0j3ym9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/wrap-region";
@@ -76200,15 +75296,15 @@
     xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-css-mode";
-        version = "20170811.2157";
+        version = "20170821.400";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "ed30c4530647de0016e3e03b8f2880591b901a05";
-          sha256 = "1hfx3qy2wmxg75wfzjdglglpm1ai04jafqrv2qx4kh0q3ra7yzgq";
+          rev = "7167c7a9a0f0dcc167dafa833efd43a0c9ae4307";
+          sha256 = "1iychyj79g9mxpr688f2a9w8bbsgm2r88rr11b42gagal0kgk8q4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode";
           sha256 = "1kkwfyf94v3ni3d4szy28v49p6f3hy8ww9mlris2vvgc726wy6hr";
           name = "xah-css-mode";
         };
@@ -76221,15 +75317,15 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170811.2138";
+        version = "20170821.357";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "f9059b7a081da8981ed6ae4cb2f5a325e7775553";
-          sha256 = "10f3dna1mpnjia87w5gkqkqrvkrg1h5zm33znsmgzwlqgzkhq94d";
+          rev = "4f7b14d913bd4401f6765ae75ba17c5350b24782";
+          sha256 = "0x3w5k5n1wg9iqbm5hw0chfmrbb6m5z450q1nm68cqvqlxbjxniy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode";
           sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij";
           name = "xah-elisp-mode";
         };
@@ -76242,15 +75338,15 @@
     xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-find";
-        version = "20170811.2149";
+        version = "20170821.358";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "9783b74a5f3593db6c86e929b58f2cb9d5bc8624";
-          sha256 = "1ssd9kzn7nfqr01mb7shzkwkz61028580dkvzgxxs80403gs373q";
+          rev = "6b7a60d6210d42559b46f0e17d7a0e4a2607f887";
+          sha256 = "11whm7cnz6z61lycm5w6qmvbbl5f2c2lpgmk5c5whks7v3bkq6n6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find";
           sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
           name = "xah-find";
         };
@@ -76263,15 +75359,15 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170811.2147";
+        version = "20170821.356";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "90eee20efad8cd6902ca6ce7426f62c934f047d8";
-          sha256 = "1wccz83nfig4i6xp8di1rvs678w9a20dbfd5j932hazvw3796gvj";
+          rev = "c6c7dac8260d0b74034224b8fbc789b0f30034f6";
+          sha256 = "1qgj69rx4flrdgrrib3aq86qf5iyr3xp1qdnvb3m9iwd9pngwadr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
           sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
           name = "xah-fly-keys";
         };
@@ -76284,15 +75380,15 @@
     xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-get-thing";
-        version = "20170811.2155";
+        version = "20170821.353";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-get-thing-or-selection";
-          rev = "4e0782af230292b18e787bee43d3c94750383a1b";
-          sha256 = "10xlxk95s7dxwmbylbhbwa3px5z6add8ash0gkgqjb4ibdfrclzi";
+          rev = "e3ef069ea9fea3a092689d45c94c6211b51d0ea4";
+          sha256 = "0z9pflz99p2i7czccpzvw7bkbshfycpb6js9n8a12yhc1ndbz6z0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-get-thing";
           sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
           name = "xah-get-thing";
         };
@@ -76305,15 +75401,15 @@
     xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-lookup";
-        version = "20170811.2143";
+        version = "20170821.405";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "lookup-word-on-internet";
-          rev = "feb480cdfd0b3e6751cc589fbf40538daa60b75b";
-          sha256 = "1x1pdpngv6k1gwi7x2nsqni778wssicgsrddxaskri8axkxdiq65";
+          rev = "cd5d622140e78e01d0ab32fcb43edc49f4e7fbb5";
+          sha256 = "1i952mm0mxiaphnwimlr28swrk8b0k6rwx90f4s5s8idcp6wvp4y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-lookup";
           sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
           name = "xah-lookup";
         };
@@ -76326,15 +75422,15 @@
     xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-math-input";
-        version = "20170811.2145";
+        version = "20170821.406";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "2575611505d057061938ca21df621c6f9cac4cc5";
-          sha256 = "0mmbvyqihg0036cix3xh2phq68816zzcnp8cf4yc42hp1aksg770";
+          rev = "6cdde9e4721fd6d026872ca3e59c212a34913486";
+          sha256 = "0qn2dv14cw8yq14wgbfcf474bvdlfacb3m6i1rfwwqzsmcarlbnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input";
           sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
           name = "xah-math-input";
         };
@@ -76347,15 +75443,15 @@
     xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-reformat-code";
-        version = "20170706.339";
+        version = "20170821.411";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-reformat-code";
-          rev = "655cc8820118737db7b758ab72ad107d7fff091a";
-          sha256 = "12zrgp76nq18anp7vc7pj0w9a688i7xylplqh55jv9q24xgmpyhs";
+          rev = "7fec8b28e46b8cc2813fac5149e3bbb56c0aa6b1";
+          sha256 = "0mz47laig0p7fwwiv66x60f5jg0kh8zvjd1vg3nnn3xvk37lv2cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-reformat-code";
           sha256 = "1sj407nbh4x586hvsq4ycr0ahhxin0wgfwdj0551cz8793wvjpzp";
           name = "xah-reformat-code";
         };
@@ -76368,15 +75464,15 @@
     xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20170811.2151";
+        version = "20170821.354";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "fb72b406ae171e840798172321e72e32ba904276";
-          sha256 = "01ilk5ic884nfili823zp05ylrnj9iqhwc2v8brc908f23mbdf79";
+          rev = "d11f78994f08cec335e351db92924db133fb47de";
+          sha256 = "05j850yplz1bsf9zxq9gvlh9aikdcy4q78m109gdb0imrikm9h9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-replace-pairs";
           sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
           name = "xah-replace-pairs";
         };
@@ -76389,15 +75485,15 @@
     xahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xahk-mode";
-        version = "20170523.1946";
+        version = "20170821.407";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xahk-mode.el";
-          rev = "538b891a1565d109d079185b56332cd28dd846a7";
-          sha256 = "1rm3sih1rciszs7m9d29r7vkgs8q2kwpn8sdwadlycgjmk9c38s1";
+          rev = "02012b20603c00e3b2ef32159a690ed1e05d12c3";
+          sha256 = "09nakcfczb95vd48f8z77igmi1kbcblmgpzfzm9i7df4jcfkkh3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d6422756b435f59ead15fa7e8081f5c88b2e93f/recipes/xahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xahk-mode";
           sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
           name = "xahk-mode";
         };
@@ -77122,12 +76218,12 @@
     yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yard-mode";
-        version = "20160310.850";
+        version = "20170817.537";
         src = fetchFromGitHub {
           owner = "pd";
           repo = "yard-mode.el";
-          rev = "78792f6a6fbff4f1bc955f494fdb11378e7f8095";
-          sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y";
+          rev = "ba74a47463b0320ae152bd42a7dd7aeecd7b5748";
+          sha256 = "0zry3p66bvrk32icnd6kkk8y5rrr8crnqjp6wlp889c8c7wm00n1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode";
@@ -77206,12 +76302,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170808.940";
+        version = "20170818.1916";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "e371c119ecc9044c8ca2d6b93215121eb714d6b1";
-          sha256 = "02md6332891fwwiqqf9x3sjd7568lg2lmjcx79cdjcl5hjik7qdc";
+          rev = "c79c8df5999e3147170a45566ad2da4e71c80531";
+          sha256 = "1c0za8p4fyciv3qzg8z2s3sch2rw908i0x4a51z910q3j8lvacnn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -77227,12 +76323,12 @@
     yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "yasnippet-snippets";
-        version = "20170813.416";
+        version = "20170821.302";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
           repo = "yasnippet-snippets";
-          rev = "21fc956845bf7aff4a84511a813d3afd3a620a40";
-          sha256 = "00balpdz6gpyngzir0ddvw492bbv045spchaxkf1lxc0pl0ldjh9";
+          rev = "6ff001decd016fa753392192936204e020ea3785";
+          sha256 = "0wzai1d70f7q5vppks3j2f3np1z4241wf4p5i821p67y1fsyz4wr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -77266,25 +76362,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "yatex";
-        version = "20170723.1909";
-        src = fetchhg {
-          url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "4f8551386af2";
-          sha256 = "0qvp54pzc6m52j5xkwp25nwdlik6v879halmfvcpn3z0grhrslbn";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
-          sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
-          name = "yatex";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/yatex";
-          license = lib.licenses.free;
-        };
-      }) {};
     yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yaxception";
@@ -77611,15 +76688,15 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20170721.214";
+        version = "20170818.47";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "b187aee9351f0ec94d87156223e5b434b58aa2a8";
-          sha256 = "1fidrmf2ljhzm9prk8a6y35djgzyj9bsla7pwacjknkqza3pjpbi";
+          rev = "e43ecf497a73c742f6ecdd0f38750fcc53aad5b5";
+          sha256 = "0rys0kvnfjbf29f943bpi79490sax1r7yqbj8xlilk4wnvgs6x7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
@@ -77629,27 +76706,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "zig-mode";
-        version = "20170413.130";
-        src = fetchFromGitHub {
-          owner = "AndreaOrru";
-          repo = "zig-mode";
-          rev = "9a252ebd4ccd8a30abef3d9ed0ecb510e3d88844";
-          sha256 = "07ar5lijj3y62ynx1fj9qxabf0h82laxzyb60f6cgxpzgxfpn1b8";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/64d12e362a2490e85c8e7a66a5ed1ebff9ce95a6/recipes/zig-mode";
-          sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09";
-          name = "zig-mode";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/zig-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zlc";
@@ -77737,12 +76793,12 @@
     zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zone-nyan";
-        version = "20161014.154";
+        version = "20170818.944";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "zone-nyan";
-          rev = "0ec6328ee58d7d140c8c7be84822c07741f3ad2b";
-          sha256 = "106sppnp1jd5qcp2ydb180fbhfld90jvfimy8316qvrgk5xc2q57";
+          rev = "4b1f8d95f130946718d52806489ffe2762aebfdc";
+          sha256 = "1axq4ch7garlfrybq9kgv6x7d8y4dw5y9pqbqlqvlwf4xmdrvzmm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan";
@@ -78010,8 +77066,8 @@
         version = "20170730.2055";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "bddebd64d652";
-          sha256 = "1q7rhcsxr66fmhwmpbw35y8gdvlbfisvjy4xmh455ajy3126zyp2";
+          rev = "33b840f663b7";
+          sha256 = "1g9x257bg9mgg1impyk5s8lfhr4qmqf1fzc7iwfdzizvzmgdlas1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From 14a772145470fdeddabd927d8265dfba6626074c Mon Sep 17 00:00:00 2001
From: Puneet Arora <puneetarora.er@gmail.com>
Date: Tue, 22 Aug 2017 03:05:07 -0700
Subject: [PATCH 2476/3246] subversion: 1.9.6 -> 1.9.7 (#28306)

---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 586f4c52792..0a5a3fbd0c6 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -109,7 +109,7 @@ in {
   };
 
   subversion19 = common {
-    version = "1.9.6";
-    sha256 = "06dfram53lyfyyqgz1r7c5323qqc6mjcpwi1j402y21lnqgwbjyv";
+    version = "1.9.7";
+    sha256 = "08qn94zaqcclam2spb4h742lvhxw8w5bnrlya0fm0bp17hriicf3";
   };
 }

From 964799e556222b5115ca61823fd671488f8e718d Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Tue, 22 Aug 2017 12:27:00 +0200
Subject: [PATCH 2477/3246] sks and pgpkeyserver-lite modules: init (#27515)

* modules sks and pgpkeyserver-lite:
  runs the sks keyserver with optional nginx proxy for webgui.
* Add calbrecht to maintainers
* module sks: fix default hkpAddress value
* module pgpkeyserver-lite: make hkpAddress a string type option
  and use (builtins.head services.sks.hkpAddress) as default value
* module sks: remove leftover service dependencies
---
 lib/maintainers.nix                           |  1 +
 nixos/modules/module-list.nix                 |  2 +
 nixos/modules/services/security/sks.nix       | 82 +++++++++++++++++++
 .../services/web-apps/pgpkeyserver-lite.nix   | 75 +++++++++++++++++
 .../web-apps/pgpkeyserver-lite/default.nix    | 25 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 187 insertions(+)
 create mode 100644 nixos/modules/services/security/sks.nix
 create mode 100644 nixos/modules/services/web-apps/pgpkeyserver-lite.nix
 create mode 100644 pkgs/servers/web-apps/pgpkeyserver-lite/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 2bbb56aab5e..d44c3ac0d8b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -89,6 +89,7 @@
   bstrik = "Berno Strik <dutchman55@gmx.com>";
   bzizou = "Bruno Bzeznik <Bruno@bzizou.net>";
   c0dehero = "CodeHero <codehero@nerdpol.ch>";
+  calbrecht = "Christian Albrecht <christian.albrecht@mayflower.de>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
   calvertvl = "Victor Calvert <calvertvl@gmail.com>";
   campadrenalin = "Philip Horger <campadrenalin@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bfc554cc936..b1efa10aecd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -556,6 +556,7 @@
   ./services/security/oauth2_proxy.nix
   ./services/security/physlock.nix
   ./services/security/shibboleth-sp.nix
+  ./services/security/sks.nix
   ./services/security/sshguard.nix
   ./services/security/tor.nix
   ./services/security/torify.nix
@@ -583,6 +584,7 @@
   ./services/web-apps/frab.nix
   ./services/web-apps/mattermost.nix
   ./services/web-apps/nixbot.nix
+  ./services/web-apps/pgpkeyserver-lite.nix
   ./services/web-apps/piwik.nix
   ./services/web-apps/pump.io.nix
   ./services/web-apps/tt-rss.nix
diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
new file mode 100644
index 00000000000..62308428f32
--- /dev/null
+++ b/nixos/modules/services/security/sks.nix
@@ -0,0 +1,82 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.sks;
+
+  sksPkg = cfg.package;
+
+in
+
+{
+
+  options = {
+
+    services.sks = {
+
+      enable = mkEnableOption "sks";
+
+      package = mkOption {
+        default = pkgs.sks;
+        defaultText = "pkgs.sks";
+        type = types.package;
+        description = "
+          Which sks derivation to use.
+        ";
+      };
+
+      hkpAddress = mkOption {
+        default = [ "127.0.0.1" "::1" ];
+        type = types.listOf types.str;
+        description = "
+          Wich ip addresses the sks-keyserver is listening on.
+        ";
+      };
+
+      hkpPort = mkOption {
+        default = 11371;
+        type = types.int;
+        description = "
+          Which port the sks-keyserver is listening on.
+        ";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ sksPkg ];
+    
+    users.users.sks = {
+      createHome = true;
+      home = "/var/db/sks";
+      isSystemUser = true;
+      shell = "${pkgs.coreutils}/bin/true";
+    };
+
+    systemd.services = let
+      hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ;
+      hkpPort = builtins.toString cfg.hkpPort;
+      home = config.users.users.sks.home;
+      user = config.users.users.sks.name;
+    in {
+      sks-keyserver = {
+        wantedBy = [ "multi-user.target" ];
+        preStart = ''
+          mkdir -p ${home}/dump
+          ${pkgs.sks}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/
+          ${pkgs.sks}/bin/sks cleandb || true
+          ${pkgs.sks}/bin/sks pbuild -cache 20 -ptree_cache 70 || true
+        '';
+        serviceConfig = {
+          WorkingDirectory = home;
+          User = user;
+          Restart = "always";
+          ExecStart = "${pkgs.sks}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}";
+        };
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
new file mode 100644
index 00000000000..93f69bd1265
--- /dev/null
+++ b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
@@ -0,0 +1,75 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.pgpkeyserver-lite;
+  sksCfg = config.services.sks;
+
+  webPkg = cfg.package;
+
+in
+
+{
+
+  options = {
+
+    services.pgpkeyserver-lite = {
+
+      enable = mkEnableOption "pgpkeyserver-lite on a nginx vHost proxying to a gpg keyserver";
+
+      package = mkOption {
+        default = pkgs.pgpkeyserver-lite;
+        defaultText = "pkgs.pgpkeyserver-lite";
+        type = types.package;
+        description = "
+          Which webgui derivation to use.
+        ";
+      };
+
+      hostname = mkOption {
+        type = types.str;
+        description = "
+          Which hostname to set the vHost to that is proxying to sks.
+        ";
+      };     
+
+      hkpAddress = mkOption {
+        default = builtins.head sksCfg.hkpAddress;
+        type = types.str;
+        description = "
+          Wich ip address the sks-keyserver is listening on.
+        ";
+      };
+
+      hkpPort = mkOption {
+        default = sksCfg.hkpPort;
+        type = types.int;
+        description = "
+          Which port the sks-keyserver is listening on.
+        ";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    services.nginx.enable = true;
+
+    services.nginx.virtualHosts = let
+      hkpPort = builtins.toString cfg.hkpPort;
+    in {
+      "${cfg.hostname}" = {
+        root = webPkg;
+        locations = {
+          "/pks".extraConfig = ''
+            proxy_pass         http://${cfg.hkpAddress}:${hkpPort};
+            proxy_pass_header  Server;
+            add_header         Via "1.1 ${cfg.hostname}";
+          '';
+        };
+      };
+    };
+  };
+}
diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
new file mode 100644
index 00000000000..c4f49b36bf8
--- /dev/null
+++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, lib } : 
+
+stdenv.mkDerivation rec {
+  name = "pgpkeyserver-lite-${version}";
+  version = "2017-07-18";
+
+  src = fetchFromGitHub {
+    owner = "mattrude";
+    repo = "pgpkeyserver-lite";
+    rev = "a038cb7";
+    sha256 = "12pn92pcpv38b2gmamppn9yzdn7x52pgxnzpal22gqsxwimhs2rx";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R 404.html assets favicon.ico index.html robots.txt $out
+  '';
+
+  meta = {
+    homepage = https://github.com/mattrude/pgpkeyserver-lite;
+    description = "A lightweight static front-end for a sks keyserver.";
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.calbrecht ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a881d28e51..2f97b8a49f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8154,6 +8154,8 @@ with pkgs;
 
   pgpdump = callPackage ../tools/security/pgpdump { };
 
+  pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite {};
+
   gpgstats = callPackage ../tools/security/gpgstats { };
 
   gpshell = callPackage ../development/tools/misc/gpshell { };

From cc28cf11f0c09e10e55f880b876988698a98cc8b Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Tue, 22 Aug 2017 09:39:54 +0300
Subject: [PATCH 2478/3246] Nix minimal version: 1.10 -> 1.11

`ruby` attribute requires features from 1.11
```
$ nix-build -A ruby
error: cannot coerce a set to a string, at pkgs/development/interpreters/ruby/default.nix:57:17
```
---
 lib/minver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/minver.nix b/lib/minver.nix
index 4f448266d06..2147820c0e4 100644
--- a/lib/minver.nix
+++ b/lib/minver.nix
@@ -1,2 +1,2 @@
 # Expose the minimum required version for evaluating Nixpkgs
-"1.10"
+"1.11"

From e2fbaa856f1cc7f20e6c54b8622ae3d981088273 Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Tue, 22 Aug 2017 12:14:17 +0100
Subject: [PATCH 2479/3246] canto-{daemon,curses}: 0.9.6,0.9.7 -> 0.9.7,0.9.9

Upstream changelog available at:
https://codezen.org/canto-ng/news/
---
 .../networking/feedreaders/canto-curses/default.nix           | 4 ++--
 .../networking/feedreaders/canto-daemon/default.nix           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 438efdc813c..0190d5f9798 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
 
 python34Packages.buildPythonApplication rec {
-  version = "0.9.7";
+  version = "0.9.9";
   name = "canto-curses-${version}";
 
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-curses";
     rev = "v${version}";
-    sha256 = "0ap1b4m5gbzi0l7vj6pwvvg77i2aarbynbdc147z2b1lzvr985zq";
+    sha256 = "1vzb9n1j4gxigzll6654ln79lzbrrm6yy0lyazd9kldyl349b8sr";
   };
 
   buildInputs = [ readline ncurses canto-daemon ];
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index c50647ac7b0..4b1721278e3 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python34Packages, }:
 
 python34Packages.buildPythonApplication rec {
-  version = "0.9.6";
+  version = "0.9.7";
   name = "canto-daemon-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ python34Packages.buildPythonApplication rec {
     owner = "themoken";
     repo = "canto-next";
     rev = "v${version}";
-    sha256 = "0ibakwmsbpk10bvxsr5vvka0pks89arric428y5cmfgcpr72sqzw";
+    sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n";
   };
 
   propagatedBuildInputs = with python34Packages; [ feedparser ];

From 65ff0d5f9de3e8f0ca5ec3a70549e30afd84a6d5 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Tue, 22 Aug 2017 15:04:18 +0300
Subject: [PATCH 2480/3246] switch-to-configuration: fix detection of changes
 between rebuilds for template instances

This makes declarative containers truly reloadable. Current code already declares it:

https://github.com/NixOS/nixpkgs/blob/56904d7c423f2b13b37fbd29f39bbb4b52bc7824/nixos/modules/virtualisation/containers.nix#L488

```
  restartIfChanged = false;
```

https://github.com/NixOS/nixpkgs/blob/56904d7c423f2b13b37fbd29f39bbb4b52bc7824/nixos/modules/virtualisation/containers.nix#L540

```
  reloadIfChanged = true;
```

Original author: @chrisfarms in https://github.com/NixOS/nixpkgs/pull/3021/commits/6e36619b277f78ece1bb81b79b5651897e46a2bf
Most of stuff from that commit has already been ported.
---
 .../modules/system/activation/switch-to-configuration.pl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 88e7847cf8c..29cc60b0032 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -147,11 +147,16 @@ my $activePrev = getActiveUnits;
 while (my ($unit, $state) = each %{$activePrev}) {
     my $baseUnit = $unit;
 
-    # Recognise template instances.
-    $baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/;
     my $prevUnitFile = "/etc/systemd/system/$baseUnit";
     my $newUnitFile = "$out/etc/systemd/system/$baseUnit";
 
+    # Detect template instances.
+    if (!-e $prevUnitFile && !-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) {
+      $baseUnit = "$1\@.$2";
+      $prevUnitFile = "/etc/systemd/system/$baseUnit";
+      $newUnitFile = "$out/etc/systemd/system/$baseUnit";
+    }
+
     my $baseName = $baseUnit;
     $baseName =~ s/\.[a-z]*$//;
 

From 4c07f405979d7c5004cbbec7cd2ade7a6b6e279e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 19 Aug 2017 18:30:51 +0200
Subject: [PATCH 2481/3246] hackage2nix: keep old base-orphans around for
 liquidhaskell

---
 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 fc46f4a50a4..efd89198ff4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2514,6 +2514,7 @@ extra-packages:
   - aeson < 1                           # required by liquidhaskell-0.8.0.0
   - aeson-pretty < 0.8                  # required by elm compiler
   - apply-refact < 0.4                  # newer versions don't work with GHC 8.0.x
+  - base-orphans < 0.6                  # required by liquidhaskell-0.8.0.0
   - binary > 0.7 && < 0.8               # keep a 7.x major release around for older compilers
   - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions

From 4ad193dd274fcc9734c3c57e17a1b65528d7b7ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 21 Aug 2017 12:37:24 +0200
Subject: [PATCH 2482/3246] hackage2nix: partially revert
 https://github.com/NixOS/nixpkgs/pull/28383 to fix evaluation

5342bffc1571a286 refers to an unknown Nixpkgs maintainer.
---
 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 efd89198ff4..14606e17d64 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2595,8 +2595,6 @@ package-maintainers:
   abbradar:
     - Agda
     - lambdabot
-  alunduil:
-    - collection-json
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms

From f445fe7574750d45257e7a66034b583e38845ff2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 19 Aug 2017 18:33:22 +0200
Subject: [PATCH 2483/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4.1-5-g0ed67c9 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/a355eb34ee90af46ae711efcb472a05107ea9f0f.
---
 .../haskell-modules/hackage-packages.nix      | 773 +++++++++++++++---
 1 file changed, 646 insertions(+), 127 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b75b805c630..2d17b152b28 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3975,8 +3975,8 @@ self: {
      }:
      mkDerivation {
        pname = "DeepDarkFantasy";
-       version = "0.2017.8.18";
-       sha256 = "1gm86c03b06hjv83g4mmyilhcryz2gqygbcwlkg5mibvi1wixqqf";
+       version = "0.2017.8.19";
+       sha256 = "1hsmxb961jvlv77y3ajrd2gjfr84z2kq451fwwm4q6p28grjvj8l";
        libraryHaskellDepends = [
          base bimap constraints containers mtl random recursion-schemes
          template-haskell
@@ -7126,6 +7126,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HDBC_2_4_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, convertible, mtl
+     , old-time, text, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "HDBC";
+       version = "2.4.0.2";
+       sha256 = "0nnvfyivmw5pykbna953yb6z4al1ak5vsd308lpsyv2bczymf1v7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers convertible mtl old-time text time
+         utf8-string
+       ];
+       homepage = "https://github.com/hdbc/hdbc";
+       description = "Haskell Database Connectivity";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HDBC-mysql" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, HDBC, mysqlclient
      , openssl, time, utf8-string, zlib
@@ -7169,8 +7189,8 @@ self: {
      }:
      mkDerivation {
        pname = "HDBC-postgresql";
-       version = "2.3.2.4";
-       sha256 = "1zb8q44rvyykd6yfsmiqm9bl7fv1dks4383jh8z7gz1fvy18963i";
+       version = "2.3.2.5";
+       sha256 = "0l9i7mkdcch7f1ajl0fma7rra3dc0llmlia0iqhqb4k0gcrpy7l8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10202,6 +10222,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "IPv6DB_0_2_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
+     , hedis, hspec, http-client, http-types, IPv6Addr, mtl
+     , optparse-applicative, text, unordered-containers, vector, wai
+     , wai-logger, warp
+     }:
+     mkDerivation {
+       pname = "IPv6DB";
+       version = "0.2.2";
+       sha256 = "117qn9h25wi0q8nnj10yj33spqizcsf0inb7n4xpbccg60x9i51k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring fast-logger hedis http-types IPv6Addr mtl
+         optparse-applicative text unordered-containers vector wai
+         wai-logger warp
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-client http-types vector
+       ];
+       homepage = "http://ipv6db.cybervisible.com";
+       description = "A RESTful Web Service for IPv6-related data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IcoGrid" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -10591,6 +10641,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_2_8_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.2.8.3";
+       sha256 = "1g4cjldlncll6snykgm4qwkryqq66m5a3a5jrxq79nzfizvwsl4c";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       homepage = "https://github.com/Twinside/Juicy.Pixels";
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-canvas" = callPackage
     ({ mkDerivation, base, containers, JuicyPixels }:
      mkDerivation {
@@ -18190,25 +18258,25 @@ self: {
      }) {};
 
   "Villefort" = callPackage
-    ({ mkDerivation, base, directory, filepath, FindBin, HDBC
-     , HDBC-sqlite3, mtl, process, QuickCheck, random, scotty, split
-     , strict, text, time, transformers, unix
+    ({ mkDerivation, base, bytestring, directory, filepath, FindBin
+     , HDBC, HDBC-sqlite3, mtl, process, random, scotty, split, strict
+     , text, time, transformers, unix
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.1.4";
-       sha256 = "0rdklpqa0g7fv2ah8khbgjngaxp8lfvf9i4wlmbg1755r6irhz9a";
+       version = "0.1.1.5";
+       sha256 = "1rp624kdrc8gx0zsxa5q68n458mdbjr0qf94s7dc7030rgvqs8l6";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base directory filepath FindBin HDBC HDBC-sqlite3 mtl process
-         random scotty split strict text time transformers unix
+         base bytestring directory filepath FindBin HDBC HDBC-sqlite3 mtl
+         process random scotty split strict text time transformers unix
        ];
        executableHaskellDepends = [
          base HDBC HDBC-sqlite3 random scotty split text time
        ];
-       testHaskellDepends = [ base HDBC HDBC-sqlite3 QuickCheck ];
+       testHaskellDepends = [ base HDBC HDBC-sqlite3 ];
        homepage = "https://github.com/Chrisr850/Villefort#readme";
        description = "Villefort is a task manager and time tracker written in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -22243,8 +22311,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "0.6";
-       sha256 = "02i557qians780vzi6fvffwm967j4k2p0iphvj423lk6qywyvdy5";
+       version = "0.7";
+       sha256 = "0f1vb7948p7xn1x4ayzjpr222349bp70wsix384nhwsrksk2fiwp";
        libraryHaskellDepends = [
          aivika aivika-transformers base binary containers
          distributed-process exceptions mtl mwc-random random stm time
@@ -25399,6 +25467,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-terminal_0_7" = callPackage
+    ({ mkDerivation, base, colour }:
+     mkDerivation {
+       pname = "ansi-terminal";
+       version = "0.7";
+       sha256 = "1p66w12i2nr653ixdxly98q4g895a4nav8afmgq6yifm96shf89f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base colour ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/feuerbach/ansi-terminal";
+       description = "Simple ANSI terminal support, with Windows compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ansi-wl-pprint" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -27181,6 +27265,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "arrowp-qq_0_2_0_1" = callPackage
+    ({ mkDerivation, arrows, base, containers, data-default
+     , haskell-src-exts, haskell-src-exts-util, haskell-src-meta, NoHoed
+     , template-haskell, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "arrowp-qq";
+       version = "0.2.0.1";
+       sha256 = "18m9h5v1c3w0f5f0iw2vxmdms73d4w9s1z7aa301h2c43fv0iym8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-default haskell-src-exts haskell-src-exts-util
+         haskell-src-meta NoHoed template-haskell transformers uniplate
+       ];
+       executableHaskellDepends = [ base haskell-src-exts NoHoed ];
+       testHaskellDepends = [ arrows base template-haskell ];
+       homepage = "https://github.com/pepeiborra/arrowp";
+       description = "A preprocessor and quasiquoter for translating arrow notation";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "arrows" = callPackage
     ({ mkDerivation, base, Stream }:
      mkDerivation {
@@ -30651,6 +30758,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "base-orphans_0_5_4" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.5.4";
+       sha256 = "0qv20n4yabg7sc3rs2dd46a53c7idnd88by7n3s36dkbc21m41q4";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-orphans" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
@@ -36126,7 +36247,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_23" = callPackage
+  "brick_0_24" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-clist
      , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
      , template-haskell, text, text-zipper, transformers, vector, vty
@@ -36134,8 +36255,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.23";
-       sha256 = "1izw1gj38z6d8wnakpdqvsqx49gpgg5wm95hkbc75fvxshngxiwm";
+       version = "0.24";
+       sha256 = "1zlzxbbsan14n7vnhs1250zq8d504br8grni4vlzk2dp21rikasn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44928,7 +45049,6 @@ self: {
        homepage = "https://github.com/alunduil/collection-json.hs";
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collections" = callPackage
@@ -44990,14 +45110,14 @@ self: {
 
   "colonnade" = callPackage
     ({ mkDerivation, base, bytestring, contravariant, doctest
-     , profunctors, text, vector
+     , profunctors, semigroups, text, vector
      }:
      mkDerivation {
        pname = "colonnade";
-       version = "1.1.0";
-       sha256 = "1z7a4c4yim89yqsb1jnhml115lfri8j1nrdq2q4km64fxgi90vp8";
+       version = "1.1.1";
+       sha256 = "1qivzd143lk68k6dp8flj1265x8gw9zhs76bsvmhx6kq139qldhf";
        libraryHaskellDepends = [
-         base bytestring contravariant profunctors text vector
+         base bytestring contravariant profunctors semigroups text vector
        ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
@@ -50377,6 +50497,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crypto-enigma_0_0_2_9" = callPackage
+    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
+     , split
+     }:
+     mkDerivation {
+       pname = "crypto-enigma";
+       version = "0.0.2.9";
+       sha256 = "18nc5gqsy4dsm22van6iz96lqq45f7jqik4fljczgp6n1knyig9z";
+       libraryHaskellDepends = [ base containers MissingH mtl split ];
+       testHaskellDepends = [ base HUnit QuickCheck ];
+       homepage = "https://github.com/orome/crypto-enigma-hs";
+       description = "An Enigma machine simulator with display";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "crypto-multihash" = callPackage
     ({ mkDerivation, base, base58-bytestring, bytestring, containers
      , cryptonite, hspec, memory, QuickCheck, string-conversions
@@ -51535,6 +51671,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "currencies" = callPackage
+    ({ mkDerivation, base, hspec, text }:
+     mkDerivation {
+       pname = "currencies";
+       version = "0.1.1.0";
+       sha256 = "07mkzn12rwlgfv7l0b507sqhl2hw56clmj6sfj0cmdyq9i75lj55";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "https://github.com/alx741/currencies#readme";
+       description = "Currencies representation, pretty printing and conversion";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "currency" = callPackage
     ({ mkDerivation, base, containers, hashable, iso3166-country-codes
      }:
@@ -53205,11 +53354,11 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "data-forest";
-       version = "0.1.0.4";
-       sha256 = "0nq0y7s4lciaghf0d3xcpy13na7cv3irvr07gq7k3f75lzjj4309";
+       version = "0.1.0.5";
+       sha256 = "05hpi0xr4bp7jigb6qa48n02widxxcn9npjh1y876mkgsdpd4x01";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/chris-martin/haskell-libraries";
+       homepage = "https://github.com/chris-martin/data-forest";
        description = "A simple multi-way tree data structure";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -55612,6 +55761,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_0_7_1_2" = callPackage
+    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
+     , leancheck, mtl, random, ref-fd, semigroups, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "0.7.1.2";
+       sha256 = "07ilcx6j4y587vda3y6maqjzn00zx9lz7mlgp2c1rhikbyk5dn03";
+       libraryHaskellDepends = [
+         base concurrency containers deepseq exceptions leancheck mtl random
+         ref-fd semigroups transformers transformers-base
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Systematic testing for Haskell concurrency";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -58403,10 +58571,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.6.6";
-       sha256 = "1l5png3jwsqa5m63szz4x669nz6qmjiwhhh26z9wql7amdfpg0g8";
-       revision = "1";
-       editedCabalFile = "1rx1igg8rf0qgdnkfx2az011308winjji67bx4w8zcff9cg6cn2r";
+       version = "0.7.0";
+       sha256 = "1haasdwmp475crdrqz6krvwn31rq3xl8fp6ihdmq65js4hbd2w02";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static exceptions hashable mtl network-transport random
@@ -58885,8 +59051,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-tests";
-       version = "0.4.7";
-       sha256 = "1c8pd7288978fjym4cw0f47xkwr0myss2pvh4mwralspyynx3rwb";
+       version = "0.4.9";
+       sha256 = "1vpg01klz6yq5jp5wbf4x3608yq5270r5icds3wfn83qxwwpnhd7";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
@@ -62410,8 +62576,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.9";
-       sha256 = "04j65wxdwbyfay0a40kfx0lnzph3k32jidaqks48g2nxjxqn8gvh";
+       version = "1.0.10";
+       sha256 = "18108haj2gpgbn3lbsgzb1ixbycijjns1h780hllsb3nbcmqv0gw";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -65859,6 +66025,19 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "executor" = callPackage
+    ({ mkDerivation, async, base, process }:
+     mkDerivation {
+       pname = "executor";
+       version = "0.0.3";
+       sha256 = "01whn23ycgm59zim6knna43p2dafh0bjwrmfwg3xq169im79n1zq";
+       libraryHaskellDepends = [ async base process ];
+       testHaskellDepends = [ async base process ];
+       homepage = "https://github.com/GianlucaGuarini/executor";
+       description = "Shell helpers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "exference" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, containers
      , data-pprint, deepseq, deepseq-generics, directory, either
@@ -66624,12 +66803,12 @@ self: {
     ({ mkDerivation, base, leancheck, speculate, template-haskell }:
      mkDerivation {
        pname = "extrapolate";
-       version = "0.2.1";
-       sha256 = "0bb02q5pb3lx5ass9265qb25fn0g30drv0b5250njagc1gi69nrl";
+       version = "0.2.2";
+       sha256 = "0187ifx48dlm6grq9bkkavrwrblc5yncj4pd1lq436dwa7b0c4b5";
        libraryHaskellDepends = [
          base leancheck speculate template-haskell
        ];
-       testHaskellDepends = [ base leancheck speculate template-haskell ];
+       testHaskellDepends = [ base leancheck speculate ];
        homepage = "https://github.com/rudymatela/extrapolate#readme";
        description = "generalize counter-examples of test properties";
        license = stdenv.lib.licenses.bsd3;
@@ -69423,14 +69602,14 @@ self: {
      }:
      mkDerivation {
        pname = "fizzbuzz-as-a-service";
-       version = "0.1.0.0";
-       sha256 = "1h7spka2igi1yz1dwl1192i4g74wlxp3m011mi6s6j35xpvll99l";
+       version = "0.1.0.1";
+       sha256 = "1m2pyvhdj8phj2f1zka6v1p72hzhmaigw2v0n1zwkh3k4hkq90kg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          async base bytestring network-simple optparse-applicative
        ];
-       homepage = "https://github.com/chris-martin/haskell-libraries";
+       homepage = "https://github.com/chris-martin/fizzbuzz-as-a-service";
        description = "FizzBuzz as a service";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -70209,7 +70388,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fmt_0_4_0_0" = callPackage
+  "fmt_0_5_0_0" = callPackage
     ({ mkDerivation, base, base16-bytestring, base64-bytestring
      , bytestring, containers, criterion, deepseq, formatting, hspec
      , interpolate, microlens, neat-interpolation, text, text-format
@@ -70217,8 +70396,8 @@ self: {
      }:
      mkDerivation {
        pname = "fmt";
-       version = "0.4.0.0";
-       sha256 = "0ksc8nx3v26y7k25a4x0knbmy9f5c9sa7j54b6fp4xb93bcdn76h";
+       version = "0.5.0.0";
+       sha256 = "156iv5c5aqlc6mmc5qcnsa4plhp99n4mzmm8rspxrc84gkl1agnf";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring containers
          microlens text text-format time time-locale-compat
@@ -72244,6 +72423,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fswatch" = callPackage
+    ({ mkDerivation, base, directory, fsnotify, haskeline
+     , optparse-applicative, process
+     }:
+     mkDerivation {
+       pname = "fswatch";
+       version = "0.1.0.0";
+       sha256 = "13mrpz99sky3m2wfgxqxv475q0mnlpamhak1z20ycg7wdm3k13zw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory fsnotify haskeline optparse-applicative process
+       ];
+       executableHaskellDepends = [
+         base directory fsnotify haskeline optparse-applicative process
+       ];
+       homepage = "https://github.com/kelemzol/watch";
+       description = "File System watching tool with cli and slave functionalities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fswatcher" = callPackage
     ({ mkDerivation, base, directory, fsnotify, optparse-applicative
      , process, regex-pcre-builtin, system-filepath, unix
@@ -73741,8 +73941,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-lens";
-       version = "0.3.0.1";
-       sha256 = "0wkshjzwvlpmxbfr96l1c485rwn21zfgcngkchj2c04amq1fiqs8";
+       version = "0.4.0.0";
+       sha256 = "0gqw9wdz2kf0jsx42l49f16xkb6yh741sv3kzss4d5laznmyh2v2";
        libraryHaskellDepends = [ base profunctors ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [
@@ -75292,8 +75492,8 @@ self: {
     ({ mkDerivation, base, cpphs, ghc, happy }:
      mkDerivation {
        pname = "ghc-parser";
-       version = "0.1.8.0";
-       sha256 = "0ljizdzrgn64s70li3yp273ib323jkpflcf305zfgia277vrskj9";
+       version = "0.2.0.0";
+       sha256 = "0jd02qgjs529ac0jvg59rgrjvpm541j993lyfpqr9aqwqj1n3ylp";
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
        homepage = "https://github.com/gibiansky/IHaskell";
@@ -76294,6 +76494,28 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-gobject_2_0_15" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-gobject";
+       version = "2.0.15";
+       sha256 = "0h98lld62dhdbw7s0c833jw15wxajy6nmvr69604px3saf4mjrrl";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GObject bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "gi-gst" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gstreamer, haskell-gi, haskell-gi-base
@@ -78417,8 +78639,8 @@ self: {
        pname = "glirc";
        version = "2.23";
        sha256 = "0iv4n6i63f1x1808a3dvrbxyibi7jd1c8barsqbf9h1bqwazgsah";
-       revision = "1";
-       editedCabalFile = "1grjnv2krrncm6swf53mkvfvsd5qwrn2ixpfzwqvkrfy17bjskp9";
+       revision = "2";
+       editedCabalFile = "14jk02g995qpa1amkngy7vqyxjfxmmwr0585sjg2d6jw2wrzydal";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -78658,8 +78880,8 @@ self: {
        pname = "gloss-examples";
        version = "1.11.1.1";
        sha256 = "0m5xyr5q6kfb2h5pfd5nj4x39nhhsnr7h8vxghvhvw1khsbh5gj1";
-       revision = "1";
-       editedCabalFile = "1l7hkyrl535wmw8afafsq3hj6b02zmm4skv1739h8wbpdc6255al";
+       revision = "2";
+       editedCabalFile = "0ldnhqmxs03040m5ym0qw1ig217j893rm1sq7rnjsmvh15ziw4yh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -78746,6 +78968,8 @@ self: {
        pname = "gloss-rendering";
        version = "1.11.1.1";
        sha256 = "1x2a8w49ik4w03wzf31icqbpr7fds9a1c7w263xwpm1445nrl2hz";
+       revision = "1";
+       editedCabalFile = "1z580vh4idsbndjjla6gniz8cacxwj9206llyafl83brrqjhm14b";
        libraryHaskellDepends = [
          base bmp bytestring containers GLUT OpenGL
        ];
@@ -89241,6 +89465,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "haskell-src-exts-util" = callPackage
+    ({ mkDerivation, base, containers, data-default, haskell-src-exts
+     , transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-src-exts-util";
+       version = "0.1.0";
+       sha256 = "0paqb9k7p7vnykrzmiwkmah50523svsifc7wjy1xc5c2cc19597m";
+       libraryHaskellDepends = [
+         base containers data-default haskell-src-exts transformers uniplate
+       ];
+       homepage = "https://github.com/pepeiborra/haskell-src-exts-util";
+       description = "Helper functions for working with haskell-src-exts trees";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-src-meta" = callPackage
     ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
      , template-haskell, test-framework, test-framework-hunit
@@ -92395,6 +92635,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hdevtools_0_1_6_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.6.0";
+       sha256 = "0yp270sbz501vla87nhzv53ag0b64ny9gza6chr8mbjqkj86d5j5";
+       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
@@ -92965,8 +93226,8 @@ self: {
        pname = "heist";
        version = "1.0.1.0";
        sha256 = "1jwbqr2n7jv8cykjgg1a0bdwjszmrbg5qflikvmkyiy1pz0z6kzx";
-       revision = "5";
-       editedCabalFile = "02vsrjfcbzfi27992dv60cakb2s1z6ci13x01cvgdskcm8w81yl6";
+       revision = "6";
+       editedCabalFile = "1r0gqv2y2sar3j4vwnvc6gsdbs9813gviiaa348j9jyc0j6dy4qw";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
@@ -103514,6 +103775,22 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hsyslog-tcp" = callPackage
+    ({ mkDerivation, base, bytestring, hsyslog, hsyslog-udp, network
+     , text, time
+     }:
+     mkDerivation {
+       pname = "hsyslog-tcp";
+       version = "0.1.0.0";
+       sha256 = "06qlpxl5cf45a2y9ncjcngrghbhgf624a6s1yczx1pfx7zqda6i6";
+       libraryHaskellDepends = [
+         base bytestring hsyslog hsyslog-udp network text time
+       ];
+       homepage = "https://github.com/osa1/hsyslog-tcp#readme";
+       description = "syslog over TCP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hsyslog-udp" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
      , time, unix
@@ -103700,8 +103977,8 @@ self: {
        pname = "html-conduit";
        version = "1.2.1.1";
        sha256 = "1a5878axl1w65rv3g76d8fwgzbwazikna885jz5156zrrdq79hlq";
-       revision = "1";
-       editedCabalFile = "0hqkhbg3lq988pr26nanw37pq6pg68p1pnqig817qjprdm6wlcny";
+       revision = "2";
+       editedCabalFile = "1fhna6ck1v05zpf4c715phz102v8vz0p7lsjk3fljmxblamc8kn6";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra containers resourcet
          tagstream-conduit text transformers xml-conduit xml-types
@@ -104974,8 +105251,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2-client";
-       version = "0.2.0.1";
-       sha256 = "14w56b2lzjqwyh2vfqp3q27wsh6yzldrk073msszn0af0wrjv39p";
+       version = "0.2.0.2";
+       sha256 = "07mhaqjlvivk93wia9hlvn9nxfxsqnrbhga0k5jwsgldk229y02p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105242,10 +105519,10 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "human-parse";
-       version = "0.1.0.0";
-       sha256 = "00jngz0v32jd90hq22zshp3ldfrjfkdik9pf6ab4n2bd2mql3va5";
+       version = "0.1.0.2";
+       sha256 = "1p7r26b3845fbdp2lxv6pqbqrlfzna8qsh7k3b1rkj3qlbw64rym";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/chris-martin/haskell-libraries";
+       homepage = "https://github.com/chris-martin/human";
        description = "A lawless typeclass for parsing text entered by humans";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -105268,10 +105545,10 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "human-text";
-       version = "0.1.0.1";
-       sha256 = "0i3z7hmlq7d3kcbx81rkm828l8wv7bv8q9la7cx0l7df9anri7za";
+       version = "0.1.0.2";
+       sha256 = "1jq9ksszwiy0bddw5c0zx037ig0gvsc5k030h6znkvmkpcvg096q";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/chris-martin/haskell-libraries";
+       homepage = "https://github.com/chris-martin/human";
        description = "A lawless typeclass for converting values to human-friendly text";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -105749,14 +106026,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-bits_0_6_0_0" = callPackage
+  "hw-bits_0_7_0_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
      , hw-prim, hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-bits";
-       version = "0.6.0.0";
-       sha256 = "1w6kr5brkw78a0x82r34aivbbh4bhrng2hzh7hycia7291vysbbw";
+       version = "0.7.0.0";
+       sha256 = "18vqxkdzq42186k9ynrhlhk5wigg302y0xcpmgwah6is6hng1mxw";
        libraryHaskellDepends = [
          base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
@@ -106128,6 +106405,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_5_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.5.0.0";
+       sha256 = "00sivy11g7haafpqy12sxgslffw841bx0i25phaz5vcfwp5xrp9j";
+       libraryHaskellDepends = [ base bytestring vector ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
+       homepage = "http://github.com/haskell-works/hw-prim#readme";
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-rankselect" = callPackage
     ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
      , hw-rankselect-base, QuickCheck, vector
@@ -108218,23 +108509,23 @@ self: {
 
   "ihaskell" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
-     , cmdargs, containers, directory, filepath, ghc, ghc-parser
-     , ghc-paths, haskeline, haskell-src-exts, hlint, hspec, http-client
-     , http-client-tls, HUnit, ipython-kernel, mtl, parsec, process
-     , random, setenv, shelly, split, stm, strict, system-argv0, text
-     , transformers, unix, unordered-containers, utf8-string, uuid
-     , vector
+     , cmdargs, containers, directory, filepath, ghc, ghc-boot
+     , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
+     , hspec, hspec-contrib, http-client, http-client-tls, HUnit
+     , ipython-kernel, mtl, parsec, process, random, setenv, shelly
+     , split, stm, strict, system-argv0, text, transformers, unix
+     , unordered-containers, utf8-string, uuid, vector
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.8.4.0";
-       sha256 = "09vzwbxc8hnm7cwhs1nfpd6abwmlld495h304iwv1j653zrhjygp";
+       version = "0.9.0.1";
+       sha256 = "1xfp0pzxsfcz8h4f27fqvbc6pprwz45cgq5sa393z3wqy17ni4lq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cereal cmdargs containers
-         directory filepath ghc ghc-parser ghc-paths haskeline
+         directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
          haskell-src-exts hlint http-client http-client-tls ipython-kernel
          mtl parsec process random shelly split stm strict system-argv0 text
          transformers unix unordered-containers utf8-string uuid vector
@@ -108244,12 +108535,8 @@ self: {
          process strict text transformers unix
        ];
        testHaskellDepends = [
-         aeson base base64-bytestring bytestring cereal cmdargs containers
-         directory filepath ghc ghc-parser ghc-paths haskeline
-         haskell-src-exts hlint hspec http-client http-client-tls HUnit
-         ipython-kernel mtl parsec process random setenv shelly split stm
-         strict system-argv0 text transformers unix unordered-containers
-         utf8-string uuid vector
+         base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
+         shelly text transformers
        ];
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A Haskell backend kernel for the IPython project";
@@ -109725,7 +110012,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
-  "inline-c_0_6_0_4" = callPackage
+  "inline-c_0_6_0_5" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, gsl
      , gslcblas, hashable, hspec, mtl, parsec, parsers, QuickCheck
      , raw-strings-qq, regex-posix, template-haskell, transformers
@@ -109733,8 +110020,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.6.0.4";
-       sha256 = "0ram4gixghck1ydqjfymm0ks7yfig2cn3iq40iid2ppvam5kmsgc";
+       version = "0.6.0.5";
+       sha256 = "0fy19z3r6xyzhkkagi050rasc4ak8xmvdgidy4wplayck9fr3z47";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111251,8 +111538,8 @@ self: {
      }:
      mkDerivation {
        pname = "ipython-kernel";
-       version = "0.8.4.0";
-       sha256 = "0r426gbvr5k019v49gmw32fv0xnq5viizin4gb7wxcnm6ql84k5c";
+       version = "0.9.0.0";
+       sha256 = "04byvmf4n55sdanw2lg5hicp2h7ivn2620wybd8i43hgcckx1ach";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -115757,8 +116044,8 @@ self: {
      }:
      mkDerivation {
        pname = "keystore";
-       version = "0.8.0.1";
-       sha256 = "0mfq4i1bn4zbfvxi45d7k8g3xiljv24vicc62535csdp68i5sh3i";
+       version = "0.8.0.2";
+       sha256 = "0n5d94wkasrb834j7jvh7fh3a2dshqb21g3a9kpsqjmsjy76bq3g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -117649,6 +117936,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-elm" = callPackage
+    ({ mkDerivation, base, HUnit, MissingH, pretty }:
+     mkDerivation {
+       pname = "language-elm";
+       version = "0.0.10.1";
+       sha256 = "1kp2mwl1hngpvl2hfzlf7dghcvcr407f7qc86b3zz2vgxfac0n07";
+       libraryHaskellDepends = [ base MissingH pretty ];
+       testHaskellDepends = [ base HUnit pretty ];
+       homepage = "https://github.com/eliaslfox/language-elm#readme";
+       description = "Generate elm code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "language-fortran" = callPackage
     ({ mkDerivation, alex, array, base, happy, haskell-src, parsec, syb
      }:
@@ -119023,6 +119323,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "leancheck_0_6_5" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "leancheck";
+       version = "0.6.5";
+       sha256 = "05mda73v91y951fc8lph2fq8nhq3q12d30xjwj5h7xqwi2c8sdiy";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/rudymatela/leancheck#readme";
+       description = "Cholesterol-free property-based testing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "leankit-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
      mkDerivation {
@@ -120179,8 +120493,8 @@ self: {
      }:
      mkDerivation {
        pname = "libgraph";
-       version = "1.12";
-       sha256 = "04mm5va8dzxhp65q404dq44zma9x069sw9hyqmz1xj7b9cwkigwn";
+       version = "1.13";
+       sha256 = "0h4sas34nfql5w3mxds1j68qv4mcfjrrawxssd3rr23d1icavw2c";
        libraryHaskellDepends = [
          array base containers monads-tf process union-find
        ];
@@ -122998,11 +123312,11 @@ self: {
     ({ mkDerivation, base, containers, doctest, hedgehog, loc-test }:
      mkDerivation {
        pname = "loc";
-       version = "0.1.3.0";
-       sha256 = "09s0a8diav2gyva965m03z1j7dcb7r1r6y10c8c3n1qpqvmgmvym";
+       version = "0.1.3.1";
+       sha256 = "0irwsh3ib9rb1h6chs060vzr7bhczqb3qxrizxvsqiymgd1yjjgx";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hedgehog loc-test ];
-       homepage = "https://github.com/chris-martin/haskell-libraries";
+       homepage = "https://github.com/chris-martin/loc";
        description = "Types representing line and column positions and ranges in text files";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -123011,10 +123325,10 @@ self: {
     ({ mkDerivation, base, containers, hedgehog, loc }:
      mkDerivation {
        pname = "loc-test";
-       version = "0.1.3.0";
-       sha256 = "1ic60m2slsaqyd0k82hbm5pb58z15zlhy429hzaj40bj1yjblwyw";
+       version = "0.1.3.1";
+       sha256 = "0z2d1fi77msbgzipz87q32z5fmfb6aj923j2wh1565qbjaf7qjxx";
        libraryHaskellDepends = [ base containers hedgehog loc ];
-       homepage = "https://github.com/chris-martin/haskell-libraries";
+       homepage = "https://github.com/chris-martin/loc";
        description = "Test-related utilities related to the /loc/ package";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -132310,6 +132624,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_10" = callPackage
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, http-client, http-client-tls
+     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
+     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-format, transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.10";
+       sha256 = "0wlcizw6kfbir18mqplnyap76gslbzia6ni25z2r4jb8mxrh5z6d";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text text-format transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base code-page optparse-applicative text text-format
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mosaico-lib" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
      , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -134111,8 +134458,8 @@ self: {
      }:
      mkDerivation {
        pname = "mvc";
-       version = "1.1.4";
-       sha256 = "0nx66swbca3c481abzbpgxfhs93y6bsm897dbk56v0dfdqn0inw4";
+       version = "1.1.5";
+       sha256 = "18izqidmhiw2b3xs0q8w7dv73v3300d2xqk3prnk70326bsrvrid";
        libraryHaskellDepends = [
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
@@ -134974,6 +135321,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "naperian" = callPackage
+    ({ mkDerivation, adjunctions, base, comonad, distributive, free
+     , streams, transformers
+     }:
+     mkDerivation {
+       pname = "naperian";
+       version = "0.1.0.0";
+       sha256 = "0ydlwk1m3xi12bv2rylay4lrz5j5aj1lz95ivilnh89qg4ahrnlb";
+       libraryHaskellDepends = [
+         adjunctions base comonad distributive free streams transformers
+       ];
+       homepage = "https://github.com/aaronvargo/naperian#readme";
+       description = "Efficient representable functors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "naqsha" = callPackage
     ({ mkDerivation, base, bytestring, groups, hspec, HUnit, QuickCheck
      , vector
@@ -136823,6 +137186,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-transport-tcp_0_6_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-accessor
+     , network, network-transport, network-transport-tests
+     }:
+     mkDerivation {
+       pname = "network-transport-tcp";
+       version = "0.6.0";
+       sha256 = "15p6y91gnk0xvysr3abcicwl343bq9bi1liaxcrwh2ffwws02kvp";
+       libraryHaskellDepends = [
+         base bytestring containers data-accessor network network-transport
+       ];
+       testHaskellDepends = [
+         base bytestring network network-transport network-transport-tests
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "TCP instantiation of Network.Transport";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-transport-tests" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
      , network-transport, random
@@ -136840,6 +137223,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-transport-tests_0_2_4_1" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
+     , network-transport, random
+     }:
+     mkDerivation {
+       pname = "network-transport-tests";
+       version = "0.2.4.1";
+       sha256 = "1j3sfr8d0fjp7qiqw94rcfwk8hrb55w8vz7cmw891cjjdlf00nb3";
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring containers mtl network-transport
+         random
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Unit tests for Network.Transport implementations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-transport-zeromq" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, containers
      , criterion, data-accessor, distributed-process
@@ -142509,6 +142910,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-types_1_17_1" = 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.1";
+       sha256 = "0sqk4sjpyl9k54kaxrk52in2sqhy62cakhca9k5i9c6gjhqh0rrb";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers HUnit QuickCheck string-qq syb
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://johnmacfarlane.net/pandoc";
+       description = "Types for representing a structured document";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-unlit" = callPackage
     ({ mkDerivation, base, pandoc }:
      mkDerivation {
@@ -151281,8 +151704,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-compact";
-       version = "2.1";
-       sha256 = "0723zp6577vwfrhr2hnn439hc90h6qh6sgrshywhd5yks673vgf5";
+       version = "3.0";
+       sha256 = "06m8n5rx1d62hwd017ss8nlxas5ia57lgxddm2hv2046938a5wm8";
        libraryHaskellDepends = [ base base-compat containers ];
        benchmarkHaskellDepends = [
          aeson base base-compat bytestring criterion deepseq pretty text
@@ -159107,6 +159530,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reflex-sdl2" = callPackage
+    ({ mkDerivation, base, dependent-sum, mtl, ref-tf, reflex, sdl2 }:
+     mkDerivation {
+       pname = "reflex-sdl2";
+       version = "0.1.0.0";
+       sha256 = "1k18lb7aa440i76yd6x4bh3sz6wsqv1cq1l93wpac1673bvxicll";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base dependent-sum mtl ref-tf reflex sdl2
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/schell/reflex-sdl2#readme";
+       description = "SDL2 and reflex FRP";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "reflex-transformers" = callPackage
     ({ mkDerivation, base, containers, lens, mtl, reflex, semigroups
      , stateWriter, transformers
@@ -160595,10 +161035,8 @@ self: {
      }:
      mkDerivation {
        pname = "repa";
-       version = "3.4.1.2";
-       sha256 = "0myw05dicby7dhkmjvv9wphfnnx2jj3dxaa50357n76zysxhpy2p";
-       revision = "1";
-       editedCabalFile = "0pagab03fw7xp1vvgrc87g6g6zdr60plqhjjxk3fwwm1gs0jj61k";
+       version = "3.4.1.3";
+       sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -160611,8 +161049,8 @@ self: {
     ({ mkDerivation, base, repa, vector }:
      mkDerivation {
        pname = "repa-algorithms";
-       version = "3.4.1.1";
-       sha256 = "0a3yhia6wb4blc8zyzd2pw6k7hfpamv08d64qplq181dp887kl64";
+       version = "3.4.1.2";
+       sha256 = "11lqq5j4g7p1dd47y65mfhzfsj8r27h7qj6qpc43g7kmf7h9gd87";
        libraryHaskellDepends = [ base repa vector ];
        homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
@@ -160704,6 +161142,8 @@ self: {
        pname = "repa-examples";
        version = "3.4.1.1";
        sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039";
+       revision = "1";
+       editedCabalFile = "0acl57w635zi1il4r4jxzp3r1kd0zdqdiihinpbla5vnp3a5zg13";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160764,6 +161204,8 @@ self: {
        pname = "repa-io";
        version = "3.4.1.1";
        sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm";
+       revision = "1";
+       editedCabalFile = "0z0wbaz7svqdzjpmx7d9wwfjl31w0i29pcc1v11r26f9avw3g9qi";
        libraryHaskellDepends = [
          base binary bmp bytestring old-time repa vector
        ];
@@ -167824,8 +168266,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }:
      mkDerivation {
        pname = "servant-auth";
-       version = "0.2.7.0";
-       sha256 = "0j0hfal64qjdbif9a6vy7dv4zn0pmkspn0pwafhsyh5adgqkrhxa";
+       version = "0.3.0.0";
+       sha256 = "085xfhrim0y067yab3pwgiilk7zzdg8b7dz3i08f4cfd633an8km";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ];
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
@@ -167841,8 +168283,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-client";
-       version = "0.2.7.1";
-       sha256 = "1y5ha76j81biyzzgl9r26i0hkx1j3yslidzyl5h8xz55y712m16d";
+       version = "0.3.0.0";
+       sha256 = "048rrakd4v9nhgnqdwk4hwdb4mrailpkmf0ip1zmav18rg9ij3c7";
        libraryHaskellDepends = [
          base bytestring servant servant-auth servant-client text
        ];
@@ -167955,6 +168397,8 @@ self: {
        pname = "servant-auth-server";
        version = "0.3.0.0";
        sha256 = "1rs51w929hlwsgrg5ajcv3cp09hnk37p1n5s2ydmja22m4ba93ak";
+       revision = "1";
+       editedCabalFile = "077qvaxqcnhvyl1d1318hyx9ckjd3z5n48vq0bqma0z7wqlzqs2v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173780,6 +174224,8 @@ self: {
        pname = "snap";
        version = "1.0.0.2";
        sha256 = "0jx2prq0lxq9jqxqk8f059lwjm2yqxzwb9lx6iviq57flx4zxyqq";
+       revision = "1";
+       editedCabalFile = "1df44l26sxfk2qprs2vcfigzyzkxxwxi8siaaikbvmjzyjm0mby1";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist filepath hashable heist
@@ -174033,8 +174479,8 @@ self: {
        pname = "snap-loader-dynamic";
        version = "1.0.0.0";
        sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg";
-       revision = "1";
-       editedCabalFile = "0zgnlfp4rlj5c40ma75fdc7csbjn9p84x6a7fiwc7lqd1iqk4rbj";
+       revision = "2";
+       editedCabalFile = "1q5lal77sgxwcwbabw5rqwlrx84xv1c24zs2ry2gz57ccdr6n9qm";
        libraryHaskellDepends = [
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
@@ -179768,14 +180214,13 @@ self: {
   "stratux" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
      , stratux-http, stratux-types, stratux-websockets, template-haskell
-     , text
      }:
      mkDerivation {
        pname = "stratux";
-       version = "0.0.8";
-       sha256 = "0awksbs58vvzf21747bcnhhf15px7nw99nnrd2kx220fa62fd9qh";
+       version = "0.0.9";
+       sha256 = "17jy7svf74k3r87p8xlp0hi9z95f5npmnn28jlwx4rb68dn63aly";
        libraryHaskellDepends = [
-         base stratux-http stratux-types stratux-websockets text
+         base stratux-http stratux-types stratux-websockets
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -179793,8 +180238,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratux-http";
-       version = "0.0.8";
-       sha256 = "0p9wcp8rby3mdxy1xs4wfx9cyc1yx16x2r4k964brv9vh6h615y7";
+       version = "0.0.9";
+       sha256 = "121pansnd8pdhv9ki2qdav93cwldmnxnykjldhbkb2bkyr0skdyb";
        libraryHaskellDepends = [
          aeson base either HTTP network-uri stratux-types utf8-string
        ];
@@ -179814,8 +180259,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratux-types";
-       version = "0.0.8";
-       sha256 = "1jf633w4pzhqmpmwpxiq49l0as85c6sj6wyvs3gjp0cik5g3m0q5";
+       version = "0.0.9";
+       sha256 = "06d4qagcmzch25zkxpnvw04h5aav5wbdrfyi6xvzvndj12hvayza";
        libraryHaskellDepends = [
          aeson base bytestring lens scientific text time
        ];
@@ -179835,8 +180280,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratux-websockets";
-       version = "0.0.8";
-       sha256 = "1rq0v6hyjc3s28zkdssm1my8k4lwbpqv0hv119w5j5i51l8zhgj8";
+       version = "0.0.9";
+       sha256 = "0076n4i250frv71w9sysw935g5aq0py8shwaqrhjrv4jp6mb2k3q";
        libraryHaskellDepends = [
          aeson base either network stratux-types text transformers
          websockets
@@ -182042,8 +182487,8 @@ self: {
      }:
      mkDerivation {
        pname = "swish";
-       version = "0.9.1.9";
-       sha256 = "173qvx46als9ar63j6hqynnwnkvs12pb2qv3gbfjm8mla5i7sjym";
+       version = "0.9.1.10";
+       sha256 = "10nx8vx6vprsdchqd726vx3cfzxy0jkz9ylw4p2mkcam9s72dd7c";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -188949,6 +189394,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ticker" = callPackage
+    ({ mkDerivation, async, base, deepseq, doctest, Glob, hspec
+     , safe-exceptions
+     }:
+     mkDerivation {
+       pname = "ticker";
+       version = "1.0.0";
+       sha256 = "16n1qxhp6i14h636n7r427s89v7z4kmfi7ivc6a0sz6jzh4h5c0d";
+       libraryHaskellDepends = [ async base safe-exceptions ];
+       testHaskellDepends = [ async base deepseq doctest Glob hspec ];
+       homepage = "https://github.com/kazeula/ticker-hs";
+       description = "A concurrent utility inspired by Ticker in golang";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tickle" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
      , filepath, lens, mtl, QuickCheck, semigroupoids, semigroups
@@ -191998,6 +192458,8 @@ self: {
        pname = "trifecta";
        version = "1.7.1.1";
        sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31";
+       revision = "1";
+       editedCabalFile = "17i9137mqcm74s8zwdnkcg5kj583zzwqjyyz1z0af4anxfs1hvng";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -193215,6 +193677,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "twitter-conduit_0_2_2_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base
+     , bytestring, Cabal, cabal-doctest, case-insensitive, conduit
+     , conduit-extra, containers, data-default, doctest, exceptions
+     , hlint, hspec, http-client, http-conduit, http-types, lens
+     , lens-aeson, network-uri, resourcet, template-haskell, text, time
+     , transformers, transformers-base, twitter-types
+     , twitter-types-lens
+     }:
+     mkDerivation {
+       pname = "twitter-conduit";
+       version = "0.2.2.2";
+       sha256 = "00bxqd77ccxa0cbbrgwhnivyi8jvmm5w0xx7fnx592yn7y9kgfip";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec authenticate-oauth base bytestring conduit
+         conduit-extra containers data-default exceptions http-client
+         http-conduit http-types lens lens-aeson resourcet template-haskell
+         text time transformers transformers-base twitter-types
+         twitter-types-lens
+       ];
+       testHaskellDepends = [
+         aeson attoparsec authenticate-oauth base bytestring
+         case-insensitive conduit conduit-extra containers data-default
+         doctest hlint hspec http-client http-conduit http-types lens
+         lens-aeson network-uri resourcet template-haskell text time
+         twitter-types twitter-types-lens
+       ];
+       homepage = "https://github.com/himura/twitter-conduit";
+       description = "Twitter API package with conduit interface and Streaming API support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "twitter-enumerator" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-enumerator
      , authenticate, base, bytestring, containers, enumerator
@@ -194041,6 +194537,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "typed-process_0_1_0_1" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, bytestring
+     , conduit, conduit-extra, exceptions, hspec, http-conduit, process
+     , stm, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "typed-process";
+       version = "0.1.0.1";
+       sha256 = "05pwpis2vm63qxg8kkqd52whbgkgf5k5sy0w1z1am7jsm6fiychc";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra exceptions process stm
+         transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring bytestring conduit conduit-extra hspec
+         http-conduit temporary
+       ];
+       homepage = "https://haskell-lang.org/library/typed-process";
+       description = "Run external processes, with strong typing of streams";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "typed-spreadsheet" = callPackage
     ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
      , diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -205782,8 +206301,8 @@ self: {
        pname = "xml-hamlet";
        version = "0.4.1";
        sha256 = "1fy29sxby4z6dby518x4za9bpgnh7aqwpwn365lb384rjpsr1wvx";
-       revision = "1";
-       editedCabalFile = "0cs0pmz3hlm09nrcdkr8cnj7s9phqi0y1gfvldcqzw6l4h9557aw";
+       revision = "2";
+       editedCabalFile = "1qlhn3lir1b534mqwxvx5ndnmn4h4qvmd809zapadx8s1q0i0f53";
        libraryHaskellDepends = [
          base containers parsec shakespeare template-haskell text
          xml-conduit
@@ -210763,8 +211282,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-stack";
-       version = "0.0.0.5";
-       sha256 = "01j6gm276xwlclkanai1hb93q83ml62njw8nsnnjk313jwds6151";
+       version = "0.0.0.6";
+       sha256 = "0z2y77fd9ij8s9qqyjik1syh5ry169bda6wlsa4lj658f8yghggc";
        libraryHaskellDepends = [
          base Cabal directory filepath path path-io process safe zifter
        ];

From 499b9ebc012c8002dbb199259dac9201937fb5ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 19 Aug 2017 18:41:55 +0200
Subject: [PATCH 2484/3246] liquidhaskell: fix build of the required old aeson
 version

Closes https://github.com/NixOS/nixpkgs/issues/28372.
---
 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 69be69fd918..31833efc191 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -851,6 +851,7 @@ self: super: {
 
   # build liquidhaskell with the proper (old) aeson version
   liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; };
+  aeson_0_11_3_0 = super.aeson_0_11_3_0.override { base-orphans = self.base-orphans_0_5_4; };
 
   # Test suite fails: https://github.com/lymar/hastache/issues/46.
   # Don't install internal mkReadme tool.

From 7b16f5974e283bccf3b41566f1cbe4add6f6265b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 21 Aug 2017 12:21:49 +0200
Subject: [PATCH 2485/3246] git-annex: update to version 6.20170818

Fixes CVE-2017-9800, CVE-2017-12836, CVE-2017-1000116, and CVE-2017-1000117.
---
 .../haskell-modules/configuration-common.nix  |  2 +-
 .../configuration-hackage2nix.yaml            |  1 -
 .../haskell-modules/hackage-packages.nix      | 76 -------------------
 3 files changed, 1 insertion(+), 78 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 31833efc191..ee1ed27261a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -79,7 +79,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx";
+      sha256 = "15d29hmbl146axjgbm4qhxpz6ypcq1bjf2aj29yhwh5jmznh58i2";
     };
   })).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 14606e17d64..700219d843e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -786,7 +786,6 @@ default-package-overrides:
   - gio ==0.13.3.1
   - giphy-api ==0.5.2.0
   - git ==0.2.0
-  - git-annex ==6.20170520
   - github ==0.16.0
   - github-release ==1.0.5
   - github-types ==0.2.1
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2d17b152b28..e5c748e5dc0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -77287,81 +77287,6 @@ self: {
      }) {};
 
   "git-annex" = callPackage
-    ({ mkDerivation, aeson, async, aws, base, blaze-builder
-     , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
-     , 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
-     , hinotify, hslogger, http-client, http-conduit, http-types, IfElse
-     , lsof, magic, memory, monad-control, monad-logger, mountpoints
-     , 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, split, 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.20170520";
-       sha256 = "05r701gd7jqjcxcvm8l11fb04z8rqjalf4z8id693q9c2x29pkzq";
-       configureFlags = [
-         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
-         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
-         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
-         "-fwebapp-secure" "-fwebdav" "-fxmpp"
-       ];
-       isLibrary = false;
-       isExecutable = true;
-       setupHaskellDepends = [
-         base bytestring Cabal data-default directory exceptions filepath
-         hslogger IfElse process split unix unix-compat
-       ];
-       executableHaskellDepends = [
-         aeson async aws base blaze-builder bloomfilter byteable bytestring
-         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 hinotify hslogger
-         http-client http-conduit http-types IfElse magic memory
-         monad-control monad-logger mountpoints mtl network network-info
-         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 split 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
-       ];
-       preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
-       installPhase = "make PREFIX=$out BUILDER=: install";
-       checkPhase = ''
-         ln -sf dist/build/git-annex/git-annex git-annex
-         ln -sf git-annex git-annex-shell
-         export PATH+=":$PWD"
-         git-annex test
-       '';
-       enableSharedExecutables = false;
-       homepage = "http://git-annex.branchable.com/";
-       description = "manage files with git, without checking their contents into git";
-       license = stdenv.lib.licenses.gpl3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
-         inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
-         inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
-         inherit (pkgs) which;};
-
-  "git-annex_6_20170818" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -77430,7 +77355,6 @@ self: {
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 

From fcd8950520e41c51c76737f387d24e2a6e1a6712 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Tue, 22 Aug 2017 14:14:37 +0100
Subject: [PATCH 2486/3246] scaleway-cli: init at v1.14

---
 pkgs/tools/admin/scaleway-cli/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/admin/scaleway-cli/default.nix

diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix
new file mode 100644
index 00000000000..0e8aacea4ef
--- /dev/null
+++ b/pkgs/tools/admin/scaleway-cli/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec{
+  name = "scaleway-cli-${version}";
+  version = "1.14";
+
+  goPackagePath = "github.com/scaleway/scaleway-cli";
+
+  src = fetchFromGitHub {
+    owner = "scaleway";
+    repo = "scaleway-cli";
+    rev = "v${version}";
+    sha256 = "09rqw82clfdiixa9m3hphxh5v7w1gks3wicz1dvpay2sx28bpddr";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Interact with Scaleway API from the command line";
+    homepage = https://github.com/scaleway/scaleway-cli;
+    license = licenses.mit;
+    maintainers = with maintainers; [ nickhu ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73aba9ab34d..8145a3dbe80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17461,6 +17461,8 @@ with pkgs;
 
   sauerbraten = callPackage ../games/sauerbraten {};
 
+  scaleway-cli = callPackage ../tools/admin/scaleway-cli { };
+
   scid = callPackage ../games/scid {
     tcl = tcl-8_5;
     tk = tk-8_5;

From 9226f4886f1cd5d48eabbddc000c3d6b3dd8b860 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Wed, 1 Mar 2017 00:00:00 +0000
Subject: [PATCH 2487/3246] nixos: tor: more options, no unexpected
 consequences for default relay operators

Before this commit default relay configuration could produce unexpected
real life consequences. This patch makes those choices explicit and
documents them extensively.
---
 nixos/modules/rename.nix                |   2 +
 nixos/modules/services/security/tor.nix | 220 ++++++++++++++++++------
 2 files changed, 170 insertions(+), 52 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 08146d1f568..a75c827c534 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -195,6 +195,8 @@ with lib;
     (mkRemovedOptionModule [ "services" "openvpn" "enable" ] "")
     (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "")
     (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "")
+    (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.")
+    (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
     (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]
       "See the 16.09 release notes for more information.")
     (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 3f1450ebfbd..5f208fdf842 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -7,7 +7,7 @@ let
   torDirectory = "/var/lib/tor";
 
   opt    = name: value: optionalString (value != null) "${name} ${value}";
-  optint = name: value: optionalString (value != 0)    "${name} ${toString value}";
+  optint = name: value: optionalString (value != null && value != 0)    "${name} ${toString value}";
 
   torRc = ''
     User tor
@@ -28,6 +28,7 @@ let
   # Relay config
   + optionalString cfg.relay.enable ''
     ORPort ${cfg.relay.portSpec}
+    ${opt "Address" cfg.relay.address}
     ${opt "Nickname" cfg.relay.nickname}
     ${opt "ContactInfo" cfg.relay.contactInfo}
 
@@ -36,14 +37,19 @@ let
     ${opt "AccountingMax" cfg.relay.accountingMax}
     ${opt "AccountingStart" cfg.relay.accountingStart}
 
-    ${if cfg.relay.isExit then
+    ${if (cfg.relay.role == "exit") then
         opt "ExitPolicy" cfg.relay.exitPolicy
       else
         "ExitPolicy reject *:*"}
 
-    ${optionalString cfg.relay.isBridge ''
+    ${optionalString (elem cfg.relay.role ["bridge" "private-bridge"]) ''
       BridgeRelay 1
       ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed
+      ExtORPort auto
+      ${optionalString (cfg.relay.role == "private-bridge") ''
+        ExtraInfoStatistics 0
+        PublishServerDescriptor 0
+      ''}
     ''}
   ''
   + hiddenServices
@@ -61,6 +67,7 @@ let
     in "HiddenServicePort ${toString hsport.virtualPort}${trgt}";
 
   torRcFile = pkgs.writeText "torrc" torRc;
+
 in
 {
   options = {
@@ -96,8 +103,8 @@ in
       };
 
       controlPort = mkOption {
-        type = types.int;
-        default = 0;
+        type = types.nullOr types.int;
+        default = null;
         example = 9051;
         description = ''
           If set, Tor will accept connections on the specified port
@@ -133,9 +140,10 @@ in
           example = "192.168.0.1:9101";
           description = ''
             Bind to this address to listen for connections from
-            Socks-speaking applications. Same as socksListenAddress
-            but uses weaker circuit isolation to provide performance
-            suitable for a web browser.
+            Socks-speaking applications. Same as
+            <option>socksListenAddress</option> but uses weaker
+            circuit isolation to provide performance suitable for a
+            web browser.
            '';
          };
 
@@ -145,9 +153,9 @@ in
           example = "accept 192.168.0.0/16, reject *";
           description = ''
             Entry policies to allow/deny SOCKS requests based on IP
-            address.  First entry that matches wins. If no SocksPolicy
+            address. First entry that matches wins. If no SocksPolicy
             is set, we accept all (and only) requests from
-            SocksListenAddress.
+            <option>socksListenAddress</option>.
           '';
         };
 
@@ -176,45 +184,147 @@ in
           description = ''
             Whether to enable relaying TOR traffic for others.
 
-            See https://www.torproject.org/docs/tor-doc-relay for details.
+            See <link xlink:href="https://www.torproject.org/docs/tor-doc-relay" />
+            for details.
+
+            Setting this to true requires setting
+            <option>services.tor.relay.role</option>
+            and
+            <option>services.tor.relay.portSpec</option>
+            options.
           '';
         };
 
-        isBridge = mkOption {
-          type = types.bool;
-          default = false;
+        role = mkOption {
+          type = types.enum [ "exit" "relay" "bridge" "private-bridge" ];
           description = ''
-            Bridge relays (or "bridges") are Tor relays that aren't
-            listed in the main directory. Since there is no complete
-            public list of them, even if an ISP is filtering
-            connections to all the known Tor relays, they probably
-            won't be able to block all the bridges.
+            Your role in Tor network. There're several options:
 
-            A bridge relay can't be an exit relay.
+            <variablelist>
+            <varlistentry>
+              <term><literal>exit</literal></term>
+              <listitem>
+                <para>
+                  An exit relay. This allows Tor users to access regular
+                  Internet services through your public IP.
+                </para>
 
-            You need to set relay.enable to true for this option to
-            take effect.
+                <important><para>
+                  Running an exit relay may expose you to abuse
+                  complaints. See
+                  <link xlink:href="https://www.torproject.org/faq.html.en#ExitPolicies" />
+                  for more info.
+                </para></important>
 
-            The bridge is set up with an obfuscated transport proxy.
+                <para>
+                  You can specify which services Tor users may access via
+                  your exit relay using <option>exitPolicy</option> option.
+                </para>
+              </listitem>
+            </varlistentry>
 
-            See https://www.torproject.org/bridges.html.en for more info.
-          '';
-        };
+            <varlistentry>
+              <term><literal>relay</literal></term>
+              <listitem>
+                <para>
+                  Regular relay. This allows Tor users to relay onion
+                  traffic to other Tor nodes, but not to public
+                  Internet.
+                </para>
 
-        isExit = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            An exit relay allows Tor users to access regular Internet
-            services.
+                <important><para>
+                  Note that some misconfigured and/or disrespectful
+                  towards privacy sites will block you even if your
+                  relay is not an exit relay. That is, just being listed
+                  in a public relay directory can have unwanted
+                  consequences.
 
-            Unlike running a non-exit relay, running an exit relay may
-            expose you to abuse complaints. See
-            https://www.torproject.org/faq.html.en#ExitPolicies for
-            more info.
+                  Which means you might not want to use
+                  this role if you browse public Internet from the same
+                  network as your relay, unless you want to write
+                  e-mails to those sites (you should!).
+                </para></important>
 
-            You can specify which services Tor users may access via
-            your exit relay using exitPolicy option.
+                <para>
+                  See
+                  <link xlink:href="https://www.torproject.org/docs/tor-doc-relay.html.en" />
+                  for more info.
+                </para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>bridge</literal></term>
+              <listitem>
+                <para>
+                  Regular bridge. Works like a regular relay, but
+                  doesn't list you in the public relay directory and
+                  hides your Tor node behind obfsproxy.
+                </para>
+
+                <para>
+                  Using this option will make Tor advertise your bridge
+                  to users through various mechanisms like
+                  <link xlink:href="https://bridges.torproject.org/" />, though.
+                </para>
+
+                <important>
+                  <para>
+                    WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVISE.
+                    Consult with your lawer when in doubt.
+                  </para>
+
+                  <para>
+                    This role should be safe to use in most situations
+                    (unless the act of forwarding traffic for others is
+                    a punishable offence under your local laws, which
+                    would be pretty insane as it would make ISP
+                    illegal).
+                  </para>
+                </important>
+
+                <para>
+                  See <link xlink:href="https://www.torproject.org/docs/bridges.html.en" />
+                  for more info.
+                </para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>private-bridge</literal></term>
+              <listitem>
+                <para>
+                  Private bridge. Works like regular bridge, but does
+                  not advertise your node in any way.
+                </para>
+
+                <para>
+                  Using this role means that you won't contribute to Tor
+                  network in any way unless you advertise your node
+                  yourself in some way.
+                </para>
+
+                <para>
+                  Use this if you want to run a private bridge, for
+                  example because you'll give out your bridge address
+                  manually to your friends.
+                </para>
+
+                <para>
+                  Switching to this role after measurable time in
+                  "bridge" role is pretty useless as some Tor users would have
+                  learned about your node already.
+                  In the latter case you can still change
+                  <option>portSpec</option> option.
+                </para>
+
+                <para>
+                  See <link xlink:href="https://www.torproject.org/docs/bridges.html.en" />
+                  for more info.
+                </para>
+              </listitem>
+            </varlistentry>
+            </variablelist>
           '';
         };
 
@@ -268,8 +378,8 @@ in
         };
 
         bandwidthRate = mkOption {
-          type = types.int;
-          default = 0;
+          type = types.nullOr types.int;
+          default = null;
           example = 100;
           description = ''
             Specify this to limit the bandwidth usage of relayed (server)
@@ -278,7 +388,7 @@ in
         };
 
         bandwidthBurst = mkOption {
-          type = types.int;
+          type = types.nullOr types.int;
           default = cfg.relay.bandwidthRate;
           example = 200;
           description = ''
@@ -288,6 +398,16 @@ in
           '';
         };
 
+        address = mkOption {
+          type    = types.nullOr types.str;
+          default = null;
+          example = "noname.example.com";
+          description = ''
+            The IP address or full DNS name for advertised address of your relay.
+            Leave unset and Tor will guess.
+          '';
+        };
+
         portSpec = mkOption {
           type    = types.str;
           example = "143";
@@ -313,13 +433,15 @@ in
             considered first to last, and the first match wins. If you
             want to _replace_ the default exit policy, end this with
             either a reject *:* or an accept *:*. Otherwise, you're
-            _augmenting_ (prepending to) the default exit
-            policy. Leave commented to just use the default, which is
+            _augmenting_ (prepending to) the default exit policy.
+            Leave commented to just use the default, which is
             available in the man page or at
-            https://www.torproject.org/documentation.html
+            <link xlink:href="https://www.torproject.org/documentation.html" />.
 
-            Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
-            for issues you might encounter if you use the default exit policy.
+            Look at
+            <link xlink:href="https://www.torproject.org/faq-abuse.html#TypicalAbuses" />
+            for issues you might encounter if you use the default
+            exit policy.
 
             If certain IPs and ports are blocked externally, e.g. by
             your firewall, you should update your exit policy to
@@ -398,12 +520,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    assertions = singleton
-      { message = "Can't be both an exit and a bridge relay at the same time";
-        assertion =
-          cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit);
-      };
-
     users.extraGroups.tor.gid = config.ids.gids.tor;
     users.extraUsers.tor =
       { description = "Tor Daemon User";

From 30a3cccd07914155703e9376d9470ef5f24f9a5c Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Wed, 1 Mar 2017 00:00:00 +0000
Subject: [PATCH 2488/3246] nixos: tor: better submodule for hidden services

Rebased onto master with a different implementation.
Originally: "add support for serving hidden services".
---
 nixos/modules/services/security/tor.nix | 190 +++++++++++++++---------
 1 file changed, 119 insertions(+), 71 deletions(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 5f208fdf842..c2851b1dd60 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -52,20 +52,15 @@ let
       ''}
     ''}
   ''
-  + hiddenServices
+  # Hidden services
+  + concatStrings (flip mapAttrsToList cfg.hiddenServices (n: v: ''
+    HiddenServiceDir ${torDirectory}/onion/${v.name}
+    ${flip concatMapStrings v.map (p: ''
+      HiddenServicePort ${p.port} ${p.destination}
+    '')}
+  ''))
   + cfg.extraConfig;
 
-  hiddenServices = concatStrings (mapAttrsToList (hiddenServiceDir: hs:
-    let
-      hsports = concatStringsSep "\n" (map mkHiddenServicePort hs.hiddenServicePorts);
-    in
-      "HiddenServiceDir ${hiddenServiceDir}\n${hsports}\n${hs.extraConfig}\n"
-    ) cfg.hiddenServices);
-
-    mkHiddenServicePort = hsport: let
-      trgt = optionalString (hsport.target != null) (" " + hsport.target);
-    in "HiddenServicePort ${toString hsport.virtualPort}${trgt}";
-
   torRcFile = pkgs.writeText "torrc" torRc;
 
 in
@@ -452,74 +447,123 @@ in
       };
 
       hiddenServices = mkOption {
-        type = types.attrsOf (types.submodule ({
+        description = ''
+          A set of static hidden services that terminate their Tor
+          circuits at this node.
+
+          Every element in this set declares a virtual onion host.
+
+          You can specify your onion address by putting corresponding
+          private key to an appropriate place in ${torDirectory}.
+
+          For services without private keys in ${torDirectory} Tor
+          daemon will generate random key pairs (which implies random
+          onion addresses) on restart. The latter could take a while,
+          please be patient.
+
+          <note><para>
+            Hidden services can be useful even if you don't intend to
+            actually <emphasis>hide</emphasis> them, since they can
+            also be seen as a kind of NAT traversal mechanism.
+
+            E.g. the example will make your sshd, whatever runs on
+            "8080" and your mail server available from anywhere where
+            the Tor network is available (which, with the help from
+            bridges, is pretty much everywhere), even if both client
+            and server machines are behind NAT you have no control
+            over.
+          </para></note>
+        '';
+        default = {};
+        example = literalExample ''
+          { "my-hidden-service-example".map = [
+              { port = "22"; }                   # map ssh port to this machine's ssh
+              { port = "80";  toPort = "8080"; } # map http port to whatever runs on 8080
+              { port = "sip"; toHost = "mail.example.com"; toPort = "imap"; } # because we can
+            ];
+          }
+        '';
+        type = types.loaOf (types.submodule ({name, config, ...}: {
           options = {
-            hiddenServicePorts = mkOption {
-              type = types.listOf (types.submodule {
-                options = {
-                  virtualPort = mkOption {
-                    type = types.int;
-                    example = 80;
-                    description = "Virtual port.";
-                  };
-                  target = mkOption {
-                    type = types.nullOr types.str;
-                    default = null;
-                    example = "127.0.0.1:8080";
-                    description = ''
-                      Target virtual Port shall be mapped to.
 
-                      You may override the target port, address, or both by
-                      specifying a target of addr, port, addr:port, or
-                      unix:path. (You can specify an IPv6 target as
-                      [addr]:port. Unix paths may be quoted, and may use
-                      standard C escapes.)
-                    '';
-                  };
-                };
-              });
-              example = [ { virtualPort = 80; target = "127.0.0.1:8080"; } { virtualPort = 6667; } ];
-              description = ''
-                If target is <literal>null</literal> the virtual port is mapped
-                to the same port on 127.0.0.1 over TCP. You may use
-                <literal>target</literal> to overwrite this behaviour (see
-                description of target).
+             name = mkOption {
+               type = types.str;
+               description = ''
+                 Name of this tor hidden service.
 
-                This corresponds to the <literal>HiddenServicePort VIRTPORT
-                [TARGET]</literal> option by looking at the tor manual
-                <citerefentry><refentrytitle>tor</refentrytitle>
-                <manvolnum>1</manvolnum></citerefentry> for more information.
-              '';
-            };
-            extraConfig = mkOption {
-              type = types.str;
-              default = "";
-              description = ''
-                Extra configuration. Contents will be added in the current
-                hidden service context.
-              '';
-            };
+                 This is purely descriptive.
+
+                 After restarting Tor daemon you should be able to
+                 find your .onion address in
+                 <literal>${torDirectory}/onion/$name/hostname</literal>.
+               '';
+             };
+
+             map = mkOption {
+               default = [];
+               description = "Port mapping for this hidden service.";
+               type = types.listOf (types.submodule ({config, ...}: {
+                 options = {
+
+                   port = mkOption {
+                     type = types.str;
+                     example = "80";
+                     description = ''
+                       Hidden service port to "bind to".
+                     '';
+                   };
+
+                   destination = mkOption {
+                     internal = true;
+                     type = types.str;
+                     description = "Forward these connections where?";
+                   };
+
+                   toHost = mkOption {
+                     type = types.str;
+                     default = "127.0.0.1";
+                     description = "Mapping destination host.";
+                   };
+
+                   toPort = mkOption {
+                     type = types.str;
+                     example = "8080";
+                     description = "Mapping destination port.";
+                   };
+
+                 };
+
+                 config = {
+                   toPort = mkDefault config.port;
+                   destination = mkDefault "${config.toHost}:${config.toPort}";
+                 };
+               }));
+             };
+
+          };
+
+          config = {
+            name = mkDefault name;
           };
         }));
-        default = {};
-        example = {
-          "/var/lib/tor/webserver" = {
-            hiddenServicePorts = [ { virtualPort = 80; } ];
-          };
-        };
-        description = ''
-          Configure hidden services.
-
-          Please consult the tor manual
-          <citerefentry><refentrytitle>tor</refentrytitle>
-          <manvolnum>1</manvolnum></citerefentry> for a more detailed
-          explanation. (search for 'HIDDEN').
-        '';
       };
     };
   };
 
   config = mkIf cfg.enable {
+    # Not sure if `cfg.relay.role == "private-bridge"` helps as tor
+    # sends a lot of stats
+    warnings = optional (cfg.relay.enable && cfg.hiddenServices != {})
+      ''
+        Running Tor hidden services on a public relay makes the
+        presence of hidden services visible through simple statistical
+        analysis of publicly available data.
+
+        You can safely ignore this warning if you don't intend to
+        actually hide your hidden services. In either case, you can
+        always create a container/VM with a separate Tor daemon instance.
+      '';
+
     users.extraGroups.tor.gid = config.ids.gids.tor;
     users.extraUsers.tor =
       { description = "Tor Daemon User";
@@ -538,9 +582,13 @@ in
         restartTriggers = [ torRcFile ];
 
         # Translated from the upstream contrib/dist/tor.service.in
+        preStart = ''
+          install -o tor -g tor -d ${torDirectory}/onion
+          ${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config
+        '';
+
         serviceConfig =
           { Type         = "simple";
-            ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config";
             ExecStart    = "${pkgs.tor}/bin/tor -f ${torRcFile} --RunAsDaemon 0";
             ExecReload   = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
             KillSignal   = "SIGINT";

From 2c4a925ab07e4ebfd932730b358771e3547be605 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Wed, 1 Mar 2017 00:00:00 +0000
Subject: [PATCH 2489/3246] nixos: tor: rename portSpec -> port, type all
 "port"s properly

---
 nixos/modules/rename.nix                |  1 +
 nixos/modules/services/security/tor.nix | 38 ++++++++++++-------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a75c827c534..2079ed544ae 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -25,6 +25,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
     (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
 
     (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index c2851b1dd60..04b065f6ae4 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -17,7 +17,7 @@ let
       GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6
     ''}
 
-    ${optint "ControlPort" cfg.controlPort}
+    ${optint "ControlPort" (toString cfg.controlPort)}
   ''
   # Client connection config
   + optionalString cfg.client.enable  ''
@@ -27,7 +27,7 @@ let
   ''
   # Relay config
   + optionalString cfg.relay.enable ''
-    ORPort ${cfg.relay.portSpec}
+    ORPort ${toString cfg.relay.port}
     ${opt "Address" cfg.relay.address}
     ${opt "Nickname" cfg.relay.nickname}
     ${opt "ContactInfo" cfg.relay.contactInfo}
@@ -56,7 +56,7 @@ let
   + concatStrings (flip mapAttrsToList cfg.hiddenServices (n: v: ''
     HiddenServiceDir ${torDirectory}/onion/${v.name}
     ${flip concatMapStrings v.map (p: ''
-      HiddenServicePort ${p.port} ${p.destination}
+      HiddenServicePort ${toString p.port} ${p.destination}
     '')}
   ''))
   + cfg.extraConfig;
@@ -98,7 +98,7 @@ in
       };
 
       controlPort = mkOption {
-        type = types.nullOr types.int;
+        type = types.nullOr (types.either types.int types.str);
         default = null;
         example = 9051;
         description = ''
@@ -185,7 +185,7 @@ in
             Setting this to true requires setting
             <option>services.tor.relay.role</option>
             and
-            <option>services.tor.relay.portSpec</option>
+            <option>services.tor.relay.port</option>
             options.
           '';
         };
@@ -307,10 +307,10 @@ in
 
                 <para>
                   Switching to this role after measurable time in
-                  "bridge" role is pretty useless as some Tor users would have
-                  learned about your node already.
-                  In the latter case you can still change
-                  <option>portSpec</option> option.
+                  "bridge" role is pretty useless as some Tor users
+                  would have learned about your node already. In the
+                  latter case you can still change
+                  <option>port</option> option.
                 </para>
 
                 <para>
@@ -403,9 +403,9 @@ in
           '';
         };
 
-        portSpec = mkOption {
-          type    = types.str;
-          example = "143";
+        port = mkOption {
+          type    = types.either types.int types.str;
+          example = 143;
           description = ''
             What port to advertise for Tor connections. This corresponds to the
             <literal>ORPort</literal> section in the Tor manual; see
@@ -477,8 +477,8 @@ in
         default = {};
         example = literalExample ''
           { "my-hidden-service-example".map = [
-              { port = "22"; }                   # map ssh port to this machine's ssh
-              { port = "80";  toPort = "8080"; } # map http port to whatever runs on 8080
+              { port = 22; }                # map ssh port to this machine's ssh
+              { port = 80; toPort = 8080; } # map http port to whatever runs on 8080
               { port = "sip"; toHost = "mail.example.com"; toPort = "imap"; } # because we can
             ];
           }
@@ -506,8 +506,8 @@ in
                  options = {
 
                    port = mkOption {
-                     type = types.str;
-                     example = "80";
+                     type = types.either types.int types.str;
+                     example = 80;
                      description = ''
                        Hidden service port to "bind to".
                      '';
@@ -526,8 +526,8 @@ in
                    };
 
                    toPort = mkOption {
-                     type = types.str;
-                     example = "8080";
+                     type = types.either types.int types.str;
+                     example = 8080;
                      description = "Mapping destination port.";
                    };
 
@@ -535,7 +535,7 @@ in
 
                  config = {
                    toPort = mkDefault config.port;
-                   destination = mkDefault "${config.toHost}:${config.toPort}";
+                   destination = mkDefault "${config.toHost}:${toString config.toPort}";
                  };
                }));
              };

From 2e65e2df94b39d17ff7f52ea76b7eca285b66d05 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 22 Aug 2017 11:46:16 -0400
Subject: [PATCH 2490/3246] nixos: Fix pam_kwallet5 integration

Fixes #28469
---
 nixos/modules/security/pam.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 5632500df2e..ede4ace5ed0 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -281,7 +281,7 @@ let
                 "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
               ${optionalString cfg.enableKwallet
                 ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
-                 " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
+                 " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
             '') + ''
           ${optionalString cfg.unixAuth
               "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -350,7 +350,7 @@ let
               "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
           ${optionalString (cfg.enableKwallet)
               ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
-               " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
+               " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
         '');
     };
 

From 6461b609dbfbba1ced11a5ec482c0cd03c915a2d Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Tue, 22 Aug 2017 20:02:40 +0300
Subject: [PATCH 2491/3246] Fix maintainer email

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d44c3ac0d8b..d904c5368bf 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -247,7 +247,7 @@
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
   ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>";
-  infinisil = "Silvan Mosberger <infinisil@icloud.com";
+  infinisil = "Silvan Mosberger <infinisil@icloud.com>";
   ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>";
   j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
   jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";

From e6b77e2198a269ab114c1151deefbce19bfcab61 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 22 Aug 2017 13:16:57 -0400
Subject: [PATCH 2492/3246] ammonite: 1.0.1 -> 1.0.2

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

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

From 0c16f356bd030031f1d719a22e75c525b530f85c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 22 Aug 2017 14:56:47 -0300
Subject: [PATCH 2493/3246] efl: propagate utillinux, fribidi and SDL2, which
 are runtime dependencies

---
 pkgs/desktops/enlightenment/efl.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 00980d4a94d..eaff731f41e 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -22,17 +22,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ openssl zlib lz4 freetype fontconfig fribidi SDL2 SDL mesa
+  buildInputs = [ openssl zlib lz4 freetype fontconfig SDL mesa
     giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
-    xorg.libX11 udev utillinux systemd ];
+    xorg.libX11 udev systemd ];
 
   propagatedBuildInputs = [ libxkbcommon python27Packages.dbus-python dbus libjpeg xorg.libXcomposite
     xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
     bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
     xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
     harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
-    libinput ];
+    libinput utillinux fribidi SDL2 ];
 
   # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
   configureFlags = [

From 978c9f02dc0cb767eecdbca613a05eb7ab3aa642 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 22 Aug 2017 15:01:25 -0300
Subject: [PATCH 2494/3246] ephoto: 1.0 -> 1.5

- Update to version 1.5, which builds of the latest efl versions
---
 pkgs/desktops/enlightenment/default.nix | 2 +-
 pkgs/desktops/enlightenment/ephoto.nix  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index c132f565632..adce75f64c2 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -11,5 +11,5 @@ rec {
   econnman = callPackage ./econnman.nix { };
   terminology = callPackage ./terminology.nix { };
   rage = callPackage ./rage.nix { };
-  ephoto = callPackage ./ephoto.nix { efl = efl_1_19; };
+  ephoto = callPackage ./ephoto.nix { };
 }
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index ee6013dae29..9bfb2144b6f 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ephoto-${version}";
-  version = "1.0";
+  version = "1.5";
   
   src = fetchurl {
     url = "http://www.smhouston.us/stuff/${name}.tar.gz";
-    sha256 = "0l6zrk22fap6pylmzxwp6nycy8l5wdc7jza890h4zrwmpfag8w31";
+    sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From 5340a0aee0f48861a7abf88fc5982beaf66fac92 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 22 Aug 2017 15:08:59 -0300
Subject: [PATCH 2495/3246] efl: remove old version 1.19.1

- Version 1.19.1 is not needed anymore to build ephoto.
---
 pkgs/desktops/enlightenment/default.nix | 1 -
 pkgs/desktops/enlightenment/efl.nix     | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index adce75f64c2..a8b5e08abd6 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -2,7 +2,6 @@
 rec {
   #### CORE EFL
   efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
-  efl_1_19 = callPackage ./efl.nix { eflVersion = "1.19.1"; openjpeg = pkgs.openjpeg_1; };
 
   #### WINDOW MANAGER
   enlightenment = callPackage ./enlightenment.nix { };
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index eaff731f41e..e93195de1f8 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -4,20 +4,15 @@
 , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
 , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
 , curl, libinput, systemd, writeText
-# Support more than one version because for now ephoto does not work with efl-1.20.x
-, eflVersion ? "1.20.2"
 }:
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = eflVersion;
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = {
-      "1.19.1" = "0fndwraca9rg0bz3al4isdprvyw56szr88qiyvglb4j8ygsylscc";
-      "1.20.2" = "0zll6k4xbbdsxqg53g8jddgv889g5m1xh20i03iz5a52y2bcnh55";
-    }.${version};
+    sha256 = "0zll6k4xbbdsxqg53g8jddgv889g5m1xh20i03iz5a52y2bcnh55";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d1cbd546e00cf77a4248b4d5da54368cfd189f0c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 22 Aug 2017 15:13:17 -0300
Subject: [PATCH 2496/3246] terminology: 1.0.0 -> 1.1.0

---
 pkgs/desktops/enlightenment/terminology.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 5f2db064af2..390f0593782 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "1x4j2q4qqj10ckbka0zaq2r2zm66ff1x791kp8slv1ff7fw45vdz";
+    sha256 = "13rl1k22yf8qrpzdm5nh6ij641fibadr2ww1r7rnz7mbhzj3d4gb";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From ce7e2c06b10cdc95e976f635b5918063b25502d7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 22 Aug 2017 20:22:31 +0200
Subject: [PATCH 2497/3246] prometheus-unifi-exporter: make ordering more
 robust

---
 nixos/modules/services/monitoring/prometheus/unifi-exporter.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
index e3059e48509..0a56d6ae95a 100644
--- a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
@@ -83,6 +83,7 @@ in {
       description = "Prometheus exporter for UniFi Controller metrics";
       unitConfig.Documentation = "https://github.com/mdlayher/unifi_exporter";
       wantedBy = [ "multi-user.target" ];
+      after = optional config.services.unifi.enable "unifi.service";
       serviceConfig = {
         User = "nobody";
         Restart = "always";

From 2eacddf0dc27c6eca637c628b3842aec2bf59c0e Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 22 Aug 2017 13:50:04 -0500
Subject: [PATCH 2498/3246] treewide: homepage URL fixes (#28475)

* pgadmin: use https homepage

* msn-pecan: move homepage to github

google code is now unavailable

* pidgin-latex: use https for homepage

* pidgin-opensteamworks: use github for homepage

google code is unavailable

* putty: use https for homepage

* ponylang: use https for homepage

* picolisp: use https for homepage

* phonon: use https for homepage

* pugixml: use https for homepage

* pioneer: use https for homepage

* packer: use https for homepage

* pokerth: usee https for homepage

* procps-ng: use https for homepage

* pycaml: use https for homepage

* proot: move homepage to .github.io

* pius: use https for homepage

* pdfread: use https for homepage

* postgresql: use https for homepage

* ponysay: move homepage to new site

* prometheus: use https for homepage

* powerdns: use https for homepage

* pm-utils: use https for homepage

* patchelf: move homepage to https

* tesseract: move homepage to github

* quodlibet: move homepage from google code

* jbrout: move homepage from google code

* eiskaltdcpp: move homepage to github

* nodejs: use https to homepage

* nix: use https for homepage

* pdf2djvu: move homepage from google code

* game-music-emu: move homepage from google code

* vacuum: move homepae from google code
---
 pkgs/applications/audio/game-music-emu/default.nix            | 2 +-
 pkgs/applications/audio/quodlibet/default.nix                 | 2 +-
 pkgs/applications/graphics/jbrout/default.nix                 | 2 +-
 pkgs/applications/graphics/tesseract/4.x.nix                  | 2 +-
 pkgs/applications/graphics/tesseract/default.nix              | 2 +-
 pkgs/applications/misc/pgadmin/default.nix                    | 4 ++--
 .../instant-messengers/pidgin-plugins/msn-pecan/default.nix   | 2 +-
 .../pidgin-plugins/pidgin-latex/default.nix                   | 2 +-
 .../pidgin-plugins/pidgin-opensteamworks/default.nix          | 2 +-
 .../networking/instant-messengers/vacuum/default.nix          | 2 +-
 pkgs/applications/networking/p2p/eiskaltdcpp/default.nix      | 2 +-
 pkgs/applications/networking/remote/putty/default.nix         | 2 +-
 pkgs/development/compilers/ponyc/pony-stable.nix              | 2 +-
 pkgs/development/interpreters/picolisp/default.nix            | 2 +-
 pkgs/development/libraries/phonon/backends/gstreamer.nix      | 2 +-
 pkgs/development/libraries/phonon/backends/vlc.nix            | 2 +-
 pkgs/development/libraries/phonon/default.nix                 | 2 +-
 pkgs/development/libraries/pugixml/default.nix                | 2 +-
 pkgs/development/ocaml-modules/pycaml/default.nix             | 2 +-
 pkgs/development/tools/misc/patchelf/default.nix              | 2 +-
 pkgs/development/tools/misc/patchelf/unstable.nix             | 2 +-
 pkgs/development/tools/node-webkit/nw12.nix                   | 2 +-
 pkgs/development/tools/packer/default.nix                     | 2 +-
 pkgs/development/web/csslint/default.nix                      | 2 +-
 pkgs/development/web/nodejs/nodejs.nix                        | 2 +-
 pkgs/games/pioneer/default.nix                                | 2 +-
 pkgs/games/pokerth/default.nix                                | 2 +-
 pkgs/os-specific/linux/pm-utils/default.nix                   | 2 +-
 pkgs/os-specific/linux/procps-ng/default.nix                  | 2 +-
 pkgs/servers/dns/powerdns/default.nix                         | 2 +-
 pkgs/servers/monitoring/prometheus/default.nix                | 2 +-
 pkgs/servers/sql/postgresql/default.nix                       | 2 +-
 pkgs/servers/sql/postgresql/jdbc/default.nix                  | 2 +-
 pkgs/tools/graphics/pdfread/default.nix                       | 2 +-
 pkgs/tools/misc/ponysay/default.nix                           | 2 +-
 pkgs/tools/package-management/nix/default.nix                 | 2 +-
 pkgs/tools/security/pius/default.nix                          | 2 +-
 pkgs/tools/system/proot/default.nix                           | 3 +--
 pkgs/tools/typesetting/pdf2djvu/default.nix                   | 2 +-
 39 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix
index 4f22ca62c1a..a0a79785283 100644
--- a/pkgs/applications/audio/game-music-emu/default.nix
+++ b/pkgs/applications/audio/game-music-emu/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
-    homepage = https://code.google.com/p/game-music-emu/;
+    homepage = https://bitbucket.org/mpyne/game-music-emu/wiki/Home;
     description = "A collection of video game music file emulators";
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index fa582d85215..2e6d61b693d 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -75,6 +75,6 @@ in buildPythonApplication {
     '';
 
     maintainers = [ stdenv.lib.maintainers.coroa ];
-    homepage = http://code.google.com/p/quodlibet/;
+    homepage = https://quodlibet.readthedocs.io/en/latest/;
   };
 }
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index 705d983c83a..f120f8b13d4 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -34,7 +34,7 @@ in pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ];
 
   meta = {
-    homepage = http://code.google.com/p/jbrout;
+    homepage = http://manatlan.com/jbrout/;
     description = "Photo manager";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/4.x.nix
index 577bff91e35..156c911b9b8 100644
--- a/pkgs/applications/graphics/tesseract/4.x.nix
+++ b/pkgs/applications/graphics/tesseract/4.x.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "OCR engine";
-    homepage = http://code.google.com/p/tesseract-ocr/;
+    homepage = https://github.com/tesseract-ocr/tesseract;
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index a5643da8c3a..eb9a6383861 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "OCR engine";
-    homepage = http://code.google.com/p/tesseract-ocr/;
+    homepage = https://github.com/tesseract-ocr/tesseract;
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 968071e454e..15313befb62 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
     "--with-libxslt=${libxslt.dev}"
   ];
 
-  meta = with stdenv.lib; { 
+  meta = with stdenv.lib; {
     description = "PostgreSQL administration GUI tool";
-    homepage = http://www.pgadmin.org;
+    homepage = https://www.pgadmin.org;
     license = licenses.gpl2;
     maintainers = with maintainers; [ domenkozar wmertens ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
index 4a86ea9e068..3b8cdd7a8cc 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Alternative MSN protocol plug-in for Pidgin IM";
-    homepage = http://code.google.com/p/msn-pecan/;
+    homepage = https://github.com/felipec/msn-pecan;
     platforms = stdenv.lib.platforms.linux;
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index 4a53513061a..59b1d463c9d 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/pidgin-latex/;
+    homepage = https://sourceforge.net/projects/pidgin-latex/;
     description = "LaTeX rendering plugin for Pidgin IM";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index 2324ad464ed..fbfd36a5928 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ];
 
   meta = with stdenv.lib; {
-    homepage = https://code.google.com/p/pidgin-opensteamworks;
+    homepage = https://github.com/EionRobb/pidgin-opensteamworks;
     description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 3e5a3fb87b6..1f1a19394b3 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     license = licenses.gpl3;
-    homepage = http://code.google.com/p/vacuum-im/;
+    homepage = http://www.vacuum-im.org;
   };
 }
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 8c7958ecaaa..e8df906217a 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A cross-platform program that uses the Direct Connect and ADC protocols";
-    homepage = https://code.google.com/p/eiskaltdc/;
+    homepage = https://github.com/eiskaltdcpp/eiskaltdcpp;
     license = licenses.gpl3Plus;
     platforms = platforms.all;
   };
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index 503632c009b..5e675c148bc 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       platforms, along with an xterm terminal emulator.
       It is written and maintained primarily by Simon Tatham.
     '';
-    homepage = http://www.chiark.greenend.org.uk/~sgtatham/putty/;
+    homepage = https://www.chiark.greenend.org.uk/~sgtatham/putty/;
     license = licenses.mit;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 4353c425489..21488361f4a 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A simple dependency manager for the Pony language.";
-    homepage = http://www.ponylang.org;
+    homepage = https://www.ponylang.org;
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 2a5d9d2f574..4618d0da9dd 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A simple Lisp with an integrated database";
-    homepage = http://picolisp.com/;
+    homepage = https://picolisp.com/;
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = with maintainers; [ raskin tohl ];
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index e0f24fbc822..b29388790d0 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}";
 
   meta = with stdenv.lib; {
-    homepage = http://phonon.kde.org/;
+    homepage = https://phonon.kde.org/;
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
     maintainers = with maintainers; [ ttuegel ];
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index f296e34e783..53281ddc657 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}";
 
   meta = with stdenv.lib; {
-    homepage = http://phonon.kde.org/;
+    homepage = https://phonon.kde.org/;
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 696cd6a36e5..171acea90b3 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}";
 
   meta = {
-    homepage = http://phonon.kde.org/;
+    homepage = https://phonon.kde.org/;
     description = "Multimedia API for Qt";
     license = stdenv.lib.licenses.lgpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index d9d0afa2bde..dd33f63c913 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Light-weight, simple and fast XML parser for C++ with XPath support";
-    homepage = http://pugixml.org/;
+    homepage = https://pugixml.org;
     license = licenses.mit;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.unix;
diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix
index 5a313ce4e1b..7421e2fa0b1 100644
--- a/pkgs/development/ocaml-modules/pycaml/default.nix
+++ b/pkgs/development/ocaml-modules/pycaml/default.nix
@@ -43,7 +43,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://github.com/chemoelectric/pycaml;
+    homepage = https://github.com/chemoelectric/pycaml;
     description = "Bindings for python and ocaml";
     license = "LGPL";
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 807b2a9a49d..787b434df3c 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   #doCheck = true; # problems when loading libc.so.6
 
   meta = {
-    homepage = http://nixos.org/patchelf.html;
+    homepage = https://nixos.org/patchelf.html;
     license = "GPL";
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
     maintainers = [ stdenv.lib.maintainers.eelco ];
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 5f434c13abc..2443c280443 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = http://nixos.org/patchelf.html;
+    homepage = https://nixos.org/patchelf.html;
     license = "GPL";
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
     maintainers = [ stdenv.lib.maintainers.eelco ];
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 30c40331a0f..8e2953839b7 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An app runtime based on Chromium and node.js";
-    homepage = http://nwjs.io/;
+    homepage = https://nwjs.io/;
     platforms = ["i686-linux" "x86_64-linux"];
     maintainers = [ maintainers.offline ];
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index e1b52102907..11909ec1a19 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
-    homepage    = http://www.packer.io;
+    homepage    = https://www.packer.io;
     license     = licenses.mpl20;
     maintainers = with maintainers; [ cstrahan zimbatm ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix
index d5a6889c06a..4e8cb2b8829 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/pkgs/development/web/csslint/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       rules to the code that look for problematic patterns or signs of
       inefficiency. The rules are all pluggable, so you can easily
       write your own or omit ones you don't want. '';
-    homepage = http://nodejs.org;
+    homepage = https://nodejs.org;
     license = licenses.bsd2;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 0b6ec87f00a..d7917c52c99 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -67,7 +67,7 @@ in
 
     meta = {
       description = "Event-driven I/O framework for the V8 JavaScript engine";
-      homepage = http://nodejs.org;
+      homepage = https://nodejs.org;
       license = licenses.mit;
       maintainers = with maintainers; [ goibhniu havvy gilligan cko ];
       platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix
index 6aff7696995..51f2b6a8c4e 100644
--- a/pkgs/games/pioneer/default.nix
+++ b/pkgs/games/pioneer/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century";
-    homepage = http://pioneerspacesim.net;
+    homepage = https://pioneerspacesim.net;
     license = with licenses; [
         gpl3 cc-by-sa-30
     ];
diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index e34f05402f7..24a0281a874 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://www.pokerth.net/;
+    homepage    = https://www.pokerth.net;
     description = "Open Source Poker client and server";
     license     = licenses.gpl3;
     maintainers = with maintainers; [ obadz ];
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index e2257642d0b..1053e07559e 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = http://pm-utils.freedesktop.org/wiki/;
+    homepage = https://pm-utils.freedesktop.org/wiki/;
     description = "A small collection of scripts that handle suspend and resume on behalf of HAL";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 2fcf6dbf3c0..4023ea5c69f 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-modern-top" ];
 
   meta = {
-    homepage = http://sourceforge.net/projects/procps-ng/;
+    homepage = https://sourceforge.net/projects/procps-ng/;
     description = "Utilities that give information about processes using the /proc filesystem";
     priority = 10; # less than coreutils, which also provides "kill" and "uptime"
     license = lib.licenses.gpl2;
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 8b838a58b27..bcbb6bb120e 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Authoritative DNS server";
-    homepage = http://www.powerdns.com/;
+    homepage = https://www.powerdns.com;
     platforms = platforms.linux;
     # cannot find postgresql libs on macos x
     license = licenses.gpl2;
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 63ea093b4bb..8d5450127d6 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -34,7 +34,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Service monitoring system and time series database";
-    homepage = http://prometheus.io;
+    homepage = https://prometheus.io;
     license = licenses.asl20;
     maintainers = with maintainers; [ benley fpletz ];
     platforms = platforms.unix;
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index b9c940a01cd..85edbbf442a 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -80,7 +80,7 @@ let
     };
 
     meta = with lib; {
-      homepage = http://www.postgresql.org/;
+      homepage = https://www.postgresql.org;
       description = "A powerful, open source object-relational database system";
       license = licenses.postgresql;
       maintainers = [ maintainers.ocharles ];
diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix
index 35ec5b0c110..39b574ae96d 100644
--- a/pkgs/servers/sql/postgresql/jdbc/default.nix
+++ b/pkgs/servers/sql/postgresql/jdbc/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage = http://jdbc.postgresql.org/;
+    homepage = https://jdbc.postgresql.org/;
     description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix
index 3c43935e950..8733b2c1caa 100644
--- a/pkgs/tools/graphics/pdfread/default.nix
+++ b/pkgs/tools/graphics/pdfread/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "PDF/DJVU to ebook format converter";
-    homepage = http://www.mobileread.com/forums/showthread.php?t=21906;
+    homepage = https://www.mobileread.com/forums/showthread.php?t=21906;
     license = licenses.mit;
   };
 }
diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
index a09dfb4d4e4..0f5c1524143 100644
--- a/pkgs/tools/misc/ponysay/default.nix
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Cowsay reimplemention for ponies";
-    homepage = http://terse.tk/ponysay/;
+    homepage = http://erkin.co/ponysay/;
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ bodil ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 56324f4073d..6b252e9fe00 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -116,7 +116,7 @@ let
         a package, multi-user package management and easy setup of build
         environments.
       '';
-      homepage = http://nixos.org/;
+      homepage = https://nixos.org/;
       license = stdenv.lib.licenses.lgpl2Plus;
       maintainers = [ stdenv.lib.maintainers.eelco ];
       platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index af27fb6cd01..5e0c87c2f7d 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://www.phildev.net/pius/;
+    homepage = https://www.phildev.net/pius/;
 
     description = "PGP Individual UID Signer (PIUS), quickly and easily sign UIDs on a set of PGP keys";
 
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index 87c463bdac9..5d65267311f 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -34,11 +34,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://proot.me;
+    homepage = http://proot-me.github.io;
     description = "User-space implementation of chroot, mount --bind and binfmt_misc";
     platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = with maintainers; [ ianwookim nckx ];
   };
 }
-
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index 2318a146f62..708bf46bbb0 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Creates djvu files from PDF files";
-    homepage = http://code.google.com/p/pdf2djvu/;
+    homepage = https://jwilk.net/software/pdf2djvu;
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
     inherit version;

From 7ffee4de3c2cb2af9d4e48c44de6247174cabac2 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 22 Aug 2017 15:54:56 -0300
Subject: [PATCH 2499/3246] efl: use vanilla pkg-config

Use vanilla pkg-config to build EFL applications.

The EFL library has a set of pkg-config files (*.pc) which uses
private requirements. The default pkg-config setup on nixpkgs is
patched to disable resolving those requirements. See
http://bugs.freedesktop.org/show_bug.cgi?id=4738 for reference.

As a consequence each package depending on efl has to explicitly set
the search path in order to be able to find the corresponding header
files.

By using vanilla pkg-config this is not necessary (and this is the
expected behaviour for pkg-config), allowing simpler nix expressions.
---
 pkgs/desktops/enlightenment/enlightenment.nix | 14 +++----------
 pkgs/desktops/enlightenment/ephoto.nix        | 18 +++--------------
 pkgs/desktops/enlightenment/rage.nix          | 20 +++----------------
 pkgs/desktops/enlightenment/terminology.nix   | 15 +++-----------
 4 files changed, 12 insertions(+), 55 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 7976176af1b..b16b84acf14 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, efl, xcbutilkeysyms, libXrandr, libXdmcp,
 libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap,
-mesa_glu, xkeyboard_config }:
+mesa_glu, xkeyboard_config, pcre }:
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
@@ -11,22 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "0w5f3707hyfc20i6xqh4jlr5p2yhy1z794061mjsz2rp4w00qmpb";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) ];
 
   buildInputs = [
     efl libXdmcp libxcb xcbutilkeysyms libXrandr libffi pam alsaLib
-    luajit bzip2 libpthreadstubs gdbm
+    luajit bzip2 libpthreadstubs gdbm pcre
   ] ++
     stdenv.lib.optionals stdenv.isLinux [ libcap ];
 
-  NIX_CFLAGS_COMPILE = [
-    "-I${efl}/include/ecore-imf-1"
-    "-I${efl}/include/emile-1"
-    "-I${efl}/include/eo-1"
-    "-I${efl}/include/ethumb-1"
-    "-I${efl}/include/ethumb-client-1"
-  ];
-
   preConfigure = ''
     export USER_SESSION_DIR=$prefix/lib/systemd/user
 
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index 9bfb2144b6f..eef9eafae38 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "ephoto-${version}";
@@ -9,21 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
   };
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
 
-  buildInputs = [ efl curl ];
-
-  NIX_CFLAGS_COMPILE = [
-    "-I${efl}/include/ecore-con-1"
-    "-I${efl}/include/ecore-evas-1"
-    "-I${efl}/include/ecore-imf-1"
-    "-I${efl}/include/ecore-input-1"
-    "-I${efl}/include/eet-1"
-    "-I${efl}/include/eldbus-1"
-    "-I${efl}/include/emile-1"
-    "-I${efl}/include/ethumb-1"
-    "-I${efl}/include/ethumb-client-1"
-  ];
+  buildInputs = [ efl pcre curl ];
 
   postInstall = ''
     wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib
diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix
index 4d102b31e3b..5f6a451d065 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, curl, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, pcre, curl, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "rage-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    (pkgconfig.override { vanilla = true; })
     wrapGAppsHook
   ];
 
@@ -21,24 +21,10 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-good
     gst_all_1.gst-plugins-bad
     gst_all_1.gst-libav
+    pcre
     curl
  ];
 
-  NIX_CFLAGS_COMPILE = [
-    "-I${efl}/include/ecore-con-1"
-    "-I${efl}/include/ecore-evas-1"
-    "-I${efl}/include/ecore-file-1"
-    "-I${efl}/include/ecore-imf-1"
-    "-I${efl}/include/ecore-input-1"
-    "-I${efl}/include/eet-1"
-    "-I${efl}/include/efreet-1"
-    "-I${efl}/include/eldbus-1"
-    "-I${efl}/include/emile-1"
-    "-I${efl}/include/eo-1"
-    "-I${efl}/include/ethumb-1"
-    "-I${efl}/include/ethumb-client-1"
-  ];
-
   postInstall = ''
     wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib
   '';
diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 390f0593782..71d92f6f3cb 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, pcre, curl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
@@ -9,18 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "13rl1k22yf8qrpzdm5nh6ij641fibadr2ww1r7rnz7mbhzj3d4gb";
   };
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
 
-  buildInputs = [ efl curl ];
-
-  NIX_CFLAGS_COMPILE = [
-    "-I${efl}/include/ecore-con-1"
-    "-I${efl}/include/eldbus-1"
-    "-I${efl}/include/elocation-1"
-    "-I${efl}/include/emile-1"
-    "-I${efl}/include/eo-1"
-    "-I${efl}/include/ethumb-1"
-  ];
+  buildInputs = [ efl pcre curl ];
 
   postInstall = ''
     for f in $out/bin/*; do

From d9b27fa623e2de5c2f8ffbba1332725e7b8374bc Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 22 Aug 2017 14:06:53 -0700
Subject: [PATCH 2500/3246] pythonPackages.logfury: New expression 0.1.2

This will be needed by the upcoming release of backblaze-b2
---
 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 713756c232e..e14cd930394 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7286,6 +7286,28 @@ in {
     };
   };
 
+  logfury = buildPythonPackage rec {
+    name = "logfury-${version}";
+    version = "0.1.2";
+  
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/l/logfury/${name}.tar.gz";
+      sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2";
+    };
+  
+    buildInputs =
+      [ self.funcsigs
+        self.six
+      ];
+  
+    meta = with pkgs.stdenv.lib; {
+      description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls.";
+      homepage = "https://github.com/ppolewicz/logfury";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ jwiegley ];
+    };
+  };
+
   ndg-httpsclient = buildPythonPackage rec {
     version = "0.4.2";
     name = "ndg-httpsclient-${version}";

From 0b74f6f16ee6530dc7e0ec8fcf93c5ae1da89315 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Tue, 22 Aug 2017 23:31:38 +0200
Subject: [PATCH 2501/3246] libcouchbase: 2.7.2 -> 2.7.6

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

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 5f39e2f4971..2fccee0160b 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.7.2";
+  version = "2.7.6";
 
   src = fetchFromGitHub {
     owner = "couchbase";
-    repo ="libcouchbase";
+    repo = "libcouchbase";
     rev = version;
-    sha256 = "1182r9z3cykkgx1vn36l0a50wvh5mr3yj89x0ynyjhfi3iwalrar";
+    sha256 = "13g7r0mcmrj37mihj6g1x1ckpaps659c4qwnw3ixrg7p5mb3p41f";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From 8b8e363979d01e3bffb1999c28c446f291aa527c Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 21 Aug 2017 20:59:37 -0400
Subject: [PATCH 2502/3246] hdfview: init at 2.14

hdf_java: init at 3.3.2
---
 pkgs/tools/misc/hdf5/default.nix    |  1 +
 pkgs/tools/misc/hdfjava/default.nix | 27 ++++++++++++++++++++
 pkgs/tools/misc/hdfview/default.nix | 39 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  8 ++++++
 4 files changed, 75 insertions(+)
 create mode 100644 pkgs/tools/misc/hdfjava/default.nix
 create mode 100644 pkgs/tools/misc/hdfview/default.nix

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index ea71def3619..eb29e7d914c 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
       applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and 
       applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
     '';
+    license = stdenv.lib.licenses.free; # BSD-like
     homepage = https://www.hdfgroup.org/HDF5/;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix
new file mode 100644
index 00000000000..553e78c58a7
--- /dev/null
+++ b/pkgs/tools/misc/hdfjava/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, javac }:
+
+stdenv.mkDerivation rec {
+  name = "hdf-java-${version}";
+  version = "3.3.2";
+
+  src = fetchurl {
+    url = "http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-${version}/src/CMake-hdfjava-${version}.tar.gz";
+    sha256 = "0m1gp2aspcblqzmpqbdpfp6giskws85ds6p5gz8sx7asyp7wznpr";
+  };
+
+  nativeBuildInputs = [ cmake javac ];
+
+  configurePhase = "true";
+  buildPhase = "./build-hdfjava-unix.sh";
+  installPhase = ''
+    mkdir -p $out
+    cp -r build/_CPack_Packages/Linux/TGZ/HDFJava-3.3.2-Linux/HDF_Group/HDFJava/${version}/* $out/
+  '';
+
+  meta = {
+    description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form";
+    license = stdenv.lib.licenses.free; # BSD-like
+    homepage = https://support.hdfgroup.org/products/java/index.html;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
new file mode 100644
index 00000000000..d69a3d2470d
--- /dev/null
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, cmake, ant, javac, hdf_java }:
+
+stdenv.mkDerivation rec {
+  name = "hdfview-${version}";
+  version = "2.14";
+
+  src = fetchurl {
+    url = "http://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}-${version}.tar.gz";
+    sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p";
+  };
+
+  nativeBuildInputs = [ ant javac ];
+
+  HDFLIBS = hdf_java;
+
+  buildPhase = ''
+    ant run
+    ant package
+  '';
+
+  installPhase = ''
+    mkdir $out
+    # exclude jre
+    cp -r build/HDF_Group/HDFView/*/{lib,share} $out/
+    mkdir $out/bin
+    cp -r build/HDF_Group/HDFView/*/hdfview.sh $out/bin/hdfview
+    chmod +x $out/bin/hdfview
+    substituteInPlace $out/bin/hdfview \
+      --replace "@JAVABIN@" "${javac}/bin/" \
+      --replace "@INSTALLDIR@" "$out"
+  '';
+
+  meta = {
+    description = "A visual tool for browsing and editing HDF4 and HDF5 files";
+    license = stdenv.lib.licenses.free; # BSD-like
+    homepage = https://support.hdfgroup.org/products/java/index.html;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e8f4a853e9..107b5f5e762 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2464,6 +2464,14 @@ with pkgs;
     inherit gfortran;
   });
 
+  hdfview = callPackage ../tools/misc/hdfview {
+    javac = jdk;
+  };
+
+  hdf_java = callPackage ../tools/misc/hdfjava {
+    javac = jdk;
+  };
+
   hecate = callPackage ../applications/editors/hecate { };
 
   heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {};

From 5bd10ff39b4e6d5742b643e08892d06cfb44f375 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <me@andreascarpino.it>
Date: Wed, 23 Aug 2017 01:11:48 +0200
Subject: [PATCH 2503/3246] qoauth: 1.0.1 -> 2.0.0

---
 pkgs/development/libraries/qoauth/default.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index 48a63e41234..fa998b9e198 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchurl, qt4, qca2, qmake4Hook }:
+{ stdenv, fetchurl, qt5, qca2-qt5 }:
 
 stdenv.mkDerivation {
-  name = "qoauth-1.0.1";
+  name = "qoauth-2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ayoy/qoauth/tarball/v1.0.1;
-    name = "qoauth-1.0.1.tar.gz";
-    sha256 = "1ax0g4dd49a3a1699ams13bkhz690xfwqg8rxp1capbdpf2aa8cp";
+    url = https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz;
+    name = "qoauth-2.0.0.tar.gz";
+    sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333";
   };
 
   patchPhase = "sed -e 's/lib64/lib/g' -i src/src.pro";
 
-  buildInputs = [ qt4 qca2 ];
-  nativeBuildInputs = [ qmake4Hook ];
+  buildInputs = [ qt5.qtbase qca2-qt5 ];
+  nativeBuildInputs = [ qt5.qmake ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${qca2}/include/QtCrypto" ];
-  NIX_LDFLAGS = [ "-lqca" ];
+  NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ];
+  NIX_LDFLAGS = [ "-lqca-qt5" ];
 
   meta = {
     description = "Qt library for OAuth authentication";
-    inherit (qt4.meta) platforms;
+    inherit (qt5.qtbase.meta) platforms;
     maintainers = [ ];
   };
 }

From 8b4fec00e09d36fedbadcd28d84320c7c0d186f1 Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@alunduil.com>
Date: Tue, 22 Aug 2017 18:31:08 -0500
Subject: [PATCH 2504/3246] add alunduil as collection-json maintainer

---
 lib/maintainers.nix                                             | 1 +
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d904c5368bf..8bb7072ddcd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -33,6 +33,7 @@
   algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
   alibabzo = "Alistair Bill <alistair.bill@gmail.com>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
+  alunduil = "Alex Brandt <alunduil@alunduil.com>";
   ambrop72 = "Ambroz Bizjak <ambrop7@gmail.com>";
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
   amiloradovsky = "Andrew Miloradovsky <miloradovsky@gmail.com>";
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 700219d843e..31cbbd6db97 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2594,6 +2594,8 @@ package-maintainers:
   abbradar:
     - Agda
     - lambdabot
+  alunduil:
+    - collection-json
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms

From 09bde4a2cdeed27dca8a145502d405d4c986a304 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 23 Aug 2017 01:58:12 +0200
Subject: [PATCH 2505/3246] elk: 5.4.2 -> 5.5.2

Release notes:

* https://www.elastic.co/guide/en/elasticsearch/reference/5.5/release-notes-5.5.2.html
* https://www.elastic.co/guide/en/logstash/5.5/logstash-5-5-2.html
* https://www.elastic.co/guide/en/kibana/current/release-notes-5.5.2.html
---
 nixos/release.nix                          | 1 +
 pkgs/development/tools/misc/kibana/5.x.nix | 6 +++---
 pkgs/misc/logging/beats/default.nix        | 2 +-
 pkgs/servers/search/elasticsearch/5.x.nix  | 2 +-
 pkgs/tools/misc/logstash/5.x.nix           | 4 ++--
 pkgs/top-level/all-packages.nix            | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 9604da5a4d7..761a151e12e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -239,6 +239,7 @@ in rec {
   tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
   tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;
   tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
+  tests.elk = callTest tests/elk.nix {};
   tests.ferm = callTest tests/ferm.nix {};
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix
index 71e21d31bb7..69a19987020 100644
--- a/pkgs/development/tools/misc/kibana/5.x.nix
+++ b/pkgs/development/tools/misc/kibana/5.x.nix
@@ -11,9 +11,9 @@ let
   elasticArch = archOverrides."${arch}" or arch;
   plat = elemAt info 1;
   shas = {
-    "x86_64-linux"  = "0b3kxd2s66pps5262khnh9yvp2mlwan6461ggxba380hfm7xxi6y";
-    "i686-linux"    = "1vfl1xmzvrr064nbsbwr597r7hbxyh27397n981scgb1j1y7qja9";
-    "x86_64-darwin" = "19iw39qi7i8685s3mg3y6wsqnsddc6fj06g80vqbg76x8160z7dl";
+    "x86_64-linux"  = "0nmx7r6i54x7pii4ryh3wzzbwvnmcb3f1hn6ch96r24xi4v9m1sb";
+    "i686-linux"    = "0am6wmbcsh7zxzdrl1q9jbjrb7y4apvi6sr70j61xcx07pbickpp";
+    "x86_64-darwin" = "0kjnlzsz4i2fca3jgfsr1kknqzaypb0r78a7cxz2m7daj3bmpvpl";
   };
 in stdenv.mkDerivation rec {
   name = "kibana-${version}";
diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix
index ec2fc975b33..2b555978edc 100644
--- a/pkgs/misc/logging/beats/default.nix
+++ b/pkgs/misc/logging/beats/default.nix
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
         owner = "elastic";
         repo = "beats";
         rev = "v${version}";
-        sha256 = "03pvzikl5wa6agf3aszx96xvd6yjbvdf0kdwjsr4vfga0h797s32";
+        sha256 = "0vzjlgc0sym3kh6nflf2iyy2k3gxd7zwq8ma0cd7kpf42vxwhvqy";
       };
 
       goPackagePath = "github.com/elastic/beats";
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
index 6f9895509ee..781f505f469 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
-    sha256 = "0l31i6dp3q6d6gqsnji1ym0abqphzf1yxswwn4s3na8s216i41h2";
+    sha256 = "1wavcqhwx4nj5v1ba8136009asnhrnhpm87zdsbxlvifqz0f4w08";
   };
 
   patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix
index 2628c777140..d796b3952f6 100644
--- a/pkgs/tools/misc/logstash/5.x.nix
+++ b/pkgs/tools/misc/logstash/5.x.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
-    sha256 = "1z3rwpwafrn6h0rzdsmripnwj8ad33v92ryxq8xf9y7331rqb2gs";
+    sha256 = "04nrw7ikcjp02cmwvaa1swj0b66l91n9d8qbdicsa023js4mp14m";
   };
 
   dontBuild         = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out
-    cp -r {Gemfile*,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
+    cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
 
     wrapProgram $out/bin/logstash \
        --set JAVA_HOME "${jre}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbb8855678a..41889c8fb22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1806,7 +1806,7 @@ with pkgs;
   evemu = callPackage ../tools/system/evemu { };
 
   # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
-  elk5Version = "5.4.2";
+  elk5Version = "5.5.2";
 
   elasticsearch = callPackage ../servers/search/elasticsearch { };
   elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };

From ca381067e77f01b875cacdee3fe0934c87b89bda Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 22 Aug 2017 19:48:56 -0500
Subject: [PATCH 2506/3246] idrisPackages.build-builtin-package: Include
 version in name

---
 pkgs/development/idris-modules/build-builtin-package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix
index 95641a8f9fa..defe8765403 100644
--- a/pkgs/development/idris-modules/build-builtin-package.nix
+++ b/pkgs/development/idris-modules/build-builtin-package.nix
@@ -1,8 +1,12 @@
 # Build one of the packages that come with idris
 # name: The name of the package
 # deps: The dependencies of the package
-{ idris, build-idris-package, lib }: name: deps: build-idris-package {
-  inherit name;
+{ idris, build-idris-package, lib }: name: deps:
+let
+  inherit (builtins.parseDrvName idris.name) version;
+in
+build-idris-package {
+  name = "${name}-${version}";
 
   propagatedBuildInputs = deps;
 

From d5abffac81b823b390fb8b72c8099a7b20269619 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 22 Jun 2017 08:29:48 -0500
Subject: [PATCH 2507/3246] k3b: fixup inputs

---
 pkgs/applications/kde/k3b.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index c70c3ea877b..ec789c626d2 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib
-, extra-cmake-modules, kdoctools, makeWrapper
+, extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info
 , qtwebkit
 , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis

From 34c265584dfbfd3c49e3f3a58fa45d98f10fed89 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 20 Aug 2017 11:54:35 +0200
Subject: [PATCH 2508/3246] kdeApplications: adapt deps and patches to new
 version

---
 .../grantlee-merge-theme-dirs.patch           | 11 --------
 .../grantleetheme_check_null.patch            | 25 -------------------
 pkgs/applications/kde/grantleetheme/series    |  1 -
 pkgs/applications/kde/kdepim-runtime.nix      |  3 ++-
 pkgs/applications/kde/kmail.nix               |  4 +--
 pkgs/applications/kde/mailcommon.nix          |  4 +--
 6 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch

diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
index 76b65a44475..6275bb84c17 100644
--- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
+++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
@@ -44,17 +44,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
      loader->setTheme(dirName);
  
      if (!sEngine) {
-@@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons
-     Grantlee::Context ctx = createContext();
-     ctx.insert(QStringLiteral("error"), reason);
-     ctx.insert(QStringLiteral("templateName"), origTemplateName);
--    const QString errorString = failedTemplate
--            ? failedTemplate->errorString()
--            : QStringLiteral("(null template)");
-+    const QString errorString = failedTemplate->errorString();
-     ctx.insert(QStringLiteral("errorMessage"), errorString);
-     return tpl->render(&ctx);
- }
 @@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c
      KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
      if (group.isValid()) {
diff --git a/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch b/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch
deleted file mode 100644
index 730d5b0fe26..00000000000
--- a/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
-index b86fc3a..8af72f4 100644
---- a/src/grantleetheme.cpp
-+++ b/src/grantleetheme.cpp
-@@ -102,7 +102,10 @@ QString ThemePrivate::errorTemplate(const QString &reason,
-     Grantlee::Context ctx = createContext();
-     ctx.insert(QStringLiteral("error"), reason);
-     ctx.insert(QStringLiteral("templateName"), origTemplateName);
--    ctx.insert(QStringLiteral("errorMessage"), failedTemplate->errorString());
-+    const QString errorString = failedTemplate
-+            ? failedTemplate->errorString()
-+            : QStringLiteral("(null template)");
-+    ctx.insert(QStringLiteral("errorMessage"), errorString);
-     return tpl->render(&ctx);
- }
- 
-@@ -208,7 +211,7 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
-     }
- 
-     Grantlee::Template tpl = d->loader->loadByName(templateName, ThemePrivate::sEngine);
--    if (tpl->error()) {
-+    if (!tpl || tpl->error()) {
-         return d->errorTemplate(i18n("Template parsing error"), templateName, tpl);
-     }
- 
diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series
index 5c38848de71..9095599ea56 100644
--- a/pkgs/applications/kde/grantleetheme/series
+++ b/pkgs/applications/kde/grantleetheme/series
@@ -1,2 +1 @@
-grantleetheme_check_null.patch
 grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix
index 01683a6315c..0fde861a023 100644
--- a/pkgs/applications/kde/kdepim-runtime.nix
+++ b/pkgs/applications/kde/kdepim-runtime.nix
@@ -5,7 +5,7 @@
   akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
   kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
   kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
-  qtwebengine,
+  pimcommon, qtwebengine,
 }:
 
 mkDerivation {
@@ -19,6 +19,7 @@ mkDerivation {
     akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
     kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
     kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
+    pimcommon
   ];
   # Attempts to build some files before dependencies have been generated
   enableParallelBuilding = false;
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index ec8c9892779..acb200c5970 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
-  kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs,
+  kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim,
   kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap,
   kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
   kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
@@ -20,7 +20,7 @@ mkDerivation {
   buildInputs = [
     akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig
     kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n
-    kiconthemes kinit kio kldap kmail-account-wizard kmailtransport
+    kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim
     knotifications knotifyconfig kontactinterface kparts kpty kservice
     ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
     libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix
index ee958d701b3..44edea8f55e 100644
--- a/pkgs/applications/kde/mailcommon.nix
+++ b/pkgs/applications/kde/mailcommon.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets,
   kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap,
-  kmailtransport, kwindowsystem, mailimporter, messagelib, phonon,
+  kmailtransport, kwindowsystem, mailimporter, messagelib, phonon, libkdepim
 }:
 
 mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
   buildInputs = [
     akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons
     kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport
-    kwindowsystem mailimporter messagelib phonon
+    kwindowsystem mailimporter messagelib phonon libkdepim
   ];
   outputs = [ "out" "dev" ];
 }

From 1c0179e84da87c21fa2a19a1bb764305ed8dbaa2 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 20 Aug 2017 12:03:41 +0200
Subject: [PATCH 2509/3246] k3b: remove duplicate dependency

---
 pkgs/applications/kde/k3b.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index ec789c626d2..950f44aa1fb 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -5,7 +5,7 @@
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info, kinit
+, ffmpeg, libmusicbrainz2, normalize, sox, transcode, kinit
 }:
 
 mkDerivation {
@@ -15,7 +15,7 @@ mkDerivation {
     maintainers = with maintainers; [ sander phreedom ];
     platforms = platforms.linux;
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper shared_mime_info ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
   propagatedBuildInputs = [
     # qt
     qtwebkit

From c59a09d1fbaffdafe446554fe26fa7516010d7b3 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 20 Aug 2017 12:10:35 +0200
Subject: [PATCH 2510/3246] akonadicondole: add dependency

---
 pkgs/applications/kde/akonadiconsole.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix
index 844cbc7d17f..3d7bf26c794 100644
--- a/pkgs/applications/kde/akonadiconsole.nix
+++ b/pkgs/applications/kde/akonadiconsole.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
-  kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit,
+  kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
   ktextwidgets, kxmlgui, messagelib, qtbase,
 }:
 
@@ -16,6 +16,6 @@ mkDerivation {
   buildInputs = [
     akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
     kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
-    messagelib qtbase
+    messagelib qtbase libkdepim
   ];
 }

From cea59ffb797bbc7d77a73b6e11249558ef75facd Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 20 Aug 2017 12:29:46 +0200
Subject: [PATCH 2511/3246] kontact: add missing dependency

---
 pkgs/applications/kde/kontact.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
index 4bbee9c3ffa..bb44762e65c 100644
--- a/pkgs/applications/kde/kontact.nix
+++ b/pkgs/applications/kde/kontact.nix
@@ -4,7 +4,7 @@
   qtwebengine,
   kcmutils, kcrash, kdbusaddons, kwindowsystem,
   akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
-  mailcommon,
+  mailcommon, libkdepim
 }:
 
 mkDerivation {
@@ -18,6 +18,6 @@ mkDerivation {
     qtwebengine
     kcmutils kcrash kdbusaddons kwindowsystem
     akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
-    mailcommon
+    mailcommon libkdepim
   ];
 }

From 2afb096e83f74d32ee68369bf325a8725653d651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 23 Aug 2017 10:09:37 +0200
Subject: [PATCH 2512/3246] gcc-4.5: fix build

It's fallout after output changes #27424.
gnat seems OK now, except that the wrapper is broken, so it's probably
not really usable.
---
 pkgs/development/compilers/gcc/4.5/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 971726b8ab9..879e379da51 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -138,8 +138,9 @@ stdenv.mkDerivation ({
 
   hardeningDisable = [ "format" ] ++ optional (name != "gnat") "all";
 
-  outputs = if (hostPlatform.is64bit && langAda) then [ "out" "doc" ]
-    else [ "out" "lib" "doc" ];
+  outputs = [ "out" "man" "info" ]
+    ++ optional (!(hostPlatform.is64bit && langAda)) "lib";
+
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 

From 9d4b711908a6f53669dc42a762c78c686c5390ed Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 23 Aug 2017 08:24:20 +0000
Subject: [PATCH 2513/3246] Revert "coq: default version is the one of
 coqPackages"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5f04a61d4fe8fac31dfb4b1d58f599a1067017c6.

That way, the Coq that is used to build other coq packages
can be overridden.

The top-level `coq` attribute is `coqPackages.coq` thus both
“un-versioned” attributes are consistent.
---
 pkgs/top-level/all-packages.nix | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbb8855678a..945775cccdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18071,13 +18071,19 @@ with pkgs;
     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_02) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages_4_02.camlp5_transitional;
+  };
+  coq_8_5 = callPackage ../applications/science/logic/coq {
+    version = "8.5pl3";
+  };
+  coq_8_6 = callPackage ../applications/science/logic/coq {};
+  coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
 
   mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
     inherit callPackage;
-    coq = callPackage ../applications/science/logic/coq/8.4.nix {
-      inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
-      camlp5 = ocamlPackages_4_02.camlp5_transitional;
-    };
+    coq = coq_8_4;
     coqPackages = coqPackages_8_4;
 
     contribs =
@@ -18109,9 +18115,7 @@ with pkgs;
 
   mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec {
     inherit callPackage;
-    coq = callPackage ../applications/science/logic/coq {
-      version = "8.5pl3";
-    };
+    coq = coq_8_5;
     coqPackages = coqPackages_8_5;
 
     autosubst = callPackage ../development/coq-modules/autosubst {};
@@ -18130,7 +18134,7 @@ with pkgs;
 
   mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec {
     inherit callPackage;
-    coq = callPackage ../applications/science/logic/coq {};
+    coq = coq_8_6;
     coqPackages = coqPackages_8_6;
 
     autosubst = callPackage ../development/coq-modules/autosubst {};
@@ -18153,11 +18157,6 @@ with pkgs;
   coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
   coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6;
   coqPackages = coqPackages_8_6;
-
-  coq_8_4 = coqPackages_8_4.coq;
-  coq_8_5 = coqPackages_8_5.coq;
-  coq_8_6 = coqPackages_8_6.coq;
-  coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {};
   coq = coqPackages.coq;
 
   coq2html = callPackage ../applications/science/logic/coq2html {

From b7d1b3214d8320ab6ee711ce06fc5b7e4e63902d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 23 Aug 2017 10:58:21 +0200
Subject: [PATCH 2514/3246] Plasma: 5.10.4 -> 5.10.5

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

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 1b82b4c38fc..7513c83c107 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index c7b83ebc51d..4e582bcef10 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,339 +3,339 @@
 
 {
   bluedevil = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/bluedevil-5.10.4.tar.xz";
-      sha256 = "1q1mhblrcsz55fjjgw9xd49w2whxcbvwvr7w5rb99jbgixiijmxi";
-      name = "bluedevil-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/bluedevil-5.10.5.tar.xz";
+      sha256 = "01nhfggikkygfzyjbm7zqszhq2x1fhc619wskwjb7hm9p35laj9r";
+      name = "bluedevil-5.10.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/breeze-5.10.4.tar.xz";
-      sha256 = "075iq5nr112la2zfmpkz0x7v1720zkil5b074g5p6yl058nfbg1d";
-      name = "breeze-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/breeze-5.10.5.tar.xz";
+      sha256 = "0rmc3nn9b63jyij814hqx1zg38iphvd03pg7qybkp61zw40ng90v";
+      name = "breeze-5.10.5.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/breeze-grub-5.10.4.tar.xz";
-      sha256 = "110d8jkgn6b28w4piwgl0lvkz7kkhx10948i8sb7dahyxilz57l2";
-      name = "breeze-grub-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/breeze-grub-5.10.5.tar.xz";
+      sha256 = "0am1hldqyrsryda907q2qwfc09xcsxrv7bq9v23ig0xmylcsq3if";
+      name = "breeze-grub-5.10.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/breeze-gtk-5.10.4.tar.xz";
-      sha256 = "0r0q5i24vqqaf9lyi7ac9i650ha6b3pv0js3r2vj0kivj1kh9wz5";
-      name = "breeze-gtk-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/breeze-gtk-5.10.5.tar.xz";
+      sha256 = "0i5ddrq9h1www5362qyfwpqpspn3brr43mbsv7ax7gk30san6w0a";
+      name = "breeze-gtk-5.10.5.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/breeze-plymouth-5.10.4.tar.xz";
-      sha256 = "16nvp2078py6gqwhi23rz0li6d1zv5i669q6whrpwd1xvb489xlg";
-      name = "breeze-plymouth-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/breeze-plymouth-5.10.5.tar.xz";
+      sha256 = "197g84mvh8s3f163zx24y1mmzk26fg3ni19pw21njdj2j813hd35";
+      name = "breeze-plymouth-5.10.5.tar.xz";
     };
   };
   discover = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/discover-5.10.4.tar.xz";
-      sha256 = "08bxk03jknbdyk1lsw59ml4d6p66shn6kijcsw44pkfiwxv4k7a8";
-      name = "discover-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/discover-5.10.5.tar.xz";
+      sha256 = "085lq0y9a6r12jbx2ik7zqp4r9bjw332ykfh2gbzzz4s7l7rj4xf";
+      name = "discover-5.10.5.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kactivitymanagerd-5.10.4.tar.xz";
-      sha256 = "0z33r8iysd69a76fwid46rywpvqa63pc5p7bgi2vy6aw7py5x2r2";
-      name = "kactivitymanagerd-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kactivitymanagerd-5.10.5.tar.xz";
+      sha256 = "19c297iyaq54vxc6xmvqsa1qlj5vr8071ydmkkfx3fa3lijp34v7";
+      name = "kactivitymanagerd-5.10.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kde-cli-tools-5.10.4.tar.xz";
-      sha256 = "1d9bp2yi4i5g4lk4y51yhmixkhjfjz9g0nlg6l22p37rnwr416h6";
-      name = "kde-cli-tools-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kde-cli-tools-5.10.5.tar.xz";
+      sha256 = "1i2frbxvzlqlv210w50ccxn8ksqxranc93v0wfjvnhd7f8p9c7vk";
+      name = "kde-cli-tools-5.10.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kdecoration-5.10.4.tar.xz";
-      sha256 = "15m62a0wwvssrr2k065kqmxj00fc4pvfmnxx6aakvnf11jwzs0r5";
-      name = "kdecoration-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kdecoration-5.10.5.tar.xz";
+      sha256 = "0g24gisbnp92niff36bcnjk5pp84qc8cwmx283b887fzcn8v4mf3";
+      name = "kdecoration-5.10.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kde-gtk-config-5.10.4.tar.xz";
-      sha256 = "0r5kkvxf29mi45h0snsvjw9xkc02k9b2gai687sci7n8iwkjdc9j";
-      name = "kde-gtk-config-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kde-gtk-config-5.10.5.tar.xz";
+      sha256 = "1a5q8skykhvr5mixi59db2w1qsh8nj2dqncw4nmsh5nlh2ldmgm5";
+      name = "kde-gtk-config-5.10.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kdeplasma-addons-5.10.4.tar.xz";
-      sha256 = "19rd7lsxbjw9sr96jfis8hfdrpmm1djwi8cr2yw683zv5kjqzigf";
-      name = "kdeplasma-addons-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kdeplasma-addons-5.10.5.tar.xz";
+      sha256 = "1xdsa38i60x24p6xiv4x1cqd7f2xijs15c19qsjv594lnmbizbr5";
+      name = "kdeplasma-addons-5.10.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kgamma5-5.10.4.tar.xz";
-      sha256 = "04kfigplrhcc01dap9a7l43dh2ig3ihyc01vwsrik73l026vm2im";
-      name = "kgamma5-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kgamma5-5.10.5.tar.xz";
+      sha256 = "0rci4v5amhfiwawf2sj5f6cmcyq3lrx68mn8id279bpq35mr23v1";
+      name = "kgamma5-5.10.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/khotkeys-5.10.4.tar.xz";
-      sha256 = "16apzdf2g42sr349jdjjal0lv2bpginb72f1c5p8cs14nvg0cnys";
-      name = "khotkeys-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/khotkeys-5.10.5.tar.xz";
+      sha256 = "1ixxb18nz3f4i2qqr1lvss7b662sgj78kzqjs0gd9mf5ylhqj5is";
+      name = "khotkeys-5.10.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kinfocenter-5.10.4.tar.xz";
-      sha256 = "1r0a4z6wzzkb30y76xx4x1gfbka7h3qn1j0fxyf2h97vd362g8zr";
-      name = "kinfocenter-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kinfocenter-5.10.5.tar.xz";
+      sha256 = "0flfjypp6v2k99h11srigyc0ahy23869wz3ljbqbm3b0pgqs69sm";
+      name = "kinfocenter-5.10.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kmenuedit-5.10.4.tar.xz";
-      sha256 = "1kvspljbzrbglyq1l69r7gdlqww674hxdbvrhq1v95sh33i3l29w";
-      name = "kmenuedit-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kmenuedit-5.10.5.tar.xz";
+      sha256 = "0b786l5gm093dq1hvxcn97yg9fr0jmjhfl7sfd0cdn4pkg6almam";
+      name = "kmenuedit-5.10.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kscreen-5.10.4.tar.xz";
-      sha256 = "0rahpg14raqngk8a63qh2bnqgga43dyzqfzd9ys94iqkxkmlsasw";
-      name = "kscreen-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kscreen-5.10.5.tar.xz";
+      sha256 = "1a8bqa4wqnjav2w0s39dh7hmb3mqxjnhqwsw6mycgaxicl0h37vf";
+      name = "kscreen-5.10.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kscreenlocker-5.10.4.tar.xz";
-      sha256 = "17sykdkd43z2x9ccvninbhgypysqr1p052cp1aj2wbvl54hhiznp";
-      name = "kscreenlocker-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.tar.xz";
+      sha256 = "07c8x4pj9adwwm5036wbrrw2sj8xi9d8b6d7qya6bam9xrq0mxkb";
+      name = "kscreenlocker-5.10.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/ksshaskpass-5.10.4.tar.xz";
-      sha256 = "1nz6pw10k9r7y4h9wl4b5jxbk10jkdj8fymkzx94dcvgasia52jf";
-      name = "ksshaskpass-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/ksshaskpass-5.10.5.tar.xz";
+      sha256 = "194ca18kclwmg7j9kcl02hm01cidy0hh2r68j6gxkafnlmn1cjjw";
+      name = "ksshaskpass-5.10.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/ksysguard-5.10.4.tar.xz";
-      sha256 = "02p6c9lvgpcaszl5zigyjhcarjmp12hhhhfbkd448nmaklrw4qnl";
-      name = "ksysguard-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/ksysguard-5.10.5.tar.xz";
+      sha256 = "0ywz0ax29y0gm7c3lxwdkn5xvzpkd82a313wb3cz4iphqqga3jqn";
+      name = "ksysguard-5.10.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kwallet-pam-5.10.4.tar.xz";
-      sha256 = "1si9fyg4n7kxn2kff15r8ph6m5hipyb3fwif9hc0x5v8iwf7a9q2";
-      name = "kwallet-pam-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kwallet-pam-5.10.5.tar.xz";
+      sha256 = "0ws0835a0j3wqia85hcdsgfn48d71v96dmmvc2y5pp45ki648bn4";
+      name = "kwallet-pam-5.10.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kwayland-integration-5.10.4.tar.xz";
-      sha256 = "02d4sy3fzh45r2j13m8fr3p3xkd98j40mnzwf54ljb9irvm3fplc";
-      name = "kwayland-integration-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kwayland-integration-5.10.5.tar.xz";
+      sha256 = "0s1yhrvjgn455ayi368fkmdpmpyxl97c2pxy8rchfnk3g1ffhmdy";
+      name = "kwayland-integration-5.10.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kwin-5.10.4.tar.xz";
-      sha256 = "0p7yv3a1qsv87ymr7kz8ayp3zspak1qw8lp051qrnaabpz951r39";
-      name = "kwin-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kwin-5.10.5.tar.xz";
+      sha256 = "1nxyn31a00r9kh0aw5fmvxklw21b2l07y267m0q0n9w6bmn6nzyc";
+      name = "kwin-5.10.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/kwrited-5.10.4.tar.xz";
-      sha256 = "1di7xlgszw8iy4w7722x9g9998q8y48j1s8qd6mryqryr9ryq9b3";
-      name = "kwrited-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kwrited-5.10.5.tar.xz";
+      sha256 = "0wphhb4l6qb7lbklgxh2sc6wgqij4n3iwnhaarv2d17864r7ykc9";
+      name = "kwrited-5.10.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/libkscreen-5.10.4.tar.xz";
-      sha256 = "0zpybykj6s547j53a7x4flj45qhpk3z0d3sfp6wgi88gybnffj8g";
-      name = "libkscreen-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/libkscreen-5.10.5.tar.xz";
+      sha256 = "0a2lrrp8wp7ndgdvnh48781isin868ndsqw0xr21rn78n90580n6";
+      name = "libkscreen-5.10.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/libksysguard-5.10.4.tar.xz";
-      sha256 = "01w0laywva0p0ar2lvr1k5000bhjikjfxsb4f6p30qswrchrmrh3";
-      name = "libksysguard-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/libksysguard-5.10.5.tar.xz";
+      sha256 = "0ldcpjxy10cnwwc82ihy8xqjkavycrmv6wlbn0rwhnfs04n2rryn";
+      name = "libksysguard-5.10.5.tar.xz";
     };
   };
   milou = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/milou-5.10.4.tar.xz";
-      sha256 = "105fyrh5n90ih93b9lq21y6s2ckdgb7lf9624y13gii674yv9xhb";
-      name = "milou-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/milou-5.10.5.tar.xz";
+      sha256 = "06kq9s9lij66vy5024aps03pzpcz1ixf0b79a7ii1px2h1s7z4gz";
+      name = "milou-5.10.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/oxygen-5.10.4.tar.xz";
-      sha256 = "0hip9vkp33dg51xr1v46i0w7fs6cqwx3lssw82qyzf042zipyikd";
-      name = "oxygen-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/oxygen-5.10.5.tar.xz";
+      sha256 = "0p1isrb8v0dkd27jnz6nbq44py7y3zzsjljn9xbv3d02vg802ym9";
+      name = "oxygen-5.10.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/plasma-desktop-5.10.4.tar.xz";
-      sha256 = "0g1cynvm58fg99n9ir0lwbsg3c4jh1fr330n12bx6ccgw66i1mgf";
-      name = "plasma-desktop-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/plasma-desktop-5.10.5.tar.xz";
+      sha256 = "1sxy2k2p15ag5pcy36lpn83nz8d1jb1iyq2nihf4yrc9jlxx9gqm";
+      name = "plasma-desktop-5.10.5.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/plasma-integration-5.10.4.tar.xz";
-      sha256 = "0rf50yr97if7i8ghjsladw9krkcjn45qnpq86siph2hnn784x2q6";
-      name = "plasma-integration-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/plasma-integration-5.10.5.tar.xz";
+      sha256 = "15cxwsdp78kx55py0wkwqpv4w8cf130hadmdvdw64lwr4gssvhjn";
+      name = "plasma-integration-5.10.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/plasma-nm-5.10.4.tar.xz";
-      sha256 = "0lxg2x73n353p69l4qgxm759f6vxl2z2rff60864yj80ija6i58c";
-      name = "plasma-nm-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/plasma-nm-5.10.5.tar.xz";
+      sha256 = "004nmkfy74qaba6hslv2cyb52l7q6ihpavi5j5ax8k66n5zx00bi";
+      name = "plasma-nm-5.10.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/plasma-pa-5.10.4.tar.xz";
-      sha256 = "0nxn1vhylpy91kz4xihhrxagjlwdm5xi10blgkfkq98npg7g1had";
-      name = "plasma-pa-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/plasma-pa-5.10.5.tar.xz";
+      sha256 = "0300x3w7mhyb5wpsj47qsfm73fc90iw1vxrgzl9014pxc3h14np1";
+      name = "plasma-pa-5.10.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/plasma-sdk-5.10.4.tar.xz";
-      sha256 = "0m1q39gxrjk5fmz5dkwxz0wjngv9xib6xiw3k8rscjbby5q2x4g0";
-      name = "plasma-sdk-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/plasma-sdk-5.10.5.tar.xz";
+      sha256 = "0mjndw132rn46sqjw5jdin8hn6lbrx5955h05jawk95sncr3d0yb";
+      name = "plasma-sdk-5.10.5.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/plasma-tests-5.10.4.tar.xz";
-      sha256 = "0l8f0p3z1xfc5ki4696yr4ckdpcfswg53f9bbwfzgwg54h109zs9";
-      name = "plasma-tests-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/plasma-tests-5.10.5.tar.xz";
+      sha256 = "0mfh35zdc4n52q01jbagxgr51hsvjlyfmnj6x4l2zpif0fpqpxh8";
+      name = "plasma-tests-5.10.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/plasma-workspace-5.10.4.tar.xz";
-      sha256 = "08d18swivlysh535fkkfc256rkl1p6b93y934w21bdyihs0mf18w";
-      name = "plasma-workspace-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-5.10.5.tar.xz";
+      sha256 = "1n12vzjnrhndkzki7dh9kzrwrvll5xqq0y02srb9bg3gyjbp54jl";
+      name = "plasma-workspace-5.10.5.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/plasma-workspace-wallpapers-5.10.4.tar.xz";
-      sha256 = "04jp14y8k5bchs80hj3r2h3qi17q3i4fbq6g09457qv7i195xgr2";
-      name = "plasma-workspace-wallpapers-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-wallpapers-5.10.5.tar.xz";
+      sha256 = "1z7mqk9nxh232dxl5jg20zbc5nkq5srks4f8b02va6wzfjhwhc88";
+      name = "plasma-workspace-wallpapers-5.10.5.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/plymouth-kcm-5.10.4.tar.xz";
-      sha256 = "0l0b2jpgz22f50i7zwmq5mij3p9ym6d059qvy35j96cyn69947nx";
-      name = "plymouth-kcm-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/plymouth-kcm-5.10.5.tar.xz";
+      sha256 = "11vfaaqd3mxbnq16rv7xsmfcj33i2cmdljdxib1sg5minybd072y";
+      name = "plymouth-kcm-5.10.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.10.4";
+    version = "1-5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/polkit-kde-agent-1-5.10.4.tar.xz";
-      sha256 = "1kk1g40pgzdwbpxymyf5f0m474g273nq7knkzz41jp7yqi7dh9jw";
-      name = "polkit-kde-agent-1-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/polkit-kde-agent-1-5.10.5.tar.xz";
+      sha256 = "158lkf76fz65nr0lx14skkcsk2p3xw98nh43z00wvm2c5qqzmnp2";
+      name = "polkit-kde-agent-1-5.10.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/powerdevil-5.10.4.tar.xz";
-      sha256 = "1qlxdn7w6grwpqlwfwwsh0ag5bshi8m9mz2s1zvrfgk09wvl6mr2";
-      name = "powerdevil-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/powerdevil-5.10.5.tar.xz";
+      sha256 = "0dghlgva8fybvhc09y1avzhgak246n4ad2njjvfnxpazpi2laxv7";
+      name = "powerdevil-5.10.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/sddm-kcm-5.10.4.tar.xz";
-      sha256 = "1sljbd57nn1n26jdrbyj8dgrjdz3rfq8vacvx96a2nj3csnf0qlk";
-      name = "sddm-kcm-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/sddm-kcm-5.10.5.tar.xz";
+      sha256 = "13hld5bndxhs6j3lja08zrc6czvpl4k385i8lb3g9zvn9vrk29sw";
+      name = "sddm-kcm-5.10.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/systemsettings-5.10.4.tar.xz";
-      sha256 = "05rchi657px3qizqq82z4k0wsjc4cm2w5wb1mb9ayg287cdrsnjy";
-      name = "systemsettings-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/systemsettings-5.10.5.tar.xz";
+      sha256 = "0b3wpmfjj2zmi7ickppz32i63dpn4jja3nnjrxn912yw47z4bri2";
+      name = "systemsettings-5.10.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/user-manager-5.10.4.tar.xz";
-      sha256 = "16swrdmf0b26zy5qipb89smh3cps1fvcxkz12sxd8i92m6cxa903";
-      name = "user-manager-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/user-manager-5.10.5.tar.xz";
+      sha256 = "1fiih72jafshxgwfq4q9csv1i62mgj35qr87lh6lyady6aghajnq";
+      name = "user-manager-5.10.5.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.10.4";
+    version = "5.10.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.4/xdg-desktop-portal-kde-5.10.4.tar.xz";
-      sha256 = "01snfdj73r0hby9h32k7258r65ip62wk4p78qxibvffxm4ixw04l";
-      name = "xdg-desktop-portal-kde-5.10.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/xdg-desktop-portal-kde-5.10.5.tar.xz";
+      sha256 = "0rgv4nqkrwjzvhg8cmkin348n0i6sd4v444bk6j83y4m0lxdi1ba";
+      name = "xdg-desktop-portal-kde-5.10.5.tar.xz";
     };
   };
 }

From 63f8122cd93b8d100865515d80b5e1325e69f2cd Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Wed, 23 Aug 2017 12:43:07 +0300
Subject: [PATCH 2515/3246] nixos tests: add test for declarative containers,
 that container config changes are applied on `nixos-rebuild switch`
 invocations.

---
 nixos/tests/containers-reloadable.nix | 66 +++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 nixos/tests/containers-reloadable.nix

diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
new file mode 100644
index 00000000000..b5867c6f6ab
--- /dev/null
+++ b/nixos/tests/containers-reloadable.nix
@@ -0,0 +1,66 @@
+import ./make-test.nix ({ pkgs, lib, ...} :
+let
+  client_base = rec {
+    
+    containers.test1 = {
+      autoStart = true;
+      config = {
+        environment.etc."check".text = "client_base";
+      };
+    };
+
+    # prevent make-test.nix to change IP
+    networking.interfaces = {
+      eth1.ip4 = lib.mkOverride 0 [ ];
+    };
+  };
+in {
+  name = "cotnainers-reloadable";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ danbst ];
+  };
+
+  nodes = {
+    client = { lib, pkgs, ... }: {
+      imports = [ client_base ];
+    };
+
+    client_c1 = { lib, pkgs, ... }: {
+      imports = [ client_base ];
+
+      containers.test1.config = {
+        environment.etc."check".text = lib.mkForce "client_c1";
+        services.httpd.enable = true;
+        services.httpd.adminAddr = "nixos@example.com";
+      };
+    };
+    client_c2 = { lib, pkgs, ... }: {
+      imports = [ client_base ];
+
+      containers.test1.config = {
+        environment.etc."check".text = lib.mkForce "client_c2";
+        services.nginx.enable = true;
+      };
+    };
+  };
+
+  testScript = {nodes, ...}: let
+    originalSystem = nodes.client.config.system.build.toplevel;
+    c1System = nodes.client_c1.config.system.build.toplevel;
+    c2System = nodes.client_c2.config.system.build.toplevel;
+  in ''
+    $client->start();
+    $client->waitForUnit("default.target");
+    $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_base ]] >&2");
+
+    $client->succeed("${c1System}/bin/switch-to-configuration test >&2");
+    $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c1 ]] >&2");
+    $client->succeed("systemctl status httpd -M test1 >&2");
+
+    $client->succeed("${c2System}/bin/switch-to-configuration test >&2");
+    $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c2 ]] >&2");
+    $client->fail("systemctl status httpd -M test1 >&2");
+    $client->succeed("systemctl status nginx -M test1 >&2");
+  '';
+
+})

From b8556b29958e5e3fa1ea1e07f68684e0cd8e236e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 23 Aug 2017 12:11:31 +0200
Subject: [PATCH 2516/3246] KDevelop: Fixes missing dependencies

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

diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index bbd9be22074..7a241277e8e 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -2,7 +2,7 @@
 , qtquickcontrols, qtwebkit, qttools, kde-cli-tools
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
-, threadweaver, kxmlgui, kwindowsystem, grantlee
+, threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
 , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info
 , libksysguard, konsole, llvmPackages, makeWrapper
 }:
@@ -34,7 +34,7 @@ mkDerivation rec {
     kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
     kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
     threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
-    kdevplatform shared_mime_info libksysguard konsole
+    kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons
   ];
 
   postInstall = ''

From 0cf68303091d727937cf8ef141087809c4da44a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 23 Aug 2017 12:17:32 +0200
Subject: [PATCH 2517/3246] LXQT-config: Adds patch for Cmake >3.8

---
 pkgs/desktops/lxqt/core/lxqt-config/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index 7b38d2eec6f..20e785ec5fd 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -45,4 +45,13 @@ stdenv.mkDerivation rec {
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo ];
   };
+
+  patches = [
+    # Fixes a FTBFS with CMake v3.8
+    (fetchpatch {
+       url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch;
+       sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf";
+     })
+  ];
+
 }

From 2f2275bb8cc4fe1fa6a3cf2611ecd7d681b1519b Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Wed, 23 Aug 2017 11:36:24 +0100
Subject: [PATCH 2518/3246] ImageMagick: allow building on aarch64

---
 pkgs/applications/graphics/ImageMagick/7.0.nix     | 1 +
 pkgs/applications/graphics/ImageMagick/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 5524f12077f..cd99861ea7b 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -10,6 +10,7 @@ let
     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 if stdenv.system == "aarch64-linux" then "aarch64"
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 48a29e147f0..d4e2bbc371a 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -10,6 +10,7 @@ let
     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 if stdenv.system == "aarch64-linux" then "aarch64"
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {

From d5743c08a22299a53d8e6c8ff720bf3af40411af Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 23 Aug 2017 13:00:22 +0200
Subject: [PATCH 2519/3246] pythonPackages.todoist: Init at 7.0.17.

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

diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix
new file mode 100644
index 00000000000..86dfe5d7f89
--- /dev/null
+++ b/pkgs/development/python-modules/todoist/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, python, buildPythonPackage
+, requests }:
+
+buildPythonPackage rec {
+  pname = "todoist-python";
+  version = "7.0.17";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/t/${pname}/${name}.tar.gz";
+    sha256 = "0gs4vlvvmkz627ybswj0l6m3c8dyrqgfqjlawbc8d9rkx88srkr2";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = {
+    description = "The official Todoist Python API library";
+    homepage = http://todoist-python.readthedocs.io/en/latest/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e14cd930394..8552ebc15f5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28729,6 +28729,8 @@ EOF
     };
   };
 
+  todoist = callPackage ../development/python-modules/todoist { };
+
   zxcvbn-python = callPackage ../development/python-modules/zxcvbn-python { };
 
   incremental = callPackage ../development/python-modules/incremental { };

From fbaa12bad90e3c8726a5427fdd981dc60c7f08ff Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Wed, 23 Aug 2017 11:58:19 +0200
Subject: [PATCH 2520/3246] thrift: 0.9.3 -> 0.10.0

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

diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index e48ce231590..4b299eedbd9 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "thrift-${version}";
-  version = "0.9.3";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz";
-    sha256 = "17lnchan9q3qdg222rgjjai6819j9k755s239phdv6n0183hlx5h";
+    sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292";
   };
 
   #enableParallelBuilding = true; problems on hydra

From b438d394ceb1273de5838b1d6dc81fa46cb30381 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 22 Aug 2017 19:49:25 -0500
Subject: [PATCH 2521/3246] idrisPackages.idris: 1.0 -> 1.1.1

---
 .../haskell-modules/configuration-common.nix     |  5 +++++
 .../idris-modules/build-builtin-package.nix      |  7 +++++--
 .../idris-modules/build-idris-package.nix        | 13 +++++++------
 pkgs/top-level/all-packages.nix                  | 16 +++++++++++++++-
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8ab751166c5..9f05dd4720d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -697,6 +697,11 @@ self: super: {
   # test suite cannot find its own "idris" binary
   idris = doJailbreak (dontCheck super.idris);
 
+  idris_1_1_1 = overrideCabal (doJailbreak (dontCheck super.idris_1_1_1)) (drv: {
+    # The standard libraries are compiled separately
+    configureFlags = (drv.configureFlags or []) ++ [ "-fexeconly" ];
+  });
+
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;
 
diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix
index defe8765403..6de3f8b1666 100644
--- a/pkgs/development/idris-modules/build-builtin-package.nix
+++ b/pkgs/development/idris-modules/build-builtin-package.nix
@@ -13,8 +13,11 @@ build-idris-package {
   inherit (idris) src;
 
   postUnpack = ''
-    mv $sourceRoot/libs/${name} $IDRIS_LIBRARY_PATH
-    sourceRoot=$IDRIS_LIBRARY_PATH/${name}
+    sourceRoot=$sourceRoot/libs/${name}
+  '';
+
+  postPatch = ''
+    sed -i ${name}.ipkg -e "/^opts/ s|-i \\.\\./|-i $IDRIS_LIBRARY_PATH/|g"
   '';
 
   meta = idris.meta // {
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index a00f5e74b84..9dfa3430ed8 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -4,8 +4,13 @@
 #       name and src.
 { stdenv, idris, gmp }: args: stdenv.mkDerivation ({
   preHook = ''
-    mkdir idris-libs
+    # Library import path
     export IDRIS_LIBRARY_PATH=$PWD/idris-libs
+    mkdir -p $IDRIS_LIBRARY_PATH
+
+    # Library install path
+    export IBCSUBDIR=$out/lib/${idris.name}
+    mkdir -p $IBCSUBDIR
 
     addIdrisLibs () {
       if [ -d $1/lib/${idris.name} ]; then
@@ -16,10 +21,6 @@
     envHooks+=(addIdrisLibs)
   '';
 
-  configurePhase = ''
-    export TARGET=$out/lib/${idris.name}
-  '';
-
   buildPhase = ''
     ${idris}/bin/idris --build *.ipkg
   '';
@@ -33,7 +34,7 @@
   '';
 
   installPhase = ''
-    ${idris}/bin/idris --install *.ipkg
+    ${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR
   '';
 
   buildInputs = [ gmp ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 372d346aeec..8fd3176a660 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5646,7 +5646,21 @@ with pkgs;
   icedtea_web = icedtea8_web;
 
   idrisPackages = callPackage ../development/idris-modules {
-    inherit (haskellPackages) idris;
+    idris =
+      let
+        inherit (self.haskell) lib;
+        haskellPackages = self.haskellPackages.override {
+          overrides = self: super: {
+            binary = lib.dontCheck self.binary_0_8_5_1;
+            cheapskate = self.cheapskate_0_1_1;
+            idris = self.idris_1_1_1;
+            parsers = lib.dontCheck super.parsers;
+            semigroupoids = lib.dontCheck super.semigroupoids;
+            trifecta = lib.dontCheck super.trifecta;
+          };
+        };
+      in
+        haskellPackages.idris;
   };
 
   intercal = callPackage ../development/compilers/intercal { };

From 7d735d6834711b9e67e4b8a3a8805e2170d4a2e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 23 Aug 2017 12:13:43 +0200
Subject: [PATCH 2522/3246] Kde-Frameworks: Increases the minimum qt version to
 5.7

---
 pkgs/development/libraries/kde-frameworks/attica.nix            | 2 +-
 pkgs/development/libraries/kde-frameworks/bluez-qt.nix          | 2 +-
 pkgs/development/libraries/kde-frameworks/karchive.nix          | 2 +-
 pkgs/development/libraries/kde-frameworks/kcodecs.nix           | 2 +-
 pkgs/development/libraries/kde-frameworks/kconfig.nix           | 2 +-
 pkgs/development/libraries/kde-frameworks/kcoreaddons.nix       | 2 +-
 pkgs/development/libraries/kde-frameworks/kdbusaddons.nix       | 2 +-
 pkgs/development/libraries/kde-frameworks/kdnssd.nix            | 2 +-
 pkgs/development/libraries/kde-frameworks/kguiaddons.nix        | 2 +-
 pkgs/development/libraries/kde-frameworks/ki18n.nix             | 2 +-
 pkgs/development/libraries/kde-frameworks/kidletime.nix         | 2 +-
 pkgs/development/libraries/kde-frameworks/kitemmodels.nix       | 2 +-
 pkgs/development/libraries/kde-frameworks/kitemviews.nix        | 2 +-
 pkgs/development/libraries/kde-frameworks/kplotting.nix         | 2 +-
 pkgs/development/libraries/kde-frameworks/kwayland.nix          | 2 +-
 pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix    | 2 +-
 .../libraries/kde-frameworks/kwindowsystem/default.nix          | 2 +-
 pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix   | 2 +-
 pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix | 2 +-
 pkgs/development/libraries/kde-frameworks/solid.nix             | 2 +-
 pkgs/development/libraries/kde-frameworks/sonnet.nix            | 2 +-
 .../libraries/kde-frameworks/syntax-highlighting.nix            | 2 +-
 pkgs/development/libraries/kde-frameworks/threadweaver.nix      | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index 3c725223979..0766a589a2e 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -4,7 +4,7 @@ mkDerivation {
   name = "attica";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index ec4deae6cb4..9717e770ed5 100644
--- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
@@ -7,7 +7,7 @@ mkDerivation {
   name = "bluez-qt";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtdeclarative ];
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index 1f90db2bc02..8c55f8da6a0 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "karchive";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ bzip2 lzma zlib ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index 6009b5ed73e..978db644a56 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -4,7 +4,7 @@ mkDerivation {
   name = "kcodecs";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools gperf ];
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index 78b554017ee..2650843aa55 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -4,7 +4,7 @@ mkDerivation {
   name = "kconfig";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index 34073d64f89..6658e4dca10 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kcoreaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools shared_mime_info ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index d0c744da886..c94167d5d76 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kdbusaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools qtx11extras ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 9382db43e2d..9e2f827eff5 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kdnssd";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ avahi qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index 5cc7e360782..66cd8ddf64f 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kguiaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtx11extras ];
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 805cb201bd7..3b9ca74bbd0 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "ki18n";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedNativeBuildInputs = [ gettext python ];
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index 69d83eb0ff5..a1e53bb408b 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kidletime";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtx11extras ];
diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index faeb5b16c34..91bc3e2b98d 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kitemmodels";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index c4c0e804e2d..004d1ac77a6 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kitemviews";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index 5ff37fb1db1..380fd8fc5e3 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -6,7 +6,7 @@ mkDerivation {
   name = "kplotting";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index 096100980d6..ee19b39bd15 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kwayland";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ wayland ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index e607f90de8d..63a95bc217c 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kwidgetsaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index fa9078eeb20..ffad3b1a7fd 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kwindowsystem";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools qtx11extras ];
diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index cdf09a48b4f..195e90feef6 100644
--- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "modemmanager-qt";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ modemmanager qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index 3ed56bbf718..4ded321674f 100644
--- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "networkmanager-qt";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ networkmanager qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index 2a9b4fa1a5c..d1beb03fa62 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "solid";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ];
   buildInputs = [ qtdeclarative qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 90e2169c166..cccd9251358 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -7,7 +7,7 @@ mkDerivation {
   name = "sonnet";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ hunspell qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index 82c8f323a0d..ceb8200d4c6 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -6,7 +6,7 @@ mkDerivation {
   name = "syntax-highlighting";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules perl ];
   buildInputs = [ qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index 8861d2853ba..b95f70dd674 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -8,7 +8,7 @@ mkDerivation {
   name = "threadweaver";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase ];

From 916da890273af68bdea8caa9dfde8aac015a9234 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 23 Aug 2017 08:09:10 -0400
Subject: [PATCH 2523/3246] airsonic: init at 10.0.0

---
 pkgs/servers/misc/airsonic/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/servers/misc/airsonic/default.nix

diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix
new file mode 100644
index 00000000000..d52153cbf4e
--- /dev/null
+++ b/pkgs/servers/misc/airsonic/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "airsonic-${version}";
+  version = "10.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war";
+    sha256 = "0ldqccdm7z25my0wmispbshnn26l50a61q2ig2yl0krx4lmhfams";
+  };
+
+  buildCommand = ''
+    mkdir -p "$out/webapps"
+    cp "$src" "$out/webapps/airsonic.war"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Personal media streamer";
+    homepage = https://airsonic.github.io;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ disassembler ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73aba9ab34d..b1080c92a4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -412,6 +412,8 @@ with pkgs;
 
   airfield = callPackage ../tools/networking/airfield { };
 
+  airsonic = callPackage ../servers/misc/airsonic { };
+
   aj-snapshot  = callPackage ../applications/audio/aj-snapshot { };
 
   albert = libsForQt5.callPackage ../applications/misc/albert {};

From 373970d9137e950b616a66a251844571e284d1b8 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Wed, 23 Aug 2017 15:20:09 +0200
Subject: [PATCH 2524/3246] pythonPackages.dropbox: 3.37 -> 8.0.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 2e31987a8cf..3eeb6cd1aa0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6181,12 +6181,12 @@ in {
 
   dropbox = buildPythonPackage rec {
     name = "dropbox-${version}";
-    version = "3.37";
-    #doCheck = false; # python 2.7.9 does verify ssl certificates
+    version = "8.0.0";
+    doCheck = false; # Set DROPBOX_TOKEN environment variable to a valid token.
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/dropbox/${name}.tar.gz";
-      sha256 = "f65c12bd97f09e29a951bc7cb30a74e005fc4b2f8bb48778796be3f73866b173";
+      sha256 = "0bixx80zjq0286dwm4zhg8bdhc8pqlrqy4n2jg7i6m6a4gv4gak5";
     };
 
     propagatedBuildInputs = with self; [ requests urllib3 mock setuptools ];

From d89ca3d65bc3a02307e7d3052bc2f1e52be2fd1f Mon Sep 17 00:00:00 2001
From: Glenn Searby <glenn.searby@gmail.com>
Date: Wed, 23 Aug 2017 14:31:04 +0100
Subject: [PATCH 2525/3246] Python linode-api: 4.1.1b2 -> 4.1.2b0

This change is needed as the web API which this Python client depends on
has changed and broken basic functionality.
---
 pkgs/development/python-modules/linode-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index a89596828f6..45c33f94b28 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "4.1.1b2"; # NOTE: this is a beta, and the API may change in future versions.
+  version = "4.1.2b0"; # NOTE: this is a beta, and the API may change in future versions.
   name = "${pname}-${version}";
 
   disabled = (pythonOlder "2.7");
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lfqsll3wv1wzn98ymmcbw0yawj8ab3mxniws6kaxf99jd4a0xp4";
+    sha256 = "19yzyb4sbxib8yxmrqm6d8i0fm8cims56q7kiq2ana26nbcm0gr4";
   };
 
   meta = {

From 1ff237912ae5c1c1daa14f2106394e124279ce46 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 23 Aug 2017 16:14:38 +0200
Subject: [PATCH 2526/3246] skikit-learn: 0.18.1 -> 0.19.0

---
 .../python-modules/scikitlearn/default.nix           | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index 6ac787bc82b..eb669adff45 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -6,23 +6,15 @@
 
 buildPythonPackage rec {
   pname = "scikit-learn";
-  version = "0.18.1";
+  version = "0.19.0";
   name = "${pname}-${version}";
   disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c";
+    sha256 = "07q261l9145c9xr8b4pcsa08ih1ifhclp05i4xwg43cyamkwpx94";
   };
 
-  patches = [
-    # python 3.6 test fixes (will be part of 0.18.2)
-    (fetchpatch {
-       url = https://github.com/scikit-learn/scikit-learn/pull/8123/commits/b77f28a7163cb4909da1b310f1fb741bee3cabfe.patch;
-       sha256 = "1rp6kr6hiabb6s0vh7mkgr10qwrqlq3z1fhpi0s011hg434ckh19";
-     })
-  ];
-
   buildInputs = [ nose pillow gfortran glibcLocales ];
   propagatedBuildInputs = [ numpy scipy numpy.blas ];
 

From bd879d2bef70591766057da7927f89eeeeaf7078 Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@univ-littoral.fr>
Date: Wed, 23 Aug 2017 16:41:16 +0200
Subject: [PATCH 2527/3246] eigen: fix configuration file for pkg-config

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

diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index 582b4fed9df..94652b12934 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -13,7 +13,11 @@ stdenv.mkDerivation {
   };
   
   nativeBuildInputs = [ cmake ];
-  
+
+  postInstall = ''
+    sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc
+  '';
+   
   meta = with stdenv.lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;

From 508c9983183b0108c589409c39eb54900898431b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 23 Aug 2017 22:50:06 +0800
Subject: [PATCH 2528/3246] add apache2 license

---
 lib/licenses.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 552874325d4..f93a3998edd 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -29,6 +29,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     inherit (agpl3) url;
   };
 
+  apache2 = spdx {
+    spdxId = "Apache-2.0";
+    fullName = "Apache License 2.0";
+  };
+
   amazonsl = {
     fullName = "Amazon Software License";
     url = http://aws.amazon.com/asl/;
@@ -408,7 +413,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     url = "https://raw.githubusercontent.com/raboof/notion/master/LICENSE";
     fullName = "Notion modified LGPL";
   };
-  
+
   ofl = spdx {
     spdxId = "OFL-1.1";
     fullName = "SIL Open Font License 1.1";

From 9f2ef9c25b6b80cb70e2ce7cb3c78b4d1dec3b6b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 23 Aug 2017 22:50:15 +0800
Subject: [PATCH 2529/3246] dbus-broker: init at 3

---
 .../os-specific/linux/dbus-broker/default.nix | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/os-specific/linux/dbus-broker/default.nix

diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
new file mode 100644
index 00000000000..e5552960851
--- /dev/null
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchgit, fetchFromGitHub, meson, ninja, pkgconfig
+, dbus, glib, systemd }:
+
+stdenv.mkDerivation rec {
+  name = "dbus-broker-${version}";
+  version = "3";
+
+  src = fetchFromGitHub {
+    owner           = "bus1";
+    repo            = "dbus-broker";
+    rev             = "v${version}";
+    sha256          = "1f2vw5b2cbdgd3g7vnzwr9lsw9v4xc5nc0nf9xc3qb5xqzsq7v7i";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+  buildInputs = [ dbus glib systemd ];
+
+  prePatch = ''
+    substituteInPlace meson.build \
+      --replace "dep_systemd.get_pkgconfig_variable('systemdsystemunitdir')" "'$out/lib/systemd/system'" \
+      --replace "dep_systemd.get_pkgconfig_variable('systemduserunitdir')"   "'$out/lib/systemd/user'"
+  '';
+
+  preConfigure = ''
+    mkdir build
+    meson --prefix "$out" --buildtype=release build/
+  '';
+
+  buildPhase = "ninja -C build";
+
+  installPhase = ''
+    ninja -C build install
+    install -Dm644 README $out/share/doc/dbus-broker/README
+  '';
+
+  checkPhase = "ninja -C build test";
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Linux D-Bus Message Broker";
+    homepage    = https://github.com/bus1/dbus-broker/wiki;
+    license     = licenses.apache2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8461b88299..37c7281b42a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -926,6 +926,8 @@ with pkgs;
 
   devmem2 = callPackage ../os-specific/linux/devmem2 { };
 
+  dbus-broker = callPackage ../os-specific/linux/dbus-broker {};
+
   ioport = callPackage ../os-specific/linux/ioport {};
 
   diagrams-builder = callPackage ../tools/graphics/diagrams-builder {

From f15d7388d8ea60f77e3feedc6affc4255ee0a17c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 23 Aug 2017 23:50:28 +0800
Subject: [PATCH 2530/3246] Revert "add apache2 license"

This reverts commit 508c9983183b0108c589409c39eb54900898431b.
---
 lib/licenses.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index f93a3998edd..552874325d4 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -29,11 +29,6 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     inherit (agpl3) url;
   };
 
-  apache2 = spdx {
-    spdxId = "Apache-2.0";
-    fullName = "Apache License 2.0";
-  };
-
   amazonsl = {
     fullName = "Amazon Software License";
     url = http://aws.amazon.com/asl/;
@@ -413,7 +408,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     url = "https://raw.githubusercontent.com/raboof/notion/master/LICENSE";
     fullName = "Notion modified LGPL";
   };
-
+  
   ofl = spdx {
     spdxId = "OFL-1.1";
     fullName = "SIL Open Font License 1.1";

From 2724f6539207339e20da337d7b36a470326e998b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 23 Aug 2017 23:51:00 +0800
Subject: [PATCH 2531/3246] dbus-broker: use the proper license

---
 pkgs/os-specific/linux/dbus-broker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index e5552960851..3dd63cf02e4 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Linux D-Bus Message Broker";
     homepage    = https://github.com/bus1/dbus-broker/wiki;
-    license     = licenses.apache2;
+    license     = licenses.asl20;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ peterhoeg ];
   };

From f9a42ed10e6b1da2eabbd6d63d14ef2c41f4c9b4 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Wed, 23 Aug 2017 12:33:39 -0400
Subject: [PATCH 2532/3246] Slack: 2.6.2 -> 2.7.1

---
 .../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 5a477b2a591..f36f0956f65 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.6.2";
+  version = "2.7.1";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -46,7 +46,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "01zdzzpnv8qpmcpy6h9x7izrnwm0y015j5p5rnjwx8ki712wnmm8";
+        sha256 = "1na163lr0lfii9z1v4q9a3scqlaxg0s561a9nhadbqj03k74dw6s";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";

From 85329b96e0998ea381aaa6021892aae7bdb93504 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 23 Aug 2017 08:09:48 -0400
Subject: [PATCH 2533/3246] nixos/airsonic: add module

---
 nixos/modules/module-list.nix            |   1 +
 nixos/modules/services/misc/airsonic.nix | 117 +++++++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 nixos/modules/services/misc/airsonic.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b1efa10aecd..881cafe05ad 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -268,6 +268,7 @@
   ./services/mail/rspamd.nix
   ./services/mail/rmilter.nix
   ./services/mail/nullmailer.nix
+  ./services/misc/airsonic.nix
   ./services/misc/apache-kafka.nix
   ./services/misc/autofs.nix
   ./services/misc/autorandr.nix
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
new file mode 100644
index 00000000000..b0dc3d9ec46
--- /dev/null
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -0,0 +1,117 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.airsonic;
+in {
+  options = {
+
+    services.airsonic = {
+      enable = mkEnableOption "Airsonic, the Free and Open Source media streaming server (fork of Subsonic and Libresonic)";
+
+      user = mkOption {
+        type = types.str;
+        default = "airsonic";
+        description = "User account under which airsonic runs.";
+      };
+
+      home = mkOption {
+        type = types.path;
+        default = "/var/lib/airsonic";
+        description = ''
+          The directory where Airsonic will create files.
+          Make sure it is writable.
+        '';
+      };
+
+      listenAddress = mkOption {
+        type = types.string;
+        default = "127.0.0.1";
+        description = ''
+          The host name or IP address on which to bind Airsonic.
+          Only relevant if you have multiple network interfaces and want
+          to make Airsonic available on only one of them. The default value
+          will bind Airsonic to all available network interfaces.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 4040;
+        description = ''
+          The port on which Airsonic will listen for
+          incoming HTTP traffic. Set to 0 to disable.
+        '';
+      };
+
+      contextPath = mkOption {
+        type = types.path;
+        default = "/";
+        description = ''
+          The context path, i.e., the last part of the Airsonic
+          URL. Typically '/' or '/airsonic'. Default '/'
+        '';
+      };
+
+      maxMemory = mkOption {
+        type = types.int;
+        default = 100;
+        description = ''
+          The memory limit (max Java heap size) in megabytes.
+          Default: 100
+        '';
+      };
+
+      transcoders = mkOption {
+        type = types.listOf types.path;
+        default = [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ];
+        defaultText= [ "\${pkgs.ffmpeg.bin}/bin/ffmpeg" ];
+        description = ''
+          List of paths to transcoder executables that should be accessible
+          from Airsonic. Symlinks will be created to each executable inside
+          ${cfg.home}/transcoders.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.airsonic = {
+      description = "Airsonic Media Server";
+      after = [ "local-fs.target" "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      script = ''
+        ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
+          -Dairsonic.home=${cfg.home} \
+          -Dserver.address=${cfg.listenAddress} \
+          -Dserver.port=${toString cfg.port} \
+          -Dairsonic.contextPath=${cfg.contextPath} \
+          -Djava.awt.headless=true \
+          -verbose:gc \
+          -jar ${pkgs.airsonic}/webapps/airsonic.war
+      '';
+
+      preStart = ''
+        # Install transcoders.
+        ${pkgs.coreutils}/bin/rm -rf ${cfg.home}/transcode
+        ${pkgs.coreutils}/bin/mkdir -p ${cfg.home}/transcode
+        for exe in ${toString cfg.transcoders}; do
+            ${pkgs.coreutils}/bin/ln -sf "$exe" ${cfg.home}/transcode
+        done
+      '';
+      serviceConfig = {
+        Restart = "always";
+        User = "airsonic";
+        UMask = "0022";
+      };
+    };
+
+    users.extraUsers.airsonic = {
+      description = "Airsonic service user";
+      name = cfg.user;
+      home = cfg.home;
+      createHome = true;
+    };
+  };
+}

From 2939d8a0490bc40145059998f2dcc0ca0a1857f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 14:26:10 +0200
Subject: [PATCH 2534/3246] hackage2nix: update list of broken builds

---
 .../configuration-hackage2nix.yaml            | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 700219d843e..16e43e3fda3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2911,6 +2911,7 @@ dont-distribute-packages:
   ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asn1-codec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AspectAG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   assimp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3153,6 +3154,7 @@ dont-distribute-packages:
   borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   braid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brainheck:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bravo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3212,6 +3214,7 @@ dont-distribute-packages:
   cabalmdvrpm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-mon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-nirvana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-plan:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-progdeps:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalQuery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3260,8 +3263,12 @@ dont-distribute-packages:
   casr-logbook-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-meta-html:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casr-logbook-meta:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-reports-html:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casr-logbook-reports:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-reports-meta-html:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casr-logbook-reports-meta:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casr-logbook-types:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-cql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-thrift:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassava-megaparsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3376,6 +3383,7 @@ dont-distribute-packages:
   clckwrks-theme-bootstrap:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-clckwrks:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-geo-bootstrap:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cld2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Clean:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clean-unions:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cless:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3385,6 +3393,7 @@ dont-distribute-packages:
   clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   CLI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clingo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippings:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3407,6 +3416,7 @@ dont-distribute-packages:
   clustering:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clustertools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clutterhs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmark-sections:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmathml3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CMCompare:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3787,6 +3797,7 @@ dont-distribute-packages:
   dhall-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhcp-lease-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-boolean:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-contrib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-hsqml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4132,6 +4143,7 @@ dont-distribute-packages:
   ffeed:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fficxx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffmpeg-tutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fgl-extras-decompositions:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fibon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ficketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fields:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4447,6 +4459,7 @@ dont-distribute-packages:
   goatee:                                       [ 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-analytics:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicemanagement:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4465,6 +4478,7 @@ dont-distribute-packages:
   gore-and-ash-sdl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-sync:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   GotoT-transformers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gotta-go-fast:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gpah:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gpio:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Collada:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4504,6 +4518,8 @@ dont-distribute-packages:
   grenade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridbounds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gridland:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GroteTrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-converters:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4597,6 +4613,7 @@ dont-distribute-packages:
   hakyll-contrib-hyphenation:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib-links:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-ogmarkup:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-R:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-sass:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   halberd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4604,6 +4621,7 @@ dont-distribute-packages:
   halipeto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   halive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  halma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-telegram-bot:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaMinitel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4691,6 +4709,7 @@ dont-distribute-packages:
   haskell2010:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell98:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell98libraries:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-abci:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-aliyun:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-awk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-brainfuck:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4740,6 +4759,7 @@ dont-distribute-packages:
   haskell-rules:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskellscrabble:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskellscript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-src-exts-observe:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-prisms:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-qq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-meta-mwotton:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4891,6 +4911,7 @@ dont-distribute-packages:
   hevolisa-dph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hevolisa:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexif:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexml-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-pickle-generic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4932,6 +4953,7 @@ dont-distribute-packages:
   hgearman:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeometric:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgeometry:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgettext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5260,6 +5282,7 @@ dont-distribute-packages:
   hsx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsx-xhtml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsyscall:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsyslog-tcp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsyslog-udp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hszephyr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HTab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5290,6 +5313,7 @@ dont-distribute-packages:
   htzaar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hubris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HueAPI:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  huff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hugs2yc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hulk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HulkImport:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5716,6 +5740,7 @@ dont-distribute-packages:
   legion-discovery:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  leksah-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lendingclub:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lenses:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-properties:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5897,6 +5922,7 @@ dont-distribute-packages:
   machines-zlib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   maclight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  madlang:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mage:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   magico:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   magma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5939,6 +5965,7 @@ dont-distribute-packages:
   mars:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   masakazu-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MASMGen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  master-plan:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   matchers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mathblog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mathlink:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6344,6 +6371,7 @@ dont-distribute-packages:
   objectid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ObjectIO:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  octane:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   octohat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6351,6 +6379,7 @@ dont-distribute-packages:
   oden-go-packages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   off-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   OGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ogmarkup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ohloh-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   oidc-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   oi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6837,6 +6866,7 @@ dont-distribute-packages:
   rasa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rasenschach:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rattletrap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   raven-haskell-scotty:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   raw-feldspar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rawr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6888,6 +6918,7 @@ dont-distribute-packages:
   reflex-gloss-scene:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-orphans:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-sdl2:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ref-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   refresht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7035,6 +7066,7 @@ dont-distribute-packages:
   rsagl-frp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rsagl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rset:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rspp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtorrent-rpc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7622,10 +7654,12 @@ dont-distribute-packages:
   tasty-jenkins-xml:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-laws:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TaxonomyTools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tbox:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tccli:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tcod-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcp-streams-openssl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdd-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7838,6 +7872,7 @@ dont-distribute-packages:
   turingMachine:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   turing-machines:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweet-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-graphics:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-trees:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8003,6 +8038,7 @@ dont-distribute-packages:
   vgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Villefort:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vimus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vintage-basic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]

From 92bc6a7bbc30af2a722d8f207275dd07c59c5bfb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 03:01:06 +0200
Subject: [PATCH 2535/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4.1-5-g0ed67c9 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c3ae828aa934543f1340e8ebec8e8951a64a6298.
---
 .../haskell-modules/hackage-packages.nix      | 442 ++++++++++++++++--
 1 file changed, 408 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e5c748e5dc0..b90e11cc51c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -15879,6 +15879,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SVGFonts_1_6_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
+     , bytestring, cereal, cereal-vector, containers, data-default-class
+     , diagrams-core, diagrams-lib, directory, parsec, split, text
+     , tuple, vector, xml
+     }:
+     mkDerivation {
+       pname = "SVGFonts";
+       version = "1.6.0.2";
+       sha256 = "07rimlhsvb5j77rkp1zw9567lbc0bq6172mzsm3yb4zw6x9aplaa";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         attoparsec base blaze-markup blaze-svg bytestring cereal
+         cereal-vector containers data-default-class diagrams-core
+         diagrams-lib directory parsec split text tuple vector xml
+       ];
+       description = "Fonts from the SVG-Font format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "SVGPath" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -17404,6 +17425,7 @@ self: {
        ];
        description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TeX-my-math" = callPackage
@@ -18280,6 +18302,7 @@ self: {
        homepage = "https://github.com/Chrisr850/Villefort#readme";
        description = "Villefort is a task manager and time tracker written in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Vulkan" = callPackage
@@ -22593,8 +22616,8 @@ self: {
     ({ mkDerivation, base, deepseq, template-haskell, text }:
      mkDerivation {
        pname = "alex-tools";
-       version = "0.2.0.1";
-       sha256 = "1szwa4cz9nx6rxfgg58d3j4q90zv80cvfzaq47bvlb3vb2pai4nh";
+       version = "0.3";
+       sha256 = "119g5am7nr8wbk0gjyia80pkj81p2z9ag3s97vbmzrkfamsjaik0";
        libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
@@ -25051,6 +25074,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amqp-utils" = callPackage
+    ({ mkDerivation, amqp, base, bytestring, connection, containers
+     , data-default-class, process, text, time, tls, x509-system
+     }:
+     mkDerivation {
+       pname = "amqp-utils";
+       version = "0.2.1.4";
+       sha256 = "01q9n53p2797hzsyl0y4w9fi99xhq4n2dad8q8d7a884slv73q8x";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         amqp base bytestring connection containers data-default-class
+         process text time tls x509-system
+       ];
+       description = "Generic Haskell AMQP Consumer";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "amqp-worker" = callPackage
     ({ mkDerivation, aeson, amqp, base, bytestring, data-default
      , exceptions, monad-control, monad-loops, mtl, resource-pool, split
@@ -27578,6 +27619,7 @@ self: {
        homepage = "https://github.com/andrewthad/asn1-codec";
        description = "Encode and decode ASN.1";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asn1-data" = callPackage
@@ -36156,6 +36198,7 @@ self: {
        homepage = "https://github.com/vmchale/brainheck#readme";
        description = "Brainh*ck interpreter in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "break" = callPackage
@@ -36247,7 +36290,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_24" = callPackage
+  "brick_0_24_1" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-clist
      , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
      , template-haskell, text, text-zipper, transformers, vector, vty
@@ -36255,8 +36298,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.24";
-       sha256 = "1zlzxbbsan14n7vnhs1250zq8d504br8grni4vlzk2dp21rikasn";
+       version = "0.24.1";
+       sha256 = "0vjj64h683m28kwhp98crdyywbhpk7q6bx7crg2dr2g2mj41bb58";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38367,6 +38410,7 @@ self: {
        homepage = "https://github.com/hvr/cabal-plan";
        description = "Library and utiltity for processing cabal's plan.json file";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-progdeps" = callPackage
@@ -40055,6 +40099,7 @@ self: {
        homepage = "https://github.com/tonymorris/casr-logbook-meta";
        description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook)";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "casr-logbook-meta-html" = callPackage
@@ -40096,6 +40141,7 @@ self: {
        homepage = "https://github.com/tonymorris/casr-logbook-reports";
        description = "CASR 61.345 logbook (casr-logbook) reports.";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "casr-logbook-reports-html" = callPackage
@@ -40137,6 +40183,7 @@ self: {
        homepage = "https://github.com/tonymorris/casr-logbook-reports-meta";
        description = "Reports on meta-information about entries in a CASR 61.345 logbook (casr-logbook)";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "casr-logbook-reports-meta-html" = callPackage
@@ -40178,6 +40225,7 @@ self: {
        homepage = "https://github.com/tonymorris/casr-logbook-types";
        description = "CASR 61.345 Pilot Personal Logbook";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassandra-cql" = callPackage
@@ -43388,6 +43436,7 @@ self: {
        homepage = "https://github.com/dfoxfranke/haskell-cld2";
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clean-home" = callPackage
@@ -43607,6 +43656,7 @@ self: {
        homepage = "https://github.com/tsahyt/clingo-haskell#readme";
        description = "Haskell bindings to the Clingo ASP solver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {clingo = null;};
 
   "clippard" = callPackage
@@ -44326,6 +44376,7 @@ self: {
        homepage = "http://github.com/aelve/cmark-sections";
        description = "Represent cmark-parsed Markdown as a tree of sections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmath" = callPackage
@@ -54355,6 +54406,28 @@ self: {
        license = "GPL";
      }) {};
 
+  "datarobot" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, microlens
+     , network-uri, safe, scientific, string-conversions, text
+     , unordered-containers, vector, wreq
+     }:
+     mkDerivation {
+       pname = "datarobot";
+       version = "0.1.1";
+       sha256 = "1dcr0jnd7wgxplzfgbkbv79civ80iqzlz2nvp3s6hv5zyzbf2pm9";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions microlens network-uri safe
+         scientific string-conversions text unordered-containers vector wreq
+       ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions microlens network-uri safe
+         scientific string-conversions text unordered-containers vector wreq
+       ];
+       homepage = "https://github.com/orbital/datarobot-haskell#readme";
+       description = "Client for DataRobot API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "datasets" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cassava
      , directory, file-embed, filepath, hashable, microlens
@@ -56837,6 +56910,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -58571,8 +58645,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.7.0";
-       sha256 = "1haasdwmp475crdrqz6krvwn31rq3xl8fp6ihdmq65js4hbd2w02";
+       version = "0.7.1";
+       sha256 = "1syr86zahnj3mcz06nqb7im8yxwwx700wdz18hpiz6a4mlph4f17";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static exceptions hashable mtl network-transport random
@@ -58933,10 +59007,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-simplelocalnet";
-       version = "0.2.3.3";
-       sha256 = "05j3n8gizfx0bbbv4wkqxk8ipbd9jxgg6pw51ap8bqbc5n7lk63v";
-       revision = "1";
-       editedCabalFile = "0w4gz945pv45hkvc73z62xgj2zkm5w73gdhi4lr1w50i4shh7ksc";
+       version = "0.2.4";
+       sha256 = "0ayz2l48ykbsb7wmyf5cl6anmrrr3bxspbadv7nwa1lg74rqpsif";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59051,8 +59123,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-tests";
-       version = "0.4.9";
-       sha256 = "1vpg01klz6yq5jp5wbf4x3608yq5270r5icds3wfn83qxwwpnhd7";
+       version = "0.4.10";
+       sha256 = "08fmyqiwxi0r8v1qndgjnj6gd74982sdailkxv4471kbskhr9dnp";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
@@ -59113,6 +59185,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributed-static_0_3_7" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , rank1dynamic
+     }:
+     mkDerivation {
+       pname = "distributed-static";
+       version = "0.3.7";
+       sha256 = "0aalqhk4d2qbkcxnjn5jnp8m2kbvvl6dm49psfgzpmaixbd6wr45";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq rank1dynamic
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Compositional, type-safe, polymorphic static values and closures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "distribution" = callPackage
     ({ mkDerivation, array, base, containers, MonadRandom, random }:
      mkDerivation {
@@ -61076,8 +61165,8 @@ self: {
      }:
      mkDerivation {
        pname = "dump-core";
-       version = "0.1.3";
-       sha256 = "1innidrmxaqs093pb8g9q7hfmm3kv3przhi34py4sjl256gdwgq0";
+       version = "0.1.3.1";
+       sha256 = "1n0x8p4zzc73ysf18zyrkhwiyz6j4kgwwiml64zm7pyyhskvrh3p";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath ghc monadLib
@@ -66615,6 +66704,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible_0_4_4" = callPackage
+    ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim
+     , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar
+     , tagged, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "extensible";
+       version = "0.4.4";
+       sha256 = "17ggw3znbx0mh29nqg1g1jp571vsbndswgs28zql32s6nkcd1rby";
+       libraryHaskellDepends = [
+         base comonad constraints deepseq ghc-prim monad-skeleton mtl
+         primitive profunctors semigroups StateVar tagged template-haskell
+         transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/fumieval/extensible";
+       description = "Extensible, efficient, optics-friendly data types and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-data" = callPackage
     ({ mkDerivation, base, data-lens, hashable, template-haskell
      , unordered-containers
@@ -66803,8 +66913,8 @@ self: {
     ({ mkDerivation, base, leancheck, speculate, template-haskell }:
      mkDerivation {
        pname = "extrapolate";
-       version = "0.2.2";
-       sha256 = "0187ifx48dlm6grq9bkkavrwrblc5yncj4pd1lq436dwa7b0c4b5";
+       version = "0.2.3";
+       sha256 = "10zzsikammd770pwa3h9cj8ha2dyrcp9111qv9bskvr2bcx8axgq";
        libraryHaskellDepends = [
          base leancheck speculate template-haskell
        ];
@@ -68414,6 +68524,7 @@ self: {
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Graph decomposition algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fgl-visualize" = callPackage
@@ -72429,8 +72540,8 @@ self: {
      }:
      mkDerivation {
        pname = "fswatch";
-       version = "0.1.0.0";
-       sha256 = "13mrpz99sky3m2wfgxqxv475q0mnlpamhak1z20ycg7wdm3k13zw";
+       version = "0.1.0.1";
+       sha256 = "0vmgqcrn60dv02bqbwaypkypgbzjb2nzv56c81drpalqr21ppcry";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74021,6 +74132,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "generic-random_1_0_0_0" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "generic-random";
+       version = "1.0.0.0";
+       sha256 = "16wlfmfms5544aag1bkzaq9wwsd5zkq7mhwlz9fvsngmkbfa07g7";
+       revision = "3";
+       editedCabalFile = "12l53dxv400g9fvz07jv42gn7x6825kxsyvpnhd3snsklvjrhl70";
+       libraryHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
+       homepage = "http://github.com/lysxia/generic-random";
+       description = "Generic random generators";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-records" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -79567,6 +79694,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Analytics SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-android-enterprise" = callPackage
@@ -81276,6 +81404,7 @@ self: {
        homepage = "https://github.com/hot-leaf-juice/gotta-go-fast";
        description = "A command line utility for practicing typing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gpah" = callPackage
@@ -82370,6 +82499,7 @@ self: {
        homepage = "https://github.com/mhwombat/grid#readme";
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gridbounds" = callPackage
@@ -82434,6 +82564,7 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grm" = callPackage
@@ -85383,8 +85514,8 @@ self: {
      }:
      mkDerivation {
        pname = "hail";
-       version = "0.1.0.3";
-       sha256 = "1nh76kk3bfnx802kc6afj6iw1xkj5s4sz07zwmhq32fvqbkmw889";
+       version = "0.2.0.0";
+       sha256 = "1cb1mszlxwx0091f21gyg3zd42r9qz03h04rl65kl3qydnwrmkyh";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -85884,6 +86015,7 @@ self: {
        homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme";
        description = "Integrate ogmarkup document with Hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-sass" = callPackage
@@ -86059,6 +86191,7 @@ self: {
        homepage = "https://github.com/timjb/halma";
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma-gui" = callPackage
@@ -88386,6 +88519,7 @@ self: {
        homepage = "https://github.com/cwgoes/haskell-abci#readme";
        description = "Haskell Application BlockChain Interface (ABCI) Server Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-aliyun" = callPackage
@@ -89343,6 +89477,7 @@ self: {
        homepage = "https://github.com/pepeiborra/haskell-src-exts-observe";
        description = "Observable orphan instances for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts-prisms" = callPackage
@@ -90380,6 +90515,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskey-btree" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, data-ordlist
+     , focus, hashable, HUnit, list-t, mtl, QuickCheck, semigroups, stm
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "haskey-btree";
+       version = "0.1.0.0";
+       sha256 = "1kr9ihgvbxirbvs638y5sfmx41mj685jmcka87ics7w9ppcpkbsw";
+       libraryHaskellDepends = [
+         base binary bytestring containers focus hashable list-t mtl
+         semigroups stm transformers vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers data-ordlist HUnit mtl QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+         transformers vector
+       ];
+       homepage = "https://github.com/haskell-haskey/haskey-btree";
+       description = "B+-tree implementation in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskgame" = callPackage
     ({ mkDerivation, base, containers, haskell98, SDL, SDL-ttf }:
      mkDerivation {
@@ -92938,6 +93097,8 @@ self: {
        pname = "hedgehog";
        version = "0.5";
        sha256 = "02dy5fmwmrjgwj6p8rvr53rg362qayavbc184gf2f9q196rgijpk";
+       revision = "1";
+       editedCabalFile = "13079sdirdzch3r199lyxa7xrcq4xpaayxhdvg8v0d27w9z1chln";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring concurrent-output containers
          directory exceptions lifted-async mmorph monad-control mtl
@@ -94090,6 +94251,7 @@ self: {
        homepage = "https://github.com/pepeiborra/hexml-lens#readme";
        description = "Lenses for the hexml package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat" = callPackage
@@ -94633,6 +94795,7 @@ self: {
        homepage = "https://fstaals.net/software/hgeometry";
        description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgeos" = callPackage
@@ -103713,6 +103876,7 @@ self: {
        homepage = "https://github.com/osa1/hsyslog-tcp#readme";
        description = "syslog over TCP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsyslog-udp" = callPackage
@@ -105175,8 +105339,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2-client";
-       version = "0.2.0.2";
-       sha256 = "07mhaqjlvivk93wia9hlvn9nxfxsqnrbhga0k5jwsgldk229y02p";
+       version = "0.3.0.0";
+       sha256 = "00rchfi3wdyg91hvyinlmvzyl8n6gcd47ycx06n427cvxa3gmz48";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105381,6 +105545,7 @@ self: {
        homepage = "https://github.com/elliottt/huff";
        description = "A fast-foward-based planner";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "huffman" = callPackage
@@ -118909,6 +119074,8 @@ self: {
        pname = "layout-rules";
        version = "0.1.0.1";
        sha256 = "0d296p1lwhcyn1ziqpf0gfp5i0b6lycw7d993gbxrn7lqap7f2mh";
+       revision = "1";
+       editedCabalFile = "00zh22xvwg5fmycj04xsxyyxvl2zjpskcp7wcng86bbwm5kipydh";
        libraryHaskellDepends = [ alex-tools base text ];
        homepage = "https://github.com/elliottt/layout-rules";
        description = "A collection of different layout implementations";
@@ -119567,6 +119734,7 @@ self: {
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lendingclub" = callPackage
@@ -122513,8 +122681,8 @@ self: {
      }:
      mkDerivation {
        pname = "listenbrainz-client";
-       version = "1.0.0";
-       sha256 = "1bqw4n99j9x44j06q94gzvvr3jyrq8vhg4yzgy2cf2wbijahzizr";
+       version = "1.0.1";
+       sha256 = "0xrya35nwfkcx0dd5pislm8kw0pxfsh2azjk0yd7yn1668y2zrxd";
        libraryHaskellDepends = [
          aeson base free freer-effects http-client kan-extensions mtl
          servant servant-client text time transformers
@@ -125528,6 +125696,7 @@ self: {
        homepage = "https://github.com/vmchale/madlang#readme";
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mage" = callPackage
@@ -126884,6 +127053,7 @@ self: {
        homepage = "https://github.com/rodrigosetti/master-plan";
        description = "The project management tool for hackers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mastermind" = callPackage
@@ -129728,6 +129898,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "minio-hs_0_3_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, case-insensitive, conduit
+     , conduit-combinators, conduit-extra, containers, cryptonite
+     , cryptonite-conduit, data-default, directory, exceptions, filepath
+     , http-client, http-conduit, http-types, lifted-async, lifted-base
+     , memory, monad-control, protolude, QuickCheck, resourcet, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text
+     , text-format, time, transformers, transformers-base, xml-conduit
+     }:
+     mkDerivation {
+       pname = "minio-hs";
+       version = "0.3.1";
+       sha256 = "0mrrkd3yl1lbii5gjmhcky3g26anvki3liswrzmfjkff0l7s3riv";
+       libraryHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude resourcet
+         text text-format time transformers transformers-base xml-conduit
+       ];
+       testHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         directory exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude QuickCheck
+         resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         temporary text text-format time transformers transformers-base
+         xml-conduit
+       ];
+       homepage = "https://github.com/minio/minio-hs#readme";
+       description = "A Minio Haskell Library for Amazon S3 compatible cloud storage";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "minions" = callPackage
     ({ mkDerivation, ansi-terminal, base, MissingH, process, time }:
      mkDerivation {
@@ -129982,14 +130187,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_7_2_0" = callPackage
+  "miso_0_7_3_0" = callPackage
     ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers
      , lucid, servant, servant-lucid, text, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.7.2.0";
-       sha256 = "1xg2bvavgpz3b8sgp4lbxszznvcbhhrzsy31lwalv5w1vcfjkwsw";
+       version = "0.7.3.0";
+       sha256 = "0plxc15kx486cwzgbfxyfnxd8y719kz0spb6snfxhy1b4gcmf17q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130076,14 +130281,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mixed-types-num_0_3_1_2" = callPackage
+  "mixed-types-num_0_3_1_3" = callPackage
     ({ mkDerivation, base, convertible, hspec, hspec-smallcheck
      , QuickCheck, smallcheck, template-haskell
      }:
      mkDerivation {
        pname = "mixed-types-num";
-       version = "0.3.1.2";
-       sha256 = "1f0mvk9vkv1zx2a42ljr4dxh1pzg1lh1kgrjydxynwpwrmk7r6km";
+       version = "0.3.1.3";
+       sha256 = "0945zl9g1lpvpgqmaqm168zx6l1zydw9waivh7nm4alfr8awys60";
        libraryHaskellDepends = [
          base convertible hspec hspec-smallcheck QuickCheck smallcheck
          template-haskell
@@ -130836,6 +131041,8 @@ self: {
        pname = "monad-dijkstra";
        version = "0.1.1.0";
        sha256 = "1vchyiaxawjgixxc9b3pssdrdmsy5ji0f3gwwgjr8gp0dp73yki4";
+       revision = "1";
+       editedCabalFile = "1jkxalyj9libzgg1whzp3dw152j8abxng4jm9xrh2y2i48dw412c";
        libraryHaskellDepends = [ base free mtl psqueues transformers ];
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        homepage = "https://github.com/ennocramer/monad-dijkstra";
@@ -137070,6 +137277,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-transport-composed_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, network-transport }:
+     mkDerivation {
+       pname = "network-transport-composed";
+       version = "0.2.1";
+       sha256 = "0i2rwl1hwbp87kvnhfc6h0v2zy1hbfgrz0wx1vicd9m76nzbynx3";
+       libraryHaskellDepends = [ base bytestring network-transport ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Compose network transports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-transport-inmemory" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , network-transport, network-transport-tests, stm
@@ -139556,6 +139776,7 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "octohat" = callPackage
@@ -139709,6 +139930,7 @@ self: {
        homepage = "http://github.com/ogma-project/ogmarkup";
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ohloh-hs" = callPackage
@@ -142404,6 +142626,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "palette_0_1_0_5" = callPackage
+    ({ mkDerivation, array, base, colour, containers }:
+     mkDerivation {
+       pname = "palette";
+       version = "0.1.0.5";
+       sha256 = "04lqmd0c02fp3x57gbga9qf05f4a6hr8p2ywlasm0dkr740m6d3l";
+       libraryHaskellDepends = [ array base colour containers ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Utilities for choosing and creating color schemes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "palindromes" = callPackage
     ({ mkDerivation, array, base, bytestring, containers }:
      mkDerivation {
@@ -146593,8 +146828,8 @@ self: {
        pname = "pgdl";
        version = "10.9";
        sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z";
-       revision = "2";
-       editedCabalFile = "11p3bcr82rm4pry1dqxgnzsgi50qiwma8bvfbm13fq7jy2qj51vq";
+       revision = "3";
+       editedCabalFile = "0ia214ixkjaz26j998visf4x25g12fwb5z6cpi31r7wz5lhz5z39";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -157092,6 +157327,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rank1dynamic_0_4_0" = callPackage
+    ({ mkDerivation, base, binary, HUnit, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "rank1dynamic";
+       version = "0.4.0";
+       sha256 = "07dbfp0sc32q1p8xh4ap8m3b287r9hh4r8vfsrppdm5pabz4nhiw";
+       libraryHaskellDepends = [ base binary ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rank2classes" = callPackage
     ({ mkDerivation, base, doctest, template-haskell, transformers }:
      mkDerivation {
@@ -157508,6 +157761,7 @@ self: {
        homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rattletrap_2_5_2" = callPackage
@@ -159469,6 +159723,7 @@ self: {
        homepage = "https://github.com/schell/reflex-sdl2#readme";
        description = "SDL2 and reflex FRP";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -163825,6 +164080,7 @@ self: {
        homepage = "https://github.com/lovasko/rset";
        description = "Range set";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rspp" = callPackage
@@ -165767,6 +166023,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "schematic_0_1_5_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, hspec-core
+     , hspec-discover, hspec-smallcheck, HUnit, lens, regex-compat
+     , scientific, singletons, smallcheck, smallcheck-series, tagged
+     , text, unordered-containers, validationt, vector, vinyl
+     }:
+     mkDerivation {
+       pname = "schematic";
+       version = "0.1.5.0";
+       sha256 = "1zlpr0mp3qczylyn26chcndmvyn33pb36xh3d339mrbyalvrb5v7";
+       libraryHaskellDepends = [
+         aeson base bytestring regex-compat scientific singletons smallcheck
+         smallcheck-series tagged text unordered-containers validationt
+         vector vinyl
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-core hspec-discover
+         hspec-smallcheck HUnit lens regex-compat singletons smallcheck
+         smallcheck-series tagged text unordered-containers validationt
+         vinyl
+       ];
+       description = "JSON-biased spec and validation tool";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scholdoc" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html
      , blaze-markup, bytestring, containers, criterion, data-default
@@ -178811,6 +179093,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "state-codes" = callPackage
+    ({ mkDerivation, aeson, base, hspec, QuickCheck, shakespeare, text
+     }:
+     mkDerivation {
+       pname = "state-codes";
+       version = "0.1.1";
+       sha256 = "17vfgvwrhx7h9hy6x2w52h326h9ana2gfpgwgd1war0cbws07sna";
+       libraryHaskellDepends = [ aeson base shakespeare text ];
+       testHaskellDepends = [ aeson base hspec QuickCheck text ];
+       homepage = "https://github.com/acamino/state-codes#README";
+       description = "ISO 3166-2:US state codes and i18n names";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "state-plus" = callPackage
     ({ mkDerivation, base, checkers, mtl, QuickCheck }:
      mkDerivation {
@@ -185371,6 +185667,7 @@ self: {
        homepage = "https://github.com/ncrashed/tcod-haskell#readme";
        description = "Bindings to libtcod roguelike engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {tcod = null;};
 
   "tconfig" = callPackage
@@ -189326,9 +189623,11 @@ self: {
        pname = "ticker";
        version = "1.0.0";
        sha256 = "16n1qxhp6i14h636n7r427s89v7z4kmfi7ivc6a0sz6jzh4h5c0d";
+       revision = "1";
+       editedCabalFile = "1d1zj1x0plk3s0jy8ps6mwx94rg82smcmjzb85fwv7dy2dhrkzg7";
        libraryHaskellDepends = [ async base safe-exceptions ];
        testHaskellDepends = [ async base deepseq doctest Glob hspec ];
-       homepage = "https://github.com/kazeula/ticker-hs";
+       homepage = "https://github.com/syocy/ticker-hs";
        description = "A concurrent utility inspired by Ticker in golang";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193166,6 +193465,7 @@ self: {
        homepage = "http://github.com/nick8325/twee";
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tweet-hs" = callPackage
@@ -207308,6 +207608,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xxhash-ffi" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, digest
+     , hashable, hspec, murmur-hash, QuickCheck, xxhash
+     }:
+     mkDerivation {
+       pname = "xxhash-ffi";
+       version = "0.1.0.1";
+       sha256 = "1858lz6w3qabji92vzvqwlg68g0bvy0by2h958rhsaiqd15i1kkx";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq digest hashable murmur-hash
+         xxhash
+       ];
+       homepage = "https://github.com/haskell-haskey/xxhash-ffi#readme";
+       description = "Bindings to the C implementation the xxHash algorithm";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "y0l0bot" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, network
      , old-locale, old-time, safe, split, text, time
@@ -208143,6 +208462,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_4_17_3" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptonite, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, memory
+     , mime-mail, network-uri, nonce, persistent, persistent-template
+     , random, resourcet, safe, shakespeare, template-haskell, text
+     , time, transformers, unordered-containers, wai, yesod-core
+     , yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.17.3";
+       sha256 = "16z4rqzy8gzri6sbgm5cx3vm44myx2bzydfyhi91yd6ravi7rc9i";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptonite data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base memory
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -208937,6 +209286,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_4_15" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.15";
+       sha256 = "107ddpngzwzmslrv1cc82fx775icvjpbsgjhinj7cnmpi3paq3w3";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare
+         template-haskell text time transformers wai xss-sanitize yesod-core
+         yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-bootstrap4" = callPackage
     ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
      mkDerivation {

From 1e4c4ccb5d58e22072d0c9bc0973a6c1212b23b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 14:18:44 +0200
Subject: [PATCH 2536/3246] haskell-distributive: fix build on GHC versions
 older than 8.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 2 +-
 3 files changed, 3 insertions(+), 3 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 74e1c21c581..4e5eabae802 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -183,7 +183,7 @@ self: super: {
 
   # GHC versions prior to 8.x require additional build inputs.
   dependent-map = addBuildDepend super.dependent-map self.semigroups;
-  distributive = addBuildDepend super.distributive self.semigroups;
+  distributive = addBuildDepend (dontCheck 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]);
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 a096dc9ce8c..ccb71773f2b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -96,7 +96,7 @@ self: super: {
   # Needs additional inputs on old 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;
+  distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   void = addBuildDepends super.void (with self; [hashable semigroups]);
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
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 f82bcb4e646..31e56db9223 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -146,7 +146,7 @@ self: super: {
   # Needs additional inputs on old 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;
+  distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;
   QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
   void = addBuildDepends super.void (with self; [hashable semigroups]);
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;

From b8314072f96fb2505f398c2db5ce4ba52fa9b738 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 14:23:17 +0200
Subject: [PATCH 2537/3246] haskell-vector: fix build with ghc-7.8.x and
 earlier

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

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 31e56db9223..3c2f5841452 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -150,6 +150,7 @@ self: super: {
   QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
   void = addBuildDepends super.void (with self; [hashable semigroups]);
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
+  vector = addBuildDepend super.vector self.semigroups;
 
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;

From 074581c1a4f0c3d042a6d21211d70d020711a8d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 14:28:01 +0200
Subject: [PATCH 2538/3246] haskell-comonad: fix build with ghc-7.10.x and
 earlier

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 3 +++
 2 files changed, 6 insertions(+)

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 4e5eabae802..7375072647d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -206,4 +206,7 @@ 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; };
 
+  # The test suite requires Cabal 1.24.x or later to compile.
+  comonad = dontCheck super.comonad;
+
 }
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 3c2f5841452..ca9597de48d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -158,4 +158,7 @@ self: super: {
   # extra-test: <stdout>: hFlush: invalid argument (Bad file descriptor)
   extra = dontCheck super.extra;
 
+  # The test suite requires Cabal 1.24.x or later to compile.
+  comonad = dontCheck super.comonad;
+
 }

From 5f9645ef2ee26da85f4c9b3c1d88fdb6a1c0ac07 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 14:30:10 +0200
Subject: [PATCH 2539/3246] haskell-semigroups: fix build with ghc-7.10.x and
 earlier

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 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 7375072647d..9e3f16a47a3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -196,7 +196,7 @@ self: super: {
   lens = addBuildDepend super.lens self.generic-deriving;
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
-  semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
+  semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]);
   texmath = addBuildDepend super.texmath self.network-uri;
   yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
   # cereal must have `fail` in pre-ghc-8.0.x versions
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 ca9597de48d..0247a5ad1be 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -144,7 +144,7 @@ self: super: {
   unordered-containers = dontCheck super.unordered-containers;
 
   # Needs additional inputs on old compilers.
-  semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]);
+  semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [nats tagged unordered-containers]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
   distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;
   QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);

From b5d486135649a026a62f048c75e55bb89163990b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 14:20:21 +0200
Subject: [PATCH 2540/3246] haskell-text: fix build with GHC 7.6.x and earlier

---
 .../haskell-modules/configuration-ghc-7.0.x.nix     | 13 ++++---------
 .../haskell-modules/configuration-ghc-7.2.x.nix     |  1 +
 .../haskell-modules/configuration-ghc-7.4.x.nix     |  1 +
 .../haskell-modules/configuration-ghc-7.6.x.nix     |  3 ++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 3edbc0d398b..f2e09ee69d6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -64,21 +64,16 @@ self: super: {
   doctest = dontHaddock super.doctest;
   hsdns = dontHaddock super.hsdns;
 
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
   # Newer versions require bytestring >=0.10.
   tar = super.tar_0_4_1_0;
 
-  # Needs void on pre 7.10.x compilers.
+  # These builds need additional dependencies on old compilers.
+  nats_1 = addBuildDepend super.nats_1 self.hashable;
+  nats = addBuildDepend super.nats self.hashable;
   conduit = addBuildDepend super.conduit self.void;
-
-  # Needs tagged on pre 7.6.x compilers.
   reflection = addBuildDepend super.reflection self.tagged;
-
-  # Needs nats on pre 7.6.x compilers.
   semigroups = addBuildDepend super.semigroups self.nats;
+  text = addBuildDepend super.text self.bytestring-builder;
 
   # Newer versions don't compile any longer.
   network_2_6_3_1 = dontCheck super.network_2_6_3_1;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 75e0c9c0bcb..b72f9e4c69f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -77,6 +77,7 @@ self: super: {
   reflection = addBuildDepend super.reflection self.tagged;
   semigroups = addBuildDepend super.semigroups self.nats;
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
+  text = addBuildDepend super.text self.bytestring-builder;
 
   # Newer versions don't compile any longer.
   network_2_6_3_1 = dontCheck super.network_2_6_3_1;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 1b15f4f105b..cf500924223 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -101,6 +101,7 @@ self: super: {
   semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]);
   QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
+  text = addBuildDepend super.text self.bytestring-builder;
 
   # Newer versions don't compile any longer.
   network_2_6_3_1 = dontCheck super.network_2_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 ccb71773f2b..021397de972 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -82,8 +82,9 @@ self: super: {
     postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
   });
 
-  # blaze-builder requires an additional build input on older compilers.
+  # These packages require additional build inputs on older compilers.
   blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder;
+  text = addBuildDepend super.text self.bytestring-builder;
 
   # available convertible package won't build with the available
   # bytestring and ghc-mod won't build without convertible

From a3326e85c078d7dc628ab83a78e2467d528471da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 15:59:49 +0200
Subject: [PATCH 2541/3246] haskell-vector: mark broken on GHC 7.6.x and
 earlier

---
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index cf500924223..b81fd3e8176 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -102,6 +102,7 @@ self: super: {
   QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
   text = addBuildDepend super.text self.bytestring-builder;
+  vector = addBuildDepend super.vector self.semigroups;
 
   # Newer versions don't compile any longer.
   network_2_6_3_1 = dontCheck super.network_2_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 021397de972..8703ca9cb10 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -101,6 +101,7 @@ self: super: {
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   void = addBuildDepends super.void (with self; [hashable semigroups]);
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
+  vector = addBuildDepend super.vector self.semigroups;
 
   # Need a newer version of Cabal to interpret their build instructions.
   cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0;

From 111cff5f0e923e9ac6e9175416c7080089a9a4ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 16:03:24 +0200
Subject: [PATCH 2542/3246] haskell-comonad: fix build with GHC 7.6.x

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

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 8703ca9cb10..a98800e5ca5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -114,4 +114,7 @@ self: super: {
   # Breaks a dependency cycle between QuickCheck and semigroups
   unordered-containers = dontCheck super.unordered-containers;
 
+  # The test suite requires Cabal 1.24.x or later to compile.
+  comonad = dontCheck super.comonad;
+
 }

From 194a779df40312053bb670a5c22c72842429625f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 16:29:10 +0200
Subject: [PATCH 2543/3246] hugs: fix build by un-defining the erroneous
 default for $STRIP

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

diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix
index 14afe0279c3..2177ae22db5 100644
--- a/pkgs/development/interpreters/hugs/default.nix
+++ b/pkgs/development/interpreters/hugs/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation {
 
   postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +";
 
+  preConfigure = "unset STRIP";
+
   configureFlags = [
     "--enable-char-encoding=utf8"       # require that the UTF-8 encoding is always used
     "--disable-path-canonicalization"

From f62ef84f3d5a3047e690b5af16e55d773dfd05bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 16:06:40 +0200
Subject: [PATCH 2544/3246] haskell-semigroupoids: fix build with ghc-7.10.x
 and before

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 1 +
 3 files changed, 3 insertions(+)

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 9e3f16a47a3..18040e9fb3c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -208,5 +208,6 @@ self: super: {
 
   # The test suite requires Cabal 1.24.x or later to compile.
   comonad = dontCheck super.comonad;
+  semigroupoids = dontCheck super.semigroupoids;
 
 }
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 a98800e5ca5..61d7e53be22 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -116,5 +116,6 @@ self: super: {
 
   # The test suite requires Cabal 1.24.x or later to compile.
   comonad = dontCheck super.comonad;
+  semigroupoids = dontCheck super.semigroupoids;
 
 }
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 0247a5ad1be..3914e3d9b93 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -160,5 +160,6 @@ self: super: {
 
   # The test suite requires Cabal 1.24.x or later to compile.
   comonad = dontCheck super.comonad;
+  semigroupoids = dontCheck super.semigroupoids;
 
 }

From c0944b9db06328d9fa38129797a704a794de22b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 16:43:45 +0200
Subject: [PATCH 2545/3246] ghc-6.10.4: mark build as broken

The build calls ar(1) in a way the tool doesn't like:

    ar q cru .libs/libffi.a  src/debug.o src/prep_cif.o src/types.o src/raw_api.o src/java_raw_api.o src/closures.o src/x86/ffi64.o src/x86/unix64.o src/x86/ffi.o src/x86/sysv.o
    ar: creating cru
    ar: .libs/libffi.a: No such file or directory
    make[4]: *** [Makefile:717: libffi.la] Error 1

This may have become an issue after some recent binutils update; I'm not sure.
---
 pkgs/development/compilers/ghc/6.10.4.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix
index d2552b027ac..c56762edd24 100644
--- a/pkgs/development/compilers/ghc/6.10.4.nix
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     description = "The Glasgow Haskell Compiler";
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
     inherit (ghc.meta) license;
+    broken = true;  # https://nix-cache.s3.amazonaws.com/log/6ys7lzckf2c0532kzhmss73mmz504can-ghc-6.10.4.drv
   };
 }

From 73275d4d417c4c08b0b54a3c6ec1083cceafbe65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 Aug 2017 16:46:56 +0200
Subject: [PATCH 2546/3246] halvm-2.4.0: mark build as broken

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

diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index b88ac73c7e4..24fffcf603c 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -49,5 +49,6 @@ stdenv.mkDerivation rec {
     platforms = ["x86_64-linux"];       # other platforms don't have Xen
     maintainers = with stdenv.lib.maintainers; [ dmjio ];
     inherit (bootPkgs.ghc.meta) license;
+    broken = true;  # https://nix-cache.s3.amazonaws.com/log/6i98mhbq9nzzhwr4svlivm4gz91l2w0f-HaLVM-2.4.0.drv
   };
 }

From b6bf1ce319d8a9888cc5fe92be8facc9c677ebf1 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Wed, 23 Aug 2017 20:05:41 +0200
Subject: [PATCH 2547/3246] qt5.qtcharts: enable qml

Dependency qtdeclarative was missing so QML plugin was not built.
---
 pkgs/development/libraries/qt-5/5.9/qtcharts.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix
index 46713eb7a9e..58e197d504f 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtcharts.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtcharts.nix
@@ -1,8 +1,8 @@
-{ qtSubmodule, qtbase }:
+{ qtSubmodule, qtbase, qtdeclarative }:
 
 qtSubmodule {
   name = "qtcharts";
-  qtInputs = [ qtbase ];
+  qtInputs = [ qtbase qtdeclarative ];
   outputs = [ "out" "dev" "bin" ];
   postInstall = ''
     moveToOutput "$qtQmlPrefix" "$bin"

From ff9666772d3473a35d246a38f9cf54563f46ef99 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 23 Aug 2017 14:13:16 -0400
Subject: [PATCH 2548/3246] terraform: Add 0.10.2

---
 .../networking/cluster/terraform/default.nix        | 13 +++----------
 pkgs/top-level/all-packages.nix                     |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a04cbed9610..e86351fcc54 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -55,15 +55,8 @@ in {
     doCheck = false;
   };
 
-  terraform_0_10_0 = generic {
-    version = "0.10.0";
-    sha256 = "1z6pmyfh4z5w8k2j46ancc0m9lsiq6d0m56nxj1kawb3n5q9dgds";
-    # remove debugging and the -dev postfix in the version
-    preBuild = ''
-      buildFlagsArray=(
-        -ldflags
-        "-X github.com/hashicorp/terraform/terraform.VersionPrerelease= -s -w"
-      )
-    '';
+  terraform_0_10_2 = generic {
+    version = "0.10.2";
+    sha256 = "1q7za7jcfqv914a3ynfl7hrqbgwcahgm418kivjrac6p1q26w502";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37c7281b42a..7353b684b56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18927,11 +18927,11 @@ with pkgs;
     terraform_0_8_5
     terraform_0_8_8
     terraform_0_9_11
-    terraform_0_10_0;
+    terraform_0_10_2;
 
   terraform_0_8 = terraform_0_8_8;
   terraform_0_9 = terraform_0_9_11;
-  terraform_0_10 = terraform_0_10_0;
+  terraform_0_10 = terraform_0_10_2;
   terraform = terraform_0_9;
 
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};

From ed9526949f6d17e6df85f111a0443336d124277c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 23 Aug 2017 14:19:55 -0400
Subject: [PATCH 2549/3246] terragrunt: 0.12.25 -> 0.13.0

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

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 71d595cef6f..adbe2ab5a54 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.12.25";
+  version = "0.13.0";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "0j85abmkspbwdijf9dzm37x3ibqd3bhn01qs165433k74f9m500q";
+    sha256 = "18jbz3vchdp5f3f4grl968k706fdcvj71syf7qmriwdyw4ns83wv";
   };
 
   goDeps = ./deps.nix;

From de1a25cd6974c02f16fdd8a1441466d09d9fdc6d Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <phile314@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:23:13 +0200
Subject: [PATCH 2550/3246] nixos/hail: init (#28442)

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/continuous-integration/hail.nix  | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 nixos/modules/services/continuous-integration/hail.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b1efa10aecd..1bb950ca7d6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -165,6 +165,7 @@
   ./services/continuous-integration/buildbot/master.nix
   ./services/continuous-integration/buildbot/worker.nix
   ./services/continuous-integration/buildkite-agent.nix
+  ./services/continuous-integration/hail.nix
   ./services/continuous-integration/hydra/default.nix
   ./services/continuous-integration/gitlab-runner.nix
   ./services/continuous-integration/gocd-agent/default.nix
diff --git a/nixos/modules/services/continuous-integration/hail.nix b/nixos/modules/services/continuous-integration/hail.nix
new file mode 100644
index 00000000000..5d0c3f7b4ab
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/hail.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ...}:
+
+with lib;
+
+let
+  cfg = config.services.hail;
+in {
+
+
+  ###### interface
+
+  options.services.hail = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enables the Hail Auto Update Service. Hail can automatically deploy artifacts
+        built by a Hydra Continous Integration server. A common use case is to provide
+        continous deployment for single services or a full NixOS configuration.'';
+    };
+    profile = mkOption {
+      type = types.str;
+      default = "hail-profile";
+      description = "The name of the Nix profile used by Hail.";
+    };
+    hydraJobUri = mkOption {
+      type = types.str;
+      description = "The URI of the Hydra Job.";
+    };
+    netrc = mkOption {
+      type = types.nullOr types.path;
+      description = "The netrc file to use when fetching data from Hydra.";
+      default = null;
+    };
+    package = mkOption {
+      type = types.package;
+      default = pkgs.haskellPackages.hail;
+      defaultText = "pkgs.haskellPackages.hail";
+      description = "Hail package to use.";
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    systemd.services.hail = {
+      description = "Hail Auto Update Service";
+      wants = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [ nix ];
+      environment = {
+        HOME = "/var/lib/empty";
+      };
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/hail --profile ${cfg.profile} --job-uri ${cfg.hydraJobUri}"
+          + lib.optionalString (cfg.netrc != null) " --netrc-file ${cfg.netrc}";
+      };
+    };
+  };
+}

From dd876330bea3805d05994f5b93d934873701dc91 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 23 Aug 2017 20:24:09 +0200
Subject: [PATCH 2551/3246] prometheus-unifi-exporter: 0.4.0 -> 0.4.0 + fixes

There were several fixes that make the exporter work with new unifi software
However there is not yet a release so I just updated to the latest master.
---
 .../prometheus/unifi-exporter/default.nix     |  8 +-
 .../prometheus/unifi-exporter/deps.nix        | 75 -------------------
 2 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix

diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
index f866df49b54..44a670b95ab 100644
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "unifi-exporter-${version}";
-  version = "0.4.0";
-  rev = version;
+  version = "0.4.0+git1";
+  rev = "9a4e69fdea91dd0033bda4842998d751b40a6130";
 
   goPackagePath = "github.com/mdlayher/unifi_exporter";
 
@@ -11,11 +11,9 @@ buildGoPackage rec {
     inherit rev;
     owner = "mdlayher";
     repo = "unifi_exporter";
-    sha256 = "0mbav3dkrwrgzzl80q590467nbq5j61v5v7mpsbhcn2p7ak0swx4";
+    sha256 = "08zqvwvdqnc301f8jfh7bdvc138szw6xszx884b2v8w2x38w3rmn";
   };
 
-  goDeps = ./deps.nix;
-
   meta = with stdenv.lib; {
     description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices";
     homepage = https://github.com/mdlayher/unifi_exporter;
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix
deleted file mode 100644
index 1de25a21d8c..00000000000
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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 = "c9c7427a2a70d2eb3bafa0ab2dc163e45f143317";
-      sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";
-    };
-  }
-  {
-    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/mdlayher/unifi";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mdlayher/unifi";
-      rev = "418aad77bdb31a9b97d13f79162b0bac1a38bb25";
-      sha256 = "16hv2mk2vl4lcj1qf2wp9psvffz26b5zsajs2yl21rbx0pcwkcp7";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev = "a5060f1eaab721946b185b2de468ff83ea5b89cb";
-      sha256 = "1v9qva9c0wrjkl71b0rvvi1qj7l42gvcsj349r4lg8pwni8i6did";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
-      sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/common";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/common";
-      rev = "49fee292b27bfff7f354ee0f64e1bc4850462edf";
-      sha256 = "01vcjzkxs34yyy402rsbxw3md7ia85ls9yzsxhgddcisa3mq23cj";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev = "a1dba9ce8baed984a2495b658c82687f8157b98f";
-      sha256 = "1k2460bjzsm238sqx7wi42bym5bk7ybdr4qadk9szdbv65hh8vf6";
-    };
-  }
-]

From 71186e73455a4e06e96a31da34b76f84e545ba1f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 18 Aug 2017 13:54:09 -0400
Subject: [PATCH 2552/3246] gcc: Use `configurePlatforms` to control --build,
 --host, and --target

---
 pkgs/development/compilers/gcc/4.5/default.nix      | 4 ++--
 pkgs/development/compilers/gcc/4.8/default.nix      | 4 ++--
 pkgs/development/compilers/gcc/4.9/default.nix      | 4 ++--
 pkgs/development/compilers/gcc/5/default.nix        | 6 ++----
 pkgs/development/compilers/gcc/6/default.nix        | 4 ++--
 pkgs/development/compilers/gcc/7/default.nix        | 4 ++--
 pkgs/development/compilers/gcc/snapshot/default.nix | 4 ++--
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 971726b8ab9..fe0ed930a69 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -73,7 +73,6 @@ let version = "4.5.4";
     crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt");
 
     crossConfigureFlags =
-      "--target=${targetPlatform.config}" +
       withArch +
       withCpu +
       withAbi +
@@ -231,6 +230,8 @@ stdenv.mkDerivation ({
     ++ (optionals langVhdl [gnat])
     ;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if enableMultilib then "" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
@@ -313,7 +314,6 @@ stdenv.mkDerivation ({
       ${if langAda then " --enable-libada" else ""}
       ${if targetplatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
       ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
-      --target=${targetPlatform.config}
     '';
   };
  
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 7a41ba38e51..877b71e0169 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -142,7 +142,6 @@ let version = "4.8.5";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -317,6 +316,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -436,7 +437,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index e45ee0bcc6a..02c8b449567 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -136,7 +136,6 @@ let version = "4.9.4";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -317,6 +316,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -434,7 +435,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 57b68d1a11f..3c613d40dff 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -142,7 +142,6 @@ let version = "5.4.0";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -334,6 +333,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -451,9 +452,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --build=${buildPlatform.config}
-      --host=${hostPlatform.config}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index fa42bb5b851..87c5b11c5e1 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -136,7 +136,6 @@ let version = "6.4.0";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -326,6 +325,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -443,7 +444,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 67b7dee446f..e1206c638f5 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -137,7 +137,6 @@ let version = "7.1.0";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -328,6 +327,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -445,7 +446,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 518ee5c7054..210b51dbca0 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -137,7 +137,6 @@ let version = "7-20170409";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -315,6 +314,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -432,7 +433,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}

From ebc9b161cd184502bf4912b9348a507e2d0540da Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 14:34:33 -0400
Subject: [PATCH 2553/3246] gcc: Add `configurePlatforms` exception for Arm 32

...just as we did for binutils. When the underlying issue is resolved
(probably with a configure script patch or lib/systems/parse.nix
change), this should be reverted.
---
 pkgs/development/compilers/gcc/4.5/default.nix      | 7 ++++++-
 pkgs/development/compilers/gcc/4.8/default.nix      | 7 ++++++-
 pkgs/development/compilers/gcc/4.9/default.nix      | 7 ++++++-
 pkgs/development/compilers/gcc/5/default.nix        | 7 ++++++-
 pkgs/development/compilers/gcc/6/default.nix        | 7 ++++++-
 pkgs/development/compilers/gcc/7/default.nix        | 7 ++++++-
 pkgs/development/compilers/gcc/snapshot/default.nix | 7 ++++++-
 7 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index fe0ed930a69..4c52f4447d5 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -231,7 +231,12 @@ stdenv.mkDerivation ({
     ;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if enableMultilib then "" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 877b71e0169..76fa0b66375 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -317,7 +317,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 02c8b449567..05bdcecb6a5 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -317,7 +317,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 3c613d40dff..90b10f2acbd 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -334,7 +334,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 87c5b11c5e1..bc408e28f58 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -326,7 +326,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index e1206c638f5..78b499f096d 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -328,7 +328,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 210b51dbca0..c7f7b9d970a 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -315,7 +315,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +

From 19677f811bca20c1c3319080f75ec6651b581c14 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Wed, 23 Aug 2017 20:48:56 +0200
Subject: [PATCH 2554/3246] emby: 3.2.26.0 -> 3.2.28.0

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

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 4480d950766..2ba0146520a 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.26.0";
+  version = "3.2.28.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "04d06640g56f894ypxyp7q5ikbp29nw19w6z136b5kdjy97b6idr";
+    sha256 = "0bv0wj7rny3gh4d6qdyd8widd549ap3fl35sz3q6w9x8sqhw5nfi";
   };
 
   buildInputs = with pkgs; [

From a65a499ca285390a0704b254529d1cd9faf48b8f Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <apeyroux@users.noreply.github.com>
Date: Wed, 23 Aug 2017 21:47:47 +0200
Subject: [PATCH 2555/3246] grammalecte: 0.5.17.2 -> 0.5.18 (#28510)

---
 .../python-modules/grammalecte/default.nix          |  5 ++---
 .../python-modules/grammalecte/spellchecker.patch   | 13 -------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/python-modules/grammalecte/spellchecker.patch

diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix
index 526073edd29..a3de4d3f7bc 100644
--- a/pkgs/development/python-modules/grammalecte/default.nix
+++ b/pkgs/development/python-modules/grammalecte/default.nix
@@ -7,17 +7,16 @@
 
 buildPythonPackage rec {
   pname = "grammalecte";
-  version = "0.5.17.2";
+  version = "0.5.18";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip";
-    sha256 = "1g5i978cdz14rfdi4z2ayb2c1rf8cq991slwsv0krhpvl9ripl9c";
+    sha256 = "0izfsqsj8w4awhmwmn4x8wwpqsmqbnfvfafzk93i6yj0l3fn3i97";
   };
 
   propagatedBuildInputs = [ bottle ];
 
-  patches = [ ./spellchecker.patch ];
   preBuild = "cd ..";
   postInstall = ''
     mkdir $out/bin
diff --git a/pkgs/development/python-modules/grammalecte/spellchecker.patch b/pkgs/development/python-modules/grammalecte/spellchecker.patch
deleted file mode 100644
index 151eaa62f4a..00000000000
--- a/pkgs/development/python-modules/grammalecte/spellchecker.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/spellchecker.py b/spellchecker.py
-index 37ac0ea..a60b3a9 100644
---- a/spellchecker.py
-+++ b/spellchecker.py
-@@ -2,7 +2,7 @@
- # Wrapper for the IBDAWG class.
- # Useful to check several dictionaries at once.
- 
--import ibdawg
-+from grammalecte import ibdawg
- 
- 
- dDictionaries = {

From 8b8fa402fea3d741f85491bbbca1e60f48837673 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 23 Aug 2017 21:50:05 +0200
Subject: [PATCH 2556/3246] firefox-beta-bin: 55.0b2 -> 56.0b5

---
 .../browsers/firefox-bin/beta_sources.nix     | 762 +++++++++---------
 1 file changed, 381 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 967fd1e1595..79f56413f4c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,955 +1,955 @@
 {
-  version = "55.0b2";
+  version = "56.0b5";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "7164db8b579c12976ab86770f3c238d8b4b4334a41107f995d03b87c77e7998e1c7d48b36b2305d67f1eddb4d3cbe0b9bfb9c27169abaac00839d90a0e80d38f";
+      sha512 = "01376c4365dc8c5cba1e37708f9a2b2e9408c6a2a06790a433e058dae5d245b35ed1f7e8f573e496442d8657f96db662c540a70c4d6cf8f154ff8cf04b5f06eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "994024e45c16b1dda3680ad4d73fa7a2a84bf43ce3be8df4fa61a695b9041fcdf88ae750c0ab34bf9dd814cbcde10b14832d5b03682e8c83e4dc43a316b6c75f";
+      sha512 = "f502bb10230ee5dba28e7dd84a0d76a9e868c2da99588c00f35492e9c355902cb39d383bf7a8b6440d7e7811e70a7a1945978de0e59a85514eb8c16d939e799c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "dc4a8db0c9bd87ef140d8c2fa2e4deb63e664a97353d88f94f99fd10ed358091a6215b62f8a441ef65dfa6774989ede451e55749bdffb0f670904959f5e8bb70";
+      sha512 = "488e58bde0417b70c7da08ae22c40089f759a5f2919f2a3dad595f880607880e3a4a202944c8d03f71f1d420147fa0e3e896ef88753723d8c4ee92e0c32cdb0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "94d018fe2116733bd14daf51d9d9f09022a745b3797773422ac79511a8fd1e14e9fea879f7873c1043e0b63d2df4425c806645467764325400f71600a2f1cc1c";
+      sha512 = "96d1f3dba912702eb6d467ff1be67fae112b82a77620a53125aaa861c241bcaeb441c73339e20fbc5c41eb8883a370c2371b4a3d7b0af04555dc07bff5f1cd78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "6b5811c9ec50be18a34e0102438e95fea58c8667a0a19c9c4c5f4ac93c8ae8b9cd929252c81de7f19a15b82ed6a01e8fe37fda7aafc63cac223cc09b1d9dbd11";
+      sha512 = "75873538776101e59c5544aa644bf563bd7bc0b3882f43e9d3ada94cdcb39d3ca2d34cd796445fb680f81bdfa1604cf6bc7b79175625b5e56ea12a6790171c2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "4deb4aff290277f870d5c3148e375a9bd2071b455ff93f10e28c9afe149a8f11689bef936db8a87c0fd4cda5bdda70aced4580395343916e7510ab7970269fdd";
+      sha512 = "84b975021ff95e4d0490d82ce7666539f7806b8563ab42cf9a8139db06f3558a4680d33840405a497e92ed5f2366af979ae0bc8d188be3c3015131f4459c1a1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "3cf69626fbcd8667c83978e540cf0e8e0123408dd080073e95f543a0c98085320bd95caf77fb814002e45694cefa5542c6d436d258c66abb8435d52ce85f111c";
+      sha512 = "3989e10d2884c827a82f8202cd440b9f5867e6af38cfa952848789cb855963e2ed75a13b029d47ca04a93a0bf94d53e7e1dc253e913edef6e45922a0b05bbce7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "0318b4bbf69fda1586665dbe7626d4ba1c4768acf310b5bcb0d49c1212199704d4f0c0da6dcd99f75dd7871d39a4725497c47ec2f980b1c458b101a4e18531e5";
+      sha512 = "3fa693d5d909a32bf206e81f69a1bae19560a6e4d281d1c023d956e890089e3bd4f006b3b44b9186f7f50bcb6566dd375386aff634171cc9cc27955a4ac64043";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "0de32e72eba0fae0e19c1d1cf8e8f8f99926d66df6831317742a74bd0e90f909cd4a55432f9fde3e25c33e37160f5e92d0ca97b2236089d4059c5789e89823f7";
+      sha512 = "e595c12a4c0e542be9954b3ae633f55d94bd9b402e854dae04c16d9c2c4e28814e31dc48e669ddca2bb76a55191b223f225e01cd6c23010725da0e8c29ce111e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "333b28b03e6a4612b0e5636e14bc83d6e152237fbcd4129acf25767f3049835bf262040caacba1976d2791ec06fa89e3c70ed1abea414bbf4289729296099993";
+      sha512 = "af7f0023f5abb0ea9446380165c9c955a0bfe824377a3ebdfefcfc5dee079aabf317c832de459da41d330697c69ba3f4519136ea5922fe26827745f2b8567bb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "ba989a0555fdc40e9ce9d834eef26b19c30b19616d85b5864d26253572fd79bf02b7a0b9bfd00dddaa192950c7f9d52c20887569b7cad8b03622ac0df55baadb";
+      sha512 = "5911b03099379731bde2c904ed11e5eef69e6d53a1492cb07c4d1ee6f3747fd891ef34a168adea716d867b9ab02ce0faaeff2f60a47ab0863abe0578e5829ea6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "e43ec7e1ba0d977938e5a1bc3f985196211fb6587c44018958f750b35fea78f2dd94a8fbd1b91f70e41c3f3cc0da194bed76306d4b63bca3dfde7a65a6a7532a";
+      sha512 = "2e8c4776671c29b4d885c8ebd87ae107656117d826081230890c6deabd0106b75d53334a718b36a2cec4ef9060bfc9c1a4f1d3543d13fc17218ad594f4d0f0cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "7ed042ecf92e7f873f93e0f6a7ab27418e960adcc2417e18fe9ee8b468157af85dfbd8e56df7f0dba97027b3a38aeb6279d81451579cc97a9fec814064b74e58";
+      sha512 = "e1bc29dfad9794ba95f81f611cd9075550024976651812053b1e976fa7c9e6aafb5d375c30d6164afd93255830a5d336a5c2522199701bd26bedcc6cdab7177f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "0953320dfdebfda3b2f135fb5277ebbdcae1c13f431b4452e0398515d990fd6faa8137dd4f49bf4336b385c70422f340e0bd8a466c07f76146d9ff32655cbe1d";
+      sha512 = "4122426fc6b58472f4c57c03618f7b1039958a5e5e66309472279a59df077ef08eabee1237c59fa5ede0ea18b927b60a9ed8319cbb396c5b204d6b55842b4d51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e79e1e6a2784e3e61637624ddd8b628b784090c61daa35d36a3ebbb68db1801ead01b86bb04d7b2bb3037fb53b42197a50de78013afcc2443136b65df6f0b9dc";
+      sha512 = "d1c0dc77a7a06d5fcbe231c5ee3802aae200f578febb77c41c675a5a525675442772e585fc399ff79777ab66516df4ec05c0a22348fbbc29594ca0cfa35b3b7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "c48991f37c786982f90ba12d43120dbefdc046d30c9ccbba630224b1f08dbce2b73eb4456e1b588f5ca0518ad19b8148e9dd5cf4a9f47f8d4ca0e90e2988f18d";
+      sha512 = "8934f3b7d2644dab828090e8aa6a2edfe1b21efc95d63b1a7821dd9c4cb9367d1a387d97e2a8c54f4815877533e9e20a4a0bf49446d9429f4519f28fd382e128";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a01937ba6f1e56b34ed4d16acbfa336338391c8fe4e33e5f06ec2a35c3c6010a35f20f7949ef1f6d50c9d6f6d9db115eb95cac50762d7d6a3b642f78192a6b4c";
+      sha512 = "d072efc296e744273c081b1fa78348c9b48137d0d42ef8aaa26f1607768af3dd62179c693bca567c4fde993f913da856ea36af350fc90df18d8e726f227b44ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "d7861e3765acac1e8e5a1b302986fcfbdc262a22308ead2239e7acb3617534f1b8bc101c2ca6d5aa1758bc13a6cac5f31fa062dd31ef239113cc815c9d4d22a5";
+      sha512 = "358d83de5408d2cfeef5b8e77054b528ed736a0b2552e93d7cae405d346dcf3a4ebe3470612cdf37170ef9e4ec00c87b23ececbf07bc07f67fbfe013576278dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "2b6efac1ab738f42fe52a6c8e4bd20fea1e044577a4dd82fea54ef403adf2ea9f7cb64268de68dc55799afd3f5e90f724c98b9f705affc704e1a58118c674dac";
+      sha512 = "02045240e122fb3f8339c8c09f90ced093d8c92d80f65ed03d922ebd10e454bf9b8d25df36eb8548f1249f43cb8f5d91f50993ec3623e5107115dee9de405b89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "c5de911eea687279d6d14b8dc745597c6450c733cc332e104de6ebd9a7a64b877474fb0da0bbe59ef4c8424549eff4fc6b57a93379c09df00fda761bc7347e54";
+      sha512 = "eaa5f2e6f2fd7447f79c9bebf8046ab05ab67f5717c15f01af676c3b384750b7929fea818bf064b2949dfc0cf36cd4e12f17c4c11c5f7a563474666b217b4ed9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "b531426207bf42f74f87ba8807441926f9476f0f15caf8a21594d099992c7c91d2cda6d71d318d899863185bdf776f4bf46820fff77b37f8a95c52f570f9247d";
+      sha512 = "93573cdb8088effd34206a9525bec895aed4920c878ec77fe847871c4e01d70ed35cd00aee4311e3409beb04e2f3aa4504c6bdb9b16f05b4540093db2d0924e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "4c1c99501cf1ff1320d27c7709d9572837a1a1fb7d8dea4578075836e013b5fd79c84afababb45bbb5cf95655b51b0503ac45023746ff6d4831bda93c493e539";
+      sha512 = "765e34242d93d6f53fb59d9400444e8d236b11b5ef9335324e6b0fb57c04036121935e88068fc13dc669e0fcae50d0e84cd4b393b47689d2204aec86d4daf48c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "82678293b35fe73c27c5842589de97858a8cb5186d7f1309693f16a516ddd62a59bd96e84358571367b706354625a98bec7fff9f7c598c96f025594baad44aa2";
+      sha512 = "bbcdf507dec439732a4c3c030c876c135d99126c9b35df52b6ad377575b971931eda12b9ec446be768058edc71d7331fbd1635b39baf837fc428887edbc8d5bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ded063ef65018cb0b138298b9e9df9a2aedaadf92d5c77248120cee6504542d18967b01c1bf497e264a9aeac7c119c8bc9885fb202dd0abcb0ba00344ad30397";
+      sha512 = "06d2e4cbf018dbff55d8f91e3ad9754b6a191cf9cf22ba38eb316421f732141e44c3d3b4b475e97e548ac8701652f2e9887be3789d78c9f06bcb9d1fdd4e5156";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "205dc910f37c5501b27ff044f5bbb197fd4bbc3d8a5512ea01b0b4c155cd8b2f19eb6c400cb999a6136f2534ac0ede511ddf827ffd59f97ba00b538852c9a0a7";
+      sha512 = "9612deca064158eb9981a24946ab612b472c48a897aeeb22729677cd86a8209b85e75a3f89a408de4823947ad28fb2b0c66541e27433236aaf337ceef02166cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "95a026ce800722d1e89237a675a58fee8243e5b4a900d1ce42a4f139dbb43e940478660f78d9c4593b9d09af7c3dc843984b7a362b465d99317aba9bb213b371";
+      sha512 = "a507fc11e9a528afd89c32fdc1bfc1255edace78cb11db1b238cde52ee113f6ffc2506908ad4d1331c3b80655de193b4c5b3890c979953cc01711fb2a7d9cad1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "42f0703824210feedd7da2f78a4d0823d1d0f3b23d4edaa07d63a5021847ba55871fec33676915b9f2b411ebd9cdf31de155f2de0a47586428bf0e1a3fe7457e";
+      sha512 = "028aa444658a288ce5fe84825aad85a340ab36383d04012a8dd93fc057cd3d2ad2084c84db87bbcde4778915eb7eed080d4fdf8baac009c0ad6a00d1ecee2f96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "d11dd1264e4692da710d18ef5c18d7f5bc1db36214cfd28a7f567d56a35ac6e56f838a58ef6ebfc2d68b115417cdd19fd49ae2f6a13f1a57bb2eacd122945f1c";
+      sha512 = "9ed4b5a1631110ccec6b31ea3d666fec54e9dbe9746552fc02b0eadd09053020abfb6053c763ce9f3877eaa2e1f318003177e9c3cc12e16120a7ba2881795525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "ab33b21aaacb43f4676856e74f4d93e2d449b67095500907669db42f678fe0d7448f2205f42c3f85885cef0a2c262818368808ecc336205411dc27b99e42f272";
+      sha512 = "bb13cb8455d87244a8f5216b765293ba13816ee08a0f73e70d706279d5e322e69b5627ee22aa9ad44ed20ce54730bc2f072d326ec669d509674855f835702a9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "2a87e6a9bd6c3aa22d278f114d0bd18779c7847cab2e6257c4e601f3749df703f2d0a25f5646ad91802a2cd093bd1734305fb350aa2be269c1fc5fd2d621d4db";
+      sha512 = "e7e099b80ce94392f53dc1ed3a696cad77ea1a1910ef79dd7160366f6f880857c5d3b867ca3635dde72d22d40000b2acd9495fd3804aa479c5e5adf0a3bb44db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "9017cc8bed387b103f78870b157a50c18f8e36858eca1bcbce8ac5ceb06f6d7b178760f7dc733ce570cdbdc3204d277a98a4b4324a0d3691d1fe3f6b1e9725df";
+      sha512 = "2b6ae7dbec4facca5a00a0c9827ad634b7862ead7c8694bccda7f90cd5183687bf122e29e38515b6457839913b8dd5c6e24a156edd74d3ac4ae9ff6fe8b5688b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "d70f1a793d67f1b52f740bbcdc4fb01056495fdc5b14672b35a48a500c71ac7cd0cc6272e7f6b4b4fcac65874f32ee64338435f76131c1d74ef82ca7a512eab7";
+      sha512 = "07a376c694df8a306fc169c8e0abb311361dcd3ee252654e8821673a69e6de9b3f25a47094091bfae620db152c471c39f7fd895d81acab877ffc471aaefc2439";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "c16463456725b2f0263b8fee2d0729bd4951a352b1dfdee819bc2af0e138cda73d169eec63a27ed2900a0703648db0c784969a41df874336b1a84170ddaa71a4";
+      sha512 = "745c62ac6f055bc01dfbf8814c54cf823718d472533a3650f3ebb59f4c907109cd15d881ea19d80566cb66121c6ff2ffdd9c551c4eca62ec1cad3976d1b513f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "00bf17dab47261470f57b94a18fcd5fcca0344be1b1d6352968e132c7f3fdfc5b5229c80eaca1a9802e75d432e09bb6e0dd3dbd40ee9f0c783ca007da61b52de";
+      sha512 = "f679b7e843a0626ac2e7f6fb9f85cb6628d162692263eba6506e94f8b22b543268b1de64e4cc9ae5977c7fca0725dee337a120647a5dd73edb56ee678b8088cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "7599fed77975a7b4667c9d3456a5536e3b7eb1725acd624c504d061330ea84c3a19dd72914a0f7644068972b94a7a058708e3b1e3618e084315b920e8f671f13";
+      sha512 = "a95c3dd2946bcffaf8a34fea1e11df826e1dddd642cf79677465379e43343711a18fa88d1c74247624b7e7f690ecfd62edc38d9971dd5df81d05be490fa3672e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "c665bb33f04b7d3b9790580b0db992ce223e75fdd3915b16f79125a72bac91cec098b1ae73b1223f5b03597c1e19522b46fe11c5c05a7cfe0c932a21bf94f90c";
+      sha512 = "bc6a82e5de1fd2f9c4b9fc4915604443d9102ffd8caa348a42054a1a251e820ccc69db4dcea5b4aa43e04e5c07e904b10db8b25c60986eecf91cbed89fff4f6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c775e3e6858732104ba3251de42a0e9ba5031ade5f89207b357e93c6f6e4acd07bcc91a5fa558a9884f07438ca0de6bf10065ff7e37d980914da392428bc57e9";
+      sha512 = "271dca766101881c0869a3201f5312790d11befc96c3106f92740b798052434191389f86522b40cecd882d6f85a920556d53ce409ad5f12d1ca68434fc836a0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "c8df95449757099a7c8d50c04f42aace7ce25297c78622296feb336352cecb53726f3873210af6cab96d90f65e21daa084b08f6b943e1130c75f68e6de1168a3";
+      sha512 = "afc35f1f071fe307df82582a19b817f1cb395c975f047c04a9b64790d87efe4fcb2486d4523b9144cf63f1b2949f3b67d74a7c8005c658b22eb6d363a407533d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "4488db080b8bbf7e437a684d1d7cbe219d1d730db055cd9988706cd71deb110b9496a87684ca32d172f3eeb3308ec1ee2ad0ab3b1e206d012c62311db45db911";
+      sha512 = "36a054c5d56752ddb8e5af417d53e4811b23ee5ac00b57d12bdad2152ef4a237579001f44ae41c9959a68fb144862e0185b0607df3c9801ddeba7f9a27edabb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "272c43aabe7c63b769df2aea4eac5350c9cf90326ece8ac2f096db421f7785e630cbdcfdb84e41c516e36165f1a67d9b22ee0090d84ca9d58fef275d119c2dad";
+      sha512 = "f29d9f9d793730324399d6edf5d724f1ebd7f25037865af74616ab660bf6f469616fec7a7e2f1c5d8b7427a5b3b610c876100e5f737facc366d7ecc92606baae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "415b1ff89552f6bb83458a96905c2c6b7b6b25a974b72ab4a4d4a0a1a5b1e431b82e519466393bd6a8e8031954eacbca97529cb0e4513d722563e13eb97a8fbd";
+      sha512 = "b2e0626abe14e87420528b8e1875c22c5a97717f9d6fd781956fd7858a1a08c5014dbdac5dae6378fc2fee92bfd50ac4bacb29aff738ea8288cbbee68cf58ce0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "1110e4c1c6121a00fd76f25bc513f0c877bfdc7751af2b5958f38f2a7892d8a00c9b5eaa6adab34213535480228a4e0b3aef3ec3a3ab4adde74bfa2fc7dbde94";
+      sha512 = "3a29a3f008b226c760d488e5673b6ca8d545a309aa8c19bb56df4208143663e92d29b4dfb0ae6606ac5f83826d1c6ec2118adfdf5ffb55e954193407b2249d7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "b1279b0f0a97413799598fbd3c6efca475b8aef7a0b05c401cddf283722ba423ad2524341962360845951798d9083019a5b8b431e658513001c3046b6a3fedff";
+      sha512 = "cf0894c7b4e954ab39b847ff21a88b68152e3eb1577d6ce6b513c73ad8c26fe184227da022b827b35442a069fcdf3182a843bd4266d29ec525436f7bb9761cb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "77474e40120fd4ad50a109c6b46fa93c070bfaf899e187bd4bac0ad4a53fc12c7f7d9d2a2003a871e8666dcfc60de4f3ea26b79008f4fe7ee1c5a358307b2eb4";
+      sha512 = "7f512df549b19e82d054298b1b5284956ea9568793aa0a7c676fd5f52792ff943a1f8bbcaff05996236e4ab19cf4e914d6e1178a493e7077ea97877d14ee8d70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b1e440f25ef20da7fd6e3d6a403b7c448e5493bfa410e09c3b9d59b32450883a938967b167a8e84cbfcaee546d36e28c8152a6c048070b543479072bb8df6189";
+      sha512 = "d7626253732cf868d1f414e297cf4598b1a3bcef10c43641030c599b6d04599139f268a993d4d151bdf08ecc0129dbb638f581de58c1e76f28bea30be0eca68d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "7ce8bedd243fb6d8cfe28eea17aafda028d1b85d96dd60c734f239f258dad8e7c132439614d48494e58088f99903f8a2a8824fc4878366400d9affffed203b84";
+      sha512 = "f74dd31a8987d35ee1e3c96546d6b180830b174bc03bce12ce83bd52e01f7f1ca9242830f785953ab0ec73cf2dcd19be61cd55981bec6c8926bfadc9045bfbe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "ab5054bc6cbc515af08763e61351275411edb2507b7013152185c49e3c7bad0263def5ad187cfe5fc4bb0f93e86a1596e131746646b25e452293f24216116543";
+      sha512 = "2b1902d366b7de359b8ea0a5fa75897b76293630710d30e17413a1990bc96a8cbc0032e68d73e1ff298cd366ced5f4c51f0a693c665bd3761db3646cdb536666";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "122b20868a4ee4d1bd42efb3bd281f137bda130d4328e830b3b21176777c6b993f562948671fd8e020d039b5e5798b150f1fbcf734f245615a2a3beda8d44e85";
+      sha512 = "424d9aa341405c5a6ea5441e0c471debd7d49c4a4df632d796142db9d4c944b49317758e2211b806bbc93904d4341094fe29aa44d6ef936346cc17263c357e89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "033451b816392acf472f6f62f3367f929e4d4c2b749629138120580b7bb854c5409251c49650d3359e6f48929eeb62bb9a475ff46a8b57cf11c34d6035c67f70";
+      sha512 = "3ad0b286a36467973c4910eb20b09d20ec46d47fb6796078fda35335266f791f7e82d01ae8b7a0fa49361cc79cdf2864240286b6a8a447e6dfa6f49b23f2b1f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "99bccadd7b8994c20ade9907301ac695ef01542407032588bb17cd3353e4941ed70944c8f9a28aa0fee5b49990d2bfbc5ac37d9c3d4fb88d13c473d50ecaf849";
+      sha512 = "3c47bec4d903795f522d227d085e0d7ffccadb0e219f7a67159e5bcdcf7f7f2e1543b95ee8acd495982a464095521ec9dc22d9f90599d267eee8d2f6b4a543ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "ec7193a6eb610bf1ee67791f1f7ed9ab951cc8a53bdcbddffb1078479919d5a70c43235e3b4ec4c20eb89514f283dc8223a4f61835f039f347744d07727058ce";
+      sha512 = "2a1e435e0f74205577c28a6265ac0acaf165b4b891129994f4d42cf78ea66216a04c9f4b7652053281e3717a51135c12324640c5ce285981a1165d9e749a64d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "753c48c6dc9de12787705574fe0319ca9e4d5f9db67166d62fe0391fe5b8867d7f5da9d21f829420bee034444762a6ac3166c109a36e0001e6e7752c93304f77";
+      sha512 = "177acdc588044116cd4efb5ff10f178a6af2ebf7b90b80c06b07587e11d89a45a5f0ed4b0a9c7b2b2cd4896f3f4c5003b9dbed33bd7ed01ae6d331e637f2237f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a64d1b1f69d18d06810d72ad10aaae40153e696a29efaba4327d44e45d167a4526cc00811cfb764288df8971576c281fee1d8b737597f1de0f0755a4d2e78126";
+      sha512 = "6e13833052dd32ea168d0e939ea7703c6c5a092848cd45ed8e6b1b0c18bcbe92e1a4c37ff7b1cfdc1c1e618f4efb83dffaf58501ce4f851d845b273fde5ac513";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "e95905b00476f33a8e5c39b427e592f844f04d267263dec65f9edee3e2a91790382cfde6731e2eec0193d535267d041d2254c4645a7f8cb6b1e3ecbaa40f37aa";
+      sha512 = "1deb2df839e0708f2b8bedebd47a4643e1a3ef2abcf892b14fc4842688918cfac99b8345944a00fcb36495bbce92fe2f76b3bd6f7616220a4a4758396d031d75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "3dd5c83d82e6a47aebecee97c49e94018169a06a9f81ac61bcfa7d6ff337b5c4ca66d10ae552f5642cda20ce545752ffa0f2589163fd1e01bd7e61c24c88e7fb";
+      sha512 = "aed5a7b6e3fb2d4f4260703f83b1092953fb4ee7891ec8dc50250f9b00c4f1ad51d6f9e15ccb8500faf87f723ab891e474b43d4caf4a22620f5660ee8736c9eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "cfcc5d048fbfa18aa0030114c445b40ada42064ac56194add35d51340173b3f6dffa1c9faca87fe4ca2f5aee608d7d05903ac8540095236d19aed3f939f88914";
+      sha512 = "d83b0af01fe7f335b3fd3bf89e9162a2c54ce95332de8687e265666b417a3103a508c57f770a4d075d3062cc48f652324fb1c73b1edfb8158b6f5cae597dbb59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "9e7b63568e745d5299fa0315dac87478bef0a30cdad42b05e33acdf188f8346e23ccac0ca3c544f1284e4cd216d8b5c792ef448d6cac31318ad711ec21ec4b05";
+      sha512 = "74bfe8e9a084348b7f1911c2cbbea89757b72ea8b584fd7bf26c79cc64f3b38ac642558ec3fe059464f252667d2e04dd70cbb34b92ffaa0467f5067636b05311";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "1c8ffd773a5c259d32a6bb6ed6472c041f5337f01f21f6e5e18f774ddb04480cf0772ccc6bac7710e9c22f760d7bd2b234d6d21e1281d9ce2a26483ccd6e928b";
+      sha512 = "31fbd3b75c1c7d64a9b13c52680c6c3b36e604893a768a572d41481b388e9beb7942f435510b7dcc90e7f9ef42d81e05c7c77f28e5cbca63b51beaa54b09de40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2f087692eba683bb0e865b5d4abc712edff5cffae647e8bfe382b2c15acfca481bb56c20f6b14742e7f16dedaf27848e8ae4d5078492762185d36c040c7e33ef";
+      sha512 = "ce6ebfb5a34f90ea5a8f742a3ac9a6216909c8843fe255f9906c297693a64e2ebd0318ca697cb02a896a122e29d2a8bd055957022a7cb770bad6687e83e9fa24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0f6869d9528ba56a8e03e2dd85d8b76d74a359a17eb84c575a94580f965fa8c3d253933b798e2c426f742fe5d8d0d7709a7280e21e7eb41ce3799ee98cdd3af1";
+      sha512 = "b965eb09bcb9d5e0cbabc1c8ea7fc674aca2b185b2ef83f3c3560fc68fdd2fd428ee6a9d1e72980123816c01b2ab6877add15e706eb2a90b2f9220db3e411a8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "31c2449b7127b4b537d407330cb618e1ffc24259f9bb455f95e2b535a4ca17aff8249c77e98e8f36375671390d4225552b18ba21346e3f1062482e8b8d3cc288";
+      sha512 = "3d6daf9e6e2459a246f9bd4d8e66c01f7acb0a4a63f7413c38c7158134c31b5986ee86233482d80cb33a3d8f0d9946c6cb79ec357f80c3ef22dd0ecd173dfacf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "0722b24e72fb8d0423e37d47035be6c2e90db45d99590961dea6cd5be6dbc7f1851234f20e4d8d741c4a36b82c31675b2e39884d2949f5134954b53ae6db6ac5";
+      sha512 = "f8e0208c360cc9b87ce917f51d2302df31f1cc137a16fbd8678aa664d0ae8626dc08f534dcb4f34e1a56cca1d0a3bcdad01eb506b04b0e2054c1db5acaaa8300";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "4944473b377fabc233f30a6269ebf02aff87ecdd02a75e528b8f0c737dba37ad9eb322f99b1ffae1392a67144b737307bfedf0c6d45e65562f964bcb9dd3fdc0";
+      sha512 = "7c184b7bb8bcd115b4a3d10543a4805291ccc13a3b807d71a862b8d166e324d9f4ff28dbb71f2b36c26731d6d7085dbd45f708f20d6bb20a918c361fc0dec218";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "5b2bf5731f4a988d1bdcdac74abf00b0633b4f9b63c1b999309d5c4eb5390d0e823d170b7cedc278b49d018d74e6eaa83373ad5c2a26151b78e9e831bf38f14c";
+      sha512 = "cf55c41a5ffef1fb41d6c82f5b9492f5cb4cf5aac4e14cd4ae751e81c15acdf30264653b8adee86fc343552c21484c8a1390d3872d30afe113fad94ff68a574a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "e96483b5e5800a6a33a9e9d065a90476ad76c94b6e75fe006881c209469e2f37173ef6d67b4f2b2cb216c46ad44bd0db9dcfb9d2e5afe864297e26eee93898d8";
+      sha512 = "a54c9904e67547d2c2c7bcd2c1a5df3b54ceaaed65bf6cdc35466d530797136b38e1f79cab4fa544d122ccb8787039cc3fd2cf3a1f166fcab8c27ddfa820a291";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "4d145815f5cdd37666a60b0db476925b89495b1add8bfba42cd15580a294610f20fa340c449c04fa9cd2714a62e09c61e742037cbe26b5f11671eb72dc8a5008";
+      sha512 = "a267f9ce6aced112b488e90b859ebb2d6e02fc73dd208bad34ab5c1dd7a122e4b97b68813769b85f036ccfe8af7e56ea0782914c210b684f863cf2f268f27050";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "3763bbc87d2ff21b6db0d45b684b91f1080e3dd9fa1b2240edd56c2db1100b66ae04748c67df410cc9c0802e83fcb2a6661fa35fce6e8615a787c280ded8ebd6";
+      sha512 = "99b1b97f5c78cbeb67f7ba66c05d04d37bf808e52f98c25dcf2d0c51a400a26499101e4706a20162a805da2493db2919bfc1714940234e94247c2a17e18f7358";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "eaaccd4746477ff10af5ee15b6e18020e8e1bf36bea7176cd3ca92903d983b97cea4d73a516a976827ad46dc4a03b000935f1d1d353af90ae205df435cdc3004";
+      sha512 = "b19d2699ffd4bd0e5de12a87f8a5461fe28869cbbfe573098e628ed3936baff9ca582c47104133bbab6199472182c9f71af18756ea750e9f2b256b01314884bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "7df043f3e917978b9d2c3ec6128275daed830d1402a4bcb98160b2bbdb98012e5db116b7ae6537206de95f65b3c7472326b7739979a12e452bc045e738071ffa";
+      sha512 = "87e3dc181130019499cceb8b3a2f86e0b4ed32defe44eeaeb3df8dc4bae1827eeb90742394c3112cbbddd8960f3aa1a2157dd8903c2eae1cf4c17fa9e3179dc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "04e46a2cc75b662404fd5c107a7df37761c6cde2bbe93f040d2b1b745ca6e3fad978ae868536aeb526e26b4af1f7b961e9327a3a9660e1ae9823c9688a8ab3fc";
+      sha512 = "cd6220bdd6f2ef82b0af214c62ca77b48cfd0f790b9f62316b2a2267aebeee3954935999bd6f1cb2fa4cb64650755ffe208f14b322990704daae742ed126140f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "a5a7a0ce8df208b595f895428030fab8e19eca9b88ae2484e915766376d249e0455986b3a79fb4314889b35f52abb6aeca7e7b979ee86672b85ec777f8ad9a5e";
+      sha512 = "cc7c72ec73a7618664f759ae9f96d06174d835ff6779f6bb3b199e4a38651de695db0149041f619ca4fc4c9d2284757cf33683c6c107dfc08e25bc39e3a5f6b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "427a76174ed62b38ab83fdca0c64eab60c8d8626bf350d15c269056d126a3eb2263ce75f6cdd476ffed3c59b27a77119bc28317640d3407e54a2d17497207a5e";
+      sha512 = "718ec975c1511130799ae59188034dfca681659596755aff6809336be2dd41e0ae744fa2fc245e51f8de86409d5677796efad33c7bdf29873b90dba075c941d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "6f93c44b4e3990680eb37af208a1040de5a77008485e7163db861443334cd8fbc86ce387341737699dd0f9197df4ec9aa7668a2b3862c133f0df983d1abab0c7";
+      sha512 = "f6063c710d24d74714b2661e7918566904d3ad4e189ceeec662253f7039f5bc8fe9612ebf618c858c15d64e90e2eafbfaafbec78e441a956c7cb9ad21467a547";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "255a1297cd0c2c8c3f872173276a81a0847f9991d1dd4180555e3299379740a1a65318596c66c8d464dd74bb2b4c6a395fba3f905c98eac3a97a0b0cb4ebf45d";
+      sha512 = "450f191ffd823d3a079f486dccd7cc2480f3aef840c1168b38e187a9073f1c8f3ad093ef5c56951440716d6dc6bcf98b5352d4b863308a14bd5b6b7e6a0f8480";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "69c0e8248a17c54879e3e50b6bbf2054afa8d2f85a7006e6201d6dadf5112ba558d4f8e2839bf65c622dfc55f537aeaaf6fe267e6861317cda6bcf86eb9a3ddc";
+      sha512 = "552cdfa2dcd7db775fe9591246c5c96997f0a86a031a2f6cb2a31a00fe05c78667e46cf288e30a3453d26d8e7fd2480d2f94857720488b6a291bc359553cb668";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "dd696d3f948e3fc5a6330fef299c93d2958daf96eb688826d58f76457931cd69b0a68cd9e1366e52407a2bcc650542c42f592c0b10c682d07faeaae968b0d74c";
+      sha512 = "be2b95672070d82fc92849832a37ba41caff186c1c9203a2cd113f6b949c4d86ad162a607688d3e3f546cc29553e8acd9b3d94c14593cee10365a580af0b7d1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5c788e031ab302a82cc4b7d51f7f2c7d1aeb9a32be241f4001fc8bb64c2331db391b5013480b15ae9426d970eb80fb95d72e3e2819c3ede8d54f9e47c6bfc76b";
+      sha512 = "2825967493d4a3a39aac644484556a09bc9a63e601539115d8c28bf5f2724b22b3a374a5ea30cf8f312e6c075203014df850cce3436da0c5a0dffefe9452f371";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "2a87bd1040627364b6830604b9148df4b9c826ff9c8d6a9b8709ffa491503ea25ba32f8e186946021358d66129f0b84be98561be9682369a701bd56ca13d990a";
+      sha512 = "7407388751b8df127156f5ac4519d459df4b929d79f4d82c0d150b8f327698da435460b911a077e25fe5affd05f692d4a18bbb8f71cf3921179c60d107460103";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "defa6ba4b5f00922a45d173fd85982e13a099760ef025c202cd3096366e6fa236ecda704ab97fdc3460f1c66c83e3e8cccfaa313a752f6a038118e2420626039";
+      sha512 = "2b6ca2922e28b061024c1738fc70fb0b31737b938a8fdee3676504a87c73c29751d22f33241a450941200e7fc1920cf66847dc8188d987d47f4990af00622b31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "adf3e6886f3e500e62f3706ef79e03924e6e9390775b16fe20799d5f7fd6618e5d0c520a8b409b3ee4eb737d8bd2e0f87e1aa8c2b34ee2e0cae1651913215593";
+      sha512 = "ec9d090376d17c8ca283870d62b50961c520e1d841e11137d19f6083ded9ef683cc0d14cca37446be0eb2b5a6c9a9fc79e12c5753316bb7ce0f3cd07b1a0fd00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "d6e1e6b2b0fda67a38eb9f7eb8c3bc50f1274fe81118491974372b46fe323419ddb990549c74be040900b372fd52c2cfc193e417714215f8a1b3b07259f2dd79";
+      sha512 = "0f175c5dfeb93d07cd4008967b4f3e492cdf0fe44e3280b1f761a5d9f552a7bc2df12b3e4e5bc8ec388e93ff4d9f8ceff46b46edbb331e7e92e2648804e80e67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "a787b2df5b1fd9ba57bfe5cc66bc4b774dd4a4b81d11c0d5f0b9c54e1c72590e58d11688ca0ea64d9775a3e4f65524cbfa9740d990197a0b6972034bd4bac9b2";
+      sha512 = "6ec09ee64afc4cf4e6f710d49f8010dc62394e1a912fa6139994a741c6abbb99a570478ecf94801a1ef8316704614fca5e807b0830f77ac5714a7fa3a53d5007";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "3127231295510a1681808d4c65735f2581991ef04fc7af8ee705ccf57b556f3e085a3abf0fe105533c608a27273bc659b8ac8941f2b044a1ec8a9b085b0a2124";
+      sha512 = "0515e265c0ee0a223af68c6406a04c0264e3e806e5a575afe6c6adaed5bc8030b37c70352f84742a85eb70884cf43484cdbabd8de1980034246bdbd2d46d93a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "a1bcf79292ddd3efa08d2382a35ca00022e7be2930d832523a4f94db9f25b7ca45054d6d6b6c456f3793038fe4167d8659496f4b0bc812ddc8c58a1e83e279c4";
+      sha512 = "c2982e666bd96ff6bc4af4af2faecd84235a1e314766414f521e0fac9aaf184635a3b40e118fadd3cfbb0bb50fb91834f26a608128125eee5d023dd2fbd6d87f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "c3ce64381471908f7aa7d4004c8c00d1b05d852c200343ce48cf7d428558d0182c4b13b23190e266269c556165c6f51ed55baa1bad9f55f3c355935c09bc9f3d";
+      sha512 = "603799faab54ec78905c8b5413357a50723090c5c362f3bfd5eb6ae7f62264c5111c4062766848f6f487c0f107a0a17bae87362bfe05e86c448ec455c4c9bf2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "9427ada27b5ad79a556f4e0f7d1fccecec7bafcb44ee19af9257c16e4235bc2078af94acf9e0c0240d11a32a59176040ac54721fa7b934ba12320a67c3207183";
+      sha512 = "be6afcbd8a3ea34ceb53237eeff1b271a92fc46b2138f3c5df9bd33c8be83c7d22a7d3198b91f540cae542aa3eab28a9184fc6b544de906f89fd4732c1a59ba6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "83276f41443e931b7e55914fbf32547ab01d58f9d5bce5335cb931b783fd9845f20514b76889f82e357e489b65afa3dd0894544d4004625df08bd2021aeba8e0";
+      sha512 = "3de3994a01bb3238888754ef27a41d37568d7e9e55b42e24071fb8187129008d06b5b41015d612f9caa5777a2e6ea5cecf772fc76e1b0629191126565751d014";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "c93877ccb3a0d4ba9164363b869577a5cd36d85cb05a8d1ff882fac21e333b7ff8c4597647243de753c037525f1ad7fba21dc1acb2ad212802b514af9402896d";
+      sha512 = "34bb2d9358202072ce71b052b4876a2124a4263904a74582fc9973d4c8ee92c00bfdc92a88d663b045bd94945abd8e9d843cd626c16504c2543b0c1bb6a6303e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "1512592dc0ec9a19e2e92fd39db30b50fb5b26886c1683038885c9d7b18a863182dbe1cef7b8265aaa82e60dcf94c45b84892ae19a25a8a9339382ddab13e327";
+      sha512 = "228f227258a73e9b945c8b6101598fe5a1f963eac7db546bc730dbde6c114630152767e54367939281aa9d97780d1643250140cf94e0f6032efe2a170c88eb40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "3a90c751054ce848aae996641133e2aa573c4d6329d3dc58465562e45ff450bdbe820828c551de71f0719210458cc71aaa4d0d3745a7feb27731f91befcff3d3";
+      sha512 = "34b3371285df53ed817032cfca1caf0eee92e8b15de741c7c1babeb9bf3671c3bd7ae43d80113d44f6ef5deedbd586ad36721dc6d92b73c6b1a889700e07e99c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "33d3c67687b235c231e09b6564fa525049e1d99c37c3a5fd6905feee5674c305af313d381eef5af990e878fca36f6af0cddbb399a5a297affa4e3aab5f3c103d";
+      sha512 = "8c82d7db9a48bf70658a1d086c94d0071e2b42677ab4b2eb552f6f42bd57e20a7c8580f065448346d810c0d76704bdd8d318bf0489302f8807f695529df8d4f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "8dc83c33bf9e27dd0605c945a746035bf16a189b6d5f0e52a9d65e4f45964d8fadead1b539d9b906ab13cd43a7b2157b4c7040c1d155f4eb7aa67dc987819a3a";
+      sha512 = "64d3173fe6514b17025a85119da84178cd72409763ac4b415d3527afb77eddd2c6b344be9ac74f9c9e066b468bb6c7094c579df6a9379f230b44c21c3bc2c215";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "b0535a8704b8879b86d27cb4867f13269395ffafd54a5acdf49124808f9c606f52cdf9e64a6378fc0cc37a6eb4f955b3613af07076567a6bde71a5e61a521c9a";
+      sha512 = "9a2aaa10778b8da82077b40e3fe5e295c34e7b75dd1d28329f786729059c7dcdd9a74f8e4a3dd123f3e3246c227173df23a3c5e8235fc8e3e05c64c79d03cdc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "17c5996c8002cdfd0b07ac796be9b437582cb0c5401fbe0f405dd0f8b4aa3f45aab24bb5a8f364320d62550eba7d228e1c20bc7805e741a86666c225db3046cd";
+      sha512 = "8fff898917a7d05c2d808eb272ea5c0e9a8eacea5d62dc3a40f652a12ec9c48594190c4d5c97ea9720a0da86e3322dfdf3760fc275f1bf23f4c6f328a4d6462d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "68d9b507ac39d9e175285e5bb4f4f24396687e57622ff31448cf77d73ea8e8817230b65e70c493121b40f4ae91b145be59eda2ab9d572be3d48c14ddacfb28d8";
+      sha512 = "c396e60a474d6869ac1023edc957b1b3d06e6b6a79bebe4512450e237c5f5707ce6d0ecdd5c904b0366c95a3edea331a1a6cace5171a3480fa47c08ee41c1ac7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "e6b59ce7c5c6289d57edbf019e74d2529b2d38f09552110a50d94eb82e7470103791c69c59066405b8e5d1cbf5058730c3bef780cab7b95444eee756b593eabc";
+      sha512 = "90fca234d227c88264494120a5da0433c4efebdf273074acbe073250a5d71a736314859dd9d29e693c8cf5c2056a17b215757fb2e2625c7832673179c2dda632";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "38393317412a3310ce7984e77a5dd12a70edc3da8691ca38b5133355c1c60e2ee61a12ecd5af7ea7b47d20f2718da2bce56c9b6b8b056fd75f9b93d1e196f52f";
+      sha512 = "a45a503a524c7207c120c9981425278f04454da2762ae024ab0c4df37fe355bafa4344a38c2bec49e232bcef100478f3a722c44056516a06fdcc939bb7f76939";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "584ffa243d0d070aa642d3b0e5fa4b7db553f68032d1f0f251034f4c636529f382451930217da9a3fcfa62e7912108f41e280a2f277b5ca9faa2b05ee0a86487";
+      sha512 = "f0195a1aa23b895c08b2afe1569e968534e203442d5a5831cabdef49b9e5f335f46a33f26fb58e585f46907fd059ec28a80b8c5d724a998109b635905a504109";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "b04ec9e9698e2c70149c772818a8c4ba2e0516e3049b31ea8fe9db3b1f69724094bd2c05685a864f3364978362eb89a51b0e15e7931c61ab3cd4693dfa8d7517";
+      sha512 = "2649fb1096d06dcfce03b4a53acf3bda1bdc89cecd1267df8a67551cd1a8b3ca8d56c6e2a8be9f26d477e68d5e91a8538af2d3e76a7a1a8bff969972bec8ed46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "2f76402d2333572483ac9441faf070bf55f39bc22a7d995c6e6f06e7f478e54209b1b61fdea9a350f1466b508c35a5640a3db0c4f5f0451de14e535dbc4760e5";
+      sha512 = "204a40f2fb1a55bbb0ca9e6f03764ac3a4e9c24f17a61029f3b6809e54d81ce7d1bf5b87799106956723efb5d9f3cca6db7a32197b7912b079ed786b6325b4c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1b5c6de905494d0773a7089df87987435b70b5c734de77a6ec44ffb941709d0e8713c54de8293c0f84a77a96fc3b7ca11e9ad892c870236c24a86031e62e35e2";
+      sha512 = "68a1c622459ddc75d667ee3dd969788c76524c1d81e45cfa99f846063f264fec6c9fb2bbd12134af9a2e139e0c272b8031cb432df29838d3c08f93bdc8b4a522";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "d1ed01e6854e3ab1f8e8f339e7d4c3bbe4941ccda88090e09a44eb8828a62e59749218072fa248358c073ab76e84b18d59cbb3cd39550834de9e8c91b81a8477";
+      sha512 = "7fe10e5952b1798241f3269d1b98baaff0608d9aa4dd46977c49383732386256aa0c696b59602c65ad386b0132c70cd5188a791474b20a2fc211eb7364437782";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "807a7bbdfe7e556c4f8071ea8e148cd3cdf2cc32c6c00d91a0563ebbb378599debd0d3e0a5f96f75f4ef0bde552c5050c8e798f6d1bb65a37019aa0b1b61b55b";
+      sha512 = "4fed1eab9d2c1c1290ab6b0117324ce5cf2913a9d7d39082b11aafea6bd69a8a9178ae1474bc971e64fe63a26aedb6f7af5944ce9f5ec311d6e395997a766ab0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "fe499058210285f65d81397d182b7e37ede56e60ee21cc7e0680fba8c9dff58a0e8747d6c99e789cc2b7578bba62b5a04b83d1cd1f8e533213ee3ece4957acba";
+      sha512 = "0e9b1e31ff2c0684275a9839f67b3b04ff28f4dbee09e07b5ad8b0b29eb63c5c8c37ed693a65c932268681276504eb84ec9abf97627a4d3c6e9b431bada37e2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "df14ba0acae51673edcee4e2da4ebcbde1f44e615a56777712b4bf1261c49a1007249b4b547d378906b64e4b97959b53285bd5d0c074fd3e0080537a5ef24c1c";
+      sha512 = "21281a5729c17002152af5ab2e0dc0344ff66b89ba0f1b566fd2a17e71d7515767d3ab1098c746fa8f87be6603dddda2b7d060720b753a07389db82e7f98df22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "5db62ceaf945411c01066e244fd08a95ac72134867619c488f54df05659e6e335af77c6a5341370cbcdfc7c9142a5654aa843b1a392a1531c10062052cf97c5a";
+      sha512 = "5dae77a2ef94e01155a547b2d853bc8c78166a37cecffd367e648e4f04fb87333d716c8f65d521710207f3a46a69a405592a2476b95dbf9bbd799b1ef8837145";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "02d4f4a010cc1ec71d93c1b6236bf891b290bddfca87ce9502f12f530033b26b94a1ea993f591911cb48d52145f2351a34be8b63b67a74498f6a10ee7744cc75";
+      sha512 = "73726276e5920205bc9e5d281dac7995133cf2073b69ba4a5996919a68e19c9fd2b6c57f305a4e3f88feeb890f4f006fd2ccd0ae3c5e89e0cc6ff4f3ba657e70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "458d234394e79ffb87fa3181c6722c63eecf19af4e6c10eaba372f01f4209db60ee01d932fddb335f0f1dfd2781cb3e651e98ab4e69b71974316be78693d05e2";
+      sha512 = "4ce3ce74a8f61de0a2334292ab35ce8189cccf240ae9e3f249f6d736f01803460d2c09504de94f23347886369b1af4d29a3a338ddb2879ef6f2d95b253c40eff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "cb0e2dce6a8dc0c211a72bb4e868bc3d04c2baf19478ddb4af6f6adf6c97b7a0ac334017d7faca08d51185e3352140b13c818b2a64f1c74956dca8aaba1edda4";
+      sha512 = "0b57c6754d47109089aa33edcc12f483bbc81d3027d9f09f3e69c47aa17092477d60447e19c0d1ef991927127307d448772fc5e050e73d4b1c75fc91043c18fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "984b28925fdf204b1d0dfb4080f503a520ae38288370ab2e36ac1f32e579b5fcfbce3106896a351472dad078de42656c566bdd56b32088b52fe4bc6ffbada247";
+      sha512 = "5315a9c31ef931c69875415245628cb9b11bfdf6a0900be21ae58a67301e4380b479e4426400081ba9e2735418f0eb2c6d071e830c1ff37b3e5ac2a354b0c46d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "18bfdd25f92324a7ca00183f47ec0c43eebf582ba4493a36b6b39b7f178974333df29a2238fec5974baeba271a3f83ff3f274ffc15488c24e89cc2d17766ef64";
+      sha512 = "82e827a0a23b80783bc0bedd7cd2522a5fabb9cbcd63e6d644b4859a34a7ec8f1b6a80df02a389e6ac92c6116f74d642599726cece33c77612dd37de4a106ed9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "1aad954d11eb33704782e1ae502d86fe9c428c9cd0d7dfad020e7510348443adcdc7db789fbcffe96691e68880da2dde1ee331d5f51503dc90b839f14aa44ebe";
+      sha512 = "cd5b9e70099f7529561553a12c307f4541de147b7bb7cb45a62c65f8f2eef98b4488458eb3316c6d5102a3f29dc9f9604f7aa9619a179bcc40e28050eb51d0cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "0dd9a02adc2aa39fe5ec4ebbd0b6cfa0968b0daf50b558d088f1f0680cb06a8baa526ebf96fe63babdd8dc85561910a5a6645ac11e02e641361491a2c9185738";
+      sha512 = "af9a2f686bc68f54b4fab2030933c49ae8218e1de6e538d6e46f9144e338a3b4684b195ba743cd900bb5a8890e72824491d36a94c0e07ce4cd465b40d931e05c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "a3f13abc0d8ccc445a495cd87cc690e5875c9c79aebdf6adb04f469483a5870d45fe7a61231bcb3ce07eb64c38ef04ff6e16e75c4852864a3ed1f385d3dfb79d";
+      sha512 = "5c2c13831b8ee7591cae89ad7fa8bae9f34d20d4b473e4ad755a2396a382115f1665ef5bcc0c58faaf01a112dde04a3df391dc77901d0858d90533ac557cd957";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e5bcf46a200adfa34191063503dc5875bcad0cc298f9ccecee7a1346c15b22dad5aeffee2ab7d17b98bd3cd659544422c05ee9f79ff8a0702e592b7d1b8e5b32";
+      sha512 = "75d765e2869ff7ee0487471a5b1c15af22afa9bc8027f13f67de4265277ebc079ff769cae3a051300fc5c682a3d799fe64870e87161dd8e063c9b89cbf6477d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "eefcc3ebb84bd75472ee0614d386a5bfe718a77b2fcb7e4296dae1131415e6541f3158b072314e8aaf46851ab718d0bef12339cdfcbf1ce4d1ae19004fc82153";
+      sha512 = "c430ce65539e96de0646307b9618a64f3d0441637798ecc4d0a59f77efee9cc6d269647d22f77e0f50ed01f3bf6f3786d78a4ef95cdb5e92d7765fb142d13d16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "c03a785ece38365eb69893ff4346f468199ce8753329c781241bf6ed96f595696c0927285db41fb00a15cb548eb74c66696e3962560c5add5b0be7a29936c8a5";
+      sha512 = "f371086cc83b0274133244566720d66120fe086410e768f91bf737870316a9398dc5ebae67b4d5da5dd5df72940d77e93655e94f051cc8b813cc2a40aa7de547";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "26d4b175dd8ce02cee25c2f8d6eea4e60ec3ebbf4858a185d38d3593f4397131fbb60208043f4c53affbd075299c69d5916b4ad55b910cbc8cc15952c78d9b2e";
+      sha512 = "59884b1998bcf9a2a9ec0722852b8b29f20d67a32516f00dc28f46ad2c00047e799d8a0a8de3ea5ce28e6e536feaf49ac28c38b5b68e7f304481315ccba71a7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "f99136eb3831a304ec84044cda5d5fdcdefd1a4814f6372c9edfbffb98d93b551d0cbc8fb45e8386f251eeb0f0a4aebcc12013267a901c2533bcca197ca6b5d7";
+      sha512 = "5119056668a3e539309192dc61ad2bc30d5677c297da4a18d423576bda292218e53b149da825225a016f990fbe5e2538257343dd1fb87a216ea1fa7a37586544";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "3ede053c3018b41f113d64f5d5dc14ee1d2bf219e1d7b37ae7ae8b36aab349b1364331d7364850cf40f7913294119c85468a8441f524cfa6f18fbb55c4bb2644";
+      sha512 = "2eaf2e224cf43d5a5920c690c83e4cdddd8f1c2d2813aff1057d99db77a7a68ac818ae311400efd6cea91ac89151c3b532563a9238b26d022be7c260d6fde28f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "51736e77004f5c9cbe4f303f00ac6c32c9459e55a1cdcab958ece590ae8d575f119ded5bb013600f077fe388e3572d01f31a41f462defc5407d9bcb6da743fde";
+      sha512 = "d74ef9bd620f4d62b79c0cb4c1033b3cc2278375c61f699c3251bbcc0390c657860adfb2c438f5b3eb9ab69413e2767269bdc96000a052b0ed73c0f572ad82a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "9ea21d6a5b9d0eab81eafa1a5757aa566b806fd16a925609e46002ad126a633d2373fa8ef27db9388c3f6f4680dc76b946b5ad9f71afa8dc69382323cf1dae22";
+      sha512 = "dab3dfceb1ad8073cbcc02fad1eedd530db1b9092374929c6e5eca55923f30d36f848862fc60aef3b71deebdf5bdf3f7a222951a3b3daffd32a9a60dd6ce5176";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "3d77e61ddb1738c24af8edfd8a2b9905732626ffb51d1c64b2a27c229121ec8df0e7ad61389ffc0c78ed545a6ce8ad9deb424f65c6d6fcad427753f9cee6f1fd";
+      sha512 = "c099fd1756b0e11e05656e08e50c78263f3d75c640322144bee5ced382987461c33327ced61d57cef7119c4b133246b075f443edc0b17ed0fa1e94ac37cfbc70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "155eae1468c3f4ad4a38e3ab135f79e352da4e96b1f1bd2a20771d9eca6e4ee89a0bf6db92c2a3aa4ea92df8fa41cc63f35d3b78c3f14fa4ccb4521d7fddf102";
+      sha512 = "2c1f85ddfe21f9fd9cff763fa1760fe74e501cbc01fab33d2f06b089550be8f6c9fbd3d3ced7f57efd33073adc9632c1a0bfebbe45acc8edebc69bf3b36a3a80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "08f8ff1dfc92fbf4d26eef4ed6b05caa6b911fc8a2ef1c655fd6a6216a5469e3086a514deed1b6722e6207a439feac717d3df851caa08f71a9796033b6292a90";
+      sha512 = "fb1e3c9beb39c79c073181f96e84fe7c840146c8e28480618b8d44d1ca7a4930f34e44b415ae02273661a8f4f3918a39760ebb00962a938c9c3f9a7c1179bb5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "407844c56a06d6464446390d35cba2b0ef983084beecd03f4cb9ea93607e0571be882b4ebd35bb25c6f2fc4f65bc64321c1e6f522838c1dd68bab46ea9bee779";
+      sha512 = "f896c5066102e5d5ac16d580e3b70b703c015aea4ced26019824b181cecbd75c8c01d777d36eab6a9cdfd926f722e9351d02b3da8e42e9abe031529b439b1f84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "f5c27b8987623ce46979083aeb2c7cbe0efb9e92c2df6909fefb54e78a25ac3792d78605fcbd50fcf71dca8d09b60c5e92dc4ffce22f3a24130a0e1e5fc13918";
+      sha512 = "a2d88f92dfbe449504b0d68450f56acb6dcb1051d51f54851eb30968bc762e3208ee7a3005f5ed4371c8a81bb3b21fe41bf88a9d9b1736e3d5d34caeda8422fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "12367b1f896f88a06c3eb906a10a5b288fa6b3d689fb1a452ae93677e37ed89957499937025d50f29ed808b93c359bc9cffced49e013e95a588e2828a4bd3d65";
+      sha512 = "ad7fbe231d45c96ec00d5a3c2ae5d6e47d0ba13745f0415539bd2eef40442364cb8417ff1b86e6400179ef571ee90e10348dded1197d0fdef64bb5f83f143d04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "40ccce97079cc5ca9a7db1ab2aba581c4e92d10c83748c654e48d922ca14d28632bec850d138b97c847e9325162bc34a20d4e672aab9b191aed7f5784dbdf814";
+      sha512 = "613c7e26c71e758bde31c294c8a063ab72bc1a9795b4a0206c0629c1d70a0153b03e0a0337f21c91df1f11f9c9228c997300a26978c4af6473c52c45d4eb1740";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "5639d6800f4e8265bae4b3b49fac10312fceb04be944a51c11b37c33b49c4f418f0c2a6481ff0860652adfd7a0259612be93d784a802769465fb29cf02780c6b";
+      sha512 = "fd065d962171f8438738385cc160396f7ca48e3ac89494bb772d9a778826803ac8d08893b9b1327018121020c190a7cd42e01a540a896019b5f9522a4727515a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "f73acd20403e4cf38d365f9b49de1879a750f73ec2842a3ee91da657c5fdb6eaf0695540efdbf3e67cd72234cb9007c2620b3d146a5bee72e30453c9fc6264b7";
+      sha512 = "0742a8ad845fd5269fca4f75716355de149a78768cd20fc2cc44ab3ecb8704a7e9fe75a376ce5b2419946f03b31d1fa702b7d4792f95a728bbec5a9ebb481205";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b588a3a9782621b33d9b43e252311e78bee1a49b290bbe055cb01b45eed1ecaa79c8cbe326a4a462a632a4452978a2978d6ac73f7d56d9b4b51aac479bcc5c0c";
+      sha512 = "9c6ad31ac03fcccab8fb7499c3d9243bebb8307ef3881c45eeccdede5180d3ed7b3ce49d12b403286836aa523020e2c400f10f8b6cc392906a41829e15aac4c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "ecc2d97c4713a3646a3c38ea5cc1245ca7a0bc690305bbe0ac3d9b09d903e27265cf87b73f1baf98b50547b321ae4ff984bcb4f9afc788efef9b17962c9ac28b";
+      sha512 = "524e7f7ad6b055f1deb9e6d38632bdb7de2f77fbc67ddf1eb83ca419fcaf056d5a9c697146a252e999f2d4f1595ece70e293dfcb18e9bd6fd6a1d0b1f886deb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "0715dd37ac757f9c70d41bdd0faa26cb6f45745ed17b9e627d51bfc040d9d637f236546cf1eae77c8cabad59f82bf2bf95758e5eb675dd9fb6813eb43214163c";
+      sha512 = "d8d25e18080b72497ea69962afa364f0cfbd8671ed5ef1e52b2fa2cd8f6dd23d71182544651e9a1508b1d50da8f6beac361b9426ea5be1a819bfc858b3d7cb73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "7617f00ec13a6a672b80fda28108e467124d0ee22b5e0dc366e2bc04d5be5eab91c9ec4edc275df7bc7ccf45197629fea909e945c633f58f88c8165ef2628b37";
+      sha512 = "4664536b70c34c35b43ab278874d13c0011890b071d1e3582959315b6edb54b3018135b1fa94ac482860cf6cb15ead63420c1896574348b78265c48f2a016ca6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "15e94de3500b185668ee87880667ebebeccb23bf69c324cd64c9a5f94e6ad1844861c773eb0a7b7479c169de63c8612845902c8c468ff670b37684b1d6059d1e";
+      sha512 = "c6b5374c4bb866314acfd01f1e95713ca50d51fb77a9251e6b228695fb45ae5492d11798369f27bbe1b254b77ce46b67528f1eec72b4b91a68819030f6500c01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "86a94619d93861ad797bd9457a768f62472f980076d0d526a95e1caff52cbb0136abad76825e191003ec55611429f2b35bab9dcf4a1d62aa226db89261e234f2";
+      sha512 = "b3a652dbf92a1e2b252d40b6c419c508842c779c3d5fa8458402a129eb773762048abe64cd04f41658b566b3a0add948c998ec6ec1ee32fc96f8152785a7b21d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "639469d7c987b366a5be59b45058f8aaa2e5322e0534a4784c19f434d48ba5cc7e6d2da824de48d49e09a56085521e16680e1cc29261c97cf18cd4dcdfc79c27";
+      sha512 = "7e857cbeaf419a3e1685b778c38f5d8f2b437eda2ac0c67576ed50cabf3abc13d8c95045649a3a68cadf053a7af9b64b8bdf84e614f2e52f35fd50b69b234eff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "8c4021a8591de29704240d152bfe3283901b405e8b4296196eda3f0b9591b33fe8c08871c3248afa82c3967c7d025896d584478d1ec3b761ec5f97cff498e098";
+      sha512 = "f71b627e820eb44f7b6a61f6d2a0637712a2a516eecde38c2bd13c37f92b34add41b4b274a616697e96340e44144adb0d9812dabd19aea563f90409d605d6ca6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "7316554b2d0d3b1cd559057374b67e9cf805bc827a40652e70d00bbddbc892f68c7e65fff08af2d4742115df124185c3e3ca862901a85ef56ccd658f799ac757";
+      sha512 = "e5f9eaa358e3f87d78daa8eceea39dcff1ba6854252f3327791ce51ed6a51030cc3fd493a11647142edfb94bdfdaef82893d89f7796c0e3bebb674876fcde554";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "1365f7b1e55eed2fb7d579fb2d9a2efb57d93a4e78051d57980e7b1bf3213b2f577eef6c0f1c53dcb47a7af92ea0b0ba9558e25e84c72e0f32e573c393dc8d4e";
+      sha512 = "9d74b920a7ebab561d2a812c33b3abfe73d4e2343f4f6fc903b65b8d2f6dbc7b63fdca3a567966e9ad4dd2bbf9ab50e88d71b95eb5a667aea5bf913ddf635ad6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "14e0a798b4fd9af769a464ff8c2fc87ea69116f7ec66326cb623f4fbdcf4c99f285bb8e65492e9b65cbb86dcf66a52669bd81df37ed00359546072a3709f20f7";
+      sha512 = "0315f4276f80aa0cb4a3e90dd452d1b65a270e830da91f9464f336f9fb9cad35eb446855ee63bfdc08219065580609a29870d1bfca873a88db0f0dc1ea39e362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "dc15d01a33d3fbd10f26bb9a1758df13f53aeb9f6b0a62abfe8bca1e7a3e233aa0a06981d04085e79e91c629a1cb51510bdb744ff34a6522f374444c9bbb84ca";
+      sha512 = "a447dafebf5892dcc5e316fa1fb325a926bd6d5b3f8d808dfb1136f5fe83eed57bb065844288d7634d8a61f260f87974b67ecc2efb42f5ac8c6cccec5a198908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "13761e766b5fede7eb123f304bca45bc3a7cf5ffa4661e2a961ece5653c2986a61aee742cca3dc0cdc8bef54b38a66b08e9a45223e42cce9c0a99a857d6bf45b";
+      sha512 = "84e35402b9f5e7cab69276f2780f89c20361fa463afccf985866861d41775bf5e4efd81c8b7d5233d3851910f0c36420ad78e735995d49acbe48201e3162f99f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "23dc06fc36ef32c148990692ea5bc5266f1ae61aab4a3853034f85f3debee5ea5a5a71d741ffa29136db54d63857edeeca75805f9c7f75c278f06a6c930ac248";
+      sha512 = "53e5969577b9fe93e64f7c4e45825290ccfd4ee7f7a18b53229f8040cb15c45ad558f274a072e92ddbec03af8e405216386e07414886193241e1efbc07b9dc72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f33b38709a7c4701debf19a901e36302b364c911405d96f952c0510fbf95fc4e24869a34e3a336718a0e0f26b5c7fc88fd1a3955c329a352bc1077b73cede937";
+      sha512 = "e0b26b41bc58dcb4f2bfa29fc806fedc3547d4e8b6e97c79750d77c3c822ed8f410bd0f1e99c3d261cd7f187468828c0d1eb86b67d7c67a4ed164647c323dd39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "7b684624e52e189ccfd31d6d910b18148f9040eddfe0518710388dbc1160c2ac068f0de39faa42eccfba7823372290f932d3693ad898a0c7ce20f6368e696f1c";
+      sha512 = "d14fef9f3efa294df9919d25a43233d979ccede7107d502354b2ab62949d6df3325b8b920684d0994a3894f88730f3edc5450d90bca9056fefc58739b60afe48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "9a9f8ec3cb7b86866dfca4a4f5ac25e13135896144af816ed2242091fa8719535a7d2c225be6650cdbe17a9bdc7bd2bdb962e40abd16428702c2570cd06a798f";
+      sha512 = "24212c3f06b204a348a6f864c9354d93317098093e84f57d6c8017618f2ceb15098136bc0afb70d315254cdce37ed73f7ede1db18ae1d909ce85deead4fae61a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "c7aa9195a8bf39d65deeb4233139c6941433a7bef77797532fa346b509cf91c8e2041a24569996f7a5e7d2fb0e4a108bb40337cf1283195b257a5526d89b3bf0";
+      sha512 = "2cb4bfeb2f2d3f0462e776ea82882f3431fc1877f89500aa70933f9a352b2a2fc77a9f2453954459fc6c9a22103476262bf5239e8bd4252ca7bd29a33536390c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "45a5dbd1ecbfbc69a4ff99327a234e9b26f06b9e280cdb2e0689b4378a84eefc4fe3a511bf8b111db873ccf39f7b99c1d256218accf190975d53ed574d565747";
+      sha512 = "745a5cf7ed4435ebfc1f2bb2dbee3ea76820c1758835c032579ec7e4afdfc9e43e28836a65bb667ffaa9bf1168244ebdc1ea14c14265e2ffb8d1fb7d4321aaa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "75574a88816ff42e8f20555a55f41bacb9d33d2535843b38d3079d0487bd1190b392e07e7d97f288c51f38c053bbbacc7acb34a835a7ae39814d6ff2ebfb1510";
+      sha512 = "95be01ed5085dc900679c23eda769fe0d83f09fa1269dd006cf2f2a4585b3d4e4175472db9e54d9dde45bdabe517149346a15c3eb42a47a935b2ceea7dd31f82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "2bbe4f990e2265e1d210c52987759486e6127a875ee55707bdd8fbceb44943215c28faa5f6c06161db7b7f18c2c2c3864882ffcc1eda286edc59aec7e33aca0d";
+      sha512 = "339f3d3353a7d2f739f3796b53f42f8b1aec930a0bc63a2593f3019b5ff246de2ac99753638924138cb9febd5e0359b77108261337166e3018d974a3f88f2714";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "9c3580a05057f7e04f6efbf60b281c50b64970064dac547cf6a84ed305c8dab5d014f96719e70c87e67124f61afa3e1a44ecc3627fd6a3181e3dbfc28ed175c4";
+      sha512 = "80de8bbe41e6d5a7076f3300cd90820d75068c0bf08cd8e7d79a63f2118fc3c5f5ddc4316afb884d767dcf95ba4b710e40e78d5b35880779ecb286350c9e834a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "37b30fdf603cd41617db37cc9ba7e546c58a6bb58833b461fdced4caaf128bbc1a36ed774370548b8249da884302bfedf52681af61348313c5599628576e9c57";
+      sha512 = "8bdd86ddd12f39820a639dbeb248c419efb0a7aa11223ee25b98edaa0c1aa514edb29c498932a9d2b5a368811b902e1a875c74704661f4785a38c4ec867bcfc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "7d075198482100a338105bb80d2d40d97d24460f2a6b15b72b349d249ebb638112e69bcecbf32578375d5621f3a46e6267401629d2fbe1ab6dc5d72dba454086";
+      sha512 = "51692ee445ab31d6443a823017405305af68594242c6a24be59db1ada2f9dfeb479fe595fc0590178b23daef59ce6dd84be3dd1779b4dd9f516a8f59be9d7c7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "7e052470a133931183439deba29a16097ad50383b63f97d5a1c03b7a3ce0c6485811c1afa2ea78bf9f03def2b0678bb43acefb2c1b944d8c12ee18e44b5d520c";
+      sha512 = "8459e52c6961e5f42f4547e6ea33707584a10a85fcf5b3b83eea4b4f06b2169c7dc39659ea41f3a4f1e554da5af2f9063503d9333d0d5553a521499b1efa24fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "ef6b8ad5fdeb7300c9676a2232accca1cac1b47896987455ec93ae8b8cf46dc092e224b417f922bc4cc0c41ce941d607c4c3fde6e305e274750af72b8c405389";
+      sha512 = "666e675faf3747877eeb8e188a68a1c9979a5823a7bcc63c56e53697084d4673363e057c3c73c51dc281c107161867d20adf615bcdda14f2c1dc6f3876630d6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "79dd88442e22ec9b98d432985deafc68b6b5c3dcadf6fa0a04292b019b3245c24b2fd08784d4c4d804c3b913bdf379753df4ba24ec69cdfcf9fdd659c8a18e4b";
+      sha512 = "db10acd345e98dae88e059df5ab0db7cddbf4243d0fa1fe43d4c1581286d1a625fe0d8808d6b23d6740116cbd99c487562b667e32c42c6749750090b3b0a287c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "d474b05fc960f2c12319bbf994027945ed655bb8b6e766e1ba04f9c863e4d5b6d1ab8d632e0051d1191bbaab87e4793e8c1240372b9b0e0f170da03856c5d8d0";
+      sha512 = "1715b23b260872a8aeabda5476fe6ba6499485566525542968f2cd144e10983b38b7713614a846d06dbfea18f49f08ee7b5eeeb90baf908b5886a09f7d874f46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "c5372584abf3c3ccf858c50927d26099504efa43feecf487639ab7a73e87da6137e29f31a440d7b6eae43092701e68c02325a39207f95c73fa2db303c3b402d6";
+      sha512 = "548616f8d58c140ce0d0d8c181219c8a62702c1d4a11addc54edceec81cb3e98e6743a5999c03f5076466e9bb0fd00345306ab7e91686c4b1815ac6c99755228";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "e5374a80b05eab9dd8b4a279ac96edc52930ee730a9108f76a022e3908f5d81c3e5db9ffedcad492edee532c2606982a6c76733a971cb5d8f64ce68d04b113ea";
+      sha512 = "e13dc5258eb2f751ae79b3aef7892aa9ed3c56eb44fc7e32aea240b2d73dfe5cc6b2ab07ab49548023a099f378c98b8245800edbe73d320b45d1607350145990";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "5077c2c497fda39bca53fd140241fd9bd3cde4f4e1ce3e7fbb101fed4a24d61df81d99db40453d4745750e24499382afd83e78cb67e82bbbf91158505472472f";
+      sha512 = "75e02e3aac37c840bd6725207ba53beb7cae3bb7a34bcc4c4114b412774114315d17a98457970b3f8ded7911610811bd12b9614826755f99bf6cb3e9018f2909";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "9eb8e46b9ea30e2865a009beed1c4c515830b1acddf79c2a0c035e8005dc646f2ec1d011474cfe53c07f3bbc73071765e7a88aaf0ce24378b1501cf5f246b106";
+      sha512 = "480de8826af835dda939f63fc007b01e88ea1cc2145e80e27ac9abb36bf85d5f0f7441a28623fc6b648b28c81ae02133df654a874942a497682c14a03280c4d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "afe2b9c41cdd692b9166ddfecdb78ab94a3bb91d60b91e3e79a203a1f928a92d40eaf7889ceef19427dda1464155f85d0e166e98bd9eace6b071d3b30f954071";
+      sha512 = "be5c63efa39bc574cd5f41bde6b35d3ccffa43069c61b11c75e0f9039c90e47b56bf41f20b041463cc1638639c581c1682605b24fc1621ef6380396e64d57f71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "5eb2662445fa000b626e5f4a0195a44d8e00c630e09fe386eb7d77fb514b2ea939c07c23f299ae050260c06e6e68abda8e32a2ca8c5155e5f1d5e223add04e48";
+      sha512 = "a448cf44d66e795cf2549b21728ceedca364091224720c1e72524ad55660721fe48b6ab5a3b3824a4de962bcf093a467f2dca34921bf7107495b9592bd87886e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "7e6ab9ace1aff3de1209992336567da167a3d6681af81354b05e36012545df1ff06e1a825668de7146e843a56c4e3a110ea530351ed83b129f9989d24bf86a2b";
+      sha512 = "f3b3f12a19ad1ab45709f1294f21bca08b9d39bc3b1a4bb3d7bca304443de3c5718c4b714a95c3d858dc87b1bbddbe34d7479bbb2890cb5f5dfe5adcc639479d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "fbddea93b51eb530f26de74d16a1d373ca9b86a8fc89b7f12c8ee4e2f3c3af8be22560ec11ee4afc7d93c305eb8f352931a06b2e7dcc11eb1e9ec755a2afc2a4";
+      sha512 = "03be7e535ce2e13d87c19e95711bea4d76e26517b8e877c4dd5885c7917c0079e8642126ad19365325c224e10a419586f109de5b71767777c0488c0213447c09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "6ae90c6b37258ef9e9b93fdad261c7b2522ee3b251c36f03dc6bf964d91da86a05937b0a65c75bb3531b7c10be6d5ada3a88b2240dbcf1c64c5b3f624acedcb7";
+      sha512 = "64be7571a7ec3a89098f309edced9f492cf0c3cd7a1fe0154d7e9cb645548a21f55c1631ae5ef36cb4ef0cc1f9f977ef5beeb8fcaeccae42279c2028339b3825";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0f1d035f72a3f0739f843e97e1ab27c3b5b5901e88eb8adb9d8b343f6b5f571133fb8e9f40b3df14e4d7e1144aa7f1af86e7100df5786602185e4ebe425c8f97";
+      sha512 = "0a72d994790d9ff05e799fdac7f74e7033bbab686b0c8ea5a997e01ef1e9c93e59ba760eca254bb177358fc09b7663416972428939189a709599685db543661a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "7ec0f5792e812fb2d57d420ecdca006f5242f6c3599b58da01e3ee65df896d1853fb61ae0413ff59834a669690ab40b74244a31be5033ca215bbe784a7a8cb3c";
+      sha512 = "d5e1872e7d05b854c04b67eb920950bd66f62d37c747b656f87cf37506a111df222557d8cb8b7968a4123f6e8e490256f91d13d64a0744991c8f9e1e41329aa3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "653e8942d04dc440d998229ad8a10ec8a1098ef85331abd8e1676c05398dd4b514f5fbdfd15c1b20ab0fa83216d7ad0b0e4d20b6555aab9a02f7fdf139d11e35";
+      sha512 = "80f9394ab1d00cc4b933f9460e7ad1ea6092b5caf4dcd72db53536dc46d3f2fbacd83770a1fb5a29713ae11b7f3c0c0fc2b96734169ce45a5addbf03cdf6b2f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "66c45ddea853348cf0084fb64710ce0b077dc6521767a27a83eadfc237becf05e26335d85fd1701ba4790e80a2f5f971986c1a3847cc84efa2aaa8623d0b3556";
+      sha512 = "f116481b96b8bf426f034b6374c8559b7695946fabe898683035be02d20b7ffee6a2feeb3b16a575e107996b017ef8f4e3f23c887ccbd04ad7b8f687e2af760e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "69bc89b863e9a4ffde9ff478331a88b93a42a2cc5d51114acc995189c63301144093b4cd156864e6094940d64285797f83ef920b3231a427a149c5f6dac37dc9";
+      sha512 = "af93d52c290d07a60120cc0422e44099fdaf0e3c1fd7babc1f4779f77cd8c8848985fd1c7bb558d8eb1252cb4f96d1b65f5ba9e739e91e6008b5f8f2b581f324";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "6b36b64b3edd9a16ba7051727a8ef326473859a07006159cd2b8a6fff25b0cd9649511dad03e5286e384ed74fca4b80d257cb0e754ee4ecd6eaa7c589478a5b9";
+      sha512 = "88680ad43f541a8ad9780188b92883aaeb805f47b11346f40d236b8a4ff3ca7e719270c01ae9765e336788d93c54ca8f2a80df3e0316022169702db75fbf5ecf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "19a6c7c7d7f8cc2a2f03bbb23f28c4691152ffda292399b6e438dbc3afe89dee98be86ea4d7f27d9d4f736e68a6ff21db1cbb746bcbcb9cd6ba9d7e23155cc21";
+      sha512 = "45692963e9c6c9122832ca105a19e4a9d6a4ae0c0fa66c5573e0b02ca74e2b72bfc229619a3ea3899ff591f70775949e53fc36a5a6ffad699f3824d8b5723b75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "df598c9156ba76218f4f0d87ff301a3220979abb3a4f5af19d0545b6a3ad48719a8267da22a31f646e6d20ad1f6f090579c9587e949be91559aa58455502a156";
+      sha512 = "e1a43d8d56105fc7ae69b23f3cc596363d7e0e22b18614cb512a32ecf3f9369be240cbd2d5775537363e40e3de0f0494054331554f093c40dc85d0f1aacde366";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "e8d53fa58ce1d34d22c7460c9b9d9111233047148e503e5a628d8d8e1c689b2c4a302048931dab44ee33ba2c4831362d3e74c294e907f1c5eee23d464007343d";
+      sha512 = "a80d2f2dda50f2977346c51d25eec1f52363282e83eb83dd8d6ac36ce41ae5d8d5f3925db70e2942e38e9cc61b30341c47d1fae7e60c68f8bb1ef28f1978d695";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "5d3e8d3741ee0ab535479ded3035379858ba092a8cebbd5ac8bcc525e88159594f5cef90894bb0fdc5eb9c349c435913b89a030ebf942054110d37e57bcc50cd";
+      sha512 = "e379874f97402001a48954674d84243c8da577533e309fa7f61c832c413519f784fa418d35f00b7af760e55a75f192fd97532ef2b2796130b396782b1c6b9d2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "98da270b0da5091cff599cfdc9a0d241ab8463c1c9e2771f81e8c0dd7ecf567e2cf4ea536b81cfd6b1679e449d7f1d4157b8927f1b1b0a03f3cb7dbfbd267d65";
+      sha512 = "272861b15c0476f10482f4ffba5178a7e4cc5a62e52337eb217ab06386d75998bdca7f31f478541cbcf330823b3c187fb5d247cc311c973b41f7cc56f458814d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "63287a39d325111c7e18b62a9b76cf0e7564709846cad78a946852fce761475edc61e292e31491821215b0cd2f392e8c41b7ecf0ba78ac3440cdd4f7f9b52d21";
+      sha512 = "bf2d304c978fbbf65aafa5ae01fb7da0cda9d2b133e0a78c21923d9f35c9fdf41d5aba17c863aca79ad021875cdfea934d6ed9db8010f66f6552860ea9cb6bf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "476840816b36816b967f86c9796f6df4afdb3d7524f4268cd867393eac83ff868645eb14ed5766aec87ba3c226e593099e15d44aa63a01bf422a12a4bb5c77ea";
+      sha512 = "a407d5fcaf5b1cb01d7bdbe3175327d9f985af0ff8b5b27ac93345c1a4266f4cb1753f357603220757202539c5dd7c2c7bc197d18e68585a4118384b729317d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "b5dd1a09db20a788261a2f6812a6b35be7164d14cce7c700af51dc1cb187801c2ecc0d0b035386ec4340af25c8cf651f9dd4c679bd61b335866fd2d7a531f7ef";
+      sha512 = "a3ae0aea5eb5b4df9e12c039cb2876fa1bc39c0c6a1d62971a7cef532ddcf6d76dd3c2314efde74b3226cc75213b2e1cb0f80718408f707ef4c986320dbe3c66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "08a002ec452956730d02985e74c9c1c615783d19fde6c1ee3da3adaeb1ea021c05c865e72d8dd7c930f9351ee376cd42b20fb90916d276344e7b2d17eda6f458";
+      sha512 = "4dc598410320ef44ad558da2f678791796dbe86c3d4c4891f7c50496984b2afc9f9879488f4f7fc4446ddc237ada5bb9d443b9822ad5dfa9f0c6e46d6afc1ac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7c75010a3a15f2208774f3e92317dd88c2a821c468a84a5855e4db193c5fa6d639d4b6969d3ef72bbc90c47212854abd0002295f163b06998285d439f50ccde4";
+      sha512 = "989dceca0a7c5a0b091b1ab80d15c140a3b59f950b520a0e2e87436fe4e32a28e9508ba82335e269e5fd562e31a56d7040097e1fe2365330aa257c5ee227aa4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "2d94f170a3eb66ef776c0c78c53d16716aef47218122bd5a9c7910fc6f821a5ae54192cee0314c48c7d6c5336f442532594c31e4e0821cb427f617590b8b7ae7";
+      sha512 = "cda7780cf5a9bc6a06c1ae9cd6f9f52911f2ac55aa700f87b3a3021d46dcb31f1ada5550009ed801f7754b7a5a19c3ef25f537e6280014c80672543701658b90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "21880c1a14e339e7b716f742c2910451662712a3870605db9eac00729b6cf9c2043cc49035c86044af8512239fbf05ea51ef476aebd234a7fa9317cefbd43a29";
+      sha512 = "755d03ebdeede91ac2380d53f4cb130a48331f6e8685eca21f717fc3b8768239a96328086733f768349ed231ad9b2716b58c4912fd8044f644d775489c4030d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5efca9a9fac37440d41c444497ecb2a5eb56b47881b46c66cf65b3b78353fd8a18d37c93d83400be1207193c7dc3a901402d679c50ebe55ddb93687439d4874e";
+      sha512 = "56946ebb5e9746d9cfd9ec14cf72708fa17237915c5fd9d953d7ebf5ded0f3e2778b8777a1ed9da191741baafa47e27cc12eaa2a1de46013104aafce251110cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "03927d0b8bf3c261fd00a043d8499e3686c7abc51eedac63f049d100095da2b858a2cea582c8aa2e3f65e1269b7094559709c22fd633a0cda29c6b21f3987eb7";
+      sha512 = "081be12a468f7c8dc79336cbf9e08082d0f79c39baa491a10b9a68cde05de78cea67cb247008d99c241e3c66deb5b92bc3518150138103eb1c75f141f6ed03ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "75a77fff929aa72700b9af9452e2d0fa93f21136cd7651a32970fec24332d3c9a7afd58a823e3dffe1aa63ca49057c62ba5ce579021a783a096733c23c71bbfb";
+      sha512 = "015d744fa850e529d61e4dcd0fc5459fca47e7a4048dd5b3ddab29c2474cef6e76bf5fdb1e91ff1df843e3dd1834373099372bc36270358a77d42d4e39eff8c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "d83bb672b5587b6fc8e2c4028f144821282b1596ca88f1aa889f4a2601d46fac44c7302d30f23179db6540e84e878244c4291dceadb56045f3edbdd41bc42a19";
+      sha512 = "2fe5c828da675b1b1e5b53fe9d292db27ef449eec8f53160fd60893d0bc523a0131209253d9b7c1846e8fcec2145fc760fba29c4e3850f97b2c3cd3a1b13a085";
     }
     ];
 }

From 81194eef45e2c03018687be60c2c695a1729df36 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 9 Aug 2017 01:20:56 -0400
Subject: [PATCH 2557/3246] stdenv-setup: Use `set -u` as much as possible

Older bash version, like those in the bootstrap tools and on macOS,
currently confuse variables defined as an empty array with undefined
variables. `${foo+"${foo[@]}"}` will prevent `set -u` problems with
empty arrays and older without making a single '' in the empty case.

Care is taken to `set +u` when running hooks so as to not break existing
packages.
---
 pkgs/stdenv/generic/setup.sh | 280 ++++++++++++++++++++++-------------
 1 file changed, 177 insertions(+), 103 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b6bca3e1f56..d3fff57507c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1,4 +1,4 @@
-set -e
+set -eu
 set -o pipefail
 
 : ${outputs:=out}
@@ -13,16 +13,22 @@ set -o pipefail
 # code). The hooks for <hookName> are the shell function or variable
 # <hookName>, and the values of the shell array ‘<hookName>Hooks’.
 runHook() {
+    local oldOpts="$(shopt -po nounset)"
+    set -u # May be called from elsewhere, so do `set -u`.
+
     local hookName="$1"
     shift
-    local var="$hookName"
-    if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+    local hooksSlice="${hookName%Hook}Hooks[@]"
 
-    local varRef="$var[@]"
     local hook
-    for hook in "_callImplicitHook 0 $hookName" "${!varRef}"; do
+    # Hack around old bash being bad and thinking empty arrays are
+    # undefined.
+    for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do
         _eval "$hook" "$@"
+        set -u # To balance `_eval`
     done
+
+    eval "${oldOpts}"
     return 0
 }
 
@@ -30,19 +36,25 @@ runHook() {
 # Run all hooks with the specified name, until one succeeds (returns a
 # zero exit code). If none succeed, return a non-zero exit code.
 runOneHook() {
+    local oldOpts="$(shopt -po nounset)"
+    set -u # May be called from elsewhere, so do `set -u`.
+
     local hookName="$1"
     shift
-    local var="$hookName"
-    if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+    local hooksSlice="${hookName%Hook}Hooks[@]"
 
-    local varRef="$var[@]"
-    local hook
-    for hook in "_callImplicitHook 1 $hookName" "${!varRef}"; do
+    local hook ret=1
+    # Hack around old bash like above
+    for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do
         if _eval "$hook" "$@"; then
-            return 0
+            ret=0
+            break
         fi
+        set -u # To balance `_eval`
     done
-    return 1
+
+    eval "${oldOpts}"
+    return "$ret"
 }
 
 
@@ -52,27 +64,42 @@ runOneHook() {
 # environment variables) and from shell scripts (as functions). If you
 # want to allow multiple hooks, use runHook instead.
 _callImplicitHook() {
+    set -u
     local def="$1"
     local hookName="$2"
     case "$(type -t "$hookName")" in
-        (function|alias|builtin) "$hookName";;
-        (file) source "$hookName";;
+        (function|alias|builtin)
+            set +u
+            "$hookName";;
+        (file)
+            set +u
+            source "$hookName";;
         (keyword) :;;
-        (*) if [ -z "${!hookName}" ]; then return "$def"; else eval "${!hookName}"; fi;;
+        (*) if [ -z "${!hookName:-}" ]; then
+                return "$def";
+            else
+                set +u
+                eval "${!hookName}"
+            fi;;
     esac
+    # `_eval` expects hook to need nounset disable and leave it
+    # disabled anyways, so Ok to to delegate. The alternative of a
+    # return trap is no good because it would affect nested returns.
 }
 
 
 # A function wrapper around ‘eval’ that ensures that ‘return’ inside
-# hooks exits the hook, not the caller.
+# hooks exits the hook, not the caller. Also will only pass args if
+# command can take them
 _eval() {
-    local code="$1"
-    shift
-    if [ "$(type -t "$code")" = function ]; then
-        eval "$code \"\$@\""
+    if [ "$(type -t "$1")" = function ]; then
+        set +u
+        "$@" # including args
     else
-        eval "$code"
+        set +u
+        eval "$1"
     fi
+    # `run*Hook` reenables `set -u`
 }
 
 
@@ -103,7 +130,7 @@ exitHandler() {
     exitCode="$?"
     set +e
 
-    if [ -n "$showBuildStats" ]; then
+    if [ -n "${showBuildStats:-}" ]; then
         times > "$NIX_BUILD_TOP/.times"
         local -a times=($(cat "$NIX_BUILD_TOP/.times"))
         # Print the following statistics:
@@ -114,14 +141,14 @@ exitHandler() {
         echo "build time elapsed: " "${times[@]}"
     fi
 
-    if [ "$exitCode" != 0 ]; then
+    if (( "$exitCode" != 0 )); then
         runHook failureHook
 
         # If the builder had a non-zero exit code and
         # $succeedOnFailure is set, create the file
         # ‘$out/nix-support/failed’ to signal failure, and exit
         # normally.  Otherwise, return the original exit code.
-        if [ -n "$succeedOnFailure" ]; then
+        if [ -n "${succeedOnFailure:-}" ]; then
             echo "build failed with exit code $exitCode (ignored)"
             mkdir -p "$out/nix-support"
             printf "%s" "$exitCode" > "$out/nix-support/failed"
@@ -147,7 +174,7 @@ addToSearchPathWithCustomDelimiter() {
     local varName="$2"
     local dir="$3"
     if [ -d "$dir" ]; then
-        export "${varName}=${!varName}${!varName:+$delimiter}${dir}"
+        export "${varName}=${!varName:+${!varName}${delimiter}}${dir}"
     fi
 }
 
@@ -171,12 +198,12 @@ ensureDir() {
 # The function is used in multiple-outputs.sh hook,
 # so it is defined here but tried after the hook.
 _addRpathPrefix() {
-    if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
+    if [ "${NIX_NO_SELF_RPATH:-0}" != 1 ]; then
         export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
-        if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
+        if [ -n "${NIX_LIB64_IN_SELF_RPATH:-}" ]; then
             export NIX_LDFLAGS="-rpath $1/lib64 $NIX_LDFLAGS"
         fi
-        if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then
+        if [ -n "${NIX_LIB32_IN_SELF_RPATH:-}" ]; then
             export NIX_LDFLAGS="-rpath $1/lib32 $NIX_LDFLAGS"
         fi
     fi
@@ -242,13 +269,13 @@ for i in $initialPath; do
     addToSearchPath PATH "$i/bin"
 done
 
-if [ "$NIX_DEBUG" = 1 ]; then
+if [ "${NIX_DEBUG:-}" = 1 ]; then
     echo "initial path: $PATH"
 fi
 
 
 # Check that the pre-hook initialised SHELL.
-if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
+if [ -z "${SHELL:-}" ]; then echo "SHELL not set"; exit 1; fi
 BASH="$SHELL"
 export CONFIG_SHELL="$SHELL"
 
@@ -259,7 +286,7 @@ paxmark() { true; }
 
 
 # Execute the pre-hook.
-if [ -z "$shell" ]; then export shell="$SHELL"; fi
+if [ -z "${shell:-}" ]; then export shell="$SHELL"; fi
 runHook preHook
 
 
@@ -279,11 +306,12 @@ findInputs() {
     # nix-shell doesn't use impure bash. This should replace the O(n)
     # case with an O(1) hash map lookup, assuming bash is implemented
     # well :D.
-    local varRef="$var[*]"
-
-    case "${!varRef}" in
+    local varSlice="$var[*]"
+    # ${..-} to hack around old bash empty array problem
+    case "${!varSlice-}" in
         *" $pkg "*) return 0 ;;
     esac
+    unset -v varSlice
 
     eval "$var"'+=("$pkg")'
 
@@ -293,7 +321,10 @@ findInputs() {
     fi
 
     if [ -f "$pkg" ]; then
+        local oldOpts="$(shopt -po nounset)"
+        set +u
         source "$pkg"
+        eval "$oldOpts"
     fi
 
     if [ -d "$pkg/bin" ]; then
@@ -301,7 +332,10 @@ findInputs() {
     fi
 
     if [ -f "$pkg/nix-support/setup-hook" ]; then
+        local oldOpts="$(shopt -po nounset)"
+        set +u
         source "$pkg/nix-support/setup-hook"
+        eval "$oldOpts"
     fi
 
     if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then
@@ -312,23 +346,22 @@ findInputs() {
     fi
 }
 
-if [ -z "$crossConfig" ]; then
+declare -a nativePkgs crossPkgs
+if [ -z "${crossConfig:-}" ]; then
     # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)
     # are handled identically to nativeBuildInputs
-    declare -a nativePkgs
-    for i in $nativeBuildInputs $buildInputs \
-             $defaultNativeBuildInputs $defaultBuildInputs \
-             $propagatedNativeBuildInputs $propagatedBuildInputs; do
+    for i in ${nativeBuildInputs:-} ${buildInputs:-} \
+             ${defaultNativeBuildInputs:-} ${defaultBuildInputs:-} \
+             ${propagatedNativeBuildInputs:-} ${propagatedBuildInputs:-}; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 else
-    declare -a crossPkgs
-    for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
+    for i in ${buildInputs:-} ${defaultBuildInputs:-} ${propagatedBuildInputs:-}; do
         findInputs "$i" crossPkgs propagated-build-inputs
     done
 
     declare -a nativePkgs
-    for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
+    for i in ${nativeBuildInputs:-} ${defaultNativeBuildInputs:-} ${propagatedNativeBuildInputs:-}; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 fi
@@ -355,7 +388,8 @@ _addToNativeEnv() {
     runHook envHook "$pkg"
 }
 
-for i in "${nativePkgs[@]}"; do
+# Old bash empty array hack
+for i in ${nativePkgs+"${nativePkgs[@]}"}; do
     _addToNativeEnv "$i"
 done
 
@@ -367,7 +401,8 @@ _addToCrossEnv() {
     runHook crossEnvHook "$pkg"
 }
 
-for i in "${crossPkgs[@]}"; do
+# Old bash empty array hack
+for i in ${crossPkgs+"${crossPkgs[@]}"}; do
     _addToCrossEnv "$i"
 done
 
@@ -384,17 +419,17 @@ export TZ=UTC
 # Set the prefix.  This is generally $out, but it can be overriden,
 # for instance if we just want to perform a test build/install to a
 # temporary location and write a build report to $out.
-if [ -z "$prefix" ]; then
+if [ -z "${prefix:-}" ]; then
     prefix="$out";
 fi
 
-if [ "$useTempPrefix" = 1 ]; then
+if [ "${useTempPrefix:-}" = 1 ]; then
     prefix="$NIX_BUILD_TOP/tmp_prefix";
 fi
 
 
-PATH=$_PATH${_PATH:+:}$PATH
-if [ "$NIX_DEBUG" = 1 ]; then
+PATH="${_PATH-}${_PATH:+${PATH:+:}}$PATH"
+if [ "${NIX_DEBUG:-}" = 1 ]; then
     echo "final path: $PATH"
 fi
 
@@ -423,7 +458,7 @@ export NIX_BUILD_CORES
 # Prevent OpenSSL-based applications from using certificates in
 # /etc/ssl.
 # Leave it in shells for convenience.
-if [ -z "$SSL_CERT_FILE" ] && [ -z "$IN_NIX_SHELL" ]; then
+if [ -z "${SSL_CERT_FILE:-}" ] && [ -z "${IN_NIX_SHELL:-}" ]; then
   export SSL_CERT_FILE=/no-cert-file.crt
 fi
 
@@ -508,7 +543,7 @@ substituteAll() {
 
     # Select all environment variables that start with a lowercase character.
     for varName in $(env | sed -e $'s/^\([a-z][^= \t]*\)=.*/\\1/; t \n d'); do
-        if [ "$NIX_DEBUG" = "1" ]; then
+        if [ "${NIX_DEBUG:-}" = "1" ]; then
             echo "@${varName}@ -> '${!varName}'"
         fi
         args+=("--subst-var" "$varName")
@@ -535,7 +570,7 @@ substituteAllInPlace() {
 # then go to the build directory and source in `env-vars' to reproduce
 # the environment used for building.
 dumpVars() {
-    if [ "$noDumpEnvVars" != 1 ]; then
+    if [ "${noDumpEnvVars:-0}" != 1 ]; then
         export > "$NIX_BUILD_TOP/env-vars" || true
     fi
 }
@@ -600,8 +635,8 @@ unpackFile() {
 unpackPhase() {
     runHook preUnpack
 
-    if [ -z "$srcs" ]; then
-        if [ -z "$src" ]; then
+    if [ -z "${srcs:-}" ]; then
+        if [ -z "${src:-}" ]; then
             # shellcheck disable=SC2016
             echo 'variable $src or $srcs should point to the source'
             exit 1
@@ -626,10 +661,13 @@ unpackPhase() {
     done
 
     # Find the source directory.
-    if [ -n "$setSourceRoot" ]; then
+
+    # set to empty if unset
+    : ${sourceRoot=}
+
+    if [ -n "${setSourceRoot:-}" ]; then
         runOneHook setSourceRoot
     elif [ -z "$sourceRoot" ]; then
-        sourceRoot=
         for i in *; do
             if [ -d "$i" ]; then
                 case $dirsBefore in
@@ -657,7 +695,7 @@ unpackPhase() {
     # By default, add write permission to the sources.  This is often
     # necessary when sources have been copied from other store
     # locations.
-    if [ "$dontMakeSourcesWritable" != 1 ]; then
+    if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then
         chmod -R u+w "$sourceRoot"
     fi
 
@@ -668,7 +706,7 @@ unpackPhase() {
 patchPhase() {
     runHook prePatch
 
-    for i in $patches; do
+    for i in ${patches:-}; do
         header "applying patch $i" 3
         local uncompress=cat
         case "$i" in
@@ -702,11 +740,15 @@ fixLibtool() {
 configurePhase() {
     runHook preConfigure
 
+    # set to empty if unset
+    : ${configureScript=}
+    : ${configureFlags=}
+
     if [[ -z "$configureScript" && -x ./configure ]]; then
         configureScript=./configure
     fi
 
-    if [ -z "$dontFixLibtool" ]; then
+    if [ -z "${dontFixLibtool:-}" ]; then
         local i
         find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do
             echo "fixing libtool script $i"
@@ -714,27 +756,30 @@ configurePhase() {
         done
     fi
 
-    if [[ -z "$dontAddPrefix" && -n "$prefix" ]]; then
+    if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
     # Add --disable-dependency-tracking to speed up some builds.
-    if [ -z "$dontAddDisableDepTrack" ]; then
+    if [ -z "${dontAddDisableDepTrack:-}" ]; then
         if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then
             configureFlags="--disable-dependency-tracking $configureFlags"
         fi
     fi
 
     # By default, disable static builds.
-    if [ -z "$dontDisableStatic" ]; then
+    if [ -z "${dontDisableStatic:-}" ]; then
         if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then
             configureFlags="--disable-static $configureFlags"
         fi
     fi
 
     if [ -n "$configureScript" ]; then
+        # Old bash empty array hack
         # shellcheck disable=SC2086
-        local flagsArray=($configureFlags "${configureFlagsArray[@]}")
+        local flagsArray=(
+            $configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"}
+        )
         echoCmd 'configure flags' "${flagsArray[@]}"
         # shellcheck disable=SC2086
         $configureScript "${flagsArray[@]}"
@@ -750,17 +795,22 @@ configurePhase() {
 buildPhase() {
     runHook preBuild
 
-    if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
+    # set to empty if unset
+    : ${makeFlags=}
+
+    if [[ -z "$makeFlags" && ! ( -n "${makefile:-}" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
         echo "no Makefile, doing nothing"
     else
         # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
         makeFlags="SHELL=$SHELL $makeFlags"
 
+        # Old bash empty array hack
         # shellcheck disable=SC2086
-        local flagsArray=( \
-            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-            $makeFlags "${makeFlagsArray[@]}" \
-            $buildFlags "${buildFlagsArray[@]}")
+        local flagsArray=(
+            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
+        )
 
         echoCmd 'build flags' "${flagsArray[@]}"
         make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -774,11 +824,14 @@ buildPhase() {
 checkPhase() {
     runHook preCheck
 
+    # Old bash empty array hack
     # shellcheck disable=SC2086
-    local flagsArray=( \
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check})
+    local flagsArray=(
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+        ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
+        ${checkTarget:-check}
+    )
 
     echoCmd 'check flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -797,10 +850,13 @@ installPhase() {
 
     installTargets="${installTargets:-install}"
 
+    # Old bash empty array hack
     # shellcheck disable=SC2086
-    local flagsArray=( $installTargets \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $installFlags "${installFlagsArray[@]}")
+    local flagsArray=(
+        $installTargets
+        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+        $installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
+    )
 
     echoCmd 'install flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -830,39 +886,39 @@ fixupPhase() {
 
     # Propagate build inputs and setup hook into the development output.
 
-    if [ -z "$crossConfig" ]; then
+    if [ -z "${crossConfig:-}" ]; then
         # Not cross-compiling - propagatedBuildInputs are handled identically to propagatedNativeBuildInputs
         local propagated="$propagatedNativeBuildInputs"
-        if [ -n "$propagatedBuildInputs" ]; then
+        if [ -n "${propagatedBuildInputs:-}" ]; then
             propagated+="${propagated:+ }$propagatedBuildInputs"
         fi
-        if [ -n "$propagated" ]; then
+        if [ -n "${propagated:-}" ]; then
             mkdir -p "${!outputDev}/nix-support"
             # shellcheck disable=SC2086
             printWords $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     else
-        if [ -n "$propagatedBuildInputs" ]; then
+        if [ -n "${propagatedBuildInputs:-}" ]; then
             mkdir -p "${!outputDev}/nix-support"
             # shellcheck disable=SC2086
             printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"
         fi
 
-        if [ -n "$propagatedNativeBuildInputs" ]; then
+        if [ -n "${propagatedNativeBuildInputs:-}" ]; then
             mkdir -p "${!outputDev}/nix-support"
             # shellcheck disable=SC2086
             printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     fi
 
-    if [ -n "$setupHook" ]; then
+    if [ -n "${setupHook:-}" ]; then
         mkdir -p "${!outputDev}/nix-support"
         substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook"
     fi
 
     # Propagate user-env packages into the output with binaries, TODO?
 
-    if [ -n "$propagatedUserEnvPkgs" ]; then
+    if [ -n "${propagatedUserEnvPkgs:-}" ]; then
         mkdir -p "${!outputBin}/nix-support"
         # shellcheck disable=SC2086
         printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
@@ -875,11 +931,14 @@ fixupPhase() {
 installCheckPhase() {
     runHook preInstallCheck
 
+    # Old bash empty array hack
     # shellcheck disable=SC2086
-    local flagsArray=( \
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck})
+    local flagsArray=(
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+        $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
+        ${installCheckTarget:-installcheck}
+    )
 
     echoCmd 'installcheck flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -892,13 +951,16 @@ installCheckPhase() {
 distPhase() {
     runHook preDist
 
+    # Old bash empty array hack
     # shellcheck disable=SC2086
-    local flagsArray=($distFlags "${distFlagsArray[@]}" ${distTarget:-dist})
+    local flagsArray=(
+        $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist}
+    )
 
     echo 'dist flags: %q' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
 
-    if [ "$dontCopyDist" != 1 ]; then
+    if [ "${dontCopyDist:-0}" != 1 ]; then
         mkdir -p "$out/tarballs"
 
         # Note: don't quote $tarballs, since we explicitly permit
@@ -928,31 +990,37 @@ showPhaseHeader() {
 
 
 genericBuild() {
-    if [ -f "$buildCommandPath" ]; then
-        . "$buildCommandPath"
+    if [ -f "${buildCommandPath:-}" ]; then
+        local oldOpts="$(shopt -po nounset)"
+        set +u
+        source "$buildCommandPath"
+        eval "$oldOpts"
         return
     fi
-    if [ -n "$buildCommand" ]; then
+    if [ -n "${buildCommand:-}" ]; then
+        local oldOpts="$(shopt -po nounset)"
+        set +u
         eval "$buildCommand"
+        eval "$oldOpts"
         return
     fi
 
-    if [ -z "$phases" ]; then
-        phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
-            configurePhase $preBuildPhases buildPhase checkPhase \
-            $preInstallPhases installPhase $preFixupPhases fixupPhase installCheckPhase \
-            $preDistPhases distPhase $postPhases";
+    if [ -z "${phases:-}" ]; then
+        phases="${prePhases:-} unpackPhase patchPhase ${preConfigurePhases:-} \
+            configurePhase ${preBuildPhases:-} buildPhase checkPhase \
+            ${preInstallPhases:-} installPhase ${preFixupPhases:-} fixupPhase installCheckPhase \
+            ${preDistPhases:-} distPhase ${postPhases:-}";
     fi
 
     for curPhase in $phases; do
-        if [[ "$curPhase" = buildPhase && -n "$dontBuild" ]]; then continue; fi
-        if [[ "$curPhase" = checkPhase && -z "$doCheck" ]]; then continue; fi
-        if [[ "$curPhase" = installPhase && -n "$dontInstall" ]]; then continue; fi
-        if [[ "$curPhase" = fixupPhase && -n "$dontFixup" ]]; then continue; fi
-        if [[ "$curPhase" = installCheckPhase && -z "$doInstallCheck" ]]; then continue; fi
-        if [[ "$curPhase" = distPhase && -z "$doDist" ]]; then continue; fi
+        if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi
+        if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi
+        if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then continue; fi
+        if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then continue; fi
+        if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then continue; fi
+        if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi
 
-        if [[ -n "$tracePhases" ]]; then
+        if [[ -n "${tracePhases:-}" ]]; then
             echo
             echo "@ phase-started $out $curPhase"
         fi
@@ -962,13 +1030,16 @@ genericBuild() {
 
         # Evaluate the variable named $curPhase if it exists, otherwise the
         # function named $curPhase.
+        local oldOpts="$(shopt -po nounset)"
+        set +u
         eval "${!curPhase:-$curPhase}"
+        eval "$oldOpts"
 
         if [ "$curPhase" = unpackPhase ]; then
             cd "${sourceRoot:-.}"
         fi
 
-        if [ -n "$tracePhases" ]; then
+        if [ -n "${tracePhases:-}" ]; then
             echo
             echo "@ phase-succeeded $out $curPhase"
         fi
@@ -987,3 +1058,6 @@ runHook userHook
 
 
 dumpVars
+
+# Disable nounset for nix-shell.
+set +u

From ac55f68afeb6276b66c80d7e67841856c63420b4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 23 Aug 2017 21:58:07 +0200
Subject: [PATCH 2558/3246] firefox-devedition-bin: 55.0b2 -> 56.0b5

---
 .../firefox-bin/devedition_sources.nix        | 762 +++++++++---------
 1 file changed, 381 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index a436cd46a11..2da11eac98d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,955 +1,955 @@
 {
-  version = "55.0b2";
+  version = "56.0b5";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "003297708bc29bdfd471ae4af99a39f3c4732a067ad56e7f5a49fe8caff7a88dbff9245a4e8843f504f80c0defd2c2fa62819e6b71c176da6cd0cfe9d1c614d2";
+      sha512 = "42b7889e0358946f0852079433eb84ac49b88eacd5baa1213082fff71a8bb2b060b50b6356c20cb2b59ebeaffc245f04ed086a4fe466886f5865c857f99b9ce4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "4f32ca70b0891bf25fe68196f5e78fc9368cef5dd2016f8cb0c0b099fca34b154bbc6b8faee831320fd0bbfd35f81ad379e44c7778d78b1b517175b3d5a42dd4";
+      sha512 = "c784881efa9b4ebb8e5a892a4d9fed02f85f541461e6fc8065d9a6a8db629636e00eaea7d1cb009005de829387a4c5614465e696ecba66af2516cfbff35f6d82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "01d1d9df2c24c6e41ab6a29028ef0c38630c7a786cb310eefa93adbd334d8b1e65335225b3fdb9f21bd8740d4d9710085d750144b2670b4a30e326bae0d96d78";
+      sha512 = "8440277fcbf3b927ee5bddeb572d55ef2f23997016f8cd5b21e88d969cd863a3ed7076d9cacdec4939e58ec2bc706099a322336c2fd4b796435165d55f206112";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "731ab03cf719f8181c097a40436c5123c2fac528a4c420b5564d79d094bd506dfe58c8718d7fa1a0d3e3223b67173de1826046fe09c763248bea79b7e1485c4b";
+      sha512 = "4cc24cf7ae84bdb9520ebd6816a46c6311ea92dc50c2fd8fdbb4eb2384bb45357b9dbef641ffd5be1ff4fcbbd23b2fbe53d68136717fdd3031564309cffbc2ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "78f9203b0cae15830ee289b540d56e6664a486f107f99b42020809375ead3193da2e4e1bc7bc25ac20256ac07c55e4c619302615220b0a1ae742ded4f4d6afe7";
+      sha512 = "2d0d1f5fbff86c7e0f53ed4c721e6b2e1bc8169aa5a2c75f4752347614da669b3d097e68e62b0b53373c408818ea01fc9716a7a0b1932f6ba7273d6f31fb99aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "401afbb8c2945724b0754d95b0385822d77a9018874c067b83864546c5565735d403ccd1a9f999af0be10b806ec2b64bda5f28306f90e5171406b8a79dfe5975";
+      sha512 = "fc7f099bb283540974eff2dfbec5fb212b3a27aa09be8d04ff847d99fa37183435f296cae389fe4161c436d3005935acbdbe00373c54cc5d18b140f26c3d829b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "953b91a7681e033219fe80d63ec41ed50025f1bda91cde9f6124bee46ed89e38c8470257e1791878443adfda94a579c9261c2ada6c8d415a62dc27b38cf6cb66";
+      sha512 = "557ddac93830536ace4fba1ab634e1eee14fa3c09c3dd95a16c169437f8c255d5eee4ee54791d8fa1f97123b9ebbf91a57cb70cb4fdb61b8805c2252f1640329";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "366f951b05f62a0f158bd1a345fe1540647c3a1d5b91c49c2d104f76974a64030e830dda3afc15828309f88100c4f12d5dfee98827565c96acd62a4e0db24e74";
+      sha512 = "420b8d556a0b6364e48eb04eab3e29a63c63f52942384c0d9ae19532754b51c98bb0b8d19c871c92d8d9127cd289dd0a74c30e7167d86e32d378a7820bcee184";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "51542bf88583b2f2dba75e1abfc892c0595737e74ccc6844cb470513bbad7c337e1ccfaa628f08a8d5ce09b91812ea07758831d5bab54ac961652f905c9b216b";
+      sha512 = "b63385545d6d006e0febe92a835ad4b809a24bcc9c44d356bdfb2338819e6430d0c73922a45fcbd6fc076362794daf7a68a9662aecab6e610a518ac604757910";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "9f41fae202b3a38115b1efccb0358f3b8896d8f44730f4e53896fc48c9048d6a1ca8904217312c6bd9f9ebeee1514a85c1723acae8e293559289aaa6b63661ac";
+      sha512 = "3d4754940f51a21bc3e881bc454349ed9bd6cec84395566d76d1dccd8c8464cb8e485f35d1e920c7ec0ec93304c16d3d323a94a00f3ffffaf5fdbce46da24da4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "6c617687ee2e1460addc86c383a9967803a6900845a2c98d4ef67f2007d3cbe82e6e8b046e4d990b59b8a001f60eaaaa34a50494cc1c8b9d5bfdf3951494022b";
+      sha512 = "fe16eb336eaadca6c73ef1655011ec8acfa3d4166f21909ffba109fd90190810b66ef3519d172b0f963f41776616ab41b25dceb8f9a6b775c8df5f305f6f1555";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "23cc36ad34c20003cd3a4c11eb22e6b35ba1fc43ec81fbbef0ca3c7aee445920d66620d355b60e6439296ff19805d29f7266060c2abc5937b266fe45f5af251c";
+      sha512 = "17b0a958074d4db010410fc2278a8a2a4777fa68c8796b28f70d0b65ffc341de283ea6b89410c5228482cb920ca21031784d4e7a3afc01c8ed0b0412bbca8cfa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "97b1bac5f6637c07578e689011721e261feef2535feabef4a86856a45c3a48c34da692dcff7aedd4c381159ce016eaec0b6c50acf21f9e045a4679e494c01a3e";
+      sha512 = "536f92ea3b7b390414bbc9178d855fb3783d5659ff165d6846b5233dc9e46fd46323783342f939b8daa2489be4df7f3f33859f629437693dcfd3fdd982192905";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "e188a8de2f0fb240655f88176a138a7816929a5acc708fd66960b8f51798fb240e63932498eb7db64868eab95d2b9c95935eb6475a0752e1525c5c6403a78616";
+      sha512 = "f7b36fcba699aef0438192bbcc13cb6426b69036f1256c07422e78df45220960dd122f9eaf62984041c142f2fc16f858561d9efaa509852696d0c869f097df8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "f98825c86e87c3010a48e2e71752b4b61d118e72fc4ef16f2c3eecba54e6af37671ba18c4a7564157b8f65eb552c92c461ca190b80b344103714946dec00da3b";
+      sha512 = "6c4abfb4873d08ff30ed48612e536106522dd39921da4e3303d752f468e64552a77a65631474e2e2342d1f6dc4ed94ba74b2c6c0bd15dc559468195c2ff3e95d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b5e007f882126d7c1e40d9750c9016dcf98674177cec15185ee340ac779cfb81efca0d23486bf7bcada25654e7bc15dd2cc78ad948981e668d0a00a5f138f62f";
+      sha512 = "be8c3a83f0d74f7860603ba0665cac831d787eacc427f8bd42ea118409ae9f1866a75ce06a4bf88c732847e9df5cdaef33ccd25d9dcfb5b6795af2bb5f83c971";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "ceb4f5eff71192a8be67ca79feb3a42390501e11c2c2d2c3a9bbda42a6fcb71362665e991a84fae660442269eb4b91ce1cd8c860a6b801eeda2569a1e7800291";
+      sha512 = "a5473c8f20f36d755ec01feaaf62281f199041b1bc938c7477bc4205c488265457fba6d204f7dddcc67f37e1c92ae2bd312a8406a3aea0a34e50ed3dda364a20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "c0cf7ef6fcad94ba4ac44ca8b4d272fb88c0e63a477b4829a675585204e19c88086b8f21f89c52c1954624dfc1f0f9a836d3333ad8c6989fd398afe2eb92234a";
+      sha512 = "0408c697dc971b6eb5225a3038a79c18fad96a75ed87e3f061665d00baf27c05e060835b3b77393bd50247c1a13ffc2314805460bf5d5f881ad0a48ceeb090fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "fb4423b8f154f0f124ad0a36ae692ad8962564aa9ff7747d412a73ca983e1164bec45d8ae6f983f91f2e657701bb268b96d4ddbe8261d68bd41e07d4f7c9fd5a";
+      sha512 = "1c93a760f4847163841dded76414669bc94aafddcd4b1b366f72db92e10575dbd52612ff5c906449dff510ae108f13cf39e6e836071c1d4b173dd211a98bc874";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "f17bcbd5885a0caa72380f1dafc65c4e104897abaa03f89703501af9dce33ab9e9dd133ea8fd518809e02f99ef6c10a9c5f516b56e05d700b6324b3a101de18d";
+      sha512 = "622bd1d9399e6be83c1d03a8a99b31ae1561c45a2bd1a62677c0298408125cb54df7e76df7b26ab741590ac7dfde9e0df0c3b8e202e0267ef775705b73fd4299";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "cf0304640af1f3b27b992b32e59a215d5cf95e8b0744266a86ac7738988faa8e2fcbe6b22a50990298cd7a6512747a0000e9788e50b1c32684fa616a7159cbcf";
+      sha512 = "c716d48bf2ba9eb8e2ba6d15d96a0378478937594376da77699e4239ca7b410d8088b97eb7a2076f05611348b6376c5fd1219166ab81d84022f958b1febae751";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "dde0c233b45cd72b63b39a4a99e0d3c0a2f0a63999fb6ba9bf8bddeb686afe6b03a441215e5f2d5d192a19e49b63dc3cb14555c2aaac4efe196e7d58ee83fb27";
+      sha512 = "b19aa13d69cbbc5d63e4e6f819d6ad888a686a07a6b62b8ee2c745fc8fb4d7340dfbd3fc31b2a7e4f23be1e187a15455e0a5a3a9065b759e574f7c9c756917dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "d5e35480eac87eb0f073e0ca413eec6ba6f54c7b14b0ffbaace7a130e07703215d5f7ed3c6f7356154f6a0388f4ddd695419a4d84e4ea42a85c967202110016c";
+      sha512 = "613dc9d25997f80927b6b7b850fdf9b4287497bff2446a490274faf99a4fabd2b2b6140bce560f8edb5dc1f3da09a9a855547afcbace3ffcf2172befca74a0e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "3831f3003fa5376b88fa216dc309a15b2332d4a9ba332d78b0067a38b774f7db40cb86d82daf7e0dbe5785ed72f603feb3542a84fe219bd4798cfeef1c46a268";
+      sha512 = "c0f5506e770d57bd5f5bbe84c89126e835833c059dd064b2b4af3aa31514d0223cd3b3bbc23fd99828c9dd07bbe63eab89415667ba1b269a2db2c90d165f492c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "5dddcc0fefb98d0364097fc374f033b8063cfe07ed77b0ef0f8f3c58cd907b27c860ee2776952d3900b99f0084494c304aa38eb07f659dd60765d991f86ff69b";
+      sha512 = "ff63cea657e4e78caf74a0382624accc1f4f4870af36a8b425df305e71a84d605bc2fe2c91636130053092518763fb2ad0eb2e2c73ff443b1c05fe0c31f892c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "4c1f58fb03e85a96ae339447135712ac59a5280643035f2b1ad684858d58147e62dccb9d793829a30160056891538c56df5f8a73b3342b8aaceca8a8c8b7ec40";
+      sha512 = "00c89d9dce0deffb2fa536172e040f4f75f170c8427aa3bffd5c1bc526af45b439c28e1973db1a3ce459e5fdee40a0c817b5580b9cfc68f85259cc27feea6b09";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "b96414975770592a829fa95c46dbd9c14cf1509bcbd8787442d23b55765dc3abf406cbd3fd100ad3f8ba243103798e1b060a6bbc1deabcdce24d52401b6e065a";
+      sha512 = "6aa8d504e2aaf86dbae7f637921e8e354f63e98f59be261f80256544cc5568c6f8c616fc72948bdc1d30cff62dd36513c838fae9207a8b7eadd7b20e5fa017aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "bb5d87a32d9c9c10a54273cab014caee57a68d5b1ad3de3ea10ccfd9517118a97d351b789e171514720d684e4d1c5fd89554f3c776f832d69e546d729bffa01b";
+      sha512 = "ac3494d7704c2962cd4c00d5fce1fa9581f0565dd5f6dd90eec1638237956f8204dc68b590ce75e5ce6961d786a7e722d5ad0dccf036bfd51ffac530a8f56519";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "5136699c8ec08604d1b8040bea67477dc021a50af8eaf7cb30dc9d5462fd1fbf6be2e418ad531056a033c5a661d47e9c8841e3087b8ebca3f9b1eee24d0cc20a";
+      sha512 = "6fdbb08c25feec44b38e6b4beafde422fc04bfc1c54e049a1b863c8fa4954a2b1ebfa5a4d26c507e83b446d2b836d922f4c6cbb71f77cf616c7088470e73bcc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "77b0dc7274c941efb10f25ef80d2cbc70c3d3243e6ecc07459bba933fbb01382e6d8757c77c0fc26fa42f39be0761cf07d783a1e2cf5064a73910adb420556ba";
+      sha512 = "317b05efdf3e14b907d7240d8102a2a826d2906a52bf83ecbef8f184d813af7b764521b2c884e70e29f50c23074b41d4887dfbab9b6fcbdb54c022cf2d16ccff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "f842af2f0b7e1894d49da17dcfa910df6976976cc59e58603d119adbc1fd7e4a4316ade167896b57a40e6480acf54f168a5630d3b30a7136360b3e9a6dd10d05";
+      sha512 = "7a81f3320c8adb613f80074a95cc877589eeb8b5ea47408fe526641059ac3c70c8b6a381db2f8b1c575acd2aaa857499277ee6a0b0e294038c4d29800bbd469b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "37899d6ed1c16785d9b41dd2593f504c5fd9169210b6f4bf79e4f8c3a7f00dbce74e88eca4884fbf08c28191408d886d0762f2d79928bac1820181321a53ebd8";
+      sha512 = "86a5c82dab2766fa00991409fe28f81ec0d2ed0ac67b9854c5a78e55677e58b223edc13a4e122397eecc34b46bd5dac80d3e61d3f35eaf1a49ca544193de3a52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "3a0a3cb965822ccfe51c662986fe2acea2802a72bdb9506f48c3b58e70e55f7c283ef590946e4c5c6b9aeec026980a43846dbe2fbe41744d4c9cadfabfef79f6";
+      sha512 = "349863d7a8a3b2637296422fa750f72fc14df88c944c06f8ad1e8dbb3215a7d5106a331691712127a5229a48eebb090c750b9fece25da5c34261e9ee64c2eec0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "a1d3bb077e396caa2df99a1b95a8eebb32d929980273c8f748958b7ffa6f1f7eabbf486afb195cad613d2012f3af0a355152a631066215d717bb7e270c05b72b";
+      sha512 = "83687fd94ef6ce5def8dc427b08e50b1c0a41f97b81c6d7ffb83863aecd3f97f3c3f6301a4d5f5c1ea8833d72e41d67955bd4664502e6cf75b4b327e98fe0552";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "012bb9748fa46c6a61d958bdcbce045ae050b1571ba4cc19a91314468f2144976a804183340f3ec0c249eb548ea323db872529a0a3cae391b840069ab43ef397";
+      sha512 = "2527eb06212a1e1063f91fc59af54ec427ef1d23ca9d1f1f4232be964679ad33bcfbf7acda4e3c3ced32f584761f7f506c2744552877fe3db35a36387d995263";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "f78c749867899de82295aa928a4afd256f5749f1a02b149eb2bb26660b9073e3bc4ba6a7acbb02a050ca54a1961541b2b9458e5827cbf7cc4a31e813234940ef";
+      sha512 = "7a64a19cd37c1059fd338790d8aed3b9d0f9319ff8075567b98f721a2c3f2cac9dd09f5a678bd8f4792580bef2558a858bfc6ce33afb8bbd8c40afc3f85cceb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "88652cc3006f731ffa9549cce2ed3d21553753105eacd7260e0274bd63acc4f77b5ee60ee2967cf963c37779e27290f95f61731701666d22d5ca3dcee257cf5f";
+      sha512 = "8b29fe1838e333ac3704994865bf61b11b99b8f91b46fffea30047232b8bee3589f4f27ca392a64abcdb902042ddb4cd0860dba97577a062f21f4cd994d63366";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a0eb1f4e1ba442deeffee4cf074ced94844e167fe58ecb2985555ae233f22990b11ea5eed9a219f407adfcd8fc18ca6c21f191802cbb12fbf767a0d2742154a1";
+      sha512 = "979009a44710a0206a035bd752b2c61f2178a354a692b327028cd5896a18ae4357955303dbea9326393bd993e9b088fd587d82917fc89c93a45275bdce3f3079";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "51363ace7df993022052162a5eb6b1ad65bf66eb48e1cb713deac1594f3883401f42f0a2f5c1bd7a73eef1d45f34df7a8d1976bc1d115bec134d9c7cd671b1f3";
+      sha512 = "8a6826171d549fc69cd63e6916e9c4abe10c76d0f1c149e6282c48e6f6895726d41714e8c83b4a5128bd9790bb45f186bc4dfee03f06e22d18be859cf31cad66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "93549b7a3ffdb275a4f4dba8a80f292cae039506990085484a9f6a54665a7588ff04c29ff5746f8c76e9d387272e18312ca58313cc255327b0fbfab53598515b";
+      sha512 = "8009c5297c726346ab7c24bb88ad4a7a4466dd19f01a526e1786887115600b06b37a2b80449ac1ae207f2f4c07b6a2343f349a7c314c7b7d1e934769bde47a9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "5da0acb3b9c1588f971cfd3b40041a46cd32102b619984e3e9b16ce9f6b950c37ccd16990cd6b912bdc5af42e9cbbdf6849fd7b3716a85b2217f890b5241233c";
+      sha512 = "329ed99e9553ccf99f5cc0d1f69c1c1aa931ad12720c2d3f340e2e139d35f142d97fe8ca43f1ea80b2d366379d46f8ca0ccc2e774ba9f9f1ee1b67599e794627";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "f5e703361f106f63d101df3c591c0f63930df88b72bcaa0a93ca1ab0709c325edb1680d1955eb678103343c97719fa0b38b1ab8f12458538087f4a5f31080060";
+      sha512 = "f2623131ed9451d74ade849c33bb04b38ba3d555e06ee45a5b82ca4f6eefe55a4797e5d53231916bbe3589ac277387a103aa9675a32ca372af53b4778cb44133";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "237e1fb08f8dba0bf72cfa32de252af6cde28820ae0f46d4756fa4a82893752a343d9cabfa4c719a4e39897fd6e41a32349ce2fdce61824a0dcc101cf9254681";
+      sha512 = "33f35fbf42679b48911ab20189d470daae6c31f767fb0359ce674ddd72150013dbeadc9a3a73a116a4d39b725cc54622b3fd19e84e5b388edbe2efb9231e53af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "908dc023c384b447af89b7dda7c60d2d2cdac3f386d1c4005d78490b4df5b69400b72ac743e9cbd0c700e4989583945cc2da0f2b8c0e1a87917ab1d37c842f4d";
+      sha512 = "4ef717da1b5ada94ab5d41d529605de22270f5d9f037b7bf3f19703cde55b6757fe396c087692faa0fbc500a60a4a6562f8fbb9c36e3deb859601c967c68f112";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "c4a91ab0f38eb0f565d021e798c30dd07e4d259624a50ba1f51969b46e257396b9faf8a0676675799f476ed9c71fab540d0bede002e4ff6e63d3114a7114c47b";
+      sha512 = "2bdb5e05436c24c0c4b856f2d2feffc32165240b2b7943ea5a7c93f46b1068eb21bdeac2605ab35d40ce596c9aaabd8809523a3cf768615eb6c03d9661ab815d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "cc8d632d7b9aa675f60780d0d16bc5da2f9853813917d6e89a7e0f47db288092fd2da94bbe28c0959d4589c23422df1d15101ed340059a3e5ebb9c622aaf9c46";
+      sha512 = "81cdebd0af73a7b8983e2de296f12244a6b0a92be865d0fbe089d74af127663cc3003e822bf525316bb14664ccfa3412b7424069d1b7abd17ce1e54cd5f66c7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "aa37883c2b1b880f807ab3bf2ce4cdc99e83cd8a80e5856055f33a0eed68eed21a3f8b5d20394ad706b0ae707d2469918bfc70c52e270b2b0303953d560e34b5";
+      sha512 = "f4f0e9009478904018eed8fcb6da30fa5607b5b00ee7521aa290dd13ae52e616e5903ea22e6e40f87340e3740b3d415b53bfd415ad288d601ced9318585667f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "cad8f320178124b82fa27947908191b02536691e9129fbfe9b782ca0a15a6d7adbfeccd2b6bf2bdbb4aa1d4b3d4949cb55b4188b49078685e4d07ce2a90eac20";
+      sha512 = "75da4e9be3ecce3227a3a914d9e5da90de8d4abcf49a4eb1c119d842a97a6cb789b703d3199ede4ca03502fc9e0a940c1829c85eea6adb7fbb4456d71838c39f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "7f64839be67ff5709d4ee08838a4c15e9e7971032a89390335e27781176c9d1fe555a070968f23a9cf786c3515ef028cb4911b4fb6615c38f94fdc700d35c169";
+      sha512 = "6a3d0d38f257571c865295a6b3542c1bdb8de2344c5402b8f46a85adfeb367444fd1c693611f7b0fe7160a7552086d0d2b0247fa7757d19df1eb8375f2655b06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "bd1f6c79c108f1fa1c01b445acd9f9ecb0a9f088cda0a113b48e1ebeb7503fdf36789881643cef359407e587eaad6d0dbe27298554b5025602f90d11e3c9ae0b";
+      sha512 = "650239200182d14069faf4557ccd02f155af0c954e1aee11909c648067421fc27f8334fb038a60eb9c0fc661edc0bd43e7a87ce345a4580bbfde798c5ed301cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "2f9eb69e4f1db37c46a63eb3f71edd461727ab98e5fd2ea6925cab501c2f7aa81b8870bd42af2d4e30410e8d6083cd103baa83f07177ab7370a0d96afeaf424a";
+      sha512 = "da783d020fec47024e27049a163c415ad050e65d0194324bcbd1faf9005b03fe02c2e1349855c8e00301a13a5507ce3bfce58506f375a4276fb912dece622229";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "b6b2728e9b74bf6c1eec3859c1dd8ee7d2ee98ccbc45fc28e2caaf45f1bb71e05b42361a25e3c4e5d71138b5b23b764d9e8e5288874cfc7b96b8b0db33088147";
+      sha512 = "4934648edf61441922dae1703ea70b5c670e798955891961432709ec04feb46280ee8cd924f37ebe4244f069d3d3f9d6dea71d09100fe7e11652e30a9c16508f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a4c3dd17640fff69deff932488c7322c687263c28d8bb352af37f7bec8ae442aa821782f011953e07b34c37ebd62f55c1b913a6fe6d634af41a41137c57e89ac";
+      sha512 = "82f28e1309b49921e735f0bc3818664c912877ff6608161f7ce86ee821857e321cbea7db52b8e640fe989d5b52c2b5069506b0af68e6fb89660b79e7c5cda95e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ddda306e1944d9ed37f9372ee247a2008c362235eacdc1f85ee2b875b88c968736e111b8db8d9954a3c6b0d31b76822b69968bf54394269f426ab3d4a3b11e50";
+      sha512 = "befd1cda746b5c795584e066883835d16cdbfbac14e5e919140fb0ff2d695f0f793f7f27fcb60f2d98ba9c9df0f2c3323b72decc6aab8b40e64d7fc2a9b01314";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "651cb45d7efbf85dfd081c0358def68cf1b98f9ac0025a00a112ea43c034d974a8caddc07460ffa2bf4638cf2e9c8730408cc2d5907e74645f3509861f2ee5eb";
+      sha512 = "c302d0da1baeb0c96e134c40b97c1fc095223c45916496074857a39a16f8505c929a6eb2d73cfd679b99298b305c061734426177d5c7f72e616c3cc792179e67";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "ace13edd7b784ae7496e6c6e7959e8c343cca43ef77cf9cb9fc43895720db85989b794228296af05068c6326e8704929bd2d3568b475429a839765c9c9bb18b2";
+      sha512 = "0318de8cfa51d459cf852a073d064fd3a129c081897a35bc2e1e456bf5149b305a80f2a01389f271c844db786c4ce00feea6b011ab3c7fe0f5102b73a65bfb8f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "4cc11703b836f50e5797638922bd5c3fd79dcce4b200c1eb2036876569d317733dbc38dfaf10eaa3fbd4309a1a131dddb62ce360608f82aa08c78b1a383981df";
+      sha512 = "747fcd8849372aec24c6a0c25a9e8df28d1afd6255f60be64d050204fd72bfed385f11dc3ca6d721bfe05b13d13b0b0b45343c75a7bba5950042d5984ffbb831";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "4f57f8ebb8a2d2d2237b23f703e791daa92f4692c0801fd63a1079c82f658c96b33d4c64be5b05c976f05cce74321d3cc0a3d09350461830fe89361b23a71916";
+      sha512 = "102a20ffef4e3720f0cec2ec9d5803a8f5abbd66c99195729929225acbe292f92f4e505119f1207a5d0d1b0a148b3b484bb22174acfd6d6d79b464ad3c61be70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "1dc3fedf53e70e5a299ea925484e3c995a670fba7227b56767a4887422aa4da7d536baad2655432fee86b89404fad7cd239b4c814a545e7be27db6a2ed91b725";
+      sha512 = "23e3efe3f8fd80907e685090f82305cac2be37c7f8a38c840b392d3f5eb7ba3a607bbb35c4a6c6191c401c6247d1f8c4ba2b32cc857c848aa8d4d380e41c6808";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "c97cdde91fe876bfb5da846e486d1f34ac9ba9f14d39ecdd53bd397c37fbe44254df3110d0854b3598c3a6e89883c220afc69293e09877fdaa49d7c286be5cdf";
+      sha512 = "9b784af41d5be080cefeeaeb4519bf0f25a9c201853fe078cd91e6074c678cad8ba69c1bf2c1dd018f41dc6c645dd3b7bafebd402a04f2fda93a05a0019b1d94";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "afe506e36a228dbf1c8a3918077bade8a69d51c801cbb274209055e6062c9cbca340e153842d9a24637c62cb6833f99e69fcf3b92b82ec16afa882d566cf44c0";
+      sha512 = "d61f3668ba4c7187b00fdef5a3bc46601c90a148be468ce021a42b3218f9a30bd8f4780e80fedd98d7e1133ea0e899ef02dcf2d715688a6e384aa7db542337bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "b9cbec5c7f75d6dd2fc69aea6f182bd8682cc2974425973b5d7f42982fa7f69b384bafae1bdab4fa225f7965f9d2a37c0e127ff12d7ad1991f998b19deaded63";
+      sha512 = "79d34cc870eb41c5d709d52b16b448b7e2d6f35877957e2173cdaa6f66dc889fa489258cf7b0bed1e7e87b187199eba799396e65bdcfcbf1d0ec0b258b2665f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "2e7cffa6991ee2ee8018dfbed50163c6c905e1e9394ec880d92f12bde8d180ef6445a8f20c217f620b3ed19efc5505ab2b158a679adc97a904b83d46561ba0e1";
+      sha512 = "9fcf038b2f891d62ed7b26fec3bcdbecbcf530756f38887c4f1a71c58cb2fc82af9320b03cfbdb5762c80eae7620fa0116f32d22fca5186e7a1b2738ad0d71d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "9e3ffcb028a9809dc34969587585fec94c31e3f8561c969bec5a1f6d9c436ac02648185a56c4cb95a16b400d6abcb1c01293505c51b8e9149625bdd910523aca";
+      sha512 = "cfa9eef24205cec3d1b4a6ce58f4814d33d9806ae885702d3c0ea96994126ad9d79caa7551780f3581db0de7802f7e4cc666fd9d5bd55dc7da64fe4d5dbadc2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "29f08c10050013832f709bb0b42ea1f6a3ed191ba979efaeffba44e5ff27220c7bae9717d68a9478c2a452eaf0ef1e8da390eced1f5f7a37ce1ae5ee6f4bfa6a";
+      sha512 = "0be1321aa5aba417b5ef27c1b6ddbbf10d915cfb3ebc6f70a7473f31284a4f6ecd7ad61ef27156fa8b6008598b0aae3b3b272ae4f0db2ff477083e037616efd3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "5f58e403b72cff6963a51a4e32ae55f94680460a658ff5ede90e859aa1de849c89abab33036cc194b9a3eded23b61d53ff9e9f98bb653785a1e60848e32533dc";
+      sha512 = "ea25f3df7053cb85b3cef5b3428c1e023e6631c7fb836421e5afb9794913057feac1083e08385ec595c7fe9ab578aa5c8728dff9f338f4d1aff09697c0985c60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "2e6c4cbc3a73c4669e7703b9847a52849bdde3a5cf332ff0aa76cf5336f21f62177daf050d655250e552c7beb4a05043cfddc276896feae1e03b5dade016e0c7";
+      sha512 = "6eb487bff2f942fc7c319551eb2558973235cf05cb47e5a8b7273c0cd2d9162ae96345aa3dcd38710d4169f84fbb5ff28aa16277d98a4aa0864c9608f98b8f89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "bd0afc4ef24c68e1a503ac93ecdb969a29427548d5991f47b86583941d2a1bd8d9af88e3a46b74b52b5957cc80d05a2dde659cae2c33028f87fc48beea637366";
+      sha512 = "20587b5fa98ac42adc9b83c704c5c9eda0bd2b0c40475b71d11f289c14c5df3e7811c4b4661d82baa99436ef143dd8185d2fc30bfdb8eb4c64ff72c5986c3df5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "c342102835e18d7d14e18e1f7185547d1b2385ce4157554ee65e76766885edc62d1d7e4a911af206d2bf34caa0377b6e256e18c06c41082074a868c5a6367f45";
+      sha512 = "c231055deea74c29c30a79be5e592cc5ce21aacbc3bb53d8d7a35ff5f6ddf7624e6d4f3257c7fc2c99bcd2f22359c38ce10508f31b786bed90c9f68c3e916c6b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "154b729897c7fa4e243eb42c7e365f658f3857b0b799a633e446ed1ef7257e6387d755c0534ce2cf81e0008caaa205c18ba512a3b3c4e6f31f6a5789674e16f7";
+      sha512 = "092bcdfcb26c272dfdcea1a8b05745fec1d6d41c6b8ed930f44d7bbd83cb190857ec58e084ab602ee2499ef73743a4a6582e1f53b59151285978a9a1e64f2d35";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "39cb1b7546ba00c9f2a7f5794c7920f6a110ccddc20605b829945cd85dd5172465f03fff0dfd3d22f67769c15f43130d5f034fe48e52659b864bed7cd5e869a5";
+      sha512 = "31d2ba332a534e7d8763a7413bdd24643313712635d050183aee8524612a9f122a5acbf89c674d69dc609897942f3613c9cf8fac7b92e1c22863cb54fbc0aa70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "a5d30cc38ec170a5d23fc721a91802c09ce913356217c34684887b292c523f9da5b0d2a16e882d324a38cac871f541e08c86446c36f8dd69cf2c6a60d0a2dfd0";
+      sha512 = "4180fc65b77aed5c93d6622da562e9fe7a6bc7af70747795bb37427e822c1e007b1be6fb3d50a12fc3f90e459d2e687403cb3f2df7320d6381795149977f6a1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "0ac69c4cd827cb724507202bb88ef00cddebc10e7785a23ed3adfc0fc537e981c45d8141d299f6d6e6c84017cb16361022357750b69c5cf70e643d14e12c99a8";
+      sha512 = "2d2defaee8947f5177603f60e21499aa4f192ac8a6ae53060d51bcc418654cb95cb20fdfebc052fdcfb397109b868a35c6ba8419886a499736e5655784607693";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "34ce2df0f0501610a73b4faff1fee7cc60c0c0d675c60a769b99362c7ea82a5f780804f1fd5d1b010063b0ec5fa67db5d6dcf661b0638274563c0af588c86238";
+      sha512 = "05da355fd644ced4c3aaf54e2f6f1a11f07d2952edf9511c60fb699e4bf5ba195044387d2687b4fa3a5b5413dda3d91acd6ffb28ba6e2b7210ed00ae5bcd2eac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "8053d904c427dbe66837445b471793c80e23fcabc673f2df5090b9acde7f29ba38f74d786183b8d4a1808c5af0c7ec147a02735a0aab3a8d812c7e8d541e2167";
+      sha512 = "dd2bd357d4652008b5f07d318b32383d8d30c6324482aa7fb52c3e821d4b3ac162ec26e5f521f661416356b87d013ed50da9612eb43b5fc3b95e37cdc25fdfa8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "6faf8c31b8457e11e627309c851ffac67821966e7d2f363ea54e133f25195fe35eb593de6b8f6698b01940604b4b5ba13b37259de6e24a817fc4cb402cebb52f";
+      sha512 = "ef8cf533b848e7e6bd0859506b964632ab9497bb70755f957c5ab61d64c87ecba173cb871e35b35e090682d34b424ee90514062a429deac68bfaafe561195b51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "1ef8163cbffdc6887cbc5bc26e999adeecb43d9ce45bc805da9c3d307659100a83038038cac411aaae384cf20c45be081ad1fc1211110a68d023ec1551e52b2b";
+      sha512 = "ee6a95e2a69980170adaf7c60dd23764deeb86f171142985733e967f8ad7e842a58ebddad5e828ab308872f40955a3e53bba1f818b38b075f531289fdbea795c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "556eded9643cd1f482e6b4f83fb52e73d2a182065df441e7244256472dca276903a76e19ede5bdcd02c9facdbd09c7c2d533163e3165c68e54087b592dec4fc5";
+      sha512 = "fa4287dc50567a52441f583eb0e12c4de4064a51b12e80c195f1a583dcbcae51f4b8b45804080c2437999123581f24a490df25cb27aa563e47ae05a135a21748";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "8b1cb4342ed920bba9e3770b6679817475205e9b18f94892cf86af0348a10530616622ace83173ad71b7889917dd0e6fdfce391b5a4c667230bcc63ee14f5050";
+      sha512 = "d4110c9bc7eed9f037145afb5399a88565e0d94430ac56cc8ba8aa3640ceaecef0fb31cae7add7e893b6f223dffee62578f5243cba944cb157328a6d69768b9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "69aa0ed87116ab8c1d0b0ef1c086d014b55b7e1441c1c41a10377eab81ae0ff66516dff7be201faec156e541d17262aa1f46d82f4041eda791086906c7795826";
+      sha512 = "bb06ac7d7a6f38e67061a83d6eb76b86a45a37f3c77e805dced9db8c6329c404acefc4e688d8a05c962f911996617a1430b66d2dca0334bd861ba841775b2225";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "4bd0d7510c9977013a9fdfd3453361380b497dc600b1418856a0652ead5625c67b1aaa554d75fa8c10dc1ff4c3e60fe2218a421c623ace151e8ad078c63fdb74";
+      sha512 = "8fc6940edb2a41e9bc2a0474a3302434a754a185a5c71be3b702112a5683e348dc9045ad95f7c0babdaabbd5737ac8954238b6db81b870fb0987626fc4e4ce6c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "37c7bbeaff9004b3facad06afdaffb2ce75e1a49147a3801113124f1e6827e96ccd41b38b59f5230e97c1f9060e9db4cbfd399b362bc8d3619e9f4c4786e7f65";
+      sha512 = "2c0da802929f7961b517ce6028fbdbb4191e0387ff175cee08663581539d7dfba71617304f2b7fcc3045f8e30a3427a7a5d749bb641c18a90ec515cbc8dd1437";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "ca2f26e74b20fa6e1d9d43517a26426817bfd40f0d73fc487f7341485bc1ffec6a722cd1c3212fee03f0584fb7807b554465979bf8d8228f1870eca139baf752";
+      sha512 = "92f51e7aef94bab43fd58b16f17cc3a9086ff754d039783e2829adb3dc5df2d9e39256221ba1576299da79c17b735f0f51046edefb4886a022cc23314a831b43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "9233da6de53b4304e19b27a8188314ee42ebccf49c65b48c3bfc5a06f9ffcd2cabc4843f2995f881eaa2262a9a0d8f1e6b68943d5e1d81c1290dc1d21adf3e14";
+      sha512 = "2e9806909a770d44da18b381d428ce2ca27d0808fe1d39e698c0ce5cf48505ef248f236f8f38ff66fe5d98dadaf516d0c62f3071dc1ddb0955356a9bae3a8af6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "12ada3e1b3816c257538deacb8138819b4924a900f71397c95286f37e2e941c3705db504ae4f5a964d6af142a39305cb9ab5a63cd2a3060047aa55fb6c288f4f";
+      sha512 = "bea6475ad949b4dd35dcbee67e4d1a8d462cd04eaa8ed637b8dc7b7dd386c7eb51d7e7469282bd3d5ad368cb50adc16a888421a1bb6ebed2d6b8892c96f30c8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "cf2bd733d492edefe19af9ab68f36298e825d66cdfb89995bd20ffc3a405e078af26e6a7f07bdb1b04bd09daa516b9dfced7fe524cbeace8b9aec324b8826ba9";
+      sha512 = "37db9e889edeecc36bdc313941f96abaa96c8a584a58f2b43abcaa8843cd5fd25d4abbb345c567f129f34d67eafb1d5c2cebbf3c4ca9139a8f9377f847a7ebc2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "dd6c976d58a61a50bd6f6ab3773c43f778ddb08b2dbef7ca3709219ec4ddf14db479fa8b9a9136d28875bb71c493b085b9e668c5f4d02dc307c0e350be2b81f3";
+      sha512 = "15f011ea725e90c2750ed7949a33109f08f44816d722762c6e3692d2570d2bb4671c861dc20a8b0b091bb0b00c11baee6bf449dba818dd5fffeaacda9fee08b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "6bcb6a25b985261506e47bf984302153074811c88f2134987a15651f96d2e373ca6867c3509eddd34690e2731ea0552c575097b3e083e9fed8d9aaf03b95da75";
+      sha512 = "5313c9dbedee7483215285d3909568e988fdf13ce6039d2eefcbf75754a644136a155f442112e7e19df9983d83ce349dfe5eececa4b45971db72fb2fbed80f5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "403ab45582319cc2ded9c5f6c39791cc35e040cba808ab416a4d6104accfa75df56f858597c714bb5087f41471e4dac54d0f6ab62ee767de6925ccf0a10097a7";
+      sha512 = "4a127bdd6284fe3b8eea6ce8f5b22cb46f5e1ac066186cbd90afbd8419ed7d0d31b786f210c0a3c0fe2a2b327e2cf6b2f73b45a829b9c5d092eb2e048178da82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "4dcd348076640ae39ee104cde115e6b207aca400cf9fdfc65d00334271e18ba78fd185136ff54211a162f32f0eec46d696f3c5a02ae969addcce95b839f45260";
+      sha512 = "755842ae826e377e33c767971c43a62ac6953f58ff2d23f0109e13bfaf608757603902d2576665f605192e1094504eb02df0636b5f666ea84eacf956ddee2841";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "f6d38f2de149b4fb2494582e6ee3a562d4c7af71aa957ba30fedc9c1cfea314d11849fc1c8a11d19cc43045d73c1939845f1fb3e334c4d32eeb0c2881b9ca724";
+      sha512 = "34d5f4446ae341433b0aefd7a76d3e9d6125c60d28480eb70ecfba5d7a7060e1dcc085b088eaa7ecd7d0e6814be8ed9fead537c46b404426976ba21d2d9436d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "277f09e65c5d07539346282b9f70a662494a2c5640c78ad56089e0c50c651ab0c0fadabfb67148bdcc5de190ea83d1abe70c3aa5fc50ae1cb870937d10d95be4";
+      sha512 = "272544bd42a3d22f3598884c906d1ba31df7e4b4debd55aa02110a05af74a0544e5c7fcff8937c9671b25c1637f8de399fe82eb0798ddbe40618b4a020c9c53e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "e541a068ccd072724fb19a0bd830a2a95665a20a08ad9e398be02545a0a6ae8488d3f30f8dfa25c1149df2a90eca5f586fbe116740cfe630efbe00f002d3278b";
+      sha512 = "ad0aa5402a6ffd28516d428e6f11a8aa84c68291f6722bd35776b27a8359b70466833f504db181ac5d13f8f3ba9fb87df118b5a82b473ad9a5c752b76cf1ccc7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "3f9163e25fd67048456bcae71c86c287d5052c45caedbb19d6fc65e421d1dbc66cafd61582137b7e3a6a5535fb19be110f93d11ea1cd6462f5e4a16ac2bac182";
+      sha512 = "348779865bf610de937e073b364e2e384792bda2d5d6932187717f9ab1af547efe6483fc6b09e9bd72bd3bad908507d3bd67c13d196dc7e1857f6f658dfd6361";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "12508fd22dc5ec22cb272ad8c62150ca2d7ed680e91d398e304ea07633b55eba1b44ef7668e3b0510f0ef2bd21c8d83c28ae07d2f519e138b4100c5f8fb35ae1";
+      sha512 = "3c444d575c000b34f8c536a48688f35166bda3b9702841c9f023430089919cb9c368ab0507e4949e3258a50fd3915fe21963e3c39a29644d4313698e9ec8ceb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "de723b9dca94cc4f35c329e2e31596df20e8d873b54cfc0c4d0cba1ce27b25bbe7af37f50cb360e933b4ae69b1e9d9d2874a84d4357d39d7ec06dbd62fbe9187";
+      sha512 = "f42a579de711981143832279c2dada8aa915ede2f9e601fc4d5c15b2c6497dda9c6d651fc6b9865e7827dc4f4b2da944f245dc97a73db27ec8b7aab74ee17f9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "ff3da99e585bcf41f1205e62e2d2a0f7aeaf09a8d06472d6d26c74555ffbb8600fff7266730459cd2596766029ef968f613dd2e793f444ece9967a793754de14";
+      sha512 = "8075a2593835c69f9e2b97b0fd311355cfab0257351684e0c4dd2c3fa8105aa63a946dcf196f4dc3256883fb360c4474560be1846cc06b23058da5d87935e658";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "8c9d07c589a2fd0f6fb6229a3c83ebf26d07e4535b915fbc737e8a54c64985731a7101e6474023e03c048d30c34c57e6d0a47c530a642072167093671a67f144";
+      sha512 = "18247733d65e0cf282b38ac1b52370b9e0053951d726c283adf4b52738dad9633f9a670a65dd1fbf6d84802ed4cfee26adf19c05abcfe1787c3cab3d11ba7794";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "f8242f8bbfd54bef69d9480c1a3b78811c91332ed26b1ab3db731e9a2b4633b4db1e5dace3f8351210f38f383d9396d6372dde7b1c3c20a99a4631d095c387ea";
+      sha512 = "a15777a29eddc3dcd3d9e7de970faaa10321ad991eb82956887533c9a414b6dc0e6eec6797996b5b1c286c387c5a8b01df28fbb4a5efa485712ed8c9477ccffc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "830cd3edabf5584fad8e5f77201b0980859b2fe8a2c6ec5c0ec886a5b7fe1c81c3513d93a9e99b6ad350d3d699376ba3a027caea1b8b092137f580379cc34d59";
+      sha512 = "5a2d3cdb707ccd9c663613e177832318517e66de05e825da66935a3756a07cd2aaeae6adb196cd6a305202a3b4990e6dde1b7e4b30144023fcf9e4b77c55f0ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "5ef46e285b2c7015f8c0de1a4cbf59883f1ad0a98ae9bd4fe2a5ebbaf9f27ca5522233517d7a50281cf75375a3cba0036a0d77d493e28fa8230e4af3b888456d";
+      sha512 = "08d9e6cc8a58895569667f42b6684cf342d2bc015a49f7a5ccf09f26384e7194833a3c0380385d8d0d4b1ad104c74f549ff94d03dcaf7f97cd9722e454a3a14f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "6db4270e17b883c6970988287a365497a5905f12c581ed40e442712cc61f61cb78f82dc67c5d1806f61d31302f6e914df95f3116c96404c09c07945de13e6556";
+      sha512 = "327e8ed170e1d571eae445b1206c83a7c25b4c09437d7d96f88fca5d95946ed0fe1c9c44a3776490e339050f9ac050378e9fd79819409e4432feb2d1e130ec89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "779561717f27e6090de5d63646ae0ee7de5b029422889a9b8701f30cee2ab1e1c7737f6d61a6f8bfb7106b7f05cccb060a7cb30f8bb593210ed7a04d72137c98";
+      sha512 = "ca96078fe9eb12c9acdbb315addca23aca87a923d51edeace03263ced2eab68a985030360a36af8f4843aa4f2af02609ad39517689a9ef219d29080f12605f34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "889172aef9743e4a38cbbca387528e03b3a3c9882b2a2459acb0da697bec2080a51491cc0998955921ebbfad4b272f0f82ae7029313209a887984a768552fcb5";
+      sha512 = "92fd642c41c4b5874e02829c155f6ee7a1f11779b35f43c446bacc36febdfdb415e7d30e6039c4f70df3fd7635a9f187863b249e2a352b60796d1c0bec300d9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "0b93d432172814b44e5d879f044799c0d6002e8c631766a43e892d76fee156614fb64ec5333ade7bb65451c73d04443d30202d054b8c7dc2d82d3e63b196d472";
+      sha512 = "c3ecd61ffe1177d786491eda2c776bdc136a36e756d083aebbd3add157d27f4c736fe953e2065956a13203acfe95ebfa4eb0a65c8518423b34a74ceac8248d80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "708637cca38914670df1a237fb5b3d30cc6fa93f75c9b13585fc1d80b11b986511139aac1a984e0ce27143e554092be538d91a9e54841ea44fb5feec9128eeee";
+      sha512 = "bb21a47a80862251a8d5120133bbdad67490572d794f1a7d76ffba77f8cdc9029066c176f2b423b8ec49342b390c35d95c29039044165b874cde42a852eca727";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "0343c096b3b9c98ca65a4934aaeff8d08166a2b6c806ed81cf89cd1942cea9bfd2464a42cd54037c5bd78b3c05951f29710894e852ba65f24c5f7bb0cff3f885";
+      sha512 = "fc9342c239310ccc8231b25707e5a7598cd4d77aad3990feed5c48750c677c3fe4354279cc39cf367a872f25c9ba95c805cff9193d13aff801d95b9c5d5f70a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "00d309e92d80941318ac41a56ad41ffe3fce590ab084974bf2745ed7be2637192829c4cebf230a86d77d2eebf9aebd19495b4674a5d469563ba00b124f526a9e";
+      sha512 = "3f8da7b739effdf144d2b2d104d27501575452fa20a07419910dc8fa8f2b8a92ef421c3d774e8032a2f234ca95c55efd28e8d99347f7afcdc59f5eaa5dc6ff29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "ad25a897f3d9a58156f1ad95bb17da94a3fef84603da874cbd12db8b0f51868b95e8157b71cc8c1b88253b043bcfb5f58897f052c20f4ee703afcdcf3279a15b";
+      sha512 = "1c1f8a7886de815c14da3586e9dfee316f05ad9943e9c952ca44b098786a0f721a89e9ee566f2bc08c664636558006cfefe5823053dc4f23065e636056b3b5c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d10a6222212fac4f69b2cbf5fd82954160dc6495a901f2e790fb5dfdbac5548f017d611df93b5ee74d688b53a0002f8927c2d360a7c2a907e2ce72d3961c06f9";
+      sha512 = "9992fb1ccf287e3858ac6686a43b7515370f8043fa2c2fcc814bb1ba49106f1b83fe8d8abc72df43f3008b8cea56f97254e0360a0cc4808e923515bca53dc3ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f18dff7152d0b83955ad8221f1b3e46ad0b34c082f0be17296eb459639addd076060b26036548b79aa1da73ac11a53ad82ea2e6069e12babc90570e23ea8681a";
+      sha512 = "e6c99e5533e988c10615286bf3bbb588ac9854ddff12690537cbe64cf209ad5512649690463f61b7d08bcb57ef246191c8c4d697f6de80248fd8eb72e0518c0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "04aeeac12aa2ea1ee0064daba05f33147c376c3f6acec38abd64e794ec78f72783ae865ec17b855c165c80990812ee3e0555ec55e24592806cfb02854379e32d";
+      sha512 = "92cee85be1caee2c9221dae96a5989aeec61451ba3ea6923c7ef713a56b168d871f78bf993685f1e6e56cf13b47aae067070eb9f08d58304722ecc57663b89b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "53034182c7115b8f2a24662823571b290f86977e2be663dfd40c02d9a8f2cd5db3d3563873af5cfff89bdb67e7a2e60c14c21e755b070bea0a5942c2821140ec";
+      sha512 = "7491a8d2523dcee7c7b9e2ae7ff43edf179cea94dd078d447cb8346ccc1a2053ba01edb5083a8b616e67fb5c53b88ce8c63ea9efa0ddd309a104750360c27ad9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "9a1ee91fa95b6ca8e0618dfd84930c2e41cb03a1daf33b03ac8ac9a92e113d43ab41e922537eee477bb5e706c7f018a817dd640460df5cf10288684811eb9585";
+      sha512 = "32bc1d2d6e0702360296accc324836a61cc68611cdaf01abee71d151f02044d467b985e4ea998bed6a8bfd30fe9fff30f55b271a15c9cd3ff94f493b3157a2b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "935e7ee75c34045393dde791d14be3f4f7c5d57bcef5c4b8a6e291941acdb21550e6b5aa54bb559f3deb64cc6922f4709bec360fd62273b4b693718b69de532b";
+      sha512 = "fa09fd3afcefc4df3854f599d5077652561b7763dd54c0a95db2107b19146c74152f9059fc9e54844c9b31ec26e1392534dadf1ae592aaa170ba3bb8ef8ed0e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "371d5b023d63923bb65acfdf3d4d7efb5acfff3b2b6de7ba94e0b475b7e45b268612303373e7b10b420ca2c398e9eaf340dd481390f36c5a0b50beb54ddcfc1e";
+      sha512 = "1d95c37d13df3b04f21780fe9cf95b70115adb4f647a720083ed00e6bfcbdaf26f62e9a265cc524b852a7c44b68fa4d37ac08db070eeec1fc3cfaba1fe83184b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "c99cfd1283ab71d78ab8311616ea6645cc1d492dfb5091d2bee19299ecaa9455228639f85ea366e7b4ebd28270f06446897b1a99c9c9b54bb2c69b4f4d3fec1d";
+      sha512 = "09b6f11cba4862647d37278ebd7f9f2e8105e0392130b6d30f722f3d06c75f108abc509354a7bcf1da4d4709af76dacbb66a56d5a7d0733a4f2287202a40351b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "7a81c06e4b85e7e839aba4ea4fb41f1da871c3de705a843c013965648b1bedea86f0ab73a616b7b864da10da0c47624819178063f2894508fefd34d7971e3714";
+      sha512 = "0461eb469f6e1ddd9f32f3a970b6afae3e551d72f14397d1f6955defff87d8ecf2bf2cff47a84f7989f23c4943466b09ab47bae1bc2849691fad87ce8f62c318";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "4f0b171169b73fa526e25a7c7c9dfa1a0fd557fec07b69e761a948de71172f733bc2a1d2e3d1f44d6deed0f42568279e78541e32352ba1a27fb45274d76768e0";
+      sha512 = "d5864881455d7ca5cc9dcf032e5ab786f6e7e9cf900aae7ba40061dc0df526c29767e792515e35c7bdfcbf71b9163d85a7b80e03b0865d36e5d5dc524c4ebd05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "d992ef007b02ec7c33b8efb7d69f71a9656d410dbb30ddd3c2a7e39ec6f358ea02fa9404af84bde1bf0da524d5a359655847d729f10a877e81b3846c77a74a15";
+      sha512 = "4a16209388b1ff42c355a8b0af3c9340035854deea138ebc206cfbc610ac07e18b7099f18c67d59f45104a754919ad3ce65975f94fb2fd8c1b22389c7af676a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "5e4303d24df249bf07a84e6f76bedefb906e8846db787c12422890240faa3c231e9b87afb1fc210ccb1e8b3abc7aafa84f1896d535d7e1c24854d87971be8bb3";
+      sha512 = "df195bf219be42563df30fd59504b1721d77db945adee200e8c8b9af7aceeb3ab2a4f2a3cb5a1707a862441f580a3d6cb02beb0bae5ef8cf677c0b20da2b3e8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "0be7306ad2da4072abebea8e93ae7a826e7f4be78855400fadd930e9d7d4f114b7c0e6d830a571da17d3c67d9fd3ba7b0d3fb861ed8f61c7681b3f23dd8bf381";
+      sha512 = "9d5d54c44c019de98838ee5dceec8632d5944ea00d88de42c983e7b01e14b1a3e7fc390a16a60bb4fc00333bf862a58efe8079c9b57b2957c4020e49bcba0bb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "df9e70df387da42984bd27e5f032e2194eaac20605c2c50be0b41bfbba2a1b71237380e7ad68ba02da3ab426575f5dcdcaa7a31b3871b9e565239571699d9fcd";
+      sha512 = "3e02e852544d0f78d2e842ec38cce1d9e43440d04fd4b8e43932ae184b43a8e3ffa21a85c76d0d506235f871b695cbbe277d07d4ee3eef2c997843e5a170af89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "cb021bb04ed655c92120a6dee9f65109ce5951d1496c5acd2aee2ff0e8204e36e3b226cc08a1aa947cebc693e84b41c87de91edddcd47265835c883f6078dbb4";
+      sha512 = "b9d1450d16ca587ba9fbf4000bdfd528ba3932785b63e948211f6f1fbbdcfce7898739ec6aa2d76a3464a1802393f45841167598f5a933b3800940d432a6b12b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "c3199f20eb4db23791bc7ce076b97bf08bffa447efb15542c34f2e6def2ee64bc6e2bdaf9de094eac35ace1bab6693bfab4f0ea0bccb2754948cc9fb13a99989";
+      sha512 = "68de6b9772aa4caa43f48025e145c70bd685a0f14bfc87de0668d6617f8f38be7871528e30a79ae42d86c998f8a36ee3455b4434bfaf76fd86760a3150eb6ac1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "8c168058d15a7b0f7fcb72bf8e25de041a6c8ff8b70744645dc03c57b7380a273d419090779ca755ee114b997e6beabea060542df53adf6b4dbb32527425b15f";
+      sha512 = "a1b1476ceb14e9a8732a5d52e114f3413d012538b4d41e601a6824b2c71346c5e1bef236c3b02a2104859b431fbe1bcf9d2c9ed9d5a616a6b17db8dbf58185d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "2c263b26f64e565fc4873201e21cc2cae483ae691f628b4252928f3277d919eda1a5b3b0504da04a6da3df8875dbfd86d2aca440c9fd65fdf31992d87842a3b5";
+      sha512 = "b063e2b73a0a8bebd7476b60b0a15fa3a80d6aa5fa51b68aa7bc964d21278ecbdac306ba2be1df06bdb205c396e5cc1253adef47ad395720e1938cbe30208f8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "089903272e4245ac8cc4b3a2f60809a2b11affeee2ba1befe03031bf05c8cbef239189f2a729d0489cf5593ceb9ea5356a21039b464b25c8f4613bb7ac787e17";
+      sha512 = "8a60c7640e7adda279b33d3c5e8c3981bd197118d38adcee7d9c053902680e329533c256c7361f2c7626f55d3550de193997e7212055338da8959b821c95289f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "a9f5bcded43b63766ec18f2a846b3c4c57fdfab15a0a570eaa10b9b09b817abe63eb7e9ed67bd6e1bc31805582b8458ecb3249c125aaae1803ed5036a66460c6";
+      sha512 = "9845de20dab7f981f3762c983244f1c812768a40ef7fbea61f12df2fba80fd6664166d1376559a73edf6783b558d443b95f2840207ef4b6653012f2bfcb50fd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "4689fba26647f5ba64eef2e8b188366747df8c2e957fc903845de131969e25aeb25b8f4528210be0c6d4a6a5db8a21079e1627aa8edcf087a5eafc8f9b0f8f2a";
+      sha512 = "21ed69aa109aa0931b6a3fade415df4347e3a387ddd8efa2dd0789c7bba5f74d1242b59df2641d8b968cb2edad19b24a370fcbf322d382ff60c7f7bfb3565b70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "c9ccaf00b75d0032f3fa7c79bad37e672b944dddcf07cb6783b401a4115e283ef11c90684f3a1a589a745e08f2dff9e27456509fb78a6f894e83c24cab141185";
+      sha512 = "2e04e3f247cd3941748c71c63f35a7a328b7920f9ebec417a7b48457ca6b4c900e14139fc921a1e6a9dd5e9d766a35a5241849f20a5e1abd3ee96fdbb28ed48e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a62af4ccedf1b6c443a13efd6c41b6d6f492f31d1d7701946871ffbbf00df000eef59eac69292f6ea8be64d9512d064ea86d7cdf07656b8ab2bc234106468db2";
+      sha512 = "4d129d34f70069fb82f50dfe9987192b2f32186f6b9ec7497abafde3c02c65724ffefdef360cc27c39bcc77117bc373a516703dde68af5b1907713060cceeecf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "177f3584b81bd03ceceb0f7083114b38ba826974b115e962d8c6065c001aefda7c65c273c1a833cf7dabd24b69e0c42079ccd6842f882f196de1a2fdb7ce8605";
+      sha512 = "41f29605f42672f0c178b5efcd3f20f647647c84a0b6a0cf814712758b41aed844517452c421592d6d44a7f2b1924eeae71092bce70c1862517cf776fc563739";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "6dd9fc8420093f8faf0eaafbb1cf4326360d610593fc8642e488a3850d9f94a249e27c89123eb3a25e476100b63fff1a88dc85f3e5714080ebc9078dc9309ca4";
+      sha512 = "4004eb49e097e9e5e135b2d6d13a637a7c8eabcc8b181c068d8fc2b6991129820ceab18a13e4e3054b8486b9a0a3a6fa4a3246d4af21e51052438dc77bdf230b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "3badcdbd0642ac510cf978e978ea7a9fbd1d6a0de7ca541aa2eba16bd2b788b5616fbdaec06a3d29975c6b4fbe8894b6f38e2522a6495b4d8d1564efd4c2c656";
+      sha512 = "b66153345fb4e611a476275fcb43d4742468fc83e1a109b30aebdbf86b8e661d06f29c950a265d4e929f949415f902f80ad5d418f3fd9a0c310d2ba7d7b8dd86";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "85b254c78925a8f30798e37afe5e452c50bbdfdac683a16cb0407c8cdeb1a9dfc23be4f7bedd44c8f434d2d1b16b65603448e356e5d82ca41bd698bc275da80b";
+      sha512 = "446760799bc1b453e1f1d1be21076cd7164f96a2d2628e8e6d48304d2c03df939e43ef66b97405196a9879eeb07deb728985d7c4fd0c021558121627d5f94145";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "49c6aad468a893d77f9b158883095fa0429e4acc0a18aff2b284cc90036f11a04de9951a2fc18ba87ecf1d3fa6c55673e9e0e69428bce980638fc270356e11c3";
+      sha512 = "73fa828925f54f3bf1447e81230543909bbe5af400ffad5c1af54ea20aa8f24a7c7c98d75e92e391a9b5f2bba41fec85a54f161528a0aac418e2bba8b63954a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "6f64ce83bfd5156c6fef02fbd0e7bac47f8a04848ba5da619c9809510b1f1eefba396c3c9f48ad6f9d0ee700e2b19a6edf1f0b104ec05bc798c22b8dd2b4a6e7";
+      sha512 = "bf5f891911d699de47349b6dc8ef1fea3d4e6ff1ea243e50b615035ddee991d94f57bc2eb191bac15e899c63037c976adb051f8c03a10fa0b170041b36f79a57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "0c4f520f2da27b1a5a59bfef7fc9648b9794bf0e4e471082f0527471bc824ce999ca668ac6cfe39566eee81cdcc66d5a09a15dc4aaa528345786288fc4ee4531";
+      sha512 = "e840ce4d1fdc373b22f3b8b6b33ed86ed19721d5f8fb52dd550f75d71ee6204d0baaf4856f090a710c622c5279944421f0efbba0bede9350055a4cba95e5bef1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "b7753e082c93d169aa559bbb9314de29cedfb3bed336e9b2bf2f4514269fca3ffef52e5298322c9f5d354aea160bf0e1538cb51f570a2c29d504d398c6fbe262";
+      sha512 = "139d7d9d831cd89b3f9db005b1e93908c5a0d3e7bc77923cd2ea78ae3443c26fb8458c3ddb5055f381f99e9851002c0929f058869aaedea2accb2f616917b1df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "84642ded2af2d558cf93960af568cd224ebff05f13f26d4fca84425df14f6ea8ad3ff459df16b0f035f28697723a264d2f3ecf8121022ba9659ed47163faee7f";
+      sha512 = "7e121659835fb0b175f5b19fa3a6049285ff8ad87309572eed8616e3f418591311dce94f724ff6bdac34bc5480f656fbe54b1202d900d7bd73f034fd06f766f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "fbb79684d496b4780bfeedd2d682fda002bd190f5148343d3f3720673d2dc26609fdafe402feb96093de0db960135293dada87218612bec562a6be2760514a77";
+      sha512 = "db9f64ae24566a158bb27525ea5f6623a433f4c59b78601d289d42d8b8d128ad8957cef953ed27f6af93b91cb01752cc010af398869693940030a3ef8534a903";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "405635feea5949d6ef58632809fc69ade5f77f6dd19f0c190059698558c429f28f94fdf08612c0346ffac4e54bbe806dd6c01ebceb9202a4c7911f86ccb1f747";
+      sha512 = "413933af7bcd519529140a6609d0ce179140477bada96bbd5863f4f5159dd322ca0951b5e5401afdd1865e5f1aeb01ce6c535b121a002d8cf00db55c2a2fbdb2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "5c6e9021355b7e9bf4d13db20d7bbb09dbcb94c4c8213e2aa313b6a451ace1bb394e31ded52d36ac80770b64bbd7b9cee93c7df233338a6ca9e4e5a8f0a8fa80";
+      sha512 = "6ba6a3f75ecff44391690b5f720159e86095eb7c5cae34bec0e9986071a8a4bc31cd03941c46ba40852fa6689f0b241d117f76ffefbef9c85c519bbcfb4246c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "2fc8eb314a9328cd91029aa28234acded5ee1318b2708fc167171f4ea8cbe25a87e0130ce3c13300fb15bc5e8d09ce504da9ea5ab46cb5b01498b083d067499a";
+      sha512 = "489893f4dedad8a3ac628454bdd2452aede7f37748d4af32b2ad5a1d1da4703c19c9718811d3ab6eb47becf4be60bb18c3c97476983a70cb135136839504616e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "5cd5fe41c714f9efcd7a0d4aef259c01ff4a3a0ac05ebfd6b011fb2984f1399803199f7f91703fb55e3e4cd8d0032bc6469065dade99a4290dc2af1109fce044";
+      sha512 = "d2e45cdccd321f8056e7b092f07cfc5da8150b96ec4d9eacb42c391c2b38ec4ab38f9467c4f5fab7608da606d2d87b94c20b5306cd4aaf881aec353348fc7574";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "1e84b3d9fd78c884a125a18b003dd03834b6ffc8cffae93644bac3d78e6041cddb831ceda58d5d4d461e3fe900204d3916a917d5e5056e12684a8ec471df9d20";
+      sha512 = "06cdbd6010fe2e0017dbaa9c0bd8b84a6133d607837afc3eb35488bbd0459c0ebee50e4352afa218bde546315cf0aeee3a34b9dfc00b03fbf6f6e3c205735030";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "a650cdebc1c89f5f65d60f36449650ed36f9ab79b4e5bd084717f88c089312a105388bc6cf6cb6b05aaa05ef4168225ec1378d574f82b0c7ae2fcadd9ba549b6";
+      sha512 = "d2944780c51ae3641ae51d34e082222692352c75b1c85bfad15cf97b3083fea3b8f3f39938d35bd6d452d102321d1b598c30e85fa576eac32bc623e37e36c432";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "901a7f524fb6cab92a6f686ae2951ac4668b2373f0306572b4214b9dff76762e36372afb6d5eb319eafb0c1595a62a8020078938a650531dedf26e4951f7e519";
+      sha512 = "eae250b6981a4b932dfab0cce9f31fea9ae32ffdee5021346362ad3151421948db9781cf8b98b2c77becb4541047d7d0cdbbda731aa24b7827374078a575ba55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "a86ad7c74e87ebe0e4885914a07e352349d353507708e79e37be2af57653f4778f0203b1d72580909a725aa696e8e8f491fc817237f553f526400aa47da0f03c";
+      sha512 = "fd5f9e8f999b173decebffa5f449ff0681b5ce7258b56dffd909d86364567b3e53238159648ca12a6c76ab5abf5903a6fd82207e8e5c8ae657aa6a0c650b1f6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "6f8e697482ac61565c2030164ea08fb92803e91cbd3f562ba70f982b2db7c0d9effea7347acf3a4cdaa7c7cbe393a3455b4a7333957ac2ee707f5b542ecefabf";
+      sha512 = "22f0e3b45877de32edde2f351d9434a9d6676c51bc70233c289386fa752ad5768d2fab202f74f2c62ffcb1fec2e2d318041689352d93f8dd13608e9243191b68";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "83a7ce342c38ee014142e60590d59e42373a38475a36f4c9e03dfd12890e4649e34a0ab5c3153c93ee9eeab9810c78ddb5332e4bd92c891c462e1df2a2305bfe";
+      sha512 = "631bb19fc65075b18e4c88d60b5a76e39d8a7516a44c2df5375668ca86775e577cd60e5b9e445073a47c9d117d7e96d9e8a5b2422749e0dd3622530abe21aa42";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "8a8b686894ac4c211381e31e29d0020f43b11c92edf8158c89838e73713576e21e3d25349d8f3bfa1da3a9b232a1c058f6252af15e0f2181a77cc24fd046ef7e";
+      sha512 = "ae267046c3a6ca584c85f5a8d4da3516957313cc68e554fef796fdab92a2d450effa15efcbca5686f46a4dfd6ad1f61bba529d9cbacff0e65a857052b95ecba1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "141f50e9bcb95e456204620f25e670ba3299b3cc06f86afe7bda652dc59745d09e9014737f70caf12c5f6a52c8b5f0777405969b92efe272a579d2eca817e22b";
+      sha512 = "db979def47bdc8b13060aeb2f0741c4e28d5e1bf0480703f26c0d7e5cef48c10e3d75260fdc6699668cfa3374de5ee25b150f3d5e0857ce801aeb187a8e7c4d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "c51ff24bf9ecf43e49064aede96d9487240e3a14bf5b6e61da1c83de01b5d5e974432e43b93d28fef0c473311f528cd06ea2d2a3fb09cc7a7e8fbbcc07c7e4f7";
+      sha512 = "a703df8a6c1a381a281ebb9bf4008637009da5f66194a4f85afbf2ae980de5a118e0ffdd35aea7e8521026140f2c003afce8ea1c906ab90c1db7aa4025d03be0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "2307008568c8140d7b90ff4dce3d4c6fa6bf5f1776d93fd7979b14ffc384916f15261f611dfd3c0e83e5d1e8980bff9c551ae9978ed16540a399f6cc7ff64c84";
+      sha512 = "ba9015d716e0d15b36cf7e83a28d99310a87cb2242b9e920ba8fa9112567cd0de1dab1cb8fad6ec26f381ea1cddc0b40b4c41d91450c1c76124b3c53869bc27d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "b6746b827a3c45e0f8a7bdf4423f63197ae728fe0bcaf0a6781e44fc42dc6c31cbe1e4ec4f1b97f96f1534550aa6921f453ad9732e62ea8fa0737a36a10e3479";
+      sha512 = "12c4a7dada07fb6a643675d5f504cb76e00489879fe3f2ac2e9647e053fd508b18c56f2aca172aa12988cab6672c75179e7366cb43791a443ef70dc88d0897f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "7f1a44de725ba6ae31eb21e005fccf6434e7987acd8a480493fe872163ceb5d7052e9fed2475ce65ff487f0824b3a090c917b2a8119b4b9b47a3c6e5f7fc43a1";
+      sha512 = "f6c93dfdc19487c1d61fba8a001680b9556ffed9599d4875e3e13e8df07dd49ce266c545aae9718e2657425815c643b803c170b620fb28c7e2727e92fcae0b91";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "e751aebda7834a0532fb0885da223316e19f4c0606a88b5a70956d0a72bf37069370d0478c2809400ac09f76822b34706d776f5ee6237b7b33ad4237ee4f7fd8";
+      sha512 = "eab3ac3f2afbc091a0fc02a6fd6e0bdc2dc232e06019d2b7ad3004aaa069f7afb1d4a89b7b0932e80589eeb262ee3e0b54f75ec09e2d09f58481d08c85bc7b09";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "ceaf89d467075799f95ebbf7b93bddf4c1961fead16fb86962bc857caf3ace620c42e2d11152b9cb2819f9a8a16625e5e276263ebe9066dba0840696a2a0a052";
+      sha512 = "99c3905d7b081407c6b044aca8c238e00ff2b6a4ef1cd24813746efc862a50fe7f2f3ebc79cf2f436e95cb3214894d991f8c1b003e52b70b2865970daf55c148";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "d7d6ca947e04fc99d28abfa9d9fb07e85f4f71b71b381cda0c8587460c6274a860ae26b60432566ac9af25c752e8d5edbf8cda515cd523521958e2f3bae4cbe4";
+      sha512 = "e391c752eee676f298ff37d086edaece84578e0bafb099f4ed8e0790d64de9ba64f4cf15c4218b70d519507f767572af7fd269b93d1766d2fc76a7fbd8a09848";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "4d5f7c260011e00a202c841f2ef103aa9fb6b6e329a51175656bf9cc3952664da5c0e90de571f9bb6c0886363e1988b8a81a8fe3ce0daddcd1ae284b68b8be34";
+      sha512 = "99be4ca9b8178d6ed7d7f1c7ed466bc7113087faf7256064ccc0638366c554a7443b5ec83bb85b00689d2d4787f04268dd736eb62261cad69927d68ca6b83061";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "994ee217f580dd8bf8eb06cea6f9ab509f7a430e8f74946d518465ec26b6b2d7c61e775374a9c1c3101c3a7c663326903226af0b585b01b40cd57151aa909a39";
+      sha512 = "de3eb748339672383aa8ac01cb2494bbfcf08e1f694a5505ea2407374e44cb339f857c2a45f72da3831e0f800ac2b78ad159cf3c795244c0b7ac13c2cad50240";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "ae39cb50182999233a46c6a5326ead7b5e2f363cfc10505f246d14e70fa52bab5f51804a03a7f20485b9761dbc4dfba3596feefe27e6026dc530646da0cc4b14";
+      sha512 = "bc45d70e14ec14122e45dc62a1b3acadc5a3de2a9ad6bb70d848c2952ced6ef3032a336579504fcf474bc3f12f7b8eeb6c92e529053ff3592a167b999bbe67cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "9b8346e09115651b58a2aca7a7ee2f4346155fbe6d77dda6c06f3a3e92ad4956ee5775dfcdd9c193a36a00407132aa2041311ba92e7b59c10cab287f8c8c4716";
+      sha512 = "91d846d406acc1e453a09b5de1fea0760564478a680511afc54e40c5dacaed602f8ab942dd77f25c1d89a507b867126969c36c0098763eaac10f047912cf83f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "64bda267943ca748f6151498d477687bfe06f52110ef10e5bb2a744548878f3cbdbb5dd707bda4607c45e8ea1037981a2ced01143ffa596a3847792db4849371";
+      sha512 = "5c20abd276309d82e772989dbc8c8daa6997bddb67d794cb39c0af364407d57ba9d28054116af38d5b42ec339c16eefdf3266355560460b64957504833c7936a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "dd38f64466c58cd4aee750d4489e598c0e934c6eb904ca8eccf1c2c1c092bb87af739a624f5f210e6c4ed25a6ac3dff233f13f1de5abf7a9bc831e02b4630f60";
+      sha512 = "470f2e471aedff4520ecbfda764710181cb6cf044204968f14f68bfc34f07a07a8b6e80d4dfe6f0abb1b4a79a5ec5169e552a3588eef7265df9d3bb91da731a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "b1265e3274779c415db96c6a8c2518b159311d4f7aa638c030d90ec4169db70b6388df9b5c94fe31c4e41417cce2e65a227a6f6e9c47322a365fc6941d50e1e5";
+      sha512 = "3487002948274414166cbf1527be353e9bc2267c672c2d14d731c162684e323543c5b54a43bf1f66353337e3df30fd45dbc90f0dfa8e07d8c4d77883ba1ea909";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "30e5d4ed87cc28fd51340d407e506b56fcda3cc23fc382d1c471af2c3b990222a5d2fb7b645373c1f067825df56875ec6c2f9bd7b2b259bcf0e466f5070bbb2e";
+      sha512 = "7f1b57fae5a4a8981a2b5fe1ade023e1845af866ebf60f56d88c3cf8c9fdeb42aa1c48f5a3f8f535aa310d7f53ea2afb3787cacb8a211649be9ecfec0d7a1451";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "c3d31a0e8704bd7dbf6aab569aaba68df60489ee38001905f445849fc9bd1eb4666cfba8bef959a8559dd0dd9c16222429f64b398a55502b4d8dfd7fbc8d614d";
+      sha512 = "a73cfe38beacfc621cd10373a774b4ec517ea336e0249b7abd5500a9838fb3ff7b903f64c82fe3a8cc91f89f2bddcdb2d16fb41617a0be69eed67c47f8f5cca9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "d9833be482f828da584c2d30480230e5f79432bf3479f05b5be978d7068e11d76f07f697f85ab8c84b68f49e78593cd1a3fd9067b888f11657e96ca8a2dc3872";
+      sha512 = "f18d20b7ccf069b843dd9acd3bb46c2d41408b319ac32114aaada886d43cb679b4624512637b1202fac9977d1a657deeb7dc662623e69c2e04b558ae0ca0ec39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e1f1778d4e7d019f2a945a8c83338bd3af7b6db0277af921e869c6c94fa22579240570f6d7edbf5f42c28044b6537f724bd33719d4d7cbaedca77ca7e17dfc20";
+      sha512 = "4ac1c79dce2a208c461a6a8bbd447aa4aa40b8dfd3bd1b8bf3dec3fe5610f8bb51d65052ea23f81d0792f6a4d6b49ae0cec1e82199e8b7c94788290073bb7681";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "63580c6e8820bdc3ea48dca090ab3ba2393d02051ce26905fc3097a36dd9e76efbd19b704145a0d3960a86d52462c7c58497591fbe50f6351e7d727871ec77c3";
+      sha512 = "d5c0c9fa140ec72b805f5aae8374cd0f56d21973fea5ab14f68040f38d15ed32d0c7542456eaf40f100006d79acd006cbcde1cecae81efca5097ad25d6d3171a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "9df80f36ecb8607613f30254aa8c3af5b6d417575c937dd6f428b5e62989ba9bf9237d7244b0ea598127ccd4bd2aa35db31a54412506022fbe4f2e65eb603d4b";
+      sha512 = "c5cd6793ac43b865c025f64c1cc10e2771be1e0ff6578258aac3cc433545228949c6bf33fc2764cf7272f76026549857124b535ffc64018879a7b7afd534f05e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "820cebffee19a05c2c03ab25b5c86ac7468989dd2a1118d3324dd7be5d3827675a791e3ec0b92ec32907fc585666b5b1050c81c5e16f57ffadc11da3b6de013b";
+      sha512 = "5fc23876fa9cea6ea3209bacea4ea3975e7979c0ed0ee023857288ab286a4d6366c7267fea5ca7a4a5d4ee11287af490fb6bfb7e287d0f3ab70bae715e2ae049";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "b70dc6963e44a225254aa8b9487c40abd03ba1e1cb96cc2ab4a8b24908b26f5093bc715ae2dfc727257465ef8cd01bb5b15628a328a9cf5fd6b78b7f35771855";
+      sha512 = "db1c80a5dcfa6aff3b9e8abf2a89946cf13a7ba045124bc37dacd761011ad3757319dac52a084a7b79acc0a1a813ae0d4507045c7cea01c3d06d0c6fb89579bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "ce2d445084c4db468e1a116fa9e4b741ff44ba994ebe5c575295bb6cd69cb72e5305b8a0326f7b43ee620a5e219279696b862ef512f3c4bfc32d3b6b2ab2321b";
+      sha512 = "3b73fd94fbd37d486a4bc2b0c874101dca703cd0561e6b8bc19c4c3297c6fe6aabcec3d4274c361d6eb40f3851f262ac6b87d4efc6d025a236b90bf9c3c41e16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "4a5b4f4e8e9aa944d7dff5e1bc40f44141b04672666663c8c4a1b7844faf2289d3323427efec373f5f4fdc7ef5c79494dba416db8ced23b1a5f387b462d609b5";
+      sha512 = "b827604905e7a0883d6e6d12295707c23077f2e7605b10084fcd9bf927a61401169e4b786d88e119f65b173d832cdeffe9163ad1b5522e2cc1b49693f4065f6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "56ca783a26d7c4c022001c72c96f02f79fc78bea625a73e3fb2be7602c96cb3753a718a184b7c1c5d154a755fdb4862a53137e4f8d1795345d6e5855cfe3faf5";
+      sha512 = "7dd79aa34c6645459de8c8a6d54f050d381a048a960da3d44238ec6d5579fe9856052a167e861bb72c4b73946836ef66f4b5cc9a2aa6894f7d59a8545583cd46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "9fe7f93308392fe970aeca2fa72fc7d709c592ebab1bbae768a511c6928c914c4679eadf3832f416dad9e23cadb241de6fba3345739b419d8118523b0c35aec9";
+      sha512 = "8bb836b634363a5ab120cb7fe94de9d8e7a0a66fe0b78443bd3b65fc6c9225b3bceb42539e9cd0bc424115a24938c809a36149a70796a854f4f76f009946f628";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "0d1333de541d617aa61741b03368c82ec8c76374741c086866d1d53832d97b9b0ad115d406914bed8061d348c0ea1bb5ce84a61e57596afd5ae318022b8f50b6";
+      sha512 = "5f9c4eccc27acff2e6bd388c4e8bda7813550de17747f7bac13c3d72d58babbc1f63051053cbffd9a670af0a317a2e81ec3ad77f1a04a969f8333fd87d6f2f29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "cb607b0394cb81e6db0f52b080866fb26f4776d3f81ba9b040553fcb087817795049b4c12128b9c00bc17d9d0554dc428f680de531f80cadcf24fc3dc1f15a89";
+      sha512 = "b05172f35cd062bc21125ee6230135c30afc3865612088c2bcc7e6e013817452a4dd9e5d269a8b2ebeb144d0c0864a155e40bf59312fa7cff7ee3da7d80ba55a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "3549abe03ea546bbdb0c0837829c7c9402a2d791f1fecfd7d8b9f3a3c14f496c26f758096cef959f9f9e5538397526b8d500e4d97062363f6c370cb7b8ea2b95";
+      sha512 = "06e2ae2b1d3c1c06225fb24cf9a7148e80b56a2359c218ac55a04c4a21d0ebcb13c357bb455157ecdeff7b1fe9a0841a73b4facbc4a53e7529793d5f1a3ff70e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "f65108c24e28daa73d79d52bb2c58c0d590c6bee90f4a57202954d556ea04cb082ab61f588747bdbdd7d1c752272d83e47708bb5a2c7e346f6bbd5f1bc8e5746";
+      sha512 = "bc8cca21ae9a19a0a345e08a304d4a9964e448b3787ff9d61985082d9e04ada1709924020842f8fa68ef7238ac551f575a5540e1a2254ca7f54f9fc403c25e10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "f138ec6164a608d03d7873af6f4ee8fd51f553912c06841e41214b24890f232bb342c2c33df388a58a958d932ca803ac671f2daf139ceba4f46c8fe5cd038bf0";
+      sha512 = "d4b02d24bd952c67d298ed8fd27e7565d6ab9533d8acd69aa9a1dfe2573471378480523092c01f929f25e81cb43817bc4c0c1dbff88031439b0a358c5bec9eb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "7c427f89f4aa7462a2e3a35755c5dd82cfc5ced2d82fbfbfaf8804d152326d02e88fec8230d4905f89eaf27020f522c4096cdb844d38fbb0ef4c5c54c250745f";
+      sha512 = "6db32dfb929b7939a2f54e198fc6bde10cb0aa2d9b1e39156ea1dba35ec7957fa87e5c7ffe1adbcf9ce0fb2d16eb324a8a6e49a6ff304bc369c52e91d050c714";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "6bd2810d6683ff537aa47b97dd8e4778604a8aa58e7cd8f5a1aeea7cebdabc8f7111c025131ad6255428711a5a6ae69bd1118b3636f6f4ab3ce4022aef293de0";
+      sha512 = "7cb643e9a6d920b813e7c2e12e17b5b1ee135178e208bf152eba388c9e68389d3e90425a86d45597253c729562bbd2c4b582d86d2ed2aadaf0780a08ed787421";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "d23be8509fc11f3726efdcad75847390055e2d4d9fe775e9ea007290e21e9e9583dbe5a2a74dca0866f7d0cc2d3066f9afc4bb1e6665e94cb808b3e9f3250439";
+      sha512 = "254e006f0ce5dad4d1b7681fcf8569b7e7735e9b534f626d517c58f33da483c9de00990d77530fbc3147b2a26c5bf8c0834e7c029ee632890ca98e14328207f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "42361dd8de84b011d860b0fd4a7f7ae59b3cd8297c57275283f61ecf51275e8263a67af9730e82251c1c9f19c5216b0e2d65adde5987c4dfa88f3f95eea8086f";
+      sha512 = "30dd152aab923fbc4398fec06d5558aa1abd0d9c690ad4ded7d1695fa4355e5046c4279c450e856c87e32699354d657279958ce1b7c01d646e89faed1acc142f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "44735872e5600fbfe03a5ecafc0f25b8f193572b067a8a18a598ea4972952747023a93c10727887e6f598922691bbf2bd90a76c8a966abc69ae946ab09aa0c81";
+      sha512 = "f2d7bbb0cff7e0d0c77dfa42bdd268c06dfe1b5d3135baf4e095dd9f36e25f8bbfb3f06851eef314816d53e5118da6a719c45071542e54d9e4798b2d13b06580";
     }
     ];
 }

From cf7df9230be3f971d68685c2d5768896037b7633 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 23 Aug 2017 17:17:59 +0000
Subject: [PATCH 2559/3246] ocamlPackages.ppx_derivers: init at 1.0

Ppx_derivers is a tiny package whose sole purpose is to allow ppx_deriving and
ppx_type_conv to inter-operate gracefully when linked as part of the same
ocaml-migrate-parsetree driver.

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

diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
new file mode 100644
index 00000000000..52c28efcb49
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "ppx_derivers is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-ppx_derivers-${version}";
+	version = "1.0";
+
+	src = fetchFromGitHub {
+		owner = "diml";
+		repo = "ppx_derivers";
+		rev = version;
+		sha256 = "049yy9706lv1li6a1bibkz1qq2ixxbdyhf4f5w9pv71jc3dlpfy8";
+	};
+
+	buildInputs = [ ocaml findlib jbuilder ];
+
+	inherit (jbuilder) installPhase;
+
+	meta = {
+		description = "Shared [@@deriving] plugin registry";
+		license = stdenv.lib.licenses.bsd3;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (src.meta) homepage;
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 492b22c0552..29f3ae51a0a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -536,6 +536,8 @@ let
       then callPackage ../development/ocaml-modules/ppx_blob {}
       else null;
 
+    ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {};
+
     ppx_deriving =
       if lib.versionAtLeast ocaml.version "4.02"
       then callPackage ../development/ocaml-modules/ppx_deriving {}

From 6e200f264444a7d9c23ce06d8ce2eb4043ba9c68 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 23 Aug 2017 20:21:51 +0000
Subject: [PATCH 2560/3246] ocamlPackages.core: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 07422f8cc80..e2958bce0e7 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -316,7 +316,8 @@ rec {
 
   core = janePackage {
     name = "core";
-    hash = "0x05ky8l75k2dnpsa02vmqcr7p7q0vvc6279psq3iybrwcvab9yi";
+    version = "0.9.1";
+    hash = "1643r0namsgj8xwfr9niimcdwyyq4ddiwd02d73ipb4a8710aqi8";
     propagatedBuildInputs = [ core_kernel spawn ];
     meta.description = "Jane Street's standard library overlay";
   };

From 08f3a60e7bfeed422f7ab5f7ccfeeb0ad8175f92 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 17:09:47 -0400
Subject: [PATCH 2561/3246] cc-wrapper: Remove dead code

ccPath is only defined below, so this condition would never be true.

Worse, that's not quite true: what if somebody happend to have `/clang`
and no sandboxing. Boy, wouldn't that be annoying to debug!
---
 pkgs/build-support/cc-wrapper/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index b3971808a2b..bc29de7918b 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -217,13 +217,6 @@ stdenv.mkDerivation {
         echo "$gnatCFlags" > $out/nix-support/gnat-cflags
       ''}
 
-      if [ -e $ccPath/clang ]; then
-        # Need files like crtbegin.o from gcc
-        # It's unclear if these will ever be provided by an LLVM project
-        ccCFlags="$ccCFlags -B$basePath"
-        ccCFlags="$ccCFlags -isystem$cc/lib/clang/$ccVersion/include"
-      fi
-
       echo "$ccLDFlags" > $out/nix-support/cc-ldflags
       echo "$ccCFlags" > $out/nix-support/cc-cflags
 

From 0c0fad6141cf3d620ae17d69431a0d152c9fd73e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 24 Aug 2017 01:16:02 +0300
Subject: [PATCH 2562/3246] treewide: Consistently call ARM 'arm'

No need for silly differences.
---
 lib/systems/doubles.nix                             | 2 +-
 pkgs/build-support/cc-wrapper/default.nix           | 2 +-
 pkgs/build-support/gcc-wrapper-old/default.nix      | 2 +-
 pkgs/development/compilers/gcc/4.5/default.nix      | 2 +-
 pkgs/development/compilers/gcc/4.8/default.nix      | 2 +-
 pkgs/development/compilers/gcc/4.9/default.nix      | 2 +-
 pkgs/development/compilers/gcc/5/default.nix        | 2 +-
 pkgs/development/compilers/gcc/6/default.nix        | 2 +-
 pkgs/development/compilers/gcc/7/default.nix        | 2 +-
 pkgs/development/compilers/gcc/snapshot/default.nix | 2 +-
 pkgs/development/tools/misc/binutils/default.nix    | 2 +-
 pkgs/stdenv/generic/default.nix                     | 4 +---
 12 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 0168eb42f2f..ac1a199d80c 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -26,7 +26,7 @@ in rec {
   allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
   none = [];
 
-  arm     = filterDoubles predicates.isArm32;
+  arm     = filterDoubles predicates.isArm;
   i686    = filterDoubles predicates.isi686;
   mips    = filterDoubles predicates.isMips;
   x86_64  = filterDoubles predicates.isx86_64;
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index b3971808a2b..05c1fe6fa54 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -66,7 +66,7 @@ let
     else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
     else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
     # ARM with a wildcard, which can be "" or "-armhf".
-    else if targetPlatform.isArm32                    then "${libc_lib}/lib/ld-linux*.so.3"
+    else if targetPlatform.isArm                      then "${libc_lib}/lib/ld-linux*.so.3"
     else if targetPlatform.system == "aarch64-linux"  then "${libc_lib}/lib/ld-linux-aarch64.so.1"
     else if targetPlatform.system == "powerpc-linux"  then "${libc_lib}/lib/ld.so.1"
     else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1"
diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix
index a37d94c36e0..8d28879fb06 100644
--- a/pkgs/build-support/gcc-wrapper-old/default.nix
+++ b/pkgs/build-support/gcc-wrapper-old/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation {
       (if targetPlatform.system == "i686-linux"     then "ld-linux.so.2" else
        if targetPlatform.system == "x86_64-linux"   then "ld-linux-x86-64.so.2" else
        # ARM with a wildcard, which can be "" or "-armhf".
-       if targetPlatform.isArm32                    then "ld-linux*.so.3" else
+       if targetPlatform.isArm                      then "ld-linux*.so.3" else
        if targetPlatform.system == "aarch64-linux"  then "ld-linux-aarch64.so.1" else
        if targetPlatform.system == "powerpc-linux"  then "ld.so.1" else
        if targetPlatform.system == "mips64el-linux" then "ld.so.1" else
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 4c52f4447d5..ea54e9b84f3 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -233,7 +233,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 76fa0b66375..5b9d368c457 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -319,7 +319,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 05bdcecb6a5..8990302eea2 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -319,7 +319,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 90b10f2acbd..f593e00ccfd 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -336,7 +336,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index bc408e28f58..25940420e9a 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -328,7 +328,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 78b499f096d..87d5c751e85 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -330,7 +330,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index c7f7b9d970a..46fcc53b3c4 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -317,7 +317,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index a528cb0bba9..549503f0013 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 17bf1f8b428..31de28fdc0c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -104,9 +104,7 @@ let
       # Utility flags to test the type of platform.
       inherit (hostPlatform)
         isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
-        isi686 isx86_64 is64bit isMips isBigEndian;
-      isArm = hostPlatform.isArm32;
-      isAarch64 = hostPlatform.isArm64;
+        isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian;
 
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;

From b471e125c25bda10570a9279c5f817b933987a8a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 24 Aug 2017 01:54:31 +0300
Subject: [PATCH 2563/3246] nixos/tests/installer: Add stdenvNoCC to
 extraDependencies

The installer tests are failing after 505e94256ef247dc54250
due to `nixos-rebuild switch` in the installed system trying to build
stdenvNoCC.

Seems that previously, stdenvNoCC wasn't in the installed
system either, but all the direct dependencies for the build were
(I don't really understand why, for that matter), so the building
actually went fine and everything worked.

But now gcc is also a direct build dependency due to allowedRequisites
containing gcc (even though it doesn't become a runtime dependency)
which doesn't get to the installed system.

All in all, let's ensure stdenvNoCC actually gets to the installed
system. It's after all necessary in almost any NixOS config build.
---
 nixos/tests/installer.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index d1fc3c85e99..a8090dc62ee 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -18,6 +18,9 @@ let
             <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
           ];
 
+        # To ensure that we can rebuild the grub configuration on the nixos-rebuild
+        system.extraDependencies = with pkgs; [ stdenvNoCC ];
+
         ${optionalString (bootLoader == "grub") ''
           boot.loader.grub.version = ${toString grubVersion};
           ${optionalString (grubVersion == 1) ''

From 0df187a17ae5a1c337e12057f719b0f85c965c68 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Wed, 23 Aug 2017 17:49:40 -0700
Subject: [PATCH 2564/3246] electron: 1.6.6 -> 1.7.5

---
 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 fc2651b9157..74884e6f5a8 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.6.6";
+  version = "1.7.5";
   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 = "1k6y1wcsb2z9h8wdj5f1z1fprvc3bvsj4rfx58if7q74qiq3q102";
+      sha256 = "1z1dzk6d2mfyms8lj8g6jn76m52izbd1d7c05k8h88m1syfsgav5";
       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 = "1hp42iy32lymh9d5zp4vr51qjrr83wjxmbws0c16yw7zchq7fr64";
+      sha256 = "1d3c3y5j99wbyxlzk1nkry0m1xgxy3mi4a6irvlgyxl729dnwi97";
       name = "${name}.zip";
     };
 

From d4ccf3f1b2af6c7666de2f313588652ac171e942 Mon Sep 17 00:00:00 2001
From: John Mercier <moaxcp@gmail.com>
Date: Mon, 21 Aug 2017 06:25:21 -0400
Subject: [PATCH 2565/3246] visualvm: 1.3.8 -> 1.3.9

---
 .../tools/java/visualvm/default.nix           | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 29d2f13ca9a..a71ee53dced 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -1,23 +1,36 @@
-{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2 }:
+{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "visualvm-1.3.8";
+  name = "visualvm-1.3.9";
 
   src = fetchzip {
-    url = "https://java.net/projects/visualvm/downloads/download/release138/visualvm_138.zip";
-    sha256 = "09wsi85z1g7bwyfhb37vw0gy3wl0j1cy35aj59rg7067q262gy1y";
+    url = "https://github.com/visualvm/visualvm.src/releases/download/1.3.9/visualvm_139.zip";
+    sha256 = "1gkdkxssh51jczhgv680i42jjrlia1vbpcqhxvf45xcq9xj95bm5";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     rm bin/visualvm.exe
+    rm platform/lib/nbexec64.exe
+    rm platform/lib/nbexec.exe
+    rm profiler/lib/deployed/jdk15/windows-amd64/profilerinterface.dll
+    rm profiler/lib/deployed/jdk15/windows/profilerinterface.dll
+    rm profiler/lib/deployed/jdk16/windows-amd64/profilerinterface.dll
+    rm profiler/lib/deployed/jdk16/windows/profilerinterface.dll
+    rm platform/modules/lib/amd64/jnidispatch-410.dll
+    rm platform/modules/lib/x86/jnidispatch-410.dll
+    rm platform/lib/nbexec.dll
+    rm platform/lib/nbexec64.dll
 
     substituteInPlace etc/visualvm.conf \
       --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \
       --replace "/path/to/jdk" "${jdk.home}" \
       --replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true '
 
+    substituteInPlace platform/lib/nbexec \
+      --replace /usr/bin/\''${awk} ${gawk}/bin/awk
+
     cp -r . $out
 
     # To get the native LAF, JVM needs to see GTK’s .so-s.

From 763f7f75783a7c49140ccd703135bbbb244f1522 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Wed, 23 Aug 2017 21:24:57 -0400
Subject: [PATCH 2566/3246] vscode-with-extension: improvements

 -  Now simply let the default `unpackPhase` unzip the vsix file. This
    should allow users to retrieve the extension directly from github.
 -  Extensions now installed using their unique id as install folder.
 -  Extensions under `vscode-extensions` now use the unique id
    as extension name.
---
 .../vscode-with-extensions/default.nix        |  8 ++--
 pkgs/misc/vscode-extensions/default.nix       | 17 +++++---
 pkgs/misc/vscode-extensions/vscode-utils.nix  | 39 +++++++------------
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode-with-extensions/default.nix
index 983acbbac19..c54c8a4277f 100644
--- a/pkgs/applications/editors/vscode-with-extensions/default.nix
+++ b/pkgs/applications/editors/vscode-with-extensions/default.nix
@@ -2,7 +2,7 @@
 , vscodeExtensions ? [] }:
 
 /*
-  `vsixExtensions`
+  `vscodeExtensions`
    :  A set of vscode extensions to be installed alongside the editor. Here's a an
       example:
 
@@ -10,12 +10,12 @@
       vscode-with-extensions.override {
 
         # When the extension is already available in the default extensions set.
-        vscodeExtensions = with vscodeExtensions; [
-          nix
+        vscodeExtensions = with vscode-extensions; [
+          bbenoist.Nix
         ]   
 
         # Concise version from the vscode market place when not available in the default set.
-        ++ vscodeUtils.extensionsFromVscodeMarketplace [
+        ++ vscode-utils.extensionsFromVscodeMarketplace [
           {
             name = "code-runner";
             publisher = "formulahendry";
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 12900907c00..d357c43abd8 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -3,16 +3,23 @@
 let
   inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension;
 in
-
+#
+# Unless there is a good reason not to, we attemp to use the same name as the 
+# extension's unique identifier (the name the extension gets when installed
+# from vscode under `~/.vscode`) and found on the marketplace extension page.
+# So an extension's attribute name should be of the form: 
+# "${mktplcRef.publisher}.${mktplcRef.name}".
+#
 rec {
-  nix = buildVscodeMarketplaceExtension {
+  bbenoist.Nix = buildVscodeMarketplaceExtension {
     mktplcRef = {
-        name = "nix";
+        name = "Nix";
         publisher = "bbenoist";
         version = "1.0.1";
         sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b";
     };
-
-    # TODO: Fill meta with appropriate information.
+    meta = with stdenv.lib; {
+      license = licenses.mit;
+    };
   };
 }
\ No newline at end of file
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix
index 759449a745b..f6e906ab575 100644
--- a/pkgs/misc/vscode-extensions/vscode-utils.nix
+++ b/pkgs/misc/vscode-extensions/vscode-utils.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, runCommand, vscode, which }:
+{ stdenv, lib, fetchurl, runCommand, vscode, unzip }:
 
 let
   extendedPkgVersion = lib.getVersion vscode;
@@ -7,13 +7,18 @@ let
   mktplcExtRefToFetchArgs = ext: {
     url = "https://${ext.publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${ext.publisher}/extension/${ext.name}/${ext.version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage";
     sha256 = ext.sha256;
-    name = "${ext.name}.vsix";
+    # The `*.vsix` file is in the end a simple zip file. Change the extension
+    # so that existing `unzip` hooks takes care of the unpacking.
+    name = "${ext.publisher}-${ext.name}.zip";
   };
 
   buildVscodeExtension = a@{
     name,
     namePrefix ? "${extendedPkgName}-extension-",
     src,
+    # Same as "Unique Identifier" on the extension's web page.
+    # For the moment, only serve as unique extension dir.
+    vscodeExtUniqueId,
     configurePhase ? ":",
     buildPhase ? ":",
     dontPatchELF ? true,
@@ -21,35 +26,18 @@ let
     buildInputs ? [],
     ...
   }:
-  stdenv.mkDerivation (a // {
+  stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) //  {
 
     name = namePrefix + name;
 
+    inherit vscodeExtUniqueId;
     inherit configurePhase buildPhase dontPatchELF dontStrip;
 
-    # TODO: `which` is an encapsulation leak. It should have been hardwired
-    #       as part of the `code` wrapper. 
-    buildInputs = [ vscode which ] ++ buildInputs;
-
-    unpackPhase = ''
-      # TODO: Unfortunately, 'code' systematically creates its '.vscode' directory
-      # even tough it has nothing to write in it. We need to redirect this
-      # to a writeable location as the nix environment already has (but
-      # to a non writeable one) otherwise the write will fail.
-      # It would be preferrable if we could intercept / fix this at the source.
-      HOME="$PWD/code_null_home" code \
-        --extensions-dir "$PWD" \
-        --install-extension "${toString src}"
-
-      rm -Rf "$PWD/code_null_home"
-      cd "$(find . -mindepth 1 -type d -print -quit)"
-      ls -la
-    '';
-
+    buildInputs = [ unzip ] ++ buildInputs;
 
     installPhase = ''
-      mkdir -p "$out/share/${extendedPkgName}/extensions/${name}"
-      find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${name}/"
+      mkdir -p "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}"
+      find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/"
     '';
 
   });
@@ -65,8 +53,9 @@ let
     ...
   }: assert "" == name; assert null == src;
   buildVscodeExtension ((removeAttrs a [ "mktplcRef" ]) // {
-    name = "${mktplcRef.name}-${mktplcRef.version}";
+    name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}";
     src = fetchVsixFromVscodeMarketplace mktplcRef;
+    vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}";
   });
 
   mktplcRefAttrList = [

From af852d08ac9649df9085f0a2f1582c7a41f2d625 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 21 Jul 2017 08:45:03 -0700
Subject: [PATCH 2567/3246] dgraph: init at 0.8.1

---
 pkgs/servers/dgraph/default.nix |  48 +++++
 pkgs/servers/dgraph/deps.nix    | 326 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |   2 +
 3 files changed, 376 insertions(+)
 create mode 100644 pkgs/servers/dgraph/default.nix
 create mode 100644 pkgs/servers/dgraph/deps.nix

diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix
new file mode 100644
index 00000000000..1712476b923
--- /dev/null
+++ b/pkgs/servers/dgraph/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "dgraph-${version}";
+  version = "0.8.1";
+
+  goPackagePath = "github.com/dgraph-io/dgraph";
+
+  src = fetchFromGitHub {
+    owner = "dgraph-io";
+    repo = "dgraph";
+    rev = "v${version}";
+    sha256 = "1gls2pvgcmd364x84gz5fafs7pwkll4k352rg1lmv70wvzyydsdr";
+  };
+
+  extraOutputsToInstall = [ "dashboard" ];
+
+  goDeps = ./deps.nix;
+  subPackages = [ "cmd/dgraph" "cmd/dgraphloader" ];
+
+  # let's move the dashboard to a different output, to prevent $bin from
+  # depending on $out
+  # TODO: provide a proper npm application for the dashboard.
+  postPatch = ''
+    mv dashboard/* $dashboard
+  '';
+
+  preBuild = ''
+    export buildFlagsArray="-ldflags=\
+      -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version} \
+      -X github.com/dgraph-io/dgraph/cmd/dgraph/main.uiDir=$dashboard/src/assets/"
+  '';
+
+  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+    # Somehow on Darwin, $out/lib (which doesn't exist) ends up in RPATH.
+    # Removing it fixes cycle between $out and $bin
+    install_name_tool -delete_rpath $out/lib $bin/bin/dgraph
+    install_name_tool -delete_rpath $out/lib $bin/bin/dgraphloader
+  '';
+ 
+  meta = {
+    homepage = "https://dgraph.io/";
+    description = "Fast, Distributed Graph DB";
+    maintainers = with stdenv.lib.maintainers; [ sigma ];
+    license = stdenv.lib.licenses.agpl3;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/servers/dgraph/deps.nix b/pkgs/servers/dgraph/deps.nix
new file mode 100644
index 00000000000..2e03c75489b
--- /dev/null
+++ b/pkgs/servers/dgraph/deps.nix
@@ -0,0 +1,326 @@
+[
+  {
+    goPackagePath = "github.com/AndreasBriese/bbloom";
+    fetch = {
+      type = "git";
+      url = "https://github.com/AndreasBriese/bbloom";
+      rev = "28f7e881ca57bc00e028f9ede9f0d9104cfeef5e";
+      sha256 = "03cqhqvdz8c9by5w5ls4kwnnwlm6b2kkslc6m120fanw1lgamfzp";
+    };
+  }
+  {
+    goPackagePath = "github.com/MakeNowJust/heredoc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/MakeNowJust/heredoc";
+      rev = "1d91351acdc1cb2f2c995864674b754134b86ca7";
+      sha256 = "0ia1r8ibqmx6zv3wmsvgkpqlhwk79z9l38nzp4gd4f1kcb46856x";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+    };
+  }
+  {
+    goPackagePath = "github.com/bkaradzic/go-lz4";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bkaradzic/go-lz4";
+      rev = "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a";
+      sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb";
+    };
+  }
+  {
+    goPackagePath = "github.com/blevesearch/bleve";
+    fetch = {
+      type = "git";
+      url = "https://github.com/blevesearch/bleve";
+      rev = "a7ebb8480579777c6cd1c4750d2e6b5ff2b49bdd";
+      sha256 = "121jhd158slf4050kmghz25jrvv7gbsan31wr0nxyw9z32lyf6yx";
+    };
+  }
+  {
+    goPackagePath = "github.com/blevesearch/blevex";
+    fetch = {
+      type = "git";
+      url = "https://github.com/blevesearch/blevex";
+      rev = "507dcd576550f9f3260f11495ba2de4e96773a3e";
+      sha256 = "0i9azysvia99fjpx525qnc5rcgv45hfvl3zcs58gvgqyxpzpc78z";
+    };
+  }
+  {
+    goPackagePath = "github.com/blevesearch/go-porterstemmer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/blevesearch/go-porterstemmer";
+      rev = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e";
+      sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d";
+    };
+  }
+  {
+    goPackagePath = "github.com/blevesearch/segment";
+    fetch = {
+      type = "git";
+      url = "https://github.com/blevesearch/segment";
+      rev = "762005e7a34fd909a84586299f1dd457371d36ee";
+      sha256 = "1nrm145sm0xlhqy3d12yipnb16ikjz9ykjcskmkgm7vjm47xkmfl";
+    };
+  }
+  {
+    goPackagePath = "github.com/cockroachdb/cmux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cockroachdb/cmux";
+      rev = "30d10be492927e2dcae0089c374c455d42414fcb";
+      sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx";
+    };
+  }
+  {
+    goPackagePath = "github.com/codahale/hdrhistogram";
+    fetch = {
+      type = "git";
+      url = "https://github.com/codahale/hdrhistogram";
+      rev = "3a0bb77429bd3a61596f5e8a3172445844342120";
+      sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/etcd";
+      rev = "1ebeef5cbfe69c0dab2bc701ee5307eed7a7d8d2";
+      sha256 = "12lidn1a8nwsk6nlwyfirrxkxhs4lhj53f4cd19xm8w070q0mg19";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9";
+      sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgraph-io/badger";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgraph-io/badger";
+      rev = "ad23a425b3c87b8223780cb882bed568ca14b9f0";
+      sha256 = "1xjd05vska1kanmgdhp5cvkn2i6236rqphrc9i4kfjndgwkmas57";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgryski/go-farm";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgryski/go-farm";
+      rev = "d1e51a4af19092715f4ce7d8257fe5bc8f8be727";
+      sha256 = "00iijjzdg8g6jbzhdbfw8s2rf0k25gxw4x7h7r6mkxcq18n69182";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "e57a569e1882958f6b188cb42231d6db87701f2a";
+      sha256 = "0r3jpmp6wp4xyrh1ikr8iqld3rg4r1yhv99zxw5zd7d2zprw9yfc";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/geo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/geo";
+      rev = "3a42ea109208469f16baf9e090135dd0e82ece5c";
+      sha256 = "1fzlakjj94gv516q7gd9qycn91lij7wmjbdv0vsrh6qnxvgqr8hw";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef";
+      sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/codesearch";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/codesearch";
+      rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
+      sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";
+    };
+  }
+  {
+    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/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "17b591df37844cde689f4d5813e5cea0927d8dd2";
+      sha256 = "1f400f1682h1wdjknlh1ad95rbss09g0ia36a8w102bf2f1qfq8l";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/profile";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/profile";
+      rev = "5b67d428864e92711fcbd2f8629456121a56d91f";
+      sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "310ce84375bb84c5cbbf0d05069c92daa5673740";
+      sha256 = "11awb5bjkwqj7va3v7fgniwqkjqhmhjkp01rdvnv4xfp1laxwn7v";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
+      sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "0866df4b85a18d652b6965be022d007cdf076822";
+      sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2";
+      sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "976c720a22c8eb4eb6a0b4348ad85ad12491a506";
+      sha256 = "0a2gxvqzacrj9k8h022zhr8fchhn9afc6a511m07j71dzw9g4y3m";
+    };
+  }
+  {
+    goPackagePath = "github.com/tebeka/snowball";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tebeka/snowball";
+      rev = "6b06bd306c4e4442a63e546752278920ae487934";
+      sha256 = "110akijkb55k5h7m6mra8fircvi4sxd5xq7lcjgyiqj96srq8v2k";
+    };
+  }
+  {
+    goPackagePath = "github.com/twpayne/go-geom";
+    fetch = {
+      type = "git";
+      url = "https://github.com/twpayne/go-geom";
+      rev = "6753ad11e46b04e21b3f286b342e73a8c4be8216";
+      sha256 = "0qyrdnp7j7lmj0qb0p7k45m757zvbwn78s1apiy46zfnb5415df1";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "22ddb68eccda408bbf17759ac18d3120ce0d4f3f";
+      sha256 = "07ks6qal02iz24vv54qyb90wmsg9vwqc14abf68rakprpy26qwsg";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "d1e1b351919c6738fdeb9893d5c998b161464f0c";
+      sha256 = "0qzbfah03z992zyygfp7imjjas5np2gcar5aanx5y3av5g68ggjp";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "abf9c25f54453410d0c6668e519582a9e1115027";
+      sha256 = "0dmpqjfif2zg6776d366js60k21g81jvsr3jm9dc7fv7w3282al4";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720";
+      sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev = "b0a3dcfcd1a9bd48e63634bd8802960804cf8315";
+      sha256 = "0lkj73lyr4dzj2pxgmild0i1bl6kdgrxa3c8m44j5ms537pyxcpr";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev = "2bb318258959db281674bc6fd67b5167b7ff0d65";
+      sha256 = "1g8ir87ksr8549801vdgb0n6rmxws05ky50bkgjv86370h146cqm";
+    };
+  }
+  {
+    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 4ca0dcbc9f6..820f51b4f9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11073,6 +11073,8 @@ with pkgs;
 
   dex-oidc = callPackage ../servers/dex { };
 
+  dgraph = callPackage ../servers/dgraph { };
+    
   dico = callPackage ../servers/dico { };
 
   dict = callPackage ../servers/dict {

From 0d80fabbf95715dfef19468bef2306b67c5dac88 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 24 Aug 2017 04:22:07 +0000
Subject: [PATCH 2568/3246] mirrors: update apache and cpan mirrors

removed dead mirrors, added new
---
 pkgs/build-support/fetchurl/mirrors.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 4861d4b7c35..d612db64c12 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -159,8 +159,9 @@ rec {
   cpan = [
     http://ftp.gwdg.de/pub/languages/perl/CPAN/
     ftp://download.xs4all.nl/pub/mirror/CPAN/
-    ftp://ftp.nl.uu.net/pub/CPAN/
+    http://ftp.tuwien.ac.at/pub/CPAN/
     http://ftp.funet.fi/pub/CPAN/
+    https://cpan.metacpan.org/
     http://cpan.perl.org/
     http://backpan.perl.org/  # for old releases
   ];
@@ -266,15 +267,14 @@ rec {
   # Apache mirrors (see http://www.apache.org/mirrors/).
   apache = [
     http://www.eu.apache.org/dist/
-    ftp://ftp.inria.fr/pub/Apache/
-    http://apache.cict.fr/
+    http://wwwftp.ciril.fr/pub/apache/
     ftp://ftp.fu-berlin.de/unix/www/apache/
-    ftp://crysys.hit.bme.hu/pub/apache/dist/
+    http://ftp.tudelft.nl/apache/
     http://mirror.cc.columbia.edu/pub/software/apache/
     http://www.apache.org/dist/
     http://archive.apache.org/dist/ # fallback for old releases
     ftp://ftp.funet.fi/pub/mirrors/apache.org/
-    http://apache.cs.uu.nl/dist/
+    http://apache.cs.uu.nl/
     http://apache.cs.utah.edu/
   ];
 

From d444c0056be79d2dba34a764c72f0a6ad29d60de Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 24 Aug 2017 08:21:15 +0200
Subject: [PATCH 2569/3246] zinnia: 2015-03-15 -> 2016-08-28

This fixes the build issue with GCC 6.
---
 pkgs/tools/inputmethods/zinnia/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix
index 62e9f6798b1..18e6176b706 100644
--- a/pkgs/tools/inputmethods/zinnia/default.nix
+++ b/pkgs/tools/inputmethods/zinnia/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "zinnia-${version}";
-  version = "2015-03-15";
+  version = "2016-08-28";
 
   src = fetchFromGitHub {
     owner = "taku910";
     repo = "zinnia";
-    rev = "d8de1180d5175d7579e6c41b000f1ab4dd9cd697";
-    sha256 = "ac09a16c04c5ef9b46626984e627250dc717d85711d14f1bbfa7f1ca0ca713dc";
+    rev = "fd74d8c8680bb3df8692279151ea6339ab68e32b";
+    sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg";
   };
 
   setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)";

From f1711c8fbd3886ba331073b99c93aaa135274d63 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 24 Aug 2017 09:33:28 +0300
Subject: [PATCH 2570/3246] openjk: init at 2017-08-11

---
 pkgs/games/openjk/default.nix   | 38 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/games/openjk/default.nix

diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
new file mode 100644
index 00000000000..dc6d3595416
--- /dev/null
+++ b/pkgs/games/openjk/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, makeWrapper, cmake, libjpeg, zlib, libpng, mesa_noglu, SDL2 }:
+
+stdenv.mkDerivation rec {
+  name = "OpenJK-2017-08-11";
+
+  src = fetchFromGitHub {
+    owner = "JACoders";
+    repo = "OpenJK";
+    rev = "a0828f06e0181c62e110f2f78d30acb5036b4113";
+    sha256 = "1wbb643z2nyhyirzzy3rz03wjqglwmsgnj7w5cl8167f9f9j9w0m";
+  };
+
+  dontAddPrefix = true;
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ makeWrapper cmake ];
+  buildInputs = [ libjpeg zlib libpng mesa_noglu SDL2 ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$out/opt")
+  '';
+
+  postInstall = ''
+    mkdir -p $out/bin
+    prefix=$out/opt/JediAcademy
+    makeWrapper $prefix/openjk.* $out/bin/jamp --run "cd $prefix"
+    makeWrapper $prefix/openjk_sp.* $out/bin/jasp --run "cd $prefix"
+    makeWrapper $prefix/openjkded.* $out/bin/openjkded --run "cd $prefix"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An open-source engine for Star Wars Jedi Academy game";
+    homepage = https://github.com/JACoders/OpenJK;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ gnidorah ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8461b88299..6edb8a6ff70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17388,6 +17388,8 @@ with pkgs;
 
   openclonk = callPackage ../games/openclonk { };
 
+  openjk = callPackage ../games/openjk { };
+
   openmw = callPackage ../games/openmw { };
 
   openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix {

From 8137a8cb73833432e8da8281663b56ac01d3ba0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 24 Aug 2017 10:57:50 +0200
Subject: [PATCH 2571/3246] gawk: refactor

- Don't build with libsigsegv by default.  The build apparently attempted
  to link against it, but it never retained the reference anyway...
- Side effect: stdenv bootstrapping needs no libsigsegv anymore.
- Run checks, but only in the interactive gawk by default on Linux,
  so that stdenv bootstrap isn't slowed down (by glibc locales, etc.).
- xz should be no longer needed in inputs, as we have it in stdenvs now.

The whole change was triggered by some used kernel versions still
breaking libsigsegv tests #28464.
---
 pkgs/stdenv/linux/default.nix    |  5 ++-
 pkgs/tools/text/gawk/default.nix | 62 ++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 5c03d83d5f7..48deb9a5c02 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -303,7 +303,10 @@ in
             gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
           ]
         # Library dependencies
-        ++ map getLib [ attr acl zlib pcre libsigsegv ]
+        ++ map getLib (
+            [ attr acl zlib pcre ]
+            ++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv
+          )
         # More complicated cases
         ++ [
             glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index dec7af04525..415a2ade28d 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,5 +1,19 @@
-{ stdenv, fetchurl, xz, libsigsegv, readline, interactive ? false
-, locale ? null }:
+{ stdenv, fetchurl
+# TODO: links -lsigsegv but loses the reference for some reason
+, withSigsegv ? (false && stdenv.system != "x86_64-cygwin"), libsigsegv
+, interactive ? false, readline
+
+/* Test suite broke on:
+       stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
+    || stdenv.isDarwin # XXX: `locale' segfaults
+    || stdenv.isSunOS  # XXX: `_backsmalls1' fails, locale stuff?
+    || stdenv.isFreeBSD
+*/
+, doCheck ? (interactive && stdenv.isLinux), glibcLocales ? null
+, locale ? null
+}:
+
+assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
 
 let
   inherit (stdenv.lib) optional;
@@ -13,36 +27,30 @@ stdenv.mkDerivation rec {
   };
 
   # When we do build separate interactive version, it makes sense to always include man.
-  outputs = [ "out" "info" ] ++ stdenv.lib.optional (!interactive) "man";
+  outputs = [ "out" "info" ] ++ optional (!interactive) "man";
 
-  # FIXME: 4.1.4 testsuite breaks when only C locales are available
-  doCheck = false /*!(
-       stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
-    || stdenv.isDarwin # XXX: `locale' segfaults
-    || stdenv.isSunOS  # XXX: `_backsmalls1' fails, locale stuff?
-    || stdenv.isFreeBSD
-  )*/;
+  nativeBuildInputs = optional (doCheck && stdenv.isLinux) glibcLocales;
 
-  nativeBuildInputs = [ xz.bin ];
   buildInputs =
-       stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
-    ++ stdenv.lib.optional interactive readline
-    ++ stdenv.lib.optional stdenv.isDarwin locale;
+       optional withSigsegv libsigsegv
+    ++ optional interactive readline
+    ++ optional stdenv.isDarwin locale;
 
-  configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
-    ++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")];
+  configureFlags = [
+    (if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv")
+    (if interactive then "--with-readline=${readline.dev}" else "--without-readline")
+  ];
 
-  postInstall =
-    if interactive then
-      ''
-        rm "$out"/bin/gawk-*
-        ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
-      ''
-    else # TODO: remove this other branch on a stdenv rebuild
-      ''
-        rm $out/bin/gawk-*
-        ln -s $man/share/man/man1/gawk.1 $man/share/man/man1/awk.1
-      '';
+  inherit doCheck;
+
+  postInstall = ''
+    rm "$out"/bin/gawk-*
+    ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
+  '';
+
+  passthru = {
+    libsigsegv = if withSigsegv then libsigsegv else null; # for stdenv bootstrap
+  };
 
   meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/gawk/;

From 2131b0925a48e7ba47861104a45d13d41cd8cf53 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 24 Aug 2017 17:10:56 +0700
Subject: [PATCH 2572/3246] luaPackages.luacheck : init at 0.20.0

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index f33b397958c..91efa306ce4 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -71,6 +71,32 @@ let
     };
   };
 
+  luacheck = buildLuaPackage rec {
+    pname = "luacheck";
+    version = "0.20.0";
+    name = "${pname}${version}";
+
+    src = fetchFromGitHub {
+      owner = "mpeterv";
+      repo = "luacheck";
+      rev = "${version}";
+      sha256 = "0ahfkmqcjhlb7r99bswy1sly6d7p4pyw5f4x4fxnxzjhbq0c5qcs";
+    };
+
+    propagatedBuildInputs = [ lua ];
+
+    installPhase = ''
+      ${lua}/bin/lua install.lua $out
+      '';
+
+    meta = with stdenv.lib; {
+      description = "A tool for linting and static analysis of Lua code";
+      homepage = https://github.com/mpeterv/luacheck;
+      license = licenses.mit;
+      platforms = platforms.unix;
+    };
+  };
+
   luaevent = buildLuaPackage rec {
     version = "0.4.3";
     name = "luaevent-${version}";

From 30b21f11dd605bfafed9ef66e2553b291fad08a0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 24 Aug 2017 12:14:26 +0200
Subject: [PATCH 2573/3246] perl-IO-Socket-SSL: 2.039 -> 2.050

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b570e6d22de..d766c96962f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7075,10 +7075,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOSocketSSL = buildPerlPackage rec {
-    name = "IO-Socket-SSL-2.039";
+    name = "IO-Socket-SSL-2.050";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz";
-      sha256 = "c6379a76860c724a22b79ebe9e91d26bd8a04e3ce035bacfd15de3d9beaf83ac";
+      sha256 = "54e6716e40df8b1c168d8f54a0b8f215313739bd99dda17adb7c00fe94656692";
     };
     propagatedBuildInputs = [ NetSSLeay URI ];
     # Fix path to default certificate store.

From 2913bfb25074787bf077b5b22dd9441b412718de Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 24 Aug 2017 12:49:42 +0200
Subject: [PATCH 2574/3246] perl-Git-PurePerl: 0.51 -> 0.53

---
 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 d766c96962f..f1e7a78c8ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5947,14 +5947,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  GitPurePerl = buildPerlPackage {
-    name = "Git-PurePerl-0.51";
+  GitPurePerl = buildPerlPackage rec {
+    name = "Git-PurePerl-0.53";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BR/BROQ/Git-PurePerl-0.51.tar.gz;
-      sha256 = "3775f385ae566ea392ece0913a06ffec46441a1273c19ba9a6d990574ec34d00";
+      url = "mirror://cpan/authors/id/B/BR/BROQ/${name}.tar.gz";
+      sha256 = "987c74366cc4c37ee084050f985fa254359c89c12507f5b8bfc6607de538d5a8";
     };
     buildInputs = [ Testutf8 ];
-    propagatedBuildInputs = [ ConfigGitLike DataStreamBulk DateTime FileFindRule IODigest Moose MooseXStrictConstructor MooseXTypesPathClass namespaceautoclean ];
+    propagatedBuildInputs = [ ArchiveExtract ConfigGitLike DataStreamBulk DateTime FileFindRule IODigest Moose MooseXStrictConstructor MooseXTypesPathClass namespaceautoclean ];
     doCheck = false;
     meta = {
       description = "A Pure Perl interface to Git repositories";

From 9351c5c3b559ddebcb2af2bc907af1a99391fbc8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 24 Aug 2017 12:50:12 +0200
Subject: [PATCH 2575/3246] perl-Connector: 1.16 -> 1.22

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f1e7a78c8ff..f87fab44677 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2374,13 +2374,21 @@ let self = _self // overrides; _self = with self; {
   };
 
   Connector = buildPerlPackage rec {
-    name = "Connector-1.16";
+    name = "Connector-1.22";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/${name}.tar.gz";
-      sha256 = "0rbx4n86y5sdkff37w8djw1ahxrg79bsfgbrph3kjhh4jzd20q09";
+      sha256 = "aa178d1865817ad2dea5c79645c8e6420ca2cfb951f20c98b5154307de219016";
+    };
+    buildInputs = [ ConfigMerge ConfigStd ConfigVersioned CryptSSLeay DBDSQLite DBI IOSocketSSL LWPProtocolhttps LWPUserAgent TemplateToolkit YAML ];
+    propagatedBuildInputs = [ LogLog4perl Moose ];
+    prePatch = ''
+      # Attempts to use network.
+      rm t/01-proxy-http.t
+    '';
+    meta = {
+      description = "A generic connection to a hierarchical-structured data set";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    buildInputs = [ Moose ConfigStd YAML PathClass DateTime Log4Perl
-      ConfigVersioned TemplateToolkit];
   };
 
   ConvertASN1 = buildPerlPackage rec {

From 6a51bc8bd3d85f9445f3ed5869da6b5bc756e92e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 24 Aug 2017 11:21:26 +0200
Subject: [PATCH 2576/3246] metasploit: 4.14.25 -> 4.16.1

---
 pkgs/tools/security/metasploit/Gemfile      |   2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 106 +++++++----
 pkgs/tools/security/metasploit/default.nix  |   8 +-
 pkgs/tools/security/metasploit/gemset.nix   | 196 +++++++++++++++-----
 4 files changed, 220 insertions(+), 92 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index de44760bde7..99d7556db2d 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/4.14.25"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/4.16.1"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index d3a88a50aec..d15df5e56c2 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,15 +1,17 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 8a194207f07c2b8c91c1a72e57c25683d4e9f744
-  ref: refs/tags/4.14.25
+  revision: dbec1c2d2ae4bd77276cbfb3c6ee2902048b9453
+  ref: refs/tags/4.16.1
   specs:
-    metasploit-framework (4.14.25)
+    metasploit-framework (4.16.1)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
       backports
       bcrypt
+      bcrypt_pbkdf
       bit-struct
+      dnsruby
       filesize
       jsobfu
       json
@@ -17,9 +19,9 @@ GIT
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.2.32)
+      metasploit-payloads (= 1.3.1)
       metasploit_data_models
-      metasploit_payloads-mettle (= 0.1.9)
+      metasploit_payloads-mettle (= 0.2.0)
       msgpack
       nessus_rest
       net-ssh
@@ -32,9 +34,12 @@ GIT
       packetfu
       patch_finder
       pcaprub
-      pg
+      pdf-reader
+      pg (= 0.20.0)
       railties
       rb-readline
+      rbnacl (< 5.0.0)
+      rbnacl-libsodium
       recog
       redcarpet
       rex-arch
@@ -46,7 +51,7 @@ GIT
       rex-mime
       rex-nop
       rex-ole
-      rex-powershell
+      rex-powershell (< 0.1.73)
       rex-random_identifier
       rex-registry
       rex-rop_builder
@@ -64,62 +69,69 @@ GIT
       tzinfo
       tzinfo-data
       windows_error
+      xdr
       xmlrpc
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
+    Ascii85 (1.0.2)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
       arel (~> 6.0)
-    activesupport (4.2.8)
+    activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
+    afm (0.2.2)
     arel (6.0.4)
     arel-helpers (2.4.0)
       activerecord (>= 3.1.0, < 6)
     backports (3.8.0)
     bcrypt (3.1.11)
+    bcrypt_pbkdf (1.0.0)
     bindata (2.4.0)
     bit-struct (0.16)
     builder (3.2.3)
+    dnsruby (1.60.2)
     erubis (2.7.0)
-    faraday (0.12.1)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.18)
     filesize (0.1.1)
-    i18n (0.8.4)
+    hashery (2.1.2)
+    i18n (0.8.6)
     jsobfu (0.4.2)
       rkelly-remix
     json (2.1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     metasm (1.0.3)
-    metasploit-concern (2.0.4)
+    metasploit-concern (2.0.5)
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-credential (2.0.10)
+    metasploit-credential (2.0.12)
       metasploit-concern
       metasploit-model
       metasploit_data_models
@@ -132,8 +144,8 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.2.32)
-    metasploit_data_models (2.0.14)
+    metasploit-payloads (1.3.1)
+    metasploit_data_models (2.0.15)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
       arel-helpers
@@ -143,15 +155,15 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.1.9)
+    metasploit_payloads-mettle (0.2.0)
     mini_portile2 (2.2.0)
-    minitest (5.10.2)
+    minitest (5.10.3)
     msgpack (1.1.0)
     multipart-post (2.0.0)
     nessus_rest (0.1.6)
     net-ssh (4.1.0)
     network_interface (0.0.1)
-    nexpose (6.0.0)
+    nexpose (6.1.1)
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
     octokit (4.7.0)
@@ -162,6 +174,12 @@ GEM
       pcaprub
     patch_finder (1.0.2)
     pcaprub (0.12.4)
+    pdf-reader (2.0.0)
+      Ascii85 (~> 1.0.0)
+      afm (~> 0.2.1)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
     pg (0.20.0)
     pg_array_parser (0.0.9)
     postgres_ext (3.0.0)
@@ -180,25 +198,29 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
-    rb-readline (0.5.4)
-    recog (2.1.8)
+    rb-readline (0.5.5)
+    rbnacl (4.0.2)
+      ffi
+    rbnacl-libsodium (1.0.13)
+      rbnacl (>= 3.0.1)
+    recog (2.1.12)
       nokogiri
     redcarpet (3.4.0)
-    rex-arch (0.1.8)
+    rex-arch (0.1.11)
       rex-text
-    rex-bin_tools (0.1.3)
+    rex-bin_tools (0.1.4)
       metasm
       rex-arch
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.10)
+    rex-core (0.1.12)
     rex-encoder (0.1.4)
       metasm
       rex-arch
@@ -226,9 +248,10 @@ GEM
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.6)
+    rex-socket (0.1.8)
+      rex-core
+    rex-sslscan (0.1.5)
       rex-core
-    rex-sslscan (0.1.4)
       rex-socket
       rex-text
     rex-struct2 (0.1.2)
@@ -237,6 +260,7 @@ GEM
       rex-text
     rkelly-remix (0.0.7)
     robots (0.10.1)
+    ruby-rc4 (0.1.5)
     ruby_smb (0.0.18)
       bindata
       rubyntlm
@@ -248,13 +272,17 @@ GEM
       faraday (~> 0.8, < 1.0)
     sqlite3 (1.3.13)
     sshkey (1.9.0)
-    thor (0.19.4)
+    thor (0.20.0)
     thread_safe (0.3.6)
+    ttfunk (1.5.1)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     tzinfo-data (1.2017.2)
       tzinfo (>= 1.0.0)
     windows_error (0.1.2)
+    xdr (2.0.0)
+      activemodel (>= 4.2.7)
+      activesupport (>= 4.2.7)
     xmlrpc (0.3.0)
 
 PLATFORMS
@@ -264,4 +292,4 @@ DEPENDENCIES
   metasploit-framework!
 
 BUNDLED WITH
-   1.14.6
+   1.15.0
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 4cc287c40f2..15a30db522e 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -4,6 +4,10 @@
 # 1. increment version number in expression and in Gemfile
 # 2. run $ nix-shell --command "bundler install && bundix"
 #    in metasploit in nixpkgs
+# 3. run $ sed -i '/[ ]*dependencies =/d' gemset.nix
+# 4. run $ nix-build -A metasploit ../../../../
+# 5. update sha256sum in expression
+# 6. run step 3 again
 
 let
   env = bundlerEnv {
@@ -13,13 +17,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "metasploit-framework-${version}";
-  version = "4.14.25";
+  version = "4.16.1";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "0cp1ybq29a0r7kabg4p2yj0qm90hjvr4xxp0pynb2g406sbyycjm";
+    sha256 = "1vilyy0dqzp8kbbpvs2zrv2ac7s39w2vv7mrbzgcjgh2bj7c6bg1";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index ff3e4d5d832..4262e64efb0 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -2,42 +2,42 @@
   actionpack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09fbazl0ja80na2wadfp3fzmdmdy1lsb4wd2yg7anbj0zk0ap7a9";
+      sha256 = "1kgrq74gp2czzxr0f2sqrc98llz03lgq498300z2z5n4khgznwc4";
       type = "gem";
     };
-    version = "4.2.8";
+    version = "4.2.9";
   };
   actionview = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mg4a8143q2wjhjq4mngl69jkv249z5jvg0jkdribdv4zkg586rp";
+      sha256 = "04kgp4gmahw31miz8xdq1pns14qmvvzd14fgfv7fg9klkw3bxyyp";
       type = "gem";
     };
-    version = "4.2.8";
+    version = "4.2.9";
   };
   activemodel = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11vhh7zmp92880s5sx8r32v2p0b7xg039mfr92pjynpkz4q901ld";
+      sha256 = "1qxmivny0ka5s3iyap08sn9bp2bd9wrhqp2njfw26hr9wsjk5kfv";
       type = "gem";
     };
-    version = "4.2.8";
+    version = "4.2.9";
   };
   activerecord = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kk4dhn8jfhqfsf1dmb3a183gix6k46xr6cjkxj0rp51w2za1ns0";
+      sha256 = "18i790dfhi4ndypd1pj9pv08knpxr2sayvvwfq7axj5jfwgpmrqb";
       type = "gem";
     };
-    version = "4.2.8";
+    version = "4.2.9";
   };
   activesupport = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wibdzd2f5l5rlsw1a1y3j3fhw2imrrbkxggdraa6q9qbdnc66hi";
+      sha256 = "1d0a362p3m2m2kljichar2pwq0qm4vblc3njy1rdzm09ckzd45sp";
       type = "gem";
     };
-    version = "4.2.8";
+    version = "4.2.9";
   };
   addressable = {
     source = {
@@ -47,6 +47,14 @@
     };
     version = "2.5.1";
   };
+  afm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06kj9hgd0z8pj27bxp2diwqh6fv7qhwwm17z64rhdc4sfn76jgn8";
+      type = "gem";
+    };
+    version = "0.2.2";
+  };
   arel = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -63,6 +71,14 @@
     };
     version = "2.4.0";
   };
+  Ascii85 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j95sbxd18kc8rhcnvl1w37kflqpax1r12h1x47gh4xxn3mz4m7q";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
   backports = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -79,6 +95,14 @@
     };
     version = "3.1.11";
   };
+  bcrypt_pbkdf = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   bindata = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -103,6 +127,14 @@
     };
     version = "3.2.3";
   };
+  dnsruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qfvpkka69f8vnmda3zhkr54fjpf7pwgmbx0gcsxg3jd6c7sjs1d";
+      type = "gem";
+    };
+    version = "1.60.2";
+  };
   erubis = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -114,10 +146,18 @@
   faraday = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wkx9844vacsk2229xbc27djf6zw15kqd60ifr78whf9mp9v6l03";
+      sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw";
       type = "gem";
     };
-    version = "0.12.1";
+    version = "0.13.1";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
+      type = "gem";
+    };
+    version = "1.9.18";
   };
   filesize = {
     source = {
@@ -127,13 +167,21 @@
     };
     version = "0.1.1";
   };
+  hashery = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qj8815bf7q6q7llm5rzdz279gzmpqmqqicxnzv066a020iwqffj";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
   i18n = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1j491wrfzham4nk8q4bifah3lx7nr8wp9ahfb7vd3hxn71v7kic7";
+      sha256 = "1i3aqvzfsj786kwjj70jsjpxm6ffw5pwhalzr2abjfv2bdc7k9kw";
       type = "gem";
     };
-    version = "0.8.4";
+    version = "0.8.6";
   };
   jsobfu = {
     source = {
@@ -170,28 +218,28 @@
   metasploit-concern = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kqby5ycxhr0jfzvjqkdgjbqqjrg8jlmcxw8myrm0875hybyl1mq";
+      sha256 = "0v9lm225fhzhnbjcc0vwb38ybikxwzlv8116rrrkndzs8qy79297";
       type = "gem";
     };
-    version = "2.0.4";
+    version = "2.0.5";
   };
   metasploit-credential = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zblyy2yv31zap6dzf3lpkhvnafkwbzdvr6nsqmyh95ci8yy1q6r";
+      sha256 = "1flahrcl5hf4bncqs40mry6pkffvmir85kqzkad22x3dh6crw50i";
       type = "gem";
     };
-    version = "2.0.10";
+    version = "2.0.12";
   };
   metasploit-framework = {
     source = {
       fetchSubmodules = false;
-      rev = "8a194207f07c2b8c91c1a72e57c25683d4e9f744";
-      sha256 = "0q7iv9wd65ji1cay6am4dskrlibvp3wyn66gvld8p1nfnnvn5vmq";
+      rev = "dbec1c2d2ae4bd77276cbfb3c6ee2902048b9453";
+      sha256 = "06a2dc64wl8w02zimf44hch4cap7ckw42kg1x01lmcwaa8d5q09w";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "4.14.25";
+    version = "4.16.1";
   };
   metasploit-model = {
     source = {
@@ -204,26 +252,26 @@
   metasploit-payloads = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dqnyzp60da6f8kgnbpjmv5xsg1hvyyd2jkkzbh69sgwp4nw3i9g";
+      sha256 = "0icha08z4c5rnyp66xcyn9c8lbv43gx7hgs9rsm3539gj8c40znx";
       type = "gem";
     };
-    version = "1.2.32";
+    version = "1.3.1";
   };
   metasploit_data_models = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hb2wsz3d4xgjf6dlf7nzxlv6q7rcdgn1pj79xs3g8al38zi129g";
+      sha256 = "0j3ijxn6n3ack9572a74cwknijymy41c8rx34njyhg25lx4hbvah";
       type = "gem";
     };
-    version = "2.0.14";
+    version = "2.0.15";
   };
   metasploit_payloads-mettle = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "058ijqznh4xqx3d6dph5gwdsmj96z4n46rl1mm85fyxpgpkifqd1";
+      sha256 = "1y2nfzgs17pq3xvlw14jgjcksr4h8p4miypxk9a87l1h7xv7dcgn";
       type = "gem";
     };
-    version = "0.1.9";
+    version = "0.2.0";
   };
   mini_portile2 = {
     source = {
@@ -236,10 +284,10 @@
   minitest = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11my86fnihvpndyknn3c14hc82nhsgggnhlxh8h3bdjpmfsvl0my";
+      sha256 = "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2";
       type = "gem";
     };
-    version = "5.10.2";
+    version = "5.10.3";
   };
   msgpack = {
     source = {
@@ -284,10 +332,10 @@
   nexpose = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jdhhzzs3b3rav6imx8jn9920cjj83yjvz35q169y0ppla2xzqbg";
+      sha256 = "0jnyvj09z8r3chhj930fdnashbfcfv0vw2drjvsrcnm7firdhdzb";
       type = "gem";
     };
-    version = "6.0.0";
+    version = "6.1.1";
   };
   nokogiri = {
     source = {
@@ -345,6 +393,14 @@
     };
     version = "0.12.4";
   };
+  pdf-reader = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nlammdpjy3padmzxhsql7mw31jyqp88n6bdffiarv5kzl4s3y7p";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
   pg = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -420,10 +476,10 @@
   railties = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bavl4hj7bnl3ryqi9rvykm410kflplgingkcxasfv1gdilddh4g";
+      sha256 = "1g5jnk1zllm2fr06lixq7gv8l2cwqc99akv7886gz6lshijpfyxd";
       type = "gem";
     };
-    version = "4.2.8";
+    version = "4.2.9";
   };
   rake = {
     source = {
@@ -436,18 +492,34 @@
   rb-readline = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "170m6d2298s9kfbd4y3zzj4irsnd15qlbgi6kk93m88lkh9qzy3a";
+      sha256 = "14w79a121czmvk1s953qfzww30mqjb2zc0k9qhi0ivxxk3hxg6wy";
       type = "gem";
     };
-    version = "0.5.4";
+    version = "0.5.5";
+  };
+  rbnacl = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08dkigw8wdx53hviw1zqrs7rcrzqcwh9jd3dvwr72013z9fmyp48";
+      type = "gem";
+    };
+    version = "4.0.2";
+  };
+  rbnacl-libsodium = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1323fli41m01af13xz5xvabsjnz09si1b9l4qd2p802kq0dr61gd";
+      type = "gem";
+    };
+    version = "1.0.13";
   };
   recog = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0d12889rx9ylm0jybg9n5sqx0v413hy9zjqs9rd9qjd1kjva7y87";
+      sha256 = "0h023ykrrra74bpbibkyg083kafaswvraw4naw9p1ghcjzn9ggj3";
       type = "gem";
     };
-    version = "2.1.8";
+    version = "2.1.12";
   };
   redcarpet = {
     source = {
@@ -460,26 +532,26 @@
   rex-arch = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13dyic499iblhddmy7w01ajr5l5rm6szagy6vz7sx138y21d1y6f";
+      sha256 = "1izzalmjwdyib8y0xlgys8qb60di6xyjk485ylgh14p47wkyc6yp";
       type = "gem";
     };
-    version = "0.1.8";
+    version = "0.1.11";
   };
   rex-bin_tools = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0skrbpyal6anh4g1nsaf9ypg5sd2ghxxmghasxw4p1s1i1xbmhwr";
+      sha256 = "01hi1cjr68adp47nxbjfprvn0r3b72r4ib82x9j33bf2pny6nvaw";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.4";
   };
   rex-core = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09xbslrwbc9d0rp24y1pdgc6650ciwicq4q7skjz74rprr9wj16f";
+      sha256 = "16dwf4pw7bpx8xvlv241imxvwhvjfv0cw9kl7ipsv40yazy5lzpk";
       type = "gem";
     };
-    version = "0.1.10";
+    version = "0.1.12";
   };
   rex-encoder = {
     source = {
@@ -564,18 +636,18 @@
   rex-socket = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r39782f2qpq83wsi72213v344gq4rccch98i376fx8bayh0dygh";
+      sha256 = "0bkr64qrfy2mcv6cpp2z2rn9npgn9s0yyagzjh7kawbm80ldwf2h";
       type = "gem";
     };
-    version = "0.1.6";
+    version = "0.1.8";
   };
   rex-sslscan = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r5cy1kng1ggjycn7a8vpval7clhr0yxhd7rgn2hasxl2p3c7i8v";
+      sha256 = "06gbx45q653ajcx099p0yxdqqxazfznbrqshd4nwiwg1p498lmyx";
       type = "gem";
     };
-    version = "0.1.4";
+    version = "0.1.5";
   };
   rex-struct2 = {
     source = {
@@ -617,6 +689,14 @@
     };
     version = "0.10.1";
   };
+  ruby-rc4 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00vci475258mmbvsdqkmqadlwn6gj9m01sp7b5a3zd90knil1k00";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
   ruby_smb = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -668,10 +748,10 @@
   thor = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns";
+      sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
       type = "gem";
     };
-    version = "0.19.4";
+    version = "0.20.0";
   };
   thread_safe = {
     source = {
@@ -681,6 +761,14 @@
     };
     version = "0.3.6";
   };
+  ttfunk = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
   tzinfo = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -705,6 +793,14 @@
     };
     version = "0.1.2";
   };
+  xdr = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c5cp1k4ij3xq1q6fb0f6xv5b65wy18y7bhwvsdx8wd0zyg3x96m";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
   xmlrpc = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -713,4 +809,4 @@
     };
     version = "0.3.0";
   };
-}
\ No newline at end of file
+}

From d6eb43eed4cc283c3d8377d7689c7e1453d676df Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 24 Aug 2017 12:50:20 +0200
Subject: [PATCH 2577/3246] quiterss: 0.18.6 -> 0.18.7

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

diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 6c3fc4af272..2bd6bd0a8ec 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
-  version = "0.18.6";
+  version = "0.18.7";
 
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
     rev = "${version}";
-    sha256 = "0qklgdv6b3zg4xil9yglja33vaa25d4i7vipv5aafhlavjz16mh6";
+    sha256 = "031n07s8dd0n3d5d4v9pza59iyvaim484n1qdnpbgamls2p8iwn6";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From 5674da5aed5edcab01378a506707fb78574c5b75 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 24 Aug 2017 14:43:57 +0300
Subject: [PATCH 2578/3246] Fix "treewide: Consistently call ARM 'arm'"

0c0fad6141cf3d62 was broken. I didn't realize there's some hidden
metaprogramming code where one can't even grep for 'isFoo' to find its
definition :(
---
 lib/systems/inspect.nix | 4 +---
 lib/systems/parse.nix   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index a81e88989c0..2d5353341f5 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -11,6 +11,7 @@ rec {
     PowerPC      = { cpu = cpuTypes.powerpc; };
     x86          = { cpu = { family = "x86"; }; };
     Arm          = { cpu = { family = "arm"; }; };
+    Aarch64      = { cpu = { family = "aarch64"; }; };
     Mips         = { cpu = { family = "mips"; }; };
     BigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
     LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
@@ -28,9 +29,6 @@ rec {
     Windows      = { kernel = kernels.windows; };
     Cygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
     MinGW        = { kernel = kernels.windows; abi = abis.gnu; };
-
-    Arm32        = recursiveUpdate Arm patterns."32bit";
-    Arm64        = recursiveUpdate Arm patterns."64bit";
   };
 
   matchAnyAttrs = patterns:
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index befe90f9abe..438d83685db 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -40,7 +40,7 @@ rec {
     armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
+    aarch64  = { bits = 64; significantByte = littleEndian; family = "aarch64"; };
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
     mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };

From 6d795e1baefac2cca9e5e97f2f222cc737ccc283 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 24 Aug 2017 14:08:15 +0200
Subject: [PATCH 2579/3246] ntbtls: init at 0.1.1

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

diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix
new file mode 100644
index 00000000000..b095c0366ad
--- /dev/null
+++ b/pkgs/development/libraries/ntbtls/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, libgpgerror, libgcrypt, libksba, zlib }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "ntbtls-${version}";
+  version = "0.1.1";
+
+  src = fetchurl {
+    url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2";
+    sha256 = "0d322kgih43vr0gvy7kdj4baql1d6fa71vgpv0z63ira9pk4q9rd";
+  };
+
+  outputs = [ "dev" "out" ];
+
+  buildInputs = [ libgcrypt libgpgerror libksba zlib ];
+
+  postInstall = ''
+    moveToOutput "bin/ntbtls-config" $dev
+  '';
+
+  meta = {
+    description = "A tiny TLS 1.2 only implementation";
+    homepage = https://www.gnupg.org/software/ntbtls/index.html;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ joachifm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d75dbc28b5..663258dec39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9634,6 +9634,8 @@ with pkgs;
 
   nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
 
+  ntbtls = callPackage ../development/libraries/ntbtls { };
+
   ntk = callPackage ../development/libraries/audio/ntk { };
 
   ntrack = callPackage ../development/libraries/ntrack { };

From be8e1b99176b384e7576369060be88432bb18ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 24 Aug 2017 14:35:26 +0200
Subject: [PATCH 2580/3246] copyq: 2.9.0 -> 3.0.3

- Updated to use qt5
- Added a required cmake patch (like this one for kdenlive
  https://github.com/NixOS/nixpkgs/issues/26160)
- Optional, by default true, dependency on qtwebkit
---
 .../misc/copyq/cmake-modules.patch             | 12 ++++++++++++
 pkgs/applications/misc/copyq/default.nix       | 18 +++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/misc/copyq/cmake-modules.patch

diff --git a/pkgs/applications/misc/copyq/cmake-modules.patch b/pkgs/applications/misc/copyq/cmake-modules.patch
new file mode 100644
index 00000000000..f21105763de
--- /dev/null
+++ b/pkgs/applications/misc/copyq/cmake-modules.patch
@@ -0,0 +1,12 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d910299e..69888477 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -99,6 +99,7 @@ endif()
+ 
+ # Qt modules
+ if (WITH_QT5)
++    find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script)
+     qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules})
+ else()
+     set(QT_USE_QTNETWORK TRUE)
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 7461f6853f4..4fd30c547b5 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}:
+{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git
+, webkitSupport ? true
+}:
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "2.9.0";
+  version = "3.0.3";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f";
+    sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl";
   };
 
+  patches = [
+    ./cmake-modules.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
-  
-  buildInputs = [ qt4 libXfixes libXtst ];
+
+  buildInputs = [
+    git qt5.full libXfixes libXtst
+  ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit;
 
   meta = with stdenv.lib; {
     homepage    = https://hluk.github.io/CopyQ;

From 3eca1c5500aa2477b078b9764949b1ef4bf0c117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Donval?= <gdonval+github@gmail.com>
Date: Thu, 24 Aug 2017 15:34:23 +0100
Subject: [PATCH 2581/3246] Add patch to enable SIGBUS capture

Kernels older than 3.18.6 emit SIGBUS signal upon stackoverflow instead of SIGSEGV. This patch enables the capture of SIGBUS (just as it is done on Darwin).

Applying it fixes https://github.com/NixOS/nixpkgs/issues/6028 and https://github.com/NixOS/nixpkgs/issues/28464#issuecomment-324255704
---
 pkgs/development/libraries/libsigsegv/sigbus_fix.patch | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 pkgs/development/libraries/libsigsegv/sigbus_fix.patch

diff --git a/pkgs/development/libraries/libsigsegv/sigbus_fix.patch b/pkgs/development/libraries/libsigsegv/sigbus_fix.patch
new file mode 100644
index 00000000000..6f1c399041d
--- /dev/null
+++ b/pkgs/development/libraries/libsigsegv/sigbus_fix.patch
@@ -0,0 +1,8 @@
+--- a/src/signals.h	2017-08-23 14:07:05.000000000 +0100
++++ b/src/signals.h	2017-08-23 14:06:53.000000000 +0100
+@@ -18,4 +18,4 @@
+ /* List of signals that are sent when an invalid virtual memory address
+    is accessed, or when the stack overflows.  */
+ #define SIGSEGV_FOR_ALL_SIGNALS(var,body) \
+-  { int var; var = SIGSEGV; { body } }
++  { int var; var = SIGSEGV; { body } var = SIGBUS; { body } }

From 2bd21c7bb559c410c785b729f8c9a1016ec276ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Thu, 24 Aug 2017 17:04:15 +0200
Subject: [PATCH 2582/3246] automatically removed whitespace as per
 .editorconfig

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c52732be98..56f915f372d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5460,7 +5460,7 @@ in {
   };
 
   easydict = callPackage ../development/python-modules/easydict { };
-  
+
   EasyProcess = buildPythonPackage rec {
     name = "EasyProcess-0.2.3";
 
@@ -7289,17 +7289,17 @@ in {
   logfury = buildPythonPackage rec {
     name = "logfury-${version}";
     version = "0.1.2";
-  
+
     src = pkgs.fetchurl {
       url = "mirror://pypi/l/logfury/${name}.tar.gz";
       sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2";
     };
-  
+
     buildInputs =
       [ self.funcsigs
         self.six
       ];
-  
+
     meta = with pkgs.stdenv.lib; {
       description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls.";
       homepage = "https://github.com/ppolewicz/logfury";
@@ -28755,17 +28755,17 @@ EOF
 
   cymem = callPackage ../development/python-modules/cymem { };
 
-  ftfy = callPackage ../development/python-modules/ftfy { };    
+  ftfy = callPackage ../development/python-modules/ftfy { };
 
-  murmurhash = callPackage ../development/python-modules/murmurhash { };      
+  murmurhash = callPackage ../development/python-modules/murmurhash { };
+
+  plac = callPackage ../development/python-modules/plac { };
 
-  plac = callPackage ../development/python-modules/plac { };        
-  
   preshed = callPackage ../development/python-modules/preshed { };
 
-  thinc = callPackage ../development/python-modules/thinc { };  
+  thinc = callPackage ../development/python-modules/thinc { };
 
-  spacy = callPackage ../development/python-modules/spacy { };  
+  spacy = callPackage ../development/python-modules/spacy { };
 });
 
 in fix' (extends overrides packages)

From 791ce593ce065cf074edf1509ff52ebc69136d9e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 9 Jul 2017 15:12:32 -0400
Subject: [PATCH 2583/3246] linux-headers: Improve derivation, removing cross
 arg

 - Perl is used at build time, so must be in `nativeBuildInputs`. It's
   not used at run time so it should not be in `buildInputs`, too.

 - Don't treat headers like a compiler---use the build and host
   platforms not host and target. Perhaps that would make sense if every
   library's headers could be a separate derivation, but since that is
   not feasible, best to keep the implementation and interface in the
   same stage.

   To do this, we used `stdenvNoCC` to get rid of the normal toolchain,
   and added a dependency for the toolchain targeting the build platform
   --- `buildPackages.stdenv.cc` --- thus everything is effectively slid
   a stage black.
---
 pkgs/os-specific/linux/kernel-headers/4.4.nix | 44 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  5 +--
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/4.4.nix b/pkgs/os-specific/linux/kernel-headers/4.4.nix
index be6dd847201..716ad799bc6 100644
--- a/pkgs/os-specific/linux/kernel-headers/4.4.nix
+++ b/pkgs/os-specific/linux/kernel-headers/4.4.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, perl, cross ? null }:
+{ stdenvNoCC, lib, buildPackages
+, buildPlatform, hostPlatform
+, fetchurl, perl
+}:
 
-assert cross == null -> stdenv.isLinux;
+assert hostPlatform.isLinux;
 
 let
-
   version = "4.4.10";
-
-  kernelHeadersBaseConfig =
-    if cross == null
-    then stdenv.platform.kernelHeadersBaseConfig
-    else cross.platform.kernelHeadersBaseConfig;
-
+  inherit (hostPlatform.platform) kernelHeadersBaseConfig;
 in
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   name = "linux-headers-${version}";
 
   src = fetchurl {
@@ -21,23 +18,20 @@ stdenv.mkDerivation {
     sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";
   };
 
-  targetConfig = if cross != null then cross.config else null;
+  targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null;
 
-  platform =
-    if cross != null then cross.platform.kernelArch else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.isArm then "arm" else
-    if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
-    abort "don't know what the kernel include directory is called for this platform";
+  platform = hostPlatform.platform.kernelArch or (
+    if hostPlatform.system == "i686-linux" then "i386" else
+    if hostPlatform.system == "x86_64-linux" then "x86_64" else
+    if hostPlatform.system == "powerpc-linux" then "powerpc" else
+    if hostPlatform.isArm then "arm" else
+    abort "don't know what the kernel include directory is called for this platform");
 
-  buildInputs = [perl];
+  # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
+  # We do this so we have a build->build, not build->host, C compiler.
+  nativeBuildInputs = [ buildPackages.stdenv.cc perl ];
 
-  extraIncludeDirs =
-    if cross != null then
-        (if cross.arch == "powerpc" then ["ppc"] else [])
-    else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
+  extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"];
 
   buildPhase = ''
     if test -n "$targetConfig"; then
@@ -63,7 +57,7 @@ stdenv.mkDerivation {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Header files and scripts for Linux kernel";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5809c436dbb..77543077c06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12021,9 +12021,7 @@ with pkgs;
 
   lkl = callPackage ../applications/virtualization/lkl { };
 
-  linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
-    cross = if targetPlatform != hostPlatform then targetPlatform else null;
-  };
+  linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { };
   linuxHeaders = linuxHeaders_4_4;
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
@@ -12666,7 +12664,6 @@ with pkgs;
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
   uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
-    inherit (buildPackages) linuxHeaders;
     gccCross = gccCrossStageStatic;
     cross = assert targetPlatform != buildPlatform; targetPlatform;
   });

From 15ae2cbeea340093d82ce6e935de9f8160e9d855 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 24 Aug 2017 19:34:08 +0300
Subject: [PATCH 2584/3246] maxx: use libredirect

---
 .../services/x11/desktop-managers/maxx.nix    |  6 --
 pkgs/desktops/maxx/default.nix                | 58 +++++++++++++------
 2 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
index 6a698658bdd..d7bd2fc5eb0 100644
--- a/nixos/modules/services/x11/desktop-managers/maxx.nix
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -13,12 +13,6 @@ in {
   config = mkIf (xcfg.enable && cfg.enable) {
     environment.systemPackages = [ pkgs.maxx ];
 
-    # there is hardcoded path in binaries
-    system.activationScripts.setup-maxx = ''
-      mkdir -p /opt
-      ln -sfn ${pkgs.maxx}/opt/MaXX /opt
-    '';
-
     services.xserver.desktopManager.session = [
     { name = "MaXX";
       start = ''
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 5bcc6e84152..3e8ca1f388e 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl, makeWrapper
+{ stdenv, fetchurl, makeWrapper, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg
+
 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
-, libXinerama, libXdamage, libICE, libXtst, libXaw
-, fontconfig, pango, cairo, glib, libxml2, atk, gtk2, gdk_pixbuf, mesa_noglu, ncurses
-, gcc, xclock, xsettingsd, bash, gtk-engine-murrine, gtk_engines, librsvg }:
+, libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2
+, gdk_pixbuf, mesa_noglu, ncurses
+
+, xclock, xsettingsd }:
 
 let
   version = "Indy-1.1.0";
 
   deps = [
-    libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
-    libXinerama libXdamage libICE libXtst libXaw
-    stdenv.cc.cc fontconfig pango cairo glib libxml2 atk gtk2 gdk_pixbuf mesa_noglu ncurses
+    stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
+    libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
+    gdk_pixbuf mesa_noglu ncurses
+  ];
+  runtime_deps = [
+    xclock xsettingsd
   ];
 in stdenv.mkDerivation {
   name = "MaXX-${version}";
@@ -26,15 +31,12 @@ in stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   buildPhase = ''
     while IFS= read -r -d $'\0' i; do
-      if isELF "$i"; then
-        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" || true
-        patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i"
-      fi
-    done < <(find "." -type f -print0)
+      substituteInPlace "$i" --replace /opt/MaXX $out/opt/MaXX
+    done < <(find "." -type f -exec grep -Iq /opt/MaXX {} \; -and -print0)
 
     substituteInPlace bin/adminterm \
       --replace /bin/bash ${bash}/bin/bash
@@ -52,15 +54,37 @@ in stdenv.mkDerivation {
 
     wrapProgram $maxx/etc/skel/Xsession.dt \
       --prefix GTK_PATH : "${gtk-engine-murrine}/lib/gtk-2.0:${gtk_engines}/lib/gtk-2.0" \
-      --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)"
-  '';
+      --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)" \
+      --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps}
 
-  propagatedUserEnvPkgs = [ gcc xclock xsettingsd ];
+    while IFS= read -r -d $'\0' i; do
+      if isELF "$i"; then
+        bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?`
+        patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i"
+        if [ "$bin" -eq 0 ]; then
+          wrapProgram "$i" \
+            --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+            --set NIX_REDIRECTS /opt/MaXX=$maxx
+        fi
+      fi
+    done < <(find "$maxx" -type f -print0)
+
+    cp ${gcc-unwrapped}/bin/cpp ${gcc-unwrapped}/libexec/gcc/*/*/cc1 $maxx/bin
+    for i in $maxx/bin/cpp $maxx/bin/cc1
+    do
+      wrapProgram "$i" \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+        --set NIX_REDIRECTS /opt/MaXX=$maxx
+    done
+  '';
 
   meta = with stdenv.lib; {
     description = "A replica of IRIX Interactive Desktop";
     homepage = http://www.maxxinteractive.com;
-    license = licenses.free;
+    license = {
+      url = http://www.maxxinteractive.com/site/?page_id=97;
+      free = true;
+    };
     maintainers = [ maintainers.gnidorah ];
     platforms = ["x86_64-linux"];
     hydraPlatforms = [];

From ff68bcd563d853a2aca26c7ca28b0efac9337a54 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 24 Aug 2017 19:41:27 +0300
Subject: [PATCH 2585/3246] openjk: comment why we set DCMAKE_INSTALL_PREFIX

---
 pkgs/games/openjk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
index dc6d3595416..02afa0a8edc 100644
--- a/pkgs/games/openjk/default.nix
+++ b/pkgs/games/openjk/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper cmake ];
   buildInputs = [ libjpeg zlib libpng mesa_noglu SDL2 ];
 
+  # move from $out/JediAcademy to $out/opt/JediAcademy
   preConfigure = ''
     cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$out/opt")
   '';

From 72d6389ca16dfe224d0456146d3009f00dc36a17 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 24 Aug 2017 11:48:11 -0500
Subject: [PATCH 2586/3246] dropbox: 32.4.23 -> 33.4.23

---
 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 25259b467bb..a76d6bc2fa4 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -24,10 +24,10 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "32.4.23";
+  version = "33.4.23";
   sha256 = {
-    "x86_64-linux" = "11jh3cyax652crhvjshi8gnvb8mpp7hfbgwqjx5n1q3j1rswm3d1";
-    "i686-linux"   = "0xf0in3ywgd53v19h0v2sg69b6y2lbvr5y6jz10x3cighzr31qfp";
+    "x86_64-linux" = "0z8sd71v0xfbq4x8gw0rjhg7kbd7r0465b1cqk1ls2fivb25qqxz";
+    "i686-linux"   = "07sj1ixpml56bx83jawslak6scb12wxwn53nnabvgnivhb9vzq97";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch = {

From 1f4fdbcb7ff0604c3eb1d027c93c7ec80d57a107 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:06:43 +0200
Subject: [PATCH 2587/3246] python.pkgs.obfsproxy: fix build

---
 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 2c52732be98..f3ed5f89832 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14587,13 +14587,17 @@ in {
       sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa";
     };
 
-    patchPhase = ''
+    postPatch = ''
       substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'"
+      substituteInPlace setup.py --replace "argparse" ""
     '';
 
     propagatedBuildInputs = with self;
       [ pyptlib argparse twisted pycrypto pyyaml ];
 
+    # No tests in archive
+    doCheck = false;
+
     meta = {
       description = "A pluggable transport proxy";
       homepage = https://www.torproject.org/projects/obfsproxy;

From 8511a3378b3a26497bcff1a3acb292a0f300886f Mon Sep 17 00:00:00 2001
From: Mark Cohen <m@mpc.sh>
Date: Tue, 22 Aug 2017 17:21:49 -0400
Subject: [PATCH 2588/3246] nixos/caddy: improve documentation

There was no documentation for the "config" option, and it wasn't quite
clear whether it was supposed to be a file, a string, or what. This
commit removes that ambiguity.
---
 nixos/modules/services/web-servers/caddy.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index ee32a1c86d4..d8efa24bc6d 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -5,12 +5,22 @@ with lib;
 let
   cfg = config.services.caddy;
   configFile = pkgs.writeText "Caddyfile" cfg.config;
-in
-{
+in {
   options.services.caddy = {
     enable = mkEnableOption "Caddy web server";
 
     config = mkOption {
+      default = "";
+      example = ''
+        example.com {
+        gzip
+        minify
+        log syslog
+
+        root /srv/http
+        }
+      '';
+      type = types.lines;
       description = "Verbatim Caddyfile to use";
     };
 

From f2cdc1e5c25504e6407eb84dc492a2b71fd3a0a8 Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Tue, 15 Aug 2017 10:02:16 +0200
Subject: [PATCH 2589/3246] twisted: update to 17.5.0

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

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 6898863e8af..66a6022802f 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -1,17 +1,17 @@
 { stdenv, buildPythonPackage, fetchurl, python,
-  zope_interface, incremental, automat, constantly
+  zope_interface, incremental, automat, constantly, hyperlink
 }:
 buildPythonPackage rec {
   pname = "Twisted";
   name = "${pname}-${version}";
-  version = "17.1.0";
+  version = "17.5.0";
 
   src = fetchurl {
     url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
-    sha256 = "1p245mg15hkxp7hy5cyq2fgvlgjkb4cg0gwkwd148nzy1bbi3wnv";
+    sha256 = "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i";
   };
 
-  propagatedBuildInputs = [ zope_interface incremental automat constantly ];
+  propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ];
 
   # Patch t.p._inotify to point to libc. Without this,
   # twisted.python.runtime.platform.supportsINotify() == False

From fb4357445665ab12877cbc49027f7593b471b288 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:06:43 +0200
Subject: [PATCH 2590/3246] python.pkgs.obfsproxy: fix build

---
 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 2c52732be98..f3ed5f89832 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14587,13 +14587,17 @@ in {
       sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa";
     };
 
-    patchPhase = ''
+    postPatch = ''
       substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'"
+      substituteInPlace setup.py --replace "argparse" ""
     '';
 
     propagatedBuildInputs = with self;
       [ pyptlib argparse twisted pycrypto pyyaml ];
 
+    # No tests in archive
+    doCheck = false;
+
     meta = {
       description = "A pluggable transport proxy";
       homepage = https://www.torproject.org/projects/obfsproxy;

From 01495f325506dbf233c9142429ad0dd6a2d0a0cc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 24 Aug 2017 17:49:05 +0000
Subject: [PATCH 2591/3246] ocamlPackages.js_of_ocaml-compiler: init at 0.3.0

---
 .../ocaml/js_of_ocaml-compiler/default.nix    | 35 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix
new file mode 100644
index 00000000000..11df26818c1
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+, cmdliner, cppo, yojson
+}:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+	name = "js_of_ocaml-compiler-${version}";
+	version = "3.0.0";
+
+	src = fetchFromGitHub {
+		owner = "ocsigen";
+		repo = "js_of_ocaml";
+		rev = version;
+		sha256 = "17w1pqjk521jd4yp34miyif0cxjxchnw59xhj188qfl635ykb4k8";
+	};
+
+	buildInputs = [ ocaml findlib jbuilder cmdliner cppo ];
+
+	propagatedBuildInputs = [ yojson ];
+
+	buildPhase = "jbuilder build -p js_of_ocaml-compiler";
+
+	inherit (jbuilder) installPhase;
+
+	meta = {
+		description = "Compiler from OCaml bytecode to Javascript";
+		license = stdenv.lib.licenses.gpl2;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (src.meta) homepage;
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 29f3ae51a0a..9462eb3d3da 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -272,6 +272,8 @@ let
 
     js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; };
 
+    js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml-compiler {};
+
     jsonm = callPackage ../development/ocaml-modules/jsonm { };
 
     lablgl = callPackage ../development/ocaml-modules/lablgl { };

From 77404dbf37838dfc6b8a10d8c7298d813481705f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 24 Aug 2017 17:50:00 +0000
Subject: [PATCH 2592/3246] jbuilder: 1.0+beta7 -> 1.0+beta12

ocamlPackages.sexplib: 0.9.1 -> 0.9.2

ocamlPackages.base: 0.9.1 -> 0.9.3

ocamlPackages.ppx_driver: 0.9.0 -> 0.9.1

ocamlPackages.bin_prot: 0.9.0 -> 0.9.1

ocamlPackages.ppx_inline_test: 0.9.0 -> 0.9.2
---
 .../ocaml-modules/janestreet/default.nix        | 17 ++++++++++-------
 .../tools/ocaml/jbuilder/default.nix            |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index e2958bce0e7..724bca18706 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -8,15 +8,15 @@ rec {
 
   sexplib = janePackage {
     name = "sexplib";
-    version = "0.9.1";
-    hash = "087md38l73lp24j2lmwi053jjav00k11r06s6whmff1xlhj70wdj";
+    version = "0.9.2";
+    hash = "0szj7gi5ksy7kif5g71rkr6xhxc41xl8hq6s5zz610cjyngzyzjl";
     meta.description = "Automated S-expression conversion";
   };
 
   base = janePackage {
     name = "base";
-    version = "0.9.1";
-    hash = "09gj30zyv23gv3gkf2pb3d3ywmkgd74dq8sfaps5xarr3grvndhm";
+    version = "0.9.3";
+    hash = "14v3zsr7za9h1gkxdmkk1yagnrfjk3y9snraywv9hsqbhv39ajvv";
     propagatedBuildInputs = [ sexplib ];
     meta.description = "Full standard library replacement for OCaml";
   };
@@ -65,7 +65,8 @@ rec {
 
   ppx_driver = janePackage {
     name = "ppx_driver";
-    hash = "1w3khwnvy18nkh673zrbhcs6051hs7z5z5dib7npkvpxndw22hwj";
+    version = "0.9.1";
+    hash = "1amz49x6v4sh1v2my6618cah0zv5i7jmsapbk9ydps6419g5asay";
     buildInputs = [ ocamlbuild ];
     propagatedBuildInputs = [ ppx_optcomp ];
     meta.description = "Feature-full driver for OCaml AST transformers";
@@ -173,7 +174,8 @@ rec {
 
   bin_prot = janePackage {
     name = "bin_prot";
-    hash = "0cy6lhksx4jypkrnj3ha31p97ghslki0bx5rpnzc2v28mfp6pzh1";
+    version = "0.9.1";
+    hash = "1bgcmkgz6b5i522996x589zsaiy5b3h37887lwbqvpps8by2ayvk";
     propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
     meta.description = "Binary protocol generator";
   };
@@ -203,7 +205,8 @@ rec {
 
   ppx_inline_test = janePackage {
     name = "ppx_inline_test";
-    hash = "01xml88ahrzqnc7g1ib184jbqxpdfx4gn2wdvi09dpi4i0jahy33";
+    version = "0.9.2";
+    hash = "17j36ihiqprbpa2bk02449k93vaidid2sly5djrk848ccjq8n5aa";
     propagatedBuildInputs = [ ppx_metaquot ];
     meta.description = "Syntax extension for writing in-line tests in OCaml code";
   };
diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
index f1bf5e33a61..db34450a7a6 100644
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchzip, ocaml, opam }:
 
 stdenv.mkDerivation {
-  name = "jbuilder-1.0+beta7";
+  name = "jbuilder-1.0+beta12";
   src = fetchzip {
-    url = http://github.com/janestreet/jbuilder/archive/1.0+beta7.tar.gz;
-    sha256 = "10qjqs6gv9y8s580gvssjm56xw72pcxd5lkpzqpz6cz4390d45i8";
+    url = http://github.com/janestreet/jbuilder/archive/1.0+beta12.tar.gz;
+    sha256 = "1gqpp1spcya9951mw2kcavam8v0m5s6zc5pjb7bkv5d71si04rlf";
   };
 
   buildInputs = [ ocaml ];

From 49ab1dcc6984d27d64694ff61821fff08d52f931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Thu, 24 Aug 2017 16:07:01 +0200
Subject: [PATCH 2593/3246] pythonPackages.matrix-client: init at 0.0.6

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

diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
new file mode 100644
index 00000000000..d0bbef8a78f
--- /dev/null
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonPackages
+}:
+
+buildPythonPackage rec {
+  pname = "matrix-client";
+  version = "0.0.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq";
+  };
+
+  checkInputs = with pythonPackages; [ tox pytest flake8 responses ];
+
+  propagatedBuildInputs = with pythonPackages; [ requests ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Matrix Client-Server SDK";
+    homepage = https://github.com/matrix-org/matrix-python-sdk;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olejorgenb ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 56f915f372d..d00d7f5d164 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12539,6 +12539,7 @@ in {
     inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
   };
 
+  matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { pythonPackages = self; };
 
   mccabe = callPackage ../development/python-modules/mccabe { };
 

From 36dd8edde15e4780df884e2fac245402369ff50e Mon Sep 17 00:00:00 2001
From: evujumenuk <evujumenuk@mailinator.com>
Date: Thu, 24 Aug 2017 20:48:24 +0200
Subject: [PATCH 2594/3246] containers: remove EXIT_ON_REBOOT

EXIT_ON_REBOOT has been obsolete since sometime in 2014.
---
 nixos/modules/virtualisation/containers.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 6adb2c1681a..001c6473a98 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -120,7 +120,6 @@ let
 
       # Run systemd-nspawn without startup notification (we'll
       # wait for the container systemd to signal readiness).
-      EXIT_ON_REBOOT=1 \
       exec ${config.systemd.package}/bin/systemd-nspawn \
         --keep-unit \
         -M "$INSTANCE" -D "$root" $extraFlags \

From 3ac73fbb810a2c1965eaee0b21b90e9d788191cd Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:44:36 +0200
Subject: [PATCH 2595/3246] maintainers: add myself

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d904c5368bf..50efd46e27c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -619,6 +619,7 @@
   vrthra = "Rahul Gopinath <rahul@gopinath.org>";
   vyp = "vyp <elisp.vim@gmail.com>";
   wedens = "wedens <kirill.wedens@gmail.com>";
+  willibutz = "Willi Butz <willibutz@posteo.de>";
   willtim = "Tim Philip Williams <tim.williams.public@gmail.com>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";

From 8ddc3eb988e73d75fc72532a2d36af1d95e494a6 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 18:17:27 +0200
Subject: [PATCH 2596/3246] watchman: 4.7.0 -> 4.9.0

---
 pkgs/development/tools/watchman/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 379f87b4cf4..15f265e31e3 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre
-, confFile ? config.watchman.confFile or null
+{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre,
+  libtool, pkgconfig, openssl,
+  confFile ? config.watchman.confFile or null
 }:
 
 stdenv.mkDerivation rec {
   name = "watchman-${version}";
 
-  version = "4.7.0";
+  version = "4.9.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "watchman";
     rev = "v${version}";
-    sha256 = "0xnd7jvrmyxhlw2ggd37swv1mk6vw9j91fdxps6njgvnlfg9zs5n";
+    sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
   };
 
-  buildInputs = [ autoconf automake pcre ];
+  buildInputs = [ pcre openssl ];
+  nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
 
   configureFlags = [
       "--enable-lenient"
@@ -26,6 +28,10 @@ stdenv.mkDerivation rec {
       "--disable-statedir"
   ];
 
+  prePatch = ''
+    patchShebangs .
+  '';
+
   preConfigure = ''
     ./autogen.sh
   '';

From a8db87efd8938c78d0a7d0fe6cf135a105efbe42 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 18:20:58 +0200
Subject: [PATCH 2597/3246] whois: 5.2.17 -> 5.2.18

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

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index e6f25176864..ed8f2eebc75 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  version = "5.2.17";
+  version = "5.2.18";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "15jnzk0js8wxiapz1bw7jnck0fl3mcli56f9635z9x7vk63ss68z";
+    sha256 = "0jzyq1rj6balc6a28swzgspv55xhkc75dw6wsn159in4ap61bzmi";
   };
 
   buildInputs = [ perl gettext ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       select the appropriate WHOIS server for most queries.
     '';
 
-    homepage = http://packages.qa.debian.org/w/whois.html;
+    homepage = https://packages.qa.debian.org/w/whois.html;
     license = licenses.gpl2;
     maintainers = with maintainers; [ fpletz ];
     platforms = platforms.linux;

From bbf7d8c77b3353cbd6a5e1af02b29b59e0c51fbc Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:06:08 +0200
Subject: [PATCH 2598/3246] wordnet: refactor

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

diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index f1bc06d395c..b93295850bc 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:
 
-let version = "3.0"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  version = "3.0";
   name = "wordnet-${version}";
   src = fetchurl {
     url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2";

From 1c0e7d631db7e731787ff19bf98225a46adc5a45 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:15:03 +0200
Subject: [PATCH 2599/3246] debianutils: 4.8.1 -> 4.8.2

---
 pkgs/tools/misc/debianutils/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
index e2253982788..6575c19391c 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -1,16 +1,12 @@
 { stdenv, fetchurl }:
 
-let
-  checksums = {
-    "4.8.1" = "09phylg8ih1crgxjadkdb8idbpj9ap62a7cbh8qdx2gyvh5mqf9c";
-  };
-in stdenv.mkDerivation rec {
-  version = "4.8.1";
+stdenv.mkDerivation rec {
+  version = "4.8.2";
   name = "debianutils-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz";
-    sha256 = checksums."${version}";
+    sha256 = "0s3w3svcsh984zinkxvpzxi7dc0ginqk0nk299fkrr6k7wlmzssd";
   };
 
   meta = {

From 0fbafd6195a63982bd8e27e55dfd66cd1cdd1602 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:20:25 +0200
Subject: [PATCH 2600/3246] duc: 1.4.1 -> 1.4.3

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

diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
index ba1abb7c86d..06862a63423 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/pkgs/tools/misc/duc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "duc-${version}";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "duc";
     rev = "${version}";
-    sha256 = "0rnar2zacsb9rvdmp1a62xixhy69s5vh0nwgrklqxhb19qkzhdp7";
+    sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif";
   };
 
   buildInputs = [ autoreconfHook pkgconfig tokyocabinet cairo pango ncurses ];

From e1b044646ba5609bc63b5c71ca4d1214093ab4ad Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:26:51 +0200
Subject: [PATCH 2601/3246] evemu: 2.4.0 -> 2.6.0

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

diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix
index 873abd4812c..b6f1af7b23f 100644
--- a/pkgs/tools/system/evemu/default.nix
+++ b/pkgs/tools/system/evemu/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name = "evemu-${version}";
-  version = "2.4.0";
+  version = "2.6.0";
 
   # We could have downloaded a release tarball from cgit, but it changes hash
   # each time it is downloaded :/
   src = fetchgit {
     url = git://git.freedesktop.org/git/evemu;
     rev = "refs/tags/v${version}";
-    sha256 = "07iha13xrpf4z59rzl9cm2h1zkc5xhyipbd3ajd3c1d4hhpn9w9s";
+    sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system";
-    homepage = http://www.freedesktop.org/wiki/Evemu/;
+    homepage = https://www.freedesktop.org/wiki/Evemu/;
     repositories.git = git://git.freedesktop.org/git/evemu;
     license = licenses.gpl2;
     maintainers = [ maintainers.amorsillo ];

From c6ee3231b786116d089c44c5d0763e5b13c8fc95 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 24 Aug 2017 20:43:07 +0200
Subject: [PATCH 2602/3246] feh: 2.19.1 -> 2.19.3

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index aace37601b5..2b24b93282f 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.19.1";
+  version = "2.19.3";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "1d4ycmai3dpajl0bdr9i56646g4h5j1lb95jjn0nckwcddcj927c";
+    sha256 = "1l3yvv0l0ggwlfyhk84p2g9mrqvzqrg1fgalf88kzppvb9jppjay";
   };
 
   outputs = [ "out" "man" "doc" ];
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     description = "A light-weight image viewer";
     homepage = https://derf.homelinux.org/projects/feh/;
     license = licenses.mit;
-    maintainers = [ maintainers.viric ];
+    maintainers = [ maintainers.viric maintainers.willibutz ];
     platforms = platforms.unix;
   };
 }

From 2639bcee5d63a0c81dc1e66fd3fc463344dd9d7b Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 24 Aug 2017 13:52:29 -0700
Subject: [PATCH 2603/3246] wineUnstable: 2.14 -> 2.15

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 479726e1304..0d0f9f21bf2 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.14";
+    version = "2.15";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "1ilmhwm7vlp4fbl5a5m3rwwfw8g821gkjkd01ih2ixw1a7ck9y83";
+    sha256 = "1cv890khg5zqk844y12daw2ql4vk4garnqfk273hiyw1pw650bfq";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0mbklg0q3k5iavmwfbrwq4p8589ayikwq5q9wk87885xv32g176g";
+    sha256 = "0psdkhf4gn4nkpp2fvwy0b2a0s5b6wgf40vlbdf6ii45kj59mn7f";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 51df72e4f6cdabb67e4c693f006f967aa9b4225c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 24 Aug 2017 18:10:32 -0300
Subject: [PATCH 2604/3246] oblogout: add description for configuration options

---
 nixos/modules/programs/oblogout.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/programs/oblogout.nix b/nixos/modules/programs/oblogout.nix
index 79a8ddb7ce3..042935d285e 100644
--- a/nixos/modules/programs/oblogout.nix
+++ b/nixos/modules/programs/oblogout.nix
@@ -27,6 +27,7 @@ in
         type = types.int;
         default = 70;
         description = ''
+          Opacity percentage of Cairo rendered backgrounds.
         '';
       };
 
@@ -34,6 +35,7 @@ in
         type = types.str;
         default = "black";
         description = ''
+          Colour name or hex code (#ffffff) of the background color.
         '';
       };
 
@@ -41,6 +43,9 @@ in
         type = types.str;
         default = "simplistic";
         description = ''
+          Icon theme for the buttons, must be in the themes folder of
+          the package, or in
+          <filename>~/.themes/<name>/oblogout/</filename>.
         '';
       };
 
@@ -48,6 +53,7 @@ in
         type = types.str;
         default =  "cancel, logout, restart, shutdown, suspend, hibernate";
         description = ''
+          List and order of buttons to show.
         '';
       };
 
@@ -55,6 +61,7 @@ in
         type = types.str;
         default =  "Escape";
         description = ''
+          Cancel logout/shutdown shortcut.
         '';
       };
 
@@ -62,6 +69,7 @@ in
         type = types.str;
         default = "S";
         description = ''
+          Shutdown shortcut.
         '';
       };
 
@@ -69,6 +77,7 @@ in
         type = types.str;
         default = "R";
         description = ''
+          Restart shortcut.
         '';
       };
 
@@ -76,6 +85,7 @@ in
         type = types.str;
         default = "U";
         description = ''
+          Suspend shortcut.
         '';
       };
 
@@ -83,6 +93,7 @@ in
         type = types.str;
         default = "L";
         description = ''
+          Logout shortcut.
         '';
       };
 
@@ -90,6 +101,7 @@ in
         type = types.str;
         default = "K";
         description = ''
+          Lock session shortcut.
         '';
       };
 
@@ -97,6 +109,7 @@ in
         type = types.str;
         default =  "H";
         description = ''
+          Hibernate shortcut.
         '';
       };
 
@@ -104,6 +117,7 @@ in
         type = types.str;
         default = "openbox --exit";
         description = ''
+          Command to logout.
         '';
       };
 
@@ -111,6 +125,7 @@ in
         type = types.str;
         default = "";
         description = ''
+          Command to lock screen.
         '';
       };
 
@@ -118,6 +133,7 @@ in
         type = types.str;
         default = "";
         description = ''
+          Command to switch user.
         '';
       };
     };

From 35c4b6d22b2cd520b88b1e5fc63fb7bc275a84b2 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 25 Aug 2017 00:59:11 +0300
Subject: [PATCH 2605/3246] rustRegistry: 2017-07-23 -> 2017-08-24

---
 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 1caef26322d..f49b1e444e5 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,13 +7,13 @@
 { stdenv, fetchFromGitHub, git }:
 
 stdenv.mkDerivation {
-  name = "rustRegistry-2017-07-23";
+  name = "rustRegistry-2017-08-24";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "crates.io-index";
-    rev = "ed8e6a6761278861db046073cc69d6a5e7dd8c15";
-    sha256 = "1v72m0h31xcay2m64n2wil5wqnl8z4n4adxxpdllcpgj3pj5jai6";
+    rev = "53fd44d796ca10ec0a5a9b657d8c7f8964695a49";
+    sha256 = "1ppg3q001ypdh6w0ymhkcilr5gyr2pnrha9vdixa0gzgw06k7k0s";
   };
   phases = [ "unpackPhase" "installPhase" ];
   installPhase = ''

From 5db77990db448ba45ba79a467415e75df7cb7970 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 25 Aug 2017 01:25:02 +0300
Subject: [PATCH 2606/3246] ripgrep: 0.5.2 -> 0.6.0

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

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index da7c5b593e3..8ddfa7d7be4 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "128sfczms14zgfbhgmf84jjlivd4q6i581rxirhz3kmpnnby18rz";
+    sha256 = "1cnvwxbznmsn1gand8hhy5zadax5p67lvm46fkj1a1s89f158w3a";
   };
 
-  depsSha256 = "1kjmv4bn5sicx8g5gyzq2zhxmqsqlgckhcg4ypvnjmcyq1ifiv2m";
+  depsSha256 = "1kx9xazhj93xa3cnys39wwr84qqjqrlsbbi5ih71vxppskdpvd6m";
 
   preFixup = ''
     mkdir -p "$out/man/man1"
@@ -23,7 +23,7 @@ buildRustPackage rec {
   meta = with stdenv.lib; {
     description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
     homepage = https://github.com/BurntSushi/ripgrep;
-    license = with licenses; [ unlicense ];
+    license = with licenses; [ unlicense /* or */ mit ];
     maintainers = [ maintainers.tailhook ];
     platforms = platforms.all;
   };

From 22ae3aa5b68fb7e74a6730f9f6ddac1be6931db7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 25 Aug 2017 02:35:31 +0200
Subject: [PATCH 2607/3246] android-studio-preview: 3.0.0.10 -> 3.0.0.11

---
 pkgs/applications/editors/android-studio/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 471f78f0c07..70755098497 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,9 +27,9 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.10"; # "Android Studio 3.0 Beta 2"
-    build = "171.4263559";
-    sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w";
+    version = "3.0.0.11"; # "Android Studio 3.0 Beta 3"
+    build = "171.4294784";
+    sha256Hash = "11m939hpwnrrz0grnc1x1ff19yjnwzx5w1dzaw9hpm8ylx692mrf";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";

From 501f55af87f8a75a4ec18ec39b33646d8e56389f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 25 Aug 2017 02:43:46 +0200
Subject: [PATCH 2608/3246] quiterss: 0.18.7 -> 0.18.8

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

diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 2bd6bd0a8ec..5ebd01f38c4 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
-  version = "0.18.7";
+  version = "0.18.8";
 
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
     rev = "${version}";
-    sha256 = "031n07s8dd0n3d5d4v9pza59iyvaim484n1qdnpbgamls2p8iwn6";
+    sha256 = "09mdxpv04zycrip1p5w6947348xfraicijddvxsr7d498r59b7ff";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From a86b304a26c20928d2ba6d013753c248055ce500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 07:25:02 +0100
Subject: [PATCH 2609/3246] grails: 2.4.3 -> 3.3.0

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

diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index f3f137da757..c447173b608 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -10,11 +10,12 @@ let
     ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
 in
 stdenv.mkDerivation rec {
-  name = "grails-2.4.3";
+  name = "grails-${version}";
+  version = "3.3.0";
 
   src = fetchurl {
-    url = "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/${name}.zip";
-    sha256 = "0lqkv0hsiiqa36pfnq5wv7s7nsp9xadmh1ri039bn0llpfck4742";
+    url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
+    sha256 = "0lk9ll0x9w2akmlwkams9pxyafmgjmsr3fa45gx1r16nx563qxsg";
   };
 
   buildInputs = [ unzip ];

From ef6e2d13b0c03a4dfb192ed52e4c827ae3d10e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 07:30:10 +0100
Subject: [PATCH 2610/3246] grail: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix
index 3a7ed879bff..c8b1c0bdd9b 100644
--- a/pkgs/development/libraries/grail/default.nix
+++ b/pkgs/development/libraries/grail/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "grail-${version}";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "c26dced1b3f4317ecf6af36db0e90294d87e43966d56aecc4e97b65368ab78b9";
+    sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay";
   };
 
   buildInputs = [ pkgconfig python3 frame ]

From cfaa4235e3e511bc45f71c1deef4d5654993ceec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 07:41:02 +0100
Subject: [PATCH 2611/3246] geis: fix compilation

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

diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 5a7bff7459e..6e043f5994d 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=pedantic";
+  NIX_CFLAGS_COMPILE = "-Wno-format -Wno-misleading-indentation -Wno-error";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ python3 dbus_libs evemu frame grail libX11 libXext libXi libXtst xorgserver ];

From f861426de968a91d360ce54c54bd5355fd51fb4e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 25 Aug 2017 10:09:25 +0200
Subject: [PATCH 2612/3246] nixos/tlp: mask systemd-rfkill socket

This fixes a spurious error on boot. See #24737.
---
 nixos/modules/services/hardware/tlp.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 3b108c87edd..68425822a88 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -57,6 +57,8 @@ in
     powerManagement.scsiLinkPolicy = null;
     powerManagement.cpuFreqGovernor = null;
 
+    systemd.sockets."systemd-rfkill".enable = false;
+
     systemd.services = {
       "systemd-rfkill@".enable = false;
       "systemd-rfkill".enable = false;

From 520a43ced38843d5116594b359854e02fa7ed057 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Fri, 25 Aug 2017 11:34:21 +0300
Subject: [PATCH 2613/3246] Fix zsh completions (#28550)

* Fix zsh completions

* Fix zsh completions (fix commit)

* Fix zsh completions (fix commit)
---
 nixos/modules/programs/zsh/zsh.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index a055291282c..ee61e2d2382 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -158,6 +158,11 @@ in
 
         HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
 
+        # 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 $p/share/zsh/vendor-completions)
+        done
+
         ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"}
 
         ${optionalString (cfg.enableAutosuggestions)
@@ -172,11 +177,6 @@ in
 
         ${cfg.promptInit}
 
-        # 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 $p/share/zsh/vendor-completions)
-        done
-
         # Read system-wide modifications.
         if test -f /etc/zshrc.local; then
           . /etc/zshrc.local

From 8fb2432d94aabe3a136e3a78e82bdff912cfaaa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:01:33 +0100
Subject: [PATCH 2614/3246] jetbrains.clion: 2017.2 -> 2017.2.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 08fc25fe9c1..035546edc09 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -216,12 +216,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2017.2"; /* updated by script */
+    version = "2017.2.1"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "de7f47ec959be9653aa4d2028fb27f8327800d8370daa0ab2d1093f3469f4b49"; /* updated by script */
+      sha256 = "acd3d09a37a3fa922a85a48635d1b230d559ea68917e2e7895caf16460d50c13"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

From ca995e5b68902ee22cf58ad2a95c7b2d3d8bd5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:04:23 +0100
Subject: [PATCH 2615/3246] jetbrains.gogland: 171.4694.61 -> 172.3757.46

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 035546edc09..79348f01045 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -242,12 +242,12 @@ in
 
   gogland = buildGogland rec {
     name = "gogland-${version}";
-    version = "171.4694.61"; /* updated by script */
+    version = "172.3757.46"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "8e9462fc7c5cc7dc110ea2257b920a55d7d52ea874a53567e5d19381a1fcb269"; /* updated by script */
+      sha256 = "0d6b710edc434ed5d5ea5c4734b9026e2caeba7e74a027c1eb6fd837c5d4f4fd"; /* updated by script */
     };
     wmClass = "jetbrains-gogland";
     update-channel = "gogland_1.0_EAP";

From c5d3ddba3eab3ada777e0a77f2fbb9d15b309aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:05:55 +0100
Subject: [PATCH 2616/3246] jetbrains.idea-community: 2017.2.1 -> 2017.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 79348f01045..31fc2fd6696 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -268,12 +268,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2017.2.1";
+    version = "2017.2.2"; /* updated by script */
     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 = "1z8gp209jpjzvllnrpxzmbhgaxkklxw8nkm3g2drb7nal2hhs113";
+      sha256 = "c719af3d538bef23d061ef62d4acbf503198ff62322a3c0c5b3c38ab7ac36c4f"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";

From 61e343649682cde32cefcf6523120df943484e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:06:59 +0100
Subject: [PATCH 2617/3246] jetbrains.idea-ultimate: 2017.2.1 -> 2017.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 31fc2fd6696..fd3025cb07d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -307,12 +307,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2017.2.1";
+    version = "2017.2.2"; /* updated by script */
     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}-no-jdk.tar.gz";
-      sha256 = "0y3r82i229d7lywixyifv4kkrwivixl75flagaqbkzw3j9wklg3k";
+      sha256 = "b8eb9d612800cc896eb6b6fbefbf9f49d92d2350ae1c3c4598e5e12bf93be401"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IDEA_Release";

From 5bf21b3db78ea62b90ed67228188793f80b2385d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:07:40 +0100
Subject: [PATCH 2618/3246] jetbrains.pycharm-community: 2017.2.1 -> 2017.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index fd3025cb07d..a39327b0222 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -346,12 +346,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2017.1.5"; /* updated by script */
+    version = "2017.2.2"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1a0bbf0d881527e08aad7a5adaa3ad44e8754c3eb2c3a8ed5ab113491549679b"; /* updated by script */
+      sha256 = "4eacc9bf512406bebf71546ccb4b6c14ea8e06748fd76be6ca409ea1955e1f53"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm_Release";

From ed023e03749ea47141aad3bca0289fb0a134a9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:08:18 +0100
Subject: [PATCH 2619/3246] jetbrains.idea-ultimate: 2017.2.1 -> 2017.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a39327b0222..2784f15c136 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -359,12 +359,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2017.1.5"; /* updated by script */
+    version = "2017.2.2"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "52519dfd0e913b5ccb8767155cd4d1fd413967d5010e8474cdc9a1fa688016ce"; /* updated by script */
+      sha256 = "21aedfd189115fcfee0e8c8df88eccbd8f19b998667af3c55ce5d56d4eaa37a9"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm_Release";

From 7ea05ea54244f5fa5a308f2f03181179a607675c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 11:08:56 +0100
Subject: [PATCH 2620/3246] jetbrains.webstorm: 2017.1.4 -> 2017.2.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 2784f15c136..ea1fc1022fd 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -424,12 +424,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2017.1.4";
+    version = "2017.2.2"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "0aw2728wknss5vn2fkgz8rkm5vwk031305f32dirfrh51bvmq2zm";
+      sha256 = "d6b7b103f8543e25d2602657f12d029856529895af6354e1a0875ed40bd05180"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WS_Release";

From b854e83183ab92e05e8697f2f94d10aa60c59492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 12:50:41 +0100
Subject: [PATCH 2621/3246] pythonPackages.matrix-client: don't pass
 pythonPackages

---
 pkgs/development/python-modules/matrix-client/default.nix | 7 ++++---
 pkgs/top-level/python-packages.nix                        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
index d0bbef8a78f..20af252f58f 100644
--- a/pkgs/development/python-modules/matrix-client/default.nix
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -1,7 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, pythonPackages
+, requests
+, tox, pytest, flake8, responses
 }:
 
 buildPythonPackage rec {
@@ -14,9 +15,9 @@ buildPythonPackage rec {
     sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq";
   };
 
-  checkInputs = with pythonPackages; [ tox pytest flake8 responses ];
+  checkInputs = [ tox pytest flake8 responses ];
 
-  propagatedBuildInputs = with pythonPackages; [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   checkPhase = ''
     pytest
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d00d7f5d164..894742625b3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12539,7 +12539,7 @@ in {
     inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { pythonPackages = self; };
+  matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { };
 
   mccabe = callPackage ../development/python-modules/mccabe { };
 

From a5386213ad17e6780db6afcd075e470c6a005c58 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 25 Aug 2017 13:37:36 +0200
Subject: [PATCH 2622/3246] monkeys-audio: Fix build against GCC 6.x

Regression introduced by 1ded0cb24c4cd6b456ff18b6162d2173cc6330fc.

The package defines macros for min() and max(), but those macros are
undefined by the inclusion of stdlib.h since GCC 6.x, so we need to
change tho order of inclusions to include stdlib.h *before* NoWindows.h.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../audio/monkeys-audio/buildfix.diff         | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/pkgs/applications/audio/monkeys-audio/buildfix.diff
index 3c48f6ad828..9684e5bf8e4 100644
--- a/pkgs/applications/audio/monkeys-audio/buildfix.diff
+++ b/pkgs/applications/audio/monkeys-audio/buildfix.diff
@@ -1,7 +1,8 @@
-diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp
---- monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp	2006-06-01 11:00:57.000000000 +0200
-+++ monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp	2012-01-05 14:51:47.000000000 +0100
-@@ -63,10 +63,10 @@
+diff --git a/src/MACLib/APELink.cpp b/src/MACLib/APELink.cpp
+index d349f4b..b00ec83 100644
+--- a/src/MACLib/APELink.cpp
++++ b/src/MACLib/APELink.cpp
+@@ -63,10 +63,10 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
      if (pData != NULL)
      {
          // parse out the information
@@ -16,7 +17,7 @@ diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b
  
          if (pHeader && pImageFile && pStartBlock && pFinishBlock)
          {
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
                  
                  // get the path
                  char cImageFile[MAX_PATH + 1]; int nIndex = 0;
@@ -25,3 +26,24 @@ diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b
                  while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
                      cImageFile[nIndex++] = *pImageCharacter++;
                  cImageFile[nIndex] = 0;
+diff --git a/src/Shared/All.h b/src/Shared/All.h
+index 328addc..7730e89 100644
+--- a/src/Shared/All.h
++++ b/src/Shared/All.h
+@@ -21,6 +21,8 @@ Global includes
+     #include <windows.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #ifdef _WIN32
+     #include <mmsystem.h>
+     #include <tchar.h>
+@@ -34,7 +36,6 @@ Global includes
+     #include "NoWindows.h"
+ #endif
+ 
+-#include <stdlib.h>
+ #include <memory.h>
+ #include <stdio.h>
+ #include <math.h>

From dd5f0d9538aa84e42bd666e8679cb448fa8a79fe Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 25 Aug 2017 14:08:11 +0200
Subject: [PATCH 2623/3246] nixos: Fix build of manual

Regression introduced by 520a43ced38843d5116594b359854e02fa7ed057.

Using XML tag characters for things that are not tags needs to be
properly indicated by an entity.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/programs/oblogout.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/oblogout.nix b/nixos/modules/programs/oblogout.nix
index 042935d285e..720c29b1eae 100644
--- a/nixos/modules/programs/oblogout.nix
+++ b/nixos/modules/programs/oblogout.nix
@@ -45,7 +45,7 @@ in
         description = ''
           Icon theme for the buttons, must be in the themes folder of
           the package, or in
-          <filename>~/.themes/<name>/oblogout/</filename>.
+          <filename>~/.themes/&lt;name&gt;/oblogout/</filename>.
         '';
       };
 

From 30c15c9149a6ea37533cd4b7cc8f231bd1f21780 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Aug 2017 14:41:30 +0200
Subject: [PATCH 2624/3246] Fix a bunch of ghc-8.2.x Haskell builds.

---
 .../haskell-modules/configuration-ghc-8.2.x.nix          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index d1e22d881c3..fc0c34f0397 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -48,8 +48,6 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
-  ## GHC > 8.0.2
-
   # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
   vector-algorithms = dontCheck super.vector-algorithms;
 
@@ -62,5 +60,12 @@ self: super: {
   # Work around overly restrictive constraints on the version of 'base'.
   ChasingBottoms = doJailbreak super.ChasingBottoms;
   hashable = doJailbreak super.hashable;
+  protolude = doJailbreak super.protolude;
+  quickcheck-instances = doJailbreak super.quickcheck-instances;
+
+  # LTS-9 versions do not compile.
+  path = dontCheck super.path;
+  path-io = super.path-io_1_3_3;
+  trifecta = super.trifecta_1_7_1_1;
 
 }

From cd6df6bbf7fe673fecb2ba43e3c14a4195733945 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Sat, 1 Jul 2017 00:00:00 +0000
Subject: [PATCH 2625/3246] i2pd: fix meta.license

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 8d2ac5ce9d7..ef2bc0c4828 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://i2pd.website;
     description = "Minimal I2P router written in C++";
-    license = licenses.gpl2;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ edwtjo ];
     platforms = platforms.linux;
   };

From c21d434d1b74523588fbd50080ec1cd59243599a Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Wed, 1 Mar 2017 00:00:00 +0000
Subject: [PATCH 2626/3246] nixos: i2pd: change httpproxy port to its default
 value

---
 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 7622f030f83..e16ef3beae5 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -353,7 +353,7 @@ in
         };
       };
 
-      proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4446 "";
+      proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "";
       proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "")
       // {
         outproxy = mkOption {

From b42a107bc60d072daedd5bed7106e62990543740 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Wed, 1 Mar 2017 00:00:00 +0000
Subject: [PATCH 2627/3246] nixos: i2pd: rename extIp -> address to harmonize
 with tor

---
 nixos/modules/rename.nix                   | 3 ++-
 nixos/modules/services/networking/i2pd.nix | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 08146d1f568..27dde17dbed 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -17,8 +17,9 @@ with lib;
     (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
-    (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])
     (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ])
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index e16ef3beae5..0463498359b 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -151,7 +151,7 @@ let
   i2pdSh = pkgs.writeScriptBin "i2pd" ''
     #!/bin/sh
     ${pkgs.i2pd}/bin/i2pd \
-      ${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \
+      ${if isNull cfg.address then "" else "--host="+cfg.address} \
       --conf=${i2pdConf} \
       --tunconf=${i2pdTunnelConf}
   '';
@@ -176,11 +176,11 @@ in
         '';
       };
 
-      extIp = mkOption {
+      address = mkOption {
         type = with types; nullOr str;
         default = null;
         description = ''
-          Your external IP.
+          Your external IP or hostname.
         '';
       };
 

From 042329be5edfd347fb54705578e5a9bbefffe1c3 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Sat, 1 Jul 2017 00:00:00 +0000
Subject: [PATCH 2628/3246] nixos: i2pd: one fork less, one process less

---
 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 0463498359b..a6e7cd2d2e1 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -150,7 +150,7 @@ let
 
   i2pdSh = pkgs.writeScriptBin "i2pd" ''
     #!/bin/sh
-    ${pkgs.i2pd}/bin/i2pd \
+    exec ${pkgs.i2pd}/bin/i2pd \
       ${if isNull cfg.address then "" else "--host="+cfg.address} \
       --conf=${i2pdConf} \
       --tunconf=${i2pdTunnelConf}

From af5de701b7ea5e97e43ffee4de250dbcbf3b244c Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Sat, 1 Jul 2017 00:00:00 +0000
Subject: [PATCH 2629/3246] nixos: i2pd: add logLevel

---
 nixos/modules/services/networking/i2pd.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index a6e7cd2d2e1..16c247a3a04 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -72,6 +72,8 @@ let
 
   i2pdConf = pkgs.writeText "i2pd.conf"
   ''
+  loglevel = ${cfg.logLevel}
+
   ipv4 = ${boolToString cfg.enableIPv4}
   ipv6 = ${boolToString cfg.enableIPv6}
   notransit = ${boolToString cfg.notransit}
@@ -176,6 +178,18 @@ in
         '';
       };
 
+      logLevel = mkOption {
+        type = types.enum ["debug" "info" "warn" "error"];
+        default = "error";
+        description = ''
+          The log level. <command>i2pd</command> defaults to "info"
+          but that generates copious amounts of log messages.
+
+          We default to "error" which is similar to the default log
+          level of <command>tor</command>.
+        '';
+      };
+
       address = mkOption {
         type = with types; nullOr str;
         default = null;

From fd872c9b71d1ef31e0f2895d934126c20f2ce21d Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Sat, 1 Jul 2017 00:00:00 +0000
Subject: [PATCH 2630/3246] nixos: i2pd: enable ElGamal precomputation by
 default

---
 nixos/modules/services/networking/i2pd.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 16c247a3a04..14b98f8f715 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -275,9 +275,14 @@ in
 
       precomputation.elgamal = mkOption {
         type = types.bool;
-        default = false;
+        default = true;
         description = ''
-          Use ElGamal precomputated tables.
+          Whenever to use precomputated tables for ElGamal.
+          <command>i2pd</command> defaults to <literal>false</literal>
+          to save 64M of memory (and looses some performance).
+
+          We default to <literal>true</literal> as that is what most
+          users want anyway.
         '';
       };
 

From 3594c4eec656f3443ee03bd1988c77e6b7ebec4b Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 2 Jul 2017 12:32:07 +0000
Subject: [PATCH 2631/3246] nixos: i2pd: tiny fix in a description

---
 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 14b98f8f715..b481f70521b 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -227,7 +227,7 @@ in
         default = null;
         description = ''
            Set a router bandwidth limit integer in KBps.
-           If not set, i2pd defaults to 32KBps.
+           If not set, <command>i2pd</command> defaults to 32KBps.
         '';
       };
 

From 27aa99753b3a418cea35156d18a354b794d48f48 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 2 Jul 2017 12:32:17 +0000
Subject: [PATCH 2632/3246] nixos: i2pd: fix indent

---
 nixos/modules/services/networking/i2pd.nix | 155 +++++++++++----------
 1 file changed, 78 insertions(+), 77 deletions(-)

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index b481f70521b..5c4932075fe 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -28,15 +28,15 @@ let
   };
 
   mkKeyedEndpointOpt = name: addr: port: keyFile:
-  (mkEndpointOpt name addr port) // {
-    keys = mkOption {
-      type = types.str;
-      default = "";
-      description = ''
-        File to persist ${lib.toUpper name} keys.
-      '';
+    (mkEndpointOpt name addr port) // {
+      keys = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          File to persist ${lib.toUpper name} keys.
+        '';
+      };
     };
-  };
 
   commonTunOpts = let
     i2cpOpts = {
@@ -59,7 +59,7 @@ let
       description = "Number of ElGamal/AES tags to send.";
       default = 40;
     };
-   destination = mkOption {
+    destination = mkOption {
       type = types.str;
       description = "Remote endpoint, I2P hostname or b32.i2p address.";
     };
@@ -70,84 +70,85 @@ let
     };
   } // mkEndpointOpt name "127.0.0.1" 0;
 
-  i2pdConf = pkgs.writeText "i2pd.conf"
-  ''
-  loglevel = ${cfg.logLevel}
+  i2pdConf = pkgs.writeText "i2pd.conf" ''
+    # DO NOT EDIT -- this file has been generated automatically.
+    loglevel = ${cfg.logLevel}
 
-  ipv4 = ${boolToString cfg.enableIPv4}
-  ipv6 = ${boolToString cfg.enableIPv6}
-  notransit = ${boolToString cfg.notransit}
-  floodfill = ${boolToString cfg.floodfill}
-  netid = ${toString cfg.netid}
-  ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" }
-  ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}
+    ipv4 = ${boolToString cfg.enableIPv4}
+    ipv6 = ${boolToString cfg.enableIPv6}
+    notransit = ${boolToString cfg.notransit}
+    floodfill = ${boolToString cfg.floodfill}
+    netid = ${toString cfg.netid}
+    ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" }
+    ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}
 
-  [limits]
-  transittunnels = ${toString cfg.limits.transittunnels}
+    [limits]
+    transittunnels = ${toString cfg.limits.transittunnels}
 
-  [upnp]
-  enabled = ${boolToString cfg.upnp.enable}
-  name = ${cfg.upnp.name}
+    [upnp]
+    enabled = ${boolToString cfg.upnp.enable}
+    name = ${cfg.upnp.name}
 
-  [precomputation]
-  elgamal = ${boolToString cfg.precomputation.elgamal}
+    [precomputation]
+    elgamal = ${boolToString cfg.precomputation.elgamal}
 
-  [reseed]
-  verify = ${boolToString cfg.reseed.verify}
-  file = ${cfg.reseed.file}
-  urls = ${builtins.concatStringsSep "," cfg.reseed.urls}
+    [reseed]
+    verify = ${boolToString cfg.reseed.verify}
+    file = ${cfg.reseed.file}
+    urls = ${builtins.concatStringsSep "," cfg.reseed.urls}
 
-  [addressbook]
-  defaulturl = ${cfg.addressbook.defaulturl}
-  subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions}
-  ${flip concatMapStrings
+    [addressbook]
+    defaulturl = ${cfg.addressbook.defaulturl}
+    subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions}
+
+    ${flip concatMapStrings
       (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)
-      (proto: let portStr = toString proto.port; in
-        ''
-          [${proto.name}]
-          enabled = ${boolToString proto.enable}
-          address = ${proto.address}
-          port = ${toString proto.port}
-          ${if proto ? keys then "keys = ${proto.keys}" else ""}
-          ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""}
-          ${if proto ? user then "user = ${proto.user}" else ""}
-          ${if proto ? pass then "pass = ${proto.pass}" else ""}
-          ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""}
-          ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""}
-        '')
-      }
+      (proto: let portStr = toString proto.port; in ''
+        [${proto.name}]
+        enabled = ${boolToString proto.enable}
+        address = ${proto.address}
+        port = ${toString proto.port}
+        ${if proto ? keys then "keys = ${proto.keys}" else ""}
+        ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""}
+        ${if proto ? user then "user = ${proto.user}" else ""}
+        ${if proto ? pass then "pass = ${proto.pass}" else ""}
+        ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""}
+        ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""}
+      '')
+    }
   '';
 
   i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" ''
-  ${flip concatMapStrings
-    (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
-    (tun: let portStr = toString tun.port; in ''
-  [${tun.name}]
-  type = client
-  destination = ${tun.destination}
-  keys = ${tun.keys}
-  address = ${tun.address}
-  port = ${toString tun.port}
-  inbound.length = ${toString tun.inbound.length}
-  outbound.length = ${toString tun.outbound.length}
-  inbound.quantity = ${toString tun.inbound.quantity}
-  outbound.quantity = ${toString tun.outbound.quantity}
-  crypto.tagsToSend = ${toString tun.crypto.tagsToSend}
-  '')
-  }
-  ${flip concatMapStrings
-    (collect (tun: tun ? port && tun ? host) cfg.inTunnels)
-    (tun: let portStr = toString tun.port; in ''
-  [${tun.name}]
-  type = server
-  destination = ${tun.destination}
-  keys = ${tun.keys}
-  host = ${tun.address}
-  port = ${tun.port}
-  inport = ${tun.inPort}
-  accesslist = ${builtins.concatStringsSep "," tun.accessList}
-  '')
-  }
+    # DO NOT EDIT -- this file has been generated automatically.
+    ${flip concatMapStrings
+      (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
+      (tun: let portStr = toString tun.port; in ''
+        [${tun.name}]
+        type = client
+        destination = ${tun.destination}
+        keys = ${tun.keys}
+        address = ${tun.address}
+        port = ${toString tun.port}
+        inbound.length = ${toString tun.inbound.length}
+        outbound.length = ${toString tun.outbound.length}
+        inbound.quantity = ${toString tun.inbound.quantity}
+        outbound.quantity = ${toString tun.outbound.quantity}
+        crypto.tagsToSend = ${toString tun.crypto.tagsToSend}
+      '')
+    }
+    ${flip concatMapStrings
+      (collect (tun: tun ? port && tun ? host) cfg.inTunnels)
+      (tun: let portStr = toString tun.port; in ''
+        [${tun.name}]
+        type = server
+        destination = ${tun.destination}
+        keys = ${tun.keys}
+        host = ${tun.address}
+        port = ${tun.port}
+        inport = ${tun.inPort}
+        accesslist = ${builtins.concatStringsSep "," tun.accessList}
+      '')
+    }
   '';
 
   i2pdSh = pkgs.writeScriptBin "i2pd" ''

From 55821dc576b535c2aa33ba535f6ad31c8f5df3ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 25 Aug 2017 14:59:49 +0200
Subject: [PATCH 2633/3246] git-lfs: adding old 1.5.6 (supports old server
 protocols)

Some git-lfs servers may not be ready for 2.x clients.
---
 .../version-management/git-lfs/1.nix          | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/git-lfs/1.nix

diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
new file mode 100644
index 00000000000..24c22d423d5
--- /dev/null
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "git-lfs-${version}";
+  version = "1.5.6";
+  rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
+  
+  goPackagePath = "github.com/git-lfs/git-lfs";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "git-lfs";
+    repo = "git-lfs";
+    sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d";
+  };
+
+  # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
+  excludedPackages = [ "test" ];
+
+  preBuild = ''
+    pushd go/src/github.com/git-lfs/git-lfs
+      go generate ./commands
+    popd
+  '';
+
+  postInstall = ''
+    rm -v $bin/bin/{man,script}
+  '';
+  meta = with stdenv.lib; {
+    description = "Git extension for versioning large files";
+    homepage    = https://git-lfs.github.com/;
+    license     = [ licenses.mit ];
+    maintainers = [ maintainers.twey ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a3591a83bb..d5c8f3d2af0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2134,7 +2134,9 @@ with pkgs;
 
   git-crecord = callPackage ../applications/version-management/git-crecord { };
 
-  git-lfs = callPackage ../applications/version-management/git-lfs { };
+  git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
+
+  git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { };
 
   git-ftp = callPackage ../development/tools/git-ftp { };
 

From 0eb868fa8aedb58e3bedb2b41a754a3460fab252 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 23 Aug 2017 14:41:01 +0200
Subject: [PATCH 2634/3246] pango: fix pango_default_break function

bug: https://bugzilla.gnome.org/show_bug.cgi?id=785978#c9

(fixes the failing perl-gtk2 tests)
---
 pkgs/development/libraries/pango/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 29a69bee0c7..ecb0dd841fc 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz
 , libintlOrEmpty, gobjectIntrospection, darwin
 }:
 
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
     sha256 = "9faea6535312fe4436b93047cf7a04af544eb52a079179bd3a33821aacce7e16";
   };
 
+  patches = [
+    # https://bugzilla.gnome.org/show_bug.cgi?id=785978#c9
+    (fetchpatch rec {
+      name = "pango-fix-gtk2-test-failures.patch";
+      url = "https://bug785978.bugzilla-attachments.gnome.org/attachment.cgi?id=357690&action=diff&collapsed=&context=patch&format=raw&headers=1";
+      sha256 = "055m2dllfr5pgw6bci72snw38f4hsyw1x7flj188c965ild8lq3a";
+    })
+  ];
+
   outputs = [ "bin" "dev" "out" "devdoc" ];
 
   buildInputs = [ gobjectIntrospection ];

From 61ea0eb88c0d536cea3a7a6df95ca7f67573c4c1 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@teamviewer.com>
Date: Fri, 25 Aug 2017 16:42:28 +0200
Subject: [PATCH 2635/3246] pythonPackages.phonenumbers: 8.7.1 -> 8.8.0

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 18cd9f021fe..ab00a946439 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.7.1";
+  version = "8.8.0";
   name = "${pname}-${version}";
 
   meta = {
@@ -14,6 +14,6 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
-    sha256 = "1zmi2xvh6v4iyfxmrqhj2byfac9xk733w663a7phib7y6wkvqlgr";
+    sha256 = "0j8yzn7fva863v7vrjk0s1d63yswg8hf2hlpvfwzxk9absjyvmgq";
   };
 }

From 287fce6402100c40317233de6b4f749f2b79b0a5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 16:23:30 -0400
Subject: [PATCH 2636/3246] expand-response-params: Pull out of cc-wrapper

No hashes were changed
---
 pkgs/build-support/cc-wrapper/default.nix        | 16 ++++------------
 .../expand-response-params/default.nix           | 13 +++++++++++++
 .../expand-response-params.c                     |  0
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/build-support/expand-response-params/default.nix
 rename pkgs/build-support/{cc-wrapper => expand-response-params}/expand-response-params.c (100%)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 525cb07ac32..d5ae64c9c5f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -74,18 +74,10 @@ let
     else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
     else null;
 
-  expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
-  then buildPackages.stdenv.mkDerivation {
-    name = "expand-response-params";
-    src = ./expand-response-params.c;
-    buildCommand = ''
-      # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
-      cp "$src" expand-response-params.c
-      "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
-      strip -S $out
-      ${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"}
-    '';
-  } else "";
+  expand-response-params =
+    if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
+    then import ../expand-response-params { inherit (buildPackages) stdenv; }
+    else "";
 
 in
 
diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix
new file mode 100644
index 00000000000..7afbb727fc3
--- /dev/null
+++ b/pkgs/build-support/expand-response-params/default.nix
@@ -0,0 +1,13 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "expand-response-params";
+  src = ./expand-response-params.c;
+  buildCommand = ''
+    # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
+    cp "$src" expand-response-params.c
+    "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
+    strip -S $out
+    ${stdenv.lib.optionalString stdenv.hostPlatform.isLinux "patchelf --shrink-rpath $out"}
+  '';
+}
diff --git a/pkgs/build-support/cc-wrapper/expand-response-params.c b/pkgs/build-support/expand-response-params/expand-response-params.c
similarity index 100%
rename from pkgs/build-support/cc-wrapper/expand-response-params.c
rename to pkgs/build-support/expand-response-params/expand-response-params.c

From 3933c4e9435fb0c3d89f670064f78a6512c23db1 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@teamviewer.com>
Date: Fri, 25 Aug 2017 17:33:18 +0200
Subject: [PATCH 2637/3246] graylog: 2.3.0 -> 2.3.1

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

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

From c905b7895cff498a8ccddfa77ab401676d16ed55 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 25 Aug 2017 18:23:07 +0200
Subject: [PATCH 2638/3246] twister: 0.9.30 -> 0.9.34

From the upstream changelog:

Version 0.9.34:

 * quick fix to "Assertion mapInfo.count" failed, don't mess with these
   addrman structures!

Version 0.9.33:

 * fix serious connectivity problem: not trying to connect to >=0.9.30
   peers with random ports.

Version 0.9.31:

 * backport from upstream (arvidn/libtorrent@677e642):
   fixed uTP vulnerability from

The fixes in 0.9.31 are a bit more serious and it actually contains two
fixes from what I've been able to dig through:

 * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-5685
 * https://www.us-cert.gov/ncas/alerts/TA14-017A

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/p2p/twister/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index 6cb2c7247d5..2388b9ded18 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -15,12 +15,12 @@ let
 
 in stdenv.mkDerivation rec {
   name = "twister-${version}";
-  version = "0.9.30";
+  version = "0.9.34";
 
   src = fetchurl {
     url = "https://github.com/miguelfreitas/twister-core/"
         + "archive/v${version}.tar.gz";
-    sha256 = "1i39iqq6z25rh869vi5k76g84rmyh30p05xid7z9sqjrqdfpyyzk";
+    sha256 = "1bi8libivd9y2bn9fc7vbc5q0jnal0pykpzgri6anqaww22y58jq";
   };
 
   configureFlags = [

From 58c0d63100244211f5a898d5c26a76aca038698c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 25 Aug 2017 18:27:41 +0200
Subject: [PATCH 2639/3246] twister: Fix build against GCC 6.x

This applies upstream commit miguelfreitas/twister-core@dd4f5a176958ea6.

Tested only by building and executing "twisterd --help", but no serious
testing done otherwise.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/p2p/twister/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index 2388b9ded18..e5a242662ce 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python2
+{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, python2
 , boost, db, openssl, geoip, libiconv, miniupnpc
 , srcOnly, fetchgit
 }:
@@ -37,6 +37,12 @@ in stdenv.mkDerivation rec {
     boost db openssl geoip miniupnpc libiconv
   ];
 
+  patches = stdenv.lib.singleton (fetchpatch {
+    url = "https://github.com/miguelfreitas/twister-core/commit/"
+        + "dd4f5a176958ea6ed855dc3fcef79680c1c0c92c.patch";
+    sha256 = "06fgmqnjyl83civ3ixiq673k8zjgm8n2w4w46nsh810nprqim8s6";
+  });
+
   postPatch = ''
     sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \
       src/init.cpp

From aabdd37cb91301fe882fa729117e8ab3af86a869 Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Sat, 26 Aug 2017 00:52:31 +0800
Subject: [PATCH 2640/3246] btc1: init at 1.14.5

A portion of Bitcoin users (including the super-majority of the
miners) decided to hard fork to segwit2x around this November. At that
time this will not be compatible with the Bitcoin Core client. 1.14.5
is known as "the Production Release".
---
 lib/maintainers.nix                    |  1 +
 pkgs/applications/altcoins/btc1.nix    | 40 ++++++++++++++++++++++++++
 pkgs/applications/altcoins/default.nix |  3 ++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/altcoins/btc1.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7728749f054..0eeb7ed66a0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -545,6 +545,7 @@
   smironov = "Sergey Mironov <grrwlf@gmail.com>";
   snyh = "Xia Bin <snyh@snyh.org>";
   solson = "Scott Olson <scott@solson.me>";
+  sorpaas = "Wei Tang <hi@that.world>";
   spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
   spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>";
   spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>";
diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix
new file mode 100644
index 00000000000..8ade6fb5251
--- /dev/null
+++ b/pkgs/applications/altcoins/btc1.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, withGui }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+  name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version;
+  version = "1.14.5";
+
+  src = fetchurl {
+    url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz";
+    sha256 = "1az6bbblh3adgcs16r9cjz8jacg6sbwfpg8zzfzkbp9h9j85ass5";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db48 boost zlib
+                  miniupnpc protobuf libevent]
+                  ++ optionals stdenv.isLinux [ utillinux ]
+                  ++ optionals withGui [ qt4 qrencode ];
+
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
+                     ++ optionals withGui [ "--with-gui=qt4" ];
+
+  meta = {
+    description = "Peer-to-peer electronic cash system (btc1 client)";
+    longDescription= ''
+      Bitcoin is a free open source peer-to-peer electronic cash system that is
+      completely decentralized, without the need for a central server or trusted
+      parties. Users hold the crypto keys to their own money and transact directly
+      with each other, with the help of a P2P network to check for double-spending.
+
+      btc1 is an implementation of a Bitcoin full node with segwit2x hard fork
+      support.
+    '';
+    homepage = "https://github.com/btc1/bitcoin";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sorpaas ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 1fbabc338f2..81b459e8308 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -14,6 +14,9 @@ rec {
   bitcoin-xt  = callPackage ./bitcoin-xt.nix { withGui = true; };
   bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
 
+  btc1 = callPackage ./btc1.nix { withGui = true; };
+  btc1d = callPackage ./btc1.nix { withGui = false; };
+
   dashpay = callPackage ./dashpay.nix { };
 
   dogecoin  = callPackage ./dogecoin.nix { withGui = true; };

From 512c664709bdd6cef92d26f88f54ccb0858cf2bd Mon Sep 17 00:00:00 2001
From: Tom Doggett <nocoolnametom@gmail.com>
Date: Fri, 25 Aug 2017 10:26:58 -0700
Subject: [PATCH 2641/3246] phpPackages: add AST package

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1d07acb8e77..851e19231f6 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -23,6 +23,12 @@ let
     sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd";
   };
 
+  ast = assert isPhp7; buildPecl {
+    name = "ast-0.1.5";
+
+    sha256 = "0vv2w5fkkw9n7qdmi5aq50416zxmvyzjym8kb6j1v8kd4xcsjjgw";
+  };
+
   imagick = buildPecl {
     name = "imagick-3.4.3RC1";
     sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh";

From d58e1f1c7b3e955d3ee1194ea96c574338b47b97 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:34:20 +0200
Subject: [PATCH 2642/3246] python.pkgs: many updates

---
 pkgs/development/python-modules/Cython/default.nix  |  4 ++--
 .../development/python-modules/aafigure/default.nix |  4 ++--
 pkgs/development/python-modules/adal/default.nix    |  4 ++--
 pkgs/development/python-modules/aiodns/default.nix  |  4 ++--
 pkgs/development/python-modules/alembic/default.nix |  4 ++--
 .../python-modules/argcomplete/default.nix          |  4 ++--
 .../development/python-modules/asgi_ipc/default.nix |  4 ++--
 pkgs/development/python-modules/astropy/default.nix |  4 ++--
 .../python-modules/async_timeout/default.nix        |  4 ++--
 .../python-modules/audioread/default.nix            |  4 ++--
 .../development/python-modules/autobahn/default.nix |  4 ++--
 .../python-modules/bottleneck/default.nix           |  4 ++--
 pkgs/development/python-modules/breathe/default.nix |  4 ++--
 pkgs/development/python-modules/certifi/default.nix |  4 ++--
 pkgs/development/python-modules/chai/default.nix    |  4 ++--
 .../python-modules/confluent-kafka/default.nix      |  4 ++--
 .../python-modules/coveralls/default.nix            |  4 ++--
 .../python-modules/discordpy/default.nix            |  4 ++--
 .../python-modules/django-polymorphic/default.nix   |  4 ++--
 .../python-modules/django_compressor/default.nix    |  4 ++--
 .../python-modules/djangorestframework/default.nix  |  4 ++--
 pkgs/development/python-modules/docker.nix          |  4 ++--
 pkgs/development/python-modules/dulwich.nix         |  4 ++--
 pkgs/development/python-modules/emcee/default.nix   |  4 ++--
 pkgs/development/python-modules/flake8/default.nix  |  4 ++--
 .../python-modules/flask-migrate/default.nix        |  4 ++--
 pkgs/development/python-modules/flask-testing.nix   | 12 +++++++-----
 .../python-modules/fonttools/default.nix            |  4 ++--
 pkgs/development/python-modules/ftfy/default.nix    |  4 ++--
 pkgs/development/python-modules/gensim/default.nix  |  4 ++--
 .../python-modules/html5-parser/default.nix         |  4 ++--
 .../python-modules/ipywidgets/default.nix           |  4 ++--
 pkgs/development/python-modules/keras/default.nix   |  4 ++--
 .../python-modules/keystoneauth1/default.nix        |  4 ++--
 pkgs/development/python-modules/kitchen/default.nix |  4 ++--
 .../python-modules/ledgerblue/default.nix           |  4 ++--
 pkgs/development/python-modules/libtmux/default.nix |  4 ++--
 .../development/python-modules/llvmlite/default.nix |  4 ++--
 pkgs/development/python-modules/m2r/default.nix     |  4 ++--
 .../python-modules/magic-wormhole/default.nix       |  4 ++--
 .../python-modules/marionette-harness/default.nix   |  4 ++--
 .../python-modules/multidict/default.nix            |  4 ++--
 pkgs/development/python-modules/natsort/default.nix |  4 ++--
 .../development/python-modules/nbformat/default.nix |  4 ++--
 pkgs/development/python-modules/numba/default.nix   |  4 ++--
 .../python-modules/oslo-config/default.nix          |  4 ++--
 pkgs/development/python-modules/pbr/default.nix     |  4 ++--
 .../python-modules/phonenumbers/default.nix         |  4 ++--
 pkgs/development/python-modules/plotly/default.nix  |  4 ++--
 pkgs/development/python-modules/pycuda/default.nix  |  4 ++--
 .../python-modules/pygraphviz/default.nix           |  4 ++--
 pkgs/development/python-modules/pylast/default.nix  |  4 ++--
 .../development/python-modules/pyopencl/default.nix |  4 ++--
 .../development/python-modules/pypandoc/default.nix |  4 ++--
 .../development/python-modules/pyroute2/default.nix |  4 ++--
 pkgs/development/python-modules/pyscard/default.nix |  4 ++--
 .../python-modules/pytest-asyncio/default.nix       |  4 ++--
 .../python-modules/pytest-xdist/default.nix         |  8 ++++----
 pkgs/development/python-modules/pytest/default.nix  | 10 ++++++----
 .../python-modules/python-editor/default.nix        |  4 ++--
 .../python-modules/qtconsole/default.nix            |  4 ++--
 .../python-modules/relatorio/default.nix            |  4 ++--
 .../python-modules/requests-oauthlib.nix            |  6 +++---
 pkgs/development/python-modules/rfc3986/default.nix |  4 ++--
 pkgs/development/python-modules/semver/default.nix  |  4 ++--
 .../python-modules/setuptools/default.nix           |  4 ++--
 .../python-modules/simplejson/default.nix           |  4 ++--
 pkgs/development/python-modules/sphinx/default.nix  | 13 ++++++++++---
 .../python-modules/sqlalchemy/default.nix           |  4 ++--
 .../python-modules/stevedore/default.nix            |  4 ++--
 pkgs/development/python-modules/stripe/default.nix  |  4 ++--
 pkgs/development/python-modules/tqdm/default.nix    |  4 ++--
 pkgs/development/python-modules/treq/default.nix    |  4 ++--
 pkgs/development/python-modules/txaio/default.nix   |  4 ++--
 pkgs/development/python-modules/vega/default.nix    |  4 ++--
 .../python-modules/virtualenv/default.nix           |  4 ++--
 .../python-modules/websockets/default.nix           |  4 ++--
 .../python-modules/widgetsnbextension/default.nix   |  4 ++--
 pkgs/development/python-modules/xlwt/default.nix    |  4 ++--
 .../development/python-modules/yamllint/default.nix |  4 ++--
 pkgs/development/python-modules/yapf/default.nix    |  4 ++--
 pkgs/development/python-modules/yarl/default.nix    |  4 ++--
 pkgs/development/python-modules/zeep/default.nix    |  4 ++--
 83 files changed, 186 insertions(+), 175 deletions(-)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 9d09b93ed20..3dd4b0acbaf 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -14,11 +14,11 @@
 buildPythonPackage rec {
   pname = "Cython";
   name = "${pname}-${version}";
-  version = "0.25.2";
+  version = "0.26";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
+    sha256 = "4c24e2c22ddaed624d35229dc5db25049e9e225c6f64f3364326836cad8f2c66";
   };
 
   # With Python 2.x on i686-linux or 32-bit ARM this test fails because the
diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix
index 1084eca762b..120d17e6709 100644
--- a/pkgs/development/python-modules/aafigure/default.nix
+++ b/pkgs/development/python-modules/aafigure/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aafigure";
-  version = "0.5";
+  version = "0.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091";
+    sha256 = "49f2c1fd2b579c1fffbac1386a2670b3f6f475cc7ff6cc04d8b984888c2d9e1e";
   };
 
   propagatedBuildInputs = [ pillow ];
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index 982e63882ad..22ed76b9e59 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "adal";
-  version = "0.1.0";
+  version = "0.4.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09";
+    sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325";
   };
 
   propagatedBuildInputs =  [ requests pyjwt ];
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
index 4265a7488f6..becb9ceae72 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "aiodns";
-  version = "1.0.1";
+  version = "1.1.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
+    sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea";
   };
 
   propagatedBuildInputs = with stdenv.lib; [ pycares ] 
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index d1262d8fab4..45bea1fe687 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "alembic";
-  version = "0.9.3";
+  version = "0.9.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "57f2ede554c0b18f1cf811cfbb3b02c586a5422df94922e3821883ba0b8c616c";
+    sha256 = "8bdcb4babaa16b9a826f8084949cc2665cb328ecf7b89b3224b0ab85bd16fd05";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index 228ffa7e521..a4318fe5fa4 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "argcomplete";
-  version = "1.8.2";
+  version = "1.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0sslhl1klvh92c8hjsz3y3mmnpcqspcgi49g5cik2rpbfkhcsb3s";
+    sha256 = "d6ea272a93bb0387f758def836e73c36fff0c54170258c212de3e84f7db8d5ed";
   };
 
   doCheck = false; # bash-completion test fails with "compgen: command not found".
diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix
index e282294ef0c..41de61dbcca 100644
--- a/pkgs/development/python-modules/asgi_ipc/default.nix
+++ b/pkgs/development/python-modules/asgi_ipc/default.nix
@@ -2,13 +2,13 @@
   asgiref, msgpack, posix_ipc
 }:
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.4.1";
   pname = "asgi_ipc";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
-    sha256 = "1bae453d771eb92c0ec558b826fc0bce75a2a61bf21187784d4e4dc11710e588";
+    sha256 = "87cc9dda476d28f335261b73f0f3070f28847718de2e64da9a80492638203e43";
   };
 
   propagatedBuildInputs = [ asgiref msgpack posix_ipc ];
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 836ce3addea..44ff96cf826 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -9,13 +9,13 @@
 buildPythonPackage rec {
   
   pname = "astropy";
-  version = "1.3.3";
+  version = "2.0.1";
 
   name = "${pname}-${version}";
   doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99";
+    sha256 = "25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e";
   };
   propagatedBuildInputs = [ numpy cython h5py scipy ];
 
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index aa548602d37..94c2379b0e1 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname = "async-timeout";
-  version = "1.2.1";
+  version = "1.3.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "380e9bfd4c009a14931ffe487499b0906b00b3378bb743542cfd9fbb6d8e4657";
+    sha256 = "f4651f122a9877049930ce31a8422bc202a47937627295fe5e411b2c2083481f";
   };
 
   buildInputs = [ pytestrunner ];
diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix
index bf71cf8cfbd..88fdcbbeba1 100644
--- a/pkgs/development/python-modules/audioread/default.nix
+++ b/pkgs/development/python-modules/audioread/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   pname = "audioread";
   name = "${pname}-${version}";
-  version = "2.1.1";
+  version = "2.1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e";
+    sha256 = "36c3b118f097c58ba073b7d040c4319eff200756f094295677567e256282d0d7";
   };
 
   # No tests, need to disable or py3k breaks
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index b83d731c720..8d647a9b52e 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "autobahn";
-  version = "17.5.1";
+  version = "17.8.1";
 
   src = fetchurl {
     url = "mirror://pypi/a/${pname}/${name}.tar.gz";
-    sha256 = "0p2xx20g0rj6pnp4h3231mn8zk4ag8msv69f93gai2hzl5vglcia";
+    sha256 = "72b1b1e30bd41d52e7454ef6fe78fe80ebf2341a747616e2cd854a76203a0ec4";
   };
 
   # Upstream claim python2 support, but tests require pytest-asyncio which
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index 2c1850b86ab..4eb5bcb6edc 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -9,10 +9,10 @@
 buildPythonPackage rec {
   pname = "Bottleneck";
   name = "Bottleneck-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8";
+    sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36";
   };
 
   checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 9f4d89da90c..6f539f15222 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.6.0";
+  version = "4.7.2";
   pname = "breathe";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/breathe/${name}.tar.gz";
-    sha256 = "9db2ba770f824da323b9ea3db0b98d613a4e0af094c82ccb0a82991da81b736a";
+    sha256 = "dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index a2cf4633d30..79eea057454 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2017.4.17";
+  version = "2017.7.27.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a";
+    sha256 = "40523d2efb60523e113b44602298f0960e900388cf3bb6043f645cf57ea9e3f5";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix
index f5440004ebd..aa4e5e47e72 100644
--- a/pkgs/development/python-modules/chai/default.nix
+++ b/pkgs/development/python-modules/chai/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "chai";
-  version = "1.1.1";
+  version = "1.1.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
+    sha256 = "ff8d2b6855f660cd23cd5ec79bd10264d39f24f6235773331b48e7fcd637d6cc";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index d26008231b0..c8cbfe9d9be 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
-  version = "0.9.4";
+  version = "0.11.0";
   pname = "confluent-kafka";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v8apw9f8l01ql42jg1sfqv41yxvcbxn1a3ar01y0ni428swq6wk";
+    sha256 = "4c34bfe8f823ee3777d93820ec6578365d2bde3cd1302cbd0e44c86b68643667";
   };
 
   buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;
diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index 57431c2c2c2..f3b01c66815 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -13,12 +13,12 @@
 buildPythonPackage rec {
   pname = "coveralls";
   name = "${pname}-python-${version}";
-  version = "1.1";
+  version = "1.2.0";
 
   # wanted by tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0238hgdwbvriqxrj22zwh0rbxnhh9c6hh75i39ll631vq62h65il";
+    sha256 = "510682001517bcca1def9f6252df6ce730fcb9831c62d9fff7c7d55b6fdabdf3";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index 53a4a51fcd8..eebcd802dd6 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -11,13 +11,13 @@
 
 let
   pname = "discord.py";
-  version = "0.16.8";
+  version = "0.16.10";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "d775b701383e3a5762accf3816b819f357f299476701615ac30c7715a5ea79aa";
+    sha256 = "cb0b9ad5f5edf2d5afd5f5ce07381a0a089eb036004938126a5582fc8fa0cc88";
   };
 
   propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];
diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index 83e8f1c4d58..e2fedfdaaf3 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
-  version = "1.2";
+  version = "1.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bz86711sx2b66rl2xz141xppsfmlxilkgjgq0jsavpw37vg7r3r";
+    sha256 = "8737b465ebf5fad772b4c52272189c352f5904f468d298584a3469187e3207ad";
   };
 
   checkInputs = [ django ];
diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix
index 5d8626ec576..1fbb4dbafe6 100644
--- a/pkgs/development/python-modules/django_compressor/default.nix
+++ b/pkgs/development/python-modules/django_compressor/default.nix
@@ -2,12 +2,12 @@
   rcssmin, rjsmin, django_appconf }:
 buildPythonPackage rec {
     pname = "django_compressor";
-    version = "2.1.1";
+    version = "2.2";
     name = "${pname}-${version}";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1s42dkq3qp1niaf69markd7m3ljgf2bspyz2nk0sa07f8q04004j";
+      sha256 = "9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f";
     };
 
     # Need to setup django testing
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 8bbce992c1b..648ee019682 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchurl, django }:
 buildPythonPackage rec {
-  version = "3.6.3";
+  version = "3.6.4";
   pname = "djangorestframework";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
-    sha256 = "6aa6aafdfb7f6152a401873ecae93aff9eb54d7a74266065347cf4de68278ae4";
+    sha256 = "de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42";
   };
 
   # Test settings are missing
diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix
index 7364c5faed4..88d85dad91a 100644
--- a/pkgs/development/python-modules/docker.nix
+++ b/pkgs/development/python-modules/docker.nix
@@ -3,13 +3,13 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "2.4.2";
+  version = "2.5.1";
   pname = "docker";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/docker/${name}.tar.gz";
-    sha256 = "11kl6kl82056bzcycvc2jpz59ra89vwbyzi0yaamixgcm9nzlvr1";
+    sha256 = "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix
index 804419d0fca..bbf43ce615c 100644
--- a/pkgs/development/python-modules/dulwich.nix
+++ b/pkgs/development/python-modules/dulwich.nix
@@ -3,13 +3,13 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.17.3";
+  version = "0.18.2";
   pname = "dulwich";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/dulwich/${name}.tar.gz";
-    sha256 = "0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca";
+    sha256 = "284d0000b21ac12f94bcd5eb3d7dcc42da51e5506b9a53a11c615b46da906d9b";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix
index 3e95859fc0f..2afcb2b2de5 100644
--- a/pkgs/development/python-modules/emcee/default.nix
+++ b/pkgs/development/python-modules/emcee/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "emcee";
-  version = "2.1.0";
+  version = "2.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qyafp9jfya0mkxgqfvljf0rkic5fm8nimzwadyrxyvq7nd07qaw";
+    sha256 = "b83551e342b37311897906b3b8acf32979f4c5542e0a25786ada862d26241172";
   };
 
   propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index aec715328f9..f7f78e709f9 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "flake8";
-  version = "3.3.0";
+  version = "3.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04izn1q1lgbr408l9b3vkxqmpi6mq47bxwc0iwypb02mrxns41xr";
+    sha256 = "c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8";
   };
 
   buildInputs = [ pytest mock pytestrunner ];
diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
index 3e2c7ac4602..dc94be8f600 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -5,12 +5,12 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
-  version = "2.0.4";
+  version = "2.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e6dc83bed93aef9a4791d5daaa03b186c8ef5d96c99c7d88166da683c86e42d";
+    sha256 = "716d5b68eec53821f80b3fbcb0fd60baed0cb0e320abb30289e83217668cef7f";
   };
 
   checkInputs = optional isPy3k glibcLocales;
diff --git a/pkgs/development/python-modules/flask-testing.nix b/pkgs/development/python-modules/flask-testing.nix
index c5fe8f8bdbe..c34c53e3ffa 100644
--- a/pkgs/development/python-modules/flask-testing.nix
+++ b/pkgs/development/python-modules/flask-testing.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonOlder
+{ stdenv, fetchPypi, buildPythonPackage, pythonOlder
 , flask, blinker, twill }:
 
 with stdenv.lib;
 
 buildPythonPackage rec {
-  name = "Flask-Testing-0.6.1";
+  pname = "Flask-Testing";
+  version = "0.6.2";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/F/Flask-Testing/${name}.tar.gz";
-    sha256 = "1ckmy7kz2qkggdlm9y5wx6gvd2x7qv921dyb059ywfh15hrkkxdb";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f25effd266fce9b16482f4ce3423d5a7d25534aab77bc83caace5d9637bf0df0";
   };
 
   buildInputs = optionals (pythonOlder "3.0") [ twill ];
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index fbe83733404..c037decbc87 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.13.1";
+  version = "3.15.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ded1f9a6cdd6ed19a3df05ae40066d579ffded17369b976f9e701cf31b7b1f2d";
+    sha256 = "8df4b605a28e313f0f9e0a79502caba4150a521347fdbafc063e52fee34912c2";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index c0aea987781..e5335867702 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -9,11 +9,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ftfy";
-  version = "4.4.3";
+  version = "5.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";        
+    sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78";        
   };
 
   propagatedBuildInputs = [ html5lib wcwidth];
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 3892ee105c4..837ffa8c867 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -13,10 +13,10 @@
 buildPythonPackage rec {
   pname = "gensim";
   name = "${pname}-${version}";
-  version = "2.1.0";
+  version = "2.3.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wn7bji9b80wn1yggmh7a0dlwzdjr6cp24x4p33j2rf29lxnm2kc";
+    sha256 = "7d0dccc7d2c576e270037949874800b7cfbc86ef081ff981483f612cd18e223f";
   };
 
   propagatedBuildInputs = [ smart_open numpy six scipy
diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
index 549dcb89bf7..6a579cffccf 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "html5-parser";
-  version = "0.4.3";
+  version = "0.4.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "173vzg214x7qfq201m4b09wg5nszdgwjw5q02v23k54iqm3kcpnx";
+    sha256 = "b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index dcd5b89b6b8..ce0aed4964d 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "6.0.0";
+  version = "7.0.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7";
+    sha256 = "63e454202f72796044e99846881c33767c47fa050735dc1f927657b9cd2b7fcd";
   };
 
   # Tests are not distributed
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index b15b2d0817a..51c15ad6813 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.0.6";
+  version = "2.0.7";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0519480abe4ad18b2c2d1bc580eab75edd82c95083d341a1157952f4b00019bb";
+    sha256 = "a6c72ee2b94be1ffefe7e77b69582b9827211f0c356b2189459711844d3634c0";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
index c2c2235836f..17792723e4a 100644
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "keystoneauth1";
-  version = "1.1.0";
+  version = "3.1.0";
   name = "${pname}-${version}";
   disabled = isPyPy; # a test fails
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
+    sha256 = "e5abfa8bbe866d52ca56afbe528d15214a60033cc1dc9804478cae7424f0f8fb";
   };
 
   buildInputs = [ pbr testtools testresources testrepository mock
diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix
index 895cdedcb6e..a35737e69ba 100644
--- a/pkgs/development/python-modules/kitchen/default.nix
+++ b/pkgs/development/python-modules/kitchen/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "kitchen";
-  version = "1.2.4";
+  version = "1.2.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ggv3p4x8jvmmzhp0xm00h6pvh1g0gmycw71rjwagnrj8n23vxrq";
+    sha256 = "af9fbb60f68cbdb2ead402beb8fa7c7edadbe2aa7b5a70138b7c4b0fa88153fd";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index f8faab3fbb8..0bee4dd47b5 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ledgerblue";
-  version = "0.1.13";
+  version = "0.1.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
+    sha256 = "42cbcd74615576294142d56eb9eaa7e1b67f9dd87eeb24d713336b56e8c01c5c";
   };
 
   buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 203b9e6bf75..2f041f0da4a 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "libtmux";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "111qbgq28za12la5b0aa9rr7hg8235zy0kyzzryn7fa6z3i5k5z8";
+    sha256 = "c7407aa4103d40f50f99432bf4dffe0b4591f976956b2dd7ee7bbf53ad138bd9";
   };
 
   buildInputs = [ pytest_29 ];
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index fa9c6ac18f3..5de795f84ef 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -11,13 +11,13 @@
 buildPythonPackage rec {
   pname = "llvmlite";
   name = "${pname}-${version}";
-  version = "0.18.0";
+  version = "0.19.0";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "25a38af925f0523b834b92216d7f7cc997624942d5958287350c254f5e730404";
+    sha256 = "fbaeb3d584e0f6bac82a33776e9b5f0b5b4a3415a03edeff5d66f6176f0edbe2";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index b79307a8084..39498919708 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "m2r";
   name = "${pname}-${version}";
-  version = "0.1.7";
+  version = "0.1.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "771631d051a52764fe5b660f97ad028df3aff90c9859d345ccfd17a4c7c2ab39";
+    sha256 = "cfb5b8a37defdd594eb46a794b87d9b4ca1902b0e8e309c9f2623f7275c261d6";
   };
 
   propagatedBuildInputs = [ mistune docutils ];
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index d4a356eaec4..7fedf4d48bb 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.9.2";
+  version = "0.10.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14aed4b453278651d92c3fd8955a105e2d33dcde279fa25d1d759e0e769f16b3";
+    sha256 = "55a423247faee7a0644d25f37760495978cd494ba0274fefd8cd1fad493954ee";
   };
 
   checkInputs = [ mock ];
diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix
index 5b81d3da8ec..da8949f9f6e 100644
--- a/pkgs/development/python-modules/marionette-harness/default.nix
+++ b/pkgs/development/python-modules/marionette-harness/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "marionette-harness";
-  version = "4.0.0";
+  version = "4.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0726zm09nwh4kkd4xirva4596svlifkkpbaywlmq2yb6ayk7d4vl";
+    sha256 = "20c188791e28d586c58acf86ff28cb704c4195a4da6eb10db7b8c6771e3f2983";
   };
 
   propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest 
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index faece73e172..fc0bdf90627 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname = "multidict";
-  version = "2.1.6";
+  version = "3.1.3";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "9ec33a1da4d2096949e29ddd66a352aae57fad6b5483087d54566a2f6345ae10";
+    sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index 79ec9f5bd89..bd48ad2559c 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -16,7 +16,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "natsort";
-  version = "5.0.3";
+  version = "5.1.0";
 
   buildInputs = [
     hypothesis
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h87n0jcsi6mgjx1pws6g1lmcn8jwabwxj8hq334jvziaq0plyym";
+    sha256 = "5db0fd17c9f8ef3d54962a6e46159ce4807c630f0931169cd15ce54f2ac395b9";
   };
 
   # do not run checks on nix_run_setup.py
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index 81340923fde..6f637bae891 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "nbformat";
-  version = "4.3.0";
+  version = "4.4.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b";
+    sha256 = "f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402";
   };
   LC_ALL="en_US.UTF-8";
 
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 99c7ce00853..840df876938 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,13 +14,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.33.0";
+  version = "0.34.0";
   pname = "numba";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numba/${name}.tar.gz";
-    sha256 = "56c5fcf3175f72b67ba8998d02870e3ea598e10c41d93289cecb9d89be7669fd";
+    sha256 = "4f86df9212cb2678598e6583973ef1df978f3e3ba497b4dc6f91848887710577";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
index a76937278c4..6323e72e2a5 100644
--- a/pkgs/development/python-modules/oslo-config/default.nix
+++ b/pkgs/development/python-modules/oslo-config/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "oslo.config";
-  version = "2.5.0";
+  version = "4.11.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz";
+    sha256 = "1be8aaba466a3449fdb21ee8f7025b0d3d252c8c7568b8d5d05ceff58617cd05";
   };
 
   propagatedBuildInputs = [ pbr six netaddr stevedore ];
diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index 2fa6c2b3930..75052f27151 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "3.0.1";
+  version = "3.1.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91";
+    sha256 = "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1";
   };
 
   # circular dependencies with fixtures
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 18cd9f021fe..f7b7ecd0abc 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.7.1";
+  version = "8.8.0";
   name = "${pname}-${version}";
 
   meta = {
@@ -14,6 +14,6 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
-    sha256 = "1zmi2xvh6v4iyfxmrqhj2byfac9xk733w663a7phib7y6wkvqlgr";
+    sha256 = "f8d5eda55e2acdfeb9db9742e1207a5cfb615ad060cabccf1e06a9ed8efd1e49";
   };
 }
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index ed62a091281..ac3c4f1d324 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.0.12";
+  version = "2.0.15";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0050da900e4420c15766f8dfb8d252510896511361bf485b9308bc0287f7add0";
+    sha256 = "0ecd16a11778674c63615a590e22f79307801eaf009b399bf7e46c486dec8f99";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index 71bf64b7733..83b294321b8 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -22,12 +22,12 @@ let
 in
 buildPythonPackage rec {
   pname = "pycuda";
-  version = "2017.1";
+  version = "2017.1.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "a92725ccd8515b4d7284b9127184b6fdb61f224daa086e7fc6b926e2094b055f";
+    sha256 = "6b5a9384e38c603ee429f8a6bee424532db7b3505027ce22f7e18ad19564b563";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index 911779e67fd..bed258c1673 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pygraphviz";
-  version = "1.4rc1";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a";
+    sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
   };
 
   buildInputs = [ doctest-ignore-unicode mock nose ];
diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
index c2c6ee211c9..99bcb9357dc 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pylast";
-  version = "1.8.0";
+  version = "1.9.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "85f8dd96aef0ccba5f80379c3d7bc1fabd72f59aebab040daf40a8b72268f9bd";
+    sha256 = "ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4";
   };
 
   propagatedBuildInputs = [ certifi six ];
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index ddab1cde1e6..362cef42b78 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2017.1.1";
+  version = "2017.2";
   name = "${pname}-${version}";
 
   buildInputs = [ pytest opencl-headers ocl-icd ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "928c458a463321c6c91e7fa54bf325bf71d7a8aa5ff750ec8fed2472f6aeb323";
+    sha256 = "039b689a58eb98e27a577ac086210deae959f40d657487f3199d2d217c270ff9";
   };
 
   # gcc: error: pygpu_language_opencl.cpp: No such file or directory
diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index cb7b9ed43fe..4c694319563 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "pypandoc";
-  version = "1.3.3";
+  version = "1.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6";
+    sha256 = "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b";
   };
 
   # Fix tests: first requires network access, second is a bug (reported upstream)
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 2e60f6812e9..8465c205295 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.4.18";
+  version = "0.4.19";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-    sha256 = "bdcff9f598ff4dda7420675ee387426cd9cc79d795ea73eb684a4314d4b00b9e";
+    sha256 = "122a1e34702287b805742a6edd8fe8483608238bd1602df2d5e3274bd8e8030a";
   };
 
   # requires root priviledges
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index c3d271caa32..bee5d760c0c 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonPackage, swig, pcsclite }:
 
 buildPythonPackage rec {
-  version = "1.9.5";
+  version = "1.9.6";
   pname = "pyscard";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyscard/${name}.tar.gz";
-    sha256 = "7eef027e1939b7595fc13c03616f262f90d118594fdb6f7620af46b54fa06835";
+    sha256 = "6e28143c623e2b34200d2fa9178dbc80a39b9c068b693b2e6527cdae784c6c12";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 966a207e50c..605c970cedc 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -2,13 +2,13 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-asyncio";
-  version = "0.5.0";
+  version = "0.6.0";
 
   disabled = !isPy3k;
 
   src = fetchurl {
     url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-    sha256 = "03sxq8fglr4lw4y6wqlbli9ypr65fxzx6hlpn5wpccx8v5472iff";
+    sha256 = "e5c6786ece4b3bbb0cca1bf68bf089756a62760e3764dc84eaee39bfab70289b";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 600c98925af..dc1a31a8922 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-xdist";
-  version = "1.18.2";
+  version = "1.20.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10468377901b80255cf192c4603a94ffe8b1f071f5c912868da5f5cb91170dae";
+    sha256 = "7924d45c2430191fe3679a58116c74ceea13307d7822c169d65fd59a24b3a4fe";
   };
 
-  buildInputs = [ pytest setuptools_scm ];
+  buildInputs = [ pytest setuptools_scm pytest-forked];
   propagatedBuildInputs = [ execnet ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 402c869c98c..6e450afbef9 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
+{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py
+, setuptools_scm
+}:
 buildPythonPackage rec {
-  version = "3.0.7";
+  version = "3.2.1";
   pname = "pytest";
   name = "${pname}-${version}";
 
@@ -11,10 +13,10 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/pytest/${name}.tar.gz";
-    sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
+    sha256 = "4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce";
   };
 
-  buildInputs = [ hypothesis ];
+  buildInputs = [ hypothesis setuptools_scm ];
   propagatedBuildInputs = [ py ]
     ++ (stdenv.lib.optional isPy26 argparse);
 
diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix
index bd429a67f24..bb64ff0e241 100644
--- a/pkgs/development/python-modules/python-editor/default.nix
+++ b/pkgs/development/python-modules/python-editor/default.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "0.4";
+  version = "1.0.3";
   pname = "python-editor";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4";
+    sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index b09458de568..16d66a6db21 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "qtconsole";
-  version = "4.3.0";
+  version = "4.3.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209";
+    sha256 = "eff8c2faeda567a0bef5781f419a64e9977988db101652b312b9d74ec0a5109c";
   };
 
   buildInputs = [ nose ] ++ lib.optionals isPy27 [mock];
diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index dc42449a339..f92f7723543 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -3,10 +3,10 @@
 buildPythonPackage rec {
   pname = "relatorio";
   name = "${pname}-${version}";
-  version = "0.6.4";
+  version = "0.7.0";
   src = fetchurl {
     url = "mirror://pypi/r/relatorio/${name}.tar.gz";
-    sha256 = "0lincq79mzgazwd9gh41dybjh9c3n87r83pl8nk3j79aihyfk84z";
+    sha256 = "efd68d96573b15c59c24a8f420ed14210ce51de535a8470d14381f2bed69d845";
   };
   propagatedBuildInputs = [
     genshi
diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix
index 0162d6f6eb5..1aea747a784 100644
--- a/pkgs/development/python-modules/requests-oauthlib.nix
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , oauthlib, requests }:
 
 buildPythonPackage rec {
@@ -6,8 +6,8 @@ buildPythonPackage rec {
   pname = "requests-oauthlib";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468";
   };
 
diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
index 6ebcb741685..e95699360e9 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "rfc3986";
-  version = "1.0.0";
+  version = "1.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2faacfabcc13ed89b061b5f21cbbf330f82400654b317b5907d311c3478ec4c4";
+    sha256 = "8458571c4c57e1cf23593ad860bb601b6a604df6217f829c2bc70dc4b5af941b";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index a34b2d2ccfa..86ceb5a233b 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "semver";
-  version = "2.2.1";
+  version = "2.7.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+    sha256 = "20ffbb50248a6141bb9eba907db0e47ee4a239ddb55fe0ada8696fc241495a9d";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index fa2b810964f..b6bf629e746 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  version = "36.0.1";
+  version = "36.2.7";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a";
+    sha256 = "b0fe5d432d922df595e918577c51458d63f245115d141b309ac32ecfca329df5";
   };
 
   buildInputs = [ python wrapPython unzip ];
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 4deac80fb06..846e8dc21a1 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "simplejson";
-  version = "3.10.0";
+  version = "3.11.1";
   name = "${pname}-${version}";
   doCheck = !stdenv.isDarwin;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2";
+    sha256 = "01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index ae08db31b2a..605ab3b3a60 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -20,18 +20,21 @@
 , whoosh
 , imagesize
 , requests
+, sphinxcontrib-websupport
 }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Sphinx";
-  version = "1.5.2";
+  version = "1.6.3";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722";
+    sha256 = "af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6";
   };
   LC_ALL = "en_US.UTF-8";
-  buildInputs = [ pytest simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
+
+  checkInputs = [ pytest ];
+  buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
   # Disable two tests that require network access.
   checkPhase = ''
     cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
@@ -48,8 +51,12 @@ buildPythonPackage rec {
     whoosh
     imagesize
     requests
+    sphinxcontrib-websupport
   ];
 
+  # Lots of tests. Needs network as well at some point.
+  doCheck = false;
+
   # https://github.com/NixOS/nixpkgs/issues/22501
   # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
   postPatch = ''
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 36b04692a9e..a6fefaa1612 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.1.12";
+  version = "1.1.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9";
+    sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898";
   };
 
   checkInputs = [ pytest mock pytest_xdist ]
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index 1478de78bba..0625dd851e5 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "stevedore";
-  version = "1.21.0";
+  version = "1.25.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12sg88ax0lv2sxr685rqdaxm9gryjrpj4fvax459zvwy1r4n83ma";
+    sha256 = "c8a373b90487b7a1b52ebaa3ca5059315bf68d9ebe15b2203c2fa675bd7e1e7e";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index fc16d77b481..8755a1d4b63 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "1.41.1";
+  version = "1.62.1";
   name = "${pname}-${version}";
 
   # Tests require network connectivity and there's no easy way to disable
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5";
+    sha256 = "7cc83b8d405a48d8a792640761519c64e373ad3514ea8bb4a9a5128f98b0b679";
   };
 
   buildInputs = [ unittest2 mock ];
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 6a0dd6a3655..bc6d7c2fba9 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.11.2";
+  version = "4.15.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14baa7a9ea7723d46f60de5f8c6f20e840baa7e3e193bf0d9ec5fe9103a15254";
+    sha256 = "6ec1dc74efacf2cda936b4a6cf4082ce224c76763bdec9f17e437c8cfcaa9953";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 7bb028b233d..5ee984941d0 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "treq";
-  version = "17.3.1";
+  version = "17.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xhcpvsl3xqw0dq9sixk80iwyiv17djigp3815sy5pfgvvggcfii";
+    sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16";
   };
 
   propagatedBuildInputs = [ twisted requests six incremental service-identity ];
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 98060536638..27ce7a99fa7 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "txaio";
-  version = "2.7.1";
+  version = "2.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lmllmjjsqzl3w4faq2qhlgkaqn1yn1m7d99k822ib7qgz18bsly";
+    sha256 = "fe2e0e4d3a06705f86bbd351fdd1f39dae61755e44162375e024acbf32eafddb";
   };
 
   buildInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index efdce1e6dba..beed6544914 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "vega";
-  version = "0.4.4";
+  version = "0.5.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm";
+    sha256 = "9871bce3a00bb775d9f7f8212aa237f99f11ca7cfe6ecf246773f5559f20c38c";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index f6d3a747ee4..df0c83605f7 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "15.0.3";
+  version = "15.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d";
+    sha256 = "02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a";
   };
 
   # Doubt this is needed - FRidh 2017-07-07
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 7e29b2b6190..48803655258 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "websockets";
-  version = "3.3";
+  version = "3.4";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "305ab7fdd86afd08c2723461c949e153f7b01233f95a108619a15e41b7a74c93";
+    sha256 = "43e5b9f51dd0000a4c6f646e2ade0c886bd14a784ffac08b9e079bd17a63bcc5";
   };
 
   disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index dda58c65f60..80c5abeb47c 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -8,11 +8,11 @@
 buildPythonPackage rec {
   pname = "widgetsnbextension";
   name = "${pname}-${version}";
-  version = "2.0.0";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "566582a84642d0c0f78b756a954450a38a8743eeb8dad04b7cab3ca66f455e6f";
+    sha256 = "e8890d87c80782ee4ea3ed9afffc89a0af8b4ff475d1608d900f728ea55f041c";
   };
 
   propagatedBuildInputs = [ notebook ];
diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix
index f25646fffdb..82364ee1d1c 100644
--- a/pkgs/development/python-modules/xlwt/default.nix
+++ b/pkgs/development/python-modules/xlwt/default.nix
@@ -8,11 +8,11 @@
 buildPythonPackage rec {
   pname = "xlwt";
   name = "${pname}-${version}";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9";
+    sha256 = "c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88";
   };
 
   buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 1d4672312a2..2f0b12618e5 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "yamllint";
-  version = "0.5.2";
+  version = "1.8.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84";
+    sha256 = "048743567ca9511e19222233ebb53795586a2cede07b79e801577e0a9b4f173c";
   };
 
   buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index 86ef792a437..4bdfbccadf1 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "yapf";
-  version = "0.16.3";
+  version = "0.17.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qxq41y65saljw0jk5fzinvynr9fhwzqcjsxxs8bn78in073x7a2";
+    sha256 = "5472f4c95ab9b9fe9f5bf74ece3c986bfafa1f98ad9e1e296d4c35d291c97856";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 0455efc3127..046b749ffa7 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -8,12 +8,12 @@
 
 let
   pname = "yarl";
-  version = "0.10.3";
+  version = "0.12.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "27b24ba3ef3cb8475aea1a655a1750bb11918ba139278af21db5846ee9643138";
+    sha256 = "fc0f71ffdce882b4d4b287b0b3a68d9f2557ab14cc2c10ce4df714c42512cbde";
   };
 
   buildInputs = [ pytest pytestrunner ];
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 8d6670aa850..0f19e7f4e5d 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -24,13 +24,13 @@
 
 let
   pname = "zeep";
-  version = "2.0.0";
+  version = "2.3.0";
 in buildPythonPackage {
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b9bd6b8772d6b505118c11d6924eb7df0decf12bbbeb43b1c27d781817361ad";
+    sha256 = "b01d81c61d7b7858b7be001615d3c995a371815f5e6902c914fea9beba30b716";
   };
 
   propagatedBuildInputs = [

From d2b5850ad08b48f92f07f8a80aaccd6535cc7077 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 20 Jul 2017 14:29:52 +0200
Subject: [PATCH 2643/3246] pythonPackages.py: 1.4.31 -> 1.4.34

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

diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix
new file mode 100644
index 00000000000..0dc3b679328
--- /dev/null
+++ b/pkgs/development/python-modules/py/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "py";
+  version = "1.4.34";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qyd5z0hv8ymxy84v5vig3vps2fvhcf4bdlksb3r03h549fmhb8g";
+  };
+
+  # Circular dependency on pytest
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Library with cross-python path, ini-parsing, io, code, log facilities";
+    homepage = http://pylib.readthedocs.org/;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f3ed5f89832..4a4f0231e15 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17170,24 +17170,7 @@ in {
   };
 
 
-  py = buildPythonPackage rec {
-    name = "py-${version}";
-    version = "1.4.31";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/py/${name}.tar.gz";
-      sha256 = "a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114";
-    };
-
-    # Circular dependency on pytest
-    doCheck = false;
-
-    meta = {
-      description = "Library with cross-python path, ini-parsing, io, code, log facilities";
-      homepage = http://pylib.readthedocs.org/;
-      license = licenses.mit;
-    };
-  };
+  py = callPackage ../development/python-modules/py { };
 
 
   pyacoustid = buildPythonPackage rec {

From 84c6e6b4d708faae843ea00a2335dd80b57fd107 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 20 Jul 2017 14:57:57 +0200
Subject: [PATCH 2644/3246] pythonPackages.setuptools_scm: 1.15.0 -> 1.15.6

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

diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix
new file mode 100644
index 00000000000..260f899f56d
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools_scm/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pip }:
+buildPythonPackage rec {
+  pname = "setuptools_scm";
+  name = "${pname}-${version}";
+  version = "1.15.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9";
+  };
+
+  buildInputs = [ pip ];
+
+  # Seems to fail due to chroot and would cause circular dependency
+  # with pytest
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/pypa/setuptools_scm/;
+    description = "Handles managing your python package versions in scm metadata";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a4f0231e15..4f3c5327cfd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21025,31 +21025,7 @@ in {
     '';
   };
 
-  setuptools_scm = buildPythonPackage rec {
-    name = "setuptools_scm-${version}";
-    version = "1.15.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/setuptools_scm/${name}.tar.gz";
-      sha256 = "0bwyc5markib0i7i2qlyhdzxhiywzxbkfiapldma8m91m82jvwfs";
-    };
-
-    buildInputs = with self; [ pip ];
-    checkInputs = with self; [ pytest ];
-    # Seems to fail due to chroot
-    doCheck = false;
-
-    checkPhase = ''
-      py.test
-    '';
-
-    meta = with stdenv.lib; {
-      homepage = https://bitbucket.org/pypa/setuptools_scm/;
-      description = "Handles managing your python package versions in scm metadata";
-      license = licenses.mit;
-      maintainers = with maintainers; [ jgeerds ];
-    };
-  };
+  setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
 
   setuptools_scm_18 = self.setuptools_scm.override rec {
     name = "setuptools_scm-${version}";

From da32df875b7484a2099ede34682150fd9cc8865f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:47:07 +0200
Subject: [PATCH 2645/3246] python.pkgs.pytest-django: fix hash patch

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

diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 0fd48568446..a91bf9d6d0e 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     # Unpin setuptools-scm
     (fetchpatch {
       url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
-      sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws";
+      sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp";
     })
   ];
 

From 2930c655570f26a149ffb14d527229940a84f3aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:47:48 +0200
Subject: [PATCH 2646/3246] python.pkgs.setuptools_scm_18: remove

because we do not keep multiple versions and it is not used anywhere.
---
 pkgs/top-level/python-packages.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f3c5327cfd..c50713ad676 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21027,19 +21027,6 @@ in {
 
   setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
 
-  setuptools_scm_18 = self.setuptools_scm.override rec {
-    name = "setuptools_scm-${version}";
-    version = "1.8.0";
-
-    # tests fail: ImportError: cannot import name 'find_files'
-    disabled = isPy35;
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/setuptools_scm/${name}.tar.bz2";
-      sha256 = "00p60v2yfqy1r58pjcx9wy6dvqd7wkpfs5z1dzwf7y75c1g3dgyx";
-    };
-  };
-
   setuptoolsDarcs = buildPythonPackage rec {
     name = "setuptools_darcs-${version}";
     version = "1.2.11";

From f30d3635f56bdf23d11a2f5126f20f1740ceb6ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 20:13:55 +0200
Subject: [PATCH 2647/3246] python.pkgs.pytest-forked: init at 0.2

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

diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
new file mode 100644
index 00000000000..4d04fa61f23
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-forked";
+  version = "0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805";
+  };
+
+  buildInputs = [ pytest setuptools_scm ];
+
+  # Do not function
+  doCheck = false;
+
+  checkPhase = ''
+    py.test testing
+  '';
+
+  meta = {
+    description = "Run tests in isolated forked subprocesses";
+    homepage = https://github.com/pytest-dev/pytest-forked;
+    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 c50713ad676..8a631f3d3c7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4223,6 +4223,8 @@ in {
     };
   };
 
+  pytest-forked = callPackage ../development/python-modules/pytest-forked { };
+
   pytest-rerunfailures = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "pytest-rerunfailures";

From e7b5917af1d5cb8e3b041ae1da6c3c0af48c4fb7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 20:23:09 +0200
Subject: [PATCH 2648/3246] python.pkgs.fetchPypi: makeOverridable

to make it easier to override packages to use a newer version.
---
 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 8a631f3d3c7..9442ccd90af 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -62,7 +62,7 @@ let
 
   graphiteVersion = "0.9.15";
 
-  fetchPypi = {format ? "setuptools", ... } @attrs:
+  fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs:
     let
       fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}:
       # Fetch a wheel. By default we fetch an universal wheel.
@@ -78,7 +78,7 @@ let
       fetcher = (if format == "wheel" then fetchWheel
         else if format == "setuptools" then fetchSource
         else throw "Unsupported kind ${kind}");
-    in fetcher (builtins.removeAttrs attrs ["format"]);
+    in fetcher (builtins.removeAttrs attrs ["format"]) );
 
   # This should become part of stdenv!
   sharedLibraryExtension = if stdenv.isDarwin then ".dylib" else ".so";

From 19183d17eda80e7b8ffab7d6d0d813e24e27ae0c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 20:24:06 +0200
Subject: [PATCH 2649/3246] mitmproxy: use older tornado

because python.pkgs.tornado is not < 4.5 anymore.
---
 pkgs/tools/networking/mitmproxy/default.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 7d36b6b4ac7..70a9366c07c 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -1,6 +1,20 @@
-{ stdenv, fetchpatch, fetchFromGitHub, python3Packages }:
+{ stdenv, fetchpatch, fetchFromGitHub, python3 }:
 
-python3Packages.buildPythonPackage rec {
+let
+  # mitmproxy needs an older tornado version
+  python = python3.override {
+    packageOverrides = self: super: {
+      tornado = super.tornado.overridePythonAttrs (oldAttrs: rec {
+        version = "4.4.3";
+        name = "${oldAttrs.pname}-${version}";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "f267acc96d5cf3df0fd8a7bfb5a91c2eb4ec81d5962d1a7386ceb34c655634a8";
+        };
+      });
+    };
+  };
+in python.pkgs.buildPythonPackage rec {
   baseName = "mitmproxy";
   name = "${baseName}-${version}";
   version = "2.0.2";
@@ -21,7 +35,7 @@ python3Packages.buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python.pkgs; [
     blinker click certifi construct cryptography
     cssutils editorconfig h2 html2text hyperframe
     jsbeautifier kaitaistruct passlib pyasn1 pyopenssl

From 84adeffc6dd9f8ca2510ce51b53559946feeebf2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:28:47 +0200
Subject: [PATCH 2650/3246] mypy: 0.511 -> 0.521

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

diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index a68b29dee24..9f568504317 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -3,14 +3,14 @@
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "mypy";
-  version = "0.511";
+  version = "0.521";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vmfyi6zh49mi7rmns5hjgpqshq7islxwsgp80j1izf82r8xgx1z";
+    sha256 = "9d30df20cd937b80cfc6007d75426f27a232789cfa288c63bf9370f2542c9658";
   };
 
   propagatedBuildInputs = [ lxml typed-ast ];

From 1e4029fa0a36e9948c3df7afd276e9651cea1a85 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:34:58 +0200
Subject: [PATCH 2651/3246] python.pkgs.python-editor: fix by disabling tests

---
 pkgs/development/python-modules/python-editor/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix
index bb64ff0e241..d2941e4c572 100644
--- a/pkgs/development/python-modules/python-editor/default.nix
+++ b/pkgs/development/python-modules/python-editor/default.nix
@@ -10,8 +10,12 @@ buildPythonPackage rec {
     sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565";
   };
 
+  # No proper tests
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "A library that provides the `editor` module for programmatically";
     homepage = https://github.com/fmoo/python-editor;
+    license = licenses.asl20;
   };
 }

From b1c1892e2d5b2d47d1b89f22331f479c7d947096 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:40:49 +0200
Subject: [PATCH 2652/3246] python.pkgs.odfpy: 0.9.6 -> 1.3.5

---
 .../python-modules/odfpy/default.nix          | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +------------
 2 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/odfpy/default.nix

diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix
new file mode 100644
index 00000000000..a80cd827c6d
--- /dev/null
+++ b/pkgs/development/python-modules/odfpy/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "odfpy";
+  version = "1.3.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6f8163f8464868cff9421a058f25566e41d73c8f7e849c021b86630941b44366";
+  };
+
+  checkPhase = ''
+    pushd tests
+    rm runtests
+    for file in test*.py; do
+        python  $file
+    done
+  '';
+
+  meta = {
+    description = "Python API and tools to manipulate OpenDocument files";
+    homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9442ccd90af..c8aa5048f5e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7365,25 +7365,7 @@ in {
     };
   };
 
-  odfpy = buildPythonPackage rec {
-    version = "0.9.6";
-    name = "odfpy-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/odfpy/${name}.tar.gz";
-      sha256 = "e458f969f1ccd7ed77d70a45fe69ad656ac61b39e36e4d32c42d4e3216030891";
-    };
-
-    buildInputs = with self; with pkgs; [ ];
-
-    propagatedBuildInputs = with self; [ ];
-
-    meta = {
-      description = "Python API and tools to manipulate OpenDocument files";
-      homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
-      license = licenses.asl20;
-    };
-  };
+  odfpy = callPackage ../development/python-modules/odfpy { };
 
   oger = buildPythonPackage rec {
     name = "oger-${version}";

From fec771fbb4aa697a94ccce32528e4e7604ff01c6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:44:16 +0200
Subject: [PATCH 2653/3246] python.pkgs.pyx: disable tests to fix build

---
 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 c8aa5048f5e..eaca28dec6e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18145,6 +18145,9 @@ in {
     };
 
     disabled = !isPy3k;
+    
+    # No tests in archive
+    doCheck = false;
 
     meta = {
       description = "Python package for the generation of PostScript, PDF, and SVG files";

From 7e6be0968b9f2116410e9ae6ca2a53d2740bff00 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:48:01 +0200
Subject: [PATCH 2654/3246] python.pkgs.raven: fix build

---
 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 eaca28dec6e..e31c04cb759 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8192,6 +8192,8 @@ in {
     # see https://github.com/getsentry/raven-python/blob/master/setup.py
     doCheck = false;
 
+    propagatedBuildInputs = optionals (!isPy3k) [ self.contextlib2 ];
+
     meta = {
       maintainers = with maintainers; [ primeos ];
     };

From 492390cfad41c6936a4ac6edf6f6370ac8bdf8df Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:52:18 +0200
Subject: [PATCH 2655/3246] python.pkgs.relatorio: fix build

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

diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index f92f7723543..1010766cf2d 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonPackage, genshi, lxml }:
+{ lib, fetchurl, buildPythonPackage, genshi, lxml, python_magic }:
 
 buildPythonPackage rec {
   pname = "relatorio";
@@ -11,6 +11,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     genshi
     lxml
+    python_magic
   ];
   meta = {
     homepage = http://relatorio.tryton.org/;

From d019bb0123b134d3f1f50d2ae67321d6886ae58c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:56:05 +0200
Subject: [PATCH 2656/3246] python.pkgs.robomachine: fix build

---
 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 e31c04cb759..eb730521482 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20319,6 +20319,10 @@ in {
       rm "$out/bin/"*.bat
     '';
 
+    postPatch = ''
+      substituteInPlace setup.py --replace "argparse" ""
+    '';
+
     meta = {
       description = "Test data generator for Robot Framework";
       homepage = https://github.com/mkorpela/RoboMachine;

From 3efa08baea6a38f3957d1a67cd860ba85dbd864a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:57:54 +0200
Subject: [PATCH 2657/3246] python.pkgs.semver: disable tests to fix build

---
 pkgs/development/python-modules/semver/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index 86ceb5a233b..2d592962558 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -10,6 +10,9 @@ buildPythonPackage rec {
     sha256 = "20ffbb50248a6141bb9eba907db0e47ee4a239ddb55fe0ada8696fc241495a9d";
   };
 
+  # No tests in archive
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Python package to work with Semantic Versioning (http://semver.org/)";
     homepage = https://github.com/k-bx/python-semver;

From b101bdddacad04a24fd000e1db63c22522f711c4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 11:04:45 +0200
Subject: [PATCH 2658/3246] python.pkgs.jsonpatch: 1.11 -> 1.16

---
 .../python-modules/jsonpatch/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +-----------
 2 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/jsonpatch/default.nix

diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix
new file mode 100644
index 00000000000..39f36b1d949
--- /dev/null
+++ b/pkgs/development/python-modules/jsonpatch/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, jsonpointer
+}:
+
+buildPythonPackage rec {
+  pname = "jsonpatch";
+  version = "1.16";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f025c28a08ce747429ee746bb21796c3b6417ec82288f8fe6514db7398f2af8a";
+  };
+
+  # test files are missing
+  doCheck = false;
+  propagatedBuildInputs = [ jsonpointer ];
+
+  meta = {
+    description = "Library to apply JSON Patches according to RFC 6902";
+    homepage = "https://github.com/stefankoegl/python-json-patch";
+    license = lib.licenses.bsd2; # "Modified BSD license, says pypi"
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb730521482..3b16bd36444 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6785,22 +6785,7 @@ in {
     };
   };
 
-  jsonpatch = buildPythonPackage rec {
-    name = "jsonpatch-1.11";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jsonpatch/${name}.tar.gz";
-      sha256 = "22d0bc0f5522a4a03dd9fb4c4cdf7c1f03256546c88be4c61e5ceabd22280e47";
-    };
-
-    propagatedBuildInputs = with self; [ jsonpointer ];
-
-    meta = {
-      description = "Library to apply JSON Patches according to RFC 6902";
-      homepage = "https://github.com/stefankoegl/python-json-patch";
-      license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi"
-    };
-  };
+  jsonpatch = callPackage ../development/python-modules/jsonpatch { };
 
   jsonpointer = buildPythonPackage rec {
     name = "jsonpointer-1.9";

From f6eb190e7030feac015bd1624d0dbb6825e28a9e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 11:17:54 +0200
Subject: [PATCH 2659/3246] python.pkgs.pyrtlsdr: disable tests to fix build

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

diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix
new file mode 100644
index 00000000000..4ce373ee7ad
--- /dev/null
+++ b/pkgs/development/python-modules/pyrtlsdr/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, rtl-sdr
+}:
+
+buildPythonPackage rec {
+  pname = "pyrtlsdr";
+  version = "0.2.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dd041143b68628c713c2227c78c40b0b4a0cb5d08df116f7bdc5f83c529be0e4";
+  };
+
+  postPatch = ''
+    sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
+  '';
+
+  # No tests that can be used.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)";
+    homepage = https://github.com/roger-/pyrtlsdr;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b16bd36444..359e50f0cbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8452,26 +8452,7 @@ in {
   };
 
 
-  pyrtlsdr = buildPythonPackage rec {
-    name = "pyrtlsdr-0.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyrtlsdr/${name}.zip";
-      sha256 = "cbb9086efe4320858c48f4856d09f7face191c4156510b1459ef4e5588935b6a";
-    };
-
-    postPatch = ''
-      sed "s|driver_files =.*|driver_files = ['${pkgs.rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
-    '';
-
-    meta = {
-      description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)";
-      homepage = https://github.com/roger-/pyrtlsdr;
-      license = licenses.gpl3;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { };
 
   random2 = self.buildPythonPackage rec {
     name = "random2-1.0.1";

From 7a6b150f94b601e4c865f70fec31391d14fa4611 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 11:22:30 +0200
Subject: [PATCH 2660/3246] python.pkgs.sqlmap: 1.0.11 -> 1.1.18

---
 .../python-modules/sqlmap/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +-----------
 2 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/sqlmap/default.nix

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
new file mode 100644
index 00000000000..a440abb5149
--- /dev/null
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "sqlmap";
+  version = "1.1.8";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f8f88fc7fe0ba81a7558902f87df31c052e27404caa26a160174747afcaebe49";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "http://sqlmap.org";
+    license = licenses.gpl2;
+    description = "Automatic SQL injection and database takeover tool";
+    maintainers = with maintainers; [ bennofs ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 359e50f0cbf..0d93e5716df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21328,21 +21328,7 @@ in {
     };
   };
 
-  sqlmap = buildPythonPackage {
-    name = "sqlmap-1.0.11";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sqlmap/sqlmap-1.0.11.tar.gz";
-      sha256 = "1x4amyjqnd9j5g2kp9nvg8pr5sqzbhr8gd0m6d671bshvgj568vr";
-    };
-
-    meta = with pkgs.stdenv.lib; {
-      homepage = "http://sqlmap.org";
-      license = licenses.gpl2;
-      description = "Automatic SQL injection and database takeover tool";
-      maintainers = with stdenv.lib.maintainers; [ bennofs ];
-    };
-  };
+  sqlmap = callPackage ../development/python-modules/sqlmap { };
 
   pgpdump = self.buildPythonPackage rec {
     name = "pgpdump-1.5";

From 673e0520c619acdd4c646987eb3461242e1b6c9e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 16:21:51 +0200
Subject: [PATCH 2661/3246] python.pkgs.click: disable tests

because of broken tests
---
 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 0d93e5716df..86c2022e38c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2910,8 +2910,8 @@ in {
       py.test tests
     '';
 
-    # Python 3.5 str/bytes-like errors with reading files
-    doCheck = !isPy3k;
+    # https://github.com/pallets/click/issues/823
+    doCheck = false;
 
     meta = {
       homepage = http://click.pocoo.org/;

From da006013065d1c6f31009ac35eb18933fd50f629 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 17:38:35 +0200
Subject: [PATCH 2662/3246] pytest fixup

---
 pkgs/applications/office/fava/default.nix | 2 +-
 pkgs/top-level/python-packages.nix        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 437a0cbbd13..7bc549dd0fc 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz";
   };
 
-  buildInputs = with python3Packages; [ pytest_30 ];
+  checkInputs = with python3Packages; [ pytest ];
 
   checkPhase = ''
     # pyexcel is optional
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86c2022e38c..551aed36669 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4129,7 +4129,7 @@ in {
     };
   };
 
-  pytest = self.pytest_30;
+  pytest = self.pytest_32;
 
   pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};
 
@@ -4137,7 +4137,7 @@ in {
 
   pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
 
-  pytest_30 = callPackage ../development/python-modules/pytest{
+  pytest_32 = callPackage ../development/python-modules/pytest{
     hypothesis = self.hypothesis.override {
       # hypothesis requires pytest that causes dependency cycle
       doCheck = false;

From e0a23575d226e2ffb29ea76a7dd0867ecda541a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 17:41:36 +0200
Subject: [PATCH 2663/3246] python.pkgs.pyzmq: fix broken test

which I think will be solved in 17.0.0 which should be released within
weeks.
---
 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 551aed36669..4ed3b072749 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25077,7 +25077,7 @@ EOF
     # Disable broken test
     # https://github.com/zeromq/pyzmq/issues/799
     checkPhase = ''
-      py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send"
+      py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send and not test_recv_json_cancelled"
     '';
   };
 

From 997043c1372b16f39000238874aff263bdeab153 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 17:51:18 +0200
Subject: [PATCH 2664/3246] bepasty: move out of python-packages

because its a (web) application and thus doesn't belong there.
---
 nixos/modules/services/misc/bepasty.nix |  2 +-
 pkgs/tools/misc/bepasty/default.nix     | 34 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 pkgs/top-level/python-packages.nix      | 27 --------------------
 4 files changed, 37 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/tools/misc/bepasty/default.nix

diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index 4d78cddcb54..c499e428af3 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixos/modules/services/misc/bepasty.nix
@@ -3,7 +3,7 @@
 with lib;
 let
   gunicorn = pkgs.pythonPackages.gunicorn;
-  bepasty = pkgs.pythonPackages.bepasty-server;
+  bepasty = pkgs.bepasty;
   gevent = pkgs.pythonPackages.gevent;
   python = pkgs.pythonPackages.python;
   cfg = config.services.bepasty;
diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
new file mode 100644
index 00000000000..cd3a149b378
--- /dev/null
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -0,0 +1,34 @@
+{ python
+, lib
+}:
+
+with python.pkgs;
+
+buildPythonPackage rec {
+  pname = "bepasty";
+  version = "0.4.0";
+  name = "${pname}-${version}";
+
+  propagatedBuildInputs = [
+    flask
+    pygments
+    xstatic
+    xstatic-bootbox
+    xstatic-bootstrap
+    xstatic-jquery
+    xstatic-jquery-file-upload
+    xstatic-jquery-ui
+    xstatic-pygments
+  ];
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4";
+  };
+
+  meta = {
+    homepage = http://github.com/bepasty/bepasty-server;
+    description = "Binary pastebin server";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.makefu ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 663258dec39..2629b6112e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1228,6 +1228,8 @@ with pkgs;
     pythonPackages = python2Packages;
   };
 
+  bepasty = callPackage ../tools/misc/bepasty { };
+
   bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner;
 
   bgs = callPackage ../tools/X11/bgs { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ed3b072749..765b36f63fa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27380,33 +27380,6 @@ EOF
     };
   };
 
-  bepasty-server = buildPythonPackage rec {
-    name = "bepasty-server-${version}";
-    version = "0.4.0";
-    propagatedBuildInputs = with self;[
-      flask
-      pygments
-      xstatic
-      xstatic-bootbox
-      xstatic-bootstrap
-      xstatic-jquery
-      xstatic-jquery-file-upload
-      xstatic-jquery-ui
-      xstatic-pygments
-    ];
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/b/bepasty/bepasty-${version}.tar.gz";
-      sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4";
-    };
-
-    meta = {
-      homepage = http://github.com/bepasty/bepasty-server;
-      description = "Binary pastebin server";
-      license = licenses.mit;
-      maintainers = [ maintainers.makefu ];
-    };
-  };
-
   xgboost = buildPythonPackage rec {
     name = "xgboost-${version}";
 

From 63b66bf960d4e8749349bb593a776d472caaee88 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 17:53:19 +0200
Subject: [PATCH 2665/3246] python.pkgs.WSGIProxy: disable python3

---
 pkgs/tools/misc/bepasty/default.nix | 2 +-
 pkgs/top-level/python-packages.nix  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
index cd3a149b378..67faf925a27 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -4,7 +4,7 @@
 
 with python.pkgs;
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   pname = "bepasty";
   version = "0.4.0";
   name = "${pname}-${version}";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 765b36f63fa..3aaea00fa24 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26213,6 +26213,8 @@ EOF
       paste six
     ];
 
+    disabled = isPy3k; # Judging from SyntaxError
+
     meta = with stdenv.lib; {
       description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other";
       homepage = "http://pythonpaste.org/wsgiproxy/";

From 5c463017449b28f6d01762a9ec2bf0b8d92ea889 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:38:22 +0200
Subject: [PATCH 2666/3246] python.pkgs.pytest_30: keep this version

---
 .../development/python-modules/pytest/3_0.nix | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  7 +++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest/3_0.nix

diff --git a/pkgs/development/python-modules/pytest/3_0.nix b/pkgs/development/python-modules/pytest/3_0.nix
new file mode 100644
index 00000000000..487fe1b73c7
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/3_0.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
+, setuptools_scm
+}:
+buildPythonPackage rec {
+  version = "3.0.7";
+  pname = "pytest";
+  name = "${pname}-${version}";
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
+  };
+
+  buildInputs = [ hypothesis setuptools_scm ];
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse);
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
+    platforms = 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 3aaea00fa24..4731839272a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4137,6 +4137,13 @@ in {
 
   pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
 
+  pytest_30 = callPackage ../development/python-modules/pytest/3_0.nix {
+    hypothesis = self.hypothesis.override {
+      # hypothesis requires pytest that causes dependency cycle
+      doCheck = false;
+      pytest = null;
+    };
+  };
   pytest_32 = callPackage ../development/python-modules/pytest{
     hypothesis = self.hypothesis.override {
       # hypothesis requires pytest that causes dependency cycle

From 61da59858c15cf88798e8ef92f94e8f9d3390a38 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:39:14 +0200
Subject: [PATCH 2667/3246] buku: python3 as parameter instead of python

---
 pkgs/applications/misc/buku/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix         | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index ea3ca107d24..321e12877eb 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ stdenv, python3, fetchFromGitHub }:
 
-with pythonPackages; buildPythonApplication rec {
+with python3.pkgs; buildPythonApplication rec {
   version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck
   name = "buku-${version}";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2629b6112e2..f1928feb574 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1268,9 +1268,7 @@ with pkgs;
 
   burp = callPackage ../tools/backup/burp { };
 
-  buku = callPackage ../applications/misc/buku {
-    pythonPackages = python3Packages;
-  };
+  buku = callPackage ../applications/misc/buku { };
 
   byzanz = callPackage ../applications/video/byzanz {};
 

From 10df572a034cfc92d3faddfbb4dd4cfd0afd2f42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:39:49 +0200
Subject: [PATCH 2668/3246] python.pkgs.pytest: use fetchPypi

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

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 6e450afbef9..32ad71de704 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py
+{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
 , setuptools_scm
 }:
 buildPythonPackage rec {
@@ -11,8 +11,8 @@ buildPythonPackage rec {
     rm testing/test_argcomplete.py
   '';
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce";
   };
 

From 34021f595dde8d9263f17aa95bcfba0ca337a33c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:40:25 +0200
Subject: [PATCH 2669/3246] python.pkgs.pytest-catchlog: disable tests

because pytest_30 is required but we don't override the package set
inside the package set.
---
 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 4731839272a..b0cdb3359b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4191,6 +4191,9 @@ in {
 
     checkPhase = "make test";
 
+    # Requires pytest < 3.1
+    doCheck = false;
+
     meta = {
       license = licenses.mit;
       homepage = https://pypi.python.org/pypi/pytest-catchlog/;

From 0081ba712d585117132af655c56ca62db8f47dc9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:41:00 +0200
Subject: [PATCH 2670/3246] python.pkgs.cgroup-utils: fix build

---
 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 b0cdb3359b7..c48d48a2d15 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1672,6 +1672,10 @@ in {
       sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc";
     };
 
+    postPatch = ''
+      substituteInPlace setup.py --replace "argparse" ""
+    '';
+
     meta = {
       description = "Utility tools for control groups of Linux";
       maintainers = with maintainers; [ layus ];

From 78c7b40062f0b913038c25ab471e9e98011e3b0e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 19:03:14 +0200
Subject: [PATCH 2671/3246] python.pkgs.flask-pymong: 0.3.1 -> 0.5.1

---
 .../python-modules/Flask-PyMongo/default.nix  | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +---------
 2 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/Flask-PyMongo/default.nix

diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
new file mode 100644
index 00000000000..5518dc382a8
--- /dev/null
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, fetchPypi
+, flask
+, pymongo
+, lib
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "Flask-PyMongo";
+  name = "${pname}-${version}";
+  version = "0.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2baaa2ba5107d72b3a8bd4b5c0c8881316e35340ad1ae979cc13f1f3c8843b3d";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  # Tests seem to hang
+  doCheck = false;
+
+  propagatedBuildInputs = [ flask pymongo ];
+
+  meta = {
+    homepage = "http://flask-pymongo.readthedocs.org/";
+    description = "PyMongo support for Flask applications";
+    license = lib.licenses.bsd2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c48d48a2d15..30d3129b894 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9853,23 +9853,7 @@ in {
     };
   };
 
-  flask-pymongo = buildPythonPackage rec {
-    name = "Flask-PyMongo-${version}";
-    version = "0.3.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flask-PyMongo/${name}.tar.gz";
-      sha256 = "0305qngvjrjyyabf8gxqgqvd9ffh00gr5yfrjf4nncr2my9svbyd";
-    };
-
-    propagatedBuildInputs = with self; [ flask pymongo_2_9_1 ];
-
-    meta = {
-      homepage = "http://flask-pymongo.readthedocs.org/";
-      description = "PyMongo support for Flask applications";
-      license = licenses.bsd2;
-    };
-  };
+  flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { };
 
   flask-restful = buildPythonPackage rec {
     name = "Flask-RESTful-${version}";

From 2923300a5fdf41ef4620f7f33355df7118920263 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 19:03:41 +0200
Subject: [PATCH 2672/3246] python.pkgs.sqlalchemy: use pytest_30 and don't use
 pytest_xdist

---
 .../python-modules/sqlalchemy/default.nix          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index a6fefaa1612..27a3c4ac2ae 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,7 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, pytest
+, pytest_30
 , mock
 , pytest_xdist
 , isPy3k
@@ -18,12 +18,12 @@ buildPythonPackage rec {
     sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898";
   };
 
-  checkInputs = [ pytest mock pytest_xdist ]
-    ++ lib.optional (!isPy3k) pysqlite;
-
-  # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
-  # acceptable reason to make all dependents unavailable on Python 3 as well
-  #doCheck = !(isPyPy || isPy3k);
+  checkInputs = [
+    pytest_30
+    mock
+#     Disable pytest_xdist tests for now, because our version seems to be too new.
+#     pytest_xdist
+  ] ++ lib.optional (!isPy3k) pysqlite;
 
   checkPhase = ''
     py.test

From 7726a1ec25854e85aee988111fae83d767a5b179 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 19:34:14 +0200
Subject: [PATCH 2673/3246] python.pkgs.sphinxcontrib-websupport: init at 1.0.1

---
 .../sphinxcontrib-websupport/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinxcontrib-websupport/default.nix

diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
new file mode 100644
index 00000000000..fa308dc37bb
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "sphinxcontrib-websupport";
+  version = "1.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  doCheck = false;
+
+  meta = {
+    description = "Sphinx API for Web Apps";
+    homepage = http://sphinx-doc.org/;
+    license = lib.licenses.bsd2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30d3129b894..ff0edb75b44 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22121,6 +22121,8 @@ in {
     doCheck = false;
   };
 
+  sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
+
   hieroglyph = callPackage ../development/python-modules/hieroglyph { };
 
   sphinx_rtd_theme = buildPythonPackage (rec {

From 1b613047619e952aea04f54d904ade98d2dfc7ff Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 26 Aug 2017 03:12:54 +0900
Subject: [PATCH 2674/3246] firefox-bin: 55.0 -> 55.0.3

---
 .../browsers/firefox-bin/release_sources.nix  | 762 +++++++++---------
 1 file changed, 381 insertions(+), 381 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index cba850e33d5..8a8298ef818 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,955 +1,955 @@
 {
-  version = "55.0.2";
+  version = "55.0.3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ach/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ach/firefox-55.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "3824d633f5aec2bf1f9c6809ddde44a85081dcceee05898275b8c4c6dc26113e453ad701d4c05b5a81c81fe2ac42baf37fa2fa9c22129451435eb78791df51b1";
+      sha512 = "fdbe702f129c2e8c749fed009609c475282638b5e920defeb65b94cce807f96f8f07d02d916c91b3d50cb9f909b419d2c635b3914f8f059251f33f93b887c797";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/af/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/af/firefox-55.0.3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "e3ad3df3469ced1f12fad5a6cc16c7be6754867bbd2871aaa07a9f49a26c3d8c07363892cfae0e8245d9020c5448e82d01d4d2b6c7fd93a7083b2d6480aec689";
+      sha512 = "b5ace58a9cffa219e3a56eb5e427a482dcce4f2e4ac2a6955c3bea6c40b48940763129499803e86742ca3407d4a80973094d9bfce869bc2a321b443258fa5806";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/an/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/an/firefox-55.0.3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "1ace2fbf01cc30f70ba7dba7803f4052ec8c05f93e174225e9aff14a67e8b7214dfba43080b4c50c761b80801a9e16a92c0f753734cdc34dd7b482cf023ff0b1";
+      sha512 = "d737a3425592ecc474399feb2d1f82fd7cdab362ed406f26671ddb3ce88c8736b17627ac279c12551c2b27432f9ba8bb3dc93b6ca30124cd155848a63bccff06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ar/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ar/firefox-55.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "a1dd8e128bec748c37b849c8c480c9f106c614440bc4f8d3b17b28cbf0558b8e6524a0b459d2ed5f6031133056f0f73826691b9ccc1a9efd216ffbc3f64a6eb2";
+      sha512 = "31e834d78399549ef670e78d2ff9befad6d300dc327853d1435d02533379e23ae38cf3dfff1222e314165c8f80e2e4fb9f364a9a3b33fb3d0aaed3259414d321";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/as/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/as/firefox-55.0.3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "995993ac28d2ef309e025d15f75ce29c3cd028f79bcbc4aab65d1e10efda2887faaabc6beb8277baf81ef256d8365c062e6362f2dfa91b37a65930ba5cb59c0f";
+      sha512 = "8393861ad7e2ab0a070ba32f38afb59bfabba4510f0f9a85273b4300fd7b2f45461d8e2c0a485e1d5776533d4b0bb8d06c78efc2a2a0c87af55fe5eede33e6f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ast/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ast/firefox-55.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "8bd9c1dbc549b7b8024c28f026e2b9b5a099b80904938955372e157016b4ddc729a378502fb7973a9352bbdd09646942241eb23d8a7528874ff500b0aaade77b";
+      sha512 = "e091884962a239f65f7bee05e1bdc516091b89ae7be1dd6517c4ae3b8ad34af0c49c04d365114cceca40a6a8af229256f100e4a1aec09e7e284fd6cbee497e54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/az/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/az/firefox-55.0.3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "38ba0acf054195274043470d4c71c8f2800ea543806ab0d6f39b0545fe634c742072900075c319593e5a75b8403dc2228c049cd9c359497a71627d74bb750bbb";
+      sha512 = "3324d8041257adf120d08537ffb94e90ff1d701bd60b9bc3016570887c0a2ff2d10a406de599be8bf5146b62647f4b95b87e9fb48736c4d0e747be03a35b6d09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/be/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/be/firefox-55.0.3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "dde5852d9d000b81ef460e49c540fdf2731ba836d5df50771c551b96f857263552389dbe97289b6d95019630774c1e8b8a85a90ca94ac275410c1ea18bcde833";
+      sha512 = "65861965c8f3c5e37d9b6e919f0ec506340b38a2cfe71905b43802ff3cceaa062ffb49516541253a8c944ea2a6b0c09d6523da6f5b8419857921c08a53b70062";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bg/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bg/firefox-55.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "e0e642f9a7e6c1968f77cd34722acc77de84994b92745048093abb123d79ce9206945c9eea519b10a293ea349c7922937c27e6d9e7b6709b6aef388058f6e6ef";
+      sha512 = "948b2469ade253a0c174d996053e4855e477f93f6a35351c3c6db10aba6e9894fa850289aa90bc7d830edc8ddad6ddce78f6bf5047f91701152c4b7dea10accc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bn-BD/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-BD/firefox-55.0.3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "49834af50d8f8e547f504a504d6161c07675cdcd98bb8d964d5f6c72c76d22925865677e64a90175ddb3312c8a9efc1d113e76aaa914e9d6315f635dc3095bac";
+      sha512 = "3cba3214ff62b5fbed875e7af40c04382564caa3ab613f44d25aba56eefca893dace583afbae172153fcbf1adc13cd0545e3c80ee72631862f46e4211589e103";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bn-IN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-IN/firefox-55.0.3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "664692ced004e94e61ff9c44618931f62b316ddf0b56eb83dab7d4fe69a5016b3b5efd5a02c49e3ba41cb51b2298096c74ff2fa8131731bf79708a23203ce350";
+      sha512 = "8a9335fce85a4787c091053842a45e2234ba13ac75568209d965f28a8d40ec42f8eef8da62878c0f8f17b6db052f72a00798bf2bbc37c7de9c861efcebd9e41a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/br/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/br/firefox-55.0.3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "e9ba0f8bfff1929820ca0cca3de5c377c8c483e4ba46b3064cb210f971aebbf2f5cc67d13a05e1c19e988006ff37dfee607d00317162f5146dd8a1b7e167ee83";
+      sha512 = "1b08b96c1030302ac47baafbaec63ce87a5744a284c20a6432208d0e3c7750f15941f89c69fe3f8a7875a7eaf7a9872855c72c4157447799edc2ba6bcf3768e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bs/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bs/firefox-55.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "41fc17c916c3c23cbbcccdad686ebbbee3ff9d68b0b72f8e8e8819e438df2fda7aa954be3a0076d91fb5c05b507873a2bca90e2b661542b86ffb0bee3cf6bb77";
+      sha512 = "35e3a1c0b098c5ccf68e2b4547cedc513d31ca62897e0a6ceb6283e0af565ee7a1da847459217dca94c3e192e5b643dd0fb1e302ca54d866f7023841722f8aef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ca/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ca/firefox-55.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d0880ef0357a3e8d9f3d419390b8bbd95c75d6f50469a63e7c1e0182cf98e85c942d75dd1c3736c856deace3f49c6751f9e8e1b320fb0aa73a78129340e5467e";
+      sha512 = "372881da1ab01c36e06c9bbc7a67c12adf2af454afb8baee79b506d65e99754340e0650a7c16f01ee6735d2c2bad6ba82ea437f3d6265f17efe2ba26d4b55471";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/cak/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cak/firefox-55.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "62a6e53dd82ef2bc2881c1aa912bdcd9628123b13a769f43d640c05c1a02dde9ad5d69f486c2858c68ddac7dcd2275fd3970e56d48f4e842a3757f453e6843fd";
+      sha512 = "447414a13729e3eef3311802c4714a00c707f3567d4d90687420972f57f4ab7079afcc741f7ea0e992f916786919c27a6670424036b50fac3be52bfe8eefbc8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/cs/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cs/firefox-55.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "719e052b32b1e080b4627f286bacd9b3bc2b8f40cf8b79ba2643f08220a05201e649fa98f679c4fb926a23355a12ef744ff7b5ef819d9b825d5a5ae790f7a6ec";
+      sha512 = "2eb5388d2dfccc213c730cf605b134e51c68496c93dec255c9ede8820de2d40968371e989f125c4ee938622312e782d6d68b28c836e7c8cfbfbfb100ddf59441";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/cy/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cy/firefox-55.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "ffbb24e8720f354c2a20d5d13d6b3f003a0b3d1606da231cc9c4750d837efeedb4a789fc4b787463d0e6f0fd9492583fc24b791de6ab4eeff6f2258dc2206f93";
+      sha512 = "f27a12d1e9c9c5712f2da5236a2d81b8958eb8a208cabb8b6e1e75e40579bcefd9ea17a64d5f530248ae8f288ac1628ee350b1b280aedf3dfb8948d5cb800983";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/da/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/da/firefox-55.0.3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "62a53b150f4dce8d09e63c44bc4ec5d3657b8db624a71415b666101b5a4ff2c98da3ab4e0587bef824ad0303da78060c6ac5409747291dd021d2d62437417928";
+      sha512 = "f8957fea57b1f48ea18eb65bcf5caf3d5f71aa3ad44c697861d9b7c7655cfa99c66a49b034eacb8530d42a66b2a458ce4a4c97890bf8f28cb06d24d000517c57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/de/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/de/firefox-55.0.3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "feddf89febf177d83e816900cdfcfc03c119c4aebb026586cee127d541db7d7c37c6d47e989402a657e51d66d7564e13016926f16cd3510ae0cbf6b4f767aeba";
+      sha512 = "11a2076a5502d2edcf91a0b1e8776f71be3e5970885843096ab2e576dc5910da6b758b9372caba83fb5a6c20fafbc1dfa8d0a238020b32f93a7ffe50ba1ec430";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/dsb/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/dsb/firefox-55.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "ceb9fe65ef661d721c43879082c1d99c90f293ff38137c7ff2994f0a7b53086452f139f3ccd2c15fdba1b09a16abe560d4a81499926830f06b5311eb05746157";
+      sha512 = "e788a73b2b77d2cf6aac1557814df1d88ad9e036b1d58218781dc284433f3b8b9e1a34be4c0bceabb99b6238dca2f9dee8f5e97a994e09f5fae175eec7e34b9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/el/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/el/firefox-55.0.3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "13c7ffaa22e1b9968b643d4cd6e4b46310476592ec894293be1f0179e9c16c02944c34e2b25fb5a0dcea5d374c8bd5258a370df1539b967b96b6781fdfbde753";
+      sha512 = "03099311390384c652e7dbbcb41d60eae522a1ecaa69b6e17e214fc0e06f81739456a2543adf9808b2b08d6b0c0b84dbea6168c70be4cc1ef71a04e81164792b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/en-GB/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-GB/firefox-55.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "566ff317b62ad2158866ca7f50509eed0272e00029686719c1843ea742d252c45137f9d6f867b0ca88e63e84a7f46444b9f6d669bca31f6bb2566edffa167f75";
+      sha512 = "e971fdbb2cbe2e080f75900df9a32506e26eb07859f635c9f9b4738ad20cf7bc939bfe6b8a91455178d124a29d869f5f960ad9bac64ac863d31dae3a2f4ab2b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/en-US/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-US/firefox-55.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "93092a136943c8901a1d62d34582dc3d6c5a71629a274e54650901eddde89287d489572605a0d937f16d3ff9cf2b0e95ec8dd90acaf7da979f599623d1b9ff99";
+      sha512 = "99f270542b0d77a0bf2ce7926dcff04a356785af9269854eb12bd50c179e1d5b6db66885900a0f1dbfd1ae50a40298a2be7610b55380886719fbb3890f9e66fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/en-ZA/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-ZA/firefox-55.0.3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "5898f88d188daed37bd8b5bf523d94bc3ae8064a3a020b463658f333140c4cbdecc24f053bc898dd2e81f3e945a2d0ae63a05bbeaf27f8ac94a7477f697e354a";
+      sha512 = "837b11040ac50920f41400bb7764864a42fa84da9da6c606c9475f862cec3bcae8ea1bba3b72424c668d9bc036a00c7c360ad248285ca8d6f6d94aa46c80b868";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/eo/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eo/firefox-55.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "ca234eba852ce9ed736490e3db9185baba4d190fc631133747219dce7b24fdcb4fc3bf348de21bc81cc02cd818660158a94f0d2129a6869e9dc88f0b7a426c95";
+      sha512 = "0d7c650fa35e75a6af940bdb4662e03fe4a76f5fc3750ec4f813bc6570fce252256f6fd1e6b26a15c6f19c819a0e0bb2a26325015feb37b4f5318a018a8c09ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-AR/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-AR/firefox-55.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "c86897d532114b6e9039e4eff546e724177b9de1049af2634580e8ed8f2de54484fc9573fca1640ad544b8db092a477f3d855227ae1ddf2766fb5c453cfea876";
+      sha512 = "442370c45f57cf0a63da9d7b33e377b766d71c80606144d4cdfa956c6d4d5c91314cd3f9b7db007cefc762dd2cf79bbe1999842f1ff74bcd85affb7ed1305158";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-CL/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-CL/firefox-55.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "868ab44893d60c66da1389dd36c8b84bb44a52f0daae20a7de247bd22aa4fe3b9c5d22dd75fcfaf3b36933fdfd91f694d9758ec9ea6cd40f1882a3a721889742";
+      sha512 = "ce5cc274961638c396ea3350857c79fcf39bfd116a9f3ceda74bef9d5eee2dfab54b12d77cd9e0a01bf98856f0b7eb8ca155fab50f444a4eab785086e8045734";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-ES/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-ES/firefox-55.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "39c9841c7a1f6e1bd9028410b49f83d57193a6995053e7056d2f1884ac6706bc54972a531031b8e14a2aabeb0c8cc1f297bb580676b4c6e0b33edd5dbd6e43eb";
+      sha512 = "45aa1e6e9df4bde4fe67296ce735eac1356e20bdfde638944f809338869ce243c16a23bd6c066cc3df54cd1a8b7ed1937eeb56f556803dceb3b1fcdc2ecc273d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-MX/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-MX/firefox-55.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "d20bf48f886f739215fe2e46c30b355fb6113859ddc6c917c6936c119e3aa105161174f74d77e63f7bd59619b85f21353dba19be4f98d114551d585eccb70004";
+      sha512 = "17c4ccef75bbe794d398121beaccdc3110d58991d5a0bfca857914c8fca5c866b45d1e4cd07e2be8f4f029a058179d61c774b74f1e9c6fb513e547a79ea901cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/et/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/et/firefox-55.0.3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "a794a793a7e430c643007d20898ff21f25a364d0629c022073747d15882f1470ee6b50c1bc6ba2d4830d09598044086d81f6f81555e23c7f3492eb8ee7b29835";
+      sha512 = "072b65588b1829309af5b84fe46e15974f8689e07be1bd24fd09cf5ae403d66ff196b1deac32de70d97fd5984d5579aa991a9fcde4df8fdd1884050507dab13f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/eu/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eu/firefox-55.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "ae8b65527a12e8db514dcdea7d533edb52a39426e96f50707374395cc88f427e6370e864c9d55da93b02e2c92443c2f06dcda4aacb882be0a4982408678a05c2";
+      sha512 = "dfde116081eb810215d29a142f6f3c16c0664c01415c6d2f3cd6385097b55a49b112090934700e9c217a286e345be13236df1768f602232db2da0a47edeecf03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fa/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fa/firefox-55.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ce8df8ad73cb30195a444dc9ca9f1514081315fa4a927af79eda41ea1b2fe22c67825157cae641f80b3dd8760bf8d3d26a538a211c5828b41458ff60337c6166";
+      sha512 = "7b934fcef4d9eda9895f4ea1a0e52e8ff40186bfec73e8c1171d0d96ee6a2b19d7a077e4208c0d6c768f6078a90525772086ca08a179036a2723443761e69259";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ff/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ff/firefox-55.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "d896277ff916832466ae58f567cac018d259b08df13b59433707bcf60f5e75975678a25fb8bc138d3e705310e10d0cce06118f6581760fc9c1e8e076e4a5c355";
+      sha512 = "1e6667da86ad91d5bdbd27bdd615f8152a84e01d6304de4da90d48baefd758fc6e124c4253a00a89431b6c860ea574687237fb20b8ff95f52ee55b661447e723";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fi/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fi/firefox-55.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "adc3dce086ea0113b8daf96e1ebc5d292d35007ef59b0febdf72868350e98696c4efc25ad9dc9cbee908a0721829a106ca4d72690f5e9295077e7971bc9950d8";
+      sha512 = "24d8f011fff7425163a3a1ebc497eef9fbecdba8deec7ced18d1af0dfbc2e0dc31dffe29a7d6179972026aa04f5111ecfb5d1bdb29f466d041e5ba8058ae7f31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fr/firefox-55.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "2446635b7fc3b76e3fdd15634c7563483fe6bdb3c26e98cbcfb0f025567a5a003bddeca68fb87a6119e46da7325b50bb429444a30b92137f7e7aac8a57ed382b";
+      sha512 = "651bbba82549e5309373cc8ba3bf00c0cb87f0a8e1f943ef4c55b1d9157879a6c0132a8a296a9df3d10a501a1a13dbbfc18ce97febeab9b2e19fd87c00ce860a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fy-NL/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fy-NL/firefox-55.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "fb02a7d115c00f36680d9b33a65b8ce459a2607e8c9bfc9ecb70b6712a59185e990415b4998583da70996331fe3ac7230b5f2c540d27e0d04c193940b398585a";
+      sha512 = "0adfc657c5e29e0af9c33972a93973ade9a4441e32998a1e8ac45ef814791637e26fad074ea2d3669f5d3261bd48afcf1abb30170844db12ad49a1a1b0a28bc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ga-IE/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ga-IE/firefox-55.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "02f16ddfede728b0a1b103266805263414b2ffa959ee5e5b41d4d542c747ec2b819e4e4b1b6d30173f76d91eba388572ff4a84433b05ec7d02b7ea3d351232c9";
+      sha512 = "dca148b6cad926c1b57a2fa1d8e2175cca84f9ad7041a517fcd7436ae557219a19efffd6986ba7e7d1b0ff51f895d6894bc6c4316ec92b2ad79cdf747243bfc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gd/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gd/firefox-55.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "e1e25afce2d91f582a2cd93cab594f08f47ea5bebf273db47b79950a674e39b580e8efc477611e5f0e288593508e9cc583c6a9509f08357e9c717c84fa54acb5";
+      sha512 = "f4f01d4253b0e2ce56aa15839ca619df93fff7b60a771440a7102df1d84d45e37a7981044ad40d03e8dc70317836968bd84cf3ab3985736593880f26d95d7e60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gl/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gl/firefox-55.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f077016885b4780b91e9be185fce08398be4b34e496afba3b41c9dadea4d191d4c93a36f31ec094b0e57fe0636bcf1b38c67ad5180bd63086fc07800e90f076a";
+      sha512 = "2fb7a2ced35eb942cca10b4ca4b89fe4c0eb1a8f5aeeb9d62989717b704a922bf2678251e4c5fdb4a3507255f1548c183081d88e1586a727c17ec821240443e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gn/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gn/firefox-55.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "c935d587a2d5d5ef9278d265fe6d7225c4568e2f9058bddef99c677e9b89ab286bece8b066a44bc4ca6d155d83ccc14382e80f2fba4a44aaaf272cfce178f5f6";
+      sha512 = "28a720b0e8c3b452ca6824db44f274728d61471a815f858d95498ec8a8662973b0800e34cd8cceb5a0abdad405ee5eebb87f5f8efb5e07ebb8021bee41e73827";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gu-IN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gu-IN/firefox-55.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "9afa840dcf0de2386923186f6f3b2da1c78d3a31eb794b3aa1caa0092e90a8f7594b729970de8bb410457ec88b681abd99bb9be7eaabd8496bcfcd521ed0f14e";
+      sha512 = "5b1fbbba89814b15c6d8db09a1f335bdf37a300035ecd637909aba756a6986b3ed2107e5f015df2122e594e3a4a84775110f2e1faa9412302758f20915da5b03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/he/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/he/firefox-55.0.3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "41eefbde51929a1642310b62fc61881a16643372a94b9109dec6668e28ee71d3acfc154ff26052cf4702504523ea39e5e14679b14956dfaa21628717f66a5f10";
+      sha512 = "96dc38740133f31d385f5a2bfdac4af4eb9ec13c9a5fb29b989de34349eea3a682dc50a57b52037228dcea56b19535a31c37b47873b34a6383dc687eb3d61680";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hi-IN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hi-IN/firefox-55.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "4ab94bfa479c1dc703206fd5529ba9821afe9f388cc18a80512c5beb9411c3476ba4db7b859df4556e8382c1fa5a521e6f6682021daa46510c3497deeaad1ec4";
+      sha512 = "62ebb2492546d9d6923a93b506c573e1bbb1cdd563700db4980b0d9afcfe19ec3b31b34b5f0d141e1a5827bf922978860ab13e36338a611a6c1143b225d6c546";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hr/firefox-55.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "7a0048bef5a50588220be7145a2449e2f2f16a2542e5e2af17bdf5fab10a7ca9f9441ee52bf8c274fa462d4590be6269129db5dbf3f55574b8e3257f80d2604c";
+      sha512 = "1de18ef034b46d2d610268bcc5735e10671a6e7e70c2239d869606cebc0421c0c99032c2deaba2b0ced97c937441731a8097598185a81ebfb609662471081533";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hsb/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hsb/firefox-55.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "d21ba3b5344ab0f105cc6f6c426dffb553f4b98d1b6c125266d8f53209ebb58011e41d72b431945656a2c619347e309ab57252c4ed7189f6160d61379017e062";
+      sha512 = "2a500029892890bbcc44937e02c2f8dfee42fcc0cf0397e635b2e564aff66806424f0c0105440e3fef973289ec655a109b480c9c52f9cf820ffdedc7a5314377";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hu/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hu/firefox-55.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "5bb2e9c79cc08ca3b9e4c47e85daf351e411899318abd6f97bc715a1c4134ff271f7c1830eab1da9465c975d2c1abaaac0c490b7c2504f175b3b468b7824b622";
+      sha512 = "3227cf91840b19e45e4d1eb1454d0d1ebfaae1f91a632c93e994cd576f3d6dbe1acee273e266b12a8d8d18409e8c7da8abb2284a2d85e0f48a3e2619d6ffbeaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hy-AM/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hy-AM/firefox-55.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "25191d401eabab8adf1d603b4838ef5fd42630e5109cdc7fbdd638cb9537f91c16fc559dead9084ebc703f3ea0b3282c9ba72bc579466ac501b2d9446e398e21";
+      sha512 = "47d744ae1aa81e5caf0ec14bbb19289bac77c969c773a3a98ef6b22577a1b345127333281d9d041c9a835aa2a6313fee26dd5e8d20e452a9ebad049eff96c560";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/id/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/id/firefox-55.0.3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "0c681e3f08b80e94b8b3c3c8fc2408e6161c3c8a665c6eaa29d5c33eaf508bcb8426dfdb0a3218d15c88b6a414e55d27468aaed43c2b87f8ccfb1ccd26f07817";
+      sha512 = "3745ceb9ac5cb1a11d4fde46787a435a44c6197d7cc557fcffd6c68a332105eee9e0aa4042dc010b11e0a4846caa066f96c786a744b45a2b13b832b29deacce7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/is/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/is/firefox-55.0.3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "6bd3b4233ed6efa88b32047705ae9f5250cbf58f93e134924a0adb0ae7f569123b5d085011c35c0f022f37096fb812811f0fec0bf781e355a5342650820b269c";
+      sha512 = "cdcc14717bf8460b2ae2a21dc5ae4d9e3f9486ca29d744149f90e26f09f6fed54b40739f75ad644c57b8a1e4b16dac49f43167ab74e8e29b850d6dd8b22a68fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/it/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/it/firefox-55.0.3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "cf8bfaeef210cc2f94fc9405a9dcb8dda331fedb82e4743cbe6b75eb0eeca13b77a30fec648806057e0e8ec95bd957a4003e4210e38e9d122df50ee6c0c31b79";
+      sha512 = "d93cfd5b5bdf0dcef5a82a39e592cfb3aa6e4b128ad22c38fc5ba3dff8177947c877b55da6d45fdb0e8fedf73aed024630eebc45910dea6760e4cbc0cb47f971";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ja/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ja/firefox-55.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "ed12eef067d9505266b27bbf856be093bd3f6bd2b82c355a3c75db0d964ba3a86838cfc976cd142c142dd77b90d5a878615577c57e7861b41a4ae6ba69bb9933";
+      sha512 = "d9508e377e104c869c38d62edd255b2837092571c0748112554efa8fd9eb2f17319e3e7d36fad2538b49eb06a82151e364614416b3bd17c181923f5506cfb445";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ka/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ka/firefox-55.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "594f2a455ec525956e92e77e5de1f54f8cd7bc615567ebb4bb9b938d1978df1bd87f9865e6311cb4280d0b1d435cc8a522b7d7b5fe6279aa3f387a288df81d60";
+      sha512 = "6dd2fffd82ccf111b133431edde1c8bdd34769803cce8626987b7665203d64925aef1c2bcbdb2be70897e3f66fd40bdfedf4b6ffc9dfcb2e8f0ee585a1b75cea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/kab/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kab/firefox-55.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "b7d3d54e7bff659074bfbab859acc3bb6c2141e9111fd0b207ec3ae81179356942f48ecae75a8f87af0514a79179e77f088be810cafe23eb234e85bebfffc798";
+      sha512 = "389d33267f621a82d08e179005dafe88284a2580cd2803a3c223e9d132b471a69ea97647883ca05fed98d96048b0f448f376dcb3994c64c3f25598b601f2226f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/kk/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kk/firefox-55.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "0cabe96911784264c984e23831b8e8170fa27af03b15c85706c20059f5e935910deab728e2e8b68e00b62d4f073f4d8e156e302bccaef6794de07fce48f99255";
+      sha512 = "48b5cc20a559aceff6f58fbc5bc18ef72e60ed5ae4ed86e7d30ba75169a1bb62bee19deed7dcf071ed470719c8f97117fbd2dd0f973edd3cd641500747fc1dae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/km/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/km/firefox-55.0.3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "e62980ea8f48280dfa8123e4ba8bfbf7627bcab855e2869ffc947c9538377721fa6ab52b9bb209f7e2db859a5f606232e39248d7da3020693f4d7de1125b8a2a";
+      sha512 = "783a67160300aa95ff851e913b5af9208db4d1c96696db9aeb153a6ca0d061b68d2d83fd231b1ff73d11fb6c9689ede2c1632d43e23fb2c923e761cbffd73b64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/kn/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kn/firefox-55.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "b5bd9a15cb1526dc39bfe15c9bf5c8624eb919f85c0f61f83da0477afed65aaa3a2af71a0118fd48fdcc7a73da778b9781d56f41d70971e52799ac04f3a8ee78";
+      sha512 = "a4ae433d78844021f0fbe9a36b2baedda3c80cc10fea1bdf865d110c52c23936c51f5670917947aca9c313d7de936012661a96b498f3a88dd73ef6862a1035b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ko/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ko/firefox-55.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "59462a1891d08c109827b1e92a267c28427222e62b945194d4c5610f823489e645714bc6a1975b42b3aed3b809c46f01670484ba8043538465a20c21b6519263";
+      sha512 = "a1075cb1d622af46b47110da0e0c846a3a245fd94a89427d1598cec1e30f2b43a5697075358bddece7b44fa4bb5dacb63751a6cb16f00a447b9c3f815a96838f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/lij/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lij/firefox-55.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "b0c1dfacb6a1333306dca3b16bc815d707ede40b96511c6e130ec76572e0ebef264537b458c4040d45790868114f8f652c84b525e1cf92b05785631a67de2196";
+      sha512 = "ef16c60f7a479876655338a822d0a366340581f90ba6a5927336aa24c7241ae1de7295dac0aa9d94758fcf2f9de696ec5996066db51ab961e108b73717f93019";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/lt/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lt/firefox-55.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ea0f17e1b5f28e5ed0033ea5bdf8ef8461cb861123688dacc908e37670b22be9d115c3dbe8e92543a7b5234c3a45d159aa0c486eddb3348acd21f7430e5b3cdd";
+      sha512 = "4eb707f286d699948bcc7df14096f32581a0ba2edbde59b89f1568f6d5a96e412d2aac210d765707b4bd797845cfb70569e57b6587a8fa67b81ce56d23648666";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/lv/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lv/firefox-55.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "2a6a5ede69b3280b43de68ad3c1082a4f46d606cd0e78a1968ab984b8b3aa8a455b809b3a6ecd9f8ffb2c296206e68446b2139a1739fdbc4f3fe8e6a736091a5";
+      sha512 = "45fed96d0e82dceb48853aaa08ac9f6b26ef16ee8fad04ef15cb76cc2f1969a3733fd74468088803a735feca5e5416b853f41956d240d4150254a61ac86f83cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/mai/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mai/firefox-55.0.3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "178d8d1446287d0f163166851f7ec2d404d4328fe6b901c6227cf4d195de7e97e5097477d0f2a9cd4c2c492ac27fb15d3dbc90b798d3ea05c3e2d2a017ab3ae5";
+      sha512 = "14739a5b2249386786c14816115a9b1a21bded28083bba11aba28012a9c7f5240d7b4dc3342192689d4d3a096d6a6f516d22f4370e49d465ee07721e937c1380";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/mk/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mk/firefox-55.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "52673259ddf45b072037c28f872a03b75a3a948517a27514b6623bc5a975c0d745340638b04a5c9d16503bb0ab62e08795d1e387ea37a69e796fe0842c3957d6";
+      sha512 = "fa44baf0e211a6efc3498c077911879593bb3dd715dfe3127f3177801f86fc7561f1ceefd5743cf4367bb01082a19df1f003ec879d314d252877bb69e2a12213";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ml/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ml/firefox-55.0.3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "a58262f6788002550220861c1a501fd9d15b7967bb538da738b831be91787e04c2f42ce5dcb045910ee022556af9330df4d0b985702995ec40f3368a3a52eb7f";
+      sha512 = "91b233c59500256bda1e9236df9e282af2a161b4085e4d3af4807e4d9bbb568bf1c83b1d7314c01e10dd5757fbb9d291ac3df334e40e3f155f996db506996bd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/mr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mr/firefox-55.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "c927b197ed833cb3beece57d247107865d6c1d9ddcf01292f28927ec4ad8cb325c8b75cc50e1bf9b31eaffef31a3d472c55338667c64425f80934534bd6b6f3d";
+      sha512 = "eaf62cb8a34af24dffd29daa1a5e2b9bab7f58a4016a6624335f621cb75f187d09c3fba71abe780b58c3e4861b640a1e8273a682d02c2179909249725a44da30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ms/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ms/firefox-55.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "1b0227782120185c60cfc18f60fa592340fe5ff875d130d0d786b055c475dea9210e98867b8ac2c9c63273f138763cd73c2fc5e5085000af06aacfdcc9d69179";
+      sha512 = "f089fa240f58ebc248fed6922eb1c429043504df079027f0f8122288ca7277bfb24644852c73ba1cb8032e5951f6066b4175b59bcd894485e7adcaf7823776bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/my/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/my/firefox-55.0.3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "a18326b32fd45e968dfdb4800209ad76265e8c72237fe3e0d799c7a66456d3020722a1ef702a349a0d19411c5645e7d286a2c523cdd826d474d40f02faffb129";
+      sha512 = "747ae8c0826f463a9b5f6e68283069ac35501245a3ec4e3df356e4244bf649bc83f3564bf7f7dfd572f7c09fc2b4cd533b7d60a1c2839de9ff9e049945d3238a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/nb-NO/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nb-NO/firefox-55.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "6652b0cc7aef35e81e0bf1a4aa3ee26516a874338d23a9d216e4c8003bf86f4f73b1872d39969f77e878e9894f66c23f930cc133b666a4b1cb5490668153d653";
+      sha512 = "063eb5efc2a47e6ac39d71900844df00bd1508873ffda1a1a7910bceb83fcb33f33b6de00470e1ef23ffdcd46dbb7ee2e60d9272e43f74275ac1c3b34c330f68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/nl/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nl/firefox-55.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "d6bb770bf841f7882ea61a2e780247d94333a8df7e72e99ce3574d9216b149fbf2d1c87cd385436492680c5c0e4d1cf897ce0987c43a15bb2776c4a80799229f";
+      sha512 = "77441aa1589345be58882ecf3890e2f029b80ba62946109d48a105d421db7259532ac153fc1b5dfb4ff54c788def590dfa98ebb6f5c95383374843e9f8dba1e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/nn-NO/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nn-NO/firefox-55.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "117ae9c5939cd7f4eaf6b353b2e14b2680114be27066782b2348f56f8ab7b72bc37f48043e382adc40f6315167035afb33a40437b86560100563f1e5e752abef";
+      sha512 = "0369a0732cd13ed14059041187de9bf10ad018b68449513da224ade76827a21df8b87743137028c788dcbc76c216345a50bc82f097aaa991d068cb37473ab5ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/or/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/or/firefox-55.0.3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "c58300fe25da662c6227c89189a6e17666a8d0482d56fabf5a3bc1a3001a1d9b62e0c7ad55c8eac7b8294153ef12adcf1a61067a697011b7ea74e23060449ccb";
+      sha512 = "dd3a1a56f506cd20163d28c8aab98958dedc811f921f4a0c277be59d93379856b04fa7362d3528c5840cb024280919eabf7acec031bcd1a198012457a4061a88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pa-IN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pa-IN/firefox-55.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "b2c5f59305be66f6c3bb4bc2bd67e787e56461ae1be29efebf4880bee2378f567cb719f6cbce90502cb0df6645239d2abaf101bf4c171efb226c28821544bd16";
+      sha512 = "04ac45c34a0373e40574662f841879172d6d49fb79c0b39d0394397f26e3291a5ef053b78dac8d1bcac9d55fdb9e3e60dbe315f2416d4b93ecf6a258bbad31d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pl/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pl/firefox-55.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "c7e062eac501d08bda55d0e2f642dcae3a3fff8e228521719999386e6b910ac9a0f101e36845a0cda326970aa7c6ada16d56a44ea27d5ce7deac773328272710";
+      sha512 = "1037efb25bc120e8aa8829362991461f22c0a7422afd45a3bcd29e81c81d009efdb9b8011e09fdf95e2d59a37199a75fa5ac46f042552140bd9ab571c63ac702";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pt-BR/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-BR/firefox-55.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "854054e7a77ae695f0344fa19d2c16afd112dd965f511c4d3d0a22d3e52e790e8adc1f86fe951f1daba7c390c851607af87a1886b6ca2970f4b4d921d7ee3998";
+      sha512 = "66372b345b017a46b0bc6a5eb2cd54854e15fb6229b72b418dabc605003542b97170c72ef4d22d05a41e8622c8f43767e32971e09d1d0c3c4f58c008a0028532";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pt-PT/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-PT/firefox-55.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "e490aaac75a1d7022ed79ec888963730cbe995a31755c62d431eed9cd7573cf607d361d190452fb1bbbcdf0e246fc52c0132637a2b58b6934e3564e221692efe";
+      sha512 = "99b5a21180578bcc24e2813e2304a3b70f6d19c199925b0771938366e40710329ac408b59635f741e3082048972a740e84166fad9d567d155bb714aeac35037d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/rm/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/rm/firefox-55.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "010c815bc7ff3b779f1d393e593eab21cb4740cf1ffa2eef670b508fa0915ad65bec15cdd916f6c4a6c1823fc800aa6f70c0c004e6c6910645e5dc9c109705f2";
+      sha512 = "d67cde6cce18638e061256a562774a332192242a506b817b033ba41fe2f0f854bc0c80ce9b956f5ed7f25e51fd257cdb17673b05cb139a7e619cf5f01d90fd96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ro/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ro/firefox-55.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "970a35a149c512d30efc1842748a26febe4c323c8682791396354c80d5b9e71a1e6a1d2c918a4552229dffdd26982665f8c339f483a179002edcce05d6ef3fe1";
+      sha512 = "dc33064cebff3ba13f169fc1f52f4134c672214431db0d6309b111df8c53d59db5ac32ec54e5001d14b837cb8bcea02ed3b48763bde75c29fa8e4ba3a406fe08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ru/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ru/firefox-55.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "02ece7c9664416da2be2042676d60e6dbfcc27568d74bf23f64517255675e19fd52f031c6579a9ef08f7ebf3d94b92426f3f8dc74fdb3843634e958597bb30c2";
+      sha512 = "24b5259c9a146176075e26b37744759ce3f9b24c7e7973b9394fe2a70ad10410e2c4453ee55a1bb2bef9b766fe829b3a7dc99cddc4686081f413f4cd2537be35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/si/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/si/firefox-55.0.3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "0f2f273b7912f73e8b022e5101ca40603a272914deb49159529fd96ac627fc106f039454941b902e5d9fdbf6aede57f38f263c93ea561fa9bd933acc21c329c2";
+      sha512 = "0d8590d03413e817baba1d5f32ccaa7516d258f7eb742ed619a8615f7b2191e5229674730e90accfaa1711d6730c458e60c2b142840a62e526127257632233ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sk/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sk/firefox-55.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "fa95f13fc3cc513fa22012598a6bbd82b23b8e0d19d19aff100dddc1b0f123098db8306582b8ff27bc2e6188b579a2fa22d7205aa04e718f622c723df0ae78dc";
+      sha512 = "c2afd8ec0f78f6d8db747500c8dafa3a188a10ba6c1cf713d3997bfc349a02f8dff58663b51ab24d545f74308d4b7db29c2d6a5a92f9efa3520b42e84795696a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sl/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sl/firefox-55.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "eddc485ee09e45685a99715ed62921453f3d647e4f2c10b152d6e3faf626c4e1e12cc5ca76403c10cc94ebdee7dd999faf35b3e4e6d544628fabc760c07e7fd4";
+      sha512 = "75d545f89dc2da70737910f0288a91a6a745675419aa2ed41e0652072dfce0696b0b01197f0cb7dbffbbcfc4e8350394e94c621d2f8e36c65fa95163e70db50d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/son/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/son/firefox-55.0.3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "0a6b22284b2f65ce7cf8911b05a00df7675b042f7db31f8cbd9440929f4bd32a05b463a8c26399495847dd14881fa3fa1fd00309fa404b0cd12ffd24eb97131f";
+      sha512 = "0baf5dc181eca057107b2d2ea89fdbd5662a0e443f7ad7adc286773da3b0ba922a90583b4961908607f6b6f1f1849c56ca219e661b8ec3ecde2ae4e1dbec0f63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sq/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sq/firefox-55.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "fce71fb0cefa5d975d0eb22a0a32cf99e3a6448b206170b260b68f6bc08957ee5fe7fc83fe3bd29a3ccefebb5faf731e9fbef2b642a99adb48deb9c0fa934374";
+      sha512 = "9d220d7177945732d27c77fede9528043f1ced0e26968c9589aab75c727d808440897b8246b0ecc72c91a375f532c2add002d2bd8d59e3fb0f5f9474f42e144b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sr/firefox-55.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "21667d882d2065d7106077fe280dd07afbbfffef1cd5625f830fc76ba8798ff45c4af9bab382af3eb390f63cb94de108aa113caeb3cb07bbea3ccd6c51333aa8";
+      sha512 = "8e9ac8e24c3af617ec99e77ac849267712ef095d01b177c78e8e8a0c35ca28b4567b93fc9ce1eb5c5e7cc16f9e1e9ad19df30f483db86d25e01e665c73380838";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sv-SE/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sv-SE/firefox-55.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "691cb5961830be2a7813a3e5c67af793e1f716f916fdebadd4031f288d8439403b3f49abedb4410a30317fa4fc51446638e7f18d4b33bbe0f94a93ee9c4dcb21";
+      sha512 = "4a5895a1304c24c19ab270496f6de03a46059ac7d47edb834f36ec2ab39ab363af59eb742f2b11c325b69616cf4bfe93abe2a6720ebb5654cbf56e6868d07508";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ta/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ta/firefox-55.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "bed2f31f934f5feca3189e6064490c7e90401fc0373b8a46f9e3f19fc5245830fbec1bf84de63a5cda2c71577fc8e0cd834e60c722b2e6a4634f9cec3bb3912a";
+      sha512 = "00d6ef2853eff0f6e867087e0fbdc16f6243d349b14ada2c540c8d3bebb520b682248165725ca842c77925d71b07e27ec15426cc215fc256caf34f56055351af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/te/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/te/firefox-55.0.3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "6a43c634e534daf172ad8847e442c577172eae5478896bb01e34ef941156664ec55c633195e1fe82677fc0cf481ddaf847229f7029d279bb0a0bab256fb3b239";
+      sha512 = "ca9b12ba9c26bf12c709b8204206cf5766a819cbafee1d71fe4e12897fe76fc9144cb281e11b94f35243af6cb7d8deff2dd3d05444fc92a18a8babc8de9bb72a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/th/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/th/firefox-55.0.3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "9c91a5c6d2304b92111c392fd3d7b017b38c1c686df5f55073237a6655c4780d6c90100ddd13d6a7569f1b82797be8452aa6df0a4a22ceb3320d69bc902641c7";
+      sha512 = "d58decde55543eb8ae134335d3dc10f478b8354a723c0f0de2cef89d76c885ad442f989590bf5746a60e9bd46627ea520cc296f6811452d6ac4188da261ac941";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/tr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/tr/firefox-55.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "d38f8e7097164075bc5e6866968403acd5dd91d67782eee968065ee5f2eb0a6204d207b8249d97efcf955f52d510410b6b868712a3796796c0eeefebb0f6e5d2";
+      sha512 = "1852fe5c47454a7b5bffc236f12843f0fc7491311979bb0793cc8150943f6bbc39852b30c597a6167d23b8b3199da77347bcaaf8a7d58f50f65019dc6db5a8b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/uk/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uk/firefox-55.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "bf10105b97b89bb8ddd4769ec0428d938843b9d2ceab2d63851fa0a6698c6d10241b65a3f2068503a4a41bf9d50811a7aaf01105918b8afa92879be96f043dfb";
+      sha512 = "c908a9385c9bb07bbe55e62962f19af59da63753284dbc90fa4418fbb601a787f9ac6448906a45da73929e7fd66ffaa1d1c643e240ff288b21e66494e73b9e9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ur/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ur/firefox-55.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b241c882c867a5ee808e9ac37cd14dffd17d8eabd241e4e01ef4573f7d4641007d58fbaa8875284ac640d1ec8f013b7a7278f19768b07d388b5f30c4d943955d";
+      sha512 = "e23aed0297c0605881baaed3df11f327db42467d8f0c764763ab0ac08697f1a7d3183ca0dbe8abe97d46503d6f71b9efaf046e5be68ac8e34027e8cc70c1c622";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/uz/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uz/firefox-55.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "357ef3d85e8174e765682b9bd99b5865994119c73d41eafe3c6ce17e3430a1eabe358a1ae8c4af6d2d9562673a6ee65e469ca423ef7e0b135b8f79df4643112f";
+      sha512 = "894e4bfa2919983c8879bdbed542b39da58ccc237e93a981a7dfcdbd0fb91fb338770f89c46cb97d4af3f3b8b9472983ce72c4fccb458d50f70d79b3da6591ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/vi/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/vi/firefox-55.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "606c28e1777af2364c4a85557f6b173baa2f07ae198da154655d949b4999289e1a9de3ccf8086c771167abf70d74c576a4440a73cd1a34c3d1bb5e13f91da307";
+      sha512 = "5011071e8f1be873e69d7914c99b5fff3a510f74a064525f71c45373ea1444db4a2da46e806f0cc6f20032f96ef63a6147961acc4f6a7d9af161f08732b6b4bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/xh/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/xh/firefox-55.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "2dd2317e3cf7a487730cba41d24db990844fac4b5f5c2b93e70fa5cf635478e26a60aa2ec60a98f670419c72564dde487050c1bf1d662cf7bc8440654cab2ca7";
+      sha512 = "9bb89e5614745a1fee19241d96abb15d7ba51a19b312c3d47d0a931d4e111b1e5796a47b97175af44331f4d7d86158d4c07d825b4f019383e5d93b2460a17ccf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/zh-CN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-CN/firefox-55.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "714ef62fb08db12559e20d1bb6c7e253c4a12b275ad1db8279982ef5df9854e647241d9cfa15085620f12e894cc84a8d60da9b150cac222ca4b454e048e6ee68";
+      sha512 = "2d9a2a0c2d0b21f5c3d58fd14cd7b9fdf3a7b45cb31b124ad17eff538e4dc64e55c035834373d0093615e93fcf61033fd16151b74b411d774541872ee4e1e914";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/zh-TW/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-TW/firefox-55.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "ca5852892d7ab49bb1473425bc5b1e158b045f647ed33fda1b22d0e25267f45a87cd4ea296c58a4f1b502e6e0ca8c82ecca25720e61596e49508a550ba43f9bd";
+      sha512 = "2d55a1458104fcbd6b6f24d5ab6df1103ce1390d4bae44fa4552b6172a25a36d2456c5f5466abdf8a1eebbda926f1c354b12183b12bba497ea1b7739f804a167";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ach/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ach/firefox-55.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "3819fa366f4f5ca40276a30cc5a7e90325d40ddd281160948c06e9db8eba05b51b5e0f230a3c5113eb21e9638374d383b318df3905877d14b654874c83db0934";
+      sha512 = "f66fb15ed6671b27f03eeed20c42a93a31ec2589196160ab80d27b2db57f580ad52d3f23b03a3426e90753b8530ec766e35d3428561b837fac2444d0b9972e17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/af/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/af/firefox-55.0.3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "eb7b48ee9ce0b7c08f96f5d09b51e1819d38fccf7c71cfcfae72e3189ebc928ec4692a7a10964d6dbb42fc2ff04da13d5f058084e6376b67b0a1f4818922ab45";
+      sha512 = "41fa15ec74a0b53fccd6f572e4d350ede8eb637d1cdcfd38db1ef56e29672761abfaac76b2eed74b59c3a907238df02e5a193410829ba5b738a4a7d2ed74a0c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/an/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/an/firefox-55.0.3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "956bf6e053fb566f4a6506f672e7102c37548af41807797078b2cd7560fa4dc17cefde0b21939a5fad75005a98adcc58893ef01d170c312065c2fb1904102bb3";
+      sha512 = "900409612c2ef05008c8c3b27852ab94038677df5fabb2ddf460ab731d57f5a39b9928b5cadb0996ffcce893983128bc04593ca6dbedb528ddd634199d92d311";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ar/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ar/firefox-55.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a05cfaf18d92d8b0a43587cb685e192c69cae3603c94bb60f9b7d5c3380d498dd050559fc1d041860893fa52651fd30f7a734cb98699348587f3211625e880df";
+      sha512 = "445af6192be988f8af74f2ef618c09c3ebb8f3bacedb0d622740b9068665b104146a7bb06306219193455cfdb1f508a924711a2480a31b5d1d554361a9ebf576";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/as/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/as/firefox-55.0.3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "b855da6d338d80a58aa9dc6f4a39ee9a5d21c92b25f5a4b349f83070fca7e27cda8c7d070b2c543723f6cd061949e6c91f79979edc45c0dba9dab3dbc81fe4bb";
+      sha512 = "9230c78a28845292164c311fdd882a2e0be590f09ed680c5fa91cb400570b1da8efce86efb96c1f006d166f61fa463871c9c8d7276a4f49a07bdd89c9a67442f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ast/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ast/firefox-55.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "57f498045089ee3e96b5f3f80caf3919d39c3a40ebf68b1b578e1bfb14555635fc216956387ee417cc1bd05cfee7bba3260890d161fc1ea8471bd73399a0ad41";
+      sha512 = "8b313ba678e7beb14788fccda7ab1ff4dcf8c2adee8eee7a8a1224184219b167f8b84d81ae1c73400781bdd0b6c8a5e3e0e6bbb3e34b26587d5eda71130f2215";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/az/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/az/firefox-55.0.3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "38399cf0c73942f96df9a4a599092fcac64956353d14e6395a1c0507fd0c7cadd566f571c12bfe06275446a5412e69c29bae95dd86aec42b97acf960026b16f0";
+      sha512 = "8092452d5e2197932a4fe126e891b8985c008fc28d24ae2ebcbc8554a55f1592de2eb0e0ec6b8d33d483aaca29c644b4b5956ea49719e6bd06b88d07ce200169";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/be/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/be/firefox-55.0.3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "047c06fb4ec91013521b237592af85715140ae17a10f095f5b8d54516f6b62a4dd90c262294702258161bf781a6babdf7ead4b2c5f7211cb5e87a332c552ed0d";
+      sha512 = "6020147ec72cad49e2d1ca93f3eb4e7f5c3c435f6f0a85bbe0a39335c3791d52c628ad5b9b97dfaf52ecb61e7ba354e0bb5d00770cb88c79a58db0c002f2aac1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bg/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bg/firefox-55.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "9a823d322edb570bc53c07eb63414b65baf82df2f37c7d2a6d52221b6b23d0804c890af9c3ecf66032035505ec246e096864754930426aef4be008f5969fee67";
+      sha512 = "c34a98c08553a7961f3dd2af92e14f72c6bc9eb6fe0c613339570d9ecef1f015d0860ba5866107115cd1ea71a86b4c8177509c173f108db316b0d1a4feccf0b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bn-BD/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-BD/firefox-55.0.3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a5f8b004170993b4317044df0c65711597b5eb8f046cc1115cd047835b90045bd16740c47901b8e261a037be9592493c11cd527f80465d46d19c06b692139103";
+      sha512 = "d1157740fc765119441aab489252db93698e82e43a8bf2577a1c36be535adc782fb418a439c56c1954d58091514db4c9e33b7a8f281930387a9bbe6066062b52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bn-IN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-IN/firefox-55.0.3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "2f161b15a10577a48386cf3277c027d2c0103c881ec33b57e87824b4e40f000348356ca0a6caaf20d50263c5d203ce02a6a734059ae477b72dd8b55e17bcbbbc";
+      sha512 = "ada0aec0383e3f43bc46d72e0e79e3adc64cdba5d5d6fb76315077403e233e5ebb8622795b4e3d78bd16ca3b5978259218c0873f547828f420aacdfb53753e7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/br/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/br/firefox-55.0.3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1a99b157661a90607af89117321f1fbda167bc6804ac95434c6a17859c8c66d86bc957cc95d46e47c69f42b5f513dd39a876881ca69221adba9f7790da7e965f";
+      sha512 = "714d2433d3716d1d9f08025115a7c4a20be975a7d66684ffd25439f68cea2b5dab2c37689c688b7d6eedddaf756e810556bd53366a28ee11437e1180a563388b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bs/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bs/firefox-55.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "f850f28cfb54798e0305dfc2525ae59f1568ae93133fef2fcaa5e30063d980263e47324a3bb038ba3a9512aa621d2232475d5c0098d4d5914d661d5f36e9b51a";
+      sha512 = "836310bd3eafd70edc760390fe0fa33659ce2c1f0243ffa21d5da95d59462cf9301f50e89f8e413a91c02f5f362ddc34e18498f635ba19667ae8bb5d69bfcd57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ca/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ca/firefox-55.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "5b67953d4fd2ef7235fab59b83a17814d9edf106183983dde21746ae1330c9a9169cffaba21b7cb9623d93a82b67c9c249800892601db58b4e42efb8323cb7e0";
+      sha512 = "51f2ce893ae1513c067dcdd0525b254a7c1049e952e56b31f86eb3249d741d131f7df529400039bc63b61a673cf1fc55e7dc12043679def7fcb583d748afe4e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/cak/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cak/firefox-55.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "05ac251aae543a91755b927db98ae44aa07b06ba824d784e72c91c8aed741eb54d0e4b27167dc11a96bbdb765c6daffefe6ad16982812664070d07b5b6a8dfc8";
+      sha512 = "ed948b4f57118d0e0fe7deb5d8e117c1cf8d7df0c6d5c1f1721490586720bea76e81f05ee07553f2ffb42675b2ce5fd8e3dae342fbe9ec7836d489472d1ca673";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/cs/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cs/firefox-55.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "c0789840e6a3bcc626ce99bc94db727c09d9b6e3b750dbe3c7e2310d00f3d3ef06d2dd3c755daf7e7081f7fa6d059a4e5b0982b513ce5cd4f4dcb2a63630743d";
+      sha512 = "2b16f351f4984310355f9f9b27d656bdaf15b2641ab5c83c08d6e590562284b9d4a89d7f26be605957ad3f4fc81775155255d1f0080ee0558dad96c05e6a5591";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/cy/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cy/firefox-55.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "8b8c1d7f561649f37b589cb11f4117a762e704a7374ff4f6aac1594d95482f13c7dc00924ffef76b41ad9c00780592c16f38fdecb60975de6d45f6d1b5e6a97f";
+      sha512 = "ad4719304c7ee807294853aacf1516e29339be23e5906bfb5725266ebc3105dc1bde876b29573609de0f38b180f75017fdcc40e8602f92d779578a450146f6c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/da/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/da/firefox-55.0.3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "42312ed0a97b2bc03a37cbbefb8027d373c0e1894a3b37e78a6bb8ee5f72a846d4e14835507ad771fbf4be60ef34768d5e866a4f691a0af827d3667f7b1c01e2";
+      sha512 = "158c318c5b83dacc3ca737e387d47845a43cfdae5add8230b9b4055f936f212fd9f25d2837ad9b4e177e18beb949ae2afe5853b24331facea3fe410216b8cf78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/de/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/de/firefox-55.0.3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "9a228c3e177b11539666b9c5f0a4ec19ff86da023f5a302c81266d85ade1c8e39be861e43e143bc0247f09af85863aed224011bfdb4c64bc2dac267fa1e548f3";
+      sha512 = "f9ff911f2cadc837685b814e906d6e03f019a004f0daff5b5af902467e905269b873f101b63b9e6cc33e357b5be06834878b072b2f8b7e08cf9f16d46122f987";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/dsb/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/dsb/firefox-55.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "d8c791da0654bd46fb52c866ca89399a65186d63e0262536ede7263ca3fb7af852281e50faff750e2d3020f16d4f85caef8e5d33629ff0019e249bfdd87bf439";
+      sha512 = "d4d92ccb3073d038836c92ece1e7cb94e8c2ad1210c1f70608f99381fb02fc88aa61db5845cb123af11794cb39d14562e9e034be4f1519234bb9f8b2f685eb61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/el/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/el/firefox-55.0.3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "9e466913d7d84dae64d0e537093cfcd46128f3ef9fef10f8ba675195e83e2fd0a32a4602231206cde599ee8be7e246e64e0858dba36c6e283649c59ac990db5b";
+      sha512 = "6eff466dd1b04611fa8af686dc70bb2530e4392d2eabdfbf51f4b679060c7d5f96fd95120e60cc629eea8b23f2452f5342fa5e5dff6067b820d152906ac19882";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/en-GB/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-GB/firefox-55.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "5f4199493fc4c55c1b247cb729c65b83ed668c65704284dbe2206178e4264df852a73925a1adf1d079f77560c9538427544826af8ec311bfb604bc7a5c691073";
+      sha512 = "e8193bc433fccb5d02254892f2e4869cbad215ab9022dade1167082d3559545c7d9a8c28b6b6454183e1a0ab707f0535709cf551977c97398459f816ecfb1b05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/en-US/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-US/firefox-55.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "51cbedf391e4b2b33c4bf4882a6183084291136064d2125e14da6cd86cbed8f979e20adbe386848d1a22c2a4c567b99cb68bff51668e53b6dcb85e92c73e47f5";
+      sha512 = "880084f39653f405a3a142267e0c6023779cac219932d89705750f1384e08e21d70025152dc010ed19a5a3c6c4059948892d6121135a44de96ba9c6dd185b5a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/en-ZA/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-ZA/firefox-55.0.3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "33b6fcefc6d4867a670531e3de4d4a926c934a297b890fc60b3c4e6acb6237d2c2fc1d0655b8da42406ee4ed62fa98bac0a94fa7cdd3f70a918232e95df3a317";
+      sha512 = "d42d7a3e9bc2c3d06b7579077a99db5bd609b62e807862e5e03717cc84c2b26e9202f8e785ea16bc16182aaa8ebd8b83ba2b0b73dae133dd6466ed46a75351fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/eo/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eo/firefox-55.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "64d93eff3cb4f19185975b830e4f956d2d76e8bb600176a322a57f873e7bf8856582149b9c86d7af7652e2e0ee2a355f821607810713bd95e5738ef1b436a7d5";
+      sha512 = "2f1aae311a095e8d48df3106513b94e9b1fb2cb426c0b35782a61bd7cb02215f26039e3090b78401120fbe81a548b5de819c3e49cdc46a41431534735527cf40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-AR/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-AR/firefox-55.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "6ac236b635ecdafd0864711c56bb3a4d339cb9540d5cfb4836c437f8df9c9fe9d6b65c4c8b1bcd68e2e04ae86f3e70edb5e704042c2ba00611b7f60fe0b3d071";
+      sha512 = "71b1c0ca8dd8483f6c40f62215b86b7633c76097aa9c2d94bb901eea5f6e8a9a5bd99255064c700308569d294caeafee7fd711191b9f393f0b607768edbe2488";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-CL/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-CL/firefox-55.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "0ba857c7d7f1ed986110ec356cb4db75f7ac6291ba0684add7cc56f4505fb946ddac3c603f3bda2a9fe91b2a3031a7cf4dac59bd781dc148c09dfce4d4837e3b";
+      sha512 = "065fe812e9a4001b0cb282efa5c667a999429456de1be2679fb656b88be7119d252164036a9c23829722e5f52b29512809ed4ebdd0824f6904c81865a1a96a1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-ES/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-ES/firefox-55.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "0440a2e9eea08a43431c377bb4e8f4e747dcc8b608b68a2289ada27bd4b3950feb4ed2946845d725be15fb6fb910f984e791229631100d3cdfb39f9ab398780f";
+      sha512 = "c2c22c22624e55d2463644fd0e3812556b22b7c664ef412613485278b5bb9e0cda8f17e9e57798cbe6b93a3a8acfad9c287abef425e1c064374757abc7465edf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-MX/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-MX/firefox-55.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "7c9ef5df8bf96ac277e7488c2ac0743afb72165ffdc5723b4bc4c64e1c4f7d338f453fb50a7d938bec39cf04217b903a56b86ffe3856f8437ddb17f53a48f32d";
+      sha512 = "e0c84c217ff11d3ed882d49edd68b8b72589b5a1689dc75d54a895dbe261166bcbc2a14f89f633749b5c9ebc865e39a01bb992904e897d518a45840846710e79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/et/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/et/firefox-55.0.3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "297fa442fbdc2042b3b7756de00f2573da9c5544a4d83a6409808ee929d441bbb7fafefa023f4d858f0fe55f08e6cf6397ad2732ee197d01d4a03ac504e62087";
+      sha512 = "7639e65067d23d20f4ac96e1ec87efcf3fd6ba912dae1fb68e46c4eb23fa31352589bcd6841df66e292c08a332243dc305c1800ee26b4d91d6401b873d517607";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/eu/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eu/firefox-55.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "fc79272cb8d9c22607fdf0075681abfa34ccc78bcba8801e1181dc46ac9ce420dc3b789a4964fac37bd89fc9e8b03af8b09bf5353f7b3784014c8327deca28f4";
+      sha512 = "8251eab30eb48b0012d3df66ebfbe75d75d36fc4d2ef71947113f747741f42ae8942db7a40df777973245be3c72949a303fe013341bfa64753d30ff05407d592";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fa/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fa/firefox-55.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "ec6429c1d78e9b5e1e174c7e13d8d99a8358289f67c76d2ba3c3bf096d9fef7558969df37693b86d7ff077206d35934187906f82edefa0634a3b2b111f42cc1e";
+      sha512 = "418c2ccaedc94c695dd77bacc399d7dda65cba53251eeea8e203c68a80fcc2fc83f7f6a75bd2d919a5e8f61a148b25da7ef4e4026bf2ab35eec99f39bbc4daf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ff/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ff/firefox-55.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "fc7287c16143ce71075b2f0bd5724cc6568e4c7ccd08ef81d1f46f945b6af18615c0b465bdbd358919af03ee956437cdb912e41c94741ad916d5e0ed993fb37c";
+      sha512 = "eeb0f38f0aa9cca8c7d9530a60416685054394a016778006eee3fad363f05ef8a362425e1a318d18b9f88c409b60fe380dfd86080825929aa9cd2553392a8b79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fi/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fi/firefox-55.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "2a73b783ac0c9728385d7a47e94a430bb04c3d8d50f7d35fc8256551788f2b23156e0d8cd73595c2d11af26060a4f5caf9c711a2542d9d68197e5773fcd03cae";
+      sha512 = "678e4396e41c5674b8bb5a536c498b48312b2fc029ac8a34fe152b93392e6337f41f29c755157a0cbb3af39098eb9a821ca288b1b09d28da417164a46195f5f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fr/firefox-55.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "c8c0fd587e0947793c734e8b8a71f50f8d9321e8ea5214290bfe721a95e7ddb5904a7254a39d1ce395cd674c47ee34e613e09174528fb5c5a94323018d03faed";
+      sha512 = "2f94ad8820602f0687da70da22dd1d09ab7901e3697f55fb094f7e9ef2aee87b02aef529b58b528cbc7a3d3f7245f5fe2886949201fe902463febb1900c9e38d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fy-NL/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fy-NL/firefox-55.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "965e29af8153a239da08de82ce52acf78a76a02634daafdb8919c2c8c82c553ad989c7d893c6e9c0f9c10b9540762997c2ecb4d41f0411593588edef34eeae22";
+      sha512 = "7641e748104314754fab92b8d08a3f1d45871b10997a7c42b1862bd69db8cb8df41251a8030488d673127b24da40159996f1f9d88869ddf90cd60f9017cdf1c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ga-IE/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ga-IE/firefox-55.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "7abe283e1898c11bfe5df5a5ef629a0d08887e12606648c39a21eac4c96235c2ea5e2493ac1515d4ed8aaba638cd14f85c929fd08d8f79d933428823e7096266";
+      sha512 = "8eaba21bf5b37552186db581f5f0da833170ccc1eb5c490911b51771a72d1c48678aa680f29ef5f1a3a3cc019ba5e9a58fddfdb9acd08b2356886a84eb5801b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gd/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gd/firefox-55.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "f980334b4576c3ffabcc41431a90379ac8d13e1bc493d39928f30faaf343bfeff9cdf897551b21548b4556df43eb27103f2836b9797331304be2dea536b63a57";
+      sha512 = "71508a24090f347738fc0511432d4331007e4982a69d2b07e8ef39a6c0917db55b6a0a1c4b5397f7bc96213c6ab67747a4252bba3625b1ec7ad3dbce4b6976a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gl/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gl/firefox-55.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "5fb1d134a6ad89556880d3df3208c796a14773e1c7a62f4191726d6eb24c13c2e76c9a4aba3927032da4865786b936667dd6f96b8ca49224494ceb0f08ee759e";
+      sha512 = "01f4fe34072d62b95e0197ce2622334dd851c14066bb988b2744a983bb766d60852f8a1144b2d2972ea0a7edc8bd974934e4e120b9e218ea8307744ec42ad268";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gn/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gn/firefox-55.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "508a04bef58c1042cf04f47134e615cafe26497ebe1ec0401f9d12c3fb21f87386a01859ba26226c9d0267c40cf6e5843349035c1a3e2f49c7c9f9d1439abd25";
+      sha512 = "2857bad04c580841f58aa29d02d30c87fa72d5ca2695c124ee73f5cdcef93e5b7cd02daa42f2b93a569be6773b0edb9c9da55289bf49f2e442fc91c1cf97ac47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gu-IN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gu-IN/firefox-55.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "5d44ee3027a37c8251a8c612a08d8f6916f809cc0d86f8906295a82efc6d98f475bb80c0f961bf95871e7b2dfed8faf151ecf43136a022a2f7796070625ac71d";
+      sha512 = "8ec3538b7d0278caeaae64b19300132c76cefc3345e66a76bf686391ce35cb578be9674d14b6cc54fee2017792e319496777af337401f3b3419af99e86710462";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/he/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/he/firefox-55.0.3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "62d08c2ee0b7015808883e66e5c54ed09a5ecf3a0b730efd5a89bc8d4cd35aea9ad6dd9fbfe394f12c2846923f47fb66e393c41cf4c273590a890ef1701fb7a0";
+      sha512 = "82324d45dda57df70520e878938a646e6692817f4f35d6d0f0518d8f8c7ce6183f968f9863e83304f5f41a5a6e135d77f613dbd6d277a66f6d5db9996381d949";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hi-IN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hi-IN/firefox-55.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "b6b21ed97830233ce22658e4bd7637a6449f53e095cc92b7381afa30f4d74c8df5b1082bcf1704aa75b53c0dcd75ad509774e818ee4073bfe6986ae4e93538a0";
+      sha512 = "0359d570441db163c8d8346a0cf1e50704125e6f165a6e1d7bbfbcd0ffd89fede9487195de927d9eec5d4f23889dbf4ed69d8a7807ddf93291da79bae14267c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hr/firefox-55.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "124965251c04b4db521b79102be73b88d747d0ab47898b2929ab867b24cce50768f62b61afcd3e03d338c958065c429524ef61ccaa0ae80fa1ad7c3def20e1d5";
+      sha512 = "fd3e94d57decd57ac00450b9b76cdda282bc2b528cea4630d6e835c5a1ff9d56c7be6c67e18e977ff4b3d00cc4e1db3d21b73debb7194bc094e29a49de405010";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hsb/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hsb/firefox-55.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "aa08c3616051ff566576776977af5a5827c5dcb68472ca48af5adcf0a107325395f9fae8a51f824e126b74fc9f6816401acedc0bc61783a8416e6ea3431fdf85";
+      sha512 = "0a6896110e471501194086932f155d0a5302fbae75fc0403cf437d13d5e5e3ecdc382ac748688f7918307e45d294e0b29100831fbab5684afb8d78f9031512bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hu/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hu/firefox-55.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "5b7e3c318657e20bc012f1324928c43b950cb1fc860ecad40fe6a64e4cf8ce30e4a32bf617b02e397dda7a1f8bfc40c8709ba09144ae1bf5676104fad1763798";
+      sha512 = "ed27b99b71dbe5f51db4a981e4c93b59c35d7ebb2965b7d12719c70de41512201f37f4540aee2bb723ebdb7b2737df668babef889847d3c136d6083433e75c20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hy-AM/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hy-AM/firefox-55.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "31e5389d610ccc05d387ae23676bead9176d87ada142fc545e571ddf296a4bfe396725982f011a2c0b35dec8f8d06e97aad8b42235cb98aa9db5f0352356b3fa";
+      sha512 = "568c1e4bc95c26b5b0113c0784a305dd5ecfba56f5cb8318f71e135a676f9b86e38fe31675684785d2cbff7a1db46910c0ef7c60470791f9b6c0334422df83ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/id/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/id/firefox-55.0.3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "b037671a6d63e0a55564987dfcd1b3bee1347c180e29a6e6df80db0d6cda284e08a6eb5b31a37a1eff208030aea3cd3d4ef0ed711ec1c936c746efa870e5bd46";
+      sha512 = "91e66bda4ef701bfd10e5170ba463fcd1849083651add4cd09103c5eb6532ce5f72bd30a15e0caa811e2e78326fa53429f7d232a27100ed03207f2a2110730bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/is/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/is/firefox-55.0.3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "6a681a05885574a163d7603edf61a0d075728c7eb50d8e78690c0828d5189ee757cc225913f060b27a254f2a19d03eb63525fd5f305377e45ee4ce5c729ba397";
+      sha512 = "a9fe82f9045ca421c45bb9f2de9fd28b57b22329dc767b402a7393d0275acda591cd193d0285395a36907a9b497427a88d2d4da2c224bcd123dfbd53888b2e3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/it/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/it/firefox-55.0.3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "5e37dde84cd5b7a162438d2d418fa80f8529cc3ff3b28bd37b0826d8f5981ffec6fcfbe7b41cbba92d7c921bdb1249e6b0f5188ef983187e7b60bde08e80bb24";
+      sha512 = "2ea32878113a4256eb9e264bfbf67a81803f8c89a63d74e3ba66a143ede3af2082e5fd13f1e761147f5545c29c70f578210b2a4e5dbf2985ce957ce79db2d568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ja/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ja/firefox-55.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f59fe7957981b362d01f33483bb43ade19894c0f80fc2a1b889e3348b27876f54b7de20e9a67915bf8a4e0c4d89cefc87911841637c63f987b0aea183bba4ed4";
+      sha512 = "760b3c4ad18d6af0b1bc993dd9d12d76e30f6c197b1e58d9b4606d271ce502fb609b1208c0ccdea222bc7076f03dc8923e61cad092d23c0289ffb5bdd3d8442d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ka/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ka/firefox-55.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "381f250da469df0245bf6a41165955b0dbac3a14268b9a9bd59836d3094695ac6ae434eaafd41138b24fec3507a6d020ec2bcde740865ec3605a554a1c7ca0e1";
+      sha512 = "5a2c4a3249be869c5e70369c38a3795de3cfc2ad9bf30f933f82b4a286d72fb9c936d4df8e1320105a4ba20ebadaaef1659ecbec80eb9e8e21aa8f403d912c41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/kab/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kab/firefox-55.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "5f33d95c60567e02fd4f721a5a0084a255a16bb130737c7dc8e4ee3334f2eab33d4a415ef306bedf55f7f0aaca7e615bd5cc175a08edcbfd770c035ce928bca1";
+      sha512 = "7ef692ed2101c094a08b3593ba2d1738a616803b3649f83f650c0038316fd52b51e8cde53116015a54dcdfbfeb9d1209dea2273705142bf431b29c2f6b7611dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/kk/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kk/firefox-55.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "ba2006d6b797fb63bdeb285d7eb5f91374f2b8df7593f712a6b5fd185bfbf8af082f7e2db1f7a79a15cc34a95458ed114b78daf89b362dffc7238a253421ddd5";
+      sha512 = "bd88bc609a6638f9cf825e2ce9b7a615c555532275dea9dc3c6e79376cd2d814b886f5266631166a53ea38542e66011608f52797febd2867d15c18223d5f7788";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/km/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/km/firefox-55.0.3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "ff67a4724bd50795aa8161b74382f9b53caab3b98f6950b4d3285c0f8ea636c4b6626a4d3e8ed03c633f756ed9738b4ce69e6cffdd034aece4515ab7bb9ece07";
+      sha512 = "b38ca1ff78eff732ef54d71cc956a31fe87922e76df5cef63ffc13016b01394aae904a17b7c8905d62120420bf715b8c37f73cd5fbe2468003d55b8c28db47c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/kn/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kn/firefox-55.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "42eae0cb137fecfadc72dcbb0e7ff62e7b6701d1ebbf4190e1d20a1211d200b54989f15889f260566002a83d672b105453cdf23c2094af0f55cf4300381e9c81";
+      sha512 = "ae05bfa4914d479de80f0cb6842a570737b21097a60386b700cdd831374e6197cbc5d0b171b2091ce962e082bb7809fa46fcffb4a1281d7c38d5f57675b8e925";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ko/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ko/firefox-55.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "8fcb7965e550c9fd510bf782f54a60bdc38f3707874c6f24d1a24de7ddd5eec2736490c6cdc2ed1206e99a75b3d7267a216bd6003652375841789c0d0e0ed71d";
+      sha512 = "20993f13768ea3b035b0b9d80db2baaae2d07757761a9d0a8e2a992df2e7ba3b891222c93dc3778f1b51b381ab99adf2671161560904f99a4756d5e4999cfc82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/lij/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lij/firefox-55.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "0dc0d54b31816be522fda4572347f6c4f1c244b0a919650500cc66beb39da1e46637db089cb595228213cd4e99262bfe4689f6315f25f6e359ad299bd9d202db";
+      sha512 = "0bf873490e9a6dc237d5bf2b8f32676b78eb1d6d9a8cf5f5ca9d1913b4b235e9694010463ba13bd082a90cae23d65f6eb33a15a8dd8e21092a5c966c2805ef54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/lt/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lt/firefox-55.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "9b498e3adc4d069e219af0034a69fddff2d70e7a28dee522448a2c4586e26b6b905ba8f501f5c9b83b9ff8a2888d7025171aefa002a815fb6d352889cad95016";
+      sha512 = "0660a016305c84dc4601bc1e324864702233cd08a356673f515d8b9a9b7be443c6e265cc6072f144c49a097ab3d512b033ef0ca657be92117f6b646b6e2102f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/lv/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lv/firefox-55.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "2246366ee92a315330a4e8d1e77e21cbf875d599c169bffdcf32eace63b5794ca106d5801523bcf547dbb26ed24aab3ad108e461a8cfce0254b6389f6b1df077";
+      sha512 = "6fa4d166fd871e1d76d8324cfe50217a468c6da073905504919ab69c6dd14521f585e0e347fc076c985afb5d41f86b3ae691f09492c97400ad5245ddbaaadcf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/mai/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mai/firefox-55.0.3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "ca5bc8eee4fe7643c98a3c93381a7156373b1ec94c86d8601d1529daf8cb225ee12d813fa2d310384d99cfd130dc3480ff243017a15739533d7cf7552052f12c";
+      sha512 = "a18f5580bcf74d2dde0d2c1bed4413add943d0e7ce8529d3fb5ab55b91397352eb70ec8c393cf8f9dd89e3a32f4187b4cc93954800b63d1a10853bcf13202b10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/mk/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mk/firefox-55.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "ca81a90c97feedc7bda3ce61f5dccc0e3c2563d284a8e10c4ddd16a3d93042e3fa38f10dfbb0218df9fa83051b778ffa629d5f57735de85e44b74b820d180018";
+      sha512 = "72248c99fd9bc40ce579992438cd94b050c18100b26cbfe575c6199ae3b986d1d8aeb8fcfb63c8b8464b7d4ec35f6b332fc32595e72603eb7d41f0b0dbf3c2b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ml/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ml/firefox-55.0.3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "7668eff72251028c9392774cb84742ed5027d4e0b617b4864b0e3d079061c95ab81c0a2471466a1b69a8e0e5d331b6b75c6a63be2411ff90bab48b3acab28ca6";
+      sha512 = "f9ae435602cfc796d93a2e5aa9ffe1216c1465de3beed4ecc6b04141c392df9d1b6280deb1d69c30330db4c9ac6568b3cc4849e57c8e84f8d3e69c47a473018f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/mr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mr/firefox-55.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "27f6410bd1da1e7360cd86c493aaf7ec406a30957fa41b35c5ac8b7a5c32eae2da0b5197a018379215bfed60032c8291446d9e3a10f5b371675154cb54b8d0bd";
+      sha512 = "0cff95fc291a1874926ec895150cbc99b8219b29f4e66782ab182c29670b2356a5ccb1a765e0eb734666f7ff4a7be7806c62012b38118ce8d2a8f7c47a1e936c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ms/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ms/firefox-55.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "cb1718ed34f2e1a48a2ac2f69a00d477cd3aacab7a6b0d149f240ddaacf04993c44403f68c9d5cbac95e03db893c8b713208466784f867d4b00b0122b9de5c39";
+      sha512 = "1add2335e98ad3ea9a2b57ca733087830c50e50872f8add7d8d5f2571f2d858b4f4a866298a8509398237ba62c363eccce9bb358c978cbd7b1ac6cf1dcaffce5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/my/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/my/firefox-55.0.3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "9fa2f51c3666a7536dcfb8fa769645117c98eff0af9969bd0e54853c42345ad407b102db952ae2a9cbf286c221b0a821f56f3f67caf114fb62990b0564aacba8";
+      sha512 = "901404d74cdd090c0a63b2c0e60d0fb7afcdf3fbabda7dff07205613680ea315c2c33ee33001c8e10174f91698cc1cb4f03dfcf96e1104a5bd2d4750666627b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/nb-NO/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nb-NO/firefox-55.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "230afe8420be9daeb270fbc836de70ae2eb197c2b1b9f8d7606d16c73c718190ebde135bdb8a78ef29b1b271a30bca3f5438434c54e76dd3f86076dc77fc5b6c";
+      sha512 = "50821c1cf2ff9b49c34f9e05007678068d73d9558e43083bb305049c47d62abeeb3c0a994d872de6c9dbe86971e4a5d70de716a9051180a0b2bd73df213416b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/nl/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nl/firefox-55.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "8d8ba124d9efd39a2faee19d2e37fa11506a135aaf70fa780471a7ff763c943e943ff970a70023d4431da50f5e7f842382bef66eea6ddd07f3deac05850761ba";
+      sha512 = "a81331ef521173951d7b45e726dcc0d57fa4d1ae1d9c05a835163bd71bd6ec6ee410a355bd2d697b6c59f3a8d9d2a5122182e82ed800b0d8c1830ff759fff71c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/nn-NO/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nn-NO/firefox-55.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "ee7125a2cbb47d1ad7b541ccd4480eae05ce5b94d8a280f8f99cc45a29e23480f3ba5610d5f97e2b5ad677a2d6b79b72162707fda851f5930b8f38ba030abdc4";
+      sha512 = "9e8e1337557ab07c07ceb5395d6cdaca647a606650ff00d76244df125e6e041b3580828cc25dc1e300559b05a83121454e77c88e47c0708c30a561b00f18a86c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/or/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/or/firefox-55.0.3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "f7dee58fa33c741aeb0a85e5d9a2787e6af7a74e48cf41f76fb381f8761ce5883b639e023246ad94efa42c51da88dbc1bf5c1af25832c01e71915a9156e07a42";
+      sha512 = "4dddf3bcc8b46c326a632f96844ec369c5593bbd70a846a4d041a5f14da29b953c3318aef820b46d4e77d25e79290fa77230ef17c0d57bd00802f830ae4a76a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pa-IN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pa-IN/firefox-55.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "28f22dacd509e904a61c915f40abfe315f724f919a1ef31d338173ba92df4e7977f77b48f7aac999a89b170f845d0bd1e21e07090189193a10568ed14749213a";
+      sha512 = "b22a57fb65257b25f2a7c083fbdfeb9ca0ff83919d5201fb6996a5af33a68a2722ed8174853d81a90d61beb79d811c6b756d1fca6dea6c70175165255dc92bda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pl/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pl/firefox-55.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "712433bd8d4cc1d1a29adfd2c3de423f355dfe92ea9c341b1315272f22ae4c1a1b7cb34a9320e8ba2479652e99401b0d449824fca23b4a61bd2763265ccf401a";
+      sha512 = "76d98c31d80b581a910a703098a0f80d9b9dceebb8b8f5f69eb428a59d7b592ff3aea40f152b1c74a9a849c45cfe1334951261b84e84ed454afa3bf9d14afdd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pt-BR/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-BR/firefox-55.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "50701c3deac2821de87dde0858804bfe2e5ed25eaff5ab599a5a6fd03fc94ccbcae781f4b127bf4eee2cd068415d78535dc6f029ba472ab6060b803b815c33af";
+      sha512 = "b22cce3b391df6c945a7d84294b3ca36c90438d1eeeda002f1af4230bb8638733db1313b36f3d907b8ad4b7b117eec58c601abb21400ca2cd228a44fc49a499d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pt-PT/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-PT/firefox-55.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "4a03a6ee97a7576475c47c1eb9f4148fc242dab79f80013cc720f3e4f31a176d59ebbba9aa53e0ef72a3b890ac3c8d3905e22eabbac61b0c95bb50e8fd4aa2c1";
+      sha512 = "7f0f627c170f8db91525a3aebbe1afe47a84745eba53da6fec79c14a95d857f8ca65ed7b52d67d966f371d3c4cf1bc4d734e1c8f427775e234aa80c318aeac52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/rm/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/rm/firefox-55.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "868cf77f91cfba14156e5e053891407a831aa6e24c8050d20e7772a0e7d8f06b831d83134f177fa7fa1fe2fafa815036e7b9a6a5c3b1814d191aec9ffeede3a6";
+      sha512 = "3e7941441c09a0dbac44ae352b3817713b34c0a7cf694e465b75cdc53d977b97ae3e388ae580880bc33df134d11fbe941b4d1c63567ee6183f43bde31a2d9793";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ro/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ro/firefox-55.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "a30d9ee09a94830d1196ea2ce0e92e304a28c696a8b8ccc9066ab67b03452fec4f93bd3c5975f9db22a8dba0cffd115000efad815fd9ae1a1a892cd5a3d87bc2";
+      sha512 = "67d270f1eed7b761499967d1d3ae6c1c7e067f124689f6214be6ba5687f3eb212e70a6089573ab2a90315593d8749496e48d047cb8642b19c01877ee394ef86d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ru/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ru/firefox-55.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "de5678325845a719fdadc26928a6691887711e08a3067f2ad2c658db19e68a019b567e6916673ba6b869b8174cf9729015400feb7aae5cd9f7ea55e85d085348";
+      sha512 = "287e6a3fb2de71b31a0cfd74d3eca00ad8ae1cc68760fa5731c1cc9f58c4bcccecbfefab892b93864ffffca6433498d6daafd7928b9633f8a587de3c0787600e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/si/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/si/firefox-55.0.3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "0942c285a4e4a5dee08bca7709337f01d03624287a0ff8030309d1f503da4ac13c0df8314c2eac4be3a13a9842ba8e9fc2b3ebaf6a7d405e733afb8ff1bc3d8e";
+      sha512 = "63260a1c9e333d05654ac7d912011228d0f787d2d2a5b084410ee6cef75b41ef3ee08dc305f95baf459d16fa4f206792e3811426500ded4d02eea0d6fbc0d5ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sk/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sk/firefox-55.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "881bf74e210e0b3430060644429bb77447014381e6aacee6901dfc35dfcd260e719e39dcd158fb7624261ca62c68587c12fc178ee62548f4a1f0844c8a9c1eea";
+      sha512 = "339c3df4c1a12e14f6e2156ec0fc64aa62fb5d5e93897fcd412980ffa37edd2f6a55f3da991e0ee4c00aaa30e469f862e288cd8c950ac03bcebbe8b84d12f374";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sl/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sl/firefox-55.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "f813a8dbef0506e281c3e347d8a240da65940c7fcb0609a9510ab3c83f2fd13462d1ad749bbe768ca65b92ae1d9dab72880f5592b430d796fd377748291ba41e";
+      sha512 = "793c89b07c0fb8e7929aecb67bd37a1a97156d48f50972ec13583728614703b3d69e50249efb12b592aa6e5643d3f2af2aa57854ea1bb88d080983ded11ef676";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/son/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/son/firefox-55.0.3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "61c75236138087ba7b56eaa5fcf4360fb869dcee60dd1f431b92a613ca00a64172bb48e9ff3a649e5e616566967ea0f254517ac1c98875efe2972bc9d2075b96";
+      sha512 = "51d941ebf974bc04f9aa7a02c14c14b4aa5190d3621604964262a92d298d68d36f3aaf84ed235760d1d9d766d29a97490ddd6df8cfc53ab215526741c8de0d31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sq/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sq/firefox-55.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "072fc33249af1ffe150ef5ab2ccf79322227844e1adc4928947b43b7956b98812ed80b1995e06d5e731f107e58cd1bb1d26eba1b9695fff7a69e00010c364e0e";
+      sha512 = "44ee948b537e8774fbc37361639a83508fa3e7bb0978e12bce9ecd8c9a02d9bcf6ba28922093e8701deac71fd577eb4d85cd349c85e93fb04f5e5e6a02d6fa48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sr/firefox-55.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "bac3cfc1adf91712b58777b26fc506e1db025a58f94aef8016904d957cd8dbb2f91950ae652e076b27d4e6624458c1f10d60ca0e2906440663bfb9e239916e04";
+      sha512 = "77e9dd47c3967435a83e191c335791d03e6e63206f1e303eece5e1a813bf5e0b88aede11eea033972e578974beb4ec6bde260194a01e15f7b9ed7fd915ace77d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sv-SE/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sv-SE/firefox-55.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "57499d98d877bbe491737ebf1b799ffef61ea41f7c903b3fc298c7006fb3a1d791cb716487f4b4fcd32d230f0fe8466ee1f36cdfd3832d920928bcdc62586ef5";
+      sha512 = "945a718d39d665e4b51a57ee4bb819eca8d4572c2e9098c448bece63b76bfbb652764667908c66ab4f9ace0c82b2d476f51a6fae5ba0f24aab8f94e47f506085";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ta/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ta/firefox-55.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "dfc1348f2239d917c19aee05f2b0d181b8028ab14b5b60fef2d8eba955fe1cb50a1400f8b5639f86c2aa8b82cc3a248224dd126d3313a5dc2f2f16014db1d0dd";
+      sha512 = "17c5f121cee7d8b81fae8f1b2dec696e4fe02abeb0fb50124906dbb9d00c4a74a917d812760e671215f7391c408a391ecad2c590103956460dbbe5484595f457";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/te/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/te/firefox-55.0.3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "50e89852e7799661c506f313440c7ef10ce96fa7562452cf9f6685a93d8d2f8ec15b8984d6fe971e9fe16b4ab916b665c1e4343e37a5cd4b75f0227dd2530915";
+      sha512 = "0f14c88d99afa7f299bff4d456d10a08bd4d359bd5ffae74b51eb907274e0ac5da1b762f357b845f7039e2b43fffa1b20c1a7fbd895ac57eb42615516ef0329e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/th/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/th/firefox-55.0.3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "d1538447ed93bc652131e6d608a784294cf5f6b828e88109ff452d8f8e537dd76f9fca95b29c7eb3874c1e0b284b8ff45680783282945820fce1609c2c1cd116";
+      sha512 = "2727f304314911aabbd34f46afda1c035fe018cd2efcfd2ab89cd71a265de176b5fef36f176086f93c28e0d456464634dd36f6e048761b24d276aecd0dc7fb97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/tr/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/tr/firefox-55.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "7e6984a3364c1da09ada8f4aff6c2e1c371b5a4a6ee64b13afd3144d8e221081248aad6baf0d5399c3dc8a9891b184ac9fb74c9572b66007b1f1fc29642c16d3";
+      sha512 = "74b31af4b6622d286aa145e41567b09e9d1f0d922dd256647f09c959f09c2637889d11a346ec303c0fc871c8b1a382707756b8d0fc38d7093387b0247d143ff5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/uk/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uk/firefox-55.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "98ffd7e12a77387cb503d8c91cad07385d6d151319afd6c109712638e83ff2391555906c762c4127455487d5d9dc0ee68a20a0865791b4ebad3deb1bf9bae04a";
+      sha512 = "a9373c5d8379a7ab483d4587fdc3df8adee0371d2a40b7886033d0505022b8adb516f7164d67da7b504e170aa5ed105218124274173d29c232e2dab7f7279921";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ur/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ur/firefox-55.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "2e1de51b606d155bb05c6e6f51dbfa0932ec0d9d521e3904859e0c3a98ecdcd174efe865ccf44f54814530c8a979d00508d7edd25fd3d8b2e2824dc2576898fd";
+      sha512 = "78578c99aefea3eb46d70d563868d2eb0bf43cc6a905b908305cf61ffe5b49064bf2845661af48c861e93cf50aa5e9d8dfaa755f11732760c1574cc0c88e5718";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/uz/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uz/firefox-55.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "850fed3fbca540e717bfc6941f1d41067e596b338173924cfd2bb4109f6c52d0eb83d0f5c405f3aa3074e853dc1f1cce205f1e599ea5a2dd1422ee37fc40b691";
+      sha512 = "0739b4d60e55b1d4e0ef5984050dca5ef484edb73ed590f948d8e4c4c2303cc0fcd177dbcca4ef66bf61821172675a4805aeaaf3349df1dad5a3080544316aa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/vi/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/vi/firefox-55.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "aa512af12c17bf2703798b3e4bd846fcaaac2230be4062f1804b73461b78f9ea8fadec137783c8f7c6ecdb11d1a1f324c57884dd3e3deb7591c4203603887d73";
+      sha512 = "9e0185b988338a333e7d89a384bd42dcf6f6ca8db4eedd56236357909f9d43ec09685e8099fe25833dcd60c301297760972770bbca7b61aba87622abc2623428";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/xh/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/xh/firefox-55.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "72273bedebc546a1fcb1869154cefe7cd542348e20d01a23a3cefa8eb8bd0766159d46d69759a7d444b8d28f9769d1ef693b9f16e4fded27eca2b1a93ace6ffd";
+      sha512 = "63c1cd434edcb6069959085526cc14845de1fbf4da135a1e705433fae305dacaccfc958b98e0905b5cb2627f50b768db0940aeb728a4ab84e4592b596e50a895";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/zh-CN/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-CN/firefox-55.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ef38cb84527c941be98315db0f9f6dd6c30a7eaf2ab8830429d79341e6af3ed919ae046b6e42d08e07990d2255b2600cb7dd3b3f24c36cb985d57e7828ab7f53";
+      sha512 = "a8c2473a2e172eb7bb34a66a4ce145218ba1cdbf951d3865561512cecd6cdda2a9741c6b383706f37537eea646fa1b282174ce9634bc69105c7611879c851a69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/zh-TW/firefox-55.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-TW/firefox-55.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "b7aa08e3e983c0453ae2d4482ab3d15c7a0a814cef78cb2103539a2771555e0c2c8675e3f8bebcbfb7c801bb2b1399e321b805d99aa28dcb3aee104d887cd6ac";
+      sha512 = "f40193e6390f143cac3cdc0c230fedf2e791792d16e8446becf2038b4916274b47522bf5f239454696a8cbfffbb001556ade3b1bee2bdd239843f3bc3448b03f";
     }
     ];
 }

From dec0929f197e0099d6389a06adfcacde602350c9 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 26 Aug 2017 03:13:03 +0900
Subject: [PATCH 2675/3246] firefox: 55.0 -> 55.0.3

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index a0a1b304d6c..36053045468 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,10 +6,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "55.0.2";
+    version = "55.0.3";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "a27722cb5840aac89752fea0880a7e093e84b50dc78a36dc8c4bd493ffda10fa61446007f680bfe65db7a0debe4c21e6f0bf9f0de9876bba067abdda6fed7be4";
+      sha512 = "3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416";
     };
 
     patches = lib.optional stdenv.isi686 (fetchpatch {

From a470be5a16e54ebdda7d1e61ca1e74f82aed3199 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 16:39:15 -0400
Subject: [PATCH 2676/3246] expand-response-params: Build more normally

---
 pkgs/build-support/cc-wrapper/default.nix        |  3 ++-
 pkgs/build-support/cc-wrapper/utils.sh           |  2 +-
 .../expand-response-params/default.nix           | 16 +++++++++++-----
 pkgs/stdenv/linux/default.nix                    |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index d5ae64c9c5f..bb95c1807ab 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -342,7 +342,8 @@ stdenv.mkDerivation {
 
   inherit dynamicLinker expand-response-params;
 
-  expandResponseParams = expand-response-params; # for substitution in utils.sh
+  # for substitution in utils.sh
+  expandResponseParams = "${expand-response-params}/bin/expand-response-params";
 
   crossAttrs = {
     shell = shell.crossDrv + shell.crossDrv.shellPath;
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 7e9979f10ae..c84a094e26b 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -30,7 +30,7 @@ expandResponseParams() {
         if [[ "$arg" == @* ]]; then
             # phase separation makes this look useless
             # shellcheck disable=SC2157
-            if [ -n "@expandResponseParams@" ]; then
+            if [ -x "@expandResponseParams@" ]; then
                 # params is used by caller
                 #shellcheck disable=SC2034
                 readarray -d '' params < <("@expandResponseParams@" "$@")
diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix
index 7afbb727fc3..2a4bee74197 100644
--- a/pkgs/build-support/expand-response-params/default.nix
+++ b/pkgs/build-support/expand-response-params/default.nix
@@ -3,11 +3,17 @@
 stdenv.mkDerivation {
   name = "expand-response-params";
   src = ./expand-response-params.c;
-  buildCommand = ''
-    # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
+  # Work around "stdenv-darwin-boot-2 is not allowed to refer to path
+  # /nix/store/...-expand-response-params.c"
+  unpackPhase = ''
     cp "$src" expand-response-params.c
-    "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
-    strip -S $out
-    ${stdenv.lib.optionalString stdenv.hostPlatform.isLinux "patchelf --shrink-rpath $out"}
+    src=$PWD
+  '';
+  buildPhase = ''
+    "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
+  '';
+  installPhase = ''
+    mkdir -p $prefix/bin
+    mv expand-response-params $prefix/bin/
   '';
 }
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 48deb9a5c02..fab1985b976 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -310,7 +310,7 @@ in
         # More complicated cases
         ++ [
             glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
-            gcc gcc.cc gcc.cc.lib gcc.expandResponseParams
+            gcc gcc.cc gcc.cc.lib gcc.expand-response-params
           ]
           ++ lib.optionals (system == "aarch64-linux")
             [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];

From dc47e763c15b54ece609e08d0496462a11862cd6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 17:30:56 -0400
Subject: [PATCH 2677/3246] cc-wrapper: Use `set -u` for better maintainability

---
 pkgs/build-support/cc-wrapper/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index bb95c1807ab..696e43369a7 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -114,6 +114,8 @@ stdenv.mkDerivation {
 
   buildCommand =
     ''
+      set -u
+
       mkdir -p $out/bin $out/nix-support $man/nix-support
 
       wrap() {
@@ -320,7 +322,7 @@ stdenv.mkDerivation {
       rm $out/nix-support/setup-hook.tmp
 
       # some linkers on some platforms don't support specific -z flags
-      hardening_unsupported_flags=""
+      export hardening_unsupported_flags=""
       if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
         hardening_unsupported_flags+=" bindnow"
       fi

From df7c305c4cba1c69f61086be64ff9bbdacb5a31b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 16:55:55 -0400
Subject: [PATCH 2678/3246] cc-wrapper: Leverage the setup script instead of
 `buildCommand`

---
 pkgs/build-support/cc-wrapper/default.nix | 225 +++++++++++++---------
 1 file changed, 132 insertions(+), 93 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 696e43369a7..0114170b8eb 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -112,7 +112,14 @@ stdenv.mkDerivation {
     '';
   };
 
-  buildCommand =
+  dontBuild = true;
+  dontConfigure = true;
+
+  unpackPhase = ''
+    src=$PWD
+  '';
+
+  installPhase =
     ''
       set -u
 
@@ -127,103 +134,16 @@ stdenv.mkDerivation {
       }
     ''
 
-    + optionalString (libc != null) (''
-      if [[ -z ''${dynamicLinker+x} ]]; then
-        echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
-        dynamicLinker="${libc_lib}/lib/ld*.so.?"
-      fi
-
-      # Expand globs to fill array of options
-      dynamicLinker=($dynamicLinker)
-
-      case ''${#dynamicLinker[@]} in
-        0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;;
-        1) echo "Using dynamic linker: '$dynamicLinker'" >&2;;
-        *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
-      esac
-
-      if [ -n "$dynamicLinker" ]; then
-        echo $dynamicLinker > $out/nix-support/dynamic-linker
-
-    '' + (if targetPlatform.isDarwin then ''
-        printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
-    '' else ''
-        if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
-          echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
-        fi
-
-        ldflagsBefore=(-dynamic-linker "$dynamicLinker")
-    '') + ''
-      fi
-
-      # The dynamic linker is passed in `ldflagsBefore' to allow
-      # explicit overrides of the dynamic linker by callers to gcc/ld
-      # (the *last* value counts, so ours should come first).
-      printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
-    '')
-
-    + optionalString (libc != null) ''
-      # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
-      # against the crt1.o from our own glibc, rather than the one in
-      # /usr/lib.  (This is only an issue when using an `impure'
-      # compiler/linker, i.e., one that searches /usr/lib and so on.)
-      #
-      # Unfortunately, setting -B appears to override the default search
-      # path. Thus, the gcc-specific "../includes-fixed" directory is
-      # now longer searched and glibc's <limits.h> header fails to
-      # compile, because it uses "#include_next <limits.h>" to find the
-      # limits.h file in ../includes-fixed. To remedy the problem,
-      # another -idirafter is necessary to add that directory again.
-      echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
-
-      echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
-
-      echo "${libc_lib}" > $out/nix-support/orig-libc
-      echo "${libc_dev}" > $out/nix-support/orig-libc-dev
-    ''
-
     + (if nativeTools then ''
+      echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc
+
       ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin"
       ldPath="${nativePrefix}/bin"
     '' else ''
       echo $cc > $out/nix-support/orig-cc
 
-      # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
-      # ${cc_solib}/lib64 (even though it does actually search there...)..
-      # This confuses libtool.  So add it to the compiler tool search
-      # path explicitly.
-      if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
-        ccLDFlags+=" -L${cc_solib}/lib64"
-        ccCFlags+=" -B${cc_solib}/lib64"
-      fi
-      ccLDFlags+=" -L${cc_solib}/lib"
-      ccCFlags+=" -B${cc_solib}/lib"
-
-      ${optionalString cc.langVhdl or false ''
-        ccLDFlags+=" -L${zlib.out}/lib"
-      ''}
-
-      # Find the gcc libraries path (may work only without multilib).
-      ${optionalString cc.langAda or false ''
-        basePath=`echo ${cc_solib}/lib/*/*/*`
-        ccCFlags+=" -B$basePath -I$basePath/adainclude"
-        gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
-        echo "$gnatCFlags" > $out/nix-support/gnat-cflags
-      ''}
-
-      echo "$ccLDFlags" > $out/nix-support/cc-ldflags
-      echo "$ccCFlags" > $out/nix-support/cc-cflags
-
       ccPath="${cc}/bin"
       ldPath="${binutils_bin}/bin"
-
-      # Propagate the wrapped cc so that if you install the wrapper,
-      # you get tools like gcov, the manpages, etc. as well (including
-      # for binutils and Glibc).
-      printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
-      printWords ${cc.man or ""}  > $man/nix-support/propagated-user-env-packages
-
-      printWords ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
     ''
 
     + optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
@@ -314,12 +234,126 @@ stdenv.mkDerivation {
 
     + optionalString cc.langVhdl or false ''
       ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl
+    '';
+
+  propagatedBuildInputs = extraPackages;
+
+  setupHook = ./setup-hook.sh;
+
+  postFixup =
+    ''
+      set -u
+    ''
+
+    + optionalString (libc != null) (''
+      ##
+      ## General libc support
+      ##
+
+      # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
+      # against the crt1.o from our own glibc, rather than the one in
+      # /usr/lib.  (This is only an issue when using an `impure'
+      # compiler/linker, i.e., one that searches /usr/lib and so on.)
+      #
+      # Unfortunately, setting -B appears to override the default search
+      # path. Thus, the gcc-specific "../includes-fixed" directory is
+      # now longer searched and glibc's <limits.h> header fails to
+      # compile, because it uses "#include_next <limits.h>" to find the
+      # limits.h file in ../includes-fixed. To remedy the problem,
+      # another -idirafter is necessary to add that directory again.
+      echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
+
+      echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
+
+      echo "${libc_lib}" > $out/nix-support/orig-libc
+      echo "${libc_dev}" > $out/nix-support/orig-libc-dev
+
+      ##
+      ## Dynamic linker support
+      ##
+
+      if [[ -z ''${dynamicLinker+x} ]]; then
+        echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
+        local dynamicLinker="${libc_lib}/lib/ld*.so.?"
+      fi
+
+      # Expand globs to fill array of options
+      dynamicLinker=($dynamicLinker)
+
+      case ''${#dynamicLinker[@]} in
+        0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;;
+        1) echo "Using dynamic linker: '$dynamicLinker'" >&2;;
+        *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
+      esac
+
+      if [ -n "$dynamicLinker" ]; then
+        echo $dynamicLinker > $out/nix-support/dynamic-linker
+
+    '' + (if targetPlatform.isDarwin then ''
+        printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
+    '' else ''
+        if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
+          echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
+        fi
+
+        local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
+    '') + ''
+      fi
+
+      # The dynamic linker is passed in `ldflagsBefore' to allow
+      # explicit overrides of the dynamic linker by callers to gcc/ld
+      # (the *last* value counts, so ours should come first).
+      printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
+    '')
+
+    + optionalString (!nativeTools) ''
+
+      ##
+      ## Initial CFLAGS
+      ##
+
+      # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
+      # ${cc_solib}/lib64 (even though it does actually search there...)..
+      # This confuses libtool.  So add it to the compiler tool search
+      # path explicitly.
+      if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
+        ccLDFlags+=" -L${cc_solib}/lib64"
+        ccCFlags+=" -B${cc_solib}/lib64"
+      fi
+      ccLDFlags+=" -L${cc_solib}/lib"
+      ccCFlags+=" -B${cc_solib}/lib"
+
+      ${optionalString cc.langVhdl or false ''
+        ccLDFlags+=" -L${zlib.out}/lib"
+      ''}
+
+      # Find the gcc libraries path (may work only without multilib).
+      ${optionalString cc.langAda or false ''
+        basePath=`echo ${cc_solib}/lib/*/*/*`
+        ccCFlags+=" -B$basePath -I$basePath/adainclude"
+        gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
+        echo "$gnatCFlags" > $out/nix-support/gnat-cflags
+      ''}
+
+      echo "$ccLDFlags" > $out/nix-support/cc-ldflags
+      echo "$ccCFlags" > $out/nix-support/cc-cflags
+
+      ##
+      ## User env support
+      ##
+
+      # Propagate the wrapped cc so that if you install the wrapper,
+      # you get tools like gcov, the manpages, etc. as well (including
+      # for binutils and Glibc).
+      printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
+      printWords ${cc.man or ""}  > $man/nix-support/propagated-user-env-packages
     ''
 
     + ''
-      substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp
-      cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook
-      rm $out/nix-support/setup-hook.tmp
+
+      ##
+      ## Hardening support
+      ##
 
       # some linkers on some platforms don't support specific -z flags
       export hardening_unsupported_flags=""
@@ -339,6 +373,11 @@ stdenv.mkDerivation {
       substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
       substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
       substituteAll ${./utils.sh} $out/nix-support/utils.sh
+
+      ##
+      ## Extra custom steps
+      ##
+
     ''
     + extraBuildCommands;
 

From 96e1bca1289691a458a60c7726e62de0299b2ddb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 25 Aug 2017 19:27:19 +0000
Subject: [PATCH 2679/3246] ocamlPackages.ocaml-migrate-parsetree: 1.0 -> 1.0.4

---
 .../ocaml-modules/ocaml-migrate-parsetree/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index dbfa05744e5..3610cded1c9 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -6,13 +6,13 @@ else
 
 stdenv.mkDerivation rec {
    name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
-   version = "1.0";
+   version = "1.0.4";
 
    src = fetchFromGitHub {
      owner = "let-def";
      repo = "ocaml-migrate-parsetree";
      rev = "v${version}";
-     sha256 = "0j1d3scakny2b656gyz5z2h8987b5aqw7iwssxgfbhwcszn6sps4";
+     sha256 = "0xwjll827anqngnqy746m2pd44mkhsaaqaqbir6z91xcqix2isvy";
    };
 
    buildInputs = [ ocaml findlib ocamlbuild jbuilder ];

From 4aa602386cf6ffb811822f241ba719c325d51466 Mon Sep 17 00:00:00 2001
From: Tom Doggett <nocoolnametom@gmail.com>
Date: Fri, 25 Aug 2017 10:29:58 -0700
Subject: [PATCH 2680/3246] phpPackages: add YAML package

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1d07acb8e77..4a344ca1b3c 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -105,6 +105,36 @@ let
     checkTarget = "test";
   };
 
+  yaml = if isPhp7 then yaml20 else yaml13;
+
+  yaml13 = assert !isPhp7; buildPecl {
+    name = "yaml-1.3.1";
+
+    sha256 = "1fbmgsgnd6l0d4vbjaca0x9mrfgl99yix5yf0q0pfcqzfdg4bj8q";
+
+    configureFlags = [
+      "--with-yaml=${pkgs.libyaml}"
+    ];
+
+    buildInputs = [
+      pkgs.pkgconfig
+    ];
+  };
+
+  yaml20 = assert isPhp7; buildPecl {
+    name = "yaml-2.0.2";
+
+    sha256 = "0f80zy79kyy4hn6iigpgfkwppwldjfj5g7s4gddklv3vskdb1by3";
+
+    configureFlags = [
+      "--with-yaml=${pkgs.libyaml}"
+    ];
+
+    buildInputs = [
+      pkgs.pkgconfig
+    ];
+  };
+
   # Since PHP 5.5 OPcache is integrated in the core and has to be enabled via --enable-opcache during compilation.
   zendopcache = assert isPhpOlder55; buildPecl {
     name = "zendopcache-7.0.3";

From ea491d4ea10d2cb252e796daa03ef067191da833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 20:40:46 +0100
Subject: [PATCH 2681/3246] python.pkgs.phonenumbers: use fetchPypi

---
 .../python-modules/phonenumbers/default.nix          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index ab00a946439..b527df29792 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, buildPythonPackage }:
+{ stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "phonenumbers";
   version = "8.8.0";
   name = "${pname}-${version}";
 
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0j8yzn7fva863v7vrjk0s1d63yswg8hf2hlpvfwzxk9absjyvmgq";
+  };
+
   meta = {
     description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
     homepage    = "https://github.com/daviddrysdale/python-phonenumbers";
     license     = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ fadenb ];
   };
-
-  src = fetchurl {
-    url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
-    sha256 = "0j8yzn7fva863v7vrjk0s1d63yswg8hf2hlpvfwzxk9absjyvmgq";
-  };
 }

From a75d04a970b87bd54003d3485333d7c5d8880e34 Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Fri, 25 Aug 2017 20:46:04 +0100
Subject: [PATCH 2682/3246] qbittorrent: 3.3.13 -> 3.3.15

This version contains among other things a fix for a too restrictive
XSS filter. See the full change log at https://www.qbittorrent.org/news.php
---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index c848f13b0d9..3baa5a8e480 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.3.13";
+  version = "3.3.15";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "13a6rv4f4xgbjh6nai7fnqb04rh7i2kjpp7y2z5j1wyy4x8pncc4";
+    sha256 = "1bnfnbkdg0088h25zzhlpcdh30y0k1m76bkhjsj1aali765c1fx7";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

From 7182b71489ef248e5e3dbe9a31e17e3597e42e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 21:06:56 +0100
Subject: [PATCH 2683/3246] ffado: 2.2.1 -> 2.3.0

---
 pkgs/os-specific/linux/ffado/build-fix.patch | 61 --------------------
 pkgs/os-specific/linux/ffado/default.nix     | 14 +++--
 pkgs/os-specific/linux/ffado/gcc6.patch      | 19 ++++++
 3 files changed, 28 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/ffado/build-fix.patch
 create mode 100644 pkgs/os-specific/linux/ffado/gcc6.patch

diff --git a/pkgs/os-specific/linux/ffado/build-fix.patch b/pkgs/os-specific/linux/ffado/build-fix.patch
deleted file mode 100644
index b63fd65184a..00000000000
--- a/pkgs/os-specific/linux/ffado/build-fix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index ca5d5cf..76738e3 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -354,7 +354,7 @@ if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and co
-     env['PYUIC4'] = True
-     build_mixer = True
- 
--if conf.CheckForApp( 'xdg-desktop-menu --help' ):
-+if conf.CheckForApp( 'which xdg-desktop-menu' ):
-     env['XDG_TOOLS'] = True
- else:
-     print """
-diff --git a/support/dbus/SConscript b/support/dbus/SConscript
-index 2b0f0c6..23069d8 100644
---- a/support/dbus/SConscript
-+++ b/support/dbus/SConscript
-@@ -44,6 +44,7 @@ if not env.GetOption( "clean" ):
-         env.MergeFlags( env['LIBXML26_FLAGS'] )
-     else:
-         env.PrependUnique( LIBS=["expat"] )
-+        env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
- 
- env.Xml2Cpp_Proxy('controlclient-glue.h', 'control-interface.xml')
- env.Xml2Cpp_Adaptor('controlserver-glue.h', 'control-interface.xml')
-diff --git a/support/firmware/SConscript b/support/firmware/SConscript
-index 2939cb0..307b295 100644
---- a/support/firmware/SConscript
-+++ b/support/firmware/SConscript
-@@ -36,6 +36,7 @@ if not env.GetOption( "clean" ):
-         env.MergeFlags( env['LIBXML26_FLAGS'] )
-     else:
-         env.PrependUnique( LIBS=["expat"] )
-+        env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
- 
- static_env = env.Clone()
- 
-diff --git a/support/tools/SConscript b/support/tools/SConscript
-index 651621d..01b11f4 100644
---- a/support/tools/SConscript
-+++ b/support/tools/SConscript
-@@ -36,6 +36,7 @@ if not e.GetOption( "clean" ):
-                 e.MergeFlags( env['LIBXML26_FLAGS'] )
-         else:
-                 e.PrependUnique( LIBS=["expat"] )
-+                e.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
- 
- #
- # For the the ffado-diag tools
-diff --git a/tests/SConscript b/tests/SConscript
-index 307341f..4800b93 100644
---- a/tests/SConscript
-+++ b/tests/SConscript
-@@ -35,6 +35,7 @@ if not env.GetOption( "clean" ):
- 		env.MergeFlags( env['LIBXML26_FLAGS'] )
- 	else:
- 		env.PrependUnique( LIBS=["expat"] )
-+        env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
- 
- static_env = env.Clone()
- 
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index ff259dcfbb0..1ca503f33ec 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python
-, expat, libraw1394, libconfig, libavc1394, libiec61883
+, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx, glibmm
 
 # Optional dependencies
 , libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}ffado-${version}";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "http://www.ffado.org/files/libffado-${version}.tgz";
-    sha256 = "1ximic90l0av91njb123ra2zp6mg23yg5iz8xa5371cqrn79nacz";
+    sha256 = "122z8gya60nyg47i738z2yr4qcjyk2xix4kwhf5ybkmp23kcgqqq";
   };
 
   nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
@@ -38,10 +38,10 @@ stdenv.mkDerivation rec {
     expat libraw1394 libconfig libavc1394 libiec61883
   ] ++ stdenv.lib.optionals (!libOnly) [
     optLibjack2 optDbus optDbus_cplusplus optAlsaLib optPyqt4
-    optXdg_utils
+    optXdg_utils libxmlxx glibmm
   ];
 
-  patches = [ ./build-fix.patch ];
+  patches = [ ./gcc6.patch ];
 
   postPatch = ''
     # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch
@@ -57,6 +57,10 @@ stdenv.mkDerivation rec {
       src/libutil/serialize_expat.cpp
   '';
 
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)"
+  '';
+
   # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
   buildPhase = ''
     export PYDIR=$out/lib/${python.libPrefix}/site-packages
diff --git a/pkgs/os-specific/linux/ffado/gcc6.patch b/pkgs/os-specific/linux/ffado/gcc6.patch
new file mode 100644
index 00000000000..f9cad9c88ab
--- /dev/null
+++ b/pkgs/os-specific/linux/ffado/gcc6.patch
@@ -0,0 +1,19 @@
+Author: Adrian Knoth <adi@drcomp.erfurt.thur.de>
+Forwarded: Yes
+Applied-Upstream: 2.3.1
+Last-Update: 2016-08-11
+Description: Fix FTBFS with gcc6
+
+Index: b/src/ffadotypes.h
+===================================================================
+--- a/src/ffadotypes.h
++++ b/src/ffadotypes.h
+@@ -51,6 +51,8 @@ struct ffado_handle {
+ };
+ 
+ 
++#include <cmath>
++#include <algorithm>
+ #include <vector>
+ #include <string>
+ 

From 2da2cf31fa67ca4bd68818f612c41a1d7c63c53f Mon Sep 17 00:00:00 2001
From: Tobias Happ <Gerschtli@users.noreply.github.com>
Date: Fri, 25 Aug 2017 22:51:23 +0200
Subject: [PATCH 2684/3246] php pcs: init at 1.3.3 (#28484)

phpPackages.pcs: init at 1.3.3
---
 pkgs/top-level/php-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5bb5adac9b5..d5ee57f3c5b 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -78,6 +78,12 @@ let
     buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ];
   };
 
+  pcs = buildPecl rec {
+    name = "pcs-1.3.3";
+
+    sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p";
+  };
+
   # No support for PHP 7 yet (and probably never will be)
   spidermonkey = assert !isPhp7; buildPecl rec {
     name = "spidermonkey-1.0.0";

From 7067c699fa80a67cdc852505eba7910edd10fd4b Mon Sep 17 00:00:00 2001
From: Tobias Happ <Gerschtli@users.noreply.github.com>
Date: Fri, 25 Aug 2017 22:52:43 +0200
Subject: [PATCH 2685/3246] php memcache: fix php startup warning (#28482)

 phpPackages.memcache: fix php startup warning
---
 pkgs/top-level/php-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index d5ee57f3c5b..b88cebda432 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -43,6 +43,8 @@ let
     sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic";
 
     configureFlags = "--with-zlib-dir=${pkgs.zlib.dev}";
+
+    makeFlags = [ "CFLAGS=-fgnu89-inline" ];
   };
 
   memcached = if isPhp7 then memcachedPhp7 else memcached22;

From ad7439fbd1aa06fbf24229be5d3de62330e38d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 22:00:29 +0100
Subject: [PATCH 2686/3246] strongswan: add patch for CVE-2017-11185

---
 pkgs/tools/networking/strongswan/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 2c0352152d5..4d7bc7b3d0d 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
+{ stdenv, fetchurl, fetchpatch, gmp, pkgconfig, python, autoreconfHook
 , curl, trousers, sqlite, iptables, libxml2, openresolv
 , ldns, unbound, pcsclite, openssl, systemd, pam
 , enableTNC ? false }:
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals stdenv.isLinux [ systemd.dev pam ];
 
   patches = [
+    (fetchpatch {
+      url = "https://download.strongswan.org/security/CVE-2017-11185/strongswan-4.4.0-5.5.3_gmp_mpz_export.patch";
+      sha256 = "1vqf077dq71wai7ma3bpzv55i76b48gp2cf6507chgy4wj04gi73";
+    })
     ./ext_auth-path.patch
     ./firewall_defaults.patch
     ./updown-path.patch

From 70aa1e365757138d19794d1dac3317841fc497d7 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 23 Aug 2017 00:09:16 +0200
Subject: [PATCH 2687/3246] strongswan: 5.5.3 -> 5.6.0

See: https://wiki.strongswan.org/versions/66

fixes #28485
---
 pkgs/tools/networking/strongswan/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 4d7bc7b3d0d..0671b7d0089 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, fetchpatch, gmp, pkgconfig, python, autoreconfHook
+{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
 , curl, trousers, sqlite, iptables, libxml2, openresolv
 , ldns, unbound, pcsclite, openssl, systemd, pam
 , enableTNC ? false }:
 
 stdenv.mkDerivation rec {
   name = "strongswan-${version}";
-  version = "5.5.3";
+  version = "5.6.0";
 
   src = fetchurl {
     url = "http://download.strongswan.org/${name}.tar.bz2";
-    sha256 = "1m7qq0l5pwj1wy0f7h2b7msb1d98rx78z6xg27g0hiqpk6qm9sn5";
+    sha256 = "04vvha2zgsg1cq05cnn6sf7a4hq9ndnsfxpw1drm5v9l4vcw0kd1";
   };
 
   dontPatchELF = true;
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals stdenv.isLinux [ systemd.dev pam ];
 
   patches = [
-    (fetchpatch {
-      url = "https://download.strongswan.org/security/CVE-2017-11185/strongswan-4.4.0-5.5.3_gmp_mpz_export.patch";
-      sha256 = "1vqf077dq71wai7ma3bpzv55i76b48gp2cf6507chgy4wj04gi73";
-    })
     ./ext_auth-path.patch
     ./firewall_defaults.patch
     ./updown-path.patch

From 6905e59e25817d6d22550f3857a63d326e66c42a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 23:04:56 +0100
Subject: [PATCH 2688/3246] nixos/airsonic: change script to
 serviceConfig.ExecStart

- shell invocation is not necessary here
---
 nixos/modules/services/misc/airsonic.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
index b0dc3d9ec46..3ec22719720 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -81,16 +81,6 @@ in {
       description = "Airsonic Media Server";
       after = [ "local-fs.target" "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      script = ''
-        ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
-          -Dairsonic.home=${cfg.home} \
-          -Dserver.address=${cfg.listenAddress} \
-          -Dserver.port=${toString cfg.port} \
-          -Dairsonic.contextPath=${cfg.contextPath} \
-          -Djava.awt.headless=true \
-          -verbose:gc \
-          -jar ${pkgs.airsonic}/webapps/airsonic.war
-      '';
 
       preStart = ''
         # Install transcoders.
@@ -101,6 +91,16 @@ in {
         done
       '';
       serviceConfig = {
+        ExecStart = ''
+          ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
+          -Dairsonic.home=${cfg.home} \
+          -Dserver.address=${cfg.listenAddress} \
+          -Dserver.port=${toString cfg.port} \
+          -Dairsonic.contextPath=${cfg.contextPath} \
+          -Djava.awt.headless=true \
+          -verbose:gc \
+          -jar ${pkgs.airsonic}/webapps/airsonic.war
+        '';
         Restart = "always";
         User = "airsonic";
         UMask = "0022";

From 3ba09a8e2c4e1adffbb518b23efae203bebb4577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 23:05:51 +0100
Subject: [PATCH 2689/3246] nixos/airsonic: remove full-path commands from
 preStart

systemd services are initialised with a default PATH.
This path includes coreutils.
---
 nixos/modules/services/misc/airsonic.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
index 3ec22719720..b92104787a5 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -84,10 +84,10 @@ in {
 
       preStart = ''
         # Install transcoders.
-        ${pkgs.coreutils}/bin/rm -rf ${cfg.home}/transcode
-        ${pkgs.coreutils}/bin/mkdir -p ${cfg.home}/transcode
+        rm -rf ${cfg.home}/transcode
+        mkdir -p ${cfg.home}/transcode
         for exe in ${toString cfg.transcoders}; do
-            ${pkgs.coreutils}/bin/ln -sf "$exe" ${cfg.home}/transcode
+          ln -sf "$exe" ${cfg.home}/transcode
         done
       '';
       serviceConfig = {

From 7b982fcb091a610e23647d6f47ceae3bfca9d402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 Aug 2017 23:13:19 +0100
Subject: [PATCH 2690/3246] airsonic: 10.0.0 -> 10.0.1

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

diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix
index d52153cbf4e..57040f46947 100644
--- a/pkgs/servers/misc/airsonic/default.nix
+++ b/pkgs/servers/misc/airsonic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "airsonic-${version}";
-  version = "10.0.0";
+  version = "10.0.1";
 
   src = fetchurl {
     url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war";
-    sha256 = "0ldqccdm7z25my0wmispbshnn26l50a61q2ig2yl0krx4lmhfams";
+    sha256 = "1qky8dz49200f6100ivkn5g7i0hzkv3gpq2r0cj6z53s8d1ayblc";
   };
 
   buildCommand = ''

From 7c230bf5183bc811b90425fd7ae61770cb1526a4 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sat, 26 Aug 2017 00:18:52 +0200
Subject: [PATCH 2691/3246] php couchbase: init at 2.3.4

The patch is needed because the paths where libcouchbase has to be
present on the system are hardcoded. I tried to change as little as
possible with this patch.
---
 pkgs/top-level/php-packages.nix | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index b88cebda432..d7ad2eb85b6 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -29,6 +29,38 @@ let
     sha256 = "0vv2w5fkkw9n7qdmi5aq50416zxmvyzjym8kb6j1v8kd4xcsjjgw";
   };
 
+  couchbase = buildPecl rec {
+    name = "couchbase-${version}";
+    version = "2.3.4";
+
+    buildInputs = [ pkgs.libcouchbase pcs ];
+
+    src = pkgs.fetchFromGitHub {
+      owner = "couchbase";
+      repo = "php-couchbase";
+      rev = "v${version}";
+      sha256 = "0rdlrl7vh4kbxxj9yxp54xpnnrxydpa9fab7dy4nas474j5vb2bp";
+    };
+
+    configureFlags = [ "--with-couchbase" ];
+
+    patches = [
+      (pkgs.writeText "php-couchbase.patch" ''
+        --- a/config.m4
+        +++ b/config.m4
+        @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then
+             LIBCOUCHBASE_DIR=$PHP_COUCHBASE
+           else
+             AC_MSG_CHECKING(for libcouchbase in default path)
+        -    for i in /usr/local /usr; do
+        +    for i in ${pkgs.libcouchbase}; do
+               if test -r $i/include/libcouchbase/couchbase.h; then
+                 LIBCOUCHBASE_DIR=$i
+                 AC_MSG_RESULT(found in $i)
+      '')
+    ];
+  };
+
   imagick = buildPecl {
     name = "imagick-3.4.3RC1";
     sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh";

From 4f2935390e208a08992db8625d6b0db48ee280ad Mon Sep 17 00:00:00 2001
From: Phil <philipp.B.610@googlemail.com>
Date: Sat, 26 Aug 2017 00:35:18 +0200
Subject: [PATCH 2692/3246] nixos/usbguard: create package and module (#28363)

* nixos/usbguard: create package and module

No usbguard module or package existed for NixOS previously. USBGuard
will protect you from BadUSB attacks. (assuming configuration is done
correctly)

* nixos/usbguard: remove extra packages

Users can override this by themselves.

* nixos/usbguard: add maintainer and fix style
---
 lib/maintainers.nix                           |   1 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/security/usbguard.nix  | 200 ++++++++++++++++++
 .../usbguard/daemon_read_only_config.patch    |  13 ++
 pkgs/os-specific/linux/usbguard/default.nix   |  68 ++++++
 .../linux/usbguard/documentation.patch        |  32 +++
 pkgs/top-level/all-packages.nix               |   4 +
 7 files changed, 319 insertions(+)
 create mode 100644 nixos/modules/services/security/usbguard.nix
 create mode 100644 pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch
 create mode 100644 pkgs/os-specific/linux/usbguard/default.nix
 create mode 100644 pkgs/os-specific/linux/usbguard/documentation.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7728749f054..707770cdc82 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -578,6 +578,7 @@
   thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
   timbertson = "Tim Cuthbertson <tim@gfxmonk.net>";
   titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
+  tnias = "Philipp Bartsch <phil@grmr.de>";
   tohl = "Tomas Hlavaty <tom@logand.com>";
   tokudan = "Daniel Frank <git@danielfrank.net>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 625b1d3a852..285c59572d5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -563,6 +563,7 @@
   ./services/security/tor.nix
   ./services/security/torify.nix
   ./services/security/torsocks.nix
+  ./services/security/usbguard.nix
   ./services/security/vault.nix
   ./services/system/cgmanager.nix
   ./services/system/cloud-init.nix
diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
new file mode 100644
index 00000000000..1f2c56a9efa
--- /dev/null
+++ b/nixos/modules/services/security/usbguard.nix
@@ -0,0 +1,200 @@
+{config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.usbguard;
+
+  # valid policy options
+  policy = (types.enum [ "allow" "block" "reject" "keep" "apply-policy" ]);
+
+  # decide what file to use for rules
+  ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else cfg.ruleFile;
+
+  daemonConf = ''
+      # generated by nixos/modules/services/security/usbguard.nix
+      RuleFile=${ruleFile}
+      ImplicitPolicyTarget=${cfg.implictPolicyTarget}
+      PresentDevicePolicy=${cfg.presentDevicePolicy}
+      PresentControllerPolicy=${cfg.presentControllerPolicy}
+      InsertedDevicePolicy=${cfg.insertedDevicePolicy}
+      RestoreControllerDeviceState=${if cfg.restoreControllerDeviceState then "true" else "false"}
+      # this does not seem useful for endusers to change
+      DeviceManagerBackend=uevent
+      IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers}
+      IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups}
+      IPCAccessControlFiles=${cfg.IPCAccessControlFiles}
+      DeviceRulesWithPort=${if cfg.deviceRulesWithPort then "true" else "false"}
+      AuditFilePath=${cfg.auditFilePath}
+    '';
+
+    daemonConfFile = pkgs.writeText "usbguard-daemon-conf" daemonConf;
+
+in {
+
+  ###### interface
+
+  options = {
+    services.usbguard = {
+      enable = mkEnableOption "USBGuard daemon";
+
+      ruleFile = mkOption {
+        type = types.path;
+        default = "/var/lib/usbguard/rules.conf";
+        description = ''
+          The USBGuard daemon will use this file to load the policy rule set
+          from it and to write new rules received via the IPC interface.
+
+          Running the command <literal>usbguard generate-policy</literal> as
+          root will generate a config for your currently plugged in devices.
+          For a in depth guide consult the official documentation.
+
+          Setting the <literal>rules</literal> option will ignore the
+          <literal>ruleFile</literal> option.
+        '';
+      };
+
+      rules = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = ''
+          allow with-interface equals { 08:*:* }
+        '';
+        description = ''
+          The USBGuard daemon will load this policy rule set. Modifying it via
+          the IPC interface won't work if you use this option, since the
+          contents of this option will be written into the nix-store it will be
+          read-only.
+
+          You can still use <literal> usbguard generate-policy</literal> to
+          generate rules, but you would have to insert them here.
+
+          Setting the <literal>rules</literal> option will ignore the
+          <literal>ruleFile</literal> option.
+        '';
+      };
+
+      implictPolicyTarget = mkOption {
+        type = policy;
+        default = "block";
+        description = ''
+          How to treat USB devices that don't match any rule in the policy.
+          Target should be one of allow, block or reject (logically remove the
+          device node from the system).
+        '';
+      };
+
+      presentDevicePolicy = mkOption {
+        type = policy;
+        default = "apply-policy";
+        description = ''
+          How to treat USB devices that are already connected when the daemon
+          starts. Policy should be one of allow, block, reject, keep (keep
+          whatever state the device is currently in) or apply-policy (evaluate
+          the rule set for every present device).
+        '';
+      };
+
+      presentControllerPolicy = mkOption {
+        type = policy;
+        default = "keep";
+        description = ''
+          How to treat USB controller devices that are already connected when
+          the daemon starts. One of allow, block, reject, keep or apply-policy.
+        '';
+      };
+
+      insertedDevicePolicy = mkOption {
+        type = policy;
+        default = "apply-policy";
+        description = ''
+          How to treat USB devices that are already connected after the daemon
+          starts. One of block, reject, apply-policy.
+        '';
+      };
+
+      restoreControllerDeviceState = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          The  USBGuard  daemon  modifies  some attributes of controller
+          devices like the default authorization state of new child device
+          instances. Using this setting, you can controll whether the daemon
+          will try to restore the attribute values to the state before
+          modificaton on shutdown.
+        '';
+      };
+
+      IPCAllowedUsers = mkOption {
+        type = types.listOf types.str;
+        default = [ "root" ];
+        example = [ "root" "yourusername" ];
+        description = ''
+          A list of usernames that the daemon will accept IPC connections from.
+        '';
+      };
+
+      IPCAllowedGroups = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "wheel" ];
+        description = ''
+          A list of groupnames that the daemon will accept IPC connections
+          from.
+        '';
+      };
+
+      IPCAccessControlFiles = mkOption {
+        type = types.path;
+        default = "/var/lib/usbguard/IPCAccessControl.d/";
+        description = ''
+          The files at this location will be interpreted by the daemon as IPC
+          access control definition files. See the IPC ACCESS CONTROL section
+          in <citerefentry><refentrytitle>usbguard-daemon.conf</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for more details.
+        '';
+      };
+
+      deviceRulesWithPort = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Generate device specific rules including the "via-port" attribute.
+        '';
+      };
+
+      auditFilePath = mkOption {
+        type = types.path;
+        default = "/var/log/usbguard/usbguard-audit.log";
+        description = ''
+          USBGuard audit events log file path.
+        '';
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.usbguard ];
+
+    systemd.services.usbguard = {
+      description = "USBGuard daemon";
+
+      wantedBy = [ "basic.target" ];
+      wants = [ "systemd-udevd.service" "local-fs.target" ];
+
+      # make sure an empty rule file and required directories exist
+      preStart = ''mkdir -p $(dirname "${cfg.ruleFile}") "${cfg.IPCAccessControlFiles}" && ([ -f "${cfg.ruleFile}" ] || touch ${cfg.ruleFile})'';
+
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}'';
+        Restart = "on-failure";
+      };
+    };
+  };
+}
diff --git a/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch b/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch
new file mode 100644
index 00000000000..eb4d5df698a
--- /dev/null
+++ b/pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Library/ConfigFilePrivate.cpp b/src/Library/ConfigFilePrivate.cpp
+index 8aefa65..40914f7 100644
+--- a/src/Library/ConfigFilePrivate.cpp
++++ b/src/Library/ConfigFilePrivate.cpp
+@@ -51,7 +51,7 @@ namespace usbguard
+ 
+   void ConfigFilePrivate::open(const std::string& path)
+   {
+-    _stream.open(path, std::ios::in|std::ios::out);
++    _stream.open(path, std::ios::in);
+     if (!_stream.is_open()) {
+       throw std::runtime_error("Can't open " + path);
+     }
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix
new file mode 100644
index 00000000000..b88d96e02a4
--- /dev/null
+++ b/pkgs/os-specific/linux/usbguard/default.nix
@@ -0,0 +1,68 @@
+{
+  stdenv, fetchurl, lib,
+  libxslt, pandoc, pkgconfig,
+  dbus_glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg,
+  libgcrypt ? null,
+  libsodium ? null
+}:
+
+with stdenv.lib;
+
+assert libgcrypt != null -> libsodium == null;
+
+stdenv.mkDerivation rec {
+  version = "0.7.0";
+  name = "usbguard-${version}";
+
+  repo = "https://github.com/dkopecek/usbguard";
+
+  src = fetchurl {
+    url = "${repo}/releases/download/${name}/${name}.tar.gz";
+    sha256 = "1e1485a2b47ba3bde9de2851b371d2552a807047a21e0b81553cf80d7f722709";
+  };
+
+  patches = [
+    ./daemon_read_only_config.patch
+    ./documentation.patch
+  ];
+
+  nativeBuildInputs = [
+    libxslt
+    pandoc # for rendering documentation
+    pkgconfig
+  ];
+
+  buildInputs = [
+    dbus_glib
+    libcap_ng
+    libqb
+    libseccomp
+    polkit
+    protobuf
+
+    qtbase
+    qtsvg
+    qttools
+  ]
+  ++ (lib.optional (libgcrypt != null) libgcrypt)
+  ++ (lib.optional (libsodium != null) libsodium);
+
+  configureFlags = [
+    "--with-bundled-catch"
+    "--with-bundled-pegtl"
+    "--with-dbus"
+    "--with-gui-qt=qt5"
+    "--with-polkit"
+  ]
+  ++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt")
+  ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium");
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "The USBGuard software framework helps to protect your computer against BadUSB.";
+    homepage = "https://dkopecek.github.io/usbguard/";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.tnias ];
+  };
+}
diff --git a/pkgs/os-specific/linux/usbguard/documentation.patch b/pkgs/os-specific/linux/usbguard/documentation.patch
new file mode 100644
index 00000000000..89de627131f
--- /dev/null
+++ b/pkgs/os-specific/linux/usbguard/documentation.patch
@@ -0,0 +1,32 @@
+diff --git a/doc/usbguard-daemon.conf.5.md b/doc/usbguard-daemon.conf.5.md
+index ea86ad1..63aec70 100644
+--- a/doc/usbguard-daemon.conf.5.md
++++ b/doc/usbguard-daemon.conf.5.md
+@@ -30,21 +30,21 @@ The **usbguard-daemon.conf** file is loaded by the USBGuard daemon after it pars
+ **RestoreControllerDeviceState**=<*boolean*>
+ :   The USBGuard daemon modifies some attributes of controller devices like the default authorization state of new child device instances. Using this setting, you can control whether the daemon will try to restore the attribute values to the state before modification on shutdown.
+ 
++**DeviceManagerBackend**=<*backend*>
++:   Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`.
++
+ **IPCAllowedUsers**=<*username*> [<*username*> ...]
+ :   A space delimited list of usernames that the daemon will accept IPC connections from.
+ 
+ **IPCAllowedGroups**=<*groupname*> [<*groupname*> ...]
+ :   A space delimited list of groupnames that the daemon will accept IPC connections from.
+ 
+-**IPCAccessControlFiles**=<*path*>
+-:   Path to a directory holding the IPC access control files.
+-
+-**DeviceManagerBackend**=<*backend*>
+-:   Which device manager backend implementation to use. Backend should be one of `uevent` (default) or `dummy`.
+-
+ **IPCAccessControlFiles**=<*path*>
+ :   The files at this location will be interpreted by the daemon as IPC access control definition files. See the **IPC ACCESS CONTROL** section for more details.
+ 
++**DeviceRulesWithPort**=<*boolean*>
++:   Generate device specific rules including the "via-port" attribute.
++
+ **AuditFilePath**=<*filepath*>
+ :   USBGuard audit events log file path.
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8f8477569e..2a8db9e450f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12726,6 +12726,10 @@ with pkgs;
 
   upstart-check-config = callPackage ../os-specific/linux/upstart/check-config.nix {};
 
+  usbguard = libsForQt5.callPackage ../os-specific/linux/usbguard {
+    libgcrypt = null;
+  };
+
   usbutils = callPackage ../os-specific/linux/usbutils { };
 
   usermount = callPackage ../os-specific/linux/usermount { };

From 35612ffb6c9545e2533ee024d1cf1e580ad22095 Mon Sep 17 00:00:00 2001
From: kiloreux <kiloreux@gmail.com>
Date: Sat, 26 Aug 2017 00:07:31 +0100
Subject: [PATCH 2693/3246] xpdf: 3.04-> 4.00

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

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index d2283c32920..ca6be8a08d6 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -10,11 +10,11 @@ assert useT1Lib -> t1lib != null;
 assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities
 
 stdenv.mkDerivation {
-  name = "xpdf-3.04";
+  name = "xpdf-4.00";
 
-  src = fetchurl {
-    url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz;
-    sha256 = "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i";
+   src = fetchurl {
+    url = http://www.xpdfreader.com/dl/xpdf-4.00.tar.gz;
+    sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz";
   };
 
   buildInputs = [ zlib libpng ] ++

From 1799e1464722fabbd0473cb9e836caa21e905e66 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 26 Aug 2017 01:52:11 +0200
Subject: [PATCH 2694/3246] Revert "android-studio-preview: 3.0.0.10 ->
 3.0.0.11"

This reverts the upgrade to Android Studio 3.0 Beta 3 from commit
22ae3aa5b68fb7e74a6730f9f6ddac1be6931db7 due to an upstream decision.

From the release updates: "Due to an issues with the Android Plugin for
Gradle in Beta 3 (64527520), we've pulled it down and recommend that you
not accept the update. If you already did, you can go back to Beta 2 by
downloading here." [0]

[0]: https://androidstudio.googleblog.com/2017/08/android-studio-30-beta-3-is-now.html
---
 pkgs/applications/editors/android-studio/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 70755098497..471f78f0c07 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,9 +27,9 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.11"; # "Android Studio 3.0 Beta 3"
-    build = "171.4294784";
-    sha256Hash = "11m939hpwnrrz0grnc1x1ff19yjnwzx5w1dzaw9hpm8ylx692mrf";
+    version = "3.0.0.10"; # "Android Studio 3.0 Beta 2"
+    build = "171.4263559";
+    sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";

From 0c48a3bf53af0458ad9a4a9315a51f043849f803 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 25 Aug 2017 22:24:21 +0000
Subject: [PATCH 2695/3246] gargoyle: 2017-03-12 -> 2017-05-17

---
 pkgs/games/gargoyle/darwin.patch | 65 ++++++--------------------------
 pkgs/games/gargoyle/default.nix  | 16 ++++----
 pkgs/top-level/all-packages.nix  |  4 +-
 3 files changed, 23 insertions(+), 62 deletions(-)

diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch
index fa0337fc585..cf44dffc897 100644
--- a/pkgs/games/gargoyle/darwin.patch
+++ b/pkgs/games/gargoyle/darwin.patch
@@ -1,39 +1,3 @@
-From 06255a8b5a378a2484cd0faa1dd718d5b4e98042 Mon Sep 17 00:00:00 2001
-From: Orivej Desh <orivej@gmx.fr>
-Date: Fri, 17 Mar 2017 08:43:57 +0000
-Subject: [PATCH] darwin
-
----
- Jamrules        | 5 ++---
- Jamshared       | 2 +-
- support/Jamfile | 4 ++--
- tads/Jamfile    | 4 ++--
- terps/Jamfile   | 4 ++--
- 5 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/Jamrules b/Jamrules
-index 698220d..2294dfc 100644
---- a/Jamrules
-+++ b/Jamrules
-@@ -141,8 +141,7 @@ switch $(OS)
-     case MACOSX :
-         Echo "OS is MACOSX (cocoa)" ;
-         SUFDLL = .dylib ;
--        MAINARCH = -arch i386 ;
--        CCFLAGS = -Wno-pointer-sign $(MAINARCH) $(ALTARCH) ;
-+        CCFLAGS = -Wno-pointer-sign $(ALTARCH) ;
-         PKGCONFIG = "pkg-config freetype2" ;
-         GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" ;
-         SHRLINKLIBS += "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ;
-@@ -155,7 +154,7 @@ switch $(OS)
-             SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ;
-         }
- 
--        LINK = $(CC) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) ;
-+        LINK = $(CC) $(FRAMEWORKS) $(ALTARCH) ;
- 
- 
-     case * :
 diff --git a/Jamshared b/Jamshared
 index 13db835..fd42928 100644
 --- a/Jamshared
@@ -47,21 +11,6 @@ index 13db835..fd42928 100644
      }
  }
  else
-diff --git a/support/Jamfile b/support/Jamfile
-index aedf8fe..70cfefd 100644
---- a/support/Jamfile
-+++ b/support/Jamfile
-@@ -41,8 +41,8 @@ if $(USESDL) = yes
-         ;
- 
-     if $(OS) = MINGW   { SubDirCcFlags -DSDL_SOUND_DLL_EXPORTS ; }
--    if $(OS) = SOLARIS { SubDirCcFlags -I/usr/include/SDL -fPIC ; }
--    if $(OS) = MACOSX  { SubDirCcFlags -I/opt/local/include/SDL -fPIC ; }
-+    if $(OS) = SOLARIS { SubDirCcFlags -ISDL -fPIC ; }
-+    if $(OS) = MACOSX  { SubDirCcFlags -ISDL -fPIC ; }
- 
-     SEARCH_SOURCE =
-         [ FDirName $(TOP) support sdl_sound ]
 diff --git a/tads/Jamfile b/tads/Jamfile
 index 1f8829d..d8455eb 100644
 --- a/tads/Jamfile
@@ -77,6 +26,17 @@ index 1f8829d..d8455eb 100644
  }
  
  SEARCH_SOURCE =
+diff --git a/tads/tads3/vmtz.cpp b/tads/tads3/vmtz.cpp
+index 5e193a1..dce46f7 100644
+--- a/tads/tads3/vmtz.cpp
++++ b/tads/tads3/vmtz.cpp
+@@ -1985,5 +1985,5 @@ void CVmTimeZone::query(vmtzquery *result, int32_t dayno, int32_t daytime,
+              *   up until that moment
+              */
+-            result->set(tcur > 0 ? tcur - 1 : tcur);
++            result->set(tcur != 0 ? tcur - 1 : tcur);
+            return;
+        }
 diff --git a/terps/Jamfile b/terps/Jamfile
 index b5f6d52..2d1ccdb 100644
 --- a/terps/Jamfile
@@ -92,6 +52,3 @@ index b5f6d52..2d1ccdb 100644
      }
  
      SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ;
--- 
-2.12.0
-
diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix
index ecee61513b4..7a461fbfa0d 100644
--- a/pkgs/games/gargoyle/default.nix
+++ b/pkgs/games/gargoyle/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, jam, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }:
+{ stdenv, fetchFromGitHub, jam, libtool, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }:
 
 let
 
-  jamenv = if stdenv.isDarwin then ''
+  jamenv = ''
+    unset AR
+  '' + (if stdenv.isDarwin then ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL"
     export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini"
   '' else ''
@@ -12,21 +14,21 @@ let
     export _APPDIR=libexec/gargoyle
     export _LIBDIR=libexec/gargoyle
     export GARGLKINI="$out/etc/garglk.ini"
-  '';
+  '');
 
 in
 
 stdenv.mkDerivation {
-  name = "gargoyle-2017-03-12";
+  name = "gargoyle-2017-05-17";
 
   src = fetchFromGitHub {
     owner = "garglk";
     repo = "garglk";
-    rev = "7d8fe875927c332ea30d75656bc982354b42f602";
-    sha256 = "00nac7j84gfql1cr11cs9ad4j1gsxrnkqfx6mis4ijf7d6px3sih";
+    rev = "2da2824748b0b99107f481801f818efc54a43d3a";
+    sha256 = "184lgylcbhj205pfccwgl7avs0pczwrc53nvkzhj2p5inxak20kk";
   };
 
-  nativeBuildInputs = [ jam pkgconfig ];
+  nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin libtool;
 
   buildInputs = [ gtk2 SDL SDL_mixer ] ++ (
     if stdenv.isDarwin then [ smpeg libvorbis ] else [ SDL_sound ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8f8477569e..9915e28edd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17262,7 +17262,9 @@ with pkgs;
 
   garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
 
-  gargoyle = callPackage ../games/gargoyle { };
+  gargoyle = callPackage ../games/gargoyle {
+    libtool = darwin.cctools;
+  };
 
   gav = callPackage ../games/gav { };
 

From e285527b3bdec38b0f477fe637157ce9866a2173 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Tue, 15 Aug 2017 18:26:51 -0400
Subject: [PATCH 2696/3246] Fix taskwarrior fish completions

Fish expects third party completions to be in a directory called
`vendor_completions.d` rather than `completions`.
---
 pkgs/applications/misc/taskwarrior/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 841e0a494e4..74ef55ee8cc 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p "$out/share/bash-completion/completions"
     ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/"
-    mkdir -p "$out/etc/fish/completions"
-    ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/etc/fish/completions/"
+    mkdir -p "$out/share/fish/vendor_completions.d"
+    ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/"
   '';
 
   meta = with stdenv.lib; {

From 64d13026b6f43d11d99c1f16d680c6bfe3773ea2 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Fri, 25 Aug 2017 23:12:57 -0400
Subject: [PATCH 2697/3246] corebird: 1.5.1 -> 1.6

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

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 376c70f3f44..412335094ff 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -3,14 +3,14 @@
 , glib_networking }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.1";
+  version = "1.6";
   name = "corebird-${version}";
 
   src = fetchFromGitHub {
     owner = "baedert";
     repo = "corebird";
     rev = version;
-    sha256 = "1qajb4xms3vsfm5sg91z9ka0nrzgfi0fjgjxqm7snhkfgxlkph7w";
+    sha256 = "1bxjlamdy5d2j3xdahmxf6lwc7f6xdfxbzi712ppvh1dwggw654v";
   };
 
   preConfigure = ''
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
 
   buildInputs = [
-    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking
+    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib_networking
   ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]);
 
   meta = {

From 833467ed963b63f1bd12c274518bfabecf554fda Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 26 Aug 2017 13:46:32 +0900
Subject: [PATCH 2698/3246] styx: 0.6.0 -> 0.7.0

---
 pkgs/applications/misc/styx/default.nix |  47 ++++++-----
 pkgs/applications/misc/styx/themes.nix  | 104 ------------------------
 pkgs/top-level/all-packages.nix         |   2 -
 3 files changed, 25 insertions(+), 128 deletions(-)
 delete mode 100644 pkgs/applications/misc/styx/themes.nix

diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index 8e3b0e747ae..2cdf047a10f 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -4,22 +4,22 @@
 
 stdenv.mkDerivation rec {
   name    = "styx-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner  = "styx-static";
     repo   = "styx";
     rev    = "v${version}";
-    sha256 = "1dl6zmic8bv17f3ib8by66c2fj7izlnv9dh2cfa2m0ipkxk930vk";
+    sha256 = "044zpj92w96csaddf1qnnc2w2w9iq4b7rzlqqsqnd1s0a87lm1qd";
   };
 
-  setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`";
-
   server = "${caddy.bin}/bin/caddy";
   linkcheck = "${linkchecker}/bin/linkchecker";
 
   nativeBuildInputs = [ asciidoctor ];
 
+  outputs = [ "out" "lib" "themes" ];
+
   propagatedBuildInputs = [
     file
     lessc
@@ -30,39 +30,42 @@ stdenv.mkDerivation rec {
     (python27.withPackages (ps: [ ps.parsimonious ]))
   ];
 
-  outputs = [ "out" "lib" ];
-
   installPhase = ''
     mkdir $out
-    install -D -m 777 styx.sh $out/bin/styx
+    install -D -m 777 src/styx.sh $out/bin/styx
 
-    mkdir -p $out/share/styx
-    cp -r scaffold $out/share/styx
-    cp -r nix $out/share/styx
+    mkdir -p $out/share/styx-src
+    cp -r ./* $out/share/styx-src
 
     mkdir -p $out/share/doc/styx
-    asciidoctor doc/index.adoc       -o $out/share/doc/styx/index.html
-    asciidoctor doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html
-    asciidoctor doc/library.adoc     -o $out/share/doc/styx/library.html
-    cp -r doc/highlight $out/share/doc/styx/
-    cp -r doc/imgs $out/share/doc/styx/
-    cp -r tools $out/share
+    asciidoctor src/doc/index.adoc       -o $out/share/doc/styx/index.html
+    asciidoctor src/doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html
+    asciidoctor src/doc/library.adoc     -o $out/share/doc/styx/library.html
+    cp -r src/doc/highlight $out/share/doc/styx/
+    cp -r src/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
     substituteAllInPlace $out/share/doc/styx/library.html
 
+    mkdir -p $out/share/styx/scaffold
+    cp -r src/scaffold $out/share/styx
+    cp -r src/tools $out/share/styx
+
     mkdir $lib
-    cp -r lib/* $lib
+    cp -r src/lib/* $lib
+
+    mkdir $themes
+    cp -r themes/* $themes
   '';
 
   meta = with stdenv.lib; {
-    description = "Nix based static site generator";
-    maintainers = with maintainers; [ ericsagnes ];
-    homepage = https://styx-static.github.io/styx-site/;
+    description  = "Nix based static site generator";
+    maintainers  = with maintainers; [ ericsagnes ];
+    homepage     = https://styx-static.github.io/styx-site/;
     downloadPage = https://github.com/styx-static/styx/;
-    platforms = platforms.all;
-    license = licenses.mit;
+    platforms    = platforms.all;
+    license      = licenses.mit;
   };
 }
diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix
deleted file mode 100644
index e0bea3b23b6..00000000000
--- a/pkgs/applications/misc/styx/themes.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{ fetchFromGitHub, stdenv }:
-
-let
-
-  mkThemeDrv = args: stdenv.mkDerivation {
-    name = "styx-theme-${args.themeName}-${args.version}";
-
-    src = fetchFromGitHub ({
-      owner = "styx-static";
-      repo  = "styx-theme-${args.themeName}";
-    } // args.src);
-
-    installPhase = ''
-      mkdir $out
-      cp -r * $out/
-    '';
-
-    preferLocalBuild = true;
-
-    meta = with stdenv.lib; {
-      maintainer  = with maintainers; [ ericsagnes ];
-      description = "${args.themeName} theme for styx";
-      platforms   = platforms.all;
-    } // args.meta;
-  };
-
-in
-{
-  agency = mkThemeDrv rec {
-    themeName = "agency";
-    version   = "0.6.0";
-    src = {
-      rev    = "v${version}";
-      sha256 = "1i9bajzgmxd3ffvgic6wwnqijsgkfr2mfdijkgw9yf3bxcdq5cb6";
-    };
-    meta = {
-      license = stdenv.lib.licenses.asl20;
-      longDescription = ''
-        Agency Theme is a one page portfolio for companies and freelancers.
-        This theme features several content sections, a responsive portfolio
-        grid with hover effects, full page portfolio item modals, a timeline,
-        and a contact form.
-      '';
-    };
-  };
-
-  generic-templates = mkThemeDrv rec {
-    themeName = "generic-templates";
-    version   = "0.6.0";
-    src = {
-      rev    = "v${version}";
-      sha256 = "0wr2687pffczn0sns1xvqxr2gpf5v9j64zbj6q9f7km6bq0zpiiy";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  hyde = mkThemeDrv rec {
-    themeName = "hyde";
-    version   = "0.6.0";
-    src = {
-      rev    = "v${version}";
-      sha256 = "0yca76p297ymxd049fkcpw8bca5b9yvv36707z31jbijriy50zxb";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-      longDescription = ''
-        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 rec {
-    themeName = "orbit";
-    version   = "0.6.0";
-    src = {
-      rev    = "v${version}";
-      sha256 = "0qdx1r7dcycr5hzl9ix70pl4xf0426ghpi1lgh61zdpdhcch0xfi";
-    };
-    meta = {
-      license = stdenv.lib.licenses.cc-by-30;
-      longDescription = ''
-        Orbit is a free resume/CV template designed for developers.
-      '';
-    };
-  };
-
-  showcase = mkThemeDrv rec {
-    themeName = "showcase";
-    version   = "0.6.0";
-    src = {
-      rev    = "v${version}";
-      sha256 = "1jfhw49yag8l1zr69l01y1p4p88waig3xv3b6c3mfxc8jrchp7pb";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-      longDescription = ''
-        Theme that show most of styx functionalities with a basic design.
-      '';
-    };
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a8db9e450f..7cef28dc301 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16046,8 +16046,6 @@ with pkgs;
 
   styx = callPackage ../applications/misc/styx { };
 
-  styx-themes = callPackage ../applications/misc/styx/themes.nix { };
-
   tecoc = callPackage ../applications/editors/tecoc { };
 
   viber = callPackage ../applications/networking/instant-messengers/viber { };

From 2f24483de7ddef47e77ef58959f93419a1ff0ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 06:20:33 +0100
Subject: [PATCH 2699/3246] hdfview: fix download url

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

diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index d69a3d2470d..405e19e75bf 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.14";
 
   src = fetchurl {
-    url = "http://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}-${version}.tar.gz";
+    url = "http://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz";
     sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p";
   };
 

From 8bd224320e5a39eb26237f5152d09ad1f3ed6f4e Mon Sep 17 00:00:00 2001
From: Samuel Leathers <disasm@gmail.com>
Date: Sat, 26 Aug 2017 02:48:57 -0400
Subject: [PATCH 2700/3246] polybar: fixes issue #28387 (#28441)

* polybar: fixes issue #28387

* polybar: fix fetchpatch checksum
---
 pkgs/applications/misc/polybar/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 026a1289fb6..e88a4974074 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,6 +1,6 @@
 { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
 , python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil
-, xcbutilwm, xcbutilxrm
+, xcbutilwm, xcbutilxrm, fetchpatch
 
 # optional packages-- override the variables ending in 'Support' to enable or
 # disable modules
@@ -32,13 +32,21 @@ stdenv.mkDerivation rec {
       description = "A fast and easy-to-use tool for creatin status bars.";
       longDescription = ''
         Polybar aims to help users build beautiful and highly customizable
-        status bars for their desktop environment, without the need of 
+        status bars for their desktop environment, without the need of
         having a black belt in shell scripting.
-      ''; 
+      '';
       license = licenses.mit;
       maintainers = [ maintainers.afldcr ];
       platforms = platforms.unix;
     };
+    # This patch should be removed with next stable release.
+    patches = [
+      (fetchpatch {
+        name = "polybar-remove-curlbuild.patch";
+        url = "https://github.com/jaagr/polybar/commit/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch";
+        sha256 = "14xr65vsjvd51hzg9linj09w0nnixgn26dh9lqxy25bxachcyzxy";
+      })
+    ];
 
     buildInputs = [
       cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil

From 1627e5b5d562476f2578bb328de98c419a00e992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 08:29:10 +0100
Subject: [PATCH 2701/3246] libtunegimp: remove package

it is deprecated by upstream: https://wiki.musicbrainz.org/History:libtunepimp
and uses an old version of libmusicbrainz, which does no longer build
---
 .../libraries/libtunepimp/default.nix         |  28 ---
 .../libraries/libtunepimp/gcc-4.x.patch       | 237 ------------------
 pkgs/top-level/all-packages.nix               |   2 -
 3 files changed, 267 deletions(-)
 delete mode 100644 pkgs/development/libraries/libtunepimp/default.nix
 delete mode 100644 pkgs/development/libraries/libtunepimp/gcc-4.x.patch

diff --git a/pkgs/development/libraries/libtunepimp/default.nix b/pkgs/development/libraries/libtunepimp/default.nix
deleted file mode 100644
index 061b2cfedfb..00000000000
--- a/pkgs/development/libraries/libtunepimp/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, zlib, expat, curl, libmusicbrainz2, taglib, libmpcdec,
-  libmad, libogg, libvorbis, flac, mp4v2, libofa, libtool }:
-
-stdenv.mkDerivation rec {
-  name = "libtunepimp-0.5.3";
-
-  outputs = [ "out" "lib" "dev" ];
-
-  setOutputFlags = false;
-
-  preConfigure = ''
-    configureFlagsArray=(--includedir=$dev/include --libdir=$lib/lib)
-  '';
-
-  propagatedBuildInputs = [ zlib expat curl libmusicbrainz2 taglib libmpcdec
-    libmad libogg libvorbis flac libofa libtool ];
-
-  patches = [ ./gcc-4.x.patch ];
-
-  src = fetchurl {
-    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
-    sha256 = "0s141zmsxv8xlivcgcmy6xhk9cyjjxmr1fy45xiqfqrqpsh485rl";
-  };
-
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
deleted file mode 100644
index aed742b0490..00000000000
--- a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-diff -rc libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h
-*** libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h	2006-11-18 05:52:08.000000000 -0500
---- libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h	2011-11-06 09:00:14.816684749 -0500
-***************
-*** 29,34 ****
---- 29,35 ----
-  
-  #include <string>
-  #include <cstdio>
-+ #include <cstring>
-  
-  #include "defs.h"
-  #include "tp_c.h"
-diff -rc libtunepimp-0.5.3/lib/c_wrapper.cpp libtunepimp-0.5.3-new/lib/c_wrapper.cpp
-*** libtunepimp-0.5.3/lib/c_wrapper.cpp	2006-11-18 05:52:33.000000000 -0500
---- libtunepimp-0.5.3-new/lib/c_wrapper.cpp	2011-11-06 09:00:14.816684749 -0500
-***************
-*** 43,48 ****
---- 43,49 ----
-                           if (obj == NULL) return;
-  
-  #include <deque>
-+ #include <cstdlib>
-  
-  class NotifyData
-  {
-diff -rc libtunepimp-0.5.3/lib/fileio.cpp libtunepimp-0.5.3-new/lib/fileio.cpp
-*** libtunepimp-0.5.3/lib/fileio.cpp	2006-11-18 05:52:33.000000000 -0500
---- libtunepimp-0.5.3-new/lib/fileio.cpp	2011-11-06 09:00:14.816684749 -0500
-***************
-*** 27,32 ****
---- 27,34 ----
-  
-  #include <assert.h>
-  #include <errno.h>
-+ #include <string.h>
-+ #include <stdlib.h>
-  #include <string>
-  #ifndef WIN32
-  #include <unistd.h>
-***************
-*** 122,128 ****
-  
-  void tmktempname(const char *path, char *newPath, int newPathLen)
-  {
-!     char *ptr, *temp;
-  
-      temp = (char *)malloc(strlen(path) + 32);
-      ptr = strrchr(path, dirSepChar);
---- 124,131 ----
-  
-  void tmktempname(const char *path, char *newPath, int newPathLen)
-  {
-!     char *temp;
-! 	const char *ptr;
-  
-      temp = (char *)malloc(strlen(path) + 32);
-      ptr = strrchr(path, dirSepChar);
-diff -rc libtunepimp-0.5.3/lib/metadata.cpp libtunepimp-0.5.3-new/lib/metadata.cpp
-*** libtunepimp-0.5.3/lib/metadata.cpp	2006-11-18 05:52:33.000000000 -0500
---- libtunepimp-0.5.3-new/lib/metadata.cpp	2011-11-06 09:00:14.817684754 -0500
-***************
-*** 24,31 ****
-     $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
-  
-  ----------------------------------------------------------------------------*/
-! #include <math.h>
-! #include <stdio.h>
-  #include "metadata.h"
-  #include "../config.h"
-  using namespace std;
---- 24,32 ----
-     $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
-  
-  ----------------------------------------------------------------------------*/
-! #include <cmath>
-! #include <cstdio>
-! #include <cstdlib>
-  #include "metadata.h"
-  #include "../config.h"
-  using namespace std;
-diff -rc libtunepimp-0.5.3/lib/protocol.cpp libtunepimp-0.5.3-new/lib/protocol.cpp
-*** libtunepimp-0.5.3/lib/protocol.cpp	2006-11-28 15:25:04.000000000 -0500
---- libtunepimp-0.5.3-new/lib/protocol.cpp	2011-11-06 09:00:23.281742454 -0500
-***************
-*** 8,18 ****
-  -------------------------------------------------------------------*/
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <string>
-  #include <map>
-  #include <expat.h>
-  #include <curl/curl.h>
-- #include <curl/types.h>
-  #include <curl/easy.h>
-  using namespace std;
-  
---- 8,18 ----
-  -------------------------------------------------------------------*/
-  #include <stdio.h>
-  #include <stdlib.h>
-+ #include <string.h>
-  #include <string>
-  #include <map>
-  #include <expat.h>
-  #include <curl/curl.h>
-  #include <curl/easy.h>
-  using namespace std;
-  
-diff -rc libtunepimp-0.5.3/lib/readmeta.cpp libtunepimp-0.5.3-new/lib/readmeta.cpp
-*** libtunepimp-0.5.3/lib/readmeta.cpp	2006-11-18 05:52:33.000000000 -0500
---- libtunepimp-0.5.3-new/lib/readmeta.cpp	2011-11-06 09:00:14.817684754 -0500
-***************
-*** 30,36 ****
-  #endif
-  #endif
-  
-! #include <stdio.h>
-  #ifndef WIN32
-  #include <unistd.h>
-  #endif
---- 30,37 ----
-  #endif
-  #endif
-  
-! #include <cstdio>
-! #include <cstdlib>
-  #ifndef WIN32
-  #include <unistd.h>
-  #endif
-diff -rc libtunepimp-0.5.3/lib/tunepimp.cpp libtunepimp-0.5.3-new/lib/tunepimp.cpp
-*** libtunepimp-0.5.3/lib/tunepimp.cpp	2006-11-18 05:52:33.000000000 -0500
---- libtunepimp-0.5.3-new/lib/tunepimp.cpp	2011-11-06 09:00:14.818684760 -0500
-***************
-*** 30,36 ****
-  #endif
-  #endif
-  
-! #include <stdio.h>
-  #include <map>
-  using namespace std;
-  
---- 30,37 ----
-  #endif
-  #endif
-  
-! #include <cstdio>
-! #include <cstdlib>
-  #include <map>
-  using namespace std;
-  
-diff -rc libtunepimp-0.5.3/lib/utf8/utf8util.cpp libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp
-*** libtunepimp-0.5.3/lib/utf8/utf8util.cpp	2006-11-18 05:52:26.000000000 -0500
---- libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp	2011-11-06 09:00:14.818684760 -0500
-***************
-*** 26,31 ****
---- 26,32 ----
-  ----------------------------------------------------------------------------*/
-  
-  #include <stdio.h>
-+ #include <stdlib.h>
-  #include "utf8util.h"
-  #include "utf8.h"
-  #ifdef WIN32
-diff -rc libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp
-*** libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp	2006-11-18 05:51:07.000000000 -0500
---- libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp	2011-11-06 09:00:14.818684760 -0500
-***************
-*** 26,31 ****
---- 26,32 ----
-  ----------------------------------------------------------------------------*/
-  
-  #include <stdio.h>
-+ #include <stdlib.h>
-  #include <assert.h>
-  #include <ctype.h>
-  #include <musicbrainz/mb_c.h>
-diff -rc libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp
-*** libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp	2006-11-18 05:51:07.000000000 -0500
---- libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp	2011-11-06 09:00:14.818684760 -0500
-***************
-*** 26,31 ****
---- 26,32 ----
-  ----------------------------------------------------------------------------*/
-  
-  #include <stdio.h>
-+ #include <stdlib.h>
-  #include <time.h>
-  #include <ctype.h>
-  #include <musicbrainz/mb_c.h>
-diff -rc libtunepimp-0.5.3/plugins/mp4/mp4.cpp libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp
-*** libtunepimp-0.5.3/plugins/mp4/mp4.cpp	2006-11-18 05:51:08.000000000 -0500
---- libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp	2011-11-06 09:00:14.819684766 -0500
-***************
-*** 27,33 ****
-  
-  #include <string.h>
-  #include <stdio.h>
-! #include <mp4.h>
-  #include "metadata.h"
-  #include "plugin.h"
-  #ifndef WIN32
---- 27,34 ----
-  
-  #include <string.h>
-  #include <stdio.h>
-! #include <stdlib.h>
-! #include <mp4v2/mp4v2.h>
-  #include "metadata.h"
-  #include "plugin.h"
-  #ifndef WIN32
-diff -rc libtunepimp-0.5.3/plugins/wma/wma.cpp libtunepimp-0.5.3-new/plugins/wma/wma.cpp
-*** libtunepimp-0.5.3/plugins/wma/wma.cpp	2006-11-18 05:51:28.000000000 -0500
---- libtunepimp-0.5.3-new/plugins/wma/wma.cpp	2011-11-06 09:00:14.819684766 -0500
-***************
-*** 27,32 ****
---- 27,33 ----
-  
-  #include <string.h>
-  #include <stdio.h>
-+ #include <stdlib.h>
-  #include <wmafile.h>
-  #include "metadata.h"
-  #include "plugin.h"
-diff -rc libtunepimp-0.5.3/plugins/wma/wmafile.cpp libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp
-*** libtunepimp-0.5.3/plugins/wma/wmafile.cpp	2006-11-18 05:51:28.000000000 -0500
---- libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp	2011-11-06 09:00:14.819684766 -0500
-***************
-*** 19,24 ****
---- 19,25 ----
-   *   USA                                                                   *
-   ***************************************************************************/
-  
-+ #include <string.h>
-  #include <tstring.h>
-  #include <wmafile.h>
-  #include <wmatag.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60a0f9415b1..c90db9594e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9277,8 +9277,6 @@ with pkgs;
 
   libtsm = callPackage ../development/libraries/libtsm { };
 
-  libtunepimp = callPackage ../development/libraries/libtunepimp { };
-
   libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
 
   libtxc_dxtn_s2tc = callPackage ../development/libraries/libtxc_dxtn_s2tc { };

From 5f482c5df4797f240ad0fffc624b33ab77f16fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 08:30:09 +0100
Subject: [PATCH 2702/3246] libmusicbrainz2: remove deprecated version

builds no longer against gcc6 and is not used anywhere
---
 pkgs/applications/kde/k3b.nix                 |  4 +-
 .../libraries/libmusicbrainz/2.x.nix          | 27 ---------
 .../libraries/libmusicbrainz/gcc-4.x.patch    | 60 -------------------
 pkgs/top-level/all-packages.nix               |  6 +-
 4 files changed, 4 insertions(+), 93 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmusicbrainz/2.x.nix
 delete mode 100644 pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch

diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index c70c3ea877b..409e674e1ad 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -5,7 +5,7 @@
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info, kinit
+, ffmpeg, libmusicbrainz3, normalize, sox, transcode, shared_mime_info, kinit
 }:
 
 mkDerivation {
@@ -28,7 +28,7 @@ mkDerivation {
     # cd/dvd
     cdparanoia libdvdcss libdvdread
     # others
-    ffmpeg libmusicbrainz2 shared_mime_info
+    ffmpeg libmusicbrainz3 shared_mime_info
   ];
   propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
   postFixup =
diff --git a/pkgs/development/libraries/libmusicbrainz/2.x.nix b/pkgs/development/libraries/libmusicbrainz/2.x.nix
deleted file mode 100644
index f12b854e778..00000000000
--- a/pkgs/development/libraries/libmusicbrainz/2.x.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, expat }:
-
-stdenv.mkDerivation rec {
-  name = "libmusicbrainz-2.1.5";
-
-  configureFlags = "--enable-cpp-headers";
-
-  buildInputs = [ expat ];
-
-  patches = [ ./gcc-4.x.patch ];
-
-  src = fetchurl {
-    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
-    sha256 = "183i4c109r5qx3mk4r986sx5xw4n5mdhdz4yz3rrv3s2xm5rqqn6";
-  };
-
-  meta = {
-    homepage = http://musicbrainz.org/doc/libmusicbrainz;
-    description = "MusicBrainz Client Library (deprecated 2.x version)";
-    longDescription = ''
-      The libmusicbrainz (also known as mb_client or MusicBrainz Client
-      Library) is a development library geared towards developers who wish to
-      add MusicBrainz lookup capabilities to their applications.'';
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch b/pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch
deleted file mode 100644
index f55c4f2cd41..00000000000
--- a/pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp
-index deae11d..ebc7854 100644
---- a/lib/c_wrapper.cpp
-+++ b/lib/c_wrapper.cpp
-@@ -24,6 +24,7 @@
- #include "musicbrainz.h"
- #include "trm.h"
- #include "mb_c.h"
-+#include <string.h>
- 
- extern "C"
- {
-diff --git a/lib/comhttpsocket.cpp b/lib/comhttpsocket.cpp
-index 067313b..4371772 100644
---- a/lib/comhttpsocket.cpp
-+++ b/lib/comhttpsocket.cpp
-@@ -20,6 +20,7 @@
- #endif
- #include <stdlib.h>
- #include <assert.h>
-+#include <string.h>
- 
- const char* g_strCOMVer = "libmusicbrainz/"VERSION;
- 
-diff --git a/lib/comsocket.cpp b/lib/comsocket.cpp
-index 01a94be..7bfc4dd 100644
---- a/lib/comsocket.cpp
-+++ b/lib/comsocket.cpp
-@@ -44,6 +44,7 @@ ____________________________________________________________________________*/
- #include <net/if.h>
- #include <sys/ioctl.h>
- #endif
-+#include <string.h>
- 
- #define mb_socklen_t ACCEPT_ARG3
- 
-diff --git a/lib/http.cpp b/lib/http.cpp
-index 85390a3..e63713c 100644
---- a/lib/http.cpp
-+++ b/lib/http.cpp
-@@ -67,6 +67,7 @@
- #ifdef __QNX__
- #include <strings.h>
- #endif
-+#include <string.h>
- 
- using namespace std;
- 
-diff --git a/lib/sigclient.cpp b/lib/sigclient.cpp
-index 9f76008..4bbbaae 100644
---- a/lib/sigclient.cpp
-+++ b/lib/sigclient.cpp
-@@ -32,6 +32,7 @@ email                : ijr@relatable.com
- #ifdef WIN32
- #pragma warning(disable:4786)
- #endif
-+#include <string.h>
- 
- #include "sigclient.h"
- #include "comhttpsocket.h"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c90db9594e2..605baef6894 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9094,8 +9094,6 @@ with pkgs;
 
   libmspack = callPackage ../development/libraries/libmspack { };
 
-  libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { };
-
   libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
 
   libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
@@ -11106,7 +11104,7 @@ with pkgs;
   dex-oidc = callPackage ../servers/dex { };
 
   dgraph = callPackage ../servers/dgraph { };
-    
+
   dico = callPackage ../servers/dico { };
 
   dict = callPackage ../servers/dict {
@@ -18699,7 +18697,7 @@ with pkgs;
   hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { };
 
   hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; };
-  
+
   epkowa = callPackage ../misc/drivers/epkowa { };
 
   illum = callPackage ../tools/system/illum { };

From 48f337a882a46bb5a9105ed592db05776ad1a507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 09:14:51 +0100
Subject: [PATCH 2703/3246] python.pkgs.pysideShiboken: fix gcc6 build

---
 .../python-modules/pyside/gcc6.patch           | 18 ++++++++++++++++++
 .../python-modules/pyside/shiboken.nix         |  5 ++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/pyside/gcc6.patch

diff --git a/pkgs/development/python-modules/pyside/gcc6.patch b/pkgs/development/python-modules/pyside/gcc6.patch
new file mode 100644
index 00000000000..440e94508c5
--- /dev/null
+++ b/pkgs/development/python-modules/pyside/gcc6.patch
@@ -0,0 +1,18 @@
+--- Shiboken-1.2.4.org/tests/libsample/simplefile.cpp	2017-08-26 09:06:27.216859143 +0100
++++ Shiboken-1.2.4/tests/libsample/simplefile.cpp	2017-08-26 09:05:40.037029652 +0100
+@@ -90,13 +90,13 @@
+ SimpleFile::exists() const
+ {
+     std::ifstream ifile(p->m_filename);
+-    return ifile;
++    return (bool)ifile;
+ }
+ 
+ bool
+ SimpleFile::exists(const char* filename)
+ {
+     std::ifstream ifile(filename);
+-    return ifile;
++    return (bool)ifile;
+ }
+ 
diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index 82a40c96f64..c588bac69cc 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -14,6 +14,7 @@ buildPythonPackage rec {
     sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4";
   };
 
+
   enableParallelBuilding = true;
 
   buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
@@ -23,7 +24,9 @@ buildPythonPackage rec {
     substituteInPlace generator/CMakeLists.txt --replace \
       \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
   '';
-  patches = if (isPy35 || isPy36) then [ ./shiboken_py35.patch ] else null;
+
+  # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
+  patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36) ./shiboken_py35.patch);
 
   cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;
 

From 4596835502f60dfc250494728d0995d6d4b9d4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 09:23:16 +0100
Subject: [PATCH 2704/3246] xml-security-c: fix gcc6 build

---
 .../libraries/xml-security-c/cxx11.patch        | 11 +++++++++++
 .../libraries/xml-security-c/default.nix        | 17 +++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/xml-security-c/cxx11.patch

diff --git a/pkgs/development/libraries/xml-security-c/cxx11.patch b/pkgs/development/libraries/xml-security-c/cxx11.patch
new file mode 100644
index 00000000000..bc87d4c1411
--- /dev/null
+++ b/pkgs/development/libraries/xml-security-c/cxx11.patch
@@ -0,0 +1,11 @@
+--- xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp.orig	2016-02-02 23:57:26.204655144 +0000
++++ xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp	2016-02-02 23:57:35.796692305 +0000
+@@ -645,7 +645,7 @@
+ 
+ 	}
+ 
+-	return false;
++	return NULL;
+ 
+ }
+ 
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index 37936caf2b9..7ab6041e86d 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -9,18 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583";
   };
 
-  patchPhase = ''
+  patches = [ ./cxx11.patch ];
+
+  postPatch = ''
     mkdir -p xsec/yes/lib
     sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure
   '';
 
-  configurePhase = ''
-    ./configure --prefix=$out \
-                --with-openssl \
-                --with-xerces \
-                --with-xalan \
-                --disable-static
-  '';
+  configureFlags = [
+    "--with-openssl"
+    "--with-xerces"
+    "--with-xalan"
+    "--disable-static"
+  ];
 
   buildInputs = [ xalanc xercesc openssl pkgconfig ];
 

From 6895ef672b510cdf20d8eac26c35605839de710f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 26 Aug 2017 10:35:05 +0200
Subject: [PATCH 2705/3246] fbreader: fixup build with gcc-6

---
 pkgs/applications/misc/fbreader/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
index 2b193ef42cd..6cfd1e05279 100644
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -16,11 +16,13 @@ stdenv.mkDerivation {
 
   makeFlags = "INSTALLDIR=$(out)";
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; # since gcc-6
+
   patchPhase = ''
     # don't try to use ccache
     substituteInPlace makefiles/arch/desktop.mk \
       --replace "CCACHE = " "# CCACHE = "
-  
+
     substituteInPlace fbreader/desktop/Makefile \
       --replace "/usr/share" "$out/share"
   '';

From 326f54d9ba0a0c45da125313ed400034cf396f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 09:42:42 +0100
Subject: [PATCH 2706/3246] log4cxx: fix gcc6 build

---
 .../development/libraries/log4cxx/default.nix |  14 ++-
 .../libraries/log4cxx/narrowing-fixes.patch   | 117 ++++++++++++++++++
 2 files changed, 127 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/log4cxx/narrowing-fixes.patch

diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index 7e5a62e63f4..ac0b7bf6834 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost
+{ stdenv, fetchurl, libtool, libxml2, cppunit, boost
 , apr, aprutil, db, expat
 }:
 
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d";
   };
 
+  patches = [
+    # adapted from upstream commit; will be fixed in next version
+    ./narrowing-fixes.patch
+  ];
+
   postPatch = ''
     sed -i -e '1,/^#include/ {
       /^#include/i \
@@ -21,11 +26,12 @@ stdenv.mkDerivation rec {
        src/main/cpp/inputstreamreader.cpp \
        src/main/cpp/socketoutputstream.cpp
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-  sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h
-  sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp
+    sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h
+    sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp
   '';
 
-  buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat];
+  buildInputs = [ libxml2 cppunit boost apr aprutil db expat ];
+  nativeBuildInputs = [ libtool ];
 
   meta = {
     homepage = http://logging.apache.org/log4cxx/index.html;
diff --git a/pkgs/development/libraries/log4cxx/narrowing-fixes.patch b/pkgs/development/libraries/log4cxx/narrowing-fixes.patch
new file mode 100644
index 00000000000..e583e7661d1
--- /dev/null
+++ b/pkgs/development/libraries/log4cxx/narrowing-fixes.patch
@@ -0,0 +1,117 @@
+diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp
+index e76ea29..bd22a1d 100644
+--- a/src/main/cpp/locationinfo.cpp
++++ b/src/main/cpp/locationinfo.cpp
+@@ -149,18 +149,21 @@ void LocationInfo::write(ObjectOutputStream& os, Pool& p) const {
+          os.writeNull(p);
+     } else {
+         char prolog[] = {
+-         0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E, 
+-         0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, 
+-         0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, 
+-         0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 
+-         0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB, 
+-         0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01, 
+-         0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, 
+-         0x6E, 0x66, 0x6F, 
+-            0x74, 0x00, 0x12, 0x4C, 0x6A, 
+-                0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67, 
+-                0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
+-         0x78, 0x70 };
++         0x72,
++         0x00,
++         0x21, 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E,
++         0x6C, 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F,
++         0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x49, 0x6E, 0x66, 0x6F, static_cast<char>(0xED),
++         static_cast<char>(0x99), static_cast<char>(0xBB), static_cast<char>(0xE1),
++         0x4A, static_cast<char>(0x91), static_cast<char>(0xA5), 0x7C, 0x02,
++         0x00,
++         0x01, 0x4C,
++         0x00,
++         0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, 0x6E, 0x66, 0x6F, 0x74,
++         0x00,
++         0x12, 0x4C, 0x6A, 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67, 0x2F,
++         0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x78, 0x70
++        };
+       os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
+         char* line = p.itoa(lineNumber);
+         //
+diff --git a/src/main/cpp/loggingevent.cpp b/src/main/cpp/loggingevent.cpp
+index 1c0d4be..edbf40b 100644
+--- a/src/main/cpp/loggingevent.cpp
++++ b/src/main/cpp/loggingevent.cpp
+@@ -242,7 +242,7 @@ void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p)  {
+         0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, 
+         0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67, 
+         0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E, 
+-        0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5, 
++        0x74, static_cast<char>(0xF3), static_cast<char>(0xF2), static_cast<char>(0xB9), 0x23, 0x74, 0x0B, static_cast<char>(0xB5), 
+         0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D, 
+         0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F, 
+         0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 
+diff --git a/src/main/cpp/objectoutputstream.cpp b/src/main/cpp/objectoutputstream.cpp
+index 7cd696b..5442420 100644
+--- a/src/main/cpp/objectoutputstream.cpp
++++ b/src/main/cpp/objectoutputstream.cpp
+@@ -36,7 +36,7 @@ ObjectOutputStream::ObjectOutputStream(OutputStreamPtr outputStream, Pool& p)
+        objectHandle(0x7E0000),
+        classDescriptions(new ClassDescriptionMap())
+ {
+-   char start[] = { 0xAC, 0xED, 0x00, 0x05 };
++   char start[] = { static_cast<char>(0xAC), static_cast<char>(0xED), 0x00, 0x05 };
+    ByteBuffer buf(start, sizeof(start));
+    os->write(buf, p);
+ }
+@@ -81,15 +81,15 @@ void ObjectOutputStream::writeObject(const MDC::Map& val, Pool& p) {
+     //
+     //  TC_OBJECT and the classDesc for java.util.Hashtable
+     //
+-    char prolog[] = {
+-        0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, 
+-        0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, 
+-        0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, 
+-        0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, 
+-        0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, 
+-        0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, 
+-        0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 
+-        0x6F, 0x6C, 0x64, 0x78, 0x70  };
++	char prolog[] = {
++		0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61,
++		0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61,
++		0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13,
++		static_cast<char>(0xBB), 0x0F, 0x25, 0x21, 0x4A, static_cast<char>(0xE4), static_cast<char>(0xB8), 0x03,
++		0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61,
++		0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49,
++		0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68,
++		0x6F, 0x6C, 0x64, 0x78, 0x70  };
+     writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p);
+     //
+     //   loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7
+diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp
+index a500628..29d67dd 100644
+--- a/src/test/cpp/xml/domtestcase.cpp
++++ b/src/test/cpp/xml/domtestcase.cpp
+@@ -190,9 +190,9 @@ public:
+                 DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
+                 LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
+ #if LOG4CXX_LOGCHAR_IS_UTF8
+-                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
++                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xC2), static_cast<logchar>(0xB3), 0 };
+ #else
+-                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
++                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xB3), 0 };
+ #endif
+                 File file;
+                 file.setPath(fname);
+@@ -209,9 +209,9 @@ public:
+                 DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
+                 LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
+ #if LOG4CXX_LOGCHAR_IS_UTF8
+-                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
++                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xE3), static_cast<logchar>(0x86), static_cast<logchar>(0x95), 0 };
+ #else
+-                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
++                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0x3195), 0 };
+ #endif
+                 File file;
+                 file.setPath(fname);
\ No newline at end of file

From 86890ae351419f6a28f2952b0888e1f6c3fbceaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 09:46:31 +0100
Subject: [PATCH 2707/3246] python.pkgs.requests_oauthlib: fix source hash

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

diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix
index 0162d6f6eb5..03b9586d67f 100644
--- a/pkgs/development/python-modules/requests-oauthlib.nix
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
-    sha256 = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468";
+    sha256 = "18gg9dwral153c10f8bwhz2dy4nw7c6mws5a2g7gidk3z5xhqy4n";
   };
 
   doCheck = false;        # Internet tests fail when building in chroot

From 7b0effc4e050cdf9ab5d206bdd675b13d4fa7827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 26 Aug 2017 10:48:06 +0200
Subject: [PATCH 2708/3246] dee: fix with gcc-6

This warning is useful to devs and not integrators, really.
---
 pkgs/development/libraries/dee/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index 9b05d74a406..1288f4ac2f5 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib gobjectIntrospection icu ];
   nativeBuildInputs = [ python pkgconfig ];
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" ]; # gcc-6
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From f195108c32d26ba4bb1ee0222e3b702506459775 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 26 Aug 2017 16:03:13 +0700
Subject: [PATCH 2709/3246] call generate.sh before add package to make diff
 more readable

---
 .../node-packages/composition-v4.nix          |    2 +-
 .../node-packages/composition-v6.nix          |    2 +-
 .../node-packages/node-packages-v4.nix        |  198 +--
 .../node-packages/node-packages-v6.nix        | 1117 +++++++++--------
 4 files changed, 712 insertions(+), 607 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index dc5899ebf1a..8c4a5390f55 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 0c01a169af4..ea30c5b04c4 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index e2d9b5c348e..15ec0536525 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -73,7 +73,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
       };
     };
     "once-1.4.0" = {
@@ -640,7 +640,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
-        sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv";
+        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
       };
     };
     "xtend-4.0.1" = {
@@ -676,7 +676,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+        sha1 = "893312af69b2123def71f57889001671eeb2c853";
       };
     };
     "string_decoder-1.0.3" = {
@@ -685,7 +685,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
+        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -793,7 +793,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
-        sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9";
+        sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86";
       };
     };
     "detect-file-0.1.0" = {
@@ -955,7 +955,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
+        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
       };
     };
     "expand-range-1.8.2" = {
@@ -1018,7 +1018,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
-        sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg";
+        sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c";
       };
     };
     "repeat-string-1.6.1" = {
@@ -1216,7 +1216,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
-        sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5";
+        sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -1252,7 +1252,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
+        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
       };
     };
     "object.defaults-1.1.0" = {
@@ -1264,13 +1264,13 @@ let
         sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf";
       };
     };
-    "object.pick-1.2.0" = {
+    "object.pick-1.3.0" = {
       name = "object.pick";
       packageName = "object.pick";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz";
-        sha1 = "b5392bee9782da6d9fb7d6afaf539779f1234c2b";
+        url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz";
+        sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
       };
     };
     "parse-filepath-1.0.1" = {
@@ -1711,7 +1711,7 @@ let
       version = "7.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
+        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
       };
     };
     "graceful-fs-4.1.11" = {
@@ -1729,7 +1729,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
+        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
       };
     };
     "osenv-0.1.4" = {
@@ -1837,7 +1837,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
-        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
+        sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1";
       };
     };
     "has-unicode-2.0.1" = {
@@ -1882,7 +1882,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
+        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
       };
     };
     "code-point-at-1.1.0" = {
@@ -2098,7 +2098,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
+        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -2614,13 +2614,13 @@ let
         sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
-    "big-integer-1.6.23" = {
+    "big-integer-1.6.24" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.23";
+      version = "1.6.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.23.tgz";
-        sha1 = "e85d508220c74e3f43a4ce72eed51f3da4db94d1";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.24.tgz";
+        sha1 = "1ed84d018ac3c1c72b307e7f7d94008e8ee20311";
       };
     };
     "camelcase-keys-2.1.0" = {
@@ -2665,7 +2665,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n";
+        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
       };
     };
     "read-pkg-up-1.0.1" = {
@@ -2728,7 +2728,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54";
+        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -2947,13 +2947,13 @@ let
         sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
-    "accepts-1.3.3" = {
+    "accepts-1.3.4" = {
       name = "accepts";
       packageName = "accepts";
-      version = "1.3.3";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz";
-        sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz";
+        sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f";
       };
     };
     "array-flatten-1.1.1" = {
@@ -3043,7 +3043,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz";
-        sha512 = "2vbps6iw562i2zxd973z5mmbs8ggx3wbz4g1jqwvkjibiwrk9ym8bxcvvwnlmxqad92x120x5xz5nyfq68nd8akk355bkk0qjppzafp";
+        sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7";
       };
     };
     "fresh-0.5.0" = {
@@ -3115,7 +3115,7 @@ let
       version = "6.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
-        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
+        sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49";
       };
     };
     "range-parser-1.2.0" = {
@@ -3340,7 +3340,7 @@ let
       version = "5.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
+        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
       };
     };
     "tar-pack-3.4.0" = {
@@ -3502,7 +3502,7 @@ let
       version = "9.2.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
-        sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642";
+        sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd";
       };
     };
     "call-limit-1.1.0" = {
@@ -3601,7 +3601,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
-        sha512 = "07r7qvmx5fjjk2ra3hjrz31ciy4vhfq2k8a3wjscjl7y52885zwfvz4caa5xr3kab8l3y4c9rsz1nkpjl530irrs6q5l3z6yadyj4c8";
+        sha1 = "08c4a452f789dcbac4c89a4563c902b2c862fd5b";
       };
     };
     "iferr-0.1.5" = {
@@ -3637,7 +3637,7 @@ let
       version = "9.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz";
-        sha512 = "0ki52cm2pf27r9pkpfbrx6y1myg7yx1mghwnvv6mw4kmgscif08qlj0xzlc88kpfl549xip4z1ap64s22l7v3q26ygz6x12cch87wsr";
+        sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304";
       };
     };
     "lockfile-1.0.3" = {
@@ -3700,7 +3700,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz";
-        sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb";
+        sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55";
       };
     };
     "mississippi-1.3.0" = {
@@ -3754,7 +3754,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
+        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
       };
     };
     "npm-registry-client-8.4.0" = {
@@ -3763,7 +3763,7 @@ let
       version = "8.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
-        sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx";
+        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
       };
     };
     "npm-user-validate-1.0.0" = {
@@ -3790,7 +3790,7 @@ let
       version = "2.7.38";
       src = fetchurl {
         url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz";
-        sha512 = "0a0ar6lns179qdszia13prhj7gjpdjy334xafq791h48q00259lr6gpkzp17dagfcnff9pgcgxm7b68nidpj5qs0yah1v81fk4d84az";
+        sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1";
       };
     };
     "path-is-inside-1.0.2" = {
@@ -3838,13 +3838,13 @@ let
         sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
       };
     };
-    "read-package-json-2.0.11" = {
+    "read-package-json-2.0.12" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.11";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.11.tgz";
-        sha512 = "1y74w8zm70x1zc7qgg6fxg72pb78dmafg2bf5x4gn1z8d4amjrw2q3d4j9035ginsrigk372scwj57p0ll5ck9yxdgnyjpzcd5fj7wy";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz";
+        sha1 = "68ea45f98b3741cb6e10ae3bbd42a605026a6951";
       };
     };
     "read-package-tree-5.1.6" = {
@@ -3853,7 +3853,7 @@ let
       version = "5.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
-        sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l";
+        sha1 = "4f03e83d0486856fb60d97c94882841c2a7b1b7a";
       };
     };
     "retry-0.10.1" = {
@@ -3907,7 +3907,7 @@ let
       version = "4.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr";
+        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -3979,7 +3979,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz";
-        sha512 = "0vh5z2d6q3zgf7j3g5ngyq4piqq1y613wacfyildfnm2c2klb4h2gw32grgk6pv9ssyiliyfvj4p4alpaa85cqcj2nznb4q0fv400dn";
+        sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8";
       };
     };
     "write-file-atomic-2.1.0" = {
@@ -3988,7 +3988,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni";
+        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
       };
     };
     "debuglog-1.0.1" = {
@@ -4150,7 +4150,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
+        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
       };
     };
     "read-pkg-up-2.0.0" = {
@@ -4186,7 +4186,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
+        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
       };
     };
     "which-module-2.0.0" = {
@@ -4447,7 +4447,7 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz";
-        sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g";
+        sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd";
       };
     };
     "end-of-stream-1.4.0" = {
@@ -4540,13 +4540,13 @@ let
         sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
       };
     };
-    "copy-concurrently-1.0.3" = {
+    "copy-concurrently-1.0.5" = {
       name = "copy-concurrently";
       packageName = "copy-concurrently";
-      version = "1.0.3";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz";
-        sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250";
+        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
+        sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0";
       };
     };
     "run-queue-1.0.3" = {
@@ -4558,13 +4558,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "make-fetch-happen-2.4.13" = {
+    "make-fetch-happen-2.5.0" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "2.4.13";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.13.tgz";
-        sha512 = "0j8sgm5sh7lb4mdpg52yz9rv0jpgkd3bf701i30gd5s3aqxb0i2lq8qm4bndqqfcb8jgiw8wj6dwpv2497khvxmmx3bfj0iad7aqw7g";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.5.0.tgz";
+        sha1 = "08c22d499f4f30111addba79fe87c98cf01b6bc8";
       };
     };
     "npm-pick-manifest-1.0.4" = {
@@ -4573,7 +4573,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
+        sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8";
       };
     };
     "promise-retry-1.1.1" = {
@@ -4618,7 +4618,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
-        sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
+        sha1 = "6d5de5829afd3be2712201a39275fd11c651857c";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -4645,7 +4645,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
+        sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443";
       };
     };
     "node-fetch-npm-2.0.2" = {
@@ -4654,7 +4654,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz";
-        sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
+        sha1 = "7258c9046182dca345b4208eda918daf33697ff7";
       };
     };
     "socks-proxy-agent-3.0.0" = {
@@ -4663,7 +4663,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz";
-        sha512 = "3zn9cz2ry5m1akapj7hvhgkxfq7ffwynia46lmwipsw2jk5sv8dvs32dc4hfx3xvp34i1jff1bg870a1xnknsgk5dl021jd4gwi75v0";
+        sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -4681,7 +4681,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
-        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
+        sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -4699,7 +4699,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
-        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
+        sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a";
       };
     };
     "encoding-0.1.12" = {
@@ -4717,7 +4717,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz";
-        sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967";
+        sha1 = "50183cd1b2d25275de069e9e71b467ac9eab973a";
       };
     };
     "iconv-lite-0.4.18" = {
@@ -4726,7 +4726,7 @@ let
       version = "0.4.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
-        sha512 = "2l97vd6kax8syr9aggcqhiyhd3b2rf506wdq6wapfrc74qwpdzqf2a3891kq9ri3g5sdzayph2sz4zkr8kbbps58z9h2lvpk115kgdj";
+        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
       };
     };
     "socks-1.1.10" = {
@@ -4801,6 +4801,15 @@ let
         sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
       };
     };
+    "slash-1.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
+        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
+      };
+    };
     "from2-1.3.0" = {
       name = "from2";
       packageName = "from2";
@@ -4843,7 +4852,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
-        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
+        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
       };
     };
     "import-lazy-2.1.0" = {
@@ -4906,7 +4915,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
+        sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e";
       };
     };
     "cli-boxes-1.0.0" = {
@@ -4942,7 +4951,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
+        sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88";
       };
     };
     "supports-color-4.2.1" = {
@@ -4951,7 +4960,7 @@ let
       version = "4.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
-        sha512 = "1ldz0jkrkclywnr7gwh85p6kljs5rm4jczbpj55vb9w5c81iyrf1ahgkw88nnzahgw2xvlg041vqk7gynxkwcqkzfagxjpphsrdh75b";
+        sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836";
       };
     };
     "color-convert-1.9.0" = {
@@ -4987,7 +4996,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
+        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
       };
     };
     "make-dir-1.0.0" = {
@@ -5431,13 +5440,13 @@ let
         sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "source-map-0.5.6" = {
+    "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
-      version = "0.5.6";
+      version = "0.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
-        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -5581,16 +5590,16 @@ let
       version = "2.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
+        sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563";
       };
     };
-    "is-my-json-valid-2.16.0" = {
+    "is-my-json-valid-2.16.1" = {
       name = "is-my-json-valid";
       packageName = "is-my-json-valid";
-      version = "2.16.0";
+      version = "2.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz";
-        sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz";
+        sha1 = "5a846777e2c2620d1e69104e5d3a03b1f6088f11";
       };
     };
     "generate-function-2.0.0" = {
@@ -5701,7 +5710,7 @@ in
     version = "1.12.7";
     src = fetchurl {
       url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
+      sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -6054,13 +6063,9 @@ in
                   sources."isobject-3.0.1"
                 ];
               })
-              (sources."object.pick-1.2.0" // {
+              (sources."object.pick-1.3.0" // {
                 dependencies = [
-                  (sources."isobject-2.1.0" // {
-                    dependencies = [
-                      sources."isarray-1.0.0"
-                    ];
-                  })
+                  sources."isobject-3.0.1"
                 ];
               })
               (sources."parse-filepath-1.0.1" // {
@@ -6517,7 +6522,7 @@ in
                 dependencies = [
                   (sources."bplist-parser-0.1.1" // {
                     dependencies = [
-                      sources."big-integer-1.6.23"
+                      sources."big-integer-1.6.24"
                     ];
                   })
                   (sources."meow-3.7.0" // {
@@ -6657,7 +6662,7 @@ in
       })
       (sources."express-4.15.4" // {
         dependencies = [
-          (sources."accepts-1.3.3" // {
+          (sources."accepts-1.3.4" // {
             dependencies = [
               (sources."mime-types-2.1.16" // {
                 dependencies = [
@@ -7605,7 +7610,7 @@ in
     version = "5.3.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz";
-      sha512 = "29izly6jqqdaslak9xz3i3bsr7qgg5vjcbzf55as0hh630z4aml48n5a7dz6skqn34d02fg3bk2zwkq7n67z787wn14vr3na9chx6v4";
+      sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -7889,7 +7894,7 @@ in
       })
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
-          sources."copy-concurrently-1.0.3"
+          sources."copy-concurrently-1.0.5"
           sources."run-queue-1.0.3"
         ];
       })
@@ -7974,7 +7979,7 @@ in
       })
       (sources."pacote-2.7.38" // {
         dependencies = [
-          (sources."make-fetch-happen-2.4.13" // {
+          (sources."make-fetch-happen-2.5.0" // {
             dependencies = [
               (sources."agentkeepalive-3.3.0" // {
                 dependencies = [
@@ -8105,9 +8110,10 @@ in
           sources."util-extend-1.0.3"
         ];
       })
-      (sources."read-package-json-2.0.11" // {
+      (sources."read-package-json-2.0.12" // {
         dependencies = [
           sources."json-parse-better-errors-1.0.1"
+          sources."slash-1.0.0"
         ];
       })
       sources."read-package-tree-5.1.6"
@@ -8532,7 +8538,7 @@ in
           (sources."uglify-js-2.7.5" // {
             dependencies = [
               sources."async-0.2.10"
-              sources."source-map-0.5.6"
+              sources."source-map-0.5.7"
               sources."uglify-to-browserify-1.0.2"
               (sources."yargs-3.10.0" // {
                 dependencies = [
@@ -8619,7 +8625,7 @@ in
                 ];
               })
               sources."commander-2.11.0"
-              (sources."is-my-json-valid-2.16.0" // {
+              (sources."is-my-json-valid-2.16.1" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index da1d79e02ed..6856eadb1cf 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.3.0. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -82,7 +82,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
-        sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9";
+        sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86";
       };
     };
     "global-paths-0.1.2" = {
@@ -202,13 +202,13 @@ let
         sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "source-map-0.5.6" = {
+    "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
-      version = "0.5.6";
+      version = "0.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
-        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -424,7 +424,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
-        sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5";
+        sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -1162,7 +1162,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
+        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
       };
     };
     "validator-5.2.0" = {
@@ -1270,7 +1270,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+        sha1 = "893312af69b2123def71f57889001671eeb2c853";
       };
     };
     "buffer-equal-constant-time-1.0.1" = {
@@ -1615,13 +1615,13 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "@types/node-7.0.42" = {
+    "@types/node-7.0.43" = {
       name = "@types/node";
       packageName = "@types/node";
-      version = "7.0.42";
+      version = "7.0.43";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-7.0.42.tgz";
-        sha512 = "3qxigqldpssvqrmzvaq4zsshk19240ad5284716hgf2h1ibp97pbqcjxxpx1zc0kkcpx2vf2zf7mk5a3cdahhvxgabywkh8f94gcpvh";
+        url = "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz";
+        sha1 = "a187e08495a075f200ca946079c914e1a5fe962c";
       };
     };
     "@types/request-0.0.45" = {
@@ -1630,7 +1630,7 @@ let
       version = "0.0.45";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/request/-/request-0.0.45.tgz";
-        sha512 = "37apdgz29nhb3cpz9l2m1j1vj646727yzrk6ch66ji4yz0al4529gp3zlwdqcsi2w1kw43n2jsr2jq4vs9n7i4qgklrkwpr6h9130iq";
+        sha1 = "c6e52be8b108eb035c35aa9af56a38a260c3e7e6";
       };
     };
     "@types/uuid-2.0.30" = {
@@ -1639,7 +1639,7 @@ let
       version = "2.0.30";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz";
-        sha512 = "117asm25fci0i0w2igvz0mxydd0m4vsz1l55kibx36d19j8md4s9fmvispcy83m7zlf9w9s4di7v0j8rawnyn67xci916gn0b88jr4y";
+        sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5";
       };
     };
     "is-stream-1.1.0" = {
@@ -1657,7 +1657,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.0.tgz";
-        sha512 = "26fb719b154ab3x89bbgpp3fk4jcrfal0y909ik8zss3d8ykn1dsh9wm3q08j5pzpy3wvfy41h0yzfhbl7k3lb4zjqm9swwq8d4wvmy";
+        sha1 = "a98aac91dc99857b6af24caef7ca6df302f31565";
       };
     };
     "debug-0.7.4" = {
@@ -1678,13 +1678,13 @@ let
         sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75";
       };
     };
-    "pkginfo-0.4.0" = {
+    "pkginfo-0.4.1" = {
       name = "pkginfo";
       packageName = "pkginfo";
-      version = "0.4.0";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz";
-        sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65";
+        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz";
+        sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff";
       };
     };
     "revalidator-0.1.8" = {
@@ -1774,7 +1774,7 @@ let
       version = "7.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
+        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -1801,7 +1801,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
       };
     };
     "once-1.4.0" = {
@@ -2089,7 +2089,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz";
-        sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv";
+        sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d";
       };
     };
     "lodash-4.17.4" = {
@@ -2116,16 +2116,16 @@ let
       version = "2.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
+        sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563";
       };
     };
-    "is-my-json-valid-2.16.0" = {
+    "is-my-json-valid-2.16.1" = {
       name = "is-my-json-valid";
       packageName = "is-my-json-valid";
-      version = "2.16.0";
+      version = "2.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz";
-        sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz";
+        sha1 = "5a846777e2c2620d1e69104e5d3a03b1f6088f11";
       };
     };
     "pinkie-promise-2.0.1" = {
@@ -2512,7 +2512,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
-        sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv";
+        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
       };
     };
     "string_decoder-1.0.3" = {
@@ -2521,7 +2521,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
+        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
       };
     };
     "http-basic-2.5.1" = {
@@ -2539,7 +2539,7 @@ let
       version = "7.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
+        sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
       };
     };
     "asap-2.0.6" = {
@@ -2665,7 +2665,7 @@ let
       version = "5.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
+        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
       };
     };
     "temp-0.8.3" = {
@@ -2746,7 +2746,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz";
-        sha512 = "0a77zmipy5silq8yx7adj0hw82ccvshbs5alv3h8l0vk83lkm5m7pw6y2781wnbks8h98ixyn2q3q065l6m8pwbrhxa3bcvrf191r5v";
+        sha1 = "0b98e64ed82f5acf0f2931babf69212ef52ddd37";
       };
     };
     "meow-3.7.0" = {
@@ -2809,7 +2809,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n";
+        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
       };
     };
     "object-assign-4.1.1" = {
@@ -2890,7 +2890,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54";
+        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3250,7 +3250,7 @@ let
       version = "5.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer/-/buffer-5.0.7.tgz";
-        sha512 = "2p32xxvhb1b3dp3hjy1ga0iajddqfxqi25wx44lhd94jjry1g758zywadx6hq04c8zsrcnmjyjrlymxrfmgyxib837jd93rd1fqgrrm";
+        sha1 = "570a290b625cf2603290c1149223d27ccf04db97";
       };
     };
     "cached-path-relative-1.0.1" = {
@@ -3295,7 +3295,7 @@ let
       version = "3.11.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz";
-        sha512 = "2alsgx5iqvf0nr641lz4g24bpvfgv6lza2h9n34d24jhvs3s0dklnds2x2nzs2w9sfiadi6zy93c2szm5ajn50wwnb8dalf02bxkbim";
+        sha1 = "948945efc6757a400d6e5e5af47194d10064279f";
       };
     };
     "defined-1.0.0" = {
@@ -3484,7 +3484,7 @@ let
       version = "2.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz";
-        sha512 = "09n1hj53jy075fnbsaaiknry7in0l4yarh912abwgvk4hwl33lvn8wrfw891zg5bkfa7sxlmd5yz3xxd4dmcln19bnkahyvd87r6k3k";
+        sha1 = "40a050ec8dc3b53b33d9909415c02c0bf1abfbad";
       };
     };
     "subarg-1.0.0" = {
@@ -3646,7 +3646,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz";
-        sha512 = "0dhi66vsajfcm04s11xqklh5lj3abs4ncnl8h3689964aqam3ps9spmc454hz94rz3x1x5l1ad03jrba67mq9zc9vq9a1gchma581bp";
+        sha1 = "a91947da1f4a516ea38e5b4ec0ec3773675e0886";
       };
     };
     "ieee754-1.1.8" = {
@@ -3727,7 +3727,7 @@ let
       version = "3.0.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz";
-        sha512 = "3crgpf13g3zshm39jjfgnp4lfg5jilllwk6ixi07nzyf4yghmxrhrdmhsgr5jr855ma790a21hd4bcvpx8bv9h5irnk6xpy6728gl7r";
+        sha1 = "c37d295531e786b1da3e3eadc840426accb0ae25";
       };
     };
     "public-encrypt-4.0.0" = {
@@ -3745,7 +3745,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz";
-        sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi";
+        sha1 = "dc009a246b8d09a177b4b7a0ae77bc570f4b1b79";
       };
     };
     "browserify-aes-1.0.6" = {
@@ -3766,13 +3766,13 @@ let
         sha1 = "daa277717470922ed2fe18594118a175439721dd";
       };
     };
-    "evp_bytestokey-1.0.0" = {
+    "evp_bytestokey-1.0.2" = {
       name = "evp_bytestokey";
       packageName = "evp_bytestokey";
-      version = "1.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz";
-        sha1 = "497b66ad9fef65cd7c08a6180824ba1476b66e53";
+        url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz";
+        sha1 = "f66bb88ecd57f71a766821e20283ea38c68bf80a";
       };
     };
     "buffer-xor-1.0.3" = {
@@ -3790,7 +3790,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
-        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
+        sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de";
       };
     };
     "des.js-1.0.0" = {
@@ -3817,7 +3817,7 @@ let
       version = "4.11.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
-        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
+        sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f";
       };
     };
     "browserify-rsa-4.0.1" = {
@@ -3862,7 +3862,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz";
-        sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx";
+        sha1 = "340dedbe6290187151c1ea1d777a3448935df846";
       };
     };
     "hmac-drbg-1.0.1" = {
@@ -4270,13 +4270,13 @@ let
         sha1 = "68261be4efb48840239b5791af23ee3b8bd79808";
       };
     };
-    "xml2js-0.4.18" = {
+    "xml2js-0.4.19" = {
       name = "xml2js";
       packageName = "xml2js";
-      version = "0.4.18";
+      version = "0.4.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.18.tgz";
-        sha512 = "2hgm5fp1zqiy89nn0i4j11j3h53h1hh0w2kbnfja16f8xbzkam62blrvz46xm8jnnaixwpxg8ydifvzmmyly0aml2c7k8gj1a9jvi9h";
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz";
+        sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7";
       };
     };
     "xspfr-0.3.1" = {
@@ -4780,16 +4780,16 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz";
-        sha512 = "2shaz6cv4fgbmy1hq6hc59spkja51qg0vvx514r1nqsspdnsq6xzxabk0gs17x3n8s03y9mj8hx1xn5c0bkq9fvx59sxms2a4mlig9r";
+        sha1 = "3e2ab0a464a803cc35d1357a1029d1cbd11dae37";
       };
     };
-    "simple-get-2.6.0" = {
+    "simple-get-2.7.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.6.0";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.6.0.tgz";
-        sha1 = "bb01144db49b3d4c107615dcf48d3ee404b16e06";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz";
+        sha1 = "ad37f926d08129237ff08c4f2edfd6f10e0380b5";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4816,7 +4816,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz";
-        sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p";
+        sha1 = "0b83aea885b3547b579ada0c6a5e7739fe4d073e";
       };
     };
     "simple-sha1-2.1.0" = {
@@ -4837,6 +4837,15 @@ let
         sha1 = "b264ddaa4d49a1d67300061858ba9358c4adca14";
       };
     };
+    "decompress-response-3.3.0" = {
+      name = "decompress-response";
+      packageName = "decompress-response";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz";
+        sha1 = "80a4dd323748384bfa248083622aedec982adff3";
+      };
+    };
     "simple-concat-1.0.0" = {
       name = "simple-concat";
       packageName = "simple-concat";
@@ -4846,13 +4855,13 @@ let
         sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6";
       };
     };
-    "unzip-response-2.0.1" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "2.0.1";
+    "mimic-response-1.0.0" = {
+      name = "mimic-response";
+      packageName = "mimic-response";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
-        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
+        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz";
+        sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e";
       };
     };
     "once-1.2.0" = {
@@ -5023,7 +5032,7 @@ let
       version = "1.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz";
-        sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r";
+        sha1 = "b1a54a0f924fbd4d45731a5771aea36be2166532";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5257,7 +5266,7 @@ let
       version = "1.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.1.tgz";
-        sha512 = "1xigw4j1na5gxiff1dad35vn0h91i77a9jzwsczl47rypanm2vfwyx2zchzdgny7mrxrn14bk9xss16nj2k3vng60v8pc7snjdc6q8n";
+        sha1 = "e6e92a00b2c74906ad69c42b6ea213dce8914d95";
       };
     };
     "bencode-0.8.0" = {
@@ -5332,13 +5341,13 @@ let
         sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61";
       };
     };
-    "ipaddr.js-1.4.0" = {
+    "ipaddr.js-1.5.2" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.4.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz";
-        sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz";
+        sha1 = "d4b505bde9946987ccf0fc58d9010ff9607e3fa0";
       };
     };
     "get-browser-rtc-1.0.2" = {
@@ -5671,7 +5680,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz";
-        sha512 = "1zss1rcd373slj9qjmy4zp7ann95isbkvjlrgp2dirpazvn1sy23hgnw6p72w0mj8hcgqpxvs0ls035zmb8isilqhqqpkmya9d3234r";
+        sha1 = "5465c0ce11d0881f7d8e36d8ca587043f33a25ae";
       };
     };
     "exit-on-epipe-1.0.1" = {
@@ -5680,7 +5689,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz";
-        sha512 = "2kxcf7dq1q9z2wqwwfjagn77kpzg2zpjqf2kd3vj5drx576gwglbsfly2b1imabj3svgcz5xsx79kspq1xsdgm4wwg1fksfnjdgjv47";
+        sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692";
       };
     };
     "sax-1.2.4" = {
@@ -5689,7 +5698,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
+        sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
       };
     };
     "xmlbuilder-9.0.4" = {
@@ -5926,13 +5935,13 @@ let
         sha1 = "364200d5f13646ca8bcd44490271335614792300";
       };
     };
-    "big-integer-1.6.23" = {
+    "big-integer-1.6.24" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.23";
+      version = "1.6.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.23.tgz";
-        sha1 = "e85d508220c74e3f43a4ce72eed51f3da4db94d1";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.24.tgz";
+        sha1 = "1ed84d018ac3c1c72b307e7f7d94008e8ee20311";
       };
     };
     "sax-0.3.5" = {
@@ -6157,7 +6166,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz";
-        sha512 = "1rkrq8iizbb4v8qv16qdknj2m9cjbxyl6d0jlp1jsnkys56b7xnn50f7qxbcsmz5z1m9r8j1pas6ai7bnhlmvmv88pyvdhw8fw3msdw";
+        sha1 = "53fe161111f912ab999ee887a90a0bc52822fd75";
       };
     };
     "foreach-2.0.5" = {
@@ -6286,13 +6295,13 @@ let
         sha1 = "032e2253489cf8fce02666beca3d11ed7a2daed1";
       };
     };
-    "accepts-1.3.3" = {
+    "accepts-1.3.4" = {
       name = "accepts";
       packageName = "accepts";
-      version = "1.3.3";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz";
-        sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz";
+        sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f";
       };
     };
     "bytes-2.5.0" = {
@@ -6427,7 +6436,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz";
-        sha512 = "2vbps6iw562i2zxd973z5mmbs8ggx3wbz4g1jqwvkjibiwrk9ym8bxcvvwnlmxqad92x120x5xz5nyfq68nd8akk355bkk0qjppzafp";
+        sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7";
       };
     };
     "fresh-0.5.0" = {
@@ -6499,7 +6508,7 @@ let
       version = "6.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
-        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
+        sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49";
       };
     };
     "send-0.15.4" = {
@@ -6583,6 +6592,15 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
+    "ipaddr.js-1.4.0" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz";
+        sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0";
+      };
+    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -6634,7 +6652,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
+        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
       };
     };
     "promzard-0.3.0" = {
@@ -6646,13 +6664,13 @@ let
         sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
       };
     };
-    "read-package-json-2.0.11" = {
+    "read-package-json-2.0.12" = {
       name = "read-package-json";
       packageName = "read-package-json";
-      version = "2.0.11";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.11.tgz";
-        sha512 = "1y74w8zm70x1zc7qgg6fxg72pb78dmafg2bf5x4gn1z8d4amjrw2q3d4j9035ginsrigk372scwj57p0ll5ck9yxdgnyjpzcd5fj7wy";
+        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz";
+        sha1 = "68ea45f98b3741cb6e10ae3bbd42a605026a6951";
       };
     };
     "validate-npm-package-name-3.0.0" = {
@@ -6670,7 +6688,16 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz";
-        sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967";
+        sha1 = "50183cd1b2d25275de069e9e71b467ac9eab973a";
+      };
+    };
+    "slash-1.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
+        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
       };
     };
     "builtins-1.0.3" = {
@@ -7624,7 +7651,7 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz";
-        sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g";
+        sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd";
       };
     };
     "infinity-agent-2.0.3" = {
@@ -8156,7 +8183,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz";
-        sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf";
+        sha1 = "b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7";
       };
     };
     "nan-2.6.2" = {
@@ -8891,13 +8918,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.100.0" = {
+    "aws-sdk-2.104.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.100.0";
+      version = "2.104.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.100.0.tgz";
-        sha1 = "fc0fbca7690d6c28effd28bd51fe85f7dba42bff";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.104.0.tgz";
+        sha1 = "335e0553380c0ae8dd43d11b76d73dfb926f6333";
       };
     };
     "request-2.81.0" = {
@@ -9068,7 +9095,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/conf/-/conf-1.1.2.tgz";
-        sha512 = "0x5jhmsdnq5y7m1wdvvcdg2rxf6435lw7s00gim8zsb4l2z4slvb2g7macl1376v9mcznfvl9p65m7xzm6f3cb20yfq3v2xi1qfd6yi";
+        sha1 = "a164003022dd1643cd5abd9653071bd3b0a19f50";
       };
     };
     "got-7.1.0" = {
@@ -9077,7 +9104,7 @@ let
       version = "7.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz";
-        sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3";
+        sha1 = "05450fd84094e6bbea56f451a43a9c289166385a";
       };
     };
     "has-ansi-3.0.0" = {
@@ -9095,7 +9122,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz";
-        sha512 = "26xxz57vqm8p6mg0syr21risma4h5h9n8kn4zv4pcxqap4zxicc210w5m7vz6a4zldhd102sbi7giwzmw0wjlpr6rb1hycr8iv703b1";
+        sha1 = "079df1da943b3274f46932fb740c9b56dd6351fb";
       };
     };
     "ink-0.3.1" = {
@@ -9104,7 +9131,7 @@ let
       version = "0.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz";
-        sha512 = "0km0z5smnzrh4c5386h3vbmvps6m45m6hbbf62as9wl4vw370q411gpxxhqz3i83n0qjds7py2ylgjx2y3915m5v77c1sf428w4wwkv";
+        sha1 = "551047276cb93baa3f14eafaef2ae5b1526e8213";
       };
     };
     "ink-text-input-1.1.0" = {
@@ -9113,7 +9140,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.0.tgz";
-        sha512 = "3dlsk820l687ixfmi4qx8czzb7cr0hfz5gijxvm5x0qrnhrcg4kqzhvph2hrf50whjj3cxcbyx6ldqxnp6msw7ai5rs3b4vs50vcpak";
+        sha1 = "887a9623c23fd5c6f173b9704e6cc6029d0a15c1";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -9203,7 +9230,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz";
-        sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb";
+        sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55";
       };
     };
     "shebang-command-1.2.0" = {
@@ -9239,7 +9266,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
+        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
       };
     };
     "env-paths-1.0.0" = {
@@ -9314,15 +9341,6 @@ let
         sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc";
       };
     };
-    "decompress-response-3.3.0" = {
-      name = "decompress-response";
-      packageName = "decompress-response";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz";
-        sha1 = "80a4dd323748384bfa248083622aedec982adff3";
-      };
-    };
     "duplexer3-0.1.4" = {
       name = "duplexer3";
       packageName = "duplexer3";
@@ -9347,7 +9365,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
-        sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl";
+        sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67";
       };
     };
     "p-cancelable-0.3.0" = {
@@ -9356,7 +9374,7 @@ let
       version = "0.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz";
-        sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5";
+        sha1 = "b9e123800bcebb7ac13a479be195b507b98d30fa";
       };
     };
     "p-timeout-1.2.0" = {
@@ -9395,22 +9413,13 @@ let
         sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9";
       };
     };
-    "mimic-response-1.0.0" = {
-      name = "mimic-response";
-      packageName = "mimic-response";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz";
-        sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e";
-      };
-    };
     "has-to-string-tag-x-1.4.0" = {
       name = "has-to-string-tag-x";
       packageName = "has-to-string-tag-x";
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.0.tgz";
-        sha512 = "0ldd58k8nhlbx35b3bbvyq9w38sdg9ac3334s6bxjw2zn803aa8zal9jvg793561g11yhwrlj4bw160ppmmswidhpwh3s33zww9sws7";
+        sha1 = "49d7bcde85c2409be38ac327e3e119a451657c7b";
       };
     };
     "is-object-1.0.1" = {
@@ -9428,7 +9437,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.0.tgz";
-        sha512 = "14khsaf360hn87pdlz9scgn3c5s1ndihc6prcsi5k2rkiapz4ag3lg448a69srpsvdk7jyp4hf4a9fp113nkprdmnadrx2n7cn6slqp";
+        sha1 = "442d89b1d0ac6cf5ff2f7b916ee539869b93a256";
       };
     };
     "ansi-regex-3.0.0" = {
@@ -9590,7 +9599,7 @@ let
       version = "6.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz";
-        sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb";
+        sha1 = "af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3";
       };
     };
     "convert-source-map-1.5.0" = {
@@ -9620,15 +9629,6 @@ let
         sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "slash-1.0.0" = {
-      name = "slash";
-      packageName = "slash";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
-        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
-      };
-    };
     "esutils-2.0.2" = {
       name = "esutils";
       packageName = "esutils";
@@ -9698,7 +9698,7 @@ let
       version = "0.4.16";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.16.tgz";
-        sha512 = "2p8x22bgrc6cyxz8j73zzcwpqcb7fszycq7qrvbb0wd4g5wvdrz40lv3hyagx5if3xw0x1sjisx1a298gl51xl2mxizj7rvsv4ybaq3";
+        sha1 = "16fecf98212467d017d586a2af68d628b9421cd8";
       };
     };
     "regenerator-runtime-0.11.0" = {
@@ -9707,7 +9707,7 @@ let
       version = "0.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz";
-        sha512 = "3a1pn2aankj443h5v8png8dbgrlyb7fcdn66vjglxwqvdpivpq959qsl2n44i6zwf1k5y6y23xwhim0x077yy275dyr6vwiny83987x";
+        sha1 = "7e54fe5b5ccd5d6624ea6255c3473be090b802e1";
       };
     };
     "globals-9.18.0" = {
@@ -9716,7 +9716,7 @@ let
       version = "9.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab";
+        sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a";
       };
     };
     "invariant-2.2.2" = {
@@ -9806,7 +9806,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
+        sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e";
       };
     };
     "indent-string-3.2.0" = {
@@ -9860,7 +9860,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
+        sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88";
       };
     };
     "supports-color-4.2.1" = {
@@ -9869,7 +9869,7 @@ let
       version = "4.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
-        sha512 = "1ldz0jkrkclywnr7gwh85p6kljs5rm4jczbpj55vb9w5c81iyrf1ahgkw88nnzahgw2xvlg041vqk7gynxkwcqkzfagxjpphsrdh75b";
+        sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836";
       };
     };
     "color-convert-1.9.0" = {
@@ -9959,7 +9959,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
+        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -10031,7 +10031,7 @@ let
       version = "1.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz";
-        sha512 = "250k1k343w8g1ndd16h1lqcdvp989id6agsppfqi9a6lcqk89ga56xjz78hhy1dqn86vha8n8s551pwpyd1n87mkw4a7143djmm95n5";
+        sha1 = "c54e9aac57e432875233525f3c891c4159ffefd7";
       };
     };
     "whatwg-fetch-2.0.3" = {
@@ -10058,7 +10058,7 @@ let
       version = "0.4.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
-        sha512 = "2l97vd6kax8syr9aggcqhiyhd3b2rf506wdq6wapfrc74qwpdzqf2a3891kq9ri3g5sdzayph2sz4zkr8kbbps58z9h2lvpk115kgdj";
+        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
       };
     };
     "unicode-emoji-modifier-base-1.0.0" = {
@@ -10142,13 +10142,13 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "ignore-3.3.3" = {
+    "ignore-3.3.4" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.3.3";
+      version = "3.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz";
-        sha1 = "432352e57accd87ab3110e82d3fea0e47812156d";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.4.tgz";
+        sha1 = "85ab6d0a9ca8b27b31604c09efe1c14dc21ab872";
       };
     };
     "inquirer-3.2.2" = {
@@ -10157,7 +10157,7 @@ let
       version = "3.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.2.tgz";
-        sha512 = "0gsmdyd280pgvy7aqam9hdjhpljwmyn2axwmf2gp6qrc8cxrykrshan1kr1s1f9cb8pf13m3jav92df9dbn1gwkk7i08m698768nckd";
+        sha1 = "c2aaede1507cc54d826818737742d621bef2e823";
       };
     };
     "is-resolvable-1.0.0" = {
@@ -10175,7 +10175,7 @@ let
       version = "3.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz";
-        sha512 = "31wxw267vdf4nnjpksnzcb4i603366sjrw7g08bkxi3cwlrfl67458v7rvj72vbxcycq43z4ldkrfvqjrsvrjqrb2kfzmabpzghddq9";
+        sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0";
       };
     };
     "levn-0.3.0" = {
@@ -10301,7 +10301,7 @@ let
       version = "0.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz";
-        sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji";
+        sha1 = "815c99ea84f6809529d2f45791bdf82711352d66";
       };
     };
     "del-2.2.2" = {
@@ -10376,13 +10376,13 @@ let
         sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f";
       };
     };
-    "cli-width-2.1.0" = {
+    "cli-width-2.2.0" = {
       name = "cli-width";
       packageName = "cli-width";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz";
-        sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a";
+        url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz";
+        sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
       };
     };
     "external-editor-2.0.4" = {
@@ -10436,7 +10436,7 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz";
-        sha512 = "3c44v9rz6j4z6i7gj2v3wmfcqv5i47psysgd1p4jcgz114vfk99fif1n1r08jbsdkp4g3smv1wx7x4ikwa7q9dp5i1bc77la17s2kdw";
+        sha1 = "c519f629f86b3a5bedba58a88d311309eec097f9";
       };
     };
     "tmp-0.0.31" = {
@@ -10481,7 +10481,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
-        sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1";
+        sha1 = "4499eddcd1110e0b218bacf2fa7f7f59f55ca804";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -10574,13 +10574,13 @@ let
         sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
       };
     };
-    "eslint-4.4.1" = {
+    "eslint-4.5.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "4.4.1";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz";
-        sha1 = "99cd7eafcffca2ff99a5c8f5f2a474d6364b4bd3";
+        url = "https://registry.npmjs.org/eslint/-/eslint-4.5.0.tgz";
+        sha1 = "bb75d3b8bde97fb5e13efcd539744677feb019c3";
       };
     };
     "supports-color-3.2.3" = {
@@ -10643,7 +10643,7 @@ let
       version = "0.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz";
-        sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf";
+        sha1 = "845a1cfda804a13419ec8ec12343e1f4c45cd07a";
       };
     };
     "cli-spinners-1.0.0" = {
@@ -10967,7 +10967,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz";
-        sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi";
+        sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a";
       };
     };
     "async-each-1.0.1" = {
@@ -11021,7 +11021,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz";
-        sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja";
+        sha1 = "3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4";
       };
     };
     "micromatch-2.3.11" = {
@@ -11129,7 +11129,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
+        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
       };
     };
     "expand-range-1.8.2" = {
@@ -11192,7 +11192,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
-        sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg";
+        sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c";
       };
     };
     "is-number-3.0.0" = {
@@ -11327,7 +11327,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
+        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
       };
     };
     "tar-pack-3.4.0" = {
@@ -11372,7 +11372,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
-        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
+        sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1";
       };
     };
     "string-width-1.0.2" = {
@@ -11390,7 +11390,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
+        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
       };
     };
     "event-stream-0.5.3" = {
@@ -11544,7 +11544,7 @@ let
       version = "1.12.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-        sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
+        sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
       };
     };
     "jade-1.11.0" = {
@@ -12255,7 +12255,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
+        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
       };
     };
     "object.defaults-1.1.0" = {
@@ -12267,13 +12267,13 @@ let
         sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf";
       };
     };
-    "object.pick-1.2.0" = {
+    "object.pick-1.3.0" = {
       name = "object.pick";
       packageName = "object.pick";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz";
-        sha1 = "b5392bee9782da6d9fb7d6afaf539779f1234c2b";
+        url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz";
+        sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
       };
     };
     "parse-filepath-1.0.1" = {
@@ -12813,7 +12813,7 @@ let
       version = "5.4.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.3.tgz";
-        sha512 = "20pswi06vxjrv64d6i7z1zcsml98fma05a3xbyaycyfn7xmhbg8zwhnswx9pd03hrlxr4ypgikjgr65a0kkycjcyw9819gffaw95jvm";
+        sha1 = "d28f83ed19f10cf4bc9dc84db3c424788a1c541e";
       };
     };
     "chai-4.1.1" = {
@@ -12831,7 +12831,7 @@ let
       version = "7.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz";
-        sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb";
+        sha1 = "08645d825deb8696ee61725dbf590c012eb00ca0";
       };
     };
     "fast-json-patch-2.0.4" = {
@@ -12921,7 +12921,7 @@ let
       version = "3.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz";
-        sha512 = "1dwznr02qr6wd7886k3i7y3vxgzqdm14gc5vs892vrc8azhh6hl79bvl5lgc05004lzqbazj9p7vdkbms62f1iys92h5w1xpvdldfc8";
+        sha1 = "b7857be58b97af664a8cdd071c91891d6c7d6a67";
       };
     };
     "vscode-languageserver-3.3.0" = {
@@ -12930,7 +12930,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.3.0.tgz";
-        sha512 = "380fi37ifwdgndnglvymyrb844aybpm5mjpwmq4p3dm1b93iqdfr00pr2b692d15k5hn9x82h98zw0bs0k7287pwdvdkv3v75pc92zi";
+        sha1 = "f547d4f0e5702f88ff3695bae5905f9604c8cc62";
       };
     };
     "vscode-languageserver-types-3.3.0" = {
@@ -12939,7 +12939,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz";
-        sha512 = "1xjiay30jyp6sj9nq55zwjmxyq5ajcdrv4bw9ypkplv7mg57h4skiqvcsd6wbizidpx3xanqmnl04l66491fmlrwijn9ph3rsa044z4";
+        sha1 = "8964dc7c2247536fbefd2d6836bf3febac80dd00";
       };
     };
     "symbol-observable-1.0.4" = {
@@ -13137,7 +13137,7 @@ let
       version = "0.13.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz";
-        sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s";
+        sha1 = "e5219e587951d60958fd94ea9a9a008cdeff1b34";
       };
     };
     "bluebird-3.5.0" = {
@@ -13194,13 +13194,13 @@ let
         sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa";
       };
     };
-    "superagent-3.5.2" = {
+    "superagent-3.6.0" = {
       name = "superagent";
       packageName = "superagent";
-      version = "3.5.2";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz";
-        sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8";
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.6.0.tgz";
+        sha1 = "eb679651057c3462199c7b902b696c25350e1b87";
       };
     };
     "component-emitter-1.2.1" = {
@@ -13221,13 +13221,13 @@ let
         sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
       };
     };
-    "form-data-2.2.0" = {
+    "form-data-2.3.1" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.2.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.2.0.tgz";
-        sha1 = "9a5e3b9295f980b2623cf64fa238b14cebca707b";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz";
+        sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf";
       };
     };
     "formidable-1.1.1" = {
@@ -13704,7 +13704,7 @@ let
       version = "3.6.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/connect/-/connect-3.6.3.tgz";
-        sha512 = "2fkfixwv0fqqxw5rhmzrczj8ayxccwnxwkgyv4w8sxnkz52sl6dsx2nirg1vryxxqdlwph4ag9vc17yzzydmzshc73gpi6m12m9kd0q";
+        sha1 = "f7320d46a25b4be7b483a2236517f24b1e27e301";
       };
     };
     "di-0.0.1" = {
@@ -13941,6 +13941,15 @@ let
         sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
+    "accepts-1.3.3" = {
+      name = "accepts";
+      packageName = "accepts";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz";
+        sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca";
+      };
+    };
     "base64id-1.0.0" = {
       name = "base64id";
       packageName = "base64id";
@@ -14667,7 +14676,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz";
-        sha512 = "0mvmzv0c23159jkmwd32hlbilf9lby2iz7xpmxi6i5ym75am5m355dpfv0wwkw2s41f8lncgnx6plxl361bqkfbmds8083llmf6dkv7";
+        sha1 = "33abf2b5720a9b094df38e81741ccb502e1a4125";
       };
     };
     "conventional-recommended-bump-1.0.1" = {
@@ -14676,7 +14685,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz";
-        sha512 = "0cn224cp4qa787r0gkxg66f8m3s6l4nimfi2hm9mi5b0fh1365nqcipq3p5g1l82lkz6xdc9ihv46pvrx7gr8l0lh563dvh8bqw8nnq";
+        sha1 = "56b8ae553a8a1152fa069e767599e1f6948bd36c";
       };
     };
     "dedent-0.7.0" = {
@@ -14688,22 +14697,31 @@ let
         sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c";
       };
     };
-    "fs-extra-3.0.1" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "3.0.1";
+    "execa-0.8.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz";
-        sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291";
+        url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz";
+        sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da";
       };
     };
-    "get-port-3.1.0" = {
+    "fs-extra-4.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.1.tgz";
+        sha1 = "7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880";
+      };
+    };
+    "get-port-3.2.0" = {
       name = "get-port";
       packageName = "get-port";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-port/-/get-port-3.1.0.tgz";
-        sha1 = "ef01b18a84ca6486970ff99e54446141a73ffd3e";
+        url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz";
+        sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc";
       };
     };
     "globby-6.1.0" = {
@@ -14724,13 +14742,13 @@ let
         sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
       };
     };
-    "load-json-file-2.0.0" = {
+    "load-json-file-3.0.0" = {
       name = "load-json-file";
       packageName = "load-json-file";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
-        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-3.0.0.tgz";
+        sha1 = "7eb3735d983a7ed2262ade4ff769af5369c5c440";
       };
     };
     "read-cmd-shim-1.0.1" = {
@@ -14769,13 +14787,13 @@ let
         sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9";
       };
     };
-    "write-file-atomic-2.1.0" = {
+    "write-file-atomic-2.3.0" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "2.1.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz";
+        sha1 = "1ff61575c2e2a4e8e510d6fa4e243cce183999ab";
       };
     };
     "write-json-file-2.2.0" = {
@@ -14838,7 +14856,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz";
-        sha512 = "2cp0yhzf0kjmhawbj1v8kq71ddksbx8g7k1h7snwxijqy2xdgl6y6c63q6qg8ck3ar6n6wcs7yxzrq6kc9ddphclaqdg5s9d7drfhms";
+        sha1 = "118b9f7d41a3d99500bfb6bea1f3525e055e8b9b";
       };
     };
     "conventional-changelog-atom-0.1.1" = {
@@ -14847,7 +14865,7 @@ let
       version = "0.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz";
-        sha512 = "0h2y3wj5pfwir1ynh6i7qibcv30z2vy6l6q11nh9z9vzl15433c00bvjy1iz9zirkb57g4xyilak59hdzfzinadxqi8h3r2wgznxng8";
+        sha1 = "d40a9b297961b53c745e5d1718fd1a3379f6a92f";
       };
     };
     "conventional-changelog-codemirror-0.1.0" = {
@@ -15018,7 +15036,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz";
-        sha512 = "16mn1j3vray2l88lrl57pkaxz3bvv4ahnx3qr6r3hkdjarzqn1d8w99n44mn39y4kdmcva1z6annx92h06r870yq05382f76jvv2p3w";
+        sha1 = "6ccd2a52e735b736748dc762444fcd9588e27490";
       };
     };
     "conventional-commits-filter-1.0.0" = {
@@ -15036,7 +15054,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
-        sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r";
+        sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9";
       };
     };
     "is-subset-0.1.1" = {
@@ -15135,7 +15153,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz";
-        sha512 = "0mh43bfdx21ll5dn629cyh7p65drm2zcrazqvi6kq0m17h0y27brzsf8shjpi4idj3h9sqqa1dnq47xdwa00y4saswih5iqmy1pm1zj";
+        sha1 = "71d01910cb0a99aeb20c144e50f81f4df3178447";
       };
     };
     "jsonfile-3.0.1" = {
@@ -15165,6 +15183,15 @@ let
         sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
       };
     };
+    "parse-json-3.0.0" = {
+      name = "parse-json";
+      packageName = "parse-json";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz";
+        sha1 = "fa6f47b18e23826ead32f263e744d0e1e847fb13";
+      };
+    };
     "strip-bom-3.0.0" = {
       name = "strip-bom";
       packageName = "strip-bom";
@@ -15174,6 +15201,15 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
+    "load-json-file-2.0.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+      };
+    };
     "path-type-2.0.0" = {
       name = "path-type";
       packageName = "path-type";
@@ -15243,7 +15279,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
+        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
       };
     };
     "which-module-2.0.0" = {
@@ -15648,7 +15684,7 @@ let
       version = "8.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
-        sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx";
+        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
       };
     };
     "npmconf-2.1.2" = {
@@ -15666,7 +15702,7 @@ let
       version = "3.1.15";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
-        sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5";
+        sha1 = "cccdc35b90917d58e4c3837795d5d022d7a1f46f";
       };
     };
     "fs.extra-1.3.2" = {
@@ -15702,7 +15738,7 @@ let
       version = "4.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr";
+        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
       };
     };
     "uid-number-0.0.5" = {
@@ -15720,7 +15756,7 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
-        sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
+        sha1 = "5ada97538b1027b4cf7213432428578cb564011f";
       };
     };
     "minizlib-1.0.3" = {
@@ -16089,7 +16125,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz";
-        sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a";
+        sha1 = "355e8f4d16876b43f577b0d5ce2668b9723214ea";
       };
     };
     "fs.notify-0.0.4" = {
@@ -16134,7 +16170,7 @@ let
       version = "1.2.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz";
-        sha512 = "3bpyhs9imacbmpq0r7l65qvkx0dfnx92qz5vm59i983h2xvw2yrr1934i979accigkr33b65n51m5zx73glbi3pwl8n6zm5b3y74a8a";
+        sha1 = "d44fea5a54145600c1a3875e942ab6727adbddb5";
       };
     };
     "mqtt-2.9.0" = {
@@ -16143,7 +16179,7 @@ let
       version = "2.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz";
-        sha512 = "181qi8xb0lxxqvwq2xcslv35dbhphyr67w02bad6n4rlibcm6z0j055dyfpdh12mrrvgjzfj11cjylsj26y7vr17cvk1kbgkiqgzpb9";
+        sha1 = "379ceb787a52fc15cb8fc96d558a32c123f12a9d";
       };
     };
     "multer-1.3.0" = {
@@ -16215,7 +16251,7 @@ let
       version = "3.0.20";
       src = fetchurl {
         url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz";
-        sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv";
+        sha1 = "cb35b2bcfe478051b6f3282be8db4e4add49a1e5";
       };
     };
     "when-3.7.8" = {
@@ -16272,13 +16308,13 @@ let
         sha1 = "a670c1542a6eaf5e06db45490c2a7edf8a9f70b6";
       };
     };
-    "bcrypt-1.0.2" = {
+    "bcrypt-1.0.3" = {
       name = "bcrypt";
       packageName = "bcrypt";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz";
-        sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
+        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz";
+        sha1 = "b02ddc6c0b52ea16b8d3cf375d5a32e780dab548";
       };
     };
     "css-select-1.2.0" = {
@@ -16494,7 +16530,7 @@ let
       version = "2.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz";
-        sha512 = "2h6492mk9v9dzy26i5wfajinhi2pg729ksbcsmm0sp8s32hlr432q19g97qghfp5x98hsm77hmzwdzhgi3vhm2drz53ax7rabhydw98";
+        sha1 = "2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a";
       };
     };
     "retry-0.6.1" = {
@@ -16575,7 +16611,7 @@ let
       version = "5.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz";
-        sha512 = "2d1hvibps8d4xlw8wm937ykc76yb02rp2065hd6186vygjx3wixjjzrn3fia4wfj7d38ic8gh5ij5rsi9389kl6gpxxjbdcbjwpn8yf";
+        sha1 = "387104c06aa68fbb9f8159d0c722dd5c3e45df22";
       };
     };
     "reinterval-1.1.0" = {
@@ -16593,7 +16629,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.1.tgz";
-        sha512 = "3w842xsi7pgjjr5fkdzbx9dfsjl87x6c8wrvxgy8i1lr399yjiggbwrfdvpccv698f7n4ywvf7dbc8g61ly99yw1lf7fwpfrypg8x9p";
+        sha1 = "51cb992988c2eeb4525ccd90eafbac52a5ac6700";
       };
     };
     "leven-1.0.2" = {
@@ -16656,7 +16692,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-3.1.0.tgz";
-        sha512 = "07wdh2llaz8j5nbjpvl1zbbksw2pikqnw243c6a1ifmshp095hgam79vv5nbp1pjwnlm120m4d3sih9iwm5mkc46im03jb5l6l3ykjd";
+        sha1 = "8afafecdeab46d572e5397ee880739367aa2f41c";
       };
     };
     "append-field-0.1.0" = {
@@ -16929,42 +16965,6 @@ let
         sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
-    "nan-2.5.0" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
-        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
-      };
-    };
-    "node-pre-gyp-0.6.32" = {
-      name = "node-pre-gyp";
-      packageName = "node-pre-gyp";
-      version = "0.6.32";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
-      };
-    };
-    "rc-1.1.7" = {
-      name = "rc";
-      packageName = "rc";
-      version = "1.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz";
-        sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea";
-      };
-    };
-    "tar-pack-3.3.0" = {
-      name = "tar-pack";
-      packageName = "tar-pack";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz";
-        sha1 = "30931816418f55afc4d21775afdd6720cee45dae";
-      };
-    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -17235,13 +17235,13 @@ let
         sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
       };
     };
-    "debug-3.0.0" = {
+    "debug-3.0.1" = {
       name = "debug";
       packageName = "debug";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.0.0.tgz";
-        sha512 = "3ra092awfmss9asigji0v03n1n27376c2h94zyzv5sr206nd0p3p6hyzaadlyfz8vj1pcypk2bmjqmnx1v0iasvrkz2dc4v3b3hf2ax";
+        url = "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz";
+        sha1 = "0564c612b521dc92d9f2988f0549e34f9c98db64";
       };
     };
     "qs-0.5.1" = {
@@ -17574,7 +17574,7 @@ let
       version = "9.2.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
-        sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642";
+        sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd";
       };
     };
     "call-limit-1.1.0" = {
@@ -17592,7 +17592,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
-        sha512 = "07r7qvmx5fjjk2ra3hjrz31ciy4vhfq2k8a3wjscjl7y52885zwfvz4caa5xr3kab8l3y4c9rsz1nkpjl530irrs6q5l3z6yadyj4c8";
+        sha1 = "08c4a452f789dcbac4c89a4563c902b2c862fd5b";
       };
     };
     "lazy-property-1.0.0" = {
@@ -17610,7 +17610,7 @@ let
       version = "9.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz";
-        sha512 = "0ki52cm2pf27r9pkpfbrx6y1myg7yx1mghwnvv6mw4kmgscif08qlj0xzlc88kpfl549xip4z1ap64s22l7v3q26ygz6x12cch87wsr";
+        sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304";
       };
     };
     "lodash._baseuniq-4.6.0" = {
@@ -17709,7 +17709,7 @@ let
       version = "2.7.38";
       src = fetchurl {
         url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz";
-        sha512 = "0a0ar6lns179qdszia13prhj7gjpdjy334xafq791h48q00259lr6gpkzp17dagfcnff9pgcgxm7b68nidpj5qs0yah1v81fk4d84az";
+        sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1";
       };
     };
     "promise-inflight-1.0.1" = {
@@ -17727,7 +17727,7 @@ let
       version = "5.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
-        sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l";
+        sha1 = "4f03e83d0486856fb60d97c94882841c2a7b1b7a";
       };
     };
     "sorted-union-stream-2.1.3" = {
@@ -17763,7 +17763,16 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz";
-        sha512 = "0vh5z2d6q3zgf7j3g5ngyq4piqq1y613wacfyildfnm2c2klb4h2gw32grgk6pv9ssyiliyfvj4p4alpaa85cqcj2nznb4q0fv400dn";
+        sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8";
+      };
+    };
+    "write-file-atomic-2.1.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
+        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
       };
     };
     "lodash._baseindexof-3.1.0" = {
@@ -17856,13 +17865,13 @@ let
         sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
       };
     };
-    "copy-concurrently-1.0.3" = {
+    "copy-concurrently-1.0.5" = {
       name = "copy-concurrently";
       packageName = "copy-concurrently";
-      version = "1.0.3";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz";
-        sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250";
+        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
+        sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0";
       };
     };
     "run-queue-1.0.3" = {
@@ -17874,13 +17883,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "make-fetch-happen-2.4.13" = {
+    "make-fetch-happen-2.5.0" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "2.4.13";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.13.tgz";
-        sha512 = "0j8sgm5sh7lb4mdpg52yz9rv0jpgkd3bf701i30gd5s3aqxb0i2lq8qm4bndqqfcb8jgiw8wj6dwpv2497khvxmmx3bfj0iad7aqw7g";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.5.0.tgz";
+        sha1 = "08c22d499f4f30111addba79fe87c98cf01b6bc8";
       };
     };
     "npm-pick-manifest-1.0.4" = {
@@ -17889,7 +17898,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
+        sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8";
       };
     };
     "promise-retry-1.1.1" = {
@@ -17925,7 +17934,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
-        sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
+        sha1 = "6d5de5829afd3be2712201a39275fd11c651857c";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -17952,7 +17961,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
+        sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443";
       };
     };
     "node-fetch-npm-2.0.2" = {
@@ -17961,7 +17970,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz";
-        sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
+        sha1 = "7258c9046182dca345b4208eda918daf33697ff7";
       };
     };
     "socks-proxy-agent-3.0.0" = {
@@ -17970,7 +17979,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz";
-        sha512 = "3zn9cz2ry5m1akapj7hvhgkxfq7ffwynia46lmwipsw2jk5sv8dvs32dc4hfx3xvp34i1jff1bg870a1xnknsgk5dl021jd4gwi75v0";
+        sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -17988,7 +17997,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
-        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
+        sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -18006,7 +18015,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
-        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
+        sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a";
       };
     };
     "socks-1.1.10" = {
@@ -18078,7 +18087,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
-        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
+        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
       };
     };
     "import-lazy-2.1.0" = {
@@ -18162,6 +18171,15 @@ let
         sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
       };
     };
+    "unzip-response-2.0.1" = {
+      name = "unzip-response";
+      packageName = "unzip-response";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
+        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
+      };
+    };
     "argparse-0.1.15" = {
       name = "argparse";
       packageName = "argparse";
@@ -18387,13 +18405,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.38.3" = {
+    "snyk-1.40.1" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.38.3";
+      version = "1.40.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.38.3.tgz";
-        sha1 = "76988492a24030ee1b496fd6c0b45aedaf349ec4";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.40.1.tgz";
+        sha1 = "36120e6ab1659185db33fd3404377152bb92cdf2";
       };
     };
     "spawn-please-0.3.0" = {
@@ -18504,13 +18522,13 @@ let
         sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
       };
     };
-    "es5-ext-0.10.27" = {
+    "es5-ext-0.10.30" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.27";
+      version = "0.10.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.27.tgz";
-        sha512 = "39v1b13qiq02g8qwdjqnnqla20yy3bbhvvk66vhjyywbha8bjb9ry6q4hk8zlckvws880azkrxyw994dkkfcwpiqmxkfpfaii2wk9fw";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz";
+        sha1 = "7141a16836697dbabfaaaeee41495ce29f52c939";
       };
     };
     "es6-iterator-2.0.1" = {
@@ -18558,13 +18576,22 @@ let
         sha1 = "f27aec2498b24027ac719214026521591111508f";
       };
     };
-    "snyk-gradle-plugin-1.0.3" = {
+    "snyk-go-plugin-1.1.2" = {
+      name = "snyk-go-plugin";
+      packageName = "snyk-go-plugin";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.1.2.tgz";
+        sha1 = "af93ab38d34ab40c67f1ffb00eb3bf6e4b6ab17c";
+      };
+    };
+    "snyk-gradle-plugin-1.1.1" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "1.0.3";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.0.3.tgz";
-        sha512 = "0mfvgmyrysvs5vfwnv6scysgkjq2917zay5s5x884a0xv0rdzr6rcc283lmkzm9g4rwikf06mz5aq99j59vl168iwpcfdk2q4w0l8l9";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.1.1.tgz";
+        sha1 = "9d75c973ce0e2e94bbf031ca737a354d9f2aa026";
       };
     };
     "snyk-module-1.8.1" = {
@@ -18582,7 +18609,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.0.tgz";
-        sha512 = "01vcacjw51v7n21nb72chxlgqnzslg4dxqf2m5v4dlig0mk03jbvhhib2a48ji9kda2gplnq94xnjgqkc6ckp4xjyv7ajqacdabfwnv";
+        sha1 = "99ae297b7ae40fa8df78a39fa13816dc513c2d10";
       };
     };
     "snyk-policy-1.7.1" = {
@@ -18600,7 +18627,7 @@ let
       version = "1.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.3.tgz";
-        sha512 = "32brr3jb8vs1253ls0bmhmnp26873sc40805wvxl3x40i84czzr5nrnf5x2ikwk8hb4nwcy5bwpm192wj43z7g0gcd2k19afq8ixifn";
+        sha1 = "c7c7df73576c6f8e9fab25364e8bab0b325b5ca9";
       };
     };
     "snyk-recursive-readdir-2.0.0" = {
@@ -18636,7 +18663,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.1.0.tgz";
-        sha512 = "20rfszcqyzsbkrq0289dg335kdls788r81chv7kwhp440hj7aqckzydc1hdgkcqpq7qic1v6bzknl06jkrbh5mb1nysxi3qz8y11333";
+        sha1 = "922bc70220ee95f26fbb1e482ff1dcbccdd1f050";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -18702,6 +18729,24 @@ let
         sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181";
       };
     };
+    "fs-0.0.1-security" = {
+      name = "fs";
+      packageName = "fs";
+      version = "0.0.1-security";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz";
+        sha1 = "8a7bd37186b6dddf3813f23858b57ecaaf5e41d4";
+      };
+    };
+    "toml-2.3.2" = {
+      name = "toml";
+      packageName = "toml";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/toml/-/toml-2.3.2.tgz";
+        sha1 = "5eded5ca42887924949fd06eb0e955656001e834";
+      };
+    };
     "clone-deep-0.3.0" = {
       name = "clone-deep";
       packageName = "clone-deep";
@@ -19189,7 +19234,7 @@ let
       version = "3.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.0.tgz";
-        sha512 = "2sgk5bgncdhki1x3pl5lc9l4j1p1p9v2nkrc24gb1gkmycc8svqgx3712h0nmb00zbn1nkzgfzrsy708cpgxfmwkyvbvb9q56nvys2f";
+        sha1 = "193b3e864959a826d33074460c2651d1ed04b07a";
       };
     };
     "dom-storage-2.0.2" = {
@@ -19354,13 +19399,13 @@ let
         sha1 = "1cbc691c45cdf6d6c1dc63bf368b2505f56ef839";
       };
     };
-    "buffer-indexof-1.1.0" = {
+    "buffer-indexof-1.1.1" = {
       name = "buffer-indexof";
       packageName = "buffer-indexof";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz";
-        sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982";
+        url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz";
+        sha1 = "52fabcc6a606d1a00302802648ef68f639da268c";
       };
     };
     "next-line-1.1.0" = {
@@ -19432,7 +19477,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz";
-        sha512 = "0770ymyc0rv6a11mj3990d0z1jl1b2qxp4bapqa819y269sszfd96wn2y7pb6aw8bdgsn3bvpr7bmig5lcmkrxya13d5vc5y66q7pwh";
+        sha1 = "a8a26bec7646438963fc86e06f8f8b16d6c8bf7a";
       };
     };
     "external-editor-1.1.1" = {
@@ -20471,6 +20516,15 @@ let
         sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60";
       };
     };
+    "http-signature-1.2.0" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
+        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+      };
+    };
     "once-1.3.0" = {
       name = "once";
       packageName = "once";
@@ -20693,7 +20747,7 @@ let
       version = "1.15.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/express-session/-/express-session-1.15.5.tgz";
-        sha512 = "0xr0b4wp67nzril9h59g1ag2siwazl9kkfy45cq317w0x9q6apr82i9hvqrmjpp9zfvzfidz0vvd1pczsa7namwsdwk1anp9zl74584";
+        sha1 = "f49a18227263b316f6f8544da5fee25a540259ec";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -20792,7 +20846,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/raven/-/raven-2.1.2.tgz";
-        sha512 = "136ylazswrblh2b1kc29xsmzk3i3bhm6vcirl1zb60fv9h0nf3hipz7qm91vs6my1lry00xrzpy1x96y51siciwwq7k3fs0ynl2j6m4";
+        sha1 = "4aa7a72c4b3061d7fde06bfc62d669a74a651e27";
       };
     };
     "signals-1.0.0" = {
@@ -20822,6 +20876,15 @@ let
         sha1 = "4359f06a24933ae6bd087798af78c680eae345e3";
       };
     };
+    "superagent-3.5.2" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "3.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz";
+        sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8";
+      };
+    };
     "winston-2.3.1" = {
       name = "winston";
       packageName = "winston";
@@ -20864,7 +20927,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz";
-        sha512 = "0vcr20wa3j8j9b5xs7d5wnkm74g7ka45zfmw813s6ibwk8gbzyj87ifas3qklfdj7ydrqjfcylhazar038qzaf6jqfl17snn6wxjif3";
+        sha1 = "056695150d7aa93237ca7e378ac3b1682b7963b9";
       };
     };
     "hogan.js-3.0.2" = {
@@ -21026,7 +21089,7 @@ let
       version = "2.2.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz";
-        sha512 = "3sn0n3ncghvdrhy082cysiswswps9d5824ppjkl7gl1z1r6f11ij6z9nvs3l8gbp7vys1kgamrnikas3azjh7dwaqi1j4haffpkxvw7";
+        sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72";
       };
     };
     "update-notifier-2.1.0" = {
@@ -21206,7 +21269,7 @@ let
       version = "0.0.33";
       src = fetchurl {
         url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
-        sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d";
+        sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9";
       };
     };
     "follow-redirects-0.0.3" = {
@@ -21260,7 +21323,7 @@ let
       version = "0.5.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz";
-        sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0";
+        sha1 = "dca14a70235ff82f0ac9a3abeb60d337a365185d";
       };
     };
     "loader-runner-2.3.0" = {
@@ -21323,7 +21386,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz";
-        sha512 = "27l6lhqai0bhgk7mbchvf608bgmrgbqmgjd07k1rsg7xh12lnaflr459cy7ay108jr7dk8g5ybx70xi7cbz6lm5c7m022sl5b34r6yk";
+        sha1 = "c7356436a4d13123be2e2426a05d1dad9cbe65cf";
       };
     };
     "es6-map-0.1.5" = {
@@ -21395,7 +21458,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz";
-        sha512 = "2pddj1k7206wrs3q5z7dzwc657rbdd2m00llzz0h1241fp0y5i32qi2slmfys217hqszbqmvnmjr32msgbjgzh33nxw6py49p4j35mr";
+        sha1 = "96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6";
       };
     };
     "source-list-map-2.0.0" = {
@@ -21404,7 +21467,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz";
-        sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93";
+        sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085";
       };
     };
     "death-1.1.0" = {
@@ -21422,7 +21485,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz";
-        sha512 = "3d6jyhcq21cxy2n6mnalnxcdxl9i00n8qka7awrqamggss8yllz57msx7c480knv037snkzkymq6npl36wlpl71h54x511dlchavnxa";
+        sha1 = "39c72ed89d1b49ba708e18776500488902a52027";
       };
     };
     "leven-2.1.0" = {
@@ -21440,7 +21503,7 @@ let
       version = "1.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz";
-        sha512 = "1bdm7sms59bj5fa575nda007mvn4nibjla4hm9bf9ry70kgqw7slmz3l4md4cyx2j4zda0dh0mcjildkzq7ba3i9qzapha93l14qjzs";
+        sha1 = "6eec6bfb07421e2148c75c6bba72421f8530a826";
       };
     };
     "object-path-0.11.4" = {
@@ -21638,7 +21701,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.2.tgz";
-        sha512 = "2wkqnb0q3hbfvgxiyi21kaw7rcn4grpxaajnhxry03y05xfr39xh25c9nqj4drp6c89snssd741ra24v5ibngj460hgs4ldsz90w5r0";
+        sha1 = "504ece28e11b5ac487e90b97d8189afa38db4331";
       };
     };
     "yosay-2.0.1" = {
@@ -21647,7 +21710,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yosay/-/yosay-2.0.1.tgz";
-        sha512 = "1n6z65vkm1r31a1ms8wn32m9q61vrlz9isn43lm00qka1zvnich78zbnp29xwy72z361is2yimrpglmc55w97hbi9pas5pqlnvqbpw4";
+        sha1 = "078167f0365732e5c82d3f64633f9cd3a0526d2f";
       };
     };
     "filter-obj-1.1.0" = {
@@ -21665,7 +21728,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz";
-        sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i";
+        sha1 = "1d03835c7eed1e34b8e539c47b7b60d0d015d4e1";
       };
     };
     "p-try-1.0.0" = {
@@ -21692,7 +21755,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz";
-        sha512 = "23lpz1jyj01f06bndx53w1k931l6ki6m94mgf9lqpxka3366q0w1ql0igm7bj5nc0imzdjv3x5825c05mjnhkgahw99hd0h1kk5ri0a";
+        sha1 = "60b408e21f5da11a417fad13740bf20f9024ab3b";
       };
     };
     "aggregate-error-1.0.0" = {
@@ -22013,7 +22076,7 @@ in
       sources."jsonlint-1.5.1"
       (sources."uglify-js-2.6.1" // {
         dependencies = [
-          sources."source-map-0.5.6"
+          sources."source-map-0.5.7"
         ];
       })
       sources."resolve-1.4.0"
@@ -22364,7 +22427,7 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
-      sources."@types/node-7.0.42"
+      sources."@types/node-7.0.43"
       sources."@types/request-0.0.45"
       sources."@types/uuid-2.0.30"
       sources."is-buffer-1.1.5"
@@ -22372,7 +22435,7 @@ in
       sources."@types/form-data-2.2.0"
       sources."debug-0.7.4"
       sources."q-0.9.7"
-      sources."pkginfo-0.4.0"
+      sources."pkginfo-0.4.1"
       sources."revalidator-0.1.8"
       (sources."utile-0.2.1" // {
         dependencies = [
@@ -22432,7 +22495,7 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."lodash-4.17.4"
-      sources."is-my-json-valid-2.16.0"
+      sources."is-my-json-valid-2.16.1"
       sources."pinkie-promise-2.0.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -22743,7 +22806,7 @@ in
       sources."convert-source-map-1.1.3"
       sources."inline-source-map-0.6.2"
       sources."lodash.memoize-3.0.4"
-      sources."source-map-0.5.6"
+      sources."source-map-0.5.7"
       sources."pako-0.2.9"
       sources."base64-js-1.2.1"
       sources."ieee754-1.1.8"
@@ -22764,12 +22827,14 @@ in
       sources."randombytes-2.0.5"
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
-      sources."evp_bytestokey-1.0.0"
+      sources."evp_bytestokey-1.0.2"
       sources."buffer-xor-1.0.3"
       sources."cipher-base-1.0.4"
       sources."safe-buffer-5.1.1"
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
+      sources."md5.js-1.3.4"
+      sources."hash-base-3.0.4"
       sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
@@ -22779,9 +22844,12 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
-      sources."ripemd160-2.0.1"
+      (sources."ripemd160-2.0.1" // {
+        dependencies = [
+          sources."hash-base-2.0.2"
+        ];
+      })
       sources."sha.js-2.4.8"
-      sources."hash-base-2.0.2"
       sources."miller-rabin-4.0.0"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -22872,7 +22940,7 @@ in
       sources."router-0.6.2"
       sources."srt2vtt-1.3.1"
       sources."stream-transcoder-0.0.5"
-      (sources."xml2js-0.4.18" // {
+      (sources."xml2js-0.4.19" // {
         dependencies = [
           sources."xmlbuilder-9.0.4"
         ];
@@ -23015,16 +23083,17 @@ in
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.7"
       sources."parse-torrent-file-4.0.3"
-      sources."simple-get-2.6.0"
+      sources."simple-get-2.7.0"
       sources."safe-buffer-5.1.1"
       sources."thirty-two-1.0.2"
       sources."uniq-1.0.1"
       sources."bencode-1.0.0"
       sources."simple-sha1-2.1.0"
       sources."rusha-0.8.6"
+      sources."decompress-response-3.3.0"
       sources."once-1.4.0"
       sources."simple-concat-1.0.0"
-      sources."unzip-response-2.0.1"
+      sources."mimic-response-1.0.0"
       sources."wrappy-1.0.2"
       (sources."end-of-stream-1.0.0" // {
         dependencies = [
@@ -23132,7 +23201,7 @@ in
           sources."ultron-1.0.2"
         ];
       })
-      sources."ipaddr.js-1.4.0"
+      sources."ipaddr.js-1.5.2"
       sources."get-browser-rtc-1.0.2"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
@@ -23197,7 +23266,7 @@ in
     version = "1.12.7";
     src = fetchurl {
       url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
+      sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -23272,7 +23341,7 @@ in
       sources."shelljs-0.5.3"
       sources."underscore-1.8.3"
       sources."unorm-1.4.1"
-      sources."big-integer-1.6.23"
+      sources."big-integer-1.6.24"
       sources."sax-0.3.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -23465,7 +23534,7 @@ in
       sources."convert-source-map-1.1.3"
       sources."inline-source-map-0.6.2"
       sources."lodash.memoize-3.0.4"
-      sources."source-map-0.5.6"
+      sources."source-map-0.5.7"
       sources."pako-0.2.9"
       sources."ieee754-1.1.8"
       sources."typedarray-0.0.6"
@@ -23483,12 +23552,14 @@ in
       sources."randombytes-2.0.5"
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
-      sources."evp_bytestokey-1.0.0"
+      sources."evp_bytestokey-1.0.2"
       sources."buffer-xor-1.0.3"
       sources."cipher-base-1.0.4"
       sources."safe-buffer-5.1.1"
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
+      sources."md5.js-1.3.4"
+      sources."hash-base-3.0.4"
       sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
@@ -23498,9 +23569,12 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
-      sources."ripemd160-2.0.1"
+      (sources."ripemd160-2.0.1" // {
+        dependencies = [
+          sources."hash-base-2.0.2"
+        ];
+      })
       sources."sha.js-2.4.8"
-      sources."hash-base-2.0.2"
       sources."miller-rabin-4.0.0"
       sources."function-bind-1.1.0"
       sources."is-buffer-1.1.5"
@@ -23536,7 +23610,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
-      sources."accepts-1.3.3"
+      sources."accepts-1.3.4"
       sources."bytes-2.5.0"
       sources."compressible-2.0.11"
       sources."debug-2.6.8"
@@ -23582,7 +23656,7 @@ in
       sources."npm-package-arg-5.1.2"
       sources."promzard-0.3.0"
       sources."read-1.0.7"
-      (sources."read-package-json-2.0.11" // {
+      (sources."read-package-json-2.0.12" // {
         dependencies = [
           sources."glob-7.1.2"
         ];
@@ -23593,6 +23667,7 @@ in
       sources."mute-stream-0.0.7"
       sources."json-parse-better-errors-1.0.1"
       sources."normalize-package-data-2.4.0"
+      sources."slash-1.0.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       sources."spdx-correct-1.0.2"
@@ -23707,7 +23782,7 @@ in
         ];
       })
       sources."commander-2.11.0"
-      sources."is-my-json-valid-2.16.0"
+      sources."is-my-json-valid-2.16.1"
       sources."pinkie-promise-2.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -23856,7 +23931,7 @@ in
     version = "0.2.9";
     src = fetchurl {
       url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.9.tgz";
-      sha512 = "0xvz5ppq82s4yhrp4alp1ni696v960p9a8hycwns0bj33qjdsd2nn9h2xzpgssn9c27jbr91h9fr851rnc7sz7nd2ycblcsfy193sj0";
+      sha1 = "204208be1cef2788d528744fb263f60a528363a2";
     };
     dependencies = [
       sources."minimist-1.2.0"
@@ -24167,13 +24242,13 @@ in
     version = "3.3.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.1.tgz";
-      sha512 = "21mmlyi12vnfg5s88vh8i7jk43m69bp4qhgkch8i2qbzf9fv4hqn7b6wcxkbbdxzdvnkkpklb2xxpxi5nflwl513w08d6ykvac2ambh";
+      sha1 = "84218b1184cec4859e63ae2ef44b5a7d877e4fe4";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.100.0"
+      sources."aws-sdk-2.104.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
@@ -24281,7 +24356,7 @@ in
     version = "2.0.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz";
-      sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z";
+      sha1 = "6f6faf41a8f48e6080bffb2012041fc89491dd9f";
     };
     dependencies = [
       sources."auto-bind-1.1.0"
@@ -24376,7 +24451,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."private-0.1.7"
       sources."slash-1.0.0"
-      sources."source-map-0.5.6"
+      sources."source-map-0.5.7"
       (sources."chalk-1.1.3" // {
         dependencies = [
           sources."has-ansi-2.0.0"
@@ -24514,15 +24589,25 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "4.4.1";
+    version = "4.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz";
-      sha1 = "99cd7eafcffca2ff99a5c8f5f2a474d6364b4bd3";
+      url = "https://registry.npmjs.org/eslint/-/eslint-4.5.0.tgz";
+      sha1 = "bb75d3b8bde97fb5e13efcd539744677feb019c3";
     };
     dependencies = [
       sources."ajv-5.2.2"
-      sources."babel-code-frame-6.26.0"
-      sources."chalk-1.1.3"
+      (sources."babel-code-frame-6.26.0" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
+      (sources."chalk-2.1.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
+        ];
+      })
       sources."concat-stream-1.6.0"
       sources."cross-spawn-5.1.0"
       sources."debug-2.6.8"
@@ -24536,17 +24621,9 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
-      sources."ignore-3.3.3"
+      sources."ignore-3.3.4"
       sources."imurmurhash-0.1.4"
-      (sources."inquirer-3.2.2" // {
-        dependencies = [
-          sources."chalk-2.1.0"
-          sources."strip-ansi-4.0.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."inquirer-3.2.2"
       sources."is-resolvable-1.0.0"
       sources."js-yaml-3.9.1"
       sources."json-stable-stringify-1.0.1"
@@ -24561,10 +24638,17 @@ in
       sources."progress-2.0.0"
       sources."require-uncached-1.0.3"
       sources."semver-5.4.1"
+      (sources."strip-ansi-4.0.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."strip-json-comments-2.0.1"
       (sources."table-4.0.1" // {
         dependencies = [
           sources."ajv-4.11.8"
+          sources."chalk-1.1.3"
+          sources."strip-ansi-3.0.1"
         ];
       })
       sources."text-table-0.2.0"
@@ -24575,9 +24659,11 @@ in
       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."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
       sources."readable-stream-2.3.3"
@@ -24626,23 +24712,15 @@ in
       sources."wrappy-1.0.2"
       sources."ansi-escapes-2.0.0"
       sources."cli-cursor-2.1.0"
-      sources."cli-width-2.1.0"
+      sources."cli-width-2.2.0"
       sources."external-editor-2.0.4"
       sources."figures-2.0.0"
       sources."mute-stream-0.0.7"
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."string-width-2.1.1"
       sources."through-2.3.8"
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
@@ -24687,7 +24765,7 @@ in
     version = "5.1.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.1.0.tgz";
-      sha512 = "3a69fni3gypbhmr458lzxnz7qpik5v7zsxhv4sfb85a7ygngibaxazv5z4i39zvcyivab5z8mnayn496z7v6m0r8j0zkfm39d6i5gwq";
+      sha1 = "937da79d43f4411c92837c8aec22cf307bc6a572";
     };
     dependencies = [
       (sources."chalk-1.1.3" // {
@@ -24695,7 +24773,15 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      sources."eslint-4.4.1"
+      (sources."eslint-4.5.0" // {
+        dependencies = [
+          sources."chalk-2.1.0"
+          sources."strip-ansi-4.0.0"
+          sources."ansi-styles-3.2.0"
+          sources."supports-color-4.2.1"
+          sources."ansi-regex-3.0.0"
+        ];
+      })
       sources."optionator-0.8.2"
       sources."resolve-1.4.0"
       (sources."supports-color-3.2.3" // {
@@ -24723,7 +24809,7 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
-      sources."ignore-3.3.3"
+      sources."ignore-3.3.4"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-3.2.2" // {
         dependencies = [
@@ -24758,6 +24844,9 @@ in
       sources."fast-deep-equal-1.0.0"
       sources."json-schema-traverse-0.3.1"
       sources."js-tokens-3.0.2"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
       sources."readable-stream-2.3.3"
@@ -24806,7 +24895,7 @@ in
       sources."wrappy-1.0.2"
       sources."ansi-escapes-2.0.0"
       sources."cli-cursor-2.1.0"
-      sources."cli-width-2.1.0"
+      sources."cli-width-2.2.0"
       sources."external-editor-2.0.4"
       sources."figures-2.0.0"
       sources."mute-stream-0.0.7"
@@ -24820,9 +24909,6 @@ in
         ];
       })
       sources."through-2.3.8"
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
@@ -25463,7 +25549,7 @@ in
           sources."asap-2.0.6"
         ];
       })
-      sources."xml2js-0.4.18"
+      sources."xml2js-0.4.19"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
       (sources."clean-css-3.4.28" // {
@@ -25485,7 +25571,7 @@ in
       })
       (sources."uglify-js-2.8.29" // {
         dependencies = [
-          sources."source-map-0.5.6"
+          sources."source-map-0.5.7"
         ];
       })
       sources."void-elements-2.0.1"
@@ -25707,7 +25793,11 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."object.pick-1.2.0"
+      (sources."object.pick-1.3.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."parse-filepath-1.0.1"
       sources."array-each-1.0.1"
       sources."array-slice-1.0.0"
@@ -25947,7 +26037,7 @@ in
       })
       (sources."uglify-js-2.8.29" // {
         dependencies = [
-          sources."source-map-0.5.6"
+          sources."source-map-0.5.7"
         ];
       })
       sources."minimist-0.0.10"
@@ -26070,7 +26160,7 @@ in
     version = "0.3.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz";
-      sha512 = "0v4070gii05w3qhq7bnl5jp358f3dibvjml3vnmphqhgdn2g9i94a2mrvmcyrhpa7k9f3gp63p6vgpmhihja5b3is5xc8mv4vdy8wjh";
+      sha1 = "7630ef74577274e95ad6d386ddfa091fcee8df4b";
     };
     dependencies = [
       sources."when-3.4.6"
@@ -26240,12 +26330,12 @@ in
       sources."argparse-1.0.9"
       sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
-      sources."superagent-3.5.2"
+      sources."superagent-3.6.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.1"
       sources."debug-2.6.8"
       sources."extend-3.0.1"
-      sources."form-data-2.2.0"
+      sources."form-data-2.3.1"
       sources."formidable-1.1.1"
       sources."methods-1.1.2"
       sources."mime-1.3.6"
@@ -26280,7 +26370,7 @@ in
     version = "0.12.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/json-server/-/json-server-0.12.0.tgz";
-      sha512 = "2iqk65hy94j010zlqsl4rzfkz4f9ic1pqbvsf5w1lrgmda9wmhxl5kmvnmwikjilmn6kz9kniqzl7rpq3xv3cmpx8rppb7ipk5ddhzj";
+      sha1 = "e8764bcb2fccbbe2a0c3bc406ea1ef04e9007308";
     };
     dependencies = [
       sources."body-parser-1.17.2"
@@ -26356,7 +26446,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
-      sources."accepts-1.3.3"
+      sources."accepts-1.3.4"
       sources."compressible-2.0.11"
       sources."on-headers-1.0.1"
       sources."safe-buffer-5.1.1"
@@ -26583,7 +26673,7 @@ in
     version = "3.9.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz";
-      sha512 = "31wxw267vdf4nnjpksnzcb4i603366sjrw7g08bkxi3cwlrfl67458v7rvj72vbxcycq43z4ldkrfvqjrsvrjqrb2kfzmabpzghddq9";
+      sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0";
     };
     dependencies = [
       sources."argparse-1.0.9"
@@ -26659,7 +26749,7 @@ in
           sources."ms-0.7.2"
         ];
       })
-      sources."source-map-0.5.6"
+      sources."source-map-0.5.7"
       sources."tmp-0.0.31"
       sources."useragent-2.2.1"
       sources."bytes-2.4.0"
@@ -26961,7 +27051,7 @@ in
       })
       sources."passport-google-oauth-1.0.0"
       sources."connect-restreamer-1.0.3"
-      sources."xml2js-0.4.18"
+      sources."xml2js-0.4.19"
       sources."basic-auth-1.0.4"
       sources."connect-2.30.2"
       sources."content-disposition-0.5.0"
@@ -26997,7 +27087,7 @@ in
       sources."csurf-1.8.3"
       (sources."errorhandler-1.4.3" // {
         dependencies = [
-          sources."accepts-1.3.3"
+          sources."accepts-1.3.4"
           sources."escape-html-1.0.3"
           sources."negotiator-0.6.1"
         ];
@@ -27103,14 +27193,14 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "2.0.0";
+    version = "2.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-2.0.0.tgz";
-      sha1 = "49a72fe70e06aebfd7ea23efb2ab41abe60ebeea";
+      url = "https://registry.npmjs.org/lerna/-/lerna-2.1.0.tgz";
+      sha1 = "22da4c9cb09f7733a7e87ba8f34779a509c172ea";
     };
     dependencies = [
       sources."async-1.5.2"
-      sources."chalk-1.1.3"
+      sources."chalk-2.1.0"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
       sources."command-join-2.0.0"
@@ -27121,25 +27211,23 @@ in
         ];
       })
       sources."dedent-0.7.0"
-      sources."execa-0.6.3"
+      sources."execa-0.8.0"
       sources."find-up-2.1.0"
-      sources."fs-extra-3.0.1"
-      sources."get-port-3.1.0"
+      sources."fs-extra-4.0.1"
+      sources."get-port-3.2.0"
       sources."glob-7.1.2"
       sources."globby-6.1.0"
       sources."graceful-fs-4.1.11"
       (sources."inquirer-3.2.2" // {
         dependencies = [
-          sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
-          sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
           sources."ansi-regex-3.0.0"
         ];
       })
       sources."is-ci-1.0.10"
-      (sources."load-json-file-2.0.0" // {
+      (sources."load-json-file-3.0.0" // {
         dependencies = [
+          sources."parse-json-3.0.0"
           sources."strip-bom-3.0.0"
         ];
       })
@@ -27151,7 +27239,9 @@ in
       sources."read-cmd-shim-1.0.1"
       (sources."read-pkg-2.0.0" // {
         dependencies = [
+          sources."load-json-file-2.0.0"
           sources."path-type-2.0.0"
+          sources."strip-bom-3.0.0"
         ];
       })
       sources."rimraf-2.6.1"
@@ -27168,7 +27258,7 @@ in
           sources."uuid-3.1.0"
         ];
       })
-      sources."write-file-atomic-2.1.0"
+      sources."write-file-atomic-2.3.0"
       sources."write-json-file-2.2.0"
       (sources."write-pkg-3.1.0" // {
         dependencies = [
@@ -27186,15 +27276,17 @@ in
           sources."is-fullwidth-code-point-1.0.0"
         ];
       })
-      sources."ansi-styles-2.2.1"
+      sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."supports-color-4.2.1"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
       sources."mkdirp-0.5.1"
       sources."minimist-0.0.8"
+      sources."strip-ansi-3.0.1"
       sources."wcwidth-1.0.1"
+      sources."ansi-regex-2.1.1"
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
       sources."add-stream-1.0.0"
@@ -27254,7 +27346,7 @@ in
       sources."source-map-0.4.4"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
-          sources."source-map-0.5.6"
+          sources."source-map-0.5.7"
           sources."yargs-3.10.0"
         ];
       })
@@ -27364,7 +27456,7 @@ in
       sources."array-uniq-1.0.3"
       sources."ansi-escapes-2.0.0"
       sources."cli-cursor-2.1.0"
-      sources."cli-width-2.1.0"
+      sources."cli-width-2.2.0"
       sources."external-editor-2.0.4"
       sources."figures-2.0.0"
       sources."mute-stream-0.0.7"
@@ -27377,9 +27469,6 @@ in
           sources."ansi-regex-3.0.0"
         ];
       })
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.3"
-      sources."has-flag-2.0.0"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."mimic-fn-1.1.0"
@@ -27417,7 +27506,6 @@ in
       sources."make-dir-1.0.0"
       sources."temp-dir-1.0.0"
       sources."imurmurhash-0.1.4"
-      sources."slide-1.1.6"
       sources."detect-indent-5.0.0"
       sources."sort-keys-1.1.2"
       sources."is-plain-obj-1.1.0"
@@ -27636,7 +27724,7 @@ in
     version = "3.5.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz";
-      sha512 = "0ygdqmd1pxvdrgyympyhfy8cg90632jkggbv7l7irnzl0gaxdmyrrs9bf634046q8xq41bfxysabapgwdy8ssd58vc8nggbk0y3d1d4";
+      sha1 = "1328567d2717f997030f8006234bce9b8cd72465";
     };
     dependencies = [
       sources."browser-stdout-1.3.0"
@@ -28070,7 +28158,7 @@ in
       sources."bplist-parser-0.1.1"
       sources."meow-3.7.0"
       sources."untildify-2.1.0"
-      sources."big-integer-1.6.23"
+      sources."big-integer-1.6.24"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -28112,7 +28200,7 @@ in
       sources."number-is-nan-1.0.1"
       sources."get-stdin-4.0.1"
       sources."ms-2.0.0"
-      sources."accepts-1.3.3"
+      sources."accepts-1.3.4"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.2"
@@ -28787,7 +28875,7 @@ in
         ];
       })
       sources."node-red-node-rbe-0.1.11"
-      sources."bcrypt-1.0.2"
+      sources."bcrypt-1.0.3"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.6.7"
@@ -28842,7 +28930,7 @@ in
       sources."vary-1.1.1"
       sources."moment-timezone-0.5.13"
       sources."moment-2.18.1"
-      sources."accepts-1.3.3"
+      sources."accepts-1.3.4"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
       sources."encodeurl-1.0.1"
@@ -28965,7 +29053,7 @@ in
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."commander-2.9.0"
-      sources."source-map-0.5.6"
+      sources."source-map-0.5.7"
       sources."graceful-readlink-1.0.1"
       sources."options-0.0.6"
       sources."sax-1.2.4"
@@ -29011,7 +29099,7 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
-      sources."is-my-json-valid-2.16.0"
+      sources."is-my-json-valid-2.16.1"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -29113,10 +29201,10 @@ in
       sources."ajv-4.11.8"
       sources."har-schema-1.0.5"
       sources."co-4.6.0"
-      sources."bindings-1.2.1"
-      sources."nan-2.5.0"
-      (sources."node-pre-gyp-0.6.32" // {
+      sources."nan-2.6.2"
+      (sources."node-pre-gyp-0.6.36" // {
         dependencies = [
+          sources."nopt-4.0.1"
           sources."request-2.81.0"
           sources."caseless-0.12.0"
           sources."form-data-2.1.4"
@@ -29125,18 +29213,13 @@ in
         ];
       })
       sources."npmlog-4.1.2"
-      sources."rc-1.1.7"
-      sources."rimraf-2.5.4"
+      sources."rc-1.2.1"
+      sources."rimraf-2.6.1"
       sources."tar-2.2.1"
-      (sources."tar-pack-3.3.0" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."once-1.3.3"
-          sources."readable-stream-2.1.5"
-          sources."ms-0.7.1"
-          sources."string_decoder-0.10.31"
-        ];
-      })
+      sources."tar-pack-3.4.0"
+      sources."osenv-0.1.4"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
       sources."are-we-there-yet-1.1.4"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.4"
@@ -29157,7 +29240,6 @@ in
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."buffer-shims-1.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -29221,7 +29303,7 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-3.0.0" // {
+      (sources."debug-3.0.1" // {
         dependencies = [
           sources."ms-2.0.0"
         ];
@@ -29299,7 +29381,7 @@ in
     version = "5.3.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz";
-      sha512 = "29izly6jqqdaslak9xz3i3bsr7qgg5vjcbzf55as0hh630z4aml48n5a7dz6skqn34d02fg3bk2zwkq7n67z787wn14vr3na9chx6v4";
+      sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -29371,7 +29453,7 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.11"
+      sources."read-package-json-2.0.12"
       sources."read-package-tree-5.1.6"
       sources."readable-stream-2.3.3"
       sources."request-2.81.0"
@@ -29512,7 +29594,7 @@ in
       sources."cyclist-0.2.2"
       sources."xtend-4.0.1"
       sources."minimist-0.0.8"
-      sources."copy-concurrently-1.0.3"
+      sources."copy-concurrently-1.0.5"
       sources."run-queue-1.0.3"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
@@ -29536,7 +29618,7 @@ in
       })
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."make-fetch-happen-2.4.13"
+      sources."make-fetch-happen-2.5.0"
       sources."npm-pick-manifest-1.0.4"
       sources."promise-retry-1.1.1"
       sources."protoduck-4.0.0"
@@ -29565,6 +29647,7 @@ in
       sources."bl-1.2.1"
       sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
+      sources."slash-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -29913,7 +29996,7 @@ in
     version = "2.12.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.12.1.tgz";
-      sha512 = "2p62mjf7a9bjycq3x1jbp3vsvn8ww3ccrfx96syp7p19bzgg58q80didz4ygwn8cf1xxiyqhr3v3mwi7v9v90gnb8lsas4yz62z55ac";
+      sha1 = "9a41006f5186e8a59da7fd2b466fee9e896d865d";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -29940,7 +30023,7 @@ in
       sources."require-dir-0.3.2"
       sources."semver-5.4.1"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.38.3" // {
+      (sources."snyk-1.40.1" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -29970,7 +30053,7 @@ in
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
           sources."dot-prop-4.2.0"
-          sources."write-file-atomic-2.1.0"
+          sources."write-file-atomic-2.3.0"
           sources."package-json-4.0.1"
           sources."got-6.7.1"
           sources."timed-out-4.0.1"
@@ -30053,7 +30136,7 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.11"
+      sources."read-package-json-2.0.12"
       sources."read-package-tree-5.1.6"
       (sources."readable-stream-2.1.5" // {
         dependencies = [
@@ -30126,7 +30209,7 @@ in
       sources."es6-symbol-3.1.1"
       sources."ms-2.0.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.27"
+      sources."es5-ext-0.10.30"
       sources."es6-iterator-2.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
@@ -30147,6 +30230,7 @@ in
       sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
       sources."json-parse-better-errors-1.0.1"
+      sources."slash-1.0.0"
       sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -30176,7 +30260,7 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."is-my-json-valid-2.16.0"
+      sources."is-my-json-valid-2.16.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
       sources."jsonpointer-4.0.1"
@@ -30243,7 +30327,8 @@ in
       sources."open-0.0.5"
       sources."os-name-1.0.3"
       sources."snyk-config-1.0.1"
-      sources."snyk-gradle-plugin-1.0.3"
+      sources."snyk-go-plugin-1.1.2"
+      sources."snyk-gradle-plugin-1.1.1"
       sources."snyk-module-1.8.1"
       sources."snyk-mvn-plugin-1.0.0"
       sources."snyk-policy-1.7.1"
@@ -30278,7 +30363,7 @@ in
       sources."xdg-basedir-2.0.0"
       sources."async-1.5.2"
       sources."cli-cursor-1.0.2"
-      sources."cli-width-2.1.0"
+      sources."cli-width-2.2.0"
       sources."figures-1.7.0"
       sources."run-async-2.3.0"
       sources."rx-4.1.0"
@@ -30312,6 +30397,8 @@ in
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
+      sources."fs-0.0.1-security"
+      sources."toml-2.3.2"
       sources."clone-deep-0.3.0"
       sources."for-own-1.0.0"
       sources."is-plain-object-2.0.4"
@@ -30544,7 +30631,7 @@ in
       sources."media-typer-0.3.0"
       sources."mime-types-2.1.16"
       sources."mime-db-1.29.0"
-      sources."accepts-1.3.3"
+      sources."accepts-1.3.4"
       sources."compressible-2.0.11"
       sources."on-headers-1.0.1"
       sources."safe-buffer-5.1.1"
@@ -30602,7 +30689,7 @@ in
       sources."source-map-0.4.4"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
-          sources."source-map-0.5.6"
+          sources."source-map-0.5.7"
           sources."yargs-3.10.0"
         ];
       })
@@ -30826,7 +30913,7 @@ in
     version = "0.37.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz";
-      sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf";
+      sha1 = "535019f8dcbae8932bd38b28533bf61c0f979048";
     };
     dependencies = [
       sources."airplayer-2.0.0"
@@ -30879,7 +30966,7 @@ in
       sources."plist-1.2.0"
       sources."reverse-http-1.3.0"
       sources."stream-buffers-2.2.0"
-      sources."big-integer-1.6.23"
+      sources."big-integer-1.6.24"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
       sources."readable-stream-2.3.3"
@@ -30897,7 +30984,7 @@ in
       sources."once-1.4.0"
       sources."consume-until-1.0.0"
       sources."http-headers-3.0.1"
-      sources."buffer-indexof-1.1.0"
+      sources."buffer-indexof-1.1.1"
       sources."next-line-1.1.0"
       sources."wrappy-1.0.2"
       sources."chalk-1.1.3"
@@ -30964,7 +31051,7 @@ in
       sources."get-stdin-4.0.1"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-1.0.2"
-      sources."cli-width-2.1.0"
+      sources."cli-width-2.2.0"
       sources."external-editor-1.1.1"
       sources."figures-1.7.0"
       sources."mute-stream-0.0.6"
@@ -30984,14 +31071,15 @@ in
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.7"
       sources."parse-torrent-file-4.0.3"
-      sources."simple-get-2.6.0"
+      sources."simple-get-2.7.0"
       sources."thirty-two-1.0.2"
       sources."uniq-1.0.1"
       sources."bencode-1.0.0"
       sources."simple-sha1-2.1.0"
       sources."rusha-0.8.6"
+      sources."decompress-response-3.3.0"
       sources."simple-concat-1.0.0"
-      sources."unzip-response-2.0.1"
+      sources."mimic-response-1.0.0"
       sources."end-of-stream-1.4.0"
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
@@ -31084,7 +31172,7 @@ in
           sources."ultron-1.0.2"
         ];
       })
-      sources."ipaddr.js-1.4.0"
+      sources."ipaddr.js-1.5.2"
       sources."get-browser-rtc-1.0.2"
       sources."ultron-1.1.0"
       sources."addr-to-ip-port-1.4.2"
@@ -31180,7 +31268,7 @@ in
       sources."csurf-1.8.3"
       (sources."errorhandler-1.4.3" // {
         dependencies = [
-          sources."accepts-1.3.3"
+          sources."accepts-1.3.4"
           sources."escape-html-1.0.3"
           sources."negotiator-0.6.1"
         ];
@@ -31427,7 +31515,7 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      sources."simple-get-2.6.0"
+      sources."simple-get-2.7.0"
       (sources."simple-peer-6.4.4" // {
         dependencies = [
           sources."readable-stream-2.3.3"
@@ -31447,8 +31535,9 @@ in
       })
       sources."string2compact-1.2.2"
       sources."uniq-1.0.1"
+      sources."decompress-response-3.3.0"
       sources."simple-concat-1.0.0"
-      sources."unzip-response-2.0.1"
+      sources."mimic-response-1.0.0"
       sources."get-browser-rtc-1.0.2"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
@@ -31576,7 +31665,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."commander-2.11.0"
-      sources."is-my-json-valid-2.16.0"
+      sources."is-my-json-valid-2.16.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -31653,7 +31742,7 @@ in
       sources."minimist-0.0.8"
       sources."ast-types-0.9.6"
       sources."esprima-3.1.3"
-      sources."source-map-0.5.6"
+      sources."source-map-0.5.7"
       sources."base62-0.1.1"
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
       sources."amdefine-1.0.1"
@@ -31716,7 +31805,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-3.0.0"
+      sources."debug-3.0.1"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -31825,7 +31914,7 @@ in
     version = "5.4.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-      sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
+      sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -31888,7 +31977,7 @@ in
       })
       sources."fs-ext-0.6.0"
       sources."crypt3-0.2.0"
-      sources."accepts-1.3.3"
+      sources."accepts-1.3.4"
       sources."array-flatten-2.1.1"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.2"
@@ -32152,9 +32241,9 @@ in
           sources."assert-plus-0.1.2"
           sources."clone-0.1.5"
           sources."dashdash-1.10.1"
-          (sources."http-signature-1.1.1" // {
+          (sources."http-signature-1.2.0" // {
             dependencies = [
-              sources."assert-plus-0.2.0"
+              sources."assert-plus-1.0.0"
             ];
           })
           sources."once-1.3.0"
@@ -32274,7 +32363,7 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-3.0.0"
+      sources."debug-3.0.1"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
@@ -32322,7 +32411,7 @@ in
       sources."sprintf-js-1.0.3"
       sources."minimist-0.0.8"
       sources."clap-1.2.0"
-      sources."source-map-0.5.6"
+      sources."source-map-0.5.7"
       sources."chalk-1.1.3"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -32403,14 +32492,14 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.0.27";
+    version = "3.0.28";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.27.tgz";
-      sha512 = "111q9l8r0c6pfhpdpx4wi99f71n1ykfdc2h73ycdy0q1cnk78qvw837j0994nf337bm1irdj1mgzhrillmplw4vpyv8wl6p2fdh4gqw";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.28.tgz";
+      sha1 = "96b8495f0272944787b5843a1679aa326640d5f7";
     };
     dependencies = [
       sources."commander-2.11.0"
-      sources."source-map-0.5.6"
+      sources."source-map-0.5.7"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -32423,10 +32512,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.27";
+    version = "1.1.28";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.27.tgz";
-      sha1 = "47d7f0cedbecd9c9a1f7377cbaea944053727153";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.28.tgz";
+      sha1 = "372d0d57bd8efc3570de6b2743a4da8aaa83eefb";
     };
     dependencies = [
       sources."async-2.5.0"
@@ -32451,7 +32540,7 @@ in
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.3.3"
+      sources."ignore-3.3.4"
       sources."just-detect-adblock-1.0.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
@@ -32546,7 +32635,7 @@ in
           sources."component-emitter-1.2.1"
           sources."cookiejar-2.1.1"
           sources."extend-3.0.1"
-          sources."form-data-2.2.0"
+          sources."form-data-2.3.1"
           sources."formidable-1.1.1"
           sources."readable-stream-2.3.3"
           sources."combined-stream-1.0.5"
@@ -32609,7 +32698,7 @@ in
       sources."whatwg-fetch-2.0.3"
       sources."nopt-1.0.10"
       sources."abbrev-1.1.0"
-      sources."accepts-1.3.3"
+      sources."accepts-1.3.4"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
       sources."encodeurl-1.0.1"
@@ -32655,7 +32744,7 @@ in
         ];
       })
       sources."minimatch-0.0.5"
-      sources."pkginfo-0.4.0"
+      sources."pkginfo-0.4.1"
       sources."ps-tree-0.0.3"
       sources."watch-0.5.1"
       (sources."utile-0.1.7" // {
@@ -32795,7 +32884,7 @@ in
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
-      sources."read-package-json-2.0.11"
+      sources."read-package-json-2.0.12"
       sources."read-package-tree-5.1.6"
       sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.1"
@@ -32911,7 +33000,7 @@ in
       sources."stream-shift-1.0.0"
       sources."cyclist-0.2.2"
       sources."xtend-4.0.1"
-      sources."copy-concurrently-1.0.3"
+      sources."copy-concurrently-1.0.5"
       sources."run-queue-1.0.3"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
@@ -32937,6 +33026,7 @@ in
       sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
       sources."json-parse-better-errors-1.0.1"
+      sources."slash-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -33013,7 +33103,7 @@ in
       })
       (sources."configstore-3.1.1" // {
         dependencies = [
-          sources."write-file-atomic-2.1.0"
+          sources."write-file-atomic-2.3.0"
         ];
       })
       sources."is-npm-1.0.0"
@@ -33086,7 +33176,11 @@ in
       sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."eve-0.5.4"
-      sources."engine.io-3.1.0"
+      (sources."engine.io-3.1.0" // {
+        dependencies = [
+          sources."accepts-1.3.3"
+        ];
+      })
       sources."socket.io-adapter-1.1.1"
       (sources."socket.io-client-2.0.3" // {
         dependencies = [
@@ -33311,7 +33405,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."commander-2.11.0"
-      sources."is-my-json-valid-2.16.0"
+      sources."is-my-json-valid-2.16.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -33342,7 +33436,7 @@ in
     version = "3.5.5";
     src = fetchurl {
       url = "https://registry.npmjs.org/webpack/-/webpack-3.5.5.tgz";
-      sha512 = "079rx5l3h8prapxbrdddakxp5s7cbcmzy2hlmzvydmn7c4cpnlba7cprhxqazzs26iv63hm8lrc3crrwk6lx3davvwv4y0vfbi33rd9";
+      sha1 = "3226f09fc8b3e435ff781e7af34f82b68b26996c";
     };
     dependencies = [
       sources."acorn-5.1.1"
@@ -33368,7 +33462,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."source-map-0.5.6"
+      sources."source-map-0.5.7"
       sources."supports-color-4.2.1"
       sources."tapable-0.2.8"
       sources."uglifyjs-webpack-plugin-0.4.6"
@@ -33401,7 +33495,7 @@ in
       sources."esrecurse-4.2.0"
       sources."estraverse-4.2.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.27"
+      sources."es5-ext-0.10.30"
       sources."es6-iterator-2.0.1"
       sources."es6-set-0.1.5"
       sources."es6-symbol-3.1.1"
@@ -33463,11 +33557,13 @@ in
       sources."randombytes-2.0.5"
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
-      sources."evp_bytestokey-1.0.0"
+      sources."evp_bytestokey-1.0.2"
       sources."buffer-xor-1.0.3"
       sources."cipher-base-1.0.4"
       sources."des.js-1.0.0"
       sources."minimalistic-assert-1.0.0"
+      sources."md5.js-1.3.4"
+      sources."hash-base-3.0.4"
       sources."bn.js-4.11.8"
       sources."browserify-rsa-4.0.1"
       sources."elliptic-6.4.0"
@@ -33477,9 +33573,12 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
-      sources."ripemd160-2.0.1"
+      (sources."ripemd160-2.0.1" // {
+        dependencies = [
+          sources."hash-base-2.0.2"
+        ];
+      })
       sources."sha.js-2.4.8"
-      sources."hash-base-2.0.2"
       sources."miller-rabin-4.0.0"
       sources."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
@@ -33844,7 +33943,7 @@ in
       sources."xtend-4.0.1"
       sources."ansi-escapes-2.0.0"
       sources."cli-cursor-2.1.0"
-      sources."cli-width-2.1.0"
+      sources."cli-width-2.2.0"
       sources."external-editor-2.0.4"
       sources."figures-2.0.0"
       sources."lodash-4.17.4"
@@ -34009,7 +34108,7 @@ in
     version = "2.0.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/yo/-/yo-2.0.0.tgz";
-      sha512 = "3maxk0a2p7xyz9bkfyx3jd0inm9y7a3wc8b7rqx8p5fsmx8qkqnbvhxwn4210l689vd5p3xphn147dyclqsqmmgp7cqyswyyfsmm1lr";
+      sha1 = "0cd75211379ed87105f99510885759062147b517";
     };
     dependencies = [
       sources."async-2.5.0"
@@ -34127,13 +34226,13 @@ in
       sources."graceful-fs-4.1.11"
       sources."make-dir-1.0.0"
       sources."unique-string-1.0.0"
-      sources."write-file-atomic-2.1.0"
+      sources."write-file-atomic-2.3.0"
       sources."xdg-basedir-3.0.0"
       sources."is-obj-1.0.1"
       sources."pify-2.3.0"
       sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
-      sources."slide-1.1.6"
+      sources."signal-exit-3.0.2"
       sources."lru-cache-4.1.1"
       sources."shebang-command-1.2.0"
       sources."which-1.3.0"
@@ -34158,7 +34257,6 @@ in
       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."path-key-2.0.1"
       sources."mimic-fn-1.1.0"
@@ -34186,7 +34284,7 @@ in
       sources."decamelize-1.2.0"
       sources."ansi-escapes-2.0.0"
       sources."cli-cursor-2.1.0"
-      sources."cli-width-2.1.0"
+      sources."cli-width-2.2.0"
       sources."external-editor-2.0.4"
       sources."mute-stream-0.0.7"
       sources."run-async-2.3.0"
@@ -34222,6 +34320,7 @@ in
       })
       sources."osenv-0.1.4"
       sources."os-homedir-1.0.2"
+      sources."slide-1.1.6"
       (sources."readline2-1.0.1" // {
         dependencies = [
           sources."is-fullwidth-code-point-1.0.0"

From b0c32cf8c673b14544257bda97261b0e3c4c5b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 10:12:16 +0100
Subject: [PATCH 2710/3246] vmime: 0.9.2-pre-svn603 -> 0.9.2

---
 pkgs/development/libraries/vmime/default.nix | 27 ++++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix
index 846fc64a91e..9bef1b27e9c 100644
--- a/pkgs/development/libraries/vmime/default.nix
+++ b/pkgs/development/libraries/vmime/default.nix
@@ -1,14 +1,25 @@
-{stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1, libgcrypt }:
+{stdenv, fetchFromGitHub
+, gsasl, gnutls, pkgconfig, cmake, zlib, libtasn1, libgcrypt, gtk3
+# this will not work on non-nixos systems
+, sendmailPath ? "/run/wrappers/bin/sendmail"
+}:
 
-stdenv.mkDerivation {
-  name = "vmime-0.9.2-pre-svn603";
-  src = fetchurl {
-    url = http://download.zarafa.com/community/final/7.0/7.0.5-31880/sourcecode/libvmime-0.9.2+svn603.tar.bz2;
-    #url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2;
-    sha256 = "1jhxiy8c2cgzfjps0z4q40wygdpgm8jr7jn727cbzrscj2c48kxx";
+stdenv.mkDerivation rec {
+  name = "vmime-${version}";
+  version = "0.9.2";
+  src = fetchFromGitHub {
+    owner = "kisli";
+    repo = "vmime";
+    rev = "v${version}";
+    sha256 = "1304n50ny2av8bagjpgz55ag0nd7m313akm9bb73abjn6h5nzacv";
   };
 
-  buildInputs = [ gsasl gnutls pkgconfig zlib libtasn1 libgcrypt ];
+  buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ];
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  cmakeFlags = [
+    "-DVMIME_SENDMAIL_PATH=${sendmailPath}"
+  ];
 
   meta = {
     homepage = http://www.vmime.org/;

From 643ca9a3aa590fa36ac1d4c534075dc4eca5c9ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 26 Aug 2017 11:21:30 +0200
Subject: [PATCH 2711/3246] Python docs: rewrite a part

- fix some mistakes
- move explanation on how to create Python environments to the front
---
 doc/languages-frameworks/python.md | 350 +++++++++++++++--------------
 1 file changed, 178 insertions(+), 172 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index c100c9d0c20..c57fd4aec17 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -2,115 +2,204 @@
 
 ## User Guide
 
-Several versions of Python are available on Nix as well as a high amount of
-packages. The default interpreter is CPython 2.7.
-
 ### Using Python
 
+#### Overview
+
+Several versions of the Python interpreter are available on Nix, as well as a
+high amount of packages. The attribute `python` refers to the default
+interpreter, which is currently CPython 2.7. It is also possible to refer to
+specific versions, e.g. `python35` refers to CPython 3.5, and `pypy` refers to
+the default PyPy interpreter.
+
+Python is used a lot, and in different ways. This affects also how it is
+packaged. In the case of Python on Nix, an important distinction is made between
+whether the package is considered primarily an application, or whether it should
+be used as a library, i.e., of primary interest are the modules in
+`site-packages` that should be importable.
+
+In the Nixpkgs tree Python applications can be found throughout, depending on
+what they do, and are called from the main package set. Python libraries,
+however, are in separate sets, with one set per interpreter version.
+
+The interpreters have several common attributes. One of these attributes is
+`pkgs`, which is a package set of Python libraries for this specific
+interpreter. E.g., the `toolz` package corresponding to the default interpreter
+is `python.pkgs.toolz`, and the CPython 3.5 version is `python35.pkgs.toolz`.
+The main package set contains aliases to these package sets, e.g.
+`pythonPackages` refers to `python.pkgs` and `python35Packages` to
+`python35.pkgs`.
+
 #### Installing Python and packages
 
-It is important to make a distinction between Python packages that are
-used as libraries, and applications that are written in Python.
+The Nix and NixOS manuals explain how packages are generally installed. In the
+case of Python and Nix, it is important to make a distinction between whether the
+package is considered an application or a library.
 
-Applications on Nix are installed typically into your user
+Applications on Nix are typically installed into your user
 profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the
 package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`.
 Dependencies such as libraries are automatically installed and should not be
 installed explicitly.
 
 The same goes for Python applications and libraries. Python applications can be
-installed in your profile, but Python libraries you would like to use to develop
-cannot. If you do install libraries in your profile, then you will end up with
-import errors.
+installed in your profile. But Python libraries you would like to use for
+development cannot be installed, at least not individually, because they won't
+be able to find each other resulting in import errors. Instead, it is possible
+to create an environment with `python.buildEnv` or `python.withPackages` where
+the interpreter and other executables are able to find each other and all of the
+modules.
 
-#### Python environments using `nix-shell`
+In the following examples we create an environment with Python 3.5, `numpy` and
+`toolz`. As you may imagine, there is one limitation here, and that's that
+you can install only one environment at a time. You will notice the complaints
+about collisions when you try to install a second environment.
 
-The recommended method for creating Python environments for development is with
-`nix-shell`. Executing
+##### Environment defined in separate `.nix` file
 
-```sh
-$ nix-shell -p python35Packages.numpy python35Packages.toolz
+Create a file, e.g. `build.nix`, with the following expression
+```nix
+with import <nixpkgs> {};
+
+python35.withPackages (ps: with ps; [ numpy toolz ])
+```
+and install it in your profile with
+```shell
+nix-env -if build.nix
+```
+Now you can use the Python interpreter, as well as the extra packages (`numpy`,
+`toolz`) that you added to the environment.
+
+##### Environment defined in `~/.config/nixpkgs/config.nix`
+
+If you prefer to, you could also add the environment as a package override to the Nixpkgs set, e.g.
+using `config.nix`,
+```nix
+{ # ...
+
+  packageOverrides = pkgs: with pkgs; {
+    myEnv = python35.withPackages (ps: with ps; [ numpy toolz ]);
+  };
+}
+```
+and install it in your profile with
+```shell
+nix-env -iA nixpkgs.myEnv
+```
+The environment is is installed by referring to the attribute, and considering
+the `nixpkgs` channel was used.
+
+##### Environment defined in `/etc/nixos/configuration.nix`
+
+For the sake of completeness, here's another example how to install the environment system-wide.
+
+```nix
+{ # ...
+
+  environment.systemPackages = with pkgs; [
+    (python35.withPackages(ps: with ps; [ numpy toolz ]))
+  ];
+}
 ```
 
-opens a Nix shell which has available the requested packages and dependencies.
-Now you can launch the Python interpreter (which is itself a dependency)
+#### Temporary Python environment with `nix-shell`
 
+The examples in the previous section showed how to install a Python environment
+into a profile. For development you may need to use multiple environments.
+`nix-shell` gives the possibility to temporarily load another environment, akin
+to `virtualenv`.
+
+There are two methods for loading a shell with Python packages. The first and recommended method
+is to create an environment with `python.buildEnv` or `python.withPackages` and load that. E.g.
+```sh
+$ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])'
+```
+opens a shell from which you can launch the interpreter
 ```sh
 [nix-shell:~] python3
 ```
+The other method, which is not recommended, does not create an environment and requires you to list the packages directly,
 
-If the packages were not available yet in the Nix store, Nix would download or
-build them automatically. A convenient option with `nix-shell` is the `--run`
-option, with which you can execute a command in the `nix-shell`. Let's say we
-want the above environment and directly run the Python interpreter
+```sh
+$ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz
+```
+Again, it is possible to launch the interpreter from the shell.
+The Python interpreter has the attribute `pkgs` which contains all Python libraries for that specific interpreter.
 
+##### Load environment from `.nix` expression
+As explained in the Nix manual, `nix-shell` can also load an
+expression from a `.nix` file. Say we want to have Python 3.5, `numpy`
+and `toolz`, like before, in an environment. Consider a `shell.nix` file
+with
+```nix
+with import <nixpkgs> {};
+
+python35.withPackages (ps: [ps.numpy ps.toolz])
+```
+Executing `nix-shell` gives you again a Nix shell from which you can run Python.
+
+What's happening here?
+
+1. We begin with importing the Nix Packages collections. `import <nixpkgs>` imports the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set.
+2. Then we create a Python 3.5 environment with the `withPackages` function.
+3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set.
+
+##### Execute command with `--run`
+A convenient option with `nix-shell` is the `--run`
+option, with which you can execute a command in the `nix-shell`. We can
+e.g. directly open a Python shell
 ```sh
 $ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3"
 ```
-
-This way you can use the `--run` option also to directly run a script
-
+or run a script
 ```sh
 $ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py"
 ```
 
-In fact, for this specific use case there is a more convenient method. You can
+##### `nix-shell` as shebang
+In fact, for the second use case, there is a more convenient method. You can
 add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
-specifying which dependencies Nix shell needs. With the following shebang, you
-can use `nix-shell myscript.py` and it will make available all dependencies and
+specifying which dependencies `nix-shell` needs. With the following shebang, you
+can just execute `./myscript.py`, and it will make available all dependencies and
 run the script in the `python3` shell.
 
 ```py
 #! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p python3Packages.numpy
+#! nix-shell -i 'python3.withPackages(ps: [ps.numpy])'
 
 import numpy
 
 print(numpy.__version__)
 ```
 
-Likely you do not want to type your dependencies each and every time. What you
-can do is write a simple Nix expression which sets up an environment for you,
-requiring you only to type `nix-shell`. Say we want to have Python 3.5, `numpy`
-and `toolz`, like before, in an environment. With a `shell.nix` file
-containing
-```nix
-with import <nixpkgs> {};
-
-(pkgs.python35.withPackages (ps: [ps.numpy ps.toolz])).env
-```
-executing `nix-shell` gives you again a Nix shell from which you can run Python.
-
-What's happening here?
-
-1. We begin with importing the Nix Packages collections. `import <nixpkgs>` import the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. Therefore we can now use `pkgs`.
-2. Then we create a Python 3.5 environment with the `withPackages` function.
-3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set.
-4. And finally, for in interactive use we return the environment by using the `env` attribute.
-
 ### Developing with Python
 
+Now that you know how to get a working Python environment with Nix, it is time
+to go forward and start actually developing with Python. We will first have a
+look at how Python packages are packaged on Nix. Then, we will look at how you
+can use development mode with your code.
 
-Now that you know how to get a working Python environment on Nix, it is time to go forward and start actually developing with Python.
-We will first have a look at how Python packages are packaged on Nix. Then, we will look how you can use development mode with your code.
+#### Packaging a library
 
-#### Python packaging on Nix
-
-On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/python/build-python-package.nix).
-Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using
+With Nix all packages are built by functions. The main function in Nix for
+building Python libraries is `buildPythonPackage`. Let's see how we can build the
+`toolz` package.
 
 ```nix
 { # ...
 
   toolz = buildPythonPackage rec {
-    name = "toolz-${version}";
+    pname = "toolz";
     version = "0.7.4";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
+    src = fetchPypi {
+      inherit pname version;
       sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
     };
 
+    doCheck = false;
+
     meta = {
       homepage = "http://github.com/pytoolz/toolz/";
       description = "List processing tools and functional utilities";
@@ -122,63 +211,37 @@ Let's see how we would build the `toolz` package. According to [`python-packages
 ```
 
 What happens here? The function `buildPythonPackage` is called and as argument
-it accepts a set. In this case the set is a recursive set ([`rec`](http://nixos.org/nix/manual/#sec-constructs)).
-One of the arguments is the name of the package, which consists of a basename
-(generally following the name on PyPi) and a version. Another argument, `src`
-specifies the source, which in this case is fetched from an url. `fetchurl` not
-only downloads the target file, but also validates its hash. Furthermore, we
-specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap-meta).
-
-The output of the function is a derivation, which is an attribute with the name
-`toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
-so e.g. `python27Packages`, `python35Packages` and `pypyPackages`.
+it accepts a set. In this case the set is a recursive set, `rec`. One of the
+arguments is the name of the package, which consists of a basename (generally
+following the name on PyPi) and a version. Another argument, `src` specifies the
+source, which in this case is fetched from PyPI using the helper function
+`fetchPypi`. The argument `doCheck` is used to set whether tests should be run
+when building the package. Furthermore, we specify some (optional) meta
+information. The output of the function is a derivation.
 
+An expression for `toolz` can be found in the Nixpkgs repository. As explained
+in the introduction of this Python section, a derivation of `toolz` is available
+for each interpreter version, e.g. `python35.pkgs.toolz` refers to the `toolz`
+derivation corresponding to the CPython 3.5 interpreter.
 The above example works when you're directly working on
 `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
-you will want to test a Nix expression outside of the Nixpkgs tree. If you
-create a `shell.nix` file with the following contents
+you will want to test a Nix expression outside of the Nixpkgs tree.
 
-```nix
-with import <nixpkgs> {};
-
-pkgs.python35Packages.buildPythonPackage rec {
-  name = "toolz-${version}";
-  version = "0.8.0";
-
-  src = pkgs.fetchurl {
-    url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
-    sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479";
-  };
-
-  doCheck = false;
-
-  meta = {
-    homepage = "http://github.com/pytoolz/toolz/";
-    description = "List processing tools and functional utilities";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
-  };
-}
-```
-
-and then execute `nix-shell` will result in an environment in which you can use
-Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
-for which Python version we want to build a package.
-
-The above example considered only a single package. Generally you will want to use multiple packages.
-If we create a `shell.nix` file with the following contents
+The following expression creates a derivation for the `toolz` package,
+and adds it along with a `numpy` package to a Python environment.
 
 ```nix
 with import <nixpkgs> {};
 
 ( let
-    toolz = pkgs.python35Packages.buildPythonPackage rec {
-      name = "toolz-${version}";
-      version = "0.8.0";
+    my_toolz = python35.pkgs.buildPythonPackage rec {
+      pname = "toolz";
+      version = "0.7.4";
+      name = "${pname}-${version}";
 
-      src = pkgs.fetchurl {
-        url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
-        sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479";
+      src = python35.pkgs.fetchPypi {
+        inherit pname version;
+        sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
       };
 
       doCheck = false;
@@ -189,24 +252,24 @@ with import <nixpkgs> {};
       };
     };
 
-  in pkgs.python35.withPackages (ps: [ps.numpy toolz])
+  in python35.withPackages (ps: [ps.numpy my_toolz])
 ).env
 ```
+Executing `nix-shell` will result in an environment in which you can use
+Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
+for which Python version we want to build a package.
 
-and again execute `nix-shell`, then we get a Python 3.5 environment with our
-locally defined package as well as `numpy` which is build according to the
-definition in Nixpkgs. What did we do here? Well, we took the Nix expression
-that we used earlier to build a Python environment, and said that we wanted to
-include our own version of `toolz`. To introduce our own package in the scope of
-`withPackages` we used a
-[`let`](http://nixos.org/nix/manual/#sec-constructs) expression.
-You can see that we used `ps.numpy` to select numpy from the nixpkgs package set (`ps`).
-But we do not take `toolz` from the nixpkgs package set this time.
-Instead, `toolz` will resolve to our local definition that we introduced with `let`.
+So, what did we do here? Well, we took the Nix expression that we used earlier
+to build a Python environment, and said that we wanted to include our own
+version of `toolz`, named `my_toolz`. To introduce our own package in the scope
+of `withPackages` we used a `let` expression. You can see that we used
+`ps.numpy` to select numpy from the nixpkgs package set (`ps`). We did not take
+`toolz` from the Nixpkgs package set this time, but instead took our own version
+that we introduced with the `let` expression.
 
-### Handling dependencies
+#### Handling dependencies
 
-Our example, `toolz`, doesn't have any dependencies on other Python
+Our example, `toolz`, does not have any dependencies on other Python
 packages or system libraries. According to the manual,  `buildPythonPackage`
 uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is
 exclusively a build-time dependency, then the dependency should be included as a
@@ -713,63 +776,6 @@ Both are also exported in `nix-shell`.
 
 ## FAQ
 
-### How can I install a working Python environment?
-
-As explained in the user's guide installing individual Python packages
-imperatively with `nix-env -i` or declaratively in `environment.systemPackages`
-is not supported. However, it is possible to install a Python environment with packages (`python.buildEnv`).
-
-In the following examples we create an environment with Python 3.5, `numpy` and `ipython`.
-As you might imagine there is one limitation here, and that's you can install
-only one environment at a time. You will notice the complaints about collisions
-when you try to install a second environment.
-
-#### Environment defined in separate `.nix` file
-
-Create a file, e.g. `build.nix`, with the following expression
-```nix
-with import <nixpkgs> {};
-
-pkgs.python35.withPackages (ps: with ps; [ numpy ipython ])
-```
-and install it in your profile with
-```shell
-nix-env -if build.nix
-```
-Now you can use the Python interpreter, as well as the extra packages that you added to the environment.
-
-#### Environment defined in `~/.config/nixpkgs/config.nix`
-
-If you prefer to, you could also add the environment as a package override to the Nixpkgs set.
-```nix
-{ # ...
-
-  packageOverrides = pkgs: with pkgs; {
-    myEnv = python35.withPackages (ps: with ps; [ numpy ipython ]);
-  };
-}
-```
-and install it in your profile with
-```shell
-nix-env -iA nixpkgs.myEnv
-```
-
-We're installing using the attribute path and assume the channels is named `nixpkgs`.
-Note that I'm using the attribute path here.
-
-#### Environment defined in `/etc/nixos/configuration.nix`
-
-For the sake of completeness, here's another example how to install the environment system-wide.
-
-```nix
-{ # ...
-
-  environment.systemPackages = with pkgs; [
-    (python35.withPackages(ps: with ps; [ numpy ipython ]))
-  ];
-}
-```
-
 ### How to solve circular dependencies?
 
 Consider the packages `A` and `B` that depend on each other. When packaging `B`,

From 18232bca7e3885d6ca0f3492a4dbe0feb2b07fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 10:22:15 +0100
Subject: [PATCH 2712/3246] clamav: fix build

---
 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 da469771c6e..83a2a1fd85e 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc/clamav"
     "--with-zlib=${zlib.dev}"
     "--disable-zlib-vcheck" # it fails to recognize that 1.2.10 >= 1.2.2
+    "--disable-llvm" # enabling breaks the build at the moment
     "--with-libbz2-prefix=${bzip2.dev}"
     "--with-iconv-dir=${libiconv}"
     "--with-xml=${libxml2.dev}"

From 1e7358a875b31b91fd875461b2e4542d4dda3c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 26 Aug 2017 11:30:44 +0200
Subject: [PATCH 2713/3246] kde4.kde_workspace: fixup build with gcc-6

---
 pkgs/desktops/kde-4.14/kde-workspace.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/kde-4.14/kde-workspace.nix b/pkgs/desktops/kde-4.14/kde-workspace.nix
index 53df146ab53..5aeba4be3a6 100644
--- a/pkgs/desktops/kde-4.14/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.14/kde-workspace.nix
@@ -30,6 +30,8 @@ kde {
        --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
    '';
 
+  NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # gcc-6
+
   enableParallelBuilding = false; # frequent problems on Hydra
 
   meta = {

From d732a5917a4cacaacfc04019aae0129428fe975e Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Sat, 26 Aug 2017 16:36:42 +0700
Subject: [PATCH 2714/3246] nodePackages.livedown : init at 2.1.1

---
 .../node-packages/node-packages-v6.json       |   1 +
 .../node-packages/node-packages-v6.nix        | 631 +++++++++++++++---
 2 files changed, 524 insertions(+), 108 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 10ab75e3dca..f9a3c9af2f2 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -42,6 +42,7 @@
 , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
 , "lerna"
 , "lcov-result-merger"
+, "livedown"
 , "meat"
 , "mocha"
 , "nijs"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 6856eadb1cf..15f37baf46e 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -15471,6 +15471,213 @@ let
         sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
       };
     };
+    "markdown-it-8.4.0" = {
+      name = "markdown-it";
+      packageName = "markdown-it";
+      version = "8.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz";
+        sha1 = "e2400881bf171f7018ed1bd9da441dac8af6306d";
+      };
+    };
+    "markdown-it-emoji-1.4.0" = {
+      name = "markdown-it-emoji";
+      packageName = "markdown-it-emoji";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz";
+        sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc";
+      };
+    };
+    "markdown-it-github-headings-1.0.1" = {
+      name = "markdown-it-github-headings";
+      packageName = "markdown-it-github-headings";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.0.1.tgz";
+        sha1 = "ac3e694de3fa3f0296961f4057f5160143fc2710";
+      };
+    };
+    "markdown-it-task-checkbox-1.0.4" = {
+      name = "markdown-it-task-checkbox";
+      packageName = "markdown-it-task-checkbox";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.4.tgz";
+        sha1 = "183d2d81cf2b8e4de1b91bab73a13ef5c6c16581";
+      };
+    };
+    "opn-5.1.0" = {
+      name = "opn";
+      packageName = "opn";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz";
+        sha1 = "72ce2306a17dbea58ff1041853352b4a8fc77519";
+      };
+    };
+    "socket.io-2.0.3" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.3.tgz";
+        sha1 = "4359f06a24933ae6bd087798af78c680eae345e3";
+      };
+    };
+    "linkify-it-2.0.3" = {
+      name = "linkify-it";
+      packageName = "linkify-it";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz";
+        sha1 = "d94a4648f9b1c179d64fa97291268bdb6ce9434f";
+      };
+    };
+    "mdurl-1.0.1" = {
+      name = "mdurl";
+      packageName = "mdurl";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz";
+        sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e";
+      };
+    };
+    "uc.micro-1.0.3" = {
+      name = "uc.micro";
+      packageName = "uc.micro";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz";
+        sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192";
+      };
+    };
+    "github-slugger-1.1.3" = {
+      name = "github-slugger";
+      packageName = "github-slugger";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.1.3.tgz";
+        sha1 = "314a6e759a18c2b0cc5760d512ccbab549c549a7";
+      };
+    };
+    "innertext-1.0.2" = {
+      name = "innertext";
+      packageName = "innertext";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/innertext/-/innertext-1.0.2.tgz";
+        sha1 = "11a197b3143a593636fba5d59213835e6954580a";
+      };
+    };
+    "emoji-regex-6.1.1" = {
+      name = "emoji-regex";
+      packageName = "emoji-regex";
+      version = "6.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz";
+        sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e";
+      };
+    };
+    "html-entities-1.2.1" = {
+      name = "html-entities";
+      packageName = "html-entities";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz";
+        sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
+      };
+    };
+    "is-wsl-1.1.0" = {
+      name = "is-wsl";
+      packageName = "is-wsl";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz";
+        sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
+      };
+    };
+    "engine.io-3.1.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.0.tgz";
+        sha1 = "5ca438e3ce9fdbc915c4a21c8dd9e1266706e57e";
+      };
+    };
+    "socket.io-adapter-1.1.1" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz";
+        sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b";
+      };
+    };
+    "socket.io-client-2.0.3" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz";
+        sha1 = "6caf4aff9f85b19fd91b6ce13d69adb564f8873b";
+      };
+    };
+    "socket.io-parser-3.1.2" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz";
+        sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2";
+      };
+    };
+    "engine.io-parser-2.1.1" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz";
+        sha1 = "e0fb3f0e0462f7f58bb77c1a52e9f5a7e26e4668";
+      };
+    };
+    "uws-0.14.5" = {
+      name = "uws";
+      packageName = "uws";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz";
+        sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc";
+      };
+    };
+    "has-binary2-1.0.2" = {
+      name = "has-binary2";
+      packageName = "has-binary2";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz";
+        sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98";
+      };
+    };
+    "isarray-2.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz";
+        sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e";
+      };
+    };
+    "engine.io-client-3.1.1" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz";
+        sha1 = "415a9852badb14fa008fa3ef1e31608db6761325";
+      };
+    };
     "express-2.5.11" = {
       name = "express";
       packageName = "express";
@@ -20201,24 +20408,6 @@ let
         sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a";
       };
     };
-    "mdurl-1.0.1" = {
-      name = "mdurl";
-      packageName = "mdurl";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz";
-        sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e";
-      };
-    };
-    "uc.micro-1.0.3" = {
-      name = "uc.micro";
-      packageName = "uc.micro";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz";
-        sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192";
-      };
-    };
     "regexp-quote-0.0.0" = {
       name = "regexp-quote";
       packageName = "regexp-quote";
@@ -20867,15 +21056,6 @@ let
         sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3";
       };
     };
-    "socket.io-2.0.3" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.3.tgz";
-        sha1 = "4359f06a24933ae6bd087798af78c680eae345e3";
-      };
-    };
     "superagent-3.5.2" = {
       name = "superagent";
       packageName = "superagent";
@@ -21146,87 +21326,6 @@ let
         sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa";
       };
     };
-    "engine.io-3.1.0" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.0.tgz";
-        sha1 = "5ca438e3ce9fdbc915c4a21c8dd9e1266706e57e";
-      };
-    };
-    "socket.io-adapter-1.1.1" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz";
-        sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b";
-      };
-    };
-    "socket.io-client-2.0.3" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz";
-        sha1 = "6caf4aff9f85b19fd91b6ce13d69adb564f8873b";
-      };
-    };
-    "socket.io-parser-3.1.2" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz";
-        sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2";
-      };
-    };
-    "engine.io-parser-2.1.1" = {
-      name = "engine.io-parser";
-      packageName = "engine.io-parser";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz";
-        sha1 = "e0fb3f0e0462f7f58bb77c1a52e9f5a7e26e4668";
-      };
-    };
-    "uws-0.14.5" = {
-      name = "uws";
-      packageName = "uws";
-      version = "0.14.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz";
-        sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc";
-      };
-    };
-    "has-binary2-1.0.2" = {
-      name = "has-binary2";
-      packageName = "has-binary2";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz";
-        sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98";
-      };
-    };
-    "isarray-2.0.1" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz";
-        sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e";
-      };
-    };
-    "engine.io-client-3.1.1" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz";
-        sha1 = "415a9852badb14fa008fa3ef1e31608db6761325";
-      };
-    };
     "adm-zip-0.4.7" = {
       name = "adm-zip";
       packageName = "adm-zip";
@@ -27683,6 +27782,322 @@ in
     };
     production = true;
   };
+  livedown = nodeEnv.buildNodePackage {
+    name = "livedown";
+    packageName = "livedown";
+    version = "2.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz";
+      sha1 = "896f8e28af72fdaa1137fda105d1066aadc65314";
+    };
+    dependencies = [
+      sources."body-parser-1.17.2"
+      sources."chokidar-1.7.0"
+      (sources."express-4.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+          sources."qs-6.5.0"
+        ];
+      })
+      sources."markdown-it-8.4.0"
+      sources."markdown-it-emoji-1.4.0"
+      sources."markdown-it-github-headings-1.0.1"
+      sources."markdown-it-task-checkbox-1.0.4"
+      sources."minimist-1.2.0"
+      sources."opn-5.1.0"
+      sources."request-2.81.0"
+      sources."socket.io-2.0.3"
+      sources."bytes-2.4.0"
+      sources."content-type-1.0.2"
+      sources."debug-2.6.7"
+      sources."depd-1.1.1"
+      sources."http-errors-1.6.2"
+      sources."iconv-lite-0.4.15"
+      sources."on-finished-2.3.0"
+      sources."qs-6.4.0"
+      sources."raw-body-2.2.0"
+      sources."type-is-1.6.15"
+      sources."ms-2.0.0"
+      sources."inherits-2.0.3"
+      sources."setprototypeof-1.0.3"
+      sources."statuses-1.3.1"
+      sources."ee-first-1.1.1"
+      sources."unpipe-1.0.0"
+      sources."media-typer-0.3.0"
+      sources."mime-types-2.1.16"
+      sources."mime-db-1.29.0"
+      sources."anymatch-1.3.2"
+      sources."async-each-1.0.1"
+      sources."glob-parent-2.0.0"
+      sources."is-binary-path-1.0.1"
+      sources."is-glob-2.0.1"
+      sources."path-is-absolute-1.0.1"
+      sources."readdirp-2.1.0"
+      sources."fsevents-1.1.2"
+      sources."micromatch-2.3.11"
+      sources."normalize-path-2.1.1"
+      sources."arr-diff-2.0.0"
+      sources."array-unique-0.2.1"
+      sources."braces-1.8.5"
+      sources."expand-brackets-0.1.5"
+      sources."extglob-0.3.2"
+      sources."filename-regex-2.0.1"
+      sources."is-extglob-1.0.0"
+      sources."kind-of-3.2.2"
+      sources."object.omit-2.0.1"
+      sources."parse-glob-3.0.4"
+      sources."regex-cache-0.4.3"
+      sources."arr-flatten-1.1.0"
+      sources."expand-range-1.8.2"
+      sources."preserve-0.2.0"
+      sources."repeat-element-1.1.2"
+      sources."fill-range-2.2.3"
+      sources."is-number-2.1.0"
+      sources."isobject-2.1.0"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."repeat-string-1.6.1"
+      sources."isarray-1.0.0"
+      sources."is-buffer-1.1.5"
+      sources."is-posix-bracket-0.1.1"
+      sources."for-own-0.1.5"
+      sources."is-extendable-0.1.1"
+      sources."for-in-1.0.2"
+      sources."glob-base-0.3.0"
+      sources."is-dotfile-1.0.3"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-primitive-2.0.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."binary-extensions-1.10.0"
+      sources."graceful-fs-4.1.11"
+      sources."minimatch-3.0.4"
+      sources."readable-stream-2.3.3"
+      sources."set-immediate-shim-1.0.1"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
+      sources."util-deprecate-1.0.2"
+      sources."nan-2.6.2"
+      sources."node-pre-gyp-0.6.36"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."nopt-4.0.1"
+      sources."npmlog-4.1.2"
+      sources."rc-1.2.1"
+      sources."rimraf-2.6.1"
+      sources."semver-5.4.1"
+      sources."tar-2.2.1"
+      sources."tar-pack-3.4.0"
+      sources."abbrev-1.1.0"
+      sources."osenv-0.1.4"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."are-we-there-yet-1.1.4"
+      sources."console-control-strings-1.1.0"
+      sources."gauge-2.7.4"
+      sources."set-blocking-2.0.0"
+      sources."delegates-1.0.0"
+      sources."aproba-1.1.2"
+      sources."has-unicode-2.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
+      sources."string-width-1.0.2"
+      sources."strip-ansi-3.0.1"
+      sources."wide-align-1.1.2"
+      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."deep-extend-0.4.2"
+      sources."ini-1.3.4"
+      sources."strip-json-comments-2.0.1"
+      sources."glob-7.1.2"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."once-1.4.0"
+      sources."wrappy-1.0.2"
+      sources."block-stream-0.0.9"
+      sources."fstream-1.0.11"
+      sources."fstream-ignore-1.0.5"
+      sources."uid-number-0.0.6"
+      sources."accepts-1.3.4"
+      sources."array-flatten-1.1.1"
+      sources."content-disposition-0.5.2"
+      sources."cookie-0.3.1"
+      sources."cookie-signature-1.0.6"
+      sources."encodeurl-1.0.1"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.0"
+      (sources."finalhandler-1.0.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
+      sources."fresh-0.5.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.5"
+      sources."range-parser-1.2.0"
+      (sources."send-0.15.4" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
+      sources."serve-static-1.12.4"
+      sources."utils-merge-1.0.0"
+      sources."vary-1.1.1"
+      sources."negotiator-0.6.1"
+      sources."forwarded-0.1.0"
+      sources."ipaddr.js-1.4.0"
+      sources."destroy-1.0.4"
+      sources."mime-1.3.4"
+      sources."argparse-1.0.9"
+      sources."entities-1.1.1"
+      sources."linkify-it-2.0.3"
+      sources."mdurl-1.0.1"
+      sources."uc.micro-1.0.3"
+      sources."sprintf-js-1.0.3"
+      sources."github-slugger-1.1.3"
+      sources."innertext-1.0.2"
+      sources."emoji-regex-6.1.1"
+      sources."html-entities-1.2.1"
+      sources."is-wsl-1.1.0"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.6.0"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.5"
+      sources."extend-3.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."hawk-3.1.3"
+      sources."http-signature-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.2"
+      sources."tunnel-agent-0.6.0"
+      sources."uuid-3.1.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."extsprintf-1.3.0"
+      sources."json-schema-0.2.3"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsbn-0.1.1"
+      sources."tweetnacl-0.14.5"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."punycode-1.4.1"
+      (sources."engine.io-3.1.0" // {
+        dependencies = [
+          sources."accepts-1.3.3"
+        ];
+      })
+      sources."socket.io-adapter-1.1.1"
+      sources."socket.io-client-2.0.3"
+      (sources."socket.io-parser-3.1.2" // {
+        dependencies = [
+          sources."isarray-2.0.1"
+        ];
+      })
+      sources."base64id-1.0.0"
+      sources."engine.io-parser-2.1.1"
+      (sources."ws-2.3.1" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
+      sources."uws-0.14.5"
+      sources."after-0.8.2"
+      sources."arraybuffer.slice-0.0.6"
+      sources."base64-arraybuffer-0.1.5"
+      sources."blob-0.0.4"
+      (sources."has-binary2-1.0.2" // {
+        dependencies = [
+          sources."isarray-2.0.1"
+        ];
+      })
+      sources."ultron-1.1.0"
+      sources."backo2-1.0.2"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      sources."engine.io-client-3.1.1"
+      sources."has-cors-1.1.0"
+      sources."indexof-0.0.1"
+      sources."object-component-0.0.3"
+      sources."parseqs-0.0.5"
+      sources."parseuri-0.0.5"
+      sources."to-array-0.1.4"
+      sources."component-inherit-0.0.3"
+      sources."parsejson-0.0.3"
+      sources."xmlhttprequest-ssl-1.5.3"
+      sources."yeast-0.1.2"
+      sources."better-assert-1.0.2"
+      sources."callsite-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Live Markdown previews for your favourite editor.";
+      homepage = https://github.com/shime/livedown;
+      license = "MIT";
+    };
+    production = true;
+  };
   meat = nodeEnv.buildNodePackage {
     name = "meat";
     packageName = "meat";

From ee51e73120f5da4b1fa524dc0b0fd91f565be1e7 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 17 Aug 2017 17:13:13 +0000
Subject: [PATCH 2715/3246] perl: 5.24.1 -> 5.24.2 and 5.22.3 -> 5.22.4

Scavenged by vcunat from #28353.
---
 pkgs/development/interpreters/perl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 5654aefe5d2..e268cfb7ea6 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -125,13 +125,13 @@ in rec {
   perl = perl524;
 
   perl522 = common {
-    version = "5.22.3";
-    sha256 = "10q087l1ffdy3gpryr8z540jcnsr0dhm37raicyfqqkyvys1yd8v";
+    version = "5.22.4";
+    sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms";
   };
 
   perl524 = common {
-    version = "5.24.1";
-    sha256 = "1bqqb5ghfj4486nqr77kgsd8aff6a289jy7n2cdkznwvn34qbhg6";
+    version = "5.24.2";
+    sha256 = "1x4yj814a79lcarwb3ab6bbcb36hvb5n4ph4zg3yb0nabsjfi6v0";
   };
 
 }

From 8c3cc7c7c4fa88b4df7adf7841cb5cbf03459f8f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 26 Aug 2017 13:44:13 +0200
Subject: [PATCH 2716/3246] pkgs/development/compilers/ghc: drop un-referenced
 patch files

---
 pkgs/development/compilers/ghc/D2710.patch |  19 ---
 pkgs/development/compilers/ghc/D2711.patch |  22 ---
 pkgs/development/compilers/ghc/D2712.patch | 158 ---------------------
 pkgs/development/compilers/ghc/D2713.patch |  17 ---
 4 files changed, 216 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/D2710.patch
 delete mode 100644 pkgs/development/compilers/ghc/D2711.patch
 delete mode 100644 pkgs/development/compilers/ghc/D2712.patch
 delete mode 100644 pkgs/development/compilers/ghc/D2713.patch

diff --git a/pkgs/development/compilers/ghc/D2710.patch b/pkgs/development/compilers/ghc/D2710.patch
deleted file mode 100644
index 0ee1b06c734..00000000000
--- a/pkgs/development/compilers/ghc/D2710.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h
---- a/rts/LinkerInternals.h
-+++ b/rts/LinkerInternals.h
-@@ -303,4 +303,14 @@
- #  define OBJFORMAT_MACHO
- #endif
- 
-+/* In order to simplify control flow a bit, some references to mmap-related
-+   definitions are blocked off by a C-level if statement rather than a CPP-level
-+   #if statement. Since those are dead branches when !RTS_LINKER_USE_MMAP, we
-+   just stub out the relevant symbols here
-+*/
-+#if !RTS_LINKER_USE_MMAP
-+#define munmap(x,y) /* nothing */
-+#define MAP_ANONYMOUS 0
-+#endif
-+
- #endif /* LINKERINTERNALS_H */
-
diff --git a/pkgs/development/compilers/ghc/D2711.patch b/pkgs/development/compilers/ghc/D2711.patch
deleted file mode 100644
index 8d229f27399..00000000000
--- a/pkgs/development/compilers/ghc/D2711.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
---- a/rts/sm/Storage.c
-+++ b/rts/sm/Storage.c
-@@ -1314,7 +1314,7 @@
-    ------------------------------------------------------------------------- */
- 
- #if (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS)
--void sys_icache_invalidate(void *start, size_t len);
-+#include <libkern/OSCacheControl.h>
- #endif
- 
- /* On ARM and other platforms, we need to flush the cache after
-@@ -1327,7 +1327,7 @@
-   (void)exec_addr;
- #elif (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS)
-   /* On iOS we need to use the special 'sys_icache_invalidate' call. */
--  sys_icache_invalidate(exec_addr, ((unsigned char*)exec_addr)+len);
-+  sys_icache_invalidate(exec_addr, len);
- #elif defined(__GNUC__)
-   /* For all other platforms, fall back to a libgcc builtin. */
-   unsigned char* begin = (unsigned char*)exec_addr;
-
diff --git a/pkgs/development/compilers/ghc/D2712.patch b/pkgs/development/compilers/ghc/D2712.patch
deleted file mode 100644
index d938d70bbcf..00000000000
--- a/pkgs/development/compilers/ghc/D2712.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/includes/rts/OSThreads.h b/includes/rts/OSThreads.h
---- a/includes/rts/OSThreads.h
-+++ b/includes/rts/OSThreads.h
-@@ -15,7 +15,12 @@
- #ifndef RTS_OSTHREADS_H
- #define RTS_OSTHREADS_H
- 
--#if defined(THREADED_RTS) /* to near the end */
-+#if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS)
-+#define BUILD_OSTHREAD_POSIX
-+#endif
-+
-+
-+#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) /* to near end */
- 
- #if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS)
- 
-@@ -205,13 +210,25 @@
- void releaseThreadNode (void);
- #endif // !CMINUSMINUS
- 
--#else
-+#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */
-+
-+#ifndef THREADED_RTS
-+
-+#ifdef ACQUIRE_LOCK
-+// If we have pthreads, we pull in the threading primitives even when the RTS
-+// isn't threaded, but we expect these macros to be noops on non-threaded RTS.
-+
-+#undef ACQUIRE_LOCK
-+#undef RELEASE_LOCK
-+#undef ASSERT_LOCK_HELD
-+
-+#endif
- 
- #define ACQUIRE_LOCK(l)
- #define RELEASE_LOCK(l)
- #define ASSERT_LOCK_HELD(l)
- 
--#endif /* defined(THREADED_RTS) */
-+#endif
- 
- #ifndef CMINUSMINUS
- //
-diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
---- a/rts/posix/OSThreads.c
-+++ b/rts/posix/OSThreads.c
-@@ -35,7 +35,7 @@
- #endif
- #endif
- 
--#if defined(THREADED_RTS)
-+#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX)
- #include "RtsUtils.h"
- #include "Task.h"
- 
-@@ -225,47 +225,6 @@
-     return NULL;
- }
- 
--int
--forkOS_createThread ( HsStablePtr entry )
--{
--    pthread_t tid;
--    int result = pthread_create(&tid, NULL,
--                                forkOS_createThreadWrapper, (void*)entry);
--    if(!result)
--        pthread_detach(tid);
--    return result;
--}
--
--void freeThreadingResources (void) { /* nothing */ }
--
--uint32_t
--getNumberOfProcessors (void)
--{
--    static uint32_t nproc = 0;
--
--    if (nproc == 0) {
--#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
--        nproc = sysconf(_SC_NPROCESSORS_ONLN);
--#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF)
--        nproc = sysconf(_SC_NPROCESSORS_CONF);
--#elif defined(darwin_HOST_OS)
--        size_t size = sizeof(uint32_t);
--        if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) {
--            if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
--                nproc = 1;
--        }
--#elif defined(freebsd_HOST_OS)
--        size_t size = sizeof(uint32_t);
--        if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
--            nproc = 1;
--#else
--        nproc = 1;
--#endif
--    }
--
--    return nproc;
--}
--
- #if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETAFFINITY)
- // Schedules the thread to run on CPU n of m.  m may be less than the
- // number of physical CPUs, in which case, the thread will be allowed
-@@ -353,6 +312,51 @@
-     pthread_kill(id, SIGPIPE);
- }
- 
-+#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */
-+
-+#if defined(THREADED_RTS)
-+
-+int
-+forkOS_createThread ( HsStablePtr entry )
-+{
-+    pthread_t tid;
-+    int result = pthread_create(&tid, NULL,
-+                                forkOS_createThreadWrapper, (void*)entry);
-+    if(!result)
-+        pthread_detach(tid);
-+    return result;
-+}
-+
-+void freeThreadingResources (void) { /* nothing */ }
-+
-+uint32_t
-+getNumberOfProcessors (void)
-+{
-+    static uint32_t nproc = 0;
-+
-+    if (nproc == 0) {
-+#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
-+        nproc = sysconf(_SC_NPROCESSORS_ONLN);
-+#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF)
-+        nproc = sysconf(_SC_NPROCESSORS_CONF);
-+#elif defined(darwin_HOST_OS)
-+        size_t size = sizeof(uint32_t);
-+        if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) {
-+            if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
-+                nproc = 1;
-+        }
-+#elif defined(freebsd_HOST_OS)
-+        size_t size = sizeof(uint32_t);
-+        if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0)
-+            nproc = 1;
-+#else
-+        nproc = 1;
-+#endif
-+    }
-+
-+    return nproc;
-+}
-+
- #else /* !defined(THREADED_RTS) */
- 
- int
-
diff --git a/pkgs/development/compilers/ghc/D2713.patch b/pkgs/development/compilers/ghc/D2713.patch
deleted file mode 100644
index 80cf35a5297..00000000000
--- a/pkgs/development/compilers/ghc/D2713.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -437,7 +437,11 @@
- else
-   CrossCompilePrefix=""
- fi
--TargetPlatformFull="${TargetPlatform}"
-+# Despite its similarity in name to TargetPlatform, TargetPlatformFull is used
-+# in calls to subproject configure scripts and thus must be set to the autoconf
-+# triple, not the normalized GHC triple that TargetPlatform is set to.
-+# It may be better to just do away with the GHC triples all together.
-+TargetPlatformFull="${target}"
- AC_SUBST(CrossCompiling)
- AC_SUBST(CrossCompilePrefix)
- AC_SUBST(TargetPlatformFull)
-

From be5d898473719b6e43b2ee1a104b2cdb1a29f222 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 26 Aug 2017 13:58:04 +0200
Subject: [PATCH 2717/3246] ppl: 1.1 -> 1.2

---
 pkgs/development/libraries/ppl/default.nix    |   6 +-
 .../libraries/ppl/ppl-cstddef.patch           | 238 ------------------
 2 files changed, 2 insertions(+), 242 deletions(-)
 delete mode 100644 pkgs/development/libraries/ppl/ppl-cstddef.patch

diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index d6e699929ba..73eda630e44 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, gmpxx, perl, gnum4 }:
 
-let version = "1.1"; in
+let version = "1.2"; in
 
 stdenv.mkDerivation rec {
   name = "ppl-${version}";
 
   src = fetchurl {
     url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
-    sha256 = "1vrqhbpyca6sf984cfcwlp8wdnfzj1g7ph9958qdky9978i1nlny";
+    sha256 = "1wgxcbgmijgk11df43aiqfzv31r3bkxmgb4yl68g21194q60nird";
   };
 
   nativeBuildInputs = [ perl gnum4 ];
@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
       "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips"
     ];
 
-  patches = [ ./ppl-cstddef.patch /* from Fedora */ ];
-
   # Beware!  It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
   # x86_64 box.  Nevertheless, being a dependency of GCC, it probably ought
   # to be tested.
diff --git a/pkgs/development/libraries/ppl/ppl-cstddef.patch b/pkgs/development/libraries/ppl/ppl-cstddef.patch
deleted file mode 100644
index 8c43b26bef7..00000000000
--- a/pkgs/development/libraries/ppl/ppl-cstddef.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -up ppl-1.1/src/Dense_Row_defs.hh.orig ppl-1.1/src/Dense_Row_defs.hh
---- ppl-1.1/src/Dense_Row_defs.hh.orig	2014-04-29 13:08:10.516682937 -0300
-+++ ppl-1.1/src/Dense_Row_defs.hh	2014-04-29 13:08:50.447684466 -0300
-@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
- #include <memory>
- #include <vector>
- #include <limits>
-+#include <cstddef>
- 
- #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
- //! A finite sequence of coefficients.
-@@ -433,7 +434,7 @@ public:
- 
-   typedef std::bidirectional_iterator_tag iterator_category;
-   typedef Coefficient value_type;
--  typedef ptrdiff_t difference_type;
-+  typedef std::ptrdiff_t difference_type;
-   typedef value_type* pointer;
-   typedef value_type& reference;
- 
-@@ -474,7 +475,7 @@ class Parma_Polyhedra_Library::Dense_Row
- public:
- 
-   typedef const Coefficient value_type;
--  typedef ptrdiff_t difference_type;
-+  typedef std::ptrdiff_t difference_type;
-   typedef value_type* pointer;
-   typedef Coefficient_traits::const_reference reference;
- 
-diff -up ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig ppl-1.1/src/Linear_Expression_Interface_defs.hh
---- ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig	2014-04-29 13:08:17.337683198 -0300
-+++ ppl-1.1/src/Linear_Expression_Interface_defs.hh	2014-04-29 13:08:40.999684104 -0300
-@@ -32,6 +32,7 @@ site: http://bugseng.com/products/ppl/ .
- #include "Sparse_Row_types.hh"
- #include <vector>
- #include <set>
-+#include <cstddef>
- 
- #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
- //! A linear expression.
-@@ -65,7 +66,7 @@ public:
-   public:
-     typedef std::bidirectional_iterator_tag iterator_category;
-     typedef const Coefficient value_type;
--    typedef ptrdiff_t difference_type;
-+    typedef std::ptrdiff_t difference_type;
-     typedef value_type* pointer;
-     typedef Coefficient_traits::const_reference reference;
- 
-diff -up ppl-1.1/src/CO_Tree_defs.hh.orig ppl-1.1/src/CO_Tree_defs.hh
---- ppl-1.1/src/CO_Tree_defs.hh.orig	2014-04-29 13:11:33.725690719 -0300
-+++ ppl-1.1/src/CO_Tree_defs.hh	2014-04-29 13:11:55.943691569 -0300
-@@ -28,6 +28,7 @@ site: http://bugseng.com/products/ppl/ .
- 
- #include "Coefficient_defs.hh"
- #include <memory>
-+#include <cstddef>
- 
- #ifndef PPL_CO_TREE_EXTRA_DEBUG
- #ifdef PPL_ABI_BREAKING_EXTRA_DEBUG
-@@ -159,7 +160,7 @@ public:
- 
-     typedef std::bidirectional_iterator_tag iterator_category;
-     typedef const data_type value_type;
--    typedef ptrdiff_t difference_type;
-+    typedef std::ptrdiff_t difference_type;
-     typedef value_type* pointer;
-     typedef data_type_const_reference reference;
- 
-@@ -314,7 +315,7 @@ public:
- 
-     typedef std::bidirectional_iterator_tag iterator_category;
-     typedef data_type value_type;
--    typedef ptrdiff_t difference_type;
-+    typedef std::ptrdiff_t difference_type;
-     typedef value_type* pointer;
-     typedef value_type& reference;
- 
-diff -up ppl-1.1/src/CO_Tree_inlines.hh.orig ppl-1.1/src/CO_Tree_inlines.hh
---- ppl-1.1/src/CO_Tree_inlines.hh.orig	2014-04-29 13:14:12.738696808 -0300
-+++ ppl-1.1/src/CO_Tree_inlines.hh	2014-04-29 13:14:48.887698192 -0300
-@@ -24,6 +24,8 @@ site: http://bugseng.com/products/ppl/ .
- #ifndef PPL_CO_Tree_inlines_hh
- #define PPL_CO_Tree_inlines_hh 1
- 
-+#include <cstddef>
-+
- namespace Parma_Polyhedra_Library {
- 
- inline dimension_type
-@@ -31,7 +33,7 @@ CO_Tree::dfs_index(const_iterator itr) c
-   PPL_ASSERT(itr.current_index != 0);
-   PPL_ASSERT(itr.current_index >= indexes + 1);
-   PPL_ASSERT(itr.current_index <= indexes + reserved_size);
--  const ptrdiff_t index = itr.current_index - indexes;
-+  const std::ptrdiff_t index = itr.current_index - indexes;
-   return static_cast<dimension_type>(index);
- }
- 
-@@ -40,7 +42,7 @@ CO_Tree::dfs_index(iterator itr) const {
-   PPL_ASSERT(itr.current_index != 0);
-   PPL_ASSERT(itr.current_index >= indexes + 1);
-   PPL_ASSERT(itr.current_index <= indexes + reserved_size);
--  const ptrdiff_t index = itr.current_index - indexes;
-+  const std::ptrdiff_t index = itr.current_index - indexes;
-   return static_cast<dimension_type>(index);
- }
- 
-@@ -772,7 +774,7 @@ CO_Tree::tree_iterator::follow_left_chil
-   p -= (offset - 1);
-   while (*p == unused_index)
-     ++p;
--  const ptrdiff_t distance = p - tree.indexes;
-+  const std::ptrdiff_t distance = p - tree.indexes;
-   PPL_ASSERT(distance >= 0);
-   i = static_cast<dimension_type>(distance);
-   offset = least_significant_one_mask(i);
-@@ -787,7 +789,7 @@ CO_Tree::tree_iterator::follow_right_chi
-   p += (offset - 1);
-   while (*p == unused_index)
-     --p;
--  const ptrdiff_t distance = p - tree.indexes;
-+  const std::ptrdiff_t distance = p - tree.indexes;
-   PPL_ASSERT(distance >= 0);
-   i = static_cast<dimension_type>(distance);
-   offset = least_significant_one_mask(i);
-diff -up ppl-1.1/src/Linear_Expression_defs.hh.orig ppl-1.1/src/Linear_Expression_defs.hh
---- ppl-1.1/src/Linear_Expression_defs.hh.orig	2014-04-29 13:15:39.793700141 -0300
-+++ ppl-1.1/src/Linear_Expression_defs.hh	2014-04-29 13:16:07.464701201 -0300
-@@ -51,6 +51,7 @@ site: http://bugseng.com/products/ppl/ .
- 
- #include "Linear_Expression_Interface_defs.hh"
- #include "Variable_defs.hh"
-+#include <cstddef>
- 
- namespace Parma_Polyhedra_Library {
- 
-@@ -381,7 +382,7 @@ public:
-   public:
-     typedef std::bidirectional_iterator_tag iterator_category;
-     typedef const Coefficient value_type;
--    typedef ptrdiff_t difference_type;
-+    typedef std::ptrdiff_t difference_type;
-     typedef value_type* pointer;
-     typedef Coefficient_traits::const_reference reference;
- 
-diff -up ppl-1.1/src/CO_Tree.cc.orig ppl-1.1/src/CO_Tree.cc
---- ppl-1.1/src/CO_Tree.cc.orig	2014-04-29 13:19:37.192709232 -0300
-+++ ppl-1.1/src/CO_Tree.cc	2014-04-29 13:19:58.000710029 -0300
-@@ -954,7 +954,7 @@ PPL::CO_Tree
-     --subtree_size;
-   }
- 
--  const ptrdiff_t distance = first_unused_index - indexes;
-+  const std::ptrdiff_t distance = first_unused_index - indexes;
-   PPL_ASSERT(distance >= 0);
-   return static_cast<dimension_type>(distance);
- }
-diff -up ppl-1.1/src/Constraint_System_defs.hh.orig ppl-1.1/src/Constraint_System_defs.hh
---- ppl-1.1/src/Constraint_System_defs.hh.orig	2014-04-29 13:30:05.530733294 -0300
-+++ ppl-1.1/src/Constraint_System_defs.hh	2014-04-29 13:30:27.167734122 -0300
-@@ -37,6 +37,7 @@ site: http://bugseng.com/products/ppl/ .
- #include "termination_types.hh"
- #include <iterator>
- #include <iosfwd>
-+#include <cstddef>
- 
- namespace Parma_Polyhedra_Library {
- 
-@@ -609,7 +610,7 @@ for (Constraint_System::const_iterator i
- class Parma_Polyhedra_Library::Constraint_System_const_iterator
-   : public std::iterator<std::forward_iterator_tag,
-                          Constraint,
--                         ptrdiff_t,
-+                         std::ptrdiff_t,
-                          const Constraint*,
-                          const Constraint&> {
- public:
-diff -up ppl-1.1/src/Congruence_System_defs.hh.orig ppl-1.1/src/Congruence_System_defs.hh
---- ppl-1.1/src/Congruence_System_defs.hh.orig	2014-04-29 13:33:56.927742155 -0300
-+++ ppl-1.1/src/Congruence_System_defs.hh	2014-04-29 13:34:15.535742867 -0300
-@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
- #include "Congruence_defs.hh"
- #include "Constraint_System_types.hh"
- #include <iosfwd>
-+#include <cstddef>
- 
- namespace Parma_Polyhedra_Library {
- 
-@@ -249,7 +250,7 @@ public:
-   class const_iterator
-     : public std::iterator<std::forward_iterator_tag,
-                            Congruence,
--                           ptrdiff_t,
-+                           std::ptrdiff_t,
-                            const Congruence*,
-                            const Congruence&> {
-   public:
-diff -up ppl-1.1/src/Generator_System_defs.hh.orig ppl-1.1/src/Generator_System_defs.hh
---- ppl-1.1/src/Generator_System_defs.hh.orig	2014-04-29 13:44:30.122766402 -0300
-+++ ppl-1.1/src/Generator_System_defs.hh	2014-04-29 13:44:48.167767093 -0300
-@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
- #include "Poly_Con_Relation_defs.hh"
- #include "Polyhedron_types.hh"
- #include <iosfwd>
-+#include <cstddef>
- 
- namespace Parma_Polyhedra_Library {
- 
-@@ -679,7 +680,7 @@ copy(gs.begin(), gs.end(), ostream_itera
- class Parma_Polyhedra_Library::Generator_System_const_iterator
-   : public std::iterator<std::forward_iterator_tag,
-         Generator,
--        ptrdiff_t,
-+        std::ptrdiff_t,
-         const Generator*,
-         const Generator&> {
- public:
-diff -up ppl-1.1/src/Grid_Generator_System_defs.hh.orig ppl-1.1/src/Grid_Generator_System_defs.hh
---- ppl-1.1/src/Grid_Generator_System_defs.hh.orig	2014-04-29 13:45:26.073768544 -0300
-+++ ppl-1.1/src/Grid_Generator_System_defs.hh	2014-04-29 13:45:42.535769175 -0300
-@@ -31,6 +31,7 @@ site: http://bugseng.com/products/ppl/ .
- #include "Variables_Set_types.hh"
- #include "Polyhedron_types.hh"
- #include <iosfwd>
-+#include <cstddef>
- 
- namespace Parma_Polyhedra_Library {
- 
-@@ -277,7 +278,7 @@ public:
-   class const_iterator
-     : public std::iterator<std::forward_iterator_tag,
-                            Grid_Generator,
--                           ptrdiff_t,
-+                           std::ptrdiff_t,
-                            const Grid_Generator*,
-                            const Grid_Generator&> {
-   public:

From fcfd477c9baa0c7189bcdd17e11650a75c11615f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 11:48:23 +0100
Subject: [PATCH 2718/3246] arangodb: 2.5.3 -> 3.2.2

---
 pkgs/servers/nosql/arangodb/default.nix | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index e7dc7ae9225..0e5590a9420 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,29 +1,28 @@
-{ stdenv, fetchFromGitHub, openssl, zlib, python2Packages, bash, go, readline }:
+{ stdenv, fetchFromGitHub
+, openssl, zlib, python2Packages, readline, cmake, python }:
 
 let
-  inherit (python2Packages) python gyp;
 in stdenv.mkDerivation rec {
-  version = "2.5.3";
+  version = "3.2.2";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
-    rev = "67d995aa22ea341129398326fa10c5f6c14e94e9";
-    sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc";
+    rev = "v${version}";
+    sha256 = "0f87r0fr3i09fnmwjqz6q1lwd5k32a2knrls0nv0zhqrma7sdy01";
   };
 
-  postPatch = ''
-    substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash
-    substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash
-    sed '1i#include <cmath>' -i arangod/Aql/Functions.cpp \
-      -i lib/Basics/string-buffer.cpp
-  '';
-
   buildInputs = [
-    openssl zlib python gyp go readline
+    openssl zlib go readline python
   ];
 
+  nativeBuildInputs = [ cmake ];
+
+  postPatch = ''
+    sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi
+  '';
+
   configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";

From 132c2a8ec51ca34ba7e20fd9bf1f88ee47bf8511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 13:34:06 +0100
Subject: [PATCH 2719/3246] arangodb: remove go

---
 pkgs/servers/nosql/arangodb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 0e5590a9420..c4a616856ad 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    openssl zlib go readline python
+    openssl zlib readline python
   ];
 
   nativeBuildInputs = [ cmake ];

From ffa499f9ec0a5d1b26796bf0caa1ac84c2dc815f Mon Sep 17 00:00:00 2001
From: Alvar <geistesk@users.noreply.github.com>
Date: Sat, 26 Aug 2017 14:36:31 +0200
Subject: [PATCH 2720/3246] et: init at 2017-03-04 (#28427)

---
 lib/maintainers.nix                   |  1 +
 pkgs/applications/misc/et/default.nix | 30 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/misc/et/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 707770cdc82..7fd33f3b396 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -215,6 +215,7 @@
   garrison = "Jim Garrison <jim@garrison.cc>";
   gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
   gebner = "Gabriel Ebner <gebner@gebner.org>";
+  geistesk = "Alvar Penning <post@0x21.biz>";
   georgewhewell = "George Whewell <georgerw@gmail.com>";
   gilligan = "Tobias Pflug <tobias.pflug@gmail.com>";
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
new file mode 100644
index 00000000000..23b2a57ea33
--- /dev/null
+++ b/pkgs/applications/misc/et/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "et-${version}";
+  version = "2017-03-04";
+
+  src = fetchFromGitHub {
+    owner = "geistesk";
+    repo = "et";
+    rev = "151e9b6bc0d2d4f45bda8ced740ee99d0f2012f6";
+    sha256 = "1a1jdnzmal05k506bbvzlwsj2f3kql6l5xc1gdabm79y6vaf4r7s";
+  };
+
+  buildInputs = [ libnotify gdk_pixbuf ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp et $out/bin
+    cp et-status.sh $out/bin/et-status
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Minimal libnotify-based (egg) timer for GNU/Linux";
+    homepage = https://github.com/geistesk/et;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ geistesk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 605baef6894..551a38fed38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1007,6 +1007,8 @@ with pkgs;
 
   ephemeralpg = callPackage ../applications/misc/ephemeralpg {};
 
+  et = callPackage ../applications/misc/et {};
+
   f3 = callPackage ../tools/filesystems/f3 { };
 
   facedetect = callPackage ../tools/graphics/facedetect { };

From 9bdf89692cce9c43145a3c7775c9c781e08dc1a2 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Sat, 26 Aug 2017 22:44:39 +1000
Subject: [PATCH 2721/3246] flyway: init at 4.2.0 (#28586)

* flyway: init at 4.2.0

* flyway: simplify install phase
---
 pkgs/development/tools/flyway/default.nix | 29 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/flyway/default.nix

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
new file mode 100644
index 00000000000..6233b9c6bdb
--- /dev/null
+++ b/pkgs/development/tools/flyway/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, jre_headless, makeWrapper }:
+  let
+    version = "4.2.0";
+  in
+    stdenv.mkDerivation {
+      name = "flyway-${version}";
+      src = fetchurl {
+        url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/4.2.0/flyway-commandline-${version}.tar.gz";
+        sha256 = "1fxj760qx6apsz50p60c9n79k6bqkjcv2zfgab0awvmdvdy4k661";
+      };
+      buildInputs = [ makeWrapper ];
+      dontBuild = true;
+      dontStrip = true;
+      installPhase = ''
+        mkdir -p $out/bin $out/share/flyway
+        cp -r sql jars lib drivers $out/share/flyway
+        makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \
+          --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
+          --add-flags "-cp '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \
+          --add-flags "org.flywaydb.commandline.Main"
+      '';
+      meta = with stdenv.lib; {
+        description = "Evolve your Database Schema easily and reliably across all your instances";
+        homepage = "https://flywaydb.org/";
+        license = licenses.asl20;
+        platforms = platforms.linux;
+        maintainers = maintainers.cmcdragonkai;
+      };
+    }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 551a38fed38..75cf326f473 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7879,6 +7879,8 @@ with pkgs;
   fltk13 = callPackage ../development/libraries/fltk { };
   fltk = self.fltk13;
 
+  flyway = callPackage ../development/tools/flyway { };
+
   fplll = callPackage ../development/libraries/fplll {};
   fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
 

From 68d8674f5a03fdeaf76c60429d5819d07ae35f5a Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sat, 26 Aug 2017 10:33:49 -0300
Subject: [PATCH 2722/3246] libebml: 1.3.4 -> 1.3.5

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

diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index 40d80329291..4b233301cce 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libebml-1.3.4";
+  name = "libebml-1.3.5";
 
   src = fetchurl {
-    url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2";
-    sha256 = "11zka6z9ncywyjr1gfm5cnii33ln7y3w6s86kiacchip2g7kw3f5";
+    url = "http://dl.matroska.org/downloads/libebml/${name}.tar.xz";
+    sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q";
   };
 
   meta = with stdenv.lib; {

From 66b78476bef0e3777a69e74edcf22bf09f566b17 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sat, 26 Aug 2017 10:34:23 -0300
Subject: [PATCH 2723/3246] mkvtoolnix: 14.0.0 -> 15.0.0

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index b902b96a7cd..442e9d8eeb3 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "14.0.0";
+  version = "15.0.0";
 
   src = fetchFromGitHub {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "1ygc2qrd074vz2yw4iqml5ir31kkvkv7pz3hcfy423p9s06xi1k2";
+    sha256 = "06n0hbp484zpsjvnzp6p0nzzssym3illxdicn3y1jf8gy971rxi0";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];

From 6dae73f552f299e4be792a8f526dda98f427149e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 14:36:26 +0100
Subject: [PATCH 2724/3246] jetbrains.phpstorm: 2017.1.4 -> 2017.2.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index ea1fc1022fd..95f3c0801d2 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -320,15 +320,15 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2017.1.4";
+    version = "2017.2.1"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "0zrbcziznz6dwh56snr27752xcsnl2gsxzi6jiraplkd92f2xlaf";
+      sha256 = "2f1af9ef6e9cda25a809a19a25f2d4fbaef00edf9d1d5a195572ab5e04e71e5e"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
-    update-channel = "PS2017.1";
+    update-channel = "PS2017.2";
   };
 
   phpstorm10 = buildPhpStorm rec {

From d23bed7cc63c596fe65e7d4a4ae473bb87363604 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 26 Aug 2017 09:47:57 -0400
Subject: [PATCH 2725/3246] linux: 4.12.8 -> 4.12.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index c223584c92d..df64bffe80b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.8";
+  version = "4.12.9";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0z4viglsqk9mv3hp6svwihncpxdgxdkzap74say1cqlbm1dqrdyi";
+    sha256 = "1734l7h9rc8y0gr68ir6j99nf480y56b5i5xb40vkywxbhbkj139";
   };
 
   kernelPatches = args.kernelPatches;

From 9b9d0cc06b3c9d72aa39b9565c292eb0893f2f3f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 26 Aug 2017 09:50:02 -0400
Subject: [PATCH 2726/3246] linux: 4.9.44 -> 4.9.45

---
 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 0c5a82c0290..393ae9d63ad 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.44";
+  version = "4.9.45";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18z3ijxdb6gmk6n37016233hq15bf9wkfqrkw67xlhyqa1hki9j4";
+    sha256 = "0vb62np19i88nslb24ydwnlhkb4018d247ha4xmn0ncsqy6x3rb6";
   };
 
   kernelPatches = args.kernelPatches;

From 3e732d92e96aeb5ab8de09b0d69cdd0d823ad9b2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 26 Aug 2017 09:56:28 -0400
Subject: [PATCH 2727/3246] atom: 1.19.2 -> 1.19.3

---
 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 07728ed7f3b..e44d919ece6 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.19.2";
+  version = "1.19.3";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0bfhcxhjsa7p35s5dz3zjxm4wc802m3k137p04l9anr3v5hrgqmb";
+    sha256 = "0cms0zgxlzrm0sdqm97qdvrmvjcdcrbqi3bw66xabgx365pkry7z";
     name = "${name}.deb";
   };
 

From 0e9be66b7c63699c44d69abc172960657884dd21 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 26 Aug 2017 15:56:43 +0200
Subject: [PATCH 2728/3246] globulation2: fix build

---
 pkgs/games/globulation/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
index 061f7c328d6..49353f5d7b5 100644
--- a/pkgs/games/globulation/default.nix
+++ b/pkgs/games/globulation/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, mesa, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net
 , speex, libvorbis, libogg, boost, fribidi, bsdiff
+, fetchpatch
 }:
 let
   version = "0.9.4";
@@ -18,7 +19,12 @@ stdenv.mkDerivation rec {
     sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
   };
 
-  patches = [ ./header-order.patch ./public-buildproject.patch ];
+  patches = [ ./header-order.patch ./public-buildproject.patch
+    (fetchpatch {
+	  url = https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw;
+	  sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
+	})
+  ];
 
   postPatch = ''
     cp campaigns/tutorial-part4.map{,.orig}

From 8d7da77fb4b80fab8f769302ad595d71b655b529 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 26 Aug 2017 16:01:58 +0200
Subject: [PATCH 2729/3246] pharo: set platforms based on flavor selection

---
 pkgs/development/pharo/vm/build-vm.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 378c89d8d90..7e80acb97c4 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -123,10 +123,6 @@ stdenv.mkDerivation rec {
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.lukego ];
-    # Pharo VM sources are packaged separately for darwin (macOS)
-    platforms = with stdenv.lib;
-                  intersectLists
-                    platforms.mesaPlatforms
-                    (subtractLists platforms.darwin platforms.unix);
+    platforms = [ "i686-linux" "x86_64-linux" "i686-darwin" "x86_64-darwin" ];
   };
 }

From edb61d115126ac60fcf7ead646af10cf42d10c17 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 26 Aug 2017 16:09:25 +0200
Subject: [PATCH 2730/3246] xsv: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index 12061b75a9d..52567f19023 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "xsv-${version}";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "xsv";
     rev = "${version}";
-    sha256 = "0xmjx5grwjrx2zsqmpblid9pqpwkk9pv468ffqlza3w35n9x5dax";
+    sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2";
   };
 
-  depsSha256 = "0gdbxgykhy6wm89mbdvl7ck2v0f66hwlm0m1q7r64bkb7i10fmkd";
+  depsSha256 = "013hy835871zxdnakwsr4bjm4krahlz4aqk5lh0rw78avfla89q9q";
 
   meta = with stdenv.lib; {
     description = "A fast CSV toolkit written in Rust";

From 2d43c1fa9f7255a36c8c2e56b508ae1cda2ebe53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 15:45:15 +0100
Subject: [PATCH 2731/3246] Revert "boot.kernelParams: dedup and sort"

This reverts commit 9e00c643d823b9c7483c13cc338c6a3322102a9c.

reason: https://github.com/NixOS/nixpkgs/pull/28392#issuecomment-325130848
---
 nixos/modules/system/boot/kernel.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index cc68be781fc..cf70a891c0c 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -57,7 +57,6 @@ in
       type = types.listOf types.str;
       default = [ ];
       description = "Parameters added to the kernel command line.";
-      apply = list: attrNames (genAttrs list (_: true)); # dedup and sort to avoid restarting services on eval order change
     };
 
     boot.consoleLogLevel = mkOption {

From eb159a0e5a371cfe2c3d75a039aef5d6c1ca8dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Sat, 26 Aug 2017 18:06:54 +0200
Subject: [PATCH 2732/3246] nignx-dav-ext-module: 0.0.3 -> 0.1.0

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

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index ea819c7ec83..98141c13c01 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -24,8 +24,8 @@
     src = fetchFromGitHub {
       owner = "arut";
       repo = "nginx-dav-ext-module";
-      rev = "v0.0.3";
-      sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91";
+      rev = "v0.1.0";
+      sha256 = "1ifahd69vz715g3zim618jbmxb7kcmzykc696grskxm0svpy294k";
     };
     inputs = [ pkgs.expat ];
   };

From 8dc06a23856292fc148d430b1cc88c723aa8b639 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Sat, 26 Aug 2017 18:35:40 +0200
Subject: [PATCH 2733/3246] racket: 6.9 -> 6.10

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 245ff7b006f..79759eb6443 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -33,11 +33,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "6.9";
+  version = "6.10";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "1cd218ee2ba1dc683de858a866c6666eb72a11adee8d1df6cdd59c5c5a47b714";
+    sha256 = "1mqnyj3bawad12dygsb11f2dbnkjp7q6d7ra714rqyw8mxix5ws0";
   };
 
   FONTCONFIG_FILE = fontsConf;
@@ -52,8 +52,7 @@ stdenv.mkDerivation rec {
     cd src/build
   '';
 
-  shared = if stdenv.isDarwin then "dylib" else "shared";
-  configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
+  configureFlags = [ "--enable-lt=${libtool}/bin/libtool" ]
                    ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]
                    ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ];
 

From 0387f84cf37acdf322aa020a6c4aac0eb1c07c28 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 26 Aug 2017 18:44:06 +0200
Subject: [PATCH 2734/3246] Revert "xsv: 0.12.1 -> 0.12.2"

This reverts commit edb61d115126ac60fcf7ead646af10cf42d10c17.

The sha256 is malformed.
---
 pkgs/tools/text/xsv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index 52567f19023..12061b75a9d 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "xsv-${version}";
-  version = "0.12.2";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "xsv";
     rev = "${version}";
-    sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2";
+    sha256 = "0xmjx5grwjrx2zsqmpblid9pqpwkk9pv468ffqlza3w35n9x5dax";
   };
 
-  depsSha256 = "013hy835871zxdnakwsr4bjm4krahlz4aqk5lh0rw78avfla89q9q";
+  depsSha256 = "0gdbxgykhy6wm89mbdvl7ck2v0f66hwlm0m1q7r64bkb7i10fmkd";
 
   meta = with stdenv.lib; {
     description = "A fast CSV toolkit written in Rust";

From 383f3f3a1bf4ed55d71f812f0a9ede9e27bf19ce Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 26 Aug 2017 16:22:52 +0000
Subject: [PATCH 2735/3246] smplayer: 17.7.0 -> 17.8.0

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 187f869bcfa..7877d8ec27a 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-17.7.0";
+  name = "smplayer-17.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "1g35h8xqs2bdwjdibzgs1ab2z2lmwgj8h53a7vqydv3j3crxx9wk";
+    sha256 = "0sm7zf7nvcjlx8fvzfnlrs7rr0c549j7r60j68lv898vp6yhwybh";
   };
 
   buildInputs = [ qtscript ];

From c3f28f84a89c0180146206f5d03059d6f3c82453 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 26 Aug 2017 16:09:25 +0200
Subject: [PATCH 2736/3246] xsv: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index 12061b75a9d..db84eac4a23 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "xsv-${version}";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "xsv";
     rev = "${version}";
-    sha256 = "0xmjx5grwjrx2zsqmpblid9pqpwkk9pv468ffqlza3w35n9x5dax";
+    sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2";
   };
 
-  depsSha256 = "0gdbxgykhy6wm89mbdvl7ck2v0f66hwlm0m1q7r64bkb7i10fmkd";
+  depsSha256 = "13hy835871zxdnakwsr4bjm4krahlz4aqk5lh0rw78avfla89q9q";
 
   meta = with stdenv.lib; {
     description = "A fast CSV toolkit written in Rust";

From 6dafc6c78b55c53b125b59d765d392fa6e1f6019 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 26 Aug 2017 20:31:10 +0200
Subject: [PATCH 2737/3246] shaarli: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 1c58194027a..21e8dc5be34 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "shaarli-${version}";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
-    sha256 = "1l8waa26cq9rjh8hvhnlrsvj4606pz81msdmhljgqx7fdn5wzs5c";
+    sha256 = "10arm3sm9dbzi97x1mjh46r5f6zii4f1w8nl0zfw3knbapab8xv5";
   };
 
   outputs = [ "out" "doc" ];
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     description = "The personal, minimalist, super-fast, database free, bookmarking service";
     license = licenses.gpl3Plus;
     homepage = https://github.com/shaarli/Shaarli;
-    maintainers = with maintainers; [ schneefux ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }

From e244067dff99c10a03d0ca9982dfed6aa28b3b90 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Sat, 26 Aug 2017 20:49:07 +0200
Subject: [PATCH 2738/3246] riot-web: init at 0.12.2 (#28585)

---
 .../instant-messengers/riot/riot-web.nix      | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/riot/riot-web.nix

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
new file mode 100644
index 00000000000..ea6ec1676ec
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, fetchpatch }:
+
+stdenv.mkDerivation rec {
+  name= "riot-web-${version}";
+  version = "0.12.2";
+
+  src = fetchurl {
+    url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
+    sha256 = "0zyddpnng1vjli12hn1hd0w99g6sfsk80dn2ll5h9276nc677pnh";
+  };
+
+  installPhase = ''
+    mkdir -p $out/
+    cp -R . $out/
+  '';
+
+  meta = {
+    description = "A glossy Matrix collaboration client for the web";
+    homepage = http://riot.im/;
+    maintainers = with stdenv.lib.maintainers; [ bachp ];
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 919776ebe8f..ca8b5690dfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1143,6 +1143,8 @@ with pkgs;
 
   ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { };
 
+  riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { };
+
   rsyslog = callPackage ../tools/system/rsyslog {
     hadoop = null; # Currently Broken
     czmq = czmq3;

From 04ff3e137d47215b5a04a951ad2c053f63cc9c7d Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sat, 26 Aug 2017 12:00:52 -0700
Subject: [PATCH 2739/3246] silver-searcher: 2.0.0 -> 2.1.0

---
 pkgs/tools/text/silver-searcher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index 14680896312..34aa0e9c7ed 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "silver-searcher-${version}";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "ggreer";
     repo = "the_silver_searcher";
     rev = "${version}";
-    sha256 = "074ll6l0486ak4ijvfzhwsp6fp8w55x4yjviql5kb8qpisi9ll7y";
+    sha256 = "0wcw4kyivb10m9b173183jrj46a0gisd35yqxi1mr9hw5l5dhkpa";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

From 5ae506e94a269a5092e019dbbd5197789a0ac3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 20:12:07 +0100
Subject: [PATCH 2740/3246] racket: fix shared library build

---
 pkgs/development/interpreters/racket/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 79759eb6443..07f622931fa 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -47,12 +47,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ];
 
   preConfigure = ''
+    unset AR
     substituteInPlace src/configure --replace /usr/bin/uname ${coreutils}/bin/uname
     mkdir src/build
     cd src/build
   '';
 
-  configureFlags = [ "--enable-lt=${libtool}/bin/libtool" ]
+  shared = if stdenv.isDarwin then "dylib" else "shared";
+  configureFlags = [ "--enable-${shared}"  "--enable-lt=${libtool}/bin/libtool" ]
                    ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]
                    ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ];
 

From bff106ea605f463d77e1c6d4d5435675f6a68b9b Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 26 Aug 2017 16:09:05 -0700
Subject: [PATCH 2741/3246] discord: clean up /opt, put discord in its own dir

---
 .../instant-messengers/discord/default.nix       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 6267a3c8eb7..853a6c96a7a 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -25,21 +25,21 @@ stdenv.mkDerivation rec {
      ];
 
     installPhase = ''
-        mkdir -p $out/{bin,opt,share/pixmaps}
-        mv * $out/opt
+        mkdir -p $out/{bin,opt/discord,share/pixmaps}
+        mv * $out/opt/discord
 
         # Copying how adobe-reader does it,
         # see pkgs/applications/misc/adobe-reader/builder.sh
         patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                 --set-rpath "$out/opt:$libPath"                                   \
-                 $out/opt/Discord
+                 --set-rpath "$out/opt/discord:$libPath"                                   \
+                 $out/opt/discord/Discord
 
-        paxmark m $out/opt/Discord
+        paxmark m $out/opt/discord/Discord
 
-        wrapProgram $out/opt/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib:${libpulseaudio}/lib"
+        wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib:${libpulseaudio}/lib"
 
-        ln -s $out/opt/Discord $out/bin/
-        ln -s $out/opt/discord.png $out/share/pixmaps
+        ln -s $out/opt/discord/Discord $out/bin/
+        ln -s $out/opt/discord/discord.png $out/share/pixmaps
 
         ln -s "${desktopItem}/share/applications" $out/share/
         '';

From 5772ce1dd8947173d020d91541185e8b37bd3fa6 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 26 Aug 2017 22:23:31 +0000
Subject: [PATCH 2742/3246] smpeg2: init at svn412

---
 pkgs/development/libraries/smpeg2/default.nix | 43 +++++++++++++++++++
 pkgs/development/libraries/smpeg2/gcc6.patch  | 33 ++++++++++++++
 pkgs/development/libraries/smpeg2/sdl2.patch  | 22 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 100 insertions(+)
 create mode 100644 pkgs/development/libraries/smpeg2/default.nix
 create mode 100644 pkgs/development/libraries/smpeg2/gcc6.patch
 create mode 100644 pkgs/development/libraries/smpeg2/sdl2.patch

diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix
new file mode 100644
index 00000000000..10386a7b33e
--- /dev/null
+++ b/pkgs/development/libraries/smpeg2/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }:
+
+stdenv.mkDerivation rec {
+  name = "smpeg2-svn${version}";
+  version = "412";
+
+  src = fetchsvn {
+    url = svn://svn.icculus.org/smpeg/trunk;
+    rev = version;
+    sha256 = "1irf2d8f150j8cx8lbb0pz1rijap536crsz0mw871xrh6wd2fd96";
+  };
+
+  patches = [
+    ./gcc6.patch
+    ./sdl2.patch
+  ];
+
+  nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
+
+  buildInputs = [ SDL2 ];
+
+  preConfigure = ''
+    sh autogen.sh
+  '';
+
+  postInstall = ''
+    sed -e 's,#include "\(SDL.*.h\)",#include <SDL2/\1>,' -i $out/include/smpeg2/*.h
+
+    wrapProgram $out/bin/smpeg2-config \
+      --prefix PATH ":" "${pkgconfig}/bin" \
+      --prefix PKG_CONFIG_PATH ":" "${SDL2.dev}/lib/pkgconfig"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://icculus.org/smpeg/;
+    description = "SDL2 MPEG Player Library";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/development/libraries/smpeg2/gcc6.patch b/pkgs/development/libraries/smpeg2/gcc6.patch
new file mode 100644
index 00000000000..165feb4428c
--- /dev/null
+++ b/pkgs/development/libraries/smpeg2/gcc6.patch
@@ -0,0 +1,33 @@
+--- a/audio/hufftable.cpp
++++ b/audio/hufftable.cpp
+@@ -9,6 +9,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <climits>
+ #include "MPEGaudio.h"
+ 
+ static const unsigned int
+@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16,  1},{  8,  1},{  4,
+ 
+ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, UINT_MAX, UINT_MAX, 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+   { 2, 3-1, 3-1, 0, 17,htd02},
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, UINT_MAX, UINT_MAX, 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+   { 6, 4-1, 4-1, 0, 31,htd06},
+   { 7, 6-1, 6-1, 0, 71,htd07},
+@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN
+   {11, 8-1, 8-1, 0,127,htd11},
+   {12, 8-1, 8-1, 0,127,htd12},
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14, UINT_MAX, UINT_MAX, 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
+   {16,16-1,16-1, 1,511,htd16},
+   {17,16-1,16-1, 2,511,htd16},
diff --git a/pkgs/development/libraries/smpeg2/sdl2.patch b/pkgs/development/libraries/smpeg2/sdl2.patch
new file mode 100644
index 00000000000..63bc352976e
--- /dev/null
+++ b/pkgs/development/libraries/smpeg2/sdl2.patch
@@ -0,0 +1,22 @@
+diff --git a/smpeg2-config.in b/smpeg2-config.in
+index 5cce954..0e61939 100644
+--- a/smpeg2-config.in
++++ b/smpeg2-config.in
+@@ -42,7 +42,7 @@ while test $# -gt 0; do
+       if test @includedir@ != /usr/include ; then
+         includes=-I@includedir@
+       fi
+-      echo $includes -I@includedir@/smpeg2 `@SDL_CONFIG@ --cflags`
++      echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags`
+       ;;
+     --libs)
+       if [ "`uname`" = "SunOS" ]; then
+@@ -50,7 +50,7 @@ while test $# -gt 0; do
+       else
+         libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@"
+       fi
+-      echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs`
++      echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs`
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca8b5690dfe..49b32f30e13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10299,6 +10299,8 @@ with pkgs;
 
   smpeg = callPackage ../development/libraries/smpeg { };
 
+  smpeg2 = callPackage ../development/libraries/smpeg2 { };
+
   snack = callPackage ../development/libraries/snack {
         # optional
   };

From e5be0e82d2e19e31fef4d7a8724d86173eb914c7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 26 Aug 2017 21:54:37 +0000
Subject: [PATCH 2743/3246] SDL2_mixer: build with libmodplug and smpeg2

---
 pkgs/development/libraries/SDL2_mixer/default.nix  | 14 ++++++++++++--
 .../libraries/SDL2_mixer/libmodplug.patch          | 13 +++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/SDL2_mixer/libmodplug.patch

diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 0203b8a1a8d..bca90fd4abd 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, smpeg, flac, enableNativeMidi ? false, fluidsynth ? null }:
+{ stdenv, lib, fetchurl, autoconf, pkgconfig, which
+, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug
+, enableNativeMidi ? false, fluidsynth ? null }:
 
 stdenv.mkDerivation rec {
   name = "SDL2_mixer-${version}";
@@ -9,7 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s";
   };
 
-  propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg flac ];
+  nativeBuildInputs = [ autoconf pkgconfig which ];
+
+  propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];
+
+  patches = [ ./libmodplug.patch ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
 
   configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";
 
diff --git a/pkgs/development/libraries/SDL2_mixer/libmodplug.patch b/pkgs/development/libraries/SDL2_mixer/libmodplug.patch
new file mode 100644
index 00000000000..63ed2732ebf
--- /dev/null
+++ b/pkgs/development/libraries/SDL2_mixer/libmodplug.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.in b/configure.in
+index d511646..77dc3fe 100644
+--- a/configure.in
++++ b/configure.in
+@@ -258,7 +258,7 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then
+             have_libmodplug_lib=yes
+         ], [dnl
+             AC_CHECK_HEADER([libmodplug/modplug.h], [have_libmodplug_hdr=yes])
+-            AC_CHECK_LIB([modplug], [have_libmodplug_lib=yes])
++            AC_CHECK_LIB([modplug], [ModPlug_Load], [have_libmodplug_lib=yes])
+         ])
+ 
+     if test x$have_libmodplug_hdr = xyes -a x$have_libmodplug_lib = xyes; then

From 927eb6f41738b5111920322fbbc0d77ecf71992e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 26 Aug 2017 21:55:11 +0000
Subject: [PATCH 2744/3246] rocksndiamonds: init at 4.0.0.2

---
 pkgs/games/rocksndiamonds/default.nix | 49 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/games/rocksndiamonds/default.nix

diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix
new file mode 100644
index 00000000000..caaedc44ee0
--- /dev/null
+++ b/pkgs/games/rocksndiamonds/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, makeDesktopItem, SDL2, SDL2_image, SDL2_mixer, SDL2_net }:
+
+stdenv.mkDerivation rec {
+  name = "${project}-${version}";
+  project = "rocksndiamonds";
+  version = "4.0.0.2";
+
+  src = fetchurl {
+    url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz";
+    sha256 = "0dzn6vlayvnkjm64zwva337rn07lc21kq93m2h8zz8j3wpl11pb4";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "rocksndiamonds";
+    exec = "rocksndiamonds";
+    icon = "rocksndiamonds";
+    comment = meta.description;
+    desktopName = "Rocks'n'Diamonds";
+    genericName = "Tile-based puzzle";
+    categories = "Game;LogicGame;";
+  };
+
+  buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net ];
+
+  preBuild = ''
+    dataDir="$out/share/rocksndiamonds"
+    makeFlags+="RO_GAME_DIR=$dataDir"
+  '';
+
+  installPhase = ''
+    appDir=$out/share/applications
+    iconDir=$out/share/icons/hicolor/32x32/apps
+    mkdir -p $out/bin $appDir $iconDir $dataDir
+    cp rocksndiamonds $out/bin/
+    ln -s ${desktopItem}/share/applications/* $appDir/
+    ln -s $dataDir/graphics/gfx_classic/RocksIcon32x32.png $iconDir/rocksndiamonds.png
+    cp -r docs graphics levels music sounds $dataDir
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Scrolling tile-based arcade style puzzle game";
+    homepage = https://www.artsoft.org/rocksndiamonds/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49b32f30e13..71cd91fff58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17513,6 +17513,8 @@ with pkgs;
 
   robotfindskitten = callPackage ../games/robotfindskitten { };
 
+  rocksndiamonds = callPackage ../games/rocksndiamonds { };
+
   saga = callPackage ../applications/gis/saga { };
 
   samplv1 = callPackage ../applications/audio/samplv1 { };

From 310e2d677a9664ed62484478a0173fb35b00b6d4 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 2 Aug 2017 15:11:54 +0200
Subject: [PATCH 2745/3246] freerdp: 20170502 -> 20170724

Fixes multiple security issues:
 * TALOS-2017-0336 CVE-2017-2834
 * TALOS-2017-0337 CVE-2017-2834
 * TALOS-2017-0338 CVE-2017-2836
 * TALOS-2017-0339 CVE-2017-2837
 * TALOS-2017-0340 CVE-2017-2838
 * TALOS-2017-0341 CVE-2017-2839

See http://www.freerdp.com/2017/07/24/freerdp-security for announcement.
---
 pkgs/applications/networking/remote/freerdp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index f4109bbd179..31e1a860ac9 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   name = "freerdp-git-${version}";
-  version = "20170502";
+  version = "20170724";
 
   src = fetchFromGitHub {
     owner  = "FreeRDP";
     repo   = "FreeRDP";
-    rev    = "8569102c3a011602de3a1cdf69f7c69adbb864ee";
-    sha256 = "0m61aiy8l3ybnk2d2kjmpp9ql31zfs63gjixyj9x95jd4m507j67";
+    rev    = "2.0.0-rc0";
+    sha256 = "0ngwdy0lfv2k59z1z8yq1wj5zbhqigpyfqbgh38m9p35yzh33lv1";
   };
 
   # outputs = [ "bin" "out" "dev" ];

From 7c696a08ce0faa7851dec48d9899980699f224a3 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Sat, 26 Aug 2017 22:45:37 +0300
Subject: [PATCH 2746/3246] pijul: 0.6.0 -> 0.7.3

---
 pkgs/applications/version-management/pijul/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index d72c2945239..a5479a6c6a8 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, rustPlatform, perl, darwin }:
+{ stdenv, fetchurl, rustPlatform, darwin }:
 
 with rustPlatform;
 
 buildRustPackage rec {
   name = "pijul-${version}";
-  version = "0.6.0";
+  version = "0.7.3";
 
   src = fetchurl {
     url = "https://pijul.org/releases/${name}.tar.gz";
-    sha256 = "a6b066b49b25d1083320c5ab23941deee795e1fcbe1faa951e95189fd594cdb3";
+    sha256 = "08cffv6nfp1iv9m2qhr9hggy9kg8xp07p8kqkjypfsdsb983vz5n";
   };
 
-  sourceRoot = "pijul";
+  sourceRoot = "${name}/pijul";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin
     (with darwin.apple_sdk.frameworks; [ Security ]);
 
   doCheck = false;
 
-  depsSha256 = "0raim0ahqg6fkidb6picfzircdzwdbsdmmv8in70r5hw770bv67r";
+  depsSha256 = "1qzzpnkyw1bn5fnj06c80f7985v1q0rqcphrrrkpbi33lg5mzgbv";
 
   meta = with stdenv.lib; {
     description = "A distributed version control system";

From 951106c650ce585a5f5afa99e65dd685ab66f6e2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 19:53:25 +0200
Subject: [PATCH 2747/3246] lldpd: 0.9.7 -> 0.9.8

Now uses the upstream systemd unit which adds lots of hardening flags.
---
 nixos/modules/services/networking/lldpd.nix | 9 ++-------
 pkgs/tools/networking/lldpd/default.nix     | 5 +++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix
index 4f951d843e2..ba4e1b1542f 100644
--- a/nixos/modules/services/networking/lldpd.nix
+++ b/nixos/modules/services/networking/lldpd.nix
@@ -28,16 +28,11 @@ in
     users.extraGroups._lldpd = {};
 
     environment.systemPackages = [ pkgs.lldpd ];
+    systemd.packages = [ pkgs.lldpd ];
 
     systemd.services.lldpd = {
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-      requires = [ "network.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.lldpd}/bin/lldpd -d ${concatStringsSep " " cfg.extraArgs}";
-        PrivateTmp = true;
-        PrivateDevices = true;
-      };
+      environment.LLDPD_OPTIONS = concatStringsSep " " cfg.extraArgs;
     };
   };
 }
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 5a97f2219ce..1ce9f7cb323 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -3,17 +3,18 @@
 
 stdenv.mkDerivation rec {
   name = "lldpd-${version}";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchurl {
     url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz";
-    sha256 = "1f0d5s4643pjmgycc5ssgl1pggyq5a7navhabkyhcg0aqdah6dmr";
+    sha256 = "0kwck17cr2f1a395a8bfmj7fz1n4i1hv429cbdbkhff33glr9r4y";
   };
 
   configureFlags = [
     "--localstatedir=/var"
     "--enable-pie"
     "--with-snmp"
+    "--with-systemdsystemunitdir=\${out}/lib/systemd/system"
   ];
 
   nativeBuildInputs = [ pkgconfig removeReferencesTo ];

From 7cff97a8d4ec41d538d7b81875db8f31c57fa2ad Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 20:20:29 +0200
Subject: [PATCH 2748/3246] squid: 3.5.26 -> 3.5.27

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

diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index 1133b697a25..2da0316483b 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -2,11 +2,11 @@
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "squid-3.5.26";
+  name = "squid-3.5.27";
 
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz";
-    sha256 = "10m9g7wcik11gv7xqpv9wbkmmfbwxs00s1jm8hgqh63fgp5yx8ds";
+    sha256 = "1v7hzvwwghrs751iag90z8909nvyp3c5jynaz4hmjqywy9kl7nsx";
   };
 
   buildInputs = [

From 28967501e92c3a505b1078644d7a4f18f42c408c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 20:20:48 +0200
Subject: [PATCH 2749/3246] squid4: 4.0.20 -> 4.0.21

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

diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
index af1a3f1eb0e..9f43af418e6 100644
--- a/pkgs/servers/squid/4.nix
+++ b/pkgs/servers/squid/4.nix
@@ -2,11 +2,11 @@
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "squid-4.0.20";
+  name = "squid-4.0.21";
 
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
-    sha256 = "1apb496psfv513fad82m52s6x7l74lsdq2dkzifmfgh3zrlc7r9i";
+    sha256 = "0cwfj3qpl72k5l1h2rvkv1xg0720rifk4wcvi49z216hznyqwk8m";
   };
 
   buildInputs = [

From eecd559bf1d6db99636f284d15653b602f130133 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 20:32:13 +0200
Subject: [PATCH 2750/3246] youtubeDL: 2017.07.30.1 -> 2017.08.23

---
 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 bf05cd9bf5c..3820b95405e 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.07.30.1";
+  version = "2017.08.23";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1m1n5d06xh8hnild6kssiv9yaq2sm7vy0c8h506v3nff7i9wf0a7";
+    sha256 = "1vq0r37ynnj2hx0ssh3hycg4wzhwch5pphq76swfz76r1klnrich";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b3d123fba57df73a2ae8ac6d832a8c6ff490e620 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 20:40:34 +0200
Subject: [PATCH 2751/3246] uhd: 3.10.1.1 -> 3.10.2.0

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

diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix
index e3af8181601..889595ab743 100644
--- a/pkgs/development/tools/misc/uhd/default.nix
+++ b/pkgs/development/tools/misc/uhd/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   name = "uhd-${version}";
-  version = "3.10.1.1";
+  version = "3.10.2.0";
 
   # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
   # and xxx.yyy.zzz. Hrmpf...
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EttusResearch";
     repo = "uhd";
-    rev = "release_003_010_001_001";
-    sha256 = "009pynjfpwbf3vfyg4w5yhcn4xb93afagqb3p5svjxzswh90j1d2";
+    rev = "release_003_010_002_000";
+    sha256 = "0g6f4amw7h0vr6faa1nc1zs3bc645binza0zqqx5cwgfxybv8cfy";
   };
 
   enableParallelBuilding = true;

From fad54919363eb939005b23594ab24dd27f0380c8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 20:44:52 +0200
Subject: [PATCH 2752/3246] syslogng: 3.9.1 -> 3.11.1

---
 pkgs/tools/system/syslog-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 812fab65ef6..397ba053841 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -9,11 +9,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "3.9.1";
+  version = "3.11.1";
 
   src = fetchurl {
     url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
-    sha256 = "05qaqw115py5iz55vmc0j1xcwcpr8wa9vpmbixhr1rqaamm8ay2n";
+    sha256 = "1sa51bh3rs4gq4zpgkyv94lqcx3qvxa41d2dsa7hyxidkp1rs2b4";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

From 88b9dd871adb53280ddc133e744f099ca01ad97d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 20:54:55 +0200
Subject: [PATCH 2753/3246] syslogng_incubator: 0.5.0 -> 0.6.0, remove broken
 flag

---
 pkgs/tools/system/syslog-ng-incubator/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
index 3fd529b0a50..ef92bdfe47e 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/pkgs/tools/system/syslog-ng-incubator/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng
-, eventlog, perl, python, yacc, protobufc, libivykis
+, eventlog, perl, python, yacc, protobufc, libivykis, libcap, czmq
 }:
 
 stdenv.mkDerivation rec {
   name = "syslog-ng-incubator-${version}";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "balabit";
     repo = "syslog-ng-incubator";
     rev = name;
-    sha256 = "00j123ya0xfj1jicaqnk1liffx07mhhf0r406pabxjjj97gy8nlk";
+    sha256 = "1wiv289lc5kxsd3ydyn1zvvgjrj1mv2jghv0cm425wsdsfr7fjb0";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook yacc ];
 
   buildInputs = [
-    glib syslogng eventlog perl python protobufc libivykis
+    glib syslogng eventlog perl python protobufc libivykis libcap czmq
   ];
 
   configureFlags = [
@@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.rickynils ];
     platforms = platforms.linux;
-    broken = true; # does not work with our new syslog-ng version yet
   };
 }

From 3d25e96b1fd82d65bdb390c622a758531e9cd6a7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 21:26:25 +0200
Subject: [PATCH 2754/3246] prometheus-alertmanager: 0.6.0 -> 0.8.0

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

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 78cd69714e8..3ae2a45ca6d 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "alertmanager-${version}";
-  version = "0.6.0";
+  version = "0.8.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    sha256 = "04969hqig0llfkvk3b0yqrywcxm6rgd7ph6nn5rx8pnq21i77sqm";
+    sha256 = "0bqc58j0nrq7y8nbd927z7x74m8mcd2782cxkqwscpq6d9983qql";
   };
 
   # Tests exist, but seem to clash with the firewall.

From 65890d6644f7349e68bf774234380f4a568cb0a5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 23:25:55 +0200
Subject: [PATCH 2755/3246] gqrx: 2.5.3 -> 2.7

---
 pkgs/applications/misc/gqrx/default.nix | 18 +++++++-----------
 pkgs/top-level/all-packages.nix         |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 5ad03c88c64..a0672f1810f 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt4, qmake4Hook, gnuradio, boost, gnuradio-osmosdr
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gnuradio-osmosdr
 # drivers (optional):
 , rtl-sdr, hackrf
 , pulseaudioSupport ? true, libpulseaudio
@@ -8,29 +8,25 @@ assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   name = "gqrx-${version}";
-  version = "2.5.3";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "csete";
     repo = "gqrx";
     rev = "v${version}";
-    sha256 = "02pavd1kc0gsnrl18bfa01r2f3j4j05zly4a8zwss9yrsgf8432x";
+    sha256 = "1dslb8l8ggj6vf9257c2bj0z8z1wy9c6sr2zksp5jdgf8m4j71im";
   };
 
-  nativeBuildInputs = [ qmake4Hook ];
-
+  nativeBuildInputs = [ cmake ];
   buildInputs = [
-    qt4 gnuradio boost gnuradio-osmosdr rtl-sdr hackrf
+    qtbase qtsvg gnuradio boost gnuradio-osmosdr rtl-sdr hackrf
   ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ];
 
   enableParallelBuilding = true;
 
   postInstall = ''
-    mkdir -p "$out/share/applications"
-    mkdir -p "$out/share/icons"
-
-    cp gqrx.desktop "$out/share/applications/"
-    cp resources/icons/gqrx.svg "$out/share/icons/"
+    install -vD $src/gqrx.desktop -t "$out/share/applications/"
+    install -vD $src/resources/icons/gqrx.svg -t "$out/share/icons/"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca8b5690dfe..5ad587a4483 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14228,7 +14228,7 @@ with pkgs;
     gtk2 = gtk2-x11;
   };
 
-  gqrx = callPackage ../applications/misc/gqrx { };
+  gqrx = qt5.callPackage ../applications/misc/gqrx { };
 
   grass = callPackage ../applications/gis/grass { };
 

From fc7397d66b1aba8a769747ddcdf40c875e70d061 Mon Sep 17 00:00:00 2001
From: Leandro Lisboa Penz <lpenz@lpenz.org>
Date: Thu, 24 Aug 2017 21:31:21 +0100
Subject: [PATCH 2756/3246] Revert "gnu global: set path of default gtags.conf
 in wrapper"

This reverts commit bd0d64730a90c8447245e415a2d10982ca95ba35.

Setting GTAGSCONF is not an adequate solution as it prevents the use of
it and the way it was done also breaks gtags when it is called by
global.

Fixes NixOS/nixpkgs#26971
---
 pkgs/development/tools/misc/global/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index f55130ae104..35126c85d3f 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -34,10 +34,8 @@ stdenv.mkDerivation rec {
     cp -v *.el "$out/share/emacs/site-lisp"
 
     wrapProgram $out/bin/gtags \
-      --prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \
       --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
     wrapProgram $out/bin/global \
-      --prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \
       --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
   '';
 

From f214a47ac42000c08db7cdf8d543c20bb13ec80b Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sat, 26 Aug 2017 21:47:01 -0700
Subject: [PATCH 2757/3246] fzf: 0.16.11 -> 0.17.0

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 5bf42fae9ea..4b76b85287a 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.16.11";
+  version = "0.17.0";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "1jm7v482ad85l627k7a265p2clzy2yk88hqqbjsihi53mj8agxa0";
+    sha256 = "0cj9vvrsrxj7752fxww1bkflz9rap0n4hhwd6shs0qbss1awwqk9";
   };
 
   outputs = [ "bin" "out" "man" ];

From 3eae39b38a5842e5473e1c01efdf0ba37d7c9866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 27 Aug 2017 06:34:08 +0100
Subject: [PATCH 2758/3246] SDL2_mixer: use autoreconfHook

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

diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index bca90fd4abd..c0fdbf921a6 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoconf, pkgconfig, which
+{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which
 , SDL2, libogg, libvorbis, smpeg2, flac, libmodplug
 , enableNativeMidi ? false, fluidsynth ? null }:
 
@@ -11,17 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s";
   };
 
-  nativeBuildInputs = [ autoconf pkgconfig which ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig which ];
 
   propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];
 
   patches = [ ./libmodplug.patch ];
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
-  configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";
+  configureFlags = [ "--disable-music-ogg-shared" ]
+    ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";
 
   meta = with stdenv.lib; {
     description = "SDL multi-channel audio mixer library";

From b0e90b99db9c6e728676a85f2006038f5fcb092e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 27 Aug 2017 07:08:53 +0100
Subject: [PATCH 2759/3246] python.pkgs.pygame_sdl2: python3 tests are
 non-functional

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

diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix
index 6f6163bb35e..eab56f9f7ac 100644
--- a/pkgs/development/python-modules/pygame_sdl2/default.nix
+++ b/pkgs/development/python-modules/pygame_sdl2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub
+{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub, isPy27
 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
 
 buildPythonPackage rec {
@@ -18,6 +18,9 @@ buildPythonPackage rec {
     cython libjpeg libpng
   ];
 
+
+  doCheck = isPy27; # python3 tests are non-functional
+
   postInstall = ''
     ( cd "$out"/include/python*/ ;
       ln -s pygame-sdl2 pygame_sdl2 || true ; )

From b07d148e1d56e4d1d0b46729728af0336ebee2bc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 27 Aug 2017 06:56:35 +0000
Subject: [PATCH 2760/3246] obelisk: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index 1ec0fef49d3..2b63054e59c 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
 	name = "obelisk-${version}";
-	version = "0.2.0";
+	version = "0.3.0";
 	src = fetchFromGitHub {
-		owner = "Lelio-Brun";
-		repo = "Obelisk";
+		owner = "lelio-brun";
+		repo = "obelisk";
 		rev = "v${version}";
-		sha256 = "0kbadib53x7mzqri9asd8fmhl4xfgk4ajgzd7rlq3irf2j3bmcqp";
+		sha256 = "1b0mnakrwd4xrj04dxnqcdmskh9r90mapb5xv0lcdgfhzlflyk3g";
 	};
 
 	buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ];

From 9d74fd3e0730ca7e63016b2573950acb8402d372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 27 Aug 2017 08:54:19 +0100
Subject: [PATCH 2761/3246] frostwire: add java to PATH

fixes #28547
---
 .../networking/p2p/frostwire/default.nix       | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 74f0ef392ef..8a159f033ae 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre }:
+{ stdenv, fetchurl, jre, makeWrapper }:
 
 with stdenv.lib;
 
@@ -11,20 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "01nq1vwkqdidmprlnz5d3c5412r6igv689barv64dmb9m6iqg53z";
   };
 
-  inherit jre;
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-    jar=$(ls */*.jar)
-    
     mkdir -p $out/share/java
-    mv $jar $out/share/java
-    
-    mkdir -p $out/bin
-    cat > $out/bin/frostwire <<EOF
-    #! $SHELL -e
-    exec $out/share/java/frostwire
-    EOF
-    chmod +x $out/bin/frostwire
+    mv $(ls */*.jar) $out/share/java
+
+    makeWrapper $out/share/java/frostwire $out/bin/frostwire \
+      --prefix PATH : ${jre}/bin/
   '';
 
   meta = with stdenv.lib; {

From d3b5fa3db259c987b0fcf43bcece73f24a822312 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 27 Aug 2017 09:59:23 +0200
Subject: [PATCH 2762/3246] gitlab-runner: 9.4.2 -> 9.5.0

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

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 4d827471687..d6b2ce42cdc 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 = "9.4.2";
+  version = "9.5.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 = "1cf8iasn47dlnbchh389ishzx5dqbyzg94w83j1w2ik4z0na6b7g";
+    sha256 = "05vph5pqw3wlrh76bfgrmhgzsjsf7llzscr9vr7nk3b2pcigawdp";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "120rvxlksza9zpjin0awq8gnnplnv6qmqlidgnxs63c71kyjiwf3";
+    sha256 = "0ilp793kbw0n6nhbcdqc1cb05h2ir27c1rkijyxaqvpczrm11lqj";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "06g4y6vn99b0g0k2als7fz5y2f87pg1cfwsxs8psqgl7nxmhw3i6";
+    sha256 = "0zpyvaflq62qazjw60xnzfw52fqbcmjaqig9y8i6wjzdzlm803f0";
   };
 
   patches = [ ./fix-shell-path.patch ];

From c4a156ed454a10424d9f6fcc486f377ea7965833 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 27 Aug 2017 09:58:46 +0200
Subject: [PATCH 2763/3246] qarte: 3.2.0+158 -> 3.10.0+188

---
 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 8bfe3c0b91f..aba3b81fde8 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+158";
+  name = "qarte-3.10.0+188";
   src = fetchbzr {
     url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3;
-    rev = "158";
-    sha256 = "0nj9yxylz1nz0hdjm0jzrq2l3dgfdqkafwxnzydp6qv6261w564n";
+    rev = "188";
+    sha256 = "06xpkjgm5ci5gfkza9f44m8l4jj32gfmr65cqs4x0j2ihrc6b4r9";
   };
 
   buildInputs = [ makeWrapper pythonEnv ];

From 460f640a5d411406e64f8767221eb4219a79e28c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 27 Aug 2017 09:59:25 +0200
Subject: [PATCH 2764/3246] ocamlPackages.fileutils: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix
index 6265a4b90ca..15942812754 100644
--- a/pkgs/development/ocaml-modules/fileutils/default.nix
+++ b/pkgs/development/ocaml-modules/fileutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
 
 stdenv.mkDerivation {
-  name = "ocaml-fileutils-0.5.1";
+  name = "ocaml-fileutils-0.5.2";
 
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz;
-    sha256 = "0g6zx2rcvacklxyli19ixcf6ich9ipxsps4k3jz98f5zlaab0a7g";
+    url = https://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz;
+    sha256 = "06l8hva3jmb2b7n4aa84dhhh1lr2mj8632gz4q83glc00khkn1vv";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ounit ];

From 4c23d059f5ffd08216e6007ddeea0b0850736e6c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 27 Aug 2017 10:19:40 +0200
Subject: [PATCH 2765/3246] obelisk: fix hash

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

diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index 2b63054e59c..0f072c5dd93 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 		owner = "lelio-brun";
 		repo = "obelisk";
 		rev = "v${version}";
-		sha256 = "1b0mnakrwd4xrj04dxnqcdmskh9r90mapb5xv0lcdgfhzlflyk3g";
+		sha256 = "12gldzi1mp15vwkk6llz2ignpc8ndqlycm88njb4k7r9hpv59m97";
 	};
 
 	buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ];

From 48241bddba2675ce917b0ce94843da9ffa759c4d Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 26 Aug 2017 20:32:58 +0200
Subject: [PATCH 2766/3246] nextcloud: 12.0.0 -> 12.0.2

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 03c8463f9ea..ffd2ad18796 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "12.0.0";
+  version = "12.0.2";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "0gr47bwwni7y33qz3l8g3sjrqridykxiid2jlmjdaz35bvq9r78v";
+    sha256 = "0z5145xnwmmim5j25ylghhhm74nvijqb8iyq5azq9vjmkz5xcd7b";
   };
 
   installPhase = ''

From 777075295686c7aa529362c1d3d3456f9efd918f Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 26 Aug 2017 20:38:23 +0200
Subject: [PATCH 2767/3246] nextcloud-news-updater: 9.0.2 -> 10.0.0

---
 pkgs/servers/nextcloud/news-updater.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix
index 0e99378c92c..a78b3d59095 100644
--- a/pkgs/servers/nextcloud/news-updater.nix
+++ b/pkgs/servers/nextcloud/news-updater.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "nextcloud-news-updater-${version}";
-  version = "9.0.2";
+  version = "10.0.0";
 
   src = fetchurl {
     url = "mirror://pypi/n/nextcloud_news_updater/nextcloud_news_updater-${version}.tar.gz";
-    sha256 = "1m6g4591zyvjl2fji4iwl9api02racgc9rqa0gf0mfsqwdr77alw";
+    sha256 = "00pscz0p4s10y1ymb6sm0gx4a5wdbhimn30582x8i28n58nnl8j0";
   };
 
   doCheck = false;

From d7f2c1f2b81a8b1c15cbe3d234cf8abc73bc5a2f Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 27 Aug 2017 13:55:24 +0200
Subject: [PATCH 2768/3246] postage: 3.2.17 -> 3.2.18

Release notes: https://github.com/workflowproducts/postage/releases/tag/eV3.2.18
---
 pkgs/applications/misc/postage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/postage/default.nix
index 17f718182e2..eeb879ee6e4 100644
--- a/pkgs/applications/misc/postage/default.nix
+++ b/pkgs/applications/misc/postage/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "postage-${version}";
-  version = "3.2.17";
+  version = "3.2.18";
 
   src = fetchFromGitHub {
     owner  = "workflowproducts";
     repo   = "postage";
     rev    = "eV${version}";
-    sha256 = "1c9ss5vx8s05cgw68z7y224qq8z8kz8rxfgcayd2ny200kqyn5bl";
+    sha256 = "1kdg8pw2vxwkxw3b6dim4s740s60j3iyrh96524wi3lqkkq98krn";
   };
 
   buildInputs = [ postgresql openssl ];

From 84459ddfecd503844b09be458670f5f0fc8d6708 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 27 Aug 2017 18:52:45 +0800
Subject: [PATCH 2769/3246] sensu: 1.0.2 -> 1.0.3

---
 pkgs/servers/monitoring/sensu/Gemfile.lock | 32 +++++++--------
 pkgs/servers/monitoring/sensu/gemset.nix   | 45 +++++++++++++---------
 2 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock
index 9e47e697c3b..d12e17130b0 100644
--- a/pkgs/servers/monitoring/sensu/Gemfile.lock
+++ b/pkgs/servers/monitoring/sensu/Gemfile.lock
@@ -5,13 +5,13 @@ GEM
     amqp (1.6.0)
       amq-protocol (>= 2.0.1)
       eventmachine
-    aws-sdk (2.10.19)
-      aws-sdk-resources (= 2.10.19)
-    aws-sdk-core (2.10.19)
+    aws-sdk (2.10.34)
+      aws-sdk-resources (= 2.10.34)
+    aws-sdk-core (2.10.34)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.19)
-      aws-sdk-core (= 2.10.19)
+    aws-sdk-resources (2.10.34)
+      aws-sdk-core (= 2.10.34)
     aws-sigv4 (1.0.1)
     cause (0.1)
     childprocess (0.5.8)
@@ -23,7 +23,7 @@ GEM
       eventmachine
     em-worker (0.0.2)
       eventmachine
-    eventmachine (1.2.2)
+    eventmachine (1.2.5)
     ffi (1.9.18)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -34,19 +34,21 @@ GEM
     json (1.8.6)
     jsonpath (0.5.8)
       multi_json
-    mime-types (2.99.3)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mixlib-cli (1.7.0)
     multi_json (1.12.1)
     netrc (0.11.0)
     oj (2.18.1)
     parse-cron (0.1.4)
-    rest-client (1.8.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    sensu (1.0.2)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    sensu (1.0.3)
       em-http-server (= 0.1.8)
-      eventmachine (= 1.2.2)
+      eventmachine (= 1.2.5)
       parse-cron (= 0.1.4)
       sensu-extension (= 1.5.1)
       sensu-extensions (= 1.9.0)
@@ -89,12 +91,12 @@ GEM
     sensu-plugin (1.4.5)
       json (< 2.0.0)
       mixlib-cli (>= 1.5.0)
-    sensu-plugins-disk-checks (2.4.0)
+    sensu-plugins-disk-checks (2.4.2)
       sensu-plugin (~> 1.2)
       sys-filesystem (= 1.1.7)
-    sensu-plugins-http (2.5.0)
+    sensu-plugins-http (2.6.0)
       aws-sdk (~> 2.3)
-      rest-client (= 1.8.0)
+      rest-client (~> 2.0.2)
       sensu-plugin (~> 1.2)
     sensu-plugins-influxdb (1.2.0)
       dentaku (= 2.0.9)
diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix
index 36bef969c2a..cce9a45e9ed 100644
--- a/pkgs/servers/monitoring/sensu/gemset.nix
+++ b/pkgs/servers/monitoring/sensu/gemset.nix
@@ -20,28 +20,28 @@
     dependencies = ["aws-sdk-resources"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04fgpkhjjmwxppb7b0jbsc6zykkw7hpkncld8mm1zamajf653sf6";
+      sha256 = "09k367vs9gb640cr1afphxjfmlykw7knnb9xz0kl2x5f9yr3zz23";
       type = "gem";
     };
-    version = "2.10.19";
+    version = "2.10.34";
   };
   aws-sdk-core = {
     dependencies = ["aws-sigv4" "jmespath"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0f0qq7h4bpmlvcsl1bncxdyw63zanz6jdxch9i457irc5l6z8sm0";
+      sha256 = "0gfsph8kr59jdpvycq8qh0c0ah64k0n96ag5qbvy7mzq9292085w";
       type = "gem";
     };
-    version = "2.10.19";
+    version = "2.10.34";
   };
   aws-sdk-resources = {
     dependencies = ["aws-sdk-core"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0c107vlh475jph5i2szchmcwlsimpvdbd2cc0m5p39jmw8prkysa";
+      sha256 = "0knip45mhx0dm8llp1akhhar2z007r7kjg3i3xbws7lhvms8fbjc";
       type = "gem";
     };
-    version = "2.10.19";
+    version = "2.10.34";
   };
   aws-sigv4 = {
     source = {
@@ -106,10 +106,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00mlcq33q104spkb5c997lwallpilhj0d6fzsbd4lr9s8lmjga5f";
+      sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.5";
   };
   ffi = {
     source = {
@@ -163,12 +163,21 @@
     version = "0.5.8";
   };
   mime-types = {
+    dependencies = ["mime-types-data"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
+      sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
       type = "gem";
     };
-    version = "2.99.3";
+    version = "3.1";
+  };
+  mime-types-data = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
+      type = "gem";
+    };
+    version = "3.2016.0521";
   };
   mixlib-cli = {
     source = {
@@ -214,19 +223,19 @@
     dependencies = ["http-cookie" "mime-types" "netrc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
+      sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "2.0.2";
   };
   sensu = {
     dependencies = ["em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vk9bvxwh6ah8xkncf16f8r0bq84cnnx16ffc4k6sq73v8wpk116";
+      sha256 = "07fa9rv7hdj2n58a0cm1i5nis309w7xbs9lmgckmrpj190q1gvdm";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
   sensu-extension = {
     dependencies = ["eventmachine"];
@@ -331,19 +340,19 @@
     dependencies = ["sensu-plugin" "sys-filesystem"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1r7kzqp0kwhz7kk0s25r7lh2sw4yr99m5lr8cb99kq73fnsjqipq";
+      sha256 = "1m5pygdaf8xqrby61vcsq6ynhzcvjr2xgahwmkkcai8a4xqrpq9x";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.4.2";
   };
   sensu-plugins-http = {
     dependencies = ["aws-sdk" "rest-client" "sensu-plugin"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13126hx2fgjsrfqnlh2hf2czn35pi8rkc5ql9yxf4y8x9a7dyksj";
+      sha256 = "1yg05x9dl4xwqi7lvglyv374a3hbp7ag0z9325jmc9bazm6i2q2d";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.6.0";
   };
   sensu-plugins-influxdb = {
     dependencies = ["dentaku" "influxdb" "jsonpath" "sensu-plugin"];

From 8398253f99dfacb327d588d92edb1a6eb1ceb235 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 27 Aug 2017 12:32:33 +0000
Subject: [PATCH 2770/3246] kdeApplications: inherit new KDE applications into
 pkgs

Add akregator, kaddressbook, kleopatra, kontact, korganizer.
---
 pkgs/top-level/all-packages.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d4ce349878..cdd1e198155 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14877,8 +14877,6 @@ with pkgs;
     boost = boost155;
   };
 
-  k3b = kdeApplications.k3b;
-
   k9copy = libsForQt5.callPackage ../applications/video/k9copy {};
 
   kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { };
@@ -14899,10 +14897,10 @@ with pkgs;
       recurseIntoAttrs (makeOverridable mkApplications attrs);
 
   inherit (kdeApplications)
-    akonadi ark dolphin ffmpegthumbs filelight gwenview kate kdenlive
-    kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmail
-    kmix kolourpaint kompare konsole krfb kwalletmanager marble okteta okular
-    spectacle;
+    akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b
+    kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf
+    kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
+    kontact korganizer krfb kwalletmanager marble okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 

From bebaf083cd297429f53ce3a86d77ad09702d3235 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 27 Aug 2017 09:43:23 -0400
Subject: [PATCH 2771/3246] linux-copperhead: 4.12.8.a -> 4.12.9.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 9e0c55fed6e..0edc17a6274 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.12.8";
+  version = "4.12.9";
   revision = "a";
-  sha256 = "03ldbgs4w70q756bl5gsxr2z428njnlslh6293y34r54gz5li9a3";
+  sha256 = "0bdhzh483l9g6c7n263f4wxx5klfciswzkmd5p6jlf9wqx72km33";
 in
 
 import ./generic.nix (args // {

From 821881030d4467893c14a8500934aa52862376c6 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 27 Aug 2017 16:15:39 +0200
Subject: [PATCH 2772/3246] mbuffer: 20160613 -> 20170806

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

diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index 51c0ebc82ae..4c4204badb1 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -3,19 +3,19 @@
  } :
 
 stdenv.mkDerivation rec {
-  version = "20160613";
+  version = "20170806";
   name = "mbuffer-${version}";
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
-    sha256 = "1za9yqfn23axnp4zymdsrjkqcci3wxywqw3bv4dxms57q1ljiab7";
+    sha256 = "0kbvxrd1k0509whgyl7w20cmqn5q16vjjh7d9glpl2j4lfd66ljw";
   };
 
   buildInputs = [ openssl ];
 
   meta = {
     homepage = http://www.maier-komor.de/mbuffer.html;
-    description  = "mbuffer is a tool for buffering data streams with a large set of unique features";
+    description  = "A tool for buffering data streams with a large set of unique features";
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ tokudan ];
     platforms = with stdenv.lib.platforms; allBut darwin;

From ef2c0f317a64bc43a8052296c903087ce4442c9e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 27 Aug 2017 14:29:57 +0000
Subject: [PATCH 2773/3246] js_of_ocaml-compiler: move

---
 .../default.nix => js_of_ocaml/compiler.nix}                    | 0
 pkgs/top-level/ocaml-packages.nix                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/tools/ocaml/{js_of_ocaml-compiler/default.nix => js_of_ocaml/compiler.nix} (100%)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/js_of_ocaml-compiler/default.nix
rename to pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9462eb3d3da..9da6228f816 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -272,7 +272,7 @@ let
 
     js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; };
 
-    js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml-compiler {};
+    js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml/compiler.nix {};
 
     jsonm = callPackage ../development/ocaml-modules/jsonm { };
 

From 4b1a1c1846b1b673f53728a02617a39ea6907006 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 27 Aug 2017 14:32:39 +0000
Subject: [PATCH 2774/3246] js_of_ocaml-ocamlbuild: init at 3.0.0

---
 .../tools/ocaml/js_of_ocaml/ocamlbuild.nix        | 15 +++++++++++++++
 pkgs/top-level/ocaml-packages.nix                 |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
new file mode 100644
index 00000000000..60ad695dc0b
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
@@ -0,0 +1,15 @@
+{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+, ocamlbuild
+}:
+
+stdenv.mkDerivation rec {
+	name = "js_of_ocaml-ocamlbuild-${version}"; 
+
+	inherit (js_of_ocaml-compiler) version src installPhase meta;
+
+	buildInputs = [ ocaml findlib jbuilder ];
+
+	propagatedBuildInputs = [ ocamlbuild ];
+
+	buildPhase = "jbuilder build -p js_of_ocaml-ocamlbuild";
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9da6228f816..509d50ce986 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -274,6 +274,8 @@ let
 
     js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml/compiler.nix {};
 
+    js_of_ocaml-ocamlbuild = callPackage ../development/tools/ocaml/js_of_ocaml/ocamlbuild.nix {};
+
     jsonm = callPackage ../development/ocaml-modules/jsonm { };
 
     lablgl = callPackage ../development/ocaml-modules/lablgl { };

From 935e991b724b096d78571c22d735dcbc8894515b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 27 Aug 2017 14:44:39 +0000
Subject: [PATCH 2775/3246] js_of_ocaml: 2.8.4 -> 3.0.0

js_of_ocaml-camlp4: init at 3.0.0

js_of_ocaml-ppx: init at 3.0.0
---
 .../ocaml-modules/ojquery/default.nix            |  6 +++---
 pkgs/development/ocaml-modules/vg/default.nix    |  5 +++--
 pkgs/development/ocaml-modules/xtmpl/default.nix |  4 ++--
 pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix | 15 +++++++++++++++
 .../tools/ocaml/js_of_ocaml/camlp4.nix           | 13 +++++++++++++
 pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix | 14 ++++++++++++++
 pkgs/top-level/ocaml-packages.nix                | 16 ++++++++++++++--
 7 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
 create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
 create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix

diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix
index ec4a6114810..6e9ca15fb38 100644
--- a/pkgs/development/ocaml-modules/ojquery/default.nix
+++ b/pkgs/development/ocaml-modules/ojquery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, camlp4 }:
+{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, ocaml_react }:
 
 stdenv.mkDerivation rec {
   version = "0.1";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1n01bsk4car40p94fk1ssvww0inqapwwhdylmrb7vv40drsdldp1";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ];
-  propagatedBuildInputs = [ js_of_ocaml camlp4 ];
+  buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ];
+  propagatedBuildInputs = [ js_of_ocaml lwt3 ocaml_react ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index ba33081486d..0ef3ef4939b 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, uchar, result, gg, uutf, otfm, js_of_ocaml,
+, uchar, result, gg, uutf, otfm
+, js_of_ocaml, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx,
   pdfBackend ? true, # depends on uutf and otfm
   htmlcBackend ? true # depends on js_of_ocaml
 }:
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ uchar result gg ]
                           ++ optionals pdfBackend [ uutf otfm ]
-                          ++ optionals htmlcBackend [ js_of_ocaml ];
+                          ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
index 77569c44bec..0d25b3785fc 100644
--- a/pkgs/development/ocaml-modules/xtmpl/default.nix
+++ b/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, uutf, sedlex, ppx_tools, js_of_ocaml
-, re }:
+, js_of_ocaml-camlp4, camlp4, re }:
 
 if stdenv.lib.versionOlder ocaml.version "4.03"
 then throw "xtmpl not supported for ocaml ${ocaml.version}"
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1dj5b4b266y4d8q3v1g0xsivz4vkhj0gi0jis37w84xcnlgiik8k";
   };
 
-  buildInputs = [ ocaml findlib ppx_tools js_of_ocaml ];
+  buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-camlp4 camlp4 ];
   propagatedBuildInputs = [ sedlex uutf re ];
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
new file mode 100644
index 00000000000..a4852a8aba0
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
@@ -0,0 +1,15 @@
+{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
+}:
+
+stdenv.mkDerivation rec {
+	name = "js_of_ocaml-${version}"; 
+
+	inherit (js_of_ocaml-compiler) version src installPhase meta;
+
+	buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned ];
+
+	propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
+
+	buildPhase = "jbuilder build -p js_of_ocaml";
+}
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
new file mode 100644
index 00000000000..b3a37e3f760
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
@@ -0,0 +1,13 @@
+{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+, camlp4
+}:
+
+stdenv.mkDerivation rec {
+	name = "js_of_ocaml-camlp4-${version}"; 
+
+	inherit (js_of_ocaml-compiler) version src installPhase meta;
+
+	buildInputs = [ ocaml findlib jbuilder camlp4 ];
+
+	buildPhase = "jbuilder build -p js_of_ocaml-camlp4";
+}
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
new file mode 100644
index 00000000000..4f6b281c8b9
--- /dev/null
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
@@ -0,0 +1,14 @@
+{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+, ocaml-migrate-parsetree, ppx_tools_versioned
+, js_of_ocaml
+}:
+
+stdenv.mkDerivation rec {
+	name = "js_of_ocaml-ppx-${version}"; 
+
+	inherit (js_of_ocaml-compiler) version src installPhase meta;
+
+	buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
+
+	buildPhase = "jbuilder build -p js_of_ocaml-ppx";
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 509d50ce986..ba75adb77d0 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -182,7 +182,10 @@ let
 
     eff = callPackage ../development/interpreters/eff { };
 
-    eliom = callPackage ../development/ocaml-modules/eliom { lwt = lwt2; };
+    eliom = callPackage ../development/ocaml-modules/eliom {
+      lwt = lwt2;
+      js_of_ocaml = js_of_ocaml_2;
+    };
 
     enumerate = callPackage ../development/ocaml-modules/enumerate { };
 
@@ -270,12 +273,21 @@ let
       pcre = ocaml_pcre;
     };
 
-    js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; };
+    js_of_ocaml =
+    if lib.versionOlder "4.02" ocaml.version
+    then callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { }
+    else js_of_ocaml_2;
+
+    js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; };
+
+    js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {};
 
     js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml/compiler.nix {};
 
     js_of_ocaml-ocamlbuild = callPackage ../development/tools/ocaml/js_of_ocaml/ocamlbuild.nix {};
 
+    js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {};
+
     jsonm = callPackage ../development/ocaml-modules/jsonm { };
 
     lablgl = callPackage ../development/ocaml-modules/lablgl { };

From a4c2613f3de171b7189d2ebb3bcf06f763cf6739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 27 Aug 2017 17:01:43 +0200
Subject: [PATCH 2776/3246] darwin.usr-include: set meta.platforms

Otherwise scripts may try to evaluate it and that fails due to
missing `stdenv.libc`.
---
 pkgs/os-specific/darwin/usr-include/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix
index f0af0f6ba55..4fef1388764 100644
--- a/pkgs/os-specific/darwin/usr-include/default.nix
+++ b/pkgs/os-specific/darwin/usr-include/default.nix
@@ -18,4 +18,6 @@ stdenv.mkDerivation {
     mkdir CoreFoundation
     ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation
   '';
+
+  meta.platforms = stdenv.lib.platforms.darwin;
 }

From 592d23d7db0880f92bb6c71b83368b9fa6412d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 27 Aug 2017 17:03:46 +0200
Subject: [PATCH 2777/3246] maxx: fix evaluation

Occurences of `$'` apparently do have to be quoted in ''-strings.
---
 pkgs/desktops/maxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 3e8ca1f388e..339183f906e 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -34,7 +34,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ makeWrapper ];
 
   buildPhase = ''
-    while IFS= read -r -d $'\0' i; do
+    while IFS= read -r -d ''$'\0' i; do
       substituteInPlace "$i" --replace /opt/MaXX $out/opt/MaXX
     done < <(find "." -type f -exec grep -Iq /opt/MaXX {} \; -and -print0)
 
@@ -57,7 +57,7 @@ in stdenv.mkDerivation {
       --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)" \
       --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps}
 
-    while IFS= read -r -d $'\0' i; do
+    while IFS= read -r -d ''$'\0' i; do
       if isELF "$i"; then
         bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?`
         patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i"

From 3ab85383a0859623e5f5e53cb1c1115befe4ac1e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 26 Aug 2017 21:55:27 -0500
Subject: [PATCH 2778/3246] libpoly: 0.1.3 -> 0.1.4

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

diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix
index 2fdbd87a275..1b401c927b6 100644
--- a/pkgs/applications/science/logic/poly/default.nix
+++ b/pkgs/applications/science/logic/poly/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, gmp, cmake, python}:
 
-let version = "0.1.3";
+let version = "0.1.4";
 in
 
 stdenv.mkDerivation {
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/SRI-CSL/libpoly/archive/v${version}.tar.gz";
-    sha256 = "0nd90585imnznyp04vg6a5ixxkd3bavhv1437397aj2k3dfc0y2k";
+    sha256 = "16x1pk2a3pcb5a0dzyw28ccjwkhmbsck4hy80ss7kx0dd7qgpi7j";
   };
 
   buildInputs = [ cmake gmp python ];

From db66c996bf9dc1900d42aaf8392df17435bf957c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 26 Aug 2017 21:50:45 -0500
Subject: [PATCH 2779/3246] yices: 2.5.2 -> 2.5.3

Move to github URL, homepage seems to be down currently.
---
 pkgs/applications/science/logic/yices/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index c8e20c7260c..489ca744bea 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchurl {
-    url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=${name}-src.tar.gz&accept=I+Agree";
+    url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz";
     name = "${name}-src.tar.gz";
-    sha256 = "18mjnwg0pwc0fx4f99l7hxsi10mb5skkzk0k1m3xv5kx3qfnghs0";
+    sha256 = "0a3zzbvmgyiljzqn6xmc037gismm779p696jywk09j2pqbvp52ac";
   };
 
   patchPhase = ''patchShebangs tests/regress/check.sh'';
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   # only installing the libyices.so.2.5.1 file.
   installPhase = ''
       make install LDCONFIG=true
-      (cd $out/lib && ln -s -f libyices.so.2.5.2 libyices.so.2.5)
+      (cd $out/lib && ln -s -f libyices.so.2.5.3 libyices.so.2.5)
   '';
 
   meta = with stdenv.lib; {

From eef236d0ba205b061972d55926a45b593a4c3d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 27 Aug 2017 17:21:35 +0200
Subject: [PATCH 2780/3246] libsigsegv*: add an option to apply a patch

Close #28536; this code is a bit different in style for 2.5,
and avoids mass rebuild for the default version.
---
 pkgs/development/libraries/libsigsegv/2.5.nix     | 6 +++++-
 pkgs/development/libraries/libsigsegv/default.nix | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix
index 0712ba92f60..fd453defe71 100644
--- a/pkgs/development/libraries/libsigsegv/2.5.nix
+++ b/pkgs/development/libraries/libsigsegv/2.5.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl
+, enableSigbusFix ? false # required by kernels < 3.18.6
+}:
 
 stdenv.mkDerivation rec {
   name = "libsigsegv-2.5";
@@ -8,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg";
   };
 
+  patches = stdenv.lib.optional enableSigbusFix ./sigbus_fix.patch;
+
   meta = {
     homepage = http://libsigsegv.sf.net;
     description = "A library for handling page faults in user mode";
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 961b3b2d883..8e1079bfbc8 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl
 , buildPlatform, hostPlatform
+, enableSigbusFix ? false # required by kernels < 3.18.6
 }:
 
 stdenv.mkDerivation rec {
@@ -10,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x";
   };
 
+  patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null;
+
   doCheck = hostPlatform == buildPlatform;
 
   meta = {

From f0a1ab78b492015f8a60bb49065579195fe1dc86 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Sun, 27 Aug 2017 19:42:21 +0200
Subject: [PATCH 2781/3246] meson/ninja: add setup hooks (#28444)

* Add setupHook for meson/ninja build

* libhttpseverywhere: Use meson/ninja setupHooks

* jamomacore: Remove superfluous ninja buildInput

* Remove obsolete ninja buildPhases

These are all handled by ninja's setup hook.

* lean2, xcbuild: fix build with ninja setup hook

Ninja is a runtime dependency here. However, cmake can generate Ninja
build files as well to satisfy the setup hook.

* qtwebengine: fix build with ninja setup hook
---
 pkgs/applications/audio/i-score/default.nix   |  4 --
 pkgs/applications/graphics/ao/default.nix     |  1 -
 .../science/logic/lean2/default.nix           |  2 +
 .../libraries/audio/jamomacore/default.nix    |  4 +-
 .../libraries/libhttpseverywhere/default.nix  | 12 ------
 .../qt-5/5.9/qtwebengine/default.nix          |  4 ++
 .../tools/build-managers/meson/default.nix    |  2 +
 .../tools/build-managers/meson/setup-hook.sh  | 22 ++++++++++
 .../tools/build-managers/ninja/default.nix    |  2 +
 .../tools/build-managers/ninja/setup-hook.sh  | 43 +++++++++++++++++++
 pkgs/development/tools/xcbuild/default.nix    |  2 +
 pkgs/tools/system/illum/default.nix           |  4 --
 12 files changed, 79 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/meson/setup-hook.sh
 create mode 100644 pkgs/development/tools/build-managers/ninja/setup-hook.sh

diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index 1a47b74e21c..eb2b2ca0702 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -67,10 +67,6 @@ stdenv.mkDerivation rec {
     export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
   '';
 
-  preBuild = ''
-    ninja
-  '';
-
   installPhase = ''
     cmake --build . --target install
   '';
diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix
index 2bba73fae1a..7396fdc045f 100644
--- a/pkgs/applications/graphics/ao/default.nix
+++ b/pkgs/applications/graphics/ao/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   };
 
   cmakeFlags = "-G Ninja";
-  buildPhase = "ninja";
   installPhase = ''
     ninja install
     cd ..
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
index f45f65e9082..2b861b6d06d 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
+  cmakeFlags = [ "-GNinja" ];
+
   postInstall = ''
     wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
   '';
diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix
index a3d04fee7f6..5dac4d8e592 100644
--- a/pkgs/development/libraries/audio/jamomacore/default.nix
+++ b/pkgs/development/libraries/audio/jamomacore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2,  ninja }:
+{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }:
 
 stdenv.mkDerivation rec {
   version = "1.0-beta.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln";
   };
 
-  buildInputs = [ pkgconfig alsaLib portaudio portmidi libsndfile cmake libxml2  ninja ];
+  buildInputs = [ pkgconfig alsaLib portaudio portmidi libsndfile cmake libxml2 ];
 
   meta = {
     description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media";
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 239536140ec..88a3ebbc4fb 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -15,18 +15,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
   buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ];
 
-  configurePhase = ''
-    mkdir build
-    cd build
-    meson --prefix "$out" ..
-  '';
-
-  buildPhase = ''
-    ninja
-   '';
-
-  installPhase = "ninja install";
-
   doCheck = true;
 
   checkPhase = "./httpseverywhere_test";
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
index 1684e6aac70..c0b9aa83e19 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
@@ -100,6 +100,10 @@ qtSubmodule {
     xlibs.libXcomposite
   ];
   patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
+
+  dontUseNinjaBuild = true;
+  dontUseNinjaInstall = true;
+
   postInstall = ''
     cat > $out/libexec/qt.conf <<EOF
     [Paths]
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 1855985f09f..1f38ad58453 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -18,6 +18,8 @@ python3Packages.buildPythonApplication rec {
     popd
   '';
 
+  setupHook = ./setup-hook.sh;
+
   meta = with lib; {
     homepage = http://mesonbuild.com;
     description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh
new file mode 100644
index 00000000000..dacad017ede
--- /dev/null
+++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh
@@ -0,0 +1,22 @@
+mesonConfigurePhase() {
+    runHook preConfigure
+
+    if [ -z "$dontAddPrefix" ]; then
+        mesonFlags="--prefix=$prefix $mesonFlags"
+    fi
+
+    # Build release by default.
+    mesonFlags="--buildtype=${mesonBuildType:-release} $mesonFlags"
+
+    echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"
+
+    meson build $mesonFlags "${mesonFlagsArray[@]}"
+    cd build
+
+    runHook postConfigure
+}
+
+if [ -z "$dontUseMesonConfigure" -a -z "$configurePhase" ]; then
+    setOutputFlags=
+    configurePhase=mesonConfigurePhase
+fi
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 39d0d4e0e39..fff6af396b9 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     cp doc/manual.html $out/share/doc/ninja/
   '';
 
+  setupHook = ./setup-hook.sh;
+
   meta = with stdenv.lib; {
     description = "Small build system with a focus on speed";
     longDescription = ''
diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
new file mode 100644
index 00000000000..9ea6549a824
--- /dev/null
+++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
@@ -0,0 +1,43 @@
+ninjaBuildPhase() {
+    runHook preBuild
+
+    if [[ -z "$ninjaFlags" && ! ( -e build.ninja ) ]]; then
+        echo "no build.ninja, doing nothing"
+    else
+        # shellcheck disable=SC2086
+        local flagsArray=( \
+            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
+            $ninjaFlags "${ninjaFlagsArray[@]}" \
+            $buildFlags "${buildFlagsArray[@]}")
+
+        echoCmd 'build flags' "${flagsArray[@]}"
+        ninja "${flagsArray[@]}"
+        unset flagsArray
+    fi
+
+    runHook postBuild
+}
+
+if [ -z "$dontUseNinjaBuild" -a -z "$buildPhase" ]; then
+    buildPhase=ninjaBuildPhase
+fi
+
+ninjaInstallPhase() {
+    runHook preInstall
+
+    installTargets="${installTargets:-install}"
+
+    # shellcheck disable=SC2086
+    local flagsArray=( $installTargets \
+        $ninjaFlags "${ninjaFlagsArray[@]}")
+
+    echoCmd 'install flags' "${flagsArray[@]}"
+    ninja "${flagsArray[@]}"
+    unset flagsArray
+
+    runHook postInstall
+}
+
+if [ -z "$dontUseNinjaInstall" -a -z "$installPhase" ]; then
+    installPhase=ninjaInstallPhase
+fi
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 649c7d14927..d38c85a5d83 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -50,6 +50,8 @@ in stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=strict-aliasing";
 
+  cmakeFlags = [ "-GNinja" ];
+
   buildInputs = [ cmake zlib libxml2 libpng ninja ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
 
diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix
index 4cdfeec12b7..d8faeea19d8 100644
--- a/pkgs/tools/system/illum/default.nix
+++ b/pkgs/tools/system/illum/default.nix
@@ -17,10 +17,6 @@ stdenv.mkDerivation rec {
     bash ./configure
   '';
 
-  buildPhase = ''
-    ninja
-  '';
-
   installPhase = ''
     mkdir -p $out/bin
     mv illum-d $out/bin

From dfd905b548e943f31eac36d487089116c2af10fb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 27 Aug 2017 19:56:39 +0200
Subject: [PATCH 2782/3246] python.pkgs.sphinx: fix python < 3.5 build

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

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 605ab3b3a60..a96a31824f7 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -21,6 +21,7 @@
 , imagesize
 , requests
 , sphinxcontrib-websupport
+, typing
 }:
 
 buildPythonPackage rec {
@@ -52,7 +53,7 @@ buildPythonPackage rec {
     imagesize
     requests
     sphinxcontrib-websupport
-  ];
+  ] ++ lib.optional (pythonOlder "3.5") typing;
 
   # Lots of tests. Needs network as well at some point.
   doCheck = false;

From 4d858a2a17d1c65b4cabd43e5b63de3e58c0b12c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Aug 2017 20:14:17 +0200
Subject: [PATCH 2783/3246] gdal: don't use composableDerivation

---
 pkgs/development/libraries/gdal/default.nix   | 2 +-
 pkgs/development/libraries/gdal/gdal-1_11.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 0bb91951a28..984d3da8119 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
+{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
 , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4
 , libiconv
diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix
index 5ed72a6669c..c9f0c076101 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
+{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
 , postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
 , libpng }:
 
-composableDerivation.composableDerivation {} (fixed: rec {
+stdenv.mkDerivation rec {
   version = "1.11.3";
   name = "gdal-${version}";
 
@@ -58,4 +58,4 @@ composableDerivation.composableDerivation {} (fixed: rec {
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
-})
+}

From ccbdab96d436497e084be1f6d26460f13dee676b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Aug 2017 20:29:52 +0200
Subject: [PATCH 2784/3246] ed: 1.14.1 -> 1.14.2

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

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 2404405c307..9d5848f0263 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,26 +1,20 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, lzip
 , buildPlatform, hostPlatform
 }:
 
 stdenv.mkDerivation rec {
   name = "ed-${version}";
-  version = "1.14.1";
+  version = "1.14.2";
 
   src = fetchurl {
-    # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
-    #url = "mirror://gnu/ed/${name}.tar.gz";
-    # 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_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db";
-      in [
-        ("http://pkgs.fedoraproject.org/repo/extras/ed"
-          + "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2")
-        "http://fossies.org/linux/privat/${name}.tar.bz2"
-      ];
-    sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw";
+    url = "mirror://gnu/ed/${name}.tar.lz";
+    sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";
   };
 
+  unpackCmd = "tar --lzip -xf";
+
+  nativeBuildInputs = [ lzip ];
+
   /* FIXME: Tests currently fail on Darwin:
 
        building test scripts for ed-1.5...
@@ -32,11 +26,7 @@ stdenv.mkDerivation rec {
     */
   doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
 
-  # TODO(@Ericson2314): Use placeholder to make this a configure flag once Nix
-  # 1.12 is released.
-  preConfigure = ''
-    export DESTDIR=$out
-  '';
+  installFlags = [ "DESTDIR=$(out)" ];
 
   configureFlags = [
     "--exec-prefix=${stdenv.cc.prefix}"

From f6afe064a0a1136f1b288299fa90898f4d9938ae Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 27 Aug 2017 19:41:10 +0100
Subject: [PATCH 2785/3246] edk2: 2014-12-10 -> UDK2017

---
 pkgs/applications/virtualization/OVMF/default.nix |  2 +-
 pkgs/development/compilers/edk2/default.nix       | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 121875a69de..98fb53e57dd 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
     export OUTPUT_FD=$fd
 
     for file in \
-      "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg};
+      "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg};
     do
       ln -sv "$file" .
     done
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 1e6e0e8c1f6..b3e2ff909b7 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libuuid, python2, iasl }:
+{ stdenv, fetchFromGitHub, libuuid, python2, iasl }:
 
 let
   pythonEnv = python2.withPackages(ps: [ps.tkinter]);
@@ -13,10 +13,11 @@ else
 edk2 = stdenv.mkDerivation {
   name = "edk2-2014-12-10";
 
-  src = fetchgit {
-    url = git://github.com/tianocore/edk2;
-    rev = "684a565a04";
-    sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb";
+  src = fetchFromGitHub {
+    owner = "tianocore";
+    repo = "edk2";
+    rev = "vUDK2017";
+    sha256 = "0sswa028644yr8fbl8j6rhrdm717fj29h4dys3ygklmjhss90a2g";
   };
 
   buildInputs = [ libuuid pythonEnv];

From 9c3fd150a2445d82061a5db62f0d58359702051f Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sun, 27 Aug 2017 14:19:47 -0400
Subject: [PATCH 2786/3246] iosevka: 1.13.1 -> 1.13.3

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

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index b72e5a27391..04f8ebc613c 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "1.13.1";
+  version = "1.13.3";
 in fetchzip rec {
   name = "iosevka-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
-  sha256 = "0w35jkvfnzn4clm3010wv13sil2yj6pxffx40apjp7yhh19c4sw7";
+  sha256 = "0103rjxcp2sis42xp7fh7g8i03h5snvs8n78lgsf79g8ssw0p9d4";
 
   meta = with stdenv.lib; {
     homepage = https://be5invis.github.io/Iosevka/;

From f5068aadd9d62563d77a32486996467e69cabe36 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 27 Aug 2017 20:05:15 +0100
Subject: [PATCH 2787/3246] endless-sky: 0.9.6 -> 0.9.8

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

diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index f39e32eb752..40dbd1d33a7 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "0.9.6";
+  version = "0.9.8";
 
 in
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "endless-sky";
     repo = "endless-sky";
     rev = "v${version}";
-    sha256 = "166wr861w415kynim0yx3x7c16x66f5367hv2mfzhpyp244jzccx";
+    sha256 = "0i36lawypikbq8vvzfis1dn7yf6q0d2s1cllshfn7kmjb6pqfi6c";
   };
 
   enableParallelBuilding = true;

From 724504e0da4b6491dbc2517c685d65cf7f4f4134 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 27 Aug 2017 19:00:55 +0000
Subject: [PATCH 2788/3246] ocamlPackages.cohttp: 0.22.0 -> 0.99.0

ocamlPackages.conduit: 0.15.4 -> 1.0.0

ocamlPackages.cohttp-lwt: init at 0.99.0

ocamlPackages.cohttp-lwt-unix: init at 0.99.0

ocamlPackages.conduit-lwt: init at 1.0.0

ocamlPackages.conduit-lwt-unix: init at 1.0.0

ocamlPackages.git: 1.11.1 -> 1.11.2
---
 .../ocaml-modules/cohttp/default.nix          | 19 +++++++---------
 .../ocaml-modules/cohttp/lwt-unix.nix         | 19 ++++++++++++++++
 pkgs/development/ocaml-modules/cohttp/lwt.nix | 16 ++++++++++++++
 .../ocaml-modules/conduit/default.nix         | 22 +++++++++----------
 .../ocaml-modules/conduit/lwt-unix.nix        | 18 +++++++++++++++
 .../development/ocaml-modules/conduit/lwt.nix | 16 ++++++++++++++
 .../ocaml-modules/git-http/default.nix        |  4 ++--
 .../ocaml-modules/git-unix/default.nix        |  5 +++--
 .../development/ocaml-modules/git/default.nix |  4 ++--
 pkgs/top-level/ocaml-packages.nix             |  8 +++++++
 10 files changed, 102 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
 create mode 100644 pkgs/development/ocaml-modules/cohttp/lwt.nix
 create mode 100644 pkgs/development/ocaml-modules/conduit/lwt-unix.nix
 create mode 100644 pkgs/development/ocaml-modules/conduit/lwt.nix

diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 1fd4446f1ee..adde3094e27 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,29 +1,26 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
 , ppx_fields_conv, ppx_sexp_conv
-, base64, fieldslib, uri, conduit
-# Optional for async and lwt support:
-, async , async_ssl, cmdliner, fmt, magic-mime, ocaml_lwt, tls
+, base64, fieldslib, jsonm, logs, re, stringext, uri
 }:
 
 stdenv.mkDerivation rec {
-	version = "0.22.0";
+	version = "0.99.0";
 	name = "ocaml${ocaml.version}-cohttp-${version}";
 
 	src = fetchFromGitHub {
 		owner = "mirage";
 		repo = "ocaml-cohttp";
 		rev = "v${version}";
-		sha256 = "1iy4ynh0yrw8337nsa9zvgcf476im0bhccsbs0vki3c5yxw2x60d";
+		sha256 = "0y8qhzfwrc6486apmp2rsj822cnfhnz4w8rsb52w5wqmsgjxx1bj";
 	};
 
-	buildInputs = [ ocaml findlib ocamlbuild ppx_fields_conv ppx_sexp_conv conduit
-		async async_ssl cmdliner fmt magic-mime ocaml_lwt tls ];
+	buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ base64 fieldslib uri ];
+	propagatedBuildInputs = [ base64 fieldslib re stringext uri ];
 
-	makeFlags = [ "PREFIX=$(out)" ];
+	buildPhase = "jbuilder build -p cohttp";
 
-	createFindlibDestdir = true;
+	inherit (jbuilder) installPhase;
 
 	meta = {
 		description = "HTTP(S) library for Lwt, Async and Mirage";
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
new file mode 100644
index 00000000000..c526a101dd9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@@ -0,0 +1,19 @@
+{ stdenv, ocaml, findlib, jbuilder, cohttp-lwt
+, conduit-lwt-unix, ppx_sexp_conv
+, cmdliner, fmt, magic-mime
+}:
+
+if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99"
+then cohttp-lwt
+else
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-cohttp-lwt-unix-${version}";
+	inherit (cohttp-lwt) version src installPhase meta;
+
+	buildInputs = [ ocaml findlib jbuilder cmdliner ppx_sexp_conv ];
+
+	propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
+
+	buildPhase = "jbuilder build -p cohttp-lwt-unix";
+}
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
new file mode 100644
index 00000000000..21bea646d72
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -0,0 +1,16 @@
+{ stdenv, ocaml, findlib, jbuilder, cohttp, lwt3, uri, ppx_sexp_conv }:
+
+if !stdenv.lib.versionAtLeast cohttp.version "0.99"
+then cohttp
+else
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-cohttp-lwt-${version}";
+	inherit (cohttp) version src installPhase meta;
+
+	buildInputs = [ ocaml findlib jbuilder uri ppx_sexp_conv ];
+
+	propagatedBuildInputs = [ cohttp lwt3 ];
+
+	buildPhase = "jbuilder build -p cohttp-lwt";
+}
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index 750bded2893..98ac997383c 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -1,27 +1,25 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild
-, ppx_driver, ppx_sexp_conv
-, ipaddr, uri, logs
-, ocaml_lwt ? null
-, async ? null, async_ssl ? null
-, tls ? null
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+, ppx_sexp_conv
+, astring, ipaddr, uri
 }:
 
 stdenv.mkDerivation rec {
-	version = "0.15.4";
+	version = "1.0.0";
 	name = "ocaml${ocaml.version}-conduit-${version}";
 
 	src = fetchFromGitHub {
 		owner = "mirage";
 		repo = "ocaml-conduit";
 		rev = "v${version}";
-		sha256 = "1ya7jqvhl8hc22cid5myf31w5c473imdxjnl9785lavsqj3djjxq";
+		sha256 = "1ryigzh7sfif1mly624fpm87aw5h60n5wzdlrvqsf71qcpxc6iiz";
 	};
 
-	buildInputs = [ ocaml findlib ocamlbuild ppx_driver ppx_sexp_conv
-		ocaml_lwt async async_ssl tls ];
-	propagatedBuildInputs = [ ipaddr uri logs ];
+	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];
+	propagatedBuildInputs = [ astring ipaddr uri ];
 
-	createFindlibDestdir = true;
+	buildPhase = "jbuilder build -p conduit";
+
+	inherit (jbuilder) installPhase;
 
 	meta = {
 		description = "Network connection library for TCP and SSL";
diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
new file mode 100644
index 00000000000..ce7a33a11ee
--- /dev/null
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -0,0 +1,18 @@
+{ stdenv, ocaml, findlib, jbuilder, conduit-lwt
+, logs, ppx_sexp_conv
+}:
+
+if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0"
+then conduit-lwt
+else
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-conduit-lwt-unix-${version}";
+	inherit (conduit-lwt) version src installPhase meta;
+
+	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];
+
+	propagatedBuildInputs = [ conduit-lwt logs ];
+
+	buildPhase = "jbuilder build -p conduit-lwt-unix";
+}
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix
new file mode 100644
index 00000000000..8ee3d827ecc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -0,0 +1,16 @@
+{ stdenv, ocaml, findlib, jbuilder, ppx_sexp_conv, conduit, lwt3 }:
+
+if !stdenv.lib.versionAtLeast conduit.version "1.0"
+then conduit
+else
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-conduit-lwt-${version}";
+	inherit (conduit) version src installPhase meta;
+
+	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];
+
+	propagatedBuildInputs = [ conduit lwt3 ];
+
+	buildPhase = "jbuilder build -p conduit-lwt";
+}
diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix
index 7df47b093b3..5b93b960765 100644
--- a/pkgs/development/ocaml-modules/git-http/default.nix
+++ b/pkgs/development/ocaml-modules/git-http/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, git, cohttp }:
+{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt }:
 
 stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-git-http-${version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib jbuilder ];
 
-	propagatedBuildInputs = [ git cohttp ];
+	propagatedBuildInputs = [ git cohttp-lwt ];
 
 	buildPhase = "jbuilder build -p git-http";
 
diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix
index 1fd4fd92649..189388efe32 100644
--- a/pkgs/development/ocaml-modules/git-unix/default.nix
+++ b/pkgs/development/ocaml-modules/git-unix/default.nix
@@ -1,5 +1,6 @@
 { stdenv, ocaml, findlib, jbuilder, git-http
-, ocaml_lwt, tls, conduit, magic-mime, cmdliner, mtime
+, cohttp-lwt-unix
+, tls, magic-mime, cmdliner, mtime
 }:
 
 stdenv.mkDerivation rec {
@@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib jbuilder cmdliner mtime ];
 
-	propagatedBuildInputs = [ conduit git-http magic-mime ocaml_lwt tls ];
+	propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ];
 
 	buildPhase = "jbuilder build -p git-unix";
 
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index e3b4b4333e1..4d4f86e57eb 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-	version = "1.11.1";
+	version = "1.11.2";
 	name = "ocaml${ocaml.version}-git-${version}";
 
 	src = fetchFromGitHub {
 		owner = "mirage";
 		repo = "ocaml-git";
 		rev = version;
-		sha256 = "04az2bpbhgdhh7y6pagqx4wf3jbmqrm8w20dgimpbj5h3hnak744";
+		sha256 = "1z5b0g4vck1sh1w076i2p3ppxrmb9h30q3nip5snw2r9prkm6y1j";
 	};
 
 	buildInputs = [ ocaml findlib jbuilder ];
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ba75adb77d0..64656990d0e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -137,6 +137,10 @@ let
       then callPackage ../development/ocaml-modules/cohttp { }
       else cohttp_p4;
 
+    cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { };
+
+    cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { };
+
     conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix {
        lwt = lwt2;
     };
@@ -146,6 +150,10 @@ let
       then callPackage ../development/ocaml-modules/conduit { }
       else conduit_p4;
 
+    conduit-lwt = callPackage ../development/ocaml-modules/conduit/lwt.nix { };
+
+    conduit-lwt-unix = callPackage ../development/ocaml-modules/conduit/lwt-unix.nix { };
+
     config-file = callPackage ../development/ocaml-modules/config-file { };
 
     containers = callPackage ../development/ocaml-modules/containers { };

From 1cfe9539f99d4d0f9dd00a48f79d13e8a37b4d08 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 27 Aug 2017 23:05:28 +0300
Subject: [PATCH 2789/3246] libgcrypt: Add pre-ARMv7 patch

Apparently the assembly-optimized functions use an opcode that doesn't
work on pre-ARMv7. Fix in next release.
---
 pkgs/development/libraries/libgcrypt/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 5bcb8c5fe98..732f3710563 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
+{ stdenv, fetchurl, fetchpatch, libgpgerror, enableCapabilities ? false, libcap }:
 
 assert enableCapabilities -> stdenv.isLinux;
 
@@ -22,6 +22,15 @@ stdenv.mkDerivation rec {
   buildInputs = [ libgpgerror ]
     ++ stdenv.lib.optional enableCapabilities libcap;
 
+  # Shouldn't be needed after 1.8.1
+  patches = if stdenv.isArm && stdenv.system != "armv7l-linux"
+    then fetchpatch {
+        url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=4a7aa30ae9f3ce798dd886c2f2d4164c43027748";
+        name = "arm.patch";
+        sha256 = "1dq9s0xwpbg7s5sghvssmwh4v88x733zm6c8ab3flllq8h7c8fq5";
+      }
+    else null;
+
   # Make sure libraries are correct for .pc and .la files
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postFixup = ''

From 6a851869b4d763654851d9b1dcd96ff1af0c6792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 27 Aug 2017 22:09:52 +0200
Subject: [PATCH 2790/3246] libdrm: 2.4.82 -> 2.4.83

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 96d346ad77e..c62d31a1e26 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.82";
+  name = "libdrm-2.4.83";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c";
+    sha256 = "1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983";
   };
 
   outputs = [ "out" "dev" ];

From aa1e535b1be7ecba807244ce90f5a1d4b2c492cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 27 Aug 2017 22:14:43 +0200
Subject: [PATCH 2791/3246] mesa: maintenance 17.1.6 -> 17.1.7

---
 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 f23838cb956..54e5626868a 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.1.6";
+  version = "17.1.7";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -82,7 +82,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 = "0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50";
+    sha256 = "1xg5v61nvabjk3rx48cwmnwv6zpqdcnkxl8bz82284mifjl75x39";
   };
 
   prePatch = "patchShebangs .";

From 556029c9047c97b798ea465632dc59218bff3052 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Aug 2017 20:48:27 +0200
Subject: [PATCH 2792/3246] elfutils: 0.169 -> 1.170

---
 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 591e263205c..e89aba67999 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,11 +3,11 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.169";
+  version = "0.170";
 
   src = fetchurl {
     url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
-    sha256 = "1hiv1yqig3292dwqhrwsxwk3qjalxp5fpl8yphwbfwh8ng3zl4ll";
+    sha256 = "0rp0r54z44is49c594qy7hr211nhb00aa5y7z74vsybbaxslg10z";
   };
 
   patches = ./debug-info-from-env.patch;

From 44f797fa56e5076cbd0fce3674012727817b983f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Aug 2017 23:02:25 +0200
Subject: [PATCH 2793/3246] prometheus-mysqld-exporter: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index ff6eca621e8..9180a511349 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "mysqld_exporter-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/mysqld_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "mysqld_exporter";
-    sha256 = "0ldjrbhm6n7in4lj6l78xii10mg162rsp09ymjm7y2xar9sd70vp";
+    sha256 = "1133bgyp5vljz2qvfh0qzq8h8bkc8vci3jnmbr633bh3jpaqm2py";
   };
 
   meta = with stdenv.lib; {

From 9bacde7cc14176b411b9f0968ac5573abbc5ee97 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Aug 2017 23:17:35 +0200
Subject: [PATCH 2794/3246] prometheus-haproxy-exporter: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index 3a61480aea5..b2a0e387589 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "haproxy_exporter-${version}";
-  version = "0.7.1";
+  version = "0.8.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/haproxy_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "haproxy_exporter";
-    sha256 = "1svwa1cw4yc5k8acj2r2hkall9csxjw51hgmwkmx5dq55gr9lzai";
+    sha256 = "0gx8pq67w71ch3g3c77xaz39msrd9graizc6d3shwabdjx35yc6q";
   };
 
   meta = with stdenv.lib; {

From 73885ee33035f309e74e4c5a77b8949a63df4d52 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Aug 2017 23:18:05 +0200
Subject: [PATCH 2795/3246] prometheus-pushgateway: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index ccddb078f47..6509f55d46e 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "pushgateway-${version}";
-  version = "0.3.1";
+  version = "0.4.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/pushgateway";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "pushgateway";
-    sha256 = "0ax83yy5hbfppcr66l9al7wxibcqfnyps05jdscvpwvgrg4q7ldk";
+    sha256 = "19hsv42addcx4dsjdbh64y7ggjvaaay9gag0342gz7gyl9sr719f";
   };
 
   buildInputs = [ go-bindata ];

From 20e37eea63f73126e689b3f1133e2c79c6e85d59 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Aug 2017 23:18:42 +0200
Subject: [PATCH 2796/3246] prometheus-statsd-exporter: 0.3.0 -> 0.4.0

---
 pkgs/servers/monitoring/prometheus/statsd-bridge.nix | 8 ++++----
 pkgs/top-level/aliases.nix                           | 1 +
 pkgs/top-level/all-packages.nix                      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
index 0ff1386074b..f4d9f5a8503 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
@@ -1,17 +1,17 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "statsd_bridge-${version}";
-  version = "0.3.0";
+  name = "statsd_exporter-${version}";
+  version = "0.4.0";
   rev = version;
 
   goPackagePath = "github.com/prometheus/statsd_bridge";
 
   src = fetchFromGitHub {
-    inherit rev;
+    rev = "v${version}";
     owner = "prometheus";
     repo = "statsd_exporter";
-    sha256 = "1gg9v224n05khcwy27637w3rwh0cymm7hx6bginfxd7730rmpp2r";
+    sha256 = "1w11n7g663g7d7mbf6jfzcqmcm9rhaxy52bg0rqnad9v0rs5qxr6";
   };
 
   goDeps = ./statsd-bridge_deps.nix;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index daada3f416e..181e8a35277 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -112,6 +112,7 @@ mapAliases (rec {
   pidgin-with-plugins = pidgin; # added 2016-06
   pidginlatexSF = pidginlatex; # added 2014-11-02
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
+  prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27
   qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
   QmidiNet = qmidinet;  # added 2016-05-22
   qt_gstreamer = qt-gstreamer;  # added 2017-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b16bd98ba1..a2c25b8a325 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11508,7 +11508,7 @@ with pkgs;
   prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-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 { };
+  prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { };
   prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };
   prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
 

From 1a2c7e563cabf703e5f7d54d215b19087fcf183e Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 28 Aug 2017 00:08:44 +0200
Subject: [PATCH 2797/3246] guitarix: 0.35.3 -> 0.35.6

---
 pkgs/applications/audio/guitarix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 6073008d541..b149aab06e1 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -12,11 +12,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.35.3";
+  version = "0.35.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
-    sha256 = "0pvw4ijkq6lcn45vrif9b4mqmgzi0qg1dp5b33kb5zan6n1aci4j";
+    sha256 = "0ffvfnvhj6vz73zsrpi88hs69ys4zskm847zf825dl2r39n9nn41";
   };
 
   nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];

From f01ea209e5314216f955d0ad8cdec7cd136bbc65 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 27 Aug 2017 23:46:42 +0200
Subject: [PATCH 2798/3246] yoshimi: 1.5.0 -> 1.5.3

---
 pkgs/applications/audio/yoshimi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index ef10bfed9b6..2b79718809f 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.5.0";
+  version = "1.5.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "10s1i18xlmvqfrnr0zn2mj2b28i7p62dlqzzzkmpaapqj1gsgpz5";
+    sha256 = "0sns35pyw2f74xrv1fxiyf9g9415kvh2rrbdjd60hsiv584nlari";
   };
 
   buildInputs = [

From 45971ebb3ec3c8109580f6fe4d875a800a3dea5a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 27 Aug 2017 23:34:02 +0200
Subject: [PATCH 2799/3246] Vee One Suite: 0.8.0 -> 0.8.4

---
 pkgs/applications/audio/drumkv1/default.nix |  4 ++--
 pkgs/applications/audio/padthv1/default.nix | 23 +++++++++++++++++++++
 pkgs/applications/audio/samplv1/default.nix |  4 ++--
 pkgs/applications/audio/synthv1/default.nix |  4 ++--
 pkgs/top-level/all-packages.nix             |  2 ++
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/audio/padthv1/default.nix

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 064feeb02a3..fb62b6ea3de 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.8.1";
+  version = "0.8.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "0l6kjb1q9vslwy56836a0c65mf8z8ycam5vzz3k4qvd8g74bs1zq";
+    sha256 = "0qqpklzy4wgw9jy0v2810j06712q90bwc69fp7da82536ba058a9";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
new file mode 100644
index 00000000000..820ff385c10
--- /dev/null
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftw }:
+
+stdenv.mkDerivation rec {
+  name = "padthv1-${version}";
+  version = "0.8.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/padthv1/${name}.tar.gz";
+    sha256 = "1p6wfgh90h7gj1j3hlvwik3zj07xamkxbya85va2lsj6fkkkk20r";
+  };
+
+  buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "polyphonic additive synthesizer";
+    homepage = http://padthv1.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 10f06e16cf4..1eb366d6bbd 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.8.0";
+  version = "0.8.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "0j3hkmd9q0bw9b7nk9cssqywlrishkd1n790a9vq6gh3pdc5sf3r";
+    sha256 = "107p2xsj066q2bil0xcgqrrn7lawp02wzf7qmlajcbnd79jhsi6i";
   };
 
   buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index c7932a132d7..2f5a4ebb43f 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.8.0";
+  version = "0.8.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "155pfyhr6d35ciw95pbxlqy7751cmij8j5d849rvblqbjzyzb5qx";
+    sha256 = "0awk2zx0xa6vl6ah24zz0k2mwsx50hh5g1rh32mp790fp4x7l5s8";
   };
 
   buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2c25b8a325..b77c37a2f58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3638,6 +3638,8 @@ with pkgs;
 
   packetdrill = callPackage ../tools/networking/packetdrill { };
 
+  padthv1 = callPackage ../applications/audio/padthv1 { };
+
   pakcs = callPackage ../development/compilers/pakcs {};
 
   pal = callPackage ../tools/misc/pal { };

From db59381a5d1781dcb3e72814caff408b194c5aac Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sun, 27 Aug 2017 23:08:18 +0200
Subject: [PATCH 2800/3246] ngrok: 1.7.1 -> 2.2.8, added ngrok1 1.1.7

ngrok now releases a proprietary version (2.x). 1.1.7 can still be used
with a self-hosted ngrokd, but it won't work out of the box.

Therefore ngrok 2.2.8 is now the default for the `ngrok` package and
ngrok 1.1.7 can be installed using the `ngrok1` package.
---
 pkgs/tools/networking/ngrok/default.nix       | 46 +++++++++----------
 pkgs/tools/networking/ngrok1/default.nix      | 31 +++++++++++++
 .../networking/{ngrok => ngrok1}/deps.nix     |  0
 pkgs/top-level/all-packages.nix               |  6 ++-
 4 files changed, 59 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/tools/networking/ngrok1/default.nix
 rename pkgs/tools/networking/{ngrok => ngrok1}/deps.nix (100%)

diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix
index e354ad223b8..031161da4d5 100644
--- a/pkgs/tools/networking/ngrok/default.nix
+++ b/pkgs/tools/networking/ngrok/default.nix
@@ -1,31 +1,31 @@
-{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }:
+{ stdenv, fetchurl, unzip }:
 
-buildGoPackage rec {
+stdenv.mkDerivation rec {
   name = "ngrok-${version}";
-  version = "1.7.1";
-  rev = "${version}";
+  version = "2.2.8";
 
-  goPackagePath = "ngrok";
+  src = if stdenv.system == "i686-linux" then fetchurl {
+    url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-i386.tgz";
+    sha256 = "0s5ymlaxrvm13q3mlvfirh74sx60qh56c5sgdma2r7q5qlsq41xg";
+  } else if stdenv.system == "x86_64-linux" then fetchurl {
+    url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.tgz";
+    sha256 = "1mn9iwgy6xzrjihikwc2k2j59igqmph0cwx17qp0ziap9lp5xxad";
+  } else throw "platform ${stdenv.system} not supported!";
 
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "inconshreveable";
-    repo = "ngrok";
-    sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4";
-  };
+  sourceRoot = ".";
 
-  goDeps = ./deps.nix;
-
-  buildInputs = [ go-bindata ];
-
-  preConfigure = ''
-    sed -e '/jteeuwen\/go-bindata/d' \
-        -e '/export GOPATH/d' \
-        -e 's/go get/#go get/' \
-        -e 's|bin/go-bindata|go-bindata|' -i Makefile
-    make assets BUILDTAGS=release
-    export sourceRoot=$sourceRoot/src/ngrok
+  installPhase = ''
+    install -D ngrok $out/bin/ngrok
   '';
 
-  buildFlags = [ "-tags release" ];
+  meta = with stdenv.lib; {
+    description = "ngrok";
+    longDescription = ''
+      Allows you to expose a web server running on your local machine to the internet.
+    '';
+    homepage = https://ngrok.com/;
+    license = stdenv.lib.licenses.unfree;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    maintainers = [ maintainers.bobvanderlinden ];
+  };
 }
diff --git a/pkgs/tools/networking/ngrok1/default.nix b/pkgs/tools/networking/ngrok1/default.nix
new file mode 100644
index 00000000000..32fe8db45e4
--- /dev/null
+++ b/pkgs/tools/networking/ngrok1/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "ngrok1-${version}";
+  version = "1.7.1";
+  rev = "${version}";
+
+  goPackagePath = "ngrok";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "inconshreveable";
+    repo = "ngrok";
+    sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4";
+  };
+
+  goDeps = ./deps.nix;
+
+  buildInputs = [ go-bindata ];
+
+  preConfigure = ''
+    sed -e '/jteeuwen\/go-bindata/d' \
+        -e '/export GOPATH/d' \
+        -e 's/go get/#go get/' \
+        -e 's|bin/go-bindata|go-bindata|' -i Makefile
+    make assets BUILDTAGS=release
+    export sourceRoot=$sourceRoot/src/ngrok
+  '';
+
+  buildFlags = [ "-tags release" ];
+}
diff --git a/pkgs/tools/networking/ngrok/deps.nix b/pkgs/tools/networking/ngrok1/deps.nix
similarity index 100%
rename from pkgs/tools/networking/ngrok/deps.nix
rename to pkgs/tools/networking/ngrok1/deps.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b77c37a2f58..a9a575e1e3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3418,7 +3418,11 @@ with pkgs;
 
   ngrep = callPackage ../tools/networking/ngrep { };
 
-  ngrok = callPackage ../tools/networking/ngrok { };
+  ngrok = ngrok2;
+
+  ngrok2 = callPackage ../tools/networking/ngrok { };
+
+  ngrok1 = callPackage ../tools/networking/ngrok1 { };
 
   noice = callPackage ../applications/misc/noice { };
 

From e531f92b249fe2c58b8c94717c566c8bc837ca41 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sun, 27 Aug 2017 23:26:14 +0200
Subject: [PATCH 2801/3246] ngrok: use proper attribute names

---
 pkgs/tools/networking/{ngrok1 => ngrok-1}/default.nix | 2 +-
 pkgs/tools/networking/{ngrok1 => ngrok-1}/deps.nix    | 0
 pkgs/tools/networking/{ngrok => ngrok-2}/default.nix  | 0
 pkgs/top-level/all-packages.nix                       | 6 +++---
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/tools/networking/{ngrok1 => ngrok-1}/default.nix (95%)
 rename pkgs/tools/networking/{ngrok1 => ngrok-1}/deps.nix (100%)
 rename pkgs/tools/networking/{ngrok => ngrok-2}/default.nix (100%)

diff --git a/pkgs/tools/networking/ngrok1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix
similarity index 95%
rename from pkgs/tools/networking/ngrok1/default.nix
rename to pkgs/tools/networking/ngrok-1/default.nix
index 32fe8db45e4..e354ad223b8 100644
--- a/pkgs/tools/networking/ngrok1/default.nix
+++ b/pkgs/tools/networking/ngrok-1/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "ngrok1-${version}";
+  name = "ngrok-${version}";
   version = "1.7.1";
   rev = "${version}";
 
diff --git a/pkgs/tools/networking/ngrok1/deps.nix b/pkgs/tools/networking/ngrok-1/deps.nix
similarity index 100%
rename from pkgs/tools/networking/ngrok1/deps.nix
rename to pkgs/tools/networking/ngrok-1/deps.nix
diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok-2/default.nix
similarity index 100%
rename from pkgs/tools/networking/ngrok/default.nix
rename to pkgs/tools/networking/ngrok-2/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9a575e1e3e..dddbdd7174b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3418,11 +3418,11 @@ with pkgs;
 
   ngrep = callPackage ../tools/networking/ngrep { };
 
-  ngrok = ngrok2;
+  ngrok = ngrok-2;
 
-  ngrok2 = callPackage ../tools/networking/ngrok { };
+  ngrok-2 = callPackage ../tools/networking/ngrok-2 { };
 
-  ngrok1 = callPackage ../tools/networking/ngrok1 { };
+  ngrok-1 = callPackage ../tools/networking/ngrok-1 { };
 
   noice = callPackage ../applications/misc/noice { };
 

From e04772230b0c02819d52fac6fc7be8938d2f8314 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 02:54:08 +0200
Subject: [PATCH 2802/3246] bitkeeper: mark as broken

---
 pkgs/applications/version-management/bitkeeper/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix
index 86e555a989c..d8597913c24 100644
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
     license     = stdenv.lib.licenses.asl20;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ wscott thoughtpolice ];
+    broken      = true; # seems to fail on recent glibc versions
   };
 }

From fa7d449faab706417e6ddcc91c49db61a30a07b9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 03:26:10 +0200
Subject: [PATCH 2803/3246] bruteforce-luks: 1.2.1 -> 1.3.1

---
 pkgs/tools/security/bruteforce-luks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix
index 85773953af0..7b505722efa 100644
--- a/pkgs/tools/security/bruteforce-luks/default.nix
+++ b/pkgs/tools/security/bruteforce-luks/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "bruteforce-luks-${version}";
-  version = "1.2.1";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
-    sha256 = "1i3qr2qgqdx3a5kjl0wrjh9kw8fx2indrj57z6911nx747pmda0n";
+    sha256 = "14ckm31wbzf3lnk472bywjjlh9kysb793nsh2gp04aa5hp5lym58";
     rev = version;
     repo = "bruteforce-luks";
     owner = "glv2";

From a160f34823abeb10e2bc857ffedb8bcb4cd09ccf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 03:34:42 +0200
Subject: [PATCH 2804/3246] xar: 1.5.2 -> 1.6.1

---
 pkgs/tools/compression/xar/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix
index 0bb4a1fb2ae..c62eead3cb7 100644
--- a/pkgs/tools/compression/xar/default.nix
+++ b/pkgs/tools/compression/xar/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, libxml2, openssl, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.2";
+  version = "1.6.1";
   name    = "xar-${version}";
 
   src = fetchurl {
-    url    = "https://xar.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1rp3va6akzlh35yqrapfqnbxaxa0zi8wyr93swbapprwh215cpac";
+    url    = "https://github.com/downloads/mackyle/xar/${name}.tar.gz";
+    sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf";
   };
 
   buildInputs = [ libxml2 openssl zlib bzip2 ];
 
   meta = {
-    homepage    = https://code.google.com/p/xar/;
+    homepage    = https://mackyle.github.io/xar/;
     description = "Extensible Archiver";
 
     longDescription =

From 2d44bf1c9b064b00e2465dbe99b6789682da576e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 03:40:38 +0200
Subject: [PATCH 2805/3246] xdo: 0.5.5 -> 0.5.6

---
 pkgs/tools/misc/xdo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix
index 72b42cdc3b9..b3c97207b1d 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/pkgs/tools/misc/xdo/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, libxcb, xcbutilwm }:
+{ stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm }:
 
 stdenv.mkDerivation rec {
    name = "xdo-${version}";
-   version = "0.5.5";
+   version = "0.5.6";
 
    src = fetchFromGitHub {
      owner = "baskerville";
      repo = "xdo";
      rev = version;
-     sha256 = "17i7ym4jrrbsiqs0jnm6k49hp9qn32hswad4j0lavwgv4wawachz";
+     sha256 = "1i8xlsp36ji7cvyh66ajqsf59hxpwm0xvnn9laq7nbajcx3qqlnh";
    };
-   
+
    makeFlags = "PREFIX=$(out)";
 
-   buildInputs = [ libxcb xcbutilwm ];
+   buildInputs = [ libxcb xcbutilwm xcbutil ];
 
    meta = with stdenv.lib; {
      description = "Small X utility to perform elementary actions on windows";

From 4d10bb5efce42b48704c873d46c9f0d0fec63742 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 03:43:19 +0200
Subject: [PATCH 2806/3246] xfstools: remove unused patch

---
 .../xfsprogs/4.3.0-sharedlibs.patch           | 89 -------------------
 1 file changed, 89 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch

diff --git a/pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch b/pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch
deleted file mode 100644
index 622708f7b9c..00000000000
--- a/pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- xfsprogs-4.3.0/include/buildmacros
-+++ xfsprogs-4.3.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
--	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
--	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
--	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
--	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
--	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
--	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
--		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
--		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
--		../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
--	fi
-+	set -e; cd $(TOPDIR)/$(LIBNAME); \
-+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-4.3.0/libxcmd/Makefile
-+++ xfsprogs-4.3.0/libxcmd/Makefile
-@@ -34,6 +34,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
---- xfsprogs-4.3.0/libxfs/Makefile
-+++ xfsprogs-4.3.0/libxfs/Makefile
-@@ -138,6 +138,7 @@
- 
- install-dev: install
- 	$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+	$(INSTALL_LTLIB_DEV)
- 
- # We need to install the headers before building the dependencies.  If we
- # include the .ltdep file, the makefile decides that it needs to build the
---- xfsprogs-4.3.0/libxlog/Makefile
-+++ xfsprogs-4.3.0/libxlog/Makefile
-@@ -12,6 +12,8 @@
- 
- CFILES = xfs_log_recover.c util.c
- 
-+LTLIBS = $(LIBUUID) $(LIBXFS)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
- 
-@@ -19,6 +21,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
---- xfsprogs-4.3.0/quota/Makefile
-+++ xfsprogs-4.3.0/quota/Makefile
-@@ -16,7 +16,6 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
- 
- LLDLIBS = $(LIBXCMD)
- LTDEPENDENCIES = $(LIBXCMD)
--LLDFLAGS = -static
- 
- ifeq ($(ENABLE_READLINE),yes)
- LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
---- xfsprogs-4.3.0/mdrestore/Makefile
-+++ xfsprogs-4.3.0/mdrestore/Makefile
-@@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c
- 
- LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID)
- LTDEPENDENCIES = $(LIBXFS)
--LLDFLAGS = -static
- 
- default: depend $(LTCOMMAND)
- 

From fd51e28b88e89e0410670be07159b3ccc92ece54 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 03:47:42 +0200
Subject: [PATCH 2807/3246] xlockmore: 5.54 -> 5.55

---
 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 f87e24efe18..998e4055464 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
 , libX11, libXext, libXinerama, libXdmcp, libXt }:
 
 stdenv.mkDerivation rec {
+  name = "xlockmore-5.55";
 
-  name = "xlockmore-5.54";
   src = fetchurl {
     url = "http://sillycycle.com/xlock/${name}.tar.xz";
-    sha256 = "0mdgl20619iii1i04pj2dq29nwvasbngy48cvd819h0wfawsqkwz";
+    sha256 = "1y3f76rq2nd10fgi2rx81aj6pijglmm661vjsxi05hpg35dzmwfl";
     curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 

From aa1b75ef918239ae3adff948037c9f2fd553b0c3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 03:49:58 +0200
Subject: [PATCH 2808/3246] xl2tpd: 1.3.7 -> 1.3.10

---
 pkgs/tools/networking/xl2tpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix
index c032ee7dd6b..e50f208e95f 100644
--- a/pkgs/tools/networking/xl2tpd/default.nix
+++ b/pkgs/tools/networking/xl2tpd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xl2tpd-${version}";
-  version = "1.3.7";
+  version = "1.3.10";
 
   src = fetchFromGitHub {
     owner = "xelerance";
     repo = "xl2tpd";
     rev = "v${version}";
-    sha256 = "0wjkj2b5rkxhx522wmkml5s0zdp68hkvrh7npx839dvsr79fji7k";
+    sha256 = "1z8a33hz82nla1342lfxdihssbhw9lzkgavdhl275im5byj8qgkg";
   };
 
   buildInputs = [ libpcap ];

From cf7a4ef6daaf44902407fc416601e364765e9d11 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 03:57:15 +0200
Subject: [PATCH 2809/3246] xterm: 327 -> 330

---
 pkgs/applications/misc/xterm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 22e0466df36..9e64557838e 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-327";
+  name = "xterm-330";
 
   src = fetchurl {
-    url = "ftp://invisible-island.net/xterm/${name}.tgz";
-    sha256 = "02qmfr1y24y5vq6kddksw84b8gxalc96n9wwaj7i8hmk6mn2zyv6";
+    url = "http://invisible-mirror.net/archives/xterm/${name}.tgz";
+    sha256 = "1psnfmqd23v9gxj8a98nzrgvymrk0p1whwqi92gy15bbkzrgkvks";
   };
 
   buildInputs =

From d5680983dcd71d8bbb19b76d52a125c90c1aa134 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 04:11:38 +0200
Subject: [PATCH 2810/3246] xdg_utils: 1.1.1 -> 1.1.2

---
 pkgs/tools/X11/xdg-utils/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index a1d3a059a83..717ad327c67 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -17,11 +17,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "xdg-utils-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "https://portland.freedesktop.org/download/${name}.tar.gz";
-    sha256 = "09a1pk3ifsndc5qz2kcd1557i137gpgnv3d739pv22vfayi67pdh";
+    sha256 = "1k4b4m3aiyqn9k12a0ihcdahzlspl3zhskmm1d7228dvqvi546cm";
   };
 
   # just needed when built from git
@@ -46,6 +46,9 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/xdg-mime \
       --replace "/usr/bin/file" "${file}/bin/file"
 
+    substituteInPlace $out/bin/xdg-email \
+      --replace "/bin/echo" "${coreutils}/bin/echo"
+
     sed 's# which # type -P #g' -i "$out"/bin/*
   '';
 

From 7d48dc39f61287927c14e6c856bb24f81478892c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 04:20:21 +0200
Subject: [PATCH 2811/3246] wireless-regdb: 2016-06-16 -> 2017.03.07

---
 pkgs/data/misc/wireless-regdb/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index 3aae3adf2a8..b69762d933f 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
-  version = "2016-06-10";
+  version = "2017.03.07";
 
-  src = fetchgit {
-    sha256 = "0im9likzpziircl96pql2jpyl8pfcqc5v0wgqy705j4ga5sx8pmn";
-    url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;
-    rev = "refs/tags/master-${version}";
+  src = fetchurl {
+    url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz";
+    sha256 = "1f9mcp78sdd4sci6v32vxfcl1rfjpv205jisz1p93kkfnaisy7ip";
   };
 
-  phases = [ "unpackPhase" "installPhase" ];
+  dontBuild = true;
 
   makeFlags = [
     "DESTDIR=$(out)"
@@ -22,6 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://wireless.kernel.org/en/developers/Regulatory/;
     license = licenses.isc;
     platforms = platforms.all;
-    maintainers = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx fpletz ];
   };
 }

From b06231c01bd1e48ad31df4b727a6dd844595488a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 04:21:55 +0200
Subject: [PATCH 2812/3246] wolfssl: 3.11.0 -> 3.12.0

---
 pkgs/development/libraries/wolfssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 0f1f87b9bd6..fdbef27705e 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.11.0";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     rev = "v${version}-stable";
-    sha256 = "0s4s9adni2q1sgqpavbmxhkl8i98bmlw6gla6dnifgsm1dirv75w";
+    sha256 = "0bjfzpgj50cd27lfz6vry9bdz0f0kvgq8plqdbhlk7kjp32nm2bv";
   };
 
   outputs = [ "out" "dev" "doc" "lib" ];

From 26f10adfa932cac91b180c57bb084096ff98c66f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 04:24:06 +0200
Subject: [PATCH 2813/3246] xdg-user-dirs: 0.15 -> 0.16

---
 pkgs/tools/X11/xdg-user-dirs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
index 8829427b79c..0af94531753 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xdg-user-dirs-0.15";
-  
+  name = "xdg-user-dirs-0.16";
+
   src = fetchurl {
     url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786";
+    sha256 = "1rp3c94hxjlfsryvwajklynfnrcvxplhwnjqc7395l89i0nb83vp";
   };
 
   buildInputs = [ libxslt docbook_xsl makeWrapper ];

From 80848ce10d03c4462a3353299db4a98e0b87fcc9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 27 Aug 2017 04:47:22 +0200
Subject: [PATCH 2814/3246] bro: 2.5 -> 2.5.1

---
 pkgs/applications/networking/ids/bro/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 4117d409b93..f3962811a8a 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -1,20 +1,21 @@
 {stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl
-, geoip, gperftools, python }:
+, geoip, gperftools, python, swig }:
 
 stdenv.mkDerivation rec {
-  name = "bro-2.5";
+  name = "bro-2.5.1";
 
   src = fetchurl {
     url = "http://www.bro.org/downloads/${name}.tar.gz";
-    sha256 = "10603lwhwsmh08m5rgknbspbhd4lis71qv7z8ixacgv6sf8a40hm";
+    sha256 = "04cmm0vs8q31mgaq3pxybjk834py3ji16qp4qcir7vjbhq1fav1c";
   };
 
-  buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools python ];
+  nativeBuildInputs = [ cmake flex bison file ];
+  buildInputs = [ openssl libpcap perl zlib curl geoip gperftools python swig ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    description = "Powerful network analysis framework that is much different from the typical IDS you may know";
+    description = "Powerful network analysis framework much different from a typical IDS";
     homepage = https://www.bro.org/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ pSub ];

From c91fe60d0097a3e29bd89fbee2ec7a6c6f209b00 Mon Sep 17 00:00:00 2001
From: "Samuel W. Flint" <swflint@flintfam.org>
Date: Sun, 27 Aug 2017 16:28:11 -0500
Subject: [PATCH 2815/3246] git-fire: Init at master as of 2017-08-27 14:30 CST

---
 pkgs/tools/misc/git-fire/default.nix | 33 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/misc/git-fire/default.nix

diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix
new file mode 100644
index 00000000000..2d506f4c8ca
--- /dev/null
+++ b/pkgs/tools/misc/git-fire/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "git-fire-unstable-2017-08-27";
+
+  src = fetchFromGitHub {
+    owner = "qw3rtman";
+    repo = "git-fire";
+    rev = "d72b68ed356f726c77c60294f9220275f16c9931";
+    sha256 = "1hdwkhyjjx31y0lpjkhbb4f5y9f7g70fnd4c2246cmk2rbsvj5b2";
+  };
+  
+  unpackPhase = ":";
+  
+  installPhase = ''
+    mkdir -p $out/bin 
+    cp $src/git-fire $out/bin
+    chmod +x $out/bin/git-fire
+  '';
+  
+  meta = with stdenv.lib; {
+    description = ''
+      Push ALL changes in a git repository
+    '';
+    longDescription = ''
+      In the event of an emergency (fire, etc.), automatically commit all changes/files in a repository, pushing to all known remotes all commits and stashes.
+    '';
+    homepage = "https://github.com/qw3rtman/git-fire";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.swflint ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b16bd98ba1..0092d149a56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -571,6 +571,8 @@ with pkgs;
 
   genymotion = callPackage ../development/mobile/genymotion { };
 
+  git-fire = callPackage ../tools/misc/git-fire { };
+
   grc = callPackage ../tools/misc/grc { };
 
   green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {

From 3b6eb933ccef33718045b3d77538b376dab5197f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 06:55:30 +0100
Subject: [PATCH 2816/3246] python.pkgs.oger: remove

seems to unmaintained since 2012 and test suite indicates
incompatibilities with recent version of numpy

cc @nico202
---
 pkgs/top-level/python-packages.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c6cdcd5faa..ea1a97ac233 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7385,23 +7385,6 @@ in {
     };
   };
 
-  oger = buildPythonPackage rec {
-    name = "oger-${version}";
-    version = "1.1.3";
-    src = pkgs.fetchurl {
-      url = "http://organic.elis.ugent.be/sites/organic.elis.ugent.be/files/Oger-${version}.tar.gz";
-      sha256 = "1k02ys812lz0x0yymljp102amkm8bvfgqsrphnk235xbcrb0akg5";
-    };
-
-    propagatedBuildInputs = with self; [ MDP scipy numpy matplotlib ];
-
-    meta = {
-      homepage = http://organic.elis.ugent.be/organic/engine;
-      description = "Rapidly build, train, and evalue modular learning architectures";
-      maintainers = with maintainers; [ nico202 ];
-      license = licenses.lgpl3;
-    };
-  };
 
   pamela = buildPythonPackage rec {
     name = "pamela-${version}";

From 27ac74daa58667adff7b93eba8f6f157597137ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 07:27:59 +0100
Subject: [PATCH 2817/3246] mitmproxy: fix tests

---
 pkgs/tools/networking/mitmproxy/default.nix   | 24 ++++++++++++++-----
 .../networking/mitmproxy/tornado-4.6.patch    | 11 +++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/networking/mitmproxy/tornado-4.6.patch

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 7d36b6b4ac7..5259f246012 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -13,14 +13,25 @@ python3Packages.buildPythonPackage rec {
   };
 
   patches = [
-    # Bump pyopenssl dependency
-    # https://github.com/mitmproxy/mitmproxy/pull/2252
+    # fix tests
     (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/mitmproxy/mitmproxy/pull/2252.patch";
-      sha256 = "1smld21df79249qbh412w8gi2agcf4zjhxnlawy19yjl1fk2h67c";
+      url = "https://github.com/mitmproxy/mitmproxy/commit/b3525570929ba47c10d9d08696876c39487f7000.patch";
+      sha256 = "111fld5gqdii7rs1jhqaqrxgbyhfn6qd0y7l15k4npamsnvdnv20";
     })
+    # bump pyOpenSSL
+    (fetchpatch {
+      url = https://github.com/mitmproxy/mitmproxy/commit/6af72160bf98b58682b8f9fc5aabf51928d2b1d3.patch;
+      sha256 = "1q4ml81pq9c8j9iscq8janbxf4s37w3bqskbs6r30yqzy63v54f2";
+    })
+    # https://github.com/mitmproxy/mitmproxy/commit/3d7cde058b7e6242d93b9bc9d3e17520ffb578a5
+    ./tornado-4.6.patch
   ];
 
+  checkPhase = ''
+    export HOME=$(mktemp -d)
+    LC_CTYPE=en_US.UTF-8 python setup.py pytest
+  '';
+
   propagatedBuildInputs = with python3Packages; [
     blinker click certifi construct cryptography
     cssutils editorconfig h2 html2text hyperframe
@@ -29,8 +40,9 @@ python3Packages.buildPythonPackage rec {
     urwid watchdog brotlipy sortedcontainers
   ];
 
-  # Tests fail due to an error with a decorator
-  doCheck = false;
+  buildInputs = with python3Packages; [
+    beautifulsoup4 flask pytz pytest pytestrunner protobuf3_2
+  ];
 
   meta = with stdenv.lib; {
     description = "Man-in-the-middle proxy";
diff --git a/pkgs/tools/networking/mitmproxy/tornado-4.6.patch b/pkgs/tools/networking/mitmproxy/tornado-4.6.patch
new file mode 100644
index 00000000000..879b8a4c379
--- /dev/null
+++ b/pkgs/tools/networking/mitmproxy/tornado-4.6.patch
@@ -0,0 +1,11 @@
+--- mitmproxy-v2.0.2-src.org/setup.py	2017-08-28 07:31:51.727424688 +0100
++++ mitmproxy-v2.0.2-src/setup.py	2017-08-28 07:35:55.608919302 +0100
+@@ -78,7 +78,7 @@
+         "pyperclip>=1.5.22, <1.6",
+         "requests>=2.9.1, <3",
+         "ruamel.yaml>=0.13.2, <0.14",
+-        "tornado>=4.3, <4.5",
++        "tornado>=4.3, <4.6",
+         "urwid>=1.3.1, <1.4",
+         "watchdog>=0.8.3, <0.9",
+         "brotlipy>=0.5.1, <0.7",

From def7badb3167e592dc3be6d79fa6b02b227d5ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 07:53:33 +0100
Subject: [PATCH 2818/3246] python.pkgs.pyramid_beaker: fix tests

---
 .../python-modules/pyramid_beaker/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +------------
 2 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyramid_beaker/default.nix

diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix
new file mode 100644
index 00000000000..517f068edd9
--- /dev/null
+++ b/pkgs/development/python-modules/pyramid_beaker/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pyramid_beaker";
+  version = "0.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
+  };
+
+  checkPhase = ''
+    # https://github.com/Pylons/pyramid_beaker/issues/29
+    py.test -k 'not test_includeme'
+  '';
+
+  buildInputs = [ pytest ];
+
+  propagatedBuildInputs = [ beaker pyramid ];
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea1a97ac233..d7a965315f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7971,23 +7971,7 @@ in {
 
   };
 
-
-  pyramid_beaker = buildPythonPackage rec {
-    name = "pyramid_beaker-0.8";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyramid_beaker/${name}.tar.gz";
-      sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
-    };
-
-    propagatedBuildInputs = with self; [ beaker pyramid ];
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-      platforms = platforms.all;
-    };
-  };
-
+  pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { };
 
   pyramid_chameleon = buildPythonPackage rec {
     name = "pyramid_chameleon-0.3";

From a7ddca6e3dce865a6a07cbdaea3963026b7bb3d3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 28 Aug 2017 09:42:59 +0200
Subject: [PATCH 2819/3246] python 3.4, 3.5, 3.6: Don't use ldconfig and speed
 up uuid load, fixes #28349

These patches had already been merged for 3.5 and 3.6 but not yet for
3.4. However, they did contain a mistake as explained in #28349.
---
 .../python/cpython/3.4/default.nix            |   4 +
 .../python/cpython/3.4/no-ldconfig.patch      | 147 ++++++++++++++++++
 .../python/cpython/3.5/no-ldconfig.patch      |  20 +--
 .../python/cpython/3.6/no-ldconfig.patch      |  20 +--
 4 files changed, 171 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 5799e319ba0..d00b91f316f 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -64,6 +64,10 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
+  patches = [
+    ./no-ldconfig.patch
+  ];
+
   postPatch = ''
     # Determinism
     substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
diff --git a/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
new file mode 100644
index 00000000000..3cb77a10725
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
@@ -0,0 +1,147 @@
+From 81bd99ad9058feb1d0361bc8862e8567c21a6142 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Mon, 28 Aug 2017 09:24:06 +0200
+Subject: [PATCH] Don't use ldconfig and speed up uuid load
+
+---
+ Lib/ctypes/util.py | 52 ++--------------------------------------------------
+ Lib/uuid.py        | 50 ++------------------------------------------------
+ 2 files changed, 4 insertions(+), 98 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 595113bffd..780cd5d21b 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -88,28 +88,7 @@ elif os.name == "posix":
+     import re, tempfile
+ 
+     def _findLib_gcc(name):
+-        expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
+-        fdout, ccout = tempfile.mkstemp()
+-        os.close(fdout)
+-        cmd = 'if type gcc >/dev/null 2>&1; then CC=gcc; elif type cc >/dev/null 2>&1; then CC=cc;else exit 10; fi;' \
+-              'LANG=C LC_ALL=C $CC -Wl,-t -o ' + ccout + ' 2>&1 -l' + name
+-        try:
+-            f = os.popen(cmd)
+-            try:
+-                trace = f.read()
+-            finally:
+-                rv = f.close()
+-        finally:
+-            try:
+-                os.unlink(ccout)
+-            except FileNotFoundError:
+-                pass
+-        if rv == 10:
+-            raise OSError('gcc or cc command not found')
+-        res = re.search(expr, trace)
+-        if not res:
+-            return None
+-        return res.group(0)
++        return None
+ 
+ 
+     if sys.platform == "sunos5":
+@@ -200,34 +179,7 @@ elif os.name == "posix":
+     else:
+ 
+         def _findSoname_ldconfig(name):
+-            import struct
+-            if struct.calcsize('l') == 4:
+-                machine = os.uname().machine + '-32'
+-            else:
+-                machine = os.uname().machine + '-64'
+-            mach_map = {
+-                'x86_64-64': 'libc6,x86-64',
+-                'ppc64-64': 'libc6,64bit',
+-                'sparc64-64': 'libc6,64bit',
+-                's390x-64': 'libc6,64bit',
+-                'ia64-64': 'libc6,IA-64',
+-                }
+-            abi_type = mach_map.get(machine, 'libc6')
+-
+-            # XXX assuming GLIBC's ldconfig (with option -p)
+-            regex = os.fsencode(
+-                '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type))
+-            try:
+-                with subprocess.Popen(['/sbin/ldconfig', '-p'],
+-                                      stdin=subprocess.DEVNULL,
+-                                      stderr=subprocess.DEVNULL,
+-                                      stdout=subprocess.PIPE,
+-                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+-                    res = re.search(regex, p.stdout.read())
+-                    if res:
+-                        return os.fsdecode(res.group(1))
+-            except OSError:
+-                pass
++            return None
+ 
+         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 1061bffc43..846f5819f5 100644
+--- a/Lib/uuid.py
++++ b/Lib/uuid.py
+@@ -451,57 +451,11 @@ def _netbios_getnode():
+         return ((bytes[0]<<40) + (bytes[1]<<32) + (bytes[2]<<24) +
+                 (bytes[3]<<16) + (bytes[4]<<8) + bytes[5])
+ 
+-# 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.
+-# XXX This makes the module non-thread-safe!
+ _uuid_generate_random = _uuid_generate_time = _UuidCreate = None
+-try:
+-    import ctypes, ctypes.util
+ 
+-    # The uuid_generate_* routines are provided by libuuid on at least
+-    # Linux and FreeBSD, and provided by libc on Mac OS X.
+-    for libname in ['uuid', 'c']:
+-        try:
+-            lib = ctypes.CDLL(ctypes.util.find_library(libname))
+-        except:
+-            continue
+-        if hasattr(lib, 'uuid_generate_random'):
+-            _uuid_generate_random = lib.uuid_generate_random
+-        if hasattr(lib, 'uuid_generate_time'):
+-            _uuid_generate_time = lib.uuid_generate_time
+-            if _uuid_generate_random is not None:
+-                break  # found everything we were looking for
+-
+-    # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
+-    # in issue #8621 the function generates the same sequence of values
+-    # in the parent process and all children created using fork (unless
+-    # those children use exec as well).
+-    #
+-    # Assume that the uuid_generate functions are broken from 10.5 onward,
+-    # the test can be adjusted when a later version is fixed.
+-    import sys
+-    if sys.platform == 'darwin':
+-        import os
+-        if int(os.uname().release.split('.')[0]) >= 9:
+-            _uuid_generate_random = _uuid_generate_time = None
+-
+-    # On Windows prior to 2000, UuidCreate gives a UUID containing the
+-    # hardware address.  On Windows 2000 and later, UuidCreate makes a
+-    # random UUID and UuidCreateSequential gives a UUID containing the
+-    # hardware address.  These routines are provided by the RPC runtime.
+-    # NOTE:  at least on Tim's WinXP Pro SP2 desktop box, while the last
+-    # 6 bytes returned by UuidCreateSequential are fixed, they don't appear
+-    # to bear any relationship to the MAC address of any network device
+-    # on the box.
+-    try:
+-        lib = ctypes.windll.rpcrt4
+-    except:
+-        lib = None
+-    _UuidCreate = getattr(lib, 'UuidCreateSequential',
+-                          getattr(lib, 'UuidCreate', None))
+-except:
+-    pass
++_uuid_generate_time = _UuidCreate = None
++
+ 
+ def _unixdll_getnode():
+     """Get the hardware address on Unix using ctypes."""
+-- 
+2.14.1
+
diff --git a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
index c96de5d0e91..9718b1d8dce 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
+++ b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
@@ -1,12 +1,12 @@
-From f0ed87f4066296b7aa3c095d04672c138506fa45 Mon Sep 17 00:00:00 2001
+From 590c46bb04f79ab611b2f8fd682dd7e43a01f268 Mon Sep 17 00:00:00 2001
 From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Sat, 29 Jul 2017 20:33:56 +0200
+Date: Mon, 28 Aug 2017 09:24:06 +0200
 Subject: [PATCH] Don't use ldconfig and speed up uuid load
 
 ---
  Lib/ctypes/util.py | 70 ++----------------------------------------------------
- Lib/uuid.py        | 52 ----------------------------------------
- 2 files changed, 2 insertions(+), 120 deletions(-)
+ Lib/uuid.py        | 49 --------------------------------------
+ 2 files changed, 2 insertions(+), 117 deletions(-)
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
 index 7684eab81d..e9957d7951 100644
@@ -97,22 +97,22 @@ index 7684eab81d..e9957d7951 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 e96e7e034c..a099ab4b4a 100644
+index e96e7e034c..31160ace95 100644
 --- a/Lib/uuid.py
 +++ b/Lib/uuid.py
-@@ -455,58 +455,6 @@ def _netbios_getnode():
+@@ -455,58 +455,9 @@ def _netbios_getnode():
              continue
          return int.from_bytes(bytes, 'big')
  
 -# 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.
 -# XXX This makes the module non-thread-safe!
--_uuid_generate_time = _UuidCreate = None
+ _uuid_generate_time = _UuidCreate = None
 -try:
 -    import ctypes, ctypes.util
 -    import sys
--
+ 
 -    # The uuid_generate_* routines are provided by libuuid on at least
 -    # Linux and FreeBSD, and provided by libc on Mac OS X.
 -    _libnames = ['uuid']
@@ -160,5 +160,5 @@ index e96e7e034c..a099ab4b4a 100644
  def _unixdll_getnode():
      """Get the hardware address on Unix using ctypes."""
 -- 
-2.13.3
+2.14.1
 
diff --git a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
index da6afe04d6e..0f829860a5b 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
+++ b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
@@ -1,12 +1,12 @@
-From a831df344ec1c883a0ef04d8cc8f5c53a942f6de Mon Sep 17 00:00:00 2001
+From 105621b99cc30615c79b5aa3d12d6732e14b0d59 Mon Sep 17 00:00:00 2001
 From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Sat, 29 Jul 2017 20:17:40 +0200
+Date: Mon, 28 Aug 2017 09:24:06 +0200
 Subject: [PATCH] Don't use ldconfig and speed up uuid load
 
 ---
  Lib/ctypes/util.py | 70 ++----------------------------------------------------
- Lib/uuid.py        | 51 ---------------------------------------
- 2 files changed, 2 insertions(+), 119 deletions(-)
+ Lib/uuid.py        | 48 -------------------------------------
+ 2 files changed, 2 insertions(+), 116 deletions(-)
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
 index 339ae8aa8a..2944985c30 100644
@@ -97,22 +97,22 @@ index 339ae8aa8a..2944985c30 100644
          def _findLib_ld(name):
              # See issue #9998 for why this is needed
 diff --git a/Lib/uuid.py b/Lib/uuid.py
-index 200c800b34..a099ab4b4a 100644
+index 200c800b34..31160ace95 100644
 --- a/Lib/uuid.py
 +++ b/Lib/uuid.py
-@@ -455,57 +455,6 @@ def _netbios_getnode():
+@@ -455,57 +455,9 @@ def _netbios_getnode():
              continue
          return int.from_bytes(bytes, 'big')
  
 -# 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.
 -# XXX This makes the module non-thread-safe!
--_uuid_generate_time = _UuidCreate = None
+ _uuid_generate_time = _UuidCreate = None
 -try:
 -    import ctypes, ctypes.util
 -    import sys
--
+ 
 -    # The uuid_generate_* routines are provided by libuuid on at least
 -    # Linux and FreeBSD, and provided by libc on Mac OS X.
 -    _libnames = ['uuid']
@@ -159,5 +159,5 @@ index 200c800b34..a099ab4b4a 100644
  def _unixdll_getnode():
      """Get the hardware address on Unix using ctypes."""
 -- 
-2.13.3
+2.14.1
 

From 94351197cd40d7e2d22e8a971e888b8333764cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 24 Aug 2017 17:38:28 +0200
Subject: [PATCH 2820/3246] cpython: include test.support and test.regrtest

test.{support, regrtest} are the internal packages cpython
developers use to write tests.
Although they are not public and the API may change/break
some developers use these packages to write tests for their
(3rd party) software.
The derivations for cpython now only remove the actual tests
but leave the packages in place that are used to write them.

Discussion: https://github.com/NixOS/nixpkgs/pull/28540
---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 ++-
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 5 ++++-
 pkgs/development/interpreters/python/cpython/3.5/default.nix | 5 ++++-
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 5 ++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index fd3c63de1e7..f601fbc9808 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -162,7 +162,8 @@ in stdenv.mkDerivation {
         # needed for some packages, especially packages that backport
         # functionality to 2.x from 3.x
         for item in $out/lib/python${majorVersion}/test/*; do
-          if [[ "$item" != */test_support.py* ]]; then
+          if [[ "$item" != */test_support.py*
+             && "$item" != */regrtest.py* ]]; then
             rm -rf "$item"
           else
             echo $item
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index d00b91f316f..3b375e147bc 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -111,7 +111,10 @@ in stdenv.mkDerivation {
     # needed for some packages, especially packages that backport functionality
     # to 2.x from 3.x
     for item in $out/lib/python${majorVersion}/test/*; do
-      if [[ "$item" != */test_support.py* ]]; then
+      if [[ "$item" != */test_support.py*
+         && "$item" != */test/support
+         && "$item" != */test/libregrtest
+         && "$item" != */test/regrtest.py* ]]; then
         rm -rf "$item"
       else
         echo $item
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 1b71dba42c4..ed1170427c0 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -105,7 +105,10 @@ in stdenv.mkDerivation {
     # needed for some packages, especially packages that backport functionality
     # to 2.x from 3.x
     for item in $out/lib/python${majorVersion}/test/*; do
-      if [[ "$item" != */test_support.py* ]]; then
+      if [[ "$item" != */test_support.py*
+         && "$item" != */test/support
+         && "$item" != */test/libregrtest
+         && "$item" != */test/regrtest.py* ]]; then
         rm -rf "$item"
       else
         echo $item
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 0b0f9c8be6a..127c093501c 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -105,7 +105,10 @@ in stdenv.mkDerivation {
     # needed for some packages, especially packages that backport functionality
     # to 2.x from 3.x
     for item in $out/lib/python${majorVersion}/test/*; do
-      if [[ "$item" != */test_support.py* ]]; then
+      if [[ "$item" != */test_support.py*
+         && "$item" != */test/support
+         && "$item" != */test/libregrtest
+         && "$item" != */test/regrtest.py* ]]; then
         rm -rf "$item"
       else
         echo $item

From b24099cb176b3fc1737c53afa24523cab483eaa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 09:02:19 +0100
Subject: [PATCH 2821/3246] pythonPackages.keystoneclient: fix build

---
 .../python-modules/keystoneclient/default.nix | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 38 +-------------
 2 files changed, 53 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/development/python-modules/keystoneclient/default.nix

diff --git a/pkgs/development/python-modules/keystoneclient/default.nix b/pkgs/development/python-modules/keystoneclient/default.nix
new file mode 100644
index 00000000000..5b09992295f
--- /dev/null
+++ b/pkgs/development/python-modules/keystoneclient/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python
+
+, pbr, testtools, testresources, testrepository
+, requests-mock, fixtures, openssl, oslotest, pep8
+
+, oslo-serialization, oslo-config, oslo-i18n, oslo-utils
+, Babel, prettytable, requests, six, iso8601, stevedore
+, netaddr, debtcollector, bandit, webob, mock, pycrypto
+}:
+
+buildPythonPackage rec {
+  name = "keystoneclient-${version}";
+  version = "1.8.1";
+
+  src = fetchFromGitHub {
+    owner = "openstack";
+    repo = "python-keystoneclient";
+    rev = version;
+    sha256 = "0yayn1hb3mncqb0isy8vy6d519xya7mhf5pcbn60fzdqjrkj2prq";
+  };
+
+  PBR_VERSION = "${version}";
+
+  buildInputs = [
+    pbr testtools testresources testrepository requests-mock fixtures openssl
+    oslotest pep8
+  ];
+  propagatedBuildInputs = [
+    oslo-serialization oslo-config oslo-i18n oslo-utils
+    Babel prettytable requests six iso8601 stevedore
+    netaddr debtcollector bandit webob mock pycrypto
+  ];
+
+  postPatch = ''
+    sed -i 's@python@${python.interpreter}@' .testr.conf
+    sed -ie '/argparse/d' requirements.txt
+    '';
+
+  doCheck = false; # The checkPhase below is broken
+
+  checkPhase = ''
+    patchShebangs run_tests.sh
+    ./run_tests.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/openstack/python-novaclient/;
+    description = "Client library and command line tool for the OpenStack Nova API";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7a965315f6..f2cf42e6fc1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22887,43 +22887,7 @@ in {
     };
   };
 
-  keystoneclient = buildPythonPackage rec {
-    name = "keystoneclient-${version}";
-    version = "1.8.1";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/openstack/python-keystoneclient/archive/${version}.tar.gz";
-      sha256 = "0lijri0xa5fvmynvq148z13kw4xd3bam4zrfd8aj0gb3lnzh9y6v";
-    };
-
-    PBR_VERSION = "${version}";
-
-    buildInputs = with self; [
-        pbr testtools testresources testrepository requests-mock fixtures pkgs.openssl
-        oslotest pep8 ];
-    propagatedBuildInputs = with self; [
-        oslo-serialization oslo-config oslo-i18n oslo-utils
-        Babel argparse prettytable requests six iso8601 stevedore
-        netaddr debtcollector bandit webob mock pycrypto ];
-
-    patchPhase = ''
-      sed -i 's@python@${python.interpreter}@' .testr.conf
-    '';
-
-    doCheck = false; # The checkPhase below is broken
-
-    checkPhase = ''
-      patchShebangs run_tests.sh
-      ./run_tests.sh
-    '';
-
-    meta = {
-      homepage = https://github.com/openstack/python-novaclient/;
-      description = "Client library and command line tool for the OpenStack Nova API";
-      license = stdenv.lib.licenses.asl20;
-      platforms = stdenv.lib.platforms.linux;
-    };
-  };
+  keystoneclient = callPackage ../development/python-modules/keystoneclient { };
 
   keystonemiddleware = buildPythonPackage rec {
     name = "keystonemiddleware-${version}";

From 22002cb41ba4e0d612bafad2c4363a85386e7feb Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 28 Aug 2017 04:02:42 -0400
Subject: [PATCH 2822/3246] xssproxy: init at 1.0.0

---
 pkgs/misc/screensavers/xssproxy/default.nix | 29 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/misc/screensavers/xssproxy/default.nix

diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix
new file mode 100644
index 00000000000..e5b6bf0d167
--- /dev/null
+++ b/pkgs/misc/screensavers/xssproxy/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, glib, pkgconfig, xorg, dbus }:
+
+let rev = "1.0.0"; in
+
+stdenv.mkDerivation {
+  name = "xssproxy-${rev}";
+
+  src = fetchFromGitHub {
+    owner = "timakro";
+    repo = "xssproxy";
+    rev = "v${rev}";
+    sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7";
+  };
+
+  buildInputs = [ glib pkgconfig xorg.libX11 xorg.libXScrnSaver dbus ];
+
+  makeFlags = [
+    "bindir=$(out)/bin"
+    "man1dir=$(out)/share/man/man1"
+  ];
+
+  meta = {
+    description = "Forward freedesktop.org Idle Inhibition Service calls to Xss";
+    homepage = https://github.com/timakro/xssproxy;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ benley ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dddbdd7174b..de5410075b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17007,6 +17007,8 @@ with pkgs;
 
   xss-lock = callPackage ../misc/screensavers/xss-lock { };
 
+  xssproxy = callPackage ../misc/screensavers/xssproxy { };
+
   xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { };
 
   xterm = callPackage ../applications/misc/xterm { };

From 861048c15f681ed8412da6253063c77244a5d871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 09:13:20 +0100
Subject: [PATCH 2823/3246] python.pkgs.mozinfo: python3 is not supported

---
 .../python-modules/marionette-harness/mozinfo.nix      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
index d22e92876bf..0240f4ce427 100644
--- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
@@ -1,7 +1,7 @@
-{ lib
-, stdenv
+{ stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy3k
 , mozfile
 }:
 
@@ -15,9 +15,11 @@ buildPythonPackage rec {
     sha256 = "1jwhnhbj7xipwh33wf7m12pw5g662dpr1chkp6p2fmy0mwpn2y4z";
   };
 
-  propagatedBuildInputs = [ mozfile ]; 
+  disabled = isPy3k;
 
-  meta = {
+  propagatedBuildInputs = [ mozfile ];
+
+  meta = with stdenv.lib; {
     description = "System information utilities for Mozilla testing";
     homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
     license = lib.licenses.mpl20;

From e67daebcb6eca3a2ae8c3a53b9c19a0f154945c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 09:33:16 +0100
Subject: [PATCH 2824/3246] pycuda: 2017.1 -> 2017.1.1

---
 .../python-modules/pycuda/default.nix         | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index 71bf64b7733..0bd8800eddc 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -1,6 +1,7 @@
-{ buildPythonPackage 
-, fetchurl
+{ buildPythonPackage
+, fetchPypi
 , fetchFromGitHub
+, Mako
 , boost
 , numpy
 , pytools
@@ -22,28 +23,23 @@ let
 in
 buildPythonPackage rec {
   pname = "pycuda";
-  version = "2017.1";
+  version = "2017.1.1";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "a92725ccd8515b4d7284b9127184b6fdb61f224daa086e7fc6b926e2094b055f";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qxmcjax32p1ywicw9sha2rvfbak4kjbx9pq57j3wq4cwf296nkb";
   };
 
   preConfigure = ''
-    findInputs ${boost.dev} boost_dirs propagated-native-build-inputs
-
-    export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
-    export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib
-
-    ${python.interpreter} configure.py --boost-inc-dir=$BOOST_INCLUDEDIR \
-                            --boost-lib-dir=$BOOST_LIBRARYDIR \
-                            --no-use-shipped-boost \
-                            --boost-python-libname=boost_python
+    ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \
+                          --boost-lib-dir=${boost}/lib \
+                          --no-use-shipped-boost \
+                          --boost-python-libname=boost_python
   '';
 
   postInstall = ''
-    ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte 
+    ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte
   '';
 
   # Requires access to libcuda.so.1 which is provided by the driver
@@ -63,7 +59,8 @@ buildPythonPackage rec {
     cudatoolkit
     compyte
     python
-  ]; 
+    Mako
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/inducer/pycuda/;

From c269ab6323797dad3d7ebae6c4bd387d27866213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Mon, 28 Aug 2017 10:41:04 +0200
Subject: [PATCH 2825/3246] git-open: 1.3.0 -> 1.3.1

---
 .../version-management/git-and-tools/git-open/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
index 6b696821f1c..5272e2be07c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-open-${version}";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-open";
     rev = "v${version}";
-    sha256 = "005am4phf7j4ybc9k1hqsxjb7gv2i56a3axrza866pwwx1ayrhpq";
+    sha256 = "1klj41vqgyyigqzi6s1ykz9vd8wvaq3skin63pi989dlsjf7igyr";
   };
 
   buildInputs = [ makeWrapper ];

From 5d62a4d1819dc7f702cf2380ef8eb8b2427a292c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 09:47:38 +0100
Subject: [PATCH 2826/3246] python.pkgs.cgroup-utils: fix build

---
 .../python-modules/cgroup-utils/default.nix   | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +---------------
 2 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/cgroup-utils/default.nix

diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix
new file mode 100644
index 00000000000..ed0623fa778
--- /dev/null
+++ b/pkgs/development/python-modules/cgroup-utils/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }:
+
+buildPythonPackage rec {
+  version = "0.6";
+  name = "cgroup-utils-${version}";
+
+  buildInputs = [ pep8 nose ];
+  # Pep8 tests fail...
+  doCheck = false;
+
+  postPatch = ''
+    sed -i -e "/argparse/d" setup.py
+  '';
+
+  src = fetchFromGitHub {
+    owner = "peo3";
+    repo = "cgroup-utils";
+    rev = "v${version}";
+    sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Utility tools for control groups of Linux";
+    maintainers = with maintainers; [ layus ];
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f2cf42e6fc1..e22b56dd7fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1656,28 +1656,7 @@ in {
     };
   };
 
-  cgroup-utils = buildPythonPackage rec {
-    version = "0.6";
-    name = "cgroup-utils-${version}";
-
-    propagatedBuildInputs = with self; [ argparse ];
-    buildInputs = with self; [ pep8 nose ];
-    # Pep8 tests fail...
-    doCheck = false;
-
-    src = pkgs.fetchFromGitHub {
-      owner = "peo3";
-      repo = "cgroup-utils";
-      rev = "v${version}";
-      sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc";
-    };
-
-    meta = {
-      description = "Utility tools for control groups of Linux";
-      maintainers = with maintainers; [ layus ];
-      license = licenses.gpl2;
-    };
-  };
+  cgroup-utils = callPackage ../development/python-modules/cgroup-utils {};
 
   channels = callPackage ../development/python-modules/channels {};
 

From 5f5a5ba58efdd2b5d524a647cc8a43dc7dbde38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 10:16:16 +0100
Subject: [PATCH 2827/3246] python.pkgs.piexif: fix build

---
 .../python-modules/piexif/default.nix         | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix
index e21593993cd..2c921959852 100644
--- a/pkgs/development/python-modules/piexif/default.nix
+++ b/pkgs/development/python-modules/piexif/default.nix
@@ -1,4 +1,4 @@
-{lib, buildPythonPackage, fetchurl, pillow}:
+{ stdenv, buildPythonPackage, fetchPypi, pillow }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -8,17 +8,23 @@ buildPythonPackage rec {
   # pillow needed for unit tests
   buildInputs = [ pillow ];
 
-  # No .tar.gz source available at PyPI, only .zip source, so need to use
-  # fetchurl because fetchPypi doesn't support .zip.
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.zip";
+  postPatch = ''
+    # incompatibility with pillow => 4.2.0
+    # has been resolved in https://github.com/hMatoba/Piexif/commit/c3a8272f5e6418f223b25f6486d8ddda201bbdf1
+    # remove this in the next version
+    sed -i -e 's/RGBA/RGB/' tests/s_test.py
+  '';
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
     sha256 = "15dvdr7b5xxsbsq5k6kq8h0xnzrkqzc08dzlih48a21x27i02bii";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Simplify Exif manipulations with Python";
     homepage = https://github.com/hMatoba/Piexif;
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ jluttine ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
   };
 }

From ea3f747ed51c6c0ea569d09eacd67ccd95f786d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 10:40:27 +0100
Subject: [PATCH 2828/3246] mozinfo: fix evaluation

---
 .../development/python-modules/marionette-harness/mozinfo.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
index 0240f4ce427..0e24ab09de6 100644
--- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "System information utilities for Mozilla testing";
     homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase;
-    license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ raskin ];
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ raskin ];
   };
 }

From 4e0d38cee837f12e41acc31a3ec247e5ea9e8dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 10:49:10 +0100
Subject: [PATCH 2829/3246] git-fire: nitpicks

---
 pkgs/tools/misc/git-fire/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix
index 2d506f4c8ca..0b5deccaa90 100644
--- a/pkgs/tools/misc/git-fire/default.nix
+++ b/pkgs/tools/misc/git-fire/default.nix
@@ -9,15 +9,11 @@ stdenv.mkDerivation {
     rev = "d72b68ed356f726c77c60294f9220275f16c9931";
     sha256 = "1hdwkhyjjx31y0lpjkhbb4f5y9f7g70fnd4c2246cmk2rbsvj5b2";
   };
-  
-  unpackPhase = ":";
-  
+
   installPhase = ''
-    mkdir -p $out/bin 
-    cp $src/git-fire $out/bin
-    chmod +x $out/bin/git-fire
+    install -D -m755 $src/git-fire $out/bin/git-fire
   '';
-  
+
   meta = with stdenv.lib; {
     description = ''
       Push ALL changes in a git repository

From 2f5dab753cb52539325b82c43df8c5dd0a20635e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 11:29:29 +0100
Subject: [PATCH 2830/3246] ansible: move out of pythonPackages

ansible is not a library
---
 .../admin}/ansible/2.1.nix                    | 29 +++++++-----------
 .../admin}/ansible/2.2.nix                    | 29 +++++++-----------
 .../admin}/ansible/2.3.nix                    | 30 +++++++------------
 pkgs/top-level/all-packages.nix               |  7 +++--
 pkgs/top-level/python-packages.nix            |  7 -----
 5 files changed, 37 insertions(+), 65 deletions(-)
 rename pkgs/{development/python-modules => tools/admin}/ansible/2.1.nix (68%)
 rename pkgs/{development/python-modules => tools/admin}/ansible/2.2.nix (71%)
 rename pkgs/{development/python-modules => tools/admin}/ansible/2.3.nix (56%)

diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix
similarity index 68%
rename from pkgs/development/python-modules/ansible/2.1.nix
rename to pkgs/tools/admin/ansible/2.1.nix
index 6c7f2090523..5a20b525607 100644
--- a/pkgs/development/python-modules/ansible/2.1.nix
+++ b/pkgs/tools/admin/ansible/2.1.nix
@@ -1,19 +1,11 @@
-{ lib
+{ stdenv
 , fetchurl
-, buildPythonPackage
-, pycrypto
-, paramiko
-, jinja2
-, pyyaml
-, httplib2
-, boto
-, six
-, netaddr
-, dns
+, pythonPackages
 , windowsSupport ? false
-, pywinrm ? null
 }:
 
+with pythonPackages;
+
 let
   jinja = jinja2.override rec {
     pname = "Jinja2";
@@ -45,17 +37,18 @@ in buildPythonPackage rec {
   dontPatchELF = true;
   dontPatchShebangs = false;
 
-  propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
-    boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
+  propagatedBuildInputs = [
+    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns
+  ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.ansible.com;
     description = "A simple automation tool";
-    license = with lib.licenses; [ gpl3] ;
-    maintainers = with lib.maintainers; [
+    license = with licenses; [ gpl3] ;
+    maintainers = with maintainers; [
       jgeerds
       joamaki
     ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix
similarity index 71%
rename from pkgs/development/python-modules/ansible/2.2.nix
rename to pkgs/tools/admin/ansible/2.2.nix
index 48e3be96695..528dbf0e97b 100644
--- a/pkgs/development/python-modules/ansible/2.2.nix
+++ b/pkgs/tools/admin/ansible/2.2.nix
@@ -1,19 +1,11 @@
-{ lib
+{ stdenv
 , fetchurl
-, buildPythonPackage
-, pycrypto
-, paramiko
-, jinja2
-, pyyaml
-, httplib2
-, boto
-, six
-, netaddr
-, dns
+, pythonPackages
 , windowsSupport ? false
-, pywinrm ? null
 }:
 
+with pythonPackages;
+
 let
   # Shouldn't be needed anymore in next version
   # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521
@@ -46,17 +38,18 @@ in buildPythonPackage rec {
   dontPatchELF = true;
   dontPatchShebangs = false;
 
-  propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
-    boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
+  propagatedBuildInputs = [
+    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns
+  ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.ansible.com;
     description = "A simple automation tool";
-    license = with lib.licenses; [ gpl3] ;
-    maintainers = with lib.maintainers; [
+    license = with licenses; [ gpl3] ;
+    maintainers = with maintainers; [
       jgeerds
       joamaki
     ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/python-modules/ansible/2.3.nix b/pkgs/tools/admin/ansible/2.3.nix
similarity index 56%
rename from pkgs/development/python-modules/ansible/2.3.nix
rename to pkgs/tools/admin/ansible/2.3.nix
index 36fb44498b5..599ea75836c 100644
--- a/pkgs/development/python-modules/ansible/2.3.nix
+++ b/pkgs/tools/admin/ansible/2.3.nix
@@ -1,25 +1,14 @@
-{ lib
+{ stdenv
 , fetchurl
-, buildPythonPackage
-, pycrypto
-, paramiko
-, jinja2
-, pyyaml
-, httplib2
-, boto
-, six
-, netaddr
-, dns
+, pythonPackages
 , windowsSupport ? false
-, pywinrm ? null
 }:
 
-buildPythonPackage rec {
+pythonPackages.buildPythonPackage rec {
   pname = "ansible";
   version = "2.3.1.0";
   name = "${pname}-${version}";
 
-
   src = fetchurl {
     url = "http://releases.ansible.com/ansible/${name}.tar.gz";
     sha256 = "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd";
@@ -34,17 +23,18 @@ buildPythonPackage rec {
   dontPatchELF = true;
   dontPatchShebangs = false;
 
-  propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2
-    boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
+  propagatedBuildInputs = with pythonPackages; [
+    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns
+  ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.ansible.com;
     description = "A simple automation tool";
-    license = with lib.licenses; [ gpl3] ;
-    maintainers = with lib.maintainers; [
+    license = with licenses; [ gpl3] ;
+    maintainers = with maintainers; [
       jgeerds
       joamaki
     ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5bba04cbbf..af69e1c944c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6618,8 +6618,11 @@ with pkgs;
 
   augeas = callPackage ../tools/system/augeas { };
 
-  ansible  = python2Packages.ansible2;
-  ansible2 = python2Packages.ansible2;
+  ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {};
+  ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {};
+  ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {};
+  ansible  = ansible_2_3;
+  ansible2 = ansible_2_3;
 
   antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e22b56dd7fe..03808ed0789 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -519,13 +519,6 @@ in {
 
   amqplib = callPackage ../development/python-modules/amqplib {};
 
-  ansible  = self.ansible2;
-  ansible2 = self.ansible_2_3;
-
-  ansible_2_1 = callPackage ../development/python-modules/ansible/2.1.nix {};
-  ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {};
-  ansible_2_3 = callPackage ../development/python-modules/ansible/2.3.nix {};
-
   apipkg = callPackage ../development/python-modules/apipkg {};
 
   appdirs = callPackage ../development/python-modules/appdirs { };

From 8994b27c54bba1e2eade5c5631a2953a330be15b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 28 Aug 2017 12:53:15 +0200
Subject: [PATCH 2831/3246] libvirtd module: add qemu_kvm to path

---
 nixos/modules/virtualisation/libvirtd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index ade0ba531cf..8aa7ad8e391 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -102,7 +102,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = with pkgs; [ libvirt netcat-openbsd ];
+    environment.systemPackages = with pkgs; [ libvirt netcat-openbsd qemu_kvm ];
 
     boot.kernelModules = [ "tun" ];
 

From 815cffc3f22b82e9d5300d94fa8c7a23e49287f7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 28 Aug 2017 12:53:38 +0200
Subject: [PATCH 2832/3246] docker-distribution: 2.6.0 -> 2.6.2

---
 .../virtualization/docker-distribution/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker-distribution/default.nix
index c3c0de14966..0af9abc852e 100644
--- a/pkgs/applications/virtualization/docker-distribution/default.nix
+++ b/pkgs/applications/virtualization/docker-distribution/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "distribution-${version}";
-  version = "2.6.0";
+  version = "2.6.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/docker/distribution";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "docker";
     repo = "distribution";
     inherit rev;
-    sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6";
+    sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
   };
 
   meta = with stdenv.lib; {

From 16bab456b4fc3c132bdd3cf9173fd43740b0084e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 11:57:55 +0100
Subject: [PATCH 2833/3246] kargo: fix evaluation

---
 pkgs/tools/misc/kargo/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 4c390f1e80e..827024abdbc 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python2Packages, ansible2 }:
 
 python2Packages.buildPythonApplication rec {
   version = "0.4.6";
@@ -12,7 +12,6 @@ python2Packages.buildPythonApplication rec {
   doCheck = false;
 
   propagatedBuildInputs = with python2Packages; [
-    ansible2
     boto
     cffi
     cryptography

From 49b17a81270535179458050ff648064edf87be0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 12:05:33 +0100
Subject: [PATCH 2834/3246] kargo: readd ansible2 to propagatedBuildInputs

was removed by accident in 16bab456b4fc3c132bdd3cf9173fd43740b0084e
---
 pkgs/tools/misc/kargo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 827024abdbc..cb2109e195e 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -12,6 +12,7 @@ python2Packages.buildPythonApplication rec {
   doCheck = false;
 
   propagatedBuildInputs = with python2Packages; [
+    ansible2
     boto
     cffi
     cryptography

From 99ffd2051e853963f98ef28cb806bce685a1f6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 12:19:30 +0100
Subject: [PATCH 2835/3246] python.pkgs.pyramid_beaker: fix tests

---
 pkgs/development/python-modules/pyramid_beaker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix
index 517f068edd9..a95c67b96d2 100644
--- a/pkgs/development/python-modules/pyramid_beaker/default.nix
+++ b/pkgs/development/python-modules/pyramid_beaker/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   checkPhase = ''
     # https://github.com/Pylons/pyramid_beaker/issues/29
-    py.test -k 'not test_includeme'
+    py.test -k 'not test_includeme' pyramid_beaker/tests.py
   '';
 
   buildInputs = [ pytest ];

From 8991610fbcdb9596dadf2a1b6a563ebd2d85cc8b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 28 Aug 2017 10:51:37 +0000
Subject: [PATCH 2836/3246] projectm: fix build with gcc6

---
 pkgs/applications/audio/projectm/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index 7b103286fe2..e7aace763a1 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/pkgs/applications/audio/projectm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cmake
+{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake
 , glew, ftgl, ttf_bitstream_vera
 , withQt ? true, qt4
 , withLibvisual ? false, libvisual, SDL
@@ -24,7 +24,13 @@ stdenv.mkDerivation {
     sha256 = "1vh6jk68a0jdb6qwppb6f8cbgmhnv2ba3bcavzfd6sq06gq08cji";
   };
 
+  patch_gcc6 = fetchpatch {
+    url = https://raw.githubusercontent.com/gentoo/gentoo/45abd63abc6644b6e177c057b5b42d894dbf8e29/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch;
+    sha256 = "1i50scxv1jlqvb3jm3sql89a7wqckxhlpvnhz20vvmm1kii6lrsn";
+  };
+
   patchPhase = ''
+    patch -d src/libprojectM -p1 -i "$patch_gcc6"
     sed -i 's:''${LIBVISUAL_PLUGINSDIR}:''${CMAKE_INSTALL_PREFIX}/lib/libvisual-0.4:' \
       src/projectM-libvisual/CMakeLists.txt
   '';

From 1475b0f0df52d0bf93be3e1c1d519c8b4379b24a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 28 Aug 2017 10:52:18 +0000
Subject: [PATCH 2837/3246] clementine: fix build with gcc6

---
 pkgs/applications/audio/clementine/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 5b0d285f82d..d916b8957e6 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
 , qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
-, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, protobuf
+, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
 , qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
 
 let
@@ -26,9 +26,10 @@ let
     ./clementine-spotify-blob-remove-from-build.patch
   ];
 
+  nativeBuildInputs = [ cmake pkgconfig ];
+
   buildInputs = [
     boost
-    cmake
     chromaprint
     fftw
     gettext
@@ -40,7 +41,7 @@ let
     liblastfm
     libpulseaudio
     pcre
-    pkgconfig
+    projectm
     protobuf
     qca2
     qjson
@@ -55,7 +56,10 @@ let
 
   free = stdenv.mkDerivation {
     name = "clementine-free-${version}";
-    inherit patches src buildInputs;
+    inherit src patches nativeBuildInputs buildInputs;
+
+    cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
+
     enableParallelBuilding = true;
     postPatch = ''
       sed -i src/CMakeLists.txt \
@@ -76,7 +80,7 @@ let
   blob = stdenv.mkDerivation {
     name = "clementine-blob-${version}";
     # Use the same patches and sources as Clementine
-    inherit src;
+    inherit src nativeBuildInputs;
 
     patches = [
       ./clementine-spotify-blob.patch
@@ -114,15 +118,13 @@ runCommand "clementine-${version}"
   dontPatchELF = true;
   dontStrip = true;
   meta = {
-    homepage = http://www.clementine-player.org;
     description = "A multiplatform music player"
       + " (" + (optionalString withSpotify "with Spotify, ")
       + "with gstreamer plugins: "
       + concatStrings (intersperse ", " (map (x: x.name) gst_plugins))
       + ")";
     license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.ttuegel ];
+    inherit (free.meta) homepage platforms maintainers;
   };
 }
 ''

From 22a270b05037416848a187caeed9482476a0a8be Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 28 Aug 2017 10:05:48 +0000
Subject: [PATCH 2838/3246] webkitgtk24x: fix build with gcc6

---
 pkgs/development/libraries/webkitgtk/2.4.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 40b27f67fff..6669b562400 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex
+{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex
 , pkgconfig, which, gettext, gobjectIntrospection
 , gtk2, gtk3, wayland, libwebp, enchant, sqlite
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
@@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
   '';
   patches = [
     ./webcore-svg-libxml-cflags.patch
+    (fetchpatch {
+      url = https://raw.githubusercontent.com/gentoo/gentoo/7c5457e265bd40c156a8fe6b2ff94a4e34bcea8e/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch;
+      sha256 = "0ll93dr5vxd40wvly1jaw41lvw86krac0jc6k6cacrps4i5ql5j0";
+    })
   ] ++ optionals stdenv.isDarwin [
     ./configure.patch
     ./quartz-webcore.patch

From fd3e1ce77642e0c138dcc6ee1a4918daa1140a0c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 28 Aug 2017 13:53:06 +0200
Subject: [PATCH 2839/3246] fbterm: import Arch Linux patches to fix build

---
 pkgs/os-specific/linux/fbterm/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix
index ad3c145cd8a..e97f911534a 100644
--- a/pkgs/os-specific/linux/fbterm/default.nix
+++ b/pkgs/os-specific/linux/fbterm/default.nix
@@ -28,6 +28,23 @@ stdenv.mkDerivation {
     mkdir -p "$out/share/terminfo"
     tic -a -v2 -o"$out/share/terminfo" terminfo/fbterm
   '';
+
+  patches = [
+    # fixes from Arch Linux package
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/glitsj16/fbterm-patched/d1fe03313be4654dd0a1c0bb5f51530732345134/gcc-6-build-fixes.patch";
+      sha256 = "1kl9fjnrri6pamjdl4jpkqxk5wxcf6jcchv5801xz8vxp4542m40";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/glitsj16/fbterm-patched/d1fe03313be4654dd0a1c0bb5f51530732345134/insertmode-fix.patch";
+      sha256 = "1bad9mqcfpqb94lpx23lsamlhplil73ahzin2xjva0gl3gr1038l";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/glitsj16/fbterm-patched/d1fe03313be4654dd0a1c0bb5f51530732345134/miscoloring-fix.patch";
+      sha256 = "1mjszji0jgs2jsagjp671fv0d1983wmxv009ff1jfhi9pbay6jd0";
+    })
+  ];
+
   meta = {
     inherit (s) version;
     description = "Framebuffer terminal emulator";

From c8bdd873ff638cd7f5b2c037b7cbf4d9614d1831 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 28 Aug 2017 21:19:40 +0800
Subject: [PATCH 2840/3246] darkhttpd: minor cleanups

---
 pkgs/servers/http/darkhttpd/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix
index 0ca888fd6ed..3efc97f6296 100644
--- a/pkgs/servers/http/darkhttpd/default.nix
+++ b/pkgs/servers/http/darkhttpd/default.nix
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155";
   };
 
-  installPhase = ''
-    install -d "$out/bin"
+  enableParallelBuilding = true;
 
+  installPhase = ''
     # install darkhttpd
     install -Dm755 "darkhttpd" "$out/bin/darkhttpd"
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Small and secure static webserver";
-    homepage = https://unix4lyfe.org/darkhttpd/;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = platforms.all;
-    maintainers = [ maintainers.bobvanderlinden ];
+    homepage    = https://unix4lyfe.org/darkhttpd/;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ bobvanderlinden ];
+    platforms   = platforms.all;
   };
 }

From b73e3b6095e5d8d952682d4b868e9ac7f633f0c2 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 25 Jun 2017 17:59:23 +0100
Subject: [PATCH 2841/3246] GNOME: 3.22 -> 3.24

This is a squash commit of the joint work from:

* Jan Tojnar (@jtojnar)
* Linus Heckemann (@lheckemann)
* Ryan Mulligan (@ryantm)
* romildo (@romildo)
* Tom Hunger (@teh)
---
 nixos/doc/manual/release-notes/rl-1709.xml    |  7 ++-
 .../services/x11/display-managers/gdm.nix     | 19 +++++++-
 .../gnome-3/3.22/apps/bijiben/src.nix         | 10 ----
 .../desktops/gnome-3/3.22/apps/cheese/src.nix | 10 ----
 .../gnome-3/3.22/apps/evolution/src.nix       | 10 ----
 .../gnome-3/3.22/apps/file-roller/src.nix     | 10 ----
 .../gnome-3/3.22/apps/gnome-boxes/src.nix     | 10 ----
 .../gnome-3/3.22/apps/gnome-calendar/src.nix  | 10 ----
 .../3.22/apps/gnome-characters/src.nix        | 10 ----
 .../gnome-3/3.22/apps/gnome-clocks/src.nix    | 10 ----
 .../gnome-3/3.22/apps/gnome-documents/src.nix | 10 ----
 .../apps/gnome-getting-started-docs/src.nix   | 10 ----
 .../gnome-3/3.22/apps/gnome-logs/src.nix      | 10 ----
 .../gnome-3/3.22/apps/gnome-maps/soup.patch   | 12 -----
 .../gnome-3/3.22/apps/gnome-maps/src.nix      | 10 ----
 .../gnome-3/3.22/apps/gnome-music/src.nix     | 10 ----
 .../gnome-3/3.22/apps/gnome-photos/src.nix    | 10 ----
 .../gnome-3/3.22/apps/gnome-weather/src.nix   | 10 ----
 .../desktops/gnome-3/3.22/apps/polari/src.nix | 10 ----
 .../3.22/core/adwaita-icon-theme/src.nix      | 10 ----
 .../desktops/gnome-3/3.22/core/baobab/src.nix | 10 ----
 pkgs/desktops/gnome-3/3.22/core/eog/src.nix   | 10 ----
 .../gnome-3/3.22/core/epiphany/src.nix        | 10 ----
 .../desktops/gnome-3/3.22/core/evince/src.nix | 10 ----
 .../3.22/core/evolution-data-server/src.nix   | 10 ----
 .../core/gdm/disable_x_access_control.patch   | 13 -----
 .../gnome-3/3.22/core/gdm/libsystemd.patch    | 21 ---------
 .../3.22/core/gdm/no-dbus-launch.patch        | 20 --------
 .../gnome-3/3.22/core/gdm/sessions_dir.patch  | 21 ---------
 pkgs/desktops/gnome-3/3.22/core/gdm/src.nix   | 10 ----
 .../gnome-3/3.22/core/gdm/xserver_path.patch  | 17 -------
 .../gnome-3/3.22/core/geocode-glib/src.nix    | 10 ----
 pkgs/desktops/gnome-3/3.22/core/gjs/src.nix   | 11 -----
 .../3.22/core/gnome-backgrounds/src.nix       | 10 ----
 .../3.22/core/gnome-calculator/src.nix        | 10 ----
 .../3.22/core/gnome-control-center/src.nix    | 10 ----
 .../gnome-3/3.22/core/gnome-desktop/src.nix   | 10 ----
 .../3.22/core/gnome-dictionary/src.nix        | 10 ----
 .../3.22/core/gnome-disk-utility/src.nix      | 10 ----
 .../3.22/core/gnome-font-viewer/src.nix       | 10 ----
 .../3.22/core/gnome-online-accounts/src.nix   | 10 ----
 .../3.22/core/gnome-online-miners/src.nix     | 10 ----
 .../gnome-3/3.22/core/gnome-session/src.nix   | 10 ----
 .../3.22/core/gnome-settings-daemon/src.nix   | 10 ----
 .../3.22/core/gnome-shell-extensions/src.nix  | 10 ----
 .../gnome-3/3.22/core/gnome-shell/src.nix     | 10 ----
 .../gnome-3/3.22/core/gnome-software/src.nix  | 10 ----
 .../3.22/core/gnome-system-monitor/src.nix    | 10 ----
 .../gnome-3/3.22/core/gnome-terminal/src.nix  | 10 ----
 .../gnome-3/3.22/core/gnome-user-docs/src.nix | 10 ----
 .../core/gsettings-desktop-schemas/src.nix    | 10 ----
 .../gnome-3/3.22/core/gtksourceview/src.nix   | 10 ----
 .../gnome-3/3.22/core/libgweather/src.nix     | 10 ----
 .../desktops/gnome-3/3.22/core/mutter/src.nix | 10 ----
 .../gnome-3/3.22/core/nautilus/src.nix        | 10 ----
 pkgs/desktops/gnome-3/3.22/core/sushi/src.nix | 10 ----
 pkgs/desktops/gnome-3/3.22/core/totem/src.nix | 10 ----
 .../gnome-3/3.22/core/tracker/src.nix         | 11 -----
 pkgs/desktops/gnome-3/3.22/core/vte/src.nix   | 11 -----
 .../desktops/gnome-3/3.22/core/zenity/src.nix | 10 ----
 .../gnome-3/3.22/devtools/devhelp/src.nix     | 10 ----
 .../gnome-3/3.22/games/gnome-chess/src.nix    | 10 ----
 .../gnome-3/3.22/games/gnome-mines/src.nix    | 10 ----
 .../gnome-3/3.22/games/gnome-nibbles/src.nix  | 10 ----
 .../gnome-3/3.22/games/gnome-sudoku/src.nix   | 10 ----
 .../gnome-3/3.22/games/lightsoff/src.nix      | 10 ----
 .../gnome-3/3.22/games/swell-foop/src.nix     | 10 ----
 pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix  | 10 ----
 .../gnome-3/3.22/misc/gnome-autoar/src.nix    | 12 -----
 .../3.22/misc/gnome-packagekit/src.nix        | 10 ----
 .../3.22/misc/gnome-tweak-tool/src.nix        | 10 ----
 .../apps/accerciser/default.nix               |  0
 .../{3.22 => 3.24}/apps/accerciser/src.nix    |  0
 .../{3.22 => 3.24}/apps/bijiben/default.nix   |  0
 .../gnome-3/3.24/apps/bijiben/src.nix         | 10 ++++
 .../{3.22 => 3.24}/apps/cheese/default.nix    |  0
 .../desktops/gnome-3/3.24/apps/cheese/src.nix | 10 ++++
 .../{3.22 => 3.24}/apps/evolution/default.nix | 11 ++++-
 .../gnome-3/3.24/apps/evolution/src.nix       | 10 ++++
 .../apps/file-roller/default.nix              |  0
 .../gnome-3/3.24/apps/file-roller/src.nix     | 10 ++++
 .../{3.22 => 3.24}/apps/gedit/default.nix     |  0
 .../gnome-3/{3.22 => 3.24}/apps/gedit/src.nix |  0
 .../{3.22 => 3.24}/apps/ghex/default.nix      |  0
 .../gnome-3/{3.22 => 3.24}/apps/ghex/src.nix  |  0
 .../{3.22 => 3.24}/apps/glade/default.nix     |  0
 .../gnome-3/{3.22 => 3.24}/apps/glade/src.nix |  0
 .../apps/gnome-boxes/default.nix              |  0
 .../gnome-3/3.24/apps/gnome-boxes/src.nix     | 10 ++++
 .../apps/gnome-calendar/default.nix           |  0
 .../gnome-3/3.24/apps/gnome-calendar/src.nix  | 10 ++++
 .../apps/gnome-characters/default.nix         |  2 +-
 .../3.24/apps/gnome-characters/src.nix        | 10 ++++
 .../apps/gnome-clocks/default.nix             |  0
 .../gnome-3/3.24/apps/gnome-clocks/src.nix    | 10 ++++
 .../apps/gnome-documents/default.nix          |  0
 .../gnome-3/3.24/apps/gnome-documents/src.nix | 10 ++++
 .../gnome-getting-started-docs/default.nix    |  0
 .../apps/gnome-getting-started-docs/src.nix   | 10 ++++
 .../apps/gnome-logs/default.nix               |  2 +-
 .../gnome-3/3.24/apps/gnome-logs/src.nix      | 10 ++++
 .../apps/gnome-maps/default.nix               | 14 ++++--
 .../gnome-3/3.24/apps/gnome-maps/src.nix      | 10 ++++
 .../apps/gnome-music/default.nix              |  0
 .../gnome-3/3.24/apps/gnome-music/src.nix     | 10 ++++
 .../apps/gnome-nettool/default.nix            |  0
 .../apps/gnome-photos/default.nix             |  4 +-
 .../gnome-3/3.24/apps/gnome-photos/src.nix    | 10 ++++
 .../apps/gnome-weather/default.nix            | 10 ++++
 .../gnome-3/3.24/apps/gnome-weather/src.nix   | 10 ++++
 .../apps/nautilus-sendto/default.nix          |  0
 .../{3.22 => 3.24}/apps/polari/default.nix    |  4 +-
 .../desktops/gnome-3/3.24/apps/polari/src.nix | 10 ++++
 .../{3.22 => 3.24}/apps/seahorse/default.nix  |  0
 .../{3.22 => 3.24}/apps/seahorse/src.nix      |  0
 .../{3.22 => 3.24}/apps/vinagre/default.nix   |  0
 .../{3.22 => 3.24}/apps/vinagre/src.nix       |  0
 .../core/adwaita-icon-theme/default.nix       |  0
 .../3.24/core/adwaita-icon-theme/src.nix      | 10 ++++
 .../{3.22 => 3.24}/core/baobab/default.nix    |  0
 .../desktops/gnome-3/3.24/core/baobab/src.nix | 10 ++++
 .../{3.22 => 3.24}/core/caribou/default.nix   |  1 +
 .../core/dconf-editor/default.nix             |  0
 .../{3.22 => 3.24}/core/dconf-editor/src.nix  |  0
 .../{3.22 => 3.24}/core/dconf/default.nix     |  0
 .../{3.22 => 3.24}/core/empathy/default.nix   |  0
 .../{3.22 => 3.24}/core/eog/default.nix       |  0
 pkgs/desktops/gnome-3/3.24/core/eog/src.nix   | 10 ++++
 .../{3.22 => 3.24}/core/epiphany/default.nix  |  4 +-
 .../gnome-3/3.24/core/epiphany/src.nix        | 10 ++++
 .../{3.22 => 3.24}/core/evince/default.nix    |  7 ---
 .../desktops/gnome-3/3.24/core/evince/src.nix | 10 ++++
 .../core/evolution-data-server/default.nix    | 15 ++++--
 .../3.24/core/evolution-data-server/src.nix   | 10 ++++
 .../{3.22 => 3.24}/core/folks/default.nix     |  0
 .../{3.22 => 3.24}/core/gconf/default.nix     |  0
 .../{3.22 => 3.24}/core/gcr/default.nix       |  0
 .../gnome-3/{3.22 => 3.24}/core/gcr/src.nix   |  0
 .../core/gdm/3.16-wip/default.nix             |  0
 .../3.16-wip/disable_x_access_control.patch   |  0
 .../core/gdm/3.16-wip/sessions_dir.patch      |  0
 .../core/gdm/3.16-wip/xserver_path.patch      |  0
 .../{3.22 => 3.24}/core/gdm/default.nix       | 10 ++--
 .../gdm/gdm-session-worker_xserver-path.patch |  0
 .../core/gdm/gdm-x-session_extra_args.patch   |  0
 .../core/gdm/gdm-x-session_path.patch         |  0
 .../gnome-3/3.24/core/gdm/sessions_dir.patch  | 23 +++++++++
 pkgs/desktops/gnome-3/3.24/core/gdm/src.nix   | 10 ++++
 .../core/geocode-glib/default.nix             |  0
 .../gnome-3/3.24/core/geocode-glib/src.nix    | 10 ++++
 .../{3.22 => 3.24}/core/gjs/default.nix       |  9 +++-
 pkgs/desktops/gnome-3/3.24/core/gjs/src.nix   | 10 ++++
 .../core/gnome-backgrounds/default.nix        |  0
 .../3.24/core/gnome-backgrounds/src.nix       | 10 ++++
 .../core/gnome-bluetooth/default.nix          |  0
 .../core/gnome-bluetooth/src.nix              |  6 +--
 .../core/gnome-calculator/default.nix         |  4 +-
 .../3.24/core/gnome-calculator/src.nix        | 10 ++++
 .../core/gnome-common/default.nix             |  0
 .../{3.22 => 3.24}/core/gnome-common/src.nix  |  0
 .../core/gnome-contacts/default.nix           |  0
 .../core/gnome-contacts/gio_unix.patch        |  0
 .../core/gnome-contacts/src.nix               |  0
 .../core/gnome-control-center/default.nix     |  0
 .../3.24/core/gnome-control-center/src.nix    | 10 ++++
 .../core/gnome-desktop/default.nix            |  0
 .../gnome-3/3.24/core/gnome-desktop/src.nix   | 10 ++++
 .../core/gnome-dictionary/default.nix         |  0
 .../3.24/core/gnome-dictionary/src.nix        | 10 ++++
 .../core/gnome-disk-utility/default.nix       |  0
 .../3.24/core/gnome-disk-utility/src.nix      | 10 ++++
 .../core/gnome-font-viewer/default.nix        |  0
 .../3.24/core/gnome-font-viewer/src.nix       | 10 ++++
 .../core/gnome-keyring/default.nix            |  0
 .../{3.22 => 3.24}/core/gnome-keyring/src.nix |  0
 .../core/gnome-menus/default.nix              |  0
 .../core/gnome-online-accounts/default.nix    |  0
 .../3.24/core/gnome-online-accounts/src.nix   | 10 ++++
 .../core/gnome-online-miners/default.nix      |  0
 .../3.24/core/gnome-online-miners/src.nix     | 10 ++++
 .../core/gnome-screenshot/default.nix         |  0
 .../core/gnome-screenshot/src.nix             |  0
 .../core/gnome-session/default.nix            |  6 ++-
 .../gnome-3/3.24/core/gnome-session/src.nix   | 10 ++++
 .../core/gnome-settings-daemon/default.nix    |  0
 .../3.24/core/gnome-settings-daemon/src.nix   | 10 ++++
 .../core/gnome-shell-extensions/default.nix   |  0
 .../3.24/core/gnome-shell-extensions/src.nix  | 10 ++++
 .../core/gnome-shell/default.nix              | 19 ++++++--
 .../gnome-3/3.24/core/gnome-shell/src.nix     | 10 ++++
 .../core/gnome-software/default.nix           |  4 +-
 .../gnome-3/3.24/core/gnome-software/src.nix  | 10 ++++
 .../core/gnome-system-log/default.nix         |  0
 .../core/gnome-system-monitor/default.nix     |  7 ++-
 .../3.24/core/gnome-system-monitor/src.nix    | 10 ++++
 .../core/gnome-terminal/default.nix           |  0
 .../gnome-3/3.24/core/gnome-terminal/src.nix  | 10 ++++
 .../core/gnome-themes-standard/default.nix    |  0
 .../core/gnome-themes-standard/src.nix        |  0
 .../core/gnome-user-docs/default.nix          |  0
 .../gnome-3/3.24/core/gnome-user-docs/src.nix | 10 ++++
 .../core/gnome-user-share/default.nix         |  0
 .../core/gnome-user-share/src.nix             |  0
 .../core/grilo-plugins/default.nix            |  0
 .../{3.22 => 3.24}/core/grilo/default.nix     |  4 +-
 .../{3.22 => 3.24}/core/grilo/setup-hook.sh   |  0
 .../gsettings-desktop-schemas/default.nix     |  0
 .../core/gsettings-desktop-schemas/src.nix    | 10 ++++
 .../{3.22 => 3.24}/core/gsound/default.nix    |  0
 .../core/gtksourceview/default.nix            |  0
 .../core/gtksourceview/nix_share_path.patch   |  0
 .../gnome-3/3.24/core/gtksourceview/src.nix   | 10 ++++
 .../core/gtksourceviewmm/default.nix          |  0
 .../core/gtksourceviewmm/src.nix              |  0
 .../{3.22 => 3.24}/core/gucharmap/default.nix |  0
 .../{3.22 => 3.24}/core/gucharmap/src.nix     |  0
 .../{3.22 => 3.24}/core/libcroco/default.nix  |  0
 .../{3.22 => 3.24}/core/libgdata/default.nix  |  0
 .../{3.22 => 3.24}/core/libgee/default.nix    |  0
 .../core/libgee/fix_introspection_paths.patch |  0
 .../{3.22 => 3.24}/core/libgepub/default.nix  |  0
 .../core/libgnome-keyring/default.nix         |  0
 .../core/libgnomekbd/default.nix              |  0
 .../{3.22 => 3.24}/core/libgnomekbd/src.nix   |  0
 .../core/libgweather/default.nix              |  2 -
 .../gnome-3/3.24/core/libgweather/src.nix     | 10 ++++
 .../{3.22 => 3.24}/core/libgxps/default.nix   |  0
 .../{3.22 => 3.24}/core/libpeas/default.nix   |  0
 .../{3.22 => 3.24}/core/libpeas/src.nix       |  0
 .../core/libzapojit/default.nix               |  0
 .../{3.22 => 3.24}/core/mutter/default.nix    | 10 +++-
 .../{3.22 => 3.24}/core/mutter/math.patch     |  0
 .../desktops/gnome-3/3.24/core/mutter/src.nix | 10 ++++
 .../{3.22 => 3.24}/core/mutter/x86.patch      |  0
 .../{3.22 => 3.24}/core/nautilus/default.nix  |  0
 .../core/nautilus/extension_dir.patch         |  0
 .../gnome-3/3.24/core/nautilus/src.nix        | 10 ++++
 .../{3.22 => 3.24}/core/rest/default.nix      |  0
 .../{3.22 => 3.24}/core/sushi/default.nix     |  0
 pkgs/desktops/gnome-3/3.24/core/sushi/src.nix | 10 ++++
 .../core/totem-pl-parser/default.nix          |  0
 .../{3.22 => 3.24}/core/totem/default.nix     |  1 -
 pkgs/desktops/gnome-3/3.24/core/totem/src.nix | 10 ++++
 .../{3.22 => 3.24}/core/tracker/default.nix   |  7 ++-
 .../gnome-3/3.24/core/tracker/src.nix         | 10 ++++
 .../{3.22 => 3.24}/core/vino/default.nix      |  0
 .../gnome-3/{3.22 => 3.24}/core/vino/src.nix  |  0
 .../gnome-3/{3.22 => 3.24}/core/vte/2.90.nix  |  0
 .../{3.22 => 3.24}/core/vte/default.nix       |  2 +-
 .../core/vte/fix_g_test_init_calls.patch      |  0
 .../vte/fix_vteseq_n_lookup_declaration.patch |  0
 .../gnome-3/{3.22 => 3.24}/core/vte/ng.nix    |  0
 pkgs/desktops/gnome-3/3.24/core/vte/src.nix   | 10 ++++
 .../core/yelp-tools/default.nix               |  0
 .../{3.22 => 3.24}/core/yelp-tools/src.nix    |  0
 .../{3.22 => 3.24}/core/yelp-xsl/default.nix  |  0
 .../{3.22 => 3.24}/core/yelp-xsl/src.nix      |  0
 .../{3.22 => 3.24}/core/yelp/default.nix      |  0
 .../gnome-3/{3.22 => 3.24}/core/yelp/src.nix  |  0
 .../{3.22 => 3.24}/core/zenity/default.nix    |  0
 .../desktops/gnome-3/3.24/core/zenity/src.nix | 10 ++++
 .../gnome-3/{3.22 => 3.24}/default.nix        |  7 +--
 .../{3.22 => 3.24}/desktop/rarian/default.nix |  0
 .../devtools/anjuta/default.nix               |  0
 .../{3.22 => 3.24}/devtools/anjuta/src.nix    |  0
 .../devtools/devhelp/default.nix              |  0
 .../gnome-3/3.24/devtools/devhelp/src.nix     | 10 ++++
 .../{3.22 => 3.24}/devtools/gdl/default.nix   |  0
 .../{3.22 => 3.24}/devtools/gdl/src.nix       |  0
 .../devtools/gnome-devel-docs/default.nix     |  0
 .../devtools/gnome-devel-docs/src.nix         |  0
 .../devtools/nemiver/bool_slot.patch          |  0
 .../devtools/nemiver/default.nix              |  0
 .../devtools/nemiver/safe_ptr.patch           |  0
 .../{3.22 => 3.24}/devtools/nemiver/src.nix   |  0
 .../games/aisleriot/default.nix               |  0
 .../{3.22 => 3.24}/games/aisleriot/src.nix    |  0
 .../games/five-or-more/default.nix            |  0
 .../{3.22 => 3.24}/games/five-or-more/src.nix |  0
 .../games/four-in-a-row/default.nix           |  0
 .../games/four-in-a-row/src.nix               |  0
 .../games/gnome-chess/default.nix             |  0
 .../gnome-3/3.24/games/gnome-chess/src.nix    | 10 ++++
 .../games/gnome-klotski/default.nix           |  0
 .../games/gnome-klotski/src.nix               |  0
 .../games/gnome-mahjongg/default.nix          |  0
 .../games/gnome-mahjongg/src.nix              |  0
 .../games/gnome-mines/default.nix             |  0
 .../gnome-3/3.24/games/gnome-mines/src.nix    | 10 ++++
 .../games/gnome-nibbles/default.nix           |  0
 .../gnome-3/3.24/games/gnome-nibbles/src.nix  | 10 ++++
 .../games/gnome-robots/default.nix            |  0
 .../{3.22 => 3.24}/games/gnome-robots/src.nix |  0
 .../games/gnome-sudoku/default.nix            |  0
 .../gnome-3/3.24/games/gnome-sudoku/src.nix   | 10 ++++
 .../games/gnome-taquin/default.nix            |  0
 .../{3.22 => 3.24}/games/gnome-taquin/src.nix |  0
 .../games/gnome-tetravex/default.nix          |  0
 .../games/gnome-tetravex/src.nix              |  0
 .../{3.22 => 3.24}/games/hitori/default.nix   |  0
 .../{3.22 => 3.24}/games/hitori/src.nix       |  0
 .../{3.22 => 3.24}/games/iagno/default.nix    |  0
 .../{3.22 => 3.24}/games/iagno/src.nix        |  0
 .../games/lightsoff/default.nix               |  0
 .../gnome-3/3.24/games/lightsoff/src.nix      | 10 ++++
 .../games/quadrapassel/default.nix            |  0
 .../{3.22 => 3.24}/games/quadrapassel/src.nix |  0
 .../games/swell-foop/default.nix              |  0
 .../gnome-3/3.24/games/swell-foop/src.nix     | 10 ++++
 .../{3.22 => 3.24}/games/tali/default.nix     |  0
 .../gnome-3/{3.22 => 3.24}/games/tali/src.nix |  0
 .../gnome-3/{3.22 => 3.24}/installer.nix      |  0
 ...d-with-evolution-data-server-3.13.90.patch |  0
 .../misc/california/default.nix               |  0
 .../{3.22 => 3.24}/misc/geary/default.nix     |  0
 .../{3.22 => 3.24}/misc/gexiv2/default.nix    |  0
 .../{3.22 => 3.24}/misc/gfbgraph/default.nix  |  0
 .../{3.22 => 3.24}/misc/gitg/default.nix      |  0
 pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix  | 10 ++++
 .../misc/gnome-autoar/default.nix             |  0
 .../gnome-3/3.24/misc/gnome-autoar/src.nix    | 10 ++++
 .../misc/gnome-packagekit/default.nix         |  0
 .../3.24/misc/gnome-packagekit/src.nix        | 10 ++++
 ...themes-and-icons-in-system-data-dirs.patch | 47 ++++++++++---------
 ...-multiple-entries-for-a-single-theme.patch | 45 +++++++++---------
 ...reate-config-dir-if-it-doesn-t-exist.patch | 12 ++---
 .../misc/gnome-tweak-tool/default.nix         | 21 ++++-----
 .../gnome-tweak-tool/find_gsettings.patch     |  0
 .../3.24/misc/gnome-tweak-tool/src.nix        | 10 ++++
 .../misc/gnome-video-effects/default.nix      |  0
 .../{3.22 => 3.24}/misc/gpaste/default.nix    | 10 ++--
 .../{3.22 => 3.24}/misc/gspell/default.nix    |  4 +-
 .../{3.22 => 3.24}/misc/gspell/src.nix        |  4 +-
 .../{3.22 => 3.24}/misc/gtkhtml/default.nix   |  0
 .../{3.22 => 3.24}/misc/gtkhtml/src.nix       |  0
 .../misc/libgames-support/default.nix         |  0
 .../{3.22 => 3.24}/misc/libgda/default.nix    |  0
 .../{3.22 => 3.24}/misc/libgda/src.nix        |  0
 .../misc/libgit2-glib/default.nix             |  0
 .../{3.22 => 3.24}/misc/libgit2-glib/src.nix  |  0
 .../misc/libmediaart/default.nix              |  4 +-
 .../{3.22 => 3.24}/misc/pidgin/default.nix    |  0
 .../{3.22 => 3.24}/misc/pomodoro/default.nix  |  0
 .../extensions/chrome-gnome-shell/default.nix | 16 +++----
 .../extensions/dash-to-dock/default.nix       |  6 +--
 pkgs/desktops/mate/mate-themes/default.nix    |  3 +-
 .../libraries/appstream-glib/default.nix      |  8 ++--
 pkgs/development/libraries/babl/default.nix   |  4 +-
 .../libraries/clutter-gst/default.nix         |  4 +-
 .../development/libraries/clutter/default.nix |  8 ++--
 pkgs/development/libraries/gegl/3.0.nix       |  4 +-
 .../development/libraries/geoclue/default.nix |  5 +-
 pkgs/development/libraries/glib/default.nix   |  4 +-
 .../gobject-introspection/default.nix         |  6 +--
 .../libraries/libchamplain/default.nix        |  4 +-
 .../python-modules/adal/default.nix           |  4 +-
 .../python-modules/pygobject/3.nix            |  6 +--
 pkgs/tools/misc/colord/default.nix            | 12 ++++-
 pkgs/top-level/all-packages.nix               |  4 +-
 359 files changed, 913 insertions(+), 922 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/eog/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/evince/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/totem/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/vte/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/accerciser/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/accerciser/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/bijiben/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/cheese/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/evolution/default.nix (89%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/file-roller/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gedit/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gedit/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/ghex/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/ghex/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/glade/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/glade/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-boxes/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-calendar/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-characters/default.nix (88%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-clocks/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-documents/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-getting-started-docs/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-logs/default.nix (88%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-maps/default.nix (62%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-music/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-nettool/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-photos/default.nix (90%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-weather/default.nix (58%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/nautilus-sendto/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/polari/default.nix (81%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/seahorse/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/seahorse/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/vinagre/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/vinagre/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/adwaita-icon-theme/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/baobab/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/caribou/default.nix (99%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/dconf-editor/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/dconf-editor/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/dconf/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/empathy/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/eog/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/eog/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/epiphany/default.nix (93%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/evince/default.nix (90%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/evince/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/evolution-data-server/default.nix (62%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/folks/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gconf/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gcr/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gcr/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/3.16-wip/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/3.16-wip/disable_x_access_control.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/3.16-wip/sessions_dir.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/3.16-wip/xserver_path.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/default.nix (85%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/gdm-session-worker_xserver-path.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/gdm-x-session_extra_args.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/gdm-x-session_path.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/geocode-glib/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gjs/default.nix (65%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-backgrounds/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-bluetooth/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-bluetooth/src.nix (53%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-calculator/default.nix (91%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-common/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-common/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-contacts/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-contacts/gio_unix.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-contacts/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-control-center/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-desktop/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-dictionary/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-disk-utility/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-font-viewer/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-keyring/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-keyring/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-menus/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-online-accounts/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-online-miners/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-screenshot/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-screenshot/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-session/default.nix (93%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-settings-daemon/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-shell-extensions/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-shell/default.nix (81%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-software/default.nix (90%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-system-log/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-system-monitor/default.nix (80%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-terminal/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-themes-standard/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-themes-standard/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-user-docs/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-user-share/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-user-share/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/grilo-plugins/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/grilo/default.nix (92%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/grilo/setup-hook.sh (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gsettings-desktop-schemas/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gsound/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gtksourceview/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gtksourceview/nix_share_path.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gtksourceviewmm/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gtksourceviewmm/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gucharmap/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gucharmap/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libcroco/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgdata/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgee/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgee/fix_introspection_paths.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgepub/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgnome-keyring/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgnomekbd/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgnomekbd/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgweather/default.nix (81%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgxps/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libpeas/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libpeas/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libzapojit/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/mutter/default.nix (89%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/mutter/math.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/mutter/x86.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/nautilus/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/nautilus/extension_dir.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/rest/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/sushi/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/totem-pl-parser/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/totem/default.nix (99%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/totem/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/tracker/default.nix (91%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vino/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vino/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/2.90.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/default.nix (95%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/fix_g_test_init_calls.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/fix_vteseq_n_lookup_declaration.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/ng.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/vte/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp-tools/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp-tools/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp-xsl/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp-xsl/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/zenity/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/default.nix (98%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/desktop/rarian/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/anjuta/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/anjuta/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/devhelp/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/gdl/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/gdl/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/gnome-devel-docs/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/gnome-devel-docs/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/nemiver/bool_slot.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/nemiver/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/nemiver/safe_ptr.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/nemiver/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/aisleriot/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/aisleriot/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/five-or-more/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/five-or-more/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/four-in-a-row/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/four-in-a-row/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-chess/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-klotski/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-klotski/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-mahjongg/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-mahjongg/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-mines/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-nibbles/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-robots/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-robots/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-sudoku/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-taquin/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-taquin/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-tetravex/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-tetravex/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/hitori/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/hitori/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/iagno/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/iagno/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/lightsoff/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/quadrapassel/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/quadrapassel/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/swell-foop/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/tali/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/tali/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/installer.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/california/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/geary/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gexiv2/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gfbgraph/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gitg/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-autoar/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-packagekit/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch (77%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch (72%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch (69%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/default.nix (66%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/find_gsettings.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-video-effects/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gpaste/default.nix (82%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gspell/default.nix (64%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gspell/src.nix (65%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gtkhtml/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gtkhtml/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgames-support/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgda/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgda/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgit2-glib/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgit2-glib/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libmediaart/default.nix (82%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/pidgin/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/pomodoro/default.nix (100%)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index fc7fd49907e..a8932a90803 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -10,6 +10,11 @@
 has the following highlights: </para>
 
 <itemizedlist>
+  <listitem>
+    <para>
+      The Gnome version is now 3.24.
+    </para>
+  </listitem>
   <listitem>
     <para>
       The user handling now keeps track of deallocated UIDs/GIDs. When a user
@@ -207,7 +212,7 @@ rmdir /var/lib/ipfs/.ipfs
   <listitem>
     <para>
       Nixpkgs overlays may now be specified with a file as well as a directory. The
-      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and 
+      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and
       <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the
       <filename>~/.config/nixpkgs/overalys</filename> directory.
     </para>
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c63fede857..0e3b05cc592 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -103,14 +103,29 @@ in
             (filter (arg: arg != "-terminate") cfg.xserverArgs);
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
           # Find the mouse
-          XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
+          XCURSOR_PATH = "~/.icons:${gnome3.adwaita-icon-theme}/share/icons";
         };
         execCmd = "exec ${gdm}/bin/gdm";
       };
 
     # Because sd_login_monitor_new requires /run/systemd/machines
     systemd.services.display-manager.wants = [ "systemd-machined.service" ];
-    systemd.services.display-manager.after = [ "systemd-machined.service" ];
+    systemd.services.display-manager.after = [
+      "rc-local.service"
+      "systemd-machined.service"
+      "systemd-user-sessions.service"
+      "getty@tty1.service"
+    ];
+
+    systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
+    systemd.services.display-manager.serviceConfig = {
+        # Restart = "always"; - already defined in xserver.nix
+        KillMode = "mixed";
+        IgnoreSIGPIPE = "no";
+        BusName = "org.gnome.DisplayManager";
+        StandardOutput = "syslog";
+        StandardError = "inherit";
+    };
 
     systemd.services.display-manager.path = [ gnome3.gnome_session ];
 
diff --git a/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
deleted file mode 100644
index b2c36c3d7ae..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "bijiben-3.21.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/bijiben/3.21/bijiben-3.21.2.tar.xz;
-    sha256 = "d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
deleted file mode 100644
index 4a25b015393..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "cheese-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/cheese/3.22/cheese-3.22.0.tar.xz;
-    sha256 = "0b52e4b0021cfb86a5abbd17356b72693f724892165d91b3ff7f5031a1ce53ea";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
deleted file mode 100644
index a3e0121f6f1..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evolution-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evolution/3.22/evolution-3.22.0.tar.xz;
-    sha256 = "3e4742032b450cd8752097ba7e56302134e3653d510d4c53196654fb353ebbeb";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
deleted file mode 100644
index 029cdc2064d..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "file-roller-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/file-roller/3.22/file-roller-3.22.0.tar.xz;
-    sha256 = "5065b71d43deb3dc3c7af6efa3f3b1188a63bfafb213be86af1d262b1dc11d42";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
deleted file mode 100644
index ff43d41c53a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-boxes-3.22.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz;
-    sha256 = "1wngw4c052p5ghdsd0mdrn20yi8xs0hjdq30rdwv9sqh40liqnjq";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
deleted file mode 100644
index b1ff598acaf..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-calendar-3.22.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calendar/3.22/gnome-calendar-3.22.1.tar.xz;
-    sha256 = "e6a3670c63122c4b37fbe243a54486e019c1bfd9a27c709234fb81b9e0c13360";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
deleted file mode 100644
index d4b90eb4768..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-characters-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-characters/3.22/gnome-characters-3.22.0.tar.xz;
-    sha256 = "0778b625646d6d934cf252d58a2e16403889da6bfc237bdca1d3cb3258f63d4e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
deleted file mode 100644
index 81a857cf1c0..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-clocks-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-clocks/3.22/gnome-clocks-3.22.0.tar.xz;
-    sha256 = "cdcd4ccd9716e7f12487a80d1b173aa28d9bde536d6274fbbc31acd6606c0511";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
deleted file mode 100644
index ca9dca1ff4c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-documents-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-documents/3.22/gnome-documents-3.22.0.tar.xz;
-    sha256 = "edf5cd6b7b7f5847217b60885358030598e551010087d2a9d1765ae6777041ad";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
deleted file mode 100644
index 4cb82624254..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-getting-started-docs-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-getting-started-docs/3.22/gnome-getting-started-docs-3.22.0.tar.xz;
-    sha256 = "22b11fb4f6fd9f6d595dc01d5989fb1652c9a63732a4d1c997f3f5f82da75722";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
deleted file mode 100644
index 995120855d5..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-logs-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-logs/3.22/gnome-logs-3.22.0.tar.xz;
-    sha256 = "114da79579d69840904970b2b3a72dc8f6be76a5673174b6628b42fd6781eb4f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
deleted file mode 100644
index ef8c7a1287d..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gnome-maps-3.18.0/configure.ac.orig	2015-09-24 18:38:31.912498368 +0200
-+++ gnome-maps-3.18.0/configure.ac	2015-09-24 18:38:40.783320413 +0200
-@@ -50,8 +50,9 @@
-     folks                        >= $FOLKS_MIN_VERSION
-     geocode-glib-1.0             >= $GEOCODE_MIN_VERSION
-     champlain-0.12               >= $CHAMPLAIN_MIN_VERSION
-     libxml-2.0
-     rest-0.7
-+    libsoup-2.4
- ])
- AC_SUBST(GNOME_MAPS_LIB_CFLAGS)
- AC_SUBST(GNOME_MAPS_LIB_LIBS)
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
deleted file mode 100644
index ef668faef53..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-maps-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-maps/3.22/gnome-maps-3.22.0.tar.xz;
-    sha256 = "7ce98a683f1c38d3ba1b5d68c7d05add9f9366774678fd50fdeeda6987163c39";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
deleted file mode 100644
index 5b3a79a111a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-music-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-music/3.22/gnome-music-3.22.0.tar.xz;
-    sha256 = "170685ffa89556951b9fb0b9225b2bca863e54348d4079a56b8e5c4eeafa9b03";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
deleted file mode 100644
index f28d626ff94..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-photos-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-photos/3.22/gnome-photos-3.22.0.tar.xz;
-    sha256 = "568329142855901a85f325ee014176e24f735b15a496842bcd31f5cb2615ba53";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
deleted file mode 100644
index 8cfab25381e..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-weather-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.2.tar.xz;
-    sha256 = "7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
deleted file mode 100644
index a8c4b303c38..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "polari-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/polari/3.22/polari-3.22.0.tar.xz;
-    sha256 = "90ea3db7ed0a03d46d9376e3201b4332f56d6149bc284379c367159094b73818";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
deleted file mode 100644
index a48b404ceb6..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "adwaita-icon-theme-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.tar.xz;
-    sha256 = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
deleted file mode 100644
index df4cefc4816..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "baobab-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/baobab/3.22/baobab-3.22.0.tar.xz;
-    sha256 = "796e784886d5bdf2e9d8ac94d74d5f94e055f4285ef54dc16552fb9c9b9c3e99";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/src.nix b/pkgs/desktops/gnome-3/3.22/core/eog/src.nix
deleted file mode 100644
index f3995e6bc2c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/eog/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "eog-3.20.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz;
-    sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
deleted file mode 100644
index 2ec9189964a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "epiphany-3.22.6";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz;
-    sha256 = "0ib7z8x65gcr6vc6709df1rngcfrp3xn5ywqlrnc2xrsynrhghz9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
deleted file mode 100644
index 07997a5c095..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evince-3.22.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evince/3.22/evince-3.22.1.tar.xz;
-    sha256 = "f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
deleted file mode 100644
index 84817846f72..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evolution-data-server-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.0.tar.xz;
-    sha256 = "8653a9a28980e661e8b91ba335dae04a0553e12611ad155bc48fb3fb3c98653d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
deleted file mode 100644
index e100e013b78..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gdm-3.14.2/daemon/gdm-slave.c.orig	2015-04-16 15:05:27.844353079 +0200
-+++ gdm-3.14.2/daemon/gdm-slave.c	2015-04-16 15:05:40.240417915 +0200
-@@ -369,8 +369,9 @@
-                 gdm_error_trap_push ();
- 
-                 for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
--                        XAddHost (slave->priv->server_display, &host_entries[i]);
-+                        //XAddHost (slave->priv->server_display, &host_entries[i]);
-                 }
-+                XDisableAccessControl(slave->priv->server_display);
- 
-                 XSync (slave->priv->server_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
deleted file mode 100644
index 4556f418cc8..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd
---- a/configure.ac	2016-05-27 11:10:44.589740789 +0200
-+++ b/configure.ac	2016-05-27 11:11:00.146427723 +0200
-@@ -888,7 +888,7 @@
- dnl ---------------------------------------------------------------------------
- 
- PKG_CHECK_MODULES(SYSTEMD,
--                  [libsystemd-login >= 186 libsystemd-daemon],
-+                  [libsystemd],
-                   [have_systemd=yes], [have_systemd=no])
- 
- if test "x$with_systemd" = "xauto" ; then
-@@ -912,7 +912,7 @@
- AC_SUBST(SYSTEMD_LIBS)
- 
- PKG_CHECK_MODULES(JOURNALD,
--                  [libsystemd-journal],
-+                  [libsystemd],
-                   [have_journald=yes], [have_journald=no])
- 
- if test "x$enable_systemd_journal" = "xauto" ; then
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
deleted file mode 100644
index c87554078c7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/daemon/gdm-launch-environment.c	2015-06-22 15:11:07.277474398 +0000
-+++ b/daemon/gdm-launch-environment.c	2015-06-22 15:12:31.301157665 +0000
-@@ -48,8 +48,6 @@
- #include "gdm-session-enum-types.h"
- #include "gdm-launch-environment.h"
- 
--#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
--
- extern char **environ;
- 
- #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
-@@ -512,7 +510,7 @@
-                 gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);
-         } else {
-                 /* wrap it in dbus-launch */
--                char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);
-+                char *command = g_strdup (launch_environment->priv->command);
- 
-                 gdm_session_select_program (launch_environment->priv->session, command);
-                 g_free (command);
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
deleted file mode 100644
index 9714a68600a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/daemon/gdm-session.c.orig b/daemon/gdm-session.c
-index b839fea..053d4ac 100644
---- a/daemon/gdm-session.c.orig
-+++ b/daemon/gdm-session.c
-@@ -344,12 +344,16 @@ get_system_session_dirs (GdmSession *self)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                "/var/empty",
-                 "/etc/X11/sessions/",
-                 DMCONFDIR "/Sessions/",
-                 DATADIR "/gdm/BuiltInSessions/",
-                 DATADIR "/xsessions/",
-                 NULL
-         };
-+        if (getenv("GDM_SESSIONS_DIR") != NULL) {
-+                search_dirs[1] = getenv("GDM_SESSIONS_DIR");
-+        };
- 
- #ifdef ENABLE_WAYLAND_SUPPORT
-         if (self->priv->ignore_wayland) {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
deleted file mode 100644
index 795be7f4cfe..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gdm-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gdm/3.22/gdm-3.22.0.tar.xz;
-    sha256 = "b9180d07c6a4a3fb0e8df6bcb4f333008cb3071f0ef81e02f081ff8a144f62d4";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
deleted file mode 100644
index 3f2ec808cd6..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-server.c.orig b/daemon/gdm-server.c
-index 6357d34..5bef5c8 100644
---- a/daemon/gdm-server.c.orig
-+++ b/daemon/gdm-server.c
-@@ -264,7 +264,11 @@ gdm_server_init_command (GdmServer *server)
-         return;
- 
- fallback:
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- 
- }
-
diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
deleted file mode 100644
index 135e05e90e9..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "geocode-glib-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz;
-    sha256 = "669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
deleted file mode 100644
index 7af8d7c531b..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  name = "gjs-${major}.4";
-  major = "1.47";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz";
-    sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
deleted file mode 100644
index 2b20cae9cda..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-backgrounds-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-backgrounds/3.22/gnome-backgrounds-3.22.0.tar.xz;
-    sha256 = "6c83e01647375d5c409312d7215d038d705a3f214179227ed37d3158afdd001f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
deleted file mode 100644
index 891ce5c58f6..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-calculator-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calculator/3.22/gnome-calculator-3.22.0.tar.xz;
-    sha256 = "fa0f192fc0cad43a8520d4015780ce008d9fc6201bd2dd6dc06365ba45458728";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
deleted file mode 100644
index bbe7f5a009d..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-control-center-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-control-center/3.22/gnome-control-center-3.22.0.tar.xz;
-    sha256 = "d264ae919aeeb27987dcdd5af5577fad0590e1f184f506b563c89f356aab5052";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
deleted file mode 100644
index 8efa20f01dc..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-desktop-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-desktop/3.22/gnome-desktop-3.22.0.tar.xz;
-    sha256 = "cff36ccd8d0a62177a4c1513ec70d13ead3b84fdc208ba54199cf7616f05644d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
deleted file mode 100644
index 249cb314c2a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-dictionary-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz;
-    sha256 = "efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
deleted file mode 100644
index c0a0798cd27..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-disk-utility-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-disk-utility/3.22/gnome-disk-utility-3.22.0.tar.xz;
-    sha256 = "757d4ff438e63ac337a8681c9ef184a36143b39494381b609cdf889128d7fb22";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
deleted file mode 100644
index ee87655bba7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-font-viewer-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-font-viewer/3.22/gnome-font-viewer-3.22.0.tar.xz;
-    sha256 = "bd27cbc523016711508d7913878f32e262893cfcc7e10795171dbf8e35af9be0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
deleted file mode 100644
index 3c1c426d264..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-online-accounts-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.0.tar.xz;
-    sha256 = "aacce93a71bf5e687a45ae0d00f31ea0625ddd8143235d6d8c64c4ec21bbfa33";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
deleted file mode 100644
index 2bafae9967e..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-online-miners-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-online-miners/3.22/gnome-online-miners-3.22.0.tar.xz;
-    sha256 = "bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
deleted file mode 100644
index 29f1ad93abb..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-session-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-session/3.22/gnome-session-3.22.0.tar.xz;
-    sha256 = "ec5c5e133c8ff1c044802eb887f4911183c45ca2d9de4ce29c6f10768ddc8e42";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
deleted file mode 100644
index 1457aab1d01..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-settings-daemon-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-settings-daemon/3.22/gnome-settings-daemon-3.22.0.tar.xz;
-    sha256 = "430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
deleted file mode 100644
index e17d02a011f..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-extensions-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell-extensions/3.22/gnome-shell-extensions-3.22.0.tar.xz;
-    sha256 = "317b35f6f1299d5162e693d39b21031f5fe875083c4020217db3ec056e245fc5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
deleted file mode 100644
index b835eea019c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.0.tar.xz;
-    sha256 = "d8d22cc19e28641f2eac47e812065c209e4866b6e5f9d636647a0a8c96e5dca9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
deleted file mode 100644
index a05e6bd09e5..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-software-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-software/3.22/gnome-software-3.22.0.tar.xz;
-    sha256 = "22e30c84851b0768bd46dbb90de6d3308acdc2973d3ca4ee52a19cdb5a0182ba";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
deleted file mode 100644
index e8e9ba37501..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-system-monitor-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-system-monitor/3.22/gnome-system-monitor-3.22.0.tar.xz;
-    sha256 = "4339d36c2f7b702652ee03424a241f855992c583bb437d7083c61d8dcfe3fff8";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
deleted file mode 100644
index 5d8088d78d3..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-terminal-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-terminal/3.22/gnome-terminal-3.22.0.tar.xz;
-    sha256 = "97e6b1b4128ac133d8917b3940c71ddf9b89d189c5ac8402b1060126733993ed";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
deleted file mode 100644
index e7e67e0b4fb..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-user-docs-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-user-docs/3.22/gnome-user-docs-3.22.0.tar.xz;
-    sha256 = "7467825a1c56ae2522fe9e36622a84b8887c731bb5f24cecfbf49acc66f6e3fc";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
deleted file mode 100644
index 50a54eab7eb..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gsettings-desktop-schemas-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.tar.xz;
-    sha256 = "0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
deleted file mode 100644
index 6e010227fc3..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gtksourceview-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gtksourceview/3.22/gtksourceview-3.22.0.tar.xz;
-    sha256 = "70657f48732427984dce6cc812bdd3f2b701c0a49e0a0a08889705b3dadcf8e5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
deleted file mode 100644
index 94657351946..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "libgweather-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libgweather/3.20/libgweather-3.20.3.tar.xz;
-    sha256 = "fb6bc5b64ef5db3dc40a9798f072b83ebcafe7ff5af472aaee70600619b56c0b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
deleted file mode 100644
index 02e9b6e0d84..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "mutter-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/mutter/3.22/mutter-3.22.0.tar.xz;
-    sha256 = "a5acdde788f5d137ec6dfe218a214c1f6cfb7e2e851fbcebe0b2d67b4c96e5f3";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
deleted file mode 100644
index e0c7f3034f9..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "nautilus-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/nautilus/3.22/nautilus-3.22.0.tar.xz;
-    sha256 = "7671d9cf9df0321f5ad03abce03ab35ab6d643e1b3392a84f3c1d7c23ce29816";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
deleted file mode 100644
index e1fc1011b56..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "sushi-3.21.91";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/sushi/3.21/sushi-3.21.91.tar.xz;
-    sha256 = "db71c9ec3dd2dde6aed03b469253ce7d9f30c60ff50c2a8dc9f7776b70d15d55";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/src.nix b/pkgs/desktops/gnome-3/3.22/core/totem/src.nix
deleted file mode 100644
index 11e20f665b7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/totem/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "totem-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/totem/3.22/totem-3.22.0.tar.xz;
-    sha256 = "026a5b5b1674bdb941bc28e1ee95ecc168627e0fc323b6ec8d73407d21964fea";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
deleted file mode 100644
index 6889f6ee09e..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-fetchurl: rec {
-  major = "1.10";
-  minor = "0";
-  name = "tracker-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tracker/${major}/${name}.tar.xz";
-    sha256 = "df95b4a1e7de442f66d1097b725dd3cdd739862f491453fc7d7b1f88181a12fb";
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix b/pkgs/desktops/gnome-3/3.22/core/vte/src.nix
deleted file mode 100644
index d80749a2566..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  name = "vte-${major}.0";
-  major = "0.46";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vte/${major}/${name}.tar.xz";
-    sha256 = "5f7122e7860eb2470d310fc63df91d3ee32bab233729c2dc181a0cbc9b3249d7";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
deleted file mode 100644
index 75476b43b95..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "zenity-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/zenity/3.22/zenity-3.22.0.tar.xz;
-    sha256 = "1ecdfa1071d383b373b8135954b3ec38d402d671dcd528e69d144aff36a0e466";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
deleted file mode 100644
index 02747b9153c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "devhelp-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/devhelp/3.22/devhelp-3.22.0.tar.xz;
-    sha256 = "59cae02e12d238cc5fc3f049d779895ba89701426d9173f5b534d4ab90c5ffb0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
deleted file mode 100644
index 1cced81517d..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-chess-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-chess/3.22/gnome-chess-3.22.0.tar.xz;
-    sha256 = "838040c120af08aaa8ef1a6a284e2de296b998b37e49adb9436a12b6a428154a";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
deleted file mode 100644
index 67db003d99a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-mines-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-mines/3.22/gnome-mines-3.22.0.tar.xz;
-    sha256 = "ee6df05b36fdff0376371887c1375e63d9e90655146a9a787db3c3aa2b74908a";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
deleted file mode 100644
index e2948db9e4c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-nibbles-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-nibbles/3.22/gnome-nibbles-3.22.0.tar.xz;
-    sha256 = "9cbc0aa458af0a4c00fd1bd528c4c3fecaea713390e2cbee796b0a6930e0cb49";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
deleted file mode 100644
index 085cf2ffb20..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-sudoku-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-sudoku/3.22/gnome-sudoku-3.22.0.tar.xz;
-    sha256 = "0f39a7afb864c6cffa1991cc5fda958e0eb03329eebe21ca2d965588cf5fa0d5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
deleted file mode 100644
index c79aa1582a1..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "lightsoff-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/lightsoff/3.22/lightsoff-3.22.0.tar.xz;
-    sha256 = "0458e0ff99a10a99573db4d3e1ea5abde186056d8e32cf1f0bd76e25ff2c4fca";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
deleted file mode 100644
index e0644e539fb..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "swell-foop-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/swell-foop/3.22/swell-foop-3.22.0.tar.xz;
-    sha256 = "e7bb6f4c7932a17c3f48e5b7df66f4e3953642e8126389531592a79fdf71e0a4";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
deleted file mode 100644
index 5a78b8d0ca6..00000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gitg-3.23.90";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gitg/3.23/gitg-3.23.90.tar.xz;
-    sha256 = "0m3g8ag8nh6vj5m188l7sgkm7p8mrs094mjijqaaav3r6cz91fdg";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
deleted file mode 100644
index c9f10fa8cd7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  pname = "gnome-autoar";
-  version = "0.1";
-  name = "${pname}-${version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz";
-    sha256 = "f65cb810b562dc038ced739fbf59739fd5df1a8e848636e21f363ded9f349ac9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
deleted file mode 100644
index 8937b7dd1a7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-packagekit-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-packagekit/3.22/gnome-packagekit-3.22.0.tar.xz;
-    sha256 = "0b28d4928f9767a512723b49656266aaa2a7909d880e5e4238c0e3436ac4908c";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
deleted file mode 100644
index 88f3b3069f1..00000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-tweak-tool-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.tar.xz;
-    sha256 = "3d6ae11e13f6169ee543e573135e1e5697cf92ab8d86570c6f952021ae093abb";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
new file mode 100644
index 00000000000..ea2c063647f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "bijiben-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/bijiben/3.24/bijiben-3.24.1.tar.xz;
+    sha256 = "2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
new file mode 100644
index 00000000000..e10f79e8312
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "cheese-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz;
+    sha256 = "26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
similarity index 89%
rename from pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
index 8da7fab9037..3d152221a39 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
@@ -2,7 +2,8 @@
 , pkgconfig, gtk3, glib, libnotify, gtkspell3
 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
 , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap}:
+, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap
+, cmake}:
 
 let
   majVer = gnome3.version;
@@ -24,7 +25,9 @@ in stdenv.mkDerivation rec {
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
                   nss nspr libnotify procps highlight gnome3.libgweather
                   gnome3.gsettings_desktop_schemas
-                  gnome3.libgnome_keyring gnome3.glib_networking openldap ];
+                  gnome3.libgnome_keyring gnome3.glib_networking openldap
+                  cmake
+                ];
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
@@ -32,6 +35,10 @@ in stdenv.mkDerivation rec {
   configureFlags = [ "--disable-pst-import" "--disable-autoar"
                      "--disable-libcryptui" "--with-openldap"];
 
+  cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF"
+                 "-DENABLE_YTNEF=OFF" "-DENABLE_PST_IMPORT=OFF"
+               ];
+
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
new file mode 100644
index 00000000000..2aab7967d8a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "evolution-3.24.5";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz;
+    sha256 = "5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
new file mode 100644
index 00000000000..10a82877bcd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "file-roller-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz;
+    sha256 = "011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix b/pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix b/pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/glade/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/glade/src.nix b/pkgs/desktops/gnome-3/3.24/apps/glade/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/glade/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/glade/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
new file mode 100644
index 00000000000..dbed4617850
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-boxes-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz;
+    sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
new file mode 100644
index 00000000000..5d0eeadcc0a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-calendar-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz;
+    sha256 = "3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
similarity index 88%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
index 4571a5d50e8..0c7adcb0319 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
-    librsvg gnome3.defaultIconTheme
+    librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
new file mode 100644
index 00000000000..db14a10d65a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-characters-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz;
+    sha256 = "9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
new file mode 100644
index 00000000000..2497fe83c1e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-clocks-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz;
+    sha256 = "9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
new file mode 100644
index 00000000000..c1ca08a064b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-documents-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz;
+    sha256 = "c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
new file mode 100644
index 00000000000..027cbb59d88
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-getting-started-docs-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz;
+    sha256 = "9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
similarity index 88%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
index d4135fdb1ba..2fc27617d98 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    systemd gnome3.defaultIconTheme
+    systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
new file mode 100644
index 00000000000..53e303f3856
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-logs-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz;
+    sha256 = "9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
similarity index 62%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
index 8625f21f3db..5af407ef15c 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
-, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook
+, gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook
 , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
 , webkitgtk }:
 
@@ -11,12 +11,20 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
                   gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
                   gnome3.geocode_glib libchamplain file libsoup
-                  gdk_pixbuf librsvg autoreconfHook
+                  gdk_pixbuf librsvg libgweather autoreconfHook
                   gnome3.gsettings_desktop_schemas gnome3.evolution_data_server
                   gnome3.gnome_online_accounts gnome3.defaultIconTheme
                   webkitgtk ];
 
-  patches = [ ./soup.patch ];
+  # The .service file isn't wrapped with the correct environment
+  # so misses GIR files when started. By re-pointing from the gjs
+  # entry point to the wrapped binary we get back to a wrapped
+  # binary.
+  preConfigure = ''
+    substituteInPlace "data/org.gnome.Maps.service.in" \
+        --replace "Exec=@pkgdatadir@/org.gnome.Maps" \
+                  "Exec=$out/bin/gnome-maps"
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Maps;
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
new file mode 100644
index 00000000000..e45d7be3fb7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-maps-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz;
+    sha256 = "5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
new file mode 100644
index 00000000000..615c54583f2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-music-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz;
+    sha256 = "1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
similarity index 90%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
index df7e23ef9d4..6e8394950a6 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib
 , makeWrapper, itstool, gegl, babl, lcms2
 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook
-, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2 }:
+, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
                   gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
                   gnome3.gnome_online_accounts gnome3.gnome_desktop
                   lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-                  wrapGAppsHook gexiv2 ];
+                  wrapGAppsHook gexiv2 geocode_glib ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
new file mode 100644
index 00000000000..78f3b7d672a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-photos-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.2.tar.xz;
+    sha256 = "31ddc078ad2f6bc4bbfa2f71eb23377782750b9cb2ad2b0e6ff2a1971548cdf9";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
similarity index 58%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
index dbd5377d5bf..3b5542544d5 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
@@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
     libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas
   ];
 
+  # The .service file isn't wrapped with the correct environment
+  # so misses GIR files when started. By re-pointing from the gjs
+  # entry point to the wrapped binary we get back to a wrapped
+  # binary.
+  preConfigure = ''
+    substituteInPlace "data/org.gnome.Weather.Application.service.in" \
+        --replace "Exec=@pkgdatadir@/@PACKAGE_NAME@.Application" \
+                  "Exec=$out/bin/gnome-weather"
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Weather;
     description = "Access current weather conditions and forecasts";
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
new file mode 100644
index 00000000000..eef77b23504
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-weather-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz;
+    sha256 = "e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
similarity index 81%
rename from pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
index f14a1ef3c47..fc97d1b6d6e 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
 , telepathy_glib, gjs, itstool, telepathy_idle, libxml2
 , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup
-, gnome3, wrapGAppsHook, telepathy_logger }:
+, gnome3, wrapGAppsHook, telepathy_logger, gspell }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
-                  telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ];
+                  telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
new file mode 100644
index 00000000000..da7a37031f5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "polari-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz;
+    sha256 = "3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
new file mode 100644
index 00000000000..5700cb56913
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "adwaita-icon-theme-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz;
+    sha256 = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
new file mode 100644
index 00000000000..8a2e35d454e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "baobab-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz;
+    sha256 = "5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
similarity index 99%
rename from pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
index 2d71f1da592..e405d8edfba 100644
--- a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
   buildInputs = with gnome3;
     [ glib gtk clutter at_spi2_core dbus pythonPackages.python
       pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/empathy/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/default.nix b/pkgs/desktops/gnome-3/3.24/core/eog/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/eog/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/eog/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/eog/src.nix b/pkgs/desktops/gnome-3/3.24/core/eog/src.nix
new file mode 100644
index 00000000000..72b02d0bba5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/eog/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "eog-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz;
+    sha256 = "f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
similarity index 93%
rename from pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
index 015f8213b44..ec8cf118815 100644
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
@@ -2,7 +2,7 @@
 , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
 , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
 , sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }:
+, gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
                   gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
                   gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
-                  gst_all_1.gst-libav];
+                  gst_all_1.gst-libav json_glib ];
 
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
new file mode 100644
index 00000000000..85596c07fad
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "epiphany-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/epiphany/3.24/epiphany-3.24.3.tar.xz;
+    sha256 = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.24/core/evince/default.nix
similarity index 90%
rename from pkgs/desktops/gnome-3/3.22/core/evince/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/evince/default.nix
index 559e9b8575a..aca10516a38 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/evince/default.nix
@@ -10,13 +10,6 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2017-1000083"; # https://bugzilla.gnome.org/show_bug.cgi?id=784630
-      url = "https://git.gnome.org/browse/evince/patch/?id=fa072dbbfd96";
-      sha256 = "12xg00jvbsh54dr2dyq2ha5a05x2bpzd1lh2k3sppq3h7a02lsjy";
-    })
-  ];
   # missing help for now; fixing the autogen phase seemed too difficult
   postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am";
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/evince/src.nix b/pkgs/desktops/gnome-3/3.24/core/evince/src.nix
new file mode 100644
index 00000000000..aa45a79536a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/evince/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "evince-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz;
+    sha256 = "9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
similarity index 62%
rename from pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
index c2038ecdce6..9d51dc969d3 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
@@ -1,20 +1,25 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python, dconf
 , intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }:
+, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true,
+vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = with gnome3;
-    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts (stdenv.lib.getLib dconf)
-      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
+    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
+      (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper
+      icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk
+      libaccounts-glib ]
     ++ stdenv.lib.optional valaSupport vala_0_32;
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];
 
   # uoa irrelevant for now
-  configureFlags = [ "--disable-uoa" "--disable-google-auth" ]
-                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
+  cmakeFlags = [ "-DENABLE_UOA=OFF" "-DENABLE_GOA=OFF" ]
+                   ++ stdenv.lib.optionals valaSupport [
+                     "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON"
+                     "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
new file mode 100644
index 00000000000..655fffe0eb9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "evolution-data-server-3.24.5";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz;
+    sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix b/pkgs/desktops/gnome-3/3.24/core/folks/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/folks/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/folks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.24/core/gconf/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gcr/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.24/core/gcr/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gcr/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gcr/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
similarity index 85%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
index 0d8e46aeece..59f0381f2e8 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
 , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth }:
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth
+, librsvg }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -18,17 +19,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
                   accountsservice gnome3.dconf systemd
                   gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool plymouth ];
+                  libcanberra_gtk3 pam libtool plymouth librsvg ];
 
   enableParallelBuilding = true;
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch
-              ./sessions_dir.patch
+  patches = [ ./sessions_dir.patch
               ./gdm-x-session_extra_args.patch
               ./gdm-session-worker_xserver-path.patch
-             # ./disable_x_access_control.patch ./no-dbus-launch.patch
-             # ./libsystemd.patch
              ];
 
   installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
new file mode 100644
index 00000000000..bbc803d49c1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
@@ -0,0 +1,23 @@
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index ff3a1acb..b8705d8f 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -344,6 +344,7 @@ get_system_session_dirs (GdmSession *self)
+         char **search_dirs;
+ 
+         static const char *x_search_dirs[] = {
++                "/var/empty",
+                 "/etc/X11/sessions/",
+                 DMCONFDIR "/Sessions/",
+                 DATADIR "/gdm/BuiltInSessions/",
+@@ -351,6 +352,10 @@ get_system_session_dirs (GdmSession *self)
+                 NULL
+         };
+ 
++        if (getenv("GDM_SESSIONS_DIR") != NULL) {
++                x_search_dirs[0] = getenv("GDM_SESSIONS_DIR");
++        };
++
+         static const char *wayland_search_dir = DATADIR "/wayland-sessions/";
+ 
+         search_array = g_array_new (TRUE, TRUE, sizeof (char *));
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
new file mode 100644
index 00000000000..0dd7680467f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gdm-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz;
+    sha256 = "4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
new file mode 100644
index 00000000000..394e3a68c35
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "geocode-glib-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz;
+    sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
similarity index 65%
rename from pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
index 1141db03c40..10d9c46123d 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
@@ -1,12 +1,17 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_31, pango, readline, glib, libxml2, dbus }:
+, spidermonkey_38, pango, readline, glib, libxml2, dbus }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
 
-  propagatedBuildInputs = [ spidermonkey_31 ];
+  propagatedBuildInputs = [ spidermonkey_38 ];
+
+  # GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc
+  preConfigure = ''
+    sed -i s/mozjs-38/js/ configure
+  '';
 
   postInstall = ''
     sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
diff --git a/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
new file mode 100644
index 00000000000..27162fcbfd4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gjs-1.48.6";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz;
+    sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
new file mode 100644
index 00000000000..dce56f2341e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-backgrounds-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz;
+    sha256 = "cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
similarity index 53%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
index 474d4722b4a..5129b87e542 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-bluetooth-3.20.0";
+  name = "gnome-bluetooth-3.20.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz;
-    sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53";
+    url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz;
+    sha256 = "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
similarity index 91%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
index 0a177fbab31..12b8af206ea 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, libxml2
 , bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }:
+, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash gtk3 glib intltool itstool
                   libxml2 gnome3.gtksourceview mpfr gmp
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];
+                  gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
new file mode 100644
index 00000000000..9279cdb13af
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-calculator-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz;
+    sha256 = "44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch
rename to pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
new file mode 100644
index 00000000000..85dfcd2ef31
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-control-center-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz;
+    sha256 = "43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
new file mode 100644
index 00000000000..83c2979656c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-desktop-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz;
+    sha256 = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
new file mode 100644
index 00000000000..3c0a188c7b2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-dictionary-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz;
+    sha256 = "41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
new file mode 100644
index 00000000000..602b9eb340e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-disk-utility-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz;
+    sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
new file mode 100644
index 00000000000..f4e37d476dd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-font-viewer-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz;
+    sha256 = "f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
new file mode 100644
index 00000000000..2c51429cd0c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-online-accounts-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.2.tar.xz;
+    sha256 = "b70ad52d1541e1e5192dd060bb11552a3af5007ab477aa81d265d1cd1cf7afba";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
new file mode 100644
index 00000000000..00558f25295
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-online-miners-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz;
+    sha256 = "8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
similarity index 93%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
index 8dec630354c..2cd92ce39ca 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
+, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
   buildInputs = with gnome3;
     [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt
       gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
-      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
+      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd
+      epoxy
+    ];
 
   # FIXME: glib binaries shouldn't be in .dev!
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
new file mode 100644
index 00000000000..d323fea7631
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-session-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz;
+    sha256 = "3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
new file mode 100644
index 00000000000..03c213f2162
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-settings-daemon-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz;
+    sha256 = "68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
new file mode 100644
index 00000000000..cb9bf57ce4a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-shell-extensions-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz;
+    sha256 = "3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
similarity index 81%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
index 2ce3f9e3927..a694da0844d 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
@@ -1,14 +1,15 @@
 { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core
 , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, sqlite, libgweather, libcanberra_gtk3
+, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2
 , libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
+, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
 
 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
 
 let
   pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+
 in stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
@@ -17,24 +18,29 @@ in stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg
+      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf
+      (librsvg.override { enableIntrospection = true; })
       clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
       libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
       libical libtool nss gtk gstreamer makeWrapper gdm
-      libcanberra_gtk3 gnome_control_center
+      libcanberra_gtk3 gnome_control_center geoclue2
       defaultIconTheme sqlite gnome3.gnome-bluetooth
       libgweather # not declared at build time, but typelib is needed at runtime
       gnome3.gnome-clocks # schemas needed
       at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon
-      pythonEnv gobjectIntrospection (stdenv.lib.getLib dconf) ];
+      gobjectIntrospection (stdenv.lib.getLib dconf) ];
 
   installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
 
   preBuild = ''
     patchShebangs src/data-to-c.pl
     substituteInPlace data/Makefile --replace " install-keysDATA" ""
+
+    substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
+    substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
   '';
 
+
   preFixup = with gnome3; ''
     wrapProgram "$out/bin/gnome-shell" \
       --prefix PATH : "${unzip}/bin" \
@@ -44,6 +50,9 @@ in stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
       --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
 
+    wrapProgram "$out/bin/gnome-shell-extension-prefs" \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
new file mode 100644
index 00000000000..7cb2bd89221
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-shell-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz;
+    sha256 = "58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
similarity index 90%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
index a6a196625b4..2f4a1427ec0 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
 , appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3
-, json_glib, libsecret }:
+, json_glib, libsecret, valgrind-light }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
                   gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
                   gtkspell3 json_glib libsecret
-                  polkit attr acl libyaml ];
+                  polkit attr acl libyaml valgrind-light ];
   propagatedBuildInputs = [ isocodes ];
 
   postInstall = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
new file mode 100644
index 00000000000..9d847b3af7d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-software-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-software/3.24/gnome-software-3.24.3.tar.xz;
+    sha256 = "0dbc8cbf0e46c5ef8c6a34391622d1532cf05c49976b39a8b8ee1fff8d8f75e3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
similarity index 80%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
index 8c3bf86edcf..3164e4dd74b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
 , bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
+, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
                   gtkmm3 libgtop wrapGAppsHook
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas ];
+                  gnome3.gsettings_desktop_schemas systemd ];
 
   preFixup = ''
     gappsWrapperArgs+=(
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  # fails to build without --enable-static
+  configureFlags = ["--enable-systemd" "--enable-static"];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
new file mode 100644
index 00000000000..aab373b9715
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-system-monitor-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz;
+    sha256 = "c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
new file mode 100644
index 00000000000..2aa084cc493
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-terminal-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz;
+    sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
new file mode 100644
index 00000000000..f617d41ff30
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-user-docs-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz;
+    sha256 = "c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
similarity index 92%
rename from pkgs/desktops/gnome-3/3.22/core/grilo/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
index 0deac26c259..b4a794812a5 100644
--- a/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   major = "0.3"; # if you change this, also change ./setup-hook.sh
-  minor = "2";
+  minor = "3";
   name = "grilo-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
-    sha256 = "f26f684a5d76aea8dbce136750bc67d2170b36575f109292fbb78ae99ec87f5b";
+    sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw";
   };
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh
rename to pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
new file mode 100644
index 00000000000..22760d2be11
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gsettings-desktop-schemas-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz;
+    sha256 = "f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gsound/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch
rename to pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
new file mode 100644
index 00000000000..8648c595bb9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gtksourceview-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.3.tar.xz;
+    sha256 = "3eed05486a6420c3e2fdda0bbb19a0d905ed09ebf442302a026ab7e574204cbd";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch
rename to pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
similarity index 81%
rename from pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
index 79ede15df8f..9dbed05523c 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
@@ -4,8 +4,6 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
   configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
   propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
new file mode 100644
index 00000000000..6324a27b612
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "libgweather-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz;
+    sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix b/pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
similarity index 89%
rename from pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
index 4818d05517b..ebceb4ef706 100644
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
-, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libudev, libinput
+, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
 , libgudev, xwayland }:
 
 stdenv.mkDerivation rec {
@@ -11,11 +11,17 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
 
+  propagatedBuildInputs = [
+    # required for pkgconfig to detect mutter-clutter
+    libXtst
+  ];
+
   buildInputs = with gnome3;
     [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
       gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
       gnome3.geocode_glib libudev libinput libgudev
-      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
+      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
+      libxkbcommon ];
 
   preFixup = ''
     wrapProgram "$out/bin/mutter" \
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch b/pkgs/desktops/gnome-3/3.24/core/mutter/math.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/mutter/math.patch
rename to pkgs/desktops/gnome-3/3.24/core/mutter/math.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
new file mode 100644
index 00000000000..579ee0689e8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "mutter-3.24.4";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz;
+    sha256 = "7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
rename to pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch
rename to pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
new file mode 100644
index 00000000000..37c81a54a31
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "nautilus-3.24.2.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz;
+    sha256 = "357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/rest/default.nix b/pkgs/desktops/gnome-3/3.24/core/rest/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/rest/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/rest/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/sushi/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
new file mode 100644
index 00000000000..a713aef6f7f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "sushi-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz;
+    sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
similarity index 99%
rename from pkgs/desktops/gnome-3/3.22/core/totem/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/totem/default.nix
index 6e62a2d522f..b3e9e5dd1fe 100644
--- a/pkgs/desktops/gnome-3/3.22/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
 
   GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
-
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem/src.nix b/pkgs/desktops/gnome-3/3.24/core/totem/src.nix
new file mode 100644
index 00000000000..2067945f99e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/totem/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "totem-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/totem/3.24/totem-3.24.0.tar.xz;
+    sha256 = "9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
similarity index 91%
rename from pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
index b086e386059..a60c38015c0 100644
--- a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
@@ -5,7 +5,8 @@
 , evolution_data_server, gst_all_1, poppler
 , icu, taglib, libjpeg, libtiff, giflib, libcue
 , libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2 }:
+, libpng, libexif, libgsf, libuuid, bzip2
+, libsoup, json_glib, libseccomp }:
 
 stdenv.mkDerivation rec {
 
@@ -24,7 +25,9 @@ stdenv.mkDerivation rec {
                   upower libnotify evolution_data_server gnome3.libgee
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
                   poppler icu taglib libjpeg libtiff giflib libvorbis
-                  exempi networkmanager libpng libexif libgsf libuuid ];
+                  exempi networkmanager libpng libexif libgsf libuuid
+                  libsoup json_glib libseccomp
+                ];
 
   preConfigure = ''
     substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
diff --git a/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
new file mode 100644
index 00000000000..7a9b9ce3e38
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "tracker-1.12.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz;
+    sha256 = "1mpq418lzba7fad0w0m3bnxvz3khf461b5zya8zmq5n1g0w99ki3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix b/pkgs/desktops/gnome-3/3.24/core/vino/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vino/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/vino/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/src.nix b/pkgs/desktops/gnome-3/3.24/core/vino/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vino/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/vino/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
rename to pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
similarity index 95%
rename from pkgs/desktops/gnome-3/3.22/core/vte/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/vte/default.nix
index 09b83e14923..7eabe6ad9d4 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
-                  gnome3.gtk3 ncurses vala_0_32 libxml2 ];
+                  gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ];
 
   propagatedBuildInputs = [ gnutls pcre2 ];
 
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch b/pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch
rename to pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch b/pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch
rename to pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/ng.nix b/pkgs/desktops/gnome-3/3.24/core/vte/ng.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vte/ng.nix
rename to pkgs/desktops/gnome-3/3.24/core/vte/ng.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/src.nix b/pkgs/desktops/gnome-3/3.24/core/vte/src.nix
new file mode 100644
index 00000000000..841798848e6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "vte-0.48.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz;
+    sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.24/core/yelp/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.24/core/zenity/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/zenity/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
new file mode 100644
index 00000000000..cb12262725a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "zenity-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz;
+    sha256 = "6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.24/default.nix
similarity index 98%
rename from pkgs/desktops/gnome-3/3.22/default.nix
rename to pkgs/desktops/gnome-3/3.24/default.nix
index 1944cc98cfb..e3d53d3a24e 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/default.nix
@@ -13,7 +13,7 @@ let
 
   callPackage = pkgs.newScope self;
 
-  version = "3.22";
+  version = "3.24";
   maintainers = with pkgs.lib.maintainers; [ lethalman ];
 
   corePackages = with gnome3; [
@@ -255,10 +255,7 @@ let
 
   accerciser = callPackage ./apps/accerciser { };
 
-  bijiben = callPackage ./apps/bijiben {
-    # https://bugzilla.gnome.org/show_bug.cgi?id=728293
-    webkitgtk = pkgs.webkitgtk24x-gtk3;
-  };
+  bijiben = callPackage ./apps/bijiben { };
 
   cheese = callPackage ./apps/cheese { };
 
diff --git a/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix
rename to pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
new file mode 100644
index 00000000000..b13de444c7e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "devhelp-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz;
+    sha256 = "4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch
rename to pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch
rename to pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
new file mode 100644
index 00000000000..3fb218ab602
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-chess-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz;
+    sha256 = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
new file mode 100644
index 00000000000..4b0e85fdef1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-mines-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz;
+    sha256 = "e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
new file mode 100644
index 00000000000..133e9651fa7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-nibbles-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-3.24.0.tar.xz;
+    sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
new file mode 100644
index 00000000000..597196a5ec8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-sudoku-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz;
+    sha256 = "04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/hitori/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix b/pkgs/desktops/gnome-3/3.24/games/hitori/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/hitori/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/hitori/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/iagno/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.24/games/iagno/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/iagno/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/iagno/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
new file mode 100644
index 00000000000..2a26df6615b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "lightsoff-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz;
+    sha256 = "5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
new file mode 100644
index 00000000000..7fa5f724de2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "swell-foop-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz;
+    sha256 = "1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/default.nix b/pkgs/desktops/gnome-3/3.24/games/tali/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/tali/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/tali/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/src.nix b/pkgs/desktops/gnome-3/3.24/games/tali/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/tali/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/tali/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/installer.nix b/pkgs/desktops/gnome-3/3.24/installer.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/installer.nix
rename to pkgs/desktops/gnome-3/3.24/installer.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
rename to pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/default.nix b/pkgs/desktops/gnome-3/3.24/misc/california/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/california/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/california/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/geary/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
new file mode 100644
index 00000000000..9c6dd2148cc
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gitg-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gitg/3.24/gitg-3.24.0.tar.xz;
+    sha256 = "3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
new file mode 100644
index 00000000000..ee2ade83ee6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-autoar-0.2.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.2.tar.xz;
+    sha256 = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
new file mode 100644
index 00000000000..992badf1f4f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-packagekit-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz;
+    sha256 = "8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
similarity index 77%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
index 7a16d2c24e5..d236730282a 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
@@ -1,6 +1,6 @@
-From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001
+From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sat, 1 Aug 2015 21:01:11 +0200
+Date: Sun, 25 Jun 2017 11:32:30 +0100
 Subject: [PATCH 1/3] Search for themes and icons in system data dirs
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 1/3] Search for themes and icons in system data dirs
  gtweak/utils.py                        | 17 +++++++++++++++++
  3 files changed, 23 insertions(+), 18 deletions(-)
 
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index 97751ed..db89b85 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
 @@ -26,7 +26,7 @@ from gi.repository import Gtk
  from gi.repository import GLib
  
@@ -22,7 +22,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
  from gtweak.gshellwrapper import GnomeShellFactory
  from gtweak.gsettings import GSettingsSetting
-@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
          if gtk_ver % 2: # Want even number
              gtk_ver += 1
  
@@ -34,7 +34,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
                      os.path.exists(os.path.join(d, "gtk-2.0")) and \
                          (os.path.exists(os.path.join(d, "gtk-3.0")) or \
                           os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
-@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTw
+@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_icon_themes(self):
@@ -46,7 +46,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
                      os.path.isdir(d) and \
  			os.path.exists(os.path.join(d, "index.theme")))
          return valid
-@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsCombo
+@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_cursor_themes(self):
@@ -58,20 +58,20 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
                      os.path.isdir(d) and \
                          os.path.exists(os.path.join(d, "cursors")))
          return valid
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
+diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
+index 69c4b7e..b06900c 100644
+--- a/gtweak/tweaks/tweak_group_keymouse.py
++++ b/gtweak/tweaks/tweak_group_keymouse.py
+@@ -21,7 +21,7 @@ from gi.repository import GLib
  
  import gtweak
+ from gtweak.gshellwrapper import GnomeShellFactory
 -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
 +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
  from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
  
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+ _shell = GnomeShellFactory().get_shell()
+@@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_key_themes(self):
@@ -83,10 +83,10 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
                      os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
                      os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
          return valid
-Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+diff --git a/gtweak/utils.py b/gtweak/utils.py
+index 39f8833..b0993b6 100644
+--- a/gtweak/utils.py
++++ b/gtweak/utils.py
 @@ -21,6 +21,7 @@ import tempfile
  import shutil
  import subprocess
@@ -95,7 +95,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
  
  import gtweak
  from gtweak.gsettings import GSettingsSetting
-@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, bl
+@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True):
          stdout, stderr = p.communicate()
          return stdout, stderr, p.returncode
  
@@ -118,3 +118,6 @@ Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
  @singleton
  class AutostartManager:
  
+-- 
+2.12.2
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
similarity index 72%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
index 5ddc13949cb..40c0969d588 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
@@ -1,6 +1,6 @@
-From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001
+From 25c047ac6a2ac892e2be3d7e002fbf7a16725a4c Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sat, 1 Aug 2015 21:26:57 +0200
+Date: Sun, 25 Jun 2017 11:35:10 +0100
 Subject: [PATCH 2/3] Don't show multiple entries for a single theme
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 2/3] Don't show multiple entries for a single theme
  gtweak/utils.py                        | 16 ++++++++++++++++
  3 files changed, 22 insertions(+), 6 deletions(-)
 
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index db89b85..4697fe3 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
 @@ -26,7 +26,7 @@ from gi.repository import Gtk
  from gi.repository import GLib
  
@@ -22,7 +22,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
  from gtweak.gshellwrapper import GnomeShellFactory
  from gtweak.gsettings import GSettingsSetting
-@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
                      os.path.exists(os.path.join(d, "gtk-2.0")) and \
                          (os.path.exists(os.path.join(d, "gtk-3.0")) or \
                           os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
@@ -31,7 +31,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  
  class IconThemeSwitcher(GSettingsComboTweak):
      def __init__(self, **options):
-@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTw
+@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("icons"), lambda d:
                      os.path.isdir(d) and \
  			os.path.exists(os.path.join(d, "index.theme")))
@@ -40,7 +40,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  
  class CursorThemeSwitcher(GSettingsComboTweak):
      def __init__(self, **options):
-@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsCombo
+@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("icons"), lambda d:
                      os.path.isdir(d) and \
                          os.path.exists(os.path.join(d, "cursors")))
@@ -49,20 +49,20 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  
  class ShellThemeTweak(Gtk.Box, Tweak):
  
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
+diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
+index b06900c..d34793e 100644
+--- a/gtweak/tweaks/tweak_group_keymouse.py
++++ b/gtweak/tweaks/tweak_group_keymouse.py
+@@ -21,7 +21,7 @@ from gi.repository import GLib
  
  import gtweak
+ from gtweak.gshellwrapper import GnomeShellFactory
 -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
 +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
  from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
  
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+ _shell = GnomeShellFactory().get_shell()
+@@ -44,7 +44,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("themes"), lambda d:
                      os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
                      os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
@@ -71,10 +71,10 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
  
  TWEAK_GROUPS = [
      ListBoxTweakGroup(_("Keyboard and Mouse"),
-Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+diff --git a/gtweak/utils.py b/gtweak/utils.py
+index b0993b6..0d995bc 100644
+--- a/gtweak/utils.py
++++ b/gtweak/utils.py
 @@ -133,6 +133,22 @@ def get_resource_dirs(resource):
  
      return [dir for dir in dirs if os.path.isdir(dir)]
@@ -98,3 +98,6 @@ Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
  @singleton
  class AutostartManager:
  
+-- 
+2.12.2
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
similarity index 69%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
index b25b2d6dc4a..5082a55387a 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
@@ -1,19 +1,17 @@
-From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001
+From ba2eb4be6c69ee8206e0139268c896e6a2b278d8 Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sun, 2 Aug 2015 12:01:20 +0200
+Date: Sun, 25 Jun 2017 11:50:33 +0100
 Subject: [PATCH 3/3] Create config dir if it doesn't exist
 
-Otherwise gnome-tweak-tool can't enable the dark theme and fails
-without a clear error message.
 ---
  gtweak/gtksettings.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
-index bcec9f1..f39991b 100644
+index a0c163b..f5883ec 100644
 --- a/gtweak/gtksettings.py
 +++ b/gtweak/gtksettings.py
-@@ -35,6 +35,10 @@ class GtkSettingsManager:
+@@ -36,6 +36,10 @@ class GtkSettingsManager:
      def _get_keyfile(self):
          keyfile = None
          try:
@@ -25,5 +23,5 @@ index bcec9f1..f39991b 100644
              keyfile.load_from_file(self._path, 0)
          except MemoryError:
 -- 
-2.7.0
+2.12.2
 
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
similarity index 66%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
index 5a1baa5e330..1df3c1ffdb7 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
@@ -1,11 +1,9 @@
 { stdenv, intltool, fetchurl, atk
 , pkgconfig, gtk3, glib, libsoup
-, bash, makeWrapper, itstool, libxml2, python2Packages
+, bash, itstool, libxml2, python2Packages
 , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
 
-let
-  pythonEnv = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   doCheck = true;
@@ -15,16 +13,17 @@ in stdenv.mkDerivation rec {
   makeFlags = [ "DESTDIR=/" ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gnome3.gsettings_desktop_schemas file
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  libnotify gnome3.gnome_shell
+                  libnotify gnome3.gnome_shell python2Packages.pygobject3
                   libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-                  gnome3.gnome_desktop wrapGAppsHook
-                  python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
+                  gnome3.gnome_desktop wrapGAppsHook gobjectIntrospection
+                ];
 
-  PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PYTHONPATH : "$out/${python2Packages.python.sitePackages}:$PYTHONPATH")
+  '';
 
   patches = [
     ./find_gsettings.patch
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
new file mode 100644
index 00000000000..0af83053fa8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-tweak-tool-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz;
+    sha256 = "19226b374148d660330af9a8341087c2f869bb24355f4dcc87857169eca9f565";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
similarity index 82%
rename from pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
index 99766ad898e..2bfc6c73eb4 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala_0_32, glib, gjs, mutter
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.20.4";
+  version = "3.24.2";
   name = "gpaste-${version}";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax";
+    sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340";
   };
 
-  buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib
+  buildInputs = [ autoreconfHook pkgconfig vala_0_32 glib gjs mutter
                   gtk3 gnome3.gnome_control_center dbus
                   clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ];
 
-  preConfigure = "intltoolize -f";
-
   configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
                      "--with-dbusservicesdir=$(out)/share/dbus-1/services"
                      "--with-systemduserunitdir=$(out)/etc/systemd/user" ];
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
similarity index 64%
rename from pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
index 3024d3ed59f..44573d1a5bb 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
@@ -3,7 +3,9 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig glib gtk3 enchant isocodes vala ];
+  propagatedBuildInputs = [ enchant ]; # required for pkgconfig
+
+  buildInputs = [ pkgconfig glib gtk3 isocodes vala ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
similarity index 65%
rename from pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
index 850e13fb011..fd55e654d55 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
@@ -1,10 +1,10 @@
 fetchurl: rec {
-  major = "1.2";
+  major = "1.4";
   minor = "1";
   name = "gspell-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz";
-    sha256 = "18zisdrq14my2iq6iv3lhqfn9jg98bqwbzcdidp7hfk915gkw74z";
+    sha256 = "1ghh1xdzf04mfgb13zqpj88krpa44xv2vbyhm6k017kzrpz8hbs4";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix b/pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
similarity index 82%
rename from pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
index b8648012573..9988541e0f5 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
@@ -4,11 +4,11 @@ let
   majorVersion = "1.9";
 in
 stdenv.mkDerivation rec {
-  name = "libmediaart-${majorVersion}.0";
+  name = "libmediaart-${majorVersion}.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
-    sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
+    sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v";
   };
 
   buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
index 8a99932e830..bda356cf4c3 100644
--- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
@@ -7,24 +7,24 @@ name="chrome-gnome-shell";
     rev = "7d99523e90805cb65027cc2f5f1191a957dcf276";
     sha256 = "0qc34dbhsz5yf4z5bx6py08h561rcxw9928drgk9256g3vnygnbc";
   };
- 
+
  buildInputs = [ gnome3.gnome_shell makeWrapper jq dbus gobjectIntrospection
  python python27Packages.requests python27Packages.pygobject3 wrapGAppsHook];
 
  preConfigure = ''
- mkdir build usr etc
- cd build
- ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../
- substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc"  
+   mkdir build usr etc
+   cd build
+   ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../
+   substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc"
  '';
 
  postInstall = ''
     rm $out/etc/opt/chrome/policies/managed/chrome-gnome-shell.json
     rm $out/etc/chromium/policies/managed/chrome-gnome-shell.json
     wrapProgram $out/usr/bin/chrome-gnome-shell \
-      --prefix PATH '"${dbus}/bin/dbus:$PATH"' \
-      --prefix PATH '"${gnome3.gnome_shell}:$PATH"' \
-      --prefix PYTHONPATH : "$PYTHONPATH" 
+      --prefix PATH : '"${dbus}/bin"' \
+      --prefix PATH : '"${gnome3.gnome_shell}/bin"' \
+      --prefix PYTHONPATH : "$PYTHONPATH"
 
   '';
 
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 4d5b29f6cc6..4d788e909e2 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-dash-to-dock-${version}";
-  version = "v57";
+  version = "v60";
 
   src = fetchFromGitHub {
     owner = "micheleg";
     repo = "dash-to-dock";
-    rev = "97f6a0bb95b9f87d7a34a074c9b3624b65111794";
-    sha256 = "0b9i89hpn9k63zcrbl4bhs7qfb70wh09870fwv2ik7hajm64kynn";
+    rev = "extensions.gnome.org-" + version;
+    sha256 = "0w9km1zcxcskrsfr392zx945k227qajnw09pxc20d1vwv78wlgy3";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 45be1d8710d..3967a8c9ca2 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   name = "mate-themes-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = gnome3.version;
+  # There is no 3.24 release.
+  major-ver = if stdenv.lib.versionOlder gnome3.version "3.23" then gnome3.version else "3.22";
   minor-ver = {
     "3.20" = "22";
     "3.22" = "13";
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 03853192531..4230e1e7d6e 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib
 , gtk_doc, autoconf, automake, libtool, libarchive, libyaml
 , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
-, libuuid, json_glib, autoconf-archive
+, libuuid, json_glib, autoconf-archive, gperf
 }:
 
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.6.3";
+  name = "appstream-glib-0.6.13";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "appstream-glib";
     rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "12l0vzhi9vpyrnf7vrpq21rb26mb6yskp5zgngdjyjanwhzmc617";
+    sha256 = "1csscszdp1imd0hiib6xx7mfylfl1r64xmma14p5jq1yprprpa9h";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool autoconf-archive ];
   buildInputs = [ glib gtk_doc gettext sqlite libsoup
                   gcab attr acl docbook_xsl libuuid json_glib
-                  libarchive libyaml gobjectIntrospection ];
+                  libarchive libyaml gobjectIntrospection gperf ];
   propagatedBuildInputs = [ gtk3 ];
   configureScript = "./autogen.sh";
 
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 545612d5c15..54a84487671 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.24";
+  name = "babl-0.1.28";
 
   src = fetchurl {
     url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "02wxyaa9kjfypmg31avp2dxh16sfx9701ww6dmp0ggz5vnng2as7";
+    sha256 = "00w6xfcv960c98qvxv81gcbj8l1jiab9sggmdl77m19awwiyvwv3";
   };
 
   meta = with stdenv.lib; { 
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 41c7f8db6d2..2b5f7069681 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   major = "3.0";
-  minor = "20";
+  minor = "24";
   name = "clutter-gst-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
-    sha256 = "1jb6q0f6vbh8nskz88siny70pm43wbnw2wzr2klsyb9axn3if0d0";
+    sha256 = "0v6cg0syh4vx7y7ni47jsvr2r57q0j3h1f1gjlp0ciscixywiwg9";
   };
 
   propagatedBuildInputs = [ clutter gtk3 glib cogl ];
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index a0479d9d73c..3292c8e353f 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
+, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, 
 gobjectIntrospection, gtk3
 }:
 
 let
   ver_maj = "1.26";
-  ver_min = "0";
+  ver_min = "2";
 in
 stdenv.mkDerivation rec {
   name = "clutter-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7";
+    sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7";
   };
 
   buildInputs = [ gtk3 ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection
+      atk json_glib gobjectIntrospection libxcb
     ];
 
   configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
index df68eecd137..48b1e47e0ed 100644
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -2,11 +2,11 @@
 , librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw }:
 
 stdenv.mkDerivation rec {
-  name = "gegl-0.3.6";
+  name = "gegl-0.3.18";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
-    sha256 = "08m7dlf2kwmp7jw3qskwxas192swhn1g4jcd8aldg9drfjygprvh";
+    sha256 = "1ywihjav9yhmsvbrdyx9c5q71rqdkjg8l66ywca6s4yydvr8x1fp";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 9aba42fdf4b..433a1722e76 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, libxslt }:
+{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2,
+  libxslt, glib_networking }:
 
 stdenv.mkDerivation rec {
   name = "geoclue-0.12.0";
@@ -7,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
   };
 
-  buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt ];
+  buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt glib_networking ];
 
   propagatedBuildInputs = [dbus glib dbus_glib];
 
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 071941d66c3..e76e48ad8fc 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -43,7 +43,7 @@ let
   '';
 
   ver_maj = "2.52";
-  ver_min = "1";
+  ver_min = "3";
 in
 
 stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f";
+    sha256 = "0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 4773cc38000..4c1f6135b49 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -7,8 +7,8 @@
 # In that case its about 6MB which could be separated
 
 let
-  ver_maj = "1.50";
-  ver_min = "0";
+  ver_maj = "1.52";
+  ver_min = "1";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-    sha256 = "1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5";
+    sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 4037de5a9cf..67302f330b9 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite
-, clutter_gtk, libsoup /*, libmemphis */ }:
+, clutter_gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:
 
 stdenv.mkDerivation rec {
   major = "0.12";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi";
   };
 
-  buildInputs = [ pkgconfig ];
+  buildInputs = [ pkgconfig gobjectIntrospection ];
 
   propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
 
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index 22ed76b9e59..4673e5461d3 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, requests, pyjwt }:
+, requests, pyjwt, dateutil }:
 
 buildPythonPackage rec {
   pname = "adal";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325";
   };
 
-  propagatedBuildInputs =  [ requests pyjwt ];
+  propagatedBuildInputs =  [ requests pyjwt dateutil ];
 
   meta = with stdenv.lib; {
     description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 984b1184434..ce7210391c6 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
 
 buildPythonPackage rec {
-  major = "3.22";
-  minor = "0";
+  major = "3.24";
+  minor = "1";
   name = "pygobject-${major}.${minor}";
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";
-    sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7";
+    sha256 = "1zdzznrj2s1gsrv2z4r0n88fzba8zjc1n2r313xi77lhl1daja56";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 222b04db0d0..46f3786a6df 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, bash-completion
 , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
-, gtk_doc, gobjectIntrospection, argyllcms
+, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook
 , libgudev, sane-backends }:
 
 stdenv.mkDerivation rec {
@@ -10,9 +10,16 @@ stdenv.mkDerivation rec {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
     sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";
   };
+   nativeBuildInputs = [ autoreconfHook intltool ];
 
   enableParallelBuilding = true;
 
+  # Version mismatch requires intltoolize to overwrite
+  # with newer version.
+  preConfigure = ''
+    intltoolize --force
+  '';
+
   configureFlags = [
     "--enable-sane"
     "--with-udevrulesdir=$(out)/lib/udev/rules.d"
@@ -21,12 +28,13 @@ stdenv.mkDerivation rec {
     "--disable-bash-completion"
   ];
 
+
   # don't touch /var at install time, colord creates what it needs at runtime
   postPatch = ''
     sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
   '';
 
-  buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
+  buildInputs = [ glib polkit pkgconfig gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
                   bash-completion argyllcms libgudev sane-backends ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e51bc545aec..f76948f7086 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17749,9 +17749,9 @@ with pkgs;
     libcanberra = self.libcanberra_gtk2;
   });
 
-  gnome3_22 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.22 { });
+  gnome3_24 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.24 { });
 
-  gnome3 = gnome3_22;
+  gnome3 = gnome3_24;
 
   gnomeExtensions = {
     caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };

From 3247c940e06d20d2f01fd315e9bda7295d8cb40e Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 15:55:05 +0100
Subject: [PATCH 2842/3246] gnome-photos: 3.24.2 -> -3.24.3

---
 pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
index 78f3b7d672a..204897f6d36 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-photos-3.24.2";
+  name = "gnome-photos-3.24.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.2.tar.xz;
-    sha256 = "31ddc078ad2f6bc4bbfa2f71eb23377782750b9cb2ad2b0e6ff2a1971548cdf9";
+    url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.3.tar.xz;
+    sha256 = "cd365629ce584d223c023676a88b6194012bbc561c4a4b1c8eca462425e76288";
   };
 }

From 932b1673219a1c46becb024c65c38262cd5a7a8c Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 15:56:04 +0100
Subject: [PATCH 2843/3246] Fix indentation.

---
 nixos/modules/services/x11/display-managers/gdm.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 0e3b05cc592..bd16f221059 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -119,12 +119,12 @@ in
 
     systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
     systemd.services.display-manager.serviceConfig = {
-        # Restart = "always"; - already defined in xserver.nix
-        KillMode = "mixed";
-        IgnoreSIGPIPE = "no";
-        BusName = "org.gnome.DisplayManager";
-        StandardOutput = "syslog";
-        StandardError = "inherit";
+      # Restart = "always"; - already defined in xserver.nix
+      KillMode = "mixed";
+      IgnoreSIGPIPE = "no";
+      BusName = "org.gnome.DisplayManager";
+      StandardOutput = "syslog";
+      StandardError = "inherit";
     };
 
     systemd.services.display-manager.path = [ gnome3.gnome_session ];

From 163b3e853bcdf4333cbf1bd868fc979933f407c0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 11:59:37 -0400
Subject: [PATCH 2844/3246] linux: 4.13-rc6 -> 4.13-rc7

---
 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 5bbee02b9aa..6778e11710f 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13-rc6";
-  modDirVersion = "4.13.0-rc6";
+  version = "4.13-rc7";
+  modDirVersion = "4.13.0-rc7";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "06jdbgihdjmq84d7km43f3w6d3hwmbnv3sgzip3nhx77l14cp7f2";
+    sha256 = "1xkfxsvdhd0xcfjcr78222sa58i02z2ca9fv804jbyp7w9g628rm";
   };
 
   features.iwlwifi = true;

From e0010cd1c3ef224730da3df2348d3b2a44c8637e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 28 Aug 2017 18:12:40 +0200
Subject: [PATCH 2845/3246] pprof: init at 2017-08-28

---
 .../tools/profiling/pprof/default.nix         | 35 +++++++++++++++++++
 .../tools/profiling/pprof/deps.nix            | 12 +++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/tools/profiling/pprof/default.nix
 create mode 100644 pkgs/development/tools/profiling/pprof/deps.nix

diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix
new file mode 100644
index 00000000000..f506db32d9a
--- /dev/null
+++ b/pkgs/development/tools/profiling/pprof/default.nix
@@ -0,0 +1,35 @@
+# This file was originally generated by https://github.com/kamilchm/go2nix v1.2.1
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "pprof-${version}";
+  version = "2017-08-28";
+  rev = "d19a98b9bcec464f178b20da0f936cef7e15462e";
+
+  goPackagePath = "github.com/google/pprof";
+
+  src = fetchgit {
+    inherit rev;
+    url = "git://github.com/google/pprof";
+    sha256 = "0wh589fndvvidisy0jy19y0ykw4l05paqd53s8kli7h9zdcl11gq";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "A tool for visualization and analysis of profiling data";
+    homepage = https://github.com/google/pprof;
+    license = licenses.asl20;
+    longDescription = ''
+      pprof reads a collection of profiling samples in profile.proto format and generates reports to visualize and help analyze the data. It can generate both text and graphical reports (through the use of the dot visualization package).
+
+      profile.proto is a protocol buffer that describes a set of callstacks and symbolization information. A common usage is to represent a set of sampled callstacks from statistical profiling. The format is described on the proto/profile.proto file. For details on protocol buffers, see https://developers.google.com/protocol-buffers
+
+      Profiles can be read from a local file, or over http. Multiple profiles of the same type can be aggregated or compared.
+
+      If the profile samples contain machine addresses, pprof can symbolize them through the use of the native binutils tools (addr2line and nm).
+
+      This is not an official Google product.
+    '';
+  };
+}
diff --git a/pkgs/development/tools/profiling/pprof/deps.nix b/pkgs/development/tools/profiling/pprof/deps.nix
new file mode 100644
index 00000000000..f8bd466423c
--- /dev/null
+++ b/pkgs/development/tools/profiling/pprof/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/ianlancetaylor/demangle";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ianlancetaylor/demangle";
+      rev = "4883227f66371e02c4948937d3e2be1664d9be38";
+      sha256 = "1yj7c9i1sg26fyx6cmz87x3qh71rldkl6h87x5gysqzipm9jg54l";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af69e1c944c..2691a4f85d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7223,6 +7223,8 @@ with pkgs;
 
   postiats-utilities = callPackage ../development/tools/postiats-utilities {};
 
+  pprof = callPackage ../development/tools/profiling/pprof { };
+
   prelink = callPackage ../development/tools/misc/prelink { };
 
   premake3 = callPackage ../development/tools/misc/premake/3.nix { };

From 3a18fa412a9a062e0356f9b8cbb30b6a85b3ce26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 28 Aug 2017 18:13:30 +0200
Subject: [PATCH 2846/3246] gperftools: 2.5 -> 2.6.1

I only tested the profiler now, but hopefully it's all OK.
---
 pkgs/development/libraries/gperftools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 8eb79b27fdc..47c6134dd20 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libunwind }:
 
 stdenv.mkDerivation rec {
-  name = "gperftools-2.5";
+  name = "gperftools-2.6.1";
 
   src = fetchurl {
     url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz";
-    sha256 = "0wsix3lhkpjv8lxmcbml549mfwifdv7n1qak09slvx6d3a7p98kg";
+    sha256 = "10cxd6s5pkm2d934gh47hrn9xcrw4qlc9yr7s99z4a508bmngd1q";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isLinux libunwind;

From 71fdaeaeb2563285e01aecafb45009208f27a7c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <bjarki.agust@gmail.com>
Date: Mon, 28 Aug 2017 17:22:07 +0000
Subject: [PATCH 2847/3246] google-play-music-desktop-player: 4.4.0 -> 4.4.1

---
 .../audio/google-play-music-desktop-player/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index ba9bd0338f5..9d9af631183 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "4.4.0";
+  version = "4.4.1";
 
   deps = [
     alsaLib
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
-    sha256 = "01a52rsp0a9k47mm3wqnhnmlnd7fw6xmdrn882msldijjgwsq5cc";
+    sha256 = "0jqgawgij6jxf3zy3glviqj6s34mq7d756syg2c7kk1gkqkwgdpw";
   };
 
   dontBuild = true;

From f9f9749fd2a7b75bea9660a60634965de98bac88 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 22:14:17 +0200
Subject: [PATCH 2848/3246] libarchive: 3.3.1 -> 3.3.2

---
 pkgs/development/libraries/libarchive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 883273f188c..fb1faf8d1b1 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,11 +10,11 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   name = "libarchive-${version}";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.gz";
-    sha256 = "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9";
+    sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd";
   };
 
   outputs = [ "out" "lib" "dev" ];

From 0f043d497d0e736eef217e77e4164cf4bb6f455d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 20:27:14 +0200
Subject: [PATCH 2849/3246] unbound: 1.6.4 -> 1.6.5

---
 pkgs/tools/networking/unbound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 5b6b2ee7ba7..a65ccb0541c 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.6.4";
+  version = "1.6.5";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "1vbzfzp932nhii5vq7z7rpczdyv624p17sy9hj1cn763ds0qh2nz";
+    sha256 = "0khhrj11yhh6a0h578w29yw2j7yzvaqkr4p44jzjapq1549am5z2";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

From 46cb14c8cc2d8fa1a46289d9bc72f721f8cdd715 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 28 Aug 2017 16:08:48 +0000
Subject: [PATCH 2850/3246] synergy: fix check with gcc6

---
 pkgs/applications/misc/synergy/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 89d493bcd01..3ecc772feaa 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -16,9 +16,15 @@ stdenv.mkDerivation rec {
 
   patches = [ ./openssl-1.1.patch ];
 
+  patch_gcc6 = fetchpatch {
+    url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch;
+    sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d";
+  };
+
   postPatch = ''
     ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
     ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
+    patch -d ext/gmock-1.6.0 -p1 -i ${patch_gcc6}
   ''
     # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt
     # it's not able to find it (it's trying to search the store path of libX11

From d269d8dbd62b053d6721b7b474651240a3c4d141 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 19:50:59 +0100
Subject: [PATCH 2851/3246] Uppercase GNOME version.

---
 nixos/doc/manual/release-notes/rl-1709.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index a8932a90803..e4fa3ea2429 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -12,7 +12,7 @@ has the following highlights: </para>
 <itemizedlist>
   <listitem>
     <para>
-      The Gnome version is now 3.24.
+      The GNOME version is now 3.24.
     </para>
   </listitem>
   <listitem>

From 64e4b9637bdb2d616a696f6b7af545dae963e471 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 19:52:06 +0100
Subject: [PATCH 2852/3246] Remove unused gdm/3.16-wip

---
 .../3.24/core/gdm/3.16-wip/default.nix        | 41 ---------
 .../3.16-wip/disable_x_access_control.patch   | 15 ----
 .../3.24/core/gdm/3.16-wip/sessions_dir.patch | 17 ----
 .../3.24/core/gdm/3.16-wip/xserver_path.patch | 83 -------------------
 4 files changed, 156 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch

diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
deleted file mode 100644
index 51b67afb01f..00000000000
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gdm-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
-  };
-
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
-    substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
-    sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
- '';
-
-  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-                     "--with-initial-vt=10" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
deleted file mode 100644
index 7691a9e86f0..00000000000
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gdm-3.16.0/daemon/gdm-display.c.orig	2015-04-08 13:53:14.370274369 +0200
-+++ gdm-3.16.0/daemon/gdm-display.c	2015-04-08 13:53:36.287520435 +0200
-@@ -1706,9 +1706,10 @@
- 
-                 gdm_error_trap_push ();
- 
--                for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-+                /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-                         XAddHost (self->priv->x11_display, &host_entries[i]);
--                }
-+                }*/
-+                XDisableAccessControl(self->priv->x11_display);
- 
-                 XSync (self->priv->x11_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731..00000000000
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
deleted file mode 100644
index b451d129391..00000000000
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
---- gdm-3.16.0/daemon/gdm-x-session.c.orig	2015-04-15 18:44:16.875743928 +0200
-+++ gdm-3.16.0/daemon/gdm-x-session.c	2015-04-16 13:34:02.335708638 +0200
-@@ -207,6 +207,8 @@
-         char     *display_fd_string = NULL;
-         char     *vt_string = NULL;
-         char     *display_number;
-+        int nixos_argc = 0;
-+        char **nixos_argv = NULL;
-         gsize     display_number_size;
- 
-         auth_file = prepare_auth_file ();
-@@ -236,7 +238,15 @@
- 
-         display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- 
--        g_ptr_array_add (arguments, X_SERVER);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+                int i = 0;
-+                g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
-+                for (i = 0; i < nixos_argc; i++) {
-+                        g_ptr_array_add (arguments, nixos_argv[i]);
-+                }
-+        } else {
-+                g_ptr_array_add (arguments, X_SERVER);
-+        }
- 
-         if (vt_string != NULL) {
-                 g_ptr_array_add (arguments, vt_string);
-@@ -259,12 +269,12 @@
-         g_ptr_array_add (arguments, "-noreset");
-         g_ptr_array_add (arguments, "-keeptty");
- 
--        g_ptr_array_add (arguments, "-verbose");
-+        /*g_ptr_array_add (arguments, "-verbose");
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "7");
-         } else {
-                 g_ptr_array_add (arguments, "3");
--        }
-+        }*/
- 
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "-core");
-@@ -275,6 +285,9 @@
-                                                    (const char * const *) arguments->pdata,
-                                                    &error);
-         g_free (display_fd_string);
-+        if (nixos_argv) {
-+                 g_strfreev (nixos_argv);
-+        }
-         g_clear_object (&launcher);
-         g_ptr_array_free (arguments, TRUE);
- 
---- gdm-3.16.0/daemon/gdm-session.c.orig	2015-04-16 14:19:01.392802683 +0200
-+++ gdm-3.16.0/daemon/gdm-session.c	2015-04-16 14:20:36.012296764 +0200
-@@ -2359,6 +2359,12 @@
-         gchar *desktop_names;
-         const char *locale;
- 
-+        if (g_getenv ("GDM_X_SERVER") != NULL) {
-+                gdm_session_set_environment_variable (self,
-+                                                      "GDM_X_SERVER",
-+                                                      g_getenv ("GDM_X_SERVER"));
-+        }
-+
-         gdm_session_set_environment_variable (self,
-                                               "GDMSESSION",
-                                               get_session_name (self));

From df33d1a2fc9460b5b3bcd95d4e903d5d098f0d64 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 28 Aug 2017 20:56:10 +0200
Subject: [PATCH 2853/3246] maintainers/hydra-eval-failures: catch fetching
 maintainers

Fails with some i686-linux build failures
---
 maintainers/scripts/hydra-eval-failures.py | 27 ++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index 6bbc0a45e44..f82d14c3b46 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -31,18 +31,21 @@ EVAL_FILE = {
 
 
 def get_maintainers(attr_name):
-    nixname = attr_name.split('.')
-    meta_json = subprocess.check_output([
-        'nix-instantiate',
-        '--eval',
-        '--strict',
-        '-A',
-        '.'.join(nixname[1:]) + '.meta',
-        EVAL_FILE[nixname[0]],
-        '--json'])
-    meta = json.loads(meta_json)
-    if meta.get('maintainers'):
-        return [MAINTAINERS[name] for name in meta['maintainers'] if MAINTAINERS.get(name)]
+    try:
+        nixname = attr_name.split('.')
+        meta_json = subprocess.check_output([
+            'nix-instantiate',
+            '--eval',
+            '--strict',
+            '-A',
+            '.'.join(nixname[1:]) + '.meta',
+            EVAL_FILE[nixname[0]],
+            '--json'])
+        meta = json.loads(meta_json)
+        if meta.get('maintainers'):
+            return [MAINTAINERS[name] for name in meta['maintainers'] if MAINTAINERS.get(name)]
+    except:
+       return []
 
 
 @click.command()

From 6dc4b5229bd85156169be39be376bb85a5fccd0f Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 19:58:49 +0100
Subject: [PATCH 2854/3246] Fix ibus by using a python.buildEnv.

---
 pkgs/tools/inputmethods/ibus/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index d392777dfd4..66d61b8c5e9 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -48,6 +48,9 @@ let
       sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7";
     };
   };
+  pyEnv = python3.buildEnv.override {
+    extraLibs = [ python3.pkgs.pygobject3 ];
+  };
 in stdenv.mkDerivation rec {
   name = "ibus-${version}";
   version = "1.5.16";
@@ -77,16 +80,16 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    python3
+    pyEnv
     intltool isocodes pkgconfig
     gtk2 gtk3 dconf
     json_glib
     dbus libnotify gobjectIntrospection wayland
   ];
 
-  propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ];
+  propagatedBuildInputs = [ glib ];
 
-  nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ];
+  nativeBuildInputs = [ wrapGAppsHook ];
 
   outputs = [ "out" "dev" ];
 
@@ -104,11 +107,6 @@ in stdenv.mkDerivation rec {
     substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
   '';
 
-  postFixup = ''
-    buildPythonPath $out
-    patchPythonScript $out/share/ibus/setup/main.py
-  '';
-
   doInstallCheck = true;
   installCheckPhase = "$out/bin/ibus version";
 

From 8dca9bff66ee44f2df0783a0622dbb4b2d3b1efd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 28 Aug 2017 21:13:03 +0200
Subject: [PATCH 2855/3246] upstart: remove ancient

---
 .../linux/upstart/check-config.nix            | 43 --------------
 pkgs/os-specific/linux/upstart/default.nix    | 58 -------------------
 .../linux/upstart/upstart-bash-completion     | 18 ------
 pkgs/top-level/all-packages.nix               |  4 --
 pkgs/top-level/release-small.nix              |  1 -
 5 files changed, 124 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/upstart/check-config.nix
 delete mode 100644 pkgs/os-specific/linux/upstart/default.nix
 delete mode 100644 pkgs/os-specific/linux/upstart/upstart-bash-completion

diff --git a/pkgs/os-specific/linux/upstart/check-config.nix b/pkgs/os-specific/linux/upstart/check-config.nix
deleted file mode 100644
index 5803b4ed833..00000000000
--- a/pkgs/os-specific/linux/upstart/check-config.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-# Useful tool to check syntax of a config file. Upstart needs a dbus
-# session, so this script wraps one up and makes the operation not
-# require any prior state.
-#
-# See: http://mwhiteley.com/scripts/2012/12/11/dbus-init-checkconf.html
-{stdenv, coreutils, upstart, writeScript, dbus}:
-
-writeScript "upstart-check-config" ''
-  #!${stdenv.shell}
-
-  set -o errexit
-  set -o nounset
-
-  export PATH=${stdenv.lib.makeBinPath [dbus.out upstart coreutils]}:$PATH
-
-  if [[ $# -ne 1 ]]
-  then
-    echo "Usage: $0 upstart-conf-file" >&2
-    exit 1
-  fi
-  config=$1 && shift
-
-  dbus_pid_file=$(mktemp)
-  exec 4<> $dbus_pid_file
-
-  dbus_add_file=$(mktemp)
-  exec 6<> $dbus_add_file
-
-  dbus-daemon --fork --print-pid 4 --print-address 6 --session
-
-  function clean {
-    dbus_pid=$(cat $dbus_pid_file)
-    if [[ -n $dbus_pid ]]; then
-      kill $dbus_pid
-    fi
-    rm -f $dbus_pid_file $dbus_add_file
-  }
-  trap "{ clean; }" EXIT
-
-  export DBUS_SESSION_BUS_ADDRESS=$(cat $dbus_add_file)
-
-  init-checkconf $config
-''
diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix
deleted file mode 100644
index 76ce2637ced..00000000000
--- a/pkgs/os-specific/linux/upstart/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libnih, python, makeWrapper, utillinux
-, writeScript }:
-
-let
-  inherit (stdenv.lib) makeBinPath;
-  version = "1.5";
-
-  upstart = stdenv.mkDerivation rec {
-  name = "upstart-${version}";
-
-  src = fetchurl {
-    url = "http://upstart.ubuntu.com/download/${version}/${name}.tar.gz";
-    sha256 = "01w4ab6nlisz5blb0an1sxjkndwikr7sjp0cmz4lg00g3n7gahmx";
-  };
-
-  buildInputs = [ pkgconfig dbus libnih python makeWrapper];
-
-  NIX_CFLAGS_COMPILE =
-    ''
-      -DSHELL="${stdenv.shell}"
-      -DCONFFILE="/etc/init.conf"
-      -DCONFDIR="/etc/init"
-      -DPATH="/no-path"
-    '';
-
-  # The interface version prevents NixOS from switching to an
-  # incompatible Upstart at runtime.  (Switching across reboots is
-  # fine, of course.)  It should be increased whenever Upstart changes
-  # in a backwards-incompatible way.  If the interface version of two
-  # Upstart builds is the same, then we can switch between them at
-  # runtime; otherwise we can't and we need to reboot.
-  passthru.interfaceVersion = 2;
-
-  postInstall =
-    ''
-      t=$out/etc/bash_completion.d
-      mkdir -p $t
-      cp ${./upstart-bash-completion} $t/upstart
-
-      # Patch some binaries to refer to the correct binary location.
-      sed -i "s,/sbin/init,$out/bin/init,g" $out/bin/init-checkconf
-      sed -i "s,initctl,$out/bin/initctl," $out/bin/initctl2dot
-
-      # Add some missing executable permissions, and wrap binaries.
-      chmod +x $out/bin/init-checkconf $out/bin/init-checkconf
-      wrapProgram $out/bin/init-checkconf \
-        --prefix PATH : $out/bin:${makeBinPath [utillinux dbus]}
-      wrapProgram $out/bin/initctl2dot --prefix PATH : $out/bin
-    '';
-
-  meta = {
-    homepage = http://upstart.ubuntu.com/;
-    description = "An event-based replacement for the /sbin/init daemon";
-    platforms = stdenv.lib.platforms.linux;
-  };
-};
-
-in upstart
diff --git a/pkgs/os-specific/linux/upstart/upstart-bash-completion b/pkgs/os-specific/linux/upstart/upstart-bash-completion
deleted file mode 100644
index f47d38c90ad..00000000000
--- a/pkgs/os-specific/linux/upstart/upstart-bash-completion
+++ /dev/null
@@ -1,18 +0,0 @@
-_upstart_comp_list(){
-  COMPREPLY=()
-  cur=${COMP_WORDS[COMP_CWORD]}
-  if [ $COMP_CWORD -eq 1 ]; then
-      COMPREPLY=( $(compgen -o filenames -W "$@" $cur) )
-  fi
-}
-
-_upstart_complete() { _upstart_comp_list "$(initctl list 2>&1 | grep -E "$1" | cut -f2 -d ' ')"; }
-
-_waiting(){ _upstart_complete "(waiting|instance)"; }
-_running(){ _upstart_complete "(running|instance)"; }
-_jobs(){ _upstart_comp_list "$(ls -1 /etc/event.d 2> /dev/null)"; }
-
-complete -F _jobs status
-complete -F _waiting start
-complete -F _running stop
-complete -F _running restart
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2691a4f85d3..8fb97035794 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12754,10 +12754,6 @@ with pkgs;
 
   upower = callPackage ../os-specific/linux/upower { };
 
-  upstart = callPackage ../os-specific/linux/upstart { };
-
-  upstart-check-config = callPackage ../os-specific/linux/upstart/check-config.nix {};
-
   usbguard = libsForQt5.callPackage ../os-specific/linux/usbguard {
     libgcrypt = null;
   };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 40218a2b702..be055ccb285 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -159,7 +159,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   udev = linux;
   unar = linux;
   unzip = all;
-  upstart = linux;
   usbutils = linux;
   utillinux = linux;
   utillinuxMinimal = linux;

From 7a22c01b546fb14c9fec8ab1f9bcba2845e354b7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 Aug 2017 18:57:42 -0400
Subject: [PATCH 2856/3246] apple misc pkgs: `buildInputs` ->
 `nativeBuildInputs`

---
 .../darwin/apple-source-releases/ICU/default.nix            | 2 +-
 .../darwin/apple-source-releases/Libc/825_40_1.nix          | 4 ++--
 .../darwin/apple-source-releases/Libc/default.nix           | 2 +-
 .../darwin/apple-source-releases/Libsystem/default.nix      | 2 +-
 .../darwin/apple-source-releases/adv_cmds/default.nix       | 3 ++-
 .../darwin/apple-source-releases/bootstrap_cmds/default.nix | 4 ++--
 .../darwin/apple-source-releases/bsdmake/default.nix        | 6 +++---
 .../darwin/apple-source-releases/configd/default.nix        | 3 ++-
 pkgs/os-specific/darwin/cctools/port.nix                    | 3 ++-
 9 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index a9d06fc9dbc..2d098418f03 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cctools, appleDerivation }:
 
 appleDerivation {
-  buildInputs = [ cctools ];
+  nativeBuildInputs = [ cctools ];
 
   postPatch = ''
     substituteInPlace makefile \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
index b5e7e512393..0fa9294f229 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
@@ -3,7 +3,7 @@
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
 
-  buildInputs = [ ed unifdef ];
+  nativeBuildInputs = [ ed unifdef ];
 
   installPhase = ''
     export SRCROOT=$PWD
@@ -12,4 +12,4 @@ appleDerivation {
     export PRIVATE_HEADERS_FOLDER_PATH=include
     bash xcodescripts/headers.sh
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
index ce04be0e083..40237b27bd2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
@@ -3,7 +3,7 @@
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
 
-  buildInputs = [ ed unifdef ];
+  nativeBuildInputs = [ ed unifdef ];
 
   # TODO: asl.h actually comes from syslog project now
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index e3583b3bf84..caef875ac13 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -5,7 +5,7 @@
 appleDerivation rec {
   phases = [ "unpackPhase" "installPhase" ];
 
-  buildInputs = [ cpio ];
+  nativeBuildInputs = [ cpio ];
 
   installPhase = ''
     export NIX_ENFORCE_PURITY=
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
index b8b436efe24..ccbd8343e0d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
@@ -16,7 +16,8 @@ let recentAdvCmds = fetchzip {
 };
 
 in appleDerivation {
-  buildInputs = [ bsdmake perl yacc flex ];
+  nativeBuildInputs = [ bsdmake perl yacc flex ];
+  buildInputs = [ flex ];
 
   patchPhase = ''
     substituteInPlace BSDmakefile \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
index 8dce3fd3609..408a2c7524c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
@@ -1,7 +1,7 @@
 { stdenv, appleDerivation, yacc, flex }:
 
 appleDerivation {
-  buildInputs = [ yacc flex ];
+  nativeBuildInputs = [ yacc flex ];
 
   buildPhase = ''
     cd migcom.tproj
@@ -41,4 +41,4 @@ appleDerivation {
       --replace '/bin/rmdir' "rmdir" \
       --replace 'C=''${MIGCC}' "C=cc"
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
index dcbf8b43308..77123d0057d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
@@ -1,7 +1,7 @@
 { stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }:
 
 appleDerivation {
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   patchPhase = ''
     substituteInPlace mk/bsd.prog.mk \
@@ -27,9 +27,9 @@ appleDerivation {
     for file in $(find . -name '*.c'); do
       obj="$(basename "$file" .c).o"
       objs+=("$obj")
-      cc -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g
+      $CC -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g
     done
-    cc "''${objs[@]}" -o bsdmake
+    $CC "''${objs[@]}" -o bsdmake
   '';
 
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
index 24797fc286a..2b31b042040 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
@@ -3,7 +3,8 @@
 appleDerivation {
   meta.broken = stdenv.cc.nativeLibc;
 
-  buildInputs = [ launchd bootstrap_cmds ppp IOKit eap8021x ];
+  nativeBuildInputs = [ bootstrap_cmds ];
+  buildInputs = [ launchd ppp IOKit eap8021x ];
 
   propagatedBuildInputs = [ Security ];
 
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 51547100752..1f2e7c14378 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -29,7 +29,8 @@ let
       sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
     };
 
-    buildInputs = [ autoconf automake libtool_2 libuuid ] ++
+    nativeBuildInputs = [ autoconf automake libtool_2 ];
+    buildInputs = [ 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 ];

From a75491caa4de5a4a4b8ad7a358c273565fea50a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Aug 2017 19:36:46 +0200
Subject: [PATCH 2857/3246] LTS Haskell 9.2

---
 .../configuration-hackage2nix.yaml            | 79 ++++++++++---------
 1 file changed, 42 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 40e50bd5ce9..ec09ed585c0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 9.1
+  # LTS Haskell 9.2
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -364,7 +364,7 @@ default-package-overrides:
   - check-email ==1.0.2
   - checkers ==0.4.7
   - chell ==0.4.0.1
-  - choice ==0.2.1
+  - choice ==0.2.2
   - chunked-data ==0.3.0
   - cipher-aes ==0.2.11
   - cipher-aes128 ==0.7.0.3
@@ -411,6 +411,8 @@ default-package-overrides:
   - comonads-fd ==4.0
   - compactmap ==0.1.4.2.1
   - compensated ==0.7.2
+  - composable-associations ==0.1.0.0
+  - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
   - concise ==0.1.0.0
@@ -457,7 +459,7 @@ default-package-overrides:
   - crypto-api-tests ==0.3
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
-  - crypto-enigma ==0.0.2.8
+  - crypto-enigma ==0.0.2.9
   - crypto-pubkey-types ==0.4.3
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
@@ -523,7 +525,7 @@ default-package-overrides:
   - Decimal ==0.4.2
   - declarative ==0.5.1
   - deepseq-generics ==0.2.0.0
-  - dejafu ==0.7.1.1
+  - dejafu ==0.7.1.2
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - derive ==2.6.3
@@ -534,7 +536,7 @@ default-package-overrides:
   - diagrams-cairo ==1.4
   - diagrams-canvas ==1.4
   - diagrams-contrib ==1.4.1
-  - diagrams-core ==1.4
+  - diagrams-core ==1.4.0.1
   - diagrams-gtk ==1.4
   - diagrams-html5 ==1.4
   - diagrams-lib ==1.4.1.2
@@ -559,7 +561,7 @@ default-package-overrides:
   - disposable ==0.2.0.4
   - distance ==0.1.0.0
   - distributed-closure ==0.3.4.0
-  - distributed-static ==0.3.5.0
+  - distributed-static ==0.3.7
   - distribution ==1.1.1.0
   - distributive ==0.5.3
   - diversity ==0.8.0.2
@@ -666,7 +668,7 @@ default-package-overrides:
   - exp-pairs ==0.1.5.2
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9
-  - extensible ==0.4.3
+  - extensible ==0.4.4
   - extensible-effects ==1.11.1.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.5.3
@@ -764,7 +766,7 @@ default-package-overrides:
   - ghc-syb-utils ==0.2.3.2
   - ghc-tcplugins-extra ==0.2.1
   - ghc-typelits-extra ==0.2.3
-  - ghc-typelits-knownnat ==0.3
+  - ghc-typelits-knownnat ==0.3.1
   - ghc-typelits-natnormalise ==0.5.3
   - ghcid ==0.6.6
   - ghcjs-base-stub ==0.1.0.2
@@ -776,7 +778,7 @@ default-package-overrides:
   - gi-gdkpixbuf ==2.0.14
   - gi-gio ==2.0.14
   - gi-glib ==2.0.14
-  - gi-gobject ==2.0.14
+  - gi-gobject ==2.0.15
   - gi-gtk ==3.0.17
   - gi-javascriptcore ==3.0.14
   - gi-pango ==1.0.15
@@ -1008,11 +1010,12 @@ default-package-overrides:
   - hbeanstalk ==0.2.4
   - Hclip ==3.0.0.4
   - HCodecs ==0.5
+  - hcwiid ==0.0.6.1
   - hdaemonize ==0.5.4
-  - HDBC ==2.4.0.1
+  - HDBC ==2.4.0.2
   - HDBC-mysql ==0.7.1.0
   - HDBC-session ==0.1.1.1
-  - hdevtools ==0.1.5.0
+  - hdevtools ==0.1.6.0
   - hdocs ==0.5.2.1
   - heap ==1.0.3
   - heaps ==0.3.5
@@ -1122,6 +1125,7 @@ default-package-overrides:
   - hstatistics ==0.3
   - hstatsd ==0.1
   - HStringTemplate ==0.8.6
+  - HSvm ==0.1.0.3.22
   - hsx-jmacro ==7.3.8
   - hsx2hs ==0.14.1.1
   - hsyslog ==5.0.1
@@ -1141,7 +1145,7 @@ default-package-overrides:
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.6.4
-  - http-reverse-proxy ==0.4.4
+  - http-reverse-proxy ==0.4.5
   - http-streams ==0.8.5.3
   - http-types ==0.9.1
   - http2 ==1.6.3
@@ -1155,12 +1159,12 @@ default-package-overrides:
   - hw-bits ==0.5.0.3
   - hw-diagnostics ==0.0.0.5
   - hw-excess ==0.1.0.1
-  - hw-int ==0.0.0.1
-  - hw-parser ==0.0.0.2
-  - hw-prim ==0.4.0.3
+  - hw-int ==0.0.0.3
+  - hw-parser ==0.0.0.3
+  - hw-prim ==0.4.0.5
   - hw-rankselect ==0.8.0.2
-  - hw-rankselect-base ==0.2.0.1
-  - hw-string-parse ==0.0.0.3
+  - hw-rankselect-base ==0.2.0.2
+  - hw-string-parse ==0.0.0.4
   - hw-succinct ==0.1.0.1
   - hweblib ==0.6.3
   - hworker ==0.1.0.1
@@ -1227,7 +1231,7 @@ default-package-overrides:
   - ip6addr ==0.5.3
   - iproute ==1.7.1
   - IPv6Addr ==1.0.1
-  - IPv6DB ==0.2.1
+  - IPv6DB ==0.2.2
   - irc ==0.6.1.0
   - irc-client ==0.4.4.4
   - irc-conduit ==0.2.2.3
@@ -1258,7 +1262,7 @@ default-package-overrides:
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
   - json-stream ==0.4.1.3
-  - JuicyPixels ==3.2.8.2
+  - JuicyPixels ==3.2.8.3
   - JuicyPixels-extra ==0.2.1
   - JuicyPixels-scale-dct ==0.1.1.2
   - jvm ==0.2.2
@@ -1298,7 +1302,7 @@ default-package-overrides:
   - lattices ==1.5.0
   - lazyio ==0.1.0.4
   - lca ==0.3
-  - leancheck ==0.6.4
+  - leancheck ==0.6.5
   - leapseconds-announced ==2017
   - lens ==4.15.4
   - lens-action ==0.2.2
@@ -1416,7 +1420,7 @@ default-package-overrides:
   - mime-mail ==0.4.14
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
-  - minio-hs ==0.3.0
+  - minio-hs ==0.3.1
   - mintty ==0.1.1
   - miso ==0.4.0.0
   - missing-foreign ==0.1.1
@@ -1463,7 +1467,7 @@ default-package-overrides:
   - monoid-subclasses ==0.4.4
   - monoid-transformer ==0.0.3
   - monoidal-containers ==0.3.0.2
-  - morte ==1.6.9
+  - morte ==1.6.10
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.1
@@ -1516,10 +1520,10 @@ default-package-overrides:
   - network-transport-composed ==0.2.0.1
   - network-transport-inmemory ==0.5.2
   - network-transport-tcp ==0.5.1
-  - network-transport-tests ==0.2.3.0
+  - network-transport-tests ==0.2.4.1
   - network-uri ==2.6.1.0
   - newtype ==0.2
-  - newtype-generics ==0.5
+  - newtype-generics ==0.5.1
   - next-ref ==0.1.0.2
   - nfc ==0.1.0
   - nicify-lib ==1.0.1
@@ -1587,7 +1591,7 @@ default-package-overrides:
   - pager ==0.1.1.0
   - pagerduty ==0.0.8
   - pagination ==0.2.1
-  - palette ==0.1.0.4
+  - palette ==0.1.0.5
   - pandoc ==1.19.2.1
   - pandoc-citeproc ==0.10.5.1
   - pandoc-types ==1.17.0.5
@@ -1783,7 +1787,7 @@ default-package-overrides:
   - raw-strings-qq ==1.1
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
-  - rdf ==0.1.0.1
+  - rdf ==0.1.0.2
   - rdtsc ==1.3.0.1
   - reactive-banana ==1.1.0.1
   - read-editor ==0.1.0.2
@@ -1861,7 +1865,7 @@ default-package-overrides:
   - safe ==0.3.15
   - safe-exceptions ==0.1.6.0
   - safe-exceptions-checked ==0.1.0
-  - safecopy ==0.9.3.2
+  - safecopy ==0.9.3.3
   - safeio ==0.0.3.0
   - SafeSemaphore ==0.10.1
   - sample-frame ==0.0.3
@@ -1873,11 +1877,12 @@ default-package-overrides:
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
-  - schematic ==0.1.4.0
+  - schematic ==0.1.6.0
   - scientific ==0.3.5.1
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.5
   - scrypt ==0.5.0
+  - SDL ==0.6.5.1
   - sdl2 ==2.2.0
   - sdl2-gfx ==0.2
   - sdl2-image ==2.0.0
@@ -1932,7 +1937,7 @@ default-package-overrides:
   - SHA ==1.6.4.2
   - shake ==0.15.11
   - shake-language-c ==0.10.1
-  - shakespeare ==2.0.13
+  - shakespeare ==2.0.14
   - shell-conduit ==4.6.1
   - shelly ==1.6.8.3
   - shikensu ==0.3.7
@@ -2013,7 +2018,7 @@ default-package-overrides:
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.0.4
-  - stateWriter ==0.2.8.2
+  - stateWriter ==0.2.9
   - static-canvas ==0.2.0.3
   - statistics ==0.13.3.0
   - stemmer ==0.5.2
@@ -2064,7 +2069,7 @@ default-package-overrides:
   - superrecord ==0.3.0.0
   - svg-builder ==0.1.0.2
   - svg-tree ==0.6.2
-  - SVGFonts ==1.6.0.1
+  - SVGFonts ==1.6.0.2
   - swagger ==0.3.0
   - swagger2 ==2.1.4.1
   - syb ==0.7
@@ -2214,7 +2219,7 @@ default-package-overrides:
   - tries ==0.0.4.2
   - trifecta ==1.6.2.1
   - triplesec ==0.1.2.0
-  - true-name ==0.1.0.2
+  - true-name ==0.1.0.3
   - tsv2csv ==0.1.0.2
   - ttrie ==0.1.2.1
   - tttool ==1.7.0.3
@@ -2223,7 +2228,7 @@ default-package-overrides:
   - tuples-homogenous-h98 ==0.1.1.0
   - turtle ==1.3.6
   - turtle-options ==0.1.0.4
-  - twitter-conduit ==0.2.2.1
+  - twitter-conduit ==0.2.2.2
   - twitter-feed ==0.2.0.11
   - twitter-types ==0.7.2.2
   - twitter-types-lens ==0.7.2
@@ -2239,7 +2244,7 @@ default-package-overrides:
   - type-operators ==0.1.0.4
   - type-spec ==0.3.0.1
   - TypeCompose ==0.9.12
-  - typed-process ==0.1.0.0
+  - typed-process ==0.1.0.1
   - typelits-witnesses ==0.2.3.0
   - typography-geometry ==1.0.0.1
   - tz ==0.1.3.0
@@ -2447,11 +2452,11 @@ default-package-overrides:
   - yackage ==0.8.1
   - yahoo-finance-api ==0.2.0.2
   - yaml ==0.8.23.3
-  - Yampa ==0.10.6
+  - Yampa ==0.10.6.1
   - YampaSynth ==0.2
   - yes-precure5-command ==5.5.3
   - yesod ==1.4.5
-  - yesod-auth ==1.4.17.2
+  - yesod-auth ==1.4.17.3
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
   - yesod-auth-fb ==1.8.1
@@ -2461,7 +2466,7 @@ default-package-overrides:
   - yesod-default ==1.2.0
   - yesod-eventsource ==1.4.1
   - yesod-fb ==0.4.0
-  - yesod-form ==1.4.13
+  - yesod-form ==1.4.15
   - yesod-form-bootstrap4 ==0.1.0.1
   - yesod-form-richtext ==0.1.0.2
   - yesod-gitrepo ==0.2.1.0

From c0f77542c2ee73a720a0b207001cf15c15ccdbfd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Aug 2017 09:05:56 +0200
Subject: [PATCH 2858/3246] hackage2nix: update list of broken packages

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ec09ed585c0..426a015418a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2662,6 +2662,8 @@ dont-distribute-packages:
   ccelerate-cuda:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cublas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cufft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cusolver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cusparse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-raster-accelerate:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libnvvm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nvvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]

From 39cf16f10e744f748059d00f506b764f2d78e4c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 24 Aug 2017 03:00:34 +0200
Subject: [PATCH 2859/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.5-1-gf0558f5 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c0a55494983a08ec7d12b1d4b6cda4ec12d85606.
---
 .../haskell-modules/hackage-packages.nix      | 1801 +++++++++--------
 1 file changed, 976 insertions(+), 825 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b90e11cc51c..6e4f936245a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2730,8 +2730,8 @@ self: {
      }:
      mkDerivation {
        pname = "ChasingBottoms";
-       version = "1.3.1.2";
-       sha256 = "1mmqs8xhmlamb9ncvkwnsfb0zqprvw7flm91fyv4x8n4c25jfvkr";
+       version = "1.3.1.3";
+       sha256 = "04jwwjs22mqc4hvpp4c3gpb79inrrq5sapks5khknspv2hslm61q";
        libraryHaskellDepends = [
          base containers mtl QuickCheck random syb
        ];
@@ -4991,8 +4991,10 @@ self: {
      }:
      mkDerivation {
        pname = "Euterpea";
-       version = "2.0.3";
-       sha256 = "0khr4yqrg258x0fqrhzpwrzzsmzwdk3x3b3vyyqqmy5vh9hagvfy";
+       version = "2.0.4";
+       sha256 = "1n0b4ksdrr1457abvij76z8r4ski4cic80picddilpg83mxaasw6";
+       revision = "2";
+       editedCabalFile = "0f8fyib7cqb4w54rrcrd00c6ca4fgfj5v9rm7mih7lyybkrs44qv";
        libraryHaskellDepends = [
          array arrows base bytestring containers deepseq ghc-prim HCodecs
          heap PortMidi random stm
@@ -7106,27 +7108,6 @@ self: {
      }) {};
 
   "HDBC" = callPackage
-    ({ mkDerivation, base, bytestring, containers, convertible, mtl
-     , old-time, text, time, utf8-string
-     }:
-     mkDerivation {
-       pname = "HDBC";
-       version = "2.4.0.1";
-       sha256 = "1bfjffn44n8w0bvznjiqm4ckfs28nipachip98f125p784ff4gks";
-       revision = "1";
-       editedCabalFile = "1zg7l48g45wc86kqyspzg92q3vnzb6c52rn8qkrhw85wk57yy76s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers convertible mtl old-time text time
-         utf8-string
-       ];
-       homepage = "https://github.com/hdbc/hdbc";
-       description = "Haskell Database Connectivity";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HDBC_2_4_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible, mtl
      , old-time, text, time, utf8-string
      }:
@@ -7143,7 +7124,6 @@ self: {
        homepage = "https://github.com/hdbc/hdbc";
        description = "Haskell Database Connectivity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HDBC-mysql" = callPackage
@@ -10193,36 +10173,6 @@ self: {
      }) {};
 
   "IPv6DB" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
-     , hedis, hspec, http-client, http-types, IPv6Addr, mtl
-     , optparse-applicative, text, unordered-containers, vector, wai
-     , wai-logger, warp
-     }:
-     mkDerivation {
-       pname = "IPv6DB";
-       version = "0.2.1";
-       sha256 = "1730whn02k1d9w6znfiibz8slwwnbrm1z47s544c24vdziwfh54v";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring fast-logger hedis http-types IPv6Addr mtl
-         optparse-applicative text unordered-containers vector wai
-         wai-logger warp
-       ];
-       testHaskellDepends = [
-         aeson base hspec http-client http-types vector
-       ];
-       homepage = "http://ipv6db.cybervisible.com";
-       description = "A RESTful Web Service for IPv6-related data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "IPv6DB_0_2_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
      , hedis, hspec, http-client, http-types, IPv6Addr, mtl
      , optparse-applicative, text, unordered-containers, vector, wai
@@ -10625,23 +10575,6 @@ self: {
      }) {};
 
   "JuicyPixels" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
-     , primitive, transformers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "JuicyPixels";
-       version = "3.2.8.2";
-       sha256 = "1s3qakm7jn2kjx59nlp81hkysz6bxidj3khd8xlny7x8gvjqjk5p";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq mtl primitive
-         transformers vector zlib
-       ];
-       homepage = "https://github.com/Twinside/Juicy.Pixels";
-       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels_3_2_8_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
@@ -10656,7 +10589,6 @@ self: {
        homepage = "https://github.com/Twinside/Juicy.Pixels";
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -15860,26 +15792,6 @@ self: {
      }) {};
 
   "SVGFonts" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
-     , bytestring, cereal, cereal-vector, containers, data-default-class
-     , diagrams-core, diagrams-lib, directory, parsec, split, text
-     , tuple, vector, xml
-     }:
-     mkDerivation {
-       pname = "SVGFonts";
-       version = "1.6.0.1";
-       sha256 = "1w6hh8anpb0psilzbp4k80rbavdmkmb5rn34x9m2s72rz0jfy9zp";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base blaze-markup blaze-svg bytestring cereal
-         cereal-vector containers data-default-class diagrams-core
-         diagrams-lib directory parsec split text tuple vector xml
-       ];
-       description = "Fonts from the SVG-Font format";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "SVGFonts_1_6_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
      , bytestring, cereal, cereal-vector, containers, data-default-class
      , diagrams-core, diagrams-lib, directory, parsec, split, text
@@ -15897,7 +15809,6 @@ self: {
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SVGPath" = callPackage
@@ -19272,19 +19183,6 @@ self: {
      }) {};
 
   "Yampa" = callPackage
-    ({ mkDerivation, base, deepseq, random }:
-     mkDerivation {
-       pname = "Yampa";
-       version = "0.10.6";
-       sha256 = "060aglv38snkf9p9d46mnvny517xvyzz561vlm8myxzx3jm38lsn";
-       libraryHaskellDepends = [ base deepseq random ];
-       testHaskellDepends = [ base ];
-       homepage = "http://www.haskell.org/haskellwiki/Yampa";
-       description = "Library for programming hybrid systems";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Yampa_0_10_6_1" = callPackage
     ({ mkDerivation, base, deepseq, hcwiid, random, SDL }:
      mkDerivation {
        pname = "Yampa";
@@ -19298,6 +19196,21 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "Yampa_0_10_6_2" = callPackage
+    ({ mkDerivation, base, deepseq, random }:
+     mkDerivation {
+       pname = "Yampa";
+       version = "0.10.6.2";
+       sha256 = "1d18m2id6dsdkpldmqsjxxi6mpqv8hg87mzpay99l8h937nyhj3g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base deepseq random ];
+       testHaskellDepends = [ base ];
+       homepage = "http://www.haskell.org/haskellwiki/Yampa";
+       description = "Library for programming hybrid systems";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -22167,6 +22080,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aip" = callPackage
+    ({ mkDerivation, base, bytestring, digit, directory, doctest
+     , filepath, HTTP, lens, network-uri, papa, parsec, parsers
+     , QuickCheck, quickcheck-text, tagsoup, tagsoup-selection
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "aip";
+       version = "0.0.1";
+       sha256 = "162mmwniiwlyi3h7d4xxmk2a8pr3ldnl1mx9m9yjpl5vy0926lyd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring digit directory filepath HTTP lens network-uri papa
+         parsec parsers tagsoup tagsoup-selection transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring digit directory filepath HTTP lens network-uri papa
+         parsec parsers tagsoup tagsoup-selection transformers
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath parsec QuickCheck quickcheck-text
+         template-haskell
+       ];
+       homepage = "https://github.com/qfpl/aip";
+       description = "Aeronautical Information Package (AIP)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "air" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, mtl, text, time
@@ -22334,8 +22276,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "0.7";
-       sha256 = "0f1vb7948p7xn1x4ayzjpr222349bp70wsix384nhwsrksk2fiwp";
+       version = "0.7.2";
+       sha256 = "1b18sgnk5ybrfvwqhwixcnwzr7ffi2h93ck75ba9a1r8rkkd193c";
        libraryHaskellDepends = [
          aivika aivika-transformers base binary containers
          distributed-process exceptions mtl mwc-random random stm time
@@ -26261,6 +26203,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "apns-http2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, async, base, base16-bytestring
+     , bytestring, conduit, conduit-extra, containers, data-default
+     , http2, keys, lens, lifted-base, mmorph, mtl, network, stm
+     , stm-chans, stm-conduit, text, time, tls, x509, x509-store
+     , x509-system, x509-validation
+     }:
+     mkDerivation {
+       pname = "apns-http2";
+       version = "0.1.0.0";
+       sha256 = "1mbsvv202h6vh1gkv4rhx369wagil111qbphb502v02v2g5yibdb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring conduit conduit-extra containers
+         data-default http2 keys lens lifted-base mmorph mtl network stm
+         stm-chans stm-conduit text time tls x509 x509-store x509-validation
+       ];
+       executableHaskellDepends = [
+         aeson aeson-qq async base base16-bytestring bytestring conduit
+         conduit-extra containers data-default http2 keys lens lifted-base
+         mmorph mtl network stm stm-chans stm-conduit text time tls x509
+         x509-store x509-system x509-validation
+       ];
+       homepage = "https://github.com/ConferHealth/apns-http2#readme";
+       description = "Apple Push Notification service HTTP/2 integration";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "apotiki" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , containers, crypto-api, cryptohash, directory, http-types
@@ -27306,15 +27277,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "arrowp-qq_0_2_0_1" = callPackage
+  "arrowp-qq_0_2_1_1" = callPackage
     ({ mkDerivation, arrows, base, containers, data-default
      , haskell-src-exts, haskell-src-exts-util, haskell-src-meta, NoHoed
      , template-haskell, transformers, uniplate
      }:
      mkDerivation {
        pname = "arrowp-qq";
-       version = "0.2.0.1";
-       sha256 = "18m9h5v1c3w0f5f0iw2vxmdms73d4w9s1z7aa301h2c43fv0iym8";
+       version = "0.2.1.1";
+       sha256 = "0sxcsjag31m773l9c02gq879rh0hllsjns2cl3pkazbj2jgf53i5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -28618,8 +28589,8 @@ self: {
      }:
      mkDerivation {
        pname = "attoparsec-data";
-       version = "1.0.2";
-       sha256 = "0qkjl80vmprqq8fd6ksxaqmqq5izd1cg7c8v98s8j59kdzw322ab";
+       version = "1.0.3";
+       sha256 = "02bkrbdipd0940aq34dx4156z538jbfxpgdk3pkbb6vjdcghcw9g";
        libraryHaskellDepends = [
          attoparsec attoparsec-time base base-prelude bytestring scientific
          text time
@@ -28743,6 +28714,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "attoparsec-time_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, bytestring, Cabal
+     , cabal-doctest, directory, doctest, filepath, scientific, text
+     , time
+     }:
+     mkDerivation {
+       pname = "attoparsec-time";
+       version = "1";
+       sha256 = "0606rdwb6r5s819hid3fd4gkclprwjmqryl4fniflcpccy94gsyl";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         attoparsec base base-prelude bytestring scientific text time
+       ];
+       testHaskellDepends = [
+         base base-prelude directory doctest filepath
+       ];
+       homepage = "https://github.com/nikita-volkov/attoparsec-time";
+       description = "Attoparsec parsers of time";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "attoparsec-trans" = callPackage
     ({ mkDerivation, attoparsec, base, transformers }:
      mkDerivation {
@@ -29232,8 +29225,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "15";
-       editedCabalFile = "06vhxs4172liq6ayf2cg3b45hk3jkcxbgz1ilwqrw9bbn8lfgq6s";
+       revision = "16";
+       editedCabalFile = "0dv8lrnnb643fh1rsi10rq99nnb5a98akdl26lfxxjmmdmy238vd";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -33651,22 +33644,20 @@ self: {
      }) {};
 
   "biohazard" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, base-prelude
-     , binary, bytestring, bytestring-mmap, containers, directory
-     , exceptions, filepath, hashable, monad-control, primitive, random
-     , scientific, stm, text, transformers, transformers-base, unix
+    ({ mkDerivation, async, attoparsec, base, base-prelude, binary
+     , bytestring, containers, directory, exceptions, filepath, hashable
+     , primitive, random, scientific, stm, text, transformers, unix
      , unordered-containers, vector, vector-algorithms, vector-th-unbox
      , zlib
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "0.6.15";
-       sha256 = "19w9rk0r835fzfk5k2fxfb54wa4fbyyfrppa4ifmc7z57bxii3gq";
+       version = "0.6.16";
+       sha256 = "05w44blv6bawkiw2vyb32swnv6wg92033xz9p03fhrc2yhl33pps";
        libraryHaskellDepends = [
-         aeson async attoparsec base base-prelude binary bytestring
-         bytestring-mmap containers directory exceptions filepath hashable
-         monad-control primitive random scientific stm text transformers
-         transformers-base unix unordered-containers vector
+         async attoparsec base base-prelude binary bytestring containers
+         directory exceptions filepath hashable primitive random scientific
+         stm text transformers unix unordered-containers vector
          vector-algorithms vector-th-unbox zlib
        ];
        homepage = "http://github.com/udo-stenzel/biohazard";
@@ -36290,7 +36281,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_24_1" = callPackage
+  "brick_0_24_2" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-clist
      , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
      , template-haskell, text, text-zipper, transformers, vector, vty
@@ -36298,8 +36289,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.24.1";
-       sha256 = "0vjj64h683m28kwhp98crdyywbhpk7q6bx7crg2dr2g2mj41bb58";
+       version = "0.24.2";
+       sha256 = "162p1sgiq25zymjnvjzkbblwwl7544ph7y8kpa1x07w7x9bq2jw3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38716,8 +38707,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.4.1";
-       sha256 = "0dplmm32kckb5mk2gfkw63qkakzbgz7f4j0scaj74ncga4vjkzxg";
+       version = "2.5";
+       sha256 = "19ywslwarwk84anfq78y249krqnddi2yyh66l78a88xfsh002abp";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -41493,6 +41484,19 @@ self: {
        license = "LGPL";
      }) {};
 
+  "charsetdetect-ae_1_1_0_3" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "charsetdetect-ae";
+       version = "1.1.0.3";
+       sha256 = "15kf9g708ics81s3gj4vkx4xcvywj2fripf0g9p29v4xliwd9m7y";
+       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 {
@@ -41927,18 +41931,6 @@ self: {
      }) {};
 
   "choice" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "choice";
-       version = "0.2.1";
-       sha256 = "163p6ji6gsr0lgxvldnz0rmcbckfk75wpq0xn1n41fbhxzchr2gi";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mboes/choice#readme";
-       description = "A solution to boolean blindness";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "choice_0_2_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "choice";
@@ -41948,7 +41940,6 @@ self: {
        homepage = "https://github.com/mboes/choice#readme";
        description = "A solution to boolean blindness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "choose" = callPackage
@@ -45323,17 +45314,17 @@ self: {
   "columbia" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, contravariant
      , data-endian, directory, filelock, invariant, mmap, mmorph
-     , monad-loops, mtl, parallel, pointless-haskell, syb-with-class
-     , transformers
+     , monad-loops, mtl, parallel, pointed, pointless-haskell
+     , syb-with-class, transformers
      }:
      mkDerivation {
        pname = "columbia";
-       version = "0.1.0.2";
-       sha256 = "152f43s2dm81amag28kav9a1gfyg97rxhd2dm3ivip98j8p1d6j0";
+       version = "0.1.1";
+       sha256 = "10yd0rp9zzdsx2hcb7gn0yxz8b9zj0pfy4g8d09qgs3c8lg8fdan";
        libraryHaskellDepends = [
          array base bytestring containers contravariant data-endian
          directory filelock invariant mmap mmorph monad-loops mtl parallel
-         pointless-haskell syb-with-class transformers
+         pointed pointless-haskell syb-with-class transformers
        ];
        description = "Enhanced serialization for media that support seeking";
        license = stdenv.lib.licenses.bsd3;
@@ -46547,15 +46538,15 @@ self: {
      }) {};
 
   "concrete-haskell-autogen" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hashable, QuickCheck
-     , text, thrift, unordered-containers, vector
+    ({ mkDerivation, base, bytestring, containers, hashable, lens
+     , QuickCheck, text, thrift, unordered-containers, vector
      }:
      mkDerivation {
        pname = "concrete-haskell-autogen";
-       version = "0.0.0.1";
-       sha256 = "09y6jj0f7kaibn9imnk6wrhkn1yq1dpjxr8pqdizqqm5dwrwy94m";
+       version = "0.0.0.2";
+       sha256 = "02y9ahcryrhwiam9fsh8r57lri3zhy2xhm6098j9x1zzr2vq72sl";
        libraryHaskellDepends = [
-         base bytestring containers hashable QuickCheck text thrift
+         base bytestring containers hashable lens QuickCheck text thrift
          unordered-containers vector
        ];
        homepage = "https://github.com/hltcoe";
@@ -50532,23 +50523,6 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
-     , split
-     }:
-     mkDerivation {
-       pname = "crypto-enigma";
-       version = "0.0.2.8";
-       sha256 = "0dz8qr4afl360vc8mhcxsqm48y4pf1rvwxhzbvsgwhwjscvass3q";
-       revision = "4";
-       editedCabalFile = "1rvcphwavb3ns46fankpdlkz8rwl3rn591zlkmx0zdy3vygpwsfg";
-       libraryHaskellDepends = [ base containers MissingH mtl split ];
-       testHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "https://github.com/orome/crypto-enigma-hs";
-       description = "An Enigma machine simulator with display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crypto-enigma_0_0_2_9" = callPackage
     ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
      , split
      }:
@@ -50561,7 +50535,6 @@ self: {
        homepage = "https://github.com/orome/crypto-enigma-hs";
        description = "An Enigma machine simulator with display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-multihash" = callPackage
@@ -51551,25 +51524,20 @@ self: {
      }) {};
 
   "cublas" = callPackage
-    ({ mkDerivation, base, c2hs, cublas, cuda, cusparse, filepath
-     , language-c, storable-complex, template-haskell
+    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
+     , storable-complex
      }:
      mkDerivation {
        pname = "cublas";
-       version = "0.2.1.0";
-       sha256 = "02x8a9varkj770cl4nnb0mf4qh519gf9mv51awinlaikyz932q1w";
-       revision = "1";
-       editedCabalFile = "1myrmj4fc1nxgdlv5pmz30j4nlap7a6ylyc7bmrljpyjgciwg117";
-       libraryHaskellDepends = [
-         base cuda filepath language-c storable-complex template-haskell
-       ];
-       librarySystemDepends = [ cublas cusparse ];
+       version = "0.3.0.0";
+       sha256 = "1i2nqbf0zmc1xpqb8szklccki2jkwpiqslqbaahidzp18bc9cm2r";
+       setupHaskellDepends = [ base Cabal cuda directory filepath ];
+       libraryHaskellDepends = [ base cuda half storable-complex ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/bmsherman/cublas";
-       description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries";
+       description = "FFI bindings to the CUDA BLAS library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {cublas = null; cusparse = null;};
+     }) {};
 
   "cuboid" = callPackage
     ({ mkDerivation, base, GLUT, Yampa }:
@@ -51590,12 +51558,14 @@ self: {
      }:
      mkDerivation {
        pname = "cuda";
-       version = "0.7.5.3";
-       sha256 = "1xd7yyh9v8ndir98wgsbhkz8kfgd7xl58b423gw44c6i8wq3mky6";
+       version = "0.8.0.0";
+       sha256 = "0zlasd6c3da462qaffj9z44546551b2cvs0wv0f23739x4i929z9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [ base bytestring template-haskell ];
+       libraryHaskellDepends = [
+         base bytestring filepath template-haskell
+       ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base pretty ];
        homepage = "https://github.com/tmcdonell/cuda";
@@ -51670,10 +51640,10 @@ self: {
      }:
      mkDerivation {
        pname = "cufft";
-       version = "0.7.5.0";
-       sha256 = "0w8i9r0xng3z2g8gjg4ahi6ybpvr1gmy2hqwjwdv48d52n487g89";
+       version = "0.8.0.0";
+       sha256 = "0n6x079d41s05s050vjyph67xm0gx8nnl9wbmqqgdfimgc8xiggp";
        setupHaskellDepends = [
-         base Cabal directory filepath template-haskell
+         base Cabal cuda directory filepath template-haskell
        ];
        libraryHaskellDepends = [ base cuda ];
        libraryToolDepends = [ c2hs ];
@@ -51750,6 +51720,22 @@ self: {
        license = "unknown";
      }) {};
 
+  "currency-codes" = callPackage
+    ({ mkDerivation, aeson, base, bson, lens, random, safe, swagger2
+     , text
+     }:
+     mkDerivation {
+       pname = "currency-codes";
+       version = "1.0.0.3";
+       sha256 = "0lfaikcig22y79fm75jc40d6ii3xrj4firyfssyqcqbyjhvf3fyn";
+       libraryHaskellDepends = [
+         aeson base bson lens random safe swagger2 text
+       ];
+       homepage = "https://gitlab.com/chordify/currency-codes";
+       description = "ISO-4217 Currency Codes";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "currency-convert" = callPackage
     ({ mkDerivation, aeson, base, http-conduit, text
      , unordered-containers
@@ -51887,6 +51873,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cusolver" = callPackage
+    ({ mkDerivation, base, c2hs, Cabal, cublas, cuda, cusparse
+     , directory, filepath, half, storable-complex
+     }:
+     mkDerivation {
+       pname = "cusolver";
+       version = "0.1.0.0";
+       sha256 = "00ki40s6z9llsbxlp4c46qn7iaamrhnr5yfr983gqg2mfc3wx355";
+       setupHaskellDepends = [ base Cabal cuda directory filepath ];
+       libraryHaskellDepends = [
+         base cublas cuda cusparse half storable-complex
+       ];
+       libraryToolDepends = [ c2hs ];
+       description = "FFI bindings to CUDA Solver, a LAPACK-like library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cusparse" = callPackage
+    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
+     , storable-complex
+     }:
+     mkDerivation {
+       pname = "cusparse";
+       version = "0.1.0.0";
+       sha256 = "0a45b7y18v50r5lzgkbjapivajqymndl3yvdzp1x25n3imi4knxn";
+       setupHaskellDepends = [ base Cabal cuda directory filepath ];
+       libraryHaskellDepends = [ base cuda half storable-complex ];
+       libraryToolDepends = [ c2hs ];
+       description = "FFI bindings to the CUDA Sparse BLAS library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "custom-prelude" = callPackage
     ({ mkDerivation, base, basic-prelude, monad-loops }:
      mkDerivation {
@@ -55817,24 +55837,6 @@ self: {
      }) {};
 
   "dejafu" = callPackage
-    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, mtl, random, ref-fd, semigroups, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "dejafu";
-       version = "0.7.1.1";
-       sha256 = "0mqi2jswdk9qid8h5q24ay2h0p3x48i8yz5m0hnwnvqv966lgq7v";
-       libraryHaskellDepends = [
-         base concurrency containers deepseq exceptions leancheck mtl random
-         ref-fd semigroups transformers transformers-base
-       ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Systematic testing for Haskell concurrency";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dejafu_0_7_1_2" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , leancheck, mtl, random, ref-fd, semigroups, transformers
      , transformers-base
@@ -55850,7 +55852,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Systematic testing for Haskell concurrency";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deka" = callPackage
@@ -56948,8 +56949,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.4";
-       sha256 = "1rrak6vym0q1c00cvhdlh29z8vsr6w81lq1xa9b61f5d7m42yl75";
+       version = "1.4.0.1";
+       sha256 = "0k951bi3b2n33lbjym87l0hcm8v2ww5w2cwfgdmjy8yl4gz1jyff";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -59170,22 +59171,6 @@ self: {
      }) {};
 
   "distributed-static" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , rank1dynamic
-     }:
-     mkDerivation {
-       pname = "distributed-static";
-       version = "0.3.5.0";
-       sha256 = "1yai3sgqk1z8kyvnmkw1ngmj7wazlyxva4smvsk37q1ss7fjfyz5";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq rank1dynamic
-       ];
-       homepage = "http://haskell-distributed.github.com";
-       description = "Compositional, type-safe, polymorphic static values and closures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributed-static_0_3_7" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , rank1dynamic
      }:
@@ -59199,7 +59184,6 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution" = callPackage
@@ -60198,17 +60182,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dotenv_0_4_0_0" = callPackage
+  "dotenv_0_5_0_1" = callPackage
     ({ mkDerivation, base, base-compat, exceptions, hspec
      , hspec-megaparsec, megaparsec, optparse-applicative, process, text
      , transformers
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.4.0.0";
-       sha256 = "0f9c5p1nm7zdwz55wlgm56fb2xvyra0f4i37rfj7bb5kdhncqphg";
+       version = "0.5.0.1";
+       sha256 = "1gbb1h1wzxk6szrciw81kkiljf1gpnaymksspqa955qh4qhxj1bw";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat exceptions megaparsec text transformers
        ];
@@ -61086,6 +61071,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dublincore-xml-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , data-default, hlint, QuickCheck, quickcheck-instances, resourcet
+     , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , timerep, uri-bytestring, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "dublincore-xml-conduit";
+       version = "0.1.0.0";
+       sha256 = "1z09bpywiyv39mm2y4kfvqasg5492f655mbwlh8nn1nv12w9x9il";
+       libraryHaskellDepends = [
+         base conduit conduit-combinators safe-exceptions text time timerep
+         uri-bytestring xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators data-default hlint
+         QuickCheck quickcheck-instances resourcet safe-exceptions tasty
+         tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit
+         xml-types
+       ];
+       homepage = "https://github.com/k0ral/dublincore-xml-conduit";
+       description = "XML streaming parser/renderer for the Dublin Core standard elements";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "duckling" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, bytestring
      , containers, deepseq, dependent-sum, directory, extra, filepath
@@ -66115,13 +66125,13 @@ self: {
      }) {};
 
   "executor" = callPackage
-    ({ mkDerivation, async, base, process }:
+    ({ mkDerivation, async, base, doctest, hspec, process }:
      mkDerivation {
        pname = "executor";
-       version = "0.0.3";
-       sha256 = "01whn23ycgm59zim6knna43p2dafh0bjwrmfwg3xq169im79n1zq";
+       version = "0.0.4";
+       sha256 = "0knqdlq3ziwpx5dx7i015009ks1qyhzs8cz0sx383xy5im5wcrg7";
        libraryHaskellDepends = [ async base process ];
-       testHaskellDepends = [ async base process ];
+       testHaskellDepends = [ async base doctest hspec process ];
        homepage = "https://github.com/GianlucaGuarini/executor";
        description = "Shell helpers";
        license = stdenv.lib.licenses.mit;
@@ -66681,30 +66691,6 @@ self: {
      }) {};
 
   "extensible" = callPackage
-    ({ mkDerivation, base, comonad, constraints, criterion, deepseq
-     , effin, extensible-effects, freer-effects, ghc-prim, lens
-     , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar
-     , tagged, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "extensible";
-       version = "0.4.3";
-       sha256 = "0ix1dran0s17jpdzcwai79snfmls8al7a34b0sysgkp75g8lrgca";
-       libraryHaskellDepends = [
-         base comonad constraints deepseq ghc-prim monad-skeleton mtl
-         primitive profunctors semigroups StateVar tagged template-haskell
-         transformers
-       ];
-       testHaskellDepends = [ base ];
-       benchmarkHaskellDepends = [
-         base criterion effin extensible-effects freer-effects lens mtl
-       ];
-       homepage = "https://github.com/fumieval/extensible";
-       description = "Extensible, efficient, optics-friendly data types and effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extensible_0_4_4" = callPackage
     ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim
      , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar
      , tagged, template-haskell, transformers
@@ -66722,7 +66708,6 @@ self: {
        homepage = "https://github.com/fumieval/extensible";
        description = "Extensible, efficient, optics-friendly data types and effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-data" = callPackage
@@ -68019,6 +68004,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "feed_1_0_0_0" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, HUnit, old-locale
+     , old-time, safe, test-framework, test-framework-hunit, text, time
+     , time-locale-compat, utf8-string, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "feed";
+       version = "1.0.0.0";
+       sha256 = "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base base-compat bytestring old-locale old-time safe text time
+         time-locale-compat utf8-string xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base base-compat HUnit old-locale old-time test-framework
+         test-framework-hunit text time time-locale-compat utf8-string
+         xml-conduit xml-types
+       ];
+       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
@@ -75726,6 +75736,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghc-proofs" = callPackage
+    ({ mkDerivation, base, ghc, transformers }:
+     mkDerivation {
+       pname = "ghc-proofs";
+       version = "0.1";
+       sha256 = "18zznyh84sv5qvxqzk1lkkx3lrqprkqnx996cjywyix5z5kdk5gk";
+       libraryHaskellDepends = [ base ghc ];
+       testHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/nomeata/ghc-proofs";
+       description = "GHC plugin to prove program equations by simplification";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ghc-server" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -75883,30 +75906,6 @@ self: {
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
-     , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
-       version = "0.3";
-       sha256 = "0dq419pd8mf8x48wcr3ciygrwy40kvcl5iq307836ss2r506nrqc";
-       revision = "1";
-       editedCabalFile = "17k7rarp56ljxz2j7p17jh1wgbqfcv9l1pj8vrffidb9r8sj448q";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons
-         template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-natnormalise singletons tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       homepage = "http://clash-lang.org/";
-       description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-knownnat_0_3_1" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, transformers
@@ -75926,7 +75925,6 @@ 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
@@ -76601,27 +76599,6 @@ self: {
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gobject";
-       version = "2.0.14";
-       sha256 = "12w4fph341b6gxp6bd6xnrc4cs8bxhwkz33z4ndlkrb75a0289lg";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-gobject_2_0_15" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -76640,7 +76617,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gst" = callPackage
@@ -77222,7 +77198,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "ginger_0_6_0_1" = callPackage
+  "ginger_0_6_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
      , tasty-quickcheck, text, time, transformers, unordered-containers
@@ -77230,8 +77206,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.6.0.1";
-       sha256 = "0c843zx5jnw1z0gbiyq5asx5amz6bh87kn1f7359p4p1l4qg44sk";
+       version = "0.6.0.2";
+       sha256 = "0h6db6pm7i19rgn8hfx0m3qjl3b4ybf1ngd2451jn16n859sljbm";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -77747,8 +77723,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-vogue";
-       version = "0.2.2.1";
-       sha256 = "1gx96rh97gbbf2h64rpar00pdph4vdvhwpw7hmmi1vh5ynqp4zrs";
+       version = "0.2.2.2";
+       sha256 = "13i5kb3bqkjhgla98ywl5rhjyi8dnxzi4srsjw3x3hwy0srmh7l8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -78889,6 +78865,8 @@ self: {
        pname = "gloss-algorithms";
        version = "1.11.1.1";
        sha256 = "1wi3mrx8wzmsjz8al284rzgpsn9z77yw9l8p802hbld2hwf5d9z1";
+       revision = "1";
+       editedCabalFile = "08w84grwvl079gzjwnshfgs12kh1p2gbc5kvbw6qdxc7g292hd5m";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
@@ -79281,8 +79259,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.3.11";
-       sha256 = "0f6953pp35rgy2x51db3faawmnr7lsbrdihyi16kcqbffdwcni9g";
+       version = "0.3.15";
+       sha256 = "0ki9s3drynmncd9nzw5xkbjpypz6qjzvbng3dv4kxf6jdd8wd6xl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79294,8 +79272,8 @@ self: {
        ];
        testHaskellDepends = [
          aeson aeson-pretty base basic-prelude binary binary-conduit
-         bytestring conduit conduit-extra lens resourcet rtcm sbp tasty
-         tasty-golden tasty-hunit text unordered-containers
+         bytestring conduit conduit-extra lens rtcm sbp tasty tasty-golden
+         tasty-hunit text unordered-containers
        ];
        homepage = "http://github.com/swift-nav/gnss-converters";
        description = "GNSS Converters";
@@ -81569,6 +81547,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "grakn" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, http-client
+     , http-media, markdown-unlit, MissingH, mtl, process, QuickCheck
+     , regex-posix, scientific, servant, servant-client, text
+     }:
+     mkDerivation {
+       pname = "grakn";
+       version = "0.2.0";
+       sha256 = "0k6l3bd9bb5wzlk5b5kqp7pdza9vymhm03b65hjcv1djs8lf8hk4";
+       libraryHaskellDepends = [
+         aeson base containers http-client http-media mtl process
+         regex-posix scientific servant servant-client text
+       ];
+       testHaskellDepends = [
+         aeson base containers hspec http-client http-media markdown-unlit
+         MissingH mtl process QuickCheck regex-posix scientific servant
+         servant-client text
+       ];
+       homepage = "https://github.com/graknlabs/grakn-haskell";
+       description = "A Haskell client for <http://grakn.ai Grakn>";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "grammar-combinators" = callPackage
     ({ mkDerivation, base, containers, enumerable, fgl, graphviz
      , MaybeT, mtl, multirec, parsec, template-haskell, text
@@ -88401,17 +88402,17 @@ self: {
 
   "haskdogs" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , optparse-applicative, process, text
+     , hasktags, optparse-applicative, process, text
      }:
      mkDerivation {
        pname = "haskdogs";
-       version = "0.5.0";
-       sha256 = "16ba13qihpxfvb65szzs5ajhk854c0yii939xavwq76dk0cr01w3";
+       version = "0.5.1";
+       sha256 = "1iilnxw9xq3i5y1fvvjs557xbblfgq992576fpvr405wj6nlhmk3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring containers directory filepath optparse-applicative
-         process text
+         base bytestring containers directory filepath hasktags
+         optparse-applicative process text
        ];
        homepage = "http://github.com/grwlf/haskdogs";
        description = "Generate tags file for Haskell project and its nearest deps";
@@ -89530,8 +89531,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-src-exts-util";
-       version = "0.1.0";
-       sha256 = "0paqb9k7p7vnykrzmiwkmah50523svsifc7wjy1xc5c2cc19597m";
+       version = "0.2.1.2";
+       sha256 = "1a5y6fvzpjdi6az580rb1aq3gjxlcm6gn5dfd9mixyn5dv32aysv";
        libraryHaskellDepends = [
          base containers data-default haskell-src-exts transformers uniplate
        ];
@@ -89631,6 +89632,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-ast_0_9_0_0" = callPackage
+    ({ mkDerivation, base, ghc, mtl, references, template-haskell
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-ast";
+       version = "0.9.0.0";
+       sha256 = "1hhlp7bvn1q18jsfmi6pig26aggq6961p7lq7p140lk2jlvv9i1i";
+       libraryHaskellDepends = [
+         base ghc mtl references template-haskell uniplate
+       ];
+       homepage = "https://github.com/nboldi/haskell-tools";
+       description = "Haskell AST for efficient tooling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-ast-fromghc" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
@@ -89703,6 +89721,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-backend-ghc_0_9_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
+     , haskell-tools-ast, mtl, references, safe, split, template-haskell
+     , transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-backend-ghc";
+       version = "0.9.0.0";
+       sha256 = "17v38npf016pm80wiynimdqw83v3y8f1hdjjl7lbkwyj7rgkpx6n";
+       libraryHaskellDepends = [
+         base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
+         references safe split template-haskell transformers uniplate
+       ];
+       homepage = "https://github.com/nboldi/haskell-tools";
+       description = "Creating the Haskell-Tools AST from GHC's representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, haskell-tools-ast
@@ -89733,6 +89770,43 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-cli_0_9_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , directory, filepath, ghc, ghc-paths, Glob
+     , haskell-tools-builtin-refactorings, haskell-tools-daemon
+     , haskell-tools-refactor, knob, mtl, optparse-applicative, process
+     , references, split, strict, tasty, tasty-hunit, time
+     }:
+     mkDerivation {
+       pname = "haskell-tools-cli";
+       version = "0.9.0.0";
+       sha256 = "04ycy6hqnzqj9gc4vqf95flc3yh3swx201n2daggkmxayasiivqj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath ghc ghc-paths
+         haskell-tools-builtin-refactorings haskell-tools-daemon
+         haskell-tools-refactor mtl references split strict
+       ];
+       executableHaskellDepends = [
+         base directory filepath Glob haskell-tools-builtin-refactorings mtl
+         optparse-applicative process split
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath
+         haskell-tools-builtin-refactorings knob tasty tasty-hunit
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion directory filepath
+         haskell-tools-builtin-refactorings knob split time
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Command-line frontend for Haskell-tools Refact";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {haskell-tools-builtin-refactorings = null;};
+
   "haskell-tools-daemon" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, Diff
      , directory, filepath, ghc, ghc-paths, haskell-tools-ast
@@ -89782,6 +89856,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-debug_0_9_0_0" = callPackage
+    ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
+     , haskell-tools-prettyprint, haskell-tools-refactor, references
+     , split, template-haskell
+     }:
+     mkDerivation {
+       pname = "haskell-tools-debug";
+       version = "0.9.0.0";
+       sha256 = "0lbb8ip5y511v41i9xw9yi4nk2f0xmxv8ddcr0faxvy503miv613";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath ghc ghc-paths haskell-tools-ast
+         haskell-tools-backend-ghc haskell-tools-builtin-refactorings
+         haskell-tools-prettyprint haskell-tools-refactor references split
+         template-haskell
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Debugging Tools for Haskell-tools";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {haskell-tools-builtin-refactorings = null;};
+
   "haskell-tools-demo" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -89812,6 +89912,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-demo_0_9_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
+     , haskell-tools-prettyprint, haskell-tools-refactor, http-types
+     , HUnit, mtl, network, references, tasty, tasty-hunit, transformers
+     , wai, wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "haskell-tools-demo";
+       version = "0.9.0.0";
+       sha256 = "1mb2ica5x5x66z68px9sfy0gndla1qmydlb9vcwvvc2wv8jmn8mr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-builtin-refactorings haskell-tools-prettyprint
+         haskell-tools-refactor http-types mtl references transformers wai
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath HUnit network tasty
+         tasty-hunit websockets
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "A web-based demo for Haskell-tools Refactor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {haskell-tools-builtin-refactorings = null;};
+
   "haskell-tools-prettyprint" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, text, uniplate
@@ -89829,6 +89962,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-prettyprint_0_9_0_0" = callPackage
+    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
+     , references, split, text, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-prettyprint";
+       version = "0.9.0.0";
+       sha256 = "15ym19dhn4lvv2szyp4bj7347bmbj43p76hj5fi1v2z20irjvmfi";
+       libraryHaskellDepends = [
+         base containers ghc haskell-tools-ast mtl references split text
+         uniplate
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Pretty printing of Haskell-Tools AST";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-refactor" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -89859,6 +90010,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-refactor_0_9_0_0" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
+     , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
+     , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references
+     , split, template-haskell, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-tools-refactor";
+       version = "0.9.0.0";
+       sha256 = "0n9j8rlv613b0l5g3lihqp6rfkxxdm21f1m4fqygbi7fb3d6n7ss";
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-rewrite mtl references
+         split template-haskell transformers uniplate
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Refactoring Tool for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tools-rewrite" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
@@ -89881,6 +90054,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-tools-rewrite_0_9_0_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, ghc
+     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
+     , tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "haskell-tools-rewrite";
+       version = "0.9.0.0";
+       sha256 = "1vdbnb7808v2wycrg7nz0zx6rb8mjb1d50i57g6irfwk3s46k31s";
+       libraryHaskellDepends = [
+         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
+         references
+       ];
+       testHaskellDepends = [
+         base directory filepath haskell-tools-ast haskell-tools-prettyprint
+         tasty tasty-hunit
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Facilities for generating new parts of the Haskell-Tools AST";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-tor" = callPackage
     ({ mkDerivation, array, asn1-encoding, asn1-types, async
      , attoparsec, base, base64-bytestring, binary, bytestring, cereal
@@ -90515,6 +90711,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskey" = callPackage
+    ({ mkDerivation, async, base, binary, bytestring, containers
+     , directory, exceptions, filepath, focus, haskey-btree, HUnit
+     , list-t, lz4, mtl, QuickCheck, semigroups, stm, stm-containers
+     , temporary, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, transformers, unix, vector
+     , xxhash-ffi
+     }:
+     mkDerivation {
+       pname = "haskey";
+       version = "0.1.0.1";
+       sha256 = "08kd48a67m1p55i3d4fla6zdpaqzq49piswhqwj1jnks4sj18ran";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers directory exceptions filepath
+         focus haskey-btree list-t lz4 mtl semigroups stm stm-containers
+         transformers unix xxhash-ffi
+       ];
+       executableHaskellDepends = [
+         async base bytestring haskey-btree text
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers directory exceptions haskey-btree
+         HUnit mtl QuickCheck temporary test-framework test-framework-hunit
+         test-framework-quickcheck2 transformers vector
+       ];
+       homepage = "https://github.com/haskell-haskey";
+       description = "A transcatoinal, ACID compliant, embeddable key-value store";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskey-btree" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, data-ordlist
      , focus, hashable, HUnit, list-t, mtl, QuickCheck, semigroups, stm
@@ -91775,17 +92003,19 @@ self: {
      }) {};
 
   "haven" = callPackage
-    ({ mkDerivation, base, bytestring, containers, http-conduit
-     , http-types, mtl, SHA, xml
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , http-conduit, http-types, mtl, process, SHA, temporary
+     , transformers, xml
      }:
      mkDerivation {
        pname = "haven";
-       version = "0.1.0.0";
-       sha256 = "161m2msqr30460m9k1s67w3d05gil9d9gdhizl8rshll8pjhl6hg";
+       version = "0.2.0.0";
+       sha256 = "0cclphiq2jkk1msp5yg2mpkfn98jlqnc0vvwmi3vqcy5ln7641v1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring containers http-conduit http-types mtl SHA xml
+         base bytestring containers directory filepath http-conduit
+         http-types mtl process SHA temporary transformers xml
        ];
        description = "Recursively retrieve maven dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -92699,26 +92929,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.5.0";
-       sha256 = "1rq41mlvfsjqf21hnv5jslnfk39z52p0a6a0yk2ng8q971pj70gd";
-       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_6_0" = callPackage
     ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc
      , ghc-boot, ghc-paths, network, process, syb, time, transformers
      , unix
@@ -92736,7 +92946,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
@@ -96496,8 +96705,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.3";
-       sha256 = "0b9gaj68ykx1ak2v4kjif67kkwv1s8rf9nvcijs4garz98781sdd";
+       version = "1.3.1";
+       sha256 = "0h2ljdncxg5f17llnck6136mn9dn83ql85apnm04sm9cxq7iqqxd";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -96543,8 +96752,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.3";
-       sha256 = "0kl0sc11181bgpz65b5xg9l1hxdaai27icx13x15kwlc01jf9rcc";
+       version = "1.3.1";
+       sha256 = "149v81qslajzkr13ba7j4qqliagaq88v3d3pw301haf4v3wz9sv4";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -96673,8 +96882,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.3";
-       sha256 = "052ynivzbyabp2yn7y2wfy9dvjly989rpbcla9kx8kvmqij5qdhm";
+       version = "1.3.1";
+       sha256 = "1pb49s54rg396b15753h5wi3iyhpd3dadn3cvs3bplb5r432ni1i";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
@@ -96704,10 +96913,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.3";
-       sha256 = "0bixkihc2hcf98xpnb9a8lnqi5rcg2pj6d78w4pzwzd83vkmr1rj";
-       revision = "1";
-       editedCabalFile = "0dc5nqc9g4s0h1si6pcymbhfw32hlxafzavpp8y1jg7c9brc7ln0";
+       version = "1.3.1";
+       sha256 = "1mnvqhp32m9xfyabzl19djy74v5nr9mwaanpnwxqp1wkifq7cmxs";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -96753,8 +96960,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.3";
-       sha256 = "01y8djakr4r0jm5wyi6fbp911y3i82r1xmfi4gm9sgf27fi6a3i4";
+       version = "1.3.2";
+       sha256 = "0lcrgg6d0gpi9z855byjibzr82bbvmr6bbca5k3ivigd0yzc467d";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -97122,6 +97329,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hmatrix-morpheus" = callPackage
+    ({ mkDerivation, base, blas, criterion, hmatrix, HUnit, liblapack
+     , MonadRandom, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "hmatrix-morpheus";
+       version = "0.1.1.1";
+       sha256 = "1y7ckwgv20j72ji0n30jj0iiibx9i3k053jh2cp17q1lnks836vj";
+       libraryHaskellDepends = [ base hmatrix ];
+       librarySystemDepends = [ blas liblapack ];
+       testHaskellDepends = [
+         base hmatrix HUnit MonadRandom test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [ base criterion hmatrix ];
+       homepage = "https://github.com/Alexander-Ignatyev/morpheus/tree/master/hmatrix-morpheus";
+       description = "Low-level machine learning auxiliary functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
+
   "hmatrix-nipals" = callPackage
     ({ mkDerivation, base, hmatrix }:
      mkDerivation {
@@ -97730,10 +97958,8 @@ self: {
      }:
      mkDerivation {
        pname = "hobbits";
-       version = "1.2.3";
-       sha256 = "1ws0k2cxqyyr20r03pmc7q0354axhy96w3vcj5nhp04gxalxz9l8";
-       revision = "1";
-       editedCabalFile = "1g0nsxlxa6jwwi550wq1z0c3mjg0l3dpl3497fxjfw2h9rjajh9k";
+       version = "1.2.4";
+       sha256 = "0hqg29s938hz1hxb7ljv3wnr8iaxwjmi66zjvvy1939g5r6fmdll";
        libraryHaskellDepends = [
          base deepseq haskell-src-exts haskell-src-meta mtl syb tagged
          template-haskell th-expand-syns transformers
@@ -97921,12 +98147,22 @@ self: {
      }) {};
 
   "hol" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, bytestring, containers, pretty, QuickCheck
+     , text, transformers
+     }:
      mkDerivation {
        pname = "hol";
-       version = "1.0";
-       sha256 = "02hzkx4zz47fky24ybjiqp6zfj77h13q06jipmc4rh15fz26q282";
-       libraryHaskellDepends = [ base ];
+       version = "1.1";
+       sha256 = "0d3m343zgnffjk5dnv7i5w5nj3jjbw17fnrrwb10vq177fkbq4gz";
+       libraryHaskellDepends = [
+         base bytestring containers pretty text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers pretty QuickCheck text transformers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers pretty text transformers
+       ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -105103,33 +105339,6 @@ self: {
      }) {};
 
   "http-reverse-proxy" = callPackage
-    ({ mkDerivation, async, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, containers
-     , data-default-class, hspec, http-client, http-conduit, http-types
-     , lifted-base, monad-control, network, resourcet, streaming-commons
-     , text, transformers, wai, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "http-reverse-proxy";
-       version = "0.4.4";
-       sha256 = "0y29jn65llbljpalshic673yxfd6jrpn057sx4xaf14pgcx99ahw";
-       libraryHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive conduit
-         conduit-extra containers data-default-class http-client http-types
-         lifted-base monad-control network resourcet streaming-commons text
-         transformers wai wai-logger word8
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra hspec
-         http-conduit http-types lifted-base network resourcet
-         streaming-commons transformers wai warp
-       ];
-       homepage = "https://github.com/fpco/http-reverse-proxy";
-       description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-reverse-proxy_0_4_5" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
      , data-default-class, hspec, http-client, http-conduit, http-types
@@ -105154,7 +105363,6 @@ self: {
        homepage = "https://github.com/fpco/http-reverse-proxy";
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-server" = callPackage
@@ -106071,14 +106279,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-balancedparens_0_2_0_0" = callPackage
+  "hw-balancedparens_0_2_0_1" = callPackage
     ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
      , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector
      }:
      mkDerivation {
        pname = "hw-balancedparens";
-       version = "0.2.0.0";
-       sha256 = "1yd7s4n93rparg99x3kjsfiyk1si8kfg2ibfz5da1dlnzpffvmfq";
+       version = "0.2.0.1";
+       sha256 = "1kg8nl2dvd8xyc37v11bf0pw9pvcbzpv31y8vjzm1z5iyphn9lcr";
        libraryHaskellDepends = [
          base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple
          vector
@@ -106115,14 +106323,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-bits_0_7_0_0" = callPackage
+  "hw-bits_0_7_0_1" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
      , hw-prim, hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-bits";
-       version = "0.7.0.0";
-       sha256 = "18vqxkdzq42186k9ynrhlhk5wigg302y0xcpmgwah6is6hng1mxw";
+       version = "0.7.0.1";
+       sha256 = "1h8gpxqlyiq6zfipbmv6377s21dx5idjjakw8rwwhp476pa6dxnw";
        libraryHaskellDepends = [
          base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
@@ -106142,8 +106350,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-conduit";
-       version = "0.2.0.1";
-       sha256 = "1zsh8dvafxxrzrgdfa3fl40bzlm6f4isimmmcbgfv3whzxnv15z1";
+       version = "0.2.0.2";
+       sha256 = "052sgj1bny2d2j4gsmfj7mx9jcnkac7b0rsz7310nv2rc9h46sbl";
        libraryHaskellDepends = [
          array base bytestring conduit time word8
        ];
@@ -106256,8 +106464,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "hw-int";
-       version = "0.0.0.1";
-       sha256 = "1jx75lnsrzsbh2s9s2bx5rwaip4aa69b4aqa61hhlr3p7bv5j1rg";
+       version = "0.0.0.3";
+       sha256 = "0gsaimfx7gg39yfj2n6mlszri5x06f14b8f9cs12klrq2q8sadl3";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/haskell-works/hw-int#readme";
        description = "Integers";
@@ -106274,15 +106482,15 @@ self: {
      }:
      mkDerivation {
        pname = "hw-json";
-       version = "0.4.0.0";
-       sha256 = "11fc66zhr6rl3psjdi6i5i6gxl6aa8gicrs9grwljwp91vbndpxd";
+       version = "0.5.0.0";
+       sha256 = "0vpdfa2kskrv7j2vajxlrbsd4hgjgv4yj9bmj2wyxk5v3mx3l422";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array attoparsec base bytestring conduit containers
-         dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics hw-mquery
-         hw-parser hw-prim hw-rankselect hw-rankselect-base mmap
-         mono-traversable resourcet text vector word8
+         dlist hw-balancedparens hw-bits hw-conduit hw-mquery hw-parser
+         hw-prim hw-rankselect hw-rankselect-base mmap mono-traversable
+         resourcet text vector word8
        ];
        executableHaskellDepends = [
          ansi-wl-pprint array attoparsec base bytestring conduit containers
@@ -106471,8 +106679,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-parser";
-       version = "0.0.0.2";
-       sha256 = "0c9ns631f3lmar3xqkqk6lgdrfzmpphcray2c32li7n2hj5bcdik";
+       version = "0.0.0.3";
+       sha256 = "1wn68s00smwnivi813jcb71mx095v1kjgd2253gqknpmdv3ig16x";
        libraryHaskellDepends = [
          attoparsec base bytestring hw-prim mono-traversable text
        ];
@@ -106485,8 +106693,8 @@ self: {
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.4.0.3";
-       sha256 = "0025ilyzrhyjgc69jrkscy218gdscfq4mfh27a3f1niq67cpc2al";
+       version = "0.4.0.5";
+       sha256 = "1d2fs0w2bccxiw66m3brdbg0ynzb8kr8avj1rzid7g7v65nhpn5v";
        libraryHaskellDepends = [ base bytestring vector ];
        testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
        homepage = "http://github.com/haskell-works/hw-prim#readme";
@@ -106527,7 +106735,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect_0_10_0_2" = callPackage
+  "hw-rankselect_0_10_0_3" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap
@@ -106535,8 +106743,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.10.0.2";
-       sha256 = "1l3s40jk6nsq87q83mj4kalzn4kphxkpy4h89bw4jzzlykqwpcz9";
+       version = "0.10.0.3";
+       sha256 = "1jqlyprb83bnffmq6ck6xpx27mqnmrarn890r2dn8k06asghf7da";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106566,8 +106774,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect-base";
-       version = "0.2.0.1";
-       sha256 = "0nkbq0wzljhdjvcn04wkysqa357qhzacisimqpj8k5nbf3rkrlvj";
+       version = "0.2.0.2";
+       sha256 = "0yp2p87ijvb8lbh0spw1yjk10sq8gaa1iv517iy4fbxfjzdqhkyy";
        libraryHaskellDepends = [
          base hw-bits hw-int hw-prim hw-string-parse safe vector
        ];
@@ -106586,8 +106794,8 @@ self: {
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
        pname = "hw-string-parse";
-       version = "0.0.0.3";
-       sha256 = "02pfmcx8mn3jzi9i7z7f32x4x418lw05z0nqyzkhy7hb7g39hn3g";
+       version = "0.0.0.4";
+       sha256 = "1dzjx6virpikbqnpzdjlliakm8kd6kxyn3y4jgr5bqhisgwfp8b4";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
        homepage = "http://github.com/haskell-works/hw-string-parse#readme";
@@ -106631,39 +106839,36 @@ self: {
 
   "hw-xml" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bytestring, conduit, containers, criterion, hspec
-     , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-parser
-     , hw-prim, hw-rankselect, hw-rankselect-base, mmap
-     , mono-traversable, parsec, QuickCheck, resourcet, text
-     , transformers, vector, word8
+     , bytestring, cereal, conduit, containers, criterion, ghc-prim
+     , hspec, hw-balancedparens, hw-bits, hw-conduit, hw-parser, hw-prim
+     , hw-rankselect, hw-rankselect-base, lens, mmap, mtl, QuickCheck
+     , resourcet, transformers, vector, word8
      }:
      mkDerivation {
        pname = "hw-xml";
-       version = "0.0.0.1";
-       sha256 = "05bahk2fl2cp0dgx4v91dghzhsh1bclaj8z24j4s0p25xbi63zvr";
+       version = "0.1.0.0";
+       sha256 = "04ld7ny0s43qin92ycw0j1xki7r93cnlw8aq7418m6k17pq9kicc";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint array attoparsec base bytestring conduit containers
-         hw-balancedparens hw-bits hw-conduit hw-parser hw-prim
-         hw-rankselect hw-rankselect-base mono-traversable resourcet text
-         vector word8
+         ansi-wl-pprint array attoparsec base bytestring cereal conduit
+         containers ghc-prim hw-balancedparens hw-bits hw-conduit hw-parser
+         hw-prim hw-rankselect hw-rankselect-base lens mtl resourcet
+         transformers vector word8
        ];
        executableHaskellDepends = [
-         base bytestring conduit criterion hw-balancedparens hw-bits
-         hw-conduit hw-diagnostics hw-prim hw-rankselect mmap resourcet
+         base bytestring hw-balancedparens hw-bits hw-prim hw-rankselect
          vector
        ];
        testHaskellDepends = [
-         attoparsec base bytestring conduit containers hspec
-         hw-balancedparens hw-bits hw-conduit hw-prim hw-rankselect
-         hw-rankselect-base mmap parsec QuickCheck resourcet transformers
+         attoparsec base bytestring conduit hspec hw-balancedparens hw-bits
+         hw-conduit hw-prim hw-rankselect hw-rankselect-base QuickCheck
          vector
        ];
        benchmarkHaskellDepends = [
          base bytestring conduit criterion hw-balancedparens hw-bits
-         hw-conduit hw-prim hw-rankselect mmap resourcet vector
+         hw-conduit hw-prim mmap resourcet vector
        ];
        homepage = "http://github.com/haskell-works/hw-xml#readme";
        description = "Conduits for tokenizing streams";
@@ -110254,8 +110459,7 @@ self: {
        homepage = "https://github.com/diffusionkinetics/open/inliterate";
        description = "Interactive literate programming";
        license = stdenv.lib.licenses.mit;
-       broken = true;
-     }) {lucid-extras = null;};
+     }) {};
 
   "inquire" = callPackage
     ({ mkDerivation, aether, base, text }:
@@ -114767,8 +114971,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.19";
-       sha256 = "0f3iibpxgr2f7mvl6x4719gvjd4dcd5ajiz3y985rng6d7n5sbya";
+       version = "0.2.20";
+       sha256 = "178fnfn0bjgk9rp5sv00l5vs3cmp3rcxzmm163y68w2azm4125an";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119402,19 +119606,6 @@ self: {
      }) {};
 
   "leancheck" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "leancheck";
-       version = "0.6.4";
-       sha256 = "0vvqzcl53d18axi3p6n9chggb2g7i2ip3wq8z5cbklkm9vb8qirc";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/rudymatela/leancheck#readme";
-       description = "Cholesterol-free property-based testing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "leancheck_0_6_5" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
@@ -119425,7 +119616,6 @@ self: {
        homepage = "https://github.com/rudymatela/leancheck#readme";
        description = "Cholesterol-free property-based testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leankit-api" = callPackage
@@ -122301,15 +122491,16 @@ self: {
     ({ mkDerivation, ansi-terminal, array, ascii-progress, async
      , attoparsec, base, bifunctors, binary, boxes, bytestring, cereal
      , cmdargs, containers, deepseq, directory, dotgen, fgl
-     , fgl-visualize, filemanip, filepath, ghc-prim, hashable, intern
-     , located-base, mtl, ocaml, parallel, parsec, pretty, process, syb
-     , tasty, tasty-hunit, tasty-rerun, text, text-format, time
-     , transformers, unordered-containers, z3
+     , fgl-visualize, filemanip, filepath, ghc-prim, git, hashable
+     , intern, located-base, mtl, nettools, ocaml, parallel, parallel-io
+     , parsec, pretty, process, stm, syb, tasty, tasty-ant-xml
+     , tasty-hunit, tasty-rerun, text, text-format, time, transformers
+     , unordered-containers, z3
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
-       version = "0.6.0.1";
-       sha256 = "1zbhspcwqx8lqdz4niikz5g2hd8rd2h5lda3rqpkl3z8nw0v7vql";
+       version = "0.7.0.1";
+       sha256 = "1hw7xbnqmrbzqv6mvzgpi6rnqp3an8vf8ky5w25j7088c2f0chzr";
        configureFlags = [ "-fbuild-external" ];
        isLibrary = true;
        isExecutable = true;
@@ -122317,19 +122508,21 @@ self: {
          ansi-terminal array ascii-progress async attoparsec base bifunctors
          binary boxes bytestring cereal cmdargs containers deepseq directory
          dotgen fgl fgl-visualize filemanip filepath ghc-prim hashable
-         intern located-base mtl parallel parsec pretty process syb text
-         text-format time transformers unordered-containers
+         intern located-base mtl parallel parallel-io parsec pretty process
+         syb text text-format time transformers unordered-containers
        ];
        executableHaskellDepends = [ base ];
        executableSystemDepends = [ ocaml ];
        testHaskellDepends = [
-         base directory filepath process tasty tasty-hunit tasty-rerun text
+         base containers directory filepath mtl process stm tasty
+         tasty-ant-xml tasty-hunit tasty-rerun text transformers
        ];
-       testSystemDepends = [ z3 ];
+       testSystemDepends = [ git nettools z3 ];
        homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) ocaml; inherit (pkgs) z3;};
+     }) {inherit (pkgs) git; inherit (pkgs) nettools; 
+         inherit (pkgs) ocaml; inherit (pkgs) z3;};
 
   "liquidhaskell" = callPackage
     ({ mkDerivation, aeson, array, base, bifunctors, binary, bytestring
@@ -124932,6 +125125,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lucid-extras" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, directory, lucid
+     , text
+     }:
+     mkDerivation {
+       pname = "lucid-extras";
+       version = "0.1.0.0";
+       sha256 = "0akpsh79lpdx7in1ffzz2l36i4gnvfn290cjz0pdr0y8bs0bv9dr";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring lucid text
+       ];
+       testHaskellDepends = [ base directory lucid ];
+       homepage = "https://github.com/diffusionkinetics/open/lucid-extras";
+       description = "Generate more HTML with Lucid";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lucid-foundation" = callPackage
     ({ mkDerivation, base, hspec, lucid, QuickCheck
      , quickcheck-instances, text
@@ -129864,41 +130074,6 @@ self: {
      }) {};
 
   "minio-hs" = callPackage
-    ({ mkDerivation, async, base, bytestring, case-insensitive, conduit
-     , conduit-combinators, conduit-extra, containers, cryptonite
-     , cryptonite-conduit, data-default, directory, exceptions, filepath
-     , http-client, http-conduit, http-types, lifted-async, lifted-base
-     , memory, monad-control, protolude, QuickCheck, resourcet, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text
-     , text-format, time, transformers, transformers-base, xml-conduit
-     }:
-     mkDerivation {
-       pname = "minio-hs";
-       version = "0.3.0";
-       sha256 = "0bnva7809g7ry31373j7qcmnfiamqfv4r50y6h1k0d7pnsck3bn5";
-       libraryHaskellDepends = [
-         async base bytestring case-insensitive conduit conduit-combinators
-         conduit-extra containers cryptonite cryptonite-conduit data-default
-         exceptions filepath http-client http-conduit http-types
-         lifted-async lifted-base memory monad-control protolude resourcet
-         text text-format time transformers transformers-base xml-conduit
-       ];
-       testHaskellDepends = [
-         async base bytestring case-insensitive conduit conduit-combinators
-         conduit-extra containers cryptonite cryptonite-conduit data-default
-         directory exceptions filepath http-client http-conduit http-types
-         lifted-async lifted-base memory monad-control protolude QuickCheck
-         resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck
-         temporary text text-format time transformers transformers-base
-         xml-conduit
-       ];
-       homepage = "https://github.com/minio/minio-hs#readme";
-       description = "A Minio client library, compatible with S3 like services";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "minio-hs_0_3_1" = callPackage
     ({ mkDerivation, async, base, bytestring, case-insensitive, conduit
      , conduit-combinators, conduit-extra, containers, cryptonite
      , cryptonite-conduit, data-default, directory, exceptions, filepath
@@ -132724,38 +132899,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, code-page, containers
-     , criterion, deepseq, Earley, http-client, http-client-tls
-     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
-     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
-     , tasty-quickcheck, text, text-format, transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.6.9";
-       sha256 = "1a0s0hj09rhgixs09ay7fjk12d3wrlhm2w957md7pkan412vx200";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text text-format transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         base code-page optparse-applicative text text-format
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion system-filepath text ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_10" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, http-client, http-client-tls
      , microlens, microlens-mtl, mtl, optparse-applicative, pipes
@@ -132785,7 +132928,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -136608,8 +136750,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-api-support";
-       version = "0.3.0";
-       sha256 = "0jjd84wwxjdvj1d17rwwmpdv03c18am09xafysw33d6777xh8dmk";
+       version = "0.3.1";
+       sha256 = "0p3k19fv211rhrncc9l08m0wbm9ip1xima2xpfcq4pig8xc2fqbx";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
@@ -137351,23 +137493,6 @@ self: {
      }) {};
 
   "network-transport-tests" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
-     , network-transport, random
-     }:
-     mkDerivation {
-       pname = "network-transport-tests";
-       version = "0.2.3.0";
-       sha256 = "0v1vyn0v41kzw54qy2f46phwglyh0qsng534ma8rhwbxxfbvsxw2";
-       libraryHaskellDepends = [
-         ansi-terminal base bytestring containers mtl network-transport
-         random
-       ];
-       homepage = "http://haskell-distributed.github.com";
-       description = "Unit tests for Network.Transport implementations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-transport-tests_0_2_4_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
      , network-transport, random
      }:
@@ -137382,7 +137507,6 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Unit tests for Network.Transport implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport-zeromq" = callPackage
@@ -137688,18 +137812,6 @@ self: {
      }) {};
 
   "newtype-generics" = callPackage
-    ({ mkDerivation, base, hspec, HUnit }:
-     mkDerivation {
-       pname = "newtype-generics";
-       version = "0.5";
-       sha256 = "173zdvwmx71i146yrp7pc1c6vdpi3bms73zqm29f4bk8kqnaqqyw";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec HUnit ];
-       description = "A typeclass and set of functions for working with newtypes, with generics support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "newtype-generics_0_5_1" = callPackage
     ({ mkDerivation, base, hspec, HUnit, transformers }:
      mkDerivation {
        pname = "newtype-generics";
@@ -137709,7 +137821,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtype-th" = callPackage
@@ -137822,8 +137933,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.6.0.0";
-       sha256 = "0bs0jxxgrq29b14mcslyqa29znbhlx6kwq93jzr995alhn7g92px";
+       version = "0.6.1.1";
+       sha256 = "09rrkxkc23yfm7vyzmq57lwhbwfn4x89b3r9i4s3r27qs1p2l7fa";
        libraryHaskellDepends = [
          async base binary bytestring template-haskell unix
        ];
@@ -139288,6 +139399,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "numhask_0_1_2" = callPackage
+    ({ mkDerivation, adjunctions, base, distributive, doctest, matrix
+     , protolude, QuickCheck, singletons, tasty, tasty-quickcheck
+     , vector
+     }:
+     mkDerivation {
+       pname = "numhask";
+       version = "0.1.2";
+       sha256 = "0vxs2qwgrq7ylp34r87hdnd2rxfyri2iyv933si8hzkgdg54zqk3";
+       libraryHaskellDepends = [
+         adjunctions base distributive matrix protolude QuickCheck
+         singletons vector
+       ];
+       testHaskellDepends = [ base doctest tasty tasty-quickcheck ];
+       homepage = "https://github.com/tonyday567/numhask";
+       description = "A numeric prelude";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "numhask-range" = callPackage
     ({ mkDerivation, base, containers, foldl, formatting, lens, linear
      , numhask, protolude, QuickCheck, tasty, tasty-quickcheck
@@ -139307,18 +139438,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range_0_1_0" = callPackage
-    ({ mkDerivation, adjunctions, base, containers, distributive
-     , doctest, formatting, numhask, protolude, QuickCheck
-     , semigroupoids, tasty, tasty-quickcheck
+  "numhask-range_0_1_1" = callPackage
+    ({ mkDerivation, adjunctions, base, distributive, doctest, numhask
+     , protolude, QuickCheck, semigroupoids, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.1.0";
-       sha256 = "1z5h7vmbq0jx8rcvxd8b9y1w1lnh3hv9mcykajwddjmrk2rxynnp";
+       version = "0.1.1";
+       sha256 = "09vg6b1ddd8v5lsz15x1g9164c33m5jv48g9f1i5ylbn4vyld90n";
        libraryHaskellDepends = [
-         adjunctions base containers distributive formatting numhask
-         protolude QuickCheck semigroupoids
+         adjunctions base distributive numhask protolude QuickCheck
+         semigroupoids
        ];
        testHaskellDepends = [
          base doctest numhask tasty tasty-quickcheck
@@ -139481,10 +139611,10 @@ self: {
      }:
      mkDerivation {
        pname = "nvvm";
-       version = "0.7.5.2";
-       sha256 = "07qg4y0ypmhcin7k4j2scb4c94sn9wiy5l6nradjw59hk2b8q97i";
+       version = "0.8.0.0";
+       sha256 = "1vs3694ybfzi9zv04mjnmcsy0b8w43pw2fw8yjnlzvknwzcf2sw3";
        setupHaskellDepends = [
-         base Cabal directory filepath template-haskell
+         base Cabal cuda directory filepath template-haskell
        ];
        libraryHaskellDepends = [ base bytestring cuda template-haskell ];
        libraryToolDepends = [ c2hs ];
@@ -141907,20 +142037,21 @@ self: {
 
   "orgmode-parse" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
-     , free, hashable, HUnit, old-locale, tasty, tasty-hunit, text
-     , thyme, unordered-containers
+     , free, hashable, HUnit, neat-interpolation, old-locale, tasty
+     , tasty-hunit, text, thyme, unordered-containers
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.1.1.3";
-       sha256 = "09xnrbwihr8xm1azsgc0vhdcam3a5gdh4s04gnfzkq89aql7j9rj";
+       version = "0.2.0";
+       sha256 = "1xx0mqq4c2war7ykr7md67dhhgh7h74b5j25arh1im7hgn1iy52x";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
        ];
        testHaskellDepends = [
-         aeson attoparsec base bytestring containers hashable HUnit
-         old-locale tasty tasty-hunit text thyme unordered-containers
+         aeson attoparsec base bytestring containers free hashable HUnit
+         neat-interpolation old-locale tasty tasty-hunit text thyme
+         unordered-containers
        ];
        description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
        license = stdenv.lib.licenses.bsd3;
@@ -142615,18 +142746,6 @@ self: {
      }) {};
 
   "palette" = callPackage
-    ({ mkDerivation, array, base, colour, containers }:
-     mkDerivation {
-       pname = "palette";
-       version = "0.1.0.4";
-       sha256 = "1k57mp56zgjs8xpf57vwnnm2ilkbgp717hchrg3ilrbx0yhb9cz6";
-       libraryHaskellDepends = [ array base colour containers ];
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Utilities for choosing and creating color schemes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "palette_0_1_0_5" = callPackage
     ({ mkDerivation, array, base, colour, containers }:
      mkDerivation {
        pname = "palette";
@@ -142636,7 +142755,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Utilities for choosing and creating color schemes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "palindromes" = callPackage
@@ -153116,6 +153234,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "projectile" = callPackage
+    ({ mkDerivation, base, deepseq, path, path-io, protolude
+     , safe-exceptions, tasty, tasty-hunit, tasty-rerun, text, vector
+     }:
+     mkDerivation {
+       pname = "projectile";
+       version = "0.0.0.2";
+       sha256 = "0bl5j1n0vvxglrr9fs6kid2n6qakkjpkwi8dz7la64lznfr96dji";
+       libraryHaskellDepends = [
+         base deepseq path path-io protolude safe-exceptions text vector
+       ];
+       testHaskellDepends = [
+         base deepseq path path-io protolude safe-exceptions tasty
+         tasty-hunit tasty-rerun text vector
+       ];
+       homepage = "https://github.com/roman/Haskell-projectile#readme";
+       description = "Go to README.md";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "projection" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -153334,8 +153472,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.7.6";
-       sha256 = "0nqhhgrcjq8zbnvarrgn2ijk7pmyb2blzh1896jxij828zq9rddd";
+       version = "4.7.7";
+       sha256 = "04aglqwvnw40pxg479mhi1i81547bb7s26qrg9gga8xs1cqgnfbs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156530,6 +156668,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "raaz_0_2_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, criterion
+     , deepseq, hspec, hspec-discover, HUnit, optparse-applicative
+     , pretty, QuickCheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "raaz";
+       version = "0.2.0";
+       sha256 = "0841p4yw0hd1mjx0ida662n6apfhmjyw76ar9gaysivbgh75dw4y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring deepseq vector ];
+       executableHaskellDepends = [ base optparse-applicative ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-discover HUnit QuickCheck transformers
+         vector
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion pretty
+       ];
+       homepage = "http://github.com/raaz-crypto/raaz";
+       description = "The raaz cryptographic library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rabocsv2qif" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-conversion, split
      , time
@@ -158037,25 +158201,6 @@ self: {
      }) {};
 
   "rdf" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq
-     , dlist, fgl, text, transformers
-     }:
-     mkDerivation {
-       pname = "rdf";
-       version = "0.1.0.1";
-       sha256 = "19iy6gfvmmz06bdacfrg3slaxvjikl7x152n7pcz3kwwv2qhscjg";
-       libraryHaskellDepends = [
-         attoparsec base bytestring deepseq dlist fgl text transformers
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq text
-       ];
-       homepage = "https://github.com/traviswhitaker/rdf";
-       description = "Representation and Incremental Processing of RDF Data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rdf_0_1_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq
      , dlist, fgl, text, transformers
      }:
@@ -158072,7 +158217,6 @@ self: {
        homepage = "https://github.com/traviswhitaker/rdf";
        description = "Representation and Incremental Processing of RDF Data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdf4h" = callPackage
@@ -159007,8 +159151,8 @@ self: {
      }:
      mkDerivation {
        pname = "recursion-schemes-ext";
-       version = "0.1.1.1";
-       sha256 = "10jyylpbcahxp64gnvb1pplvkrgga65nj4lapws5kl52jw1bf5z4";
+       version = "0.2.0.0";
+       sha256 = "0h74109rwybpg6wardmrzh3163868mi025a8wq5dbpcx284zv1w1";
        libraryHaskellDepends = [
          base composition-prelude deepseq recursion-schemes template-haskell
        ];
@@ -164199,8 +164343,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.2.5";
-       sha256 = "1idqvlva12ndm4nbjhigz6z8r7y8lr25yck6fxilkls766rdv61m";
+       version = "0.2.6";
+       sha256 = "1j3sgsrz6l6c77xcy1ni8jglrpahb7kg3ba92lgbdbr6jcrfqi1x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164836,8 +164980,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy";
-       version = "0.9.3.2";
-       sha256 = "0dvbwjrgy6vzhp4mqxpk0kbzv1im2bjp6qq9aq8ggcbdis6m1x85";
+       version = "0.9.3.3";
+       sha256 = "17msazxg0iqvmsn4cwlnr1hwcw5bfp276zsg7x5r47ifi9j748nb";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -165999,31 +166143,6 @@ self: {
      }) {};
 
   "schematic" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, hspec-core
-     , hspec-discover, hspec-smallcheck, HUnit, regex-compat, scientific
-     , singletons, smallcheck, smallcheck-series, tagged, text
-     , unordered-containers, validationt, vector, vinyl
-     }:
-     mkDerivation {
-       pname = "schematic";
-       version = "0.1.4.0";
-       sha256 = "11dc24f657wh5g5yx256qnwmajxs5f6pv2ydzdqig3a7al32kvfb";
-       libraryHaskellDepends = [
-         aeson base bytestring regex-compat scientific singletons smallcheck
-         smallcheck-series tagged text unordered-containers validationt
-         vector vinyl
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec hspec-core hspec-discover
-         hspec-smallcheck HUnit regex-compat singletons smallcheck
-         smallcheck-series tagged text unordered-containers validationt
-         vinyl
-       ];
-       description = "JSON-biased spec and validation tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "schematic_0_1_5_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, hspec-core
      , hspec-discover, hspec-smallcheck, HUnit, lens, regex-compat
      , scientific, singletons, smallcheck, smallcheck-series, tagged
@@ -166031,8 +166150,8 @@ self: {
      }:
      mkDerivation {
        pname = "schematic";
-       version = "0.1.5.0";
-       sha256 = "1zlpr0mp3qczylyn26chcndmvyn33pb36xh3d339mrbyalvrb5v7";
+       version = "0.1.6.0";
+       sha256 = "1pk75lrcw187nv3qf2xddi2v3pkmrq6vy6frv5piaaw12qzflfah";
        libraryHaskellDepends = [
          aeson base bytestring regex-compat scientific singletons smallcheck
          smallcheck-series tagged text unordered-containers validationt
@@ -166046,7 +166165,6 @@ self: {
        ];
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scholdoc" = callPackage
@@ -167025,6 +167143,25 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
+  "sdl2-ttf_2_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
+     , template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "sdl2-ttf";
+       version = "2.0.1";
+       sha256 = "0sk1lnb9zrh2ip4lhxx4g6q4j23c35k62jvbzckzy4ajlbs3029v";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring sdl2 template-haskell text transformers
+       ];
+       libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
+       description = "Bindings to SDL2_ttf";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
+
   "sdnv" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
@@ -170988,32 +171125,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.13";
-       sha256 = "03jqmkvsf5ygg3szqr65xpd7c3yjivkbaxvkz683pwx7hqqpyzm6";
-       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_14" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -171036,7 +171147,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 ];
      }) {};
 
@@ -171537,18 +171647,18 @@ self: {
      }) {};
 
   "shift" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, bytestring
+    ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , composition, data-default, lens, optparse-applicative
      , system-fileio, system-filepath, text, turtle
      }:
      mkDerivation {
        pname = "shift";
-       version = "0.1.0.0";
-       sha256 = "10mbb64cxv4iin6ic9bgl5l431g3mc91jcpns71k85w8imbfiypd";
+       version = "0.2.0.1";
+       sha256 = "162b862m73dwdw3ci1k8ihwb2kng7nrn679zk01v5cq3s3qkbqgx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring composition data-default lens
+         ansi-terminal base binary bytestring composition data-default lens
          optparse-applicative system-fileio system-filepath text turtle
        ];
        executableHaskellDepends = [ base ];
@@ -177060,8 +177170,8 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.2.8";
-       sha256 = "1xv3pciz0badd4wbijw8zmiwr656gjimv7lxccggm2q3nsqnq9gz";
+       version = "0.2.9";
+       sha256 = "0xk8i5hskr59vrf8vkvwsvp4n048fd66k959q7nl0i5z3k0lx2m2";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base leancheck ];
@@ -178776,6 +178886,52 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-curator_0_15_0_0" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
+     , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
+     , classy-prelude-conduit, conduit, conduit-extra, containers
+     , cryptohash, cryptohash-conduit, data-default-class, directory
+     , exceptions, filepath, hashable, hspec, html-conduit, http-client
+     , http-client-tls, http-conduit, lucid, mime-types, monad-unlift
+     , monad-unlift-ref, mono-traversable, mtl, old-locale
+     , optparse-applicative, optparse-simple, process, QuickCheck
+     , resourcet, safe, semigroups, stm, store, streaming-commons, syb
+     , system-fileio, system-filepath, tar, temporary, text, time
+     , transformers, unix-compat, unordered-containers, utf8-string
+     , vector, xml-conduit, xml-types, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "stackage-curator";
+       version = "0.15.0.0";
+       sha256 = "0z84ywxh4zb996b0ir8hjl9pwdcb0ds0pgq6i8sfxmj5nrw5yjn5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 async base
+         base16-bytestring blaze-html byteable bytestring Cabal
+         classy-prelude-conduit conduit conduit-extra containers cryptohash
+         cryptohash-conduit data-default-class directory exceptions filepath
+         hashable html-conduit http-client http-client-tls http-conduit
+         lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl
+         old-locale process resourcet safe semigroups stm store
+         streaming-commons syb system-fileio system-filepath tar temporary
+         text time transformers unix-compat unordered-containers utf8-string
+         vector xml-conduit xml-types yaml zlib
+       ];
+       executableHaskellDepends = [
+         aeson base http-client http-client-tls optparse-applicative
+         optparse-simple system-filepath text
+       ];
+       testHaskellDepends = [
+         base Cabal classy-prelude-conduit containers directory hspec
+         http-client http-client-tls QuickCheck text yaml
+       ];
+       homepage = "https://github.com/fpco/stackage-curator";
+       description = "Tools for curating Stackage bundles";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stackage-install" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , cryptohash, directory, filepath, http-client, http-client-tls
@@ -179098,8 +179254,8 @@ self: {
      }:
      mkDerivation {
        pname = "state-codes";
-       version = "0.1.1";
-       sha256 = "17vfgvwrhx7h9hy6x2w52h326h9ana2gfpgwgd1war0cbws07sna";
+       version = "0.1.2";
+       sha256 = "08i4ly81yr8sxjhjl6y2kk58ya597q0rcyw3dr50gfxrg20p36dj";
        libraryHaskellDepends = [ aeson base shakespeare text ];
        testHaskellDepends = [ aeson base hspec QuickCheck text ];
        homepage = "https://github.com/acamino/state-codes#README";
@@ -179138,8 +179294,8 @@ self: {
      }:
      mkDerivation {
        pname = "stateWriter";
-       version = "0.2.8.2";
-       sha256 = "1y8580n66hif4pp2b6gsqssafcqf1vysf63209i2rcjr0dsgnjgz";
+       version = "0.2.9";
+       sha256 = "0kvkf3lh60sz0nfscjd6skr52b11mh7wk4ls64z5hmdjr4cnjgmm";
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base free hspec mtl QuickCheck ];
        benchmarkHaskellDepends = [
@@ -181614,6 +181770,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "structured-cli" = callPackage
+    ({ mkDerivation, base, data-default, haskeline, mtl, split
+     , transformers
+     }:
+     mkDerivation {
+       pname = "structured-cli";
+       version = "0.9.0.3";
+       sha256 = "1w1a8ryj85iixzh3y5vr46dfmslsldngqyf0c1yg8wwb3sacca9n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-default haskeline mtl split transformers
+       ];
+       executableHaskellDepends = [ base data-default mtl split ];
+       homepage = "https://github.com/erickg/structured-cli#readme";
+       description = "Application library for building interactive console CLIs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "structured-haskell-mode" = callPackage
     ({ mkDerivation, base, descriptive, ghc-prim, haskell-src-exts
      , text
@@ -182430,6 +182605,8 @@ self: {
        pname = "svg-builder";
        version = "0.1.0.2";
        sha256 = "0m7fpxh2viafcfm04xzy64jakx5c0p5wcam3bdwxgmj3r3q0qjc1";
+       revision = "1";
+       editedCabalFile = "1h3bzkimiydj5j2rh7cyp5bhphvy6hglpkidhlfwy520sqsw3zvx";
        libraryHaskellDepends = [
          base blaze-builder bytestring hashable text unordered-containers
        ];
@@ -185239,6 +185416,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-hedgehog" = callPackage
+    ({ mkDerivation, base, hedgehog, tagged, tasty
+     , tasty-expected-failure
+     }:
+     mkDerivation {
+       pname = "tasty-hedgehog";
+       version = "0.1.0.1";
+       sha256 = "1sqwj5vzmc2rcr8yh2pqwmkdr11cwf20fv5z4wr5xsp9qnv3bzl1";
+       revision = "1";
+       editedCabalFile = "1aq46lrx467r3c6i8figzgyhwkg1n34zq9r39j6144mmmmgh2wpz";
+       libraryHaskellDepends = [ base hedgehog tagged tasty ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-expected-failure
+       ];
+       homepage = "https://github.com/qfpl/tasty-hedgehog";
+       description = "Integrates the hedgehog testing library with the tasty testing framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tasty-hspec" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
      , tagged, tasty, tasty-quickcheck, tasty-smallcheck
@@ -185916,6 +186112,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "teardown_0_2_0_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest
+     , Glob, protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit
+     , tasty-rerun, tasty-smallcheck, text, time
+     }:
+     mkDerivation {
+       pname = "teardown";
+       version = "0.2.0.0";
+       sha256 = "1ir84hm9z5n4dv1qvfs5f3qzmhdymcaak2whbvdz189kkziwhqsf";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base deepseq protolude text time
+       ];
+       testHaskellDepends = [
+         base doctest Glob protolude QuickCheck tasty tasty-hspec
+         tasty-hunit tasty-rerun tasty-smallcheck text time
+       ];
+       benchmarkHaskellDepends = [ base criterion protolude text time ];
+       homepage = "https://github.com/roman/Haskell-teardown#readme";
+       description = "Build composable, idempotent & transparent application cleanup sub-routines";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "teeth" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -187542,6 +187761,23 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "text-cp437" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-text
+     , text
+     }:
+     mkDerivation {
+       pname = "text-cp437";
+       version = "0.2.1";
+       sha256 = "1fzsb341yr1jiv9wflr35ra1z1cd41wmyp0y5dv2p0fq10kxcfgs";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base bytestring QuickCheck quickcheck-text text
+       ];
+       homepage = "https://github.com/pliosoft/text-cp437#readme";
+       description = "Conversion of Text to and from CP437";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "text-format" = callPackage
     ({ mkDerivation, array, base, double-conversion, ghc-prim
      , integer-gmp, old-locale, text, time, transformers
@@ -189306,18 +189542,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "threepenny-editors_0_5_2" = callPackage
+  "threepenny-editors_0_5_3" = callPackage
     ({ mkDerivation, base, bifunctors, casing, containers, data-default
-     , generics-sop, lens, profunctors, threepenny-gui
+     , generics-sop, profunctors, template-haskell, threepenny-gui
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.5.2";
-       sha256 = "131gczj4nwcip1m2pry8h340mivpm4skydw0r8ir7mfr4pc6a1wj";
+       version = "0.5.3";
+       sha256 = "19h83mcrm22svdpb20bzvv3wfzkrynwybgf14qclf5wyf46qmf2b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bifunctors casing containers data-default generics-sop lens
+         base bifunctors casing containers data-default generics-sop
+         profunctors template-haskell threepenny-gui
+       ];
+       executableHaskellDepends = [
+         base bifunctors casing containers data-default generics-sop
          profunctors threepenny-gui
        ];
        homepage = "https://github.com/pepeiborra/threepenny-editors";
@@ -191856,16 +192096,16 @@ self: {
 
   "traildb" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, criterion
-     , deepseq, directory, exceptions, Judy, lens, primitive, random
-     , text, time, traildb, transformers, unix, vector
+     , deepseq, directory, exceptions, Judy, primitive, profunctors
+     , random, text, time, traildb, transformers, unix, vector
      }:
      mkDerivation {
        pname = "traildb";
-       version = "0.1.1.0";
-       sha256 = "0frv6wxa70jgxys9mjlj605xcwwzdf33k7igghzhsdmavbzqldqm";
+       version = "0.1.2.0";
+       sha256 = "0a6pjkslq4vi84l04g8s640hwg2yki3015z1glcslyyj4x4wb47m";
        libraryHaskellDepends = [
-         base bytestring containers directory exceptions lens primitive text
-         time transformers unix vector
+         base bytestring containers directory exceptions primitive
+         profunctors text time transformers unix vector
        ];
        librarySystemDepends = [ Judy traildb ];
        benchmarkHaskellDepends = [
@@ -192789,8 +193029,10 @@ self: {
     ({ mkDerivation, base, containers, template-haskell, time }:
      mkDerivation {
        pname = "true-name";
-       version = "0.1.0.2";
-       sha256 = "1c0wdqpdrannmsgf5qp9l8igmwmj8kgf1mvb3cj5mzk90n4jfxh6";
+       version = "0.1.0.3";
+       sha256 = "0s74fi3zfzk3apvwjz1c0k0ij24kdvlrn8lply9c04kyd20fyc66";
+       revision = "1";
+       editedCabalFile = "0x56r3wyrrsckx6kdvr4v9janrby5qa21fjqwg9k211765c9ddj6";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base containers template-haskell time ];
        homepage = "https://github.com/liyang/true-name";
@@ -193377,7 +193619,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "turtle_1_4_1" = callPackage
+  "turtle_1_4_2" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , criterion, directory, doctest, foldl, hostname, managed
      , optional-args, optparse-applicative, process, semigroups, stm
@@ -193386,8 +193628,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.4.1";
-       sha256 = "1frq36axmzbcya2623vcs2cpvr7zh7bk7nzjpdpvzmwqykkfm4lc";
+       version = "1.4.2";
+       sha256 = "0zzc84k0126rnfm4sqb1a42n9carfq740vjnb7v7m5p1zf23x1f8";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock directory foldl hostname
          managed optional-args optparse-applicative process semigroups stm
@@ -193871,37 +194113,6 @@ self: {
      }) {};
 
   "twitter-conduit" = callPackage
-    ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base
-     , bytestring, case-insensitive, conduit, conduit-extra, containers
-     , data-default, doctest, exceptions, hlint, hspec, http-client
-     , http-conduit, http-types, lens, lens-aeson, network-uri
-     , resourcet, template-haskell, text, time, transformers
-     , transformers-base, twitter-types, twitter-types-lens
-     }:
-     mkDerivation {
-       pname = "twitter-conduit";
-       version = "0.2.2.1";
-       sha256 = "06nbbh9lx816klc1hcd7rvqaxhshscc4bbq10mnhqrfzq69al695";
-       libraryHaskellDepends = [
-         aeson attoparsec authenticate-oauth base bytestring conduit
-         conduit-extra containers data-default exceptions http-client
-         http-conduit http-types lens lens-aeson resourcet template-haskell
-         text time transformers transformers-base twitter-types
-         twitter-types-lens
-       ];
-       testHaskellDepends = [
-         aeson attoparsec authenticate-oauth base bytestring
-         case-insensitive conduit conduit-extra containers data-default
-         doctest hlint hspec http-client http-conduit http-types lens
-         lens-aeson network-uri resourcet template-haskell text time
-         twitter-types twitter-types-lens
-       ];
-       homepage = "https://github.com/himura/twitter-conduit";
-       description = "Twitter API package with conduit interface and Streaming API support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "twitter-conduit_0_2_2_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base
      , bytestring, Cabal, cabal-doctest, case-insensitive, conduit
      , conduit-extra, containers, data-default, doctest, exceptions
@@ -193932,7 +194143,6 @@ self: {
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -194740,28 +194950,6 @@ self: {
      }) {};
 
   "typed-process" = callPackage
-    ({ mkDerivation, async, base, base64-bytestring, bytestring
-     , conduit, conduit-extra, exceptions, hspec, http-conduit, process
-     , stm, temporary, transformers
-     }:
-     mkDerivation {
-       pname = "typed-process";
-       version = "0.1.0.0";
-       sha256 = "1y0h19fh6pf3x8rr2ai59rxpsgwippcas087wb63rbmkrk36p1ny";
-       libraryHaskellDepends = [
-         async base bytestring conduit conduit-extra exceptions process stm
-         transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring bytestring conduit conduit-extra hspec
-         http-conduit temporary
-       ];
-       homepage = "https://github.com/fpco/typed-process#readme";
-       description = "Run external processes, with strong typing of streams";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "typed-process_0_1_0_1" = callPackage
     ({ mkDerivation, async, base, base64-bytestring, bytestring
      , conduit, conduit-extra, exceptions, hspec, http-conduit, process
      , stm, temporary, transformers
@@ -194781,7 +194969,6 @@ self: {
        homepage = "https://haskell-lang.org/library/typed-process";
        description = "Run external processes, with strong typing of streams";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-spreadsheet" = callPackage
@@ -201821,6 +202008,25 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "wai-secure-cookies" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, http-types, memory
+     , protolude, random, split, wai
+     }:
+     mkDerivation {
+       pname = "wai-secure-cookies";
+       version = "0.1.0.1";
+       sha256 = "0i6ipcyqfndakr42d4cbskv5zkg1kizkhl46wi6km0l8lzbc42l4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cryptonite http-types memory protolude random split
+         wai
+       ];
+       executableHaskellDepends = [ base bytestring cryptonite memory ];
+       homepage = "https://github.com/habibalamin/wai-secure-cookies";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "wai-session" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , cookie, http-types, StateVar, time, transformers, vault, wai
@@ -202200,8 +202406,8 @@ self: {
      }:
      mkDerivation {
        pname = "warc";
-       version = "1.0.1";
-       sha256 = "0vwml51prp730n5dmdla4s2116slp0wqg195b7psv4a3yqfx7v7p";
+       version = "1.0.3";
+       sha256 = "040kvm4nrd71hsjba5kjdp4620q2123asnfzsbxmbjw5p9jqjhh9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208434,35 +208640,6 @@ self: {
      }) {};
 
   "yesod-auth" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptonite, data-default, email-validate, file-embed
-     , http-client, http-conduit, http-types, lifted-base, memory
-     , mime-mail, network-uri, nonce, persistent, persistent-template
-     , random, resourcet, safe, shakespeare, template-haskell, text
-     , time, transformers, unordered-containers, wai, yesod-core
-     , yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.4.17.2";
-       sha256 = "10wrl6g5q06mf751rwc8wclb5i5wajp30vhr7ggpvfylmqzjg933";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-conduit http-types lifted-base memory
-         mime-mail network-uri nonce persistent persistent-template random
-         resourcet safe shakespeare template-haskell text time transformers
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_4_17_3" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -208489,7 +208666,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -209263,30 +209439,6 @@ self: {
      }) {};
 
   "yesod-form" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, template-haskell, text, time
-     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.4.13";
-       sha256 = "0yq98rk81nilm39djpwl2kvr83j96yakc1ysyy3zgywb2k1ncvqk";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare
-         template-haskell text time transformers wai xss-sanitize yesod-core
-         yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_4_15" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -209308,7 +209460,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage

From 1cae15edda33f59bd17e0bd71bd4837f98c1b61b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 Aug 2017 19:55:42 +0000
Subject: [PATCH 2860/3246] lilypond-unstable: 2.19.24 -> 2.19.65

---
 pkgs/misc/lilypond/unstable.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index d16102df927..046416cd9df 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchurl, guile, rsync, lilypond }:
+{ stdenv, fetchurl, fetchgit, guile, rsync, lilypond, gyre-fonts }:
 
 with stdenv.lib;
 
+let urw-fonts = fetchgit {
+  url = "http://git.ghostscript.com/urw-core35-fonts.git";
+  rev = "1f28a6fcd2176256a995db907d9ffe6e1b9b83e9";
+  sha256 = "1nlx95l1pw5lxqp2v0rn9a7lqrsbbhzr0dy3cybk55r4a8awbr2a";
+}; in
+
 overrideDerivation lilypond (p: rec {
   majorVersion = "2.19";
-  minorVersion = "24";
+  minorVersion = "65";
   version="${majorVersion}.${minorVersion}";
   name = "lilypond-${version}";
 
   src = fetchurl {
     url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz";
-    sha256 = "0wd57swrfc2nvkj10ipdbhq6gpnckiafg2b2kpd8aydsyp248iln";
+    sha256 = "0k2jy7z58j62c5cv1308ac62d6jri17wip76xrbq8s6jq6jl7phd";
   };
 
-  configureFlags = [ "--disable-documentation" "--with-fonts-dir=${p.urwfonts}"];
+  configureFlags = [ "--disable-documentation" "--with-urwotf-dir=${urw-fonts}" "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"];
 
   buildInputs = p.buildInputs ++ [ rsync ];
 

From 30ad3834a953f06aa7c5fc3d98be09753cdceb1e Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Mon, 28 Aug 2017 12:04:11 -0800
Subject: [PATCH 2861/3246] broadcom-bt-firmware: 12.0.1.1011 -> 12.0.1.1012

---
 .../linux/firmware/broadcom-bt-firmware/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
index 87232acfa83..01609c8779d 100644
--- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
@@ -5,11 +5,11 @@
 # see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865
 stdenv.mkDerivation rec {
   name = "broadcom-bt-firmware-${version}";
-  version = "12.0.1.1011";
+  version = "12.0.1.1012";
 
   src = fetchurl {
-    url = "http://download.windowsupdate.com/d/msdownload/update/driver/drvs/2016/11/200033618_94cfea9130b30c04bc602cd3dcc1f9a793fc75bb.cab";
-    sha256 = "6091e49c9d9c71cbe3aed2db3c0d60994ff562804c3b40e1e8bcbb818180987b";
+    url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/04/852bb503-de7b-4810-a7dd-cbab62742f09_7cf83a4c194116648d17707ae37d564f9c70bec2.cab";
+    sha256 = "1b1qjwxjk4y91l3iz157kms8601n0mmiik32cs6w9b1q4sl4pxx9";
   };
 
   nativeBuildInputs = [ cabextract bt-fw-converter ];

From 0da61beee937f7c22b8c609bc645d54fd4876465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 28 Aug 2017 22:14:11 +0200
Subject: [PATCH 2862/3246] xxdiff-tip: 20170101 -> 20170623

Updates the xxdiff-tip version and fixes compilation errors by forcing qt5.6.
---
 pkgs/development/tools/misc/xxdiff/tip.nix | 18 +++++++++---------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix
index b613508c5c0..f05988e7026 100644
--- a/pkgs/development/tools/misc/xxdiff/tip.nix
+++ b/pkgs/development/tools/misc/xxdiff/tip.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchFromBitbucket, qt5, flex, bison, docutils }:
+{ stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }:
 
 stdenv.mkDerivation rec {
-  name = "xxdiff-4.0.1.20170101";
+  name = "xxdiff-4.0.1.20170623";
 
   src = fetchFromBitbucket {
     owner = "blais";
     repo = "xxdiff";
-    rev = "1cf6b23ad30a845daba28a3409c65f93aec7f5e8";
-    sha256 = "0rq7grpndj85i7qzlj93jpzpfzk7bwsi55033fc63hb55rbdzz6z";
+    rev = "5e5f885dfc43559549a81c59e9e8c9525306356a";
+    sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w";
   };
 
-  nativeBuildInputs = [ flex bison qt5.qtbase docutils ];
+  nativeBuildInputs = [ flex bison docutils ];
 
-  buildInputs = [ qt5.qtbase ];
+  buildInputs = [ qtbase ];
 
   preConfigure = ''
-    ln -s ${qt5.qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs
-    ln -s ${qt5.qtbase.dev}/bin/* ../__nix_qt*__/bin || true
+    ln -s ${qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs
+    ln -s ${qtbase.dev}/bin/* ../__nix_qt*__/bin || true
   '';
 
-  NIX_CFLAGS_COMPILE="-I${qt5.qtbase.dev}/include/QtCore -I${qt5.qtbase.dev}/include/QtGui -I${qt5.qtbase.dev}/include/QtWidgets";
+  NIX_CFLAGS_COMPILE="-I${qtbase.dev}/include/QtCore -I${qtbase.dev}/include/QtGui -I${qtbase.dev}/include/QtWidgets";
   
   configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fb97035794..469000ba931 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7443,7 +7443,7 @@ with pkgs;
   xxdiff = callPackage ../development/tools/misc/xxdiff {
     bison = bison2;
   };
-  xxdiff-tip = callPackage ../development/tools/misc/xxdiff/tip.nix { };
+  xxdiff-tip = qt56.callPackage ../development/tools/misc/xxdiff/tip.nix { };
 
   yacc = bison;
 

From 03b08fca66850dc01f988146d8c807d059f9c4af Mon Sep 17 00:00:00 2001
From: Claas Augner <github@caugner.de>
Date: Mon, 28 Aug 2017 22:33:51 +0200
Subject: [PATCH 2863/3246] nextcloud-client 2.3.2 (#28645)

* nextcloud-client: init at 2.3.2

* nextcloud-client: nitpicks
---
 lib/maintainers.nix                           |  1 +
 .../networking/nextcloud-client/default.nix   | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/networking/nextcloud-client/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7fd33f3b396..8e97bac42ac 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -97,6 +97,7 @@
   canndrew = "Andrew Cann <shum@canndrew.org>";
   carlsverre = "Carl Sverre <accounts@carlsverre.com>";
   casey = "Casey Rodarmor <casey@rodarmor.net>";
+  caugner = "Claas Augner <nixos@caugner.de>";
   cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>";
   cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
   changlinli = "Changlin Li <mail@changlinli.com>";
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
new file mode 100644
index 00000000000..d369ec63a94
--- /dev/null
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "nextcloud-client-${version}";
+  version = "2.3.2";
+
+  src = fetchgit {
+    url = "git://github.com/nextcloud/client_theming.git";
+    rev = "1ee750d1aeaaefc899629e85c311594603e9ac1b";
+    sha256 = "0dxyng8a7cg78z8yngiqypsb44lf5c6vkabvkfch0cl0cqmarc1a";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];
+
+  preConfigure = ''
+    cmakeFlagsArray+=("-UCMAKE_INSTALL_LIBDIR" "-DOEM_THEME_DIR=$(realpath ./nextcloudtheme)" "../client")
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Nextcloud themed desktop client";
+    homepage = https://nextcloud.com;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ caugner ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 469000ba931..041bd7dd268 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3416,6 +3416,8 @@ with pkgs;
 
   nextcloud = callPackage ../servers/nextcloud { };
 
+  nextcloud-client = libsForQt56.callPackage ../applications/networking/nextcloud-client { };
+
   nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
 
   ngrep = callPackage ../tools/networking/ngrep { };

From be17a1c5254a34625345cd5edcc8eca711b6da1e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 16:45:48 -0400
Subject: [PATCH 2864/3246] ena: 20160629 -> 1.2.0

---
 pkgs/os-specific/linux/ena/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index d3db8ca7d43..d293e276999 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,13 +1,14 @@
 { lib, stdenv, fetchFromGitHub, kernel, kmod }:
 
 stdenv.mkDerivation rec {
-  name = "ena-20160629-${kernel.version}";
+  version = "1.2.0";
+  name = "ena-${version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "amzn-drivers";
-    rev = "b594ac1ea9e0c70e8e95803a0cfd9f5f06ac097e";
-    sha256 = "03w6xgv3lfn28n38mj9cdi3px5zjyrbxnflpd3ggivkv6grf9fp7";
+    rev = "ena_linux_${version}";
+    sha256 = "0m0jqd6gyk4r43w6p5dvp1djg2qgvyhnzmg53sszlh55mlgla714";
   };
 
   hardeningDisable = [ "pic" ];

From 86c55fbb996f00a20788e643ea8afb1e0b64ab55 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 16:55:14 -0400
Subject: [PATCH 2865/3246] sch_cake: 2017-01-28 -> 2017-07-16

---
 pkgs/os-specific/linux/sch_cake/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix
index 72dfea082ef..1522f277fed 100644
--- a/pkgs/os-specific/linux/sch_cake/default.nix
+++ b/pkgs/os-specific/linux/sch_cake/default.nix
@@ -3,13 +3,13 @@
 assert stdenv.lib.versionAtLeast kernel.version "4.4";
 
 stdenv.mkDerivation {
-  name = "sch_cake-2017-01-28";
+  name = "sch_cake-2017-07-16";
 
   src = fetchFromGitHub {
     owner = "dtaht";
     repo = "sch_cake";
-    rev = "9789742cfc596d48583ba4cdbc8f38d026121fa6";
-    sha256 = "03xgkqrv8d9q8rr21awbld0kvwglyinpm71nk16gvm4rd37c5h76";
+    rev = "e641a56f27b6848736028f87eda65ac3df9f99f7";
+    sha256 = "08582jy01j32b3mj8hf6m8687qrcz64zv2m236j24inlkmd94q21";
   };
 
   hardeningDisable = [ "pic" ];

From c9be778453cc7cd6dbdb829b9097dfb314cef9de Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 16:58:45 -0400
Subject: [PATCH 2866/3246] rtlwifi_new: 2016-09-12 -> 2017-07-18

---
 pkgs/os-specific/linux/rtlwifi_new/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix
index 0c7cb24e465..25548e0f962 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix
@@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
 
 in stdenv.mkDerivation rec {
   name = "rtlwifi_new-${version}";
-  version = "2016-09-12";
+  version = "2017-07-18";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtlwifi_new";
-    rev = "7a1b37d2121e8ab1457f002b2729fc23e6ff3e10";
-    sha256 = "0z8grf0fak2ryxwzapp9di77c4bghzkv8lffv76idkcnxgq6sclv";
+    rev = "a24cb561b4d23187ea103255336daa7ca88791a7";
+    sha256 = "1w9rx5wafcp1vc4yh7lj332bv78szl6gmx3ckr8yl6c39alqcv0d";
   };
 
   hardeningDisable = [ "pic" "format" ];

From e42c62e05f47c221a393722456d97cac8043df94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 22:08:01 +0100
Subject: [PATCH 2867/3246] xpdf: build with qt gui

---
 pkgs/applications/misc/xpdf/default.nix | 20 ++++++++------------
 pkgs/top-level/all-packages.nix         |  8 +++-----
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index ca6be8a08d6..ef031c4b9f4 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -1,9 +1,9 @@
 { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
-, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null
-, base14Fonts ? null
+, stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null
+, cmake, qtbase ? null
 }:
 
-assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null;
+assert enableGUI -> qtbase != null && freetype != null;
 assert enablePDFtoPPM -> freetype != null;
 assert useT1Lib -> t1lib != null;
 
@@ -17,8 +17,12 @@ stdenv.mkDerivation {
     sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz";
   };
 
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"];
+
   buildInputs = [ zlib libpng ] ++
-    stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++
+    stdenv.lib.optional enableGUI qtbase ++
     stdenv.lib.optional useT1Lib t1lib ++
     stdenv.lib.optional enablePDFtoPPM freetype;
 
@@ -27,14 +31,6 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  configureFlags = "--enable-a4-paper";
-
-  postInstall = stdenv.lib.optionalString (base14Fonts != null) ''
-    substituteInPlace $out/etc/xpdfrc \
-      --replace /usr/local/share/ghostscript/fonts ${base14Fonts} \
-      --replace '#fontFile' fontFile
-  '';
-
   meta = {
     homepage = http://www.foolabs.com/xpdf/;
     description = "Viewer for Portable Document Format (PDF) files";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5c8f3d2af0..336009476ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11098,7 +11098,7 @@ with pkgs;
   dex-oidc = callPackage ../servers/dex { };
 
   dgraph = callPackage ../servers/dgraph { };
-    
+
   dico = callPackage ../servers/dico { };
 
   dict = callPackage ../servers/dict {
@@ -16924,9 +16924,7 @@ with pkgs;
 
   apvlv = callPackage ../applications/misc/apvlv { };
 
-  xpdf = callPackage ../applications/misc/xpdf {
-    base14Fonts = "${ghostscript}/share/ghostscript/fonts";
-  };
+  xpdf = libsForQt5.callPackage ../applications/misc/xpdf { };
 
   xkb_switch = callPackage ../tools/X11/xkb-switch { };
 
@@ -18684,7 +18682,7 @@ with pkgs;
   hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { };
 
   hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; };
-  
+
   epkowa = callPackage ../misc/drivers/epkowa { };
 
   illum = callPackage ../tools/system/illum { };

From 48a941e29faa95e897fda56e55415f9bb57660f3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 28 Aug 2017 23:11:43 +0200
Subject: [PATCH 2868/3246] cuneiform: use the branch with fresh fixes to fix
 the build

---
 pkgs/tools/graphics/cuneiform/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 6ae6df35a51..14a609fe976 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, cmake, patchelf, imagemagick }:
+{ stdenv, fetchbzr, cmake, patchelf, imagemagick }:
 
 stdenv.mkDerivation rec {
   name = "cuneiform-${version}";
   version = "1.1.0";
 
-  src = fetchurl {
-    url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2";
-    sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp";
+  src = fetchbzr {
+    url = "lp:~f0ma/cuneiform-linux/devel";
+    rev = "540";
+    sha256 = "0sj7v3plf2rrc2vzxl946h9yfribc0jfn4b3ffppghxk2g6kicsb";
   };
 
   buildInputs = [

From 14699ac91d69d438b614482f6472bd3209e5cbbe Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 28 Aug 2017 23:12:15 +0200
Subject: [PATCH 2869/3246] cuneiform: maintain

---
 pkgs/tools/graphics/cuneiform/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 14a609fe976..28699bf6931 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Multi-language OCR system";
     platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [raskin];
   };
 }

From f71d1211734f4c25f8317c5a23348535ad227c88 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Tue, 29 Aug 2017 00:14:20 +0300
Subject: [PATCH 2870/3246] rust-bindgen: 0.29.0 -> 0.30.0

---
 pkgs/development/tools/rust/bindgen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 9be048257ce..78a327c9ea1 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -4,13 +4,13 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "190nilbqch8w2hcdmzgkk2npgsn49a4y9c5r0mxa9d7nz7h0imxk";
+    sha256 = "02ic48qng76rvwa54i8zkvqgr8kfsyj3axc08naylzcvwzp84bsf";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib"
   '';
 
-  depsSha256 = "1y55xdqsk200hj5dhbigsgsx11w5cfxms84hhyl9y7w6jszbzxzw";
+  depsSha256 = "06b5zyw9p7h73h30c1nlnwjb0zmkfx52wqsl9b14y9hx51g9bw0r";
 
   doCheck = false; # A test fails because it can't find standard headers in NixOS
 

From 7d36b34bb8d69a02cd679d3bb2e8dfd7adf85191 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 17:18:58 -0400
Subject: [PATCH 2871/3246] rtl8723bs: 2016-04-11 -> 2017-04-06

---
 pkgs/os-specific/linux/rtl8723bs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix
index d14d0a233c2..0263d17ead0 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/pkgs/os-specific/linux/rtl8723bs/default.nix
@@ -2,13 +2,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rtl8723bs-${kernel.version}-${version}";
-  version = "2016-04-11";
+  version = "2017-04-06";
 
   src = fetchFromGitHub {
     owner = "hadess";
     repo = "rtl8723bs";
-    rev = "11ab92d8ccd71c80f0102828366b14ef6b676fb2";
-    sha256 = "05q7mf12xcb00v6ba4wwvqi53q7ph5brfkj17xf6vkx4jr7xxnmm";
+    rev = "db2c4f61d48fe3b47c167c8bcd722ce83c24aca5";
+    sha256 = "0pxqya14a61vv2v5ky1ldybc0mjfin9mpvmajlmv0lls904rph7g";
   };
 
   hardeningDisable = [ "pic" ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/hadess/rtl8723bs;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
-    broken = (! versionAtLeast kernel.version "3.19");
+    broken = (! versionOlder kernel.version "4.12"); # Now in kernel staging drivers
     maintainers = with maintainers; [ elitak ];
   };
 }

From 9b65bc9649616d06a1dc32075807fd73ff26525c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 22:20:01 +0100
Subject: [PATCH 2872/3246] python.pkgs.Flask-Testing: 0.6.1 -> 0.6.2

Progress on: #28643
---
 .../development/python-modules/flask-testing.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/flask-testing.nix b/pkgs/development/python-modules/flask-testing.nix
index c5fe8f8bdbe..178e000a32e 100644
--- a/pkgs/development/python-modules/flask-testing.nix
+++ b/pkgs/development/python-modules/flask-testing.nix
@@ -1,16 +1,22 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonOlder
+{ stdenv, fetchPypi, buildPythonPackage, pythonOlder
 , flask, blinker, twill }:
 
 with stdenv.lib;
 
 buildPythonPackage rec {
-  name = "Flask-Testing-0.6.1";
+  name = "${pname}-${version}";
+  pname = "Flask-Testing";
+  version = "0.6.2";
 
-  src = fetchurl {
-    url = "mirror://pypi/F/Flask-Testing/${name}.tar.gz";
-    sha256 = "1ckmy7kz2qkggdlm9y5wx6gvd2x7qv921dyb059ywfh15hrkkxdb";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1w0dpwvrcpffm8ychyxpm8s5blm7slik9kplh9jb3sgwcv9gyppj";
   };
 
+  postPatch = ''
+    sed -i -e 's/twill==0.9.1/twill/' setup.py
+  '';
+
   buildInputs = optionals (pythonOlder "3.0") [ twill ];
   propagatedBuildInputs = [ flask blinker ];
 

From fdc18bc74c39b482bb5b0e102e03f764dfbff81f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 29 Aug 2017 00:00:42 +0200
Subject: [PATCH 2873/3246] uri: 2016-09-04 -> 2017-07-16

---
 pkgs/development/libraries/uri/default.nix | 24 +++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix
index 61ac651256a..bec6f2d0f4b 100644
--- a/pkgs/development/libraries/uri/default.nix
+++ b/pkgs/development/libraries/uri/default.nix
@@ -1,30 +1,26 @@
 { stdenv, fetchFromGitHub, cmake, doxygen }:
 
 stdenv.mkDerivation {
-  name = "uri-2016-09-04";
+  name = "uri-2017-07-16";
 
   src = fetchFromGitHub {
     owner = "cpp-netlib";
     repo = "uri";
-    rev = "8b1eec80621ea7be1db3b28f1621e531cc72855c";
-    sha256 = "0f77y79b11pp31y0qpydki2nnxd6gpycp24fmrapi70fsni2ah0d";
+    rev = "ac30f19cc7a4745667a8ebd3eac68d5e70b9a4a6";
+    sha256 = "0ys295ij071rilwkk3xq1p3sdzgb0gyybvd3f0cahh67kh8hyk6n";
   };
 
-  buildInputs = [ cmake doxygen ];
+  nativeBuildInputs = [ cmake doxygen ];
 
-  cmakeFlags = [ "-DUri_BUILD_TESTS=OFF" "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = [
+    "-DUri_BUILD_TESTS=OFF" "-DUri_BUILD_DOCS=ON" "-DBUILD_SHARED_LIBS=ON"
+  ];
 
-  postBuild = ''
-    make doc
-  '';
+  postBuild = "make doc";
 
-  # https://github.com/cpp-netlib/uri/issues/90
   postInstall = ''
-    mv $out/include $out/include2
-    mv $out/include2/include $out/
-    rmdir $out/include2
-    mkdir -p $out/share/doc
-    mv html $out/share/doc/uri
+    install -vd $out/share/doc
+    cp -vR html $out/share/doc
   '';
 
   meta = {

From 8d6682ca0b5f022d8322c3e47d2a1978efafd5ff Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 29 Aug 2017 00:34:33 +0200
Subject: [PATCH 2874/3246] snake4: don't install with setuid

what the..
---
 pkgs/games/snake4/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix
index 2899f712098..f37e15a22df 100644
--- a/pkgs/games/snake4/default.nix
+++ b/pkgs/games/snake4/default.nix
@@ -8,10 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9";
   };
 
-  buildInputs = with xorg; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext];
+  buildInputs = with xorg; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext ];
 
   preInstall = ''
-    substituteInPlace Makefile --replace "-o \$(OWNER) -g \$(GROUP)" ""
+    substituteInPlace Makefile \
+      --replace "-o \$(OWNER) -g \$(GROUP)" "" \
+      --replace "4755" "755"
   '';
   
   installFlags = [ "INSTLIBDIR=$(out)/lib"

From 8e622d268934c56b465850b74f2cf65682f78ff7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 29 Aug 2017 00:41:31 +0200
Subject: [PATCH 2875/3246] phpfpm service: allow netlink sockets for sendmail

Fixes #26611.
---
 nixos/modules/services/web-servers/phpfpm/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index f9febbfbacd..e1f4ff5db7f 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -150,7 +150,8 @@ in {
           PrivateDevices = true;
           ProtectSystem = "full";
           ProtectHome = true;
-          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
+          # XXX: We need AF_NETLINK to make the sendmail SUID binary from postfix work
+          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
           Type = "notify";
           ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";
           ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";

From 4adee2534a6b4ec48a72ff31bb6c2c87c3cd75e1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 19:19:42 -0400
Subject: [PATCH 2876/3246] rustRegistry: 2017-08-24 -> 2017-08-27

---
 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 f49b1e444e5..2bc4ea96705 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,13 +7,13 @@
 { stdenv, fetchFromGitHub, git }:
 
 stdenv.mkDerivation {
-  name = "rustRegistry-2017-08-24";
+  name = "rustRegistry-2017-08-27";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "crates.io-index";
-    rev = "53fd44d796ca10ec0a5a9b657d8c7f8964695a49";
-    sha256 = "1ppg3q001ypdh6w0ymhkcilr5gyr2pnrha9vdixa0gzgw06k7k0s";
+    rev = "2f344732d240aaa8b5090f0c280ea05382a1c8cb";
+    sha256 = "19h8znbmq2skcrzmc0rcn1c6m3qqb58v8qfh8svkvmihhzpkmhmv";
   };
   phases = [ "unpackPhase" "installPhase" ];
   installPhase = ''

From b1749aecbed77674fa6268b730669e0611d98728 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 29 Aug 2017 02:37:38 +0300
Subject: [PATCH 2877/3246] raspberrypifw: 1.20170515 -> 1.20170515n

---
 pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 123a7d9395d..bb714f60c2d 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20170515";
+  version = "1.20170811";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "0liy0p69p9yr5cqgrfc23d3n243xkrx889gc8yqd9m2jpns4s361";
+    sha256 = "1lrbbslpwjgvrn7hk3l104gkl07qxh7qd4cdyqccqhqzip9wqhkn";
   };
 
   dontStrip = true;    # Stripping breaks some of the binaries

From ff3f6f38c4735a921c71412ec55068fdd89addbf Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 29 Aug 2017 02:37:52 +0300
Subject: [PATCH 2878/3246] linux_rpi: 1.20170515 -> 1.20170811

---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index f1fabad24fb..4985e40f51d 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  modDirVersion = "4.9.28";
-  tag = "1.20170515";
+  modDirVersion = "4.9.41";
+  tag = "1.20170811";
 in
 stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
   version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
     owner = "raspberrypi";
     repo = "linux";
     rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "19cjvns6zs53l319k3a2angffr93dh2j9g0022ww6rmi6niq4fkf";
+    sha256 = "1ly0x7a43zvig0fv7lc6rpq49pcdb7i9sdb78p4gi5485zap40kb";
   };
 
   features.iwlwifi = true;

From 774e93858964a033949162e5d8faddea31f70f0e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 13:22:16 -0400
Subject: [PATCH 2879/3246] alacritty: 2017-07-25 -> 2017-08-28

---
 pkgs/applications/misc/alacritty/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 50af18ca1fc..cc21703082a 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -29,16 +29,16 @@ let
 in
 
 buildRustPackage rec {
-  name = "alacritty-unstable-2017-07-25";
+  name = "alacritty-unstable-2017-08-28";
 
   src = fetchFromGitHub {
     owner = "jwilm";
     repo = "alacritty";
-    rev = "49c73f6d55e5a681a0e0f836cd3e9fe6af30788f";
-    sha256 = "0h5hrb2g0fpc6xn94hmvxjj21cqbj4vgqkznvd64jl84qbyh1xjl";
+    rev = "c4ece6dde3c9dcf825a44aa775535a65c0c376a6";
+    sha256 = "1n1ncz45h0zgprsm2wkj11i9wwpg3kba4wv5mcs1xx793aq16x82";
   };
 
-  depsSha256 = "1pbb0swgpsbd6x3avxz6fv3q31dg801li47jibz721a4n9c0rssx";
+  depsSha256 = "19lrj4i6vzmf22r6xg99zcwvzjpiar8pqin1m2nvv78xzxx5yvgb";
 
   buildInputs = [
     cmake

From 56beae4db6c00b493c1dcdabd7a63721bb852e77 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 20:12:17 -0400
Subject: [PATCH 2880/3246] ply: Allow building for git-fetched kernels

---
 pkgs/os-specific/linux/ply/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index a9c84516ef8..8ae73189276 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -16,9 +16,17 @@ in stdenv.mkDerivation {
   };
 
   preAutoreconf = ''
-    # ply wants to install header fails to its build directory
-    # use 7z to handle multiple archive formats transparently
-    7z x ${kernel.src} -so | 7z x -aoa -si -ttar
+    # If kernel sources are a folder (i.e. fetched from git), we just copy them in
+    # Since they are owned by uid 0 and read-only, we need to fix permissions
+    if [ -d ${kernel.src} ]; then
+      cp -r ${kernel.src} linux-${kernel.version}
+      chown -R $(whoami): linux-${kernel.version}
+      chmod -R a+w linux-${kernel.version}
+    else
+      # ply wants to install header files to its build directory
+      # use 7z to handle multiple archive formats transparently
+      7z x ${kernel.src} -so | 7z x -aoa -si -ttar
+    fi
 
     configureFlagsArray+=(--with-kerneldir=$(echo $(pwd)/linux-*))
     ./autogen.sh --prefix=$out

From 52b56bf02dbc9c83958c161e68e5301a1b113cd6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 20:22:00 -0400
Subject: [PATCH 2881/3246] containerd: 0.2.5 -> 0.2.9

---
 pkgs/applications/virtualization/containerd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index b918177f543..3316633e437 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.5";
+  version = "0.2.9";
 
   src = fetchFromGitHub {
-    owner = "docker";
+    owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "16p8kixhzdx8afpciyf3fjx43xa3qrqpx06r5aqxdrqviw851zh8";
+    sha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552";
   };
 
   buildInputs = [ removeReferencesTo go ];

From ecea06ab2e771808817dd7e0d2287b3ad0709de2 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 28 Aug 2017 18:02:05 -0700
Subject: [PATCH 2882/3246] wine-mono: 4.7.0 -> 4.7.1

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 0d0f9f21bf2..d37cc93dfcd 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -24,9 +24,9 @@ in rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "4.7.0";
+      version = "4.7.1";
       url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
-      sha256 = "18d5djnsb70740xs475jg1xsjsrq6zzjv0dmjq3vi7nbv56lg63n";
+      sha256 = "1ai9qsrgiwd371pyqr3mjaddaczly5d1z68r4lxl3hrkz2vmv39c";
     };
   };
 

From ea23f8bb079ef11c2d11859994d804c4e4940be5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 20 Aug 2017 13:20:45 +0200
Subject: [PATCH 2883/3246] cups service: Automatically detect Gutenprint in
 drivers

Additional CUPS drivers can be added via "services.printing.drivers" but
Gutenprint was an exception. It was possible to add a Gutenprint
derivation to that list and it would work at first but unlike the other
drivers Gutenprint requires a script to be run after each update or any
attempt to print something would simply fail and an error would show up
in the jobs queue (http://localhost:631/jobs/):
"The PPD version (5.2.11) is not compatible with Gutenprint 5.2.13.
Please run
`/nix/store/7762kpyhfkcgmr3q81v1bbyy0bjhym80-gutenprint-5.2.13/sbin/cups-genppdupdate'
as administrator."
This is due to state in "/var/lib/cups/ppd" and one would need to run
"/nix/store/.../bin/cups-genppdupdate -p /var/lib/cups/ppd" manually.
The alternative was to enable the following option:
"services.printing.gutenprint" but this had two disadvantages:
1) It is an exception that one could be unaware of or that could
potentially cause some confusion.
2) One couldn't use a customized Gutenprint derivation in
"services.printing.drivers" but would instead have to overwrite
"pkgs.gutenprint".

This new approach simply detects a Gutenprint derivation in
"services.printing.gutenprint" by checking if the meta set of a
derivation contains "isGutenprint = true". Therefore no special
exception for Gutenprint would be required and it could easily be
applied to other drivers if they would require such a script to be run.
---
 nixos/modules/rename.nix                  |  6 ++++-
 nixos/modules/services/printing/cupsd.nix | 32 ++++++++++-------------
 pkgs/misc/drivers/gutenprint/default.nix  |  1 +
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 800e12956f2..6b33eeb6e4e 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
@@ -14,6 +14,10 @@ with lib;
     (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
 
     (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
+    (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]
+      (config:
+        let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
+        in if enabled then [ pkgs.gutenprint ] else [ ]))
     (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 855c8930384..4c7f58d1d8b 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  inherit (pkgs) cups cups-pk-helper cups-filters gutenprint;
+  inherit (pkgs) cups cups-pk-helper cups-filters;
 
   cfg = config.services.printing;
 
@@ -35,7 +35,6 @@ let
     name = "cups-progs";
     paths =
       [ cups.out additionalBackends cups-filters pkgs.ghostscript ]
-      ++ optional cfg.gutenprint gutenprint
       ++ cfg.drivers;
     pathsToLink = [ "/lib" "/share/cups" "/bin" ];
     postBuild = cfg.bindirCmds;
@@ -97,12 +96,15 @@ let
       (writeConf "client.conf" cfg.clientConf)
       (writeConf "snmp.conf" cfg.snmpConf)
     ] ++ optional avahiEnabled browsedFile
-      ++ optional cfg.gutenprint gutenprint
       ++ cfg.drivers;
     pathsToLink = [ "/etc/cups" ];
     ignoreCollisions = true;
   };
 
+  filterGutenprint = pkgs: filter (pkg: pkg.meta.isGutenprint or false == true) pkgs;
+  containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;
+  getGutenprint = pkgs: head (filterGutenprint pkgs);
+
 in
 
 {
@@ -224,23 +226,17 @@ in
         '';
       };
 
-      gutenprint = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable Gutenprint drivers for CUPS. This includes auto-updating
-          Gutenprint PPD files.
-        '';
-      };
-
       drivers = mkOption {
         type = types.listOf types.path;
         default = [];
-        example = literalExample "[ pkgs.splix ]";
+        example = literalExample "[ pkgs.gutenprint pkgs.hplip pkgs.splix ]";
         description = ''
-          CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript
-          and Samba are added unconditionally. For adding Gutenprint, see
-          <literal>gutenprint</literal>.
+          CUPS drivers to use. Drivers provided by CUPS, cups-filters,
+          Ghostscript and Samba are added unconditionally. If this list contains
+          Gutenprint (i.e. a derivation with
+          <literal>meta.isGutenprint = true</literal>) the PPD files in
+          <filename>/var/lib/cups/ppd</filename> will be updated automatically
+          to avoid errors due to incompatible versions.
         '';
       };
 
@@ -318,9 +314,9 @@ in
             [ ! -e /var/lib/cups/path ] && \
               ln -s ${bindir} /var/lib/cups/path
 
-            ${optionalString cfg.gutenprint ''
+            ${optionalString (containsGutenprint cfg.drivers) ''
               if [ -d /var/lib/cups/ppd ]; then
-                ${gutenprint}/bin/cups-genppdupdate -p /var/lib/cups/ppd
+                ${getGutenprint cfg.drivers}/bin/cups-genppdupdate -p /var/lib/cups/ppd
               fi
             ''}
           '';
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 0bd40721c4e..7917d1e3616 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -47,5 +47,6 @@ stdenv.mkDerivation rec {
     homepage = https://sourceforge.net/projects/gimp-print/;
     license = licenses.gpl2;
     platforms = platforms.linux;
+    isGutenprint = true;
   };
 }

From d25134b196ea6dba3c55da33fac48fad18184747 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 28 Aug 2017 22:11:44 -0400
Subject: [PATCH 2884/3246] pythonPackages.tiros: init at 1.0.38

---
 .../python-modules/tiros/default.nix          | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/tiros/default.nix

diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix
new file mode 100644
index 00000000000..ab7de4bfa77
--- /dev/null
+++ b/pkgs/development/python-modules/tiros/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, semantic-version
+, boto3
+, flask
+, docutils
+}:
+
+buildPythonPackage rec {
+  pname = "tiros";
+  name = "${pname}-${version}";
+  version = "1.0.38";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0k668z9gb5vh304gysynj4rxgi24wy2vl4a33dnwkri2g6db3s4n";
+  };
+
+  patchPhase = ''
+    sed -E -i "s/'([[:alnum:].-_]+)[=><]{2}[[:digit:].]*'/'\\1'/g" setup.py
+    sed -i "s/'datetime',//" setup.py
+  '';
+
+  propagatedBuildInputs = [ semantic-version boto3 flask docutils ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03808ed0789..74d87420502 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23074,6 +23074,8 @@ in {
     };
   };
 
+  tiros = callPackage ../development/python-modules/tiros { };
+
   # Tkinter/tkinter is part of the Python standard library.
   # The Python interpreters in Nixpkgs come without tkinter by default.
   # To make the module available, we make it available as any other

From 18df335c17d63a45651c5fef52f2cf4e080a9709 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Tue, 29 Aug 2017 00:05:55 -0300
Subject: [PATCH 2885/3246] Mednafen-server: change download location

And some minor modifications
---
 pkgs/misc/emulators/mednafen/server.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index 3854caf2242..91a74171da9 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -2,22 +2,22 @@
 
 stdenv.mkDerivation rec {
 
-  name = "mednafen-server-${meta.version}";
+  name = "mednafen-server-${version}";
+  version = "0.5.2";
 
   src = fetchurl {
-    url = "http://mednafen.fobby.net/releases/files/${name}.tar.gz";
-    sha256="06fal6hwrb8gw94yp7plhcz55109128cgp35m7zs5vvjf1zfhcs9";
+    url = "https://mednafen.github.io/releases/files/mednafen-server-0.5.2.tar.xz";
+    sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq";
   };
 
   postInstall = ''
-    mkdir -p $out/share/$name 
+    mkdir -p $out/share/$name
     install -m 644 -t $out/share/$name standard.conf
   '';
 
   meta = with stdenv.lib; {
-    version = "0.5.2";
     description = "Netplay server for Mednafen";
-    homepage = http://mednafen.sourceforge.net/;
+    homepage = http://mednafen.github.io/;
     license = licenses.gpl2;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.linux;

From 026bc4f78365fc92c6571d90851c6a123c1d6f5d Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Tue, 29 Aug 2017 00:10:20 -0300
Subject: [PATCH 2886/3246] Mednafen: 0.9.38.7 -> 0.9.47

And some minor changes
---
 pkgs/misc/emulators/mednafen/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index 148c8380d8c..a03695eed77 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -4,18 +4,20 @@
 , SDL, SDL_net, zlib
 }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "mednafen-${meta.version}";
+  name = "mednafen-${version}";
+  version = "0.9.47";
 
   src = fetchurl {
-    url = "http://mednafen.fobby.net/releases/files/${name}.tar.bz2";
-    sha256 = "1n6y7b86sv11vd6rv8if3wr4qyihkjai9km1s4smqcisi3pvxcqv";
+    url = "https://mednafen.github.io/releases/files/${name}.tar.xz";
+    sha256 = "0flz6bjkzs9qrw923s4cpqrz4b2dhc2w7pd8mgw0l1xbmrh7w4si";
   };
 
-  buildInputs = with stdenv.lib;
-  [ pkgconfig libX11 mesa freeglut libjack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ];
-  
+  buildInputs =
+  [ pkgconfig libX11 mesa freeglut libjack2 libcdio
+    libsndfile libsamplerate SDL SDL_net zlib ];
 
   # Install docs
   postInstall = ''
@@ -25,9 +27,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    version = "0.9.38.7";
     description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
-    homepage = http://mednafen.sourceforge.net/;
+    homepage = http://mednafen.github.io/;
     license = licenses.gpl2;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.linux;

From 96ef0dc776ba187bf525efc36a1908afb4bd40fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 06:47:17 +0100
Subject: [PATCH 2887/3246] python.pkgs.mozlog: disable for python3

not yet compatible according to upstream
---
 .../development/python-modules/marionette-harness/mozlog.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
index 7382425f240..5960848ff63 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy3k
 , blessings
 , mozfile
 }:
@@ -11,12 +12,14 @@ buildPythonPackage rec {
   version = "3.4";
   name = "${pname}-${version}";
 
+  disabled = isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "1m4d9i1kzcmkhipfd5czv05f2s84j1byx3cv4y2irjmwq5v6cyiq";
   };
 
-  propagatedBuildInputs = [ blessings mozfile ]; 
+  propagatedBuildInputs = [ blessings mozfile ];
 
   meta = {
     description = "Mozilla logging library";

From b57deb82421b8353a662c0ce55b38de882649dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 07:31:45 +0100
Subject: [PATCH 2888/3246] python.pkgs.zetup: init at 0.2.34

(needed as dependency for moretools)
---
 .../python-modules/zetup/default.nix          | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/zetup/default.nix

diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix
new file mode 100644
index 00000000000..66a4718fe9e
--- /dev/null
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, setuptools_scm, pathpy, nbconvert
+, pytest }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "zetup";
+  version = "0.2.34";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0k4lm51b5qjy7yxy3n5z8vc5hlvjcsfsvwjgqzkr0pisysar1kpf";
+  };
+
+  checkPhase = ''
+    py.test test
+  '';
+
+  buildInputs = [ pytest pathpy nbconvert ];
+  propagatedBuildInputs = [ setuptools_scm ];
+
+  meta = with stdenv.lib; {
+    description = ''
+      Zimmermann's Extensible Tools for Unified Project setups
+    '';
+    homepage = https://github.com/zimmermanncode/zetup;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74d87420502..8eeeac3ead7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24556,6 +24556,8 @@ EOF
     };
   };
 
+  zetup = callPackage ../development/python-modules/zetup { };
+
   zope_broken = buildPythonPackage rec {
     name = "zope.broken-3.6.0";
 

From b65e2e6cb156fbd73653d023bbe474e75a58bafd Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Mon, 28 Aug 2017 23:30:38 -0800
Subject: [PATCH 2889/3246] redshift-plasma-applet: add kwindowsystem to
 buildInputs

---
 pkgs/applications/misc/redshift-plasma-applet/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 18e49176edc..03b8d709fce 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, extra-cmake-modules, plasma-framework, redshift, fetchFromGitHub, }:
+{ stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, redshift, fetchFromGitHub, }:
 
 let version = "1.0.18"; in
 
@@ -29,7 +29,10 @@ stdenv.mkDerivation {
     extra-cmake-modules
   ];
 
-  buildInputs = [ plasma-framework ];
+  buildInputs = [
+    plasma-framework
+    kwindowsystem
+  ];
 
   meta = with stdenv.lib; {
     description = "KDE Plasma 5 widget for controlling Redshift";

From 6e0f61486a80997fd420ede749ebaf6313e78f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Aug 2017 09:48:13 +0200
Subject: [PATCH 2890/3246] e17gtk: unbreak evaluation after gnome update

---
 pkgs/misc/themes/e17gtk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix
index 461c2a98c94..cdf2d958fe4 100644
--- a/pkgs/misc/themes/e17gtk/default.nix
+++ b/pkgs/misc/themes/e17gtk/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchFromGitHub, gnome3 }:
-
+let
+  gnome3 = { version = "3.22"; }; # FIXME
+in
 stdenv.mkDerivation rec {
   name = "e17gtk-${version}";
   version = "${gnome3.version}.1";

From 2356161256e9e1fa4634333a4f9c5905e034991f Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Tue, 29 Aug 2017 15:51:06 +0800
Subject: [PATCH 2891/3246] litecoin: 0.13.2.1 -> 0.14.2

---
 pkgs/applications/altcoins/litecoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index 9b19d2f2996..ac42caa8099 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.13.2.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "litecoin-project";
     repo = "litecoin";
     rev = "v${version}";
-    sha256 = "0hml1crml6rx7im8dfbig3znmvnk2di61ybbhrhpad5mj0yrih30";
+    sha256 = "1smadd5d2mpz2v3pyk7wqm60vdp81zqr4m3z4wfvnlz62m1m800y";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 6670ee9ee69e8a9e299f64f018fef8fd0246b007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 09:14:53 +0100
Subject: [PATCH 2892/3246] python.pkgs.ldap: fix build

---
 pkgs/development/python-modules/ldap.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index 34a179f501b..c67fdcd548f 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -1,5 +1,5 @@
 { lib, writeText, buildPythonPackage, isPy3k, fetchPypi
-, openldap, cyrus_sasl, openssl }:
+, openldap, cyrus_sasl, openssl, pytest }:
 
 buildPythonPackage rec {
   pname = "python-ldap";
@@ -12,12 +12,19 @@ buildPythonPackage rec {
     sha256 = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0";
   };
 
-  # Needed by tests to setup a mockup ldap server.
-  preCheck = ''
+  buildInputs = [ pytest ];
+
+  checkPhase = ''
+    # Needed by tests to setup a mockup ldap server.
     export BIN="${openldap}/bin"
     export SBIN="${openldap}/bin"
     export SLAPD="${openldap}/libexec/slapd"
     export SCHEMA="${openldap}/etc/schema"
+
+    # AssertionError: expected errno=107, got 57 -> nix sandbox related ?
+    py.test -k 'not TestLdapCExtension and \
+                not Test01_SimpleLDAPObject and \
+                not Test02_ReconnectLDAPObject' Tests/*.py
   '';
 
   patches = lib.singleton (writeText "avoid-syslog.diff" ''

From df0ec10c51cee086c22ac7c01f2e79e351c94335 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 29 Aug 2017 10:29:57 +0200
Subject: [PATCH 2893/3246] libqalculate: 1.0.0a -> 2.0.0

---
 .../libraries/libqalculate/default.nix        | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 2e748d26689..f16f51105d4 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -1,19 +1,31 @@
-{ stdenv, fetchurl, cln, libxml2, glib, intltool, pkgconfig, doxygen, autoreconfHook, readline }:
+{ stdenv, fetchurl, mpfr, libxml2, intltool, pkgconfig, doxygen,
+  autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }:
 
 stdenv.mkDerivation rec {
   name = "libqalculate-${version}";
-  version = "1.0.0a";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";
-    sha256 = "12igmd1rn6zwrsg0mmn5pwy2bqj2gmc08iry0vcdxgzi7jc9x7ix";
+    sha256 = "1ziw48djccsgfcjd1h3834sihr89pyb3mna096cpm47bc71saqvh";
   };
 
   outputs = [ "out" "dev" "doc" ];
 
   nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ];
-  buildInputs = [ readline ];
-  propagatedBuildInputs = [ cln libxml2 glib ];
+  buildInputs = [ curl gettext libiconv readline ];
+  propagatedBuildInputs = [ libxml2 mpfr icu ];
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    intltoolize -f
+  '';
+
+  patchPhase = ''
+    substituteInPlace libqalculate/Calculator.cc \
+      --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
+      --replace '"gnuplot -"' '"${gnuplot}/bin/gnuplot -"'
+  '';
 
   preBuild = ''
     pushd docs/reference

From 393f1f53bef9540bdd9b07c6643d50cf0b82e07a Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 29 Aug 2017 10:30:10 +0200
Subject: [PATCH 2894/3246] qalculate-gtk: 1.0.0 -> 2.0.0a

---
 pkgs/applications/science/math/qalculate-gtk/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index cd89fbbe187..6b5cb452f59 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,23 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "qalculate-gtk-${version}";
-  version = "1.0.0";
+  version = "2.0.0a";
 
   src = fetchurl {
     url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";
-    sha256 = "08sg6kfcfdpxjsl538ba26ncm2cxzc63nlafj99ff4b46wxia57k";
+    sha256 = "0bif79wl2hi0sf4pk2b4s2xz33lj7401pygsdmxrnr5gqqq0s696";
   };
 
   patchPhase = ''
-    for fn in src/interface.cc src/main.cc; do
-      substituteInPlace $fn --replace 'getPackageDataDir().c_str()' \"$out/share\"
-    done
+    substituteInPlace src/main.cc --replace 'getPackageDataDir().c_str()' \"$out/share\"
   '';
 
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ];
   buildInputs = [ libqalculate gtk3 ];
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "The ultimate desktop calculator";

From c387c54b3c322b0c2a819b5f88713af6de0aca57 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 29 Aug 2017 10:37:42 +0200
Subject: [PATCH 2895/3246] ibus-engines.anthy: 1.5.8 -> 1.5.9

---
 pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 5d130d7ad80..f93edffa7bd 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-anthy-${version}";
-  version = "1.5.8";
+  version = "1.5.9";
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1aj7vnfky7izl23xyjky78z3qas3q72l3kr8dnql2lnivsrb8q1y";
+    sha256 = "1y8sf837rmp662bv6zakny0xcm7c9c5qda7f9kq9riv9ywpcbw6x";
   };
 }

From 92523344d113601718722cc3e2356bf9ae1ba9b7 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 29 Aug 2017 10:40:14 +0200
Subject: [PATCH 2896/3246] tokei: 6.0.0 -> 6.0.1

---
 pkgs/development/tools/misc/tokei/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 057c01a1885..f47fab71b83 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tokei-${version}";
-  version = "6.0.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "Aaronepower";
     repo = "tokei";
     rev = "v${version}";
-    sha256 = "1j8k2i25c989mf15jwy4a4vazjc7x7pm8zywycg8xvv4ik1im7m7";
+    sha256 = "1v9h45vspsqsy86fm78bc2g5byqa4cd9b9fbmv7imi87yjbm8i7x";
   };
 
-  depsSha256 = "184x6lwma3lawr2dcc7ivkp1j049af9w040dyzca6i56i2s9998p";
+  depsSha256 = "0jqzk5qlrc7pm3s7jf8130vgnrcd54izw3mx84m9b5lhf3rz98hm";
 
   installPhase = ''
     mkdir -p $out/bin

From 15bac19cd2189815d718f62efbd83e466766ebef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Aug 2017 11:04:59 +0200
Subject: [PATCH 2897/3246] libbass: evaluation nitpicks

- specify meta.platforms to avoid trying to evaluate when it shouldn't
- use `throw` instead of `abort`, as that's the convention for similar cases
---
 pkgs/development/libraries/audio/libbass/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index dedfa5ceb35..4c2918c922d 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -42,7 +42,7 @@ let
     installPhase =
       let so =
             if bass.so ? ${stdenv.system} then bass.so.${stdenv.system}
-            else abort "${name} not packaged for ${stdenv.system} (yet).";
+            else throw "${name} not packaged for ${stdenv.system} (yet).";
       in ''
         mkdir -p $out/{lib,include}
         install -m644 -t $out/lib/ ${so}
@@ -53,6 +53,7 @@ let
       description = "Shareware audio library";
       homepage = https://www.un4seen.com/;
       license = licenses.unfreeRedistributable;
+      platforms = builtins.attrNames bass.so;
     };
   };
 

From bbd2a0323bf514ba47b6dc6ead29bac21771f8f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 07:32:42 +0100
Subject: [PATCH 2898/3246] python.pkgs.moretools: 0.1a41 -> 0.1.8

Progress on: #28643
---
 .../python-modules/moretools/default.nix      | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +-----------
 2 files changed, 31 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/moretools/default.nix

diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix
new file mode 100644
index 00000000000..83fa05d4b1c
--- /dev/null
+++ b/pkgs/development/python-modules/moretools/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, six, pathpy, zetup, pytest
+, decorator }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "moretools";
+  version = "0.1.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03ni7k0kcgrm3y605c29gqlyp779fx1xc3r8xb742lzd6ni30kdg";
+  };
+
+  checkPhase = ''
+    py.test test
+  '';
+
+  buildInputs = [ six pathpy pytest ];
+  propagatedBuildInputs = [ decorator zetup ];
+
+  meta = with stdenv.lib; {
+    description = ''
+      Many more basic tools for python 2/3 extending itertools, functools, operator and collections
+    '';
+    homepage = https://bitbucket.org/userzimmermann/python-moretools;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8eeeac3ead7..15052c708e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12976,24 +12976,7 @@ in {
     };
   });
 
-  moretools = buildPythonPackage rec {
-    name = "moretools-0.1a41";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/moretools/${name}.tar.gz";
-      sha256 = "1n442wprbl3cmg08233m1sr3g4z0i8hv9g6bhch7kzdmbl21399f";
-    };
-
-    buildInputs = with self; [ six pathpy setuptools ];
-    propagatedBuildInputs = with self; [ decorator ];
-
-    meta = {
-      description = "Many more basic tools for python 2/3 extending itertools, functools, operator and collections";
-      homepage = https://bitbucket.org/userzimmermann/python-moretools;
-      license = licenses.gpl3Plus;
-      platforms = platforms.linux;
-    };
-  };
+  moretools = callPackage ../development/python-modules/moretools { };
 
   moto = buildPythonPackage rec {
     version = "0.4.25";

From 51c713c538fbe055ea10a7cef321541ef506f9f6 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Tue, 29 Aug 2017 05:58:10 -0400
Subject: [PATCH 2899/3246] loccount: 1.0 -> 1.1

---
 pkgs/development/tools/misc/loccount/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
index d0458c30467..ad4e5d112d1 100644
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, buildGoPackage, fetchFromGitLab }:
 buildGoPackage rec {
   name = "loccount-${version}";
-  version = "1.0";
+  version = "1.1";
 
   goPackagePath = "gitlab.com/esr/loccount";
   excludedPackages = "tests";
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "esr";
     repo = "loccount";
     rev = version;
-    sha256 = "081wf7fckn76m4x0jwq4h2fsbhpb6f67dha77ni3p6wg7q6sihqx";
+    sha256 = "1wx31hraxics8x8w42jy5b10wdx1368zp2p6gplcfmpjssf9pacr";
   };
 
   meta = with stdenv.lib; {

From 75f86ae83114e37229cf9cd84118f811ff4f1115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 29 Aug 2017 12:30:10 +0200
Subject: [PATCH 2900/3246] Openshot: 2.3.1 -> 2.3.4

---
 pkgs/applications/video/openshot-qt/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index f67ab412c26..86b8dab7f1f 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -4,20 +4,20 @@
 
 python3Packages.buildPythonApplication rec {
   name = "openshot-qt-${version}";
-  version = "2.3.1";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "openshot-qt";
     rev = "v${version}";
-    sha256 = "10j3p10q66m9nhzcd8315q1yiqscidkjbm474mllw7c281vacvzw";
+    sha256 = "026zxvg5mij49g021hipv3hspsx8m5bs4v9pm2axqw6rvszjk90z";
   };
 
   nativeBuildInputs = [ doxygen wrapGAppsHook ];
 
   buildInputs = [ gtk3 ];
 
-  propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 sip httplib2 pyzmq ];
+  propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 requests sip httplib2 pyzmq ];
 
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fb97035794..33e14148c26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5747,7 +5747,7 @@ with pkgs;
   jre = jre8;
   jre_headless = jre8_headless;
 
-  openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
+  openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
 
   oraclejdk = pkgs.jdkdistro true false;
 

From f5f0d8389015fe93d376a0cfbd1c6344ea04b33e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 29 Aug 2017 12:30:47 +0200
Subject: [PATCH 2901/3246] libopenshot: 0.1.4 -> 0.1.7

Removes ruby to fix compilation errors.
---
 .../applications/video/openshot-qt/libopenshot.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index b45460c426c..02a19c935e7 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,34 +1,32 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
 , pkgconfig, cmake, doxygen
 , libopenshot-audio, imagemagick, ffmpeg
-, swig, python3, ruby
+, swig, python3
 , unittest-cpp, cppzmq, czmqpp
 , qtbase, qtmultimedia }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libopenshot-${version}";
-  version = "0.1.4";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "1mqci103kn4l7w8i9kqzi705kxn4q596vw0sh05r1w5nbyjwcyp6";
+    sha256 = "1dk40qild8d3s99p2kkm0mjvxfxrz2wns7ij1brzqmcdnaxqdhlp";
   };
 
   patchPhase = ''
     sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt
     sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt
-    sed -i 's/{RUBY_VENDOR_ARCH_DIR}/ENV{RUBY_VENDOR_ARCH_DIR}/g' src/bindings/ruby/CMakeLists.txt
     export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)
-    export RUBY_VENDOR_ARCH_DIR=$out/lib/ruby/site-packages
   '';
 
   nativeBuildInputs = [ pkgconfig cmake doxygen ];
 
   buildInputs =
-  [ imagemagick ffmpeg swig python3 ruby unittest-cpp
+  [ imagemagick ffmpeg swig python3 unittest-cpp
     cppzmq czmqpp qtbase qtmultimedia ];
 
   LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}";
@@ -36,6 +34,8 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
+  cmakeFlags = [ "-DENABLE_RUBY=OFF" ];
+
   meta = {
     homepage = http://openshot.org/;
     description = "Free, open-source video editor library";

From be40ed5a0bc0a32a9998af347fe9e5501aad250d Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Wed, 3 May 2017 02:49:09 -0400
Subject: [PATCH 2902/3246] fanficfare: 2.9.0 -> 2.16.0

---
 pkgs/tools/text/fanficfare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index 9e273d3c69b..37447d0fb2a 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python27Packages }:
 
 python27Packages.buildPythonApplication rec {
-  version = "2.9.0";
+  version = "2.16.0";
   name = "fanficfare-${version}";
   nameprefix = "";
 
   src = fetchurl {
     url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
-    sha256 = "781e9095d8152345a6106135e87c46eb306ff234b847de5073faca2f78544398";
+    sha256 = "0c31z7w4b3wz5nahsmnfhvp3srprfsqbp3zyngw4cqw3dm17kvvi";
   };
 
   propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];

From bebcef8892c624711a05749e4b2ce6d1e613b276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 29 Aug 2017 12:31:50 +0200
Subject: [PATCH 2903/3246] libopenshot-audio: 0.1.2 -> 0.1.4

---
 pkgs/applications/video/openshot-qt/libopenshot-audio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index 82c7f247189..6591af9d0d8 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libopenshot-audio-${version}";
-  version = "0.1.2";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot-audio";
     rev = "v${version}";
-    sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6";
+    sha256 = "07615vacbvi08pzm4lxfckfwib2xcfdjaggpda58hy8nr0677fzq";
   };
 
   nativeBuildInputs =

From 501278bbd4f275603ac20ee3a11e2ef6c4de2616 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 29 Aug 2017 12:42:00 +0200
Subject: [PATCH 2904/3246] nano: 2.8.6 -> 2.8.7

See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00010.html
for release announcement
---
 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 3cb53a6116b..441c157a349 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.8.6";
+  version = "2.8.7";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "0xjpm2ka56x5ycrgjh06v110na13xlbm42bs8qibk7g578m9cils";
+    sha256 = "0nhns59smd43mad2w6lnaxqnj4h6ifnlivi6cwydg646jm31gqzv";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From 5ad107de5d062d4ac8a3aa897a9773e5889b372e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 11:45:19 +0100
Subject: [PATCH 2905/3246] libcommuni: 2016-08-17 -> 3.5.0

---
 pkgs/development/libraries/libcommuni/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 2dc9c6577a4..6192266bd4a 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmake, which
+{ stdenv, fetchFromGitHub
+, qtbase, qtdeclarative, qmake, which
 }:
 
 stdenv.mkDerivation rec {
   name = "libcommuni-${version}";
-  version = "2016-08-17";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "communi";
     repo = "libcommuni";
-    rev = "dedba6faf57c31c8c70fd563ba12d75a9caee8a3";
-    sha256 = "0wvs53z34vfs5xlln4a6sbd4981svag89xm0f4k20mb1i052b20i";
+    rev = "v${version}";
+    sha256 = "15crqc7a4kwrfbxs121rpdysw0694hh7dr290gg7pm61akvnrqcm";
   };
 
   buildInputs = [ qtbase qtdeclarative ];
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Hack to avoid TMPDIR in RPATHs.
-  preFixup = ''rm -rf "$(pwd)" '';
+  preFixup = "rm -rf lib";
 
   meta = with stdenv.lib; {
     description = "A cross-platform IRC framework written with Qt";

From 0d35ce240db07cd7ba411120e27dfb2b5f2da50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 11:45:39 +0100
Subject: [PATCH 2906/3246] communi: 2016-08-17 -> 3.5.0

---
 pkgs/applications/networking/irc/communi/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 9bfdd8408da..25e5a61f272 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "communi-${version}";
-  version = "2016-08-19";
+  version = "3.5.0";
 
   src = fetchgit {
     url = "https://github.com/communi/communi-desktop.git";
-    rev = "d516b01b1382a805de65f21f3475e0a8e64a97b5";
-    sha256 = "1pn7mr7ch1ck5qv9zdn3ril40c9kk6l04475564rpzf11jly76an";
+    rev = "v${version}";
+    sha256 = "10grskhczh8601s90ikdsbjabgr9ypcp2j7vivjkl456rmg6xbji";
     fetchSubmodules = true;
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    patchelf --set-rpath "$out/lib:$(patchelf --print-rpath $out/bin/.communi-wrapped)" $out/bin/.communi-wrapped
+    rm -rf lib
   '';
 
   meta = with stdenv.lib; {

From 327766bb32813c28e579365acbab52a2ac453f5c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 25 Aug 2017 12:45:48 +0000
Subject: [PATCH 2907/3246] firefoxPackages: tor-browser: use gcc5

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index a0a1b304d6c..d4e62cc3b1c 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch }:
+{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
 
 let common = opts: callPackage (import ./common.nix opts); in
 
@@ -102,6 +102,7 @@ rec {
       platforms = lib.platforms.linux;
     };
   } {
+    stdenv = overrideCC stdenv gcc5;
     ffmpegSupport = false;
   };
 

From 25102567cfc1cfda1dd13875ed6d552cc85a2059 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Aug 2017 13:04:09 +0200
Subject: [PATCH 2908/3246] mini-httpd: update to version 1.7

---
 pkgs/servers/http/mini-httpd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index 75ec8514e35..99b13dab84d 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost }:
 
 stdenv.mkDerivation rec {
-  name = "mini-httpd-1.6";
+  name = "mini-httpd-1.7";
 
   src = fetchurl {
     url = "http://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz";
-    sha256 = "04azr1qa70l0fnpbx7nmyxz1lkykjjs2b6p4lhkpg86hs3lrmxly";
+    sha256 = "0jggmlaywjfbdljzv5hyiz49plnxh0har2bnc9dq4xmj1pmjgs49";
   };
 
   buildInputs = [ boost ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://mini-httpd.nongnu.org/;
-    description = "A minimalistic high-performance web server";
+    description = "minimalistic high-performance web server";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.peti ];

From 045c707e541ca04813603f3d30aa0f2bc8e37274 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Aug 2017 13:07:18 +0200
Subject: [PATCH 2909/3246] ikiwiki: mark build broken

The test suite fails after we updated to Imagemagick from version 6.9.7-6 to
6.9.8-4. https://ikiwiki.info/bugs/imagemagick_6.9.8_test_suite_failure/ has
more details.
---
 pkgs/applications/misc/ikiwiki/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index e27b9dc43eb..6e4fc206588 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -84,8 +84,8 @@ stdenv.mkDerivation {
     description = "Wiki compiler, storing pages and history in a RCS";
     homepage = http://ikiwiki.info/;
     license = stdenv.lib.licenses.gpl2Plus;
-
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.peti ];
+    broken = true; # https://ikiwiki.info/bugs/imagemagick_6.9.8_test_suite_failure/
   };
 }

From 358604aae2f1bae63667f4b811819d4f29de365b Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 18 Aug 2017 15:10:51 +0000
Subject: [PATCH 2910/3246] memtest86+: use debian patches, use default gcc

---
 pkgs/tools/misc/memtest86+/compile-fix.patch  | 20 ----
 pkgs/tools/misc/memtest86+/crash-fix.patch    | 99 -------------------
 pkgs/tools/misc/memtest86+/default.nix        | 24 ++++-
 .../misc/memtest86+/no-optimization.patch     | 11 ---
 pkgs/top-level/all-packages.nix               |  4 +-
 5 files changed, 23 insertions(+), 135 deletions(-)
 delete mode 100644 pkgs/tools/misc/memtest86+/compile-fix.patch
 delete mode 100644 pkgs/tools/misc/memtest86+/crash-fix.patch
 delete mode 100644 pkgs/tools/misc/memtest86+/no-optimization.patch

diff --git a/pkgs/tools/misc/memtest86+/compile-fix.patch b/pkgs/tools/misc/memtest86+/compile-fix.patch
deleted file mode 100644
index f178259f9e0..00000000000
--- a/pkgs/tools/misc/memtest86+/compile-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- memtest86+-5.01/io.h~	2013-08-10 02:01:58.000000000 +0000
-+++ memtest86+-5.01/io.h	2014-01-08 01:29:12.404465515 +0000
-@@ -31,7 +31,7 @@
-  */
- 
- #define __OUT1(s,x) \
--extern inline void __out##s(unsigned x value, unsigned short port) {
-+static inline void __out##s(unsigned x value, unsigned short port) {
- 
- #define __OUT2(s,s1,s2) \
- __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
-@@ -43,7 +43,7 @@
- __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
- 
- #define __IN1(s) \
--extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
-+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
- 
- #define __IN2(s,s1,s2) \
- __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
diff --git a/pkgs/tools/misc/memtest86+/crash-fix.patch b/pkgs/tools/misc/memtest86+/crash-fix.patch
deleted file mode 100644
index de7c86bac35..00000000000
--- a/pkgs/tools/misc/memtest86+/crash-fix.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/controller.c b/controller.c
-index f4f7371..183e9c3 100644
---- a/controller.c
-+++ b/controller.c
-@@ -2,6 +2,8 @@
-  * MemTest86+ V5 Specific code (GPL V2.0)
-  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
-  * http://www.canardpc.com - http://www.memtest.org
-+ *
-+ * Edited by David McInnis Oct 4, 2014
-  */
- 
- //#include "defs.h"
-@@ -292,7 +294,7 @@ static void setup_nhm(void)
- 
- 	/* First, locate the PCI bus where the MCH is located */
- 
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -327,7 +329,7 @@ static void setup_nhm32(void)
- 	ctrl.mode = ECC_NONE;
- 
- 	/* First, locate the PCI bus where the MCH is located */
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) {
- 	unsigned long dramchr;
- 	float clockratio;
- 	double dramclock;
--	unsigned int dummy[3];
-+	unsigned int dummy[4];
- 	int ram_type;
- 
- 	float coef = 10;
-@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) {
- 
- static void poll_timings_i875(void) {
- 
--	ulong dev6, dev62;
-+	ulong dev6;
- 	ulong temp;
- 	float cas;
- 	int rcd, rp, ras, chan;
- 	long *ptr, *ptr2;
- 
--	pci_conf_read( 0, 6, 0, 0x40, 4, &dev62);
-+	pci_conf_read( 0, 6, 0, 0x40, 4, &dev6);
- 	ptr2=(long*)(dev6+0x68);
- 
- 	/* Read the MMR Base Address & Define the pointer */
-diff --git a/init.c b/init.c
-index 754b8d7..5bd8b4f 100644
---- a/init.c
-+++ b/init.c
-@@ -7,6 +7,8 @@
-  *
-  * Released under version 2 of the Gnu Public License.
-  * By Chris Brady
-+ *
-+ * Edited by David McInnis October 4, 2014
-  */
-  
- 
-@@ -914,7 +916,6 @@ void cpu_type(void)
- 			default:
- 				cprint(0, COL_MID, "Unknown Intel");
-  				break;
--			break;
- 		    }
- 
- 		}
-diff --git a/main.c b/main.c
-index 0bc7ca0..613f811 100644
---- a/main.c
-+++ b/main.c
-@@ -422,7 +422,7 @@ void test_start(void)
- 		//initialise_cpus();
- 		btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0);
- 		/* Draw the screen and get system information */
--	  init();
-+		init();
- 
- 		/* Set defaults and initialize variables */
- 		set_defaults();
-@@ -737,7 +737,7 @@ void test_start(void)
- 			    /* Do the same test for each CPU */
- 			    if (++cpu_sel >= act_cpus) 
- 			    	{
--	            cpu_sel = 0;
-+				cpu_sel = 0;
- 			        next_test();
- 			    	} else {
- 			        continue;
diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix
index 5b4044f1891..0a02f8fb4f7 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/pkgs/tools/misc/memtest86+/default.nix
@@ -8,8 +8,28 @@ stdenv.mkDerivation rec {
     sha256 = "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l";
   };
 
-  # Patch incompatiblity with GCC. Source: http://koji.fedoraproject.org/koji/buildinfo?buildID=586907
-  patches = [ ./compile-fix.patch ./crash-fix.patch ./no-optimization.patch ];
+  patches = [
+    (fetchurl {
+      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/doc-serialconsole";
+      sha256 = "1qh2byj9bmpchym8iq20n4hqmy10nrl6bi0d9pgdqikkmw9m38jq";
+    })
+    (fetchurl {
+      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/multiboot";
+      sha256 = "0nq61307ah5b41ff5nqs99wjzjzlajvfv6k9c9d0gqvhx8r4dvmy";
+    })
+    (fetchurl {
+      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-O0.patch";
+      sha256 = "1xmj3anq1fr0cxwv8lqfp5cr5f58v7glwc6z0v8hx8aib8yj1wl2";
+    })
+    (fetchurl {
+      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-array-size.patch";
+      sha256 = "0yxlzpfs6313s91y984p7rlf5rgybcjhg7i9zqy4wqhm3j90f1kb";
+    })
+    (fetchurl {
+      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/gcc-5";
+      sha256 = "13xfy6sn8qbj1hx4vms2cz24dsa3bl8n2iblz185hkn11y7141sc";
+    })
+  ];
 
   preBuild = ''
     # Really dirty hack to get Memtest to build without needing a Glibc
diff --git a/pkgs/tools/misc/memtest86+/no-optimization.patch b/pkgs/tools/misc/memtest86+/no-optimization.patch
deleted file mode 100644
index 76815a93170..00000000000
--- a/pkgs/tools/misc/memtest86+/no-optimization.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- memtest86+-5.01/Makefile~	2014-01-08 01:30:11.355900076 +0000
-+++ memtest86+-5.01/Makefile	2014-01-08 01:31:19.387555469 +0000
-@@ -12,7 +12,7 @@
- AS=as -32
- CC=gcc
- 
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- 	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 663258dec39..5af704bfa43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3146,9 +3146,7 @@ with pkgs;
 
   memtest86 = callPackage ../tools/misc/memtest86 { };
 
-  memtest86plus = callPackage ../tools/misc/memtest86+ {
-    stdenv = overrideCC stdenv gcc5;
-  };
+  memtest86plus = callPackage ../tools/misc/memtest86+ { };
 
   meo = callPackage ../tools/security/meo {
     boost = boost155;

From 13360f066cbbaf144397ac436d63c62712e8ae97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 12:10:59 +0100
Subject: [PATCH 2911/3246] gdbGuile: guile bindings are broken for quite some
 time

---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73533e248f5..b180ad5dd64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7404,8 +7404,6 @@ with pkgs;
     inherit (gnu) mig;
   };
 
-  gdbGuile = lowPrio (gdb.override { inherit guile; });
-
   gdb-multitarget = lowPrio (gdb.override { multitarget = true; });
 
   valgrind = callPackage ../development/tools/analysis/valgrind {

From f99ddebd506073fc8b3e3ab01e49e40cb0d1875d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Aug 2017 13:11:47 +0200
Subject: [PATCH 2912/3246] ledger-2.6.3: mark build broken

---
 pkgs/applications/office/ledger/2.6.3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix
index 119fb6bb075..6fb8f6ca903 100644
--- a/pkgs/applications/office/ledger/2.6.3.nix
+++ b/pkgs/applications/office/ledger/2.6.3.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    broken = true; # https://hydra.nixos.org/build/59124559/nixlog/1
   };
 }

From 2f73fd3eea61a562c0b420ee1c1796dd288307dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Aug 2017 13:12:29 +0200
Subject: [PATCH 2913/3246] ledger-3.1.1: mark build broken

---
 pkgs/applications/office/ledger/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index a459909764e..a761b9fd5b9 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ peti the-kenny jwiegley ];
+    maintainers = with stdenv.lib.maintainers; [ the-kenny jwiegley ];
+    broken = true;
   };
 }

From 13f4ce8cc953951d29188c088d5e33ca2002a2d7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 18:47:55 -0400
Subject: [PATCH 2914/3246] mxu11x0: 1.3.11 -> 1.3.11+git2017-07-13

---
 pkgs/os-specific/linux/mxu11x0/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix
index 6f16debaedf..d21bed7cbe4 100644
--- a/pkgs/os-specific/linux/mxu11x0/default.nix
+++ b/pkgs/os-specific/linux/mxu11x0/default.nix
@@ -1,16 +1,13 @@
 { stdenv, fetchFromGitHub, kernel }:
 
-# it doesn't compile anymore on 3.14
-assert stdenv.lib.versionAtLeast kernel.version "3.18";
-
 stdenv.mkDerivation {
-  name = "mxu11x0-1.3.11-${kernel.version}";
+  name = "mxu11x0-1.3.11+git2017-07-13-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "ellysh";
     repo = "mxu11x0";
-    rev = "de54053d6f297785d77aba9e9c880001519ffddf";
-    sha256 = "1zmqanw22pgaj3b3lnciq33w6svm5ngg6g0k5xxwwijixg8ri3lf";
+    rev = "cbbb5ec2045939209117cb5fcd6c7c23bcc109ef";
+    sha256 = "0wf44pnz5aclvg2k1f8ljnwws8hh6191i5h06nz95ijbxhwz63w4";
   };
 
   preBuild = ''
@@ -19,6 +16,7 @@ stdenv.mkDerivation {
     sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/mxconf
     sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/Makefile
   '';
+  
   installPhase = ''
     install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/usb/serial/mxu11x0.ko"
     install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/misc/mxu11x0.ko"
@@ -36,5 +34,6 @@ stdenv.mkDerivation {
     license = licenses.gpl1;
     maintainers = with maintainers; [ uralbash ];
     platforms = platforms.linux;
+    broken = (versionOlder kernel.version "4.9");
   };
 }

From 1bfda6a8c0efd24e02ae38aa669702f9aaf53702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 12:15:54 +0100
Subject: [PATCH 2915/3246] git-review: fix build

---
 pkgs/applications/version-management/git-review/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index a824b55fca8..c9251b987e9 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -8,12 +8,16 @@ pythonPackages.buildPythonApplication rec {
   # upstream repository (and we are installing from tarball instead)
   PBR_VERSION = "${version}";
 
+  postPatch = ''
+    sed -i -e '/argparse/d' requirements.txt
+  '';
+
   src = fetchurl rec {
     url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz";
     sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce";
   };
 
-  propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests pythonPackages.argparse pythonPackages.setuptools ];
+  propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ];
 
   # Don't do tests because they require gerrit which is not packaged
   doCheck = false;

From 40d05c1073e557d86d0bafd1a007c5eeec6f4a21 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 18:42:01 -0400
Subject: [PATCH 2916/3246] ixgbevf: 4.1.2 -> 4.2.1

---
 pkgs/os-specific/linux/ixgbevf/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix
index 96dc0775cec..df4ef81adb8 100644
--- a/pkgs/os-specific/linux/ixgbevf/default.nix
+++ b/pkgs/os-specific/linux/ixgbevf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ixgbevf-${version}-${kernel.version}";
-  version = "4.1.2";
+  version = "4.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz";
-    sha256 = "1dismhiq0asf04rv6pv2sk2m3xcy6m3bpk16gmxqybca3xa28a5b";
+    sha256 = "1666hsavaspjmf45ij396mkndzk6g0n3ibr2glfdhjfqhfy35zb8";
   };
 
   hardeningDisable = [ "pic" ];
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage = https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/;
     license = stdenv.lib.licenses.gpl2;
     priority = 20;
+    broken = (stdenv.lib.versionOlder kernel.version "4.9");
   };
 }

From 263978219cf570d57d61377d14f73b5a38e295cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 12:21:06 +0100
Subject: [PATCH 2917/3246] fstrm: 0.3.1 -> 0.3.2

---
 pkgs/development/libraries/fstrm/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix
index 3700b6f6355..9c4bf00347c 100644
--- a/pkgs/development/libraries/fstrm/default.nix
+++ b/pkgs/development/libraries/fstrm/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }:
 
 stdenv.mkDerivation rec {
   name = "fstrm-${version}";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "farsightsec";
     repo = "fstrm";
     rev = "v${version}";
-    sha256 = "1n8hpywjgkzm0xh0hvryf5r6v2sbpgr3qy0grxq9yha7kqcam4f3";
+    sha256 = "135m0d4z1wbiaazs3bh6z53a35mgs33gvfki8pl4xfaw9cfcfpd2";
   };
 
   outputs = [ "bin" "out" "dev" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ libevent ];
+  buildInputs = [ libevent openssl ];
+
+  preBuild = ''
+    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -L${openssl}/lib"
+  '';
 
   doCheck = true;
 

From 6da8f82d6bcf572ff312a26fa2157c241139fe74 Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Tue, 29 Aug 2017 19:26:34 +0800
Subject: [PATCH 2918/3246] go-ethereum-classic: 3.5.0 -> 3.5.86

---
 .../applications/altcoins/go-ethereum-classic/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
index 3687905ae57..37d6264d82f 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@@ -2,16 +2,15 @@
 
 buildGoPackage rec {
   name = "go-ethereum-classic-${version}";
-  version = "3.5.0";
-  rev = "402c1700fbefb9512e444b32fe12c2d674638ddb";
+  version = "3.5.86";
 
   goPackagePath = "github.com/ethereumproject/go-ethereum";
   subPackages = [ "cmd/evm" "cmd/geth" ];
 
   src = fetchgit {
-    inherit rev;
+    rev = "v${version}";
     url = "https://github.com/ethereumproject/go-ethereum";
-    sha256 = "15wji12wqcrgsb1glwwz4jv7rsas71bbxh7750iv2phn7jivm0fi";
+    sha256 = "1k59hl3qvx4422zqlp259566fnxq5bs67jhm0v6a1zfr1k8iqzwh";
   };
 
   goDeps = ./deps.nix;
@@ -20,5 +19,6 @@ buildGoPackage rec {
     description = "Golang implementation of Ethereum Classic";
     homepage = https://github.com/ethereumproject/go-ethereum;
     license = with lib.licenses; [ lgpl3 gpl3 ];
+    maintainers = with lib.maintainers; [ sorpaas ];
   };
 }

From f9192394ba80c70e50cab0d23a637b6c02e3dfa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 12:33:49 +0100
Subject: [PATCH 2919/3246] dvgrab: 3.5 -> 2016-05-16

---
 pkgs/tools/video/dvgrab/default.nix | 47 ++++++++++++++++-------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index 73986b5be05..cec4fc1ce8b 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -1,34 +1,39 @@
-{ fetchurl, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv
-, libavc1394, pkgconfig }:
+{ fetchFromGitHub, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv
+, libavc1394, pkgconfig, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "dvgrab-3.5";
+  name = "dvgrab-2016-05-16";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/kino/${name}.tar.gz";
-    sha256 = "1y8arv14nc9sf8njfcxf96pb4nyimpsly1fnhcbj406k54s1h42r";
+  src = fetchFromGitHub {
+    # mirror of original project with some build fixes
+    owner = "ddennedy";
+    repo = "dvgrab";
+    rev = "e46042e0c7b3523b6854ee547b0534e8310b7460";
+    sha256 = "17qy76fjpzrbxm4pj0ljx5lbimxryv24fvr13jwkh24j85dxailn";
   };
 
-  buildInputs =
-    [ libunwind libraw1394 libjpeg libiec61883 libdv libavc1394
-      pkgconfig
-    ];
+  buildInputs = [
+    libunwind libraw1394 libjpeg libiec61883 libdv libavc1394
+  ];
 
-  meta = {
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig
+  ];
+
+  meta = with stdenv.lib; {
     description = "Receive and store audio & video over IEEE1394";
 
-    longDescription =
-      '' dvgrab receives audio and video data from a digital camcorder via an
-         IEEE1394 (widely known as FireWire) or USB link and stores them into
-         one of several file formats. It features autosplit of long video
-         sequences, and supports saving the data as raw frames, AVI type 1,
-         AVI type 2, Quicktime DV, a series of JPEG stills or MPEG2-TS.
-      '';
+    longDescription = ''
+      dvgrab receives audio and video data from a digital camcorder via an
+      IEEE1394 (widely known as FireWire) or USB link and stores them into
+      one of several file formats. It features autosplit of long video
+      sequences, and supports saving the data as raw frames, AVI type 1,
+      AVI type 2, Quicktime DV, a series of JPEG stills or MPEG2-TS.
+    '';
 
     homepage = http://kinodv.org/;
 
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.gnu;
-    maintainers = [ ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.gnu;
   };
 }

From d881b024d492fea78d9987a6ffeaa1e3290be668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 12:57:56 +0100
Subject: [PATCH 2920/3246] lprof: fix build

---
 pkgs/tools/graphics/lprof/default.nix            | 13 +------------
 pkgs/tools/graphics/lprof/keep-environment.patch | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/tools/graphics/lprof/keep-environment.patch

diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix
index 6e09dc191ac..e6773e42304 100644
--- a/pkgs/tools/graphics/lprof/default.nix
+++ b/pkgs/tools/graphics/lprof/default.nix
@@ -19,27 +19,16 @@ stdenv.mkDerivation {
     sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn";
   };
 
-  # The sed commands disable header checks and add LDFLAGS NIX_CFLAGS_COMPILE
-  # to the gcc environment
   buildPhase = ''
     mkdir -p $out
     export CXX=g++
-    sed -i  SConstruct \
-     -e 's/def CheckForQt(context):/def CheckForQt(context):\n  return 1/' \
-     -e "s/not config.CheckHeader('lcms.h')/False/" \
-     -e "s/not config.CheckHeader('tiff.h')/False/" \
-     -e "s/not config.CheckCXXHeader('vigra\/impex.hxx')/False/" \
-     \
-     -e "s/^\(      'LDFLAGS'.*\)/\1\n,'hardeningDisable' : os.environ['hardeningDisable']/" \
-     -e "s/^\(      'LDFLAGS'.*\)/\1\n,'NIX_CFLAGS_COMPILE' : os.environ['NIX_CFLAGS_COMPILE']/" \
-     -e "s/^\(      'LDFLAGS'.*\)/\1\n,'NIX_LDFLAGS' : os.environ['NIX_LDFLAGS']/"
 
     scons PREFIX=$out SYSLIBS=1 install
   '';
 
   installPhase = ":";
 
-  patches = [ ./lcms-1.17.patch ];
+  patches = [ ./lcms-1.17.patch  ./keep-environment.patch ];
 
   meta = {
     description = "Little CMS ICC profile construction set";
diff --git a/pkgs/tools/graphics/lprof/keep-environment.patch b/pkgs/tools/graphics/lprof/keep-environment.patch
new file mode 100644
index 00000000000..4dcb5b0448d
--- /dev/null
+++ b/pkgs/tools/graphics/lprof/keep-environment.patch
@@ -0,0 +1,16 @@
+--- lprof-1.11.4.1.org/SConstruct	2006-06-06 02:11:32.000000000 +0100
++++ lprof-1.11.4.1/SConstruct	2017-08-29 12:56:13.425654683 +0100
+@@ -22,12 +22,7 @@
+ # opts.Add(BoolOption('qt-mt-lib', 'Flag used to set QT library to either qt-mt or qt. Value of 1 = qt-mt, 0 = qt.', 'yes'))
+ 
+ # setup base environemnt 
+-env = Environment(
+-    ENV = {
+-      'PATH' : os.environ[ 'PATH' ],
+-      'HOME' : os.environ[ 'HOME' ], # required for distcc
+-      'LDFLAGS' : ''
+-    }, options = opts)
++env = Environment(ENV = os.environ, options = opts)
+ 
+ opts.Update(env)
+ opts.Save('lprof.conf', env) # Save, so user doesn't have to 

From e9648952dc32f1d11956567844060b0ffe8ee307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 13:08:17 +0100
Subject: [PATCH 2921/3246] direwolf: 1.3 -> 1.4

---
 pkgs/applications/misc/direwolf/default.nix | 27 +++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index d4c8b1ada6c..f1e33ea5357 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -6,35 +6,36 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "direwolf-${version}";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "wb2osz";
     repo = "direwolf";
     rev = version;
-    sha256 = "1x6vvl3fy70ic5pqvqsyr0bkqwim8m9jaqnm5ls8z8i66rwq23fg";
+    sha256 = "033sffjs2dz48077hc58jr4lxxs8md1fyfh4lig6ib7pyigiv1y0";
   };
 
   buildInputs = [
     espeak perl python
   ] ++ (optional stdenv.isLinux alsaLib);
 
-  patchPhase = ''
-        substituteInPlace Makefile.* \
-          --replace /usr/share $out/share
+  postPatch = ''
+    for i in Makefile.*; do
+      substituteInPlace "$i" \
+        --replace /usr/share $out/share
+    done
 
-        substituteInPlace dwespeak.sh \
-          --replace espeak ${espeak}/bin/espeak
-        '';
+    substituteInPlace dwespeak.sh \
+      --replace espeak ${espeak}/bin/espeak
+  '';
 
-  installPhase = ''
-    mkdir -p $out/bin 
-    make INSTALLDIR=$out install
-    '';
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+  installFlags = [ "INSTALLDIR=$(out)" ];
 
   meta = {
     description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
-    # On the page: This page will be disappearing on October 8, 2015.
     homepage = https://github.com/wb2osz/direwolf/;
     license = licenses.gpl2;
     platforms = platforms.unix;

From 09eb4adf91e80ce44953894cf8126aa02377e514 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 29 Aug 2017 14:23:52 +0200
Subject: [PATCH 2922/3246] lincity_ng: 2.0 -> 2.9beta20170715

---
 pkgs/games/lincity/ng.nix      | 48 ++++++++++++++++++----------------
 pkgs/games/lincity/ng.upstream |  5 ----
 2 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/games/lincity/ng.upstream

diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix
index b6574eaf39e..4ca2cd271cd 100644
--- a/pkgs/games/lincity/ng.nix
+++ b/pkgs/games/lincity/ng.nix
@@ -1,39 +1,41 @@
-{stdenv, fetchurl
+{stdenv, fetchgit
 , zlib, jam, pkgconfig, gettext, libxml2, libxslt, xproto, libX11, mesa, SDL
-, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs
+, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs, autoconf, automake, libtool
 }:
-let s = # Generated upstream information
-  rec {
-    baseName="lincity";
-    version="2.0";
-    name="lincity-2.0";
-    hash="01k6n304qj0z5zmqr49gqirp0jmx2b0cpisgkxk1ga67vyjhdcm6";
-    url="http://pkgs.fedoraproject.org/repo/pkgs/lincity-ng/lincity-ng-2.0.tar.bz2"
-      + "/1bd0f58e0f2b131d70044f4230600ed1/lincity-ng-2.0.tar.bz2";
-      # berlios shut down; I found no better mirror
-    sha256="01k6n304qj0z5zmqr49gqirp0jmx2b0cpisgkxk1ga67vyjhdcm6";
-  };
-  buildInputs = [zlib jam pkgconfig gettext libxml2 libxslt xproto libX11 mesa 
-    SDL SDL_mixer SDL_image SDL_ttf SDL_gfx physfs];
-in
 stdenv.mkDerivation rec {
-  inherit (s) name version;
-  src = fetchurl {
-    inherit (s) url sha256;
+  name = "lincity-ng-${version}";
+  version = "2.9beta.20170715";
+
+  src = fetchgit {
+    url = "https://github.com/lincity-ng/lincity-ng";
+    rev = "0c19714b811225238f310633e59f428934185e6b";
+    sha256 = "1gaj9fq97zmb0jsdw4rzrw34pimkmkwbfqps0glpqij4w3srz5f3";
   };
 
   hardeningDisable = [ "format" ];
 
-  inherit buildInputs;
+  nativeBuildInputs = [
+    jam autoconf automake libtool pkgconfig
+  ];
 
-  buildPhase = "jam";
-  installPhase="jam install";
+  buildInputs = [
+    zlib gettext libxml2 libxslt xproto libX11 mesa SDL SDL_mixer SDL_image
+    SDL_ttf SDL_gfx physfs
+  ];
+
+   preConfigure = ''
+     ./autogen.sh
+   '';
+
+   installPhase = ''
+     touch CREDITS
+     AR='ar r' jam install
+   '';
 
   meta = {
     documentation = ''City building game'';
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [stdenv.lib.maintainers.raskin];
-    inherit (s) version;
   };
 }
diff --git a/pkgs/games/lincity/ng.upstream b/pkgs/games/lincity/ng.upstream
deleted file mode 100644
index d73d1a2c419..00000000000
--- a/pkgs/games/lincity/ng.upstream
+++ /dev/null
@@ -1,5 +0,0 @@
-target ng.nix
-attribute_name lincity_ng
-url https://fedorahosted.org/LinCity-NG/wiki/Downloads
-version_link tar.bz2
-version_link tar.bz2

From fe6c5adecf373ea9847ddcc6a90420a44a5d8248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 29 Aug 2017 14:24:17 +0200
Subject: [PATCH 2923/3246] e17gtk: finish decoupling from gnome3 version

---
 pkgs/misc/themes/e17gtk/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix
index cdf2d958fe4..3fbb77816d3 100644
--- a/pkgs/misc/themes/e17gtk/default.nix
+++ b/pkgs/misc/themes/e17gtk/default.nix
@@ -1,18 +1,14 @@
-{ stdenv, fetchFromGitHub, gnome3 }:
-let
-  gnome3 = { version = "3.22"; }; # FIXME
-in
+{ stdenv, fetchFromGitHub }:
+
 stdenv.mkDerivation rec {
   name = "e17gtk-${version}";
-  version = "${gnome3.version}.1";
+  version = "3.22.1";
 
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "E17gtk";
     rev = "V${version}";
-    sha256 = {
-      "3.22" = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8";
-    }."${gnome3.version}";
+    sha256 = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8";
   };
 
   installPhase = ''

From 1ee49e13e6b9721e8f0c08f871f8f6d3c2cc895a Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 29 Aug 2017 21:32:56 +0900
Subject: [PATCH 2924/3246] fcitx-unikey: fix build

---
 .../tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
index b2cd71d1816..4581f80a75e 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake fcitx gettext pkgconfig ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-narrowing";
+
   preInstall = ''
     substituteInPlace src/cmake_install.cmake \
       --replace ${fcitx} $out
@@ -28,4 +30,4 @@ stdenv.mkDerivation rec {
     maintainers   = with maintainers; [ ericsagnes ];
   };
 
-}
\ No newline at end of file
+}

From 3cf149c60de2a2eb2e23b121359b51a0b3935c81 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Tue, 29 Aug 2017 08:19:34 -0500
Subject: [PATCH 2925/3246] rippled: mark build broken

---
 pkgs/servers/rippled/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 7f9f08af002..18cd936e8fc 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ ehmry offline ];
     license = licenses.isc;
     platforms = [ "x86_64-linux" ];
+    broken = true;
   };
 }

From e3f4de8940ea4b32d1cbd603f7cf7cb4b00e2cc9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 29 Aug 2017 16:07:32 +0200
Subject: [PATCH 2926/3246] asc: 2.4.0.0 -> 2.6.0.0; maintain

---
 pkgs/games/asc/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix
index e67b92afa76..e532fb75e0b 100644
--- a/pkgs/games/asc/default.nix
+++ b/pkgs/games/asc/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs
 , boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkgconfig, zlib, zip, bzip2,
-libpng }:
+libpng, libtiff, fluidsynth, libmikmod }:
 
 stdenv.mkDerivation rec {
-  name = "asc-2.4.0.0";
+  name = "asc-2.6.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/asc-hq/${name}.tar.bz2";
-    sha256 = "1r011l4gsliky6szjvda8xzyhkkc50ahrr7p14911v5ydar0w3hh";
+    sha256 = "1fybasb6srqfg6pqbvh0s0vvzjq9r0n6aq0z44hs7n68kmaam775";
   };
 
   configureFlags = [ "--disable-paragui" "--disable-paraguitest" ];
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat
     freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng
+    libtiff fluidsynth libmikmod
   ];
 
   meta = with stdenv.lib; {
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl2Plus;
 
-    maintainers = with maintainers; [ viric ];
+    maintainers = with maintainers; [ viric raskin ];
     platforms = platforms.linux;
   };
 }

From 10f5aad602975b888f2beecea5e59ed69608b5b2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 29 Aug 2017 16:12:14 +0200
Subject: [PATCH 2927/3246] acpi_call: mark as broken on ChromiumOS kernels

---
 pkgs/os-specific/linux/acpi-call/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index fe8c0b65bb7..4a7a2abbb59 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation {
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
     description = "A module allowing arbitrary ACPI calls; use case: hybrid video";
+    broken = kernel.features.chromiumos or false;
   };
 }

From cdb49582a64925c8f13c43eab51586c8593f17ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Aug 2017 15:09:23 +0200
Subject: [PATCH 2928/3246] rogue: fix build by using older ncurses

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d57f68961ed..bb3b8b419ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17514,7 +17514,9 @@ with pkgs;
 
   rimshot = callPackage ../games/rimshot { love = love_0_7; };
 
-  rogue = callPackage ../games/rogue { };
+  rogue = callPackage ../games/rogue {
+    ncurses = ncurses5;
+  };
 
   robotfindskitten = callPackage ../games/robotfindskitten { };
 

From dc9374427357a942a27e36fc8cc0674aa8cbc22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Aug 2017 16:15:15 +0200
Subject: [PATCH 2929/3246] rogue: omit from the installation media

At least for now.  It would increase the ISO size by ~10 MB,
after the fixup in the parent commit.
---
 nixos/modules/profiles/installation-device.nix | 2 +-
 nixos/tests/installer.nix                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index a24fa75e01d..8e1482f5533 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -28,7 +28,7 @@ with lib;
     services.nixosManual.showManual = true;
 
     # Let the user play Rogue on TTY 8 during the installation.
-    services.rogue.enable = true;
+    #services.rogue.enable = true;
 
     # Disable some other stuff we don't need.
     security.sudo.enable = false;
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index a8090dc62ee..c1dae2a34fa 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -74,7 +74,7 @@ let
       # Make sure that we get a login prompt etc.
       $machine->succeed("echo hello");
       #$machine->waitForUnit('getty@tty2');
-      $machine->waitForUnit("rogue");
+      #$machine->waitForUnit("rogue");
       $machine->waitForUnit("nixos-manual");
 
       # Wait for hard disks to appear in /dev

From aae774571e6faeb166f9d4fbfca6afbfc6aa21af Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Sat, 26 Aug 2017 11:21:29 -0400
Subject: [PATCH 2930/3246] doc: explain pull request template

---
 doc/submitting-changes.xml | 127 +++++++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)

diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index 0b09dffbb2d..c8742a083c3 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -223,6 +223,133 @@ Additional information.
 </itemizedlist>
 </section>
 
+<section>
+  <title>Pull Request Template</title>
+  <para>
+    The pull request template helps determine what steps have been made for a
+    contribution so far, and will help guide maintainers on the status of a
+    change. The motivation section of the PR should include any extra details
+    the title does not address and link any existing issues related to the pull
+    request.
+  </para>
+  <para>When a PR is created, it will be pre-populated with some checkboxes detailed below:
+  </para>
+  <section>
+    <title>Tested using sandboxing</title>
+    <para>
+      When sandbox builds are enabled, Nix will setup an isolated environment
+      for each build process. It is used to remove further hidden dependencies
+      set by the build environment to improve reproducibility. This includes
+      access to the network during the build outside of
+      <function>fetch*</function> functions and files outside the Nix store.
+      Depending on the operating system access to other resources are blocked
+      as well (ex. inter process communication is isolated on Linux); see <link
+      xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link>
+      in Nix manual for details.
+    </para>
+    <para>
+      Sandboxing is not enabled by default in Nix due to a small performance
+      hit on each build.  In pull requests for <link
+        xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link> people
+      are asked to test builds with sandboxing enabled (see <literal>Tested
+        using sandboxing</literal> in the pull request template) because
+      in<link
+        xlink:href="https://nixos.org/hydra/">https://nixos.org/hydra/</link>
+      sandboxing is also used.
+    </para>
+    <para>
+      Depending if you use NixOS or other platforms you can use one of the
+      following methods to enable sandboxing <emphasis role="bold">before</emphasis> building the package:
+      <itemizedlist>
+        <listitem>
+          <para>
+            <emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>:
+            add the following to 
+            <filename>configuration.nix</filename>
+            <screen>nix.useSandbox = true;</screen>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <emphasis role="bold">Globally enable sandboxing on non-NixOS platforms</emphasis>:
+            add the following to: <filename>/etc/nix/nix.conf</filename>
+            <screen>build-use-sandbox = true</screen>
+          </para>
+        </listitem>
+      </itemizedlist>
+    </para>
+    
+  </section>
+  <section>
+    <title>Built on platform(s)</title>
+    <para>
+      Many Nix packages are designed to run on multiple
+      platforms. As such, it's important to let the maintainer know which
+      platforms your changes have been tested on. It's not always practical to
+      test a change on all platforms, and is not required for a pull request to
+      be merged. Only check the systems you tested the build on in this
+      section.
+    </para>
+  </section>
+  <section>
+    <title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title>
+    <para>
+      Packages with automated tests are much more likely to be merged in a
+      timely fashion because it doesn't require as much manual testing by the
+      maintainer to verify the functionality of the package. If there are
+      existing tests for the package, they should be run to verify your changes
+      do not break the tests. Tests only apply to packages with NixOS modules
+      defined and can only be run on Linux. For more details on writing and
+      running tests, see the <link
+        xlink:href="https://nixos.org/nixos/manual/index.html#sec-nixos-tests">section
+        in the NixOS manual</link>.
+    </para>
+  </section>
+  <section>
+    <title>Tested compilation of all pkgs that depend on this change using <command>nox-review</command></title>
+    <para>
+      If you are updating a package's version, you can use nox to make sure all
+      packages that depend on the updated package still compile correctly. This
+      can be done using the nox utility. The <command>nox-review</command>
+      utility can look for and build all dependencies either based on
+      uncommited changes with the <literal>wip</literal> option or specifying a
+      github pull request number.
+    </para>
+    <para>
+      review uncommitted changes:
+      <screen>nix-shell -p nox --run nox-review wip</screen>
+    </para>
+    <para>
+      review changes from pull request number 12345:
+      <screen>nix-shell -p nox --run nox-review pr 12345</screen>
+    </para>
+  </section>
+  <section>
+    <title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title>
+    <para>
+      It's important to test any executables generated by a build when you
+      change or create a package in nixpkgs. This can be done by looking in
+      <filename>./result/bin</filename> and running any files in there, or at a
+      minimum, the main executable for the package. For example, if you make a change
+      to <package>texlive</package>, you probably would only check the binaries
+      associated with the change you made rather than testing all of them.
+    </para>
+  </section>
+  <section>
+    <title>Meets nixpkgs contribution standards</title>
+    <para>
+      The last checkbox is fits <link
+        xlink:href="https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md">CONTRIBUTING.md</link>.
+      The contributing document has detailed information on standards the Nix
+      community has for commit messages, reviews, licensing of contributions
+      you make to the project, etc... Everyone should read and understand the
+      standards the community has for contributing before submitting a pull
+      request.
+    </para>
+    
+  </section>
+</section>
+
 <section>
 <title>Hotfixing pull requests</title>
 

From 91062dc8627d5e27996951b5bf8cae9dd9ea75db Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sun, 19 Feb 2017 04:23:58 +0200
Subject: [PATCH 2931/3246] habitat: 0.8.0 -> 0.30.2

---
 .../networking/cluster/habitat/chroot-env.nix   |  9 ---------
 .../networking/cluster/habitat/default.nix      | 17 ++++++++++++-----
 pkgs/top-level/all-packages.nix                 |  1 -
 3 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/habitat/chroot-env.nix

diff --git a/pkgs/applications/networking/cluster/habitat/chroot-env.nix b/pkgs/applications/networking/cluster/habitat/chroot-env.nix
deleted file mode 100644
index 7d6b3749904..00000000000
--- a/pkgs/applications/networking/cluster/habitat/chroot-env.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-# TODO: Drop once https://github.com/habitat-sh/habitat/issues/994
-#       is resolved.
-{ habitat, libsodium, libarchive, openssl, buildFHSUserEnv }:
-
-buildFHSUserEnv {
-    name = "habitat-sh";
-    targetPkgs = pkgs: [ habitat libsodium libarchive openssl ];
-    runScript = "bash";
-}
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index da82dac0019..60531261140 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -5,23 +5,30 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "habitat-${version}";
-  version = "0.8.0";
+  version = "0.30.2";
 
   src = fetchFromGitHub {
     owner = "habitat-sh";
     repo = "habitat";
     rev = version;
-    sha256 = "1h9wv2v4hcv79jkkjf8j96lzxni9d51755zfflfr5s3ayaip7rzj";
+    sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1";
   };
 
-  sourceRoot = "habitat-${version}-src/components/hab";
-
-  depsSha256 = "1612jaw3zdrgrb56r755bb18l8szdmf1wi7p9lpv3d2gklqcb7l1";
+  depsSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9py";
 
   buildInputs = [ libsodium libarchive openssl ];
 
   nativeBuildInputs = [ pkgconfig ];
 
+  cargoBuildFlags = ["--package hab"];
+
+  checkPhase = ''
+    runHook preCheck
+    echo "Running cargo test"
+    cargo test --package hab
+    runHook postCheck
+  '';
+
   meta = with lib; {
     description = "An application automation framework";
     homepage = https://www.habitat.sh;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b180ad5dd64..ce1e08f54a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2436,7 +2436,6 @@ with pkgs;
   haveged = callPackage ../tools/security/haveged { };
 
   habitat = callPackage ../applications/networking/cluster/habitat { };
-  habitat-sh = callPackage ../applications/networking/cluster/habitat/chroot-env.nix { };
 
   hardlink = callPackage ../tools/system/hardlink { };
 

From fafa1cca63d6a5d47eabe465cc3540fab8e484d6 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Tue, 29 Aug 2017 17:47:21 +0200
Subject: [PATCH 2932/3246] lizardfs: 3.10.2 -> 3.11.3

---
 pkgs/tools/filesystems/lizardfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index a50d8341f6b..0c8f05d6904 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   name = "lizardfs-${version}";
-  version = "3.10.2";
+  version = "3.11.3";
 
   src = fetchFromGitHub {
     owner = "lizardfs";
     repo = "lizardfs";
     rev = "v${version}";
-    sha256 = "0xw6skprxw0wcbqh4yx8f8a4q00x0sfz42llqgd047bcbga1k5zg";
+    sha256 = "1njgj242vgpdqb1di321jfqk4al5lk72x2iyp0nldy7h6r98l2ww";
   };
 
   buildInputs = 

From f86cac2dfc659e5ccdb1a88d850cba45d3be066f Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Tue, 29 Aug 2017 18:30:35 +0200
Subject: [PATCH 2933/3246] vault: 0.7.3 -> 0.8.1

---
 pkgs/tools/security/vault/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 9de6216ea59..7ca4d8bd1c1 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,18 +9,19 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.7.3";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "15wj1pfgzwzjfrqy7b5bx4y9f0hbpqlfif58l5xamwm88229qk4m";
+    sha256 = "19y688nvi0vr7cdnaa5sy2m65xicjwi5qgkgzyjvb7r3zb0dnli1";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];
 
   buildPhase = ''
+    patchShebangs ./
     substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
 
     mkdir -p src/github.com/hashicorp

From 680538dbf3849f1a51c545a32f1bc90798f7fc6b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 Aug 2017 19:23:25 +0200
Subject: [PATCH 2934/3246] pidgin: remove unnecessary dependency

Farsight was renamed to Farstream long ago and it is already listed as a dependency.
---
 .../networking/instant-messengers/pidgin/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 45aafba57f3..cf1893b198e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell
 , gst_all_1, startupnotification, gettext
-, perl, perlXMLParser, libxml2, nss, nspr, farstream, farsight2
+, perl, perlXMLParser, libxml2, nss, nspr, farstream
 , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
 , lib, python, libICE, libXext, libSM
 , openssl ? null
@@ -30,7 +30,7 @@ let unwrapped = stdenv.mkDerivation rec {
   buildInputs = [
     gtkspell2 aspell startupnotification
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    libxml2 nss nspr farstream farsight2
+    libxml2 nss nspr farstream
     libXScrnSaver ncurses python
     avahi dbus dbus_glib intltool libidn
     libICE libXext libSM

From 114f3c75eca8cae5850bb609bd98e99ce581e6ac Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 Aug 2017 19:25:24 +0200
Subject: [PATCH 2935/3246] farsight2: remove

Farsight was renamed to Farstream long ago. The old version is unnecessary and so
outdated it was removed even from Debian.
---
 .../libraries/farsight2/default.nix           | 25 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/farsight2/default.nix

diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix
deleted file mode 100644
index 9ff57257e03..00000000000
--- a/pkgs/development/libraries/farsight2/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst-plugins-base
-, gst-python, gupnp_igd }:
-
-let
-  inherit (python2Packages) python pygobject2;
-in stdenv.mkDerivation rec {
-  name = "farsight2-0.0.31";
-  
-  src = fetchurl {
-    url = "http://farsight.freedesktop.org/releases/farsight2/${name}.tar.gz";
-    sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm";
-  };
-
-  buildInputs = [ libnice python pygobject2 gst-python gupnp_igd ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ gstreamer gst-plugins-base ];
-
-  meta = {
-    homepage = http://farsight.freedesktop.org/wiki/;
-    description = "Audio/Video Communications Framework";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b180ad5dd64..e68251fae7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7817,8 +7817,6 @@ with pkgs;
 
   farbfeld = callPackage ../development/libraries/farbfeld { };
 
-  farsight2 = callPackage ../development/libraries/farsight2 { };
-
   farstream = callPackage ../development/libraries/farstream {
     inherit (gst_all_1)
       gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad

From 49d86bc076fed658e064ded9553eeae5298a09a5 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Tue, 29 Aug 2017 18:54:15 +0200
Subject: [PATCH 2936/3246] cockroachdb: 1.0.2 -> 1.0.5

---
 pkgs/servers/sql/cockroachdb/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 01f92dfa2b9..a6442b97647 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "cockroach-${version}";
-  version = "v1.0.2";
+  version = "v1.0.5";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
     url = "https://binaries.cockroachdb.com/cockroach-${version}.src.tgz";
-    sha256 = "0xq5lg9a2lxn89lilq3zzcd4kph0a5sga3b5bb9xv6af87igy6zp";
+    sha256 = "0jjl6zb8pyxws3i020h98vdr217railca8h6n3xijkvcqy9dj8wa";
   };
 
   buildInputs = [ cmake xz which ];
@@ -26,10 +26,12 @@ buildGoPackage rec {
 
   installPhase =
     ''
-      mkdir -p $bin/{bin,share,etc/bash_completion.d}
-      mv cockroach $bin/bin
-      mv man $bin/share
-      mv cockroach.bash $bin/etc/bash_completion.d
+      mkdir -p $bin/{bin,share}
+      mv cockroach $bin/bin/
+      mv man $bin/share/
+
+      mkdir -p $out/share/bash-completion/completions
+      mv cockroach.bash $out/share/bash-completion/completions
     '';
 
   meta = with stdenv.lib; {

From 51d1325482695ae9056effc5b665bc62f00ace32 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 29 Aug 2017 12:50:13 -0500
Subject: [PATCH 2937/3246] remove atlasWithLapack

atlasWithLapack is no longer used. We should prefer OpenBLAS.
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fb97035794..5306684a2e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17988,8 +17988,6 @@ with pkgs;
     withLapack = false;
   };
 
-  atlasWithLapack = atlas.override { withLapack = true; };
-
   blas = callPackage ../development/libraries/science/math/blas { };
 
   clblas-cuda = callPackage ../development/libraries/science/math/clblas/cuda {

From a233cb19df06b63d001fe73c4baa0c2f27133c4c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 29 Aug 2017 12:55:26 -0500
Subject: [PATCH 2938/3246] prison: mark broken with Qt < 5.7

---
 pkgs/development/libraries/kde-frameworks/prison.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix
index 2d86f3fbf05..cf74ee20c2d 100644
--- a/pkgs/development/libraries/kde-frameworks/prison.nix
+++ b/pkgs/development/libraries/kde-frameworks/prison.nix
@@ -6,7 +6,10 @@
 
 mkDerivation {
   name = "prison";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ libdmtx qrencode ];
   propagatedBuildInputs = [ qtbase ];

From a9b1a67a109cb1a13380b214f6011a62a747064e Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Tue, 29 Aug 2017 20:10:11 +0200
Subject: [PATCH 2939/3246] caddy: 0.10.6 -> 0.10.7

---
 pkgs/servers/caddy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index e221c67a2c0..d4036b52d96 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.10.6";
+  version = "0.10.7";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "17k8518mx1l0q5bjlx0c6f249ibr9qdrcgwn3wpwhd244cbg44gn";
+    sha256 = "1sn959l2cq6pallmngwf1hrjk7qrsfb5wsqbv15xnczl22lvwf13";
   };
 
   buildFlagsArray = ''

From 4d3c396181739cc4e3b8d3a1e1f678dd4c807ff1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 28 Aug 2017 23:41:35 -0400
Subject: [PATCH 2940/3246] python.pkgs.numpy: fix patch

---
 .../numpy/numpy-distutils-C++.patch            | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
index 4b2d5c640e6..771da8cf3ff 100644
--- a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
+++ b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
@@ -1,23 +1,31 @@
 diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
-index a92ccd3..9630e91 100644
+index 6ed5eec..82a88b5 100644
 --- a/numpy/distutils/unixccompiler.py
 +++ b/numpy/distutils/unixccompiler.py
-@@ -43,10 +43,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
+@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
          if opt not in llink_s:
              self.linker_so = llink_s.split() + opt.split()
  
 -    display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
+-
+     # gcc style automatic dependencies, outputs a makefile (-MF) that lists
+     # all headers needed by a c file as a side effect of compilation (-MMD)
+     if getattr(self, '_auto_depends', False):
+@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
+         deps = []
+ 
      try:
--        self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-        self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
 -                   extra_postargs, display = display)
 +        if self.detect_language(src) == 'c++':
 +            display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src)
-+            self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++            self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps +
 +                       extra_postargs, display = display)
 +        else:
 +            display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
-+            self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++            self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
 +                       extra_postargs, display = display)
++
      except DistutilsExecError:
          msg = str(get_exception())
          raise CompileError(msg)

From 51d138f401c9f2564e4032e84f20a65ca14fde8a Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Tue, 29 Aug 2017 20:28:57 +0200
Subject: [PATCH 2941/3246] cassandra: remove myself from maintainers

---
 pkgs/servers/nosql/cassandra/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 848d181867e..f5f29bcdac7 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
     description = "A massively scalable open source NoSQL database";
     platforms = platforms.unix;
     license = licenses.asl20;
-    maintainers = with maintainers; [ nckx rushmorem cransom ];
+    maintainers = with maintainers; [ nckx cransom ];
   };
 }

From d0d191939cbff68efc45db4079248d783dbac40b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 29 Aug 2017 20:31:45 +0200
Subject: [PATCH 2942/3246] xconq: fix build

---
 pkgs/games/xconq/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix
index e8e27d7afb6..82dfd217217 100644
--- a/pkgs/games/xconq/default.nix
+++ b/pkgs/games/xconq/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
     # Fix C files
     sed -re 's@[(]int[)]color@(long)color@' -i tcltk/tkmap.c
     sed -re '/unitp = view_unit[(]uview[)]/aelse *unitp = NULL\;' -i tcltk/tkmap.c
+    sed -re 's@BMAP_BYTE char@BMAP_BYTE unsigned char@' -i kernel/ui.h
 
     # Fix TCL files
     sed -re 's@MediumBlue@LightBlue@g' -i tcltk/tkconq.tcl

From 0a12c4bc2a5ed269d07d036a1fcab821d1f484be Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Tue, 29 Aug 2017 20:34:52 +0200
Subject: [PATCH 2943/3246] mesos: remove myself from maintainers

---
 pkgs/applications/networking/cluster/mesos/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 65758fca600..4c9753c1aac 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -247,7 +247,7 @@ in stdenv.mkDerivation rec {
     homepage    = "http://mesos.apache.org";
     license     = licenses.asl20;
     description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
-    maintainers = with maintainers; [ cstrahan kevincox offline rushmorem ];
+    maintainers = with maintainers; [ cstrahan kevincox offline ];
     platforms   = platforms.linux;
   };
 }

From a3111b8a7764fde97bc0f0dc60735f0437a9d4b1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 29 Aug 2017 20:35:38 +0200
Subject: [PATCH 2944/3246] xmacro: 0.3pre20000911 -> 0.4.6; switch upstream

---
 pkgs/tools/X11/xmacro/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
index 758bf1729b1..e986b46aa48 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -1,21 +1,15 @@
 { stdenv, fetchurl, libX11, libXtst, xextproto, libXi, inputproto }:
 
-stdenv.mkDerivation {
-  name = "xmacro-0.3pre20000911";
+stdenv.mkDerivation rec {
+  name = "xmacro-${version}";
+  version = "0.4.6";
 
   src = fetchurl {
-    url = mirror://sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz;
-    sha256 = "04gzgxhp8bx98zrcvmsm7mn72r9g9588skbf64cqvkp4yz6kfqhb";
+    url = "http://download.sarine.nl/xmacro/${name}.tar.gz";
+    sha256 = "1p9jljxyn4j6piljiyi2xv6f8jhjbzhabprp8p0qmqxaxgdipi61";
   };
 
-  preBuild = ''
-    sed -e 's/-pedantic//g' -i Makefile
-    sed -e 's/iostream[.]h/iostream/' -i *.cpp
-    sed -e 's/iomanip[.]h/iomanip/' -i *.cpp
-    sed -e '1iusing namespace std;' -i *.cpp
-  '';
-
-  preInstall = "echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
+  preInstall = "echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
 
   buildInputs = [ libX11 libXtst xextproto libXi inputproto ];
 

From 16fb651c039af3f94cdde384e7bb264d263290d2 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Tue, 29 Aug 2017 20:37:59 +0200
Subject: [PATCH 2945/3246] marathon: remove myself from maintainers

---
 pkgs/applications/networking/cluster/marathon/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 6bceeefc37a..49cac6d5063 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = https://mesosphere.github.io/marathon;
     description = "Cluster-wide init and control system for services in cgroups or Docker containers";
     license = licenses.asl20;
-    maintainers = with maintainers; [ rushmorem kamilchm kevincox pradeepchhetri ];
+    maintainers = with maintainers; [ kamilchm kevincox pradeepchhetri ];
     platforms = platforms.linux;
   };
 }

From 43732d8bc0f8cf4ece86ad67166e27b6e1ffbf51 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Tue, 29 Aug 2017 20:43:54 +0200
Subject: [PATCH 2946/3246] nomad: 0.6.0 -> 0.6.2

---
 pkgs/applications/networking/cluster/nomad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index f607bd9a614..e39bc59709e 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "nomad-${version}";
-  version = "0.6.0";
+  version = "0.6.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "nomad";
     inherit rev;
-    sha256 = "1qvpcf2hwrx280qk8gl7sfl23y44k8z7c2vwi0gnzx8vqh0l8ywm";
+    sha256 = "12bxqn7yldri5cwyxybd1lwg4c66mxd7g9syf54va5788c0hj8ij";
   };
 
   meta = with stdenv.lib; {

From c8f2e3f95f870cb702bf76256d7213fc82309816 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 29 Aug 2017 13:48:09 -0500
Subject: [PATCH 2947/3246] cvc3: Add gcc6 patch from Gentoo.

https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-mathematics/cvc3/files/cvc3-2.4.1-gccv6-fix.patch
---
 .../logic/cvc3/cvc3-2.4.1-gccv6-fix.patch     | 76 +++++++++++++++++++
 .../science/logic/cvc3/default.nix            |  2 +
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch

diff --git a/pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch b/pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch
new file mode 100644
index 00000000000..1fb3516b8c2
--- /dev/null
+++ b/pkgs/applications/science/logic/cvc3/cvc3-2.4.1-gccv6-fix.patch
@@ -0,0 +1,76 @@
+commit 4eb28b907e89be05d92eb704115f821b9b848e60
+Author: Matthew Dawson <matthew@mjdsystems.ca>
+Date:   Sun Oct 16 22:06:03 2016 -0400
+
+    Fix gcc v6 compile failures.
+    
+     * Use std::hash<const char*> over std::hash<char *>, as throwing away the const is not allowed.
+     * Use Hash::hash by default in CDMap over std::hash, to get Hash::hash<CVC3::expr>
+
+diff --git a/src/expr/expr_value.cpp b/src/expr/expr_value.cpp
+index 0c85ff6..e4dd251 100644
+--- a/src/expr/expr_value.cpp
++++ b/src/expr/expr_value.cpp
+@@ -29,7 +29,7 @@ namespace CVC3 {
+ // Class ExprValue static members
+ ////////////////////////////////////////////////////////////////////////
+ 
+-std::hash<char*> ExprValue::s_charHash;
++std::hash<const char*> ExprValue::s_charHash;
+ std::hash<long int> ExprValue::s_intHash;
+ 
+ ////////////////////////////////////////////////////////////////////////
+diff --git a/src/include/cdmap.h b/src/include/cdmap.h
+index faf682a..c3b094c 100644
+--- a/src/include/cdmap.h
++++ b/src/include/cdmap.h
+@@ -43,9 +43,9 @@ namespace CVC3 {
+ // Auxiliary class: almost the same as CDO (see cdo.h), but on
+ // setNull() call it erases itself from the map.
+ 
+-template <class Key, class Data, class HashFcn = std::hash<Key> > class CDMap;
++template <class Key, class Data, class HashFcn = Hash::hash<Key> > class CDMap;
+ 
+-template <class Key, class Data, class HashFcn = std::hash<Key> >
++template <class Key, class Data, class HashFcn = Hash::hash<Key> >
+ class CDOmap :public ContextObj {
+   Key d_key;
+   Data d_data;
+diff --git a/src/include/expr_hash.h b/src/include/expr_hash.h
+index b2107d7..baa2eab 100644
+--- a/src/include/expr_hash.h
++++ b/src/include/expr_hash.h
+@@ -20,7 +20,6 @@
+  * hash_set over Expr class.
+  */
+ /*****************************************************************************/
+-
+ #ifndef _cvc3__expr_h_
+ #include "expr.h"
+ #endif
+diff --git a/src/include/expr_value.h b/src/include/expr_value.h
+index 95102b2..f53aa4d 100644
+--- a/src/include/expr_value.h
++++ b/src/include/expr_value.h
+@@ -179,7 +179,7 @@ protected:
+   // Static hash functions.  They don't depend on the context
+   // (ExprManager and such), so it is still thread-safe to have them
+   // static.
+-  static std::hash<char*> s_charHash;
++  static std::hash<const char*> s_charHash;
+   static std::hash<long int> s_intHash;
+ 
+   static size_t pointerHash(void* p) { return s_intHash((long int)p); }
+diff --git a/src/theory_core/theory_core.cpp b/src/theory_core/theory_core.cpp
+index df5289f..37ccab9 100644
+--- a/src/theory_core/theory_core.cpp
++++ b/src/theory_core/theory_core.cpp
+@@ -710,7 +710,7 @@ TheoryCore::TheoryCore(ContextManager* cm,
+     //    d_termTheorems(cm->getCurrentContext()),
+     d_predicates(cm->getCurrentContext()),
+     d_solver(NULL),
+-    d_simplifyInPlace(false),
++    d_simplifyInPlace(NULL),
+     d_currentRecursiveSimplifier(NULL),
+     d_resourceLimit(0),
+     d_timeBase(0),
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix
index 82fad1134bc..703ce6fd508 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/pkgs/applications/science/logic/cvc3/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp flex bison perl ];
 
+  patches = [ ./cvc3-2.4.1-gccv6-fix.patch ];
+
   preConfigure = ''
     sed -e "s@ /bin/bash@bash@g" -i Makefile.std
     find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';'

From 438a5c7f9869525ebc06121579d54bcc8849121e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 May 2017 08:53:32 -0500
Subject: [PATCH 2948/3246] armagetronad: 0.2.8.3.3 -> 0.2.8.3.4

---
 pkgs/games/armagetronad/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index d24833a31be..21f545100b3 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -2,15 +2,15 @@
 
 let
   versionMajor = "0.2.8";
-  versionMinor = "3.3";
+  versionMinor = "3.4";
   version = "${versionMajor}.${versionMinor}";
 in
 
 stdenv.mkDerivation {
   name = "armagetron-${version}";
   src = fetchurl {
-    url = "https://launchpad.net/armagetronad/${versionMajor}/0.2.8.3.x/+download/armagetronad-${version}.src.tar.bz2";
-    sha256 = "1s55irhg60fpmhy8wwxpdq7c45r1mqch6zpicyb2wf9ln60xgwnx";
+    url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2";
+    sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3";
   };
 
   NIX_LDFLAGS = [ "-lSDL_image" ];

From 1c44981d1982194d2c5aa31b12c582f74425603a Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Tue, 29 Aug 2017 15:04:46 -0400
Subject: [PATCH 2949/3246] irrlicht3843: Removed unused derivation

supertuxcart includes its own version of irrlicht so this is no longer
needed.
---
 .../irrlicht/irrlicht-1.8.1-mesa-10.x.patch   | 40 ----------------
 .../libraries/irrlicht/irrlicht3843.nix       | 46 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 87 deletions(-)
 delete mode 100644 pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch
 delete mode 100644 pkgs/development/libraries/irrlicht/irrlicht3843.nix

diff --git a/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch b/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch
deleted file mode 100644
index e90ff36443a..00000000000
--- a/pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
-From: hiker <henrichsjoerg@mgail.com>
-Date: Wed, 26 Feb 2014 11:13:03 +1100
-Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
- problems.
-
---- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
-+++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
-@@ -21,6 +21,7 @@
- 	#endif
- 	#include <GL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 		#include "glext.h"
- 	#endif
- 	#include "wglext.h"
-@@ -35,6 +36,7 @@
- 	#endif
- 	#include <OpenGL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 		#include "glext.h"
- 	#endif
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-@@ -48,6 +50,7 @@
- 	#define NO_SDL_GLEXT
- 	#include <SDL/SDL_video.h>
- 	#include <SDL/SDL_opengl.h>
-+	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 	#include "glext.h"
- #else
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-@@ -60,6 +63,7 @@
- 	#include <GL/gl.h>
- 	#include <GL/glx.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- 	#include "glext.h"
- 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
- 	#include "glxext.h"
diff --git a/pkgs/development/libraries/irrlicht/irrlicht3843.nix b/pkgs/development/libraries/irrlicht/irrlicht3843.nix
deleted file mode 100644
index c6e5b35f9e2..00000000000
--- a/pkgs/development/libraries/irrlicht/irrlicht3843.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }:
-
-
-stdenv.mkDerivation rec {
-  # Version 3843 is required for supertuxkart
-  name = "irrlicht-1.8-svn-3843";
-
-  src = fetchsvn {
-    url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk;
-    rev = 3843;
-    sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
-  };
-
-  patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
-
-  postPatch = ''
-    sed -i /stdcall-alias/d source/Irrlicht/Makefile
-  '';
-
-  preConfigure = ''
-    cd source/Irrlicht
-  '';
-
-  buildPhase = ''
-    make sharedlib NDEBUG=1
-  '';
-
-  preInstall = ''
-    sed -i s,/usr/local/lib,$out/lib, Makefile
-    mkdir -p $out/lib
-  '';
-
-  postInstall = ''
-    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8
-    ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so
-  '';
-
-  buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
-
-  meta = {
-    homepage = http://irrlicht.sourceforge.net/;
-    license = stdenv.lib.licenses.zlib;
-    description = "Open source high performance realtime 3D engine written in C++";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ad587a4483..bbfdbdb24ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8428,7 +8428,6 @@ with pkgs;
   ip2location-c = callPackage ../development/libraries/ip2location-c { };
 
   irrlicht = callPackage ../development/libraries/irrlicht { };
-  irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { };
 
   isocodes = callPackage ../development/libraries/iso-codes { };
 

From 371a2ee70727977b58136e93e5ca61228b03f866 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 29 Aug 2017 21:17:00 +0200
Subject: [PATCH 2950/3246] obliv-c: 0.0pre20161001 -> 0.0pre20170827

---
 pkgs/development/compilers/obliv-c/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
index f1f9a38a198..1d9d973572c 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/pkgs/development/compilers/obliv-c/default.nix
@@ -1,15 +1,20 @@
 {stdenv, fetchurl, ocaml, libgcrypt, fetchFromGitHub, ocamlPackages, perl}:
 stdenv.mkDerivation rec {
   name = "obliv-c-${version}";
-  version = "0.0pre20161001";
+  version = "0.0pre20170827";
   buildInputs = [ ocaml ocamlPackages.findlib perl ];
   propagatedBuildInputs = [ libgcrypt ];
   src = fetchFromGitHub {
     owner = "samee";
     repo = "obliv-c";
-    rev = "32d71fb46983aded604045e8cda7874d8fb160a2";
-    sha256 = "05bicvalsfabngvf41q02bcyzkibmyihj7naqd53kdq75xa1yf37";
+    rev = "9a6be5a5f44d341bc357055e11922f6a4c4c3b65";
+    sha256 = "0jz2ayadx62zv2b5ji947bkvw63axl4a2q70lwli86zgmcl390gf";
   };
+
+  preBuild = ''
+    patchShebangs .
+  '';
+
   preInstall = ''
     mkdir -p "$out/bin"
     cp bin/* "$out/bin"
@@ -23,6 +28,7 @@ stdenv.mkDerivation rec {
     gcc $(ar t _build/libobliv.a | sed -e 's@^@_build/@') --shared -o _build/libobliv.so
     cp _build/lib*.a _build/lib*.so* "$out/lib"
   '';
+
   meta = {
     inherit version;
     description = ''A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs'';

From 780ceffd51b4bed35249fb9f6d6fd00e064b0701 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 29 Aug 2017 14:13:26 -0500
Subject: [PATCH 2951/3246] pies: 1.2 -> 1.3

Also, disable format hardening or build fails.
---
 pkgs/servers/pies/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix
index 56c7da5caed..2251d44ff38 100644
--- a/pkgs/servers/pies/default.nix
+++ b/pkgs/servers/pies/default.nix
@@ -1,13 +1,15 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "pies-1.2";
+  name = "pies-1.3";
 
   src = fetchurl {
     url = "mirror://gnu/pies/${name}.tar.bz2";
-    sha256 = "18w0dbg77i56cx1bwa789w0qi3l4xkkbascxcv2b6gbm0zmjg1g6";
+    sha256 = "12r7rjjyibjdj08dvwbp0iflfpzl4s0zhn6cr6zj3hwf9gbzgl1g";
   };
 
+  hardeningDisable = [ "format" ];
+
   doCheck = true;
 
   meta = {

From cdff68e113a96361883cd58bbc4c0bf6f721ae03 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 29 Aug 2017 20:27:27 +0200
Subject: [PATCH 2952/3246] electrum: 2.9.0 -> 2.9.3

---
 pkgs/applications/misc/electrum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 4aaa5f1ff67..b0f821a3aac 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.9.0";
+  version = "2.9.3";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "1lida5phq0c1lxnk75d9jsps0vw4zy7saaxhv0q4kv76rk2b3fhv";
+    sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2";
   };
 
   propagatedBuildInputs = with python2Packages; [

From 5c730085f7e425b53322bf106626e6c916cc8f67 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 29 Aug 2017 21:18:46 +0200
Subject: [PATCH 2953/3246] mksh: 55 -> 56b

---
 pkgs/shells/mksh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 23c7e2cc3a5..96939230983 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "mksh-${version}";
-  version = "55";
+  version = "56b";
 
   src = fetchurl {
     urls = [
       "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
       "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
     ];
-    sha256 = "0mssqd2wp3cs9x01v6g66iy3ymdxagbyw2c0v597vnc1l6s2rm6f";
+    sha256 = "0zwsikj0gvbg693xydgmhq19hz7m5bics1w9w7j86r95xi779v20";
   };
 
   buildPhase = ''sh ./Build.sh -r -c lto'';

From 4bf96227493327f9075aad8a0d2c134b2bc58193 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Tue, 29 Aug 2017 15:06:49 -0400
Subject: [PATCH 2954/3246] irrlicht: 1.8-svn-5104 -> 1.8.4

---
 pkgs/development/libraries/irrlicht/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index bc3e1a20abb..336f446cdf1 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -1,15 +1,13 @@
-{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }:
+{ stdenv, fetchzip, mesa, unzip, libXrandr, libX11, libXxf86vm }:
 
 
 stdenv.mkDerivation rec {
-  name = "irrlicht-${version}-svn-${revision}";
-  version = "1.8";
-  revision = "5104"; # newest revision as of 05-16-15
+  name = "irrlicht-${version}";
+  version = "1.8.4";
 
-  src = fetchsvn {
-    url = "https://svn.code.sf.net/p/irrlicht/code/branches/releases/${version}"; # get 1.8 release (same regardless of rev)
-    rev = "${revision}";
-    sha256 = "18xvlrjf113mphf29iy24hmrkh7xff6j9cz0chrxjqbr9xk9h1yq";
+  src = fetchzip {
+    url = "mirror://sourceforge/irrlicht/${name}.zip";
+    sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
   };
 
   preConfigure = ''

From 429044453fd2e20046a6e440a6729ec982f1ecea Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 29 Aug 2017 21:30:55 +0200
Subject: [PATCH 2955/3246] dnscrypt-wrapper: 0.2.2 -> 0.3

---
 pkgs/tools/networking/dnscrypt-wrapper/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index 9e7167989e4..1282c72452f 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -2,15 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-wrapper-${version}";
-  version = "0.2.2";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "Cofyc";
     repo = "dnscrypt-wrapper";
     rev = "v${version}";
-    sha256 = "0ip205safbpkmk1z7qf3hshqlc2q2zwhsm3i705m0y7rxc4200ms";
+    sha256 = "0wnkgn0ajx1qmfyb264jvpqxlbravdcq4m485iaa3wjp82g8xlca";
   };
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ libsodium libevent ];
 

From f2d1abf3661de0a98ed6fa767ac47bf4d54093b7 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 29 Aug 2017 21:34:14 +0200
Subject: [PATCH 2956/3246] cppcheck: 1.79 -> 1.80

---
 pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index ce9ca76a43b..97bd0d6e3df 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
-  version = "1.79";
+  version = "1.80";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "0vgh4zx191d7mcmiilkhcbd9jkspfkppl7l4y5451walvs9vd19b";
+    sha256 = "1yx06yhkqlv9849ns7p97mj09gm9j7xc51q7yvzkk8ldvx4d4h88";
   };
 
   buildInputs = [ pcre ];

From 82f835d2ee5203e6dce55b614d8709fee60e4cdb Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Tue, 29 Aug 2017 21:09:37 +0200
Subject: [PATCH 2957/3246] enchive: init at 3.3

---
 pkgs/tools/security/enchive/default.nix | 27 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/security/enchive/default.nix

diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix
new file mode 100644
index 00000000000..d045450f948
--- /dev/null
+++ b/pkgs/tools/security/enchive/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "enchive-${version}";
+  version = "3.3";
+  src = fetchFromGitHub {
+    owner = "skeeto";
+    repo = "enchive";
+    rev = version;
+    sha256 = "0i3b0v5dqz56m5ppzm3332yxkw17dxs2zpvf48769ljgjy74irfl";
+  };
+
+  makeFlags = ["PREFIX=$(out)"];
+
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp/
+    cp -v "$src/enchive-mode.el" "$out/share/emacs/site-lisp/"
+  '';
+
+  meta = {
+    description = "Encrypted personal archives";
+    homepage = https://github.com/skeeto/enchive;
+    license = stdenv.lib.licenses.unlicense;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94b1c68804c..4d657d3bce6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -565,6 +565,8 @@ with pkgs;
     gconf = gnome2.GConf;
  };
 
+ enchive = callPackage ../tools/security/enchive { };
+
   enpass = callPackage ../tools/security/enpass { };
 
   ezstream = callPackage ../tools/audio/ezstream { };

From 3d41279b768f0d7c5a6f7d071337b0dafeedf753 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 29 Aug 2017 15:15:42 +0200
Subject: [PATCH 2958/3246] qgis: 2.18.10 -> 2.18.12

---
 pkgs/applications/gis/qgis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 10c2ab9ebf9..a3ea89e2668 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.18.10";
+  name = "qgis-2.18.12";
 
   buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "1vrzxhnpzd75iia4xmhbxy90x0wlvj2w4210f0r8203hd2m4sxdj";
+    sha256 = "0fh256j2d2kh9hjx6q1zdzxfqsgifg9dvgk214sv6zxzhsn0kxvs";
   };
 
   cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";

From 8b4392094f0abc96dfe5ee01c1328a4faf0b9321 Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Tue, 29 Aug 2017 21:45:08 +0200
Subject: [PATCH 2959/3246] jackmix: don't fail on deprecated definitions

---
 pkgs/applications/audio/jackmix/default.nix    |  4 ++--
 pkgs/applications/audio/jackmix/no_error.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/audio/jackmix/no_error.patch

diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index e9e3fd53e54..f0cd3bd0427 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j";
   };
 
+  patches = [ ./no_error.patch ];
+
   buildInputs = [
     pkgconfig
     scons
@@ -31,5 +33,3 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
-
-
diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/applications/audio/jackmix/no_error.patch
new file mode 100644
index 00000000000..d1a714ded9c
--- /dev/null
+++ b/pkgs/applications/audio/jackmix/no_error.patch
@@ -0,0 +1,13 @@
+diff --git a/SConstruct b/SConstruct
+index 4290fa5..0a7a679 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -16,7 +16,7 @@ env = Environment(
+ env.Replace( LIBS="" )
+ env.Replace( LIBPATH="" )
+
+-env.MergeFlags( ['-Wall', '-Werror', '-g', '-fpic'] )
++env.MergeFlags( ['-g', '-fpic'] )
+
+ tests = { }
+ tests.update( env['PKGCONFIG_TESTS'] )

From 4bca6eca0632a0dc33bdd3505f4944d55288eb7d Mon Sep 17 00:00:00 2001
From: patternspandemic <patternspandemic@live.com>
Date: Tue, 29 Aug 2017 11:26:24 -0700
Subject: [PATCH 2960/3246] ponyc: 0.18.0 -> 0.18.1

---
 pkgs/development/compilers/ponyc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index f605f31c06d..627672a97d0 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "0favj1895fp5j5i23cmjn9wvrrlchr2dmc18grlvbjr2cg2c76mg";
+    sha256 = "1yjrmi8xigh1n95d5q98m2jc4z45m5dwkah4hyi9dyibbfiiwix3";
   };
 
   buildInputs = [ llvm makeWrapper which ];
@@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
     homepage = http://www.ponylang.org;
     license = licenses.bsd2;
-    maintainers = with maintainers; [ doublec kamilchm ];
+    maintainers = with maintainers; [ doublec kamilchm patternspandemic ];
     platforms = subtractLists platforms.i686 platforms.unix;
   };
 })

From 41aaeef570e4b6c009f3a84abf6577582cf91deb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 29 Aug 2017 17:43:50 -0400
Subject: [PATCH 2961/3246] shallot: init at 0.0.3

---
 pkgs/tools/misc/shallot/default.nix | 32 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/shallot/default.nix

diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix
new file mode 100644
index 00000000000..279de83e817
--- /dev/null
+++ b/pkgs/tools/misc/shallot/default.nix
@@ -0,0 +1,32 @@
+{ 
+  stdenv, fetchFromGitHub,
+  openssl
+}:
+
+let 
+  version = "0.0.3";
+in stdenv.mkDerivation {
+  name = "shallot-${version}";
+
+  src = fetchFromGitHub {
+    owner = "katmagic";
+    repo = "Shallot";
+    rev = "shallot-${version}";
+    sha256 = "0cjafdxvjkwb9vyifhh11mw0la7yfqswqwqmrfp1fy9jl7m0il9k";
+  };
+
+  buildInputs = [ openssl ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ./shallot $out/bin/
+  '';
+
+  meta = {
+    description = "Shallot allows you to create customized .onion addresses for your hidden service";
+
+    license = stdenv.lib.licenses.mit;
+    homepage = https://github.com/katmagic/Shallot;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94b1c68804c..626e96f78cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7303,6 +7303,8 @@ with pkgs;
   sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
   simpleBuildTool = sbt;
 
+  shallot = callPackage ../tools/misc/shallot { };
+
   shards = callPackage ../development/tools/build-managers/shards { };
 
   shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck;

From 4b9a5f9041f4707724665e21d904369a06018df4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 29 Aug 2017 17:52:41 -0400
Subject: [PATCH 2962/3246] atom: 1.19.3 -> 1.19.4

---
 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 e44d919ece6..e3e889abd87 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.19.3";
+  version = "1.19.4";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0cms0zgxlzrm0sdqm97qdvrmvjcdcrbqi3bw66xabgx365pkry7z";
+    sha256 = "13k98ghz943yd5lqsbsvp1qy79lhgi3vww97qhqcbmmh15n0gsb0";
     name = "${name}.deb";
   };
 

From 77e05e2c133633bbf7625f37d6cb1a4a08fda874 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 29 Aug 2017 17:54:11 -0400
Subject: [PATCH 2963/3246] zsh: 5.4.1 -> 5.4.2

---
 pkgs/shells/zsh/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 50481dd941b..4b2b79a2104 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, ncurses, pcre }:
 
 let
-
-  version = "5.4.1";
+  version = "5.4.2";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "17qg4iqhvkxsmk1p04brkjq20vb7zx6d8qx1r2q8v6cy4qvqjbjr";
+    sha256 = "1703g6vfz2vpb866wgl71nvg0ynjq0zvrjwkqbv7v6q3606jbmn3";
   };
 
 in
@@ -16,7 +15,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "1qhw00y0gnr66bil48hj4wjm0cbjxfdkz5hyb82garp8r8rbhiy4";
+    sha256 = "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm";
   };
 
   buildInputs = [ ncurses pcre ];

From 012b6bcbc1281141fe215b3d87a8395208a4f1b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2017 23:16:19 +0100
Subject: [PATCH 2964/3246] pies: look in /etc for configuration

---
 pkgs/servers/pies/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix
index 2251d44ff38..c472f767d52 100644
--- a/pkgs/servers/pies/default.nix
+++ b/pkgs/servers/pies/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "12r7rjjyibjdj08dvwbp0iflfpzl4s0zhn6cr6zj3hwf9gbzgl1g";
   };
 
+  configureFlags = ["--sysconfdir=/etc"];
+
   hardeningDisable = [ "format" ];
 
   doCheck = true;

From 9ad7c642810b008b3d1eaab3b1fe14b4413d4831 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 29 Aug 2017 09:54:33 -0500
Subject: [PATCH 2965/3246] kgraphviewer: 2.1.90 unstable -> 2.2.0 stable

---
 pkgs/applications/graphics/kgraphviewer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index ea0fe51cc85..6c2be6ea73c 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "kgraphviewer-${version}";
-  version = "2.1.90";
+  version = "2.2.0";
 
   src = fetchurl {
-    url = "mirror://kde/unstable/kgraphviewer/${version}/src/${name}.tar.xz";
-    sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs";
+    url = "mirror://kde/stable/kgraphviewer/${version}/src/${name}.tar.xz";
+    sha256 = "1vs5x539mx26xqdljwzkh2bj7s3ydw4cb1wm9nlhgs18siw4gjl5";
   };
 
   buildInputs = [ kdelibs4 boost graphviz ];

From 1a16760bf03f3160b672b1208172e101a2c6bf7a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 29 Aug 2017 09:54:47 -0500
Subject: [PATCH 2966/3246] massif-visualizer: 0.3.90 unstable -> 0.4.0 stable

---
 .../tools/analysis/massif-visualizer/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix
index 79c826c08fe..f3195a23f88 100644
--- a/pkgs/development/tools/analysis/massif-visualizer/default.nix
+++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "massif-visualizer-${version}";
-  version = "0.3.90";
+  version = "0.4.0";
 
   src = fetchurl {
-    url = "mirror://kde/unstable/massif-visualizer/${version}/src/${name}.tar.xz";
-    sha256 = "9940fa90137ca5eef08b9ec220825fadbf03db423a670a2c7fe3edab271d9922";
+    url = "mirror://kde/stable/massif-visualizer/${version}/src/${name}.tar.xz";
+    sha256 = "0yawzp5lw7ryjcpqkhz70q4hc5hwq5imq5lgqnwgss057zcln7z8";
   };
 
   nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];

From 5172dfd2d1e16f2f3d07787d9931baa20110613b Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 29 Aug 2017 17:27:59 +0100
Subject: [PATCH 2967/3246] swc: remove setuid from install script

---
 pkgs/development/libraries/swc/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/swc/default.nix b/pkgs/development/libraries/swc/default.nix
index 48e1524e36f..bbc3aa20dd6 100644
--- a/pkgs/development/libraries/swc/default.nix
+++ b/pkgs/development/libraries/swc/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ wld wayland xwayland fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ];
 
+  prePatch = ''
+    substituteInPlace launch/local.mk --replace 4755 755
+  '';
+
   makeFlags = "PREFIX=$(out)";
   installPhase = "PREFIX=$out make install";
 

From 322af6d80e2c81702c03fcf3a93508b663eafd9f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 29 Aug 2017 16:44:08 +0100
Subject: [PATCH 2968/3246] polygraph: 4.3.2 -> 4.11.0

---
 pkgs/tools/networking/polygraph/default.nix   |  8 +-
 .../networking/polygraph/fix_build.patch      | 77 -------------------
 2 files changed, 3 insertions(+), 82 deletions(-)
 delete mode 100644 pkgs/tools/networking/polygraph/fix_build.patch

diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix
index 09357e87da0..46680ab47af 100644
--- a/pkgs/tools/networking/polygraph/default.nix
+++ b/pkgs/tools/networking/polygraph/default.nix
@@ -1,21 +1,19 @@
 { stdenv, fetchurl, openssl, zlib, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "polygraph-4.3.2";
+  name = "polygraph-4.11.0";
 
   src = fetchurl {
     url = "http://www.web-polygraph.org/downloads/srcs/${name}-src.tgz";
-    sha256 = "1fv9jpcicfsgsmghkykqif6l6w7nwvk5xbdmpv72jbrwzx44845h";
+    sha256 = "1ii60yl3p89qawvl19sd1bkpkw39fz8kpvmc3cawa32nxzbm9pbs";
   };
 
   buildInputs = [ openssl zlib ncurses ];
   
-  patches = [ ./fix_build.patch ];
-
   meta = with stdenv.lib; {
     homepage = http://www.web-polygraph.org;
     description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries";
     platforms = platforms.linux;
     maintainers = [ maintainers.lethalman ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/networking/polygraph/fix_build.patch b/pkgs/tools/networking/polygraph/fix_build.patch
deleted file mode 100644
index 96832d72037..00000000000
--- a/pkgs/tools/networking/polygraph/fix_build.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: Fix ftbfs with GCC-4.7.
-Author: Mònica Ramírez Arceda <monica@debian.org>
-Bug-Debian: http://bugs.debian.org/667326
-Last-Update: 2012-05-11
-
---- a/src/xstd/Heap.h
-+++ b/src/xstd/Heap.h
-@@ -23,7 +23,7 @@
- 		const Item &top() const { return this->theItems[1]; }
- 		Item &at(int idx) { return this->theItems[idx+1]; }
- 
--		void add(Item v) { append(v); floatUp(++theCnt); }
-+		void add(Item v) { this->append(v); floatUp(++theCnt); }
- 		void skip() { this->theItems[1] = this->theItems[theCnt--]; this->theCount--; sinkDown(1); }
- 		Item shift() { const Item v = this->theItems[1]; skip(); return v; }
- 
---- a/src/xstd/Ring.h
-+++ b/src/xstd/Ring.h
-@@ -22,11 +22,11 @@
- 		int size() const { return Array<Item>::size(); }
- 		bool empty() const { return this->theInOff <= this->theOutOff; }
- 		bool full() const { return count() >= this->theCapacity; }
--		const Item &top(int off = 0) const { return item((this->theOutOff+off) % this->theCapacity); }
-+		const Item &top(int off = 0) const { return this->item((this->theOutOff+off) % this->theCapacity); }
- 
--		Item &top(int off = 0) { return item((this->theOutOff+off) % this->theCapacity); }
--		void enqueue(Item i) { Assert(!full()); item(this->theInOff++ % this->theCapacity) = i; check(); }
--		Item dequeue() { return item(this->theOutOff++ % this->theCapacity); }
-+		Item &top(int off = 0) { return this->item((this->theOutOff+off) % this->theCapacity); }
-+		void enqueue(Item i) { Assert(!full()); this->item(this->theInOff++ % this->theCapacity) = i; check(); }
-+		Item dequeue() { return this->item(this->theOutOff++ % this->theCapacity); }
- 
- 		void reset() { this->theInOff = this->theOutOff = 0; }
- 		inline void resize(int aCap);
---- a/src/runtime/StatPhase.cc
-+++ b/src/runtime/StatPhase.cc
-@@ -413,12 +413,12 @@
- 						break;
- 				}
- 		} else {
--			static CompoundXactInfo &compound = *CompoundXactInfo::Create();
--			compound.exchanges = 1;
--			compound.reqSize = reqSize;
--			compound.repSize = repSize;
--			compound.lifeTime = repTime;
--			compound.record(rec.theIsolated);
-+			static CompoundXactInfo &compound2 = *CompoundXactInfo::Create();
-+			compound2.exchanges = 1;
-+			compound2.reqSize = reqSize;
-+			compound2.repSize = repSize;
-+			compound2.lifeTime = repTime;
-+			compound2.record(rec.theIsolated);
- 		}
- 
- 		if (x->cookiesSent() > 0)
---- a/src/cache/CacheEntryHash.cc
-+++ b/src/cache/CacheEntryHash.cc
-@@ -14,7 +14,7 @@
- 
- CacheEntryHash::CacheEntryHash(int aCapacity): theCount(0) {
- 	theCapacity = (aCapacity + aCapacity/3 + 7) | 1;
--	theIndex = new (CacheEntry*[theCapacity]);
-+	theIndex = new (CacheEntry*[this->theCapacity]);
- 	memset(theIndex, 0, sizeof(CacheEntry*)*theCapacity);
- }
- 
---- a/src/tools/IntIntHash.cc
-+++ b/src/tools/IntIntHash.cc
-@@ -13,7 +13,7 @@
- 
- IntIntHash::IntIntHash(int aCapacity): theHashCap(0) {
- 	theHashCap = (aCapacity + aCapacity/3 + 7) | 1;
--	theIndex = new (IntIntHashItem*[theHashCap]);
-+	theIndex = new (IntIntHashItem*[this->theHashCap]);
- 	memset(theIndex, 0, sizeof(IntIntHashItem*)*theHashCap);
- }
- 
\ No newline at end of file

From 322d0c562cdcc147b998292586e34695c7fe6f30 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Tue, 22 Aug 2017 10:32:13 +0200
Subject: [PATCH 2969/3246] auto-upgrade: add proxy support

Add the proxy variables so that auto upgrade works behind a proxy.
---
 nixos/modules/installer/tools/auto-upgrade.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
index a4d4f16d1d9..7b756b70e2f 100644
--- a/nixos/modules/installer/tools/auto-upgrade.nix
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -76,7 +76,7 @@ let cfg = config.system.autoUpgrade; in
       environment = config.nix.envVars //
         { inherit (config.environment.sessionVariables) NIX_PATH;
           HOME = "/root";
-        };
+        } // config.networking.proxy.envVars;
 
       path = [ pkgs.gnutar pkgs.xz.bin config.nix.package.out ];
 

From 88dcd4d5143ebf5c16e72e21e332e86d1934d59c Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 28 Aug 2017 18:12:03 +0200
Subject: [PATCH 2970/3246] libipfix: init at 110209

---
 pkgs/development/libraries/libipfix/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/libipfix/default.nix

diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix
new file mode 100644
index 00000000000..eca1730ca7c
--- /dev/null
+++ b/pkgs/development/libraries/libipfix/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libipfix-${version}";
+  version = "110209";
+  src = fetchurl {
+    url = " http://sourceforge.net/projects/libipfix/files/libipfix/libipfix_110209.tgz";
+    sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6";
+  };
+  meta = with stdenv.lib; {
+    homepage = http://libipfix.sourceforge.net/;
+    description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF.";
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ lewo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4eb820a6390..481a35f4550 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2995,6 +2995,8 @@ with pkgs;
 
   libfann = callPackage ../development/libraries/libfann { };
 
+  libipfix = callPackage ../development/libraries/libipfix { };
+
   libircclient = callPackage ../development/libraries/libircclient { };
 
   libite = callPackage ../development/libraries/libite { };

From 5cf45626eb8cb0df5c236b752552ae561ad7f034 Mon Sep 17 00:00:00 2001
From: Steven Conaway <steven.conaway@icloud.com>
Date: Tue, 29 Aug 2017 16:42:44 -0700
Subject: [PATCH 2971/3246] plex: 1.5.7.4016 -> 1.7.5.4035 (#28514)

---
 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 a1d5ce4147f..0e5cb3e697f 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.5.7.4016";
-    vsnHash = "25d94bad9";
-    sha256 = "0lc1shlyg7rvzfpjm9kww7rva33b3bip2bms64a4d5nb3lj4wilh";
+    version = "1.7.5.4035";
+    vsnHash = "313f93718";
+    sha256 = "89b8585e561046a8422d520ebcdae784f5dc3c895aac8d313c435cc6b58795b8";
   };
 
 in stdenv.mkDerivation rec {

From 64994b363804051e3d4b8f7916a5bc03a45b9e9a Mon Sep 17 00:00:00 2001
From: Richard Yang <rdjy@users.noreply.github.com>
Date: Wed, 30 Aug 2017 09:50:29 +1000
Subject: [PATCH 2972/3246] tasks/filesystems: Make sure /dev/pts/ptmx is 0666
 (#28490)

This is required for running commands likes screen and tmux, especially inside containers.

See also : https://www.kernel.org/doc/Documentation/filesystems/devpts.txt
---
 nixos/modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 3951d617f6f..1922d2924bc 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -294,7 +294,7 @@ in
       "/run" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; };
       "/dev" = { fsType = "devtmpfs"; options = [ "nosuid" "strictatime" "mode=755" "size=${config.boot.devSize}" ]; };
       "/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; };
-      "/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "gid=${toString config.ids.gids.tty}" ]; };
+      "/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "ptmxmode=0666" "gid=${toString config.ids.gids.tty}" ]; };
 
       # To hold secrets that shouldn't be written to disk (generally used for NixOps, harmless elsewhere)
       "/run/keys" = { fsType = "ramfs"; options = [ "nosuid" "nodev" "mode=750" "gid=${toString config.ids.gids.keys}" ]; };

From 07ed5ebc8eb7721dd9414b2690b2ccfcfcd6eba9 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 18 Aug 2017 15:09:51 +0000
Subject: [PATCH 2973/3246] kiwix: use default gcc

overrideCC no longer needed
---
 pkgs/applications/misc/kiwix/default.nix | 8 ++------
 pkgs/top-level/all-packages.nix          | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index b0590fdc38f..c5b75a0be55 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -29,10 +29,6 @@ let
               then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; }
               else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; };
 
-  ctpp2_ = ctpp2.override { inherit stdenv; };
-  xapian_ = xapian.override { inherit stdenv; };
-  zimlib_ = zimlib.override { inherit stdenv; };
-
   pugixml = stdenv.mkDerivation rec {
     version = "1.2";
     name = "pugixml-${version}";
@@ -67,8 +63,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    zip pkgconfig python zlib xapian_ which icu libmicrohttpd
-    lzma zimlib_ ctpp2_ aria2 wget bc libuuid makeWrapper pugixml
+    zip pkgconfig python zlib xapian which icu libmicrohttpd
+    lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml
   ];
 
   postUnpack = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 481a35f4550..8dabd68379f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14957,9 +14957,7 @@ with pkgs;
 
   kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { };
 
-  kiwix = callPackage ../applications/misc/kiwix {
-    stdenv = overrideCC stdenv gcc49;
-  };
+  kiwix = callPackage ../applications/misc/kiwix { };
 
   kmplayer = kde4.callPackage ../applications/video/kmplayer { };
 

From 4f3b8c5e7c16626966cb545c164a68a8da6ddf8d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 Aug 2017 16:51:36 -0400
Subject: [PATCH 2974/3246] evdi: 1.4.1 -> 1.4.1+git2017-06-12

---
 pkgs/os-specific/linux/evdi/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 064af708427..9cfcb55ce13 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "evdi-${version}";
-  version = "1.4.1";
+  version = "1.4.1+git2017-06-12";
 
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = "evdi";
-    rev = "v${version}";
-    sha256 = "176cq83qlmhc4c00dwfnqgd021l7s4gyj8604m5zmxbz0r5mnawv";
+    rev = "ee1c578774e62fe4b08d92750620ed3094642160";
+    sha256 = "1m3wkmw4hjpjax7rvhmpicz09d7vxcxklq797ddjg6ljvf12671b";
   };
 
   buildInputs = [ kernel libdrm ];
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2;
     homepage = http://www.displaylink.com/;
-    broken = !versionAtLeast kernel.version "3.16";
+    broken = versionOlder kernel.version "4.9";
   };
 }

From ae742fa4952a2ab799317b810e04bcac8846c56d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 29 Aug 2017 20:01:25 -0400
Subject: [PATCH 2975/3246] frandom: Remove

---
 nixos/modules/module-list.nix               |  1 -
 nixos/modules/services/security/frandom.nix | 31 -------------
 pkgs/os-specific/linux/frandom/default.nix  | 48 ---------------------
 pkgs/top-level/all-packages.nix             |  2 -
 4 files changed, 82 deletions(-)
 delete mode 100644 nixos/modules/services/security/frandom.nix
 delete mode 100644 pkgs/os-specific/linux/frandom/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dd9c3702b80..cbb15ac4f01 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -550,7 +550,6 @@
   ./services/security/fail2ban.nix
   ./services/security/fprintd.nix
   ./services/security/fprot.nix
-  ./services/security/frandom.nix
   ./services/security/haka.nix
   ./services/security/haveged.nix
   ./services/security/hologram-server.nix
diff --git a/nixos/modules/services/security/frandom.nix b/nixos/modules/services/security/frandom.nix
deleted file mode 100644
index 2d43d12e541..00000000000
--- a/nixos/modules/services/security/frandom.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{lib, config, ...}:
-
-let kernel = config.boot.kernelPackages;
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.frandom.enable = lib.mkOption {
-      default = false;
-      type = lib.types.bool;
-      description = ''
-        enable the /dev/frandom device (a very fast random number generator)
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = lib.mkIf config.services.frandom.enable {
-    boot.kernelModules = [ "frandom" ];
-    boot.extraModulePackages = [ kernel.frandom ];
-    services.udev.packages = [ kernel.frandom ];
-  };
-
-}
diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix
deleted file mode 100644
index dfdc79c2005..00000000000
--- a/pkgs/os-specific/linux/frandom/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, kernel }:
-
-let baseName = "frandom-1.1";
-in
-
-stdenv.mkDerivation rec {
-  name = "${baseName}-${kernel.version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/frandom/${baseName}.tar.gz";
-    sha256 = "15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls";
-  };
-
-  hardeningDisable = [ "pic" ];
-
-  preBuild = ''
-    kernelVersion=${kernel.modDirVersion}
-    substituteInPlace Makefile \
-      --replace "\$(shell uname -r)" "$kernelVersion" \
-      --replace "/lib/modules" "${kernel.dev}/lib/modules"
-  '';
- 
-  installPhase = ''
-    kernelVersion=${kernel.modDirVersion}
-    mkdir -p $out/lib/modules/$kernelVersion/misc
-    cp frandom.ko $out/lib/modules/$kernelVersion/misc
-
-    mkdir -p $out/lib/udev/rules.d
-    tee $out/lib/udev/rules.d/10-frandom.rules <<-EOF
-    #
-    # These are the rules for the frandom devices. In theory, we could let
-    # udev's catch-all rule create the /dev node based upon the kernel name,
-    # which gives correct result, except that the default MODE set in
-    # 50-udev.rules (0600) is too restrictive.
-    #
-    KERNEL=="[ef]random", MODE="444", OPTIONS="last_rule"
-    EOF
-  '';
-
-  buildInputs = [];
-
-  meta = {
-    description = "A very fast random number generator kernel module";
-    homepage = http://frandom.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 041bd7dd268..a3f8dfa73b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12250,8 +12250,6 @@ with pkgs;
 
     v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };
 
-    frandom = callPackage ../os-specific/linux/frandom { };
-
     fusionio-vsl = callPackage ../os-specific/linux/fusionio/vsl.nix { };
 
     lttng-modules = callPackage ../os-specific/linux/lttng-modules { };

From d4b0883ad26d4bf57e70ef17c0f78e7b43a6a174 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 31 Jul 2017 12:39:24 +0200
Subject: [PATCH 2976/3246] vm: Add trusty-updates to the packages list

---
 pkgs/build-support/vm/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index d886e9a56fa..e9310c0c516 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1687,6 +1687,10 @@ rec {
             url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2;
             sha256 = "558637eeb8e340b871653e2060effe36e064677eca4eae62d9e4138dd402a610";
           })
+          (fetchurl {
+            url = mirror://ubuntu/dists/trusty-updates/main/binary-amd64/Packages.bz2;
+            sha256 = "0hrrcx9kqszla5qkd31gjm87b7hnvjin9vvpga2skb9wl3h7ys2f";
+          })
         ];
       urlPrefix = mirror://ubuntu;
       packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];

From e2589b3ca22c93029051efcde62aa773fe3085b4 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 29 Aug 2017 20:27:04 -0400
Subject: [PATCH 2977/3246] Deduplicate some filterSource invocations

This version should have more conventional regexes that work across many
platforms and regex engines. This is an issue because up until Nix 1.11,
Nix called out to the libc regex matcher, which behaved differently on
Darwin and Linux. And in Nix 1.12, we're moving to std::regex which will
also behave differently here.

And yes, I do actually evaluate make-disk-image.nix on Darwin ;)
---
 lib/sources.nix                            |  2 ++
 nixos/lib/make-disk-image.nix              | 14 +-------------
 nixos/modules/installer/cd-dvd/channel.nix | 11 +----------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/lib/sources.nix b/lib/sources.nix
index 8f312a9db5c..0ec4c020e54 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -17,6 +17,8 @@ rec {
     (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
     # Filter out backup files.
     lib.hasSuffix "~" baseName ||
+    builtins.match "^.*\.sw[a-z]$" baseName != null ||
+
     # Filter out generates files.
     lib.hasSuffix ".o" baseName ||
     lib.hasSuffix ".so" baseName ||
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 9c91bf39225..d4b2e338c3e 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -45,19 +45,7 @@ let
     raw   = "img";
   };
 
-  # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix
-  # TODO: factor out more cleanly
-
-  # Do not include these things:
-  #   - The '.git' directory
-  #   - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)
-  #   - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)
-  filterFn = path: type: let basename = baseNameOf (toString path); in
-    if type == "directory" then basename != ".git"
-    else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null
-    else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;
-
-  nixpkgs = builtins.filterSource filterFn pkgs.path;
+  nixpkgs = lib.cleanSource pkgs.path;
 
   channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''
     mkdir -p $out
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 663ff24c81f..ddb00f174d1 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -6,16 +6,7 @@
 with lib;
 
 let
-  # Do not include these things:
-  #   - The '.git' directory
-  #   - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)
-  #   - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)
-  filterFn = path: type: let basename = baseNameOf (toString path); in
-    if type == "directory" then basename != ".git"
-    else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null
-    else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;
-
-  nixpkgs = builtins.filterSource filterFn pkgs.path;
+  nixpkgs = lib.cleanSource pkgs.path;
 
   # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
   # CD.  These are installed into the "nixos" channel of the root

From 5543e992f1d66aa4fb4e7ec19597bbe8b8ac18a8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 25 Jul 2017 09:46:55 -0500
Subject: [PATCH 2978/3246] snowman: init at 2017-07-22

---
 .../tools/analysis/snowman/default.nix        | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/snowman/default.nix

diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
new file mode 100644
index 00000000000..f21e9bba3f7
--- /dev/null
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, cmake, boost, qt4 ? null, qtbase ? null }:
+
+# Only one qt
+assert qt4 != null -> qtbase == null;
+assert qtbase != null -> qt4 == null;
+
+stdenv.mkDerivation rec {
+  name = "snowman-${version}";
+  version = "2017-07-22";
+
+  src = fetchFromGitHub {
+    owner = "yegord";
+    repo = "snowman";
+    rev = "6c4d9cceb56bf2fd0f650313131a2240579d1bea";
+    sha256 = "1d0abh0fg637jksk7nl4yl54b4cadinj93qqvsm138zyx7h57xqf";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ boost qt4 qtbase ];
+
+  postUnpack = ''
+    export sourceRoot=$sourceRoot/src
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Native code to C/C++ decompiler";
+    homepage = "http://derevenets.com/";
+
+    # https://github.com/yegord/snowman/blob/master/doc/licenses.asciidoc
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58e43cec68b..c5108c55580 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7332,6 +7332,10 @@ with pkgs;
 
   smc = callPackage ../tools/misc/smc { };
 
+  snowman_qt4 = callPackage ../development/tools/analysis/snowman { };
+  snowman_qt5 = qt5.callPackage ../development/tools/analysis/snowman { qt4 = null; };
+  snowman = snowman_qt5;
+
   sparse = callPackage ../development/tools/analysis/sparse { };
 
   speedtest-cli = callPackage ../tools/networking/speedtest-cli { };

From 48291b066d6eeef9b935314fab6acdd6015b47d9 Mon Sep 17 00:00:00 2001
From: "Sang Hak (Andy) Chun" <sanghak@andychun.info>
Date: Wed, 16 Aug 2017 21:24:28 -0700
Subject: [PATCH 2979/3246] displaylink: use requireFile instead of fetchurl

The direct link used with fetchurl is no longer a direct link (see #28279)
Users will need to accept a EULA and add the source themselves to the store.
---
 .../os-specific/linux/displaylink/default.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 1f513786063..f561a65ea5c 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, lib, fetchurl, unzip, utillinux, libusb1, evdi, systemd, makeWrapper }:
+{ stdenv, lib, fetchurl, unzip, utillinux,
+  libusb1, evdi, systemd, makeWrapper, requireFile }:
 
 let
   arch =
@@ -12,10 +13,22 @@ in stdenv.mkDerivation rec {
   name = "displaylink-${version}";
   version = "1.3.52";
 
-  src = fetchurl {
+  src = requireFile rec {
     name = "displaylink.zip";
-    url = "http://www.displaylink.com/downloads/file?id=744";
     sha256 = "0ridpsxcf761vym0nlpq702qa46ynddzci17bjmyax2pph7khr0k";
+    message = ''
+      In order to install the DisplayLink drivers, you must first
+      comply with DisplayLink's EULA and download the binaries and
+      sources from here:
+
+      http://www.displaylink.com/downloads/file?id=744
+
+      Once you have downloaded the file, please use the following
+      commands and re-run the installation:
+
+      mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu ${version}.zip" \$PWD/${name}
+      nix-prefetch-url file://\$PWD/${name}
+    '';
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From c699694cbf4400480fe4267b7bee33b77747db07 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Wed, 16 Aug 2017 00:47:17 +0200
Subject: [PATCH 2980/3246] nodejs: 8.3.0 -> 8.4.0

---
 pkgs/development/web/nodejs/v8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index a891e637d26..af329063e9f 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.3.0";
+    version = "8.4.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "0lbfp7j73ig0xa3gh8wnl4g3lji7lm34l0ybfys4swl187c3da63";
+      sha256 = "0qgkccsldpdrjxwwq78z94hsqz6qivmi4n2738iiginw06hs4njx";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];

From bd545892332ede39cd5c1c0ba26e7101b0d2c971 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 15 Aug 2017 23:42:48 +0200
Subject: [PATCH 2981/3246] networkmanager_iodine: init at 1.2.0

---
 nixos/modules/config/no-x-libs.nix            |  1 +
 .../services/networking/networkmanager.nix    | 11 +++++-
 .../services/x11/desktop-managers/gnome3.nix  |  3 +-
 pkgs/desktops/gnome-3/3.22/default.nix        |  4 +++
 .../networking/network-manager/iodine.nix     | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 6 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/networking/network-manager/iodine.nix

diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 4b778730252..ae3e17ac27b 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -34,6 +34,7 @@ with lib;
       networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; };
       networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
       networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
+      networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
       pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; };
     };
   };
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 2b7086afe7e..e03309c8729 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -130,7 +130,8 @@ in {
         default = { inherit networkmanager modemmanager wpa_supplicant
                             networkmanager_openvpn networkmanager_vpnc
                             networkmanager_openconnect networkmanager_fortisslvpn
-                            networkmanager_pptp networkmanager_l2tp; };
+                            networkmanager_pptp networkmanager_l2tp
+                            networkmanager_iodine; };
         internal = true;
       };
 
@@ -255,6 +256,9 @@ in {
       { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
         target = "NetworkManager/VPN/nm-strongswan-service.name";
       }
+      { source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
+        target = "NetworkManager/VPN/nm-iodine-service.name";
+      }
     ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
            { source = overrideNameserversScript;
              target = "NetworkManager/dispatcher.d/02overridedns";
@@ -278,6 +282,11 @@ in {
       name = "nm-openvpn";
       uid = config.ids.uids.nm-openvpn;
       extraGroups = [ "networkmanager" ];
+    }
+    {
+      name = "nm-iodine";
+      isSystemUser = true;
+      group = "networkmanager";
     }];
 
     systemd.packages = cfg.packages;
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 2434aa1654a..0abdc27bbfc 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -186,7 +186,8 @@ in {
     networking.networkmanager.basePackages =
       { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
         inherit (gnome3) networkmanager_openvpn networkmanager_vpnc
-                         networkmanager_openconnect networkmanager_fortisslvpn networkmanager_pptp
+                         networkmanager_openconnect networkmanager_fortisslvpn
+                         networkmanager_pptp networkmanager_iodine
                          networkmanager_l2tp; };
 
     # Needed for themes and backgrounds
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index 1944cc98cfb..9c337b415b3 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -220,6 +220,10 @@ let
     inherit gnome3;
   };
 
+  networkmanager_iodine = pkgs.networkmanager_iodine.override {
+    inherit gnome3;
+  };
+
   networkmanagerapplet = pkgs.networkmanagerapplet.override {
     inherit gnome3 gsettings_desktop_schemas glib_networking;
   };
diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix
new file mode 100644
index 00000000000..154b54952f2
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/iodine.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, iodine, intltool, pkgconfig, networkmanager, libsecret
+, withGnome ? true, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+  pname   = "NetworkManager-iodine";
+  major   = "1.2";
+  version = "${major}.0";
+
+  src = fetchurl {
+    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh";
+  };
+
+  buildInputs = [ iodine networkmanager libsecret ]
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring
+                                        gnome3.networkmanagerapplet ];
+
+  nativeBuildInputs = [ intltool pkgconfig ];
+
+  configureFlags = [
+    "${if withGnome then "--with-gnome" else "--without-gnome"}"
+    "--disable-static"
+    "--localstatedir=/" # needed for the management socket under /run/NetworkManager
+  ];
+
+  preConfigure = ''
+     substituteInPlace "src/nm-iodine-service.c" \
+       --replace "/usr/bin/iodine" "${iodine}/bin/iodine"
+  '';
+
+  meta = {
+    description = "NetworkManager's iodine plugin";
+    inherit (networkmanager.meta) maintainers platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5108c55580..9127745dad6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3393,6 +3393,8 @@ with pkgs;
 
   networkmanager = callPackage ../tools/networking/network-manager { };
 
+  networkmanager_iodine = callPackage ../tools/networking/network-manager/iodine.nix { };
+
   networkmanager_openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };
 
   networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { };

From d15a067856ed97f9b7af0b4cfcc44c7fc2d39107 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Tue, 15 Aug 2017 00:11:53 +0200
Subject: [PATCH 2982/3246] blueman: fix python wrapper mockup

---
 pkgs/tools/bluetooth/blueman/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index bb2ed0c2c26..9027bdf9c5f 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -31,10 +31,11 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
 
-  preFixup = ''
+  postFixup = ''
     makeWrapperArgs="--prefix PATH ':' ${binPath}"
-    wrapPythonProgramsIn "$out/bin" "$pythonPath"
-    wrapPythonProgramsIn "$out/libexec" "$pythonPath"
+    # This mimics ../../../development/interpreters/python/wrap.sh
+    wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
+    wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
   '';
 
   meta = with lib; {

From 8c506dfb64f1bc46521ef0f7646e846c0a540def Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 30 Aug 2017 02:27:55 +0000
Subject: [PATCH 2983/3246] ocamlPackages.posixat: mark as broken with OCaml
 4.05

---
 pkgs/development/ocaml-modules/janestreet/default.nix | 3 ++-
 pkgs/top-level/ocaml-packages.nix                     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 724bca18706..8fc1ddf9063 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime,
+{ stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime,
   ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith,
   openssl }:
 
@@ -572,6 +572,7 @@ rec {
     hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl";
     propagatedBuildInputs = [ ppx_sexp_conv ];
     meta.description = "Binding to the posix *at functions";
+    meta.broken = lib.versionAtLeast ocaml.version "4.05";
   };
 
   rpc_parallel = janePackage {
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 64656990d0e..f00c46e3a3a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -663,7 +663,7 @@ let
     janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
 
     janeStreet = import ../development/ocaml-modules/janestreet {
-      inherit lib janePackage ocamlbuild ctypes cryptokit magic-mime;
+      inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime;
       inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith;
       inherit (pkgs) stdenv openssl;
     };

From 2a191ed853c931e6d69ee84a17d56c1bbf633190 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 30 Aug 2017 02:32:47 +0000
Subject: [PATCH 2984/3246] ocamlPackages.ppx_deriving_yojson: mark as broken
 with OCaml 4.05

---
 pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index 69276fb5a7d..5874f5eb884 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.vbgl ];
     inherit (ocaml.meta) platforms;
+    broken = stdenv.lib.versionAtLeast ocaml.version "4.05";
   };
 }

From a9be3c20d16df5cddbacd5b808b52052ceff6482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 28 Aug 2017 11:17:22 +0200
Subject: [PATCH 2985/3246] ocamlPackages.ppx_deriving: 4.1 -> 4.2

This fixes compilation of ppx_deriving with OCaml 4.05.

js_of_ocaml_2: mark as broken with OCaml 4.05

ocamlPackages.cohttp: propagates ppx_deriving
---
 .../ocaml-modules/cohttp/default.nix          |  4 ++--
 .../ocaml-modules/ppx_deriving/default.nix    | 21 ++++++++++++++-----
 .../tools/ocaml/js_of_ocaml/default.nix       |  1 +
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index adde3094e27..3e571dd791a 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
-, ppx_fields_conv, ppx_sexp_conv
+, ppx_fields_conv, ppx_sexp_conv, ppx_deriving
 , base64, fieldslib, jsonm, logs, re, stringext, uri
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ base64 fieldslib re stringext uri ];
+	propagatedBuildInputs = [ ppx_deriving base64 fieldslib re stringext uri ];
 
 	buildPhase = "jbuilder build -p cohttp";
 
diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index 57a423a8037..1b209e52369 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -1,22 +1,34 @@
 { stdenv, buildOcaml, ocaml, fetchzip
-, cppo, ppx_tools, result, ounit
+, cppo, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree
 }:
 
+let param =
+  if ocaml.version == "4.03.0"
+  then {
+    version = "4.1";
+    sha256 = "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9";
+    extraPropagatedBuildInputs = [];
+  } else {
+    version = "4.2";
+    sha256 = "0scsg45wp6xdqj648fz155r4yngyl2xcd3hdszfzqwdpbax33914";
+    extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ];
+}; in
+
 buildOcaml rec {
   name = "ppx_deriving";
-  version = "4.1";
+  inherit (param) version;
 
   minimumSupportedOcamlVersion = "4.02";
 
   src = fetchzip {
     url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz";
-    sha256 = "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9";
+    inherit (param) sha256;
   };
 
   hasSharedObjects = true;
 
   buildInputs = [ cppo ounit ];
-  propagatedBuildInputs =
+  propagatedBuildInputs = param.extraPropagatedBuildInputs ++
     [ ppx_tools result ];
 
   installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install";
@@ -25,6 +37,5 @@ buildOcaml rec {
     description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02.";
     maintainers = [ maintainers.maurer ];
     license = licenses.mit;
-    broken = versionAtLeast ocaml.version "4.05";
   };
 }
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 23556a0edbd..f88811855a2 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation {
     maintainers = [
       maintainers.gal_bolle
     ];
+    broken = versionAtLeast ocaml.version "4.05";
   };
 }

From 6a6fb6d31cc736af4cf9893deffcd0151f0b8c11 Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Wed, 30 Aug 2017 12:29:57 +0800
Subject: [PATCH 2986/3246] conky: enable nvidia support

---
 pkgs/os-specific/linux/conky/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix          | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 9c2553dbf45..35bcb6151c5 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -26,6 +26,7 @@
 , toluapp ? null
 
 , wirelessSupport     ? true      , wirelesstools ? null
+, nvidiaSupport       ? true      , libXNVCtrl ? null
 
 , curlSupport         ? true      , curl ? null
 , rssSupport          ? curlSupport
@@ -52,6 +53,7 @@ assert luaCairoSupport || luaImlib2Support
                            -> lua.luaversion == "5.1";
 
 assert wirelessSupport     -> wirelesstools != null;
+assert nvidiaSupport       -> libXNVCtrl != null;
 
 assert curlSupport         -> curl != null;
 assert rssSupport          -> curlSupport && libxml2 != null;
@@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
     ++ optional  curlSupport        curl
     ++ optional  rssSupport         libxml2
     ++ optional  weatherXoapSupport libxml2
+    ++ optional  nvidiaSupport      libXNVCtrl
     ;
 
   cmakeFlags = []
@@ -118,6 +121,7 @@ stdenv.mkDerivation rec {
     ++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON"
     ++ optional weatherXoapSupport  "-DBUILD_WEATHER_XOAP=ON"
     ++ optional wirelessSupport     "-DBUILD_WLAN=ON"
+    ++ optional nvidiaSupport       "-DBUILD_NVIDIA=ON"
     ;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6684d0accd0..aa617ce7941 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11756,6 +11756,7 @@ with pkgs;
 
   conky = callPackage ../os-specific/linux/conky ({
     lua = lua5_1; # conky can use 5.2, but toluapp can not
+    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
   } // config.conky or {});
 
   conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };

From b50309a5b5802485e0421af6d27888ef1ef53576 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 30 Aug 2017 14:26:28 +0800
Subject: [PATCH 2987/3246] httrack: 3.48.22 -> 3.49.2

---
 pkgs/tools/backup/httrack/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 02265bbc683..ecd6a3209f4 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -1,21 +1,23 @@
 { stdenv, fetchurl, zlib, openssl, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "3.48.22";
+  version = "3.49.2";
   name = "httrack-${version}";
 
   src = fetchurl {
     url = "http://mirror.httrack.com/httrack-${version}.tar.gz";
-    sha256 = "13y4m4rhvmgbbpc3lig9hzmzi86a5fkyi79sz1ckk4wfnkbim0xj";
+    sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl";
   };
 
   buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
-  meta = {
-    homepage = http://www.httrack.com;
-    description = "Easy-to-use offline browser utility";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    platforms = with stdenv.lib.platforms; unix;
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Easy-to-use offline browser / website mirroring utility";
+    homepage    = http://www.httrack.com;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ the-kenny ];
+    platforms   = with platforms; unix;
   };
 }

From 8988f8589a58de5596f5ef4ff39f72a29fc34ebb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 30 Aug 2017 15:02:30 +0800
Subject: [PATCH 2988/3246] httraqt: init at 1.4.9

---
 pkgs/tools/backup/httrack/qt.nix | 40 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/backup/httrack/qt.nix

diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix
new file mode 100644
index 00000000000..e29acc6f3c8
--- /dev/null
+++ b/pkgs/tools/backup/httrack/qt.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper
+, httrack, qtbase, qtmultimedia }:
+
+stdenv.mkDerivation rec {
+  name = "httraqt-${version}";
+  version = "1.4.9";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/httraqt/${name}.tar.gz";
+    sha256 = "0pjxqnqchpbla4xiq4rklc06484n46cpahnjy03n9rghwwcad25b";
+  };
+
+  buildInputs = [ httrack qtbase qtmultimedia ];
+
+  nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
+
+  enableParallelBuilding = true;
+
+  prePatch = ''
+    substituteInPlace cmake/HTTRAQTFindHttrack.cmake \
+      --replace /usr/include/httrack/ ${httrack}/include/httrack/
+
+    substituteInPlace distribution/posix/CMakeLists.txt \
+      --replace /usr/share $out/share
+
+    substituteInPlace desktop/httraqt.desktop \
+      --replace Exec=httraqt Exec=$out/bin/httraqt
+
+    substituteInPlace sources/main/httraqt.cpp \
+      --replace /usr/share/httraqt/ $out/share/httraqt
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Easy-to-use offline browser / website mirroring utility - QT frontend";
+    homepage    = http://www.httrack.com;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b92340e14d..65e4976a1c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19243,6 +19243,8 @@ with pkgs;
 
   httrack = callPackage ../tools/backup/httrack { };
 
+  httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { };
+
   mg = callPackage ../applications/editors/mg { };
 
   mpvc = callPackage ../applications/misc/mpvc { };

From 1e5b5bd719b5f712632fde1a2e07f85340fe5d8c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 29 Aug 2017 09:03:37 +0200
Subject: [PATCH 2989/3246] gnupg: 2.1.23 -> 2.2.0

See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00012.html
for release information
---
 pkgs/tools/security/gnupg/{21.nix => 22.nix} | 4 ++--
 pkgs/top-level/all-packages.nix              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/tools/security/gnupg/{21.nix => 22.nix} (96%)

diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/22.nix
similarity index 96%
rename from pkgs/tools/security/gnupg/21.nix
rename to pkgs/tools/security/gnupg/22.nix
index 1523f3e159c..3cabf9e1e41 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.1.23";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0xqd5nm4j3w9lwk35vg57gl2i8bfkmx7d24i44gkbscm2lwpci59";
+    sha256 = "1rj538kp3wsdq7rhl8sy1wpwhlsbxcch0cwk64kgz8gpw05lllfl";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af69e1c944c..132c3bee5d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2215,10 +2215,10 @@ with pkgs;
   gnupg20 = callPackage ../tools/security/gnupg/20.nix {
     pinentry = if stdenv.isDarwin then pinentry_mac else pinentry;
   };
-  gnupg21 = callPackage ../tools/security/gnupg/21.nix {
+  gnupg22 = callPackage ../tools/security/gnupg/22.nix {
     pinentry = if stdenv.isDarwin then pinentry_mac else pinentry;
   };
-  gnupg = gnupg21;
+  gnupg = gnupg22;
 
   gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };
 

From 9061a4e759ec6beef6954d999912cd284147cbc1 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 30 Aug 2017 09:25:08 +0200
Subject: [PATCH 2990/3246] datamash: 1.1.1 -> 1.2

See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00008.html
for release infrmation
---
 pkgs/tools/misc/datamash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index b1e0bb52a51..9b9735cbfcd 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "datamash-${version}";
-  version = "1.1.1";
+  version = "1.2";
 
   src = fetchurl {
     url = "mirror://gnu/datamash/${name}.tar.gz";
-    sha256 = "06w0pc828qsabmrlh7bc2zwc823xzxy89paaf37f6bipsyrij222";
+    sha256 = "15jrv3ly0vgvwwi2qjmhi39n7wrklwifdk961wwfaxyc5jr6zm78";
   };
 
   meta = with stdenv.lib; {

From d277d5288c8ebf8191fcb95456773d82504052d7 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Wed, 30 Aug 2017 00:25:53 -0700
Subject: [PATCH 2991/3246] trezord: 1.2.0 -> 1.2.1

Progress on: #28643
---
 pkgs/servers/trezord/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index 0fad00e882d..71e51d4c765 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, curl, cmake, boost, gcc5, protobuf, pkgconfig, jsoncpp
+{ stdenv, fetchgit, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp
 , libusb1, libmicrohttpd
 }:
 
 let
-  version = "1.2.0";
+  version = "1.2.1";
 in
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url    = "https://github.com/trezor/trezord";
     rev    = "refs/tags/v${version}";
-    sha256 = "1606j5cfngryk4q21yiga1zvc3zpx4q8vqn6ljrvr679hpvlwni4";
+    sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4";
   };
 
   meta = with stdenv.lib; {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    gcc5
+    gcc
     pkgconfig
   ];
 

From e8e0cb193e4296d834face2f2831d3df9e49e3b4 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 30 Aug 2017 10:01:32 +0200
Subject: [PATCH 2992/3246] pspp: 0.8.3 -> 1.0.1

---
 .../science/math/{pssp => pspp}/default.nix          | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/applications/science/math/{pssp => pspp}/default.nix (75%)

diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pspp/default.nix
similarity index 75%
rename from pkgs/applications/science/math/pssp/default.nix
rename to pkgs/applications/science/math/pspp/default.nix
index 02d24d601b1..e899548217f 100644
--- a/pkgs/applications/science/math/pssp/default.nix
+++ b/pkgs/applications/science/math/pspp/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk2, gsl
-, pkgconfig, gtksourceview, pango, gettext, libglade
+{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
+, pkgconfig, gtksourceview, pango, gettext
 }:
 
 stdenv.mkDerivation rec {
-  name = "pspp-0.8.3";
+  name = "pspp-1.0.1";
 
   src = fetchurl {
     url = "mirror://gnu/pspp/${name}.tar.gz";
-    sha256 = "0vri2pzvmm38qaihfvwlry30f40lcnps4blg59ixic4q20ldxf5d";
+    sha256 = "1r8smr5057993h90nx0mdnff8nxw9x546zzh6qpy4h3xblp1la5s";
   };
 
-  buildInputs = [ libxml2 readline zlib perl cairo gtk2 gsl pkgconfig
-    gtksourceview pango gettext libglade ];
+  buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl pkgconfig
+    gtksourceview pango gettext ];
 
   doCheck = false;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65e4976a1c5..467ffa891fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18415,8 +18415,8 @@ with pkgs;
 
   pcalc = callPackage ../applications/science/math/pcalc { };
 
-  pspp = callPackage ../applications/science/math/pssp {
-    inherit (gnome2) libglade gtksourceview;
+  pspp = callPackage ../applications/science/math/pspp {
+    inherit (gnome3) gtksourceview;
   };
 
   singular = callPackage ../applications/science/math/singular {};

From 7978edad53456e0eff490c6a72b62fdadc16bf8c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Aug 2017 11:55:19 +0200
Subject: [PATCH 2993/3246] python-PyICU: disable for darwin

The build errors out on macOS.
---
 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 15052c708e9..8f25018345b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18237,7 +18237,7 @@ in {
       homepage = https://pypi.python.org/pypi/PyICU/;
       description = "Python extension wrapping the ICU C++ API";
       license = licenses.mit;
-      platforms = platforms.all;
+      platforms = with platforms; allBut darwin;
       maintainers = [ maintainers.rycee ];
     };
   };

From 128cdeffd0b801dd36258684e25fcd4ee99015d3 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 30 Aug 2017 06:59:20 -0400
Subject: [PATCH 2994/3246] compiz: drop

---
 doc/coding-conventions.xml                    |  8 +--
 nixos/doc/manual/release-notes/rl-1709.xml    |  8 ++-
 nixos/modules/module-list.nix                 |  1 -
 .../services/x11/window-managers/compiz.nix   | 60 -----------------
 .../services/x11/window-managers/default.nix  |  1 -
 .../window-managers/compiz/default.nix        | 67 -------------------
 .../window-managers/compiz/default.upstream   |  1 -
 pkgs/top-level/all-packages.nix               |  4 --
 8 files changed, 11 insertions(+), 139 deletions(-)
 delete mode 100644 nixos/modules/services/x11/window-managers/compiz.nix
 delete mode 100644 pkgs/applications/window-managers/compiz/default.nix
 delete mode 100644 pkgs/applications/window-managers/compiz/default.upstream

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index f89437af445..0457018f7d0 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -254,7 +254,7 @@ bound to the variable name <varname>e2fsprogs</varname> in
   dash) — e.g., <literal>"hello-0.3.1rc2"</literal>.</para></listitem>
 
   <listitem><para>If a package is not a release but a commit from a repository, then
-  the version part of the name <emphasis>must</emphasis> be the date of that 
+  the version part of the name <emphasis>must</emphasis> be the date of that
   (fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal> format.
   Also append <literal>"unstable"</literal> to the name - e.g.,
   <literal>"pkgname-unstable-2014-09-23"</literal>.</para></listitem>
@@ -456,7 +456,7 @@ splitting up an existing category.</para>
   <varlistentry>
     <term>If it’s a <emphasis>window manager</emphasis>:</term>
     <listitem>
-      <para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>compiz</filename>, <filename>stumpwm</filename>)</para>
+      <para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>stumpwm</filename>)</para>
     </listitem>
   </varlistentry>
   <varlistentry>
@@ -661,9 +661,9 @@ src = fetchFromGitHub {
 </section>
 
 <section xml:id="sec-patches"><title>Patches</title>
-  <para>Only patches that are unique to <literal>nixpkgs</literal> should be 
+  <para>Only patches that are unique to <literal>nixpkgs</literal> should be
     included in <literal>nixpkgs</literal> source.</para>
-  <para>Patches available online should be retrieved using 
+  <para>Patches available online should be retrieved using
     <literal>fetchpatch</literal>.</para>
   <para>
 <programlisting>
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index c64cdd583f2..82ee5216ca9 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -165,6 +165,12 @@ rmdir /var/lib/ipfs/.ipfs
       Refer to the description of the options for more details.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>compiz</literal> window manager and package was
+      removed. The system support had been broken for several years.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>
@@ -210,7 +216,7 @@ rmdir /var/lib/ipfs/.ipfs
   <listitem>
     <para>
       Nixpkgs overlays may now be specified with a file as well as a directory. The
-      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and 
+      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and
       <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the
       <filename>~/.config/nixpkgs/overalys</filename> directory.
     </para>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index cbb15ac4f01..918d0f3b245 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -630,7 +630,6 @@
   ./services/x11/redshift.nix
   ./services/x11/urxvtd.nix
   ./services/x11/window-managers/awesome.nix
-  #./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
   ./services/x11/window-managers/fluxbox.nix
   ./services/x11/window-managers/icewm.nix
diff --git a/nixos/modules/services/x11/window-managers/compiz.nix b/nixos/modules/services/x11/window-managers/compiz.nix
deleted file mode 100644
index 539a83f9906..00000000000
--- a/nixos/modules/services/x11/window-managers/compiz.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.xserver.windowManager.compiz;
-  xorg = config.services.xserver.package;
-
-in
-
-{
-
-  options = {
-
-    services.xserver.windowManager.compiz = {
-
-      enable = mkEnableOption "compiz";
-
-      renderingFlag = mkOption {
-        default = "";
-        example = "--indirect-rendering";
-        description = "Pass the <option>--indirect-rendering</option> flag to Compiz.";
-      };
-
-    };
-
-  };
-
-
-  config = mkIf cfg.enable {
-
-    services.xserver.windowManager.session = singleton
-      { name = "compiz";
-        start =
-          ''
-            # Start Compiz using the flat-file configuration backend
-            # (ccp).
-            export COMPIZ_PLUGINDIR=${config.system.path}/lib/compiz
-            export COMPIZ_METADATADIR=${config.system.path}/share/compiz
-            ${pkgs.compiz}/bin/compiz ccp ${cfg.renderingFlag} &
-
-            # Start GTK-style window decorator.
-            ${pkgs.compiz}/bin/gtk-window-decorator &
-          '';
-      };
-
-    environment.systemPackages =
-      [ pkgs.compiz
-        pkgs.compiz_ccsm
-        pkgs.compiz_plugins_main
-        pkgs.compiz_plugins_extra
-        pkgs.libcompizconfig # for the "ccp" plugin
-      ];
-
-    environment.pathsToLink = [ "/lib/compiz" "/share/compiz" ];
-
-  };
-
-}
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 32ef34bdad2..d12003768a6 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -11,7 +11,6 @@ in
     ./2bwm.nix
     ./afterstep.nix
     ./bspwm.nix
-    ./compiz.nix
     ./dwm.nix
     ./exwm.nix
     ./fluxbox.nix
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
deleted file mode 100644
index 412cdf91e0b..00000000000
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ stdenv, fetchurl, cmake, pkgconfig
-, libXrender, renderproto, gtk2, libwnck, pango, cairo
-, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm
-, metacity
-, libstartup_notification, libpthreadstubs, libxcb, intltool
-, ORBit2, libXau, libICE, libSM
-, dbus, dbus_glib, librsvg, mesa
-, libXdmcp, libnotify, python2Packages
-, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf
-, xdg_utils
-, gettext, boost, pyrex
-, makeWrapper
-}:
-let
-  # FIXME: Use python.withPackages so we can get rid of PYTHONPATH wrapper
-  inherit (python2Packages) python dbus-python pygtk;
-
-  s = # Generated upstream information
-  rec {
-    baseName="compiz";
-    version="0.9.13.1";
-    name="${baseName}-${version}";
-    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
-    GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification
-    metacity
-    libpthreadstubs libxcb intltool
-    ORBit2 libXau libICE libSM
-    dbus dbus_glib librsvg mesa
-    libXdmcp libnotify python
-    hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk dbus-python
-    xdg_utils
-    gettext boost pyrex
-    makeWrapper 
-    ];
-  in
-stdenv.mkDerivation rec {
-  inherit (s) name version;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  inherit buildInputs;
-
-  NIX_CFLAGS_COMPILE = " -Wno-error ";
-  NIX_CFLAGS_LINK = "-lm -ldl -pthread -lutil";
-  postInstall = ''
-    wrapProgram "$out/bin/ccsm" \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
-      --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
-  '';
-
-  # automatic moving fails, perhaps due to having two $out/lib*/pkgconfig
-  dontMoveLib64 = true;
-
-  meta = {
-    description = "Compoziting window manager";
-    homepage = https://launchpad.net/compiz/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    inherit (s) version;
-  };
-}
diff --git a/pkgs/applications/window-managers/compiz/default.upstream b/pkgs/applications/window-managers/compiz/default.upstream
deleted file mode 100644
index b7fc98bd126..00000000000
--- a/pkgs/applications/window-managers/compiz/default.upstream
+++ /dev/null
@@ -1 +0,0 @@
-url https://launchpad.net/compiz/+download
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65e4976a1c5..89afebcf4bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13690,10 +13690,6 @@ with pkgs;
 
   communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
 
-  compiz = callPackage ../applications/window-managers/compiz {
-    inherit (gnome2) GConf ORBit2 metacity;
-  };
-
   confclerk = callPackage ../applications/misc/confclerk { };
 
   copyq = callPackage ../applications/misc/copyq { };

From 5d4a54ca4d063174ced97e1e689becf49b7b7cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 30 Aug 2017 06:59:27 +0100
Subject: [PATCH 2995/3246] network-interfaces-scripted: don't add 'lo' as
 device dependency

systemd does not create device units for loopback devices,
since they are not physical.
---
 nixos/modules/tasks/network-interfaces-scripted.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index f6f104ce7a6..15b36cfcb11 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -71,7 +71,7 @@ let
              (hasAttr dev cfg.vswitches) ||
              (hasAttr dev cfg.wlanInterfaces)
           then [ "${dev}-netdev.service" ]
-          else optional (dev != null && !config.boot.isContainer) (subsystemDevice dev);
+          else optional (dev != null && dev != "lo" && !config.boot.isContainer) (subsystemDevice dev);
 
         networkLocalCommands = {
           after = [ "network-setup.service" ];

From 693d2403f1bf37e2cb4fe45cb949a64344965c18 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 12 Aug 2017 15:37:36 -0400
Subject: [PATCH 2996/3246] docker-edge: 17.06 -> 17.07

---
 .../virtualization/docker/default.nix             | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                   |  5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index e1935f39092..edae12fed1f 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -169,6 +169,9 @@ rec {
     };
   };
 
+  # Get revisions from
+  # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
+
   docker_17_06 = dockerGen rec {
     version = "17.06.1-ce";
     rev = "874a7374f31c77aca693d025101b2de1b20b96c2"; # git commit
@@ -180,4 +183,16 @@ rec {
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
+
+  docker_17_07 = dockerGen rec {
+    version = "17.07.0-ce";
+    rev = "87847530f7176a48348d196f7c23bbd058052af1"; # git commit
+    sha256 = "0zw9zlzbd7il33ch17ypwpa73gsb930sf2njnphg7ylvnqp8qzsp";
+    runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4";
+    runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq";
+    containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429";
+    containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j";
+    tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
+    tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89afebcf4bb..a6692f277c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13815,10 +13815,11 @@ with pkgs;
   };
 
   inherit (callPackage ../applications/virtualization/docker { })
-    docker_17_06;
+    docker_17_06
+    docker_17_07;
 
   docker = docker_17_06;
-  docker-edge = docker_17_06;
+  docker-edge = docker_17_07;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 

From dd2d140241f0fc83b7451fb8267d54bd358d3f05 Mon Sep 17 00:00:00 2001
From: Mikael Brockman <mikael@brockman.se>
Date: Mon, 31 Jul 2017 13:12:08 +0300
Subject: [PATCH 2997/3246] hsevm: v0.3.2 -> v0.6.4

---
 pkgs/applications/altcoins/hsevm.nix | 37 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hsevm.nix
index d68526e2cd9..173ac83a6db 100644
--- a/pkgs/applications/altcoins/hsevm.nix
+++ b/pkgs/applications/altcoins/hsevm.nix
@@ -1,23 +1,24 @@
-{ aeson, ansi-wl-pprint, base, base16-bytestring
-, base64-bytestring, binary, brick, bytestring, containers
-, cryptonite, data-dword, deepseq, directory, filepath, ghci-pretty
-, here, HUnit, lens, lens-aeson, memory, mtl, optparse-generic
-, process, QuickCheck, quickcheck-text, readline, rosezipper
-, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
-, text-format, unordered-containers, vector, vty
-, mkDerivation, fetchFromGitHub, lib
-, ncurses, zlib, bzip2, solc
+{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, base
+, base16-bytestring, base64-bytestring, binary, brick, bytestring
+, cereal, containers, cryptonite, data-dword, deepseq, directory
+, filepath, ghci-pretty, here, HUnit, lens, lens-aeson, memory
+, monad-par, mtl, optparse-generic, process, QuickCheck
+, quickcheck-text, readline, rosezipper, scientific, stdenv, tasty, tasty-hunit
+, tasty-quickcheck, temporary, text, text-format
+, unordered-containers, vector, vty
+, fetchFromGitHub, lib, makeWrapper
+, ncurses, zlib, bzip2, solc, coreutils
 }:
 
 lib.overrideDerivation (mkDerivation rec {
   pname = "hsevm";
-  version = "0.3.2";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "dapphub";
     repo = "hsevm";
     rev = "v${version}";
-    sha256 = "1c6zpphs03yfvyfbv1cjf04qh5q2miq7rpd7kx2cil77msi8hxw4";
+    sha256 = "01b67k9cam4gvsi07q3vx527m1w6p6xll64k1nl27bc8ik6jh8l9";
   };
 
   isLibrary = false;
@@ -26,15 +27,16 @@ lib.overrideDerivation (mkDerivation rec {
 
   postInstall = ''
     rm -rf $out/{lib,share}
+    wrapProgram $out/bin/hsevm --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS'
   '';
 
   extraLibraries = [
-    aeson ansi-wl-pprint base base16-bytestring base64-bytestring
-    binary brick bytestring containers cryptonite data-dword deepseq
-    directory filepath ghci-pretty lens lens-aeson memory mtl
-    optparse-generic process QuickCheck quickcheck-text readline
-    rosezipper temporary text text-format unordered-containers vector
-    vty
+    abstract-par aeson ansi-wl-pprint base base16-bytestring
+    base64-bytestring binary brick bytestring cereal containers
+    cryptonite data-dword deepseq directory filepath ghci-pretty lens
+    lens-aeson memory monad-par mtl optparse-generic process QuickCheck
+    quickcheck-text readline rosezipper scientific temporary text text-format
+    unordered-containers vector vty
   ];
   executableHaskellDepends = [
     readline zlib bzip2
@@ -50,4 +52,5 @@ lib.overrideDerivation (mkDerivation rec {
   maintainers = [stdenv.lib.maintainers.dbrock];
 }) (attrs: {
   buildInputs = attrs.buildInputs ++ [solc];
+  nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper];
 })

From dfeb8bd4b51c7254a60e2752336061539e531f59 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Tue, 29 Aug 2017 01:00:16 -0700
Subject: [PATCH 2998/3246] stagit: init at 0.6

a git static site generator
---
 pkgs/development/tools/stagit/default.nix | 24 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/tools/stagit/default.nix

diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix
new file mode 100644
index 00000000000..ad23ed7e9dc
--- /dev/null
+++ b/pkgs/development/tools/stagit/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, libgit2, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "stagit-${version}";
+  version = "0.6";
+
+  src = fetchgit {
+    url = git://git.codemadness.org/stagit;
+    rev = version;
+    sha256 = "1xwjdqkf5akxa66ak7chd9gna89kgbdzjrpx4ch7f770ycp2s5sr";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  buildInputs = [ libgit2 ];
+
+  meta = with stdenv.lib; {
+    description = "git static site generator";
+    homepage = https://git.codemadness.org/stagit/;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jb55 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9d455fe31d..b53d9d0532e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1139,6 +1139,8 @@ with pkgs;
 
   staccato = callPackage ../tools/text/staccato { };
 
+  stagit = callPackage ../development/tools/stagit { };
+
   syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};
 
   syslogng = callPackage ../tools/system/syslog-ng { };

From fbc3c696643ee55a615da2d06e131d84d428c369 Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Wed, 30 Aug 2017 14:57:45 +0800
Subject: [PATCH 2999/3246] hivemind: Fix boost version dependency

---
 pkgs/applications/altcoins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 81b459e8308..a67e5559a53 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -26,8 +26,8 @@ rec {
   go-ethereum = callPackage ./go-ethereum.nix { };
   go-ethereum-classic = callPackage ./go-ethereum-classic { };
 
-  hivemind = callPackage ./hivemind.nix { withGui = true; };
-  hivemindd = callPackage ./hivemind.nix { withGui = false; };
+  hivemind = callPackage ./hivemind.nix { withGui = true; boost = pkgs.boost162; };
+  hivemindd = callPackage ./hivemind.nix { withGui = false; boost = pkgs.boost162; };
 
   litecoin  = callPackage ./litecoin.nix { withGui = true; };
   litecoind = callPackage ./litecoin.nix { withGui = false; };

From 73c4a3f641ee2d3af2e0ff5f70fd8f1e373a934a Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@siemens.com>
Date: Wed, 30 Aug 2017 10:20:42 +0200
Subject: [PATCH 3000/3246] gitlab-runner service: honor proxy variables

---
 nixos/modules/services/continuous-integration/gitlab-runner.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index ce0583dad54..b18221456cb 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -100,6 +100,7 @@ in
 
   config = mkIf cfg.enable {
     systemd.services.gitlab-runner = {
+      environment = config.networking.proxy.envVars;
       description = "Gitlab Runner";
       after = [ "network.target" ]
         ++ optional hasDocker "docker.service";

From 233781410d15a4a38e4ef86f6b47ed2435be94b9 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@siemens.com>
Date: Wed, 30 Aug 2017 13:57:57 +0200
Subject: [PATCH 3001/3246] gitlab-runner service: allow adding additional
 tools to PATH

This is similar to how it is implemented for the Jenkins service.

Bash and docker-machine are added by default as they are required in
many cases.
---
 .../services/continuous-integration/gitlab-runner.nix  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index b18221456cb..6d5cea4f77a 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -96,10 +96,20 @@ in
       example = literalExample "pkgs.gitlab-runner_1_11";
     };
 
+    packages = mkOption {
+      default = [ pkgs.bash pkgs.docker-machine ];
+      defaultText = "[ pkgs.bash pkgs.docker-machine ]";
+      type = types.listOf types.package;
+      description = ''
+        Packages to add to PATH for the gitlab-runner process.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {
     systemd.services.gitlab-runner = {
+      path = cfg.packages;
       environment = config.networking.proxy.envVars;
       description = "Gitlab Runner";
       after = [ "network.target" ]

From a27c6c7374a2b692baffeced8093c95f4787adf5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 Aug 2017 07:57:51 -0400
Subject: [PATCH 3002/3246] linux: 4.12.9 -> 4.12.10

---
 pkgs/os-specific/linux/kernel/linux-4.12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index df64bffe80b..ca9ed265799 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.9";
+  version = "4.12.10";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1734l7h9rc8y0gr68ir6j99nf480y56b5i5xb40vkywxbhbkj139";
+    sha256 = "1156ly1lmsr3l8ad8z80agsl026yk86nyypw67ksc66mznvzgyy0";
   };
 
   kernelPatches = args.kernelPatches;

From fab79d08e9a5b0b52a688115ff358d1d59ceb86a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 Aug 2017 07:58:16 -0400
Subject: [PATCH 3003/3246] linux: 4.9.45 -> 4.9.46

---
 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 393ae9d63ad..87b225dfd3d 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.45";
+  version = "4.9.46";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0vb62np19i88nslb24ydwnlhkb4018d247ha4xmn0ncsqy6x3rb6";
+    sha256 = "0arbm9l8pq7d6c1hr0c64p94qcxrxf4q4famvcm13273y3lr70r2";
   };
 
   kernelPatches = args.kernelPatches;

From 9fd315a62faa9011afb34f1d9e0372ccb3983ab9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 Aug 2017 07:58:38 -0400
Subject: [PATCH 3004/3246] vscode: Skip 'Getting Started'

---
 pkgs/applications/editors/vscode/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 5db2a1aaece..1f91bdfa3a5 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -58,6 +58,9 @@ in
       '' else ''
         mkdir -p $out/lib/vscode $out/bin
         cp -r ./* $out/lib/vscode
+
+        substituteInPlace $out/lib/vscode/bin/code --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
+
         ln -s $out/lib/vscode/bin/code $out/bin
 
         mkdir -p $out/share/applications

From 76dec4a4d2bbed90e9682f18a1758007fcb0e2c4 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 30 Aug 2017 14:13:13 +0200
Subject: [PATCH 3005/3246] znapzend service: add autoCreation option

---
 nixos/modules/services/backup/znapzend.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 8c5af80c8fb..baf99930e3e 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -27,7 +27,13 @@ in
       noDestroy = mkOption {
         type = types.bool;
         default = false;
-        description = "Does all changes to the filesystem except destroy";
+        description = "Does all changes to the filesystem except destroy.";
+      };
+
+      autoCreation = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Automatically create the dataset on dest if it does not exists.";
       };
     };
   };
@@ -44,7 +50,7 @@ in
         path = with pkgs; [ zfs mbuffer openssh ];
 
         serviceConfig = {
-          ExecStart = "${pkgs.znapzend}/bin/znapzend --logto=${cfg.logTo} --loglevel=${cfg.logLevel} ${optionalString cfg.noDestroy "--nodestroy"}";
+          ExecStart = "${pkgs.znapzend}/bin/znapzend --logto=${cfg.logTo} --loglevel=${cfg.logLevel} ${optionalString cfg.noDestroy "--nodestroy"} ${optionalString cfg.autoCreation "--autoCreation"}";
           ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
           Restart = "on-failure";
         };

From 97a4088d339f2595fa5722b5aec9a39f08ab560a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 30 Aug 2017 14:32:04 +0200
Subject: [PATCH 3006/3246] Add lib.mod: integer modulus

---
 lib/trivial.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 9ee0549fc0f..a57cf30d171 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -70,6 +70,16 @@ rec {
   min = x: y: if x < y then x else y;
   max = x: y: if x > y then x else y;
 
+  /* Integer modulus
+
+     Example:
+       mod 11 10
+       => 1
+       mod 1 10
+       => 1
+  */
+  mod = base: int: base - (int * (builtins.div base int));
+
   /* Reads a JSON file. */
   importJSON = path:
     builtins.fromJSON (builtins.readFile path);

From e410a191a1e6cb041cc62d14d9823b91d054b41c Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 30 Aug 2017 14:40:54 +0200
Subject: [PATCH 3007/3246] haskell: add the checkUnusedPackages function
 including docs

---
 doc/languages-frameworks/haskell.md      | 56 ++++++++++++++++++++++++
 pkgs/development/haskell-modules/lib.nix | 18 +++++++-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 930bd261615..8efc60f1e17 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -867,6 +867,62 @@ use the following to get the `scientific` package build with `integer-simple`:
 nix-build -A haskell.packages.integer-simple.ghc802.scientific
 ```
 
+### Quality assurance
+
+The `haskell.lib` library includes a number of functions for checking for
+various imperfections in Haskell packages. It's useful to apply these functions
+to your own Haskell packages and integrate that in a Continuous Integration
+server like [hydra](https://nixos.org/hydra/) to assure your packages maintain a
+minimum level of quality. This section discusses some of these functions.
+
+#### buildStrictly
+
+Applying `haskell.lib.buildStrictly` to a Haskell package enables the `-Wall`
+and `-Werror` GHC options to turn all warnings into build failures. Additionally
+the source of your package is gotten from first invoking `cabal sdist` to ensure
+all needed files are listed in the Cabal file.
+
+#### checkUnusedPackages
+
+Applying `haskell.lib.checkUnusedPackages` to a Haskell package invokes
+the [packunused](http://hackage.haskell.org/package/packunused) tool on the
+package. `packunused` complains when it finds packages listed as build-depends
+in the Cabal file which are redundant. For example:
+
+```
+$ nix-build -E 'let pkgs = import <nixpkgs> {}; in pkgs.haskell.lib.checkUnusedPackages {} pkgs.haskellPackages.scientific'
+these derivations will be built:
+  /nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv
+...
+detected package components
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ - library
+ - testsuite(s): test-scientific
+ - benchmark(s): bench-scientific*
+
+(component names suffixed with '*' are not configured to be built)
+
+library
+~~~~~~~
+
+The following package dependencies seem redundant:
+
+ - ghc-prim-0.5.0.0
+
+testsuite(test-scientific)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+no redundant packages dependencies found
+
+builder for ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed with exit code 1
+error: build of ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed
+```
+
+As you can see, `packunused` finds out that although the testsuite component has
+no redundant dependencies the library component of `scientific-0.3.5.1` depends
+on `ghc-prim` which is unused in the library.
+
 ## Other resources
 
   - The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE)
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 43723b80774..6da19794f6f 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -1,5 +1,5 @@
 # TODO(@Ericson2314): Remove `pkgs` param, which is only used for
-# `buildStackProject` and `justStaticExecutables`
+# `buildStackProject`, `justStaticExecutables` and `checkUnusedPackages`
 { pkgs, lib }:
 
 rec {
@@ -108,6 +108,22 @@ rec {
 
   buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
 
+  checkUnusedPackages =
+    { ignoreEmptyImports ? false
+    , ignoreMainModule   ? false
+    , ignorePackages     ? []
+    } : drv :
+      overrideCabal (appendConfigureFlag drv "--ghc-option=-ddump-minimal-imports") (_drv: {
+        postBuild = with lib;
+          let args = concatStringsSep " " (
+                       optional ignoreEmptyImports "--ignore-empty-imports" ++
+                       optional ignoreMainModule   "--ignore-main-module" ++
+                       map (pkg: "--ignore-package ${pkg}") ignorePackages
+                     );
+          in "${pkgs.haskellPackages.packunused}/bin/packunused" +
+             optionalString (args != "") " ${args}";
+      });
+
   buildStackProject = pkgs.callPackage ./generic-stack-builder.nix { };
 
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });

From 30c85e85ae0c18d5f61268ae98c29755795664c9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 30 Aug 2017 21:05:11 +0800
Subject: [PATCH 3008/3246] bundler: 1.15.3 -> 1.15.4

---
 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 8331440ab99..1782cea20e7 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.15.3";
-  sha256 = "125amldnpzzrfw76mmr7mlx002k1k6xdyrqf5bdnzl5hajvn0s5f";
+  version = "1.15.4";
+  sha256 = "0wl4r7wbwdq68xidfv4hhzfb1spb6lmhbspwlzrg4pf1l6ipxlgs";
   dontPatchShebangs = true;
 
   postFixup = ''

From a1302eab3ad89440edad3e5a360875ba97be1d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Wed, 30 Aug 2017 15:20:10 +0200
Subject: [PATCH 3009/3246] tests: fix ipfs test, test actual networking
 functionality

---
 nixos/tests/ipfs.nix | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix
index 92d742e4f37..a93f8f175c5 100644
--- a/nixos/tests/ipfs.nix
+++ b/nixos/tests/ipfs.nix
@@ -11,27 +11,47 @@ import ./make-test.nix ({ pkgs, ...} : {
       {
         services.ipfs = {
           enable = true;
+          defaultMode = "norouting";
           gatewayAddress = "/ip4/127.0.0.1/tcp/2323";
           apiAddress = "/ip4/127.0.0.1/tcp/2324";
         };
+        networking.firewall.allowedTCPPorts = [ 4001 ];
       };
     getter =
       { config, pkgs, ... }:
       {
-         services.ipfs.enable = true;
+        services.ipfs = {
+          enable = true;
+          defaultMode = "norouting";
+          # not yet. See #28621
+          #autoMount = true;
+        };
+        networking.firewall.allowedTCPPorts = [ 4001 ];
       };
   };
 
   testScript = ''
     startAll;
-    $adder->waitForUnit("ipfs");
-    # * => needs ipfs dht (internet)
-    # $getter->waitForUnit("ipfs");
+    $adder->waitForUnit("ipfs-norouting");
+    $getter->waitForUnit("ipfs-norouting");
+
+    # wait until api is available
     $adder->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id");
-    $adder->mustSucceed("([[ -n '$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.gatewayAddress | grep /ip4/127.0.0.1/tcp/2323)' ]])");
-    # * $getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id");
-    # * my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2");
-    $adder->mustSucceed("([[ -n '$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)' ]])");
-    # * $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 cat $ipfsHash");
+    my $addrId = $adder->succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id -f=\"<id>\"");
+    my $addrIp = (split /[ \/]+/, $adder->succeed("ip -o -4 addr show dev eth1"))[3];
+
+    $adder->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.Gateway | grep /ip4/127.0.0.1/tcp/2323)\" ]");
+
+    # wait until api is available
+    $getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id");
+    my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2");
+    chomp($ipfsHash);
+
+    $adder->mustSucceed("[ -n \"\$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)\" ]");
+
+    $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 swarm connect /ip4/$addrIp/tcp/4001/ipfs/$addrId");
+    $getter->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/5001 cat /ipfs/$ipfsHash | grep fnord)\" ]");
+    # not yet. See #28621
+    # $getter->mustSucceed("[ -n \"$(cat /ipfs/$ipfsHash | grep fnord)\" ]");
     '';
 })

From 998f516fb07330b00f5d9845bf9970fc530ab7be Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 30 Aug 2017 10:23:05 +0100
Subject: [PATCH 3010/3246] terraform: only expose maj.min to top-level

We shouldn't encourage users to depend on a tiny release.
---
 .../networking/cluster/terraform/default.nix           |  6 +++---
 pkgs/top-level/all-packages.nix                        | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index e86351fcc54..8fd76f7df75 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -43,19 +43,19 @@ in {
     sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
   };
 
-  terraform_0_8_8 = generic {
+  terraform_0_8 = generic {
     version = "0.8.8";
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
-  terraform_0_9_11 = generic {
+  terraform_0_9 = generic {
     version = "0.9.11";
     sha256 = "045zcpd4g9c52ynhgh3213p422ahds63mzhmd2iwcmj88g8i1w6x";
     # checks are failing again
     doCheck = false;
   };
 
-  terraform_0_10_2 = generic {
+  terraform_0_10 = generic {
     version = "0.10.2";
     sha256 = "1q7za7jcfqv914a3ynfl7hrqbgwcahgm418kivjrac6p1q26w502";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1d7a30fa87..c6c996b5dbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18976,13 +18976,11 @@ with pkgs;
 
   inherit (callPackage ../applications/networking/cluster/terraform {})
     terraform_0_8_5
-    terraform_0_8_8
-    terraform_0_9_11
-    terraform_0_10_2;
+    terraform_0_8
+    terraform_0_9
+    terraform_0_10
+    ;
 
-  terraform_0_8 = terraform_0_8_8;
-  terraform_0_9 = terraform_0_9_11;
-  terraform_0_10 = terraform_0_10_2;
   terraform = terraform_0_9;
 
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};

From 71d83eac88b20c33016c80fab4187779ef93edff Mon Sep 17 00:00:00 2001
From: David Pflug <david@tpflug.com>
Date: Tue, 29 Aug 2017 20:31:45 -0400
Subject: [PATCH 3011/3246] gargoyle: 2017-05-10 -> 2018-08-27

---
 pkgs/games/gargoyle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix
index 7a461fbfa0d..4c5b2827a0e 100644
--- a/pkgs/games/gargoyle/default.nix
+++ b/pkgs/games/gargoyle/default.nix
@@ -19,13 +19,13 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "gargoyle-2017-05-17";
+  name = "gargoyle-2017-08-27";
 
   src = fetchFromGitHub {
     owner = "garglk";
     repo = "garglk";
-    rev = "2da2824748b0b99107f481801f818efc54a43d3a";
-    sha256 = "184lgylcbhj205pfccwgl7avs0pczwrc53nvkzhj2p5inxak20kk";
+    rev = "65c95166f53adaa2e5e1a5e0d8a34e9219d06de6";
+    sha256 = "1agnap38qdf2n1v37ka3ky44j56yhvln4lzf13diyqhjmh9lvfq5";
   };
 
   nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin libtool;

From 261386a39e9a1ceb41accf6175392d5aca19f6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 30 Aug 2017 16:46:27 +0200
Subject: [PATCH 3012/3246] Calf: fix homepage

---
 pkgs/applications/audio/calf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index e133df564d7..15fca59deee 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://calf.sourceforge.net;
+    homepage = http://calf-studio-gear.org;
     description = "A set of high quality open source audio plugins for musicians";
     license = licenses.lgpl2;
     maintainers = [ maintainers.goibhniu ];

From 0bb2d3112b259940df18ec6c0203bb01234f4e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 30 Aug 2017 16:47:06 +0200
Subject: [PATCH 3013/3246] Calf: use gcc5 to fix the build

There hasn't been a release in a few years, but they're working on it.
---
 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 c6c996b5dbd..a846fbab75b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13586,6 +13586,7 @@ with pkgs;
 
   calf = callPackage ../applications/audio/calf {
       inherit (gnome2) libglade;
+      stdenv = overrideCC stdenv gcc5;
   };
 
   calcurse = callPackage ../applications/misc/calcurse { };

From 029f40a552cdc39d211fd015c03aceab450c85dd Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 30 Aug 2017 11:04:26 -0400
Subject: [PATCH 3014/3246] xplanet: gcc6 patch

---
 .../science/astronomy/xplanet/default.nix     |   5 +-
 .../science/astronomy/xplanet/gcc6.patch      | 128 ++++++++++++++++++
 2 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/science/astronomy/xplanet/gcc6.patch

diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix
index 9c79bfe1a55..ca5bbd4882c 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/pkgs/applications/science/astronomy/xplanet/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];
 
-  patches = [ ./giflib.patch ];
+  patches = [
+    ./giflib.patch
+    ./gcc6.patch
+  ];
 
   meta = {
     description = "Renders an image of the earth or other planets into the X root window";
diff --git a/pkgs/applications/science/astronomy/xplanet/gcc6.patch b/pkgs/applications/science/astronomy/xplanet/gcc6.patch
new file mode 100644
index 00000000000..b30385a50f8
--- /dev/null
+++ b/pkgs/applications/science/astronomy/xplanet/gcc6.patch
@@ -0,0 +1,128 @@
+diff --git c/src/libannotate/addArcs.cpp i/src/libannotate/addArcs.cpp
+index 2ee06c0..0ff5478 100644
+--- c/src/libannotate/addArcs.cpp
++++ i/src/libannotate/addArcs.cpp
+@@ -258,7 +258,7 @@ addArcs(PlanetProperties *planetProperties, Planet *planet,
+         {
+             ifstream inFile(arcFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+                 readArcFile(line, planet, view, projection,
+                             planetProperties, annotationMap);
+             
+@@ -292,7 +292,7 @@ addArcs(View *view, multimap<double, Annotation *> &annotationMap)
+         {
+             ifstream inFile(arcFile.c_str());
+             char *line = new char[256];
+-            while (inFile.getline (line, 256, '\n') != NULL)
++            while (inFile.getline (line, 256, '\n'))
+                 readArcFile(line, NULL, view, NULL, NULL, annotationMap);
+ 
+             inFile.close();
+diff --git c/src/libannotate/addMarkers.cpp i/src/libannotate/addMarkers.cpp
+index 6a8a835..b35d820 100644
+--- c/src/libannotate/addMarkers.cpp
++++ i/src/libannotate/addMarkers.cpp
+@@ -423,7 +423,7 @@ addMarkers(PlanetProperties *planetProperties, Planet *planet,
+         {
+             ifstream inFile(markerFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+             {
+                 unsigned char color[3];
+                 memcpy(color, planetProperties->MarkerColor(), 3);
+@@ -469,7 +469,7 @@ addMarkers(View *view, const int width, const int height,
+         {
+             ifstream inFile(markerFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+             {
+                 unsigned char color[3];
+                 memcpy(color, options->Color(), 3);
+diff --git c/src/libannotate/addSatellites.cpp i/src/libannotate/addSatellites.cpp
+index 2634339..c9ff0b0 100644
+--- c/src/libannotate/addSatellites.cpp
++++ i/src/libannotate/addSatellites.cpp
+@@ -488,10 +488,10 @@ loadSatelliteVector(PlanetProperties *planetProperties)
+         {
+             ifstream inFile(tleFile.c_str());
+             char lines[3][80];
+-            while (inFile.getline(lines[0], 80) != NULL)
++            while (inFile.getline(lines[0], 80))
+             {
+-                if ((inFile.getline(lines[1], 80) == NULL) 
+-                    || (inFile.getline(lines[2], 80) == NULL))
++                if ((inFile.getline(lines[1], 80))
++                    || (inFile.getline(lines[2], 80)))
+                 {
+                     ostringstream errStr;
+                     errStr << "Malformed TLE file (" << tleFile << ")?\n";
+@@ -542,7 +542,7 @@ addSatellites(PlanetProperties *planetProperties, Planet *planet,
+         {
+             ifstream inFile(satFile.c_str());
+             char *line = new char[MAX_LINE_LENGTH];
+-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
+                 readSatelliteFile(line, planet, view, projection,
+                                   planetProperties, annotationMap);
+             
+diff --git c/src/libmultiple/RayleighScattering.cpp i/src/libmultiple/RayleighScattering.cpp
+index d885173..7c25c1c 100644
+--- c/src/libmultiple/RayleighScattering.cpp
++++ i/src/libmultiple/RayleighScattering.cpp
+@@ -369,7 +369,7 @@ RayleighScattering::readConfigFile(string configFile)
+ 
+     diskTemplate_.clear();
+     limbTemplate_.clear();
+-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+     {
+         int i = 0;
+         while (isDelimiter(line[i]))
+@@ -439,7 +439,7 @@ RayleighScattering::readBlock(ifstream &inFile,
+     values.clear();
+ 
+     char line[MAX_LINE_LENGTH];
+-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+     {
+         int i = 0;
+         while (isDelimiter(line[i]))
+@@ -470,7 +470,7 @@ RayleighScattering::readValue(ifstream &inFile,
+                               double &value)
+ {
+     char line[MAX_LINE_LENGTH];
+-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+     {
+         int i = 0;
+         while (isDelimiter(line[i]))
+diff --git c/src/libmultiple/drawStars.cpp i/src/libmultiple/drawStars.cpp
+index ff07c49..22e41a0 100644
+--- c/src/libmultiple/drawStars.cpp
++++ i/src/libmultiple/drawStars.cpp
+@@ -41,7 +41,7 @@ drawStars(DisplayBase *display, View *view)
+     ifstream inFile(starMap.c_str());
+ 
+     char line[MAX_LINE_LENGTH];
+-    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
+     {
+         if (line[0] == '#') continue;
+ 
+diff --git c/src/readConfig.cpp i/src/readConfig.cpp
+index cc1964f..2946690 100644
+--- c/src/readConfig.cpp
++++ i/src/readConfig.cpp
+@@ -550,7 +550,7 @@ readConfigFile(string configFile, PlanetProperties *planetProperties[])
+ 
+         ifstream inFile(configFile.c_str());
+         char *line = new char[256];
+-        while (inFile.getline(line, 256, '\n') != NULL)
++        while (inFile.getline(line, 256, '\n'))
+             readConfig(line, planetProperties);
+         
+         // This condition will only be true if [default] is the only

From a48a2c4f788003a9e19dd63730732f82e835ba0f Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 8 Aug 2017 01:52:08 -0700
Subject: [PATCH 3015/3246] ipfs: add autoMount option

---
 .../services/network-filesystems/ipfs.nix     | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 60822b5b547..74711a10abb 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -7,7 +7,11 @@ let
 
   cfg = config.services.ipfs;
 
-  ipfsFlags = ''${if cfg.autoMigrate then "--migrate" else ""} ${if cfg.enableGC then "--enable-gc" else ""} ${toString cfg.extraFlags}'';
+  ipfsFlags = toString ([
+    (optionalString cfg.autoMount   "--mount")
+    (optionalString cfg.autoMigrate "--migrate")
+    (optionalString cfg.enableGC    "--enable-gc")
+  ] ++ cfg.extraFlags);
 
   # Before Version 17.09, ipfs would always use "/var/lib/ipfs/.ipfs" as it's dataDir
   defaultDataDir = if versionAtLeast config.system.stateVersion "17.09" then
@@ -17,7 +21,9 @@ let
   # Wrapping the ipfs binary with the environment variable IPFS_PATH set to dataDir because we can't set it in the user environment
   wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; } ''
     mkdir -p "$out/bin"
-    makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" --set IPFS_PATH ${cfg.dataDir}
+    makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" \
+      --set IPFS_PATH ${cfg.dataDir} \
+      --prefix PATH : /run/wrappers/bin
   '';
 in
 
@@ -63,6 +69,12 @@ in
         '';
       };
 
+      autoMount = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether IPFS should try to mount /ipfs and /ipns at startup.";
+      };
+
       gatewayAddress = mkOption {
         type = types.str;
         default = "/ip4/127.0.0.1/tcp/8080";
@@ -133,12 +145,16 @@ in
       preStart = ''
         install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
       '';
-      script =  ''
+      script = ''
         if [[ ! -f ${cfg.dataDir}/config ]]; then
           ${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"}
         fi
         ${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress}
         ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
+      '' + optionalString cfg.autoMount ''
+        ${ipfs}/bin/ipfs --local config Mounts.FuseAllowOther --json true
+        mkdir -p $(${ipfs}/bin/ipfs --local config Mounts.IPFS)
+        mkdir -p $(${ipfs}/bin/ipfs --local config Mounts.IPNS)
       '';
 
       serviceConfig = {

From 5f9bad6ceb75713c051ef722f5b57dd6c036a67a Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Sun, 27 Aug 2017 09:52:56 -0700
Subject: [PATCH 3016/3246] ipfs: add extraConfig option

---
 .../services/network-filesystems/ipfs.nix     | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 74711a10abb..f93f5bcb628 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -103,11 +103,32 @@ in
         '';
       };
 
+      extraConfig = mkOption {
+        type = types.attrs;
+        description = toString [
+          "Attrset of daemon configuration to set using `ipfs config`, every time the daemon starts."
+          "These are applied last, so may override configuration set by other options in this module."
+          "Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default!"
+        ];
+        default = {};
+        example = {
+          Datastore.StorageMax = "100GB";
+          Discovery.MDNS.Enabled = false;
+          Bootstrap = [
+            "/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
+            "/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm"
+          ];
+          Swarm.AddrFilters = null;
+        };
+
+      };
+
       extraFlags = mkOption {
         type = types.listOf types.str;
         description = "Extra flags passed to the IPFS daemon";
         default = [];
       };
+
     };
   };
 
@@ -155,7 +176,19 @@ in
         ${ipfs}/bin/ipfs --local config Mounts.FuseAllowOther --json true
         mkdir -p $(${ipfs}/bin/ipfs --local config Mounts.IPFS)
         mkdir -p $(${ipfs}/bin/ipfs --local config Mounts.IPNS)
-      '';
+      '' + concatStringsSep "\n" (collect
+            isString
+            (mapAttrsRecursive
+              (path: value:
+              # Using heredoc below so that the value is never improperly quoted
+              ''
+                read value <<EOF
+                ${builtins.toJSON value}
+                EOF
+                ipfs --local config --json "${concatStringsSep "." path}" "$value"
+              '')
+              cfg.extraConfig)
+          );
 
       serviceConfig = {
         User = cfg.user;

From 952424217b0e0177362a7e9e00305abc22762a19 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Mon, 31 Jul 2017 07:15:02 -0700
Subject: [PATCH 3017/3246] ipfs: optionally manage ulimit -n in serviceConfig

---
 .../services/network-filesystems/ipfs.nix        | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index f93f5bcb628..df8506dd3d4 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -8,6 +8,7 @@ let
   cfg = config.services.ipfs;
 
   ipfsFlags = toString ([
+    (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=true")
     (optionalString cfg.autoMount   "--mount")
     (optionalString cfg.autoMigrate "--migrate")
     (optionalString cfg.enableGC    "--enable-gc")
@@ -129,6 +130,15 @@ in
         default = [];
       };
 
+      serviceFdlimit = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          The fdlimit for the IPFS systemd unit or `null` to have the daemon attempt to manage it.
+        '';
+        example = 256*1024;
+      };
+
     };
   };
 
@@ -219,7 +229,7 @@ in
         Group = cfg.group;
         Restart = "on-failure";
         RestartSec = 1;
-      };
+      } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
     };
 
     systemd.services.ipfs-offline = {
@@ -242,7 +252,7 @@ in
         Group = cfg.group;
         Restart = "on-failure";
         RestartSec = 1;
-      };
+      } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
     };
 
     systemd.services.ipfs-norouting = {
@@ -265,7 +275,7 @@ in
         Group = cfg.group;
         Restart = "on-failure";
         RestartSec = 1;
-      };
+      } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
     };
 
   };

From ba976021af3b191263e86d4f1b8605d12ae56387 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Mon, 28 Aug 2017 13:09:39 -0700
Subject: [PATCH 3018/3246] ipfs: refactor; wrapper adjustment

---
 .../services/network-filesystems/ipfs.nix     | 113 ++++++------------
 1 file changed, 37 insertions(+), 76 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index df8506dd3d4..d6840b0ea0d 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -1,20 +1,19 @@
 { config, lib, pkgs, ... }:
-
 with lib;
-
 let
   inherit (pkgs) ipfs runCommand makeWrapper;
 
   cfg = config.services.ipfs;
 
   ipfsFlags = toString ([
-    (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=true")
-    (optionalString cfg.autoMount   "--mount")
-    (optionalString cfg.autoMigrate "--migrate")
-    (optionalString cfg.enableGC    "--enable-gc")
+    (optionalString  cfg.autoMount                   "--mount")
+    (optionalString  cfg.autoMigrate                 "--migrate")
+    (optionalString  cfg.enableGC                    "--enable-gc")
+    (optionalString (cfg.serviceFdlimit != null)     "--manage-fdlimit=false")
+    (optionalString (cfg.defaultMode == "offline")   "--offline")
+    (optionalString (cfg.defaultMode == "norouting") "--routing=none")
   ] ++ cfg.extraFlags);
 
-  # Before Version 17.09, ipfs would always use "/var/lib/ipfs/.ipfs" as it's dataDir
   defaultDataDir = if versionAtLeast config.system.stateVersion "17.09" then
     "/var/lib/ipfs" else
     "/var/lib/ipfs/.ipfs";
@@ -26,9 +25,24 @@ let
       --set IPFS_PATH ${cfg.dataDir} \
       --prefix PATH : /run/wrappers/bin
   '';
-in
 
-{
+
+  commonEnv = {
+    environment.IPFS_PATH = cfg.dataDir;
+    path = [ wrapped ];
+    serviceConfig.User = cfg.user;
+    serviceConfig.Group = cfg.group;
+  };
+
+  baseService = recursiveUpdate commonEnv {
+    wants = [ "ipfs-init.service" ];
+    serviceConfig = {
+      ExecStart = "${wrapped}/bin/ipfs daemon ${ipfsFlags}";
+      Restart = "on-failure";
+      RestartSec = 1;
+    } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
+  };
+in {
 
   ###### interface
 
@@ -158,34 +172,28 @@ in
     };
 
     users.extraGroups = mkIf (cfg.group == "ipfs") {
-      ipfs = {
-        gid = config.ids.gids.ipfs;
-      };
+      ipfs.gid = config.ids.gids.ipfs;
     };
 
-    systemd.services.ipfs-init = {
+    systemd.services.ipfs-init = recursiveUpdate commonEnv {
       description = "IPFS Initializer";
 
       after = [ "local-fs.target" ];
       before = [ "ipfs.service" "ipfs-offline.service" ];
 
-      environment.IPFS_PATH = cfg.dataDir;
-
-      path  = [ pkgs.ipfs pkgs.su pkgs.bash ];
-
       preStart = ''
         install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
       '';
       script = ''
         if [[ ! -f ${cfg.dataDir}/config ]]; then
-          ${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"}
+          ipfs init ${optionalString cfg.emptyRepo "-e"}
         fi
-        ${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress}
-        ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
+        ipfs --local config Addresses.API ${cfg.apiAddress}
+        ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
       '' + optionalString cfg.autoMount ''
-        ${ipfs}/bin/ipfs --local config Mounts.FuseAllowOther --json true
-        mkdir -p $(${ipfs}/bin/ipfs --local config Mounts.IPFS)
-        mkdir -p $(${ipfs}/bin/ipfs --local config Mounts.IPNS)
+        ipfs --local config Mounts.FuseAllowOther --json true
+        mkdir -p $(ipfs --local config Mounts.IPFS)
+        mkdir -p $(ipfs --local config Mounts.IPNS)
       '' + concatStringsSep "\n" (collect
             isString
             (mapAttrsRecursive
@@ -201,81 +209,34 @@ in
           );
 
       serviceConfig = {
-        User = cfg.user;
-        Group = cfg.group;
         Type = "oneshot";
         RemainAfterExit = true;
         PermissionsStartOnly = true;
       };
     };
 
-    systemd.services.ipfs = {
+    # TODO These 3 definitions possibly be further abstracted through use of a function
+    # like: mutexServices "ipfs" [ "", "offline", "norouting" ] { ... shared conf here ... }
+
+    systemd.services.ipfs = recursiveUpdate baseService {
       description = "IPFS Daemon";
-
       wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];
-
       after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
-
       conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
-      wants = [ "ipfs-init.service" ];
-
-      environment.IPFS_PATH = cfg.dataDir;
-
-      path  = [ pkgs.ipfs ];
-
-      serviceConfig = {
-        ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}";
-        User = cfg.user;
-        Group = cfg.group;
-        Restart = "on-failure";
-        RestartSec = 1;
-      } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
     };
 
-    systemd.services.ipfs-offline = {
+    systemd.services.ipfs-offline = recursiveUpdate baseService {
       description = "IPFS Daemon (offline mode)";
-
       wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ];
-
       after = [ "local-fs.target" "ipfs-init.service" ];
-
       conflicts = [ "ipfs.service" "ipfs-norouting.service"];
-      wants = [ "ipfs-init.service" ];
-
-      environment.IPFS_PATH = cfg.dataDir;
-
-      path  = [ pkgs.ipfs ];
-
-      serviceConfig = {
-        ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --offline";
-        User = cfg.user;
-        Group = cfg.group;
-        Restart = "on-failure";
-        RestartSec = 1;
-      } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
     };
 
-    systemd.services.ipfs-norouting = {
+    systemd.services.ipfs-norouting = recursiveUpdate baseService {
       description = "IPFS Daemon (no routing mode)";
-
       wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ];
-
       after = [ "local-fs.target" "ipfs-init.service" ];
-
       conflicts = [ "ipfs.service" "ipfs-offline.service"];
-      wants = [ "ipfs-init.service" ];
-
-      environment.IPFS_PATH = cfg.dataDir;
-
-      path  = [ pkgs.ipfs ];
-
-      serviceConfig = {
-        ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --routing=none";
-        User = cfg.user;
-        Group = cfg.group;
-        Restart = "on-failure";
-        RestartSec = 1;
-      } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };
     };
 
   };

From 5554ea55838f7b4fd3bf8f3efd7ef51180965eae Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 29 Aug 2017 10:34:48 -0700
Subject: [PATCH 3019/3246] ipfs: preStart configuration moved into daemon
 services

---
 .../services/network-filesystems/ipfs.nix     | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index d6840b0ea0d..34bb6770efd 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -36,6 +36,26 @@ let
 
   baseService = recursiveUpdate commonEnv {
     wants = [ "ipfs-init.service" ];
+    preStart = ''
+      ipfs --local config Addresses.API ${cfg.apiAddress}
+      ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
+    '' + optionalString cfg.autoMount ''
+      ipfs --local config Mounts.FuseAllowOther --json true
+      mkdir -p $(ipfs --local config Mounts.IPFS)
+      mkdir -p $(ipfs --local config Mounts.IPNS)
+    '' + concatStringsSep "\n" (collect
+          isString
+          (mapAttrsRecursive
+            (path: value:
+            # Using heredoc below so that the value is never improperly quoted
+            ''
+              read value <<EOF
+              ${builtins.toJSON value}
+              EOF
+              ipfs --local config --json "${concatStringsSep "." path}" "$value"
+            '')
+            cfg.extraConfig)
+        );
     serviceConfig = {
       ExecStart = "${wrapped}/bin/ipfs daemon ${ipfsFlags}";
       Restart = "on-failure";
@@ -188,25 +208,7 @@ in {
         if [[ ! -f ${cfg.dataDir}/config ]]; then
           ipfs init ${optionalString cfg.emptyRepo "-e"}
         fi
-        ipfs --local config Addresses.API ${cfg.apiAddress}
-        ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
-      '' + optionalString cfg.autoMount ''
-        ipfs --local config Mounts.FuseAllowOther --json true
-        mkdir -p $(ipfs --local config Mounts.IPFS)
-        mkdir -p $(ipfs --local config Mounts.IPNS)
-      '' + concatStringsSep "\n" (collect
-            isString
-            (mapAttrsRecursive
-              (path: value:
-              # Using heredoc below so that the value is never improperly quoted
-              ''
-                read value <<EOF
-                ${builtins.toJSON value}
-                EOF
-                ipfs --local config --json "${concatStringsSep "." path}" "$value"
-              '')
-              cfg.extraConfig)
-          );
+      '';
 
       serviceConfig = {
         Type = "oneshot";

From 5050c5638235ee2af92dfc769ea0476bc049e62d Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Wed, 30 Aug 2017 08:24:09 -0700
Subject: [PATCH 3020/3246] ipfs: adding mountDir options but disabling broken
 autoMount

---
 .../services/network-filesystems/ipfs.nix     | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 34bb6770efd..cd320c5c462 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -6,7 +6,7 @@ let
   cfg = config.services.ipfs;
 
   ipfsFlags = toString ([
-    (optionalString  cfg.autoMount                   "--mount")
+    #(optionalString  cfg.autoMount                   "--mount")
     (optionalString  cfg.autoMigrate                 "--migrate")
     (optionalString  cfg.enableGC                    "--enable-gc")
     (optionalString (cfg.serviceFdlimit != null)     "--manage-fdlimit=false")
@@ -39,10 +39,10 @@ let
     preStart = ''
       ipfs --local config Addresses.API ${cfg.apiAddress}
       ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
-    '' + optionalString cfg.autoMount ''
+    '' + optionalString false/*cfg.autoMount*/ ''
       ipfs --local config Mounts.FuseAllowOther --json true
-      mkdir -p $(ipfs --local config Mounts.IPFS)
-      mkdir -p $(ipfs --local config Mounts.IPNS)
+      ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}
+      ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir}
     '' + concatStringsSep "\n" (collect
           isString
           (mapAttrsRecursive
@@ -104,10 +104,22 @@ in {
         '';
       };
 
-      autoMount = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether IPFS should try to mount /ipfs and /ipns at startup.";
+      #autoMount = mkOption {
+      #  type = types.bool;
+      #  default = false;
+      #  description = "Whether IPFS should try to mount /ipfs and /ipns at startup.";
+      #};
+
+      ipfsMountDir = mkOption {
+        type = types.str;
+        default = "/ipfs";
+        description = "Where to mount the IPFS namespace to";
+      };
+
+      ipnsMountDir = mkOption {
+        type = types.str;
+        default = "/ipns";
+        description = "Where to mount the IPNS namespace to";
       };
 
       gatewayAddress = mkOption {
@@ -203,6 +215,9 @@ in {
 
       preStart = ''
         install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
+      '' + optionalString false/*cfg.autoMount*/ ''
+        install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipfsMountDir}
+        install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipnsMountDir}
       '';
       script = ''
         if [[ ! -f ${cfg.dataDir}/config ]]; then

From 4ef4a17f779b3e6d09667639c0f34980e1325f12 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 30 Aug 2017 17:53:03 +0200
Subject: [PATCH 3021/3246] nilfs-utils: fix build

Just kill .libs to make sure patchelf does shrink-rpath correctly

Complain in comments that patchelf/#98 is still not used by stdenv
---
 pkgs/tools/filesystems/nilfs-utils/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix
index c5cc4f053a2..80a0d566edc 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/pkgs/tools/filesystems/nilfs-utils/default.nix
@@ -23,8 +23,14 @@ stdenv.mkDerivation rec {
     sed -e 's@/sbin/@'"$out"'/sbin/@' -i ./lib/cleaner*.c
   '';
 
-  # FIXME: Remove after https://github.com/NixOS/patchelf/pull/98 is in
-  dontPatchELF = true;
+  # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv
+  # still doesn't use it
+  #
+  # To make sure patchelf doesn't mistakenly keep the reference via
+  # build directory
+  postInstall = ''
+    find . -name .libs | xargs rm -rf
+  '';
 
   meta = {
     description = "NILFS utilities";

From b8538c680192924a77cac739ffac0438848649d4 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 30 Aug 2017 11:49:34 -0400
Subject: [PATCH 3022/3246] chromedriver: fix on Darwin

A refactor broke it by forcing a bunch of Linux-specific dependencies on
Darwin that only get used in the patchelf invocation.
---
 .../tools/selenium/chromedriver/default.nix      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index b349b389997..8912f52ba60 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -22,6 +22,14 @@ let
 
   spec = allSpecs."${stdenv.system}"
     or (throw "missing chromedriver binary for ${stdenv.system}");
+
+  libs = stdenv.lib.makeLibraryPath [
+    stdenv.cc.cc.lib
+    cairo fontconfig freetype
+    gdk_pixbuf glib gtk2 gconf
+    libX11 nspr nss pango libXrender
+    gconf libXext libXi
+  ];
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
@@ -36,14 +44,6 @@ stdenv.mkDerivation rec {
 
   unpackPhase = "unzip $src";
 
-  libs = stdenv.lib.makeLibraryPath [
-    stdenv.cc.cc.lib
-    cairo fontconfig freetype
-    gdk_pixbuf glib gtk2 gconf
-    libX11 nspr nss pango libXrender
-    gconf libXext libXi
-  ];
-
   installPhase = ''
     install -m755 -D chromedriver $out/bin/chromedriver
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''

From 28856eb23b85d341a07cc79eccfe8e5e7e1d814c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 30 Aug 2017 17:22:58 +0200
Subject: [PATCH 3023/3246] Lmms: fix homepage URL

---
 pkgs/applications/audio/lmms/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 7ba5bcc4ac4..dcefbb06436 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Linux MultiMedia Studio";
-    homepage = http://lmms.sourceforge.net;
+    homepage = https://lmms.io;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];

From 5b70a2f1e555b802f5302489136675ec6edba61e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 30 Aug 2017 17:23:34 +0200
Subject: [PATCH 3024/3246] lmms: use gcc5

This should be fixed in 1.2, which has had a few release candidates
already.
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a846fbab75b..82eafe36d35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15097,7 +15097,9 @@ with pkgs;
 
   llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { };
 
-  lmms = callPackage ../applications/audio/lmms { };
+  lmms = callPackage ../applications/audio/lmms {
+    stdenv = overrideCC stdenv gcc5;
+  };
 
   loxodo = callPackage ../applications/misc/loxodo { };
 

From 769c44d9d87b4a2f39bd1f854fd5a506cd517150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 30 Aug 2017 17:56:21 +0200
Subject: [PATCH 3025/3246] mixxx: patch to build with gcc6 (via debian)

Also, get the sqlite patch directly from bugs.gentoo.org.
---
 pkgs/applications/audio/mixxx/default.nix  | 14 ++++++++++++--
 pkgs/applications/audio/mixxx/sqlite.patch | 13 -------------
 2 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/applications/audio/mixxx/sqlite.patch

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 0bf7472ea11..6d353344b07 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, chromaprint, fftw, flac, libid3tag, libmad
+{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, libid3tag, libmad
 , libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig
 , portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
 , taglib, vampSDK
@@ -13,7 +13,17 @@ stdenv.mkDerivation rec {
     sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
   };
 
-  patches = [ ./sqlite.patch ]; # from: https://bugs.gentoo.org/show_bug.cgi?id=622776
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/m/mixxx/2.0.0~dfsg-7.1/debian/patches/0007-fix_gcc6_issue.patch";
+      sha256 = "0kpyv10wcjcvbijk6vpq54gx9sqzrq4kq2qilc1czmisp9qdy5sd";
+    })
+    (fetchpatch {
+      url = "https://622776.bugs.gentoo.org/attachment.cgi?id=487284";
+      name = "sqlite.patch";
+      sha256 = "1qqbd8nrxrjcc1dwvyqfq1k2yz3l071sfcgd2dmpk6j8d4j5kx31";
+    })
+ ];
 
   buildInputs = [
     chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
diff --git a/pkgs/applications/audio/mixxx/sqlite.patch b/pkgs/applications/audio/mixxx/sqlite.patch
deleted file mode 100644
index ed9f4ee5143..00000000000
--- a/pkgs/applications/audio/mixxx/sqlite.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN old/src/library/trackcollection.h mixxx-2.0.0/src/library/trackcollection.h
---- old/src/library/trackcollection.h	2017-07-30 00:04:48.511029517 -0400
-+++ mixxx-2.0.0/src/library/trackcollection.h	2017-07-30 00:05:03.378699826 -0400
-@@ -34,8 +34,7 @@
- #include "library/dao/libraryhashdao.h"
-
- #ifdef __SQLITE3__
--typedef struct sqlite3_context sqlite3_context;
--typedef struct Mem sqlite3_value;
-+#include <sqlite3.h>
- #endif
-
- class TrackInfoObject;

From e36afa80e3a09e2ec52a042a6ed437f27d6bc52f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 30 Aug 2017 18:19:00 +0200
Subject: [PATCH 3026/3246] gfan: 0.5 -> 0.6; #28643

---
 pkgs/applications/science/math/gfan/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index 05f09e4aedb..9a9a1ff762f 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -2,17 +2,16 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "gfan";
-  version = "0.5";
-  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+  version = "0.6";
+
   src = fetchurl {
     url = "http://home.math.au.dk/jensen/software/gfan/gfan${version}.tar.gz";
-    sha256 = "0adk9pia683wf6kn6h1i02b3801jz8zn67yf39pl57md7bqbrsma";
+    sha256 = "02d6dvzfwy0lnidfgf98052jfqwy285nfm1h5nnx7jbgic1nnpgz";
   };
-  preBuild = ''
-    sed -e 's@static int i;@//&@' -i app_minkowski.cpp
-  '';
-  makeFlags = ''PREFIX=$(out)'';
+
+  makeFlags = ''PREFIX=$(out) CC=cc CXX=c++ cddnoprefix=1'';
   buildInputs = [gmp mpir cddlib];
+
   meta = {
     inherit version;
     description = ''A software package for computing Gröbner fans and tropical varieties'';

From 3d107c15bd0c9f32cd8e51ed5c4aa40e4b1accf8 Mon Sep 17 00:00:00 2001
From: Mikael Brockman <mikael@brockman.se>
Date: Wed, 30 Aug 2017 19:21:17 +0300
Subject: [PATCH 3027/3246] solc: v0.4.13 -> v0.4.16 (#28732)

Also add the Z3 SMT solver as a dependency, since the new solc can use
it for checking assertions and stuff (which is awesome).
---
 pkgs/development/compilers/solc/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 714f06d0b53..43d10bbfb93 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchzip, fetchgit, boost, cmake }:
+{ stdenv, fetchzip, fetchgit, boost, cmake, z3 }:
 
 let
-  version = "0.4.13";
-  rev = "0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14";
-  sha256 = "0rhrm0bmk5s2358j40yx7dzr1938q17dchzflrxw6y7yvkhscxrm";
+  version = "0.4.16";
+  rev = "d7661dd97460250b4e1127b9e7ea91e116143780";
+  sha256 = "1fd69pdhkkkvbkrxipkck1icpqkpdskjzar48a1yzdsx3l8s4lil";
   jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
@@ -27,12 +27,14 @@ stdenv.mkDerivation {
       --replace '${jsoncppURL}' ${jsoncpp}
     substituteInPlace cmake/EthCompilerSettings.cmake \
       --replace 'add_compile_options(-Werror)' ""
-    substituteInPlace cmake/EthDependencies.cmake \
-      --replace 'set(Boost_USE_STATIC_LIBS ON)'   \
-                'set(Boost_USE_STATIC_LIBS OFF)'
   '';
 
-  buildInputs = [ boost cmake ];
+  cmakeFlags = [
+    "-DBoost_USE_STATIC_LIBS=OFF"
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost z3 ];
 
   meta = {
     description = "Compiler for Ethereum smart contract language Solidity";

From 078abc31aadc83aafa032be58695a0423feb7466 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 30 Aug 2017 12:32:45 -0400
Subject: [PATCH 3028/3246] xbase: gcc6/gcc7 patches

---
 pkgs/development/libraries/xbase/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index 45d7d6f8301..79f75abfd91 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -15,6 +15,14 @@ stdenv.mkDerivation {
       url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?revision=1.1";
       sha256 = "1kpcrkkcqdwl609yd0qxlvp743icz3vni13993sz6fkgn5lah8yl";
     })
+    (fetchurl {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc6.patch";
+      sha256 = "1994pqiip5njkcmm5czb1bg6zdldkx1mpandgmvzqrja0iacf953";
+    })
+    (fetchurl {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc7.patch";
+      sha256 = "1304gn9dbdv8xf61crkg0fc8cal0h4qkyhlbqa8y618w134cxh1q";
+    })
   ];
 
   meta = {

From 55a123a49db4371b9108e35b675a6924df76a04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20R=C5=AF=C5=BEi=C4=8Dka?=
 <adamruzicka@users.noreply.github.com>
Date: Wed, 30 Aug 2017 18:43:27 +0200
Subject: [PATCH 3029/3246] notmuch-addrlookup: fix build with notmuch 0.25
 (#27691)

---
 .../0001-notmuch-0.25-compatibility-fix.patch | 44 +++++++++++++++++++
 .../notmuch-addrlookup/default.nix            |  3 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch

diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch
new file mode 100644
index 00000000000..be094c9a397
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch
@@ -0,0 +1,44 @@
+From a736c0dfd22cd4ab0da86c30a664c91843df1b98 Mon Sep 17 00:00:00 2001
+From: Adam Ruzicka <a.ruzicka@outlook.com>
+Date: Sat, 29 Jul 2017 12:16:29 +0200
+Subject: [PATCH] notmuch-0.25 compatibility fix
+
+---
+ notmuch-addrlookup.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/notmuch-addrlookup.c b/notmuch-addrlookup.c
+index c5cf5b4..a95ded0 100644
+--- a/notmuch-addrlookup.c
++++ b/notmuch-addrlookup.c
+@@ -171,6 +171,13 @@ create_queries (notmuch_database_t *db,
+       count += tmp;
+   if (notmuch_query_count_messages_st (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
+       count += tmp;
++#elif LIBNOTMUCH_MAJOR_VERSION >= 5
++  unsigned int count = 0;
++  unsigned int tmp;
++  if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
++      count += tmp;
++  if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
++      count += tmp;
+ #else
+   unsigned int count = notmuch_query_count_messages (queries[0])
+                      + notmuch_query_count_messages (queries[1]);
+@@ -233,6 +240,13 @@ run_queries (notmuch_database_t *db,
+ #if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3
+       if (notmuch_query_search_messages_st (queries[i], &messages) != NOTMUCH_STATUS_SUCCESS)
+           continue;
++#elif LIBNOTMUCH_MAJOR_VERSION >= 5
++  unsigned int count = 0;
++  unsigned int tmp;
++  if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
++      count += tmp;
++  if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
++      count += tmp;
+ #else
+       if (!(messages = notmuch_query_search_messages (queries[i])))
+           continue;
+--
+2.13.3
+
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index 2cc4905e435..ae6033556fa 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig glib notmuch ];
 
+  # Required until notmuch-addrlookup can be compiled against notmuch >= 0.25
+  patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ];
+
   installPhase = ''
     mkdir -p "$out/bin"
     cp notmuch-addrlookup "$out/bin"

From 4c91e32da6268397834a3290bcd86622b320cffe Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 Aug 2017 13:17:51 -0400
Subject: [PATCH 3030/3246] linux-copperhead: 4.12.9.a -> 4.12.10.a

---
 pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 0edc17a6274..8e4f747051e 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.12.9";
+  version = "4.12.10";
   revision = "a";
-  sha256 = "0bdhzh483l9g6c7n263f4wxx5klfciswzkmd5p6jlf9wqx72km33";
+  sha256 = "00vm7bc4sfj2qj3yar9hy6qf8m2kmkxmxlf8q908jb1m541pfvpn";
 in
 
 import ./generic.nix (args // {

From fa5e34324204fc626d9b644a37982bcedec9e4bc Mon Sep 17 00:00:00 2001
From: Grant Wu <grantwwu@gmail.com>
Date: Sat, 5 Aug 2017 17:13:26 -0400
Subject: [PATCH 3031/3246] deluge: 1.3.13 -> 1.3.15

Change libtorrentRasterbar dependency to 1.0.x series (required for
1.3.x series)
Move Deluge out of pythonPackages (it doesn't support Python 3)
---
 .../networking/p2p/deluge/default.nix         | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 pkgs/top-level/python-packages.nix            | 31 -------------------
 3 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/applications/networking/p2p/deluge/default.nix

diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
new file mode 100644
index 00000000000..7f8594b8bbb
--- /dev/null
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, intltool, libtorrentRasterbar_1_0, pythonPackages }:
+pythonPackages.buildPythonPackage rec {
+  name = "deluge-${version}";
+  version = "1.3.15";
+
+  src = fetchurl {
+    url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
+    sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    pyGtkGlade libtorrentRasterbar_1_0 twisted Mako chardet pyxdg pyopenssl service-identity
+  ];
+
+  nativeBuildInputs = [ intltool ];
+
+  postInstall = ''
+     mkdir -p $out/share/applications
+     cp -R deluge/data/pixmaps $out/share/
+     cp -R deluge/data/icons $out/share/
+     cp deluge/data/share/applications/deluge.desktop $out/share/applications
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://deluge-torrent.org;
+    description = "Torrent client";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ domenkozar ebzzry ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82eafe36d35..1d5e9042dbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1635,7 +1635,9 @@ with pkgs;
 
   ddrescue = callPackage ../tools/system/ddrescue { };
 
-  deluge = python2Packages.deluge; # Package should be moved out of python-packages.nix
+  deluge = callPackage ../applications/networking/p2p/deluge {
+    pythonPackages = python2Packages;
+  };
 
   desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f25018345b..d3f93621d8d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8775,37 +8775,6 @@ in {
     };
   };
 
-  deluge = buildPythonPackage rec {
-    name = "deluge-${version}";
-    version = "1.3.13";
-
-    src = pkgs.fetchurl {
-      url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
-      sha256 = "1ig8kv22009f0ny6n77a4lcfddhdsxrdklpmhdqvis1wx8na5crp";
-    };
-
-    propagatedBuildInputs = with self; [
-      pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl service-identity
-    ];
-
-    nativeBuildInputs = [ pkgs.intltool ];
-
-    postInstall = ''
-       mkdir -p $out/share/applications
-       cp -R deluge/data/pixmaps $out/share/
-       cp -R deluge/data/icons $out/share/
-       cp deluge/data/share/applications/deluge.desktop $out/share/applications
-    '';
-
-    meta = {
-      homepage = http://deluge-torrent.org;
-      description = "Torrent client";
-      license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ domenkozar ebzzry ];
-      platforms = platforms.all;
-    };
-  };
-
   pyxdg = buildPythonPackage rec {
     name = "pyxdg-0.25";
 

From 1f0d6f11908d725aadd691a8c60e5c47f9b47f79 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 30 Aug 2017 10:09:06 -0400
Subject: [PATCH 3032/3246] ardour: fix build with gcc6

---
 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 a1cca6ee162..4dc0c6f081f 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
+    [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac 
       glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
       libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
       libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2

From 28cb5f58cf58572f9d437a5995e39e013156f005 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 30 Aug 2017 13:30:07 -0400
Subject: [PATCH 3033/3246] elpa-packages: 2017-08-30

---
 .../editors/emacs-modes/elpa-generated.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index e605801fa80..9b6ffa704a3 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1530,10 +1530,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170821";
+        version = "20170828";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170821.tar";
-          sha256 = "13214dfm6ixypsl0mj1wrdcs42w1qn5ig8m5sb6ih697i2kbxkgg";
+          url = "https://elpa.gnu.org/packages/org-20170828.tar";
+          sha256 = "0frjwgjyy7rwb7si57h6nd1p35a4gcd1dc0aka19kn8r59hbi08p";
         };
         packageRequires = [];
         meta = {
@@ -2321,10 +2321,10 @@
     yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "yasnippet";
-        version = "0.12.1";
+        version = "0.12.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/yasnippet-0.12.1.tar";
-          sha256 = "01q1hn3w8w63s7cvr9bq6l5n4nyirnk8qfba60ajp3j6ndi2964n";
+          url = "https://elpa.gnu.org/packages/yasnippet-0.12.2.tar";
+          sha256 = "03cilldgq7fpzk9ix2a8q1ppilxp5gvyrym7krifvrg1g2rs1qv9";
         };
         packageRequires = [ cl-lib ];
         meta = {

From 28de93c5bd1ad12b0c33d89fda3af222bc2d619a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 30 Aug 2017 13:30:20 -0400
Subject: [PATCH 3034/3246] org-packages: 2017-08-30

---
 .../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 794c79d7151..78a59490dba 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 = "20170821";
+        version = "20170828";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170821.tar";
-          sha256 = "0pfqm8r1hgk1mf57rwp1h46gc5dwsyfkgnpw01a8y5w35dcsvz4j";
+          url = "http://orgmode.org/elpa/org-20170828.tar";
+          sha256 = "0zvszxw9dm1j3jf1fblvfc74kmiv3zmjydlkkj7q4vd0p4gnfvky";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170821";
+        version = "20170828";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170821.tar";
-          sha256 = "0m5zym1b4kr7q3ps41rhz92krbjmk9m220hc0rdym95gyjfzw62i";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170828.tar";
+          sha256 = "0r3n7ilf4aqsg9hl057qkl70s9bd9w5884ddigbiahv88hldvv4y";
         };
         packageRequires = [];
         meta = {

From e035d95a43b86147d4ba5285489baddaf4d934b9 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 30 Aug 2017 13:36:22 -0400
Subject: [PATCH 3035/3246] melpa-stable-packages: 2017-08-30

Removals:
 - chinese-fonts-setup: removed from melpa
 - chinese-pyim: removed from melpa
---
 .../emacs-modes/melpa-stable-generated.nix    | 480 +++++++++++-------
 1 file changed, 302 insertions(+), 178 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 1c521d0c9db..783c098f99a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -548,12 +548,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.7.9";
+        version = "1.8";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
-          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
+          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -569,12 +569,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.9";
+        version = "1.8";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
-          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
+          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -611,12 +611,12 @@
     ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ac-rtags";
-        version = "2.12";
+        version = "2.14";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+          sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -692,22 +692,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-buffer = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-buffer";
-        version = "0.3.1";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ace-jump-buffer";
-          rev = "41f8bb0744cdf9c219d25b417f2ffbd0883469e7";
-          sha256 = "1z82a0lrb61msamqpsy7rxcgs2nfhhckkk4zw0aw49l248p2nrgs";
+          rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a";
+          sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
-        packageRequires = [ ace-jump-mode dash ];
+        packageRequires = [ avy dash ];
         meta = {
           homepage = "https://melpa.org/#/ace-jump-buffer";
           license = lib.licenses.free;
@@ -1692,14 +1692,14 @@
         pname = "apache-mode";
         version = "2.1";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "apache-mode";
           rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
           sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
-          sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode";
+          sha256 = "0wzfx3kaiwvya30ihq3vpdhy6znkzf25w5x43x457ifdn2vrh9zi";
           name = "apache-mode";
         };
         packageRequires = [];
@@ -3166,12 +3166,12 @@
     buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-manage";
-        version = "0.2";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "buffer-manage";
-          rev = "1110217973afa1329c47a1f7e6962aad36a90134";
-          sha256 = "0hb75npk1d9bdqpgdrin8vvfn64arhgq0h69xgvhwcdlm7xjg1bf";
+          rev = "aa743807f92d457f3a8904a2504a575f22951850";
+          sha256 = "19xjzx1fcms3cighb7qr79zd4vrlnpvzi1yrgxb6z2jvcgkb7b44";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
@@ -3355,12 +3355,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "1.7";
+        version = "1.8";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb";
-          sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1";
+          rev = "e6f97d0ee4da1d061c2ff5f3e3984a30956a9fbc";
+          sha256 = "1qizbnychsjv42h9r33l1jm0rylvkgddcwgwxxcckfkj6r75k9p5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -3751,6 +3751,25 @@
           license = lib.licenses.free;
         };
       }) {};
+    catmacs = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "catmacs";
+        version = "0.1.1";
+        src = fetchgit {
+          url = "https://bitbucket.org/pymaximus/catmacs";
+          rev = "c6e8277bd2aab3f5fbf10d419111110f3b33564f";
+          sha256 = "0kdlmmqgpgmhbbvafywllqdwkkd5a41rf8zhfmxhs3ydza86hmlg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e62e45ea234a574ed602f27c3c6bc240bcd4fa43/recipes/catmacs";
+          sha256 = "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50";
+          name = "catmacs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/catmacs";
+          license = lib.licenses.free;
+        };
+      }) {};
     cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cbm";
@@ -4024,48 +4043,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "chinese-fonts-setup";
-        version = "0.1";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "cnfonts";
-          rev = "6f4423664e55d5470c4f239d04b88da5d6acb34d";
-          sha256 = "0d9xx43ijxrp95j5bnxcsnfwn032ypy2c1lypak15772nk6i7s1w";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup";
-          sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1";
-          name = "chinese-fonts-setup";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-fonts-setup";
-          license = lib.licenses.free;
-        };
-      }) {};
-    chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
-    melpaBuild {
-        pname = "chinese-pyim";
-        version = "1.6.1";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "pyim";
-          rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6";
-          sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim";
-          sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn";
-          name = "chinese-pyim";
-        };
-        packageRequires = [ pyim ];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-pyim";
-          license = lib.licenses.free;
-        };
-      }) {};
     chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-word-at-point";
@@ -4279,12 +4256,12 @@
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "0.5.3";
+        version = "0.5.4";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c";
-          sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14";
+          rev = "2aceea0e16e2f18b8b51161423ef1c0f655c7c8d";
+          sha256 = "13vhm7dsqbaslml3a2hd3s39c7q494p5w2xznhdxvh8ig6w102lc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -5215,12 +5192,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "1.7.9";
+        version = "1.8";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
-          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
+          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5284,12 +5261,12 @@
     company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "company-rtags";
-        version = "2.12";
+        version = "2.14";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+          sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -5475,14 +5452,14 @@
         pname = "composer";
         version = "0.0.8";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "composer.el";
           rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1";
           sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
-          sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer";
+          sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1";
           name = "composer";
         };
         packageRequires = [ emacs f request s seq ];
@@ -5622,14 +5599,14 @@
         pname = "copy-file-on-save";
         version = "0.0.1";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "emacs-auto-deployment";
           rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487";
           sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f99184ba41e9ab40b2fcff584421bbd933bffc72/recipes/copy-file-on-save";
-          sha256 = "07hm6ml9j9qwxbv9kv8w8i2x9js7fyrw3p7m219vpncka80qf6k3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
+          sha256 = "1mcwgkhd241aijnmzrrqqn9f7hiq5k1w4fj83v50aixrcs049gc3";
           name = "copy-file-on-save";
         };
         packageRequires = [ cl-lib emacs f s ];
@@ -6187,12 +6164,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "0.26";
+        version = "0.26.1";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "62f04f6766386893f5da6bee23d4de1e92a4148d";
-          sha256 = "0rw22qa67ifrw7kd58wjs2bnrjzkpr75k1rbhdgba526mm4s0q0x";
+          rev = "39c71d912af541229d24da17987d65e65731d2bf";
+          sha256 = "02alpsgmm0csp9yfa4bhsf8yyhf0q9rc44yrss0020qg8n92xs06";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -7601,12 +7578,12 @@
     dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dtrt-indent";
-        version = "0.2.1";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "jscheid";
           repo = "dtrt-indent";
-          rev = "a54871bedadabede505b3913ee1039f5ab36cad2";
-          sha256 = "0ylch7q8lh2r10qzrb41bnrpnznvj5fjszazmxfcvj6ss8yrxjzi";
+          rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c";
+          sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -7852,12 +7829,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "1.5.7";
+        version = "1.7.7";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c";
-          sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s";
+          rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2";
+          sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -9846,12 +9823,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20.0.2";
+        version = "20.0.4";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "6ede2da826335960037299d9f3b0e66d072ea5a0";
-          sha256 = "1zxfyd711l13n6xhspa8l0k4l7hb8aq1q1j2b2yrzw9k1hx2lfyj";
+          rev = "a230f26086b3db9097f06d4bb91fb3b2e9379c77";
+          sha256 = "1g26vf7ab18r9knxa2ykn3j6vrhhiyqbg6jf3gfjxw2c94z51a9m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -10013,12 +9990,12 @@
     esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esh-help";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "esh-help";
-          rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695";
-          sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m";
+          rev = "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6";
+          sha256 = "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
@@ -10706,12 +10683,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "3.0.2";
+        version = "3.0.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03";
-          sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m";
+          rev = "0a46b911200c75c4737bfdb2b71f10a9a8254969";
+          sha256 = "03v53zhm33fz6aib03j00bwkfqh2j45ziz7nwynynxm50j32axkg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -11503,12 +11480,12 @@
     fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fill-column-indicator";
-        version = "1.87";
+        version = "1.88";
         src = fetchFromGitHub {
           owner = "alpaker";
           repo = "Fill-Column-Indicator";
-          rev = "0e755319451dd9c6c99c2a2ef82c890ba93343b6";
-          sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
+          rev = "0c6f8f692854712a0c86d57c331b1bd9e6269b4d";
+          sha256 = "0l64r4id13lzrmnidq20hzjx0yip16lj47k3ajk01ycgqs4jpmzs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -11566,12 +11543,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "5.4.0";
+        version = "5.4.1";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "2d3e8d095e0c36f927142e80c4330977be698568";
-          sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j";
+          rev = "cb61762e50e85894febbbc82eeafa85d67707218";
+          sha256 = "0zzjr7z2iayibqvl8rrbpmdbar6i8b6zda65az8ybrwzbsz8zhnb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -12434,12 +12411,12 @@
     flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "flycheck-rtags";
-        version = "2.12";
+        version = "2.14";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+          sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -15106,15 +15083,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    gorepl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gorepl-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "manute";
+          repo = "gorepl-mode";
+          rev = "17e025951f5964a0542a4b353ddddbc734c01eed";
+          sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode";
+          sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq";
+          name = "gorepl-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gorepl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "0.13.0";
+        version = "0.14.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "2ae187078beb5d9672ca14cb636b6b4021de4230";
-          sha256 = "1pq9zjfs7gp7bz3jq11fx75m4zcx9p772lja5jicz535khpgxw7f";
+          rev = "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9";
+          sha256 = "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -15134,8 +15132,8 @@
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "d9b00bd93ab3fed0e7fff99b0dc8773584f5207d";
-          sha256 = "0vrz97w9yzkxl8pc9jmxkxvj5nagpnzqq9pvavwmvlh68wrh58gi";
+          rev = "417d61978d139cb5d089c5365fc8d3166d76d3ac";
+          sha256 = "0rc40cfj2mby1q7bk1pp1fxdi72nh9ip80spjdm1csvjjc4dbkwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -15474,6 +15472,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "green-is-the-new-black-theme";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "fredcamps";
+          repo = "green-is-the-new-black-emacs";
+          rev = "2b1011836fc04940d542e9a783b99670a08b308b";
+          sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
+          sha256 = "03q0vj409icmawffy2kd9yl04r453q80cy1p9y4i3xk368z0362g";
+          name = "green-is-the-new-black-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/green-is-the-new-black-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "green-screen-theme";
@@ -15913,6 +15932,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }:
+    melpaBuild {
+        pname = "harvest";
+        version = "0.3.8";
+        src = fetchFromGitHub {
+          owner = "kostajh";
+          repo = "harvest.el";
+          rev = "69041907bdca68d3ab6802e08ec698c3448f28a1";
+          sha256 = "0rqxi668wra1mfzq4fqscjghis5gqnwpazgidgix13brybaxydx4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/harvest";
+          sha256 = "1r6brld6iq03wsr1b3jhdkxwrcxa6g6fwa1jiy1kgjsr9dq1m51c";
+          name = "harvest";
+        };
+        packageRequires = [ hydra s swiper ];
+        meta = {
+          homepage = "https://melpa.org/#/harvest";
+          license = lib.licenses.free;
+        };
+      }) {};
     haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-emacs";
@@ -16062,12 +16102,12 @@
     hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "hasky-stack";
-        version = "0.2.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-stack";
-          rev = "e256e50fce9a65cad1754d863d9ed969b159cefe";
-          sha256 = "12rf51l5dg4c5jkn0rsyr47wfsw9qnmzl0hmsa8j04fm8nr978x7";
+          rev = "2379f43b589115bd3960a11c26fa0a7d12316db7";
+          sha256 = "1vkmm3mf4zcf1wrkwln7ik4i17dqx7a9lb8j2j0l217hn7h3mk5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -17448,12 +17488,12 @@
     helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "helm-rtags";
-        version = "2.12";
+        version = "2.14";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+          sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -17697,6 +17737,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helpful";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "helpful";
+          rev = "a5d8bc41e43177953d8ba3972a83755ddd4e1073";
+          sha256 = "0sr31df42cbrhzqxjvx1fcbafwq30jslqf715scrzyiziddf83zq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
+          sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
+          name = "helpful";
+        };
+        packageRequires = [ dash elisp-refs emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/helpful";
+          license = lib.licenses.free;
+        };
+      }) {};
     hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hfst-mode";
@@ -18348,6 +18409,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hy-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "hylang";
+          repo = "hy-mode";
+          rev = "c09b4e3cd8700966cb2120d5a4e62ebfb0b488b5";
+          sha256 = "054b1h621f6nfzz9nslyi1shs206my8s6zzv29k835by864bc0sq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
+          sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
+          name = "hy-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/hy-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hyai";
@@ -19317,12 +19399,12 @@
     insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "insert-shebang";
-        version = "0.9.5";
+        version = "0.9.6";
         src = fetchFromGitHub {
           owner = "psachin";
           repo = "insert-shebang";
-          rev = "8b36eaa092e62002fe64162daf9d3ad1138b6ec2";
-          sha256 = "1an7wzqnh9aj38bi9w0wsrs35h2z43lkaaw04lrz3a6zf797ac3x";
+          rev = "adfa473f07443b231914d277c20a3419b30399b6";
+          sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang";
@@ -19694,12 +19776,12 @@
     ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ivy-rtags";
-        version = "2.12";
+        version = "2.14";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+          sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -19715,12 +19797,12 @@
     ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
     melpaBuild {
         pname = "ivy-youtube";
-        version = "0.3.0";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "squiter";
           repo = "ivy-youtube";
-          rev = "c80bbab9d499d96bee3eb9a6d9be74ad254ec86d";
-          sha256 = "0n2v1w2801yxc71xd0vwma7y4nzs2qgnwbmkkx3xiq4n049sqd8l";
+          rev = "9a9d584124bd9905b5a8a7e29cdafa3224770c9d";
+          sha256 = "0fircdxhfb9s6qmzic2hizhlwfkszw3was83nw09zf0zhab3vllh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
@@ -21779,14 +21861,14 @@
         pname = "magic-filetype";
         version = "0.2.1";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "magic-filetype.el";
           rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd";
           sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
-          sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype";
+          sha256 = "0f0j8fgh2gpkarz9308pns0d89wc2dchyim6hbixkdpqzg9gskc3";
           name = "magic-filetype";
         };
         packageRequires = [ emacs s ];
@@ -22589,12 +22671,12 @@
     mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "mc-extras";
-        version = "1.2.1";
+        version = "1.2.4";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "mc-extras.el";
-          rev = "71cf966be06d9c74e781a87bb30fa4cf657ee852";
-          sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
+          rev = "f0ba639e9b18cc56e80ae45bbb2b694dbad9171a";
+          sha256 = "0d6ncj6zd0lfsdpffbh3l25ycjw5hn0rwi5znp5hpl06b1ycyk4s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12747bb8603ebc09ce0873f3317a99e34d818313/recipes/mc-extras";
@@ -24898,8 +24980,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "46b2c3d16b83ce6e7e318d69ae74e1d7c4106549";
-          sha256 = "0g2zap8yyv31lkpmdnripg1q03xdb7sm3jzq7j17sgqak2a223xp";
+          rev = "8aa56979fe85211b1e12c42e91b68a4ebee5176e";
+          sha256 = "15bsmi5cm208iq8rw87gvkkqja2shldbc4287x1qxny3cplcvwqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -25301,22 +25383,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-edit-latex";
-        version = "0.8.0";
+        version = "0.8.2";
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "323d0b39d0284cef730b706dce7c0e58ed35530f";
-          sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842";
+          rev = "83e03b6bef7746bc0a90c0a52ee8c18c4e87ada9";
+          sha256 = "1y9ycmsnwwc804zlsz20ad210plp0xgzjq69rpvry5gg17wp3nv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
           sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry";
           name = "org-edit-latex";
         };
-        packageRequires = [ auctex emacs org ];
+        packageRequires = [ auctex emacs ];
         meta = {
           homepage = "https://melpa.org/#/org-edit-latex";
           license = lib.licenses.free;
@@ -25531,6 +25613,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mru-clock";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "org-mru-clock";
+          rev = "096a7c514ab8487ec63def6281cf4dce24e3a626";
+          sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
+          sha256 = "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm";
+          name = "org-mru-clock";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-mru-clock";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-multiple-keymap";
@@ -27515,14 +27618,14 @@
         pname = "phan";
         version = "0.0.2";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "phan.el";
           rev = "4e3528f490e77d3aa6d81729b30b569434ef679f";
           sha256 = "1aif1hshwpzi353k2gcpwk9s76jlmz3s5dyf357qfv14b5ddhw6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan";
-          sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan";
+          sha256 = "17ar6nxy0plx5li49kgf4f0h99wwmnnp5kwmpf34jg9ygyhaglvb";
           name = "phan";
         };
         packageRequires = [ composer emacs f ];
@@ -28562,14 +28665,14 @@
         pname = "projectile-variable";
         version = "0.0.2";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "projectile-variable";
           rev = "8d348ac70bdd6dc320c13a12941b32b38140e264";
           sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable";
-          sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/projectile-variable";
+          sha256 = "15qc5n91nxyfvb100iyihfmrdr57qgw6098yv3nfqgw3zx1qchdw";
           name = "projectile-variable";
         };
         packageRequires = [ cl-lib emacs ];
@@ -28730,14 +28833,14 @@
         pname = "psysh";
         version = "0.0.4";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "psysh.el";
           rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa";
           sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh";
-          sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh";
+          sha256 = "00rzfw8nlbcmfbjnzbfl08136dhgvrrn9g1s9l623xgpbcay63sg";
           name = "psysh";
         };
         packageRequires = [ emacs f s ];
@@ -30347,14 +30450,14 @@
         pname = "robots-txt-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "robots-txt-mode";
           rev = "edf1f8082c88cb2ff5a784ba00f92c535aaa1c7d";
           sha256 = "11ig771ck610glb6f3322ka026ikq0b072rlq5z6ymr3rbxagn6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1669c7a0d89ea36d61bfa57ef54ee1f203daff5f/recipes/robots-txt-mode";
-          sha256 = "1q3fqaf9nysy9bhx4h9idgshxr65hfwnx05vlwazx7jd6bq6kxfh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/robots-txt-mode";
+          sha256 = "00hxz4mygcxg7d8m2i4cm0bl82v3hw8wb4m8vv7g7fqkjp32c9qc";
           name = "robots-txt-mode";
         };
         packageRequires = [];
@@ -30450,12 +30553,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.12";
+        version = "2.14";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "db1244c1c14514324474f362c857112e89bbf0c6";
-          sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+          rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+          sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -31037,11 +31140,11 @@
     secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "secretaria";
-        version = "0.2.5";
+        version = "0.2.7";
         src = fetchgit {
           url = "https://bitbucket.org/shackra/secretaria.el";
-          rev = "7bd1cf591528b18a153e15a260d7817b72c900f2";
-          sha256 = "0n9mj2g59yiqbg81rk0gglbgpvfs550r4y26n8nf5pyxpxfllv5s";
+          rev = "1cd32d957864be1ba5c44a3f505f662832169a28";
+          sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@@ -31939,12 +32042,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "2.19";
+        version = "2.20";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "6e20d01e446334848ea31ace0ce041cec25647ab";
-          sha256 = "1ywlbdk9ywfkv8z6pb69r29nh03krfdg676d086i8qjaas7ly2yp";
+          rev = "f223388c78ea51ce7717e9bbae14c50ad2386c2c";
+          sha256 = "07jks9fnqjv2i9sjfpgj7r3a7g5aha4aipsffjbnw1qd930ygw83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -32023,12 +32126,12 @@
     slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slstats";
-        version = "1.9";
+        version = "1.10";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "slstats.el";
-          rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167";
-          sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4";
+          rev = "e9696066abf3f2b7b818a57c062530dfd9377033";
+          sha256 = "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -32377,6 +32480,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    snazzy-theme = callPackage ({ base16-theme, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "snazzy-theme";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "weijiangan";
+          repo = "emacs-snazzy";
+          rev = "578d7ebc4ed91c0a630b652c4b6fdd54d9ae16cd";
+          sha256 = "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/18c89a612418e0f49b7e6ae29a678d2fc1ffaf3d/recipes/snazzy-theme";
+          sha256 = "0srmhwhqrp1s01p1znhjzs254l3r2i6c91v7cnlwlvrls1sbh32k";
+          name = "snazzy-theme";
+        };
+        packageRequires = [ base16-theme emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/snazzy-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "snoopy";
@@ -32611,12 +32735,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "1.3.5";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "255e89303bb706b42057504e72caeb2764f3d413";
-          sha256 = "0y3gv664crng4vibbh0pfh9w0ys9m5gny2b1mrqb7ma6xa78xiv2";
+          rev = "7eafe2d7a81f8d10e03498bdcc3bec0ea50f905d";
+          sha256 = "186v71d8n1iy73drayyf57pyzlz973q74mazkyvb8w3fj8bb3llm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -34498,12 +34622,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "0.11";
+        version = "0.11.1";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "541f73c779e72eb6ebcc6814a75771e91679875a";
-          sha256 = "1rjxn5pfryxbxsgfmmzidcs83azvzvzq0nnphbxmlxybp97wzimx";
+          rev = "d465378a59e2eb91372564a56e60a9ab00e48f9c";
+          sha256 = "0al0xz59lrqj97fxmyxiphblg1bvbzahc6srd8klg7s0378ybblw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -35932,12 +36056,12 @@
     weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
     melpaBuild {
         pname = "weechat";
-        version = "0.3.1";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "41f06299b2a691473b6b26c15dc46367542c79f0";
-          sha256 = "0vg3w18xj6i320jsivsml3mi1fdxr8dgxmn7qy2780ajy5ndxnw1";
+          rev = "a1bda40513f0ea94a8a85ee122a475475a03f6ef";
+          sha256 = "05jnfrjrf1da038jkypvx3slyk39xlpak4n9s5vwmx7mgf4zg06y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -36376,8 +36500,8 @@
         version = "0.9.2";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "e5a20c81c0bd";
-          sha256 = "13pb956f1yidwjh4imi01dghzs2wgd6r7n5bzhvpszvx4x1nw4z9";
+          rev = "7ce954278aef";
+          sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -37065,12 +37189,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "0.12.1";
+        version = "0.12.2";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5";
-          sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1";
+          rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a";
+          sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";

From 8374c027f96e21a8e540d6a08d079569a31a6901 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 30 Aug 2017 13:40:12 -0400
Subject: [PATCH 3036/3246] melpa-packages: 2017-08-30

Removals:
 - chinese-fonts-setup: removed from melpa
 - chinese-pyim: removed from melpa
 - mo-git-blame: source repository moved, recipe not yet updated
 - org-webpage: removed from melpa
 - simple-rtm: source repository moved, recipe not yet updated
 - vc-fossil: recipe doesn't match repository
---
 .../editors/emacs-modes/melpa-generated.nix   | 1467 +++++++++--------
 1 file changed, 759 insertions(+), 708 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 694013823c3..647d107c8ac 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -759,8 +759,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "5be2a4a9819f9685a1f6c464afd8bbc042d94575";
-          sha256 = "1khfh9fggs67fgz77yvlw8pw9gdbgy1dh4cbflccdbnjskrafnhl";
+          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
+          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -776,12 +776,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20170814.2227";
+        version = "20170823.352";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "5be2a4a9819f9685a1f6c464afd8bbc042d94575";
-          sha256 = "1khfh9fggs67fgz77yvlw8pw9gdbgy1dh4cbflccdbnjskrafnhl";
+          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
+          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -822,8 +822,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
-          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
+          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
+          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -944,12 +944,12 @@
     ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-buffer";
-        version = "20170717.1148";
+        version = "20170828.2153";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ace-jump-buffer";
-          rev = "9b1bb1a817c97cfa3853cc24474bd13e641f560d";
-          sha256 = "1qlm025jhxqsb5xcp1mcpm4djlah9xnsw3m26cfrk686b17x8l4l";
+          rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a";
+          sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
@@ -1305,8 +1305,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "2efb3ea5c3f3b4de79a6f21fa8dbcf90afb758f5";
-          sha256 = "06aagmalpxvic285v0ipvir6777ipj6l9izfqsblbb7j70klw0dm";
+          rev = "74d00c48a98211001c844ab4386d00420ccc850a";
+          sha256 = "1mjgl1pwaf0wl8hmzcwxq1g58mbi63ajbvhxljlysyfdkw15lvlq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1509,12 +1509,12 @@
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
-        version = "20170701.751";
+        version = "20170825.1009";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "d1d19c76393ffe80fb11c6837e8582c3cb087d40";
-          sha256 = "1gyjswlgbx5p1pq74qncrcjypkrfqd3dxm39bnbaszc6rhb58k8k";
+          rev = "ded94ab1421994aa863a4d7538ec7453768ec235";
+          sha256 = "1616vkjgn5g4xf40p15847pkqyrlfzp9d143a4cyk7za50a175ll";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1530,12 +1530,12 @@
     alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
     melpaBuild {
         pname = "alert";
-        version = "20170503.1714";
+        version = "20170824.1140";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "alert";
-          rev = "affbbc5f359a7abcf50f4509b712fc7a80843f51";
-          sha256 = "04zxhxkk8dnq07m2cidn9mw05m2wyvix6vvbj1jaaawb60b1ic7q";
+          rev = "08f42ced409b6edd70e4b13ed648f16240dc1ec1";
+          sha256 = "13my3m81binijaz9r113k1xll6p86qrcxacppzm20r71gpa1iifb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -2440,14 +2440,14 @@
         pname = "apache-mode";
         version = "20170711.913";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "apache-mode";
           rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
           sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
-          sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode";
+          sha256 = "0wzfx3kaiwvya30ihq3vpdhy6znkzf25w5x43x457ifdn2vrh9zi";
           name = "apache-mode";
         };
         packageRequires = [];
@@ -2605,12 +2605,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20170726.1123";
+        version = "20170829.754";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "4137ad1eed3fc2fe48c122e636f83580d1d04dd9";
-          sha256 = "1ydxwlv3v2whl4k77shlyjk0yyrm4cr6src9rsbzvw6in5cm483f";
+          rev = "68145a891348cb74db5209548c74dbc8a80e6902";
+          sha256 = "1r46810dn99cnbv3railbw79k42sz1pmhx2fbx60c4g80w2kcjy6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2895,12 +2895,12 @@
     async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "async";
-        version = "20170804.2158";
+        version = "20170823.2116";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "d395e92d2a12e8b944ccfcdc1330c8665a3187f5";
-          sha256 = "03n93cwbwrbs73kv2ysgc1qw6as8wd2q5cl743zb58y6h74kshv0";
+          rev = "5863eefbcd445f0fe917646f1326a9c86f067865";
+          sha256 = "16m1ykbjawia3nh6qkmp38yrdg58pc7k3vpfq364gf31qpsq6rwg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -4383,12 +4383,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170806.1329";
+        version = "20170824.1656";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "7b4e0dd8750e7a10fe446201e85346aeb18cca8e";
-          sha256 = "1wcdzq4smi0070inrr5pc4zi6rbyxrf1ba0pj206cq14nfvjywj5";
+          rev = "bb4f204f51439fcf8ae45429d150861523d1f1d0";
+          sha256 = "1vkv5kqs9crbk2j4jynyrx2fzijhimnhm2fvgwcxsb6hx3g257id";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4404,12 +4404,12 @@
     bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bash-completion";
-        version = "20170813.624";
+        version = "20170827.943";
         src = fetchFromGitHub {
           owner = "szermatt";
           repo = "emacs-bash-completion";
-          rev = "318e32979fab4e1fcb4fdf400af0e30148544951";
-          sha256 = "0kdh87rvrvb2dgqkhaqv2wj6m2z0g13va1vk6p8d6q2x4a2mp9y1";
+          rev = "2378b04eeb4338a8268072d7eda7820dba390ccd";
+          sha256 = "1hc5n0d4y5ayv6c10zyr806mxdp26j4gc20vw2i9mzdb1w862jmc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -5591,12 +5591,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20170802.1256";
+        version = "20170825.416";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "d5c4e762fcfad605b95125d8422f0071494ddd91";
-          sha256 = "1px37ymsakw3yxpa32sw7q4vi1mkiphaz0qfbl02gwxigdylpzlr";
+          rev = "13fca1929639e2239e9b4be060cbd4befd7921b4";
+          sha256 = "0nbwmb4l2f6y58gx8bm42688y6sqc33l5sf0gh1vmn2ki2mq7jvh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5696,12 +5696,12 @@
     bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bpr";
-        version = "20170820.354";
+        version = "20170823.1636";
         src = fetchFromGitHub {
           owner = "ilya-babanov";
           repo = "emacs-bpr";
-          rev = "9f4fac3f9cc9a44518d5c0f000b9a2c2b26d6b85";
-          sha256 = "0sn5xx3d461xm60hnj8jkr9rxnbs17kv8aq3br1qjy61yrg98gh7";
+          rev = "392de473664fbf319e3585a15f7f8abd34b3dbb6";
+          sha256 = "1ngz76j9mf9a1gvmwdy1r1jqxl8g4d3md95lqxq5dqbwz9076im2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr";
@@ -5882,12 +5882,12 @@
     bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bshell";
-        version = "20170806.1446";
+        version = "20170824.711";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "bshell";
-          rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68";
-          sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv";
+          rev = "b4f27abfdbcee572368ef1d50e7537e505c92773";
+          sha256 = "163fwyk7ncnmzxar452pl7gmnxn436mzl8ls7zliipzrfaicwp34";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
@@ -6029,12 +6029,12 @@
     buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-manage";
-        version = "20170818.738";
+        version = "20170828.852";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "buffer-manage";
-          rev = "badab811809da6c1c05daa8dda7b464a6002cbf5";
-          sha256 = "1qjfykpli0qcv769gwas9j3rcsqp08ryqbyymadnmkbssvqhkg9h";
+          rev = "0e50634aace95b322d00e9e91eb5e85367a02179";
+          sha256 = "195kb6hzcipz1px0fwdnk1adyyzxyyb84m9z206091dzhl2z6i3r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
@@ -6362,12 +6362,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20170812.128";
+        version = "20170827.202";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "6ad9565cd7adc195f81bdbbc1115a6bd96802a72";
-          sha256 = "1qlfr09k39wmhr6lngsq1c7gdw4c8smvmn2vj6r2jlhnfav54ig5";
+          rev = "5d1f338a67a2ed94412d2c69f52a845ca9c752f7";
+          sha256 = "11rkhr2jkzriqg7abx1xn4fdhmw1l77ascx7qpl10isg1fmmpmcb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6805,7 +6805,7 @@
         version = "20151009.845";
         src = fetchsvn {
           url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/";
-          rev = "16560";
+          rev = "16561";
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
@@ -6987,6 +6987,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    catmacs = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "catmacs";
+        version = "20170826.457";
+        src = fetchgit {
+          url = "https://bitbucket.org/pymaximus/catmacs";
+          rev = "65d3e0563abe6ff9577202cf2278074d4130fbdd";
+          sha256 = "0954qck9j417c17niy28ccrhmsbjyh95z4dbqc5j4mib06j37587";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e62e45ea234a574ed602f27c3c6bc240bcd4fa43/recipes/catmacs";
+          sha256 = "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50";
+          name = "catmacs";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/catmacs";
+          license = lib.licenses.free;
+        };
+      }) {};
     cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cbm";
@@ -7348,7 +7368,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12312";
+          rev = "12319";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7677,27 +7697,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-fonts-setup = callPackage ({ cnfonts, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "chinese-fonts-setup";
-        version = "20170726.1517";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "cnfonts";
-          rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182";
-          sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup";
-          sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1";
-          name = "chinese-fonts-setup";
-        };
-        packageRequires = [ cnfonts emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-fonts-setup";
-          license = lib.licenses.free;
-        };
-      }) {};
     chinese-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-number";
@@ -7719,27 +7718,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
-    melpaBuild {
-        pname = "chinese-pyim";
-        version = "20170728.2242";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "pyim";
-          rev = "1f40c4341a886ec952de14f642f07ccce90670b2";
-          sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim";
-          sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn";
-          name = "chinese-pyim";
-        };
-        packageRequires = [ pyim ];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-pyim";
-          license = lib.licenses.free;
-        };
-      }) {};
     chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-wbim";
@@ -7782,22 +7760,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    chinese-yasdcv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
     melpaBuild {
         pname = "chinese-yasdcv";
-        version = "20170504.321";
+        version = "20170827.1650";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-yasdcv";
-          rev = "92231de8771f2ffc9f5bb9b4ee08700fdb1a9dcb";
-          sha256 = "0viihcrnf7psqkfj2izdaah2w5bkz2cm46bgbhygzfqx8424vqh7";
+          rev = "fe14df025491530680529c98df3e3239ff44f57f";
+          sha256 = "0vcm381i2zvpjcq8jcxldk7dn2c7pbszmb8j3qwrw038hx0lbi3i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv";
           sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm";
           name = "chinese-yasdcv";
         };
-        packageRequires = [ chinese-pyim cl-lib ];
+        packageRequires = [ cl-lib pyim ];
         meta = {
           homepage = "https://melpa.org/#/chinese-yasdcv";
           license = lib.licenses.free;
@@ -7888,12 +7866,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170729.133";
+        version = "20170829.941";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "a1eee8c71237c98809c4852d9b1c799da903cd4f";
-          sha256 = "02nvrb40zk1wyw9v6wh0rnasv88phd3cn5kp1hmsspaa3sbyln1g";
+          rev = "7a53a92054d12b698790b3ec59af757014522b95";
+          sha256 = "180xirnh1v0sv6my4ymwdd1av8jbyr84ymw2cjwycg4m3rni0ccx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8164,8 +8142,8 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "311383";
-          sha256 = "135p8ag315sh9zwssb6f9widiqh6xrcnry1r1v0ij8r94n7bw6la";
+          rev = "312112";
+          sha256 = "063lnsasva07rnlhhb9dqpf5z92bjf1abs9z4rfggg5jqx1gmhs2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format";
@@ -8286,12 +8264,12 @@
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "20170208.514";
+        version = "20170821.1858";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c";
-          sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14";
+          rev = "2aceea0e16e2f18b8b51161423ef1c0f655c7c8d";
+          sha256 = "13vhm7dsqbaslml3a2hd3s39c7q494p5w2xznhdxvh8ig6w102lc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -8349,12 +8327,12 @@
     clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clips-mode";
-        version = "20131012.1401";
+        version = "20170829.2203";
         src = fetchFromGitHub {
           owner = "grettke";
           repo = "clips-mode";
-          rev = "a3ab4a3e958d54a16544ec38fe6338f27df20817";
-          sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
+          rev = "13150b42a216551494505080aa82d74b6cec3993";
+          sha256 = "18905idq6d49h6jfyj4r1pj8268n2kcl5l7i2g9mh6x6jwlx26wg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode";
@@ -8806,8 +8784,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "9a0a6f91ae5c8e25197d50e7045b6c4418f607b2";
-          sha256 = "1l4x4xz1r1m8vf1klbpq98mzwkgxmpajwxl04vd8fxwv33pkyyxb";
+          rev = "7321cfb667ce2907dbc0716f6a26ac64106c7eb9";
+          sha256 = "0hsxwpvj4y8c5gvkpclpjyf2ykcdi2v59k8zc2jfdq5mbvp04bbb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8930,8 +8908,8 @@
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "cnfonts";
-          rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182";
-          sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp";
+          rev = "cbe1ddd49e33b790a568c55351146aa5b909f173";
+          sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
@@ -9323,12 +9301,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170813.237";
+        version = "20170830.410";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "8faa5d0153166e44416d59324dc39e43469d684c";
-          sha256 = "137rn1k1hlaz4k47mrh358k5kpc29n87281sq3sd8gq3rdm8hs7a";
+          rev = "13b4b4f8d0f84efde956c4f57c5e5ebc974e9763";
+          sha256 = "1fjg5w0xpk7qq8p677czs9lkdjk2z0m7vslml18shvpfis9rz997";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9594,12 +9572,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170818.340";
+        version = "20170828.414";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "ab2937a862541a66c149e1f95ca32eb2bd31b16b";
-          sha256 = "17mk0yfq2mdlhsxxsliy1qcmjl9fzqddrp6sw4p886v0f6w59br5";
+          rev = "c0098afab0719c633ea9984e62a240f542ab8c49";
+          sha256 = "0vm4rl7xkqpbi1dh2ds45smbyk25x16w0x99ri1nzvfbana5w7j5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -10029,12 +10007,12 @@
     company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "company-go";
-        version = "20170420.515";
+        version = "20170825.943";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05";
-          sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw";
+          rev = "d0d549d64d2764038b86f5d5862b94b42516e3c6";
+          sha256 = "1xcx4rbqvhjdlk3vnkwa4vsg97y8sh079bdbwfzc51g8nbmvshw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10243,8 +10221,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "5be2a4a9819f9685a1f6c464afd8bbc042d94575";
-          sha256 = "1khfh9fggs67fgz77yvlw8pw9gdbgy1dh4cbflccdbnjskrafnhl";
+          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
+          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10371,12 +10349,12 @@
     company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "company-rtags";
-        version = "20170522.2154";
+        version = "20170829.2022";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
-          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
+          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
+          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10604,14 +10582,14 @@
         pname = "composer";
         version = "20170304.1647";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "composer.el";
           rev = "43e50a5e626bedb3c46c875ac765daf615f18ce9";
           sha256 = "0vfr9v60dgynjfz1kpx4c17mhsfbyi9g68jzvjkw7y95pwqv8f0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
-          sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer";
+          sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1";
           name = "composer";
         };
         packageRequires = [ emacs f request s seq ];
@@ -10855,14 +10833,14 @@
         pname = "copy-file-on-save";
         version = "20170817.2319";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "emacs-auto-deployment";
           rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487";
           sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f99184ba41e9ab40b2fcff584421bbd933bffc72/recipes/copy-file-on-save";
-          sha256 = "07hm6ml9j9qwxbv9kv8w8i2x9js7fyrw3p7m219vpncka80qf6k3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
+          sha256 = "1mcwgkhd241aijnmzrrqqn9f7hiq5k1w4fj83v50aixrcs049gc3";
           name = "copy-file-on-save";
         };
         packageRequires = [ cl-lib emacs f s ];
@@ -10913,6 +10891,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "coq-commenter";
+        version = "20170822.1609";
+        src = fetchFromGitHub {
+          owner = "ailrun";
+          repo = "coq-commenter";
+          rev = "7fe9a2cc0ebdb0b1e54a24eb7971d757fb588ac3";
+          sha256 = "1rq0j6ds9snv21k2lzyja96qxxz8nrai5aj1k1si9zshld28mapx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/coq-commenter";
+          sha256 = "19726z8yvgwjikbl95smdl60k58a5yf7cjbinnb7251d8mhd8562";
+          name = "coq-commenter";
+        };
+        packageRequires = [ cl-lib dash s ];
+        meta = {
+          homepage = "https://melpa.org/#/coq-commenter";
+          license = lib.licenses.free;
+        };
+      }) {};
     corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "corral";
@@ -11982,8 +11981,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "f4faa0ee50916d5e042493827062a47ae6b1d988";
-          sha256 = "0l4p5sakw9mi15zss5b05m0ghix7vq3c4j5adbcg5hl8464gzvpn";
+          rev = "41308e574e77ec527cbcce6209a142c12f94bcaf";
+          sha256 = "08bnasd7hhly05pmp5nswp35ql8ab0pplrh1hbg91hkfz4wkc97y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12146,12 +12145,12 @@
     dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dante";
-        version = "20170821.708";
+        version = "20170829.1311";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "dbfc2b8aad1ad0d3f01f58365de380d4fecf260b";
-          sha256 = "07wkrqlw3051qn3ycr2ianrm9q4kg0rcm3iy76adq9hxmnljc4zx";
+          rev = "498883333cbd41d36a7533f6c2c701e574277972";
+          sha256 = "1bcgxmb837n75byz8v53rb8bxqb1kzfpdaalx0bqkwvvk7kn6byl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12505,14 +12504,14 @@
         pname = "datetime-format";
         version = "20160612.1015";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "emacs-datetime";
           rev = "e6427538b547cbe02e1bd6ed4b765c73620bdae8";
           sha256 = "1573z8wq5m8qzbzmnsz2fmbwrj9c0ava0jjfchzmwm2b3jyvqh5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e01f4589dbd8849638d4fc9bd765876987267439/recipes/datetime-format";
-          sha256 = "0v9jp54qxzj2scbmr35xi6bz16q8bq6hmyxdglb3a4qbf4zgvwpi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/datetime-format";
+          sha256 = "19qccjz2lzh01glgkixya7bxd6pvyjqgmw8bmqlwag6cb68bwsyv";
           name = "datetime-format";
         };
         packageRequires = [];
@@ -12795,12 +12794,12 @@
     default-text-scale = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "default-text-scale";
-        version = "20150227.956";
+        version = "20170826.2215";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "default-text-scale";
-          rev = "c680861a459e5a1b4cea0da1b99d2a22f08fdcd2";
-          sha256 = "1ysv1q7n7k2l4x8x7hlzmxmawyxl5lx627sbdv3phkvjh5zccsm8";
+          rev = "5dc4c4e66d860ce783ce6f2b8ddf39d263a53207";
+          sha256 = "0mwqzgn6y9kc94gy1mrgk905b4785l4avhyn7g0imh5l0kjay6zx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale";
@@ -14867,12 +14866,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170809.1218";
+        version = "20170827.1515";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "af5f703b6b63a7823fe5eec9864222c794a05566";
-          sha256 = "0c6sr2n795cjbvvlgiqb6a6lixbwdag5p4l3iw4knikdp31gk55w";
+          rev = "fb92c7c31b490c5fce997024b9c9b8c05f607301";
+          sha256 = "1wpv2cz4gs3mckdhmnz0mk57y1w6701yjcmxd8km99cpwy2bily6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -14987,12 +14986,12 @@
     dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dotnet";
-        version = "20170819.642";
+        version = "20170827.838";
         src = fetchFromGitHub {
           owner = "julienXX";
           repo = "dotnet.el";
-          rev = "e02b68a6823937023d8a2778e7e17d13ea2d9f1c";
-          sha256 = "1vmywfija3ip7q84zixnq4ax6j2n3qrvxy8r6gsj0yzfxv3915wl";
+          rev = "e22fd23bf2bfab980d4802b10c4d872b800f90d4";
+          sha256 = "1qq0gkdr0h4b9h6l14wfk3zmw62sa2i5in23bvs6jp6y6hmffr2m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet";
@@ -15323,7 +15322,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1805686";
+          rev = "1806688";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15361,12 +15360,12 @@
     dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dtrt-indent";
-        version = "20160620.329";
+        version = "20170825.847";
         src = fetchFromGitHub {
           owner = "jscheid";
           repo = "dtrt-indent";
-          rev = "a54871bedadabede505b3913ee1039f5ab36cad2";
-          sha256 = "0ylch7q8lh2r10qzrb41bnrpnznvj5fjszazmxfcvj6ss8yrxjzi";
+          rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c";
+          sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -16534,12 +16533,12 @@
     edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "edts";
-        version = "20170804.343";
+        version = "20170821.149";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
           repo = "edts";
-          rev = "42c69a845bfe1c123d6e2a773c22931892ab85ac";
-          sha256 = "0a629i2d6kjzmhrnji0x8320k93y8kwf7bb6r1acz83gh60smd3z";
+          rev = "8a737e0601ab4a3fbe2f1252f8b1474ca39df94c";
+          sha256 = "0dbha339yp7jd8nmz38g9igmj5bi03l9fz9gqy2z8j367br3afxs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16584,12 +16583,12 @@
     eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eg";
-        version = "20170816.235";
+        version = "20170830.115";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "eg.el";
-          rev = "0791452498719afb7409d1f723dbea2ec26d56f1";
-          sha256 = "1y16pah8f4jp117vihvlcwvsw2i85gdk45h9y9r1w9mslb24faac";
+          rev = "1c7f1613d2aaae728ef540305f6ba030616f86bd";
+          sha256 = "1g2ha6q9k6dmi63i2p4aypwf5mha699wr7yy5dsck39mqk15hx0f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
@@ -16834,8 +16833,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "fe5c35f065c9ae0a1fcd13d866cd38038775cd95";
-          sha256 = "1whl866bz7cs07hixx1m4cvi8snrbi3cgv7f2k6wvxhwhxnrjkhm";
+          rev = "c98016bf352bb17ca4aafcc68e12583001fbea71";
+          sha256 = "077knnb16416jhhz0w0a4vh4mqkh5wg362pf3by5k7sysxr5zmgx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16893,12 +16892,12 @@
     el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-mock";
-        version = "20170501.1123";
+        version = "20170824.1254";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "el-mock.el";
-          rev = "e3017494230cb90c5f542acc07c539be1497123b";
-          sha256 = "1dzll63ahsrjrx0dx6vzd88qvs3kvpn5jd3i39wjlfml18hpfiqi";
+          rev = "5df1d3a956544f1d3ad0bcd81daf47fff33ab8cc";
+          sha256 = "06ldnrpqvbdxfzr8v7pj9xacgvkp36xjlhvjkpxldmqj1l5v8a6w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock";
@@ -17141,12 +17140,12 @@
     eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild }:
     melpaBuild {
         pname = "eldoc-overlay-mode";
-        version = "20170123.6";
+        version = "20170826.434";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "eldoc-overlay-mode";
-          rev = "a0f25710b6a1614ce93c71c7947108c09b587c48";
-          sha256 = "065sihf0dvi7g37zvf5drigkakydapyvpxdibcdzhcxx2p9bqszi";
+          rev = "e008b78afc5fc2b85f6d84188bafb3b5ee86e2fb";
+          sha256 = "1ii2il6vbh53j6z2dq9ah81fk1qng4q13wd024xzxk7wy90vmmnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eldoc-overlay-mode";
@@ -17187,8 +17186,8 @@
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "13b5c19049bd7ac9529ee6fb6171f9141311f277";
-          sha256 = "0xpqynnl1dxylxgg7h42pamxn7iwa4jwcy355l0sxmra951j22wq";
+          rev = "9aa71d7b6b780242e4659fedfdb186d4ee422366";
+          sha256 = "03py67msf3cshg60zs6bdk71ksswi3vjf0nl88jhlgnzb3kjg4wm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -17463,12 +17462,12 @@
     elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "elisp-refs";
-        version = "20170528.1223";
+        version = "20170828.1027";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "8f2da5ba5b728a8f278813c95d0fda3364cca40c";
-          sha256 = "0i0xjy4x3i349jbpbqhfz57frk8cdakwi78fw1mlycx4qinlx2n0";
+          rev = "fd25631d87118885bee511e1cb4e2afa8a02fcdb";
+          sha256 = "1v9n1dak8vbm5qdwk0k4j0vcl59z4pa94xj4b87mmapkqa40jpgk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -18804,12 +18803,12 @@
     enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "enh-ruby-mode";
-        version = "20170816.1713";
+        version = "20170822.1647";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "e0ea0270d34806cdbbdc442279ec9b94e6fef68d";
-          sha256 = "02aaj7zw0383ynm5ikvhxj8h1rq1qg05ri1y7w1k48ia9w5057m7";
+          rev = "c1462183573258edfd8134581417d3c95f1c9c4c";
+          sha256 = "1xyg52qf8zpkrgifw1lxk8h91acrg1n7nw59mxmwq8f122lmllx7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -19525,12 +19524,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20170509.742";
+        version = "20170828.600";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "770454f0a32fbc0714c6762ed3e4d761b799814f";
-          sha256 = "1prg6xhj8dyvbhwwkjvnpmcwc0w145im6n0w5fx9kw9har9ch8cj";
+          rev = "ea46749ffc0d12ff6b4e37964c26123f1af4b8ec";
+          sha256 = "1qfjh8n3pfixqapavv84rnkjdr9rpabcl146jv0ki8lih57cx9c1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19692,12 +19691,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170803.1433";
+        version = "20170823.957";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "2e00707f42276b59fff2a32c64703e9586b22ae6";
-          sha256 = "0kcrca7f33020hxhx30vqdf21j1w32lvn28ys8g7gwa20nq05zb3";
+          rev = "82c9d0e47f7f224d1248e3455ee10c0adea327bf";
+          sha256 = "1jb4b2cww6y3y0j3gf9n5v2hcmb9zsf1cz9rhr0x6vh169yvhjvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -19797,12 +19796,12 @@
     esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esh-help";
-        version = "20170730.2157";
+        version = "20170829.2111";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "esh-help";
-          rev = "fdd62fb873e2a9a664314a45f91529cac00b8c47";
-          sha256 = "1z8gl8mwnr1g7n9jn9iw5a6c9jsr1gjbx3004k07rlw8dld59qd0";
+          rev = "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6";
+          sha256 = "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
@@ -20053,8 +20052,8 @@
         src = fetchFromGitHub {
           owner = "ecukes";
           repo = "espuds";
-          rev = "8caef13020527956a56b53171057ca1d0e2fb48b";
-          sha256 = "0nj5llf9s59dagwqj4s87ccwaky9pan3dyw1dcf8m8f41s5zia62";
+          rev = "31ffd83f6deccddfb8378fa2298d90d3fc5fdda1";
+          sha256 = "1l8c8g050av0hi5snini7igfrjaq8q0nb3g114ai1i8frzsrxgzn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
@@ -20444,12 +20443,12 @@
     eve-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, polymode }:
     melpaBuild {
         pname = "eve-mode";
-        version = "20170724.1408";
+        version = "20170822.1531";
         src = fetchFromGitHub {
           owner = "witheve";
           repo = "emacs-eve-mode";
-          rev = "16de9c42393f687446dd9ffd36fcc7428437bf7f";
-          sha256 = "0xpga18zw78v7wqxmfsv00s2r5rwil0khqjjkm867gk20954j7zh";
+          rev = "a4661114d9c18725691b76321d72167ca5a9070a";
+          sha256 = "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0f197adfe64ef88d90d24dfd6532bf52a5bce0d/recipes/eve-mode";
@@ -21137,12 +21136,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20170814.1947";
+        version = "20170829.353";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "684f558931a8129bcc58bf9d31a6b2be1be56ec0";
-          sha256 = "12xly3kdm4p64bk46mj4cf67r65aznyj27v3zdm6ca1cfxvkm6ss";
+          rev = "0a46b911200c75c4737bfdb2b71f10a9a8254969";
+          sha256 = "03v53zhm33fz6aib03j00bwkfqh2j45ziz7nwynynxm50j32axkg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -21788,11 +21787,11 @@
     exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exiftool";
-        version = "20170613.1342";
+        version = "20170822.1432";
         src = fetchgit {
           url = "https://git.systemreboot.net/exiftool.el/";
-          rev = "1c9c6feba21b98337665b6f2b4064b2bf5b75af6";
-          sha256 = "1m3jn127w95sb4y34f9lb1cv445pxfs4b90f6ia5cjs75706fn03";
+          rev = "3a07dbcb975577734d4abf6d68e1ab83a01951bb";
+          sha256 = "10prrwvmc891vkzzgqmz0xd85xgi52ni83ydf0bvhfmcg0wmm0cc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
@@ -21808,12 +21807,12 @@
     exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exotica-theme";
-        version = "20170821.459";
+        version = "20170828.357";
         src = fetchFromGitHub {
           owner = "jbharat";
           repo = "exotica-theme";
-          rev = "016e44ff8c812ca6e8c34e40beaaf6fa4cdc0c37";
-          sha256 = "0208ky004yhznhcwcn07v5l72w7g5kkjgpl98grwvqracp07glg9";
+          rev = "0fcb6f3e5ef7d97a4ec049867a8d703ec60a89f5";
+          sha256 = "0i7pgdxrx2ijf67sy4x2xab416s458mgac261ng2522z87szddah";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
@@ -22636,12 +22635,12 @@
     fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fill-column-indicator";
-        version = "20151030.1233";
+        version = "20170829.907";
         src = fetchFromGitHub {
           owner = "alpaker";
           repo = "Fill-Column-Indicator";
-          rev = "0e755319451dd9c6c99c2a2ef82c890ba93343b6";
-          sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
+          rev = "a44ac30c4c2b6efdd325604d41a154ff00ae187f";
+          sha256 = "1arx3k2lf84avx10bfv96wjhgbdn3y1606nqra4malfs8zfj7gqz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -22739,12 +22738,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20170725.133";
+        version = "20170822.1915";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "584ebd41f51e86567375848f64b7c9d337125801";
-          sha256 = "1fwifcknkc6sxcn76c2qg8zz0ric5ppdqqxsdd28qicgjqnqrhkx";
+          rev = "7ebbce969733d3185bc583f3f660b96d34eb43a5";
+          sha256 = "17zalma32r9gi27a6xbszig0a95gb6y0rzi2h08hkcjwc528pzii";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -23474,12 +23473,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170817.57";
+        version = "20170823.1732";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "24534988d115754cda5f19943d2b4075e2b5c581";
-          sha256 = "0mb2rzqbi6a4wcn13kbwhff0z94z6n70lbx567i8lb484kf2kfaf";
+          rev = "8460e113e7d5e43a0c44395212a592e26d03f58d";
+          sha256 = "19f79089sh7xn67wj7n4bdfd0afvqjw70yfh3vilf4gbhipdh80j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24654,8 +24653,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
-          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
+          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
+          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -26457,12 +26456,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170821.831";
+        version = "20170824.31";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "85e32ccf204fb8bc35954d6ca288c7b8a74531ac";
-          sha256 = "13m5axbwbxidhawma1wszfzfgdr2lhbi56y3l305csa4vaxq5cbi";
+          rev = "9ffad30f11e97aeec4c8dcd353da8e14f1d3a9f3";
+          sha256 = "15ij1i4a0g7vmb312cdsq70i76accijrjha6lr8bq9a4r167axcr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26490,8 +26489,8 @@
         src = fetchFromGitHub {
           owner = "factor";
           repo = "factor";
-          rev = "f8ce34b1dbe1780de135e2b7ba2250bde8fc604f";
-          sha256 = "0cv7mrbpks89qk7ivrc0m7kjfayqhnj1db8dh62sv7np2qh49cvv";
+          rev = "c457c019bb2d5f2a09021581fa7fd12429cd5ca1";
+          sha256 = "1i0m89398z8waxylpmw8laq8n198894v5qv5in6hnwgkz8vs5lxp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -26570,12 +26569,12 @@
     function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "function-args";
-        version = "20170821.946";
+        version = "20170822.1002";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "function-args";
-          rev = "0b07db81c0c1fa88d1ec763219ee57640858f79d";
-          sha256 = "0lg9bhwn3za4jvz38zld389gdl48qf34nqqqrzj0r119g1jqdrg1";
+          rev = "f4d2d1692f38f5acf6d209610371e008856357b5";
+          sha256 = "1s5ajgig4na5mvymbxk4ncs6nfa8qirzgkp15x8rjx5kj1m22rxa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
@@ -26616,8 +26615,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "2cf02a412a445933f96b43283d38b6f61addbb0a";
-          sha256 = "1a4k2394ccz3c25kav3pl7g9s9b19w15pkvrm4svf3hsdxypaky1";
+          rev = "72d6ddf110446aad7bf5988a0a0178aa89e689d8";
+          sha256 = "0q78qizshnr616q2mcfbzxncg2588d06729nkyw1rf0ihk88cf0g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26776,12 +26775,12 @@
     fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fzf";
-        version = "20170527.2120";
+        version = "20170824.904";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "fzf.el";
-          rev = "8d75f98cf904c3ab62e8cc54f2b8701c215620d7";
-          sha256 = "1rr0d937j078xyhlx5i305l5wavd3fcmvfqmdnbfwah8mfnp4kip";
+          rev = "9b1744b8cf8817912164fc08d01b3d9e541d6479";
+          sha256 = "0x16m5ysifw6vqm09i834ykjalxzg7yrnlf2lpafbg1f31mr0hhj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -26923,12 +26922,12 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20170704.1044";
+        version = "20170827.1755";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "dd08e3d83d070eb8d041d66217b4591a55729024";
-          sha256 = "1mchrrrygwxy2ivnh7zfv0bqqvwinh61b5204yvivw303rfyc2iy";
+          rev = "9581e61f9d8839281fe42344dd5fe885ea7359ea";
+          sha256 = "0nx86pzncab0b7700m8sc7k3nzml4v9frrq77lljjcjhw71gnvnn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -27049,12 +27048,12 @@
     ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ggtags";
-        version = "20170711.1806";
+        version = "20170827.510";
         src = fetchFromGitHub {
           owner = "leoliu";
           repo = "ggtags";
-          rev = "8579025b9b89c53221c6c608b92a85734ffb0116";
-          sha256 = "1fr12adssldynjayylqck85nnlcjx6pf15vp0hhvdnl689imbg3l";
+          rev = "9d1ecf961dd964cbe8ea183eac23572bb4f8f4ee";
+          sha256 = "1iy7n39kjl8n5qhs2vc9vszq3ff8h883zd380d3g7zs9nw0xx7jf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -27427,12 +27426,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170821.1159";
+        version = "20170823.2103";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "8810adb1ff5388c5e4e5a7671b4e207eb49985e2";
-          sha256 = "1q9bhy0ig5jg8wcq35pdpsmwwzl2vr2pbcd1zm2pc2c3ajgilkyk";
+          rev = "1250314a4bf7bfd3971f6a422744b0e3da7b3e71";
+          sha256 = "0vzgpqjvkvx5hl0z5lyd7s5smgv86hhivr8zqqzs4q7y6s2qfxgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27910,12 +27909,12 @@
     github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "github-search";
-        version = "20160822.1328";
+        version = "20170823.2023";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "github-search";
-          rev = "24435772bf8c2c55b4f228917a1344d785851e2a";
-          sha256 = "1863g5gphlz1xr465r9nplf5n3ajz1b6girswf3fv1gk8xl1swjj";
+          rev = "c5fa1d9f8f9bcf201fa31478a6f5e02ed5ac086b";
+          sha256 = "1v9kswj65sdb90lr4a2xqai55kyp3jp46nksikxx9m243nxdsh9q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search";
@@ -28479,8 +28478,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05";
-          sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw";
+          rev = "d0d549d64d2764038b86f5d5862b94b42516e3c6";
+          sha256 = "1xcx4rbqvhjdlk3vnkwa4vsg97y8sh079bdbwfzc51g8nbmvshw4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -29025,8 +29024,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "62385582b8479bd523a21ffd414acdeaa1a98efb";
-          sha256 = "17nlq8jcdlrv1zi0hpmfgakw9g12m7gsnj9p13rg0vx063qfpvfq";
+          rev = "ef4219f259a8a9779e179a4c777c8258f6366848";
+          sha256 = "04ncd18m1dbzqp0h7nddypj56x1jcbxxady7rja6qh0jy81g451r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -29189,12 +29188,12 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "20170811.0";
+        version = "20170823.141";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "22f54d6c00c48f38a04a74990db501946405c1a8";
-          sha256 = "1p69i0w7gbc3fmgwx5mhb30qp7zfgh7sfk7jdvd7270k0nixs7qr";
+          rev = "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9";
+          sha256 = "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -29210,12 +29209,12 @@
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "20170521.417";
+        version = "20170822.1030";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "df428b477eb84f2ccd791c4310587cfd72644692";
-          sha256 = "0ph5h08cx61nh70hafmnqzdcxb799fss0pl2d36hhimkf866zvln";
+          rev = "417d61978d139cb5d089c5365fc8d3166d76d3ac";
+          sha256 = "0rc40cfj2mby1q7bk1pp1fxdi72nh9ip80spjdm1csvjjc4dbkwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -29296,8 +29295,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "d7e841db6909ae5e9eb7493f7b1ea7d7b15101e3";
-          sha256 = "00mi0fscfcgw540b1lfq5xlv1cw7zxxr78q5vzfvhdgg3c2d2z7r";
+          rev = "6ce8848e808c01db99dea4064068cebe230b11a5";
+          sha256 = "190smd9d8y1j602xiapnw65ii0vkayfbi7md49qv0657pc4h3hf1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29334,12 +29333,12 @@
     grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grab-mac-link";
-        version = "20170228.1039";
+        version = "20170822.2321";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "grab-mac-link.el";
-          rev = "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2";
-          sha256 = "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k";
+          rev = "fa23db288c93ff12d804939aa3c78e809169523e";
+          sha256 = "1r2rcxcipyxdr16m8y93yc86vqxcmxamvkj60dg6ljsxg2lgvbx4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
@@ -29422,8 +29421,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "60e71008db67407de8abf897dbe36cdb66c16e72";
-          sha256 = "0zviwc49h80jlgp34ddg95lx4z4pasq5rxqj1dv3xcyaw8rkg4af";
+          rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f";
+          sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29615,6 +29614,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "green-is-the-new-black-theme";
+        version = "20170828.1056";
+        src = fetchFromGitHub {
+          owner = "fredcamps";
+          repo = "green-is-the-new-black-emacs";
+          rev = "2b1011836fc04940d542e9a783b99670a08b308b";
+          sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
+          sha256 = "03q0vj409icmawffy2kd9yl04r453q80cy1p9y4i3xk368z0362g";
+          name = "green-is-the-new-black-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/green-is-the-new-black-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     green-phosphor-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "green-phosphor-theme";
@@ -29639,12 +29659,12 @@
     green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "green-screen-theme";
-        version = "20170209.1208";
+        version = "20170824.728";
         src = fetchFromGitHub {
           owner = "rbanffy";
           repo = "green-screen-emacs";
-          rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e";
-          sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn";
+          rev = "05a9641d4f7354be7ff1b8dd34cbe5ef7054348c";
+          sha256 = "036l9rbp7p9bf7wb85zr4ykyxiippiwlq53vk30lvkpwbv9vc5qz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
@@ -29782,12 +29802,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170818.241";
+        version = "20170828.1026";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "60e71008db67407de8abf897dbe36cdb66c16e72";
-          sha256 = "0zviwc49h80jlgp34ddg95lx4z4pasq5rxqj1dv3xcyaw8rkg4af";
+          rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f";
+          sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29845,12 +29865,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20170821.1241";
+        version = "20170828.144";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "d6b8d37f34e0be49b452d6017698afc48b8d61fb";
-          sha256 = "0ay8cv4n27rbkcfqxwf20cva6bjzwnf3yvdqg1q6b3cqmvak4mni";
+          rev = "4e1c2616a31f33191daf20c0f9f744af5dd14468";
+          sha256 = "1cgc8amxbj1839zx6vhpk96r1iag8mwnkdzd4wj6xabb59lvbjld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -30160,12 +30180,12 @@
     hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "hackernews";
-        version = "20160627.1651";
+        version = "20170829.1044";
         src = fetchFromGitHub {
           owner = "clarete";
           repo = "hackernews.el";
-          rev = "629fe18abbef6674821876ed089c4fa83b709d1b";
-          sha256 = "1s3ybiifbszp7v3gznh9f78dzwb1smdq3hb8np9swjr2fzcshwl4";
+          rev = "62442f76a0936047b5f66457298811c4f724a4f5";
+          sha256 = "0pz3w726485yqww674ydrc3ffd0wrm9w0dgan0qyg3ggjj1fvjvs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
@@ -30409,6 +30429,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }:
+    melpaBuild {
+        pname = "harvest";
+        version = "20170822.1046";
+        src = fetchFromGitHub {
+          owner = "kostajh";
+          repo = "harvest.el";
+          rev = "7acbc0564b250521b67131ee2a0a92720239454f";
+          sha256 = "0wzv67kkfyaw19ddw0ra45p6rja6bk6d1xi3ak5lkyzvgqvylr3b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/harvest";
+          sha256 = "1r6brld6iq03wsr1b3jhdkxwrcxa6g6fwa1jiy1kgjsr9dq1m51c";
+          name = "harvest";
+        };
+        packageRequires = [ hydra s swiper ];
+        meta = {
+          homepage = "https://melpa.org/#/harvest";
+          license = lib.licenses.free;
+        };
+      }) {};
     haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-emacs";
@@ -30475,12 +30516,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170810.1519";
+        version = "20170828.844";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "783ea06cab61e16b86bb434d3c8a61076f564bb7";
-          sha256 = "0ypb3qilcnphxhsaskib5h8n4m2ivwka116jnjpdjrgwh838aakp";
+          rev = "03ced314205d2441f21c18464ad1e6a775c675b2";
+          sha256 = "064pc3hzjnv9b4l6p7hp4lnmhg1bg9ji9z3n9kwiw6xxfpkpdikz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30541,8 +30582,8 @@
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-extensions";
-          rev = "f0c6a4d07bd18b39010a4bc28340aff4ceebf785";
-          sha256 = "15926zw2sj180svn53fmb1x8x8aw7754anbaxb8xbcpg2zrkspbh";
+          rev = "8e03c0fbb902c0ce51e822cd7b73f5f42e64aec4";
+          sha256 = "1aykx7x0dmxq42mavyi43fm1qpvs2whz1q3n7hn6rd7qsxa0x8g4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -30558,12 +30599,12 @@
     hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "hasky-stack";
-        version = "20170818.2201";
+        version = "20170826.1029";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-stack";
-          rev = "e256e50fce9a65cad1754d863d9ed969b159cefe";
-          sha256 = "12rf51l5dg4c5jkn0rsyr47wfsw9qnmzl0hmsa8j04fm8nr978x7";
+          rev = "2379f43b589115bd3960a11c26fa0a7d12316db7";
+          sha256 = "1vkmm3mf4zcf1wrkwln7ik4i17dqx7a9lb8j2j0l217hn7h3mk5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -30765,12 +30806,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170821.954";
+        version = "20170830.357";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "5e4081322f0f673e1709993ec3c59c33cd508fc3";
-          sha256 = "0hl9z0zwch78bmndrswcjgcl5wgai2pndm7qxnmxd7yh0bxv20kb";
+          rev = "15525a2608344c15c475564c8fe64a0acc0a654b";
+          sha256 = "044rqjxxc6n60mycbcqiy6sn3bpvr9xgb3vlgigabc7532na89dr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31374,12 +31415,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170821.1152";
+        version = "20170828.2343";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "5e4081322f0f673e1709993ec3c59c33cd508fc3";
-          sha256 = "0hl9z0zwch78bmndrswcjgcl5wgai2pndm7qxnmxd7yh0bxv20kb";
+          rev = "15525a2608344c15c475564c8fe64a0acc0a654b";
+          sha256 = "044rqjxxc6n60mycbcqiy6sn3bpvr9xgb3vlgigabc7532na89dr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -32491,8 +32532,8 @@
         src = fetchFromGitHub {
           owner = "julienXX";
           repo = "helm-lobste.rs";
-          rev = "4121b232aeded2f82ad2c8a85c7dda17ef9d97bb";
-          sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy";
+          rev = "53c5b42baf72776dcba891fc3d7cd7d47721e9b0";
+          sha256 = "1ic0pcr7cfrfalb7760viixz5gfdg5hfazzwfhhw08vx44xx0jk4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6247e3786131e5b2a7824804e49927ed65d266d5/recipes/helm-lobsters";
@@ -33267,8 +33308,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
-          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
+          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
+          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33704,12 +33745,12 @@
     helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-xref";
-        version = "20170725.546";
+        version = "20170822.1708";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "helm-xref";
-          rev = "3197a66a605afa42957781cc7f97f6c614ecf02a";
-          sha256 = "0nr4yg44qqr5ga8h1hc143953iyyswp2l9bfb5b5wwwzz42iz5cx";
+          rev = "af55df844aa65275c8f75d3a8705e13717fd3ee6";
+          sha256 = "0srjmz3xm6ycx5grjl7iqrnx5qlmg7n42i9wrb3i01zrjrjbqi7x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39f3d09a8f00d0358653631a8643b6dd71a9bd1/recipes/helm-xref";
@@ -33824,12 +33865,12 @@
     helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helpful";
-        version = "20170722.522";
+        version = "20170829.1620";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "d167ee6fd4fbaadc46aa50a96529dc234a4c37c2";
-          sha256 = "04r090757jcaljr0bfvxjm45wf201cn04cr467ryh9k92gravlfj";
+          rev = "4b2c3f4e7a9fb41fe424fe89e46580d5f7751d69";
+          sha256 = "1lgqzilkp7byp6j1lxavnvrjryy0llakc1kd8rq05ydvnhw3wcbh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -35394,12 +35435,12 @@
     http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "http";
-        version = "20170603.1107";
+        version = "20170822.2149";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "http.el";
-          rev = "19317fcc928bb75e0464e39032af1627b7961a0c";
-          sha256 = "14zq54g4ckcrrbpwjcb84krg9bijw88nwnkj8kg9kij5p25knqwh";
+          rev = "f7844d9f84cb5e89655934ab0f23f9e4b82402cb";
+          sha256 = "1hgri43sazjja2c1h4kff1zpmlwhxyy2845cp9avmdqlp2i9d2g8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http";
@@ -35562,12 +35603,12 @@
     hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hy-mode";
-        version = "20170621.1354";
+        version = "20170827.1814";
         src = fetchFromGitHub {
           owner = "hylang";
           repo = "hy-mode";
-          rev = "f34bc19e9a58c7014c1f672d0655d2edee997ad2";
-          sha256 = "049f3746dfg9jh29904qnk2asym2rjqqgzn1zimk4bs3v8xnys1c";
+          rev = "23bf935a96bd4161d32d7cf810b3a2e9c1aea208";
+          sha256 = "04fl5byl0zj4sqs05dvhzryd0w0sic4vljydx4cvs8vzqzq0hxj4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -35687,11 +35728,11 @@
       }) {};
     i3wm = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "i3wm";
-        version = "20170116.1825";
+        version = "20170822.738";
         src = fetchgit {
           url = "https://git.flintfam.org/swf-projects/emacs-i3.git";
-          rev = "7daad9bcbb545ed5cd75706eef56172cef1498cf";
-          sha256 = "1y69hh9gaz8q3kljgjarqkxmc70qpf83rzwsb1rzsglf4aqlr2rq";
+          rev = "71391dc61063fee77ad174f3b2ca25c60b41009e";
+          sha256 = "16rwqfg517ask3y6mqxw689w8xx4i51nq8js5wnzbz9a55aj776n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/i3wm";
@@ -36998,12 +37039,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170818.1523";
+        version = "20170829.637";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "0bb43ddcf0e206d5144ce412c63a106556224fd0";
-          sha256 = "1g23y9j3inzl7fdyzcpn02r7fva0x6g4j8pcjjimpwi3z8h6aswm";
+          rev = "d98a9e0cd11d8230c4c3d0b59c4ac60520e34ebb";
+          sha256 = "1q3yf45fmbjppv3ahb1gdb95pa3kyn18x5m23ihpxz1pziz3a074";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -37173,10 +37214,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20170810.1125";
+        version = "20170828.1035";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "0nr9d2rqipbz2p30f1bmg10mbnndxqx9k6jj1qkmijhzzbk5w36l";
+          sha256 = "1q8cxy9wc6imrn60w9yl1lsww6928xh5zsx1v5d07f9qzw9jsyp9";
           name = "info+.el";
         };
         recipeFile = fetchurl {
@@ -37382,12 +37423,12 @@
     insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "insert-shebang";
-        version = "20160626.409";
+        version = "20170825.438";
         src = fetchFromGitHub {
           owner = "psachin";
           repo = "insert-shebang";
-          rev = "d5a827ce9ee1bdabb7561203a3e774ca599514c1";
-          sha256 = "11dxkgn9d6slcwq1zpi13g2cy80ns97gprxakqjvy9gi2l5wl634";
+          rev = "adfa473f07443b231914d277c20a3419b30399b6";
+          sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang";
@@ -37507,12 +37548,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170812.1029";
+        version = "20170826.2220";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "1c34f8e858eb11493078ca222fd0f598cf9f1e26";
-          sha256 = "115pqqyhinjpcjh1sigwcbqinwcslk19qmqxwxpwfka62j8c22x1";
+          rev = "77efbde5158317c93939d94383ae1d43e8fda562";
+          sha256 = "02jnss8y56q0dx1izsvdbx5mkpzb1rkfkcxzxv6mhj2yjrl9l6bj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37570,12 +37611,12 @@
     inverse-acme-theme = callPackage ({ autothemer, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inverse-acme-theme";
-        version = "20170716.1100";
+        version = "20170822.1954";
         src = fetchFromGitHub {
           owner = "dcjohnson";
           repo = "inverse-acme-theme";
-          rev = "361a8840469648a9b98f16cc996df5f151d3c75f";
-          sha256 = "1dvaz36037wvh00m3ddqfp9w86pna3k058xw22i4xcdhp1518i03";
+          rev = "74d6f3e2f6534371509dd2d77006435156c276d6";
+          sha256 = "15fk60ky8kbj665yjylmgc4nn4qsk57fvarqzwv3fns64yfshkv3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme";
@@ -37820,12 +37861,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170821.1300";
+        version = "20170828.1218";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "f58f36253b697d2b3183f1a0b73a8a3af89360ef";
-          sha256 = "0509np04cw6sqlwgn837fjb4q0n48s481nv4mc2rngix5pjfpx3v";
+          rev = "9950212a55fa09ef41ce53a90bea7d26cb3af99a";
+          sha256 = "04qipvshmfar8znr1rbf9acx8ray4n8jwdrsnji9ywblfb74czpy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -38026,12 +38067,12 @@
     itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "itail";
-        version = "20170709.1543";
+        version = "20170823.1629";
         src = fetchFromGitHub {
           owner = "re5et";
           repo = "itail";
-          rev = "a8c98583cbc4e2b761df95fd738efebb116fe6e6";
-          sha256 = "001i7xn6v8j3ls50cnsazjfkpzdnr01rb98a6h0nibkj8hi21myb";
+          rev = "606a5e93f53a36cad958e191a9698dd74683a773";
+          sha256 = "1ddy3q36hhhzjkr4lcaw0brk28ssyllava0yx2xn5kxbfs0lhdfb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b810bf1deeb79064144d8b684fab336686018ef/recipes/itail";
@@ -38089,12 +38130,12 @@
     ivariants = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivs-edit, lib, melpaBuild }:
     melpaBuild {
         pname = "ivariants";
-        version = "20170818.739";
+        version = "20170822.1924";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "emacs-ivariants";
-          rev = "c056850745fcfa1e20aed9f6a7378869c623b5c7";
-          sha256 = "19dw5gg8zb27m5j7iwqzzbbbqy5nl6zysx0a1mv8fp68psapl0ln";
+          rev = "ca0b74d32b5d2d77a45cc6ad6edc00be0ee85284";
+          sha256 = "16hygfx9gla6yhc3kaiy4m6g910m1hak3v86fnpf12kzvjjs9zfx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivariants";
@@ -38366,8 +38407,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
-          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
+          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
+          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38425,12 +38466,12 @@
     ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
     melpaBuild {
         pname = "ivy-youtube";
-        version = "20170818.1432";
+        version = "20170822.659";
         src = fetchFromGitHub {
           owner = "squiter";
           repo = "ivy-youtube";
-          rev = "c80bbab9d499d96bee3eb9a6d9be74ad254ec86d";
-          sha256 = "0n2v1w2801yxc71xd0vwma7y4nzs2qgnwbmkkx3xiq4n049sqd8l";
+          rev = "9a9d584124bd9905b5a8a7e29cdafa3224770c9d";
+          sha256 = "0fircdxhfb9s6qmzic2hizhlwfkszw3was83nw09zf0zhab3vllh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
@@ -40605,8 +40646,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "5b9a1c94e36e38500d72379b50e091e5aca522a6";
-          sha256 = "0si4xbqz5pcwrikawwjp9yjcrfi1fpiarfnym0c9pbrdr77a8mv3";
+          rev = "500de18ac442b74d2cebd973059d643f873320c5";
+          sha256 = "0qiy4ckd6jlwwfhixmhdyndglfn6xbj5ha31400fgckb0db254fa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -41375,12 +41416,12 @@
     ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170714.1529";
+        version = "20170830.58";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "f4abac98adfe747c93abd4398dac3aafa33a816c";
-          sha256 = "04gm8i663k9vgij0c9qqmicmq0dcxbnahjrx81agp2sqzixh6adx";
+          rev = "4ca70c65f2ced4e759801952986d828f6bf983cc";
+          sha256 = "0njxqh5cqcq1a3n25rbcplwinanriq8zyaf6zj36jykpswx2n8m3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -41652,8 +41693,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "446f61280f984f17d4b923150f3b5c58f520ecaa";
-          sha256 = "1vnck52yj8h0zahqgxlx70h7pqk9dnd5sy3jdl92rkj0bimhqr9s";
+          rev = "f62f2af216cedbcbcdb568f16392de2581dc6ba0";
+          sha256 = "1z7rpb20c5z1912p9ay1np3ffg06h8y55vpbzi8q2b3dwfd5djal";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41967,12 +42008,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170813.913";
+        version = "20170825.1129";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "15017ccd229644a3b253937f2bb5e1420f197d6f";
-          sha256 = "1lldyv3ixgy3rsxyp6rfz5427vd9bds90rzvjxf747hn5ws6m110";
+          rev = "72a72815b7bff1d6bc6c420c9bb7e9ddb4f1ec5f";
+          sha256 = "1459yd1yl4i8qlzj54aqknx01j7xhj9v8rj11s9vzcdqpw0lb2ks";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -42009,12 +42050,12 @@
     lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }:
     melpaBuild {
         pname = "lispyville";
-        version = "20170515.807";
+        version = "20170823.1458";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "lispyville";
-          rev = "92e22ed9f70e0ae2c68736fc8d91240af36102e1";
-          sha256 = "0gz9z6dsslrx8fgzgy98y3mcpcs00k10hygrw8rbrdf2q8k2xpcg";
+          rev = "dbf62c3b50723e3970a80d181805c395d4d4c33c";
+          sha256 = "0xjqdkimw65qa9ldh9ms03mgh6sh5yyir16vyi2fmwjlb1j4vvh9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville";
@@ -42410,8 +42451,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "https://llvm.org/git/llvm";
-          rev = "854f9175285330ee09ccb5a3ff448bd6883111f3";
-          sha256 = "0z1kvki59hl0flqhx1p2vsgnxhxyifphp840sgzs7v56dw8bdjb1";
+          rev = "e17ef297f0841306e1126830714652511e3f8d9b";
+          sha256 = "0lkwihxqga42cgxsiawag45fhmhwivx69w7c8jr86sffi04illln";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
@@ -42887,12 +42928,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170816.1123";
+        version = "20170829.1033";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "460334192ad6c96c0d7204d537561477dcd80586";
-          sha256 = "1khwzn0z422is124pfl508c11v402ln4231bk2hq0dk9j6r1mrkm";
+          rev = "b386facc7347b3b5412d0cc8a1d8738a890e9b49";
+          sha256 = "0malv3i8hgir3hj32y4gxfqkvvpnwca2sn7iv708wkwmw3jcib5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -42929,12 +42970,12 @@
     lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "lsp-rust";
-        version = "20170421.326";
+        version = "20170829.142";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-rust";
-          rev = "bd9b1f5d9195067decc496e61ad383d615b7f054";
-          sha256 = "1nai41wv3wfxx2lslkpm0qas73j6hachiqwbvhvvcfz34h9nnc5l";
+          rev = "613a379e8cf62597181c72b3e4a69893852c60a6";
+          sha256 = "19p8cw38kmj0kjw0kknicd8zva9f7vai9rjk3xbli5cwpmwvizy8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
@@ -43223,14 +43264,14 @@
         pname = "magic-filetype";
         version = "20161214.1017";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "magic-filetype.el";
           rev = "9a20137474697063898902b43a40423daa4eb64d";
           sha256 = "1r16qlm2pqcph0zwy3fhzdjywdrfcwvldqk809vbhw71qkq4a54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
-          sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype";
+          sha256 = "0f0j8fgh2gpkarz9308pns0d89wc2dchyim6hbixkdpqzg9gskc3";
           name = "magic-filetype";
         };
         packageRequires = [ emacs s ];
@@ -43263,12 +43304,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170808.1712";
+        version = "20170829.1128";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "8810adb1ff5388c5e4e5a7671b4e207eb49985e2";
-          sha256 = "1q9bhy0ig5jg8wcq35pdpsmwwzl2vr2pbcd1zm2pc2c3ajgilkyk";
+          rev = "1250314a4bf7bfd3971f6a422744b0e3da7b3e71";
+          sha256 = "0vzgpqjvkvx5hl0z5lyd7s5smgv86hhivr8zqqzs4q7y6s2qfxgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43463,8 +43504,8 @@
         src = fetchFromGitHub {
           owner = "qoocku";
           repo = "magit-p4";
-          rev = "ef23e89dc504970e78ac9b158731a3eda7d6d7ee";
-          sha256 = "1gld0x4y4jshyfr0q8k5icjpgmfrbcfir13sysgzqjz9ssyn2bi5";
+          rev = "c87de6d3f10fd35415a0c56e63747eb14ed5a113";
+          sha256 = "03gn9xl9mqxb7ways9n9rcl0hc3h41j2nq42q10b0jw5zrzmr9ra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4";
@@ -43480,12 +43521,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170810.917";
+        version = "20170824.1130";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "8810adb1ff5388c5e4e5a7671b4e207eb49985e2";
-          sha256 = "1q9bhy0ig5jg8wcq35pdpsmwwzl2vr2pbcd1zm2pc2c3ajgilkyk";
+          rev = "1250314a4bf7bfd3971f6a422744b0e3da7b3e71";
+          sha256 = "0vzgpqjvkvx5hl0z5lyd7s5smgv86hhivr8zqqzs4q7y6s2qfxgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43606,12 +43647,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "magithub";
-        version = "20170820.956";
+        version = "20170829.1509";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "cd3b194f8f7f3a7f75f755552d48dfae9e5ed5cd";
-          sha256 = "08vgz3sg3c23cl20330zw19rd2vxnhx04b6k0rgyh95mv61lgy36";
+          rev = "9408c1af76890802bb2038ce5779949003263765";
+          sha256 = "062vfj3mm9g5avf9cj8y0zm5gm8wsnqpnrqlclqwcyya3jy4jrn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -43963,12 +44004,12 @@
     mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mandm-theme";
-        version = "20170304.1401";
+        version = "20170826.307";
         src = fetchFromGitHub {
           owner = "choppsv1";
           repo = "emacs-mandm-theme";
-          rev = "cd1505c8bcff0a3de821f0b419f897f4b0378b01";
-          sha256 = "1spj3mlydwnngccrny27p8s3m75n039hipqvzqskdg7p1hvr6m59";
+          rev = "4cbd651445cf92137261b863ed5f16fdee6b8d11";
+          sha256 = "0sryf8cg0j9argi2cfmv7v257xcxlgvl9q0yrbviqrb4gvdg5wi2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme";
@@ -44002,6 +44043,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }:
+    melpaBuild {
+        pname = "mandoku-tls";
+        version = "20170822.1138";
+        src = fetchFromGitHub {
+          owner = "mandoku";
+          repo = "mandoku-tls";
+          rev = "82b1b39305da3259b53a2200260713500d7a9ec5";
+          sha256 = "0xkycqwv5bczz111zlfai2y3m9shwv237dhgyjmhd1j6blpp59jw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/mandoku-tls";
+          sha256 = "0zny1l548rvjsbbzj47wysz6gk1sqxvpj215r3w84vw5dyrn78bz";
+          name = "mandoku-tls";
+        };
+        packageRequires = [
+          emacs
+          github-clone
+          helm
+          helm-charinfo
+          hydra
+          mandoku
+          org
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/mandoku-tls";
+          license = lib.licenses.free;
+        };
+      }) {};
     map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "map-progress";
@@ -44131,12 +44201,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170817.822";
+        version = "20170829.1812";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "737a4fd5bf555aff5cfc6a19e82a7af527846702";
-          sha256 = "1y9nf7976x8c7d2m4pxsm6hlks3v5ra4cv8kqrcp1ly7wcjr4gm4";
+          rev = "8dec2fda4da3098d04aa278268bb30ec63ccef9a";
+          sha256 = "0wl7qgqqyz2hqsvfylyk2dzj74v2qbmcm9al2ghyz14r4z58xjwl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44639,12 +44709,12 @@
     mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "mc-extras";
-        version = "20150218.234";
+        version = "20170824.2239";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "mc-extras.el";
-          rev = "71cf966be06d9c74e781a87bb30fa4cf657ee852";
-          sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
+          rev = "f0ba639e9b18cc56e80ae45bbb2b694dbad9171a";
+          sha256 = "0d6ncj6zd0lfsdpffbh3l25ycjw5hn0rwi5znp5hpl06b1ycyk4s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12747bb8603ebc09ce0873f3317a99e34d818313/recipes/mc-extras";
@@ -45492,10 +45562,10 @@
       }) {};
     misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "misc-cmds";
-        version = "20170307.847";
+        version = "20170823.842";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=103";
-          sha256 = "1w58z2j95sycgkakgb9anlc3q73v77whspi9a4j1kf6lmcbpyms8";
+          url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=104";
+          sha256 = "1spds0fkbvk1br3lpaq3ifyvq0vk5rvyyx5x3cmrvpd0m5s01h87";
           name = "misc-cmds.el";
         };
         recipeFile = fetchurl {
@@ -45653,27 +45723,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    mo-git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "mo-git-blame";
-        version = "20160129.959";
-        src = fetchFromGitHub {
-          owner = "mbunkus";
-          repo = "mo-git-blame";
-          rev = "254a675eb794cdbbdef9fa2b4b7bb510b70089c0";
-          sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b72b67897c349d48e8fd47a4b33055738ed5d89/recipes/mo-git-blame";
-          sha256 = "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x";
-          name = "mo-git-blame";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/mo-git-blame";
-          license = lib.licenses.free;
-        };
-      }) {};
     mo-vi-ment-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mo-vi-ment-mode";
@@ -46551,12 +46600,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20170808.1745";
+        version = "20170822.1344";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "316bd3a5916114e545d9ee26208cc82771cb7002";
-          sha256 = "1ff249bvppw9dnjqawc48yhf1vyvq8a54xm8808pak2crpn44zix";
+          rev = "a5f2dbca51c1c77dbcc0d4b752b78c0971ef43bd";
+          sha256 = "0zpw6mdngf0zh8x8zj3m00irk28kw5qh0l6wxdc4cwzsnbc10lkn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -46593,12 +46642,12 @@
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
-        version = "20170429.816";
+        version = "20170827.735";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "3453e25ff6c07c1b768b2a79fdb9fc5c97100e76";
-          sha256 = "1nvsfbfsma59ilf7c3vjngnmx3aapwvvvaafdy5szm5r6lkicqvg";
+          rev = "b5d255b8a1777ea95b944f2750e7e93c5bb32f2e";
+          sha256 = "1ph85rll8mgsxb720cr87xkmw7zr3k65hha5xybpyvwr96bv6963";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
@@ -46696,12 +46745,12 @@
     multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "multi-line";
-        version = "20170417.1856";
+        version = "20170821.1926";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "multi-line";
-          rev = "ca151864e7ff7ade0e530e8eb2c26291d37a56b6";
-          sha256 = "01dsnpfwkycmq3kiy76hz92bm1hq4rqqg3kp56scy05sz9biqzkc";
+          rev = "d3ce76b6aec62f96ef2c0409d8262fd39e67dccc";
+          sha256 = "0kysz7l18z3fkzygpdnqf2ancixrwyzh6n49jgk0c50lhhqj324x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -46825,8 +46874,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "18f992bff596609091afca128b51a7d2e919ac40";
-          sha256 = "01xlbvnc74h450wm6falpj839nz04dmc2ll083zkndd3gfjk6g3d";
+          rev = "6f183a1e82ba6f998a8c4e3d47a780fa7370f231";
+          sha256 = "1aqlxp9r5nq3mpvmc53pln5abp9naq4c119wf4az1mnf6z6l2da2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -47700,8 +47749,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "5809965fc8f4bc33133c10e49758cf60b069b82c";
-          sha256 = "1fmvdndnr1i5rywjc7r40y0cxshs06qvw488lhg15n5kl2z4271l";
+          rev = "d4f7a5b25f1b58a0434ed2c6b1a5e522f8017af7";
+          sha256 = "04jdy668yvsrdg1hjhwrd6gs6asj4j4p3f6pqgsp9qs9d2d4474c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
@@ -47948,12 +47997,12 @@
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20170820.1810";
+        version = "20170823.1252";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "517f2682799bdead083e91de5eeac766dc8e34fa";
-          sha256 = "1hfvrcj9bhl2xc3hsg9q4kqwaj7saybpiq8fv1q3wz4k2y948cdy";
+          rev = "adfc03d318b6e849278c48eb3c66ee217ecb8681";
+          sha256 = "0x228qjrsx25lsidifrcjc31lxdgjb1hnvaks4n3xhnbdm07g4ww";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -47994,8 +48043,8 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "7bbc708ff08f5660f4cff4b3e8c675bec428a1f2";
-          sha256 = "1iqv268yvvhs7nxf28105g3ya16js1ibzxl0is13i4hlkx9wiqw1";
+          rev = "327d6cee67dac252938cda82c91a6b4d65ef523b";
+          sha256 = "19yarj8vz2lz5c09s35jgi4kgfr8k4cl54hc9ajbx1i56h324l2g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -48032,12 +48081,12 @@
     nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "20170811.1927";
+        version = "20170824.2204";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix-mode";
-          rev = "42632ee471aed3e8a1a6ef385d1ee8bc43938a42";
-          sha256 = "1ra37fszvhx8168c1vr0dpgjryz50mmwxm8yx2wqg9yggwwnyql3";
+          rev = "b0db22ebd50a62ccb225e8404593757cba19588f";
+          sha256 = "0g3q6xy3whrqmpds1zpfgfnxrqnk72lclz5h2sid4a48abfqjhvf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
@@ -48179,12 +48228,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170815.119";
+        version = "20170823.518";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "no-littering";
-          rev = "c9cd2fc9413a41a6c5240969cbe2ae9e47762b9d";
-          sha256 = "05n2wnk7x814fzpcmndiydhafgszz5h66vpa051qk3xcp6zn9i7y";
+          rev = "c1e2cd9daf37f6a1e455be108bececef7c362692";
+          sha256 = "145ivrf0km7aknd318vzy4c4wyjzz4681kcl84amqvwwdzbmsnxi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -48386,11 +48435,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170820.433";
+        version = "20170823.408";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "49d4f52f270773f86c90eb1c50805d1d7429d39b";
-          sha256 = "1f8jqkj5y2h95qz1zdzas0yrwjgxv3hdly6cscsm2qp0hkvzga0h";
+          rev = "ca4852649ede6618046c1b38698af99f72063ecd";
+          sha256 = "1an10gqvrlw78pxqxc9f8sz46wym0bcvjfk37ysc378iyfx8j1d5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48446,12 +48495,12 @@
     noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "noxml-fold";
-        version = "20170520.545";
+        version = "20170823.657";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "noXML-fold";
-          rev = "41cd645531783982e03cb1af2fc2acd59c88f6cb";
-          sha256 = "1bpakbwcs6qilx0j24xg01yarkyvv8wvcf6j5kxqmls3hq23i47s";
+          rev = "46c7f6a008672213238a9f8d7a416ce80916aa62";
+          sha256 = "0axr7n4wdrd009lz6sg4y9ggf4f5svgrsclwhs0hyn2ld34rvrax";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold";
@@ -48548,22 +48597,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, transpose-frame, undo-tree }:
+    nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }:
     melpaBuild {
         pname = "nu-mode";
-        version = "20170816.1316";
+        version = "20170825.1300";
         src = fetchFromGitHub {
           owner = "pyluyten";
           repo = "emacs-nu";
-          rev = "afc23383f0e3c4240d8d18ab7dd87edf595655ea";
-          sha256 = "0zp682b7w3ifni2x2x81xirg7f7kcx1jwqrxpx2j57lrvhszqg3l";
+          rev = "711b5bd53c77ba66987fe9807a4442084f67789e";
+          sha256 = "11iymqm51ky7k8ylwvcq770y8anaqn8giki63kf2a96f4rdglb1x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode";
           sha256 = "0nzv3p62k8yyyww6idlxyi94q4d07nis7ydypar8d01jfqlrybkn";
           name = "nu-mode";
         };
-        packageRequires = [ helm transpose-frame undo-tree ];
+        packageRequires = [ helm help-fns-plus transpose-frame undo-tree ];
         meta = {
           homepage = "https://melpa.org/#/nu-mode";
           license = lib.licenses.free;
@@ -49852,12 +49901,12 @@
     olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "olivetti";
-        version = "20170806.2121";
+        version = "20170823.1754";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "olivetti";
-          rev = "21f8356ce025a66125954ed372c8ace83bd279c4";
-          sha256 = "0a3d5rsg4vmjzj8lwgj8i205ns526g66895ppx4az6x542yamr5x";
+          rev = "da7955aaea2a3f3ad07b457b9737a24534674e33";
+          sha256 = "11qvlwsy6l4v9jcdnf7g3yxy85g1qii4hmrpv6s85vbfsn9rxxw0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -50020,12 +50069,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170821.1113";
+        version = "20170824.1418";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "46b2c3d16b83ce6e7e318d69ae74e1d7c4106549";
-          sha256 = "0g2zap8yyv31lkpmdnripg1q03xdb7sm3jzq7j17sgqak2a223xp";
+          rev = "8aa56979fe85211b1e12c42e91b68a4ebee5176e";
+          sha256 = "15bsmi5cm208iq8rw87gvkkqja2shldbc4287x1qxny3cplcvwqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50489,12 +50538,12 @@
     org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-beautify-theme";
-        version = "20161019.1524";
+        version = "20170829.1443";
         src = fetchFromGitHub {
           owner = "jonnay";
           repo = "org-beautify-theme";
-          rev = "7b7a7cbd4f25f77e8bd81783f517b2b182220fd9";
-          sha256 = "0nqw4apv642vqbjjqbi960zim9lkbnaszrlasf25c9fnzdg1m134";
+          rev = "18528986b19246d7763f4db8f336fb0a0ab4bfe9";
+          sha256 = "02zqwfxxkmcb7c1w3vnf5b3zkz84fqyhldyriccd80mr3agq8wnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme";
@@ -50552,12 +50601,12 @@
     org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-brain";
-        version = "20170814.404";
+        version = "20170826.1412";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "org-brain";
-          rev = "f572bf29d6592f587b671b215394cf459dd574b9";
-          sha256 = "0f8nf4mljf2xfkwvn9n2d612sy02mk4m19lnx5pidjmm5a50id6j";
+          rev = "f5a147c1f94eb21c61d15bc3e19f5bc95ebc055e";
+          sha256 = "1bnbyd1w59kqh78q58171vsl1fgj8vkczx12pqvvvi7316714flg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -50993,12 +51042,12 @@
     org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-edit-latex";
-        version = "20170816.114";
+        version = "20170825.810";
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "11481d0b324433e58d3846d5da675be559be507a";
-          sha256 = "1j2klbyfjyk5ysvnv9xihbkcb3lbfijkqf4c8bp38n6lb9bdhlhc";
+          rev = "83e03b6bef7746bc0a90c0a52ee8c18c4e87ada9";
+          sha256 = "1y9ycmsnwwc804zlsz20ad210plp0xgzjq69rpvry5gg17wp3nv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
@@ -51310,8 +51359,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "526b3d4b980317ef176869011b9b152ef85b5258";
-          sha256 = "1gn7w15g7rhm609pkmg4riq9xj5lfkwc1f52mlcsiczaqn6n1rbi";
+          rev = "c01b62305e4bd69a26da9838ce4a86a73f01c92e";
+          sha256 = "1j7r8w5khnld2lcpgxgwd90bd8ilrjpp19v4ssny3s9x5rzr2if2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -51330,8 +51379,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "526b3d4b980317ef176869011b9b152ef85b5258";
-          sha256 = "1gn7w15g7rhm609pkmg4riq9xj5lfkwc1f52mlcsiczaqn6n1rbi";
+          rev = "c01b62305e4bd69a26da9838ce4a86a73f01c92e";
+          sha256 = "1j7r8w5khnld2lcpgxgwd90bd8ilrjpp19v4ssny3s9x5rzr2if2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51368,12 +51417,12 @@
     org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-mind-map";
-        version = "20170813.631";
+        version = "20170827.1554";
         src = fetchFromGitHub {
           owner = "theodorewiles";
           repo = "org-mind-map";
-          rev = "baf46fa5cbdc545d13be78badac359cb50706c89";
-          sha256 = "0z1yvii2956nv27wkb6qwzb74vn8b09bgv3r8xq5b9xhcxm7x2aa";
+          rev = "c3c6e23242d92ea289650ea97c81e2c7711fe155";
+          sha256 = "00yic00cv6hqxhjixqprqkzrb7xhxa8asslnvsx0hacz65p1lrvd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map";
@@ -51410,12 +51459,12 @@
     org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mru-clock";
-        version = "20170323.308";
+        version = "20170829.403";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "98691aac779001d50516b12679e2a53b5192f164";
-          sha256 = "02v872vmvrda94s8gpv3ylss2fvj3ja6r70rvcmannjikmjdan5k";
+          rev = "096a7c514ab8487ec63def6281cf4dce24e3a626";
+          sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -51980,12 +52029,12 @@
     org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-super-agenda";
-        version = "20170819.2228";
+        version = "20170823.151";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-super-agenda";
-          rev = "63a48409b1046b25fd51fb8e464e30b0b8a0857a";
-          sha256 = "0lxldd7s4wvv00ny5asqml4yglbf86l93fhp51wkffdxwh4h9l8c";
+          rev = "a4973debae634554325f0dd3e74bdd2810324950";
+          sha256 = "0gwfkpf511zzx907ljvx6lwnskc29s03i22is3172v4r6szr33wb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
@@ -52022,12 +52071,12 @@
     org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-sync-snippets";
-        version = "20170614.641";
+        version = "20170824.1128";
         src = fetchFromGitHub {
           owner = "abrochard";
           repo = "org-sync-snippets";
-          rev = "e96bc94ff8865b4d408d90c4f3e39cc7cbb6cec8";
-          sha256 = "0913klrly2xb1pxh91yvvfpzpackxn7sqpsajf4q8adbnlkn0w96";
+          rev = "0f264a032d371d7dbb4a7cbaf0ea2f91b5a629ca";
+          sha256 = "0j680cla1zlxkwnslxwnxd5h6v1vvwr9byi1aawm9gxvz11x7vsj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets";
@@ -52292,27 +52341,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
-    melpaBuild {
-        pname = "org-webpage";
-        version = "20170809.638";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "org2web";
-          rev = "89a67c0e32e172613e6c46bffcd9537f9198067a";
-          sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org-webpage";
-          sha256 = "11zv1vbwd03dyk2ac8k8lh0x5f2b6vpxdib74qs8wdvvqi7pippm";
-          name = "org-webpage";
-        };
-        packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ];
-        meta = {
-          homepage = "https://melpa.org/#/org-webpage";
-          license = lib.licenses.free;
-        };
-      }) {};
     org-wunderlist = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred, s }:
     melpaBuild {
         pname = "org-wunderlist";
@@ -52334,22 +52362,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
+    org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }:
     melpaBuild {
         pname = "org2blog";
-        version = "20170804.2043";
+        version = "20170826.1843";
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "8bcf98ea538c1397f9fbe2098dc836fe9e1dcdf9";
-          sha256 = "08ddhdhrs0jz22g8dv0dzyqpdqsjii4cfjax3xsij8qvs4h593cx";
+          rev = "62a6400746847f246e12493271f0bb52f7465a92";
+          sha256 = "1xnb6yd5ny5i6hvzxfsnga5m75si5y8vc1j3vfs42r99s2ns8yid";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
           sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
           name = "org2blog";
         };
-        packageRequires = [ metaweblog org xml-rpc ];
+        packageRequires = [ htmlize metaweblog org xml-rpc ];
         meta = {
           homepage = "https://melpa.org/#/org2blog";
           license = lib.licenses.free;
@@ -52425,8 +52453,8 @@
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "org2web";
-          rev = "89a67c0e32e172613e6c46bffcd9537f9198067a";
-          sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8";
+          rev = "b14aaecd9e51b3cc4fa4530bfc6f07dd47c80616";
+          sha256 = "04f85kw7d5s8yszbm0270yyb49i3k5a9q35a6zdfhpmpfap48h90";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web";
@@ -52980,8 +53008,8 @@
         src = fetchFromGitHub {
           owner = "articuluxe";
           repo = "outrespace";
-          rev = "47df84553ca3df0f42da19fa79e7ddff6e50ca35";
-          sha256 = "1fckl6jim7i63zpq6jadagpzcq65ds23ya3n4ajilw611bd0jn26";
+          rev = "ef13c944735e8b3cb41c8067d0a2c1de400071b8";
+          sha256 = "18jc9yx5p5rx7pqj8yqlzz4vfqxjhydi5mhrycafdwi001hc493k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace";
@@ -53127,8 +53155,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "ox-clip";
-          rev = "649aa719c6cb3fab46d1ff20d8090b85503a771e";
-          sha256 = "0n2s59668l9n9vz8qs4kmbmlf6cybd0zijkb65qvba5iz4lxsj08";
+          rev = "b596760aec2ab4e10b18807c01839047aa209d6e";
+          sha256 = "0bd5vbbz0p0dg5v7s54a88ba7aca53xwr8niirshfkm916lc8mpy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip";
@@ -53354,12 +53382,12 @@
     ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-pandoc";
-        version = "20170818.747";
+        version = "20170829.1658";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ox-pandoc";
-          rev = "558661d1b6ba98ce2dd9b8a498a01db341bbbe31";
-          sha256 = "0if6d8c04m2rgv0abxrav04fqz8v2y1bgkcxkmj8x8xr3fk675p3";
+          rev = "7a7635ceb3e6c6050e1a932dc91b639c41572b51";
+          sha256 = "1fr33hljpb9f8035ghqrrw14ybqjnc8w0m714yx8jp6hbvjvgkdn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
@@ -53669,12 +53697,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170820.524";
+        version = "20170828.452";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "58d5fcd4ddcb023fbd74b0bdb304cd3037a955d3";
-          sha256 = "0yqnbvswps2244zsib3ym3cbmd94sqn3yznfry5rwbq30b9fya2p";
+          rev = "a7bcde21d5f2d1ea3b69834a8f6b56b4c4e78dea";
+          sha256 = "0yid4kaqbqf3w7a10ghbds8bbhkhn7k2xhw921zwvri00w98gqgx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -53816,12 +53844,12 @@
     page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "page-break-lines";
-        version = "20170517.235";
+        version = "20170829.157";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "page-break-lines";
-          rev = "82f9100312dcc922fb66ff289faf5d4795d8ca7a";
-          sha256 = "1bwh5g63cg2iw3kmcwj4y2jdw46rxll9rgjn6ymx7hbw15s7m5yp";
+          rev = "913732ad06d838661989fb1fef05fcc9ca88f725";
+          sha256 = "0cpcbjxm158475jq96hms0qyk14ijvzcxfac4gw8nwhik9n4mv1r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
@@ -53940,12 +53968,12 @@
     pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
     melpaBuild {
         pname = "pamparam";
-        version = "20170808.1219";
+        version = "20170829.939";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "pamparam";
-          rev = "33efb42525da0094a5338f6cae4013fddf550118";
-          sha256 = "0r8c3njp24g1jsmypdvd7ax0hylk3igp0yfblszsz1ypafl4x2jv";
+          rev = "a476d240cfb73e826ccb907de36516b4e1d774ac";
+          sha256 = "02l709xv2jyz0d3mi06mp7z2m35p3z5vv00z6qp7bnxydk82l91b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
@@ -54316,12 +54344,12 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "20170815.225";
+        version = "20170829.105";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "358070a74f5bf13c0707e7da13a51c3c41eb20cd";
-          sha256 = "19m7gsvaagql5n9q8l7dm2h9ir2mg9d3h7lxfwh2bvpl3c9vsh2i";
+          rev = "60bc00c0931bf1229ddaaf7839155bcc07fc3bec";
+          sha256 = "1vjxm0q9l0d4dj8v1l4cif51cphn6gjvkkw2p92c59psbqa371rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -54418,21 +54446,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }:
+    password-store = callPackage ({ emacs, f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }:
     melpaBuild {
         pname = "password-store";
-        version = "20170726.2054";
+        version = "20170829.1633";
         src = fetchgit {
           url = "https://git.zx2c4.com/password-store";
-          rev = "8fa1be8cdff8f5278011616171d8095b8a46b287";
-          sha256 = "0i9iqsrg5y2w694kx9wa4fv3syijdshripjl6wi83c2xi4cp6p8s";
+          rev = "65cead8c0fdb07ce3821f6b97bdcb32684d0c3f7";
+          sha256 = "0rm364l9mg2gl16ng5zd02gkfq8592mhrp81sk1v0wwh8wlyrzrh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store";
           sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65";
           name = "password-store";
         };
-        packageRequires = [ f s with-editor ];
+        packageRequires = [ emacs f s with-editor ];
         meta = {
           homepage = "https://melpa.org/#/password-store";
           license = lib.licenses.free;
@@ -55386,14 +55414,14 @@
         pname = "phan";
         version = "20170205.604";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "phan.el";
           rev = "6442663bf7618bc614b6c47b0ad7bc591c68f947";
           sha256 = "0s38vbnsbpazca0jsahjmms7qgq74gsvfn2zkrfkhx9y8cpfxrrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan";
-          sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan";
+          sha256 = "17ar6nxy0plx5li49kgf4f0h99wwmnnp5kwmpf34jg9ygyhaglvb";
           name = "phan";
         };
         packageRequires = [ composer emacs f ];
@@ -55759,6 +55787,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "php-runtime";
+        version = "20170828.2343";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "php-runtime.el";
+          rev = "b33a4dc01de7b6a0b81602998dafe8257805e4e1";
+          sha256 = "1608qkn20qdgh9nfaqlgiflhgjy84i51g91b5zzv3wnw56dyavyx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime";
+          sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb";
+          name = "php-runtime";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/php-runtime";
+          license = lib.licenses.free;
+        };
+      }) {};
     php-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, s }:
     melpaBuild {
         pname = "php-scratch";
@@ -56014,12 +56063,12 @@
     pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pinyinlib";
-        version = "20170424.1352";
+        version = "20170827.1442";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "pinyinlib.el";
-          rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234";
-          sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0";
+          rev = "45f05d3dbb4fe957f7ab332ca6f94675848b6aa3";
+          sha256 = "0pmgb4y06dbffs4442aa92vn8ydwl45zqwzxzwhk6md1318fppvd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
@@ -56474,8 +56523,8 @@
         version = "20170419.303";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "488bf1c3be5ebe66520f352bfb8d99917878ab42";
-          sha256 = "1p81ljxxsxd5dp9xn46zia0sp8d095ib3aaby3yzar55nvdfpl6f";
+          rev = "5ad8c92742daaf4434fded196ff23638cdaa621b";
+          sha256 = "1z3cy6n727lrsm8smksb48hbj2ckh4wri44c0423hdf84qp5ifg8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -57283,12 +57332,12 @@
     prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "prettier-js";
-        version = "20170712.2334";
+        version = "20170823.159";
         src = fetchFromGitHub {
           owner = "prettier";
           repo = "prettier-emacs";
-          rev = "9cac36f6b1c224e0772dc92d15a6105ec10d3f40";
-          sha256 = "0iwriz14aj5ripnr2v4y96pdl092h93i8mq2qi5jdi31fgi97sjj";
+          rev = "6cc79cc933968f9ecae988ed79398d9dc97790e2";
+          sha256 = "01k1k68rwwpjdajc12dvpjr8jfncvj8lli2l6065jwbq8ldg2ja0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js";
@@ -57720,12 +57769,12 @@
     projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20170820.2210";
+        version = "20170827.2053";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "74bac5b5744ed293533966cc4959cb366029fa5c";
-          sha256 = "13yw4rjmjgsajab4njlq7g5g8xh97f2xwpq9f2qfbsavkbpbf2p2";
+          rev = "adf6ae2dbfbdca96aec49115ca35867006f326b1";
+          sha256 = "1x39v7lb63k2nfa4xyvkgvgxbd88jcqnwdmd78a86p5zc3m42zk9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -57911,14 +57960,14 @@
         pname = "projectile-variable";
         version = "20170208.918";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "projectile-variable";
           rev = "8d348ac70bdd6dc320c13a12941b32b38140e264";
           sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable";
-          sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/projectile-variable";
+          sha256 = "15qc5n91nxyfvb100iyihfmrdr57qgw6098yv3nfqgw3zx1qchdw";
           name = "projectile-variable";
         };
         packageRequires = [ cl-lib emacs ];
@@ -58144,8 +58193,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "ba4e54724d2e6a1881c4fe88664d81fbacaf8c08";
-          sha256 = "1qa6qjixgw82jd9zwi6c11lqh2qkc444pwp1lczjrw2fm4iyw549";
+          rev = "c7457ef65a7a8584b1e3bd396c401ccf8e275ffa";
+          sha256 = "16mrl0fx2b4pkzf5y9rvsqhwdq8pwxn8knd8i94wlqarq5aya0sz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58278,14 +58327,14 @@
         pname = "psysh";
         version = "20170610.2104";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "psysh.el";
           rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa";
           sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh";
-          sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh";
+          sha256 = "00rzfw8nlbcmfbjnzbfl08136dhgvrrn9g1s9l623xgpbcay63sg";
           name = "psysh";
         };
         packageRequires = [ emacs f s ];
@@ -58862,12 +58911,12 @@
     pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
     melpaBuild {
         pname = "pyim";
-        version = "20170809.413";
+        version = "20170825.2043";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "pyim";
-          rev = "1f40c4341a886ec952de14f642f07ccce90670b2";
-          sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55";
+          rev = "e2f13e120cb6375d04970d6aac035a5923e13505";
+          sha256 = "0dxq9yhyzxnjiqk8b9hcw8y74a8hb19anahivrpsb1xrnrknmw6d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
@@ -58992,8 +59041,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "3b56d183ca3b148d2ff092bbda5b061c20660a2c";
-          sha256 = "1q0z0pij051nv9yb60c7wcdirycz3p3nl63yhs58pvpw6hxnwcfp";
+          rev = "e231a409a83a23c24c8b7dbbaca79314eee6d4c6";
+          sha256 = "0xkbhd2cgsmqkbkscaa758ngfg01cdym7qgh809wsa0j6xf058lp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -59135,12 +59184,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170813.50";
+        version = "20170825.20";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "8c3d55344fecd2837a3f268472f89866365fb54b";
-          sha256 = "0cnzj17wrs5590kc84kywdk5xbs2149kygb3ys74jcli7zvg8bbh";
+          rev = "e0fab065042a7e35b73928e94f32f649eac6a3af";
+          sha256 = "0vpzzfdr85zp2gsh148yp1b1aynwcgvva69r3qjj0cwm13f28492";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -59240,12 +59289,12 @@
     pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyvenv";
-        version = "20170224.538";
+        version = "20170826.812";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55";
-          sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh";
+          rev = "fc1e9c1fbac00460a32435390b94a8ce4f5542ce";
+          sha256 = "0ckam3mkx44hrdykrhvm147xvw09rn328byl6dcpd3ygdqamwpdk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -59538,8 +59587,8 @@
         src = fetchFromGitHub {
           owner = "davep";
           repo = "quiz.el";
-          rev = "64bc2f4b72f70a6c9eab6ebeaa49afb5fc34b879";
-          sha256 = "0zx1ic6cn95wa7b8afq0v2cb7rf8w48gmjlp2dlhz06vk78j1w27";
+          rev = "c43151212ead2330e7ec8e5ac6914c617a12e4f8";
+          sha256 = "09r3p6gw17xrsm0pk6yv4lg8i3yf03yx2mlj4mi9i0r765m01c27";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz";
@@ -60248,12 +60297,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20170803.632";
+        version = "20170825.224";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "3f1b98f7a92e68e087a9a2174e61ac723eb161d3";
-          sha256 = "1xiw6aw31zmvqwa3vpbq1xnla8539rjdy5gfxlhrw1qah5fqxni8";
+          rev = "211c01aa4758a295bbd849cc211656df02b4738c";
+          sha256 = "1k9ccps0z4f9y7503fv1563d59931q63249zvy7pmnx1055qw9li";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -60590,8 +60639,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "56916601db4797712c7f1f62b44a8ccd5de3c6f0";
-          sha256 = "0kpyfx228n0dj36h80hkhl23phx6cmgcadig9kn8gsz9j2icfrpa";
+          rev = "8d796eb5717c2386e8d486b6d4a58f46967f1f3a";
+          sha256 = "0d2502hcr07cy4p4d80jrcgjvah8h6irjqscs03dw1q2cmp0bdjy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -61044,12 +61093,12 @@
     req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
     melpaBuild {
         pname = "req-package";
-        version = "20170314.2342";
+        version = "20170826.2252";
         src = fetchFromGitHub {
           owner = "edvorg";
           repo = "req-package";
-          rev = "e7108177d05fc6f674b1766f1154d0652654b1af";
-          sha256 = "1pv3yvglfq09rc2vxhy48hglppydsz0ji92564xba5kngqbbjw34";
+          rev = "179ab70bb3d4f7a94401dace64f695c50acfe389";
+          sha256 = "1j54l002vq8hz1pghyas4aalqhsnma5czjh4fh5s5cs4v7v6d7s8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
@@ -61174,8 +61223,8 @@
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "restart-emacs";
-          rev = "e6ac81464cce37b7ae3aea38dcf2720cc2750d31";
-          sha256 = "19fh4hsnxb7jc0zhgrg01hn8vbcirjxny5w29gcq7xiighwrbap7";
+          rev = "98aa4efd2caeaf0f42ca385c24fa14a843b271b7";
+          sha256 = "00qh17m4q6a1d2ck1309hp4hcw528nzp60zp8vy6x6qx7shsibrm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -61651,14 +61700,14 @@
         pname = "robots-txt-mode";
         version = "20160820.202";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "robots-txt-mode";
           rev = "edf1f8082c88cb2ff5a784ba00f92c535aaa1c7d";
           sha256 = "11ig771ck610glb6f3322ka026ikq0b072rlq5z6ymr3rbxagn6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1669c7a0d89ea36d61bfa57ef54ee1f203daff5f/recipes/robots-txt-mode";
-          sha256 = "1q3fqaf9nysy9bhx4h9idgshxr65hfwnx05vlwazx7jd6bq6kxfh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/robots-txt-mode";
+          sha256 = "00hxz4mygcxg7d8m2i4cm0bl82v3hw8wb4m8vv7g7fqkjp32c9qc";
           name = "robots-txt-mode";
         };
         packageRequires = [];
@@ -61838,12 +61887,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170819.1611";
+        version = "20170829.1916";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8254e0b25fcd03ad29094869a8c35f3938a0d10b";
-          sha256 = "04lnn8wzidkwm46qhsjg4j6lisj3dpxsb3r60wad6g7haqibj080";
+          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
+          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61904,7 +61953,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59630";
+          rev = "59692";
           sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr";
         };
         recipeFile = fetchurl {
@@ -62213,12 +62262,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170820.651";
+        version = "20170827.1300";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "f57a8ebfc33de72e0ca6fe61ed3d7a622510b5b3";
-          sha256 = "0f42sw2c20nv5nyamd6smbxfkqaygg3li511l5bmwmp557gkakl5";
+          rev = "c8280aea1d02ae84bff2a6f02f8dc7701309c8b6";
+          sha256 = "105ayzqkcd8q2zhny1x84gdry6mfp92zfa8ihfqlfvva6ax6v1vp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -62360,12 +62409,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20170806.2110";
+        version = "20170823.1809";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "15d32495acb7df9aeb1def6845332a1a72fd2a36";
-          sha256 = "068x0dzknpxcjnvbp5wkg3i3bvr67dg7mns7r859mpr59q9gyh9j";
+          rev = "5ba8a40c38c71c813a9d6dc79036f71a7a47e013";
+          sha256 = "04f11yp1rc5zi31hn9imz1z4nli2i5pzllx8niiibff82kw8dvip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -62696,12 +62745,12 @@
     scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scheme-complete";
-        version = "20170410.617";
+        version = "20170824.713";
         src = fetchFromGitHub {
           owner = "ashinn";
           repo = "scheme-complete";
-          rev = "6bf844202cb9e8490ce37a414374be3f04eefca4";
-          sha256 = "16mbcwx1x6bg86qfgl6bhq5qjkz9xgd5f2jl993vvfk824qg4jgl";
+          rev = "4c77038048cbcf34b5907f0439c93058a71a2d2b";
+          sha256 = "14b1bajgvim48j7y4pss73lyxqfyazjnxn1dgvvmkvngm3k1a4y8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/scheme-complete";
@@ -63195,11 +63244,11 @@
     secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "secretaria";
-        version = "20170813.1107";
+        version = "20170828.945";
         src = fetchgit {
           url = "https://bitbucket.org/shackra/secretaria.el";
-          rev = "7bd1cf591528b18a153e15a260d7817b72c900f2";
-          sha256 = "0n9mj2g59yiqbg81rk0gglbgpvfs550r4y26n8nf5pyxpxfllv5s";
+          rev = "1cd32d957864be1ba5c44a3f505f662832169a28";
+          sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@@ -63261,8 +63310,8 @@
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "9197838617211c71a965aa4b009249d231249902";
-          sha256 = "1zk0rf2iq14vssrj9p3ixcricm2lp8kwfxxj1x8vixk1kw118q3n";
+          rev = "61840b57d9ae32bf8e297b175942590a1319c7e7";
+          sha256 = "05vj12l88s29wnkpvgzlbypv9hkmy1hqgv9hvav6v4kmdykl5w1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -64529,27 +64578,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-rtm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }:
-    melpaBuild {
-        pname = "simple-rtm";
-        version = "20160222.734";
-        src = fetchFromGitHub {
-          owner = "mbunkus";
-          repo = "simple-rtm";
-          rev = "8c7cd96cf66ef112be5c363e3378e304f8f83999";
-          sha256 = "1kkhnsxr8zrb21k4ckyg69nsndwy4zdkvfw2drk4v1vnbgx8144f";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fae2c5512242c39f9a1d806fafda85081e84cda3/recipes/simple-rtm";
-          sha256 = "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271";
-          name = "simple-rtm";
-        };
-        packageRequires = [ dash rtm ];
-        meta = {
-          homepage = "https://melpa.org/#/simple-rtm";
-          license = lib.licenses.free;
-        };
-      }) {};
     simple-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simple-screen";
@@ -64847,12 +64875,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170820.1946";
+        version = "20170828.451";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "5ba5e9036ac39fdb51a5d0c07ff794ec2c30eef4";
-          sha256 = "0f85rvsy2g136qwd3fkkxnf5ppkqnn1gvzc5qfzhl2y3fycy4vkm";
+          rev = "f223388c78ea51ce7717e9bbae14c50ad2386c2c";
+          sha256 = "07jks9fnqjv2i9sjfpgj7r3a7g5aha4aipsffjbnw1qd930ygw83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -64994,12 +65022,12 @@
     slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slstats";
-        version = "20170802.413";
+        version = "20170823.149";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "slstats.el";
-          rev = "5e86904ae3facafb3204607c08f8b14aa53fabec";
-          sha256 = "05h5wsv2a4maqrsvr5klj1pqnhaj0cxlzyv7dvs5vb9wkd0mblzc";
+          rev = "e9696066abf3f2b7b818a57c062530dfd9377033";
+          sha256 = "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -65159,17 +65187,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-compile = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    smart-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "smart-compile";
-        version = "20161118.403";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/smart-compile.el?revision=7";
-          sha256 = "163s97h1a9pjz3pqyn2mhh4mf05b7yycp29k5wnk3c9zc71pafvp";
-          name = "smart-compile.el";
+        version = "20170827.1050";
+        src = fetchFromGitHub {
+          owner = "zenitani";
+          repo = "elisp";
+          rev = "64258b424e471c749a3399d32aa35b39dfb05222";
+          sha256 = "08hk3kdz2mkp6lmx1fvgax862ibw99yji12c12n23ksjv1qz261z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e6c3dd7b8e19193d070fd41c2be4bcd61f1022/recipes/smart-compile";
-          sha256 = "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile";
+          sha256 = "1w3vyb6wz786ydrywkjmazyvgfl0qxamn0fgnqpn17d2c5jr9c4g";
           name = "smart-compile";
         };
         packageRequires = [];
@@ -65870,6 +65900,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    snazzy-theme = callPackage ({ base16-theme, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "snazzy-theme";
+        version = "20170823.1132";
+        src = fetchFromGitHub {
+          owner = "weijiangan";
+          repo = "emacs-snazzy";
+          rev = "578d7ebc4ed91c0a630b652c4b6fdd54d9ae16cd";
+          sha256 = "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/18c89a612418e0f49b7e6ae29a678d2fc1ffaf3d/recipes/snazzy-theme";
+          sha256 = "0srmhwhqrp1s01p1znhjzs254l3r2i6c91v7cnlwlvrls1sbh32k";
+          name = "snazzy-theme";
+        };
+        packageRequires = [ base16-theme emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/snazzy-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     snippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "snippet";
@@ -65999,12 +66050,12 @@
     solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solaire-mode";
-        version = "20170809.1220";
+        version = "20170823.422";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-solaire-mode";
-          rev = "8794f4d8fb63758d19e5a5f23e1d1118f0a1d10f";
-          sha256 = "0vq01w4krj7l3qgqck2a1cz2d5xzkbx2giimkxqxzyb00820z41s";
+          rev = "c8da9d228003b88ea31f80e7223608b119d41848";
+          sha256 = "0v0vzxzfxh3pqq9hs52bkgyny3vwzas2qpk5pbpzim3zg3lia35r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -66384,12 +66435,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170719.131";
+        version = "20170829.120";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "84ee6d37b8e6d50763ca2977133684143fc61cf3";
-          sha256 = "1w66rfp1kmhqhnqjz2j41i245fw6840q09bfhsaci6kbhvhd5fnm";
+          rev = "e2e195f64a541d72b6d0ba0451f1e3072234b820";
+          sha256 = "0lrf62gsss19z2ca4hg5c08b3nbkqaa33fqrbfa126v2c98bj583";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -66405,12 +66456,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170731.845";
+        version = "20170823.1658";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "5bcac14ab4b99bc3bef20fd62ef981c4590c4021";
-          sha256 = "0xx22mf4wskn9gv04farwyp3mpx2ab3lsmmxvd3k00x99637x6jq";
+          rev = "30b198ce87a92777f74e34ddee775b99d05b46c3";
+          sha256 = "0a77y9njks44xx1c5j0cxpgkqwlz6lrzkbph3qwnbzkydnbyxgiy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -67777,22 +67828,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sublimity = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sublimity";
-        version = "20161214.2032";
+        version = "20170820.827";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "sublimity";
-          rev = "033c7c04e47e7666afd125a72467c3eb657732d9";
-          sha256 = "073c4bbxkmq7cifzwn933qxkqvklcbg3gh9vm5hr3af9j7vpx2ac";
+          rev = "62b0c526c599a0178a16a75f16513fc1f93a0d53";
+          sha256 = "0kncjm6133a84z9rvygn5dqnwdj036sw6cf1pi595rk3f9r2ccg5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity";
           sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
           name = "sublimity";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/sublimity";
           license = lib.licenses.free;
@@ -67904,12 +67955,12 @@
     suggestion-box = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "suggestion-box";
-        version = "20160927.1530";
+        version = "20170830.107";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "suggestion-box-el";
-          rev = "90452d71e4afe9f42ee975f2f7897835cf3dee87";
-          sha256 = "1bcmhbx4l4x01n2vpcyw8wyp3cklzp65v5d4sx284qj5gd64i1p4";
+          rev = "50af0776c8caf3c79c4d37fd51cbf304ea34b68e";
+          sha256 = "01lx20kzay5504xcq6m6yhvayyd7wpzaa1r6i67xqjnr25lqyajw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b59be8dc0a1850d3e245957fd170e1d01f4e284/recipes/suggestion-box";
@@ -68404,12 +68455,12 @@
     symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symbol-overlay";
-        version = "20170615.1919";
+        version = "20170825.2047";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "1c40cd921d573bbbd2cd9770c0bafc484b23a2ad";
-          sha256 = "1npgjhjdky298n70n1lh1qi6d1km1d9vy82n2x4rjn45699gkrl8";
+          rev = "6c7ec584b62b7922a5398a552a1bf60f8144306c";
+          sha256 = "0haflm6b8aqjbs54h3khax62rwlky3y8py4jq4m664r1nb91ni57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -70030,12 +70081,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170819.2329";
+        version = "20170824.2230";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "ed6cfafbed4d49f06015f2090682b218a4b001ec";
-          sha256 = "0cqg8yb52ljgvjz5f6fmxs2x5p19bj41x2myqarm2jdyy8j58yyx";
+          rev = "2d92188ee66e89ee3c941a36b00eee6ef3f0552e";
+          sha256 = "1rjw9k467ximx0bi6jd9f8v5347p9x830fqdbvn11jyxj10n41hn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -70114,14 +70165,14 @@
         pname = "timecop";
         version = "20160520.352";
         src = fetchFromGitHub {
-          owner = "zonuexe";
+          owner = "emacs-php";
           repo = "emacs-datetime";
           rev = "e6427538b547cbe02e1bd6ed4b765c73620bdae8";
           sha256 = "1573z8wq5m8qzbzmnsz2fmbwrj9c0ava0jjfchzmwm2b3jyvqh5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c367c756a02e161a2f6ce6c422802c9f74102a07/recipes/timecop";
-          sha256 = "0kcjx3silk9vwysaawhcvpb7c82dzb2y7ns8x50jznylqg8c4zh5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/timecop";
+          sha256 = "1hnmxcc2hjx9a4jyavx2v9hxmqacmmg1xj86rxqx3ms32hgigji5";
           name = "timecop";
         };
         packageRequires = [ cl-lib datetime-format ];
@@ -70878,12 +70929,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170807.823";
+        version = "20170825.825";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "b165329a21b9d2693661372f4802208f52029c7a";
-          sha256 = "1lksw9nxvaml4ykhr6m8na3dcwk13r1q86hncyk3ybrg5w9663bq";
+          rev = "d465378a59e2eb91372564a56e60a9ab00e48f9c";
+          sha256 = "0al0xz59lrqj97fxmyxiphblg1bvbzahc6srd8klg7s0378ybblw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -70983,12 +71034,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170817.1155";
+        version = "20170827.311";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "bda0fd59fa7b9d188227ef7ccb7c52a263769e27";
-          sha256 = "0lzfs6887hm8jkl4jz8q3256jpqp3h1zspd6ccn0pphlvmfv471g";
+          rev = "c024a66581b16c15ce9ed246249451ebaeb08cbf";
+          sha256 = "06bxq0bwd728s9rnj2hy0x77404kn9s9vxnxmiiwxxmq4d8kbjq6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -71008,8 +71059,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "bda0fd59fa7b9d188227ef7ccb7c52a263769e27";
-          sha256 = "0lzfs6887hm8jkl4jz8q3256jpqp3h1zspd6ccn0pphlvmfv471g";
+          rev = "c024a66581b16c15ce9ed246249451ebaeb08cbf";
+          sha256 = "06bxq0bwd728s9rnj2hy0x77404kn9s9vxnxmiiwxxmq4d8kbjq6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71212,12 +71263,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170814.933";
+        version = "20170828.1500";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "6b9b57ad4532abb369c374bab4f5b22e7f777b8c";
-          sha256 = "0lrx7d1cykrb9y6bbbmq2fax00k0mn0ahysayc47v9iz6w46rk06";
+          rev = "1d0058a50693f18eee8bd1862b27e15b319f21ff";
+          sha256 = "14ni4fm0fhccgy1whk70hqqcal6shvc7wj2111scay5av0n28r7b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -71464,12 +71515,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170813.1541";
+        version = "20170830.515";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "2c43dd034c156762589f80f7c6163a2bd35b51d0";
-          sha256 = "1xyalhrv7d8fa32xsyx044bxcxk7shm44hcjrncghps9w21zfdwm";
+          rev = "f6d28c7a0df305893ac567cacc755a1db1bcc86c";
+          sha256 = "0728nblgh9b07g03pipvx4f2w7b28fs5bg623njiyii6qwv1v7ai";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -72203,12 +72254,12 @@
     uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "uptimes";
-        version = "20170802.426";
+        version = "20170830.533";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "uptimes.el";
-          rev = "c1e45ea728e5eaedea3e7974256fcfbcd20970f5";
-          sha256 = "15qcii1cs7kyzn44b6np7lxflrszbf3n1wr7vhid6l71cnfgbz86";
+          rev = "c2c1b44b16a0fd873193b17c580ef3dfdacea580";
+          sha256 = "1rq4m77fydkawdwkbw8125ihmvv6aisr03nwb1857k3hxhrg0gwv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
@@ -72576,27 +72627,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "vc-fossil";
-        version = "20161030.842";
-        src = fetchFromGitHub {
-          owner = "emacsorphanage";
-          repo = "vc-fossil";
-          rev = "066a1c591c18102d199407e303ccdd0dd8c26be9";
-          sha256 = "1z42y04h4649i1hn3lc0ydkmaps39357jy25hlcy07x5nxpklvxf";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8f2a79d6ad9cac527db2d08f3ee6aa199152d1/recipes/vc-fossil";
-          sha256 = "0fym5wnig3bdkj86x0n7milcxh3fbigpx42827aim6bm3ry7a081";
-          name = "vc-fossil";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/vc-fossil";
-          license = lib.licenses.free;
-        };
-      }) {};
     vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "vc-msg";
@@ -73770,12 +73800,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170807.903";
+        version = "20170828.1221";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "b0c8db9b08978dd041c8a3ed41361afa9638d17d";
-          sha256 = "0cx038sychpx5jqdsx5llvmq98wwi3bdhwsi8hj0gw5pqc59vrx6";
+          rev = "d24cb64bb366fa9e9c7704cf0fa5bf6ef8c11b5d";
+          sha256 = "1rms3apmykdan4q0hpk0aa18zf7gd9p13rxhayzm9474c06i3z0g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -73896,12 +73926,12 @@
     websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "websocket";
-        version = "20170819.1111";
+        version = "20170829.457";
         src = fetchFromGitHub {
           owner = "ahyatt";
           repo = "emacs-websocket";
-          rev = "b77aca6ccf0937601e53b53ec906f9ee4fc5d469";
-          sha256 = "1af8kx9b4fzvgpf4z486vlxg8r4ai046pmzl5v0i42ifnk2bsxli";
+          rev = "33d0406901f7306b326928190b6ad94247d01a5f";
+          sha256 = "0lw7s121jfqaqrl3b2w9jbx3adh3nq0mkh911c40s4ydxm6xcnk3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
@@ -73942,8 +73972,8 @@
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "a1bda40513f0ea94a8a85ee122a475475a03f6ef";
-          sha256 = "05jnfrjrf1da038jkypvx3slyk39xlpak4n9s5vwmx7mgf4zg06y";
+          rev = "2edf75a8405680ba94528864668b226102dd37c5";
+          sha256 = "14p8q2bjpgka3mdfphllz13kp6l85aghn2l64fwbcpy0i4xgicbg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -74733,8 +74763,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "e5a20c81c0bd";
-          sha256 = "13pb956f1yidwjh4imi01dghzs2wgd6r7n5bzhvpszvx4x1nw4z9";
+          rev = "7ce954278aef";
+          sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -75272,6 +75302,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "x509-mode";
+        version = "20170827.2317";
+        src = fetchFromGitHub {
+          owner = "jobbflykt";
+          repo = "x509-mode";
+          rev = "9d2dbb8287c28779fa27153b16cf26f54bf2405f";
+          sha256 = "1y46v0s833lmrrz4lcg6qp1as8vzh5zm3s7j8j4vzlfrn267dagf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode";
+          sha256 = "15k3pxj3a2vaf64cl2xrzzlvzbqzqc29qyfd8brhq6yc69snr0vj";
+          name = "x509-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/x509-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "x86-lookup";
@@ -75317,12 +75368,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170821.357";
+        version = "20170828.1";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "4f7b14d913bd4401f6765ae75ba17c5350b24782";
-          sha256 = "0x3w5k5n1wg9iqbm5hw0chfmrbb6m5z450q1nm68cqvqlxbjxniy";
+          rev = "6e94446566df206911afa107d06aec50ac3a56fc";
+          sha256 = "028y8dlb5b4vclg03imcipjp56l1m4klgj69f0n7ir0rr6xwl3f6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode";
@@ -75359,12 +75410,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170821.356";
+        version = "20170827.2359";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "c6c7dac8260d0b74034224b8fbc789b0f30034f6";
-          sha256 = "1qgj69rx4flrdgrrib3aq86qf5iyr3xp1qdnvb3m9iwd9pngwadr";
+          rev = "c1f4c2fe62320ade8d1cf5ac3c73f7ace36bed8d";
+          sha256 = "0js78zj2c5x769y5isk5p711hky57rbgkfq94gjma9jcfhkpvc0h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
@@ -75464,12 +75515,12 @@
     xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20170821.354";
+        version = "20170823.2028";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "d11f78994f08cec335e351db92924db133fb47de";
-          sha256 = "05j850yplz1bsf9zxq9gvlh9aikdcy4q78m109gdb0imrikm9h9i";
+          rev = "f051772e097723bafd05a7a05f283b900375ebd7";
+          sha256 = "0r85y1qaqvnj36c931cz4qzxwf86ai35xjaw6bwy7hjjdxp82cz0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-replace-pairs";
@@ -75989,12 +76040,12 @@
     yahoo-weather = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yahoo-weather";
-        version = "20160703.2008";
+        version = "20170822.1544";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "yahoo-weather-mode";
-          rev = "5154c320400fc20a8deb1b43e21f790709c4af76";
-          sha256 = "0f3jh0y14kkbflsdpf4c6qlzdc0jk5p3c6xxs4hd7mb8af32rrvh";
+          rev = "a74e29bc81b13efe285b87fa4d0694d75f8e2bb5";
+          sha256 = "1nimmv84q5zsv81ji3nmvpmi30f8xh0ypa88hpdpykc5iirj1m0x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae5ca93d48a2d24787c3d4ed7ab3a65aa8023f4f/recipes/yahoo-weather";
@@ -76014,8 +76065,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "7652ce2c926084a893b26695a765ba8b8f4ba328";
-          sha256 = "09mzglx049b2xcrz8g7iywxbr79haf1xbcs8qnj1ljypmdmkq89a";
+          rev = "344fc30dc83e005d0b2c7dd330e25bff16fdc5ce";
+          sha256 = "06c27fmdsyw1raq7b02zdp94w4jk859qwdnn8s1dzlcxcmf30ryl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -76302,12 +76353,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170818.1916";
+        version = "20170828.1908";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "c79c8df5999e3147170a45566ad2da4e71c80531";
-          sha256 = "1c0za8p4fyciv3qzg8z2s3sch2rw908i0x4a51z910q3j8lvacnn";
+          rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a";
+          sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -76323,12 +76374,12 @@
     yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "yasnippet-snippets";
-        version = "20170821.302";
+        version = "20170822.1356";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
           repo = "yasnippet-snippets";
-          rev = "6ff001decd016fa753392192936204e020ea3785";
-          sha256 = "0wzai1d70f7q5vppks3j2f3np1z4241wf4p5i821p67y1fsyz4wr";
+          rev = "b2f5f4af18dfedf374595e56969f5ad51edb2d76";
+          sha256 = "0f3f8n7ib25mhpb4s85vvvi5pyfpqrkssb4k8cwb55xwlmji3wsx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -76688,12 +76739,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20170818.47";
+        version = "20170830.57";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "e43ecf497a73c742f6ecdd0f38750fcc53aad5b5";
-          sha256 = "0rys0kvnfjbf29f943bpi79490sax1r7yqbj8xlilk4wnvgs6x7q";
+          rev = "37ec068e6a744274daf1ecd1a64b75db6a7b8a0c";
+          sha256 = "1yh1n6647a3fppjhhbs6ir7vgqn6nqhpghwnhlrl3amp74h6di78";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";

From afa5dcbd7dfed89b359143eb45d599afb2d77a4f Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 30 Aug 2017 13:49:27 -0400
Subject: [PATCH 3037/3246] libsigrok: 0.4.0 -> 0.5.0

---
 pkgs/development/tools/libsigrok/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix
index 7671bf18063..abfbc9a6c47 100644
--- a/pkgs/development/tools/libsigrok/default.nix
+++ b/pkgs/development/tools/libsigrok/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi, check
+{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check
 , libserialport, librevisa, doxygen, glibmm, python
-, version ? "0.4.0", sha256 ? "17k63p3yhpx9qbfprgayphqqhn2hdrcph73g6fqxmrinxqziyaaz"
+, version ? "0.5.0", sha256 ? "197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c"
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl";
   };
 
-  buildInputs = [ pkgconfig libzip glib libusb1 libftdi check libserialport
+  buildInputs = [ pkgconfig libzip glib libusb1 libftdi1 check libserialport
     librevisa doxygen glibmm python
   ];
 

From 3e1fa824dff2a0a03110e1b6cea59c497b46ba2e Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 30 Aug 2017 13:49:53 -0400
Subject: [PATCH 3038/3246] libsigrokdecode: 0.4.1 -> 0.5.0

---
 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 539a5bd845d..e421a709c89 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.1";
+  name = "libsigrokdecode-0.5.0";
 
   src = fetchurl {
     url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
-    sha256 = "15aabl9p4586v2bkj4bm4xi7l3309r9zb31sw233s5vi170p0pq6";
+    sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a";
   };
 
   buildInputs = [ pkgconfig glib python3 libsigrok check ];

From b39462d0c3181f270c1742568de546828b91abb3 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 30 Aug 2017 13:50:51 -0400
Subject: [PATCH 3039/3246] pulseview: 0.3.0 -> 0.4.0

---
 .../science/electronics/pulseview/default.nix        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix
index 595ad9eeb0a..1d61ee2dd16 100644
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/pkgs/applications/science/electronics/pulseview/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, cmake, glib, qt4, boost, libsigrok
-, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi, glibmm
+{ stdenv, fetchurl, pkgconfig, cmake, glib, qt5, boost, libsigrok
+, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm
 }:
 
 stdenv.mkDerivation rec {
-  name = "pulseview-0.3.0";
+  name = "pulseview-0.4.0";
 
   src = fetchurl {
     url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz";
-    sha256 = "03jk5xpsird5ssbnwkxw57jnqvnnpivhqh1xjdhdrz02lsvjrzjz";
+    sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q";
   };
 
-  buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok
-    libsigrokdecode libserialport libzip udev libusb1 libftdi glibmm
+  buildInputs = [ pkgconfig cmake glib qt5.full boost libsigrok
+    libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm
   ];
 
   meta = with stdenv.lib; {

From 902dc73ee2880727a6b804aec5ea2698a0b41814 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 30 Aug 2017 14:04:31 -0400
Subject: [PATCH 3040/3246] sigrok-cli: 0.6.0 -> 0.7.0

---
 pkgs/development/tools/sigrok-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix
index 7ea394039b9..f2b7d67915a 100644
--- a/pkgs/development/tools/sigrok-cli/default.nix
+++ b/pkgs/development/tools/sigrok-cli/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }:
 
 stdenv.mkDerivation rec {
-  name = "sigrok-cli-0.6.0";
+  name = "sigrok-cli-0.7.0";
 
   src = fetchurl {
     url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz";
-    sha256 = "0g3jhi7azm256gnryka70wn7j3af42yk19c9kbhqffaz4i7dwbmb";
+    sha256 = "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan";
   };
 
   buildInputs = [ pkgconfig glib libsigrok libsigrokdecode ];

From b60c9aa950c78cde3ddc9093ff6577ddb95ed453 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 30 Aug 2017 18:33:24 +0100
Subject: [PATCH 3041/3246] thumbor: fix build

thumbor 6.3.2 requires Pillow >=3.0.0 && <4.0.0 whereas presently nixpkgs'
Pillow is at 4.x.x. An upstream commit in a yet unreleased version of thumbor
relaxes the bounds to >=3.0.0 && <5.0.0, and is included here as a patch.
---
 pkgs/top-level/python-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f25018345b..af63366ce34 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26373,6 +26373,13 @@ EOF
       sha256 = "0787245x4yci34cdfc9xaxhds0lv60476qgp132pwa78hrpc9m31";
     };
 
+    patches = [
+      (pkgs.fetchurl {
+          url = "https://github.com/thumbor/thumbor/commit/376f688a8a0b82e50388c885d9d733572f2eb3e6.patch";
+          sha256 = "1j2434yqb6pz61d65dsy8w6lvyzvh5ksizadi5hgjzfw6s46v6yn";
+      })
+    ];
+
     prePatch = ''
       substituteInPlace setup.py \
         --replace '"argparse",' ""

From 6dcc77bdb890cc6baab1ec561849d1dab3e9e65e Mon Sep 17 00:00:00 2001
From: Heitham Omar <hhomar@gmail.com>
Date: Sat, 22 Jul 2017 19:27:44 +0100
Subject: [PATCH 3042/3246] docker: add libseccomp to build

---
 pkgs/applications/virtualization/docker/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index edae12fed1f..3ba019aa8d5 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -2,7 +2,7 @@
 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
 , sqlite, iproute, bridge-utils, devicemapper, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
-, procps
+, procps, libseccomp
 }:
 
 with lib;
@@ -63,9 +63,12 @@ rec {
       ];
     });
 
+    # Optimizations break compilation of libseccomp c bindings
+    hardeningDisable = [ "fortify" ];
+
     buildInputs = [
       makeWrapper removeReferencesTo pkgconfig go-md2man go
-      sqlite devicemapper btrfs-progs systemd libtool
+      sqlite devicemapper btrfs-progs systemd libtool libseccomp
     ];
 
     dontStrip = true;
@@ -73,7 +76,8 @@ rec {
     DOCKER_BUILDTAGS = []
       ++ optional (systemd != null) [ "journald" ]
       ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
-      ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper";
+      ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"
+      ++ optional (libseccomp != null) "seccomp";
 
     buildPhase = ''
       # build engine

From 0371f2b5cc0a8d7b146af4e88f4c583e4ced73eb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 8 Aug 2017 20:48:41 +0200
Subject: [PATCH 3043/3246] nginx module: clean up SSL/listen handling

---
 .../services/web-servers/nginx/default.nix    | 55 +++++++++----------
 .../web-servers/nginx/vhost-options.nix       |  5 +-
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 293fa77107e..70c1d994206 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -130,22 +130,23 @@ let
 
   vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost:
     let
-        ssl = with vhost; addSSL || onlySSL || enableSSL;
+        onlySSL = vhost.onlySSL || vhost.enableSSL;
+        hasSSL = onlySSL || vhost.addSSL || vhost.forceSSL;
 
-        defaultListen = with vhost;
-          if listen != [] then listen
-          else if onlySSL || enableSSL then
-               singleton                          { addr = "0.0.0.0"; port = 443; ssl = true;  }
-               ++ optional enableIPv6             { addr = "[::]";    port = 443; ssl = true;  }
-          else singleton                          { addr = "0.0.0.0"; port = 80;  ssl = false; }
-               ++ optional enableIPv6             { addr = "[::]";    port = 80;  ssl = false; }
-               ++ optional addSSL                 { addr = "0.0.0.0"; port = 443; ssl = true;  }
-               ++ optional (enableIPv6 && addSSL) { addr = "[::]";    port = 443; ssl = true;  };
+        defaultListen =
+          if vhost.listen != [] then vhost.listen
+          else ((optionals hasSSL (
+            singleton                    { addr = "0.0.0.0"; port = 443; ssl = true; }
+            ++ optional enableIPv6 { addr = "[::]";    port = 443; ssl = true; }
+          )) ++ optionals (!onlySSL) (
+            singleton                    { addr = "0.0.0.0"; port = 80;  ssl = false; }
+            ++ optional enableIPv6 { addr = "[::]";    port = 80;  ssl = false; }
+          ));
 
         hostListen =
-          if !vhost.forceSSL
-            then defaultListen
-            else filter (x: x.ssl) defaultListen;
+          if vhost.forceSSL
+            then filter (x: x.ssl) defaultListen
+            else defaultListen;
 
         listenString = { addr, port, ssl, ... }:
           "listen ${addr}:${toString port} "
@@ -155,9 +156,6 @@ let
 
         redirectListen = filter (x: !x.ssl) defaultListen;
 
-        redirectListenString = { addr, ... }:
-          "listen ${addr}:80 ${optionalString vhost.default "default_server"};";
-
         acmeLocation = ''
           location /.well-known/acme-challenge {
             ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"}
@@ -175,7 +173,7 @@ let
       in ''
         ${optionalString vhost.forceSSL ''
           server {
-            ${concatMapStringsSep "\n" redirectListenString redirectListen}
+            ${concatMapStringsSep "\n" listenString redirectListen}
 
             server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
             ${optionalString vhost.enableACME acmeLocation}
@@ -191,9 +189,9 @@ let
           ${optionalString vhost.enableACME acmeLocation}
           ${optionalString (vhost.root != null) "root ${vhost.root};"}
           ${optionalString (vhost.globalRedirect != null) ''
-            return 301 http${optionalString ssl "s"}://${vhost.globalRedirect}$request_uri;
+            return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri;
           ''}
-          ${optionalString ssl ''
+          ${optionalString hasSSL ''
             ssl_certificate ${vhost.sslCertificate};
             ssl_certificate_key ${vhost.sslCertificateKey};
           ''}
@@ -478,18 +476,15 @@ in
       }
 
       {
-        assertion = all (conf: with conf; !(addSSL && (onlySSL || enableSSL))) (attrValues virtualHosts);
+        assertion = all (conf: with conf;
+          !(addSSL && (onlySSL || enableSSL)) &&
+          !(forceSSL && (onlySSL || enableSSL)) &&
+          !(addSSL && forceSSL)
+        ) (attrValues virtualHosts);
         message = ''
-          Options services.nginx.service.virtualHosts.<name>.addSSL and
-          services.nginx.virtualHosts.<name>.onlySSL are mutually esclusive
-        '';
-      }
-
-      {
-        assertion = all (conf: with conf; forceSSL -> addSSL) (attrValues virtualHosts);
-        message = ''
-          Option services.nginx.virtualHosts.<name>.forceSSL requires
-          services.nginx.virtualHosts.<name>.addSSL set to true.
+          Options services.nginx.service.virtualHosts.<name>.addSSL,
+          services.nginx.virtualHosts.<name>.onlySSL and services.nginx.virtualHosts.<name>.forceSSL
+          are mutually exclusive.
         '';
       }
     ];
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 362f8ee9052..8a04e07eeea 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -96,8 +96,9 @@ with lib;
       default = false;
       description = ''
         Whether to add a separate nginx server block that permanently redirects (301)
-        all plain HTTP traffic to HTTPS. This option needs <literal>addSSL</literal>
-        to be set to true.
+        all plain HTTP traffic to HTTPS. This will set defaults for
+        <literal>listen</literal> to listen on all interfaces on the respective default
+        ports (80, 443), where the non-SSL listens are used for the redirect vhosts.
       '';
     };
 

From 530282eebec47b8e4afc93de8caf607c621fd6cc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Feb 2017 04:09:11 +0100
Subject: [PATCH 3044/3246] nginx module: fix applying recommended proxy
 headers

Previously, if proxy_set_header would be used in an extraConfig of
a location, the headers defined in the http block by
recommendedProxySettings would be cleared. As this is not the intended
behaviour, these settings are now included from a separate file if
needed.
---
 .../services/web-servers/nginx/default.nix    | 24 ++++++++++++-------
 .../web-servers/nginx/location-options.nix    |  3 ++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 70c1d994206..1aa8000502f 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -19,6 +19,16 @@ let
   ) cfg.virtualHosts;
   enableIPv6 = config.networking.enableIPv6;
 
+  recommendedProxyConfig = pkgs.writeText "nginx-recommended-proxy-headers.conf" ''
+    proxy_set_header        Host $host;
+    proxy_set_header        X-Real-IP $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header        X-Forwarded-Proto $scheme;
+    proxy_set_header        X-Forwarded-Host $host;
+    proxy_set_header        X-Forwarded-Server $host;
+    proxy_set_header        Accept-Encoding "";
+  '';
+
   configFile = pkgs.writeText "nginx.conf" ''
     user ${cfg.user} ${cfg.group};
     error_log stderr;
@@ -74,19 +84,12 @@ let
       ''}
 
       ${optionalString (cfg.recommendedProxySettings) ''
-        proxy_set_header        Host $host;
-        proxy_set_header        X-Real-IP $remote_addr;
-        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header        X-Forwarded-Proto $scheme;
-        proxy_set_header        X-Forwarded-Host $host;
-        proxy_set_header        X-Forwarded-Server $host;
-        proxy_set_header        Accept-Encoding "";
-
         proxy_redirect          off;
         proxy_connect_timeout   90;
         proxy_send_timeout      90;
         proxy_read_timeout      90;
         proxy_http_version      1.0;
+        include ${recommendedProxyConfig};
       ''}
 
       client_max_body_size ${cfg.clientMaxBodySize};
@@ -206,7 +209,10 @@ let
   ) virtualHosts);
   mkLocations = locations: concatStringsSep "\n" (mapAttrsToList (location: config: ''
     location ${location} {
-      ${optionalString (config.proxyPass != null) "proxy_pass ${config.proxyPass};"}
+      ${optionalString (config.proxyPass != null) ''
+        proxy_pass ${config.proxyPass};
+        ${optionalString cfg.recommendedProxySettings "include ${recommendedProxyConfig};"}
+      ''}
       ${optionalString (config.index != null) "index ${config.index};"}
       ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"}
       ${optionalString (config.root != null) "root ${config.root};"}
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index 83ce0f71734..d6f57404f82 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -14,7 +14,8 @@ with lib;
       default = null;
       example = "http://www.example.org/";
       description = ''
-        Adds proxy_pass directive.
+        Adds proxy_pass directive and sets recommended proxy headers if
+        recommendedProxySettings is enabled.
       '';
     };
 

From 65c2203ffcedcf4817c590fe82c213dd45602d47 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Feb 2017 04:11:35 +0100
Subject: [PATCH 3045/3246] nginx module: add option for proxying websocket
 requests

---
 nixos/modules/services/web-servers/nginx/default.nix   | 10 ++++++++++
 .../services/web-servers/nginx/location-options.nix    |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 1aa8000502f..e71a9e1885a 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -92,6 +92,11 @@ let
         include ${recommendedProxyConfig};
       ''}
 
+      # $connection_upgrade is used for websocket proxying
+      map $http_upgrade $connection_upgrade {
+          default upgrade;
+          '''      close;
+      }
       client_max_body_size ${cfg.clientMaxBodySize};
 
       server_tokens ${if cfg.serverTokens then "on" else "off"};
@@ -213,6 +218,11 @@ let
         proxy_pass ${config.proxyPass};
         ${optionalString cfg.recommendedProxySettings "include ${recommendedProxyConfig};"}
       ''}
+      ${optionalString config.proxyWebsockets ''
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+      ''}
       ${optionalString (config.index != null) "index ${config.index};"}
       ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"}
       ${optionalString (config.root != null) "root ${config.root};"}
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index d6f57404f82..4c772734a74 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -19,6 +19,15 @@ with lib;
       '';
     };
 
+    proxyWebsockets = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Whether to supporty proxying websocket connections with HTTP/1.1.
+      '';
+    };
+
     index = mkOption {
       type = types.nullOr types.str;
       default = null;

From 759daba9801af7cceb62674488129c223dc22f70 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Feb 2017 04:51:24 +0100
Subject: [PATCH 3046/3246] nginx module: first proxy_set_header takes
 precendence

---
 nixos/modules/services/web-servers/nginx/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index e71a9e1885a..93339c075ca 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -214,10 +214,7 @@ let
   ) virtualHosts);
   mkLocations = locations: concatStringsSep "\n" (mapAttrsToList (location: config: ''
     location ${location} {
-      ${optionalString (config.proxyPass != null) ''
-        proxy_pass ${config.proxyPass};
-        ${optionalString cfg.recommendedProxySettings "include ${recommendedProxyConfig};"}
-      ''}
+      ${optionalString (config.proxyPass != null) "proxy_pass ${config.proxyPass};"}
       ${optionalString config.proxyWebsockets ''
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
@@ -228,6 +225,7 @@ let
       ${optionalString (config.root != null) "root ${config.root};"}
       ${optionalString (config.alias != null) "alias ${config.alias};"}
       ${config.extraConfig}
+      ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
     }
   '') locations);
   mkBasicAuth = vhostName: authDef: let

From 4ffa9ddb30726808416ecb26a4389b1d2ac6337e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 15 Apr 2017 17:53:46 +0200
Subject: [PATCH 3047/3246] nginx module: allow basic configuration of
 upstreams

---
 .../services/web-servers/nginx/default.nix    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 93339c075ca..249b660d8c6 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -29,6 +29,14 @@ let
     proxy_set_header        Accept-Encoding "";
   '';
 
+  upstreamConfig = toString (flip mapAttrsToList cfg.upstreams (name: upstream: ''
+    upstream ${name} {
+      ${toString (flip mapAttrsToList upstream.servers (name: server: ''
+        server ${name} ${optionalString server.backup "backup"};
+      ''))}
+    }
+  ''));
+
   configFile = pkgs.writeText "nginx.conf" ''
     user ${cfg.user} ${cfg.group};
     error_log stderr;
@@ -51,6 +59,7 @@ let
       ${optionalString (cfg.resolver.addresses != []) ''
         resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"};
       ''}
+      ${upstreamConfig}
 
       ${optionalString (cfg.recommendedOptimisation) ''
         # optimisation
@@ -443,6 +452,35 @@ in
         default = {};
       };
 
+      upstreams = mkOption {
+        type = types.attrsOf (types.submodule {
+          options = {
+            servers = mkOption {
+              type = types.attrsOf (types.submodule {
+                options = {
+                  backup = mkOption {
+                    type = types.bool;
+                    default = false;
+                    description = ''
+                      Marks the server as a backup server. It will be passed
+                      requests when the primary servers are unavailable.
+                    '';
+                  };
+                };
+              });
+              description = ''
+                Defines the address and other parameters of the upstream servers.
+              '';
+              default = {};
+            };
+          };
+        });
+        description = ''
+          Defines a group of servers to use as proxy target.
+        '';
+        default = {};
+      };
+
       virtualHosts = mkOption {
         type = types.attrsOf (types.submodule (import ./vhost-options.nix {
           inherit config lib;

From 7cd46a05943bfd86a46a3d99a1d85a2a028d4d2c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 15 Apr 2017 23:21:44 +0200
Subject: [PATCH 3048/3246] nginx module: add proxyResolveWhileRunning option

---
 .../services/web-servers/nginx/default.nix     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 249b660d8c6..a9ee6255fd4 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -223,7 +223,13 @@ let
   ) virtualHosts);
   mkLocations = locations: concatStringsSep "\n" (mapAttrsToList (location: config: ''
     location ${location} {
-      ${optionalString (config.proxyPass != null) "proxy_pass ${config.proxyPass};"}
+      ${optionalString (config.proxyPass != null && !cfg.proxyResolveWhileRunning)
+        "proxy_pass ${config.proxyPass};"
+      }
+      ${optionalString (config.proxyPass != null && cfg.proxyResolveWhileRunning) ''
+        set $nix_proxy_target "${config.proxyPass}";
+        proxy_pass $nix_proxy_target;
+      ''}
       ${optionalString config.proxyWebsockets ''
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
@@ -426,6 +432,16 @@ in
         description = "Path to DH parameters file.";
       };
 
+      proxyResolveWhileRunning = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Resolves domains of proxyPass targets at runtime
+          and not only at start, you have to set
+          services.nginx.resolver, too.
+        '';
+      };
+
       resolver = mkOption {
         type = types.submodule {
           options = {

From 3bff3b10e1a1314b78e5b5dc90b39287abb363d2 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 30 Aug 2017 21:06:41 +0200
Subject: [PATCH 3049/3246] youtube-dl: 2017.08.23 -> 2017.08.27

fixes (among others) mixcloud.com
---
 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 3820b95405e..c52efc546af 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.08.23";
+  version = "2017.08.27";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1vq0r37ynnj2hx0ssh3hycg4wzhwch5pphq76swfz76r1klnrich";
+    sha256 = "1xna277m1vqb6gl1w8mf5vr69c7kvmdsn8mrrqcrmhi7gvr9j03i";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0f0bf06ac6f337bbb8ef31536e3c1a47d584f2d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Aug 2017 22:06:07 +0200
Subject: [PATCH 3050/3246] wyrd: fixup by using older ncurses

(cherry picked from commit 8f713e881e6f96bc99072e6a863b4069e705bbd6)
---
 pkgs/top-level/ocaml-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 64656990d0e..5bb79186d8c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -904,7 +904,9 @@ let
 
     # Apps / from all-packages
 
-    wyrd = callPackage ../tools/misc/wyrd { };
+    wyrd = callPackage ../tools/misc/wyrd {
+      ncurses = pkgs.ncurses5;
+    };
 
     haxe = callPackage ../development/compilers/haxe { };
 

From c07e9ba3e7441a66edd05adb1a755a994419dca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Aug 2017 21:15:08 +0200
Subject: [PATCH 3051/3246] squishyball: fixup by using older ncurses

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb3b8b419ea..147223ce200 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16064,7 +16064,9 @@ with pkgs;
 
   spideroak = callPackage ../applications/networking/spideroak { };
 
-  squishyball = callPackage ../applications/audio/squishyball { };
+  squishyball = callPackage ../applications/audio/squishyball {
+    ncurses = ncurses5;
+  };
 
   ssvnc = callPackage ../applications/networking/remote/ssvnc { };
 

From c2dc21ea85033f9d757ab61a7303ebb4e64857d4 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Wed, 30 Aug 2017 20:53:53 +0200
Subject: [PATCH 3052/3246] pythonPackages.jug: 1.4.0 -> 1.6.1

Update Jug Python package
---
 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 5f7f7cc2a58..b93049bca17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6748,7 +6748,7 @@ in {
   jsbeautifier = callPackage ../development/python-modules/jsbeautifier {};
 
   jug = buildPythonPackage rec {
-    version = "1.4.0";
+    version = "1.6.1";
     name = "jug-${version}";
     buildInputs = with self; [ nose numpy ];
     propagatedBuildInputs = with self; [
@@ -6762,7 +6762,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz";
-      sha256 = "0s9m34k8w59k32sjcg74qqdz8r492sxhsdmlhca1z7jazdk56dzb";
+      sha256 = "15lv998mz6kpp65kh8wsfnrl5ay02bk1lm07nbbdv2k455bhrn1i";
     };
 
     meta = {

From c9990947150fa9f7a1bd1809192bb27e5666202c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 28 Sep 2016 19:26:47 +0200
Subject: [PATCH 3053/3246] errbot: 4.2.2 -> 4.3.3

---
 .../applications/networking/errbot/default.nix | 18 +++++++++---------
 .../networking/errbot/fix-dnspython.patch      | 13 -------------
 2 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/applications/networking/errbot/fix-dnspython.patch

diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index e2b5844429f..8af502660ee 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -2,22 +2,22 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "errbot-${version}";
-  version = "4.2.2";
+  version = "4.3.3";
 
   src = fetchurl {
     url = "mirror://pypi/e/errbot/${name}.tar.gz";
-    sha256 = "1f1nw4m58dvmw0a37gbnihgdxxr3sz0l39653jigq9ysh3nznifv";
+    sha256 = "1z6xcm8jx22i56gpcrjym85a82swvaxh09zkryd5pdksi6k41rb4";
   };
 
   disabled = !pythonPackages.isPy3k;
 
-  patches = [
-    ./fix-dnspython.patch
-  ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace dnspython3 dnspython
+  '';
 
-  buildInputs = with pythonPackages; [
-    pep8 mock pytest pytest_xdist
-  ];
+  # tests folder is not included in release
+  doCheck = false;
 
   propagatedBuildInputs = with pythonPackages; [
     webtest bottle threadpool rocket-errbot requests jinja2
@@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
   meta = with stdenv.lib; {
     description = "Chatbot designed to be simple to extend with plugins written in Python";
     homepage = http://errbot.io/;
-    maintainers = with maintainers; [ fpletz ];
+    maintainers = with maintainers; [ fpletz globin ];
     license = licenses.gpl3;
     platforms = platforms.unix;
   };
diff --git a/pkgs/applications/networking/errbot/fix-dnspython.patch b/pkgs/applications/networking/errbot/fix-dnspython.patch
deleted file mode 100644
index 7e2b037d78d..00000000000
--- a/pkgs/applications/networking/errbot/fix-dnspython.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index d57d4e8..9d036fc 100755
---- a/setup.py
-+++ b/setup.py
-@@ -58,7 +58,7 @@ if PY2:
-              'backports.functools_lru_cache',
-              'configparser>=3.5.0b2']  # This is a backport from Python 3
- else:
--    deps += ['dnspython3', ]  # dnspython3 for SRV records
-+    deps += ['dnspython', ]  # dnspython for SRV records
- 
- if not PY35_OR_GREATER:
-     deps += ['typing', ]  # backward compatibility for 3.3 and 3.4

From 6b9ca4599e72c6f820ca46237fd11514707e2bd9 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 29 Nov 2016 21:14:23 +0100
Subject: [PATCH 3054/3246] errbot: remove pyside dependency

---
 pkgs/applications/networking/errbot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 8af502660ee..5a561d5e10a 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec {
     webtest bottle threadpool rocket-errbot requests jinja2
     pyopenssl colorlog Yapsy markdown ansi pygments dns pep8
     daemonize pygments-markdown-lexer telegram irc slackclient
-    pyside sleekxmpp hypchat pytest
+    sleekxmpp hypchat pytest
   ];
 
   meta = with stdenv.lib; {

From 8211dfb200d5f413da692d463b7d52daf4478582 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 28 Aug 2017 01:56:16 +0200
Subject: [PATCH 3055/3246] errbot: 4.3.3 -> 5.1.2

---
 pkgs/applications/networking/errbot/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 5a561d5e10a..ee3ff1e48c8 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -2,15 +2,17 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "errbot-${version}";
-  version = "4.3.3";
+  version = "5.1.2";
 
   src = fetchurl {
     url = "mirror://pypi/e/errbot/${name}.tar.gz";
-    sha256 = "1z6xcm8jx22i56gpcrjym85a82swvaxh09zkryd5pdksi6k41rb4";
+    sha256 = "1r9w7pmdw77h1hwxns6d0sdg8cndsq1lwkq0y5qiiqr91jz93ajm";
   };
 
   disabled = !pythonPackages.isPy3k;
 
+  LC_ALL = "en_US.utf8";
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace dnspython3 dnspython

From d99d9026b3f65aaac568006454507cad449e25cf Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 30 Aug 2017 14:54:10 -0400
Subject: [PATCH 3056/3246] k9copy: fix build with gcc6

---
 pkgs/applications/video/k9copy/default.nix |  4 ++++
 pkgs/applications/video/k9copy/gcc6.patch  | 26 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/video/k9copy/gcc6.patch

diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index 7e87f03725f..48c7624cfa6 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg";
   };
 
+  patches = [
+    ./gcc6.patch
+  ];
+
   cmakeFlags = [
     "-DQT5_BUILD=ON"
     "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0"
diff --git a/pkgs/applications/video/k9copy/gcc6.patch b/pkgs/applications/video/k9copy/gcc6.patch
new file mode 100644
index 00000000000..d0c9c2a8035
--- /dev/null
+++ b/pkgs/applications/video/k9copy/gcc6.patch
@@ -0,0 +1,26 @@
+diff --git c/src/backup/k9dvdbackup.cpp i/src/backup/k9dvdbackup.cpp
+index f5e4859..82fa392 100755
+--- c/src/backup/k9dvdbackup.cpp
++++ i/src/backup/k9dvdbackup.cpp
+@@ -907,7 +907,7 @@ k9Vobu * k9DVDBackup::remapOffset(uint32_t _sector,uint32_t *_offset,int _dir) {
+ 
+ 
+         if ((vobu1 !=NULL) && (vobu2!=NULL)) {
+-            *_offset = abs(vobu1->newSector - vobu2->newSector)  | maskOffset1 ;
++            *_offset = (vobu1->newSector - vobu2->newSector)  | maskOffset1 ;
+             *_offset |= maskOffset2;
+             return vobu2;
+         }
+diff --git c/src/backup/k9execcopy.cpp i/src/backup/k9execcopy.cpp
+index d59222c..35de923 100644
+--- c/src/backup/k9execcopy.cpp
++++ i/src/backup/k9execcopy.cpp
+@@ -306,7 +306,7 @@ void k9ExecCopy::createMkv(k9DVDTitle *_title,const QString &_filename,QMultiMap
+ 
+ #if QT_VERSION >= 0x050000
+     m_progressDialog=new QProgressDialog(k9Dialogs::getMainWidget() );
+-    m_progressDialog->setCancelButton(false);
++    m_progressDialog->setCancelButton(0);
+ 
+ #else
+     m_progressDialog=new KProgressDialog(k9Dialogs::getMainWidget() );

From 1e5128ff5a6d0c63f78d7762482f38d69ae2151d Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Wed, 30 Aug 2017 00:37:38 +0200
Subject: [PATCH 3057/3246] kdevelop: 5.1.1 -> 5.1.2

---
 .../editors/kdevelop5/kdevelop-pg-qt.nix           |  7 +++----
 pkgs/applications/editors/kdevelop5/kdevelop.nix   |  4 ++--
 .../editors/kdevelop5/kdevplatform.nix             | 14 +++-----------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
index c8aae34e6c4..fac18c0b129 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
@@ -2,16 +2,15 @@
 
 let
   pname = "kdevelop-pg-qt";
-  version = "2.0";
-  dirVersion = "2.0.0";
+  version = "2.1.0";
 
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";
-    sha256 = "2f778d324b7c0962e8bb5f62dd2643bac1a6f3ac971d145b6aace7cd61878993";
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "20d84d25bd40610bd6c0964e4fe0642e56c41b76a65575122dc5196649621e5d";
   };
 
   nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 7a241277e8e..9efe6a44716 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "kdevelop";
-  version = "5.1.1";
+  version = "5.1.2";
 
 in
 mkDerivation rec {
@@ -17,7 +17,7 @@ mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "0a01a4ffb2f01802cf4945521a3149a8f82c21fa8a97935991f1854b7db5d754";
+    sha256 = "af54e807847d145fe5f3eb55962ed0d22e6363c2bc6c32167e51ca4823c00ac7";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index b7c0d0cf855..78881b21018 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules
+{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules
 , boost, subversion, apr, aprutil, kwindowsystem
 , qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
 , kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
@@ -6,7 +6,7 @@
 
 let
   pname = "kdevplatform";
-  version = "5.1.1";
+  version = "5.1.2";
 
 in
 stdenv.mkDerivation rec {
@@ -14,17 +14,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz";
-    sha256 = "3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726";
+    sha256 = "e622ddad552a678baaf1166d5cbdc5fd1192d2324300c52ef2d25f1c6778664a";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "kdevplatform-project-selection.patch";
-      url = "https://cgit.kde.org/kdevplatform.git/patch/?id=da4c0fdfcf21dc2a8f48a2b1402213a32effd47a";
-      sha256 = "16ws8l6dciy2civjnsaj03ml2bzvg4a9g7gd4iyx4hprw65zrcxm";
-    })
-  ];
-
   nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ];
 
   buildInputs = [

From 46e41da543a3885554733b06e720937f7df742a3 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 12 Aug 2017 08:47:30 +0100
Subject: [PATCH 3058/3246] cron service: fix reliance on etc.timezone

This does not fully address the issue, as cron will not restart when
the timezone is changed imperatively as it presumably needs to.
---
 nixos/modules/services/scheduling/cron.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 7b1a1599e14..6f6977b38a1 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -122,7 +122,7 @@ in
               fi
             '';
 
-          restartTriggers = [ config.environment.etc.localtime.source ];
+          restartTriggers = [ config.time.timeZone ];
           serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n";
         };
 

From d9a0c68775b8e01c2ef2673d2bea8234b5c497bf Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 29 Aug 2017 16:13:32 +0100
Subject: [PATCH 3059/3246] hhvm: fix build

Upstream re2 commit:

https://github.com/google/re2/commit/b94b7cd42e9f02673cd748c1ac1d16db4052514c

Upstream bytecode.h commit:

https://github.com/facebook/hhvm/commit/f8a75ca667a1d27be2a304502edd01d064cce20a
---
 pkgs/development/compilers/hhvm/default.nix   |  4 +++
 .../hhvm/flexible-array-members-gcc6.patch    | 33 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch

diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index f0f3a130ef6..c00629619ec 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
       gmp libyaml libedit libvpx imagemagick fribidi gperf
     ];
 
+  patches = [
+    ./flexible-array-members-gcc6.patch
+  ];
+
   enableParallelBuilding = false; # occasional build problems;
   dontUseCmakeBuildDir = true;
   NIX_LDFLAGS = "-lpam -L${pam}/lib";
diff --git a/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch b/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
new file mode 100644
index 00000000000..11affa75bc9
--- /dev/null
+++ b/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
@@ -0,0 +1,33 @@
+diff --git a/hphp/runtime/vm/bytecode.h b/hphp/runtime/vm/bytecode.h
+index ddc7b69..edf807c 100644
+--- a/hphp/runtime/vm/bytecode.h
++++ b/hphp/runtime/vm/bytecode.h
+@@ -124,7 +124,7 @@ private:
+   static void* allocMem(unsigned nargs);
+
+ private:
+-  TypedValue m_extraArgs[];
++  TypedValue m_extraArgs[0];
+   TYPE_SCAN_FLEXIBLE_ARRAY_FIELD(m_extraArgs);
+ };
+
+diff --git a/third-party/re2/src/re2/dfa.cc b/third-party/re2/src/re2/dfa.cc
+index 483f678..3aa3610 100644
+--- a/third-party/re2/src/re2/dfa.cc
++++ b/third-party/re2/src/re2/dfa.cc
+@@ -101,8 +101,13 @@ class DFA {
+     uint flag_;         // Empty string bitfield flags in effect on the way
+                         // into this state, along with kFlagMatch if this
+                         // is a matching state.
+-    std::atomic<State*> next_[];    // Outgoing arrows from State,
+-                        // one per input byte class
++// Work around the bug affecting flexible array members in GCC 6.1 and 6.2.
++// (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70932)
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ == 6 && __GNUC_MINOR__ >= 1
++    std::atomic<State*> next_[0];   // Outgoing arrows from State, one per input byte class
++#else
++    std::atomic<State*> next_[];    // Outgoing arrows from State, one per input byte class
++#endif
+   };
+
+   enum {

From 51c247a074adf6d13de84e528deb81ed81936a15 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 30 Aug 2017 15:59:30 +0100
Subject: [PATCH 3060/3246] hhvm: 3.15.0 -> 3.15.8

---
 pkgs/development/compilers/hhvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index c00629619ec..a89d909e9dd 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   name    = "hhvm-${version}";
-  version = "3.15.0";
+  version = "3.15.8";
 
   # use git version since we need submodules
   src = fetchgit {
     url    = "https://github.com/facebook/hhvm.git";
-    rev    = "92a682ebaa3c85b84857852d8621f528607fe27d";
-    sha256 = "0mn3bfvhdf6b4lflyjfjyr7nppkq505xkaaagk111fqy91rdzd3b";
+    rev    = "983bdab781d9d7bff5f14a4a2827c2c217c500df";
+    sha256 = "0sbjwdy69x08c4w0vf83dcfx3fin8qqysl9pacy2j6p0hxvgn5r5";
     fetchSubmodules = true;
   };
 

From 80351add5ade1c5e754d83332182dd2343e6632d Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 30 Aug 2017 18:40:20 +0100
Subject: [PATCH 3061/3246] hhvm: 3.15.8 -> 3.21

---
 pkgs/development/compilers/hhvm/default.nix        | 14 +++++++-------
 .../hhvm/flexible-array-members-gcc6.patch         | 13 -------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index a89d909e9dd..a4b67425fdb 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -3,18 +3,18 @@
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
 , libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
-, libvpx, imagemagick, fribidi, gperf
+, libvpx, imagemagick, fribidi, gperf, which
 }:
 
 stdenv.mkDerivation rec {
   name    = "hhvm-${version}";
-  version = "3.15.8";
+  version = "3.21";
 
   # use git version since we need submodules
   src = fetchgit {
     url    = "https://github.com/facebook/hhvm.git";
-    rev    = "983bdab781d9d7bff5f14a4a2827c2c217c500df";
-    sha256 = "0sbjwdy69x08c4w0vf83dcfx3fin8qqysl9pacy2j6p0hxvgn5r5";
+    rev    = "56483773e2edd9e61782f1901ce40e47959e71b8";
+    sha256 = "0dmdk98nv04m0fv6909gfbsxqlkckn369yi7kadhir0r7vxsj7wa";
     fetchSubmodules = true;
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
-      gmp libyaml libedit libvpx imagemagick fribidi gperf
+      gmp libyaml libedit libvpx imagemagick fribidi gperf which
     ];
 
   patches = [
@@ -43,10 +43,10 @@ stdenv.mkDerivation rec {
   cmakeFlags = "-DCMAKE_INSTALL_INCLUDEDIR=include";
 
   prePatch = ''
-    substituteInPlace hphp/util/generate-buildinfo.sh \
-      --replace /bin/bash ${stdenv.shell}
     substituteInPlace ./configure \
       --replace "/usr/bin/env bash" ${stdenv.shell}
+    substituteInPlace ./third-party/ocaml/CMakeLists.txt \
+      --replace "/bin/bash" ${stdenv.shell}
     perl -pi -e 's/([ \t(])(isnan|isinf)\(/$1std::$2(/g' \
       hphp/runtime/base/*.cpp \
       hphp/runtime/ext/std/*.cpp \
diff --git a/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch b/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
index 11affa75bc9..61b6e5e8d8c 100644
--- a/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
+++ b/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
@@ -1,16 +1,3 @@
-diff --git a/hphp/runtime/vm/bytecode.h b/hphp/runtime/vm/bytecode.h
-index ddc7b69..edf807c 100644
---- a/hphp/runtime/vm/bytecode.h
-+++ b/hphp/runtime/vm/bytecode.h
-@@ -124,7 +124,7 @@ private:
-   static void* allocMem(unsigned nargs);
-
- private:
--  TypedValue m_extraArgs[];
-+  TypedValue m_extraArgs[0];
-   TYPE_SCAN_FLEXIBLE_ARRAY_FIELD(m_extraArgs);
- };
-
 diff --git a/third-party/re2/src/re2/dfa.cc b/third-party/re2/src/re2/dfa.cc
 index 483f678..3aa3610 100644
 --- a/third-party/re2/src/re2/dfa.cc

From e2bf8cea5aae0b49bc5bdeb07c5778b8193ad414 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Wed, 30 Aug 2017 22:43:55 +0300
Subject: [PATCH 3062/3246] nodePackages.ocaml-language-server: init at 0.2.0

---
 .../node-packages/composition-v4.nix          |   2 +-
 .../node-packages/composition-v6.nix          |   2 +-
 .../node-packages/node-packages-v4.nix        | 122 +--
 .../node-packages/node-packages-v6.json       |   1 +
 .../node-packages/node-packages-v6.nix        | 776 ++++++++++--------
 5 files changed, 505 insertions(+), 398 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index 8c4a5390f55..dc5899ebf1a 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.3.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index ea30c5b04c4..0c01a169af4 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.3.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 15ec0536525..24afa7b97e1 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.3.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -73,7 +73,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
       };
     };
     "once-1.4.0" = {
@@ -640,7 +640,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
-        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
+        sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv";
       };
     };
     "xtend-4.0.1" = {
@@ -676,7 +676,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha1 = "893312af69b2123def71f57889001671eeb2c853";
+        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
       };
     };
     "string_decoder-1.0.3" = {
@@ -685,7 +685,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
+        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -793,7 +793,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
-        sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86";
+        sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9";
       };
     };
     "detect-file-0.1.0" = {
@@ -955,7 +955,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
+        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
       };
     };
     "expand-range-1.8.2" = {
@@ -1018,7 +1018,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
-        sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c";
+        sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg";
       };
     };
     "repeat-string-1.6.1" = {
@@ -1216,7 +1216,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
-        sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a";
+        sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -1252,7 +1252,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
+        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
       };
     };
     "object.defaults-1.1.0" = {
@@ -1711,7 +1711,7 @@ let
       version = "7.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
+        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
       };
     };
     "graceful-fs-4.1.11" = {
@@ -1729,7 +1729,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
+        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
       };
     };
     "osenv-0.1.4" = {
@@ -1837,7 +1837,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
-        sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1";
+        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
       };
     };
     "has-unicode-2.0.1" = {
@@ -1882,7 +1882,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
+        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
     "code-point-at-1.1.0" = {
@@ -2098,7 +2098,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
+        sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -2665,7 +2665,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
+        sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n";
       };
     };
     "read-pkg-up-1.0.1" = {
@@ -2728,7 +2728,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
+        sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3043,7 +3043,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz";
-        sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7";
+        sha512 = "2vbps6iw562i2zxd973z5mmbs8ggx3wbz4g1jqwvkjibiwrk9ym8bxcvvwnlmxqad92x120x5xz5nyfq68nd8akk355bkk0qjppzafp";
       };
     };
     "fresh-0.5.0" = {
@@ -3115,7 +3115,7 @@ let
       version = "6.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
-        sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49";
+        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
       };
     };
     "range-parser-1.2.0" = {
@@ -3307,13 +3307,13 @@ let
         sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28";
       };
     };
-    "nan-2.6.2" = {
+    "nan-2.7.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.6.2";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
-        sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
+        url = "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz";
+        sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46";
       };
     };
     "node-pre-gyp-0.6.36" = {
@@ -3340,7 +3340,7 @@ let
       version = "5.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
+        sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
       };
     };
     "tar-pack-3.4.0" = {
@@ -3502,7 +3502,7 @@ let
       version = "9.2.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
-        sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd";
+        sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642";
       };
     };
     "call-limit-1.1.0" = {
@@ -3601,7 +3601,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
-        sha1 = "08c4a452f789dcbac4c89a4563c902b2c862fd5b";
+        sha512 = "07r7qvmx5fjjk2ra3hjrz31ciy4vhfq2k8a3wjscjl7y52885zwfvz4caa5xr3kab8l3y4c9rsz1nkpjl530irrs6q5l3z6yadyj4c8";
       };
     };
     "iferr-0.1.5" = {
@@ -3637,7 +3637,7 @@ let
       version = "9.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz";
-        sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304";
+        sha512 = "0ki52cm2pf27r9pkpfbrx6y1myg7yx1mghwnvv6mw4kmgscif08qlj0xzlc88kpfl549xip4z1ap64s22l7v3q26ygz6x12cch87wsr";
       };
     };
     "lockfile-1.0.3" = {
@@ -3700,7 +3700,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz";
-        sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55";
+        sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb";
       };
     };
     "mississippi-1.3.0" = {
@@ -3754,7 +3754,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
+        sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
       };
     };
     "npm-registry-client-8.4.0" = {
@@ -3763,7 +3763,7 @@ let
       version = "8.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
-        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
+        sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx";
       };
     };
     "npm-user-validate-1.0.0" = {
@@ -3790,7 +3790,7 @@ let
       version = "2.7.38";
       src = fetchurl {
         url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz";
-        sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1";
+        sha512 = "0a0ar6lns179qdszia13prhj7gjpdjy334xafq791h48q00259lr6gpkzp17dagfcnff9pgcgxm7b68nidpj5qs0yah1v81fk4d84az";
       };
     };
     "path-is-inside-1.0.2" = {
@@ -3844,7 +3844,7 @@ let
       version = "2.0.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz";
-        sha1 = "68ea45f98b3741cb6e10ae3bbd42a605026a6951";
+        sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv";
       };
     };
     "read-package-tree-5.1.6" = {
@@ -3853,7 +3853,7 @@ let
       version = "5.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
-        sha1 = "4f03e83d0486856fb60d97c94882841c2a7b1b7a";
+        sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l";
       };
     };
     "retry-0.10.1" = {
@@ -3907,7 +3907,7 @@ let
       version = "4.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
+        sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -3979,7 +3979,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz";
-        sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8";
+        sha512 = "0vh5z2d6q3zgf7j3g5ngyq4piqq1y613wacfyildfnm2c2klb4h2gw32grgk6pv9ssyiliyfvj4p4alpaa85cqcj2nznb4q0fv400dn";
       };
     };
     "write-file-atomic-2.1.0" = {
@@ -3988,7 +3988,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
+        sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni";
       };
     };
     "debuglog-1.0.1" = {
@@ -4150,7 +4150,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
+        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
       };
     };
     "read-pkg-up-2.0.0" = {
@@ -4186,7 +4186,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
+        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
       };
     };
     "which-module-2.0.0" = {
@@ -4447,7 +4447,7 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz";
-        sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd";
+        sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g";
       };
     };
     "end-of-stream-1.4.0" = {
@@ -4546,7 +4546,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
-        sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0";
+        sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz";
       };
     };
     "run-queue-1.0.3" = {
@@ -4564,7 +4564,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.5.0.tgz";
-        sha1 = "08c22d499f4f30111addba79fe87c98cf01b6bc8";
+        sha512 = "1s6fqfsr7ksyfp0mwzlcf9rwpg74y29p67jkc8h89zy915rjsy5f85ik1659gd0y48z7lbnf3mg9c27drk74qycj446rlykim3zkw14";
       };
     };
     "npm-pick-manifest-1.0.4" = {
@@ -4573,7 +4573,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8";
+        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
       };
     };
     "promise-retry-1.1.1" = {
@@ -4618,7 +4618,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
-        sha1 = "6d5de5829afd3be2712201a39275fd11c651857c";
+        sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -4645,7 +4645,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443";
+        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
       };
     };
     "node-fetch-npm-2.0.2" = {
@@ -4654,7 +4654,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz";
-        sha1 = "7258c9046182dca345b4208eda918daf33697ff7";
+        sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
       };
     };
     "socks-proxy-agent-3.0.0" = {
@@ -4663,7 +4663,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz";
-        sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245";
+        sha512 = "3zn9cz2ry5m1akapj7hvhgkxfq7ffwynia46lmwipsw2jk5sv8dvs32dc4hfx3xvp34i1jff1bg870a1xnknsgk5dl021jd4gwi75v0";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -4681,7 +4681,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
-        sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4";
+        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -4699,7 +4699,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
-        sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a";
+        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
       };
     };
     "encoding-0.1.12" = {
@@ -4717,7 +4717,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz";
-        sha1 = "50183cd1b2d25275de069e9e71b467ac9eab973a";
+        sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967";
       };
     };
     "iconv-lite-0.4.18" = {
@@ -4726,7 +4726,7 @@ let
       version = "0.4.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
-        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
+        sha512 = "2l97vd6kax8syr9aggcqhiyhd3b2rf506wdq6wapfrc74qwpdzqf2a3891kq9ri3g5sdzayph2sz4zkr8kbbps58z9h2lvpk115kgdj";
       };
     };
     "socks-1.1.10" = {
@@ -4852,7 +4852,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
-        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
+        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
       };
     };
     "import-lazy-2.1.0" = {
@@ -4915,7 +4915,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e";
+        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
       };
     };
     "cli-boxes-1.0.0" = {
@@ -4951,7 +4951,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88";
+        sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
     "supports-color-4.2.1" = {
@@ -4960,7 +4960,7 @@ let
       version = "4.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
-        sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836";
+        sha512 = "1ldz0jkrkclywnr7gwh85p6kljs5rm4jczbpj55vb9w5c81iyrf1ahgkw88nnzahgw2xvlg041vqk7gynxkwcqkzfagxjpphsrdh75b";
       };
     };
     "color-convert-1.9.0" = {
@@ -4996,7 +4996,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
+        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
       };
     };
     "make-dir-1.0.0" = {
@@ -5590,7 +5590,7 @@ let
       version = "2.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563";
+        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
       };
     };
     "is-my-json-valid-2.16.1" = {
@@ -5599,7 +5599,7 @@ let
       version = "2.16.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz";
-        sha1 = "5a846777e2c2620d1e69104e5d3a03b1f6088f11";
+        sha512 = "2wmvqb2vfzjbnd2znxkg4sqpksxb9mi1lbr4r5zv535ykxzfv8dbnafra1lhk415wrbg9r1lfhyimcw5xfj3k4ry7inbmcjlnr4zj51";
       };
     };
     "generate-function-2.0.0" = {
@@ -5710,7 +5710,7 @@ in
     version = "1.12.7";
     src = fetchurl {
       url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
+      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -6784,7 +6784,7 @@ in
       })
       (sources."v8-debug-1.0.1" // {
         dependencies = [
-          sources."nan-2.6.2"
+          sources."nan-2.7.0"
           (sources."node-pre-gyp-0.6.36" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
@@ -7030,7 +7030,7 @@ in
       })
       (sources."v8-profiler-5.7.0" // {
         dependencies = [
-          sources."nan-2.6.2"
+          sources."nan-2.7.0"
           (sources."node-pre-gyp-0.6.36" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
@@ -7610,7 +7610,7 @@ in
     version = "5.3.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz";
-      sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17";
+      sha512 = "29izly6jqqdaslak9xz3i3bsr7qgg5vjcbzf55as0hh630z4aml48n5a7dz6skqn34d02fg3bk2zwkq7n67z787wn14vr3na9chx6v4";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index f9a3c9af2f2..8611155d291 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -56,6 +56,7 @@
 , "npm"
 , { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
 , "npm-check-updates"
+, "ocaml-language-server"
 , "parsoid"
 , "peerflix"
 , "peerflix-server"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 15f37baf46e..ab0a93c9b14 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.3.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -82,7 +82,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz";
-        sha1 = "a75be01c53da25d934a98ebd0e4c4a7312f92a86";
+        sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9";
       };
     };
     "global-paths-0.1.2" = {
@@ -424,7 +424,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz";
-        sha1 = "ff04bdfc010ee547d780bec38e1ac1c2777d253a";
+        sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5";
       };
     };
     "parse-passwd-1.0.0" = {
@@ -1162,7 +1162,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
+        sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
       };
     };
     "validator-5.2.0" = {
@@ -1270,7 +1270,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha1 = "893312af69b2123def71f57889001671eeb2c853";
+        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
       };
     };
     "buffer-equal-constant-time-1.0.1" = {
@@ -1621,7 +1621,7 @@ let
       version = "7.0.43";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz";
-        sha1 = "a187e08495a075f200ca946079c914e1a5fe962c";
+        sha512 = "22wrl2iy2njl5la57vh56b83bq9nabk9cx88vq7ic0m85v7daw0y73bj60ypvsjjgaq4l0hip968p3dlhv2gzbzpibrldn70z1iiizf";
       };
     };
     "@types/request-0.0.45" = {
@@ -1630,7 +1630,7 @@ let
       version = "0.0.45";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/request/-/request-0.0.45.tgz";
-        sha1 = "c6e52be8b108eb035c35aa9af56a38a260c3e7e6";
+        sha512 = "37apdgz29nhb3cpz9l2m1j1vj646727yzrk6ch66ji4yz0al4529gp3zlwdqcsi2w1kw43n2jsr2jq4vs9n7i4qgklrkwpr6h9130iq";
       };
     };
     "@types/uuid-2.0.30" = {
@@ -1639,7 +1639,7 @@ let
       version = "2.0.30";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz";
-        sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5";
+        sha512 = "117asm25fci0i0w2igvz0mxydd0m4vsz1l55kibx36d19j8md4s9fmvispcy83m7zlf9w9s4di7v0j8rawnyn67xci916gn0b88jr4y";
       };
     };
     "is-stream-1.1.0" = {
@@ -1657,7 +1657,7 @@ let
       version = "2.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.0.tgz";
-        sha1 = "a98aac91dc99857b6af24caef7ca6df302f31565";
+        sha512 = "26fb719b154ab3x89bbgpp3fk4jcrfal0y909ik8zss3d8ykn1dsh9wm3q08j5pzpy3wvfy41h0yzfhbl7k3lb4zjqm9swwq8d4wvmy";
       };
     };
     "debug-0.7.4" = {
@@ -1774,7 +1774,7 @@ let
       version = "7.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
+        sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -1801,7 +1801,7 @@ let
       version = "3.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+        sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
       };
     };
     "once-1.4.0" = {
@@ -2089,7 +2089,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz";
-        sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d";
+        sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv";
       };
     };
     "lodash-4.17.4" = {
@@ -2116,7 +2116,7 @@ let
       version = "2.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz";
-        sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563";
+        sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
       };
     };
     "is-my-json-valid-2.16.1" = {
@@ -2125,7 +2125,7 @@ let
       version = "2.16.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz";
-        sha1 = "5a846777e2c2620d1e69104e5d3a03b1f6088f11";
+        sha512 = "2wmvqb2vfzjbnd2znxkg4sqpksxb9mi1lbr4r5zv535ykxzfv8dbnafra1lhk415wrbg9r1lfhyimcw5xfj3k4ry7inbmcjlnr4zj51";
       };
     };
     "pinkie-promise-2.0.1" = {
@@ -2512,7 +2512,7 @@ let
       version = "2.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
-        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
+        sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv";
       };
     };
     "string_decoder-1.0.3" = {
@@ -2521,7 +2521,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
+        sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0";
       };
     };
     "http-basic-2.5.1" = {
@@ -2539,7 +2539,7 @@ let
       version = "7.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
+        sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy";
       };
     };
     "asap-2.0.6" = {
@@ -2665,7 +2665,7 @@ let
       version = "5.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
+        sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
       };
     };
     "temp-0.8.3" = {
@@ -2746,7 +2746,7 @@ let
       version = "2.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz";
-        sha1 = "0b98e64ed82f5acf0f2931babf69212ef52ddd37";
+        sha512 = "0a77zmipy5silq8yx7adj0hw82ccvshbs5alv3h8l0vk83lkm5m7pw6y2781wnbks8h98ixyn2q3q065l6m8pwbrhxa3bcvrf191r5v";
       };
     };
     "meow-3.7.0" = {
@@ -2767,6 +2767,15 @@ let
         sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
       };
     };
+    "mime-db-1.30.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.30.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz";
+        sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01";
+      };
+    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -2809,7 +2818,7 @@ let
       version = "2.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
+        sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n";
       };
     };
     "object-assign-4.1.1" = {
@@ -2890,7 +2899,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
+        sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3250,7 +3259,7 @@ let
       version = "5.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer/-/buffer-5.0.7.tgz";
-        sha1 = "570a290b625cf2603290c1149223d27ccf04db97";
+        sha512 = "2p32xxvhb1b3dp3hjy1ga0iajddqfxqi25wx44lhd94jjry1g758zywadx6hq04c8zsrcnmjyjrlymxrfmgyxib837jd93rd1fqgrrm";
       };
     };
     "cached-path-relative-1.0.1" = {
@@ -3295,7 +3304,7 @@ let
       version = "3.11.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz";
-        sha1 = "948945efc6757a400d6e5e5af47194d10064279f";
+        sha512 = "2alsgx5iqvf0nr641lz4g24bpvfgv6lza2h9n34d24jhvs3s0dklnds2x2nzs2w9sfiadi6zy93c2szm5ajn50wwnb8dalf02bxkbim";
       };
     };
     "defined-1.0.0" = {
@@ -3484,7 +3493,7 @@ let
       version = "2.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz";
-        sha1 = "40a050ec8dc3b53b33d9909415c02c0bf1abfbad";
+        sha512 = "09n1hj53jy075fnbsaaiknry7in0l4yarh912abwgvk4hwl33lvn8wrfw891zg5bkfa7sxlmd5yz3xxd4dmcln19bnkahyvd87r6k3k";
       };
     };
     "subarg-1.0.0" = {
@@ -3646,7 +3655,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz";
-        sha1 = "a91947da1f4a516ea38e5b4ec0ec3773675e0886";
+        sha512 = "0dhi66vsajfcm04s11xqklh5lj3abs4ncnl8h3689964aqam3ps9spmc454hz94rz3x1x5l1ad03jrba67mq9zc9vq9a1gchma581bp";
       };
     };
     "ieee754-1.1.8" = {
@@ -3727,7 +3736,7 @@ let
       version = "3.0.13";
       src = fetchurl {
         url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz";
-        sha1 = "c37d295531e786b1da3e3eadc840426accb0ae25";
+        sha512 = "3crgpf13g3zshm39jjfgnp4lfg5jilllwk6ixi07nzyf4yghmxrhrdmhsgr5jr855ma790a21hd4bcvpx8bv9h5irnk6xpy6728gl7r";
       };
     };
     "public-encrypt-4.0.0" = {
@@ -3745,7 +3754,7 @@ let
       version = "2.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz";
-        sha1 = "dc009a246b8d09a177b4b7a0ae77bc570f4b1b79";
+        sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi";
       };
     };
     "browserify-aes-1.0.6" = {
@@ -3772,7 +3781,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz";
-        sha1 = "f66bb88ecd57f71a766821e20283ea38c68bf80a";
+        sha512 = "1s4vqr50n16z69vx8mwadpvfh4zy9acxarv9kj8dqnsl42r0ns7hl74fh9sgi9p6v5rg3r6915zrj7nlachpahxnarh7v76bb92nbcy";
       };
     };
     "buffer-xor-1.0.3" = {
@@ -3790,7 +3799,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
-        sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de";
+        sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a";
       };
     };
     "des.js-1.0.0" = {
@@ -3817,7 +3826,7 @@ let
       version = "4.11.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
-        sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f";
+        sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2";
       };
     };
     "browserify-rsa-4.0.1" = {
@@ -3862,7 +3871,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz";
-        sha1 = "340dedbe6290187151c1ea1d777a3448935df846";
+        sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx";
       };
     };
     "hmac-drbg-1.0.1" = {
@@ -3928,13 +3937,13 @@ let
         sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d";
       };
     };
-    "function-bind-1.1.0" = {
+    "function-bind-1.1.1" = {
       name = "function-bind";
       packageName = "function-bind";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz";
-        sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771";
+        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
+        sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8";
       };
     };
     "lexical-scope-1.2.0" = {
@@ -4189,13 +4198,13 @@ let
         sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
       };
     };
-    "mime-1.3.6" = {
+    "mime-1.4.0" = {
       name = "mime";
       packageName = "mime";
-      version = "1.3.6";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz";
-        sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0";
+        url = "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz";
+        sha512 = "14lm9narafxlaar57v4mv7qqgg0v56isjyb3kxmbgj0p1zcrjwj9qz6im8nzwvr16vga071f5dl11mcgraz4cwnd8209ygvzqpa3l4z";
       };
     };
     "peerflix-0.34.0" = {
@@ -4276,7 +4285,7 @@ let
       version = "0.4.19";
       src = fetchurl {
         url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz";
-        sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7";
+        sha512 = "3skianymbfq4rg2v5c1vwsz2kmxfik60qa892wh6a3rydd1wrv3l4vgyr8v4wd8krdf42jbmq7blp0ksbmwm332q5yr922fj8jngiks";
       };
     };
     "xspfr-0.3.1" = {
@@ -4780,7 +4789,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz";
-        sha1 = "3e2ab0a464a803cc35d1357a1029d1cbd11dae37";
+        sha512 = "2shaz6cv4fgbmy1hq6hc59spkja51qg0vvx514r1nqsspdnsq6xzxabk0gs17x3n8s03y9mj8hx1xn5c0bkq9fvx59sxms2a4mlig9r";
       };
     };
     "simple-get-2.7.0" = {
@@ -4789,7 +4798,7 @@ let
       version = "2.7.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz";
-        sha1 = "ad37f926d08129237ff08c4f2edfd6f10e0380b5";
+        sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4816,7 +4825,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz";
-        sha1 = "0b83aea885b3547b579ada0c6a5e7739fe4d073e";
+        sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p";
       };
     };
     "simple-sha1-2.1.0" = {
@@ -5032,7 +5041,7 @@ let
       version = "1.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz";
-        sha1 = "b1a54a0f924fbd4d45731a5771aea36be2166532";
+        sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5266,7 +5275,7 @@ let
       version = "1.7.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.1.tgz";
-        sha1 = "e6e92a00b2c74906ad69c42b6ea213dce8914d95";
+        sha512 = "1xigw4j1na5gxiff1dad35vn0h91i77a9jzwsczl47rypanm2vfwyx2zchzdgny7mrxrn14bk9xss16nj2k3vng60v8pc7snjdc6q8n";
       };
     };
     "bencode-0.8.0" = {
@@ -5680,7 +5689,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz";
-        sha1 = "5465c0ce11d0881f7d8e36d8ca587043f33a25ae";
+        sha512 = "1zss1rcd373slj9qjmy4zp7ann95isbkvjlrgp2dirpazvn1sy23hgnw6p72w0mj8hcgqpxvs0ls035zmb8isilqhqqpkmya9d3234r";
       };
     };
     "exit-on-epipe-1.0.1" = {
@@ -5689,7 +5698,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz";
-        sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692";
+        sha512 = "2kxcf7dq1q9z2wqwwfjagn77kpzg2zpjqf2kd3vj5drx576gwglbsfly2b1imabj3svgcz5xsx79kspq1xsdgm4wwg1fksfnjdgjv47";
       };
     };
     "sax-1.2.4" = {
@@ -5698,7 +5707,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
-        sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
+        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
       };
     };
     "xmlbuilder-9.0.4" = {
@@ -6166,7 +6175,7 @@ let
       version = "5.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz";
-        sha1 = "53fe161111f912ab999ee887a90a0bc52822fd75";
+        sha512 = "1rkrq8iizbb4v8qv16qdknj2m9cjbxyl6d0jlp1jsnkys56b7xnn50f7qxbcsmz5z1m9r8j1pas6ai7bnhlmvmv88pyvdhw8fw3msdw";
       };
     };
     "foreach-2.0.5" = {
@@ -6436,7 +6445,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz";
-        sha1 = "18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7";
+        sha512 = "2vbps6iw562i2zxd973z5mmbs8ggx3wbz4g1jqwvkjibiwrk9ym8bxcvvwnlmxqad92x120x5xz5nyfq68nd8akk355bkk0qjppzafp";
       };
     };
     "fresh-0.5.0" = {
@@ -6508,7 +6517,7 @@ let
       version = "6.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz";
-        sha1 = "8d04954d364def3efc55b5a0793e1e2c8b1e6e49";
+        sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby";
       };
     };
     "send-0.15.4" = {
@@ -6652,7 +6661,7 @@ let
       version = "5.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
+        sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
       };
     };
     "promzard-0.3.0" = {
@@ -6670,7 +6679,7 @@ let
       version = "2.0.12";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz";
-        sha1 = "68ea45f98b3741cb6e10ae3bbd42a605026a6951";
+        sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv";
       };
     };
     "validate-npm-package-name-3.0.0" = {
@@ -6688,7 +6697,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz";
-        sha1 = "50183cd1b2d25275de069e9e71b467ac9eab973a";
+        sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967";
       };
     };
     "slash-1.0.0" = {
@@ -7651,7 +7660,7 @@ let
       version = "3.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz";
-        sha1 = "4e1516be68838bc90a49994f0b39a6e5960befcd";
+        sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g";
       };
     };
     "infinity-agent-2.0.3" = {
@@ -8183,16 +8192,16 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz";
-        sha1 = "b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7";
+        sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf";
       };
     };
-    "nan-2.6.2" = {
+    "nan-2.7.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.6.2";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
-        sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
+        url = "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz";
+        sha1 = "d95bf721ec877e08db276ed3fc6eb78f9083ad46";
       };
     };
     "jsonparse-0.0.6" = {
@@ -8918,13 +8927,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.104.0" = {
+    "aws-sdk-2.106.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.104.0";
+      version = "2.106.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.104.0.tgz";
-        sha1 = "335e0553380c0ae8dd43d11b76d73dfb926f6333";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.106.0.tgz";
+        sha1 = "8296b8ffbc63be61ae0a73b0e66f72b98baf293c";
       };
     };
     "request-2.81.0" = {
@@ -9095,7 +9104,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/conf/-/conf-1.1.2.tgz";
-        sha1 = "a164003022dd1643cd5abd9653071bd3b0a19f50";
+        sha512 = "0x5jhmsdnq5y7m1wdvvcdg2rxf6435lw7s00gim8zsb4l2z4slvb2g7macl1376v9mcznfvl9p65m7xzm6f3cb20yfq3v2xi1qfd6yi";
       };
     };
     "got-7.1.0" = {
@@ -9104,7 +9113,7 @@ let
       version = "7.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz";
-        sha1 = "05450fd84094e6bbea56f451a43a9c289166385a";
+        sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3";
       };
     };
     "has-ansi-3.0.0" = {
@@ -9122,7 +9131,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz";
-        sha1 = "079df1da943b3274f46932fb740c9b56dd6351fb";
+        sha512 = "26xxz57vqm8p6mg0syr21risma4h5h9n8kn4zv4pcxqap4zxicc210w5m7vz6a4zldhd102sbi7giwzmw0wjlpr6rb1hycr8iv703b1";
       };
     };
     "ink-0.3.1" = {
@@ -9131,7 +9140,7 @@ let
       version = "0.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz";
-        sha1 = "551047276cb93baa3f14eafaef2ae5b1526e8213";
+        sha512 = "0km0z5smnzrh4c5386h3vbmvps6m45m6hbbf62as9wl4vw370q411gpxxhqz3i83n0qjds7py2ylgjx2y3915m5v77c1sf428w4wwkv";
       };
     };
     "ink-text-input-1.1.0" = {
@@ -9140,7 +9149,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.0.tgz";
-        sha1 = "887a9623c23fd5c6f173b9704e6cc6029d0a15c1";
+        sha512 = "3dlsk820l687ixfmi4qx8czzb7cr0hfz5gijxvm5x0qrnhrcg4kqzhvph2hrf50whjj3cxcbyx6ldqxnp6msw7ai5rs3b4vs50vcpak";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -9230,7 +9239,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz";
-        sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55";
+        sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb";
       };
     };
     "shebang-command-1.2.0" = {
@@ -9266,7 +9275,7 @@ let
       version = "4.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
+        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
       };
     };
     "env-paths-1.0.0" = {
@@ -9365,7 +9374,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
-        sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67";
+        sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl";
       };
     };
     "p-cancelable-0.3.0" = {
@@ -9374,7 +9383,7 @@ let
       version = "0.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz";
-        sha1 = "b9e123800bcebb7ac13a479be195b507b98d30fa";
+        sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5";
       };
     };
     "p-timeout-1.2.0" = {
@@ -9419,7 +9428,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.0.tgz";
-        sha1 = "49d7bcde85c2409be38ac327e3e119a451657c7b";
+        sha512 = "0ldd58k8nhlbx35b3bbvyq9w38sdg9ac3334s6bxjw2zn803aa8zal9jvg793561g11yhwrlj4bw160ppmmswidhpwh3s33zww9sws7";
       };
     };
     "is-object-1.0.1" = {
@@ -9437,7 +9446,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.0.tgz";
-        sha1 = "442d89b1d0ac6cf5ff2f7b916ee539869b93a256";
+        sha512 = "14khsaf360hn87pdlz9scgn3c5s1ndihc6prcsi5k2rkiapz4ag3lg448a69srpsvdk7jyp4hf4a9fp113nkprdmnadrx2n7cn6slqp";
       };
     };
     "ansi-regex-3.0.0" = {
@@ -9599,7 +9608,7 @@ let
       version = "6.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz";
-        sha1 = "af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3";
+        sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb";
       };
     };
     "convert-source-map-1.5.0" = {
@@ -9698,7 +9707,7 @@ let
       version = "0.4.16";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.16.tgz";
-        sha1 = "16fecf98212467d017d586a2af68d628b9421cd8";
+        sha512 = "2p8x22bgrc6cyxz8j73zzcwpqcb7fszycq7qrvbb0wd4g5wvdrz40lv3hyagx5if3xw0x1sjisx1a298gl51xl2mxizj7rvsv4ybaq3";
       };
     };
     "regenerator-runtime-0.11.0" = {
@@ -9707,7 +9716,7 @@ let
       version = "0.11.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz";
-        sha1 = "7e54fe5b5ccd5d6624ea6255c3473be090b802e1";
+        sha512 = "3a1pn2aankj443h5v8png8dbgrlyb7fcdn66vjglxwqvdpivpq959qsl2n44i6zwf1k5y6y23xwhim0x077yy275dyr6vwiny83987x";
       };
     };
     "globals-9.18.0" = {
@@ -9716,7 +9725,7 @@ let
       version = "9.18.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a";
+        sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab";
       };
     };
     "invariant-2.2.2" = {
@@ -9806,7 +9815,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";
-        sha1 = "ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e";
+        sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d";
       };
     };
     "indent-string-3.2.0" = {
@@ -9860,7 +9869,7 @@ let
       version = "3.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";
-        sha1 = "c159b8d5be0f9e5a6f346dab94f16ce022161b88";
+        sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
     "supports-color-4.2.1" = {
@@ -9869,7 +9878,7 @@ let
       version = "4.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
-        sha1 = "65a4bb2631e90e02420dba5554c375a4754bb836";
+        sha512 = "1ldz0jkrkclywnr7gwh85p6kljs5rm4jczbpj55vb9w5c81iyrf1ahgkw88nnzahgw2xvlg041vqk7gynxkwcqkzfagxjpphsrdh75b";
       };
     };
     "color-convert-1.9.0" = {
@@ -9959,7 +9968,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
-        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
+        sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -10031,7 +10040,7 @@ let
       version = "1.7.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz";
-        sha1 = "c54e9aac57e432875233525f3c891c4159ffefd7";
+        sha512 = "250k1k343w8g1ndd16h1lqcdvp989id6agsppfqi9a6lcqk89ga56xjz78hhy1dqn86vha8n8s551pwpyd1n87mkw4a7143djmm95n5";
       };
     };
     "whatwg-fetch-2.0.3" = {
@@ -10058,7 +10067,7 @@ let
       version = "0.4.18";
       src = fetchurl {
         url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
-        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
+        sha512 = "2l97vd6kax8syr9aggcqhiyhd3b2rf506wdq6wapfrc74qwpdzqf2a3891kq9ri3g5sdzayph2sz4zkr8kbbps58z9h2lvpk115kgdj";
       };
     };
     "unicode-emoji-modifier-base-1.0.0" = {
@@ -10142,13 +10151,13 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "ignore-3.3.4" = {
+    "ignore-3.3.5" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.3.4";
+      version = "3.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.4.tgz";
-        sha1 = "85ab6d0a9ca8b27b31604c09efe1c14dc21ab872";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz";
+        sha512 = "07qdg1b3fwg8b7zwq83rljcx2h0ybq8s43h5xkvsr252qij7ib2gcjamqsb25zv1nvxm94yrvf4fl41s1kyms8zhr86cspwcbggvc94";
       };
     };
     "inquirer-3.2.2" = {
@@ -10157,7 +10166,7 @@ let
       version = "3.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.2.tgz";
-        sha1 = "c2aaede1507cc54d826818737742d621bef2e823";
+        sha512 = "0gsmdyd280pgvy7aqam9hdjhpljwmyn2axwmf2gp6qrc8cxrykrshan1kr1s1f9cb8pf13m3jav92df9dbn1gwkk7i08m698768nckd";
       };
     };
     "is-resolvable-1.0.0" = {
@@ -10175,7 +10184,7 @@ let
       version = "3.9.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz";
-        sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0";
+        sha512 = "31wxw267vdf4nnjpksnzcb4i603366sjrw7g08bkxi3cwlrfl67458v7rvj72vbxcycq43z4ldkrfvqjrsvrjqrb2kfzmabpzghddq9";
       };
     };
     "levn-0.3.0" = {
@@ -10301,7 +10310,7 @@ let
       version = "0.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz";
-        sha1 = "815c99ea84f6809529d2f45791bdf82711352d66";
+        sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji";
       };
     };
     "del-2.2.2" = {
@@ -10436,7 +10445,7 @@ let
       version = "1.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz";
-        sha1 = "c519f629f86b3a5bedba58a88d311309eec097f9";
+        sha512 = "3c44v9rz6j4z6i7gj2v3wmfcqv5i47psysgd1p4jcgz114vfk99fif1n1r08jbsdkp4g3smv1wx7x4ikwa7q9dp5i1bc77la17s2kdw";
       };
     };
     "tmp-0.0.31" = {
@@ -10481,7 +10490,7 @@ let
       version = "4.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
-        sha1 = "4499eddcd1110e0b218bacf2fa7f7f59f55ca804";
+        sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -10643,7 +10652,7 @@ let
       version = "0.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz";
-        sha1 = "845a1cfda804a13419ec8ec12343e1f4c45cd07a";
+        sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf";
       };
     };
     "cli-spinners-1.0.0" = {
@@ -10967,7 +10976,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz";
-        sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a";
+        sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi";
       };
     };
     "async-each-1.0.1" = {
@@ -11021,7 +11030,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz";
-        sha1 = "3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4";
+        sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja";
       };
     };
     "micromatch-2.3.11" = {
@@ -11129,7 +11138,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
-        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
+        sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
       };
     };
     "expand-range-1.8.2" = {
@@ -11192,7 +11201,7 @@ let
       version = "1.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
-        sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c";
+        sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg";
       };
     };
     "is-number-3.0.0" = {
@@ -11327,7 +11336,7 @@ let
       version = "4.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
+        sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
       };
     };
     "tar-pack-3.4.0" = {
@@ -11372,7 +11381,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
-        sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1";
+        sha512 = "0zmgm7vf91vxk5hdvkwhfnzjxz9r6hwpn8dlbpasaax8rxx7z1qqdmh8l631vawj7y1bkpsd0v0mhjh9agggkjl72f3vlnfhy61m5k6";
       };
     };
     "string-width-1.0.2" = {
@@ -11390,7 +11399,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
+        sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
     "event-stream-0.5.3" = {
@@ -11492,13 +11501,13 @@ let
         sha1 = "21ffdc429be2b50cb361df990a40a7731288e935";
       };
     };
-    "simple-git-1.75.0" = {
+    "simple-git-1.76.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.75.0";
+      version = "1.76.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.75.0.tgz";
-        sha1 = "eaddc90118b40a1dca3837d51c50ac064ee1d288";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.76.0.tgz";
+        sha1 = "bfa9287559d30fb60bbef5a370e0a3f3895c8fee";
       };
     };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
@@ -11544,7 +11553,7 @@ let
       version = "1.12.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-        sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
+        sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
       };
     };
     "jade-1.11.0" = {
@@ -12255,7 +12264,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
-        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
+        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
       };
     };
     "object.defaults-1.1.0" = {
@@ -12813,7 +12822,7 @@ let
       version = "5.4.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.3.tgz";
-        sha1 = "d28f83ed19f10cf4bc9dc84db3c424788a1c541e";
+        sha512 = "20pswi06vxjrv64d6i7z1zcsml98fma05a3xbyaycyfn7xmhbg8zwhnswx9pd03hrlxr4ypgikjgr65a0kkycjcyw9819gffaw95jvm";
       };
     };
     "chai-4.1.1" = {
@@ -12831,16 +12840,16 @@ let
       version = "7.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz";
-        sha1 = "08645d825deb8696ee61725dbf590c012eb00ca0";
+        sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb";
       };
     };
-    "fast-json-patch-2.0.4" = {
+    "fast-json-patch-2.0.5" = {
       name = "fast-json-patch";
       packageName = "fast-json-patch";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.4.tgz";
-        sha1 = "6aa2b2918ff6f5a16daddf2745547a9ccf36a9fb";
+        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.5.tgz";
+        sha1 = "a712e829be69ab707514440c5404bdd9b0d3c609";
       };
     };
     "iterare-0.0.8" = {
@@ -12921,7 +12930,7 @@ let
       version = "3.3.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz";
-        sha1 = "b7857be58b97af664a8cdd071c91891d6c7d6a67";
+        sha512 = "1dwznr02qr6wd7886k3i7y3vxgzqdm14gc5vs892vrc8azhh6hl79bvl5lgc05004lzqbazj9p7vdkbms62f1iys92h5w1xpvdldfc8";
       };
     };
     "vscode-languageserver-3.3.0" = {
@@ -12930,7 +12939,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.3.0.tgz";
-        sha1 = "f547d4f0e5702f88ff3695bae5905f9604c8cc62";
+        sha512 = "380fi37ifwdgndnglvymyrb844aybpm5mjpwmq4p3dm1b93iqdfr00pr2b692d15k5hn9x82h98zw0bs0k7287pwdvdkv3v75pc92zi";
       };
     };
     "vscode-languageserver-types-3.3.0" = {
@@ -12939,7 +12948,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz";
-        sha1 = "8964dc7c2247536fbefd2d6836bf3febac80dd00";
+        sha512 = "1xjiay30jyp6sj9nq55zwjmxyq5ajcdrv4bw9ypkplv7mg57h4skiqvcsd6wbizidpx3xanqmnl04l66491fmlrwijn9ph3rsa044z4";
       };
     };
     "symbol-observable-1.0.4" = {
@@ -13137,7 +13146,7 @@ let
       version = "0.13.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz";
-        sha1 = "e5219e587951d60958fd94ea9a9a008cdeff1b34";
+        sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s";
       };
     };
     "bluebird-3.5.0" = {
@@ -13200,7 +13209,7 @@ let
       version = "3.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/superagent/-/superagent-3.6.0.tgz";
-        sha1 = "eb679651057c3462199c7b902b696c25350e1b87";
+        sha512 = "3n51bpsm3bf5x3z8jf9ylnffxgyrfwgi2v5ii78d1vgzs5f2km3928pcqzw2j331q4y19dj96npb134f2ry2ad8qlawp8z8cvi2wsx1";
       };
     };
     "component-emitter-1.2.1" = {
@@ -13704,7 +13713,7 @@ let
       version = "3.6.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/connect/-/connect-3.6.3.tgz";
-        sha1 = "f7320d46a25b4be7b483a2236517f24b1e27e301";
+        sha512 = "2fkfixwv0fqqxw5rhmzrczj8ayxccwnxwkgyv4w8sxnkz52sl6dsx2nirg1vryxxqdlwph4ag9vc17yzzydmzshc73gpi6m12m9kd0q";
       };
     };
     "di-0.0.1" = {
@@ -14676,7 +14685,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz";
-        sha1 = "33abf2b5720a9b094df38e81741ccb502e1a4125";
+        sha512 = "0mvmzv0c23159jkmwd32hlbilf9lby2iz7xpmxi6i5ym75am5m355dpfv0wwkw2s41f8lncgnx6plxl361bqkfbmds8083llmf6dkv7";
       };
     };
     "conventional-recommended-bump-1.0.1" = {
@@ -14685,7 +14694,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz";
-        sha1 = "56b8ae553a8a1152fa069e767599e1f6948bd36c";
+        sha512 = "0cn224cp4qa787r0gkxg66f8m3s6l4nimfi2hm9mi5b0fh1365nqcipq3p5g1l82lkz6xdc9ihv46pvrx7gr8l0lh563dvh8bqw8nnq";
       };
     };
     "dedent-0.7.0" = {
@@ -14724,6 +14733,15 @@ let
         sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc";
       };
     };
+    "glob-parent-3.1.0" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
+      };
+    };
     "globby-6.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -14793,7 +14811,7 @@ let
       version = "2.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz";
-        sha1 = "1ff61575c2e2a4e8e510d6fa4e243cce183999ab";
+        sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6";
       };
     };
     "write-json-file-2.2.0" = {
@@ -14856,7 +14874,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz";
-        sha1 = "118b9f7d41a3d99500bfb6bea1f3525e055e8b9b";
+        sha512 = "2cp0yhzf0kjmhawbj1v8kq71ddksbx8g7k1h7snwxijqy2xdgl6y6c63q6qg8ck3ar6n6wcs7yxzrq6kc9ddphclaqdg5s9d7drfhms";
       };
     };
     "conventional-changelog-atom-0.1.1" = {
@@ -14865,7 +14883,7 @@ let
       version = "0.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz";
-        sha1 = "d40a9b297961b53c745e5d1718fd1a3379f6a92f";
+        sha512 = "0h2y3wj5pfwir1ynh6i7qibcv30z2vy6l6q11nh9z9vzl15433c00bvjy1iz9zirkb57g4xyilak59hdzfzinadxqi8h3r2wgznxng8";
       };
     };
     "conventional-changelog-codemirror-0.1.0" = {
@@ -15036,7 +15054,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz";
-        sha1 = "6ccd2a52e735b736748dc762444fcd9588e27490";
+        sha512 = "16mn1j3vray2l88lrl57pkaxz3bvv4ahnx3qr6r3hkdjarzqn1d8w99n44mn39y4kdmcva1z6annx92h06r870yq05382f76jvv2p3w";
       };
     };
     "conventional-commits-filter-1.0.0" = {
@@ -15054,7 +15072,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
-        sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9";
+        sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r";
       };
     };
     "is-subset-0.1.1" = {
@@ -15153,7 +15171,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz";
-        sha1 = "71d01910cb0a99aeb20c144e50f81f4df3178447";
+        sha512 = "0mh43bfdx21ll5dn629cyh7p65drm2zcrazqvi6kq0m17h0y27brzsf8shjpi4idj3h9sqqa1dnq47xdwa00y4saswih5iqmy1pm1zj";
       };
     };
     "jsonfile-3.0.1" = {
@@ -15174,6 +15192,33 @@ let
         sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7";
       };
     };
+    "is-glob-3.1.0" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
+      };
+    };
+    "path-dirname-1.0.2" = {
+      name = "path-dirname";
+      packageName = "path-dirname";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
+        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+      };
+    };
+    "is-extglob-2.1.1" = {
+      name = "is-extglob";
+      packageName = "is-extglob";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+      };
+    };
     "ci-info-1.0.0" = {
       name = "ci-info";
       packageName = "ci-info";
@@ -15279,7 +15324,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
-        sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2";
+        sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
       };
     };
     "which-module-2.0.0" = {
@@ -15399,15 +15444,6 @@ let
         sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "glob-parent-3.1.0" = {
-      name = "glob-parent";
-      packageName = "glob-parent";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
-        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
-      };
-    };
     "ordered-read-streams-0.3.0" = {
       name = "ordered-read-streams";
       packageName = "ordered-read-streams";
@@ -15435,33 +15471,6 @@ let
         sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369";
       };
     };
-    "is-glob-3.1.0" = {
-      name = "is-glob";
-      packageName = "is-glob";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
-        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
-      };
-    };
-    "path-dirname-1.0.2" = {
-      name = "path-dirname";
-      packageName = "path-dirname";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
-        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
-      };
-    };
-    "is-extglob-2.1.1" = {
-      name = "is-extglob";
-      packageName = "is-extglob";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
-        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
-      };
-    };
     "extend-shallow-2.0.1" = {
       name = "extend-shallow";
       packageName = "extend-shallow";
@@ -15477,7 +15486,7 @@ let
       version = "8.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz";
-        sha1 = "e2400881bf171f7018ed1bd9da441dac8af6306d";
+        sha512 = "0c0jpdfbi4fmqyjc2ilwvinxyc8rn4p9j7fwshh2c00nkc0q2lh6yw2dgragvnpy8bjhcwa1hlfy2ih2ih3np78wrpqx7gf4w48xnxl";
       };
     };
     "markdown-it-emoji-1.4.0" = {
@@ -15513,7 +15522,7 @@ let
       version = "5.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz";
-        sha1 = "72ce2306a17dbea58ff1041853352b4a8fc77519";
+        sha512 = "2k8g3x11xbm64r7bbyad08cjv27vaparkigq11w2v8kg8h73k2rzdr3q6f5i2klidgpaq9rbhfv45rf9dkqqv3d8vsbvw4c5knnbww8";
       };
     };
     "socket.io-2.0.3" = {
@@ -15891,7 +15900,7 @@ let
       version = "8.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
-        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
+        sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx";
       };
     };
     "npmconf-2.1.2" = {
@@ -15909,7 +15918,7 @@ let
       version = "3.1.15";
       src = fetchurl {
         url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
-        sha1 = "cccdc35b90917d58e4c3837795d5d022d7a1f46f";
+        sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5";
       };
     };
     "fs.extra-1.3.2" = {
@@ -15945,7 +15954,7 @@ let
       version = "4.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
+        sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr";
       };
     };
     "uid-number-0.0.5" = {
@@ -15963,7 +15972,7 @@ let
       version = "2.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
-        sha1 = "5ada97538b1027b4cf7213432428578cb564011f";
+        sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
       };
     };
     "minizlib-1.0.3" = {
@@ -16332,7 +16341,7 @@ let
       version = "1.2.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz";
-        sha1 = "355e8f4d16876b43f577b0d5ce2668b9723214ea";
+        sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a";
       };
     };
     "fs.notify-0.0.4" = {
@@ -16377,7 +16386,7 @@ let
       version = "1.2.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz";
-        sha1 = "d44fea5a54145600c1a3875e942ab6727adbddb5";
+        sha512 = "3bpyhs9imacbmpq0r7l65qvkx0dfnx92qz5vm59i983h2xvw2yrr1934i979accigkr33b65n51m5zx73glbi3pwl8n6zm5b3y74a8a";
       };
     };
     "mqtt-2.9.0" = {
@@ -16386,7 +16395,7 @@ let
       version = "2.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz";
-        sha1 = "379ceb787a52fc15cb8fc96d558a32c123f12a9d";
+        sha512 = "181qi8xb0lxxqvwq2xcslv35dbhphyr67w02bad6n4rlibcm6z0j055dyfpdh12mrrvgjzfj11cjylsj26y7vr17cvk1kbgkiqgzpb9";
       };
     };
     "multer-1.3.0" = {
@@ -16458,7 +16467,7 @@ let
       version = "3.0.20";
       src = fetchurl {
         url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz";
-        sha1 = "cb35b2bcfe478051b6f3282be8db4e4add49a1e5";
+        sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv";
       };
     };
     "when-3.7.8" = {
@@ -16521,7 +16530,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz";
-        sha1 = "b02ddc6c0b52ea16b8d3cf375d5a32e780dab548";
+        sha512 = "1zfn87155w6q9fsv5ls3gxwih7yvarrh16kzpfrpppblzpmp1cy9gjkknsf9lkixacza39h51jd7varqfg19w3qkdic62zpirv86755";
       };
     };
     "css-select-1.2.0" = {
@@ -16737,7 +16746,7 @@ let
       version = "2.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz";
-        sha1 = "2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a";
+        sha512 = "2h6492mk9v9dzy26i5wfajinhi2pg729ksbcsmm0sp8s32hlr432q19g97qghfp5x98hsm77hmzwdzhgi3vhm2drz53ax7rabhydw98";
       };
     };
     "retry-0.6.1" = {
@@ -16749,13 +16758,13 @@ let
         sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
       };
     };
-    "cookies-0.7.0" = {
+    "cookies-0.7.1" = {
       name = "cookies";
       packageName = "cookies";
-      version = "0.7.0";
+      version = "0.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.0.tgz";
-        sha1 = "0bc961d910c35254980fc7c9eff5da12011bbf00";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.1.tgz";
+        sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b";
       };
     };
     "i18next-client-1.10.3" = {
@@ -16776,13 +16785,13 @@ let
         sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343";
       };
     };
-    "keygrip-1.0.1" = {
+    "keygrip-1.0.2" = {
       name = "keygrip";
       packageName = "keygrip";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
-        sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
+        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.2.tgz";
+        sha1 = "ad3297c557069dea8bcfe7a4fa491b75c5ddeb91";
       };
     };
     "esprima-3.1.3" = {
@@ -16818,7 +16827,7 @@ let
       version = "5.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz";
-        sha1 = "387104c06aa68fbb9f8159d0c722dd5c3e45df22";
+        sha512 = "2d1hvibps8d4xlw8wm937ykc76yb02rp2065hd6186vygjx3wixjjzrn3fia4wfj7d38ic8gh5ij5rsi9389kl6gpxxjbdcbjwpn8yf";
       };
     };
     "reinterval-1.1.0" = {
@@ -16836,7 +16845,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.1.tgz";
-        sha1 = "51cb992988c2eeb4525ccd90eafbac52a5ac6700";
+        sha512 = "3w842xsi7pgjjr5fkdzbx9dfsjl87x6c8wrvxgy8i1lr399yjiggbwrfdvpccv698f7n4ywvf7dbc8g61ly99yw1lf7fwpfrypg8x9p";
       };
     };
     "leven-1.0.2" = {
@@ -16899,7 +16908,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ws/-/ws-3.1.0.tgz";
-        sha1 = "8afafecdeab46d572e5397ee880739367aa2f41c";
+        sha512 = "07wdh2llaz8j5nbjpvl1zbbksw2pikqnw243c6a1ifmshp095hgam79vv5nbp1pjwnlm120m4d3sih9iwm5mkc46im03jb5l6l3ykjd";
       };
     };
     "append-field-0.1.0" = {
@@ -17172,6 +17181,15 @@ let
         sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
+    "nan-2.6.2" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
+        sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
+      };
+    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -17448,7 +17466,7 @@ let
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz";
-        sha1 = "0564c612b521dc92d9f2988f0549e34f9c98db64";
+        sha512 = "3rnqa9m5ma6whhiailgppfhnm4gkv4brw9619yvxz59di3g306svl7na9qj6n9l887ra3fgr80b0xij0vjvfwpbk9zvpags5plmqxga";
       };
     };
     "qs-0.5.1" = {
@@ -17781,7 +17799,7 @@ let
       version = "9.2.9";
       src = fetchurl {
         url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz";
-        sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd";
+        sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642";
       };
     };
     "call-limit-1.1.0" = {
@@ -17799,7 +17817,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
-        sha1 = "08c4a452f789dcbac4c89a4563c902b2c862fd5b";
+        sha512 = "07r7qvmx5fjjk2ra3hjrz31ciy4vhfq2k8a3wjscjl7y52885zwfvz4caa5xr3kab8l3y4c9rsz1nkpjl530irrs6q5l3z6yadyj4c8";
       };
     };
     "lazy-property-1.0.0" = {
@@ -17817,7 +17835,7 @@ let
       version = "9.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz";
-        sha1 = "f6fb833dae64044c93dc31eff99cff4a019dc304";
+        sha512 = "0ki52cm2pf27r9pkpfbrx6y1myg7yx1mghwnvv6mw4kmgscif08qlj0xzlc88kpfl549xip4z1ap64s22l7v3q26ygz6x12cch87wsr";
       };
     };
     "lodash._baseuniq-4.6.0" = {
@@ -17916,7 +17934,7 @@ let
       version = "2.7.38";
       src = fetchurl {
         url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz";
-        sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1";
+        sha512 = "0a0ar6lns179qdszia13prhj7gjpdjy334xafq791h48q00259lr6gpkzp17dagfcnff9pgcgxm7b68nidpj5qs0yah1v81fk4d84az";
       };
     };
     "promise-inflight-1.0.1" = {
@@ -17934,7 +17952,7 @@ let
       version = "5.1.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
-        sha1 = "4f03e83d0486856fb60d97c94882841c2a7b1b7a";
+        sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l";
       };
     };
     "sorted-union-stream-2.1.3" = {
@@ -17970,7 +17988,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz";
-        sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8";
+        sha512 = "0vh5z2d6q3zgf7j3g5ngyq4piqq1y613wacfyildfnm2c2klb4h2gw32grgk6pv9ssyiliyfvj4p4alpaa85cqcj2nznb4q0fv400dn";
       };
     };
     "write-file-atomic-2.1.0" = {
@@ -17979,7 +17997,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
+        sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni";
       };
     };
     "lodash._baseindexof-3.1.0" = {
@@ -18078,7 +18096,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
-        sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0";
+        sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz";
       };
     };
     "run-queue-1.0.3" = {
@@ -18096,7 +18114,7 @@ let
       version = "2.5.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.5.0.tgz";
-        sha1 = "08c22d499f4f30111addba79fe87c98cf01b6bc8";
+        sha512 = "1s6fqfsr7ksyfp0mwzlcf9rwpg74y29p67jkc8h89zy915rjsy5f85ik1659gd0y48z7lbnf3mg9c27drk74qycj446rlykim3zkw14";
       };
     };
     "npm-pick-manifest-1.0.4" = {
@@ -18105,7 +18123,7 @@ let
       version = "1.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz";
-        sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8";
+        sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h";
       };
     };
     "promise-retry-1.1.1" = {
@@ -18141,7 +18159,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz";
-        sha1 = "6d5de5829afd3be2712201a39275fd11c651857c";
+        sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -18168,7 +18186,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha1 = "1391bee7fd66aeabc0df2a1fa90f58954f43e443";
+        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
       };
     };
     "node-fetch-npm-2.0.2" = {
@@ -18177,7 +18195,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz";
-        sha1 = "7258c9046182dca345b4208eda918daf33697ff7";
+        sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw";
       };
     };
     "socks-proxy-agent-3.0.0" = {
@@ -18186,7 +18204,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz";
-        sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245";
+        sha512 = "3zn9cz2ry5m1akapj7hvhgkxfq7ffwynia46lmwipsw2jk5sv8dvs32dc4hfx3xvp34i1jff1bg870a1xnknsgk5dl021jd4gwi75v0";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -18204,7 +18222,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.1.tgz";
-        sha1 = "92d8a4fc2524a3b09b3666a33b6c97960f23d6a4";
+        sha512 = "2naw79i4m7pj1n5qw9xq6c0c8cdjfcqhdqk4j552nbrpb4c60hic13jfikqw7xga8xywpr57z2y5z70gn5xiihq47vzs3wrc1998qf9";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -18222,7 +18240,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz";
-        sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a";
+        sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r";
       };
     };
     "socks-1.1.10" = {
@@ -18294,7 +18312,7 @@ let
       version = "3.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
-        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
+        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
       };
     };
     "import-lazy-2.1.0" = {
@@ -18612,13 +18630,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.40.1" = {
+    "snyk-1.40.2" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.40.1";
+      version = "1.40.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.40.1.tgz";
-        sha1 = "36120e6ab1659185db33fd3404377152bb92cdf2";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.40.2.tgz";
+        sha1 = "0084cdb969f0ee0282f5b1de562434d916c732c5";
       };
     };
     "spawn-please-0.3.0" = {
@@ -18783,22 +18801,22 @@ let
         sha1 = "f27aec2498b24027ac719214026521591111508f";
       };
     };
-    "snyk-go-plugin-1.1.2" = {
+    "snyk-go-plugin-1.1.3" = {
       name = "snyk-go-plugin";
       packageName = "snyk-go-plugin";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.1.2.tgz";
-        sha1 = "af93ab38d34ab40c67f1ffb00eb3bf6e4b6ab17c";
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.1.3.tgz";
+        sha512 = "2yxrc9kh1i9xxa012g3gwx5hdv0df0d0jkqh5h9bm6lkjs567kyh116bfvk6y3gj2cy39a85gvm0dd9gc92fy8i6if8d0zgh9w5wj2i";
       };
     };
-    "snyk-gradle-plugin-1.1.1" = {
+    "snyk-gradle-plugin-1.1.2" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.1.1.tgz";
-        sha1 = "9d75c973ce0e2e94bbf031ca737a354d9f2aa026";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.1.2.tgz";
+        sha512 = "17xbvmgijgmbpr01mq7z5hhbi9yjwj7mffmfngi8jbva19yggcns4srn18wh8bya0bb0hsjzj5g1lkzc6ndn1vyx95kfkqv6yrs9diq";
       };
     };
     "snyk-module-1.8.1" = {
@@ -18810,13 +18828,13 @@ let
         sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca";
       };
     };
-    "snyk-mvn-plugin-1.0.0" = {
+    "snyk-mvn-plugin-1.0.1" = {
       name = "snyk-mvn-plugin";
       packageName = "snyk-mvn-plugin";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.0.tgz";
-        sha1 = "99ae297b7ae40fa8df78a39fa13816dc513c2d10";
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.1.tgz";
+        sha512 = "2hyx0v53423yszxyxx41swndwqxya92iw3zjqaa35fl1ial9zxrmvrvlrc6jv4jaimv9ci7ni9jkascs1cgm85gqf1ifzkl9kfg0h3c";
       };
     };
     "snyk-policy-1.7.1" = {
@@ -18828,13 +18846,13 @@ let
         sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
       };
     };
-    "snyk-python-plugin-1.2.3" = {
+    "snyk-python-plugin-1.2.4" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.2.3";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.3.tgz";
-        sha1 = "c7c7df73576c6f8e9fab25364e8bab0b325b5ca9";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.4.tgz";
+        sha512 = "3n3rsr3cfa5jib3vlhwh6q60a6v7plc6gqwvylkc0q2yn99cb9syxkddzg0122apg98f10g2sy3y8mmsxyi7wpzklmhqmflv7q7dsiq";
       };
     };
     "snyk-recursive-readdir-2.0.0" = {
@@ -18864,13 +18882,13 @@ let
         sha1 = "13743a058437dff890baaf437c333c966a743cb6";
       };
     };
-    "snyk-sbt-plugin-1.1.0" = {
+    "snyk-sbt-plugin-1.1.1" = {
       name = "snyk-sbt-plugin";
       packageName = "snyk-sbt-plugin";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.1.0.tgz";
-        sha1 = "922bc70220ee95f26fbb1e482ff1dcbccdd1f050";
+        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.1.1.tgz";
+        sha512 = "38hp4kdx53qwknznqzi3j2y8i7hcwbmpbn6rk2lyszg4aly2dqvphk2hs8msij6s20lr884l8wkvc6rw9qpid8cqm75inl7wa2c5an0";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -19098,6 +19116,60 @@ let
         sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
       };
     };
+    "async-2.1.5" = {
+      name = "async";
+      packageName = "async";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
+        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
+      };
+    };
+    "lokijs-1.4.3" = {
+      name = "lokijs";
+      packageName = "lokijs";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lokijs/-/lokijs-1.4.3.tgz";
+        sha1 = "f2a47ba8d6991c92d6da6a5b35be79b674453abb";
+      };
+    };
+    "vscode-jsonrpc-3.0.4" = {
+      name = "vscode-jsonrpc";
+      packageName = "vscode-jsonrpc";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.0.4.tgz";
+        sha1 = "07fdae38e3122412faddf45756fba1d2cb1eb9c8";
+      };
+    };
+    "vscode-languageclient-3.0.4" = {
+      name = "vscode-languageclient";
+      packageName = "vscode-languageclient";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.0.4.tgz";
+        sha1 = "d0a4ecf3e1c5bf486a49a161962f9189b0bd2bf7";
+      };
+    };
+    "vscode-languageserver-3.0.5" = {
+      name = "vscode-languageserver";
+      packageName = "vscode-languageserver";
+      version = "3.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.0.5.tgz";
+        sha1 = "080f7b7ce6d43a0785a21195e00068ac57558c85";
+      };
+    };
+    "vscode-languageserver-types-3.0.3" = {
+      name = "vscode-languageserver-types";
+      packageName = "vscode-languageserver-types";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.3.tgz";
+        sha1 = "303b2a307c20952ff5c1f5a608f3c91146028d47";
+      };
+    };
     "babybird-0.0.1" = {
       name = "babybird";
       packageName = "babybird";
@@ -19435,13 +19507,13 @@ let
         sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff";
       };
     };
-    "msgpack5-3.5.0" = {
+    "msgpack5-3.5.1" = {
       name = "msgpack5";
       packageName = "msgpack5";
-      version = "3.5.0";
+      version = "3.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.0.tgz";
-        sha1 = "193b3e864959a826d33074460c2651d1ed04b07a";
+        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.1.tgz";
+        sha512 = "3a93gp3vf9vwp9dk4xsf25d7m8hmlm779x1wbhv6a8fg9p0341nsmbp2nmip7ypa1bc59f2y07b92cr3lb99i8a62828l5bppsylv2j";
       };
     };
     "dom-storage-2.0.2" = {
@@ -19612,7 +19684,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz";
-        sha1 = "52fabcc6a606d1a00302802648ef68f639da268c";
+        sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3";
       };
     };
     "next-line-1.1.0" = {
@@ -19684,7 +19756,7 @@ let
       version = "1.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz";
-        sha1 = "a8a26bec7646438963fc86e06f8f8b16d6c8bf7a";
+        sha512 = "0770ymyc0rv6a11mj3990d0z1jl1b2qxp4bapqa819y269sszfd96wn2y7pb6aw8bdgsn3bvpr7bmig5lcmkrxya13d5vc5y66q7pwh";
       };
     };
     "external-editor-1.1.1" = {
@@ -20426,15 +20498,6 @@ let
         sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff";
       };
     };
-    "async-2.1.5" = {
-      name = "async";
-      packageName = "async";
-      version = "2.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
-        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
-      };
-    };
     "assert-plus-0.1.5" = {
       name = "assert-plus";
       packageName = "assert-plus";
@@ -20894,13 +20957,13 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
-    "blueimp-md5-2.7.0" = {
+    "blueimp-md5-2.8.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
-      version = "2.7.0";
+      version = "2.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.7.0.tgz";
-        sha1 = "7f518e0dd70467fefe28ecba398916092f2a02a9";
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.8.0.tgz";
+        sha512 = "3k2jkipyh7gdwg827wlnjaq8zj2wajj8c9c7p2il6qzbk16565fwl2dr6jjp0b2fv7lichvxzpl933ixazf2j3i0pq91fh2g7imhcv7";
       };
     };
     "color-2.0.0" = {
@@ -20936,7 +20999,7 @@ let
       version = "1.15.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/express-session/-/express-session-1.15.5.tgz";
-        sha1 = "f49a18227263b316f6f8544da5fee25a540259ec";
+        sha512 = "0xr0b4wp67nzril9h59g1ag2siwazl9kkfy45cq317w0x9q6apr82i9hvqrmjpp9zfvzfidz0vvd1pczsa7namwsdwk1anp9zl74584";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -21035,7 +21098,7 @@ let
       version = "2.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/raven/-/raven-2.1.2.tgz";
-        sha1 = "4aa7a72c4b3061d7fde06bfc62d669a74a651e27";
+        sha512 = "136ylazswrblh2b1kc29xsmzk3i3bhm6vcirl1zb60fv9h0nf3hipz7qm91vs6my1lry00xrzpy1x96y51siciwwq7k3fs0ynl2j6m4";
       };
     };
     "signals-1.0.0" = {
@@ -21107,7 +21170,7 @@ let
       version = "3.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz";
-        sha1 = "056695150d7aa93237ca7e378ac3b1682b7963b9";
+        sha512 = "0vcr20wa3j8j9b5xs7d5wnkm74g7ka45zfmw813s6ibwk8gbzyj87ifas3qklfdj7ydrqjfcylhazar038qzaf6jqfl17snn6wxjif3";
       };
     };
     "hogan.js-3.0.2" = {
@@ -21269,7 +21332,7 @@ let
       version = "2.2.11";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz";
-        sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72";
+        sha512 = "3sn0n3ncghvdrhy082cysiswswps9d5824ppjkl7gl1z1r6f11ij6z9nvs3l8gbp7vys1kgamrnikas3azjh7dwaqi1j4haffpkxvw7";
       };
     };
     "update-notifier-2.1.0" = {
@@ -21368,7 +21431,7 @@ let
       version = "0.0.33";
       src = fetchurl {
         url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
-        sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9";
+        sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d";
       };
     };
     "follow-redirects-0.0.3" = {
@@ -21422,7 +21485,7 @@ let
       version = "0.5.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz";
-        sha1 = "dca14a70235ff82f0ac9a3abeb60d337a365185d";
+        sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0";
       };
     };
     "loader-runner-2.3.0" = {
@@ -21485,7 +21548,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz";
-        sha1 = "c7356436a4d13123be2e2426a05d1dad9cbe65cf";
+        sha512 = "27l6lhqai0bhgk7mbchvf608bgmrgbqmgjd07k1rsg7xh12lnaflr459cy7ay108jr7dk8g5ybx70xi7cbz6lm5c7m022sl5b34r6yk";
       };
     };
     "es6-map-0.1.5" = {
@@ -21557,7 +21620,7 @@ let
       version = "2.0.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz";
-        sha1 = "96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6";
+        sha512 = "2pddj1k7206wrs3q5z7dzwc657rbdd2m00llzz0h1241fp0y5i32qi2slmfys217hqszbqmvnmjr32msgbjgzh33nxw6py49p4j35mr";
       };
     };
     "source-list-map-2.0.0" = {
@@ -21566,7 +21629,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz";
-        sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085";
+        sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93";
       };
     };
     "death-1.1.0" = {
@@ -21584,7 +21647,7 @@ let
       version = "1.4.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz";
-        sha1 = "39c72ed89d1b49ba708e18776500488902a52027";
+        sha512 = "3d6jyhcq21cxy2n6mnalnxcdxl9i00n8qka7awrqamggss8yllz57msx7c480knv037snkzkymq6npl36wlpl71h54x511dlchavnxa";
       };
     };
     "leven-2.1.0" = {
@@ -21602,7 +21665,7 @@ let
       version = "1.8.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz";
-        sha1 = "6eec6bfb07421e2148c75c6bba72421f8530a826";
+        sha512 = "1bdm7sms59bj5fa575nda007mvn4nibjla4hm9bf9ry70kgqw7slmz3l4md4cyx2j4zda0dh0mcjildkzq7ba3i9qzapha93l14qjzs";
       };
     };
     "object-path-0.11.4" = {
@@ -21800,7 +21863,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.2.tgz";
-        sha1 = "504ece28e11b5ac487e90b97d8189afa38db4331";
+        sha512 = "2wkqnb0q3hbfvgxiyi21kaw7rcn4grpxaajnhxry03y05xfr39xh25c9nqj4drp6c89snssd741ra24v5ibngj460hgs4ldsz90w5r0";
       };
     };
     "yosay-2.0.1" = {
@@ -21809,7 +21872,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/yosay/-/yosay-2.0.1.tgz";
-        sha1 = "078167f0365732e5c82d3f64633f9cd3a0526d2f";
+        sha512 = "1n6z65vkm1r31a1ms8wn32m9q61vrlz9isn43lm00qka1zvnich78zbnp29xwy72z361is2yimrpglmc55w97hbi9pas5pqlnvqbpw4";
       };
     };
     "filter-obj-1.1.0" = {
@@ -21827,7 +21890,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz";
-        sha1 = "1d03835c7eed1e34b8e539c47b7b60d0d015d4e1";
+        sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i";
       };
     };
     "p-try-1.0.0" = {
@@ -21854,7 +21917,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz";
-        sha1 = "60b408e21f5da11a417fad13740bf20f9024ab3b";
+        sha512 = "23lpz1jyj01f06bndx53w1k931l6ki6m94mgf9lqpxka3366q0w1ql0igm7bj5nc0imzdjv3x5825c05mjnhkgahw99hd0h1kk5ri0a";
       };
     };
     "aggregate-error-1.0.0" = {
@@ -22726,7 +22789,7 @@ in
       sources."ext-list-2.2.2"
       sources."meow-3.7.0"
       sources."sort-keys-length-1.0.1"
-      sources."mime-db-1.29.0"
+      sources."mime-db-1.30.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -22959,7 +23022,7 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."function-bind-1.1.0"
+      sources."function-bind-1.1.1"
       sources."is-buffer-1.1.5"
       sources."lexical-scope-1.2.0"
       sources."astw-2.2.0"
@@ -23008,7 +23071,7 @@ in
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
       sources."keypress-0.2.1"
-      sources."mime-1.3.6"
+      sources."mime-1.4.0"
       sources."minimist-1.2.0"
       sources."peerflix-0.34.0"
       (sources."playerui-1.2.0" // {
@@ -23365,7 +23428,7 @@ in
     version = "1.12.7";
     src = fetchurl {
       url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
-      sha1 = "c05dae0cb79591d05b3070a8433a98c9a89ccc53";
+      sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -23675,7 +23738,7 @@ in
       })
       sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
-      sources."function-bind-1.1.0"
+      sources."function-bind-1.1.1"
       sources."is-buffer-1.1.5"
       sources."lexical-scope-1.2.0"
       (sources."astw-2.2.0" // {
@@ -24030,7 +24093,7 @@ in
     version = "0.2.9";
     src = fetchurl {
       url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.9.tgz";
-      sha1 = "204208be1cef2788d528744fb263f60a528363a2";
+      sha512 = "0xvz5ppq82s4yhrp4alp1ni696v960p9a8hycwns0bj33qjdsd2nn9h2xzpgssn9c27jbr91h9fr851rnc7sz7nd2ycblcsfy193sj0";
     };
     dependencies = [
       sources."minimist-1.2.0"
@@ -24133,7 +24196,7 @@ in
       sources."destroy-1.0.3"
       sources."mime-1.2.11"
       sources."bindings-1.3.0"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       sources."jsonparse-0.0.6"
       sources."es5class-2.3.1"
       sources."faye-websocket-0.11.1"
@@ -24341,13 +24404,13 @@ in
     version = "3.3.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.1.tgz";
-      sha1 = "84218b1184cec4859e63ae2ef44b5a7d877e4fe4";
+      sha512 = "21mmlyi12vnfg5s88vh8i7jk43m69bp4qhgkch8i2qbzf9fv4hqn7b6wcxkbbdxzdvnkkpklb2xxpxi5nflwl513w08d6ykvac2ambh";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.104.0"
+      sources."aws-sdk-2.106.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
@@ -24455,7 +24518,7 @@ in
     version = "2.0.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz";
-      sha1 = "6f6faf41a8f48e6080bffb2012041fc89491dd9f";
+      sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z";
     };
     dependencies = [
       sources."auto-bind-1.1.0"
@@ -24720,7 +24783,7 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
-      sources."ignore-3.3.4"
+      sources."ignore-3.3.5"
       sources."imurmurhash-0.1.4"
       sources."inquirer-3.2.2"
       sources."is-resolvable-1.0.0"
@@ -24864,7 +24927,7 @@ in
     version = "5.1.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.1.0.tgz";
-      sha1 = "937da79d43f4411c92837c8aec22cf307bc6a572";
+      sha512 = "3a69fni3gypbhmr458lzxnz7qpik5v7zsxhv4sfb85a7ygngibaxazv5z4i39zvcyivab5z8mnayn496z7v6m0r8j0zkfm39d6i5gwq";
     };
     dependencies = [
       (sources."chalk-1.1.3" // {
@@ -24908,7 +24971,7 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
       sources."globals-9.18.0"
-      sources."ignore-3.3.4"
+      sources."ignore-3.3.5"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-3.2.2" // {
         dependencies = [
@@ -25406,7 +25469,7 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       sources."node-pre-gyp-0.6.36"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -25567,7 +25630,7 @@ in
       sources."async-2.5.0"
       sources."lodash.groupby-4.6.0"
       sources."minilog-2.0.8"
-      sources."simple-git-1.75.0"
+      sources."simple-git-1.76.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
       sources."lodash-4.17.4"
       sources."microee-0.0.2"
@@ -25715,7 +25778,7 @@ in
       sources."weak-map-1.0.5"
       sources."sax-1.2.4"
       sources."xmlbuilder-9.0.4"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -26185,7 +26248,7 @@ in
       sources."chai-as-promised-7.1.1"
       sources."chalk-2.1.0"
       sources."commander-2.11.0"
-      sources."fast-json-patch-2.0.4"
+      sources."fast-json-patch-2.0.5"
       sources."glob-7.1.2"
       sources."iterare-0.0.8"
       (sources."jaeger-client-3.5.3" // {
@@ -26259,7 +26322,7 @@ in
     version = "0.3.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz";
-      sha1 = "7630ef74577274e95ad6d386ddfa091fcee8df4b";
+      sha512 = "0v4070gii05w3qhq7bnl5jp358f3dibvjml3vnmphqhgdn2g9i94a2mrvmcyrhpa7k9f3gp63p6vgpmhihja5b3is5xc8mv4vdy8wjh";
     };
     dependencies = [
       sources."when-3.4.6"
@@ -26437,7 +26500,7 @@ in
       sources."form-data-2.3.1"
       sources."formidable-1.1.1"
       sources."methods-1.1.2"
-      sources."mime-1.3.6"
+      sources."mime-1.4.0"
       sources."qs-6.5.0"
       sources."readable-stream-2.3.3"
       sources."ms-2.0.0"
@@ -26469,7 +26532,7 @@ in
     version = "0.12.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/json-server/-/json-server-0.12.0.tgz";
-      sha1 = "e8764bcb2fccbbe2a0c3bc406ea1ef04e9007308";
+      sha512 = "2iqk65hy94j010zlqsl4rzfkz4f9ic1pqbvsf5w1lrgmda9wmhxl5kmvnmwikjilmn6kz9kniqzl7rpq3xv3cmpx8rppb7ipk5ddhzj";
     };
     dependencies = [
       sources."body-parser-1.17.2"
@@ -26772,7 +26835,7 @@ in
     version = "3.9.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz";
-      sha1 = "08775cebdfdd359209f0d2acd383c8f86a6904a0";
+      sha512 = "31wxw267vdf4nnjpksnzcb4i603366sjrw7g08bkxi3cwlrfl67458v7rvj72vbxcycq43z4ldkrfvqjrsvrjqrb2kfzmabpzghddq9";
     };
     dependencies = [
       sources."argparse-1.0.9"
@@ -26790,10 +26853,10 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.7.0";
+    version = "1.7.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz";
-      sha1 = "6f7a1a406446fa2e187ec95398698f4cee476269";
+      url = "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz";
+      sha512 = "0g4s1b3k1485yxia2b8703zyw8dxjz9npijnkapv7q9jfw1piyaa2p4hsyqiajnc4n1djri6xk76q6y0jw0n9y7a5d4g6p1f26436lk";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -26834,7 +26897,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."mime-1.3.6"
+      sources."mime-1.4.0"
       sources."minimatch-3.0.4"
       sources."optimist-0.6.1"
       sources."qjobs-1.1.5"
@@ -26927,7 +26990,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       sources."node-pre-gyp-0.6.36"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
@@ -27292,10 +27355,10 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "2.1.0";
+    version = "2.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-2.1.0.tgz";
-      sha1 = "22da4c9cb09f7733a7e87ba8f34779a509c172ea";
+      url = "https://registry.npmjs.org/lerna/-/lerna-2.1.2.tgz";
+      sha1 = "b07eb7a4d7dd7d44a105262fef49b2229301c577";
     };
     dependencies = [
       sources."async-1.5.2"
@@ -27315,6 +27378,7 @@ in
       sources."fs-extra-4.0.1"
       sources."get-port-3.2.0"
       sources."glob-7.1.2"
+      sources."glob-parent-3.1.0"
       sources."globby-6.1.0"
       sources."graceful-fs-4.1.11"
       (sources."inquirer-3.2.2" // {
@@ -27551,6 +27615,9 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
+      sources."is-glob-3.1.0"
+      sources."path-dirname-1.0.2"
+      sources."is-extglob-2.1.1"
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
       sources."ansi-escapes-2.0.0"
@@ -27788,7 +27855,7 @@ in
     version = "2.1.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz";
-      sha1 = "896f8e28af72fdaa1137fda105d1066aadc65314";
+      sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b";
     };
     dependencies = [
       sources."body-parser-1.17.2"
@@ -27889,7 +27956,7 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       sources."node-pre-gyp-0.6.36"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -28139,7 +28206,7 @@ in
     version = "3.5.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz";
-      sha1 = "1328567d2717f997030f8006234bce9b8cd72465";
+      sha512 = "0ygdqmd1pxvdrgyympyhfy8cg90632jkggbv7l7irnzl0gaxdmyrrs9bf634046q8xq41bfxysabapgwdy8ssd58vc8nggbk0y3d1d4";
     };
     dependencies = [
       sources."browser-stdout-1.3.0"
@@ -28666,7 +28733,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."safe-buffer-5.0.1"
       sources."truncate-1.0.5"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       (sources."node-pre-gyp-0.6.36" // {
         dependencies = [
           sources."rimraf-2.6.1"
@@ -29032,7 +29099,7 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       sources."node-pre-gyp-0.6.36"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
@@ -29380,10 +29447,10 @@ in
       sources."klaw-1.3.1"
       sources."async-0.1.22"
       sources."retry-0.6.1"
-      sources."cookies-0.7.0"
+      sources."cookies-0.7.1"
       sources."i18next-client-1.10.3"
       sources."json5-0.2.0"
-      sources."keygrip-1.0.1"
+      sources."keygrip-1.0.2"
       sources."argparse-1.0.9"
       sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
@@ -29796,7 +29863,7 @@ in
     version = "5.3.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz";
-      sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17";
+      sha512 = "29izly6jqqdaslak9xz3i3bsr7qgg5vjcbzf55as0hh630z4aml48n5a7dz6skqn34d02fg3bk2zwkq7n67z787wn14vr3na9chx6v4";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -30411,7 +30478,7 @@ in
     version = "2.12.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.12.1.tgz";
-      sha1 = "9a41006f5186e8a59da7fd2b466fee9e896d865d";
+      sha512 = "2p62mjf7a9bjycq3x1jbp3vsvn8ww3ccrfx96syp7p19bzgg58q80didz4ygwn8cf1xxiyqhr3v3mwi7v9v90gnb8lsas4yz62z55ac";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -30438,7 +30505,7 @@ in
       sources."require-dir-0.3.2"
       sources."semver-5.4.1"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.40.1" // {
+      (sources."snyk-1.40.2" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -30742,12 +30809,12 @@ in
       sources."open-0.0.5"
       sources."os-name-1.0.3"
       sources."snyk-config-1.0.1"
-      sources."snyk-go-plugin-1.1.2"
-      sources."snyk-gradle-plugin-1.1.1"
+      sources."snyk-go-plugin-1.1.3"
+      sources."snyk-gradle-plugin-1.1.2"
       sources."snyk-module-1.8.1"
-      sources."snyk-mvn-plugin-1.0.0"
+      sources."snyk-mvn-plugin-1.0.1"
       sources."snyk-policy-1.7.1"
-      sources."snyk-python-plugin-1.2.3"
+      sources."snyk-python-plugin-1.2.4"
       (sources."snyk-recursive-readdir-2.0.0" // {
         dependencies = [
           sources."minimatch-3.0.2"
@@ -30759,7 +30826,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."snyk-sbt-plugin-1.1.0"
+      sources."snyk-sbt-plugin-1.1.1"
       sources."snyk-tree-1.0.0"
       sources."snyk-try-require-1.2.0"
       (sources."tempfile-1.1.1" // {
@@ -30954,6 +31021,43 @@ in
     };
     production = true;
   };
+  ocaml-language-server = nodeEnv.buildNodePackage {
+    name = "ocaml-language-server";
+    packageName = "ocaml-language-server";
+    version = "0.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-0.2.0.tgz";
+      sha1 = "f9ae38396f893863ed52c1a29fb45b42236e1a36";
+    };
+    dependencies = [
+      sources."async-2.1.5"
+      sources."glob-7.1.1"
+      sources."lodash-4.17.4"
+      sources."lokijs-1.4.3"
+      sources."pegjs-0.10.0"
+      sources."vscode-jsonrpc-3.0.4"
+      sources."vscode-languageclient-3.0.4"
+      sources."vscode-languageserver-3.0.5"
+      sources."vscode-languageserver-types-3.0.3"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.4"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "OCaml language server";
+      homepage = https://github.com/freebroccolo/ocaml-language-server;
+      license = "Apache-2.0";
+    };
+    production = true;
+  };
   parsoid = nodeEnv.buildNodePackage {
     name = "parsoid";
     packageName = "parsoid";
@@ -31128,7 +31232,7 @@ in
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
-      sources."function-bind-1.1.0"
+      sources."function-bind-1.1.1"
       sources."object-keys-1.0.11"
       sources."define-properties-1.1.2"
       sources."foreach-2.0.5"
@@ -31216,7 +31320,7 @@ in
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -31250,7 +31354,7 @@ in
       })
       sources."lodash-3.10.1"
       sources."merge-1.2.0"
-      (sources."msgpack5-3.5.0" // {
+      (sources."msgpack5-3.5.1" // {
         dependencies = [
           sources."readable-stream-2.3.3"
           sources."isarray-1.0.0"
@@ -31328,7 +31432,7 @@ in
     version = "0.37.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz";
-      sha1 = "535019f8dcbae8932bd38b28533bf61c0f979048";
+      sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf";
     };
     dependencies = [
       sources."airplayer-2.0.0"
@@ -31339,7 +31443,7 @@ in
         ];
       })
       sources."keypress-0.2.1"
-      sources."mime-1.3.6"
+      sources."mime-1.4.0"
       sources."network-address-1.1.2"
       sources."numeral-1.5.6"
       sources."open-0.0.5"
@@ -32106,15 +32210,15 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.5.3";
+    version = "1.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.5.3.tgz";
-      sha1 = "59dadc683345ec6b88f88b94ed4ae7e1da394bfe";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.6.1.tgz";
+      sha512 = "31al4m6n59a0mr6q8fn231zn4navr252z2pgq7dhcxdpp5a1aqaqmvx0sgamv97pkygswlcpbsj7a1dg2ijb9n0zr623ai2hh36mkkz";
     };
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Prettier is an opinionated JavaScript formatter";
-      homepage = "https://github.com/prettier/prettier#readme";
+      description = "Prettier is an opinionated code formatter";
+      homepage = https://prettier.io/;
       license = "MIT";
     };
     production = true;
@@ -32329,7 +32433,7 @@ in
     version = "5.4.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-      sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
+      sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -32368,7 +32472,7 @@ in
       })
       sources."commander-2.11.0"
       sources."js-yaml-3.9.1"
-      sources."cookies-0.7.0"
+      sources."cookies-0.7.1"
       sources."request-2.81.0"
       sources."async-0.9.2"
       sources."es6-shim-0.21.1"
@@ -32452,7 +32556,7 @@ in
       sources."argparse-1.0.9"
       sources."esprima-4.0.0"
       sources."sprintf-js-1.0.3"
-      sources."keygrip-1.0.1"
+      sources."keygrip-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -32524,7 +32628,7 @@ in
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
       (sources."glob-6.0.4" // {
@@ -32691,7 +32795,7 @@ in
       sources."formidable-1.1.1"
       sources."http-signature-0.11.0"
       sources."keep-alive-agent-0.0.1"
-      sources."mime-1.3.6"
+      sources."mime-1.4.0"
       sources."negotiator-0.5.3"
       sources."node-uuid-1.4.8"
       sources."once-1.4.0"
@@ -32715,7 +32819,7 @@ in
       sources."wrappy-1.0.2"
       sources."extsprintf-1.2.0"
       sources."core-util-is-1.0.2"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."mkdirp-0.5.1"
@@ -32910,7 +33014,7 @@ in
     version = "3.0.28";
     src = fetchurl {
       url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.28.tgz";
-      sha1 = "96b8495f0272944787b5843a1679aa326640d5f7";
+      sha512 = "0c2lanpm4sac5iz6mybcdxyh2y1hrgjghlggjh1wq2nr19lr9yig6j2hgjvghm1pzv5r3lm7pfhbgnpndrbynjmva3a3mxlmhcyl7yj";
     };
     dependencies = [
       sources."commander-2.11.0"
@@ -32927,15 +33031,15 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.28";
+    version = "1.1.29";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.28.tgz";
-      sha1 = "372d0d57bd8efc3570de6b2743a4da8aaa83eefb";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.29.tgz";
+      sha1 = "4376943f1924f90f294f5f17ae56bda852cb1643";
     };
     dependencies = [
       sources."async-2.5.0"
       sources."bluebird-3.5.0"
-      sources."blueimp-md5-2.7.0"
+      sources."blueimp-md5-2.8.0"
       sources."body-parser-1.17.2"
       sources."color-2.0.0"
       sources."cookie-parser-1.4.3"
@@ -32955,7 +33059,7 @@ in
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.3.4"
+      sources."ignore-3.3.5"
       sources."just-detect-adblock-1.0.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
@@ -32982,6 +33086,7 @@ in
           sources."npm-registry-client-8.1.1"
           sources."readable-stream-2.2.11"
           sources."request-2.81.0"
+          sources."semver-5.3.0"
           sources."isarray-1.0.0"
           sources."safe-buffer-5.0.1"
           (sources."string_decoder-1.0.3" // {
@@ -33025,7 +33130,7 @@ in
       sources."octicons-3.5.0"
       sources."open-0.0.5"
       sources."os-homedir-1.0.2"
-      sources."passport-0.3.2"
+      sources."passport-0.4.0"
       sources."passport-local-1.0.0"
       (sources."raven-2.1.2" // {
         dependencies = [
@@ -33040,7 +33145,7 @@ in
         ];
       })
       sources."rimraf-2.6.1"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."serve-static-1.12.4"
       sources."signals-1.0.0"
       sources."snapsvg-0.5.1"
@@ -33283,6 +33388,7 @@ in
         dependencies = [
           sources."minimatch-3.0.4"
           sources."nopt-3.0.6"
+          sources."semver-5.3.0"
         ];
       })
       sources."normalize-git-url-3.0.2"
@@ -33851,7 +33957,7 @@ in
     version = "3.5.5";
     src = fetchurl {
       url = "https://registry.npmjs.org/webpack/-/webpack-3.5.5.tgz";
-      sha1 = "3226f09fc8b3e435ff781e7af34f82b68b26996c";
+      sha512 = "079rx5l3h8prapxbrdddakxp5s7cbcmzy2hlmzvydmn7c4cpnlba7cprhxqazzs26iv63hm8lrc3crrwk6lx3davvwv4y0vfbi33rd9";
     };
     dependencies = [
       sources."acorn-5.1.1"
@@ -34074,7 +34180,7 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."nan-2.6.2"
+      sources."nan-2.7.0"
       sources."node-pre-gyp-0.6.36"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.2"
@@ -34523,7 +34629,7 @@ in
     version = "2.0.0";
     src = fetchurl {
       url = "https://registry.npmjs.org/yo/-/yo-2.0.0.tgz";
-      sha1 = "0cd75211379ed87105f99510885759062147b517";
+      sha512 = "3maxk0a2p7xyz9bkfyx3jd0inm9y7a3wc8b7rqx8p5fsmx8qkqnbvhxwn4210l689vd5p3xphn147dyclqsqmmgp7cqyswyyfsmm1lr";
     };
     dependencies = [
       sources."async-2.5.0"

From ed6bd02a9d1446e5e2af9f599e49ab69a9d72e06 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Wed, 30 Aug 2017 13:09:23 -0400
Subject: [PATCH 3063/3246] sword: fix build with gcc6

---
 pkgs/development/libraries/sword/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 6091bb3c8bb..44f6cabd35a 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
     patchShebangs .;
   '';
 
+  patches = [
+    (fetchurl {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/sword/files/sword-1.7.4-gcc6.patch";
+      sha256 = "0cvnya5swc7dxabir6bz6la2h1qxd32g3xi06m9b5l5ahb6g10y7";
+    })
+  ];
+
   configureFlags = "--without-conf --enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable";
 
   meta = with stdenv.lib; {

From 746cc06f1365c2c2f704f78e0e53452a3aae2ff8 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Wed, 30 Aug 2017 15:01:43 +0200
Subject: [PATCH 3064/3246] nixos/piwik: use nginx' virtualHost submodule
 instead of redeclaring part of the options. Backward-compatible change. This
 gives the same flexibility to the user as nginx itself. This also resolves
 the piwik module break from nginx' enableSSL introduction from #27426.

---
 nixos/modules/services/web-apps/piwik.nix | 61 ++++++++---------------
 1 file changed, 22 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/piwik.nix
index 26342a9c5f0..11fa13d6d76 100644
--- a/nixos/modules/services/web-apps/piwik.nix
+++ b/nixos/modules/services/web-apps/piwik.nix
@@ -57,41 +57,20 @@ in {
       };
 
       nginx = mkOption {
-        # TODO: for maximum flexibility, it would be nice to use nginx's vhost_options module
-        #       but this only makes sense if we can somehow specify defaults suitable for piwik.
-        #       But users can always copy the piwik nginx config to their configuration.nix and customize it.
-        type = types.nullOr (types.submodule {
-          options = {
-            virtualHost = mkOption {
-              type = types.str;
-              default = "piwik.${config.networking.hostName}";
-              example = "piwik.$\{config.networking.hostName\}";
-              description = ''
-                  Name of the nginx virtualhost to use and set up.
-              '';
-            };
-            enableSSL = mkOption {
-              type = types.bool;
-              default = true;
-              description = "Whether to enable https.";
-            };
-            forceSSL = mkOption {
-              type = types.bool;
-              default = true;
-              description = "Whether to always redirect to https.";
-            };
-            enableACME = mkOption {
-              type = types.bool;
-              default = true;
-              description = "Whether to ask Let's Encrypt to sign a certificate for this vhost.";
-            };
-          };
-        });
+        type = types.nullOr (types.submodule (import ../web-servers/nginx/vhost-options.nix {
+          inherit config lib;
+        }));
         default = null;
-        example = { virtualHost = "stats.$\{config.networking.hostName\}"; };
+        example = {
+          serverName = "stats.$\{config.networking.hostName\}";
+          enableACME = false;
+        };
         description = ''
-            The options to use to configure an nginx virtualHost.
-            If null (the default), no nginx virtualHost will be configured.
+            With this option, you can customize an nginx virtualHost which already has sensible defaults for piwik.
+            Set this to {} to just enable the virtualHost if you don't need any customization.
+            If enabled, then by default, the serverName is piwik.$\{config.networking.hostName\}, SSL is active,
+            and certificates are acquired via ACME.
+            If this is set to null (the default), no nginx virtualHost will be configured.
         '';
       };
     };
@@ -170,11 +149,15 @@ in {
       # References:
       # https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html
       # https://github.com/perusio/piwik-nginx
-      ${cfg.nginx.virtualHost} = {
-        root = "${pkgs.piwik}/share";
-        enableSSL  = cfg.nginx.enableSSL;
-        enableACME = cfg.nginx.enableACME;
-        forceSSL   = cfg.nginx.forceSSL;
+      "${user}.${config.networking.hostName}" = mkMerge [ cfg.nginx {
+        # don't allow to override root, as it will almost certainly break piwik
+        root = mkForce "${pkgs.piwik}/share";
+
+        # allow to override SSL settings if necessary, i.e. when using another method than ACME
+        # but enable them by default, as sensitive login and piwik data should not be transmitted in clear text.
+        addSSL = mkDefault true;
+        forceSSL = mkDefault true;
+        enableACME = mkDefault true;
 
         locations."/" = {
           index = "index.php";
@@ -208,7 +191,7 @@ in {
         locations."= /piwik.js".extraConfig = ''
           expires 1M;
         '';
-      };
+      }];
     };
   };
 

From adb03f32a126a139e8c23dcd3ea8852ca6dd5d9d Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Wed, 30 Aug 2017 15:09:05 +0200
Subject: [PATCH 3065/3246] nixos/piwik: Remove part about mail problems
 Sending mail works out of the box as of resolution of #26611.

---
 nixos/modules/services/web-apps/piwik-doc.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/piwik-doc.xml
index 21342d4454f..a393a182d36 100644
--- a/nixos/modules/services/web-apps/piwik-doc.xml
+++ b/nixos/modules/services/web-apps/piwik-doc.xml
@@ -79,16 +79,6 @@
           You can safely ignore this, unless you need a plugin that needs JavaScript tracker access.
         </para>
       </listitem>
-
-      <listitem>
-        <para>
-          Sending mail from piwik, e.g. for the password reset function, might not work out of the box:
-          There's a problem with using <command>sendmail</command> from <literal>php-fpm</literal> that is
-          being investigated at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/26611" />.
-          If you have (or don't have) this problem as well, please report it. You can enable SMTP as method
-          to send mail in piwik's <quote>General Settings</quote> > <quote>Mail Server Settings</quote> instead.
-        </para>
-      </listitem>
     </itemizedlist>
   </section>
 

From 0544ac4a1b6ae7ed6f9d0e33307f618a405ce35b Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Wed, 30 Aug 2017 15:14:52 +0200
Subject: [PATCH 3066/3246] nixos/piwik: Make webServerUser default to nginx if
 the nginx option is used. Noted that either webServerUser or nginx option is
 mandatory. Also introduce an assertion if both are not set, and a warning if
 both are set. Resolves #27704.

---
 nixos/modules/services/web-apps/piwik.nix | 28 +++++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/piwik.nix
index 11fa13d6d76..8d1b3fd00e2 100644
--- a/nixos/modules/services/web-apps/piwik.nix
+++ b/nixos/modules/services/web-apps/piwik.nix
@@ -24,14 +24,17 @@ in {
         default = false;
         description = ''
           Enable piwik web analytics with php-fpm backend.
+          Either the nginx option or the webServerUser option is mandatory.
         '';
       };
 
       webServerUser = mkOption {
-        type = types.str;
-        example = "nginx";
+        type = types.nullOr types.str;
+        default = null;
+        example = "lighttpd";
         description = ''
-          Name of the owner of the ${phpSocket} fastcgi socket for piwik.
+          Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for piwik if the nginx
+          option is not used. Either this option or the nginx option is mandatory.
           If you want to use another webserver than nginx, you need to set this to that server's user
           and pass fastcgi requests to `index.php` and `piwik.php` to this socket.
         '';
@@ -67,6 +70,7 @@ in {
         };
         description = ''
             With this option, you can customize an nginx virtualHost which already has sensible defaults for piwik.
+            Either this option or the webServerUser option is mandatory.
             Set this to {} to just enable the virtualHost if you don't need any customization.
             If enabled, then by default, the serverName is piwik.$\{config.networking.hostName\}, SSL is active,
             and certificates are acquired via ACME.
@@ -77,6 +81,14 @@ in {
   };
 
   config = mkIf cfg.enable {
+    warnings = mkIf (cfg.nginx != null && cfg.webServerUser != null) [
+      "If services.piwik.nginx is set, services.piwik.nginx.webServerUser is ignored and should be removed."
+    ];
+
+    assertions = [ {
+        assertion = cfg.nginx != null || cfg.webServerUser != null;
+        message = "Either services.piwik.nginx or services.piwik.nginx.webServerUser is mandatory";
+    }];
 
     users.extraUsers.${user} = {
       isSystemUser = true;
@@ -132,10 +144,16 @@ in {
       serviceConfig.UMask = "0007";
     };
 
-    services.phpfpm.poolConfigs = {
+    services.phpfpm.poolConfigs = let
+      # workaround for when both are null and need to generate a string,
+      # which is illegal, but as assertions apparently are being triggered *after* config generation,
+      # we have to avoid already throwing errors at this previous stage.
+      socketOwner = if (cfg.nginx != null) then config.services.nginx.user
+      else if (cfg.webServerUser != null) then cfg.webServerUser else "";
+    in {
       ${pool} = ''
         listen = "${phpSocket}"
-        listen.owner = ${cfg.webServerUser}
+        listen.owner = ${socketOwner}
         listen.group = root
         listen.mode = 0600
         user = ${user}

From ae9d311565d8c790900ebbc0976e447034930112 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Wed, 30 Aug 2017 22:13:26 +0200
Subject: [PATCH 3067/3246] nixos/piwik: adjust to addSSL and forceSSL now
 being mutually exclusive

---
 nixos/modules/services/web-apps/piwik.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/piwik.nix
index 8d1b3fd00e2..d59f800cf36 100644
--- a/nixos/modules/services/web-apps/piwik.nix
+++ b/nixos/modules/services/web-apps/piwik.nix
@@ -173,7 +173,6 @@ in {
 
         # allow to override SSL settings if necessary, i.e. when using another method than ACME
         # but enable them by default, as sensitive login and piwik data should not be transmitted in clear text.
-        addSSL = mkDefault true;
         forceSSL = mkDefault true;
         enableACME = mkDefault true;
 

From cffb1fab3e300dfab1b952c79ecd32eb5e79af34 Mon Sep 17 00:00:00 2001
From: Servilio Afre Puentes <afrepues@sharcnet.ca>
Date: Mon, 28 Aug 2017 14:56:50 -0400
Subject: [PATCH 3068/3246] gitlab: 8.17.6 -> 8.17.8

Latest release has important bugfixes.
---
 pkgs/applications/version-management/gitlab/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 9929c94198d..c139a3ff45d 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -18,11 +18,11 @@ let
     };
   };
 
-  version = "8.17.6";
+  version = "8.17.8";
 
   gitlabDeb = fetchurl {
     url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
-    sha256 = "1pr8nfnkzmicn5nxjkq48l4nfjsp6v5j3v8p7cp8r86lgfdc6as3";
+    sha256 = "0r4f1illaalhrvc6zgq19g4jcs77jf665l8bgx6pyvw45yn6wv7h";
   };
 
 in
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "1yyyn2j0a457q2xbcxz6b33r23myr8kxbm9whj2dwrrbp4p273hr";
+    sha256 = "041ld3na8m42akqpljipid984d0mv0wzk2p1630fncc1w3iaq06d";
   };
 
   patches = [

From fae458c5e73b51b4758be7dc6f1a6bf6ac8476fc Mon Sep 17 00:00:00 2001
From: Servilio Afre Puentes <afrepues@sharcnet.ca>
Date: Mon, 28 Aug 2017 14:39:04 -0400
Subject: [PATCH 3069/3246] gitlab: fix permission issue in build phase

The newer DEB packages have a setuid file, creating an error when
unpacking the source during the build phase.

As dpkg doesn't have a way to pass parameters to tar, dpkg is then
told to just extract the filesystem tar file and that is unpacked by
tar directly.

Fixes #28494
---
 pkgs/applications/version-management/gitlab/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index c139a3ff45d..815bc30344a 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     mv config/gitlab.yml.example config/gitlab.yml
 
-    dpkg -x ${gitlabDeb} .
+    dpkg --fsys-tarfile ${gitlabDeb} | tar -x --no-same-permissions --no-same-owner
     mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
     rm -rf opt
 

From a8f0b18b9aebd4c4d8687e2a1f28fe0216030326 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 30 Aug 2017 22:23:28 +0200
Subject: [PATCH 3070/3246] errbot: add glibcLocales to buildInputs

---
 pkgs/applications/networking/errbot/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index ee3ff1e48c8..7d815c8fad0 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
   name = "errbot-${version}";
@@ -21,6 +21,7 @@ pythonPackages.buildPythonApplication rec {
   # tests folder is not included in release
   doCheck = false;
 
+  buildInputs = [ glibcLocales ];
   propagatedBuildInputs = with pythonPackages; [
     webtest bottle threadpool rocket-errbot requests jinja2
     pyopenssl colorlog Yapsy markdown ansi pygments dns pep8

From de31f879bd1a08ed35f9e3b632a5ab22837b58be Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 30 Aug 2017 22:23:56 +0200
Subject: [PATCH 3071/3246] release documentation: update to current procedure

---
 nixos/doc/manual/development/releases.xml | 67 ++++++++++++++---------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index 01c3dbc22f1..bcc746a67b7 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -10,7 +10,7 @@
   <title>Release process</title>
 
   <para>
-    Going through an example of releasing NixOS 15.09:
+    Going through an example of releasing NixOS 17.09:
   </para>
 
   <section xml:id="one-month-before-the-beta">
@@ -18,13 +18,13 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Send an email to nix-dev mailinglist as a warning about upcoming beta "feature freeze" in a month.
+          Send an email to the nix-devel mailinglist as a warning about upcoming beta "feature freeze" in a month.
         </para>
       </listitem>
       <listitem>
         <para>
           Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline.
-          Any issue or Pull Request targeting the release should have assigned milestone.
+          Any issue or Pull Request targeting the release should be included in the release milestone.
         </para>
       </listitem>
     </itemizedlist>
@@ -34,60 +34,63 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Rename <literal>rl-unstable.xml</literal> -&gt;
-          <literal>rl-1509.xml</literal>.
+          Create a new release notes file for the upcoming release + 1, in this
+          case <literal>rl-1803.xml</literal>.
         </para>
       </listitem>
       <listitem>
         <para>
-          <literal>git tag -a -m &quot;Release 15.09-beta&quot; 15.09-beta &amp;&amp; git push --tags</literal>
+          <literal>git tag -a -s -m &quot;Release 17.09-beta&quot; 17.09-beta &amp;&amp; git push --tags</literal>
         </para>
       </listitem>
       <listitem>
         <para>
-          From the master branch run <literal>git checkout -B release-15.09</literal>.
+          From the master branch run <literal>git checkout -B release-17.09</literal>.
         </para>
       </listitem>
       <listitem>
         <para>
           <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18">
-            Make sure channel is created at http://nixos.org/channels/.
+            Make sure a channel is created at http://nixos.org/channels/.
           </link>
         </para>
       </listitem>
       <listitem>
         <para>
           <link xlink:href="https://github.com/NixOS/nixpkgs/settings/branches">
-            Lock the branch on github (so developers can’t force push)
+            Let a GitHub nixpkgs admin lock the branch on github for you.
+            (so developers can’t force push)
           </link>
         </para>
       </listitem>
       <listitem>
         <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">bump
-          <literal>system.defaultChannel</literal> attribute in
-          <literal>nixos/modules/misc/version.nix</literal></link>
+          <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">
+            Bump the <literal>system.defaultChannel</literal> attribute in
+            <literal>nixos/modules/misc/version.nix</literal>
+          </link>
         </para>
       </listitem>
       <listitem>
         <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06">update
-          <literal>versionSuffix</literal> in
+          <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06">
+            Update <literal>versionSuffix</literal> in
           <literal>nixos/release.nix</literal></link>, use
-          <literal>git log --format=%an|wc -l</literal> to get commit
+          <literal>git log --format=%an|wc -l</literal> to get the commit
           count
         </para>
       </listitem>
       <listitem>
         <para>
-          <literal>echo -n &quot;16.03&quot; &gt; .version</literal> in
+          <literal>echo -n &quot;18.03&quot; &gt; .version</literal> on
           master.
         </para>
       </listitem>
       <listitem>
         <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842">pick
-          a new name for unstable branch.</link>
+          <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842">
+            Pick a new name for the unstable branch.
+          </link>
         </para>
       </listitem>
       <listitem>
@@ -99,26 +102,20 @@
       </listitem>
       <listitem>
         <para>
-          Use https://lwn.net/Vulnerabilities/ and 
-          <link xlink:href="https://github.com/NixOS/nixpkgs/search?utf8=%E2%9C%93&amp;q=vulnerabilities&amp;type=Issues">triage vulnerabilities in an issue</link>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Create two Hydra jobsets: release-15.09 and release-15.09-small with <literal>stableBranch</literal> set to false
+          Create two Hydra jobsets: release-17.09 and release-17.09-small with <literal>stableBranch</literal> set to false.
         </para>
       </listitem>
       <listitem>
         <para>
           Edit changelog at
-          <literal>nixos/doc/manual/release-notes/rl-1509.xml</literal>
+          <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal>
           (double check desktop versions are noted)
         </para>
         <itemizedlist spacing="compact">
           <listitem>
             <para>
               Get all new NixOS modules
-              <literal>git diff release-14.12..release-15.09 nixos/modules/module-list.nix|grep ^+</literal>
+              <literal>git diff release-17.03..release-17.09 nixos/modules/module-list.nix|grep ^+</literal>
             </para>
           </listitem>
           <listitem>
@@ -130,9 +127,25 @@
       </listitem>
     </itemizedlist>
   </section>
+  <section xml:id="during-beta">
+    <title>During Beta</title>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Monitor the master branch for bugfixes and minor updates
+          and cherry-pick them to the release branch.
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
   <section xml:id="before-the-final-release">
     <title>Before the final release</title>
     <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Re-check that the release notes are complete.
+        </para>
+      </listitem>
       <listitem>
         <para>
           Release Nix (currently only Eelco Dolstra can do that).

From 6f2fffef77d585996b2ae5482ad4aa0bdf8d91d8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Aug 2017 22:33:47 +0200
Subject: [PATCH 3072/3246] mbedtls: 2.5.1 -> 2.6.0 for CVE-2017-14032

https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2017-02
---
 pkgs/development/libraries/mbedtls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index b4500c8f6d6..8195ba2d4d6 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-2.5.1";
+  name = "mbedtls-2.6.0";
 
   src = fetchurl {
     url = "https://tls.mbed.org/download/${name}-gpl.tgz";
-    sha256 = "1qny1amp54vn84wp0aaj8zvblad60zcp73pdwgnykn7h0q004bri";
+    sha256 = "042q1l4708zjn5v72sa9qdvgx173kmy4hbcd23wj5vqd6vbmk6d9";
   };
 
   nativeBuildInputs = [ perl ];

From 6a7066eb53685438564dc50362666d0e7f150110 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Aug 2017 22:51:32 +0200
Subject: [PATCH 3073/3246] release documentation: reorder beta steps

---
 nixos/doc/manual/development/releases.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index bcc746a67b7..afcb970ed70 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -34,8 +34,9 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Create a new release notes file for the upcoming release + 1, in this
-          case <literal>rl-1803.xml</literal>.
+          <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create
+            an issue for tracking Zero Hydra Failures progress. ZHF is an effort
+            to get build failures down to zero.</link>
         </para>
       </listitem>
       <listitem>
@@ -95,9 +96,8 @@
       </listitem>
       <listitem>
         <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create
-            an issue for tracking Zero Hydra Failures progress. ZHF is an effort
-            to get build failures down to zero.</link>
+          Create a new release notes file for the upcoming release + 1, in this
+          case <literal>rl-1803.xml</literal>.
         </para>
       </listitem>
       <listitem>

From 5d5be9706eed43cfb9470fffd09cd134f10c2c64 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Aug 2017 23:09:06 +0200
Subject: [PATCH 3074/3246] Impala makes packaging a life-long addiction

Take that recursive acronym, GNU!
---
 .version                                   |  2 +-
 nixos/doc/manual/release-notes/rl-1803.xml | 46 ++++++++++++++++++++++
 nixos/modules/misc/version.nix             |  2 +-
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 nixos/doc/manual/release-notes/rl-1803.xml

diff --git a/.version b/.version
index 2fdad9f4058..a88d2ca3231 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-17.09
+18.03
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
new file mode 100644
index 00000000000..ce05cde7b08
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -0,0 +1,46 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-18.03">
+
+<title>Release 18.03 (“Impala”, 2018/03/??)</title>
+
+<para>In addition to numerous new and upgraded packages, this release
+has the following highlights: </para>
+
+<itemizedlist>
+  <listitem>
+    <para>
+    </para>
+  </listitem>
+</itemizedlist>
+
+<para>The following new services were added since the last release:</para>
+
+<itemizedlist>
+  <listitem>
+    <para></para>
+  </listitem>
+</itemizedlist>
+
+<para>When upgrading from a previous release, please be aware of the
+following incompatible changes:</para>
+
+<itemizedlist>
+  <listitem>
+    <para>
+    </para>
+  </listitem>
+</itemizedlist>
+
+<para>Other notable improvements:</para>
+
+<itemizedlist>
+  <listitem>
+    <para>
+    </para>
+  </listitem>
+</itemizedlist>
+
+</section>
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 315c33a462c..48cde2ebbc8 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -95,7 +95,7 @@ in
       nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
 
       # Note: code names must only increase in alphabetical order.
-      nixosCodeName = "Hummingbird";
+      nixosCodeName = "Impala";
     };
 
     # Generate /etc/os-release.  See

From b09ab584f0f75aa79c187f703d0812cc35c47578 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 30 Aug 2017 23:59:59 +0200
Subject: [PATCH 3075/3246] vidalia: remove

closes #28753
---
 pkgs/tools/security/vidalia/default.nix   | 24 -----------------------
 pkgs/tools/security/vidalia/gcc-4.7.patch | 12 ------------
 pkgs/top-level/all-packages.nix           |  2 --
 3 files changed, 38 deletions(-)
 delete mode 100644 pkgs/tools/security/vidalia/default.nix
 delete mode 100644 pkgs/tools/security/vidalia/gcc-4.7.patch

diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
deleted file mode 100644
index fc1d98806f0..00000000000
--- a/pkgs/tools/security/vidalia/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, doxygen }:
-stdenv.mkDerivation rec {
-
-  name = "vidalia-${version}";
-  version = "0.3.1";
-
-  src = fetchurl {
-    url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz";
-    sha256 = "1mw3wnlh18rj20qjv7jxjk3a8mf75p5wzv358qfs3sm3lqgd68qm";
-  };
-
-  buildInputs = [ cmake qt4 doxygen ];
-
-  patches = [ ./gcc-4.7.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://www.torproject.org/projects/vidalia.html.en;
-    repositories.git = https://git.torproject.org/vidalia;
-    description = "A cross-platform graphical controller for the Tor software, built using the Qt framework";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.phreedom ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/security/vidalia/gcc-4.7.patch b/pkgs/tools/security/vidalia/gcc-4.7.patch
deleted file mode 100644
index 4c163af760c..00000000000
--- a/pkgs/tools/security/vidalia/gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp
---- vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:02:01.901732270 +0200
-+++ vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:03:26.241677875 +0200
-@@ -20,6 +20,8 @@
- 
- #include "Vidalia.h"
- 
-+#include <unistd.h>
-+
- PluginEngine::PluginEngine(QObject *parent)
-   : QScriptEngine(parent)
- {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c059fd61d4c..bb29decfcb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4668,8 +4668,6 @@ with pkgs;
 
   volatility = callPackage ../tools/security/volatility { };
 
-  vidalia = callPackage ../tools/security/vidalia { };
-
   vbetool = callPackage ../tools/system/vbetool { };
 
   vde2 = callPackage ../tools/networking/vde2 { };

From 80319c123876064df40235eb21ab9ddd2d5a241a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 30 Aug 2017 12:25:34 -0400
Subject: [PATCH 3076/3246] terraform: manage 0.10 plugins with Nix

Also add a few starter plugins/providers
---
 .../networking/cluster/terraform/default.nix  | 38 +++++++++++++++++--
 .../cluster/terraform/provider-path.patch     | 16 ++++++++
 .../cluster/terraform/providers/aws.nix       | 16 ++++++++
 .../cluster/terraform/providers/azurerm.nix   | 16 ++++++++
 .../cluster/terraform/providers/google.nix    | 16 ++++++++
 .../terraform/providers/kubernetes.nix        | 16 ++++++++
 6 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/terraform/provider-path.patch
 create mode 100644 pkgs/applications/networking/cluster/terraform/providers/aws.nix
 create mode 100644 pkgs/applications/networking/cluster/terraform/providers/azurerm.nix
 create mode 100644 pkgs/applications/networking/cluster/terraform/providers/google.nix
 create mode 100644 pkgs/applications/networking/cluster/terraform/providers/kubernetes.nix

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8fd76f7df75..efff9282bd3 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchpatch, fetchFromGitHub }:
+{ stdenv, lib, buildEnv, buildGoPackage, fetchpatch, fetchFromGitHub, makeWrapper }:
 
 let
   goPackagePath = "github.com/hashicorp/terraform";
@@ -37,6 +37,36 @@ let
         maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
       };
     } // attrs');
+
+  pluggable = terraform:
+    let
+      withPlugins = plugins: stdenv.mkDerivation {
+        name = "${terraform.name}-with-plugins";
+        buildInputs = [ makeWrapper ];
+
+        buildCommand = ''
+          mkdir -p $out/bin/
+          makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
+            --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = plugins terraform.plugins; }}/bin"
+        '';
+
+        passthru = {
+          withPlugins = newplugins: withPlugins (x: newplugins x ++ plugins x);
+
+          # Ouch
+          overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins;
+          overrideAttrs = f: (pluggable (terraform.overrideAttrs f)).withPlugins plugins;
+          override = x: (pluggable (terraform.override x)).withPlugins plugins;
+        };
+      };
+    in withPlugins (_: []);
+
+  plugins = {
+    aws = import providers/aws.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
+    azurerm = import providers/azurerm.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
+    google = import providers/google.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
+    kubernetes = import providers/kubernetes.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
+  };
 in {
   terraform_0_8_5 = generic {
     version = "0.8.5";
@@ -55,8 +85,10 @@ in {
     doCheck = false;
   };
 
-  terraform_0_10 = generic {
+  terraform_0_10 = pluggable (generic {
     version = "0.10.2";
     sha256 = "1q7za7jcfqv914a3ynfl7hrqbgwcahgm418kivjrac6p1q26w502";
-  };
+    patches = [ ./provider-path.patch ];
+    passthru = { inherit plugins; };
+  });
 }
diff --git a/pkgs/applications/networking/cluster/terraform/provider-path.patch b/pkgs/applications/networking/cluster/terraform/provider-path.patch
new file mode 100644
index 00000000000..39a69e4a389
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/provider-path.patch
@@ -0,0 +1,16 @@
+diff --git a/command/init.go b/command/init.go
+index 403ca245b..05d98329a 100644
+--- a/command/init.go
++++ b/command/init.go
+@@ -64,6 +64,11 @@ func (c *InitCommand) Run(args []string) int {
+ 		return 1
+ 	}
+ 
++	val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
++	if ok {
++		flagPluginPath = append(flagPluginPath, val)
++	}
++
+ 	if len(flagPluginPath) > 0 {
+ 		c.pluginPath = flagPluginPath
+ 		c.getPlugins = false
diff --git a/pkgs/applications/networking/cluster/terraform/providers/aws.nix b/pkgs/applications/networking/cluster/terraform/providers/aws.nix
new file mode 100644
index 00000000000..744c13df329
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/aws.nix
@@ -0,0 +1,16 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "terraform-provider-aws";
+  name = "${pname}-${version}";
+  version = "0.1.4";
+
+  goPackagePath = "github.com/terraform-providers/terraform-provider-aws";
+
+  src = fetchFromGitHub {
+    owner  = "terraform-providers";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform/providers/azurerm.nix b/pkgs/applications/networking/cluster/terraform/providers/azurerm.nix
new file mode 100644
index 00000000000..e6907d1b2aa
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/azurerm.nix
@@ -0,0 +1,16 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "terraform-provider-azurerm";
+  name = "${pname}-${version}";
+  version = "0.1.5";
+
+  goPackagePath = "github.com/terraform-providers/terraform-provider-azurerm";
+
+  src = fetchFromGitHub {
+    owner  = "terraform-providers";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "02g8wnzwaii24nx5iin1yd4bx0rx22ly8aqhwa39mr5hsjj1qy4k";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform/providers/google.nix b/pkgs/applications/networking/cluster/terraform/providers/google.nix
new file mode 100644
index 00000000000..0f8ad21bb13
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/google.nix
@@ -0,0 +1,16 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "terraform-provider-google";
+  name = "${pname}-${version}";
+  version = "0.1.3";
+
+  goPackagePath = "github.com/terraform-providers/terraform-provider-google";
+
+  src = fetchFromGitHub {
+    owner  = "terraform-providers";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform/providers/kubernetes.nix b/pkgs/applications/networking/cluster/terraform/providers/kubernetes.nix
new file mode 100644
index 00000000000..6a8bc8902b6
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/kubernetes.nix
@@ -0,0 +1,16 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "terraform-provider-kubernetes";
+  name = "${pname}-${version}";
+  version = "1.0.0";
+
+  goPackagePath = "github.com/terraform-providers/terraform-provider-kubernetes";
+
+  src = fetchFromGitHub {
+    owner  = "terraform-providers";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "1kh7a83f98v6b4v3zj84ddhrg2hya4nmvrw0mjc26q12g4z2d5g6";
+  };
+}
\ No newline at end of file

From 11753b3273ac492a4efdd44ae98f1969f554b126 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 30 Aug 2017 18:53:14 -0400
Subject: [PATCH 3077/3246] terraform: noop 0.10 plugins mechanism when unused

---
 .../networking/cluster/terraform/default.nix  | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index efff9282bd3..8589eed12bb 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -40,25 +40,35 @@ let
 
   pluggable = terraform:
     let
-      withPlugins = plugins: stdenv.mkDerivation {
-        name = "${terraform.name}-with-plugins";
-        buildInputs = [ makeWrapper ];
+      withPlugins = plugins:
+        let
+          actualPlugins = plugins terraform.plugins;
 
-        buildCommand = ''
-          mkdir -p $out/bin/
-          makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
-            --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = plugins terraform.plugins; }}/bin"
-        '';
+          passthru = {
+            withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);
 
-        passthru = {
-          withPlugins = newplugins: withPlugins (x: newplugins x ++ plugins x);
+            # Ouch
+            overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins;
+            overrideAttrs = f: (pluggable (terraform.overrideAttrs f)).withPlugins plugins;
+            override = x: (pluggable (terraform.override x)).withPlugins plugins;
+          };
+        in
+          # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading
+          # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
+          if actualPlugins == []
+            then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; })
+            else stdenv.mkDerivation {
+              name = "${terraform.name}-with-plugins";
+              buildInputs = [ makeWrapper ];
 
-          # Ouch
-          overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins;
-          overrideAttrs = f: (pluggable (terraform.overrideAttrs f)).withPlugins plugins;
-          override = x: (pluggable (terraform.override x)).withPlugins plugins;
-        };
-      };
+              buildCommand = ''
+                mkdir -p $out/bin/
+                makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
+                  --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin"
+              '';
+
+              inherit passthru;
+            };
     in withPlugins (_: []);
 
   plugins = {

From b35972b3fa4e844accc01a87b5b8d1e6676d16bd Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 31 Aug 2017 01:21:15 +0200
Subject: [PATCH 3078/3246] mpvScripts.convert: fix for mpv >0.26.0

See https://gist.github.com/Zehkul/25ea7ae77b30af959be0#gistcomment-2189556
---
 pkgs/applications/video/mpv/scripts/convert.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/video/mpv/scripts/convert.patch b/pkgs/applications/video/mpv/scripts/convert.patch
index 92d0fae1d50..82171210b41 100644
--- a/pkgs/applications/video/mpv/scripts/convert.patch
+++ b/pkgs/applications/video/mpv/scripts/convert.patch
@@ -11,6 +11,21 @@
  -- default options, convert_script.conf is read
  local options = {
      bitrate_multiplier = 0.975,			-- to make sure the file won’t go over the target file size, set it to 1 if you don’t care
+@@ -247,12 +247,12 @@
+     if string.len(vf) > 0 then
+         vf = vf .. ","
+     end
+-    local sub_file_table = mp.get_property_native("options/sub-file")
++    local sub_file_table = mp.get_property_native("options/sub-files")
+     local sub_file = ""
+     for index, param in pairs(sub_file_table) do
+         sub_file = sub_file .. " --sub-file='" .. string.gsub(tostring(param), "'", "'\\''") .. "'"
+     end
+-    local audio_file_table = mp.get_property_native("options/audio-file")
++    local audio_file_table = mp.get_property_native("options/audio-files")
+     local audio_file = ""
+     for index, param in pairs(audio_file_table) do
+         audio_file = audio_file .. " --audio-file='" .. string.gsub(tostring(param), "'", "'\\''") .. "'"
 @@ -354,9 +358,9 @@
      if ovc == "gif" then
          full_command = full_command .. ' --vf-add=lavfi=graph=\\"framestep=' .. framestep .. '\\" && convert ' 

From 7c7ca7f017ed601c50d98db2f6238914b34b58d0 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dkalinkin@bnl.gov>
Date: Wed, 30 Aug 2017 09:04:45 -0700
Subject: [PATCH 3079/3246] root: add noSplash option

---
 pkgs/applications/science/misc/root/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 86e074dbe5d..b220bb8a80c 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
 , libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lzma, gsl
-, Cocoa, OpenGL }:
+, Cocoa, OpenGL, noSplash ? false }:
 
 stdenv.mkDerivation rec {
   name = "root-${version}";
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     patchShebangs build/unix/
+  '' + stdenv.lib.optionalString noSplash ''
+    substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
   '';
 
   cmakeFlags = [

From af51aa79d2bb8ebedd9c241e7e3be719e3d944ed Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 30 Aug 2017 20:24:36 -0400
Subject: [PATCH 3080/3246] installer: add a comment hinting about enabling
 libinput for touchpads

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 29b447912e7..f15f0861388 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -605,6 +605,9 @@ $bootLoaderConfig
   # services.xserver.layout = "us";
   # services.xserver.xkbOptions = "eurosign:e";
 
+  # Enable touchpad support.
+  # services.xserver.libinput.enable = true;
+
   # Enable the KDE Desktop Environment.
   # services.xserver.displayManager.sddm.enable = true;
   # services.xserver.desktopManager.plasma5.enable = true;

From 1b68193167af1f19502689708223fa16f8e31f50 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 30 Aug 2017 20:25:11 -0400
Subject: [PATCH 3081/3246] profiles/graphical.nix: enable libinput over
 synaptics

---
 nixos/modules/profiles/graphical.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index e2337537518..fe9851e79a6 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -8,7 +8,7 @@
     enable = true;
     displayManager.sddm.enable = true;
     desktopManager.plasma5.enable = true;
-    synaptics.enable = true; # for touchpad support on many laptops
+    libinput.enable = true; # for touchpad support on many laptops
   };
 
   environment.systemPackages = [ pkgs.glxinfo ];

From 9d2777a5a5f861a727d09c3ecdeffd8c72c143b7 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 30 Aug 2017 20:32:45 -0400
Subject: [PATCH 3082/3246] Mark synaptics as deprecated

---
 nixos/doc/manual/release-notes/rl-1709.xml        | 8 ++++++++
 nixos/modules/services/x11/hardware/synaptics.nix | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 91681cc6949..88b28c29118 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -176,6 +176,14 @@ rmdir /var/lib/ipfs/.ipfs
       removed. The system support had been broken for several years.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      Touchpad support should now be enabled through
+      <literal>libinput</literal> as <literal>synaptics</literal> is
+      now deprecated. See the option
+      <literal>services.xserver.libinput.enable</literal>.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 54454c736c1..f032c593885 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -29,7 +29,7 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable touchpad support.";
+        description = "Whether to enable touchpad support. Deprecated: Consider services.xserver.libinput.enable.";
       };
 
       dev = mkOption {

From 7d6c3e877b5d23423adc85cf9d56e9b9c9bc38a1 Mon Sep 17 00:00:00 2001
From: David Pflug <david@tpflug.com>
Date: Wed, 30 Aug 2017 20:50:17 -0400
Subject: [PATCH 3083/3246] milkytracker: 0.90.85 -> 1.01

---
 .../audio/milkytracker/default.nix            | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index f22ccd08a8e..6a71971c5fd 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -1,38 +1,23 @@
-{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, libjack2, perl
-, zlib, zziplib
+{ stdenv, fetchurl, SDL2, alsaLib, cmake, libjack2, perl
+, zlib, zziplib, pkgconfig, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.90.85";
+  version = "1.01";
   name = "milkytracker-${version}";
 
   src = fetchurl {
-    url = "http://milkytracker.org/files/milkytracker-0.90.85.tar.gz";
-    sha256 = "184pk0k9nv461a61sh6lb62wfadjwwk8ri3z5kpdbqnyssz0zfpv";
+    url = "https://github.com/milkytracker/MilkyTracker/archive/v${version}.00.tar.gz";
+    sha256 = "1dvnddsnn9c83lz4dlm0cfjpc0m524amfkbalxbswdy0qc8cj1wv";
   };
 
-  # Get two official patches.
-  no_zzip_patch = fetchurl {
-    url = "http://www.milkytracker.org/files/patches-0.90.85/no_zziplib_dep.patch";
-    sha256 = "1w550q7pxa7w6v2v19ljk03hayacrs6y887izg11a1983wk7qzb3";
-      };
-
-  fix_64bit_patch = fetchurl {
-    url = "http://www.milkytracker.org/files/patches-0.90.85/64bit_freebsd_fix.patch";
-    sha256 = "0gwd4zslbd8kih80k4v7n2c65kvm2cq3kl6d7y33z1l007vzyvf6";
-  };
-
-  patchPhase = ''
-    patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch}
-    patch < ${no_zzip_patch}
-    patch ./src/compression/DecompressorGZIP.cpp < ${./decompressor_gzip.patch}
-  '';
-
   preBuild=''
     export CPATH=${zlib.out}/lib
   '';
 
-  buildInputs = [ SDL alsaLib autoconf automake libjack2 perl zlib zziplib ];
+  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+
+  buildInputs = [ SDL2 alsaLib libjack2 perl zlib zziplib ];
 
   meta = {
     description = "Music tracker application, similar to Fasttracker II";

From 9c501a05a65ed416145c37e9246dea552535dc79 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 30 Aug 2017 20:01:47 -0400
Subject: [PATCH 3084/3246] dia: mark as working on darwin

---
 pkgs/applications/graphics/dia/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 8d8e36a8bc8..34d15b0c464 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     description = "Gnome Diagram drawing software";
     homepage = http://live.gnome.org/Dia;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 42a4aa1e8397acf53cdb71b447f4253b1163f9a1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 30 Aug 2017 21:02:06 -0400
Subject: [PATCH 3085/3246] dia: undo persistence wrapper

The wrapper was introduced as workaround for #1691. The original bug was
present in 0.97.2 but was fixed in 0.97.3.
---
 pkgs/applications/graphics/dia/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 34d15b0c464..1516e8f6e6d 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -11,11 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492";
   };
 
-  correctPersistence = fetchurl {
-    url = https://launchpadlibrarian.net/132677658/persistence;
-    sha256 = "1rv6zv9i03bna4bdp1wzn72lg7kdwi900y1izdq0imibi54nxjsk";
-  };
-
   buildInputs =
     [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
       libxslt docbook_xsl libart_lgpl
@@ -31,14 +26,6 @@ stdenv.mkDerivation rec {
   # It have no reasons to exist in a redistribuable package
   postInstall = ''
     rm $out/share/icons/hicolor/icon-theme.cache
-
-    cd "$out"/bin/
-    mv dia .dia-wrapped
-    echo '#! ${stdenv.shell}' >> dia
-    echo 'test -f "$HOME/.dia/persistence" || cp ${correctPersistence} "$HOME/.dia/persistence" ' >> dia
-    echo 'chmod u+rw "$HOME/.dia/persistence" ' >> dia
-    echo "\"$out/bin/"'.dia-wrapped" "$@"' >> dia
-    chmod a+x dia
   '';
 
   meta = {

From 8efb46b6094170e55c0d1776e77d19d184c7b546 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 30 Aug 2017 21:12:19 -0400
Subject: [PATCH 3086/3246] configuration.nix: Document the stateVersion more

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index f15f0861388..3af76f898f9 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -618,8 +618,11 @@ $bootLoaderConfig
   #   uid = 1000;
   # };
 
-  # The NixOS release to be compatible with for stateful data such as databases.
-  system.stateVersion = "${\(qw(@nixosRelease@))}";
+  # This value determines the NixOS release with which your system is to be
+  # compatible, in order to avoid breaking some software such as database
+  # servers. You should change this only after NixOS release notes say you
+  # should.
+  system.stateVersion = "${\(qw(@nixosRelease@))}"; # Did you read the comment?
 
 }
 EOF

From 6b05ff00e95fc7eb446952468c3c0e677eea73c3 Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Thu, 31 Aug 2017 12:33:12 +1000
Subject: [PATCH 3087/3246] deer: init at 1.4

I wrote the patch. Unfortunately it's Nix specific because upstream
rejected it because Ubuntu Trusty's version of realpath doesn't seem to
have the `--relative-to` option. (Upstream used to use realpath before).
But for Nix, our version of realpath is recent enough. Also, upstream
will probably use realpath again anyway in May 2019 when Ubuntu Trusty
becomes unsupported, so this patch should probably be used.
---
 pkgs/shells/zsh-deer/default.nix    | 36 +++++++++++++++++++++++++++++
 pkgs/shells/zsh-deer/realpath.patch | 28 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 66 insertions(+)
 create mode 100644 pkgs/shells/zsh-deer/default.nix
 create mode 100644 pkgs/shells/zsh-deer/realpath.patch

diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh-deer/default.nix
new file mode 100644
index 00000000000..3f39edfd963
--- /dev/null
+++ b/pkgs/shells/zsh-deer/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, perl }:
+
+let
+  version = "1.4";
+  name = "deer-${version}";
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchFromGitHub {
+    owner = "Vifon";
+    repo = "deer";
+    rev = "v${version}";
+    sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl";
+  };
+
+  prePatch = ''
+    sed -i '157s/perl/'\
+    "$(echo ${perl}/bin/perl | sed 's/\//\\\//g')"'/' \
+    deer
+  '';
+
+  patches = [ ./realpath.patch ];
+
+  installPhase = ''
+    mkdir -p $out/share/zsh/site-functions/
+    cp deer $out/share/zsh/site-functions/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Ranger-like file navigation for zsh";
+    homepage = "https://github.com/Vifon/deer";
+    license = licenses.gpl3Plus;
+    maintainers = maintainers.vyp;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/shells/zsh-deer/realpath.patch b/pkgs/shells/zsh-deer/realpath.patch
new file mode 100644
index 00000000000..03850d7e5c1
--- /dev/null
+++ b/pkgs/shells/zsh-deer/realpath.patch
@@ -0,0 +1,28 @@
+From ceadb2f11119143af4f590ea6b05a531483219b5 Mon Sep 17 00:00:00 2001
+From: xd1le <elisp.vim@gmail.com>
+Date: Wed, 30 Aug 2017 17:27:20 +1000
+Subject: [PATCH] use realpath instead of python to calculate relative path
+
+---
+ deer | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/deer b/deer
+index 3d89dea..804a871 100644
+--- a/deer
++++ b/deer
+@@ -259,10 +259,7 @@ deer-get-relative()
+ {
+     local TMP
+     TMP=${1:-${DEER_DIRNAME%/}/$DEER_BASENAME[$DEER_DIRNAME]}
+-    TMP="`python -c '
+-import sys, os
+-print(os.path.relpath(sys.argv[1], sys.argv[2]))
+-' $TMP ${DEER_STARTDIR:-$PWD}`"
++    TMP="`realpath --relative-to=${DEER_STARTDIR:-$PWD} $TMP`"
+     print -R $TMP:q
+ }
+ 
+-- 
+2.14.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6684d0accd0..937064e5ed7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1597,6 +1597,8 @@ with pkgs;
 
   debootstrap = callPackage ../tools/misc/debootstrap { };
 
+  deer = callPackage ../shells/zsh-deer { };
+
   detox = callPackage ../tools/misc/detox { };
 
   devilspie2 = callPackage ../applications/misc/devilspie2 {

From dd230e33d61aff1faa6b69044a8090e8b1baba34 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 30 Aug 2017 23:48:20 -0300
Subject: [PATCH 3088/3246] mate: organize packages in base and extra

---
 pkgs/desktops/mate/default.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index fd326b6bbbb..2a47e6d9756 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,5 +1,7 @@
 { callPackage, pkgs }:
+
 rec {
+
   atril = callPackage ./atril { };
   caja = callPackage ./caja { };
   caja-extensions = callPackage ./caja-extensions { };
@@ -8,11 +10,30 @@ rec {
   };
   engrampa = callPackage ./engrampa { };
   eom = callPackage ./eom { };
-  pluma = callPackage ./pluma { };
   mate-common = callPackage ./mate-common { };
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
   mate-terminal = callPackage ./mate-terminal { };
   mate-themes = callPackage ./mate-themes { };
+  pluma = callPackage ./pluma { };
+
+  basePackages = [
+    caja
+    mate-common
+    mate-desktop
+    mate-icon-theme
+    mate-themes
+  ];
+
+  extraPackages = [
+    atril
+    cajaWithExtensions
+    engrampa
+    eom
+    mate-icon-theme-faenza
+    mate-terminal
+    pluma
+  ];
+  
 }

From 6c4424efb2b727f127fc09ec64393e63e6d635cc Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 30 Aug 2017 23:49:46 -0300
Subject: [PATCH 3089/3246] mate-desktop: add maintainer

---
 pkgs/desktops/mate/mate-desktop/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 8854580a7ca..eb247efe052 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -11,8 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg";
   };
 
-  propagatedUserEnvPkgs = [
-    gnome3.gnome_themes_standard
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
   ];
 
   buildInputs = [
@@ -21,10 +23,8 @@ stdenv.mkDerivation rec {
     gnome3.defaultIconTheme
   ];
 
-  nativeBuildInputs = [
-    pkgconfig
-    intltool
-    wrapGAppsHook
+  propagatedUserEnvPkgs = [
+    gnome3.gnome_themes_standard
   ];
 
   meta = with stdenv.lib; {
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     homepage = http://mate-desktop.org;
     license = licenses.gpl2;
     platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
   };
 }

From 75d643ee838d455526380ac13a8ccb960e2e340d Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 30 Aug 2017 23:53:16 -0300
Subject: [PATCH 3090/3246] libmatekbd: init at 1.18.2

---
 pkgs/desktops/mate/default.nix            |  2 ++
 pkgs/desktops/mate/libmatekbd/default.nix | 25 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/desktops/mate/libmatekbd/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 2a47e6d9756..1764b32863c 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -10,6 +10,7 @@ rec {
   };
   engrampa = callPackage ./engrampa { };
   eom = callPackage ./eom { };
+  libmatekbd = callPackage ./libmatekbd { };
   mate-common = callPackage ./mate-common { };
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
@@ -20,6 +21,7 @@ rec {
 
   basePackages = [
     caja
+    libmatekbd
     mate-common
     mate-desktop
     mate-icon-theme
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
new file mode 100644
index 00000000000..a02f605b470
--- /dev/null
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }:
+
+stdenv.mkDerivation rec {
+  name = "libmatekbd-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "030bl18qbjm7l92bp1bhs7v82bp8j3mv7c1j1a4gd89iz4611pq3";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ gtk3 libxklavier ];
+
+  meta = with stdenv.lib; {
+    description = "Keyboard management library for MATE";
+    homepage = https://github.com/mate-desktop/libmatekbd;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From 20f3dfd5799be3f175a62c280897634b6d08b2ec Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 30 Aug 2017 23:55:20 -0300
Subject: [PATCH 3091/3246] libmatemixer: init at 1.18.0

---
 pkgs/desktops/mate/default.nix              |  2 ++
 pkgs/desktops/mate/libmatemixer/default.nix | 33 +++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/desktops/mate/libmatemixer/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 1764b32863c..01c3d373d3c 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -11,6 +11,7 @@ rec {
   engrampa = callPackage ./engrampa { };
   eom = callPackage ./eom { };
   libmatekbd = callPackage ./libmatekbd { };
+  libmatemixer = callPackage ./libmatemixer { };
   mate-common = callPackage ./mate-common { };
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
@@ -22,6 +23,7 @@ rec {
   basePackages = [
     caja
     libmatekbd
+    libmatemixer
     mate-common
     mate-desktop
     mate-icon-theme
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
new file mode 100644
index 00000000000..614124f8a0c
--- /dev/null
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib
+, alsaSupport ? stdenv.isLinux, alsaLib
+, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
+, ossSupport ? false
+ }:
+
+stdenv.mkDerivation rec {
+  name = "libmatemixer-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "09vyxnlnalws318gsafdfi5c6jwpp92pbafn1ddlqqds23ihk4mr";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ glib ]
+    ++ stdenv.lib.optional alsaSupport alsaLib
+    ++ stdenv.lib.optional pulseaudioSupport libpulseaudio;
+
+  configureFlags = stdenv.lib.optional ossSupport "--enable-oss";
+
+  meta = with stdenv.lib; {
+    description = "Mixer library for MATE";
+    homepage = https://github.com/mate-desktop/libmatemixer;
+    license = with licenses; [ gpl2 lgpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From dd3703e166ac8a491f269fe88f69ff3ef532673c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 30 Aug 2017 23:56:47 -0300
Subject: [PATCH 3092/3246] libmateweather: init at 1.18.1

---
 pkgs/desktops/mate/default.nix                |  2 ++
 pkgs/desktops/mate/libmateweather/default.nix | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/desktops/mate/libmateweather/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 01c3d373d3c..d02258de590 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -12,6 +12,7 @@ rec {
   eom = callPackage ./eom { };
   libmatekbd = callPackage ./libmatekbd { };
   libmatemixer = callPackage ./libmatemixer { };
+  libmateweather = callPackage ./libmateweather { };
   mate-common = callPackage ./mate-common { };
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
@@ -24,6 +25,7 @@ rec {
     caja
     libmatekbd
     libmatemixer
+    libmateweather
     mate-common
     mate-desktop
     mate-icon-theme
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
new file mode 100644
index 00000000000..aafc0fa9ceb
--- /dev/null
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }:
+
+stdenv.mkDerivation rec {
+  name = "libmateweather-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0z6vfh42fv9rqjrraqfpf6h9nd9h662bxy3l3r48j19xvxrwmx3a";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ gtk3 libsoup tzdata ];
+
+  configureFlags = [
+    "--with-zoneinfo-dir=${tzdata}/share/zoneinfo"
+    "--enable-locations-compression"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Library to access weather information from online services for MATE";
+    homepage = https://github.com/mate-desktop/libmateweather;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From 7e151599f44e265bca18c7620ad9763f63b0f3dc Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 30 Aug 2017 23:59:38 -0300
Subject: [PATCH 3093/3246] mate-menus: init at 1.18.0

---
 pkgs/desktops/mate/default.nix            |  2 ++
 pkgs/desktops/mate/mate-menus/default.nix | 30 +++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/desktops/mate/mate-menus/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index d02258de590..1dca7b4c16f 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -17,6 +17,7 @@ rec {
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
+  mate-menus = callPackage ./mate-menus { };
   mate-terminal = callPackage ./mate-terminal { };
   mate-themes = callPackage ./mate-themes { };
   pluma = callPackage ./pluma { };
@@ -29,6 +30,7 @@ rec {
     mate-common
     mate-desktop
     mate-icon-theme
+    mate-menus
     mate-themes
   ];
 
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
new file mode 100644
index 00000000000..a3da557f2a2
--- /dev/null
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection, python }:
+
+stdenv.mkDerivation rec {
+  name = "mate-menus-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "05kyr37xqv6hm1rlvnqd5ng0x1n883brqynkirkk5drl56axnz7h";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ glib gobjectIntrospection python ];
+
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Menu system for MATE";
+    homepage = https://github.com/mate-desktop/mate-menus;
+    license = with licenses; [ gpl2 lgpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From 7d482d835f9502f521b81aad9f7ec5075c8e9d68 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 Aug 2017 23:00:12 -0400
Subject: [PATCH 3094/3246] openjdk: 8u152-04 -> 8u144-01

Fix GCC6 build
---
 pkgs/development/compilers/openjdk/8.nix | 25 ++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 3355304b3bb..45054a3577d 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -21,42 +21,42 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "152";
-  build = "04";
+  update = "144";
+  build = "01";
   baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "1hnpbx0v89jmbg58ym4zm255da11zf5jq8y5s58zj4x2z6b1fpxi";
+             sha256 = "08b7ia2ifvcl8xnpflf019ak3xcbdjnxcy1mhfp3nbfsbk2sia45";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "060q01msfyspn14c9mkf9x0l8sprki9n8zb3cwlgglhnr2d4gfbr";
+             sha256 = "0g7q6ljvn79psrcak3l4imd27w047ngavn9jcn3xwivg5wppsfks";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "0705667y6llsmszvdcbhbxzbn1csv1f2rlyghwggx5xnaq46dhx6";
+             sha256 = "1hbbzf0m2a78dm8pyvc11jwfpj7q67pvjrp3hf0cnc38k9mzrn8q";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "13f4h43lw9q1292fymn2d7whwvccpkcqraasdhvzf904101xcpsl";
+             sha256 = "1znc0prsb814ggm6qjgbsykm864mwypnxgi9w9f9riq8gs0578gh";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "16wqinqv0aqyf6jg3nsn6rj5s7ggq82wvx86zm584g56011vkgf6";
+             sha256 = "0gx5md1v1jmqhdwcc7smpf46sgp4alvb6jz3n6yjlcyfzk92yi78";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "0japl4nyb8y3w1mpfpkxn5vkf8fap1rg340vjnb6qm6fpqvl964f";
+             sha256 = "0ad9w7gnwlpdssw2p3kfny02mmvzc6z8i2n7qq0177ml48c88iji";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "024zphx9r92ws9xjihvhyrbbbamfl7js0s24ff577v5z5gdb1lly";
+             sha256 = "14yzbbishsyrzmymws6mnndqj6hvs69ivfdbjhgwi0wl23g9siym";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "1crnbjjv1s6ndqpllcrggcpsxvqcnpr58zp51y0hjz3m3gpsxwcq";
+             sha256 = "175q29n4bfmm1cyyga7x58zhh6ann9rm3wibw0scrhgy23lx052x";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";
@@ -100,8 +100,9 @@ let
       substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
     ''
     # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+    # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
     + stdenv.lib.optionalString stdenv.cc.isGNU ''
-      NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks"
+      NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
     '';
 
     configureFlags = [
@@ -246,7 +247,7 @@ let
       homepage = http://openjdk.java.net/;
       license = licenses.gpl2;
       description = "The open-source Java Development Kit";
-      maintainers = with maintainers; [ edwtjo ];
+      maintainers = with maintainers; [ edwtjo nequissimus ];
       platforms = platforms.linux;
     };
 

From 5bbe177b3f781fa024e9404c6aa52ba5b2e10b39 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 00:01:39 -0300
Subject: [PATCH 3095/3246] marco: init at 1.18.1

---
 pkgs/desktops/mate/default.nix       |  2 ++
 pkgs/desktops/mate/marco/default.nix | 37 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/mate/marco/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 1dca7b4c16f..de8efa08966 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -13,6 +13,7 @@ rec {
   libmatekbd = callPackage ./libmatekbd { };
   libmatemixer = callPackage ./libmatemixer { };
   libmateweather = callPackage ./libmateweather { };
+  marco = callPackage ./marco { };
   mate-common = callPackage ./mate-common { };
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
@@ -27,6 +28,7 @@ rec {
     libmatekbd
     libmatemixer
     libmateweather
+    marco
     mate-common
     mate-desktop
     mate-icon-theme
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
new file mode 100644
index 00000000000..1846bccacef
--- /dev/null
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "marco-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0lwbp9wyd66hl5d7g272l8g3k1pb9s4s2p9fb04750a58w87d8k5";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    libxml2
+    libcanberra_gtk3
+    libgtop
+    gnome2.startup_notification
+    gnome3.gtk
+    gnome3.zenity
+  ];
+  
+  meta = with stdenv.lib; {
+    description = "MATE default window manager";
+    homepage = https://github.com/mate-desktop/marco;
+    license = [ licenses.gpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From 8f7d80339a761af6d39e0519ac50428833c0f5cb Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 00:03:41 -0300
Subject: [PATCH 3096/3246] mate-settings-daemon: init at 1.18.1

---
 pkgs/desktops/mate/default.nix                |  2 +
 .../mate/mate-settings-daemon/default.nix     | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/desktops/mate/mate-settings-daemon/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index de8efa08966..10fea9501e8 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -19,6 +19,7 @@ rec {
   mate-icon-theme = callPackage ./mate-icon-theme { };
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
   mate-menus = callPackage ./mate-menus { };
+  mate-settings-daemon = callPackage ./mate-settings-daemon { };
   mate-terminal = callPackage ./mate-terminal { };
   mate-themes = callPackage ./mate-themes { };
   pluma = callPackage ./pluma { };
@@ -33,6 +34,7 @@ rec {
     mate-desktop
     mate-icon-theme
     mate-menus
+    mate-settings-daemon
     mate-themes
   ];
 
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
new file mode 100644
index 00000000000..ffa01d1dba8
--- /dev/null
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus_glib, libxklavier, libcanberra_gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook
+, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
+}:
+
+stdenv.mkDerivation rec {
+  name = "mate-settings-daemon-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "07b2jkxqv07njdrgkdck93d872p6lch1lrvi7ydnpicspg3rfid6";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    dbus_glib
+    libxklavier
+    libcanberra_gtk3
+    libnotify
+    nss
+    polkit
+    gnome3.gtk
+    gnome3.dconf
+    mate.mate-desktop
+    mate.libmatekbd
+    mate.libmatemixer
+  ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio;
+
+  configureFlags = stdenv.lib.optional pulseaudioSupport "--enable-pulse";
+
+  meta = with stdenv.lib; {
+    description = "MATE settings daemon";
+    homepage = https://github.com/mate-desktop/mate-settings-daemon;
+    license = with licenses; [ gpl2 lgpl21 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From c1e18929f0746aa60131f60a6d36bff441715d04 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 00:07:11 -0300
Subject: [PATCH 3097/3246] mate-control-center: init at 1.18.2

---
 pkgs/desktops/mate/default.nix                |  2 +
 .../mate/mate-control-center/default.nix      | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/desktops/mate/mate-control-center/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 10fea9501e8..82d8ca75f46 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -15,6 +15,7 @@ rec {
   libmateweather = callPackage ./libmateweather { };
   marco = callPackage ./marco { };
   mate-common = callPackage ./mate-common { };
+  mate-control-center = callPackage ./mate-control-center { };
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
@@ -31,6 +32,7 @@ rec {
     libmateweather
     marco
     mate-common
+    mate-control-center
     mate-desktop
     mate-icon-theme
     mate-menus
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
new file mode 100644
index 00000000000..ad91069356f
--- /dev/null
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, desktop_file_utils, gnome3, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-control-center-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0flnn0h8f5aqyccwrlv7qxchvr3kqmlfdga6wq28d55zkpv5m7dl";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    desktop_file_utils
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    libxml2
+    dbus_glib
+    libxklavier
+    libcanberra_gtk3
+    gnome3.gtk
+    gnome3.dconf
+    mate.mate-desktop
+    mate.libmatekbd
+    mate.mate-menus
+    mate.marco
+    mate.mate-settings-daemon
+  ];
+
+  configureFlags = "--disable-update-mimedb";
+
+  meta = with stdenv.lib; {
+    description = "Utilities to configure the MATE desktop";
+    homepage = https://github.com/mate-desktop/mate-control-center;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From 25f65c4339f5e1e2104663eeb8b72d6f486b2906 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 00:08:40 -0300
Subject: [PATCH 3098/3246] mate-panel: init at 1.18.4

---
 pkgs/desktops/mate/default.nix            |  2 +
 pkgs/desktops/mate/mate-panel/default.nix | 48 +++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/desktops/mate/mate-panel/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 82d8ca75f46..d1f28b0ff76 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -20,6 +20,7 @@ rec {
   mate-icon-theme = callPackage ./mate-icon-theme { };
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
   mate-menus = callPackage ./mate-menus { };
+  mate-panel = callPackage ./mate-panel { };
   mate-settings-daemon = callPackage ./mate-settings-daemon { };
   mate-terminal = callPackage ./mate-terminal { };
   mate-themes = callPackage ./mate-themes { };
@@ -36,6 +37,7 @@ rec {
     mate-desktop
     mate-icon-theme
     mate-menus
+    mate-panel
     mate-settings-daemon
     mate-themes
   ];
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
new file mode 100644
index 00000000000..cc6fd6c363c
--- /dev/null
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-panel-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "4";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1n565ff1n7jrfx223i3cl3m69wjda506nvbn8gra7m1jwdfzpbw1";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    itstool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib
+    dbus_glib
+    libwnck3
+    librsvg
+    libxml2
+    gnome3.gtk
+    gnome3.dconf
+    mate.libmateweather
+    mate.mate-desktop
+    mate.mate-menus
+  ];
+
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "The MATE panel";
+    homepage = https://github.com/mate-desktop/mate-panel;
+    license = with licenses; [ gpl2 lgpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From 934b9bef41d89c418bd92618e042f0852c7b1336 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 00:10:20 -0300
Subject: [PATCH 3099/3246] mate-session-manager: init at 1.18.1

---
 pkgs/desktops/mate/default.nix                |  2 +
 .../mate/mate-session-manager/default.nix     | 37 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/mate/mate-session-manager/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index d1f28b0ff76..5657f309362 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -21,6 +21,7 @@ rec {
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
   mate-menus = callPackage ./mate-menus { };
   mate-panel = callPackage ./mate-panel { };
+  mate-session-manager = callPackage ./mate-session-manager { };
   mate-settings-daemon = callPackage ./mate-settings-daemon { };
   mate-terminal = callPackage ./mate-terminal { };
   mate-themes = callPackage ./mate-themes { };
@@ -38,6 +39,7 @@ rec {
     mate-icon-theme
     mate-menus
     mate-panel
+    mate-session-manager
     mate-settings-daemon
     mate-themes
   ];
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
new file mode 100644
index 00000000000..316104334ac
--- /dev/null
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-session-manager-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0i0xq6041x2qmb26x9bawx0qpfkgjn6x9w3phnm9s7rc4s0z20ll";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    dbus_glib
+    systemd
+    xtrans
+    xorg.libSM
+    gnome3.gtk3
+    gnome3.gsettings_desktop_schemas
+    mate.mate-desktop
+  ];
+
+  meta = with stdenv.lib; {
+    description = "MATE Desktop session manager";
+    homepage = https://github.com/mate-desktop/mate-session-manager;
+    license = with licenses; [ gpl2 lgpl2 ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From dcebb0668b7e767095b395267fb0a151e588a2ae Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 00:16:51 -0300
Subject: [PATCH 3100/3246] mate: add the MATE desktop environment

---
 .../services/x11/desktop-managers/default.nix |  1 +
 .../services/x11/desktop-managers/mate.nix    | 79 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 nixos/modules/services/x11/desktop-managers/mate.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 4b57d9641f5..13f339e3fbf 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -20,6 +20,7 @@ in
   imports = [
     ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
     ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
+    ./mate.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
new file mode 100644
index 00000000000..239cd772fc2
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -0,0 +1,79 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  # Remove packages of ys from xs, based on their names
+  removePackagesByName = xs: ys:
+    let
+      pkgName = drv: (builtins.parseDrvName drv.name).name;
+      ysNames = map pkgName ys;
+    in
+      filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
+
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.mate;
+
+in
+
+{
+  options = {
+
+    services.xserver.desktopManager.mate.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable the MATE desktop environment";
+    };
+
+    environment.mate.excludePackages = mkOption {
+      default = [];
+      example = literalExample "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]";
+      type = types.listOf types.package;
+      description = "Which MATE packages to exclude from the default environment";
+    };
+
+  };
+
+  config = mkIf (xcfg.enable && cfg.enable) {
+
+    services.xserver.desktopManager.session = singleton {
+      name = "mate";
+      bgSupport = true;
+      start = ''
+        # Set GTK_DATA_PREFIX so that GTK+ can find the themes
+        export GTK_DATA_PREFIX=${config.system.path}
+
+        # Find theme engines
+        export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
+
+        export XDG_MENU_PREFIX=mate
+
+        # Find the mouse
+        export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
+
+        # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
+        ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
+
+        ${pkgs.mate.mate-session-manager}/bin/mate-session &
+        waitPID=$!
+      '';
+    };
+
+    environment.systemPackages =
+      pkgs.mate.basePackages ++
+      (removePackagesByName
+        pkgs.mate.extraPackages
+        config.environment.mate.excludePackages);
+
+    services.dbus.packages = [
+      pkgs.gnome3.dconf
+      pkgs.at_spi2_core
+    ];
+
+    services.gnome3.gnome-keyring.enable = true;
+
+    environment.pathsToLink = [ "/share" ];    
+  };
+
+}

From b29c64c2354e774700bc274d57864a5c864e623b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 31 Aug 2017 11:49:58 +0800
Subject: [PATCH 3101/3246] ledger: requires an older boost

---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb29decfcb7..3c0f07f0f18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7573,10 +7573,12 @@ with pkgs;
 
   boost155 = callPackage ../development/libraries/boost/1.55.nix { };
   boost159 = callPackage ../development/libraries/boost/1.59.nix { };
+  boost15x = boost159;
   boost160 = callPackage ../development/libraries/boost/1.60.nix { };
   boost162 = callPackage ../development/libraries/boost/1.62.nix { };
   boost163 = callPackage ../development/libraries/boost/1.63.nix { };
   boost164 = callPackage ../development/libraries/boost/1.64.nix { };
+  boost16x = boost164;
   boost = boost162;
 
   boost_process = callPackage ../development/libraries/boost-process { };
@@ -15072,7 +15074,9 @@ with pkgs;
   linuxband = callPackage ../applications/audio/linuxband { };
 
   ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { };
-  ledger3 = callPackage ../applications/office/ledger { };
+  ledger3 = callPackage ../applications/office/ledger {
+    boost = boost15x;
+  };
   ledger = ledger3;
   ledger-web = callPackage ../applications/office/ledger-web { };
 

From a2de9c334a5901f57ae41aa134d9fbd83b802fb8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 31 Aug 2017 11:51:10 +0800
Subject: [PATCH 3102/3246] ledger: fixed with older boost

---
 pkgs/applications/office/ledger/default.nix | 32 ++++++++++-----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index a761b9fd5b9..2d66fe4b309 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python
+{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python
 , texinfo, gnused }:
 
-let
-  version = "3.1.1";
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ledger-${version}";
+  version = "3.1.1";
 
-  # NOTE: fetchgit because ledger has submodules not included in the
-  # default github tarball.
-  src = fetchgit {
-    url = "https://github.com/ledger/ledger.git";
-    rev = "refs/tags/v${version}";
+  src = fetchFromGitHub {
+    owner  = "ledger";
+    repo   = "ledger";
+    rev    = "v${version}";
     sha256 = "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp";
+    fetchSubmodules = true;
   };
 
-  buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ];
+  buildInputs = [ boost gmp mpfr libedit python texinfo gnused ];
+
+  nativeBuildInputs = [ cmake ];
 
   enableParallelBuilding = true;
 
@@ -29,10 +28,10 @@ stdenv.mkDerivation {
     cp -v "$src/lisp/"*.el $out/share/emacs/site-lisp/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://ledger-cli.org/;
     description = "A double-entry accounting system with a command-line reporting interface";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
 
     longDescription = ''
       Ledger is a powerful, double-entry accounting system that is accessed
@@ -41,8 +40,7 @@ stdenv.mkDerivation {
       their data, there really is no alternative.
     '';
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny jwiegley ];
-    broken = true;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ the-kenny jwiegley ];
   };
 }

From 39a982dc3ecc398f01c9ab382e842873b58e9f4b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 30 Aug 2017 21:14:45 -0700
Subject: [PATCH 3103/3246] nixos/calibre-server: fix ExecStart call

calibre-server changed the way you specify the library from using
--with-library to just allowing the directory to be specified. See
https://manual.calibre-ebook.com/generated/en/calibre-server.html for
details.
---
 nixos/modules/services/misc/calibre-server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix
index a920aa22ccd..6b19f780ec0 100644
--- a/nixos/modules/services/misc/calibre-server.nix
+++ b/nixos/modules/services/misc/calibre-server.nix
@@ -42,7 +42,7 @@ in
         serviceConfig = {
           User = "calibre-server";
           Restart = "always";
-          ExecStart = "${pkgs.calibre}/bin/calibre-server --with-library=${cfg.libraryDir}";
+          ExecStart = "${pkgs.calibre}/bin/calibre-server ${cfg.libraryDir}";
         };
 
       };

From 6d988e5e568d0804083d1faff2e367348d9a1072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 31 Aug 2017 07:05:18 +0100
Subject: [PATCH 3104/3246] deer: simpler perl patch

---
 pkgs/shells/zsh-deer/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh-deer/default.nix
index 3f39edfd963..3fa941c08c3 100644
--- a/pkgs/shells/zsh-deer/default.nix
+++ b/pkgs/shells/zsh-deer/default.nix
@@ -14,9 +14,8 @@ in stdenv.mkDerivation {
   };
 
   prePatch = ''
-    sed -i '157s/perl/'\
-    "$(echo ${perl}/bin/perl | sed 's/\//\\\//g')"'/' \
-    deer
+    substituteInPlace deer \
+      --replace " perl " " ${perl}/bin/perl "
   '';
 
   patches = [ ./realpath.patch ];

From 3383f2f4ccca0dd2a60e27dcfacc3c9d8dddfe32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 31 Aug 2017 07:28:54 +0100
Subject: [PATCH 3105/3246] nodePackages.serve: init at 6.0.6

fixes #28778
---
 .../node-packages/node-packages-v4.nix        |  10 +-
 .../node-packages/node-packages-v6.json       |   1 +
 .../node-packages/node-packages-v6.nix        | 429 ++++++++++++++++--
 3 files changed, 388 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 24afa7b97e1..bed5381fa48 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -4954,13 +4954,13 @@ let
         sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
-    "supports-color-4.2.1" = {
+    "supports-color-4.3.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.2.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
-        sha512 = "1ldz0jkrkclywnr7gwh85p6kljs5rm4jczbpj55vb9w5c81iyrf1ahgkw88nnzahgw2xvlg041vqk7gynxkwcqkzfagxjpphsrdh75b";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.3.0.tgz";
+        sha512 = "3zlrvz89lkcf45xbbwx5lx216ics9xnmn7jg3rwlwfh6q2wrpd08xys3jj70c4qi6ipapd19n4brkz3nvzxi8fdlqj56rp0hd8vrzv1";
       };
     };
     "color-convert-1.9.0" = {
@@ -8276,7 +8276,7 @@ in
                     ];
                   })
                   sources."escape-string-regexp-1.0.5"
-                  (sources."supports-color-4.2.1" // {
+                  (sources."supports-color-4.3.0" // {
                     dependencies = [
                       sources."has-flag-2.0.0"
                     ];
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 8611155d291..69639cdcbc8 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -65,6 +65,7 @@
 , "react-tools"
 , "s3http"
 , "semver"
+, "serve"
 , "sinopia"
 , "sloc"
 , "smartdc"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index ab0a93c9b14..66175d76825 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1003,22 +1003,22 @@ let
         sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
       };
     };
-    "ms-rest-2.2.1" = {
+    "ms-rest-2.2.2" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.1.tgz";
-        sha1 = "652f09dee89c115e5b672bd3de4d16dcc7961377";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.2.tgz";
+        sha1 = "be191c4fbdff2e208bda440933436af80e7425b9";
       };
     };
-    "ms-rest-azure-2.2.3" = {
+    "ms-rest-azure-2.3.0" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "2.2.3";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.3.tgz";
-        sha1 = "a11fc443b276ee26adbd159b2c5b2107d6197266";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.3.0.tgz";
+        sha1 = "526b4c39a3c02e50913b92787a9e95ce833b37f1";
       };
     };
     "node-forge-0.6.23" = {
@@ -1615,31 +1615,31 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "@types/node-7.0.43" = {
+    "@types/node-8.0.26" = {
       name = "@types/node";
       packageName = "@types/node";
-      version = "7.0.43";
+      version = "8.0.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz";
-        sha512 = "22wrl2iy2njl5la57vh56b83bq9nabk9cx88vq7ic0m85v7daw0y73bj60ypvsjjgaq4l0hip968p3dlhv2gzbzpibrldn70z1iiizf";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.0.26.tgz";
+        sha512 = "3lics7p4hn35w65a53z0awaigy1livzwsjkngc1xg2v97i9aqy6fxp2z0lbv6msbsrww26658703fnch9wf0d11kpfwhpkqq388vcn1";
       };
     };
-    "@types/request-0.0.45" = {
+    "@types/request-2.0.3" = {
       name = "@types/request";
       packageName = "@types/request";
-      version = "0.0.45";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-0.0.45.tgz";
-        sha512 = "37apdgz29nhb3cpz9l2m1j1vj646727yzrk6ch66ji4yz0al4529gp3zlwdqcsi2w1kw43n2jsr2jq4vs9n7i4qgklrkwpr6h9130iq";
+        url = "https://registry.npmjs.org/@types/request/-/request-2.0.3.tgz";
+        sha512 = "3q87vjfkg7p6mwr6yn9y7f6c87klvd81wqi7vq86cn5cvfd4j3i1pvykjc1qhp4jmggl54a2r5zxcbv5qk0psg1w021qis0ak4fg2vh";
       };
     };
-    "@types/uuid-2.0.30" = {
+    "@types/uuid-3.4.1" = {
       name = "@types/uuid";
       packageName = "@types/uuid";
-      version = "2.0.30";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz";
-        sha512 = "117asm25fci0i0w2igvz0mxydd0m4vsz1l55kibx36d19j8md4s9fmvispcy83m7zlf9w9s4di7v0j8rawnyn67xci916gn0b88jr4y";
+        url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.1.tgz";
+        sha512 = "239r06f02p00ccim76bz20flxdmvkxgb2c1q2lp7nbac2whxnmwr21g3mik6c2rz03qy6sr6n9q577f61dvlbzhq6nzg6xsn9w6i0pv";
       };
     };
     "is-stream-1.1.0" = {
@@ -9872,13 +9872,13 @@ let
         sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
-    "supports-color-4.2.1" = {
+    "supports-color-4.3.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.2.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz";
-        sha512 = "1ldz0jkrkclywnr7gwh85p6kljs5rm4jczbpj55vb9w5c81iyrf1ahgkw88nnzahgw2xvlg041vqk7gynxkwcqkzfagxjpphsrdh75b";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.3.0.tgz";
+        sha512 = "3zlrvz89lkcf45xbbwx5lx216ics9xnmn7jg3rwlwfh6q2wrpd08xys3jj70c4qi6ipapd19n4brkz3nvzxi8fdlqj56rp0hd8vrzv1";
       };
     };
     "color-convert-1.9.0" = {
@@ -15120,13 +15120,13 @@ let
         sha1 = "d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc";
       };
     };
-    "parse-github-repo-url-1.4.0" = {
+    "parse-github-repo-url-1.4.1" = {
       name = "parse-github-repo-url";
       packageName = "parse-github-repo-url";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz";
-        sha1 = "286c53e2c9962e0641649ee3ac9508fca4dd959c";
+        url = "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz";
+        sha1 = "9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50";
       };
     };
     "dargs-4.1.0" = {
@@ -20291,6 +20291,123 @@ let
         sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
       };
     };
+    "args-3.0.4" = {
+      name = "args";
+      packageName = "args";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/args/-/args-3.0.4.tgz";
+        sha512 = "2441a84bwxxm0zcn133ngf0aj1f8jidgfsvm40wa8ap98lkzyzv8fppfsl1dhxpni70mpgl8yik9anc2vrgh1n1immkhw3z6727r9ll";
+      };
+    };
+    "chalk-2.0.1" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz";
+        sha512 = "398mvhli8dvcn53xaqllyjzp19z8gh3j75fvp4gv5njnnkhsikx3byfb6lx432pl0073hn75prc8gb0ysbf65bnzlcbq5iy89f8b7rj";
+      };
+    };
+    "dargs-5.1.0" = {
+      name = "dargs";
+      packageName = "dargs";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz";
+        sha1 = "ec7ea50c78564cd36c9d5ec18f66329fade27829";
+      };
+    };
+    "detect-port-1.2.1" = {
+      name = "detect-port";
+      packageName = "detect-port";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-port/-/detect-port-1.2.1.tgz";
+        sha512 = "0r0mpkpa1r78cmagyv47v38fc8ik7pr3zvlnqg57v8nkh4ipd83rla5s1j2c8gymfbwzzlna6pp7h9xw94h93gic3l2z9hzpd68p9fq";
+      };
+    };
+    "filesize-3.5.10" = {
+      name = "filesize";
+      packageName = "filesize";
+      version = "3.5.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/filesize/-/filesize-3.5.10.tgz";
+        sha1 = "fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f";
+      };
+    };
+    "micro-8.0.1" = {
+      name = "micro";
+      packageName = "micro";
+      version = "8.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/micro/-/micro-8.0.1.tgz";
+        sha512 = "3fbrk4yxb1bj097n2w8iqapyq5znp13p8lgc3kd6h53aakpp52779qicbfzd89dva5yj5pinb9swf92j8k5ksl82llahc0y8kg45q1z";
+      };
+    };
+    "micro-compress-1.0.0" = {
+      name = "micro-compress";
+      packageName = "micro-compress";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz";
+        sha1 = "53f5a80b4ad0320ca165a559b6e3df145d4f704f";
+      };
+    };
+    "node-version-1.1.0" = {
+      name = "node-version";
+      packageName = "node-version";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz";
+        sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp";
+      };
+    };
+    "path-type-3.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz";
+        sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg";
+      };
+    };
+    "pkginfo-0.4.0" = {
+      name = "pkginfo";
+      packageName = "pkginfo";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz";
+        sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65";
+      };
+    };
+    "address-1.0.3" = {
+      name = "address";
+      packageName = "address";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz";
+        sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng";
+      };
+    };
+    "mri-1.1.0" = {
+      name = "mri";
+      packageName = "mri";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz";
+        sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a";
+      };
+    };
+    "pify-3.0.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
+        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+      };
+    };
     "express-5.0.0-alpha.5" = {
       name = "express";
       packageName = "express";
@@ -22488,8 +22605,8 @@ in
         ];
       })
       sources."moment-2.18.1"
-      sources."ms-rest-2.2.1"
-      (sources."ms-rest-azure-2.2.3" // {
+      sources."ms-rest-2.2.2"
+      (sources."ms-rest-azure-2.3.0" // {
         dependencies = [
           sources."async-0.2.7"
         ];
@@ -22589,9 +22706,9 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
-      sources."@types/node-7.0.43"
-      sources."@types/request-0.0.45"
-      sources."@types/uuid-2.0.30"
+      sources."@types/node-8.0.26"
+      sources."@types/request-2.0.3"
+      sources."@types/uuid-3.4.1"
       sources."is-buffer-1.1.5"
       sources."is-stream-1.1.0"
       sources."@types/form-data-2.2.0"
@@ -24531,7 +24648,7 @@ in
         dependencies = [
           sources."chalk-2.1.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
+          sources."supports-color-4.3.0"
         ];
       })
       sources."ink-text-input-1.1.0"
@@ -24767,7 +24884,7 @@ in
       (sources."chalk-2.1.0" // {
         dependencies = [
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
+          sources."supports-color-4.3.0"
         ];
       })
       sources."concat-stream-1.6.0"
@@ -24940,7 +25057,7 @@ in
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
+          sources."supports-color-4.3.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -24978,7 +25095,7 @@ in
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
+          sources."supports-color-4.3.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -26279,7 +26396,7 @@ in
       sources."type-detect-4.0.3"
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.2.1"
+      sources."supports-color-4.3.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -27441,7 +27558,7 @@ in
       })
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.2.1"
+      sources."supports-color-4.3.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -27540,7 +27657,7 @@ in
       sources."jsonparse-1.3.1"
       sources."text-extensions-1.5.0"
       sources."get-stdin-4.0.1"
-      sources."parse-github-repo-url-1.4.0"
+      sources."parse-github-repo-url-1.4.1"
       sources."hosted-git-info-2.5.0"
       sources."dargs-4.1.0"
       sources."lodash.template-4.4.0"
@@ -30235,7 +30352,7 @@ in
       })
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.2.1"
+      sources."supports-color-4.3.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -30530,7 +30647,7 @@ in
           sources."camelcase-4.1.0"
           sources."string-width-2.1.1"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
+          sources."supports-color-4.3.0"
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -32443,6 +32560,224 @@ in
     };
     production = true;
   };
+  serve = nodeEnv.buildNodePackage {
+    name = "serve";
+    packageName = "serve";
+    version = "6.0.6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/serve/-/serve-6.0.6.tgz";
+      sha512 = "1r8g02k4ab6rr6mbh0pib7wg2q08nmydkz5mgvg5mjlq41q7cqi3gsxw85d9qw891rmrhx66zm0h7m85y7mldp3b7nhqqgmqblsl9h2";
+    };
+    dependencies = [
+      sources."args-3.0.4"
+      sources."basic-auth-1.1.0"
+      sources."bluebird-3.5.0"
+      sources."boxen-1.2.1"
+      sources."chalk-2.0.1"
+      (sources."clipboardy-1.1.4" // {
+        dependencies = [
+          sources."execa-0.6.3"
+        ];
+      })
+      sources."dargs-5.1.0"
+      sources."detect-port-1.2.1"
+      sources."filesize-3.5.10"
+      sources."fs-extra-4.0.1"
+      sources."handlebars-4.0.10"
+      sources."ip-1.1.5"
+      sources."micro-8.0.1"
+      sources."micro-compress-1.0.0"
+      (sources."mime-types-2.1.16" // {
+        dependencies = [
+          sources."mime-db-1.29.0"
+        ];
+      })
+      sources."node-version-1.1.0"
+      sources."opn-5.1.0"
+      sources."path-type-3.0.0"
+      (sources."send-0.15.3" // {
+        dependencies = [
+          sources."debug-2.6.7"
+        ];
+      })
+      (sources."update-notifier-2.2.0" // {
+        dependencies = [
+          sources."chalk-1.1.3"
+          sources."ansi-styles-2.2.1"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."camelcase-4.1.0"
+      sources."minimist-1.2.0"
+      sources."pkginfo-0.4.0"
+      sources."string-similarity-1.2.0"
+      sources."lodash-4.17.4"
+      sources."ansi-align-2.0.0"
+      sources."cli-boxes-1.0.0"
+      sources."string-width-2.1.1"
+      sources."term-size-1.2.0"
+      (sources."widest-line-1.0.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."strip-ansi-3.0.1"
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."strip-ansi-4.0.0"
+      sources."ansi-regex-3.0.0"
+      sources."execa-0.7.0"
+      sources."cross-spawn-5.1.0"
+      sources."get-stream-3.0.0"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."strip-eof-1.0.0"
+      sources."lru-cache-4.1.1"
+      sources."shebang-command-1.2.0"
+      sources."which-1.3.0"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
+      sources."isexe-2.0.0"
+      sources."path-key-2.0.1"
+      sources."code-point-at-1.1.0"
+      sources."number-is-nan-1.0.1"
+      sources."ansi-styles-3.2.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."supports-color-4.3.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.3"
+      sources."has-flag-2.0.0"
+      sources."address-1.0.3"
+      sources."debug-2.6.8"
+      sources."ms-2.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."jsonfile-3.0.1"
+      sources."universalify-0.1.1"
+      sources."async-1.5.2"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."minimist-0.0.10"
+        ];
+      })
+      sources."source-map-0.4.4"
+      (sources."uglify-js-2.8.29" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
+      sources."wordwrap-0.0.3"
+      sources."amdefine-1.0.1"
+      (sources."yargs-3.10.0" // {
+        dependencies = [
+          sources."camelcase-1.2.1"
+        ];
+      })
+      sources."uglify-to-browserify-1.0.2"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      sources."window-size-0.1.0"
+      sources."center-align-0.1.3"
+      sources."right-align-0.1.3"
+      sources."align-text-0.1.4"
+      sources."lazy-cache-1.0.4"
+      sources."kind-of-3.2.2"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.5"
+      sources."media-typer-0.3.0"
+      sources."mri-1.1.0"
+      sources."raw-body-2.2.0"
+      sources."bytes-2.4.0"
+      sources."iconv-lite-0.4.15"
+      sources."unpipe-1.0.0"
+      (sources."compression-1.7.0" // {
+        dependencies = [
+          sources."bytes-2.5.0"
+        ];
+      })
+      sources."accepts-1.3.4"
+      sources."compressible-2.0.11"
+      sources."on-headers-1.0.1"
+      sources."safe-buffer-5.1.1"
+      sources."vary-1.1.1"
+      sources."negotiator-0.6.1"
+      sources."mime-db-1.30.0"
+      sources."is-wsl-1.1.0"
+      sources."pify-3.0.0"
+      sources."depd-1.1.1"
+      sources."destroy-1.0.4"
+      sources."encodeurl-1.0.1"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.0"
+      sources."fresh-0.5.0"
+      sources."http-errors-1.6.2"
+      sources."mime-1.3.4"
+      sources."on-finished-2.3.0"
+      sources."range-parser-1.2.0"
+      sources."statuses-1.3.1"
+      sources."inherits-2.0.3"
+      sources."setprototypeof-1.0.3"
+      sources."ee-first-1.1.1"
+      sources."configstore-3.1.1"
+      sources."import-lazy-2.1.0"
+      sources."is-npm-1.0.0"
+      sources."latest-version-3.1.0"
+      sources."semver-diff-2.1.0"
+      sources."xdg-basedir-3.0.0"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."dot-prop-4.2.0"
+      (sources."make-dir-1.0.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
+      sources."unique-string-1.0.0"
+      sources."write-file-atomic-2.3.0"
+      sources."is-obj-1.0.1"
+      sources."crypto-random-string-1.0.0"
+      sources."imurmurhash-0.1.4"
+      sources."package-json-4.0.1"
+      sources."got-6.7.1"
+      sources."registry-auth-token-3.3.1"
+      sources."registry-url-3.1.0"
+      sources."semver-5.4.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."timed-out-4.0.1"
+      sources."unzip-response-2.0.1"
+      sources."url-parse-lax-1.0.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."prepend-http-1.0.4"
+      sources."rc-1.2.1"
+      sources."deep-extend-0.4.2"
+      sources."ini-1.3.4"
+      sources."strip-json-comments-2.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Static file serving and directory listing";
+      homepage = "https://github.com/zeit/serve#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
   sinopia = nodeEnv.buildNodePackage {
     name = "sinopia";
     packageName = "sinopia";
@@ -33646,7 +33981,7 @@ in
       sources."widest-line-1.0.0"
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.2.1"
+      sources."supports-color-4.3.0"
       sources."has-flag-2.0.0"
       sources."execa-0.7.0"
       (sources."cross-spawn-5.1.0" // {
@@ -33984,7 +34319,7 @@ in
         ];
       })
       sources."source-map-0.5.7"
-      sources."supports-color-4.2.1"
+      sources."supports-color-4.3.0"
       sources."tapable-0.2.8"
       sources."uglifyjs-webpack-plugin-0.4.6"
       sources."watchpack-1.4.0"
@@ -34398,7 +34733,7 @@ in
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
+          sources."supports-color-4.3.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -34646,7 +34981,7 @@ in
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
+          sources."supports-color-4.3.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -35008,7 +35343,7 @@ in
           sources."camelcase-4.1.0"
           sources."chalk-2.1.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.2.1"
+          sources."supports-color-4.3.0"
         ];
       })
       sources."import-lazy-2.1.0"

From 13d628d2d39fa2eb83997d877c37b99d31aeafd0 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 30 Aug 2017 21:04:07 -0400
Subject: [PATCH 3106/3246] dia: 0.97.3 -> 0.97.3.20170622

---
 pkgs/applications/graphics/dia/default.nix | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 1516e8f6e6d..73362588a57 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,26 +1,32 @@
-{stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext
-, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
-, withGNOME ? false, libgnomeui }:
+{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
+perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
+libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
+gtk-mac-integration }:
 
 stdenv.mkDerivation rec {
-  name = "dia-${minVer}.3";
-  minVer = "0.97";
+  name = "dia-${version}";
+  version = "0.97.3.20170622";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/dia/${minVer}/${name}.tar.xz";
-    sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492";
+  src = fetchgit {
+    url = git://git.gnome.org/dia;
+    rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c";
+    sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";
   };
 
   buildInputs =
     [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
-      libxslt docbook_xsl libart_lgpl
-    ] ++ stdenv.lib.optional withGNOME libgnomeui;
+      libxslt docbook_xsl libart_lgpl ]
+      ++ stdenv.lib.optional withGNOME libgnomeui
+      ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration;
 
-  nativeBuildInputs = [ pkgconfig intltool perl ];
+  nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
 
+  preConfigure = ''
+    NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough
+  '';
   configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
 
-  patches = [ ];
+  hardeningDisable = [ "format" ];
 
   # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
   # It have no reasons to exist in a redistribuable package

From 43755fcf71e7c2beb0bdb711037dffa6cc61dbba Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 31 Aug 2017 08:57:55 +0200
Subject: [PATCH 3107/3246] unifont: 10.0.04 -> 10.0.06

---
 pkgs/data/fonts/unifont/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 4d9f3fc7104..29d5060d401 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 = "10.0.04";
+  version = "10.0.06";
 
   ttf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.ttf";
-    sha256 = "0qp9zf8cx86syr8wl2z8yxlr5r83n156744ylzc0cg3rlmkx6r22";
+    sha256 = "1h4scl4l6503n8ghzd35dxfbai773csjrgdziqm86334zdj9g6k6";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
-    sha256 = "1mj2np6j4jdbfnl0i3zlpg95ic9zq8bhvz8wf3pxkc85zmnk6w62";
+    sha256 = "0ypkmwyfrsnag69h1c0mx89ranz4f6jc9y1sqkpq2rbzg64maik0";
   };
 
   buildInputs = [ mkfontscale mkfontdir ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "1s7gpxxj760aw3rpk760s3w8qdkn819rs7si1qj4grm3s6hb2gd8";
+  outputHash = "1qz7qr6lrwcn47vn0hbbgqnhz3agdl7q7x4l4yd5ard0idv3jj98";
 
   meta = with stdenv.lib; {
     description = "Unicode font for Base Multilingual Plane";

From 8763330fff0f7bc3d806aadab76a80cc28b9525d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 31 Aug 2017 09:09:23 +0200
Subject: [PATCH 3108/3246] perl-Data-FormValidator: 4.85 -> 4.88

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f87fab44677..7cf4c445192 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2975,10 +2975,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DataFormValidator = buildPerlPackage rec {
-    name = "Data-FormValidator-4.85";
+    name = "Data-FormValidator-4.88";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DF/DFARRELL/${name}.tar.gz";
-      sha256 = "809f15d05434ff5667c3967e71e86308fcfad8fce1057420bd2714300b2a5870";
+      sha256 = "c1a539f91c92cbcd8a8d83597ec9a7643fcd8ccf5a94e15382c3765289170066";
     };
     propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes RegexpCommon ];
     meta = {

From d9ae1b408abc521e3ca76d7f85bd7813332fd600 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 31 Aug 2017 10:07:18 +0200
Subject: [PATCH 3109/3246] mysql-workbench: fix build with gcc6

---
 pkgs/applications/misc/mysql-workbench/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index b9fcd1a7f15..9ab12367903 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka";
   };
 
-  buildInputs = [ cmake pkgconfig glibc gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo
+  buildInputs = [ cmake pkgconfig gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo
     paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file
     libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf
     automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl

From dbba364f64aab825937c95df411a1ebc2d9c6f4b Mon Sep 17 00:00:00 2001
From: Valentin Robert <valentin.robert.42@gmail.com>
Date: Thu, 31 Aug 2017 01:26:06 -0700
Subject: [PATCH 3110/3246] nerdfonts: 1.0.0 -> 1.1.0

---
 pkgs/data/fonts/nerdfonts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index 4b725cbf5f8..6b1ebfd68d0 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 = "1.0.0";
+  version = "1.1.0";
   name = "nerdfonts-${version}";
   src = fetchFromGitHub {
     owner = "ryanoasis";
     repo = "nerd-fonts";
     rev = version;
-    sha256 = "1kz4hhshi3lsaja20kg258jc220q1b6nhwiyv0w433m0kvsgzdqd";
+    sha256 = "0h12d33wnhs5w8r3h1gqil98442vf7a13ms3nwldsam4naapsqxz";
   };
   dontPatchShebangs = true;
   buildInputs = [ which ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0bxna3llj6kf1rndvkw8w81blmgwy9l8kricynlf0l3mdd6li1f4";
+  outputHash = "1f3qvzl7blqddx3cm2sdml7hi8s56yjc0vqhfajndxr5ybz6g1rw";
 
   meta = with stdenv.lib; {
     description = ''

From 90ef2183f79ff2472d76994693bafafbb83b0089 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Thu, 13 Jul 2017 23:43:48 +0200
Subject: [PATCH 3111/3246] grub module: assume /nix/store is a bind mount even
 if it is not read only

Fixes #14999
---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 1edb9e0d229..82b5bcda921 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -121,8 +121,8 @@ sub GetFs {
         my $device = $fields[$n + 1];
         my @superOptions = split /,/, $fields[$n + 2];
 
-        # Skip the read-only bind-mount on /nix/store.
-        next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions) && (grep { $_ eq "ro" } @mountOptions);
+        # Skip the bind-mount on /nix/store.
+        next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions);
         # Skip mount point generated by systemd-efi-boot-generator?
         next if $fsType eq "autofs";
 

From 79954b9d1f65737b904e232ebc6a5583a597daec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 31 Aug 2017 11:00:09 +0200
Subject: [PATCH 3112/3246] nix: 1.11.13 -> 1.11.14

---
 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 4568a20e778..62c292eea6d 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/avwiw7hb1qckag864sc6ixfxr8qmf94w-nix-1.11.13";
-  i686-linux = "/nix/store/8wv3ms0afw95hzsz4lxzv0nj4w3614z9-nix-1.11.13";
-  x86_64-darwin = "/nix/store/z21lvakv1l7lhasmv5fvaz8mlzxia8k9-nix-1.11.13";
+  x86_64-linux = "/nix/store/xrqssm90gsrnqdn79rpfcs6dwx8597d2-nix-1.11.14";
+  i686-linux = "/nix/store/3vjphivqs2iy6m9yb3bd80nd3518510k-nix-1.11.14";
+  x86_64-darwin = "/nix/store/4j9jacx8mjd4jlj53wvymyhxq7dqyj5d-nix-1.11.14";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 6b252e9fe00..3d0c8909177 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -152,10 +152,10 @@ in rec {
   nix = nixStable;
 
   nixStable = (common rec {
-    name = "nix-1.11.13";
+    name = "nix-1.11.14";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913";
+      sha256 = "26593c831addf1d40f6b7d131f394cb0f9fbec9e46471369faed16eaa2c4b7e4";
     };
   }) // { perl-bindings = nixStable; };
 

From d22c1c07196520c70c054e9dc127a37ce125a0d1 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Sat, 20 May 2017 23:57:07 +0200
Subject: [PATCH 3113/3246] mysql service: Make initialDatabases.schema
 attribute optional

---
 nixos/modules/services/databases/mysql.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 6027f109285..50766093307 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -108,10 +108,13 @@ in
 
       initialDatabases = mkOption {
         default = [];
-        description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
+        description = ''
+          List of database names and their initial schemas that should be used to create databases on the first startup
+          of MySQL. The schema attribute is optional: If not specified, an empty database is created.
+        '';
         example = [
           { name = "foodatabase"; schema = literalExample "./foodatabase.sql"; }
-          { name = "bardatabase"; schema = literalExample "./bardatabase.sql"; }
+          { name = "bardatabase"; }
         ];
       };
 
@@ -247,6 +250,8 @@ in
                     if ! test -e "${cfg.dataDir}/${database.name}"; then
                         echo "Creating initial database: ${database.name}"
                         ( echo "create database ${database.name};"
+
+                          ${optionalString (database ? "schema") ''
                           echo "use ${database.name};"
 
                           if [ -f "${database.schema}" ]
@@ -256,6 +261,7 @@ in
                           then
                               cat ${database.schema}/mysql-databases/*.sql
                           fi
+                          ''}
                         ) | ${mysql}/bin/mysql -u root -N
                     fi
                   '') cfg.initialDatabases}

From f5dd3b71e80c6f1193ecac6524a38bce0b7808ca Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 31 Aug 2017 11:29:28 +0200
Subject: [PATCH 3114/3246] luaffi: init at 2013-11-08

---
 pkgs/development/libraries/luaffi/default.nix | 30 +++++++++++++++++++
 .../libraries/luaffi/makefile-errors.patch    | 13 ++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/libraries/luaffi/default.nix
 create mode 100644 pkgs/development/libraries/luaffi/makefile-errors.patch

diff --git a/pkgs/development/libraries/luaffi/default.nix b/pkgs/development/libraries/luaffi/default.nix
new file mode 100644
index 00000000000..38dfba4c462
--- /dev/null
+++ b/pkgs/development/libraries/luaffi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, lua, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "luaffi-2013-11-08";
+  src = fetchFromGitHub {
+    owner = "jmckaskill";
+    repo = "luaffi";
+    rev = "abc638c9341025580099dcf77795c4b320ba0e63";
+    sha256 = "1hv1y9i66p473hfy36nqj220sfrxdmbd75c1gpjvpk8073vx55ac";
+  };
+
+  buildInputs = [ lua pkgconfig ];
+
+  patches = [
+    ./makefile-errors.patch
+  ];
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp ffi.so $out/lib/ffi.so
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Standalone FFI library for calling C functions from lua. Compatible with the luajit FFI interface.";
+    homepage = https://github.com/jmckaskill/luaffi;
+    maintainers = with maintainers; [ ma27 ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/luaffi/makefile-errors.patch b/pkgs/development/libraries/luaffi/makefile-errors.patch
new file mode 100644
index 00000000000..0ee6e639006
--- /dev/null
+++ b/pkgs/development/libraries/luaffi/makefile-errors.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index b2b5f2c..49d4c99 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ LUA=lua
+ LUA_CFLAGS=`$(PKG_CONFIG) --cflags lua5.2 2>/dev/null || $(PKG_CONFIG) --cflags lua`
+ SOCFLAGS=-fPIC
+ SOCC=$(CC) -shared $(SOCFLAGS)
+-CFLAGS=-fPIC -g -Wall -Werror $(LUA_CFLAGS) -fvisibility=hidden -Wno-unused-function --std=gnu99
++CFLAGS=-fPIC -g -Wall $(LUA_CFLAGS) -fvisibility=hidden -Wno-unused-function --std=gnu99
+ 
+ MODNAME=ffi
+ MODSO=$(MODNAME).so
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d486de4687..b97715eb706 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9498,6 +9498,8 @@ with pkgs;
 
   luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; };
 
+  luaffi = callPackage ../development/libraries/luaffi { lua = lua5_1; };
+
   lzo = callPackage ../development/libraries/lzo { };
 
   mapnik = callPackage ../development/libraries/mapnik { };

From 724a69f5c4b6a927d8efce1bf06c0cc50b23dda0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 31 Aug 2017 11:50:58 +0200
Subject: [PATCH 3115/3246] weechat-matrix-bridge: init at 2017-03-28

---
 .../weechat-matrix-bridge/default.nix         | 44 +++++++++++++++++++
 .../weechat-matrix-bridge/library-path.patch  | 28 ++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 76 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch

diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
new file mode 100644
index 00000000000..f1338bc0df3
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }:
+
+stdenv.mkDerivation {
+  name = "weechat-matrix-bridge-2017-03-28";
+  src = fetchFromGitHub {
+    owner = "torhve";
+    repo = "weechat-matrix-protocol-script";
+    rev = "0052e7275ae149dc5241226391c9b1889ecc3c6b";
+    sha256 = "14x58jd44g08sfnp1gx74gq2na527v5jjpsvv1xx4b8mixwy20hi";
+  };
+
+  patches = [
+    ./library-path.patch
+  ];
+
+  buildInputs = [ curl cjson olm luaffi ];
+
+  postPatch = ''
+    substituteInPlace matrix.lua \
+      --replace "/usr/bin/curl" "${curl}/bin/curl" \
+      --replace "__NIX_LIB_PATH__" "$out/lib/?.so" \
+      --replace "__NIX_OLM_PATH__" "$out/share/?.lua"
+
+    substituteInPlace olm.lua \
+      --replace "__NIX_LIB_PATH__" "$out/lib/?.so"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{share,lib}
+
+    cp {matrix.lua,olm.lua} $out/share
+    cp ${cjson}/lib/lua/5.2/cjson.so $out/lib/cjson.so
+    cp ${olm}/lib/libolm.so $out/lib/libolm.so
+    cp ${luaffi}/lib/ffi.so $out/lib/ffi.so
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A WeeChat script in Lua that implements the matrix.org chat protocol";
+    homepage = https://github.com/torhve/weechat-matrix-protocol-script;
+    maintainers = with maintainers; [ ma27 ];
+    license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch
new file mode 100644
index 00000000000..d9945c2993b
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch
@@ -0,0 +1,28 @@
+diff --git a/matrix.lua b/matrix.lua
+index b79f500..32b37a2 100644
+--- a/matrix.lua
++++ b/matrix.lua
+@@ -43,6 +43,9 @@ This script maps this as follows:
+ 
+ ]]
+ 
++package.cpath = package.cpath .. ";__NIX_LIB_PATH__"
++package.path = package.path .. ";__NIX_OLM_PATH__"
++
+ local json = require 'cjson' -- apt-get install lua-cjson
+ local olmstatus, olm = pcall(require, 'olm') -- LuaJIT olm FFI binding ln -s ~/olm/olm.lua /usr/local/share/lua/5.1
+ local w = weechat
+diff --git a/olm.lua b/olm.lua
+index 114649c..4828371 100644
+--- a/olm.lua
++++ b/olm.lua
+@@ -17,6 +17,9 @@
+  * limitations under the License.
+  */
+ --]]
++
++package.cpath = package.cpath .. ";__NIX_LIB_PATH__"
++
+ local ffi = require'ffi'
+ 
+ ffi.cdef[[
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b97715eb706..8e9c1ab9f8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16696,6 +16696,10 @@ with pkgs;
     guile = guile_2_0;
   };
 
+  weechat-matrix-bridge = callPackage ../applications/networking/instant-messengers/weechat-matrix-bridge {
+    inherit (luaPackages) cjson;
+  };
+
   westonLite = callPackage ../applications/window-managers/weston {
     pango = null;
     freerdp = null;

From 4134db36d021b4715bdf0f4e54caee6d1255ee5e Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Thu, 31 Aug 2017 05:17:54 -0500
Subject: [PATCH 3116/3246] linux-testing-bcachefs: init at 4.11.2017.08.23

---
 .../linux/kernel/linux-testing-bcachefs.nix   | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 18 ++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
new file mode 100644
index 00000000000..77a2b62dbb4
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -0,0 +1,28 @@
+{ stdenv, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.11.2017.08.23";
+  modDirVersion = "4.11.0";
+  extraMeta.branch = "master";
+  extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ];
+
+  src = fetchgit {
+    url = "https://evilpiepirate.org/git/bcachefs.git";
+    rev = "fb8082a13d49397346a04ce4d3904569b0287738";
+    sha256 = "18csg2zb4lnhid27h5w95j3g8np29m8y3zfpfgjl1jr2jks64kid";
+  };
+
+  extraConfig = ''
+    BCACHEFS_FS m
+  '';
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+
+  # Should the testing kernels ever be built on Hydra?
+  extraMeta.hydraPlatforms = [];
+
+} // (args.argsOverride or {}))
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d486de4687..141c024ed64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12185,6 +12185,21 @@ with pkgs;
     ];
   };
 
+  linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        kernelPatches.p9_fixes
+        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
+        # when adding a new linux version
+        kernelPatches.cpu-cgroup-v2."4.11"
+        kernelPatches.modinst_arg_list_too_long
+      ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
 
   linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix {
     kernelPatches =
@@ -12371,6 +12386,9 @@ with pkgs;
       allowImportFromDerivation = true;
     }));
 
+  # Build a kernel with bcachefs module
+  linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs);
+
   # Build a kernel for Xen dom0
   linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
 

From bd79b8c9fc918223e28dc29e7afa2673bebb5392 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Thu, 31 Aug 2017 05:23:32 -0500
Subject: [PATCH 3117/3246] bcachefs-tools: 2016-05-13 -> 2017-08-28

---
 pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 56d132907a0..0ce69500038 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,12 +1,12 @@
 { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }:
 
 stdenv.mkDerivation rec {
-  name = "bcachefs-tools-unstable-2016-05-13";
+  name = "bcachefs-tools-unstable-2017-08-28";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "565b4a74d6c25c78b0d2b82d9529595fc6269308";
-    sha256 = "1wnis26hq67vxqkxzck6wm6caq4c1rfmy9blmmgkzlhdd2nzisbx";
+    rev = "b1814f2dd0c6b61a12a2ebb67a13d406d126b227";
+    sha256 = "05ba1h09rrqj6vjr3q37ybca3nbrmnifmffdyk83622l28fpv350";
   };
 
   buildInputs = [ pkgconfig attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ];

From 8f389f331641561c2c0355edd9e83593bf908a39 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Thu, 31 Aug 2017 05:24:48 -0500
Subject: [PATCH 3118/3246] nixos/bcachefs: init module

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/system/boot/stage-1-init.sh    |  3 +++
 nixos/modules/tasks/filesystems/bcachefs.nix | 26 ++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 nixos/modules/tasks/filesystems/bcachefs.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 918d0f3b245..adb21f7b7d9 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -679,6 +679,7 @@
   ./tasks/cpu-freq.nix
   ./tasks/encrypted-devices.nix
   ./tasks/filesystems.nix
+  ./tasks/filesystems/bcachefs.nix
   ./tasks/filesystems/btrfs.nix
   ./tasks/filesystems/cifs.nix
   ./tasks/filesystems/exfat.nix
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 1f4ab3eae07..b442386914a 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -221,6 +221,9 @@ checkFS() {
     # Don't check resilient COWs as they validate the fs structures at mount time
     if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi
 
+    # Skip fsck for bcachefs - not implemented yet.
+    if [ "$fsType" = bcachefs ]; then return 0; fi
+
     # Skip fsck for inherently readonly filesystems.
     if [ "$fsType" = squashfs ]; then return 0; fi
 
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix
new file mode 100644
index 00000000000..227707173a3
--- /dev/null
+++ b/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  inInitrd = any (fs: fs == "bcachefs") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+  config = mkIf (any (fs: fs == "bcachefs") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.bcachefs-tools ];
+
+    # use kernel package with bcachefs support until it's in mainline
+    boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs;
+    boot.initrd.availableKernelModules = mkIf inInitrd [ "bcachefs" ];
+
+    boot.initrd.extraUtilsCommands = mkIf inInitrd
+      ''
+        copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/fsck.bcachefs
+      '';
+
+  };
+}

From 43acfe0f49f9905a5b4d2ed725d00b1c97763ceb Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 18:16:17 +0700
Subject: [PATCH 3119/3246] pythonPackages.tempora : move to separate
 expression

---
 .../python-modules/tempora/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/tempora/default.nix

diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
new file mode 100644
index 00000000000..69006a31905
--- /dev/null
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, setuptools_scm, six }:
+
+buildPythonPackage rec {
+  version = "1.4";
+  pname = "tempora";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ysvns22i5hzhl5ln4n86bq10j8xwvd09z8qw1zjr3s0fj3lynza";
+  };
+
+  doCheck = false;
+
+  buildInputs = [ setuptools_scm ];
+
+  propagatedBuildInputs = [ six ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b93049bca17..82362e75460 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28183,9 +28183,7 @@ EOF
     propagatedBuildInputs = with self; [ websocket_client requests ];
   };
 
-  tempora = buildPythonPackage rec {
-    name = "tempora-${version}";
-    version = "1.4";
+  tempora= callPackage ../development/python-modules/tempora { };
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/t/tempora/${name}.tar.gz";

From 6ba7b4c672260d2543b45d243ef6177a672c9643 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 18:19:12 +0700
Subject: [PATCH 3120/3246] pythonPackages.hypchat : move to separate
 expression

---
 .../python-modules/hypchat/default.nix        | 15 ++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +------------------
 2 files changed, 16 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/hypchat/default.nix

diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix
new file mode 100644
index 00000000000..6574de1be63
--- /dev/null
+++ b/pkgs/development/python-modules/hypchat/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, requests, six, dateutil }:
+
+buildPythonPackage rec {
+  pname = "hypchat";
+  version = "0.21";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg";
+  };
+
+  propagatedBuildInputs = [ requests six dateutil ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 82362e75460..fa1fff79ce4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28185,29 +28185,7 @@ EOF
 
   tempora= callPackage ../development/python-modules/tempora { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/tempora/${name}.tar.gz";
-      sha256 = "0ysvns22i5hzhl5ln4n86bq10j8xwvd09z8qw1zjr3s0fj3lynza";
-    };
-
-    doCheck = false;
-
-    buildInputs = with self; [ setuptools_scm ];
-
-    propagatedBuildInputs = with self; [ six ];
-  };
-
-  hypchat = buildPythonPackage rec {
-    name = "hypchat-${version}";
-    version = "0.21";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/hypchat/${name}.tar.gz";
-      sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg";
-    };
-
-    propagatedBuildInputs = with self; [ requests six dateutil ];
-  };
+  hypchat = callPackage ../development/python-modules/hypchat { };
 
   pivy = buildPythonPackage rec {
     version = "20101207";

From d83cadf84172ef46d76707c2c7408876b0d3372c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 31 Aug 2017 15:12:52 +0100
Subject: [PATCH 3121/3246] photoqt: 1.3 -> 1.5.1

related to #28643
---
 pkgs/applications/graphics/photoqt/default.nix | 13 ++++++-------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 22db78b8125..a3c8d805b23 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, cmake, exiv2, graphicsmagick
-, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools
+{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw
+, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
 }:
 
-let
-  version = "1.3";
-in
 stdenv.mkDerivation rec {
   name = "photoqt-${version}";
+  version = "1.5.1";
+
   src = fetchurl {
     url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
+    sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     qtbase qtquickcontrols qttools exiv2 graphicsmagick
-    qtmultimedia qtdeclarative
+    qtmultimedia qtdeclarative libraw qtgraphicaleffects
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2124b237ac7..5ba13b013c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15668,7 +15668,7 @@ with pkgs;
 
   pflask = callPackage ../os-specific/linux/pflask {};
 
-  photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { };
+  photoqt = libsForQt56.callPackage ../applications/graphics/photoqt { };
 
   phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };
 

From c0433265bbca6db732aa1e5aec00c16ee7b292b8 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 18:21:45 +0700
Subject: [PATCH 3122/3246] pythonPackages.smugpy : move to separate expression

---
 .../python-modules/smugpy/default.nix         | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +-------------
 2 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/smugpy/default.nix

diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix
new file mode 100644
index 00000000000..5eb8d77a244
--- /dev/null
+++ b/pkgs/development/python-modules/smugpy/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  name    = pname + "-" + version;
+  pname   = "smugpy";
+  version = "20131218";
+
+  src = fetchFromGitHub {
+    owner  = "chrishoffman";
+    repo   = pname;
+    rev    = "f698d6749ce446e3d6c7d925b2cd1cd5b3d695ea";
+    sha256 = "029x6hm1744iznv4sw8sfyl974wmx1sqnr1k5dvzzwpk3ja49a1y";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python library for the SmugMug API";
+    license = with licenses; [ mit ];
+    homepage = https://github.com/chrishoffman/smugpy;
+  };
+
+  doCheck = false; # Tries to login to Smugmug…
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa1fff79ce4..df3c33442d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28199,22 +28199,7 @@ EOF
     buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.mesa pkgs.xorg.libXi ];
   };
 
-  smugpy = buildPythonPackage rec {
-    name    = pname + "-" + version;
-    pname   = "smugpy";
-    version = "20131218";
-
-    src = pkgs.fetchFromGitHub {
-      owner  = "chrishoffman";
-      repo   = pname;
-      rev    = "f698d6749ce446e3d6c7d925b2cd1cd5b3d695ea";
-      sha256 = "029x6hm1744iznv4sw8sfyl974wmx1sqnr1k5dvzzwpk3ja49a1y";
-    };
-
-    doCheck = false; # Tries to login to Smugmug…
-
-    propagatedBuildInputs = with self; [ ];
-  };
+  smugpy = callPackage ../development/python-modules/smugpy { };
 
   smugline = stdenv.mkDerivation rec {
     name    = pname + "-" + version;

From 31b7f8701a0c31d4f66508fed1ce1ea475e38dcd Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 18:31:04 +0700
Subject: [PATCH 3123/3246] pythonPackages.ramlfications : move to separate
 expression

---
 .../python-modules/ramlfications/default.nix  | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +---------------
 2 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/ramlfications/default.nix

diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix
new file mode 100644
index 00000000000..1042b8de98e
--- /dev/null
+++ b/pkgs/development/python-modules/ramlfications/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, mock, pytest, pytest-mock, pytest-server-fixtures, pytest-localserver
+, termcolor, click, markdown2, six, jsonref, pyyaml, xmltodict, attrs
+}:
+
+buildPythonPackage rec {
+  pname = "ramlfications";
+  version = "0.1.9";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xvnna7kaq4nm5nfnwcwbr5bcm2s532hgyp7kq4v9iivn48rrf3v";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A Python RAML parser.";
+    homepage    = "https://ramlfications.readthedocs.org";
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ nand0p ];
+    platforms   = platforms.all;
+  };
+
+  doCheck = false;
+  # [darwin]  AssertionError: Expected 'update_mime_types' to have been called once. Called 0 times.
+
+  buildInputs = [ mock pytest pytest-mock pytest-server-fixtures pytest-localserver ];
+
+  propagatedBuildInputs = [ termcolor click markdown2 six jsonref pyyaml xmltodict attrs ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df3c33442d5..cc391405ee2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28229,31 +28229,7 @@ EOF
 
   txaio = callPackage ../development/python-modules/txaio { };
 
-  ramlfications = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "ramlfications";
-    version = "0.1.9";
-
-    meta = {
-      description = "A Python RAML parser.";
-      homepage    = "https://ramlfications.readthedocs.org";
-      license     = licenses.asl20;
-      maintainers = with maintainers; [ nand0p ];
-      platforms   = platforms.all;
-    };
-
-    doCheck = false;
-    # [darwin]  AssertionError: Expected 'update_mime_types' to have been called once. Called 0 times.
-
-    buildInputs = with self; [ mock pytest pytest-mock pytest-server-fixtures pytest-localserver ];
-
-    propagatedBuildInputs = with self; [ termcolor click markdown2 six jsonref pyyaml xmltodict attrs ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/${pname}/${name}.tar.gz";
-      sha256 = "0xvnna7kaq4nm5nfnwcwbr5bcm2s532hgyp7kq4v9iivn48rrf3v";
-    };
-  };
+  ramlfications = callPackage ../development/python-modules/ramlfications { };
 
   yapf = callPackage ../development/python-modules/yapf { };
 

From fcba0a1cb7ff15de11f493fa9fe75eff1be9d854 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 18:31:19 +0700
Subject: [PATCH 3124/3246] pythonPackages.ROPGadget : move to separate
 expression

---
 .../python-modules/ROPGadget/default.nix      | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 15 +------------
 2 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/ROPGadget/default.nix

diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix
new file mode 100644
index 00000000000..41b92683b07
--- /dev/null
+++ b/pkgs/development/python-modules/ROPGadget/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, capstone}:
+
+buildPythonPackage rec {
+  pname = "ROPGadget";
+  version = "5.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19wly4x3mq73c91pplqjk0c7sx6710887czh514qk5l7j0ky6dxg";
+  };
+
+  propagatedBuildInputs = [ capstone ];
+
+  meta = with stdenv.lib; {
+    description = "Tool to search for gadgets in binaries to facilitate ROP exploitation";
+    homepage = "http://shell-storm.org/project/ROPgadget/";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bennofs ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cc391405ee2..296de16d3c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28278,20 +28278,7 @@ EOF
     };
   };
 
-  ROPGadget = buildPythonPackage rec {
-    name = "ROPGadget-5.4";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/R/ROPGadget/${name}.tar.gz";
-      sha256 = "19wly4x3mq73c91pplqjk0c7sx6710887czh514qk5l7j0ky6dxg";
-    };
-    propagatedBuildInputs = with self; [ capstone ];
-    meta = with pkgs.stdenv.lib; {
-      description = "Tool to search for gadgets in binaries to facilitate ROP exploitation";
-      homepage = "http://shell-storm.org/project/ROPgadget/";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ bennofs ];
-    };
-  };
+  ROPGadget = callPackage ../development/python-modules/ROPGadget { };
 
   # We need "normal" libxml2 and not the python package by the same name.
   pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };

From 64fb8817578dac0c52dff0a52b03afd02dcd568d Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 21:00:31 +0700
Subject: [PATCH 3125/3246] pythonPackages.pyfeed : move to separate expression

---
 .../python-modules/pyfeed/default.nix         | 23 ++++++++++
 pkgs/top-level/python-packages.nix            | 42 +------------------
 2 files changed, 24 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyfeed/default.nix

diff --git a/pkgs/development/python-modules/pyfeed/default.nix b/pkgs/development/python-modules/pyfeed/default.nix
new file mode 100644
index 00000000000..a1591037fb5
--- /dev/null
+++ b/pkgs/development/python-modules/pyfeed/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl
+, xe }:
+
+buildPythonPackage rec {
+  url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
+
+  name = stdenv.lib.nameFromURL url ".tar";
+
+  src = fetchurl {
+    inherit url;
+    sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1";
+  };
+
+  propagatedBuildInputs = [ xe ];
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "http://home.blarg.net/~steveha/pyfeed.html";
+    description = "Tools for syndication feeds";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 296de16d3c3..71af3719575 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17776,47 +17776,7 @@ in {
      };
    };
 
-  pyfeed = buildPythonPackage rec {
-    url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
-    name = stdenv.lib.nameFromURL url ".tar";
-    src = pkgs.fetchurl {
-      inherit url;
-      sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1";
-    };
-    propagatedBuildInputs = with self; [xe];
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = "http://home.blarg.net/~steveha/pyfeed.html";
-      description = "Tools for syndication feeds";
-    };
-  };
-
-  pyfftw = buildPythonPackage rec {
-    name = "pyfftw-${version}";
-    version = "0.10.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz";
-      sha256 = "739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a";
-    };
-
-    buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble];
-
-    propagatedBuildInputs = with self; [ numpy scipy ];
-
-    # Tests cannot import pyfftw. pyfftw works fine though.
-    doCheck = false;
-
-    preConfigure = ''
-      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib"
-      export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"
-    '';
-    #+ optionalString isDarwin ''
-    #  export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib"
-    #'';
+  pyfeed = callPackage ../development/python-modules/pyfeed { };
 
     meta = {
       description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";

From 4f43682759f6a4741c4ff6f175f8c9f9c5ea62cc Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 21:01:10 +0700
Subject: [PATCH 3126/3246] pythonPackages.pyfftw : move to separate expression

---
 .../python-modules/pyfftw/default.nix         | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +---------
 2 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyfftw/default.nix

diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix
new file mode 100644
index 00000000000..973a2e84ffa
--- /dev/null
+++ b/pkgs/development/python-modules/pyfftw/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, fftw, fftwFloat, fftwLongDouble, numpy, scipy }:
+
+buildPythonPackage rec {
+  version = "0.10.4";
+  pname = "pyFFTW";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a";
+  };
+
+  buildInputs = [ fftw fftwFloat fftwLongDouble];
+
+  propagatedBuildInputs = [ numpy scipy ];
+
+  # Tests cannot import pyfftw. pyfftw works fine though.
+  doCheck = false;
+
+  preConfigure = ''
+    export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib"
+    export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include"
+  '';
+  #+ optionalString isDarwin ''
+  #  export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib"
+  #'';
+
+  meta = with stdenv.lib; {
+    description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
+    homepage = http://hgomersall.github.com/pyFFTW/;
+    license = with licenses; [ bsd2 bsd3 ];
+    maintainers = with maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71af3719575..b6c920d3611 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17778,24 +17778,7 @@ in {
 
   pyfeed = callPackage ../development/python-modules/pyfeed { };
 
-    meta = {
-      description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
-      homepage = http://hgomersall.github.com/pyFFTW/;
-      license = with licenses; [ bsd2 bsd3 ];
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
-
-  pyfiglet = buildPythonPackage rec {
-    name = "pyfiglet-${version}";
-    version = "0.7.5";
-
-    src = pkgs.fetchurl {
-      url    = "mirror://pypi/p/pyfiglet/${name}.tar.gz";
-      sha256 = "04jy4182hn5xfs6jf432gxclfj1rhssd7bsf0b4gymrjzkhr8qa4";
-    };
-
-    doCheck = false;
+  pyfftw = callPackage ../development/python-modules/pyfftw { };
 
     meta = {
       description = "FIGlet in pure Python";

From 2d7733b6c2a74d6ed898c19784cc23d849bddaa4 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 21:01:26 +0700
Subject: [PATCH 3127/3246] pythonPackages.pyfiglet : move to separate
 expression

---
 .../python-modules/pyfiglet/default.nix       | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  7 +------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyfiglet/default.nix

diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix
new file mode 100644
index 00000000000..9308a746736
--- /dev/null
+++ b/pkgs/development/python-modules/pyfiglet/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  version = "0.7.5";
+  pname = "pyfiglet";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04jy4182hn5xfs6jf432gxclfj1rhssd7bsf0b4gymrjzkhr8qa4";
+  };
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "FIGlet in pure Python";
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b6c920d3611..76ddbbd349a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17780,12 +17780,7 @@ in {
 
   pyfftw = callPackage ../development/python-modules/pyfftw { };
 
-    meta = {
-      description = "FIGlet in pure Python";
-      license     = licenses.gpl2Plus;
-      maintainers = with maintainers; [ thoughtpolice ];
-    };
-  };
+  pyfiglet = callPackage ../development/python-modules/pyfiglet { };
 
   pyflakes = callPackage ../development/python-modules/pyflakes { };
 

From d94d826433e53dbf892217313e6084cf9ea3405f Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 21:01:39 +0700
Subject: [PATCH 3128/3246] pythonPackages.pyftgl : move to separate expression

---
 .../python-modules/pyftgl/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 +--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyftgl/default.nix

diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix
new file mode 100644
index 00000000000..51de5e8fad5
--- /dev/null
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, boost, freetype, ftgl, mesa }:
+
+buildPythonPackage rec {
+  name = "pyftgl-0.4b";
+
+  src = fetchFromGitHub {
+    owner = "umlaeute";
+    repo = "pyftgl";
+    rev = "0.4b";
+    sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
+  };
+
+  buildInputs = [ boost freetype ftgl mesa ];
+
+  meta = with stdenv.lib; {
+    description = "Python bindings for FTGL (FreeType for OpenGL)";
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76ddbbd349a..6c940f56f2a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17784,8 +17784,7 @@ in {
 
   pyflakes = callPackage ../development/python-modules/pyflakes { };
 
-  pyftgl = buildPythonPackage rec {
-    name = "pyftgl-0.4b";
+  pyftgl = callPackage ../development/python-modules/pyftgl { };
 
     src = pkgs.fetchFromGitHub {
       owner = "umlaeute";

From 282216c635a4da125cac615b17f4812a6e4a2533 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 21:01:56 +0700
Subject: [PATCH 3129/3246] pythonPackages.pygeoip : move to separate
 expression

---
 .../python-modules/pygeoip/default.nix        | 24 +++++++++++++
 pkgs/top-level/python-packages.nix            | 35 +------------------
 2 files changed, 25 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/development/python-modules/pygeoip/default.nix

diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix
new file mode 100644
index 00000000000..a0a92ffc287
--- /dev/null
+++ b/pkgs/development/python-modules/pygeoip/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, nose }:
+
+buildPythonPackage rec {
+  pname = "pygeoip";
+  version = "0.3.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f22c4e00ddf1213e0fae36dc60b46ee7c25a6339941ec1a975539014c1f9a96d";
+  };
+
+  # requires geoip samples
+  doCheck = false;
+
+  buildInputs = [ nose ];
+
+  meta = with stdenv.lib; {
+    description = "Pure Python GeoIP API";
+    homepage = https://github.com/appliedsec/pygeoip;
+    license = licenses.lgpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c940f56f2a..9db0ff7da8d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17786,40 +17786,7 @@ in {
 
   pyftgl = callPackage ../development/python-modules/pyftgl { };
 
-    src = pkgs.fetchFromGitHub {
-      owner = "umlaeute";
-      repo = "pyftgl";
-      rev = "0.4b";
-      sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
-    };
-
-    buildInputs = with self; [ boost pkgs.freetype pkgs.ftgl pkgs.mesa ];
-
-    meta = {
-      description = "Python bindings for FTGL (FreeType for OpenGL)";
-      license = licenses.gpl2Plus;
-    };
-  };
-
-  pygeoip = buildPythonPackage rec {
-    name = "pygeoip-0.3.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pygeoip/pygeoip-0.3.2.tar.gz";
-      sha256 = "f22c4e00ddf1213e0fae36dc60b46ee7c25a6339941ec1a975539014c1f9a96d";
-    };
-
-    # requires geoip samples
-    doCheck = false;
-
-    buildInputs = with self; [ nose ];
-
-    meta = {
-      description = "Pure Python GeoIP API";
-      homepage = https://github.com/appliedsec/pygeoip;
-      license = licenses.lgpl3Plus;
-    };
-  };
+  pygeoip = callPackage ../development/python-modules/pygeoip {};
 
   PyGithub = callPackage ../development/python-modules/pyGithub {};
 

From ac35d9884bed0e39d6206a982b6e13e50b0484f4 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 21:02:11 +0700
Subject: [PATCH 3130/3246] pythonPackages.pyglet : move to separate expression

---
 .../python-modules/pyglet/default.nix         | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +----------------
 2 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyglet/default.nix

diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
new file mode 100644
index 00000000000..8d5dd53f80a
--- /dev/null
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, mesa, xorg, freetype, fontconfig}:
+
+buildPythonPackage rec {
+  version = "1.2.4";
+  pname = "pyglet";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445";
+  };
+
+  patchPhase = let
+    libs = [ mesa xorg.libX11 freetype fontconfig ];
+    paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs);
+  in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py";
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.pyglet.org/";
+    description = "A cross-platform windowing and multimedia library";
+    license = licenses.bsd3;
+    platforms = platforms.mesaPlatforms;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9db0ff7da8d..c0748876922 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17790,29 +17790,7 @@ in {
 
   PyGithub = callPackage ../development/python-modules/pyGithub {};
 
-  pyglet = buildPythonPackage rec {
-    name = "pyglet-${version}";
-    version = "1.2.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyglet/pyglet-${version}.tar.gz";
-      sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445";
-    };
-
-    patchPhase = let
-      libs = [ pkgs.mesa pkgs.xorg.libX11 pkgs.freetype pkgs.fontconfig ];
-      paths = concatStringsSep "," (map (l: "\"${l}/lib\"") libs);
-    in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py";
-
-    doCheck = false;
-
-    meta = {
-      homepage = "http://www.pyglet.org/";
-      description = "A cross-platform windowing and multimedia library";
-      license = licenses.bsd3;
-      platforms = platforms.mesaPlatforms;
-    };
-  };
+  pyglet = callPackage ../development/python-modules/pyglet {};
 
   pygments = callPackage ../development/python-modules/Pygments { };
 

From 80ca1cae8b72767e2b27164e8c499e7ac894f36a Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 21:02:30 +0700
Subject: [PATCH 3131/3246] pythonPackages.pygpgme : move to separate
 expression

---
 .../python-modules/pygpgme/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +---------------
 2 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/pygpgme/default.nix

diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix
new file mode 100644
index 00000000000..85bf262837f
--- /dev/null
+++ b/pkgs/development/python-modules/pygpgme/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchurl, isPyPy
+, gpgme }:
+
+buildPythonPackage rec {
+  version = "0.3";
+  pname = "pygpgme";
+  name = "${pname}-${version}";
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "5fd887c407015296a8fd3f4b867fe0fcca3179de97ccde90449853a3dfb802e1";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  propagatedBuildInputs = [ gpgme ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://launchpad.net/pygpgme";
+    description = "A Python wrapper for the GPGME library";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0748876922..bf9076850be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17805,28 +17805,7 @@ in {
     };
   });
 
-  pygpgme = buildPythonPackage rec {
-    version = "0.3";
-    name = "pygpgme-${version}";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${name}.tar.gz";
-      sha256 = "5fd887c407015296a8fd3f4b867fe0fcca3179de97ccde90449853a3dfb802e1";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ pkgs.gpgme ];
-
-    meta = {
-      homepage = "https://launchpad.net/pygpgme";
-      description = "A Python wrapper for the GPGME library";
-      license = licenses.lgpl21;
-      maintainers = with maintainers; [ garbas ];
-    };
-  };
+  pygpgme = callPackage ../development/python-modules/pygpgme { };
 
   pylint = callPackage ../development/python-modules/pylint { };
 

From b9eebaf8bbcc9d01beb04146ae5f8ab9069715d9 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 21:02:44 +0700
Subject: [PATCH 3132/3246] pythonPackages.pyrr : move to separate expression

---
 .../python-modules/pyrr/default.nix           | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 12 +---------
 2 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyrr/default.nix

diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix
new file mode 100644
index 00000000000..fba7a0b27dd
--- /dev/null
+++ b/pkgs/development/python-modules/pyrr/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, setuptools, multipledispatch, numpy }:
+
+buildPythonPackage rec {
+  version = "0.7.2";
+  pname = "pyrr";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa";
+  };
+
+  buildInputs = [ setuptools ];
+  propagatedBuildInputs = [ multipledispatch numpy ];
+
+  meta = with stdenv.lib; {
+    description = "3D mathematical functions using NumPy";
+    homepage = https://github.com/adamlwgriffiths/Pyrr/;
+    license = licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf9076850be..e606bac98c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17817,17 +17817,7 @@ in {
     proj = null;
   };
 
-  pyrr = buildPythonPackage rec {
-    name = "pyrr-${version}";
-    version = "0.7.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyrr/pyrr-${version}.tar.gz";
-      sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa";
-    };
-
-    buildInputs = with self; [ setuptools ];
-    propagatedBuildInputs = with self; [ multipledispatch numpy ];
+  pyrr = callPackage ../development/python-modules/pyrr { };
 
     meta = {
       description = "3D mathematical functions using NumPy";

From 489bfcfa0f80c3bac4877ef0a1fc13d0ca7b20e7 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Thu, 31 Aug 2017 21:03:02 +0700
Subject: [PATCH 3133/3246] pythonPackages.pyshp : move to separate expression

---
 .../python-modules/pyshp/default.nix          | 21 ++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +------------------
 2 files changed, 22 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyshp/default.nix

diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
new file mode 100644
index 00000000000..4629331e52d
--- /dev/null
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, setuptools }:
+
+buildPythonPackage rec {
+  version = "1.2.3";
+  pname = "pyshp";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e18cc19659dadc5ddaa891eb780a6958094da0cf105a1efe0f67e75b4fa1cdf9";
+  };
+
+  buildInputs = [ setuptools ];
+
+  meta = with stdenv.lib; {
+    description = "Pure Python read/write support for ESRI Shapefile format";
+    homepage = https://github.com/GeospatialPython/pyshp;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e606bac98c6..9831d302111 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17819,30 +17819,7 @@ in {
 
   pyrr = callPackage ../development/python-modules/pyrr { };
 
-    meta = {
-      description = "3D mathematical functions using NumPy";
-      homepage = https://github.com/adamlwgriffiths/Pyrr/;
-      license = licenses.bsd2;
-    };
-  };
-
-  pyshp = buildPythonPackage rec {
-    name = "pyshp-${version}";
-    version = "1.2.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyshp/pyshp-${version}.tar.gz";
-      sha256 = "e18cc19659dadc5ddaa891eb780a6958094da0cf105a1efe0f67e75b4fa1cdf9";
-    };
-
-    buildInputs = with self; [ setuptools ];
-
-    meta = {
-      description = "Pure Python read/write support for ESRI Shapefile format";
-      homepage = https://github.com/GeospatialPython/pyshp;
-      license = licenses.mit;
-    };
-  };
+  pyshp = callPackage ../development/python-modules/pyshp { };
 
   pyspread = callPackage ../development/python-modules/pyspread { };
 

From ddaa696a4e5c29b22ea26efeb9e69ee8cdf5bf5b Mon Sep 17 00:00:00 2001
From: Servilio Afre Puentes <afrepues@sharcnet.ca>
Date: Thu, 31 Aug 2017 10:37:00 -0400
Subject: [PATCH 3134/3246] gmime: updated home and description

GMime home has moved to Github as the list of commits clearly shows,
i.e.:

  https://github.com/jstedfast/gmime/commit/b5cbc68a67956643862d894f0e9c95a0eb803f3b

The description is updated as well to be closer to the one used there
and over at gnome.org.
---
 pkgs/development/libraries/gmime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index e908c9b5b13..a01f3890453 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://spruce.sourceforge.net/gmime/;
-    description = "A C/C++ library for manipulating MIME messages";
+    homepage = https://github.com/jstedfast/gmime/;
+    description = "A C/C++ library for creating, editing and parsing MIME messages and structures";
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
     platforms = stdenv.lib.platforms.unix;
   };

From 26ebbac2c42f2d2bb898e9669b2459ff63d0563e Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 31 Aug 2017 15:53:06 +0100
Subject: [PATCH 3135/3246] rethinkdb: fix build with gcc6

---
 pkgs/servers/nosql/rethinkdb/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index cc82e75a615..e935b5d0987 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4";
   };
 
+  patches = [
+    (fetchurl {
+        url = "https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c.patch";
+        sha256 = "05nagixlwnq3x7441fhll5vs70pxppbsciw8qjqp660bdb5m4jm1";
+    })
+  ];
+
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py
 

From e8b88649123ef0fcfe41a6d7fa00b84a8e50ecd6 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 31 Aug 2017 12:09:56 -0400
Subject: [PATCH 3136/3246] terraform: build all known 0.10 plugins in Hydra

---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ba13b013c1..890d69d4f0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19013,6 +19013,10 @@ with pkgs;
     terraform_0_10
     ;
 
+  # Terraform with all the plugins, both to get Hydra to build all plugins for us and for
+  # convenience if someone doesn't want to have to think about which plugins to use.
+  terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
+
   terraform = terraform_0_9;
 
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};

From 6fb18561e7abb525c5e897b8093f675867f650c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 31 Aug 2017 11:11:16 -0500
Subject: [PATCH 3137/3246] pythonPackages.willie: remove

was renamed by sopel, which we already have in nixpkgs
---
 pkgs/top-level/python-packages.nix | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b93049bca17..8dc1cb6cb29 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24116,27 +24116,6 @@ EOF
 
   widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
 
-  willie = buildPythonPackage rec {
-    name = "willie-${version}";
-    version = "5.5.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/w/willie/${name}.tar.gz";
-      sha256 = "e03dd26ea694b877a2b3b7b4dcca8e79420e7f346abab34292bff43d992a8cc5";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname ];
-    checkPhase = ''
-      py.test test
-    '';
-
-    meta = {
-      description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python";
-      homepage = http://willie.dftba.net/;
-      license = licenses.efl20;
-    };
-  };
 
   wokkel = buildPythonPackage (rec {
     url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";

From 0b2f9d1ce12d49439472045df8da3acadacc6fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 31 Aug 2017 11:23:01 -0500
Subject: [PATCH 3138/3246] pythonPkgs.html5lib_0_9999999: remove

no longer needed and fails with python3
---
 pkgs/top-level/python-packages.nix | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8dc1cb6cb29..e084bbd2b40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2045,22 +2045,6 @@ in {
 
   blaze = callPackage ../development/python-modules/blaze { };
 
-  # Needed for FlexGet 1.2.337 and calibre 2.76.0
-  html5lib_0_9999999 = self.html5lib.overridePythonAttrs 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";
-    };
-  };
-
   html5-parser = callPackage ../development/python-modules/html5-parser {};
 
   httpserver = callPackage ../development/python-modules/httpserver {};
@@ -18005,7 +17989,7 @@ in {
     };
 
     disabled = !isPy3k;
-    
+
     # No tests in archive
     doCheck = false;
 

From a9f66285b76f07e3e637531899b27f16bd03f214 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 13:21:02 -0300
Subject: [PATCH 3139/3246] mate-icon-theme: build icon cache

---
 pkgs/desktops/mate/mate-icon-theme/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 239a01c759a..b1c5e82da99 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, hicolor_icon_theme }:
+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3 }:
 
 stdenv.mkDerivation rec {
   name = "mate-icon-theme-${version}";
@@ -13,8 +13,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
 
-  buildInputs = [ hicolor_icon_theme ];
-
+  buildInputs = [ librsvg hicolor_icon_theme ];
+  
+  postInstall = ''
+    for theme in "$out"/share/icons/*; do
+      "${gtk3.out}/bin/gtk-update-icon-cache" "$theme"
+    done
+  '';
+  
   meta = {
     description = "Icon themes from MATE";
     homepage = http://mate-desktop.org;

From 8f8d308fe1788a482a1ac62e22e20ced09df526b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 13:25:16 -0300
Subject: [PATCH 3140/3246] mate: use newScope

---
 pkgs/desktops/mate/default.nix  | 109 +++++++++++++++++---------------
 pkgs/top-level/all-packages.nix |   4 +-
 2 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 5657f309362..3cac721c0eb 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,57 +1,62 @@
-{ callPackage, pkgs }:
+{ pkgs, newScope }:
 
-rec {
+let
+  callPackage = newScope self;
 
-  atril = callPackage ./atril { };
-  caja = callPackage ./caja { };
-  caja-extensions = callPackage ./caja-extensions { };
-  cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
-    extensions = [ caja-extensions ];
-  };
-  engrampa = callPackage ./engrampa { };
-  eom = callPackage ./eom { };
-  libmatekbd = callPackage ./libmatekbd { };
-  libmatemixer = callPackage ./libmatemixer { };
-  libmateweather = callPackage ./libmateweather { };
-  marco = callPackage ./marco { };
-  mate-common = callPackage ./mate-common { };
-  mate-control-center = callPackage ./mate-control-center { };
-  mate-desktop = callPackage ./mate-desktop { };
-  mate-icon-theme = callPackage ./mate-icon-theme { };
-  mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
-  mate-menus = callPackage ./mate-menus { };
-  mate-panel = callPackage ./mate-panel { };
-  mate-session-manager = callPackage ./mate-session-manager { };
-  mate-settings-daemon = callPackage ./mate-settings-daemon { };
-  mate-terminal = callPackage ./mate-terminal { };
-  mate-themes = callPackage ./mate-themes { };
-  pluma = callPackage ./pluma { };
+  self = rec {
 
-  basePackages = [
-    caja
-    libmatekbd
-    libmatemixer
-    libmateweather
-    marco
-    mate-common
-    mate-control-center
-    mate-desktop
-    mate-icon-theme
-    mate-menus
-    mate-panel
-    mate-session-manager
-    mate-settings-daemon
-    mate-themes
-  ];
+    atril = callPackage ./atril { };
+    caja = callPackage ./caja { };
+    caja-extensions = callPackage ./caja-extensions { };
+    cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
+      extensions = [ caja-extensions ];
+    };
+    engrampa = callPackage ./engrampa { };
+    eom = callPackage ./eom { };
+    libmatekbd = callPackage ./libmatekbd { };
+    libmatemixer = callPackage ./libmatemixer { };
+    libmateweather = callPackage ./libmateweather { };
+    marco = callPackage ./marco { };
+    mate-common = callPackage ./mate-common { };
+    mate-control-center = callPackage ./mate-control-center { };
+    mate-desktop = callPackage ./mate-desktop { };
+    mate-icon-theme = callPackage ./mate-icon-theme { };
+    mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
+    mate-menus = callPackage ./mate-menus { };
+    mate-panel = callPackage ./mate-panel { };
+    mate-session-manager = callPackage ./mate-session-manager { };
+    mate-settings-daemon = callPackage ./mate-settings-daemon { };
+    mate-terminal = callPackage ./mate-terminal { };
+    mate-themes = callPackage ./mate-themes { };
+    pluma = callPackage ./pluma { };
 
-  extraPackages = [
-    atril
-    cajaWithExtensions
-    engrampa
-    eom
-    mate-icon-theme-faenza
-    mate-terminal
-    pluma
-  ];
+    basePackages = [
+      caja
+      libmatekbd
+      libmatemixer
+      libmateweather
+      marco
+      mate-common
+      mate-control-center
+      mate-desktop
+      mate-icon-theme
+      mate-menus
+      mate-panel
+      mate-session-manager
+      mate-settings-daemon
+      mate-themes
+    ];
+
+    extraPackages = [
+      atril
+      cajaWithExtensions
+      engrampa
+      eom
+      mate-icon-theme-faenza
+      mate-terminal
+      pluma
+    ];
   
-}
+  };
+
+in self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d4ce349878..680b6cd3dc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17821,9 +17821,7 @@ with pkgs;
     inherit (lib) makeScope;
   });
 
-  mate = recurseIntoAttrs (callPackage ../desktops/mate {
-    callPackage = newScope pkgs.mate;
-  });
+  mate = recurseIntoAttrs (callPackage ../desktops/mate { });
 
   maxx = callPackage ../desktops/maxx { };
 

From 56345c0ee4e725af4fa5252ecb839ca1ec7b407b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 31 Aug 2017 13:25:44 -0300
Subject: [PATCH 3141/3246] mate: add icon themes

---
 nixos/modules/services/x11/desktop-managers/mate.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 239cd772fc2..1230d9cf534 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -60,7 +60,10 @@ in
       '';
     };
 
-    environment.systemPackages =
+    environment.systemPackages = [
+      pkgs.hicolor_icon_theme
+      pkgs.mate.mate-icon-theme
+    ]  ++
       pkgs.mate.basePackages ++
       (removePackagesByName
         pkgs.mate.extraPackages
@@ -73,7 +76,7 @@ in
 
     services.gnome3.gnome-keyring.enable = true;
 
-    environment.pathsToLink = [ "/share" ];    
+    environment.pathsToLink = [ "/share" ];
   };
 
 }

From bcbcbfcfa581efe5764281a6675622e7cd71d313 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 31 Aug 2017 12:35:42 -0400
Subject: [PATCH 3142/3246] terraform: add template plugin for 0.10

---
 .../networking/cluster/terraform/default.nix     |  1 +
 .../cluster/terraform/providers/template.nix     | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terraform/providers/template.nix

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8589eed12bb..8643159aa8f 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -76,6 +76,7 @@ let
     azurerm = import providers/azurerm.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
     google = import providers/google.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
     kubernetes = import providers/kubernetes.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
+    template = import providers/template.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
   };
 in {
   terraform_0_8_5 = generic {
diff --git a/pkgs/applications/networking/cluster/terraform/providers/template.nix b/pkgs/applications/networking/cluster/terraform/providers/template.nix
new file mode 100644
index 00000000000..16650af870b
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/template.nix
@@ -0,0 +1,16 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "terraform-provider-template";
+  name = "${pname}-${version}";
+  version = "0.1.1";
+
+  goPackagePath = "github.com/terraform-providers/terraform-provider-template";
+
+  src = fetchFromGitHub {
+    owner  = "terraform-providers";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn";
+  };
+}
\ No newline at end of file

From 40cbf908619514cfe504536a1eb95c9cf7453bc8 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Tue, 29 Aug 2017 13:26:03 +0200
Subject: [PATCH 3143/3246] rstudio: 1.1.216 -> 1.1.351

---
 pkgs/applications/editors/rstudio/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index efb0a6f624d..930a18e39a6 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,24 +1,30 @@
-{ stdenv, fetchurl, makeDesktopItem, cmake, boost163, zlib, openssl,
+{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost163, zlib, openssl,
 R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
 }:
 
 let
-  version = "1.1.216";
+  version = "1.1.351";
   ginVer = "1.5";
   gwtVer = "2.7.0";
 in
 stdenv.mkDerivation rec {
   name = "RStudio-${version}";
 
-  buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ];
+  buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ];
 
   src = fetchurl {
     url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
-    sha256 = "07lp2ybvj7ippdrp7fv7j54dp0mm6k19j1vqdvjdk95acg3xgcjf";
+    sha256 = "0dpzmkq7jkdndidmmgdcr849q33ypmzkqwx22fraaqcy7w4f0pcn";
   };
 
   # Hack RStudio to only use the input R.
-  patches = [ ./r-location.patch ];
+  patches = [ 
+    ./r-location.patch 
+    (fetchpatch {
+      url = https://aur.archlinux.org/cgit/aur.git/plain/socketproxy-openssl.patch?h=rstudio-desktop-git;
+      sha256 = "0ywq9rk14s5961l6hvd3cw70jsm73r16h0bsh4yp52vams7cwy9d";
+    })
+  ];
   postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}";
 
   inherit ginVer;
@@ -115,7 +121,7 @@ stdenv.mkDerivation rec {
     { description = "Set of integrated tools for the R language";
       homepage = http://www.rstudio.com/;
       license = licenses.agpl3;
-      maintainers = [ maintainers.ehmry maintainers.changlinli ];
+      maintainers = with maintainers; [ ehmry changlinli ciil ];
       platforms = platforms.linux;
     };
 }

From 1785ac4a13ae699be8b8b8905416e3d8a6a40517 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Thu, 31 Aug 2017 20:27:00 +0200
Subject: [PATCH 3144/3246] netmask: init at 2.4.3

---
 pkgs/tools/networking/netmask/default.nix | 29 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/networking/netmask/default.nix

diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix
new file mode 100644
index 00000000000..ae2e9cc79f6
--- /dev/null
+++ b/pkgs/tools/networking/netmask/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, automake, autoconf, texinfo}:
+
+stdenv.mkDerivation rec
+{
+  name = "netmask-${version}";
+  version = "2.4.3";
+
+  src = fetchFromGitHub {
+    owner = "tlby";
+    repo = "netmask";
+    rev = "v${version}";
+    sha256 = "1n6b9f60j7hfdbpbppgkhz3lr7pg963bxnfrq95i1d49xmx41f87";
+  };
+
+  buildInputs = [ automake autoconf texinfo ];
+
+  preConfigure = ''
+  ./autogen
+  '';
+
+  meta =
+  {
+    homepage = https://github.com/tlby/netmask;
+    description = "An IP address formatting tool ";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.jensbin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18c59c6264d..ddbca2e0ebe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2658,6 +2658,8 @@ with pkgs;
 
   ipcalc = callPackage ../tools/networking/ipcalc {};
 
+  netmask = callPackage ../tools/networking/netmask {};
+
   ipv6calc = callPackage ../tools/networking/ipv6calc {};
 
   ipxe = callPackage ../tools/misc/ipxe { };

From 59b525e5595ef300a34381e672f33465b6561464 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 31 Aug 2017 14:32:05 -0400
Subject: [PATCH 3145/3246] sherpa: 2.2.1 -> 2.2.4

---
 pkgs/applications/science/physics/sherpa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
index e1e7c43943a..cdbe19c53b3 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sherpa-${version}";
-  version = "2.2.1";
+  version = "2.2.4";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
-    sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali";
+    sha256 = "1rw0ivx78zkbkl7nwil9i4fn8rvkifc3i20zrq3asbi4kb6brj2x";
   };
 
   buildInputs = [ gfortran sqlite lhapdf rivet ];

From 79bca40c37d3e8de6bd0183a5515a22d403b1c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 31 Aug 2017 21:06:13 +0200
Subject: [PATCH 3146/3246] ghostscript: include X by default

Currently the closure-size difference between `ghostscript` and
`ghostscriptX` was ~140 vs. ~142 MB, which was wasteful, as the output
itself is ~40 MB. (x86_64-linux)

Also make ghostscriptX the full derivation, including CUPS support.
---
 pkgs/top-level/all-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18c59c6264d..5fa9d8cfe48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18717,12 +18717,13 @@ with pkgs;
 
   gensgs = callPackage_i686 ../misc/emulators/gens-gs { };
 
-  ghostscript = callPackage ../misc/ghostscript {
-    x11Support = false;
+  ghostscript = callPackage ../misc/ghostscript rec {
     cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin);
+    x11Support = cupsSupport; # with CUPS, X11 only adds very little
   };
 
   ghostscriptX = appendToName "with-X" (ghostscript.override {
+    cupsSupport = true;
     x11Support = true;
   });
 

From 79527c2196873c87056d470a0a6b7f83aba2cee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 31 Aug 2017 20:14:35 +0100
Subject: [PATCH 3147/3246] netmask: use autoreconfHook

---
 pkgs/tools/networking/netmask/default.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix
index ae2e9cc79f6..52727163704 100644
--- a/pkgs/tools/networking/netmask/default.nix
+++ b/pkgs/tools/networking/netmask/default.nix
@@ -1,7 +1,6 @@
-{stdenv, fetchFromGitHub, automake, autoconf, texinfo}:
+{ stdenv, fetchFromGitHub, autoreconfHook, texinfo }:
 
-stdenv.mkDerivation rec
-{
+stdenv.mkDerivation rec {
   name = "netmask-${version}";
   version = "2.4.3";
 
@@ -12,18 +11,14 @@ stdenv.mkDerivation rec
     sha256 = "1n6b9f60j7hfdbpbppgkhz3lr7pg963bxnfrq95i1d49xmx41f87";
   };
 
-  buildInputs = [ automake autoconf texinfo ];
+  buildInputs = [ texinfo ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  preConfigure = ''
-  ./autogen
-  '';
-
-  meta =
-  {
+  meta = with stdenv.lib; {
     homepage = https://github.com/tlby/netmask;
     description = "An IP address formatting tool ";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.jensbin ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jensbin ];
   };
 }

From cb61e27e9e14b2a0d21d3bcbfc7990b2fb9a415a Mon Sep 17 00:00:00 2001
From: Frank <frank.boeddeker@gmx.net>
Date: Thu, 31 Aug 2017 21:10:00 +0200
Subject: [PATCH 3148/3246] profanity support for unix

---
 .../networking/instant-messengers/profanity/default.nix         | 2 +-
 pkgs/development/libraries/libmesode/default.nix                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index e1a068393b1..68f632d4b6f 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://profanity.im/;
     license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.devhell ];
     updateWalker = true;
   };
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
index d36d483b92c..9dae423efd7 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/boothj5/libmesode/;
     license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.devhell ];
   };
 }

From 91054336ce8fcaedb5d98a4b53f177b52f63d0d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 Aug 2017 21:42:55 +0200
Subject: [PATCH 3149/3246] multi-ghc-travis: update to latest git head

---
 pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 90c9126c2b9..8f9095fae13 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "multi-ghc-travis-${version}";
-  version = "git-2017-07-27";
+  version = "20170728-git";
 
   buildInputs = [ ghc ];
 
   src = fetchFromGitHub {
     owner = "hvr";
     repo = "multi-ghc-travis";
-    rev = "f21804164cf646d682d7da668a625cdbd8baf05a";
-    sha256 = "07l3qzlc2hl7g5wbgqh8ld8ynl004i6m7p903667gbhs7sw03nbl";
+    rev = "437739986fc81ca8c010e5d889348ba74171e680";
+    sha256 = "05fbc7ab9c25k19xj0iax72gv62l89dw2m4bci7h76y9hcajs5v4";
   };
 
   installPhase = ''

From 2eeffa6993775b9c418f8de6e706e684d30390c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Aug 2017 13:19:19 +0200
Subject: [PATCH 3150/3246] hackage2nix: update list of broken builds

---
 .../configuration-hackage2nix.yaml            | 155 ++++++++++++++++++
 1 file changed, 155 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 426a015418a..7ba056148ed 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2720,6 +2720,7 @@ dont-distribute-packages:
   4Blocks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   AAI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   abacate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  abcBridge:                                    [ "x86_64-darwin" ]
   abcnotation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   abeson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   AbortT-monadstf:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2833,6 +2834,7 @@ dont-distribute-packages:
   alternative-io:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   altfloat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   alure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ALUT:                                         [ "x86_64-darwin" ]
   amazon-emailer-client-snap:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2890,6 +2892,7 @@ dont-distribute-packages:
   approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbtt:                                        [ "x86_64-darwin" ]
   archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2925,6 +2928,7 @@ dont-distribute-packages:
   assimp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-dejafu:                                 [ "x86_64-darwin" ]
   asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2938,6 +2942,7 @@ dont-distribute-packages:
   attic-schedule:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoBencode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-data:                              [ "x86_64-darwin" ]
   attoparsec-iteratee:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text-enumerator:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2986,10 +2991,12 @@ dont-distribute-packages:
   aws-sdk-xml-unordered:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  axiom:                                        [ "x86_64-darwin" ]
   azubi:                                        [ 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 ]
+  babylon:                                      [ "x86_64-darwin" ]
   backdropper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   backtracking-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   backward-state:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3012,6 +3019,7 @@ dont-distribute-packages:
   Barracuda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base32-bytestring:                            [ "x86_64-darwin" ]
   base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3070,8 +3078,10 @@ dont-distribute-packages:
   bindings-EsounD:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-fann:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-friso:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-gpgme:                               [ "x86_64-darwin" ]
   bindings-gsl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-gts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-hamlib:                              [ "x86_64-darwin" ]
   bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libftdi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3080,11 +3090,17 @@ dont-distribute-packages:
   bindings-libstemmer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libv4l2:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-linux-videodev2:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-mmap:                                [ "x86_64-darwin" ]
   bindings-monetdb-mapi:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-parport:                             [ "x86_64-darwin" ]
+  bindings-portaudio:                           [ "x86_64-darwin" ]
+  bindings-posix:                               [ "x86_64-darwin" ]
+  bindings-ppdev:                               [ "x86_64-darwin" ]
   bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sipc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-wlc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binding-wx:                                   [ "x86_64-darwin" ]
   bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindynamic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed-example:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3113,6 +3129,7 @@ dont-distribute-packages:
   bitmaps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bits-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bits-extras:                                  [ "x86_64-darwin" ]
   bitspeak:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bit-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3141,6 +3158,7 @@ dont-distribute-packages:
   Blogdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloomfilter-redis:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bloxorz:                                      [ "x86_64-darwin" ]
   blubber:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3177,6 +3195,7 @@ dont-distribute-packages:
   btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  btrfs:                                        [ "x86_64-darwin" ]
   buchhaltung:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3256,6 +3275,7 @@ dont-distribute-packages:
   Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  caramia:                                      [ "x86_64-darwin" ]
   carboncopy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   carte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3433,6 +3453,7 @@ dont-distribute-packages:
   cmd-item:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmdtheline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c-mosquitto:                                  [ "x86_64-darwin" ]
   cmph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3770,6 +3791,7 @@ dont-distribute-packages:
   definitive-reactive:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   definitive-sound:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   deiko-config:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dejafu:                                       [ "x86_64-darwin" ]
   deka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   deka-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   delicious:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3850,6 +3872,7 @@ dont-distribute-packages:
   DiscussionSupportSystem:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dish:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   disjoint-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diskhash:                                     [ "x86_64-darwin" ]
   distance-of-time:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3896,6 +3919,7 @@ dont-distribute-packages:
   dotfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dot-linker:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   download-media-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dow:                                          [ "x86_64-darwin" ]
   dozenal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dozens:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3990,6 +4014,8 @@ dont-distribute-packages:
   ekg-log:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-rrd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  elerea-examples:                              [ "x86_64-darwin" ]
+  elerea-sdl:                                   [ "x86_64-darwin" ]
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   eliminators:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4019,8 +4045,10 @@ dont-distribute-packages:
   env-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   epanet-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   epass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  epic:                                         [ "x86_64-darwin" ]
   epoll:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   epubname:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  epub-tools:                                   [ "x86_64-darwin" ]
   Eq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   EqualitySolver:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   erd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4044,6 +4072,7 @@ dont-distribute-packages:
   estreps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etage-Graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EtaMOO:                                       [ "x86_64-darwin" ]
   Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etherbunny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4158,6 +4187,7 @@ dont-distribute-packages:
   fields:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   FieldTrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fieldwise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filecache:                                    [ "x86_64-darwin" ]
   file-collection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   file-command-qq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   filediff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4191,6 +4221,7 @@ dont-distribute-packages:
   fixed-width:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixfile:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fix-parser-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixplate:                                     [ "x86_64-darwin" ]
   fix-symbols-gitit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac-picture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4275,6 +4306,7 @@ dont-distribute-packages:
   friday-devil:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-scale-dct:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   frp-arduino:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frpnow-gtk3:                                  [ "x86_64-darwin" ]
   fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsh-csv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4304,6 +4336,7 @@ dont-distribute-packages:
   fusion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   futun:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fuzzytime:                                    [ "x86_64-darwin" ]
   fuzzy-timings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-glfw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4320,6 +4353,7 @@ dont-distribute-packages:
   gcodehs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-ig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GeBoP:                                        [ "x86_64-darwin" ]
   geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gegl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4395,12 +4429,18 @@ dont-distribute-packages:
   ghc-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   giak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-cairo:                                     [ "x86_64-darwin" ]
   Gifcurry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-gdk:                                       [ "x86_64-darwin" ]
   gi-ggit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstpbutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gsttag:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-gtk-hs:                                    [ "x86_64-darwin" ]
   gi-gtkosxapplication:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-gtksource:                                 [ "x86_64-darwin" ]
+  gi-gtk:                                       [ "x86_64-darwin" ]
   gi-notify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-pangocairo:                                [ "x86_64-darwin" ]
   gipeda:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-poppler:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4434,6 +4474,8 @@ dont-distribute-packages:
   GLFW-b-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-OGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-task:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GLFW:                                         [ "x86_64-darwin" ]
+  GLHUI:                                        [ "x86_64-darwin" ]
   gli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   glirc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gll:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4492,7 +4534,9 @@ dont-distribute-packages:
   gpio:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Collada:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GPipe-GLFW:                                   [ "x86_64-darwin" ]
   GPipe-TextureLoad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GPipe:                                        [ "x86_64-darwin" ]
   gps2htmlReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gpx-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4501,6 +4545,7 @@ dont-distribute-packages:
   grammar-combinators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammatical-parsers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-ui-gtk:                            [ "x86_64-darwin" ]
   Graph500:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphbuilder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphene:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4532,6 +4577,7 @@ dont-distribute-packages:
   grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GroteTrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-converters:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  group-by-date:                                [ "x86_64-darwin" ]
   group-with:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   growler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4542,6 +4588,7 @@ dont-distribute-packages:
   gsl-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gssapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gssapi-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gstreamer:                                    [ "x86_64-darwin" ]
   GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4554,13 +4601,17 @@ dont-distribute-packages:
   gtk2hs-hello:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-rpn:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk3-mac-integration:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk3:                                         [ "x86_64-darwin" ]
   gtkglext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GtkGLTV:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkimageview:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-largeTreeStore:                           [ "x86_64-darwin" ]
   gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkrsync:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtksourceview3:                               [ "x86_64-darwin" ]
   gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-traymanager:                              [ "x86_64-darwin" ]
   guarded-rewriting:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   guess-combinator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   guid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4632,6 +4683,7 @@ dont-distribute-packages:
   halma-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-telegram-bot:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hamid:                                        [ "x86_64-darwin" ]
   HaMinitel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4978,6 +5030,7 @@ dont-distribute-packages:
   hi3status:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiccup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hichi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hid:                                          [ "x86_64-darwin" ]
   hieraclus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-clustering-diagrams:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4985,12 +5038,14 @@ dont-distribute-packages:
   hiernotify:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hieroglyph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HiggsSet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  higher-leveldb:                               [ "x86_64-darwin" ]
   higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   highWaterMark:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   himg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   himpy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hindley-milner:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinotify-bytestring:                          [ "x86_64-darwin" ]
   hinquire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinstaller:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hint-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5000,6 +5055,8 @@ dont-distribute-packages:
   hipchat-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HipmunkPlayground:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hipmunk-Utils:                                [ "x86_64-darwin" ]
+  Hipmunk:                                      [ "x86_64-darwin" ]
   hircules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hirt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hish:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5041,6 +5098,7 @@ dont-distribute-packages:
   hmarkup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-banded:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-mmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-morpheus:                             [ "x86_64-darwin" ]
   hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nlopt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5050,6 +5108,7 @@ dont-distribute-packages:
   hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmidi:                                        [ "x86_64-darwin" ]
   hmk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmm-hmatrix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5080,11 +5139,13 @@ dont-distribute-packages:
   Holumbus-MapReduce:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Searchengine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Storage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hol:                                          [ "x86_64-darwin" ]
   homeomorphic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hommage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   homplexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   honi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  honk:                                         [ "x86_64-darwin" ]
   hoobuddy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5120,6 +5181,7 @@ dont-distribute-packages:
   hpaste:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpasteit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpath:                                        [ "x86_64-darwin" ]
   hpc-tracer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpdft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5210,6 +5272,7 @@ dont-distribute-packages:
   HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHTSLib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsI2C:                                        [ "x86_64-darwin" ]
   hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-java:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5268,6 +5331,8 @@ dont-distribute-packages:
   hs-re:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-scrape:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsseccomp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsshellscript:                                [ "x86_64-darwin" ]
+  hssourceinfo:                                 [ "x86_64-darwin" ]
   hsSqlite3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsSVN:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5321,6 +5386,7 @@ dont-distribute-packages:
   htune:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   htzaar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hubris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  huckleberry:                                  [ "x86_64-darwin" ]
   HueAPI:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   huff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hugs2yc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5328,6 +5394,7 @@ dont-distribute-packages:
   HulkImport:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hums:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hunit-dejafu:                                 [ "x86_64-darwin" ]
   HUnit-Diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunit-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunit-rematch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5351,6 +5418,9 @@ dont-distribute-packages:
   hwsl2-bytevector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-reducers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-xml:                                       [ "x86_64-darwin" ]
+  H:                                            [ "x86_64-darwin" ]
+  hXmixer:                                      [ "x86_64-darwin" ]
   hxmppc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXMPP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxournal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5388,6 +5458,7 @@ dont-distribute-packages:
   iap-verifier:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ib-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   IcoGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iconv-typed:                                  [ "x86_64-darwin" ]
   ideas-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-common:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5455,6 +5526,7 @@ dont-distribute-packages:
   inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   informative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   inject-function:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inline-r:                                     [ "x86_64-darwin" ]
   inserts:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inspector-wrecker:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-aeson:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5472,6 +5544,7 @@ dont-distribute-packages:
   interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpol:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   interruptible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  intricacy:                                    [ "x86_64-darwin" ]
   introduction-test:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   intro-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   intset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5500,6 +5573,7 @@ dont-distribute-packages:
   ironforge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   iron-mq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   isevaluated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  isiz:                                         [ "x86_64-darwin" ]
   ismtp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   IsNull:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iso8583-bitmaps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5526,6 +5600,7 @@ dont-distribute-packages:
   jack-bindings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jackminimix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   JackMiniMix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jack:                                         [ "x86_64-darwin" ]
   jacobi-roots:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jail:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jalaali:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5658,6 +5733,7 @@ dont-distribute-packages:
   ktx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure-your-boilerplate:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   KyotoCabinet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kyotocabinet:                                 [ "x86_64-darwin" ]
   labeled-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   laborantin-hs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   labyrinth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5712,6 +5788,7 @@ dont-distribute-packages:
   language-ninja:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-puppet:                              [ "x86_64-darwin" ]
   language-python-colour:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-qux:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-sh:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5741,6 +5818,7 @@ dont-distribute-packages:
   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 ]
+  leancheck:                                    [ "x86_64-darwin" ]
   leapseconds:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   learn-physics-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   learn-physics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5761,6 +5839,7 @@ dont-distribute-packages:
   lenz-template:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Level0:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leveldb-haskell-fork:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  leveldb-haskell:                              [ "x86_64-darwin" ]
   levmar-chart:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   levmar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lgtk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5790,6 +5869,7 @@ dont-distribute-packages:
   libssh2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   libsystemd-daemon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   libtagc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libvirt-hs:                                   [ "x86_64-darwin" ]
   libxls:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5820,7 +5900,12 @@ dont-distribute-packages:
   linode-v4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-blkid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-cgroup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linux-evdev:                                  [ "x86_64-darwin" ]
+  linux-file-extents:                           [ "x86_64-darwin" ]
+  linux-inotify:                                [ "x86_64-darwin" ]
   linux-kmod:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linux-mount:                                  [ "x86_64-darwin" ]
+  linux-namespaces:                             [ "x86_64-darwin" ]
   linux-perf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-ptrace:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   linx-gateway:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5852,15 +5937,20 @@ dont-distribute-packages:
   llvm-general:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general-pure:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general-quote:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-hs:                                      [ "x86_64-darwin" ]
   llvm-ht:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lmdb-high-level:                              [ "x86_64-darwin" ]
+  lmdb-simple:                                  [ "x86_64-darwin" ]
+  lmdb:                                         [ "x86_64-darwin" ]
   lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loc:                                          [ "x86_64-darwin" ]
   log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5986,6 +6076,7 @@ dont-distribute-packages:
   mattermost-api-qc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   maude:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maxent-learner-hw-gui:                        [ "x86_64-darwin" ]
   maxsharing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   maybench:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6137,6 +6228,7 @@ dont-distribute-packages:
   money:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongrel2-handler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monky:                                        [ "x86_64-darwin" ]
   Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6272,6 +6364,7 @@ dont-distribute-packages:
   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 ]
+  netlink:                                      [ "x86_64-darwin" ]
   NetSNMP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   netspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   netstring-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6327,6 +6420,7 @@ dont-distribute-packages:
   Ninjas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nitro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nix-paths:                                    [ "x86_64-darwin" ]
   nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlopt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlp-scores-scripts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6408,6 +6502,7 @@ dont-distribute-packages:
   onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-classy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenAL:                                       [ "x86_64-darwin" ]
   opench-meteo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6494,6 +6589,7 @@ dont-distribute-packages:
   parconc-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pareto:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parport:                                      [ "x86_64-darwin" ]
   Parry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-parsers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   parseerror-eq:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6575,6 +6671,7 @@ dont-distribute-packages:
   pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-transact:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  phoityne:                                     [ "x86_64-darwin" ]
   phone-numbers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-push:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   phooey:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6629,6 +6726,8 @@ dont-distribute-packages:
   plist-buddy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plivo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   plocketed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plot-gtk3:                                    [ "x86_64-darwin" ]
+  Plot-ho-matic:                                [ "x86_64-darwin" ]
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6665,11 +6764,14 @@ dont-distribute-packages:
   popenhs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   poppler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   portager:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  portaudio:                                    [ "x86_64-darwin" ]
   porte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   porter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   PortFusion:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ports:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-pty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  posix-realtime:                               [ "x86_64-darwin" ]
+  posix-timer:                                  [ "x86_64-darwin" ]
   posix-waitpid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   postcodes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6685,7 +6787,9 @@ dont-distribute-packages:
   postmark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmark-streams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   potato-tool:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  powermate:                                    [ "x86_64-darwin" ]
   powerpc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  powerqueue-levelmem:                          [ "x86_64-darwin" ]
   PPrinter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqueue-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6742,6 +6846,7 @@ dont-distribute-packages:
   property-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   proplang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prosper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proteaaudio:                                  [ "x86_64-darwin" ]
   protobuf-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6760,6 +6865,7 @@ dont-distribute-packages:
   pugs-HsSyck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pugs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   PUH-Project:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pulseaudio:                                   [ "x86_64-darwin" ]
   punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6888,12 +6994,15 @@ dont-distribute-packages:
   react-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-gi-gtk:                       [ "x86_64-darwin" ]
   reactive-banana-sdl2:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-threepenny:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-wx:                           [ "x86_64-darwin" ]
   reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-jack:                                [ "x86_64-darwin" ]
   reactive-thread:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6916,6 +7025,7 @@ dont-distribute-packages:
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reenact:                                      [ "x86_64-darwin" ]
   refcount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Referees:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   refh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7078,6 +7188,7 @@ dont-distribute-packages:
   rset:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rspp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rtnetlink:                                    [ "x86_64-darwin" ]
   rtorrent-rpc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtorrent-state:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rts-loader:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7167,6 +7278,11 @@ dont-distribute-packages:
   sdl2-cairo-image:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-gfx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SDL-gfx:                                      [ "x86_64-darwin" ]
+  SDL-image:                                    [ "x86_64-darwin" ]
+  SDL-mixer:                                    [ "x86_64-darwin" ]
+  SDL-mpeg:                                     [ "x86_64-darwin" ]
+  SDL-ttf:                                      [ "x86_64-darwin" ]
   sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   search:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7179,6 +7295,7 @@ dont-distribute-packages:
   secrm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sednaDBXML:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   selectors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  select:                                       [ "x86_64-darwin" ]
   selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   selenium-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   selinux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7245,6 +7362,7 @@ dont-distribute-packages:
   set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sfml-audio:                                   [ "x86_64-darwin" ]
   SFML-control:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFML:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sfmt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7270,6 +7388,7 @@ dont-distribute-packages:
   shapely-data:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-buffer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-fields:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shared-memory:                                [ "x86_64-darwin" ]
   sha-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   she:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelduck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7285,6 +7404,7 @@ dont-distribute-packages:
   showdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  si-clock:                                     [ "x86_64-darwin" ]
   sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7458,6 +7578,7 @@ dont-distribute-packages:
   spata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   special-functors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   specialize-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  speculate:                                    [ "x86_64-darwin" ]
   spelling-suggest:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphinx-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7618,12 +7739,15 @@ dont-distribute-packages:
   synthesizer-filter:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-llvm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sysinfo:                                      [ "x86_64-darwin" ]
   Sysmon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-inotify:                               [ "x86_64-darwin" ]
   system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-locale:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   systemstats:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-time-monotonic:                        [ "x86_64-darwin" ]
   t3-client:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   t3-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   table:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7634,6 +7758,7 @@ dont-distribute-packages:
   table-tennis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tablize:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  taffybar:                                     [ "x86_64-darwin" ]
   tag-bits:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7647,6 +7772,8 @@ dont-distribute-packages:
   tagsoup-selection:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tahin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ta:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tailfile-hinotify:                            [ "x86_64-darwin" ]
+  tai:                                          [ "x86_64-darwin" ]
   Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   takusen-oracle:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7658,6 +7785,7 @@ dont-distribute-packages:
   task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   task:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-auto:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-dejafu:                                 [ "x86_64-darwin" ]
   tasty-groundhog-converters:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-integrate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-jenkins-xml:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7758,6 +7886,7 @@ dont-distribute-packages:
   th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threadscope:                                  [ "x86_64-darwin" ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7779,6 +7908,7 @@ dont-distribute-packages:
   timberc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-exts:                                    [ "x86_64-darwin" ]
   time-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7841,6 +7971,7 @@ dont-distribute-packages:
   transformers-runnable:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   TransformersStepByStep:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   transient-universe-tls:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  transient-universe:                           [ "x86_64-darwin" ]
   translatable-intset:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   translate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   trasa-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7872,6 +8003,7 @@ dont-distribute-packages:
   tsp-viz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsvsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tuntap-simple:                                [ "x86_64-darwin" ]
   tup-functor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-hlist:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7880,6 +8012,7 @@ dont-distribute-packages:
   tuple-morph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   turingMachine:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   turing-machines:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  turing-music:                                 [ "x86_64-darwin" ]
   tweak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweet-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7935,6 +8068,7 @@ dont-distribute-packages:
   type-spine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-structure:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-sub-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tz:                                           [ "x86_64-darwin" ]
   u2f:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uAgda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   uber:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7965,6 +8099,7 @@ dont-distribute-packages:
   universe-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-fcntl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-process-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Unixutils-shadow:                             [ "x86_64-darwin" ]
   unordered-containers-rematch:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unpack-funcs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unroll-ghc-plugin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8021,7 +8156,10 @@ dont-distribute-packages:
   variables:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vcache-trie:                                  [ "x86_64-darwin" ]
+  vcache:                                       [ "x86_64-darwin" ]
   vcatt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vcsgui:                                       [ "x86_64-darwin" ]
   Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating-accelerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8135,6 +8273,7 @@ dont-distribute-packages:
   WeberLogic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   webfinger-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-fpco:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkit2gtk3-javascriptcore:                   [ "x86_64-darwin" ]
   webkit-javascriptcore:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-output:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8164,9 +8303,11 @@ dont-distribute-packages:
   wide-word:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   WikimediaParser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wikipedia4epub:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wild-bind-task-x11:                           [ "x86_64-darwin" ]
   windowslive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   winerror:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   winio:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Wired:                                        [ "x86_64-darwin" ]
   wires:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPControl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8203,12 +8344,16 @@ dont-distribute-packages:
   wumpus-microprint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wumpus-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   WURFL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wxAsteroids:                                  [ "x86_64-darwin" ]
+  wxcore:                                       [ "x86_64-darwin" ]
+  wxc:                                          [ "x86_64-darwin" ]
   WXDiffCtrl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
+  wx:                                           [ "x86_64-darwin" ]
   wyvern:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-rm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8216,8 +8361,10 @@ dont-distribute-packages:
   X11-xfixes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   x509-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xbattbar:                                     [ "x86_64-darwin" ]
   xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xdot:                                         [ "x86_64-darwin" ]
   x-dsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Xec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xfconf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8227,8 +8374,10 @@ dont-distribute-packages:
   xhb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xine:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xkbcommon:                                    [ "x86_64-darwin" ]
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xls:                                          [ "x86_64-darwin" ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8256,6 +8405,7 @@ dont-distribute-packages:
   xmonad-contrib-bluetilebranch:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-contrib-gpl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmonad-utils:                                 [ "x86_64-darwin" ]
   xmonad-vanessa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-wallpaper:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-windownames:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8269,6 +8419,7 @@ dont-distribute-packages:
   xsact:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   XSaiga:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xslt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xtc:                                          [ "x86_64-darwin" ]
   y0l0bot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yabi-muno:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8280,6 +8431,7 @@ dont-distribute-packages:
   yajl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml2owl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yamlkeysdiff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  YamlReference:                                [ "x86_64-darwin" ]
   yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8392,6 +8544,7 @@ dont-distribute-packages:
   zipkin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ziptastic-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ziptastic-core:                               [ "x86_64-darwin" ]
   zlib-enum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZMachine:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   zmcat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8403,6 +8556,8 @@ dont-distribute-packages:
   zoom-cache-sndfile:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-refs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zot:                                          [ "x86_64-darwin" ]
   zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zstd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Zwaluw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zxcvbn-c:                                     [ "x86_64-darwin" ]

From e21497f268f87bb600452e3c7af65301a564ae3d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Aug 2017 03:00:42 +0200
Subject: [PATCH 3151/3246] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.5-1-gf0558f5 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e8af693832dafaacee039174b65ad48d85419ed6.
---
 .../haskell-modules/hackage-packages.nix      | 960 +++++++++++++++---
 1 file changed, 837 insertions(+), 123 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6e4f936245a..3cabf7ff100 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -492,6 +492,7 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freealut;};
 
   "AMI" = callPackage
@@ -4896,6 +4897,7 @@ self: {
        homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
@@ -5867,6 +5869,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;};
 
   "GLFW-OGL" = callPackage
@@ -5943,6 +5946,7 @@ self: {
        librarySystemDepends = [ libX11 mesa ];
        description = "Open OpenGL context windows in X11 with libX11";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;};
 
   "GLM" = callPackage
@@ -6072,6 +6076,7 @@ self: {
        homepage = "https://github.com/tobbebex/GPipe-Core#readme";
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -6118,6 +6123,7 @@ self: {
        homepage = "https://github.com/plredmond/GPipe-GLFW";
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GPipe-TextureLoad" = callPackage
@@ -6219,6 +6225,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GeBoP";
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GenI" = callPackage
@@ -6938,6 +6945,7 @@ self: {
        homepage = "https://tweag.github.io/HaskellR";
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "HARM" = callPackage
@@ -9478,6 +9486,7 @@ self: {
        homepage = "https://github.com/meteficha/Hipmunk";
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Hipmunk-Utils" = callPackage
@@ -9491,6 +9500,7 @@ self: {
        homepage = "https://github.com/suzumiyasmith/Hipmunk-Utils#readme";
        description = "Useful functions for Hipmunk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "HipmunkPlayground" = callPackage
@@ -12960,6 +12970,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "NoTrace_0_3_0_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "NoTrace";
+       version = "0.3.0.2";
+       sha256 = "0nqjjhfycvalva0l660cxgqj793kcsyb75rd3dlp58d2i947isir";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/CindyLinz/Haskell-NoTrace";
+       description = "Remove all the functions come from Debug.Trace after debugging";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Noise" = callPackage
     ({ mkDerivation, array, base, data-default, vector }:
      mkDerivation {
@@ -13468,6 +13492,7 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) openal;};
 
   "OpenCL" = callPackage
@@ -14198,8 +14223,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.11.2.0";
-       sha256 = "1jxxvd49b40gsrd5vppfd1f94h166475mxy8f0bhbjmpngdhjdcj";
+       version = "0.12.0.0";
+       sha256 = "0dmsgmw1gqx3bsdvw4y0gc02pc4shf97kq3hv757gqi1rsg4fsdy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14210,6 +14235,7 @@ self: {
        executableHaskellDepends = [ base containers generic-accessors ];
        description = "Real-time line plotter for generic data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "PlslTools" = callPackage
@@ -15490,6 +15516,7 @@ self: {
        librarySystemDepends = [ SDL_gfx ];
        description = "Binding to libSDL_gfx";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_gfx;};
 
   "SDL-image" = callPackage
@@ -15505,6 +15532,7 @@ self: {
        librarySystemDepends = [ SDL_image ];
        description = "Binding to libSDL_image";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_image;};
 
   "SDL-mixer" = callPackage
@@ -15520,6 +15548,7 @@ self: {
        librarySystemDepends = [ SDL_mixer ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_mixer;};
 
   "SDL-mpeg" = callPackage
@@ -15533,6 +15562,7 @@ self: {
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
@@ -15546,6 +15576,7 @@ self: {
        librarySystemDepends = [ SDL_ttf ];
        description = "Binding to libSDL_ttf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_ttf;};
 
   "SDL2-ttf" = callPackage
@@ -17987,6 +18018,7 @@ self: {
        homepage = "http://src.seereason.com/haskell-unixutils-shadow";
        description = "A simple interface to shadow passwords (aka, shadow.h)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Updater" = callPackage
@@ -18191,20 +18223,20 @@ self: {
      }) {};
 
   "Villefort" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, FindBin
-     , HDBC, HDBC-sqlite3, mtl, process, random, scotty, split, strict
-     , text, time, transformers, unix
+    ({ mkDerivation, base, bytestring, directory, filepath, HDBC
+     , HDBC-sqlite3, mtl, process, random, scotty, split, strict, text
+     , time, transformers, unix
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.1.5";
-       sha256 = "1rp624kdrc8gx0zsxa5q68n458mdbjr0qf94s7dc7030rgvqs8l6";
+       version = "0.1.1.10";
+       sha256 = "1rnw0k9brb8m2gcac4adknnzldzfwv6w72wfc3rrxrxajyk8za32";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring directory filepath FindBin HDBC HDBC-sqlite3 mtl
-         process random scotty split strict text time transformers unix
+         base bytestring directory filepath HDBC HDBC-sqlite3 mtl process
+         random scotty split strict text time transformers unix
        ];
        executableHaskellDepends = [
          base HDBC HDBC-sqlite3 random scotty split text time
@@ -18719,6 +18751,7 @@ self: {
        homepage = "http://www.cse.chalmers.se/~emax/wired/";
        description = "Wire-aware hardware description";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "WordAlignment" = callPackage
@@ -19180,6 +19213,7 @@ self: {
        homepage = "http://www.ben-kiki.org/oren/YamlReference";
        description = "YAML reference implementation";
        license = "LGPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Yampa" = callPackage
@@ -19474,6 +19508,7 @@ self: {
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {abc = null;};
 
   "abcnotation" = callPackage
@@ -21517,6 +21552,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "aeson-injector_1_0_9_0" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens
+     , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2
+     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "aeson-injector";
+       version = "1.0.9.0";
+       sha256 = "1qa2fv1lpn4xj6cxnbq5bgkzzqspwq6zzkfqxxcl83frsy90975i";
+       libraryHaskellDepends = [
+         aeson base bifunctors deepseq lens servant-docs swagger2 text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base HUnit lens QuickCheck quickcheck-text scientific
+         swagger2 tasty tasty-hunit tasty-quickcheck text vector
+       ];
+       description = "Injecting fields into aeson values";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-iproute" = callPackage
     ({ mkDerivation, aeson, base, iproute, text }:
      mkDerivation {
@@ -22515,6 +22573,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alerts" = callPackage
+    ({ mkDerivation, base, blaze-html, text }:
+     mkDerivation {
+       pname = "alerts";
+       version = "0.1.0.0";
+       sha256 = "0s6af3267qfg18zsy0fb43hfwf3dym2zpr864n05xwgzmg9qwhaj";
+       libraryHaskellDepends = [ base blaze-html text ];
+       homepage = "https://github.com/alx741/alerts#readme";
+       description = "Alert messages for web applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "alex" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, directory
      , filepath, happy, process, QuickCheck
@@ -25848,6 +25918,8 @@ self: {
        pname = "api-tools";
        version = "0.5.2";
        sha256 = "0pd2kaii40isbnc1rgh0zkm2abrljipmq27nlgz3zbldbm1l5xw6";
+       revision = "1";
+       editedCabalFile = "0mmay0si68ib7slc044fjxcsylg2499gn6i2migfi0v07qdc3na3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -26654,6 +26726,7 @@ self: {
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libXScrnSaver;};
 
   "archive" = callPackage
@@ -27912,6 +27985,7 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Run MonadConc operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "async-extra" = callPackage
@@ -28598,6 +28672,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/attoparsec-data";
        description = "Parsers for the standard Haskell data types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "attoparsec-enumerator" = callPackage
@@ -30010,6 +30085,7 @@ self: {
        homepage = "https://github.com/transient-haskell/axiom";
        description = "Web EDSL for running in browsers and server nodes using transient";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "axiomatic-classes" = callPackage
@@ -30142,18 +30218,21 @@ self: {
 
   "b-tree" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , directory, errors, filepath, lens, mmap, mtl, pipes
-     , pipes-interleave, QuickCheck, transformers, vector
+     , directory, errors, exceptions, filepath, lens, mmap, mtl, pipes
+     , pipes-interleave, QuickCheck, tasty, tasty-quickcheck
+     , transformers, vector
      }:
      mkDerivation {
        pname = "b-tree";
-       version = "0.1.2";
-       sha256 = "19258xrys1pjb6n9w634zig6vhbyv86fyd4pfpf3mc8lk9gah6r0";
+       version = "0.1.3";
+       sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb";
        libraryHaskellDepends = [
-         base binary bytestring containers directory errors filepath lens
-         mmap mtl pipes pipes-interleave transformers vector
+         base binary bytestring containers directory errors exceptions
+         filepath lens mmap mtl pipes pipes-interleave transformers vector
+       ];
+       testHaskellDepends = [
+         base binary containers pipes QuickCheck tasty tasty-quickcheck
        ];
-       testHaskellDepends = [ base binary containers pipes QuickCheck ];
        benchmarkHaskellDepends = [ base criterion pipes ];
        homepage = "http://github.com/bgamari/b-tree";
        description = "Immutable disk-based B* trees";
@@ -30222,6 +30301,7 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "backdropper" = callPackage
@@ -30870,6 +30950,7 @@ self: {
        homepage = "https://github.com/pxqr/base32-bytestring";
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "base32string" = callPackage
@@ -32699,6 +32780,7 @@ self: {
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings" = callPackage
@@ -33000,6 +33082,7 @@ self: {
        homepage = "http://bitbucket.org/mauricio/bindings-gpgme";
        description = "Project bindings-* raw interface to gpgme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) gpgme;};
 
   "bindings-gsl" = callPackage
@@ -33044,6 +33127,7 @@ self: {
        homepage = "https://github.com/relrod/hamlib-haskell";
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
@@ -33230,6 +33314,7 @@ self: {
        libraryHaskellDepends = [ bindings-posix ];
        description = "(deprecated) see bindings-posix instead";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings-monetdb-mapi" = callPackage
@@ -33285,6 +33370,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "parport bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings-portaudio" = callPackage
@@ -33297,6 +33383,7 @@ self: {
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) portaudio;};
 
   "bindings-posix" = callPackage
@@ -33308,6 +33395,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low level bindings to posix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings-potrace" = callPackage
@@ -33332,6 +33420,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings-saga-cmd" = callPackage
@@ -34239,6 +34328,7 @@ self: {
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gcc_s = null;};
 
   "bitset" = callPackage
@@ -34411,8 +34501,8 @@ self: {
     ({ mkDerivation, base, containers, directory, text }:
      mkDerivation {
        pname = "bizzlelude";
-       version = "1.0.1";
-       sha256 = "16d38igqmqr42kx3jx0wbc1qykz3jf6s2hdx1f1s6bxbw33a47qb";
+       version = "1.0.3";
+       sha256 = "135wbjk79j0ayipkpv761ybnsq1001mvbcry3pl8fg1s8zbdaqfh";
        libraryHaskellDepends = [ base containers directory text ];
        homepage = "http://github.com/TheBizzle";
        description = "A lousy Prelude replacement by a lousy dude";
@@ -34984,13 +35074,13 @@ self: {
   "ble" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, d-bus
      , data-default-class, hslogger, hspec, markdown-unlit, microlens
-     , microlens-ghc, mtl, process, QuickCheck, quickcheck-instances
-     , random, stm, text, transformers, uuid
+     , microlens-ghc, mtl, optparse-applicative, process, QuickCheck
+     , quickcheck-instances, random, stm, text, transformers, uuid
      }:
      mkDerivation {
        pname = "ble";
-       version = "0.4.0.0";
-       sha256 = "0c4m9ia92djr8lhp6n1zwwxskr344322m8g24ka4skbrp1vy3qnd";
+       version = "0.4.1";
+       sha256 = "1ascfscxg24crc2bv1vsgdp72gg3lql2pabg66zhv8vcvqcrlcah";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -35000,8 +35090,8 @@ self: {
        ];
        executableHaskellDepends = [
          base bytestring cereal containers d-bus data-default-class hslogger
-         markdown-unlit microlens microlens-ghc mtl random stm text
-         transformers uuid
+         markdown-unlit microlens microlens-ghc mtl optparse-applicative
+         random stm text transformers uuid
        ];
        testHaskellDepends = [
          base bytestring cereal containers d-bus data-default-class hslogger
@@ -35275,6 +35365,7 @@ self: {
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "blubber" = callPackage
@@ -36604,6 +36695,7 @@ self: {
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "buchhaltung" = callPackage
@@ -36928,6 +37020,8 @@ self: {
        pname = "bus-pirate";
        version = "0.7.0";
        sha256 = "0zsh73nq802l180b3v6cd6x1h0cdf5r81i8sz8zvdd0d46lrnawk";
+       revision = "1";
+       editedCabalFile = "0amc8dk6v991iy1d23l5hbsn9lf551mjbm6mxldj46mm3y02nn67";
        libraryHaskellDepends = [
          base bytestring errors serialport transformers
        ];
@@ -37685,6 +37779,7 @@ self: {
        homepage = "https://github.com/tolysz/c-mosquitto#readme";
        description = "Simpe mosquito MQTT binding able to work with the Amazons IoT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) mosquitto;};
 
   "c-storable-deriving" = callPackage
@@ -39457,8 +39552,8 @@ self: {
     ({ mkDerivation, aeson, base }:
      mkDerivation {
        pname = "canteven-listen-http";
-       version = "1.0.0.1";
-       sha256 = "1ic1nyz6zvzba6k4ra66jvdvxnfbxy4sk2h04zfhiqqnpnj5n0w0";
+       version = "1.0.0.3";
+       sha256 = "1vcax1ipkd8s44pasr8qdrgjav4n2jnxd2qwamrl7kf6lm1i8n18";
        libraryHaskellDepends = [ aeson base ];
        description = "data types to describe HTTP services";
        license = stdenv.lib.licenses.asl20;
@@ -39652,6 +39747,7 @@ self: {
        homepage = "https://github.com/Noeda/caramia/";
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "carbonara" = callPackage
@@ -44710,8 +44806,8 @@ self: {
      }:
      mkDerivation {
        pname = "codec-rpm";
-       version = "0.1.2";
-       sha256 = "15rdraaqzgp7qga8075rfk1vg2w10vj47nnfb584acc66gsc0k8i";
+       version = "0.1.3";
+       sha256 = "18f7rn2k33v5k2g3gbfd6rmpq81gm02aj5xwdy1c8fxsf67fnn00";
        libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring conduit
          conduit-combinators conduit-extra mtl parsec pretty resourcet text
@@ -45091,6 +45187,7 @@ self: {
        homepage = "https://github.com/alunduil/collection-json.hs";
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ alunduil ];
      }) {};
 
   "collections" = callPackage
@@ -46944,8 +47041,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-algorithms";
-       version = "0.0.2.0";
-       sha256 = "17b2j4pm6d2r80q0f33sa1iyfxszmk5lgf94qdw9hbwhs6g7rfjb";
+       version = "0.0.3.0";
+       sha256 = "1bcn3gmq3dd23biw7widf1pmx7063yn5xn949cviw4nmfshrqahp";
        libraryHaskellDepends = [
          async base bytestring bzlib-conduit conduit conduit-combinators
          conduit-extra containers deepseq directory filepath mtl resourcet
@@ -51728,6 +51825,8 @@ self: {
        pname = "currency-codes";
        version = "1.0.0.3";
        sha256 = "0lfaikcig22y79fm75jc40d6ii3xrj4firyfssyqcqbyjhvf3fyn";
+       revision = "1";
+       editedCabalFile = "0jp3x19zymrjxlzrg98ch2fch9a1c93g41nzcfmxc6jjy5lh7x6z";
        libraryHaskellDepends = [
          aeson base bson lens random safe swagger2 text
        ];
@@ -53385,6 +53484,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-fix_0_0_6" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-fix";
+       version = "0.0.6";
+       sha256 = "10shw0c7c3v3qy27c8mahr56bzciikqmafpm01r7792i84glb10g";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/anton-k/data-fix";
+       description = "Fixpoint data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-fix-cse" = callPackage
     ({ mkDerivation, base, containers, data-fix, transformers }:
      mkDerivation {
@@ -55409,6 +55521,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "deburr" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "deburr";
+       version = "0.1.0.1";
+       sha256 = "0r6mqsb3x6pa2g4s24fyg67gx2ld3c2a539j96skg1lk7wxaxj54";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/pinktrink/deburr";
+       description = "Convert Unicode characters with burrs to their ASCII counterparts";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "decepticons" = callPackage
     ({ mkDerivation, base, comonad-transformers }:
      mkDerivation {
@@ -55852,6 +55977,7 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Systematic testing for Haskell concurrency";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "deka" = callPackage
@@ -58553,6 +58679,7 @@ self: {
        ];
        description = "Disk-based hash table";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "display-haskell-do" = callPackage
@@ -59186,6 +59313,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributed-static_0_3_8" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , rank1dynamic
+     }:
+     mkDerivation {
+       pname = "distributed-static";
+       version = "0.3.8";
+       sha256 = "1hpzsjwmmaj3cj4i54mg6g9dkk6vgwda66y8j14pjqmn49bzcjwm";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq rank1dynamic
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Compositional, type-safe, polymorphic static values and closures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "distribution" = callPackage
     ({ mkDerivation, array, base, containers, MonadRandom, random }:
      mkDerivation {
@@ -60357,6 +60501,7 @@ self: {
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "download" = callPackage
@@ -62970,6 +63115,7 @@ self: {
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "elerea-sdl" = callPackage
@@ -62982,6 +63128,7 @@ self: {
        homepage = "http://github.com/singpolyma/elerea-sdl";
        description = "Elerea FRP wrapper for SDL";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "elevator" = callPackage
@@ -64247,6 +64394,7 @@ self: {
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epoll" = callPackage
@@ -64337,6 +64485,7 @@ self: {
        homepage = "http://hub.darcs.net/dino/epub-tools";
        description = "Command line utilities for working with epub files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epubname" = callPackage
@@ -68809,6 +68958,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "A Linux-only cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "filediff" = callPackage
@@ -69669,6 +69819,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fixpoint" = callPackage
@@ -70143,6 +70294,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow_1_0_9" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.9";
+       sha256 = "1rqljbq4s9swh19r57gpp3nzxwgwa1j0q53m971i455wq1xszx1m";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       homepage = "https://github.com/tfausak/flow#readme";
+       description = "Write more understandable Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flow-er" = callPackage
     ({ mkDerivation, base, doctest, flow, QuickCheck }:
      mkDerivation {
@@ -72381,6 +72546,7 @@ self: {
        homepage = "https://github.com/george-steel/frpnow-gtk3";
        description = "Program GUIs with GTK3 and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "frquotes" = callPackage
@@ -73243,6 +73409,7 @@ self: {
        ];
        description = "A 'ten past six' style clock";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fwgl" = callPackage
@@ -76399,6 +76566,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghost-buster" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "ghost-buster";
+       version = "0.1.1.0";
+       sha256 = "1mpnvdb6p6hda645njnfia5j259byrs0mg2fl3syff3qww797l02";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/Lazersmoke/ghost-buster#readme";
+       description = "Existential type utilites";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ght" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-default, directory
      , filepath, iteratee, iteratee-compress, mmap, mtl, old-locale, SHA
@@ -76467,6 +76647,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) cairo;};
 
   "gi-gdk" = callPackage
@@ -76490,6 +76671,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gdkpixbuf" = callPackage
@@ -76770,6 +76952,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gtk-hs" = callPackage
@@ -76788,6 +76971,7 @@ self: {
        homepage = "https://github.com/haskell-gi/gi-gtk-hs";
        description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gi-gtkosxapplication" = callPackage
@@ -76833,6 +77017,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
 
   "gi-javascriptcore" = callPackage
@@ -76972,6 +77157,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
   "gi-poppler" = callPackage
@@ -79259,8 +79445,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.3.15";
-       sha256 = "0ki9s3drynmncd9nzw5xkbjpypz6qjzvbng3dv4kxf6jdd8wd6xl";
+       version = "0.3.16";
+       sha256 = "0fhwl0l5vzacqc62sdrvdsl0vhw1wi8l4c3pmg21nsgy73rxb1ar";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79273,7 +79459,7 @@ self: {
        testHaskellDepends = [
          aeson aeson-pretty base basic-prelude binary binary-conduit
          bytestring conduit conduit-extra lens rtcm sbp tasty tasty-golden
-         tasty-hunit text unordered-containers
+         tasty-hunit text time unordered-containers
        ];
        homepage = "http://github.com/swift-nav/gnss-converters";
        description = "GNSS Converters";
@@ -81698,6 +81884,7 @@ self: {
        homepage = "https://grapefruit-project.org/";
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "graph-core" = callPackage
@@ -82767,6 +82954,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/group-by-date/";
        description = "Shell command for grouping files by dates into folders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "group-with" = callPackage
@@ -82803,6 +82991,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "grouped-list_0_2_1_3" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, pointed
+     , QuickCheck, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "grouped-list";
+       version = "0.2.1.3";
+       sha256 = "1ggmjn9gmq3ksbavvi0cqb96fnkbmhr9bsadkilpdnnndfdz0rdy";
+       libraryHaskellDepends = [ base containers deepseq pointed ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groupoid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -83023,6 +83228,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -83121,6 +83327,7 @@ self: {
        testHaskellDepends = [ base containers gtk3 hspec ];
        description = "Large TreeStore support for gtk2hs";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gtk-mac-integration" = callPackage
@@ -83207,6 +83414,7 @@ self: {
        homepage = "http://github.com/travitch/gtk-traymanager";
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;};
 
   "gtk2hs-buildtools" = callPackage
@@ -83385,6 +83593,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) gtk3;};
 
   "gtk3-mac-integration" = callPackage
@@ -83499,6 +83708,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
 
   "guarded-rewriting" = callPackage
@@ -84118,6 +84328,7 @@ self: {
        ];
        description = "A Gtk mixer GUI application for FreeBSD";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "haar" = callPackage
@@ -86284,6 +86495,7 @@ self: {
        libraryHaskellDepends = [ base HCodecs newtype ];
        description = "Binding to the OS level Midi services (fork of system-midi)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hamilton" = callPackage
@@ -95309,6 +95521,7 @@ self: {
        homepage = "https://github.com/phaazon/hid";
        description = "Interface to hidapi library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) hidapi;};
 
   "hidapi" = callPackage
@@ -95497,6 +95710,7 @@ self: {
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "higherorder" = callPackage
@@ -95924,6 +96138,7 @@ self: {
        homepage = "https://github.com/hasufell/hinotify-bytestring.git";
        description = "Haskell binding to inotify, using ByteString filepaths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hinquire" = callPackage
@@ -97348,6 +97563,7 @@ self: {
        homepage = "https://github.com/Alexander-Ignatyev/morpheus/tree/master/hmatrix-morpheus";
        description = "Low-level machine learning auxiliary functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hmatrix-nipals" = callPackage
@@ -97562,6 +97778,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Binding to the OS level MIDI services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hmk" = callPackage
@@ -98165,6 +98382,7 @@ self: {
        ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hold-em" = callPackage
@@ -98342,6 +98560,7 @@ self: {
        homepage = "https://lambda.xyz/honk/";
        description = "Cross-platform interface to the PC speaker";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hoobuddy" = callPackage
@@ -99578,6 +99797,7 @@ self: {
        ];
        description = "Support for well-typed paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hpc_0_6_0_3" = callPackage
@@ -100877,6 +101097,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "I2C access for Haskell and Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hsSqlite3" = callPackage
@@ -100932,6 +101153,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hsass_0_4_2" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, filepath
+     , hlibsass, hspec, hspec-discover, monad-loops, temporary
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hsass";
+       version = "0.4.2";
+       sha256 = "0hv2falrm3dcmdx08mpk2z8yxfr1hahgrd3ff9yvw6xjcjzab5yh";
+       libraryHaskellDepends = [
+         base bytestring data-default-class filepath hlibsass monad-loops
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring data-default-class hspec hspec-discover temporary
+       ];
+       homepage = "https://github.com/jakubfijalkowski/hsass";
+       description = "Integrating Sass into Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsay" = callPackage
     ({ mkDerivation, base, Hclip, HTTP, process, unix }:
      mkDerivation {
@@ -103667,6 +103910,7 @@ self: {
        homepage = "http://www.volker-wysk.de/hsshellscript/";
        description = "Haskell for Unix shell scripting tasks";
        license = "LGPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hssourceinfo" = callPackage
@@ -103682,6 +103926,7 @@ self: {
        ];
        description = "get haskell source code info";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hssqlppp" = callPackage
@@ -105547,8 +105792,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2-client";
-       version = "0.3.0.0";
-       sha256 = "00rchfi3wdyg91hvyinlmvzyl8n6gcd47ycx06n427cvxa3gmz48";
+       version = "0.3.0.1";
+       sha256 = "0py51s0dfw7gz7kz8l6p344aas7ifa8hxx4ybrmbs0936mpmmqbh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105732,6 +105977,7 @@ self: {
        homepage = "https://github.com/mitsuji/huckleberry#readme";
        description = "Haskell IOT on Intel Edison and other Linux computers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "huff" = callPackage
@@ -105909,6 +106155,7 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hunit-dejafu_0_7_0_0" = callPackage
@@ -106873,6 +107120,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-xml#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -108225,6 +108473,7 @@ self: {
        homepage = "https://github.com/adinapoli/iconv-typed#readme";
        description = "Type safe iconv wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ide-backend" = callPackage
@@ -110438,6 +110687,7 @@ self: {
        homepage = "https://tweag.github.io/HaskellR";
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) R;};
 
   "inliterate" = callPackage
@@ -111143,6 +111393,7 @@ self: {
        homepage = "http://mbays.freeshell.org/intricacy";
        description = "A game of competitive puzzle-design";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "intro" = callPackage
@@ -112239,6 +112490,7 @@ self: {
        executableHaskellDepends = [ base gtk3 ];
        description = "A program to show the size of image and whether suitable for wallpaper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "islink" = callPackage
@@ -113010,6 +113262,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libjack2;};
 
   "jack-bindings" = callPackage
@@ -114580,6 +114833,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-stream_0_4_1_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec
+     , QuickCheck, quickcheck-unicode, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-stream";
+       version = "0.4.1.4";
+       sha256 = "0mg1pv1gp2zd7zpl2n5k8kv73br8ji91mwszfhn1bw119m29v1rs";
+       libraryHaskellDepends = [
+         aeson base bytestring scientific text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory doctest hspec QuickCheck
+         quickcheck-unicode scientific text unordered-containers vector
+       ];
+       homepage = "https://github.com/ondrap/json-stream";
+       description = "Incremental applicative JSON parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-togo" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base
      , bytestring, scientific, text, transformers, unordered-containers
@@ -114807,8 +115082,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsonschema-gen";
-       version = "0.4.0.0";
-       sha256 = "0kqp8a7f7sar6zjcpbn9qlmz1xsldxg526aqfb6a578q2ism2mn4";
+       version = "0.4.1.0";
+       sha256 = "1ssgci0nnpdj5sgw7wghnca8ndx20azb5z7svbxk6a1gmh9pfndj";
        libraryHaskellDepends = [
          aeson base bytestring containers scientific tagged text time
          unordered-containers vector
@@ -116332,13 +116607,13 @@ self: {
      , asn1-encoding, asn1-types, base, base64-bytestring, byteable
      , bytestring, cipher-aes, containers, crypto-pubkey, crypto-random
      , directory, filepath, lens, mtl, old-locale, optparse-applicative
-     , pbkdf, process, raw-strings-qq, regex-compat-tdfa, safe, setenv
-     , text, time, unordered-containers, vector
+     , pbkdf, process, raw-strings-qq, regex, regex-compat-tdfa, safe
+     , setenv, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "keystore";
-       version = "0.8.0.2";
-       sha256 = "0n5d94wkasrb834j7jvh7fh3a2dshqb21g3a9kpsqjmsjy76bq3g";
+       version = "0.8.1.0";
+       sha256 = "11dfxm7wxn1l82cr30gn2xw45ma7apssfgrgz95wrzm5k0kq331v";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -116346,8 +116621,8 @@ self: {
          aeson aeson-pretty ansi-wl-pprint api-tools asn1-encoding
          asn1-types base base64-bytestring byteable bytestring cipher-aes
          containers crypto-pubkey crypto-random directory filepath lens mtl
-         old-locale optparse-applicative pbkdf regex-compat-tdfa safe setenv
-         text time unordered-containers vector
+         old-locale optparse-applicative pbkdf regex regex-compat-tdfa safe
+         setenv text time unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint api-tools base bytestring directory filepath
@@ -116922,6 +117197,7 @@ self: {
        homepage = "https://github.com/bitonic/kyotocabinet";
        description = "Mid level bindings to Kyoto Cabinet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) kyotocabinet;};
 
   "l-bfgs-b" = callPackage
@@ -116985,6 +117261,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "labels_0_3_3" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "labels";
+       version = "0.3.3";
+       sha256 = "04rh8c9ncd9radarz4fjka9hc3i6crvibpyj3y8qpij0acmw1d76";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "https://github.com/chrisdone/labels#readme";
+       description = "Anonymous records via named tuples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "laborantin-hs" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cmdlib, containers
      , directory, hslogger, mtl, old-locale, parsec, random, split, text
@@ -118609,6 +118898,8 @@ self: {
        pname = "language-openscad";
        version = "0.1.7";
        sha256 = "18ws65lc5w9pidadrlynscxavxfij794wi1f2ijnr11vbz087drd";
+       revision = "1";
+       editedCabalFile = "1kmqwdgfxhpia6yi734g9a0mrdqzgi6lzzadx1fhwhfx1pgnap0y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base bytestring ];
@@ -118655,6 +118946,8 @@ self: {
        pname = "language-puppet";
        version = "1.3.8.1";
        sha256 = "0hk1fx574hkmm275rm4jv66vr9gixllaw2vqklhpx54rgjwpcclv";
+       revision = "1";
+       editedCabalFile = "1v6vd8mfa4rk7l952d9lysv38w0prvrlhiacfqpxwx8fxj0m5kxc";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -118681,9 +118974,10 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "language-puppet_1_3_9" = callPackage
+  "language-puppet_1_3_10" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, exceptions, filecache, formatting, Glob
@@ -118697,8 +118991,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.9";
-       sha256 = "13sap5qqpinbn0cvi38kbvlny0vp1pi4xjvx8kjjwkrl30av2rx8";
+       version = "1.3.10";
+       sha256 = "10z7573594ba4ldb5bnr1biwbqs0km14y18lkcr65d99qh7pqc2i";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -119616,6 +119910,7 @@ self: {
        homepage = "https://github.com/rudymatela/leancheck#readme";
        description = "Cholesterol-free property-based testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "leankit-api" = callPackage
@@ -120390,6 +120685,7 @@ self: {
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
@@ -121268,6 +121564,7 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/libvirt-hs";
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libvirt;};
 
   "libvorbis" = callPackage
@@ -122233,10 +122530,13 @@ self: {
        pname = "linux-evdev";
        version = "0.3.2";
        sha256 = "04ajbcvn8i2xa678f3sgbbrn00rxm1k86wrj9n6w2r8h2yda9s9r";
+       revision = "1";
+       editedCabalFile = "0s7yb9wwh5rp4v2phm5lih29f033rgffldhkm9i2mxsag2qbfg0k";
        libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "http://github.com/bgamari/linux-evdev";
        description = "Bindings to Linux evdev input device interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-file-extents" = callPackage
@@ -122251,6 +122551,7 @@ self: {
        homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-inotify" = callPackage
@@ -122262,6 +122563,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-kmod" = callPackage
@@ -122288,6 +122590,7 @@ self: {
        homepage = "https://github.com/tensor5/linux-mount";
        description = "Mount and unmount filesystems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-namespaces" = callPackage
@@ -122300,6 +122603,7 @@ self: {
        homepage = "https://github.com/redneb/hs-linux-namespaces";
        description = "Create new or enter an existing linux namespaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-perf" = callPackage
@@ -122499,8 +122803,8 @@ self: {
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
-       version = "0.7.0.1";
-       sha256 = "1hw7xbnqmrbzqv6mvzgpi6rnqp3an8vf8ky5w25j7088c2f0chzr";
+       version = "0.7.0.2";
+       sha256 = "0m60vp0kwikb3wbc9vddlr0csm8sa7jqclywga5d8m7r5wkc7iha";
        configureFlags = [ "-fbuild-external" ];
        isLibrary = true;
        isExecutable = true;
@@ -123319,6 +123623,7 @@ self: {
        homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {llvm-config = null;};
 
   "llvm-hs-pure" = callPackage
@@ -123475,6 +123780,7 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lmdb;};
 
   "lmdb-high-level" = callPackage
@@ -123498,6 +123804,7 @@ self: {
        homepage = "https://github.com/andrewthad/lmdb-high-level";
        description = "Higher level API for working with LMDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lmdb-simple" = callPackage
@@ -123514,6 +123821,7 @@ self: {
        homepage = "https://github.com/verement/lmdb-simple#readme";
        description = "Simple API for LMDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lmonad" = callPackage
@@ -123604,6 +123912,7 @@ self: {
        homepage = "https://github.com/chris-martin/loc";
        description = "Types representing line and column positions and ranges in text files";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "loc-test" = callPackage
@@ -127752,6 +128061,7 @@ self: {
        homepage = "https://github.com/george-steel/maxent-learner";
        description = "GUI for maxent-learner-hw";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "maximal-cliques" = callPackage
@@ -130362,14 +130672,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_7_3_0" = callPackage
+  "miso_0_7_4_0" = callPackage
     ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers
      , lucid, servant, servant-lucid, text, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.7.3.0";
-       sha256 = "0plxc15kx486cwzgbfxyfnxd8y719kz0spb6snfxhy1b4gcmf17q";
+       version = "0.7.4.0";
+       sha256 = "0dnpk0rqbg4fwwb0n9qn2amhk3jfbnwf3vnz3n3s6rv6q24gxrrp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132470,6 +132780,7 @@ self: {
        ];
        description = "A system state collecting library and application";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mono-foldable" = callPackage
@@ -135120,6 +135431,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mysql-simple_0_4_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light
+     , text, time
+     }:
+     mkDerivation {
+       pname = "mysql-simple";
+       version = "0.4.1.0";
+       sha256 = "008ygaawqm91323ypsq2ih9bsvm10kld6p80av2p61iaklancgva";
+       libraryHaskellDepends = [
+         attoparsec base base16-bytestring blaze-builder blaze-textual
+         bytestring mysql old-locale pcre-light text time
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/paul-rouse/mysql-simple";
+       description = "A mid-level MySQL client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mysql-simple-quasi" = callPackage
     ({ mkDerivation, base, haskell-src-meta, mysql-simple
      , template-haskell
@@ -136372,6 +136703,7 @@ self: {
        homepage = "https://github.com/Ongy/netlink-hs";
        description = "Netlink communication for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "netlist" = callPackage
@@ -136750,8 +137082,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-api-support";
-       version = "0.3.1";
-       sha256 = "0p3k19fv211rhrncc9l08m0wbm9ip1xima2xpfcq4pig8xc2fqbx";
+       version = "0.3.2";
+       sha256 = "1wzigwxdql9v6m9kwvnlgaachkr0rk9ldghnazrkkxba8di5kpsi";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
@@ -137933,8 +138265,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.6.1.1";
-       sha256 = "09rrkxkc23yfm7vyzmq57lwhbwfn4x89b3r9i4s3r27qs1p2l7fa";
+       version = "0.7.0.0";
+       sha256 = "1gi45x4l2lbkdzs1xb7p1al53d292jylawy0ak6mv9zzs06r6088";
        libraryHaskellDepends = [
          async base binary bytestring template-haskell unix
        ];
@@ -138163,6 +138495,7 @@ self: {
        homepage = "https://github.com/peti/nix-paths";
        description = "Knowledge of Nix's installation directories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) nix;};
 
   "nixfromnpm" = callPackage
@@ -143082,6 +143415,8 @@ self: {
        pname = "pandoc-lens";
        version = "0.6.2";
        sha256 = "18v22salncjdghpg6gz78mpf9wp5qk622jia77qwlh9di36jdqg5";
+       revision = "1";
+       editedCabalFile = "1b3qk1afdd9l6i625spm26cgzmmd3bqmyp0lfszjnaf32ac7sldd";
        libraryHaskellDepends = [ base containers lens pandoc-types ];
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
@@ -144143,6 +144478,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Simply interfacing the parallel port on linux";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "parse-dimacs" = callPackage
@@ -147133,6 +147469,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Deprecated - ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "phoityne-vscode" = callPackage
@@ -149190,6 +149527,7 @@ self: {
        homepage = "http://code.haskell.org/plot";
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "plot-lab" = callPackage
@@ -150345,6 +150683,7 @@ self: {
        homepage = "http://code.haskell.org/portaudio";
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) portaudio;};
 
   "porte" = callPackage
@@ -150511,6 +150850,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "posix-timer" = callPackage
@@ -150523,6 +150863,7 @@ self: {
        homepage = "https://github.com/mvv/posix-timer";
        description = "Bindings to POSIX clock and timer functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "posix-waitpid" = callPackage
@@ -151261,6 +151602,7 @@ self: {
        homepage = "https://github.com/ppelleti/powermate";
        description = "bindings for Griffin PowerMate USB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "powerpc" = callPackage
@@ -151334,6 +151676,7 @@ self: {
        homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A high performance in memory and LevelDB backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
 
   "powerqueue-sqs" = callPackage
@@ -153583,6 +153926,7 @@ self: {
        executableHaskellDepends = [ base bytestring filepath ];
        description = "Simple audio library for Windows, Linux, OSX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libpulseaudio;};
 
   "proto-lens" = callPackage
@@ -154128,8 +154472,8 @@ self: {
        pname = "pseudo-boolean";
        version = "0.1.5.0";
        sha256 = "0xk82fw3z8ppj32awfcrj5q2193883zsw7bnqin14ba5bp94rnqi";
-       revision = "1";
-       editedCabalFile = "0l72bbqppispdlz7jm3wn67d7zn7zdg46n5qh2nkapnjc6r5yhh6";
+       revision = "2";
+       editedCabalFile = "175x2fsxpkw37c25ixakhzbzhx23xgbm302r2fqgbpgaa5lkss38";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable megaparsec parsec
@@ -154528,6 +154872,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libpulseaudio;};
 
   "punkt" = callPackage
@@ -158486,6 +158831,7 @@ self: {
        homepage = "https://github.com/mr/reactive-banana-gi-gtk";
        description = "Simple reactive programming with GTK GObject Introspection";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "reactive-banana-sdl" = callPackage
@@ -158552,6 +158898,7 @@ self: {
        homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -158629,6 +158976,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana and JACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "reactive-midyim" = callPackage
@@ -159442,6 +159790,7 @@ self: {
        ];
        description = "A reimplementation of the Reactive library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "reexport-crypto-random" = callPackage
@@ -160952,6 +161301,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_9_5_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, quickcheck-simple, sql-words
+     , template-haskell, text, th-reify-compat, time, time-locale-compat
+     , transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.9.5.0";
+       sha256 = "17skrxqh3cpjkjjvbnhdlagfymdp0i3y2c5d92pg0krhc2dfida0";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         sql-words template-haskell text th-reify-compat time
+         time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers quickcheck-simple transformers
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
@@ -160972,6 +161345,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query-HDBC_0_6_4_1" = callPackage
+    ({ mkDerivation, base, containers, convertible, dlist, HDBC
+     , HDBC-session, names-th, persistable-record, relational-query
+     , relational-schemas, template-haskell, th-data-compat
+     , transformers
+     }:
+     mkDerivation {
+       pname = "relational-query-HDBC";
+       version = "0.6.4.1";
+       sha256 = "0bnksx9sq99hknj67wgg25yjbnkfdlaswhr2n6ndrrjpvkrx2lsi";
+       libraryHaskellDepends = [
+         base containers convertible dlist HDBC HDBC-session names-th
+         persistable-record relational-query relational-schemas
+         template-haskell th-data-compat transformers
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "HDBC instance of relational-query and typed query interface for HDBC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-record" = callPackage
     ({ mkDerivation, base, persistable-record
      , persistable-types-HDBC-pg, relational-query
@@ -161029,6 +161423,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-schemas_0_1_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, relational-query
+     , template-haskell, time
+     }:
+     mkDerivation {
+       pname = "relational-schemas";
+       version = "0.1.4.1";
+       sha256 = "1szxxh3m11rfndw7rsbsks4iagk61r5w0l6s4k2zh7xhzcfrhs83";
+       libraryHaskellDepends = [
+         base bytestring containers relational-query template-haskell time
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "RDBMSs' schema templates for relational-query";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relative-date" = callPackage
     ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time
      }:
@@ -161840,6 +162251,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reprinter" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, syb, syz, transformers
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "reprinter";
+       version = "0.1.0.0";
+       sha256 = "0l2vz9h5y9p10kqlg2fm5fvkg5vmrs4d8kyz8ami978ic9fv6fig";
+       libraryHaskellDepends = [
+         base bytestring mtl syb syz transformers uniplate
+       ];
+       description = "Scrap Your Reprinter";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "reproject" = callPackage
     ({ mkDerivation, base, hspec, template-haskell }:
      mkDerivation {
@@ -163069,6 +163495,8 @@ self: {
        pname = "ring-buffer";
        version = "0.3";
        sha256 = "10jvn9kj1y0w4r1kvxz4xi7vc1myq35isgd6x0c3mnxfngs45lgp";
+       revision = "1";
+       editedCabalFile = "0lmznwcy3iyxsgpj2q2l243rzz25ccdsjwazwixidv776137lz42";
        libraryHaskellDepends = [ base exceptions mtl primitive vector ];
        testHaskellDepends = [ base QuickCheck vector ];
        homepage = "http://github.com/bgamari/ring-buffer";
@@ -164409,6 +164837,7 @@ self: {
        homepage = "https://gitlab.com/formaltech/rtnetlink-hs";
        description = "Manipulate network devices, addresses, and routes on Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "rtorrent-rpc" = callPackage
@@ -165016,21 +165445,21 @@ self: {
   "safecopy-store" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, lens
      , lens-action, old-time, QuickCheck, quickcheck-instances, store
-     , store-core, tasty, tasty-quickcheck, template-haskell, text, time
-     , vector
+     , store-core, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, time, vector
      }:
      mkDerivation {
        pname = "safecopy-store";
-       version = "0.9.4";
-       sha256 = "1i0hr3j0ibz87v72jl648df0xry53qzfdk64hizrypnqc66hldd4";
+       version = "0.9.5";
+       sha256 = "177v32sn3bxk3a4f4lg9vh4yc1lgylzrwzs0n6k4jrs8jxlz74iw";
        libraryHaskellDepends = [
          array base bytestring containers old-time store store-core
          template-haskell text time vector
        ];
        testHaskellDepends = [
          array base containers lens lens-action QuickCheck
-         quickcheck-instances store tasty tasty-quickcheck template-haskell
-         time vector
+         quickcheck-instances store tasty tasty-hunit tasty-quickcheck
+         template-haskell time vector
        ];
        homepage = "https://github.com/NCrashed/safecopy";
        description = "Binary serialization with version control";
@@ -165213,6 +165642,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsodium;};
 
+  "salve" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, doctest, microlens }:
+     mkDerivation {
+       pname = "salve";
+       version = "0.0.0";
+       sha256 = "10rah1p7lgbizfbxk4p4q2x0zp1b6l9zzyr0vzp57avjrkka5x5s";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest microlens ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       description = "Semantic version numbers and constraints";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
      , MaybeT-transformers, monads-fd, network, old-locale, process
@@ -165781,8 +166223,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.1";
-       sha256 = "0gxx84b7dzhymizwna8fzaaz2gimzch650jk1xssn5da2gqfan7g";
+       version = "7.2";
+       sha256 = "0kqgx84kp1y63iakmmhfcgmqn4b7d3hrgcl2j7xdzi3fw6ig93y7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -166365,6 +166807,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_5_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
+     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.5.2";
+       sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq hashable integer-gmp
+         integer-logarithms primitive text
+       ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       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
@@ -167601,6 +168068,7 @@ self: {
        homepage = "http://nonempty.org/software/haskell-select";
        description = "Wrap the select(2) POSIX function";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "selections" = callPackage
@@ -168445,8 +168913,8 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.4.0";
-       sha256 = "1hql9cmw43cq9dsrkd0qwy1ycj6srsc2sr32grcfvh2j350k2m0p";
+       version = "0.4.1";
+       sha256 = "1rfmw3s07z194mfdh4rb135q4lm36yjpnzg176agy094rcjbayg7";
        libraryHaskellDepends = [
          acid-state aeson ansi-terminal base base16-bytestring
          base64-bytestring bytestring clock containers deepseq directory
@@ -168794,17 +169262,18 @@ self: {
      }) {};
 
   "servant-auth-token" = callPackage
-    ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl
-     , pwstore-fast, servant-auth-token-api, servant-server, text, time
-     , transformers, uuid
+    ({ mkDerivation, aeson-injector, base, bytestring, containers
+     , http-api-data, mtl, pwstore-fast, servant, servant-auth-token-api
+     , servant-server, text, time, transformers, uuid, wai
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.4.7.1";
-       sha256 = "0mswxxq2b6n1f3laz15y87nxnsw5l1bmpl9kfdif4spd286wgaa8";
+       version = "0.5.0.0";
+       sha256 = "1ivlc7ivn4rn2appxyv2cgn4s812s82d3a8q9ykfy1yhpjygk9hp";
        libraryHaskellDepends = [
-         aeson-injector base bytestring containers mtl pwstore-fast
-         servant-auth-token-api servant-server text time transformers uuid
+         aeson-injector base bytestring containers http-api-data mtl
+         pwstore-fast servant servant-auth-token-api servant-server text
+         time transformers uuid wai
        ];
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Servant based API and server for token based authorisation";
@@ -168820,8 +169289,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-acid";
-       version = "0.4.1.1";
-       sha256 = "01y3dis2v984a7g4hfl28ygac6jp6dcr5kzp8b45c4lywsi6pd7a";
+       version = "0.5.0.0";
+       sha256 = "1hvslg23l43k6wz6z84xcm3sv0lxgnvcsrx7z8493zyav9lnlx6h";
        libraryHaskellDepends = [
          acid-state aeson-injector base bytestring containers ghc-prim
          monad-control mtl safe safecopy servant-auth-token
@@ -168860,8 +169329,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-leveldb";
-       version = "0.4.2.1";
-       sha256 = "0i7h05jsc0r644prgifbvj7xrjpr7qsmwhqcc93p33f1wznn9h5n";
+       version = "0.5.0.0";
+       sha256 = "1v1h9jpc9ypdd6sfcb9w4lhv2ldsnlcpmmsghbdky50vqmq1y8qj";
        libraryHaskellDepends = [
          aeson-injector base bytestring concurrent-extra containers
          exceptions lens leveldb-haskell monad-control mtl resourcet safe
@@ -168883,8 +169352,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-persistent";
-       version = "0.5.1.1";
-       sha256 = "09np7cilm1ij7ra06zyx7wqcm8ynras0q6fsfkkklpr5w632ifh1";
+       version = "0.6.0.0";
+       sha256 = "18y9g9pfzbhv35pfcr4973h320p8ify8nf4vllcdv83whfm48bc1";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers monad-control mtl
          persistent persistent-template servant-auth-token
@@ -168900,17 +169369,17 @@ self: {
   "servant-auth-token-rocksdb" = callPackage
     ({ mkDerivation, aeson-injector, base, bytestring, concurrent-extra
      , containers, exceptions, lens, monad-control, mtl, resourcet
-     , rocksdb, safe, safecopy-store, servant-auth-token
+     , rocksdb-haskell, safe, safecopy-store, servant-auth-token
      , servant-auth-token-api, servant-server, store, text, time
      , transformers, transformers-base, uuid, vector
      }:
      mkDerivation {
        pname = "servant-auth-token-rocksdb";
-       version = "0.4.2.1";
-       sha256 = "0zl5xr12pnz99798pz1rn6q2msir57df97h6xayj3167zmmdv2fy";
+       version = "0.5.0.0";
+       sha256 = "0cr8qgkv89sps6ykv0v1bng2xk4g7r00fjnmgjp58kpc18pvg4vl";
        libraryHaskellDepends = [
          aeson-injector base bytestring concurrent-extra containers
-         exceptions lens monad-control mtl resourcet rocksdb safe
+         exceptions lens monad-control mtl resourcet rocksdb-haskell safe
          safecopy-store servant-auth-token servant-auth-token-api
          servant-server store text time transformers transformers-base uuid
          vector
@@ -168918,8 +169387,7 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "RocksDB backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {rocksdb = null;};
+     }) {};
 
   "servant-blaze" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant }:
@@ -170722,6 +171190,7 @@ self: {
        homepage = "http://patch-tag.com/r/shahn/sfml-audio";
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
 
   "sfmt" = callPackage
@@ -171341,6 +171810,7 @@ self: {
        homepage = "https://github.com/nh2/shared-memory";
        description = "POSIX shared memory";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sharedio" = callPackage
@@ -172009,6 +172479,7 @@ self: {
        ];
        description = "An interface to the Silicon Labs Si5351 clock chip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sibe" = callPackage
@@ -176624,6 +177095,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "soundgen" = callPackage
+    ({ mkDerivation, base, split, WAVE }:
+     mkDerivation {
+       pname = "soundgen";
+       version = "0.1.0.0";
+       sha256 = "0zlap41i7npx8n8c3wsdhq6mqm5yhidhid1mqn4lq726sa3njanq";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base split WAVE ];
+       description = "sound generator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "source-code-server" = callPackage
     ({ mkDerivation, base, bytestring, containers, curl, data-default
      , directory, filepath, hack, hack-contrib, hack-handler-happstack
@@ -177178,6 +177662,7 @@ self: {
        homepage = "https://github.com/rudymatela/speculate#readme";
        description = "discovery of properties about Haskell functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "speculation" = callPackage
@@ -178086,6 +178571,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "squeal-postgresql" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
+     , generics-sop, hspec, lifted-base, monad-control, mtl, network-ip
+     , postgresql-binary, postgresql-libpq, scientific, text, time
+     , transformers, transformers-base, uuid
+     }:
+     mkDerivation {
+       pname = "squeal-postgresql";
+       version = "0.1.0.0";
+       sha256 = "1hz2nyy0c4x4wb6a2qpjicwngdvdp4w18wax84qcqbprydw8svwp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq generics-sop lifted-base
+         monad-control mtl network-ip postgresql-binary postgresql-libpq
+         scientific text time transformers transformers-base uuid
+       ];
+       executableHaskellDepends = [
+         base bytestring generics-sop mtl text transformers
+         transformers-base
+       ];
+       testHaskellDepends = [ base doctest generics-sop hspec ];
+       homepage = "https://github.com/morphismtech/squeal";
+       description = "Squeal PostgreSQL Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "squeeze" = callPackage
     ({ mkDerivation, base, Cabal, data-default, directory, factory
      , filepath, mtl, QuickCheck, random, toolshed
@@ -178492,7 +179004,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "stache_1_1_1" = callPackage
+  "stache_1_1_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec
      , megaparsec, mtl, template-haskell, text, unordered-containers
@@ -178500,8 +179012,8 @@ self: {
      }:
      mkDerivation {
        pname = "stache";
-       version = "1.1.1";
-       sha256 = "1gjmv1yqm5hkgap60w1ci6ng1l7kfhmz97wdhnqawcm8q7lir1nx";
+       version = "1.1.2";
+       sha256 = "1zwl8a8ank1zwssz5yq00mcmvimnn3hcsv8z973gkmwhisp0alrz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -178509,7 +179021,7 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring containers file-embed hspec hspec-megaparsec
-         megaparsec text yaml
+         megaparsec template-haskell text yaml
        ];
        benchmarkHaskellDepends = [
          aeson base criterion deepseq megaparsec text
@@ -179101,6 +179613,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage2nix" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, cabal2nix
+     , containers, deepseq, distribution-nixpkgs, exceptions, filepath
+     , gitlib, gitlib-libgit2, hopenssl, hspec, inflections
+     , language-nix, lens, network-uri, optparse-applicative, pretty
+     , QuickCheck, shakespeare, stackage-curator, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "stackage2nix";
+       version = "0.3.0";
+       sha256 = "1cgcdgsw8qbc7dcfvj2jhwaja5x03fqa8f67c8f86fzrn0wcvw47";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal cabal2nix containers deepseq
+         distribution-nixpkgs exceptions filepath gitlib gitlib-libgit2
+         hopenssl inflections language-nix lens network-uri
+         optparse-applicative pretty QuickCheck stackage-curator text
+         unordered-containers yaml
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring Cabal hspec pretty shakespeare text yaml
+       ];
+       homepage = "https://github.com/4e6/stackage2nix#readme";
+       description = "Convert Stack files into Nix build instructions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "staf" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -181195,12 +181737,10 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "strict-concurrency";
-       version = "0.2.4.1";
-       sha256 = "128sbh5fnv02v2xdjlk7cb525bfckqyj7fyz5399nfycs0nj2f89";
-       revision = "2";
-       editedCabalFile = "0l3q3b532mzza2r77f5sdkgfzfg9caha7zbkqcnzmpypdzyp3s3h";
+       version = "0.2.4.2";
+       sha256 = "0vzqhd0sqcs2ci3zw7rm3ydmc9brl2sdc8k3jq47kd9l878xanmz";
        libraryHaskellDepends = [ base deepseq ];
-       homepage = "http://code.haskell.org/~dons/code/strict-concurrency";
+       homepage = "https://github.com/ygale/strict-concurrency";
        description = "Strict concurrency abstractions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181776,8 +182316,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured-cli";
-       version = "0.9.0.3";
-       sha256 = "1w1a8ryj85iixzh3y5vr46dfmslsldngqyf0c1yg8wwb3sacca9n";
+       version = "0.9.1.0";
+       sha256 = "0yhdfwvw15b1srjkmjafxjgpxcxwjqpdg4r5681cc9s4dqrhhgxw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182252,6 +182792,8 @@ self: {
        pname = "sump";
        version = "0.1.0.2";
        sha256 = "1g23rijpalqalcshnmzhfvlp205r12lgc9avzs38acjs8r5gxdda";
+       revision = "1";
+       editedCabalFile = "1m1vha9kyhwf9da6xy00q7p4mmwc2bcpvd8qamjvjmsdvmzb4qiz";
        libraryHaskellDepends = [
          base bytestring data-default lens serialport transformers vector
        ];
@@ -182718,6 +183260,8 @@ self: {
        pname = "svm-light-utils";
        version = "0.1.4";
        sha256 = "01wz59ldv5n0xwl3d1sll11n3yy3wf2qrm67v4cskmrl7rib7177";
+       revision = "1";
+       editedCabalFile = "1yqvr9i681wv7y4qjqmyg617sjbgcpmkhxkf2r77xh1kv0zagylv";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        homepage = "http://github.com/bgamari/svm-light-utils";
        description = "Parsers and formatters for the SVMlight input file format";
@@ -183749,6 +184293,7 @@ self: {
        homepage = "https://github.com/psibi/sysinfo#readme";
        description = "Haskell Interface for getting overall system statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "system-argv0" = callPackage
@@ -183886,6 +184431,7 @@ self: {
        homepage = "http://darcs.imperialviolet.org/system-inotify";
        description = "Binding to Linux's inotify interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "system-lifted" = callPackage
@@ -184012,6 +184558,7 @@ self: {
        homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
        description = "Simple library for using the system's monotonic clock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "system-util" = callPackage
@@ -184405,6 +184952,7 @@ self: {
        homepage = "http://github.com/travitch/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gtk2 = pkgs.gnome2.gtk;};
 
   "tag-bits" = callPackage
@@ -184826,6 +185374,7 @@ self: {
        homepage = "https://oss.xkcd.com/";
        description = "Support library to enable TAI usage on systems with time kept in UTC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tai64" = callPackage
@@ -184867,6 +185416,7 @@ self: {
        ];
        description = "Tail files in Unix, using hinotify";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tak" = callPackage
@@ -185309,6 +185859,7 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tasty-dejafu_0_7_0_0" = callPackage
@@ -188220,8 +188771,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-short";
-       version = "0.1";
-       sha256 = "0zlkvzh99dyrvvk4i9pbhwkj2kf8akc8j1g3z06saprl7kjz6sn0";
+       version = "0.1.1";
+       sha256 = "1c912nn1xqqvg27rndb8qvqwhw4iivhr19qjkgy3nfbi6krzkvsm";
        libraryHaskellDepends = [
          base binary bytestring deepseq hashable text
        ];
@@ -189504,6 +190055,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "threefish" = callPackage
@@ -189542,19 +190094,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "threepenny-editors_0_5_3" = callPackage
+  "threepenny-editors_0_5_4_1" = callPackage
     ({ mkDerivation, base, bifunctors, casing, containers, data-default
-     , generics-sop, profunctors, template-haskell, threepenny-gui
+     , generics-sop, profunctors, threepenny-gui
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.5.3";
-       sha256 = "19h83mcrm22svdpb20bzvv3wfzkrynwybgf14qclf5wyf46qmf2b";
+       version = "0.5.4.1";
+       sha256 = "0mfnyj1v4babbysxwhw63v8r8k4a6wfdza04q3d48mab8qs57ym2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bifunctors casing containers data-default generics-sop
-         profunctors template-haskell threepenny-gui
+         profunctors threepenny-gui
        ];
        executableHaskellDepends = [
          base bifunctors casing containers data-default generics-sop
@@ -189591,6 +190143,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threepenny-gui_0_8_1_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , data-default, deepseq, exceptions, file-embed, filepath, hashable
+     , network-uri, safe, snap-core, snap-server, stm, template-haskell
+     , text, transformers, unordered-containers, vault, vector
+     , websockets, websockets-snap
+     }:
+     mkDerivation {
+       pname = "threepenny-gui";
+       version = "0.8.1.0";
+       sha256 = "13wafs0m9qiadnc9pyzhs8xc5lk7k4cd1fspm938r1jnwslj05ch";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring containers data-default deepseq
+         exceptions file-embed filepath hashable network-uri safe snap-core
+         snap-server stm template-haskell text transformers
+         unordered-containers vault vector websockets websockets-snap
+       ];
+       homepage = "http://wiki.haskell.org/Threepenny-gui";
+       description = "GUI framework that uses the web browser as a display";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threepenny-gui-contextmenu" = callPackage
     ({ mkDerivation, base, threepenny-gui }:
      mkDerivation {
@@ -190172,6 +190750,7 @@ self: {
        homepage = "https://github.com/enzoh/time-exts";
        description = "Yet another time library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "time-http" = callPackage
@@ -192444,6 +193023,7 @@ self: {
        homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "Remote execution and map-reduce: distributed computing for Transient";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "transient-universe-tls" = callPackage
@@ -193385,6 +193965,7 @@ self: {
        homepage = "https://github.com/riaqn/tuntap-simple#readme";
        description = "A simple tun/tap library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tup-functor" = callPackage
@@ -193551,6 +194132,7 @@ self: {
        executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "turingMachine" = callPackage
@@ -193712,22 +194294,23 @@ self: {
 
   "tweet-hs" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
-     , bytestring, composition, containers, criterion, data-default
-     , directory, extra, hspec, htoml, http-client, http-client-tls
-     , http-types, lens, megaparsec, optparse-applicative, QuickCheck
-     , split, text, unordered-containers
+     , bytestring, composition-prelude, containers, criterion
+     , data-default, directory, extra, hspec, htoml, http-client
+     , http-client-tls, http-types, lens, megaparsec
+     , optparse-applicative, QuickCheck, split, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.2";
-       sha256 = "0rzkb2mv19jafswc3cww7zp1flbz87pyn4mkw16sf3gjar2k9h8l";
+       version = "1.0.1.3";
+       sha256 = "0xxyb2czffd46hwiv1wqqhhh5km8z9k0jqv5j64f68zmxfra5x04";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint authenticate-oauth base bytestring composition
-         containers data-default directory extra htoml http-client
-         http-client-tls http-types lens megaparsec optparse-applicative
-         split text unordered-containers
+         aeson ansi-wl-pprint authenticate-oauth base bytestring
+         composition-prelude containers data-default directory extra htoml
+         http-client http-client-tls http-types lens megaparsec
+         optparse-applicative split text unordered-containers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
@@ -195307,6 +195890,7 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tzdata" = callPackage
@@ -196713,18 +197297,19 @@ self: {
 
   "universum" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
-     , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe, stm
-     , text, text-format, transformers, type-operators
-     , unordered-containers, utf8-string, vector
+     , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe
+     , safe-exceptions, stm, text, text-format, transformers
+     , type-operators, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.5.1.1";
-       sha256 = "1cj9qs7r3p8zhlrv3h3phmflp158ckimg3rzq4c28vfx85d8vxz2";
+       version = "0.6.0.0";
+       sha256 = "0cl3301dcipyq2dlnhrr195x922qgl20zfkb5hnfmy56c0c04brv";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions ghc-prim hashable
-         microlens microlens-mtl mtl safe stm text text-format transformers
-         type-operators unordered-containers utf8-string vector
+         microlens microlens-mtl mtl safe safe-exceptions stm text
+         text-format transformers type-operators unordered-containers
+         utf8-string vector
        ];
        homepage = "https://github.com/serokell/universum";
        description = "Custom prelude used in Serokell";
@@ -197562,6 +198147,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "uri-templater_0_2_2_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, charset, containers, dlist
+     , HTTP, HUnit, mtl, parsers, template-haskell, text, trifecta
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "uri-templater";
+       version = "0.2.2.0";
+       sha256 = "13dgpsiihlgd0k18bh67ssrv5hgmp38xwicfgss84rar47m61hw6";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base charset containers dlist HTTP mtl parsers
+         template-haskell text trifecta unordered-containers vector
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base HUnit mtl template-haskell
+       ];
+       homepage = "https://github.com/iand675/uri-templater";
+       description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "url" = callPackage
     ({ mkDerivation, base, utf8-string }:
      mkDerivation {
@@ -198852,6 +199459,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "var-monad" = callPackage
+    ({ mkDerivation, base, stm }:
+     mkDerivation {
+       pname = "var-monad";
+       version = "0.2.0.0";
+       sha256 = "12l536ca32dhvylp3kizq664lsfysmc5r0hqzs50aqrbx8db40ji";
+       libraryHaskellDepends = [ base stm ];
+       homepage = "https://github.com/chris-martin/var-monad";
+       description = "The VarMonad typeclass, generalizing types of references";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "varan" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs, mtl
      , parallel, random, statistics
@@ -199027,6 +199646,7 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-vcache";
        description = "semi-transparent persistence for Haskell using LMDB, STM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcache-trie" = callPackage
@@ -199043,6 +199663,7 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-vcache-trie";
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcard" = callPackage
@@ -199148,6 +199769,7 @@ self: {
        homepage = "https://github.com/forste/haskellVCSGUI";
        description = "GUI library for source code management systems";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcswrapper" = callPackage
@@ -199303,6 +199925,8 @@ self: {
        pname = "vector-binary-instances";
        version = "0.2.3.5";
        sha256 = "0niad09lbxz3cj20qllyj92lwbc013ihw4lby8fv07x5xjx5a4p1";
+       revision = "1";
+       editedCabalFile = "0yk61mifvcc31vancsfsd0vskqh5k3a3znx1rbz8wzcs4ijjzh48";
        libraryHaskellDepends = [ base binary vector ];
        testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
        benchmarkHaskellDepends = [
@@ -202408,6 +203032,8 @@ self: {
        pname = "warc";
        version = "1.0.3";
        sha256 = "040kvm4nrd71hsjba5kjdp4620q2123asnfzsbxmbjw5p9jqjhh9";
+       revision = "1";
+       editedCabalFile = "02y9zbmlra6srl7iv6cs4c4iw3dqdn8nmxzsds9qfr1f8bl3avj2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -203422,6 +204048,7 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.gnome3) webkitgtk;};
 
   "webkitgtk3" = callPackage
@@ -204178,6 +204805,7 @@ self: {
        homepage = "https://github.com/debug-ito/wild-bind";
        description = "Task to install and export everything you need to use WildBind in X11";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "wild-bind-x11" = callPackage
@@ -204436,8 +205064,8 @@ self: {
      }:
      mkDerivation {
        pname = "wkt";
-       version = "0.3.1";
-       sha256 = "1paxjwfk34y0f96ia1shw3hvbz57vig1pga01mk4ynw45s4lzv92";
+       version = "0.3.2";
+       sha256 = "17gkszhyklhh6izsvhzrbwl4ci27kh9jgvjcd92ql98xb70iv38c";
        libraryHaskellDepends = [ base lens linear trifecta ];
        testHaskellDepends = [
          base filepath lens linear tasty tasty-golden trifecta
@@ -205583,6 +206211,7 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "wxAsteroids" = callPackage
@@ -205598,6 +206227,7 @@ self: {
        homepage = "https://wiki.haskell.org/WxAsteroids";
        description = "Try to avoid the asteroids with your space ship";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "wxFruit" = callPackage
@@ -205650,6 +206280,7 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; 
          inherit (pkgs) wxGTK;};
 
@@ -205671,6 +206302,7 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
@@ -205968,6 +206600,7 @@ self: {
        homepage = "https://github.com/polachok/xbattbar";
        description = "Simple battery indicator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xcb-types" = callPackage
@@ -206117,6 +206750,7 @@ self: {
        ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xeno" = callPackage
@@ -206382,6 +207016,7 @@ self: {
        benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -206423,6 +207058,7 @@ self: {
        homepage = "http://github.com/harendra-kumar/xls";
        description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xlsior" = callPackage
@@ -207467,6 +208103,7 @@ self: {
        homepage = "https://github.com/LeifW/xmonad-utils";
        description = "A small collection of X utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xmonad-vanessa" = callPackage
@@ -207768,6 +208405,7 @@ self: {
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xtest" = callPackage
@@ -208578,6 +209216,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-alerts" = callPackage
+    ({ mkDerivation, alerts, base, blaze-html, blaze-markup, safe, text
+     , yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-alerts";
+       version = "0.1.0.0";
+       sha256 = "1n35827f54nk7p313m3b7iwnsnk0balrw2l6ckd783gcwp5r6j2y";
+       libraryHaskellDepends = [
+         alerts base blaze-html blaze-markup safe text yesod-core
+       ];
+       homepage = "https://github.com/alx741/yesod-alerts#readme";
+       description = "Alert messages for the Yesod framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-angular" = callPackage
     ({ mkDerivation, aeson, base, containers, shakespeare
      , template-haskell, text, transformers, yesod
@@ -208668,6 +209322,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_4_18" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptonite, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, memory
+     , mime-mail, network-uri, nonce, persistent, persistent-template
+     , random, resourcet, safe, shakespeare, template-haskell, text
+     , time, transformers, unordered-containers, wai, yesod-core
+     , yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.18";
+       sha256 = "1cg3wb5d8cy65rmrc0dq086mmfhvvwdyig926pb0nhn2zj2kbzav";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptonite data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base memory
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -208820,6 +209504,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth-hashdb_1_6_2" = callPackage
+    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
+     , hspec, http-conduit, http-types, monad-logger, network-uri
+     , persistent, persistent-sqlite, resourcet, text
+     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
+     , yesod-form, yesod-persistent, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-auth-hashdb";
+       version = "1.6.2";
+       sha256 = "1cydpwy8i5z1ya5k3kn3qx0np3lhv9cka5c6gajwvla8kpgy11df";
+       libraryHaskellDepends = [
+         aeson base bytestring persistent text yesod-auth yesod-core
+         yesod-form yesod-persistent
+       ];
+       testHaskellDepends = [
+         aeson base basic-prelude bytestring containers hspec http-conduit
+         http-types monad-logger network-uri persistent-sqlite resourcet
+         text unordered-containers wai-extra yesod yesod-auth yesod-core
+         yesod-test
+       ];
+       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
+       description = "Authentication plugin for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-hmac-keccak" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, mtl
      , persistent, random, shakespeare, text, yesod-auth, yesod-core
@@ -212032,6 +212743,7 @@ self: {
        homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "zlib" = callPackage
@@ -212324,6 +213036,7 @@ self: {
        executableHaskellDepends = [ base monads-tf ];
        description = "Zot language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "zre" = callPackage
@@ -212419,6 +213132,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Password strength estimation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
 }

From aa9bebf261b47393bbc79407757a71ec42527999 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Aug 2017 11:28:21 +0200
Subject: [PATCH 3152/3246] R: update package set

---
 .../r-modules/bioc-annotation-packages.nix    |    1 +
 .../r-modules/bioc-experiment-packages.nix    |    8 +
 pkgs/development/r-modules/bioc-packages.nix  |    1 +
 pkgs/development/r-modules/cran-packages.nix  | 2394 ++++++++++-------
 4 files changed, 1366 insertions(+), 1038 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix
index 75ae872d77c..d623433593c 100644
--- a/pkgs/development/r-modules/bioc-annotation-packages.nix
+++ b/pkgs/development/r-modules/bioc-annotation-packages.nix
@@ -133,6 +133,7 @@ in with self; {
   LowMACAAnnotation = derive2 { name="LowMACAAnnotation"; version="0.99.3"; sha256="0ri301ci54s8wwkah1jccy5h44xg8yjk08j5b15qmdsm25hli4wm"; depends=[]; };
   LymphoSeqDB = derive2 { name="LymphoSeqDB"; version="0.99.2"; sha256="1cdyn2imjh4zr23szndc4vwyiacxs1jsp14gil2dyq9aifa25qr7"; depends=[]; };
   MafDb_1Kgenomes_phase1_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase1.hs37d5"; version="3.4.0"; sha256="180z52y03gdkf36ycr76vcs1mz9qdbwywzxrbcj6yb5vcj8i5hdx"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
+  MafDb_1Kgenomes_phase3_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase3.hs37d5"; version="3.4.0"; sha256="10968v506gmhzrnjz92z2p4484dbhgs6a20lkhs6f79bl66ckdbj"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
   MafDb_ESP6500SI_V2_SSA137 = derive2 { name="MafDb.ESP6500SI.V2.SSA137"; version="3.4.0"; sha256="1s5vqp3fnkswiv2slsh0wkd286psdhqcwvchcjq3gm4hq86h4pwh"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
   MafDb_ESP6500SI_V2_SSA137_GRCh38 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.GRCh38"; version="3.4.0"; sha256="1qaqqkshvrf7y6lwnnh8n47zvb35vn23l8vmvm29przz8y2xz22v"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
   MafDb_ESP6500SI_V2_SSA137_hs37d5 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.hs37d5"; version="3.4.0"; sha256="0gxj4nghd99r6ivgzvs86gl8j1frr8laira4gld0vmfp0a4iv5fy"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix
index e87c0160ff3..fe446610c4e 100644
--- a/pkgs/development/r-modules/bioc-experiment-packages.nix
+++ b/pkgs/development/r-modules/bioc-experiment-packages.nix
@@ -28,6 +28,7 @@ in with self; {
   CRCL18 = derive2 { name="CRCL18"; version="0.108.0"; sha256="12m13kv1f1cxynlar59m5s0ihz92ff52j80dqz5m8dzsynbjckbz"; depends=[Biobase]; };
   CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.6.0"; sha256="0zjc5h348h94h2vm926z592f1zibv000nvx039662ydhsxn58mp2"; depends=[Cardinal]; };
   CellMapperData = derive2 { name="CellMapperData"; version="1.0.0"; sha256="12nkc500mqzfrg5yksfwf4f4kv2flk4l7lxx6ws0kw2hgrnm9yz1"; depends=[CellMapper ExperimentHub]; };
+  ChAMPdata = derive2 { name="ChAMPdata"; version="2.6.0"; sha256="1hkwwkz2k4dnsl2sshr33as16x0dh98xvsnpf0zll2vkjkjw44v4"; depends=[BiocGenerics GenomicRanges]; };
   ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.12.0"; sha256="1hb4ay5a9z2c5zmjhlbbkcbycvmk27qimrpb6rvxkh3lprap2lv2"; depends=[bigmemory]; };
   ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.12.0"; sha256="0wg9bsb1264wif23rqv2c863rr72crxb4n640q37ayf5zw7p6jgh"; depends=[affy hexbin limma qvalue statmod]; };
   ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.10.0"; sha256="0v34kfkdpw8zmg1hkxbdjvk58m18ldxvsirz7s3i2vaf8k1g4r53"; depends=[]; };
@@ -60,6 +61,7 @@ in with self; {
   GSVAdata = derive2 { name="GSVAdata"; version="1.10.0"; sha256="0lbh07ygyns6db3g0208691q7ry0mjg2lhis4pqw6rr122mvhh4l"; depends=[Biobase GSEABase hgu95a_db]; };
   GWASdata = derive2 { name="GWASdata"; version="1.12.0"; sha256="0ygkrm7gybfj4wb8rc56zrwyfbpgl1kz50dyrz5glwkgzxqn00dq"; depends=[GWASTools]; };
   GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.2.0"; sha256="0jlmkqkjrffspny20w6yci319ry63sjnsychz6z9gwacy72fz14y"; depends=[]; };
+  HD2013SGI = derive2 { name="HD2013SGI"; version="1.14.0"; sha256="0whm9irlfmjamsjcjbxb1c574g60iscx10f498l9vh857iv1q8vl"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; };
   HEEBOdata = derive2 { name="HEEBOdata"; version="1.12.0"; sha256="1j79sxx3ig61ny8r0j40m4fba5rf61k8rq23b5w6rcq6zwysymh6"; depends=[]; };
   HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.14.0"; sha256="0h42jvnmfdr14glnlspgiznxx5qh19pn6abw4qyf2q24yps5hrpd"; depends=[]; };
   HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.108.0"; sha256="0i48h84qpcwraj8rhmisk6g7l6m9wf5a4p5pl6kr0ipfpr6fnh2b"; depends=[]; };
@@ -122,6 +124,7 @@ in with self; {
   RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.2.0"; sha256="0088cm640mzbzbyj1pmvi35l0s2zpl5x2pmhj2lz2zjp4dis2g3p"; depends=[RTCGA]; };
   RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.4.0"; sha256="0qhg1dx77xarjzb41dpvhlvl9aqwsyscavk3n3w33zpn1r087v33"; depends=[RTCGA]; };
   RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.2.0"; sha256="1grrcrd8lsjfk056r018y2rkn2zr31k4jc854mllh7sgpg0jr6br"; depends=[RTCGA]; };
+  RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.2.0"; sha256="1c7j35jn0076v3pv0h2yiphl2b9ga8hq0d6xb6hm7jasgq4i4w25"; depends=[RTCGA]; };
   RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.2.0"; sha256="1mfbq20s2zp234arkqy0g5km7y8jnymwnm4vl13vxqqcv12f3kr8"; depends=[RTCGA]; };
   RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.4.0"; sha256="0jxr2g8x5z4vyhs9n3ciiis45bs3jg3vg1v4mwxl4v4gys8p3i9b"; depends=[RTCGA]; };
   RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.4.0"; sha256="0ag3kmh2zfg9rqpmiih686klpcqd05l2cf5zfvg0vjwcim30xph2"; depends=[RTCGA]; };
@@ -139,6 +142,7 @@ in with self; {
   SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.10.0"; sha256="182agiw245zrb7lbyn1c38w1kljqs73lkvhvrlrilww1bfhwlrwc"; depends=[]; };
   SNPhoodData = derive2 { name="SNPhoodData"; version="1.4.0"; sha256="1w36157kdn1fji5pgj75bf88isfhvavpgyxnm9dfnzz5r1qaxx79"; depends=[]; };
   SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.6.0"; sha256="1rsagb2nlc8airrdql7sa4rl1h34nhmds4lz0yx5i3dca8jzqn61"; depends=[]; };
+  Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.2.1"; sha256="143qp77bhrrclfvqqsk86cz7xqsnn5wfi41z9hp4klai0dhgk68g"; depends=[]; };
   SomatiCAData = derive2 { name="SomatiCAData"; version="1.12.0"; sha256="1cqbprdlrz3yz1zjjrd33wy4ybhkfq943pv3pi0bx4yz9gqc5625"; depends=[]; };
   SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.10.0"; sha256="0sqdgmqs3ds3hnfn7nmmzhs8m5if8wy8rrfp7q76qhz7winqmqxh"; depends=[exomeCopy GenomicRanges IRanges S4Vectors stringr]; };
   SpikeIn = derive2 { name="SpikeIn"; version="1.16.0"; sha256="0nvxix2hsamcffdg6zqlvavx6l41qmfz7q1ycq99rjmv4rznl1z1"; depends=[affy]; };
@@ -180,6 +184,7 @@ in with self; {
   ceuhm3 = derive2 { name="ceuhm3"; version="0.12.0"; sha256="03qkfk9mxz510lmr9spv74d3138bvfcpsgp0qnjw3jj2xiwn4jqq"; depends=[Biobase GGBase GGtools]; };
   cgdv17 = derive2 { name="cgdv17"; version="0.12.0"; sha256="1cl725dhyh81rsxgv2icfljczbcgsnqba383gjfyf06d2qarby1y"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors VariantAnnotation]; };
   charmData = derive2 { name="charmData"; version="1.10.0"; sha256="1v760z5br1cj5dj97ayl68dv202086v2mcnhn6bpv0kf62q9mia2"; depends=[charm pd_charm_hg18_example]; };
+  cheung2010 = derive2 { name="cheung2010"; version="0.12.0"; sha256="15z6p2kfrbs9wbsf7rqmg53k5i6gja5hix97sl9bj7y3jkxws62b"; depends=[AnnotationDbi Biobase GenomicRanges GGtools hgfocus_db]; };
   chipenrich_data = derive2 { name="chipenrich.data"; version="1.10.0"; sha256="0zcj4pa03ny4b1rng4ima23jc6sqvsznp52d59vipnqd4jg1ic95"; depends=[BiocGenerics GenomicRanges IRanges]; };
   chromstaRData = derive2 { name="chromstaRData"; version="1.0.0"; sha256="0d0g20mg36mxldl9f0bzqbz9vzp526pqy501k0g7bmj5sbgd2p3s"; depends=[]; };
   cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.10.0"; sha256="04bkk8360pc0sp8n1z16smj888gbglgghklciwpzk2d513wwapdr"; depends=[cnvGSA]; };
@@ -194,6 +199,7 @@ in with self; {
   diffloopdata = derive2 { name="diffloopdata"; version="1.2.0"; sha256="0vvkgfixvs76cymz0nlyzp7sh9jzd1mcbl5pbnnziybwn5fdpw3g"; depends=[]; };
   diggitdata = derive2 { name="diggitdata"; version="1.6.0"; sha256="0xyvd8jdpn3y9s88z489cinacb4bnnp1jqg2aj7h9hhaj95pywsq"; depends=[Biobase viper]; };
   dressCheck = derive2 { name="dressCheck"; version="0.12.0"; sha256="1mm8hlivhcf9f01aqdcipq4wz7x3ga8znpcpi69jgh3iadf5x2xq"; depends=[Biobase]; };
+  dsQTL = derive2 { name="dsQTL"; version="0.12.0"; sha256="00nry3qf9r79x65scyfghjyj2qbc6ji0l7c1rayrk5s6pxj0v0hw"; depends=[Biobase GGBase SummarizedExperiment]; };
   dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.14.0"; sha256="18ghl3l7ps6xz90gyrnz3zc0rba99yg8ry9fpfbv7yni888hl9bx"; depends=[GEOquery marray]; };
   ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.14.0"; sha256="1s03jpb83j8xgwxdr5z7233175jhd4w7vikalxvh1mvk9bqa8rmk"; depends=[affy ecolicdf]; };
   estrogen = derive2 { name="estrogen"; version="1.20.2"; sha256="19f1gjppzfg21ci6jdxgwv7h14mm89spnj4qr71pwid0a4kiq6gn"; depends=[]; };
@@ -304,6 +310,8 @@ in with self; {
   yeastExpData = derive2 { name="yeastExpData"; version="0.20.0"; sha256="17bassc4xn9amlsa33rscgbkk50xwrz3i3vlh9ym1184wq14jmp8"; depends=[graph]; };
   yeastGSData = derive2 { name="yeastGSData"; version="0.12.0"; sha256="0s3458lvcn7xpnwkygl426zqm7h35cl59r0rlp0znnrjvr3f16k3"; depends=[]; };
   yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.10.0"; sha256="1085snsd7wsi9sjsqm551i2bnv8pf234vvz6xpw9fz0inr6m5wqq"; depends=[]; };
+  yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.12.0"; sha256="1rym01mbpn0h70q1c7alhnrqa0c2hb7xmr17qbsh130gqp67c3mq"; depends=[]; };
   yri1kgv = derive2 { name="yri1kgv"; version="0.16.0"; sha256="0xqlqi665ww3w00g5wv089ydjs74iy07xqzbn19bpdqnkypm83rx"; depends=[Biobase GGBase]; };
+  yriMulti = derive2 { name="yriMulti"; version="0.4.1"; sha256="1s1riipq4ck655m3cds6ffvzr7hg0aa2fhm8gax2b7hwgqr4xmiz"; depends=[dsQTL GenomicRanges geuvPack gQTLBase Homo_sapiens MultiAssayExperiment SummarizedExperiment]; };
   zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.108.0"; sha256="04pbkfqb6l8qgxl1263jhhd7gm8hz908c47q5s1f1nvc3403dlbp"; depends=[]; };
 }
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 5f72f46f2a0..070ff5e96ad 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -134,6 +134,7 @@ in with self; {
   CellMapper = derive2 { name="CellMapper"; version="1.0.0"; sha256="1ixii9ppg7jhwvazzzjy3dq01x35yc3k81j698988dfrdls0plcv"; depends=[S4Vectors]; };
   CellNOptR = derive2 { name="CellNOptR"; version="1.20.0"; sha256="1awz7k09rx03f8dq5g9mmnlizpx6232vvc03ycah3r1wwzgfzlhd"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
   CexoR = derive2 { name="CexoR"; version="1.12.0"; sha256="110c7p0y3l7b491bvr78n5z8f4gmfgfjndbd8pnhn0k7abb9bvs9"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
+  ChAMP = derive2 { name="ChAMP"; version="2.6.4"; sha256="1f8ngnzp6yq4x746vid72ind2bi7l1wdfnipyj2wn0gsh2jpxa7c"; depends=[bumphunter ChAMPdata dendextend DMRcate DNAcopy doParallel FEM GenomicRanges goseq Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICmanifest impute isva limma marray matrixStats minfi plotly plyr preprocessCore quadprog qvalue RColorBrewer RefFreeEWAS RPMM shiny shinythemes sva wateRmelon]; };
   ChIPComp = derive2 { name="ChIPComp"; version="1.4.0"; sha256="0wr9qrw9mnjl28fw764vhjb2shif6fl3z0hbwkhrfiz1974rdw0v"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; };
   ChIPQC = derive2 { name="ChIPQC"; version="1.10.3"; sha256="1nabghyndp4bky6msb4k6gcxpgysz7rir545d5afrfi4gbk1rpfi"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; };
   ChIPXpress = derive2 { name="ChIPXpress"; version="1.16.0"; sha256="19lx482jhh4h97nic57lk198a0x1xc51cnx79l9h6r9r86ncxl0w"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; };
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 4b592385fb0..fa2659aa347 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,7 +4,7 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2017-06-30"; };
+let derive2 = derive { snapshot = "2017-08-24"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; };
@@ -38,8 +38,8 @@ in with self; {
   AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; };
   AHR = derive2 { name="AHR"; version="1.4.2"; sha256="15khncbbnpbvj6rcn6rklzhv5a0mmfyjljv77bsx96zfis7mk2d7"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
   AICcmodavg = derive2 { name="AICcmodavg"; version="2.1-1"; sha256="0y2lgvy0a78wdx4xcq85fkhl4hyvjdljrj199mibisfgkh61amb1"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; };
-  AID = derive2 { name="AID"; version="2.0"; sha256="01lr72r0b72kp8b979px82g2gmkw6nckjbm54njlxdspbjgfbkk2"; depends=[ggplot2 MASS nortest tseries]; };
-  AIG = derive2 { name="AIG"; version="0.1.6"; sha256="18yz034l6znrzfq1gr2xcs6s8wwk104jdazcs67a85c6rjchkij1"; depends=[dplyr magrittr mgcv rgl]; };
+  AID = derive2 { name="AID"; version="2.2"; sha256="11ch5nl3c4fb4b0whz67apf9hq2gwj5a54ri5g1d5xv0xcacxg58"; depends=[ggplot2 MASS nortest psych tseries]; };
+  AIG = derive2 { name="AIG"; version="0.1.7"; sha256="0fg2g74cg7nsgsfvglr91f0bcqnszs1c8vr1zkybq2sgy1kcpnaa"; depends=[dplyr magrittr mgcv rgl]; };
   AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
   ALA4R = derive2 { name="ALA4R"; version="1.5.6"; sha256="0fj5y6z179glhc2jj3ksd5w29xmlqm71n23hp1vynrza70fz0gna"; depends=[assertthat digest httr jsonlite plyr RCurl sp stringr wellknown]; };
   ALDqr = derive2 { name="ALDqr"; version="1.0"; sha256="0gk8hxh4p0fi47sf1zsvvxxbzp38vzk60wh8hmc63phnjab6qkv4"; depends=[HyperbolicDist sn]; };
@@ -58,7 +58,8 @@ in with self; {
   ANLP = derive2 { name="ANLP"; version="1.3"; sha256="1m1jnfaqny6qprgyk4f3naan5i5cildawv322h6mc25nypwl12m4"; depends=[dplyr qdap RWeka tm]; };
   ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
   ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.0.0"; sha256="0wqzsyp8bs8ib1l98pqm4hl6xqziqras4k7xykvgmfcgbwfmsbhd"; depends=[quadprog shiny]; };
-  APSIM = derive2 { name="APSIM"; version="0.9.1"; sha256="0ws9zl2c5m58j0rpbhkpd1rs0pasd4fazd25xw7b3s9b738clfwa"; depends=[data_table lubridate plyr RSQLite sirad stringr]; };
+  APML0 = derive2 { name="APML0"; version="0.2"; sha256="1v407c025528ia21h0zj6qylp3b1p3j3mqrlycc892zli69fxp6g"; depends=[Matrix Rcpp RcppEigen]; };
+  APSIM = derive2 { name="APSIM"; version="0.9.2"; sha256="0yyjz1kyvqpw9dh71ls2lf44gbb6r7bp9a22mr3z68k89azps5rc"; depends=[data_table lubridate plyr RSQLite sirad stringr]; };
   APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
   APfun = derive2 { name="APfun"; version="0.1.1"; sha256="0vb5lmyq8wnwnxikhslaqxd65rs2pv0k3l5bghdzj6s0hp1j6kxp"; depends=[raster rgdal]; };
   APtools = derive2 { name="APtools"; version="3.0"; sha256="0v5xgznc8hvw3gid8x5chksc62zpwbx34qsh64sv7d1kqmh5w26j"; depends=[survival]; };
@@ -71,7 +72,8 @@ in with self; {
   ARTP = derive2 { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
   ARTP2 = derive2 { name="ARTP2"; version="0.9.32"; sha256="12mrxssjcj08svdsrxv2nm53mzsgy1k0whd5zzy6fz327bjyqsrz"; depends=[data_table Formula]; };
   ARTool = derive2 { name="ARTool"; version="0.10.4"; sha256="1malrjv4myk9nj3dndgpzscfhky4y6lj8xbfg8h2b29g7s2k846q"; depends=[car dplyr lme4 magrittr plyr]; };
-  ASMap = derive2 { name="ASMap"; version="0.4-7"; sha256="1xsgz05ck60aflnnbhwwbrnizwq92g5ickdnx39fqlj6mpxircw4"; depends=[fields gtools lattice qtl RColorBrewer]; };
+  ASIP = derive2 { name="ASIP"; version="0.3.1"; sha256="10r7566c5w6s898mlnzj25f0xgd0r6qi9yvzwp4vi026b0bdrcl2"; depends=[gdalUtils raster rgdal]; };
+  ASMap = derive2 { name="ASMap"; version="1.0-1"; sha256="0qkw8wxlad327yydgisc7905qbszqr7x64bpkmjrbzain0ina4xv"; depends=[fields gtools lattice qtl RColorBrewer]; };
   ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; };
   ASSISTant = derive2 { name="ASSISTant"; version="1.2-3"; sha256="072lmvmdi5yfyfda42vs556ciwj2rnka02isnknk6czir3947nck"; depends=[mvtnorm R6]; };
   ATE = derive2 { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; };
@@ -89,7 +91,7 @@ in with self; {
   AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.1"; sha256="16rmwz51fy84w83vwnq2nv9mcrp4gi9ciirj5555gl1224b9i2am"; depends=[seewave tuneR zoo]; };
   AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; };
   Actigraphy = derive2 { name="Actigraphy"; version="1.3.2"; sha256="0y0ccmxhdfhdmi4k6pbfvnqknkqbgvfsf2qf7z7rc4xpfgym6574"; depends=[fda SDMTools]; };
-  ActuDistns = derive2 { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[actuar hypergeo reliaR]; };
+  ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; };
   AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; };
   AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; };
   AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; };
@@ -109,7 +111,7 @@ in with self; {
   AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; };
   AlignStat = derive2 { name="AlignStat"; version="1.3.1"; sha256="1x9nlf3z6rpfca3k3cqm673sid418mnl44df9v93nyj5dpd70ylc"; depends=[ggplot2 Rcpp reshape2 seqinr]; };
   AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
-  AlleleRetain = derive2 { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; };
+  AlleleRetain = derive2 { name="AlleleRetain"; version="1.3.4"; sha256="1jpn497plvgv1f9nwfpp5n765n7jr43cs5kz807a3fld8sjy0x2i"; depends=[]; };
   Amelia = derive2 { name="Amelia"; version="1.7.4"; sha256="0w6532s5xr7pw47zqhhymql7i68c4lralvw1gc26l9d4c7ib00fd"; depends=[foreign Rcpp RcppArmadillo]; };
   AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
   AmmoniaConcentration = derive2 { name="AmmoniaConcentration"; version="0.1"; sha256="05pnwfji9l9az4jvni6jy7cayzg5pbspz82a63kmj6rgibn4ywvn"; depends=[]; };
@@ -125,29 +127,30 @@ in with self; {
   AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.0"; sha256="14cdkbwv6bf0h6na200gwq6gdldzawsvzk9pnpixj1kq2n8amm6b"; depends=[ape seqinr]; };
   AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; };
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
-  AnthropMMD = derive2 { name="AnthropMMD"; version="1.0.1"; sha256="1zb5qxmnbp2ha7hsnb4cvlc6n83gimwsq2g5pwkg7yqi5xgcp1ff"; depends=[tcltk2]; };
+  AnthropMMD = derive2 { name="AnthropMMD"; version="2.2.0"; sha256="037d3543ga2dzp2bch0270vy8mchnfsfcabjh5kbgx8bbr9cmgkk"; depends=[shiny]; };
   Anthropometry = derive2 { name="Anthropometry"; version="1.8"; sha256="0drbpffi9qx04vrf60fim30l4xkyvn13mvpr3csyqdfhi0wwn990"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
   ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.2"; sha256="01h8hi76nlwn9hnfyvzyg2d25s2r0vgpl5rz37yqkhjs5xr3rpyi"; depends=[doParallel foreach stringr]; };
   AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
   AquaEnv = derive2 { name="AquaEnv"; version="1.0-4"; sha256="07yx7mbslqgqg7ky67n3xfhskaj7s3w5mvl7xkih48xbsdlmxi4l"; depends=[minpack_lm]; };
   ArArRedux = derive2 { name="ArArRedux"; version="0.2"; sha256="0ql9yx46sgqkc3jd7yaw3vwg8rnykbsvpcahrgc66753kcxih04q"; depends=[]; };
-  ArCo = derive2 { name="ArCo"; version="0.1-2"; sha256="1p6vz6kqdx81j0d37scfwhpz7bf0xhij01nk3aj3a5wmbg96iv25"; depends=[boot glmnet Matrix]; };
+  ArCo = derive2 { name="ArCo"; version="0.2"; sha256="1fxxg6080kg6n0wk8hm2qwjry88m6q6z4h9000zwpdfhf3fir1i2"; depends=[boot glmnet Matrix]; };
   ArDec = derive2 { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
   ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.2"; sha256="13canmrg1k4crxhzmrjpnkm8fwb4cv75wp7qjq6hl7bj5nqnva55"; depends=[coda dplyr DT ggplot2 ggthemes hdrcde readr shiny shinythemes]; };
   ArfimaMLM = derive2 { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; };
   ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; };
   ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
   AsioHeaders = derive2 { name="AsioHeaders"; version="1.11.0-1"; sha256="1g226im9aakqdv5gynsl568w0mxcbfrny9lqid7pl984pq8xr8ks"; depends=[]; };
-  AssayCorrector = derive2 { name="AssayCorrector"; version="1.1.3"; sha256="172zvyjim1w69d8v2ah8l56yj05vwypi77gkcz80xfyfmgcksgdk"; depends=[lattice latticeExtra RColorBrewer]; };
+  AssayCorrector = derive2 { name="AssayCorrector"; version="2.0.0"; sha256="0d2444if5hyfbzyminnspw686r5l4pf9cdj9k48n2539vd61k452"; depends=[kSamples lattice latticeExtra RColorBrewer RVAideMemoire]; };
   AssetPricing = derive2 { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; };
   AssocTests = derive2 { name="AssocTests"; version="0.0-3"; sha256="0vin9jkyvmgwk3kjf32qd8q9cj8ibmvdggbh8ny6f413ldyd77qc"; depends=[cluster combinat fExtremes mvtnorm]; };
   AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
   AsynchLong = derive2 { name="AsynchLong"; version="2.0"; sha256="1wjby75rpypzyrxnv2lgl7h2fsvyni3bpiwclp0x7cl4sxic1x5c"; depends=[]; };
   AtelieR = derive2 { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; };
   AtmRay = derive2 { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; };
-  AutoDeskR = derive2 { name="AutoDeskR"; version="0.1.2"; sha256="16yzlrksi0fpdj1j845wbqznv1313a6npxa6a8jl5nac4sbqck27"; depends=[httr jsonlite shiny]; };
+  AutoDeskR = derive2 { name="AutoDeskR"; version="0.1.3"; sha256="1n7c8ris8b517bs1wahpvrhwfbvn2q4jbq01kgiv9lfmkjckzfkc"; depends=[httr jsonlite shiny]; };
   AutoModel = derive2 { name="AutoModel"; version="0.4.9"; sha256="07wpdf5b1z6lk69nqybzx333zc57wbnga6dp0vkf1d50hxmpd9yc"; depends=[aod BaylorEdPsych broom car dplyr gtools lmtest MASS ROCR rowr]; };
   AutoSEARCH = derive2 { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[lgarch zoo]; };
+  Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; };
   AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; };
   AzureML = derive2 { name="AzureML"; version="0.2.13"; sha256="03b2s76dbzvpy32vj5kb030k1x64lll4bfv0ci92rii9l35653gc"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; };
   B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; };
@@ -156,10 +159,11 @@ in with self; {
   BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; };
   BACprior = derive2 { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; };
   BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
+  BALCONY = derive2 { name="BALCONY"; version="0.1.6"; sha256="13hy0ysg3vsm6v1acqwdifl4g3z6gxv97by49pq5adkjizhvsyvz"; depends=[Rpdb scales seqinr]; };
   BAMBI = derive2 { name="BAMBI"; version="1.1.0"; sha256="1578iifmjzlhxvgih8l5va07w6zk8d6li7j1w91033lfpzivahr0"; depends=[label_switching Rcpp RcppArmadillo]; };
   BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; };
   BANFF = derive2 { name="BANFF"; version="2.0"; sha256="1c5wdwqqvkcm9910lhd387snd7myv9qzs9vfk87vzp3di7hdi4l6"; depends=[coda doParallel DPpackage flexmix foreach GGally igraph mclust network pscl truncnorm]; };
-  BANOVA = derive2 { name="BANOVA"; version="0.8"; sha256="0kjmhb1y3vkm8yw4z5fqmr1ripblk82svg2ik15ml2xnriwgdpwp"; depends=[coda rjags runjags]; };
+  BANOVA = derive2 { name="BANOVA"; version="0.9"; sha256="1d2azyvz49lzsic133pgii6cfqkbyc9k4kpzs4diqy6s1bl62769"; depends=[coda rjags rstan runjags]; };
   BART = derive2 { name="BART"; version="1.2"; sha256="0clg63avxldr4h6dzv3pl087ms2a2zhg570xy7l9zjgh00v2zb2p"; depends=[Rcpp survival]; };
   BAS = derive2 { name="BAS"; version="1.4.6"; sha256="0fhldihrl94aj4kx5wlqyy7i8d9cm92zhk33ilarrymmksccinmp"; depends=[]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
@@ -179,20 +183,20 @@ in with self; {
   BCDating = derive2 { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; };
   BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
   BCEA = derive2 { name="BCEA"; version="2.2-5"; sha256="0jiizwnxycbz9x8fmkcw3rcjkgg5b9fawyddf8swvx23cnfm6z8z"; depends=[MASS]; };
-  BCEE = derive2 { name="BCEE"; version="1.1"; sha256="0pssqmjj13wjbkq8ls5r9zr08by24q0k9g4f1aysgxds2a4dawd1"; depends=[BMA]; };
+  BCEE = derive2 { name="BCEE"; version="1.2"; sha256="08jsnsy7l182n0gy2jy0l9a7grr62g57gz3217fzapk2im2q648b"; depends=[BMA leaps Rcpp RcppArmadillo]; };
   BCEs0 = derive2 { name="BCEs0"; version="1.1-1"; sha256="1ipg8xliqnpfa4ga9r0gqf5sfa9gass4hvrlgxazs5hb18fpsl91"; depends=[]; };
   BCRA = derive2 { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; };
   BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; };
   BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; };
   BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; };
   BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; };
-  BDgraph = derive2 { name="BDgraph"; version="2.39"; sha256="10k463mb6gkvvsyviz00a71ayvk2ygvf0s88x6cla7rvihdzrq7s"; depends=[igraph Matrix]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.40"; sha256="0dhmqgwsb89ph6zk507rg4qqjf9srflywf7v3v26q1f0qpxam87s"; depends=[igraph Matrix]; };
   BEACH = derive2 { name="BEACH"; version="1.1.2"; sha256="10533ac575mcw9mv1lf3dgjjaf1hgzv3yn7ys9qi6b2k5fynhsg0"; depends=[devtools DT haven plyr readxl rJava rtf sas7bdat SASxport shiny WriteXLS xtable]; };
   BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
   BEDMatrix = derive2 { name="BEDMatrix"; version="1.4.0"; sha256="0aha33skksh45fx248lx6v8cxwgkiripw3avspb8arbld9rmqwxn"; depends=[BH crochet Rcpp]; };
   BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
   BEST = derive2 { name="BEST"; version="0.5.0"; sha256="178vn0ps6nr7qjayavnvmbyx6gq57dni5llsncl89kkz633mb2hg"; depends=[coda HDInterval rjags]; };
-  BETS = derive2 { name="BETS"; version="0.2.1"; sha256="00pf2v8spbmih129yl97rkq3mjsrkckqbx745sk2vppzlimws1k8"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn miniUI plotly RCurl rmarkdown RMySQL rstudioapi seasonal shiny sqldf stringr urca webshot zoo]; };
+  BETS = derive2 { name="BETS"; version="0.3.1"; sha256="0w95nb4l63872rc5m24mz2n5gvr8wfs9kfy8f8dcabyl1nhlml0y"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools lubridate miniUI plotly RCurl rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; };
   BGData = derive2 { name="BGData"; version="1.0.0"; sha256="0xd7xpnvhpyvv6caxyif7wa25llvrnyzmmk4z6rp7absjqbz2alc"; depends=[BEDMatrix bigmemory bit ff LinkedMatrix symDMatrix]; };
   BGLR = derive2 { name="BGLR"; version="1.0.5"; sha256="14a979rnasaklkfafzpkhr6mqv0ga7fsfxq63scpnlwa2aasgn83"; depends=[]; };
   BGPhazard = derive2 { name="BGPhazard"; version="1.2.3"; sha256="1yp92y5y3xh0hb1ring6jrma8g4q6210hm9572j8ji1jkafzxjw1"; depends=[survival]; };
@@ -201,9 +205,10 @@ in with self; {
   BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; };
   BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.1"; sha256="1qygizn2np9amkm1f1332zp9ab9ky423plr9lahgwzdxn1c2c5c2"; depends=[AnalyzeFMRI fmri wavethresh]; };
   BHPMF = derive2 { name="BHPMF"; version="1.0"; sha256="0b7dl4wxhkk47cnj1dxdjnf094cabqb8ncyl7pdi0zx6h4py9h8w"; depends=[Matrix]; };
-  BIEN = derive2 { name="BIEN"; version="1.1.0"; sha256="1n6a1si3llaqm69nvh348dnvaf05g1kcklwvrys7nnr3kr3adslr"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; };
-  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.1-6"; sha256="1bvnjwccfrbl2v2wjks775s126a4z8h9fyxngzxicxq2n6i51wzc"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; };
-  BIGDAWG = derive2 { name="BIGDAWG"; version="1.5.5"; sha256="1blqaxhx9ffa036zcz30kmkhh58l0ybmyrb2sb947f2i13h7qsk0"; depends=[haplo_stats XML]; };
+  BIEN = derive2 { name="BIEN"; version="1.2.2"; sha256="11bqbkw6v4yvlvpv0bhmn5q7ady12hmp9ziak5jzsc7p4d8azd5r"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; };
+  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.2-22"; sha256="1m5kybi4mp7ghhv0cwdgfpqbclrp317wncns0hpbqywcqngxy3j4"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; };
+  BIGDAWG = derive2 { name="BIGDAWG"; version="1.14.2"; sha256="11y6fjq36szb7mdc6s22s4ji2hd3n7pqsyp9qr3665wp8lvw011c"; depends=[haplo_stats knitr rmarkdown XML]; };
+  BIGL = derive2 { name="BIGL"; version="1.0.1"; sha256="0qv57xknvivy3y1zppp0qnjy38124sgay9apj76s4bgf82kfyaiv"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
   BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
   BIOMASS = derive2 { name="BIOMASS"; version="1.1"; sha256="1qawp10hw7xhqyg9bdwvgxbksiwhga7h6vwp8m7q30ibwfv5kamg"; depends=[httr jsonlite minpack_lm msm raster]; };
   BIOdry = derive2 { name="BIOdry"; version="0.5"; sha256="0isvqs2bgirxwb7b1dbn70zfx9b4mw7fp33fwmxq0dx6k1r4f87g"; depends=[ecodist nlme]; };
@@ -211,7 +216,7 @@ in with self; {
   BKPC = derive2 { name="BKPC"; version="1.0"; sha256="1c5n2vdpsk00slqyxxq2c8d7ix8jdbyigrh23ykd4b95mynp9kdv"; depends=[kernlab]; };
   BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; };
   BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; };
-  BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.1.4"; sha256="007p7lc76q0mwsznh4n4n0j80z1mh5i5897sfd4igy4psmyxkb4y"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; };
+  BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.1.5"; sha256="0wnxfyl8hz1a0k33v5nc3j1ziwcv1fnw8639l0xv92p5rn7n5nc5"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; };
   BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; };
   BMA = derive2 { name="BMA"; version="3.18.7"; sha256="095iwlbjklg1pkp5jiw0srg7jh9cn50g8z4namrs4xsmlh7if65z"; depends=[inline leaps robustbase rrcov survival]; };
   BMAmevt = derive2 { name="BMAmevt"; version="1.0.1"; sha256="1krx8isj2wp3panjcbc2ysrc2pxz2casj12qq9p18imaa326l53y"; depends=[coda]; };
@@ -222,15 +227,16 @@ in with self; {
   BMisc = derive2 { name="BMisc"; version="1.0.1"; sha256="0r16aacsdag3b6vz0jbfvchdy10giwchdcnhri20l6bg7kwjvjwb"; depends=[formula_tools]; };
   BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
   BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="0.2.0"; sha256="1w8p8fkiai2xqgf0w8imv55p8s1nvsfdfmyrq2cnc5b8m1gw457k"; depends=[MASS matrixcalc mvtnorm plyr truncnorm]; };
+  BNPMediation = derive2 { name="BNPMediation"; version="0.1.0"; sha256="0bfsayhhhf60qr8nvs4yhshnb7ank70529abpqdxb506ni67pny1"; depends=[condMVNorm DPpackage mnormt]; };
   BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
   BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; };
   BNSL = derive2 { name="BNSL"; version="0.1.2"; sha256="0phvbxijrb29hs20g1f1nz5s449zv7mgrymlczc5vpsq8nq2y4vm"; depends=[bnlearn igraph Rcpp]; };
-  BNSP = derive2 { name="BNSP"; version="1.1.1"; sha256="00rmfn0ivrjghwzpfig3znwpswj0l1jvs9kvkknb1z33kvwbc9b4"; depends=[]; };
+  BNSP = derive2 { name="BNSP"; version="2.0.1"; sha256="08flz440ki467xsr8pg8y02n74p9wncawqpghchzm5zwb82wjdmw"; depends=[coda ggplot2 gridExtra plot3D threejs]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
   BOIN = derive2 { name="BOIN"; version="2.4"; sha256="0vb3bkaq9vl1yqm3dhdpd27nhv2095n3lp90fr961jpwj1xhjh5l"; depends=[Iso]; };
-  BPEC = derive2 { name="BPEC"; version="1.0"; sha256="15ys0nzy6988yw1lf4lmv2h9i164cbl41x261gdyvmg0dy62qsnc"; depends=[ape coda fields igraph maps maptools mvtnorm phytools R2G2 sp]; };
+  BPEC = derive2 { name="BPEC"; version="1.1"; sha256="14bkpmi1rmpl728nb7kmbmd687s5cvlzj181cxzwcaz3yb8x58nw"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; };
   BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; };
-  BSDA = derive2 { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
+  BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; };
   BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
   BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; };
   BSSasymp = derive2 { name="BSSasymp"; version="1.2-0"; sha256="1xs6gfvsla7h1sldckjfpw3qx7fhxiqzv849g3k6w1309r7pv75r"; depends=[fICA JADE]; };
@@ -265,8 +271,8 @@ in with self; {
   BayHap = derive2 { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
   BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
   BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
-  BayesBD = derive2 { name="BayesBD"; version="1.1"; sha256="0wkkk69841vfbwc10s0kvcvx87pnafgx4lr4d2nvqq3v4sw1d2v2"; depends=[Rcpp RcppArmadillo shiny]; };
-  BayesBinMix = derive2 { name="BayesBinMix"; version="1.4"; sha256="09jb8g273xf72wmrgqmajypszl1dyqab9wldb08aqlqf3d3rp1lw"; depends=[coda doParallel foreach label_switching]; };
+  BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; };
+  BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; };
   BayesBridge = derive2 { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lhbrfvddjglrzs6px7bc89yvfzj776amm7myqd0l"; depends=[]; };
   BayesCR = derive2 { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mnormt mvtnorm Rlab rootSolve truncdist]; };
   BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; };
@@ -298,31 +304,35 @@ in with self; {
   BayesX = derive2 { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[coda colorspace maptools shapefiles sp]; };
   BayesXsrc = derive2 { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; };
   BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
-  BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.1"; sha256="1vclgdqqldkwhiilv44ihflbadllna5hvggbjbpz0r3365alnmq6"; depends=[bnlearn d3heatmap lattice networkD3 rhandsontable shiny shinydashboard]; };
-  BayesianTools = derive2 { name="BayesianTools"; version="0.1.2"; sha256="0v6jqiv5rkdra3zjnsd64ja9x4arv61fm8mprx45d27fvy80dpbv"; depends=[coda ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp vioplot]; };
+  BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; };
+  BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.3"; sha256="1lli3v922cvp1kwg4sllgvm4rnb972anlpl0lklqk3aqi7ff6flw"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard]; };
+  BayesianTools = derive2 { name="BayesianTools"; version="0.1.3"; sha256="03lvds5hxanygmc46sivh7vin48phr3xs27gdz5f6j5pcm8j8xj5"; depends=[coda DHARMa ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm vioplot]; };
   Bayesianbetareg = derive2 { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[betareg mvtnorm]; };
   Bayesthresh = derive2 { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[coda lme4 MASS matrixcalc mvtnorm VGAM]; };
   BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
   BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; };
   Bchron = derive2 { name="Bchron"; version="4.2.6"; sha256="0i77a72cq6ddpfgs2p0f3bskb03428jxxyq8chjyirsws1amzp92"; depends=[coda ellipse inline MASS mclust]; };
   Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; };
-  BeSS = derive2 { name="BeSS"; version="1.0.2"; sha256="0kg9aa6jrnrmcfdyj3yl1ssqgwlvv15wyqi88s0h3p9ay68pykdj"; depends=[glmnet Matrix Rcpp RcppEigen survival]; };
+  BeSS = derive2 { name="BeSS"; version="1.0.3"; sha256="0qli3p15mp9q5hl7av7dqpdnh9rzn9hxrqabkfh3h2di0vpwv78g"; depends=[glmnet Matrix Rcpp RcppEigen survival]; };
   Benchmarking = derive2 { name="Benchmarking"; version="0.26"; sha256="00w7a16lhra6rjylyj26q67mvgbc3wa27a2wmiwjz5yh7wdnh193"; depends=[lpSolveAPI ucminf]; };
   BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; };
   Bergm = derive2 { name="Bergm"; version="4.0.0"; sha256="1iw9k9v540bnrjqqq9hvpjh8g4cr53sli31ldw4k1savzq0jirdf"; depends=[coda ergm MCMCpack mvtnorm network]; };
   Bessel = derive2 { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
   BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; };
-  BeviMed = derive2 { name="BeviMed"; version="5.0"; sha256="0nkb7phlvvk54m1bkphy788l64vzpnbbvrcsz1n7h79kl4d7kd8d"; depends=[Rcpp]; };
+  BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; };
   Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
-  BiBitR = derive2 { name="BiBitR"; version="0.3.0"; sha256="00b6d0h921a0wh4mydgi5kcpacx7pd21zbidmz02hs09vq30k030"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; };
+  BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; };
+  BiDAG = derive2 { name="BiDAG"; version="1.0.1"; sha256="089nixy13mi9z4vqb5dsrxf0g472d7ax5rrlrqmhr19pjfh800cq"; depends=[pcalg Rcpp]; };
   BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
   BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; };
   BiTrinA = derive2 { name="BiTrinA"; version="1.2"; sha256="0q2wqxj2ipmppilhvq80cnvhnhcp26h422i8ghx26nrkswhx378s"; depends=[diptest]; };
   BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; };
+  BibPlots = derive2 { name="BibPlots"; version="0.0.1"; sha256="0bmgyla44aw7mski7yw91mqzabhsf65j8bd6dvgaa8shvwhz6dqq"; depends=[]; };
   BigQuic = derive2 { name="BigQuic"; version="1.1-7"; sha256="1bhi9dilrprgjvqyc2hb4a0y8rm9la0m5lgry9mf184p56z1syzb"; depends=[Matrix Rcpp scalreg]; };
   BigSEM = derive2 { name="BigSEM"; version="0.2"; sha256="091fdibcxd8a8kf9k4pvc1sah830wh179f28gag9g816h4qclnx9"; depends=[MASS parcor]; };
   BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; };
   BigVAR = derive2 { name="BigVAR"; version="1.0.2"; sha256="14vb6nc6bn22dd112sg9zypkchmkv17gnwxs915k0k5vbb9czlr5"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
+  BimodalIndex = derive2 { name="BimodalIndex"; version="1.1.5"; sha256="08hkdpvwvi5vczc9hdzbk5qnr6s44wyf6n0xv0zbd51dqcmv2xbk"; depends=[mclust oompaBase]; };
   BinNonNor = derive2 { name="BinNonNor"; version="1.3"; sha256="0lxhfys066wz8svr9mjb28rd85lhjicqw4py4j96w9zgi974ha51"; depends=[BB corpcor Matrix mvtnorm]; };
   BinNor = derive2 { name="BinNor"; version="2.1"; sha256="14b90y40wzqwaf1v1l92s17j0kggbcsg5c90l1r7wi3j4xcl20pc"; depends=[corpcor Matrix mvtnorm psych]; };
   BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.3"; sha256="18cks0hh6a49jr1yq0pwgw3scy1b7cl2060miwxswpwry9lcnnn5"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
@@ -331,7 +341,7 @@ in with self; {
   BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.0"; sha256="08w5zcyrfz55x86nwpb4k0w0lpk1ncirjp30p46421w0xz8swk10"; depends=[expm Formula lmtest numDeriv]; };
   BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; };
   BioGeoBEARS = derive2 { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[ape cladoRcpp FD gdata optimx phylobase plotrix rexpokit xtable]; };
-  BioInstaller = derive2 { name="BioInstaller"; version="0.1.2"; sha256="1kf8d1l71ch04a73ysp3i8r3a5zdsk3df40lcwv4bij1hqgvjhl2"; depends=[configr devtools futile_logger git2r R_utils RCurl rvest stringi stringr]; };
+  BioInstaller = derive2 { name="BioInstaller"; version="0.2.0"; sha256="1pfgmpn6bwzxqac6jywkfkdi1jh99z93zlpcf8dpc9926zpjik7b"; depends=[configr devtools futile_logger git2r R_utils RCurl rvest stringi stringr]; };
   BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; };
   BioPET = derive2 { name="BioPET"; version="0.2.1"; sha256="0pwkgffm8hlgvpk3dfzskl50kp9b4rnxc8aj119kwrmlfazhhl50"; depends=[ggplot2 gridExtra pROC VGAM]; };
   BioPhysConnectoR = derive2 { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; };
@@ -366,7 +376,7 @@ in with self; {
   Boruta = derive2 { name="Boruta"; version="5.2.0"; sha256="111rp7lbq79p7c1w4dkzhb9wh32mns5p17xxq0qbjzaiv41377dy"; depends=[ranger]; };
   BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[brglm gtools lme4]; };
   BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; };
-  BrailleR = derive2 { name="BrailleR"; version="0.24.2"; sha256="07kd9x176gd3ccpskv7vn22jam1pknsywcd09qj7l4zfbv9l0rqx"; depends=[devtools extrafont gridGraphics gridSVG knitr moments nortest pander rmarkdown xtable]; };
+  BrailleR = derive2 { name="BrailleR"; version="0.26.0"; sha256="1grqs3sb1xk28vmpcbidb6s805wqzkrrx41qqz7jc5y8vpspba51"; depends=[devtools extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest pander rmarkdown XML xtable]; };
   Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; };
   Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
   BrownDog = derive2 { name="BrownDog"; version="0.2.0"; sha256="0i1rvrxb67kx3m3p84b7rrajjz5k3xj18qy631iqkg596p007940"; depends=[httpuv jsonlite RCurl]; };
@@ -384,14 +394,16 @@ in with self; {
   CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; };
   CANSIM2R = derive2 { name="CANSIM2R"; version="0.11"; sha256="12d5558b3wldla3sgwqdqwmfixcqfa8h92bq4a8ia284946vcbbf"; depends=[Hmisc reshape2]; };
   CARBayes = derive2 { name="CARBayes"; version="5.0"; sha256="0kii28mf75m7ij1l0bz2w93h7m1wwq1xjvv3d3nf3ps9h8rxzi8d"; depends=[CARBayesdata coda MASS matrixcalc MCMCpack Rcpp sp spam spdep truncnorm]; };
-  CARBayesST = derive2 { name="CARBayesST"; version="2.5"; sha256="1rzw05qq395zymmnk54a4qkq9b9mqwwmiaac0qgqq4k2ig9l5271"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; };
+  CARBayesST = derive2 { name="CARBayesST"; version="2.5.1"; sha256="10mzjcybj549wp07sigr7m0r93gjskmwd8i6i1017wyh1vv5vlyc"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; };
   CARBayesdata = derive2 { name="CARBayesdata"; version="2.0"; sha256="0mlqlqm50k4lqyvbjva7vji9jqa3rwi5ky5521rp5l4nqlj53sfb"; depends=[shapefiles sp]; };
   CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
   CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
+  CARS = derive2 { name="CARS"; version="0.1"; sha256="1l996731f29z54cyjp6x303xj8i6rrjkkwfsx79d0569b8dqv3rd"; depends=[np]; };
   CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
   CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; };
   CATkit = derive2 { name="CATkit"; version="3.0.0.2"; sha256="1afaa1s8clynpna9hwgbgfdp5jciv0n5q9vb27cgyl9n69nla991"; depends=[magic MASS png rtf season signal]; };
   CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; };
+  CBCgrps = derive2 { name="CBCgrps"; version="2.1"; sha256="0cvgcpvdvpvjkzkwapx0y4a666xq54dwm00w4w9n8fhgp05mnkn8"; depends=[nortest]; };
   CBPS = derive2 { name="CBPS"; version="0.13"; sha256="16g62pvxd2njawk2sfaznhicy1dfxab3v1k0bfrzj5a4l1501l2z"; depends=[MASS MatchIt nnet numDeriv]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
   CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
@@ -403,13 +415,13 @@ in with self; {
   CDF_PSIdekick = derive2 { name="CDF.PSIdekick"; version="1.2"; sha256="1h2d5xh7zj3d8r63qndvd5c8z52byn1852b51zmj6ypc90fil25x"; depends=[Rcpp]; };
   CDFt = derive2 { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
   CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-  CDM = derive2 { name="CDM"; version="5.7-16"; sha256="0gc9193c057mmdw5myva2hl345i5hrpzwbhvr6zpwxb9157w7nda"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; };
+  CDM = derive2 { name="CDM"; version="5.8-9"; sha256="05xfnf4llag1g96kv0sgkkpl67w0j76bjggi0wvg9z5f9pdjhmxj"; depends=[mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; };
   CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
   CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; };
   CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; };
-  CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.0"; sha256="1sj6w80w5qmy5advk2y38lrq9xz1zidq9f83xc364kpn3nw2d7x2"; depends=[combinat VineCopula]; };
+  CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; };
   CEC = derive2 { name="CEC"; version="0.9.4"; sha256="194n190szwzxjxfdhiah1f50vp6n7f3q567yky7pq1x2hngna5rs"; depends=[]; };
-  CEGO = derive2 { name="CEGO"; version="2.1.0"; sha256="141gr1sin6sgvjasm6sczvq2za25ybw7wapdljdx2lx7qhgq77rk"; depends=[DEoptim expm MASS Matrix quadprog]; };
+  CEGO = derive2 { name="CEGO"; version="2.2.0"; sha256="0k01fb8bciq3m2rcqcicrlhx6av46sdczgcyn8df1f3pr28l1fyf"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; };
   CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
   CFC = derive2 { name="CFC"; version="1.1.0"; sha256="0yhb314qcdxig5vg0nbzvsqiddlsqlm50vzddhpp0z5n3xfa7h2c"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; };
   CGP = derive2 { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; };
@@ -419,18 +431,20 @@ in with self; {
   CHMM = derive2 { name="CHMM"; version="0.1.0"; sha256="18wpld1anws9hv1z8sgib5nvjdg1wmk4dv5s1ysh8s0rzwnq9x2p"; depends=[mclust]; };
   CHNOSZ = derive2 { name="CHNOSZ"; version="1.1.0"; sha256="1nbszjvz43ijxdq8pv7bci7csbggg5gg16r3538gxd8yainrwkjr"; depends=[colorspace]; };
   CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; };
-  CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.1"; sha256="11cicxfvjhbrfjsczsv25xdy7pckmz1bnjx7xq5jbg3b1wbv4g28"; depends=[Matrix mvtnorm numDeriv stringr]; };
+  CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.2"; sha256="0s3a9ay0l9n5kc6q0wb7f9625vba4giz1pdg3ikq4h4zhp1ldq62"; depends=[Matrix mvtnorm numDeriv stringr]; };
   CIDnetworks = derive2 { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[igraph MASS msm mvtnorm numDeriv pbivnorm Rcpp]; };
   CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; };
   CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
+  CINNA = derive2 { name="CINNA"; version="1.0.0"; sha256="1ikmml2dr9xgs4nip9x4glri54qaib7janvifwwbrrqn0r377yyf"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; };
   CINOEDV = derive2 { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; };
   CITAN = derive2 { name="CITAN"; version="2015.12-2"; sha256="08h91q7529q04izgqw3ahm4r0zjpwnwyc0vynykvv9fz2fkbk7wb"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
+  CIplot = derive2 { name="CIplot"; version="1.0"; sha256="0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f"; depends=[MASS multcomp]; };
   CLME = derive2 { name="CLME"; version="2.0-6"; sha256="0cd3sn6amariap04lhc2kwsdcj4i4axrx95xr10spykr8py4skmc"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
   CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
   CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
   CMF = derive2 { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; };
   CMPControl = derive2 { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
-  CMplot = derive2 { name="CMplot"; version="3.2.0"; sha256="0hrym0kadwyc36hpgskls1fhipiq1vrpyhsjzrkny10m9yny5c8i"; depends=[]; };
+  CMplot = derive2 { name="CMplot"; version="3.2.1"; sha256="0gnqqw59xsjq671kiykj8k1qx1m2j7hj8dsnh7ccirpq55hqajff"; depends=[]; };
   CNLTreg = derive2 { name="CNLTreg"; version="0.1"; sha256="1fjc45kv2nm902vpfynfxj0n7nm2prazm44nhg2m30vd6l1ijisv"; depends=[adlift miscTools nlt]; };
   CNLTtsa = derive2 { name="CNLTtsa"; version="0.1"; sha256="0s98ckg6ms3kh49b8la2d8rsdb0m4m0v8gdbj48nqxncdvg25qk4"; depends=[adlift CNLTreg fields nlt]; };
   CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
@@ -442,12 +456,11 @@ in with self; {
   COCONUT = derive2 { name="COCONUT"; version="1.0.1"; sha256="1bpn1zhlbm99w8d80lp7iasi1ivvh0ndhpzh8glmnlnanm2b06ni"; depends=[]; };
   COMBAT = derive2 { name="COMBAT"; version="0.0.2"; sha256="1sda41db8h5gi7gqq0hj433dd6lh4xj75skjgmgqa3p80rndw461"; depends=[corpcor mvtnorm]; };
   COMBIA = derive2 { name="COMBIA"; version="1.0-4"; sha256="02yadw3zjkj0ljq2c5k5zfsn8qnlvr6gxgafzrqw9g95cawv8q4x"; depends=[gdata hash lattice latticeExtra oro_nifti]; };
-  COMMUNAL = derive2 { name="COMMUNAL"; version="1.1.0"; sha256="1fv5dlqajpsd9k99sfikj3ai4jpzz2fh4s3gfglwrajk0nzlxjg2"; depends=[cluster clValid fpc]; };
   COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.4.1"; sha256="14gjrf2hj7dy4hd0qnh6vqjzh7gc6g7gm7rh1d8dingkjwmjzrqb"; depends=[]; };
   CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; };
   CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; };
   CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
-  CORElearn = derive2 { name="CORElearn"; version="1.50.3"; sha256="0pa8jlvqgkdw3r5k6wlalq6xnqqc75gg2hzmc7s0qy57wjx450jw"; depends=[cluster rpart]; };
+  CORElearn = derive2 { name="CORElearn"; version="1.51.2"; sha256="0ifj7b29ij8ab96j733afkracwxpz5skcg9j3y9v21ny775l9cps"; depends=[cluster nnet rpart]; };
   CORM = derive2 { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; };
   COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; };
   COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; };
@@ -464,7 +477,7 @@ in with self; {
   CRF = derive2 { name="CRF"; version="0.3-14"; sha256="0xhjj76730yjlpwbhcpdzqp7s37a9rhf4adk1s7hfb0jm8b76fgh"; depends=[Matrix Rglpk]; };
   CRM = derive2 { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; };
   CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; };
-  CRTgeeDR = derive2 { name="CRTgeeDR"; version="1.2"; sha256="0dq5q1gb392imfgqhzqphc7h5af0qcx2vx4fh77gwpz08ycrlkmg"; depends=[ggplot2 MASS Matrix]; };
+  CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0"; sha256="1fzw8618k152b8d4d6wmzp0bfkz2grwp0rqsplwvfdx23nxq437n"; depends=[ggplot2 MASS Matrix]; };
   CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; };
   CSeqpat = derive2 { name="CSeqpat"; version="0.1.0"; sha256="097r5hhq45wl783qakqs8j2b3315j1bvk9pcpssx6svkn507hh66"; depends=[NLP tm]; };
   CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; };
@@ -484,7 +497,6 @@ in with self; {
   Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; };
   Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.2"; sha256="07g7ik3xb9ijghkz94qyk87c2d4q942h4d0yicwr1j1xzcv5qzsw"; depends=[]; };
   CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.0"; sha256="1r3318rzh29cgq72gdp16z60xkan7hyh1vj4gjg3pzbxy8zawqxx"; depends=[survey]; };
-  CampaR1 = derive2 { name="CampaR1"; version="0.8.4"; sha256="0qlbrmqfs38bg9hsmvzd3cfgsbd2zx99f64bjv1gfhkmysmg1ysb"; depends=[bio3d ggplot2]; };
   Canopy = derive2 { name="Canopy"; version="1.2.0"; sha256="10z511vp9nmyf7jaihdx2367ddsnlrfg4rdzlz7rg9b5k9d92pja"; depends=[ape fields pheatmap scatterplot3d]; };
   CarletonStats = derive2 { name="CarletonStats"; version="1.3"; sha256="1a8ic2ny2zkqy6xsnzhlc3hybhk200d8jbdbjfy7jav7n757kr0y"; depends=[]; };
   CatDyn = derive2 { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; };
@@ -496,11 +508,12 @@ in with self; {
   Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; };
   CePa = derive2 { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; };
   CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; };
-  CensMixReg = derive2 { name="CensMixReg"; version="1.0"; sha256="0plqirl6vhk2rx9q2kgniq7km9jl1g6xdn74sdjpdcm4srmr7074"; depends=[mixsmsn mnormt mvtnorm]; };
+  CensMixReg = derive2 { name="CensMixReg"; version="3.0"; sha256="0ywqijwca4hkc0mz5gngqs9ivkvvjznrkflcv590diapxw52b2c5"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; };
   CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
   CensSpatial = derive2 { name="CensSpatial"; version="1.3"; sha256="0gd1c5qlk71avv0s3jqwb00h9cm6djg9qwzc1znc3kh61wx9kvfi"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; };
+  Census2016 = derive2 { name="Census2016"; version="0.2.0"; sha256="1c88jmd565v19w8dbvai10f9y5lyfmzsxsjblc3gdykf9kharvcq"; depends=[data_table]; };
   CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; };
-  CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.5"; sha256="1q6dcikmk5la5msb4gml0llvbb9262bsgmdhxi75myv4jlb3b8p9"; depends=[robustbase]; };
+  CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.9"; sha256="0s3pd4y165v69m4wmg9jlc7dl4gz64la9yic67l3n4242wa84p19"; depends=[robustbase]; };
   CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
   ChIPtest = derive2 { name="ChIPtest"; version="1.0"; sha256="1yn5b5s56k2dbhw6damxj18xbaiz180ym7fiq2i3p2gkcgwpddbz"; depends=[]; };
   ChainLadder = derive2 { name="ChainLadder"; version="0.2.4"; sha256="0wp8cihvyrlbixzpp7fhr5qcsq46m54j0m4az97b0v6lwr5dfp4w"; depends=[actuar cplm ggplot2 lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
@@ -508,12 +521,12 @@ in with self; {
   ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.10"; sha256="1a1fzlp5fc5l357gklya096cwry26hymxrlpqsy1xdr60fd7pfx5"; depends=[Rcpp RcppArmadillo]; };
   ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; };
   Chaos01 = derive2 { name="Chaos01"; version="1.0.1"; sha256="061z1cm55d0vxf9ly8hdhqb0qapqkyvhnfg44nnfh43a6a6kv339"; depends=[]; };
-  ChaosGame = derive2 { name="ChaosGame"; version="0.2"; sha256="1d6c2zjh7d5d1abi07d9akjjbpccvlnra96f2w58rdr87dy757zq"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; };
+  ChaosGame = derive2 { name="ChaosGame"; version="0.3"; sha256="0nfp2qnhzpncs0yd5rknspin6c4hidqhxdd973ysiivg63wxwz8d"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; };
   CharFun = derive2 { name="CharFun"; version="0.1.0"; sha256="0cqy1na1lh9w3nspy68yylali9y5b64jlgh4fyzas556239dnyk7"; depends=[Bessel]; };
   ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
   CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
-  ChemoSpec = derive2 { name="ChemoSpec"; version="4.4.17"; sha256="1v4mzkhr6y90nhxnq28aklh76f3imv1cxch50vj5k23d744djx8f"; depends=[plyr]; };
-  ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.9"; sha256="095jahs7n591fam7s6i38h2iw5jbl005n040s1i489zzmsnj2n6d"; depends=[ChemometricsWithRData kohonen MASS pls]; };
+  ChemoSpec = derive2 { name="ChemoSpec"; version="4.4.85"; sha256="1wb9jvrsydia9lnc0pw55lngiqwa62ff02bfqj1slmr53nw864mp"; depends=[plyr]; };
+  ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.10"; sha256="0pdi7lbn97bs11x9dy4aa7zi2warqswk0gak4gr5ap4l69vh0baj"; depends=[devtools kohonen MASS pls]; };
   ChemometricsWithRData = derive2 { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; };
   ChoR = derive2 { name="ChoR"; version="0.0-1"; sha256="1zxzgmww368zfdd3fq4wmj4v9prh8fqdb2d3wplqszxjf1irmb45"; depends=[rJava]; };
   ChocoLattes = derive2 { name="ChocoLattes"; version="0.1.0"; sha256="0ircdar4fswaf34969gzgn83ia891jvwl29jn4s9a87cc4qagzgr"; depends=[ggplot2 knitr plotly R_utils rmarkdown WriteXLS XML]; };
@@ -527,19 +540,22 @@ in with self; {
   Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; };
   CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
   CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; };
-  Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.2.0"; sha256="18hqh2p64vhw3w26viyh049if0d9vgd012hrvdkq9cllzil9scac"; depends=[]; };
+  Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.2.1"; sha256="1jx5419r2c55qxh4kfjdm37594bqcalqgdrqihsr8aafxhh96b8z"; depends=[]; };
   ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; };
+  ClassComparison = derive2 { name="ClassComparison"; version="3.1.5"; sha256="0h83xf6vwp1wjavsnpcdxc033pyyc68vmghwmcivalcp3kahz6gf"; depends=[Biobase oompaBase]; };
+  ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.7"; sha256="03lp1dbp2mzrzk1hn7nkp7nm1ngs0qndlk3zz7qjh3a67x7xr5p1"; depends=[Biobase cluster mclust oompaBase oompaData]; };
   ClickClust = derive2 { name="ClickClust"; version="1.1.5"; sha256="0b46f453mffg4ym6yvmh7g3v05mc9gphwfra75j28y1425s87yvw"; depends=[]; };
   ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; };
   ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; };
   CluMix = derive2 { name="CluMix"; version="2.0"; sha256="0bp85yhz7mj0ljmqrlj72q817vwcdibsxhadv0jjfxw1bwjhh1mh"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; };
   ClueR = derive2 { name="ClueR"; version="1.2"; sha256="17phjzpdx11sw259xk16h2w28xdaxxpzbh0sxli61icnssw35n7z"; depends=[e1071]; };
-  ClustGeo = derive2 { name="ClustGeo"; version="1.0"; sha256="0n7i6lwc86cizpn5ibd6k9i41w8fcbh1cdxqm7w52z024w0z40jh"; depends=[FactoMineR plyr rCarto]; };
+  ClusVis = derive2 { name="ClusVis"; version="1.0.0"; sha256="0d8s4gd5dl4mc1538rhy2pwk1xfgbq2ca76qaqrl2q3mswb1p6wp"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod]; };
+  ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; };
   ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; };
-  ClustOfVar = derive2 { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; };
+  ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; };
   ClustVarLV = derive2 { name="ClustVarLV"; version="1.5.1"; sha256="11zydj3iq15sg84kny6nklpmh8wj9j9nklkknzfqnaagai8jgsmy"; depends=[Rcpp]; };
   ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="0.9.3"; sha256="1znyj39mwdi02xhypvr2fsx2yp45w8br7r8qkn831d6fza5pkcyc"; depends=[]; };
-  ClusterR = derive2 { name="ClusterR"; version="1.0.5"; sha256="1x4rkj4b8n8zirzzmkxa20n50msj6mw41j2gkr276pcs37paf772"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
+  ClusterR = derive2 { name="ClusterR"; version="1.0.6"; sha256="1pmh0i8ldnf8ka7hjh7sh6l22w34rrs7ci4z0l2cvzfjs7jz5swz"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
   ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; };
   ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; };
   ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; };
@@ -564,16 +580,17 @@ in with self; {
   CommonTrend = derive2 { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; };
   CommunityCorrelogram = derive2 { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; };
   Comp2ROC = derive2 { name="Comp2ROC"; version="1.1.4"; sha256="06hpbid9z1pzg7k4gqp2zn8l7sm375z32fsn54i27qbl3inp7m2d"; depends=[boot ROCR]; };
+  CompDist = derive2 { name="CompDist"; version="1.0"; sha256="02c18ksk6clv674yh79bzg3mh9hymzhal51j6g0rnvqd5ra8g66c"; depends=[actuar fExtremes numDeriv PearsonDS rmutil VGAM]; };
   CompGLM = derive2 { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp]; };
   CompLognormal = derive2 { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
   CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; };
   CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; };
   CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
-  CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.5"; sha256="0z9fjd344wc5bisir7hf64abli7in8b5860y1012vmah4vz9knlr"; depends=[Matrix]; };
+  CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.9"; sha256="086yacr5fgqzgl1hh0m6qpx59smk66bsxglaic3ynd9n9k1n9p6c"; depends=[data_table expm Matrix]; };
   CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; };
   CompetingRisk = derive2 { name="CompetingRisk"; version="1.0"; sha256="0lfpqz3a8csgmv8cg4clc1dzsgxvssfr5cyn1mgyxfzssch85drm"; depends=[MASS Matrix reshape2 survival wesanderson]; };
   Compind = derive2 { name="Compind"; version="1.2"; sha256="0xlsfrgh3pk0vfwhp81108fpcbhlddv31w449744rhpwzjbnx04b"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; };
-  Compositional = derive2 { name="Compositional"; version="2.4"; sha256="1av05vli01c1l5cgd7hmwc2pfgg69zplfj5x0pvnlxvjds668k36"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
+  Compositional = derive2 { name="Compositional"; version="2.5"; sha256="1962h3zcyc16alri9yybjskwwb5h6sal53rjhimw3wmcz9ykry11"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
   Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
   ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; };
   ConR = derive2 { name="ConR"; version="1.2.1"; sha256="0k6761x5dfibbbzfzmkc73ahfmw54d5rpj0rj32232qdlk48hqk5"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
@@ -581,7 +598,8 @@ in with self; {
   Conake = derive2 { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; };
   CondIndTests = derive2 { name="CondIndTests"; version="0.1.1"; sha256="0n9ishrq9ilray5cq37q7fyizaffbwx36s5lf9z60mh6hn3dppha"; depends=[caTools kernlab lawstat MASS mgcv quantregForest randomForest RPtests]; };
   CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
-  ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.1.0"; sha256="1w3xqcwh657k6g84dc14xxnv49c8khr4k3j2yxs2f18ps1ld5b9k"; depends=[ggplot2 metafor]; };
+  ConfigParser = derive2 { name="ConfigParser"; version="1.0.0"; sha256="0jjh6gz5qcqhirzkmg7a4lnf8n3mjly15x2mvbvdpjkk7iv3w9m3"; depends=[ini R6]; };
+  ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.3.0"; sha256="17l6dfff2v0a4p022qclrmkzi78ga9adkgxgrgk9imz0n9m9424d"; depends=[ggplot2 metafor]; };
   Conigrave = derive2 { name="Conigrave"; version="0.1.1"; sha256="0k9azng63pyq7xic5w00mllbyq17pz8g1zmgr6zpvkmfv13fa6yw"; depends=[ggplot2 miceadds mitools]; };
   ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
   ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; };
@@ -605,34 +623,34 @@ in with self; {
   Correlplot = derive2 { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
   CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; };
   CosmoPhotoz = derive2 { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[arm COUNT ggplot2 ggthemes gridExtra mvtnorm pcaPP shiny]; };
-  Counterfactual = derive2 { name="Counterfactual"; version="1.0"; sha256="18ngh1p2lm16wb4sxpah0xfbsnpq0i03mkaxsia51lqwkfg57vdv"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; };
+  Counterfactual = derive2 { name="Counterfactual"; version="1.1"; sha256="0mz0h5zsmca8fww7nq08m9cld2zbaydn8qad5f2g6vxn382842p9"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; };
   Countr = derive2 { name="Countr"; version="3.2.8"; sha256="0nx0xavpm3kkh6q9q4snqjs3dmp45b9dm2zqwg7lkrv0f32inkyp"; depends=[boot car flexsurv Formula MASS Matrix numDeriv optimx Rcpp RcppArmadillo VGAM]; };
   CountsEPPM = derive2 { name="CountsEPPM"; version="2.1"; sha256="1w1l4kbk8c2prq7f38maz0fc44j9za6cmj0vydmcgscb9s6f3mg7"; depends=[expm Formula numDeriv]; };
   CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; };
-  CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.0"; sha256="0lxyhs8pvkvkjy5a6jpkxs1vfy0b05l9z87rdyn6hwpf0a5jh2mg"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; };
+  CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; };
   CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; };
   CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; };
   CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; };
   Coxnet = derive2 { name="Coxnet"; version="0.2"; sha256="023l1fcs0g5qqlslqfwb51nkmcqa0d5qp9bibhndd8gq7raz6ws6"; depends=[Matrix Rcpp RcppEigen]; };
-  CpGFilter = derive2 { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; };
+  CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; };
   CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; };
   Cprob = derive2 { name="Cprob"; version="1.3"; sha256="1hahvkmniahhar47nha96vcj810895wgvvg9si112hnv3sjaql3r"; depends=[geepack lattice lgtdl prodlim tpr]; };
   CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
   CrossClustering = derive2 { name="CrossClustering"; version="3.0"; sha256="0l9cdniqf63x4pfkf6y7c2qh056jwadqw45nz9jk78wamqq8hyqv"; depends=[cluster]; };
   CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; };
   CrossVA = derive2 { name="CrossVA"; version="0.9.0"; sha256="0q5fc2maxq70s6h6dmj6amn6xzrjn6rzcsnq0cqrah2c8b6y351y"; depends=[lubridate]; };
+  CrossValidate = derive2 { name="CrossValidate"; version="2.3.1"; sha256="1v9fwhhy2xxrrn0xd2yg7ngy7adm85fmyvqhcvnpa91ifr4ijrly"; depends=[Modeler oompaBase]; };
   Crossover = derive2 { name="Crossover"; version="0.1-16"; sha256="19697wy066apkxrm99s7vflc0ih6zxxmyvj7x3dzh2icnv1gg1bb"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
   CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; };
   CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[car chopsticks ellipse rJPSGCS]; };
   CuCubes = derive2 { name="CuCubes"; version="0.1.0"; sha256="1cpazar85rp8xfjvy0vxivr61grzvxz7a9mirxvhynln964by6ns"; depends=[]; };
   Cubist = derive2 { name="Cubist"; version="0.0.19"; sha256="1bjajcr2qnmqy8cakgiy4q07nj9dygz15a9jry5sa4nbkabpj4qh"; depends=[lattice reshape2]; };
-  Cyclops = derive2 { name="Cyclops"; version="1.2.2"; sha256="1ly8rmfssjbi04b0k200iqh0gv3zr53x9vhj6hnrg1n3dqw0smn5"; depends=[BH bit ff ffbase Matrix Rcpp RcppEigen RcppParallel]; };
-  CytobankAPI = derive2 { name="CytobankAPI"; version="1.0.1.1"; sha256="0a3r0a97q6mr1mznbhddd37v2ydmh6vhagvpgcfp413fq1abcpi3"; depends=[httr jsonlite]; };
+  Cyclops = derive2 { name="Cyclops"; version="1.3.0"; sha256="0sznzzz21qn1cxxfa3wiwvfza7lykzzf0xyqvawha9vzm8qzgqnq"; depends=[BH bit ff ffbase Matrix Rcpp RcppEigen RcppParallel survival]; };
+  CytobankAPI = derive2 { name="CytobankAPI"; version="1.1.0"; sha256="1014r17krw74drykdlw24pgqylidp8yxa00zhf340ilcxfpacxyi"; depends=[curl httr jsonlite]; };
   D2C = derive2 { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; };
   D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; };
   D3M = derive2 { name="D3M"; version="0.41.1"; sha256="1qr50xq5zccb16a1rgzfbb9bz8bbnxxb522nb8ga159nmb4cwjmp"; depends=[beanplot Rcpp]; };
   D3partitionR = derive2 { name="D3partitionR"; version="0.3.1"; sha256="09172g1xz9j746y22wj7vx759a3wnv6skqqzfazl753ms07zrwdc"; depends=[htmlwidgets]; };
-  DA_MRFA = derive2 { name="DA.MRFA"; version="1.1.2"; sha256="0gcrvw6zkbrahavmplvcav2h2m3jqmgd5f1s12k7r51nkh19hn21"; depends=[optimbase psych]; };
   DAAG = derive2 { name="DAAG"; version="1.22"; sha256="16xp4qk09v9jwm4cs7b4mpn0kgl1va9rw86viwcjc54vjc32953f"; depends=[lattice latticeExtra]; };
   DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; };
   DAAGxtras = derive2 { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
@@ -648,7 +666,7 @@ in with self; {
   DBI = derive2 { name="DBI"; version="0.7"; sha256="04fyrxdpqcygg5wviy637y6lgk64xqjjq31lvv4hwqj5kbaxamr5"; depends=[]; };
   DBItest = derive2 { name="DBItest"; version="1.5"; sha256="1mhygy6wdw22r43jcisyxc852q1lbzx4xi387csf2zqgl86xldw4"; depends=[blob DBI desc hms R6 testthat withr]; };
   DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; };
-  DCA = derive2 { name="DCA"; version="1.0"; sha256="13f22vwnxgq9wh2klhprni80092qwpwvbdp7n1apfvhim13mcyf9"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; };
+  DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; };
   DCG = derive2 { name="DCG"; version="0.9.2"; sha256="1s2dz0vnhdhq23fqds1m2jspaz8k5zvd76z1zlbi6nb5ja5n3j3w"; depends=[]; };
   DCGL = derive2 { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; };
   DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; };
@@ -670,7 +688,7 @@ in with self; {
   DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; };
   DEoptim = derive2 { name="DEoptim"; version="2.2-4"; sha256="10nlsvms5pf0wmn4z1lj6vnmpwr10q8nhdy5xy9rn7hd1627fm0a"; depends=[]; };
   DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; };
-  DEploid = derive2 { name="DEploid"; version="0.3.2"; sha256="12yh9w6qlg3l9w9i7isic1g825d9r7qwwwf3d0x8j7prim37w5yr"; depends=[Rcpp]; };
+  DEploid = derive2 { name="DEploid"; version="0.4.3"; sha256="1hcdf4iap81d332daqlzva6vs5glxj5523znl2rifx6r0m8kzagl"; depends=[magrittr plotly Rcpp scales]; };
   DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; };
   DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; };
   DHARMa = derive2 { name="DHARMa"; version="0.1.5"; sha256="1mgvpyhllp7pqnas5sbn6393jkin205109g2b4pn3diyb20avqwp"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; };
@@ -682,7 +700,7 @@ in with self; {
   DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; };
   DJL = derive2 { name="DJL"; version="2.6"; sha256="1vvfh9hpanac2g22k4hqy3y7j3mn34mvasw0rx3y4vjbv3h05yw6"; depends=[car lpSolveAPI]; };
   DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; };
-  DLMtool = derive2 { name="DLMtool"; version="4.2"; sha256="0s133f7xi8lz9hcdmdh8d0msy9l2xr3z2b9778h9g7mp9bh09ran"; depends=[abind coda devtools LBSPR MASS mvtnorm r4ss Rcpp readxl snowfall]; };
+  DLMtool = derive2 { name="DLMtool"; version="4.4.1"; sha256="0ld3v7qkjkp8f9didzf79ds0gdzywpk453i6fdx1wv6xr65m8kqn"; depends=[abind coda devtools LBSPR MASS mvtnorm r4ss Rcpp RcppArmadillo readxl snowfall]; };
   DMMF = derive2 { name="DMMF"; version="0.3.2.0"; sha256="17v7ksmknbgh7h9k2l6mgkykg0rq352nlw585yhfck0bvvb5vdb3"; depends=[raster rgdal sp]; };
   DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
   DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; };
@@ -703,11 +721,11 @@ in with self; {
   DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; };
   DRR = derive2 { name="DRR"; version="0.0.2"; sha256="1scfwp6ry6apxzqjclsmn2frxp9qfw6zxsxn5w0j0q3sz42hz1h2"; depends=[CVST kernlab Matrix]; };
   DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; };
-  DSAIDE = derive2 { name="DSAIDE"; version="0.4.0"; sha256="1dy6kxk63yaa8npaszcsc5g5is8ikcdfxkk1csy34m6q5l18yxar"; depends=[adaptivetau deSolve knitr shiny]; };
+  DSAIDE = derive2 { name="DSAIDE"; version="0.5.0"; sha256="03q4clm5gr08z3lad995slw1w054b16ng4mzs5yhcpp90f00ylfc"; depends=[adaptivetau deSolve knitr shiny]; };
   DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
   DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; };
   DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
-  DSsim = derive2 { name="DSsim"; version="1.1.1"; sha256="1av7dvzqarap1b21cq4mhv494yh1wdxa2vi5gkvb1f9mhlx0v70c"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; };
+  DSsim = derive2 { name="DSsim"; version="1.1.2"; sha256="1n46r7nn2wl8xnc22wf91mcz745yzx83g8nk5mmj429j3i0sfd77"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; };
   DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; };
   DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; };
   DT = derive2 { name="DT"; version="0.2"; sha256="1g86p0jcjqi2ph5rhm45jkzibsa6yfcj8n5cg3giy90sqgjzkdx1"; depends=[htmltools htmlwidgets magrittr]; };
@@ -729,14 +747,14 @@ in with self; {
   DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
   DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; };
   DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; };
-  DataEntry = derive2 { name="DataEntry"; version="0.9-1"; sha256="127g8vd22rir2xdhv0jdirfg2vq7iyh6y1qak8221jxdifpfvrjj"; depends=[digest gWidgets gWidgetsRGtk2 RGtk2]; };
+  DataEntry = derive2 { name="DataEntry"; version="0.9-2"; sha256="1hp1601cq3rc9d84v86445mjpms6ji19lv122gdn9z0ppr39djps"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; };
   DataExplorer = derive2 { name="DataExplorer"; version="0.4.0"; sha256="0yxx20wzdnsz924q7mh9sbbbby04vv5rybvyqbk2s78a8lqv7abw"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; };
   DataGraph = derive2 { name="DataGraph"; version="1.0.1"; sha256="0rvysvkcs926jzhp7iz9d5np0pa31y825ajn9yyzhbdfk5dg2wry"; depends=[Rcpp]; };
   DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; };
+  DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="0.9.7"; sha256="0r90jmrg3w0crfkyacaz14kg7z5ri2fjcil5b8nyf18pg4w0gnbp"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; };
   Datasmith = derive2 { name="Datasmith"; version="1.0-1"; sha256="1ba23b8a931pvml2dzw0zkm40akcl2lb6rps6bffrl7lvxiy35y1"; depends=[igraph lbfgs MASS Matrix nloptr truncnorm vegan]; };
   Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; };
-  DeLorean = derive2 { name="DeLorean"; version="1.2.4"; sha256="1ja3kgw4rynsaaybq77axzp1m7sbqnv1pc7s9qsm1c7k6v3zjhfg"; depends=[broom coda dplyr fastICA functional ggplot2 kernlab MASS memoise Rcpp reshape2 rstan seriation stringr]; };
-  DecisionCurve = derive2 { name="DecisionCurve"; version="1.3"; sha256="1sigxhm9d9k2kxap43kpnlb0r8iqphslb7wxcp44k1cdnk192311"; depends=[caret MASS pander reshape]; };
+  DeLorean = derive2 { name="DeLorean"; version="1.2.5"; sha256="17qrgij2npdgsdifsa2bvcs99p28why3wbdz5a8dkhyj4plj14kk"; depends=[broom coda dplyr fastICA functional ggplot2 kernlab MASS memoise Rcpp reshape2 rstan seriation stringr]; };
   DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; };
   Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; };
   DeducerExtras = derive2 { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; };
@@ -745,8 +763,8 @@ in with self; {
   DeducerSpatial = derive2 { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; };
   DeducerSurvival = derive2 { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
   DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; };
-  Delaporte = derive2 { name="Delaporte"; version="6.0.0"; sha256="0jjm84m2lq7p326ji2z207a7r04l9aj1bgy82b3isgj7i01k56xy"; depends=[]; };
-  Delta = derive2 { name="Delta"; version="0.1.1.1"; sha256="0wbdb23l5ayiwg0cnkwkqlg7g1n41jsq6m1b8fxf0dn25lfkiqkj"; depends=[]; };
+  Delaporte = derive2 { name="Delaporte"; version="6.1.0"; sha256="1gpckw6vd00cjpf164rmxxdvg08ky1as9rj7ls3l52ghyn0s3pxs"; depends=[]; };
+  Delta = derive2 { name="Delta"; version="0.1.1.11"; sha256="1fi5sgyrf86xmfxhglqxcc0hq5mpc8ar3nk2s4wx3rw4if3sdxdz"; depends=[]; };
   Demerelate = derive2 { name="Demerelate"; version="0.9-3"; sha256="1bsf09di6nh0hznqx829jnbn3092rya03hnc82cns6rm8d3bn0a9"; depends=[fts mlogit sfsmisc vegan]; };
   DendSer = derive2 { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
   DendroSync = derive2 { name="DendroSync"; version="0.1.0"; sha256="0694pw5wh6ff30gpxxn4spkdyzybqhdvh2p9ciijnn454rqv6qm6"; depends=[ggplot2 gridExtra nlme]; };
@@ -763,7 +781,7 @@ in with self; {
   DetSel = derive2 { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
   Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; };
   Dforest = derive2 { name="Dforest"; version="0.4.0"; sha256="05a3hhddkyk1jlmgvlswa5bsaqlfpgvprzpays18rd7af60542n8"; depends=[ggplot2 rpart]; };
-  DiagrammeR = derive2 { name="DiagrammeR"; version="0.9.0"; sha256="09j6h733wm0b9k8l8va2fav6h5cxz6z07kwp29hfxgsjd97rchlg"; depends=[dplyr htmlwidgets igraph influenceR magrittr RColorBrewer rgexf rstudioapi scales stringr tibble viridis visNetwork]; };
+  DiagrammeR = derive2 { name="DiagrammeR"; version="0.9.1"; sha256="0aj45iyvrf1whm7k9gdd9hbwq8j7ffd7v6286wxqlknbrfjacp3p"; depends=[downloader dplyr htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; };
   DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; };
   DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.1.1"; sha256="1diwzckn0f2dv0vj2mdzy7k3md6j472xzj82ip23adwr27vlfsi3"; depends=[ggplot2]; };
   DiceDesign = derive2 { name="DiceDesign"; version="1.7"; sha256="05bmscy275077kmbmg75npnmw30kd5x5wmlizcfq771zixby3f7h"; depends=[]; };
@@ -779,7 +797,7 @@ in with self; {
   DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   Digiroo2 = derive2 { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; };
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
-  Directional = derive2 { name="Directional"; version="2.7"; sha256="1d2dbsvkdvg4i9d3gyc8i0y2ld01mxaih6plzkz13qrsszy5nrvq"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
+  Directional = derive2 { name="Directional"; version="2.8"; sha256="135xssvd3jvw2b98pyw33hdphhr08ha3mspx57hjzw37xxavyb24"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; };
   DisHet = derive2 { name="DisHet"; version="0.1.0"; sha256="0j25skxf26zwwrkzjadw6drg5wrhipk0j6wzjl3xzhpfxsz93afp"; depends=[gtools matrixStats]; };
   Disake = derive2 { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
@@ -789,7 +807,7 @@ in with self; {
   DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; };
   DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
   DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; };
-  Distance = derive2 { name="Distance"; version="0.9.6"; sha256="165spw4hfyjpgfwg3z5wi69spfb1x3xzag4phwrqhsnp8wb4b619"; depends=[mrds]; };
+  Distance = derive2 { name="Distance"; version="0.9.7"; sha256="0g2zb7im3l4043bml7akd2cbss3p7mlvds6iv1libimlpy1dr71f"; depends=[mrds]; };
   DistatisR = derive2 { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[car prettyGraphs]; };
   DistributionUtils = derive2 { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
   DivE = derive2 { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
@@ -797,8 +815,9 @@ in with self; {
   DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
   DiversitySampler = derive2 { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; };
   DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
-  DoE_base = derive2 { name="DoE.base"; version="0.30"; sha256="0zpb5cvraznaawkrc7swwvsq363slv0sq1w4rs80jg14sshvr67n"; depends=[combinat conf_design lattice MASS vcd]; };
+  DoE_base = derive2 { name="DoE.base"; version="0.31"; sha256="0kr9d8ga6dif02gzn6z72n46a85n2kx933m16ja6gpa3wmp3x2wh"; depends=[combinat conf_design lattice MASS numbers vcd]; };
   DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; };
+  DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; };
   DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; };
   Dodge = derive2 { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; };
   Dominance = derive2 { name="Dominance"; version="1.0.17"; sha256="07xsyadmq47szvp1vnf53ijq43pwd9g7554fgl803fhkwq6b3jgh"; depends=[chron gdata igraph XLConnect]; };
@@ -808,6 +827,7 @@ in with self; {
   Dowd = derive2 { name="Dowd"; version="0.12"; sha256="1fgaq22n7gm8pqxdfkiayqgjfqjn7knjjjr1x12jgv77cv08xyjk"; depends=[bootstrap forecast MASS]; };
   Dpit = derive2 { name="Dpit"; version="1.0"; sha256="02pnc00sk3bwxmxrg27638x0q62r7nsx2nr14zjjc5q880prdisv"; depends=[fitdistrplus gsl moments VGAM]; };
   DrBats = derive2 { name="DrBats"; version="0.1.4"; sha256="0jzl1jklxsbqf5hv3a71lckk51jxi1lnbk5zmvd4x3y9b9azl2cq"; depends=[ade4 coda MASS Matrix rstan sde]; };
+  DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; };
   DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; };
   DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; };
   DstarM = derive2 { name="DstarM"; version="0.2.2"; sha256="014xlj5kipl2jpcgcqs1ynw05x17wbsgc5mhfjn3p96bbp6pkzzy"; depends=[DEoptim ggplot2 rtdists RWiener]; };
@@ -826,14 +846,14 @@ in with self; {
   ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; };
   ECOSolveR = derive2 { name="ECOSolveR"; version="0.3"; sha256="16cw13cxa24c1dkcn8qwkpim4lrjr7cgr8z59px7wi6fyh6v189g"; depends=[Matrix]; };
   ECctmc = derive2 { name="ECctmc"; version="0.2.4"; sha256="1aw0cbfgzlrkyc3m1rfhbdcdyb8wjcfx6p2mz1hvds86mf1pzv1i"; depends=[Rcpp RcppArmadillo]; };
-  ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.11"; sha256="0s15x7ggsf2wi167hx7198jn11y59ix9a550wnmr43b9vn7rfdw5"; depends=[jsonlite shiny]; };
+  ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.12"; sha256="0g0591dddkdvpq1wgw5wjz0b0qlwkjxi0zz9g33qs442ijq8v1wc"; depends=[jsonlite shiny]; };
   EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
   EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; };
   EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; };
   EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; };
   EFAutilities = derive2 { name="EFAutilities"; version="0.1.0"; sha256="1kbbhwvqj6c5n2nknjy7kfm4i0zhil5x8rsl1k4xh1zcvnlj22bs"; depends=[GPArotation mvtnorm]; };
   EFDR = derive2 { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
-  EFS = derive2 { name="EFS"; version="1.0.1"; sha256="0zjspy4myxi1z16pbs515c8zylkbykdadsqkgdd9k0pr0mb7cnck"; depends=[party pROC randomForest ROCR]; };
+  EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; };
   EGRET = derive2 { name="EGRET"; version="2.6.0"; sha256="0alr47pmq1ml64j500vkqwmvrqa3i1ccbf3w7w44fbbjy1vfp04a"; depends=[dataRetrieval fields lubridate survival truncnorm]; };
   EGRETci = derive2 { name="EGRETci"; version="1.0.2"; sha256="15jf4bgxvqqz64y4i6ncfj0ymgwmhahxlhdnfps4zj7gwxgcbvqh"; depends=[binom EGRET lubridate]; };
   EIAdata = derive2 { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; };
@@ -844,7 +864,7 @@ in with self; {
   ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; };
   ELYP = derive2 { name="ELYP"; version="0.7-3"; sha256="1d91r59m85k91kcjjlvhvbsa9855fyd702bwj7drvk36ssfr8qb9"; depends=[survival]; };
   EMA = derive2 { name="EMA"; version="1.4.5"; sha256="16iq5a3yrilchqmkyb4g5bmmgpw6psm88n52gmlax75xbiwk8261"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; };
-  EMAtools = derive2 { name="EMAtools"; version="0.1.2"; sha256="1kwannv833iq5k2jkjmpa1cmm4dq0dd4w930k352yfri7m2nq4q8"; depends=[DataCombine ggplot2 sjstats]; };
+  EMAtools = derive2 { name="EMAtools"; version="0.1.3"; sha256="1kzna29kd6s2hgli5azrfz85mbyl1x6knvhhhny2scf7a1fcijsy"; depends=[DataCombine ggplot2 lmerTest sjstats]; };
   EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; };
   EMCC = derive2 { name="EMCC"; version="1.3"; sha256="166yqr17a72lhimpgbgzpf9frribj47n4rddzqd9m4xmh4f6x7x5"; depends=[EMC MASS mclust]; };
   EMCluster = derive2 { name="EMCluster"; version="0.2-7"; sha256="1ybffri9khfmliwp0xln3yzal7wx1h0qw3s7ixrx7zzvg58blryp"; depends=[MASS Matrix]; };
@@ -858,7 +878,7 @@ in with self; {
   EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; };
   EMMREML = derive2 { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; };
   EMP = derive2 { name="EMP"; version="2.0.2"; sha256="0l9wyxmcl8b6jiykc4mim6npmz5wrsapk2wgxbfhg27dwdb847ha"; depends=[ROCR]; };
-  EMSC = derive2 { name="EMSC"; version="0.8"; sha256="1fkwmfiw3cg0wkzcwl68dxzyiz7n35jmvjhq6jxdmb59p10f5z1j"; depends=[pracma]; };
+  EMSC = derive2 { name="EMSC"; version="0.8.2"; sha256="1wclkyq528fhvbr6n5592byjlpi0xszhqzbbzsq64ilg88q9cmaj"; depends=[pracma]; };
   EMSaov = derive2 { name="EMSaov"; version="2.2"; sha256="12y0mj72la4ciwzgr38w9ssik4hixjf5kjsjwrvz6z59hi0ldfly"; depends=[shiny]; };
   EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
   EMVC = derive2 { name="EMVC"; version="0.3"; sha256="1n7fxmqg8762lc7lg50h6wcrxrrz4nvi0xdaganz84l8vp8w90ms"; depends=[]; };
@@ -874,7 +894,7 @@ in with self; {
   ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; };
   ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; };
   ESKNN = derive2 { name="ESKNN"; version="1.0"; sha256="1w43v3q9i7dkx1qwcl5cgh9wdgg5r4s7vfbkk0vcsq9qd8nbcvfy"; depends=[caret]; };
-  ETAS = derive2 { name="ETAS"; version="0.4.1"; sha256="1zaz75r4vp79szsa4la81jahci04iiv7kpqlka1zllgpg4qkg4bw"; depends=[fields maps Rcpp spatstat]; };
+  ETAS = derive2 { name="ETAS"; version="0.4.3"; sha256="08i8i3az5f4nb6cwfyilc0dk84j6i3f3k6bxr2k1lrds1rqx0fla"; depends=[fields lattice maps Rcpp spatstat]; };
   ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
   ETLUtils = derive2 { name="ETLUtils"; version="1.3"; sha256="13xq9i9fr34kx1nym7nr02gynshzm4jjn4qzx6ydg044b7xl57jp"; depends=[bit ff]; };
   EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; };
@@ -885,12 +905,12 @@ in with self; {
   EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; };
   EasyMx = derive2 { name="EasyMx"; version="0.1-3"; sha256="0kzfsnknbpmgj4ikn9sh453irqv5vvdyibmm7f1xmfmnsvcck6p2"; depends=[OpenMx]; };
   EasyStrata = derive2 { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; };
-  EbayesThresh = derive2 { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
+  EbayesThresh = derive2 { name="EbayesThresh"; version="1.4-12"; sha256="07a2dd3za2dc81n6m2xy794sclp3yw7f46lg1igaflh7m9407198"; depends=[wavethresh]; };
   Ecdat = derive2 { name="Ecdat"; version="0.3-1"; sha256="1lvfp2ih8ng3kn3cia687j5fd27iwiak7gk3bhgjp8bnlgblqq02"; depends=[Ecfun]; };
   Ecfun = derive2 { name="Ecfun"; version="0.1-7"; sha256="0s4hhvwyi411xr7c1fv098nmwqjcyvh8vy65j5w9hd80l864lvkl"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
   EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1"; sha256="0ww0p4allaaz2zmj88105xr75gffcsycjjyy1ph4m9q7w5sw3c5y"; depends=[d3heatmap edgebundleR ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; };
   EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
-  EcoIndR = derive2 { name="EcoIndR"; version="1.0"; sha256="0yw27rv0w7z276cbjqqiidf4r5razp0xmam8kl8jd06q6yjpizrw"; depends=[]; };
+  EcoIndR = derive2 { name="EcoIndR"; version="1.1"; sha256="12m0cwv3q0bsxqz0vrfnqb18vb61pqpsd0j7fn1bs2xmkwvwkbni"; depends=[]; };
   EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
   EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
   EcoVirtual = derive2 { name="EcoVirtual"; version="1.0"; sha256="1adhxwi22psr81xh1szjvn6ycv4zw31xjnswk65iazk3sc4vz7wc"; depends=[]; };
@@ -902,7 +922,7 @@ in with self; {
   EffectStars2 = derive2 { name="EffectStars2"; version="0.1-1"; sha256="1yffwnr563vzdq0ph9xs3w0zg5c7l3ima6skn8cqiafr21w332ss"; depends=[miscTools VGAM]; };
   EffectTreat = derive2 { name="EffectTreat"; version="0.3"; sha256="1y8b1867idjbd7i39hhryg4nyijlv6d828z0jspp80fka3sp8xpw"; depends=[]; };
   EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
-  EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.1"; sha256="1m4cycvq58pvccpkycj7kmyavyz722q48qr1sc102a3a1wjj375j"; depends=[]; };
+  EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.3"; sha256="10awzpl6vb4rz9yja8ly6w2vizggpzicp7s42s4806nwf116zwv5"; depends=[]; };
   ElastH = derive2 { name="ElastH"; version="0.3.1"; sha256="1xgmz0xirvdyjz8l31zb2j91nj0g8ffhvzp44b97473fsj06n1g6"; depends=[dlm]; };
   ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26"; sha256="0r8d0fm4yx7iawcsikksd7i01kbyqz3xkdls74f3ngkvj4iq1rqc"; depends=[]; };
   EloChoice = derive2 { name="EloChoice"; version="0.29"; sha256="1r54laim7i8hzgyir47xq7qw8hxzsdw1ss10sljq1rm2lpsci6wk"; depends=[Rcpp RcppArmadillo]; };
@@ -925,9 +945,9 @@ in with self; {
   EnvStats = derive2 { name="EnvStats"; version="2.2.1"; sha256="0gjjw2pvqh4m18f7m0pkcr1lsryqmfai1kqc34146h1a4wv7gbdv"; depends=[ggplot2 MASS]; };
   EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; };
   EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
-  Epi = derive2 { name="Epi"; version="2.15"; sha256="0f4ibfz7qf1bbp10i119rqgf1633acybrxzclacacflg28bv2za6"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival]; };
+  Epi = derive2 { name="Epi"; version="2.19"; sha256="1zd5q5w8l9gvq0x5j00vwfb61kfadbziqmff5fm0cmwnvpizl55k"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival zoo]; };
   EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; };
-  EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.10.0"; sha256="0x0ah55nx68mq05hpp29g9h21is3kx9d84r82j4x4asyqjv92s7v"; depends=[]; };
+  EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.11.0"; sha256="1ry7s4snq6hgbw55b6w615f2y2iskpdcy9kpjg1zv6hp06b6hyqr"; depends=[]; };
   EpiCurve = derive2 { name="EpiCurve"; version="1.1-0"; sha256="1s6lhhc6n0dfbwaklc8fx9f0yi9r0yf5pf0fs955hiv5al98vaai"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; };
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
   EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
@@ -940,13 +960,13 @@ in with self; {
   EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
   EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
   EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.1.2"; sha256="148srhlpzh0scvnkjbkyia1pr8a2ridabm3dahw4zn7p3cryiyb1"; depends=[igraph qgraph]; };
-  EthSEQ = derive2 { name="EthSEQ"; version="2.0.1"; sha256="014yhh1msn1vg4ncrs557xrw25vd6jplbsqw2x728hjfivrlwl78"; depends=[data_table gdsfmt rgeos SNPRelate]; };
+  EthSEQ = derive2 { name="EthSEQ"; version="2.1.0"; sha256="0hby3sc7zflqnk8x7cbpy04mk3xf138xm5zrxlfckpimj40nzkkk"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; };
   EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.0"; sha256="08m7igh6n8haf8yi8ikrz6ih4agvsnx415kdx4cgjw4xilvgpgqm"; depends=[clinfun data_table plyr shiny VGAM]; };
   EvCombR = derive2 { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
   EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
   EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; };
-  Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.10"; sha256="0v8jjbmr9qqbn2k6jb7jcqmib89x2g7r8wkipxhb4bck0b0z5c0r"; depends=[zoo]; };
-  EventStudy = derive2 { name="EventStudy"; version="0.31"; sha256="0d3pa2981djg2i3960damd1aahyl8id6irgz2fqs1k69dvqykr8p"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI purrr RColorBrewer readr rstudioapi scales shiny stringr testthat tidyquant]; };
+  Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.11"; sha256="1zir62009fw4w4ixkyc5s9428krlh6bz8ir2vl11206xxf8rbkd4"; depends=[zoo]; };
+  EventStudy = derive2 { name="EventStudy"; version="0.32"; sha256="1g142289my77zhqsgjb7q38izs1ipkisxw656n2xna6c64zv349a"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI purrr RColorBrewer readr rstudioapi scales shiny stringr testthat tidyquant]; };
   EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
   Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; };
   ExPosition = derive2 { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
@@ -985,7 +1005,7 @@ in with self; {
   FDboost = derive2 { name="FDboost"; version="0.3-0"; sha256="06cwd8534k3h7mk6w9z7fyq0gvb74w12gxh3njmy4m7hw8yzicc8"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; };
   FENmlm = derive2 { name="FENmlm"; version="1.0"; sha256="0mq1qa72hsz3pyqjnbyzcc7shr08cq3hng1fz53mn9mvp11vb135"; depends=[MASS Matrix numDeriv]; };
   FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; };
-  FFTrees = derive2 { name="FFTrees"; version="1.3.2"; sha256="17wvbfay5lbqfkvhyxjv6sazcrp0zmmvivgfk9hym3rb8d0jviny"; depends=[circlize e1071 glmnet igraph MASS mlbench progress randomForest rpart stringr yarrr]; };
+  FFTrees = derive2 { name="FFTrees"; version="1.3.3"; sha256="0vvrihgq2m08jpm4sbq9fpbwppvmcc2v9za7kl2l41n8as1n14gc"; depends=[circlize e1071 igraph progress randomForest rpart stringr yarrr]; };
   FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; };
   FGN = derive2 { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; };
   FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
@@ -1009,7 +1029,7 @@ in with self; {
   FMsmsnReg = derive2 { name="FMsmsnReg"; version="1.0"; sha256="0d58n7lz8d6xgzvyznmhw1byshyiiwk8dc462qr18cl51p0lqnkv"; depends=[mvtnorm]; };
   FNN = derive2 { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; };
   FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; };
-  FPDclustering = derive2 { name="FPDclustering"; version="1.1"; sha256="1zbf8y3b3scigqp7yiw0hq36lq6fzzvns331jxg5v62f4aj0g496"; depends=[ThreeWay]; };
+  FPDclustering = derive2 { name="FPDclustering"; version="1.2"; sha256="1qj1dddzcy2jx4903kmzzhcwfi13c2x9kva2n4rzqh5n560nvg57"; depends=[ThreeWay]; };
   FRACTION = derive2 { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; };
   FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; };
   FRB = derive2 { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; };
@@ -1018,23 +1038,23 @@ in with self; {
   FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
   FRESA_CAD = derive2 { name="FRESA.CAD"; version="2.2.1"; sha256="065iywjay4a06w97lg2z98qq0j60flq4srchyg7c2a3pjrwppqc2"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
   FREddyPro = derive2 { name="FREddyPro"; version="1.0"; sha256="0h2rdydcx9pwjl1zxghzb5vqynrwdkscyq6c9adjgz4dngfwyzsw"; depends=[dismo ggplot2 lubridate raster RColorBrewer sp]; };
-  FRK = derive2 { name="FRK"; version="0.1.4"; sha256="0is7ljz7ryr5dr4jq8r6ys6lb102mk7aaibw3z928q57bim0pxg9"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; };
-  FSA = derive2 { name="FSA"; version="0.8.13"; sha256="0i48x9gz59h9a0dknfb48xpps3slzplrc8r4qgk2ckvjhpi64q7f"; depends=[car dplyr epitools gplots plotrix plyr sciplot]; };
+  FRK = derive2 { name="FRK"; version="0.1.5"; sha256="01r7w2m9f6lr63hiv8sfg49jccyf5xk0fw7xipvwmq0daxl250y1"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; };
+  FSA = derive2 { name="FSA"; version="0.8.14"; sha256="085xzghpk0j4d5678ka1bqxlgkp0hz62vi9gld4qap89fy954hrm"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; };
   FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; };
   FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; };
   FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; };
   FSelector = derive2 { name="FSelector"; version="0.21"; sha256="0qk54b4svihwcmfdp5k8pcvy60568zlg4z2qqiawr7h4inzmvrlk"; depends=[digest entropy randomForest RWeka]; };
-  FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.1.3"; sha256="1imhl5jz4avqfk2xavkyjnizsg885h13ay6hdlbh1yd1m8d2pxl6"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
   FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; };
   FTRLProximal = derive2 { name="FTRLProximal"; version="0.3.0"; sha256="0wnlswvxiw7gvmn9yq1v8jixwspfbvcg3rklqcd0ib38d72ww7w0"; depends=[Matrix]; };
+  FUNLDA = derive2 { name="FUNLDA"; version="1.1"; sha256="1qqwpics63qab43mvpm275rk9iywawr4gap0qa832i6iy3jp1h3c"; depends=[Rcpp RcppArmadillo]; };
   FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; };
   FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; };
   FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
-  FactoClass = derive2 { name="FactoClass"; version="1.1.3"; sha256="1vwjxzz8cdvshslx51vnvgybvmki2x3zfax2q6czxl8kacijdh9n"; depends=[ade4 xtable]; };
+  FactoClass = derive2 { name="FactoClass"; version="1.1.4"; sha256="1svql9llnwwdpb2c9g3fx65wgmkvv0ksdrk1vrhw9pvwyk3yzbrn"; depends=[ade4 KernSmooth scatterplot3d xtable]; };
   FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.0"; sha256="10yim7xvzizr383hygs4s2f59ipbl4sj2i85g55zw7j5crangql3"; depends=[FactoMineR rmarkdown rrcov]; };
   FactoMineR = derive2 { name="FactoMineR"; version="1.36"; sha256="1pin3frnls7bbng3fvl92248mf9nnv6d8wwkdzgj66m4rbxc7611"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
-  FactoRizationMachines = derive2 { name="FactoRizationMachines"; version="0.11"; sha256="0k9c7byyn14mqrsxa03d4pf4dlnm4zxryk3n15rr9w9mbmrhidcy"; depends=[Matrix Rcpp]; };
+  FactoRizationMachines = derive2 { name="FactoRizationMachines"; version="0.21"; sha256="0kd9q4nh01hh9ky9f2gx880cbhsipk5cl0173z8kn5vqag9ms4wj"; depends=[Matrix Rcpp]; };
   FactorsR = derive2 { name="FactorsR"; version="1.1"; sha256="06193gw4q9yvhmgzlv8w2xi9f418cjkn9jx72l41426wapjhygdy"; depends=[]; };
   Factoshiny = derive2 { name="Factoshiny"; version="1.0.5"; sha256="1jqk80raqf3kxympkqfayzwwc61yipzh4cbklrb9kmay5ryg4gj9"; depends=[colourpicker FactoMineR shiny]; };
   Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; };
@@ -1049,10 +1069,11 @@ in with self; {
   FastPCS = derive2 { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; };
   FastRCS = derive2 { name="FastRCS"; version="0.0.7"; sha256="1pszpmb5qki4cchd1pc0j6s4sfflaikbfrbisf6c2j9p8ssxxfgk"; depends=[matrixStats Rcpp RcppEigen]; };
   FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; };
+  FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; };
   FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; };
   FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
   FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.1"; sha256="1y46bk2yddq0n8p1kj6fwi9q23lsblsrlgf7b630vcbvv8mpz5x2"; depends=[BH digest magrittr Matrix Rcpp]; };
-  FedData = derive2 { name="FedData"; version="2.4.5"; sha256="1ad5dffrp2rwl8sdbik40g8p0c1drb5fxkcysh3qzsd6wi1zc2ff"; depends=[curl data_table devtools doParallel dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp]; };
+  FedData = derive2 { name="FedData"; version="2.4.6"; sha256="0b2fk2x634m91j5rvn7mf7wfa8dz8kafgridq1slhb9mkdk5w21y"; depends=[curl data_table devtools dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp]; };
   FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; };
   Fgmutils = derive2 { name="Fgmutils"; version="0.9.4"; sha256="0k5pafgrcb7smklgzgw2mf6npj55nm5fsr6k0xp6ji380rvdxc0y"; depends=[data_table devEMF ggplot2 gridExtra plyr png ReporteRs sqldf stringr]; };
   FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
@@ -1060,11 +1081,10 @@ in with self; {
   FinAsym = derive2 { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; };
   FinCal = derive2 { name="FinCal"; version="0.6.3"; sha256="1clvnvhpf2krrf8flhmdxmys6ym3xw3v4v07kk1if4xb0dfk9wgy"; depends=[ggplot2 RCurl reshape2]; };
   FinCovRegularization = derive2 { name="FinCovRegularization"; version="1.1.0"; sha256="0h3i46s0rpqvgnqgjwqrlrfa3vv5jn2hm6bqc0ijwmrr9f80g4ir"; depends=[quadprog]; };
-  FinTS = derive2 { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; };
   FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod TTR xts zoo]; };
   FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; };
   FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; };
-  FindIt = derive2 { name="FindIt"; version="1.0"; sha256="00psd20j84vdjw2jyilkfb2z9kfs5c139rky8d8rpl8sz97szpf2"; depends=[arm ggplot2 glmnet lars Matrix quadprog]; };
+  FindIt = derive2 { name="FindIt"; version="1.1"; sha256="16ply5a3zh9qzff6iv9kgbvz7y33j5fmpkf6ydfjfb4bw57v1xix"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; };
   FindMinIC = derive2 { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; };
   FinePop = derive2 { name="FinePop"; version="1.4.0"; sha256="0bq6p95mpwbx38gly61n58jrqz6rymwdq6dwxghpx98f6isa83xh"; depends=[]; };
   FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; };
@@ -1075,7 +1095,7 @@ in with self; {
   FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; };
   FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; };
   FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; };
-  FlowScreen = derive2 { name="FlowScreen"; version="1.2.2"; sha256="1djh9yx718js1s21c0brxv3bw8nbga3dyhvcbkfvx9vcf9mk2pki"; depends=[changepoint evir zyp]; };
+  FlowScreen = derive2 { name="FlowScreen"; version="1.2.3"; sha256="1yzar8r8jdd385xic5wmqpkwm5f0pysckv70ss9sficwqrgrfcsp"; depends=[changepoint evir zyp]; };
   Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
   ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
   ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; };
@@ -1084,12 +1104,12 @@ in with self; {
   ForecastFramework = derive2 { name="ForecastFramework"; version="0.9.0"; sha256="131h9f148wn89znzsnym43amlvf4s7jzg4f2p7ld9ns7727sf56q"; depends=[abind dplyr lubridate magrittr R6 reshape2]; };
   ForestTools = derive2 { name="ForestTools"; version="0.1.4"; sha256="0czvslmhz5syvd8h5zz6wl3nfp2dpyx3wf9x1d1hkgfgxkkl6f1y"; depends=[APfun imager raster rgdal rgeos sp TileManager]; };
   FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
-  Formula = derive2 { name="Formula"; version="1.2-1"; sha256="02in5325zzrqbhlygx6s0dinj6ymw845q70y56frqacv25ayzcax"; depends=[]; };
+  Formula = derive2 { name="Formula"; version="1.2-2"; sha256="0ad49bzip1zqmpj1d8jajwl4bd81fm3k6dq8p26x6mvlzc04dvwd"; depends=[]; };
   ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
   FourScores = derive2 { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
   FrF2 = derive2 { name="FrF2"; version="1.7-2"; sha256="1qjgx7zbnabbs4zq7hn3j1i1xyy4yjwnz7pn25kz9s3szqr1fk66"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
   FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
-  FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.0"; sha256="12v72zn1san2kv82b9y1vd0gzd1fa800yscc63zlq8lfflz47xvz"; depends=[]; };
+  FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1"; sha256="1ni10fdxinmclng0ck8287i6shis886y318a7b42pcfp00aiz8hh"; depends=[]; };
   Fragman = derive2 { name="Fragman"; version="1.0.7"; sha256="0dh1gk2arj7r6zd5dhkmxpr7a1hd3pl8x5klmlsg4n6rwsx2p4v8"; depends=[]; };
   Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; };
   FreeSortR = derive2 { name="FreeSortR"; version="1.2"; sha256="01h29p9qhlkd2qmmmw23wh9lrsggvp1h3r2laqi2lln7d7srcwbj"; depends=[ellipse smacof vegan]; };
@@ -1102,12 +1122,12 @@ in with self; {
   FusedPCA = derive2 { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
   Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.0"; sha256="1n2m6p03bfip2fxfg8v4k43zgv7lcwwgv4myw2rj46djfwl2l9i7"; depends=[FuzzyNumbers MASS]; };
   FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.0"; sha256="02c08rzmmdd2l84jlzb0vck9m08afm7j599n0g09hffflcrb3fz7"; depends=[MASS]; };
-  FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-4"; sha256="1iqvbj1mv7ja2dhlcvg5spjyj3fxvk1yz9y264kks0bf11kl0ckn"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; };
+  FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-5"; sha256="1achmsc107b26d266q0vmip8vi3qaa5z0p183z2fjdm7zh9ch6ag"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; };
   FuzzyMCDM = derive2 { name="FuzzyMCDM"; version="1.1"; sha256="0ss0s65mm6j0nax4mb9g668d9n9cgl0l016mc3h9hbjxfpqrbkks"; depends=[RankAggreg]; };
   FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; };
-  FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="1.0"; sha256="1mqpdii0lf1p19kmzw93bzqbfjx2jzbphd0aacyzzai72vzx6aj1"; depends=[FuzzyNumbers]; };
+  FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="3.1"; sha256="1wqp2ffqy5pl4m06ibj42x9hbcixsvdpx3703kn6jhqyif4i1r43"; depends=[FuzzyNumbers]; };
   FuzzyR = derive2 { name="FuzzyR"; version="2.1"; sha256="08mhwzyksw0snxxcwn2kg62ya8smfvrls30znqhmnbkn5ijz0642"; depends=[plyr shiny]; };
-  FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.2"; sha256="01rdvsvdfyg8cz6rl1kzwzg9ns5zmikmb7ljlavvzcbg4i1vliqq"; depends=[DEoptim FuzzyNumbers MultinomialCI]; };
+  FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.3"; sha256="0ry2cr5ds7kd7vk6ihdg68gqs2rv6qfmzlszr33a9ia5gsbi8b7b"; depends=[DEoptim FuzzyNumbers MultinomialCI]; };
   FuzzyStatTra = derive2 { name="FuzzyStatTra"; version="1.0"; sha256="1ijrlnlmq9d5ahgrpzba6kzkaq1zq59zqdgcizybsf9alsswcm00"; depends=[]; };
   FuzzyToolkitUoN = derive2 { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; };
   G1DBN = derive2 { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[igraph MASS]; };
@@ -1124,8 +1144,9 @@ in with self; {
   GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; };
   GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; };
   GAR = derive2 { name="GAR"; version="1.1"; sha256="12xgk87bndinx7ibaasn51a9fad3ymvpjmixa7l18pfy99l3pcll"; depends=[httr jsonlite]; };
-  GAS = derive2 { name="GAS"; version="0.2.1"; sha256="138i62cjclhqnnwzqk4ry95yrpwabppw3lvx8asqkgxyqrc3wpx6"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; };
+  GAS = derive2 { name="GAS"; version="0.2.4"; sha256="1brk16fqciprggwx96xfzbz8jswg8k9d0qvfaj9hffnl0gq0jpxa"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; };
   GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; };
+  GAparsimony = derive2 { name="GAparsimony"; version="0.9-1"; sha256="1j8r56pri7h0xr0fiihkwgccjb33n89lz8ah5p42bak7ay9fglkm"; depends=[foreach iterators]; };
   GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
   GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
   GCD = derive2 { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; };
@@ -1145,19 +1166,21 @@ in with self; {
   GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; };
   GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; };
   GEVcdn = derive2 { name="GEVcdn"; version="1.1.5"; sha256="0nqym5jqgshx6ad4k4nwain6lnhx5y7s3b10f2xmcn93287p3rji"; depends=[VGAM]; };
-  GEint = derive2 { name="GEint"; version="0.1.2"; sha256="12jkrflv9p05bnsx5xqyr55c18q1vrs1wlcni38zyppd334yyiyh"; depends=[geepack mvtnorm nleqslv pracma rje speedglm]; };
+  GEint = derive2 { name="GEint"; version="0.1.4"; sha256="0xwp8hqds4lf6nb8hcbvsj2000w7f90bi62b1v3iry0y6cbpwbjg"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; };
   GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
-  GFA = derive2 { name="GFA"; version="1.0.1"; sha256="073mwbrvvacrvqw4mwm13wd4rh3wlvwxkakal0k9xwxi5q9kl2rs"; depends=[]; };
-  GFD = derive2 { name="GFD"; version="0.2.2"; sha256="1llz22cqp26336ybfkmn98v80zl09hpjx34f9c5bf39lc6w1645h"; depends=[magic MASS Matrix plotrix plyr]; };
+  GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; };
+  GFD = derive2 { name="GFD"; version="0.2.4"; sha256="10ijin08saamr0i2hcp0gjh372q2w30s0dia1bi9zxlwna1h9hxp"; depends=[magic MASS Matrix plotrix plyr]; };
   GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; };
-  GGIR = derive2 { name="GGIR"; version="1.5-9"; sha256="1dgmpi48qdsmxclg45n8hb66rgpsb58c9asg07gq3kva526hz3zk"; depends=[data_table Rcpp]; };
+  GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; };
+  GGIR = derive2 { name="GGIR"; version="1.5-12"; sha256="1n8xckhv3x9clphp696clqzcvc5z4v9npw1y69dfk6m1f29gcik4"; depends=[data_table Rcpp]; };
   GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; };
   GGMselect = derive2 { name="GGMselect"; version="0.1-12"; sha256="1vjzmnnvnckr8s0badqm3l15arsa31fwg4wq6c2wx3g0hi1nzxxs"; depends=[gtools lars mvtnorm]; };
-  GGally = derive2 { name="GGally"; version="1.3.1"; sha256="18vpmx7p1v2yq3h53xgr6f1n5crlsla8na2d3x46l40mhal4s0kr"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape]; };
+  GGally = derive2 { name="GGally"; version="1.3.2"; sha256="02px7j28wzbhcgcwm2m0pxb6g7s5zvphl64ix55pkvag4m2ky57l"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape]; };
   GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
   GHap = derive2 { name="GHap"; version="1.2.2"; sha256="1qwv4llcixklr9d6lq4ljzbs8al80xnvqkcajnh8dbf3axmlmr5b"; depends=[bigmemory lme4 Matrix]; };
   GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; };
   GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
+  GJRM = derive2 { name="GJRM"; version="0.1-1"; sha256="04vk9442zdjy00pzjkzgvxnszbvk021klayjzlimi5pbrm7mlgc2"; depends=[copula gamlss_dist ggplot2 magic matrixStats mgcv mnormt psych Rmpfr scam survey survival trust VGAM VineCopula]; };
   GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; };
   GLDEX = derive2 { name="GLDEX"; version="2.0.0.5"; sha256="0mr8qhccp8dndp43v8ym22f4djrjr8qcxbv61lwabk2462llwln6"; depends=[cluster]; };
   GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; };
@@ -1170,6 +1193,7 @@ in with self; {
   GMD = derive2 { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
   GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; };
   GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
+  GMSE = derive2 { name="GMSE"; version="0.2.2.7"; sha256="0n5dl5spv8265n43vwy4j8v13j7gg4sg49j2nkpc7q9f9bqczq4b"; depends=[]; };
   GNE = derive2 { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; };
   GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
   GORCure = derive2 { name="GORCure"; version="2.0"; sha256="1hazin0q74hf16azxa5h08kfj7g1079q77n2fn4fahpfxb8hmvwm"; depends=[ICsurv MASS pracma survival]; };
@@ -1189,6 +1213,8 @@ in with self; {
   GPvam = derive2 { name="GPvam"; version="3.0-4"; sha256="1vqvm9647jnw91vpf4dhjjp9rc05n5k6qgzilfpmcg4a7zzi917k"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   GRANBase = derive2 { name="GRANBase"; version="1.2.1"; sha256="1fxbgl7z61qdfg0lcjylc00wr819kg9kycc42gsjl1gxxy94b433"; depends=[hwriter switchr]; };
   GRAPE = derive2 { name="GRAPE"; version="0.1.0"; sha256="0kcyz8x6yzq83hcwdlx7yw5jpww819f9d1hax19vn31ccq71xkyw"; depends=[]; };
+  GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; };
+  GROAN = derive2 { name="GROAN"; version="1.0.0"; sha256="0bhr8hqzn639zl52raapxipc3cwhwwsj5fvj0dk39mpaychc2dg1"; depends=[plyr rmarkdown rrBLUP]; };
   GRS_test = derive2 { name="GRS.test"; version="1.0"; sha256="1igyb3rma1v2arx1k16fanvzmlywx0n9lf5jz69vnf6z2qmqvrg5"; depends=[]; };
   GRTo = derive2 { name="GRTo"; version="1.3"; sha256="1xkcx2agvrpfnmplgaqx70vz303v8rhwnxdyr4hmdlf4h92lbv8i"; depends=[bootstrap]; };
   GRaF = derive2 { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
@@ -1199,8 +1225,8 @@ in with self; {
   GSED = derive2 { name="GSED"; version="1.5"; sha256="0r1fgwk1v11bwq83a64cgmxh5snw3mnaq4mlgi0h4n5f1yjgg5wj"; depends=[memoise rootSolve survival]; };
   GSIF = derive2 { name="GSIF"; version="0.5-4"; sha256="1vh3dffi5hakk32rwaabw9k34wigd0n5bhzcyqhadl6fxjsaz6b6"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; };
   GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
-  GSMX = derive2 { name="GSMX"; version="0.1"; sha256="1bw249b3a58d9q8cj91w9syyghf6sy8xqnx2jawp83qp8lfbix5x"; depends=[MASS psych]; };
-  GSODR = derive2 { name="GSODR"; version="1.0.3"; sha256="1jhh7vwi1kgjcprvjm7iawz8k53fafymm0bdli513pn73xk9q9ax"; depends=[curl data_table dplyr fields magrittr purrr R_utils readr rgdal sp]; };
+  GSMX = derive2 { name="GSMX"; version="1.1"; sha256="06l6abhf4b6h8wkmwdylw4f4inflr8qxfd65pnnsjmk6lv6zpdgm"; depends=[MASS]; };
+  GSODR = derive2 { name="GSODR"; version="1.0.5"; sha256="09q7d26y12d1mkxjf2zcbzjm3ddkj1spls53g01m842y1kwxnn2h"; depends=[curl data_table dplyr fields magrittr purrr R_utils readr rgdal sp]; };
   GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; };
   GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; };
   GUIDE = derive2 { name="GUIDE"; version="1.2.3.1"; sha256="02chn2mzh6smmiv8rp00cq5rff18bqszazbk8svmvvlgn0a25pj4"; depends=[rpanel tkrplot]; };
@@ -1213,17 +1239,18 @@ in with self; {
   GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
   GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
   GWLelast = derive2 { name="GWLelast"; version="1.1"; sha256="0c3mcvmvxvgibja6rb8j2mhmmjny825wgvi1dw0pz8pq1kg1q0ay"; depends=[doParallel foreach geosphere glmnet sp spgwr]; };
-  GWRM = derive2 { name="GWRM"; version="2.1.0.2"; sha256="1i8f2a43vn7zjsfb108ckjhi23m93mbm3lc7w7w6grp4ny98xr6g"; depends=[doParallel foreach]; };
+  GWRM = derive2 { name="GWRM"; version="2.1.0.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; };
   GWmodel = derive2 { name="GWmodel"; version="2.0-4"; sha256="1q4z715yi5rasmcxv1acy14sf18knk11cznqi481kxc4mhxl2ay2"; depends=[maptools Rcpp RcppArmadillo robustbase sp]; };
   GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; };
   GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; };
-  GameTheory = derive2 { name="GameTheory"; version="2.5"; sha256="05isd08z7k52nvic52gnlmnqvvrxxipcn2njfiz3kp105wvdw1rp"; depends=[combinat gtools ineq kappalab lpSolveAPI]; };
+  GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; };
   GameTheoryAllocation = derive2 { name="GameTheoryAllocation"; version="1.0"; sha256="0733vmyr0d9scjd5ixpnggr548snd7nj70knf5hbzc59nmbc5y11"; depends=[e1071 lpSolveAPI]; };
   Gammareg = derive2 { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; };
-  GauPro = derive2 { name="GauPro"; version="0.1.0"; sha256="01f8f3adki3g0aiw2km60w8sf78yj68aaj86bj8nizslgkj3z8ln"; depends=[lbfgs R6 Rcpp RcppArmadillo]; };
-  GeNetIt = derive2 { name="GeNetIt"; version="0.1-0"; sha256="102hq4w94gd7rz80cz1bll9kfblyacsk4h54yjflvqkmrs9x0d2b"; depends=[nlme raster rgeos sp spatialEco spdep]; };
+  GauPro = derive2 { name="GauPro"; version="0.2.0"; sha256="0fkkn03bs90sjynv5h9bby3n2v49vb5x25j9nxhi0gm0wxsqydb7"; depends=[lbfgs R6 Rcpp RcppArmadillo]; };
+  GeNetIt = derive2 { name="GeNetIt"; version="0.1-1"; sha256="1xjz22m4yn642m0bqa33w4m2rygpxjwg43c54lw168jck9zzgv1f"; depends=[nlme raster rgeos sp spatialEco spdep]; };
   GenABEL = derive2 { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[GenABEL_data MASS]; };
   GenABEL_data = derive2 { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; };
+  GenAlgo = derive2 { name="GenAlgo"; version="2.1.3"; sha256="00lr13kvkmw7zgg6b67yba0qym24vqb09xm94rwh2wd5mbh2fh2v"; depends=[ClassDiscovery MASS oompaBase]; };
   GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
   GenCAT = derive2 { name="GenCAT"; version="1.0.3"; sha256="1rzhp4aypdryr7hrqazax3lzfkxqhls5cf8zsjjip8jb701x46hf"; depends=[doParallel dplyr foreach ggplot2]; };
   GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
@@ -1239,14 +1266,15 @@ in with self; {
   GeneReg = derive2 { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
   GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; };
   GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; };
-  GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="0.9.4"; sha256="12ixcg9msfxa6pmv0dx5zczy5vgqpk6hsqdhsf22nycmavnzgzgd"; depends=[Rcpp RcppArmadillo]; };
+  GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="0.9.5"; sha256="0jz89z5qs0r46bby5d1ki49dj9n71x6i42llzpjqv3832kywqp86"; depends=[ggplot2 Rcpp RcppArmadillo shiny shinyjs]; };
   GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; };
   GenomicMating = derive2 { name="GenomicMating"; version="1.2"; sha256="0kli32vsjighgl6hvrn2g3hwxdfysxh0ci3kiysddn2h4gqc44lz"; depends=[Rcpp RcppArmadillo]; };
-  GenomicTools = derive2 { name="GenomicTools"; version="0.2.4"; sha256="1r1d36ik0xrpznz19jrw4m7xf3xsqhx9vwsnal8k030k6vjip82d"; depends=[circlize data_table gMWT Rcpp RcppArmadillo snpStats stringr]; };
+  GenomicTools = derive2 { name="GenomicTools"; version="0.2.6"; sha256="19illcfcm34vr90kh4cbdwf7k8hy700dlzylsaicv3h4xi7iydgs"; depends=[circlize data_table gMWT Rcpp RcppArmadillo snpStats stringr]; };
   GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; };
   GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; };
   GeoGenetix = derive2 { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; };
   GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; };
+  GeoMongo = derive2 { name="GeoMongo"; version="1.0.0"; sha256="1kpc1nh7gnbfms6wsvrj278bqb3grgxsrpqzq9jyk3l36ybahn5r"; depends=[data_table geojsonR R6 reticulate]; };
   GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; };
   GeoXp = derive2 { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[KernSmooth quantreg rgeos rgl robustbase spdep splancs]; };
   GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; };
@@ -1268,7 +1296,7 @@ in with self; {
   Gmedian = derive2 { name="Gmedian"; version="1.2.3"; sha256="0b2ijr9zlsp1287da3h9qm5cm17xk8zm8cdcj6d4kz0ivgg444py"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; };
   Gmisc = derive2 { name="Gmisc"; version="1.4.1"; sha256="1xdgmvzixc03qz34l57gy85w711iimmfqn6w20rr5b67m5m63drz"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; };
   GoFKernel = derive2 { name="GoFKernel"; version="2.1-0"; sha256="17jd1dqwpki4mmzk695g25vvfwvkp4k7jhvw06dmdmn5j09hw373"; depends=[KernSmooth]; };
-  GofKmt = derive2 { name="GofKmt"; version="1.0"; sha256="1b91js02kam515p7s0c6v63rl31wk16bvkr4f4z25wa5nb8g8p81"; depends=[Rsolnp]; };
+  GofKmt = derive2 { name="GofKmt"; version="2.0"; sha256="0018ljzlj7nkf12g0sqa8iyq3j2bnj9la3fwblx9lbdn8nxgllhn"; depends=[Rsolnp]; };
   GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; };
   Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; };
   GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
@@ -1276,14 +1304,14 @@ in with self; {
   GraphKit = derive2 { name="GraphKit"; version="0.5"; sha256="1ip0rkrwxpjcd9mhz2z8n7lwdrjj1idymsafm8aac1hfbxr6c0xz"; depends=[Rcpp RcppArmadillo]; };
   GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; };
   GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
+  GreedyEPL = derive2 { name="GreedyEPL"; version="1.0"; sha256="19b8fwxsjd6shwjxhpawa8pmlj6yn0j4577g6b93xbcs76wgrvd1"; depends=[Rcpp RcppArmadillo]; };
   GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.0"; sha256="00a2lcqrj17ckw4npkvm3sxydfn2lyvs7pzpccy3xnzrr006ibsx"; depends=[rJava]; };
   Greg = derive2 { name="Greg"; version="1.2"; sha256="19bzv2nknahzbdnl7n0pcnavsdlwgkprc0yk3ksqllfawnvi39f9"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
-  Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.1.6"; sha256="1dgyif5hgjk4jir01pbsmsffn2dhmcci2smvk6vryq0iii3ixwaf"; depends=[raster rgeos sp]; };
+  Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.2.1"; sha256="0db5kv0rbsg077h2badw28x9363ymqkr52sw5wlg9x1bk9cczhi7"; depends=[inlmisc raster rgeos sp]; };
   GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
   GroupSeq = derive2 { name="GroupSeq"; version="1.3.4"; sha256="0m127793gh00spj2ghapmysvf3dbxhpf2jlms3xxrflh7ajrmy5m"; depends=[]; };
   GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; };
-  GrowingSOM = derive2 { name="GrowingSOM"; version="0.1.1"; sha256="0pzhf27kk9nc73w6wp0qd50i7hk7904y90l2ppdgy738z9gcbz4i"; depends=[plotrix]; };
-  GrpString = derive2 { name="GrpString"; version="0.3.1"; sha256="0j2xyil4z3dcl306ralf277ixypk0i0dfysbbl5j22ykgg21lbfd"; depends=[plyr]; };
+  GrpString = derive2 { name="GrpString"; version="0.3.2"; sha256="14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1"; depends=[cluster plyr Rcpp]; };
   GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; };
   GuardianR = derive2 { name="GuardianR"; version="0.8"; sha256="07bg7wz7d2rgjkw5ldzi5p7nd4ch39m6ql5w4sqnvds4r08jspj9"; depends=[RCurl RJSONIO]; };
   Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; };
@@ -1292,6 +1320,7 @@ in with self; {
   HAP_ROR = derive2 { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; };
   HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
   HARtools = derive2 { name="HARtools"; version="0.0.5"; sha256="10a92jsk1ccgxi5g6byrs4fbj5l2kih7vhib0jg6spdqi6rhqla1"; depends=[assertthat htmltools htmlwidgets jsonlite magrittr]; };
+  HBP = derive2 { name="HBP"; version="0.1.2"; sha256="0khw15xj3k40bsdbbs1m5ad1ykji3fx0549697c1svhkm7zrrny4"; depends=[BiocInstaller coin flexclust ggplot2 gplots HiTC igraph lattice multcomp OmicCircos pgirmess reshape2 rtracklayer]; };
   HBSTM = derive2 { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; };
   HBglm = derive2 { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; };
   HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; };
@@ -1305,9 +1334,10 @@ in with self; {
   HDtest = derive2 { name="HDtest"; version="0.1"; sha256="0vlwpx9l6r0izfcf9fgna72w39w64b95s3q527mapjb6a3676avg"; depends=[checkmate doParallel expm foreach MASS mvtnorm]; };
   HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
   HEAT = derive2 { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
+  HEMDAG = derive2 { name="HEMDAG"; version="1.0.0"; sha256="0hgxhd8c87ngyh87vdzlmmbfllxjrmqr6ndh561hkxzmbiw1q655"; depends=[graph PerfMeas precrec preprocessCore RBGL]; };
   HGNChelper = derive2 { name="HGNChelper"; version="0.3.5"; sha256="0b2q99z22gafkicfkaxpzl79j2axrz60r9ch1smjivpk8sa22hyq"; depends=[]; };
   HH = derive2 { name="HH"; version="3.1-34"; sha256="1srr195ha8n4va30impm12p2kamkl36whl8g10pl80hwgg20pbqk"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
-  HHG = derive2 { name="HHG"; version="2.0"; sha256="1y6w62ivbhqpl6zgwpxq9r2w5nlc70zj8f7rnnhck162p6hyp778"; depends=[]; };
+  HHG = derive2 { name="HHG"; version="2.1"; sha256="0930pgq0xzixj0rl6rkd1cd007zpa9krfdyaav8cbx8sgg5bfknp"; depends=[]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
   HIBPwned = derive2 { name="HIBPwned"; version="0.1.6"; sha256="0ym62n1rmi8pjj37cxbrdmih7530nhmy77gxb8yylppjf3rikci4"; depends=[httr jsonlite ratelimitr urltools]; };
   HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
@@ -1320,22 +1350,22 @@ in with self; {
   HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; };
   HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; };
   HMMpa = derive2 { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; };
-  HMP = derive2 { name="HMP"; version="1.4.3"; sha256="15fsyk61y141wdkc5cjrw05gc5kzl2a8cmk2n54c8gmhhjbjy692"; depends=[dirmult doParallel foreach gplots MASS]; };
-  HMPTrees = derive2 { name="HMPTrees"; version="1.3"; sha256="1q0zfwhzfr45mykql8hsp6pzkfhcplr7gkq7dbd8xa97wxsf63yd"; depends=[ape dirmult doParallel foreach HMP]; };
+  HMP = derive2 { name="HMP"; version="1.5"; sha256="1jsvk0ban726qrf31gkq5c3gnyxvqv9jpcpk68md9xw3a2r3lxy6"; depends=[dirmult doParallel foreach ggplot2 gplots MASS rpart rpart_plot vegan]; };
+  HMPTrees = derive2 { name="HMPTrees"; version="1.4"; sha256="1jha64iyb0816rdg2i3z7i31z02r72k6acmvw0ibw3sli8zcvphb"; depends=[ape dirmult doParallel foreach HMP]; };
   HMR = derive2 { name="HMR"; version="0.4.2"; sha256="0rbpghih99avaq803f6hb66pfbqgzh1i2yaqs0mhbj61yyjzyb7b"; depends=[]; };
   HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; };
   HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
-  HRM = derive2 { name="HRM"; version="0.5.1"; sha256="0ng9p9x6ka4cdi53vbzy298y9ahdjr037y5wyzlmmhm2cy182wby"; depends=[ggplot2 MASS matrixcalc plyr reshape2]; };
+  HRM = derive2 { name="HRM"; version="0.7.1"; sha256="1asd63x61r1ll0jkm677jghd92yp0n04qg0ayslygr9hh02gva9k"; depends=[cairoDevice ggplot2 MASS matrixcalc plyr reshape2 RGtk2Extras xtable]; };
   HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; };
   HSAR = derive2 { name="HSAR"; version="0.4.0"; sha256="1k40hh546hrdm2yh64l51sky17mnmkzckb7l3bnkpw495rsk73g2"; depends=[Rcpp RcppArmadillo spdep]; };
-  HSAUR = derive2 { name="HSAUR"; version="1.3-8"; sha256="0sypgdpk5iy5gw1l047w0q8lb4b8j77ws7vl2kjpiz8cyxwfdx66"; depends=[]; };
-  HSAUR2 = derive2 { name="HSAUR2"; version="1.1-16"; sha256="0g107rrnan9cbrd628s71wxbvbd4rmk9s1kr3cl1xkbff1cc9zmz"; depends=[]; };
-  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-7"; sha256="1jf756qp7ncmnpzdndhsdn994l85y6gxfgk9pkcbq4dcpfwn2hsl"; depends=[]; };
+  HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; };
+  HSAUR2 = derive2 { name="HSAUR2"; version="1.1-17"; sha256="0jc554lz5lj7180vd4rbrjkywar4bh38c7i9kyxhd5clg4afxpw8"; depends=[]; };
+  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-8"; sha256="0s3m771l83psfwk6dqw2zf0vyvk5v2h730b5nwaky9xvgvp0mrms"; depends=[]; };
   HSROC = derive2 { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[coda lattice MASS MCMCpack]; };
   HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
   HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
   HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; };
-  HTSSIP = derive2 { name="HTSSIP"; version="1.1.1"; sha256="1jfclid88kygqc8ygcpm6hih3w43h8pp2wqh1zzc7xq3wnin46a7"; depends=[coenocliner DESeq2 dplyr ggplot2 lazyeval magrittr phyloseq plyr stringr tidyr]; };
+  HTSSIP = derive2 { name="HTSSIP"; version="1.2.0"; sha256="1w9xky4rdjg646x6aaif29xrrz901yzkh3x5lpv9xbbdam5v5na9"; depends=[ape coenocliner DESeq2 dplyr ggplot2 lazyeval magrittr phyloseq plyr stringr tidyr]; };
   HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
   HURDAT = derive2 { name="HURDAT"; version="0.1.0"; sha256="074c5spfsg4f3hg9f316wz72m2j3kvycl8hb4j7i7z62wswgi420"; depends=[dplyr lubridate magrittr purrr readr stringr tibble tidyr]; };
   HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
@@ -1362,21 +1392,20 @@ in with self; {
   HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; };
   HiDimMaxStable = derive2 { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula maxLik mnormpow mnormt partitions VGAM]; };
   HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
-  HiPLARM = derive2 { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; };
   HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-8"; sha256="13db9qxcky91nck49w6iz98yx3c5rb70dc993gdmnwhzzrl92lfp"; depends=[]; };
   HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
   HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
   HistDAWass = derive2 { name="HistDAWass"; version="0.1.6"; sha256="0i43zki95m47nm3yy7m7s66nvpmx6vl3df2bxkpyihc2xsqrsf3l"; depends=[class colorspace FactoMineR ggplot2 histogram]; };
-  HistData = derive2 { name="HistData"; version="0.8-1"; sha256="018v8wr95fssc5hzfwzk7x8pax2s41m22a7lvcpy0chy0nvh7dqh"; depends=[]; };
+  HistData = derive2 { name="HistData"; version="0.8-2"; sha256="0qd3a1v3xg39nwqfw63k6210vqkpknq0j3r36sy1910hn0nr83fa"; depends=[]; };
   HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; };
-  HiveR = derive2 { name="HiveR"; version="0.2.55"; sha256="14hdnpiw0ccmzb0lj9gwn92hzwwmlpgrxv7mj8kwp89n7kqccvl7"; depends=[jpeg plyr png RColorBrewer]; };
+  HiveR = derive2 { name="HiveR"; version="0.3.42"; sha256="09h061511pk7iy1k9gb3ifa5q6gd17ix9sn2fshl6gp5sxnysn4f"; depends=[jpeg plyr png RColorBrewer rgl tkrgl]; };
   Hmisc = derive2 { name="Hmisc"; version="4.0-3"; sha256="1a7i7azag6pldgala85d8hh7wnx1shamyiriy4jfc65nxrr2lq8w"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; };
   HoRM = derive2 { name="HoRM"; version="0.1.1"; sha256="0l0gcp1bagm7zbjg7hw2748aqjn9592531d0w5vjap0jgalaig32"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; };
   Holidays = derive2 { name="Holidays"; version="1.0-7"; sha256="1srfbhlrf0pd6gzhp4hbic555lb7camk084rn1qz2g7fjvyijqiq"; depends=[TimeWarp]; };
   Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; };
   HomoPolymer = derive2 { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[deSolve MenuCollection RGtk2]; };
   HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; };
-  Hotelling = derive2 { name="Hotelling"; version="1.0-3"; sha256="14sry3m14czy84mjpvimqbz446320ypb8cf442dmnxazd121fc84"; depends=[corpcor]; };
+  Hotelling = derive2 { name="Hotelling"; version="1.0-4"; sha256="1ncq74ifdn1ha6wbkvygbwi2n0nwaj1lifyqp36sy0hql3ahrac9"; depends=[corpcor]; };
   HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; };
   HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; };
   HydeNet = derive2 { name="HydeNet"; version="0.10.5"; sha256="00h7lj347nag5m5nfyv1hgaml77kqlcxrl704mq6791fcjdchgp1"; depends=[checkmate DiagrammeR dplyr graph gRbase magrittr nnet pixiedust plyr rjags stringr]; };
@@ -1387,6 +1416,7 @@ in with self; {
   IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; };
   IATScore = derive2 { name="IATScore"; version="0.1.0"; sha256="1dlqazsg4vvflrqls1scmq3f6840d3dsplglfj3x0i8fh87q9ja0"; depends=[]; };
   IATscores = derive2 { name="IATscores"; version="0.1-2"; sha256="0grl5m4ccwaxvhg1bziy3vv5jffkvr24z268ws5m4ia20haif0dm"; depends=[dplyr nem qgraph reshape2 stringr]; };
+  IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; };
   IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
   IBDhaploRtools = derive2 { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; };
   IBDsim = derive2 { name="IBDsim"; version="0.9-7"; sha256="1wq0w9d4kwvq1hc5l0m8wrqfhnncapmnrh29x9vvafv50ym7yb3l"; depends=[paramlink]; };
@@ -1400,10 +1430,11 @@ in with self; {
   ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; };
   ICCbin = derive2 { name="ICCbin"; version="1.0"; sha256="1ybhxk5bvgfsz45r1kbb8b82qwjb8a88q11x5c4dbdk85fkxg3w9"; depends=[]; };
   ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
-  ICEbox = derive2 { name="ICEbox"; version="1.1.1"; sha256="1j2sdszvi6h1pjv1n46qymgfxc7rdznspjxpyf2aa3axh0v0l3zk"; depends=[sfsmisc]; };
+  ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; };
   ICEinfer = derive2 { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; };
   ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; };
   ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; };
+  ICRanks = derive2 { name="ICRanks"; version="1.0"; sha256="0354rilqyqinf7gp936541rhlb714fqgf8r083wd0lx14qkciqiq"; depends=[multcomp Rcpp]; };
   ICS = derive2 { name="ICS"; version="1.3-0"; sha256="0r5lf8km77h29lcpi7z0hkmy4vh0p5m7p2xbxsxj6w9hsgyanv72"; depends=[mvtnorm survey]; };
   ICSNP = derive2 { name="ICSNP"; version="1.1-0"; sha256="1g7n8jlilg36hm989s5x18kf8jqn5wy98xi9jmnqkqpds4ff217y"; depends=[ICS mvtnorm]; };
   ICSOutlier = derive2 { name="ICSOutlier"; version="0.2-0"; sha256="1dxbh3qhirr7f2bv68g1xlya5fprm230fdgxhccrzdc0wh0ijh3i"; depends=[ICS moments mvtnorm]; };
@@ -1414,23 +1445,24 @@ in with self; {
   IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
   IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; };
   IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
-  IDmining = derive2 { name="IDmining"; version="1.0.1"; sha256="1cwq79kdfgsaklczbb2zgjsbxys7g6p2knlxsykxf3zw788m3ra1"; depends=[data_table]; };
+  IDmining = derive2 { name="IDmining"; version="1.0.2"; sha256="1ffjwcf3j2v950ksshajwld0h2ld71ij2i76vncl2qmwdlmx0ip3"; depends=[data_table doParallel foreach]; };
   IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; };
   IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.5"; sha256="09k5di7bqlqi2m3jn39ahnf7x96wx1h06bw0ah6pdszwd97yy33i"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; };
   IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; };
   ILS = derive2 { name="ILS"; version="0.1.0"; sha256="18phs1q28mpwvwnzn0hgjxy978f7n4c3p94jxjp0sy3as67hqphp"; depends=[depthTools fda_usc MASS multcomp]; };
   IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
   IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; };
-  IMIFA = derive2 { name="IMIFA"; version="1.3.0"; sha256="0ym9chn3af10i8n6jcyrwkz9ijmwc7dfd9a4mcxmjhqvy5lxgs4m"; depends=[abind e1071 matrixStats mclust mvnfast plotrix Rfast slam viridis]; };
+  IMIFA = derive2 { name="IMIFA"; version="1.3.1"; sha256="1xk2l1zk7arrbb8lxs5s03pjapks98xx8dfpic8qmha3qjlav90c"; depends=[abind e1071 matrixStats mclust mvnfast plotrix Rfast slam viridis]; };
   IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
   IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; };
-  IMPACT = derive2 { name="IMPACT"; version="0.1.0"; sha256="17m2gqwaqam8wv7214x4hp93imgfzilgm42zx5z21ipypiq6rqfy"; depends=[]; };
+  IMPACT = derive2 { name="IMPACT"; version="0.1.1"; sha256="0ai22gvmfj9j00cw742szfqqay63b5lmnszkwwdfdvidls43v0bm"; depends=[]; };
   IMTest = derive2 { name="IMTest"; version="1.0.0"; sha256="0n0swbi051cr7mrjmszqg79hxa38ccyq69ws8c37ixwb0lpxmx48"; depends=[lme4 ltm MASS reshape2]; };
   IMak = derive2 { name="IMak"; version="1.1.2"; sha256="19si4hhvi8kddkp2kr1yw2bcw1qkk0i42saklvwk751gdmyzl9p3"; depends=[]; };
   INLABMA = derive2 { name="INLABMA"; version="0.1-8"; sha256="13r89r14xpihfqddwzkhxg4jgxyl59826x2insrall3mj2yffj90"; depends=[Matrix sp spdep]; };
+  INLAutils = derive2 { name="INLAutils"; version="0.0.4"; sha256="0bfqczwqyfdy343n3pa6pzard9wqzl382p1z42q6vclgx6h0h7rc"; depends=[assertthat ggfortify ggplot2 raster RColorBrewer reshape2 sp]; };
   INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; };
   IPEC = derive2 { name="IPEC"; version="0.0.9"; sha256="02nzh8yq6nshnljxlkqyvd9spnqbcxfdlcr2zl33syhgqjsaz34h"; depends=[MASS numDeriv]; };
-  IPMRF = derive2 { name="IPMRF"; version="1.0"; sha256="13zgz6g48nkrgqfzm24863hp57pah82s5rsglr19cnlcx30ry2a9"; depends=[party randomForest]; };
+  IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; };
   IPMpack = derive2 { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; };
   IPSUR = derive2 { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
   IPWsurvival = derive2 { name="IPWsurvival"; version="0.5"; sha256="0lmw0ifj8cds8lzyjkkv0i0zim23p0a3pawlhmhdm3nfvwawb853"; depends=[survival]; };
@@ -1438,31 +1470,32 @@ in with self; {
   IQCC = derive2 { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[MASS micEcon miscTools qcc]; };
   IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; };
   IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.0.8"; sha256="0imsssija6v91il3dw5ibzm09xyjbabp2xy9jp4ixj6x8295i5xg"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; };
-  IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.5"; sha256="0ybnp87a08rfchxmcirifl3znh389yj89dp0qr88kg78zgcqyr4y"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
+  IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.6"; sha256="1kccc4rbnyczdif7plvl3jfa3nfqfasybbbqmdkfiz0mhgvn1z4r"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
   IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; };
   IRTpp = derive2 { name="IRTpp"; version="0.2.6.1"; sha256="10shzyiawk65pikawvhg58kx6fpvs1dazqmfjf3rfvly1lc0px1q"; depends=[FactoMineR MASS mvtnorm numDeriv Rcpp]; };
   IRdisplay = derive2 { name="IRdisplay"; version="0.4.4"; sha256="19l4flvik8zw2pany8dpjbrh0bji6bag6pmclgwqnq80532hnfp8"; depends=[repr]; };
   ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
   ISDA_R = derive2 { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
-  ISLR = derive2 { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; };
+  ISLR = derive2 { name="ISLR"; version="1.1"; sha256="1w6k90mbzrx1756rvx7b3y22ypgkzl9p7mjjdlzs8i5g1yz8gzqv"; depends=[]; };
   ISOcodes = derive2 { name="ISOcodes"; version="2016.12.09"; sha256="1xsazjipx468hyqivdkskcqiipmysdzzrswh4yh6p41qbf1ahp6a"; depends=[]; };
   ISOpureR = derive2 { name="ISOpureR"; version="1.0.21"; sha256="093wvnh7fv9shvssgl8slfg394f0v0jazj4jpihhaqkfchq1vryy"; depends=[futile_logger Rcpp RcppEigen]; };
   ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
   ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; };
   ISwR = derive2 { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; };
-  ITGM = derive2 { name="ITGM"; version="0.4"; sha256="0vsf3hnqfz029n1skm54s9ynd8alqag963bircqg0psgl9x6jhvi"; depends=[data_table Fgmutils gsubfn plyr sqldf]; };
+  ITGM = derive2 { name="ITGM"; version="0.6"; sha256="0acrm15vb1r0nnp0bp5zf8g27i3sy3d7bpd50lj0w1rl6dgwfznh"; depends=[data_table Fgmutils ggplot2 gsubfn plyr randomcoloR rbokeh sqldf]; };
   IUPS = derive2 { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; };
   IalsaSynthesis = derive2 { name="IalsaSynthesis"; version="0.1.6"; sha256="15iwywvzhgiyigl8f488b7ra89rz0a7ymfsdgdlqfls3fmld7b4a"; depends=[testit]; };
   Iboot = derive2 { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; };
-  IceCast = derive2 { name="IceCast"; version="1.1.0"; sha256="1xw7fapp72kxdg9vynwmgz3nl6hah135d78hys8zikn6gsnkmzhj"; depends=[maptools MASS ncdf4 raster rgeos sp]; };
+  IceCast = derive2 { name="IceCast"; version="1.2.0"; sha256="13qsdzsx6a9kfbfx4dbr326ia0pdl18yvsb2v0wjl1gyr10r4vmr"; depends=[maptools MASS ncdf4 raster rgeos sp]; };
   IgorR = derive2 { name="IgorR"; version="0.8.1"; sha256="1lkiz3gxj8i1xbr5jp69z21rpk7kz3a68h29inp1qa7zi7gikmgx"; depends=[bitops]; };
   ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; };
   Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
   ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
   ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; };
-  ImputeRobust = derive2 { name="ImputeRobust"; version="1.1-2"; sha256="0jd7j4i55bbcgvm5km2mk07c6vgjnrlbij0vlfw833ag979zzsla"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
+  ImputeRobust = derive2 { name="ImputeRobust"; version="1.2"; sha256="0hr5payxqyk5nckwx84j5wqrj477219qbp76908aylwb7c7iw9n4"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; };
   InSilicoVA = derive2 { name="InSilicoVA"; version="1.1.4"; sha256="16978c1bdxbp3xxrcnx8yyar1dd292a5i43qhcymdp7nnprd6gc7"; depends=[coda ggplot2 rJava]; };
+  IncDTW = derive2 { name="IncDTW"; version="0.1.3"; sha256="11mlrwy5x11hd1q2gjcnxfrvvrn6y8njgn0ywdxyhlxr0hcbylp0"; depends=[ggplot2 Rcpp scales]; };
   IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; };
   IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; };
   IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
@@ -1470,7 +1503,7 @@ in with self; {
   InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
   InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
   InfiniumPurify = derive2 { name="InfiniumPurify"; version="1.3.1"; sha256="0yqah4rwpishas0xyv5a7cn4v18brj33cd7f494g21b9brggafq1"; depends=[matrixStats]; };
-  InfoTrad = derive2 { name="InfoTrad"; version="1.1"; sha256="072280famiq6455mc3q00k9xw1jb534308am875ys1bplci63521"; depends=[]; };
+  InfoTrad = derive2 { name="InfoTrad"; version="1.2"; sha256="0blfn59w73hjga15sw8plwvn6yq9fj95nxwp018mp1harl8wa5db"; depends=[nloptr]; };
   Information = derive2 { name="Information"; version="0.0.9"; sha256="0pszwzj3r7vdvdsy9w1qz95zxp7y2bsyg36b58mm4qcvcvymd4kn"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; };
   InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; };
   InformativeCensoring = derive2 { name="InformativeCensoring"; version="0.3.4"; sha256="145k4hggymra2jnxkcck795xk280yyldfzh9ls2irnsxmxfszr52"; depends=[boot dplyr survival]; };
@@ -1480,7 +1513,7 @@ in with self; {
   IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
   IntNMF = derive2 { name="IntNMF"; version="1.1"; sha256="0bw6ycf7zrbfh8dfpgva1a51nazkvwlq7pxdhpp1j1mhabwm2nq2"; depends=[cluster InterSIM MASS mclust NMF]; };
   IntegrateBs = derive2 { name="IntegrateBs"; version="0.1.0"; sha256="1pkx4wpahd1sabzx55law3710x3vbh9yi6kii8gs2xfq3cb1llmq"; depends=[]; };
-  IntegratedJM = derive2 { name="IntegratedJM"; version="1.5"; sha256="0vw2k8f0smb2vbn10rqp5alhra8q5d87c0zjs2xjc8w6i72fy2q8"; depends=[Biobase ggplot2 nlme]; };
+  IntegratedJM = derive2 { name="IntegratedJM"; version="1.6"; sha256="0fv24z7vidhn09ljk09pjzkrlg2rlwxcrhfjc53ybjjgsgay99z6"; depends=[Biobase ggplot2 nlme]; };
   IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.8"; sha256="0y3hagjx3pzhqyqm3pydl3s3f1g9d5yb2w3ybxll11913p3gll3i"; depends=[bootstrap caTools ggplot2 limSolve MultivariateRandomForest Rcpp]; };
   InterSIM = derive2 { name="InterSIM"; version="2.1"; sha256="092fw918qq8pahyxxznabkdfrb8700bpkkq96zj8ihpkx2ngkxln"; depends=[MASS NMF]; };
   InterVA4 = derive2 { name="InterVA4"; version="1.7.4"; sha256="0mlcn8mlrwgb54iclvadjwgpgav3zfm1y513bn2gypafq7x3bk81"; depends=[]; };
@@ -1495,15 +1528,15 @@ in with self; {
   InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; };
   Inventorymodel = derive2 { name="Inventorymodel"; version="1.0.4"; sha256="1mlvdfhyr27sgap7jgccy79gg7dksplp2jirijn9i289mqvy12c9"; depends=[e1071 GameTheoryAllocation]; };
   InventorymodelPackage = derive2 { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
-  IrishDirectorates = derive2 { name="IrishDirectorates"; version="0.1.0"; sha256="0741093vq1cqs9zh95fc6kwpd4a4r4yxvmcnp7f7j5xxyqy1h3xz"; depends=[]; };
+  IrishDirectorates = derive2 { name="IrishDirectorates"; version="0.2.0"; sha256="1m3c3dj4729chk1n3k7awvi1jdfnds2w36vm268azg53j6c7l4b6"; depends=[]; };
   IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; };
   IsingSampler = derive2 { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[magrittr nnet plyr Rcpp]; };
   Iso = derive2 { name="Iso"; version="0.0-17"; sha256="0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0"; depends=[]; };
   IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
   IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; };
   IsoSpecR = derive2 { name="IsoSpecR"; version="1.0.3"; sha256="1cnkzc29k0inz6kdn77l0ymzjgf1hid8jza7nla4ym2s0gidgdyf"; depends=[Rcpp]; };
-  IsoplotR = derive2 { name="IsoplotR"; version="0.14"; sha256="0k7isq6ady85vwzyh6zg1z6jbkf86pxmcfw14gvyzqhjwzc9jh5p"; depends=[MASS]; };
-  IsoriX = derive2 { name="IsoriX"; version="0.5"; sha256="177z16afx0ws1y99phhb3wpy5qpf9w1964rh0dxqrwr7xas20jlq"; depends=[latticeExtra numDeriv proxy raster rasterVis sp spaMM]; };
+  IsoplotR = derive2 { name="IsoplotR"; version="0.16"; sha256="1g4slgafi1wbiayhy0b51kixbwrdfw14pcvwvh9xbbn6rqnk1wci"; depends=[MASS]; };
+  IsoriX = derive2 { name="IsoriX"; version="0.7"; sha256="0b94s94axrqgv3dm9dbkdnh6imlzn245f2pi7wbj99nqhwa47ynb"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
   IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; };
   JADE = derive2 { name="JADE"; version="2.0-0"; sha256="15bcq6r2iargxkb0pdbqkwrrn2rs7hc3y5fxjm5mb377513sdz5j"; depends=[clue]; };
   JAGUAR = derive2 { name="JAGUAR"; version="3.0.1"; sha256="0lyc8biwj9yir1i06klp2jkb31mnzwp226aw7pwabkprfhqgfmqd"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; };
@@ -1516,7 +1549,7 @@ in with self; {
   JMbayes = derive2 { name="JMbayes"; version="0.8-0"; sha256="1kay6na8mb7k2r4alpzm2lb8phjqr3a05qfpv4ydd16rbjrlfbph"; depends=[MASS nlme survival]; };
   JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
   JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
-  JOUSBoost = derive2 { name="JOUSBoost"; version="2.0.0"; sha256="1nrsbcdfn196209niqmq0lxwakwma9sp33ydnj3dap0yikswci8x"; depends=[doParallel foreach Rcpp rpart]; };
+  JOUSBoost = derive2 { name="JOUSBoost"; version="2.1.0"; sha256="0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7"; depends=[doParallel foreach Rcpp rpart]; };
   JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; };
   JPSurv = derive2 { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
   JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; };
@@ -1528,7 +1561,6 @@ in with self; {
   Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
   JoSAE = derive2 { name="JoSAE"; version="0.2.3"; sha256="0b1jwplds5b7z15v6bvqj1rbn7zxpgvh2ykhqplxzv4mlaw6i0li"; depends=[nlme]; };
   Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
-  JohnsonDistribution = derive2 { name="JohnsonDistribution"; version="0.24"; sha256="00211pa2wn4bsfj6wfl9q9g123cp8iz3kxc17pw9q65j9an4sr0m"; depends=[]; };
   JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; };
   JointRegBC = derive2 { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[MASS nlme survival]; };
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
@@ -1537,19 +1569,19 @@ in with self; {
   KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit matlab R_matlab]; };
   KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; };
   KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; };
-  KFAS = derive2 { name="KFAS"; version="1.2.8"; sha256="15p459bs6q0j893zbkpak6dnflrmlm27203ldf8pjdfyfy1nvsva"; depends=[]; };
+  KFAS = derive2 { name="KFAS"; version="1.2.9"; sha256="04iq4zyy98rqvv7q4f3ypg0bmdawmwa3lwm9agbrsaiz8v89cqhk"; depends=[]; };
   KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
   KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
   KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
   KODAMA = derive2 { name="KODAMA"; version="1.4"; sha256="0qzpgj6ljzd8n8vgmf53pmblsmypl86j7njd3pz0d370bxfchsqj"; depends=[Rcpp RcppArmadillo]; };
   KOGMWU = derive2 { name="KOGMWU"; version="1.1"; sha256="0n07wrpmmvxflxpmhkp3gm40xz2w4j0l8dsljhmfiyxcf5y7kq2g"; depends=[pheatmap]; };
-  KRLS = derive2 { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; };
+  KRLS = derive2 { name="KRLS"; version="1.0-0"; sha256="1zyf3smfzfm3n43i35rlj1w6vcip2hxkvk4f8lp77xbsry0gmwjw"; depends=[]; };
   KRMM = derive2 { name="KRMM"; version="1.0"; sha256="0wxzhrrc4lx20nxjny7rcfw3bya7drn88zbrlzx9f531298xwbrk"; depends=[cvTools kernlab MASS robustbase]; };
   KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; };
   KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; };
   KScorrect = derive2 { name="KScorrect"; version="1.2.0"; sha256="1rymzllm97z22xwsn5wbn02c0xp0kfdp73mk9jrk81hfdpd15p4i"; depends=[MASS mclust]; };
   KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; };
-  KappaGUI = derive2 { name="KappaGUI"; version="1.2.1"; sha256="1nr9jyl43fc8w10jp0xbgjx8vdkjnl4irqwjgw4fil19fc6p7g3p"; depends=[irr]; };
+  KappaGUI = derive2 { name="KappaGUI"; version="2.0.1"; sha256="0l2kgh9bflag5s056ib8fkajl56yr8c0qsmd9ma56i9ay7i540da"; depends=[irr shiny]; };
   KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
   KarsTS = derive2 { name="KarsTS"; version="1.1"; sha256="0dg0w7n2ga22wkbg0sxdx93zyksvvpwx1f87ki55mvk9i5kb2a5k"; depends=[BaylorEdPsych circular forecast mgcv missForest MVN nonlinearTseries rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; };
   Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
@@ -1559,22 +1591,24 @@ in with self; {
   Kernelheaping = derive2 { name="Kernelheaping"; version="1.6"; sha256="1xsszbx6srrgzdddr11pfrmfi985amjwngsrbhg8mgn58pwz3yiy"; depends=[ks MASS plyr sp sparr]; };
   Kmisc = derive2 { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; };
   KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; };
+  Knoema = derive2 { name="Knoema"; version="0.1.7"; sha256="1f9sndva2pfv4r8g8dspywg8rs1vzlb8adf5zdc5gz8hl03b3dgr"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; };
   KnowBR = derive2 { name="KnowBR"; version="1.2"; sha256="1d2rzggj3jp8r748mrvk4c692xkmbim5avxjy30qzn3wmy15r479"; depends=[]; };
   KoNLP = derive2 { name="KoNLP"; version="0.80.1"; sha256="1chj8kv1l405dm0jcsxjjjxx395z05sfxbcc5vxnpbydx7lxa6zy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; };
   KoulMde = derive2 { name="KoulMde"; version="3.0.0"; sha256="01mczlrdrfwdp2cj10kdqay3qpg8xf2v7vym62pll9l8n595snrl"; depends=[Rcpp]; };
   Kpart = derive2 { name="Kpart"; version="1.2.0"; sha256="14c6ngc37xpxy5pd5jishaqz6aahky32p0x5bfsn5zirdahlphsa"; depends=[leaps]; };
-  KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.1.1"; sha256="1r9gs7k12djg56bifrpxbkj1kbcqgdpyqnjw5829gsx8881j2z9d"; depends=[dplyr ggplot2 tibble]; };
+  KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.1.2"; sha256="14qc0ghylsj83l3pjlb9vld5i7hm7139cj6gqp2c38xmddr97wmx"; depends=[dplyr ggplot2 tibble]; };
   KrigInv = derive2 { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; };
-  L1pack = derive2 { name="L1pack"; version="0.38"; sha256="1my9fbqry1h3s1dwy8ia6rzkdp8map3n01vfwp0ddx4bw1mz2ffv"; depends=[]; };
+  L1pack = derive2 { name="L1pack"; version="0.38.1"; sha256="17ln5w6faq6wm95rxm6yqybay6r1wvdhn59pwzzm4j1ysrvxdzzs"; depends=[]; };
   LAM = derive2 { name="LAM"; version="0.0-17"; sha256="1ip9gz4i5ap7z6rsg0yh7sv590bji2kq4pcpaz16jpjgy5802skg"; depends=[CDM coda Rcpp RcppArmadillo sirt]; };
   LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; };
   LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; };
-  LBSPR = derive2 { name="LBSPR"; version="0.1.1"; sha256="0wwn64qbvf64i38gsd3q6p3n3rplb9b662hv3n2al54dis7kr9iv"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
+  LBSPR = derive2 { name="LBSPR"; version="0.1.2"; sha256="09jvdjagf4icnigbfw18z36ya4llg84fa6j2khd22cl60y81r5i3"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
   LCA = derive2 { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; };
   LCAextend = derive2 { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot kinship2 mvtnorm rms]; };
   LCF = derive2 { name="LCF"; version="1.6-6"; sha256="1pcm1fdf0s2ygd425h2yi3j4r41zwi2bq2xsc20ymzq8lxq7d4rb"; depends=[quadprog]; };
   LCFdata = derive2 { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; };
-  LCMCR = derive2 { name="LCMCR"; version="0.4.1"; sha256="1pn11a0h4986wvllkpspymvh1qyi5vhpcz0qg7wa32jbla9is87s"; depends=[]; };
+  LCMCR = derive2 { name="LCMCR"; version="0.4.3"; sha256="1pzavzlr3fml4chrh0fmj8688a3xa153w5gp404nx3qld5sizqrm"; depends=[]; };
+  LCox = derive2 { name="LCox"; version="0.1.0"; sha256="1cqkqmi6bkd41xxwqqzpdiwdv8m5nrqz3f6cajnnbmgfcjawmrzq"; depends=[fdapace survival]; };
   LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; };
   LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; };
   LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; };
@@ -1629,7 +1663,7 @@ in with self; {
   LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.1"; sha256="1inq88yqm1155shx81lsmjvc0snnid0ibim991g46yibf3jpcyzf"; depends=[]; };
   LaF = derive2 { name="LaF"; version="0.6.3"; sha256="0mp1g8pikmkahxgshgs4a7iryxzzcxhxdzvdn60s6m9h1addvhww"; depends=[Rcpp]; };
   LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.0"; sha256="0qf818dgyp1sgs6j5zqsj1wld5hychv1qxr6gdk3s0nbv72y7wsw"; depends=[data_table maptools rgdal rgeos sp spdep]; };
-  Lahman = derive2 { name="Lahman"; version="5.0-0"; sha256="03zfgsgf36lnsjlrqfh1npqnz52dhd6xyzs7k1sxygwy62lg03lx"; depends=[dplyr]; };
+  Lahman = derive2 { name="Lahman"; version="6.0-0"; sha256="1616iaa28z6wrxcvvmnic5awj33b7km9yxnn8bnll9yw99ks6qk6"; depends=[dplyr]; };
   LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.0"; sha256="06mvdrdyl0rh9rwd0jxww0sycadcp7cj08hq35q6vyzq0jkxn2xf"; depends=[plyr rLakeAnalyzer]; };
   Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
   LambertW = derive2 { name="LambertW"; version="0.6.4"; sha256="09ygalklv0d767nwziqwaxa7h517rzqgaznmb04q43122x2gwb3k"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; };
@@ -1644,6 +1678,7 @@ in with self; {
   LeafAngle = derive2 { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
   LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; };
   LearnBayes = derive2 { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
+  LearnGeom = derive2 { name="LearnGeom"; version="1.0"; sha256="0n97jzmi7zg1iysawgr753mig49fvzymldgh8nqqcgql1rjf3yph"; depends=[RgoogleMaps]; };
   LendingClub = derive2 { name="LendingClub"; version="1.0.3"; sha256="0gnykp51nnchm79w0s3wx7q5790yzjp1fjgm12v4jjxzq30gjmcm"; depends=[dplyr httr jsonlite plyr]; };
   LexisPlotR = derive2 { name="LexisPlotR"; version="0.3"; sha256="1qdgs6p11j0ign27bbnn32g65sw42982ijrig5cwqsdvxpdabjl8"; depends=[ggplot2]; };
   LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; };
@@ -1654,7 +1689,7 @@ in with self; {
   LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; };
   LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
   LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
-  LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.6"; sha256="10a1m4yqr02gg5akxknwmhrlbqxnza78z8rm0ym36c4vlz8b0hyi"; depends=[stringr]; };
+  LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; };
   LindleyR = derive2 { name="LindleyR"; version="1.1.0"; sha256="163i604q683znp6q544hnv4vibygwvsxcfhh8m7iaqr42li3c0ak"; depends=[lamW]; };
   LinearRegressionMDE = derive2 { name="LinearRegressionMDE"; version="1.0"; sha256="0nl29l10y5kpds1i4sv7jwizq61fmh5c0zpj8x64qfif4l6y4v0d"; depends=[]; };
   LinearizedSVR = derive2 { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[expectreg kernlab LiblineaR]; };
@@ -1667,7 +1702,7 @@ in with self; {
   LncPriCNet = derive2 { name="LncPriCNet"; version="1.0"; sha256="19cw3x97xv42kc4jag7axnmpd0nfnwg7vnwcn2bgcmm5gapmfn1h"; depends=[]; };
   LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
   LocalControl = derive2 { name="LocalControl"; version="1.0.1"; sha256="0bmqlhazblps8x9ndqh5k6lmd8020kh5wzgjnw5mq9v053p360sz"; depends=[cluster gss lattice Rcpp]; };
-  Lock5Data = derive2 { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; };
+  Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; };
   Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
   LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
   LogicForest = derive2 { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; };
@@ -1679,6 +1714,8 @@ in with self; {
   LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-4"; sha256="02p46agsdbvw6dpgzahq9hfmy184jrkwa1hhnrcbrsmm54n3m2bx"; depends=[nlme]; };
   LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; };
   LowRankQP = derive2 { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
+  LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.0"; sha256="0dqh1cg49w75fc6qmv2sdym5jsdnsgkwv621g3wmr8m3i81m49v6"; depends=[Rcpp RSQLite]; };
+  LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.0"; sha256="1a74hjamh6sldzp65s0fm7d2wq1f37j822a7whikcpwsdj3za8vm"; depends=[Rcpp RSQLite]; };
   LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; };
   Luminescence = derive2 { name="Luminescence"; version="0.7.5"; sha256="07v78diyjvbymwidpa9f5bykaafczv0f88f6r926mk949sj1ici4"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
@@ -1688,10 +1725,11 @@ in with self; {
   MAINT_Data = derive2 { name="MAINT.Data"; version="1.1.2"; sha256="1d552k2n110a6rvvf2ld8anravp3xgh17irj6kb0nxzcjy30vprg"; depends=[MASS miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
   MALDIquant = derive2 { name="MALDIquant"; version="1.16.2"; sha256="0z5srzsfgsgi4bssr4chls4ry6d18y2g9143znqmraylppwrrqzr"; depends=[]; };
   MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.10"; sha256="1h1lvmw3233wgy1wvpa6n5q5j6z27hg3k31rq4a7c53w8g1bsmi3"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
+  MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.0"; sha256="1di9l80pk0pp9r2437rq79ad05kaxrd2pvl0bliw63vr4g7vcnha"; depends=[lattice MALDIquant robustbase signal wmtsa]; };
   MAMS = derive2 { name="MAMS"; version="1.01"; sha256="0vm1pnh5bcggsip4cpbfif2j2glvbsscpnpjsycbd2y0m05asccz"; depends=[mvtnorm]; };
   MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; };
   MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; };
-  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.0.5"; sha256="1xh1nn2wipxyl8nj3vnpbyyww2np3pv12c78sf87kyl4q5c20v64"; depends=[ellipse magic MASS Matrix plotrix plyr]; };
+  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.1.2"; sha256="14vs6a4kh6w3qjsphid4czkzg1456igv4q0laxi4wfm8pb1j3aym"; depends=[ellipse magic MASS Matrix plotrix plyr]; };
   MAPA = derive2 { name="MAPA"; version="2.0.2"; sha256="1sk95zpsw6lhciyyq8jzz8mdj4gbnq5vk9z3hxbyl0v0g2rr1gqz"; depends=[forecast RColorBrewer smooth]; };
   MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
   MAR1 = derive2 { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
@@ -1703,7 +1741,7 @@ in with self; {
   MATA = derive2 { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
   MATTOOLS = derive2 { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
   MAVE = derive2 { name="MAVE"; version="1.2.9"; sha256="0h54iaw0nlyddgl266sk2gkrq8ff1xn510bfw12csqk7xnydm18f"; depends=[mda Rcpp RcppArmadillo]; };
-  MAVIS = derive2 { name="MAVIS"; version="1.1.2"; sha256="1ankgazqf368jhj8csmyyvlys27d61s41fcxq3s324gz69xh25ll"; depends=[compute_es ggplot2 MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS weightr]; };
+  MAVIS = derive2 { name="MAVIS"; version="1.1.3"; sha256="02hi3n2rligmgg9afqwkpdny2kl68simkaqdd6k1swzlrih0fs4s"; depends=[compute_es ggplot2 irr MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS weightr]; };
   MAVTgsa = derive2 { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach MASS multcomp randomForest]; };
   MAc = derive2 { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
   MAclinical = derive2 { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; };
@@ -1712,28 +1750,28 @@ in with self; {
   MBC = derive2 { name="MBC"; version="0.10-2"; sha256="0c40k3m9z9cqk3778hwyy0i56qnsvw1dwpa6p9v097fbpacfsrg2"; depends=[energy Matrix]; };
   MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
   MBESS = derive2 { name="MBESS"; version="4.3.0"; sha256="055h4wppp4dyxa152hdg6as5ckxzvjjfb3k8n72w9jmmrk49vbbg"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; };
-  MBHdesign = derive2 { name="MBHdesign"; version="1.0.63"; sha256="1dvcllx514n2djira132ranpwqlxc11an580kis2biw9aww6dskc"; depends=[class geometry mgcv mvtnorm randtoolbox]; };
+  MBHdesign = derive2 { name="MBHdesign"; version="1.0.70"; sha256="1diprak06v4jkivnf2bb74v9flm439034n62pfqg446vymxjkzh9"; depends=[class geometry mgcv mvtnorm randtoolbox]; };
   MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
-  MBSGS = derive2 { name="MBSGS"; version="1.0.0"; sha256="1g13bjxmbnd7fwb3nv1s87ra7iwjkvid9pfwy7qxixy80pdrlfz5"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; };
+  MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; };
   MBTAr = derive2 { name="MBTAr"; version="1.0.1"; sha256="0zak19pdk0wwkhl4kj1jbwx0qmqcgpmmqv3vk0wg8nwgf1l65idy"; depends=[jsonlite]; };
   MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; };
   MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
   MCAvariants = derive2 { name="MCAvariants"; version="2.0"; sha256="0akff64v49d5r0wvspal0pz17jhz1ry4vdmj47m28gzjj69zcab0"; depends=[]; };
   MCDA = derive2 { name="MCDA"; version="0.0.16"; sha256="1yxcpvapn9dv802z3fm0sfgf8lkpsniwb41qnb8lbvmqnyzmkqhw"; depends=[glpkAPI RColorBrewer Rglpk]; };
   MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; };
-  MCI = derive2 { name="MCI"; version="1.3.0"; sha256="0256rxsjcrwyah4ixhfl3ba46sh02sq3rc1h0mx2jckycdf0nx9r"; depends=[]; };
+  MCI = derive2 { name="MCI"; version="1.3.1"; sha256="1dy7awqwxzpijx0x49ma28iialrdcwdcvc1qznlr9znml9xmz2br"; depends=[]; };
   MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
   MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; };
   MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; };
   MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; };
   MCMCglmm = derive2 { name="MCMCglmm"; version="2.24"; sha256="0s2x8kazn3g3x3z4ji95c5vmfj8awcjmx92c0alsj5ms1bqxsh7x"; depends=[ape coda corpcor cubature Matrix tensorA]; };
   MCMCpack = derive2 { name="MCMCpack"; version="1.4-0"; sha256="0cz5djmf1xfv54sgwan0r6ln1mlnkpnqh2zhqkss2m3ys2v087yh"; depends=[coda lattice MASS mcmc quantreg]; };
-  MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.6"; sha256="1gz01jqi4w0lnp4mkxa5ri09hkc4c2qwxifbmx50m75rhr0328hr"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
+  MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.7"; sha256="0pbyg6v478di1w9cpp2rmhr4p5ncnwmks042981snqc5gnwysjx4"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
   MCMCvis = derive2 { name="MCMCvis"; version="0.7.1"; sha256="1hqkxqs1s0m1znqlf6bjx5nscqv8galnkxgp738pcvvw0mwn19pk"; depends=[coda rstan]; };
   MCPAN = derive2 { name="MCPAN"; version="1.1-20"; sha256="0j36dhi3bf3q14bbcmrmipz2fcn6g9gsqidzm43i8x5r7hcvv2lh"; depends=[magic MCMCpack multcomp mvtnorm plyr]; };
-  MCPMod = derive2 { name="MCPMod"; version="1.0-9"; sha256="03zqassvyqwllg1yjfdg2zxamkg2dy8cy19ki5srpn6clv5zy1rj"; depends=[lattice mvtnorm]; };
+  MCPMod = derive2 { name="MCPMod"; version="1.0-10"; sha256="0ns74qhm9bzi70m9bn61zs4mmqmmxxi77f49pdrcnr8wrrnn1kdn"; depends=[lattice mvtnorm]; };
   MCPerm = derive2 { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
-  MCS = derive2 { name="MCS"; version="0.1.1"; sha256="0fxc5ri4ci3r5w1hdicqm1j0g6fwrl3wng7qwc2c0isagrn3vp4n"; depends=[]; };
+  MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; };
   MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; };
   MChtest = derive2 { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; };
   MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; };
@@ -1742,7 +1780,7 @@ in with self; {
   MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.3"; sha256="0aaw787fvcyhw6mbl42icgqfdzvfr618vg179984xqifafr40dyc"; depends=[linprog Matrix]; };
   MDR = derive2 { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; };
   MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; };
-  MDplot = derive2 { name="MDplot"; version="1.0.0"; sha256="18q25qxwqd8jwn8y781xqisd15k9p81nmxkx41pyi703njav1fm1"; depends=[gplots gtools MASS RColorBrewer]; };
+  MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; };
   MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; };
   MEGENA = derive2 { name="MEGENA"; version="1.3.6"; sha256="0ylv7kbk0x3rm08aiwci4p3kma08qj4szlw2h1d6wcqmipy93v8s"; depends=[BH cluster doParallel foreach fpc ggplot2 ggrepel igraph Matrix Rcpp reshape]; };
   MEMSS = derive2 { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; };
@@ -1752,6 +1790,7 @@ in with self; {
   MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
   MFAg = derive2 { name="MFAg"; version="1.4"; sha256="092zbl2pxbsvfyf3qssbid14194p0ax2zrw0gzpyqwzdpx0brrlb"; depends=[]; };
   MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; };
+  MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9"; sha256="16f1kdaqczjlv5cx0nv9fybvjwf22yaj3f4blkgm7mf9h78cyz05"; depends=[corpcor Matrix matrixcalc scs]; };
   MFPCA = derive2 { name="MFPCA"; version="1.1"; sha256="1nbm8j9g36jqbalja5zcgkiy03i0pmr75hiqnhigxyy4dnp0wj4a"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
   MGGM = derive2 { name="MGGM"; version="1.0"; sha256="0j9wyshwxd7zqb60avb7dmfgnrzv2nyn983bw0g5997zixz0w6mp"; depends=[]; };
   MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; };
@@ -1792,11 +1831,10 @@ in with self; {
   MNP = derive2 { name="MNP"; version="3.0-2"; sha256="08q4qqhpgnmkw18kgzxsanp6qhwikx1wxcr6byr6zylqnqgx2id9"; depends=[MASS]; };
   MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; };
   MOCCA = derive2 { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; };
-  MODIS = derive2 { name="MODIS"; version="1.0.0"; sha256="05p4lisdbpzvq42pvfc2hdqr5p16gkr85g4bcc5j4h4f4cva5drl"; depends=[bitops mapdata maps ptw raster RCurl rgdal rgeos sp XML]; };
+  MODIS = derive2 { name="MODIS"; version="1.1.0"; sha256="0a0gjncbh9dskbmvl5yzzg33jxvvfrsvc3axy1r5j5nfp3hb6zn6"; depends=[bitops devtools mapdata mapedit maps ptw raster RCurl rgdal sf sp XML]; };
   MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; };
-  MODISTools = derive2 { name="MODISTools"; version="0.95.1"; sha256="099xh987phvya67b75c8j4z58zpqf69q3qxh280l9ka3w6pq3ljm"; depends=[RCurl XML]; };
-  MODIStsp = derive2 { name="MODIStsp"; version="1.3.2"; sha256="1qsw7s1skkfadyap3w8z1rb9yjls154wp7a2fa2ifxm9164976b8"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 hash httr pacman plyr raster RCurl rgdal rgeos RJSONIO sp stringr XML xts]; };
-  MOEADr = derive2 { name="MOEADr"; version="0.2.1"; sha256="0m5nbr2xcy9nl808ydsn07w0p3pl2cd7dqfz9mk0z52mghvz390f"; depends=[assertthat FNN]; };
+  MODIStsp = derive2 { name="MODIStsp"; version="1.3.3.1"; sha256="0685mrddw47428p61dw30yqdp5m0z2xh3rjfdrrdicfyx7kaii5m"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 hash httr pacman plyr raster RCurl rgdal rgeos RJSONIO sp stringr XML xts]; };
+  MOEADr = derive2 { name="MOEADr"; version="1.0.0"; sha256="0v5cmnin1fg5yzk2jkbi0fjmgbxls1mgpsr9qkss1cskyxw1d4lz"; depends=[assertthat FNN]; };
   MOJOV = derive2 { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; };
   MOQA = derive2 { name="MOQA"; version="2.0.0"; sha256="17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr"; depends=[gplots psych readr]; };
   MOrder = derive2 { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; };
@@ -1804,21 +1842,23 @@ in with self; {
   MPCI = derive2 { name="MPCI"; version="1.0.7"; sha256="1l55q09lliv0y4q1hc0jgzls47wkmsfag6b4iq5y6wrllr5wq7sa"; depends=[]; };
   MPDiR = derive2 { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
   MPINet = derive2 { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
-  MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.0"; sha256="0ga9v057vrb2vjrxr55kqk9hyfq94r9nfqhsxvwf60hxyn929qpd"; depends=[MASS survival]; };
-  MPSEM = derive2 { name="MPSEM"; version="0.3-1"; sha256="1c4788qvvn02hnihlz56h2nsj7qfdaw3x2i7jmkd9ll2jsszav3v"; depends=[ape MASS]; };
+  MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.1"; sha256="0xgj349jkv29ldia4lmsiwnkhrk99aqcrvyiy3si5knmi1jvx9q0"; depends=[MASS survival]; };
+  MPSEM = derive2 { name="MPSEM"; version="0.3-2"; sha256="10kh0ss2m8j09risnwk550p0bdd73asgdm8qjjwb2ii6bi31lw5g"; depends=[ape MASS]; };
   MPTinR = derive2 { name="MPTinR"; version="1.10.3"; sha256="0281w5dhg8wmi1rz80xribq437shp4m890c504kggsacr28mbhkw"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
   MPV = derive2 { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
   MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; };
   MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
+  MRFA = derive2 { name="MRFA"; version="0.1"; sha256="1z6bnss9p8p8a2wxy40yp62ypxpis6k2j7naspdjcv09b1882jdg"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; };
   MRH = derive2 { name="MRH"; version="2.2"; sha256="1icwlq8js58g9fkiq7fwjg8r97ca47xl3dscnhnga99gkgsfgjwl"; depends=[coda KMsurv survival]; };
   MRMR = derive2 { name="MRMR"; version="0.1.4"; sha256="0dgbhlynaaka7mdzl6igwgcdzvy6cm2y8mbxaf9pfla8w3z8y0lq"; depends=[ggplot2 lmtest lubridate plyr reshape2]; };
   MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; };
   MRS = derive2 { name="MRS"; version="1.2.1"; sha256="07kpj5q1slplqm3907yj74dkfq348a9fwfr0dzhjzdbkhph2iwpi"; depends=[igraph optimx Rcpp RcppArmadillo]; };
   MRSP = derive2 { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[Formula matrixcalc]; };
+  MRTSampleSize = derive2 { name="MRTSampleSize"; version="0.1.0"; sha256="1f6ivr6cx4irqkry219x4nk6k5zhp3b19axy2xbfc3dx5zixhpjl"; depends=[]; };
   MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
   MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
   MSBVAR = derive2 { name="MSBVAR"; version="0.9-3"; sha256="0ybkkl3hfff2jgz4a0z105bb0v6jl4dkkqmdg382and8w0mc496c"; depends=[bit coda KernSmooth lattice mvtnorm xtable]; };
-  MSCMT = derive2 { name="MSCMT"; version="1.2.0"; sha256="0ypysx3782nipz2zgvp2h183nhak47gnjh2xvfpzqmn49vd8x0fc"; depends=[ggplot2 lpSolve]; };
+  MSCMT = derive2 { name="MSCMT"; version="1.3.0"; sha256="0rwhfk6dh10zn1zgjamwx23j8i9kw1p6yzfgxj5ch7w3d3yzhrbf"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; };
   MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; };
   MSGARCH = derive2 { name="MSGARCH"; version="0.17.7"; sha256="01n8ngk0r2hfa5vrj0mbc09kq9dj0d4fjzhszcj80mzfr47jf5vf"; depends=[adaptMCMC DEoptim dfoptim expm fanplot ggplot2 nloptr Rcpp RcppArmadillo reshape2 stringr zoo]; };
   MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; };
@@ -1832,6 +1872,7 @@ in with self; {
   MTA = derive2 { name="MTA"; version="0.1.0"; sha256="0h1nnvylp5yvzx6mljayjjz73l0bjyz5zahymxa9z3z7jlahvkwh"; depends=[igraph rgeos sp]; };
   MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; };
   MTS = derive2 { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; };
+  MTSYS = derive2 { name="MTSYS"; version="1.0.0"; sha256="0gap1ghwkfa8ni11wgrck4zsngf9j470vwv1jdzmsmr963q1yw1w"; depends=[]; };
   MTurkR = derive2 { name="MTurkR"; version="0.8.0"; sha256="0q498chr2s67ai7lfxi6kdficqbs5sxj9asyv69z2a37fmsr4va7"; depends=[base64enc curl digest XML]; };
   MTurkRGUI = derive2 { name="MTurkRGUI"; version="0.1.5"; sha256="1rlgz80na0v1nx70cda1fzyswlb1lg5kcx64zl9dcqy6accsrpmp"; depends=[curl MTurkR XML]; };
   MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; };
@@ -1859,13 +1900,14 @@ in with self; {
   MapGAM = derive2 { name="MapGAM"; version="1.0"; sha256="1hzv3sy2szxl4fhnnzlwagh3qm4z22cbhiwi8whgn5ymwlnw0pca"; depends=[gam maptools sp survival]; };
   MareyMap = derive2 { name="MareyMap"; version="1.3.3"; sha256="0d8prx08321f0p42xbnf0b1446fq4km35xs3ih5ssbdm14q7fnln"; depends=[tkrplot]; };
   MarkowitzR = derive2 { name="MarkowitzR"; version="0.9900.0"; sha256="1wyqlgmb376dsvx7nixpbynjzp7xpmsh4fx9s7nai6fhjb50mxha"; depends=[gtools matrixcalc sandwich]; };
-  MasterBayes = derive2 { name="MasterBayes"; version="2.54"; sha256="016xk43mhl4249p3wsx0v68b69nmp7zllaa0c1in5l18g5v0npi0"; depends=[coda genetics gtools kinship2]; };
+  MasterBayes = derive2 { name="MasterBayes"; version="2.55"; sha256="14532l41x5k3z2qg0vklafqyzmn45qny9hlrrgriykajv3xjf2lz"; depends=[coda genetics gtools kinship2]; };
+  MatManlyMix = derive2 { name="MatManlyMix"; version="0.1.2"; sha256="08iny27gsf89r7c938nx8pmkivkiyrsq7za9ijamz61cf4kyawcl"; depends=[]; };
   MatchIt = derive2 { name="MatchIt"; version="3.0.1"; sha256="0iifn286ssdavpg3ajlmd5z7n5wn0rsj3l23xf6qnvij35k95kbw"; depends=[MASS Matching rgenoud]; };
   MatchItSE = derive2 { name="MatchItSE"; version="1.0"; sha256="01ghv3hdlsx6ypvsh7k0mi20yc8vg7z602mhcprhhh97qsb81v6h"; depends=[Rcpp RcppArmadillo]; };
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
   Matching = derive2 { name="Matching"; version="4.9-2"; sha256="0lv5b41l797c4bl2rzmdqzjnn47zpvvcv3md3xwxvvz5knxky5x4"; depends=[MASS]; };
   MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
-  Matrix = derive2 { name="Matrix"; version="1.2-10"; sha256="0r3qjcz92xwgdzrfz444mqzwnja5sv9abaf252fh6k48qbyahahh"; depends=[lattice]; };
+  Matrix = derive2 { name="Matrix"; version="1.2-11"; sha256="1yvd6fx3n99j4gvzrng43ji38pr5h8y03kijccgjdalym2hcp36g"; depends=[lattice]; };
   Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.5"; sha256="057lms2xdp13wcglg8hg95blj60f5zhva26jlkm2z1vi11jiy728"; depends=[grr Matrix]; };
   MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.1"; sha256="1m14fh52l7zb9pyj2swisrz8dfw68k1p90rgg0g9zqkmx6fp5qls"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; };
   MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; };
@@ -1873,7 +1915,7 @@ in with self; {
   MatrixModels = derive2 { name="MatrixModels"; version="0.4-1"; sha256="0cyfvhci2p1vr2x52ymkyqqs63x1qchn856dh2j94yb93r08x1zy"; depends=[Matrix]; };
   MaxPro = derive2 { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
   MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; };
-  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.4.9"; sha256="19j8mxlhwkr9safgs685kwz1b85z1mplihcjd1m7yc3sdpvmnsdd"; depends=[dplyr lubridate rgdal rgeos rvest sp stringr xml2]; };
+  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.5.1"; sha256="1c5lba3v7agl6wvgnr7af3raxpl9jaffk0ri20jn3gn5mq3bpjrk"; depends=[dplyr lubridate rgdal rgeos rmapshaper rvest sp stringr xml2]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
   Mcomp = derive2 { name="Mcomp"; version="2.6"; sha256="01m2kawkxs9k7va3bvv7bknl4y13rhy8zczc093f10msgy6nqncl"; depends=[forecast ggplot2]; };
   MeanShift = derive2 { name="MeanShift"; version="1.1-1"; sha256="02zf27xvk2zlmgxfyl5pwl2rdq8c30fb52x1mbpvlhmxjbhg6fsn"; depends=[wavethresh]; };
@@ -1882,11 +1924,11 @@ in with self; {
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
   Mediana = derive2 { name="Mediana"; version="1.0.5"; sha256="1hxla0678ilwkm27pxz97794hxz2qxhw557swskhvnybcxq80752"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; };
   Meiosis = derive2 { name="Meiosis"; version="1.0.2"; sha256="1qjn3017xi6js75b9wq7vp6ail5dpbacraj1my3icaggdcbjc45g"; depends=[BH Rcpp]; };
-  MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.2.0"; sha256="1rnsjrvshj41srbzrplfhqw5y68dab489rjn5bdhrk1lm0vz0zvc"; depends=[ggplot2 knitr plotly rmarkdown robustbase stargazer]; };
+  MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.2.2"; sha256="0hwmixcby68a6p6vrq0jy9g6ky26q94haz7m9drzf50zzkv5df0g"; depends=[ggplot2 knitr plotly rmarkdown robustbase stargazer]; };
   MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; };
   MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
   MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
-  MetFns = derive2 { name="MetFns"; version="2.2.0"; sha256="16l55wrbxhpyy97ihw606s41zbvmshygdfjxladhca0pf7zpj29y"; depends=[astroFns fBasics lubridate plotrix spatial]; };
+  MetFns = derive2 { name="MetFns"; version="3.0.0"; sha256="0h2zic2abkifwz8ysy46980frc15rlpzirgk045m4qms91zk08fl"; depends=[astroFns lubridate plotrix pracma]; };
   MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; };
   MetProc = derive2 { name="MetProc"; version="1.0.1"; sha256="1z6538pij1rq5wv9s8rjcn0sck15y26asv4vamav8a6s4135ia3q"; depends=[fastcluster gplots]; };
   MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
@@ -1896,11 +1938,13 @@ in with self; {
   MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; };
   MetaDE = derive2 { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; };
   MetaIntegrator = derive2 { name="MetaIntegrator"; version="1.0.3"; sha256="0611k497ixy0f51lmqzs08zqqq5krrxrm7m0xqdl18gkwrw3w656"; depends=[Biobase DBI GEOmetadb GEOquery ggplot2 gplots multtest preprocessCore reshape rmeta Rmisc RMySQL RSQLite stringr]; };
-  MetaLandSim = derive2 { name="MetaLandSim"; version="0.5.5"; sha256="11dwmhkka0yabgvcxys2w039xwd1brb4kd1g1ahs45cin7w79xvl"; depends=[Biobase e1071 fgui googleVis maptools minpack_lm raster rgeos rgrass7 sp spatstat]; };
+  MetaLandSim = derive2 { name="MetaLandSim"; version="0.5.6"; sha256="1hrgq15qgi26qdiz9iwkhf98nlzx86d3980z717w3gl1yr3i9kal"; depends=[e1071 fgui googleVis igraph maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
+  MetaLonDA = derive2 { name="MetaLonDA"; version="1.0.4"; sha256="0nly4wbklbbihqnxw1nxhydvs6n1fd3j068am9hapf0nwf8kp02g"; depends=[caTools doParallel ggplot2 gss plyr]; };
   MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
   MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; };
   MetaQC = derive2 { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; };
   MetaSKAT = derive2 { name="MetaSKAT"; version="0.60"; sha256="13qffirv0lnj0bflzjpr2hd0d8j4bkakyfjvicp40f0v4v3cack2"; depends=[SKAT]; };
+  MetaSubtract = derive2 { name="MetaSubtract"; version="1.0"; sha256="0yn5ymx22wxn0j6j0w6nxj2mr9nb4qf7ypflikpj9h5qqiln2nn7"; depends=[]; };
   MetaboList = derive2 { name="MetaboList"; version="1.2"; sha256="15wkj29s1mxi1wzqzlh8lkr5jkw15dbc37h3hzsc0r72a3ddzf38"; depends=[enviPick]; };
   MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; };
   MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; };
@@ -1915,18 +1959,20 @@ in with self; {
   Metrics = derive2 { name="Metrics"; version="0.1.2"; sha256="1q407lisi65qaxqlp3lfjfwz3m93csrmjip689ryck7559my9zxh"; depends=[]; };
   MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; };
   MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; };
+  MiRKAT = derive2 { name="MiRKAT"; version="1.0"; sha256="1j2sasxrld9lxmhm4lrrxm2r32nfdiqsg5qjnplx7z55djjxqq4m"; depends=[GUniFrac MASS PearsonDS survival]; };
   MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
   MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; };
   MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
   MicSim = derive2 { name="MicSim"; version="1.0.12"; sha256="186m0p08h6x8zhk82sm1hsyrqdl3p872xn03ysv3g5bldglc9677"; depends=[chron rlecuyer snowfall]; };
   MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.8.2"; sha256="0k0hmi3ciipizmgjw1i5rrsg34yx21s1msn40vc4qc9s1n4wd8dl"; depends=[readr]; };
+  MicroMacroMultilevel = derive2 { name="MicroMacroMultilevel"; version="0.4.0"; sha256="1q5cyqr4hdl1wp2isk6p4p084i83kg6hd406wdp1nj9lv5i0xvgw"; depends=[]; };
   MicroStrategyR = derive2 { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
   MigClim = derive2 { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; };
   MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; };
   Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
   MissMech = derive2 { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; };
   MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-5"; sha256="0drbm87ka17avg6fmswjilgnz9c3azwd0236s8yfms24k9k77vnd"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
-  MitISEM = derive2 { name="MitISEM"; version="1.1"; sha256="1h2nl8xa68c3zmknvn4mrszpi95dwjp8chpgzqfm246ccijzh0bl"; depends=[mvtnorm]; };
+  MitISEM = derive2 { name="MitISEM"; version="1.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; depends=[mvtnorm]; };
   MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.1.0"; sha256="0fdfaq0my31zmh66ih2ws4wj77x26i2jzfql4lflzv441ngx0bv2"; depends=[stabledist]; };
   MixAll = derive2 { name="MixAll"; version="1.2.0"; sha256="09wwisdwgvcsnvb9jdr0p0gyai5ab06yjyqhac1i7jg6wa2r8m3g"; depends=[Rcpp rtkore]; };
   MixGHD = derive2 { name="MixGHD"; version="2.1"; sha256="0f3ppj18acvr35dbgqibmpd58cymq3baw3jdrl4ranlk0nj6h26r"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
@@ -1938,16 +1984,19 @@ in with self; {
   MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; };
   MixedTS = derive2 { name="MixedTS"; version="1.0.4"; sha256="0gwcg115idbcm5llgzqsygvqgshq8dywawxkaddsmw4sbbhj4555"; depends=[MASS]; };
   MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; };
+  MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; };
+  MoLE = derive2 { name="MoLE"; version="1.0.0"; sha256="1iwmn3axyz2kjwh8bq10q8b7dwsn3m628nxq0qa9z2xj1jf2cnf9"; depends=[]; };
   MoTBFs = derive2 { name="MoTBFs"; version="1.0"; sha256="09ymfgw6psc1y0dczvsrsw5cki58wn0d8vj56ydfylrxn24g3jfq"; depends=[bnlearn lpSolve quadprog]; };
   Mobilize = derive2 { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[ggplot2 Ohmage reshape2 wordcloud]; };
   Modalclust = derive2 { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[class mvtnorm zoo]; };
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
   ModelMap = derive2 { name="ModelMap"; version="3.3.5"; sha256="1rmm1a2nw91kzvxpvq9qhlag0dhihis7mgscgslqia6z8fr86qvs"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; };
   ModelMetrics = derive2 { name="ModelMetrics"; version="1.1.0"; sha256="119xxmzb5biq7k1yxqsf0jmmarmfn6lds9x9hfgv593xlpym6za8"; depends=[Rcpp]; };
+  Modeler = derive2 { name="Modeler"; version="3.4.2"; sha256="0zf3z3y4w1jixmcbhkgrjh4dx7x3bfi66hrbzsxyfp7abk0p2d6l"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; };
   Momocs = derive2 { name="Momocs"; version="1.1.6"; sha256="15rmda0d270wallhn9f0nksms194js3vy71cii0aih02rwcpg9kw"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; };
   Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; };
   MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; };
-  MonetDBLite = derive2 { name="MonetDBLite"; version="0.3.1"; sha256="1lbymf7kh3jag7qhb873mw2g66xp1589w2linp0r7kx0ia86rqd3"; depends=[codetools DBI digest]; };
+  MonetDBLite = derive2 { name="MonetDBLite"; version="0.4.1"; sha256="082589ywbg7bjkivymwprx24jnxdcb4xnh0ax64h4xhzfynbw93a"; depends=[codetools DBI digest]; };
   MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; };
   MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; };
   MonoPoly = derive2 { name="MonoPoly"; version="0.3-8"; sha256="1dd2m4c726j94cxwsma33sc166c9656m7sl2b29bg6i0bmpvpmd2"; depends=[quadprog]; };
@@ -1956,7 +2005,7 @@ in with self; {
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
   MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
   MotilityLab = derive2 { name="MotilityLab"; version="0.2-5"; sha256="080j548sp1c4yqqd7p7zgr70j1xyrw3fgjj1f521sgh84x5h2hbc"; depends=[ellipse]; };
-  MplusAutomation = derive2 { name="MplusAutomation"; version="0.6-4"; sha256="151d2iq9v8d584ascpkjp9wjldc7n25wma14nn2wgcxwdh2nglpi"; depends=[boot coda gsubfn lattice pander plyr texreg xtable]; };
+  MplusAutomation = derive2 { name="MplusAutomation"; version="0.7"; sha256="0xnipvfib16ycxglqnr5x0h19km0sw966w1xhaxw2ii6cm82ks0l"; depends=[boot coda digest gsubfn lattice pander plyr texreg xtable]; };
   Mposterior = derive2 { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; };
   MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
   MuMIn = derive2 { name="MuMIn"; version="1.15.6"; sha256="08qac7d1w367wjsz7n9ydziacbf8np8w8mm9izbxd4pk3ibxwi5a"; depends=[Matrix]; };
@@ -1987,7 +2036,7 @@ in with self; {
   Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
   NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; };
   NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; };
-  NAM = derive2 { name="NAM"; version="1.5.1"; sha256="0k3dkkrisqx71srma4lwkyk1rayhyjr0h91lzx3l2yal9r12flpc"; depends=[randomForest Rcpp]; };
+  NAM = derive2 { name="NAM"; version="1.5.3"; sha256="1z6gw53y8w98krh92l0a83wnfnw14g8di4q3qz2hc2kn6834s8lq"; depends=[randomForest Rcpp]; };
   NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; };
   NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
   NB_MClust = derive2 { name="NB.MClust"; version="1.1.1"; sha256="0hzmrszxgx3pylf9pjjwk2ryjhwz7naxxkhcqpnfjv337vv5dg0i"; depends=[MASS]; };
@@ -2003,13 +2052,12 @@ in with self; {
   NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; };
   NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; };
   NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; };
-  NHMM = derive2 { name="NHMM"; version="3.7"; sha256="0h6m01y42yswjgx3cfj4xwj0wq9nw0gzjz7vf9prm3vag3wnfs2q"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; };
   NHMSAR = derive2 { name="NHMSAR"; version="1.5"; sha256="1s94icc99b9vaaypxy5q4pnid1kqmh4xx4p7yb52i9zizpw9sr90"; depends=[caTools glasso lars ncvreg SIS ucminf]; };
   NHPoisson = derive2 { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; };
   NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; };
   NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
   NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; };
-  NLP = derive2 { name="NLP"; version="0.1-10"; sha256="1jq9nhm2dzm0ppwlrxgbwk92dh1zwhcxjn13zaw8naiz8zffba63"; depends=[]; };
+  NLP = derive2 { name="NLP"; version="0.1-11"; sha256="15v50gxzmpqx49wzkwxfpb5xjpg9y829a0ifys372kf1cfj521aq"; depends=[]; };
   NLPutils = derive2 { name="NLPutils"; version="0.0-4"; sha256="1dqbf8xmrzx81ybmp5qkd5a5rw3c19l2wxfnpddij4a1n074bwym"; depends=[NLP qdap SnowballC]; };
   NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
   NMF = derive2 { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
@@ -2017,7 +2065,7 @@ in with self; {
   NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; };
   NMOF = derive2 { name="NMOF"; version="0.40-0"; sha256="1zxbhpcl82v0wvp4dfpavwckvfyd2a9f4pbghk4mgqi0vhl8fgpz"; depends=[]; };
   NNLM = derive2 { name="NNLM"; version="0.4.1"; sha256="1wi2rbj56v49hsnhwdyyjwfk4hb84sagfq6mpjis4ccq65hxkvfv"; depends=[Rcpp RcppArmadillo RcppProgress]; };
-  NNS = derive2 { name="NNS"; version="0.3.4"; sha256="1bxnpssl98bvf19yb69s42m0hm6n1vi6sncc4kq0d79b34f8ryrd"; depends=[data_table rgl stringr]; };
+  NNS = derive2 { name="NNS"; version="0.3.6"; sha256="01ahwpid9xc5ivzs7qgys92a63gw1hvlya4vz8mgwq5m4qrp0c4a"; depends=[data_table rgl stringr]; };
   NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; };
   NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; };
   NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
@@ -2033,13 +2081,14 @@ in with self; {
   NPMPM = derive2 { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; };
   NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
   NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
-  NPflow = derive2 { name="NPflow"; version="0.12.0"; sha256="0vdnhwls80yaqh9mnfprks4l609jf4vcic1x99rji1gjmawhs93r"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; };
+  NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; };
   NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
   NSA = derive2 { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[aroma_affymetrix aroma_core DNAcopy MASS matrixStats R_methodsS3 R_oo R_utils]; };
   NSM3 = derive2 { name="NSM3"; version="1.9"; sha256="0ianzczznigkbialzdm43w9wkgnsx24393v7hnxcvxqczzhl795h"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
   NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
   NScluster = derive2 { name="NScluster"; version="1.1.1"; sha256="1w63abh4q0wgv3x7inl2xyp9qgr9m223r2p7nfiqnxk9y259kh04"; depends=[]; };
   NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4"; sha256="00zdwm722v625dyya323jlipicpmfxvzxxf072x3fn4b97xc8h8n"; depends=[snowfall]; };
+  NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; };
   NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.1.21"; sha256="1rbmhk5kags3mm4znakfp1c7axdpv4gmh2h0sydvyc2dm1vds5k4"; depends=[gdata vsn]; };
   NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; };
   NeatMap = derive2 { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; };
@@ -2056,9 +2105,9 @@ in with self; {
   NetSim = derive2 { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; };
   NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; };
   NetWeaver = derive2 { name="NetWeaver"; version="0.0.2"; sha256="0wsmz7db8q2fycz6rfbbfs67ccj857y9zs4d80k1gnqazgj5whkn"; depends=[]; };
-  NetworkChange = derive2 { name="NetworkChange"; version="0.2"; sha256="1awy3bym0l72jr17x0pm1mhrv0fh2s42813rff10b3jjgis193gq"; depends=[abind ggplot2 LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; };
+  NetworkChange = derive2 { name="NetworkChange"; version="0.3"; sha256="1brpa6fhmrgafmk1iw19g0pppwxi0ld0nyhx9c0fgnkn9m82isjk"; depends=[abind ggplot2 ggvis LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; };
   NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.0.1"; sha256="09fqlnpdibf9jr5mw2pzmwi66f6cjz8rmm8jay0cv2bami7jhy2a"; depends=[IsingFit IsingSampler qgraph reshape2]; };
-  NetworkInference = derive2 { name="NetworkInference"; version="1.1.0"; sha256="1ilw4achdpb7xkvr23750vj6qlf0k6wv42x77h6ygvkqsb9mzqhz"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp]; };
+  NetworkInference = derive2 { name="NetworkInference"; version="1.1.1"; sha256="053p7cpzmr2jwrgmdlwvipv5vfhvy52xw0xc51lnd4yiwmv4y5l0"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp]; };
   NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; };
   NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.0"; sha256="04r0716vlv54cjybxspq61ahb12f2i8krhils5layr436k7slm07"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; };
@@ -2068,20 +2117,22 @@ in with self; {
   NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; };
   NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; };
   NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
-  NonCompart = derive2 { name="NonCompart"; version="0.3.0"; sha256="0c6sdsigfmkan1q728n6v3s2lyg0y24cdbl7xdjfgdwsvg67kbdb"; depends=[]; };
+  NonCompart = derive2 { name="NonCompart"; version="0.3.3"; sha256="0f66p122rdibn8k79wjhvslgankhxk4dq9sfvq0gcabmi1skfqgq"; depends=[]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; };
   NormPsy = derive2 { name="NormPsy"; version="1.0.5"; sha256="0zhv6p9ffm2g02nr302j3qc6mrk5n4xxznircgbp4jx7hcj7cf1m"; depends=[lcmm]; };
   NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; };
   NormalLaplace = derive2 { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; };
   NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; };
   Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
-  OAIHarvester = derive2 { name="OAIHarvester"; version="0.2-2"; sha256="0r3yz8x123f0p9d165074ylnmf3hkyyc4h1758018m9iqj5cqp2h"; depends=[curl XML]; };
+  OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; };
+  OBRE = derive2 { name="OBRE"; version="0.1-0"; sha256="1sxfb8mn0ky8x177l3v6wwcr96h5hfwd718h1akwrpir7acldchl"; depends=[pracma]; };
   OBsMD = derive2 { name="OBsMD"; version="0.2-0.00"; sha256="16km0v6678lbgh9n2d9nvmpq6k7d2gicc68wnfy4kvn9vmpr79cz"; depends=[Rcpp]; };
   OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; };
   ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
   ODMconverter = derive2 { name="ODMconverter"; version="2.3"; sha256="07j9p2hfx3almd5n3j0clc1alj5wzrnzljd9w13bbd6nrvil1krm"; depends=[xlsx XML]; };
   OData = derive2 { name="OData"; version="0.6"; sha256="10r4kfhdabramjmkgc4fl0bljaiqbvc7rq4byas7q8cmji2czw6f"; depends=[RJSONIO XML]; };
   OECD = derive2 { name="OECD"; version="0.2.2"; sha256="07flhhca7734fffcqvxjl1hlhbbhn6lch868rlpps0r99jxy8m5q"; depends=[httr rsdmx xml2]; };
+  OHPL = derive2 { name="OHPL"; version="1.3"; sha256="0hm229nyv96s3sjljn5rwh89g1n6wsf24qm3ll5ccb0q2pcwnd7r"; depends=[glmnet mvtnorm pls]; };
   OIdata = derive2 { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; };
   OIsurv = derive2 { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[KMsurv survival]; };
   OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
@@ -2109,17 +2160,17 @@ in with self; {
   OjaNP = derive2 { name="OjaNP"; version="0.9-9"; sha256="12a7zfrk3rdvfby5qa511w3nk5jpnsd5gg2z46b5s97rxb3qq7za"; depends=[ICS ICSNP Rcpp]; };
   OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; };
   OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; };
-  OmicsPLS = derive2 { name="OmicsPLS"; version="1.0.1"; sha256="0bvlk1zl7jbniwjmbhxc6wbqqk5da9bvh5l6q6xkp7n8707h06h5"; depends=[ggplot2]; };
+  OmicsPLS = derive2 { name="OmicsPLS"; version="1.0.3"; sha256="0i8vc4lg642pgy934hv1nln91g5s15la0328bbs530fx6c2132dz"; depends=[ggplot2]; };
   Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
   OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="0.1.6"; sha256="0whd5vwaqhvv5qmryzh7nh5skc4lv740ziha7vxfpb91ph0mgrz8"; depends=[Rcpp]; };
   OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; };
   OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
-  OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[digest ggplot2 httpRequest plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
+  OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
   OpenCL = derive2 { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
   OpenImageR = derive2 { name="OpenImageR"; version="1.0.6"; sha256="0mp79l2yaix4pagvjv41z01arpw2qpx1mzib82vklsbb7g85k1z2"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; };
-  OpenML = derive2 { name="OpenML"; version="1.4"; sha256="03xfqy52ml1dqwc5awy2ra0jw2bsr2r86j8qfd7v518w8487jh3f"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
+  OpenML = derive2 { name="OpenML"; version="1.6"; sha256="0khcach9myls6nfqm308nvhv8ylzysg2v3aw8l79ajfmdp83s1am"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
-  OpenMx = derive2 { name="OpenMx"; version="2.7.12"; sha256="0b4impl2wy17dmhv5xzh701gzy9yfrb94a30k9bpih3kvf02yvbc"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
+  OpenMx = derive2 { name="OpenMx"; version="2.7.16"; sha256="1jpx8z1ql8phh59kvb4jc7pd65b6mxrg61sdk8kx8pkw22qh8fip"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
   OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.10"; sha256="0ikw8l9hffcaa094y6pnvyc3ly5jb02djaakz668ba15a0yw0wmb"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
   OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.3"; sha256="099vdyq0vw9xl5v7zggdb8yd4zl7x8imvvbj5j2f5hrspgg131pz"; depends=[ggplot2 raster rgdal rJava sp]; };
   Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; };
@@ -2135,7 +2186,7 @@ in with self; {
   OrdMonReg = derive2 { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; };
   OrdNor = derive2 { name="OrdNor"; version="2.0"; sha256="1zr8zzigrbf6r0zz4f0za6my6d67wxqzvmabl36pjxc3sq7jh83j"; depends=[corpcor GenOrd Matrix mvtnorm]; };
   OrdinalLogisticBiplot = derive2 { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[MASS mirt NominalLogisticBiplot]; };
-  OrgMassSpecR = derive2 { name="OrgMassSpecR"; version="0.4-6"; sha256="1xihaq8vxc9s6b37bydavg3xxnzbn96l85b1bz2mq5m6snpp8ra0"; depends=[]; };
+  OrgMassSpecR = derive2 { name="OrgMassSpecR"; version="0.5-3"; sha256="1dx9d8rb1dfqyhyc26zhfnxiv3rz2ikvs2mwqnsrq3lsjs9dvyc8"; depends=[]; };
   OriGen = derive2 { name="OriGen"; version="1.4.3"; sha256="0a7mql87dqxrfx7phgy32hbanfwnjx8x52mj83xf2mgmqhrcikr6"; depends=[ggplot2 maps]; };
   OrthoPanels = derive2 { name="OrthoPanels"; version="1.1-0"; sha256="1g78abh9i3x0g34vjqz2ic9330rbgn8k0hgdcrznxgsfnlgnpx9x"; depends=[MASS]; };
   OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-14"; sha256="03bdb7w5nsrjxz5kd5zvgwybgmv2mzsxyzdc7v3kpwi20yfb9ax8"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; };
@@ -2144,9 +2195,9 @@ in with self; {
   OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
   OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; };
   P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; };
-  PAC = derive2 { name="PAC"; version="1.0.8"; sha256="1prsvlvhv46izvxlrfrw2hg5rily5qpkmjb6vg2wcvikb4yyyzwd"; depends=[dplyr igraph infotheo parmigene Rcpp]; };
+  PAC = derive2 { name="PAC"; version="1.0.9"; sha256="1757wpy92hhk1gpzm719kkhh31qkn0a2cbagyn3pnx5vklywfzz1"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
   PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; };
-  PAFit = derive2 { name="PAFit"; version="1.0.0.0"; sha256="0xlil8hq0dffvycfljgwa6p8mhjawsz2vkmb8zw2kcy37xs8a7c2"; depends=[igraph magicaxis MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
+  PAFit = derive2 { name="PAFit"; version="1.0.0.1"; sha256="12cq692wfvakyhxqjjzcvrwy7yclki7pqn6k507hd44ka3lva3nl"; depends=[igraph magicaxis MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
   PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; };
   PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; };
@@ -2169,7 +2220,7 @@ in with self; {
   PBSmodelling = derive2 { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; };
   PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; };
   PCADSC = derive2 { name="PCADSC"; version="0.8.0"; sha256="0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir"; depends=[ggplot2 Matrix pander reshape2]; };
-  PCAmixdata = derive2 { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; };
+  PCAmixdata = derive2 { name="PCAmixdata"; version="3.0"; sha256="03das7hwfhssixz8rzwvawvl8hmvqcbmf6l0rr8v0mmnh26dssxp"; depends=[]; };
   PCDSpline = derive2 { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; };
   PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; };
   PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; };
@@ -2189,6 +2240,7 @@ in with self; {
   PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; };
   PGICA = derive2 { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; };
   PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; };
+  PGRdup = derive2 { name="PGRdup"; version="0.2.3.2"; sha256="1m6511bgml76gb3pc8dgq3i30sci1hnayhmxq62farzdcd4wxnfs"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; };
   PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; };
   PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
   PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; };
@@ -2198,6 +2250,7 @@ in with self; {
   PK = derive2 { name="PK"; version="1.3-3"; sha256="07qxyszj0f7qwrg5ixvciy33mjsfxxi9rk32a1fz46z8wiwfil9i"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-3"; sha256="1xhc84k4iszvfawwwzrwclfs41nvb8bmyygapxmsxjky725s7k1g"; depends=[base64enc]; };
   PKNCA = derive2 { name="PKNCA"; version="0.8.1"; sha256="1by2yp1ngqv06w7dfl7lbb80gnmpid4xg1yhk4zvx8bwss0ggzph"; depends=[digest dplyr lattice nlme plyr tidyr]; };
+  PKPDmisc = derive2 { name="PKPDmisc"; version="2.0.0"; sha256="0rn5m5wak6lis5wck2ws934bzy8w65wj1d0l3rz8svfd8agf2ys8"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; };
   PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
   PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
   PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
@@ -2205,18 +2258,19 @@ in with self; {
   PLMIX = derive2 { name="PLMIX"; version="1.0"; sha256="1z59z7ynlfh7cskanj7drvry0fpzl5mq52as8adi2zxp2q8q032p"; depends=[abind combinat foreach FSA rcdd Rcpp]; };
   PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
   PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
+  PLmixed = derive2 { name="PLmixed"; version="0.1.0"; sha256="1xg5zg646ihm7cnpi77hkcvymvix4jagl77ysqi8j27z4jiak9gq"; depends=[lme4 Matrix numDeriv]; };
   PLordprob = derive2 { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; };
   PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; };
   PMCMR = derive2 { name="PMCMR"; version="4.1"; sha256="0mfms8wvdwcakkgsnrb2wawp07hvlr7s6cvl54kxv7f5fqllw5kc"; depends=[]; };
   POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; };
   POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; };
   POT = derive2 { name="POT"; version="1.1-6"; sha256="08av53rnishk3mhwrb6ydbgc3n9nwi87jlx5vmag3vpiidhn1laj"; depends=[]; };
-  POUMM = derive2 { name="POUMM"; version="1.3.0"; sha256="0ylpmlfp50lhxwii96cxg3mpixribfr83wgy5p8nh3vhyyca04cn"; depends=[adaptMCMC ape coda data_table foreach GGally ggplot2 gsl Matrix Rcpp RcppArmadillo]; };
+  POUMM = derive2 { name="POUMM"; version="1.3.2"; sha256="0v7wgswgqikqlhz087qg75026saqd88ml1mxp375m5nab412ng3d"; depends=[adaptMCMC ape coda data_table foreach GGally ggplot2 gsl Rcpp RcppArmadillo]; };
   PP = derive2 { name="PP"; version="0.6.1"; sha256="10innn1nhc4zqimd0gww7k3k30jkfkkj89zkddcjqa2sqq5gs3xr"; depends=[Rcpp]; };
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.1"; sha256="02073yxdwns9mnnjvw13ydw1s3vrxl53szcd9jy8ibj78vnm57r3"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
   PRIMME = derive2 { name="PRIMME"; version="2.1-0"; sha256="1sjgy923ppp28qhkvhgv2xmx7b7aqd17g60af1my44ygdsd8c1kw"; depends=[Matrix Rcpp]; };
-  PRIMsrc = derive2 { name="PRIMsrc"; version="0.7.1"; sha256="10cfld73hb0cw4kkxyi5qj9mqm1fyg9ybw546r52v132j85vw7xh"; depends=[glmnet Hmisc quantreg superpc survival]; };
+  PRIMsrc = derive2 { name="PRIMsrc"; version="0.7.3"; sha256="0mppmgg435fjg33pxql67rygyr5nibvcac9q2nxgq9fqyya70gys"; depends=[glmnet Hmisc quantreg superpc survival]; };
   PRISMA = derive2 { name="PRISMA"; version="0.2-6"; sha256="1yzcx4js0xaxp1mp7ginhfz8jji49rkw3x15a9mlmpz260gkfs98"; depends=[ggplot2 gplots Matrix]; };
   PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.0.1"; sha256="1qk9cljk52m8rcasck8cl7gwzhcsx0p58jn31izy2j027w0rns7j"; depends=[DiagrammeR]; };
   PROFANCY = derive2 { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; };
@@ -2231,10 +2285,11 @@ in with self; {
   PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
   PSCBS = derive2 { name="PSCBS"; version="0.63.0"; sha256="0pgha1rvb9nfxkr8fxc17zgws781qwmrl01rss7bd0sf2n2lw2k2"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; };
   PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; };
+  PSIMEX = derive2 { name="PSIMEX"; version="1.0"; sha256="0py58x1sqxdas8ny6dqj0x9wcpglyxl6v70wwd68z30w1ppyiq13"; depends=[knitr MCMCglmm pedigree plotrix]; };
   PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; };
   PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; };
   PTE = derive2 { name="PTE"; version="1.5"; sha256="1wx90b34yrc2rwg6yh2hiivirp1c1357h276jzjc0kzchkkxv4g2"; depends=[doParallel foreach survival]; };
-  PTXQC = derive2 { name="PTXQC"; version="0.82.6"; sha256="0afq7yk1sj8jfqgrnzidarw1j46dh9lpbvifhgjj5qprqpbaffqr"; depends=[data_table ggdendro ggplot2 gridExtra gtable plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; };
+  PTXQC = derive2 { name="PTXQC"; version="0.90.0"; sha256="1jcx864skn1p9y7v951grm7n8waby8wkqahhnyb2r51qj3zdlilf"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; };
   PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; };
   PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; };
   PWEALL = derive2 { name="PWEALL"; version="1.1.0"; sha256="0k66wzyvy89zfnsyrgbj5vr4w6c008lw2jlfkrm11l01vvgy7wgf"; depends=[survival]; };
@@ -2260,10 +2315,11 @@ in with self; {
   PdPDB = derive2 { name="PdPDB"; version="1.0"; sha256="1rnphdklyzznpzf57gwlnr498612d54kl5jkqnza6h8if7nqr4kd"; depends=[plyr]; };
   Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; };
   PeakError = derive2 { name="PeakError"; version="2017.06.19"; sha256="1d4v7s478zjz42dm6ps4nnqqyyqv84dgmzn1bp1a4qwnfv9vmfg7"; depends=[]; };
-  PeakSegDP = derive2 { name="PeakSegDP"; version="2017.06.20"; sha256="0zr0hn4zn3pbql6aamlx3yialqhdbzp069diprlnri7n1rqy7h2r"; depends=[]; };
-  PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2017.06.20"; sha256="0f1xlx3mq1m6dgvc1fpdzvsxl5z0asq19yyh5cxrq98igbl51xyj"; depends=[penaltyLearning]; };
+  PeakSegDP = derive2 { name="PeakSegDP"; version="2017.08.15"; sha256="1ndf4d4ikcyqi0k51kil2jw777z4c1m4pda3dahrjmjyz0jhrhkw"; depends=[]; };
+  PeakSegJoint = derive2 { name="PeakSegJoint"; version="2017.08.11"; sha256="1xp0gxdwsy6z06kbfg5ca2qm0kwva8scxbg22km20cikwpgdi6rm"; depends=[data_table PeakError penaltyLearning]; };
+  PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2017.07.12"; sha256="0bpwm2n2wz707ykgd088zadi5jmixkwxx6822b6l6qw67x85pfyc"; depends=[penaltyLearning]; };
   Peaks = derive2 { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; };
-  PearsonDS = derive2 { name="PearsonDS"; version="1.0"; sha256="1fnlkadq53vl0gn3b066kvxh1s3pljkpxlpfbyp8jcyp8gxm6i8n"; depends=[]; };
+  PearsonDS = derive2 { name="PearsonDS"; version="1.1"; sha256="0rqh9ji0bah3n1c6fcg7krgqs65qla9p3xrnc4jr7va6ph104im9"; depends=[]; };
   PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
   PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   PeerPerformance = derive2 { name="PeerPerformance"; version="2.1.2"; sha256="07as5csvrlr3a55miadhbcvjrjag7g69wxmb8z7rpipppa8f9q7y"; depends=[lmtest sandwich snow]; };
@@ -2282,7 +2338,7 @@ in with self; {
   PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; };
   PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
   PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
-  PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.1.2"; sha256="01ngkwbnyv0zqbjn75lfhncg829kixq3l4dg1570nz5g42n9azky"; depends=[mvtnorm optparse plyr R_utils Rcpp snpStats]; };
+  PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.1.3"; sha256="1gjhrdy3pd9y13akqcfp50h241lvlyxsrzd860jg11x7hgkzhzb1"; depends=[mvtnorm optparse plyr R_utils Rcpp snpStats]; };
   Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; };
   PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; };
   PhySortR = derive2 { name="PhySortR"; version="1.0.7"; sha256="1xpxkd2bf3xdsfwa0bzkppr6y7p6v7s4iy0x0m8fiwj93n9jh0pz"; depends=[ape phytools]; };
@@ -2308,6 +2364,7 @@ in with self; {
   PoisNonNor = derive2 { name="PoisNonNor"; version="1.3"; sha256="0p39sad9wiwrhgg9vdx0gzgd4kf2wwxjzmyav04q8ijbmqp0mjbw"; depends=[BB corpcor MASS Matrix]; };
   PoisNor = derive2 { name="PoisNor"; version="1.1"; sha256="0z5h8rdb7kjqzasrdvkpkvwv05rfazv92cza8pln1qrvi6cdk5f3"; depends=[corpcor Matrix mvtnorm]; };
   PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
+  PoloniexR = derive2 { name="PoloniexR"; version="0.0.1"; sha256="1qik272z5lmzv9k1kfr5v0m8sydbdhbrc732n1zpwnqc1spfqb20"; depends=[anytime digest httr jsonlite RApiDatetime xts zoo]; };
   PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; };
   PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; };
   Polychrome = derive2 { name="Polychrome"; version="0.9.3"; sha256="1baf231skpmy673d3nxkw2r8ai38a1npwpa42ssijz476kmy0ii2"; depends=[colorspace rgl]; };
@@ -2316,7 +2373,7 @@ in with self; {
   PopED = derive2 { name="PopED"; version="0.3.2"; sha256="1lvzqpij4dqbw144ya25bhlx96mwaxz932r0bl3jsx1si9ijb8xz"; depends=[codetools dplyr ggplot2 MASS mvtnorm]; };
   PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
   PopGenReport = derive2 { name="PopGenReport"; version="3.0.0"; sha256="0z4g7ll3dk9mgawnn7k0ysgj8w55adivc4zcrr898x399g7vnfx4"; depends=[ade4 adegenet calibrate data_table dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; };
-  PopGenome = derive2 { name="PopGenome"; version="2.2.3"; sha256="1v8gwsp45vbqrbvcg4z6s29mnqii7a0cjm4df8y6lyh296xqma7w"; depends=[ff]; };
+  PopGenome = derive2 { name="PopGenome"; version="2.2.4"; sha256="1l0c8p1vpj4zbbgjcnjzdiryfzfl6ad070sp54q83k7iaracmqzd"; depends=[ff]; };
   PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; };
   PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; };
   PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; };
@@ -2326,11 +2383,12 @@ in with self; {
   PottsUtils = derive2 { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
   PoweR = derive2 { name="PoweR"; version="1.0.6"; sha256="0p2v07wp1hqmmbf7b3mh0v4n5hbbcms9xkdhjzdfxkkbafxybc24"; depends=[Rcpp RcppArmadillo]; };
   Power2Stage = derive2 { name="Power2Stage"; version="0.4-5"; sha256="0wjry83dkrnl6bblb0688hx5ihwwkya05dwb9nrnv39033ksd0a9"; depends=[mvtnorm PowerTOST]; };
-  PowerNormal = derive2 { name="PowerNormal"; version="1.1.0"; sha256="1zwm8lwix2bnimp3srl0cv1j8fi8asf956f35dmp9y047lsn3a9i"; depends=[]; };
-  PowerTOST = derive2 { name="PowerTOST"; version="1.4-5"; sha256="1jlf12cifgs06s1yr7pcvs3h9zxvzbz7f6x74pkypi7rzydnpxqs"; depends=[cubature mvtnorm TeachingDemos]; };
+  PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; };
+  PowerTOST = derive2 { name="PowerTOST"; version="1.4-6"; sha256="0fy9g1zkkxx45pz7axyhv9v9yajfwi19pxcr2bc9dih3j41kazjr"; depends=[cubature mvtnorm TeachingDemos]; };
   PowerUpR = derive2 { name="PowerUpR"; version="0.1.3"; sha256="1znhkyxl8qrs288zf0cr6sxgq6ir029fmilda0k73scc6k1jxz7f"; depends=[nloptr]; };
-  PracTools = derive2 { name="PracTools"; version="0.4"; sha256="1klknzbpgjyvrws6d7gwrdmglc16xag3pa3i8rk0zg62wvyb4l1v"; depends=[]; };
+  PracTools = derive2 { name="PracTools"; version="0.6"; sha256="0y6gqqk2inq96afr50qwv19bwjc0kyvd1jnmacsda2fxgplflzgx"; depends=[]; };
   PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; };
+  PreProcess = derive2 { name="PreProcess"; version="3.1.4"; sha256="0zvy7wx9wfsdcvnjdr1angh0shqwhlm48byc0ymciqlx6xagaw0b"; depends=[oompaBase]; };
   PredPsych = derive2 { name="PredPsych"; version="0.2"; sha256="1fppjwh1g2irxafaaid2y7ln1psii7kx369jbnl63kadmpd36q7p"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; };
   PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
   PredictTestbench = derive2 { name="PredictTestbench"; version="1.1.3"; sha256="14np4zvr0labhqxzsv07iqzldfxmnsfk91qpfqz7vyiq0vwcymp4"; depends=[forecast ggplot2 imputeTestbench PSF reshape2]; };
@@ -2348,7 +2406,8 @@ in with self; {
   ProfessR = derive2 { name="ProfessR"; version="2.3-5"; sha256="0q04mjfr2g2l2md8c7nampivg6z4wjv6nfcq13b94sgixak0ww6f"; depends=[RPMG]; };
   ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; };
   ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; };
-  ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.7"; sha256="0jf8r9lbczvjvnzf15lz6fm31naxm1fpqni88484yrd6vpxjacq6"; depends=[]; };
+  ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.8"; sha256="0kagahw30m0drlda75hgwbpp7cqrxyf1512ar56qlgm8z73hab3n"; depends=[]; };
+  ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.4"; sha256="0h11gn09wd2mw3gawc6k6pqjpxldy7i3qdkgck8zqpvkvx5m41a4"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; };
   ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.0"; sha256="1baf4v9c2pqqmlgxs1jf7fhwqbsw0l1g7rdiia21acxix2j3b7wj"; depends=[]; };
   PropCIs = derive2 { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh6827f5r7gdhajx1iwp5fggdlm808hgq7"; depends=[]; };
   PropClust = derive2 { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[dynamicTreeCut flashClust]; };
@@ -2358,6 +2417,7 @@ in with self; {
   PsiHat = derive2 { name="PsiHat"; version="1.0"; sha256="0an71x75j6ih55alxp7kfwi0qf4z3y5bwswrjk01z2w4b9glacqh"; depends=[qvalue]; };
   Pstat = derive2 { name="Pstat"; version="1.0"; sha256="13mm5jk3frl74sm988q8yazm790wlx2npf2cav6h5rb8ck637ffb"; depends=[]; };
   PsumtSim = derive2 { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; };
+  PsyControl = derive2 { name="PsyControl"; version="1.0.0.0"; sha256="1c5ml6s3c8kzf7p0mig84bmq40b0491ah713bm6jpy2s3nwnmafs"; depends=[irtoys ltm]; };
   PtProcess = derive2 { name="PtProcess"; version="3.3-12"; sha256="14d39xxgkqnqq79v9sp6g9csj2rp6pix2hzg9acjdmw1xyadn71h"; depends=[]; };
   PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; };
   PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.4"; sha256="04gc0vypmdrls967idhvzkwbm374awr2wkg6dsbkizjahf2n3v0p"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
@@ -2377,16 +2437,16 @@ in with self; {
   QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
   QGglmm = derive2 { name="QGglmm"; version="0.5.1"; sha256="1112w9dwbr9smxa869w4833iw1vclscr1zbjn2f0xklnpn3nb40d"; depends=[mvtnorm R2Cuba]; };
   QICD = derive2 { name="QICD"; version="1.2.0"; sha256="0ppyl978y7md2n9m4kwhbrgdr5i3df0yw124x84f53w4acipgz5q"; depends=[]; };
-  QNB = derive2 { name="QNB"; version="1.1.8"; sha256="1czky811x79a54sq6p7vfpci6hvj49flvbyd20wk9fpsw1rrska7"; depends=[locfit]; };
+  QNB = derive2 { name="QNB"; version="1.1.9"; sha256="1358h00qnxd0c6yg9dwi1qp7svd9avyvfww1xji95xazfx4ksl59"; depends=[exomePeak GenomicFeatures locfit Rsamtools]; };
   QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; };
   QPot = derive2 { name="QPot"; version="1.1"; sha256="1ivkk5wdd1lp6v4hwmpr9g230kd7zgmj0vnv5fw0svwpb8zzz14x"; depends=[MASS]; };
   QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; };
   QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; };
   QRM = derive2 { name="QRM"; version="0.4-13"; sha256="0zxhm1bdbs4jizd909vw9yjdn484vmcrwcmpk3a7gr4142q9kdjh"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; };
   QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; };
-  QRegVCM = derive2 { name="QRegVCM"; version="1.0"; sha256="15fgmgwp9b4bjk46c3myfvq7ipl0qyfqslmf4ha184vi7s600ymj"; depends=[quantreg SparseM truncSP]; };
+  QRegVCM = derive2 { name="QRegVCM"; version="1.1"; sha256="01dhc0r1nialwv7dp2108znyc3ip1hswkcbpf3kmabxxj5y4vyvx"; depends=[quantreg SparseM truncSP]; };
   QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
-  QTLRel = derive2 { name="QTLRel"; version="0.2-15"; sha256="15wli0mpcmp7vc4jwp393w0qfm5g5n8dj724j38s711ir98w660b"; depends=[gdata lattice]; };
+  QTLRel = derive2 { name="QTLRel"; version="0.2-17"; sha256="0csn7xijzdw9wnsd7ilm3fjn2zrv87i8dqwvkm9d7qs5ssxsi44v"; depends=[gdata lattice]; };
   QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
   QVM = derive2 { name="QVM"; version="0.1.1"; sha256="0dnr4h4084n505vrxfrx3czrkqdbna8s4fxpwr5czfilbfbxhpar"; depends=[gWidgets IMPACT ltm multilevel mvtnorm nlme pander psych]; };
   QZ = derive2 { name="QZ"; version="0.1-6"; sha256="1vgqwv3rbnmz2sgbmbivgnxcwy5dzgk6ivqskdnqkil4f10zflmi"; depends=[Matrix]; };
@@ -2400,7 +2460,7 @@ in with self; {
   QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
   QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
   QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.4"; sha256="1dqibl4rnf1qbk44srh8ndka0ni7a463hlpf7sdpgx2b57414jkd"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
-  QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[edgeR mgcv pracma]; };
+  QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-1"; sha256="05d47cc632sgi0bjwx408dq0nx7ylkf3l6ln4bf191l40hr1r4j7"; depends=[edgeR mgcv pracma uniqueAtomMat]; };
   R_cache = derive2 { name="R.cache"; version="0.12.0"; sha256="006x52w9r8phw5hgqmyp0bz8z42vn8p5yibibnzi1sfa1xlw8iyx"; depends=[digest R_methodsS3 R_oo R_utils]; };
   R_devices = derive2 { name="R.devices"; version="2.15.1"; sha256="09gmzb87n1ybqwyp4jdpih3w3s7nqkr4hd1qhcqr57kp2pj9jp9x"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
   R_filesets = derive2 { name="R.filesets"; version="2.11.0"; sha256="0hjmd86zqsd9v17ma9r734pk9b0k53ayb52w5mm19d9hnl3wnv08"; depends=[digest future R_cache R_methodsS3 R_oo R_utils]; };
@@ -2414,6 +2474,7 @@ in with self; {
   R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; };
   R2BayesX = derive2 { name="R2BayesX"; version="1.1-0"; sha256="043hrznc16j6mkr3h9vjvi9yn6xn497xz5pjp53ks48pzz54jp9p"; depends=[BayesXsrc colorspace mgcv]; };
   R2Cuba = derive2 { name="R2Cuba"; version="1.1-0"; sha256="1zmlsambajzxkc9dawlqb0png8s502hwblq0vyhqgc08yf29b43w"; depends=[]; };
+  R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; };
   R2G2 = derive2 { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; };
   R2GUESS = derive2 { name="R2GUESS"; version="1.7"; sha256="07w54r5r9v7pa8aklmwbwdcc57j3a3b46b1a7mwmzcl11mcfwdph"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; };
   R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; };
@@ -2443,6 +2504,7 @@ in with self; {
   RANN_L1 = derive2 { name="RANN.L1"; version="2.5"; sha256="0sjf92hdw9jczvq1wl5syckhvik7wv0k9vrrgw4nnnsabc25v9pf"; depends=[]; };
   RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
   RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
+  RATest = derive2 { name="RATest"; version="0.1.0"; sha256="1pi082iydl6k6l78gpvff5hfk4y7fr82vnhnp28dw215hi0x3891"; depends=[ggplot2 gridExtra quantreg]; };
   RAdwords = derive2 { name="RAdwords"; version="0.1.12"; sha256="0g2lbrqqh3azyc2xlafgqnd1langjg8xhma1njjcd3jn7q21mhnk"; depends=[RCurl rjson]; };
   RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.3"; sha256="0g5sdq6sl7cvsj9fgqhcdxjkrfi53078r0mbzvf69cvz38y5x3sm"; depends=[]; };
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
@@ -2451,6 +2513,7 @@ in with self; {
   RAtmosphere = derive2 { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
   RBMRB = derive2 { name="RBMRB"; version="2.0.4"; sha256="0l6w3j4dykxd5r3h3qj7hsz77657bhif7qk020hvmcg17jszr9a2"; depends=[data_table ggplot2 httr plotly rjson]; };
   RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
+  RBesT = derive2 { name="RBesT"; version="1.2-3"; sha256="1d6m3r8amcw9rvivzgxgvsqjxq3xq78z2s29f20r6dxfl7wl7d99"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 lme4 mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
   RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; };
   RCALI = derive2 { name="RCALI"; version="0.2-18"; sha256="1d9pgkkghkzciawlzlggqk6qp9bh0akwgh1hc47akcnjvqlvxjd2"; depends=[splancs]; };
   RCEIM = derive2 { name="RCEIM"; version="0.3"; sha256="1kil5r88b6lf8vxmswz0wn0hhjxjm8jmlcl5kxjwl6fwjyy2z120"; depends=[]; };
@@ -2466,13 +2529,12 @@ in with self; {
   RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; };
   RCurl = derive2 { name="RCurl"; version="1.95-4.8"; sha256="1yrbm8sypizy18qxkl6534fk2gf2ijxhahw6qldk9v5v3cjl68p7"; depends=[bitops]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
-  RDML = derive2 { name="RDML"; version="0.9-6"; sha256="1qapzdfym49vwsxgcaxlkz0blqg95r50vdwd6w60zpxina4p0bs9"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
+  RDML = derive2 { name="RDML"; version="0.9-7"; sha256="03rh1ji473jj7sg53vr73lr9557wd9s3y7cn6450mjgalf9zfh7k"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
   RDS = derive2 { name="RDS"; version="0.7-8"; sha256="0lxnb6zd5lphs9d42pfdzx607w7iz1mpj3z8pb2ri3s4h011g1vn"; depends=[ggplot2 gridExtra igraph reshape2 scales]; };
   RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; };
   RDStreeboot = derive2 { name="RDStreeboot"; version="1.0"; sha256="10ry8rna450j389cplvyvgwljxa8lli7licwdin64b1kyzy2cdn7"; depends=[]; };
   RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
   RDieHarder = derive2 { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
-  RDocumentation = derive2 { name="RDocumentation"; version="0.8.0"; sha256="0k733c6b2ggwqry13ynnm9bmnrlf1sszya061wx2w52d3x378r2g"; depends=[githubinstall httr proto rjson]; };
   RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; };
   REAT = derive2 { name="REAT"; version="1.3.2"; sha256="1vp103jwq6zf3w6bn3xvbh4zcgsdrwiycp23ab8mj42axk8pw5li"; depends=[]; };
   REBayes = derive2 { name="REBayes"; version="0.85"; sha256="0r8fd43qrwfg38sg2xchl4p2lhyfwbaqbr0xs2zln720s6zcwgi6"; depends=[Matrix reliaR Rmosek]; };
@@ -2509,17 +2571,17 @@ in with self; {
   RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[httr lubridate]; };
   RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; };
   RGoogleFit = derive2 { name="RGoogleFit"; version="0.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; };
-  RGraphM = derive2 { name="RGraphM"; version="0.1.6"; sha256="0gb25ax7idp8p24j6a481lm1v5jvhx6abqcib4ipw0bz1giilzy7"; depends=[Rcpp RcppGSL]; };
+  RGraphM = derive2 { name="RGraphM"; version="0.1.9"; sha256="1rba0vymw0vgkd9wv4dfx1l8lja73sfjpdvqk2ggiaqcii12z2xh"; depends=[Rcpp RcppGSL]; };
   RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; };
   RGtk2 = derive2 { name="RGtk2"; version="2.20.33"; sha256="0d5r0lrkk1ixhln94pm6d5d88bqs0h8p2sdczb7r7ah007ffmhic"; depends=[]; };
   RGtk2Extras = derive2 { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; };
   RH2 = derive2 { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron rJava RJDBC]; };
-  RHMS = derive2 { name="RHMS"; version="1.1"; sha256="1hhf8hlx3c95zkvg3k8vzgi8fbh0ziwy1k02w3m1sa45nfm068dn"; depends=[Hmisc pso]; };
+  RHMS = derive2 { name="RHMS"; version="1.3"; sha256="0pp67p8i6nsh9nvxsd1m453735s0whlril8l640m888zl6a3463j"; depends=[Hmisc pso]; };
   RHPCBenchmark = derive2 { name="RHPCBenchmark"; version="0.1.0"; sha256="1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y"; depends=[cluster Matrix mvtnorm]; };
   RHRV = derive2 { name="RHRV"; version="4.2.3"; sha256="09rcf9da04195myh4mwva3hqcd483k0wwcn84jgbkj8a5z1zxqc6"; depends=[lomb nonlinearTseries tkrplot waveslim]; };
   RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; };
   RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; };
-  RIA = derive2 { name="RIA"; version="1.1.0"; sha256="0wfwbszaw30za0lhv3ldf99f580iw6sxxv9lxwcaccha1y6b4kfx"; depends=[oro_dicom]; };
+  RIA = derive2 { name="RIA"; version="1.2.0"; sha256="0fyp1rz8xwq8jvp208yp4kx6v7jxcnj8dm923ii9jciy25q4i20i"; depends=[oro_dicom]; };
   RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
   RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; };
   RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
@@ -2531,12 +2593,12 @@ in with self; {
   RJDBC = derive2 { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; };
   RJSDMX = derive2 { name="RJSDMX"; version="1.7"; sha256="13qd1ynxyyxsz11aiiqv47wlbygs5z3vsyw53fbcrcq4r34y4zx4"; depends=[rJava zoo]; };
   RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
-  RJSplot = derive2 { name="RJSplot"; version="2.1"; sha256="1wrm9kkr6j0czh1fsjakqi8a2wf4xjh0z2qhhy1j4bhr1c35kd2p"; depends=[]; };
+  RJSplot = derive2 { name="RJSplot"; version="2.3"; sha256="0wswfdr8ml0wrnspdkp2s8kqimq2pgkkyr86zw0p8m5brzm6cr27"; depends=[]; };
   RJaCGH = derive2 { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; };
   RJafroc = derive2 { name="RJafroc"; version="0.1.1"; sha256="1630f8nmpid5pax8gqxych8bqf8a1avgrk7yqisk3lf1yx3h68rq"; depends=[ggplot2 shiny stringr xlsx]; };
   RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
   RKEAjars = derive2 { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; };
-  RKEEL = derive2 { name="RKEEL"; version="1.1.21"; sha256="0rcbw4wbp1dg4hqrg6dmim7d4bsaa1j3rdffhkyz3in8hv76i0lq"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; };
+  RKEEL = derive2 { name="RKEEL"; version="1.1.22"; sha256="1k0xdy23za38lmav7hh9zchy9x61nkdm34s3cqrclzhf4nnlndfi"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; };
   RKEELdata = derive2 { name="RKEELdata"; version="1.0.3"; sha256="1imz5qsr04hkhblivax30jlvbvjxya6h0z9x7s0llgqssfxbawpy"; depends=[]; };
   RKEELjars = derive2 { name="RKEELjars"; version="1.0.15"; sha256="06wc4x6lhk9akaghqi5bfkfs3yxg29lbga074a5nwadiz2fbnmkv"; depends=[downloader]; };
   RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
@@ -2557,18 +2619,19 @@ in with self; {
   RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; };
   RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
   RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
-  RMark = derive2 { name="RMark"; version="2.2.2"; sha256="10qinncbvfkc1n6w5i4pc7zr4llc6jskq6p2m5783chxwrwzyjlj"; depends=[coda matrixcalc msm]; };
+  RMark = derive2 { name="RMark"; version="2.2.4"; sha256="1vns8bl3fnk6hkwmm0wl2c6lgyv3vabsk07kkxrxrl1nzy11wj3a"; depends=[coda matrixcalc msm]; };
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
   RMixpanel = derive2 { name="RMixpanel"; version="0.6-2"; sha256="09z00ryyk3jx1s7p2d1rzvg84qhybv58d1n3cvjcmj07bv1h2dj1"; depends=[jsonlite RCurl uuid]; };
   RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
-  RMySQL = derive2 { name="RMySQL"; version="0.10.11"; sha256="127a0f7hp0msiqqdjfpk3pz862rb4agrd71bdic2idwbs0w5wh6s"; depends=[DBI]; };
+  RMySQL = derive2 { name="RMySQL"; version="0.10.13"; sha256="1j0vr2l4s02cg2hzgr3pla96pjj4h85sxw28lidy58rg5awnsf82"; depends=[DBI]; };
   RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.1"; sha256="145wp9wz2ir1ni36zrp53qzpdh4vz5j0f9h27w1vljrll6v0mwck"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; };
+  RNAsmc = derive2 { name="RNAsmc"; version="0.1.0"; sha256="02r8y43hrhjyhmim2yf7s4c46q8ys6b8qla9vwjqpmx5104v5v5g"; depends=[RRNA]; };
   RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; };
   RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
   RNCEP = derive2 { name="RNCEP"; version="1.0.8"; sha256="0nkx33997c5rgc3ch5a2bb6rrw5xw1y71rliygw5k1ldi335rsm7"; depends=[abind fields fossil maps RColorBrewer sp tgp]; };
   RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; };
   RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; };
-  RNRCS = derive2 { name="RNRCS"; version="0.1.1"; sha256="1dmkvb63wacwnjl51si1zyx26z1p4jkrdrr7pgxp2zh3lp8gsa96"; depends=[magrittr rvest xml2]; };
+  RNRCS = derive2 { name="RNRCS"; version="0.2.0"; sha256="1wg7ld6g94wby5lagf68h19qgx2mf0pc8rfvmnz4fac7xpdsg9s8"; depends=[ggplot2 magrittr rvest xml2]; };
   RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; };
   RNeXML = derive2 { name="RNeXML"; version="2.0.7"; sha256="1q6ifqkypdj4hmm0f4mhwq8pidg4ba52c7k68527dk9rsrmiyjr6"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; };
   RNeo4j = derive2 { name="RNeo4j"; version="1.6.4"; sha256="197ykvcfw1160ir6m568a4ksszyv5vlis2r0aygi155iz04j0bwm"; depends=[httr jsonlite rstudioapi]; };
@@ -2585,7 +2648,7 @@ in with self; {
   ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
   RODBC = derive2 { name="RODBC"; version="1.3-15"; sha256="0m37b5ccdh4imbhmk7gj795fys2pcb9d0zx0xx2qanfrf54gk6kk"; depends=[]; };
   RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; };
-  RODBCext = derive2 { name="RODBCext"; version="0.3.0"; sha256="1w9n40ilwnxa4zcz57icyw2d7b37p8icvqaby1dn0w5vgskgrd12"; depends=[RODBC]; };
+  RODBCext = derive2 { name="RODBCext"; version="0.3.1"; sha256="06ky97k93bbrlxm4fg770mnz6yqp2zzgwmvzdqrpanfbg7qkfwwn"; depends=[RODBC]; };
   RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
   ROI = derive2 { name="ROI"; version="0.2-6"; sha256="0ajr9yclp0wjrjmway6wnj4pgczgphgnk4yxnvmqxia6s923bzap"; depends=[registry slam]; };
   ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="0.0-1"; sha256="1viqr0dqza9386m9xmfdm5riaczp4izf3bd2jk70cmdgypjj6mzg"; depends=[R_utils Rglpk ROI]; };
@@ -2623,12 +2686,12 @@ in with self; {
   RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
   RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.4"; sha256="0gi3zknxgxxmxjmb238vd64yqg02fv4qdirn2xf5badlqzwv3r71"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
   RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; };
-  RPresto = derive2 { name="RPresto"; version="1.2.1"; sha256="1lka1p4wh1vl9bpg2q4yv72jcd6jjp09330mw68ph27jqhfzinmm"; depends=[DBI httr jsonlite RCurl stringi]; };
-  RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.9"; sha256="0jar93xxm9sa4a4mqc93868hmk2l0hpbh7x707ilmkzjq47fi81r"; depends=[Rcpp RCurl]; };
+  RPresto = derive2 { name="RPresto"; version="1.3.0"; sha256="01w832ia4c44nhir5rzw33qa8h7afmf04vkfdlg32jaqi1gv5861"; depends=[DBI httr jsonlite openssl Rcpp stringi]; };
+  RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.10"; sha256="0fnyk04bnmgk9c14ng0bw1xd7vf1z1r76fzrk7dqdihqym52gi1m"; depends=[Rcpp RCurl]; };
   RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; };
   RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; };
   RPushbullet = derive2 { name="RPushbullet"; version="0.3.1"; sha256="15cb1zlfnjaf5z4dqx3xrkbkja152ah7jhs21qhvfl20qz4cyh7r"; depends=[curl jsonlite]; };
-  RQDA = derive2 { name="RQDA"; version="0.2-8"; sha256="103mb69x70z1i7z66b2if6zycr5iwcz1p3g8vvz0npmxncr4las9"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
+  RQDA = derive2 { name="RQDA"; version="0.3-0"; sha256="0p060wilvmz5wyahbga6gxkhs49rw8nb093bfrha7vhqhxnmdyqk"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
   RQGIS = derive2 { name="RQGIS"; version="1.0.1"; sha256="0i6qp1f87b54cmprn1d3kb9jv38n0pblb9i1xs9v4n508bfcdwmn"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; };
   RQuantLib = derive2 { name="RQuantLib"; version="0.4.3"; sha256="1c0ilkrgkyf5x31c51rkszm4bnscyv7hy101dlk0cqkjril7mp7m"; depends=[Rcpp zoo]; };
   RRF = derive2 { name="RRF"; version="1.7"; sha256="1nxwqb0ybia8cglqlrbwnm9xzab6ayrn5f3j3l0kqszq1rvkfw95"; depends=[]; };
@@ -2643,7 +2706,7 @@ in with self; {
   RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
   RSAgeo = derive2 { name="RSAgeo"; version="1.2"; sha256="1lgxcf5sd7aqk213s70mvi0kc4prm1w97m4wf3xjnvs7yc7mb5yz"; depends=[]; };
   RSCABS = derive2 { name="RSCABS"; version="0.9.2"; sha256="13l4ql40ahm06yi5a9zys62h5452fchkkhlhqh9gzh3pbpyjawgc"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; };
-  RSDA = derive2 { name="RSDA"; version="2.0"; sha256="0lxab3ig3r01d8insjqk7h8a4yq6kr01frz53jbalxxd3n5wzdm5"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr princurve RJSONIO scales scatterplot3d sqldf stringr tidyr XML xtable]; };
+  RSDA = derive2 { name="RSDA"; version="2.0.2"; sha256="17hymak1i9zkwdn9hv7diccs0vdbx16cwhaxyw89xsq3lwqfi2ap"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr pander princurve RJSONIO rlang scales scatterplot3d sqldf stringr tidyr XML xtable]; };
   RSEIS = derive2 { name="RSEIS"; version="3.7-4"; sha256="0yz1lgq79chvcz70a82pyiy7s9z0af22pcnbkw629plzrxlpfppx"; depends=[RPMG Rwave]; };
   RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; };
   RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; };
@@ -2662,9 +2725,9 @@ in with self; {
   RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; };
   RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; };
   RSelenium = derive2 { name="RSelenium"; version="1.7.1"; sha256="04ghck76jh7w6kgzdszkzjwj9fhyngq13mf9iybavxph5wcy7xgq"; depends=[binman caTools httr openssl wdman XML]; };
-  RSentiment = derive2 { name="RSentiment"; version="2.1.4"; sha256="199j82s31k5z5rkk1vr5jcir3330zxmnnsgm7k2bpdm4awf7l6j7"; depends=[NLP openNLP plyr stringr]; };
+  RSentiment = derive2 { name="RSentiment"; version="2.2"; sha256="0a4i9mpffmblgzj6qh4kg2x2cv9s93b1pgpfd0z6dh8czdzkdd8j"; depends=[NLP openNLP plyr stringr]; };
   RSiena = derive2 { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
-  RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.12"; sha256="0yxqna3vgjqpgbk6391dd3j5lvfa0n5xnjkq3i2i9i0pwzdr2knh"; depends=[base64enc digest httr jsonlite plyr stringr]; };
+  RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.13"; sha256="03993xck4274r6sxkzxlzcvwviafdb3d7icfn6f0xin4cnj6ry4m"; depends=[base64enc digest httr jsonlite plyr stringr]; };
   RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.2"; sha256="0phkk79ng4r54w3d4ajl505gs8svlzdf1g6q50lhraq2cbllbvgx"; depends=[RCurl]; };
   RSocrata = derive2 { name="RSocrata"; version="1.7.3-2"; sha256="17c5g8k5r60h6cgs2383fhi09lnm3kjm3pll4ma66ypjfbffzdpn"; depends=[httr jsonlite mime plyr]; };
   RSpectra = derive2 { name="RSpectra"; version="0.12-0"; sha256="0aa33mhzj03gznpza5l5qj94s45imfhrgx52bsa8rq00f93fgaf0"; depends=[Matrix Rcpp RcppEigen]; };
@@ -2679,13 +2742,13 @@ in with self; {
   RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
   RTDE = derive2 { name="RTDE"; version="0.2-0"; sha256="1dj7dsj4256z9m70y2fpcgprxpqbgqxz0dqwn0jl80sj2325f66s"; depends=[]; };
   RTOMO = derive2 { name="RTOMO"; version="1.1-5"; sha256="0wnxmzad2q5cpnqmglqh92clsk2c8fngd3gzh8f91alpj6nz69jp"; depends=[GEOmap RPMG RSEIS splancs]; };
-  RTaxometrics = derive2 { name="RTaxometrics"; version="2.1"; sha256="1l9byf8my5xx2rk8y2dk0j6gid3z2iz69iwv898v4d2ck0i5j4vp"; depends=[]; };
+  RTaxometrics = derive2 { name="RTaxometrics"; version="2.2"; sha256="0zjpgnxh5mqr4h6v2dw9g6zbrsrdlxzcpc7fx7yakqncwf6gd8b7"; depends=[]; };
   RTextTools = derive2 { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[caTools e1071 glmnet ipred maxent nnet randomForest SparseM tau tm tree]; };
   RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
   RTransProb = derive2 { name="RTransProb"; version="0.1.0"; sha256="0q5fyf176pzjjdpyc5wpakpfnp48ckcpcparf6n99js2xgxc725g"; depends=[chron e1071 expm matrixStats nnet pracma zoo]; };
-  RTriangle = derive2 { name="RTriangle"; version="1.6-0.8"; sha256="0mngwi7ybcg6lsk3f7faljwnzsfvyxln4jd2s2hiirr303ml4wzg"; depends=[]; };
+  RTriangle = derive2 { name="RTriangle"; version="1.6-0.9"; sha256="1khwr62qdmgzkqzxqgkcjvxl1w8lnabqm68x18d5rk0hq3rpi1wj"; depends=[]; };
   RUnit = derive2 { name="RUnit"; version="0.4.31"; sha256="1jqr871jkll2xmk7wk5hv1z3a36hyn2ibgivw7bwk4b346940xlx"; depends=[]; };
-  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-65"; sha256="0f3m05ada4iw83n289vxfygfa1jvaah1sibcyg1d2z9ycxf78c1q"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; };
+  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-68"; sha256="1gxh6w3b83szagirci84iik1ah0cvyzy4l61pnxli3abbzakzxc8"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; };
   RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; };
   RVPedigree = derive2 { name="RVPedigree"; version="0.0.3"; sha256="0v47bcdlcd0ydw4vffy1g9lj1azvyqwz4400nmlqshf9vqyhf9qq"; depends=[CompQuadForm doParallel foreach kinship2 ks Matrix snpStats]; };
   RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; };
@@ -2716,7 +2779,7 @@ in with self; {
   RandVar = derive2 { name="RandVar"; version="1.0.1"; sha256="0vj0p46xmj4129m6r5zg85fnvb5kx1ardwwk55nqypkxd0v58a4j"; depends=[distr distrEx startupmsg]; };
   RandomFields = derive2 { name="RandomFields"; version="3.1.50"; sha256="0j7852wvclglp820y2x5r19gsr6ciygbbpl5qvwj1khnlz1hfsid"; depends=[RandomFieldsUtils sp]; };
   RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.3.25"; sha256="0nxk7jhr61l9h76hf96f7ypakl4wip144c0gzr6rqsja6m75rjz3"; depends=[]; };
-  RankAggreg = derive2 { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
+  RankAggreg = derive2 { name="RankAggreg"; version="0.6.2"; sha256="1hblxvx5symysqfrmapw8ma7ghhmc01rzzc7kpq8vckch2k9x8kb"; depends=[gtools]; };
   RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
   Rankcluster = derive2 { name="Rankcluster"; version="0.94"; sha256="0ak6cpm073ym4h9l3j7pq0ks9h4is1hzxfjn52j23nc5ifq3fjpq"; depends=[Rcpp RcppEigen]; };
   RankingProject = derive2 { name="RankingProject"; version="0.1.1"; sha256="1n1282pym7q2b1bh18wlkmk9f0simzq149h7hacc23vyqzgkjs84"; depends=[]; };
@@ -2729,7 +2792,7 @@ in with self; {
   RbioRXN = derive2 { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[ChemmineR data_table fmcsR gdata KEGGREST plyr RCurl stringr]; };
   Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
   Rblpapi = derive2 { name="Rblpapi"; version="0.3.6"; sha256="1n25dyggqlvgqjfq30022i5ydpzmli2bcw08kaidgp23l7f90ghh"; depends=[BH Rcpp]; };
-  Rborist = derive2 { name="Rborist"; version="0.1-7"; sha256="018ialp0czrwp057llxclk76bs76l0acjp11jq0s1h1byafdmz6a"; depends=[Rcpp RcppArmadillo]; };
+  Rborist = derive2 { name="Rborist"; version="0.1-8"; sha256="0zr8vfbv11ascng7n2zv5xbqv7h0r0bycwn8bqlq8q10y2lyxg70"; depends=[Rcpp RcppArmadillo]; };
   Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
   RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
   Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; };
@@ -2741,7 +2804,7 @@ in with self; {
   Rcmdr = derive2 { name="Rcmdr"; version="2.3-2"; sha256="07p22b6kbx2md6h911jzgiin2rds76aizn9d7nd6l4lxp8a76c09"; depends=[abind car RcmdrMisc relimp tcltk2]; };
   RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-5"; sha256="11y53wzxflpyq6p187yihs0xpa9nv2rkqhzl70k0mrchvv625bcr"; depends=[abind car colorspace e1071 Hmisc MASS readxl sandwich]; };
   RcmdrPlugin_BCA = derive2 { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; };
-  RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.0"; sha256="1gigmvzmndxnplsy9w3znj6x4qayka7flzpgj5nsxaqw8xp1z1ip"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; };
+  RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; };
   RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
   RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
   RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; };
@@ -2760,11 +2823,13 @@ in with self; {
   RcmdrPlugin_PcaRobust = derive2 { name="RcmdrPlugin.PcaRobust"; version="1.1.4"; sha256="17rq3sv8payazjjn5j37cgd6df5b62d2y8al3grw6hw5nfba7lvn"; depends=[Rcmdr robustbase rrcov tkrplot]; };
   RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; };
   RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
+  RcmdrPlugin_RiskDemo = derive2 { name="RcmdrPlugin.RiskDemo"; version="1.9"; sha256="014x9w9qhi0fl8y35k918m25ml1sr1pndcrdih7v3dibzy18qbbn"; depends=[demography Rcmdr rgl]; };
   RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[Rcmdr SCMA SCRT SCVA]; };
   RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; };
   RcmdrPlugin_SM = derive2 { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; };
   RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; };
   RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.1-1"; sha256="0qlkqb3s4g417l9cfjq1hhi8y528lb3ibswkdk2bfsghn38yrmr4"; depends=[car randtests Rcmdr TeachingDemos tseries]; };
+  RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.4"; sha256="1f5swkwlii0wgw38m0pzziycqdhh2v00bxnr7815pdmr2yx0frqr"; depends=[Rcmdr]; };
   RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; };
   RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; };
   RcmdrPlugin_doex = derive2 { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[multcomp Rcmdr]; };
@@ -2776,18 +2841,17 @@ in with self; {
   RcmdrPlugin_pointG = derive2 { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; };
   RcmdrPlugin_qual = derive2 { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; };
   RcmdrPlugin_sampling = derive2 { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve MASS Rcmdr sampling]; };
-  RcmdrPlugin_seeg = derive2 { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg sgeostat spatstat]; };
   RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; };
   RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; };
   RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.1-1"; sha256="0hgf52pk81wii2jfw69csapm4gw7xrp1cm08b9n2d29chgw0gww6"; depends=[date Rcmdr survival]; };
-  RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.8"; sha256="0sgh2nqmlxsa6nzwdcdpad1q1mwwm6nb4xqpx4wj5afyisq2fbwr"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
+  RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.9"; sha256="0nacpipaimb1348rhv1rma85gnd38wsg741pz7xpvn347wnnc0wz"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
   Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; };
   Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; };
-  Rcpp = derive2 { name="Rcpp"; version="0.12.11"; sha256="0zwwhlfqbr6kkr0l2lmjfhpc1ndxi58inviw7s7zjp5lbcksx35x"; depends=[]; };
+  Rcpp = derive2 { name="Rcpp"; version="0.12.12"; sha256="1byyqvlgb2p46p1gv243k73rk69fa8pa4l5m5asmckag2pkb2glz"; depends=[]; };
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
-  RcppAPT = derive2 { name="RcppAPT"; version="0.0.3"; sha256="0q1iwhf1rafzr6d7pjbxs0ii0anbfrzrl1kpz1ka5yvjw39s3kr8"; depends=[Rcpp]; };
+  RcppAPT = derive2 { name="RcppAPT"; version="0.0.4"; sha256="0xbaamv3bg08ymbmiq6kwh86p17y6qzgydq02syig2a3ykp0042c"; depends=[Rcpp]; };
   RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.8"; sha256="14hw9nrqwcqx2xwam03wfxk07qg648gp0cnk76c4knpr6pmad9sx"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.7.900.2.0"; sha256="01qsff2p1fp5i9lq7rsykrskgr6smz24ddspbl5ad9a8rkmczwyv"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.7.960.1.1"; sha256="0m2c5lb4k3y1xp4bgvy1y5llci0nryyxnlv1nwl9pb1knl9p141a"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
   RcppBlaze = derive2 { name="RcppBlaze"; version="0.1.1"; sha256="0r6mzsm2gq77i8cylcvgg7hn0399d3v11wlf89v559vslkv2b2m0"; depends=[BH Matrix Rcpp]; };
   RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.3"; sha256="0cb04filbr0mymcg891lc0dw2b3fnjmhn8z50xcilb3v72ccrvqg"; depends=[Rcpp]; };
@@ -2815,10 +2879,12 @@ in with self; {
   RcppSMC = derive2 { name="RcppSMC"; version="0.1.5"; sha256="0vzibl1ck0cxl9nzx2829ikxvp2bcndq7h0agzr53i089168rr8s"; depends=[Rcpp]; };
   RcppShark = derive2 { name="RcppShark"; version="3.1.1"; sha256="0dy6zksxcsbzjyz0f147rk2amwjsrjdcyl6jn767pw9ij9vdzh6r"; depends=[BH checkmate Rcpp]; };
   RcppStreams = derive2 { name="RcppStreams"; version="0.1.1"; sha256="0sa0ndnfm89f8lh3ba6jf3gxaan1g97dhlzbmpkwqj22frgggqjw"; depends=[BH Rcpp]; };
+  RcppTN = derive2 { name="RcppTN"; version="0.2-1"; sha256="09ssggx66b3cyjh7mlc73lax2nfw7agfiph090w1qblaam9jz8sy"; depends=[Rcpp]; };
   RcppTOML = derive2 { name="RcppTOML"; version="0.1.3"; sha256="0krw4104m8drgyf53aq22kl5q0abrd0y4j1fvrwsj1dkbkybas05"; depends=[Rcpp]; };
+  RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.0"; sha256="0833j7hy7dpdxkj1m5cfyxzpp7j0n7mxjc5kx32mdn5s43iaf7yh"; depends=[Rcpp]; };
   RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
   RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.3"; sha256="0s82haf96krr356lcf978f229np6w0aihm2qxcnlm0w3i02gzh3x"; depends=[Rcpp RcppGSL]; };
-  Rcrawler = derive2 { name="Rcrawler"; version="0.1.1"; sha256="1kg0zp93sq359mkb45shxb6clr1xvfvbn09zcg8439k47sq8mm5k"; depends=[data_table doParallel foreach httr rJava xml2]; };
+  Rcrawler = derive2 { name="Rcrawler"; version="0.1.2"; sha256="036ycw60zh8bynnxskgrabr6smqwvxz5w669krv37f0yk18z238y"; depends=[data_table doParallel foreach httr xml2]; };
   Rcriticor = derive2 { name="Rcriticor"; version="1.1"; sha256="0imhzf55w3fvfhrpjppkaxndb56bmpqnkibkq9li9g9i7zda2q8w"; depends=[]; };
   Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; };
   Rcssplot = derive2 { name="Rcssplot"; version="0.2.0.0"; sha256="0pv1yzpsc68bahfxh5h79xmh798a22nk6i88gj1s81sp7l5fbqlm"; depends=[]; };
@@ -2826,23 +2892,23 @@ in with self; {
   Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.6.2"; sha256="1hkqy97mh68yzkh4bawjrgf1rlhkh3jz2ky84rg3wgz1mkvrrsx2"; depends=[formatR roxygen2]; };
   Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; };
   Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; };
-  Rdpack = derive2 { name="Rdpack"; version="0.4-20"; sha256="1b1vikh8py4lvf6w90919y8f5aq9xyhv2pprfyzfx0671k99cz6z"; depends=[bibtex gbRd]; };
-  Rdrools = derive2 { name="Rdrools"; version="1.0.1"; sha256="0yrk4z4i75vq9v3d2bic4r7rf56r3m6lzkjm6vkqp0p8s5qfpwaz"; depends=[Rdroolsjars rJava]; };
+  Rdpack = derive2 { name="Rdpack"; version="0.4-21"; sha256="15i2xby0jys9pxyy8c19najxyh98mbsw7pll14p69rfsx8s07kbn"; depends=[bibtex gbRd]; };
+  Rdrools = derive2 { name="Rdrools"; version="1.0.2"; sha256="1xn46lp6kgj6bns5nwjx4s8a3iif1g38iwf58hsrbqjhyygqvdzv"; depends=[Rdroolsjars rJava]; };
   Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; };
   Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; };
   Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
   Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; };
   ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
   ReIns = derive2 { name="ReIns"; version="1.0.4"; sha256="1dyj95grwwb2nd0xa3631h3ahqi9zw08jr406aq8hq51wd4aq054"; depends=[doParallel foreach Rcpp survival]; };
-  ReacTran = derive2 { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[deSolve rootSolve shape]; };
-  RealVAMS = derive2 { name="RealVAMS"; version="0.3-3"; sha256="1isjk6mzhlhmvz8sv5wlh3w6s53yk3f41xxji4j3hwbaw5q9a73m"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+  ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; };
+  RealVAMS = derive2 { name="RealVAMS"; version="0.4-0"; sha256="1byh7in3bpfgdwfxp15334h167bvrcfj0cdswqy3yd81l9g2ickn"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; };
   RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-10"; sha256="09xp0ad7v2bsg1r7gf3awdqcpds0v3ygsbnkm8ysy8w14sbrrydf"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
   Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
   RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.0.2"; sha256="1113dm41rhyimn7jc3pkrdqz3biqg5m174vz24jchhmn9n38zsss"; depends=[igraph RJSONIO]; };
   Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; };
   RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.1"; sha256="1w0cx988ixl10d8ylfsblmk1mdd9dhzxdhp9z4n1643dkd2xzr02"; depends=[isva quadprog]; };
-  RefManageR = derive2 { name="RefManageR"; version="0.13.1"; sha256="1yw3fbiis1gl7ih66b4vjr299xy3w164irmmdfsqr79n9h3p5kv7"; depends=[bibtex httr lubridate plyr RCurl RJSONIO stringr XML]; };
+  RefManageR = derive2 { name="RefManageR"; version="0.14.20"; sha256="18g2w32ldfakmnmlk1gaxq64jhx4iy7kil1s7g6lnvv1fygxpg8k"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; };
   RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
   RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; };
   RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.4.2"; sha256="11j6g13als34bh6fdbdda4hh6xcy8b7j748kjlpwxhh7kjm7n1p5"; depends=[ggplot2 gtools psych RGCCA]; };
@@ -2864,7 +2930,7 @@ in with self; {
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; };
-  Rfast = derive2 { name="Rfast"; version="1.8.1"; sha256="1d430izm7kc4ppihwpqydc4bwpky7rr8625yr275q0pfj5p2iswq"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast = derive2 { name="Rfast"; version="1.8.2"; sha256="1nfdcph66d3kb8gjq5ik5lf1g0m5j87zjhwq8f3ma16w1h3cm487"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
   Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
   Rfmtool = derive2 { name="Rfmtool"; version="1.2"; sha256="1q359574fspwxy1lmlzfqk0cg3qih8jzh3rk74qr22jw0sp7bcyw"; depends=[]; };
   Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; };
@@ -2883,10 +2949,11 @@ in with self; {
   Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; };
   Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
   Rjpstatdb = derive2 { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
+  RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; };
   Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; };
   Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
   Rlabkey = derive2 { name="Rlabkey"; version="2.1.135"; sha256="1gmwi30gl78psg5a34w0l5957vs7mb8pplgcwh7d5dszp92jw2xc"; depends=[Rcpp RCurl rjson]; };
-  Rlda = derive2 { name="Rlda"; version="0.2.0"; sha256="10b2lzyybh4qbd95xy86cv75x51ar82agf15i8hp8qhw29gzfwi0"; depends=[doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
+  Rlda = derive2 { name="Rlda"; version="0.2.2"; sha256="0wp2lgflpai3pqxkmbsadrdzlm27xafb129zzqm8nx70zwww611c"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.3.7"; sha256="0k2snw8a6h4dvbpl97fklvvbbqma4g9r0ksvh5ndyk4vqwyxy1na"; depends=[Rcpp]; };
   Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; };
   Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; };
@@ -2901,6 +2968,7 @@ in with self; {
   RnavGraph = derive2 { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[graph rgl scagnostics]; };
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; };
   RndTexExams = derive2 { name="RndTexExams"; version="1.4"; sha256="18zmdfq234k4bjj5rz6zjlkiyndbj5v2irjfl3w66vz38lk8sf6v"; depends=[CopyDetect data_table stringi stringr]; };
+  Rnightlights = derive2 { name="Rnightlights"; version="0.1.1"; sha256="0k5pc6jd249n333w0nwlp64ah0823is9ryw1yfdibvhh2a8fxfgk"; depends=[cleangeo data_table doParallel dplyr foreach gdalUtils lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings sp stringr xml2]; };
   RobAStBase = derive2 { name="RobAStBase"; version="1.0.1"; sha256="17vfi0ia3z3s6x7frjk1alcgb0h73gwxy2n11kfl0k8w2fxgk49l"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; };
   RobAStRDA = derive2 { name="RobAStRDA"; version="1.0.2"; sha256="1lyp2y38jnwv8ggrv9pdzprpf2gs62w1mpzwcqcbrmy7fzjsym0b"; depends=[]; };
   RobLox = derive2 { name="RobLox"; version="1.0"; sha256="0y193xai0mfwpm6zhxgy21h4yrlqrpvwx84bj4xnr8ql87wznh7q"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; };
@@ -2908,6 +2976,7 @@ in with self; {
   RobPer = derive2 { name="RobPer"; version="1.2.2"; sha256="0631qfpz61606r50vzn7b3h7arfwxcs8j13q1hg779qx60kwrliy"; depends=[BB quantreg rgenoud robustbase]; };
   RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
   RobRex = derive2 { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
+  Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; };
   RobustAFT = derive2 { name="RobustAFT"; version="1.4-1"; sha256="180gmlinrpnk4ghl1xickbjkdqr7vb6qzmy6701xpji5k8g9il60"; depends=[robustbase survival]; };
   RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.3"; sha256="1kzi5mvz78gxwrg1z822pkqzmqwvw73x2gh2yfsaxcwy2d7nr2mx"; depends=[Rcpp RcppEigen]; };
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
@@ -2934,7 +3003,7 @@ in with self; {
   Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.4"; sha256="1a2x85r2q5h6951frq5d0kvvxyiw18riq9xbswg5g1yhs093yrrs"; depends=[kohonen Rcpp]; };
   Rssa = derive2 { name="Rssa"; version="0.14"; sha256="0r51jw7fl0nxmly05dj85chw804vf8gmrkfs6yi59zh7fq7jsis6"; depends=[forecast lattice svd]; };
   Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; };
-  Rsymphony = derive2 { name="Rsymphony"; version="0.1-26"; sha256="0v51sjhggvl8i3ysslqcc4x84874nagxq2v68izs4hpvcpzn7268"; depends=[]; };
+  Rsymphony = derive2 { name="Rsymphony"; version="0.1-27"; sha256="0zlkkh2k5il0bqmx9wf2w8wk21zkaf6sm1hx1v1qvzz780cngfh4"; depends=[]; };
   Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; };
   Rtextrankr = derive2 { name="Rtextrankr"; version="1.0.0"; sha256="16dby3xsfcjyp35xdflmgnh7zkqygfbffvj4jqa565vj9ksnq5ir"; depends=[igraph KoNLP sets stringi]; };
   Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; };
@@ -2948,13 +3017,13 @@ in with self; {
   Runuran = derive2 { name="Runuran"; version="0.23.0"; sha256="1qkml3n0h1z59085spla0ry1wl42c1ljg9nh2sxv6mnhxygm6aq1"; depends=[]; };
   RunuranGUI = derive2 { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; };
   Rvcg = derive2 { name="Rvcg"; version="0.16"; sha256="0629fl4bq15mcb9kxiqsgllqgygxx0xn50849akx0rn72y7jp5v0"; depends=[Rcpp RcppArmadillo RcppEigen]; };
-  Rvmmin = derive2 { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
+  Rvmmin = derive2 { name="Rvmmin"; version="2017-7.18"; sha256="14jzwqwi1zd8sg1vb18hgvbvsax38hdqjy540qqhn2xb4z8qx3hy"; depends=[optextras]; };
   Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; };
   Rwave = derive2 { name="Rwave"; version="2.4-5"; sha256="1q80759382yig5gmjd83qafavhbbh7bbbgil8qha91xfs27m45br"; depends=[]; };
   Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
   RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[lattice MASS MCMCpack mvtnorm]; };
   RxODE = derive2 { name="RxODE"; version="0.5-6"; sha256="06y4cdkx93ldhdbs5iaiad7hzlbnsjnimmnmvcnfv4gbicxjq9c5"; depends=[]; };
-  RxnSim = derive2 { name="RxnSim"; version="1.0.2"; sha256="0sky3x2gpgw8zbgqkf77w3v66i7bgssyqbradf4dl5f66d0kx4cg"; depends=[data_table fingerprint rcdk rJava]; };
+  RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; };
   Ryacas = derive2 { name="Ryacas"; version="0.3-1"; sha256="13qvd5gpdrjgzf6isk3529khd02852y3ajmpp5vl8vn9k1jxp86v"; depends=[Rcpp XML]; };
   Rz = derive2 { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; };
   S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; };
@@ -2966,7 +3035,7 @@ in with self; {
   SAFD = derive2 { name="SAFD"; version="1.0-1"; sha256="1h9hw66irq2c1ciz502r5h8h9hx32jwhrp9dwl91qlknlj6s1bxr"; depends=[]; };
   SAGA = derive2 { name="SAGA"; version="2.0.0"; sha256="022q8hagc38mfakh02cyvf49as2rps1my9iy2xcg8qhrr2czzmy8"; depends=[plotrix viridis]; };
   SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; };
-  SALTSampler = derive2 { name="SALTSampler"; version="0.1"; sha256="1ys88fgsx92b50x5y8xb0gp03spj0d29nqgw91yl95qwkg0d6bsg"; depends=[lattice]; };
+  SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; };
   SAM = derive2 { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
   SAMM = derive2 { name="SAMM"; version="0.0.1"; sha256="1yyqci1c0xk5pqi09v3b7p5y0dwbrg1wlsyscfnw6qxwr707y23j"; depends=[Rcpp RcppArmadillo]; };
   SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
@@ -2975,6 +3044,7 @@ in with self; {
   SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.8"; sha256="1hz5a2zjv8hrasjck981sqahq0l88b6ard1iwsfqznalva8zywbb"; depends=[]; };
   SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
   SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
+  SASmarkdown = derive2 { name="SASmarkdown"; version="0.3.3"; sha256="0wwqy9gr35isaqzgg48d2gaayaz40n8mjymlj28brbsbrfhddpbw"; depends=[knitr]; };
   SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
   SASxport = derive2 { name="SASxport"; version="1.5.3"; sha256="0hkwz4szl4rzl6arkn6kp8s7nk55g902hpslgzbkaz94wlrzp77z"; depends=[chron Hmisc]; };
   SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; };
@@ -2988,7 +3058,7 @@ in with self; {
   SCI = derive2 { name="SCI"; version="1.0-2"; sha256="1jvzkdv15ifgf6a3zjfzzcgw2y2vg0wp7yhiamiaqp8xkm142w49"; depends=[fitdistrplus lmomco]; };
   SCMA = derive2 { name="SCMA"; version="1.2"; sha256="0z4f8p1d0ry35g5a13blc8w73vid7nwdn2w9d3i0nfb05fj7i5qf"; depends=[]; };
   SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
-  SCRSELECT = derive2 { name="SCRSELECT"; version="1.2-2"; sha256="0cq4hhxcwpxz9v0jk18aza29v7gdppgr1va0mglzkvd4hmwwrz19"; depends=[mvtnorm]; };
+  SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; };
   SCRT = derive2 { name="SCRT"; version="1.2.1"; sha256="09d9ghviskg1ifjgqcgdlcp1p3w09bpkixvbxqr4354rq31kwf21"; depends=[]; };
   SCVA = derive2 { name="SCVA"; version="1.2.1"; sha256="1ixy4ybw3c9w6q8csjv27r5f9x6988zrbr2a3yybhyw8xmkszc4v"; depends=[]; };
   SCperf = derive2 { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; };
@@ -3002,13 +3072,13 @@ in with self; {
   SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
   SECP = derive2 { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
   SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
-  SEERaBomb = derive2 { name="SEERaBomb"; version="2017.1"; sha256="14i0ppcwc10n68ydg5w0wf2x4krj49h5hncg1nz20szl6x8qfdzb"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales XLConnect]; };
+  SEERaBomb = derive2 { name="SEERaBomb"; version="2017.2"; sha256="0fjw8gjafhy6jdj4w9b4xj634gzpdnjbmn2dhhlfg3a7fqh4y91q"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales survival XLConnect]; };
   SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; };
-  SEMID = derive2 { name="SEMID"; version="0.2"; sha256="1897yjshcbidnrhr575sicsmhzyhjbagv0dp9g3nsv78syb6dr2p"; depends=[igraph]; };
+  SEMID = derive2 { name="SEMID"; version="0.3.0"; sha256="1i7pp1jviyx48l5wsb0dh8kgmshkyqkqwaj557ndavpa0v7mn2fg"; depends=[igraph R_methodsS3 R_oo R_utils]; };
   SEMModComp = derive2 { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; };
   SETPath = derive2 { name="SETPath"; version="1.0"; sha256="1dpgmki0dhph13h1fd3mbf308746wccgfz5g5gdm7bwbjnmjzd98"; depends=[]; };
   SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; };
-  SFS = derive2 { name="SFS"; version="0.1.1"; sha256="1dlgriddp998wzcgsbl11ngzflj1grh3ws5nw4s4hgim6vqls0rj"; depends=[Rcpp RcppArmadillo]; };
+  SFS = derive2 { name="SFS"; version="0.1.2"; sha256="119dh1pyvjna4k0m7nk601kyvm57jijqsr5aphzvgywhkmk9yzh9"; depends=[Rcpp RcppArmadillo]; };
   SFtools = derive2 { name="SFtools"; version="0.1.0"; sha256="08k2ywkpk1pzp0qcwm7qx9gnv9hglspl9hrsrrfblagdpkw6rm2x"; depends=[doParallel ff wordspace]; };
   SGCS = derive2 { name="SGCS"; version="2.6"; sha256="09czgfc0mg64qcigp36kjaf52zlmrpz3m2d1dp42d9hhlciliqf5"; depends=[spatstat]; };
   SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
@@ -3018,6 +3088,7 @@ in with self; {
   SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
   SHLR = derive2 { name="SHLR"; version="1.0"; sha256="0anj2bfbax8kipn7cgjhr4ijjcipixm9lshafh19qbxag2li1891"; depends=[doParallel FactoMineR foreach geepack kinship2 MASS Matrix stringr]; };
   SIBER = derive2 { name="SIBER"; version="2.1.3"; sha256="14ab9zid0i400kj924m2y5qgp2iibnpllhqw11rlmdf8j9cr7858"; depends=[dplyr ggplot2 hdrcde magrittr mnormt rjags spatstat_utils tidyr viridis]; };
+  SIBERG = derive2 { name="SIBERG"; version="2.0.1"; sha256="0679npp89d6xqs95c2kj95dbbp2v4g933ppkcn315siw2s553nv5"; depends=[mclust]; };
   SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; };
   SIDES = derive2 { name="SIDES"; version="1.11"; sha256="1gmhfj44qdklsdklmg8p35lmvlgla8i881i3iaziblslyscbyw9f"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
   SII = derive2 { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
@@ -3025,10 +3096,11 @@ in with self; {
   SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
   SIS = derive2 { name="SIS"; version="0.8-4"; sha256="1bhpj0l28804f48nc68xg0cfbpzplr2n32ccfs4w9g2m7lgarg07"; depends=[glmnet ncvreg survival]; };
   SISIR = derive2 { name="SISIR"; version="0.1"; sha256="08lw9y38j5qq00m2vcxsac97lg14j4w1y6607vw8isrb3qb5db9z"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; };
-  SKAT = derive2 { name="SKAT"; version="1.3.0"; sha256="1iksiz3hm3m3aw45wxlrr47n8lk1fmkvianjdk657xbhx5zlkiqq"; depends=[]; };
+  SKAT = derive2 { name="SKAT"; version="1.3.2.1"; sha256="0ylfz63xiq2zw9nc8nqr89qbhl3fnkhjgg9x7yxjm78vrn640hkl"; depends=[]; };
   SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; };
   SLDAssay = derive2 { name="SLDAssay"; version="1.7"; sha256="123yh2xasfa90bjjqdihrrrjb2754frlkggx5wg6590sk3i1kp5n"; depends=[]; };
   SLHD = derive2 { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; };
+  SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph lle]; };
   SLOPE = derive2 { name="SLOPE"; version="0.1.3"; sha256="12naak08qjpn6l1ikqwf17h72zk4b5mppgxx7ks9wmnqy9ylhy3x"; depends=[Rcpp]; };
   SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; };
   SMCP = derive2 { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; };
@@ -3036,6 +3108,7 @@ in with self; {
   SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; };
   SMIR = derive2 { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; };
   SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; };
+  SMM = derive2 { name="SMM"; version="1.0"; sha256="0qg6c553z1f3w6s84mnql9w4p7ss8xy7fijnrhn2wdh0j4yp18bf"; depends=[DiscreteWeibull seqinr]; };
   SMMA = derive2 { name="SMMA"; version="1.0.1"; sha256="0ld8jjh67iw5w5cmb2gb899269apjydgqjsnn5hq5lzqjilpzzl8"; depends=[Rcpp RcppArmadillo]; };
   SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; };
   SMPracticals = derive2 { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; };
@@ -3088,6 +3161,7 @@ in with self; {
   SSDM = derive2 { name="SSDM"; version="0.2.3"; sha256="177lh4qf9b7gwi911mhy8ypfqlpl7yhl60pznhwcpynk9iqp2hzx"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; };
   SSDforR = derive2 { name="SSDforR"; version="1.4.15"; sha256="0vjfzjs2bhxzavcnlz5lq5f96pp2sw5zdzlz3vivxbmvzp50kbr7"; depends=[MASS psych TSA TTR]; };
   SSL = derive2 { name="SSL"; version="0.1"; sha256="0fy6svf8xfni72bpsg8a5wr8ly46srhfixk8866lrcsp8pb6mqcd"; depends=[caret e1071 klaR NetPreProc proxy Rcpp xgboost]; };
+  SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; };
   SSN = derive2 { name="SSN"; version="1.1.10"; sha256="0fhwshl6vwf9cvbg8j284i27vayjrslk5hpyvrby390jma9klk4i"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; };
   SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; };
   SSRMST = derive2 { name="SSRMST"; version="0.1.1"; sha256="15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg"; depends=[survival survRM2]; };
@@ -3096,6 +3170,7 @@ in with self; {
   STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; };
   STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; };
   STARTS = derive2 { name="STARTS"; version="0.0-9"; sha256="1r93gy1044sn4cdjqfbqc9pcrq63135rm8fvvy0jjmqqmx5xigi2"; depends=[]; };
+  STARTdesign = derive2 { name="STARTdesign"; version="1.0"; sha256="1q61l3v8ishzax3ppy0pz4ky4l46472l6j36hjlsa8cl01ik1zjf"; depends=[Rcpp]; };
   STB = derive2 { name="STB"; version="0.6.3.1"; sha256="0fj1cfxqhijpxl41z799zd7id95jsb84ylrbqzrd1jlp80plyw83"; depends=[Matrix VCA]; };
   STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; };
   STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; };
@@ -3121,7 +3196,7 @@ in with self; {
   SciencesPo = derive2 { name="SciencesPo"; version="1.4.1"; sha256="1y9ymm5h6mmcx1ncl7yq2nn681gm0hd25fgxxwill9bzpy34pdnr"; depends=[data_table ggplot2 htmltools lubridate pander Rcpp rstudioapi shiny stringr xtable]; };
   ScoreGGUM = derive2 { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; };
   ScottKnott = derive2 { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; };
-  ScottKnottESD = derive2 { name="ScottKnottESD"; version="1.2.2"; sha256="0b1xy1977d4l2ybl7qqlf6a4pajmkynfs39nlkipdffxnvys214z"; depends=[car effsize reshape2 ScottKnott]; };
+  ScottKnottESD = derive2 { name="ScottKnottESD"; version="2.0.2"; sha256="08pg51rjvb29fhv8wx03q6ncfw616pszgpcdywkplbgab26rrx1q"; depends=[car effsize forecast reshape2]; };
   ScrabbleScore = derive2 { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; };
   ScreenClean = derive2 { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; };
   SearchTrees = derive2 { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; };
@@ -3142,13 +3217,12 @@ in with self; {
   SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.7"; sha256="092mf3dfwa78rh9bh3a4f2gsflax013100a4zld47j5lkp24diy4"; depends=[MASS survival]; };
   SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.3"; sha256="1qfsy88bd07xk3gy2r7cjcs6fhx9889aqn1494d92msxmc6zvcz7"; depends=[MASS numDeriv Rsolnp]; };
   SemiPar = derive2 { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; };
-  SemiParBIVProbit = derive2 { name="SemiParBIVProbit"; version="3.8-2"; sha256="0zhdkc6ccpxhmrh9fjn5px41pphl9zccr26kaymg56bqq181krd2"; depends=[copula gamlss_dist ggplot2 magic matrixStats mgcv mnormt psych Rmpfr scam survey survival trust VGAM VineCopula]; };
   SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.5"; sha256="0apbg8sddz2ab9170wvf7p6cgawvp4w13r97r5q7p3hx2hylb8sw"; depends=[CDVine copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM]; };
   SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; };
   SensMixed = derive2 { name="SensMixed"; version="2.0-10"; sha256="0r2lga40xr782n1viyxc4wn9gzgm7g2ick45pfnkgq6m60wx9rfh"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; };
   SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
   SensoMineR = derive2 { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[cluster FactoMineR KernSmooth]; };
-  SensusR = derive2 { name="SensusR"; version="2.0.0"; sha256="1897d9lh3srgg99lnjs77j2yrgskbzp68d04i4pkar6slc6xsmli"; depends=[ggmap ggplot2 jsonlite lubridate plyr sp]; };
+  SensusR = derive2 { name="SensusR"; version="2.2.0"; sha256="0ahgy6mvlxfdavdarmfmb1ld1pykhbrjgg8mdh5q71b3a75vbp47"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; };
   SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.2-0"; sha256="1hxn7lnq21ja9hgi35pz446q7gr6pzmfxg3mcd7yfk9679cixjpq"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; };
   SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; };
   SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.4"; sha256="0wk40lhx2bjyfl8gcv9g1c3bm7kf3b12pfdb0zk22vcp2flr0mci"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; };
@@ -3156,27 +3230,28 @@ in with self; {
   SeqKat = derive2 { name="SeqKat"; version="0.0.4"; sha256="0n6crb2lvyvx86k3ipyc29q5g4f452pdn3c77303y6jhbpy4hcjd"; depends=[doParallel foreach Rcpp]; };
   SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; };
   SequenceAnalysis = derive2 { name="SequenceAnalysis"; version="1.3"; sha256="0jrpq5ryw7rwkv99w0a5p3r0vj8nbzj6adlcsr84d9ffgxafmhif"; depends=[XML]; };
-  Sequential = derive2 { name="Sequential"; version="2.3.1"; sha256="0rdcxmqysi9x8671zvjndaxp91g7h5a8qhcs0qb5zxh3pbrch0jk"; depends=[]; };
+  Sequential = derive2 { name="Sequential"; version="2.3.2"; sha256="01zvgvdj57js08krskahk1ng3wkv9iblmirslgrmllf4q18zwsdr"; depends=[]; };
   SetMethods = derive2 { name="SetMethods"; version="2.1"; sha256="1n6pd6cs11qahbfimqg1mskvq364gs1hvjbyygr49pv28cb3rig7"; depends=[betareg lattice QCA]; };
   SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; };
   SetTest = derive2 { name="SetTest"; version="0.1.0"; sha256="0b5lkdhaymi3vsx9acdn9jxvqwwsac9lbdr43c44c06gglqlvk47"; depends=[]; };
+  Seurat = derive2 { name="Seurat"; version="2.0.1"; sha256="1w24fy60r7lkdz7rn09a0jnmdg6gf5q3q25bckiqp6mjmyikm8va"; depends=[ape caret compositions cowplot diffusionMap dplyr dtw e1071 FNN fpc gdata ggjoy ggplot2 gplots gridExtra Hmisc ica igraph irlba lars MASS Matrix mixtools NMF NMOF pbapply plotly ranger RColorBrewer Rcpp RcppEigen RcppProgress reshape2 ROCR Rtsne SDMTools stringr tclust tidyr tsne VGAM]; };
   ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; };
   ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; };
   ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; };
   SharpeR = derive2 { name="SharpeR"; version="1.1.0"; sha256="0qhvpwv81jznqfzm7xysm051ckv8ilq7zhsysxc7wripnlj01c4m"; depends=[matrixcalc sadists]; };
-  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.0"; sha256="0ygd250lgxrjhrqv17vzxl96bfzmfgcgal4rzn4wmm816ks7y6h9"; depends=[corrplot CTT deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; };
+  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.3"; sha256="1l7x1aw1nfjcwv3b47x3hr5yvdhbxyn8gxipwx5asr6gc62jxlqf"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; };
   ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; };
-  ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.1.2"; sha256="1rfmsmqd4gq27scm3f0y7p5ivsmk20cjizfycp3sj8ng0qahjmaq"; depends=[]; };
-  SiMRiv = derive2 { name="SiMRiv"; version="0.9.1"; sha256="0aw2x9fgjzs8fiz5gqml333w3yi7k65jz611mbhjh26nvbgq82ls"; depends=[raster]; };
+  ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; };
+  SiMRiv = derive2 { name="SiMRiv"; version="1.0.1"; sha256="17aja5blbslj6pzypxk2nx91lnqdq2z5kn0ss9xfd3x4h9hvw81y"; depends=[mco raster rgdal sp]; };
   SiZer = derive2 { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
   SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; };
   SigTree = derive2 { name="SigTree"; version="1.10.5"; sha256="1i0zhawv0dl764ciyyr3r4sbql2xhhks2r8vbya10wnzyqipxmmb"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; };
   SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
   SignifReg = derive2 { name="SignifReg"; version="1.0"; sha256="1360892wy0qc6dch3753s4a17l3pcijjmxd34zqvzl9534arlsxd"; depends=[]; };
   Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.7"; sha256="0g45mi7hd64h2ja215g61qa5v47vqlbfbbs15dsmlv4yygy1n2fx"; depends=[ks MASS misc3d rgl scatterplot3d]; };
-  SimComp = derive2 { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mratios multcomp mvtnorm]; };
-  SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.4.2"; sha256="04qs0b7sn170m65176p7gmk03dzm2jjgqknmc8kjab8snlrr3r3k"; depends=[evd]; };
-  SimDesign = derive2 { name="SimDesign"; version="1.6"; sha256="1517gfrxnhj3c8jj5qiqf9yg7y8h9q1175czb2ykx2c291b2qvac"; depends=[foreach pbapply plyr]; };
+  SimComp = derive2 { name="SimComp"; version="3.2"; sha256="04rmpxasaa888p6f0rhhpvpqc39fppdkcwbq5sxcslx7bwc9w9z8"; depends=[mratios multcomp mvtnorm]; };
+  SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.5.0"; sha256="10afb3k4rvsmgfx6m1csb0pvnjba1d896llfh3ksmjzxglmvslgw"; depends=[evd]; };
+  SimDesign = derive2 { name="SimDesign"; version="1.7"; sha256="0n71irxa2yjy3hx3138r2fjnwn46ihbbq235vk7h9sxdy37ksp1f"; depends=[foreach pbapply plyr]; };
   SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; };
   SimInf = derive2 { name="SimInf"; version="5.0.0"; sha256="1m0va9wi3a14pbwnz93lm2lid6ypdxaccsmwqna1c6idnpbfp841"; depends=[Matrix]; };
   SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.1.0"; sha256="1bg9i3dw54d3xyzvmmanbgj6wlqzipa2nqc6qrlj02wa76dz9hak"; depends=[BB GenOrd ggplot2 MASS Matrix nleqslv psych triangle VGAM]; };
@@ -3198,7 +3273,7 @@ in with self; {
   SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
   Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; };
   Sky = derive2 { name="Sky"; version="1.0"; sha256="02vjdggvanzsjx7ihxskapp5d5dlyalj02122wmarj8qf1ha1i2m"; depends=[EBImage]; };
-  SkyWatchr = derive2 { name="SkyWatchr"; version="0.5-1"; sha256="0mza2r80wsa091ry0rcx9x29k9v0kfk4gnafmpw6pah3bgpd2lk8"; depends=[htmlTable httr sp]; };
+  SkyWatchr = derive2 { name="SkyWatchr"; version="0.8-2"; sha256="0if44d79j2hlxdccn3jd7lrfbhrr09rfhfgds132syxprwkcb2mr"; depends=[htmlTable httr sp]; };
   Sleuth2 = derive2 { name="Sleuth2"; version="2.0-4"; sha256="18mh1svmb96hw3rjmgxlwzs7kdcvjkxf4zm8k4w0sxz94ks062i7"; depends=[]; };
   Sleuth3 = derive2 { name="Sleuth3"; version="1.0-2"; sha256="0b4g7j8a204wyvh0q9n1l4zrl9rk7ibyfijd49mjjdyg9zz4kbna"; depends=[]; };
   SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; };
@@ -3206,10 +3281,11 @@ in with self; {
   SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; };
   Smisc = derive2 { name="Smisc"; version="0.3.6"; sha256="0knrgq6831rwr48880kvsmrl6c943nw3nkzds0sh63ljw0dp5ja7"; depends=[doParallel plyr]; };
   SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; };
-  SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.0"; sha256="122j7rr9d5pkyxlchlvs0zyfxxs1c9n4hj2kk9v9fws3gjlrrlds"; depends=[lava mvtnorm prodlim]; };
+  SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; };
   SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.6"; sha256="1p15k57hi31i3p6v63v9s7hi1w9kb4aqjcgz405jk4klsifzw8va"; depends=[jsonlite Rcpp stringr]; };
   SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; };
   SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
+  SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; };
   SocialMediaLab = derive2 { name="SocialMediaLab"; version="0.23.2"; sha256="1adl0h3vnw17c364bxm5wffjkmvfzz9l0w5wkpwi6ry96vxzwy40"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; };
   SocialMediaMineR = derive2 { name="SocialMediaMineR"; version="0.4"; sha256="0hd05rm7qn2w8rqx7pw996wpgb2rymcwzmns8xyczcyn81vjx8z8"; depends=[httr jsonlite RCurl]; };
   SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; };
@@ -3217,12 +3293,14 @@ in with self; {
   Sofi = derive2 { name="Sofi"; version="0.16.4.8"; sha256="0h9ir0xrwmsabfhwsr9hbpwabh1fsb3p51y8qcgm92iyvc6dl3mf"; depends=[foreign sampling shiny]; };
   SoftClustering = derive2 { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; };
   SoilR = derive2 { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
+  SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; };
   SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
   SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; };
   SoyNAM = derive2 { name="SoyNAM"; version="1.3"; sha256="128iq8rrj6nm8zdqrv17gsjxzdsfashgzk1k7lnw38w04a2g05zs"; depends=[lme4 NAM reshape2]; };
   SpATS = derive2 { name="SpATS"; version="1.0-5"; sha256="0nxv6mnbwd1a9yh883dqhcz6qnjznqc7q6c43s23lggj9wmjlzwj"; depends=[data_table fields plot3Drgl spam]; };
   SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; };
   SpaDES = derive2 { name="SpaDES"; version="1.3.1"; sha256="0a2s0smd0m3dmrjl88hm7dnkv6src96v00bhllc42sq6vq81iwsf"; depends=[archivist chron CircStats data_table DEoptim DiagrammeR digest dplyr DT ff ffbase fpCompare ggplot2 gridBase httr igraph lazyeval lubridate miniUI R_utils RandomFields raster RColorBrewer rstudioapi shiny sp stringi stringr]; };
+  SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.1.0"; sha256="178xcvh5m5hkyjiqq6bgk6a7r7nrfd4fv5r6g27b26inxlpxc2bg"; depends=[bit checkmate CircStats data_table fastdigest fastmatch ff ffbase fpCompare magrittr quickPlot RandomFields raster Rcpp reproducible sp]; };
   SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; };
   SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; };
   SparseDC = derive2 { name="SparseDC"; version="0.1.5"; sha256="15hgcpqr3hmbpm65d15d1lcrwi2vq38pz07rrr4rgr3z2rd7f36g"; depends=[]; };
@@ -3233,17 +3311,17 @@ in with self; {
   SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.5"; sha256="004hbk5fdd5b5hdvg25wl1908pfya26brm2pz00zypfvis99lps3"; depends=[abind flare glasso longitudinal MASS mvtnorm network QUIC]; };
   SpatMCA = derive2 { name="SpatMCA"; version="1.0.0.2"; sha256="1xm29ybbdxspj2ylkkd9qh17sizz1gkc3l34y3d0ivmxz64vn6pj"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; };
   SpatPCA = derive2 { name="SpatPCA"; version="1.1.1.2"; sha256="0v694bmfgwhpz2072f7gshqasd2vywvrbk5ncwq74xk5qrcpx9i7"; depends=[Rcpp RcppArmadillo RcppParallel]; };
-  SpatialAcc = derive2 { name="SpatialAcc"; version="0.1"; sha256="0iawawaabv33rx5582aamagn83f2dvf21025hjpgwzivb9f904i7"; depends=[]; };
+  SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-2"; sha256="1nyxxwvlnhz78pw31dqijp1crlar5nak5934s4h0a4sajv9syif2"; depends=[]; };
   SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
   SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.2"; sha256="1f59da2r36vpz8caq7jncmlq8j4l9g5g5v5a5x4abdm750g6n7mz"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; };
-  SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; };
+  SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-3"; sha256="0rsfrsa4wqmrxc7vybijvzadhshpx3kmivfmq656acqj94g0qnpg"; depends=[fields maps]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
   SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
   SpatialPosition = derive2 { name="SpatialPosition"; version="1.1.1"; sha256="1fbch16qmp8xnlkl7crydn1rh5gj49zlii6c9va5l7zp5wf8cl87"; depends=[raster rgdal rgeos sp]; };
   SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; };
   SpatialVx = derive2 { name="SpatialVx"; version="0.6-1"; sha256="1yscz5w6ydh87qh4ncgn6br49pzg08nqgx95m5bmydqx2r74h9jg"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
   SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; };
-  SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.2"; sha256="1hwlyjpgzf2wgigbc49xcqhf6rzrjzkbriwa4i9gwpa0bnrs4wp1"; depends=[gsubfn splancs]; };
+  SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.7"; sha256="1v3v717ah2fkx9225860dwppdf5m6nnnaaa4iwmj30rn17nqr4jh"; depends=[gsubfn splancs]; };
   SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; };
   SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; };
   SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; };
@@ -3258,7 +3336,7 @@ in with self; {
   StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
   Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; };
   StagedChoiceSplineMix = derive2 { name="StagedChoiceSplineMix"; version="1.0.0"; sha256="1008gm6zv5k8lpv0qg42qjriajmx0n4kshjh76mvx91dpi788ivh"; depends=[plyr]; };
-  StanHeaders = derive2 { name="StanHeaders"; version="2.15.0-1"; sha256="0j3g73fm8ac9kfhb0kv4zk1j12i4klpcdlp71zwbv95v14ll38pf"; depends=[]; };
+  StanHeaders = derive2 { name="StanHeaders"; version="2.16.0-1"; sha256="0i1gq32ys7iwgbdrwc86ww8kj5aqc7jbl663dynackb7wmqwlb7r"; depends=[]; };
   StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
   StatCharrms = derive2 { name="StatCharrms"; version="0.90.4"; sha256="16m7xs3f9mdixjp4gfr9sfl6c2i5cd5cnghhvl19zaxpw6nydixy"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
@@ -3270,6 +3348,7 @@ in with self; {
   StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; };
   SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; };
   Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
+  StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.5.9"; sha256="11lsjiry04m6yf4n1q0kniad6qdrj88pkziabi5glivijq0dh1wr"; depends=[Rcpp]; };
   StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; };
   StereoMorph = derive2 { name="StereoMorph"; version="1.6.1"; sha256="1q0fif4azv8nd37smhmr61mr4fls1jpm1ky40aqlv6kjm336pn1c"; depends=[bezier jpeg png Rcpp rjson shiny svgViewR tiff]; };
   Stickbreaker = derive2 { name="Stickbreaker"; version="1.0.0"; sha256="11g97yj61s09d1687algr9f80gcgw8fadc1vbadglxh7l9wxj6lv"; depends=[lattice nnet xtable]; };
@@ -3279,13 +3358,14 @@ in with self; {
   StratSel = derive2 { name="StratSel"; version="1.2"; sha256="11dkhyh0xgl23f9ksxcjl6bqfhwm6k6i1chgx23dvjifbm6s5s5p"; depends=[Formula MASS memisc mnormt pbivnorm]; };
   Strategy = derive2 { name="Strategy"; version="1.0.0"; sha256="1s89rl6h68sn8px3g7bhhrwmn6k4kmdqhiz0d39xr3kgpfpvi5i2"; depends=[xts zoo]; };
   StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.2.0"; sha256="0iwzvschncb2vrmsawb6i94shn2cjbkph854x1z4ykr6ddw411g2"; depends=[plyr]; };
-  StratifiedRF = derive2 { name="StratifiedRF"; version="0.1.1"; sha256="0w9bd6j9mh8zib3l5xn52sj9babin0q163xqr3cyirq18fm96s6h"; depends=[C50 dplyr]; };
+  StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; };
   StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; };
   StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; };
   StroupGLMM = derive2 { name="StroupGLMM"; version="0.1.0"; sha256="1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd"; depends=[aod broom car ggplot2 lme4 lmerTest lsmeans MASS mutoss nlme pbkrtest phia survey]; };
   StructFDR = derive2 { name="StructFDR"; version="1.2"; sha256="00h3mx7kf01snngkcarhyidqiycvnjhcs81x3kprgp6597md7ph1"; depends=[ape cluster dirmult matrixStats nlme]; };
   SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
   SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; };
+  SubTite = derive2 { name="SubTite"; version="1.0.1"; sha256="0zf65ds771831xlrnyvknpis81ns0p29yr7w1a7ifczn17wmx796"; depends=[Rcpp RcppArmadillo]; };
   SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; };
   SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; };
   SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; };
@@ -3293,10 +3373,11 @@ in with self; {
   Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; };
   SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
   SuperExactTest = derive2 { name="SuperExactTest"; version="0.99.4"; sha256="0wjqvwff5ag8hh6v2plc774hk6ydsyvr6ihlp9a15v0f0p61x6bk"; depends=[]; };
-  SuperLearner = derive2 { name="SuperLearner"; version="2.0-21"; sha256="0j349yv510s1qjkpks24qrfgr2bip1m70i5dh9ydlna280k43dbh"; depends=[cvAUC nnls]; };
+  SuperGauss = derive2 { name="SuperGauss"; version="1.0"; sha256="1yqskaz4zsx87mcb9p7081h2lilaiwa3213yxlkyihyans7gnmp8"; depends=[fftw Rcpp RcppEigen]; };
+  SuperLearner = derive2 { name="SuperLearner"; version="2.0-22"; sha256="1yajqqsxfrp9ybaa8ffwdrbwm3rfy5pgp6ma1ak43qg3plclllyr"; depends=[cvAUC nnls]; };
   SuperRanker = derive2 { name="SuperRanker"; version="1.0.1"; sha256="0s5d38xaan4jznb3nlr9rj054haf6wks0229lggykj8mfz746wky"; depends=[prodlim Rcpp]; };
   SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; };
-  Surrogate = derive2 { name="Surrogate"; version="0.2"; sha256="1pihjgrf621if12fs7kjk8d8zq3xf2ppji4c5dah10imy5kj8z0x"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; };
+  Surrogate = derive2 { name="Surrogate"; version="0.4"; sha256="04lscndba5imqjhd8ajb13812qsg0yzpgdfyjlz3y9xzvafpkg3w"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; };
   SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; };
   SurvDisc = derive2 { name="SurvDisc"; version="0.1.0"; sha256="0iqjimrljh9iaw3s406v6j03xg62ysf9xdia1yxr2ray38j8148c"; depends=[cubature MASS mvtnorm nlme simex survival]; };
   SurvLong = derive2 { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
@@ -3315,7 +3396,7 @@ in with self; {
   SynergizeR = derive2 { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAM = derive2 { name="TAM"; version="2.3-18"; sha256="0kv8wf8s7wbgiqgzki2s514f07q3ny04phxy06b2vsf4fg0m57xh"; depends=[CDM coda GPArotation lattice lavaan MASS mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc WrightMap]; };
+  TAM = derive2 { name="TAM"; version="2.6-2"; sha256="0d7dgwn9pqpv9y4i9kh323rrdrd7ifrgq6l51w9kckwagvbhcmn1"; depends=[CDM coda mvtnorm Rcpp RcppArmadillo sfsmisc]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; };
   TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2016.12-1"; sha256="1b3v30zi6ssac866grhgki2bpzbk06pd8vrfya3zcc5anry699bm"; depends=[Rcpp]; };
@@ -3324,6 +3405,7 @@ in with self; {
   TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
   TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; };
   TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; };
+  TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.0"; sha256="1jh4gw9z6kq3lzg2xdr5yw0y9c21zcairwi88lm45px0vd5c4nqh"; depends=[httr jsonlite testthat]; };
   TDA = derive2 { name="TDA"; version="1.5.1"; sha256="1ab60b1wk2j4271vikbglkk12nwl77d5b9w3xqvzpcbrbjfqsmjh"; depends=[BH FNN igraph Rcpp RcppEigen scales]; };
   TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
   TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; };
@@ -3348,7 +3430,7 @@ in with self; {
   TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; };
   TLMoments = derive2 { name="TLMoments"; version="0.7.2.1"; sha256="1xgkbdnh79dj54jg5kf0c5kwykcvjaf4y16yyqf0vcc7aand6a3y"; depends=[hypergeo Rcpp]; };
   TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; };
-  TMB = derive2 { name="TMB"; version="1.7.10"; sha256="1rliy1zx7qrabsmc8a9qwxa1qzlkambmr5zavdr8pgk30pl2mh84"; depends=[Matrix RcppEigen]; };
+  TMB = derive2 { name="TMB"; version="1.7.11"; sha256="1v74iw4pmklhnq5rc0xaahrfd78bgz1fylnwp8gahha72lbcdzrq"; depends=[Matrix RcppEigen]; };
   TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
   TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; };
   TOSTER = derive2 { name="TOSTER"; version="0.2.3"; sha256="1wyzlil7sznf0gldnmga9qkbj4qcfrbpm8imns18dpfrz3kxaw4i"; depends=[ggplot2 jmvcore R6]; };
@@ -3363,6 +3445,7 @@ in with self; {
   TRSbook = derive2 { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
   TSA = derive2 { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
   TSCS = derive2 { name="TSCS"; version="0.1.0"; sha256="19g74xbk9q8xrwl2d2bld3hlbj0gcl2paxbpf8lv75x79pmkywan"; depends=[ggplot2 rgl tseries]; };
+  TSF = derive2 { name="TSF"; version="0.1.1"; sha256="0v3pq64yknp3n6lw6c87slv1avsv7rlb82gm670q4jzv5d174phv"; depends=[forecast fracdiff]; };
   TSGSIS = derive2 { name="TSGSIS"; version="0.1"; sha256="0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n"; depends=[glmnet MASS]; };
   TSHRC = derive2 { name="TSHRC"; version="0.1-5"; sha256="05vv2zdkzlg04dicwa0lyww92fiafr7bnvsbm6990xkip1lf3cih"; depends=[]; };
   TSMN = derive2 { name="TSMN"; version="1.0.0"; sha256="12wgcc7szbcbk3d1a17wz96rlwp5l39cn0i03hjsb0sbrs7mjwg5"; depends=[]; };
@@ -3388,13 +3471,14 @@ in with self; {
   TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; };
   TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.3"; sha256="0a1v0lsfcn32w5rwcjwmvh0rghamwr5a76rx3npa6kv0dymnvhxf"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape tcltk2 zoo]; };
   TTCA = derive2 { name="TTCA"; version="0.1.1"; sha256="16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h"; depends=[MASS Matrix quantreg RISmed tcltk2 VennDiagram]; };
-  TTR = derive2 { name="TTR"; version="0.23-1"; sha256="1bmj0ngd3i3a9l2zsanifq3irz3rhsyd2rvvlhyndsgadkq9i5v9"; depends=[xts zoo]; };
+  TTR = derive2 { name="TTR"; version="0.23-2"; sha256="0djlqwbqqzlnjali8qs00vvd6h0qa8rmcr7csrrxan0x6v9c27qs"; depends=[curl xts zoo]; };
   TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; };
   TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
   TUWmodel = derive2 { name="TUWmodel"; version="0.1-8"; sha256="0c00jd2bq4i5fd55hj7l2grkpn990p0kmhbsh95b2zrzhbwgcjp6"; depends=[]; };
   Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
   TableMonster = derive2 { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; };
   TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; };
+  TailRank = derive2 { name="TailRank"; version="3.1.3"; sha256="1d1i2i12lg4isyy9d37anpd26v7jp9ph5p82dkv66bhsj8fb0y8m"; depends=[Biobase oompaBase oompaData]; };
   TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; };
   TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; };
   TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; };
@@ -3414,12 +3498,13 @@ in with self; {
   TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; };
   TestSurvRec = derive2 { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[boot survrec]; };
   TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.0"; sha256="1fagy9168cz09p460pa0qyn8m79zg4i2b9j5vg8gm1ssqi2znsl9"; depends=[alabama DoseFinding lattice]; };
+  ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; };
   Thermimage = derive2 { name="Thermimage"; version="3.0.0"; sha256="0l098praarg5kg0m5hxs9zbwhl8w7g48ngyiry1rlwkp2rsl3cza"; depends=[png tiff]; };
   Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
   ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-0"; sha256="075cn99k06lgdd0cwl1i9242fcxwmd5malcyks0mmwjf9kzw00z2"; depends=[MASS numDeriv]; };
   ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; };
   ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; };
-  ThresholdROC = derive2 { name="ThresholdROC"; version="2.3"; sha256="08bmjsbwndb5i902plsy1wa5c1i5f96r3s6fdy0a16w9n6rvll1k"; depends=[MASS numDeriv pROC]; };
+  ThresholdROC = derive2 { name="ThresholdROC"; version="2.5"; sha256="1c727qbplwrclhg41jjygm6a5k45whzar9pjm2nlp9ccr9fv710a"; depends=[MASS numDeriv pROC]; };
   TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; };
   TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
   TideCurves = derive2 { name="TideCurves"; version="0.0.2"; sha256="1xm8df18i3pzb2v5g2li9axdx1hhg63q3j73381s88iadvqgf3aq"; depends=[chron data_table fields]; };
@@ -3439,25 +3524,25 @@ in with self; {
   Tnseq = derive2 { name="Tnseq"; version="0.1.2"; sha256="1n76yzk15p8i5bp3k6fszmdqk2d791r4sb8hg5hb61zb92r7wqlj"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; };
   TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; };
   TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="0.1"; sha256="1477zp8jzq1p22q8484vkrdx5nxwq4i44mxg4zhj9fixiw4shpx9"; depends=[ape]; };
-  TraMineR = derive2 { name="TraMineR"; version="2.0-6"; sha256="1yinx7ym8rj8z9p98bz9sw3vxnr4gk6vk7j9shskrraz5md5siw0"; depends=[boot cluster Hmisc RColorBrewer]; };
-  TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.0"; sha256="1n8i815cr8fclfrh97pzbyyrcv0v8y4j9y6c14bz0kzx8n7pzjy1"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
+  TraMineR = derive2 { name="TraMineR"; version="2.0-7"; sha256="0skc52da2l137zx015yx28bw43z4snl01ahm7d0x1gnp3ps7lvr9"; depends=[boot cluster Hmisc RColorBrewer]; };
+  TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.1"; sha256="11vr9f0l4bg4cga5wfflrmq3zhs1hdwmv18xxgni194g642h7k8b"; depends=[cluster RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
   Trading = derive2 { name="Trading"; version="1.1"; sha256="1mzqck9n14xp16vflx1sx8lry0wjmx37hqv76ldj21xnk5zbrgil"; depends=[]; };
   Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; };
   TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; };
   TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; };
   TransferEntropy = derive2 { name="TransferEntropy"; version="1.4"; sha256="0620axdj6qyskf7xszrs8j5d2l73ns4bgbdg03fvr8i7jmq70zb8"; depends=[BH Rcpp]; };
-  TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.0.3"; sha256="00z85vmpy7k4vi2jj9yspybc9hkwqqfnvl1x9jqayyb8xw8wk0f6"; depends=[binom ggplot2 survival]; };
-  TreeBUGS = derive2 { name="TreeBUGS"; version="1.1.0"; sha256="1xw3wqax6d8pys2177cj6bdp92xx7pr08y6qa1g3k83hhi2frikw"; depends=[coda hypergeo MASS Rcpp RcppArmadillo rjags runjags]; };
+  TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; };
+  TreeBUGS = derive2 { name="TreeBUGS"; version="1.1.1"; sha256="1zhxmmks263khrdckp570j6lykfhhlpc6rnhw3rk35a9k89yp90v"; depends=[coda hypergeo MASS Rcpp RcppArmadillo rjags runjags]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
   TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; };
-  TreeSimGM = derive2 { name="TreeSimGM"; version="2.1"; sha256="1aqycpin2v99n7ayfk1l54l4s6nzwxl9qpl89i8is45bnnwy9fln"; depends=[ape TreeSim]; };
-  TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.1"; sha256="1fph4sz3y7drni0mjivz82jvmfa8hp468vmqk00k51w4nkg3hyif"; depends=[]; };
+  TreeSimGM = derive2 { name="TreeSimGM"; version="2.2"; sha256="14m7m3krhbwnm5l254cy12i201kjfbbvnsajkgljkmpqxn0cg5vb"; depends=[ape TreeSim]; };
+  TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.2"; sha256="0ymlgalddnfnb55s31bysm68yh823ys0rr5fgiic4a2ipnbfd8qf"; depends=[pROC rms]; };
   TriMatch = derive2 { name="TriMatch"; version="0.9.7"; sha256="06idgh9bwwbwa16hlc2kgm06n9shzm0825f7k65zpz3isq23dp7q"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; };
   TriadSim = derive2 { name="TriadSim"; version="0.1.1"; sha256="0m14k512b7q09zx51v2kxa8q9pk2i179w6ckl6jxj2acc860xw3k"; depends=[doParallel foreach snpStats]; };
   TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
   TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; };
-  TropFishR = derive2 { name="TropFishR"; version="1.1.3"; sha256="114vg4jvb1k7mzz81ag1hs7zvpnq4ql68p55xbci24gi3qg5s7cj"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; };
+  TropFishR = derive2 { name="TropFishR"; version="1.1.4"; sha256="120w48rjszcs9c59vi4my98jdbg08s9lld93j38g7a6gnkv2hg8s"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; };
   TruncatedNormal = derive2 { name="TruncatedNormal"; version="1.0"; sha256="1qj18xcq58xah1niwxgqqzscl7dfgxh2s8fdbzk1vigwwm5xfvij"; depends=[randtoolbox]; };
   Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
   TukeyC = derive2 { name="TukeyC"; version="1.1-5"; sha256="08s9scsd2l6wavc7qqlffjbf89vkd6xpb4iawvbqf7jh8jiyvw17"; depends=[]; };
@@ -3467,12 +3552,12 @@ in with self; {
   TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; };
   TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.5"; sha256="050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck"; depends=[survival]; };
   UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; };
-  UBL = derive2 { name="UBL"; version="0.0.5"; sha256="13dvfpkyn9fc2lwlxzf5s47zjhgjnm7s9825w2brgq4l6x5afz9q"; depends=[]; };
+  UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; };
   UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; };
   UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; };
   UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; };
   UPMASK = derive2 { name="UPMASK"; version="1.1"; sha256="1qxajvld8g2mii12agypcm50fps9bai6d2wx6l0bv3srk80in7ai"; depends=[DBI MASS RSQLite]; };
-  USAboundaries = derive2 { name="USAboundaries"; version="0.2.0"; sha256="1if3wf22h395iqcn1n5rfnacwhxd3mpmbvygdwbs2amk55r18vg4"; depends=[sp]; };
+  USAboundaries = derive2 { name="USAboundaries"; version="0.3.0"; sha256="0rza1np6320xm9ppn458cwgz4zaq173m3g0ylvxbx1fxq716lqj6"; depends=[]; };
   USGSstates2k = derive2 { name="USGSstates2k"; version="1.0.1"; sha256="11yk0pkss23j6fmmxnjkjm9p24ln343y4hijigbrbvcnb21wj2py"; depends=[sp]; };
   UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; };
   UScensus2000cdp = derive2 { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[foreign maptools sp]; };
@@ -3481,6 +3566,7 @@ in with self; {
   UStatBookABSC = derive2 { name="UStatBookABSC"; version="1.0.0"; sha256="16r6clhfaalfsg5hmvzm8a128zygxax5hyc0vr1q9bsw9hj7cs0c"; depends=[]; };
   UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
   Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; };
+  Umpire = derive2 { name="Umpire"; version="1.3.4"; sha256="0kxndg96ah6sk1m216f2dmkg73w10lyg3rv7qsrnn145mznsdlw1"; depends=[]; };
   UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; };
   UncertainInterval = derive2 { name="UncertainInterval"; version="0.3.0"; sha256="09x52g691qqsphy2sppm3852gak0ammsan4x306vd16yz9z0zlb2"; depends=[nloptr reshape2 rootSolve]; };
   Unicode = derive2 { name="Unicode"; version="9.0.0-1"; sha256="1daf4wlglqzha0p6cbmrkwn4ppkzfvpvg1aa64gphr4dg2g5jsdf"; depends=[]; };
@@ -3491,12 +3577,13 @@ in with self; {
   VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
   VARSEDIG = derive2 { name="VARSEDIG"; version="1.3"; sha256="1qvc9lyfdc0irivi4y27hc5yn5lk05nbgqx7zcj602s0r7i7nvln"; depends=[]; };
   VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; };
+  VARtests = derive2 { name="VARtests"; version="1.0.1"; sha256="19xmf4mg4v1fwd002ccinfbsbpcq9qfmzc2sf710mqv6i8ghv6jm"; depends=[Rcpp RcppArmadillo sn]; };
   VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; };
   VBmix = derive2 { name="VBmix"; version="0.3.2"; sha256="09kgllh8wbsgx9ykv95igczy4hi8d8grvffvdkp2zygdiyvkhsxa"; depends=[lattice mnormt pixmap]; };
-  VCA = derive2 { name="VCA"; version="1.3.2"; sha256="10d8vw6ihnsmqgvbfd6dwdilk9mz9wvmlxi39fpq219mqvqyzkah"; depends=[lme4 Matrix numDeriv]; };
+  VCA = derive2 { name="VCA"; version="1.3.3"; sha256="03ibvn3a6bbgq36a1ibhi4givdnba6d0qcfbpbdxkz5masn1r23q"; depends=[lme4 Matrix numDeriv]; };
   VDA = derive2 { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
   VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; };
-  VGAM = derive2 { name="VGAM"; version="1.0-3"; sha256="0wr6szcpj8r4a1rlzgd6iym7khin69fmvxcf37iyvs8mms86dfr3"; depends=[]; };
+  VGAM = derive2 { name="VGAM"; version="1.0-4"; sha256="0r59hyp3afmvms890b3v2yyckf8v0qkjf2w11rnqd2zgg1gri0g5"; depends=[]; };
   VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; };
   VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
   VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
@@ -3507,7 +3594,7 @@ in with self; {
   VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
   VLMC = derive2 { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; };
   VNM = derive2 { name="VNM"; version="5.1"; sha256="132m23np3qk4cf2fnsjg0ykcifqs20psavybmzs5b86qp9m77h9h"; depends=[Rcpp]; };
-  VRPM = derive2 { name="VRPM"; version="1.1"; sha256="19rr31w0yzy7w9k34ny2sjk9ijwgnkfzbdizdch77g9rnpzpw597"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; };
+  VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; };
   VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; };
   VSURF = derive2 { name="VSURF"; version="1.0.3"; sha256="0fgy1qk1jkrnil4cirkp2lj21xjwbpgjgxqrsjs321s69rw2dy1j"; depends=[doParallel foreach randomForest rpart]; };
   VTrack = derive2 { name="VTrack"; version="1.11"; sha256="1w8zp7l60mwzppg3gqq0zv5a065y0vdrp2v0x0yl4a8jq0zlvppx"; depends=[doParallel foreach plotKML sp spacetime]; };
@@ -3531,7 +3618,7 @@ in with self; {
   VetResearchLMM = derive2 { name="VetResearchLMM"; version="0.2.0"; sha256="1vx72pn3fl27mjsa48kz5j1sj1bkjq8q0ifs5dxdfrcdswfqhjcw"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; };
   ViSiElse = derive2 { name="ViSiElse"; version="1.2.0"; sha256="0k5hhzyjws0haawx2r2c0rxjbjdfx821x0jmj88786q6x67x86n0"; depends=[chron colorspace Matrix stringr]; };
   VideoComparison = derive2 { name="VideoComparison"; version="0.15"; sha256="0592fz0v4xvq1qy2hj4ph90v7zn1cnzr6a094mp9p1k61ki3fbg2"; depends=[pracma Rcpp RCurl RJSONIO zoo]; };
-  VineCopula = derive2 { name="VineCopula"; version="2.1.2"; sha256="0h1h0sk7s4gh5ngsyjbaw6j535yycng2r4lm5ysrzv46lm6x5y03"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
+  VineCopula = derive2 { name="VineCopula"; version="2.1.3"; sha256="1v15fq4wgqcxwkqzk1wyfsmlrslshlp0faxmnfajis7a59cwlwgp"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
   VisuClust = derive2 { name="VisuClust"; version="1.2"; sha256="0hnjmrz352950rzky88q4nwvkx7zp6x3lsm7kff5dl4w05iq4wsl"; depends=[aplpack]; };
   VizOR = derive2 { name="VizOR"; version="0.8-5"; sha256="1v76m67xdlg06w3dmp27mh3mv3lfqy6bd1iq907dynp2g4qf4ww0"; depends=[lattice rms]; };
   Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
@@ -3544,7 +3631,7 @@ in with self; {
   WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
   WDI = derive2 { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
   WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; };
-  WGCNA = derive2 { name="WGCNA"; version="1.51"; sha256="0hzvnhw76vwg8bl8x368f0c5szpwb8323bmrb3bir93i5bmfjsxx"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore survival]; };
+  WGCNA = derive2 { name="WGCNA"; version="1.61"; sha256="1vrc2k33a196hrrl7k0z534fp96vv0shmigcr65ny1q0v6lq0h6i"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; };
   WHO = derive2 { name="WHO"; version="0.2"; sha256="0rpk7ddpkjcqs0m7cgxs55k178js0d70ccfximp2vqrsw0igkmk9"; depends=[dplyr httr]; };
   WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; };
   WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
@@ -3553,7 +3640,7 @@ in with self; {
   WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; };
   WRS2 = derive2 { name="WRS2"; version="0.9-2"; sha256="0szjq9ffckjqa128avs4cymqvxk7dhldzj620kcq7q59aagrnj04"; depends=[MASS mc2d plyr reshape]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.0"; sha256="0yyhls0qzwwj4sz5d1nvzfiacx28dmf2hgjc7xgfi2qjkckg40hs"; depends=[caret dplyr EnvStats fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="0.2.4"; sha256="13vivk497ix0qpww705awws69lgn8whminfvs53inlyqnqinrwp4"; depends=[ggplot2 gridExtra mgcv plotly replyr reshape2 sigr wrapr]; };
+  WVPlots = derive2 { name="WVPlots"; version="0.2.5"; sha256="0d1za8mp1ikaav756kqlnl0c0k08cg9dqfnn58izw3k5g6g4l4bn"; depends=[ggplot2 gridExtra mgcv plotly replyr reshape2 sigr wrapr]; };
   WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
   WWR = derive2 { name="WWR"; version="1.2.0"; sha256="1m60zchm1f85m2b5h1yqcyhnm4593d0r7wakhmx5zpkhbx1rhgmg"; depends=[inline]; };
   WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; };
@@ -3566,8 +3653,8 @@ in with self; {
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.2-1"; sha256="04gsr65mssv4cz4v8sh44qhyzn0isll057d45z4ljv6sx0an5yhl"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
-  WeightedROC = derive2 { name="WeightedROC"; version="2017.06.08"; sha256="07vx6blkq86cqsraxp9sixd4y4vrrmdxnzkp1c8jpivzpqiydh9y"; depends=[]; };
-  WhatIf = derive2 { name="WhatIf"; version="1.5-8"; sha256="0vnkb16ap1aiqbmcw18cr558kyixq0rmfcwh0bp6v1djwb78adhd"; depends=[lpSolve Zelig]; };
+  WeightedROC = derive2 { name="WeightedROC"; version="2017.07.12"; sha256="1s9ic2nv4xd3j9xhan46fv9a14n70v0skw9q70rix6kaydi6cjf9"; depends=[]; };
+  WhatIf = derive2 { name="WhatIf"; version="1.5-9"; sha256="0ihpp3wbhpsg00g0s31l0ca4q0a2sch2a2j8cgz14g8na43x8831"; depends=[lpSolve pbmcapply Zelig]; };
   WhiteStripe = derive2 { name="WhiteStripe"; version="2.2.2"; sha256="0jaxy5a4m4ir25assi2dsdgfcm88lbgjdghsh36v7zvhblrfcfap"; depends=[mgcv oro_nifti]; };
   WhopGenome = derive2 { name="WhopGenome"; version="0.9.7"; sha256="1xa7d9x5ny8g79scfkv7v5ix9m3mfzg0fks2bsan9zqyhcd01fsq"; depends=[]; };
   WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; };
@@ -3579,7 +3666,7 @@ in with self; {
   WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
   Wmisc = derive2 { name="Wmisc"; version="0.3.2"; sha256="1dyfpmsl1fdznnz79l8zkp6v4kxc9a260qp7g52mwxj9xw0jb0z7"; depends=[hash R6 Rcpp]; };
   WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
-  Wrapped = derive2 { name="Wrapped"; version="1.0"; sha256="1c12yk0qw017ccdjr2hk6zxm93735hx7lwg2gp2cj15yb3rwnscf"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; };
+  Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; };
   WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; };
   WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; };
   WufooR = derive2 { name="WufooR"; version="0.6.2"; sha256="1k5nmg8mg8m9salcb0jr87ws548ydc597v8m94y4qrrfchy623rg"; depends=[dplyr httr jsonlite]; };
@@ -3608,13 +3695,13 @@ in with self; {
   ZIM = derive2 { name="ZIM"; version="1.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; };
   ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; };
   ZeBook = derive2 { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; };
-  Zelig = derive2 { name="Zelig"; version="5.1-2"; sha256="00i36haj1ac99fins20nx1ljp5dmkw7gcx8yz7brz9a8as5k02r9"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
+  Zelig = derive2 { name="Zelig"; version="5.1-3"; sha256="0qk2i8z07b69vnnmxl33cqxxccjybzqy6rm0vgbjlk7xcl4c1bpd"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
   ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-6"; sha256="1whfwc42lsi54xfr423h6jwbvpj6yjyyf0854k1f1ms13liahm8w"; depends=[dplyr Formula jsonlite MASS VGAM Zelig]; };
   ZeligEI = derive2 { name="ZeligEI"; version="0.1-2"; sha256="0kilzfqmm6a41mmjvlynh3rnj30fqiq8gsja28fzwpf0lbl89slg"; depends=[dplyr ei eiPack Formula jsonlite MASS MCMCpack Zelig]; };
   ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; };
   aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; };
   aLFQ = derive2 { name="aLFQ"; version="1.3.4"; sha256="1q2l5cwkcsng22nxckgc7aalvy3qhvgga5nkchfpy53sxg68awqv"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
-  aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.0"; sha256="128f3ggnqpdv12d1f1hpkq5nb1wdwihifvvb2k2ixizmhw7vn6dy"; depends=[]; };
+  aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; };
   aRxiv = derive2 { name="aRxiv"; version="0.5.16"; sha256="1dghv40waprld9gg81p2is72sk0z6fla0pfiqzzfhky8lazaih01"; depends=[httr XML]; };
   aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; };
   aSPU = derive2 { name="aSPU"; version="1.48"; sha256="0kjvwwvyhiz9i5kxqg68lq6cvxnk9vzvp5zca5hfv2g77j42wh9h"; depends=[fields gee MASS matrixStats mvtnorm]; };
@@ -3624,7 +3711,7 @@ in with self; {
   abc = derive2 { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
   abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
   abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; };
-  abcrf = derive2 { name="abcrf"; version="1.5"; sha256="1jfplr549cd6mpm694spc8ws0d56q3pa5wv1z57blayk4mxnczwv"; depends=[MASS ranger readr stringr]; };
+  abcrf = derive2 { name="abcrf"; version="1.6"; sha256="0qphqw4wg6dl0chfwvf4bxm0kdgsbcvlpshjhimkklmvpxbh1957"; depends=[MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; };
   abctools = derive2 { name="abctools"; version="1.1.1"; sha256="0x6pjdvn5z510j42byddzdvg2mgv81yy72snia5k8h7bs9k5glfg"; depends=[abc abind Hmisc plyr]; };
   abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; };
   abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
@@ -3638,7 +3725,7 @@ in with self; {
   accelmissing = derive2 { name="accelmissing"; version="1.1"; sha256="0s2vy16zcpvbqyqz4ifdqccs6bfp8sf7azvfy8jjcm73xncv6ij3"; depends=[mice pscl]; };
   accrual = derive2 { name="accrual"; version="1.2"; sha256="1d9jis7d2fihkmwlqqvjl2kh6dcinzbffc9c0m4aqwzaq7c6ngjx"; depends=[fgui SMPracticals tcltk2]; };
   accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; };
-  acebayes = derive2 { name="acebayes"; version="1.4"; sha256="1wjbcf8v277rfr79zh68xws60xahc0bkb9bkapzsz0bbcg7h3hmg"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
+  acebayes = derive2 { name="acebayes"; version="1.4.1"; sha256="0wkygvhwf0y5jzkcj6prjmr9dlak1xgsbswlixqwrx5b48iqxgwh"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
   acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; };
   acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; };
   acm4r = derive2 { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
@@ -3647,7 +3734,7 @@ in with self; {
   acopula = derive2 { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
   acp = derive2 { name="acp"; version="2.1"; sha256="0lcwbjcyyr32m6qjmjqh25qjwrbyqj1n092xhgbhxzd8fslppnmn"; depends=[quantmod tseries]; };
   acrt = derive2 { name="acrt"; version="1.0.1"; sha256="0y9ndcq8ffpfrv7w9rikm4zn68jpsj6baqisq9kp2433xrwzdb6s"; depends=[Rcpp RcppEigen sandwich]; };
-  acs = derive2 { name="acs"; version="2.0"; sha256="0iddpjbswmxgqbly35gw1f9h3kv7yq3y72j9ngzq6xx00jarc3y7"; depends=[plyr RCurl stringr XML]; };
+  acs = derive2 { name="acs"; version="2.1.1"; sha256="0c0w9ayjb80nmibg2fsyz61ywciiyyvjaym4y1lsx946hzg5arqj"; depends=[httr plyr stringr XML]; };
   acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
   acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
   activity = derive2 { name="activity"; version="1.1"; sha256="1lqajgxfps2h6amz1791vp3f52rs9ghmanq1nqfxqd2jmk3idkrx"; depends=[circular overlap pbapply]; };
@@ -3658,18 +3745,20 @@ in with self; {
   adagio = derive2 { name="adagio"; version="0.6.5"; sha256="0jy8g5604alaqbi5ynj95ig07igzbgk8x03a4x1rzkvfwvydfflz"; depends=[]; };
   adapr = derive2 { name="adapr"; version="1.0.2"; sha256="1mbl0b9njjf0zwddkylmwyvrridqqx69v9invxqhc5kc6fvk4f10"; depends=[devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard]; };
   adaptDA = derive2 { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; };
-  adaptMCMC = derive2 { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; };
+  adaptMCMC = derive2 { name="adaptMCMC"; version="1.2"; sha256="07zf7kv7q885zjqxcrdl09mzjmjn028g40r1l11y8cg697q0qx75"; depends=[coda Matrix]; };
   adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
-  adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1"; sha256="0jp9wfl4yz7fzxgdh3ixnsb1sr0y4rhifkv4j113dkiy719s7h8m"; depends=[ape ggplot2 phyloseq shiny]; };
+  adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.1"; sha256="1jhkiz0gdjvgclqfksm10zza9iwy1z6k5wpviwa4r9a936f1i88k"; depends=[ape ggplot2 phyloseq shiny]; };
   adaptivetau = derive2 { name="adaptivetau"; version="2.2-1"; sha256="1hd2l1jv4i5mg0k0g8bbrvv43nk1zxbwh21594zayrzjyikb2593"; depends=[]; };
   adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; };
   addhaz = derive2 { name="addhaz"; version="0.4"; sha256="0i3czmv538m8s3pnxrhh2a1mrdv9m3hgzjkb25p7hygwnzz54drg"; depends=[boot MASS Matrix]; };
   addhazard = derive2 { name="addhazard"; version="1.1.0"; sha256="0hk7br52wjmq605xgslv8lspr35aqpdgkiz2yljz31khy3y3vi8c"; depends=[ahaz rootSolve survival]; };
   addinslist = derive2 { name="addinslist"; version="0.2"; sha256="04jqhdy0axs1a9c0cfi3pqy9hd67jqxz79a2lj209gd27qv1q22c"; depends=[curl devtools DT miniUI rappdirs rmarkdown rvest shiny shinyjs xml2]; };
+  additiveDEA = derive2 { name="additiveDEA"; version="1.0"; sha256="0hnjmcv8gicpbmvw57igmj61kafas3apis90fzviyg2dc8fymgbi"; depends=[Benchmarking lpSolveAPI]; };
   additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
   addreg = derive2 { name="addreg"; version="2.0"; sha256="1lc8p70di466i061jrbahq4hir4g5a8rns6044jjjg8v7b1y8alc"; depends=[combinat glm2]; };
-  ade4 = derive2 { name="ade4"; version="1.7-6"; sha256="0lnc37d6waajmagy8qvw206pyc4vgrpzl3hk3j9frh6wa0b8x140"; depends=[]; };
+  ade4 = derive2 { name="ade4"; version="1.7-8"; sha256="1a5p3wf8l9cp1bjp57b1pc5bqs39kw1v21i4waj9j18wawzlmpb6"; depends=[]; };
   ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; };
+  adeba = derive2 { name="adeba"; version="1.0.2"; sha256="12zs6rh7sl1fsf8q20hgqms5pykmysnb9mfcwf9x63g44yi26dj4"; depends=[pdist Rcpp]; };
   adegenet = derive2 { name="adegenet"; version="2.0.1"; sha256="045vc1s1n4ihw9id02c3w315pgfr004was2b0d6xb07ncipg9pby"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; };
   adegraphics = derive2 { name="adegraphics"; version="1.0-8"; sha256="1588n1cqgzdv4lpdgsyj47mha41n11sb36vvjdix3drncq997p9b"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
   adehabitat = derive2 { name="adehabitat"; version="1.8.18"; sha256="1ng55j95hzhh853qa55mfx4xdh954ap8pqy01kyg5mgyn45i7rpa"; depends=[ade4 shapefiles sp tkrplot]; };
@@ -3678,9 +3767,11 @@ in with self; {
   adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.21"; sha256="0anyvijvlrq7c0a77dpcyq60yl1jc817rj5cb3s9iq6scicymp87"; depends=[ade4 adehabitatMA CircStats sp]; };
   adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.11"; sha256="1911zdpwyr1gqyjvnn5w3blhk0mjafy0xmr3l6l749lx4cwa08d9"; depends=[filehash sp]; };
   adephylo = derive2 { name="adephylo"; version="1.1-10"; sha256="1hj9nkl2z2xdb5yv9a7fb7zn9sd41lrhk2ff5z8s88xab3b2vhnc"; depends=[ade4 adegenet ape phylobase]; };
+  adepro = derive2 { name="adepro"; version="0.1.0"; sha256="0gvqfrdmd755nz72022wq5vmdh2z83lr7bg44b07bxyd6id2pak0"; depends=[audio Cairo MASS shape shiny shinyBS]; };
   adespatial = derive2 { name="adespatial"; version="0.0-8"; sha256="0h2waffkgdns5pz47zhy0wi388hrya6s01gwgwbyp7fgxj65i9ba"; depends=[ade4 adegraphics lattice MASS shiny sp spdep]; };
   adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; };
   adimpro = derive2 { name="adimpro"; version="0.8.2"; sha256="0nfzk9pp4p16c1nvpidngag96r845376h8ljh7m6p6rhk9fs4jdw"; depends=[awsMethods]; };
+  adiv = derive2 { name="adiv"; version="1.0"; sha256="1q6miic5y0zdj1wsnih4jdwg9shmdgv8bxrgfq92dyb5v5zwax5c"; depends=[ade4 adephylo ape cluster phylobase]; };
   adlift = derive2 { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; };
   admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; };
   ads = derive2 { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; };
@@ -3694,12 +3785,14 @@ in with self; {
   aftgee = derive2 { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; };
   agRee = derive2 { name="agRee"; version="0.5-0"; sha256="16ijw02x5qvc8rppf0yn35aljd35alnvjkjyi6725nywjib2xy5x"; depends=[coda lme4 miscF R2jags]; };
   agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
-  agricolae = derive2 { name="agricolae"; version="1.2-4"; sha256="115k72riidc2dmq6gz52vqv63ijwj6akdwp31k14qmlv3a28asiz"; depends=[AlgDesign cluster klaR MASS nlme spdep]; };
+  agricolae = derive2 { name="agricolae"; version="1.2-6"; sha256="04dk0fwszdrmqsrnaxf6h5bi3mmv5pvbi26f4kpzm82pc5x0kh4j"; depends=[AlgDesign cluster klaR MASS nlme spdep]; };
   agridat = derive2 { name="agridat"; version="1.12"; sha256="1b3dgrp6mkfpfaywqdm22sakadhnl1vlyj1n3rq6bc2f0gf8kcrw"; depends=[lattice reshape2]; };
   agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; };
   agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
   ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; };
+  ahnr = derive2 { name="ahnr"; version="0.2.0"; sha256="0bfy7xxfxfzhv4yl9dlsyl304673p23r2h0lz3lv75iqp2gbzdjr"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; };
   ahp = derive2 { name="ahp"; version="0.2.11"; sha256="09n06k5dmmpw6h6s51x9xy6rkk54fswss8pflh3v9nprbx7vzx4i"; depends=[data_tree DiagrammeR formattable yaml]; };
+  aiRthermo = derive2 { name="aiRthermo"; version="1.1"; sha256="0i3sq7i37i82ad70z2mai09rxzk4kk27hfg5jjbh6pajwzyn5yri"; depends=[]; };
   aidar = derive2 { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; };
   aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
   airGR = derive2 { name="airGR"; version="1.0.5.12"; sha256="02nasl8qamvbggwwfpgjfgqazfs1bfv6h48r1kab9wynpgqknynm"; depends=[]; };
@@ -3715,7 +3808,7 @@ in with self; {
   alineR = derive2 { name="alineR"; version="1.1.3"; sha256="000rywvianwi0xm0ccsmc7g2hl9d0zjl3qplidrr7rz872f6snwm"; depends=[]; };
   allan = derive2 { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
   allanvar = derive2 { name="allanvar"; version="1.1"; sha256="142wy1mf4jbp4hy756rz95w24f4j1dgf14f1n5sd09dg4w98j7xg"; depends=[gplots]; };
-  alleHap = derive2 { name="alleHap"; version="0.9.7"; sha256="1fpfi8d6fb1r41fq18b35ngzfmbm9qq0lvdbbgahlgjf9n0zbp30"; depends=[abind]; };
+  alleHap = derive2 { name="alleHap"; version="0.9.9"; sha256="1fqrw645s3f5363p7jl3dzy8xphxdr1v6wdsjmqcqwpgvjqfr2zz"; depends=[abind]; };
   allelematch = derive2 { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; };
   allelic = derive2 { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
   alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; };
@@ -3728,6 +3821,7 @@ in with self; {
   alterryx = derive2 { name="alterryx"; version="0.2.0"; sha256="042cbxw0s43ffmicf25mvg0na1l0x8qbf6rl63ia44r9l3v8jcyd"; depends=[base64enc digest httr jsonlite]; };
   altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; };
   amap = derive2 { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468jwvpxav60qn2w0049bw8llj6xdl"; depends=[]; };
+  ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; };
   ameco = derive2 { name="ameco"; version="0.2.7"; sha256="0n4y2k7cifly94qhfasy8r8i0mgaap1p0s9qqh2i19wiacr348gh"; depends=[]; };
   amei = derive2 { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
   amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; };
@@ -3747,18 +3841,18 @@ in with self; {
   anesrake = derive2 { name="anesrake"; version="0.75"; sha256="1blq1blyq122jlj2yp8l7gam49q6h1wg6c9v0kkfkmnh5dwgz3mm"; depends=[Hmisc weights]; };
   anfis = derive2 { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr9nirp9kxvc8km1qq1i8zaw1bh8pqb"; depends=[]; };
   angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; };
-  aniDom = derive2 { name="aniDom"; version="0.1.1"; sha256="0y7gdcp2926b70clr28qdrs0azqvrx829j5aypl6m8gnwj6qnc45"; depends=[rptR]; };
+  aniDom = derive2 { name="aniDom"; version="0.1.2"; sha256="0lmq7k2l7nk120m96wj8zdsw03dqfvhz9y9miizrhl8db9nw9qka"; depends=[rptR]; };
   anim_plots = derive2 { name="anim.plots"; version="0.2"; sha256="1plpi90qzk4ng0sm77fvqyv1063w67axvdc29q5nvz4h6v4j7ks3"; depends=[animation]; };
   animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
   animation = derive2 { name="animation"; version="2.5"; sha256="0pxmihfr3q1hh4cdnzf7wbzqak5spa3kv4p1wl89giqqngqzwcmj"; depends=[]; };
   anocva = derive2 { name="anocva"; version="0.1.0"; sha256="1kira0bs3yjmsq7zrd4y5zzl948pz3rgbfsvkzidi2n6vvcl5344"; depends=[cluster]; };
   anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
-  anomalyDetection = derive2 { name="anomalyDetection"; version="0.1.1"; sha256="0446qdh8abl02f7s2rli5qh7vl1y075nwirmxhc2i59jl0jhx44f"; depends=[caret dplyr gmp gplots magrittr MASS matrixStats plyr purrr qdapTools RColorBrewer tibble tidyverse]; };
+  anomalyDetection = derive2 { name="anomalyDetection"; version="0.1.2"; sha256="0nn5a7hl5r4g1akpxggqqfgbc56pnm3a08q0i1pd8hmz0rh6apbh"; depends=[caret dplyr gmp gplots magrittr MASS matrixStats plyr purrr qdapTools RColorBrewer tibble tidyverse]; };
   anominate = derive2 { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6bafg3c36a7whnznnww0101da2y0i6dw79lg5"; depends=[coda MCMCpack oc pscl wnominate]; };
   anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; };
-  antaresProcessing = derive2 { name="antaresProcessing"; version="0.10.2"; sha256="0zcwgdypqmfg3444cz7jx2v14z3lvc1mfwhk1sgdmzdf0nm4kakq"; depends=[antaresRead data_table]; };
-  antaresRead = derive2 { name="antaresRead"; version="1.1.3"; sha256="1fkznfhj46wyr2sqn76rynca7yh6lm3cchgpgxrf8hf1gbsxkajy"; depends=[data_table lubridate plyr]; };
-  antaresViz = derive2 { name="antaresViz"; version="0.10"; sha256="07g5hlwdv2dga3irflafgjjfvx568aw0j12z2qyyw86jc07d8cjp"; depends=[antaresProcessing antaresRead data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate magrittr manipulateWidget miniUI plotly shiny sp tibble webshot]; };
+  antaresProcessing = derive2 { name="antaresProcessing"; version="0.11"; sha256="165rqsqq3cp5kak4513rv5ibbq61nipvybvmm4m8ynwbd4q5p7p9"; depends=[antaresRead data_table]; };
+  antaresRead = derive2 { name="antaresRead"; version="1.1.4"; sha256="1n59rspxswxsljhwhbqdcq8grd5899403581rc46bd8l81hldapp"; depends=[data_table lubridate plyr]; };
+  antaresViz = derive2 { name="antaresViz"; version="0.11"; sha256="0v6li8m6zl39pvs7h6cwc5zqsap7q973cqcdwar29l0zrg2f6x4a"; depends=[antaresProcessing antaresRead data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate magrittr manipulateWidget miniUI plotly shiny sp tibble webshot]; };
   antitrust = derive2 { name="antitrust"; version="0.95.1"; sha256="14qz4c78lyfhgh3xyybn2sb8kl4rjzvb3dwrwxl9dzjmk5k6ab7i"; depends=[BB evd ggplot2 MASS numDeriv]; };
   antiword = derive2 { name="antiword"; version="1.1"; sha256="0nbx2l0d2y4qvcw4dw3m26zfkgdmav4cq0l00gib7l3y9pqxzjh5"; depends=[sys]; };
   anytime = derive2 { name="anytime"; version="0.3.0"; sha256="1byhgplskj17d0gib9sajfnzyv8p9slgq1vy8fq9j2ibirl86a91"; depends=[BH RApiDatetime Rcpp]; };
@@ -3772,12 +3866,12 @@ in with self; {
   apaStyle = derive2 { name="apaStyle"; version="0.5"; sha256="1x3kgyxhgbx3r7wi759j75wh811jcm6z559mrk4zm4p99vqz10bl"; depends=[ReporteRs]; };
   apaTables = derive2 { name="apaTables"; version="1.5.1"; sha256="1ajff635vvypi457wk55bp8kddm80hg2af3hayp3rvjvdk8a8fjv"; depends=[broom car dplyr MBESS]; };
   apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
-  apcluster = derive2 { name="apcluster"; version="1.4.3"; sha256="1pqcxh83189388qqc6cngqnsygvpx4kjy0j2r8ykcgxvdwi8r58m"; depends=[Matrix Rcpp]; };
+  apcluster = derive2 { name="apcluster"; version="1.4.4"; sha256="16m6akgs4cg5423cdz25i11wayff2c2qbq2sih5yfs9ssdk4ii64"; depends=[Matrix Rcpp]; };
   apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
   ape = derive2 { name="ape"; version="4.1"; sha256="0959fiiy11rzfzrzaknmgrx64bhszj02l0ycz79k5a6bmpfzanlk"; depends=[lattice nlme]; };
   apercu = derive2 { name="apercu"; version="0.2.1"; sha256="11ykbl3g752imj8zr03p5sv6pwl12apdrq4wg66yj1fdqflhd9sp"; depends=[pls]; };
   apex = derive2 { name="apex"; version="1.0.2"; sha256="0p2sjpjg3b6i0ya99hkx2vl40w97k34z0z6ccnz08sfg3fyjiv24"; depends=[adegenet ape phangorn]; };
-  aphid = derive2 { name="aphid"; version="1.0.0"; sha256="08jm83qr78c44z00kxx9n47w0vc4yizn6zaxzck4v8rhwndjy541"; depends=[openssl phylogram Rcpp]; };
+  aphid = derive2 { name="aphid"; version="1.0.1"; sha256="1s41ph6i28l14h8s5vvgmx6kby378x27y3vwbz25f2jmq8i7fqi2"; depends=[openssl phylogram Rcpp]; };
   aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; };
   aplpack = derive2 { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; };
   apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
@@ -3804,10 +3898,10 @@ in with self; {
   archivist = derive2 { name="archivist"; version="2.1.2"; sha256="1d6bm9hdaj1lfbismv50qdzz3v91pvw28ijjxvhnaa4yqq9qh967"; depends=[DBI digest httr lubridate magrittr RCurl RSQLite]; };
   archivist_github = derive2 { name="archivist.github"; version="0.2.2"; sha256="04xb2i47y12ic87gb2l30bldil0505h7s9601hq0afjg3npx6jq7"; depends=[archivist digest git2r httr jsonlite]; };
   arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
-  arfima = derive2 { name="arfima"; version="1.4-0"; sha256="0xfhaimhnwsb7ggx9rhlpqyc405k42h4lx6nrmjnsdw39g7i1w1i"; depends=[ltsa]; };
+  arfima = derive2 { name="arfima"; version="1.6-2"; sha256="05ya1h6xpvs1gmhv68xfm7xf8g3g312ch7ibqi9xhi02vxniwg85"; depends=[ltsa]; };
   argon2 = derive2 { name="argon2"; version="0.2-0"; sha256="0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh"; depends=[]; };
   argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
-  argparse = derive2 { name="argparse"; version="1.0.4"; sha256="1qyca2kmvks338v48g7bqzg3gc6vn3cynwn77liqk42kwd327g8g"; depends=[findpython getopt proto rjson]; };
+  argparse = derive2 { name="argparse"; version="1.0.7"; sha256="1ph13n8zv591vc427sihj765h27mkdrjyf1whg3as3i644bjsaqs"; depends=[findpython getopt proto rjson]; };
   argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; };
   arm = derive2 { name="arm"; version="1.9-3"; sha256="00773z8ai07s9wa2annzjqrxml3z13fh9zqls0z1n7s3h8fwrvqw"; depends=[abind coda lme4 MASS Matrix nlme]; };
   arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
@@ -3818,10 +3912,10 @@ in with self; {
   arrApply = derive2 { name="arrApply"; version="2.0.1"; sha256="007fsqgb9bsr4mscljhp37dvrk7cv6nrb7y28w8kc7mxvgdq29wg"; depends=[Rcpp RcppArmadillo]; };
   arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; };
   ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
-  arsenal = derive2 { name="arsenal"; version="0.3.0"; sha256="19m6zblghdsx0phm82bb6dbjba260pa495xxwssypciyf7lrj3mc"; depends=[broom stringr]; };
+  arsenal = derive2 { name="arsenal"; version="0.5.0"; sha256="0acqzq2g7bgyj9k3kn967akyjjk5rpnd598q2dw27zq0vyysaxr9"; depends=[testthat]; };
   artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; };
   arules = derive2 { name="arules"; version="1.5-2"; sha256="0i5cj2v86nmrqf4lr0jisfpvscjz6pp6d8kzaj1ry09d4j3z2siz"; depends=[Matrix]; };
-  arulesCBA = derive2 { name="arulesCBA"; version="1.1.1"; sha256="185zj7yajziadb8xhyk376gxsa4xn03jjd3kp1lqn2ck6v0cvsnj"; depends=[arules caret Matrix testthat]; };
+  arulesCBA = derive2 { name="arulesCBA"; version="1.1.2"; sha256="0c37cffb89gsyv5shpgiksrh5hi2lzdqsk7xl8lxzz6mnv4v1xrj"; depends=[arules caret Matrix testthat]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
   arulesSequences = derive2 { name="arulesSequences"; version="0.2-19"; sha256="1cncvrf7za38b3vdwbzy4yrbakj7jbpxrl1jg6bvjnlkymiajavx"; depends=[arules]; };
   arulesViz = derive2 { name="arulesViz"; version="1.2-1"; sha256="0x4hg5nhkga6zikl5ah5g0vvqfn0xw9277c9q4hfxp4x2hzdbsyy"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd]; };
@@ -3836,7 +3930,7 @@ in with self; {
   ashr = derive2 { name="ashr"; version="2.0.5"; sha256="0blr19ipcanwjxizilkd8hb37dlhb6idjcw2lf0ll8pkd2l68f5z"; depends=[assertthat doParallel etrunct foreach pscl Rcpp SQUAREM truncnorm]; };
   asht = derive2 { name="asht"; version="0.9.1"; sha256="1la0dnyxrl35pb531awfkajinx7bwf78gzm8f1pryh5x5g8lpli6"; depends=[bpcp coin exact2x2 exactci ssanv]; };
   aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; };
-  asnipe = derive2 { name="asnipe"; version="1.1.3"; sha256="1kg58k52wiwcqgxgzsvrcn10j5gcl395mw4vky4k85kmcw1h63ks"; depends=[MASS Matrix]; };
+  asnipe = derive2 { name="asnipe"; version="1.1.4"; sha256="0sskw0vrk9qg9c4gzvqvhva7yb3kzj64svy9vph42hrbnwjrxm0s"; depends=[MASS Matrix]; };
   aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
   aspect = derive2 { name="aspect"; version="1.0-4"; sha256="1kxddm8v1y0v2r7lg24r1wpzk7lqzxlrpzq5xb9kn343g53lny6i"; depends=[]; };
   aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; };
@@ -3862,6 +3956,7 @@ in with self; {
   assertthat = derive2 { name="assertthat"; version="0.2.0"; sha256="1wp5znk3xy338x6hknppk702jn596yr735d9i7c3wabm3sdzfgnp"; depends=[]; };
   assignPOP = derive2 { name="assignPOP"; version="1.1.3"; sha256="12ldcm1v1s311n3c9sysaw5ba2z8yrzrf95rl7ip6fl2q8g0fv6b"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; };
   assist = derive2 { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; };
+  assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; };
   assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; };
   aster = derive2 { name="aster"; version="0.9.1"; sha256="0z976r9ljawfdzvmsb1arpllgs3l2r5wimdvbpcw08r1qdyyzwj8"; depends=[trust]; };
   aster2 = derive2 { name="aster2"; version="0.3"; sha256="17d200sg0vn1fj6lb480dhszm70q6ipjldilb3x0jp72hiczakk9"; depends=[Matrix]; };
@@ -3872,19 +3967,23 @@ in with self; {
   astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; };
   astsa = derive2 { name="astsa"; version="1.7"; sha256="1rzl1ayzv8lnn2009j4v667pp8sxdbn7qbqqyjpq00c75f4wss6x"; depends=[MASS]; };
   asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; };
-  asymmetry = derive2 { name="asymmetry"; version="1.2.1"; sha256="09mz7cwld2qn6vg35rmi80bygy2mxbapigcczxn83lqfj1aj0khk"; depends=[gplots rJava smacof]; };
+  asymmetry = derive2 { name="asymmetry"; version="1.2.2"; sha256="1l3i5ja0b3q83b7cnvzbdc4k2hy6166xfkgfhl1bggyf0cbf55v9"; depends=[gplots rJava smacof]; };
   asympTest = derive2 { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; };
   asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; };
-  atlantistools = derive2 { name="atlantistools"; version="0.4.2"; sha256="0dajmmj8k2daqbj7zpwi67p22a004nyrg1wd2xx59m45ihgxa209"; depends=[circlize dplyr ggplot2 gridExtra lazyeval magrittr proj4 purrr RColorBrewer RNetCDF rvest scales stringr tibble tidyr xml2]; };
+  atlantistools = derive2 { name="atlantistools"; version="0.4.3"; sha256="06rb0c4ralx55mdlqwpjzim0inxif4cdi9732v4h1ll8jhlm5v7d"; depends=[circlize dplyr ggplot2 gridExtra lazyeval magrittr proj4 purrr RColorBrewer RNetCDF rvest scales stringr tibble tidyr xml2]; };
   atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; };
   atsd = derive2 { name="atsd"; version="1.0.8441"; sha256="1jz2bdgvk1wamrm8r9ygprhyf0z3mdk9c1pwlb4bfmwvbnqd0yqa"; depends=[httr RCurl]; };
   attrCUSUM = derive2 { name="attrCUSUM"; version="0.1.0"; sha256="113y40v9hyvnvvzvyqg81n0n1h84pj4zph5q8p0vc0384hw00544"; depends=[Rcpp RcppArmadillo]; };
   attribrisk = derive2 { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; };
+  atus = derive2 { name="atus"; version="0.1"; sha256="15arijdfyci43k0a32zc8qmm73fmzrr3ghhxw0kgipdr3w5xcmz3"; depends=[]; };
   auRoc = derive2 { name="auRoc"; version="0.1-0"; sha256="1ijk127p6g5mzc7b4b9lnjnfzvklz3g8w6bckrdahlw7djd9mgz1"; depends=[coda MBESS ProbYX rjags]; };
   aucm = derive2 { name="aucm"; version="2017.3-2"; sha256="124rb1lhssvmlzkzb5h6hc5plv0hk7wkid53cbd28nxx1grp2wwm"; depends=[kyotil]; };
   audio = derive2 { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
   audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
   audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
+  auk = derive2 { name="auk"; version="0.0.2"; sha256="0vi1fs2nda77sfhq3xzqs04kd7fq14bknv7jqffa30g84bm8qkb1"; depends=[assertthat countrycode magrittr stringi stringr tidyr]; };
+  aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; };
+  autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; };
   autoSEM = derive2 { name="autoSEM"; version="0.1.0"; sha256="0s58dnpr7zyclk5vwaf7a2id6paqsnb224f0gpmj2nms4klsw323"; depends=[GA lavaan snowfall]; };
   autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; };
   autoimage = derive2 { name="autoimage"; version="1.3"; sha256="109n23j9wx0nbbawpr28l3xsxhc3pq21b0pg6h2symgjahvw9b5n"; depends=[fields ggplot2 mapproj maps viridisLite]; };
@@ -3892,24 +3991,28 @@ in with self; {
   automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; };
   automultinomial = derive2 { name="automultinomial"; version="1.0.0"; sha256="15cxnqaai2dln6jvk7lpfqvlpv5237zn18axp459p5zxcgg0lw88"; depends=[Hmisc igraph MASS Matrix]; };
   autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; };
-  autothresholdr = derive2 { name="autothresholdr"; version="0.5.0"; sha256="1a0lmsqxjcq5bzxjha95hy79m6ns5wxcap8ksvkyj3w191i6dapk"; depends=[EBImage magrittr Rcpp rJava RSAGA]; };
+  autothresholdr = derive2 { name="autothresholdr"; version="0.6.0"; sha256="1m3nz094czxx8sdnpww47qrh4g8g9lk97g9vs95v7al34whlq8xd"; depends=[EBImage magrittr Rcpp rJava RSAGA]; };
   autovarCore = derive2 { name="autovarCore"; version="1.0-0"; sha256="08h51bh1m3d47nprd5z7v3k3lkrixbxwinr73zd5442wskf4x82v"; depends=[Amelia jsonlite Rcpp urca vars]; };
   averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
   aws = derive2 { name="aws"; version="1.9-6"; sha256="0mfq44pji0p6d7s1wbwi0f97lsh3f33wnj8fiyimpg9fv8lr4inz"; depends=[awsMethods gsl]; };
   aws_alexa = derive2 { name="aws.alexa"; version="0.1.4"; sha256="1dqfmmmvdmlpk9ld563f65chwp2ahhlnrvbzsj9m5rfjs0bw6yny"; depends=[aws_signature httr plyr XML]; };
-  aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.1"; sha256="0xzilzvrvzhna1iyhjb5r9k1wbd7545sc1yjcf69r35585gnm8rr"; depends=[curl jsonlite]; };
+  aws_cloudtrail = derive2 { name="aws.cloudtrail"; version="0.1.5"; sha256="0p7qj9ivs14ska11a9qni4n0f8d05c1p126zvlxj9038c9p0y1wx"; depends=[aws_s3 aws_signature httr jsonlite]; };
+  aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.2"; sha256="1ycxir3l7jcnxp6hdpr3zqf885hl8zb1yvjyr09cq3ql82vi95ml"; depends=[curl jsonlite]; };
+  aws_iam = derive2 { name="aws.iam"; version="0.1.7"; sha256="0hag8j5g8rqg39x4f6d8vwwzhz98cx7549xixfl9cxiff7x9sz2c"; depends=[aws_signature httr jsonlite xml2]; };
+  aws_lambda = derive2 { name="aws.lambda"; version="0.1.6"; sha256="16vis596clxn6h9j1k66224ikacsg0f9xrzqi5987nqlzrwskjgk"; depends=[aws_signature base64enc httr jsonlite]; };
   aws_polly = derive2 { name="aws.polly"; version="0.1.2"; sha256="0ij0rbng8q7xfa08p4x1l1lcmskmz3fy2pvln28zxqbs6jbc22rm"; depends=[aws_signature httr jsonlite tuneR]; };
   aws_s3 = derive2 { name="aws.s3"; version="0.3.3"; sha256="1vk4ykgfdyfispd9nkk1qc1jjhvjhxqzhd48g5ddqz09wm0wx4w3"; depends=[aws_signature base64enc digest httr xml2]; };
   aws_ses = derive2 { name="aws.ses"; version="0.1.4"; sha256="13hf4iqhnpkm9rnr7nzwky663vplnkjrgk90zix91cn2fvaspjgp"; depends=[aws_signature httr jsonlite]; };
-  aws_signature = derive2 { name="aws.signature"; version="0.3.2"; sha256="11b3gbx870l4qkk2njq09pm19w9j2b19ymmbicm63jqciyp34gwq"; depends=[base64enc digest]; };
-  aws_sns = derive2 { name="aws.sns"; version="0.1.5"; sha256="1l013yczlvgbi07xfdslfrwmnc39j58f6kfqwa8j4kdxb0h58lq4"; depends=[aws_signature httr jsonlite xml2]; };
-  aws_sqs = derive2 { name="aws.sqs"; version="0.1.8"; sha256="1qgq2jbm523jb4qhzjbpq2f04saanwarz6nnhyn4g3dliv3fhsf6"; depends=[aws_signature httr jsonlite xml2]; };
+  aws_signature = derive2 { name="aws.signature"; version="0.3.5"; sha256="1ijzdxv46x5iydmhgbri4lfpdhhlhz1ybhwwdcy4m4mjz9s74yhk"; depends=[base64enc digest]; };
+  aws_sns = derive2 { name="aws.sns"; version="0.1.7"; sha256="0i8nn5jnykhsjwn4nsqdqbagankjc09zs8and54rkirdigzdny8v"; depends=[aws_signature httr jsonlite xml2]; };
+  aws_sqs = derive2 { name="aws.sqs"; version="0.1.10"; sha256="09sh3injb4kfrq5al7hmbnqdn5v5hnjkqqsz86vpi4154435ymdg"; depends=[aws_signature httr jsonlite xml2]; };
   awsMethods = derive2 { name="awsMethods"; version="1.0-4"; sha256="0n4mxn9fkqkvv19mfaqhrmhwhmkxiahfnls47b5ki3a3gsr6cm8l"; depends=[]; };
   awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; };
+  awspack = derive2 { name="awspack"; version="0.1.6"; sha256="0pf6g9w2r2rm887sa3v0gfwia2w2q94m40m76sq66gb3spkmngd5"; depends=[aws_alexa aws_cloudtrail aws_ec2metadata aws_iam aws_lambda aws_polly aws_s3 aws_ses aws_signature aws_sns aws_sqs]; };
   aylmer = derive2 { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; };
   b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
   bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; };
-  bReeze = derive2 { name="bReeze"; version="0.4-0"; sha256="1znhmb2inbfv574adhwjwk3qf9kikrxrly4n6sfyim1z6sagnj0z"; depends=[]; };
+  bReeze = derive2 { name="bReeze"; version="0.4-1"; sha256="113giw1aw6b5h0h5794p2p7zrwqz38mn9ihhpca7r8g7w74kpsdi"; depends=[]; };
   bWGR = derive2 { name="bWGR"; version="1.4"; sha256="0sj6fa4ajp7a7k8z7znqn3wkibvxmdlnj5xf1n0zmsvncmgqhkwh"; depends=[Rcpp]; };
   babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
   babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; };
@@ -3928,6 +4031,7 @@ in with self; {
   bamboo = derive2 { name="bamboo"; version="0.9.18"; sha256="1y95apf43bpgw15jh4bzqfyiqs2imdrmn4wmbplxgjn4369mbqq9"; depends=[rscala]; };
   bamdit = derive2 { name="bamdit"; version="3.1.0"; sha256="148ikj7mly8m6kxs2n4gidi7kb70i3x2vbf9xsllrf0cgvrjccps"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
   bamlss = derive2 { name="bamlss"; version="0.1-2"; sha256="1d5pinyq16y0ljjgf23mpabzpsx4n2vh91c89qmzclcw7ns0l7xw"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp spam survival]; };
+  banR = derive2 { name="banR"; version="0.2.0"; sha256="0m71m99f8f4wckylry6z16gw6r2cc4wxbd9287ns00jr6s13x6c8"; depends=[dplyr httr magrittr purrr readr rlang stringr tibble]; };
   bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
   bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.0"; sha256="0ycx771g9a73w0sx8zzix8kswwbjagzhbyvaq7l5r8a9ayfli8ic"; depends=[]; };
   banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; };
@@ -3945,32 +4049,34 @@ in with self; {
   batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
   batch = derive2 { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
   batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; };
-  batchtools = derive2 { name="batchtools"; version="0.9.3"; sha256="1xl49zqhdwlw1gw22517kq3fjbkyzsdh2gwvm4vzz91iyi2j21fb"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi]; };
+  batchtools = derive2 { name="batchtools"; version="0.9.5"; sha256="0g49bgh9mvxwfw5pq0hza9svvr7rdwpd9pk72s37icsnj948bj5n"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi withr]; };
   batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; };
   batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; };
-  bayesAB = derive2 { name="bayesAB"; version="0.7.0"; sha256="1visjwxf7jc9z1m99dnplg01sbbx4w4cr6ykh3n1nzh5r9xinimm"; depends=[devtools ggplot2 plumber Rcpp reshape2]; };
+  bayesAB = derive2 { name="bayesAB"; version="1.0.0"; sha256="0m7nhzyq727gzs191ra39kdds634i39hxvflcfxfgl6l6px4zdcz"; depends=[ggplot2 Rcpp reshape2]; };
   bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; };
-  bayesDP = derive2 { name="bayesDP"; version="1.1.1"; sha256="0px17fkl0p6vnyz8alv2cjxkph056r2xmbvzksszqqvj9l2k47ah"; depends=[ggplot2 Rcpp RcppArmadillo survival]; };
+  bayesDP = derive2 { name="bayesDP"; version="1.2.2"; sha256="0lfw3mnk6kgpzg0h0r54k5dndgpbsb2i2q59qwsm6k14nz1b5n5j"; depends=[ggplot2 Rcpp RcppArmadillo survival]; };
   bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; };
   bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; };
   bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; };
   bayesGDS = derive2 { name="bayesGDS"; version="0.6.2"; sha256="0ash16hmassn76x3f59dfvp4plqp8vb17qzcwmag7vi3mi3y2ap6"; depends=[Matrix]; };
   bayesImageS = derive2 { name="bayesImageS"; version="0.4-0"; sha256="1z8jvjqz56xlj5x2ilp9m93v74qsqd7xvdld5pk7y80pxnfd6wpy"; depends=[Rcpp RcppArmadillo]; };
-  bayesLife = derive2 { name="bayesLife"; version="3.0-5"; sha256="076smmvdf1k1wgcscdy5q4jin93697vy7y7b9mcv1m12whbr3ah3"; depends=[bayesTFR car coda hett wpp2015]; };
+  bayesLife = derive2 { name="bayesLife"; version="3.1-0"; sha256="01b8ih2n1yqsimicml17qz8vm8pyylq4igl4j6wi9gx9abxx1xg4"; depends=[bayesTFR car coda hett wpp2017]; };
   bayesMCClust = derive2 { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; };
-  bayesPop = derive2 { name="bayesPop"; version="6.0-4"; sha256="16i9h7zvym1mj1al3wzima3y4igxhwax03npgnypaxahi1sbiwha"; depends=[abind bayesLife bayesTFR fields googleVis plyr rworldmap wpp2012 wpp2015]; };
+  bayesPop = derive2 { name="bayesPop"; version="6.1-1"; sha256="0vf82bf400wsm8pkp1pzsxylijajp01z6q260cdri12c0qjdzcy5"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2015]; };
   bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; };
   bayesSurv = derive2 { name="bayesSurv"; version="3.0"; sha256="0p1kn7hc02v9vrnzicwh2vy5h7aw0mdhh2cssm09dp9wz4sajwgk"; depends=[coda smoothSurv survival]; };
-  bayesTFR = derive2 { name="bayesTFR"; version="6.0-0"; sha256="0dyjq7s2gvwwz0yylz5g0csjnhdfbbii1sd4606r2yphfwb9v0x8"; depends=[coda MASS mvtnorm wpp2015]; };
+  bayesTFR = derive2 { name="bayesTFR"; version="6.1-1"; sha256="12f3s1k7jalaqd3hxhlrn2i6nvzsmcgv5k1jfhbmk7py5b7ybj2p"; depends=[coda MASS mvtnorm wpp2017]; };
   bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; };
   bayesboot = derive2 { name="bayesboot"; version="0.2.1"; sha256="0gd3in9z8kx3d29dvyd8blmhlc7wxxl5b2hxnrrq0w13jcnsn57w"; depends=[HDInterval plyr]; };
   bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
   bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; };
+  bayeslm = derive2 { name="bayeslm"; version="0.1.0"; sha256="1fbpw2dxhcq7zd7652gskq2x3sz0ad475ds3c2cq94d3aasvzjix"; depends=[Rcpp RcppArmadillo]; };
   bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; };
-  bayesm = derive2 { name="bayesm"; version="3.1-0"; sha256="01hklyina6qs5p6ilhz5dw2qzh75i3m8sn3dwvblb7kvs3rxm5ja"; depends=[Rcpp RcppArmadillo]; };
-  bayesmeta = derive2 { name="bayesmeta"; version="1.4"; sha256="0ks0g7jdr2jqm7nwbm0p34nk8hm9746nldf0kyzgkl7vb29jb9f1"; depends=[forestplot]; };
+  bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; };
+  bayesm = derive2 { name="bayesm"; version="3.1-0.1"; sha256="04b4s8clxrmdyhnhd2arnsdi992422yam3z91w6dzrmngwxq4yaq"; depends=[Rcpp RcppArmadillo]; };
+  bayesmeta = derive2 { name="bayesmeta"; version="1.5"; sha256="0cdld4gvaaj1aqj2fjpg19a1ipym1ci099r4q5mjfnwb9n5ji2dx"; depends=[forestplot]; };
   bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
-  bayesplot = derive2 { name="bayesplot"; version="1.2.0"; sha256="10xk90vh9p9ifnkffh4l7icq7072zmn3cf5gdr8j4982pbb3d4w0"; depends=[dplyr ggplot2 reshape2]; };
+  bayesplot = derive2 { name="bayesplot"; version="1.3.0"; sha256="0n07ii605dskf0x9bms7krx1akjghb4bmq76zm39sc1lshyxinrr"; depends=[dplyr ggplot2 reshape2]; };
   bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayesreg = derive2 { name="bayesreg"; version="1.0"; sha256="0crld04cxxqw0xq2d4rdv040iq7vchwjbzacj0z8jv245hwgr9qy"; depends=[BayesLogit]; };
   bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
@@ -3981,14 +4087,14 @@ in with self; {
   bbmle = derive2 { name="bbmle"; version="1.0.19"; sha256="014h6mw16gv4acs2p78dy7lla7s428n633aybsb1mbi6250dg0p8"; depends=[lattice MASS numDeriv]; };
   bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
   bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; };
-  bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-1"; sha256="0gikx66lwirvh037za1ipwvw6kj7n8r31zdsbsasrvksg4r3k58m"; depends=[boot nnet Rcpp RcppArmadillo rgl]; };
+  bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-2"; sha256="0v1zjbgpalr5ag97s9rxcd2z0r7qpw8yhc4lw4p4i3xkw2paf5zh"; depends=[boot nnet Rcpp RcppArmadillo rgl]; };
   bcRep = derive2 { name="bcRep"; version="1.3.6"; sha256="1fibx11ykkkjv4sgg6zc2a0g270384z2cf68hwghnld0wi002b5z"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; };
   bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; };
   bcp = derive2 { name="bcp"; version="4.0.0"; sha256="1bkd7812jacyk955l71b2szpc9550p0hpv3x337qgl09zck4vdgm"; depends=[Rcpp RcppArmadillo]; };
   bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
   bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
   bcrm = derive2 { name="bcrm"; version="0.4.6"; sha256="1nqa7kd83h8gh6bb5lbd17m1hgv8vjlbbq8w0i1fgmadz7y5rpji"; depends=[ggplot2 mvtnorm]; };
-  bcrypt = derive2 { name="bcrypt"; version="0.2"; sha256="0f4sw1w2k1237wipfva3k9w2a678pvfz0k86jd7djslhyimb6jrq"; depends=[openssl]; };
+  bcrypt = derive2 { name="bcrypt"; version="1.0"; sha256="12qlad4rb5zjj7ilcj11zhiir9jvp8hciz7f7viwk2m6jpl0dl2b"; depends=[openssl]; };
   bcs = derive2 { name="bcs"; version="1.0.0"; sha256="0wv7kfcr6i36ik8v3prwp4mrwg1x6vf5nmybq9a57fz66pf1ff1x"; depends=[fda Rcpp RcppArmadillo wmtsa]; };
   bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
   bda = derive2 { name="bda"; version="5.1.6"; sha256="0rpxvmjbqiph8hpzsvlj8q6h70jsc9771fiq7l3lmkz69jn1gf4q"; depends=[]; };
@@ -4000,9 +4106,9 @@ in with self; {
   bdrift = derive2 { name="bdrift"; version="1.2.2"; sha256="03vwiyvxv174l0sy76gp2x8lwjf3s45zxzwrlbn97hg9c3j9adjm"; depends=[Quandl quantmod scales xts zoo]; };
   bdscale = derive2 { name="bdscale"; version="2.0.0"; sha256="1hkkfd69g2bg2y4hicjs6bnw9f0zw74jy0dpadchnzw17lffpms3"; depends=[ggplot2 scales]; };
   bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-2"; sha256="16qhfwk0r1snm9hg32qwz7hizkpwc32m723hjm23m2026gvz2nwy"; depends=[]; };
-  bdvis = derive2 { name="bdvis"; version="0.2.15"; sha256="0qmzy41bbv6vin0ah1skqb1sp5z66pgbi8h81cfmmffsypzwawx5"; depends=[chron ggplot2 lattice leafletR maps plotrix plyr sqldf taxize treemap]; };
+  bdvis = derive2 { name="bdvis"; version="0.2.18"; sha256="0m1nxq6bjinagmbkixkqdyx9s4vwggcihb33aqpixlm6vqcf7wyh"; depends=[chron ggplot2 lattice leafletR maps plotrix plyr sqldf taxize treemap]; };
   bdynsys = derive2 { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[caTools deSolve Formula Hmisc MASS matrixStats plm pracma]; };
-  bea_R = derive2 { name="bea.R"; version="1.0.1"; sha256="15ihbw3chmwnlyh68dwdzzzbvzj909jz8d1m4gnmi71s4v5mc1v8"; depends=[chron colorspace data_table DT ggplot2 googleVis gtable htmltools htmlwidgets httpuv httr jsonlite magrittr munsell plyr Rcpp scales shiny shinydashboard stringi stringr xtable yaml]; };
+  bea_R = derive2 { name="bea.R"; version="1.0.2"; sha256="0zh5gaplkwp3mq0dpj6avjlgxbni05mzbh782kb230754nshr27h"; depends=[chron colorspace data_table DT ggplot2 googleVis gtable htmltools htmlwidgets httpuv httr jsonlite magrittr munsell plyr Rcpp scales shiny shinydashboard stringi stringr xtable yaml]; };
   beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; };
   beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; };
   beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
@@ -4010,7 +4116,7 @@ in with self; {
   bedr = derive2 { name="bedr"; version="1.0.3"; sha256="1v1r5rndpd1wbwcsyzpqwag0dswicdppvs4qq28zr1acgi8cy722"; depends=[data_table R_utils testthat VennDiagram yaml]; };
   beepr = derive2 { name="beepr"; version="1.2"; sha256="0w4szy3rgj1bdcanxbcb9agyw38jqp0hc7qsn7j9700vh20zqbln"; depends=[audio stringr]; };
   beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; };
-  beginr = derive2 { name="beginr"; version="0.0.1"; sha256="1gpn5zff9c1y5qc830izdln2h0zsvqngj514iwv9lj6ibg4jxqnc"; depends=[]; };
+  beginr = derive2 { name="beginr"; version="0.1.0"; sha256="0zi2c6agkxx6aq7ih2c1z4r93fsjmqp2iymxllld0d7jcpp5qbv6"; depends=[cranlogs jsonlite]; };
   belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; };
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
   benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; };
@@ -4045,9 +4151,9 @@ in with self; {
   bhm = derive2 { name="bhm"; version="1.11"; sha256="1d35fvwk8v8b2x1knhsk5rz48hc5k9lkrxqd6y8p0gn63k5iy5ag"; depends=[coda survival]; };
   biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
   bib2df = derive2 { name="bib2df"; version="0.2"; sha256="06gzkvf5fngijkicsi97a9vzabkc3af32mr52wl178y2pzigf4hc"; depends=[dplyr humaniformat plyr stringr]; };
-  bibliometrix = derive2 { name="bibliometrix"; version="1.6"; sha256="1jfssm4xaxl9zfxm7lqlvm0yirz98kbhyh2app17zha0fpg67ji6"; depends=[factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer rscopus SnowballC stringdist stringr]; };
+  bibliometrix = derive2 { name="bibliometrix"; version="1.7"; sha256="11fnymbfrpw3r63lw1z4k4a8nni4lhzb4ddxv18azhaqawkf7hwh"; depends=[factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer rscopus SnowballC stringdist stringr]; };
   bibliospec = derive2 { name="bibliospec"; version="0.0.4"; sha256="0abrbaw2knnlh8g5r4c2i6cc7a6ilfxry8zhscrx0x58irmp790b"; depends=[DBI RSQLite]; };
-  bibtex = derive2 { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; depends=[]; };
+  bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; };
   biclique = derive2 { name="biclique"; version="1.0.1"; sha256="0wxvqjxc11ccvfnlnnb6gv6r74a48pg3yabsjynrg1m2kbynnqjf"; depends=[]; };
   biclust = derive2 { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[colorspace flexclust lattice MASS]; };
   bifactorial = derive2 { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[lattice multcomp mvtnorm Rcpp]; };
@@ -4072,7 +4178,7 @@ in with self; {
   bigstep = derive2 { name="bigstep"; version="0.7.4"; sha256="0g45fgnamdv1v3b8xvpsj4rzhisyvbbddwyzvzvmmi4a8w20pzn5"; depends=[bigmemory matrixStats R_utils RcppEigen speedglm]; };
   bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; };
   bigtcr = derive2 { name="bigtcr"; version="1.0"; sha256="1wh85r6f4jd8xzinczr5g1p1acbcyn4am3v1n4blfbn447l9nx4z"; depends=[]; };
-  bikedata = derive2 { name="bikedata"; version="0.0.1"; sha256="1wndc27yxwfrsyjn2q19fq5xsd63qkfdpjfkgk6bacwnvdpcrjab"; depends=[BH dplyr httr lubridate Rcpp reshape2 RSQLite tibble xml2]; };
+  bikedata = derive2 { name="bikedata"; version="0.0.4"; sha256="0j4zyphnmmgdckvlhf0sbmnjkz1xpbikfsgk111lpcn5dg1h526g"; depends=[BH DBI httr lubridate magrittr Rcpp reshape2 RSQLite tibble xml2]; };
   bikeshare14 = derive2 { name="bikeshare14"; version="0.1.0"; sha256="12399c01s8p9rmpi3fpy4rm7xxnsf627slz3h234frbahhs882c4"; depends=[]; };
   bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; };
   bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
@@ -4084,9 +4190,9 @@ in with self; {
   bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
   bindr = derive2 { name="bindr"; version="0.1"; sha256="0d95ifm0x4mrfzi20xf39f5pzd7rfzqsld0vjqf6xzga5rhnd8fc"; depends=[]; };
   bindrcpp = derive2 { name="bindrcpp"; version="0.2"; sha256="0l1l22zl87wiyl79m3gj2vlxmkhxvrkl4alhyy08h55q7hqs3vyh"; depends=[bindr plogr Rcpp]; };
-  binequality = derive2 { name="binequality"; version="1.0.1"; sha256="0an73s9nj96hm83va4p5zfv2sv8vnp1fwjwx4ls5carg8f5pmfv5"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
+  binequality = derive2 { name="binequality"; version="1.0.2"; sha256="09gafmz77qbyci8ih8zag3l8a92qij8nyr8hw57ymcvnzafq5iad"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
   binford = derive2 { name="binford"; version="0.1.0"; sha256="04mpdvynlm4gddybys04k0446gc9hyq0vaxr6a525p76ls5aw4b1"; depends=[]; };
-  bingat = derive2 { name="bingat"; version="1.2.2"; sha256="1vx6zm6vvv7nzp781fa6mb2iq6hmndi5f3yml15ydw4cx3f8r0xd"; depends=[doParallel foreach genalg gplots matrixStats network]; };
+  bingat = derive2 { name="bingat"; version="1.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; };
   binhf = derive2 { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[adlift wavethresh]; };
   binman = derive2 { name="binman"; version="0.1.0"; sha256="103f74gm124vw4rwbfrd5dlgca3v83kqd8m5j9z3ma3snh788mkx"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; };
   binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; };
@@ -4100,10 +4206,10 @@ in with self; {
   binsmooth = derive2 { name="binsmooth"; version="0.1.0"; sha256="1zlw4zmkckg7rwf4hx8wyr2yl644xkdkazayysy99saysr9pk2c9"; depends=[ineq pracma triangle]; };
   binst = derive2 { name="binst"; version="0.2.0"; sha256="13hg9kmxlaczbkbimlqphpimzx67kncc6qvnlk9cxqyvfkb0ph47"; depends=[]; };
   bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
-  bio3d = derive2 { name="bio3d"; version="2.3-2"; sha256="1l2k6sh46dbdc78v05brnnb1gkj9w3cglsc7964ci47xk3wj96aa"; depends=[Rcpp]; };
+  bio3d = derive2 { name="bio3d"; version="2.3-3"; sha256="0cw6nhkj5mxh89lfrnhrmv0rwxkmh05g6nd6rvd7ahcaxd3mid7l"; depends=[Rcpp]; };
   bioOED = derive2 { name="bioOED"; version="0.1.1"; sha256="18b66s5dn8a67iwb0g1bmbi856ip81yfa57m40kf7phsga52ncg1"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
-  biogas = derive2 { name="biogas"; version="1.7.0"; sha256="1c0w78x2jjgsxffcz61lfs5m72kkds55c73z970nbxvhqk8n15j6"; depends=[]; };
+  biogas = derive2 { name="biogas"; version="1.8.1"; sha256="1q10q6mk8qzf6an52qhlps61zv8vwy0lcx3128zyn8p6b98ymy8d"; depends=[]; };
   biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; };
   biogram = derive2 { name="biogram"; version="1.4"; sha256="1kkim6dxmvvpby2ir280adl14jmrz7nsib3m8g2ki81d539km6il"; depends=[bit combinat entropy partitions slam]; };
   bioimagetools = derive2 { name="bioimagetools"; version="1.1.0"; sha256="0ws99rx7bhqi448qqy08jsl3c4vbq96gigqb85yv1mzrc82sg62p"; depends=[EBImage httr tiff]; };
@@ -4116,7 +4222,7 @@ in with self; {
   biorxivr = derive2 { name="biorxivr"; version="0.1.3"; sha256="1vi035c4jld5i52xnp79dn5642308cv11vfrw0n62wlsbjfbdma4"; depends=[XML]; };
   bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; };
   biosignalEMG = derive2 { name="biosignalEMG"; version="2.0.1"; sha256="1prdr0pa1vd190pqxr7y87sjy10icfj9wb7jc3r5q8qmk5lpnyq5"; depends=[signal]; };
-  biospear = derive2 { name="biospear"; version="1.0.0"; sha256="1lhpbmjc2l0wk9w6m87lllqk7mdf29zifkqm01xwfcr9n706lxiv"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; };
+  biospear = derive2 { name="biospear"; version="1.0.1"; sha256="03wsyzlxmqff6xvr10jy49p229xr6jjvr8kk93wm7wil7q6b7z42"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; };
   biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; };
   biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; };
   bipartite = derive2 { name="bipartite"; version="2.08"; sha256="16j70ikzprjsm81w9bqbp26xxf14ckw654dy7c5hkz24x62qsx2i"; depends=[fields igraph MASS permute sna vegan]; };
@@ -4136,11 +4242,14 @@ in with self; {
   biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; };
   bizdays = derive2 { name="bizdays"; version="1.0.3"; sha256="16187266vz5kzqlywiai6z0qkvcwmm67vl83pdkbjpqnswxwz57l"; depends=[]; };
   bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; };
-  blackbox = derive2 { name="blackbox"; version="1.0.18"; sha256="1sgq6i8p066li9lr3241zplygv7yc7mp7k13c6nih0289v3l7jg7"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; };
+  blackbox = derive2 { name="blackbox"; version="1.1.0"; sha256="0iqicqfg1phcnb0a9r7fghhvvdk2826r48amp5l50bf4w1lpddv2"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; };
+  blandr = derive2 { name="blandr"; version="0.4.3"; sha256="03w1k646izbrygcsynrzrph7crpqdqn58544mmm9zxfvkmsilpmi"; depends=[ggplot2 knitr]; };
+  blastula = derive2 { name="blastula"; version="0.1"; sha256="0i306x0xm34r9fz7iq8frjbcvfbgg64fm5nn7mbk29a58kn91axp"; depends=[commonmark ggplot2 glue htmltools httr knitr magrittr mailR rJava stringr]; };
   blavaan = derive2 { name="blavaan"; version="0.2-4"; sha256="1bjczm5i9q1h3i1sl5p31jv87hi9bj4b546fi4g338ljqqrzx6a5"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; };
   blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; };
   blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
   blighty = derive2 { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; };
+  blink = derive2 { name="blink"; version="0.1.0"; sha256="0gi5dk2js3mssg2blji7yddrbmsynp9nr3qhzlpkpy15i81mg2xy"; depends=[plyr RecordLinkage stringdist]; };
   blkbox = derive2 { name="blkbox"; version="1.0"; sha256="14bl0b5w46gb7v8p94df5r56nj849r7jqisajagvd1irda3vkc7z"; depends=[bartMachine caret dplyr e1071 ggplot2 glmnet gtools kknn knitr magrittr nnet pamr party plyr pROC randomForest reshape reshape2 rJava rmarkdown shiny shinyjs stringr tibble tidyr xgboost]; };
   blkergm = derive2 { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[ergm network statnet_common]; };
   blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; };
@@ -4150,13 +4259,14 @@ in with self; {
   blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; };
   blockcluster = derive2 { name="blockcluster"; version="4.2.3"; sha256="1b3rqpg3i5bplz85lxfspb1vv8l7qsxwkalnn0h5pwy9ppqdbcb7"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
-  blockmodeling = derive2 { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
+  blockmodeling = derive2 { name="blockmodeling"; version="0.1.9"; sha256="1rd8ifwv5q9yl0ayzkgi0h4k79w3r46dr164l73iz1ny77a78fn9"; depends=[]; };
   blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
   blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
-  blocksdesign = derive2 { name="blocksdesign"; version="2.5"; sha256="1l64z2j7qzyycpll63ny0y451fr2mhwgbqam3v0iw5vg4qk5q8wh"; depends=[crossdes]; };
+  blocksdesign = derive2 { name="blocksdesign"; version="2.6"; sha256="0lxf7wkyfhcr52b2pn3ifmr0k48lr85nimr9yybdamp47rvd4yxw"; depends=[crossdes]; };
   blockseg = derive2 { name="blockseg"; version="0.2"; sha256="183hjb66589qqjwf14rzdmy770biad73r0l5pkh6f4xk9xac1r62"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
-  blsAPI = derive2 { name="blsAPI"; version="0.1.8"; sha256="1xikaix2n667281w6xga158c198s6fs5iga24qyrl1j5119a8way"; depends=[RCurl rjson]; };
-  blscrapeR = derive2 { name="blscrapeR"; version="2.1.5"; sha256="0mkigpv6chsbdsnfy28gaqjlqcivq2w1kryg9xnrbgd4jgr4xl4r"; depends=[ggplot2 httr jsonlite magrittr]; };
+  blogdown = derive2 { name="blogdown"; version="0.1"; sha256="05cicpk8yv7v2fbq0yg8rqga88by0zr1ygr7phmsb4fzgzmv709n"; depends=[bookdown htmltools httpuv knitr rmarkdown servr yaml]; };
+  blsAPI = derive2 { name="blsAPI"; version="0.1.9"; sha256="1p7s799kix396fbx8ap9vy9akwpaps37awr18qbj53n9qcm74wkp"; depends=[RCurl rjson]; };
+  blscrapeR = derive2 { name="blscrapeR"; version="3.0.0"; sha256="1846n1hm1xprdni847zvs187f7yxay0a7x9vq67kmhd0n5lxn5cq"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr tibble]; };
   bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
   bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; };
   bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; };
@@ -4165,24 +4275,24 @@ in with self; {
   bmlm = derive2 { name="bmlm"; version="1.3.0"; sha256="0ahkfg6d10729p4vq77ly2sf667jnyf7ysp3rap87l8vgy24aris"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
   bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
   bmp = derive2 { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
-  bmrm = derive2 { name="bmrm"; version="3.3"; sha256="0d2p49j7pnwif96cr3mafkxnnqsvpvf9wfjkvn5m66x1mvjmjbi7"; depends=[LowRankQP lpSolve matrixStats]; };
-  bnlearn = derive2 { name="bnlearn"; version="4.1.1"; sha256="16jqkysz9s1a9hd7wki9l4ifzj88176c5p5fsa1ww2zadsa9njbd"; depends=[]; };
+  bmrm = derive2 { name="bmrm"; version="3.4"; sha256="1588nz3h05sss94sa1d87v5si7p3316canxc2dbbdqgv51ds377w"; depends=[LowRankQP lpSolve matrixStats]; };
+  bnlearn = derive2 { name="bnlearn"; version="4.2"; sha256="1k9zfz8sc3ikrxp513cjgxw6fgxx9knz3wv5nikpcjmmrvlvwqya"; depends=[]; };
   bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; };
   bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
   bnpmr = derive2 { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
-  bnspatial = derive2 { name="bnspatial"; version="1.0.1"; sha256="0cm4kqidjlb64rnjmiwsbjay8fjzwbmpm8k1bl1kz6nj4y532v6d"; depends=[doParallel foreach gRain gRbase raster]; };
+  bnspatial = derive2 { name="bnspatial"; version="1.0.2"; sha256="0lhxcxkgi2mi99hq6vx8jwq6xafl8b7cfn84r40ikipp97ss0jha"; depends=[doParallel foreach gRain gRbase raster]; };
   bnstruct = derive2 { name="bnstruct"; version="1.0.2"; sha256="0n4gn1vhka694wdzignawyaca0rx2l0wjgw09fw42bkrswfjvxy1"; depends=[bitops igraph Matrix]; };
   boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; };
   bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; };
   boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
-  bold = derive2 { name="bold"; version="0.4.0"; sha256="09ib3h9a3cjcysf5503qh1vrxd79dycsd0rg0xkikrxljzmfmv4b"; depends=[assertthat data_table httr jsonlite plyr reshape stringr tibble xml2]; };
-  bookdown = derive2 { name="bookdown"; version="0.4"; sha256="1fp1k7hivrb7s2dwgrsqy9s7xg6pk9hczhrc149y1dwh901j6qvv"; depends=[htmltools knitr rmarkdown yaml]; };
-  bookdownplus = derive2 { name="bookdownplus"; version="1.0.2"; sha256="12bffg2bq7077bm68gp8h13p8y7izk6h63l1h6l7rmy53h7ymkmx"; depends=[bookdown knitr yaml]; };
+  bold = derive2 { name="bold"; version="0.5.0"; sha256="0gdmb3zsspcp594d32yzqhdpw4dwg7a3pfm7kgbghz368yw662gl"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; };
+  bookdown = derive2 { name="bookdown"; version="0.5"; sha256="0zm63kr4f4kja4qpwkzl119zzyciqj7ihajfqgfjpgb4dzaiycxp"; depends=[htmltools knitr rmarkdown yaml]; };
+  bookdownplus = derive2 { name="bookdownplus"; version="1.3.0"; sha256="1297hwxkc1i3h706p135704rxc2hhkppmwkq5b04d7d03a1kv9pn"; depends=[bookdown knitr yaml]; };
   boolean3 = derive2 { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; };
   boostSeq = derive2 { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
   boostmtree = derive2 { name="boostmtree"; version="1.1.0"; sha256="1k6cwiz6354xgmqyadm4vfrl4szcr2c9mgxgmmngdc28p7sm50i7"; depends=[nlme randomForestSRC]; };
   boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
-  boot = derive2 { name="boot"; version="1.3-19"; sha256="16hsw4bw9pkfc2lqxfwycm1sbvbrm4linvm0ci71n8sxc7srvkis"; depends=[]; };
+  boot = derive2 { name="boot"; version="1.3-20"; sha256="0ai1qpm0p4z07xr0dvag8sdn9jrxcwanrsk9khzmww094jvr1jxd"; depends=[]; };
   bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; };
   bootLR = derive2 { name="bootLR"; version="1.0"; sha256="1asf4yxy3abfkgqqg89mv9r2iifc5bgcjipy5idni0lvwfjashnd"; depends=[boot]; };
   bootRes = derive2 { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
@@ -4197,6 +4307,7 @@ in with self; {
   boral = derive2 { name="boral"; version="1.3.1"; sha256="0kwgjfp4r8a2mph83n3ljlqr7077i4f8dvbk2kz80n5jq48v84j0"; depends=[abind coda fishMod MASS mvtnorm R2jags]; };
   bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; };
   boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
+  boxcoxmix = derive2 { name="boxcoxmix"; version="0.13"; sha256="16hqhdlh04v7dfk44anvsa9vp2yziwwf7xccm9wknqpbbwif39p2"; depends=[qicharts statmod]; };
   boxoffice = derive2 { name="boxoffice"; version="0.1.1"; sha256="19l65nxrj0q7vr5ds6cwf7ynaqzd3ivzx673svvl6wmxlgn67cfi"; depends=[foreach lubridate rvest xml2]; };
   boxplotdbl = derive2 { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
   boxr = derive2 { name="boxr"; version="0.3.4"; sha256="0wx3x65rk1ma8bw5h4yskr7ii95ynkm7il22l1bj34kv9f4bfyj3"; depends=[assertthat bit64 digest dplyr httpuv httr mime rio stringr]; };
@@ -4229,9 +4340,9 @@ in with self; {
   bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; };
   bridgesampling = derive2 { name="bridgesampling"; version="0.2-2"; sha256="0sz3svkfwn0xf8z2h3mhz5lnybfph6jky0p1rzpa2adxwg0fsvjg"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; };
   briskaR = derive2 { name="briskaR"; version="0.1.0"; sha256="0fx254pc250jv53kmd6miw8blcp43c72myah9g5ns2s84pcdmx6h"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
-  brlrmr = derive2 { name="brlrmr"; version="0.1.2"; sha256="1hl05rnlswsnsqgijqxzkk744vw18l7l1c4ghdpdxbajx0ssmsh7"; depends=[boot brglm MASS profileModel Rcpp]; };
+  brlrmr = derive2 { name="brlrmr"; version="0.1.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; };
   brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; };
-  brms = derive2 { name="brms"; version="1.7.0"; sha256="1gbbm30x5n6rpiawf4256qpvaixdnwg5y9n2dw56cs2j02gmdcd2"; depends=[abind bayesplot coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools RWiener shinystan]; };
+  brms = derive2 { name="brms"; version="1.9.0"; sha256="0lkkgabcy7jink5xr85q1r6m8gpmvzclpd7m63g4kaqblzi4xwx5"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools shinystan]; };
   brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; };
   broman = derive2 { name="broman"; version="0.65-4"; sha256="0cmcyifp49c1m3sawcs5ijjl218wk4sffvr68dfi3y9vh58f5iss"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
   broom = derive2 { name="broom"; version="0.4.2"; sha256="0i2s3jbi0v5xhbqkmms4f17i3x9s6lan4bj521qmxwiwc89r8h4z"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
@@ -4239,13 +4350,15 @@ in with self; {
   brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; };
   brranching = derive2 { name="brranching"; version="0.2.0"; sha256="0y99px2m02rl60qgf6pjbjv6isp8v1w9sny6p2icgsx4bwxjxmns"; depends=[ape curl httr phytools taxize]; };
   brt = derive2 { name="brt"; version="1.1.0"; sha256="11a6zpdml5vz3kcdcajw5zcck1zbp4kfdkqm3y6q7qj8ym2f12q5"; depends=[ggplot2]; };
-  bsam = derive2 { name="bsam"; version="1.1.1"; sha256="00ckj2pmyh7pqmbvwlgvgc3m53c807mri46jc0ivfwgf0kc8q0s0"; depends=[coda dplyr ggplot2 gridExtra msm mvtnorm rjags rworldxtra sp tibble]; };
+  bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; };
+  bsamGP = derive2 { name="bsamGP"; version="1.0.1"; sha256="1chg1bd89cbrpi1g8wrfzz3q1m8fhhca1xrr57bhqjs7qjibm5i6"; depends=[ggplot2 gridExtra MASS]; };
   bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; };
   bshazard = derive2 { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; };
   bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
+  bsplinePsd = derive2 { name="bsplinePsd"; version="0.1.0"; sha256="1sicbrammayy56fa72jjygxiqxri93kglpyalhm30llsdm4jic33"; depends=[Rcpp]; };
   bsplus = derive2 { name="bsplus"; version="0.1.0"; sha256="1hpjrmsn66brf1hpwfmg55jbpwbhvkz7sbr160z1cgq3hdhqm7r8"; depends=[htmltools lubridate magrittr purrr rmarkdown stringr]; };
   bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
-  bssm = derive2 { name="bssm"; version="0.1.1"; sha256="1i6hsmd8v7wg9q0nmsg8l5bbrl1rg6i8kz45qzqvxqkz6vy1g501"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
+  bssm = derive2 { name="bssm"; version="0.1.1-1"; sha256="06pizcbxp6l4cjl88ccpn3hsxgq51vcw2bzyc6li4z01jaqvxh5y"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
   bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; };
   bst = derive2 { name="bst"; version="0.3-14"; sha256="02rnnv3f89329kw81a1v88wjzrfjshqjijw5hp3zyydcsfa3j088"; depends=[doParallel foreach gbm rpart]; };
   bsts = derive2 { name="bsts"; version="0.7.1"; sha256="07bnhh82abagphfp6y40wchmgb10h2l5lnqc7am50arfa324blrh"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
@@ -4266,6 +4379,7 @@ in with self; {
   bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; };
   c060 = derive2 { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; };
   c212 = derive2 { name="c212"; version="0.93"; sha256="10gwkr2w05bi27zwvspm3g31a1dpqbh1i52vyrfaamqkxypa11nh"; depends=[coda]; };
+  c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; };
   c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
   cAIC4 = derive2 { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; };
   cIRT = derive2 { name="cIRT"; version="1.2.1"; sha256="1i43pqlyzykyd1a6abg1yi7ai9ay7d2jkvnw1sa4c6q07jk56d89"; depends=[Rcpp RcppArmadillo]; };
@@ -4278,6 +4392,7 @@ in with self; {
   cabootcrs = derive2 { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
   cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; };
   caesar = derive2 { name="caesar"; version="0.1.0"; sha256="1l0z64fsifx37j2h61kzygbwr3z3cncn48znrpb5cq10ma42igqf"; depends=[binhf]; };
+  caffsim = derive2 { name="caffsim"; version="0.2.0"; sha256="0ai6glh21b0mrprz3haib44czkby8c50qp6sma47lb09s578333c"; depends=[dplyr ggplot2 mgcv]; };
   cairoDevice = derive2 { name="cairoDevice"; version="2.24"; sha256="1xbjxz1cxnwzvb6hjns2kk97krmx24chpyvjaa25xwmvy4x6qcps"; depends=[]; };
   calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; };
   calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; };
@@ -4292,7 +4407,7 @@ in with self; {
   cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; };
   candisc = derive2 { name="candisc"; version="0.7-2"; sha256="0sbvngpyni4pagqb5xqjnk5yjd391rdjqq7aypnm2wd3i1am90hm"; depends=[car heplots]; };
   canprot = derive2 { name="canprot"; version="0.1.0"; sha256="0g3sqc81qw8jx6v2p6makclccnvhshimwlhk2cabq20rfs8npgbm"; depends=[CHNOSZ colorspace xtable]; };
-  canvasXpress = derive2 { name="canvasXpress"; version="0.16.2"; sha256="1lc6smczahmm33mkhvad3ylj1n71y2a7z9xji1iaza40bafijv1q"; depends=[htmlwidgets]; };
+  canvasXpress = derive2 { name="canvasXpress"; version="0.16.7"; sha256="129ks8iaakcci0s61xnajyhgzrmkm2dznnrg4gdr0gvbj8wqamkx"; depends=[htmlwidgets]; };
   cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; };
   caper = derive2 { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
   capm = derive2 { name="capm"; version="0.11.0"; sha256="1yw7h1r5m4md8yv0fn1j4wxvhwybifqyvrn8ip3fl32kxbwsmnvz"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; };
@@ -4301,7 +4416,7 @@ in with self; {
   captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; };
   capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; };
   capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
-  car = derive2 { name="car"; version="2.1-4"; sha256="0a6v7rsd1xsdyapnfqy37m7c4kx9wslkzsizc9k0lmnba0bwyfgx"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
+  car = derive2 { name="car"; version="2.1-5"; sha256="1bm0ks9ga60z3izgq0d4kvirr9v4yf1820d1wznkihnbb55bc3m6"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
   carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; };
   cardidates = derive2 { name="cardidates"; version="0.4.7"; sha256="0dxb2941w56s479laf315hqh9iv3k2l1ds7k8hdl9akcacagjgs2"; depends=[boot lattice pastecs]; };
   cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; };
@@ -4321,7 +4436,7 @@ in with self; {
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
   catR = derive2 { name="catR"; version="3.12"; sha256="15db9mfpnrrghiksfrfqqwfhw6fwlqlabc12xq1szg010k343dvb"; depends=[]; };
-  catSurv = derive2 { name="catSurv"; version="1.0.2"; sha256="1j3qkgsv85qpb2kcim1d9c10l725s93apns3glamfrh7pd0jsbcm"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; };
+  catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; };
   catdap = derive2 { name="catdap"; version="1.2.4"; sha256="0vvrlbdjml1cxf6jafjycv0k3kzd2xy1zcwjv0rh3cswxmvpnh3a"; depends=[]; };
   catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
   cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; };
@@ -4336,11 +4451,11 @@ in with self; {
   causalsens = derive2 { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; };
   cba = derive2 { name="cba"; version="0.2-19"; sha256="0nyssc7j5rkv1gcgx4cg31hwc37wd5k3yn9s2k22ffxlnrknss2l"; depends=[proxy]; };
   cbanalysis = derive2 { name="cbanalysis"; version="0.1.0"; sha256="170rhycd78k8ivibvaa7r5hx64wpqwb067s182iwx51fb2yf01a7"; depends=[]; };
-  cbar = derive2 { name="cbar"; version="0.1.0"; sha256="15klwzqkprliqlj33kwf5wi0gr3mvp6gdn6gkikg6xlzyj5r7srr"; depends=[Boom bsts dplyr ggplot2 magrittr]; };
+  cbar = derive2 { name="cbar"; version="0.1.2"; sha256="1y7p0ygxy5c53ms5ylrvw4zlj66z8sj4py21q018g2i6cmwb5vc5"; depends=[Boom bsts dplyr ggplot2 magrittr]; };
   cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; };
   cbsodataR = derive2 { name="cbsodataR"; version="0.2.1"; sha256="0nsg0fzaqhzv8r2lwz5xlybwgv25c0a2hid91ky95yaqvnjrp6mq"; depends=[jsonlite whisker yaml]; };
   ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
-  ccRemover = derive2 { name="ccRemover"; version="1.0.1"; sha256="1i7rbpqdzzhwhc4c2i5cq7dy8a0mzniahwq5nsd2zzjqpx0a8fdj"; depends=[]; };
+  ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; };
   ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
   ccafs = derive2 { name="ccafs"; version="0.1.0"; sha256="1bb1127mfpz6s2hs43msjcxk56bsk6vhxznpnv0fb21r8xnx0g7m"; depends=[crul data_table httr jsonlite rappdirs raster tibble xml2]; };
   cccd = derive2 { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
@@ -4353,7 +4468,7 @@ in with self; {
   cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; };
   cctools = derive2 { name="cctools"; version="0.1.0"; sha256="1x35dxmyyjbf3v2hsbbnq2f88zy5sk6qz3xzx9p2kg5wi5187xl5"; depends=[qrng Rcpp RcppArmadillo]; };
   cda = derive2 { name="cda"; version="2.0.0"; sha256="1vq90z6kafiz5b884hxsz3lg8a0zis1n475lmvwlymcam5rpgjrc"; depends=[randtoolbox Rcpp RcppArmadillo reshape2 statmod]; };
-  cdata = derive2 { name="cdata"; version="0.1.1"; sha256="09iawwg5fjmfcb52cykvifdmcfpl2c51ygapmrfhryr7a92di5wl"; depends=[dplyr tibble tidyr wrapr]; };
+  cdata = derive2 { name="cdata"; version="0.1.5"; sha256="1pqy186x7s3kdiz07b963n57jh83acs9ri0k1h44gfjrywj8jdyx"; depends=[dplyr tibble tidyr wrapr]; };
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   cdcfluview = derive2 { name="cdcfluview"; version="0.5.1"; sha256="0k63hrx3cc04xpi2sxl5g8mn7lc7rh4q33mj3filyiyppj16jixf"; depends=[dplyr httr jsonlite purrr readr V8 xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
@@ -4374,17 +4489,20 @@ in with self; {
   censReg = derive2 { name="censReg"; version="0.5-26"; sha256="1g69261ajha9p762xg2a5pj127b9pfws6ylpiqhjv7h96n12f2pi"; depends=[glmmML maxLik miscTools plm sandwich]; };
   censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; };
   censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; };
-  censusapi = derive2 { name="censusapi"; version="0.2.0"; sha256="0c8qcjmws6h1kmqkfbl261c87ap7h17729lqx9sgvr4336fkjn9f"; depends=[httr jsonlite]; };
+  censusapi = derive2 { name="censusapi"; version="0.2.1"; sha256="1ax1lwnw9978iss8j1hpmbnp8pbsz8rppz37cyfn0m7xnpg9mq8b"; depends=[httr jsonlite]; };
   censusr = derive2 { name="censusr"; version="0.0.3"; sha256="0lcji62kzdxaslvvp54bwfdmbx69lds7inmvywlj0plfqg1kvsid"; depends=[dplyr httr stringr]; };
   censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; };
+  centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; };
   cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
+  cepR = derive2 { name="cepR"; version="0.1.0"; sha256="1yqny6vgsjbrfxlk965pyk38n87ylf4513kbaljmgggrlyaz0qap"; depends=[dplyr httr magrittr purrr tibble]; };
   cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; };
   cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; };
+  cetcolor = derive2 { name="cetcolor"; version="0.1.0"; sha256="013ghlfs27a585851cir5fxgxhi41h48irq90932y55npa8gwdak"; depends=[]; };
   cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; };
   cffdrs = derive2 { name="cffdrs"; version="1.7.6"; sha256="00n3h2vf855anxh0xgsps7sv0kj819864wjdmkiak1lsacysav8s"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; };
   cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; };
   cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; };
-  cgam = derive2 { name="cgam"; version="1.6"; sha256="04mwkij3fyamm8i1wnd87vihcg7c45872n10q9ax5f2nby95ddrc"; depends=[coneproj svDialogs]; };
+  cgam = derive2 { name="cgam"; version="1.7"; sha256="0i0vi2xca0y95bcskzf2apfpphavsz3h9gygzx0l28gfjp91b6jv"; depends=[coneproj Matrix svDialogs]; };
   cgdsr = derive2 { name="cgdsr"; version="1.2.6"; sha256="05q26g7gflq4hsd3xa5xkjc3mhvml7i6dzamfwm0i14kxigghqp8"; depends=[R_methodsS3 R_oo]; };
   cggd = derive2 { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; };
   cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
@@ -4398,7 +4516,7 @@ in with self; {
   cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
   chebpol = derive2 { name="chebpol"; version="1.3-1789"; sha256="1505zdzvc9drw7n8qw5jmqligjgp5gwwki4wlk8dsm0p3p06dvd2"; depends=[]; };
   checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; };
-  checkmate = derive2 { name="checkmate"; version="1.8.2"; sha256="1zqcggl9m7slvc0q6zyhssdypb7jzf3l9byl5vxh1qdwjiw2y64g"; depends=[backports]; };
+  checkmate = derive2 { name="checkmate"; version="1.8.3"; sha256="04rxabzamhv6ybynx627sxk02qvq8znkv0y10vmq67xx6pxhqvla"; depends=[backports]; };
   checkpoint = derive2 { name="checkpoint"; version="0.4.1"; sha256="0hp37scj0iaivwk5w2vprq2yzqfpg6zi19nzaxzaz8w2sk8dql7v"; depends=[]; };
   cheddar = derive2 { name="cheddar"; version="0.1-631"; sha256="0s6v3xcpv8ppgx6q6h2hgrjcf3f3i87kmylnr9q9zhry7729aiyn"; depends=[]; };
   chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; };
@@ -4407,12 +4525,13 @@ in with self; {
   cherry = derive2 { name="cherry"; version="0.6-11"; sha256="0ixrzbzg559h0qb33b9158rk6w6as2b34b7iq5vzm429cpyzl7l8"; depends=[bitops lpSolve Matrix slam]; };
   chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; };
   chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; };
-  childsds = derive2 { name="childsds"; version="0.6.2"; sha256="0y62977mnlrx4zgn2advk99xvbdglb84a5q5iriknga442mn76kq"; depends=[boot class dplyr gamlss gamlss_dist magrittr tidyr]; };
+  childsds = derive2 { name="childsds"; version="0.6.5"; sha256="17i64vcwlhcsmwbsqcrjz9j8m6bacd8ms2ijqf8xc1q6k3nk7pcj"; depends=[boot class dplyr gamlss gamlss_dist magrittr tidyr]; };
   chillR = derive2 { name="chillR"; version="0.66"; sha256="1qw9l3drw3r4an1jy2bckaslwla3s5fvpqr7ahvd2m6alx05b0k6"; depends=[fields httr Kendall pls raster readxl RMAWGEN sp XML]; };
   chinese_misc = derive2 { name="chinese.misc"; version="0.1.6"; sha256="0mm21mla6wxa62k2hq5cp6489n41a8n11l3vzrjj5a6wma9ddc2q"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; };
   chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
   chngpt = derive2 { name="chngpt"; version="2016.7-31"; sha256="1hjqdkqai6aij3giarbxasijipb376qm081ri9w6snd5gy6izzsi"; depends=[boot kyotil MASS survival]; };
   choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; };
+  cholera = derive2 { name="cholera"; version="0.2.1"; sha256="0w213qlnkwbs7y1z5kmxicrbimkqlws46w12vadghf96rn1pb4fv"; depends=[deldir HistData igraph pracma RColorBrewer scales sp]; };
   choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
   chopthin = derive2 { name="chopthin"; version="0.2.1"; sha256="0sib3ic79hff5w2xmmw4z9c6bax33jczrcijs7ywdb8y3viwy5av"; depends=[Rcpp]; };
   chords = derive2 { name="chords"; version="0.95.4"; sha256="1v6zvl1mv9fyf6hx1fpbj3i7s893n4y1w4j9rw1arps006qz2jqn"; depends=[MASS Matrix]; };
@@ -4422,17 +4541,18 @@ in with self; {
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
   chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
   chron = derive2 { name="chron"; version="2.3-50"; sha256="1w3sl60gsirniqslb3pa75caiqbzbvc44phpd4czvwkb62xx1vx9"; depends=[]; };
-  chunked = derive2 { name="chunked"; version="0.3"; sha256="1qhrq957w8nyxndvrnf3xh1p1g7f9qjyr12ybcysgrz4lk0q8xcs"; depends=[DBI dplyr LaF lazyeval]; };
+  chunked = derive2 { name="chunked"; version="0.4"; sha256="0pqk6nnxxnlsw9zal62ajjalrlmvkdrzyz2l8r10jd7s61vhra40"; depends=[DBI dplyr LaF lazyeval]; };
+  ciTools = derive2 { name="ciTools"; version="0.1.0"; sha256="1v871qnfr4f4lab0yq6jg0wqz72wjg3jjnv6wnyyd5zai7pc2vw5"; depends=[arm dplyr lme4 magrittr merTools tibble]; };
   cifti = derive2 { name="cifti"; version="0.4.2"; sha256="1l7dfq53plisyf244l1ch0il0ziy1qcxv0zj3gr4fxdp6k8d1br1"; depends=[base64enc gifti oro_nifti rgl xml2]; };
   cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
   cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; };
-  circlize = derive2 { name="circlize"; version="0.4.0"; sha256="0p1zx1aawkblz48kzzfn5w1k3lbwv9wrk1k5gcfjrr2b4sz1pp5b"; depends=[colorspace GlobalOptions shape]; };
+  circlize = derive2 { name="circlize"; version="0.4.1"; sha256="1w7i3jgxgq510axglzmw54ma9kq7k4c86i9ccndz10mrwc51fji0"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; };
   cit = derive2 { name="cit"; version="2.1"; sha256="1kiph7znr9fiq704wfbms6hsl4shxfqijrlh4dhmik9x9m8sj538"; depends=[]; };
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
   citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
   citr = derive2 { name="citr"; version="0.2.0"; sha256="1nzn0yw74k6zkwzb6spfzqkj3cbx6ry6ypbsnhy6w2flabnnvy4v"; depends=[assertthat curl miniUI RefManageR rstudioapi shiny yaml]; };
-  cjoint = derive2 { name="cjoint"; version="2.0.4"; sha256="0c2vs5zbw83r7jlm6kwjylyd5yjnyz5qaqnk0lh9x54jd0f3nqwv"; depends=[ggplot2 lmtest sandwich survey]; };
+  cjoint = derive2 { name="cjoint"; version="2.0.5"; sha256="0q2mp790maphiz77lw1lashgfcl2a174mmxw65hfvvv7m49plcy3"; depends=[ggplot2 lmtest Matrix sandwich survey]; };
   ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; };
   ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; };
   clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
@@ -4450,12 +4570,12 @@ in with self; {
   cld2 = derive2 { name="cld2"; version="1.1"; sha256="0zlvnnyz5aqjwzxwghfs9pyxcgr86yg3wpmrdg85dnlggjh2j12z"; depends=[Rcpp]; };
   cld3 = derive2 { name="cld3"; version="1.0"; sha256="0qka14z9w01b7xy6k97qcgd9qi6myfaw61imnf09mc8nqm0z3kya"; depends=[Rcpp]; };
   cleanEHR = derive2 { name="cleanEHR"; version="0.1"; sha256="1ppjg72cfh9kdwl8kk7zxyr529xqcwpfcl5lisy7hgpqirma52qn"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; };
-  cleanNLP = derive2 { name="cleanNLP"; version="1.9.0"; sha256="0ww3a9b3nfv9h9i3v5khr823fcq121llcygb1rnyz7hh9hk3njp1"; depends=[dplyr Matrix readr]; };
-  cleangeo = derive2 { name="cleangeo"; version="0.2-1"; sha256="05zzp0dbkpljc9jcx05pdlkdwfbrh6h0l2zksq3cpaw5bvz5g1pl"; depends=[maptools rgeos sp]; };
+  cleanNLP = derive2 { name="cleanNLP"; version="1.10.0"; sha256="127h5aycgwzm8cdgy1ybabviisj4lbb029c8p1czzfwcdvxzpf8s"; depends=[dplyr Matrix readr stringi]; };
+  cleangeo = derive2 { name="cleangeo"; version="0.2-2"; sha256="1bhpn53v36652mwg2ba2a6cs34slb7i0df2ibssyr2lnx5gciq4i"; depends=[maptools rgeos sp]; };
   cleanr = derive2 { name="cleanr"; version="1.1.3"; sha256="0vf2c2inb729kzmpxaznqa2zwj80j1ix9198gc36zq41ag5pd7jk"; depends=[checkmate]; };
   clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; };
   clhs = derive2 { name="clhs"; version="0.5-6"; sha256="0m7pw655d6jidrppk1z84z35n93k1alwq43jh28lf81ydw8finma"; depends=[ggplot2 plyr raster reshape2 scales sp]; };
-  clickR = derive2 { name="clickR"; version="0.2.0"; sha256="01fsaqgc4fxf0p9ww6z3g84ybn5kgj7qyk781flhg7r4s51qmcwv"; depends=[beeswarm ClustOfVar lme4 lmerTest lqmm ordinal ReporteRs survival xtable]; };
+  clickR = derive2 { name="clickR"; version="0.2.9"; sha256="1wzqfxwi0jala9n5ai1f0mi8gvmfa2f6n0yn766ajzn6y6vd8m8v"; depends=[beeswarm ClustOfVar lme4 lmerTest lqmm ordinal ReporteRs xtable]; };
   clickstream = derive2 { name="clickstream"; version="1.2.1"; sha256="1wan098mp2ml194al616h9qvv69q5l19218ja2x9j1qdq9dgp978"; depends=[arules ClickClust data_table ggplot2 igraph linprog plyr reshape2 Rsolnp]; };
   clifro = derive2 { name="clifro"; version="3.1-4"; sha256="1llzdcm4h060pajbh3avn209b717gipxw67rslpbxl1xa4vg1rdn"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
   clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; };
@@ -4478,13 +4598,13 @@ in with self; {
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
   clpAPI = derive2 { name="clpAPI"; version="1.2.7"; sha256="19bn5d7qjj7g0x17jnh2snymcn2r2skzj35hkhsgcj5r43834f3r"; depends=[]; };
   clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; };
-  clubSandwich = derive2 { name="clubSandwich"; version="0.2.2"; sha256="1ib6p58w8ax00cpgxcl6hhpig02d0lay9d2abdx084dbiyb45pad"; depends=[sandwich]; };
-  clue = derive2 { name="clue"; version="0.3-53"; sha256="1wj23bjsrcn7b74vaqara6vwd6qz0wznyfk9zicm627cxcix7n3x"; depends=[cluster]; };
+  clubSandwich = derive2 { name="clubSandwich"; version="0.2.3"; sha256="110zl62xa7dih1lszf9w91fnci9550mdv71z8dis2pklf645qvf5"; depends=[sandwich]; };
+  clue = derive2 { name="clue"; version="0.3-54"; sha256="1fnl1wi0g8f243ra5krlpyz69pg8s8m2wwxa53hb086k7hqv74af"; depends=[cluster]; };
   clues = derive2 { name="clues"; version="0.5.9"; sha256="0znlsbfmnz5wkp2cswrkjbgchdmmf7h78mv2zwx382m9n9n9hshy"; depends=[]; };
   clusrank = derive2 { name="clusrank"; version="0.5-2"; sha256="168xad5dyz46yxm139q09n9vp1304yrhikxz5bcfzhm3psyv5fbf"; depends=[MASS Rcpp]; };
   clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.0.6"; sha256="0hmj85byw1j1b1crb7nj12wz0rddp5cg21jg1dwg7b0mn5xvy981"; depends=[]; };
   clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; };
-  clustMixType = derive2 { name="clustMixType"; version="0.1-17"; sha256="08drby5ifv8wcww4ns2cma2gyhzwj3x6klvh7fs03wrzn6w78hr0"; depends=[]; };
+  clustMixType = derive2 { name="clustMixType"; version="0.1-25"; sha256="0pxdyay65fgarj166vvmzzjh5b6k05hdx1mv8237w16gvqa2i1y8"; depends=[]; };
   clustRcompaR = derive2 { name="clustRcompaR"; version="0.1.0"; sha256="1md1ra18q1iga01q12jyy9va4qyvzlybvbdrdfy2kxhh82w057ww"; depends=[dplyr ggplot2 ppls quanteda tidyr]; };
   cluster = derive2 { name="cluster"; version="2.0.6"; sha256="1z4gbz7chxxi4ly6c0yjlikwgf8aa8dlg05cn5cd6pjr21zvh97l"; depends=[]; };
   cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
@@ -4503,7 +4623,7 @@ in with self; {
   clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
   clustrd = derive2 { name="clustrd"; version="1.2.0"; sha256="029z46ihr2c57wan03c201d9kpaiyhhfvny41fjc2mvvc50rh2z7"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
-  clustvarsel = derive2 { name="clustvarsel"; version="2.3"; sha256="1f7qyffm4jrlg4bh3mg550igs7wib8y9pksx0h6gn0n9pkv1s8rc"; depends=[BMA foreach iterators Matrix mclust]; };
+  clustvarsel = derive2 { name="clustvarsel"; version="2.3.1"; sha256="04jhywv15xqb284nwi80sinxkhadd590vvjbg1immywy2md9gfgc"; depends=[BMA foreach iterators Matrix mclust]; };
   clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
   cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
@@ -4513,9 +4633,10 @@ in with self; {
   cmprsk = derive2 { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
   cmprskQR = derive2 { name="cmprskQR"; version="0.9.1"; sha256="002s6ls670sdzrxgqv9gbl646b675q1gn6dzkngnf6rgcdqwid7n"; depends=[quantreg survival]; };
   cmrutils = derive2 { name="cmrutils"; version="1.3"; sha256="0zjc0bwp2p03hmnj3zjw7800pcdw8b8161y68npyp3hya0s4i9x0"; depends=[chron]; };
-  cmsaf = derive2 { name="cmsaf"; version="1.7.2"; sha256="12kim4nfzar7g6fv2mjqaiy6ks82pp20v4mwnk6b0hilmpvlnhsh"; depends=[fields ncdf4 raster sp]; };
+  cmsaf = derive2 { name="cmsaf"; version="1.8.1"; sha256="0fcm3nqlydlsn1hsm1lrxq7jmmwf8kjqcxfhflsgmd4l0s06pr15"; depends=[fields ncdf4 raster sp]; };
   cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; };
   cna = derive2 { name="cna"; version="2.0.0"; sha256="0cfr4g63wwqkkz2xxz76m82p0am2kyazal6sqp7gnrc48x9lv8im"; depends=[Rcpp]; };
+  cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; };
   cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
   cnmlcd = derive2 { name="cnmlcd"; version="1.0-0"; sha256="0kbq01qrmpn133v18rjphhznpnj8g6dcn1lrbsjykhxkqz086s36"; depends=[lsei]; };
   coRanking = derive2 { name="coRanking"; version="0.1.3"; sha256="1ss00l0c99fi9p6gcimb31nrl5iflps6lvplnjjqwcqjkb2pjh9p"; depends=[Rtsne scatterplot3d]; };
@@ -4529,6 +4650,7 @@ in with self; {
   cocorresp = derive2 { name="cocorresp"; version="0.3-0"; sha256="1r1ssz0cip1gk52nkbr1kpz8gwrg6lwri8ymk41xj2adlsp576v2"; depends=[vegan]; };
   cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; };
   coda = derive2 { name="coda"; version="0.19-1"; sha256="14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl"; depends=[lattice]; };
+  coda_base = derive2 { name="coda.base"; version="0.1.6"; sha256="07y92k12bfxwmcjrp4g6xmjjf99jpxsnk1isficpyr5zz4hpl37q"; depends=[MASS Rcpp RcppArmadillo]; };
   codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
   codep = derive2 { name="codep"; version="0.6-5"; sha256="18da81wja7z9gnn11xiwi7cg43mrj4w2kjkk8s780krbycnfsn5p"; depends=[]; };
   codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; };
@@ -4540,13 +4662,13 @@ in with self; {
   coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; };
   coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
   cofeatureR = derive2 { name="cofeatureR"; version="1.0.1"; sha256="1nxdi97b37pw5xr6cib8hjgziazmy9lfbjgixn9ayacvdhkjs7ib"; depends=[dplyr ggplot2 lazyeval]; };
-  coga = derive2 { name="coga"; version="0.2.0"; sha256="17v4v5k50ps81wrjdj9zv1q1y2fry735pbwycfb9pkcsgdcl1g9r"; depends=[Rcpp RcppGSL]; };
-  coin = derive2 { name="coin"; version="1.2-0"; sha256="0lkwg3siaasdg1c6n3zvfwg36yrvv6v5pjpmj2gplsyifd60kjan"; depends=[modeltools multcomp mvtnorm survival]; };
+  coga = derive2 { name="coga"; version="0.2.1"; sha256="0cb9hvrlhm8c9fjmg4s577r46lp6xj9g0amwd5n9j2vs4m2h8dnf"; depends=[Rcpp RcppGSL]; };
+  coin = derive2 { name="coin"; version="1.2-1"; sha256="1lnxzafsnk2w856hcbx3664drlmyk125v4h3q3gxlv00k8a068b1"; depends=[modeltools multcomp mvtnorm survival]; };
   cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; };
   cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; };
   colf = derive2 { name="colf"; version="0.1.2"; sha256="1xbmc32rp0xlj73krwhqn2ji5xa9kd2anaw88mvi5psdi3d2y1np"; depends=[nlmrt]; };
   collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; };
-  collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.4"; sha256="14zg5cm6qf2106jw5wsmmlkldd71wg0576raqvzzhwbsfkapsb1r"; depends=[data_tree htmlwidgets]; };
+  collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.5"; sha256="0p0570xslfzn1fv9nl389m6z23bihinn0myi8fd6gss6z5w6vkmm"; depends=[data_tree htmlwidgets]; };
   collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; };
   coloc = derive2 { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[BMA colorspace MASS]; };
   colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
@@ -4581,7 +4703,7 @@ in with self; {
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
   compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; };
   compareDF = derive2 { name="compareDF"; version="1.1.0"; sha256="1597xmq857jf4b67k7y869gbflad89rxfvrq8m0gp1wd21wv8z1h"; depends=[dplyr htmlTable tidyr]; };
-  compareGroups = derive2 { name="compareGroups"; version="3.2.4"; sha256="0lg54vyg8jpf98bwqxzbnfiykx2l5dccdw1m48dbkncgkhm388lk"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; };
+  compareGroups = derive2 { name="compareGroups"; version="3.3"; sha256="1gh4jvckbqa9wxc6z191m4hq98blbgi276ckm62m0v51vgpb2c38"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; };
   compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
   comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
   compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; };
@@ -4594,7 +4716,9 @@ in with self; {
   compositions = derive2 { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[bayesm energy robustbase tensorA]; };
   compound_Cox = derive2 { name="compound.Cox"; version="3.3"; sha256="13gqc094c3sx52qx4yvk3la6qs31rgrpm8l6asysn4jp0q6hqgqq"; depends=[numDeriv survival]; };
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
+  comtradr = derive2 { name="comtradr"; version="0.0.2"; sha256="1abfvs0fcfrwhvh94vkvhjjgnz9kj4aw4zi3d874vpwvng7hmx3y"; depends=[dplyr httr jsonlite]; };
   concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; };
+  concaveman = derive2 { name="concaveman"; version="1.0.0"; sha256="0b6a37h4k3p879gp4qp3297q0fzq3yn79yhkwjrcxhcl86sg5nb6"; depends=[dplyr jsonlite magrittr sf V8]; };
   conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; };
   concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; };
   concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; };
@@ -4611,9 +4735,9 @@ in with self; {
   coneproj = derive2 { name="coneproj"; version="1.11"; sha256="11hz6xk7b53c1j2c1l0j8c3gh310b59nhr6ln0vibfp30dzxq7xq"; depends=[Rcpp RcppArmadillo]; };
   conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
   confSAM = derive2 { name="confSAM"; version="0.1"; sha256="00l4hk0n63p3gdv6hpxqkkn3nw4rgw77rpwzn2k8fgq53ja44yfg"; depends=[]; };
-  confidence = derive2 { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[ggplot2 knitr markdown plyr xtable]; };
+  confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; };
   config = derive2 { name="config"; version="0.2"; sha256="1p0gaqrqhcrdkp5cr3rn4i5ny8mr96b3q1fwgs0i8lk5riljkk20"; depends=[yaml]; };
-  configr = derive2 { name="configr"; version="0.3.0"; sha256="08q91pamw1qwpc9parqvr9isnqjiqawyvs1l2cs18y7qykshbd5a"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
+  configr = derive2 { name="configr"; version="0.3.1"; sha256="12hl7w215s41zkz3cc0k96p3r68cqhxry6dgvfbi7583c5yddlxv"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
   confinterpret = derive2 { name="confinterpret"; version="0.2.0"; sha256="168x9hk4vv158fqryfqqp4233lalbi5qv8qrhvicmvraa1zbvp8m"; depends=[]; };
   conformal = derive2 { name="conformal"; version="0.2"; sha256="13d8yv8l333n3m8kl2sdnd0m5b7gjixkqjlpfj312fk9nxvqdbcg"; depends=[caret e1071 ggplot2 randomForest]; };
   confreq = derive2 { name="confreq"; version="1.5.1"; sha256="0gy6d1kffb1w86ifldswb9krxyc2p646g9yjlfm1h243qlp52sfa"; depends=[gmp]; };
@@ -4623,8 +4747,9 @@ in with self; {
   conjoint = derive2 { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
   connect3 = derive2 { name="connect3"; version="0.1.0"; sha256="07ih875ynrxzynj989d0h469ilq6c634z2z3igvxpkx40wr451d5"; depends=[]; };
   conover_test = derive2 { name="conover.test"; version="1.1.4"; sha256="1dscb0rwwvl83ag4lbn13bxnn9apv3dkr37q8qr5i4diahcva17c"; depends=[]; };
+  constants = derive2 { name="constants"; version="0.0.1"; sha256="0vlfy80ww0xlkdrd493223rh4cq75pa7fmb57gkmzhclvfy9i608"; depends=[]; };
   constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
-  contfrac = derive2 { name="contfrac"; version="1.1-10"; sha256="10mw75aznwbhi4kj8s7hyisgxnb4rv8pggcs8zdbmq22w7ql2rd7"; depends=[]; };
+  contfrac = derive2 { name="contfrac"; version="1.1-11"; sha256="0vmcazjlg0p3xaksai3k7yb9bbqkd4lhmbvxf2qymr2asqm51mdi"; depends=[]; };
   conting = derive2 { name="conting"; version="1.6"; sha256="0hyg1nj89i780mf1fgmrfiv5gl5nzlar8i1zy8fsim73cw9y39fm"; depends=[BMS coda gtools mvtnorm tseries]; };
   contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; };
   contrast = derive2 { name="contrast"; version="0.21"; sha256="1fgm6qm3svqg8ryq2kd1h9z6f3ni8kki7gl3izvjw6wir97ph8nw"; depends=[geepack Hmisc MASS nlme rms sandwich]; };
@@ -4642,15 +4767,17 @@ in with self; {
   copBasic = derive2 { name="copBasic"; version="2.0.5"; sha256="0xijw9abqkljacwnblyncjkpaj178s9kq8jazxb39v4qk8pmvq6c"; depends=[lmomco randtoolbox]; };
   copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; };
   cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; };
-  coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.0"; sha256="06kk9j0rjmbvn06nhhjs8qsmy5vsk49gknjw84jv2z6ypp90hfz3"; depends=[]; };
+  coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.2"; sha256="0cvc4nz329pkjkpir3as8vvqyjmcrg9bxp6mqv12vhxyxqsp6hbg"; depends=[]; };
   coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; };
   copula = derive2 { name="copula"; version="0.999-17"; sha256="19i4x4adynn63f0z85hk5npr40lcn36d7cb2z46qnqmpplz9rqh3"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; };
   copulaedas = derive2 { name="copulaedas"; version="1.4.2"; sha256="09w6b1m1lnlnsx0qp2mzlp0z9rxzz90qs9jqzwwjl56lzdad3vpr"; depends=[copula mvtnorm truncnorm vines]; };
-  corHMM = derive2 { name="corHMM"; version="1.20"; sha256="1amfy419m8y9w6swa1avvjdyk2rjymsa280qsdy9zbq0izrgf9dr"; depends=[ape corpcor expm GenSA nloptr numDeriv phangorn]; };
+  corHMM = derive2 { name="corHMM"; version="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; };
   corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
   corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; };
   corcounts = derive2 { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; };
   cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; };
+  cordillera = derive2 { name="cordillera"; version="0.7-0"; sha256="0lapg9h2lw233h8plavs92c1l51m0sicslsr7gjyr0w3vkg13mxq"; depends=[dbscan yesno]; };
+  coreCT = derive2 { name="coreCT"; version="1.1.2"; sha256="1yn57glrbk4wqhb8icjv9hxm5lr3ys85849ddwlb6hnjlfc1cn56"; depends=[igraph oro_dicom plyr raster]; };
   coreNLP = derive2 { name="coreNLP"; version="0.4-2"; sha256="0rvyqj7s3lijq4rzil65060b29m393m7zmg99mykp1g1kby5bjd8"; depends=[rJava XML]; };
   coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; };
   coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; };
@@ -4659,16 +4786,18 @@ in with self; {
   corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; };
   corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; };
   corpora = derive2 { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; };
-  corpus = derive2 { name="corpus"; version="0.7.0"; sha256="1fxxc66zn7wyd23fxc0inll31zq3ccai1kgy5dhmbayk3ad5j35n"; depends=[Matrix]; };
-  corr2D = derive2 { name="corr2D"; version="0.1.12"; sha256="06jhcb4sr9mz06pc8jjrpl1qhxjp4bacal3hgy1k76lfbayxn7fv"; depends=[colorspace doParallel fields foreach mmand rgl]; };
+  corpus = derive2 { name="corpus"; version="0.9.1"; sha256="1bagwiysxk9vsqd3gl4752cid6pnv3nlifry3gb25bqwgxjyhy63"; depends=[Matrix]; };
+  corr2D = derive2 { name="corr2D"; version="0.2.0"; sha256="02z9k0j6j8jyjfgff55amkzsa5w0xbr9nqm1247qylsh8sl2rqcz"; depends=[colorspace doParallel fields foreach mmand rgl]; };
   correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; };
-  corregp = derive2 { name="corregp"; version="1.0.2"; sha256="14d9hr7yi43lcc2qwb3h4zr24h8539clxmcc3qa333jh3ir3zcb1"; depends=[diagram ellipse gplots rgl]; };
+  corregp = derive2 { name="corregp"; version="1.0.3"; sha256="07zsbxhvh7n4ma6lgsmg0kkmgcs5afa02k6cq57afaqvxisw18l3"; depends=[diagram ellipse gplots rgl]; };
+  correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; };
   corrgram = derive2 { name="corrgram"; version="1.12"; sha256="1z0h2mkf4805w3wnhy31cf1gm9miliapxchgc4ksg3kx2799gv91"; depends=[seriation]; };
   corrplot = derive2 { name="corrplot"; version="0.77"; sha256="1lr873lqg4zdjccf9g8a1fbvvdbvyb30j980ygiyxwpajpwnzdjl"; depends=[]; };
   corrr = derive2 { name="corrr"; version="0.2.1"; sha256="1d04nk92fjmk4kc5zipjqjhhmb1w97kid7l2jz5a8pkwiccn5byc"; depends=[dplyr ggplot2 ggrepel lazyeval magrittr purrr seriation tibble tidyr]; };
   corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
   corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; };
   cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
+  cosinor2 = derive2 { name="cosinor2"; version="0.1.0"; sha256="0pxkkp8dxhzqp2v3pfzigh1ka7ardf168k5p41z289xgar9p33g0"; depends=[cosinor ggplot2 Hmisc matrixStats]; };
   cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
   cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; };
   costat = derive2 { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; };
@@ -4690,11 +4819,12 @@ in with self; {
   covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
   covsep = derive2 { name="covsep"; version="1.0.0"; sha256="1i6ygzzf2s0f7a42q2pb1v0gn369wxdyxvbk4k891irq352sf18r"; depends=[mvtnorm]; };
   cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; };
-  cowplot = derive2 { name="cowplot"; version="0.7.0"; sha256="03iimcsh1pk7iqzjdlfcj43b8khijdk4hg00j4jdllv19xsfb0hx"; depends=[ggplot2 gtable plyr]; };
+  cowplot = derive2 { name="cowplot"; version="0.8.0"; sha256="03bh0r6ynr95gk4lc8asfi3kpmskm59vfzwn417pdziha3igs5x6"; depends=[ggplot2 gtable plyr]; };
   cowsay = derive2 { name="cowsay"; version="0.5.0"; sha256="16rlpyfiwk2f04p49inf5m3pb5nvb45xs6sdfjszihm1hxl09x7x"; depends=[fortunes rmsfact]; };
   coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
   coxme = derive2 { name="coxme"; version="2.2-5"; sha256="0lpdwpvsgjgmbf55qqhflw4q40xmqm422inkssgn3ladcp68gb1s"; depends=[bdsmatrix Matrix nlme survival]; };
   coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; };
+  coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; };
   coxphf = derive2 { name="coxphf"; version="1.12"; sha256="0vsdpbpc18fm6dwiqjwclgimwng34xqzy2mqbcijs6p7h1j124a0"; depends=[survival]; };
   coxphw = derive2 { name="coxphw"; version="4.0.0"; sha256="02xiwrvc3gbwwjcz9kwy2g91jrjpawch5r4pq6l4lyvl556w296l"; depends=[survival]; };
   coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
@@ -4715,7 +4845,7 @@ in with self; {
   cramer = derive2 { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
   crandatapkgs = derive2 { name="crandatapkgs"; version="0.1.8"; sha256="12sz54csqnwk49iwg5zcigyczxhgskxsak6ws2ih7nqpv19v8a0m"; depends=[]; };
   crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; };
-  cranlike = derive2 { name="cranlike"; version="1.0.0"; sha256="0xas7k1a8ykgrgwmql3ndy26ww622c53xngim1g9a5xchhra7h4g"; depends=[DBI debugme desc RSQLite]; };
+  cranlike = derive2 { name="cranlike"; version="1.0.1"; sha256="0lnbdkyk5mdy0qlvkx2hakqrisrxsdp5r3gif6f46pf4d9cpfj8v"; depends=[DBI debugme desc RSQLite]; };
   cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; };
   crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
   crawl = derive2 { name="crawl"; version="2.1.1"; sha256="0dr9z8y8rvc3wn1gjb6mh5wmszng9j1r2a9ks6p5am8ghf754sps"; depends=[dplyr gdistance mvtnorm raster Rcpp RcppArmadillo shiny sp]; };
@@ -4723,13 +4853,14 @@ in with self; {
   crblocks = derive2 { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
   crch = derive2 { name="crch"; version="1.0-0"; sha256="1wd9hwr68qlinaw23lckjizq5g67v74wc3v6ig1rxrxyssyzag68"; depends=[Formula ordinal]; };
   creditr = derive2 { name="creditr"; version="0.6.1"; sha256="1dhjl99gjc97bdsdg29mq6xifivjn9kr0y7m2jzvrzb26x856z97"; depends=[devtools quantmod Rcpp RCurl XML xts zoo]; };
+  credsubs = derive2 { name="credsubs"; version="1.0"; sha256="12bs1whk23y41hxa976j30d31x81rmxapz9ll5y2hi5c1h4fypn4"; depends=[]; };
   credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; };
   cricketr = derive2 { name="cricketr"; version="0.0.14"; sha256="0vziyagx594d0k44c53z720vwb1hflcxb7m898l5vfds8jsi6mhv"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
   crimCV = derive2 { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
   crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; };
   crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; };
   crmPack = derive2 { name="crmPack"; version="0.2.1"; sha256="0n6731b5l4vsyk8r35jgvrmmb7sjrlxfcybhrvbpd9m0w5aqi3dz"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; };
-  crminer = derive2 { name="crminer"; version="0.1.2"; sha256="13jqbnk4v2wrkx0zghas0qrn5cff9kawinffjpwixyz9dlgr56pf"; depends=[crul hoardr jsonlite pdftools xml2]; };
+  crminer = derive2 { name="crminer"; version="0.1.4"; sha256="1vnl01q5sw13g6qhvn61w9i40zpg9cszisgi0h8d6q6rr23iws9w"; depends=[crul hoardr jsonlite pdftools xml2]; };
   crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
   crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
   crochet = derive2 { name="crochet"; version="1.0.0"; sha256="1r10lr60v5fqppbqgp994hcx3ybg3yqc0x983pi8frdhj9mqmzrz"; depends=[]; };
@@ -4742,7 +4873,7 @@ in with self; {
   crosstalk = derive2 { name="crosstalk"; version="1.0.0"; sha256="0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk"; depends=[ggplot2 htmltools jsonlite lazyeval R6 shiny]; };
   crossval = derive2 { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; };
   crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; };
-  crplyr = derive2 { name="crplyr"; version="0.1.2"; sha256="07qz1138i6hd4n9cba9sy7fvilbvnr8b8d0n55inbzaqkz04vlx7"; depends=[crunch dplyr lazyeval tibble]; };
+  crplyr = derive2 { name="crplyr"; version="0.1.4"; sha256="1z50hplp6m4zgjfhmf2j8b22np6kjzqnprrdc0qx8408cb9vc9zr"; depends=[crunch dplyr lazyeval tibble]; };
   crqa = derive2 { name="crqa"; version="1.0.6"; sha256="1v9fwl98jjlg2z5skqsjmmgpmmxy4g1gzvc28yflvdp50qn509v8"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
   crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
   crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
@@ -4752,7 +4883,7 @@ in with self; {
   crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; };
   crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; };
   crul = derive2 { name="crul"; version="0.3.8"; sha256="1vcwbdmj357n36hgyldv70a9m8vlb5g14zn6z00ssxagsw1gk5lz"; depends=[curl httpcode mime R6 urltools]; };
-  crunch = derive2 { name="crunch"; version="1.17.0"; sha256="1m6hdh1hbd48gsvr4136jirymn82p6pr8w9db62pj46h8x2p6jsy"; depends=[curl httpcache httr jsonlite]; };
+  crunch = derive2 { name="crunch"; version="1.18.0"; sha256="08yf42aqn1vaa6adsc4c4fwrm9ra7ghi9rg95hrh21mjvd6r55qx"; depends=[curl httpcache httr jsonlite]; };
   crunchy = derive2 { name="crunchy"; version="0.2.0"; sha256="1q9mqpkg5ljb798922fmvjjp36kyjr1rrm6jf3s2fwjrhq186y3z"; depends=[crunch shiny]; };
   cruts = derive2 { name="cruts"; version="0.3"; sha256="0yn6xc2wg23nkjnsb7kii7dn897wf4ymnpmgppacrsznl8mmlmgd"; depends=[lubridate ncdf4 raster sp stringr]; };
   cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; };
@@ -4763,9 +4894,9 @@ in with self; {
   csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; };
   csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
   cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; };
-  cstab = derive2 { name="cstab"; version="0.2"; sha256="0wvcsxfbrw9p1y0l81m4i5p2x8alrzrq30lmprmx2hgazv038b4g"; depends=[cluster fastcluster Rcpp]; };
+  cstab = derive2 { name="cstab"; version="0.2-1"; sha256="08s1vann21k4afq84cp3gjzn2z0hqr7mb2znag0qyd9lzh3z6jd2"; depends=[cluster fastcluster Rcpp]; };
   cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
-  csv = derive2 { name="csv"; version="0.4"; sha256="00nvxr9q8sphmb44vhwszknpd77gzmp8r87r5imd3rwdmql8vs31"; depends=[]; };
+  csv = derive2 { name="csv"; version="0.5"; sha256="1bpxbms54xigfz1z9jalcv5g61f74591ndcdpqrh53bgq6n0l7vv"; depends=[]; };
   csvread = derive2 { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; };
   csvy = derive2 { name="csvy"; version="0.1.3"; sha256="0vszbxqa88sdsi73wng4y8zxhrvcksqa6qs3rbh50c2nll8r8kb3"; depends=[yaml]; };
   cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; };
@@ -4777,7 +4908,7 @@ in with self; {
   cts = derive2 { name="cts"; version="1.0-21"; sha256="0wagxqb8msjc8z33qp7sc92l53f56d9bzz9160bmgpjxlj6cnqcj"; depends=[]; };
   ctsem = derive2 { name="ctsem"; version="2.4.0"; sha256="1rlbk7qwn3lbzzlfwdznfywp5nhwswgl6yj220sfxzjqwlcip9qw"; depends=[Matrix OpenMx plyr Rcpp rstan]; };
   ctv = derive2 { name="ctv"; version="0.8-2"; sha256="0xpxxkn6x26vmdkd2hkn8afyn95q2yg4kl5i989dipqzxc47fbrv"; depends=[]; };
-  cubature = derive2 { name="cubature"; version="1.3-8"; sha256="0m0zs3rgxxzi6ihzchcrb5yy3xd2hc2zi1kxk3dic9mcjl44hfqp"; depends=[Rcpp]; };
+  cubature = derive2 { name="cubature"; version="1.3-11"; sha256="06f6gsvbb732p80r6hxvzh4ik546icxfvx21dyh65ypmw3kgm64k"; depends=[Rcpp]; };
   cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; };
   cudaBayesreg = derive2 { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; };
   cudaBayesregData = derive2 { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; };
@@ -4785,9 +4916,10 @@ in with self; {
   cumSeg = derive2 { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
   cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
   cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; };
-  curl = derive2 { name="curl"; version="2.7"; sha256="1kd7gs2gf4pcgvca34d8cpb4bjdcb5k8zzypk85yndar7icymx3y"; depends=[]; };
+  curl = derive2 { name="curl"; version="2.8.1"; sha256="0dgfl7wn4r8inv55xnk4ybf1y2x4qmi4cbr6phr3lfi1dnjm4hsm"; depends=[]; };
   currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; };
   curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; };
+  curstatCI = derive2 { name="curstatCI"; version="0.1.0"; sha256="00prppvrfk8d234rrazhbjq1ms1ww53pc8zvgywpjf7jiknas2ym"; depends=[Rcpp]; };
   curvHDR = derive2 { name="curvHDR"; version="1.2-0"; sha256="185097ikqhmqqc4ha7l74inx5cmg1bhgw3cw40wk0ngc4wv4sfqi"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; };
   curvetest = derive2 { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_methodsS3 R_oo]; };
   cusp = derive2 { name="cusp"; version="2.3.3"; sha256="130m0is48bp11p5fpg17lwqwlavsa8fzfxjs0z62vl6lm006aahw"; depends=[]; };
@@ -4811,19 +4943,20 @@ in with self; {
   cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
   cystiSim = derive2 { name="cystiSim"; version="0.1.0"; sha256="0pz8jxi4lgcwzrb4dh8xn63xhpaga5rzg5hwqicwv8isc16iqizd"; depends=[ggplot2 knitr magrittr]; };
   cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
-  cytometree = derive2 { name="cytometree"; version="1.0.0"; sha256="1p2avx38cwm69ihr2wxqjf1225h53k8x9kc5axv8vwz17qdj9k2i"; depends=[ggplot2 igraph mclust Rcpp RcppArmadillo]; };
+  cytometree = derive2 { name="cytometree"; version="1.0.1"; sha256="14i6x13kh8kx9vavs4vhv5zxbqwg4r5cxkd1jd801v640p7z9qmm"; depends=[ggplot2 igraph mclust Rcpp RcppArmadillo]; };
   d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
   d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; };
   d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.1"; sha256="0xx1lpp9qpkqh991ib0l9z1wn6j67jnggrhq5gr5sm63m7sjijwn"; depends=[base64enc dendextend htmlwidgets png scales]; };
-  d3r = derive2 { name="d3r"; version="0.6.6"; sha256="1snzkb2qjvhcbj9s8lvqqlzdf4nlqxiyl1vgcsdh9zsgzqbq8aix"; depends=[dplyr htmltools tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.6.9"; sha256="1gh4s0rrzwzzaqjd3gr0dgw6dz9dwijp9lb2hfjbmk5jlj55akhj"; depends=[dplyr htmltools tidyr]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
   dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; };
-  dGAselID = derive2 { name="dGAselID"; version="1.1"; sha256="0aji6zwb201d59zdpvxxx09zfymznpv5m65wrdmm8spc5yrr72p2"; depends=[ALL Biobase genefilter MLInterfaces]; };
-  dHSIC = derive2 { name="dHSIC"; version="1.1"; sha256="0ypsgl7cilq3pv1f6m4c1gb2q15k0r7q1a4kyv99dq6lbss1ydag"; depends=[]; };
+  dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; };
+  dHSIC = derive2 { name="dHSIC"; version="2.0"; sha256="1acbzln2rlyranccsjndpw6pj4a2lyb24jb52r2wms8lsg4fn2m9"; depends=[Rcpp]; };
+  dLagM = derive2 { name="dLagM"; version="0.0.7"; sha256="0p0hdrg4p7aril9hyv184d7v42mqz4pyqvwxcgwpjzpd2cbc9f8k"; depends=[AER dynlm Hmisc wavethresh]; };
   dMod = derive2 { name="dMod"; version="0.3.2"; sha256="1m0rpq78h2vhgl07jsk94hf03zj42wjc08hi6q5lqj77czwpaxfg"; depends=[cOde ggplot2 stringr trust]; };
   dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; };
-  dad = derive2 { name="dad"; version="2.0.0"; sha256="0s9x8h6d3vy0y9in54abcm7y80qnywxbyh5l8ds4sv35y6j5j4pz"; depends=[e1071 lattice]; };
-  dae = derive2 { name="dae"; version="2.7-20"; sha256="13nw3q0r17g1xsnnlggf4x6pd5ycg6vy34gy7pk5509mh0hfj38w"; depends=[ggplot2]; };
+  dad = derive2 { name="dad"; version="3.0.0"; sha256="17ric9kj8zni4yv77k118jaczik85liksa6dfvkvpnc8ig60cajp"; depends=[e1071 lattice]; };
+  dae = derive2 { name="dae"; version="3.0-04"; sha256="1fykmdgg29smdm8qn2cfspjh8lspa57h4s0jsdfz8gh5zfmvsn1h"; depends=[ggplot2]; };
   daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; };
   daff = derive2 { name="daff"; version="0.3.0"; sha256="1kl5pjwxds6bz58zd5xaa1hknd6f9i0512895fhljqi7kvsrldra"; depends=[jsonlite V8]; };
   dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
@@ -4834,35 +4967,38 @@ in with self; {
   dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; };
   darch = derive2 { name="darch"; version="0.12.0"; sha256="17nvxqxbbdv4qdallld5f2c6nhhszsz7ja04rhz5g3844s87bv2f"; depends=[caret futile_logger ggplot2 Rcpp reshape2]; };
   darksky = derive2 { name="darksky"; version="1.0.0"; sha256="03vdzxz5wxwsjz08rg18zsmrg4n7dpgrrm70zrqa5pmyq1swhh2n"; depends=[dplyr ggplot2 gridExtra gtable httr]; };
-  dartR = derive2 { name="dartR"; version="0.80"; sha256="1cp6dgxchyxd3qkfd23x940kgwhaz2dvyxbzbi82xrlzbh20g341"; depends=[adegenet ape data_table Demerelate directlabels doParallel foreach ggplot2 MASS misc3d pca3d pegas plyr quadprog reshape2 rgl seqinr SNPassoc SNPRelate stringr tidyr vegan]; };
+  dartR = derive2 { name="dartR"; version="0.93"; sha256="1mkap7dvbd6j4d2zqp9kdld06ds78fi4w01w7zqmnvz3xzigp3li"; depends=[adegenet ape data_table DBI Demerelate directlabels dismo doParallel foreach ggplot2 MASS misc3d pca3d pegas plotly plyr quadprog qvalue reshape2 rgl seqinr SNPassoc SNPRelate StAMPP stringr tidyr vegan]; };
   darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
   dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
-  dat = derive2 { name="dat"; version="0.2.0"; sha256="19mhpw7lybbkklcr9s9i24ai6b08scxscijvjdawbi5zkbq3h85d"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; };
+  dat = derive2 { name="dat"; version="0.3.0"; sha256="1mzkxjyph4xka32c6bl0krr7723sch15x9wh8v9rcawn0gwnknmj"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; };
   data_table = derive2 { name="data.table"; version="1.10.4"; sha256="0ykbjr1x50ajxbri385vi3mnxj7zg1dcgh9y0snp341qmmmdypw6"; depends=[]; };
   data_tree = derive2 { name="data.tree"; version="0.7.0"; sha256="0rgpapxsqnbzjcifnz3p41b6j8h9x2yfixr5ryd03v8vzgikyf9b"; depends=[DiagrammeR R6 stringr]; };
   data_world = derive2 { name="data.world"; version="1.1.1"; sha256="0kmlls8wicyfjxl27pajkagi4ps1s85rd7ywwfjfrkzkangy05xz"; depends=[dwapi httr ini]; };
+  dataCompareR = derive2 { name="dataCompareR"; version="0.1.0"; sha256="06chgmgrb5n2iiynwxxgf6aq0y5ldsy43s7pwnl64w0vsa7nj8wc"; depends=[dplyr knitr markdown stringi]; };
   dataMaid = derive2 { name="dataMaid"; version="0.9.2"; sha256="13wim5375vlhaba2gawjb7lykzfj4py89cdhip44xaq19agg5675"; depends=[ggplot2 gridExtra haven pander rmarkdown robustbase]; };
-  dataMeta = derive2 { name="dataMeta"; version="0.1.0"; sha256="00959s531arjhrrx9xs5rdshqkdy85gpscchx2gqsapb1jffmpz2"; depends=[dplyr]; };
+  dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; };
+  dataPreparation = derive2 { name="dataPreparation"; version="0.2"; sha256="1r8x679ba0c55za0ayj38g846bapxphpxik3qlcjj9qjwjz6l2ln"; depends=[data_table lubridate Matrix stringr]; };
   dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
   dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.2"; sha256="1c830qwvmh5xw2iw79s0pjnli4zw3r5kf2acx7nllxbj1wkmbpgd"; depends=[curl dplyr httr jsonlite lubridate readr reshape2 xml2]; };
   datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; };
   datacheckr = derive2 { name="datacheckr"; version="0.2.0"; sha256="1kk38pb4dsy6ll6drz2gsngzsv81pwmjrbvh3izm22h849mvlypv"; depends=[]; };
-  datadogr = derive2 { name="datadogr"; version="0.1.0"; sha256="0rib7r8ih2z7f4anq9nkyls743rlig4yjb3vdyxs4cdmw96k14gl"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; };
+  datadogr = derive2 { name="datadogr"; version="0.1.1"; sha256="1b6c5c3m005zlky67gi9lf1y0938gdjyjs8yjg7x51h848sy4i5p"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; };
   datadr = derive2 { name="datadr"; version="0.8.6"; sha256="0fmywnxcvw31vfb9iaxqiw19ycnd98v41pdsdknabysr7fpnygfq"; depends=[codetools data_table digest dplyr hexbin magrittr]; };
   dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; };
   datafsm = derive2 { name="datafsm"; version="0.2.0"; sha256="0s4pcxhdiskq6pm1v5w520vc315qa5nij5av1i720800675k9j1n"; depends=[caret GA Rcpp]; };
   datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
   datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; };
   dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.0"; sha256="17588r2b528ylchdh8aa1k7q7w7wc3f2mxixif8j6snzpwsvwpzc"; depends=[assertthat httr lubridate readr tibble]; };
-  dataone = derive2 { name="dataone"; version="2.0.1"; sha256="0n1c87wb15q7ysz0q5r69g57hk0vpd66m0w9wjbcjlyfn8whqa08"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
-  datapack = derive2 { name="datapack"; version="1.2.0"; sha256="1pyl52r6lbwvr96k8qjnz16l1v3hw80jcbh2ciaa9sld42ds6kgq"; depends=[digest hash redland uuid XML]; };
+  dataone = derive2 { name="dataone"; version="2.1.0"; sha256="0vpa4gb30dvxax4sxbnbn8gblnzdfcf2k0v5js3gqwjb95ah4w4y"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
+  datapack = derive2 { name="datapack"; version="1.3.0"; sha256="0ax7mxqv1p9snfjzli5zw5pjzsl3nlss14kiih1hljvyzdya0s1f"; depends=[digest hash redland uuid XML]; };
   datapasta = derive2 { name="datapasta"; version="2.0.0"; sha256="100nqw315xdzxpzn1gmx4881zli4lwzwckdvqjciysv4l5gvzzfm"; depends=[clipr readr rstudioapi]; };
   datarobot = derive2 { name="datarobot"; version="2.6.0"; sha256="1dnps3hdyz468i7jx2idary2dbphyy6j178n8ba37dvjf5pnhnbw"; depends=[httr jsonlite yaml]; };
   datasauRus = derive2 { name="datasauRus"; version="0.1.2"; sha256="1ixfc1v0iv5jb4920957xhpq9kchdy482vdsm51wj1961ldrkhvh"; depends=[]; };
   dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; };
   datasets_load = derive2 { name="datasets.load"; version="0.1.0"; sha256="029rxg0h17nszkxgq5kjd0njymb8pgdsabmz5slshzd2ijjh82jz"; depends=[DT miniUI shiny]; };
   datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; };
-  datasus = derive2 { name="datasus"; version="0.1.0"; sha256="0i6393fdiaqcraly2zsvqw9pqlijgkifw32havnvx4549gqa77ch"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; };
+  datastructures = derive2 { name="datastructures"; version="0.2.0"; sha256="03jyn1ksxpgva4r22h06lkyrm5ar8xxk3ssaskwqw7l5482i6rvf"; depends=[BH Rcpp]; };
+  datasus = derive2 { name="datasus"; version="0.4.0"; sha256="18mvgdzk2f2plzgz9w47w4zxbdz24rymxvjv08j0cm242pcl11l7"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; };
   datautils = derive2 { name="datautils"; version="0.1.5"; sha256="1yy25a84zmfh54jvxwa7mv4j296rmjgd40m4p81mrsswlqvncmfn"; depends=[deldir gplots gtools]; };
   dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; };
   dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; };
@@ -4875,7 +5011,7 @@ in with self; {
   dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
   dbarts = derive2 { name="dbarts"; version="0.8-7"; sha256="0wmwg8g8xy83yv4wpdpas3jjs5jxx258wh9463q30a8hnr3izc0l"; depends=[]; };
   dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; };
-  dbhydroR = derive2 { name="dbhydroR"; version="0.2-2"; sha256="06m1llg1il0v4v8yi62z26hglzrhzw009y81xpb9zaphcviqp2qr"; depends=[httr reshape2 XML]; };
+  dbhydroR = derive2 { name="dbhydroR"; version="0.2-3"; sha256="03s0h7vykg2wwynw1n4maazwp77r65ai63qslcabr6vzc8a0x4yc"; depends=[httr reshape2 XML]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
   dbmss = derive2 { name="dbmss"; version="2.4-0"; sha256="0rxldlyrwfbpmvgmqzmzifflnc7hv2dv62fmhqihvac7ya1h2rx8"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; };
   dbplyr = derive2 { name="dbplyr"; version="1.1.0"; sha256="17gn8vr4a6m9ynarjbm9xsrhcvgn5lnxhb2qhiiglmhh5mm4a7kv"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble]; };
@@ -4894,7 +5030,7 @@ in with self; {
   ddpcr = derive2 { name="ddpcr"; version="1.8"; sha256="11bk4mhiqn73sjji2wz47v7jqqg9kq3amci9m6a88h4fvvgmpcz4"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
   ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; };
   deBInfer = derive2 { name="deBInfer"; version="0.4.1"; sha256="05khyjpyxwrm9q8jsysffgsjpjbw76w9rrl7i8ia0yc9lv0bzjc9"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; };
-  deSolve = derive2 { name="deSolve"; version="1.14"; sha256="1c4yv5xjk36xwjs0ywxfas1f2xcg05ppf4380s0l3k7gl7vx44g4"; depends=[]; };
+  deSolve = derive2 { name="deSolve"; version="1.20"; sha256="18nx3maww979a8p8ly4hv63y65mnjx8vbj2fpipd6rhcbf1lbsan"; depends=[]; };
   deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; };
   deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; };
   deal = derive2 { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
@@ -4905,6 +5041,7 @@ in with self; {
   decisionSupport = derive2 { name="decisionSupport"; version="1.101.2"; sha256="0zmf87wjrpkg12ix8dz3asrwldwvclj1ifvzff46zgipdm3viqr0"; depends=[msm mvtnorm]; };
   decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; };
   decoder = derive2 { name="decoder"; version="1.1.12"; sha256="0jacp5fqi3l87a86kzhivwd7bl9ndcpymw1vkzmr9r5my8d119pk"; depends=[backports]; };
+  decomposedPSF = derive2 { name="decomposedPSF"; version="0.1.3"; sha256="0p9n0qi21facdp9c4fzs78ap4w1wvpvkv51kgx1gkr949kw8cv4n"; depends=[forecast PSF Rlibeemd tseries]; };
   decompr = derive2 { name="decompr"; version="4.5.0"; sha256="1kbk4z1pr1j4i1sgfkjxzjy2j2fcmrf3vacnrpv1fba2ib10619k"; depends=[]; };
   decon = derive2 { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
   deconstructSigs = derive2 { name="deconstructSigs"; version="1.8.0"; sha256="014x0nb23jb98666kaav2phkvmkr38pi38jv0dqd4jv7zp0gdf1a"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb reshape2]; };
@@ -4913,9 +5050,12 @@ in with self; {
   deductive = derive2 { name="deductive"; version="0.1.2"; sha256="1lz849p0if16877gndkxh7khx1rdvaayhps6khypayddajjr1njq"; depends=[lintools stringdist validate]; };
   deepboost = derive2 { name="deepboost"; version="0.1.5"; sha256="1varzk3dlsxl8y1p4cblw3ivk5h088agsxar02jbl9hs3r6pj17l"; depends=[Rcpp]; };
   deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
+  default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; };
   deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; };
+  defrostR = derive2 { name="defrostR"; version="1.0.0"; sha256="1ncj4qjbalb3v4kcp82wmik9p32lm5rc6cw2fqll88cni49mr62f"; depends=[XML]; };
   degenes = derive2 { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
   degreenet = derive2 { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; };
+  dejaVu = derive2 { name="dejaVu"; version="0.2.0"; sha256="1cnbgssdnvl092vz0j2n4bamvysrr0n9wy6ycz2mkm5wvf4r296i"; depends=[MASS]; };
   deldir = derive2 { name="deldir"; version="0.1-14"; sha256="12cjr4r50rdrh2l0105cvd42rqwzsmmiqcax3sbqk1ggh2lnblw9"; depends=[]; };
   delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; };
   deltaPlotR = derive2 { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; };
@@ -4925,9 +5065,11 @@ in with self; {
   demogR = derive2 { name="demogR"; version="0.5.0"; sha256="1y7pkf1m8fqjsvs0szyaqga2y7p3dvj0r85nz8nzqbmy4zrrv4w8"; depends=[]; };
   demography = derive2 { name="demography"; version="1.20"; sha256="097k0chs8shm1r9ny6jdx2kp2shyxsivjw1n1rhb3bs0m0l3vm9r"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
   dendextend = derive2 { name="dendextend"; version="1.5.2"; sha256="04jz58apibfrkjcrdmw2hmsav6qpb5cs6qdai81k1v1iznfcya42"; depends=[fpc ggplot2 magrittr viridis whisker]; };
+  dendroExtra = derive2 { name="dendroExtra"; version="0.0.2"; sha256="038qda2giqvbwrlpz6dmww912fhbhfz5ll6id6s8ngrd597nn998"; depends=[brnn ggplot2 oce reshape2 scales]; };
   dendroextras = derive2 { name="dendroextras"; version="0.2.2"; sha256="1a42g29w9dvmwrfd244a8ixak6asbkqhzmggl0c4j5fkrp74fpll"; depends=[]; };
   dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; };
   dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; };
+  denoiSeq = derive2 { name="denoiSeq"; version="0.1.0"; sha256="0jsq8qz7bm314gsa3vyavh3ychicqsm5z9yj0vz0jgihmlrdqaxk"; depends=[]; };
   denoiseR = derive2 { name="denoiseR"; version="1.0"; sha256="094nknr3hyx4kv18vnpdzrcpmfb4r7x9jgrp3p6x4nwrgzdh3r95"; depends=[FactoMineR irlba Matrix]; };
   denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; };
   denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; };
@@ -4935,7 +5077,7 @@ in with self; {
   densityClust = derive2 { name="densityClust"; version="0.2.1"; sha256="0blq6h6x071bcy3shr77b3bwq1im0013vbg7gckdhljm859n07bh"; depends=[Rcpp]; };
   densratio = derive2 { name="densratio"; version="0.0.3"; sha256="07da5spbzr8x7sv6pdknc64a5zhs3dgnpcx4s2v68vc31xsd0gqd"; depends=[]; };
   denstrip = derive2 { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
-  depend_truncation = derive2 { name="depend.truncation"; version="2.6"; sha256="0m51kz4d7mng08jarwklfjaxf4baxidq41fhsngcn14ply520y2b"; depends=[mvtnorm]; };
+  depend_truncation = derive2 { name="depend.truncation"; version="2.8"; sha256="1157m2cpa35aymkwx98vkdlg33ngbsyszk8r30988w636nhs2gh6"; depends=[mvtnorm]; };
   depmix = derive2 { name="depmix"; version="0.9.14"; sha256="12mvsd9zab55yg02r309h5i7hldwhh3bd60bzcvwip8vsmym5611"; depends=[MASS]; };
   depmixS4 = derive2 { name="depmixS4"; version="1.3-3"; sha256="0ls30v59hzyd684w4a3aygq1i5m8iq4gxsh8mmjxdq8qx0v84hk2"; depends=[MASS nnet Rsolnp]; };
   depth = derive2 { name="depth"; version="2.1-1"; sha256="17fxv4a5fbb65p7kmb4iakik5ng6401y7gmknkfr66fmjq65i1sm"; depends=[abind circular rgl]; };
@@ -4943,8 +5085,8 @@ in with self; {
   depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
   dequer = derive2 { name="dequer"; version="2.0-0"; sha256="1cvc201g6jc0y09vccswsvvwlmxi7w8raffpald4b3pin10zfr6q"; depends=[]; };
   derivmkts = derive2 { name="derivmkts"; version="0.2.2"; sha256="00bcffqzzsm2h4gfwri772q8i7h40xhv07wl8xj682fnlk246ggs"; depends=[mnormt]; };
-  desc = derive2 { name="desc"; version="1.1.0"; sha256="0mc1jmiwqyj7s6gzxz6fyamzjpmdn3rpfpllby2fq11ml30c6jpr"; depends=[assertthat crayon R6 rprojroot]; };
-  descomponer = derive2 { name="descomponer"; version="1.3"; sha256="0bn8h7z1swj1sia1kj46k9z8xvb4vkk7bfngjd5pnvsi05h4a5ya"; depends=[taRifx]; };
+  desc = derive2 { name="desc"; version="1.1.1"; sha256="0k07qighac1xzmm8k988zi7i88a0yfvia3gk5hbz0fyvb2v9kzrj"; depends=[assertthat crayon R6 rprojroot]; };
+  descomponer = derive2 { name="descomponer"; version="1.4"; sha256="12zpkixclm6jmrgzvcy48c1mdqh9dgadzf9026wjyamphxkkjbip"; depends=[taRifx]; };
   descr = derive2 { name="descr"; version="1.1.3"; sha256="0fp91gbxxxvn2hqdyddhb3x85031wgq7gnqrhzjr956prlv086r6"; depends=[xtable]; };
   describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; };
   descriptr = derive2 { name="descriptr"; version="0.1.1"; sha256="19ppyd9hhhg8s90vd2ldcf2wrr5haanqiycwfcmyrvaddc72i3mv"; depends=[dplyr magrittr]; };
@@ -4956,15 +5098,15 @@ in with self; {
   designmatch = derive2 { name="designmatch"; version="0.3.0"; sha256="1i8xdc6z01x59gvxdmi6qjqwqi8s9zzgfaxwd7xj49r4cl6h81pd"; depends=[lattice MASS Rglpk slam]; };
   desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; };
   desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
-  desplot = derive2 { name="desplot"; version="1.1"; sha256="0lqamq90hajrz43crych8a1k5m645ljhy1rmxjk9vyl4hwrbk5dc"; depends=[lattice reshape2]; };
+  desplot = derive2 { name="desplot"; version="1.2"; sha256="0526bl16gkfb6zrnaffyacp174q02m0gdn85rhr4fpczfm2gi36n"; depends=[lattice reshape2]; };
   detect = derive2 { name="detect"; version="0.4-0"; sha256="119kvkgpgd12v31ps1bg5dmc9djkaqzls548nlrvn1pbmahfnfx5"; depends=[Formula pbapply]; };
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
   detzrcr = derive2 { name="detzrcr"; version="0.2.0"; sha256="10868k4vmc5n8y0xx123klp7hz6fnycsssg9nnq3nm1z36fmgcb7"; depends=[ggplot2 MASS shiny]; };
-  devEMF = derive2 { name="devEMF"; version="3.5"; sha256="1d197v5lgdsb074i2y441d2yzbcm7ik3m6nxxipq1m0nl0d6kdp7"; depends=[]; };
-  devRate = derive2 { name="devRate"; version="0.1.2"; sha256="1x6gp12r9iajvj9lmdmqia077r40n79gdbrppbpijb3rgxs03d4b"; depends=[]; };
-  devtools = derive2 { name="devtools"; version="1.13.2"; sha256="08ajsr12wd31lsx3jv5l9mq4063dc5fpr9lcnzra6kl59vi5pa7v"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; };
-  dexter = derive2 { name="dexter"; version="0.1.7"; sha256="1bpj6izqgp4mi9h4kpm9xhnm8h6j9lvdizr31w51ljs8lkphzpwd"; depends=[colorspace plyr reshape2 RSQLite]; };
+  devEMF = derive2 { name="devEMF"; version="3.6"; sha256="1n5i68f1j3d5yp0p0845zsvr4xhjrvj610wsb5rrlf90jwnarsx2"; depends=[]; };
+  devRate = derive2 { name="devRate"; version="0.1.3"; sha256="1jh3j69r12sr77kwhg6k53byc6z3izpza4rw3q5sr1gl8cb7jbx9"; depends=[]; };
+  devtools = derive2 { name="devtools"; version="1.13.3"; sha256="146wb09cmfh10vhn1ps2nmzx104zldb3nj9qv2ic0gbcikbbryp6"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; };
+  dexter = derive2 { name="dexter"; version="0.4.4"; sha256="1ngp1srrfkhjd1nr9m3s8siqg856jlny8vvckvz6mlyjgbhmayj1"; depends=[colorspace DBI dbplyr dplyr DT fastmatch formula_tools purrr Rdpack rlang RSQLite shiny shinyBS shinydashboard tidyr]; };
   df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
   dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; };
   dfcomb = derive2 { name="dfcomb"; version="2.3"; sha256="0bgbjqv15y0wv48zzkc8pssyadcbrqy1chddiq3l91499kcw9ya6"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
@@ -4972,10 +5114,11 @@ in with self; {
   dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
   dfmta = derive2 { name="dfmta"; version="1.5"; sha256="1npa7hvcaimhjp31hbvwj1xhriryghwny3nnnp7vpvmy54i7hx84"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
   dfoptim = derive2 { name="dfoptim"; version="2016.7-1"; sha256="1hs0ln5iz3h1x1b27jai83r3gad6698zwhr2jgpviiv9zwhic8c2"; depends=[]; };
+  dfped = derive2 { name="dfped"; version="1.0"; sha256="0xhyh5sm1a009pwfn2yb3vg2hr4sfpf9ifg09hqcvjx56pxfd8zh"; depends=[ggplot2 rstan]; };
   dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; };
-  dfpk = derive2 { name="dfpk"; version="3.3.0"; sha256="003bpj65rxbf8m3sa5npw1f5n0zaaamjr125pslmgwf8043wyf3k"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
+  dfpk = derive2 { name="dfpk"; version="3.3.1"; sha256="007rxz7xfhp1r15hnfndh7fx5jwshszg2x9zgy2wk79gxdf2gy9w"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
   dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
-  dggridR = derive2 { name="dggridR"; version="1.0.1"; sha256="0pjd7q7zbsbv6xrjxchfzqvq0qr459lqkjd854kprcp6kmsxsbzd"; depends=[dplyr ggplot2 rgdal]; };
+  dggridR = derive2 { name="dggridR"; version="2.0.1"; sha256="1af5sn3py3my543vn6izqmlsc80rvyx7dqxprylk4pzsmc8yyx4c"; depends=[dplyr ggplot2 Rcpp rgdal sp]; };
   dglars = derive2 { name="dglars"; version="2.0.0"; sha256="0nhljv02cfsna4d220nhla4fs84hr30qs9j32mml0brnmazyjj0n"; depends=[Matrix]; };
   dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; };
   dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; };
@@ -4985,18 +5128,19 @@ in with self; {
   dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; };
   dhglm = derive2 { name="dhglm"; version="1.7"; sha256="09wasgvjw0xc9k68m6a8lx372p2hywk4j6ikr9wjjjfl6f17j1cw"; depends=[boot MASS Matrix numDeriv]; };
   di = derive2 { name="di"; version="1.0.0"; sha256="0lccp4xzmnj24zvwya6vw2d429b9q5rp6vfby0k3rqljgzyy6rgk"; depends=[scales]; };
-  diagis = derive2 { name="diagis"; version="0.1.2"; sha256="03mq94mx28xkspxs73c4xvm0d81wzf116fifakv4l0gpnpv21xkz"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; };
+  diagis = derive2 { name="diagis"; version="0.1.3"; sha256="0ni7xqpnzr5drdw12sslm7d7amwzaifhlr2pw6b4f264wcab72i8"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; };
   diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; };
-  diagram = derive2 { name="diagram"; version="1.6.3"; sha256="1iga574r31hz7g50nmicbah4rj4l46w6lgw3sz1b69iv6hpp7sq1"; depends=[shape]; };
+  diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; };
   diaplt = derive2 { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; };
   dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; };
   diceR = derive2 { name="diceR"; version="0.1.0"; sha256="17a8p0p6cirzp533s6cjib0z7rwxhdpmsngm0pwgpxbvd7hwaa1a"; depends=[abind apcluster assertthat blockcluster caret class clue cluster clusterCrit clValid dplyr flux ggplot2 gplots Hmisc infotheo kernlab klaR magrittr mclust NMF purrr quantable RankAggreg RColorBrewer Rcpp sigclust tidyr]; };
+  dicecrawler = derive2 { name="dicecrawler"; version="0.1.0"; sha256="04cfzc6qldfaga4mj7bw8hdbznl6jr5h91nq20c74khv5g7vas7m"; depends=[curl jsonlite rvest xml2]; };
   dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; };
   dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
   didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; };
   dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
   diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; };
-  difNLR = derive2 { name="difNLR"; version="1.0.3"; sha256="0wdlkrrwxmdqddbv8g8bjwkjybpp0zqf27dxiwav3w5yacdib3pw"; depends=[CTT ggplot2 nnet reshape2]; };
+  difNLR = derive2 { name="difNLR"; version="1.1.0"; sha256="00cnd155qdv60kvlw9y32316p3gk52xaqxjw4815af2glgdl9lr6"; depends=[CTT ggplot2 msm nnet reshape2]; };
   difR = derive2 { name="difR"; version="4.7"; sha256="17i8l4z7dw8nfr4b5pc72l1qm7byjcflh58kasafx9kxyvfgz258"; depends=[lme4 ltm]; };
   difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; };
   diffEq = derive2 { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; };
@@ -5005,6 +5149,7 @@ in with self; {
   diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
   diffeR = derive2 { name="diffeR"; version="0.0-4"; sha256="08g21h3yq8rm2i6ah364nfadg7hnghc21jnpi5aqwzqyd2v93b67"; depends=[ggplot2 raster rgdal]; };
   diffobj = derive2 { name="diffobj"; version="0.1.6"; sha256="0f6wskh3nl8ngh195x8wiv1g0fc690r4zh4ypkraqd2c6x1iskg7"; depends=[crayon]; };
+  diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; };
   diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
   diffractometry = derive2 { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
   diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; };
@@ -5074,8 +5219,8 @@ in with self; {
   dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; };
   dlmodeler = derive2 { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
   dlnm = derive2 { name="dlnm"; version="2.3.2"; sha256="1gkpdy1mgnhiabfrfi41p3n8kzh2l480qrf3v50n8p3xcjamiagp"; depends=[mgcv nlme tsModel]; };
-  dlsem = derive2 { name="dlsem"; version="1.8"; sha256="0nxgysk1gpn72vap9rycjw3qrs5wnraazpakmf5m16vs8pgslc5c"; depends=[graph gRbase nnet Rgraphviz]; };
-  dlstats = derive2 { name="dlstats"; version="0.0.9"; sha256="0dgd4f8whk94whk9larvsp5axwijcdv5ib33akdysf25zf191mi2"; depends=[jsonlite magrittr]; };
+  dlsem = derive2 { name="dlsem"; version="1.9"; sha256="1j72w9lpxsmlf39458pq72mgy6yz4rnsyx4d7s08rvl1jh32a8ni"; depends=[graph gRbase nnet Rgraphviz]; };
+  dlstats = derive2 { name="dlstats"; version="0.1.0"; sha256="0s92rdpw3m534wgjaic4srsp9i1pa3ibfmr4h7p3ly51zhza6l5h"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; };
   dma = derive2 { name="dma"; version="1.3-0"; sha256="12gjrk0dp5w49wf0zkwc16vf8hd82822k88zb9fax3dklwm1dd3p"; depends=[MASS mnormt]; };
   dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; };
   dmm = derive2 { name="dmm"; version="1.7-1"; sha256="0ihzbv2vlymyr1l0xi0jmx0xgpbj46azd7gwr3m9qsgnjp7wc1p8"; depends=[MASS Matrix nadiv pls robustbase]; };
@@ -5083,7 +5228,7 @@ in with self; {
   dmutate = derive2 { name="dmutate"; version="0.1.1"; sha256="14lv16lqvlccf84s1g1qrz88y732qzb9545skg6fjrldcr8b0hl4"; depends=[dplyr]; };
   dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
   dnc = derive2 { name="dnc"; version="1.2"; sha256="0a0nc1yx6vhbjsik9pidda97i7s6ndlsm8pzx29ccmxlmqncc18b"; depends=[BayesLogit igraph MCMCpack movMF plot3D plot3Drgl Rcpp RcppArmadillo skmeans vegan]; };
-  dnet = derive2 { name="dnet"; version="1.0.10"; sha256="011rqvwski3jh5nmn84pg3pxznbfm37gjz7sp7n6f3x3y807q2rg"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
+  dnet = derive2 { name="dnet"; version="1.1.1"; sha256="1pj31586li19dybfvwljmpv18k6k2mvrx6g0a8rjjdcqczasf8yr"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
   doBy = derive2 { name="doBy"; version="4.5-15"; sha256="0n1ml47f78nqhy92a0fgsb4brz0qyfr4q3c7im8pnb0ngia4ssdx"; depends=[MASS Matrix]; };
   doFuture = derive2 { name="doFuture"; version="0.5.0"; sha256="1yb483x99z7xjrxb2r4v2l0d66y15pc799dxqn62kppmr0j452bz"; depends=[foreach future iterators]; };
   doMC = derive2 { name="doMC"; version="1.3.4"; sha256="0y47jl6g4f83r14pj8bafdzq1phj7bxy5dwyz3k43d2rr8phk8bn"; depends=[foreach iterators]; };
@@ -5092,22 +5237,23 @@ in with self; {
   doRNG = derive2 { name="doRNG"; version="1.6.6"; sha256="0xnqrc74qncg5iv4cvq0vh3r1sd407wvzx0hfpy8j2rcqy12574k"; depends=[foreach iterators pkgmaker rngtools]; };
   doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; };
   doSNOW = derive2 { name="doSNOW"; version="1.0.14"; sha256="1xfk48i465sv2jqzydsaff3a656ggkrxzvhsqnrsgqh1k3423a1g"; depends=[foreach iterators snow]; };
+  docker = derive2 { name="docker"; version="0.0.2"; sha256="00zq4zmv2y6q069q92dn8db2bj96kfy7pv2s58q21dxkp1c4s6qg"; depends=[reticulate]; };
   docopt = derive2 { name="docopt"; version="0.4.5"; sha256="1pwng6018ls0hk785bs8yjwpzsqr2pcvzgpavqd9rw19n5lvzhxn"; depends=[stringr]; };
   docopulae = derive2 { name="docopulae"; version="0.3.3"; sha256="13889sj509gbl9zs7jqdvslp6sc81jv54cbqh1wpp834jp5s1q3x"; depends=[]; };
   docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; };
   docuSignr = derive2 { name="docuSignr"; version="0.0.2"; sha256="0a0m1kdfd2pml82qwqw9wv9aa3k7hrjyj0wrsbsxap2ly8raxvj3"; depends=[httr jsonlite magrittr]; };
   documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
-  document = derive2 { name="document"; version="1.2.0"; sha256="1hhwhzq9cw01lvb3gv6rykbfajmkd1hr8cc7r75ni1bh7y4gy961"; depends=[callr checkmate devtools roxygen2]; };
+  document = derive2 { name="document"; version="2.1.0"; sha256="1f9dr6kvmdb3lgxka2j5jr3ar1p4h0f2f7a1qqbq8a69s7f4qa7z"; depends=[callr checkmate devtools roxygen2 rstudioapi]; };
   docxtools = derive2 { name="docxtools"; version="0.1.1"; sha256="1mlgl9105mifzdgf57spgr2rr5740ghr5afmlskxn6ind7jfka70"; depends=[dplyr ggplot2 pander stringr tidyr]; };
   docxtractr = derive2 { name="docxtractr"; version="0.2.0"; sha256="197j57ab8x960b1yfq6xp8fwmq51xs04nf0cb16r161h4bcmgs2j"; depends=[dplyr purrr tibble xml2]; };
   domino = derive2 { name="domino"; version="0.3.0"; sha256="0lhrnrpyz98cl16a1xk7x0299kxkz303myyz61nw3x6f7kh1gvd6"; depends=[]; };
-  dosresmeta = derive2 { name="dosresmeta"; version="1.3.3"; sha256="0j0718mlzwnnxc7rm9yqm9izsa7c2kbwfx9ai2ygj3xki9wr70jm"; depends=[aod Matrix mvmeta]; };
+  dosresmeta = derive2 { name="dosresmeta"; version="2.0.0"; sha256="1k6m9zl0xzwg7x7s63c4agi7qfdk67f3hjbsikfhsgrb0rbbkpf7"; depends=[mvmeta]; };
   dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
   dotCall64 = derive2 { name="dotCall64"; version="0.9-04"; sha256="0qp6magpp0jaa0b9sfkbxd91afayl24kj0yrh0ix1v3ahdnaar8f"; depends=[]; };
   dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; };
   dotwhisker = derive2 { name="dotwhisker"; version="0.3.0"; sha256="1sbj8blnqnsyvf7pq2cc9q7nqb66n0v2gi2rr09yjlppf7v1pcjf"; depends=[broom dplyr ggplot2 ggstance gridExtra gtable plyr stringr]; };
   downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
-  downscale = derive2 { name="downscale"; version="1.2-4"; sha256="080zlfz0yhznymr7icc2m7w5c0pqiak1qp22ywcfcb6d0mri3k8l"; depends=[cubature minpack_lm raster Rmpfr sp]; };
+  downscale = derive2 { name="downscale"; version="2.0-2"; sha256="0ladwn27x019rhz5dil06d17gj15fhcwlmrrci150z9wzbq6ip4q"; depends=[cubature minpack_lm raster Rmpfr sp]; };
   downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; };
   dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; };
   dparser = derive2 { name="dparser"; version="0.1.3"; sha256="0cy8k7rqz06s01hr80vppb7mkf5bmh2lpdrzn4fzzmbzciflbh32"; depends=[digest]; };
@@ -5115,29 +5261,30 @@ in with self; {
   dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
   dplR = derive2 { name="dplR"; version="1.6.6"; sha256="04b0j9l2gkkycjjn16zbhv0kczhrij0bsnrdyh9qd6z53pvd3ryc"; depends=[digest lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; };
   dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
-  dplyr = derive2 { name="dplyr"; version="0.7.1"; sha256="1x0jknh4q7svm05yiwj77vwihcq4kq1x0xw93xqqz01a9d376xcc"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble]; };
+  dplyr = derive2 { name="dplyr"; version="0.7.2"; sha256="0jpb32ca1c0mr660igna4yw4fmzydzfhxshd0g8wgmggkynx2qi2"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble]; };
   dpmixsim = derive2 { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; };
   dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; };
   dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; };
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
   drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; };
-  drake = derive2 { name="drake"; version="3.0.0"; sha256="1c7kfwj9wjmxf66zd8fr9lk6ym5zsca70r725g6g9w3v76015mgb"; depends=[base64url codetools crayon digest eply igraph magrittr plyr R_utils storr stringi stringr testthat]; };
+  drake = derive2 { name="drake"; version="4.0.0"; sha256="1f03n13cfp5hi7rl1ika4fhrw98fh218kzxgyn3v0d1kjdkap7z5"; depends=[base64url codetools crayon digest eply igraph magrittr plyr R_utils storr stringi stringr testthat visNetwork]; };
   drat = derive2 { name="drat"; version="0.1.2"; sha256="14nmbxy2y51bi258fmx24pkwmga791hnwzbx6jy2sl55g3vrxjpz"; depends=[]; };
   drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
   drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; };
-  drfit = derive2 { name="drfit"; version="0.6.7"; sha256="0sh447qfx310wb19xcr1sbpap3jbi1nhmdzdrd5695zh2zcav2p7"; depends=[drc MASS]; };
+  drfit = derive2 { name="drfit"; version="0.7.1"; sha256="1k2chmhdwd78a5d1pxi3iskzfb4h1fxp51ji72qs73m3i6s2mqpz"; depends=[drc MASS qcc reshape2 RODBC]; };
   drgee = derive2 { name="drgee"; version="1.1.6"; sha256="01404mqvkvndn5gybq8dgkfc1cy9wk94p7k7i64h47w3zbkcwsax"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; };
   drm = derive2 { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
   drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; };
   dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
   drsmooth = derive2 { name="drsmooth"; version="1.9.0"; sha256="1wgi961bvbsnq4bygxbpy4sy5fy34lrrkaaj0r2rxcahwa1sc38n"; depends=[boot car DTK lubridate mgcv multcomp pgirmess segmented]; };
+  drtmle = derive2 { name="drtmle"; version="1.0.0"; sha256="1fnzgy3sq5nys7qw8g5bhmzw92azripjg6pb93vxrfsbr4agmmrz"; depends=[foreach np plyr SuperLearner]; };
   ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; };
   dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; };
   dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; };
-  dslabs = derive2 { name="dslabs"; version="0.0.1"; sha256="1v47w75h9m911smg25w0bmxzjfc3yyig2npp9sfyfx61h6jdh5a2"; depends=[]; };
+  dslabs = derive2 { name="dslabs"; version="0.1.0"; sha256="1ggskr5kqmjl5fa5skzjnc8zwcji79yzixlg05c1rvsiap6b0lwl"; depends=[ggplot2]; };
   dslice = derive2 { name="dslice"; version="1.1.5"; sha256="0qwz9rlgpgx0k28hca2m40ab0qad9rfp1gxswygchv7rcnl4f6ml"; depends=[ggplot2 Rcpp scales]; };
-  dsm = derive2 { name="dsm"; version="2.2.14"; sha256="1zcm4111qzl7mf160z7ax9gvvs627nig4zimxagzm2jdp004w10r"; depends=[ggplot2 mgcv mrds nlme numDeriv statmod]; };
-  dsmodels = derive2 { name="dsmodels"; version="1.0.0"; sha256="094kif1ffbqlznsfig1rqkpgjd6r7dnlwwmjnlhwax05xvv3dl92"; depends=[shape]; };
+  dsm = derive2 { name="dsm"; version="2.2.15"; sha256="1b7ixbfq2xpgbc5hyhyzcr6nx4larl3qg1idccraiwrj3m2dr59h"; depends=[ggplot2 mgcv mrds nlme numDeriv statmod]; };
+  dsmodels = derive2 { name="dsmodels"; version="1.1.0"; sha256="0gidxi4ph49mjm2hdf9flphfb9916al4cpdkiig504n7ms2sbpbg"; depends=[latex2exp pryr shape]; };
   dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; };
   dst = derive2 { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; };
   dtables = derive2 { name="dtables"; version="0.2.0"; sha256="0ikgip3p4b7q97b2dshlx0fq09xsk304gfk5prw4rk95w9wck3qs"; depends=[psych]; };
@@ -5148,7 +5295,7 @@ in with self; {
   dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
   dtw = derive2 { name="dtw"; version="1.18-1"; sha256="1b91vahba09cqlb8b1ry4dlv4rbldb4s2p6w52gmyw31vxdv5nnr"; depends=[proxy]; };
   dtwSat = derive2 { name="dtwSat"; version="0.2.3"; sha256="10b0hs9kn5ljfv28iz62h966zb1pxsfrr6fx45d4427gr6fg8ncz"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp xtable zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="4.0.1"; sha256="1avm9s54690rmhk8aihv1761rdmd1ymqcbzchqbacp9wrsyz1558"; depends=[clue dtw flexclust foreach ggplot2 Matrix plyr proxy Rcpp reshape2 rngtools RSpectra]; };
+  dtwclust = derive2 { name="dtwclust"; version="4.0.3"; sha256="1pg9yl1z7a3b17cpaxigry90jnf01jckarnd6gimjf02zyrjqblw"; depends=[BH bigmemory clue dtw flexclust foreach ggplot2 Matrix plyr proxy Rcpp RcppArmadillo reshape2 rngtools RSpectra]; };
   dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
   duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; };
   dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
@@ -5167,14 +5314,14 @@ in with self; {
   dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; };
   dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
   dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; };
-  dynamichazard = derive2 { name="dynamichazard"; version="0.3.4"; sha256="173br7i0p9q4c2v6bmj7mnyjwjiv5ahfvll8vxjb82aa6i48w4dx"; depends=[boot data_table Rcpp RcppArmadillo stringr survival]; };
+  dynamichazard = derive2 { name="dynamichazard"; version="0.3.5"; sha256="1p11krli4chramgcglf1rw30kk7gqjgp34vlqvfl1ppp3m80rriy"; depends=[boot data_table Rcpp RcppArmadillo stringr survival]; };
   dynatopmodel = derive2 { name="dynatopmodel"; version="1.1"; sha256="100g131jmgb3by9j3v2n7f7jh9623vd7xf5frjkwrxvwzf0q1i3k"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; };
   dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; };
   dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
   dynlm = derive2 { name="dynlm"; version="0.3-5"; sha256="1sjhhlvvcgmayb9dfwacv1g75c4lhbpzyczj6h7gkd19bcfbdhqp"; depends=[car lmtest zoo]; };
   dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; };
   dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
-  dynr = derive2 { name="dynr"; version="0.1.11-2"; sha256="0rfcmdsghrmk4cxxdwbm2bygcdbvknj5ndj8ppfxi0a1hsvb9k7g"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr reshape2 xtable]; };
+  dynr = derive2 { name="dynr"; version="0.1.11-8"; sha256="1rnpzwzcdqvlh6h6npz7akw4dmw1r0958mk665z5cwssq4fha2dm"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; };
   dynsbm = derive2 { name="dynsbm"; version="0.4"; sha256="036m5gcwfcdjj5xkrbvnnx1a6i31n9j3q2mcijc7qimbld31pfj6"; depends=[RColorBrewer Rcpp riverplot]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
   dynsurv = derive2 { name="dynsurv"; version="0.3-5"; sha256="0rvwnssg876sng53viiqfcm7mxvilpds9yahj6bwgs90chnkjz4g"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
@@ -5185,17 +5332,19 @@ in with self; {
   eLNNpaired = derive2 { name="eLNNpaired"; version="0.2.3"; sha256="08nck2p5npyw264kgcqmgx5rx7c3h9v892f90xlcd1dnb7dqlan3"; depends=[Biobase globaltest GSEAlm iCheck samr]; };
   eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; };
   eRm = derive2 { name="eRm"; version="0.15-7"; sha256="0x8cqcwgn8znd9w9vkxcacf097rziyb511wzcfmhhadidiilk0x3"; depends=[lattice MASS Matrix]; };
-  eVenn = derive2 { name="eVenn"; version="2.3.5"; sha256="1lg3700wbc2f5gbyiwjfgkv6v2b8zswwrnbcv0bgwqpq236hx69g"; depends=[]; };
+  eVenn = derive2 { name="eVenn"; version="2.3.6"; sha256="0g4ji7dli5d21xnyfzw3qda9mgm25ax2jlvfzfbn4h1ra83mcw0m"; depends=[]; };
   eaf = derive2 { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; };
   earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; };
-  earth = derive2 { name="earth"; version="4.5.0"; sha256="1gz5szpwzf5p18h9cmcmqivm5ql2qmbck9s7hqmimmgknjc1qscj"; depends=[plotmo TeachingDemos]; };
+  earth = derive2 { name="earth"; version="4.5.1"; sha256="1fkjrdlq0a8w9dvvp0akxpyg0sxrcd08qzflpxjbwd73pm1l31m5"; depends=[plotmo TeachingDemos]; };
   earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; };
+  easyAHP = derive2 { name="easyAHP"; version="0.1.0"; sha256="11ccxqw016ji32c57gq9zlzz0m8gk7bqqhfvm750mwq1yb96bqdi"; depends=[]; };
   easyDes = derive2 { name="easyDes"; version="3.0"; sha256="1z4ynd1ck2vxsshygjgnhyzg8i41kpnwsfix96nmgwm3861n0phb"; depends=[multcomp PMCMR]; };
   easyNCDF = derive2 { name="easyNCDF"; version="0.0.4"; sha256="1hd7b6pdm5j41a4v0jxhbqdy2bz5gj86fsfwj0l7gg7h32d6hkhq"; depends=[abind ncdf4]; };
   easyPubMed = derive2 { name="easyPubMed"; version="2.3"; sha256="148ga6flgv74sfzz5kvvnqhfdkx6zhpl6ydzcd32lz3cq24ckli9"; depends=[XML]; };
   easySdcTable = derive2 { name="easySdcTable"; version="0.3.0"; sha256="1dyj66vd1g06s2fs6xqrf7b4sr2p55azhzdjhazvkm9h8j55ai02"; depends=[sdcTable shiny SSBtools]; };
-  easyVerification = derive2 { name="easyVerification"; version="0.4.2"; sha256="1qj560gjhgjrj28yl4pwbgp32h3ix6hcx85r3z70hv0cks653zwf"; depends=[pbapply Rcpp SpecsVerification]; };
+  easyVerification = derive2 { name="easyVerification"; version="0.4.3"; sha256="02f7n5iwivzbsdaj2pca0vs50zins6hapn4bn4nxg624qnrldnfy"; depends=[pbapply Rcpp SpecsVerification]; };
   easyanova = derive2 { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; };
+  easycsv = derive2 { name="easycsv"; version="1.0.5"; sha256="1fk7fj6y69hjgwgrfpz69jhbhz6yj5gjlrmji74h2k5qfk3fssky"; depends=[data_table]; };
   easyformatr = derive2 { name="easyformatr"; version="0.1.2"; sha256="0mrpd21hyafn82apclxmhs2jbd87sdw0g6lwc3h6gl5cbm213nxb"; depends=[dplyr knitr lazyeval magrittr stringi tibble tidyr]; };
   easyml = derive2 { name="easyml"; version="0.1.0"; sha256="1ngfai9i2v9hn09c7z48b43113kz2jkq7qvz22z25qdrav42hs1c"; depends=[caret corrplot darch dummies e1071 futile_logger ggplot2 glinternet glmnet nnet pbapply pbmcapply pROC randomForest scales scorer]; };
   easynls = derive2 { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; };
@@ -5212,23 +5361,24 @@ in with self; {
   ecd = derive2 { name="ecd"; version="0.8.3"; sha256="0ksr5yixg4psgx4nf3y061k2fj5843f6f3xwbfl0nyfly8595s1x"; depends=[digest gsl moments optimx polynom Rmpfr RSQLite xts yaml zoo]; };
   ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; };
   ecespa = derive2 { name="ecespa"; version="1.1-8"; sha256="0rdjr0ss7a1n66dmvykbs3x944r88l08md2rfkg9w7bxm361ib8p"; depends=[spatstat splancs]; };
-  echogram = derive2 { name="echogram"; version="0.1.0"; sha256="0v0fiy2fflk7pxn8wqr75wym0m6snggvvgxpa2b35alpmqch9k18"; depends=[geosphere readHAC]; };
+  echogram = derive2 { name="echogram"; version="0.1.1"; sha256="0f93s9f1ghin8129vb3bvsp7jmy2hfrx97p86hci8b2y4f7b83qh"; depends=[geosphere readHAC]; };
   ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
   eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; };
   ecm = derive2 { name="ecm"; version="2.0.0"; sha256="1xfcpsnimik8a2rzsywgiw4dj3r66mfcq7l79096d3zifg2vjgxc"; depends=[car]; };
-  eco = derive2 { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; };
-  ecodist = derive2 { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; };
-  ecoengine = derive2 { name="ecoengine"; version="1.10.0"; sha256="0k24m03qpqbcdwsf6xawrh0x43b97w2pba3h4pcwl7j2p0ls91pi"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; };
+  eco = derive2 { name="eco"; version="4.0-1"; sha256="08fblbr9qp2v0cp69hy68c18xjqvx0nsnx42n2vd1gc6r7apapj6"; depends=[MASS]; };
+  ecodist = derive2 { name="ecodist"; version="2.0.1"; sha256="04piv52b4b9rgv1gy6s3b1lzapc0rqiwp1yi7f8yzgjd9329kc5g"; depends=[]; };
+  ecoengine = derive2 { name="ecoengine"; version="1.11.0"; sha256="1d5x6hvqrqjj0wg07m4dbgb9ljdq73ibavzy2q5magnfn50a7rzm"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; };
   ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; };
+  ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; };
   ecoreg = derive2 { name="ecoreg"; version="0.2.1"; sha256="1v3n5nbabw6qmwcq3sx759k6c8q4pxbffl227rv0lnnfbq77zlmc"; depends=[]; };
-  ecoseries = derive2 { name="ecoseries"; version="0.1.3"; sha256="1m9yb15gdbif15nqxa81bgl6h0w8yl8425yv4vgc6p9yrsrpgymn"; depends=[magrittr RCurl readr rjson rvest tibble xml2]; };
+  ecoseries = derive2 { name="ecoseries"; version="0.1.4"; sha256="0bvh2p3fv0lr55w2b86qzg1plw99q50nk0myxyxg6jv2q5aw3pp0"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; };
   ecosim = derive2 { name="ecosim"; version="1.3"; sha256="00arz8j2az1nn4p96pshw0p9xxq2qfgkyrf4ahvl1hp1h3k68jfn"; depends=[deSolve stoichcalc]; };
   ecospace = derive2 { name="ecospace"; version="1.1.3"; sha256="01nxjbx638s8pk1ybsz9zbk35cg27x35fam419b9rjj9kspxz49s"; depends=[FD]; };
   ecospat = derive2 { name="ecospat"; version="2.1.1"; sha256="1b0bmqvspg2qxnr07lj2qlwp2i90q1bjym9rjc8jdzqbmaz9gxyr"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim PresenceAbsence randomForest raster rms sp spatstat vegan]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
   ecoval = derive2 { name="ecoval"; version="1.1"; sha256="0ihig6nq3lrz6lzix92lrlzywnqkzsp5lrbccn5slhxdj5llird2"; depends=[rivernet utility]; };
   ecp = derive2 { name="ecp"; version="3.0.0"; sha256="0v07ak7fbiph058rlbhmgx0f230mnpi39ib8vx9bdzhx5g5lrp0j"; depends=[Rcpp]; };
-  ecr = derive2 { name="ecr"; version="2.0.0"; sha256="0651fi9fwgxlzv9m1yx1i58sa1yvkfqxy7p8nmfr13my6hz3k8pr"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; };
+  ecr = derive2 { name="ecr"; version="2.1.0"; sha256="0vvkdxlcqaim9mkgwgdxrx1xhw3lshi1nxfw3kqllq14p3l6xss4"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; };
   edarf = derive2 { name="edarf"; version="1.1.1"; sha256="0f27hs7vn4v2jis3d66s48hr0ki8m8ndspcw1cwns5vjwb77iqwm"; depends=[data_table ggplot2 mmpf]; };
   edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
   edci = derive2 { name="edci"; version="1.1-2"; sha256="10rqkimvmyb7hxp4wkpj8bq07q3yaimm058d4mmr09fw25lqyz1q"; depends=[]; };
@@ -5239,6 +5389,7 @@ in with self; {
   edfReader = derive2 { name="edfReader"; version="1.1.2"; sha256="02cclg549z6samhkraaknsmqvk0yxxcf4s9qpbcxb2cl9fcj1cjr"; depends=[]; };
   edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; };
   edgar = derive2 { name="edgar"; version="1.0.9"; sha256="1jh0aaizirj4i4kc6gq9kkpa1xdqxbjhj7fys8ap1xxxx6nfpcnf"; depends=[ggplot2 R_utils RColorBrewer tm wordcloud XML]; };
+  edgarWebR = derive2 { name="edgarWebR"; version="0.1.1"; sha256="04q5bz43wpjw69pp2xm42jvy62qyajqvnzpf2nz1ic5zzdz6x04x"; depends=[xml2]; };
   edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; };
   edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; };
   edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; };
@@ -5262,7 +5413,7 @@ in with self; {
   efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; };
   ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; };
   egcm = derive2 { name="egcm"; version="1.0.8"; sha256="1mrbm0yzqw344fzgcbwc6bgdn8fv8id80jnfp3jaqjfslfhlpzx7"; depends=[fArma ggplot2 MASS tseries TTR urca xts zoo]; };
-  eggCounts = derive2 { name="eggCounts"; version="1.3"; sha256="1yak67k1c13rx6ghm78585k2rdsgg9ajr3zaihjk8widavb3m23g"; depends=[BH boot coda numbers Rcpp RcppEigen rstan StanHeaders testthat]; };
+  eggCounts = derive2 { name="eggCounts"; version="1.4"; sha256="04rhyfckkg3q6n6izbmhh1m6ywywvrr719isnx8qghlx774qab86"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rstan StanHeaders testthat]; };
   egonet = derive2 { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
   eha = derive2 { name="eha"; version="2.4-5"; sha256="0c1fqvnijsaqsa4c4ss7c6lb9mr5p49bg2y4gmpc0wwyjm8xj0lx"; depends=[survival]; };
   ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; };
@@ -5281,22 +5432,23 @@ in with self; {
   elec = derive2 { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
   elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
   electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; };
-  elementR = derive2 { name="elementR"; version="1.3.1"; sha256="0cpff04inl9jxsr1nwfsl9lidsaz3gb090hf18aab2x0x6bjr18c"; depends=[abind climtrends colourpicker devtools EnvStats gdata gnumeric lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
+  elementR = derive2 { name="elementR"; version="1.3.2"; sha256="1pzgxfdwzvp58ba5h4jp4rgs6bmj7x24z3brd3vj5aldf9z0v68h"; depends=[abind climtrends colourpicker devtools EnvStats gdata gnumeric lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
   elevatr = derive2 { name="elevatr"; version="0.1.3"; sha256="1fs34gaak0sdxpvbgszrwd833nd03p19m6fawaard1waylxsgscg"; depends=[httr jsonlite prettyunits progress raster ratelimitr rgdal sp]; };
   elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; };
-  elhmc = derive2 { name="elhmc"; version="1.0.0"; sha256="0xjl43xa0qw0hwdx73vv8cl1gyd5srdhpcpkap3wbnka4c75wpgj"; depends=[emplik plyr]; };
+  elhmc = derive2 { name="elhmc"; version="1.1.0"; sha256="0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5"; depends=[emplik MASS plyr]; };
   elliplot = derive2 { name="elliplot"; version="1.1.1"; sha256="1sl85kyjpxiw0gs3syhlhfrci03fl054py7m24xln5vk07665vbp"; depends=[]; };
   ellipse = derive2 { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpxb8hgip69z3wcimk3az1701rg2i64g3ah"; depends=[]; };
   elliptic = derive2 { name="elliptic"; version="1.3-7"; sha256="1bzd5x0yph76jh59ljl875grm52s8xpnmbgww1jjxx0hgkv7938g"; depends=[MASS]; };
   elmNN = derive2 { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; };
+  elo = derive2 { name="elo"; version="0.1.2"; sha256="00yrwzkgvxc7m5pnimr51b4h9vdw1cj17m6al14b3zs0yvf4a8v6"; depends=[Rcpp]; };
   elrm = derive2 { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
   emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; };
   embryogrowth = derive2 { name="embryogrowth"; version="6.5"; sha256="1gbmrcjm8zwm01xq62wrkibmqnig904bnzrpar4d4qb98b6b3gp6"; depends=[deSolve HelpersMG numDeriv optimx]; };
   emdbook = derive2 { name="emdbook"; version="1.3.9"; sha256="09xbdyw8a4pvrsg3ryr8drby0njy4avc5wsjj4ffibdaicpchy69"; depends=[bbmle coda lattice MASS plyr]; };
-  emdi = derive2 { name="emdi"; version="1.1.0"; sha256="0830lmmdr529x461z15v88b69q59c2dp1c7wl55mygsn5scydj7k"; depends=[boot FNN ggmap ggplot2 gridExtra HLMdiag Hmisc maptools MASS moments MuMIn nlme openxlsx parallelMap reshape2 rgeos simFrame]; };
+  emdi = derive2 { name="emdi"; version="1.1.1"; sha256="1gbjx0pxfzkbp0csgq07iwqqww5lixpkvwn3k53na65gwx9afsq4"; depends=[boot FNN ggmap ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap reshape2 rgeos simFrame]; };
   emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
   emg = derive2 { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
-  emil = derive2 { name="emil"; version="2.2.6"; sha256="182grlb90nsqs17mi09srzlrflf3kzaj5swcgfdyalhlmsgrfrnd"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; };
+  emil = derive2 { name="emil"; version="2.2.8"; sha256="02xjf8ipqr136y3pa375lwpg6h63yvbphhghs9jjxfl2r4fdkvcn"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; };
   emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
   emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
   emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
@@ -5307,7 +5459,7 @@ in with self; {
   emplik = derive2 { name="emplik"; version="1.0-3"; sha256="0b52383m2djdcg9b1a7r10k5pkzljz6dalvbg2gg962ckvpndb11"; depends=[quantreg]; };
   emplik2 = derive2 { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
   ems = derive2 { name="ems"; version="0.3.1.6"; sha256="0swa1jxc52m695ankkn0kv9l012wh48ajy8n4yzssj4w8l4c4pyi"; depends=[]; };
-  emuR = derive2 { name="emuR"; version="0.2.2"; sha256="0g2448bx3p7brkzaj25wh96kv720ckbvqz6x6zc5vnsbg7rdl9il"; depends=[base64enc data_table DBI dplyr httpuv jsonlite MASS RCurl RSQLite stringr uuid wrassp]; };
+  emuR = derive2 { name="emuR"; version="0.2.3"; sha256="04nxrg95qgwc5ss139bgjcsxkarwzkxy132dz0vk3sq7sddnagws"; depends=[base64enc data_table DBI dplyr httpuv jsonlite MASS RCurl RSQLite stringr uuid wrassp]; };
   emulator = derive2 { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
   enRich = derive2 { name="enRich"; version="3.0"; sha256="1ni2hkw0pq0mjjqd11qqrc3lbzyif84ljh9zrn2yil1qk2882r1n"; depends=[]; };
   enaR = derive2 { name="enaR"; version="2.10.0"; sha256="09hzpmjbwg433b8ibrbvjzi8622cgfcq4rz194vq6qgknjr57z2j"; depends=[gdata MASS network sna stringr]; };
@@ -5326,14 +5478,14 @@ in with self; {
   enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
   enrichwith = derive2 { name="enrichwith"; version="0.0.4"; sha256="0fzj93zzs7a2qcwnw83iry6ybr3wnnnl4bpkpp6fczgmxrl0m0cw"; depends=[]; };
   ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.4"; sha256="14zq22h8nna7j403c1x9py90fwas8fg0vq3im2zh31dyrk1j8d7k"; depends=[chron]; };
-  ensembleMOS = derive2 { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[chron ensembleBMA]; };
+  ensembleMOS = derive2 { name="ensembleMOS"; version="0.8"; sha256="01pv3nhns9n5fwcngsgjj10657mfg27isxbnhfq36y4cv5igk4jk"; depends=[chron ensembleBMA evd]; };
   ensembleR = derive2 { name="ensembleR"; version="0.1.0"; sha256="0xvq1jlsp7gsk46i847nfvadxwlh09gi2rgwss2wf2xmh1855ray"; depends=[caret]; };
   ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
   entropart = derive2 { name="entropart"; version="1.4-7"; sha256="18h8jzan7q9wkz0awpzlypvz8xzq7ak0j21jy7nk02k64v7zkpch"; depends=[ade4 ape EntropyEstimation geiger vegan]; };
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
   envDocument = derive2 { name="envDocument"; version="2.3.0"; sha256="151ibmkq63r7lvh5lrszy7wsmrygvr2789lhcfp11nw3d39b4rqc"; depends=[]; };
   enveomics_R = derive2 { name="enveomics.R"; version="1.1.5"; sha256="0zb7bl92n2h3hhrs7slbqizkjk0rg47lmahmrg9sk0px7ncbjhmv"; depends=[fitdistrplus investr modeest sn]; };
-  enviGCMS = derive2 { name="enviGCMS"; version="0.1.1"; sha256="1wvanngizif7yx91f15v5mgs0dib01g440f4nvi0iid2hzx9ls4q"; depends=[mixtools rcdk xcms]; };
+  enviGCMS = derive2 { name="enviGCMS"; version="0.3.4"; sha256="1wjf1rxwzd590qsyljw1pd59kppx91m32p6nkdy4yvbnv39rk8dq"; depends=[BiocParallel genefilter limma mixtools qvalue rcdk RColorBrewer sva xcms]; };
   enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; };
   enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; };
   envirem = derive2 { name="envirem"; version="1.1"; sha256="07mlyaqjwwrh9dbc78ik61wrrpg344fg3rb12l6v6hzn04yp26pz"; depends=[raster RSAGA]; };
@@ -5342,13 +5494,13 @@ in with self; {
   epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; };
   epanetReader = derive2 { name="epanetReader"; version="0.5.1"; sha256="19w4cckdhc8qjvncymznd9jnwj16gklpp2fb96x4rf9qnmh8zdvq"; depends=[]; };
   epiDisplay = derive2 { name="epiDisplay"; version="3.2.2.0"; sha256="1f9kifjgdwxs7c236nsr369ij71rj7l5ady88h4n5p5pjw2h451a"; depends=[foreign MASS nnet survival]; };
-  epiR = derive2 { name="epiR"; version="0.9-82"; sha256="0qsi5m39hkh1m3sk341cbd8gafr0rxy688vgkcxdk4wxfxvh3yrf"; depends=[BiasedUrn survival]; };
+  epiR = derive2 { name="epiR"; version="0.9-87"; sha256="1cxcm3x1r8dfjs5kp73nzlx6a684w075mb98jnyd5a8apwrh181p"; depends=[BiasedUrn survival]; };
   epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
   epicontacts = derive2 { name="epicontacts"; version="1.0.1"; sha256="1q58ryyxffddrz6s3081hx0q6f6izwlvglbdswqq8ndx9ml693jy"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; };
   epidata = derive2 { name="epidata"; version="0.1.0"; sha256="1lp6hnjzga787abq94k8v48wlikpp5hj1xwmxc8nj1imyr4r8a4h"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; };
   epifit = derive2 { name="epifit"; version="0.1.2"; sha256="1i1ngb5kh03gyx1702fwav3dc3mqry1wjzc7ry36hdw0ngawid34"; depends=[MASS]; };
   epinet = derive2 { name="epinet"; version="2.1.7"; sha256="10mqc3xy24mjbk9np5mp41216hj6yc9jqxl3ybgysmd80y3qgf39"; depends=[network]; };
-  episensr = derive2 { name="episensr"; version="0.8.0"; sha256="0ryn3p7vg4dq976ncm48i1kx42sanmzyyslvq0wiqijkl0172x19"; depends=[boot ggplot2 gridExtra plyr reshape trapezoid triangle]; };
+  episensr = derive2 { name="episensr"; version="0.9.0"; sha256="1ldg4flzbia6mk1w88jwj5c2p1cx73izhx2j3nfj57rc1i1lzmih"; depends=[boot ggplot2 gridExtra plyr reshape trapezoid triangle]; };
   episheet = derive2 { name="episheet"; version="0.2.0"; sha256="15c4xbam9b60xkkgmbswj4raln49hk43pxp2l75a7j1wykgkif95"; depends=[dplyr ggplot2 magrittr tidyr]; };
   episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
   epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; };
@@ -5360,13 +5512,15 @@ in with self; {
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
   equSA = derive2 { name="equSA"; version="1.1.2"; sha256="13iva2iwliav3dd3cis0583d4z2ywwy7rnx73x7h0n0769rvnkg5"; depends=[huge igraph mvtnorm XMRF ZIM]; };
+  equaltestMI = derive2 { name="equaltestMI"; version="0.1.0"; sha256="1zqhgx1x6lqjwqisl3ydb6yqp3jn6x7dgnc57r93v73sjx2j5aiz"; depends=[lavaan]; };
   equate = derive2 { name="equate"; version="2.0.6"; sha256="0fkgz4747wf2n1sfkskpbp20zdmxvykqhncr7a8wl5lp314r48x3"; depends=[]; };
   equateIRT = derive2 { name="equateIRT"; version="2.0-3"; sha256="10n296hs2x20lpqhzwjs1fsfyrdyv1xnns5drdl4qpyp32a3ayq7"; depends=[mirt statmod]; };
   equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; };
   erah = derive2 { name="erah"; version="1.0.5"; sha256="00vygdrngbp53wip2x6dni3ygwax309i9si3gyqkxxbbkpv24b7i"; depends=[caTools HiClimR igraph ncdf4 nnls osd quantreg Rcpp signal XML]; };
   erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; };
+  ercv = derive2 { name="ercv"; version="1.0.0"; sha256="1h0v0gscf1ks1shkdvkn1g8r8x5jsb66a4m7rnpdfwbp2ijh41gp"; depends=[]; };
   erer = derive2 { name="erer"; version="2.5"; sha256="0wgzd7r63d20vghmbilqn1p5033i5p31asya1gzwlipgyfxmqp0b"; depends=[lmtest systemfit tseries urca]; };
-  ergm = derive2 { name="ergm"; version="3.7.1"; sha256="1hsl9fl1vzggarqk6sbfv3cjbbnxgfzblfmvhhmwngmracch3pci"; depends=[coda lpSolve MASS Matrix network robustbase statnet_common trust]; };
+  ergm = derive2 { name="ergm"; version="3.8.0"; sha256="1j4rqgxnwg4hcjg2knw3kvwad97035fxp9dqxx4pz6nlkmcib2js"; depends=[coda lpSolve MASS Matrix network robustbase statnet_common trust]; };
   ergm_count = derive2 { name="ergm.count"; version="3.2.2"; sha256="1zg07vm5y6n6r687sbdy5hcinsircm4zzkx5w4849s9kwjlnpn0b"; depends=[ergm network statnet_common]; };
   ergm_ego = derive2 { name="ergm.ego"; version="0.3.0"; sha256="1152g9zz2wach0hbj27knxficvhf062alqa0wpj6nyqj2vsgnchh"; depends=[coda ergm network RColorBrewer statnet_common]; };
   ergm_graphlets = derive2 { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[ergm network statnet_common]; };
@@ -5384,22 +5538,24 @@ in with self; {
   esc = derive2 { name="esc"; version="0.3.1"; sha256="0ihld8sklgr2waif3n8ca96x7z5zi1wi4ygf50x5n8h47p0hrj3v"; depends=[dplyr purrr readr sjmisc tibble]; };
   eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; };
   esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; };
+  esreg = derive2 { name="esreg"; version="0.3.1"; sha256="19ikfy0g8yd224ah4gyq2k29lz3gagc6vrcv53awvdadqw0cpz8l"; depends=[quantreg Rcpp RcppArmadillo]; };
   estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; };
   estimability = derive2 { name="estimability"; version="1.2"; sha256="13b80bpnbrarazjvnpnk91ljjsqgfm2fm3gy66aj09cmmsmv199h"; depends=[]; };
   estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
+  estprod = derive2 { name="estprod"; version="0.0.1"; sha256="0nd2iz1gqinvppyxgxsdh9m26v46h2ra3cc4nqz6dqnqkslzrl4k"; depends=[boot Formula lazyeval minpack_lm]; };
+  esvis = derive2 { name="esvis"; version="0.1.0"; sha256="19avayz2igw8sjc2743a9c3ikyrf18d42czadd98gdn8ny53vr6b"; depends=[sfsmisc]; };
   etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; };
   etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; };
-  etl = derive2 { name="etl"; version="0.3.5"; sha256="1qxzfcfpa50k6n70nii0qh6lr4rsbc3f2vhp6hj720pc8yg3r0mb"; depends=[DBI downloader dplyr lubridate readr stringr]; };
+  etl = derive2 { name="etl"; version="0.3.6"; sha256="1kgbds0whnn80lh9bgai3r2rlxn6rq8fbm63jk2y3yvm582yas2n"; depends=[DBI downloader dplyr lubridate readr stringr]; };
   etm = derive2 { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[lattice survival]; };
   etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; };
   etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; };
   etseed = derive2 { name="etseed"; version="0.1.0"; sha256="1kqbhvryqzmckk91ynn68yd7msqdsl6h818r164180f10flszr37"; depends=[httr jsonlite R6]; };
   eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; };
   eulerr = derive2 { name="eulerr"; version="2.0.0"; sha256="16hnplwpv38zk22y1d503hcdq406ry6x11kq4i9dsrlvw9l64j80"; depends=[assertthat lattice Rcpp RcppArmadillo]; };
-  euroMix = derive2 { name="euroMix"; version="1.1.1"; sha256="13ia6j0iwxhcfv17b5dsq1pk7v1kxaq6njxilxq0hvd57hv0b2a8"; depends=[Familias forensim paramlink]; };
   europepmc = derive2 { name="europepmc"; version="0.1.4"; sha256="0kh61jmr2y0wjqch0jzk594anpwq56x9lhx6sx54y2pqjqw68b0i"; depends=[dplyr httr jsonlite plyr urltools xml2]; };
   europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; };
-  eurostat = derive2 { name="eurostat"; version="3.1.1"; sha256="0k896b6q8cd9yh25czf7nswlzhrswl63qrybw27r4acp9kg91n2k"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; };
+  eurostat = derive2 { name="eurostat"; version="3.1.5"; sha256="128rlkkxdpl95wjxnrw8yzxpc6sml0vaghnaz0ra90ak1s43ndda"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; };
   eva = derive2 { name="eva"; version="0.2.4"; sha256="03jsiz6bkavwxpgllxaw8czahmm2rh5h8hhk5j7i9clcjx244vvj"; depends=[EnvStats Matrix]; };
   evaluate = derive2 { name="evaluate"; version="0.10.1"; sha256="070vvmnbdlp7sz2zhza7fhd2a6mlwiln8fn4hyzhsiizbn4n79y9"; depends=[stringr]; };
   evaluator = derive2 { name="evaluator"; version="0.1.0"; sha256="00811idj3vx7x627dyw0i8qlbkscrdkxknwph4d4j8m49flh9j36"; depends=[dplyr extrafont ggalt ggplot2 magrittr mc2d pander psych purrr readr readxl scales stringi tibble tidyr viridis]; };
@@ -5421,15 +5577,15 @@ in with self; {
   evoper = derive2 { name="evoper"; version="0.4.0"; sha256="11l55jj7f4ggwvimvl3d2sv2nyds29bl4dai6ycpgnff7wwdv43g"; depends=[boot deSolve futile_logger ggplot2 plot3D plyr reshape rrepast]; };
   evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
   evtree = derive2 { name="evtree"; version="1.0-5"; sha256="06afqr0gsyh80f2j56vl4cbjsz5gpywri87ykfmf1wxls7jqxqac"; depends=[partykit]; };
-  exCon = derive2 { name="exCon"; version="0.2.1"; sha256="0rblghg29azzbf8wq7wsypf9jprcy9a2063fhwn0lpxqqgbyzw8v"; depends=[jsonlite]; };
+  exCon = derive2 { name="exCon"; version="0.2.5"; sha256="0gqnv01dw4ncf3x3p74pc6f14a1ixq7icl2p18hsmvxdqqg7kgy7"; depends=[jsonlite]; };
   exact2x2 = derive2 { name="exact2x2"; version="1.5.2"; sha256="12m3kaxdrf4bsw7lrylk15nimhy4sgmjbnlqm684y2kyvii9yrg0"; depends=[exactci ssanv]; };
   exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
   exactRankTests = derive2 { name="exactRankTests"; version="0.8-29"; sha256="0sj4bf0sab2rsgh967i5jl7ml2l1niydqmyn7c6ybai1gavsdpi1"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-1"; sha256="1mhigk1nzd24qhzgd1j96zlf38dr96c1y5jbmy6lz2sw7g4mmvgm"; depends=[ssanv]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
-  exampletestr = derive2 { name="exampletestr"; version="0.4.0"; sha256="1ywr9v7h1ghpkm51p06rlr88ihpaqj0d6j57aj95x808ykhlkkp5"; depends=[BBmisc devtools filesstrings formatR magrittr purrr roxygen2 stringr]; };
+  exampletestr = derive2 { name="exampletestr"; version="1.0.1"; sha256="0352rv81isk820srwfpz7bf3349fpbygbq06lmjz8qgjvdfl1r4i"; depends=[devtools filesstrings formatR magrittr purrr roxygen2 stringr]; };
   exams = derive2 { name="exams"; version="2.2-1"; sha256="0dz1ijdfikmxyrz33mz8qkf5kn9796c078ndqk5gfyyxl2jsj6jw"; depends=[]; };
-  excerptr = derive2 { name="excerptr"; version="1.3.0"; sha256="0znp2i1gnzcnk20bk88384fwzm3xa04pmkxnrg7g0kvslbb7ndjw"; depends=[git2r rprojroot rPython]; };
+  excerptr = derive2 { name="excerptr"; version="1.3.1"; sha256="0z1qgivk4plfap9j1fllx6wdj6z4nyblgj0rqjvgalk1sjk9b5zl"; depends=[git2r rprojroot rPython]; };
   excursions = derive2 { name="excursions"; version="2.2.2"; sha256="1f6vvv33205lj6hsmmhx3q82mkhh0shzyk5hrwzf2nh1cn61w1x0"; depends=[Matrix sp]; };
   exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; };
   exifr = derive2 { name="exifr"; version="0.1.1"; sha256="0cxi8rcig03qwahdilawg4j3i9a8sv8sxgy0a68pxxmg556dwk0j"; depends=[foreach plyr]; };
@@ -5448,7 +5604,7 @@ in with self; {
   expp = derive2 { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[deldir rgeos sp spdep]; };
   exprso = derive2 { name="exprso"; version="0.1.8"; sha256="1k3is8f4yfzzkcak9fmm2nk8vi85b0na5r96f3yjbc9qb0av9vb8"; depends=[affy Biobase cluster e1071 kernlab lattice MASS mRMRe nnet pathClass plyr randomForest ROCR sampling]; };
   expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; };
-  expss = derive2 { name="expss"; version="0.7.1"; sha256="02033gqm2hsdjil8qf0458a4xg19bsp7pk06p3i92chdz4z534q8"; depends=[data_table DT foreign htmlTable htmltools magrittr matrixStats]; };
+  expss = derive2 { name="expss"; version="0.8.1"; sha256="12w5pg51j6hv48is9n4jpdfxrl3af0wf84fkql0mgaqdd8i4wy50"; depends=[data_table DT foreign htmlTable htmltools magrittr matrixStats]; };
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; };
   exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
@@ -5484,7 +5640,9 @@ in with self; {
   fBasics = derive2 { name="fBasics"; version="3011.87"; sha256="1x4jv4db0nr2fig6hglk0kv6j27ngkc8qzclgiklbl8wjfrrp9zh"; depends=[gss MASS stabledist timeDate timeSeries]; };
   fBonds = derive2 { name="fBonds"; version="3010.77"; sha256="00rc3i0iyqcpsqvc036csa1c8gxwcnniwj3l2irmcalx4p8650w0"; depends=[fBasics timeDate timeSeries]; };
   fCertificates = derive2 { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fExoticOptions fOptions]; };
+  fChange = derive2 { name="fChange"; version="0.1.0"; sha256="1pj4q9dsqqgv198kfv410qkpgynhd580bcsigmak598m5jx3rf7l"; depends=[fda lattice reshape2 sandwich sde]; };
   fCopulae = derive2 { name="fCopulae"; version="3011.81"; sha256="0r4g567icgiiz6cxi6ak3kzrav9qzsc6zvww5dj1pd8mkd4r1f0y"; depends=[fBasics fMultivar timeDate timeSeries]; };
+  fDMA = derive2 { name="fDMA"; version="1.1"; sha256="16ff6v8b71wxk5f35s9m1cybl22ck98kgl8gl3czkyxshbhnxlyw"; depends=[doParallel foreach forecast gplots iterators MSwM png xts zoo]; };
   fExoticOptions = derive2 { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[fBasics fOptions timeDate timeSeries]; };
   fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[fCertificates Matrix mvtnorm tmvtnorm]; };
   fExtremes = derive2 { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[fBasics fGarch fTrading timeDate timeSeries]; };
@@ -5500,8 +5658,9 @@ in with self; {
   fTrading = derive2 { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[fBasics timeDate timeSeries]; };
   fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; };
   face = derive2 { name="face"; version="0.1-3"; sha256="0l4sp79p72n6iqbgi5aqif1669rwx3pka7l91d8dsw7x60bhikxj"; depends=[Matrix matrixcalc mgcv]; };
-  factoextra = derive2 { name="factoextra"; version="1.0.4"; sha256="1lzf99184sbc9x3skp8hp8cjlj0w8mvm4vnwj03smfgm9sh01874"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; };
-  factorMerger = derive2 { name="factorMerger"; version="0.3"; sha256="1cnghkf091b8an1yz34a18i32aqzh2phi6ni0rffvgf1m31c67ff"; depends=[agricolae colorRamps dplyr forcats ggplot2 ggpubr ggrepel gridExtra Hotelling knitr magrittr MASS mvtnorm proxy reshape2 scales survival survminer vegan]; };
+  facebook_S4 = derive2 { name="facebook.S4"; version="1.1.0"; sha256="1if3fgyvj6pbf48yjwa5fkn3s4rl6kj9s1nk6dwphykhx72ghzrj"; depends=[httr magrittr plyr rjson]; };
+  factoextra = derive2 { name="factoextra"; version="1.0.5"; sha256="1l6m8k7qhdw8ndar8nhmym0lfyd1i2iszl1cicjax0vq23ss6xw1"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; };
+  factorMerger = derive2 { name="factorMerger"; version="0.3.1"; sha256="0fipm9b7xynzljbrhgv8qh47ik13y937jry0zms3rpmmxw8a16dy"; depends=[agricolae colorRamps dplyr forcats ggplot2 gridExtra knitr magrittr MASS mvtnorm proxy reshape2 scales survival survminer]; };
   factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
   factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; };
   factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; };
@@ -5518,28 +5677,27 @@ in with self; {
   fancycut = derive2 { name="fancycut"; version="0.1.1"; sha256="1vnxn5zl1j8209dyrwq3919hivab09f0jq4v9h7v0wlqk1hy5ich"; depends=[]; };
   fanovaGraph = derive2 { name="fanovaGraph"; version="1.4.8"; sha256="1da7yskh2gn4arrrnalkl3izqyyrm0yf0il4v2izs7di7qlw3m6v"; depends=[DiceKriging igraph sensitivity]; };
   fanplot = derive2 { name="fanplot"; version="3.4.1"; sha256="1xj1hdz3i9c9wdx7ryiqag69khh3544v4474ilxxiyahxg2r6m45"; depends=[]; };
-  faoutlier = derive2 { name="faoutlier"; version="0.7.1"; sha256="01525b5s8jdfj796pk0yrcb3zfr0ag1x5912jp3pyfy5jj080ajs"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; };
+  faoutlier = derive2 { name="faoutlier"; version="0.7.2"; sha256="0h2azbkxpz03qjmq558mh7dkpv87vbvminvg69wqsx21m6hdl5r3"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; };
   far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; };
   faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; };
   farff = derive2 { name="farff"; version="1.0"; sha256="1w3mi0vsw7mpqznaf3rnzf7va7ax07n5rrpm2hnjh0q25lsv55hk"; depends=[BBmisc checkmate readr stringi]; };
   farsi = derive2 { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
-  fasjem = derive2 { name="fasjem"; version="1.1.0"; sha256="0m3iblc88vqqc8hnlw9kmbkfrraq7l3ymhv6zfjhllysqg7fjizb"; depends=[igraph]; };
+  fasjem = derive2 { name="fasjem"; version="1.1.2"; sha256="1bbrcyyg96hakgla3604byrkn9034197vy2is048kdq20yr2y11n"; depends=[igraph]; };
   fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; };
   fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; };
   fastDummies = derive2 { name="fastDummies"; version="0.1.1"; sha256="0h2xqhsiwm0palkdckkh3k38yw3sf775w3vzysz9msrgf1nnasxl"; depends=[data_table]; };
   fastGHQuad = derive2 { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; };
   fastGraph = derive2 { name="fastGraph"; version="1.1"; sha256="1vbi5yssnh8hcbmrq1r437vpvj8hqd3vc8wmcy0nbyvnmyjaxkvb"; depends=[]; };
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
-  fastHorseshoe = derive2 { name="fastHorseshoe"; version="0.1.0"; sha256="1f9glz7zcarn4jdr6ssy41d2g6b6cqcry9mqchcq6zx576qn2irs"; depends=[lars Rcpp RcppArmadillo]; };
   fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; };
-  fastJT = derive2 { name="fastJT"; version="1.0.3"; sha256="0v7clj6wv3gzrcq64wkyxx0kppv26m085gwj8ca4aj5n1k23nnzh"; depends=[Rcpp]; };
-  fastLSU = derive2 { name="fastLSU"; version="0.1.0"; sha256="0clsd4kphlw62n7skqd0ralz3ymgxyvzn8bn06ljiwjqalzyhzhz"; depends=[]; };
+  fastJT = derive2 { name="fastJT"; version="1.0.4"; sha256="1pa4qpcf4qmzk6s8qgk60n5ialz8gcj5m8d7xr10cmn4jfwghc7b"; depends=[Rcpp]; };
+  fastLink = derive2 { name="fastLink"; version="0.1.1"; sha256="0m81ad6j0s328jf531dfglppfq5xqs1kvkzfar0az8l6xnr9i6sx"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix Rcpp RcppArmadillo RcppEigen stringdist stringr]; };
   fastM = derive2 { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp RcppArmadillo]; };
-  fastR = derive2 { name="fastR"; version="0.10.2"; sha256="0xh3pfcln8xp42zvq3kv03xf9kc5gqafnhdnq6r4rx7xhl9n5dw0"; depends=[lattice mosaic mosaicData]; };
+  fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; };
   fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; };
   fastTextR = derive2 { name="fastTextR"; version="1.0"; sha256="0l0f9jvsa68a3vd6mwbhsqd12729nd6nwsnlzrhsg9wj9rx8kpmi"; depends=[Rcpp]; };
   fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; };
-  fastcluster = derive2 { name="fastcluster"; version="1.1.22"; sha256="006k9isra5biyavqwci61avladw19mhp6kmkjj3777rl1r4r8b9z"; depends=[]; };
+  fastcluster = derive2 { name="fastcluster"; version="1.1.24"; sha256="15drhl22wm8whsy6b3vv754skfddiydb068zn1whrw5sknvkkjc2"; depends=[]; };
   fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; };
   fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; };
   fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; };
@@ -5558,9 +5716,10 @@ in with self; {
   fbroc = derive2 { name="fbroc"; version="0.4.0"; sha256="0bxi027iqqn50mn5nrlgx3z4qdlfkrq88s0dqyaxdl8rsrwp3d2w"; depends=[ggplot2 Rcpp]; };
   fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
   fclust = derive2 { name="fclust"; version="1.1.2"; sha256="08gi7w74215r44qbysg233s5n8r905b66gsi4i66xf5r7zgaqsm0"; depends=[]; };
-  fcm = derive2 { name="fcm"; version="0.1.1"; sha256="1amxyn19f99ir05h0pbxa2k53zvig1vzzqwfs391bv73fmwxhzgv"; depends=[ggplot2 reshape2]; };
+  fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; };
   fcros = derive2 { name="fcros"; version="1.5.4"; sha256="112mgs69p3642rfk1w3dkkyn72icvda0asllanmgjym1lrzdp0lj"; depends=[]; };
-  fda = derive2 { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; };
+  fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; };
+  fda = derive2 { name="fda"; version="2.4.7"; sha256="0371c32kxxvfdh18ldgc2p76dr2436ay0n9prdjwm9v0azp4rp9k"; depends=[Matrix]; };
   fda_usc = derive2 { name="fda.usc"; version="1.3.0"; sha256="1ask7g6mqwx8r1hd9vxzdl96z0gyqprswjpfcl7l5l3611m7mzdm"; depends=[fda MASS mgcv nlme rpart]; };
   fdaMixed = derive2 { name="fdaMixed"; version="0.5"; sha256="1k2b3z2jj37j6njvxalg8640zlcvi1cm7wkcwp0pia21wydz75ip"; depends=[Formula Rcpp RcppArmadillo]; };
   fdaPDE = derive2 { name="fdaPDE"; version="0.1-4"; sha256="0n72x5h00n17yxjniim2qxz2phy1srk04dn6ivvc58k3x252fzkh"; depends=[RcppEigen rgl]; };
@@ -5583,6 +5742,8 @@ in with self; {
   fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; };
   federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; };
   feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; };
+  fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; };
+  fergm = derive2 { name="fergm"; version="0.2.0"; sha256="0mgrbhskxgzkrqg8z31zv2821iwimmwimkg6f9bzg7ib8yn4hfli"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan scales statnet stringr]; };
   fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; };
   fetchR = derive2 { name="fetchR"; version="2.1-0"; sha256="1rrmky1wg2wz4m8nmvdxwbs4yxnwgdchddvh1dhp171364as3536"; depends=[plotKML rgdal rgeos sp]; };
   ff = derive2 { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; };
@@ -5596,7 +5757,7 @@ in with self; {
   fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; };
   fgui = derive2 { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; };
   fields = derive2 { name="fields"; version="9.0"; sha256="0fjk1gcgmmra38f574smv2grk3vkd81gldic85liaws1nqvb0z4w"; depends=[maps spam]; };
-  fiery = derive2 { name="fiery"; version="0.2.3"; sha256="19g1r2p6dxzz7baqmhl8xpg5kwymrrxgpmpmih0v6073gxxy3310"; depends=[assertthat future httpuv R6 stringi uuid]; };
+  fiery = derive2 { name="fiery"; version="1.0.0"; sha256="1hhh9wbhhzjns24khfdvryg0npabq702j65x1z75pl2jyfcyj7hb"; depends=[assertthat desc future httpuv later R6 reqres stringi uuid]; };
   fifer = derive2 { name="fifer"; version="1.1"; sha256="1gcv8ns4c1y3pjmixdm16raa5h6jqmc3i4m37ahj97l720j1f2ya"; depends=[fields Hmisc MASS party plotrix randomForest randomForestSRC rpart xtable]; };
   fiftystater = derive2 { name="fiftystater"; version="1.0.1"; sha256="1nri9vsqif03xrmm3g5llasqm49hj169mgv046f2l0mh9vp0fqpc"; depends=[]; };
   filehash = derive2 { name="filehash"; version="2.4-1"; sha256="1x7an7rsy5pz2qr86m511rsv297vacxwk3y1a71754yq739qgq6h"; depends=[]; };
@@ -5605,7 +5766,7 @@ in with self; {
   filenamer = derive2 { name="filenamer"; version="0.2.1"; sha256="0xahzjgwfpyln6i2szr985csw11w8wwk644sgclwly9l2yqzsi3i"; depends=[]; };
   fileplyr = derive2 { name="fileplyr"; version="0.2.0"; sha256="15rxls0njd6j2vxdahf4fx2nxmsa3rc41812v3wlaqas99naaxxr"; depends=[assertthat datadr tibble]; };
   files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; };
-  filesstrings = derive2 { name="filesstrings"; version="1.0.0"; sha256="0ga2gp0azcpdfws4cnwsnxsclc8i6c19a9hyygniv4ck8v23b8mm"; depends=[magrittr matrixStats ore Rcpp readr stringr tibble]; };
+  filesstrings = derive2 { name="filesstrings"; version="1.1.0"; sha256="0nyrmc3lhr4dx5ga90mra3jchi6i64vvm68m503lxiiix9s8ii9s"; depends=[magrittr matrixStats ore Rcpp readr stringr tibble]; };
   financial = derive2 { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; };
   finch = derive2 { name="finch"; version="0.1.0"; sha256="0pqli6l049s9pdk0gphch1pw8i0f1fr3562akms1x7hvdkn9c0i9"; depends=[data_table digest EML plyr rappdirs xml2]; };
   findpython = derive2 { name="findpython"; version="1.0.2"; sha256="1x38dbxr6yvxy2z2fvv00y263g66ljbzf3a8znl2fywj462i92xk"; depends=[]; };
@@ -5617,7 +5778,7 @@ in with self; {
   fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; };
   fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
   fishkirkko2015 = derive2 { name="fishkirkko2015"; version="1.0.0"; sha256="1s8vsf604rc6qk0gahn61p3q8p9dhsbq14wsmrin7icq2xgl3y81"; depends=[]; };
-  fishmethods = derive2 { name="fishmethods"; version="1.10-2"; sha256="0ik2l8441f2gpli4dbkwf7389b6awz7kalsziv9300fq5yljgg1r"; depends=[boot bootstrap lme4 MASS]; };
+  fishmethods = derive2 { name="fishmethods"; version="1.10-3"; sha256="0hildpbgzqghbl3b5w8ghn7j40dw6wldslind8cgskbafyfxy7d6"; depends=[boot bootstrap lme4 MASS numDeriv]; };
   fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; };
   fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; };
   fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; };
@@ -5627,8 +5788,8 @@ in with self; {
   fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; };
   fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-9"; sha256="18x9454g598d54763k3hvi33iszifk7sxvhd1zg5r8z1vpixx3z6"; depends=[MASS survival]; };
   fitplc = derive2 { name="fitplc"; version="1.1-7"; sha256="1dffgqsml6cj6ayqdpr0330kj8v57jwi3pgchb8v98rainygsyfw"; depends=[car nlme]; };
-  fitur = derive2 { name="fitur"; version="0.3.0"; sha256="0k39bh715563v47v2p2kqxqwxn7qsd8an71gjfzsn0az7jv1h4d1"; depends=[actuar fitdistrplus]; };
-  fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.2.0"; sha256="0w8m9g2y6282xlnais922n0jymv4zsh21z5lgqk8dzh1gpw3wbi2"; depends=[]; };
+  fitur = derive2 { name="fitur"; version="0.4.0"; sha256="0ak6hcfi3q6i78xjqdy02rq4c8zy27gq8a3k7jw174l93rgmphrp"; depends=[actuar e1071 fitdistrplus]; };
+  fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.3.0"; sha256="0m70yxfp1aspf4g4v21pwhkapnzxjx8cg06w37z0i69gl4lmyq9j"; depends=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
   flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; };
@@ -5644,7 +5805,7 @@ in with self; {
   flexmix = derive2 { name="flexmix"; version="2.3-14"; sha256="0sl4zxh1sb2sr5q7svjw9ihrm219jzn82yrc9d43q6r1b8bpyz43"; depends=[lattice modeltools nnet]; };
   flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; };
   flexsurv = derive2 { name="flexsurv"; version="1.1"; sha256="1vj8zsfgq2rv6v7na4w7n7z3farc69qsavm7pnmnhkaylz61gq26"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival]; };
-  flexsurvcure = derive2 { name="flexsurvcure"; version="0.0.1"; sha256="1zryxawknf15d113c46k2068wddj4v3wa0n8apvjgk5ikhbg9d2v"; depends=[flexsurv gtools survival]; };
+  flexsurvcure = derive2 { name="flexsurvcure"; version="0.0.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; };
   flextable = derive2 { name="flextable"; version="0.2.0"; sha256="0541vawawdvxym5prya2nahsr2v6wyxqq2n4b3rm39wvz5c0gp4y"; depends=[dplyr gdtools htmltools htmlwidgets lazyeval magrittr officer purrr R6 stringr tibble tidyr]; };
   flifo = derive2 { name="flifo"; version="0.1.4"; sha256="1yilfnblarimc8mlvvwsgib5sxcfgvgsvgpyzddxb39g6fb7lffs"; depends=[bazar pryr]; };
   flip = derive2 { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[cherry e1071 Rcpp RcppArmadillo someMTP]; };
@@ -5669,7 +5830,7 @@ in with self; {
   foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
   focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; };
   foghorn = derive2 { name="foghorn"; version="0.4.4"; sha256="19cabq0ffc03x2p9jjsnfh1bpkdlqa8lnf7qr6cvd3sczj4n1pdl"; depends=[clisymbols crayon curl dplyr httr lazyeval magrittr rvest tibble tidyr xml2]; };
-  fold = derive2 { name="fold"; version="0.1.2"; sha256="132179lsjcsbx1xcz161ajphm1j1wmvj18xasp2biiwbjpj43hyv"; depends=[csv dplyr encode lazyeval tidyr]; };
+  fold = derive2 { name="fold"; version="0.2.2"; sha256="1zc9zzaf878khhldl5h7gg285y5izq408vaxxssygmr696w7xv21"; depends=[csv dplyr encode lazyeval rlang spec tidyr]; };
   fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; };
   fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; };
   fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; };
@@ -5682,7 +5843,7 @@ in with self; {
   foreach = derive2 { name="foreach"; version="1.4.3"; sha256="10aqsd3rxz03s1qdb6gsb1cj89mj4vmh491zfpin4skj1xvkzw0y"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
   forecast = derive2 { name="forecast"; version="8.1"; sha256="1f49rxrls2721p9jb6krq6d4qnhdjm4z76kwr1k45sgh2km27s61"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
-  forecastHybrid = derive2 { name="forecastHybrid"; version="0.4.1"; sha256="1mavwk6jk70im9zl9lv3i02w5k5mijgyq7nn333xfynb9z6iqh3v"; depends=[forecast ggplot2 reshape2 zoo]; };
+  forecastHybrid = derive2 { name="forecastHybrid"; version="1.1.9"; sha256="03wkfzlg8pcpalakq5cgmhcy9p7ds4x0hqnhsiaja4zghrqbj5b6"; depends=[doParallel foreach forecast ggplot2 reshape2 zoo]; };
   forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; };
   forega = derive2 { name="forega"; version="1.0"; sha256="0xf9almfikfkxq8mm09lzrvav2v5cg0avpz99i6h5i9qliix1q6r"; depends=[forecast Rcpp robfilter]; };
   foreign = derive2 { name="foreign"; version="0.8-69"; sha256="0s1lxmd85dd0kxx8hwk02w9l7pmpk4bpy7787fbyh2dbq5g9ys0k"; depends=[]; };
@@ -5697,6 +5858,7 @@ in with self; {
   formula_tools = derive2 { name="formula.tools"; version="1.6.1"; sha256="14n89fljl5x24fka2jab41hwqmjq3a2yl02n58n1li20wrl3zagj"; depends=[operator_tools]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
   forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
+  forwards = derive2 { name="forwards"; version="0.1.0"; sha256="0pb101gdf2a4plalhhm34aixkss3lzfg8yj6yfi0d6khjmaza33i"; depends=[]; };
   fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
   fourPNO = derive2 { name="fourPNO"; version="1.0.4"; sha256="08l359fj39sdbq48qk05805kv25rw1wq93db0b7rvsi3iyi2lngk"; depends=[Rcpp RcppArmadillo]; };
   fourierin = derive2 { name="fourierin"; version="0.2.2"; sha256="0hy033bzybdc214z10wnbqph5f83fsr13admnzwb1d2drpbljnc8"; depends=[Rcpp RcppArmadillo]; };
@@ -5715,11 +5877,11 @@ in with self; {
   fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; };
   fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; };
   fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; };
-  fragilityindex = derive2 { name="fragilityindex"; version="0.0.8"; sha256="07d7rx2iymp3w1rmzd9n2r8ydjldxxfpp8a56pw6srlnjj4xi80a"; depends=[pbapply stringr survival]; };
+  fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; };
   frailtyEM = derive2 { name="frailtyEM"; version="0.7.0-1"; sha256="1h8ygph0b7w623wf0r7zvq70lk6z2y96j608hxxiqslpnssicx9h"; depends=[expint ggplot2 magrittr msm Rcpp survival]; };
   frailtyHL = derive2 { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; };
   frailtySurv = derive2 { name="frailtySurv"; version="1.3.2"; sha256="0qsq96p29rxlfkhbmg8cfqdnpzh8wq2nadpiim9d6l0bs20r51gl"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
-  frailtypack = derive2 { name="frailtypack"; version="2.12.1"; sha256="1ly2951rmvi3im9pjvd25hrxz1q3iiq5w2y4wyvlcmzb0fszyh31"; depends=[boot MASS nlme statmod survC1 survival]; };
+  frailtypack = derive2 { name="frailtypack"; version="2.12.3"; sha256="195j0k2wddlfdcxd3jwalkrgpmang3m94s2c9crgdjr3bv46wphx"; depends=[boot MASS nlme statmod survC1 survival]; };
   frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; };
   franc = derive2 { name="franc"; version="1.1.1"; sha256="0agrzdrgfw4a3jn6a2867rf99a87ngv6wi73ys2l7gr7mkpq54v5"; depends=[jsonlite]; };
   frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; };
@@ -5759,23 +5921,25 @@ in with self; {
   funData = derive2 { name="funData"; version="1.1"; sha256="0qr3rwa4z6173px9wqb17wcdfsnjgfqvfwwpzi8sldgmvq3l7dfg"; depends=[abind fields foreach]; };
   funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
   funHDDC = derive2 { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; };
-  funModeling = derive2 { name="funModeling"; version="1.6.4"; sha256="15xfgz4200w54phbrv79n9df9p7l0m60xv1zfqb08kx5jfd996dc"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; };
+  funModeling = derive2 { name="funModeling"; version="1.6.5"; sha256="0vmkfn2nv6iynadmlv37wxcyazfknjxzk485hl12a7d9rj2nhqfd"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; };
   funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; };
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
   functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; };
   funcy = derive2 { name="funcy"; version="0.8.6"; sha256="0wlcwwmv92djj35i7nnfns5l79fca6hsfrjxgsqmwgjb28gy19bs"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
   fungible = derive2 { name="fungible"; version="1.5"; sha256="1f4q26rfl7d35ng5nx11mzzv9fhk4zg62j63c59i649wcx1xsan9"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; };
   funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
-  funrar = derive2 { name="funrar"; version="1.1.1"; sha256="03226824ax6p9dfzrb512q340cagsxmqia974dba575gf8b19x9a"; depends=[cluster dplyr]; };
+  funrar = derive2 { name="funrar"; version="1.2.0"; sha256="0dsp3aldvnc7lkp6sl89p0i7yga7wvjvl77zkjgjhxwpr8a2ry22"; depends=[cluster dplyr]; };
   funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; };
   funtimes = derive2 { name="funtimes"; version="4.0"; sha256="0a0xpybalk38p3n0fd5f3g4yav99j6ck03d1pkx0w2yqqxnviqhw"; depends=[dbscan Jmisc Kendall]; };
-  furniture = derive2 { name="furniture"; version="1.5.0"; sha256="1x0r22hblqlbialpp9vr41ngyrcffqy86d79vhazk3lcdks5hh1s"; depends=[knitr]; };
+  furniture = derive2 { name="furniture"; version="1.5.4"; sha256="1lmxrmlkxn7l42mgl7ln9cvlmvwlmyim9k5ldnrb9wjrsh64bfhc"; depends=[knitr]; };
+  fuser = derive2 { name="fuser"; version="1.0.0"; sha256="0l2ddc3lal3gvzkn8b09i7pzd9nvqnr45naz3ni52nmgygwdk5ma"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; };
   futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
   futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; };
   futile_matrix = derive2 { name="futile.matrix"; version="1.2.6"; sha256="10v7ffjm8az75lb39526p3y8b1zhmmzx07pybiy20zydznhyvv2p"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
   futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
   futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
-  future = derive2 { name="future"; version="1.5.0"; sha256="1c47dn6zvhls2mqhfpg3554bjnm8kjj1c23dnd00kipkqa59i2kb"; depends=[digest globals listenv]; };
+  futility = derive2 { name="futility"; version="0.1"; sha256="0nbsdk4abjshjvd4nrcx0ai88h2i8lf3ml1prz83zsvivb8dnam0"; depends=[]; };
+  future = derive2 { name="future"; version="1.6.0"; sha256="030bp0s511m65ncilq65r45jgbv6cg8zaf6x66yhpg21pafkc7ys"; depends=[digest globals listenv]; };
   future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.14.1"; sha256="0wa97z4mkip29mqaj0hp9iscvnmphidrp0l637qv53m2cfvmg62z"; depends=[BatchJobs future R_utils]; };
   future_batchtools = derive2 { name="future.batchtools"; version="0.5.0"; sha256="1agv44cwf3l0ax7nra83j96l17lyvrbxzyssrggilafxla3bfzrp"; depends=[batchtools future]; };
   futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; };
@@ -5784,7 +5948,7 @@ in with self; {
   fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; };
   fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.3"; sha256="046iifjaz0nmf4l2y97myyx8rb47m90qgs3mklpisqi9l6x3d8np"; depends=[doParallel doRNG foreach ggplot2 mvtnorm randomForest]; };
   fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.3"; sha256="16l2vwx5yxwbm7lhb4a1ypgx8kl2rrdc02qkh59lblhzya1jiid8"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; };
-  fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.0"; sha256="1ihbj0ydzy9lb79irgnfbgcnvxlhif8b02bdp5ajahg12brghvkb"; depends=[R6 reticulate]; };
+  fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.1"; sha256="1w4cr41w876wf6jb413axlk147jpgjc1mjvpghbkmq4kaplwjcr0"; depends=[R6 reticulate]; };
   fwdmsa = derive2 { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
   fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; };
   fwsim = derive2 { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp]; };
@@ -5792,7 +5956,7 @@ in with self; {
   g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
   g2f = derive2 { name="g2f"; version="0.1"; sha256="1njx03hnfvzqyzhyjg5zwikv36xggss2vc82vpfybg6rqkx3rqbd"; depends=[KEGGREST minval sybil]; };
   gCat = derive2 { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; };
-  gIPFrm = derive2 { name="gIPFrm"; version="2.0"; sha256="1syjsnna7b7y27yf7zsxjwq8z5f4wxf2hfadhgjaw898gvfcnrbc"; depends=[]; };
+  gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; };
   gLRTH = derive2 { name="gLRTH"; version="0.1.0"; sha256="0a4vcfb54sqbk43gp397dwc02701wzsf4sxq2r121m2amad79nl5"; depends=[]; };
   gMCP = derive2 { name="gMCP"; version="0.8-10"; sha256="1alfy91mk6zx0k49w5ksa77qg5iqbav20ydfl1w7bh8dzp4xxxqk"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; };
   gMOIP = derive2 { name="gMOIP"; version="1.1.0"; sha256="122yzwicsq7q98x5dxk1mmf148v2w64jz3pd3535himx85gy9zy3"; depends=[ggplot2 ggrepel]; };
@@ -5807,24 +5971,24 @@ in with self; {
   gRc = derive2 { name="gRc"; version="0.4-2"; sha256="0cqc3s7a1njxzmnx7yx1yjkrazbai3gpw2kc4l7g49ld4j40bsln"; depends=[gRbase MASS]; };
   gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; };
   gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; };
-  gSeg = derive2 { name="gSeg"; version="0.3"; sha256="0dcvnxldvxmmzaz4cqpr40jpmny5l012m6j7xd5954bgfg06gs7w"; depends=[]; };
+  gSeg = derive2 { name="gSeg"; version="0.4"; sha256="0fcjhf8hznh1rzyfrk3f3hy16zs1n61b7r3j90pzg873razf97a2"; depends=[]; };
   gTests = derive2 { name="gTests"; version="0.1"; sha256="19037qn7q92dykry4wrnbdg7irkzk2vwz1j0kq2r836m03bs04nc"; depends=[]; };
   gWQS = derive2 { name="gWQS"; version="1.0.0"; sha256="0n0zwfqz5g4js5y3ss64dv5842jypr6sqacs32ax37immd34slhq"; depends=[ggplot2 Rsolnp tableHTML ztable]; };
   gWidgets = derive2 { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; };
   gWidgets2 = derive2 { name="gWidgets2"; version="1.0-7"; sha256="02jrv5x7s3jm2ajpdvgsp4zkn65gjy96rvgdxhf9smp1kb6llzg0"; depends=[digest]; };
-  gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-5"; sha256="0x6b05gag705mhp30wspamjrcx588gblgy839nv2j2w3n9k4vz98"; depends=[gWidgets2 memoise RGtk2]; };
+  gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-6"; sha256="1lv0vf1nchkx8v8464ijdmqlpw6y00f07ipx7a4pkii9ai9qv2pw"; depends=[gWidgets2 memoise RGtk2]; };
   gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-5"; sha256="1g0p7bl76rkkrixzw4b1s99gyvi8b5a4vbnsj2wmy7y9grbzndkm"; depends=[digest gWidgets2 memoise]; };
-  gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[cairoDevice gWidgets RGtk2]; };
+  gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-84"; sha256="0rn8v9cjziq1xm3w67nii4763w450n49jm253glpk9pvzxdkxhna"; depends=[cairoDevice gWidgets RGtk2]; };
   gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; };
   gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; };
   gaiah = derive2 { name="gaiah"; version="0.0.2"; sha256="1qc3crjxramyxl86dp8mcmvskixny7x6ji0jqf5dqf5r5qc7zrs9"; depends=[dplyr geosphere ggplot2 lazyeval magrittr maptools raster rgeos sp stringr tidyr]; };
   gains = derive2 { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
   galts = derive2 { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; };
   gam = derive2 { name="gam"; version="1.14-4"; sha256="13ma6zkqf1xlyrjlp228b2kq6pgh3fg9a7xmy3r3p0y40zvxfrba"; depends=[foreach]; };
-  gamCopula = derive2 { name="gamCopula"; version="0.0-2"; sha256="19sx0n9mavjwdzi5ii7n2mcrcrm1k1pbsdmvwnrsqvbvaz9r8vbg"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; };
+  gamCopula = derive2 { name="gamCopula"; version="0.0-4"; sha256="1nj5pxcbr6k7k1m44ky306yycpx20pw8awlx7lzyw1rx1hrv5ivb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; };
   gamRR = derive2 { name="gamRR"; version="0.1.0"; sha256="1hry7y9mx7yv4ai3hgg6ic91dzd5mqf0yp12d5jkxjlqy9c1xwd3"; depends=[mgcv]; };
   gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; };
-  gambin = derive2 { name="gambin"; version="1.4"; sha256="11k5y400d8ghaagvd1wrisjsid5zn4qgv07qf60a6f4ynsfbigca"; depends=[]; };
+  gambin = derive2 { name="gambin"; version="2.1.1"; sha256="023fmbn1c0zjyvb6b3x4c3wx60qs27i8vi5n4nr0shsamwr7cp6h"; depends=[doParallel foreach gtools]; };
   gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-0"; sha256="0z9wzvxjhnjl2bjnd5pxqzvv43hak7x5m23j76qnm05j12vw4bz1"; depends=[mboost stabs]; };
   gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
   gamclass = derive2 { name="gamclass"; version="0.56"; sha256="13gy8ys69dkhm54x3vcpqblq4j2hkbsnaswzcq0v0saqd9b1shcs"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; };
@@ -5840,14 +6004,14 @@ in with self; {
   gamlss_inf = derive2 { name="gamlss.inf"; version="1.0-0"; sha256="0n8d8q7ibin4q80js9b8qvxwjkb52xf9y33mmysq2sbl9652b22x"; depends=[gamlss gamlss_dist]; };
   gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-5"; sha256="1jfs3ib2imwgazf8v23fa12iaflv0pm944bkqklx8qcljxp1lcs7"; depends=[gamlss gamlss_dist nnet]; };
   gamlss_nl = derive2 { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
-  gamlss_spatial = derive2 { name="gamlss.spatial"; version="1.3.2"; sha256="05dq6m7a8f9lyhp3g26pf5fl5l5rvrlzb2g4llif96x7j8gbcm50"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; };
+  gamlss_spatial = derive2 { name="gamlss.spatial"; version="1.3.4"; sha256="08al70wjwb0w98ifhi8mphk332p1q92b5jxfbvam51k7m6s36i3s"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; };
   gamlss_tr = derive2 { name="gamlss.tr"; version="5.0-0"; sha256="02akydpvwl1qkhxpr72lv9qp4z2ra69abyq51b57rh4p60g78vhm"; depends=[gamlss gamlss_dist]; };
   gamlss_util = derive2 { name="gamlss.util"; version="4.3-4"; sha256="0p8lnwrn7cx97qnxls1x532f3ywszdyib2qiwx5qc7sam59h9c8j"; depends=[gamlss gamlss_dist zoo]; };
   gamlssbssn = derive2 { name="gamlssbssn"; version="0.1.0"; sha256="1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv"; depends=[gamlss gamlss_dist MASS]; };
-  gamm4 = derive2 { name="gamm4"; version="0.2-4"; sha256="0jssi97kmad1fmnjlymx6sjv1qcfyslhwfcx8bfzl8x15fqj1v9v"; depends=[lme4 Matrix mgcv]; };
+  gamm4 = derive2 { name="gamm4"; version="0.2-5"; sha256="11wblnh22xq3m3z25i30v2kd0zlf8wa3cm5z38z56rhk3l2wf5bc"; depends=[lme4 Matrix mgcv]; };
   gammSlice = derive2 { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmbcf1g9nfx52cys8gpqvag5djri59p0y945a"; depends=[KernSmooth lattice mgcv]; };
   gamreg = derive2 { name="gamreg"; version="0.2"; sha256="0k6npl5m1i22lgdvfjnv00pxaxh7qfd6sddy6raf4j33i6hp6ff6"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; };
-  gamsel = derive2 { name="gamsel"; version="1.7-3"; sha256="02j94va7srdb2wzj4f1b63qx9mlck0harsq140ndjgf9d9c44h01"; depends=[foreach mda]; };
+  gamsel = derive2 { name="gamsel"; version="1.8-0"; sha256="0s29czlakix5ksblixcv7y5in5az9syzs2n71mqzf32vqgf8sf18"; depends=[foreach mda]; };
   gaoptim = derive2 { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
   gap = derive2 { name="gap"; version="1.1-17"; sha256="0pkimpjrdbz04yh2z9n3hbhn4gkpwgx5w9nkj8zqv773qsdj8h5c"; depends=[]; };
   gapfill = derive2 { name="gapfill"; version="0.9.5-3"; sha256="1hwccvshz9z1zgjjrdk6iri272ih11cwpz91rldkpcwly6pqcwhk"; depends=[fields foreach ggplot2 quantreg Rcpp]; };
@@ -5873,7 +6037,7 @@ in with self; {
   gcKrig = derive2 { name="gcKrig"; version="1.0.2"; sha256="084rxc5dmnn1gdvfdhy48fyqrbcbbrjgs9sziv55c9r85hvn086c"; depends=[Rcpp RcppArmadillo]; };
   gcbd = derive2 { name="gcbd"; version="0.2.6"; sha256="1dvnly0aljv2c4x7sn3q55ncvfdfjfgp7w0k2900p77h4w8nixia"; depends=[DBI lattice Matrix plyr reshape RSQLite]; };
   gcdnet = derive2 { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; };
-  gcerisk = derive2 { name="gcerisk"; version="16.1.3"; sha256="0bjd3paxf1jrirv2grq20rk40l7izbw2y2dnj687hwcgah5021gv"; depends=[cmprsk ggplot2 survival]; };
+  gcerisk = derive2 { name="gcerisk"; version="17.8.7"; sha256="0w5valj2jm6i8z3g0cd3q2liwhy2h7qrwzhm0ryygn4ycqj8fd4x"; depends=[cmprsk ggplot2 survival]; };
   gcite = derive2 { name="gcite"; version="0.6"; sha256="1dy3asc2029mci0nixg56pvykl825ajnpw4ybhr66a4jixnrn880"; depends=[data_table httr pbapply rvest tm wordcloud xml2]; };
   gclus = derive2 { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
   gcmr = derive2 { name="gcmr"; version="1.0.0"; sha256="13xja7rh2wkmi2j7yxrkj99sl96mlcgkp3v5aagnz140jx3jibsx"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; };
@@ -5883,19 +6047,19 @@ in with self; {
   gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; };
   gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
   gdistance = derive2 { name="gdistance"; version="1.2-1"; sha256="1wygcx0iki7g10f9gjbycrjjadmsw3153ha9rnqvc9hwwf34m9y1"; depends=[igraph Matrix raster sp]; };
-  gdm = derive2 { name="gdm"; version="1.3.2"; sha256="1fr9cgsw158zkvw5dsabyf5jhgrwp8k4qk43g9mhdp82szma759k"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
+  gdm = derive2 { name="gdm"; version="1.3.3"; sha256="0vn2hsacz8n2iikdva7csbxvvb6bk7p451k6phvrpgp87m712abv"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
   gdmp = derive2 { name="gdmp"; version="0.1.0"; sha256="1dlzxf17ssm10pw14mk5lk0plgav2mj8xf39dacyg9hlrz9pjwki"; depends=[]; };
-  gdns = derive2 { name="gdns"; version="0.2.0"; sha256="0cyyqmbdd520h8q6b9dficgh1vc8zf47bih72zdqbz2hrkjm4yc4"; depends=[httr jsonlite purrr stringi]; };
+  gdns = derive2 { name="gdns"; version="0.2.1"; sha256="0dvrknhx0d00yi429zjdcs3ghgbpfjhrclkn6cicd049qdp4q396"; depends=[dplyr httr jsonlite purrr stringi tibble]; };
   gdpc = derive2 { name="gdpc"; version="1.0.2"; sha256="03gh69vb3zmsi7rlikl3a7vr7sar3x12d8lar2qa0nfksn0qa6dk"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; };
   gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; };
-  gdtools = derive2 { name="gdtools"; version="0.1.4"; sha256="0l8c4bh6765x9s6rw3mfm1bgicdzdngir1kxh9pxx4sidrdndcip"; depends=[Rcpp withr]; };
+  gdtools = derive2 { name="gdtools"; version="0.1.5"; sha256="09y9x09gri33ghhrvjjnj5k5rk0kdpsk3wq02cln8gmywd6728vk"; depends=[Rcpp withr]; };
   gear = derive2 { name="gear"; version="0.1.1"; sha256="1sqj9pz15j1v6fm4q2dp0zhdmy9zmmhmgxjwria5ihrp3b5hvwry"; depends=[lattice optimx sp]; };
   gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; };
   gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; };
   geeM = derive2 { name="geeM"; version="0.10.0"; sha256="0bk99kwh6xapkaxc3yis5x3d49j7pb45hq4ksbmkhz6ba21c4sn5"; depends=[Matrix]; };
   geepack = derive2 { name="geepack"; version="1.2-1"; sha256="13fkz38rsdk1byv6rdpdmphz5dd31r4h8ms49hali6hjh5rydzvy"; depends=[]; };
   geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; };
-  geigen = derive2 { name="geigen"; version="2.0"; sha256="00l4d512w2r2yc1naqfapfxv1l4v6ccww6hqzchf4zhkqmfr3mgd"; depends=[]; };
+  geigen = derive2 { name="geigen"; version="2.1"; sha256="1alssnwypnf20bc26q50baja6g0drwclajlsqamamss0mfc8hsnh"; depends=[]; };
   geiger = derive2 { name="geiger"; version="2.0.6"; sha256="1zry3iclj7yciiiysbq6z0kn759c7hdy5fq0dcszkskqcd92qfz1"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; };
   gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; };
   gem = derive2 { name="gem"; version="0.19"; sha256="11gzqpc9s1bkx1w6ncjylmfqqf3wj5hgca4lzygvlni9xz7pk517"; depends=[signal]; };
@@ -5919,8 +6083,8 @@ in with self; {
   geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; };
   genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; };
   genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
-  genepop = derive2 { name="genepop"; version="1.0"; sha256="1wcy29sa9x2csxcddkw7by939jpnsnl9xd45770vrkmp5yaxp4m2"; depends=[Rcpp]; };
-  generalCorr = derive2 { name="generalCorr"; version="1.0.5"; sha256="08s2br4isjbx4x9ldm6a0z9x907f1n7gmr76pidf3s66yxlypiar"; depends=[meboot np psych xtable]; };
+  genepop = derive2 { name="genepop"; version="1.0.5"; sha256="17s3azcq1fjjqi5n8rw071k1as4nnwvppmdaz2l5scn0wv120vcq"; depends=[Rcpp]; };
+  generalCorr = derive2 { name="generalCorr"; version="1.0.6"; sha256="0xiaw2ngqj4pigcj6dv0qbj20954m41cvhyjpznny23g85d47gk9"; depends=[meboot np psych xtable]; };
   generalhoslem = derive2 { name="generalhoslem"; version="1.2.5"; sha256="1kx2yzaawagxd0vx29h74ik1zccasikr6qzks3m09hgmc6g4kf2p"; depends=[epiR MASS reshape]; };
   generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; };
   genetics = derive2 { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; };
@@ -5929,6 +6093,7 @@ in with self; {
   genoPlotR = derive2 { name="genoPlotR"; version="0.8.6"; sha256="0n92d60sccx0gfakskmvan6z20v9nl0fsxsixrqmrfzp64d1n01d"; depends=[ade4]; };
   genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; };
   genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; };
+  genotypeR = derive2 { name="genotypeR"; version="0.0.1.6"; sha256="1y8fm3l97hrwra7a1n2gry6583r09rch1sk7vp6r9f5qwmmjc3r7"; depends=[colorspace doBy plyr reshape2 zoo]; };
   genpathmox = derive2 { name="genpathmox"; version="0.3"; sha256="0r1iqwm5jh93lbh87ks5qm4qqsp98928vg7qmv1pkahdlvl3ramw"; depends=[diagram mice plspm quantreg]; };
   genridge = derive2 { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; };
   gensemble = derive2 { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
@@ -5936,18 +6101,18 @@ in with self; {
   geo = derive2 { name="geo"; version="1.4-3"; sha256="0yxlafm99ypwf1700nh3hnnpndb6ghwwbi5sp6715zjbkkx94482"; depends=[mapdata maps]; };
   geoBayes = derive2 { name="geoBayes"; version="0.3.3"; sha256="1jw0fj39gzf4cislc889ndgj34svcdxk0jz85ssk936g9gp0mm0c"; depends=[coda sp]; };
   geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; };
-  geoGAM = derive2 { name="geoGAM"; version="0.1-1"; sha256="04qgkbqjzvm9pxazj96716hf5cviy08a12r782id77l61dd9ya3s"; depends=[grpreg MASS mboost mgcv]; };
+  geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; depends=[grpreg MASS mboost mgcv]; };
   geoR = derive2 { name="geoR"; version="1.7-5.2"; sha256="1sy968x154bsc3i3a6mxcwnyixcnmab5bc07dgibi9vzn0nkbbpb"; depends=[MASS RandomFields sp splancs]; };
   geoRglm = derive2 { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; };
-  geoSpectral = derive2 { name="geoSpectral"; version="0.17.3"; sha256="13638j70j30icydcb0rydmdnmswf15skk646zra5y68n46mjvl68"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; };
+  geoSpectral = derive2 { name="geoSpectral"; version="0.17.4"; sha256="0i2k5k66gmf7zvipcd0a489rnpj14j4a4xw9k5dccpj6ybwd47l7"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; };
   geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; };
   geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; };
-  geofacet = derive2 { name="geofacet"; version="0.1.4"; sha256="1vb6d18jfw2ibvz586czsnck2kx00bqs0azq09znzn3zv5p0plz6"; depends=[ggplot2 gtable]; };
+  geofacet = derive2 { name="geofacet"; version="0.1.5"; sha256="1fx7qgvyqkm8728ai1nd7kgj295q46jlps56zwvlvlzhqy437p5n"; depends=[ggplot2 gtable]; };
   geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; };
-  geohash = derive2 { name="geohash"; version="0.2.0"; sha256="09m6vhlacsxr6minq4cz110d8rkarhmm3gqxjrq06ld70gd02l8q"; depends=[Rcpp]; };
+  geohash = derive2 { name="geohash"; version="0.3.0"; sha256="1yabnf0a6jd4r6zh83sxb9wcn4vs8csp7c80qs6pi1nx016lirx7"; depends=[Rcpp]; };
   geojson = derive2 { name="geojson"; version="0.1.2"; sha256="0f8zimw50ryi776l5yxx5pi11559sa2278plvx289v3lfb20f7ii"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
-  geojsonR = derive2 { name="geojsonR"; version="1.0.1"; sha256="0jjn1pknvg0kkq1jw4blf4ykfps4gcmhaz9piwmrg1hzfdfvf2zm"; depends=[R6 Rcpp RcppArmadillo]; };
-  geojsonio = derive2 { name="geojsonio"; version="0.3.2"; sha256="10rnp4ws3465p8jv6b15zbl662swd373nmlbxxk3n8dy7049qwpj"; depends=[httr jsonlite magrittr maptools readr rgdal rgeos sp V8]; };
+  geojsonR = derive2 { name="geojsonR"; version="1.0.2"; sha256="1gx80rd1vg1j6vns24myybbi1k2c8q7z15jzsapasyw83ncjwy6w"; depends=[R6 Rcpp RcppArmadillo]; };
+  geojsonio = derive2 { name="geojsonio"; version="0.4.0"; sha256="0y6bf0c0c05gal6j7m4kx7jcygrlwy99qzknqfglpbqkl5g6j7rq"; depends=[geojson httr jsonlite magrittr maptools readr rgdal rgeos sp V8]; };
   geojsonlint = derive2 { name="geojsonlint"; version="0.2.0"; sha256="05j7059s1hs8i2fkmkv0mqmda3bgk5zbyi865ab0vl361wiwmdya"; depends=[httr jsonlite jsonvalidate V8]; };
   geoknife = derive2 { name="geoknife"; version="1.5.5"; sha256="0azb98zk4ayfm0z9vz5h59490xvng16p3gpdn60ca9mwdikyxks3"; depends=[curl httr sp XML]; };
   geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
@@ -5955,7 +6120,7 @@ in with self; {
   geometa = derive2 { name="geometa"; version="0.1-0"; sha256="1p030v19851pp9x7d4rz51qpfr7vdk3zfihm4vx5yvn5r3ls3fr8"; depends=[R6 XML]; };
   geometry = derive2 { name="geometry"; version="0.3-6"; sha256="0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib"; depends=[magic]; };
   geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; };
-  geomorph = derive2 { name="geomorph"; version="3.0.4"; sha256="1smbrkhy9c0z0izr4hg1v2maxv6bpnsbl78a5m0ln10fvynzrnl3"; depends=[ape geiger jpeg Matrix rgl]; };
+  geomorph = derive2 { name="geomorph"; version="3.0.5"; sha256="015ijpmx44agmr2ddwgxy5rs1rhkxr6j6dh5wzksaw1p4mxmhfks"; depends=[ape geiger jpeg Matrix rgl]; };
   geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
   geoparser = derive2 { name="geoparser"; version="0.1.1"; sha256="0rk2wcig79r28a974bc181p8vypxzbgxcb9rsp24qj9mg02rn5n5"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; };
   geophys = derive2 { name="geophys"; version="1.3-9"; sha256="05q42b1pqfihamxbh5s5kxkrslr84j5p6y1cybmcl31z9dg92ccl"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
@@ -5966,17 +6131,18 @@ in with self; {
   geosphere = derive2 { name="geosphere"; version="1.5-5"; sha256="0vffppnyxp7ryg7rvsb1ww9z0ghh1vk20vzgw245pi2gfh9f0vwb"; depends=[sp]; };
   geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; };
   geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; };
-  geostatsp = derive2 { name="geostatsp"; version="1.4.4"; sha256="0gvxbrr52v8g0a2mbzc8754z5ycpgz7hjfgi7xirn10iv99kwgjz"; depends=[abind Matrix numDeriv raster sp]; };
+  geostatsp = derive2 { name="geostatsp"; version="1.5.4"; sha256="1c2306sh2h0kp3yclgx49z6zy91ghi53ajrj89hjgaxkhzhf6ba7"; depends=[abind Matrix numDeriv raster sp]; };
   geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; };
   geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
+  geotoolsR = derive2 { name="geotoolsR"; version="1.0"; sha256="1arbyb1q96ya3smn9sqzqji5v21x37iyyxmvlmqmjj75an8ix5dp"; depends=[dplyr geoR ggplot2 tidyr]; };
   geotopbricks = derive2 { name="geotopbricks"; version="1.4"; sha256="1jqkdhljf0syfvkcy7wgaccrhp3hfx0kymw3vyckhmf1dkwbjvyj"; depends=[raster rgdal stringr zoo]; };
   geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; };
   gepaf = derive2 { name="gepaf"; version="0.1.0"; sha256="0ld7r0dkap7bpmb2fc8x0pzffvnlzp2q1bndx4l2ffiyygsq6f72"; depends=[bitops]; };
   gesca = derive2 { name="gesca"; version="1.0.3"; sha256="1xr9kls6wdd1lnk4nrwix5p0dl93rl1zd3x88c0qyxzp11m2pcsf"; depends=[]; };
   gesis = derive2 { name="gesis"; version="0.2.1"; sha256="1cdmhfdjiwsp48a7b0r1mnagnymz606mkzpam9fsvfl72vzji2w7"; depends=[httr rvest xml2]; };
-  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.1.7"; sha256="19iiyq0dni12syry7lirga1qil4pqm68vcdzrsp6i3fxaqqr06x5"; depends=[data_table dplyr httr purrr rappdirs raster tibble tidyr]; };
+  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.1.9"; sha256="0mq9pi64ybwwl5rx91f1jszy8vbapw0sm5jqxwp280vlxxnh1002"; depends=[data_table dplyr httr purrr rappdirs raster tibble tidyr]; };
   getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; };
-  getPass = derive2 { name="getPass"; version="0.1-1"; sha256="14s8s3zrl5iwr7pw000b8mwxy17caf42yl0lf56b3qa71ifzxbnc"; depends=[rstudioapi]; };
+  getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; };
   getlandsat = derive2 { name="getlandsat"; version="0.1.0"; sha256="0h2520r5sqyzsajqw2i86byw9zm5za27mhjkrzzw5vr5sh1vdiwb"; depends=[data_table httr rappdirs readr tibble xml2]; };
   getmstatistic = derive2 { name="getmstatistic"; version="0.1.1"; sha256="14w0n658s624anvxv7sqcgy6vfaaxcc7fj4xi1k2qrxd9rdh6dza"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; };
   getopt = derive2 { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; };
@@ -5984,8 +6150,9 @@ in with self; {
   gettingtothebottom = derive2 { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
   gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; };
   gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
-  gfer = derive2 { name="gfer"; version="0.1.6"; sha256="1lg6r4ymiaix24vg8jz3a4yb07fib9cxmyfblmvwxgdmflbswxad"; depends=[data_table httr jsonlite rvest stringi V8 xml2]; };
+  gfer = derive2 { name="gfer"; version="0.1.8"; sha256="0qz74gp94qx0w6njspm8n6kcpn87y2wxcr2g93l17plafl4pi04p"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; };
   gfmR = derive2 { name="gfmR"; version="1.0-1"; sha256="1irzkiq93wh4yphq8x1v2a7plcrskb8fs36qjaa0qhyhvhn0f57i"; depends=[faraway nnet]; };
+  ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; };
   ggCompNet = derive2 { name="ggCompNet"; version="0.1.0"; sha256="1199n4s2rh5zg001l3j8wmc6fxkbkk5vzp4q5kg661k3khgx0hd5"; depends=[dplyr geomnet GGally ggmap ggnetwork ggplot2 gridExtra igraph network progress readr scales sna tidyr tnet]; };
   ggExtra = derive2 { name="ggExtra"; version="0.7"; sha256="0vygac13cjcq63f57zd28jyla09za58r77kq1mmsa4qx4dxyfsbl"; depends=[colourpicker ggplot2 gtable miniUI shiny shinyjs]; };
   ggQC = derive2 { name="ggQC"; version="0.0.1"; sha256="0sf7hq69nzdhbrx3rhw92mxqq3cm2wqa79csp9lsvx97gwb60sfl"; depends=[ggplot2 plyr reshape2]; };
@@ -5993,16 +6160,17 @@ in with self; {
   ggRandomForests = derive2 { name="ggRandomForests"; version="2.0.1"; sha256="0f8m0j79d8wbac14zk1s8812rz6vgf04bz1iqq8p4d3sxwnvaj7q"; depends=[ggplot2 randomForest randomForestSRC survival tidyr]; };
   ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; };
   ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; };
-  ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.5.3"; sha256="1jgp55rvmzc4agcrlsjn8m5lk85di9c4wj94xzikqkql4lvq3qpd"; depends=[beeswarm ggplot2 vipor]; };
+  ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; };
   ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; };
   ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; };
   ggdmc = derive2 { name="ggdmc"; version="0.1.3.9"; sha256="07a9g6kwq4hg5zlcxndwmyprl3di7fzsn2960qyixn5bzrfk7sh2"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; };
   gge = derive2 { name="gge"; version="1.2"; sha256="00kwm4xsr8796qm98b00rlznaicgn0aagkqn2h1qmdw70scifg8l"; depends=[Rcpp reshape2 rgl]; };
   ggedit = derive2 { name="ggedit"; version="0.2.1"; sha256="0l2ryp8xcyqsgfcywr3y6c2y8j42c15dyrcmfhfimbzy52bmnqxy"; depends=[colourpicker dplyr ggplot2 miniUI plyr reshape2 rstudioapi scales shiny shinyAce shinyBS]; };
-  ggeffects = derive2 { name="ggeffects"; version="0.1.2"; sha256="0nkgvdlgl8bin77n25dn0rk9g03bhza8krwbapzp9m64vybwqccr"; depends=[dplyr effects ggplot2 magrittr Matrix prediction purrr scales sjlabelled sjmisc sjstats tibble tidyr]; };
+  ggeffects = derive2 { name="ggeffects"; version="0.2.1"; sha256="1630kganb2x9v4ihaz6vdzvi7pigjii1mmr56h5v7vgxzp7kkwxx"; depends=[dplyr effects ggplot2 magrittr Matrix prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr]; };
   ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; };
+  ggfittext = derive2 { name="ggfittext"; version="0.4.3"; sha256="0s1v8kpbjj1vvpdhkwcgjy93j9r2qcqn4nfxcca30n9gk5phsmp7"; depends=[ggplot2 stringi]; };
   ggforce = derive2 { name="ggforce"; version="0.1.1"; sha256="0y49anv5sj1qn1ifcxg1krkkv4z3dlan5lya36vfmzzdamfgq5p6"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; };
-  ggformula = derive2 { name="ggformula"; version="0.4.0"; sha256="1nrbapxz4nmg2ic9qii7lyqc7mmibl1mwzwrx70smg3k627iycwh"; depends=[ggplot2 glue magrittr mosaic rlang stringr tibble]; };
+  ggformula = derive2 { name="ggformula"; version="0.5"; sha256="14d8lilv688l2z9vdzkv2ngasink8x0pc2ssq22hny03v1il794g"; depends=[ggplot2 glue magrittr mosaicCore rlang stringr tibble tidyr]; };
   ggfortify = derive2 { name="ggfortify"; version="0.4.1"; sha256="19jwcz1z6g7l65l6cj8zspypfb86pn3x18vzdcgf932n14g646d2"; depends=[dplyr ggplot2 gridExtra scales tibble tidyr]; };
   ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; };
   ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; };
@@ -6010,6 +6178,7 @@ in with self; {
   ggimage = derive2 { name="ggimage"; version="0.0.4"; sha256="1r9rl3sw5frncsq091924p5lk9z11inpvdk39byzabz2ybi6wzp8"; depends=[EBImage ggplot2 gridGraphics scales tibble]; };
   ggiraph = derive2 { name="ggiraph"; version="0.4.0"; sha256="1q69621928skb2kvms5i73a4rmha4nrgbhdq0bb7p150c7ni3lvi"; depends=[ggplot2 htmltools htmlwidgets plyr rvg uuid xml2]; };
   ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.1.0"; sha256="09fiwkaai4sy5kxy4p0c4ldb8ya63czff53hbm6d8fm858fw2byw"; depends=[ggiraph ggplot2 mapproj mgcv moonBook mycor plyr reshape2 scales XML]; };
+  ggjoy = derive2 { name="ggjoy"; version="0.3.0"; sha256="15ycypm1imdg4cdg3qcgsj3chjwlaq84qr274r6wav6svrr52vdv"; depends=[ggplot2 plyr purrr scales]; };
   gglasso = derive2 { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; };
   gglogo = derive2 { name="gglogo"; version="0.1.3"; sha256="1dq0bixz44p32kpma5wrqjqklal2ipjmqdwqap0xch542drlpqbn"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2]; };
   ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; };
@@ -6021,41 +6190,46 @@ in with self; {
   ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; };
   ggplot2 = derive2 { name="ggplot2"; version="2.2.1"; sha256="0543782ddv2hp6s0l702mnxfg8n7a6qlbm8bm55x22hnqgz8kg2z"; depends=[digest gtable lazyeval MASS plyr reshape2 scales tibble]; };
   ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; };
+  ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; };
   ggpmisc = derive2 { name="ggpmisc"; version="0.2.15"; sha256="00a909bdzkh28b7jkllxxqd1avcspny12y5rqpxddj90xv34zjah"; depends=[broom dplyr ggplot2 lubridate MASS plyr polynom splus2R tibble xts zoo]; };
   ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; };
-  ggpubr = derive2 { name="ggpubr"; version="0.1.4"; sha256="0nzqsm3jbhp2fvzs9lvmgn7y51ia7zi6qx1m3sm5b45b2ff3rk5x"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif gridExtra magrittr purrr scales tidyr]; };
-  ggpval = derive2 { name="ggpval"; version="0.1.0"; sha256="143fbxgsy9h37zyqbd1xknzdalmchdsfq753piikp2p8hqhmmpva"; depends=[data_table ggplot2]; };
+  ggpubr = derive2 { name="ggpubr"; version="0.1.5"; sha256="1ny0z5lc50hnsg21s7c5dyl4c79c34cqfkpi091dzs61w79m27jp"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif gridExtra magrittr purrr scales tidyr]; };
+  ggpval = derive2 { name="ggpval"; version="0.2.0"; sha256="1nwf3cz1258khp1barxxp28326bagvlsfhg4rcccbxcpny9vbl7d"; depends=[data_table ggplot2]; };
+  ggquiver = derive2 { name="ggquiver"; version="0.1.0"; sha256="0p6li7cxjy54qrmaf9ja6aknnlxwq4sl0z1yip1mznb5rhv6lpxw"; depends=[dplyr ggplot2]; };
   ggraph = derive2 { name="ggraph"; version="1.0.0"; sha256="0xkhqkckqz201601aqznrgnlgqzs7is1nfpdyalag58q5wl934j8"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; };
   ggraptR = derive2 { name="ggraptR"; version="0.1"; sha256="060ksjq790rvv9kyyf6v6z0irawlw3hxaq8n0dvzmfkw58pk5fpd"; depends=[dplyr DT futile_logger ggplot2 ggthemes shiny shinyBS shinyjs]; };
   ggrepel = derive2 { name="ggrepel"; version="0.6.5"; sha256="0lm78662p1iajkcvq82g08zsv3s4lfmkpggg1wk9wpvmk78yj2in"; depends=[ggplot2 Rcpp scales]; };
   ggsci = derive2 { name="ggsci"; version="2.7"; sha256="15ay3dgdzaxxyspdai50i66r44v2qz3y2am3wkazg3afcs2qszk4"; depends=[ggplot2 scales]; };
   ggseas = derive2 { name="ggseas"; version="0.5.1"; sha256="1r23j701rvia49si42fbi6zws7x9r92h1bcp0a15h28hpl7zlp7l"; depends=[ggplot2 seasonal zoo]; };
-  ggseqlogo = derive2 { name="ggseqlogo"; version="0.0.1"; sha256="1qb6rr7q3makrv5qqa0d0r8ak8c9k3g05hzgyfhsgggz1g90036d"; depends=[ggplot2]; };
-  ggsignif = derive2 { name="ggsignif"; version="0.3.0"; sha256="0kj8fg7vns8a2izmq41mqwac420dsqzpr4dxyvzgscd0dzd8xd7h"; depends=[ggplot2]; };
+  ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; };
+  ggsignif = derive2 { name="ggsignif"; version="0.4.0"; sha256="1rn58d7pb3axk6chiihryykrzw76adaa2yiafq4d0j6qbhax78f7"; depends=[ggplot2]; };
   ggsn = derive2 { name="ggsn"; version="0.4.0"; sha256="0si3llqlb0dg482cqxhv5lm6raawqwpcd5ymjicw3780xq7d7mrk"; depends=[ggplot2 maptools png]; };
   ggspatial = derive2 { name="ggspatial"; version="0.2.1"; sha256="11vminz4kwv1ny4v9h23sp7j7d45q6v4804xv9fp04qgzbzi9lv8"; depends=[abind ggplot2 maptools plyr raster reshape2 rgdal rosm scales sp]; };
   ggspectra = derive2 { name="ggspectra"; version="0.2.1"; sha256="1q8l5zfkv4jzacb8pp7b2yp99ack4by4z2iw9l4j2n689v9wjs40"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; };
   ggstance = derive2 { name="ggstance"; version="0.3"; sha256="0sr84nasr8x8ib3mdsjck73gbfg9xba50s5nxdij0ah9xqnpyhpi"; depends=[ggplot2 lazyeval plyr purrr]; };
   ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; };
-  ggtern = derive2 { name="ggtern"; version="2.2.0"; sha256="0ddcbbgp8ni3zbz4ailqx79i16aa2x4z4gvz55f0b731bilczw86"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
+  ggtern = derive2 { name="ggtern"; version="2.2.1"; sha256="05dszysn1qr5s4ji4il91pv19xjh5yd09w9f153fmg4cyfl716iz"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
   ggthemes = derive2 { name="ggthemes"; version="3.4.0"; sha256="1jj8lp7jbk3489kpgbw4b5phpn01gkfmksc21c6sn3x6wmzyn6hs"; depends=[assertthat colorspace ggplot2 scales]; };
+  ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; };
   ggvis = derive2 { name="ggvis"; version="0.4.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
+  gh = derive2 { name="gh"; version="1.0.1"; sha256="1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k"; depends=[httr ini jsonlite]; };
+  ghibli = derive2 { name="ghibli"; version="0.1.0"; sha256="0qss6kgmvrjx2cp6lwymh1sc9jmcnkl17lghmh2b19f600d2shr4"; depends=[ggplot2]; };
   ghit = derive2 { name="ghit"; version="0.2.18"; sha256="117dn7j4nsdbdj1c1zndfikih3gxgxnkdxi3z0qmrbpsb9l4h1ic"; depends=[git2r]; };
   ghyp = derive2 { name="ghyp"; version="1.5.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; };
   giRaph = derive2 { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
   gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
-  gifti = derive2 { name="gifti"; version="0.7.1"; sha256="0nvsk7403378yaam9349420w9abixcg6a18m63m1s2a6zd3jyj2y"; depends=[base64enc xml2]; };
+  gifti = derive2 { name="gifti"; version="0.7.4"; sha256="02z6r9p0vx22ja2bs6hqb9hjwlcnb8g0kcphqpj6ivkanwh6702w"; depends=[base64enc R_utils xml2]; };
   gimme = derive2 { name="gimme"; version="0.2-2"; sha256="1fx6vh0zzrn2vqbaprv0iyihx4y93qshi82jgi9lrjhaaqw3dmfh"; depends=[gWidgets igraph lavaan qgraph]; };
   gimms = derive2 { name="gimms"; version="1.0.0"; sha256="0f959gr4nzf9p2gpvdrzlndp24g2hhzc0wbkgpbs056wp8ij0mws"; depends=[Kendall raster RCurl zyp]; };
   giphyr = derive2 { name="giphyr"; version="0.1.1"; sha256="0q5gkx2qmdn2z00fyd25q7n5izvhqa6b70cjzarxisjn2f07jdvj"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; };
   gistr = derive2 { name="gistr"; version="0.4.0"; sha256="1q1wp3q3ppkclvw9fsc9pr5raqv2r9rdm2n8s197b8brfcjilxsi"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
-  git2r = derive2 { name="git2r"; version="0.18.0"; sha256="0bgzdsdi9n6l8pchivs6a2g4ksa56qs8hygpyv2c0ndqmx4jxcwi"; depends=[]; };
+  git2r = derive2 { name="git2r"; version="0.19.0"; sha256="0ws6fbndmaafk2am4dwnz24qizxhld0yh54hgx0z6lzv3p1j209q"; depends=[]; };
   gitgadget = derive2 { name="gitgadget"; version="0.2.1"; sha256="02jmp5lnk156sfqlv91jn42xds98ihya1x2f97cfwpzlas5qrxky"; depends=[curl dplyr jsonlite miniUI rstudioapi shiny]; };
   githubinstall = derive2 { name="githubinstall"; version="0.2.1"; sha256="0vcc1s4ywaz8fjsg99knlxms4505wpvl08g48ndxcp3fqzvfc8i7"; depends=[curl data_table devtools httr jsonlite]; };
   gitlabr = derive2 { name="gitlabr"; version="0.9"; sha256="0i9sqqvn9xzknybsj9nmi6kclw8c35shy658li17455d28gv4653"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; };
   gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; };
   givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; };
-  gjam = derive2 { name="gjam"; version="2.1.4"; sha256="13w64sk99db1rncq2qsd30ql8lhn9la2ilxhhb7qgqly929c6ywl"; depends=[MASS RANN Rcpp RcppArmadillo]; };
+  gjam = derive2 { name="gjam"; version="2.1.5"; sha256="11p84p0qp8m3r9pkp0wpzwm9q8rinvsg03zjx5d9zzpf7l0d8zz8"; depends=[MASS RANN Rcpp RcppArmadillo]; };
   gk = derive2 { name="gk"; version="0.5.0"; sha256="0ixkl9jrmd4bcd3m34whfcikvwqbcdnzcd6gf5bdv81r0ygc5jml"; depends=[Ecdat lubridate progress]; };
   gkmSVM = derive2 { name="gkmSVM"; version="0.71.0"; sha256="1zpxgxmf2nd5j5wn00ps6kfxr8wxh7d1swr1rr4spq7sj5z5z0k0"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; };
   glamlasso = derive2 { name="glamlasso"; version="2.0.1"; sha256="1x87nv29r309l539qccbcll4kn889sdds6gvrhyvw68rs370pn2l"; depends=[Rcpp RcppArmadillo]; };
@@ -6065,26 +6239,26 @@ in with self; {
   glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; };
   gld = derive2 { name="gld"; version="2.4.1"; sha256="0ycm3w8s5bm5w2lqy0qa877cwjcwc9x1zyyyrknwwjjxip250iaw"; depends=[e1071 lmom]; };
   gldrm = derive2 { name="gldrm"; version="1.1"; sha256="0ixvxlgfvn7dbwd3nr27qr1x3lh0spynmkl9qprk8blvf68lsrvp"; depends=[]; };
-  glinternet = derive2 { name="glinternet"; version="1.0.4"; sha256="0h96ydwp6rygwcbwmwbbggz3dl2zg5d4zp0cs9n1p9ji7h6af95f"; depends=[]; };
+  glinternet = derive2 { name="glinternet"; version="1.0.5"; sha256="1kjy0w6gaj161f52w3gn7kgsld4kqvm53n81kl6lvfwwh2qzw4q4"; depends=[]; };
   gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
   glm_ddR = derive2 { name="glm.ddR"; version="0.1.1"; sha256="123xqyw73l5lv746zvy2wjwr8xx6gpmwi5n86m8d05dj3bx02dzm"; depends=[ddR Matrix]; };
   glm_predict = derive2 { name="glm.predict"; version="2.5-1"; sha256="0q3mi89zc7386bcx0ysii5vf4viqdc933k4fhdwqfm9c2z3rzpcy"; depends=[MASS nnet]; };
   glm2 = derive2 { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; };
-  glmBfp = derive2 { name="glmBfp"; version="0.0-48"; sha256="1r8mc55v717g4666f07hkc13v9vhj96n7xvn2r3crjndq3w5x3yn"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
+  glmBfp = derive2 { name="glmBfp"; version="0.0-51"; sha256="15jm450j1f0nl7vqvpb2mwapdlvn7kq2kxf5s96x21siwsz7sssv"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
   glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; };
   glmc = derive2 { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
   glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
   glmertree = derive2 { name="glmertree"; version="0.1-1"; sha256="0wfpx7y6x9ll86av399i7vaycjjbgmmmh78wy77cbq0gkp1rzb47"; depends=[Formula lme4 partykit]; };
   glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; };
   glmlep = derive2 { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
-  glmm = derive2 { name="glmm"; version="1.1.1"; sha256="0jswwrdc2k99kcqnbh1dg5j3z98l4x8v5kfdlxk5yxfi1ik6r3p5"; depends=[Matrix mvtnorm trust]; };
+  glmm = derive2 { name="glmm"; version="1.2.1"; sha256="00xbv65cwgfjr6njy6wx4g3i8kk75gd51lsd09qfwx5mp7blg2ww"; depends=[Matrix mvtnorm trust]; };
   glmmBUGS = derive2 { name="glmmBUGS"; version="2.4.0"; sha256="1clnnf0ja2xiqdgi2f1xs04hhi13rnp8jzzdjncbqbdzk2ic3ynl"; depends=[abind MASS sp]; };
   glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; };
   glmmML = derive2 { name="glmmML"; version="1.0.2"; sha256="0ndvp7a7dxq6ygdwzq783ci1y0zb4xwnj6g4w1cm8zvqak8dxjdb"; depends=[]; };
   glmmTMB = derive2 { name="glmmTMB"; version="0.1.1"; sha256="1ckij5jrqijwljqkj624q6li0bv8vxb3aglwbfi034zc0iwiba1b"; depends=[lme4 Matrix nlme RcppEigen TMB]; };
   glmmsr = derive2 { name="glmmsr"; version="0.1.1"; sha256="07z4j7845hz3hcv438njnqf1yfp8prqby03h3s1ql1w8d342670i"; depends=[BH lme4 Matrix R6 Rcpp RcppEigen]; };
   glmnet = derive2 { name="glmnet"; version="2.0-10"; sha256="07n2hz4fvjyv0siai8z8wqwfj8d58i8n1vzf1ckdfzp4kxa3z08d"; depends=[foreach Matrix]; };
-  glmnetUtils = derive2 { name="glmnetUtils"; version="1.0.2"; sha256="1v270hfw72x42r6m3nv28fp0s7snqnak6ilbijl9cfqnmxb642q8"; depends=[glmnet Matrix]; };
+  glmnetUtils = derive2 { name="glmnetUtils"; version="1.1"; sha256="0abvxkwfadh56672qh16vql49js9ar8cz8is0bs6i8jgsl5csz91"; depends=[glmnet Matrix]; };
   glmnetcr = derive2 { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; };
   glmpath = derive2 { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; };
   glmpathcr = derive2 { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; };
@@ -6094,7 +6268,7 @@ in with self; {
   globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
   globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
   globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
-  globals = derive2 { name="globals"; version="0.10.0"; sha256="1vxp4lliihjd9p5d5yaf4dqvj0hmr8nzpxayscdckcxq6jr2p34i"; depends=[codetools]; };
+  globals = derive2 { name="globals"; version="0.10.2"; sha256="1j6w70jplxb2z1d8h0c5jn7d4glplwnqr3r7xdj1zfqc8pszw4ld"; depends=[codetools]; };
   globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; };
   glogis = derive2 { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[sandwich zoo]; };
   glpkAPI = derive2 { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; };
@@ -6108,7 +6282,7 @@ in with self; {
   gmediation = derive2 { name="gmediation"; version="0.1.1"; sha256="0md4h298vqw67qrjcaia6xz8s7akdpcmxa83irm12qgbh56a5rpr"; depends=[MASS plyr VGAM]; };
   gmeta = derive2 { name="gmeta"; version="2.2-6"; sha256="1zq5prig4mq6i8gkaynv8p786dbwh670bv0mapwmyns1r0yarzkm"; depends=[BiasedUrn binom]; };
   gmm = derive2 { name="gmm"; version="1.6-1"; sha256="0giq0ic7gdvglkjby217r70dbz9v0xnvzvzv6icqj0m3rxwarmn1"; depends=[sandwich]; };
-  gmnl = derive2 { name="gmnl"; version="1.1-1"; sha256="0pdbky9gm8s3dvyg6z7pvn7wzqlbvdg7y0py9kcwfxxjvwcp1qwh"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
+  gmnl = derive2 { name="gmnl"; version="1.1-3"; sha256="05p2kikv8zz9ldc6xi5bz7fyinpd0sp2v82hxhx6h54hfa6i7b9v"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
   gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; };
   gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; depends=[]; };
   gmt = derive2 { name="gmt"; version="2.0-0"; sha256="146rdvfi7f1s28zvy6h11myq61jy4di2ghzxlvwy04q3hphm1nj7"; depends=[coda Hmisc lattice]; };
@@ -6170,12 +6344,14 @@ in with self; {
   graphql = derive2 { name="graphql"; version="1.3"; sha256="14abyr4h49i75aq5x49f6jv6053hyq9a77v7wad88zcbcs3p1n9p"; depends=[jsonlite Rcpp]; };
   graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; };
   graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; };
-  grattan = derive2 { name="grattan"; version="1.5.0.0"; sha256="13zrkn2hb3cnaijmvmhgfrw1aib6vhk66vmkn4vx8srrbglr3m56"; depends=[assertthat data_table dplyr forecast lazyeval lubridate magrittr purrr Rcpp rsdmx zoo]; };
+  grattan = derive2 { name="grattan"; version="1.5.1.1"; sha256="04m15v9c4kf5jfyr62l8xxcg7qyrbf17d5qf2h91cwrjq9w93lsx"; depends=[assertthat data_table dplyr forecast lazyeval lubridate magrittr purrr Rcpp rsdmx zoo]; };
   gravity = derive2 { name="gravity"; version="0.3"; sha256="0makhi5hfs2x891ss6whq49rp73j6h5x5m4dvd0d175y06n4hg3s"; depends=[lmtest multiwayvcov sandwich]; };
+  grec = derive2 { name="grec"; version="1.1.1"; sha256="1qn1vbhlw42wqg9vj5plb12pg9xskn32z27ifyzm4kggp1vckgbf"; depends=[imagine raster]; };
   greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
   greta = derive2 { name="greta"; version="0.2.0"; sha256="0fp540an93h4a1bkmc42gj7j8hxdkw5zrcaj0mg64rahx0xn2dvq"; depends=[coda progress R6 reticulate tensorflow]; };
   grex = derive2 { name="grex"; version="1.5"; sha256="1wy2f61z1mrzb487h4s97larpyygf6gqm1r9i9bmabhjakzk3qyd"; depends=[]; };
   greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
+  grf = derive2 { name="grf"; version="0.9.3"; sha256="107w6mxn5irwxvx8ck6vv4l8ix10a6283grf3xs10ralmlc4y5kh"; depends=[Rcpp]; };
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
   gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; };
   gridExtra = derive2 { name="gridExtra"; version="2.2.1"; sha256="0638ihwl00j76ivaxxhxvi8z573lwy1jym3srr78mx6dbdd4bzj4"; depends=[gtable]; };
@@ -6203,11 +6379,11 @@ in with self; {
   grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; };
   grplasso = derive2 { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; };
   grppenalty = derive2 { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; };
-  grpreg = derive2 { name="grpreg"; version="3.1-1"; sha256="16wg95iw935k8gqm53pi29244gg28yzvaqhq72p3m0xfqj5aq885"; depends=[Matrix]; };
+  grpreg = derive2 { name="grpreg"; version="3.1-2"; sha256="042waw813jfc163376019zd7ngwrmrr26z17c2kw7ggvp1vz5m9q"; depends=[Matrix]; };
   grpregOverlap = derive2 { name="grpregOverlap"; version="2.2-0"; sha256="1kq8wxpx21irwckndgfkzdy5jgzf7pmcwpclmjzjxznv6cyaikd0"; depends=[grpreg Matrix]; };
   grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; };
   grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; };
-  grt = derive2 { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS misc3d rgl]; };
+  grt = derive2 { name="grt"; version="0.2.1"; sha256="1dw5rjs82r82l6qryyyq9cczm770v4iv60d7pi1nb4b0733ndbd5"; depends=[MASS]; };
   gsDesign = derive2 { name="gsDesign"; version="3.0-1"; sha256="0cixg176ihbkwkcllabr2klc15cssdnfzwklf0q1wd23lmv6aj43"; depends=[ggplot2 plyr xtable]; };
   gsEasy = derive2 { name="gsEasy"; version="1.1"; sha256="1g68v51wpgb0fq4nb3q4b9hv34f12dlcp6115css7748imz9p99q"; depends=[ontologyIndex Rcpp]; };
   gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
@@ -6226,7 +6402,7 @@ in with self; {
   gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; };
   gstat = derive2 { name="gstat"; version="1.1-5"; sha256="1wfzffl0wfimb93d5ln96yhv2g64aywzmh6hdaadl8qyqx6rx7q3"; depends=[FNN lattice sp spacetime zoo]; };
   gsubfn = derive2 { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; };
-  gsw = derive2 { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; };
+  gsw = derive2 { name="gsw"; version="1.0-5"; sha256="0lv4x4is53xybgg205dncizpnqnakqk47b5wgys2kr4ixqc8jipb"; depends=[testthat]; };
   gsynth = derive2 { name="gsynth"; version="1.0.3"; sha256="07cr4lnjpqzlbsv8w35iazag89n75wy1lj7db2nh5msd9qsb1a79"; depends=[abind doParallel foreach GGally ggplot2 Rcpp RcppArmadillo]; };
   gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; };
   gtable = derive2 { name="gtable"; version="0.2.0"; sha256="0vz7073m0a2q12qzzihrfh5c2kx5jqi5l7z470fxmwqghdllh7l0"; depends=[]; };
@@ -6250,23 +6426,26 @@ in with self; {
   gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
   gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; };
   gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; };
-  h2o = derive2 { name="h2o"; version="3.10.5.2"; sha256="0r9fkgxld7n8344dc3s8ssagwm2xz96dhyxs98rxy873qbjghmg8"; depends=[jsonlite RCurl]; };
+  h2o = derive2 { name="h2o"; version="3.10.5.3"; sha256="0xk9aa87dch138k6zagcanqifs44shjv3da0yajrx4pgghl8xdmb"; depends=[jsonlite RCurl]; };
   h5 = derive2 { name="h5"; version="0.9.8"; sha256="1i7ymbqcmv8b9v8jdaqs49638m7xib5k92d62jh6h4il8l10rykx"; depends=[Rcpp]; };
   hBayesDM = derive2 { name="hBayesDM"; version="0.4.0"; sha256="0x7lpfx3d559fzkmrj3fb057zb3jm2y5l55zaqy0w7pnzgdpqnh6"; depends=[ggplot2 loo mail Rcpp rstan rstantools]; };
+  hIRT = derive2 { name="hIRT"; version="0.1.2"; sha256="0pqp6bycr13di1hbi5sqnkiannz2hyg0ysshswv2i9fp0vkhdhqf"; depends=[pryr rms]; };
   hNMF = derive2 { name="hNMF"; version="0.3"; sha256="1kil1dkh8yqm5z2krc6n73hpm5m0h2dwwz4fg2xzvk5hsbg9qff3"; depends=[NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
   hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
   haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
   hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; };
   hamlet = derive2 { name="hamlet"; version="0.9.5"; sha256="1wnklaf46fpii10md3sp2cv7qqvrha2ihhrr1kxvpm7m8xzjfqc7"; depends=[]; };
-  hansard = derive2 { name="hansard"; version="0.4.6"; sha256="1fnaw5zmj9r4hmkavpay2pi4409zq3496mvknln2mp43ig3640s6"; depends=[dplyr httr jsonlite lubridate tibble tidyr]; };
+  hansard = derive2 { name="hansard"; version="0.5.2"; sha256="121rb5805ybjafs2v9d95yyr8rqzci1gnck3wvc65g9lf5z39x0k"; depends=[dplyr httr jsonlite lubridate tibble tidyr]; };
   hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
   haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
   haplo_stats = derive2 { name="haplo.stats"; version="1.7.7"; sha256="1rag22sqy8r87w5a1dww5cxknacm6975bpp74vw9zr04ldx4c64k"; depends=[rms]; };
-  haploR = derive2 { name="haploR"; version="1.4.6"; sha256="0pd4jbf86hk8v8kv2acvi60chjcva6v3gza6zaxsgf1as43lcq8x"; depends=[httr RUnit tibble XML]; };
+  haploR = derive2 { name="haploR"; version="1.6.0"; sha256="1wa3q1746j1y4jbb3zj36mk89pfrj1xpdjg7my35dm042h1hn9xb"; depends=[httr plyr RUnit tibble XML]; };
   haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; };
   haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; };
   haplotypes = derive2 { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; };
+  happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; };
   hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; };
+  harmonicmeanp = derive2 { name="harmonicmeanp"; version="1.0"; sha256="071ysgyi8daq8q1vqzgypkz4bgaxr0iw4djv906vkfx5ywihr768"; depends=[FMStable]; };
   harrietr = derive2 { name="harrietr"; version="0.2.2"; sha256="1h6i9ls33h0dgncq6i33ig04yq7i1wy1cl1xx2nvbp78ig02klng"; depends=[ape dplyr ggplot2 ggtree lazyeval magrittr tidyr]; };
   harvestr = derive2 { name="harvestr"; version="0.7.1"; sha256="0xgxzbfbc33asfm8sl2y60ki6bwgd6vdh9nz466crkx7m9lsvll8"; depends=[digest foreach plyr]; };
   hash = derive2 { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; };
@@ -6275,10 +6454,10 @@ in with self; {
   hashmap = derive2 { name="hashmap"; version="0.2.0"; sha256="0dy5q11s5ds69yqzax7nqjjq2kfljk7m7sjh6s114bchx3wc77zg"; depends=[BH Rcpp]; };
   hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; };
   hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; };
-  haven = derive2 { name="haven"; version="1.0.0"; sha256="15ynk1qm4g9m6ng4lc1x3hwjb2xak6b795ifh5q1k4mmx07xz6dl"; depends=[BH hms Rcpp readr tibble]; };
+  haven = derive2 { name="haven"; version="1.1.0"; sha256="068x009dygwh8d3lg4i4p0h3lvzrk4bh78yh92y0lcjzjp8b97q8"; depends=[forcats hms Rcpp readr tibble]; };
   hawkes = derive2 { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; };
   hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
-  hbdct = derive2 { name="hbdct"; version="1.0.0"; sha256="1azyh12c648g8qr89n8sfrjj3svxx3lzr0ka3g7812x574iiv440"; depends=[]; };
+  hbdct = derive2 { name="hbdct"; version="1.0.1"; sha256="1lmbhl757hdswfq3skwbwsgxpfgim8475d9hk511dbwrzcm6wsxr"; depends=[]; };
   hbim = derive2 { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; };
   hbm = derive2 { name="hbm"; version="1.0"; sha256="0qz28azm91a6pbss1mfc47a21d3q9rs3mmw0kgwc7i2a2m43mysm"; depends=[doParallel foreach Matrix]; };
   hbmem = derive2 { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; };
@@ -6295,7 +6474,6 @@ in with self; {
   hdm = derive2 { name="hdm"; version="0.2.0"; sha256="01zd3b44c0rnwxwxcmsgj7w0clq4h7wrlzy4yiwvxcifiv8mgp8l"; depends=[checkmate Formula ggplot2 glmnet MASS]; };
   hdnom = derive2 { name="hdnom"; version="4.8"; sha256="0z6rj8r7v1z2f8c5vgslnzl6f09ncbpzv0l2xyiy5c78j68z16l3"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; };
   hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; };
-  hdr = derive2 { name="hdr"; version="0.1"; sha256="0dgp4442mfvri8vhicp02nrv55z13r6664x2nlcq6vh6xz9pqyl0"; depends=[httr]; };
   hdrcde = derive2 { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[ash KernSmooth ks locfit mvtnorm]; };
   hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; };
   healthcareai = derive2 { name="healthcareai"; version="0.1.12"; sha256="1ipw5y7k0m33mnpqbcwdbqzhsh65fb10kym11wc4n2pfsml498w1"; depends=[caret data_table DBI doParallel e1071 grpreg lme4 odbc pROC R6 ranger ROCR RODBC RSQLite]; };
@@ -6306,6 +6484,7 @@ in with self; {
   heatmaply = derive2 { name="heatmaply"; version="0.10.1"; sha256="0lanin04lzsf0fzy0ap055yw1bl26nnkd0d08y20fprkgz2ykh48"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis]; };
   heavy = derive2 { name="heavy"; version="0.38.1"; sha256="12s4g0m5qi4yg26p9l3qay1gfhixma66ls0kf8lkaswzgd7761hp"; depends=[]; };
   heemod = derive2 { name="heemod"; version="0.9.1"; sha256="1ga1g9azhkbn716p0hrkm5k7ab9mnlc7w74rkd8qv4f05av0b4xv"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble tidyr]; };
+  hei = derive2 { name="hei"; version="0.1.0"; sha256="1cvwdkm5c9p3cfgpgdj0r7222mzz1jghq2i5f20xh3786gx05sqd"; depends=[nhanesA]; };
   heims = derive2 { name="heims"; version="0.2.4"; sha256="07w5qy0fn7f2lz6zq52fxa2zgjfddga4p3x3c7rmq83jilhasppl"; depends=[bit64 data_table dplyr fastmatch fst lubridate magrittr]; };
   helixvis = derive2 { name="helixvis"; version="0.1.0"; sha256="1ycvgjbcghbdaw65v3b81pxf33226lr4cbk5l943jg7m738qsfhd"; depends=[rJava]; };
   hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; };
@@ -6330,6 +6509,7 @@ in with self; {
   hglm = derive2 { name="hglm"; version="2.1-1"; sha256="1vr1332db60fqbck0nplfw5dnxpb7sa3irh80k2hyx4aw74ckr2k"; depends=[hglm_data MASS Matrix]; };
   hglm_data = derive2 { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[MASS Matrix]; };
   hgm = derive2 { name="hgm"; version="1.17"; sha256="11hv4pfv3gqiargvwvrxqzfji75j291w1nilawf8yjc3isnc4wjp"; depends=[deSolve]; };
+  hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.0"; sha256="17f31xhh6kk7sx5d5dvpwpvl72wd45zgb4fcpdayx3yrm719csz9"; depends=[surveillance]; };
   hht = derive2 { name="hht"; version="2.1.3"; sha256="022a8zz2m34q89h29jglfj21knlqd8dwi85qmsi78ly1vacnzap8"; depends=[EMD fields spatstat]; };
   hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; };
   hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; };
@@ -6346,17 +6526,17 @@ in with self; {
   highSCREEN = derive2 { name="highSCREEN"; version="0.1"; sha256="0g2pcxdg5fix63jqpddqnldalg95x7ghvmbfr1ijjwi9m3ki2bby"; depends=[gplots]; };
   highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
   highcharter = derive2 { name="highcharter"; version="0.5.0"; sha256="1myypff80mxcgc3j0sflalhqz344c2zz2p90aarli1pbys9v8ynp"; depends=[assertthat broom dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlist stringr tibble tidyr xts zoo]; };
-  highfrequency = derive2 { name="highfrequency"; version="0.5.1"; sha256="15rzpddraz8a1qrbczf92jc99hb0a1538zzml6miqmmv5v7b02rj"; depends=[BMS chron cubature FKF MASS mvtnorm numDeriv robustbase rugarch sandwich timeDate xts zoo]; };
+  highfrequency = derive2 { name="highfrequency"; version="0.5.2"; sha256="1bjqjf4ki7r21mwlhrd83v8k6lknrypkl9wrax9ccr7fln7ha7wn"; depends=[BMS chron cubature FKF MASS mvtnorm numDeriv robustbase rugarch sandwich timeDate xts zoo]; };
   highlight = derive2 { name="highlight"; version="0.4.7.1"; sha256="02d507v599jmjggavgw94drfbk0cffj2m4zgl0hgq28n5fc9k1dm"; depends=[]; };
   highlightHTML = derive2 { name="highlightHTML"; version="0.1.1"; sha256="0kjs01ml4v57956rk3ch8y8kxni36gymkf830skxh4fj4nsr8hs1"; depends=[]; };
   highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; };
   highr = derive2 { name="highr"; version="0.6"; sha256="0n9v44dxdy5fhkdmpbpa2p78whyd9z3rhhy42ipdz5m5vsr55qa3"; depends=[]; };
-  highriskzone = derive2 { name="highriskzone"; version="1.3-1"; sha256="1jw2kf9i81h1chgbdhzw1hh3aq2hfiay58jkyzn4rdwmw21jkgs5"; depends=[deldir fields ks Matrix rgeos spatstat]; };
+  highriskzone = derive2 { name="highriskzone"; version="1.4-1"; sha256="0m1g6f0hj8wqp69ca2f8jpqhz71mz0a11aj70yvjk2sk1yz5hv4x"; depends=[deldir fields ks Matrix mvtnorm rgeos spatstat]; };
   hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
   hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; };
   hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
-  hisemi = derive2 { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[fda Iso Matrix]; };
-  hisse = derive2 { name="hisse"; version="1.8.2"; sha256="1cni5byx0187ss92ijs8j2dnswqb6dn6pva93bny3dylszqlyy96"; depends=[ape data_table deSolve GenSA nloptr phytools subplex]; };
+  hisemi = derive2 { name="hisemi"; version="1.1-0"; sha256="17qd0wzbap5gammaahyxg9lifznzzv65k8iqiyc8y1xw4ayq3cw7"; depends=[fda Iso Matrix]; };
+  hisse = derive2 { name="hisse"; version="1.8.4"; sha256="06lpbxz4ci4m45c3knrnmy65ymdfmbqkr0dlnqqimrricsd282sa"; depends=[ape data_table deSolve GenSA nloptr phytools subplex]; };
   histmdl = derive2 { name="histmdl"; version="0.6-1"; sha256="0vgfy49hrjcm3f8l2hb0fbn1ydh94g4xq2s116yf2c9pd0pwsbi1"; depends=[]; };
   histogram = derive2 { name="histogram"; version="0.0-24"; sha256="1jihw92zi5a4dj6lzm1qvkynv9fp6j5iy83g8rzikp276x63nb62"; depends=[]; };
   historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
@@ -6371,14 +6551,14 @@ in with self; {
   hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-4"; sha256="096flx2b9s66dasqj05zrkxsmg3lj6j5w0pwrw3b1qkpp9dvlrkb"; depends=[]; };
   hmmm = derive2 { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; };
   hms = derive2 { name="hms"; version="0.3"; sha256="127znf522r5mn3k6frhdd7pqh063bs3l85gn9h7cx50hpjf2as4k"; depends=[]; };
-  hnp = derive2 { name="hnp"; version="1.2-2"; sha256="0wcr472a6iq3zwzddqpjv649rx9c5ssrlj0qhbv4pn4sjfjv0pfx"; depends=[MASS]; };
+  hnp = derive2 { name="hnp"; version="1.2-3"; sha256="0y7vp60ah41h5aj18zqby9zb8ai0nqcnzb4xmi0mjcnf2fd370yv"; depends=[MASS]; };
   hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; };
   hoardeR = derive2 { name="hoardeR"; version="0.9.2"; sha256="0sss3ki2w0aqyp084pprycw8d8vgm60z41iq6g9nxhqhr9xy5kdw"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools httr IRanges MASS R_utils RCurl Rsamtools seqinr stringr XML]; };
   hoardr = derive2 { name="hoardr"; version="0.2.0"; sha256="13bjycnr1v524c5wxigdd3kn8bx1sgwdqb10hbmbyjxffabacafr"; depends=[digest R6 rappdirs]; };
   holdem = derive2 { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; };
   homals = derive2 { name="homals"; version="1.0-6"; sha256="1xfpb6mxfk18ad2fggljr2g01gy4c290axc3vgwngmmimmcvh4cy"; depends=[ape rgl scatterplot3d]; };
   homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; };
-  hommel = derive2 { name="hommel"; version="1.0"; sha256="1bsrwm3s4jiln7g30znmza4wl6q1mbpbpgb6zq4wbzicxddp1x7x"; depends=[Rcpp]; };
+  hommel = derive2 { name="hommel"; version="1.1"; sha256="1vrfw3zxj6hlfr5czrhmx67bjbd94whfgdmsdzlmdpmj0w5r0naz"; depends=[Rcpp]; };
   homomorpheR = derive2 { name="homomorpheR"; version="0.2-1"; sha256="0qs4yimyfqx6rpxgh6h4z7vyb3qdxljnyvw1g8pxm4y75i0v6vz5"; depends=[gmp R6 sodium]; };
   homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
   hopbyhop = derive2 { name="hopbyhop"; version="2.1"; sha256="0j4m1zz0ijf1kw2m12g7bww3418b8pyjvvrzkm8xcryjil2xfmim"; depends=[]; };
@@ -6397,7 +6577,6 @@ in with self; {
   hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; };
   hrbrthemes = derive2 { name="hrbrthemes"; version="0.1.0"; sha256="1hf4370hj80m6zr20236p9068g6ky0366gfk5l9hnj6l8jpmy9qa"; depends=[extrafont ggplot2 hunspell purrr scales stringi]; };
   hrr = derive2 { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
-  hsdar = derive2 { name="hsdar"; version="0.5.1"; sha256="0n5d05f7bh9zsjipfzf07yx71ccqdkarmmm4a1ryah7sjlg0zpil"; depends=[caret raster rgdal rootSolve signal]; };
   hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
   hsm = derive2 { name="hsm"; version="0.1"; sha256="1dacsq2f23bz94rh4s3477hs38pbrpz2lis4s1l9im894bcbny1x"; depends=[]; };
   hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
@@ -6407,24 +6586,26 @@ in with self; {
   htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; };
   htmltidy = derive2 { name="htmltidy"; version="0.3.1"; sha256="004a2wwsnx3mnm6v1mjlaq08gcgm60xahh520vfyrsp56b7j29ky"; depends=[htmltools htmlwidgets Rcpp XML xml2]; };
   htmltools = derive2 { name="htmltools"; version="0.3.6"; sha256="18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"; depends=[digest Rcpp]; };
-  htmlwidgets = derive2 { name="htmlwidgets"; version="0.8"; sha256="1df3pwl34rvdbr9sgr5h27q9bmqpckvpwq4frl3d1v614y3vfclj"; depends=[htmltools jsonlite yaml]; };
+  htmlwidgets = derive2 { name="htmlwidgets"; version="0.9"; sha256="0plqkfqys1ca3ki7sb7yc6gwjpi7yy4g3mzh7hfy8s6qri0vam0i"; depends=[htmltools jsonlite yaml]; };
   htree = derive2 { name="htree"; version="0.1.1"; sha256="1ns7yzzxapax5f355bpq81i581l1iwrfixp1k69n8mzsy106i988"; depends=[]; };
   hts = derive2 { name="hts"; version="5.1.4"; sha256="0n1gna2694yih5kaiw59crdlfcdfm9dqhjpkcwaskgrpmh08wnkd"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; };
-  httk = derive2 { name="httk"; version="1.6"; sha256="0zcgqaslmm5jkv5zagswgsilf29cvxpm0mpcj6v9cj667whznqlk"; depends=[data_table deSolve msm mvtnorm survey truncnorm]; };
+  httk = derive2 { name="httk"; version="1.7"; sha256="1l29wpb03l7lk7y4lzjpxksr96jymg4sdvh7amd6068kdch0lqqp"; depends=[data_table deSolve msm mvtnorm survey truncnorm]; };
   httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
   httpcache = derive2 { name="httpcache"; version="1.0.0"; sha256="0p0c2n1n5nrmnii9myp9blzwg996xgm15law9f073an4xvfg2kd2"; depends=[digest httr jsonlite]; };
   httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; };
   httping = derive2 { name="httping"; version="0.1.0"; sha256="1bhy5mh0hz83rjmvh7wl211nqkz58gxsgkwlkmjrdfzc2cparxjz"; depends=[httpcode httr jsonlite magrittr pryr]; };
-  httptest = derive2 { name="httptest"; version="2.0.0"; sha256="1jq65hw3h6api2018fi9sa75xz9iqiry6xhxsa566wbpwkamr1hi"; depends=[digest httr jsonlite testthat]; };
-  httpuv = derive2 { name="httpuv"; version="1.3.3"; sha256="0aibs0hf38n8f6xxx4g2i2lzd6l5h92m5pscx2z834sdvhnladxv"; depends=[Rcpp]; };
-  httr = derive2 { name="httr"; version="1.2.1"; sha256="03kkjlhyvvi5znwaxfm6cmdsg3q7ivwsvkzgabhjdj2jxs80pfg7"; depends=[curl jsonlite mime openssl R6]; };
+  httptest = derive2 { name="httptest"; version="2.1.2"; sha256="1145aca2bkqk39xp6m2vc8plh3xcgcdi5dwp1c30yifbqa3szamh"; depends=[digest httr jsonlite testthat]; };
+  httpuv = derive2 { name="httpuv"; version="1.3.5"; sha256="1sg4f223zfyd265b28rlhsn3b6mqflcpnmya98cjmjncmy9vjdj3"; depends=[Rcpp]; };
+  httr = derive2 { name="httr"; version="1.3.1"; sha256="0n7jz2digbgv48rbr9vmzv4vmf4rahl9jjy31izs7sxj4rs4s4r2"; depends=[curl jsonlite mime openssl R6]; };
   huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; };
   humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
   humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; };
   humarray = derive2 { name="humarray"; version="1.1"; sha256="1rzx53620nkicnkc41p6pzsiny8kfpw6n3y0mwvckz6ba6iyfl4w"; depends=[BiocGenerics BiocInstaller biomaRt GenomeInfoDb GenomicFeatures GenomicRanges genoset IRanges NCmisc Rcpp reader rtracklayer S4Vectors]; };
   humidity = derive2 { name="humidity"; version="0.1.1"; sha256="0ifxjz7216ld5c4kc9vs83fcijbg5i2z0mwfzszch9j1s734yc8y"; depends=[]; };
   hunspell = derive2 { name="hunspell"; version="2.6"; sha256="02z7d3s9mc2gg6ha9hwvpnxrx9vjpppjpggg8cgj88c09y943fkq"; depends=[digest Rcpp]; };
+  hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; };
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; };
+  hutils = derive2 { name="hutils"; version="0.1.2"; sha256="12hh69y0hvvbyw0p1z6r4kkbhp82vk8p5afcaq7g4y7liayfmdyh"; depends=[data_table fastmatch magrittr]; };
   huxtable = derive2 { name="huxtable"; version="0.3.0"; sha256="1h74n8vkza0n6mfzliadm2dhjy154lzjp2n917r26rra4xwjknrx"; depends=[crayon dplyr htmltools knitr lazyeval rmarkdown tibble xtable]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
@@ -6433,20 +6614,20 @@ in with self; {
   hybridHclust = derive2 { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; };
   hybridModels = derive2 { name="hybridModels"; version="0.2.9"; sha256="1y8793wqd22w042pgz8fnd83pl2jcr6afr6ss600qhphm5h6cig5"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; };
   hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
-  hydroGOF = derive2 { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[hydroTSM xts zoo]; };
+  hydroGOF = derive2 { name="hydroGOF"; version="0.3-10"; sha256="010f2i53rl4fjl65fg5wzaci0kc5khpak5v1zz9yxsj77fmrmvfy"; depends=[hydroTSM xts zoo]; };
   hydroPSO = derive2 { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc lattice lhs sp zoo]; };
-  hydroTSM = derive2 { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[automap e1071 gstat sp xts zoo]; };
+  hydroTSM = derive2 { name="hydroTSM"; version="0.5-1"; sha256="053id9ldr10mafww3vas9fiy16lz0n1mqqfg6wjsbm5r15jkz3ha"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; };
   hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; };
   hydrostats = derive2 { name="hydrostats"; version="0.2.5"; sha256="1n0wy8i1cfsgmqh898qi0qnqn4qx1srjvd05vmsf9qmhpnnyqw5m"; depends=[]; };
   hyfo = derive2 { name="hyfo"; version="1.3.9"; sha256="03f3irmhndwfnv4i121gwxb2yv1868pggzyr80pgp4969qzddacm"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
   hyper_fit = derive2 { name="hyper.fit"; version="1.0.3"; sha256="17f5i2i960796hl92y7ci9ffspway435r02kw1zk91lvfn927hng"; depends=[LaplacesDemon magicaxis MASS rgl]; };
-  hyper2 = derive2 { name="hyper2"; version="1.0"; sha256="1lblc7kcgcgg65z9fa7wzd9962hbqdnp4mxm0m39g90lqpciy948"; depends=[partitions Rcpp]; };
+  hyper2 = derive2 { name="hyper2"; version="1.0-1"; sha256="107cp6na0srqax42fmvcsrviy631hg6phqmkc0cxz1zdxxxw6442"; depends=[partitions Rcpp]; };
   hyperSMURF = derive2 { name="hyperSMURF"; version="1.1.2"; sha256="1jlcfwyqs2mfdixqik5dqb0sl3i9pjxcrwabbcr24z8wnq524zx8"; depends=[doParallel foreach iterators randomForest unbalanced]; };
   hyperSpec = derive2 { name="hyperSpec"; version="0.98-20161118"; sha256="0343prdah83l45z6p2wafmipw2x3f0yshm5hm11wgkkm1cnv5905"; depends=[ggplot2 lattice latticeExtra svUnit]; };
   hypergea = derive2 { name="hypergea"; version="1.3.3"; sha256="0spchrbb5y3yx63acs9ns256h7k3nd5wxg8vw258kqlvyapj50l6"; depends=[]; };
   hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; };
   hypersampleplan = derive2 { name="hypersampleplan"; version="0.1.1"; sha256="1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq"; depends=[]; };
-  hypervolume = derive2 { name="hypervolume"; version="1.4.1"; sha256="0gx9ing4h1sg4zzppfa386hllryf8vk1n013yv14c0k3sjjnz456"; depends=[fastcluster geometry ks MASS Rcpp RcppArmadillo rgl]; };
+  hypervolume = derive2 { name="hypervolume"; version="2.0.7"; sha256="1j348xw41yafgs8fpvlsy5gbhbng5m839rc3p0w9h961p6q69f0j"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; };
   hyphenatr = derive2 { name="hyphenatr"; version="0.3.0"; sha256="0mv77njy0ha7bj3kw620fk9r8cdzqd0v3ipikihqxq47fr57ml0v"; depends=[Rcpp stringi]; };
   hypoparsr = derive2 { name="hypoparsr"; version="0.1.0"; sha256="1bldiz5j6h9z499wwz8cbg5vshdmxgcd8qfxkz1a45q8b6nsd4vf"; depends=[data_tree readr RecordLinkage tibble]; };
   hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
@@ -6460,6 +6641,7 @@ in with self; {
   iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; };
   iClick = derive2 { name="iClick"; version="1.2"; sha256="04d82wbddvj73cw6ys492nasvxcj8m5594zf9r41y72i5yha11pa"; depends=[fBasics forecast lattice lubridate openair rugarch timeDate timeSeries]; };
   iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
+  iDINGO = derive2 { name="iDINGO"; version="1.0.0"; sha256="1773rsjcjcmm5hc3qx2hnwq9ifvjdc5dcgrzibkd6l55ki049njp"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; };
   iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; };
   iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; };
   iECAT = derive2 { name="iECAT"; version="0.8"; sha256="0kv8db7ss3vk21ccl8qfj4x69npfzwmm3piddj9l0vwrwd3ccl32"; depends=[MetaSKAT SKAT]; };
@@ -6473,6 +6655,7 @@ in with self; {
   iNEXT = derive2 { name="iNEXT"; version="2.0.12"; sha256="1041r5k0k3kzik5vwyd62s4yc85lnnxbg5gbbl0kl629kikymb6y"; depends=[ggplot2 reshape2]; };
   iNOTE = derive2 { name="iNOTE"; version="1.0"; sha256="1969xmgfv9405r09zpd2icvjd9vvzw4dx5qaqxk1a0jvbvhp3h88"; depends=[CompQuadForm mixtools plyr]; };
   iNextPD = derive2 { name="iNextPD"; version="0.3.2"; sha256="06wka2qr1jm3hvi8j0b19fr21v72gmqknz8dg0l5wl91m0prqns3"; depends=[ade4 ggplot2 iNEXT Rcpp]; };
+  iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; };
   iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; };
   iRefR = derive2 { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; };
   iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; };
@@ -6487,7 +6670,7 @@ in with self; {
   ibelief = derive2 { name="ibelief"; version="1.2"; sha256="1zh6bpg0gaybslr1p05qd5p2y5kxbgyhgha4j4v5d69d78jwgah9"; depends=[]; };
   ibm = derive2 { name="ibm"; version="0.1.0"; sha256="0g6wg2qpa4q142xw2vq5pca4ll6pb8hyll5g0c93kk8crddk51s7"; depends=[Rcpp]; };
   ibmcraftr = derive2 { name="ibmcraftr"; version="1.0.0"; sha256="0zm5j0a1wjj5agibp38h73qxpq0njvrhfq3077xhhfizcb3v24sb"; depends=[Rcpp]; };
-  ibmdbR = derive2 { name="ibmdbR"; version="1.48.0"; sha256="0kz08p61v12kgv1k1zrgh8mimhvnffy2fgck21gxbsa03sdi144i"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; };
+  ibmdbR = derive2 { name="ibmdbR"; version="1.49.0"; sha256="1rr64gwdy65njy0a52y3vncp7hlkp0mmq5ik92xbs49f4vagz58a"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; };
   ibr = derive2 { name="ibr"; version="2.0-3"; sha256="1plyz4sl0i8qhk9dh3h7zvh9h8wqr589jvasmvp7r3slp4ndhp1r"; depends=[mgcv]; };
   ic_infer = derive2 { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[boot kappalab mvtnorm quadprog]; };
   ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
@@ -6497,29 +6680,31 @@ in with self; {
   icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; };
   icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
   icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; };
-  iccbeta = derive2 { name="iccbeta"; version="1.0.1"; sha256="1594kzxng679pjlfmf4b6b9ynskh43aahbr01d0fadxl38kh36sz"; depends=[lme4 Rcpp RcppArmadillo]; };
+  iccbeta = derive2 { name="iccbeta"; version="1.1.0"; sha256="1xw0mz3ipkfz1jsjzwjnrm0af1gs31js7nvgy79cxqz31955zjww"; depends=[Rcpp RcppArmadillo]; };
   icd = derive2 { name="icd"; version="2.2"; sha256="0yf7xyzwvgfcbccsz89nywkrfg9hp8m2l7pn28kwxn5k0jnm1cmw"; depends=[checkmate magrittr Rcpp testthat]; };
   icd9 = derive2 { name="icd9"; version="1.3.1"; sha256="0yrgg1vf9jf0kv4qbvc0d8n26csxx79g2196ijgq43rhprrrm1y6"; depends=[checkmate fastmatch Rcpp]; };
   icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; };
-  icenReg = derive2 { name="icenReg"; version="2.0.1"; sha256="16a9v461gsyhx8hf938c17zx81383kmxkbmyb97q6z6gnkdy2ck0"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
+  icenReg = derive2 { name="icenReg"; version="2.0.2"; sha256="1k287mn1xf99vj5am96zvhl5if6qkm23rdnmcc924dw04lrdicc3"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
   icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
   icesAdvice = derive2 { name="icesAdvice"; version="1.3-1"; sha256="1afkb5f48f03l9hcjv7xgm6nindk4gn6f38k51pf31a7rxg0114x"; depends=[]; };
   icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; };
   icesSAG = derive2 { name="icesSAG"; version="1.3-2"; sha256="1w3v10qjs9jyn7dp6vsv8hyax8mn2b8y5afba4lcpzh0p8d2yzpm"; depends=[httr icesVocab openssl png xml2]; };
   icesTAF = derive2 { name="icesTAF"; version="1.3-2"; sha256="044n8jar0dx6zggd5nr9xvfc18yhcgj82643xnq6ymdfw3c57fav"; depends=[]; };
   icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; };
+  icmm = derive2 { name="icmm"; version="1.0"; sha256="01raszc1phz0iqb4gm6jsrpkdrrxvbnb1cnr9g4232fzbcmcraam"; depends=[EbayesThresh]; };
   icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl sp]; };
   icpsrdata = derive2 { name="icpsrdata"; version="0.3.0"; sha256="17sprbbi8fmvcp8d7hwrxl5amg0j036wq483cw62zbmni3p3fl82"; depends=[httr purrr rvest]; };
   icsw = derive2 { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; };
   idar = derive2 { name="idar"; version="1.0"; sha256="1yfv3na4rcldkpzybf7la227z4ynsl1scrziirl5gp072k7zrs01"; depends=[ape FD picante spatstat]; };
   idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
   idbr = derive2 { name="idbr"; version="0.2"; sha256="1hhwn93arkzqs5ns9ll7rwqq5gyngixbicly9asw0dgjn12n5p7x"; depends=[countrycode dplyr httr jsonlite]; };
-  idefix = derive2 { name="idefix"; version="0.1.0"; sha256="04a74i71980ywbn6bbhkazaackd5c1417spv8nfvsam4isv2jdjv"; depends=[dplyr gtools MASS maxLik scales]; };
-  idem = derive2 { name="idem"; version="2.0"; sha256="0skm5jax8z3wviw9cfsdi5jpxl9jv4y8w7j45sy9inax9hr706kg"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; };
+  idefix = derive2 { name="idefix"; version="0.1.2"; sha256="00whk6w8mfh8z7l4lhb7c26yniq9a59ja1qfiy6dsxfdcbwdbcnd"; depends=[dplyr gtools MASS maxLik Rdpack scales]; };
+  idem = derive2 { name="idem"; version="2.2"; sha256="1kgz5126qm6iqx4w2msfw8nmh4ym9jjkxg16m6z5i1lg3vrpzjkj"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; };
   idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; };
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
   ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; };
   idm = derive2 { name="idm"; version="1.8.1"; sha256="14cy1gv12wjpsv5jih7pgq5d36gfpdc56ih4mc6hx638qkkyk87z"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; };
+  idmTPreg = derive2 { name="idmTPreg"; version="1.0"; sha256="0lqig005zln84670pglifnhc9g4nz7g7gfkl476a4q4q920pn9ll"; depends=[doParallel foreach survival]; };
   idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
   ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; };
   ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; };
@@ -6533,7 +6718,7 @@ in with self; {
   ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; };
   ifultools = derive2 { name="ifultools"; version="2.0-4"; sha256="0pv2msaa1rmj8csxdclzi2jwg9pfdvh87blj9j3xa3myisglq092"; depends=[MASS splus2R]; };
   ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
-  igraph = derive2 { name="igraph"; version="1.0.1"; sha256="00jnm8v3kvxpxav5klld2z2nnkcpj4sdwv4ksipddy5mp04ysr6w"; depends=[irlba magrittr Matrix NMF]; };
+  igraph = derive2 { name="igraph"; version="1.1.2"; sha256="1v26wyk52snh8z6m5p7yqwcd9dbqifhm57j112i9x53ppi0npcc9"; depends=[irlba magrittr Matrix pkgconfig]; };
   igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; };
   igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; };
   igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
@@ -6544,7 +6729,7 @@ in with self; {
   imageData = derive2 { name="imageData"; version="0.1-26"; sha256="0r39bp33kki2ddvds2jkpk1r6afl8d1xbl447lnz25dxpzfcajn2"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
   imager = derive2 { name="imager"; version="0.40.2"; sha256="17awk431r37259c0yqs6c31kyiwhm9j80g2hw9hkk21jbi4jbghj"; depends=[Cairo downloader jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; };
   imaginator = derive2 { name="imaginator"; version="0.1.1"; sha256="1xp5wsv570f1qy2fn99d8ijydmlapb6h6kinj07pilvv215dg93w"; depends=[assertthat dplyr lubridate magrittr stringi]; };
-  imagine = derive2 { name="imagine"; version="1.2.2"; sha256="1b20dhgybw7ilkh6mg5acb3xywd7ms62hd7fmzbwrxz60jh0h1lg"; depends=[Rcpp]; };
+  imagine = derive2 { name="imagine"; version="1.3.1"; sha256="0sgzsyqqfi7rcs2xqxdc6f9kji09wsa38lxv7k2vymy3kdy8p9f6"; depends=[Rcpp]; };
   imfr = derive2 { name="imfr"; version="0.1.4"; sha256="0q6iy6arq2c0gqcpnpr2safig3ki32m2gai1lmz19pwcfi9qkgf2"; depends=[dplyr httr jsonlite]; };
   imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; };
   immer = derive2 { name="immer"; version="0.8-5"; sha256="181mp407vy2ij35ggr1vi80y8ak6vyjplyvps1fdpxnanp1mqpw3"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; };
@@ -6565,8 +6750,9 @@ in with self; {
   inTrees = derive2 { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; };
   inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
   inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; };
+  incR = derive2 { name="incR"; version="0.3.1"; sha256="1dml24yg64yxq6xb88nkyi7hvkc13v8l5xxmflkpnfqn0y1rdi9s"; depends=[dplyr lubridate maptools rgeos]; };
   inca = derive2 { name="inca"; version="0.0.2"; sha256="1wj8f1ga0km9k9zrjcd7g228kw2pp6y6pgnfwmgdd05bx4hzjhdw"; depends=[Matrix Rcpp RcppArmadillo]; };
-  incadata = derive2 { name="incadata"; version="0.5.3"; sha256="1mzwd9nida5spsqr5jayp3wn1h3cbv0amc5iyxx6h51gn0pwspkz"; depends=[backports decoder dplyr rccmisc sweidnumbr]; };
+  incadata = derive2 { name="incadata"; version="0.6.1"; sha256="05i0zifdzc1w6p6annhzp9rdd4v82gx2sxi4lqpdnraaczdrhgbb"; depends=[backports decoder dplyr rccmisc rvest sweidnumbr xml2]; };
   incidence = derive2 { name="incidence"; version="1.2.0"; sha256="1y731qaj9yj2sjqly0s6z4c4qi3ywvnzc3517y23zvzfxlsld8r3"; depends=[ggplot2 ISOweek]; };
   inctools = derive2 { name="inctools"; version="1.0.10"; sha256="0ykkxlifh9gxflbk9786xbx2i5ja3pn01z9dj8dqwvrrq83npcfw"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr MASS plyr pracma]; };
   indelmiss = derive2 { name="indelmiss"; version="1.0.7"; sha256="1pm1yl7kbxrik5ghvsvp6irmzgawxb8v03kvrqm48mnbghkdh1lv"; depends=[ape numDeriv phangorn Rcpp]; };
@@ -6580,18 +6766,19 @@ in with self; {
   influence_ME = derive2 { name="influence.ME"; version="0.9-9"; sha256="0f6d2hvs9qllyfpsp2cgh7w8yjxafclbk47n8av7j9zpp7s5yg9v"; depends=[lattice lme4 Matrix]; };
   influence_SEM = derive2 { name="influence.SEM"; version="2.1"; sha256="1qhv640lngwrbdfqvw2x0x4zwv0aqzxwyfdpnivzjf5pw58nya5s"; depends=[lavaan]; };
   influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; };
+  influxdbr = derive2 { name="influxdbr"; version="0.13.0"; sha256="0pab0ad98jdqpansshk5a9dlx9a3s3h51npk2ha9anaiykpdpp94"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr xts zoo]; };
   infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.0"; sha256="1gmsf4gw6xf70sh7y5hagkavknp80293sb7wgx6lycngq2acmi4w"; depends=[MASS]; };
   informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; };
   infotheo = derive2 { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; };
   infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; };
   infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.5"; sha256="1bgjfhwkbd0y1iwxq3qh80kshsd9g1r1gg99lr75n2i61qnnimnf"; depends=[fields]; };
-  infuser = derive2 { name="infuser"; version="0.2.6"; sha256="1b18476k17kkj2aq5icw8rlrla8ax1h6nx08jjn9pcx02p3lm1ni"; depends=[]; };
+  infuser = derive2 { name="infuser"; version="0.2.7"; sha256="0dr5xl81mps46da040xjbm8b42m58aa3zzrprm6ysh4ivcbw368l"; depends=[]; };
   infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
   ini = derive2 { name="ini"; version="0.2"; sha256="0dzy2zzzczs7xnnm7v6achd6qsy2wbrvsgahkgbsrpvwxpcb79bp"; depends=[]; };
   injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; };
   inline = derive2 { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; };
   inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
-  inlmisc = derive2 { name="inlmisc"; version="0.2.6"; sha256="1bgf31k3xmqmw8wsmz8z4b7d7jzivr9yxy7w9cy4vdiz05i3v96p"; depends=[dplyr igraph knitr raster rgdal rgeos sp]; };
+  inlmisc = derive2 { name="inlmisc"; version="0.3.2"; sha256="1alxbn5x7gvk0na3d670ny3cxafshk7fwwx4hmd9gm1icc7krxjb"; depends=[dplyr htmlwidgets igraph knitr leaflet raster rgdal rgeos sp]; };
   inpdfr = derive2 { name="inpdfr"; version="0.1.5"; sha256="161p45hj5h6yxn9w140gkcsj2y90lqc8avsj2dsg3gnzyks07as1"; depends=[ca cluster entropart metacom R_devices RColorBrewer RGtk2 SnowballC stringi tm wordcloud]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
   insol = derive2 { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
@@ -6604,13 +6791,15 @@ in with self; {
   intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; };
   intamap = derive2 { name="intamap"; version="1.4-1"; sha256="1shyxlps1rxqavrvg55gw0c9115q0j3yw78ilavig7036zx5lazv"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; };
   intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[automap gstat intamap spatstat spcosa]; };
+  integIRTy = derive2 { name="integIRTy"; version="1.0.5"; sha256="13p1r3rccsmaqwn0mrskr86jpww72aaq8zf2a8rnbpzkfrq9ni14"; depends=[abind doParallel foreach ltm MASS mclust]; };
   interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
   interactionTest = derive2 { name="interactionTest"; version="1.0.1"; sha256="021qsg9rglc4vj3hkrvfm2snd77zna7ql2i0m5hf77yzxxc35jc6"; depends=[]; };
   intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; };
   interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
   interflex = derive2 { name="interflex"; version="1.0.3"; sha256="07a41rx553i6rlgcl4aa2xxkdql3y7bi84h2pgak9qbyxgw6mlmq"; depends=[doParallel foreach ggplot2 Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; };
+  interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; };
   intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
-  interim = derive2 { name="interim"; version="0.6.0"; sha256="1nvkc7qald6aw3b2dh9fc52bqkbx12bmwlyhfx7fm0c9077h316r"; depends=[]; };
+  interim = derive2 { name="interim"; version="0.7.0"; sha256="05hgypckfjb9pr60cv6m8lgqibdkgksw13gy8g1rmd9njs6qcb8i"; depends=[]; };
   internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; };
   interp = derive2 { name="interp"; version="1.0-29"; sha256="08f8hg6jcz4k0fsj6sjdki3v3h6fl4597s5r7vm55mnnnzqqlaly"; depends=[deldir Rcpp RcppEigen]; };
   interplot = derive2 { name="interplot"; version="0.1.5"; sha256="0svhs7mj987vravirhmp4788qvqm32v614qj7q06b2y4va477yj8"; depends=[abind arm dplyr ggplot2]; };
@@ -6648,8 +6837,9 @@ in with self; {
   iptools = derive2 { name="iptools"; version="0.4.0"; sha256="0c3j5sl129xl75p14qr880ll1y3yss3zqg39zbj2jp6wcv9rvafx"; depends=[AsioHeaders BH ISOcodes Rcpp]; };
   ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; };
   iqLearn = derive2 { name="iqLearn"; version="1.4"; sha256="0vgnfr6x6f6qlnag63brnkdymlmm2vbkl8fg02w98qsc48lal454"; depends=[]; };
-  iqspr = derive2 { name="iqspr"; version="1.1"; sha256="0s04q8imfgxxx4rizcwax2hnyxl4pb8s883nbk62db4hp6g3v1a5"; depends=[rcdk]; };
-  irace = derive2 { name="irace"; version="2.3"; sha256="1jblrhcvbp8krk51df9qnm0q2rnvjc4mmmrhv3jcfihq3f49h3xk"; depends=[]; };
+  iqspr = derive2 { name="iqspr"; version="2.3"; sha256="190d0mc36l3ggh62km3z7ylhi9f0wp4brkwmm72qjqbm1przvk0w"; depends=[doParallel fingerprint ggplot2 glmnet gridExtra kernlab ranger rBayesianOptimization rcdk tictoc xgboost]; };
+  irace = derive2 { name="irace"; version="2.4"; sha256="07xzg4jcq0rjdq1drs3xh02y29z1gmkjkw54apmaqzc0s1pwzkk4"; depends=[]; };
+  ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; };
   irlba = derive2 { name="irlba"; version="2.2.1"; sha256="0zfb7x1701n6gask0f8y2yq0vmb82xkxf6limp43ivx551hx600s"; depends=[Matrix]; };
   irr = derive2 { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; };
   irtDemo = derive2 { name="irtDemo"; version="0.1.2"; sha256="1kbab06lwldyp5ra71rgn4habq6yl6ggl5km1sj9bbqa6n4gqvwz"; depends=[fGarch shiny shinydashboard]; };
@@ -6660,7 +6850,7 @@ in with self; {
   isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
   isdparser = derive2 { name="isdparser"; version="0.2.0"; sha256="061wi94rj3iyvf3dgvcjy0x46hvwhr4ifx0jhirz44bj0c8g3h7j"; depends=[data_table tibble]; };
   isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; };
-  island = derive2 { name="island"; version="0.1.2"; sha256="0b7i1j7prb5v5392cl1n0w9migx4dl6f1ys4d2g82hd9l0y1m6nm"; depends=[]; };
+  island = derive2 { name="island"; version="0.1.3"; sha256="1wb44zyfkgk62aidw5qg660473dxh9nyahmxzxn7ffmi8a0hmdnf"; depends=[]; };
   ismev = derive2 { name="ismev"; version="1.41"; sha256="19vmjgz1baqkryi34ffhjznc46z3zwqaqblwafhk9fd50xgn4bi6"; depends=[mgcv]; };
   isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; };
   isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
@@ -6670,10 +6860,11 @@ in with self; {
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
   issueReporter = derive2 { name="issueReporter"; version="0.1.0"; sha256="18s35f5d30vivmlcg0ycni3r8mrf4gnn7x10qdcnpisrlsjx6jbd"; depends=[httpuv httr jsonlite rmarkdown tint]; };
   isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; };
+  italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; };
   itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; };
-  itcSegment = derive2 { name="itcSegment"; version="0.5"; sha256="130bvpx23yl7mp64salqwhgfzixxdvwsrpyl7qvmdya9lg8sn8y0"; depends=[maptools raster rgeos sp]; };
+  itcSegment = derive2 { name="itcSegment"; version="0.6"; sha256="0wzp84p6cysk2488p9g9p0r8950ry5wqg13kd34yixzp9m3rx0w4"; depends=[maptools raster rgeos sp]; };
   iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
-  iterLap = derive2 { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; };
+  iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; };
   iterators = derive2 { name="iterators"; version="1.0.8"; sha256="1f057pabs7ss9h1n244can26qsi5n2k3salrdk0b0vkphlrs4kmf"; depends=[]; };
   iterpc = derive2 { name="iterpc"; version="0.3.0"; sha256="1l1qsjmqwabbmrvl4rx50fynn1p62f0g48hkx71p3gv9asr4zifz"; depends=[gmp iterators Rcpp]; };
   itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; };
@@ -6681,13 +6872,15 @@ in with self; {
   itree = derive2 { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
   itsadug = derive2 { name="itsadug"; version="2.2"; sha256="01a80a6vni3g4xph3p8i0jrlqgqhdyswhv7w6vbxhbmawbzffxyx"; depends=[mgcv plotfunctions]; };
   itsmr = derive2 { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; };
+  itunesr = derive2 { name="itunesr"; version="0.1"; sha256="0vfn3vvbfl0ckgr50449xffj8726wsa120ibppbzhalp8rb6hq4a"; depends=[curl jsonlite lubridate xml2]; };
   ivbma = derive2 { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; };
   ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
   ivlewbel = derive2 { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm lmtest plyr]; };
-  ivmodel = derive2 { name="ivmodel"; version="1.6"; sha256="109jazvzbwvxr12f2377pmvfcccgyq27vxsfb3lzkfjwyvn6sr96"; depends=[Formula Matrix]; };
+  ivmodel = derive2 { name="ivmodel"; version="1.7"; sha256="05rw76yhppm0sii49lilnss4czc65an5s7l964f16xxas6f54hd0"; depends=[Formula ggplot2 Matrix reshape2]; };
   ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; };
   ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
   ivprobit = derive2 { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; };
+  ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; };
   jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
   jaatha = derive2 { name="jaatha"; version="3.2.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; };
   jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; };
@@ -6697,6 +6890,7 @@ in with self; {
   james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
   janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; };
   janitor = derive2 { name="janitor"; version="0.3.0"; sha256="1x2598yv6r2z4q13vbzsqns6d4q0bki97sqsm67pp77djpw8wkay"; depends=[dplyr magrittr tidyr]; };
+  jcolors = derive2 { name="jcolors"; version="0.0.1"; sha256="0a5p8778s14rk7xsivmb0g0c4kzdvbhyxsl8v1lk3cpq6898zv2d"; depends=[ggplot2 scales]; };
   jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; };
   jiebaR = derive2 { name="jiebaR"; version="0.9.1"; sha256="1qv4k5fgi40ppivdk3mxkhawyf2443h2lz5b9gvai9sqj6vf0s8k"; depends=[jiebaRD Rcpp]; };
   jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
@@ -6704,12 +6898,12 @@ in with self; {
   jmetrik = derive2 { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
   jmotif = derive2 { name="jmotif"; version="1.0.2.900"; sha256="0zgj1g8vy2cj2kyschbr1xb1mb862gniva0sa8qr9p8vvb03ja4v"; depends=[Rcpp RcppArmadillo]; };
   jmuOutlier = derive2 { name="jmuOutlier"; version="1.3"; sha256="1lzqpdy2987szihsjaq6l1iggjhji0li4cj7914myj3vzfcif8gw"; depends=[]; };
-  jmv = derive2 { name="jmv"; version="0.7.3.5"; sha256="0bkdcygpc8xdc07p4sjrsf9gzc5617cybdh7xhaxdy44niykppnc"; depends=[afex BayesFactor car GGally ggplot2 GPArotation jmvcore lavaan lsmeans multcomp mvnormtest PMCMR psych R6 vcd vcdExtra]; };
-  jmvcore = derive2 { name="jmvcore"; version="0.5.5"; sha256="1i9pvv1yvz05grxxm2cccz092mk3asmrvq194pa99vq7g68hwn3c"; depends=[base64enc R6 rjson]; };
+  jmv = derive2 { name="jmv"; version="0.7.5.6"; sha256="0kkjschr24635nar2jwaq14nvavjcpj5sbikdb2bhs5b983ij98y"; depends=[afex BayesFactor car GGally ggplot2 GPArotation jmvcore lavaan lsmeans multcomp mvnormtest PMCMR psych R6 vcd vcdExtra]; };
+  jmvcore = derive2 { name="jmvcore"; version="0.7.1"; sha256="1dfr5kgylax8m8hx3cbifiq32dcrj6dawbzacanvb50rcfizn6n4"; depends=[base64enc R6 rjson]; };
   jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; };
   joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; };
-  joineR = derive2 { name="joineR"; version="1.2.0"; sha256="0zqzl4f8bl5qgvcfydkb0mm4cw0jzp8pbbixa7rivxvby4vwqmyx"; depends=[lattice MASS nlme statmod survival]; };
-  joineRML = derive2 { name="joineRML"; version="0.2.2"; sha256="1hrimz7iw74343f0frlhm6mxrsi5vnng5g14x6bvzlh53s2r4x8z"; depends=[ggplot2 lme4 MASS Matrix nlme Rcpp RcppArmadillo survival]; };
+  joineR = derive2 { name="joineR"; version="1.2.1"; sha256="05q8wky14j36c09qn9sgrp90wswj9x2s438vfaqf4m1znpgv4h3g"; depends=[lattice MASS nlme statmod survival]; };
+  joineRML = derive2 { name="joineRML"; version="0.3.0"; sha256="04v6nqrq4yw3i5xgc4rsqfyb1a4q7iyhlsyq7mhpwydzxxg7nwdg"; depends=[ggplot2 lme4 MASS Matrix mvtnorm nlme Rcpp RcppArmadillo survival]; };
   joint_Cox = derive2 { name="joint.Cox"; version="2.12"; sha256="1g79afhrs6xf4rk2h00v11pw6r9539ds7qhsy5vra4sa79qqfa1g"; depends=[survival]; };
   jointDiag = derive2 { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; };
   jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; };
@@ -6718,25 +6912,27 @@ in with self; {
   jose = derive2 { name="jose"; version="0.1"; sha256="1cvrjcx902pbh9xryph1kilmyf0rmbk671jvqd19a2kfwpcw7gqc"; depends=[jsonlite openssl]; };
   jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
   jpmesh = derive2 { name="jpmesh"; version="0.3.0"; sha256="0sv199f72l5wczqlvyykpcjap68lw11pdv6lwl47ynz350vxdzlm"; depends=[broom dplyr foreach geojsonio leaflet magrittr miniUI purrr readr rgdal shiny sp tibble tidyr]; };
+  jpndistrict = derive2 { name="jpndistrict"; version="0.2.0"; sha256="106i3mxxlfj2mq0ghymp39i70mc1w71mrycza31dpccmp1k9habd"; depends=[dplyr leaflet magrittr miniUI readr sf shiny stringi tibble]; };
   jqr = derive2 { name="jqr"; version="0.2.4"; sha256="1w4832pymnavgrlhldqg1mdf0bkd3rwfywgd98hxik51yadfszjb"; depends=[BH lazyeval magrittr Rcpp]; };
   jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; };
   jrvFinance = derive2 { name="jrvFinance"; version="1.03"; sha256="16mki26ns593xn1p1la2ihkddlwvzwdvjr3h2vz71bq5db11iffq"; depends=[]; };
-  js = derive2 { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; };
+  js = derive2 { name="js"; version="1.1"; sha256="1xsdr14k4djcd1nqybvfzhviics4igsj8yz3r0j2nqhin2wjynlf"; depends=[V8]; };
   jsonld = derive2 { name="jsonld"; version="1.2"; sha256="1y4574ai4m31x4yjx5bp9i8wfgcgjgfr8jn5nn0x6qzlnjg58gyz"; depends=[curl jsonlite V8]; };
   jsonlite = derive2 { name="jsonlite"; version="1.5"; sha256="00lfg464jhf7k01bal9pcjvbdf5cxk6xi2h46hccp1x3h883g434"; depends=[]; };
   jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; };
-  jtGWAS = derive2 { name="jtGWAS"; version="1.5"; sha256="01f1wrbgj7v6pzrx5vd8pgpm78fanyx59s84m5a5732q5g39shlk"; depends=[Rcpp]; };
-  jtools = derive2 { name="jtools"; version="0.4.5"; sha256="0mqw9i0191kszw4qw9jkb8y26v2x2c9sx9gz7hccd015nl6vra4s"; depends=[]; };
+  jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; };
+  jtools = derive2 { name="jtools"; version="0.5.0"; sha256="04v2nw3k3k82vrs7n90njkjjmblqjr59kyhnq7arnmy308cb453v"; depends=[]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
   jug = derive2 { name="jug"; version="0.1.7"; sha256="01m6hyr26f6zih49pz2bmmr8ypdl1qiz0wv3padcy68kaccf44a4"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; };
-  junr = derive2 { name="junr"; version="0.1.1"; sha256="1rkr6kyf2p3rr39w0nqfvcrcd2b0r411if7812zijnn20vrmsmda"; depends=[httr jsonlite]; };
+  junr = derive2 { name="junr"; version="0.1.2"; sha256="1b1x0fma51wapchia49351wig57fgwc5sw7xsm8rb1g30k294rkz"; depends=[httr jsonlite]; };
   jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; };
   jwutil = derive2 { name="jwutil"; version="1.1.1"; sha256="114vph86722v89iwyla7skl06cv87ymfy6nmca5iyxwx1z78zddz"; depends=[checkmate Rcpp]; };
-  kSamples = derive2 { name="kSamples"; version="1.2-6"; sha256="1pbam0zqq44slpxdgl2s2fsfdgl7i0pgm8bzlvnm0fy0na24bgdj"; depends=[SuppDists]; };
-  kableExtra = derive2 { name="kableExtra"; version="0.2.1"; sha256="1ralhjxf3rhjf40kqpxgz6i75fscjdk3h8xvz7i4mp5cmig7lpp0"; depends=[knitr magrittr rmarkdown rvest stringr xml2]; };
+  kSamples = derive2 { name="kSamples"; version="1.2-7"; sha256="0f19rjngk0lg6s8c6h5l55qpxp8sl4vxj3kpi05cizzncny9b9bj"; depends=[SuppDists]; };
+  kableExtra = derive2 { name="kableExtra"; version="0.4.0"; sha256="01zp3q78rs7nwmh6xdzjyk108b4bmdn531rpgiim0rvvci6gyj46"; depends=[knitr magrittr readr rmarkdown rvest stringr xml2]; };
   kamila = derive2 { name="kamila"; version="0.1.1.1"; sha256="06jl868i8a6zg3pyaf1r6ccd33ya5f83apc5w6d3m111dzdqqlcy"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; };
-  kangar00 = derive2 { name="kangar00"; version="1.0"; sha256="0q717pp9iip77fclhrancmp3z711qipj6030l67k1h52vylvnp2c"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; };
+  kangar00 = derive2 { name="kangar00"; version="1.1"; sha256="1rm3mjghgfq8fliha6flqvcb6m4xag1697c0q5smg515453l0s0p"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; };
   kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; };
+  kaphom = derive2 { name="kaphom"; version="0.1.0"; sha256="19wqk0mngxfisgza12a642bbikjhf9z4zbm442wj5nr0n4f7j7ss"; depends=[]; };
   kappaSize = derive2 { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
   kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; };
   kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; };
@@ -6751,11 +6947,12 @@ in with self; {
   kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; };
   kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; };
   kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; };
+  keras = derive2 { name="keras"; version="2.0.5"; sha256="12f7b1fyaj8gwj9j4fzw32zkn72a0x7z0hjnphv04wp97wagsb31"; depends=[magrittr R6 reticulate tensorflow tfruns]; };
   kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
   kergp = derive2 { name="kergp"; version="0.2.0"; sha256="1xamj19v84m1f9ls8ac8xbm6airyjf96i1l48yy4l2rvjdmx6m9l"; depends=[doParallel MASS numDeriv Rcpp testthat]; };
   kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.2"; sha256="04bdggxvggmppp289n2zw6ijdm7y05gws6z7bp6fr8n1zsxy2w3c"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; };
-  kerndwd = derive2 { name="kerndwd"; version="2.0.0"; sha256="17zys29ybfgqlgp65yzj339qgpnwr668f82iiv4ap6w7ry40r2l1"; depends=[]; };
+  kerndwd = derive2 { name="kerndwd"; version="2.0.1"; sha256="1grinlqjjsxw1x152f9y38lhijh74zc831ddc0lk2niq2rvzszdw"; depends=[]; };
   kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; };
   kernelboot = derive2 { name="kernelboot"; version="0.1.1"; sha256="0pg05k87x97bpjnxi1dvfik5kykmgyy7njmn03mmrcrqwfl79kdz"; depends=[future Rcpp]; };
   kernlab = derive2 { name="kernlab"; version="0.9-25"; sha256="0qnaq9x3j2xc6jrmmd98wc6hkzch487s4p3a9lnc00xvahkhgpmr"; depends=[]; };
@@ -6765,7 +6962,7 @@ in with self; {
   keypress = derive2 { name="keypress"; version="1.1.1"; sha256="0w8hcxxx47zyz2cbz2s8va2rfb6s2ziw9ck1slq9kh3aqsx3i9g0"; depends=[]; };
   keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; };
   kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
-  kgschart = derive2 { name="kgschart"; version="1.2.3"; sha256="0rphi8jl3x7lh3d7xix9fhprcia3ix99pvg7pkb7gyaynvw2z3l9"; depends=[abind deepnet ggplot2 gridExtra magrittr nnet png shiny stringr]; };
+  kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; };
   kimisc = derive2 { name="kimisc"; version="0.3"; sha256="1cdjhfdfidilvz0w92xfjwwnp2h73y8l1n7fxnh5jsv6wnx491l4"; depends=[plyr pryr]; };
   kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; };
   kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
@@ -6787,31 +6984,35 @@ in with self; {
   kmeans_ddR = derive2 { name="kmeans.ddR"; version="0.1.0"; sha256="1i87cxakjbq1xwyjyyzv1xiqbrncsqx6baviidcdm3n0pakrqdsg"; depends=[ddR Rcpp]; };
   kmi = derive2 { name="kmi"; version="0.5.2"; sha256="0w440r3daksghvimbm0avp6c3rjvxaxsawvn7ig5bwnw60kry9il"; depends=[mitools survival]; };
   kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; };
+  kml3d = derive2 { name="kml3d"; version="2.4.2"; sha256="1a3hqyhrsh12l1j1xlz4zy88impw3biz6w2qc80r11m549h0m6s9"; depends=[clv kml longitudinalData misc3d rgl]; };
   kmlShape = derive2 { name="kmlShape"; version="0.9.5"; sha256="1p35ihjq84jnzq78yksdblc0c1qcn13f8n4khddsxcqvk3a44xb1"; depends=[class kml lattice longitudinalData]; };
   kmlcov = derive2 { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
   kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
   knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
-  knitcitations = derive2 { name="knitcitations"; version="1.0.7"; sha256="0sx7sxrmm9x01sh3bcp9qqpvljfss9f1hr6h4dcfns8x6f60s5v6"; depends=[digest httr RefManageR]; };
-  knitr = derive2 { name="knitr"; version="1.16"; sha256="02balmhvc955rkqv4v0wkxbw4vjphydajgcpy4ml0s3b4sziyj0h"; depends=[digest evaluate highr markdown stringr yaml]; };
-  knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.0"; sha256="0pshn2slzqwpryklslsxwh1dmqcnwv6bwi7yfm6m342wjybpk0wl"; depends=[knitr markdown rmarkdown]; };
+  knitcitations = derive2 { name="knitcitations"; version="1.0.8"; sha256="07h8d5cp52qcm0912c55j59k2p3c7s4af87qa7a9hafhgimnsdiv"; depends=[digest httr RefManageR]; };
+  knitr = derive2 { name="knitr"; version="1.17"; sha256="00gljbz57n9lkvbd6az4n37gpbs8vg3fxx5p9biamhmhqyra514l"; depends=[digest evaluate highr markdown stringr yaml]; };
+  knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.1"; sha256="089147g7nqp99rwdxxsfmklsrwc8aia09sr8ndmrc335r33v6r6p"; depends=[knitr markdown rmarkdown]; };
   knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
   knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
   knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; };
   knockoff = derive2 { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; };
+  knor = derive2 { name="knor"; version="0.0-1"; sha256="03npxd3jv8386z15lcq1w402f8r12cjy5yzbprd5wi83g7sbg4fp"; depends=[Rcpp]; };
   knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; };
-  kntnr = derive2 { name="kntnr"; version="0.4.0"; sha256="0vcmm4vjawmyaqpqv0g6y5dfcixn0rjhcfr3nfc2781a4w7ydnc9"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr]; };
+  kntnr = derive2 { name="kntnr"; version="0.4.1"; sha256="0d78mgmz2yhfbf4m5jaa28aazaw2wf9vf1vxl53wrnpy0hxw329y"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr tibble]; };
   koRpus = derive2 { name="koRpus"; version="0.10-2"; sha256="1ykaky10zkj76w44fhk6kb6dqz1pgncmdnz4r2amcm08a8h96gsr"; depends=[data_table]; };
   kobe = derive2 { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[coda emdbook ggplot2 MASS plyr reshape]; };
   kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; };
   kohonen = derive2 { name="kohonen"; version="3.0.2"; sha256="1dg2jmdlp888bcfkpmd8w9w9dj7y9r94fgr7gl2fkhlhkid9ss78"; depends=[MASS Rcpp]; };
   kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.2.0"; sha256="1sk7r5v3d65w126vin9gawan3f21zrd9ps974l9nxj7kv1pa3szh"; depends=[digest dplyr httr purrr rgdal shiny xml2]; };
   kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; };
+  komadown = derive2 { name="komadown"; version="0.1.0"; sha256="08rg2qz4dmxl4xi0d7wdl2xgdmsc29fdc0yi40yddzrbpj4vs2z4"; depends=[bookdown knitr rmarkdown]; };
   kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; };
+  kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; };
   kpodclustr = derive2 { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; };
   kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; };
   kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
   krm = derive2 { name="krm"; version="2016.7-9"; sha256="0yc8agnb4685fa00pnwsxwc4vnr2aj2dwb6zxppj62r6c59xl47f"; depends=[kyotil]; };
-  ks = derive2 { name="ks"; version="1.10.6"; sha256="07gdh95y16yy2qabl2bhlnad6ifclak81lwjza0v25nw2zklwfcf"; depends=[FNN KernSmooth misc3d multicool mvtnorm rgl]; };
+  ks = derive2 { name="ks"; version="1.10.7"; sha256="01s5lzv5nmj5c8siz9wpiqcnixdhcqd5z5fhc5g7x6ym3xgcc1d5"; depends=[FNN KernSmooth misc3d multicool mvtnorm rgl]; };
   kscons = derive2 { name="kscons"; version="0.7.0"; sha256="1i4dp56y9swl5s6cipqlm5i5fknz2v0yz5g930cl5i8kx91rxwrp"; depends=[]; };
   kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; };
   ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; };
@@ -6826,8 +7027,8 @@ in with self; {
   kzfs = derive2 { name="kzfs"; version="1.5.0.1"; sha256="0gd945x1ppdw15iqcn5ijzmh07hs7zg8rjb85231bcqbh98djvfm"; depends=[digest kzft]; };
   kzft = derive2 { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; };
   kzs = derive2 { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; };
-  l0ara = derive2 { name="l0ara"; version="0.1.3"; sha256="0igav0wxvnnjcrh1wqzgvn91ndq9a25yxhxyddnsfvn6f45rc0wn"; depends=[Rcpp RcppArmadillo]; };
-  l1kdeconv = derive2 { name="l1kdeconv"; version="1.1.0"; sha256="0dks5y49kpbw4iryjx5ai3sa052xk6vd8j729b43qjg2x08zdp34"; depends=[]; };
+  l0ara = derive2 { name="l0ara"; version="0.1.5"; sha256="15qajzpvqnikg9k199cqvwp9qbrxx4zr9lsvyad96pa9qr156gvb"; depends=[Rcpp RcppArmadillo]; };
+  l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; };
   l2boost = derive2 { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; };
   laGP = derive2 { name="laGP"; version="1.4"; sha256="186ab5j0r716jxk4gvaw78s2vafj24gy9qz0wbfhalkf1hp7yblw"; depends=[tgp]; };
   labdsv = derive2 { name="labdsv"; version="1.8-0"; sha256="0rbf7cswnj534jdi5hfaai12nbxj6l96f02c73ynraqvdqxb1bnz"; depends=[cluster MASS mgcv]; };
@@ -6851,9 +7052,9 @@ in with self; {
   landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; };
   landsat = derive2 { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; };
   landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; };
-  landscapeR = derive2 { name="landscapeR"; version="1.1.3"; sha256="0mgnm1gq19ybq7dwv5agxyrldiv4743np8b9r2ql2h6gwk8rp5f7"; depends=[raster]; };
+  landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; };
   languageR = derive2 { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
-  languagelayeR = derive2 { name="languagelayeR"; version="1.0.0"; sha256="0lca079nnqppbr7k5pfa7qfc879kws34hrxcs49y12qfv7hsk576"; depends=[httr magrittr rjson]; };
+  languagelayeR = derive2 { name="languagelayeR"; version="1.1.0"; sha256="1588bdv2nwqvzkhj607b3r8z8hkp2bay4bhh0nm2b89q1a7r2g4v"; depends=[httr magrittr rjson]; };
   lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 tidyr]; };
   lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
   largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; };
@@ -6865,8 +7066,8 @@ in with self; {
   lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
   lasvmR = derive2 { name="lasvmR"; version="0.1.2"; sha256="1yzyfacr47wkpv9bblm7hvx1hgnzbhy1421bpnh95xfxxlzahy5n"; depends=[checkmate Rcpp]; };
   latdiag = derive2 { name="latdiag"; version="0.2-3"; sha256="0i2mqk3ldg5kf4d8sfljgjsqbdin7v69anmc2rrxgy28bmvykf9d"; depends=[]; };
-  latentnet = derive2 { name="latentnet"; version="2.7.1"; sha256="0bjac9cid11pmhmi2gb4h3p4h9m57ngxx7p73a07afmfjk9p7h5m"; depends=[abind coda ergm mvtnorm network sna statnet_common]; };
-  later = derive2 { name="later"; version="0.3"; sha256="18fm71bix5825a9aj40din0ij8c3bx9aq9j4cxb3if3m4gnwqvba"; depends=[BH Rcpp rlang]; };
+  latentnet = derive2 { name="latentnet"; version="2.8.0"; sha256="05r7hzj5i7rgpxl798lwi2m62l1qkl5zdza0q2awcd5ydkgj34hp"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; };
+  later = derive2 { name="later"; version="0.4"; sha256="189kx72lyf0yrsy0yq3w8aym9vb17347kvgfj915z3sf7hfr6349"; depends=[BH Rcpp rlang]; };
   latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; };
   lattice = derive2 { name="lattice"; version="0.20-35"; sha256="0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88"; depends=[]; };
   latticeDensity = derive2 { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
@@ -6885,7 +7086,7 @@ in with self; {
   lazyeval = derive2 { name="lazyeval"; version="0.2.0"; sha256="1jwdz40nznlc44hpjli7h98gnpa4d98ifggmj7z88h84n9aqywqk"; depends=[]; };
   lazyrmd = derive2 { name="lazyrmd"; version="0.2.0"; sha256="0ahm1wspvm625lx7y2zz05bvv66rlswphs84vpkcqb0dqfcn3s48"; depends=[digest htmltools htmlwidgets knitr rmarkdown]; };
   lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; };
-  lba = derive2 { name="lba"; version="2.4.1"; sha256="15ipqv6jxmiypxkzfx2gwz770nqhcp81a0ci0fzw39g2ayjs5sr3"; depends=[alabama MASS plotrix rgl scatterplot3d]; };
+  lba = derive2 { name="lba"; version="2.4.3"; sha256="0q83abkdwxrj4x17wrx0zcmv2z8rzji0qzz8psvjx1vkcxma3ix7"; depends=[alabama MASS plotrix rgl scatterplot3d]; };
   lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; };
   lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; };
   lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
@@ -6894,21 +7095,21 @@ in with self; {
   lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; };
   lcmm = derive2 { name="lcmm"; version="1.7.8"; sha256="180xfx842sic5qnfr0zh2h4345zkzlf123pdw4q6gd0mi5smwwc7"; depends=[survival]; };
   lcopula = derive2 { name="lcopula"; version="1.0"; sha256="07a9k5fp03s6jnjawg11j4458xrsrrqxv6kf3cs58ymv0j2s1qyd"; depends=[copula pcaPP Rcpp]; };
-  lctools = derive2 { name="lctools"; version="0.2-5"; sha256="02xbcmdz12vxi1hjrhibavnf792lqpjraknxz6sqz7fhfqrd8qbq"; depends=[MASS pscl reshape weights]; };
+  lctools = derive2 { name="lctools"; version="0.2-6"; sha256="06hhz0sjdrci1li03f09wij1qrl74sla2938fbkx72ffy0mdg310"; depends=[MASS pscl reshape weights]; };
   lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; };
   ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; };
   ldatuning = derive2 { name="ldatuning"; version="0.2.0"; sha256="18nm4hj7733c1cp03hyddnivhiiyv7ndnw9m6j3af019jjmvf215"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; };
   ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; };
   ldbounds = derive2 { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
-  ldhmm = derive2 { name="ldhmm"; version="0.4.1"; sha256="1bg41nw5pab5lrhqashdzyqsqx7al4fbfz3vvl7wbk0hlf4r9mi6"; depends=[ecd ggplot2 moments optimx scales xts zoo]; };
+  ldhmm = derive2 { name="ldhmm"; version="0.4.2"; sha256="0kfhb53p1pzgbn8v7hy3sqb0q04hrm7cbykv7bml0hn30z4r8hjx"; depends=[ecd ggplot2 moments optimx scales xts zoo]; };
   ldlasso = derive2 { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; };
   ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
-  ldstatsHD = derive2 { name="ldstatsHD"; version="1.0.0"; sha256="1phz9hwhfw7lcvz5gg0l3w3j3jig0bw4wxbx6j4z7dlr4bisyng8"; depends=[camel cluster corpcor evd fExtremes huge igraph MASS Matrix RBGL robustbase VGAM]; };
+  ldstatsHD = derive2 { name="ldstatsHD"; version="1.0.1"; sha256="152dlphxxzllgf7al8k34qcfg6n8ajxqym62i61ahbbgjlcd0x9r"; depends=[camel cluster corpcor evd fExtremes huge igraph MASS Matrix qvalue RBGL robustbase VGAM]; };
   leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
   leaflet = derive2 { name="leaflet"; version="1.1.0"; sha256="05faikqdlbsj9lvl1lvhmagys71597jvgah8b9f1fqhgyj0bwx7l"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; };
   leaflet_esri = derive2 { name="leaflet.esri"; version="0.2"; sha256="18y3hzbn4apn209rww8hk4mkx5ix6b6z01ydr31d39bqlgg6n7zf"; depends=[htmltools htmlwidgets leaflet leaflet_extras magrittr shiny]; };
   leaflet_extras = derive2 { name="leaflet.extras"; version="0.2"; sha256="1baxcgcxizyf05w8gb5zjmvrsbrhpwvrxrblcv5vpy4vk73921v1"; depends=[htmltools htmlwidgets leaflet magrittr shiny stringr]; };
-  leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.4.0"; sha256="0k3wv2n6vwj5wcls0jr95n2lckvmigz3j57ynn8fp2ycdf8k1y8i"; depends=[htmltools leaflet]; };
+  leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.5.1"; sha256="037x7ajdwshhmjf5cr4ha5bw1cc53cbczdc3ybdl4kp2i07gwrsq"; depends=[htmltools leaflet]; };
   leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; };
   leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; };
   leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; };
@@ -6923,7 +7124,7 @@ in with self; {
   leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
   lemon = derive2 { name="lemon"; version="0.3.0"; sha256="1ivam4b4sgvadazqn9f3dr5ffal723yk3l5rw35p8rmc3kmlhn7z"; depends=[ggplot2 gridExtra gtable knitr lattice RCurl]; };
   lero_lero = derive2 { name="lero.lero"; version="0.1"; sha256="1jndsgy48fn085ilkh8dfc3w76kfnfj0x70d1m3h59zxi3x9lb82"; depends=[stringr]; };
-  lessR = derive2 { name="lessR"; version="3.6.2"; sha256="12da2iv56m58b4a26b01xlcbklkmgvwhjlxr7nk53yd6n21byzzz"; depends=[ellipse foreign lattice latticeExtra leaps png readxl sas7bdat triangle]; };
+  lessR = derive2 { name="lessR"; version="3.6.5"; sha256="1r0b18l47nwyfclqy19hyra94bi2bv960myq6vjiyarv1lhk8f3g"; depends=[ellipse foreign lattice latticeExtra leaps png readxl robustbase sas7bdat triangle]; };
   lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
   letsR = derive2 { name="letsR"; version="3.0"; sha256="1mm0d7v29d594w2xxv6h1k6dsav2cs31hi64lyxjar1bi4snp6hj"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
   lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; };
@@ -6941,22 +7142,22 @@ in with self; {
   lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; };
   lhs = derive2 { name="lhs"; version="0.14"; sha256="1qnr3s9511nq3xqdbngllmw3mvnnpblma5dafyghxlpvydc2l481"; depends=[]; };
   libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; };
-  libcoin = derive2 { name="libcoin"; version="0.9-2"; sha256="0bya71i853vjg8wdbnm70c1fzx5az7a2bsf6s41ysd020ixdg1jj"; depends=[mvtnorm]; };
+  libcoin = derive2 { name="libcoin"; version="0.9-3"; sha256="1gmgppc5vf11zmsbyayljijd9n3n9j0ns1hia0x7m5jm6nyjxgql"; depends=[mvtnorm]; };
   libsoc = derive2 { name="libsoc"; version="0.5"; sha256="0p01mcwnkb4g3dq0mx1gbwfbznp4b2dmhs8k8wmnh7wll16v9i6z"; depends=[]; };
   libstableR = derive2 { name="libstableR"; version="1.0"; sha256="0qk70rl76lz2izgp2c1asx0yvi8xgfq1yg579kcygxk4pnxjdwv4"; depends=[Rcpp]; };
   lidR = derive2 { name="lidR"; version="1.2.1"; sha256="0kaz9v75raicrjjg4xwzm9qgljpa95ki716a78bj95kcqc556104"; depends=[data_table geometry gstat lazyeval magrittr RANN raster Rcpp RcppProgress rgeos rgl rlas settings sp]; };
-  lifecontingencies = derive2 { name="lifecontingencies"; version="1.2.3"; sha256="1gkvrzcmcic3rzbcfp5lif4zfc94bhfm36i3ajzaczwjhg2dwivs"; depends=[markovchain Rcpp]; };
+  lifecontingencies = derive2 { name="lifecontingencies"; version="1.3"; sha256="0qjx7czyrk47lnpq3aw43hh2z8b8yiqllcayk911f1hpf5vwbcir"; depends=[markovchain Rcpp]; };
   lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; };
   lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; };
   lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; };
   liftLRD = derive2 { name="liftLRD"; version="1.0-5"; sha256="0v0aczf9s3vr9kk7n6z9spwc82hf418v9vjiyfri3npn3ib112b7"; depends=[adlift nlt]; };
-  liftr = derive2 { name="liftr"; version="0.5"; sha256="0pk1w9h83ixf3ia4qxcb85i0n4jr5hfry6rc3yx3pki3r7wlqyam"; depends=[knitr rmarkdown rstudioapi stringr yaml]; };
+  liftr = derive2 { name="liftr"; version="0.6"; sha256="1i4d9fsyik8i0dcpp8drsm3xmjnmb8i48fxgci959n8f7w384w57"; depends=[knitr rmarkdown rstudioapi stringr yaml]; };
   lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; };
   likeLTD = derive2 { name="likeLTD"; version="6.2.1"; sha256="1b5rg1nijc4vsl7xabq35ini84rpnd1yrxsk1vr7wd57yac25mmk"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
   likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
   likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.45"; sha256="0sl0q6w49l89i6s80scsr5lrr8jgdd0788i4b87w985zaxjqrh03"; depends=[alabama cond nleqslv pracma Rsolnp]; };
   likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; };
-  limSolve = derive2 { name="limSolve"; version="1.5.5.2"; sha256="01vc6as0mr6fmz8vzlnziv4sy302amwwvn7nsnmfrhslqyps4vx1"; depends=[lpSolve MASS quadprog]; };
+  limSolve = derive2 { name="limSolve"; version="1.5.5.3"; sha256="1ll6ir42h3g2fzf0wqai213bm82gpwjj2hfma2np3mz024sc09rg"; depends=[lpSolve MASS quadprog]; };
   limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
   linERR = derive2 { name="linERR"; version="1.0"; sha256="1mhiyqfpwagg161ncp5ndd22hlh12qzr360nms13rgyd8a077cq7"; depends=[survival]; };
   linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
@@ -6964,16 +7165,16 @@ in with self; {
   lindia = derive2 { name="lindia"; version="0.9"; sha256="1qma8wr0fkwx03x971crkh8cfc8z4374py1r1wvszj9wzi4vfp5r"; depends=[ggplot2 gridExtra MASS]; };
   linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; };
   lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; };
-  lingtypology = derive2 { name="lingtypology"; version="1.0.5"; sha256="1k906zny4kz9jfv490fyg3mwhdkbfpravwviq4qlaqrmi1jk0wwb"; depends=[leaflet magrittr MASS rowr sp stringdist]; };
+  lingtypology = derive2 { name="lingtypology"; version="1.0.6"; sha256="117jq315bp5ykdld1aban8xww8x8gvjg02rkqh1n0slkcsc4wkg0"; depends=[leaflet magrittr MASS rowr sp stringdist]; };
   link2GI = derive2 { name="link2GI"; version="0.1-0"; sha256="1i16yf387izv8vn0z8f7wgk02hld83lhfb5c263mn1v3q5zj9kki"; depends=[gdalUtils raster rgdal rgrass7 sf sp]; };
   linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; };
   linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
   linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
   linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
   lintools = derive2 { name="lintools"; version="0.1.1.4"; sha256="18rqpm0cg233hclcqskdh3mfpwpbawc582j800mjalii233jzr36"; depends=[]; };
-  lintr = derive2 { name="lintr"; version="1.0.0"; sha256="0d03lwr96pdvkdxgjlrzj591dkaxm2rbdk2n3jgr1k428v6jkzy0"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
+  lintr = derive2 { name="lintr"; version="1.0.1"; sha256="08yw80imf71vkhhp7szhwk4lswhs0fsnfc6d2kwrwkmbqwsjswzc"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
   liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
-  liquidSVM = derive2 { name="liquidSVM"; version="1.0.1"; sha256="1440zkna0l79q1klfl91gif90q9fp0g05lyrvbbslhvcynwkgj7y"; depends=[]; };
+  liquidSVM = derive2 { name="liquidSVM"; version="1.2.1"; sha256="0nw8n4qg2jijbnlza15ifzqsl4pj7gjzi4nd71zp7h0aw5mnp80x"; depends=[]; };
   lira = derive2 { name="lira"; version="1.2.0"; sha256="1n4vjq5v0qj26bq56w5vchwdv10ysc94aizblwm1wl9ss8lpsc0a"; depends=[coda rjags]; };
   liso = derive2 { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[Iso MASS]; };
   lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
@@ -6992,6 +7193,7 @@ in with self; {
   llama = derive2 { name="llama"; version="0.9.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
   lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; };
   lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; };
+  llogistic = derive2 { name="llogistic"; version="1.0.0"; sha256="1mddwcfp6c5g36japybjrlirz0q8l7am8akbiv8c6z7jka2nwi00"; depends=[]; };
   lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
   lm_br = derive2 { name="lm.br"; version="2.9.3"; sha256="1xadz0rygm58igk0ig0w45132gnsvjxvwqzca4m6v6i6lz9x55pf"; depends=[Rcpp]; };
   lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; };
@@ -7010,12 +7212,14 @@ in with self; {
   lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
   lmfor = derive2 { name="lmfor"; version="1.2"; sha256="1lad1sfrf6lsksix4nn2c2dc5fx0rfm4kdhvbmqf9dc55f98rla8"; depends=[MASS nlme]; };
   lmm = derive2 { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; };
+  lmmen = derive2 { name="lmmen"; version="1.0"; sha256="0c1yy991bff1hp47rg89j5811l50kb9pdf76834jxh38dr3b4lsw"; depends=[glmmLasso glmnet lme4 lmmlasso mvtnorm quadprog]; };
   lmmlasso = derive2 { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
   lmmot = derive2 { name="lmmot"; version="0.1.4"; sha256="1a8msh9yvvd7cv1zxlxdv8arlfvxqghxzcxls23v6ifl5jf4d1p3"; depends=[MASS maxLik]; };
+  lmmpar = derive2 { name="lmmpar"; version="0.1.0"; sha256="1l3zjmlfjfn2wv4yayqzv6qrwaxk2sgx3hjx371b5fs54zspdj20"; depends=[bigmemory doParallel MASS matrixcalc mnormt plyr]; };
   lmms = derive2 { name="lmms"; version="1.3.3"; sha256="1gralhk9plmpmdya7cfzgzwzr8ab47pz4f76kvlp03sp5gcy4063"; depends=[gdata ggplot2 gplots gridExtra lmeSplines nlme reshape2]; };
   lmodel2 = derive2 { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; };
-  lmom = derive2 { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; };
-  lmomRFA = derive2 { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; };
+  lmom = derive2 { name="lmom"; version="2.6"; sha256="0wxlclzypg6dnvk09k26pdgn3nijl06xsa9rny5l03xzar01mz5s"; depends=[]; };
+  lmomRFA = derive2 { name="lmomRFA"; version="3.1"; sha256="1gq5sjdywz1jbsshrh350zad7iifml2yj8an5xa63ghxiskrxscx"; depends=[lmom]; };
   lmomco = derive2 { name="lmomco"; version="2.2.7"; sha256="1xrw2a3iyp0i2kmcwgq0sr10v40q5c2n84xx8dxpvl3978vqidj8"; depends=[goftest Lmoments MASS]; };
   lmridge = derive2 { name="lmridge"; version="1.0"; sha256="07zchmdcyz8agrs9q2ydcgicz3sxg893vv4rsynlpgyk2z5xnnjf"; depends=[]; };
   lmtest = derive2 { name="lmtest"; version="0.9-35"; sha256="107br1l7p52wxvazs031f4h5ryply97qywg9dzrkw4ydnvqq4j9g"; depends=[zoo]; };
@@ -7059,6 +7263,7 @@ in with self; {
   longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; };
   loo = derive2 { name="loo"; version="1.1.0"; sha256="0nh1jbrvm33v28gbys8sh6v4cxfzfd85561gz380b4kaahn2089l"; depends=[matrixStats]; };
   lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; };
+  loon = derive2 { name="loon"; version="1.1.0"; sha256="1yqbv91sk241n4rv35g374015wy4hricpm5k8r78aaqdhzgl0539"; depends=[]; };
   loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
   loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
   lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; };
@@ -7068,7 +7273,7 @@ in with self; {
   lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17"; sha256="1gfxnjkhhyybhyg29qdrdqzwq569b6pgwjgacmw3q7aldc724cyz"; depends=[]; };
   lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; };
   lpc = derive2 { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
-  lpdensity = derive2 { name="lpdensity"; version="0.2.1"; sha256="15an4ixk1kci1kv5mg0n31wjzby75xnj59z0sxfz2ixvmqw9yq3q"; depends=[ggplot2]; };
+  lpdensity = derive2 { name="lpdensity"; version="0.2.2"; sha256="1fv1biyc12zg0wfqcr5kp761fy6n6879knvlxr2zjp6rjssi3h6d"; depends=[ggplot2]; };
   lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
   lplyr = derive2 { name="lplyr"; version="0.1.6"; sha256="1a7wry5v78z4aij7ii64340ycx30wqbm3x2wllka79gkll1fn78h"; depends=[bazar dplyr lazyeval magrittr]; };
   lpme = derive2 { name="lpme"; version="1.1.0"; sha256="1mq1lf4vdlbxjax9p8k17vdkc2h3xslbbs17xzy10fbkdicljc10"; depends=[decon flexmix Rcpp RcppArmadillo]; };
@@ -7091,6 +7296,7 @@ in with self; {
   lsmeans = derive2 { name="lsmeans"; version="2.26-3"; sha256="0pxpdvdlh0lf45f1b0s53dk8y73j2xnyvzixj1jnafmw1w6bj778"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; };
   lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; };
   lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
+  lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; };
   lsr = derive2 { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
   lss = derive2 { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
   ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; };
@@ -7106,10 +7312,11 @@ in with self; {
   lucr = derive2 { name="lucr"; version="0.2.0"; sha256="0v5g72cl9fg3b3ix34bsmjwwqrnm4ivgcd5mm98c5jd8rrz1xkwq"; depends=[httr Rcpp]; };
   ludic = derive2 { name="ludic"; version="0.1.5"; sha256="03ywna9fd2ypwchwx58ccmlxjdnx7zav7pqxwrc5bh3hrfbsxl13"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; };
   lulcc = derive2 { name="lulcc"; version="1.0.2"; sha256="1vlaidyqgx5vnf8w2y1a1jmmq7z4195avnv1mryhh414r5r1kpy0"; depends=[lattice raster rasterVis ROCR]; };
-  lumberjack = derive2 { name="lumberjack"; version="0.1.0"; sha256="02p1swd1k2b8d95iilqkh3cdwr0r9y7pbicp4ibw8l9yzm2h7s81"; depends=[R6]; };
+  lumberjack = derive2 { name="lumberjack"; version="0.2.0"; sha256="0yn6482wrwinabys3awp0jjnzs6mnv29jjpvr980m1jm15nwva4g"; depends=[R6]; };
   lumendb = derive2 { name="lumendb"; version="0.2.2"; sha256="0x1k90h6aw7fpvmgbbdmkqvgxfnn4w5xxfck7f4r7zhaxfqbzp2s"; depends=[httr xml2]; };
   lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
   luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; };
+  lvec = derive2 { name="lvec"; version="0.1.1"; sha256="1mpw01z0n0cql451qmi0b77pbfkhx6jyc4zzs5nl82jb6x3y20wn"; depends=[BH]; };
   lvm4net = derive2 { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
   lvnet = derive2 { name="lvnet"; version="0.3.1"; sha256="1bzykd70j8xbvpxqwdac49pv7ndvjqljwywhbf6sn3yvq72n3hlj"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; };
   lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; };
@@ -7122,7 +7329,7 @@ in with self; {
   mBvs = derive2 { name="mBvs"; version="1.0"; sha256="0qq6yaqvpg3akwbbaamv1a5rsrwdsq5z161w0prvq8qcbyfwclni"; depends=[]; };
   mFilter = derive2 { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; };
   mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; };
-  mHG = derive2 { name="mHG"; version="1.0"; sha256="18hj9chp9dy6nmi5w0808nivqbyni117darvdpf03kzq5ym8dlm6"; depends=[]; };
+  mHG = derive2 { name="mHG"; version="1.1"; sha256="1rz5ncrvvv9h9grls15apa63v2nh9j87fmp4mwjjil37jx6a5zki"; depends=[]; };
   mMPA = derive2 { name="mMPA"; version="0.1.0"; sha256="1p9rzk1x5ldb3afr53f195vb4jdj8kw50rmv961k2jsw128mrzr5"; depends=[]; };
   mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; };
   mRMRe = derive2 { name="mRMRe"; version="2.0.5"; sha256="1lhpamjy8dbk3lzjj0wj041cg99rw6925i9fq297c93jxq562414"; depends=[igraph survival]; };
@@ -7132,7 +7339,7 @@ in with self; {
   maRketSim = derive2 { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; };
   maSAE = derive2 { name="maSAE"; version="0.1-5"; sha256="0v0vlj41j3ddyxv8lld39k1ryrdjin7r6bj13x2agbklb1fd4an1"; depends=[]; };
   maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; };
-  macc = derive2 { name="macc"; version="1.0.0"; sha256="1d6acnp9k0al4nwggf5dqjiazasnika4899gb5j4rp2aihd8yly9"; depends=[car lme4 MASS nlme optimx]; };
+  macc = derive2 { name="macc"; version="1.0.1"; sha256="1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4"; depends=[car lme4 MASS nlme optimx]; };
   machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; };
   machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; };
   macleish = derive2 { name="macleish"; version="0.3.0"; sha256="05zmk28yh54gnm09aps3q64s4igcb629b3zx7giinlfc4xx8qv74"; depends=[DBI dplyr etl lubridate readr]; };
@@ -7148,7 +7355,7 @@ in with self; {
   magic = derive2 { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; };
   magicaxis = derive2 { name="magicaxis"; version="2.0.1"; sha256="065x7076kps7bk66j0ivazqlqcich82y5fbb2953wwlnficx37wl"; depends=[celestial mapproj MASS plotrix sm]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
-  magick = derive2 { name="magick"; version="0.4"; sha256="15w904zqbdm8051xqg1s83pmimkan0wg7z5vdzm5h96mjsqf6wap"; depends=[curl Rcpp]; };
+  magick = derive2 { name="magick"; version="1.2"; sha256="035igzv57l2mimfhqqf44gg733cpqx5av12xyxmp5wcf71k3xm10"; depends=[curl Rcpp]; };
   magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; };
   magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
   mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
@@ -7159,6 +7366,7 @@ in with self; {
   malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; };
   mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
   managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
+  mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; };
   mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; };
   manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; };
   manifestoR = derive2 { name="manifestoR"; version="1.2.4"; sha256="1hd4qsa2xsa1dq5jnwh1bph34glkpaabjmsnavdjhkfzjilp32ya"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tibble tm zoo]; };
@@ -7166,9 +7374,9 @@ in with self; {
   manipulateWidget = derive2 { name="manipulateWidget"; version="0.7.0"; sha256="1xiiaaay8szmw36vli3kgg4mn73hjdbaqq0w0l01wc2qhv3fa30n"; depends=[base64enc htmltools htmlwidgets knitr lazyeval miniUI shiny]; };
   mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
   mapdata = derive2 { name="mapdata"; version="2.2-6"; sha256="0k3hsnyvax20jph384gca10rl7a9fcglgkqcjsc5hndx3qrwpanv"; depends=[maps]; };
-  mapedit = derive2 { name="mapedit"; version="0.3.0"; sha256="1h620gnb95pd61af4h7j5vhqhhw0s58jq5yzipvm9394307yxgzk"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; };
+  mapedit = derive2 { name="mapedit"; version="0.3.2"; sha256="0x1jyll45kx1q3bq3visyq75jvinhw3h0yy1n1rams61vvxrqfxk"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; };
   mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
-  mapmisc = derive2 { name="mapmisc"; version="1.5.0"; sha256="1f6yjr3a26nm482ldnx8rzjhc0d9hlrpd48japm0sihxvmsz0pv3"; depends=[raster sp]; };
+  mapmisc = derive2 { name="mapmisc"; version="1.6.2"; sha256="0555yv0snhfrvvjdc3hz32s0lw5k395paz8ypw4lp5h9hlk4b8r6"; depends=[raster sp]; };
   mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
   mapproj = derive2 { name="mapproj"; version="1.2-5"; sha256="0rjz37r4rizk2c6jaf54f0kfb60dqv6b262cnhiwjl55d4x6l0pk"; depends=[maps]; };
   mapr = derive2 { name="mapr"; version="0.3.4"; sha256="14f7zfzxb1h935bbybj2l2n4a62cnq0wvgmc09in0fvnl75jl971"; depends=[ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; };
@@ -7176,7 +7384,7 @@ in with self; {
   maptools = derive2 { name="maptools"; version="0.9-2"; sha256="075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v"; depends=[foreign lattice sp]; };
   maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
   maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
-  mapview = derive2 { name="mapview"; version="2.1.0"; sha256="014drl0jcbw685q89isiy6gvcs3wnixgw5n3cs3qhaqdy8c0kcdy"; depends=[base64enc brew gdalUtils htmltools htmlwidgets lattice leaflet png raster Rcpp satellite scales sf sp viridisLite webshot]; };
+  mapview = derive2 { name="mapview"; version="2.1.4"; sha256="1aqjk1hkr6vs8bf6z0alyqyclknv10q682wg4xcnq20c91mvzwdw"; depends=[base64enc brew gdalUtils htmltools htmlwidgets lattice leaflet png raster Rcpp satellite scales sf sp viridisLite webshot]; };
   mar1s = derive2 { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
   march = derive2 { name="march"; version="1.4"; sha256="1wfhm33k2j5yim56sg0wd02ypfhlp9fc138vmdsdjp6nh4y23hnj"; depends=[]; };
   marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; };
@@ -7189,7 +7397,7 @@ in with self; {
   marked = derive2 { name="marked"; version="1.1.13"; sha256="0zgfd7fdcrvvqnlgzarly16zjnipshxsa1g3j9jqc5kbqvh7fnh2"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
   markmyassignment = derive2 { name="markmyassignment"; version="0.6.1"; sha256="167q4fwn2ssqn588wx3ig923rcr74m95na1z1wdfy67jczsk492l"; depends=[codetools httr lazyeval testthat yaml]; };
   markophylo = derive2 { name="markophylo"; version="1.0.4"; sha256="12np5rg59wjyh1mfhhfh115ziciba973fjvbrhn4qzdnry1mwbdb"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
-  markovchain = derive2 { name="markovchain"; version="0.6.9.3"; sha256="1fvjpiqf42rg2486f446bf308v5jznbnnx17gl30xll8g0l5hgxi"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markovchain = derive2 { name="markovchain"; version="0.6.9.8-1"; sha256="1av89829fwnf2bll7b75v2vrglw4130d5c42c3i1fiqh54jxjy7k"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
   marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
   marmap = derive2 { name="marmap"; version="0.9.6"; sha256="1b0mpygk18ri0xs9f56j2g7zmka7krnw7fmh9m9xisbvq2g23g92"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
   marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
@@ -7210,25 +7418,29 @@ in with self; {
   matrixStats = derive2 { name="matrixStats"; version="0.52.2"; sha256="19fjf19cr0p3j9pj17myz39zpi5bh7ci72db3la9my09n6k6mnir"; depends=[]; };
   matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
   matrixpls = derive2 { name="matrixpls"; version="1.0.5"; sha256="04sshb88rq2mp3y4rrs6nkzr4kc380vx380r911c7j975l55a183"; depends=[assertive lavaan MASS matrixcalc psych]; };
+  mau = derive2 { name="mau"; version="0.1.0"; sha256="0ssvj089smndr7h73la4gnn3dp63p8zkimm19q3rsw4lajv8ws79"; depends=[data_table ggplot2 gtools igraph RColorBrewer stringr]; };
   maxLik = derive2 { name="maxLik"; version="1.3-4"; sha256="0jjb5kc7dvx940ybg7b7z9di79v75zm2xlb0kj2y7rmi45vvh6hq"; depends=[miscTools sandwich]; };
+  maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; };
   maxent = derive2 { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; };
   maxlike = derive2 { name="maxlike"; version="0.1-7"; sha256="0gi33hcjj456sjw7l3q4n46k4cb6m3ml3ycd93pnajxacl24swbb"; depends=[raster]; };
   maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; };
   maxnet = derive2 { name="maxnet"; version="0.1.2"; sha256="1rfcylbv068pz4jgry5ijszwf5fibz566s5iv0ar8dhv0fhjr86z"; depends=[glmnet]; };
   maxstat = derive2 { name="maxstat"; version="0.7-25"; sha256="114z1rwxwvk05ijjhdppzm148n1h192fp0w12ky10zkrhf6kphbg"; depends=[exactRankTests mvtnorm]; };
   mazeGen = derive2 { name="mazeGen"; version="0.1.2"; sha256="05lsb7ldk6nzmfaklbvkcb4n5sfnimgcv5vgilblw5awzhavj5vm"; depends=[igraph]; };
-  mbbefd = derive2 { name="mbbefd"; version="0.8.8"; sha256="17f2y4xi5fxc6mms519xjb9qg94qqlxv0mhdbhjyyfg3x6bj7bsq"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
+  mbbefd = derive2 { name="mbbefd"; version="0.8.8.1"; sha256="0akga4p8nj5nnfv18gk84mhl2nd6s10k1c1rh730sd44qm6zpiai"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
   mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; };
   mbest = derive2 { name="mbest"; version="0.5"; sha256="0l6vmcqkd2b0b90jmsswrhbdmhq2x92g7sr2l99rp7xp1cxdq02w"; depends=[bigmemory foreach lme4 logging nlme]; };
   mbgraphic = derive2 { name="mbgraphic"; version="1.0.0"; sha256="0b4xr2ycx8v56fp40lnxv69qfp0yzai2hdwk3kw4wsmir91d2a91"; depends=[diptest dplyr extracat GGally ggplot2 gridExtra hexbin magrittr mgcv Rcpp scagnostics scales seriation shiny]; };
+  mbir = derive2 { name="mbir"; version="1.0"; sha256="1m6d31br19wy3hz2d79df6qkdiyy8il7hf02md5bfvw4jvy2rh8z"; depends=[]; };
   mblm = derive2 { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
   mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
-  mboost = derive2 { name="mboost"; version="2.8-0"; sha256="02cb6a0gzwwhvcn0rzvnjzb3c50lfyjcl7j14rki4iz78s4jl55c"; depends=[lattice Matrix nnls party quadprog stabs survival]; };
+  mboost = derive2 { name="mboost"; version="2.8-1"; sha256="163pf6dhl46w9n069pybqqc8khafhdkqhf9fmm095g66ypdbga4n"; depends=[lattice Matrix nnls party quadprog stabs survival]; };
   mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; };
   mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; };
   mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; };
   mcIRT = derive2 { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp RcppArmadillo]; };
-  mcPAFit = derive2 { name="mcPAFit"; version="0.1.3"; sha256="0yg79sry8jdp17mbdnfaj2phg3vdxs11si7hmfh5csfk7maax8v6"; depends=[PAFit RColorBrewer Rcpp]; };
+  mcMST = derive2 { name="mcMST"; version="1.0.0"; sha256="0bw1ka9ics39khadzcwi4bqqswhgwa52mqf65bp8aml445gd62l1"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; };
+  mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; };
   mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; };
   mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; };
   mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
@@ -7241,11 +7453,11 @@ in with self; {
   mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
   mclcar = derive2 { name="mclcar"; version="0.1-8"; sha256="1hrjfjbsxh8g6bw2cfxciry8hn9xxfg4bww5p1sjq98v8bsqcx23"; depends=[fields maxLik nleqslv rsm spam spdep]; };
   mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
-  mclogit = derive2 { name="mclogit"; version="0.4.4"; sha256="1nnzds9md3drcgblzpbg39a53v4npdbi0xp3xgw8xqfyy37nia59"; depends=[Matrix memisc]; };
+  mclogit = derive2 { name="mclogit"; version="0.5.1"; sha256="1qnkkjq7gxivpz3mmbq5dx9a128r3xhrdzx96kc80h3w67yc7hbl"; depends=[Matrix memisc]; };
   mclust = derive2 { name="mclust"; version="5.3"; sha256="0h5syvpg3azrz5d10z2afilaa27jb4azi38idzlv05mfcs16s6rb"; depends=[]; };
   mcmc = derive2 { name="mcmc"; version="0.9-5"; sha256="1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6"; depends=[]; };
   mcmcplots = derive2 { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
-  mcmcse = derive2 { name="mcmcse"; version="1.2-1"; sha256="18k2cp5hpr3lzv9yva5qc379iq9aysnl872dv8jidwrj4iy2xccy"; depends=[ellipse Rcpp RcppArmadillo]; };
+  mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; };
   mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
   mcparallelDo = derive2 { name="mcparallelDo"; version="1.1.0"; sha256="1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn"; depends=[checkmate R_utils R6]; };
   mcprofile = derive2 { name="mcprofile"; version="0.2-3"; sha256="0rakaa1p6z0p4jl4df357vi58wzph81ik6plc8zzl370r8mj1y8q"; depends=[ggplot2 mvtnorm quadprog]; };
@@ -7259,12 +7471,12 @@ in with self; {
   mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; };
   mdftracks = derive2 { name="mdftracks"; version="0.2.0"; sha256="0l8dc6ljrhbm8jwadaa3xkf6nx90vyiig15p7rryswczz9hw5ga6"; depends=[hellno]; };
   mdhglm = derive2 { name="mdhglm"; version="1.6"; sha256="1lvckais4c3pbf6zrpfkdlyqhcg4jaw11n00622h9ks413fl788v"; depends=[boot Matrix mvtnorm numDeriv]; };
-  mdmb = derive2 { name="mdmb"; version="0.2-0"; sha256="13pkz0mjvd5gph1fpz3cd2yn5mb0lsvyjr7xr9bbikh11jqx80wb"; depends=[CDM coda miceadds sirt TAM]; };
+  mdmb = derive2 { name="mdmb"; version="0.4-15"; sha256="0qm5nyag19in8mpck1gvmsxmpj9dzfsnryx4gbwrss4yaapn7gmx"; depends=[CDM coda miceadds sirt TAM]; };
   mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; };
-  mdsOpt = derive2 { name="mdsOpt"; version="0.1-3"; sha256="0x2jd675v7h6d6psgdbh4krgpy2y8j5hknhjrcjkfx8hwn3s64hd"; depends=[clusterSim smacof]; };
+  mdsOpt = derive2 { name="mdsOpt"; version="0.1-4"; sha256="1nbs2dxwh78kh2qp19whk6infckxrkckyxjlmcmcfmk578ivb5xb"; depends=[clusterSim smacof]; };
   mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; };
   mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; };
-  mdsr = derive2 { name="mdsr"; version="0.1.3"; sha256="19ryy7cm2ia3xi54r0176n72y7w35dqml0l7ysi6qd8zy4yavkvx"; depends=[babynames DBI dplyr ggplot2 mosaic RMySQL]; };
+  mdsr = derive2 { name="mdsr"; version="0.1.4"; sha256="1g9a6g8rf2svndis7569bnbj3jx1mgli172fjzdypfnhiyhd46vb"; depends=[babynames DBI dbplyr downloader dplyr ggplot2 mosaic RMySQL tidyverse]; };
   meanShiftR = derive2 { name="meanShiftR"; version="0.50"; sha256="0wb08x9vanwfzs7ijskl53118jvy3z48gqda7gn33aq82dkablza"; depends=[]; };
   meanr = derive2 { name="meanr"; version="0.1-0"; sha256="1vbsqcbgbv0h4ld45cfpasy5sy5a019zn1fh141ylhsd9czrb9d4"; depends=[]; };
   measuRing = derive2 { name="measuRing"; version="0.4"; sha256="165j3i5295hxzqg8l2hrd61a0fh9xmw61dpx8js8qjz1zi9rm84x"; depends=[dplR pastecs png tiff]; };
@@ -7274,29 +7486,30 @@ in with self; {
   mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
   medfate = derive2 { name="medfate"; version="0.2.2"; sha256="1vw9j04063sjwyfdkk94xsgz5zps7vmqha6dbsvi8ncb951cfijp"; depends=[meteoland Rcpp sp spdep]; };
   medflex = derive2 { name="medflex"; version="0.6-1"; sha256="0i3808qh4ryqcgx5rl60d4xdy25wzx008abijg5fcirsrdly7j91"; depends=[boot car Matrix multcomp sandwich]; };
-  mediation = derive2 { name="mediation"; version="4.4.5"; sha256="0jq0gg5ydqvy0vv8m7xk609ljw7p31jppgwgin3y3mvd32wapgk3"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; };
+  mediation = derive2 { name="mediation"; version="4.4.6"; sha256="0prhpy9y26s388p9gv5sv4h5airixwy6ffjphhxmyp9h07088xxi"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; };
   medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; };
   medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; };
   mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; };
   mefa4 = derive2 { name="mefa4"; version="0.3-4"; sha256="11zg30i2fkxdv8fn7jilbmm7k5g0ls8f91bpq6qiwiagwg8gj2lh"; depends=[Matrix pbapply]; };
   meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; };
-  meltt = derive2 { name="meltt"; version="0.3.0"; sha256="0hg9madjiiq5gm4mnx3y4gg1j04997ijxd1g6hyppxmpchi0yk61"; depends=[ggmap ggplot2 plotGoogleMaps plyr reticulate scales sp]; };
+  meltt = derive2 { name="meltt"; version="0.3.1"; sha256="0aypq23pdkb0q72g81ffylc0skm26p2wcy23byn86ydn09bbazk5"; depends=[ggmap ggplot2 plotGoogleMaps plyr reticulate scales sp]; };
   melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; };
-  mem = derive2 { name="mem"; version="2.8"; sha256="1kak73ajw50i6y2j26hz46dxihzzj820l6yhpk4z6zscp5bwcrwl"; depends=[boot mixtools RColorBrewer reshape2 sm stringr]; };
-  memapp = derive2 { name="memapp"; version="2.2"; sha256="0y6qhr3fx44n4g7y3n7p7f75z7qhv07f0y3kzrm900v61vkqbbzk"; depends=[DT formattable ggplot2 ggthemes mem openxlsx plotly RColorBrewer readxl reshape2 RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr]; };
+  mem = derive2 { name="mem"; version="2.9"; sha256="0syfhvxqxc2gcrmcpfgb3qafdih1dxkkg73gwg6cv8ly4406qhk5"; depends=[boot mixtools RColorBrewer reshape2 sm stringr]; };
+  memapp = derive2 { name="memapp"; version="2.3"; sha256="0zsmrxnshyxzi18krrl6652wdwvgbaxwl8sxvjixf2j3chz6m6qd"; depends=[DT formattable ggplot2 ggthemes mem openxlsx plotly RColorBrewer readxl reshape2 RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr]; };
   memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; };
-  memisc = derive2 { name="memisc"; version="0.99.8"; sha256="1wdh8qsf6n3zg5hkgjngnabbabi0kq31prcscm39kfiv3jmvh7pk"; depends=[lattice MASS]; };
+  memisc = derive2 { name="memisc"; version="0.99.13.2"; sha256="0jq55j3a5qfwcrakyhrhifyq0q484ws34zk9dpkrkbnjzyqfg4ap"; depends=[lattice MASS repr]; };
   memo = derive2 { name="memo"; version="1.0"; sha256="1pqlsn79gpm0d5bxnjg1c1gjaqdrdvcjvr84zpfk6nmsb2862w48"; depends=[digest]; };
   memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; };
   memuse = derive2 { name="memuse"; version="3.0-1"; sha256="1fxjw209sjk9cfbbfw1ixnf2s8zzc73gnksxa9qax4mp6145i1w5"; depends=[]; };
-  merDeriv = derive2 { name="merDeriv"; version="0.1-1"; sha256="1bkpn4a4g9ps0wzrw77w0lj14h6rdpz1bicwqvv98316ggv0zkxw"; depends=[lme4 Matrix nonnest2 sandwich]; };
+  merDeriv = derive2 { name="merDeriv"; version="0.1-2"; sha256="05z0lkhmxbw82sy3qlyyb58fwbillx296ay3sskbz1clj0plph82"; depends=[lme4 Matrix nonnest2 sandwich]; };
   merTools = derive2 { name="merTools"; version="0.3.0"; sha256="1kc32zm1wmmivf1qfs6vi7y8kwibj6sr540is82dyh7xdmbc5mx3"; depends=[abind arm blme broom dplyr DT ggplot2 lme4 mvtnorm shiny]; };
   merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; };
   meshsimp = derive2 { name="meshsimp"; version="0.1.1"; sha256="0cdgq4vfjf0h6l55v687k5xs0nwmlpqmw424xgnsfnwxw5ljcvb1"; depends=[plot3D Rcpp RcppEigen]; };
   metRology = derive2 { name="metRology"; version="0.9-23-2"; sha256="16hdcrqa15mf2cfgl6r9awd0y2kwrdbld8sxqmwnchlvdbm6gib4"; depends=[MASS numDeriv robustbase]; };
   metScanR = derive2 { name="metScanR"; version="1.0.0"; sha256="0fy4r1bwi792f5z7d2c49yzx9flc6fhfmjxn0d0m4cci634nf1cb"; depends=[geosphere ggmap leaflet plotly plyr RColorBrewer RCurl rjson sp]; };
-  meta = derive2 { name="meta"; version="4.8-2"; sha256="154cw0b0hdl63509ybz7bjnrxwgf9r0lidzc2b4v4if814dlm4gl"; depends=[]; };
+  meta = derive2 { name="meta"; version="4.8-4"; sha256="0s2f1n404gfjf4k1h7x3jcys56x83y35zir7gyc32ydn88zfn57z"; depends=[]; };
   meta4diag = derive2 { name="meta4diag"; version="2.0.5"; sha256="0hwzwyzr23sqlqpx2372419167wad1q7spyzmcxhf4f5hmqv14c9"; depends=[caTools shiny shinyBS sp]; };
+  metaBMA = derive2 { name="metaBMA"; version="0.3.9"; sha256="14c3q4aw89r3apzm0ils886xsc6agbn8d2wgp47dc2ddwf5n8p58"; depends=[coda LaplacesDemon logspline mvtnorm runjags]; };
   metaLik = derive2 { name="metaLik"; version="0.42.0"; sha256="1rk5mwgmgnqq2hrzbh936hzw3aa815l12r1a1qywap5ggmmyhszl"; depends=[]; };
   metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
   metaMix = derive2 { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table ggplot2 gtools Matrix Rmpi]; };
@@ -7304,7 +7517,7 @@ in with self; {
   metaSEM = derive2 { name="metaSEM"; version="0.9.14"; sha256="0hzx2wp81hf3dkkq3vq8dpi8cxhkas6xv3zj822zchc1nwk4dn8g"; depends=[ellipse MASS Matrix mvtnorm OpenMx]; };
   metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; };
   metacoder = derive2 { name="metacoder"; version="0.1.3"; sha256="1kbxv4gvpq33vg0ri9mqkaqxlqhnccycha30dv48n4m4f3s7h8ad"; depends=[ape dplyr ggplot2 igraph lazyeval magrittr RColorBrewer RCurl readr reshape reshape2 scales seqinr stringr taxize traits zoo]; };
-  metacom = derive2 { name="metacom"; version="1.4.6"; sha256="0qqjfy5cqfpyd5906d49rkc67zrj8rp28zk2ii49dwddi2nhj4yy"; depends=[vegan]; };
+  metacom = derive2 { name="metacom"; version="1.4.7"; sha256="1xy86jc23h6l8lrcrs6ajbwqka20s6nyzyjyfzqj94k3idzcwqlk"; depends=[vegan]; };
   metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; };
   metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; };
   metafor = derive2 { name="metafor"; version="2.0-0"; sha256="0h14wd7hr1d40p5r70f2jgdgj24jwpnr4nrj6yp5qjr466v81z96"; depends=[Matrix nlme]; };
@@ -7313,15 +7526,15 @@ in with self; {
   metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; };
   metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; };
   metamisc = derive2 { name="metamisc"; version="0.1.5"; sha256="1rq5bqdij71gf06i20mj6491pv6xjwyjj4m2qhzg41g4dn0bfsac"; depends=[ellipse lme4 metafor mvtnorm]; };
-  metansue = derive2 { name="metansue"; version="1.2"; sha256="0gcysmi4lvl4496vygc7v58pd4sgz013mr8nqb870s861jwjj31v"; depends=[]; };
+  metansue = derive2 { name="metansue"; version="2.0"; sha256="102cddahlzm0b76y6pr7jxqxf28j6y3hsjd17fpnyvrwnzhqbz5m"; depends=[]; };
   metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; };
-  metaplot = derive2 { name="metaplot"; version="0.1.2"; sha256="1g8068vx5dk7k66d30b6i8rd73yh6pskm650wrz6mymg1bb94rvk"; depends=[dplyr encode fold lattice lazyeval magrittr]; };
+  metaplot = derive2 { name="metaplot"; version="0.1.6"; sha256="0fkgsi6jbpp3fchl9dc4bn9ccjhvcn0s7ij7lvpwkvbxvfjwjsml"; depends=[dplyr encode fold lattice lazyeval magrittr rlang]; };
   metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; };
   metaplus = derive2 { name="metaplus"; version="0.7-9"; sha256="1hrczccszx9jcgifwg6wsigsbm8ih4xjr00knb0rxyygijk38c82"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
   metasens = derive2 { name="metasens"; version="0.3-1"; sha256="0nxvllfa2x6v2hpgind5xr0i40wi7cpdd18lwgy9s4jpgbn0n17p"; depends=[meta]; };
   metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
   metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; };
-  metaviz = derive2 { name="metaviz"; version="0.1.0"; sha256="1cl44dvd625sfz906cggrj092bxy35vsiglalsay9frsi440d82p"; depends=[ggplot2 plyr RColorBrewer]; };
+  metaviz = derive2 { name="metaviz"; version="0.1.1"; sha256="1myhh16a7mad4gidl2xhnfv940gjqhbl8rlg6vrwvawgaiwigbxp"; depends=[ggplot2 metafor nullabor plyr RColorBrewer]; };
   meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; };
   meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
   meteoForecast = derive2 { name="meteoForecast"; version="0.51"; sha256="1k5m561b6hpqvzrg5l16523ig1rxcsi4s172jmya039cwyk8mqfp"; depends=[ncdf4 raster sp XML zoo]; };
@@ -7337,7 +7550,7 @@ in with self; {
   mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; };
   mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; };
   mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; };
-  mgcv = derive2 { name="mgcv"; version="1.8-17"; sha256="1zj223l4a3j15d3c01wv7dkzn9w6084gxrq5600ck9rvr0lfpwwg"; depends=[Matrix nlme]; };
+  mgcv = derive2 { name="mgcv"; version="1.8-18"; sha256="011mgcypr56xvm9nizsfsb2285kzql93x0d3lzg849g39vbpp4s2"; depends=[Matrix nlme]; };
   mglR = derive2 { name="mglR"; version="0.1.0"; sha256="1b7nd913d4a1szgw2qnhlnjqhfxr95xag6jwjcb2wnnxd12lib7n"; depends=[biomaRt dplyr gdata ggplot2 gplots magrittr stringr]; };
   mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
   mgm = derive2 { name="mgm"; version="1.2-1"; sha256="131zw61d2g39pzgy7ap95ah6mgbbybcpci665cxshascmlki3rpr"; depends=[glmnet Hmisc matrixcalc stringr]; };
@@ -7350,7 +7563,7 @@ in with self; {
   mhurdle = derive2 { name="mhurdle"; version="1.1-7"; sha256="06ph0vbm7yk5388v2aww6nmi2rhjhfjj1hl506a41m5k6hf746pk"; depends=[Formula maxLik survival texreg truncreg]; };
   mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; };
   miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; };
-  miRNAss = derive2 { name="miRNAss"; version="1.1"; sha256="1mpwr4qb3mzasl5q0d9hr6a023nqgmhq4iq4bknkghnsjf5jr85p"; depends=[CORElearn Matrix Rcpp RSpectra]; };
+  miRNAss = derive2 { name="miRNAss"; version="1.2"; sha256="001pknxjlkdrpcvv2rrjgciyn26j8d65vjwni2pz9lxjvrww9kvb"; depends=[CORElearn Matrix Rcpp RSpectra]; };
   miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
   miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; };
   micEcon = derive2 { name="micEcon"; version="0.6-14"; sha256="1d3cdg36ighyhly5by9gl6lxkdvx2agb5cv2mf77pwwd7rpq35h3"; depends=[miscTools plm]; };
@@ -7359,10 +7572,10 @@ in with self; {
   micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; };
   micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
   mice = derive2 { name="mice"; version="2.30"; sha256="1r673x51vs3w7kz4bkp2rih4445hcmajw86gjwz7m2piajwvs817"; depends=[lattice MASS nnet Rcpp rpart survival]; };
-  miceadds = derive2 { name="miceadds"; version="2.5-9"; sha256="1dyhcsydmcgbzjwl6fvxyr1dbzp6wbpqy39l9slvyh6dycfws9wz"; depends=[blme car CDM foreign grouped lme4 MASS MCMCglmm mice mitools multiwayvcov mvtnorm Rcpp RcppArmadillo sirt sjlabelled TAM]; };
-  micemd = derive2 { name="micemd"; version="1.0.0"; sha256="0zzdykkhl87qzklxvn5h6x9lvbg1mix5xhglk3cii8qrq4c6jik2"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
+  miceadds = derive2 { name="miceadds"; version="2.6-21"; sha256="05jv6w4r40k9z81i0jzyz3mmcxf2m142dwcmgxams0nb76n446wn"; depends=[CDM lme4 mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; };
+  micemd = derive2 { name="micemd"; version="1.1.0"; sha256="0y452xsrxdcb3kahya1f969lrf9lq9cv7zxsdf329x3q563lrcsm"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
   micompr = derive2 { name="micompr"; version="1.0.2"; sha256="1hmxi5wz7vfnvawh50zk316gr3ry59m820ddj2v9p7cxq21hwv9i"; depends=[]; };
-  microPop = derive2 { name="microPop"; version="1.2"; sha256="1gx5x4csqbqdxnzyfj72p8d5dw5qn5y1ijfas7q1vbfv65sdkak3"; depends=[deSolve]; };
+  microPop = derive2 { name="microPop"; version="1.3"; sha256="072qldi020m84j9crfvzvw2nzn5fagqmjjzb7g7i70zwqhl1kjsa"; depends=[deSolve]; };
   microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; };
   microbenchmark = derive2 { name="microbenchmark"; version="1.4-2.1"; sha256="0qn5r1a6qidghcisc2hpbdmj62pnixc3zz6p4ipk8mvakf0hdsvg"; depends=[ggplot2]; };
   microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; };
@@ -7372,6 +7585,7 @@ in with self; {
   micropan = derive2 { name="micropan"; version="1.1.2"; sha256="0rvaampr5vlpz253lhy330380646g2vqj1hqp6gsk0gp0hdlkd7g"; depends=[igraph microseq]; };
   microplot = derive2 { name="microplot"; version="1.0-16"; sha256="144rj86lkjkmwlqwlwmnagvlknhg0wg92kabpfpz2w0swfhfa742"; depends=[Hmisc]; };
   microseq = derive2 { name="microseq"; version="1.2"; sha256="14w1fycw0jgrc5g0ygks9j28hy37li057qf097qnp18w05jk3hws"; depends=[Rcpp]; };
+  midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; };
   midasr = derive2 { name="midasr"; version="0.6"; sha256="1sg6m36jg3b6znfg97ln5a6b4z36xkyjvgxk7wmqdq3h528z8613"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
   midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; };
   midrangeMCP = derive2 { name="midrangeMCP"; version="1.3"; sha256="1733dlhzbgrjdzd88rh9dkqhxh05gr078sbmihab7whbrpsq8068"; depends=[SMR WriteXLS xtable]; };
@@ -7381,9 +7595,9 @@ in with self; {
   milr = derive2 { name="milr"; version="0.3.0"; sha256="0z4d22fd6gd3zbi973vws9jqyh4c4m4i4ajcpxv934vxmbj0cma9"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; };
   mime = derive2 { name="mime"; version="0.5"; sha256="0i91m3ivaja1k33jwcvz16pfjypkci27awm8glil7sxhmwaj3izw"; depends=[]; };
   minPtest = derive2 { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[Epi scrime]; };
-  mindr = derive2 { name="mindr"; version="1.0.4"; sha256="0mvpa0g3hf8gp6ygibyib0kz0b1hgm6d2392yznmp59g5bvz1paa"; depends=[]; };
-  minerva = derive2 { name="minerva"; version="1.4.5"; sha256="0k6hyfh1lr345718vl1ssqgm5567nylk158awygmbjgkv8g8v2av"; depends=[]; };
-  miniCRAN = derive2 { name="miniCRAN"; version="0.2.7"; sha256="0ijvsc0aqhcyy5fmxjh7ks4f40l5hm3p485x80a475bmjrh9g15w"; depends=[httr XML]; };
+  mindr = derive2 { name="mindr"; version="1.1.0"; sha256="102r7m6jiadgmkw4w7535ba2qfxknj00y4b9hhawcjqm5v67jipz"; depends=[htmlwidgets]; };
+  minerva = derive2 { name="minerva"; version="1.4.7"; sha256="19snlbnk4y0lj7kfypa2g1d1s7bl3xkrxabn8p15hlwwcfb0x7vm"; depends=[]; };
+  miniCRAN = derive2 { name="miniCRAN"; version="0.2.9"; sha256="1zf2488ycx24b6rf1b4mql5rf6kqlhs5v6rx7mdz7jvbcmfm6ijk"; depends=[httr igraph magrittr XML]; };
   miniGUI = derive2 { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; };
   miniUI = derive2 { name="miniUI"; version="0.1.1"; sha256="1qfca55phw6614qh5ligvqawpyvpb08x7ky44sffwxgff4h074lw"; depends=[htmltools shiny]; };
   minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; };
@@ -7397,8 +7611,8 @@ in with self; {
   minval = derive2 { name="minval"; version="0.8"; sha256="05yqr2b5x17kpp4661x6p4pjszmvz2bad43z8m3qnvaa29zhd3n3"; depends=[]; };
   minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
   mipfp = derive2 { name="mipfp"; version="3.1"; sha256="18cfv8s38cd0g1wc5pry6a4m2ykqflkxhqbqnjbjvmr42bj3r6sp"; depends=[cmm numDeriv Rsolnp]; };
-  mirt = derive2 { name="mirt"; version="1.24"; sha256="1hlhcb5mzccispwk26caqaykqqpx600awjsw5xyi5bzlpn2llv5p"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; };
-  mirtCAT = derive2 { name="mirtCAT"; version="1.5"; sha256="032d73am0nligja1wfj5b2gnfb0yiivipajvy1wfx46wi7dv8i12"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
+  mirt = derive2 { name="mirt"; version="1.25"; sha256="11ssbf4lsamj7xcf2frsdmbyv6yd7rqggm4qy58nnpvbqrq2kkw4"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; };
+  mirtCAT = derive2 { name="mirtCAT"; version="1.6.1"; sha256="00jy27ilv1fw9ijhcyyi2lnxghyjb0dhpcqf1dqc6wi61wf5pagk"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
   misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
   miscF = derive2 { name="miscF"; version="0.1-3"; sha256="1djmsffwkicj25ndg07dnid6qj66b1rdw0yrv79jakjfbv71c13i"; depends=[BayesBridge BRugs MASS MCMCpack mvtnorm R2jags Rcpp RcppArmadillo]; };
   miscFuncs = derive2 { name="miscFuncs"; version="1.2-10"; sha256="1kqya581n76ff9avhj6xm6nwsbw7zlm4mwy0vyvdlqlf7c381qq0"; depends=[mvtnorm roxygen2]; };
@@ -7419,30 +7633,31 @@ in with self; {
   mixAK = derive2 { name="mixAK"; version="5.0"; sha256="1lb3ivcl64vny21gifll6sc2yaf970mvb1hwlch1k49125ybxz5q"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
   mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; };
   mixKernel = derive2 { name="mixKernel"; version="0.1"; sha256="0p0m081ivpc22z3p8308z12fcdjnid86niwk4i97dvz12dr8v9ws"; depends=[corrplot ggplot2 LDRTools mixOmics phyloseq psych quadprog]; };
-  mixOmics = derive2 { name="mixOmics"; version="6.1.3"; sha256="1843gvsm2rd4pmcb6ysq2x39cmipsyyaq6rkdwi8w76sn1r7myhl"; depends=[corpcor dplyr ellipse ggplot2 igraph lattice MASS plyr RColorBrewer reshape2 rgl tidyr]; };
+  mixOmics = derive2 { name="mixOmics"; version="6.2.0"; sha256="1vgm6sxxlycv99sp58s8vrqlbpn8r0qw2kmi19mmsyi6vz841cln"; depends=[corpcor dplyr ellipse ggplot2 igraph lattice MASS plyr RColorBrewer reshape2 rgl tidyr]; };
   mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
   mixR = derive2 { name="mixR"; version="0.1.0"; sha256="16rl1ggavs1qfq4i3jm85acd0w2zbiacnvnnim3vi3kqa9i09byy"; depends=[ggplot2 Rcpp]; };
   mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
   mixcat = derive2 { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
   mixdist = derive2 { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
   mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; };
-  mixedsde = derive2 { name="mixedsde"; version="2.0"; sha256="04ljpy2vyqyin9b1zn0awp43c33ch6zsgdrp6whii1ql9pcinkcl"; depends=[MASS moments plot3D sde]; };
+  mixedsde = derive2 { name="mixedsde"; version="3.0"; sha256="1libm4pyzfqi11hcx823qdhgshdsy84dzv7jhz3b89w9bkla5l17"; depends=[MASS moments plot3D sde]; };
   mixer = derive2 { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; };
   mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; };
-  mixlink = derive2 { name="mixlink"; version="0.1.4"; sha256="138q48k9bz7dc18fdi6g7ra10b08avwa7xnvw7i8f1fdjk6h2zpc"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; };
+  mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; };
   mixlm = derive2 { name="mixlm"; version="1.2.1"; sha256="0gh3w7nhnzwq65b9fs2m4dfhy6n04mw09s3q5sjlxrw571v0h1pl"; depends=[car leaps multcomp pls pracma]; };
   mixor = derive2 { name="mixor"; version="1.0.3"; sha256="1qnrfd0hggad81rn8ryfm9l0cpd59ifj9sxc1bav35bma535azdv"; depends=[]; };
   mixpack = derive2 { name="mixpack"; version="0.3.6"; sha256="0q19mal86qlriwilabgy3sn33iymi5hl3wa33kvb8cd1dgdmjr7a"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   mixreg = derive2 { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
-  mixsmsn = derive2 { name="mixsmsn"; version="1.1-2"; sha256="02hincq7bflmyvdahjmkcdpr6vwxjw5hrbvld38riwv2kw4wmn4l"; depends=[mvtnorm]; };
+  mixsmsn = derive2 { name="mixsmsn"; version="1.1-4"; sha256="1y15qjh6qzx3aqlv4pndmgk2mgkqpyxcd76ykn31qd8mwzddci9d"; depends=[mvtnorm]; };
   mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
   mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; };
   mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; };
   mixture = derive2 { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; };
+  mize = derive2 { name="mize"; version="0.1.1"; sha256="18mnpwwbwlyx0ixsjqai28ahp4g0wncv8c5qwy17xq2zbhwlq3jh"; depends=[]; };
   mizer = derive2 { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; };
   mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
-  mkin = derive2 { name="mkin"; version="0.9.45"; sha256="0p47xaxyakah4qwkymzc4qvs9i9g764laikw9vlmjyjv0j0zn9cx"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; };
+  mkin = derive2 { name="mkin"; version="0.9.46"; sha256="0b4sw7xw8qvdab0a3qh8j7khaa5vinhxrgmnnwnxkmiqv33b08i7"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; };
   mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
   mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; };
   mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
@@ -7468,10 +7683,10 @@ in with self; {
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
   mlt = derive2 { name="mlt"; version="0.2-0"; sha256="09pvqyyzlb76x47v2lbgsdrld0z0r1v3c29q3a0dsx62ia367mqr"; depends=[alabama basefun BB numDeriv quadprog sandwich survival variables]; };
   mlt_docreg = derive2 { name="mlt.docreg"; version="0.2-0"; sha256="1n23bjfjacyq7b9n47ai9is8p0ka6m36085c0q1i47zpz5kv6d5k"; depends=[mlt numDeriv]; };
-  mltools = derive2 { name="mltools"; version="0.3.0"; sha256="15i9w5qa986wnn9vlzy5f3nf0pccd80a9silxjxi77hls80snvgq"; depends=[data_table Matrix]; };
+  mltools = derive2 { name="mltools"; version="0.3.1"; sha256="0a439cgkpvm5b00s4jss21x5cqlik8ncwd4vfa1qwzrr73kzvksp"; depends=[data_table Matrix]; };
   mlxR = derive2 { name="mlxR"; version="3.2.0"; sha256="1a0104h4b0qag20xv5sg8m4b0ndvz843lnc4jypfxns3bi5k4v1m"; depends=[ggplot2 Rcpp XML]; };
   mma = derive2 { name="mma"; version="5.0-0"; sha256="1k65ar8nhv7ya254ap94hbx91siqcwxlg3yac85xxxs9rr6b27bf"; depends=[car doParallel foreach gbm gplots survival]; };
-  mmand = derive2 { name="mmand"; version="1.5.0"; sha256="1snakabn77y5mmyab5djkd87ld1hv5kl91bb2hwial8vkjpv9cq5"; depends=[Rcpp]; };
+  mmand = derive2 { name="mmand"; version="1.5.2"; sha256="11fvicwkiw5r6yg7psqarfkb0cfsjj87lz0d4mr1hrncfrz0yz55"; depends=[Rcpp]; };
   mmap = derive2 { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
   mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; };
   mmcm = derive2 { name="mmcm"; version="1.2-6"; sha256="0lk2lk8j4hq6shw3vpq53gvh2w1gwkayvgfny4i04k5fglbwivg7"; depends=[mvtnorm]; };
@@ -7486,10 +7701,12 @@ in with self; {
   mmpp = derive2 { name="mmpp"; version="0.4"; sha256="120ciyd9c6zwbdvzcpasb1476d0i9h28a1a5c99z3zar8lpp184p"; depends=[]; };
   mmppr = derive2 { name="mmppr"; version="0.1"; sha256="0fswkqcw0xkqd9gmqabb61i32zscp5jzfx0z43wq7mrlwynryylv"; depends=[expm reshape2]; };
   mmtfa = derive2 { name="mmtfa"; version="0.1"; sha256="113bpcb05i78y78byrdn9j45dfcar7q8z7qmlid8cl6b8cjv1vfz"; depends=[matrixStats mvnfast]; };
-  mnis = derive2 { name="mnis"; version="0.2.6"; sha256="1jss648lr7ypr462jq009lawvfhbxih6c9max75dykrz2q2m8mjx"; depends=[dplyr httr jsonlite Rcpp stringi tibble]; };
+  mmtsne = derive2 { name="mmtsne"; version="0.1.0"; sha256="1by0hrggla6idc1isnq072i1wfpw4x7id3hkg8l65gy8iycccd12"; depends=[]; };
+  mnis = derive2 { name="mnis"; version="0.2.7"; sha256="1yhhgrhsk3ww93vd29ipw16bkn16w0b2i7d46cb5bb5xs4s7vivd"; depends=[dplyr httr jsonlite Rcpp stringi tibble]; };
   mnlogit = derive2 { name="mnlogit"; version="1.2.5"; sha256="0vwragk71hisz7dy4h5i6zl9yp6wvzwlnfyw2kprnd94y02laq63"; depends=[Formula lmtest mlogit]; };
   mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
   mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; };
+  mnreadR = derive2 { name="mnreadR"; version="0.1.0"; sha256="0sw4hinfcxnj906zfv6yhwf6c9khlfqp1biga32agvvkgnk5b1ni"; depends=[dplyr]; };
   mockery = derive2 { name="mockery"; version="0.3.0"; sha256="1ydgxqdzwn68b84a7557nasgm1r5jk2mivzwq9x71p7zwqf4c8vd"; depends=[testthat]; };
   mockr = derive2 { name="mockr"; version="0.1"; sha256="0340v6189ivlzzriwk7yhf3v2k651x05fd1xrqfxxjgwhysaqj6z"; depends=[lazyeval]; };
   mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; };
@@ -7501,25 +7718,25 @@ in with self; {
   modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; };
   modelObj = derive2 { name="modelObj"; version="3.0"; sha256="0wc67zsh26zyr7x9s229g2mppfk6g6z12j74zj2bdhk2m7i2x3zq"; depends=[]; };
   modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
-  modelr = derive2 { name="modelr"; version="0.1.0"; sha256="1vrhszix1kq5p02i044vjlbpmkdgn6ifg1jk00if7bn33sb872vy"; depends=[broom dplyr lazyeval magrittr purrr tibble tidyr]; };
+  modelr = derive2 { name="modelr"; version="0.1.1"; sha256="1rqw0b583vp107zqp4h3wj51dvv4hb3wszfr1f5f48xassc53f95"; depends=[broom dplyr lazyeval magrittr purrr tibble tidyr]; };
   modeltools = derive2 { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; };
   modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; };
   modest = derive2 { name="modest"; version="0.1"; sha256="0nwa71pk015pqamiyrbcq0pxdq43mvcq8zpvfn2xmzcjhm30770b"; depends=[knitr shiny shinyBS]; };
   modeval = derive2 { name="modeval"; version="0.1.3"; sha256="10yjba2dlwrgd3ycw10y1sa3xdxf2spq829bbxwfissc5l9gk48x"; depends=[caret dplyr e1071 ggplot2 gridExtra knitr magrittr mlbench ModelMetrics psych purrr stringr tibble]; };
   modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
-  modmarg = derive2 { name="modmarg"; version="0.5.0"; sha256="00ccgcmk13zpiq96n7clag1a2mav76z2njfnvn79lxnp5rfx2rjb"; depends=[]; };
+  modmarg = derive2 { name="modmarg"; version="0.6.0"; sha256="0ncfpsbaby03fbpkgdlx0yfcvqiydlb4fsnc869kf6yzs8vv5ifj"; depends=[]; };
   moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
-  modules = derive2 { name="modules"; version="0.5.0"; sha256="1dwvwdfshhdv7fk346l8czbkq0f1im0xfci3pzzinkdlfi3m0h2a"; depends=[stringr]; };
+  modules = derive2 { name="modules"; version="0.6.0"; sha256="0nzypmx8p84dd7pdw7ilrjrc2nji5qzwylb9yn1zmr8wp5lzvidc"; depends=[stringr]; };
   modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; };
   moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; };
   mogavs = derive2 { name="mogavs"; version="1.0.1"; sha256="1bzjrcisbg0fb8kj8x9ngd9i1nrhif1rdacz6nrny6xrmw0m3ckp"; depends=[cvTools]; };
-  mokken = derive2 { name="mokken"; version="2.8.5"; sha256="1f45yacq50g0xfvipv3vxrcy20d69q2ijvnx1byxphzfkqjvrlj4"; depends=[poLCA]; };
-  moko = derive2 { name="moko"; version="1.0.0"; sha256="0nsj83hn0kflsw15ghw6b5zjsd875vj9vj7i0ag67cn2n82yncb5"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; };
+  mokken = derive2 { name="mokken"; version="2.8.7"; sha256="04crg01wshvb88s4kw1sfdyywm7zzprc7mi2nxymrllppz2msd4w"; depends=[poLCA]; };
+  moko = derive2 { name="moko"; version="1.0.1"; sha256="1d1gyv44z8k196hfh8a9iccmlrwb42bj1xzabs07h306gpi9m73d"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; };
   molaR = derive2 { name="molaR"; version="4.2"; sha256="1xz4vfb9rkw731cxjqvh7hpcm2lly9hmxp951il536gwb665jh1j"; depends=[alphahull rgl Rvcg]; };
   mombf = derive2 { name="mombf"; version="1.9.5"; sha256="1s776bvfkivif7i3338l1pk8qi5b6b7sxb9zgcidw4kwmj388rdd"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
   momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; };
   moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
-  momentuHMM = derive2 { name="momentuHMM"; version="1.0.0"; sha256="12slwnc7wxk72an5fv6y85bmi9yxcms00y0jq5z30midxjyja8ry"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach ggmap ggplot2 gstat MASS mitools moveHMM mvtnorm nleqslv numDeriv qdapRegex raster Rcpp RcppArmadillo sp splines2 survival]; };
+  momentuHMM = derive2 { name="momentuHMM"; version="1.1.0"; sha256="1iwx6hbrfvpfgyhsfq8hibmvc0v3s209pdmvskgp4w9lhfljfxvb"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach geosphere ggmap ggplot2 gstat MASS mitools moveHMM mvtnorm nleqslv numDeriv qdapRegex raster Rcpp RcppArmadillo sp splines2 survival]; };
   momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
   mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
   mongolite = derive2 { name="mongolite"; version="1.2"; sha256="19zhscsgqvzx5gqryzl82dw6impc6sacx2shanmnj4zfgs7bgwqr"; depends=[jsonlite openssl]; };
@@ -7537,21 +7754,22 @@ in with self; {
   mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
   morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
   morse = derive2 { name="morse"; version="2.2.0"; sha256="0l52hwhbspf1d6wi0qnwgwjjc1kkixkfdsf81jvwshnxbci4s3kw"; depends=[coda dplyr epitools ggplot2 gridExtra reshape2 rjags stringr]; };
-  mosaic = derive2 { name="mosaic"; version="0.14.4"; sha256="0dvlykr05jjpnjcvkffmjpc83bnbvg7i5zkjr2y1c7h16hy9d5wz"; depends=[dplyr ggdendro ggplot2 gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicData readr tidyr]; };
+  mosaic = derive2 { name="mosaic"; version="1.0.0"; sha256="0ih7m5x0h32z36k0fpi1s6gj06zajbbg09hl9ff6c32p6mw171vz"; depends=[dplyr ggdendro ggformula ggplot2 glue gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicCore mosaicData readr tidyr]; };
+  mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.0"; sha256="05s14rmgi15xcz50hcz7l26l95yx9g4i3kihzh0laz8bpi443i39"; depends=[MASS mosaic mosaicCore]; };
+  mosaicCore = derive2 { name="mosaicCore"; version="0.2.0"; sha256="16qgdjkig8srazn8rbrhmv6z9rhvyb0m2lv9n11x662xhpbbq6nw"; depends=[dplyr lazyeval rlang tidyr]; };
   mosaicData = derive2 { name="mosaicData"; version="0.14.0"; sha256="0f092wp2lpj8rk6r2bd5mxp4q3n7ia9h838z8prrz56vwh3gbpw0"; depends=[]; };
   moult = derive2 { name="moult"; version="2.0.0"; sha256="177fhi3f5qsg2k4qb1cgviq96aln80qwri1hf9yym6wrzn8crj7r"; depends=[Formula Matrix]; };
-  mountainplot = derive2 { name="mountainplot"; version="1.1"; sha256="1l3m7jgq70g83mmfhlwzj5gkdnwgl14g9ljpk6j7z7qxapzva3bb"; depends=[lattice]; };
+  mountainplot = derive2 { name="mountainplot"; version="1.2"; sha256="1bbgkps1yhfa0lmapqkhhl5mc63p0gzszxw2g910dbi1cjc0pphx"; depends=[lattice]; };
   mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; };
   mousetrap = derive2 { name="mousetrap"; version="3.1.0"; sha256="1r1cpfn6bcgk66lw0la6r3bsv62yhp2m3jkwn0g8rbwrhp9jyl6p"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; };
   movMF = derive2 { name="movMF"; version="0.2-1"; sha256="1yrjz76bwhziwdj2xdibr3lxcka4nq32b6rq3m9q0vkv9gspmw6v"; depends=[clue skmeans slam]; };
-  move = derive2 { name="move"; version="2.1.0"; sha256="1dk83wdfwmxwr6zhy574h9n95kss0b0bprqd20gwwfk27mfjmc8h"; depends=[geosphere httr raster Rcpp rgdal sp]; };
-  moveHMM = derive2 { name="moveHMM"; version="1.4"; sha256="10sylvcmbbf599klmc11ayzh4r94dxl74xc5n61b8n6mbrsmmi2l"; depends=[boot CircStats ggmap ggplot2 MASS Rcpp RcppArmadillo sp]; };
-  moveVis = derive2 { name="moveVis"; version="0.9.4"; sha256="0vli8vhm3nzqgdkv5f1gx8y8fwci6y5dvavxlyhwmzhp6agvfsn4"; depends=[animation dismo geosphere ggplot2 gridExtra maptools move raster rasterVis RCurl reshape sp xts]; };
+  move = derive2 { name="move"; version="3.0.1"; sha256="1wfk8ak3nzybi525mfwffsqx7ikyizq4vvcx3wpzvk1gg9y3l5i5"; depends=[geosphere httr raster Rcpp rgdal sp xml2]; };
+  moveHMM = derive2 { name="moveHMM"; version="1.5"; sha256="16r0lp3lqnmplhagixyidgyg82zsxln22v9l9fgb07lxhszrs0rj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS Rcpp RcppArmadillo sp]; };
+  moveVis = derive2 { name="moveVis"; version="0.9.5"; sha256="1b48dmqlnd048m8rrfvkab226dxim7sgs5pqi3pblbpah9zlhcx4"; depends=[animation dismo geosphere ggplot2 gridExtra maptools move raster rasterVis RCurl reshape sp xts]; };
   moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.1"; sha256="020bl3i0i393dfknix03k8y70fjsf0lbw0mqrnhwsvz8kwrw3hi1"; depends=[move Rcpp]; };
   mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; };
-  mpMap = derive2 { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata qtl seriation wgaim]; };
   mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
-  mpath = derive2 { name="mpath"; version="0.2-4"; sha256="0razmc8cvalcv6ibkfh2snc6vyiwl20zpawx0yp261qhn8gkr5js"; depends=[doParallel foreach glmnet MASS numDeriv pscl]; };
+  mpath = derive2 { name="mpath"; version="0.3-3"; sha256="05izx1zh21xaqbm80xkfg9z2z1i6wm79dsms07mgn7h45ipa28p1"; depends=[bst doParallel foreach glmnet MASS numDeriv pscl]; };
   mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; };
   mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; };
   mpe = derive2 { name="mpe"; version="1.0"; sha256="17bgdbg1zrf78djd3mwycidwibxvsis7pwkrcynvghcc8l2zfci9"; depends=[mvtnorm]; };
@@ -7568,7 +7786,7 @@ in with self; {
   mrMLM = derive2 { name="mrMLM"; version="2.1"; sha256="0ip8xd2dj6d4hxq18pf4j6mk4yl00ajci72rr485wk94cr0zj5hy"; depends=[ggplot2 gWidgets gWidgetsRGtk2 lars MASS ncvreg openxlsx qqman RGtk2 RGtk2Extras stringr]; };
   mratios = derive2 { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
   mrbsizeR = derive2 { name="mrbsizeR"; version="1.0.1"; sha256="1gr8mx1byq8nw095yla4gn2ascgw4d90j7a3a3rzwfdavkjj7167"; depends=[fields maps]; };
-  mrds = derive2 { name="mrds"; version="2.1.17"; sha256="1vs9fldk9gcwvd1acwswzvblnkdm4bv3jmaamlrp3ik6vyd6xjvv"; depends=[mgcv numDeriv optimx Rsolnp]; };
+  mrds = derive2 { name="mrds"; version="2.1.18"; sha256="0nhfyl5vcisb9z33sm37vfgnfkkmikr2wwvsjq84jaw2x2jmbxvz"; depends=[mgcv numDeriv optimx Rsolnp]; };
   mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
   mregions = derive2 { name="mregions"; version="0.1.4"; sha256="1xlgbjm339wr2rs5i6ddyp1lmfgzjb53gw44c3cj1x5qx1jrp7b1"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; };
   mrfDepth = derive2 { name="mrfDepth"; version="1.0.4"; sha256="0dfx85yd4swd2cwm7pmxa3q7sgqkrj1sr145i13cdcp76wh95hp1"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; };
@@ -7583,10 +7801,10 @@ in with self; {
   msaR = derive2 { name="msaR"; version="0.2.0"; sha256="1yj70wxpqbjiwfskb68nx2criz3v426b1wnc9bnsl9cr417zhn9s"; depends=[ape htmlwidgets]; };
   msaenet = derive2 { name="msaenet"; version="2.6"; sha256="16h08jfghlzpbivglawm0qj4kgqnghx08p7dsqzwkxgywv6x6a2b"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; };
   msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
-  msarc = derive2 { name="msarc"; version="1.4.5"; sha256="1jv364502m6q2w039dmdhwsx5id39jc4xcabyrbwbrgy65kwfspg"; depends=[AnnotationDbi gplots RColorBrewer wordcloud XLConnect]; };
   mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; };
   mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; };
   msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; };
+  msde = derive2 { name="msde"; version="1.0"; sha256="00szyab9sazw89fc1wg35nx36y0xyrq3x78y69h07kr4wxzcd2rc"; depends=[Rcpp]; };
   mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; };
   msgl = derive2 { name="msgl"; version="2.3.6"; sha256="0qq9v8bb70iw67raygpzsg35nb2wdafp7rh7wzq42xd4gghi31ya"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
@@ -7605,6 +7823,7 @@ in with self; {
   mstate = derive2 { name="mstate"; version="0.2.10"; sha256="14namzs0s7v28xkj1pidccjpxg7570fdqhd64rihvyv1r7ybfyav"; depends=[RColorBrewer survival]; };
   mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; };
   mtconnectR = derive2 { name="mtconnectR"; version="1.1.0"; sha256="068rp4n2afl9qgqrnp0a4lmnq7mq9wrc2yi361bfvib96gzg1fdw"; depends=[data_table dplyr dtw ggplot2 magrittr plyr proxy stringr tidyr XML]; };
+  mthapower = derive2 { name="mthapower"; version="0.1.0"; sha256="17svh0q9a982a390fgwgvrc2kygxxgyacb3j6gcksbikjrvkcfpw"; depends=[]; };
   mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; };
   mtsdi = derive2 { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
   muRL = derive2 { name="muRL"; version="0.1-11"; sha256="1pyspp1wpd80hcla1zwnl3misqggfk0ls54akwnx5aa617bibzz8"; depends=[maps stringr]; };
@@ -7618,9 +7837,10 @@ in with self; {
   multcompView = derive2 { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; };
   multdyn = derive2 { name="multdyn"; version="1.5.1"; sha256="1rqvfgz3lcjb1lgzp2w6wzqdysj4c1qrw77nrdc14pgm59g2vvvl"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   multfisher = derive2 { name="multfisher"; version="1.0"; sha256="1pc3f6f87n29cb4caszp4arpy33pc3a0iwmrqinhyw66xjnqm8qp"; depends=[]; };
-  multgee = derive2 { name="multgee"; version="1.5.3"; sha256="0m7qgpygsax6f2gakrq19bkxvkl9kn8s4n3wy5lbijx01bay9jg2"; depends=[gnm VGAM]; };
+  multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; };
+  multiApply = derive2 { name="multiApply"; version="0.0.1"; sha256="1hgvvi00297rri9k5mnz7kmzpf1yxjmj153wwx4a68wv2mf9sx44"; depends=[abind doParallel foreach future plyr]; };
   multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
-  multiCA = derive2 { name="multiCA"; version="1.0"; sha256="1b4m4faaq57k322m7i7y0jqgj7mz4ch39fsn1via7cnd1rrzavq1"; depends=[bitops]; };
+  multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; };
   multiDimBio = derive2 { name="multiDimBio"; version="1.1.1"; sha256="0b0lymnli7w91bfd67dsvzbj3flxsrsmbg4a18mzch0j9y6a40x0"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; };
   multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; };
   multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; };
@@ -7629,23 +7849,24 @@ in with self; {
   multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; };
   multicool = derive2 { name="multicool"; version="0.1-10"; sha256="1ybg9piya9psqg42w9i3zsnavbxhkfklfwl7cb420i5nkq6wpc2v"; depends=[Rcpp]; };
   multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; };
-  multigraph = derive2 { name="multigraph"; version="0.60"; sha256="04akyy2qpazj9z4g51i404px2m018m0zjj3l50mgnk9mr25ivj2q"; depends=[multiplex]; };
+  multigraph = derive2 { name="multigraph"; version="0.71"; sha256="1h162vhx439fmkq0pi95d3lsrcjf06kii91hamj66dpjg9wma8q7"; depends=[multiplex]; };
   multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
   multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; };
   multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.4"; sha256="0v4mhdpagmkjsc8x4wlqxa88yl3v0y91a1bbq1lh3rhqfmp9yra5"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; };
-  multimark = derive2 { name="multimark"; version="2.0.0"; sha256="0pz0qd1dbblnbazlrkarqbw3y7qhvrrvdi6g3ch8qgkxjkmdxlwj"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; };
+  multimark = derive2 { name="multimark"; version="2.0.1"; sha256="0d283gvzqmdwr1sxgfb5ir9zw0sahj1wph7izcy1h63h6qlci828"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; };
   multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
-  multinet = derive2 { name="multinet"; version="1.0"; sha256="1ydwb86dylywj76sqsl1yy08mzgj8vqj1gkv9q683i9wc4k74281"; depends=[igraph Rcpp]; };
+  multinet = derive2 { name="multinet"; version="1.1"; sha256="0jhq6lhc81fl0m5zy7131xrdzvy4iqgixdbzc4klnzijzjsm22yi"; depends=[igraph Rcpp]; };
   multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
   multipanelfigure = derive2 { name="multipanelfigure"; version="0.9.0"; sha256="1vblwn15817xxixbcy2smsp51cjyfvh34c1v9ddxypj9ycx09zd3"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; };
   multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; };
-  multiplex = derive2 { name="multiplex"; version="2.6"; sha256="1vzgxhzm6m1jzn9svyw8ir2vgam860g57cwppj59gh4xbwf0gxnj"; depends=[]; };
+  multiplex = derive2 { name="multiplex"; version="2.7"; sha256="1da28sb2rsnhs3bisgc4npjky3v1rssqh4jb0l51p50p665b5sjz"; depends=[]; };
   multiplyr = derive2 { name="multiplyr"; version="0.1.1"; sha256="0bsf2zhzqwl3skg26fm27j2wpifky0mph26acrlq8p72njkbcw4d"; depends=[bigmemory bigmemory_sri magrittr]; };
   multipol = derive2 { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
   multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; };
-  multisensi = derive2 { name="multisensi"; version="2.0"; sha256="11al13flm3ywgfpj6s6g2jc38bw6pbalf6k5xgix05bgkdd5647s"; depends=[knitr sensitivity]; };
+  multisensi = derive2 { name="multisensi"; version="2.1"; sha256="17c1cddgzkgd583fh31wfjahpl5iv1casfs1aja000rqq1x2kfqm"; depends=[knitr sensitivity]; };
   multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; };
   multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; };
+  multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; };
   multitaper = derive2 { name="multitaper"; version="1.0-13"; sha256="1ckf9bhvd5k7ypaw2viqh3cyj9jij0ygcp4q9pxwqs508s6yx3a5"; depends=[]; };
   multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; };
   multiwave = derive2 { name="multiwave"; version="1.2"; sha256="1bw071izjxrsk5gx8s49nrlryabpgpg7k2z1ghmk8p6i9m5apnl8"; depends=[]; };
@@ -7663,7 +7884,7 @@ in with self; {
   mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; };
   mutoss = derive2 { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; };
   mutossGUI = derive2 { name="mutossGUI"; version="0.1-10"; sha256="16fgmpnym9nhiywqimjgv10swrvs3whp0nlzsw573vv0k6qjmwd2"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
-  mvLSW = derive2 { name="mvLSW"; version="1.1"; sha256="0nh3myycz8kagk1sks71i20602r82mh6nxczjnlnal5qwgp6zg80"; depends=[fields wavethresh xts zoo]; };
+  mvLSW = derive2 { name="mvLSW"; version="1.2"; sha256="0xa79asrb57c5jssyb51b95v5szv1006gh08bfwnlyjbbfngs4wd"; depends=[fields wavethresh xts zoo]; };
   mvMORPH = derive2 { name="mvMORPH"; version="1.0.9"; sha256="09368vgyb1s18awfr07hs1s40n2h15hy08fmir3ayhdfrdain4k6"; depends=[ape corpcor phytools spam subplex]; };
   mvPot = derive2 { name="mvPot"; version="0.1.2"; sha256="0ni953ncm8h4ap0gjimlxjypgjaj2crlx4vscqi7a158hphahj2g"; depends=[evd gmp MASS numbers]; };
   mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
@@ -7683,7 +7904,7 @@ in with self; {
   mvmeta = derive2 { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; };
   mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; };
   mvna = derive2 { name="mvna"; version="2.0"; sha256="0qy4s8v20ccjdgqj3lgnl903b7m1rgc5lq8w66d5dl41s0jlnmx6"; depends=[lattice]; };
-  mvnfast = derive2 { name="mvnfast"; version="0.2.0"; sha256="0r33jigwbj01isrc40rgisjy3nqn7yynmlwdxn7k8z06pg7mbxrm"; depends=[BH Rcpp RcppArmadillo]; };
+  mvnfast = derive2 { name="mvnfast"; version="0.2.2"; sha256="1b548cl6gf5vks90z7hf4nl5hbl5jb1r50vnpv1hsjv2qbn0k9hr"; depends=[BH Rcpp RcppArmadillo]; };
   mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; };
   mvnmle = derive2 { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; };
   mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
@@ -7698,9 +7919,9 @@ in with self; {
   mvtnorm = derive2 { name="mvtnorm"; version="1.0-6"; sha256="0i74s9dl4jf1gln6agra8h38qn9ifd5v0gi13caj1da5nrbmn0aa"; depends=[]; };
   mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
   mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
-  mwaved = derive2 { name="mwaved"; version="1.1.4"; sha256="09v3cx2scp8fjcjzsdf7k2xl5y2491hbp25mnbjvm6v16hi2g180"; depends=[Rcpp shiny]; };
+  mwaved = derive2 { name="mwaved"; version="1.1.5"; sha256="1hb7y42fy26pv6cf235g4xx1vyvwx7chwryi7phjd2aavxffj18z"; depends=[Rcpp shiny]; };
   mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-  myTAI = derive2 { name="myTAI"; version="0.5.0"; sha256="1lnqpp06qvwg2qrf4ilh059gkv105zkpcz2yrhzg4xl6581mz455"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; };
+  myTAI = derive2 { name="myTAI"; version="0.6.0"; sha256="15r3ipan491n8mvmq9b1bkwx99gy6inq0nxrk35kqjjhfv2bq7c4"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; };
   mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
   mycor = derive2 { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; };
   myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
@@ -7715,10 +7936,12 @@ in with self; {
   naivebayes = derive2 { name="naivebayes"; version="0.9.1"; sha256="051mg1idim75k181v4n8s5rji94rwy9c75yjkavjhr4brhizqy8f"; depends=[]; };
   namedCapture = derive2 { name="namedCapture"; version="2017.06.01"; sha256="14zimn3wbavbkwra8vfmqdm1q5bmlmsbg0b29cjly5dd4zlfzzb0"; depends=[]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
-  nandb = derive2 { name="nandb"; version="0.2.0"; sha256="0zxf3gmpxwj5b8w6svf49y8rxam98d0j3awd3s1y9nxh9rpaysxm"; depends=[abind autothresholdr BH BiocParallel dplyr EBImage filesstrings ggplot2 hexbin magrittr matrixStats ore purrr R_utils Rcpp RcppRoll readr reshape2 RSAGA stringr tibble tiff viridis]; };
+  nandb = derive2 { name="nandb"; version="0.2.1"; sha256="18xk1xk77a14n9dvwrhqihagiblawgacyicx37vbza01b4x502c5"; depends=[abind autothresholdr BH BiocParallel DescTools dplyr EBImage filesstrings ggplot2 hexbin magrittr matrixStats ore purrr R_utils Rcpp RcppRoll readr reshape2 RSAGA stringr tibble viridis]; };
+  naniar = derive2 { name="naniar"; version="0.1.0"; sha256="036izabfxc5mni7brxk0ksijypwq6hbbrib980z90i3zixgqjh1b"; depends=[dplyr forcats ggplot2 magrittr purrr purrrlyr rlang tibble tidyr viridis visdat]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
   nanotime = derive2 { name="nanotime"; version="0.2.0"; sha256="138qz844sczgzzl8vn5079590hnq96w7jdbn851cpw64gmq21r4w"; depends=[bit64 RcppCCTZ zoo]; };
   naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; };
+  nardl = derive2 { name="nardl"; version="0.1.0"; sha256="0rd4a9diz5mv7ra2c8d60yl407i8bnkxz2dq5iz02c6vm94j322v"; depends=[car]; };
   narray = derive2 { name="narray"; version="0.2.2"; sha256="0cxibb8lhv3in44xxln3fw6rf8c9a18bdhcdiyp3cpcm83h22nh7"; depends=[abind pryr reshape2 stringr]; };
   nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; };
   nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
@@ -7733,7 +7956,7 @@ in with self; {
   nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
   nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; };
   ncappc = derive2 { name="ncappc"; version="0.2.1.1"; sha256="19wq7ihcr8989xpzf1dsxz1kwwzqvsx2mwcciqv9204k4fc94zjc"; depends=[dplyr ggplot2 gridExtra gtable knitr lazyeval readr reshape2 scales testthat xtable]; };
-  ncar = derive2 { name="ncar"; version="0.3.4"; sha256="1q9744gj0mj7w6b28mala7lzmxy8q99jkkpi3png2awwr2ilznw7"; depends=[rtf]; };
+  ncar = derive2 { name="ncar"; version="0.3.7"; sha256="1cbcadyz84w629bz86sivfyf545w9cda078liq9l0j7gm5z5g2if"; depends=[NonCompart rtf]; };
   ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
   ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
   ncdf4 = derive2 { name="ncdf4"; version="1.16"; sha256="0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd"; depends=[]; };
@@ -7747,7 +7970,8 @@ in with self; {
   ndtv = derive2 { name="ndtv"; version="0.10.0"; sha256="1j4g5qclfbw7fkykaclrsb2d70vy40fd1rgr1n73qyrkx0fyym44"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
   nearfar = derive2 { name="nearfar"; version="1.1"; sha256="0i2nc1b4vslgjj29x5q24yxv9l3i0g5hcrbm9xy1b3039n70cwix"; depends=[car GenSA MASS nbpMatching]; };
   neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
-  neat = derive2 { name="neat"; version="1.1"; sha256="0pfwpdxyspwm11lhhw24vz8sfxjyn140a4n8rg5dc9v6krl1i0cg"; depends=[]; };
+  neat = derive2 { name="neat"; version="1.1.1"; sha256="12q9g8b0cf9j9cp0xc4h4bs4jv251arq9pf7c2hqgvirgr10ni2g"; depends=[igraph]; };
+  neatmaps = derive2 { name="neatmaps"; version="1.0.2"; sha256="01kxn6r77grxvb40k4w548dpal74j3sdr33622aqrjvg7r8w1w3k"; depends=[dendextend flexdashboard ggplot2 heatmaply igraph knitr plotly pvclust]; };
   needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; };
   needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
   negenes = derive2 { name="negenes"; version="1.0-5"; sha256="0fdhc0v0b820wfg3sypvya7zhg7mhfmdbfiwn1lj3a2xg01zvc2n"; depends=[]; };
@@ -7757,24 +7981,25 @@ in with self; {
   nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; };
   nestedRanksTest = derive2 { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
   net_security = derive2 { name="net.security"; version="0.3.0"; sha256="15vvcmakl9hl1srdhjf73g2bwwcxn93220i4gv0rcsw5732mjanz"; depends=[data_table dplyr jsonlite plyr R_utils stringr XML]; };
-  netClass = derive2 { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[AnnotationDbi graph igraph kernlab Matrix ROCR samr]; };
-  netCoin = derive2 { name="netCoin"; version="0.2.5"; sha256="0bhn7jhwr5jf8hmw4n86fg4994bhcjd6awcx96gm2qgf1j5r2m44"; depends=[igraph Matrix]; };
+  netCoin = derive2 { name="netCoin"; version="0.2.6"; sha256="0vg1kqkgqb93n5mdq1ivf4nals7iffdkdxccj5m54bvm2j65028l"; depends=[igraph Matrix]; };
   netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; };
   netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; };
-  netdiffuseR = derive2 { name="netdiffuseR"; version="1.17.0"; sha256="15yq903li51s2mbjp7bqrvk2zcf2yjmvvma2ynp325aqhwgvisf7"; depends=[boot igraph MASS Matrix network Rcpp RcppArmadillo sna SparseM]; };
+  netcom = derive2 { name="netcom"; version="1.0.4"; sha256="0fka14sffm0p1gldk27fd62ng05spfpbn665b4w5hdf1z4z0bs20"; depends=[clue expm igraph Matrix pdist pracma vegan]; };
+  netdiffuseR = derive2 { name="netdiffuseR"; version="1.18.1"; sha256="18wssrhdqwjd7v3gly3v6s9s32vzqa340s1cmizwzbmfsf8vzm0r"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM]; };
   netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; };
   netgsa = derive2 { name="netgsa"; version="3.0"; sha256="0cqyiilpxhdi6zmibn85y1aqwpcs1aialz34klakmllzn6kvdsng"; depends=[corpcor glasso glmnet igraph Matrix]; };
-  netmeta = derive2 { name="netmeta"; version="0.9-5"; sha256="0ybpm7r78nx82vbgzbk88ci2rnv2xs2y7pgl0drgl4d9ha24mdia"; depends=[magic MASS meta]; };
+  netmeta = derive2 { name="netmeta"; version="0.9-6"; sha256="077pwbyd1hj8mqhik410dpccyb6h605zrfw03sjynxvkhyf4pb5b"; depends=[magic MASS meta]; };
   nets = derive2 { name="nets"; version="0.8"; sha256="10h6sqy9jw2a909nzmzd5x9cjg3w4wpqwikp23k4q9fj71aswd5v"; depends=[igraph]; };
   nettools = derive2 { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; };
   network = derive2 { name="network"; version="1.13.0"; sha256="11sg330xb7gcnl3f6lwhhjdabz6mk43828i2np635pqw4s4yl13s"; depends=[]; };
   networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; };
   networkDynamic = derive2 { name="networkDynamic"; version="0.9.0"; sha256="1949fbcw0gq8lsm6rx5d5mpj1y9k4rk2v0pmm1kxi5igi6yd8lg9"; depends=[network statnet_common]; };
   networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; };
+  networkGen = derive2 { name="networkGen"; version="0.1.0"; sha256="0301a1vmkvnsiyii5hkmnqdw6gp8ipfqpvzgl7b5ca5fwhpad169"; depends=[igraph mgcv]; };
   networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
   networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; };
   networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; };
-  networktools = derive2 { name="networktools"; version="1.0.0"; sha256="00zp2mvxn3pgac6wdyhra64fk3i0h3vhf5f7y1v0pvdhhrz3wk6z"; depends=[devtools ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet qgraph reshape2]; };
+  networktools = derive2 { name="networktools"; version="1.1.0"; sha256="1arfanladgnk6gkswd4hbhvycf5zz70v0cj8300qza7ksmmyvl7v"; depends=[devtools ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet qgraph reshape2]; };
   neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; };
   neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
   neuralnet = derive2 { name="neuralnet"; version="1.33"; sha256="14ga04mcd793v9a2584jb9l7n20kw00fgy3gayfwrkr1j39szdls"; depends=[MASS]; };
@@ -7792,10 +8017,10 @@ in with self; {
   nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; };
   nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
   nima = derive2 { name="nima"; version="0.3.0"; sha256="10g0a8qa64sk16xrya3qhrlrjbjyq7ndv208xz36knp5az2n27ak"; depends=[assertthat ggplot2 gridExtra plyr survival]; };
-  nimble = derive2 { name="nimble"; version="0.6-5"; sha256="1iii5wk43rk378zsvkdbxl5pv73lv5b3mj9zxcjdq5d1ahrarjw0"; depends=[coda igraph]; };
+  nimble = derive2 { name="nimble"; version="0.6-6"; sha256="0y1gziq7aks5kzzpwn852w6d9b3gj6vky0m4hwd302ps4gw1i6k3"; depends=[coda igraph]; };
   nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; };
   nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; };
-  nleqslv = derive2 { name="nleqslv"; version="3.3"; sha256="1b0hjc6qi60brrk0qh825jv7cm56ys3ajix1lbcm9gxgmgbglv96"; depends=[]; };
+  nleqslv = derive2 { name="nleqslv"; version="3.3.1"; sha256="1n1sbp7436yd5g6v0060j2iwk4rppjq2pc5x47g9wlwnskdfgvl7"; depends=[]; };
   nlme = derive2 { name="nlme"; version="3.1-131"; sha256="0k2nvdzhic6bzhfsbq6la6q6a1i5nlj4pnh6lpdxiiwvxdks3nkr"; depends=[lattice]; };
   nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
   nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
@@ -7824,17 +8049,20 @@ in with self; {
   nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; };
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
+  noaastormevents = derive2 { name="noaastormevents"; version="0.1.0"; sha256="1pkfmvp20f6xi2iy7l6c67zspp9f4wkrh7s308hlklms2difhp6m"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer stringr tidyr viridis XML]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
   nodiv = derive2 { name="nodiv"; version="1.1.6"; sha256="1srcmv4mmmsmkk4nbbnmrkv4z19l80agvwlh2q1j7xdi26wpqc5r"; depends=[ape picante raster sp vegan]; };
+  nofrills = derive2 { name="nofrills"; version="0.1.0"; sha256="1cxfzpqi1ydzmcpix3qs4hdy9fjvc9l0drplrk4fqhzyml9k9a98"; depends=[rlang]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
   noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
   nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; };
   nomogramEx = derive2 { name="nomogramEx"; version="2.0"; sha256="1as0hbmb37z9izz95x9rd98a0fs4b6zbhzjpgnyq5c1j4219vzs3"; depends=[pracma rms]; };
   noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
   noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; };
+  nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; };
   nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; };
   nonmem2R = derive2 { name="nonmem2R"; version="0.1.7"; sha256="1a3azvf9dbmi3l3crmkv1qvrd0j1d14x4s9hjk2r1cayiazpmbib"; depends=[lattice latticeExtra MASS mvtnorm xpose4]; };
-  nonmemica = derive2 { name="nonmemica"; version="0.7.1"; sha256="1kz5sm15s1yrkx0mymzw53f3pxwba251hcdbid3mkfd3nb5cxlar"; depends=[csv dplyr encode fold lazyeval magrittr metaplot spec tidyr xml2]; };
+  nonmemica = derive2 { name="nonmemica"; version="0.7.6"; sha256="0x4xfnl0yjaznpr5a80qmb721lcs9m6gsjyx3qr1jcd5pqhwm01z"; depends=[csv dplyr encode fold lazyeval magrittr metaplot rlang spec tidyr xml2]; };
   nonnest2 = derive2 { name="nonnest2"; version="0.4-1"; sha256="0lgcrxvyyw789hw80lqbxvvxl6z95qxzq9k5lphl5435xqzpfj6f"; depends=[CompQuadForm lavaan mvtnorm sandwich]; };
   nonpar = derive2 { name="nonpar"; version="1.0.1"; sha256="0pxks3nga7jrcvq0pzr1axj3a9xvzky836fl7966a09ws1vff7i4"; depends=[]; };
   nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; };
@@ -7859,6 +8087,7 @@ in with self; {
   notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
   notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; };
   novelist = derive2 { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
+  nowcasting = derive2 { name="nowcasting"; version="0.0.82"; sha256="0czm3xk993r1fynjy8pi7381916kg5311as1xqhx0hizkl1b1p7j"; depends=[corpcor DBI httr matlab RCurl RMySQL seasonal stringr xts zoo]; };
   noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
   np = derive2 { name="np"; version="0.60-3"; sha256="12hzmhh59dfifssj08bjwxszxy38irami70bq14dxlm48fjyz17g"; depends=[boot cubature quantreg]; };
   npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; };
@@ -7867,9 +8096,9 @@ in with self; {
   nparLD = derive2 { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
   nparcomp = derive2 { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; };
   nparsurv = derive2 { name="nparsurv"; version="0.1.0"; sha256="1qy9qkkpqrk49vjxbyvl25i4kfk0py6v64izd8lmaw38dynybpy2"; depends=[survival TH_data]; };
-  npbr = derive2 { name="npbr"; version="1.5"; sha256="0z35bdk3ri34idjgvxw91n4gyyq838d1rrs096y6ihxhqnywfmv5"; depends=[Benchmarking np quadprog Rglpk]; };
+  npbr = derive2 { name="npbr"; version="1.6"; sha256="1jvq4snwrwjhhjgm8n8yxd5y94ks5zzi0xwdn931yp300qnikyzc"; depends=[Benchmarking np quadprog Rglpk]; };
   npcopTest = derive2 { name="npcopTest"; version="1.02"; sha256="1avjhm6rzyawwaabch6cxc7w2if4631jwrd2l8lyd3nk39kpr8ch"; depends=[]; };
-  npcp = derive2 { name="npcp"; version="0.1-6"; sha256="1ki9q49nyw21c6x3iwpd8aa152jc30idl0xx8f803j72yl21j47c"; depends=[]; };
+  npcp = derive2 { name="npcp"; version="0.1-9"; sha256="16vzl3psa806ns387d5mhlp369r45ljcqlhl0lzdjpc1niv572nc"; depends=[]; };
   npde = derive2 { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
   nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
   nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; };
@@ -7898,10 +8127,11 @@ in with self; {
   nucim = derive2 { name="nucim"; version="1.0.0"; sha256="0fyapw6f5wkybr4mwmqpk9wy349j5sa4q26pci1bsy4ly2wf9wx6"; depends=[bioimagetools EBImage fields stringr]; };
   nullabor = derive2 { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[dplyr fpc ggplot2 MASS moments plyr]; };
   numDeriv = derive2 { name="numDeriv"; version="2016.8-1"; sha256="07ni52rwiap4wilfz94w5mrqaxr59axxmgn57857ip4p6qkiss0v"; depends=[]; };
-  numGen = derive2 { name="numGen"; version="0.1.0"; sha256="0cdlv6pmxzhpybpihbzcdjcm3lqqnivjx55cjnrgi9q2dgrndcnr"; depends=[]; };
+  numGen = derive2 { name="numGen"; version="0.1.1"; sha256="1y41wq31r8126dz1sj23smq2k6v9yqczq4ddgzqb73dsrx9dmmc0"; depends=[]; };
   numKM = derive2 { name="numKM"; version="0.1.0"; sha256="0pnwb7skp5jx5ibgfkympq59m9sf71gvk5zc0fwik539vrzfykdf"; depends=[survival]; };
   numOSL = derive2 { name="numOSL"; version="2.3"; sha256="1bcj1qk3nx1jqhldx9rcwphvlxspz3bj4vb891hkw2fa2i4559c5"; depends=[]; };
   numbers = derive2 { name="numbers"; version="0.6-6"; sha256="05qmv12b90vkzf2b50qjnp8hja6rms91jj97knx70n2yhpb2lnd9"; depends=[]; };
+  numform = derive2 { name="numform"; version="0.0.5"; sha256="1i0dj5gsqiiinngrxnl61c7rmwkq3ybd5irh3b6zh3b0dxgjpdn4"; depends=[]; };
   nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; };
   nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
   nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
@@ -7927,7 +8157,7 @@ in with self; {
   oc = derive2 { name="oc"; version="0.96"; sha256="110pf3rqcab0671djx25jwwl8rbaskcd2lrcv56d786j693y2ash"; depends=[pscl]; };
   occ = derive2 { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; };
   oce = derive2 { name="oce"; version="0.9-21"; sha256="1nwnfs75mdq0s13jz5l9zv1rjx5637yljhrc56sghwq38gi1mpal"; depends=[gsw]; };
-  oceanmap = derive2 { name="oceanmap"; version="0.0.8"; sha256="0l9w4mk9n0g52jr6pw6c3i82hishp9qzdf97bxgm326h08wz7z6l"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; };
+  oceanmap = derive2 { name="oceanmap"; version="0.0.9"; sha256="07awxbj0gc1k8f6myqk5g54qk1n3bammrpfqi0rbfambgzrw3n5c"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; };
   ocedata = derive2 { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; };
   ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; };
   ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; };
@@ -7937,9 +8167,10 @@ in with self; {
   odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; };
   odfWeave = derive2 { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
   odfWeave_survey = derive2 { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
-  oec = derive2 { name="oec"; version="2.2"; sha256="11ldy303xkl7qaqvlzfwr7qxwnz06n39mkjvrj0sca6xzw12lq5d"; depends=[curl data_table jsonlite plyr servr]; };
-  oem = derive2 { name="oem"; version="2.0.5"; sha256="1zhfq4njxsq6fq73y6nxz637h85xk3mj19y7v3b37ma3cqb2s52p"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
-  officer = derive2 { name="officer"; version="0.1.4"; sha256="0v6nfx34r2476qgmsy8aygw4b49hmp94jhx7a7x8hdh6dglmfzhp"; depends=[base64enc digest dplyr gdtools ggplot2 lazyeval magrittr purrr R_utils R6 Rcpp tibble uuid xml2 zip]; };
+  odpc = derive2 { name="odpc"; version="1.0.0"; sha256="1mhak9drp0a7h1yrbk08cs00hbvkfkj8r1y6klhr40sdych4q506"; depends=[forecast gdpc Rcpp RcppArmadillo]; };
+  oec = derive2 { name="oec"; version="2.4"; sha256="18pww1isp8w1g1l7xrxlxdv27abwmwp7rd6q1gn5kqn5sdq0spc6"; depends=[curl dplyr jsonlite readr servr]; };
+  oem = derive2 { name="oem"; version="2.0.6"; sha256="1q8nwxmf9gizwsn2795qah7f4fb8zhygqxj6kwdy5j7afr1h3zjz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
+  officer = derive2 { name="officer"; version="0.1.5"; sha256="1hwvskhaz4lv4wbhsxpbk1xh8nr0blza7x58xgpz4gksg0nwan2f"; depends=[base64enc digest dplyr gdtools ggplot2 htmltools magrittr purrr R_utils R6 Rcpp tibble uuid xml2 zip]; };
   oglmx = derive2 { name="oglmx"; version="2.0.0.3"; sha256="02skdnf89ryl4d8ja1a9mj1jzzmjqjgfdcsf6v5dpjn1z9aycc6c"; depends=[maxLik]; };
   oii = derive2 { name="oii"; version="1.0.1"; sha256="0w1afajkr5vly9qi1r2iz1ikbvyvy6hcbc10g8s7g6zi8db5dgf4"; depends=[Deducer gmodels rapportools]; };
   okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; };
@@ -7954,24 +8185,28 @@ in with self; {
   onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; };
   onemap = derive2 { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; };
   onewaytests = derive2 { name="onewaytests"; version="1.4"; sha256="0p48bic8fnj4bgrlh3r7flbaj12z3ir5bigmvh8izznablq93wkk"; depends=[car ggplot2 moments nortest]; };
-  onion = derive2 { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; };
+  onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; };
   onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; };
   onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; };
   ontologyIndex = derive2 { name="ontologyIndex"; version="2.4"; sha256="168m4jdwbzv8lpimx9063306691hnfdjmdhb5y8195d9vcq049jr"; depends=[]; };
   ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; };
   ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; };
+  oompaBase = derive2 { name="oompaBase"; version="3.2.4"; sha256="15l6xkacixczz5ig63blszx546hgsimy1an9lx8az4n22pjfmh5w"; depends=[cluster]; };
+  oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; };
   opefimor = derive2 { name="opefimor"; version="1.2"; sha256="06j5diwp42x7yrhclwyiimfwmx66y23dkwlnkd2lj2zcsgam9s8w"; depends=[]; };
-  openEBGM = derive2 { name="openEBGM"; version="0.1.0"; sha256="10r8yg5h38npw6vsjkg15j762yh8r561495sn4d47x6i8arp34sj"; depends=[data_table ggplot2]; };
+  openEBGM = derive2 { name="openEBGM"; version="0.2.0"; sha256="0yjabg15v2zvhlj3fhb92g8kpsknhg1kk1n3499jf6kg5rpvpqcs"; depends=[data_table ggplot2]; };
   openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; };
   openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-2"; sha256="1472gg651cdd5d9xjxrzl3k7np77liqnh6ysv1kjrf4sfx13pp9q"; depends=[rJava]; };
+  openSTARS = derive2 { name="openSTARS"; version="1.0.0"; sha256="0arry24nkd50nkdnddzxagrpy4lky9smc4xr1nl6q9nwxyfgdskg"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; };
   openVA = derive2 { name="openVA"; version="1.0.3"; sha256="09wbhl0g6q1rhi6yr3wpbns4ik7jalpagacn6am09i6zvmz8745j"; depends=[ggplot2 InSilicoVA InterVA4 nbc4va Tariff]; };
   openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; };
   openair = derive2 { name="openair"; version="2.1-0"; sha256="0ybly7xmxrlyn12al2pk1w1yjm857npj3ih3zl1p0sd744x8pm6w"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapproj MASS mgcv plyr RColorBrewer Rcpp reshape2]; };
   opencage = derive2 { name="opencage"; version="0.1.2"; sha256="1wnv5mgapdnkpg62sv0375jac2rdnchggjfjnr07bziwpf3xj74d"; depends=[dplyr httr jsonlite memoise]; };
-  opencpu = derive2 { name="opencpu"; version="2.0.3"; sha256="0yjlmhvqyvk4097bjw94ji8nn7clnfpj8g204vrvhy0y59bbg5rr"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; };
+  opencpu = derive2 { name="opencpu"; version="2.0.4"; sha256="1vxc52qh5mgfga689l8w0isrxxnd2jmgkh9fha2hhyk874hhcawq"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; };
   openintro = derive2 { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
   openssl = derive2 { name="openssl"; version="0.9.6"; sha256="0ffwllii8xl6sa2v66134g0fwaw1y3zn3mvaa4nrc120vv5d3mkd"; depends=[]; };
   opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
+  openwindfarm = derive2 { name="openwindfarm"; version="0.1.0"; sha256="1f1pmp1h283ypyl0bz54ps0b6hwax59mmlfl0qzickmq4wjdn0qz"; depends=[anytime dplyr foreach httr leaflet magrittr readr]; };
   openxlsx = derive2 { name="openxlsx"; version="4.0.17"; sha256="1mq4lasp12kc30sxcsmz9gskd114l8s7z7wd6svv2nm8qllrhsqi"; depends=[Rcpp]; };
   opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
   operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; };
@@ -7986,7 +8221,8 @@ in with self; {
   optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; };
   optextras = derive2 { name="optextras"; version="2016-8.8"; sha256="03wqz16q8kn0ndk241h541fa0g5y0nrfg17vph85cm5xvzdd14cc"; depends=[numDeriv]; };
   optiRum = derive2 { name="optiRum"; version="0.37.3"; sha256="1g3kgfwa7ckh45v14qdi3gq9vy0zfpjaffcgpfapyylrsrnspy3f"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; };
-  optiSel = derive2 { name="optiSel"; version="0.9.1"; sha256="1s126aylwrg9phcyil2mmrdsdx99c1va95h57ahim523vr30ipf0"; depends=[alabama cccp data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv nloptr pedigree plyr pspline quadprog Rcpp RcppArmadillo Rcsdp stringr]; };
+  optiSel = derive2 { name="optiSel"; version="1.0.0"; sha256="01ia01byp4fnclafr727bjiww8k8cygzbjlrk4i2qpbd0jp2hm6w"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline quadprog Rcpp RcppArmadillo stringr]; };
+  optiSolve = derive2 { name="optiSolve"; version="0.1"; sha256="1wnpj7z0vqf91gzgz6r2ympnljq4mczxnnyk3sq7gvf6df4ic2m1"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp Rcsdp shapes stringr]; };
   opticut = derive2 { name="opticut"; version="0.1-0"; sha256="0dh7zw8yrzxw3vfzfm776rdhfczmlwfs3fw568s5cc60xsn8fa93"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; };
   optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; };
   optigrab = derive2 { name="optigrab"; version="0.7.3"; sha256="1vd4b6mh4a137nvsbpx71jibfd67va1m8iya1gasqiflm6qzszcx"; depends=[magrittr stringi]; };
@@ -7994,13 +8230,14 @@ in with self; {
   optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
   optimization = derive2 { name="optimization"; version="1.0-5"; sha256="1lg8al7i3yrbjf1z8d9qgh9n67b34l5cww443asyciq362zjalnw"; depends=[colorspace Rcpp]; };
   optimr = derive2 { name="optimr"; version="2016-8.16"; sha256="02dgwkcjhf6ciwb6x6gyk7nn4v2jras7l1icfd4pjbypiapwnck9"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; };
-  optimsimplex = derive2 { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; };
+  optimsimplex = derive2 { name="optimsimplex"; version="1.0-6"; sha256="1hbcd2pq8hlr9vh5k1hh8icr0zyri9ar4k8iq93kpfqpfif9vppp"; depends=[optimbase]; };
   optimus = derive2 { name="optimus"; version="0.1.0"; sha256="1dz0wczyl1awv3s01malmyrzwijxdywh0xhpfh1i0pncbb4rq3vc"; depends=[mvabund ordinal]; };
   optimx = derive2 { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[BB dfoptim minqa numDeriv Rcgmin Rvmmin setRNG svUnit ucminf]; };
+  optional = derive2 { name="optional"; version="1.0"; sha256="1bh3w5mcv3rhlpklncwgjr0lmjhv164q17zls0xm00qr8knzm9kp"; depends=[magrittr]; };
   optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
   optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; };
   optmatch = derive2 { name="optmatch"; version="0.9-7"; sha256="1ps3qd7kidi0n1m9nxspz03sdw7p3lcg31q3p7c13l3vb226i5yj"; depends=[digest Rcpp RItools survival]; };
-  optparse = derive2 { name="optparse"; version="1.3.2"; sha256="1g8as89r91xxi5j5azsd6vrfrhg84mnfx2683j7pacdp8s33radw"; depends=[getopt]; };
+  optparse = derive2 { name="optparse"; version="1.4.4"; sha256="1ff4wmsszrb3spwfp7ynfs8w11qpy1sdzfxm1wk8dqqvdwris7qb"; depends=[getopt]; };
   optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; };
   optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; };
   optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
@@ -8021,11 +8258,11 @@ in with self; {
   ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; };
   ordinal = derive2 { name="ordinal"; version="2015.6-28"; sha256="0lckjzjq2k8rlibrjf5s0ccf17vcvns5pgzvjjnl3wibr2ff4czs"; depends=[MASS Matrix ucminf]; };
   ordinalCont = derive2 { name="ordinalCont"; version="1.2"; sha256="0a30yba3gmhrl4ln47kk046fk9wqn32hjkqwmrhzjyzl3w4jq8jz"; depends=[boot]; };
-  ordinalForest = derive2 { name="ordinalForest"; version="1.0"; sha256="1hmvr94s7fwpqzziaqh01w7c7hg1z4ms03cll8v13jkbaryk3yik"; depends=[combinat ggplot2 ranger]; };
-  ordinalNet = derive2 { name="ordinalNet"; version="2.0"; sha256="168sl18rcxnv2h26y83sbna5855b6shc5pw72dhv8zi268ykwkcx"; depends=[]; };
+  ordinalForest = derive2 { name="ordinalForest"; version="2.0"; sha256="00qp90wy6h8bkadr08bv4xm4fja2r4xh8fg1fnakak6absl401j6"; depends=[combinat ggplot2 Rcpp]; };
+  ordinalNet = derive2 { name="ordinalNet"; version="2.2"; sha256="0n1c96impvygs8n8mhfs5f7qfph26mfn18i31967ihfydxxsvsbx"; depends=[]; };
   ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.3"; sha256="0ki91l6vvfxpzq7zgl3d08r5pzx47jxkgf7g0g95580xx2q7n7zx"; depends=[survival]; };
   ore = derive2 { name="ore"; version="1.6.0"; sha256="115s3wq7rrpmx65k9jlpf2x1d218gnl7vsc8zsvmjbsi4gfyliwf"; depends=[]; };
-  ores = derive2 { name="ores"; version="0.2.0"; sha256="164z4r4894r8j5vigh5rsqwkslmgdwj0rsl088fq0hb40p3w1nd0"; depends=[httr]; };
+  ores = derive2 { name="ores"; version="0.3.0"; sha256="1snkbvl38rwha6zb3ff1nq71j9rb77f6yz335ryimiczp0z3x466"; depends=[httr]; };
   orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
   orgutils = derive2 { name="orgutils"; version="0.4-1"; sha256="1yc3avhq3786his7nd60zfbzd9inkfrfz938r8378z59zbb1mzqq"; depends=[textutils]; };
   orientlib = derive2 { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
@@ -8045,13 +8282,13 @@ in with self; {
   osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; };
   osi = derive2 { name="osi"; version="0.1.0"; sha256="1wzkvsqifk0g29jnpvykn26myq27pxll3glqlp74djkz0rbpv7aa"; depends=[httr]; };
   osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; };
-  osmdata = derive2 { name="osmdata"; version="0.0.4"; sha256="0j0zc5kyz2r9hik2hrmvf9m1b4zig7jm0g8krww331dbdw3bmb7x"; depends=[curl httr jsonlite lubridate Rcpp rvest sp xml2]; };
-  osmplotr = derive2 { name="osmplotr"; version="0.2.3"; sha256="1gvr3plni62hrs1i4b1id863ib0d4l4gfh8h40nyvk16mgvp4a4c"; depends=[curl ggm ggplot2 httr igraph osmar rgeos sp spatstat XML]; };
-  osrm = derive2 { name="osrm"; version="3.0.1"; sha256="0sz3fbdljfakh0g8bmsx6arwz7j2sjd63c4af1sryh9c8sk8gpjp"; depends=[gepaf jsonlite raster RCurl rgeos sp]; };
+  osmdata = derive2 { name="osmdata"; version="0.0.5"; sha256="12zfpgp4x5akh25w1f01g5rv4nqqzn2wwysak4vvwh8h7iha0ajc"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; };
+  osmplotr = derive2 { name="osmplotr"; version="0.3.0"; sha256="0w45riwwjigh1bxf9gx0wdj2yhdizwi6ydprp83pss2z9wph66yb"; depends=[curl e1071 ggm ggplot2 httr osmdata rgeos sp spatstat]; };
+  osrm = derive2 { name="osrm"; version="3.0.2"; sha256="17nwc4wak5pxzr29gwrlsm31aaskng9z1dmbb7mry7pvgmqylbhd"; depends=[gepaf jsonlite raster RCurl rgeos sp]; };
   otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; };
   otrimle = derive2 { name="otrimle"; version="1.1"; sha256="0c3wlj6cxpikrfr0knldd1z2kfihpfsppnyb9n3rflnxhk7pwij2"; depends=[doParallel foreach mclust]; };
-  ouch = derive2 { name="ouch"; version="2.9-2"; sha256="05c3bdxpjcgmimk0zl9744f0gmchhpm7myzjrx5fhpbp5h6jayaf"; depends=[subplex]; };
-  outbreaker = derive2 { name="outbreaker"; version="1.1-7"; sha256="0bq8an4hcs88279nkbn92x5s36i3sb64xqdlcrxy8fdk05w0cmg4"; depends=[adegenet ape igraph]; };
+  ouch = derive2 { name="ouch"; version="2.11-1"; sha256="0xkwwi62vdahlcg3k32zb1nfwsx87zdssk79mvcxgfsw9bw4gahx"; depends=[subplex]; };
+  outbreaker = derive2 { name="outbreaker"; version="1.1-8"; sha256="0przz78jzkwl580w83p0aigaykfki2hdzprwqic7dy6yxnpqlpm3"; depends=[adegenet ape igraph]; };
   outbreaks = derive2 { name="outbreaks"; version="1.3.0"; sha256="1k0g9x6wvdw8lkpjiv8z1ijp6pg5hri3gawx7zfpnm05g6ncvg81"; depends=[]; };
   outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
   outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; };
@@ -8082,13 +8319,13 @@ in with self; {
   packcircles = derive2 { name="packcircles"; version="0.2.0"; sha256="1z0s5lnzpmipcsdk0wsjp18mm6j50yfn8qip98rx30hmyh3flwmc"; depends=[Rcpp]; };
   packrat = derive2 { name="packrat"; version="0.4.8-1"; sha256="1wvjyvb7yy6hq188msqzf8qa00lhll865jp939byc6d4zpscm0x2"; depends=[]; };
   pacman = derive2 { name="pacman"; version="0.4.6"; sha256="1vdak1hv3j44dsj6cckzc1a86dg933jqhxdys8fyxacmk101l388"; depends=[devtools]; };
-  paco = derive2 { name="paco"; version="0.3.1"; sha256="18k4ls6y9jdknx3dn2494chjigzn8hrsh332ha8a01snfzhp66m0"; depends=[plyr vegan]; };
+  paco = derive2 { name="paco"; version="0.3.2"; sha256="0qf692fqlq0d7hh9yllywaswmj5spy6q1r67nzkhgyh311nhjh6c"; depends=[plyr vegan]; };
   pacotest = derive2 { name="pacotest"; version="0.2.2"; sha256="0n17qzn7wabs6am55z96zg8759fdcz3vpm7yx25dyaqliawgqnj7"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
   pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; };
   padr = derive2 { name="padr"; version="0.3.0"; sha256="00zh3k1rijmxkm3jj3frgwnihbw4ix1p1xd1vrd5fll1xiiy1n7l"; depends=[dplyr Rcpp]; };
   paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
   pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; };
-  pagenum = derive2 { name="pagenum"; version="1.0"; sha256="0iqx6lgbzcz5girw8cl934jcah7l32zdrbs70cxx8gs2x5rbfwkz"; depends=[]; };
+  pagenum = derive2 { name="pagenum"; version="1.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; };
   pageviews = derive2 { name="pageviews"; version="0.3.0"; sha256="031y67nqqvf3fa2273m7z2cldda0ijh63qwkh4gis3hz9hfril0v"; depends=[curl httr jsonlite]; };
   paintmap = derive2 { name="paintmap"; version="1.0"; sha256="1qw5725yjymxmfhffqjx4lbmzj437c7qwr8xrzmf52f0m28nl3vk"; depends=[]; };
   pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
@@ -8113,7 +8350,7 @@ in with self; {
   pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; };
   pamr = derive2 { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; };
   pan = derive2 { name="pan"; version="1.4"; sha256="1p3nigmhrnlch86g89hn7l0wvkifx3k9n59g0psi95yck43kza76"; depends=[]; };
-  pander = derive2 { name="pander"; version="0.6.0"; sha256="0jgylffc4ymvppaqsflxaj1l18c4x49jbz0b86jjsa00xqdyk4cn"; depends=[digest Rcpp]; };
+  pander = derive2 { name="pander"; version="0.6.1"; sha256="1axknd1isfjg4wj5b1smvl7qr4wvjdw1kikrghjnp73xh0glr7pp"; depends=[digest Rcpp]; };
   pandocfilters = derive2 { name="pandocfilters"; version="0.1-1"; sha256="18n155rkbr3gq5lsb0bh1v1v0z0r6xr2ald3nh7xh3v9qwxpmsz1"; depends=[jsonlite]; };
   panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
   panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; };
@@ -8128,14 +8365,14 @@ in with self; {
   parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
   parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
   paramGUI = derive2 { name="paramGUI"; version="2.1.2"; sha256="054l9hqsvgnwipzqrapkhsk67afz93zv1cligqhjl2wggzn9a8sc"; depends=[colorspace fields shiny shinydashboard TIMP]; };
-  paramlink = derive2 { name="paramlink"; version="1.1-0"; sha256="1qbd80x50nnyiy0y6nnnwhj8z528gzqq7098w9md3rj0ih3523xl"; depends=[assertthat kinship2 maxLik]; };
+  paramlink = derive2 { name="paramlink"; version="1.1-1"; sha256="1v2nmigvgc6n33dh2rhn984kxkplc7v5gz72b47zvgxnkcpkrab9"; depends=[assertthat kinship2 maxLik]; };
   params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; };
   paran = derive2 { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
   parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; };
   parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
   parfm = derive2 { name="parfm"; version="2.7.5"; sha256="1wnklksqybhaqwsfifwv8gmqjl6g9dm9s4z131mbjn4dm7bj1bra"; depends=[msm optimx sn survival]; };
   parfossil = derive2 { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[foreach fossil]; };
-  parlitools = derive2 { name="parlitools"; version="0.0.4"; sha256="1wwf3ry23wlg0s063vdm50h4f1x8ga94llwziwbhypl06w5vcm2z"; depends=[dplyr hansard httr jsonlite mnis sf stringi tibble]; };
+  parlitools = derive2 { name="parlitools"; version="0.2.0"; sha256="0i64phiga3m496xgdqg4vf5086b58xrkwrz0g6ara6jjqrliykl1"; depends=[dplyr hansard httr jsonlite mnis sf stringi tibble]; };
   parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; };
   parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
   parsec = derive2 { name="parsec"; version="1.1.2"; sha256="1hf3c23rnxckw4s2vqzbhkjgiir1nv1811saximj0mbih9w2vqpf"; depends=[]; };
@@ -8147,13 +8384,14 @@ in with self; {
   partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; };
   partitionMap = derive2 { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
   partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
-  partitions = derive2 { name="partitions"; version="1.9-18"; sha256="1brzvk2zbrh0s4vbaiib6zkpcyx7ghc6ws36h3diz5nxbx3g95ik"; depends=[gmp polynom]; };
+  partitions = derive2 { name="partitions"; version="1.9-19"; sha256="1pklfnjdc094c8nzkqcdvqzdh8v3p5n8jbg4pf9678iw648saiyx"; depends=[gmp polynom]; };
   partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; };
   partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
   party = derive2 { name="party"; version="1.2-3"; sha256="1rpp4qfb7igpqlz0jw12ykd7p3ri8miby6nlvyzbblz3h67lplkb"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
   partykit = derive2 { name="partykit"; version="1.1-1"; sha256="0cl3ir54pafjhk1cvyzx1a8a244x0qa5lky47m7fx1fdj0k7dx6r"; depends=[Formula survival]; };
   parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
   pass = derive2 { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; };
+  passport = derive2 { name="passport"; version="0.1.1"; sha256="0mbkiq9qxlflhyii31phva67q89zm7klpj8f2jwhdagjgy48mflx"; depends=[]; };
   password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; };
   pasta = derive2 { name="pasta"; version="0.1.0"; sha256="12ps5bhyk3hllfa9smyw8vxglr45xz9kvhkx2v65pb86iqm0r0kg"; depends=[]; };
   pastecs = derive2 { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
@@ -8162,6 +8400,7 @@ in with self; {
   patchDVI = derive2 { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; };
   patchPlot = derive2 { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
   patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; };
+  patentsview = derive2 { name="patentsview"; version="0.1.0"; sha256="01x1k24xz6315j44jshinp6snxmrfsmnqh61hm5rzb3i10wvwlmi"; depends=[httr jsonlite]; };
   pathClass = derive2 { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[affy Biobase igraph kernlab lpSolve ROCR svmpath]; };
   pathdiagram = derive2 { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
   pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; };
@@ -8174,7 +8413,7 @@ in with self; {
   pavo = derive2 { name="pavo"; version="1.1.0"; sha256="0n4jk8dy5ydrdxmvigawfjpng4l7dq9ay4lassbg9qgc260cd45a"; depends=[geometry mapproj rcdd scatterplot3d]; };
   pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
   pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; };
-  pbapply = derive2 { name="pbapply"; version="1.3-2"; sha256="1sdmjlnwxb99f95g5v8k8mirrkzw99yig377v0qi9lzwjgd6fqqr"; depends=[]; };
+  pbapply = derive2 { name="pbapply"; version="1.3-3"; sha256="0iqhymf65jffh00qf056h1p76xf92bfmij6aymlmgnvn24fv4ybk"; depends=[]; };
   pbatR = derive2 { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; };
   pbdBASE = derive2 { name="pbdBASE"; version="0.4-5"; sha256="0i7rav197787snhw2l5pyb2x0i9d1gl9d7lks2bk0dcxr0ndy9gm"; depends=[pbdMPI pbdSLAP]; };
   pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; };
@@ -8187,44 +8426,45 @@ in with self; {
   pbdZMQ = derive2 { name="pbdZMQ"; version="0.2-6"; sha256="1kqpl8y55a9m2qkh56wb9qgxxwckwwjabj2m519nvwv55avkgy61"; depends=[R6]; };
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
   pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; };
-  pbmcapply = derive2 { name="pbmcapply"; version="1.2.2"; sha256="05phx2pw5mp76lz8b189s58rrax3ivrfglna3f18mpgshzn08cz8"; depends=[future]; };
+  pbmcapply = derive2 { name="pbmcapply"; version="1.2.4"; sha256="0wh0ljy9nbb7ifh06bf79hwc2ci9482hdppgpa1zpz8x2mgyvy04"; depends=[future]; };
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
   pcIRT = derive2 { name="pcIRT"; version="0.2.2"; sha256="0sf6kkcsblc758sb1gkl4ryr72w0xhkd9nr4xdns8c9dfg9qcw1h"; depends=[combinat Rcpp]; };
   pca3d = derive2 { name="pca3d"; version="0.10"; sha256="1bpm4sbj7h2fd0h5ybjhq8g61l8v2fbc92yiiascdgfili85zsf3"; depends=[ellipse rgl]; };
   pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
-  pcaL1 = derive2 { name="pcaL1"; version="1.5.1"; sha256="0c5y595jyf0wz290hg06r8fxii2r3mwl9437wvs4fvv1sxi2i3r0"; depends=[]; };
+  pcaL1 = derive2 { name="pcaL1"; version="1.5.2"; sha256="1f7481wn2c935llb9visfdlv958ixxqybp5r2dy7nm18jacf2a0l"; depends=[]; };
   pcaPA = derive2 { name="pcaPA"; version="2.0.2"; sha256="14hi09qksr1z54l268yv4g2x5hlikir7zir4ccd9yi5z1918ksj5"; depends=[ggplot2 ltm mc2d polycor sfsmisc]; };
   pcaPP = derive2 { name="pcaPP"; version="1.9-72"; sha256="0i2822bv86dpqmk3q17x61nsp3gjjnn4nr8191rwvbiib7xhpgaq"; depends=[mvtnorm]; };
   pcadapt = derive2 { name="pcadapt"; version="3.0.4"; sha256="031ql3xppjkqrm17bvccj61hyf38skjb4qv6rs0l1h2ib8jql8ka"; depends=[ggplot2 MASS robust vcfR]; };
-  pcalg = derive2 { name="pcalg"; version="2.4-5"; sha256="1gfwx26r76d5arqhs03wldaycx1yj55bdwlaam4w42g7hi5bzdbm"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+  pcalg = derive2 { name="pcalg"; version="2.5-0"; sha256="002y7b0r750nbnrg8w53q2fyvk13jk4jrqlf3f2777qw7si5vmz3"; depends=[abind bdsmatrix BH clue corpcor dagitty fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
   pcdpca = derive2 { name="pcdpca"; version="0.2.1"; sha256="0vl661pjlfcgqmnw3c1032aci4akld1pqxchb2fh8y5wap1nhypa"; depends=[fda freqdom]; };
+  pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; };
   pcev = derive2 { name="pcev"; version="1.1.1"; sha256="0vhn5514dnmhv98bchvsfd6pfjmvbc7hhb9zabgf8syk9rh8y9h8"; depends=[RMTstat]; };
   pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
   pch = derive2 { name="pch"; version="1.3"; sha256="13pfrvp539fz4hxp08yil93caw3cjdna7xnky5fqd0lhc84fwq76"; depends=[survival]; };
-  pcnetmeta = derive2 { name="pcnetmeta"; version="2.4"; sha256="1d7cjf15blh0ysc064n8yil77yj799bsff0rdjvimaa2hbxpnk98"; depends=[coda rjags]; };
+  pcnetmeta = derive2 { name="pcnetmeta"; version="2.5"; sha256="0542vacgb8ij7cid2i5fnq038wxndkz9lpw1vanr07zgslssdyl9"; depends=[coda rjags]; };
   pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; };
   pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; };
   pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; };
   pcse = derive2 { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
   pdR = derive2 { name="pdR"; version="1.5"; sha256="072ra8czfvgcgkbdfkjhbpk7f23zh717f9sh84vls9j0wyrai6hn"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
-  pdSpecEst = derive2 { name="pdSpecEst"; version="1.0.0"; sha256="0jd7540v7zdg4l5i6i7pdwc7bgnpkhdfpf5b9bjx2gka592swhq4"; depends=[astsa Rcpp RcppArmadillo]; };
+  pdSpecEst = derive2 { name="pdSpecEst"; version="1.1.1"; sha256="1984gxyp9y8hnc3cqdr51bk2l85qpqrkrlslw38q2dmsq40v26rz"; depends=[astsa ddalpha multitaper Rcpp RcppArmadillo]; };
   pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; };
   pdfCluster = derive2 { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
-  pdfetch = derive2 { name="pdfetch"; version="0.2.1"; sha256="0d5707j4dq8ilab3ydqy3pd65mdsrwn6hf01hv4h85iv6zalm679"; depends=[httr jsonlite lubridate readr reshape2 stringr XML xml2 xts zoo]; };
+  pdfetch = derive2 { name="pdfetch"; version="0.2.2"; sha256="0nr34c7iyv2gbxrdbpkk43b61c7g9z85kgzahzq1wcx08x49bpxs"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; };
   pdfsearch = derive2 { name="pdfsearch"; version="0.1.1"; sha256="0k62j6ilv8rmmmasqyb3hklhjqg22jiyx0sxd7f8n0xmlfcjgfqi"; depends=[pdftools tibble]; };
   pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; };
   pdftools = derive2 { name="pdftools"; version="1.3"; sha256="0gaf51xfv56idw49pf9l0yzgncwmwxhg4idmbpj6xyzdbjdmr6hz"; depends=[Rcpp]; };
   pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
   pdmod = derive2 { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; };
   pdolsms = derive2 { name="pdolsms"; version="0.2"; sha256="18gwr1xnm7jbqna911b7haa9sv1i2qvq18w00dkbnj796rh0h78f"; depends=[reshape2]; };
-  pdp = derive2 { name="pdp"; version="0.5.2"; sha256="1bsi8v143q4bmdzlx55q6xrhi1scm5bi7q8ky0mh1505kz09nd74"; depends=[boot dplyr ggplot2 gridExtra lattice magrittr mgcv plyr Rcpp viridis]; };
+  pdp = derive2 { name="pdp"; version="0.6.0"; sha256="12x9j3lwnss45wlafd5kc4nw293vhffijmgyafahqwz9if829m10"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; };
   peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; };
   peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; };
   peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; };
   pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
   pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; };
-  pec = derive2 { name="pec"; version="2.5.3"; sha256="16ad20zagf3sbnj6jw0ay4kkywlslgc7p5ghz5zknrsby7ac0147"; depends=[foreach prodlim rms survival timereg]; };
+  pec = derive2 { name="pec"; version="2.5.4"; sha256="1gi8vvdj3mwpi5rgfqci1lan1a34nbcyyypwa171sfj7j1m770r3"; depends=[foreach prodlim rms survival timereg]; };
   pedantics = derive2 { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[kinship2 MasterBayes MCMCglmm]; };
   pedgene = derive2 { name="pedgene"; version="2.9"; sha256="1200d6blz7n3krnvhw0i9mz6219vwk0vlj17yzr3fqzyn5cyf91z"; depends=[CompQuadForm kinship2 Matrix survey]; };
   pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
@@ -8238,13 +8478,12 @@ in with self; {
   penalized = derive2 { name="penalized"; version="0.9-50"; sha256="0q60pgmx2wbnc7i1zf1i0sxn1zy257hl73ii0abx83zpcywq9vb6"; depends=[Rcpp RcppArmadillo survival]; };
   penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; };
   penalizedSVM = derive2 { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
-  penaltyLearning = derive2 { name="penaltyLearning"; version="2017.06.14"; sha256="0hrmzfsk8zh9zbd2zvlr6sjsm6h2vs6jbcrp0m92r44fyqfr6d19"; depends=[data_table geometry ggplot2]; };
+  penaltyLearning = derive2 { name="penaltyLearning"; version="2017.07.11"; sha256="0ab1dy0kh3fmbcdg29qhvrjnaxpk7lqcnsz4bwplq0ia3assc8sl"; depends=[data_table geometry ggplot2]; };
   pencopula = derive2 { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; };
   pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; };
   pendensity = derive2 { name="pendensity"; version="0.2.10"; sha256="023gl993jniv5r8l9nkaha7v6k2rb1hxm7z543dpr4186kjbi7zl"; depends=[fda lattice]; };
   pensim = derive2 { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; };
   peperr = derive2 { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; };
-  peplib = derive2 { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; };
   peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; };
   pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; };
   perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; };
@@ -8254,7 +8493,7 @@ in with self; {
   perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
   permDep = derive2 { name="permDep"; version="1.0-0"; sha256="15jjxni14i3br0j5cqajgydkb71yd657fvz4m0jcr66g1sb77aij"; depends=[BB goft survival]; };
   permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; };
-  permGS = derive2 { name="permGS"; version="0.2.4"; sha256="02mywldcg22xv9fh00lnzmqimrp1f7r5fwjw82v0krixhaarsnnp"; depends=[coin survival]; };
+  permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; };
   permPATH = derive2 { name="permPATH"; version="1.1"; sha256="06h1lqpmkg4ajjh4r837qp094h105n4mpvafnp2nsbv9yyayd4h8"; depends=[R2HTML xtable]; };
   permubiome = derive2 { name="permubiome"; version="1.1"; sha256="02fg1g96pg6a87n8mhrls54xp0vnqqsgg39nnjirxr7hd74l71x9"; depends=[ggplot2]; };
   permutations = derive2 { name="permutations"; version="1.0-2"; sha256="04lak21x0z1cskgm5w4xdyq59kmyrz64bwfpf332vfka54aiv8lk"; depends=[magic numbers partitions]; };
@@ -8312,7 +8551,7 @@ in with self; {
   phreeqc = derive2 { name="phreeqc"; version="3.3.10"; sha256="0hcdjj1wgfknqf5yx50b9vz5f72siw4dslyvk2xbrfnwbzzz4qib"; depends=[]; };
   phtt = derive2 { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
   phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; };
-  phybreak = derive2 { name="phybreak"; version="0.1.1"; sha256="14dn5q4knqb1ijbspnvyggdjrplbhxmyqj5jix8a74bk01xwl9nj"; depends=[ape phangorn Rcpp]; };
+  phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; };
   phyclust = derive2 { name="phyclust"; version="0.1-19"; sha256="109m7q393xv17x4rhcxvhz25x42c79smw9xr8zppmkqdzx6f75w0"; depends=[ape]; };
   phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; };
   phylin = derive2 { name="phylin"; version="1.1.1"; sha256="1hxmh5jgcz41bhmi8kvimw0b6m4p3yq85bh79hl7xbx2kshxmvzq"; depends=[]; };
@@ -8320,13 +8559,12 @@ in with self; {
   phylobase = derive2 { name="phylobase"; version="0.8.4"; sha256="00hh53ibr7ddck4rl1rz9bpjsvjym040c5f78l1yizv6q9rakhfp"; depends=[ade4 ape Rcpp rncl RNeXML]; };
   phylocanvas = derive2 { name="phylocanvas"; version="0.1.0"; sha256="0h5cp37f2jzi30zpzyvd6h16592knkyp2jnvcdhhi37yhamzhgr6"; depends=[ape htmlwidgets magrittr phylobase]; };
   phyloclim = derive2 { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
-  phylocurve = derive2 { name="phylocurve"; version="2.0.8"; sha256="183swpx0y07pd1dhhawj7fjiyd8mg52g112a4zyx480k253cxkbq"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
-  phylodyn = derive2 { name="phylodyn"; version="0.9.0"; sha256="0rc6clx4m53kc7yqass7wcgysrcy814a4p5a6f7038h767bbvznp"; depends=[ape spam]; };
+  phylocurve = derive2 { name="phylocurve"; version="2.0.9"; sha256="1d01nwfpyh61r00dq6cnhxdwzk81jr3l6aa51dl1wck4cy0frscp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
   phylogram = derive2 { name="phylogram"; version="1.0.1"; sha256="0hjniq91ivw82aqifb4sqqbw36scs0081s7xrjj37581rk0xamyl"; depends=[openssl Rcpp]; };
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
   phylolm = derive2 { name="phylolm"; version="2.5"; sha256="0bffqzba6kcv8jyya7pja10mjnklhihczljhmj8q0pdrmd6qgqp8"; depends=[ape]; };
   phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; };
-  phylopath = derive2 { name="phylopath"; version="0.2.3"; sha256="1vspb20vwikql32nvj5vrixyz85y7zhc5sdbng1ff8r7yn1l2mrx"; depends=[ape DiagrammeR dplyr ggm ggplot2 igraph MuMIn nlme pbapply purrr tibble tidyr]; };
+  phylopath = derive2 { name="phylopath"; version="0.3.1"; sha256="02c7n08spmb2hpx2jmvjg57asy9laljllf4bips0hxk9y9rb12a6"; depends=[ape dplyr ggm ggplot2 ggraph igraph MuMIn nlme pbapply purrr tibble tidyr]; };
   phylosignal = derive2 { name="phylosignal"; version="1.1"; sha256="039sdb5cyijsrvj13xznr0j7vcp780lif62xk5x5hpzxvpg1wwgk"; depends=[adephylo ape boot igraph phylobase Rcpp RcppArmadillo RCurl]; };
   phylosim = derive2 { name="phylosim"; version="3.0.2"; sha256="148zm43cgdhr264ffcabjx4abykks07jix6lypqysqy25fbmdngk"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; };
   phylotate = derive2 { name="phylotate"; version="1.1"; sha256="1lj7v05iblac2y9xggzbdm6hy99jzf60src5h3dwx3s8lm3490qm"; depends=[]; };
@@ -8334,11 +8572,11 @@ in with self; {
   phyndr = derive2 { name="phyndr"; version="0.1.0"; sha256="03y3j4ik6flrksqm2dwh2cihn12hzfdik0fsak4zbxjdzaqn5gim"; depends=[ape]; };
   phyreg = derive2 { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
   physiology = derive2 { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
-  phytools = derive2 { name="phytools"; version="0.6-00"; sha256="04xf7rksii496xiih3ijywxs4j4994z1f1yllvywzvmqqyk0khdn"; depends=[animation ape clusterGeneration coda combinat maps mnormt msm nlme numDeriv phangorn plotrix scatterplot3d]; };
+  phytools = derive2 { name="phytools"; version="0.6-20"; sha256="06ysvhpkg9lnnjla056as39bd47aax0dndbck7wz66ypy6676m6p"; depends=[animation ape clusterGeneration coda combinat maps mnormt msm nlme numDeriv phangorn plotrix scatterplot3d]; };
   phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
-  pi0 = derive2 { name="pi0"; version="1.4-0"; sha256="0qwyfan21k23q4dilnl7hqjghzm8n2qfw21wbvnidr6n9hf2fjjs"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; };
+  pi0 = derive2 { name="pi0"; version="1.4-1"; sha256="09sjcmc6d45b7c7zfq150ncpyqsy3qkq2g88kv52csi7kwl7828n"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue scatterplot3d]; };
   picante = derive2 { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; };
-  picasso = derive2 { name="picasso"; version="0.5.4"; sha256="0y6d0wmgv4nhyxyp0nz2hmfwvm4laagr1jzvngw3h4na1sw10l6i"; depends=[igraph lattice MASS Matrix]; };
+  picasso = derive2 { name="picasso"; version="1.0.1"; sha256="03108gga5a5r6cqi1c8l6n2bj81rg32277pdg6ja6d2n2c7pyah6"; depends=[MASS Matrix]; };
   pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; };
   piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.2.1"; sha256="0c705ngyj2pf24vvqdld5rnf875pw64gs64l9f7nylbfrax39kbv"; depends=[lavaan lme4 nlme pbkrtest]; };
   pifpaf = derive2 { name="pifpaf"; version="1.0.0"; sha256="1xizy0m3rm11wp4q5431axbhphx4azahh1vs7kc5ry3mwivnafhz"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; };
@@ -8348,9 +8586,9 @@ in with self; {
   pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; };
   pinnacle_API = derive2 { name="pinnacle.API"; version="2.0.9"; sha256="1pq7q2wa4g8gxbyiascygnng53ihwmf5hsazwbyzjqgyyhi0hd9m"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; };
   pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; };
-  pinyin = derive2 { name="pinyin"; version="1.0.2"; sha256="0qicjig7x39frfvrwgljb75i5kp1sjrzfcb1l3p8fr0pyrq6rkd4"; depends=[]; };
+  pinyin = derive2 { name="pinyin"; version="1.1.0"; sha256="15zv8rqz61a52pv47b0cdmmnm8ynb30ypyki7dprpdidrz3mhk8m"; depends=[]; };
   pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; };
-  pipeGS = derive2 { name="pipeGS"; version="0.1"; sha256="0ixfj52nd9785ny78wgsyq7srygsj3yg3p95pcb4lrrammchqygk"; depends=[]; };
+  pipeGS = derive2 { name="pipeGS"; version="0.2"; sha256="1p014fw3lxaspcmb3qgirz815ykycjh5r4ql59pi46ryxharn19j"; depends=[]; };
   pipeR = derive2 { name="pipeR"; version="0.6.1.3"; sha256="16lj227x24pviqb4dcrj7a55l31p5mm0cbwsb6m3y3n6k5wcd2nh"; depends=[]; };
   pipefittr = derive2 { name="pipefittr"; version="0.1.2"; sha256="0pzd7f0rhn0rydncki666zlajdwyiay3apa17cb0xy5454d99mvh"; depends=[magrittr miniUI rstudioapi shiny stringr]; };
   pipeliner = derive2 { name="pipeliner"; version="0.1.1"; sha256="1cyyd1bin89dh0zrhic3i541bj8nnaphg6jq2jqkhnxn2nvax11g"; depends=[]; };
@@ -8366,7 +8604,7 @@ in with self; {
   pkggraph = derive2 { name="pkggraph"; version="0.2.0"; sha256="1mb6vr177xvm3s00c9s7g4ilqz5ln0fv8jyjzrb0pkjm94f6l0vf"; depends=[curl dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 RColorBrewer tibble]; };
   pkgmaker = derive2 { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; };
   pkmon = derive2 { name="pkmon"; version="0.9"; sha256="1zcjz1h45qv81rwnjsgc9iwmrwpnsy917y7h66pz98wzszlxcsd2"; depends=[]; };
-  pkr = derive2 { name="pkr"; version="0.1.0"; sha256="0c8i9r1w23zldi04066pzdggxrbsqg9ydbxg3ig1z66jv17w76zq"; depends=[binr foreign forestplot]; };
+  pkr = derive2 { name="pkr"; version="0.1.1"; sha256="0mwrpkmf016lpwkjhhjpq7bw18mvshpyhwgmgqfrfl9gfbq4gphd"; depends=[binr foreign forestplot]; };
   pks = derive2 { name="pks"; version="0.4-0"; sha256="0fx7p2d83x0ip65aqp9dga59d9cggam8k79mi0drk5birzchqbcr"; depends=[sets]; };
   plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
   pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; };
@@ -8375,8 +8613,8 @@ in with self; {
   plan = derive2 { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
   planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; };
   planor = derive2 { name="planor"; version="1.3-7"; sha256="01qlfv33adf3qyg6yzpigr4mm891xix39z8nkfz5d9q9iyx6fmx6"; depends=[bit64 conf_design Rcpp RcppArmadillo]; };
-  plantecophys = derive2 { name="plantecophys"; version="1.1-8"; sha256="02425j4pgwqadg2zn7vyl4741panif236m89zm36p580chp23wir"; depends=[]; };
-  plaqr = derive2 { name="plaqr"; version="1.1"; sha256="0hkzfxph2lacrd4npqvf4pyaldr1z56hlfbj3gi7qjlflxqnv3xp"; depends=[quantreg]; };
+  plantecophys = derive2 { name="plantecophys"; version="1.2-9"; sha256="021g81ianfpvrf6w6azblrmdrd7c1jklh0wjk0b5vxzla10dnfjd"; depends=[]; };
+  plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; };
   plater = derive2 { name="plater"; version="1.0.1"; sha256="0v5b9r6iha18qvrjpbr1p8fy06nf31x63ch5cnb4axyqa0x5skpp"; depends=[dplyr]; };
   platetools = derive2 { name="platetools"; version="0.0.2"; sha256="0xan3h3djhgjbqn8f7yzlkm25l0fzq86zhb5xwfib4yajnb2dspa"; depends=[dplyr ggplot2 plyr RColorBrewer]; };
   playwith = derive2 { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
@@ -8397,15 +8635,15 @@ in with self; {
   plotKML = derive2 { name="plotKML"; version="0.5-8"; sha256="0rd9242li967w253xhfywg72d3v1n5dybjxldkjgdix17gddwn5k"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
   plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
   plotMElm = derive2 { name="plotMElm"; version="0.1.4"; sha256="17fif2rqsf4f9jr4s7nr7wikwg63nibz6yjkldf7yh1qqqfikd2g"; depends=[ggplot2 interactionTest]; };
-  plotROC = derive2 { name="plotROC"; version="2.0.1"; sha256="1r80712svlm8kfbnymv27wrn60bckxnmq1rva3caln5b58swzcdk"; depends=[ggplot2 gridSVG plyr shiny]; };
-  plotSEMM = derive2 { name="plotSEMM"; version="2.2"; sha256="08px2ng2lxhfkjmr6w26rxqzpqa18adjn59g14c29jqzx6s2m5h2"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
+  plotROC = derive2 { name="plotROC"; version="2.2.0"; sha256="08dszp08mvw7lpvznlq3xw5bayl05lmnf4v2pmy5snyyxd9zsv4x"; depends=[ggplot2 gridSVG plyr shiny]; };
+  plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
   plotfunctions = derive2 { name="plotfunctions"; version="1.2"; sha256="1kc551501f0j13z0i49hq9na1jzzjx65vw39fj3kasm8dww2npkl"; depends=[]; };
   plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; };
-  plotly = derive2 { name="plotly"; version="4.7.0"; sha256="1z0qsccdyp0razk40d2yfmzvpvrx3a6ncbdnbf01756wni9szwns"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr purrr RColorBrewer scales tibble tidyr viridisLite]; };
-  plotmo = derive2 { name="plotmo"; version="3.3.3"; sha256="0vhv0nim3p2y5liiny68xj0pc0z4cicv1rw5bwzvk38xm72gszsv"; depends=[plotrix TeachingDemos]; };
+  plotly = derive2 { name="plotly"; version="4.7.1"; sha256="0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr purrr RColorBrewer scales tibble tidyr viridisLite]; };
+  plotmo = derive2 { name="plotmo"; version="3.3.4"; sha256="1j2nc6n5kv6zvxwlr1cr1shxdcihw7d5k7z0a90phmdp834x8agy"; depends=[plotrix TeachingDemos]; };
   plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; };
   plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; };
-  plotrix = derive2 { name="plotrix"; version="3.6-5"; sha256="01655y3qzy0283ppc85bi0g42g20zrqzcl0qb30cl6rcbflhymlb"; depends=[]; };
+  plotrix = derive2 { name="plotrix"; version="3.6-6"; sha256="07hywp3ym0gbpqdj3f4vhr0bhmynhby8vh6p1b9cm2hv26pzs9q4"; depends=[]; };
   plotrr = derive2 { name="plotrr"; version="0.2.0"; sha256="12kab7w32hcdqmwh3nfpk1zqkgnvpx3p0292w47643ahl26s9whj"; depends=[dplyr ggplot2]; };
   plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; };
   pls = derive2 { name="pls"; version="2.6-0"; sha256="15j59p5x0rkdrk7iqzkipsy50rsyjl31w8zxc4w3v1j5gzxhi1rx"; depends=[]; };
@@ -8421,7 +8659,7 @@ in with self; {
   plspolychaos = derive2 { name="plspolychaos"; version="1.1-1"; sha256="078arfv8z5nfrmsfi0n7hskmv394ysi6nhlskpy5cg37lqiwh0r1"; depends=[lhs MASS]; };
   pltesim = derive2 { name="pltesim"; version="1.0"; sha256="0mvqp8di2gwhd9wc9kvnnpxd3hkr9b9lj6g5qlkqcbrgkq6fjahs"; depends=[coreSim ggplot2]; };
   plugdensity = derive2 { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
-  plumber = derive2 { name="plumber"; version="0.3.2"; sha256="0zwr98grh40ikm2a9kr03iyvd4839pnl4wg2zil0qplysp98d91h"; depends=[httpuv jsonlite R6 stringi]; };
+  plumber = derive2 { name="plumber"; version="0.4.2"; sha256="0ralab3hqz22hcd4rvi82dshsvic1qfnl631s2fcr8saddw8ki8n"; depends=[crayon httpuv jsonlite R6 stringi]; };
   plumbr = derive2 { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
   plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; };
@@ -8443,6 +8681,7 @@ in with self; {
   poibin = derive2 { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
   poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
   pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; };
+  pointblank = derive2 { name="pointblank"; version="0.1"; sha256="11v0x264065iljhv77m4yc44zqd0i9bg95c6qiv8d85nf97201hh"; depends=[digest dplyr Hmisc htmltools knitr lazyWeave lubridate magrittr mailR pixiedust purrr readr rJava rlang rmarkdown stringr tibble tidyr]; };
   pointdensityP = derive2 { name="pointdensityP"; version="0.2.1"; sha256="013vamdh987w56bmz0m6j2xas4ycv1zwxs860rs5z4i55dhgf9kh"; depends=[]; };
   poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; };
   poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; };
@@ -8450,13 +8689,15 @@ in with self; {
   poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; };
   poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
   poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
+  poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; };
   polidata = derive2 { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; };
   poliscidata = derive2 { name="poliscidata"; version="1.2.0"; sha256="0vn9wdlh3bi24mcq0r4ani2b0hhlg1za1z6fw8ikz7952gpacqk8"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
-  pollen = derive2 { name="pollen"; version="0.52.00"; sha256="1d1rr7rzc7lppw562lrn4n9syzgff21ws32s501g85f1zllkip5y"; depends=[dplyr lubridate purrr]; };
+  pollen = derive2 { name="pollen"; version="0.53.00"; sha256="0gkmy5g16794zrr21g6yap0k4xl1bvsq5npyivsdflvvrg985nzw"; depends=[dplyr lubridate purrr]; };
   pollstR = derive2 { name="pollstR"; version="2.0.0"; sha256="0lcxhi1mazs8nh9hbbqyqx4axn5lji5fnp0kxrjwjxmzf59nksj8"; depends=[httr lubridate purrr stringr]; };
-  polmineR = derive2 { name="polmineR"; version="0.7.3"; sha256="1h3yrbqgmhj6djl7w6ksrlhl6ba5lwxiaj151bvx0hj43h7qkg6r"; depends=[data_table DT Matrix R6 slam tm]; };
+  polmineR = derive2 { name="polmineR"; version="0.7.4"; sha256="1mraxg06cy27jk8gj0l7pymj2rcvzz9fg9zd6qppw69jca6f826h"; depends=[data_table DT jsonlite Matrix R6 slam tm]; };
   polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; };
   polyCub = derive2 { name="polyCub"; version="0.6.0"; sha256="1xmk87vfs9vwp8j3iywir5591dcz0hfdmxgzwcyi8416qfbc9d54"; depends=[sp spatstat]; };
+  polyPK = derive2 { name="polyPK"; version="1.0.0"; sha256="135l8s0jh37nip1ly6dzcbb07vz1vsvs1vq2kn810jrpqs9jkbr6"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD missForest mixOmics pcaMethods PKNCA plyr sqldf xlsx]; };
   polySegratio = derive2 { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
   polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; };
   polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
@@ -8467,14 +8708,14 @@ in with self; {
   polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; };
   polynom = derive2 { name="polynom"; version="1.3-9"; sha256="1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk"; depends=[]; };
   polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; };
-  polysat = derive2 { name="polysat"; version="1.7-0"; sha256="018rabvdw2sf5gzcaxmzp61532p6ymzfx6l37ndfsy295swx7bvy"; depends=[]; };
+  polysat = derive2 { name="polysat"; version="1.7-2"; sha256="0ahx2pvlv2vdfiskwgawcrp447249ha0dq4qkhav3hpyvdg3in38"; depends=[]; };
   polywog = derive2 { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
   pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
-  pomp = derive2 { name="pomp"; version="1.12"; sha256="1fvzd68pc1lhxikc16f6a0lhyf66rj54if80icfvx6z3zvqc5dgw"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
+  pomp = derive2 { name="pomp"; version="1.14"; sha256="0zi1hahx4g1jjbvrmn0d2ci2aijw9qd7fxy19d1n65hkfk131iqy"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
   pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; };
   pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; };
   pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; };
-  popEpi = derive2 { name="popEpi"; version="0.4.1"; sha256="0n4kf3h6zgr7sc2bk8bbrf5bvaybnacy6vsqck63gfdn3kkc43m2"; depends=[data_table Epi survival]; };
+  popEpi = derive2 { name="popEpi"; version="0.4.2"; sha256="1jngfvkds7mj3a72l1bi4c4mmcafgnxmbbrc4siwwp06skxhffvp"; depends=[data_table Epi survival]; };
   popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
   popRange = derive2 { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; };
   popReconstruct = derive2 { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; };
@@ -8490,8 +8731,9 @@ in with self; {
   portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
   portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
   postGIStools = derive2 { name="postGIStools"; version="0.2.1"; sha256="1dmf77xpy61pqis3j9qzjjksmm9hkyhzxqdmjajpj7rkbqhl5qvp"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; };
-  postlightmercury = derive2 { name="postlightmercury"; version="1.0"; sha256="1z69z9wfgycaahk2bfxbzvn4d13ckzaxij7ywcsmgvli7kalpq13"; depends=[httr pbapply tibble]; };
+  postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; };
   potts = derive2 { name="potts"; version="0.5-7"; sha256="194996wr4rnpr42xqfi5yrcnxvd82all2fxki95dklr2qfjxg98a"; depends=[]; };
+  powdist = derive2 { name="powdist"; version="0.1.3"; sha256="1j8i3nyr9xbs4acrqpblnqny5wj3ds59s1aayb3iv3z68pj2vz6j"; depends=[VGAM]; };
   poweRlaw = derive2 { name="poweRlaw"; version="0.70.0"; sha256="1p2la3hslxq2xa8jkwvci6zcpn47cvyr9xqd5agp1riwwp2xw5gh"; depends=[VGAM]; };
   powell = derive2 { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
   powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; };
@@ -8521,10 +8763,10 @@ in with self; {
   prcbench = derive2 { name="prcbench"; version="0.7.3"; sha256="0xdmwjhxpcdaiqawhmlpr4ddlx22xk3rywa70jpm1vk5hc9pwivk"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; };
   prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; };
   prcr = derive2 { name="prcr"; version="0.1.4"; sha256="0yb0bi3kipq4r6g0fai2pb1gjxkd6gsjkf06irp2idx8r42ipl54"; depends=[dplyr ggplot2 tibble tidyr]; };
-  pre = derive2 { name="pre"; version="0.2"; sha256="1mg8yqljx6cww7f0175qr4gbzy64maf66xca9gry309zgihjzdm9"; depends=[Formula glmnet MatrixModels partykit]; };
-  preText = derive2 { name="preText"; version="0.5.0"; sha256="06pvbqawaaw20wlmljr2mc95g9nif42lqzcq1nrqqjixkfycykfd"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; };
+  pre = derive2 { name="pre"; version="0.3.0"; sha256="1jk99pribb1cs6rlfcs7iqvjzxyblqslh7mykcbkvh9anbipkcwa"; depends=[earth Formula glmnet MatrixModels partykit stringr]; };
+  preText = derive2 { name="preText"; version="0.6.0"; sha256="0cw74vix6cd6algadl8m8i236gvkhapkfjhra5y5cficvfzqbdgk"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; };
   precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; };
-  precrec = derive2 { name="precrec"; version="0.8.0"; sha256="1kf9wg91dr4pb4lybfhjzvw9wc647h0ygkcw8balqayll7ynlwhn"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; };
+  precrec = derive2 { name="precrec"; version="0.9.1"; sha256="0kppl4x8ji8hzll5wss1nzlk8qvf4g78f14x4c2b8dcxjikgl939"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; };
   predatory = derive2 { name="predatory"; version="1.1"; sha256="18nv8riw380acvgb8iz771wzdgrmkrwcvdxbxhkbczcdhgw1p0ig"; depends=[readr stringr]; };
   prediction = derive2 { name="prediction"; version="0.2.0"; sha256="09jlwk3fh7lkka9vsbr0bp7bpaf2p7q96qb8mv56rcmfrsf5446c"; depends=[]; };
   predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; };
@@ -8537,9 +8779,9 @@ in with self; {
   preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; };
   preprosim = derive2 { name="preprosim"; version="0.2.0"; sha256="1z10ranfal51vzsnndfaw5aqddh2w1xx8h50j1p7gx4fi90d0waq"; depends=[caret DMwR doParallel e1071 foreach ggplot2 reshape2]; };
   preproviz = derive2 { name="preproviz"; version="0.2.0"; sha256="0jb85qkzywsd2iyfynd8ngkc136m4qc38phc3fgxm2qw30dacmyh"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; };
-  prereg = derive2 { name="prereg"; version="0.2.0"; sha256="098352svjdf8cfmb9qwbv71xb4irxcr70r06bvnqdv5bliq9fzin"; depends=[rmarkdown]; };
+  prereg = derive2 { name="prereg"; version="0.3.0"; sha256="1lnpdwgri5rcwbwz9wh059rl6nrhlp5342gn9rnyp0gqwyni9hpd"; depends=[rmarkdown]; };
   presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; };
-  preseqR = derive2 { name="preseqR"; version="3.1.0"; sha256="0jry6lp3q5ak9y7hzfg3m8hzxknylza6k4zw13ds52qj4639lzhc"; depends=[polynom]; };
+  preseqR = derive2 { name="preseqR"; version="3.1.2"; sha256="0xafl51yc0y8rxwz3cc0a6mjv7ajgn8bzpynxgmkb3gjx0jla5kp"; depends=[polynom]; };
   prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
   prettyR = derive2 { name="prettyR"; version="2.2"; sha256="026cgbrqs799lg06qlwx1r9ramil790qxrb1cyl4w7mzf8sfpgn9"; depends=[]; };
   prettycode = derive2 { name="prettycode"; version="1.0.0"; sha256="1zba83b5sk8jyag8jz8gipn6qpxwfsfg1xcxamfvpmzjicajzhbx"; depends=[crayon withr]; };
@@ -8556,8 +8798,9 @@ in with self; {
   princurve = derive2 { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; };
   prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
   printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; };
-  prioritylasso = derive2 { name="prioritylasso"; version="0.1.0"; sha256="1mn7ywn8barxka119khiv9vxz81rqcjiz09960skwnnw9mksxnak"; depends=[glmnet survival]; };
+  prioritylasso = derive2 { name="prioritylasso"; version="0.2.0"; sha256="138yqpra00zs12bfj2lr1v8s3cmndl0q7fjv3s89ry2p84rlq8vr"; depends=[glmnet survival]; };
   prism = derive2 { name="prism"; version="0.0.7"; sha256="03z1m09vf2gd277xp3y5nhvgrp0fnbr2x0r9b92kp46ca09fq9y8"; depends=[ggplot2 httr raster]; };
+  prisonbrief = derive2 { name="prisonbrief"; version="0.1.0"; sha256="1fnhg6vqdabdnhvgd19vnkfrdgz8a53snfrx6m6mmdwb6cvavb8m"; depends=[data_table dplyr httr magrittr passport rlang rnaturalearth rnaturalearthdata rvest stringr tibble tidyr xml2]; };
   pro = derive2 { name="pro"; version="0.1.1"; sha256="0f0iliq7bhf313hi0jbwavljic4laxfc0n3gac5y6hzm39gvvgag"; depends=[]; };
   prob = derive2 { name="prob"; version="1.0-0"; sha256="0gnp3q3dm176c1n7vdgisv3p11m2jk1hiza1yi8qaqyd9mfh86bg"; depends=[combinat fAsianOptions]; };
   probFDA = derive2 { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; };
@@ -8567,10 +8810,11 @@ in with self; {
   processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; };
   processmapR = derive2 { name="processmapR"; version="0.1.0"; sha256="0ng48vwjsn1kmviyz41v1x4d3wd4bwycyfim079hs6adf0wq6vys"; depends=[bupaR DiagrammeR dplyr edeaR ggplot2 ggthemes]; };
   processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; };
-  processx = derive2 { name="processx"; version="2.0.0"; sha256="1bcqqdyc3ia17fh3qpscfny5d4ns7i982qkm52990xm2c1mba9c3"; depends=[assertthat crayon debugme R6]; };
+  processx = derive2 { name="processx"; version="2.0.0.1"; sha256="0yw23lp9xjvbpswzghkmjiayw7p19hbvmgv58k3i6b8g5nav4qcg"; depends=[assertthat crayon debugme R6]; };
+  prodest = derive2 { name="prodest"; version="0.1.1"; sha256="1j8gqxswwvnd45givadlvblnsc3qli228gz77d7alc19qf1wrrvz"; depends=[DEoptim dplyr Matrix Rsolnp]; };
   prodigenr = derive2 { name="prodigenr"; version="0.3.0"; sha256="1217l9r012xrgzna1bf9z31n2gw36h6grga3949kg7ghxrzjbm4q"; depends=[devtools]; };
   prodlim = derive2 { name="prodlim"; version="1.6.1"; sha256="0m51rkivx1zr6whdqwj66jpnkmp4385m06kkha3dp8qqf4jna9iz"; depends=[KernSmooth lava Rcpp survival]; };
-  productivity = derive2 { name="productivity"; version="0.2.0"; sha256="0fg5gsyszxfiqv7jdc96rcw6pqkqlk1kb8dpbsw5gklrs6f2my1g"; depends=[doParallel foreach Rglpk]; };
+  productivity = derive2 { name="productivity"; version="1.0.0"; sha256="1yf1w9pss8cbhlqg1zmsmr5qchf7sdvl67m1zzgxf8pplj2pzrzm"; depends=[doParallel foreach plm Rglpk]; };
   productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; };
   prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; };
   profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
@@ -8585,13 +8829,14 @@ in with self; {
   prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
   progress = derive2 { name="progress"; version="1.1.2"; sha256="1fxakchfjr5vj59s9sxynd7crpz97xj42438rmkhkf3rjpyspx59"; depends=[prettyunits R6]; };
   proj4 = derive2 { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
+  projmanr = derive2 { name="projmanr"; version="0.1.0"; sha256="0mfp1b00a5ndw7011q3jivxm8bsykm6q7pm7dplmqffgs0p3drvv"; depends=[ggplot2 igraph R6 tidyr]; };
   prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; };
   propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; };
   propagate = derive2 { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; };
   properties = derive2 { name="properties"; version="0.0-8"; sha256="1x7zln1indckl090p9kv40snamkac3b8q45387jdqxajmsallxmb"; depends=[]; };
   prophet = derive2 { name="prophet"; version="0.1.1"; sha256="1knkkm3ai91rcak5c5199gjqazq3db8202knk7b846w0n4f77hn3"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr zoo]; };
   proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; };
-  propr = derive2 { name="propr"; version="3.0.4"; sha256="1acfylhcjbvwfd9y3c1nxcq6d0zy9i2ljyl8h6a05fxm3q0y2z37"; depends=[fastcluster ggplot2 igraph Rcpp]; };
+  propr = derive2 { name="propr"; version="3.0.6"; sha256="1mnx6x0mmqbjj312jrr3nyl1lv7m765nla344wnliaaxwzkylgf9"; depends=[fastcluster ggplot2 igraph Rcpp]; };
   prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
   protViz = derive2 { name="protViz"; version="0.2.31"; sha256="05bmxc5hq2bpd8saqs36wwkmbywkw7rm3b4zl1dxpdpxmywsbf1a"; depends=[Rcpp]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
@@ -8603,7 +8848,7 @@ in with self; {
   protolite = derive2 { name="protolite"; version="1.6"; sha256="10ly0rscpmgdakzlr27h6d78d6ixvrh76xcyx68caffr3zydlfyq"; depends=[jsonlite Rcpp]; };
   proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; };
   prototest = derive2 { name="prototest"; version="1.1"; sha256="0v65abrn73wgwnrrf6gv9f7p0qy12xlk9ishq9lq4qal1wlsrrjs"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; };
-  protr = derive2 { name="protr"; version="1.4-0"; sha256="1z37kn5mrn2l2ikdsga39zqk1rkrbyx490lqwv68m68vykyfywl3"; depends=[]; };
+  protr = derive2 { name="protr"; version="1.4-1"; sha256="01ly3908j4biabn9nwx2pfjsidgyf9zw8p50pd5342r0rvmg79dy"; depends=[]; };
   proustr = derive2 { name="proustr"; version="0.1.0"; sha256="17cxkyy5xjg94lysfkbgfhzd4vajk1n1ri5yjb0ngjlhz3nndb8v"; depends=[tidyr]; };
   provenance = derive2 { name="provenance"; version="1.7"; sha256="01gf354zg403j8l0c8q57vbz13cvi3inkrqh6pm1xg04jfmh1n86"; depends=[MASS]; };
   proxy = derive2 { name="proxy"; version="0.4-17"; sha256="0bg1fn96qrj8whmnl7c3gv244ksm2ykxxsd0zrmw4lb6465pizl2"; depends=[]; };
@@ -8615,7 +8860,7 @@ in with self; {
   pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; };
   psd = derive2 { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; };
   pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; };
-  pseudo = derive2 { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[geepack KMsurv]; };
+  pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; };
   pseval = derive2 { name="pseval"; version="1.3.0"; sha256="1iv3fa7ar9i7v9j5axbasmn8l8nvry4zvmb7fd8aql82f22szmbj"; depends=[survival]; };
   psgp = derive2 { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[automap gstat intamap Rcpp RcppArmadillo]; };
   psidR = derive2 { name="psidR"; version="1.4"; sha256="1whdjsab5cihlq4gp06xafl3zg7z0cjb4622d23v24igz7kr0ic2"; depends=[data_table foreign RCurl SAScii]; };
@@ -8627,6 +8872,7 @@ in with self; {
   pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; };
   psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
   psych = derive2 { name="psych"; version="1.7.5"; sha256="0mzzd9qj57qn5cnmd3w31gyp7big70pyx7nkxiqv1q0ys3sg6i25"; depends=[foreign lattice mnormt nlme]; };
+  psychmeta = derive2 { name="psychmeta"; version="0.1.0"; sha256="0xrw24d09imzhh4r2dpby4ps10d211yp8nfixvi04pjhk8dz16j4"; depends=[boot dplyr ggplot2 MASS metafor reshape2 tibble tmvtnorm]; };
   psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; };
   psychomix = derive2 { name="psychomix"; version="1.1-4"; sha256="15yk3z11w4bzk6vljr13bkfhzycypww6blc1djb5iwl635xq1c49"; depends=[flexmix Formula lattice modeltools psychotools]; };
   psychotools = derive2 { name="psychotools"; version="0.4-2"; sha256="04p5yb39c8j28q6brqsrw0dr1zvgpyzb7008v2kk3d5sncgl4dd0"; depends=[]; };
@@ -8639,13 +8885,14 @@ in with self; {
   ptw = derive2 { name="ptw"; version="1.9-12"; sha256="111b0s66p7fk6z6bnm3wckpfjxr1gshv0rqqy5wy6qg60hp7bcfd"; depends=[nloptr]; };
   ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; };
   ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; };
-  pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.9"; sha256="079lzyqxkhavirrnzw0khi6gilpp7778zyl7bcm3kb4jqn9isql1"; depends=[boot R2HTML RCurl XML]; };
+  pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.10"; sha256="0q4miancvvb7c3l9m9k1ij623k1f4h84zihgafvib5xy5mhzb312"; depends=[boot R2HTML RCurl XML]; };
   pubprint = derive2 { name="pubprint"; version="0.2.1"; sha256="0lcav93i4lw0j491q8ga47iyski2kvmqvppq0jwa3144zfb3hnic"; depends=[stringr]; };
   pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
   pulsar = derive2 { name="pulsar"; version="0.2.5"; sha256="1qmyhj32dygnvqvjysvlhlxv9y8lyfnm8hzaycmh8g3lhymk2k9c"; depends=[Matrix]; };
+  pulver = derive2 { name="pulver"; version="0.1.0"; sha256="0kjx2wxpyzwd4wgn519j2r4cpxrvdd1zg561ngz9af28gcc2ikvz"; depends=[DatABEL Rcpp]; };
   pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; };
   purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; };
-  purrr = derive2 { name="purrr"; version="0.2.2.2"; sha256="1i1n651xf15489pd6xjdvyp8wyayn8p33d27br39mddn1xdjrpc1"; depends=[lazyeval magrittr Rcpp tibble]; };
+  purrr = derive2 { name="purrr"; version="0.2.3"; sha256="0j1y0nbvljcis9hgic4wbbzslcsidhpw0wzs7d2hx7a2ygi6mkma"; depends=[magrittr rlang tibble]; };
   purrrlyr = derive2 { name="purrrlyr"; version="0.0.2"; sha256="1wkngb87xmlkghsqjr7l5fhlj3a54prvg6v6hd0prn768xw4rc1c"; depends=[BH dplyr lazyeval magrittr purrr Rcpp]; };
   pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; };
   pvar = derive2 { name="pvar"; version="2.2.2"; sha256="0a84nap9rwlfvhi4yj6mh7wrmzsi06w1zpmshw84lkm2h2ch02gy"; depends=[Rcpp]; };
@@ -8671,7 +8918,7 @@ in with self; {
   qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; };
   qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; };
   qboxplot = derive2 { name="qboxplot"; version="0.1"; sha256="1izihjcdwj5y90fmr97wbp2qswszjpb28cv0cf3gl57pypbq5vq2"; depends=[]; };
-  qcc = derive2 { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; };
+  qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; };
   qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
   qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; };
   qdap = derive2 { name="qdap"; version="2.2.5"; sha256="13isxmi9vknl5c71434r16j301i86zpbzcqch8hiay51x3wbf2f0"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
@@ -8694,6 +8941,7 @@ in with self; {
   qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
   qpcR = derive2 { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS Matrix minpack_lm rgl robustbase]; };
   qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; };
+  qqplotr = derive2 { name="qqplotr"; version="0.0.1"; sha256="0npvl90gqw1graa8bvn0nijvj1klcr7vnsl8d8samanj3af8z7vb"; depends=[dplyr ggplot2 robustbase]; };
   qqtest = derive2 { name="qqtest"; version="1.1.1"; sha256="08vfpbrgvyhv1w0gqmys9zkhfxh85sk74ig5fn12ma2p87zv7r5l"; depends=[robust]; };
   qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; };
   qrLMM = derive2 { name="qrLMM"; version="1.3"; sha256="1k85d09yvhx3pgmvqrsmhd14hqaah4pdr87vp4kg60dp9w5sydjz"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
@@ -8718,7 +8966,7 @@ in with self; {
   qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; };
   qtlcharts = derive2 { name="qtlcharts"; version="0.9-6"; sha256="021gx5qzrc7jbgpp91mn36czr7fsh37wf3c7cifcv3xwzc54j4dd"; depends=[htmlwidgets qtl]; };
   qtlhot = derive2 { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[corpcor lattice mnormt qtl]; };
-  qtlmt = derive2 { name="qtlmt"; version="0.1-4"; sha256="1kx4iajhnjilciz9vda0s1mxqxa0h69vm3gpwdpbghgc5cj8d8kh"; depends=[]; };
+  qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; };
   qtlnet = derive2 { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[graph igraph pcalg qtl sem]; };
   qtpaint = derive2 { name="qtpaint"; version="0.9.1"; sha256="08x7qcxwkaclwv1p4s9a5k95x35hzp69whiihkakjv5blm83m3g9"; depends=[qtbase]; };
   qtutils = derive2 { name="qtutils"; version="0.1-3"; sha256="018k9v3mab1mfcjh4mv1a1iish50fwdhb51mqn17k6fyrrrv7vs5"; depends=[qtbase]; };
@@ -8735,7 +8983,7 @@ in with self; {
   qualvar = derive2 { name="qualvar"; version="0.1.0"; sha256="07vpq5nyh40y1sq1fsg97z7bbardqakq6bx635v42pv00480h9sh"; depends=[]; };
   quantable = derive2 { name="quantable"; version="0.2.2"; sha256="179bqqrga8mpigchfmhf11sc75frhd9nd6yqclz85lnd6gl16yd7"; depends=[caret e1071 gplots Matrix pROC RColorBrewer scales]; };
   quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-  quanteda = derive2 { name="quanteda"; version="0.9.9-65"; sha256="1csj7fr42pibwnky85qcsqvg5b0chg0f8q2zzvna14ky4iah95z6"; depends=[data_table fastmatch ggplot2 Matrix Rcpp RcppArmadillo RcppParallel RSpectra SnowballC stringi wordcloud XML yaml]; };
+  quanteda = derive2 { name="quanteda"; version="0.99"; sha256="0w34nkga8xhs219501vh6ks8s09qr44i44n9w8z23y2g2k65va65"; depends=[data_table fastmatch ggplot2 lubridate Matrix Rcpp RcppArmadillo RcppParallel RSpectra SnowballC stringi wordcloud XML yaml]; };
   quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; };
   quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; };
   quantmod = derive2 { name="quantmod"; version="0.4-10"; sha256="12v83w2q8agvwwrjg9xwpamxmnqjays5xw51lhgbmnksasm40003"; depends=[curl TTR xts zoo]; };
@@ -8750,10 +8998,13 @@ in with self; {
   queuecomputer = derive2 { name="queuecomputer"; version="0.8.1"; sha256="1c4xifg0wz09bn9j0y7xyn2rdr4fz2vr2r35r8bcajnmgs9hai3x"; depends=[dplyr Rcpp RcppArmadillo tidyr]; };
   queueing = derive2 { name="queueing"; version="0.2.10"; sha256="0q7hnr5dkjfpy80m9s730k59b8wpajrv00frl5wy50xvg4a6shii"; depends=[]; };
   quhomology = derive2 { name="quhomology"; version="1.1.0"; sha256="0acglmjp4x8f81iysxp8x7v5279p8gdidj308b9spn6xbmqgbr8z"; depends=[MASS numbers]; };
+  quickPlot = derive2 { name="quickPlot"; version="0.1.1"; sha256="0pi82wrwiaj02qgn0dgfgk9jjs56wmsdkkcrwz1h180xqfk30nmp"; depends=[data_table ggplot2 gridBase igraph raster RColorBrewer rgdal sp]; };
   quickReg = derive2 { name="quickReg"; version="1.0.0"; sha256="0dgs0ja2srivrbzl11d3al45ncnrlx7940sk0h8c6lnnxv7nz77k"; depends=[ggplot2 nortest psych survival]; };
+  quickblock = derive2 { name="quickblock"; version="0.1.0"; sha256="15zv7znhq3rl5jkdy0jyxr0h2mkpxir04vvl2hw57c5mn79izcpr"; depends=[distances scclust]; };
   quickmapr = derive2 { name="quickmapr"; version="0.2.0"; sha256="1hxcq4h1rgdmypn3kgmwppzhacyspcj7iv2sy7s2xx5y69x62hf1"; depends=[httr raster rgdal rgeos sp]; };
   quickmatch = derive2 { name="quickmatch"; version="0.1.2"; sha256="03wnx6hifr4pmwm6fsxamcaf5ig59nfia9lyn6mzxplinfid71w6"; depends=[distances sandwich scclust]; };
   quickpsy = derive2 { name="quickpsy"; version="0.1.4"; sha256="0zvi5g43dj1a3f6nysw9gc9nnhm0z5h6sfka4ggwr14fw6k0gz3l"; depends=[DEoptim dplyr ggplot2 MPDiR]; };
+  quickregression = derive2 { name="quickregression"; version="0.2"; sha256="1z0sspi8q7dvgxqbj5na56v458pv6jhxrssnm6j23156dchgw39h"; depends=[car]; };
   quint = derive2 { name="quint"; version="1.2.1"; sha256="1d9dnrjnl9cg2yn5snr6x9qr6lf74639j3ymsxpw0wn5c4fm8z46"; depends=[Formula partykit rpart]; };
   quipu = derive2 { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; };
   quotedargs = derive2 { name="quotedargs"; version="0.1.0"; sha256="1wnzcywrahcf2wwxnwqfxbfmrhzlq2ghfzbhs10gj9nsbbp1l0ch"; depends=[]; };
@@ -8763,14 +9014,14 @@ in with self; {
   r_jive = derive2 { name="r.jive"; version="2.1"; sha256="0l0bhhp6bdc84pzxi7gnsxx3scycw0zahrnc496wx3j43np9hlsg"; depends=[abind gplots SpatioTemporal]; };
   r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
   r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; };
-  r2glmm = derive2 { name="r2glmm"; version="0.1.1"; sha256="0b64kia06n8l88rm63hcb8h8qha5if2h8vm8m4s5fdf5hl34dv02"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; };
+  r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; };
   r2lh = derive2 { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; };
   r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
   r4ss = derive2 { name="r4ss"; version="1.24.0"; sha256="1kifzfg2zx6lq2c8qqbhb096z1wgdayhg5qzx5hnkwpn05w5cma3"; depends=[coda corpcor gplots gtools maps pso truncnorm]; };
   rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; };
   rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; };
-  rAmCharts = derive2 { name="rAmCharts"; version="2.1.3"; sha256="0q02x00gvvqzrsl2m9lmmjc2xf3vf718ar0zlqnqn6rnz94lbvv3"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml]; };
-  rAverage = derive2 { name="rAverage"; version="0.5-3"; sha256="0mn0ngnjjcyh59q4k0lc1fpim2n81aif1b4nrkdwl5dn59zb3cw3"; depends=[]; };
+  rAmCharts = derive2 { name="rAmCharts"; version="2.1.5"; sha256="1lvcws288dxw6j3xjxd3rfr4k1izvnq8ykpmh02v4fqh4hzhqgwn"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml zoo]; };
+  rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; depends=[]; };
   rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
   rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.1.0"; sha256="194j445nirvvkz880ax0zw2q1mkiy0khdfjl7bwiwj8knhhvkrhw"; depends=[data_table foreach GPfit magrittr]; };
   rBeta2009 = derive2 { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
@@ -8805,14 +9056,15 @@ in with self; {
   rLDCP = derive2 { name="rLDCP"; version="1.0.1"; sha256="0ldw6ybyyxhfsxbbjs8qzcf8dmha3q04h6mcxk90q1wlmlanqwf0"; depends=[XML]; };
   rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; };
   rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.8.7"; sha256="17vq8lapiviyibl1jm12a73qq98bgpnh7xp66jnv3lfksv9q3ck6"; depends=[plyr]; };
-  rLiDAR = derive2 { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; };
+  rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; };
   rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
   rMR = derive2 { name="rMR"; version="1.0.4"; sha256="1md0xkl87qqylwh5zbx9awa5i4f573v4glgaf4k8h5ls4icaaav4"; depends=[biglm]; };
   rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; };
   rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; };
   rNOMADS = derive2 { name="rNOMADS"; version="2.3.6"; sha256="007yha5ils7wdbld6id3gfgm99cks3vc64awammrv0kvq85c8g8k"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
-  rODE = derive2 { name="rODE"; version="0.99.4"; sha256="10lkrhaq0vfj5vw5q7asr52af6f57faz1b4xqnvjfgpz1bn528m9"; depends=[data_table]; };
+  rODE = derive2 { name="rODE"; version="0.99.5"; sha256="0y1m03dlkf4gspif0jp0bkh4bk6n7zq4m54rfpbc8vag91h56lpv"; depends=[data_table]; };
   rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.1"; sha256="0yk61ck2br81cd40yvqxrzi9s680ii26wbl0wjdam04dyf0vh1cv"; depends=[mvtnorm ssanv]; };
+  rPraat = derive2 { name="rPraat"; version="1.0.8"; sha256="06f97sa43i0b4x8j48higgx5jyj5q73j6mf2730yfm4db6ahz94m"; depends=[dplyr dygraphs readr stringr]; };
   rPref = derive2 { name="rPref"; version="1.2"; sha256="19b6rycz73rz3nxymb52gfddqsxprkxazwa8pb75vckk13q1cmj0"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; };
   rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; };
   rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; };
@@ -8825,7 +9077,7 @@ in with self; {
   rTensor = derive2 { name="rTensor"; version="1.3"; sha256="0ra34sn4g92r6asrn4la2wbsi2y0hnyx163wwi4v0j6f57bslhdw"; depends=[]; };
   rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; };
   rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; };
-  rWind = derive2 { name="rWind"; version="0.2.0"; sha256="0yv6r32fmjl0nvvllxm57zgwwy5rckamzj58bgrppl1q4zlqpvdm"; depends=[gdistance Matrix raster shape]; };
+  rWind = derive2 { name="rWind"; version="0.3.0"; sha256="17qap8dlrgkh4kkyighxgpsbghjq4n1cgqp8asdw5giyakm5v7d4"; depends=[gdistance igraph Matrix raster shape]; };
   rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; };
   race = derive2 { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
   radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
@@ -8846,7 +9098,7 @@ in with self; {
   rainbow = derive2 { name="rainbow"; version="3.4"; sha256="09vxdb4j099grnlx10995b74r3h9g1vs8div3nywgnslaj8x7pay"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
   raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
   rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
-  rakeR = derive2 { name="rakeR"; version="0.1.2"; sha256="064vprqrsing372hhkp6a7jfihbbik2i40i7mp9l79n816szpgm7"; depends=[ipfp]; };
+  rakeR = derive2 { name="rakeR"; version="0.2.0"; sha256="11zazjr56x8dbnxryxjxqrxqpnkvangkdzy8869smvhd52qvcqa1"; depends=[ipfp wrswoR]; };
   ramcmc = derive2 { name="ramcmc"; version="0.1.0"; sha256="0s5jgjqkschr64srblppv9lbvhynlpfiy8cy12fywpmnbv8viazq"; depends=[Rcpp RcppArmadillo]; };
   ramidst = derive2 { name="ramidst"; version="0.1.0"; sha256="1q4lvq2c2vj9xrm2p2w2qjsl4qvwcl6y54y68mmbd6cw7wqpffjj"; depends=[rJava]; };
   ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; };
@@ -8859,15 +9111,16 @@ in with self; {
   random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
   randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; };
   randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.2"; sha256="1fijnzzap8my4l211m5pgj4fwna04z1db5m3hhim72i3xzc77hy2"; depends=[ddR Matrix randomForest]; };
-  randomForestSRC = derive2 { name="randomForestSRC"; version="2.4.2"; sha256="17f9dr93vbmv4b1hmx4cw5mc3phm7wnjzw70yi8nbhmzlar3qj7v"; depends=[]; };
+  randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.9"; sha256="0gqqm3784krl6xdx7j6xvvyi2rjbyi6c8shm44yvq59is5i7fypc"; depends=[data_table dplyr DT dtplyr GGally ggplot2 ggrepel MASS randomForest reshape2 rmarkdown]; };
+  randomForestSRC = derive2 { name="randomForestSRC"; version="2.5.0"; sha256="0jh7j4zwcxhgqrklz0g249am5s91q4ddi7w7yswlx6gs7yy8zcfr"; depends=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
-  randomLCA = derive2 { name="randomLCA"; version="1.0-11"; sha256="076sjq74dhdr9vqlg8kns4apvkrv9qpvkixqkrkz2l7215k79fz7"; depends=[boot fastGHQuad lattice Matrix]; };
+  randomLCA = derive2 { name="randomLCA"; version="1.0-12"; sha256="0vn3pb24r8iwadmkaps86p5qq9qwr801lvh3a19jf70lzv1g9j2i"; depends=[boot fastGHQuad lattice Matrix]; };
   randomNames = derive2 { name="randomNames"; version="1.0-0.0"; sha256="12q5bs65qivddiaxbsp128j94h2vyrgjvmm80d52r36ffbaigl09"; depends=[data_table]; };
   randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
   randomcoloR = derive2 { name="randomcoloR"; version="1.0.0"; sha256="15qgfzwc2cli2gjwzj1pf4h16qciiinihd9ib6ph74jbkpimyh11"; depends=[colorspace stringr V8]; };
   randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
   randomizeBE = derive2 { name="randomizeBE"; version="0.3-3"; sha256="0vdvgk2b1h1lsj0ka01lwldfxanngir91axc8ywa6pg12hrdkkb0"; depends=[]; };
-  randomizeR = derive2 { name="randomizeR"; version="1.3"; sha256="0s62r0fxi0f9jbwldvga2vn06cp0amxjhmqch7d892c4wa7r9fj0"; depends=[ggplot2 plotrix]; };
+  randomizeR = derive2 { name="randomizeR"; version="1.4"; sha256="0l7gvpm52fwbz79vgy7vn4z2n4gqigimdj6r9drm3lfzbylmx3js"; depends=[ggplot2 plotrix]; };
   randomizr = derive2 { name="randomizr"; version="0.6.0"; sha256="1hkazj25ipvrdcy9845lgqvnncw3ilrxrhzvh5lm865rk8z0i2cg"; depends=[]; };
   randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; };
   randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
@@ -8883,7 +9136,7 @@ in with self; {
   rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; };
   rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; };
   rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; };
-  raptr = derive2 { name="raptr"; version="0.0.3"; sha256="1ydk83w1sd60pb0a03938hlgdw87pk40l028cxwa8kzwrzi6gh1j"; depends=[adehabitatHR BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp testthat]; };
+  raptr = derive2 { name="raptr"; version="0.0.5"; sha256="1jp2p439in0j19xkv9nyh39a61srrb3zcy6y37nz0jnffzkw5mb4"; depends=[adehabitatHR BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp testthat]; };
   rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
   rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
   rarhsmm = derive2 { name="rarhsmm"; version="1.0.4"; sha256="0fc22sg4b3r1fjcmgc6kvpw1vxb29i8a1qlrkic8jmd1370dh61w"; depends=[glmnet]; };
@@ -8892,23 +9145,24 @@ in with self; {
   raster = derive2 { name="raster"; version="2.5-8"; sha256="1k34caqj8fab7am44zmp1szk0w15rjc04xz3phzm2l1lg2yjm6a7"; depends=[Rcpp sp]; };
   rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; };
   rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; };
+  rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; };
   rasterVis = derive2 { name="rasterVis"; version="0.41"; sha256="0dsg8ypsxxa7qagy5yjcyqyjqqyy7xgfbmiijr3xbn2n1wp090n9"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
   ratelimitr = derive2 { name="ratelimitr"; version="0.3.9"; sha256="0w6i9czcbj8ipd9nn4w4h4pqk6xd8anh00cn60hss9hs18fcb21d"; depends=[assertthat]; };
   rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
   raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
   ratesci = derive2 { name="ratesci"; version="0.2-0"; sha256="0gviaiia2jih6xx1maf9ajizmgh4vdbca4r17h9m817v3xn21y7b"; depends=[]; };
   rationalfun = derive2 { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
-  ratios = derive2 { name="ratios"; version="1.0.0"; sha256="1mjwh68x0kkpgk4w4hyafam0xcsgprp80ms1wgvw2ylh67qa98cv"; depends=[data_table stringr]; };
+  ratios = derive2 { name="ratios"; version="1.1.0"; sha256="1nss6xfkm5axp8mld1aiqaygrmrwl2jn9k2476la2j3pla047xgm"; depends=[data_table stringr]; };
   rattle = derive2 { name="rattle"; version="4.1.0"; sha256="0ww4bwwvivpk049lpv6k29zxkb0islhwh2qnlrvasgh2b9yig25p"; depends=[magrittr RGtk2 stringi]; };
   rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; };
-  raw = derive2 { name="raw"; version="0.1.4"; sha256="112fw1si708qrj6r91b1i8cwhxa20amri5838rc5azn6d5b9wcks"; depends=[]; };
+  raw = derive2 { name="raw"; version="0.1.5"; sha256="0w0k35izvsi8vwp38har4ygh1zxnz7hfla8d8fcbvckpfbkwpggp"; depends=[]; };
   rbamtools = derive2 { name="rbamtools"; version="2.16.6"; sha256="1sb18qx68fnj1d598lw8fkqnxp3c5s704g6cnhwy299gppj3xg1d"; depends=[refGenome]; };
   rbcb = derive2 { name="rbcb"; version="0.1.1"; sha256="1y6rb39ljk45vbf8h1ggc3viplqn9ywzfg1fhqlplklxd7l6067q"; depends=[httr jsonlite tibble xml2 xts]; };
   rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
   rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
   rbgm = derive2 { name="rbgm"; version="0.0.4"; sha256="0sqi42vz3fdgp7gpa4jjh8dxz3iwwagw9in70jpz6fc18ivizkp1"; depends=[dplyr geosphere raster sp tibble]; };
   rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; };
-  rbi = derive2 { name="rbi"; version="0.7.0"; sha256="0j5h5m4xshs5xizzb3fxlzjgp6nkyz0hbh0yhky1pj815n66ww9m"; depends=[data_table ncdf4 reshape2]; };
+  rbi = derive2 { name="rbi"; version="0.8.0"; sha256="0hizf3mffp72pgzkwsdg2dw0p0dfbnbb80jv3gmayvg7kkq1nabv"; depends=[data_table ncdf4 reshape2]; };
   rbiouml = derive2 { name="rbiouml"; version="1.7"; sha256="0bk0pvx0rfk74s7lbr8lc664yplfky94j1ym098w029045k233pi"; depends=[RCurl RJSONIO]; };
   rbison = derive2 { name="rbison"; version="0.5.4"; sha256="0l3653q7bfda9lw1isnx6gdd7l5b8aldqgc2hppg2wh2k004rnf6"; depends=[crul dplyr ggplot2 jsonlite mapproj plyr sp]; };
   rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; };
@@ -8925,14 +9179,15 @@ in with self; {
   rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; };
   rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; };
   rcdd = derive2 { name="rcdd"; version="1.2"; sha256="1s7idrfvl0hhyckrfiakszqw6fk34f9iiyxspzya3rqyhih014ay"; depends=[]; };
-  rcdk = derive2 { name="rcdk"; version="3.3.8"; sha256="0gwjb6ph7v94zl3kdh24dbk8hz48gi2y3xmj35wpjvzc496ldmbf"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
+  rcdk = derive2 { name="rcdk"; version="3.4.3"; sha256="055k6p40ai2dfc3kn6m1pgj6wryyh3l84w1wy86ckqny24h4xvqd"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
   rcdklibs = derive2 { name="rcdklibs"; version="2.0"; sha256="05g0y00bw1bqykfbwn4q42krwcfl50jcavaw7yyw9a5m34hvw0l8"; depends=[rJava]; };
   rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
   rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
   rclimateca = derive2 { name="rclimateca"; version="0.2"; sha256="1haczzx0hbah4vzbp10rih2yqq1x1s6w9f66xgk485sgyvkg5855"; depends=[digest httr lubridate prettymapr reshape2]; };
+  rclipboard = derive2 { name="rclipboard"; version="0.1"; sha256="0qphr3qrp0k2gnzk27bgfiq3ff6b8564gmkrjw1kri1p7ilf71wx"; depends=[shiny]; };
   rcmdcheck = derive2 { name="rcmdcheck"; version="1.2.1"; sha256="04gh0drvkikn91i5zmpixhrhyjnsyxwz8k8bx4kgwwrmh1dc7f2s"; depends=[callr clisymbols crayon digest withr]; };
-  rcompanion = derive2 { name="rcompanion"; version="1.5.7"; sha256="1x32yvgsn392rdflpampr8bfmffpllrhbll4d558p9r32cl4r70l"; depends=[boot BSDA coin DescTools EMT FSA hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
+  rcompanion = derive2 { name="rcompanion"; version="1.10.1"; sha256="1mcibxnkaqb0pbag90jpwxvshdhabszg95cka55igjg4sc3x7iy9"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
   rcoreoa = derive2 { name="rcoreoa"; version="0.1.0"; sha256="13nfziqxxljnczn3idq3zlc9xkklalfnxbakvhs5bw19jmbd11ba"; depends=[crul jsonlite pdftools]; };
   rcorpora = derive2 { name="rcorpora"; version="1.2.0"; sha256="0nxd2arzz2617xxcngvcrrrsky9f1b9zdmpv81zr89y08b3xh9f1"; depends=[jsonlite]; };
   rcqp = derive2 { name="rcqp"; version="0.4"; sha256="1jpzp3cs17bwfabzg7jffa3hni867mjw8yxi0igxicrbz56j33jb"; depends=[plyr]; };
@@ -8940,13 +9195,13 @@ in with self; {
   rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; };
   rcss = derive2 { name="rcss"; version="1.2"; sha256="08hiprjcjvc138laqrvlvrmn664b63x829ammzgrwjqcsj4kpmds"; depends=[Rcpp RcppArmadillo rflann]; };
   rcure = derive2 { name="rcure"; version="0.1.0"; sha256="1pcdc168bwn0b90xy8sdwrm2yvhj26xj11wm8z84m48sxy56j4v8"; depends=[arm MASS plyr smcure survival]; };
-  rcv = derive2 { name="rcv"; version="0.2.0"; sha256="1rysvcccnra2px99s83i5z657y6bsdfa1w189ngznd4964c8rxzb"; depends=[dplyr forcats readr stringr tibble tidyr]; };
+  rcv = derive2 { name="rcv"; version="0.2.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr readr stringr tibble tidyr]; };
   rda = derive2 { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
   rdatacite = derive2 { name="rdatacite"; version="0.1.0"; sha256="1h8zrgy3ig4rsrm4j9ivff71mdyabrdp71cflxahw7c3q9iyjxhf"; depends=[oai solrium]; };
   rdatamarket = derive2 { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; };
   rdataretriever = derive2 { name="rdataretriever"; version="1.0.0"; sha256="1a1dbzs1jravbhidv9wcs52qbd6zf7wf26hixpqjwiq8gsq9l5gh"; depends=[]; };
   rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; };
-  rddensity = derive2 { name="rddensity"; version="0.2"; sha256="1svqraf92c821pv6wn8i81chhqbd046q1a0ry6d1b1z7q6lh0gjc"; depends=[ggplot2 lpdensity]; };
+  rddensity = derive2 { name="rddensity"; version="0.2.2"; sha256="10530il8fxpgcads6yvj09jwanldlpvjgjqcknl2wly4gmwcwjq9"; depends=[ggplot2 lpdensity]; };
   rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; };
   rdefra = derive2 { name="rdefra"; version="0.3.4"; sha256="05fskap0vvrq08m4gql9gczy04lc3dgxgjcsb57dgp3nng358sf6"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; };
   rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
@@ -8957,7 +9212,7 @@ in with self; {
   rdnb = derive2 { name="rdnb"; version="0.1-1"; sha256="1mg40jad79mk95ndnljvfvyh9rhbxkw7inpg2vbsixf1ywdljri3"; depends=[brew httr xml2]; };
   rdomains = derive2 { name="rdomains"; version="0.1.5"; sha256="0xz6vdci2yxmc2850jlgj7c27cndwvk645kwky0whisg6cbv8wdg"; depends=[aws_alexa curl glmnet Matrix RSelenium urltools virustotal XML]; };
   rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; };
-  rdpla = derive2 { name="rdpla"; version="0.1.0"; sha256="0h3m2f5rdyvdgb767hnmck4z1wq1y4hvbcwgfh7zfjcd9zns42h1"; depends=[data_table httr jsonlite tibble]; };
+  rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; };
   rdrobust = derive2 { name="rdrobust"; version="0.98"; sha256="0yyb1mr8hn8ssp8h1ypylyd00mcxkdhxp64kp11hi0j2mzpp5pcy"; depends=[]; };
   rdrop2 = derive2 { name="rdrop2"; version="0.7.0"; sha256="03r3iqi796y7s8bnyca6nya2ys7s1rdxm00sy9c7l7sh0z6npcq4"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
   rdryad = derive2 { name="rdryad"; version="0.2.0"; sha256="16wbf0hpb4pgjcq84s7ac0y1cm5i33l8n6li5z8ynivdj9w9fb46"; depends=[httr oai solr xml2]; };
@@ -8991,6 +9246,7 @@ in with self; {
   rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; };
   recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; };
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
+  recipes = derive2 { name="recipes"; version="0.1.0"; sha256="0rydk403qihxmcv3zz323r3ywk4g1v7ibvj452rxhm0z22sqk9kb"; depends=[ddalpha dimRed dplyr gower ipred lubridate magrittr purrr RcppRoll rlang tibble tidyselect timeDate]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
   recmap = derive2 { name="recmap"; version="0.5.20"; sha256="1ld3ifcn9rwgk4hiislmdkz73sdxagrbynq9x3mswjifx1hlqj6d"; depends=[GA Rcpp sp]; };
   recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
@@ -8999,18 +9255,19 @@ in with self; {
   recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; };
   reconstructr = derive2 { name="reconstructr"; version="2.0.0"; sha256="1pa6b8zns9495f1bdifvx19hsy5808hqbxb2bn1srwnr4s3ma1zi"; depends=[openssl Rcpp]; };
   recosystem = derive2 { name="recosystem"; version="0.4.1"; sha256="1gnq2gq47qwinack3f95d7c8877qia44zk9pnj1sx83jjs8sxk8p"; depends=[Rcpp]; };
-  red = derive2 { name="red"; version="1.1.1"; sha256="05png61f8fwlhrvvhmv9yzq2m4pa8vwh3cbn9ig1rlivkhmh28s4"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; };
+  red = derive2 { name="red"; version="1.2.0"; sha256="0g15yx1wk70ds3qadfzv2hkiyliwfgzc1h66klhqi1n4f8gsalcz"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; };
   redR = derive2 { name="redR"; version="1.0.0"; sha256="01safawd9ai34fqxjpc161yzpsk31hfyl8ybcfvdj7a9vdbvcb5i"; depends=[imager]; };
   reda = derive2 { name="reda"; version="0.3.1"; sha256="0313x4vm0jm0lgzspv0ldsblmjgy13dqbsafpikkh603k5pkq1js"; depends=[ggplot2 splines2]; };
   redcapAPI = derive2 { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; };
   reddPrec = derive2 { name="reddPrec"; version="0.3"; sha256="01dsgd28ps1f32l3ppz4fbzihs5i79zb1nqg9r3b21fsx1ly44d6"; depends=[snowfall]; };
   redist = derive2 { name="redist"; version="1.3-1"; sha256="0rivfi3jpjvhd36rkhlazx4vr7wsig9lf3im1masjmzd4s00zrd8"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; };
   redland = derive2 { name="redland"; version="1.0.17-9"; sha256="01jx6r7zznb6cpi2bx36fpsgig3bkc1nv9afz5s2nfqisxiq48w5"; depends=[roxygen2]; };
+  redlistr = derive2 { name="redlistr"; version="1.0.0"; sha256="0v2j8fkq8p2g071fkimlhn0ydba1h70rs48p2sy2hsbicj9qsd4z"; depends=[plyr raster rgdal rgeos sp]; };
   redux = derive2 { name="redux"; version="1.0.0"; sha256="0p2hn7pphsfl6lyh1l8a8pp4frgfrfv2fxgkisyam331i7ns3r4h"; depends=[R6]; };
   ref = derive2 { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
   refGenome = derive2 { name="refGenome"; version="1.7.3"; sha256="15p0ra2p1pwhy5ixbhsz1g79c5sc2aap4i4c8kil0m2syg9y45sn"; depends=[DBI doBy RSQLite]; };
   referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; };
-  refimpact = derive2 { name="refimpact"; version="0.1.0"; sha256="03634gmfr423bjygdxcpgmnh9nm2l86rfmvkvq74qymwc2gl6l6p"; depends=[curl jsonlite tibble]; };
+  refimpact = derive2 { name="refimpact"; version="1.0.0"; sha256="0qifqhar2pv81npsxl2pj713vgldyap7y79fq20jpk7qigzf9573"; depends=[checkmate curl httr jsonlite tibble xml2]; };
   refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; };
   refset = derive2 { name="refset"; version="0.1.0"; sha256="0yj87sp6ghxv20hz5knmw3d7way1hsggk759wqxsbfprd38y6khd"; depends=[]; };
   refund = derive2 { name="refund"; version="0.1-16"; sha256="0npq12bf3qmcbgwdxilwvzvf5x2m3qrxljlsx1sz9xczms2dz7kg"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; };
@@ -9041,7 +9298,7 @@ in with self; {
   rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
   relabeLoadings = derive2 { name="relabeLoadings"; version="1.0"; sha256="16gxdrhkaaa33hypnsacn4vd1g3lbqdl3j8p8va54v777c561g81"; depends=[]; };
   relaimpo = derive2 { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[boot corpcor MASS mitools survey]; };
-  relations = derive2 { name="relations"; version="0.6-6"; sha256="1sl22wmnxh957dyw6rwv50ihrf27k7ak66w7avvf9llm0a0d6gsf"; depends=[cluster sets slam]; };
+  relations = derive2 { name="relations"; version="0.6-7"; sha256="1c16sb4v5n44nichwizilqs491rddn8kpf8qrqw54khj5zzg6w52"; depends=[cluster sets slam]; };
   relax = derive2 { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; };
   relaxnet = derive2 { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; };
   relaxo = derive2 { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; };
@@ -9050,7 +9307,7 @@ in with self; {
   relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; };
   reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
   relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; };
-  relsurv = derive2 { name="relsurv"; version="2.0-9"; sha256="1laykfmzv4yfkj406iag0s8cdms662y9fdrxfd29spj47zniy9ym"; depends=[date survival]; };
+  relsurv = derive2 { name="relsurv"; version="2.1"; sha256="093h3f1rpinsxns9995gnkzrhibmrbcwnqvbnjw75sf7wsq8fmk2"; depends=[date survival]; };
   rem = derive2 { name="rem"; version="1.2.8"; sha256="1w0lkxjhyssl9343z6lw7dn0cazz9firglvcf74nls4ngkgv0bbd"; depends=[doParallel foreach Rcpp]; };
   remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; };
   rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; };
@@ -9059,14 +9316,14 @@ in with self; {
   remix = derive2 { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[ascii Hmisc plyr survival]; };
   remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; };
   remoter = derive2 { name="remoter"; version="0.3-2"; sha256="0r7hm5cdbmkfn8lv07mn0lb1qq1g92l0hznjih1ykymjm3h6qyh0"; depends=[assertthat getPass pbdZMQ]; };
-  remotes = derive2 { name="remotes"; version="1.0.0"; sha256="03qwh7wb5zn08r1n5bylnb9615p0qsbx1ca644b528mf0pm7i7yc"; depends=[]; };
+  remotes = derive2 { name="remotes"; version="1.1.0"; sha256="15q2gr4a2gk5zprs9a0bn21fi2ijayk1s5dibrn7zc0g1mwhk2wc"; depends=[]; };
   rentrez = derive2 { name="rentrez"; version="1.1.0"; sha256="0mlxrbds8bjgi91yxxgsn0dxzjwghnhwjzvvg0z4lpdhrc1nrm4d"; depends=[httr jsonlite XML]; };
   repeated = derive2 { name="repeated"; version="1.1.0"; sha256="0cdyzhhv89186q5nwablcjbqvm7ncq2w5d09iidbajrac9wd1y60"; depends=[rmutil]; };
   repfdr = derive2 { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; };
   repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; };
   replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; };
   replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; };
-  replyr = derive2 { name="replyr"; version="0.4.0"; sha256="1mw9mfbbydljg11la7scz8riad9f46jq1imcl1kkc66k3s94wiyv"; depends=[DBI dplyr RSQLite wrapr]; };
+  replyr = derive2 { name="replyr"; version="0.5.2"; sha256="1a1z9xxwcyhyy03xq60xirl9f307l45xwi09h49c2r51l662n12f"; depends=[DBI dplyr RSQLite wrapr]; };
   repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; };
   repo = derive2 { name="repo"; version="2.0.2"; sha256="1rgcgl1a0sz3mnj0ny7507bkrlxbbh7ab39jwfm99ssipia12jjh"; depends=[digest]; };
   repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; };
@@ -9080,7 +9337,9 @@ in with self; {
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
   represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; };
   reprex = derive2 { name="reprex"; version="0.1.1"; sha256="0jxsnlspy12dnbpkghkmkr6p6783dhvsk3g9mj7gpn5j74qfk6li"; depends=[callr clipr knitr rmarkdown whisker]; };
-  reproducer = derive2 { name="reproducer"; version="0.1.8"; sha256="1yw6d81xg8zqc91x737z0mfx10xcfvd0sr0vs8afvhbqnxbjk3jg"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx xtable]; };
+  reproducer = derive2 { name="reproducer"; version="0.1.9"; sha256="092gz58sanpawgg0jk1634x9ki0jw460csbb6cywp0ndghswfgwh"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx xtable]; };
+  reproducible = derive2 { name="reproducible"; version="0.1.3"; sha256="0a5czpvydy5z98yh6dbhwfya5jix630g0zh3yf1xja069fj6bgav"; depends=[archivist data_table devtools digest fastdigest git2r magrittr raster sp]; };
+  reqres = derive2 { name="reqres"; version="0.2.0"; sha256="1sy88adw45fxyvi4ma25zplsvqi71rknjc0qi66p7yfs260l9hgj"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; };
   request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; };
   requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; };
   rerddap = derive2 { name="rerddap"; version="0.4.2"; sha256="0jn5fqjjn4nqn6hyaiadq8xdg7vd23l09h9ax6nq8r5iiizpv249"; depends=[data_table digest dplyr hoardr httr jsonlite ncdf4 tibble xml2]; };
@@ -9088,29 +9347,30 @@ in with self; {
   resampledata = derive2 { name="resampledata"; version="0.2.0"; sha256="1s683jhrpkhcn7cxjx5cipgkrbmhk5jr7hxniwc8ka7cbq3y22wl"; depends=[]; };
   resemble = derive2 { name="resemble"; version="1.2.2"; sha256="189a6b1y720w9ff8cyqazd2d3v1msbfw8zdqr5rmilxvxmnspccs"; depends=[foreach iterators Rcpp RcppArmadillo]; };
   reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; };
-  reshape = derive2 { name="reshape"; version="0.8.6"; sha256="1f1ngalc22knhdm9djv1m6abnjqpv1frdzxfkpakhph2l67bk7fq"; depends=[plyr]; };
+  reshape = derive2 { name="reshape"; version="0.8.7"; sha256="14ir3w4bb3bsz8jsak27nj7kpn227pdgr9653gjq5wc93rywi9ig"; depends=[plyr]; };
   reshape2 = derive2 { name="reshape2"; version="1.4.2"; sha256="0swvjmc9f8cvkrsz463cp6snd8bncbv6q8yrfrb4rgkr0dhq6dvd"; depends=[plyr Rcpp stringr]; };
   reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; };
   respirometry = derive2 { name="respirometry"; version="0.4.0"; sha256="0qrirnzyszmn6g392gkan1w0dn7sm7y69wmsy2v61v7g2slffkl6"; depends=[birk lubridate marelac measurements seacarb]; };
-  restfulr = derive2 { name="restfulr"; version="0.0.11"; sha256="02i99f0xjfpmgnc3ckk4l0smcl0rg68wzvrqrwz2smha6akg0dg6"; depends=[RCurl rjson S4Vectors XML yaml]; };
+  restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; depends=[RCurl rjson S4Vectors XML yaml]; };
   restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; };
   restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; };
   restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; };
   restriktor = derive2 { name="restriktor"; version="0.1-55"; sha256="1yrzx7w14s04ppc16iw2hialx1k6k45ag9702vm8cnf31hm14kxp"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; };
   resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; };
   rethinker = derive2 { name="rethinker"; version="1.0.0"; sha256="0a28r0rkg4m6jsrvczkkpdqrca3q5l5pgb4wyz6pvy5scjlvmpls"; depends=[rjson]; };
-  reticulate = derive2 { name="reticulate"; version="0.9"; sha256="0cpcrhw6gchlbydd45pklcjrfwxfdj4mgzp2analsimc8ma1z026"; depends=[Rcpp]; };
+  reticulate = derive2 { name="reticulate"; version="1.0"; sha256="0ych5f6kp9gq9lgwhi4ga3n4abqgqbbxfbw3ib6wsq0dgvz9d2p9"; depends=[jsonlite Rcpp]; };
   retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
-  retistruct = derive2 { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; };
+  retistruct = derive2 { name="retistruct"; version="0.5.12"; sha256="11m4i29i3zqh9chyjgdhzqj4yqlslfm8y4q0x14xxc2r9lqbkj9l"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; };
   reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; };
   reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; };
-  revdbayes = derive2 { name="revdbayes"; version="1.1.0"; sha256="08rz1w98vm0rckxcg4f9hvpqhzyyk71grvklwl8qbqmm7319bjxz"; depends=[bayesplot rust]; };
+  revdbayes = derive2 { name="revdbayes"; version="1.2.1"; sha256="0dq4knlmf1pcag09pqvcrp18sypm0zs64r3nrxn00i3mlhv90gr7"; depends=[bayesplot Rcpp RcppArmadillo rust]; };
   revealedPrefs = derive2 { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp RcppArmadillo]; };
   revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; };
+  revengc = derive2 { name="revengc"; version="1.0.0"; sha256="0ccbw61xqjf9y15ghhzx57q3l48xpw9pq2nb11nrqapp5w3f9vzy"; depends=[stringr]; };
   revgeo = derive2 { name="revgeo"; version="0.11"; sha256="1ybphg00ja2xysh8f1s8cz855689b7vybsic07fj7q8wzrbqda3f"; depends=[RCurl RJSONIO]; };
   reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
   rex = derive2 { name="rex"; version="1.1.1"; sha256="0cs13hqv2wb549rhq84psky401pz8r41ia7c0pnyvhxfa2l6zrr8"; depends=[lazyeval magrittr]; };
-  rexpokit = derive2 { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[Rcpp SparseM]; };
+  rexpokit = derive2 { name="rexpokit"; version="0.26.1"; sha256="12zg56gv9miqlhyi4c61nk2fpgz40xi1kd2wzgs4sjwxn5g8cgvk"; depends=[Rcpp]; };
   rfPermute = derive2 { name="rfPermute"; version="2.1.5"; sha256="0c7yi395j640mvnr1qlm9hy1w6vva33fa2lqb3amzkafy4j1cs63"; depends=[abind ggplot2 gridExtra randomForest reshape2 swfscMisc]; };
   rfUtilities = derive2 { name="rfUtilities"; version="2.1-0"; sha256="0zjk7rb9k0fpamdll57zxrihvxykn1821v7xkwgfhkwl9rxi8s0f"; depends=[randomForest]; };
   rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; };
@@ -9125,10 +9385,10 @@ in with self; {
   rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; };
   rgbif = derive2 { name="rgbif"; version="0.9.8"; sha256="17pixyx2wicxdwqz7mziharanqdv865hmb9lz2kfqy1gzpv29jp2"; depends=[crul data_table geoaxe ggplot2 jsonlite magrittr oai tibble whisker wicket xml2]; };
   rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-  rgdal = derive2 { name="rgdal"; version="1.2-7"; sha256="0lxr8ydzkgfjp2kkfzki958grs5kwxlxinby7ki8b2hcri0fbr7l"; depends=[sp]; };
+  rgdal = derive2 { name="rgdal"; version="1.2-8"; sha256="09dawi9a4b97vi0flga7b2iy3xgpm03qxjy9j0c0j47b1vkwfz5q"; depends=[sp]; };
   rgenoud = derive2 { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; };
   rgeoapi = derive2 { name="rgeoapi"; version="1.1.0"; sha256="0k8p1l0vrgx0bifbc2i9gxxwih513vbqhjh7fiifyfq3r74i4j7k"; depends=[httr magrittr rjson]; };
-  rgeolocate = derive2 { name="rgeolocate"; version="1.0.0"; sha256="0mac4rzgw4lp47rp9nxs7dgw0dzdxnb144an2zj8fcsnvm462vjg"; depends=[httr Rcpp]; };
+  rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; };
   rgeos = derive2 { name="rgeos"; version="0.3-23"; sha256="0p04szj4bcsycj6lgnq65dgsc3w807hdqp5zrd5zxgclhqryq9nm"; depends=[sp]; };
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
   rggobi = derive2 { name="rggobi"; version="2.1.21"; sha256="0zi4rhggngm0y8dsjxqlr2mmfc5wzi7l1qcp5gin4bjlbyf8yb3z"; depends=[RGtk2]; };
@@ -9155,18 +9415,18 @@ in with self; {
   rinat = derive2 { name="rinat"; version="0.1.5"; sha256="14ql90f8wrxz9nlykbzfpar1yfwh7p71vks7vhhn8ys09wvj30zk"; depends=[ggplot2 httr jsonlite maps plyr]; };
   rindex = derive2 { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
   ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; };
-  rintrojs = derive2 { name="rintrojs"; version="0.1.2"; sha256="16i6s0km8l22rx2n9kn90z76himfckj387az47snhzbgnwlby3yc"; depends=[jsonlite shiny]; };
+  rintrojs = derive2 { name="rintrojs"; version="0.2.0"; sha256="0qdry88f6ci5g6k0i8mycm9k5ibnmb9zjppjvqqaflw3g3nsnli2"; depends=[jsonlite shiny]; };
   rio = derive2 { name="rio"; version="0.5.5"; sha256="1wh2lq2zvfhilhy70g9n5lih0yjdgl7vzb7a3bl34vk67w0xzmf3"; depends=[curl data_table foreign haven openxlsx readxl tibble]; };
   rioja = derive2 { name="rioja"; version="0.9-15"; sha256="1yd0vcis1wsjk2cqkkd07xs0vmkxjw2yz4nnv08gf2cy5hvfsqas"; depends=[mgcv vegan]; };
   ripa = derive2 { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; };
   riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; };
-  riskRegression = derive2 { name="riskRegression"; version="1.3.7"; sha256="0zk0k0xx7d72bsrava7n7wadpkx8aaawg44fignmsh8mpzhwwhav"; depends=[cmprsk data_table doParallel foreach ggplot2 lava prodlim Rcpp RcppArmadillo rms survival]; };
+  riskRegression = derive2 { name="riskRegression"; version="1.4.3"; sha256="1r9habv47wwhnbvcjl6yin4i415ayhisg67rzggv899nqcyqpm80"; depends=[abind cmprsk data_table doParallel foreach ggplot2 lava prodlim Rcpp RcppArmadillo rms survival]; };
   riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
   risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; };
   rite = derive2 { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[knitr markdown RCurl tcltk2]; };
   ritis = derive2 { name="ritis"; version="0.5.4"; sha256="04vjbjqp5b9apafns2snh04hplgcfydzn52v63jgllyrn101vrjk"; depends=[data_table httr jsonlite solrium tibble]; };
   riv = derive2 { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS quantreg rrcov]; };
-  riverdist = derive2 { name="riverdist"; version="0.14.0"; sha256="1j9yi27zwkgx329rj7bl6284390ajwmpj6fdsh7vz5pac4q4kcds"; depends=[rgdal sp]; };
+  riverdist = derive2 { name="riverdist"; version="0.15.0"; sha256="145mvqnhv12dcvss54wdycgb3wwk95phl4kx5z0jnh3kmm1zsdl4"; depends=[rgdal sp]; };
   rivernet = derive2 { name="rivernet"; version="1.1"; sha256="1brdgm2fbdq4qw85va6isj7p9bva4sj3spgsx8nsqvc8vaa90y4p"; depends=[]; };
   riverplot = derive2 { name="riverplot"; version="0.6"; sha256="0q1icpny8nkxyjhawyjzwrw8qlz0ayn2xyrsqrm4vkxyv6c9xk8z"; depends=[]; };
   rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; };
@@ -9174,7 +9434,7 @@ in with self; {
   rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
   rjags = derive2 { name="rjags"; version="4-6"; sha256="1bc9bzq31liawg3nzwfczf75vgg56fnqjw0997xvlic4ghgbn96g"; depends=[coda]; };
   rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
-  rjmcmc = derive2 { name="rjmcmc"; version="0.2.2"; sha256="0c72nxhx57sarrpphlynrbwf2kp8cwd6bb7v39frqb1wi43ah63s"; depends=[coda madness R2jags]; };
+  rjmcmc = derive2 { name="rjmcmc"; version="0.3.2"; sha256="1s3bm6ahazqlzw3z7p3f873nga930qb72sn34sqz39py62fdwq6n"; depends=[coda madness mvtnorm]; };
   rjson = derive2 { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
   rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; };
   rjstat = derive2 { name="rjstat"; version="0.3.0"; sha256="0r772p0a0x6g96k6r26vb6vjxa68mzjslwg71r0wysa9kqhvypm4"; depends=[checkmate jsonlite]; };
@@ -9183,7 +9443,7 @@ in with self; {
   rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; };
   rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; };
   rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
-  rlang = derive2 { name="rlang"; version="0.1.1"; sha256="0grwqy3zkvz96mvpwfbfyqid4jkfrqh3ldy2n6dpv2kjd1fzj0ar"; depends=[]; };
+  rlang = derive2 { name="rlang"; version="0.1.2"; sha256="1yc5qyq6h0nrya7m2fqnfv19zh5xwsl28jx6zi2g1zz6ra4cvkwh"; depends=[]; };
   rlas = derive2 { name="rlas"; version="1.1.4"; sha256="0cf5ixz7hpjwfny23yf622z7d1l282las5q8jh675v5ai67ayyb0"; depends=[data_table Rcpp]; };
   rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; };
   rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; };
@@ -9193,12 +9453,14 @@ in with self; {
   rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; };
   rly = derive2 { name="rly"; version="1.4.2"; sha256="0mppl3y808k9ydn1lwng2bqmdzbbsla2p9p8qk73mp0xyq8iq9sm"; depends=[futile_logger R6]; };
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
-  rmapshaper = derive2 { name="rmapshaper"; version="0.2.0"; sha256="0s5av8hic3b61ch6skvcxkpn9s2r0ylfxilxg8i2dvg4dk13qkna"; depends=[geojsonio geojsonlint readr rgdal sp V8]; };
+  rmapshaper = derive2 { name="rmapshaper"; version="0.3.0"; sha256="0v7p8wqgjymidavyq9lfl6kzlpn5ybfc9lqhsaxbxcc9hb80xjxz"; depends=[geojsonio geojsonlint rgdal sp V8]; };
+  rmapzen = derive2 { name="rmapzen"; version="0.3.3"; sha256="0rz3wwy8dbb2620gy07aib2aad6ds001vf47bxrj3vzrxp5h448i"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
   rmarkdown = derive2 { name="rmarkdown"; version="1.6"; sha256="0p8ph5z5pifk1nxc1bppkfs1ir5gjc6ap9n64b4255m2fdaqfrc7"; depends=[base64enc caTools evaluate htmltools jsonlite knitr rprojroot stringr yaml]; };
-  rmatio = derive2 { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; };
-  rmcfs = derive2 { name="rmcfs"; version="1.2.5"; sha256="1g0gv1h0fqfpi57xkwy8ah97hwzl9bqqjmgyj9kq8p5hyl18d44g"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
-  rmcorr = derive2 { name="rmcorr"; version="0.1.0"; sha256="0hrlamr527r02vj86xsip5n7gilrb8y33fy0xi1lkc66hf714vgw"; depends=[mnormt psych pwr RColorBrewer]; };
+  rmatio = derive2 { name="rmatio"; version="0.12.0"; sha256="1cw7j44rgjgbw2xln7lh29ln53lwfadr8rx0sffkjwc7lbh1r6wa"; depends=[Matrix]; };
+  rmcfs = derive2 { name="rmcfs"; version="1.2.6"; sha256="0q8h0h86swm4fz4lv30sm84078dqdzm9mdhg7d2s8sg7w4ad0m16"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
+  rmcorr = derive2 { name="rmcorr"; version="0.2.0"; sha256="0s356ly6d46fv28q176ahz2y0w8igmgcy2li0mi4wkj5gnc0yxx4"; depends=[psych RColorBrewer]; };
   rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; };
+  rmda = derive2 { name="rmda"; version="1.4"; sha256="0agh4mrs8mjjb7hc41r59mbnq0h873fmykljla1cbf4ikhxwjihf"; depends=[caret MASS pander reshape]; };
   rmdformats = derive2 { name="rmdformats"; version="0.3.3"; sha256="06nyrdhy26mvgfb1bnlbd8hslybpc01a30a40wwlc3ay7yp0nzrj"; depends=[bookdown htmltools knitr questionr rmarkdown]; };
   rmdshower = derive2 { name="rmdshower"; version="2.0.0"; sha256="0prxq0zakcm5lh1ki15d1d267yxr43295zcxigpy011lawccaglm"; depends=[rmarkdown]; };
   rmeta = derive2 { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
@@ -9206,12 +9468,13 @@ in with self; {
   rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
   rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
   rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
+  rmonad = derive2 { name="rmonad"; version="0.2.0"; sha256="1r15i7z8y3j9bh2lgigxc7m97qwbcwxmdywpbq4k0xmfaikqzf1y"; depends=[DiagrammeR magrittr pryr R6]; };
   rmp = derive2 { name="rmp"; version="2.0"; sha256="1cs5ylh5z9mfj3r0yvxxd38ksna2dxk9nnfgqkry1kxibnd1b4ff"; depends=[]; };
   rmpw = derive2 { name="rmpw"; version="0.0.1"; sha256="0h5h77hh6v6nfhivmrs5dyks9krwqyh32kmp0mlwialrpshs0hp3"; depends=[]; };
   rms = derive2 { name="rms"; version="5.1-1"; sha256="1qxzs640yq61629d0fb9ydbx222fbd7q922jrw5v8d64yn6r92f4"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
   rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
   rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; };
-  rmumps = derive2 { name="rmumps"; version="5.1.1-1"; sha256="150z7g0fw5yi0lpr3w7isqjhpwjxi0w5cywhkk45gywjwkicrvgw"; depends=[Rcpp]; };
+  rmumps = derive2 { name="rmumps"; version="5.1.1-2"; sha256="17yngpzzka93ryma8sdbdpnzji8501l90vvajqxfn9dyrwyq0hpy"; depends=[Rcpp]; };
   rmutil = derive2 { name="rmutil"; version="1.1.0"; sha256="0f30afqbzrsgbnfpniwhbw4b8hlzc5zyaixvn9giggzwczfnf29k"; depends=[]; };
   rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
   rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; };
@@ -9227,15 +9490,15 @@ in with self; {
   rnoaa = derive2 { name="rnoaa"; version="0.7.0"; sha256="0mha1izbzfa6vq44wjsc4p018k83zw99f6bpkhc275c5v09pxvmr"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr httr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; };
   rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; };
   rnrfa = derive2 { name="rnrfa"; version="1.3.0"; sha256="1zrj7y0qh57r7r9c5pspz238w0j1kaicd2l6vcg92lgxi8b9i558"; depends=[ggmap ggplot2 httr plyr rjson sp stringr xml2 xts]; };
-  roadoi = derive2 { name="roadoi"; version="0.2"; sha256="0rkr38jrikjdyg3w0lf6szxdm9k11i6gh4l55wnb1l4cg2sfsqqw"; depends=[dplyr httr jsonlite miniUI plyr shiny]; };
+  roadoi = derive2 { name="roadoi"; version="0.3"; sha256="0cdqir1kwifrgiv1ki5hsp72ds6lii0yl720a6p4763zq54rqbqr"; depends=[dplyr httr jsonlite miniUI plyr shiny]; };
   roahd = derive2 { name="roahd"; version="1.3"; sha256="1pn2xzc5fnp2hb3fw3gpqng0x9rvpd4qfhx9gclf31algpzaidbb"; depends=[robustbase scales]; };
-  robCompositions = derive2 { name="robCompositions"; version="2.0.3"; sha256="0zm1qkrncp4k87mcbn72arr68xpif2y7f9m8smrcma4x52npfpfi"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM]; };
+  robCompositions = derive2 { name="robCompositions"; version="2.0.6"; sha256="1r74w6ssq9fhjain02hr9sz0x2j1fi1waw7319gls69kp73b51hw"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM]; };
   robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
   robeth = derive2 { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
-  robets = derive2 { name="robets"; version="1.1"; sha256="1wpgjw31il231am8bka6636rnlsk6kjly4v8755x191lywip6ck2"; depends=[forecast Rcpp]; };
+  robets = derive2 { name="robets"; version="1.2"; sha256="0nsp3wwwpnyv94ga3rqndddh374hz70gi1fsvp8gc050sxhmmml0"; depends=[forecast Rcpp]; };
   robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; };
   robmed = derive2 { name="robmed"; version="0.1.1"; sha256="1716vzci0lmim4n28bc2pjky1shjxqrclgllj3hc4dzf8j22dxbz"; depends=[boot ggplot2]; };
-  robotstxt = derive2 { name="robotstxt"; version="0.3.2"; sha256="01nff1m1hs30rzm6y92pi97cp33k2k8a1k11kqms54wkpkglyr55"; depends=[httr stringr]; };
+  robotstxt = derive2 { name="robotstxt"; version="0.4.0"; sha256="11swx64aavim9q47b9qv4h9kpshq80wcb2ib74dmkjckmd8yxyjy"; depends=[httr stringr]; };
   robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; };
   robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; };
   robust = derive2 { name="robust"; version="0.4-18"; sha256="1b7qh1aff500nd6dh4y2ipmjgdiq8991shflb63pc39vpc0ny6g4"; depends=[fit_models lattice MASS robustbase rrcov]; };
@@ -9251,7 +9514,7 @@ in with self; {
   robustlmm = derive2 { name="robustlmm"; version="2.1-3"; sha256="0a5gk8n8aap14s1d6cmsla5x07cqgy6i266zd0922l93k40b60rk"; depends=[ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; };
   robustloggamma = derive2 { name="robustloggamma"; version="1.0-2"; sha256="1cifyasrik010zs8jsz0kzzmwm3qmc0y7h2dahg2ibpwxfcqfcpq"; depends=[numDeriv RobustAFT robustbase survival]; };
   robustrank = derive2 { name="robustrank"; version="2016.11-9"; sha256="11x9smfkbq4f0p2n3gxhwzs2xsd019pilxrds601yshz754ccj98"; depends=[]; };
-  robustrao = derive2 { name="robustrao"; version="1.0-1"; sha256="03bigs7sc7d6ah1dp3mrkklhwih80wbr841klilwkfkajp7q97h9"; depends=[doParallel foreach gmp igraph iterpc quadprog]; };
+  robustrao = derive2 { name="robustrao"; version="1.0-3"; sha256="0gcxxizsg380blrv55vl9f3az8gnr274c6idi0pimhh5c26h7ma6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; };
   robustreg = derive2 { name="robustreg"; version="0.1-10"; sha256="1zwfgmla6wna48vq5hbz7c7fvmb29y949790w2j6x8pkjzr781sz"; depends=[Matrix Rcpp RcppArmadillo]; };
   robustsae = derive2 { name="robustsae"; version="0.1.0"; sha256="0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl"; depends=[coda lattice MCMCpack mvtnorm pscl]; };
   robustvarComp = derive2 { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; };
@@ -9259,10 +9522,10 @@ in with self; {
   rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
   roccv = derive2 { name="roccv"; version="1.0"; sha256="13pycz05x0d1azc28yc7569awikd9lidzhhsgljqgsxvazr8fg0i"; depends=[glmnet pROC]; };
   rockchalk = derive2 { name="rockchalk"; version="1.8.101"; sha256="1aa0m3whvb190cyfl4177pfd2l1i1a0dz9rn2fxkvls393cssfmb"; depends=[car lme4 MASS]; };
-  rococo = derive2 { name="rococo"; version="1.1.4"; sha256="08s21hhhzdaxbls2akd7sjyfl2nqpvpygpbj563584b399zfgxg2"; depends=[Rcpp]; };
+  rococo = derive2 { name="rococo"; version="1.1.5"; sha256="062pj62haf0xw74p6c1dd20ipcxka8nn0mxsq490d22kqwm4vf5a"; depends=[Rcpp]; };
   rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; };
   rodeo = derive2 { name="rodeo"; version="0.7.1"; sha256="0q76dnwc5bixbl2wh6km7085rivfzjpzl6c3w48wq5b23k1v7pfr"; depends=[deSolve R6]; };
-  rodham = derive2 { name="rodham"; version="0.0.3"; sha256="1rc3k2qsa1rb11fk0va635czslqk1nxpcykrqc5p225makisaxv1"; depends=[jsonlite plyr splitstackshape]; };
+  rodham = derive2 { name="rodham"; version="0.1.1"; sha256="15mrlx7azvwkwjgfplvs5fhk2nwlg9pay2l99q327p8hx87jr8ra"; depends=[jsonlite plyr splitstackshape stringr tibble]; };
   roll = derive2 { name="roll"; version="1.0.7"; sha256="059n1pl7692grzv4pmnj8s6cs2zi98lr1s5zi9pxg5vpw7r6h2v9"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   rollbar = derive2 { name="rollbar"; version="0.1.0"; sha256="1q2ym0vkgbdnibxmwx0bp9c20g3bm8fzwwgs3j4bxg1ydg3gnkj4"; depends=[httr]; };
   rollply = derive2 { name="rollply"; version="0.5.0"; sha256="01rh4x9352ixdhrqdysapqx5ynksknyf8n230b340pxwaz2d7xhc"; depends=[plyr Rcpp stringr]; };
@@ -9270,8 +9533,9 @@ in with self; {
   rolypoly = derive2 { name="rolypoly"; version="0.1.0"; sha256="11nf7in6n03675l11ynl4rp20rlzy7jli3m518s4sqqxdm8f8ci7"; depends=[data_table dplyr foreach ggplot2 glmnet MASS Matrix matrixcalc]; };
   rootSolve = derive2 { name="rootSolve"; version="1.7"; sha256="08ic6ggcc5dw4nv9xsqkm3vnvswmxyhnqnv1rdjv1h2gy1ivpcq8"; depends=[]; };
   rootWishart = derive2 { name="rootWishart"; version="0.4.0"; sha256="028k1h6vibbcnmh35kg0z388c991k8v78ac0fbrv1k2ajqrrl4lg"; depends=[BH Rcpp RcppEigen]; };
+  roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; };
   rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; };
-  ropenaq = derive2 { name="ropenaq"; version="0.2.1"; sha256="1kyqm0zwaxx0wzd16szcfg2c2kw318i9gr8la30slw65qhxr18f9"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; };
+  ropenaq = derive2 { name="ropenaq"; version="0.2.2"; sha256="0ppmh8dnszrw3nmldirhb5srx22wnslsdacm11hcn7rdda4fi3cf"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; };
   ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; };
   ropercenter = derive2 { name="ropercenter"; version="0.1.0"; sha256="0rp2dwdkl3qlwm8di0q184ppr77zs6i7njyr305pnxmbad119w9d"; depends=[dplyr foreign haven httr rvest stringr xml2]; };
   rorcid = derive2 { name="rorcid"; version="0.3.0"; sha256="1c4di3cgx9b86v5fnsahf7gd1shb6klrg4mfyhf4irndn7b1r562"; depends=[httr jsonlite tibble]; };
@@ -9283,6 +9547,7 @@ in with self; {
   rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
   rotl = derive2 { name="rotl"; version="3.0.3"; sha256="0pfpgynvdi011m6j6gs98irldpjrdc8rgza36ndk60q2w5z436h4"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
   roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; };
+  routr = derive2 { name="routr"; version="0.2.0"; sha256="0h14s90id2qfxv153wml4q3v1ban327rdvg9gpqmbmzq2bi3vwgr"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; };
   rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; };
   roxygen2 = derive2 { name="roxygen2"; version="6.0.1"; sha256="0xpzziminf225kjwhyl51kgkzhplyzhk5farhf5s822krl2xqbfj"; depends=[brew commonmark desc digest R6 Rcpp stringi stringr xml2]; };
   royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
@@ -9298,7 +9563,7 @@ in with self; {
   rpdo = derive2 { name="rpdo"; version="0.2.2"; sha256="1yzvi4givrwpbs56p2vf0gciaigq50qq0r0n5lyaqk73azzhnhxc"; depends=[curl datacheckr dplyr lubridate magrittr readr stringr tidyr]; };
   rpf = derive2 { name="rpf"; version="0.53"; sha256="16d28i8s7f6ag1jvxw1ns8pi3s1rbxp9z9l13bxsm6cd6kq5jgrq"; depends=[mvtnorm RcppEigen]; };
   rpg = derive2 { name="rpg"; version="1.5"; sha256="0hjfzikaryr55xjfw7zjdby4ja59rxq9ikycgbpapvpy2q9py5yp"; depends=[getPass RApiSerialize Rcpp uuid]; };
-  rpgm = derive2 { name="rpgm"; version="1.0.0"; sha256="03zc87jncbdzmjrl5mfc6wk1q9mkbrs75dnxy4sgim0mryvv53ap"; depends=[]; };
+  rpgm = derive2 { name="rpgm"; version="1.0.1"; sha256="15qg4hd2bs7wc2snm3m0vl1mv34ppf4w61da42ix7jc1ya9n3990"; depends=[]; };
   rphast = derive2 { name="rphast"; version="1.6.5"; sha256="1jff94hx7skvd6icbrcyabsvz80sgqqv28vz91mcz5jh6v6afhl3"; depends=[]; };
   rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; };
   rpivotTable = derive2 { name="rpivotTable"; version="0.2.0"; sha256="0h7za8bmyg7b150l7a2jz6czxdh4gi0q0gv6ddpdlgk86slw9nmh"; depends=[htmlwidgets]; };
@@ -9308,7 +9573,7 @@ in with self; {
   rpn = derive2 { name="rpn"; version="1.0"; sha256="0wk8y4yk6wqzbq5bqv6zncfp9az5vn8xgwh426pk3bxm3v4xi16i"; depends=[BBmisc checkmate]; };
   rpnf = derive2 { name="rpnf"; version="1.0.5"; sha256="07byg0ym4d2cr6fp74z379jhsaw4c0xrwf622dvhwa4frn4anl60"; depends=[]; };
   rportfolios = derive2 { name="rportfolios"; version="1.0-1"; sha256="00xxh85jpl0rw8fv84i7zmq0psc92pq7hharnr4szbmhgz8kbc35"; depends=[truncdist]; };
-  rpostgis = derive2 { name="rpostgis"; version="1.2.1"; sha256="11sfx9sjb6naqlyjn10myz9zjplh05gjjkapjq8nsdj4d49cf8rn"; depends=[DBI raster rgeos RPostgreSQL sp]; };
+  rpostgis = derive2 { name="rpostgis"; version="1.3.0"; sha256="09q54si187wv2bh2akrdan3d1klx9jczi6bllpl5iwjp1wasxiys"; depends=[DBI raster rgeos RPostgreSQL sp]; };
   rpostgisLT = derive2 { name="rpostgisLT"; version="0.5.0"; sha256="0dvzprhwdqm763b0n82vzj4blns9chlcpp7wkrsm1w67zakn02mk"; depends=[adehabitatLT DBI rpostgis RPostgreSQL sp testthat]; };
   rpql = derive2 { name="rpql"; version="0.5"; sha256="1d5mr04jk08l617zkqn13njglwj0w9an1rix937bcxw69blshahi"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm]; };
   rprev = derive2 { name="rprev"; version="0.2.3"; sha256="14p79f0mkvgwk8bwjnr7gvkvs8c632z7hddcyyrwldpilwyjnsgc"; depends=[doParallel dplyr foreach ggplot2 lazyeval magrittr rms survival tidyr]; };
@@ -9328,7 +9593,7 @@ in with self; {
   rrcov3way = derive2 { name="rrcov3way"; version="0.1-10"; sha256="0ybl759mfva185z2mjs5s8cjim9h8dk4gkqnva2rj9kxp7i45srd"; depends=[robustbase rrcov ThreeWay]; };
   rrcovHD = derive2 { name="rrcovHD"; version="0.2-5"; sha256="1wv50lcjf0fsxb1zagxbrcx68ilfmnmkc8ccpy9hw3qql5p368ij"; depends=[pcaPP pls robustbase robustHD rrcov spls]; };
   rrcovNA = derive2 { name="rrcovNA"; version="0.4-9"; sha256="1qc9xqm5x55dqjx1y7s4a2nwc07v32rygicbb8469knxasf92cs3"; depends=[cluster lattice norm robustbase rrcov]; };
-  rrecsys = derive2 { name="rrecsys"; version="0.9.5.4"; sha256="0g3mz5k1ya72qc32wwh8hy809yzxigz8rkcp9rnxdr71fk604a04"; depends=[knitr MASS proxy registry]; };
+  rrecsys = derive2 { name="rrecsys"; version="0.9.7.1"; sha256="03qdpy6n1f4bqnpladzp0qc3ky7ccdjr176m6pla7x205pll03w7"; depends=[ggplot2 knitr MASS Rcpp registry]; };
   rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; };
   rredlist = derive2 { name="rredlist"; version="0.3.0"; sha256="1w59rqwgx3hr9icw8pzwc95117vrqkj3mq197kp0qy8xbkf83h8v"; depends=[crul jsonlite]; };
   rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; };
@@ -9337,15 +9602,17 @@ in with self; {
   rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; };
   rrpack = derive2 { name="rrpack"; version="0.1-5"; sha256="0iil5bzx774fjimlzqwpf8d4jybkifg9g3hxghpvb06rrmjryfdg"; depends=[ggplot2 glmnet lassoshooting MASS Rcpp RcppArmadillo]; };
   rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; };
+  rsMove = derive2 { name="rsMove"; version="0.2.1"; sha256="1vi4gb30sibmyvng56r0m4fl256ql5838nnarc9mjfm8hiq67rdy"; depends=[caret gdalUtils ggplot2 httr ncdf4 raster RCurl rgdal sp XML]; };
   rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
+  rsample = derive2 { name="rsample"; version="0.0.1"; sha256="1l2b6wy9pgq84c40wpj5rnbx25cdp226fw6lmx93wri29a613652"; depends=[broom dplyr purrr rlang tibble tidyr]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-  rscala = derive2 { name="rscala"; version="2.2.2"; sha256="00l57nh8gmpfz34n1fr7qn40a9brlsnharj18zy7xpvnwk4dxyyx"; depends=[]; };
+  rscala = derive2 { name="rscala"; version="2.3.1"; sha256="01hhw6gsl95r0cm1zfgm7s64diqik14wzvc99sw1xkykmq8shjc9"; depends=[]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
-  rsconnect = derive2 { name="rsconnect"; version="0.8"; sha256="1ac9sgqcafy22fyx09vkf7kga276lndhz28kd9wiii67yp2ns7zy"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; };
+  rsconnect = derive2 { name="rsconnect"; version="0.8.5"; sha256="0y2sajcw1yngig06l7bxzcw993jbx13fl47fag9fa4f70qpnnwmq"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; };
   rscopus = derive2 { name="rscopus"; version="0.4.6"; sha256="0s8ahdp884yy2hpa5kq9d4kcnr0hx662wp7h0qi399pc0y1rydwm"; depends=[httr plyr]; };
   rscorecard = derive2 { name="rscorecard"; version="0.3.5"; sha256="1fhcp8xdhgjgpbfwc6bygq0z1z49w9c3bh12s8rml30597b8gc26"; depends=[dplyr jsonlite lazyeval magrittr]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
-  rsdmx = derive2 { name="rsdmx"; version="0.5-8"; sha256="0f0hc2v9g7gxqcfhx3m7fawsvlba3jx666f675263d8vhdc9f311"; depends=[plyr RCurl XML]; };
+  rsdmx = derive2 { name="rsdmx"; version="0.5-9"; sha256="0wgwd7087xb811fmi9n16f33v1gf2b50mwx2zk1298fv57rx5bil"; depends=[plyr RCurl XML]; };
   rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
   rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
   rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
@@ -9356,16 +9623,16 @@ in with self; {
   rsm = derive2 { name="rsm"; version="2.8"; sha256="1hnlaj5jwqxki07b1kzl716qkmqwap57cch2lwsb6gqqsjir8xfx"; depends=[estimability lsmeans]; };
   rsml = derive2 { name="rsml"; version="1.3"; sha256="0a1y41jq0yzr19mb2scwhlp9gx5vngm4q12yxp1fcwk2cqhnsda6"; depends=[rgl XML]; };
   rsnps = derive2 { name="rsnps"; version="0.2.0"; sha256="10g1b2i2mp0b4p78iiy83sz2jwz73xfjkhc6ih4ag2wmbdmwf9pb"; depends=[httr jsonlite plyr stringr XML]; };
-  rsoi = derive2 { name="rsoi"; version="0.2.3"; sha256="0644pycb31qgk9fa44zw0x8c4k3f59gwbiwa30hxbpb9aa50d0g9"; depends=[lubridate tibble]; };
-  rsolr = derive2 { name="rsolr"; version="0.0.4"; sha256="1kgjsqsa847fhdr17q3y6f4aa3rpdsjzi01q07hbq2xmia2m4yjq"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; };
+  rsoi = derive2 { name="rsoi"; version="0.3.0"; sha256="0syl90akbbg50pyhsa4nyq2r4psi2n6qg48a4nxprgz412n8rjbv"; depends=[dplyr lubridate readr]; };
+  rsolr = derive2 { name="rsolr"; version="0.0.8"; sha256="1swhg7hnkdphnw0d9jrzn18nk2v5a6ny7n652fh8d0k88a27xx4d"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; };
   rspa = derive2 { name="rspa"; version="0.2.1"; sha256="0m3h25jxfccdqy4gf3cls4wcdpw580yfmb3lvw4ndfva8lj2q6sy"; depends=[lintools validate]; };
-  rsparkling = derive2 { name="rsparkling"; version="0.2.0"; sha256="1d3p4zcff41m7qjx4j8bs0dvaal5j20sm4y8fipfnjizbdk72vb7"; depends=[h2o sparklyr]; };
+  rsparkling = derive2 { name="rsparkling"; version="0.2.1"; sha256="1kc34li3an6nzyf81w02p0dk8jys50mvl8cdz25vjr01d2dh5vf6"; depends=[h2o sparklyr]; };
   rsq = derive2 { name="rsq"; version="1.0"; sha256="151f7pngx54wpawb5hchacj0rbymdzyki16fkj9291cfz1cqbcx9"; depends=[MASS]; };
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
-  rstan = derive2 { name="rstan"; version="2.15.1"; sha256="1svixidzqcdwpg6j1cfvy2xql99vw3fpvf78n4zp2r6kpynnhgrg"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; };
+  rstan = derive2 { name="rstan"; version="2.16.2"; sha256="0irqh4ggk23s3c0ipihwv8m0qmkxh5j7vdxgnsarhqca6254r2vb"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; };
   rstanarm = derive2 { name="rstanarm"; version="2.15.3"; sha256="00x4ayqp31sypzhbdg6pv627w1p134qlgn7jvgxszihc7dcfb7fg"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders]; };
-  rstantools = derive2 { name="rstantools"; version="1.2.0"; sha256="1b0x0diik2zm6kfdbv3gg48mha3x7lq88f3rjmsy4ql26yvr155w"; depends=[]; };
+  rstantools = derive2 { name="rstantools"; version="1.3.0"; sha256="080mn4yh7fhd5qww1zr6l14gfsk5d6fakm8x2lmsqkn42j2i6cw9"; depends=[]; };
   rstatscn = derive2 { name="rstatscn"; version="1.1.1"; sha256="0aj4x3lyrldpgh90v90qbxylndacn5ri5yqff3qy53q45ar7yji3"; depends=[httr jsonlite]; };
   rstiefel = derive2 { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
   rstpm2 = derive2 { name="rstpm2"; version="1.3.4"; sha256="0vm5w597lz3zzklm21avxm88lqgrn9k2hlfh4yvmqk4vmwp4qkcc"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; };
@@ -9387,19 +9654,20 @@ in with self; {
   rticles = derive2 { name="rticles"; version="0.4.1"; sha256="1f2a60jmlsiga377ihhy8sm9amqn7fd91sd4vx682b97hfh3zn39"; depends=[knitr rmarkdown yaml]; };
   rtide = derive2 { name="rtide"; version="0.0.4"; sha256="0i3mf3818s62mmn315brv2axpwiiz646k5hv8z26z7s4ahxavrc0"; depends=[abind datacheckr lubridate magrittr plyr stringr tibble tidyr]; };
   rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
-  rtimes = derive2 { name="rtimes"; version="0.4.0"; sha256="0pi24kniig6h201wzjvdn7wfx2nh1i2fmp73wq6sip6kpv74a2xg"; depends=[data_table dplyr httr jsonlite tibble]; };
+  rtimes = derive2 { name="rtimes"; version="0.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; };
+  rtimicropem = derive2 { name="rtimicropem"; version="1.3"; sha256="1z7nrmzwdgz7fy2i23rl07jd39sdxqsdmmmkaaxzagj7whd58inj"; depends=[changepoint dplyr ggplot2 knitr lazyeval lubridate pathological R6 rbokeh readr stringr tibble tidyr]; };
   rtip = derive2 { name="rtip"; version="1.0.0"; sha256="1xkw0m4fnwbsqqyhvxhsia3hlpjb2qhs6y0c4g7f7qa7f0ibcbja"; depends=[boot ggplot2 mvtnorm plyr]; };
-  rtk = derive2 { name="rtk"; version="0.2.5.1"; sha256="17wqlplpqc9df5lg48xvqiny9wvn2h0drl8rj02iv50m14vrvpk1"; depends=[Rcpp]; };
+  rtk = derive2 { name="rtk"; version="0.2.5.3"; sha256="1jislv9kw858rv9wkj1ff6d8bfrw0h779d5yhfxw4kgb48jci6rn"; depends=[Rcpp]; };
   rtkore = derive2 { name="rtkore"; version="1.3.1"; sha256="01jxw1lhnzm25xgm90677gv247ps6x9ky2mcllnj54lsbk8j7gqj"; depends=[Rcpp]; };
   rtop = derive2 { name="rtop"; version="0.5-10"; sha256="0h35f3wpvsdvvymb2sl8g2wljzqzgis66bkf42njhxry7wavqf17"; depends=[gstat rgdal sp]; };
   rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; };
   rtrie = derive2 { name="rtrie"; version="0.1.1"; sha256="092ir1bm193x8ah2zbyik6vfavdqwzkda5kx4m7mv1gxcy4s64vr"; depends=[]; };
   rtrim = derive2 { name="rtrim"; version="1.0.1"; sha256="134j5sv9dvcq1n37rry7615nr3pa54by6r7ss7fagcmy4lnma2ps"; depends=[]; };
-  rts = derive2 { name="rts"; version="1.0-27"; sha256="1kshnvpr3q1zwlijypa2dbs126ckhzgnjpsn6al7ycjfh5xzgml9"; depends=[raster sp xts zoo]; };
+  rts = derive2 { name="rts"; version="1.0-38"; sha256="1m9kir2snfhxyagsflp4cyii33ycw4fr0f8bn7r92757l92i7vr7"; depends=[raster RCurl sp xts zoo]; };
   rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; };
   rtweet = derive2 { name="rtweet"; version="0.4.0"; sha256="19sb8l7xllicagy8i1rwxkfbbl9klv3m9kkxvlc3slg1j3aprvpz"; depends=[httr jsonlite magrittr openssl]; };
   rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
-  rtypeform = derive2 { name="rtypeform"; version="0.3.0"; sha256="0fld8mfdipdw4aw7gklw4kx0gaq4q450s9ibg4mjjabqvaxsfarm"; depends=[httr jsonlite purrr]; };
+  rtypeform = derive2 { name="rtypeform"; version="0.3.1"; sha256="1aavmyc7siy1834j1zmgkir24kkk0069hn27422i4fpklg8jywqk"; depends=[httr jsonlite purrr]; };
   rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; };
   rucrdtw = derive2 { name="rucrdtw"; version="0.1.2"; sha256="1rsiaqf8m5s3ffrm6jwc4s75hc1078aankadvlrfvkdn1k4pd220"; depends=[Rcpp]; };
   rugarch = derive2 { name="rugarch"; version="1.3-6"; sha256="0ysycv0qldp4dnj8yh22v860d40ycp2c0la87zblgl86r7g4f03b"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
@@ -9412,12 +9680,13 @@ in with self; {
   rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
   rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
   rvalues = derive2 { name="rvalues"; version="0.6"; sha256="075lfbqjzi103wh87i78x914iyrvrmmdz8z9f6391rbpip6bjpr3"; depends=[]; };
-  rvcheck = derive2 { name="rvcheck"; version="0.0.8"; sha256="0n3pijlaxhvz692k56z5hx2cbffq3qmyll3dckp6jdv5pbbp4ywy"; depends=[]; };
+  rvcheck = derive2 { name="rvcheck"; version="0.0.9"; sha256="14pa7fa7yyhmk0v5md7x5xr5jd4gjwjlvgbynnhq30fj56qffyvf"; depends=[]; };
   rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; };
-  rvertnet = derive2 { name="rvertnet"; version="0.5.0"; sha256="0bvf76i11kkjdy0vvx2fbv478nbzybljsw40l9mg3i9dcdmz3gjc"; depends=[dplyr ggplot2 httr jsonlite maps]; };
+  rvertnet = derive2 { name="rvertnet"; version="0.6.0"; sha256="1xxk4951vdg7qd1bn0hnnrsgnamdayc0vdw6kswpkbnzi9bfsmdk"; depends=[crul dplyr ggplot2 jsonlite maps]; };
   rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; };
   rvg = derive2 { name="rvg"; version="0.1.4"; sha256="0jrnikx1d523amx32r34h4p64ipxs7i722rmlsg1nq39cb4dc36v"; depends=[gdtools officer Rcpp xml2]; };
   rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
+  rwalkr = derive2 { name="rwalkr"; version="0.2.0"; sha256="0z5g45m3ica6r5ah1jnsrvgnxsbwh5n7c5f3dhkgf4m2j6cdpl8g"; depends=[dplyr tidyr]; };
   rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; };
   rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; };
   rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; };
@@ -9426,11 +9695,12 @@ in with self; {
   rwty = derive2 { name="rwty"; version="1.0.1"; sha256="1w66jlcbn8javlr2l0qinah3cxxadpjzvbz088saysyg277ikfxm"; depends=[ape coda GGally ggdendro ggplot2 phangorn plyr reshape2 viridis]; };
   rwunderground = derive2 { name="rwunderground"; version="0.1.6"; sha256="1q6dn635xshr0sp7iswya1fqqrj5y5xgzyssmmijmrb2s8v52sdr"; depends=[countrycode dplyr httr]; };
   rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; };
+  rxylib = derive2 { name="rxylib"; version="0.2.0"; sha256="0x02mapz5ym9sd5cq4c077sa39ykdgn0rzmj43ws0mm9fs9li8w9"; depends=[BH Rcpp]; };
   ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; };
   rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
   rzmq = derive2 { name="rzmq"; version="0.9.2"; sha256="0vlh9q5d5mddajxn87nbmjmxx99hn5bsj29pzwkn4mvxs1xa80bi"; depends=[]; };
   s2 = derive2 { name="s2"; version="0.1-1"; sha256="1k6329ra119ygb0z496894s4yra7f4dsg1ghpdk8k3ashd9yh6gd"; depends=[Rcpp]; };
-  s20x = derive2 { name="s20x"; version="3.1-22"; sha256="0z4dplpx9586308i89hgqcbqxk1qpkcad240ri7nbcacd2zgfqw9"; depends=[]; };
+  s20x = derive2 { name="s20x"; version="3.1-23"; sha256="0bncgwn3l1wnjsqncidd941ljcbl7rdfbxklgl8q8jy63zq80hpk"; depends=[]; };
   s2dverification = derive2 { name="s2dverification"; version="2.8.0"; sha256="13cjzxrjwahjhdw5q8lpbwgywgswqrcnj7rkff9kraan9lj83bkk"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; };
   s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; };
   sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; };
@@ -9440,7 +9710,7 @@ in with self; {
   sExtinct = derive2 { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
   sFFLHD = derive2 { name="sFFLHD"; version="0.1.1"; sha256="19zhx0rc6h44301a5q68r9jbxzh12ci3387d1c319vdiw05nschy"; depends=[conf_design DoE_base]; };
   sGPCA = derive2 { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[fields Matrix]; };
-  sNPLS = derive2 { name="sNPLS"; version="0.1.8"; sha256="0511542q4sda0vhgbl5jzcp2xyin3fzgmhhx1mkah8khmndxiq2p"; depends=[car ks MASS Matrix pbapply plotrix rgl]; };
+  sNPLS = derive2 { name="sNPLS"; version="0.2.0"; sha256="11qxdr55axhx497vasphjfdlvwq9gpsd0q8dx0ypk7bf8dcf7kaf"; depends=[car ks MASS Matrix pbapply plotrix rgl]; };
   sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
   sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; };
   sValues = derive2 { name="sValues"; version="0.1.4"; sha256="0y2cv3wls2y3zpbm2d098xj5n098yjl32yi7mwha6mhfwfa4y99l"; depends=[caTools ggplot2 reshape2]; };
@@ -9458,6 +9728,7 @@ in with self; {
   safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
   safer = derive2 { name="safer"; version="0.1.0"; sha256="04hwncx9g9c6lb4l9f12nyld5wq4fqr8v4w0m64qhwyiv0zi8sh1"; depends=[assertthat base64enc sodium]; };
   safi = derive2 { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; };
+  samon = derive2 { name="samon"; version="4.0.0"; sha256="0pvv93ahh0i69ncc3sic9481wd5rv5dfxysxyzkl61ds3yvrr09v"; depends=[]; };
   sampSurf = derive2 { name="sampSurf"; version="0.7-3"; sha256="165y2z9bhf7cyrh177fk87apqpgzyn69gf53f9mmii931cyykihw"; depends=[boot raster rasterVis sp]; };
   sampleSelection = derive2 { name="sampleSelection"; version="1.0-4"; sha256="0by6l20hsaqvkcxpvn7lr6p2g78lb1464dygp7x4h8sq1fc4j4av"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; };
   samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; };
@@ -9466,18 +9737,19 @@ in with self; {
   sampling = derive2 { name="sampling"; version="2.8"; sha256="06pj7dan0mknpsblmlnk7am78qrnwgnql5vvx7vmbfvib7rj6s9m"; depends=[lpSolve MASS]; };
   samplingDataCRT = derive2 { name="samplingDataCRT"; version="1.0"; sha256="0ah3fi2sn642c8nicikhjhl1hdsjzshrf1j02swq0jaqggcqjdvk"; depends=[mvtnorm]; };
   samplingEstimates = derive2 { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
-  samplingVarEst = derive2 { name="samplingVarEst"; version="1.0-2"; sha256="182y1srz2cs6rn8kh6nns5v29q0ww2jmv0yfp8b110qq23wd5mnd"; depends=[]; };
+  samplingVarEst = derive2 { name="samplingVarEst"; version="1.1"; sha256="1ffdw7s3jf5xfcbiqbrk4f3d0ym1s690wlc24yvhp5fvh5rghjn3"; depends=[]; };
   samplingbook = derive2 { name="samplingbook"; version="1.2.2"; sha256="1szx9bdlxxn2yhy9i362fcscn5cydvrkw9kggr7yqb715k5n1j6n"; depends=[pps sampling survey]; };
   samr = derive2 { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[impute matrixStats]; };
   sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; };
-  sandwich = derive2 { name="sandwich"; version="2.3-4"; sha256="0kbdfkqc8h3jpnlkil0c89z1192q207lii92yirc61css7izfli0"; depends=[zoo]; };
+  sandwich = derive2 { name="sandwich"; version="2.4-0"; sha256="1h6c12cfv2x42laxf6ifxfk9hqzagvvvimzak88fv8vnxnf5nc9l"; depends=[zoo]; };
   sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
   sankey = derive2 { name="sankey"; version="1.0.0"; sha256="0wm10f514sg3gfrz291k720kznnyssznyvr49c15i26bhb82m0q0"; depends=[simplegraph]; };
   sanon = derive2 { name="sanon"; version="1.5"; sha256="1iikm7ivlz87kbq0ax9r1dz29zdq1kmhxd2imzc4hkvr1rwgciv6"; depends=[]; };
   sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; };
   sarima = derive2 { name="sarima"; version="0.4-5"; sha256="1qhw9csfci1z9wsf3rylhfhw59180qhn575xlwmi1zvp179hlmrj"; depends=[FitAR FitARMA lagged ltsa PolynomF portes]; };
   sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
-  satellite = derive2 { name="satellite"; version="0.2.0"; sha256="00znkb9wsg7yqxykb5bhl1chqir26h4ixhcqzxg6j1c4hpd2sakk"; depends=[plyr raster Rcpp]; };
+  sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; };
+  satellite = derive2 { name="satellite"; version="1.0.0"; sha256="0kzy2rhvs4g78sndnj0mj2cs35sbkj9dkjlhkxdf3ibrbx4lisqx"; depends=[plyr raster Rcpp]; };
   satscanMapper = derive2 { name="satscanMapper"; version="1.0.0"; sha256="0yjz00nnkyp6q96r3nnizvglblxqg9rprbrc7rh9bpvydps3xxiy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; };
   saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; };
   saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
@@ -9513,6 +9785,7 @@ in with self; {
   schwartz97 = derive2 { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; };
   scidb = derive2 { name="scidb"; version="2.0.0"; sha256="079akdsxxjnca5jsv0grw1c2nd3dl368xhy4mzm94mh5j6ghi57l"; depends=[bit64 curl data_table digest openssl]; };
   scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; };
+  scifigure = derive2 { name="scifigure"; version="0.1.1"; sha256="0wfvg0c9hbdc3ipsnq6nkf7k9hf8yl27aqg012nqk9ynlwp9qa56"; depends=[]; };
   scio = derive2 { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
   sciplot = derive2 { name="sciplot"; version="1.1-1"; sha256="1ydwx9kh778z3x7s3i6gqinqi6bmsf6bslaf0mgszj0nrgcmj6y3"; depends=[]; };
   sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; };
@@ -9520,10 +9793,9 @@ in with self; {
   score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
   scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; };
   scoring = derive2 { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; };
-  scoringRules = derive2 { name="scoringRules"; version="0.9.2"; sha256="04vkw2azyj1xsnyr58cgagajcd2f7r0843i9v77p4wvzv96rl851"; depends=[MASS Rcpp RcppArmadillo]; };
+  scoringRules = derive2 { name="scoringRules"; version="0.9.3"; sha256="1n26k9vg95gq292xgva65wnzk2whfrpyw8ngq7h8jd5zn9by7fpl"; depends=[MASS Rcpp RcppArmadillo]; };
   scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; };
-  scphaser = derive2 { name="scphaser"; version="1.0.0"; sha256="1n5ihdpjclpiwg2i6v8m46ysjg53fzsr0j60ijnvrq328y0iqis4"; depends=[BiocParallel cluster Hmisc R_utils]; };
-  scpm = derive2 { name="scpm"; version="1.0-1"; sha256="16f2wsv6vrgnhky969nd7k0l7z8c0jw85yf9zbrvg1lcxgv9kg8i"; depends=[geoR interp lattice MASS Matrix mvtnorm RandomFields rgl]; };
+  scpm = derive2 { name="scpm"; version="1.0-2"; sha256="0jrr90lcalchfqmq5c8ja7ws88rpri3gjdc5z4jfpazn2vznx26n"; depends=[geoR interp lattice MASS Matrix mvtnorm RandomFields rgl]; };
   scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; };
   scrime = derive2 { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
   scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; };
@@ -9536,14 +9808,14 @@ in with self; {
   sdPrior = derive2 { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; };
   sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
   sdat = derive2 { name="sdat"; version="1.0"; sha256="1rp2s3y44f3vj0p16j1k2rrs44kmnzy9k0lpcm9ga801nbv93saz"; depends=[]; };
-  sdcMicro = derive2 { name="sdcMicro"; version="5.0.2"; sha256="094qpgpwb0lmlgrbvglf87q48xq1xzdd4bxmi4kjlsz8hq4kkhki"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS xtable]; };
-  sdcTable = derive2 { name="sdcTable"; version="0.22.6"; sha256="09yxsmdyrilrin81bnww8wsjqf6fjyfmf2i5ccz0sn8q8dgfajln"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; };
+  sdcMicro = derive2 { name="sdcMicro"; version="5.0.3"; sha256="1kl61n3y7h9ay96nd5ijis45siimzf03xvdr0ic0ih8mlswl9nbn"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; };
+  sdcTable = derive2 { name="sdcTable"; version="0.22.8"; sha256="134a0g1v5w9airckn1bqp4k7hv2dcl5kmb1hx78nw5s8h92y3gkc"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; };
   sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
   sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; };
   sdef = derive2 { name="sdef"; version="1.6"; sha256="1y1l5fl7lh636kyvc2hwssdnifl055nrz3riplj4qqw88lkm1mk8"; depends=[]; };
-  sdm = derive2 { name="sdm"; version="1.0-32"; sha256="1h20ap4q7bq2y92mrggir8fq4dlw6hz0pvpaqnj2v8fxng50fpjx"; depends=[raster sp]; };
-  sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.5"; sha256="0hnfhdrvn78yl4shrk4y42j4wjrfrglhnkqsa56kgki4hnq88d29"; depends=[R_utils raster rgdal]; };
+  sdm = derive2 { name="sdm"; version="1.0-41"; sha256="083agia8091k0c44alrpxm9qqz74f1i9xycaxkfj7f626p8f6qjj"; depends=[raster sp]; };
+  sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.6"; sha256="1kbgv5x5ilzccafl20x86fi9f7jqxnccvb8k7dy8q41s9n36qwfs"; depends=[R_utils raster rgdal]; };
   sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; };
   sdnet = derive2 { name="sdnet"; version="2.3.8"; sha256="10c962wbzgl2zpz7yx5kpryldbbq76qrd5pnz4rlmbaa9kfg08s5"; depends=[]; };
   sdprisk = derive2 { name="sdprisk"; version="1.1-5"; sha256="1c6mipq8sh8347i7m7dh47f69fr21xkrsk8yjgsdvcy41h8zijmf"; depends=[numDeriv PolynomF rootSolve]; };
@@ -9565,7 +9837,6 @@ in with self; {
   secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; };
   seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; };
   seedy = derive2 { name="seedy"; version="1.3"; sha256="1a21sl8i7z12cjaqj08lkq3viazxlgxv82vaarm58fgbpsvdi0m0"; depends=[]; };
-  seeg = derive2 { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car sgeostat spatstat]; };
   seewave = derive2 { name="seewave"; version="2.0.5"; sha256="1ml0jcqb6i6v0xgarvzg51rgax6lsf6y2255jq1kfz4v8n39vnh0"; depends=[tuneR]; };
   seg = derive2 { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
   segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; };
@@ -9608,26 +9879,29 @@ in with self; {
   sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
   sensors4plumes = derive2 { name="sensors4plumes"; version="0.9"; sha256="1fyf020bl6p9wdvnsfkmdlllhdwj3l4h9h2paq9dwd7hsr7av48p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; };
   sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; };
+  senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; };
   sentimentr = derive2 { name="sentimentr"; version="1.0.0"; sha256="1hniwvm2mr85hs6v9pvs04n73a13nf0qkikxkz9bcb3hfgkk8v6c"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean]; };
   separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
+  seplyr = derive2 { name="seplyr"; version="0.1.4"; sha256="0s347da7f9xxzzym05fr6sfwd0mahg4p8x1qxi0wf13myxkpqv6d"; depends=[dplyr rlang]; };
   seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
   seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; };
   seqHMM = derive2 { name="seqHMM"; version="1.0.7"; sha256="1pap3i2zxgnxr3frw648hkzbhn4rnz20lzhhvrp89vhc77vh4ds1"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
-  seqICP = derive2 { name="seqICP"; version="1.0"; sha256="16xw567kg0vl0gby54yiaxwcic5krajsqbnphn58wxaksj7w7qmd"; depends=[dHSIC mgcv]; };
+  seqICP = derive2 { name="seqICP"; version="1.1"; sha256="1dfhl7g47icjw38p9c0hyvnn3pwzw7pndywk22vgcyfhiz23xjcp"; depends=[dHSIC mgcv]; };
   seqMeta = derive2 { name="seqMeta"; version="1.6.7"; sha256="11dscdrlnk5jzg0q2g59qis4xjr4xs86bi463jmhq53n9gsb4i1l"; depends=[CompQuadForm coxme Matrix survival]; };
   seqPERM = derive2 { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
   seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
-  seqinr = derive2 { name="seqinr"; version="3.3-6"; sha256="13d0qxm2244wgdl2dy2s8vnrnf5fx4n47if9gkb49dqx6c0sx8s2"; depends=[ade4 segmented]; };
+  seqinr = derive2 { name="seqinr"; version="3.4-5"; sha256="17zv0n5cji17izwmwg0jcbxbjl3w5rls91w15svcnlpxjms38ahn"; depends=[ade4 segmented]; };
   seqminer = derive2 { name="seqminer"; version="6.0"; sha256="057j1l6dip35l1aivilapl2zv9db677b3di2pb3sfgq2sxg0ps3l"; depends=[]; };
   seqmon = derive2 { name="seqmon"; version="2.1"; sha256="0p7vbrx0l59wyxhg59a8nnnk1z46inys30rpchj0v5ggadaazjkx"; depends=[]; };
   seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; };
   sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; };
   sequenza = derive2 { name="sequenza"; version="2.1.2"; sha256="0f3aj96qvbr1wqimlv6rxg0v34zlrgc6pbdy7sfkwfzs1n44q1xf"; depends=[copynumber squash]; };
-  sequoia = derive2 { name="sequoia"; version="0.8.1"; sha256="0raznn4h0k50idvxfx74fb4df5357kgwwb9794ys6bm3lfi0jpjl"; depends=[plyr]; };
+  sequoia = derive2 { name="sequoia"; version="0.9.3"; sha256="1lxq88bw5fbm2afdh79fs363dvb1c2jsz02dc6c0ndwkwch04igc"; depends=[plyr]; };
+  sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; };
   serial = derive2 { name="serial"; version="1.2"; sha256="1zjzm5ym8z9g97sff6bg9p5dhjpj6g26wam9j9gklffiry8dd9li"; depends=[]; };
   seriation = derive2 { name="seriation"; version="1.2-2"; sha256="1b6glraxi5zrqzihnh39bbdnzsbd925r9hjpi020d470266g2c8f"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
   seroincidence = derive2 { name="seroincidence"; version="1.0.5"; sha256="07lphrp7r3i87633q8g6svk2mxbsvq4blrf8gnm0p99hkmz8wgg9"; depends=[]; };
-  servr = derive2 { name="servr"; version="0.6"; sha256="0sqz3wssxa19g9mpmf9s4gx2a5rvzl8nrd11qkgpz5v3iqsc6ysr"; depends=[httpuv jsonlite mime]; };
+  servr = derive2 { name="servr"; version="0.7"; sha256="0rxh89csqlpyf9wv5wlymya9kbddj79mlmxz2x0xmls12gbrxaaa"; depends=[httpuv jsonlite mime]; };
   sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; };
   session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
   sessioninfo = derive2 { name="sessioninfo"; version="1.0.0"; sha256="00g3lbvk1cjjzckl70fn5n3579qb301im4lbm3cip5c2v8k283dk"; depends=[clisymbols withr]; };
@@ -9636,12 +9910,12 @@ in with self; {
   setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; };
   settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; };
   severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
-  sf = derive2 { name="sf"; version="0.5-1"; sha256="1yz7a8pk0pxianivyr6sw83g0n7dhv9krbzf0zk3g74rdh2c8zxg"; depends=[DBI magrittr Rcpp units]; };
+  sf = derive2 { name="sf"; version="0.5-3"; sha256="1jkdqxkijr1p4ks56iwrxqh93r6627n91i8xpgznk2ghysrdzc57"; depends=[DBI magrittr Rcpp units]; };
   sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
   sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; };
   sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; };
   sfdct = derive2 { name="sfdct"; version="0.0.3"; sha256="00vm68w8fxwxkw69lay25mpd7zw86a15v5pi3nxnay8jx7vrmbhc"; depends=[dplyr RTriangle sf sp tibble]; };
-  sfinx = derive2 { name="sfinx"; version="1.7.9"; sha256="0gnli24mi9zh5j9ycpraksf4z7crr27sv6j3ycww7jfq5lfhg8kp"; depends=[]; };
+  sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; };
   sfsmisc = derive2 { name="sfsmisc"; version="1.1-1"; sha256="0jzmbywlyzfxs7hlmyd0iynghfc9qp5sa5lnhr73y8r360yv1ahf"; depends=[]; };
   sft = derive2 { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; };
   sgPLS = derive2 { name="sgPLS"; version="1.4"; sha256="0yx3vg9rfm6jvrgfaky2dlbrbksa5475gx3g11x6i35nd2nb2p5z"; depends=[mixOmics]; };
@@ -9652,21 +9926,22 @@ in with self; {
   sglOptim = derive2 { name="sglOptim"; version="1.3.6"; sha256="0gzhzfi5q9hgqgzagfdzi4cswpmwic9ggf72qi6axl1hixgmgp0w"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; };
   sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; };
   sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
+  sgmcmc = derive2 { name="sgmcmc"; version="0.1.0"; sha256="1lrr5ixb0dsjsf5g52137mz6bqm2asgnb70qmdqhkad02c8gqrcz"; depends=[tensorflow]; };
   sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; depends=[poibin]; };
   sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
   sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; };
   shades = derive2 { name="shades"; version="0.2.0"; sha256="1r2xbz1h144pg53g3ayy7n08091gv5zj52p02gv7kihir2kzxj0w"; depends=[]; };
-  shadow = derive2 { name="shadow"; version="0.3.3"; sha256="1685n637sr3717iyl9ws89cxflbyzr5lddy1vip3xaljigqa3xwy"; depends=[raster rgeos sp]; };
-  shallot = derive2 { name="shallot"; version="0.3.2"; sha256="0mbrwmkjxqqysdndyp3ha3q13hbb6kb61xzx9rssxc9nacxlsy7p"; depends=[commonsMath rscala]; };
-  shape = derive2 { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; };
+  shadow = derive2 { name="shadow"; version="0.3.5"; sha256="1y0j90rhd9jpznknyy76g6qnvrdc52wh9s8khabka4gqjgvrmb98"; depends=[raster rgeos sp]; };
+  shallot = derive2 { name="shallot"; version="0.4.0"; sha256="0gnas5h770yvi2k09nyq6yywbd36xp6bnnp7psdvcyvhwx439f64"; depends=[commonsMath rscala]; };
+  shape = derive2 { name="shape"; version="1.4.3"; sha256="1v9xp60p813rnx41vchkh32qmcb4z2zp9l7r1a8a6f8aqylnq3vj"; depends=[]; };
   shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; };
   shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
   shapes = derive2 { name="shapes"; version="1.2.0"; sha256="0fnwcxnrhy5iqzzmrkbbpr4rirg4ixl96656ywcc1mhwv6d6iw0z"; depends=[MASS rgl scatterplot3d]; };
   sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; };
   sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
   sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; };
-  shazam = derive2 { name="shazam"; version="0.1.7"; sha256="0q0ydkk8zdsyx54p7qc1xli741xyrqyjmcrwv9jzim4qilypcxdl"; depends=[alakazam ape doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval scales SDMTools seqinr stringi tidyr]; };
-  shiny = derive2 { name="shiny"; version="1.0.3"; sha256="11j4ay1k200hkcb76yx1ahvmkvjrg9k5iy0fchdvmkyv6x25lais"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; };
+  shazam = derive2 { name="shazam"; version="0.1.8"; sha256="0j953zf0wigr645a52088ajrchhr7xlf891hybbx8pvspj240f3y"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; };
+  shiny = derive2 { name="shiny"; version="1.0.5"; sha256="0hps6nlyffh685smsm9sd0rdmip0y8v7hgv6a4hqlq7kf8zmzqi0"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; };
   shiny_semantic = derive2 { name="shiny.semantic"; version="0.1.1"; sha256="0jd00z817cccz3wfhcmz61wsy5fjw6yyan2ywkf06xqcdpnr8iwh"; depends=[htmltools htmlwidgets purrr shiny]; };
   shinyAce = derive2 { name="shinyAce"; version="0.2.1"; sha256="0ycka8rsw0178q9klfid97vdn5cbyx3r778nis5s3dqipdyazdm9"; depends=[shiny]; };
   shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
@@ -9679,14 +9954,14 @@ in with self; {
   shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; };
   shinyTime = derive2 { name="shinyTime"; version="0.2.1"; sha256="0gpa6kypchvvlq71nnlilciclcrhaa488prjz46sddrsxjy09mp7"; depends=[htmltools shiny]; };
   shinyTree = derive2 { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
-  shinyWidgets = derive2 { name="shinyWidgets"; version="0.3.0"; sha256="1g1l9afqchqxn1pl11vp67npwb9c3d7cdgq92r10pfgx437gwmv2"; depends=[htmltools jsonlite shiny]; };
+  shinyWidgets = derive2 { name="shinyWidgets"; version="0.3.4"; sha256="0c221lk75mny8h80dsc1qlcavlzqdgyj5m0laqsmkkahfzg8d6r2"; depends=[htmltools jsonlite shiny]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
   shinycssloaders = derive2 { name="shinycssloaders"; version="0.2.0"; sha256="1bpzsm7m7c366sjl1qndp4m5dg2vlm68rjgdy9n1ija9xbp0r2g4"; depends=[digest glue shiny]; };
   shinydashboard = derive2 { name="shinydashboard"; version="0.6.1"; sha256="14zi7g5wrngy6lwi9xpvaid7727m6rfdijbb89al9likfhjqzqqy"; depends=[htmltools shiny]; };
-  shinyjqui = derive2 { name="shinyjqui"; version="0.1.0"; sha256="0jx0wbgw981pr60fpsd0jrhg0kj3zjp1cg1wp6201kq40mar70zg"; depends=[htmlwidgets jsonlite shiny]; };
+  shinyjqui = derive2 { name="shinyjqui"; version="0.2.0"; sha256="07ijd5psywlkfrz54d4q68bwij1as4ai0360fya8ikngkwg393mj"; depends=[htmlwidgets jsonlite shiny]; };
   shinyjs = derive2 { name="shinyjs"; version="0.9.1"; sha256="0h90k4f93lbfraldjxlbhjyjr54c3hiv7gyrbqz70j08s0bhyama"; depends=[digest htmltools jsonlite miniUI shiny]; };
-  shinymaterial = derive2 { name="shinymaterial"; version="0.2.1"; sha256="0g36qgvvb8y9jikramz39h4qnzcllyqq4pq2nri7bcn2i8994d2r"; depends=[shiny]; };
-  shinystan = derive2 { name="shinystan"; version="2.3.0"; sha256="1xianpv9s4xjv5lsnagcx7gsnba38psv9kgik9z6k7z9g7bg91rs"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; };
+  shinymaterial = derive2 { name="shinymaterial"; version="0.3.0"; sha256="1hhl5bz287faqxkl9wd0s7w5pyxzglpici7hcq1g556hqyw1x1w6"; depends=[shiny]; };
+  shinystan = derive2 { name="shinystan"; version="2.4.0"; sha256="18bdh2h6grlwfx6p00214p7cgzg7zfhbvnkd1dmxihp9wf4l80af"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; };
   shinythemes = derive2 { name="shinythemes"; version="1.1.1"; sha256="0i220y051dq763idh1j5zhpb5cpv3jr11jd9akmry9aadyys5pz6"; depends=[shiny]; };
   shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; };
   shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; };
@@ -9694,15 +9969,15 @@ in with self; {
   shotGroups = derive2 { name="shotGroups"; version="0.7.3"; sha256="0h6c4fz2b4gpbfqykic6apflvp11bcafqm87gzl0zv8b03ydylxk"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
   showtext = derive2 { name="showtext"; version="0.4-6"; sha256="17qx9zlmp440p4a9mkba89k1rdx11hdl5px33m1766hlsv1x7sf8"; depends=[showtextdb sysfonts]; };
   showtextdb = derive2 { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; };
-  shp2graph = derive2 { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[igraph maptools]; };
+  shp2graph = derive2 { name="shp2graph"; version="0-3"; sha256="0mfb3f64kpd23qa1yb19j7j234snls7yvszp2yxnv9yahk0blifw"; depends=[igraph maptools sp]; };
   shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; };
   shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; };
   siRSM = derive2 { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[doSNOW foreach MASS rsm]; };
   siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; };
-  sicegar = derive2 { name="sicegar"; version="0.1"; sha256="15l1ffggqlaywqyk6wx745yrhfxkdljycz1l8vsp15i65w03xd0q"; depends=[dplyr fBasics ggplot2 minpack_lm]; };
+  sicegar = derive2 { name="sicegar"; version="0.2"; sha256="14bgn97jsgfgpfk5pd3vh0g9gvdpsk6qw971cx3q5l493mc8qxyq"; depends=[cowplot dplyr fBasics ggplot2 minpack_lm]; };
   sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; };
   sidier = derive2 { name="sidier"; version="4.0.2"; sha256="1zzlgd20aw2asbsb3g9m5gvlmmgkai3bqrxyn48mphc2ncl4y7w0"; depends=[ape ggmap ggplot2 gridBase igraph network]; };
-  sidrar = derive2 { name="sidrar"; version="0.2.1"; sha256="0w270dgr05gs0ys8mrhrmf41hkafxd8gcif9zrzyfp9yz8292m84"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; };
+  sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; };
   sievetest = derive2 { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; };
   sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
   sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
@@ -9712,15 +9987,15 @@ in with self; {
   signalHsmm = derive2 { name="signalHsmm"; version="1.4"; sha256="1plyvx0pdid4zydxjwph6v96c8ilzgn55vcdszkslp3a4s2sns65"; depends=[Rcpp seqinr shiny]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
   sigora = derive2 { name="sigora"; version="2.0.1"; sha256="1sgjafr2f7carwnvp0vsvp80jn2bzwlkay38ch63qk9gapsh4imh"; depends=[]; };
-  sigr = derive2 { name="sigr"; version="0.1.6"; sha256="1bkizghzh4jfpakn4vh1f5v0yzdgx985ky6shwfa4czq4kk8kxjb"; depends=[]; };
-  simEd = derive2 { name="simEd"; version="1.0.1"; sha256="102zpcrzh9phcmjx585zzasr3ygvr61i0fc08naznrhl6i9lygwp"; depends=[rstream]; };
+  sigr = derive2 { name="sigr"; version="0.1.7"; sha256="06phjjs3c53nlyh0hbwlzk5qms7g0yz3lnbd8sb8pl04v6h0y3d3"; depends=[]; };
+  simEd = derive2 { name="simEd"; version="1.0.2"; sha256="1r8m5sajc362bx5wzjwd75zn05q7j1kxzzdynbxwb2c8k8q83qyq"; depends=[rstream]; };
   simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
   simLife = derive2 { name="simLife"; version="0.3"; sha256="0bqhixr4zg7mwgxdsjk0h5a82dyfkhiv9xafw43w2bpnmyxywdia"; depends=[splancs unfoldr]; };
   simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; };
   simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
   simPATHy = derive2 { name="simPATHy"; version="0.2"; sha256="0ai5wmjz8k0glbwkclgg3m3ncsjghja4iys2mn1psn3r8gxk79yc"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; };
   simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
-  simPop = derive2 { name="simPop"; version="0.6.0"; sha256="0ndcwg3yj0n7wyhgs3n02jr7m4sks9n8bjbcgkzrxkqfg6696b62"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp vcd VIM]; };
+  simPop = derive2 { name="simPop"; version="1.0.0"; sha256="1197gfpikrb02s7jgvpxzp19bbjdpzsik8ngh77k2fa76gzs4p6c"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp vcd VIM]; };
   simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; };
   simTool = derive2 { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; };
   simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
@@ -9731,11 +10006,12 @@ in with self; {
   simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; };
   simex = derive2 { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; };
   simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; };
-  simglm = derive2 { name="simglm"; version="0.5.0"; sha256="1nx1i9knsh9c2wfppdaizxgvixl6pdr4fda7jy4bxhmqvsax36bv"; depends=[dplyr Matrix purrr tibble tidyr]; };
-  simmer = derive2 { name="simmer"; version="3.6.2"; sha256="0h3am2c6043sajdbk9qsfqjrph69dwh6bv6fil174bpm00rxckhb"; depends=[BH magrittr R6 Rcpp]; };
-  simmer_plot = derive2 { name="simmer.plot"; version="0.1.9"; sha256="0xgry3x94b8h5cg9p7a8f4xjrbs61wjk1pc8drlvjjs5dazq310f"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
+  simglm = derive2 { name="simglm"; version="0.6.0"; sha256="1kmi5lpx8m14iz0i9z8811cp6fq2x700qsxn6rxrkxbq88a5mdss"; depends=[dplyr Matrix purrr tibble tidyr]; };
+  simmer = derive2 { name="simmer"; version="3.6.3"; sha256="0kg7grlsi4mbjnfhhb01aj7jnyfznrhr5g3gd0vxl7xnwj6g8ppv"; depends=[BH codetools magrittr R6 Rcpp]; };
+  simmer_plot = derive2 { name="simmer.plot"; version="0.1.10"; sha256="1l6bck2af77mq86yqqhgxqxskb55fg2rabbqq2z37sbi3r2dvqr0"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
   simmr = derive2 { name="simmr"; version="0.3"; sha256="18ycrd7qbz7frvd3bgbqaaapslw1jw89fy3np5qyb9sswyk08w9m"; depends=[boot coda compositions ggplot2 MASS reshape2 rjags viridis]; };
   simone = derive2 { name="simone"; version="1.0-3"; sha256="1l38xbcf50kjh0k4dc4xsxkjr54jz4s98az99mzcsdarqd6kz9kg"; depends=[mixer]; };
+  simpleCache = derive2 { name="simpleCache"; version="0.3.1"; sha256="14jrsfxcrndfgi7yl5frfsyixxkhagc7cfav8h6mf6apfxx0v1ls"; depends=[]; };
   simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; };
   simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; };
   simpleSetup = derive2 { name="simpleSetup"; version="0.1.0"; sha256="0rbzmixk76b3lgi9m7ijhcl6dha7wbbxfgwdhnp2y338zny6c6rm"; depends=[]; };
@@ -9748,36 +10024,39 @@ in with self; {
   simrel = derive2 { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; };
   simsalapar = derive2 { name="simsalapar"; version="1.0-9"; sha256="0h46acf797lp1hvs8x91nzll3zxiiczfl6vdxxrwizr109jzggcj"; depends=[colorspace gridBase sfsmisc]; };
   simsem = derive2 { name="simsem"; version="0.5-13"; sha256="0v6gbfp4659gbpzc1vffg687c8bcd45ddb7jhd0bgx66m28853kk"; depends=[lavaan]; };
-  simstudy = derive2 { name="simstudy"; version="0.1.2"; sha256="08350rd4nd4vckd51n2k4q28p4wi3a366xr2kgrjxr7xpx12m6zw"; depends=[data_table mvnfast Rcpp]; };
+  simstudy = derive2 { name="simstudy"; version="0.1.3"; sha256="1ypggcdxlfkgx60csi8r9m1j6rjqly8q50g0w80h68wrf919f51p"; depends=[data_table mvnfast Rcpp]; };
+  simsurv = derive2 { name="simsurv"; version="0.1.0"; sha256="08w5kbzx3wlksl17kjg9j4dj1f40ddm32mafi75y5c8bwgcfzqzy"; depends=[]; };
   simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; };
-  simule = derive2 { name="simule"; version="1.1.0"; sha256="0kyzaiix4jfmyyym7650q32ba9pdl747iqzjdfw22nyhs70qcqcs"; depends=[igraph lpSolve pcaPP]; };
+  simule = derive2 { name="simule"; version="1.1.2"; sha256="06x30rvs6fzbc1bgp4262rjljsisy03annsprfa5mm76mk00xm4v"; depends=[igraph lpSolve pcaPP]; };
   sinaplot = derive2 { name="sinaplot"; version="1.1.0"; sha256="0zfq6l8wjvdj7rndsfyh0a2xjlxmn2ij1q50hg3xjfpwrjxcsck8"; depends=[plyr]; };
   sinew = derive2 { name="sinew"; version="0.2.1"; sha256="18vdl10r5mhgmdkx01q8xqjxs418ndjzrwgrvnfm98264pkycpk3"; depends=[rstudioapi]; };
   sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; };
   siplab = derive2 { name="siplab"; version="1.2"; sha256="0r7gk9qsmbc3ln67cb8p87bq3s2rx6fbavlly1fpzqqv2isf5pq9"; depends=[spatstat]; };
   sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; };
-  sirt = derive2 { name="sirt"; version="2.0-25"; sha256="0290zlc0kcbi6h27zrn6ysc06814fdg2ixskc3v43yvpadh7pm2h"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; };
+  sirt = derive2 { name="sirt"; version="2.1-24"; sha256="12db9dfj759bpi36k9jz7xdr2xv381fxzx28yk23qmw2flhnl5ks"; depends=[CDM coda lavaan lavaan_survey mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; };
   sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
   sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
   sitar = derive2 { name="sitar"; version="1.0.9"; sha256="1yjiqykrx0dm0zkssagv50kyp4wj9b0sjmrpgbn9wzimqdb5ijph"; depends=[nlme quantreg]; };
-  sitmo = derive2 { name="sitmo"; version="1.2.0"; sha256="0y8g93wccr5fw4dv9f1cdrkgy5559wms2kzn6vrlcdk9lx5zv6ni"; depends=[Rcpp]; };
+  sitmo = derive2 { name="sitmo"; version="1.2.1"; sha256="1i4bcri3vz7r49zizzqqw1m188983izvl3ja9q4nblggikif611f"; depends=[Rcpp]; };
   sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
-  sitree = derive2 { name="sitree"; version="0.1-1"; sha256="1g5q8kq4sk6akzyvaa6gbj9fddzwhw13s5qhh53gk99xn658zl8j"; depends=[data_table lattice latticeExtra]; };
+  sitree = derive2 { name="sitree"; version="0.1-2"; sha256="0scfbj33mdqz10rgw6pznxca0hbmg64k53y30lwal957430yflz5"; depends=[data_table lattice latticeExtra]; };
+  sitreeE = derive2 { name="sitreeE"; version="0.0-1"; sha256="1gb0n5gis4ac0fdjcc496fwpvwmw5iwafpsjy3i1mpkjkxpn7za9"; depends=[sitree]; };
   sivipm = derive2 { name="sivipm"; version="1.1-3"; sha256="1l0j1bi38s09ax4kwikk615lyd074gzg1aa1j2jfmhr3igannm3z"; depends=[seqinr]; };
   sizeMat = derive2 { name="sizeMat"; version="0.3.0"; sha256="0766wxcc1980ivlib2saagl20y9dm0ar7i43qcqk2jpdbbaky33z"; depends=[MASS matrixStats mcmc MCMCpack]; };
-  sjPlot = derive2 { name="sjPlot"; version="2.3.1"; sha256="1alhwzqp748iffgbbbldgzgdcv1ilhx4jszqg6dlk94kw38jn4px"; depends=[broom dplyr effects ggplot2 knitr lme4 MASS merTools modelr nlme psych purrr scales sjmisc sjstats tibble tidyr]; };
+  sjPlot = derive2 { name="sjPlot"; version="2.3.3"; sha256="14yl3y4faiw5g3cql8vra4d8xrxn2fri55zsddlgsnqxf1qar5w1"; depends=[broom dplyr effects forcats ggeffects ggplot2 knitr lme4 MASS merTools modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr]; };
   sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; };
-  sjlabelled = derive2 { name="sjlabelled"; version="1.0.0"; sha256="0bnl9346h1fmklfg74lja2ajldwv3vn2wivb3kbiqhrja4mb07fb"; depends=[dplyr haven magrittr purrr tibble]; };
-  sjmisc = derive2 { name="sjmisc"; version="2.5.0"; sha256="150c065diawp6xdcianim2nlvp15w7z56k4qpskj2pb898slf004"; depends=[broom dplyr haven magrittr psych purrr rlang sjlabelled stringdist stringr tibble tidyr]; };
-  sjstats = derive2 { name="sjstats"; version="0.10.2"; sha256="160d3jh1xdp4xkh4bahi455s4isgm7mciwxga8vf1b4wlyb7zkmx"; depends=[broom coin dplyr glmmTMB lme4 lmtest MASS Matrix modelr nlme purrr rlang sandwich sjlabelled sjmisc tibble tidyr]; };
+  sjlabelled = derive2 { name="sjlabelled"; version="1.0.1"; sha256="1zimqcgv3n861v9adn0yj919yanjkmvmds03ksyg8mhwr290i2hq"; depends=[broom dplyr haven magrittr purrr tibble]; };
+  sjmisc = derive2 { name="sjmisc"; version="2.6.1"; sha256="1bk1f0kigyhxp40gjdxj60jmw5x984bdp1k170xw9hqfar29dn7x"; depends=[broom dplyr haven magrittr psych purrr rlang sjlabelled stringdist stringr tibble tidyr]; };
+  sjstats = derive2 { name="sjstats"; version="0.11.0"; sha256="1hc53a6gvb1ci0vl0pq8pdpn9m67d7pplc00jsfjdc79p1lh0pgk"; depends=[broom coin dplyr glmmTMB lme4 lmtest MASS Matrix modelr nlme purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
   skeleSim = derive2 { name="skeleSim"; version="0.9.5"; sha256="1m0jwr63v989dalchiv90sfpi6g19rj0x2zgp0bgmjpq3xyamykf"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; };
   skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; };
   skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; };
   skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
   skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; };
-  skmeans = derive2 { name="skmeans"; version="0.2-10"; sha256="014di97bcrx7lkvpixcy7idgfxaay4sjn7xvvj683a45pkk58h5c"; depends=[clue cluster slam]; };
+  skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; };
+  skpr = derive2 { name="skpr"; version="0.35.1"; sha256="0i0vapwf0wjacnzszc6y34j2i3nayyd4pkian5srklm5s061bw0m"; depends=[doParallel foreach iterators lme4 nlme Rcpp RcppArmadillo rintrojs shiny shinythemes survival]; };
   sla = derive2 { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; };
   slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; };
   slam = derive2 { name="slam"; version="0.1-40"; sha256="1di5qs8sz4bh47653kmjcdbdxir03k3nin8mh817ga9af7aa3b5g"; depends=[]; };
@@ -9811,8 +10090,8 @@ in with self; {
   smfsb = derive2 { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
   smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; };
-  smoof = derive2 { name="smoof"; version="1.5"; sha256="0k2h07gpldbdzn5fypzwqxn333s6n59flf8mcp4j04cfzidsswwv"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; };
-  smooth = derive2 { name="smooth"; version="1.9.9"; sha256="1wh0kv8b1a4ipy3j7715w1w2qn1p7ncbw30kcaj3bn6pmi8mw47q"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; };
+  smoof = derive2 { name="smoof"; version="1.5.1"; sha256="01jkldmxn86vmcmmz81mdlhpm1m3bddj4sv550a3b4wm1r3gddng"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; };
+  smooth = derive2 { name="smooth"; version="2.1.0"; sha256="1wv6n9ff7wv9m0pwphd8ymmrwgwg9dj9wnlzx1sazkg0r01bakdf"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; };
   smoothAPC = derive2 { name="smoothAPC"; version="0.1"; sha256="06lpjp408ggj27yw6mw7f96kxly7r8kzikbsdp0y1gzig1qq8nbs"; depends=[colorspace lmtest quantreg rgl SparseM]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
   smoothSurv = derive2 { name="smoothSurv"; version="1.6"; sha256="1s25gpih0nh8waw4r3iw53n3rc44mlzixkh4i2cykbg5rdrs8pnf"; depends=[survival]; };
@@ -9820,12 +10099,12 @@ in with self; {
   smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
   smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
   smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; };
-  smotefamily = derive2 { name="smotefamily"; version="1.0"; sha256="0jh8fmhn8c9v3c4lb3nniiagy1d4shfix4fr7jpyw4q69mh0vn0h"; depends=[]; };
+  smotefamily = derive2 { name="smotefamily"; version="1.1"; sha256="1qriyvfa6vgs7i8al7sipz0a887jzbw725kxsfa9mw22h6wm1ld8"; depends=[]; };
   sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; };
   smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; };
   sn = derive2 { name="sn"; version="1.5-0"; sha256="0fh7xjsfd2x8d9lbnss7raldh24b72b3pvcv7zqa1qprzg7zfr01"; depends=[mnormt numDeriv]; };
   sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; };
-  snakecase = derive2 { name="snakecase"; version="0.4.0"; sha256="0dklyqmn4w4wnj5hl88f4kpv3niazzswcxhyrk6zfxg0fcnp038n"; depends=[magrittr purrr stringr]; };
+  snakecase = derive2 { name="snakecase"; version="0.5.0"; sha256="0940ab0in6q5dibpwbw4q59f8r9wy3pryyhqkkivjn6fkb1hmsyd"; depends=[magrittr purrr stringi stringr]; };
   snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
   snht = derive2 { name="snht"; version="1.0.4"; sha256="01gdqicvazfd27f992j4ngv60sqywwplilqxwrsw21wi7y7c6cfv"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; };
   snipEM = derive2 { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; };
@@ -9837,11 +10116,13 @@ in with self; {
   snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
   snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; };
   snpRF = derive2 { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; };
+  snpReady = derive2 { name="snpReady"; version="0.9.3"; sha256="04k457nm4mipcddzcv1491mkw1gljzqh66xjwpfcm62bfd3p4xkr"; depends=[Matrix matrixcalc stringr]; };
   snpStatsWriter = derive2 { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; };
   snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; };
-  snplist = derive2 { name="snplist"; version="0.17"; sha256="0h419r4b62wdf63z12ai1n9zd3n36l9vgrbvlg1m72bbzrj5k8yz"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; };
+  snplist = derive2 { name="snplist"; version="0.18"; sha256="1x1l6z34b6k6325rjjmfa5nkbf5j472hrn9lyiw8s7h1wvf4gc1v"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; };
   sns = derive2 { name="sns"; version="1.1.2"; sha256="132zd57xb2y0nshw4lakf49r2mvvkv7j32f7l7hqrh91mw7wyqpr"; depends=[coda mvtnorm numDeriv]; };
   soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; };
+  social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; };
   sodavis = derive2 { name="sodavis"; version="1.0"; sha256="1mhmrg7c0chwjw117pzjya5y0ml8mm9ps5b64q5cjchlxr8900nx"; depends=[MASS mvtnorm nnet]; };
   sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; };
   sofa = derive2 { name="sofa"; version="0.2.0"; sha256="0jjc3r25qprxrhwwzx4b70i51v8gygxwx3x9d1zydx9hw1plk0mb"; depends=[httr jsonlite mime R6]; };
@@ -9850,25 +10131,25 @@ in with self; {
   softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; };
   soil_spec = derive2 { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[GSIF hexView KernSmooth pls sp wavelets]; };
   soilDB = derive2 { name="soilDB"; version="1.8-7"; sha256="0v0f9yngqjsagk5dw734aigwhld7fpadj6521bdk49j74ha0girr"; depends=[aqp Hmisc plyr raster reshape2 sp XML]; };
-  soilcarbon = derive2 { name="soilcarbon"; version="1.0.0"; sha256="068irig0q7xwhl7ry4w995v2n12zj6wqr1vj9pgbjy643xm0bkpa"; depends=[devtools ggplot2 openxlsx shiny]; };
+  soilcarbon = derive2 { name="soilcarbon"; version="1.2.0"; sha256="1gxq7np5xh3jcqbsf8xva4b82rv6rab2j23mbkc4pjs6nbnzvzba"; depends=[devtools ggplot2 openxlsx shiny]; };
   soilphysics = derive2 { name="soilphysics"; version="3.1"; sha256="11c094bqbwhggh0n3hdva1321gqzz2k1b7v3767wyyk1xpgzg98r"; depends=[boot MASS rpanel tkrplot]; };
   soilprofile = derive2 { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
   soiltexture = derive2 { name="soiltexture"; version="1.4.1"; sha256="1rvrji3xrs6smxcgggl6phnbx595wl1s2d8djnvzfca20k9q6a1q"; depends=[MASS sp]; };
-  soilwater = derive2 { name="soilwater"; version="1.0.2"; sha256="0rkyh7rcaapp1bxih88ivbaqnrig9jy32694jbg8z04b115hmdpm"; depends=[]; };
+  soilwater = derive2 { name="soilwater"; version="1.0.5"; sha256="11gal7hj73j82qx65krmzpmf0gpm41ph8hw70df46dbf4w23vvjn"; depends=[]; };
   solaR = derive2 { name="solaR"; version="0.44"; sha256="1waxi2zfns4dh1vpsl3khbgaw07icp4f1ax9l0pry9qipmk0nk3k"; depends=[lattice latticeExtra RColorBrewer zoo]; };
   solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; };
   solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; };
   solidearthtide = derive2 { name="solidearthtide"; version="1.0.2"; sha256="0274f7vyjymx6hd7ik68hznip57ni4cxp1bw7z91v1jzp3ch17rv"; depends=[]; };
   solr = derive2 { name="solr"; version="0.1.6"; sha256="0hlysi1yw4l98dcb1shznzrgia9pqzfj0p1hmnfz5gz2j64lf4h4"; depends=[assertthat httr plyr rjson XML]; };
   solrium = derive2 { name="solrium"; version="0.4.0"; sha256="1jjvwwgyq335mhc4pff2l604x1k2260zwxl6k6k9lfzgcgqylbbw"; depends=[dplyr httr jsonlite plyr tibble xml2]; };
-  solvebio = derive2 { name="solvebio"; version="0.4.1"; sha256="1mvbxrbpsx3k1k19w9y71yxfbigj08f9f6g6z22s1pgjwwslsaah"; depends=[digest dplyr httr jsonlite mime]; };
+  solvebio = derive2 { name="solvebio"; version="2.0.1"; sha256="06l50vbkcb496z19yvnb7xi5x9vx69ipf4sy28zaq4xy95b5vljc"; depends=[digest dplyr httr jsonlite mime]; };
   som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; };
   som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; };
   soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
   someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
   someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
   somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
-  sommer = derive2 { name="sommer"; version="2.8"; sha256="01q7glmxb8gccia23j0cfdf8fh5aap9yw4b5zkcal6r2kp29cd8v"; depends=[MASS Matrix]; };
+  sommer = derive2 { name="sommer"; version="2.9"; sha256="0145a7a63wrik1nc716br920mgys959a71w30hxny3nwkbsgw6ij"; depends=[MASS Matrix]; };
   somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
   sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; };
   sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; };
@@ -9879,7 +10160,7 @@ in with self; {
   soql = derive2 { name="soql"; version="0.1.1"; sha256="12wvbxy9xx140b7mga4ma7hkg4q6kv549gkq15fnf4dn8q43x8nf"; depends=[]; };
   sortinghat = derive2 { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[bdsmatrix MASS mvtnorm]; };
   sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; };
-  sos = derive2 { name="sos"; version="1.4-1"; sha256="13swys0bzcxsbr4vg0svs6ans7jdyphcyjix70brmmk6l309y8c0"; depends=[brew]; };
+  sos = derive2 { name="sos"; version="2.0-0"; sha256="0fwv76m0iihzy60kglsdjnlp6800qsll6h0v2435a50lcr53jj8g"; depends=[brew]; };
   sos4R = derive2 { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[RCurl sp XML]; };
   sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; };
   sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; };
@@ -9890,17 +10171,18 @@ in with self; {
   sourcetools = derive2 { name="sourcetools"; version="0.1.6"; sha256="0l8c6fql82cb246qh7hfgxb4s35qn0qfgy6dzvkx0zkz1cpqvx69"; depends=[]; };
   sp = derive2 { name="sp"; version="1.2-5"; sha256="09yydnacp33yx0kn537k96fjlbf75fjafqfknpa5gvci4l888bqd"; depends=[lattice]; };
   sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
-  sp500SlidingWindow = derive2 { name="sp500SlidingWindow"; version="0.1.0"; sha256="0m4fg7vwscm1575zq7s8sycr742lbwwhcr7s4gm4vcawz9sfvhkl"; depends=[dplyr FinCal gdata lubridate magrittr]; };
   spAddins = derive2 { name="spAddins"; version="0.1.7"; sha256="1ci246770j40zzmsjwjqwkwi6b2w5qwb0n4f4wah5rjf6zjwkd5r"; depends=[rstudioapi]; };
-  spBayes = derive2 { name="spBayes"; version="0.4-0"; sha256="1qnn2jpc22594zvqr99m3r8sl5cab1khbcrk8w6i2s91kbwc0qyh"; depends=[abind coda Formula magic]; };
+  spBayes = derive2 { name="spBayes"; version="0.4-1"; sha256="1cypl3kvcr7nwdkq59zpdhkasz0z5r2gk8hr6wf1a1992k8c33ag"; depends=[abind coda Formula magic]; };
   spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.1"; sha256="0pcfy3w2aqld10w9jdcizcy0rdpmdaj8z7qwpam4s2f6sap1q26b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
+  spData = derive2 { name="spData"; version="0.2.2"; sha256="1997ilf5r52z8k5xqmqqxzxiiiirhwwcmydlfyai3snmn13apc78"; depends=[]; };
   spMC = derive2 { name="spMC"; version="0.3.8"; sha256="1glkyv6wmh766ssdlm4z7dck32r0284kwah0ksmmkwxkfw1qx7xb"; depends=[]; };
+  spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; };
   spTDyn = derive2 { name="spTDyn"; version="1.0"; sha256="0yrnbf9g1n1hrrra2vp6412wfky1bhy3b6raif9k82xvi9p9m6pz"; depends=[coda sp]; };
   spTest = derive2 { name="spTest"; version="0.2.4"; sha256="1pfyrim6m0pcwsxpin9z09569yzil49hsz5mndp723c9wkk8vn5h"; depends=[geoR sp]; };
   spThin = derive2 { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; };
   spTimer = derive2 { name="spTimer"; version="2.0-1"; sha256="15yrbxx44cqphhr71b5hiimwwjiwwpzny16xjb87nn2lc4mb53by"; depends=[coda sp]; };
   spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
-  spaMM = derive2 { name="spaMM"; version="2.1.0"; sha256="1nr9rclwhi76npsjq00rk9n1f60icmsdq50ykpxyhwqwhglr2dsp"; depends=[MASS Matrix nlme nloptr proxy Rcpp RcppEigen]; };
+  spaMM = derive2 { name="spaMM"; version="2.1.6"; sha256="188qds6pxa7hl1p7rg6zmlvyxfx7pfwwgcs2as3naws2ipshlxh8"; depends=[MASS Matrix nlme nloptr proxy Rcpp RcppEigen]; };
   spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; };
   space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
   spaceExt = derive2 { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; };
@@ -9910,20 +10192,21 @@ in with self; {
   spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; };
   spacyr = derive2 { name="spacyr"; version="0.9.0"; sha256="1d2bfsmkpb3aqfqiiqdxmw85aqdq7880s0f81vs0jy6i64an90x6"; depends=[data_table reticulate]; };
   spaero = derive2 { name="spaero"; version="0.2.0"; sha256="0srkah89z23j30y2smlnyhf97mm123apma8vgmgfarbx188bkwpn"; depends=[]; };
-  spam = derive2 { name="spam"; version="1.4-0"; sha256="0c278q2rmrxwhax58n8987j3rlg7c8bnxnn8r96y9kv4hjj1pjsk"; depends=[]; };
+  spam = derive2 { name="spam"; version="2.1-1"; sha256="1j6yppyf3sngpmq99w0d3j8wlrmjsfsixw902rl6339w985b1lxc"; depends=[dotCall64]; };
+  spam64 = derive2 { name="spam64"; version="2.1-1"; sha256="0l34z630q749b27w033n504x6lspgz1d8jrw4cnzs6jkrlz6paw7"; depends=[]; };
   spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
-  spant = derive2 { name="spant"; version="0.3.0"; sha256="0q5sc662w6mipwzsdb2qcpbp5yzck8k088is7hmaw5ik87xxiimd"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd]; };
+  spant = derive2 { name="spant"; version="0.4.0"; sha256="0cfk2dxwzibxm87fkhcdl82invxvw1hryvf5mk6lvhsx88mswjsc"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd]; };
   sparc = derive2 { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
   sparcl = derive2 { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
   spareserver = derive2 { name="spareserver"; version="1.0.1"; sha256="094q5i6v4v37hzfdyps8zni394z312r802hl04jw0xzzps922rq4"; depends=[assertthat httr pingr]; };
-  spark = derive2 { name="spark"; version="1.0.1"; sha256="03viih0r7bpv6zkm5ckk0c99lf2iv0fkgrzkbs1gg7ki9qyxji8c"; depends=[magrittr]; };
+  spark = derive2 { name="spark"; version="2.0.0"; sha256="062i9qah9zws6p555pk1b42qmd04l8sx22h71skpx76vgb0lsn83"; depends=[clisymbols]; };
   spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; };
   sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; };
   sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; };
-  sparklyr = derive2 { name="sparklyr"; version="0.5.6"; sha256="1qgiyxn8q1hf3lpjm3cf2xw5f94xr0dcbq0wlndvyffvlk7vvmsd"; depends=[assertthat base64enc config DBI dbplyr digest dplyr httr jsonlite lazyeval rappdirs readr rlang rprojroot rstudioapi shiny withr]; };
+  sparklyr = derive2 { name="sparklyr"; version="0.6.2"; sha256="0lr487y5gb53yh8in5lhpwq9fnmagknzmj2yx02rgmig8qd4974y"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr httr jsonlite lazyeval rappdirs readr rlang rprojroot rstudioapi shiny withr xml2]; };
   sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
   sparkwarc = derive2 { name="sparkwarc"; version="0.1.1"; sha256="07b66f12fz19042kj7d9p32j9sy3103zvil36xkf21hm9iyg6xph"; depends=[DBI sparklyr]; };
-  sparr = derive2 { name="sparr"; version="0.3-8"; sha256="1vsfk769f6227wrxfpq3qbs9h8farfnmgq94pl2ra4hgvpvygsmr"; depends=[MASS rgl spatstat]; };
+  sparr = derive2 { name="sparr"; version="2.1-11"; sha256="1ypfij8fwsj7nf3g5arc9hrhf1fcwwinhrsbfmgwqs29xl3m9m2g"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
   sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; };
   sparseFLMM = derive2 { name="sparseFLMM"; version="0.1.1"; sha256="03j1rvgbzmscs043iyzblfk601bv2vf90sfbii14yqm0mrf27r28"; depends=[data_table MASS Matrix mgcv refund]; };
   sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3"; sha256="13v8zia1i0k6faiz6faikqmlrp16riwv637yygjq2cq8fcm75pyf"; depends=[Matrix Rcpp RcppEigen]; };
@@ -9934,8 +10217,9 @@ in with self; {
   sparseSVM = derive2 { name="sparseSVM"; version="1.1-2"; sha256="1bv9ipfs275vr1hmz7g7w4rimvbkg15wjh3xj3cx1zam91k384k9"; depends=[]; };
   sparsebn = derive2 { name="sparsebn"; version="0.0.4"; sha256="0msd12gnxijkgazg4dyfqfravsacskbshp00fa4g2vkzmsjai1y0"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; };
   sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.4"; sha256="0473pxzb95ygvhwkvs97d0zmfwlmxnxn3xp125bycv3ns3rgpssy"; depends=[Matrix nnet]; };
+  sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.4"; sha256="1sa3yssncbpx8yid5wrnxdq7jl3hy5rskyh60v5x592ijcb2mif0"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; };
   sparsenet = derive2 { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; };
-  sparsepp = derive2 { name="sparsepp"; version="0.1.1"; sha256="0wzj4z333ns18a1byii601fp46dlq9q4dbprkc95yl30xpzmdx0b"; depends=[]; };
+  sparsepp = derive2 { name="sparsepp"; version="0.2.0"; sha256="0ibadyv7lchxw3y1dspjnbhc4pin4dxwqj9rdrdxfbvlx0i3jgxr"; depends=[]; };
   sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; };
   sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; };
   sparsesvd = derive2 { name="sparsesvd"; version="0.1-1"; sha256="09qpky8vxkpycj6c4vn3nqlidhblgksh3n6w8sww4yhn0pm3rzn5"; depends=[Matrix]; };
@@ -9954,15 +10238,17 @@ in with self; {
   spatialEco = derive2 { name="spatialEco"; version="0.1-7"; sha256="0l8nshsapbgfzli1rpls3j3s8gyqy2nzsgqf2x4v1r699r419i5k"; depends=[cluster MASS RANN raster RCurl rgdal rgeos rms SDMTools sp SpatialPack spatstat spdep yaImpute]; };
   spatialTailDep = derive2 { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; };
   spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; };
+  spatialkernel = derive2 { name="spatialkernel"; version="0.4-23"; sha256="0kvhirh7afk2gfy21pa6117yk6kzbaf2dxfkr1ax3b554rnrv4p0"; depends=[spatstat]; };
   spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; };
   spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
   spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; };
-  spatstat = derive2 { name="spatstat"; version="1.51-0"; sha256="00lgx9q3bhffw70ngallnp2w8n7zbnqzxn9bx3hi5m16pxf9d97f"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_utils tensor]; };
+  spatstat = derive2 { name="spatstat"; version="1.52-1"; sha256="17p7pfdi5cxaafbkwxxfnrfpxniymvxqvlp2icy560rs6x90jjjl"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_utils tensor]; };
   spatstat_local = derive2 { name="spatstat.local"; version="3.5-6"; sha256="0yb3k2szk2z61h2scyj4h78y13qvbd9b1hvwp9n2983w77y0k5dz"; depends=[spatstat spatstat_utils tensor]; };
-  spatstat_utils = derive2 { name="spatstat.utils"; version="1.6-0"; sha256="097xjylngcjarb4zrv8fi2zs8iss5s7i55733g3jwx9jyivsiic7"; depends=[]; };
+  spatstat_utils = derive2 { name="spatstat.utils"; version="1.7-0"; sha256="17s092dmq6n9j323q48brngx062308090lrgdkf4fzrwl9f2kp77"; depends=[]; };
   spatsurv = derive2 { name="spatsurv"; version="1.1"; sha256="0fakhz2qc5vb7ym2ik7hilv8g5fn3z7s16hzngq1n591xza5b74g"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
-  spbabel = derive2 { name="spbabel"; version="0.4.7"; sha256="05iqzn0cl7alswdz923sskcsizsifmjf8bwn2mjsjhp2hqlr5qmv"; depends=[dplyr sp tibble]; };
+  spbabel = derive2 { name="spbabel"; version="0.4.8"; sha256="1f0lradf7a3fjkdhbviw24awpqj1pzw1wfvigrqhnmf0jjw3nng3"; depends=[dplyr sp tibble]; };
   spc = derive2 { name="spc"; version="0.5.3"; sha256="0y730vh04j4cyz5zfyx4xqfw07ic1l93197640q543adnmil40vf"; depends=[]; };
+  spc4sts = derive2 { name="spc4sts"; version="0.2.1"; sha256="1mwgqj9gph3fzvmqp03khi541g13ljx8xn09ji9qcjl6j032rk2p"; depends=[gridExtra rpart]; };
   spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; };
   spcosa = derive2 { name="spcosa"; version="0.3-6"; sha256="0zj5yr0by1pbixs4z6w3c6yr1k55k5gqmvjkwiq2gsgq00vs7q94"; depends=[ggplot2 rJava sp]; };
   spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
@@ -9984,16 +10270,16 @@ in with self; {
   spectral_methods = derive2 { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; };
   spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
   speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; };
-  spef = derive2 { name="spef"; version="1.0-3"; sha256="18hwsk1gkkwdn0c9f8kvrbkimkxnp4wi1d7xj1002a5x5pyvrkvs"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; };
+  spef = derive2 { name="spef"; version="1.0-5"; sha256="0hbb2vmgx5x135kvb5c525q78m8ccpv4j6hv16v31zka2fjwcj8z"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; };
   speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
   spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; };
   sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; };
-  sperrorest = derive2 { name="sperrorest"; version="2.0.0"; sha256="101q7fj3smf21m1g7kwrqlycqd7c8rdbrvy166dhzw1ygl8ha168"; depends=[doFuture foreach future gdata magrittr pbapply pbmcapply purrr ROCR rpart stringr]; };
-  spex = derive2 { name="spex"; version="0.3.0"; sha256="1ikq7k6mxv9m2szr2s471fd3bq00l25sq4jljyfk5zazzalpwzcn"; depends=[quadmesh raster sp]; };
+  sperrorest = derive2 { name="sperrorest"; version="2.0.1"; sha256="0ff5ga1fi7j265940wshd4pjzfbr2maw6dican0sx81wnhs3lniy"; depends=[doFuture foreach future gdata magrittr pbapply pbmcapply purrr ROCR rpart stringr]; };
+  spex = derive2 { name="spex"; version="0.4.0"; sha256="0b2zcpbjr8lqfsmwvmy4lp88xz16v7fyqx1yv10yhcgxlgw0yw8p"; depends=[quadmesh raster sp]; };
   spfrontier = derive2 { name="spfrontier"; version="0.2.3"; sha256="0br54kkva4m3yyqfjh3cs5wf4kk3ax6yg0h8cl5qiy38dvssa5qd"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; };
   spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; };
   spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; };
-  spgs = derive2 { name="spgs"; version="1.0"; sha256="1f75dvp6m5w5phg158ykvl4myvw6q4vysb2pc3bgm0f9fpcadfip"; depends=[]; };
+  spgs = derive2 { name="spgs"; version="1.0-1"; sha256="1jabgcc8bd6kikcd5rv9xczbg6r52mwyc68r8filn5i0gva4by57"; depends=[]; };
   spgwr = derive2 { name="spgwr"; version="0.6-31"; sha256="021h5qzz7gifxhripyd3alw6z7a9rj4r7c23dr7vk0szyd9shmgl"; depends=[sp]; };
   sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
   sphet = derive2 { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[Matrix nlme sp spdep]; };
@@ -10018,7 +10304,7 @@ in with self; {
   spmoran = derive2 { name="spmoran"; version="0.1.1"; sha256="1l5rigjvh1swj203fh410gsi3vdw42z1544g47jx9cs4s0273saa"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; };
   spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; };
   spocc = derive2 { name="spocc"; version="0.7.0"; sha256="0ar107c7snbh1iaib3xddng88861h3gc56whicx5krl3zf2xgjqa"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; };
-  spongecake = derive2 { name="spongecake"; version="0.1.1"; sha256="1bf2106ik4dp9xl68s8wzj5w6yl3syx8i39zxpp24rywb6f2i8n0"; depends=[ggplot2 jpeg magrittr plyr]; };
+  spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; };
   sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
   sppmix = derive2 { name="sppmix"; version="1.0.1"; sha256="0l9hmjrb0yl4c6y9l39h6kggxda9qz6xspf719hjc30zq76h4k1a"; depends=[fields ggplot2 matrixcalc mvtnorm Rcpp RcppArmadillo rgl sp spatstat USAboundaries]; };
   spray = derive2 { name="spray"; version="1.0-3"; sha256="0zy2dwzk33cwch0pdhhsyiy169z39iij3zvvjg81gxa29pq0h1ab"; depends=[magic partitions Rcpp]; };
@@ -10034,7 +10320,7 @@ in with self; {
   spt = derive2 { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
   sptm = derive2 { name="sptm"; version="16.7-9"; sha256="0x8824zccrwdl38jbhq8skzcvxb7a3b1zggkd7gmyjd94xvxll9k"; depends=[kyotil survey survival]; };
   spuRs = derive2 { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[lattice MASS]; };
-  spup = derive2 { name="spup"; version="0.1-0"; sha256="1dfdxh45db91rmdws4pq1kbsbcjczz98fbfcmm4vlr0vbvisy9bj"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
+  spup = derive2 { name="spup"; version="0.1-1"; sha256="0iwmydvd6bwpyr4q3hk2hlvgrvpzrdhnbq0frxadwcaaap75pfv0"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
   sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; };
   sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; };
   sqlscore = derive2 { name="sqlscore"; version="0.1.2"; sha256="0pl4nf59b8jy8rkqs2z684lxfqh01284h3cx97a1igpy4qqj712b"; depends=[dbplyr]; };
@@ -10069,7 +10355,7 @@ in with self; {
   stable = derive2 { name="stable"; version="1.1.2"; sha256="11irpn0qfblzskdr71991jlmdrbqqqpszppn5pii3lr5hflqqr1d"; depends=[rmutil]; };
   stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; };
   stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; };
-  stabs = derive2 { name="stabs"; version="0.6-2"; sha256="0alzdj3lciggi9g3fj2lgdjb60dz6077nn4nb4wwd5nv7walp4sl"; depends=[]; };
+  stabs = derive2 { name="stabs"; version="0.6-3"; sha256="17sa0sjxf6h7gx1ga1pxhv17yrz3qisaivbf5cbc3asvshhswqg9"; depends=[]; };
   stackoverflow = derive2 { name="stackoverflow"; version="0.1.2"; sha256="1psw96iscgsx11drmcnh0yjg2jjcaa4akmywh337i6gbgam8kj61"; depends=[]; };
   stacomiR = derive2 { name="stacomiR"; version="0.5.3"; sha256="0jlpg2i304xzfg418x5x9kwm2iawp2jc0q5iahmmy0kiz7283zjr"; depends=[dplyr ggplot2 gWidgets gWidgetsRGtk2 Hmisc intervals lattice lubridate magrittr mgcv RColorBrewer reshape2 RGtk2 RODBC RPostgreSQL sqldf stacomirtools stringr xtable]; };
   stacomirtools = derive2 { name="stacomirtools"; version="0.5.2"; sha256="1a33yy594699b05lb32zwx6yhmvxzwly6vvf8xzqg6lac64p26r5"; depends=[RODBC xtable]; };
@@ -10084,16 +10370,17 @@ in with self; {
   startup = derive2 { name="startup"; version="0.6.1"; sha256="1hxncw08sw9278vdpg8q1gmg2y3crkj9h8cbvf77pgm3jzswpbbc"; depends=[]; };
   startupmsg = derive2 { name="startupmsg"; version="0.9.4"; sha256="1r9dqrfznsrj7s11m56hkzgfnw3qcgzh07pqipl007zr2av9xwqw"; depends=[]; };
   statGraph = derive2 { name="statGraph"; version="0.1.0"; sha256="13wfylb92lzw08fn3p000v87abs7ij2rb82np1rkgsl8w2kica73"; depends=[igraph MASS]; };
-  statar = derive2 { name="statar"; version="0.6.4"; sha256="16jahn6skj4d1c8yg4m9iwifgl5i4bmqq7d2k9vcfnj21ih6fcvr"; depends=[data_table dplyr ggplot2 lazyeval matrixStats stringr tidyr]; };
+  statar = derive2 { name="statar"; version="0.6.5"; sha256="0vmdrdq6db16vfl0rb39x8yfnbdzpcrvywfgp4lss6jby3nvjwd9"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr]; };
   statcheck = derive2 { name="statcheck"; version="1.2.2"; sha256="0bcv8klp75q8hlmwhax9lxx9i0kbhsz8442acbhxh5fn2pn2x9jm"; depends=[ggplot2 plyr]; };
   statcomp = derive2 { name="statcomp"; version="0.0.1.1000"; sha256="0ac4s8a955ka0rs2a3k93aq2cxzrc48ai0sl9kn4yaqcw1arv2ap"; depends=[zoo]; };
   statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
+  statesRcontiguous = derive2 { name="statesRcontiguous"; version="0.1.0"; sha256="0yzi6ycfj4cc4q0zzzckdz65wp9m4yx6fi7kp9nssj9pj6a8xlrp"; depends=[dplyr magrittr sf]; };
   stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; };
   statip = derive2 { name="statip"; version="0.1.4"; sha256="1vy3433rrifcix1m28lizbik3qrl2krdldbvmqfyp046xxf2inc1"; depends=[bazar dplyr]; };
   statisticalModeling = derive2 { name="statisticalModeling"; version="0.3.0"; sha256="018ap1hbv4m6y0c71f807apbb9bhr64kcfrn4w8ahhb2520l4mf8"; depends=[ggplot2 lazyeval magrittr mosaic rpart]; };
   statmod = derive2 { name="statmod"; version="1.4.30"; sha256="07v4x8af60alcw6vbiwf5fp25bhra61kvxz9kqx64lszm0i1fb4x"; depends=[]; };
   statnet = derive2 { name="statnet"; version="2016.9"; sha256="1j5z7awvac3sb66ma1lrc9j23m6hmzqfnqxc0znsm36h324y3y6s"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
-  statnet_common = derive2 { name="statnet.common"; version="3.3.0"; sha256="190gwkbzd1qh3d7v1xi13snp83jkpvsl7x4ac9x1pxybn3kw856p"; depends=[]; };
+  statnet_common = derive2 { name="statnet.common"; version="4.0.0"; sha256="0yw6l5b4qv0jqlg4zyczas7m12a5pyqghs6ydxy2f6v6vxkijvi0"; depends=[]; };
   statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; };
   statprograms = derive2 { name="statprograms"; version="0.1.0"; sha256="1jm8vnzccx34rhypkc5brx52k0f0g4z9cckzib43i5fcqd4skib6"; depends=[]; };
   statquotes = derive2 { name="statquotes"; version="0.2"; sha256="05qsffbgpgzrhk2nbyfa4a63ad06aj09bzcc11h9dl3sdz6jj7gr"; depends=[stringr tidytext wordcloud]; };
@@ -10112,7 +10399,7 @@ in with self; {
   stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
   stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; };
   sticky = derive2 { name="sticky"; version="0.5.2"; sha256="0yib9llvlxyzcwam3qd3wxz91mdacvh4v888ifxwjhhjihffqvbj"; depends=[]; };
-  stilt = derive2 { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; };
+  stilt = derive2 { name="stilt"; version="1.1.0"; sha256="0qap66gl1iabwvar4fw7r159slmgzriljn4ikp3pas65y0pw2dz6"; depends=[fields]; };
   stinepack = derive2 { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; };
   stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; };
   stm = derive2 { name="stm"; version="1.2.2"; sha256="1kv4plz9i446s8vdrh71lk49gvvl6v5dviym4qh63iwkipgz2fy1"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; };
@@ -10120,7 +10407,7 @@ in with self; {
   stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; };
   stmgp = derive2 { name="stmgp"; version="1.0"; sha256="1v6ahg4icyrz8p0lfiyi2x90allhjvcq8rycinas5mffg7xgpv7d"; depends=[MASS]; };
   stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; };
-  stoRy = derive2 { name="stoRy"; version="0.1.0"; sha256="03i8w9b817vdgs3c9nhi770027sik8f2x5cwq33n4q1lb1xdysyw"; depends=[R6]; };
+  stoRy = derive2 { name="stoRy"; version="0.1.1"; sha256="0ymk5skzsga0jr9chl52njlb23803a7cij0iaw6crssdf3sk226s"; depends=[data_tree R6]; };
   stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; };
   stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
   stochvol = derive2 { name="stochvol"; version="1.3.2"; sha256="08vn2ifbb7yc3b7c5pgklp9wr98vx1gv60gpsqba32xr6ijn49vd"; depends=[coda Rcpp RcppArmadillo]; };
@@ -10130,9 +10417,8 @@ in with self; {
   stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.0"; sha256="1pxkb0ijx04c4bk6szxhj8lxq6x76m8pyhxpf8xq63h4gh57fxh3"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; };
   storr = derive2 { name="storr"; version="1.1.1"; sha256="0n2shzv7hblff7wrh7ls3q5zp97pisz935laqmyg201vhlypnqfi"; depends=[digest R6]; };
   stosim = derive2 { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[Rcpp tcltk2]; };
-  stplanr = derive2 { name="stplanr"; version="0.1.8"; sha256="1y8x0ybggfx2fyizwq49q1ak989kqih9gih5h20s75mz7al7zn72"; depends=[curl doParallel dplyr foreach geosphere httr igraph jsonlite lubridate maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos RgoogleMaps sp stringi stringr]; };
-  stpm = derive2 { name="stpm"; version="1.6.6"; sha256="0vzl405hc5y97n9ixy20js50q5a6s7laaj1w9avn5dl2rgwk6xva"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; };
-  stpp = derive2 { name="stpp"; version="1.0-5"; sha256="1444dbwm0nyb5k8xjfrm25x984a7h9ln2vddrwjszfpmscv0iwm1"; depends=[KernSmooth spatstat splancs]; };
+  stplanr = derive2 { name="stplanr"; version="0.1.9"; sha256="171m2d22wmcchh52sddd8rsna37718019cwb30d2j3zm8wcairgn"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sp stringi stringr]; };
+  stpm = derive2 { name="stpm"; version="1.6.8"; sha256="0gifkrpp8n4r31i4dfvjfq7w0l6jfid43i94ygqwwv0ca583aw4y"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; };
   stppResid = derive2 { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; };
   strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
   strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; };
@@ -10140,7 +10426,6 @@ in with self; {
   stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; };
   strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; };
   stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; };
-  stratigraph = derive2 { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; };
   stratvns = derive2 { name="stratvns"; version="1.0"; sha256="1bw9l389lxiji4h7hrsshf24v135h6la9dg3xxjly53d4fi56ifh"; depends=[MultAlloc Rglpk sampling snowfall stratification]; };
   straweib = derive2 { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
   stream = derive2 { name="stream"; version="1.2-4"; sha256="1xk9lnvf9xld74z4sxbwpgxl7cbni88cjyxqzxr0r9pn9vcpwima"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
@@ -10149,7 +10434,7 @@ in with self; {
   stremr = derive2 { name="stremr"; version="0.4"; sha256="0n8ickmzjqlxwrz8dsphh1nsbnsgp4mnwm52i5ji099ps5292f65"; depends=[assertthat data_table pander R6 Rcpp rmarkdown speedglm stringr zoo]; };
   stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
   stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; };
-  stringdist = derive2 { name="stringdist"; version="0.9.4.4"; sha256="1qngrhin1kqkjkfla7hp7ch0sfzi4nhaxgyzskmy51sz4llq5n4p"; depends=[]; };
+  stringdist = derive2 { name="stringdist"; version="0.9.4.6"; sha256="0j5b7hr53nr9xq44famkpwzi4khix93ffani5pwldqkf8bpdvhci"; depends=[]; };
   stringformattr = derive2 { name="stringformattr"; version="0.1.1"; sha256="16kkmb933v8pzc4gwz4x2nm51sj82slwpxmmn6p6p8dq5nfzmx5q"; depends=[stringr]; };
   stringgaussnet = derive2 { name="stringgaussnet"; version="1.1"; sha256="161fi78cd7yddbcq71z3fgx1q2sacg1n1ggrkrqz17icwzviqrh5"; depends=[AnnotationDbi biomaRt GO_db httr igraph limma org_Hs_eg_db pspearman RCurl RJSONIO simone VennDiagram]; };
   stringi = derive2 { name="stringi"; version="1.1.5"; sha256="1wh20is24lmzhcd9487ckv7r19009fyz4is3ianp3ky69vy8a7k5"; depends=[]; };
@@ -10159,9 +10444,9 @@ in with self; {
   striprtf = derive2 { name="striprtf"; version="0.4.5"; sha256="002whpmzhqw8bhqbdilfmlz0q4hgh9yy4ad1kly6lngx2n3p7db0"; depends=[magrittr Rcpp stringr]; };
   strucchange = derive2 { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; };
   structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; };
-  structree = derive2 { name="structree"; version="1.1.3"; sha256="1apiqbmmvqmn0nv5cfflfqlyh0108fvy8sg9gg8z6d6bfqkd4rhb"; depends=[mgcv penalized]; };
+  structree = derive2 { name="structree"; version="1.1.5"; sha256="0m14jzhmkfn8dpxjzj8xh9zf6cggqj3awnfz7zh1xlkkka91jz8d"; depends=[lme4 mgcv penalized]; };
   strum = derive2 { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; };
-  strvalidator = derive2 { name="strvalidator"; version="1.9.0"; sha256="0srmld1xwvf2cki79c2mhwinal2yz6yar5k0b05a9adm70zb0swr"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 MASS plyr RGtk2 scales]; };
+  strvalidator = derive2 { name="strvalidator"; version="2.0.0"; sha256="03f7clhs1hda3lkard7lbx4pfyqvhwm35r3d9sz2yksp5s78wbjk"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 gWidgets2RGtk2 MASS plyr RGtk2 scales]; };
   stsm = derive2 { name="stsm"; version="1.9"; sha256="18ypmkd7l7m7qkahb0nqf8f1m8g4irxlw48v2ms0dq1bsnhbzx7j"; depends=[KFKSDS]; };
   stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
   stubthat = derive2 { name="stubthat"; version="1.2.0"; sha256="0ib1jvrhxahlpaqai0zg49jr2iwn04c0iimfgvhvx3hyp9qhhbll"; depends=[testthat]; };
@@ -10170,19 +10455,22 @@ in with self; {
   subcopem2D = derive2 { name="subcopem2D"; version="1.2"; sha256="1yrjqg3y6i5m6k0zljq1p1pciicmc1vig3qd0wxaicz708rbp3yq"; depends=[]; };
   subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; };
   subgroup = derive2 { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
+  subgroup_discovery = derive2 { name="subgroup.discovery"; version="0.2.0"; sha256="17z49l26sfly3fln2z1x9vd6a6rsxn65z9lcb8kjylngm5s63rqj"; depends=[]; };
   sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; };
-  subniche = derive2 { name="subniche"; version="0.9.6"; sha256="1xad4ai8sg5xakdrpl5kcwimh13pzi5ifkhjiqa9jgjpyjlsbbgb"; depends=[ade4]; };
-  subplex = derive2 { name="subplex"; version="1.2-2"; sha256="10g1hv41w9g0pzj0k071zb3wglk7jl5p99v5maqpkr2v75mfkyry"; depends=[]; };
+  subniche = derive2 { name="subniche"; version="0.9.7"; sha256="1jsdcaf6d38j7c0ppjyilj0jd2dbpdldw6w4prmsbmx8mh7lplww"; depends=[ade4]; };
+  subplex = derive2 { name="subplex"; version="1.4-1"; sha256="1imfdiw8r7kb2i0ir7z69cwz2ai7a3nr248m4pqacad2m9hvkdwl"; depends=[]; };
   subprocess = derive2 { name="subprocess"; version="0.8.0"; sha256="0hvja2gacr84izlsvxcbw1xmm57ycx0n9k5yn62p1v40d135wk9p"; depends=[]; };
   subrank = derive2 { name="subrank"; version="0.9.7"; sha256="0f1m4zk7s49f3kg8gz8g5af8r1x00m4zybdy5fmzvgnx9cx6crkc"; depends=[]; };
   subscore = derive2 { name="subscore"; version="2.0"; sha256="1vscmzw6ama2kc7ic6b2rfbbczcpyhp0m4dd5khg9vkyihww5b5h"; depends=[CTT irtoys]; };
-  subselect = derive2 { name="subselect"; version="0.12-6"; sha256="157vkfxy570sl1q9nylpw0vs51h39zjx0m2yxiwdgvzvd6h4s3kr"; depends=[corpcor ISwR MASS]; };
+  subscreen = derive2 { name="subscreen"; version="0.2.2"; sha256="08s8ys0ban80xbyfzjimbgld4622c5bn0qwjmsa7g0dn5ss3ccq9"; depends=[data_table plyr]; };
+  subselect = derive2 { name="subselect"; version="0.13"; sha256="1zvvh6xcvbb05hxmyjwg80j2zhmqrlsjbj396k5s0kazkyvrwdyg"; depends=[corpcor ISwR MASS]; };
   subsemble = derive2 { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; };
   subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; };
   subspaceMOA = derive2 { name="subspaceMOA"; version="0.6.0"; sha256="1q2n4q87zaxwaak77b6rff97n9sx6nflshqf73r2q8hflfs3sxv3"; depends=[fields ggplot2 gridExtra magrittr rJava shiny stream streamMOA]; };
   subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
   sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
   sudokuAlt = derive2 { name="sudokuAlt"; version="0.1-11"; sha256="1hv9d99ir1xz6p0arxr77dv5qb45sr8jhapm6wf755l7pxlqqklq"; depends=[magrittr]; };
+  sugrrants = derive2 { name="sugrrants"; version="0.1.0"; sha256="12dqayn8hwbdqqn13v4zywn2h96q1wya4g04qs586qm6wx4p64nk"; depends=[dplyr ggplot2 lubridate magrittr purrr readr rlang tidyr timeDate]; };
   summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; };
   summarytools = derive2 { name="summarytools"; version="0.6.5"; sha256="1ddvwn0rfyrlfar1kpwggxnpp9dpswdy8v5alcv3kanp540hnmb1"; depends=[Hmisc htmltools matrixStats pander pryr rapportools rstudioapi xtable]; };
   sunburstR = derive2 { name="sunburstR"; version="1.0.0"; sha256="0n6nw35n8c453nminv0kzpfxxhwhh6hdmjja0wg1m2kpai8aj2kw"; depends=[d3r dplyr htmltools htmlwidgets]; };
@@ -10200,6 +10488,7 @@ in with self; {
   support_BWS2 = derive2 { name="support.BWS2"; version="0.1-1"; sha256="1jay1ak8242vn9a0ippfdd48vdxqqz9j8frbgf5ncffdmzzn1n21"; depends=[]; };
   support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; };
   supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; };
+  sure = derive2 { name="sure"; version="0.1.2"; sha256="0dgilavv8hq9szqz9km4fyqkc06spb5v37db5fs70ybxcisqg99f"; depends=[ggplot2 goftest gridExtra]; };
   surface = derive2 { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; };
   surrosurv = derive2 { name="surrosurv"; version="1.1.15"; sha256="0ns189h33akzl8rs53yg9g1975133wv0csn5cg0lp26b2sh9qp1x"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; };
   surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-5"; sha256="0pk70q33il9clz0ikzx1cypg5ygnsqp5hgk67xczzbidksjzs4dn"; depends=[flexsurv plotrix survival]; };
@@ -10207,7 +10496,7 @@ in with self; {
   survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; };
   survAccuracyMeasures = derive2 { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[Rcpp RcppArmadillo survival]; };
   survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
-  survHE = derive2 { name="survHE"; version="1.0.4"; sha256="1iz2ji8scw69ajwdffwbs0c5d4j5ixv4bav2jcj17cjfdzxm2vsd"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; };
+  survHE = derive2 { name="survHE"; version="1.0.6"; sha256="128pjnm1m12qqhnz2izwmir64m99389qjr73vcqr19dgbkbgv28c"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; };
   survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; };
   survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; };
   survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; };
@@ -10219,11 +10508,12 @@ in with self; {
   survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
   survey = derive2 { name="survey"; version="3.32-1"; sha256="0law5dw2kprbkclrq0xj5vy6qcbx4i0rmasmsawyl35q4y1v01ny"; depends=[lattice Matrix survival]; };
   surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; };
-  surveydata = derive2 { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[plyr stringr]; };
+  surveydata = derive2 { name="surveydata"; version="0.2.0"; sha256="1iwhjhazfy38dbcj224kz3zbw2nvpq01ry54wmmkg9d0n6mb02h4"; depends=[dplyr magrittr plyr purrr stringr]; };
   surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
   surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; };
   surveyplanning = derive2 { name="surveyplanning"; version="2.8"; sha256="0p4yigwypy2hl747qvm0qm0q7vp7p8af0yapqi7aadbbpwyy9z7h"; depends=[data_table laeken]; };
   survidm = derive2 { name="survidm"; version="0.1.0"; sha256="0jpbnvwx7ilb3z10xg5y8palbk05ax1ad1qlz319rrblx0fxi75r"; depends=[doParallel doRNG foreach KernSmooth np survival]; };
+  survivALL = derive2 { name="survivALL"; version="0.9.0"; sha256="1igilpba178za7cpp7h7w690w90vxmd24mxiw65wlyr0xvyn357b"; depends=[Biobase broom cowplot data_table desiR ggplot2 ggthemes magrittr pander png readr survcomp survival survsim testthat viridis]; };
   survival = derive2 { name="survival"; version="2.41-3"; sha256="07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk"; depends=[Matrix]; };
   survivalMPL = derive2 { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
@@ -10231,6 +10521,7 @@ in with self; {
   survminer = derive2 { name="survminer"; version="0.4.0"; sha256="0appa7difd87g1cggmkj1vwarcqvq4krryzx344gmq3d54jx8hw3"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; };
   survrec = derive2 { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; };
   survsim = derive2 { name="survsim"; version="1.1.4"; sha256="16njbqlzmk34zrh485kc0a52yacdyj9z4z4a9zcq1z5psm87c58m"; depends=[eha statmod]; };
+  survtmle = derive2 { name="survtmle"; version="1.0.0"; sha256="1sdp88br1ry6yzzav67787n0clpq6vjffxqpkvld93dyvmlb6zb1"; depends=[ggplot2 Matrix plyr stringr SuperLearner tidyr]; };
   survutils = derive2 { name="survutils"; version="1.0.0"; sha256="1dha1i2k9dyc9m9awqiq2ypy617zmw9yflfzv182z5fpd491ghrv"; depends=[broom dplyr ggplot2 lazyeval magrittr purrr survC1 survival]; };
   svDialogs = derive2 { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; };
   svDialogstcltk = derive2 { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; };
@@ -10249,6 +10540,7 @@ in with self; {
   svd = derive2 { name="svd"; version="0.4"; sha256="06bw4nypj9p57py2vw26yhzn3gw7clvby1mxbg2s2wj3jyay47p5"; depends=[]; };
   svdvis = derive2 { name="svdvis"; version="0.1"; sha256="1z3z86izl2gpxllpx56vn6kkdg9cjjikfd90hdjnfi4bmmpx50dn"; depends=[GGally ggplot2 gridExtra RColorBrewer reshape2 scales]; };
   svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
+  svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; };
   svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; };
   svgViewR = derive2 { name="svgViewR"; version="1.2"; sha256="0h3smaplnkkvbl9c6lwl67jbk34m6sygkh2d82xz66hbyw2i6q7k"; depends=[]; };
   svglite = derive2 { name="svglite"; version="1.2.0"; sha256="1s1gvmlmmna5y4jsn9h6438pg5b86fl4nwfvkgm6n4h6ljfgqyx3"; depends=[BH gdtools Rcpp]; };
@@ -10259,6 +10551,7 @@ in with self; {
   swCRTdesign = derive2 { name="swCRTdesign"; version="2.1"; sha256="0c5pya5jgpj5ncrvpzahhrbhl7b39w19f3vl06r8q0nandbn7rwq"; depends=[]; };
   swamp = derive2 { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
   swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; };
+  sweep = derive2 { name="sweep"; version="0.2.0"; sha256="11hyv48hldacdbi7avvgmrqk9andjkabdswf1blfb4qyc2z0199v"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; };
   sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; };
   swirl = derive2 { name="swirl"; version="2.4.3"; sha256="1l7gwisk3sjslh6zh4cq3vxf5y84af2fr078cp4i86rw1w2j9d44"; depends=[digest httr RCurl stringr testthat yaml]; };
@@ -10266,7 +10559,8 @@ in with self; {
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
   switchr = derive2 { name="switchr"; version="0.11.2"; sha256="0kwkadw1hfkjvlpgr8lfx9qknlml3alk8ka2yhbga019y7ifbm7y"; depends=[RCurl RJSONIO]; };
   switchrGist = derive2 { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4yic133q07vki803zywhijadymrgyq7qlx3d1m97d"; depends=[gistr httpuv RJSONIO switchr]; };
-  sybil = derive2 { name="sybil"; version="2.0.0"; sha256="0nb5k5mpqpk1i83s0a8k4npi72imsywwm1jn1hh2vr5bx3sjwflw"; depends=[lattice Matrix]; };
+  swmmr = derive2 { name="swmmr"; version="0.7.0"; sha256="1155gdsgbhr9fabsf5b63f47zicqj02yjm0fpgbbf3ds550s0hq8"; depends=[Rcpp xts]; };
+  sybil = derive2 { name="sybil"; version="2.0.4"; sha256="0iyqr9iyb4bydmzjzrc721nzf5q36p2i3zciai9rzjlwx2mdw930"; depends=[lattice Matrix]; };
   sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; };
   sybilEFBA = derive2 { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; };
   sybilSBML = derive2 { name="sybilSBML"; version="3.0.1"; sha256="1dzx1cdvi4fvdqf5hliwwk3gn5ig2wzzxv2gr92760p9c84hmmrj"; depends=[Matrix sybil]; };
@@ -10285,9 +10579,9 @@ in with self; {
   synchrony = derive2 { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
   synlik = derive2 { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Matrix Rcpp RcppArmadillo]; };
   synthACS = derive2 { name="synthACS"; version="1.0.1"; sha256="0jbhiadgc8f6h7ga685cm5i8y59lf76r8sgd629xfjj4jxn8ckdm"; depends=[acs data_table Rcpp]; };
-  synthpop = derive2 { name="synthpop"; version="1.3-1"; sha256="0vp79jxp4hr9wrc4dlh9ckkcpwiffdixr9jh1w6w1wkii3bjcani"; depends=[foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; };
+  synthpop = derive2 { name="synthpop"; version="1.3-2"; sha256="0rprvrixpnzc2yxgvp8gq72k145hb1f37fzp9lbpjc7yxy7hncmz"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; };
   sys = derive2 { name="sys"; version="1.4"; sha256="0x9npf3hybrh0vsr2bxax31k3x99p6klrc1gplp295mjiqxiy7sk"; depends=[]; };
-  sysfonts = derive2 { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; };
+  sysfonts = derive2 { name="sysfonts"; version="0.6"; sha256="02cf5n4s6knn887nx3mr8fd9cqy67i107c889w5j028l6qk43jxr"; depends=[]; };
   sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; };
   systemfit = derive2 { name="systemfit"; version="1.1-20"; sha256="1qzgx4hn6f71hnk70ccf6inajprrb6my5af8q2manz41577z0ka7"; depends=[car lmtest MASS Matrix sandwich]; };
   systemicrisk = derive2 { name="systemicrisk"; version="0.4"; sha256="1qpimrfr75l6phr425m7av02l57yyn1n2if7h26cndf9ynmv6vz1"; depends=[lpSolve Rcpp]; };
@@ -10297,7 +10591,7 @@ in with self; {
   tab = derive2 { name="tab"; version="3.1.2"; sha256="1vc5swfy9p3bsv5bqqgk4w81apzk6d0m1xz0cbhii7rpn7x6zh1h"; depends=[gee survey survival xtable]; };
   taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
   tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; };
-  table1xls = derive2 { name="table1xls"; version="0.3.2"; sha256="0b8j4gl4w3jz8hg89ja90sjvigjkqnrh4hpmky5q4a9swgwhmgf6"; depends=[XLConnect]; };
+  table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; };
   tableHTML = derive2 { name="tableHTML"; version="1.0.1"; sha256="08dcl4a8lz3abw6cjsrvwj344yq7fj2qdak6l3aj2axnnjxiqqmh"; depends=[htmltools magrittr shiny]; };
   tableMatrix = derive2 { name="tableMatrix"; version="0.8"; sha256="00l03blrrkwdrihqnwz8afx6s3d7a19laj44584546yd3prqx5dy"; depends=[data_table]; };
   tableone = derive2 { name="tableone"; version="0.8.1"; sha256="1rzh59ij53wzhnsxib47pgqmcmk65h0s9i9ifmwcvgjmcx71mn86"; depends=[e1071 gmodels MASS nlme survey zoo]; };
@@ -10306,31 +10600,34 @@ in with self; {
   tabplot = derive2 { name="tabplot"; version="1.3-1"; sha256="0yz3npn36q93gr0k9a4x5swap5fwxfc22b131kif3dfxkgklna06"; depends=[bit ff ffbase]; };
   tabplotd3 = derive2 { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; };
   tabuSearch = derive2 { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; };
-  tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.12.0"; sha256="1hlvw011a8rbczxjk2ww39rq5pcdyr8wf27dzkqwrni5nswarrcg"; depends=[broom car cowplot dplyr ggplot2 haven lazyeval lsr magrittr nortest pixiedust pwr ryouready sjmisc vcd viridis]; };
+  tabularaster = derive2 { name="tabularaster"; version="0.3.0"; sha256="1wym0m3i8k3vil8ylzn23jlzpaxjh3zndjiq3lwlz9xj8v96ni6n"; depends=[dplyr raster sp spbabel spex tibble viridis]; };
+  tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.13.0"; sha256="089g2753zn1hw9nx7d00dkv80jx1h3njrla0nh619q5ahi1sqpmf"; depends=[broom car cowplot dplyr ggplot2 haven lazyeval lsr magrittr nortest pixiedust pwr ryouready sjlabelled sjmisc vcd viridis]; };
   tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; };
   tailDepFun = derive2 { name="tailDepFun"; version="1.0.0"; sha256="1z2jrzly1adiwi8y0pndyfggpr0li6sjv9rkrc5mi47s0qjvr5qj"; depends=[copula cubature mvtnorm SpatialExtremes]; };
   tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; };
   tangram = derive2 { name="tangram"; version="0.3"; sha256="053nwj15w40966i7br52zp9lfmckxhj55imx58w767ha9m73gwvc"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; };
-  tatoo = derive2 { name="tatoo"; version="1.0.6"; sha256="0xf85fwcjbf0wh68cs57q3a6jvx8z49laxffhj4i2rvbrc4a5hi5"; depends=[assertthat data_table magrittr openxlsx purrr stringi]; };
+  tatoo = derive2 { name="tatoo"; version="1.0.7"; sha256="0y7hlwwjyc50hk8bci4r3ihasdqfq11v2ahfl90lyjpvrjnrd4zb"; depends=[assertthat data_table magrittr openxlsx purrr rlang stringi]; };
   tau = derive2 { name="tau"; version="0.0-19"; sha256="0z7ylw590r7jrw4rlmhahxiwqrnw3124fssnzqs36qa7pa3zqhq2"; depends=[]; };
   tawny = derive2 { name="tawny"; version="2.1.6"; sha256="0s6p0nnz1rpcnn2yfj1vvl54g57d8rv5s4y09azwz1z5ls7vnnlv"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
   tawny_types = derive2 { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; };
-  taxize = derive2 { name="taxize"; version="0.8.4"; sha256="03zfrkcpkbzqkm3w9m9g34nhrrp36l630l8rhpnsnkqnfxybb3yv"; depends=[ape bold data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble worrms xml2]; };
+  taxa = derive2 { name="taxa"; version="0.1.0"; sha256="1pfdh68q1x2n6x3idh1c5mbygqhsf2bkbg5c5bri0zj2pxmrmv0g"; depends=[dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr tibble]; };
+  taxize = derive2 { name="taxize"; version="0.8.9"; sha256="0dnghv9rwr6z1hk950zbvd1nnyngakzhvjr68321vmb5s58y4xs6"; depends=[ape bold data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2]; };
   taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; };
-  taxlist = derive2 { name="taxlist"; version="0.1.0"; sha256="0896wh9v78kvjfkjj6qk8sqwkdl4bf2i7hp09vr1vwrahx54cwhx"; depends=[foreign taxize vegdata]; };
+  taxlist = derive2 { name="taxlist"; version="0.1.2"; sha256="1cl97f8g92549y177b6888hfrmfvvhzx9gsqv6pbix2a67k8zvcz"; depends=[foreign taxize vegdata]; };
   taxonomizr = derive2 { name="taxonomizr"; version="0.2.2"; sha256="0drzsbr23kr3da6bawjrz8rl976mai0vcz19fr5aypsliqz32b41"; depends=[data_table R_utils RSQLite]; };
   tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
   tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
-  tbl2xts = derive2 { name="tbl2xts"; version="0.1.0"; sha256="00psr9mxnh8hb2pczr20lrnb8qia4wna1a5cck7v8bb242v7yx7h"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; };
+  tbl2xts = derive2 { name="tbl2xts"; version="0.1.2"; sha256="1zz310253s6gz0hzzldil5r03mm7ngvvnba7hxm8fm9dhfmvkbj6"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; };
   tcR = derive2 { name="tcR"; version="2.2.1.11"; sha256="1wyxjwyba08m80g2c40sdg3d5brs3qmq8azb6vzwh2wmgqlb5400"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
-  tcgsaseq = derive2 { name="tcgsaseq"; version="1.4.1"; sha256="09hswqmj7svyiqdbbg7shimhkgxmz0m8w6bknx9qd987hik9asx8"; depends=[CompQuadForm ggplot2 GSA KernSmooth]; };
+  tcgsaseq = derive2 { name="tcgsaseq"; version="1.6.2"; sha256="1cnakn8v0ijsq7bxw38fiab32cxcfyfm6k30ypsb3rr82hb8kh0l"; depends=[CompQuadForm ggplot2 GSA KernSmooth]; };
   tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
-  tclust = derive2 { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[cluster mclust mvtnorm sn]; };
+  tclust = derive2 { name="tclust"; version="1.2-7"; sha256="1mvqr280c6kwpg98byd0r1y0qf238xn2x15y8npqch6lpcszlb3x"; depends=[cluster mclust mvtnorm sn]; };
   tcpl = derive2 { name="tcpl"; version="1.2.2"; sha256="1f32qq5816qkyx3n16vgf13g2piv2pqn2nki3c91vg51bwfap7z1"; depends=[data_table DBI numDeriv RColorBrewer RMySQL RSQLite]; };
   tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; };
   tdr = derive2 { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; };
   tdthap = derive2 { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
   tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; };
+  teachingApps = derive2 { name="teachingApps"; version="1.0.2"; sha256="0rdgylcjwgbsasvd2mvi4qp74c3n4vg8yr59a82c2sidfkllci36"; depends=[actuar d3heatmap d3Network data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI needs networkD3 plotly radarchart Rcpp rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; };
   teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; };
   teigen = derive2 { name="teigen"; version="2.2.0"; sha256="0ljm8dz4hndnc37psr7mnl1gbxs1kghygz3cyqzld1xpjwsjc2cz"; depends=[]; };
   telegram = derive2 { name="telegram"; version="0.6.0"; sha256="02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y"; depends=[curl httr jsonlite R6]; };
@@ -10341,42 +10638,45 @@ in with self; {
   tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
   tensorA = derive2 { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
   tensorBF = derive2 { name="tensorBF"; version="1.0.1"; sha256="1rnsff1ypwhn5z0xsxyk2z7jl6igscma1a0w613i81qf37iy81ba"; depends=[tensor]; };
-  tensorBSS = derive2 { name="tensorBSS"; version="0.3"; sha256="0nj1rizz9c5ryfbrvsvgrx31rv3kjcpyhzi8kc2bbhz1kymch6r9"; depends=[JADE Rcpp RcppArmadillo tensor tsBSS]; };
-  tensorflow = derive2 { name="tensorflow"; version="0.9"; sha256="19bkh0axi08y9nwp0rmxh8n421224jgs3fhk3dmb3mq0s6i0fw52"; depends=[jsonlite processx reticulate yaml]; };
+  tensorBSS = derive2 { name="tensorBSS"; version="0.3.1"; sha256="1w8wl3s48wnxmahaklzkipsj3hrwzch8dp084j0zmk6rpbl1q4b7"; depends=[JADE Rcpp RcppArmadillo tensor tsBSS]; };
+  tensorflow = derive2 { name="tensorflow"; version="1.3"; sha256="1wivd19jxm2l4iij2cad3hiwb78821dsjlz2bcvrfg8qk4h2pb06"; depends=[config jsonlite processx reticulate tfruns yaml]; };
   tensorr = derive2 { name="tensorr"; version="0.1.0"; sha256="00zqklz3hqjv20giwqnd1d62x5hdm620hfdkn1x75i87dv92qn8m"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; };
   tensr = derive2 { name="tensr"; version="1.0.0"; sha256="05gclhljflkz98hgiq5bgbqjz8icxbdq6b84bn2995cx7v0x85ds"; depends=[]; };
   tergm = derive2 { name="tergm"; version="3.4.0"; sha256="19658k5570z8yxpklbbl87a7pd8i4yygi0ky8lgzb8qymds90v4s"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
   termstrc = derive2 { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; };
   ternvis = derive2 { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[dichromat mapdata maps maptools quadprog]; };
-  tesseract = derive2 { name="tesseract"; version="1.4"; sha256="1ycrclv4njbpwrdmh390pnyaczp7xk0ivkscfbr725mavq6xpvi7"; depends=[curl digest Rcpp]; };
+  tesseract = derive2 { name="tesseract"; version="1.6"; sha256="1apcmbkrbyrcdjc39w46shbic404pnkmqqdr0bdp193svp5df8rb"; depends=[curl digest rappdirs Rcpp]; };
   testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; };
   tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
   testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; };
   testit = derive2 { name="testit"; version="0.7"; sha256="07qsnhghdgyxdknzq7ngpkf3qw9939m3lvk9dv9nk2zypy4jhcq3"; depends=[]; };
   testthat = derive2 { name="testthat"; version="1.0.2"; sha256="0pj1r01x4ny4capr83dfa19hi5i2sjjxky99schzip8zrq5dzxqf"; depends=[crayon digest magrittr praise R6]; };
+  tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; };
   texPreview = derive2 { name="texPreview"; version="1.0.0"; sha256="1i34w1804p3qwmijj2lqmfjy909axfp8icllr1nilfqbsrrmssbi"; depends=[magick magrittr rstudioapi svgPanZoom xml2 xtable]; };
   texmex = derive2 { name="texmex"; version="2.3"; sha256="0hh633hlzmjrlind51kjs7s1zpx8bwcwfa93yl4swfvn501j1hy9"; depends=[ggplot2 mvtnorm]; };
   texmexseq = derive2 { name="texmexseq"; version="0.3"; sha256="08zjsb541xqqs3lj7avx5147g2d0bh3v036x615srjx2pbxzhsvg"; depends=[dplyr ggplot2 testthat]; };
   texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; };
-  text2vec = derive2 { name="text2vec"; version="0.4.0"; sha256="1ipggg63s16gb72fr7kpmc4z8v6ylp4kw7kb9bk6pccg9iz54i5a"; depends=[data_table digest foreach irlba magrittr Matrix R6 Rcpp RcppParallel]; };
+  text2vec = derive2 { name="text2vec"; version="0.5.0"; sha256="00bimgj82fbbicvbki22m3xvs42jqml3w3fmpw5rz743z2p8y34p"; depends=[data_table digest foreach futile_logger irlba magrittr Matrix R6 Rcpp RcppParallel sparsepp uuid]; };
   textTinyR = derive2 { name="textTinyR"; version="1.0.7"; sha256="1p5qsjs1k2n99p6vc05bqw3zfhh481ynrsnr5qjidf02iavcq00m"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
   textcat = derive2 { name="textcat"; version="1.0-5"; sha256="039bzyz4jvh1hl2a2pfp328kr2mpb1a07j79yqf5cbqk3d5a197b"; depends=[slam tau]; };
   textclean = derive2 { name="textclean"; version="0.3.1"; sha256="1k8wjzzh6nplrnyxq4cd7q4q0sn2fa5p5r2kaq2rd4j9sqrrypp0"; depends=[english qdapRegex stringi textshape]; };
   textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; };
+  textile = derive2 { name="textile"; version="0.1.2"; sha256="067zli6sl7bp9843spgx47hmw55aq61yinqw1lqifmrpk7b0ywk5"; depends=[]; };
   textir = derive2 { name="textir"; version="2.0-4"; sha256="1ky22xar980afyydddahppad9m263mxnrdqpj1fcbmdhg8flwjgz"; depends=[distrom gamlr Matrix]; };
-  textmineR = derive2 { name="textmineR"; version="2.0.5"; sha256="138qscgpxkkza0x6lbjrlqf1f1nvj369rw5rvjp5xj9bh7sd62xs"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; };
+  textmineR = derive2 { name="textmineR"; version="2.0.6"; sha256="1rmypjg4p1gazyi1jvxc145yha2dg2mkkm5hm6y37is2h62badx2"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; };
   textmining = derive2 { name="textmining"; version="0.0.1"; sha256="16wiykhrjs4djwa7q2wm4g8b3mrhh6hq9d9876w1j7c2s6zx69gd"; depends=[caret dplyr koRpus mallet networkD3 NLP rJava slam SnowballC stylo tm topicmodels wordcloud]; };
   textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
   textreadr = derive2 { name="textreadr"; version="0.5.1"; sha256="03j69xn5ligqypkkhj4w0avl4nzn5c87hz3ycz7cwlm2symkwadw"; depends=[antiword curl pdftools readxl rvest textshape xml2]; };
   textreg = derive2 { name="textreg"; version="0.1.4"; sha256="0k7hpvvhacz29d3mvnygg6rqmh9f3ghkcp7kjmvv9jnr2ipw2j21"; depends=[NLP Rcpp tm]; };
   textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; };
-  textshape = derive2 { name="textshape"; version="1.0.2"; sha256="0p9n003z98aqk272wcj02z0c5dzaw01iyfbd0fjyccgkidyaz49h"; depends=[data_table slam stringi]; };
+  textshape = derive2 { name="textshape"; version="1.3.0"; sha256="1pp80zfnbwgslawi0jnkg1xdqcs5qxv5inilx2diy9g11534pxng"; depends=[data_table slam stringi]; };
   textstem = derive2 { name="textstem"; version="0.0.1"; sha256="09010a5flly5kiifx2jha5zvwncpk1xsgx2idipjnrav01plhin2"; depends=[dplyr hunspell koRpus lexicon quanteda SnowballC textshape]; };
   textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; };
   tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
   tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; };
   tframe = derive2 { name="tframe"; version="2015.12-1"; sha256="0k0favda3z6zdg7ykc2nnl28gxz7sfzbyr5pcifiyi984pa2zgfx"; depends=[]; };
   tframePlus = derive2 { name="tframePlus"; version="2016.7-1"; sha256="12xi2xw4pr78n3cppfknpxmjp2263pb4kqj9v412yxwp82rgb6yk"; depends=[tframe timeSeries]; };
+  tfruns = derive2 { name="tfruns"; version="0.9"; sha256="0xi0z42w64sjncf85pwc35bffymink6s70v41iv43f3qi0w533aj"; depends=[]; };
   tgcd = derive2 { name="tgcd"; version="2.0"; sha256="1553f464jpmngdj8fmbjn9cpmrcp4ysgsfx4w7q4pm4csslsqvlr"; depends=[]; };
   tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; };
   tglm = derive2 { name="tglm"; version="1.0"; sha256="1gv33jq3bzd5wlrqjvcfb1ax258q9asawkdi64rbj18qp7fg2dbx"; depends=[BayesLogit coda mvtnorm truncnorm]; };
@@ -10388,29 +10688,31 @@ in with self; {
   thgenetics = derive2 { name="thgenetics"; version="0.3-4.1"; sha256="05g5rwdpnd1b4h1lay2l1s0ns2q6a7sav8d4zrxaqgzhaafnpxyv"; depends=[]; };
   thief = derive2 { name="thief"; version="0.2"; sha256="14xl5l7iw0nwbz5zzd00c8ihfclvhfcazvysr8rapsq1j2r5dfck"; depends=[forecast forecTheta ggplot2 hts]; };
   threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
-  threejs = derive2 { name="threejs"; version="0.2.2"; sha256="1i8ca99ys0m0njf5f9yhc5rvs9x43mwl98dh74gggq7vj2a99zj1"; depends=[base64enc htmlwidgets jsonlite Matrix]; };
+  threejs = derive2 { name="threejs"; version="0.3.1"; sha256="1s3rdlzy7man6177ycayg6xsh6k8y1r9rdj9yzn3b93j2rs0nxbi"; depends=[base64enc crosstalk htmlwidgets igraph]; };
   threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; };
   threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; };
   thregI = derive2 { name="thregI"; version="1.0.3"; sha256="1nacwpzwzb6v6gxrdrarpnrgmsgnn6nsrg53b6866lcqsg09imvj"; depends=[Formula survival]; };
   thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; };
-  tibble = derive2 { name="tibble"; version="1.3.3"; sha256="1bhq4pm56l7l6s1k44ajrcr7hz56h37m9ck4zji9f8xfdqschbl0"; depends=[Rcpp rlang]; };
+  tibble = derive2 { name="tibble"; version="1.3.4"; sha256="02vn6yqzcvmazy5jaqar3wwbrmh83a1bfgsqgk0hgz38i80zgvm7"; depends=[Rcpp rlang]; };
   tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; };
   tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; };
   tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
   tidyRSS = derive2 { name="tidyRSS"; version="1.2.1"; sha256="0ccs7njylm9dns8vkda52plxp8is3c5ynb55wcjd50qk44sys867"; depends=[dplyr httr lubridate magrittr tibble xml2]; };
-  tidycensus = derive2 { name="tidycensus"; version="0.1.2"; sha256="1p16krbkgzx6jzy5i0xmy7v4314b2sl30glzyifgva5kngk4l7sp"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
+  tidycensus = derive2 { name="tidycensus"; version="0.2"; sha256="0d80yy59avy9h2ksyv6iabiqkqa8bgr1i2s8n43w569fisjzlf9i"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
   tidygenomics = derive2 { name="tidygenomics"; version="0.1.0"; sha256="0n6km2zhdmbgacn6rzamrn506d9y3sl6yp2q6fd9x7kzgz09aq4n"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp tidyr]; };
+  tidygraph = derive2 { name="tidygraph"; version="1.0.0"; sha256="1z0jmhwj3m1xk9zmds2riyqmq189716j5qi6ijgf3xni3n25c0m0"; depends=[dplyr igraph magrittr R6 Rcpp rlang tibble tidyr]; };
   tidyjson = derive2 { name="tidyjson"; version="0.2.2"; sha256="1fim73qbd6jqjlprxv9wzhg0hr20pihdmdbx49yharfs74hf9yv7"; depends=[assertthat dplyr jsonlite]; };
-  tidyquant = derive2 { name="tidyquant"; version="0.5.1"; sha256="1w21l3njza6sf3banr3mwi6q8sqsd567z5n6qfj0f9x3nd7q8h52"; depends=[broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries tseries TTR xml2 xts zoo]; };
-  tidyr = derive2 { name="tidyr"; version="0.6.3"; sha256="14s57zrjm2phiy600z9ivq4az71z0ggmp6nj0js7yrybxf0dlah6"; depends=[dplyr lazyeval magrittr Rcpp stringi tibble]; };
+  tidyquant = derive2 { name="tidyquant"; version="0.5.3"; sha256="1vvmx0l5vd434gjsqd19vlnzk0hxgh82b1dsf2zwshc9hni1b75l"; depends=[broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries timetk tseries TTR XLConnect xml2 xts zoo]; };
+  tidyr = derive2 { name="tidyr"; version="0.7.0"; sha256="1lg0amx5hs37ajwjxz7ya50q4s28jcdj51kzl10s1x4l1akp7xls"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; };
+  tidyselect = derive2 { name="tidyselect"; version="0.1.1"; sha256="0fhqj22g69lba8xavzagm64r0w488shdxha1c529vnfm5hv7fiic"; depends=[glue Rcpp rlang]; };
   tidytext = derive2 { name="tidytext"; version="0.1.3"; sha256="10vdrvadllqrblc0w4ndvgvy9gq5l4nf93g31b1a2xkz2p30zc15"; depends=[broom dplyr hunspell janeaustenr Matrix purrr stringr tokenizers]; };
   tidyverse = derive2 { name="tidyverse"; version="1.1.1"; sha256="1ahxs7xzik27xdbzc1ccrkq5knzrn8xf82x3dhh94xi5c8p3ysqx"; depends=[broom dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl rvest stringr tibble tidyr xml2]; };
-  tidyxl = derive2 { name="tidyxl"; version="0.2.1"; sha256="10b6bl2yr11mzajkzj6xzfyfb0mgglzxm8hpsqxkmd9dp4x96035"; depends=[Rcpp]; };
+  tidyxl = derive2 { name="tidyxl"; version="0.2.3"; sha256="1rl51qrkzfw65px236x3hryfcfkrv6v1mxy5bqanlxcxyv94pnp2"; depends=[Rcpp]; };
   tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
   tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; };
   tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; };
   tigerstats = derive2 { name="tigerstats"; version="0.3"; sha256="12wrghipgypkhwwkmaxb6n0qx9fgxk82dc6wlh56rblsvciv2hj0"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; };
-  tigger = derive2 { name="tigger"; version="0.2.9.999"; sha256="1kzvx6k3460m60v81rv8ai8fk4rjbwq8ya038d1c0g39ypvkmmjc"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators tidyr]; };
+  tigger = derive2 { name="tigger"; version="0.2.10"; sha256="17dym3d1c1a34m0iwbrbp1xa8k46vi27g897z4mzb5ywk6605kn0"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval tidyr]; };
   tightClust = derive2 { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
   tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.4"; sha256="0c733mb2fzskrfa4664w6psp80wdr5hc7f9rp516y59a8rr3xzr0"; depends=[DBI RSQLite]; };
   tigris = derive2 { name="tigris"; version="0.5.3"; sha256="0ic4l91dd97gmbqm6jgwkx34gsna6asaq14prmjq8y8n4bw7dkvf"; depends=[dplyr httr magrittr maptools rappdirs rgdal rgeos sf sp stringr uuid]; };
@@ -10421,10 +10723,9 @@ in with self; {
   time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; };
   timeDate = derive2 { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; };
   timeROC = derive2 { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
-  timeSeq = derive2 { name="timeSeq"; version="1.0.2"; sha256="05ncs12afww2apa9sm71x30kjp3ns2l6c5dzrbc2inmy2bss5fy6"; depends=[doParallel foreach gss lattice pheatmap reshape]; };
+  timeSeq = derive2 { name="timeSeq"; version="1.0.3"; sha256="1jdmcbghqmp9phfx7bii8nfqdc10f1nqmi1mk70n0fysm6cdvhn6"; depends=[gss lattice pheatmap reshape]; };
   timeSeries = derive2 { name="timeSeries"; version="3022.101.2"; sha256="0yr5j8w6p0k05g76hjhkrbx3vb166p5916grigc1yag6baj6nsij"; depends=[timeDate]; };
   timedelay = derive2 { name="timedelay"; version="1.0.7"; sha256="01rl3nwazxlypimaclyjr6ihwn75jfaffp43b94msvf25xd30aiy"; depends=[mnormt]; };
-  timekit = derive2 { name="timekit"; version="0.3.1"; sha256="0wpjx95sy6ny2jwj8p16l778znq0anr2svdnvf8j68bc3pyynmna"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; };
   timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
   timelineR = derive2 { name="timelineR"; version="0.1.0"; sha256="1a2pdy5b9nca66khydrb50yzjglr78lxrgzisw6bp2simk5cix51"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR stringr]; };
   timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; };
@@ -10432,7 +10733,8 @@ in with self; {
   timereg = derive2 { name="timereg"; version="1.9.1"; sha256="1rm3b8i3vrajd50rfm39hlyz1idxxwlj73zga2q8gm0md75034rv"; depends=[lava numDeriv survival]; };
   timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
   timeseriesdb = derive2 { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[DBI reshape2 RJSONIO RPostgreSQL shiny xts zoo]; };
-  timetools = derive2 { name="timetools"; version="1.11.4"; sha256="0sny0kbadpgaa84xbh0d8blhc8gz2l8gp5f98zfc1jq7m6jm5km8"; depends=[]; };
+  timetk = derive2 { name="timetk"; version="0.1.0"; sha256="0z4zb00c4xbjn3ppz6ypcab2ahkr76mj6v68yfxkjb233cb18641"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; };
+  timetools = derive2 { name="timetools"; version="1.12.0"; sha256="06yfgnz7nap2zhq1l62xbi17d83d21vjk62jb4mxrg8wprs4arnv"; depends=[]; };
   timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; };
   timevis = derive2 { name="timevis"; version="0.4"; sha256="08caa5gilh1c0z41lm3ghf6cpnlsdjfm1v7ha73jxv1655kznmpx"; depends=[htmltools htmlwidgets jsonlite magrittr rmarkdown shiny]; };
   timma = derive2 { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; };
@@ -10454,7 +10756,7 @@ in with self; {
   tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-8"; sha256="0z843i2wlmx75748p95jz3j45d9bzmlmqa3awgya24k7bdhpd6kd"; depends=[DSL NLP slam tm]; };
   tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.4"; sha256="03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx"; depends=[NLP tm XML]; };
   tm_plugin_factiva = derive2 { name="tm.plugin.factiva"; version="1.6"; sha256="1g4gqhha4936whnir1j31jlcbg9x6jhay7yl1c2pzhldldqj98ih"; depends=[NLP tm XML]; };
-  tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.3"; sha256="056fvhd7m1z7pqmllq2l36v1zm2iwrmii3andhr22894qk99kck1"; depends=[ISOcodes NLP tm XML]; };
+  tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.3.1"; sha256="15k4bzx1p271yzskkijlf2pm6m7pb5dqxmfab9rhwynllszv96if"; depends=[ISOcodes NLP tm XML]; };
   tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
   tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
   tmap = derive2 { name="tmap"; version="1.10"; sha256="1yylbcvpby180axs0mi68y6rbqisis146lj0gaz09vlmmraz1aln"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; };
@@ -10470,7 +10772,7 @@ in with self; {
   tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; };
   tnam = derive2 { name="tnam"; version="1.6.5"; sha256="0jbwnsnn6875yprmh6y2i0bvr875hfsg7wfsj6ydmjpr5cpqqk56"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; };
   tnet = derive2 { name="tnet"; version="3.0.14"; sha256="05cc6jrkjbwxzmgzq30h63xzhlgq8f0l3wx2q54vrv0wpvlvfphn"; depends=[igraph survival]; };
-  toOrdinal = derive2 { name="toOrdinal"; version="0.0-6"; sha256="13mp6sxjbn1piw2q018nb4hznzsa2c7pkvmlv74f8qsjrvvw1h4x"; depends=[]; };
+  toOrdinal = derive2 { name="toOrdinal"; version="1.0-0.0"; sha256="1y46rcm6v2c5n71hdf5rgsgvy913wiazmml60mlxqb70dvz42649"; depends=[crayon testthat]; };
   toaster = derive2 { name="toaster"; version="0.5.5"; sha256="0ga4l3zp422scrgvz701rjznn013vhsbp4gh7v1inqp7kpxafky9"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise network plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; };
   tokenizers = derive2 { name="tokenizers"; version="0.1.4"; sha256="1qcsmcd74i39wql9p49g3pzc4flpi8jq9sxia5mcdx054viijgk9"; depends=[Rcpp SnowballC stringi]; };
   tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; };
@@ -10481,7 +10783,7 @@ in with self; {
   topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
   tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
   touch = derive2 { name="touch"; version="0.1-3"; sha256="1zzc4h6y0xmr3p7jl0vlvn4yswxz5akgvz8laxgmjgqzk926g9jl"; depends=[stringr]; };
-  tourr = derive2 { name="tourr"; version="0.5.4"; sha256="11xg5slvx7rgyzrc0lzandw7vr7wzk3w2pplsnyrqq3d990qp40d"; depends=[]; };
+  tourr = derive2 { name="tourr"; version="0.5.5"; sha256="12293kp36kz056zd3fnsaf2gy4g8mcs79ws0vgbs7b0hx09sy9vp"; depends=[]; };
   tourrGui = derive2 { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; };
   toxboot = derive2 { name="toxboot"; version="0.1.1"; sha256="0sw0mxhcq5k11swlhfpn6xk0nfsambh2yx1721zx75lya27wkmq1"; depends=[data_table tcpl]; };
   toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; };
@@ -10509,6 +10811,7 @@ in with self; {
   treatSens = derive2 { name="treatSens"; version="2.1.2"; sha256="0zqpx0lwx3vzbwi55n0517zs5vn4zlaf66js506vxnzf1dzx2h0a"; depends=[BH dbarts mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
   tree = derive2 { name="tree"; version="1.0-37"; sha256="091297qhvqhgjmnyr96jkwaghz8dkbf03rnhwfhks8bsgax6jl13"; depends=[]; };
   treeClust = derive2 { name="treeClust"; version="1.1-6"; sha256="07cw8mnfrkw733ga3aq4am1pj50g8vk0rw6b3lflnb4wdhm2fgbi"; depends=[cluster rpart]; };
+  treeDA = derive2 { name="treeDA"; version="0.0.2"; sha256="0ldk7g0bfs8y0znivhj8db5si7glxawicc5zvapbf8d9djlaxxga"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; };
   treeHFM = derive2 { name="treeHFM"; version="1.0.3"; sha256="10pyvyyz9ia4dpj8zkil56ipbvbks5xh0n9hkdy0hcinsyq0ba29"; depends=[mclust]; };
   treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; };
   treeclim = derive2 { name="treeclim"; version="2.0.0"; sha256="0hiba5xc6rp5zzka31k5klmlllpgbnla4pm920zk12jxn796953l"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
@@ -10517,12 +10820,12 @@ in with self; {
   treeman = derive2 { name="treeman"; version="1.1.1"; sha256="0j76crs31qniibsdj7dpbbr2jdbhvclfvcscd5dgklvpcspbarch"; depends=[ape bigmemory plyr RJSONIO stringr]; };
   treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
-  treeplyr = derive2 { name="treeplyr"; version="0.1.2"; sha256="03bfl7pqhw2isffnfli82bw6la41rfqcshh9dhlbnlwr7yj69m4x"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
+  treeplyr = derive2 { name="treeplyr"; version="0.1.3"; sha256="00fkmmzivwy603grfbwdabsik1swkyba7sbwcjzxbgsmx3s472g6"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
   treespace = derive2 { name="treespace"; version="1.0.0"; sha256="1dc98p5jf9qyr31xa7h7v2zrjmhd3jlzrh2cpmnmhbpfm1cviskj"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn Rcpp RLumShiny scatterD3 shiny shinyBS]; };
   treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; };
   trelliscope = derive2 { name="trelliscope"; version="0.9.7"; sha256="1hczmi3hjlk1nqd4p2m2hs89a86jrg59rraxw5z5fm0pa92xnzqy"; depends=[base64enc curl data_table datadr digest DistributionUtils ggplot2 hexbin htmltools htmlwidgets jpeg jsonlite lattice png rsconnect shiny]; };
   trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; };
-  trend = derive2 { name="trend"; version="0.2.0"; sha256="0kq2j9rky8kad3rfkwqys2s9hivrqy4yb03q80dvgz856bsh5fiw"; depends=[]; };
+  trend = derive2 { name="trend"; version="1.0.0"; sha256="1fbzylw90y2h8qmg6hivhrrvv154jgfi77qij9wrh58rl2yq6gsj"; depends=[extraDistr]; };
   triangle = derive2 { name="triangle"; version="0.10"; sha256="02s7iblk3fdrjhz0sns76bqrfwi0y0l6vbjfsb5mzq6pn45n0nkv"; depends=[]; };
   triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; };
   trib = derive2 { name="trib"; version="1.2.0"; sha256="0bvz1cvi2fx40b5rdv4gfama11dn20rz4506k4fjsny32yswpqyw"; depends=[zoo]; };
@@ -10535,6 +10838,7 @@ in with self; {
   trip = derive2 { name="trip"; version="1.5.0"; sha256="1qdq3hbqqaa0cmb47ssg3pr3jksni7g4xsc7bsj6wwdw62d9wzf6"; depends=[maptools MASS raster sp spatstat]; };
   tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; };
   tripack = derive2 { name="tripack"; version="1.3-8"; sha256="0pf707z6xysxvcs508nadga3mglpvmfk6r061qda8acn58ll1cvb"; depends=[]; };
+  tropAlgebra = derive2 { name="tropAlgebra"; version="0.1.0"; sha256="1pimvcnmj9gg454vxgx0cp8lip89f704w5v6pmlpfj34s7h88474"; depends=[]; };
   tropr = derive2 { name="tropr"; version="0.1.2"; sha256="1nm97sqmj4nfy7h8z58gmd9ipyrkw6skh2wx2g3ivm9pn3m50bwl"; depends=[digest httr magrittr rvest stringr xml2]; };
   trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; };
   trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; };
@@ -10545,10 +10849,10 @@ in with self; {
   truncreg = derive2 { name="truncreg"; version="0.2-4"; sha256="1rmf1v2khsx82yzyyk51k7fbnbchf21lj9yqrays1z2mx3p1l1fc"; depends=[maxLik]; };
   trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
   trustOptim = derive2 { name="trustOptim"; version="0.8.6"; sha256="14vxcpdmp3avkjdwqyh3hj3v315zwdp7cl5f67pwzj3l69gm1yh5"; depends=[Matrix Rcpp RcppEigen]; };
-  tsBSS = derive2 { name="tsBSS"; version="0.2"; sha256="1rnfkrmfmha6pjcsl5zicafj5s2agr048j1rmqficyh3km0kz3i7"; depends=[JADE Rcpp RcppArmadillo]; };
+  tsBSS = derive2 { name="tsBSS"; version="0.3.1"; sha256="0dsf93as0afyfbsca6p3g23ss38jl55xkgb4lmimxd4c0kf8fy92"; depends=[ICtest JADE Rcpp RcppArmadillo]; };
   tsDyn = derive2 { name="tsDyn"; version="0.9-44"; sha256="09vxp2zir0vidzfm57j4cgkigsiyqwvr6ssy15ydfjxha30523a7"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
   tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
-  tsPI = derive2 { name="tsPI"; version="1.0.1"; sha256="0sdlcymhljw0di7mi5n4jmgqhfgvqix0jpp07f6wgjbqxkas4wr5"; depends=[KFAS]; };
+  tsPI = derive2 { name="tsPI"; version="1.0.2"; sha256="0lw4s7gxn4xldsk5f3dz27bb9jywa14195703b5q1497h9j966gk"; depends=[KFAS]; };
   tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; };
   tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-2"; sha256="19535zlr6gjg45f8z6hm98pamgn20z19m8qb63997vbj4azsrjfv"; depends=[]; };
   tsbridge = derive2 { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
@@ -10560,7 +10864,7 @@ in with self; {
   tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
   tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; };
   tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; };
-  tsiR = derive2 { name="tsiR"; version="0.2.0"; sha256="15n40xj2pcdzlrd8qr1igkp27dkni3i4761ilix2mdnaml8gng5x"; depends=[ggplot2 kernlab reshape2]; };
+  tsiR = derive2 { name="tsiR"; version="0.3.0"; sha256="1brlwsbs4rac8z6cf1q3xm1apdi4ban5hj7p3qvz2yx810gbxp1d"; depends=[ggplot2 kernlab reshape2]; };
   tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; };
   tsna = derive2 { name="tsna"; version="0.2.0"; sha256="09q01jzj1rnv2f2jf7djnq5xrkp7lvykdbf4bfswsy0f95j0asx2"; depends=[network networkDynamic statnet_common]; };
   tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; };
@@ -10591,7 +10895,7 @@ in with self; {
   tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; };
   tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; };
   tvm = derive2 { name="tvm"; version="0.3.0"; sha256="1iv0qrks1zdiq8jaqr1h46snq8wc3g3q017hxc8zc6fqnsz1whf6"; depends=[ggplot2 reshape2]; };
-  twang = derive2 { name="twang"; version="1.4-9.5"; sha256="1haj2aj14n0bk2gf00afrqan67986c8l75ps6ig505c2i0z4ivqd"; depends=[gbm lattice latticeExtra survey xtable]; };
+  twang = derive2 { name="twang"; version="1.5"; sha256="1sp1vb6l0mwpy9b9my5d3spc0q0zs7xg4dkmi4cl7hy7m9xy1dbk"; depends=[gbm lattice latticeExtra survey xtable]; };
   tweedie = derive2 { name="tweedie"; version="2.2.5"; sha256="1n08xdkqklh020zwgkkj6wbf7gyjghjl5wbs0xj83zi9jcmn08sn"; depends=[]; };
   tweenr = derive2 { name="tweenr"; version="0.1.5"; sha256="06h0vhxlljmvxg4a62sqrq53lpbvl5w19dqcpyw1jqvrb5agidnq"; depends=[Rcpp]; };
   tweet2r = derive2 { name="tweet2r"; version="1.0"; sha256="0v7xshk389k3aws72ww9kqc2ycw6l6q9xmhps47g3bdl64jy8bay"; depends=[ggmap ggplot2 maptools plyr rgdal ROAuth RPostgreSQL RSQLite sp spacetime spatstat splancs streamR]; };
@@ -10612,6 +10916,7 @@ in with self; {
   udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; };
   uiucthemes = derive2 { name="uiucthemes"; version="0.1.1"; sha256="0d1agg94z0qy6k4pbv01p1xb0zh42gkjl5i9kbqblplnk2swkzyi"; depends=[rmarkdown]; };
   ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; };
+  ukbtools = derive2 { name="ukbtools"; version="0.9.0"; sha256="0kdi5x8ylbqwnj4iwpfb8zc5w0ljr42iba517vcvznqh4072n2fv"; depends=[dplyr ggplot2 magrittr purrr readr XML]; };
   ukds = derive2 { name="ukds"; version="0.1.0"; sha256="00lgr9jy57bwa8p38mqcf4fk29g2w2wqk3pwf9av6f5lapzzgc94"; depends=[magrittr rio RSelenium stringr]; };
   ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; };
   ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; };
@@ -10626,7 +10931,7 @@ in with self; {
   uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; };
   uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
   uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
-  uniqueAtomMat = derive2 { name="uniqueAtomMat"; version="0.1-2"; sha256="15d6s44n1cvhpjsmwjly3nqq7q2zpi2ws6cw5jrxb97gacma896n"; depends=[]; };
+  uniqueAtomMat = derive2 { name="uniqueAtomMat"; version="0.1-3-2"; sha256="1msk9wzxhqdq6737b5xay1nqyvppb2yjcpnff2l7c7jf4xrlw0pp"; depends=[]; };
   unitedR = derive2 { name="unitedR"; version="0.2"; sha256="0glcyji0cypb2687cvyra0zzlzbq0md7qb60abgi0199hf51q3dj"; depends=[plyr]; };
   unitizer = derive2 { name="unitizer"; version="1.4.3"; sha256="0wcr58w1pf91hb3g8sgq7l6cw3idxn550i2aih8ixp1s3r1r757d"; depends=[crayon diffobj]; };
   units = derive2 { name="units"; version="0.4-5"; sha256="0sal0h1px9nbaqmd0d3s1x70lqs34qbj43b3pdrp7hvb4v48q82w"; depends=[udunits2]; };
@@ -10634,7 +10939,8 @@ in with self; {
   univOutl = derive2 { name="univOutl"; version="0.1-3"; sha256="0p6x38szag3ngk48rz3vlsph5y6yd2vckpkqfd9h7yz2ziyyy5m6"; depends=[Hmisc robustbase]; };
   unix = derive2 { name="unix"; version="1.3"; sha256="1l5w22j0h3qzya13wx7y8lx2baw496vcmn39l2y8r1v38as9dybc"; depends=[]; };
   unmarked = derive2 { name="unmarked"; version="0.12-2"; sha256="1ql8l7kc8py7zand164w3yszqbmwyxvrkjvr10l4hx2mkcnvxzx0"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; };
-  unpivotr = derive2 { name="unpivotr"; version="0.1.1"; sha256="0k7ddbkfcdgzfbd6lzgw8dax3f879ccc04yi9wkjvw1dzx4q69kk"; depends=[data_table dplyr dtplyr lazyeval magrittr purrr tibble tidyr]; };
+  unpivotr = derive2 { name="unpivotr"; version="0.2.1"; sha256="0gijbx2ziyfh9wl0a8dxnmm31961sdd9hi0i09frkqhxmcch45fx"; depends=[data_table dplyr dtplyr lazyeval magrittr purrr tibble tidyr xml2]; };
+  unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; };
   unrtf = derive2 { name="unrtf"; version="1.0"; sha256="16z2i5194hawbyfrc5xyr54vwcfnylhr6jdz1flnw8pylbjm4z1j"; depends=[sys]; };
   unsystation = derive2 { name="unsystation"; version="0.1.1"; sha256="0w5llr2kyv7g5fx5yvlyqwj4da5k5fq1f2y70c9pjdzrny9lpz4q"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
   untb = derive2 { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; };
@@ -10642,6 +10948,7 @@ in with self; {
   upclass = derive2 { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; };
   uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
   upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; };
+  uptasticsearch = derive2 { name="uptasticsearch"; version="0.0.2"; sha256="0ippi520hrwmrc7p7f5jrxfqlc50gqc901zxzmrwylpjgc56vrzw"; depends=[data_table futile_logger httr jsonlite purrr stringr uuid]; };
   uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; };
   uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; };
   urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; };
@@ -10653,32 +10960,33 @@ in with self; {
   useful = derive2 { name="useful"; version="1.2.3"; sha256="016fwnjrnq44m71jmiy8cpzncja77pii2ag2ir85jdk4fzgckn7l"; depends=[dplyr ggplot2 magrittr Matrix plyr purrr scales]; };
   userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.6-1"; sha256="07dy0xackm90nwwcwi0c2dabwjy1znf476vp0aimyfwiq0d8wqs7"; depends=[car data_tree DiagrammeR diptest fBasics GGally ggplot2 ggrepel GPArotation gridExtra gtable knitr lavaan MASS MBESS mosaic pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists XML xtable]; };
   uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
-  usl = derive2 { name="usl"; version="1.7.0"; sha256="116h8yfij7fkzd8va5w8v977fj2is86vlwzfnv28g3h0avdwysls"; depends=[nlmrt]; };
-  usmap = derive2 { name="usmap"; version="0.2.0"; sha256="1h7jv5bpgxiwdncibcsp2p4sfczx02qkfydla669r1rb4lh30h01"; depends=[]; };
+  usl = derive2 { name="usl"; version="1.8.0"; sha256="04w7p9i08a51smgg11kh4hablic5rjmr5hndrnlg49j5h20i7w1v"; depends=[nlsr]; };
+  usmap = derive2 { name="usmap"; version="0.2.1"; sha256="0ilg8fzrxpljdly8xkniirqa3lw74kfark75pv071aa4l6xkiwlg"; depends=[]; };
   ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
   utf8latex = derive2 { name="utf8latex"; version="1.0.4"; sha256="12isrl056h7y7nr7wk52dnvf3frcp66qqy7si869ark2aj81f959"; depends=[]; };
   utility = derive2 { name="utility"; version="1.4.1"; sha256="1q94ax5vp0js4rskklkq91mvz07m4ryn5z1333cxkjmgilv9975j"; depends=[]; };
-  utiml = derive2 { name="utiml"; version="0.1.2"; sha256="0x30pgsq4j8vm6d95j7g1zc5hmbibjm9q1gphrf2bday2czmzakk"; depends=[mldr]; };
+  utiml = derive2 { name="utiml"; version="0.1.3"; sha256="08r2qfvxlz50jzvhl0k9pvzf9xs8jm838bv9ncg59ir1b3ijbkk5"; depends=[mldr]; };
   uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; };
   uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.3"; sha256="1m8n6bans7kkwriqky92vvv2sbdacyq2pvbv2m5p37q7qk5215c2"; depends=[Exact geepack plyr sandwich survival]; };
   vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; };
   vaersvax = derive2 { name="vaersvax"; version="1.0.4"; sha256="15znkwbhr624qgwlcrdhaxpdfl85ym845mr2sy8b016d3ngz7n94"; depends=[]; };
-  valaddin = derive2 { name="valaddin"; version="0.1.0"; sha256="19j3vwg8nrsnqhdvn6865k7pf79cchlf1vkdrlz7w26lnfyzzv7p"; depends=[dplyr lazyeval purrr]; };
+  valaddin = derive2 { name="valaddin"; version="0.1.2"; sha256="0j1c3g9gn2j0manz3jjh58cnl7b1rfwm9494xqrfqpia8948p9vq"; depends=[lazyeval purrr]; };
   validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; };
-  validate = derive2 { name="validate"; version="0.1.7"; sha256="1z29q7v5dwaa334dp8qg6h2gyiv9a3fggrxzvx4jqjjjmip303db"; depends=[settings yaml]; };
+  validate = derive2 { name="validate"; version="0.2.0"; sha256="178paxywwiaa45pqhknpw2k6f08b35nlnhwvqv2d1d289fz4f6qh"; depends=[settings yaml]; };
   validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; };
   validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; };
   valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; };
   valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; };
-  valr = derive2 { name="valr"; version="0.3.0"; sha256="1gzai8kg5gh0l2aazrr13c8z0l4db4r4lqsr7qv7sv3rx3fcplws"; depends=[BH broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; };
+  valr = derive2 { name="valr"; version="0.3.1"; sha256="1f98qr204fv5dngm6qricx4mnrfds8nlpnszxidk4bnvhc23xq93"; depends=[BH broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; };
   valuer = derive2 { name="valuer"; version="1.1.1"; sha256="1pvzhx5irxww6vb8j4nsanlzgwaa4z96vw4l97h6l27h1403gdkb"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; };
-  varComp = derive2 { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[CompQuadForm MASS Matrix mvtnorm nlme quadprog RLRsim SPA3G]; };
+  vanddraabe = derive2 { name="vanddraabe"; version="1.0.0"; sha256="0hnfkwrrk50a5rica3lk2d52qi77xya3aspf13g0zygbyvv7ls72"; depends=[bio3d cowplot fastcluster ggplot2 openxlsx reshape2 scales]; };
+  varComp = derive2 { name="varComp"; version="0.2-0"; sha256="05a8f4r16ryy81has6k68p6bybg8khbqlbfm5b12ba8fdfy9lj87"; depends=[CompQuadForm MASS Matrix mvtnorm nlme quadprog RLRsim SPA3G]; };
   varSel = derive2 { name="varSel"; version="0.1"; sha256="0ddj3swfxzchs75kfi6h25h3c33hpapnd5kcwcijnqhlh902b1r0"; depends=[]; };
-  varSelRF = derive2 { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; };
+  varSelRF = derive2 { name="varSelRF"; version="0.7-8"; sha256="0h49rl1j13yfh97rsfsyh9s2c4wajny4rzms2qw77d0cavxqg53i"; depends=[randomForest]; };
   varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; };
   varbvs = derive2 { name="varbvs"; version="2.0-8"; sha256="1bjw90lz1499ykx1q6yj7qd9bks1794s4yf4lz4c7sm0vbdx31x6"; depends=[lattice latticeExtra Rcpp]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  vardpoor = derive2 { name="vardpoor"; version="0.9.4"; sha256="1k76jiaiyj577pz33v2piqzk6l7w1cn0js20i3rp1j73kgl2hjgl"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.9.8"; sha256="16fjikmjnb08gnwjahz9vjygk1apdgfijzwrv1rf8ny25310z0w2"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; };
   varhandle = derive2 { name="varhandle"; version="2.0.2"; sha256="1lbhwkkp9dyfhby6s4q3b6wy13wfqdjw3q21kq6k08rz7lsi0wny"; depends=[]; };
   variables = derive2 { name="variables"; version="0.0-30"; sha256="182c8c7cwkmrpk01bki94y6f3wgf2zdjvvcfa4paa6bfq8w9ckh3"; depends=[]; };
   varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
@@ -10688,9 +10996,10 @@ in with self; {
   vcd = derive2 { name="vcd"; version="1.4-3"; sha256="05azric2w8mrsdk7y0484cjygcgcmbp96q2v500wvn91fj98kkhp"; depends=[colorspace lmtest MASS]; };
   vcdExtra = derive2 { name="vcdExtra"; version="0.7-0"; sha256="0ggkv0khn9h6b787dnmkk38fkxgp84k4nn1c3gm12i7n47r58ygr"; depends=[ca gnm MASS vcd]; };
   vcfR = derive2 { name="vcfR"; version="1.5.0"; sha256="08hsfk69j2xafmf98izhnimxcda12fsqdvy94xhwy811sx9d7mvw"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tidyr vegan viridisLite]; };
-  vcrpart = derive2 { name="vcrpart"; version="0.4-2"; sha256="16ai6x9x068s91013k980svarpkr310a4mihmcl00mx7bf5lsww3"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
+  vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; };
+  vcrpart = derive2 { name="vcrpart"; version="1.0-0"; sha256="1qxj6jp9h0x64qh10amsy80kgwavji9fs5d2xc75g7w61mm2fq3p"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
   vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; };
-  vdiffr = derive2 { name="vdiffr"; version="0.1.1"; sha256="1aqmawwhz67j7rzrd6cabxvma532mndk3iy3wq2xdm9liwpn9yq4"; depends=[devtools fontquiver gdtools htmlwidgets purrr R6 Rcpp shiny svglite testthat xml2]; };
+  vdiffr = derive2 { name="vdiffr"; version="0.2.0"; sha256="1gm5saqi3z6jrngrl1bnqj79c646pmqps42v65qv4w31pwcwaaqc"; depends=[devtools fontquiver gdtools glue htmlwidgets purrr R6 Rcpp rlang shiny svglite testthat xml2]; };
   vdmR = derive2 { name="vdmR"; version="0.2.4"; sha256="05y2zaj37ydqrb3lw16mr8brwsdcdyl5bq1kb84shfmmi0qarsqa"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rgdal rgeos rjson Rook sp]; };
   vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
   vecsets = derive2 { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; };
@@ -10698,13 +11007,15 @@ in with self; {
   vegan = derive2 { name="vegan"; version="2.4-3"; sha256="15zcxfix2d854897k1lr0sfmj2n00339nlsppcr3zrb238lb2mi5"; depends=[cluster lattice MASS mgcv permute]; };
   vegan3d = derive2 { name="vegan3d"; version="1.1-0"; sha256="1rhqk9sj71mrb53r2pgdy87bdq3drx5j4a9ilwvw23dlvjry889l"; depends=[cluster rgl scatterplot3d vegan]; };
   vegclust = derive2 { name="vegclust"; version="1.6.5"; sha256="0y1lh4d2i3nxgc30wp6f14v2p14bx399y4cr5r7gv2gi76c5bhj4"; depends=[sp vegan]; };
-  vegdata = derive2 { name="vegdata"; version="0.9"; sha256="0hk56nbzg1c1q6shz9b04d60w9gd71f4fhyy89l98mcr41g8hjbc"; depends=[foreign httr jsonlite XML]; };
+  vegdata = derive2 { name="vegdata"; version="0.9.1"; sha256="0w4dk7qcl89w04qgnlna5lk5hxnyrvwmgjjxmnvb6r5dspq7qyad"; depends=[foreign httr jsonlite XML]; };
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
-  vein = derive2 { name="vein"; version="0.2.1-8"; sha256="1pyn4zcsk77mnd8y865sbd2prvpmbarpzmx0hbk5vf062vqwx2i7"; depends=[raster rgeos sp units]; };
+  vegtable = derive2 { name="vegtable"; version="0.1.0"; sha256="12nfw0263vw9x74siqdfmlyf7dxi0kyjrla5wiwn9gfq9xbz1hrj"; depends=[foreign plotKML qdapRegex sp taxlist vegdata]; };
+  vein = derive2 { name="vein"; version="0.2.2-3"; sha256="1jqcpb7p46wxih62ckl69wl1vzzwvy60fmnlram3kxb0iy88qvcv"; depends=[raster rgdal rgeos sp units]; };
   velociraptr = derive2 { name="velociraptr"; version="1.0"; sha256="1n7q08i37qbbh5cjq6jb4gmpzzip3wx2wx8xx5wpkln8n3nyiqki"; depends=[RCurl rgdal]; };
   velox = derive2 { name="velox"; version="0.1.0"; sha256="0jiza6myx4fj26agzbqjllr34f5kpmgcidrrv1r8jasljsbqf0n1"; depends=[raster Rcpp rgdal rgeos sp]; };
-  vembedr = derive2 { name="vembedr"; version="0.1.2"; sha256="0pqjf55rgylszgmzdhzr7m0lcqw3dw6c49i45r39yiq3wprc55qa"; depends=[htmltools httr magrittr stringr]; };
+  vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; };
   venn = derive2 { name="venn"; version="1.2"; sha256="18il18i13p92dm167c6mwppzjldp2blq482l5206lp1gqvxyc7f0"; depends=[]; };
+  vennLasso = derive2 { name="vennLasso"; version="0.1"; sha256="0bxygzxckv9b1nh33aggb914na7lxfpjbb9r68jhg5hxzm3xra7s"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; };
   venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
   vennplot = derive2 { name="vennplot"; version="0.9.02"; sha256="1q2hkp0kjz0wp7cdr3wnzlq9qasj8098cf048lx2sbav2b0bkrvz"; depends=[Rcpp rgl stringr]; };
   verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; };
@@ -10712,6 +11023,7 @@ in with self; {
   vertexenum = derive2 { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; };
   vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; };
   vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
+  vetr = derive2 { name="vetr"; version="0.1.0"; sha256="0bm390blcf7idav9rrnnhj9z76w6k53pvxmw99jq1amj7wlg2cf0"; depends=[]; };
   vfcp = derive2 { name="vfcp"; version="1.1.0"; sha256="0y4gql3vps3m029k4nj6bvsni8fn5qibbnxcz8sz5dxcp13c1in0"; depends=[]; };
   vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; };
   vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
@@ -10722,9 +11034,10 @@ in with self; {
   vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; };
   viridis = derive2 { name="viridis"; version="0.4.0"; sha256="03mha2935k1mw7mjjkq7mrx185hl0m3vq3967iiwbknpivbdxllk"; depends=[ggplot2 gridExtra viridisLite]; };
   viridisLite = derive2 { name="viridisLite"; version="0.2.0"; sha256="1546h44ng4dxs130jkh6lkh990hmp90m1w45sq5p47n546gr0k9d"; depends=[]; };
-  virtualspecies = derive2 { name="virtualspecies"; version="1.4-1"; sha256="02n83j10z7m8bjlavm2c6v58z1flhxn36j0h00c5xm085brzww3y"; depends=[ade4 dismo raster rworldmap]; };
+  virtualspecies = derive2 { name="virtualspecies"; version="1.4-2"; sha256="19qw8vqf08x6fgm8w159qabpgr2wv2cxishpj6888ihcaa9ykp8f"; depends=[ade4 dismo raster rworldmap]; };
   virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; };
-  visNetwork = derive2 { name="visNetwork"; version="2.0.0"; sha256="0nb5436kz1md72fyaq1fkari2933frhalpg19lmx2mj8875k2ikp"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
+  visNetwork = derive2 { name="visNetwork"; version="2.0.1"; sha256="1dvnr7zw1azggmdvr281q2kyy6b7gj36vcjp2xc1zblwiz2r35sq"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
+  visdat = derive2 { name="visdat"; version="0.1.0"; sha256="1r009jlg3wwg06j5066c09567q24986c74f0cd68kcbmihaxngbx"; depends=[dplyr ggplot2 magrittr purrr tidyr]; };
   visreg = derive2 { name="visreg"; version="2.4-1"; sha256="1lkp668ni5p7k0vzcr75p1bsc1pyg0j0sghagdjb11abinmfzsm1"; depends=[lattice]; };
   vistime = derive2 { name="vistime"; version="0.4.0"; sha256="0fahih28q7lyywnm4mri9macdx4c5b3c5djmg557f7dxlyhhjw0l"; depends=[plotly RColorBrewer]; };
   visualFields = derive2 { name="visualFields"; version="0.4.3"; sha256="0ws3cz71hhhrf4xkdb644li04d31wf51xb2sq789bl2lf50q6a1a"; depends=[flip gridBase Hmisc matrixStats]; };
@@ -10733,7 +11046,7 @@ in with self; {
   vitality = derive2 { name="vitality"; version="1.2"; sha256="0vjbf39i7qm3857gyidg2j5hfimpydav1sx2d07n12b8q1cs8k4p"; depends=[]; };
   vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; };
   vmsbase = derive2 { name="vmsbase"; version="2.1.3"; sha256="1y4r1f6miwxx3q8pajyh202wvjz08w6291jvpv723qyxa6z1r69a"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets gWidgetsRGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; };
-  vocaldia = derive2 { name="vocaldia"; version="0.8.1"; sha256="14rh8f936p8fadlinn0n9d3l7q60bp3a1mgqag9m4q310477lf36"; depends=[]; };
+  vocaldia = derive2 { name="vocaldia"; version="0.8.2"; sha256="15314sq2gbi1z47ppvy8y3ljjk12jq4k5a1dfyi56h2lpzrc76ny"; depends=[]; };
   vortexR = derive2 { name="vortexR"; version="1.1.4"; sha256="1zjrywjh8nrzaqmrl2yym481j0y40126xz8lh52vc8pk041p3xdb"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; };
   vortexRdata = derive2 { name="vortexRdata"; version="1.0.3"; sha256="1pq910xaqk6d5amg8hj7xagb5wn2ahfrmqairf3vhwqx55lhjbg1"; depends=[]; };
   vote = derive2 { name="vote"; version="1.0-0"; sha256="1fx5x5248s48n86gdclv8pjnllly89rw0l6d2is263qqndn9fsk9"; depends=[formattable knitr]; };
@@ -10753,17 +11066,18 @@ in with self; {
   wCorr = derive2 { name="wCorr"; version="1.9.1"; sha256="1n4qd11bh0aq80fsw68vfky7nnvgkk6irsfjrknkf9bjvwvihlak"; depends=[minqa mnormt Rcpp RcppArmadillo]; };
   wPerm = derive2 { name="wPerm"; version="1.0.1"; sha256="0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4"; depends=[]; };
   wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
-  wTO = derive2 { name="wTO"; version="1.2.0"; sha256="0hn78jndq45grc459y5ylpqlcy0p2cij7jgyzk2m4xiz7mm84s9h"; depends=[data_table igraph magrittr plyr som visNetwork]; };
+  wTO = derive2 { name="wTO"; version="1.2.2"; sha256="1cr61c9vq5axx7g35f1cikny2dcjsy5kgmhmrhmbyljh6pipv99i"; depends=[data_table igraph magrittr plyr reshape2 som visNetwork]; };
+  waccR = derive2 { name="waccR"; version="0.1.0"; sha256="092p1bibyqx1gcrch68l9ilzilg5aqf46b6iagm562292cfi074l"; depends=[dplyr lubridate magrittr rvest tibble xml2]; };
   waffect = derive2 { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; };
   waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
   wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
   wakefield = derive2 { name="wakefield"; version="0.3.0"; sha256="1f74503ar4hw48j13npgzybvwc631xndldidqnyfk72wb11fzi4z"; depends=[chron dplyr ggplot2 stringi]; };
-  walker = derive2 { name="walker"; version="0.1.0"; sha256="19bmilx6iyv5d9gcfllrm2v3p4k2sg3yj5s57367lyjla38rw5dz"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
+  walker = derive2 { name="walker"; version="0.2.0"; sha256="0mr4ihai82w217kmg60b910jk9pjmzysws8b2j91w5528yv618kv"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; };
   walkr = derive2 { name="walkr"; version="0.3.4"; sha256="01278hfa9mppwqmr54826gb65pswhqbh7ai8ij6m4ncc0fk6pvvd"; depends=[ggplot2 hitandrun limSolve MASS Rcpp RcppEigen shinystan]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
   wallace = derive2 { name="wallace"; version="0.6.4"; sha256="0ydhzklhpn9hqm6np9g0kjlry4z3w91ix89s587w0j8v5lxjivwd"; depends=[devtools dismo dplyr DT ENMeval leaflet magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyBS shinyjs shinythemes spocc spThin]; };
   wally = derive2 { name="wally"; version="1.0.9"; sha256="1g6dywny8s8fpdnfvrlbzsp9d9dhxdxrm1j4dd3b9r6rpiajf964"; depends=[data_table prodlim riskRegression]; };
-  walrus = derive2 { name="walrus"; version="1.0.0"; sha256="1y68nvr1fscvd24mkyapp1g7xrbbi1v22p971ipj63ygb7jh2k24"; depends=[ggplot2 jmvcore R6 WRS2]; };
+  walrus = derive2 { name="walrus"; version="1.0.1"; sha256="032s2k122z5cqkcjvh9gva4vvmj5prn6z3rs8j5y16d98kgambpy"; depends=[ggplot2 jmvcore R6 WRS2]; };
   wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; };
   warbleR = derive2 { name="warbleR"; version="1.1.8"; sha256="0igh1vk4j39bbrzbgfjllzp5kzj2znqdcbl433m1qd476ajfa54k"; depends=[bitops doParallel dtw fftw foreach iterators jpeg maps monitoR pbapply proxy RCurl rjson seewave signal tuneR]; };
   warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; };
@@ -10775,7 +11089,7 @@ in with self; {
   waveband = derive2 { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; };
   waved = derive2 { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; };
   wavelets = derive2 { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; };
-  wavemulcor = derive2 { name="wavemulcor"; version="1.2"; sha256="1039y5rakjkx2mvfmykg2z4jpkpbcj7rclyg7ab19wnxmdm8ls81"; depends=[waveslim]; };
+  wavemulcor = derive2 { name="wavemulcor"; version="2.1.0"; sha256="0z2vyb3rsxxh7k9fgaxi0xa6rwrw3pka1h4xkfrb9xydsacwbvx2"; depends=[waveslim]; };
   waver = derive2 { name="waver"; version="0.2.0"; sha256="0zxhnrxc68i5jvkc0k2gk11wf0hj92slhb40qiddryx3i7m2yrli"; depends=[geosphere rgdal rgeos sp]; };
   waveslim = derive2 { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqhhk57m9vkbnfsznkvk8430cvbcsn7vridii"; depends=[]; };
   wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; };
@@ -10806,11 +11120,11 @@ in with self; {
   welchADF = derive2 { name="welchADF"; version="0.1"; sha256="0266iswgy2fbsc001jz5mvb0mx8rg1ys1dsy5956gxqg9hiibp1n"; depends=[]; };
   wellknown = derive2 { name="wellknown"; version="0.1.0"; sha256="0cin4xi1780hglmcfyjiynvh1lm90yryl1m6z1snpprfzsxx3mmg"; depends=[jsonlite magrittr]; };
   wesanderson = derive2 { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; };
-  wfe = derive2 { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm MASS Matrix]; };
+  wfe = derive2 { name="wfe"; version="1.6"; sha256="0y8f042hzlqwgsr63rl2apl7hkw9bs69a287dynvz9w078am61ch"; depends=[arm MASS Matrix]; };
   wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; };
   wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; };
   wgaim = derive2 { name="wgaim"; version="1.4-11"; sha256="1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg"; depends=[lattice qtl]; };
-  wgeesel = derive2 { name="wgeesel"; version="1.3"; sha256="1qy55819rm20dpfyi9gcmv16w3aakj8k8w7zhfcwbbyacvrz1zrp"; depends=[bindata geepack MASS PoisNor]; };
+  wgeesel = derive2 { name="wgeesel"; version="1.4"; sha256="0d49j24jmk6n7fzzdvhc9fxi8yb1shghf7fc7jvm3cahhjffxay2"; depends=[bindata geepack MASS PoisNor]; };
   wgsea = derive2 { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; };
   whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
   whoami = derive2 { name="whoami"; version="1.1.1"; sha256="1njyjzp9jl5k0vys0ymnvx9vbfckscg4r8hgl1nq7a2q9b9cg06f"; depends=[httr jsonlite]; };
@@ -10818,20 +11132,21 @@ in with self; {
   wicket = derive2 { name="wicket"; version="0.3.0"; sha256="1n6ji4zx48japlfbqyz4hbk40vr58l8d3wjdagjvc2jqx36cn19k"; depends=[BH Rcpp]; };
   widals = derive2 { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
   widenet = derive2 { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
-  widgetframe = derive2 { name="widgetframe"; version="0.2.0"; sha256="17kb0x5kgyq01b1y8d7gq1wp5rgi9f14ih11i48lsackks6cywq2"; depends=[htmltools htmlwidgets magrittr purrr]; };
+  widgetframe = derive2 { name="widgetframe"; version="0.3.0"; sha256="1yza8wylfrs3lfrc1hlhjga0j94m7ngq9ikkia1f87wmc3w59sjh"; depends=[htmltools htmlwidgets magrittr purrr]; };
+  widyr = derive2 { name="widyr"; version="0.1.0"; sha256="0vy34phli9jynjdwss8cpadaaizh9bhc1h0amsblc0il6xanviqm"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; };
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
-  wikilake = derive2 { name="wikilake"; version="0.2"; sha256="0z03bn4d1pllhxbyaf4knn2p8in3a3b0m32g5lxhi2lhh4sasc5h"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; };
+  wikilake = derive2 { name="wikilake"; version="0.3"; sha256="1y4vinm8gxyj6x36nb4xzhx1yf96x1nwlzzhvj4g36rbcix7dn6q"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.10"; sha256="10av87jlfn2lfx37bnhlpdnhg657md9jx3c3frc9a4mm4lhl7rbv"; depends=[hellno httr jsonlite rvest stringr xml2]; };
   wikitaxa = derive2 { name="wikitaxa"; version="0.1.4"; sha256="0d6ycn8j40lcc4plv7z34h14icaljywbl7b91gd803wxln4nhr6f"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; };
-  wildcard = derive2 { name="wildcard"; version="1.0.1"; sha256="1qdzbpaymlifp2fhrv84z1gp3sqjlav1wsmcn2990z3d7mr3s5mc"; depends=[magrittr stringi]; };
+  wildcard = derive2 { name="wildcard"; version="1.0.3"; sha256="1k4780g1r67p2n6432kx6xqqacl6rrnvdihvgrp5x5cayz7m7z6z"; depends=[magrittr stringi]; };
   wildlifeDI = derive2 { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; };
   wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; };
   windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
-  windfarmGA = derive2 { name="windfarmGA"; version="1.0"; sha256="1zfgfi762wrnmpws9g7kcp4smc6a45kgm04il25igbvza2l37p1m"; depends=[calibrate data_table dplyr geoR ggplot2 googleVis gstat gtools maptools raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp]; };
+  windfarmGA = derive2 { name="windfarmGA"; version="1.1.1"; sha256="1fns58q8bzsa6z8dghqs41xiv331pl75d4awrfgwslbg3lrd2x49"; depends=[calibrate data_table dplyr geoR ggplot2 googleVis gstat gtools leaflet maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; };
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
   wiqid = derive2 { name="wiqid"; version="0.1.1"; sha256="0nibk10hmx4w17cn7x6m6nhybhv2s6vrrgqzn8s4jpffsbdc4cpv"; depends=[coda HDInterval MASS truncnorm]; };
-  withr = derive2 { name="withr"; version="1.0.2"; sha256="042z8nmqqilgrvhmbqrjc05qys3gzwq1rqy2wxp2bi5d41859493"; depends=[]; };
+  withr = derive2 { name="withr"; version="2.0.0"; sha256="0ncq9ygx33rx7aazn53p0a0vbr5xv0r6wbkzcwbhbwyd8k55bgin"; depends=[]; };
   wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; };
   wktmo = derive2 { name="wktmo"; version="1.0.3"; sha256="037hjc7kn171iji8yv2xl6wngxp2dsjw1zrsgpnqnmr9m530a5qf"; depends=[]; };
   wle = derive2 { name="wle"; version="0.9-91"; sha256="18gqwrrw618f1xx93n0lk95gpi3lxvfkr6fmlb82v2wiibb7k7ak"; depends=[circular]; };
@@ -10840,7 +11155,8 @@ in with self; {
   wnominate = derive2 { name="wnominate"; version="1.2"; sha256="0kkdlhliihv45hc0fd25kairxd9r71hcx04ri9l0iy8cyhjs2n12"; depends=[pscl]; };
   woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
   woeBinning = derive2 { name="woeBinning"; version="0.1.4"; sha256="0fjflnhyya93xns2mcklq8vw5zwwivw1ahz4smdmlcpxf35f9cz9"; depends=[]; };
-  womblR = derive2 { name="womblR"; version="1.0.0"; sha256="04qifd1s6xyhl559a8pw42ixj6i5x22hg26chalw2yxzclmgqdcm"; depends=[mvtnorm Rcpp RcppArmadillo]; };
+  womblR = derive2 { name="womblR"; version="1.0.1"; sha256="0s1xaqg0xjdv288sd2zd5q6y6fwq9b5h6zpq88rg0b6gkh78sdhy"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
+  wooldridge = derive2 { name="wooldridge"; version="1.0.1"; sha256="05r48x70h8pkasnzkw74p8n5iaj422kf21yx8qfv79ksdwryaxzc"; depends=[]; };
   word_alignment = derive2 { name="word.alignment"; version="1.0.6"; sha256="02hhl8357ykbf04gr8gjb9vkhimmb3fbi5jxrwy8dr0qysnz1kzg"; depends=[data_table openxlsx quanteda]; };
   wordbankr = derive2 { name="wordbankr"; version="0.2.0"; sha256="041d5v3gm7bihx85k7kxwlqgg6vs24wzs2h59zf3l3cs39mhrhs5"; depends=[assertthat dplyr magrittr RMySQL stringr tidyr]; };
   wordcloud = derive2 { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; };
@@ -10855,18 +11171,19 @@ in with self; {
   wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
   wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
   wpp2015 = derive2 { name="wpp2015"; version="1.1-0"; sha256="01vsdma2fgh0vd96ly4f704hl200v0w8ksz60gjxhm44ih3qszh3"; depends=[]; };
-  wpp2017 = derive2 { name="wpp2017"; version="1.0-1"; sha256="0vl8sj2zxar4di0dfmls1m5m43xq6hzdrva6rzsazg2ir0wz15wn"; depends=[]; };
-  wppExplorer = derive2 { name="wppExplorer"; version="2.1-0"; sha256="1qw3az6aaqcn62m57gccr2kaw1d3s0zj0gxjdjvnjvk4n1sjkkmv"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2017]; };
+  wpp2017 = derive2 { name="wpp2017"; version="1.1-0"; sha256="0w1mh21zgkj22gwyxpd0vi6m8s7h28ad1hz0n7spr8fk46jd7d4a"; depends=[]; };
+  wppExplorer = derive2 { name="wppExplorer"; version="2.1-1"; sha256="0n0ayn8bxkrabw2iyqv3hfkdchbk9bzv1lhkjpxnjb6z3zl1sggl"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2017]; };
+  wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
   wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="0.1.3"; sha256="1crsq3dcd3xdd91h129mix6av6pvl26w8xxa181g98553rsmd01l"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="0.4.0"; sha256="1vzqq5na85k7ds9f68jayysahsb01hb57p8qx3pwdljqiba2pj6i"; depends=[]; };
   wrassp = derive2 { name="wrassp"; version="0.1.4"; sha256="0w1hzxwk00lk1hkdxxz6vqa6xzw5sf60y54xzfr510yd02x3r1gn"; depends=[]; };
   write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
   wrspathrow = derive2 { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
   wrspathrowData = derive2 { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
   wrswoR = derive2 { name="wrswoR"; version="1.0-1"; sha256="1czw3g2j6as024wwvxiizvvxjmsxmxhz86jbw2lh95nh61znb7l8"; depends=[logging Rcpp]; };
   wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.1-1"; sha256="1a2ymyf1yww43i79hc912jpyqvbx44qn5bfnjwf4hq3mp707731j"; depends=[curl lazyeval]; };
-  wru = derive2 { name="wru"; version="0.1-5"; sha256="1qc3x6wxai2qwshafx56gx9bjx75ihw1xqzq4p25av8w6xp6b79a"; depends=[devtools]; };
+  wru = derive2 { name="wru"; version="0.1-6"; sha256="1lpfpw4c9nn74n7z5wc42had9k5zrjcd2xjycfknxd8wglwzmd41"; depends=[devtools]; };
   wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; };
   wsrf = derive2 { name="wsrf"; version="1.7.13"; sha256="07dmimn58byr5dyszckazxjs2gjjk6g3si9wa5f10gbgzpc0713p"; depends=[Rcpp]; };
   wtest = derive2 { name="wtest"; version="1.0"; sha256="0rn2wp4xqd1b95asc1ppscfm21p3r85za778f88kgqax2lx7kq96"; depends=[]; };
@@ -10878,7 +11195,7 @@ in with self; {
   x13binary = derive2 { name="x13binary"; version="1.1.39-1"; sha256="1v6slh5136av3l7bk99a57gj6i6khx2j55qv4pyz1zmrzzgaayyc"; depends=[]; };
   xLLiM = derive2 { name="xLLiM"; version="2.1"; sha256="1q6ryw9z5wi0amv5f4drz14p36zy8gc2a0s59q10jixhhyas7ycl"; depends=[abind capushe corpcor igraph MASS Matrix]; };
   xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; };
-  xaringan = derive2 { name="xaringan"; version="0.3"; sha256="07b5gw5dn7qhvximi0f2zca78ld00hdl2n9lr7wyf1bpkxzp625b"; depends=[htmltools knitr rmarkdown servr]; };
+  xaringan = derive2 { name="xaringan"; version="0.4"; sha256="1yc6wgn3x25csl8sk0xl2v5ddw5hz1h0hqqxqxnz8f7hf5hkg9mg"; depends=[htmltools knitr rmarkdown servr]; };
   xbreed = derive2 { name="xbreed"; version="1.0.1"; sha256="0grrfra9j0k3mqikmrif5qawh4260ayr40irskzpp9ywsixim63h"; depends=[BGLR]; };
   xergm = derive2 { name="xergm"; version="1.8.2"; sha256="0rg8b0r27nzjnf0zkwfbkw96439h0b40k1l5lqi5igyr0bm7w0cc"; depends=[btergm GERGM rem tnam xergm_common]; };
   xergm_common = derive2 { name="xergm.common"; version="1.7.7"; sha256="0nfls8a1knmnjjrrw0q93qsfrrb9p3yqsm5dxp13z0780vrzxvcj"; depends=[ergm network]; };
@@ -10892,7 +11209,7 @@ in with self; {
   xlsx = derive2 { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
   xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
   xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; };
-  xmeta = derive2 { name="xmeta"; version="1.1-3"; sha256="18m28zf4rg0czxagqp2f0c36qkan7s17414vkrknc6s1xja44gaq"; depends=[aod glmmML metafor mvmeta numDeriv]; };
+  xmeta = derive2 { name="xmeta"; version="1.1-4"; sha256="1y9jldi8qn4jpr05g8fnvb23gig180hh36pc2v4y8n8289s9yvg2"; depends=[aod glmmML metafor mvmeta numDeriv]; };
   xml2 = derive2 { name="xml2"; version="1.1.1"; sha256="05iifrcgzx53w5ciw8bbm4vdwc3giv4xsvazv8chqxkndfvf7wq0"; depends=[BH Rcpp]; };
   xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.1"; sha256="0q9d4l3p4ypc0qswnjwrd3as9bx9f1niixsc19y1msva51sg5h39"; depends=[]; };
   xoi = derive2 { name="xoi"; version="0.66-9"; sha256="1kd9s9afq5shsaqhrxai9yz60a9imyy5np76fjpkjgyz56kbk6nr"; depends=[qtl]; };
@@ -10904,7 +11221,7 @@ in with self; {
   xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; };
   xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
   xtractomatic = derive2 { name="xtractomatic"; version="3.3.2"; sha256="10a1apsjqg0cpr267g5336cl6qr3ax03jcl234l9a8b2nh8sbwi5"; depends=[httr ncdf4 sp]; };
-  xts = derive2 { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
+  xts = derive2 { name="xts"; version="0.10-0"; sha256="1w7lxy3hbf005fvpzbwiznj8jbxi07s4189vbgxisd35l9a4v6q4"; depends=[zoo]; };
   xxIRT = derive2 { name="xxIRT"; version="2.0.1"; sha256="1a31jyzc37bq3068vq18rdj0fn66jihk7d1qmqk8lq76gg72dwk6"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; };
   xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; };
   xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; };
@@ -10921,26 +11238,27 @@ in with self; {
   yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; };
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
   yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
-  yuima = derive2 { name="yuima"; version="1.6.4"; sha256="1fqvpas04k37h06nspjfnqk74ydfgihascjz5j939nprcax0fx9x"; depends=[cubature expm mvtnorm Rcpp RcppArmadillo zoo]; };
+  yuima = derive2 { name="yuima"; version="1.6.8"; sha256="1x10q2l8xd3h86m333mi6hkb7fpf4q5fbs7gwmlynylkz216b65j"; depends=[cubature expm mvtnorm Rcpp RcppArmadillo zoo]; };
   yuimaGUI = derive2 { name="yuimaGUI"; version="1.1.0"; sha256="1q2v9hpj9j74f7ram92npglrqwyysnvv1bvk64qb7s9lpyv852zk"; depends=[DT ggplot2 quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
-  zCompositions = derive2 { name="zCompositions"; version="1.0.3-1"; sha256="1408bb5nfipsxskgpjzixnxndg7hf48nq27k0pwrcxx16wykmlcy"; depends=[MASS NADA truncnorm]; };
-  zFactor = derive2 { name="zFactor"; version="0.1.4"; sha256="1iay7w19fqimnj6hly0hq9d6q100frncpy07rn8b9hirfyywqsz9"; depends=[data_table dplyr ggplot2 rootSolve tibble tidyr]; };
+  zCompositions = derive2 { name="zCompositions"; version="1.1.1"; sha256="1j6v7mfxhn67mr3q6cvcjj9pqc8a02w114z8q74h3l6jw8ahjg6m"; depends=[MASS NADA truncnorm]; };
+  zFactor = derive2 { name="zFactor"; version="0.1.6"; sha256="0mgqrqdqgm49yf7hmmnak21srxdvlbp57apjgr72w7iy0pwrlf58"; depends=[data_table dplyr ggplot2 rootSolve tibble tidyr]; };
   zTree = derive2 { name="zTree"; version="1.0.4"; sha256="058vjvxn1lw07nxw8rs1b8vnw6ccxh3swrmvjicvr35xmakj8qa0"; depends=[plyr]; };
-  zeallot = derive2 { name="zeallot"; version="0.0.3"; sha256="0cxrq9lf184szysccx7zhhgsimixhkpdybgj05asi5kbrlf03pn6"; depends=[]; };
+  zeallot = derive2 { name="zeallot"; version="0.0.4"; sha256="0chwwlnqsp200n65b93hspfzihv73pmlw31xxf7a5nqx64917axq"; depends=[]; };
   zebu = derive2 { name="zebu"; version="0.1.1"; sha256="1d1s455vckd7148dycsqcfsdql0l4pzanipqn5k60kla03bic5i5"; depends=[doParallel foreach ggplot2 iterators plyr reshape2]; };
   zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
   zenplots = derive2 { name="zenplots"; version="0.0-1"; sha256="0agm81rrn4ip6sljrwm1a9i2q9rwdwamnxm0smz757kypgyll8c2"; depends=[graph MASS PairViz]; };
   zetadiv = derive2 { name="zetadiv"; version="1.0.1"; sha256="0a50xj7bgb2w3yx2ghpwq2y2hkilxx0dchhscspzjalyw77jhxvp"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
   zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; };
-  zic = derive2 { name="zic"; version="0.9"; sha256="0i39983blc46vjbb4y36rypg9q3zammxahk63p089m43gi22ycxh"; depends=[coda Rcpp RcppArmadillo]; };
+  zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; };
   zip = derive2 { name="zip"; version="1.0.0"; sha256="0rgr9pcdhdq3k8n29h2ircp3ri1ibhrx81gja1y7331v15xyrabg"; depends=[]; };
   zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
-  zipfR = derive2 { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; };
+  zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; };
   ziphsmm = derive2 { name="ziphsmm"; version="1.0.6"; sha256="1d1agp57hyxsj0bf6vhj5g5v7f7vnv338kiy7wzji07sc2illw8y"; depends=[Rcpp RcppArmadillo]; };
   zoeppritz = derive2 { name="zoeppritz"; version="1.0-6"; sha256="0b16w8s26pi5h911jizwqapgwhdh60gcx0khn3kayf9fi40kyzp0"; depends=[]; };
   zoib = derive2 { name="zoib"; version="1.4.2"; sha256="0gdbcnxlm9m88c2av4zy0k3yvm2cvg24804xnsi0mwfgwmnngdh5"; depends=[abind coda Formula matrixcalc rjags]; };
+  zonator = derive2 { name="zonator"; version="0.5.8"; sha256="1slpyg8h5vb695gf31z66m4isibvckbk7b19vbl8s5svgh7ddl12"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; };
   zoo = derive2 { name="zoo"; version="1.8-0"; sha256="0mqklbx92ifwa0awm7gpm4r9dvwa09p55zjxjnypiqsxy532r4h9"; depends=[lattice]; };
   zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; };
   zooaRchGUI = derive2 { name="zooaRchGUI"; version="1.0.2"; sha256="0snggx0d69ajz6xxwnv03l12jpjrjkpy2dgf4lrpm2l8rspd27i4"; depends=[car coda foreign geomorph ggplot2 MASS pgirmess raster readxl rjags sp spdep splancs tcltk2 tkrplot vegan]; };

From 86e6e8016d0f9280167745c19d394311be0f9002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 31 Aug 2017 21:59:07 +0100
Subject: [PATCH 3153/3246] nodePackages.multi-file-swagger: init at 2.2.0

fixes #28737
---
 .../node-packages/node-packages-v4.nix        |  10 +-
 .../node-packages/node-packages-v6.json       |   1 +
 .../node-packages/node-packages-v6.nix        | 149 +++++++++++++-----
 3 files changed, 112 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index bed5381fa48..a04b8ceb8fd 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -4954,13 +4954,13 @@ let
         sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
-    "supports-color-4.3.0" = {
+    "supports-color-4.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.3.0";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.3.0.tgz";
-        sha512 = "3zlrvz89lkcf45xbbwx5lx216ics9xnmn7jg3rwlwfh6q2wrpd08xys3jj70c4qi6ipapd19n4brkz3nvzxi8fdlqj56rp0hd8vrzv1";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";
+        sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
       };
     };
     "color-convert-1.9.0" = {
@@ -8276,7 +8276,7 @@ in
                     ];
                   })
                   sources."escape-string-regexp-1.0.5"
-                  (sources."supports-color-4.3.0" // {
+                  (sources."supports-color-4.4.0" // {
                     dependencies = [
                       sources."has-flag-2.0.0"
                     ];
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 69639cdcbc8..c719d11f170 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -45,6 +45,7 @@
 , "livedown"
 , "meat"
 , "mocha"
+, "multi-file-swagger"
 , "nijs"
 , "node2nix"
 , "node-gyp"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 66175d76825..a626d7b9657 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -9683,13 +9683,13 @@ let
         sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
       };
     };
-    "core-js-2.5.0" = {
+    "core-js-2.5.1" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.5.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz";
-        sha1 = "569c050918be6486b3837552028ae0466b717086";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz";
+        sha1 = "ae6874dc66937789b80754ff5428df66819ca50b";
       };
     };
     "home-or-tmp-2.0.0" = {
@@ -9872,13 +9872,13 @@ let
         sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n";
       };
     };
-    "supports-color-4.3.0" = {
+    "supports-color-4.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.3.0";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.3.0.tgz";
-        sha512 = "3zlrvz89lkcf45xbbwx5lx216ics9xnmn7jg3rwlwfh6q2wrpd08xys3jj70c4qi6ipapd19n4brkz3nvzxi8fdlqj56rp0hd8vrzv1";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";
+        sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
       };
     };
     "color-convert-1.9.0" = {
@@ -10160,13 +10160,13 @@ let
         sha512 = "07qdg1b3fwg8b7zwq83rljcx2h0ybq8s43h5xkvsr252qij7ib2gcjamqsb25zv1nvxm94yrvf4fl41s1kyms8zhr86cspwcbggvc94";
       };
     };
-    "inquirer-3.2.2" = {
+    "inquirer-3.2.3" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "3.2.2";
+      version = "3.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.2.tgz";
-        sha512 = "0gsmdyd280pgvy7aqam9hdjhpljwmyn2axwmf2gp6qrc8cxrykrshan1kr1s1f9cb8pf13m3jav92df9dbn1gwkk7i08m698768nckd";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.3.tgz";
+        sha512 = "1dncd0lws3fdvpgxzhi7y4lcfijrnhphn9bzxlhdl3c2aifqff1v6c6i85niwg9fim26ja1x0d6rfgy5g1dgqyh86g363d955pcmk85";
       };
     };
     "is-resolvable-1.0.0" = {
@@ -15876,6 +15876,15 @@ let
         sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821";
       };
     };
+    "json-refs-2.1.7" = {
+      name = "json-refs";
+      packageName = "json-refs";
+      version = "2.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-refs/-/json-refs-2.1.7.tgz";
+        sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89";
+      };
+    };
     "optparse-1.0.5" = {
       name = "optparse";
       packageName = "optparse";
@@ -18963,13 +18972,13 @@ let
         sha1 = "8a7bd37186b6dddf3813f23858b57ecaaf5e41d4";
       };
     };
-    "toml-2.3.2" = {
+    "toml-2.3.3" = {
       name = "toml";
       packageName = "toml";
-      version = "2.3.2";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/toml/-/toml-2.3.2.tgz";
-        sha1 = "5eded5ca42887924949fd06eb0e955656001e834";
+        url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz";
+        sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv";
       };
     };
     "clone-deep-0.3.0" = {
@@ -24648,7 +24657,7 @@ in
         dependencies = [
           sources."chalk-2.1.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.3.0"
+          sources."supports-color-4.4.0"
         ];
       })
       sources."ink-text-input-1.1.0"
@@ -24753,7 +24762,7 @@ in
       sources."repeating-2.0.1"
       sources."is-finite-1.0.2"
       sources."number-is-nan-1.0.1"
-      sources."core-js-2.5.0"
+      sources."core-js-2.5.1"
       sources."home-or-tmp-2.0.0"
       sources."mkdirp-0.5.1"
       sources."source-map-support-0.4.16"
@@ -24884,7 +24893,7 @@ in
       (sources."chalk-2.1.0" // {
         dependencies = [
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.3.0"
+          sources."supports-color-4.4.0"
         ];
       })
       sources."concat-stream-1.6.0"
@@ -24902,7 +24911,7 @@ in
       sources."globals-9.18.0"
       sources."ignore-3.3.5"
       sources."imurmurhash-0.1.4"
-      sources."inquirer-3.2.2"
+      sources."inquirer-3.2.3"
       sources."is-resolvable-1.0.0"
       sources."js-yaml-3.9.1"
       sources."json-stable-stringify-1.0.1"
@@ -25057,7 +25066,7 @@ in
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.3.0"
+          sources."supports-color-4.4.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -25090,12 +25099,12 @@ in
       sources."globals-9.18.0"
       sources."ignore-3.3.5"
       sources."imurmurhash-0.1.4"
-      (sources."inquirer-3.2.2" // {
+      (sources."inquirer-3.2.3" // {
         dependencies = [
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.3.0"
+          sources."supports-color-4.4.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -26396,7 +26405,7 @@ in
       sources."type-detect-4.0.3"
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.3.0"
+      sources."supports-color-4.4.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -26990,7 +26999,7 @@ in
           sources."debug-2.6.8"
         ];
       })
-      sources."core-js-2.5.0"
+      sources."core-js-2.5.1"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
       (sources."expand-braces-0.1.2" // {
@@ -27498,7 +27507,7 @@ in
       sources."glob-parent-3.1.0"
       sources."globby-6.1.0"
       sources."graceful-fs-4.1.11"
-      (sources."inquirer-3.2.2" // {
+      (sources."inquirer-3.2.3" // {
         dependencies = [
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -27558,7 +27567,7 @@ in
       })
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.3.0"
+      sources."supports-color-4.4.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -28368,6 +28377,60 @@ in
     };
     production = true;
   };
+  multi-file-swagger = nodeEnv.buildNodePackage {
+    name = "multi-file-swagger";
+    packageName = "multi-file-swagger";
+    version = "2.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/multi-file-swagger/-/multi-file-swagger-2.2.0.tgz";
+      sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5";
+    };
+    dependencies = [
+      sources."commander-2.11.0"
+      sources."js-yaml-3.9.1"
+      sources."json-refs-2.1.7"
+      sources."argparse-1.0.9"
+      sources."esprima-4.0.0"
+      sources."sprintf-js-1.0.3"
+      sources."graphlib-2.1.1"
+      sources."native-promise-only-0.8.1"
+      sources."path-loader-1.0.2"
+      sources."slash-1.0.0"
+      sources."uri-js-3.0.2"
+      sources."lodash-4.17.4"
+      sources."superagent-3.6.0"
+      sources."component-emitter-1.2.1"
+      sources."cookiejar-2.1.1"
+      sources."debug-2.6.8"
+      sources."extend-3.0.1"
+      sources."form-data-2.3.1"
+      sources."formidable-1.1.1"
+      sources."methods-1.1.2"
+      sources."mime-1.4.0"
+      sources."qs-6.5.0"
+      sources."readable-stream-2.3.3"
+      sources."ms-2.0.0"
+      sources."asynckit-0.4.0"
+      sources."combined-stream-1.0.5"
+      sources."mime-types-2.1.16"
+      sources."delayed-stream-1.0.0"
+      sources."mime-db-1.29.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."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
+      sources."util-deprecate-1.0.2"
+      sources."punycode-2.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Multi-file Swagger example";
+      license = "MIT";
+    };
+    production = true;
+  };
   nijs = nodeEnv.buildNodePackage {
     name = "nijs";
     packageName = "nijs";
@@ -30352,7 +30415,7 @@ in
       })
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.3.0"
+      sources."supports-color-4.4.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -30647,7 +30710,7 @@ in
           sources."camelcase-4.1.0"
           sources."string-width-2.1.1"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.3.0"
+          sources."supports-color-4.4.0"
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-regex-3.0.0"
@@ -30997,7 +31060,7 @@ in
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
       sources."fs-0.0.1-security"
-      sources."toml-2.3.2"
+      sources."toml-2.3.3"
       sources."clone-deep-0.3.0"
       sources."for-own-1.0.0"
       sources."is-plain-object-2.0.4"
@@ -31199,7 +31262,7 @@ in
       })
       sources."connect-busboy-0.0.2"
       sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
-      sources."core-js-2.5.0"
+      sources."core-js-2.5.1"
       sources."diff-1.4.0"
       sources."domino-1.0.29"
       sources."entities-1.1.1"
@@ -32649,7 +32712,7 @@ in
       sources."number-is-nan-1.0.1"
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.3.0"
+      sources."supports-color-4.4.0"
       sources."color-convert-1.9.0"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
@@ -33330,10 +33393,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.4.2";
+    version = "2.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz";
-      sha1 = "f8395f85d459276067c988aa41837a8f82870844";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz";
+      sha1 = "038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -33981,7 +34044,7 @@ in
       sources."widest-line-1.0.0"
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
-      sources."supports-color-4.3.0"
+      sources."supports-color-4.4.0"
       sources."has-flag-2.0.0"
       sources."execa-0.7.0"
       (sources."cross-spawn-5.1.0" // {
@@ -34319,7 +34382,7 @@ in
         ];
       })
       sources."source-map-0.5.7"
-      sources."supports-color-4.3.0"
+      sources."supports-color-4.4.0"
       sources."tapable-0.2.8"
       sources."uglifyjs-webpack-plugin-0.4.6"
       sources."watchpack-1.4.0"
@@ -34728,12 +34791,12 @@ in
       sources."glob-7.1.2"
       sources."gunzip-maybe-1.4.1"
       sources."ini-1.3.4"
-      (sources."inquirer-3.2.2" // {
+      (sources."inquirer-3.2.3" // {
         dependencies = [
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.3.0"
+          sources."supports-color-4.4.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -34758,7 +34821,7 @@ in
       sources."uuid-3.1.0"
       sources."v8-compile-cache-1.1.0"
       sources."validate-npm-package-license-3.0.1"
-      sources."core-js-2.5.0"
+      sources."core-js-2.5.1"
       sources."regenerator-runtime-0.11.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -34976,12 +35039,12 @@ in
       sources."fullname-3.3.0"
       sources."got-6.7.1"
       sources."humanize-string-1.0.1"
-      (sources."inquirer-3.2.2" // {
+      (sources."inquirer-3.2.3" // {
         dependencies = [
           sources."chalk-2.1.0"
           sources."strip-ansi-4.0.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.3.0"
+          sources."supports-color-4.4.0"
           sources."ansi-regex-3.0.0"
         ];
       })
@@ -35343,7 +35406,7 @@ in
           sources."camelcase-4.1.0"
           sources."chalk-2.1.0"
           sources."ansi-styles-3.2.0"
-          sources."supports-color-4.3.0"
+          sources."supports-color-4.4.0"
         ];
       })
       sources."import-lazy-2.1.0"

From a2794ee5f613c7296a9cef5286cdb071c984b102 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Thu, 31 Aug 2017 22:18:27 -0300
Subject: [PATCH 3154/3246] openmw: 0.41 -> 0.42

---
 pkgs/games/openmw/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index c09790e0c66..b15406b1e3d 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -6,19 +6,19 @@ let
     src = fetchFromGitHub {
       owner = "OpenMW";
       repo = "osg";
-      rev = "c0adcc0b43f37931ccb70e3e2b4227c4a86cfaaf";
-      sha256 = "12nrpayms0jl2knkv4kax93si1510hjyl1g3i1b73ydnzhvr3x02";
+      rev = "35f1a459a4ab6da9d70427e6539bdf4faae4cc91";
+      sha256 = "1s3a9dpbcc6v8d05pqin4xfv36i2031xpdja1vl8x11cw05fln91";
     };
   });
 in stdenv.mkDerivation rec {
-  version = "0.41.0";
+  version = "0.42.0";
   name = "openmw-${version}";
 
   src = fetchFromGitHub {
     owner = "OpenMW";
     repo = "openmw";
     rev = name;
-    sha256 = "1qay278965i7ja2rjllhcqfq7zpbapd7w57xly02apniadyfg0yz";
+    sha256 = "0lj8v81hk807dy0wcdhfp0iyn4l5yag53hx1a6xm44gh2dpyil43";
   };
 
   enableParallelBuilding = true;

From 39154ab86f15d75496c7d5b418cb6cf5e037f47c Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Thu, 31 Aug 2017 22:44:56 -0400
Subject: [PATCH 3155/3246] bossa: fix build with gcc6

---
 pkgs/development/tools/misc/bossa/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
index 86a714a9882..8035388c5f0 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
 
   # Explicitly specify targets so they don't get stripped.
   makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ];
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
   installPhase = ''
     mkdir -p $out/bin

From 04b8a85739661c02a76226311ce44edb4c139dc6 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Thu, 31 Aug 2017 22:59:37 -0400
Subject: [PATCH 3156/3246] caneda: fix build with gcc6

---
 .../science/electronics/caneda/default.nix          |  4 ++++
 .../science/electronics/caneda/gcc6.patch           | 13 +++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/science/electronics/caneda/gcc6.patch

diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index 399815f943a..2d6b12a5bb0 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake qt4 libxml2 libxslt ];
 
+  patches = [
+    ./gcc6.patch
+  ];
+
   postInstall = ''
     mkdir $out/share/caneda/components
     cp -R ${srcComponents}/* $out/share/caneda/components
diff --git a/pkgs/applications/science/electronics/caneda/gcc6.patch b/pkgs/applications/science/electronics/caneda/gcc6.patch
new file mode 100644
index 00000000000..04c8f4502b2
--- /dev/null
+++ b/pkgs/applications/science/electronics/caneda/gcc6.patch
@@ -0,0 +1,13 @@
+diff --git c/src/cgraphicsscene.cpp i/src/cgraphicsscene.cpp
+index ac2929a..c399706 100644
+--- c/src/cgraphicsscene.cpp
++++ i/src/cgraphicsscene.cpp
+@@ -1436,7 +1436,7 @@ namespace Caneda
+             QPointF newPos = m_currentWiringWire->mapFromScene(pos);
+             QPointF refPos = m_currentWiringWire->port1()->pos();
+ 
+-            if( abs(refPos.x()-newPos.x()) > abs(refPos.y()-newPos.y()) ) {
++            if( (refPos.x()-newPos.x()) > (refPos.y()-newPos.y()) ) {
+                 m_currentWiringWire->movePort2(QPointF(newPos.x(), refPos.y()));
+             }
+             else {

From f0c8027ae35139a171b04524b2e33c60aea23c5b Mon Sep 17 00:00:00 2001
From: Brad Jensen <brad@bradjensen.net>
Date: Mon, 31 Jul 2017 19:29:53 -0700
Subject: [PATCH 3157/3246] Overhaul quicklisp-to-nix

1. Detect (and automatically handle) parasitic systems.
2. Each nix package has only one asd, and (almost) every parasitic
   package inside it builds.
3. Ensure that parasitic systems are compiled.
4. Remove unnecessary testnames lisp override mechanism (the
   testnae/testSystem is replaced by parasites/buildSystems).
5. Parasitic systems (if included in the system closure) become
   aliases to their host package.
6. Support caching fasl files in a known directory (for faster
   re-generation after modifying quicklisp-to-nix-system-info).
7. Eliminate unnecessary overrides.  We're going to determine ALL
   lisp dependencies correctly.
8. Don't try to "build" lisp packages with make.  lispPackages should
   be about bringing in a lisp library.
9. Eliminate the hand-maintained list of aliases.  Parasites should
   become aliases.  Everything else should be a real package.
---
 .../lisp-modules/define-package.nix           |  53 +-
 .../lisp-modules/lisp-packages.nix            |  51 +-
 .../lisp-modules/quicklisp-to-nix-aliases.nix |  13 -
 .../quicklisp-to-nix-overrides.lisp           |   7 -
 .../quicklisp-to-nix-overrides.nix            | 130 +----
 .../quicklisp-to-nix/nix-package.emb          |  23 +-
 .../quicklisp-to-nix/parasitic-invocation.emb |   1 +
 .../quicklisp-to-nix/ql-to-nix.lisp           | 407 ++++++++++-----
 .../quicklisp-to-nix/quicklisp-bootstrap.lisp |  76 +++
 .../quicklisp-to-nix/system-info.lisp         | 473 ++++++++++++++++++
 .../quicklisp-to-nix/top-package.emb          |   3 +-
 .../lisp-modules/quicklisp-to-nix/util.lisp   | 178 +++++++
 pkgs/development/lisp-modules/shell.nix       |  14 +
 13 files changed, 1116 insertions(+), 313 deletions(-)
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix/parasitic-invocation.emb
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix/quicklisp-bootstrap.lisp
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix/util.lisp
 create mode 100644 pkgs/development/lisp-modules/shell.nix

diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 2af5530aa5c..1a155b3e933 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -1,7 +1,10 @@
-args @ {stdenv, clwrapper, baseName, packageName ? baseName, testSystems ? [packageName]
+args @ {stdenv, clwrapper, baseName, packageName ? baseName
+  , parasites ? []
+  , buildSystems ? ([packageName] ++ parasites)
   , version ? "latest"
   , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {})
-  , propagatedBuildInputs ? []}:
+  , propagatedBuildInputs ? []
+  , asdFilesToKeep ? [(builtins.concatStringsSep "" [packageName ".asd"])]}:
 let
   deployConfigScript = ''
     outhash="$out"
@@ -43,11 +46,34 @@ let
     echo "export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script"
     echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script"
   '';
+  moveAsdFiles = ''
+    find $out/lib/common-lisp/ -name '*.asd' | while read ASD_FILE; do
+      KEEP_THIS_ASD=0
+      for ALLOWED_ASD in $asdFilesToKeep; do
+        ALLOWED_ASD="/$ALLOWED_ASD"
+        ALLOWED_ASD_LENGTH=${"$"}{#ALLOWED_ASD}
+        ASD_FILE_LENGTH=${"$"}{#ASD_FILE}
+        ASD_FILE_SUFFIX_INDEX=$(expr "$ASD_FILE_LENGTH" - "$ALLOWED_ASD_LENGTH")
+        ASD_FILE_SUFFIX_INDEX=$(expr "$ASD_FILE_SUFFIX_INDEX" + 1)
+        echo $ALLOWED_ASD $ASD_FILE $ASD_FILE_SUFFIX_INDEX $(expr substr "$ASD_FILE" "$ASD_FILE_SUFFIX_INDEX" "$ASD_FILE_LENGTH")
+        if [ "$(expr substr "$ASD_FILE" "$ASD_FILE_SUFFIX_INDEX" "$ASD_FILE_LENGTH")" == "$ALLOWED_ASD" ]; then
+          KEEP_THIS_ASD=1
+          break
+        fi
+      done
+      if [ "$KEEP_THIS_ASD" == 0 ]; then
+        mv "$ASD_FILE"{,.sibling}
+      fi
+    done
+  '';
 basePackage = {
   name = "lisp-${baseName}-${version}";
   inherit src;
 
+  dontBuild = true;
+
   inherit deployConfigScript deployLaunchScript;
+  inherit asdFilesToKeep moveAsdFiles;
   installPhase = ''
     eval "$preInstall"
 
@@ -58,18 +84,19 @@ basePackage = {
 
     ${deployConfigScript}
     ${deployLaunchScript}
+    ${moveAsdFiles}
 
-    ${stdenv.lib.concatMapStrings (testSystem: ''
-       env -i \
-       NIX_LISP="$NIX_LISP" \
-       NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn
-             (asdf:compile-system :${testSystem})
-             (asdf:load-system :${testSystem})
-             (asdf:operate (quote asdf::compile-bundle-op) :${testSystem})
-             (ignore-errors (asdf:operate (quote asdf::deploy-asd-op) :${testSystem}))
-             )"' \
-          "$out/bin/${args.baseName}-lisp-launcher.sh"
-    '') testSystems}
+    env -i \
+    NIX_LISP="$NIX_LISP" \
+    NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn
+          ${stdenv.lib.concatMapStrings (system: ''
+            (asdf:compile-system :${system})
+            (asdf:load-system :${system})
+            (asdf:operate (quote asdf::compile-bundle-op) :${system})
+            (ignore-errors (asdf:operate (quote asdf::deploy-asd-op) :${system}))
+'') buildSystems}
+          )"' \
+       "$out/bin/${args.baseName}-lisp-launcher.sh"
 
     eval "$postInstall"
   '';
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index eaae4726751..27052359406 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -1,4 +1,4 @@
-{stdenv, clwrapper, pkgs}:
+{stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:
 let lispPackages = rec {
   inherit pkgs clwrapper stdenv;
   nixLib = pkgs.lib;
@@ -20,7 +20,6 @@ let lispPackages = rec {
 
   clx-xkeyboard = buildLispPackage rec {
     baseName = "clx-xkeyboard";
-    testSystems = ["xkeyboard"];
     version = "git-20150523";
     description = "CLX support for X Keyboard extensions";
     deps = with (pkgs.quicklispPackagesFor clwrapper); [clx];
@@ -30,13 +29,14 @@ let lispPackages = rec {
       sha256 = "11b34da7d354a709a24774032e85a8947be023594f8a333eaff6d4aa79f2b3db";
       rev = ''11455d36283ef31c498bd58ffebf48c0f6b86ea6'';
     };
+    buildSystems = ["xkeyboard"];
   };
 
   quicklisp = buildLispPackage rec {
     baseName = "quicklisp";
     version = "2017-03-06";
 
-    testSystems = [];
+    buildSystems = [];
 
     description = "The Common Lisp package manager";
     deps = [];
@@ -50,8 +50,8 @@ let lispPackages = rec {
       quicklispdist = pkgs.fetchurl {
         # Will usually be replaced with a fresh version anyway, but needs to be
         # a valid distinfo.txt
-        url = "http://beta.quicklisp.org/dist/quicklisp/2016-03-18/distinfo.txt";
-        sha256 = "13mvign4rsicfvg3vs3vj1qcjvj2m1aqhq93ck0sgizxfcj5167m";
+        url = "http://beta.quicklisp.org/dist/quicklisp/2017-07-25/distinfo.txt";
+        sha256 = "165fd4a10zc3mxyy7wr4i2r3n6fzd1wd2hgzfyp32xlc41qj2ajf";
       };
       buildPhase = '' true; '';
       postInstall = ''
@@ -61,5 +61,46 @@ let lispPackages = rec {
       '';
     };
   };
+
+  quicklisp-to-nix-system-info = stdenv.mkDerivation rec {
+    name = "quicklisp-to-nix-system-info-${version}";
+    version = "1.0.0";
+    src = ./quicklisp-to-nix;
+    nativeBuildInputs = [sbcl];
+    buildInputs = [
+      lispPackages.quicklisp coreutils
+    ];
+    touch = coreutils;
+    nix-prefetch-url = nix;
+    inherit quicklisp;
+    buildPhase = ''
+      ${sbcl}/bin/sbcl --eval '(load #P"${asdf}/lib/common-lisp/asdf/build/asdf.lisp")' --load $src/system-info.lisp --eval '(ql-to-nix-system-info::dump-image)'
+    '';
+    installPhase = ''
+      mkdir -p $out/bin
+      cp quicklisp-to-nix-system-info $out/bin
+    '';
+    dontStrip = true;
+  };
+
+  quicklisp-to-nix = stdenv.mkDerivation rec {
+    name = "quicklisp-to-nix-${version}";
+    version = "1.0.0";
+    src = ./quicklisp-to-nix;
+    buildDependencies = [sbcl quicklisp-to-nix-system-info];
+    touch = coreutils;
+    nix-prefetch-url = nix;
+    inherit quicklisp;
+    deps = [];
+    system-info = quicklisp-to-nix-system-info;
+    buildPhase = ''
+      ${sbcl}/bin/sbcl --eval '(load #P"${asdf}/lib/common-lisp/asdf/build/asdf.lisp")' --load $src/ql-to-nix.lisp --eval '(ql-to-nix::dump-image)'
+    '';
+    installPhase = ''
+      mkdir -p $out/bin
+      cp quicklisp-to-nix $out/bin
+    '';
+    dontStrip = true;
+  };
 };
 in lispPackages
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix
deleted file mode 100644
index cdcfde8eb33..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{quicklisp-to-nix-packages}:
-with quicklisp-to-nix-packages;
-rec {
-  cffi-grovel = cffi;
-
-  cxml-test = null;
-  cxml-dom = null;
-  cxml-klacks = null;
-  cxml-xml = null;
-
-  cl-async-util = cl-async-base;
-  cl-async = cl-async-base;
-}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
deleted file mode 100644
index a710d25ab5c..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp
+++ /dev/null
@@ -1,7 +0,0 @@
-(setf
-  (gethash "cxml-xml" testnames) "cxml"
-  (gethash "cxml-dom" testnames) "cxml"
-  (gethash "cxml-test" testnames) "cxml"
-  (gethash "cxml-klacks" testnames) "cxml"
-  (gethash "cl-async-base" testnames) "cl-async"
-  )
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 877389811d0..6ea0a2166e3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -5,7 +5,6 @@ let
   skipBuildPhase = x: {
     overrides = y: ((x.overrides y) // { buildPhase = "true"; });
   };
-  qlnp = quicklisp-to-nix-packages;
   multiOverride = l: x: if l == [] then {} else
     ((builtins.head l) x) // (multiOverride (builtins.tail l) x);
 in
@@ -23,9 +22,6 @@ in
         cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin"
       '';
     };
-    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [
-      alexandria cl-ppcre clx
-    ]);
   };
   iterate = skipBuildPhase;
   cl-fuse = x: {
@@ -45,84 +41,16 @@ in
   iolib = x: rec {
     propagatedBuildInputs = (x.propagatedBuildInputs or [])
      ++ (with pkgs; [libfixposix gcc])
-     ++ (with qlnp; [
-       alexandria split-sequence cffi bordeaux-threads idna swap-bytes
-     ])
      ;
-    testSystems = ["iolib" "iolib/syscalls" "iolib/multiplex" "iolib/streams"
-      "iolib/zstreams" "iolib/sockets" "iolib/trivial-sockets"
-      "iolib/pathnames" "iolib/os"];
-
-    version = "0.8.3";
-    src = pkgs.fetchFromGitHub {
-      owner = "sionescu";
-      repo = "iolib";
-      rev = "v${version}";
-      sha256 = "0pa86bf3jrysnmhasbc0lm6cid9xzril4jsg02g3gziav1xw5x2m";
-    };
   };
-  iolib_slash_syscalls = x: rec {
-    propagatedBuildInputs = (x.propagatedBuildInputs or [])
-     ++ (with pkgs; [libfixposix gcc])
-     ++ (with qlnp; [
-       alexandria split-sequence cffi bordeaux-threads idna swap-bytes
-     ])
-     ;
-    testSystems = ["iolib" "iolib/syscalls" "iolib/multiplex" "iolib/streams"
-      "iolib/zstreams" "iolib/sockets" "iolib/trivial-sockets"
-      "iolib/pathnames" "iolib/os"];
-
-    version = "0.8.3";
-    src = pkgs.fetchFromGitHub {
-      owner = "sionescu";
-      repo = "iolib";
-      rev = "v${version}";
-      sha256 = "0pa86bf3jrysnmhasbc0lm6cid9xzril4jsg02g3gziav1xw5x2m";
-    };
-  };
-  cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
-  clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
-  clack-v1-compat =  addDeps (with qlnp;[
-    lack bordeaux-threads prove usocket dexador http-body trivial-backtrace
-    marshal local-time cl-base64 cl-ppcre quri trivial-mimes trivial-types
-    flexi-streams circular-streams ironclad cl-syntax-annot alexandria
-    split-sequence
-  ]);
-  lack = addDeps (with qlnp; [ironclad]);
-  cxml = multiOverride [ skipBuildPhase (addDeps (with qlnp; [
-    closure-common puri trivial-gray-streams
-  ]))];
-  wookie = multiOverride [(addDeps (with qlnp; [
-      alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre
-      cl-fad fast-io vom do-urlencode cl-async-ssl
-    ]))
-    (addNativeLibs (with pkgs; [libuv openssl]))];
-  woo = addDeps (with qlnp; [
-    cffi lev clack swap-bytes static-vectors fast-http proc-parse quri fast-io
-    trivial-utf-8 vom
-  ]);
+  cxml = skipBuildPhase;
+  wookie = addNativeLibs (with pkgs; [libuv openssl]);
   lev = addNativeLibs [pkgs.libev];
-  dexador = addDeps (with qlnp; [
-    usocket fast-http quri fast-io chunga cl-ppcre cl-cookie trivial-mimes
-    chipz cl-base64 cl-reexport qlnp."cl+ssl" alexandria bordeaux-threads
-  ]);
-  fast-http = addDeps (with qlnp; [
-    alexandria cl-utilities proc-parse xsubseq smart-buffer
-  ]);
-  cl-emb = addDeps (with qlnp; [cl-ppcre]);
   "cl+ssl" = addNativeLibs [pkgs.openssl];
   cl-colors = skipBuildPhase;
   cl-libuv = addNativeLibs [pkgs.libuv];
-  cl-async = addDeps (with qlnp; [cl-async-base]);
-  cl-async-ssl = multiOverride [(addDeps (with qlnp; [cl-async-base]))
-    (addNativeLibs [pkgs.openssl])];
-  cl-async-repl = addDeps (with qlnp; [cl-async]);
-  cl-async-base = addDeps (with qlnp; [
-    cffi fast-io vom cl-libuv cl-ppcre trivial-features static-vectors
-    trivial-gray-streams babel
-  ]);
-  cl-async-util = addDeps (with qlnp; [ cl-async-base ]);
-  css-lite = addDeps (with qlnp; [parenscript]);
+  cl-async-ssl = addNativeLibs [pkgs.openssl];
+  cl-async-test = addNativeLibs [pkgs.openssl];
   clsql = x: {
     propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib];
     overrides = y: (x.overrides y) // {
@@ -146,17 +74,7 @@ in
       '';
     };
   };
-  cffi = multiOverride [(addNativeLibs [pkgs.libffi])
-    (addDeps (with qlnp; [uffi uiop trivial-features]))];
-  cl-vectors = addDeps (with qlnp; [zpb-ttf]);
-  cl-paths-ttf = addDeps (with qlnp; [zpb-ttf]);
-  "3bmd" = addDeps (with qlnp; [esrap split-sequence]);
-  cl-dbi = addDeps (with qlnp; [
-    cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads
-  ]);
-  dbd-sqlite3 = addDeps (with qlnp; [cl-dbi]);
-  dbd-postgres = addDeps (with qlnp; [cl-dbi]);
-  dbd-mysql = addDeps (with qlnp; [cl-dbi]);
+  cffi = addNativeLibs [pkgs.libffi];
   cl-mysql = addNativeLibs [pkgs.mysql];
   cl-ppcre-template = x: {
     overrides = y: (x.overrides y) // {
@@ -164,21 +82,10 @@ in
         ln -s lib-dependent/*.asd .
       '';
     };
-    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [
-      cl-ppcre
-    ]);
   };
-  cl-unification = addDeps (with qlnp; [cl-ppcre]);
-  cl-syntax-annot = addDeps (with qlnp; [cl-syntax]);
-  cl-syntax-anonfun = addDeps (with qlnp; [cl-syntax]);
-  cl-syntax-markup = addDeps (with qlnp; [cl-syntax]);
-  cl-test-more = addDeps (with qlnp; [prove]);
-  babel-streams = addDeps (with qlnp; [babel trivial-gray-streams]);
-  babel = addDeps (with qlnp; [trivial-features alexandria]);
-  plump = addDeps (with qlnp; [array-utils trivial-indent]);
   sqlite = addNativeLibs [pkgs.sqlite];
   uiop = x: {
-    testSystems = (x.testSystems or ["uiop"]) ++ [
+    parasites = (x.parasites or []) ++ [
       "uiop/version"
     ];
     overrides = y: (x.overrides y) // {
@@ -192,28 +99,5 @@ in
       postConfigure = "rm GNUmakefile";
     };
   };
-  esrap = addDeps (with qlnp; [alexandria]);
-  fast-io = addDeps (with qlnp; [
-    alexandria trivial-gray-streams static-vectors
-  ]);
-  hu_dot_dwim_dot_def = addDeps (with qlnp; [
-    hu_dot_dwim_dot_asdf alexandria anaphora iterate metabang-bind
-  ]);
-  ironclad = addDeps (with qlnp; [nibbles flexi-streams]);
-  ixf = addDeps (with qlnp; [
-    split-sequence md5 alexandria babel local-time cl-ppcre ieee-floats
-  ]);
-  jonathan = addDeps (with qlnp; [
-    cl-syntax cl-syntax-annot fast-io proc-parse cl-ppcre
-  ]);
-  local-time = addDeps (with qlnp; [cl-fad]);
-  lquery = addDeps (with qlnp; [array-utils form-fiddle plump clss]);
-  clss = addDeps (with qlnp; [array-utils plump]);
-  form-fiddle = addDeps (with qlnp; [documentation-utils]);
-  documentation-utils = addDeps (with qlnp; [trivial-indent]);
-  mssql = x: {
-    testSystems = [];
-  };
-  cl-postgres = addDeps (with qlnp; [cl-ppcre md5]);
-  postmodern = addDeps (with qlnp; [md5]);
+  mssql = addNativeLibs [pkgs.freetds];
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index baedbd1553a..ac3387d7b6d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -1,9 +1,9 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''<% @var filename %>'';
-  version = ''<% @var version %>'';<% @if testname %>
+  version = ''<% @var version %>'';<% @if parasites %>
 
-  testSystems = ["<% @var testname %>"];<% @endif %>
+  parasites = [<% (dolist (p (getf env :parasites)) (format t " \"~A\"" p)) %> ];<% @endif %>
 
   description = ''<% @var description %>'';
 
@@ -13,23 +13,10 @@ rec {
     url = ''<% @var url %>'';
     sha256 = ''<% @var sha256 %>'';
   };
-    
+
   packageName = "<% @var name %>";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/<% @var name %>[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["<% @var name %>.asd"];
+  overrides = x: x;
 }
 /* <%= cl-emb-intern::topenv %> */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/parasitic-invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/parasitic-invocation.emb
new file mode 100644
index 00000000000..bdee1c6dcf1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/parasitic-invocation.emb
@@ -0,0 +1 @@
+  "<% @var filename %>" = quicklisp-to-nix-packages."<% @var host-filename %>";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index f408ceeb3f5..790cd17b2fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -1,137 +1,212 @@
-; QuickLisp-to-Nix export
-; Requires QuickLisp to be loaded
-; Installs the QuickLisp version of all the packages processed (in the
-; QuickLisp instance it uses)
+(unless (find-package :ql-to-nix-util)
+  (load "util.lisp"))
+(unless (find-package :ql-to-nix-quicklisp-bootstrap)
+  (load "quicklisp-bootstrap.lisp"))
+(defpackage :ql-to-nix
+  (:use :common-lisp :ql-to-nix-util :ql-to-nix-quicklisp-bootstrap))
+(in-package :ql-to-nix)
 
-(ql:quickload :cl-emb)
-(ql:quickload :external-program)
-(ql:quickload :cl-ppcre)
-(ql:quickload :alexandria)
-(ql:quickload :md5)
+;; We're going to pull in our dependencies at image dumping time in an
+;; isolated quicklisp installation.  Unfortunately, that means that we
+;; can't yet access the symbols for our dependencies.  We can probably
+;; do better (by, say, loading these dependencies before this file),
+;; but...
 
-(defvar testnames (make-hash-table :test 'equal))
+(defvar *required-systems* nil)
 
-(defun nix-prefetch-url (url)
-  (let*
-    ((stdout nil)
-     (stderr nil))
-    (setf
-      stdout
-      (with-output-to-string (so)
-        (setf
-          stderr
-          (with-output-to-string (se)
-            (external-program:run
-              "nix-prefetch-url"
-              (list url)
-              :search t :output so :error se)))))
-    (let*
-      ((path-line (first (last (cl-ppcre:split (format nil "~%") stderr))))
-       (path (cl-ppcre:regex-replace-all "path is .(.*)." path-line "\\1")))
-      (list
-        :sha256 (first (cl-ppcre:split (format nil "~%") stdout))
-        :path path
-        :md5 (string-downcase
-               (format nil "~{~16,2,'0r~}"
-                       (map 'list 'identity (md5:md5sum-file path))))))))
+(push :cl-emb *required-systems*)
+(wrap :cl-emb register-emb)
+(wrap :cl-emb execute-emb)
+
+(push :external-program *required-systems*)
+(wrap :external-program run)
+
+(push :cl-ppcre *required-systems*)
+(wrap :cl-ppcre split)
+(wrap :cl-ppcre regex-replace-all)
+(wrap :cl-ppcre scan)
+
+(push :alexandria *required-systems*)
+(wrap :alexandria read-file-into-string)
+(wrap :alexandria write-string-into-file)
+
+(push :md5 *required-systems*)
+(wrap :md5 md5sum-file)
+
+(wrap :ql-dist find-system)
+(wrap :ql-dist release)
+(wrap :ql-dist provided-systems)
+(wrap :ql-dist archive-url)
+(wrap :ql-dist local-archive-file)
+(wrap :ql-dist ensure-local-archive-file)
+(wrap :ql-dist archive-md5)
+(wrap :ql-dist name)
+(wrap :ql-dist short-description)
 
 (defun escape-filename (s)
   (format 
-    nil "~a~{~a~}"
-    (if (cl-ppcre:scan "^[a-zA-Z_]" s) "" "_")
-    (loop
+   nil "~a~{~a~}"
+   (if (scan "^[a-zA-Z_]" s) "" "_")
+   (loop
       for x in (map 'list 'identity s)
       collect
-      (case x
-        (#\/ "_slash_")
-        (#\\ "_backslash_")
-        (#\_ "__")
-        (#\. "_dot_")
-        (t x)))))
+        (case x
+          (#\/ "_slash_")
+          (#\\ "_backslash_")
+          (#\_ "__")
+          (#\. "_dot_")
+          (t x)))))
 
-(defun system-depends-on (system-name)
-  (labels
-      ((decode (name)
-         (typecase name
-           (string
-            name)
-           (cons
-            (ecase (car name)
-              (:version (second name)))))))
-    (let* ((asdf-dependencies (asdf:system-depends-on (asdf:find-system system-name)))
-           (decoded-asdf-dependencies (mapcar #'decode asdf-dependencies))
-           (clean-asdf-dependencies (remove-if-not 'ql-dist:find-system decoded-asdf-dependencies))
-           (ql-dependencies (ql-dist:required-systems (ql-dist:find-system system-name)))
-           (all-dependencies (concatenate 'list clean-asdf-dependencies ql-dependencies))
-           (sorted-dependencies (sort all-dependencies #'string<))
-           (unique-dependencies (remove-duplicates sorted-dependencies :test #'equal)))
-      unique-dependencies)))
+(defvar *system-info-bin*
+  (let* ((path (uiop:getenv "system-info"))
+         (path-dir (if (equal #\/ (aref path (1- (length path))))
+                       path
+                       (concatenate 'string path "/")))
+         (pathname (parse-namestring path-dir)))
+    (merge-pathnames #P"bin/quicklisp-to-nix-system-info" pathname))
+  "The path to the quicklisp-to-nix-system-info binary.")
+
+(defvar *cache-dir* nil
+  "The folder where fasls will be cached.")
+
+(defun raw-system-info (system-name)
+  "Run quicklisp-to-nix-system-info on the given system and return the
+form produced by the program."
+  (when *cache-dir*
+    (let ((command `(,*system-info-bin* "--cacheDir" ,(namestring *cache-dir*) ,system-name)))
+      (handler-case
+          (return-from raw-system-info
+            (read (make-string-input-stream (uiop:run-program command :output :string))))
+        (error (e)
+          ;; Some systems don't like the funky caching that we're
+          ;; doing.  That's okay.  Let's try it uncached before we
+          ;; give up.
+          (warn "Unable to use cache for system ~A.~%~A" system-name e)))))
+  (read (make-string-input-stream (uiop:run-program `(,*system-info-bin* ,system-name) :output :string))))
+
+(defvar *system-data-memoization-path* nil
+  "The path to the folder where fully-resolved system information can
+be cached.
+
+If information for a system is found in this directory, `system-data'
+will use it instead of re-computing the system data.")
+
+(defvar *system-data-in-memory-memoization*
+  (make-hash-table :test #'equalp))
+
+(defun memoized-system-data-path (system)
+  "Return the path to the file that (if it exists) contains
+pre-computed system data."
+  (when *system-data-memoization-path*
+    (merge-pathnames (make-pathname :name system :type "txt") *system-data-memoization-path*)))
+
+(defun memoized-system-data (system)
+  "Attempts to locate memoized system data in the path specified by
+`*system-data-memoization-path*'."
+  (multiple-value-bind (value found) (gethash system *system-data-in-memory-memoization*)
+    (when found
+      (return-from memoized-system-data (values value found))))
+  (let ((path (memoized-system-data-path system)))
+    (unless path
+      (return-from memoized-system-data (values nil nil)))
+    (with-open-file (s path :if-does-not-exist nil :direction :input)
+      (unless s
+        (return-from memoized-system-data (values nil nil)))
+      (return-from memoized-system-data (values (read s) t)))))
+
+(defun set-memoized-system-data (system data)
+  "Store system data in the path specified by
+`*system-data-memoization-path*'."
+  (setf (gethash system *system-data-in-memory-memoization*) data)
+  (let ((path (memoized-system-data-path system)))
+    (unless path
+      (return-from set-memoized-system-data data))
+    (with-open-file (s path :direction :output :if-exists :supersede)
+      (format s "~W" data)))
+  data)
 
 (defun system-data (system)
-  (let*
-    ((asdf-system
-       (or
-         (ignore-errors (asdf:find-system system))
-         (progn
-           (ql:quickload system)
-           (asdf:find-system system))))
-     (ql-system (ql-dist:find-system system))
-     (ql-release (ql-dist:release ql-system))
-     (ql-sibling-systems (ql-dist:provided-systems ql-release))
-     (url (ql-dist:archive-url ql-release))
-     (local-archive (ql-dist:local-archive-file ql-release))
-     (local-url (format nil "file://~a" (pathname local-archive)))
-     (archive-data
-       (progn
-         (ql-dist:ensure-local-archive-file ql-release)
-         (nix-prefetch-url local-url)))
-     (ideal-md5 (ql-dist:archive-md5 ql-release))
-     (file-md5 (getf archive-data :md5))
-     (raw-dependencies (system-depends-on system))
-     (name (string-downcase (format nil "~a" system)))
-     (ql-sibling-names
-       (remove name (mapcar 'ql-dist:name ql-sibling-systems)
-               :test 'equal))
-     (dependencies
-       (set-difference
-         (remove-duplicates
-           (remove-if-not 'ql-dist:find-system raw-dependencies)
-           :test 'equal)
-         ql-sibling-names
-         :test 'equal))
-     (deps (mapcar (lambda (x) (list :name x :filename (escape-filename x)))
-                   dependencies))
-     (description (asdf:system-description asdf-system))
-     (release-name (ql-dist:short-description ql-release))
-     (version (cl-ppcre:regex-replace-all
-                (format nil "~a-" name) release-name "")))
-    (assert (equal ideal-md5 file-md5))
-  (list
-    :system system
-    :description description
-    :sha256 (getf archive-data :sha256)
-    :url url
-    :md5 file-md5
-    :name name
-    :testname (gethash name testnames)
-    :filename (escape-filename name)
-    :deps deps
-    :dependencies dependencies
-    :version version
-    :siblings ql-sibling-names)))
+  "Examine a quicklisp system name and figure out everything that is
+required to produce a nix package.
 
-(defmacro this-file ()
-  (or *compile-file-truename*
-      *load-truename*))
+This function stores results for memoization purposes in files within
+`*system-data-memoization-path*'."
+  (multiple-value-bind (value found) (memoized-system-data system)
+    (when found
+      (return-from system-data value)))
+  (format t "Examining system ~A~%" system)
+  (let* ((system-info (raw-system-info system))
+         (host (getf system-info :host))
+         (host-name (getf system-info :host-name))
+         (name (getf system-info :name)))
+    (when host
+      (return-from system-data
+        (set-memoized-system-data
+         system
+         (list
+          :system (getf system-info :system)
+          :host host
+          :filename (escape-filename name)
+          :host-filename (escape-filename host-name)))))
+
+    (let* ((url (getf system-info :url))
+           (sha256 (getf system-info :sha256))
+           (archive-data (nix-prefetch-url url :expected-sha256 sha256))
+           (archive-path (getf archive-data :path))
+           (archive-md5 (string-downcase
+                         (format nil "~{~16,2,'0r~}"
+                                 (map 'list 'identity (md5sum-file archive-path)))))
+           (stated-md5 (getf system-info :md5))
+           (dependencies (getf system-info :dependencies))
+           (deps (mapcar (lambda (x) (list :name x :filename (escape-filename x)))
+                         dependencies))
+           (description (getf system-info :description))
+           (siblings (getf system-info :siblings))
+           (release-name (getf system-info :release-name))
+           (parasites (getf system-info :parasites))
+           (version (regex-replace-all
+                     (format nil "~a-" name) release-name "")))
+      (assert (equal archive-md5 stated-md5))
+      (set-memoized-system-data
+       system
+       (list
+        :system system
+        :description description
+        :sha256 sha256
+        :url url
+        :md5 stated-md5
+        :name name
+        :filename (escape-filename name)
+        :deps deps
+        :dependencies dependencies
+        :version version
+        :siblings siblings
+        :parasites parasites)))))
+
+(defun parasitic-p (data)
+  (getf data :host))
+
+(defvar *loaded-from* (or *compile-file-truename* *load-truename*)
+  "Where this source file is located.")
+
+(defun this-file ()
+  "Where this source file is located or an error."
+  (or *loaded-from* (error "Not sure where this file is located!")))
 
 (defun nix-expression (system)
-  (cl-emb:execute-emb
-    (merge-pathnames #p"nix-package.emb" (this-file))
+  (execute-emb
+    "nix-package"
     :env (system-data system)))
+
 (defun nix-invocation (system)
-  (cl-emb:execute-emb
-    (merge-pathnames #p"invocation.emb" (this-file))
-    :env (system-data system)))
+  (let ((data (system-data system)))
+    (if (parasitic-p data)
+        (execute-emb
+         "parasitic-invocation"
+         :env data)
+        (execute-emb
+         "invocation"
+         :env data))))
 
 (defun systems-closure (systems)
   (let*
@@ -153,29 +228,97 @@
       finally (return res))))
 
 (defun ql-to-nix (target-directory)
-  (load (format nil "~a/quicklisp-to-nix-overrides.lisp" target-directory))
   (let*
     ((systems
-       (cl-ppcre:split
+       (split
          (format nil "~%")
-         (alexandria:read-file-into-string
-           (format nil "~a/quicklisp-to-nix-systems.txt" target-directory))))
+         (read-file-into-string
+          (format nil "~a/quicklisp-to-nix-systems.txt" target-directory))))
      (closure (systems-closure systems))
      (invocations
        (loop for s in closure
              collect (list :code (nix-invocation s)))))
     (loop
       for s in closure
-      do (alexandria:write-string-into-file
-           (nix-expression s)
-           (format nil "~a/quicklisp-to-nix-output/~a.nix"
-                   target-directory (escape-filename s))
-           :if-exists :supersede))
-    (alexandria:write-string-into-file
-      (cl-emb:execute-emb
-        (merge-pathnames
-          #p"top-package.emb"
-          (this-file))
+       do (unless (parasitic-p (system-data s))
+            (write-string-into-file
+             (nix-expression s)
+             (format nil "~a/quicklisp-to-nix-output/~a.nix"
+                     target-directory (escape-filename s))
+             :if-exists :supersede)))
+    (write-string-into-file
+      (execute-emb
+        "top-package"
         :env (list :invocations invocations))
       (format nil "~a/quicklisp-to-nix.nix" target-directory)
       :if-exists :supersede)))
+
+(defun print-usage-and-quit ()
+  "Does what it says on the tin."
+  (format *error-output* "Usage:
+    ~A [--help] [--cacheSystemInfoDir <path>] <work-dir>
+Arguments:
+    --cacheSystemInfoDir Store computed system info in the given directory
+    --help Print usage and exit
+    <work-dir> Path to directory with quicklisp-to-nix-systems.txt
+" (uiop:argv0))
+  (uiop:quit 2))
+
+(defun main ()
+  "Make it go"
+  (let ((argv (uiop:command-line-arguments))
+        work-directory
+        cache-system-info-directory
+        cache-fasl-directory)
+    (loop :while argv :for arg = (pop argv) :do
+       (cond
+         ((equal arg "--cacheSystemInfoDir")
+          (unless argv
+            (format *error-output* "--cacheSystemInfoDir requires an argument~%")
+            (print-usage-and-quit))
+          (setf cache-system-info-directory (pop argv)))
+
+         ((equal arg "--cacheFaslDir")
+          (unless argv
+            (format *error-output* "--cacheFaslDir requires an argument~%")
+            (print-usage-and-quit))
+          (setf cache-fasl-directory (pop argv)))
+
+         ((equal arg "--help")
+          (print-usage-and-quit))
+
+         (t
+          (when argv
+            (format *error-output* "Only one positional argument allowed~%")
+            (print-usage-and-quit))
+          (setf work-directory arg))))
+
+    (when cache-system-info-directory
+      (setf cache-system-info-directory (pathname-as-directory (pathname cache-system-info-directory)))
+      (ensure-directories-exist cache-system-info-directory))
+
+    (labels
+        ((make-go (*cache-dir*)
+           (format t "Caching fasl files in ~A~%" *cache-dir*)
+
+           (let ((*system-data-memoization-path* cache-system-info-directory))
+             (ql-to-nix work-directory))))
+      (if cache-fasl-directory
+          (make-go (truename (pathname-as-directory (parse-namestring (ensure-directories-exist cache-fasl-directory)))))
+          (with-temporary-directory (*cache-dir*)
+            (make-go *cache-dir*))))))
+
+(defun dump-image ()
+  "Make an executable"
+  (with-quicklisp (dir) ()
+    (declare (ignore dir))
+    (dolist (system *required-systems*)
+      (funcall (sym :ql :quickload) system)))
+  (register-emb "nix-package" (merge-pathnames #p"nix-package.emb" (this-file)))
+  (register-emb "invocation" (merge-pathnames #p"invocation.emb" (this-file)))
+  (register-emb "parasitic-invocation" (merge-pathnames #p"parasitic-invocation.emb" (this-file)))
+  (register-emb "top-package" (merge-pathnames #p"top-package.emb" (this-file)))
+  (setf uiop:*image-entry-point* #'main)
+  (setf uiop:*lisp-interaction* nil)
+  (setf *loaded-from* nil) ;; Break the link to our source
+  (uiop:dump-image "quicklisp-to-nix" :executable t))
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/quicklisp-bootstrap.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/quicklisp-bootstrap.lisp
new file mode 100644
index 00000000000..1c4a682007f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/quicklisp-bootstrap.lisp
@@ -0,0 +1,76 @@
+(unless (find-package :ql-to-nix-util)
+  (load "ql-to-nix-util.lisp"))
+(defpackage :ql-to-nix-quicklisp-bootstrap
+  (:use :common-lisp :ql-to-nix-util)
+  (:export #:with-quicklisp)
+  (:documentation
+   "This package provides a way to create a temporary quicklisp installation."))
+(in-package :ql-to-nix-quicklisp-bootstrap)
+
+(declaim (optimize (debug 3) (speed 0) (space 0) (compilation-speed 0) (safety 3)))
+
+;; This file cannot have any dependencies beyond quicklisp and asdf.
+;; Otherwise, we'll miss some dependencies!
+
+(defvar *quicklisp*
+  (namestring (pathname-as-directory (uiop:getenv "quicklisp")))
+  "The path to the nix quicklisp package.")
+
+(defun prepare-quicklisp-dir (target-dir quicklisp-prototype-dir)
+  "Install quicklisp into the specified `target-dir'.
+
+`quicklisp-prototype-dir' should be the path to the quicklisp nix
+package."
+  (ensure-directories-exist target-dir)
+  (dolist (subdir '(#P"dists/quicklisp/" #P"tmp/" #P"local-projects/" #P"quicklisp/"))
+    (ensure-directories-exist (merge-pathnames subdir target-dir)))
+  (with-open-file (s (merge-pathnames #P"dists/quicklisp/enabled.txt" target-dir) :direction :output :if-exists :supersede)
+    (format s "1~%"))
+  (uiop:copy-file
+   (merge-pathnames #P"lib/common-lisp/quicklisp/quicklisp-distinfo.txt" quicklisp-prototype-dir)
+   (merge-pathnames #P"dists/quicklisp/distinfo.txt" target-dir))
+  (uiop:copy-file
+   (merge-pathnames #P"lib/common-lisp/quicklisp/asdf.lisp" quicklisp-prototype-dir)
+   (merge-pathnames #P"asdf.lisp" target-dir))
+  (uiop:copy-file
+   (merge-pathnames #P"lib/common-lisp/quicklisp/setup.lisp" quicklisp-prototype-dir)
+   (merge-pathnames #P"setup.lisp" target-dir))
+  (copy-directory-tree
+   (merge-pathnames #P"lib/common-lisp/quicklisp/quicklisp/" quicklisp-prototype-dir)
+   (merge-pathnames #P"quicklisp/" target-dir)))
+
+(defun call-with-quicklisp (function &key (target-dir :temp) (cache-dir :temp))
+  "Invoke the given function with the path to a quicklisp installation.
+
+Quicklisp will be loaded before the function is called.  `target-dir'
+can either be a pathname for the place where quicklisp should be
+installed or `:temp' to request installation in a temporary directory.
+`cache-dir' can either be a pathname for a place to store fasls or
+`:temp' to request caching in a temporary directory."
+  (when (find-package :ql)
+    (error "Already loaded quicklisp in this process"))
+  (labels
+      ((make-ql (ql-dir)
+         (prepare-quicklisp-dir ql-dir *quicklisp*)
+         (with-temporary-asdf-cache (ql-dir)
+           (load (merge-pathnames #P"setup.lisp" ql-dir))
+           (if (eq :temp cache-dir)
+               (funcall function ql-dir)
+               (with-asdf-cache (ql-dir cache-dir)
+                 (funcall function ql-dir))))))
+    (if (eq :temp target-dir)
+        (with-temporary-directory (dir)
+          (make-ql dir))
+        (make-ql target-dir))))
+
+(defmacro with-quicklisp ((quicklisp-dir) (&key (cache-dir :temp)) &body body)
+  "Install quicklisp in a temporary directory, load it, bind
+`quicklisp-dir' to the path where quicklisp was installed, and then
+evaluate `body'.
+
+`cache-dir' can either be a pathname for a place to store fasls or
+`:temp' to request caching in a temporary directory."
+  `(call-with-quicklisp
+    (lambda (,quicklisp-dir)
+      ,@body)
+    :cache-dir ,cache-dir))
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
new file mode 100644
index 00000000000..3a87626df1b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp
@@ -0,0 +1,473 @@
+(unless (find-package :ql-to-nix-util)
+  (load "util.lisp"))
+(unless (find-package :ql-to-nix-quicklisp-bootstrap)
+  (load "quicklisp-bootstrap.lisp"))
+(defpackage :ql-to-nix-system-info
+  (:use :common-lisp :ql-to-nix-quicklisp-bootstrap :ql-to-nix-util)
+  (:export #:dump-image))
+(in-package :ql-to-nix-system-info)
+
+(declaim (optimize (debug 3) (speed 0) (space 0) (compilation-speed 0) (safety 3)))
+
+;; This file cannot have any dependencies beyond quicklisp and asdf.
+;; Otherwise, we'll miss some dependencies!
+
+;; We can't load quicklisp until runtime (at which point we'll create
+;; an isolated quicklisp installation).  These wrapper functions are
+;; nicer than funcalling intern'd symbols every time we want to talk
+;; to quicklisp.
+(wrap :ql apply-load-strategy)
+(wrap :ql compute-load-strategy)
+(wrap :ql show-load-strategy)
+(wrap :ql quicklisp-systems)
+(wrap :ql ensure-installed)
+(wrap :ql quicklisp-releases)
+(wrap :ql-dist archive-md5)
+(wrap :ql-dist archive-url)
+(wrap :ql-dist ensure-local-archive-file)
+(wrap :ql-dist find-system)
+(wrap :ql-dist local-archive-file)
+(wrap :ql-dist name)
+(wrap :ql-dist provided-systems)
+(wrap :ql-dist release)
+(wrap :ql-dist short-description)
+(wrap :ql-dist system-file-name)
+(wrap :ql-impl-util call-with-quiet-compilation)
+
+(defvar *version* (uiop:getenv "version")
+  "The version number of this program")
+
+(defvar *main-system* nil
+  "The name of the system we're trying to extract info from.")
+
+(defvar *found-parasites* (make-hash-table :test #'equalp)
+  "Names of systems which have been identified as parasites.
+
+A system is parasitic if its name doesn't match the name of the file
+it is defined in.  So, for example, if foo and foo-bar are both
+defined in a file named foo.asd, foo would be the host system and
+foo-bar would be a parasitic system.
+
+Parasitic systems are not generally loaded without loading the host
+system first.
+
+Keys are system names.  Values are unspecified.")
+
+(defvar *found-dependencies* (make-hash-table :test #'equalp)
+  "Hash table containing the set of dependencies discovered while installing a system.
+
+Keys are system names.  Values are unspecified.")
+
+(defun decode-asdf-dependency (name)
+  "Translates an asdf system dependency description into a system name.
+
+For example, translates (:version :foo \"1.0\") into \"foo\"."
+  (etypecase name
+    (symbol
+     (setf name (symbol-name name)))
+    (string)
+    (cons
+     (ecase (first name)
+       (:version
+        (warn "Discarding version information ~A" name)
+        ;; There's nothing we can do about this.  If the version we
+        ;; have around is good enough, then we're golden.  If it isn't
+        ;; good enough, then we'll error out and let a human figure it
+        ;; out.
+        (setf name (second name))
+        (return-from decode-asdf-dependency
+          (decode-asdf-dependency name)))
+
+       (:feature
+        (if (find (second name) *features*)
+            (return-from decode-asdf-dependency
+              (decode-asdf-dependency (third name)))
+            (progn
+              (warn "Dropping dependency due to missing feature: ~A" name)
+              (return-from decode-asdf-dependency nil))))
+
+       (:require
+        ;; This probably isn't a dependency we can satisfy using
+        ;; quicklisp, but we might as well try anyway.
+        (return-from decode-asdf-dependency
+          (decode-asdf-dependency (second name)))))))
+  (string-downcase name))
+
+(defun found-new-parasite (system-name)
+  "Record that the given system has been identified as a parasite."
+  (setf system-name (decode-asdf-dependency system-name))
+  (setf (gethash system-name *found-parasites*) t)
+  (when (nth-value 1 (gethash system-name *found-dependencies*))
+    (error "Found dependency on parasite")))
+
+(defun known-parasite-p (system-name)
+  "Have we previously identified this system as a parasite?"
+  (nth-value 1 (gethash system-name *found-parasites*)))
+
+(defun found-parasites ()
+  "Return a vector containing all identified parasites."
+  (let ((systems (make-array (hash-table-size *found-parasites*) :fill-pointer 0)))
+    (loop :for system :being :the :hash-keys :of *found-parasites* :do
+       (vector-push system systems))
+    systems))
+
+(defvar *track-dependencies* nil
+  "When this variable is nil, found-new-dependency will not record
+depdendencies.")
+
+(defun parasitic-relationship-p (potential-host potential-parasite)
+  "Returns t if potential-host and potential-parasite have a parasitic relationship.
+
+See `*found-parasites*'."
+  (let ((host-ql-system (find-system potential-host))
+        (parasite-ql-system (find-system potential-parasite)))
+    (and host-ql-system parasite-ql-system
+         (not (equal (name host-ql-system)
+                     (name parasite-ql-system)))
+         (equal (system-file-name host-ql-system)
+                (system-file-name parasite-ql-system)))))
+
+(defun found-new-dependency (name)
+  "Record that the given system has been identified as a dependency.
+
+The named system may not be recorded as a dependency.  It may be left
+out for any number of reasons.  For example, if `*track-dependencies*'
+is nil then this function does nothing.  If the named system isn't a
+quicklisp system, this function does nothing."
+  (setf name (decode-asdf-dependency name))
+  (unless name
+    (return-from found-new-dependency))
+  (unless *track-dependencies*
+    (return-from found-new-dependency))
+  (when (known-parasite-p name)
+    (return-from found-new-dependency))
+  (when (parasitic-relationship-p *main-system* name)
+    (found-new-parasite name)
+    (return-from found-new-dependency))
+  (unless (find-system name)
+    (return-from found-new-dependency))
+  (setf (gethash name *found-dependencies*) t))
+
+(defun forget-dependency (name)
+  "Whoops.  Did I say that was a dependency?  My bad.
+
+Be very careful using this function!  You can remove a system from the
+dependency list, but you can't remove other effects associated with
+this system.  For example, transitive dependencies might still be in
+the dependency list."
+  (setf name (decode-asdf-dependency name))
+  (remhash name *found-dependencies*))
+
+(defun found-dependencies ()
+  "Return a vector containing all identified dependencies."
+  (let ((systems (make-array (hash-table-size *found-dependencies*) :fill-pointer 0)))
+    (loop :for system :being :the :hash-keys :of *found-dependencies* :do
+       (vector-push system systems))
+    systems))
+
+(defun host-system (system-name)
+  "If the given system is a parasite, return the name of the system that is its host.
+
+See `*found-parasites*'."
+  (let* ((system (find-system system-name))
+         (host-file (system-file-name system)))
+    (unless (equalp host-file system-name)
+      host-file)))
+
+(defun get-loaded (system)
+  "Try to load the named system using quicklisp and record any
+dependencies quicklisp is aware of.
+
+Unlike `our-quickload', this function doesn't attempt to install
+missing dependencies."
+  ;; Let's get this party started!
+  (let* ((strategy (compute-load-strategy system))
+         (ql-systems (quicklisp-systems strategy)))
+    (dolist (dep ql-systems)
+      (found-new-dependency (name dep)))
+    (show-load-strategy strategy)
+    (labels
+        ((make-go ()
+           (apply-load-strategy strategy)))
+      (call-with-quiet-compilation #'make-go)
+      (let ((asdf-system (asdf:find-system system)))
+        ;; If ASDF says that it needed a system, then we should
+        ;; probably track that.
+        (dolist (asdf-dep (asdf:component-sideway-dependencies asdf-system))
+          (found-new-dependency asdf-dep))
+        (dolist (asdf-dep (asdf:system-defsystem-depends-on asdf-system))
+          (found-new-dependency asdf-dep))))))
+
+(defun our-quickload (system)
+  "Attempt to install a package like quicklisp would, but record any
+dependencies that are detected during the install."
+  (setf system (string-downcase system))
+  ;; Load it quickly, but do it OUR way.  Turns out our way is very
+  ;; similar to the quicklisp way...
+  (let ((already-tried (make-hash-table :test #'equalp))) ;; Case insensitive
+    (tagbody
+     retry
+       (handler-case
+           (get-loaded system)
+         (asdf/find-component:missing-dependency (e)
+           (let ((required-by (asdf/find-component:missing-required-by e))
+                 (missing (asdf/find-component:missing-requires e)))
+             (unless (typep required-by 'asdf:system)
+               (error e))
+             (when (gethash missing already-tried)
+               (error "Dependency loop? ~A" missing))
+             (setf (gethash missing already-tried) t)
+             (let ((parasitic-p (parasitic-relationship-p *main-system* missing)))
+               (if parasitic-p
+                   (found-new-parasite missing)
+                   (found-new-dependency missing))
+               ;; We always want to track the dependencies of systems
+               ;; that share an asd file with the main system.  The
+               ;; whole asd file should be loadable.  Otherwise, we
+               ;; don't want to include transitive dependencies.
+               (let ((*track-dependencies* parasitic-p))
+                 (our-quickload missing)))
+             (format t "Attempting to load ~A again~%" system)
+             (go retry)))))))
+
+(defvar *blacklisted-parasites*
+  #("hu.dwim.stefil/documentation" ;; This system depends on :hu.dwim.stefil.test, but it should depend on hu.dwim.stefil/test
+    "named-readtables/doc" ;; Dependency cycle between named-readtabes and mgl-pax
+    "symbol-munger-test" ;; Dependency cycle between lisp-unit2 and symbol-munger
+    "cl-postgres-simple-date-tests" ;; Dependency cycle between cl-postgres and simple-date
+    "cl-containers/with-variates") ;; Symbol conflict between cl-variates:next-element, metabang.utilities:next-element
+  "A vector of systems that shouldn't be loaded by `quickload-parasitic-systems'.
+
+These systems are known to be troublemakers.  In some sense, all
+parasites are troublemakers (you shouldn't define parasitic systems!).
+However, these systems prevent us from generating nix packages and are
+thus doubly evil.")
+
+(defvar *blacklisted-parasites-table*
+  (let ((ht (make-hash-table :test #'equalp)))
+    (loop :for system :across *blacklisted-parasites* :do
+       (setf (gethash system ht) t))
+    ht)
+  "A hash table where each entry in `*blacklisted-parasites*' is an
+entry in the table.")
+
+(defun blacklisted-parasite-p (system-name)
+  "Returns non-nil if the named system is blacklisted"
+  (nth-value 1 (gethash system-name *blacklisted-parasites-table*)))
+
+(defun quickload-parasitic-systems (system)
+  "Attempt to load all the systems defined in the same asd as the named system.
+
+Blacklisted systems are skipped.  Dependencies of the identified
+parasitic systems will be tracked."
+  (let* ((asdf-system (asdf:find-system system))
+         (source-file (asdf:system-source-file asdf-system)))
+    (cond
+      (source-file
+       (loop :for system-name :being :the :hash-keys :of asdf/find-system:*defined-systems* :do
+          (when (and (parasitic-relationship-p system system-name)
+                     (not (blacklisted-parasite-p system-name)))
+            (found-new-parasite system-name)
+            (let ((*track-dependencies* t))
+              (our-quickload system-name)))))
+      (t
+       (unless (or (equal "uiop" system)
+                   (equal "asdf" system))
+         (warn "No source file for system ~A.  Can't identify parasites." system))))))
+
+(defun determine-dependencies (system)
+  "Load the named system and return a sorted vector containing all the
+quicklisp systems that were loaded to satisfy dependencies.
+
+This function should probably only be called once per process!
+Subsequent calls will miss dependencies identified by earlier calls."
+  (tagbody
+   retry
+     (restart-case
+         (let ((*standard-output* (make-broadcast-stream))
+               (*trace-output* (make-broadcast-stream))
+               (*main-system* system)
+               (*track-dependencies* t))
+           (our-quickload system)
+           (quickload-parasitic-systems system))
+       (try-again ()
+         :report "Start the quickload over again"
+         (go retry))
+       (die ()
+         :report "Just give up and die"
+         (uiop:quit 1))))
+
+  ;; Systems can't depend on themselves!
+  (forget-dependency system)
+  (values))
+
+(defun parasitic-system-data (parasite-system)
+  "Return a plist of information about the given known-parastic system.
+
+Sometimes we are asked to provide information about a system that is
+actually a parasite.  The only correct response is to point them
+toward the host system.  The nix package for the host system should
+have all the dependencies for this parasite already recorded.
+
+The plist is only meant to be consumed by other parts of
+quicklisp-to-nix."
+  (let ((host-system (host-system parasite-system)))
+    (list
+     :system parasite-system
+     :host host-system
+     :name (string-downcase (format nil "~a" parasite-system))
+     :host-name (string-downcase (format nil "~a" host-system)))))
+
+(defun system-data (system)
+  "Produce a plist describing a system.
+
+The plist is only meant to be consumed by other parts of
+quicklisp-to-nix."
+  (when (host-system system)
+    (return-from system-data
+      (parasitic-system-data system)))
+
+  (determine-dependencies system)
+  (let*
+      ((dependencies (sort (found-dependencies) #'string<))
+       (parasites (coerce (sort (found-parasites) #'string<) 'list))
+       (ql-system (find-system system))
+       (ql-release (release ql-system))
+       (ql-sibling-systems (provided-systems ql-release))
+       (url (archive-url ql-release))
+       (local-archive (local-archive-file ql-release))
+       (local-url (format nil "file://~a" (pathname local-archive)))
+       (archive-data
+        (progn
+          (ensure-local-archive-file ql-release)
+          ;; Stuff this archive into the nix store.  It was almost
+          ;; certainly going to end up there anyway (since it will
+          ;; probably be fetchurl'd for a nix package).  Also, putting
+          ;; it into the store also gives us the SHA we need.
+          (nix-prefetch-url local-url)))
+       (ideal-md5 (archive-md5 ql-release))
+       (raw-dependencies (coerce dependencies 'list))
+       (name (string-downcase (format nil "~a" system)))
+       (ql-sibling-names
+        (remove name (mapcar 'name ql-sibling-systems)
+                :test 'equal))
+       (dependencies raw-dependencies)
+       (description (asdf:system-description (asdf:find-system system)))
+       (release-name (short-description ql-release)))
+    (list
+     :system system
+     :description description
+     :sha256 (getf archive-data :sha256)
+     :url url
+     :md5 ideal-md5
+     :name name
+     :dependencies dependencies
+     :siblings ql-sibling-names
+     :release-name release-name
+     :parasites parasites)))
+
+(defvar *error-escape-valve* *error-output*
+  "When `*error-output*' is rebound to inhibit spew, this stream will
+still produce output.")
+
+(defun print-usage-and-quit ()
+  "Describe how to use this program... and then exit."
+  (format *error-output* "Usage:
+    ~A [--cacheDir <dir>] [--silent] [--debug] [--help|-h] <system-name>
+Arguments:
+    --cacheDir Store (and look for) compiled lisp files in the given directory
+    --verbose Show compilation output
+    --debug Enter the debugger when a fatal error is encountered
+    --help Print usage and exit
+    <system-name> The quicklisp system to examine
+" (or (uiop:argv0) "quicklisp-to-nix-system-info"))
+  (uiop:quit 2))
+
+(defun main ()
+  "Make it go."
+  (let ((argv (uiop:command-line-arguments))
+        cache-dir
+        target-system
+        verbose-p
+        debug-p)
+    (handler-bind
+        ((warning
+          (lambda (w)
+            (format *error-escape-valve* "~A~%" w)))
+         (error
+          (lambda (e)
+            (if debug-p
+                (invoke-debugger e)
+                (progn
+                  (format *error-escape-valve* "~
+Failed to extract system info. Details are below. ~
+Run with --debug and/or --verbose for more info.
+~A~%" e)
+                  (uiop:quit 1))))))
+      (loop :while argv :do
+         (cond
+           ((equal "--cacheDir" (first argv))
+            (pop argv)
+            (unless argv
+              (error "--cacheDir expects an argument"))
+            (setf cache-dir (first argv))
+            (pop argv))
+
+           ((equal "--verbose" (first argv))
+            (setf verbose-p t)
+            (pop argv))
+
+           ((equal "--debug" (first argv))
+            (setf debug-p t)
+            (pop argv))
+
+           ((or (equal "--help" (first argv))
+                (equal "-h" (first argv)))
+            (print-usage-and-quit))
+
+           (t
+            (setf target-system (pop argv))
+            (when argv
+              (error "Can only operate on one system")))))
+
+      (unless target-system
+        (print-usage-and-quit))
+
+      (when cache-dir
+        (setf cache-dir (pathname-as-directory (parse-namestring cache-dir))))
+
+      (with-quicklisp (dir) (:cache-dir (or cache-dir :temp))
+        (declare (ignore dir))
+
+        (let (system-data)
+          (let ((*error-output* (if verbose-p
+                                    *error-output*
+                                    (make-broadcast-stream)))
+                (*standard-output* (if verbose-p
+                                       *standard-output*
+                                       (make-broadcast-stream)))
+                (*trace-output* (if verbose-p
+                                    *trace-output*
+                                    (make-broadcast-stream))))
+            (format *error-output*
+                    "quicklisp-to-nix-system-info ~A~%ASDF ~A~%Quicklisp ~A~%Compiler ~A ~A~%"
+                    *version*
+                    (asdf:asdf-version)
+                    (funcall (intern "CLIENT-VERSION" :ql))
+                    (lisp-implementation-type)
+                    (lisp-implementation-version))
+            (setf system-data (system-data target-system)))
+
+          (cond
+            (system-data
+             (format t "~W~%" system-data)
+             (uiop:quit 0))
+            (t
+             (format *error-output* "Failed to determine system data~%")
+             (uiop:quit 1))))))))
+
+(defun dump-image ()
+  "Make an executable"
+  (setf uiop:*image-entry-point* #'main)
+  (setf uiop:*lisp-interaction* nil)
+  (uiop:dump-image "quicklisp-to-nix-system-info" :executable t))
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
index 95b60df0d01..9ba7a89eb25 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
@@ -8,7 +8,6 @@ let quicklisp-to-nix-packages = rec {
 <% @loop invocations %>
 <% @var code %>
 <% @endloop %>
-} // qlAliases {inherit quicklisp-to-nix-packages;};
-qlAliases = import ./quicklisp-to-nix-aliases.nix;
+};
 in
    quicklisp-to-nix-packages
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/util.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/util.lisp
new file mode 100644
index 00000000000..7b404304273
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/util.lisp
@@ -0,0 +1,178 @@
+(defpackage :ql-to-nix-util
+  (:use :common-lisp)
+  (:export #:nix-prefetch-url #:wrap #:pathname-as-directory #:copy-directory-tree #:with-temporary-directory #:sym #:with-temporary-asdf-cache #:with-asdf-cache)
+  (:documentation
+   "A collection of useful functions and macros that ql-to-nix will use."))
+(in-package :ql-to-nix-util)
+
+(declaim (optimize (debug 3) (speed 0) (space 0) (compilation-speed 0) (safety 3)))
+
+;; This file cannot have any dependencies beyond quicklisp and asdf.
+;; Otherwise, we'll miss some dependencies!
+
+(defun pathname-as-directory (pathname)
+  "Given a pathname, make it into a path to a directory.
+
+This is sort of like putting a / at the end of the path."
+  (unless (pathname-name pathname)
+    (return-from pathname-as-directory pathname))
+  (let* ((old-dir (pathname-directory pathname))
+         (old-name (pathname-name pathname))
+         (old-type (pathname-type pathname))
+         (last-dir
+          (cond
+            (old-type
+             (format nil "~A.~A" old-name old-type))
+            (t
+             old-name)))
+         (new-dir (if old-dir
+                      (concatenate 'list old-dir (list last-dir))
+                      (list :relative last-dir))))
+
+    (make-pathname :name nil :directory new-dir :type nil :defaults pathname)))
+
+(defvar *nix-prefetch-url-bin*
+  (namestring (merge-pathnames #P"bin/nix-prefetch-url" (pathname-as-directory (uiop:getenv "nix-prefetch-url"))))
+  "The path to the nix-prefetch-url binary")
+
+(defun nix-prefetch-url (url &key expected-sha256)
+  "Invoke the nix-prefetch-url program.
+
+Returns a plist with two keys.
+:sha256 => The sha of the fetched file
+:path => The path to the file in the nix store"
+  (when expected-sha256
+    (setf expected-sha256 (list expected-sha256)))
+  (let* ((stdout
+          (with-output-to-string (so)
+            (uiop:run-program
+             `(,*nix-prefetch-url-bin* "--print-path" ,url ,@expected-sha256)
+             :output so)))
+         (stream (make-string-input-stream stdout)))
+    (list
+     :sha256 (read-line stream)
+     :path (read-line stream))))
+
+(defmacro wrap (package symbol-name)
+  "Create a function which looks up the named symbol at runtime and
+invokes it with the same arguments.
+
+If you can't load a system until runtime, this macro gives you an
+easier way to write
+    (funcall (intern \"SYMBOL-NAME\" :package-name) arg)
+Instead, you can write
+    (wrap :package-name symbol-name)
+    (symbol-name arg)"
+  (let ((args (gensym "ARGS")))
+    `(defun ,symbol-name (&rest ,args)
+       (apply (sym ',package ',symbol-name) ,args))))
+
+(defun copy-directory-tree (src-dir target-dir)
+  "Recursively copy every file in `src-dir' into `target-dir'.
+
+This function traverses symlinks."
+  (when (or (not (pathname-directory target-dir))
+            (pathname-name target-dir))
+    (error "target-dir must be a dir"))
+  (when (or (not (pathname-directory src-dir))
+            (pathname-name src-dir))
+    (error "src-dir must be a dir"))
+  (let ((src-wild (make-pathname :name :wild :type :wild :defaults src-dir)))
+    (dolist (entity (uiop:directory* src-wild))
+      (if (pathname-name entity)
+          (uiop:copy-file entity (make-pathname :type (pathname-type entity) :name (pathname-name entity) :defaults target-dir))
+          (let ((new-target-dir
+                 (make-pathname
+                  :directory (concatenate 'list (pathname-directory target-dir) (last (pathname-directory entity))))))
+            (ensure-directories-exist new-target-dir)
+            (copy-directory-tree entity new-target-dir))))))
+
+(defun call-with-temporary-directory (function)
+  "Create a temporary directory, invoke the given function by passing
+in the pathname for the directory, and then delete the directory."
+  (let* ((dir (uiop:run-program '("mktemp" "-d") :output :line))
+         (parsed (parse-namestring dir))
+         (parsed-as-dir (pathname-as-directory parsed)))
+    (assert (uiop:absolute-pathname-p dir))
+    (unwind-protect
+         (funcall function parsed-as-dir)
+      (uiop:delete-directory-tree
+       parsed-as-dir
+       :validate
+       (lambda (path)
+         (and (uiop:absolute-pathname-p path)
+              (equal (subseq (pathname-directory path) 0 (length (pathname-directory parsed-as-dir)))
+                     (pathname-directory parsed-as-dir))))))))
+
+(defmacro with-temporary-directory ((dir-name) &body body)
+  "See `call-with-temporary-directory'."
+  `(call-with-temporary-directory (lambda (,dir-name) ,@body)))
+
+(defun sym (package sym)
+  "A slightly less picky version of `intern'.
+
+Unlike `intern', the `sym' argument can be a string or a symbol.  If
+it is a symbol, then the `symbol-name' is `intern'ed into the
+specified package.
+
+The arguments are also reversed so that the package comes first."
+  (etypecase sym
+    (symbol (setf sym (symbol-name sym)))
+    (string))
+  (intern sym package))
+
+(defvar *touch-bin*
+  (namestring (merge-pathnames #P"bin/touch" (pathname-as-directory (uiop:getenv "touch"))))
+  "Path to the touch binary.")
+
+(defvar *cache-dir* nil
+  "When asdf cache remapping is in effect (see `with-asdf-cache'),
+this stores the path to the fasl cache directory.")
+(defvar *src-dir* nil
+  "When asdf cache remapping is in effect (see `with-asdf-cache'),
+this stores the path to the source directory.
+
+Only lisp files within the source directory will have their fasls
+cached in the cache directory.")
+
+(defun remap (path prefix)
+  "Implements the cache policy described in `with-asdf-cache'."
+  (declare (ignore prefix))
+  (let* ((ql-dirs (pathname-directory *src-dir*))
+         (ql-dirs-length (length ql-dirs))
+         (path-prefix (subseq (pathname-directory path) 0 ql-dirs-length))
+         (path-postfix (subseq (pathname-directory path) ql-dirs-length)))
+    (unless (equal path-prefix ql-dirs)
+      (return-from remap path))
+    (let ((result (make-pathname :directory (concatenate 'list (pathname-directory *cache-dir*) path-postfix) :defaults path)))
+      (with-open-file (s result :direction :probe :if-does-not-exist nil)
+        (when s
+          (uiop:run-program `(,*touch-bin* ,(namestring result)))))
+      result)))
+
+(defmacro with-temporary-asdf-cache ((src-dir) &body body)
+  "Create a temporary directory, and then use it as the ASDF cache
+directory for source files in `src-dir'.
+
+See `with-asdf-cache'."
+  (let ((tmp-dir (gensym "ORIGINAL-VALUE")))
+    `(with-temporary-directory (,tmp-dir)
+       (with-asdf-cache (,src-dir ,tmp-dir)
+         ,@body))))
+
+(defmacro with-asdf-cache ((src-dir cache-dir) &body body)
+  "When ASDF compiles a lisp file in `src-dir', store the fasl in `cache-dir'."
+  (let ((original-value (gensym "ORIGINAL-VALUE")))
+    `(let ((,original-value asdf:*output-translations-parameter*)
+           (*src-dir* ,src-dir)
+           (*cache-dir* ,cache-dir))
+       (unwind-protect
+            (progn
+              (asdf:initialize-output-translations
+               '(:output-translations
+                 :INHERIT-CONFIGURATION
+                 ;; FIXME: Shouldn't we only be remaping things
+                 ;; actually in the src dir?  Oh well.
+                 (t (:function remap))))
+              ,@body)
+         (asdf:initialize-output-translations ,original-value)))))
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
new file mode 100644
index 00000000000..5af6e09f2b4
--- /dev/null
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -0,0 +1,14 @@
+with import ../../../default.nix {};
+let
+self = rec {
+  name = "ql-to-nix";
+  env = buildEnv { name = name; paths = buildInputs; };
+  buildInputs = [
+    gcc stdenv
+    openssl fuse libuv mariadb libfixposix libev sqlite
+    freetds
+  ];
+  CPATH = "${libfixposix}/include";
+  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mariadb}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib";
+};
+in stdenv.mkDerivation self

From ebb5d33e932f9a6c5b4e7d2e20a669348d1337e0 Mon Sep 17 00:00:00 2001
From: Brad Jensen <brad@bradjensen.net>
Date: Wed, 30 Aug 2017 20:18:17 -0700
Subject: [PATCH 3158/3246] Move xkeyboard into the normally defined packages

---
 pkgs/development/lisp-modules/lisp-packages.nix    | 14 --------------
 .../lisp-modules/quicklisp-to-nix-systems.txt      |  1 +
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 27052359406..b50a4fe7df6 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -18,20 +18,6 @@ let lispPackages = rec {
     };
   };
 
-  clx-xkeyboard = buildLispPackage rec {
-    baseName = "clx-xkeyboard";
-    version = "git-20150523";
-    description = "CLX support for X Keyboard extensions";
-    deps = with (pkgs.quicklispPackagesFor clwrapper); [clx];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/filonenko-mikhail/clx-xkeyboard'';
-      sha256 = "11b34da7d354a709a24774032e85a8947be023594f8a333eaff6d4aa79f2b3db";
-      rev = ''11455d36283ef31c498bd58ffebf48c0f6b86ea6'';
-    };
-    buildSystems = ["xkeyboard"];
-  };
-
   quicklisp = buildLispPackage rec {
     baseName = "quicklisp";
     version = "2017-03-06";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 07b069f8b7b..6ae0080f46c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -110,6 +110,7 @@ uffi
 usocket
 woo
 wookie
+xkeyboard
 xmls
 xsubseq
 yason

From 8f03f38ab1693c07bb9af7767c6ff127803b3275 Mon Sep 17 00:00:00 2001
From: Brad Jensen <brad@bradjensen.net>
Date: Thu, 31 Aug 2017 17:46:20 -0700
Subject: [PATCH 3159/3246] Move esrap-peg into the normally defined packages

---
 pkgs/development/lisp-modules/lisp-packages.nix      | 12 ------------
 .../lisp-modules/quicklisp-to-nix-systems.txt        |  1 +
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index b50a4fe7df6..c31dc497964 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -6,18 +6,6 @@ let lispPackages = rec {
 
   buildLispPackage =  callPackage ./define-package.nix;
 
-  esrap-peg = buildLispPackage rec {
-    baseName = "esrap-peg";
-    version = "git-20170320";
-    description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
-    deps = with (pkgs.quicklispPackagesFor clwrapper); [alexandria cl-ppcre-template cl-unification esrap iterate];
-    src = pkgs.fetchgit {
-      url = "https://github.com/fb08af68/esrap-peg.git";
-      sha256 = "15yiial7cy2nbgszqxd26qqcc6n3pw5qlrppzx0mfr3xbd9pvzby";
-      rev = ''5a559b0030ecbf5e14cb070b0dc240535faa3402'';
-    };
-  };
-
   quicklisp = buildLispPackage rec {
     baseName = "quicklisp";
     version = "2017-03-06";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 6ae0080f46c..762c7d47424 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -59,6 +59,7 @@ dexador
 documentation-utils
 drakma
 esrap
+esrap-peg
 external-program
 fast-http
 fast-io

From d11ab25060ac12026716027f55d695d9a4d53fa6 Mon Sep 17 00:00:00 2001
From: Brad Jensen <brad@bradjensen.net>
Date: Thu, 31 Aug 2017 18:06:41 -0700
Subject: [PATCH 3160/3246] Add ql-to-nix programs to the ql-to-nix shell.nix

---
 pkgs/development/lisp-modules/shell.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index 5af6e09f2b4..8480fe573bf 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -7,6 +7,7 @@ self = rec {
     gcc stdenv
     openssl fuse libuv mariadb libfixposix libev sqlite
     freetds
+    lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
   ];
   CPATH = "${libfixposix}/include";
   LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mariadb}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib";

From acd05c506d03409865bb351bf2d2b40df6dca6a4 Mon Sep 17 00:00:00 2001
From: Brad Jensen <brad@bradjensen.net>
Date: Thu, 31 Aug 2017 18:21:55 -0700
Subject: [PATCH 3161/3246] Update the ql-to-nix readme

---
 pkgs/development/lisp-modules/README.txt | 31 ++++++++++++++----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/lisp-modules/README.txt b/pkgs/development/lisp-modules/README.txt
index 2a2fc9cb4f3..c55fb9b1a7c 100644
--- a/pkgs/development/lisp-modules/README.txt
+++ b/pkgs/development/lisp-modules/README.txt
@@ -1,16 +1,21 @@
-Prerequisite: have Quicklisp installed somehow.
+Want to add a package?  There are 3 simple steps!
+1. Add the needed system names to quicklisp-to-nix-systems.txt.
+2. cd <path to quicklisp-to-nix-systems.txt> ; nix-shell --run 'quicklisp-to-nix .'
+3. Add native libraries and whatever else is needed to quicklisp-to-nix-overrides.nix.
 
-Add to LD_LIBRARY_PATH all the things listed in quicklisp-to-nix-overrides.nix
-for library propagatedBuildInputs (a lot of these are done via addNativeLibs).
+To update to a more recent quicklisp dist modify
+lispPackages.quicklisp to have a more recent distinfo.
 
-Current list is:
-openssl fuse libuv mariadb libfixposix libev sqlite
+quicklisp-to-nix-system-info is responsible for installing a quicklisp
+package into an isolated environment and figuring out which packages
+are required by that system.  It also extracts other information that
+is readily available once the system is loaded.  The information
+produced by this program is fed into quicklisp-to-nix.  You usually
+don't need to run this program unless you're trying to understand why
+quicklisp-to-nix failed to handle a system.  The technique used by
+quicklisp-to-nix-system-info is described in its source.
 
-Add the needed system names to quicklisp-to-nix-systems.txt and load
-quicklisp-to-nix/ql-to-nix.lisp and call
-(ql-to-nix "/path/to/nixpkgs/pkgs/development/lisp-modules/") which is often
-just (ql-to-nix ".")
-
-Add native libraries and whatever else is needed to overrides.
-
-The lispPackages set is supposed to be buildable in its entirety.
+quicklisp-to-nix is responsible for reading
+quicklisp-to-nix-systems.txt, running quicklisp-to-nix-system-info,
+and generating the nix packages associated with the closure of
+quicklisp systems.

From d1e11cd41e68b553e8b5ee9ea399d6751455c4ce Mon Sep 17 00:00:00 2001
From: Brad Jensen <brad@bradjensen.net>
Date: Wed, 30 Aug 2017 17:22:51 -0700
Subject: [PATCH 3162/3246] Regenerate quicklisp-to-nix

Note: Changes to overrides were necessary
---
 .../quicklisp-to-nix-output/_3bmd.nix         |   37 +-
 .../quicklisp-to-nix-output/abnf.nix          |   32 +-
 .../quicklisp-to-nix-output/alexandria.nix    |   29 +-
 .../quicklisp-to-nix-output/anaphora.nix      |   32 +-
 .../quicklisp-to-nix-output/array-utils.nix   |   28 +-
 .../asdf-finalizers.nix                       |   26 +
 .../asdf-system-connections.nix               |   30 +-
 .../quicklisp-to-nix-output/babel-streams.nix |   36 +-
 .../quicklisp-to-nix-output/babel.nix         |   33 +-
 .../quicklisp-to-nix-output/blackbird.nix     |   28 +-
 .../bordeaux-threads.nix                      |   36 +-
 .../quicklisp-to-nix-output/caveman.nix       |   47 +-
 .../quicklisp-to-nix-output/cffi-grovel.nix   |   36 +-
 .../cffi-toolchain.nix                        |   31 +
 .../quicklisp-to-nix-output/cffi.nix          |   41 +-
 .../quicklisp-to-nix-output/chipz.nix         |   28 +-
 .../quicklisp-to-nix-output/chunga.nix        |   28 +-
 .../circular-streams.nix                      |   36 +-
 .../quicklisp-to-nix-output/cl+ssl.nix        |   47 +-
 .../quicklisp-to-nix-output/cl-aa.nix         |   28 +-
 .../quicklisp-to-nix-output/cl-annot.nix      |   28 +-
 .../quicklisp-to-nix-output/cl-anonfun.nix    |   27 +-
 .../quicklisp-to-nix-output/cl-ansi-text.nix  |   35 +-
 .../quicklisp-to-nix-output/cl-async-base.nix |   38 -
 .../quicklisp-to-nix-output/cl-async-repl.nix |   48 +-
 .../quicklisp-to-nix-output/cl-async-ssl.nix  |   49 +-
 .../quicklisp-to-nix-output/cl-async-util.nix |   38 -
 .../quicklisp-to-nix-output/cl-async.nix      |   49 +-
 .../quicklisp-to-nix-output/cl-base64.nix     |   33 +-
 .../quicklisp-to-nix-output/cl-cli.nix        |   28 +-
 .../quicklisp-to-nix-output/cl-colors.nix     |   35 +-
 .../quicklisp-to-nix-output/cl-containers.nix |   39 +-
 .../quicklisp-to-nix-output/cl-cookie.nix     |   43 +-
 .../quicklisp-to-nix-output/cl-csv.nix        |   42 +-
 .../quicklisp-to-nix-output/cl-dbi.nix        |   41 +-
 .../quicklisp-to-nix-output/cl-emb.nix        |   28 +-
 .../quicklisp-to-nix-output/cl-fad.nix        |   36 +-
 .../cl-fuse-meta-fs.nix                       |   46 +-
 .../quicklisp-to-nix-output/cl-fuse.nix       |   41 +-
 .../quicklisp-to-nix-output/cl-interpol.nix   |   35 +-
 .../quicklisp-to-nix-output/cl-json.nix       |   33 +-
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix  |   29 +-
 .../quicklisp-to-nix-output/cl-l10n.nix       |   54 +-
 .../quicklisp-to-nix-output/cl-libuv.nix      |   34 +-
 .../quicklisp-to-nix-output/cl-log.nix        |   27 +-
 .../quicklisp-to-nix-output/cl-markdown.nix   |   45 +-
 .../quicklisp-to-nix-output/cl-markup.nix     |   28 +-
 .../quicklisp-to-nix-output/cl-mysql.nix      |   33 +-
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |   33 +-
 .../quicklisp-to-nix-output/cl-paths.nix      |   25 +
 .../quicklisp-to-nix-output/cl-postgres.nix   |   33 +-
 .../cl-ppcre-template.nix                     |   36 +-
 .../cl-ppcre-unicode.nix                      |   38 +-
 .../quicklisp-to-nix-output/cl-ppcre.nix      |   32 +-
 .../quicklisp-to-nix-output/cl-project.nix    |   43 +-
 .../quicklisp-to-nix-output/cl-reexport.nix   |   28 +-
 .../quicklisp-to-nix-output/cl-smtp.nix       |   46 +-
 .../quicklisp-to-nix-output/cl-store.nix      |   32 +-
 .../cl-syntax-annot.nix                       |   39 +-
 .../cl-syntax-anonfun.nix                     |   38 +-
 .../cl-syntax-markup.nix                      |   38 +-
 .../quicklisp-to-nix-output/cl-syntax.nix     |   37 +-
 .../quicklisp-to-nix-output/cl-test-more.nix  |   37 +-
 .../quicklisp-to-nix-output/cl-unicode.nix    |   35 +-
 .../cl-unicode_slash_base.nix                 |   35 -
 .../cl-unification.nix                        |   27 +-
 .../quicklisp-to-nix-output/cl-utilities.nix  |   28 +-
 .../quicklisp-to-nix-output/cl-vectors.nix    |   31 +-
 .../quicklisp-to-nix-output/cl-who.nix        |   32 +-
 .../quicklisp-to-nix-output/clack-socket.nix  |   38 +-
 .../quicklisp-to-nix-output/clack-test.nix    |   41 +
 .../clack-v1-compat.nix                       |   69 +-
 .../quicklisp-to-nix-output/clack.nix         |   51 +-
 .../quicklisp-to-nix-output/closer-mop.nix    |   25 +-
 .../closure-common.nix                        |   35 +-
 .../quicklisp-to-nix-output/clsql.nix         |   34 +-
 .../quicklisp-to-nix-output/clss.nix          |   29 +-
 .../quicklisp-to-nix-output/clx-truetype.nix  |   46 +-
 .../quicklisp-to-nix-output/clx.nix           |   28 +-
 .../command-line-arguments.nix                |   29 +-
 .../quicklisp-to-nix-output/css-lite.nix      |   27 +-
 .../quicklisp-to-nix-output/cxml-dom.nix      |   37 -
 .../quicklisp-to-nix-output/cxml-klacks.nix   |   37 -
 .../quicklisp-to-nix-output/cxml-stp.nix      |   39 +
 .../quicklisp-to-nix-output/cxml-test.nix     |   38 -
 .../quicklisp-to-nix-output/cxml-xml.nix      |   38 -
 .../quicklisp-to-nix-output/cxml.nix          |   40 +-
 .../quicklisp-to-nix-output/db3.nix           |   27 +-
 .../quicklisp-to-nix-output/dbd-mysql.nix     |   45 +-
 .../quicklisp-to-nix-output/dbd-postgres.nix  |   46 +-
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   |   49 +-
 .../quicklisp-to-nix-output/dbi.nix           |   36 +
 .../quicklisp-to-nix-output/dexador.nix       |   62 +-
 .../quicklisp-to-nix-output/do-urlencode.nix  |   37 +-
 .../documentation-utils.nix                   |   30 +-
 .../quicklisp-to-nix-output/drakma.nix        |   38 +-
 .../dynamic-classes.nix                       |   30 +-
 .../quicklisp-to-nix-output/eos.nix           |   26 +
 .../quicklisp-to-nix-output/esrap-peg.nix     |   29 +
 .../quicklisp-to-nix-output/esrap.nix         |   34 +-
 .../external-program.nix                      |   36 +-
 .../quicklisp-to-nix-output/fast-http.nix     |   38 +-
 .../quicklisp-to-nix-output/fast-io.nix       |   35 +-
 .../quicklisp-to-nix-output/fiveam.nix        |   33 +-
 .../quicklisp-to-nix-output/flexi-streams.nix |   32 +-
 .../quicklisp-to-nix-output/form-fiddle.nix   |   29 +-
 .../quicklisp-to-nix-output/fset.nix          |   29 +-
 .../quicklisp-to-nix-output/garbage-pools.nix |   28 +-
 .../quicklisp-to-nix-output/http-body.nix     |   48 +-
 .../hu_dot_dwim_dot_asdf.nix                  |   30 +-
 .../hu_dot_dwim_dot_def.nix                   |   39 -
 .../hu_dot_dwim_dot_stefil.nix                |   32 +
 .../quicklisp-to-nix-output/hunchentoot.nix   |   56 +-
 .../quicklisp-to-nix-output/idna.nix          |   29 +-
 .../quicklisp-to-nix-output/ieee-floats.nix   |   32 +-
 .../quicklisp-to-nix-output/iolib.nix         |   51 +-
 .../iolib_dot_asdf.nix                        |   28 +
 .../iolib_dot_base.nix                        |   35 +
 .../iolib_dot_common-lisp.nix                 |   32 +
 .../iolib_dot_conf.nix                        |   30 +
 .../iolib_dot_grovel.nix                      |   35 +
 .../iolib_slash_multiplex.nix                 |   36 -
 .../iolib_slash_sockets.nix                   |   39 -
 .../iolib_slash_streams.nix                   |   36 -
 .../iolib_slash_syscalls.nix                  |   36 -
 .../quicklisp-to-nix-output/ironclad.nix      |   31 +-
 .../quicklisp-to-nix-output/iterate.nix       |   31 +-
 .../quicklisp-to-nix-output/ixf.nix           |   35 +-
 .../quicklisp-to-nix-output/jonathan.nix      |   42 +-
 .../quicklisp-to-nix-output/kmrcl.nix         |   24 +
 .../lack-component.nix                        |   34 +
 .../lack-middleware-backtrace.nix             |   41 +-
 .../quicklisp-to-nix-output/lack-util.nix     |   45 +-
 .../quicklisp-to-nix-output/lack.nix          |   48 +-
 .../quicklisp-to-nix-output/let-plus.nix      |   35 +-
 .../quicklisp-to-nix-output/lev.nix           |   33 +-
 .../quicklisp-to-nix-output/lift.nix          |   25 +
 .../lisp-namespace.nix                        |   31 +-
 .../quicklisp-to-nix-output/lisp-unit2.nix    |   37 +
 .../quicklisp-to-nix-output/list-of.nix       |   31 +-
 .../quicklisp-to-nix-output/local-time.nix    |   36 +-
 .../quicklisp-to-nix-output/lparallel.nix     |   33 +-
 .../quicklisp-to-nix-output/lquery.nix        |   34 +-
 .../quicklisp-to-nix-output/map-set.nix       |   27 +-
 .../quicklisp-to-nix-output/marshal.nix       |   28 +-
 .../quicklisp-to-nix-output/md5.nix           |   27 +-
 .../quicklisp-to-nix-output/metabang-bind.nix |   29 +-
 .../metatilities-base.nix                     |   29 +-
 .../misc-extensions.nix                       |   28 +-
 .../quicklisp-to-nix-output/moptilities.nix   |   25 +
 .../quicklisp-to-nix-output/mssql.nix         |   31 +-
 .../quicklisp-to-nix-output/mt19937.nix       |   28 +-
 .../quicklisp-to-nix-output/myway.nix         |   39 +-
 .../named-readtables.nix                      |   28 +-
 .../net_dot_didierverna_dot_asdf-flv.nix      |   30 +-
 .../quicklisp-to-nix-output/nibbles.nix       |   31 +-
 .../quicklisp-to-nix-output/optima.nix        |   33 +-
 .../quicklisp-to-nix-output/parenscript.nix   |   34 +-
 .../quicklisp-to-nix-output/parse-number.nix  |   30 +-
 .../quicklisp-to-nix-output/pcall-queue.nix   |   27 +
 .../quicklisp-to-nix-output/pcall.nix         |   35 +-
 .../quicklisp-to-nix-output/pgloader.nix      |   86 +-
 .../quicklisp-to-nix-output/plump-dom.nix     |   26 +
 .../quicklisp-to-nix-output/plump-lexer.nix   |   26 +
 .../quicklisp-to-nix-output/plump-parser.nix  |   30 +
 .../quicklisp-to-nix-output/plump.nix         |   37 +-
 .../quicklisp-to-nix-output/postmodern.nix    |   45 +-
 .../quicklisp-to-nix-output/proc-parse.nix    |   34 +-
 .../quicklisp-to-nix-output/prove.nix         |   37 +-
 .../quicklisp-to-nix-output/ptester.nix       |   24 +
 .../quicklisp-to-nix-output/puri.nix          |   32 +-
 .../py-configparser.nix                       |   29 +-
 .../quicklisp-to-nix-output/qmynd.nix         |   37 +-
 .../quicklisp-to-nix-output/query-fs.nix      |   51 +-
 .../quicklisp-to-nix-output/quri.nix          |   36 +-
 .../quicklisp-to-nix-output/rfc2388.nix       |   27 +-
 .../quicklisp-to-nix-output/rt.nix            |   24 +
 .../quicklisp-to-nix-output/s-sql.nix         |   26 +
 .../quicklisp-to-nix-output/salza2.nix        |   28 +-
 .../quicklisp-to-nix-output/simple-date.nix   |   36 +-
 .../quicklisp-to-nix-output/smart-buffer.nix  |   35 +-
 .../split-sequence.nix                        |   33 +-
 .../quicklisp-to-nix-output/sqlite.nix        |   33 +-
 .../static-vectors.nix                        |   39 +-
 .../quicklisp-to-nix-output/stumpwm.nix       |   31 +-
 .../quicklisp-to-nix-output/swank.nix         |   24 +
 .../quicklisp-to-nix-output/swap-bytes.nix    |   35 +-
 .../quicklisp-to-nix-output/symbol-munger.nix |   30 +
 .../trivial-backtrace.nix                     |   28 +-
 .../trivial-features.nix                      |   29 +-
 .../trivial-garbage.nix                       |   33 +-
 .../trivial-gray-streams.nix                  |   30 +-
 .../trivial-indent.nix                        |   29 +-
 .../quicklisp-to-nix-output/trivial-mimes.nix |   29 +-
 .../quicklisp-to-nix-output/trivial-types.nix |   28 +-
 .../quicklisp-to-nix-output/trivial-utf-8.nix |   30 +-
 .../quicklisp-to-nix-output/uffi.nix          |   27 +-
 .../quicklisp-to-nix-output/uiop.nix          |   27 +-
 .../quicklisp-to-nix-output/unit-test.nix     |   24 +
 .../quicklisp-to-nix-output/usocket.nix       |   29 +-
 .../quicklisp-to-nix-output/uuid.nix          |   32 +-
 .../quicklisp-to-nix-output/vom.nix           |   27 +-
 .../quicklisp-to-nix-output/woo.nix           |   54 +-
 .../quicklisp-to-nix-output/wookie.nix        |   44 +-
 .../quicklisp-to-nix-output/xkeyboard.nix     |   28 +
 .../quicklisp-to-nix-output/xmls.nix          |   28 +-
 .../quicklisp-to-nix-output/xpath.nix         |   37 +
 .../quicklisp-to-nix-output/xsubseq.nix       |   27 +-
 .../quicklisp-to-nix-output/yacc.nix          |   24 +
 .../quicklisp-to-nix-output/yason.nix         |   31 +-
 .../quicklisp-to-nix-output/zpb-ttf.nix       |   28 +-
 .../quicklisp-to-nix-overrides.nix            |   38 +
 .../lisp-modules/quicklisp-to-nix.nix         | 1350 ++++++++++++-----
 213 files changed, 4383 insertions(+), 4292 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
index 4bc7545d966..6a40dda0c1c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
@@ -5,33 +5,26 @@ rec {
 
   description = ''markdown processor in CL using esrap parser.'';
 
-  deps = [ args."split-sequence" args."esrap" args."alexandria" ];
+  deps = [ args."alexandria" args."esrap" args."split-sequence" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
     sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
   };
-    
+
   packageName = "3bmd";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["3bmd.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL
-    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME _3bmd DEPS
-    ((NAME split-sequence FILENAME split-sequence) (NAME esrap FILENAME esrap) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
-    (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS
-    (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)) */
+/* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256
+    158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL
+    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5
+    b80864c74437e0cfb66663e9bbf08fed NAME 3bmd FILENAME _3bmd DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap)
+     (NAME split-sequence FILENAME split-sequence))
+    DEPENDENCIES (alexandria esrap split-sequence) VERSION 20161204-git
+    SIBLINGS
+    (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables
+     3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
index 1f605fcc795..a657159a41f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
@@ -5,31 +5,23 @@ rec {
 
   description = ''ABNF Parser Generator, per RFC2234'';
 
-  deps = [ args."cl-ppcre" args."esrap" ];
+  deps = [ args."alexandria" args."cl-ppcre" args."esrap" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz'';
     sha256 = ''00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687'';
   };
-    
+
   packageName = "abnf";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/abnf[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["abnf.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM abnf DESCRIPTION ABNF Parser Generator, per RFC2234 SHA256 00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687 URL
-    http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz MD5 311c2b17e49666dac1c2bb45256be708 NAME abnf TESTNAME NIL FILENAME abnf
-    DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME esrap FILENAME esrap)) DEPENDENCIES (cl-ppcre esrap) VERSION cl-20150608-git SIBLINGS NIL) */
+/* (SYSTEM abnf DESCRIPTION ABNF Parser Generator, per RFC2234 SHA256
+    00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687 URL
+    http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz
+    MD5 311c2b17e49666dac1c2bb45256be708 NAME abnf FILENAME abnf DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME esrap FILENAME esrap))
+    DEPENDENCIES (alexandria cl-ppcre esrap) VERSION cl-20150608-git SIBLINGS
+    NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 52f0161aecb..334ff7e82d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz'';
     sha256 = ''1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis'';
   };
-    
+
   packageName = "alexandria";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/alexandria[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["alexandria.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis
-    URL http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz MD5 ce5427881c909981192f870cb52ff59f NAME alexandria TESTNAME NIL
-    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (alexandria-tests)) */
+/* (SYSTEM alexandria DESCRIPTION
+    Alexandria is a collection of portable public domain utilities. SHA256
+    1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis URL
+    http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz
+    MD5 ce5427881c909981192f870cb52ff59f NAME alexandria FILENAME alexandria
+    DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (alexandria-tests)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index cc1eb196202..f1fdf5bb8dc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -3,33 +3,25 @@ rec {
   baseName = ''anaphora'';
   version = ''20170227-git'';
 
+  parasites = [ "anaphora/test" ];
+
   description = ''The Anaphoric Macro Package from Hell'';
 
-  deps = [ ];
+  deps = [ args."rt" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz'';
     sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9'';
   };
-    
+
   packageName = "anaphora";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/anaphora[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["anaphora.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256 1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9 URL
-    http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz MD5 6121d9bbc92df29d823b60ae0d0c556d NAME anaphora TESTNAME NIL FILENAME
-    anaphora DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
+/* (SYSTEM anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256
+    1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9 URL
+    http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz
+    MD5 6121d9bbc92df29d823b60ae0d0c556d NAME anaphora FILENAME anaphora DEPS
+    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20170227-git SIBLINGS NIL
+    PARASITES (anaphora/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 20763679a82..f7adf3b3494 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz'';
     sha256 = ''1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb'';
   };
-    
+
   packageName = "array-utils";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/array-utils[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["array-utils.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb URL
-    http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz MD5 550b37bc0eccfafa889de00b59c422dc NAME array-utils TESTNAME NIL
-    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (array-utils-test)) */
+/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
+    SHA256 1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb URL
+    http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz
+    MD5 550b37bc0eccfafa889de00b59c422dc NAME array-utils FILENAME array-utils
+    DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (array-utils-test)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
new file mode 100644
index 00000000000..f2125676e5a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''asdf-finalizers'';
+  version = ''20170403-git'';
+
+  description = ''Enforced calling of finalizers for Lisp code'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz'';
+    sha256 = ''1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj'';
+  };
+
+  packageName = "asdf-finalizers";
+
+  asdFilesToKeep = ["asdf-finalizers.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM asdf-finalizers DESCRIPTION
+    Enforced calling of finalizers for Lisp code SHA256
+    1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj URL
+    http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz
+    MD5 a9e3c960e6b6fdbd69640b520ef8044b NAME asdf-finalizers FILENAME
+    asdf-finalizers DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS
+    (asdf-finalizers-test list-of) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index f694e4746ac..65df45d95a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -11,26 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz'';
     sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq'';
   };
-    
+
   packageName = "asdf-system-connections";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/asdf-system-connections[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["asdf-system-connections.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM asdf-system-connections DESCRIPTION Allows for ASDF system to be connected so that auto-loading may occur. SHA256
-    0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq URL
-    http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz MD5 23bdbb69c433568e3e15ed705b803992 NAME
-    asdf-system-connections TESTNAME NIL FILENAME asdf-system-connections DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL) */
+/* (SYSTEM asdf-system-connections DESCRIPTION
+    Allows for ASDF system to be connected so that auto-loading may occur.
+    SHA256 0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq URL
+    http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz
+    MD5 23bdbb69c433568e3e15ed705b803992 NAME asdf-system-connections FILENAME
+    asdf-system-connections DEPS NIL DEPENDENCIES NIL VERSION 20170124-git
+    SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index e85bb4f8f92..e96c18a8120 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -5,32 +5,26 @@ rec {
 
   description = ''Some useful streams based on Babel's encoding code'';
 
-  deps = [ args."trivial-gray-streams" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz'';
     sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx'';
   };
-    
+
   packageName = "babel-streams";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel-streams[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["babel-streams.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL
-    http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel-streams TESTNAME NIL FILENAME
-    babel-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
-    (trivial-gray-streams alexandria) VERSION babel-20170630-git SIBLINGS (babel-tests babel)) */
+/* (SYSTEM babel-streams DESCRIPTION
+    Some useful streams based on Babel's encoding code SHA256
+    0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL
+    http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz
+    MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel-streams FILENAME
+    babel-streams DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams)
+    VERSION babel-20170630-git SIBLINGS (babel-tests babel) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index e567b056b24..d5b31daa33a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -5,32 +5,23 @@ rec {
 
   description = ''Babel, a charset conversion library.'';
 
-  deps = [ args."trivial-features" args."alexandria" ];
+  deps = [ args."alexandria" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz'';
     sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx'';
   };
-    
+
   packageName = "babel";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["babel.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL
-    http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel TESTNAME NIL FILENAME babel DEPS
-    ((NAME trivial-features FILENAME trivial-features) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (trivial-features alexandria) VERSION 20170630-git
-    SIBLINGS (babel-streams babel-tests)) */
+/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256
+    0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL
+    http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz
+    MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel FILENAME babel DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria trivial-features) VERSION 20170630-git SIBLINGS
+    (babel-streams babel-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index edeadade715..a660882f36b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz'';
     sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9'';
   };
-    
+
   packageName = "blackbird";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/blackbird[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["blackbird.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM blackbird DESCRIPTION A promise implementation for Common Lisp. SHA256 0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9 URL
-    http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz MD5 5cb13dc06a0eae8dcba14714d2b5365d NAME blackbird TESTNAME NIL FILENAME
-    blackbird DEPS ((NAME vom FILENAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */
+/* (SYSTEM blackbird DESCRIPTION A promise implementation for Common Lisp.
+    SHA256 0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9 URL
+    http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz
+    MD5 5cb13dc06a0eae8dcba14714d2b5365d NAME blackbird FILENAME blackbird DEPS
+    ((NAME vom FILENAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS
+    (blackbird-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index 002b2ad0e37..f0fc5d4d0c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -3,34 +3,28 @@ rec {
   baseName = ''bordeaux-threads'';
   version = ''v0.8.5'';
 
+  parasites = [ "bordeaux-threads/test" ];
+
   description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.'';
 
-  deps = [ args."alexandria" ];
+  deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
     sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
   };
-    
+
   packageName = "bordeaux-threads";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/bordeaux-threads[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["bordeaux-threads.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM bordeaux-threads DESCRIPTION Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
-    09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz MD5
-    67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
-    (alexandria) VERSION v0.8.5 SIBLINGS NIL) */
+/* (SYSTEM bordeaux-threads DESCRIPTION
+    Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
+    09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL
+    http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz
+    MD5 67e363a363e164b6f61a047957b8554e NAME bordeaux-threads FILENAME
+    bordeaux-threads DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
+    DEPENDENCIES (alexandria fiveam) VERSION v0.8.5 SIBLINGS NIL PARASITES
+    (bordeaux-threads/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index c01189a491e..1c6dadb8fb4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -5,36 +5,33 @@ rec {
 
   description = ''Web Application Framework for Common Lisp'';
 
-  deps = [ args."myway" args."local-time" args."do-urlencode" args."clack-v1-compat" args."cl-syntax-annot" args."cl-syntax" args."cl-project" args."cl-ppcre" args."cl-emb" args."anaphora" ];
+  deps = [ args."anaphora" args."cl-emb" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."clack-v1-compat" args."do-urlencode" args."local-time" args."myway" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz'';
     sha256 = ''0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2'';
   };
-    
+
   packageName = "caveman";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/caveman[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["caveman.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2 URL
-    http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz MD5 774f85fa78792bde012bad78efff4b53 NAME caveman TESTNAME NIL FILENAME
-    caveman DEPS
-    ((NAME myway FILENAME myway) (NAME local-time FILENAME local-time) (NAME do-urlencode FILENAME do-urlencode)
-     (NAME clack-v1-compat FILENAME clack-v1-compat) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
-     (NAME cl-project FILENAME cl-project) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-emb FILENAME cl-emb) (NAME anaphora FILENAME anaphora))
-    DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20170630-git SIBLINGS
-    (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2)) */
+/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256
+    0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2 URL
+    http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz
+    MD5 774f85fa78792bde012bad78efff4b53 NAME caveman FILENAME caveman DEPS
+    ((NAME anaphora FILENAME anaphora) (NAME cl-emb FILENAME cl-emb)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-project FILENAME cl-project)
+     (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME clack-v1-compat FILENAME clack-v1-compat)
+     (NAME do-urlencode FILENAME do-urlencode)
+     (NAME local-time FILENAME local-time) (NAME myway FILENAME myway))
+    DEPENDENCIES
+    (anaphora cl-emb cl-ppcre cl-project cl-syntax cl-syntax-annot
+     clack-v1-compat do-urlencode local-time myway)
+    VERSION 20170630-git SIBLINGS
+    (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
+     caveman2)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index e5dd39df1cd..7923c444f24 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -5,32 +5,26 @@ rec {
 
   description = ''The CFFI Groveller'';
 
-  deps = [ args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz'';
     sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
   };
-    
+
   packageName = "cffi-grovel";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-grovel[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cffi-grovel.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
-    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5 7589b6437fec19fdabc65892536c3dc3 NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel
-    DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.19.0 SIBLINGS
-    (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
+/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256
+    12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
+    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5
+    7589b6437fec19fdabc65892536c3dc3 NAME cffi-grovel FILENAME cffi-grovel DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features)
+    VERSION cffi_0.19.0 SIBLINGS
+    (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
new file mode 100644
index 00000000000..8234b83edfb
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cffi-toolchain'';
+  version = ''cffi_0.19.0'';
+
+  description = ''The CFFI toolchain'';
+
+  deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz'';
+    sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
+  };
+
+  packageName = "cffi-toolchain";
+
+  asdFilesToKeep = ["cffi-toolchain.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256
+    12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
+    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5
+    7589b6437fec19fdabc65892536c3dc3 NAME cffi-toolchain FILENAME
+    cffi-toolchain DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.19.0
+    SIBLINGS
+    (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 7c09b2ec643..d79a36e0302 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -3,35 +3,32 @@ rec {
   baseName = ''cffi'';
   version = ''cffi_0.19.0'';
 
+  parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ];
+
   description = ''The Common Foreign Function Interface'';
 
-  deps = [ args."uiop" args."trivial-features" args."babel" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz'';
     sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
   };
-    
+
   packageName = "cffi";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cffi.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
-    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5 7589b6437fec19fdabc65892536c3dc3 NAME cffi TESTNAME NIL FILENAME cffi DEPS
-    ((NAME uiop FILENAME uiop) (NAME trivial-features FILENAME trivial-features) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.19.0 SIBLINGS
-    (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat)) */
+/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256
+    12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
+    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5
+    7589b6437fec19fdabc65892536c3dc3 NAME cffi FILENAME cffi DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME uiop FILENAME uiop))
+    DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop)
+    VERSION cffi_0.19.0 SIBLINGS
+    (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain
+     cffi-uffi-compat)
+    PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index e2a9da13b45..e13932346a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz'';
     sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826'';
   };
-    
+
   packageName = "chipz";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chipz[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["chipz.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM chipz DESCRIPTION A library for decompressing deflate, zlib, and gzip data SHA256 1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826 URL
-    http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz MD5 625cb9c551f3692799e2029d4a0dd7e9 NAME chipz TESTNAME NIL FILENAME chipz DEPS
-    NIL DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL) */
+/* (SYSTEM chipz DESCRIPTION
+    A library for decompressing deflate, zlib, and gzip data SHA256
+    1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826 URL
+    http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz
+    MD5 625cb9c551f3692799e2029d4a0dd7e9 NAME chipz FILENAME chipz DEPS NIL
+    DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index d6361d4392d..6a4fd0defb9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz'';
     sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg'';
   };
-    
+
   packageName = "chunga";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chunga[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["chunga.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM chunga DESCRIPTION NIL SHA256 1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL
-    http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5 75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga TESTNAME NIL FILENAME chunga DEPS
-    ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */
+/* (SYSTEM chunga DESCRIPTION NIL SHA256
+    1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL
+    http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5
+    75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga FILENAME chunga DEPS
+    ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
+    (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 39cf82831a9..b25e131be55 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -5,32 +5,26 @@ rec {
 
   description = ''Circularly readable streams for Common Lisp'';
 
-  deps = [ args."trivial-gray-streams" args."fast-io" ];
+  deps = [ args."alexandria" args."fast-io" args."static-vectors" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
     sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128'';
   };
-    
+
   packageName = "circular-streams";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/circular-streams[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["circular-streams.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM circular-streams DESCRIPTION Circularly readable streams for Common Lisp SHA256 1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128 URL
-    http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams
-    TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME fast-io FILENAME fast-io)) DEPENDENCIES
-    (trivial-gray-streams fast-io) VERSION 20161204-git SIBLINGS (circular-streams-test)) */
+/* (SYSTEM circular-streams DESCRIPTION
+    Circularly readable streams for Common Lisp SHA256
+    1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128 URL
+    http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz
+    MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams FILENAME
+    circular-streams DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME fast-io FILENAME fast-io)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES (alexandria fast-io static-vectors trivial-gray-streams)
+    VERSION 20161204-git SIBLINGS (circular-streams-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
index 4f0c1a0421d..8a8a26a2e9b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -3,38 +3,35 @@ rec {
   baseName = ''cl+ssl'';
   version = ''cl+ssl-20170725-git'';
 
+  parasites = [ "openssl-1.1.0" ];
+
   description = ''Common Lisp interface to OpenSSL.'';
 
-  deps = [ args."uiop" args."trivial-gray-streams" args."trivial-garbage" args."trivial-features" args."flexi-streams" args."cffi" args."bordeaux-threads" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz'';
     sha256 = ''1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69'';
   };
-    
+
   packageName = "cl+ssl";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl+ssl[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl+ssl.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69 URL
-    http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz MD5 3458c83f442395e0492c7e9b9720a1f2 NAME cl+ssl TESTNAME NIL FILENAME cl+ssl
-    DEPS
-    ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-garbage FILENAME trivial-garbage)
-     (NAME trivial-features FILENAME trivial-features) (NAME flexi-streams FILENAME flexi-streams) (NAME cffi FILENAME cffi)
-     (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (uiop trivial-gray-streams trivial-garbage trivial-features flexi-streams cffi bordeaux-threads alexandria) VERSION cl+ssl-20170725-git
-    SIBLINGS (cl+ssl.test)) */
+/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
+    1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69 URL
+    http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz
+    MD5 3458c83f442395e0492c7e9b9720a1f2 NAME cl+ssl FILENAME cl+ssl DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME uiop FILENAME uiop))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi flexi-streams trivial-features
+     trivial-garbage trivial-gray-streams uiop)
+    VERSION cl+ssl-20170725-git SIBLINGS (cl+ssl.test) PARASITES
+    (openssl-1.1.0)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index ab800bc1780..9a664aa9773 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
     sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
   };
-    
+
   packageName = "cl-aa";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-aa[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-aa.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-aa TESTNAME NIL FILENAME
-    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170630-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
+/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256
+    0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz
+    MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-aa FILENAME cl-aa DEPS NIL
+    DEPENDENCIES NIL VERSION cl-vectors-20170630-git SIBLINGS
+    (cl-aa-misc cl-paths-ttf cl-paths cl-vectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index 591df96c84e..5f93167a114 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz'';
     sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3'';
   };
-    
+
   packageName = "cl-annot";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-annot[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-annot.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-annot DESCRIPTION Python-like Annotation Syntax for Common Lisp SHA256 0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3 URL
-    http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz MD5 35d8f79311bda4dd86002d11edcd0a21 NAME cl-annot TESTNAME NIL FILENAME
-    cl-annot DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */
+/* (SYSTEM cl-annot DESCRIPTION Python-like Annotation Syntax for Common Lisp
+    SHA256 0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3 URL
+    http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz
+    MD5 35d8f79311bda4dd86002d11edcd0a21 NAME cl-annot FILENAME cl-annot DEPS
+    ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION
+    20150608-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index 51b5b5cf543..a413743eb8d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz'';
     sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m'';
   };
-    
+
   packageName = "cl-anonfun";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-anonfun[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-anonfun.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-anonfun DESCRIPTION Anonymous function helpers for Common Lisp SHA256 16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m URL
-    http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz MD5 915bda1a7653d42090f8d20a1ad85d0b NAME cl-anonfun TESTNAME NIL
-    FILENAME cl-anonfun DEPS NIL DEPENDENCIES NIL VERSION 20111203-git SIBLINGS NIL) */
+/* (SYSTEM cl-anonfun DESCRIPTION Anonymous function helpers for Common Lisp
+    SHA256 16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m URL
+    http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz
+    MD5 915bda1a7653d42090f8d20a1ad85d0b NAME cl-anonfun FILENAME cl-anonfun
+    DEPS NIL DEPENDENCIES NIL VERSION 20111203-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 0dce1f78944..9b053c920e3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -5,32 +5,25 @@ rec {
 
   description = ''ANSI control string characters, focused on color'';
 
-  deps = [ args."cl-colors" args."alexandria" ];
+  deps = [ args."alexandria" args."anaphora" args."cl-colors" args."let-plus" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz'';
     sha256 = ''112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i'';
   };
-    
+
   packageName = "cl-ansi-text";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ansi-text[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-ansi-text.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-ansi-text DESCRIPTION ANSI control string characters, focused on color SHA256 112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i URL
-    http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz MD5 70aa38b40377a5e89a7f22bb68b3f796 NAME cl-ansi-text TESTNAME NIL
-    FILENAME cl-ansi-text DEPS ((NAME cl-colors FILENAME cl-colors) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION
-    20150804-git SIBLINGS (cl-ansi-text-test)) */
+/* (SYSTEM cl-ansi-text DESCRIPTION
+    ANSI control string characters, focused on color SHA256
+    112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i URL
+    http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz
+    MD5 70aa38b40377a5e89a7f22bb68b3f796 NAME cl-ansi-text FILENAME
+    cl-ansi-text DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+     (NAME cl-colors FILENAME cl-colors) (NAME let-plus FILENAME let-plus))
+    DEPENDENCIES (alexandria anaphora cl-colors let-plus) VERSION 20150804-git
+    SIBLINGS (cl-ansi-text-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
deleted file mode 100644
index 210e914aeee..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cl-async-base'';
-  version = ''cl-async-20160825-git'';
-
-  testSystems = ["cl-async"];
-
-  description = ''Base system for cl-async.'';
-
-  deps = [ args."cl-libuv" args."cffi" args."bordeaux-threads" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
-    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
-  };
-    
-  packageName = "cl-async-base";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-base[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cl-async-base DESCRIPTION Base system for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
-    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-base TESTNAME cl-async
-    FILENAME cl-async-base DEPS ((NAME cl-libuv FILENAME cl-libuv) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES
-    (cl-libuv cffi bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index 21dd26e4a83..8a323e3dcc9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -5,32 +5,38 @@ rec {
 
   description = ''REPL integration for CL-ASYNC.'';
 
-  deps = [ args."bordeaux-threads" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
-    
+
   packageName = "cl-async-repl";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-repl[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-async-repl.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
-    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl TESTNAME NIL
-    FILENAME cl-async-repl DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS
-    (cl-async-ssl cl-async-test cl-async)) */
+/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
+    104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
+    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz
+    MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl FILENAME
+    cl-async-repl DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-async FILENAME cl-async)
+     (NAME cl-async-base FILENAME cl-async-base)
+     (NAME cl-async-util FILENAME cl-async-util)
+     (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME fast-io FILENAME fast-io)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME vom FILENAME vom))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base
+     cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features
+     trivial-gray-streams vom)
+    VERSION cl-async-20160825-git SIBLINGS
+    (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index 438a85700e7..7c040c7a461 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -5,32 +5,39 @@ rec {
 
   description = ''SSL Wrapper around cl-async socket implementation.'';
 
-  deps = [ args."vom" args."cffi" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
-    
+
   packageName = "cl-async-ssl";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-ssl[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-async-ssl.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
-    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl TESTNAME NIL
-    FILENAME cl-async-ssl DEPS ((NAME vom FILENAME vom) (NAME cffi FILENAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS
-    (cl-async-repl cl-async-test cl-async)) */
+/* (SYSTEM cl-async-ssl DESCRIPTION
+    SSL Wrapper around cl-async socket implementation. SHA256
+    104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
+    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz
+    MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl FILENAME
+    cl-async-ssl DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-async FILENAME cl-async)
+     (NAME cl-async-base FILENAME cl-async-base)
+     (NAME cl-async-util FILENAME cl-async-util)
+     (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME fast-io FILENAME fast-io)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME vom FILENAME vom))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base
+     cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features
+     trivial-gray-streams vom)
+    VERSION cl-async-20160825-git SIBLINGS
+    (cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
deleted file mode 100644
index 8bc2b61128f..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cl-async-util'';
-  version = ''cl-async-20160825-git'';
-
-  description = ''Internal utilities for cl-async.'';
-
-  deps = [ args."vom" args."fast-io" args."cl-ppcre" args."cl-libuv" args."cl-async-base" args."cffi" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
-    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
-  };
-    
-  packageName = "cl-async-util";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-util[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cl-async-util DESCRIPTION Internal utilities for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
-    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-util TESTNAME NIL
-    FILENAME cl-async-util DEPS
-    ((NAME vom FILENAME vom) (NAME fast-io FILENAME fast-io) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv)
-     (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi))
-    DEPENDENCIES (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 2e8a5ce83de..cc31b7a186f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -3,38 +3,37 @@ rec {
   baseName = ''cl-async'';
   version = ''20160825-git'';
 
+  parasites = [ "cl-async-base" "cl-async-util" ];
+
   description = ''Asynchronous operations for Common Lisp.'';
 
-  deps = [ args."uiop" args."trivial-gray-streams" args."trivial-features" args."static-vectors" args."cl-ppcre" args."cl-libuv" args."cl-async-util" args."cl-async-base" args."cffi" args."babel" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
-    
+
   packageName = "cl-async";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-async.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
-    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async TESTNAME NIL FILENAME
-    cl-async DEPS
-    ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-features FILENAME trivial-features)
-     (NAME static-vectors FILENAME static-vectors) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv)
-     (NAME cl-async-util FILENAME cl-async-util) (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi) (NAME babel FILENAME babel))
-    DEPENDENCIES (uiop trivial-gray-streams trivial-features static-vectors cl-ppcre cl-libuv cl-async-util cl-async-base cffi babel) VERSION 20160825-git
-    SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)) */
+/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
+    104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
+    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz
+    MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async FILENAME cl-async DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME fast-io FILENAME fast-io)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME uiop FILENAME uiop) (NAME vom FILENAME vom))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi cffi-grovel cl-libuv cl-ppcre
+     fast-io static-vectors trivial-features trivial-gray-streams uiop vom)
+    VERSION 20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+    PARASITES (cl-async-base cl-async-util)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index 86cc31f5642..a4a9a9261fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -3,33 +3,26 @@ rec {
   baseName = ''cl-base64'';
   version = ''20150923-git'';
 
+  parasites = [ "cl-base64-tests" ];
+
   description = ''Base64 encoding and decoding with URI support.'';
 
-  deps = [ ];
+  deps = [ args."kmrcl" args."ptester" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz'';
     sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp'';
   };
-    
+
   packageName = "cl-base64";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-base64[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-base64.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-base64 DESCRIPTION Base64 encoding and decoding with URI support. SHA256 0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp URL
-    http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz MD5 560d0601eaa86901611f1484257b9a57 NAME cl-base64 TESTNAME NIL FILENAME
-    cl-base64 DEPS NIL DEPENDENCIES NIL VERSION 20150923-git SIBLINGS NIL) */
+/* (SYSTEM cl-base64 DESCRIPTION Base64 encoding and decoding with URI support.
+    SHA256 0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp URL
+    http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz
+    MD5 560d0601eaa86901611f1484257b9a57 NAME cl-base64 FILENAME cl-base64 DEPS
+    ((NAME kmrcl FILENAME kmrcl) (NAME ptester FILENAME ptester)) DEPENDENCIES
+    (kmrcl ptester) VERSION 20150923-git SIBLINGS NIL PARASITES
+    (cl-base64-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
index f5bee7c03d2..36641b73b75 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz'';
     sha256 = ''0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay'';
   };
-    
+
   packageName = "cl-cli";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-cli[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-cli.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-cli DESCRIPTION Command line parser SHA256 0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay URL
-    http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz MD5 820e5c7dde6800fcfa44b1fbc7a9d62b NAME cl-cli TESTNAME NIL FILENAME cl-cli
-    DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20151218-git SIBLINGS NIL) */
+/* (SYSTEM cl-cli DESCRIPTION Command line parser SHA256
+    0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay URL
+    http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz
+    MD5 820e5c7dde6800fcfa44b1fbc7a9d62b NAME cl-cli FILENAME cl-cli DEPS
+    ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES
+    (split-sequence) VERSION 20151218-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 5abdac589dd..6a6ad9a6e70 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -3,34 +3,27 @@ rec {
   baseName = ''cl-colors'';
   version = ''20151218-git'';
 
+  parasites = [ "cl-colors-tests" ];
+
   description = ''Simple color library for Common Lisp'';
 
-  deps = [ args."alexandria" args."let-plus" ];
+  deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz'';
     sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4'';
   };
-    
+
   packageName = "cl-colors";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-colors[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-colors.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256 032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL
-    http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors TESTNAME NIL FILENAME
-    cl-colors DEPS ((NAME alexandria FILENAME alexandria) (NAME let-plus FILENAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS
-    NIL) */
+/* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256
+    032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL
+    http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz
+    MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors FILENAME cl-colors DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+     (NAME let-plus FILENAME let-plus) (NAME lift FILENAME lift))
+    DEPENDENCIES (alexandria anaphora let-plus lift) VERSION 20151218-git
+    SIBLINGS NIL PARASITES (cl-colors-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
index 89627b22fbc..ebff2928c3e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
@@ -3,34 +3,31 @@ rec {
   baseName = ''cl-containers'';
   version = ''20170403-git'';
 
+  parasites = [ "cl-containers/with-moptilities" "cl-containers/with-utilities" ];
+
   description = ''A generic container library for Common Lisp'';
 
-  deps = [ args."metatilities-base" args."asdf-system-connections" ];
+  deps = [ args."asdf-system-connections" args."metatilities-base" args."moptilities" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz'';
     sha256 = ''0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg'';
   };
-    
+
   packageName = "cl-containers";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-containers[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-containers.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-containers DESCRIPTION A generic container library for Common Lisp SHA256 0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg URL
-    http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz MD5 17123cd2b018cd3eb048eceef78be3f8 NAME cl-containers TESTNAME
-    NIL FILENAME cl-containers DEPS ((NAME metatilities-base FILENAME metatilities-base) (NAME asdf-system-connections FILENAME asdf-system-connections))
-    DEPENDENCIES (metatilities-base asdf-system-connections) VERSION 20170403-git SIBLINGS (cl-containers-test)) */
+/* (SYSTEM cl-containers DESCRIPTION
+    A generic container library for Common Lisp SHA256
+    0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg URL
+    http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz
+    MD5 17123cd2b018cd3eb048eceef78be3f8 NAME cl-containers FILENAME
+    cl-containers DEPS
+    ((NAME asdf-system-connections FILENAME asdf-system-connections)
+     (NAME metatilities-base FILENAME metatilities-base)
+     (NAME moptilities FILENAME moptilities))
+    DEPENDENCIES (asdf-system-connections metatilities-base moptilities)
+    VERSION 20170403-git SIBLINGS (cl-containers-test) PARASITES
+    (cl-containers/with-moptilities cl-containers/with-utilities)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index 5aa6ad1c9c0..a3aacd0aa8b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -5,34 +5,31 @@ rec {
 
   description = ''HTTP cookie manager'';
 
-  deps = [ args."quri" args."proc-parse" args."local-time" args."cl-ppcre" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz'';
     sha256 = ''0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8'';
   };
-    
+
   packageName = "cl-cookie";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-cookie[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-cookie.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256 0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8 URL
-    http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz MD5 d2c08a71afd47b3ad42e1234ec1a3083 NAME cl-cookie TESTNAME NIL FILENAME
-    cl-cookie DEPS
-    ((NAME quri FILENAME quri) (NAME proc-parse FILENAME proc-parse) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre)
-     (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */
+/* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256
+    0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8 URL
+    http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz
+    MD5 d2c08a71afd47b3ad42e1234ec1a3083 NAME cl-cookie FILENAME cl-cookie DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-utilities FILENAME cl-utilities)
+     (NAME local-time FILENAME local-time)
+     (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cl-fad cl-ppcre cl-utilities local-time
+     proc-parse quri split-sequence trivial-features)
+    VERSION 20150804-git SIBLINGS (cl-cookie-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index 3436e5a75a6..3e1ef10ef99 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -3,34 +3,34 @@ rec {
   baseName = ''cl-csv'';
   version = ''20170403-git'';
 
+  parasites = [ "cl-csv-test" ];
+
   description = ''Facilities for reading and writing CSV format files'';
 
-  deps = [ args."iterate" args."cl-interpol" args."alexandria" ];
+  deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz'';
     sha256 = ''1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h'';
   };
-    
+
   packageName = "cl-csv";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-csv[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-csv.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h URL
-    http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz MD5 1e71a90c5057371fab044d440c39f0a3 NAME cl-csv TESTNAME NIL FILENAME cl-csv
-    DEPS ((NAME iterate FILENAME iterate) (NAME cl-interpol FILENAME cl-interpol) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
-    (iterate cl-interpol alexandria) VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table)) */
+/* (SYSTEM cl-csv DESCRIPTION
+    Facilities for reading and writing CSV format files SHA256
+    1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h URL
+    http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz
+    MD5 1e71a90c5057371fab044d440c39f0a3 NAME cl-csv FILENAME cl-csv DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-unicode FILENAME cl-unicode)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2))
+    DEPENDENCIES
+    (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
+     lisp-unit2)
+    VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
+    (cl-csv-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 54f3380f490..4273869e62a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -5,31 +5,32 @@ rec {
 
   description = '''';
 
-  deps = [ ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
     sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
   };
-    
+
   packageName = "cl-dbi";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-dbi[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-dbi.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME cl-dbi TESTNAME NIL FILENAME cl-dbi
-    DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi)) */
+/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
+    1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz
+    MD5 a9fe67b7fea2640cea9708342a1347bd NAME cl-dbi FILENAME cl-dbi DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-types FILENAME trivial-types))
+    DEPENDENCIES
+    (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
+     dbi named-readtables split-sequence trivial-types)
+    VERSION 20170725-git SIBLINGS
+    (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 06a834ff145..a4da254cc6b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz'';
     sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80'';
   };
-    
+
   packageName = "cl-emb";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-emb[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-emb.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256 03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80 URL
-    http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz MD5 01d850432cc2f8e920e50b4b36e42d42 NAME cl-emb TESTNAME NIL FILENAME cl-emb
-    DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION 20170227-git SIBLINGS NIL) */
+/* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256
+    03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80 URL
+    http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz
+    MD5 01d850432cc2f8e920e50b4b36e42d42 NAME cl-emb FILENAME cl-emb DEPS
+    ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
+    20170227-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 43651428bd0..25ad098f267 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -3,34 +3,28 @@ rec {
   baseName = ''cl-fad'';
   version = ''0.7.4'';
 
+  parasites = [ "cl-fad-test" ];
+
   description = ''Portable pathname library'';
 
-  deps = [ args."alexandria" args."bordeaux-threads" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz'';
     sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x'';
   };
-    
+
   packageName = "cl-fad";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fad[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-fad.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL
-    http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5 8ee53f2249eca9d7d54e268662b41845 NAME cl-fad TESTNAME NIL FILENAME cl-fad DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS
-    NIL) */
+/* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256
+    1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL
+    http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5
+    8ee53f2249eca9d7d54e268662b41845 NAME cl-fad FILENAME cl-fad DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test))
+    DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION 0.7.4
+    SIBLINGS NIL PARASITES (cl-fad-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 681b9205e9b..a972751f36a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -5,33 +5,35 @@ rec {
 
   description = ''CFFI bindings to FUSE (Filesystem in user space)'';
 
-  deps = [ args."bordeaux-threads" args."cl-fuse" args."iterate" args."pcall" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz'';
     sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2'';
   };
-    
+
   packageName = "cl-fuse-meta-fs";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse-meta-fs[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-fuse-meta-fs.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-fuse-meta-fs DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL
-    http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs
-    TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS
-    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall))
-    DEPENDENCIES (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */
+/* (SYSTEM cl-fuse-meta-fs DESCRIPTION
+    CFFI bindings to FUSE (Filesystem in user space) SHA256
+    1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL
+    http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz
+    MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs FILENAME
+    cl-fuse-meta-fs DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-fuse FILENAME cl-fuse) (NAME cl-utilities FILENAME cl-utilities)
+     (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall)
+     (NAME pcall-queue FILENAME pcall-queue)
+     (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-utf-8 FILENAME trivial-utf-8))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi cffi-grovel cl-fuse cl-utilities
+     iterate pcall pcall-queue trivial-backtrace trivial-features
+     trivial-utf-8)
+    VERSION 20150608-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index 8681110c22e..e597b192b30 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -5,35 +5,30 @@ rec {
 
   description = ''CFFI bindings to FUSE (Filesystem in user space)'';
 
-  deps = [ args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-utf-8" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
     sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6'';
   };
-    
+
   packageName = "cl-fuse";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-fuse.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL
-    http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse TESTNAME NIL FILENAME
-    cl-fuse DEPS
-    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
-     (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate) (NAME trivial-backtrace FILENAME trivial-backtrace)
+/* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space)
+    SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL
+    http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz
+    MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse FILENAME cl-fuse DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate)
+     (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-utf-8 FILENAME trivial-utf-8))
-    DEPENDENCIES (bordeaux-threads cffi cffi-grovel cl-utilities iterate trivial-backtrace trivial-utf-8) VERSION 20160318-git SIBLINGS NIL) */
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi cffi-grovel cl-utilities iterate
+     trivial-backtrace trivial-features trivial-utf-8)
+    VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index 5dae43b6e59..97c948507c4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -3,33 +3,28 @@ rec {
   baseName = ''cl-interpol'';
   version = ''0.2.6'';
 
+  parasites = [ "cl-interpol-test" ];
+
   description = '''';
 
-  deps = [ args."cl-unicode" ];
+  deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz'';
     sha256 = ''172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b'';
   };
-    
+
   packageName = "cl-interpol";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-interpol[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-interpol.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b URL
-    http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz MD5 1adc92924670601ebb92546ef8bdc6a7 NAME cl-interpol TESTNAME NIL FILENAME
-    cl-interpol DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION 0.2.6 SIBLINGS NIL) */
+/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256
+    172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b URL
+    http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz
+    MD5 1adc92924670601ebb92546ef8bdc6a7 NAME cl-interpol FILENAME cl-interpol
+    DEPS
+    ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode)
+     (NAME flexi-streams FILENAME flexi-streams))
+    DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 0.2.6 SIBLINGS NIL
+    PARASITES (cl-interpol-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index 20afe70c796..d8bc535f355 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -3,33 +3,26 @@ rec {
   baseName = ''cl-json'';
   version = ''20141217-git'';
 
+  parasites = [ "cl-json.test" ];
+
   description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.'';
 
-  deps = [ ];
+  deps = [ args."fiveam" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz'';
     sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g'';
   };
-    
+
   packageName = "cl-json";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-json[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-json.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-json DESCRIPTION JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format. SHA256
-    00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g URL http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz MD5
-    9d873fa462b93c76d90642d8e3fb4881 NAME cl-json TESTNAME NIL FILENAME cl-json DEPS NIL DEPENDENCIES NIL VERSION 20141217-git SIBLINGS NIL) */
+/* (SYSTEM cl-json DESCRIPTION
+    JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.
+    SHA256 00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g URL
+    http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz
+    MD5 9d873fa462b93c76d90642d8e3fb4881 NAME cl-json FILENAME cl-json DEPS
+    ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION 20141217-git
+    SIBLINGS NIL PARASITES (cl-json.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index 74d40aa8e79..dfabda0428f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz'';
     sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv'';
   };
-    
+
   packageName = "cl-l10n-cldr";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n-cldr[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-l10n-cldr.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-l10n-cldr DESCRIPTION The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way. SHA256
-    03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv URL http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz MD5
-    466e776f2f6b931d9863e1fc4d0b514e NAME cl-l10n-cldr TESTNAME NIL FILENAME cl-l10n-cldr DEPS NIL DEPENDENCIES NIL VERSION 20120909-darcs SIBLINGS NIL) */
+/* (SYSTEM cl-l10n-cldr DESCRIPTION
+    The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.
+    SHA256 03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv URL
+    http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz
+    MD5 466e776f2f6b931d9863e1fc4d0b514e NAME cl-l10n-cldr FILENAME
+    cl-l10n-cldr DEPS NIL DEPENDENCIES NIL VERSION 20120909-darcs SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index eabcda82eab..b5ede76f817 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -3,37 +3,43 @@ rec {
   baseName = ''cl-l10n'';
   version = ''20161204-darcs'';
 
+  parasites = [ "cl-l10n/test" ];
+
   description = ''Portable CL Locale Support'';
 
-  deps = [ args."alexandria" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."cxml" args."flexi-streams" args."iterate" args."local-time" args."metabang-bind" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz'';
     sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl'';
   };
-    
+
   packageName = "cl-l10n";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-l10n.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-l10n DESCRIPTION Portable CL Locale Support SHA256 1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl URL
-    http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz MD5 c7cb0bb584b061799abaaaf2bd65c9c5 NAME cl-l10n TESTNAME NIL FILENAME
-    cl-l10n DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr) (NAME cl-ppcre FILENAME cl-ppcre)
-     (NAME closer-mop FILENAME closer-mop) (NAME cxml FILENAME cxml) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate)
-     (NAME local-time FILENAME local-time) (NAME metabang-bind FILENAME metabang-bind))
-    DEPENDENCIES (alexandria cl-fad cl-l10n-cldr cl-ppcre closer-mop cxml flexi-streams iterate local-time metabang-bind) VERSION 20161204-darcs SIBLINGS NIL) */
+/* (SYSTEM cl-l10n DESCRIPTION Portable CL Locale Support SHA256
+    1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl URL
+    http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz
+    MD5 c7cb0bb584b061799abaaaf2bd65c9c5 NAME cl-l10n FILENAME cl-l10n DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop)
+     (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
+     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
+     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil)
+     (NAME iterate FILENAME iterate) (NAME local-time FILENAME local-time)
+     (NAME metabang-bind FILENAME metabang-bind)
+     (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cl-fad cl-l10n-cldr cl-ppcre closer-mop
+     closure-common cxml cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams
+     hu.dwim.stefil iterate local-time metabang-bind parse-number puri
+     trivial-features trivial-gray-streams)
+    VERSION 20161204-darcs SIBLINGS NIL PARASITES (cl-l10n/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index c08467fdd20..deda83b7e0f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -5,32 +5,24 @@ rec {
 
   description = ''Low-level libuv bindings for Common Lisp.'';
 
-  deps = [ args."alexandria" args."cffi" args."cffi-grovel" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz'';
     sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r'';
   };
-    
+
   packageName = "cl-libuv";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-libuv[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-libuv.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL
-    http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv TESTNAME NIL FILENAME
-    cl-libuv DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES
-    (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */
+/* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp.
+    SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL
+    http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz
+    MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv FILENAME cl-libuv DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria babel cffi cffi-grovel trivial-features) VERSION
+    20160825-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
index cc0a45b6e38..57c9c03ba42 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz'';
     sha256 = ''0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d'';
   };
-    
+
   packageName = "cl-log";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-log[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-log.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-log DESCRIPTION CL-LOG - a general purpose logging utility SHA256 0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d URL
-    http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz MD5 fb960933eb748c14adc3ccb376ac8066 NAME cl-log TESTNAME NIL FILENAME cl-log DEPS NIL
-    DEPENDENCIES NIL VERSION cl-log.1.0.1 SIBLINGS (cl-log-test)) */
+/* (SYSTEM cl-log DESCRIPTION CL-LOG - a general purpose logging utility SHA256
+    0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d URL
+    http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz MD5
+    fb960933eb748c14adc3ccb376ac8066 NAME cl-log FILENAME cl-log DEPS NIL
+    DEPENDENCIES NIL VERSION cl-log.1.0.1 SIBLINGS (cl-log-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
index 791b1e55827..f52952af3e1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
@@ -5,35 +5,32 @@ rec {
 
   description = '''';
 
-  deps = [ args."metatilities-base" args."metabang-bind" args."dynamic-classes" args."cl-ppcre" args."cl-containers" args."anaphora" ];
+  deps = [ args."anaphora" args."asdf-system-connections" args."cl-containers" args."cl-ppcre" args."dynamic-classes" args."metabang-bind" args."metatilities-base" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz'';
     sha256 = ''1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w'';
   };
-    
+
   packageName = "cl-markdown";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markdown[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-markdown.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-markdown DESCRIPTION NIL SHA256 1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w URL
-    http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz MD5 3e748529531ad1dcbee5443fe24b6300 NAME cl-markdown TESTNAME NIL
-    FILENAME cl-markdown DEPS
-    ((NAME metatilities-base FILENAME metatilities-base) (NAME metabang-bind FILENAME metabang-bind) (NAME dynamic-classes FILENAME dynamic-classes)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-containers FILENAME cl-containers) (NAME anaphora FILENAME anaphora))
-    DEPENDENCIES (metatilities-base metabang-bind dynamic-classes cl-ppcre cl-containers anaphora) VERSION 20101006-darcs SIBLINGS
-    (cl-markdown-comparisons cl-markdown-test)) */
+/* (SYSTEM cl-markdown DESCRIPTION NIL SHA256
+    1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w URL
+    http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz
+    MD5 3e748529531ad1dcbee5443fe24b6300 NAME cl-markdown FILENAME cl-markdown
+    DEPS
+    ((NAME anaphora FILENAME anaphora)
+     (NAME asdf-system-connections FILENAME asdf-system-connections)
+     (NAME cl-containers FILENAME cl-containers)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME dynamic-classes FILENAME dynamic-classes)
+     (NAME metabang-bind FILENAME metabang-bind)
+     (NAME metatilities-base FILENAME metatilities-base))
+    DEPENDENCIES
+    (anaphora asdf-system-connections cl-containers cl-ppcre dynamic-classes
+     metabang-bind metatilities-base)
+    VERSION 20101006-darcs SIBLINGS (cl-markdown-comparisons cl-markdown-test)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index a8f218d3756..8967b0970c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz'';
     sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r'';
   };
-    
+
   packageName = "cl-markup";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markup[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-markup.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-markup DESCRIPTION NIL SHA256 1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL
-    http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz MD5 3ec36b8e15435933f614959032987848 NAME cl-markup TESTNAME NIL FILENAME
-    cl-markup DEPS NIL DEPENDENCIES NIL VERSION 20131003-git SIBLINGS (cl-markup-test)) */
+/* (SYSTEM cl-markup DESCRIPTION NIL SHA256
+    1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL
+    http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz
+    MD5 3ec36b8e15435933f614959032987848 NAME cl-markup FILENAME cl-markup DEPS
+    NIL DEPENDENCIES NIL VERSION 20131003-git SIBLINGS (cl-markup-test)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index 90983764cda..fa4e18cdbfe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -5,31 +5,24 @@ rec {
 
   description = ''Common Lisp MySQL library bindings'';
 
-  deps = [ args."cffi" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz'';
     sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319'';
   };
-    
+
   packageName = "cl-mysql";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-mysql[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-mysql.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL
-    http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql TESTNAME NIL FILENAME
-    cl-mysql DEPS ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */
+/* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256
+    1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL
+    http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz
+    MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql FILENAME cl-mysql DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20160628-git
+    SIBLINGS (cl-mysql-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index 27f4ef1b71a..b0514e306d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -5,32 +5,23 @@ rec {
 
   description = ''cl-paths-ttf: vectorial paths manipulation'';
 
-  deps = [ args."zpb-ttf" ];
+  deps = [ args."cl-paths" args."zpb-ttf" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
     sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
   };
-    
+
   packageName = "cl-paths-ttf";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-paths-ttf[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-paths-ttf.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-paths-ttf TESTNAME NIL
-    FILENAME cl-paths-ttf DEPS ((NAME zpb-ttf FILENAME zpb-ttf)) DEPENDENCIES (zpb-ttf) VERSION cl-vectors-20170630-git SIBLINGS
-    (cl-aa-misc cl-aa cl-paths cl-vectors)) */
+/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation
+    SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz
+    MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-paths-ttf FILENAME
+    cl-paths-ttf DEPS
+    ((NAME cl-paths FILENAME cl-paths) (NAME zpb-ttf FILENAME zpb-ttf))
+    DEPENDENCIES (cl-paths zpb-ttf) VERSION cl-vectors-20170630-git SIBLINGS
+    (cl-aa-misc cl-aa cl-paths cl-vectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
new file mode 100644
index 00000000000..770c25d924d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-paths'';
+  version = ''cl-vectors-20170630-git'';
+
+  description = ''cl-paths: vectorial paths manipulation'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
+    sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
+  };
+
+  packageName = "cl-paths";
+
+  asdFilesToKeep = ["cl-paths.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-paths DESCRIPTION cl-paths: vectorial paths manipulation SHA256
+    0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz
+    MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-paths FILENAME cl-paths DEPS
+    NIL DEPENDENCIES NIL VERSION cl-vectors-20170630-git SIBLINGS
+    (cl-aa-misc cl-aa cl-paths-ttf cl-vectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 7766454c193..485a2c3de22 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -3,33 +3,26 @@ rec {
   baseName = ''cl-postgres'';
   version = ''postmodern-20170403-git'';
 
+  parasites = [ "cl-postgres-tests" ];
+
   description = ''Low-level client library for PostgreSQL'';
 
-  deps = [ args."md5" ];
+  deps = [ args."fiveam" args."md5" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
     sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
   };
-    
+
   packageName = "cl-postgres";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-postgres[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-postgres.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
-    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres TESTNAME NIL
-    FILENAME cl-postgres DEPS ((NAME md5 FILENAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */
+/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
+    SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz
+    MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres FILENAME cl-postgres
+    DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)) DEPENDENCIES
+    (fiveam md5) VERSION postmodern-20170403-git SIBLINGS
+    (postmodern s-sql simple-date) PARASITES (cl-postgres-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index 6d1b67e28c0..92ede6007ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -9,36 +9,30 @@ This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.'';
 
-  deps = [ args."cl-ppcre" ];
+  deps = [ args."cl-ppcre" args."cl-unification" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz'';
     sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz'';
   };
-    
+
   packageName = "cl-ppcre-template";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre-template[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-ppcre-template.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-ppcre-template DESCRIPTION A system used to conditionally load the CL-PPCRE Template.
+/* (SYSTEM cl-ppcre-template DESCRIPTION
+    A system used to conditionally load the CL-PPCRE Template.
 
 This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.
-    SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz
-    MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES
-    (cl-ppcre) VERSION cl-unification-20170630-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
+    SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL
+    http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz
+    MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-ppcre-template FILENAME
+    cl-ppcre-template DEPS
+    ((NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-unification FILENAME cl-unification))
+    DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20170630-git
+    SIBLINGS (cl-unification-lib cl-unification-test cl-unification) PARASITES
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index b79a00f672f..5f2b2e37e30 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -3,33 +3,31 @@ rec {
   baseName = ''cl-ppcre-unicode'';
   version = ''cl-ppcre-2.0.11'';
 
+  parasites = [ "cl-ppcre-unicode-test" ];
+
   description = ''Perl-compatible regular expression library (Unicode)'';
 
-  deps = [ args."cl-unicode" ];
+  deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
     sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
   };
-    
+
   packageName = "cl-ppcre-unicode";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre-unicode[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-ppcre-unicode.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
-    http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode TESTNAME NIL FILENAME
-    cl-ppcre-unicode DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */
+/* (SYSTEM cl-ppcre-unicode DESCRIPTION
+    Perl-compatible regular expression library (Unicode) SHA256
+    1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz
+    MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode FILENAME
+    cl-ppcre-unicode DEPS
+    ((NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-ppcre-test FILENAME cl-ppcre-test)
+     (NAME cl-unicode FILENAME cl-unicode)
+     (NAME flexi-streams FILENAME flexi-streams))
+    DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION
+    cl-ppcre-2.0.11 SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index b7c60a16696..74d74a9b114 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -3,33 +3,25 @@ rec {
   baseName = ''cl-ppcre'';
   version = ''2.0.11'';
 
+  parasites = [ "cl-ppcre-test" ];
+
   description = ''Perl-compatible regular expression library'';
 
-  deps = [ ];
+  deps = [ args."flexi-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
     sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
   };
-    
+
   packageName = "cl-ppcre";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-ppcre.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
-    http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre TESTNAME NIL FILENAME cl-ppcre
-    DEPS NIL DEPENDENCIES NIL VERSION 2.0.11 SIBLINGS (cl-ppcre-unicode)) */
+/* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library
+    SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz
+    MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre FILENAME cl-ppcre DEPS
+    ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
+    VERSION 2.0.11 SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 74c1213cc6d..bfaaabfbc2d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -5,34 +5,31 @@ rec {
 
   description = ''Generate a skeleton for modern project'';
 
-  deps = [ args."uiop" args."prove" args."local-time" args."cl-ppcre" args."cl-emb" ];
+  deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz'';
     sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81'';
   };
-    
+
   packageName = "cl-project";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-project[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-project.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL
-    http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project TESTNAME NIL
-    FILENAME cl-project DEPS
-    ((NAME uiop FILENAME uiop) (NAME prove FILENAME prove) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre)
-     (NAME cl-emb FILENAME cl-emb))
-    DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb) VERSION 20160531-git SIBLINGS (cl-project-test)) */
+/* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256
+    1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL
+    http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz
+    MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project FILENAME cl-project
+    DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-ansi-text FILENAME cl-ansi-text)
+     (NAME cl-colors FILENAME cl-colors) (NAME cl-emb FILENAME cl-emb)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time)
+     (NAME prove FILENAME prove) (NAME uiop FILENAME uiop))
+    DEPENDENCIES
+    (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad
+     cl-ppcre let-plus local-time prove uiop)
+    VERSION 20160531-git SIBLINGS (cl-project-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index 03d863f2122..916af5b2972 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz'';
     sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi'';
   };
-    
+
   packageName = "cl-reexport";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-reexport[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-reexport.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages. SHA256 1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi URL
-    http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz MD5 207d02771cbd906d033ff704ca5c3a3d NAME cl-reexport TESTNAME NIL
-    FILENAME cl-reexport DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */
+/* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages.
+    SHA256 1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi URL
+    http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz
+    MD5 207d02771cbd906d033ff704ca5c3a3d NAME cl-reexport FILENAME cl-reexport
+    DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria)
+    VERSION 20150709-git SIBLINGS (cl-reexport-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 1d525c7a675..9cb69caaafd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -5,34 +5,34 @@ rec {
 
   description = ''Common Lisp smtp client.'';
 
-  deps = [ args."cl+ssl" args."cl-base64" args."flexi-streams" args."trivial-gray-streams" args."usocket" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl+ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz'';
     sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh'';
   };
-    
+
   packageName = "cl-smtp";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-smtp[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-smtp.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL
-    http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp TESTNAME NIL FILENAME
-    cl-smtp DEPS
-    ((NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) (NAME flexi-streams FILENAME flexi-streams)
-     (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket))
-    DEPENDENCIES (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */
+/* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256
+    0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL
+    http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz
+    MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp FILENAME cl-smtp DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl+ssl)
+     (NAME cl-base64 FILENAME cl-base64)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME usocket FILENAME usocket))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams
+     split-sequence trivial-features trivial-garbage trivial-gray-streams
+     usocket)
+    VERSION 20160825-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index 9a49e468ce1..142fbfee2ea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -3,33 +3,25 @@ rec {
   baseName = ''cl-store'';
   version = ''20160531-git'';
 
+  parasites = [ "cl-store-tests" ];
+
   description = ''Serialization package'';
 
-  deps = [ ];
+  deps = [ args."rt" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz'';
     sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz'';
   };
-    
+
   packageName = "cl-store";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-store[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-store.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-store DESCRIPTION Serialization package SHA256 0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz URL
-    http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz MD5 8b3f33956b05d8e900346663f6abca3c NAME cl-store TESTNAME NIL FILENAME
-    cl-store DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS NIL) */
+/* (SYSTEM cl-store DESCRIPTION Serialization package SHA256
+    0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz URL
+    http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz
+    MD5 8b3f33956b05d8e900346663f6abca3c NAME cl-store FILENAME cl-store DEPS
+    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20160531-git SIBLINGS NIL
+    PARASITES (cl-store-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index e82cb4d501f..add200b09a1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -5,32 +5,29 @@ rec {
 
   description = ''CL-Syntax Reader Syntax for cl-annot'';
 
-  deps = [ args."cl-annot" ];
+  deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
-    
+
   packageName = "cl-syntax-annot";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-annot[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-syntax-annot.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-syntax-annot DESCRIPTION CL-Syntax Reader Syntax for cl-annot SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
-    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-annot TESTNAME NIL
-    FILENAME cl-syntax-annot DEPS ((NAME cl-annot FILENAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS
-    (cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
+/* (SYSTEM cl-syntax-annot DESCRIPTION CL-Syntax Reader Syntax for cl-annot
+    SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
+    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz
+    MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-annot FILENAME
+    cl-syntax-annot DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME cl-annot FILENAME cl-annot)
+     (NAME cl-syntax FILENAME cl-syntax)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME trivial-types FILENAME trivial-types))
+    DEPENDENCIES (alexandria cl-annot cl-syntax named-readtables trivial-types)
+    VERSION cl-syntax-20150407-git SIBLINGS
+    (cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote
+     cl-syntax-interpol cl-syntax-markup cl-syntax)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index 6680fc51cbc..c19a47df6c2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -5,32 +5,28 @@ rec {
 
   description = ''CL-Syntax Reader Syntax for cl-anonfun'';
 
-  deps = [ args."cl-anonfun" ];
+  deps = [ args."cl-anonfun" args."cl-syntax" args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
-    
+
   packageName = "cl-syntax-anonfun";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-anonfun[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-syntax-anonfun.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-syntax-anonfun DESCRIPTION CL-Syntax Reader Syntax for cl-anonfun SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
-    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-anonfun TESTNAME NIL
-    FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun FILENAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS
-    (cl-syntax-annot cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
+/* (SYSTEM cl-syntax-anonfun DESCRIPTION CL-Syntax Reader Syntax for cl-anonfun
+    SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
+    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz
+    MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-anonfun FILENAME
+    cl-syntax-anonfun DEPS
+    ((NAME cl-anonfun FILENAME cl-anonfun) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME trivial-types FILENAME trivial-types))
+    DEPENDENCIES (cl-anonfun cl-syntax named-readtables trivial-types) VERSION
+    cl-syntax-20150407-git SIBLINGS
+    (cl-syntax-annot cl-syntax-clsql cl-syntax-fare-quasiquote
+     cl-syntax-interpol cl-syntax-markup cl-syntax)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index 2150b64cb6f..cded8dc2d06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -5,32 +5,28 @@ rec {
 
   description = ''CL-Syntax Reader Syntax for CL-Markup'';
 
-  deps = [ args."cl-markup" ];
+  deps = [ args."cl-markup" args."cl-syntax" args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
-    
+
   packageName = "cl-syntax-markup";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-markup[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-syntax-markup.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-syntax-markup DESCRIPTION CL-Syntax Reader Syntax for CL-Markup SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
-    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-markup TESTNAME NIL
-    FILENAME cl-syntax-markup DEPS ((NAME cl-markup FILENAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS
-    (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax)) */
+/* (SYSTEM cl-syntax-markup DESCRIPTION CL-Syntax Reader Syntax for CL-Markup
+    SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
+    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz
+    MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-markup FILENAME
+    cl-syntax-markup DEPS
+    ((NAME cl-markup FILENAME cl-markup) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME trivial-types FILENAME trivial-types))
+    DEPENDENCIES (cl-markup cl-syntax named-readtables trivial-types) VERSION
+    cl-syntax-20150407-git SIBLINGS
+    (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql
+     cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 264d74e2db4..353c8210885 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -5,33 +5,26 @@ rec {
 
   description = ''Reader Syntax Coventions for Common Lisp and SLIME'';
 
-  deps = [ args."trivial-types" args."named-readtables" ];
+  deps = [ args."named-readtables" args."trivial-types" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
-    
+
   packageName = "cl-syntax";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-syntax.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-syntax DESCRIPTION Reader Syntax Coventions for Common Lisp and SLIME SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
-    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax TESTNAME NIL FILENAME
-    cl-syntax DEPS ((NAME trivial-types FILENAME trivial-types) (NAME named-readtables FILENAME named-readtables)) DEPENDENCIES
-    (trivial-types named-readtables) VERSION 20150407-git SIBLINGS
-    (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup)) */
+/* (SYSTEM cl-syntax DESCRIPTION
+    Reader Syntax Coventions for Common Lisp and SLIME SHA256
+    1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
+    http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz
+    MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax FILENAME cl-syntax DEPS
+    ((NAME named-readtables FILENAME named-readtables)
+     (NAME trivial-types FILENAME trivial-types))
+    DEPENDENCIES (named-readtables trivial-types) VERSION 20150407-git SIBLINGS
+    (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql
+     cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index 2e7f97cf66a..7425b7ce0a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -5,31 +5,28 @@ rec {
 
   description = '''';
 
-  deps = [ ];
+  deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
     sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
-    
+
   packageName = "cl-test-more";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-test-more[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-test-more.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
-    http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME cl-test-more TESTNAME NIL FILENAME
-    cl-test-more DEPS NIL DEPENDENCIES NIL VERSION prove-20170403-git SIBLINGS (prove-asdf prove-test prove)) */
+/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256
+    091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
+    http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz
+    MD5 063b615692c8711d2392204ecf1b37b7 NAME cl-test-more FILENAME
+    cl-test-more DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+     (NAME cl-ansi-text FILENAME cl-ansi-text)
+     (NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME let-plus FILENAME let-plus) (NAME prove FILENAME prove))
+    DEPENDENCIES
+    (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus prove)
+    VERSION prove-20170403-git SIBLINGS (prove-asdf prove-test prove) PARASITES
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index 95d8db3b0cf..e35645f6e98 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -3,33 +3,28 @@ rec {
   baseName = ''cl-unicode'';
   version = ''0.1.5'';
 
+  parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ];
+
   description = ''Portable Unicode Library'';
 
-  deps = [ args."cl-unicode_slash_base" ];
+  deps = [ args."cl-ppcre" args."flexi-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz'';
     sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n'';
   };
-    
+
   packageName = "cl-unicode";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unicode[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-unicode.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL
-    http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode TESTNAME NIL FILENAME
-    cl-unicode DEPS ((NAME cl-unicode/base FILENAME cl-unicode_slash_base)) DEPENDENCIES (cl-unicode/base) VERSION 0.1.5 SIBLINGS NIL) */
+/* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256
+    1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL
+    http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz
+    MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode FILENAME cl-unicode
+    DEPS
+    ((NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME flexi-streams FILENAME flexi-streams))
+    DEPENDENCIES (cl-ppcre flexi-streams) VERSION 0.1.5 SIBLINGS NIL PARASITES
+    (cl-unicode/base cl-unicode/build cl-unicode/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix
deleted file mode 100644
index 50a4227fc40..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode_slash_base.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cl-unicode_slash_base'';
-  version = ''cl-unicode-0.1.5'';
-
-  description = '''';
-
-  deps = [ args."cl-ppcre" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz'';
-    sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n'';
-  };
-    
-  packageName = "cl-unicode/base";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unicode/base[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cl-unicode/base DESCRIPTION NIL SHA256 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL
-    http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode/base TESTNAME NIL
-    FILENAME cl-unicode_slash_base DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION cl-unicode-0.1.5 SIBLINGS (cl-unicode)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 93d93b18010..39f3fccb7a7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -13,28 +13,17 @@ The system contains the definitions for the 'unification' machinery.'';
     url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz'';
     sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz'';
   };
-    
+
   packageName = "cl-unification";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unification[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-unification.asd"];
+  overrides = x: x;
 }
 /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system.
 
 The system contains the definitions for the 'unification' machinery.
-    SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz
-    MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS
-    (cl-unification-lib cl-unification-test cl-ppcre-template)) */
+    SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL
+    http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz
+    MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-unification FILENAME
+    cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS
+    (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index da23cbc9499..750da99d5d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
     sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
   };
-    
+
   packageName = "cl-utilities";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-utilities[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-utilities.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256 1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL
-    http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities TESTNAME NIL
-    FILENAME cl-utilities DEPS NIL DEPENDENCIES NIL VERSION 1.2.4 SIBLINGS NIL) */
+/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256
+    1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL
+    http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz
+    MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities FILENAME
+    cl-utilities DEPS NIL DEPENDENCIES NIL VERSION 1.2.4 SIBLINGS NIL PARASITES
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index 081bad6047e..b0e89eb2303 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -5,31 +5,22 @@ rec {
 
   description = ''cl-paths: vectorial paths manipulation'';
 
-  deps = [ ];
+  deps = [ args."cl-aa" args."cl-paths" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
     sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
   };
-    
+
   packageName = "cl-vectors";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-vectors[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-vectors.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-vectors TESTNAME NIL
-    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
+/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256
+    0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz
+    MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-vectors FILENAME cl-vectors
+    DEPS ((NAME cl-aa FILENAME cl-aa) (NAME cl-paths FILENAME cl-paths))
+    DEPENDENCIES (cl-aa cl-paths) VERSION 20170630-git SIBLINGS
+    (cl-aa-misc cl-aa cl-paths-ttf cl-paths) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index e5888844c82..32304139c51 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -3,33 +3,25 @@ rec {
   baseName = ''cl-who'';
   version = ''1.1.4'';
 
+  parasites = [ "cl-who-test" ];
+
   description = ''(X)HTML generation macros'';
 
-  deps = [ ];
+  deps = [ args."flexi-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz'';
     sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq'';
   };
-    
+
   packageName = "cl-who";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-who[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cl-who.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256 0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq URL
-    http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz MD5 a9e6f0b6a8aaa247dbf751de2cb550bf NAME cl-who TESTNAME NIL FILENAME cl-who DEPS NIL
-    DEPENDENCIES NIL VERSION 1.1.4 SIBLINGS NIL) */
+/* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256
+    0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq URL
+    http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz MD5
+    a9e6f0b6a8aaa247dbf751de2cb550bf NAME cl-who FILENAME cl-who DEPS
+    ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
+    VERSION 1.1.4 SIBLINGS NIL PARASITES (cl-who-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index 94b763417d6..7ced3fd41b1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -11,29 +11,23 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
     sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
   };
-    
+
   packageName = "clack-socket";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack-socket[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["clack-socket.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM clack-socket DESCRIPTION NIL SHA256 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
-    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-socket TESTNAME NIL FILENAME
+/* (SYSTEM clack-socket DESCRIPTION NIL SHA256
+    1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
+    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz
+    MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-socket FILENAME
     clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20170630-git SIBLINGS
-    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
-     t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
-     clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
-     t-clack-middleware-auth-basic t-clack-middleware-csrf)) */
+    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
+     clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
+     t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
+     t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
+     clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth
+     clack-middleware-postmodern clack-middleware-rucksack
+     clack-session-store-dbi t-clack-middleware-auth-basic
+     t-clack-middleware-csrf)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
new file mode 100644
index 00000000000..35fa6046ae5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -0,0 +1,41 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clack-test'';
+  version = ''clack-20170630-git'';
+
+  description = ''Testing Clack Applications.'';
+
+  deps = [ args."bordeaux-threads" args."clack" args."dexador" args."flexi-streams" args."http-body" args."lack" args."prove" args."usocket" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
+    sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
+  };
+
+  packageName = "clack-test";
+
+  asdFilesToKeep = ["clack-test.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
+    1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
+    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz
+    MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-test FILENAME clack-test
+    DEPS
+    ((NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME clack FILENAME clack) (NAME dexador FILENAME dexador)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME http-body FILENAME http-body) (NAME lack FILENAME lack)
+     (NAME prove FILENAME prove) (NAME usocket FILENAME usocket))
+    DEPENDENCIES
+    (bordeaux-threads clack dexador flexi-streams http-body lack prove usocket)
+    VERSION clack-20170630-git SIBLINGS
+    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
+     clack-handler-wookie clack-socket clack-v1-compat clack
+     t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
+     t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic
+     clack-middleware-clsql clack-middleware-csrf clack-middleware-dbi
+     clack-middleware-oauth clack-middleware-postmodern
+     clack-middleware-rucksack clack-session-store-dbi
+     t-clack-middleware-auth-basic t-clack-middleware-csrf)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 98b706498dd..bf6b3dbfa65 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -5,45 +5,52 @@ rec {
 
   description = '''';
 
-  deps = [ args."uiop" args."trivial-types" args."trivial-mimes" args."trivial-backtrace" args."split-sequence" args."quri" args."marshal" args."local-time" args."lack-util" args."lack" args."ironclad" args."http-body" args."flexi-streams" args."cl-syntax-annot" args."cl-ppcre" args."cl-base64" args."circular-streams" args."alexandria" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."circular-streams" args."cl-base64" args."cl-ppcre" args."cl-syntax-annot" args."clack" args."clack-test" args."dexador" args."flexi-streams" args."http-body" args."ironclad" args."lack" args."lack-util" args."local-time" args."marshal" args."prove" args."quri" args."split-sequence" args."trivial-backtrace" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
     sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
   };
-    
+
   packageName = "clack-v1-compat";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack-v1-compat[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["clack-v1-compat.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
-    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-v1-compat TESTNAME NIL FILENAME
+/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
+    1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
+    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz
+    MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-v1-compat FILENAME
     clack-v1-compat DEPS
-    ((NAME uiop FILENAME uiop) (NAME trivial-types FILENAME trivial-types) (NAME trivial-mimes FILENAME trivial-mimes)
-     (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME split-sequence FILENAME split-sequence) (NAME quri FILENAME quri)
-     (NAME marshal FILENAME marshal) (NAME local-time FILENAME local-time) (NAME lack-util FILENAME lack-util) (NAME lack FILENAME lack)
-     (NAME ironclad FILENAME ironclad) (NAME http-body FILENAME http-body) (NAME flexi-streams FILENAME flexi-streams)
-     (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-base64 FILENAME cl-base64)
-     (NAME circular-streams FILENAME circular-streams) (NAME alexandria FILENAME alexandria))
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME circular-streams FILENAME circular-streams)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME clack FILENAME clack) (NAME clack-test FILENAME clack-test)
+     (NAME dexador FILENAME dexador)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+     (NAME lack FILENAME lack) (NAME lack-util FILENAME lack-util)
+     (NAME local-time FILENAME local-time) (NAME marshal FILENAME marshal)
+     (NAME prove FILENAME prove) (NAME quri FILENAME quri)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-mimes FILENAME trivial-mimes)
+     (NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop)
+     (NAME usocket FILENAME usocket))
     DEPENDENCIES
-    (uiop trivial-types trivial-mimes trivial-backtrace split-sequence quri marshal local-time lack-util lack ironclad http-body flexi-streams cl-syntax-annot
-     cl-ppcre cl-base64 circular-streams alexandria)
+    (alexandria bordeaux-threads circular-streams cl-base64 cl-ppcre
+     cl-syntax-annot clack clack-test dexador flexi-streams http-body ironclad
+     lack lack-util local-time marshal prove quri split-sequence
+     trivial-backtrace trivial-mimes trivial-types uiop usocket)
     VERSION clack-20170630-git SIBLINGS
-    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
-     t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
-     clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
-     t-clack-middleware-auth-basic t-clack-middleware-csrf)) */
+    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
+     clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
+     t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
+     t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
+     clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth
+     clack-middleware-postmodern clack-middleware-rucksack
+     clack-session-store-dbi t-clack-middleware-auth-basic
+     t-clack-middleware-csrf)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index bfd86a7b0de..26ded8945cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -5,37 +5,36 @@ rec {
 
   description = ''Web application environment for Common Lisp'';
 
-  deps = [ args."uiop" args."lack-util" args."lack-middleware-backtrace" args."lack" args."bordeaux-threads" args."alexandria" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."lack" args."lack-middleware-backtrace" args."lack-util" args."uiop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
     sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
   };
-    
+
   packageName = "clack";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["clack.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
-    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack TESTNAME NIL FILENAME clack DEPS
-    ((NAME uiop FILENAME uiop) (NAME lack-util FILENAME lack-util) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
-     (NAME lack FILENAME lack) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (uiop lack-util lack-middleware-backtrace lack bordeaux-threads alexandria) VERSION 20170630-git SIBLINGS
-    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi
-     t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
-     clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
-     t-clack-middleware-auth-basic t-clack-middleware-csrf)) */
+/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256
+    1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
+    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz
+    MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack FILENAME clack DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME lack FILENAME lack)
+     (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
+     (NAME lack-util FILENAME lack-util) (NAME uiop FILENAME uiop))
+    DEPENDENCIES
+    (alexandria bordeaux-threads lack lack-middleware-backtrace lack-util uiop)
+    VERSION 20170630-git SIBLINGS
+    (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
+     clack-handler-wookie clack-socket clack-test clack-v1-compat
+     t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
+     t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic
+     clack-middleware-clsql clack-middleware-csrf clack-middleware-dbi
+     clack-middleware-oauth clack-middleware-postmodern
+     clack-middleware-rucksack clack-session-store-dbi
+     t-clack-middleware-auth-basic t-clack-middleware-csrf)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index 4c1d85ec3be..3c15d7cf753 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -11,26 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz'';
     sha256 = ''0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc'';
   };
-    
+
   packageName = "closer-mop";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closer-mop[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["closer-mop.asd"];
+  overrides = x: x;
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc URL http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz MD5
-    308f9e8e4ea4573c7b6820055b6f171d NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS NIL) */
+    SHA256 0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc URL
+    http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz
+    MD5 308f9e8e4ea4573c7b6820055b6f171d NAME closer-mop FILENAME closer-mop
+    DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index 8dca87dc182..fb808164aa2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -5,32 +5,25 @@ rec {
 
   description = '''';
 
-  deps = [ args."babel" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz'';
     sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4'';
   };
-    
+
   packageName = "closure-common";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closure-common[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["closure-common.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM closure-common DESCRIPTION NIL SHA256 1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL
-    http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common
-    TESTNAME NIL FILENAME closure-common DEPS ((NAME babel FILENAME babel) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
-    (babel trivial-gray-streams) VERSION 20101107-git SIBLINGS NIL) */
+/* (SYSTEM closure-common DESCRIPTION NIL SHA256
+    1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL
+    http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz
+    MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common FILENAME
+    closure-common DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams)
+    VERSION 20101107-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index 76eae519de9..74b8442c0c9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -11,27 +11,19 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz'';
     sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn'';
   };
-    
+
   packageName = "clsql";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clsql[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["clsql.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL
-    http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql TESTNAME NIL FILENAME clsql DEPS
-    ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS
-    (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests
-     clsql-uffi)) */
+/* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256
+    0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL
+    http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz
+    MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql FILENAME clsql DEPS
+    ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git
+    SIBLINGS
+    (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket
+     clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3
+     clsql-tests clsql-uffi)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 31ff76c0f09..11e723e0029 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz'';
     sha256 = ''0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0'';
   };
-    
+
   packageName = "clss";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clss[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["clss.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0 URL
-    http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz MD5 61bbadf22391940813bfc66dfd59d304 NAME clss TESTNAME NIL FILENAME clss DEPS
-    ((NAME array-utils FILENAME array-utils) (NAME plump FILENAME plump)) DEPENDENCIES (array-utils plump) VERSION 20170630-git SIBLINGS NIL) */
+/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors.
+    SHA256 0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0 URL
+    http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz MD5
+    61bbadf22391940813bfc66dfd59d304 NAME clss FILENAME clss DEPS
+    ((NAME array-utils FILENAME array-utils) (NAME plump FILENAME plump))
+    DEPENDENCIES (array-utils plump) VERSION 20170630-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index dfd8669b59f..6cc6c24c3b9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -3,36 +3,36 @@ rec {
   baseName = ''clx-truetype'';
   version = ''20160825-git'';
 
+  parasites = [ "clx-truetype-test" ];
+
   description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.'';
 
-  deps = [ args."cl-aa" args."cl-fad" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."cl-aa" args."cl-fad" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
     sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
   };
-    
+
   packageName = "clx-truetype";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx-truetype[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["clx-truetype.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM clx-truetype DESCRIPTION clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension. SHA256
-    0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67 URL http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz MD5
-    7c9dedb21d52dedf727de741ac6d9c60 NAME clx-truetype TESTNAME NIL FILENAME clx-truetype DEPS
-    ((NAME cl-aa FILENAME cl-aa) (NAME cl-fad FILENAME cl-fad) (NAME cl-paths-ttf FILENAME cl-paths-ttf) (NAME cl-store FILENAME cl-store)
-     (NAME cl-vectors FILENAME cl-vectors) (NAME clx FILENAME clx) (NAME trivial-features FILENAME trivial-features) (NAME zpb-ttf FILENAME zpb-ttf))
-    DEPENDENCIES (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */
+/* (SYSTEM clx-truetype DESCRIPTION
+    clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.
+    SHA256 0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67 URL
+    http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz
+    MD5 7c9dedb21d52dedf727de741ac6d9c60 NAME clx-truetype FILENAME
+    clx-truetype DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-aa FILENAME cl-aa) (NAME cl-fad FILENAME cl-fad)
+     (NAME cl-paths-ttf FILENAME cl-paths-ttf)
+     (NAME cl-store FILENAME cl-store) (NAME cl-vectors FILENAME cl-vectors)
+     (NAME clx FILENAME clx) (NAME trivial-features FILENAME trivial-features)
+     (NAME zpb-ttf FILENAME zpb-ttf))
+    DEPENDENCIES
+    (alexandria bordeaux-threads cl-aa cl-fad cl-paths-ttf cl-store cl-vectors
+     clx trivial-features zpb-ttf)
+    VERSION 20160825-git SIBLINGS NIL PARASITES (clx-truetype-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index b85ccdd48f5..2d802d3e488 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz'';
     sha256 = ''0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7'';
   };
-    
+
   packageName = "clx";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["clx.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7 URL
-    http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz MD5 ccfec3f35979df3bead0b73adc1d798a NAME clx TESTNAME NIL FILENAME clx DEPS NIL
-    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */
+/* (SYSTEM clx DESCRIPTION
+    An implementation of the X Window System protocol in Lisp. SHA256
+    0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7 URL
+    http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz MD5
+    ccfec3f35979df3bead0b73adc1d798a NAME clx FILENAME clx DEPS NIL
+    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 276b13e1bd0..e1fb5965852 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz'';
     sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh'';
   };
-    
+
   packageName = "command-line-arguments";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/command-line-arguments[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["command-line-arguments.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM command-line-arguments DESCRIPTION small library to deal with command-line arguments SHA256 07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh URL
-    http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz MD5 8cdb99db40143e34cf6b0b25ca95f826 NAME
-    command-line-arguments TESTNAME NIL FILENAME command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL) */
+/* (SYSTEM command-line-arguments DESCRIPTION
+    small library to deal with command-line arguments SHA256
+    07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh URL
+    http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz
+    MD5 8cdb99db40143e34cf6b0b25ca95f826 NAME command-line-arguments FILENAME
+    command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20151218-git
+    SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 695164566ba..f4941aa80cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz'';
     sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg'';
   };
-    
+
   packageName = "css-lite";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/css-lite[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["css-lite.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM css-lite DESCRIPTION NIL SHA256 1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL
-    http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite TESTNAME NIL FILENAME
-    css-lite DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL) */
+/* (SYSTEM css-lite DESCRIPTION NIL SHA256
+    1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL
+    http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz
+    MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite FILENAME css-lite DEPS
+    NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
deleted file mode 100644
index 924b61cae6e..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cxml-dom'';
-  version = ''cxml-20110619-git'';
-
-  testSystems = ["cxml"];
-
-  description = '''';
-
-  deps = [ args."cxml-xml" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
-    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
-  };
-    
-  packageName = "cxml-dom";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-dom[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cxml-dom DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
-    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-dom TESTNAME cxml FILENAME cxml-dom
-    DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
deleted file mode 100644
index f8418ccf27f..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cxml-klacks'';
-  version = ''cxml-20110619-git'';
-
-  testSystems = ["cxml"];
-
-  description = '''';
-
-  deps = [ args."cxml-xml" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
-    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
-  };
-    
-  packageName = "cxml-klacks";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-klacks[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cxml-klacks DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
-    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-klacks TESTNAME cxml FILENAME
-    cxml-klacks DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
new file mode 100644
index 00000000000..8fe30fa73a5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
@@ -0,0 +1,39 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cxml-stp'';
+  version = ''20120520-git'';
+
+  parasites = [ "cxml-stp-test" ];
+
+  description = '''';
+
+  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cxml-stp/2012-05-20/cxml-stp-20120520-git.tgz'';
+    sha256 = ''1pmh7wvkncbwwp30d445mhj21j210swq03f6hm44x1231s8r8azv'';
+  };
+
+  packageName = "cxml-stp";
+
+  asdFilesToKeep = ["cxml-stp.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cxml-stp DESCRIPTION NIL SHA256
+    1pmh7wvkncbwwp30d445mhj21j210swq03f6hm44x1231s8r8azv URL
+    http://beta.quicklisp.org/archive/cxml-stp/2012-05-20/cxml-stp-20120520-git.tgz
+    MD5 7bc57586a91cd4d4864b8cbad3689d85 NAME cxml-stp FILENAME cxml-stp DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
+     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
+     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
+     (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri)
+     (NAME rt FILENAME rt) (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc))
+    DEPENDENCIES
+    (alexandria babel cl-ppcre closure-common cxml cxml-dom cxml-klacks
+     cxml-test cxml-xml parse-number puri rt trivial-features
+     trivial-gray-streams xpath yacc)
+    VERSION 20120520-git SIBLINGS NIL PARASITES (cxml-stp-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
deleted file mode 100644
index e8856352dcd..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cxml-test'';
-  version = ''cxml-20110619-git'';
-
-  testSystems = ["cxml"];
-
-  description = '''';
-
-  deps = [ args."cxml-xml" args."cxml-klacks" args."cxml-dom" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
-    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
-  };
-    
-  packageName = "cxml-test";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-test[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cxml-test DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
-    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-test TESTNAME cxml FILENAME
-    cxml-test DEPS ((NAME cxml-xml FILENAME cxml-xml) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-dom FILENAME cxml-dom)) DEPENDENCIES
-    (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
deleted file mode 100644
index 5d8ef158772..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''cxml-xml'';
-  version = ''cxml-20110619-git'';
-
-  testSystems = ["cxml"];
-
-  description = '''';
-
-  deps = [ args."trivial-gray-streams" args."puri" args."closure-common" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
-    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
-  };
-    
-  packageName = "cxml-xml";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-xml[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM cxml-xml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
-    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-xml TESTNAME cxml FILENAME cxml-xml
-    DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME puri FILENAME puri) (NAME closure-common FILENAME closure-common)) DEPENDENCIES
-    (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index baab538ca38..56b2645c7ee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -3,34 +3,32 @@ rec {
   baseName = ''cxml'';
   version = ''20110619-git'';
 
+  parasites = [ "cxml-dom" "cxml-klacks" "cxml-test" "cxml-xml" ];
+
   description = '''';
 
-  deps = [ args."cxml-dom" args."cxml-klacks" args."cxml-test" ];
+  deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
-    
+
   packageName = "cxml";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["cxml.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM cxml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
-    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml TESTNAME NIL FILENAME cxml DEPS
-    ((NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-test FILENAME cxml-test)) DEPENDENCIES
-    (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */
+/* (SYSTEM cxml DESCRIPTION NIL SHA256
+    04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
+    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5
+    587755dff60416d4f716f4e785cf747e NAME cxml FILENAME cxml DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME closure-common FILENAME closure-common) (NAME puri FILENAME puri)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES
+    (alexandria babel closure-common puri trivial-features
+     trivial-gray-streams)
+    VERSION 20110619-git SIBLINGS NIL PARASITES
+    (cxml-dom cxml-klacks cxml-test cxml-xml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
index 06ffeb9ad69..ae8ed6de877 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz'';
     sha256 = ''0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi'';
   };
-    
+
   packageName = "db3";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/db3[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["db3.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM db3 DESCRIPTION DB3 file reader SHA256 0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi URL
-    http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz MD5 578896a3f60f474742f240b703f8c5f5 NAME db3 TESTNAME NIL FILENAME db3 DEPS
-    NIL DEPENDENCIES NIL VERSION cl-20150302-git SIBLINGS NIL) */
+/* (SYSTEM db3 DESCRIPTION DB3 file reader SHA256
+    0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi URL
+    http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz
+    MD5 578896a3f60f474742f240b703f8c5f5 NAME db3 FILENAME db3 DEPS NIL
+    DEPENDENCIES NIL VERSION cl-20150302-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 7251da67498..80a936560d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -5,32 +5,35 @@ rec {
 
   description = ''Database driver for MySQL.'';
 
-  deps = [ args."cl-syntax-annot" args."cl-syntax" args."cl-mysql" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
     sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
   };
-    
+
   packageName = "dbd-mysql";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-mysql[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["dbd-mysql.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-mysql TESTNAME NIL FILENAME
-    dbd-mysql DEPS ((NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-mysql FILENAME cl-mysql)) DEPENDENCIES
-    (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170725-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
+/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
+    1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz
+    MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-mysql FILENAME dbd-mysql DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
+     (NAME cl-mysql FILENAME cl-mysql) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-types FILENAME trivial-types))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
+     cl-syntax-annot closer-mop dbi named-readtables split-sequence
+     trivial-features trivial-types)
+    VERSION cl-dbi-20170725-git SIBLINGS
+    (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 2d71945081c..1f7a784a5e6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -5,34 +5,36 @@ rec {
 
   description = ''Database driver for PostgreSQL.'';
 
-  deps = [ args."trivial-garbage" args."cl-syntax-annot" args."cl-syntax" args."cl-postgres" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
     sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
   };
-    
+
   packageName = "dbd-postgres";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-postgres[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["dbd-postgres.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-postgres TESTNAME NIL FILENAME
+/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
+    1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz
+    MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-postgres FILENAME
     dbd-postgres DEPS
-    ((NAME trivial-garbage FILENAME trivial-garbage) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
-     (NAME cl-postgres FILENAME cl-postgres))
-    DEPENDENCIES (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170725-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-annot FILENAME cl-annot) (NAME cl-postgres FILENAME cl-postgres)
+     (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi)
+     (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME trivial-types FILENAME trivial-types))
+    DEPENDENCIES
+    (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot
+     closer-mop dbi md5 named-readtables split-sequence trivial-garbage
+     trivial-types)
+    VERSION cl-dbi-20170725-git SIBLINGS
+    (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 42f5d82966e..1300aa47634 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -5,33 +5,38 @@ rec {
 
   description = ''Database driver for SQLite3.'';
 
-  deps = [ args."uiop" args."sqlite" args."cl-syntax-annot" args."cl-syntax" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
     sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
   };
-    
+
   packageName = "dbd-sqlite3";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-sqlite3[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["dbd-sqlite3.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-sqlite3 TESTNAME NIL FILENAME
-    dbd-sqlite3 DEPS
-    ((NAME uiop FILENAME uiop) (NAME sqlite FILENAME sqlite) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)) DEPENDENCIES
-    (uiop sqlite cl-syntax-annot cl-syntax) VERSION cl-dbi-20170725-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
+/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
+    1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz
+    MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-sqlite3 FILENAME dbd-sqlite3
+    DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
+     (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi)
+     (NAME iterate FILENAME iterate)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME sqlite FILENAME sqlite)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot
+     closer-mop dbi iterate named-readtables split-sequence sqlite
+     trivial-features trivial-types uiop)
+    VERSION cl-dbi-20170725-git SIBLINGS
+    (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
new file mode 100644
index 00000000000..6e7611fd974
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dbi'';
+  version = ''cl-20170725-git'';
+
+  description = ''Database independent interface for Common Lisp'';
+
+  deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
+    sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
+  };
+
+  packageName = "dbi";
+
+  asdFilesToKeep = ["dbi.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
+    SHA256 1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
+    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz
+    MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbi FILENAME dbi DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-types FILENAME trivial-types))
+    DEPENDENCIES
+    (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
+     named-readtables split-sequence trivial-types)
+    VERSION cl-20170725-git SIBLINGS
+    (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 1eaeddd3118..047cd3c0ffa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -5,40 +5,46 @@ rec {
 
   description = ''Yet another HTTP client for Common Lisp'';
 
-  deps = [ args."usocket" args."trivial-mimes" args."trivial-gray-streams" args."quri" args."fast-io" args."fast-http" args."cl-reexport" args."cl-ppcre" args."cl-cookie" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" args."bordeaux-threads" args."babel" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz'';
     sha256 = ''1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl'';
   };
-    
+
   packageName = "dexador";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dexador[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["dexador.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl URL
-    http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz MD5 1ab5cda1ba8d5c81859349e6a5b99b29 NAME dexador TESTNAME NIL FILENAME
-    dexador DEPS
-    ((NAME usocket FILENAME usocket) (NAME trivial-mimes FILENAME trivial-mimes) (NAME trivial-gray-streams FILENAME trivial-gray-streams)
-     (NAME quri FILENAME quri) (NAME fast-io FILENAME fast-io) (NAME fast-http FILENAME fast-http) (NAME cl-reexport FILENAME cl-reexport)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-cookie FILENAME cl-cookie) (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl)
-     (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME babel FILENAME babel)
-     (NAME alexandria FILENAME alexandria))
+/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
+    1x5jw07ydvc7rdw4jyzf3zb2dg2mspbkp9ysjaqpxlvkpdmqdmyl URL
+    http://beta.quicklisp.org/archive/dexador/2017-07-25/dexador-20170725-git.tgz
+    MD5 1ab5cda1ba8d5c81859349e6a5b99b29 NAME dexador FILENAME dexador DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz)
+     (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-reexport FILENAME cl-reexport)
+     (NAME cl-utilities FILENAME cl-utilities)
+     (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME local-time FILENAME local-time)
+     (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri)
+     (NAME smart-buffer FILENAME smart-buffer)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME trivial-mimes FILENAME trivial-mimes)
+     (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (usocket trivial-mimes trivial-gray-streams quri fast-io fast-http cl-reexport cl-ppcre cl-cookie cl-base64 cl+ssl chunga chipz bordeaux-threads babel
-     alexandria)
-    VERSION 20170725-git SIBLINGS (dexador-test)) */
+    (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64
+     cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities fast-http fast-io
+     flexi-streams local-time proc-parse quri smart-buffer split-sequence
+     static-vectors trivial-features trivial-garbage trivial-gray-streams
+     trivial-mimes usocket xsubseq)
+    VERSION 20170725-git SIBLINGS (dexador-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 993a49bc9f9..08521a07d74 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -5,32 +5,27 @@ rec {
 
   description = ''Percent Encoding (aka URL Encoding) library'';
 
-  deps = [ args."babel" args."babel-streams" ];
+  deps = [ args."alexandria" args."babel" args."babel-streams" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz'';
     sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa'';
   };
-    
+
   packageName = "do-urlencode";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/do-urlencode[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["do-urlencode.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL
-    http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode TESTNAME NIL
-    FILENAME do-urlencode DEPS ((NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION
-    20130720-git SIBLINGS NIL) */
+/* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library
+    SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL
+    http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz
+    MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode FILENAME
+    do-urlencode DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME babel-streams FILENAME babel-streams)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES
+    (alexandria babel babel-streams trivial-features trivial-gray-streams)
+    VERSION 20130720-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 06710c9a4d1..52c95b260e6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -11,27 +11,17 @@ rec {
     url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz'';
     sha256 = ''0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks'';
   };
-    
+
   packageName = "documentation-utils";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/documentation-utils[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["documentation-utils.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256
+/* (SYSTEM documentation-utils DESCRIPTION
+    A few simple tools to help you with documenting your library. SHA256
     0iz3r5llv0rv8l37fdcjrx9zibbaqf9nd6xhy5n2hf024997bbks URL
-    http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz MD5 7c0541d4207ba221a251c8c3ec7a8cac NAME
-    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (trivial-indent) VERSION
-    20170630-git SIBLINGS NIL) */
+    http://beta.quicklisp.org/archive/documentation-utils/2017-06-30/documentation-utils-20170630-git.tgz
+    MD5 7c0541d4207ba221a251c8c3ec7a8cac NAME documentation-utils FILENAME
+    documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent))
+    DEPENDENCIES (trivial-indent) VERSION 20170630-git SIBLINGS NIL PARASITES
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index 33d83765ed6..aac0560e677 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -5,33 +5,27 @@ rec {
 
   description = ''Full-featured http/https client based on usocket'';
 
-  deps = [ args."usocket" args."puri" args."flexi-streams" args."cl-ppcre" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" ];
+  deps = [ args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."usocket" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz'';
     sha256 = ''1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd'';
   };
-    
+
   packageName = "drakma";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/drakma[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["drakma.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd URL
-    http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz MD5 3578c67b445cf982414ff78b2fb8d295 NAME drakma TESTNAME NIL FILENAME drakma DEPS
-    ((NAME usocket FILENAME usocket) (NAME puri FILENAME puri) (NAME flexi-streams FILENAME flexi-streams) (NAME cl-ppcre FILENAME cl-ppcre)
-     (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl) (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz))
-    DEPENDENCIES (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION v2.0.3 SIBLINGS (drakma-test)) */
+/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket
+    SHA256 1xbbwd2gg17pq03bblj6imh7lq39z2w3yix6fm25509gyhs76ymd URL
+    http://beta.quicklisp.org/archive/drakma/2017-06-30/drakma-v2.0.3.tgz MD5
+    3578c67b445cf982414ff78b2fb8d295 NAME drakma FILENAME drakma DEPS
+    ((NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga)
+     (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME flexi-streams FILENAME flexi-streams) (NAME puri FILENAME puri)
+     (NAME usocket FILENAME usocket))
+    DEPENDENCIES
+    (chipz chunga cl+ssl cl-base64 cl-ppcre flexi-streams puri usocket) VERSION
+    v2.0.3 SIBLINGS (drakma-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
index 283dfe813ac..a4a58fd0d0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
@@ -11,26 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz'';
     sha256 = ''0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa'';
   };
-    
+
   packageName = "dynamic-classes";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dynamic-classes[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["dynamic-classes.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM dynamic-classes DESCRIPTION NIL SHA256 0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa URL
-    http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz MD5 a6ed01c4f21df2b6a142328b24ac7ba3 NAME dynamic-classes
-    TESTNAME NIL FILENAME dynamic-classes DEPS ((NAME metatilities-base FILENAME metatilities-base)) DEPENDENCIES (metatilities-base) VERSION 20130128-git
-    SIBLINGS (dynamic-classes-test)) */
+/* (SYSTEM dynamic-classes DESCRIPTION NIL SHA256
+    0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa URL
+    http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz
+    MD5 a6ed01c4f21df2b6a142328b24ac7ba3 NAME dynamic-classes FILENAME
+    dynamic-classes DEPS ((NAME metatilities-base FILENAME metatilities-base))
+    DEPENDENCIES (metatilities-base) VERSION 20130128-git SIBLINGS
+    (dynamic-classes-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
new file mode 100644
index 00000000000..1568533d92a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''eos'';
+  version = ''20150608-git'';
+
+  parasites = [ "eos-tests" ];
+
+  description = ''UNMAINTAINED fork of 5AM, a test framework'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/eos/2015-06-08/eos-20150608-git.tgz'';
+    sha256 = ''0fhcvg59p13h1d5h8fnssa8hn3lh19lzysazvrbxyfizfibyydr8'';
+  };
+
+  packageName = "eos";
+
+  asdFilesToKeep = ["eos.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM eos DESCRIPTION UNMAINTAINED fork of 5AM, a test framework SHA256
+    0fhcvg59p13h1d5h8fnssa8hn3lh19lzysazvrbxyfizfibyydr8 URL
+    http://beta.quicklisp.org/archive/eos/2015-06-08/eos-20150608-git.tgz MD5
+    94f6a72534171ff6adcc823c31e3d53f NAME eos FILENAME eos DEPS NIL
+    DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL PARASITES (eos-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
new file mode 100644
index 00000000000..d68fd839bd1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''esrap-peg'';
+  version = ''20170403-git'';
+
+  description = ''A wrapper around Esrap to allow generating Esrap grammars from PEG definitions'';
+
+  deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/esrap-peg/2017-04-03/esrap-peg-20170403-git.tgz'';
+    sha256 = ''123pl1p87f8llpzs19abn5idivl4b5mxrc9rflqirbsz3gyc8wl9'';
+  };
+
+  packageName = "esrap-peg";
+
+  asdFilesToKeep = ["esrap-peg.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM esrap-peg DESCRIPTION
+    A wrapper around Esrap to allow generating Esrap grammars from PEG definitions
+    SHA256 123pl1p87f8llpzs19abn5idivl4b5mxrc9rflqirbsz3gyc8wl9 URL
+    http://beta.quicklisp.org/archive/esrap-peg/2017-04-03/esrap-peg-20170403-git.tgz
+    MD5 0d31f9c82d88ad11ee3d309128e7803c NAME esrap-peg FILENAME esrap-peg DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME cl-unification FILENAME cl-unification) (NAME esrap FILENAME esrap)
+     (NAME iterate FILENAME iterate))
+    DEPENDENCIES (alexandria cl-unification esrap iterate) VERSION 20170403-git
+    SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 1aeded93799..2ef373aed8a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -3,33 +3,27 @@ rec {
   baseName = ''esrap'';
   version = ''20170630-git'';
 
+  parasites = [ "esrap/tests" ];
+
   description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
 
-  deps = [ args."alexandria" ];
+  deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz'';
     sha256 = ''172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh'';
   };
-    
+
   packageName = "esrap";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/esrap[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["esrap.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh URL
-    http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz MD5 bfabfebc5f5d49106df318ae2798ac45 NAME esrap TESTNAME NIL FILENAME esrap DEPS
-    ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170630-git SIBLINGS NIL) */
+/* (SYSTEM esrap DESCRIPTION
+    A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256
+    172ph55kb3yr0gciybza1rbi6khlnz4vriijvcjkn6m79kdnk1xh URL
+    http://beta.quicklisp.org/archive/esrap/2017-06-30/esrap-20170630-git.tgz
+    MD5 bfabfebc5f5d49106df318ae2798ac45 NAME esrap FILENAME esrap DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
+    DEPENDENCIES (alexandria fiveam) VERSION 20170630-git SIBLINGS NIL
+    PARASITES (esrap/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index 698189fc911..cec236dc556 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -3,34 +3,28 @@ rec {
   baseName = ''external-program'';
   version = ''20160825-git'';
 
+  parasites = [ "external-program-test" ];
+
   description = '''';
 
-  deps = [ args."trivial-features" ];
+  deps = [ args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz'';
     sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13'';
   };
-    
+
   packageName = "external-program";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/external-program[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["external-program.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM external-program DESCRIPTION NIL SHA256 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL
-    http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program
-    TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git
-    SIBLINGS NIL) */
+/* (SYSTEM external-program DESCRIPTION NIL SHA256
+    0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL
+    http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz
+    MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program FILENAME
+    external-program DEPS
+    ((NAME fiveam FILENAME fiveam)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (fiveam trivial-features) VERSION 20160825-git SIBLINGS NIL
+    PARASITES (external-program-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 1d518e7b327..e890f4e81ff 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -5,34 +5,26 @@ rec {
 
   description = ''A fast HTTP protocol parser in Common Lisp'';
 
-  deps = [ args."xsubseq" args."smart-buffer" args."proc-parse" args."cl-utilities" args."babel" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."cl-utilities" args."proc-parse" args."smart-buffer" args."xsubseq" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz'';
     sha256 = ''0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29'';
   };
-    
+
   packageName = "fast-http";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-http[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["fast-http.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp SHA256 0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29 URL
-    http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz MD5 d117d59c1f71965e0c32b19e6790cf9a NAME fast-http TESTNAME NIL FILENAME
-    fast-http DEPS
-    ((NAME xsubseq FILENAME xsubseq) (NAME smart-buffer FILENAME smart-buffer) (NAME proc-parse FILENAME proc-parse) (NAME cl-utilities FILENAME cl-utilities)
-     (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (xsubseq smart-buffer proc-parse cl-utilities babel alexandria) VERSION 20170630-git SIBLINGS (fast-http-test)) */
+/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp
+    SHA256 0fkqwbwqc9a783ynjbszimcrannpqq4ja6wcf8ybgizr4zvsgj29 URL
+    http://beta.quicklisp.org/archive/fast-http/2017-06-30/fast-http-20170630-git.tgz
+    MD5 d117d59c1f71965e0c32b19e6790cf9a NAME fast-http FILENAME fast-http DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-utilities FILENAME cl-utilities)
+     (NAME proc-parse FILENAME proc-parse)
+     (NAME smart-buffer FILENAME smart-buffer) (NAME xsubseq FILENAME xsubseq))
+    DEPENDENCIES
+    (alexandria babel cl-utilities proc-parse smart-buffer xsubseq) VERSION
+    20170630-git SIBLINGS (fast-http-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 566b3d7bdc3..8b9d5e5408b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -5,33 +5,24 @@ rec {
 
   description = ''Alternative I/O mechanism to a stream or vector'';
 
-  deps = [ args."trivial-gray-streams" args."static-vectors" args."alexandria" ];
+  deps = [ args."alexandria" args."static-vectors" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz'';
     sha256 = ''0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg'';
   };
-    
+
   packageName = "fast-io";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-io[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["fast-io.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg URL
-    http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz MD5 34bfe5f306f2e0f6da128fe024ee242d NAME fast-io TESTNAME NIL FILENAME
-    fast-io DEPS
-    ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME static-vectors FILENAME static-vectors) (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (trivial-gray-streams static-vectors alexandria) VERSION 20170630-git SIBLINGS (fast-io-test)) */
+/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector
+    SHA256 0wg40jv6hn4ijks026d2aaz5pr3zfxxzaakyzzjka6981g9rgkrg URL
+    http://beta.quicklisp.org/archive/fast-io/2017-06-30/fast-io-20170630-git.tgz
+    MD5 34bfe5f306f2e0f6da128fe024ee242d NAME fast-io FILENAME fast-io DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES (alexandria static-vectors trivial-gray-streams) VERSION
+    20170630-git SIBLINGS (fast-io-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
index 7f04b5eb893..364d6226604 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''fiveam'';
   version = ''v1.3'';
 
+  parasites = [ "fiveam/test" ];
+
   description = ''A simple regression testing framework'';
 
   deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ];
@@ -11,27 +13,18 @@ rec {
     url = ''http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz'';
     sha256 = ''0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2'';
   };
-    
+
   packageName = "fiveam";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fiveam[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["fiveam.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM fiveam DESCRIPTION A simple regression testing framework SHA256 0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2 URL
-    http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz MD5 bd03a588915f834031eeae9139c51aa4 NAME fiveam TESTNAME NIL FILENAME fiveam DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME net.didierverna.asdf-flv FILENAME net_dot_didierverna_dot_asdf-flv)
+/* (SYSTEM fiveam DESCRIPTION A simple regression testing framework SHA256
+    0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2 URL
+    http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz MD5
+    bd03a588915f834031eeae9139c51aa4 NAME fiveam FILENAME fiveam DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME net.didierverna.asdf-flv FILENAME net_dot_didierverna_dot_asdf-flv)
      (NAME trivial-backtrace FILENAME trivial-backtrace))
-    DEPENDENCIES (alexandria net.didierverna.asdf-flv trivial-backtrace) VERSION v1.3 SIBLINGS NIL) */
+    DEPENDENCIES (alexandria net.didierverna.asdf-flv trivial-backtrace)
+    VERSION v1.3 SIBLINGS NIL PARASITES (fiveam/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 1bb2b6b9c18..69aeecd8aa2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''flexi-streams'';
   version = ''1.0.15'';
 
+  parasites = [ "flexi-streams-test" ];
+
   description = ''Flexible bivalent streams for Common Lisp'';
 
   deps = [ args."trivial-gray-streams" ];
@@ -11,25 +13,17 @@ rec {
     url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz'';
     sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p'';
   };
-    
+
   packageName = "flexi-streams";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/flexi-streams[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["flexi-streams.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL
-    http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams TESTNAME NIL
-    FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */
+/* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp
+    SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL
+    http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz
+    MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams FILENAME
+    flexi-streams DEPS
+    ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
+    (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL PARASITES
+    (flexi-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index f2d5c3a64ba..4847ee328d0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz'';
     sha256 = ''0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf'';
   };
-    
+
   packageName = "form-fiddle";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/form-fiddle[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["form-fiddle.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf URL
-    http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz MD5 9c8eb18dfedebcf43718cc259c910aa1 NAME form-fiddle TESTNAME NIL
-    FILENAME form-fiddle DEPS ((NAME documentation-utils FILENAME documentation-utils)) DEPENDENCIES (documentation-utils) VERSION 20170630-git SIBLINGS NIL) */
+/* (SYSTEM form-fiddle DESCRIPTION
+    A collection of utilities to destructure lambda forms. SHA256
+    0w4isi9y2h6vswq418hj50223aac89iadl71y86wxdlznm3kdvjf URL
+    http://beta.quicklisp.org/archive/form-fiddle/2017-06-30/form-fiddle-20170630-git.tgz
+    MD5 9c8eb18dfedebcf43718cc259c910aa1 NAME form-fiddle FILENAME form-fiddle
+    DEPS ((NAME documentation-utils FILENAME documentation-utils)) DEPENDENCIES
+    (documentation-utils) VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
index c3900b7cd26..7b0ea1ff2ad 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
@@ -13,28 +13,19 @@ See: http://www.ergy.com/FSet.html
     url = ''http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz'';
     sha256 = ''1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0'';
   };
-    
+
   packageName = "fset";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fset[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["fset.asd"];
+  overrides = x: x;
 }
 /* (SYSTEM fset DESCRIPTION A functional set-theoretic collections library.
 See: http://www.ergy.com/FSet.html
 
-    SHA256 1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0 URL http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz MD5
-    89f958cc900e712aed0750b336efbe15 NAME fset TESTNAME NIL FILENAME fset DEPS
-    ((NAME misc-extensions FILENAME misc-extensions) (NAME mt19937 FILENAME mt19937)) DEPENDENCIES (misc-extensions mt19937) VERSION 20150113-git SIBLINGS NIL) */
+    SHA256 1k9c48jahw8i4zhx6dc96n0jzxjy2ascr2wng9hmm8vjhhqs5sl0 URL
+    http://beta.quicklisp.org/archive/fset/2015-01-13/fset-20150113-git.tgz MD5
+    89f958cc900e712aed0750b336efbe15 NAME fset FILENAME fset DEPS
+    ((NAME misc-extensions FILENAME misc-extensions)
+     (NAME mt19937 FILENAME mt19937))
+    DEPENDENCIES (misc-extensions mt19937) VERSION 20150113-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
index 72403e8598a..11d5ac4491e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz'';
     sha256 = ''1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05'';
   };
-    
+
   packageName = "garbage-pools";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/garbage-pools[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["garbage-pools.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM garbage-pools DESCRIPTION NIL SHA256 1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05 URL
-    http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz MD5 f691e2ddf6ba22b3451c24b61d4ee8b6 NAME garbage-pools TESTNAME
-    NIL FILENAME garbage-pools DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS (garbage-pools-test)) */
+/* (SYSTEM garbage-pools DESCRIPTION NIL SHA256
+    1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05 URL
+    http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz
+    MD5 f691e2ddf6ba22b3451c24b61d4ee8b6 NAME garbage-pools FILENAME
+    garbage-pools DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS
+    (garbage-pools-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index e6510c59c30..04e53bd3fc1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -5,35 +5,35 @@ rec {
 
   description = ''HTTP POST data parser for Common Lisp'';
 
-  deps = [ args."trivial-gray-streams" args."quri" args."jonathan" args."flexi-streams" args."fast-http" args."cl-utilities" args."cl-ppcre" args."babel" ];
+  deps = [ args."alexandria" args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."trivial-gray-streams" args."xsubseq" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz'';
     sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi'';
   };
-    
+
   packageName = "http-body";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/http-body[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["http-body.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL
-    http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body TESTNAME NIL FILENAME
-    http-body DEPS
-    ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME quri FILENAME quri) (NAME jonathan FILENAME jonathan)
-     (NAME flexi-streams FILENAME flexi-streams) (NAME fast-http FILENAME fast-http) (NAME cl-utilities FILENAME cl-utilities)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME babel FILENAME babel))
-    DEPENDENCIES (trivial-gray-streams quri jonathan flexi-streams fast-http cl-utilities cl-ppcre babel) VERSION 20161204-git SIBLINGS (http-body-test)) */
+/* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256
+    1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL
+    http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz
+    MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body FILENAME http-body DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-annot FILENAME cl-annot) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-utilities FILENAME cl-utilities)
+     (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME jonathan FILENAME jonathan) (NAME proc-parse FILENAME proc-parse)
+     (NAME quri FILENAME quri) (NAME smart-buffer FILENAME smart-buffer)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME xsubseq FILENAME xsubseq))
+    DEPENDENCIES
+    (alexandria babel cl-annot cl-ppcre cl-syntax cl-utilities fast-http
+     fast-io flexi-streams jonathan proc-parse quri smart-buffer split-sequence
+     trivial-gray-streams xsubseq)
+    VERSION 20161204-git SIBLINGS (http-body-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index b0c127e97e6..a3d8f6133a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -11,26 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz'';
     sha256 = ''151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb'';
   };
-    
+
   packageName = "hu.dwim.asdf";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["hu.dwim.asdf.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
-    151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz MD5
-    b086cb36b6a88641497b20c39937c9d4 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION
-    20170630-darcs SIBLINGS (hu.dwim.asdf.documentation)) */
+/* (SYSTEM hu.dwim.asdf DESCRIPTION
+    Various ASDF extensions such as attached test and documentation system, explicit development support, etc.
+    SHA256 151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb URL
+    http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz
+    MD5 b086cb36b6a88641497b20c39937c9d4 NAME hu.dwim.asdf FILENAME
+    hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop)
+    VERSION 20170630-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
deleted file mode 100644
index 2dc7c45b39c..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''hu_dot_dwim_dot_def'';
-  version = ''20170630-darcs'';
-
-  description = ''General purpose, homogenous, extensible definer macro.'';
-
-  deps = [ args."metabang-bind" args."iterate" args."anaphora" args."alexandria" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-06-30/hu.dwim.def-20170630-darcs.tgz'';
-    sha256 = ''0flqwj4lxwsl8yknhzzpa1jqr2iza3gnz3vxk645j4z81ynx1cjf'';
-  };
-    
-  packageName = "hu.dwim.def";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 0flqwj4lxwsl8yknhzzpa1jqr2iza3gnz3vxk645j4z81ynx1cjf URL
-    http://beta.quicklisp.org/archive/hu.dwim.def/2017-06-30/hu.dwim.def-20170630-darcs.tgz MD5 def7e4172cbf5ec86a5d51f644d71f81 NAME hu.dwim.def TESTNAME NIL
-    FILENAME hu_dot_dwim_dot_def DEPS
-    ((NAME metabang-bind FILENAME metabang-bind) (NAME iterate FILENAME iterate) (NAME anaphora FILENAME anaphora) (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (metabang-bind iterate anaphora alexandria) VERSION 20170630-darcs SIBLINGS
-    (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
-     hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
new file mode 100644
index 00000000000..51f4a2d0698
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
@@ -0,0 +1,32 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu_dot_dwim_dot_stefil'';
+  version = ''20170403-darcs'';
+
+  parasites = [ "hu.dwim.stefil/test" ];
+
+  description = ''A Simple Test Framework In Lisp.'';
+
+  deps = [ args."alexandria" args."hu_dot_dwim_dot_asdf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.stefil/2017-04-03/hu.dwim.stefil-20170403-darcs.tgz'';
+    sha256 = ''1irrsb0xfc5bx49aqs4ak0xzpjbjhxi9igx5x392gb5pzsak2r9n'';
+  };
+
+  packageName = "hu.dwim.stefil";
+
+  asdFilesToKeep = ["hu.dwim.stefil.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM hu.dwim.stefil DESCRIPTION A Simple Test Framework In Lisp. SHA256
+    1irrsb0xfc5bx49aqs4ak0xzpjbjhxi9igx5x392gb5pzsak2r9n URL
+    http://beta.quicklisp.org/archive/hu.dwim.stefil/2017-04-03/hu.dwim.stefil-20170403-darcs.tgz
+    MD5 ea8be76a360b1df297a8bbd50be0d8a1 NAME hu.dwim.stefil FILENAME
+    hu_dot_dwim_dot_stefil DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf))
+    DEPENDENCIES (alexandria hu.dwim.asdf) VERSION 20170403-darcs SIBLINGS
+    (hu.dwim.stefil+hu.dwim.def+swank hu.dwim.stefil+hu.dwim.def
+     hu.dwim.stefil+swank)
+    PARASITES (hu.dwim.stefil/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index 320dcfb7a03..5ce8459d9e2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -3,43 +3,51 @@ rec {
   baseName = ''hunchentoot'';
   version = ''v1.2.37'';
 
+  parasites = [ "hunchentoot-dev" "hunchentoot-test" ];
+
   description = ''Hunchentoot is a HTTP server based on USOCKET and
   BORDEAUX-THREADS.  It supports HTTP 1.1, serves static files, has a
   simple framework for user-defined handlers and can be extended
   through subclassing.'';
 
-  deps = [ args."bordeaux-threads" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."flexi-streams" args."md5" args."rfc2388" args."trivial-backtrace" args."usocket" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz'';
     sha256 = ''1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc'';
   };
-    
+
   packageName = "hunchentoot";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hunchentoot[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["hunchentoot.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM hunchentoot DESCRIPTION Hunchentoot is a HTTP server based on USOCKET and
+/* (SYSTEM hunchentoot DESCRIPTION
+    Hunchentoot is a HTTP server based on USOCKET and
   BORDEAUX-THREADS.  It supports HTTP 1.1, serves static files, has a
   simple framework for user-defined handlers and can be extended
   through subclassing.
-    SHA256 1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc URL http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz MD5
-    3fd6a6c4dd0d32db7b71828b52494325 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS
-    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64)
-     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME md5 FILENAME md5)
-     (NAME rfc2388 FILENAME rfc2388) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME usocket FILENAME usocket))
-    DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION v1.2.37 SIBLINGS NIL) */
+    SHA256 1r0p8qasd2zy9a8l58jysz5bb1gj79cz2ikr93in0my8q44pg9lc URL
+    http://beta.quicklisp.org/archive/hunchentoot/2017-07-25/hunchentoot-v1.2.37.tgz
+    MD5 3fd6a6c4dd0d32db7b71828b52494325 NAME hunchentoot FILENAME hunchentoot
+    DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga)
+     (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-who FILENAME cl-who) (NAME cxml-stp FILENAME cxml-stp)
+     (NAME drakma FILENAME drakma) (NAME flexi-streams FILENAME flexi-streams)
+     (NAME md5 FILENAME md5) (NAME rfc2388 FILENAME rfc2388)
+     (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
+     (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME usocket FILENAME usocket) (NAME xpath FILENAME xpath))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad
+     cl-ppcre cl-who cxml-stp drakma flexi-streams md5 rfc2388 split-sequence
+     swank trivial-backtrace trivial-features trivial-garbage
+     trivial-gray-streams usocket xpath)
+    VERSION v1.2.37 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index d849cf15272..1b948bcf325 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
     sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
   };
-    
+
   packageName = "idna";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/idna[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["idna.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM idna DESCRIPTION IDNA (international domain names) string encoding and decoding routines SHA256 0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c
-    URL http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz MD5 85b91a66efe4381bf116cdb5d2b756b6 NAME idna TESTNAME NIL FILENAME idna DEPS
-    ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */
+/* (SYSTEM idna DESCRIPTION
+    IDNA (international domain names) string encoding and decoding routines
+    SHA256 0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c URL
+    http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz MD5
+    85b91a66efe4381bf116cdb5d2b756b6 NAME idna FILENAME idna DEPS
+    ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES
+    (split-sequence) VERSION 20120107-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
index fb106aa54c5..3bb44ea2fc6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
@@ -3,33 +3,25 @@ rec {
   baseName = ''ieee-floats'';
   version = ''20160318-git'';
 
+  parasites = [ "ieee-floats-tests" ];
+
   description = '''';
 
-  deps = [ ];
+  deps = [ args."eos" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz'';
     sha256 = ''0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4'';
   };
-    
+
   packageName = "ieee-floats";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ieee-floats[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["ieee-floats.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM ieee-floats DESCRIPTION NIL SHA256 0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4 URL
-    http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz MD5 84d679a4dffddc3b0cff944adde623c5 NAME ieee-floats TESTNAME NIL
-    FILENAME ieee-floats DEPS NIL DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL) */
+/* (SYSTEM ieee-floats DESCRIPTION NIL SHA256
+    0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4 URL
+    http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz
+    MD5 84d679a4dffddc3b0cff944adde623c5 NAME ieee-floats FILENAME ieee-floats
+    DEPS ((NAME eos FILENAME eos)) DEPENDENCIES (eos) VERSION 20160318-git
+    SIBLINGS NIL PARASITES (ieee-floats-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index ba7ed0ab7d7..ce3508da816 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -3,35 +3,42 @@ rec {
   baseName = ''iolib'';
   version = ''v0.8.3'';
 
+  parasites = [ "iolib/multiplex" "iolib/os" "iolib/pathnames" "iolib/sockets" "iolib/streams" "iolib/syscalls" "iolib/trivial-sockets" "iolib/zstreams" ];
+
   description = ''I/O library.'';
 
-  deps = [ args."iolib_slash_streams" args."iolib_slash_sockets" args."iolib_slash_multiplex" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
     sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
   };
-    
+
   packageName = "iolib";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["iolib.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib TESTNAME NIL FILENAME iolib DEPS
-    ((NAME iolib/streams FILENAME iolib_slash_streams) (NAME iolib/sockets FILENAME iolib_slash_sockets) (NAME iolib/multiplex FILENAME iolib_slash_multiplex))
-    DEPENDENCIES (iolib/streams iolib/sockets iolib/multiplex) VERSION v0.8.3 SIBLINGS
-    (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
+/* (SYSTEM iolib DESCRIPTION I/O library. SHA256
+    12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib FILENAME iolib DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME idna FILENAME idna)
+     (NAME iolib.asdf FILENAME iolib_dot_asdf)
+     (NAME iolib.base FILENAME iolib_dot_base)
+     (NAME iolib.conf FILENAME iolib_dot_conf)
+     (NAME iolib.grovel FILENAME iolib_dot_grovel)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME swap-bytes FILENAME swap-bytes)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi idna iolib.asdf iolib.base
+     iolib.conf iolib.grovel split-sequence swap-bytes trivial-features)
+    VERSION v0.8.3 SIBLINGS
+    (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples
+     iolib.grovel iolib.tests)
+    PARASITES
+    (iolib/multiplex iolib/os iolib/pathnames iolib/sockets iolib/streams
+     iolib/syscalls iolib/trivial-sockets iolib/zstreams)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
new file mode 100644
index 00000000000..f566d159e0f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_dot_asdf'';
+  version = ''iolib-v0.8.3'';
+
+  description = ''A few ASDF component classes.'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+  };
+
+  packageName = "iolib.asdf";
+
+  asdFilesToKeep = ["iolib.asdf.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM iolib.asdf DESCRIPTION A few ASDF component classes. SHA256
+    12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.asdf FILENAME iolib_dot_asdf
+    DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria)
+    VERSION iolib-v0.8.3 SIBLINGS
+    (iolib iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel
+     iolib.tests)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
new file mode 100644
index 00000000000..c42eb7e602b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_dot_base'';
+  version = ''iolib-v0.8.3'';
+
+  description = ''Base IOlib package, used instead of CL.'';
+
+  deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+  };
+
+  packageName = "iolib.base";
+
+  asdFilesToKeep = ["iolib.base.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM iolib.base DESCRIPTION Base IOlib package, used instead of CL.
+    SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.base FILENAME iolib_dot_base
+    DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME iolib.asdf FILENAME iolib_dot_asdf)
+     (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp)
+     (NAME iolib.conf FILENAME iolib_dot_conf)
+     (NAME split-sequence FILENAME split-sequence))
+    DEPENDENCIES
+    (alexandria iolib.asdf iolib.common-lisp iolib.conf split-sequence) VERSION
+    iolib-v0.8.3 SIBLINGS
+    (iolib iolib.asdf iolib.common-lisp iolib.conf iolib.examples iolib.grovel
+     iolib.tests)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
new file mode 100644
index 00000000000..1171ae0f391
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
@@ -0,0 +1,32 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_dot_common-lisp'';
+  version = ''iolib-v0.8.3'';
+
+  description = ''Slightly modified Common Lisp.'';
+
+  deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+  };
+
+  packageName = "iolib.common-lisp";
+
+  asdFilesToKeep = ["iolib.common-lisp.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM iolib.common-lisp DESCRIPTION Slightly modified Common Lisp. SHA256
+    12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.common-lisp FILENAME
+    iolib_dot_common-lisp DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME iolib.asdf FILENAME iolib_dot_asdf)
+     (NAME iolib.conf FILENAME iolib_dot_conf))
+    DEPENDENCIES (alexandria iolib.asdf iolib.conf) VERSION iolib-v0.8.3
+    SIBLINGS
+    (iolib iolib.asdf iolib.base iolib.conf iolib.examples iolib.grovel
+     iolib.tests)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
new file mode 100644
index 00000000000..2dc99c742a4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_dot_conf'';
+  version = ''iolib-v0.8.3'';
+
+  description = ''Compile-time configuration for IOLib.'';
+
+  deps = [ args."alexandria" args."iolib_dot_asdf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+  };
+
+  packageName = "iolib.conf";
+
+  asdFilesToKeep = ["iolib.conf.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM iolib.conf DESCRIPTION Compile-time configuration for IOLib. SHA256
+    12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.conf FILENAME iolib_dot_conf
+    DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME iolib.asdf FILENAME iolib_dot_asdf))
+    DEPENDENCIES (alexandria iolib.asdf) VERSION iolib-v0.8.3 SIBLINGS
+    (iolib iolib.asdf iolib.base iolib.common-lisp iolib.examples iolib.grovel
+     iolib.tests)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
new file mode 100644
index 00000000000..d6c97ad7838
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''iolib_dot_grovel'';
+  version = ''iolib-v0.8.3'';
+
+  description = ''The CFFI Groveller'';
+
+  deps = [ args."alexandria" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_conf" args."split-sequence" args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
+  };
+
+  packageName = "iolib.grovel";
+
+  asdFilesToKeep = ["iolib.grovel.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM iolib.grovel DESCRIPTION The CFFI Groveller SHA256
+    12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
+    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.grovel FILENAME
+    iolib_dot_grovel DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi)
+     (NAME iolib.asdf FILENAME iolib_dot_asdf)
+     (NAME iolib.base FILENAME iolib_dot_base)
+     (NAME iolib.conf FILENAME iolib_dot_conf)
+     (NAME split-sequence FILENAME split-sequence) (NAME uiop FILENAME uiop))
+    DEPENDENCIES
+    (alexandria cffi iolib.asdf iolib.base iolib.conf split-sequence uiop)
+    VERSION iolib-v0.8.3 SIBLINGS
+    (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples
+     iolib.tests)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
deleted file mode 100644
index a0d26182a8e..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_multiplex'';
-  version = ''iolib-v0.8.3'';
-
-  description = ''I/O multiplexing library.'';
-
-  deps = [ args."iolib_slash_syscalls" args."cffi" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
-  };
-    
-  packageName = "iolib/multiplex";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/multiplex[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM iolib/multiplex DESCRIPTION I/O multiplexing library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/multiplex TESTNAME NIL FILENAME
-    iolib_slash_multiplex DEPS ((NAME iolib/syscalls FILENAME iolib_slash_syscalls) (NAME cffi FILENAME cffi)) DEPENDENCIES (iolib/syscalls cffi) VERSION
-    iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
deleted file mode 100644
index a6088dabf97..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_sockets'';
-  version = ''iolib-v0.8.3'';
-
-  description = ''Socket library.'';
-
-  deps = [ args."swap-bytes" args."iolib_slash_syscalls" args."iolib_slash_streams" args."idna" args."cffi" args."bordeaux-threads" args."babel" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
-  };
-    
-  packageName = "iolib/sockets";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/sockets[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM iolib/sockets DESCRIPTION Socket library. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/sockets TESTNAME NIL FILENAME
-    iolib_slash_sockets DEPS
-    ((NAME swap-bytes FILENAME swap-bytes) (NAME iolib/syscalls FILENAME iolib_slash_syscalls) (NAME iolib/streams FILENAME iolib_slash_streams)
-     (NAME idna FILENAME idna) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME babel FILENAME babel))
-    DEPENDENCIES (swap-bytes iolib/syscalls iolib/streams idna cffi bordeaux-threads babel) VERSION iolib-v0.8.3 SIBLINGS
-    (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
deleted file mode 100644
index 9caebf0db26..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_streams'';
-  version = ''iolib-v0.8.3'';
-
-  description = ''Gray streams.'';
-
-  deps = [ args."iolib_slash_multiplex" args."cffi" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
-  };
-    
-  packageName = "iolib/streams";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/streams[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM iolib/streams DESCRIPTION Gray streams. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/streams TESTNAME NIL FILENAME
-    iolib_slash_streams DEPS ((NAME iolib/multiplex FILENAME iolib_slash_multiplex) (NAME cffi FILENAME cffi)) DEPENDENCIES (iolib/multiplex cffi) VERSION
-    iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
deleted file mode 100644
index 0ef71a6a95c..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''iolib_slash_syscalls'';
-  version = ''iolib-v0.8.3'';
-
-  description = ''Syscalls and foreign types.'';
-
-  deps = [ args."trivial-features" args."cffi" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
-    sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
-  };
-    
-  packageName = "iolib/syscalls";
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib/syscalls[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM iolib/syscalls DESCRIPTION Syscalls and foreign types. SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5 fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib/syscalls TESTNAME NIL FILENAME
-    iolib_slash_syscalls DEPS ((NAME trivial-features FILENAME trivial-features) (NAME cffi FILENAME cffi)) DEPENDENCIES (trivial-features cffi) VERSION
-    iolib-v0.8.3 SIBLINGS (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 6d8e3c4fb0a..89301f90866 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''ironclad'';
   version = ''v0.34'';
 
+  parasites = [ "ironclad-tests" ];
+
   description = ''A cryptographic toolkit written in pure Common Lisp'';
 
   deps = [ args."nibbles" ];
@@ -11,25 +13,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz'';
     sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0'';
   };
-    
+
   packageName = "ironclad";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ironclad[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["ironclad.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL
-    http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad TESTNAME NIL FILENAME ironclad
-    DEPS ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.34 SIBLINGS (ironclad-text)) */
+/* (SYSTEM ironclad DESCRIPTION
+    A cryptographic toolkit written in pure Common Lisp SHA256
+    08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL
+    http://beta.quicklisp.org/archive/ironclad/2017-06-30/ironclad-v0.34.tgz
+    MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad FILENAME ironclad DEPS
+    ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.34
+    SIBLINGS (ironclad-text) PARASITES (ironclad-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index 5e02dceb84c..42980e0c913 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''iterate'';
   version = ''20160825-darcs'';
 
+  parasites = [ "iterate/tests" ];
+
   description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility'';
 
   deps = [ ];
@@ -11,25 +13,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz'';
     sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm'';
   };
-    
+
   packageName = "iterate";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iterate[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["iterate.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM iterate DESCRIPTION Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256 0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm URL
-    http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz MD5 e73ff4898ce4831ff2a28817f32de86e NAME iterate TESTNAME NIL FILENAME
-    iterate DEPS NIL DEPENDENCIES NIL VERSION 20160825-darcs SIBLINGS NIL) */
+/* (SYSTEM iterate DESCRIPTION
+    Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256
+    0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm URL
+    http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz
+    MD5 e73ff4898ce4831ff2a28817f32de86e NAME iterate FILENAME iterate DEPS NIL
+    DEPENDENCIES NIL VERSION 20160825-darcs SIBLINGS NIL PARASITES
+    (iterate/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
index 93e6782f163..978e58d2692 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
@@ -11,27 +11,20 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz'';
     sha256 = ''1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2'';
   };
-    
+
   packageName = "ixf";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ixf[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["ixf.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format SHA256 1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2 URL
-    http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz MD5 51db2caba094cac90982396cf552c847 NAME ixf TESTNAME NIL FILENAME ixf DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME ieee-floats FILENAME ieee-floats)
-     (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5) (NAME split-sequence FILENAME split-sequence))
-    DEPENDENCIES (alexandria babel cl-ppcre ieee-floats local-time md5 split-sequence) VERSION cl-20170630-git SIBLINGS NIL) */
+/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format
+    SHA256 1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2 URL
+    http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz
+    MD5 51db2caba094cac90982396cf552c847 NAME ixf FILENAME ixf DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME ieee-floats FILENAME ieee-floats)
+     (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5)
+     (NAME split-sequence FILENAME split-sequence))
+    DEPENDENCIES
+    (alexandria babel cl-ppcre ieee-floats local-time md5 split-sequence)
+    VERSION cl-20170630-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index b86efb3d8ec..8a4d2157515 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -5,35 +5,29 @@ rec {
 
   description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
 
-  deps = [ args."trivial-types" args."proc-parse" args."fast-io" args."cl-syntax-annot" args."cl-syntax" args."cl-ppcre" args."cl-annot" args."babel" ];
+  deps = [ args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."proc-parse" args."trivial-types" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz'';
     sha256 = ''0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm'';
   };
-    
+
   packageName = "jonathan";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/jonathan[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["jonathan.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256
-    0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm URL http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz MD5
-    5d82723835164f4e3d9c4d031322eb98 NAME jonathan TESTNAME NIL FILENAME jonathan DEPS
-    ((NAME trivial-types FILENAME trivial-types) (NAME proc-parse FILENAME proc-parse) (NAME fast-io FILENAME fast-io)
-     (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-annot FILENAME cl-annot)
-     (NAME babel FILENAME babel))
-    DEPENDENCIES (trivial-types proc-parse fast-io cl-syntax-annot cl-syntax cl-ppcre cl-annot babel) VERSION 20170630-git SIBLINGS (jonathan-test)) */
+/* (SYSTEM jonathan DESCRIPTION
+    High performance JSON encoder and decoder. Currently support: SBCL, CCL.
+    SHA256 0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm URL
+    http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz
+    MD5 5d82723835164f4e3d9c4d031322eb98 NAME jonathan FILENAME jonathan DEPS
+    ((NAME babel FILENAME babel) (NAME cl-annot FILENAME cl-annot)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME fast-io FILENAME fast-io) (NAME proc-parse FILENAME proc-parse)
+     (NAME trivial-types FILENAME trivial-types))
+    DEPENDENCIES
+    (babel cl-annot cl-ppcre cl-syntax cl-syntax-annot fast-io proc-parse
+     trivial-types)
+    VERSION 20170630-git SIBLINGS (jonathan-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
new file mode 100644
index 00000000000..e5cbad3e9e8
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''kmrcl'';
+  version = ''20150923-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/kmrcl/2015-09-23/kmrcl-20150923-git.tgz'';
+    sha256 = ''0sx7p16pp5i4qr569p2265ky6rd65gyjp21k348a6c3fs2yn0r2g'';
+  };
+
+  packageName = "kmrcl";
+
+  asdFilesToKeep = ["kmrcl.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM kmrcl DESCRIPTION NIL SHA256
+    0sx7p16pp5i4qr569p2265ky6rd65gyjp21k348a6c3fs2yn0r2g URL
+    http://beta.quicklisp.org/archive/kmrcl/2015-09-23/kmrcl-20150923-git.tgz
+    MD5 0cd15d3ed3e7d56528dd3243d1a5c9b1 NAME kmrcl FILENAME kmrcl DEPS NIL
+    DEPENDENCIES NIL VERSION 20150923-git SIBLINGS (kmrcl-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
new file mode 100644
index 00000000000..9f99f99d4ce
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lack-component'';
+  version = ''lack-20170725-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz'';
+    sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp'';
+  };
+
+  packageName = "lack-component";
+
+  asdFilesToKeep = ["lack-component.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM lack-component DESCRIPTION NIL SHA256
+    1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
+    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5
+    ab71d36ac49e4759806e9a2ace50ae53 NAME lack-component FILENAME
+    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20170725-git SIBLINGS
+    (lack-middleware-accesslog lack-middleware-auth-basic
+     lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
+     lack-middleware-session lack-middleware-static lack-request lack-response
+     lack-session-store-dbi lack-session-store-redis lack-test
+     lack-util-writer-stream lack-util lack t-lack-component
+     t-lack-middleware-accesslog t-lack-middleware-auth-basic
+     t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
+     t-lack-middleware-session t-lack-middleware-static t-lack-request
+     t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 5023dc63d42..2bbe5dcd33b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -11,29 +11,24 @@ rec {
     url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz'';
     sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp'';
   };
-    
+
   packageName = "lack-middleware-backtrace";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-middleware-backtrace[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["lack-middleware-backtrace.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
-    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 ab71d36ac49e4759806e9a2ace50ae53 NAME lack-middleware-backtrace TESTNAME NIL
-    FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION lack-20170725-git SIBLINGS
-    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session
-     lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util lack
-     t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
-     t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)) */
+/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
+    1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
+    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5
+    ab71d36ac49e4759806e9a2ace50ae53 NAME lack-middleware-backtrace FILENAME
+    lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
+    (uiop) VERSION lack-20170725-git SIBLINGS
+    (lack-component lack-middleware-accesslog lack-middleware-auth-basic
+     lack-middleware-csrf lack-middleware-mount lack-middleware-session
+     lack-middleware-static lack-request lack-response lack-session-store-dbi
+     lack-session-store-redis lack-test lack-util-writer-stream lack-util lack
+     t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic
+     t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
+     t-lack-middleware-session t-lack-middleware-static t-lack-request
+     t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index ea5ddc3f96b..38f834cd52b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -5,36 +5,31 @@ rec {
 
   description = '''';
 
-  deps = [ args."ironclad" ];
+  deps = [ args."ironclad" args."nibbles" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz'';
     sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp'';
   };
-    
+
   packageName = "lack-util";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-util[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["lack-util.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM lack-util DESCRIPTION NIL SHA256 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
-    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 ab71d36ac49e4759806e9a2ace50ae53 NAME lack-util TESTNAME NIL FILENAME lack-util
-    DEPS ((NAME ironclad FILENAME ironclad)) DEPENDENCIES (ironclad) VERSION lack-20170725-git SIBLINGS
-    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
-     lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test
-     lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf
-     t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util
-     t-lack)) */
+/* (SYSTEM lack-util DESCRIPTION NIL SHA256
+    1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
+    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5
+    ab71d36ac49e4759806e9a2ace50ae53 NAME lack-util FILENAME lack-util DEPS
+    ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
+    DEPENDENCIES (ironclad nibbles) VERSION lack-20170725-git SIBLINGS
+    (lack-component lack-middleware-accesslog lack-middleware-auth-basic
+     lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
+     lack-middleware-session lack-middleware-static lack-request lack-response
+     lack-session-store-dbi lack-session-store-redis lack-test
+     lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog
+     t-lack-middleware-auth-basic t-lack-middleware-backtrace
+     t-lack-middleware-csrf t-lack-middleware-mount t-lack-middleware-session
+     t-lack-middleware-static t-lack-request t-lack-session-store-dbi
+     t-lack-session-store-redis t-lack-util t-lack)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 0b1c36d7356..0d65d48cf0a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -5,36 +5,34 @@ rec {
 
   description = ''A minimal Clack'';
 
-  deps = [ ];
+  deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz'';
     sha256 = ''1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp'';
   };
-    
+
   packageName = "lack";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["lack.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
-    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5 ab71d36ac49e4759806e9a2ace50ae53 NAME lack TESTNAME NIL FILENAME lack DEPS NIL
-    DEPENDENCIES NIL VERSION 20170725-git SIBLINGS
-    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
-     lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test
-     lack-util-writer-stream lack-util t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace
-     t-lack-middleware-csrf t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi
-     t-lack-session-store-redis t-lack-util t-lack)) */
+/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
+    1c5xlya1zm232zsala03a6m10m11hgqvbgx04kxl29yz0ldp7jbp URL
+    http://beta.quicklisp.org/archive/lack/2017-07-25/lack-20170725-git.tgz MD5
+    ab71d36ac49e4759806e9a2ace50ae53 NAME lack FILENAME lack DEPS
+    ((NAME ironclad FILENAME ironclad)
+     (NAME lack-component FILENAME lack-component)
+     (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles))
+    DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION
+    20170725-git SIBLINGS
+    (lack-component lack-middleware-accesslog lack-middleware-auth-basic
+     lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
+     lack-middleware-session lack-middleware-static lack-request lack-response
+     lack-session-store-dbi lack-session-store-redis lack-test
+     lack-util-writer-stream lack-util t-lack-component
+     t-lack-middleware-accesslog t-lack-middleware-auth-basic
+     t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
+     t-lack-middleware-session t-lack-middleware-static t-lack-request
+     t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 4082abbe656..a94c8439cf2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -3,34 +3,27 @@ rec {
   baseName = ''let-plus'';
   version = ''20170124-git'';
 
+  parasites = [ "let-plus-tests" ];
+
   description = ''Destructuring extension of LET*.'';
 
-  deps = [ args."alexandria" args."anaphora" ];
+  deps = [ args."alexandria" args."anaphora" args."lift" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz'';
     sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8'';
   };
-    
+
   packageName = "let-plus";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/let-plus[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["let-plus.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL
-    http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus TESTNAME NIL FILENAME
-    let-plus DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS
-    NIL) */
+/* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256
+    1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL
+    http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz
+    MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus FILENAME let-plus DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+     (NAME lift FILENAME lift))
+    DEPENDENCIES (alexandria anaphora lift) VERSION 20170124-git SIBLINGS NIL
+    PARASITES (let-plus-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index f35ba345d1b..9dd6baad1bd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -5,31 +5,24 @@ rec {
 
   description = ''libev bindings for Common Lisp'';
 
-  deps = [ args."cffi" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz'';
     sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl'';
   };
-    
+
   packageName = "lev";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lev[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["lev.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM lev DESCRIPTION libev bindings for Common Lisp SHA256 0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl URL
-    http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz MD5 10f340f7500beb98b5c0d4a9876131fb NAME lev TESTNAME NIL FILENAME lev DEPS
-    ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */
+/* (SYSTEM lev DESCRIPTION libev bindings for Common Lisp SHA256
+    0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl URL
+    http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz MD5
+    10f340f7500beb98b5c0d4a9876131fb NAME lev FILENAME lev DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20150505-git
+    SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
new file mode 100644
index 00000000000..a3ddc2fd953
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lift'';
+  version = ''20151031-git'';
+
+  description = ''LIsp Framework for Testing'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz'';
+    sha256 = ''1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46'';
+  };
+
+  packageName = "lift";
+
+  asdFilesToKeep = ["lift.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM lift DESCRIPTION LIsp Framework for Testing SHA256
+    1h8fkpm377brbrc06zdynd2qilc85vr9i8r9f8pjqqmk3p1qyl46 URL
+    http://beta.quicklisp.org/archive/lift/2015-10-31/lift-20151031-git.tgz MD5
+    b92e97b3d337607743f47bde0889f3ee NAME lift FILENAME lift DEPS NIL
+    DEPENDENCIES NIL VERSION 20151031-git SIBLINGS
+    (lift-documentation lift-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
index 49ec6901fd9..50bc9946cca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
@@ -11,26 +11,17 @@ rec {
     url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz'';
     sha256 = ''06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n'';
   };
-    
+
   packageName = "lisp-namespace";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lisp-namespace[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["lisp-namespace.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM lisp-namespace DESCRIPTION Provides LISP-N --- extensible namespaces in Common Lisp. SHA256 06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n URL
-    http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz MD5 f3379a60f7cc896a7cff384ff25a1de5 NAME lisp-namespace
-    TESTNAME NIL FILENAME lisp-namespace DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170630-git SIBLINGS
-    (lisp-namespace.test)) */
+/* (SYSTEM lisp-namespace DESCRIPTION
+    Provides LISP-N --- extensible namespaces in Common Lisp. SHA256
+    06mdrzjwmfynzljcs8ym8dscjlxpbbkmjfg912v68v7p2xzq6d0n URL
+    http://beta.quicklisp.org/archive/lisp-namespace/2017-06-30/lisp-namespace-20170630-git.tgz
+    MD5 f3379a60f7cc896a7cff384ff25a1de5 NAME lisp-namespace FILENAME
+    lisp-namespace DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (alexandria) VERSION 20170630-git SIBLINGS (lisp-namespace.test) PARASITES
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
new file mode 100644
index 00000000000..47e57ba1285
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lisp-unit2'';
+  version = ''20160531-git'';
+
+  parasites = [ "lisp-unit2-test" ];
+
+  description = ''Common Lisp library that supports unit testing.'';
+
+  deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."symbol-munger" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lisp-unit2/2016-05-31/lisp-unit2-20160531-git.tgz'';
+    sha256 = ''17frcygs515l611cwggm90xapl8xng9cylsrdh11ygmdxwwy59sv'';
+  };
+
+  packageName = "lisp-unit2";
+
+  asdFilesToKeep = ["lisp-unit2.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM lisp-unit2 DESCRIPTION
+    Common Lisp library that supports unit testing. SHA256
+    17frcygs515l611cwggm90xapl8xng9cylsrdh11ygmdxwwy59sv URL
+    http://beta.quicklisp.org/archive/lisp-unit2/2016-05-31/lisp-unit2-20160531-git.tgz
+    MD5 913675bff1f86453887681e72ae5914d NAME lisp-unit2 FILENAME lisp-unit2
+    DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-unicode FILENAME cl-unicode)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME iterate FILENAME iterate)
+     (NAME symbol-munger FILENAME symbol-munger))
+    DEPENDENCIES
+    (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
+     symbol-munger)
+    VERSION 20160531-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
index 720afedb815..7189a09e20c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
@@ -5,31 +5,22 @@ rec {
 
   description = ''magic list-of deftype'';
 
-  deps = [ ];
+  deps = [ args."asdf-finalizers" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz'';
     sha256 = ''1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj'';
   };
-    
+
   packageName = "list-of";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/list-of[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["list-of.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM list-of DESCRIPTION magic list-of deftype SHA256 1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj URL
-    http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz MD5 a9e3c960e6b6fdbd69640b520ef8044b NAME list-of TESTNAME
-    NIL FILENAME list-of DEPS NIL DEPENDENCIES NIL VERSION asdf-finalizers-20170403-git SIBLINGS (asdf-finalizers-test asdf-finalizers)) */
+/* (SYSTEM list-of DESCRIPTION magic list-of deftype SHA256
+    1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj URL
+    http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz
+    MD5 a9e3c960e6b6fdbd69640b520ef8044b NAME list-of FILENAME list-of DEPS
+    ((NAME asdf-finalizers FILENAME asdf-finalizers)) DEPENDENCIES
+    (asdf-finalizers) VERSION asdf-finalizers-20170403-git SIBLINGS
+    (asdf-finalizers-test asdf-finalizers) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 1291499be3d..f5137a5e927 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -5,32 +5,26 @@ rec {
 
   description = ''A library for manipulating dates and times, based on a paper by Erik Naggum'';
 
-  deps = [ args."cl-fad" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz'';
     sha256 = ''05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9'';
   };
-    
+
   packageName = "local-time";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/local-time[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["local-time.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256
-    05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9 URL http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz MD5
-    77a79ed1036bc3547f5174f2256c8e93 NAME local-time TESTNAME NIL FILENAME local-time DEPS ((NAME cl-fad FILENAME cl-fad)) DEPENDENCIES (cl-fad) VERSION
-    20170725-git SIBLINGS (cl-postgres+local-time local-time.test)) */
+/* (SYSTEM local-time DESCRIPTION
+    A library for manipulating dates and times, based on a paper by Erik Naggum
+    SHA256 05axwla93m5jml9lw6ljwzjhcl8pshfzxyqkvyj1w5l9klh569p9 URL
+    http://beta.quicklisp.org/archive/local-time/2017-07-25/local-time-20170725-git.tgz
+    MD5 77a79ed1036bc3547f5174f2256c8e93 NAME local-time FILENAME local-time
+    DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-fad FILENAME cl-fad))
+    DEPENDENCIES (alexandria bordeaux-threads cl-fad) VERSION 20170725-git
+    SIBLINGS (cl-postgres+local-time local-time.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
index a8d9d94c664..1a6f217a2f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
@@ -5,32 +5,23 @@ rec {
 
   description = ''Parallelism for Common Lisp'';
 
-  deps = [ args."bordeaux-threads" args."alexandria" ];
+  deps = [ args."alexandria" args."bordeaux-threads" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz'';
     sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1'';
   };
-    
+
   packageName = "lparallel";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lparallel[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["lparallel.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM lparallel DESCRIPTION Parallelism for Common Lisp SHA256 0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1 URL
-    http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz MD5 6393e8d0c0cc9ed1c88b6e7cca8de5df NAME lparallel TESTNAME NIL FILENAME
-    lparallel DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (bordeaux-threads alexandria) VERSION
-    20160825-git SIBLINGS (lparallel-bench lparallel-test)) */
+/* (SYSTEM lparallel DESCRIPTION Parallelism for Common Lisp SHA256
+    0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1 URL
+    http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz
+    MD5 6393e8d0c0cc9ed1c88b6e7cca8de5df NAME lparallel FILENAME lparallel DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads))
+    DEPENDENCIES (alexandria bordeaux-threads) VERSION 20160825-git SIBLINGS
+    (lparallel-bench lparallel-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index e5224fff18c..b8592e12490 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -5,32 +5,24 @@ rec {
 
   description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
 
-  deps = [ args."plump" args."form-fiddle" args."clss" args."array-utils" ];
+  deps = [ args."array-utils" args."clss" args."form-fiddle" args."plump" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz'';
     sha256 = ''19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm'';
   };
-    
+
   packageName = "lquery";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lquery[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["lquery.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm URL
-    http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz MD5 aeb03cb5174d682092683da488531a9c NAME lquery TESTNAME NIL FILENAME lquery
-    DEPS ((NAME plump FILENAME plump) (NAME form-fiddle FILENAME form-fiddle) (NAME clss FILENAME clss) (NAME array-utils FILENAME array-utils)) DEPENDENCIES
-    (plump form-fiddle clss array-utils) VERSION 20170630-git SIBLINGS (lquery-test)) */
+/* (SYSTEM lquery DESCRIPTION
+    A library to allow jQuery-like HTML/DOM manipulation. SHA256
+    19lpzjidg31lw61b78vdsqzrsdw2js4a9s7zzr5049jpzbspszjm URL
+    http://beta.quicklisp.org/archive/lquery/2017-06-30/lquery-20170630-git.tgz
+    MD5 aeb03cb5174d682092683da488531a9c NAME lquery FILENAME lquery DEPS
+    ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss)
+     (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump))
+    DEPENDENCIES (array-utils clss form-fiddle plump) VERSION 20170630-git
+    SIBLINGS (lquery-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index b5c242530fe..db25e6ae534 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz'';
     sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v'';
   };
-    
+
   packageName = "map-set";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/map-set[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["map-set.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM map-set DESCRIPTION Set-like data structure. SHA256 15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v URL
-    http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz MD5 49cf6b527841b717b8696efaa7bb6389 NAME map-set TESTNAME NIL FILENAME
-    map-set DEPS NIL DEPENDENCIES NIL VERSION 20160628-hg SIBLINGS NIL) */
+/* (SYSTEM map-set DESCRIPTION Set-like data structure. SHA256
+    15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v URL
+    http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz
+    MD5 49cf6b527841b717b8696efaa7bb6389 NAME map-set FILENAME map-set DEPS NIL
+    DEPENDENCIES NIL VERSION 20160628-hg SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index 5729c898fdc..b45b0a5da70 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz'';
     sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d'';
   };
-    
+
   packageName = "marshal";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/marshal[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["marshal.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d URL
-    http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz MD5 ebde1b0f1c1abeb409380884cc665351 NAME marshal TESTNAME NIL FILENAME
-    marshal DEPS NIL DEPENDENCIES NIL VERSION cl-20170124-git SIBLINGS NIL) */
+/* (SYSTEM marshal DESCRIPTION
+    marshal: Simple (de)serialization of Lisp datastructures. SHA256
+    0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d URL
+    http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz
+    MD5 ebde1b0f1c1abeb409380884cc665351 NAME marshal FILENAME marshal DEPS NIL
+    DEPENDENCIES NIL VERSION cl-20170124-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index c5d86ebb703..472205924a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz'';
     sha256 = ''0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx'';
   };
-    
+
   packageName = "md5";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/md5[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["md5.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx URL
-    http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz MD5 c6a5b3ca5a23fad3dfde23963db84910 NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
-    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */
+/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256
+    0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx URL
+    http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz MD5
+    c6a5b3ca5a23fad3dfde23963db84910 NAME md5 FILENAME md5 DEPS NIL
+    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index 0bfbbbe14b2..ac12468c880 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -11,27 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz'';
     sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc'';
   };
-    
+
   packageName = "metabang-bind";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metabang-bind[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["metabang-bind.asd"];
+  overrides = x: x;
 }
 /* (SYSTEM metabang-bind DESCRIPTION
-    Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more. SHA256
-    1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc URL http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz MD5
-    20c6a434308598ad7fa224d99f3bcbf6 NAME metabang-bind TESTNAME NIL FILENAME metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS
-    (metabang-bind-test)) */
+    Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.
+    SHA256 1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc URL
+    http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz
+    MD5 20c6a434308598ad7fa224d99f3bcbf6 NAME metabang-bind FILENAME
+    metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS
+    (metabang-bind-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
index 1e35369a9d0..1fc10b9c8db 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz'';
     sha256 = ''14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br'';
   };
-    
+
   packageName = "metatilities-base";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metatilities-base[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["metatilities-base.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM metatilities-base DESCRIPTION These are metabang.com's Common Lisp basic utilities. SHA256 14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br URL
-    http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz MD5 8a3f429862a368e63b8fde731e9ab28a NAME
-    metatilities-base TESTNAME NIL FILENAME metatilities-base DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS (metatilities-base-test)) */
+/* (SYSTEM metatilities-base DESCRIPTION
+    These are metabang.com's Common Lisp basic utilities. SHA256
+    14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br URL
+    http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz
+    MD5 8a3f429862a368e63b8fde731e9ab28a NAME metatilities-base FILENAME
+    metatilities-base DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS
+    (metatilities-base-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 044ce4d9358..6334804c4f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz'';
     sha256 = ''0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj'';
   };
-    
+
   packageName = "misc-extensions";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/misc-extensions[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["misc-extensions.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM misc-extensions DESCRIPTION NIL SHA256 0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL
-    http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions
-    TESTNAME NIL FILENAME misc-extensions DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL) */
+/* (SYSTEM misc-extensions DESCRIPTION NIL SHA256
+    0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL
+    http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz
+    MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions FILENAME
+    misc-extensions DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
new file mode 100644
index 00000000000..1f2dd20ee4b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''moptilities'';
+  version = ''20170403-git'';
+
+  description = ''Common Lisp MOP utilities'';
+
+  deps = [ args."closer-mop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz'';
+    sha256 = ''0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8'';
+  };
+
+  packageName = "moptilities";
+
+  asdFilesToKeep = ["moptilities.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM moptilities DESCRIPTION Common Lisp MOP utilities SHA256
+    0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8 URL
+    http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz
+    MD5 b118397be325e60a772ea3631c4f19a4 NAME moptilities FILENAME moptilities
+    DEPS ((NAME closer-mop FILENAME closer-mop)) DEPENDENCIES (closer-mop)
+    VERSION 20170403-git SIBLINGS (moptilities-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
index 8d5450803ce..565003d1e87 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
@@ -11,26 +11,17 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz'';
     sha256 = ''0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy'';
   };
-    
+
   packageName = "mssql";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/mssql[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["mssql.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM mssql DESCRIPTION NIL SHA256 0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy URL
-    http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz MD5 88e65c72923896df603ecf20039ae305 NAME mssql TESTNAME NIL FILENAME mssql
-    DEPS ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number))
-    DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION cl-20170630-git SIBLINGS NIL) */
+/* (SYSTEM mssql DESCRIPTION NIL SHA256
+    0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy URL
+    http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz
+    MD5 88e65c72923896df603ecf20039ae305 NAME mssql FILENAME mssql DEPS
+    ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools)
+     (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number))
+    DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION
+    cl-20170630-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index 9b581d4f1cc..a8cfc070bf9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz'';
     sha256 = ''1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv'';
   };
-    
+
   packageName = "mt19937";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/mt19937[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["mt19937.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM mt19937 DESCRIPTION Portable MT19937 Mersenne Twister random number generator SHA256 1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv URL
-    http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz MD5 54c63977b6d77abd66ebe0227b77c143 NAME mt19937 TESTNAME NIL FILENAME mt19937 DEPS
-    NIL DEPENDENCIES NIL VERSION 1.1.1 SIBLINGS NIL) */
+/* (SYSTEM mt19937 DESCRIPTION
+    Portable MT19937 Mersenne Twister random number generator SHA256
+    1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv URL
+    http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz MD5
+    54c63977b6d77abd66ebe0227b77c143 NAME mt19937 FILENAME mt19937 DEPS NIL
+    DEPENDENCIES NIL VERSION 1.1.1 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 6580c322b04..fe2fc42a18b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -5,33 +5,28 @@ rec {
 
   description = ''Sinatra-compatible routing library.'';
 
-  deps = [ args."quri" args."map-set" args."cl-utilities" args."cl-ppcre" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz'';
     sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh'';
   };
-    
+
   packageName = "myway";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/myway[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["myway.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL
-    http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway TESTNAME NIL FILENAME myway DEPS
-    ((NAME quri FILENAME quri) (NAME map-set FILENAME map-set) (NAME cl-utilities FILENAME cl-utilities) (NAME cl-ppcre FILENAME cl-ppcre)
-     (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION 20150302-git SIBLINGS (myway-test)) */
+/* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256
+    1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL
+    http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz
+    MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway FILENAME myway DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-utilities FILENAME cl-utilities) (NAME map-set FILENAME map-set)
+     (NAME quri FILENAME quri) (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES
+    (alexandria babel cl-ppcre cl-utilities map-set quri split-sequence
+     trivial-features)
+    VERSION 20150302-git SIBLINGS (myway-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index 53834f82431..a239fe7e32b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -12,27 +12,17 @@ rec {
     url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz'';
     sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45'';
   };
-    
+
   packageName = "named-readtables";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/named-readtables[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["named-readtables.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM named-readtables DESCRIPTION Library that creates a namespace for named readtable
+/* (SYSTEM named-readtables DESCRIPTION
+    Library that creates a namespace for named readtable
   akin to the namespace of packages.
     SHA256 1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45 URL
-    http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz MD5 1237a07f90e29939e48b595eaad2bd82 NAME named-readtables
-    TESTNAME NIL FILENAME named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL) */
+    http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz
+    MD5 1237a07f90e29939e48b595eaad2bd82 NAME named-readtables FILENAME
+    named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS
+    NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index b289feae883..4e7c84566a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -11,26 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz'';
     sha256 = ''12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc'';
   };
-    
+
   packageName = "net.didierverna.asdf-flv";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/net.didierverna.asdf-flv[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["net.didierverna.asdf-flv.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM net.didierverna.asdf-flv DESCRIPTION ASDF extension to provide support for file-local variables. SHA256
-    12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc URL http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz MD5
-    2b74b721b7e5335d2230d6b95fc6be56 NAME net.didierverna.asdf-flv TESTNAME NIL FILENAME net_dot_didierverna_dot_asdf-flv DEPS NIL DEPENDENCIES NIL VERSION
-    asdf-flv-version-2.1 SIBLINGS NIL) */
+/* (SYSTEM net.didierverna.asdf-flv DESCRIPTION
+    ASDF extension to provide support for file-local variables. SHA256
+    12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc URL
+    http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz
+    MD5 2b74b721b7e5335d2230d6b95fc6be56 NAME net.didierverna.asdf-flv FILENAME
+    net_dot_didierverna_dot_asdf-flv DEPS NIL DEPENDENCIES NIL VERSION
+    asdf-flv-version-2.1 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index 622fd506b15..fbcfbe29164 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''nibbles'';
   version = ''20170403-git'';
 
+  parasites = [ "nibbles-tests" ];
+
   description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders'';
 
   deps = [ ];
@@ -11,25 +13,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz'';
     sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4'';
   };
-    
+
   packageName = "nibbles";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/nibbles[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["nibbles.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders SHA256
-    0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4 URL http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz MD5
-    5683a0a5510860a036b2a272036cda87 NAME nibbles TESTNAME NIL FILENAME nibbles DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */
+/* (SYSTEM nibbles DESCRIPTION
+    A library for accessing octet-addressed blocks of data in big- and little-endian orders
+    SHA256 0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4 URL
+    http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz
+    MD5 5683a0a5510860a036b2a272036cda87 NAME nibbles FILENAME nibbles DEPS NIL
+    DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL PARASITES
+    (nibbles-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 74cb02155eb..07b86f58fe7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -5,32 +5,23 @@ rec {
 
   description = ''Optimized Pattern Matching Library'';
 
-  deps = [ args."closer-mop" args."alexandria" ];
+  deps = [ args."alexandria" args."closer-mop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz'';
     sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc'';
   };
-    
+
   packageName = "optima";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/optima[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["optima.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM optima DESCRIPTION Optimized Pattern Matching Library SHA256 0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc URL
-    http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz MD5 20523dc3dfc04bb2526008dff0842caa NAME optima TESTNAME NIL FILENAME optima
-    DEPS ((NAME closer-mop FILENAME closer-mop) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS
-    (optima.ppcre optima.test)) */
+/* (SYSTEM optima DESCRIPTION Optimized Pattern Matching Library SHA256
+    0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc URL
+    http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz
+    MD5 20523dc3dfc04bb2526008dff0842caa NAME optima FILENAME optima DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop))
+    DEPENDENCIES (alexandria closer-mop) VERSION 20150709-git SIBLINGS
+    (optima.ppcre optima.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index b7398d3973d..bb5121667ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -5,32 +5,24 @@ rec {
 
   description = ''Lisp to JavaScript transpiler'';
 
-  deps = [ args."named-readtables" args."cl-ppcre" args."anaphora" ];
+  deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz'';
     sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li'';
   };
-    
+
   packageName = "parenscript";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parenscript[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["parenscript.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL
-    http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript TESTNAME NIL FILENAME
-    parenscript DEPS ((NAME named-readtables FILENAME named-readtables) (NAME cl-ppcre FILENAME cl-ppcre) (NAME anaphora FILENAME anaphora)) DEPENDENCIES
-    (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6 SIBLINGS (parenscript.test)) */
+/* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256
+    1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL
+    http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz
+    MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript FILENAME parenscript
+    DEPS
+    ((NAME anaphora FILENAME anaphora) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME named-readtables FILENAME named-readtables))
+    DEPENDENCIES (anaphora cl-ppcre named-readtables) VERSION Parenscript-2.6
+    SIBLINGS (parenscript.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index 726209f9617..d998ed305bb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''parse-number'';
   version = ''1.4'';
 
+  parasites = [ "parse-number-tests" ];
+
   description = ''Number parsing library'';
 
   deps = [ ];
@@ -11,25 +13,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz'';
     sha256 = ''0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh'';
   };
-    
+
   packageName = "parse-number";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parse-number[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["parse-number.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM parse-number DESCRIPTION Number parsing library SHA256 0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh URL
-    http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz MD5 f189d474a2cd063f9743b452241e59a9 NAME parse-number TESTNAME NIL FILENAME
-    parse-number DEPS NIL DEPENDENCIES NIL VERSION 1.4 SIBLINGS NIL) */
+/* (SYSTEM parse-number DESCRIPTION Number parsing library SHA256
+    0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh URL
+    http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz
+    MD5 f189d474a2cd063f9743b452241e59a9 NAME parse-number FILENAME
+    parse-number DEPS NIL DEPENDENCIES NIL VERSION 1.4 SIBLINGS NIL PARASITES
+    (parse-number-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
new file mode 100644
index 00000000000..93890afd300
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -0,0 +1,27 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''pcall-queue'';
+  version = ''pcall-0.3'';
+
+  description = '''';
+
+  deps = [ args."alexandria" args."bordeaux-threads" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
+    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
+  };
+
+  packageName = "pcall-queue";
+
+  asdFilesToKeep = ["pcall-queue.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM pcall-queue DESCRIPTION NIL SHA256
+    02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
+    http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5
+    019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall-queue FILENAME pcall-queue DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads))
+    DEPENDENCIES (alexandria bordeaux-threads) VERSION pcall-0.3 SIBLINGS
+    (pcall) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index f12f7b68d00..025d160f460 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -3,33 +3,28 @@ rec {
   baseName = ''pcall'';
   version = ''0.3'';
 
+  parasites = [ "pcall-tests" ];
+
   description = '''';
 
-  deps = [ args."bordeaux-threads" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
     sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
   };
-    
+
   packageName = "pcall";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pcall[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["pcall.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM pcall DESCRIPTION NIL SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
-    http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall TESTNAME NIL FILENAME pcall DEPS
-    ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */
+/* (SYSTEM pcall DESCRIPTION NIL SHA256
+    02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
+    http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5
+    019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall FILENAME pcall DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME fiveam FILENAME fiveam) (NAME pcall-queue FILENAME pcall-queue))
+    DEPENDENCIES (alexandria bordeaux-threads fiveam pcall-queue) VERSION 0.3
+    SIBLINGS (pcall-queue) PARASITES (pcall-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
index ca1ad414d75..07baf1539bc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
@@ -5,43 +5,69 @@ rec {
 
   description = ''Load data into PostgreSQL'';
 
-  deps = [ args."abnf" args."alexandria" args."cl-base64" args."cl-csv" args."cl-fad" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."command-line-arguments" args."db3" args."drakma" args."esrap" args."flexi-streams" args."ixf" args."local-time" args."lparallel" args."metabang-bind" args."mssql" args."postmodern" args."py-configparser" args."qmynd" args."quri" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."uiop" args."usocket" args."uuid" ];
+  deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz'';
     sha256 = ''1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v'';
   };
-    
+
   packageName = "pgloader";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pgloader[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["pgloader.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v URL
-    http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz MD5 6741f8e7d2d416942d5c4a1971576d33 NAME pgloader TESTNAME NIL FILENAME pgloader
-    DEPS
-    ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME cl-base64 FILENAME cl-base64) (NAME cl-csv FILENAME cl-csv)
-     (NAME cl-fad FILENAME cl-fad) (NAME cl-log FILENAME cl-log) (NAME cl-markdown FILENAME cl-markdown) (NAME cl-postgres FILENAME cl-postgres)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME db3 FILENAME db3) (NAME drakma FILENAME drakma)
-     (NAME esrap FILENAME esrap) (NAME flexi-streams FILENAME flexi-streams) (NAME ixf FILENAME ixf) (NAME local-time FILENAME local-time)
-     (NAME lparallel FILENAME lparallel) (NAME metabang-bind FILENAME metabang-bind) (NAME mssql FILENAME mssql) (NAME postmodern FILENAME postmodern)
-     (NAME py-configparser FILENAME py-configparser) (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri) (NAME simple-date FILENAME simple-date)
-     (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME uiop FILENAME uiop)
+/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256
+    1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v URL
+    http://beta.quicklisp.org/archive/pgloader/2017-07-25/pgloader-v3.4.1.tgz
+    MD5 6741f8e7d2d416942d5c4a1971576d33 NAME pgloader FILENAME pgloader DEPS
+    ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria)
+     (NAME anaphora FILENAME anaphora)
+     (NAME asdf-system-connections FILENAME asdf-system-connections)
+     (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz)
+     (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl)
+     (NAME cl-base64 FILENAME cl-base64)
+     (NAME cl-containers FILENAME cl-containers) (NAME cl-csv FILENAME cl-csv)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-interpol FILENAME cl-interpol)
+     (NAME cl-log FILENAME cl-log) (NAME cl-markdown FILENAME cl-markdown)
+     (NAME cl-postgres FILENAME cl-postgres) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-unicode FILENAME cl-unicode)
+     (NAME cl-utilities FILENAME cl-utilities)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME command-line-arguments FILENAME command-line-arguments)
+     (NAME db3 FILENAME db3) (NAME drakma FILENAME drakma)
+     (NAME dynamic-classes FILENAME dynamic-classes)
+     (NAME esrap FILENAME esrap) (NAME flexi-streams FILENAME flexi-streams)
+     (NAME garbage-pools FILENAME garbage-pools)
+     (NAME ieee-floats FILENAME ieee-floats) (NAME ironclad FILENAME ironclad)
+     (NAME iterate FILENAME iterate) (NAME ixf FILENAME ixf)
+     (NAME list-of FILENAME list-of) (NAME local-time FILENAME local-time)
+     (NAME lparallel FILENAME lparallel) (NAME md5 FILENAME md5)
+     (NAME metabang-bind FILENAME metabang-bind)
+     (NAME metatilities-base FILENAME metatilities-base)
+     (NAME mssql FILENAME mssql) (NAME nibbles FILENAME nibbles)
+     (NAME parse-number FILENAME parse-number)
+     (NAME postmodern FILENAME postmodern) (NAME puri FILENAME puri)
+     (NAME py-configparser FILENAME py-configparser)
+     (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri)
+     (NAME s-sql FILENAME s-sql) (NAME simple-date FILENAME simple-date)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME sqlite FILENAME sqlite)
+     (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop)
      (NAME usocket FILENAME usocket) (NAME uuid FILENAME uuid))
     DEPENDENCIES
-    (abnf alexandria cl-base64 cl-csv cl-fad cl-log cl-markdown cl-postgres cl-ppcre command-line-arguments db3 drakma esrap flexi-streams ixf local-time
-     lparallel metabang-bind mssql postmodern py-configparser qmynd quri simple-date split-sequence sqlite trivial-backtrace uiop usocket uuid)
-    VERSION v3.4.1 SIBLINGS NIL) */
+    (abnf alexandria anaphora asdf-system-connections babel bordeaux-threads
+     cffi chipz chunga cl+ssl cl-base64 cl-containers cl-csv cl-fad cl-interpol
+     cl-log cl-markdown cl-postgres cl-ppcre cl-unicode cl-utilities closer-mop
+     command-line-arguments db3 drakma dynamic-classes esrap flexi-streams
+     garbage-pools ieee-floats ironclad iterate ixf list-of local-time
+     lparallel md5 metabang-bind metatilities-base mssql nibbles parse-number
+     postmodern puri py-configparser qmynd quri s-sql simple-date
+     split-sequence sqlite trivial-backtrace trivial-features
+     trivial-gray-streams trivial-utf-8 uiop usocket uuid)
+    VERSION v3.4.1 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
new file mode 100644
index 00000000000..38fb942c331
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''plump-dom'';
+  version = ''plump-20170725-git'';
+
+  description = ''A DOM for use with the Plump parser.'';
+
+  deps = [ args."array-utils" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz'';
+    sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72'';
+  };
+
+  packageName = "plump-dom";
+
+  asdFilesToKeep = ["plump-dom.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM plump-dom DESCRIPTION A DOM for use with the Plump parser. SHA256
+    118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL
+    http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz
+    MD5 e5e92dd177711a14753ee86961710458 NAME plump-dom FILENAME plump-dom DEPS
+    ((NAME array-utils FILENAME array-utils)) DEPENDENCIES (array-utils)
+    VERSION plump-20170725-git SIBLINGS (plump-lexer plump-parser plump)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
new file mode 100644
index 00000000000..5edceaf4ad9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''plump-lexer'';
+  version = ''plump-20170725-git'';
+
+  description = ''A very simple toolkit to help with lexing used mainly in Plump.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz'';
+    sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72'';
+  };
+
+  packageName = "plump-lexer";
+
+  asdFilesToKeep = ["plump-lexer.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM plump-lexer DESCRIPTION
+    A very simple toolkit to help with lexing used mainly in Plump. SHA256
+    118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL
+    http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz
+    MD5 e5e92dd177711a14753ee86961710458 NAME plump-lexer FILENAME plump-lexer
+    DEPS NIL DEPENDENCIES NIL VERSION plump-20170725-git SIBLINGS
+    (plump-dom plump-parser plump) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
new file mode 100644
index 00000000000..a9d07b48a9d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''plump-parser'';
+  version = ''plump-20170725-git'';
+
+  description = ''Plump's core parser component.'';
+
+  deps = [ args."array-utils" args."plump-dom" args."plump-lexer" args."trivial-indent" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz'';
+    sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72'';
+  };
+
+  packageName = "plump-parser";
+
+  asdFilesToKeep = ["plump-parser.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM plump-parser DESCRIPTION Plump's core parser component. SHA256
+    118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL
+    http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz
+    MD5 e5e92dd177711a14753ee86961710458 NAME plump-parser FILENAME
+    plump-parser DEPS
+    ((NAME array-utils FILENAME array-utils)
+     (NAME plump-dom FILENAME plump-dom)
+     (NAME plump-lexer FILENAME plump-lexer)
+     (NAME trivial-indent FILENAME trivial-indent))
+    DEPENDENCIES (array-utils plump-dom plump-lexer trivial-indent) VERSION
+    plump-20170725-git SIBLINGS (plump-dom plump-lexer plump) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index e25b89b2cf4..763677c677c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -5,31 +5,28 @@ rec {
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
-  deps = [ ];
+  deps = [ args."array-utils" args."plump-dom" args."plump-lexer" args."plump-parser" args."trivial-indent" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz'';
     sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72'';
   };
-    
+
   packageName = "plump";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/plump[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["plump.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72
-    URL http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz MD5 e5e92dd177711a14753ee86961710458 NAME plump TESTNAME NIL FILENAME plump
-    DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
+/* (SYSTEM plump DESCRIPTION
+    An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256
+    118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL
+    http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz
+    MD5 e5e92dd177711a14753ee86961710458 NAME plump FILENAME plump DEPS
+    ((NAME array-utils FILENAME array-utils)
+     (NAME plump-dom FILENAME plump-dom)
+     (NAME plump-lexer FILENAME plump-lexer)
+     (NAME plump-parser FILENAME plump-parser)
+     (NAME trivial-indent FILENAME trivial-indent))
+    DEPENDENCIES
+    (array-utils plump-dom plump-lexer plump-parser trivial-indent) VERSION
+    20170725-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
index 18dc40ff51a..bbc0ad6b15b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -3,34 +3,37 @@ rec {
   baseName = ''postmodern'';
   version = ''20170403-git'';
 
+  parasites = [ "postmodern-tests" ];
+
   description = ''PostgreSQL programming API'';
 
-  deps = [ args."closer-mop" args."bordeaux-threads" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres-tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."simple-date" args."simple-date-postgres-glue" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
     sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
   };
-    
+
   packageName = "postmodern";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/postmodern[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["postmodern.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
-    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME postmodern TESTNAME NIL
-    FILENAME postmodern DEPS ((NAME closer-mop FILENAME closer-mop) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES
-    (closer-mop bordeaux-threads) VERSION 20170403-git SIBLINGS (cl-postgres s-sql simple-date)) */
+/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256
+    1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz
+    MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME postmodern FILENAME postmodern
+    DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-postgres FILENAME cl-postgres)
+     (NAME cl-postgres-tests FILENAME cl-postgres-tests)
+     (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam)
+     (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql)
+     (NAME simple-date FILENAME simple-date)
+     (NAME simple-date-postgres-glue FILENAME simple-date-postgres-glue))
+    DEPENDENCIES
+    (alexandria bordeaux-threads cl-postgres cl-postgres-tests closer-mop
+     fiveam md5 s-sql simple-date simple-date-postgres-glue)
+    VERSION 20170403-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES
+    (postmodern-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 142d24f5e48..8ffcbc784ff 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -5,32 +5,24 @@ rec {
 
   description = ''Procedural vector parser'';
 
-  deps = [ args."babel" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz'';
     sha256 = ''00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl'';
   };
-    
+
   packageName = "proc-parse";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/proc-parse[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["proc-parse.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256 00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl URL
-    http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz MD5 5e43f50284fa70c448a3df12d1eea2ea NAME proc-parse TESTNAME NIL
-    FILENAME proc-parse DEPS ((NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS
-    (proc-parse-test)) */
+/* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256
+    00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl URL
+    http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz
+    MD5 5e43f50284fa70c448a3df12d1eea2ea NAME proc-parse FILENAME proc-parse
+    DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria babel trivial-features) VERSION 20160318-git
+    SIBLINGS (proc-parse-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index ae823959fdc..7815efa4ecd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -5,33 +5,26 @@ rec {
 
   description = '''';
 
-  deps = [ args."uiop" args."cl-ppcre" args."cl-colors" args."cl-ansi-text" args."alexandria" ];
+  deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
     sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
-    
+
   packageName = "prove";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/prove[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["prove.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM prove DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
-    http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME prove TESTNAME NIL FILENAME prove DEPS
-    ((NAME uiop FILENAME uiop) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-colors FILENAME cl-colors) (NAME cl-ansi-text FILENAME cl-ansi-text)
-     (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
+/* (SYSTEM prove DESCRIPTION NIL SHA256
+    091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
+    http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz
+    MD5 063b615692c8711d2392204ecf1b37b7 NAME prove FILENAME prove DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+     (NAME cl-ansi-text FILENAME cl-ansi-text)
+     (NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME let-plus FILENAME let-plus) (NAME uiop FILENAME uiop))
+    DEPENDENCIES
+    (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus uiop) VERSION
+    20170403-git SIBLINGS (cl-test-more prove-asdf prove-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
new file mode 100644
index 00000000000..ffa2e595c26
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''ptester'';
+  version = ''20160929-git'';
+
+  description = ''Portable test harness package'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz'';
+    sha256 = ''04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz'';
+  };
+
+  packageName = "ptester";
+
+  asdFilesToKeep = ["ptester.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM ptester DESCRIPTION Portable test harness package SHA256
+    04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz URL
+    http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz
+    MD5 938a4366b6608ae5c4a0be9da11a61d4 NAME ptester FILENAME ptester DEPS NIL
+    DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index 9a7e24cebdc..e0e6bdc0f17 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -3,33 +3,25 @@ rec {
   baseName = ''puri'';
   version = ''20150923-git'';
 
+  parasites = [ "puri-tests" ];
+
   description = ''Portable Universal Resource Indentifier Library'';
 
-  deps = [ ];
+  deps = [ args."ptester" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz'';
     sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa'';
   };
-    
+
   packageName = "puri";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/puri[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["puri.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM puri DESCRIPTION Portable Universal Resource Indentifier Library SHA256 099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa URL
-    http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz MD5 3bd4e30aa6b6baf6f26753b5fc357e0f NAME puri TESTNAME NIL FILENAME puri DEPS NIL
-    DEPENDENCIES NIL VERSION 20150923-git SIBLINGS NIL) */
+/* (SYSTEM puri DESCRIPTION Portable Universal Resource Indentifier Library
+    SHA256 099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa URL
+    http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz MD5
+    3bd4e30aa6b6baf6f26753b5fc357e0f NAME puri FILENAME puri DEPS
+    ((NAME ptester FILENAME ptester)) DEPENDENCIES (ptester) VERSION
+    20150923-git SIBLINGS NIL PARASITES (puri-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
index 96d09bc7dc3..3b3d90d1a1e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz'';
     sha256 = ''08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr'';
   };
-    
+
   packageName = "py-configparser";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/py-configparser[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["py-configparser.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr
-    URL http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz MD5 3486092bb1d56be05dab16036f288a74 NAME py-configparser
-    TESTNAME NIL FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) DEPENDENCIES (parse-number) VERSION 20170725-svn SIBLINGS NIL) */
+/* (SYSTEM py-configparser DESCRIPTION
+    Common Lisp implementation of the Python ConfigParser module SHA256
+    08wfjlyhjqn54p3k0kv7ijsf72rsn4abdjnhd2bfkapr2a4jz6zr URL
+    http://beta.quicklisp.org/archive/py-configparser/2017-07-25/py-configparser-20170725-svn.tgz
+    MD5 3486092bb1d56be05dab16036f288a74 NAME py-configparser FILENAME
+    py-configparser DEPS ((NAME parse-number FILENAME parse-number))
+    DEPENDENCIES (parse-number) VERSION 20170725-svn SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
index b57bb0d1623..d6d853413c2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
@@ -5,33 +5,26 @@ rec {
 
   description = ''MySQL Native Driver'';
 
-  deps = [ args."usocket" args."trivial-gray-streams" args."list-of" args."ironclad" args."flexi-streams" args."babel" ];
+  deps = [ args."babel" args."flexi-streams" args."ironclad" args."list-of" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz'';
     sha256 = ''01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi'';
   };
-    
+
   packageName = "qmynd";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/qmynd[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["qmynd.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi URL
-    http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz MD5 64776472d1e0c4c0e41a1b4a2a24167e NAME qmynd TESTNAME NIL FILENAME qmynd DEPS
-    ((NAME usocket FILENAME usocket) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME list-of FILENAME list-of)
-     (NAME ironclad FILENAME ironclad) (NAME flexi-streams FILENAME flexi-streams) (NAME babel FILENAME babel))
-    DEPENDENCIES (usocket trivial-gray-streams list-of ironclad flexi-streams babel) VERSION 20170630-git SIBLINGS (qmynd-test)) */
+/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256
+    01rg2rm4n19f5g39z2gdjcfy68z7ir51r44524vzzs0x9na9y6bi URL
+    http://beta.quicklisp.org/archive/qmynd/2017-06-30/qmynd-20170630-git.tgz
+    MD5 64776472d1e0c4c0e41a1b4a2a24167e NAME qmynd FILENAME qmynd DEPS
+    ((NAME babel FILENAME babel) (NAME flexi-streams FILENAME flexi-streams)
+     (NAME ironclad FILENAME ironclad) (NAME list-of FILENAME list-of)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME usocket FILENAME usocket))
+    DEPENDENCIES
+    (babel flexi-streams ironclad list-of trivial-gray-streams usocket) VERSION
+    20170630-git SIBLINGS (qmynd-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 1cfd62686c4..45300754647 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -5,35 +5,38 @@ rec {
 
   description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries'';
 
-  deps = [ args."bordeaux-threads" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."command-line-arguments" args."iterate" args."trivial-backtrace" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz'';
     sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a'';
   };
-    
+
   packageName = "query-fs";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/query-fs[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["query-fs.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries SHA256
-    0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz MD5
-    dfbb3d0e7b5d990488a17b184771d049 NAME query-fs TESTNAME NIL FILENAME query-fs DEPS
-    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME iterate FILENAME iterate)
-     (NAME trivial-backtrace FILENAME trivial-backtrace))
-    DEPENDENCIES (bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace) VERSION 20160531-git SIBLINGS NIL) */
+/* (SYSTEM query-fs DESCRIPTION
+    High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries
+    SHA256 0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL
+    http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz
+    MD5 dfbb3d0e7b5d990488a17b184771d049 NAME query-fs FILENAME query-fs DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-fuse FILENAME cl-fuse)
+     (NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-utilities FILENAME cl-utilities)
+     (NAME command-line-arguments FILENAME command-line-arguments)
+     (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall)
+     (NAME pcall-queue FILENAME pcall-queue)
+     (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-utf-8 FILENAME trivial-utf-8))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi cffi-grovel cl-fuse cl-fuse-meta-fs
+     cl-ppcre cl-utilities command-line-arguments iterate pcall pcall-queue
+     trivial-backtrace trivial-features trivial-utf-8)
+    VERSION 20160531-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 26fab0612e9..75eade4d317 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -5,32 +5,26 @@ rec {
 
   description = ''Yet another URI library for Common Lisp'';
 
-  deps = [ args."split-sequence" args."cl-utilities" args."babel" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz'';
     sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv'';
   };
-    
+
   packageName = "quri";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/quri[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["quri.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL
-    http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5 8c87e99d4f7308d83aab361a6e36508a NAME quri TESTNAME NIL FILENAME quri DEPS
-    ((NAME split-sequence FILENAME split-sequence) (NAME cl-utilities FILENAME cl-utilities) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
-    DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git SIBLINGS (quri-test)) */
+/* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256
+    14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL
+    http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5
+    8c87e99d4f7308d83aab361a6e36508a NAME quri FILENAME quri DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-utilities FILENAME cl-utilities)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES
+    (alexandria babel cl-utilities split-sequence trivial-features) VERSION
+    20161204-git SIBLINGS (quri-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index e74c2c51b79..be2897d19a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
     sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
   };
-    
+
   packageName = "rfc2388";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/rfc2388[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["rfc2388.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256 1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6 URL
-    http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz MD5 10a8bfea588196b1147d5dc7bf759bb1 NAME rfc2388 TESTNAME NIL FILENAME
-    rfc2388 DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS NIL) */
+/* (SYSTEM rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256
+    1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6 URL
+    http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz
+    MD5 10a8bfea588196b1147d5dc7bf759bb1 NAME rfc2388 FILENAME rfc2388 DEPS NIL
+    DEPENDENCIES NIL VERSION 20130720-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
new file mode 100644
index 00000000000..d5be4be7daf
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''rt'';
+  version = ''20101006-git'';
+
+  description = ''MIT Regression Tester'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz'';
+    sha256 = ''1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v'';
+  };
+
+  packageName = "rt";
+
+  asdFilesToKeep = ["rt.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM rt DESCRIPTION MIT Regression Tester SHA256
+    1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v URL
+    http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz MD5
+    94a56c473399572ca835ac91c77c04e5 NAME rt FILENAME rt DEPS NIL DEPENDENCIES
+    NIL VERSION 20101006-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
new file mode 100644
index 00000000000..f75e890760e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''s-sql'';
+  version = ''postmodern-20170403-git'';
+
+  description = '''';
+
+  deps = [ args."cl-postgres" args."md5" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
+    sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
+  };
+
+  packageName = "s-sql";
+
+  asdFilesToKeep = ["s-sql.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM s-sql DESCRIPTION NIL SHA256
+    1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz
+    MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME s-sql FILENAME s-sql DEPS
+    ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5))
+    DEPENDENCIES (cl-postgres md5) VERSION postmodern-20170403-git SIBLINGS
+    (cl-postgres postmodern simple-date) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 9654a86b74b..9056cfbdcca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -12,26 +12,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz'';
     sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va'';
   };
-    
+
   packageName = "salza2";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/salza2[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["salza2.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM salza2 DESCRIPTION Create compressed data in the ZLIB, DEFLATE, or GZIP
+/* (SYSTEM salza2 DESCRIPTION
+    Create compressed data in the ZLIB, DEFLATE, or GZIP
   data formats
-    SHA256 1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va URL http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz MD5
-    e62383de435081c0f1f888ec363bb32c NAME salza2 TESTNAME NIL FILENAME salza2 DEPS NIL DEPENDENCIES NIL VERSION 2.0.9 SIBLINGS NIL) */
+    SHA256 1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va URL
+    http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz MD5
+    e62383de435081c0f1f888ec363bb32c NAME salza2 FILENAME salza2 DEPS NIL
+    DEPENDENCIES NIL VERSION 2.0.9 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 00e2b3dbd0f..31e70992a4c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -3,33 +3,29 @@ rec {
   baseName = ''simple-date'';
   version = ''postmodern-20170403-git'';
 
+  parasites = [ "simple-date-postgres-glue" "simple-date-tests" ];
+
   description = '''';
 
-  deps = [ ];
+  deps = [ args."cl-postgres" args."fiveam" args."md5" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
     sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
   };
-    
+
   packageName = "simple-date";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/simple-date[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["simple-date.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM simple-date DESCRIPTION NIL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
-    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME simple-date TESTNAME NIL
-    FILENAME simple-date DEPS NIL DEPENDENCIES NIL VERSION postmodern-20170403-git SIBLINGS (cl-postgres postmodern s-sql)) */
+/* (SYSTEM simple-date DESCRIPTION NIL SHA256
+    1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz
+    MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME simple-date FILENAME simple-date
+    DEPS
+    ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam)
+     (NAME md5 FILENAME md5))
+    DEPENDENCIES (cl-postgres fiveam md5) VERSION postmodern-20170403-git
+    SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+    (simple-date-postgres-glue simple-date-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 9a04f3c64db..63adab55741 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -5,32 +5,25 @@ rec {
 
   description = ''Smart octets buffer'';
 
-  deps = [ args."xsubseq" args."uiop" args."flexi-streams" ];
+  deps = [ args."flexi-streams" args."trivial-gray-streams" args."uiop" args."xsubseq" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz'';
     sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s'';
   };
-    
+
   packageName = "smart-buffer";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/smart-buffer[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["smart-buffer.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256 1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s URL
-    http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz MD5 454d8510618da8111c7ca687549b7035 NAME smart-buffer TESTNAME NIL
-    FILENAME smart-buffer DEPS ((NAME xsubseq FILENAME xsubseq) (NAME uiop FILENAME uiop) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES
-    (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS (smart-buffer-test)) */
+/* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256
+    1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s URL
+    http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz
+    MD5 454d8510618da8111c7ca687549b7035 NAME smart-buffer FILENAME
+    smart-buffer DEPS
+    ((NAME flexi-streams FILENAME flexi-streams)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME uiop FILENAME uiop) (NAME xsubseq FILENAME xsubseq))
+    DEPENDENCIES (flexi-streams trivial-gray-streams uiop xsubseq) VERSION
+    20160628-git SIBLINGS (smart-buffer-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index 03331578764..e9d1fc5f305 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -3,35 +3,28 @@ rec {
   baseName = ''split-sequence'';
   version = ''1.2'';
 
+  parasites = [ "split-sequence-tests" ];
+
   description = ''Splits a sequence into a list of subsequences
   delimited by objects satisfying a test.'';
 
-  deps = [ ];
+  deps = [ args."fiveam" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz'';
     sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l'';
   };
-    
+
   packageName = "split-sequence";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/split-sequence[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["split-sequence.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM split-sequence DESCRIPTION Splits a sequence into a list of subsequences
+/* (SYSTEM split-sequence DESCRIPTION
+    Splits a sequence into a list of subsequences
   delimited by objects satisfying a test.
-    SHA256 12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l URL http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz MD5
-    194e24d60f0fba70a059633960052e21 NAME split-sequence TESTNAME NIL FILENAME split-sequence DEPS NIL DEPENDENCIES NIL VERSION 1.2 SIBLINGS NIL) */
+    SHA256 12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l URL
+    http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz
+    MD5 194e24d60f0fba70a059633960052e21 NAME split-sequence FILENAME
+    split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam)
+    VERSION 1.2 SIBLINGS NIL PARASITES (split-sequence-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 73144329206..991791b57d0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -5,31 +5,24 @@ rec {
 
   description = '''';
 
-  deps = [ args."cffi" args."iterate" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz'';
     sha256 = ''0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh'';
   };
-    
+
   packageName = "sqlite";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/sqlite[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["sqlite.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM sqlite DESCRIPTION NIL SHA256 0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL
-    http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite TESTNAME NIL FILENAME
-    sqlite DEPS ((NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */
+/* (SYSTEM sqlite DESCRIPTION NIL SHA256
+    0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL
+    http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz
+    MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite FILENAME sqlite DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria babel cffi iterate trivial-features) VERSION
+    cl-20130615-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index e06fe790f76..e18c0c325f1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -3,34 +3,31 @@ rec {
   baseName = ''static-vectors'';
   version = ''v1.8.2'';
 
+  parasites = [ "static-vectors/test" ];
+
   description = ''Create vectors allocated in static memory.'';
 
-  deps = [ args."alexandria" args."cffi" args."cffi-grovel" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz'';
     sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g'';
   };
-    
+
   packageName = "static-vectors";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/static-vectors[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["static-vectors.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL
-    http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors TESTNAME NIL
-    FILENAME static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES
-    (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */
+/* (SYSTEM static-vectors DESCRIPTION
+    Create vectors allocated in static memory. SHA256
+    0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL
+    http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz
+    MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors FILENAME
+    static-vectors DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME fiveam FILENAME fiveam)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria babel cffi cffi-grovel fiveam trivial-features)
+    VERSION v1.8.2 SIBLINGS NIL PARASITES (static-vectors/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 952b8686dab..c7f845a4cf4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -11,26 +11,17 @@ rec {
     url = ''http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz'';
     sha256 = ''1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5'';
   };
-    
+
   packageName = "stumpwm";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/stumpwm[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["stumpwm.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5 URL
-    http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz MD5 a7fb260c6572273c05b828299c0610ce NAME stumpwm TESTNAME NIL FILENAME
-    stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) DEPENDENCIES (alexandria cl-ppcre clx)
-    VERSION 20170725-git SIBLINGS NIL) */
+/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
+    1hb01zlm4rk2n9b8lfpiary94pmg6qkw84zg54ws1if7z1yd2ss5 URL
+    http://beta.quicklisp.org/archive/stumpwm/2017-07-25/stumpwm-20170725-git.tgz
+    MD5 a7fb260c6572273c05b828299c0610ce NAME stumpwm FILENAME stumpwm DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME clx FILENAME clx))
+    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170725-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
new file mode 100644
index 00000000000..21fcaddf535
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''swank'';
+  version = ''slime-v2.19'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/slime/2017-02-27/slime-v2.19.tgz'';
+    sha256 = ''1w3xq4kiy06wbmk2sf30saqgy1qa9v2llbi6bqy7hrm956yh6dza'';
+  };
+
+  packageName = "swank";
+
+  asdFilesToKeep = ["swank.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM swank DESCRIPTION NIL SHA256
+    1w3xq4kiy06wbmk2sf30saqgy1qa9v2llbi6bqy7hrm956yh6dza URL
+    http://beta.quicklisp.org/archive/slime/2017-02-27/slime-v2.19.tgz MD5
+    7e1540ebb970db0f77b6e6cabb36ba41 NAME swank FILENAME swank DEPS NIL
+    DEPENDENCIES NIL VERSION slime-v2.19 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index 45d7a7800d5..f0df3b84f15 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -3,33 +3,28 @@ rec {
   baseName = ''swap-bytes'';
   version = ''v1.1'';
 
+  parasites = [ "swap-bytes/test" ];
+
   description = ''Optimized byte-swapping primitives.'';
 
-  deps = [ args."trivial-features" ];
+  deps = [ args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz'';
     sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky'';
   };
-    
+
   packageName = "swap-bytes";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/swap-bytes[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["swap-bytes.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256 0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky URL
-    http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz MD5 dda8b3b0a4e345879e80a3cc398667bb NAME swap-bytes TESTNAME NIL FILENAME
-    swap-bytes DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */
+/* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256
+    0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky URL
+    http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz
+    MD5 dda8b3b0a4e345879e80a3cc398667bb NAME swap-bytes FILENAME swap-bytes
+    DEPS
+    ((NAME fiveam FILENAME fiveam)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (fiveam trivial-features) VERSION v1.1 SIBLINGS NIL PARASITES
+    (swap-bytes/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
new file mode 100644
index 00000000000..4bae3cc1cee
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''symbol-munger'';
+  version = ''20150407-git'';
+
+  description = ''Functions to convert between the spacing and
+  capitalization conventions of various environments'';
+
+  deps = [ args."alexandria" args."iterate" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz'';
+    sha256 = ''0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6'';
+  };
+
+  packageName = "symbol-munger";
+
+  asdFilesToKeep = ["symbol-munger.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM symbol-munger DESCRIPTION
+    Functions to convert between the spacing and
+  capitalization conventions of various environments
+    SHA256 0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6 URL
+    http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz
+    MD5 b1e35b63d7ad1451868d1c40e2fbfab7 NAME symbol-munger FILENAME
+    symbol-munger DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate))
+    DEPENDENCIES (alexandria iterate) VERSION 20150407-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 0ed2e288760..9a4afce3280 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz'';
     sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx'';
   };
-    
+
   packageName = "trivial-backtrace";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-backtrace[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["trivial-backtrace.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256 1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx URL
-    http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz MD5 a3b41b4ae24e3fde303a2623201aac4d NAME
-    trivial-backtrace TESTNAME NIL FILENAME trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS (trivial-backtrace-test)) */
+/* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256
+    1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx URL
+    http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz
+    MD5 a3b41b4ae24e3fde303a2623201aac4d NAME trivial-backtrace FILENAME
+    trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS
+    (trivial-backtrace-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index ea531d722d4..1a562c2288b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz'';
     sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2'';
   };
-    
+
   packageName = "trivial-features";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-features[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["trivial-features.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM trivial-features DESCRIPTION Ensures consistent *FEATURES* across multiple CLs. SHA256 0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2 URL
-    http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz MD5 07497e3fd92e68027a96f877cfe62bd4 NAME trivial-features
-    TESTNAME NIL FILENAME trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS (trivial-features-tests)) */
+/* (SYSTEM trivial-features DESCRIPTION
+    Ensures consistent *FEATURES* across multiple CLs. SHA256
+    0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2 URL
+    http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz
+    MD5 07497e3fd92e68027a96f877cfe62bd4 NAME trivial-features FILENAME
+    trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS
+    (trivial-features-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 43bcd571304..7c3a01f5d11 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -3,33 +3,26 @@ rec {
   baseName = ''trivial-garbage'';
   version = ''20150113-git'';
 
+  parasites = [ "trivial-garbage-tests" ];
+
   description = ''Portable finalizers, weak hash-tables and weak pointers.'';
 
-  deps = [ ];
+  deps = [ args."rt" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz'';
     sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08'';
   };
-    
+
   packageName = "trivial-garbage";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-garbage[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["trivial-garbage.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM trivial-garbage DESCRIPTION Portable finalizers, weak hash-tables and weak pointers. SHA256 1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08 URL
-    http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz MD5 59153568703eed631e53092ab67f935e NAME trivial-garbage
-    TESTNAME NIL FILENAME trivial-garbage DEPS NIL DEPENDENCIES NIL VERSION 20150113-git SIBLINGS NIL) */
+/* (SYSTEM trivial-garbage DESCRIPTION
+    Portable finalizers, weak hash-tables and weak pointers. SHA256
+    1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08 URL
+    http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz
+    MD5 59153568703eed631e53092ab67f935e NAME trivial-garbage FILENAME
+    trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION
+    20150113-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 22011917022..53d6be525f6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -11,26 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz'';
     sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92'';
   };
-    
+
   packageName = "trivial-gray-streams";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-gray-streams[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["trivial-gray-streams.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM trivial-gray-streams DESCRIPTION Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams). SHA256
-    1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92 URL
-    http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz MD5 1ca280830c8c438ca2ccfadb3763ae83 NAME
-    trivial-gray-streams TESTNAME NIL FILENAME trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20140826-git SIBLINGS (trivial-gray-streams-test)) */
+/* (SYSTEM trivial-gray-streams DESCRIPTION
+    Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).
+    SHA256 1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92 URL
+    http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz
+    MD5 1ca280830c8c438ca2ccfadb3763ae83 NAME trivial-gray-streams FILENAME
+    trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20140826-git
+    SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index ea9b21d6eac..c0964c9731d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz'';
     sha256 = ''18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7'';
   };
-    
+
   packageName = "trivial-indent";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-indent[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["trivial-indent.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7
-    URL http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz MD5 9f11cc1014be3e3ae588a3cd07315be6 NAME trivial-indent
-    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */
+/* (SYSTEM trivial-indent DESCRIPTION
+    A very simple library to allow indentation hints for SWANK. SHA256
+    18zag7n2yfjx3x6nm8132cq8lz321i3f3zslb90j198wvpwyrnq7 URL
+    http://beta.quicklisp.org/archive/trivial-indent/2017-06-30/trivial-indent-20170630-git.tgz
+    MD5 9f11cc1014be3e3ae588a3cd07315be6 NAME trivial-indent FILENAME
+    trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index f31e1bb0a3d..080f854db43 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz'';
     sha256 = ''0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx'';
   };
-    
+
   packageName = "trivial-mimes";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-mimes[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["trivial-mimes.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx URL
-    http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz MD5 5aecea17e102bd2dab7e71fecd1f8e44 NAME trivial-mimes TESTNAME
-    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL) */
+/* (SYSTEM trivial-mimes DESCRIPTION
+    Tiny library to detect mime types in files. SHA256
+    0rm667w7nfkcrfjqbb7blbdcrjxbr397a6nqmy35qq82fqjr4rvx URL
+    http://beta.quicklisp.org/archive/trivial-mimes/2017-06-30/trivial-mimes-20170630-git.tgz
+    MD5 5aecea17e102bd2dab7e71fecd1f8e44 NAME trivial-mimes FILENAME
+    trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 8aed5e9681c..8cc04c2c64a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz'';
     sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx'';
   };
-    
+
   packageName = "trivial-types";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-types[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["trivial-types.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM trivial-types DESCRIPTION Trivial type definitions SHA256 0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx URL
-    http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz MD5 b14dbe0564dcea33d8f4e852a612d7db NAME trivial-types TESTNAME
-    NIL FILENAME trivial-types DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL) */
+/* (SYSTEM trivial-types DESCRIPTION Trivial type definitions SHA256
+    0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx URL
+    http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz
+    MD5 b14dbe0564dcea33d8f4e852a612d7db NAME trivial-types FILENAME
+    trivial-types DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index efbdca21465..c925382d81d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''trivial-utf-8'';
   version = ''20111001-darcs'';
 
+  parasites = [ "trivial-utf-8-tests" ];
+
   description = '''';
 
   deps = [ ];
@@ -11,25 +13,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz'';
     sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb'';
   };
-    
+
   packageName = "trivial-utf-8";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-utf-8[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["trivial-utf-8.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM trivial-utf-8 DESCRIPTION NIL SHA256 1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL
-    http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8
-    TESTNAME NIL FILENAME trivial-utf-8 DEPS NIL DEPENDENCIES NIL VERSION 20111001-darcs SIBLINGS NIL) */
+/* (SYSTEM trivial-utf-8 DESCRIPTION NIL SHA256
+    1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL
+    http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz
+    MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8 FILENAME
+    trivial-utf-8 DEPS NIL DEPENDENCIES NIL VERSION 20111001-darcs SIBLINGS NIL
+    PARASITES (trivial-utf-8-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 67897d46958..3e8d4155ce3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz'';
     sha256 = ''1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf'';
   };
-    
+
   packageName = "uffi";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uffi[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["uffi.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp SHA256 1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf URL
-    http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz MD5 8ac448122b79a41ec2b0647f06af7c12 NAME uffi TESTNAME NIL FILENAME uffi DEPS NIL
-    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (uffi-tests)) */
+/* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp
+    SHA256 1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf URL
+    http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz MD5
+    8ac448122b79a41ec2b0647f06af7c12 NAME uffi FILENAME uffi DEPS NIL
+    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (uffi-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 5f3bd02f90a..998681d02ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz'';
     sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v'';
   };
-    
+
   packageName = "uiop";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uiop[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["uiop.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM uiop DESCRIPTION NIL SHA256 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL
-    http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz MD5 3e9ef02ecf9005240b66552d85719700 NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
-    DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver)) */
+/* (SYSTEM uiop DESCRIPTION NIL SHA256
+    1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL
+    http://beta.quicklisp.org/archive/uiop/2017-06-30/uiop-3.2.1.tgz MD5
+    3e9ef02ecf9005240b66552d85719700 NAME uiop FILENAME uiop DEPS NIL
+    DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
new file mode 100644
index 00000000000..6c456496732
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''unit-test'';
+  version = ''20120520-git'';
+
+  description = ''unit-testing framework for common lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz'';
+    sha256 = ''1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l'';
+  };
+
+  packageName = "unit-test";
+
+  asdFilesToKeep = ["unit-test.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM unit-test DESCRIPTION unit-testing framework for common lisp SHA256
+    1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l URL
+    http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz
+    MD5 ffcde1c03dd33862cd4f7288649c3cbc NAME unit-test FILENAME unit-test DEPS
+    NIL DEPENDENCIES NIL VERSION 20120520-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index c071b2f3bbd..b4b4f4543a1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -11,25 +11,16 @@ rec {
     url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
     sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
   };
-    
+
   packageName = "usocket";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/usocket[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["usocket.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL
-    http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket TESTNAME NIL FILENAME usocket
-    DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */
+/* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256
+    1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL
+    http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz
+    MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket FILENAME usocket DEPS
+    ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES
+    (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
index 1f415f7142a..0886b1082a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
@@ -5,31 +5,23 @@ rec {
 
   description = ''UUID Generation'';
 
-  deps = [ args."ironclad" args."trivial-utf-8" ];
+  deps = [ args."ironclad" args."nibbles" args."trivial-utf-8" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz'';
     sha256 = ''1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf'';
   };
-    
+
   packageName = "uuid";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uuid[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["uuid.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM uuid DESCRIPTION UUID Generation SHA256 1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf URL
-    http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz MD5 e9029d9437573ec2ffa2b474adf95daf NAME uuid TESTNAME NIL FILENAME uuid DEPS
-    ((NAME ironclad FILENAME ironclad) (NAME trivial-utf-8 FILENAME trivial-utf-8)) DEPENDENCIES (ironclad trivial-utf-8) VERSION 20130813-git SIBLINGS NIL) */
+/* (SYSTEM uuid DESCRIPTION UUID Generation SHA256
+    1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf URL
+    http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz MD5
+    e9029d9437573ec2ffa2b474adf95daf NAME uuid FILENAME uuid DEPS
+    ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)
+     (NAME trivial-utf-8 FILENAME trivial-utf-8))
+    DEPENDENCIES (ironclad nibbles trivial-utf-8) VERSION 20130813-git SIBLINGS
+    NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 7be98029ca2..6a4751f799e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz'';
     sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93'';
   };
-    
+
   packageName = "vom";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/vom[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["vom.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM vom DESCRIPTION A tiny logging utility. SHA256 0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93 URL
-    http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz MD5 ad16bdc0221b08de371be6ce25ce3d47 NAME vom TESTNAME NIL FILENAME vom DEPS NIL
-    DEPENDENCIES NIL VERSION 20160825-git SIBLINGS NIL) */
+/* (SYSTEM vom DESCRIPTION A tiny logging utility. SHA256
+    0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93 URL
+    http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz MD5
+    ad16bdc0221b08de371be6ce25ce3d47 NAME vom FILENAME vom DEPS NIL
+    DEPENDENCIES NIL VERSION 20160825-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index c04540aaaba..7e7e9b6acad 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -5,37 +5,41 @@ rec {
 
   description = ''An asynchronous HTTP server written in Common Lisp'';
 
-  deps = [ args."vom" args."uiop" args."trivial-utf-8" args."swap-bytes" args."static-vectors" args."smart-buffer" args."quri" args."lev" args."fast-io" args."fast-http" args."clack-socket" args."cffi-grovel" args."cffi" args."bordeaux-threads" args."alexandria" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz'';
     sha256 = ''11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg'';
   };
-    
+
   packageName = "woo";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/woo[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["woo.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp SHA256 11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg URL
-    http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz MD5 bd901d8dfa7df3d19c6da73ea101f65b NAME woo TESTNAME NIL FILENAME woo DEPS
-    ((NAME vom FILENAME vom) (NAME uiop FILENAME uiop) (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME swap-bytes FILENAME swap-bytes)
-     (NAME static-vectors FILENAME static-vectors) (NAME smart-buffer FILENAME smart-buffer) (NAME quri FILENAME quri) (NAME lev FILENAME lev)
-     (NAME fast-io FILENAME fast-io) (NAME fast-http FILENAME fast-http) (NAME clack-socket FILENAME clack-socket) (NAME cffi-grovel FILENAME cffi-grovel)
-     (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria))
+/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp
+    SHA256 11cnqd058mjhkgxppsivbmd687429r4b62v7z5iav0wpha78qfgg URL
+    http://beta.quicklisp.org/archive/woo/2017-07-25/woo-20170725-git.tgz MD5
+    bd901d8dfa7df3d19c6da73ea101f65b NAME woo FILENAME woo DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-utilities FILENAME cl-utilities)
+     (NAME clack-socket FILENAME clack-socket)
+     (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
+     (NAME flexi-streams FILENAME flexi-streams) (NAME lev FILENAME lev)
+     (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri)
+     (NAME smart-buffer FILENAME smart-buffer)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME swap-bytes FILENAME swap-bytes)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop)
+     (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (vom uiop trivial-utf-8 swap-bytes static-vectors smart-buffer quri lev fast-io fast-http clack-socket cffi-grovel cffi bordeaux-threads alexandria)
-    VERSION 20170725-git SIBLINGS (clack-handler-woo woo-test)) */
+    (alexandria babel bordeaux-threads cffi cffi-grovel cl-utilities
+     clack-socket fast-http fast-io flexi-streams lev proc-parse quri
+     smart-buffer split-sequence static-vectors swap-bytes trivial-features
+     trivial-gray-streams trivial-utf-8 uiop vom xsubseq)
+    VERSION 20170725-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 3b78ba6f79e..a64ff45a187 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -11,31 +11,25 @@ rec {
     url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz'';
     sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0'';
   };
-    
+
   packageName = "wookie";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/wookie[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["wookie.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0 URL
-    http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz MD5 aeb084106facdc9c8dab100c97e05b92 NAME wookie TESTNAME NIL FILENAME wookie
-    DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME blackbird FILENAME blackbird) (NAME chunga FILENAME chunga)
-     (NAME cl-async FILENAME cl-async) (NAME cl-async-ssl FILENAME cl-async-ssl) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
-     (NAME do-urlencode FILENAME do-urlencode) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME quri FILENAME quri)
-     (NAME vom FILENAME vom))
-    DEPENDENCIES (alexandria babel blackbird chunga cl-async cl-async-ssl cl-fad cl-ppcre do-urlencode fast-http fast-io quri vom) VERSION 20170227-git
-    SIBLINGS NIL) */
+/* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256
+    0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0 URL
+    http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz
+    MD5 aeb084106facdc9c8dab100c97e05b92 NAME wookie FILENAME wookie DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME blackbird FILENAME blackbird) (NAME chunga FILENAME chunga)
+     (NAME cl-async FILENAME cl-async)
+     (NAME cl-async-ssl FILENAME cl-async-ssl) (NAME cl-fad FILENAME cl-fad)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME do-urlencode FILENAME do-urlencode)
+     (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
+     (NAME quri FILENAME quri) (NAME vom FILENAME vom))
+    DEPENDENCIES
+    (alexandria babel blackbird chunga cl-async cl-async-ssl cl-fad cl-ppcre
+     do-urlencode fast-http fast-io quri vom)
+    VERSION 20170227-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
new file mode 100644
index 00000000000..4bfc0678f0f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''xkeyboard'';
+  version = ''clx-20120811-git'';
+
+  parasites = [ "xkeyboard-test" ];
+
+  description = ''XKeyboard is X11 extension for clx of the same name.'';
+
+  deps = [ args."clx" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz'';
+    sha256 = ''11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n'';
+  };
+
+  packageName = "xkeyboard";
+
+  asdFilesToKeep = ["xkeyboard.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM xkeyboard DESCRIPTION
+    XKeyboard is X11 extension for clx of the same name. SHA256
+    11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n URL
+    http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz
+    MD5 4e382b34e05d33f5de8e9c9dea33131c NAME xkeyboard FILENAME xkeyboard DEPS
+    ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120811-git
+    SIBLINGS NIL PARASITES (xkeyboard-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index 4d1d902cf5c..d9df8c75296 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -3,6 +3,8 @@ rec {
   baseName = ''xmls'';
   version = ''1.7'';
 
+  parasites = [ "xmls/test" ];
+
   description = '''';
 
   deps = [ ];
@@ -11,24 +13,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz'';
     sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b'';
   };
-    
+
   packageName = "xmls";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xmls[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["xmls.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM xmls DESCRIPTION NIL SHA256 1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b URL http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz
-    MD5 697c9f49a60651b759e24ea0c1eb1cfe NAME xmls TESTNAME NIL FILENAME xmls DEPS NIL DEPENDENCIES NIL VERSION 1.7 SIBLINGS NIL) */
+/* (SYSTEM xmls DESCRIPTION NIL SHA256
+    1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b URL
+    http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz MD5
+    697c9f49a60651b759e24ea0c1eb1cfe NAME xmls FILENAME xmls DEPS NIL
+    DEPENDENCIES NIL VERSION 1.7 SIBLINGS NIL PARASITES (xmls/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
new file mode 100644
index 00000000000..63b8e21b4a3
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''xpath'';
+  version = ''plexippus-20120909-darcs'';
+
+  description = '''';
+
+  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2012-09-09/plexippus-xpath-20120909-darcs.tgz'';
+    sha256 = ''1zlkr7ck60gr5rxfiq22prnbblih14ywr0s5g2kss2a842zvkxn6'';
+  };
+
+  packageName = "xpath";
+
+  asdFilesToKeep = ["xpath.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM xpath DESCRIPTION NIL SHA256
+    1zlkr7ck60gr5rxfiq22prnbblih14ywr0s5g2kss2a842zvkxn6 URL
+    http://beta.quicklisp.org/archive/plexippus-xpath/2012-09-09/plexippus-xpath-20120909-darcs.tgz
+    MD5 1d7457bffe7c4f6e1631c59bc00723d4 NAME xpath FILENAME xpath DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
+     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
+     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
+     (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME yacc FILENAME yacc))
+    DEPENDENCIES
+    (alexandria babel cl-ppcre closure-common cxml cxml-dom cxml-klacks
+     cxml-test cxml-xml parse-number puri trivial-features trivial-gray-streams
+     yacc)
+    VERSION plexippus-20120909-darcs SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index c1c699bd362..91598bf6662 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -11,25 +11,14 @@ rec {
     url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz'';
     sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q'';
   };
-    
+
   packageName = "xsubseq";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xsubseq[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["xsubseq.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM xsubseq DESCRIPTION Efficient way to manage "subseq"s in Common Lisp SHA256 0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q URL
-    http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz MD5 56f7a4ac1f05f10e7226e0e5b7b0bfa7 NAME xsubseq TESTNAME NIL FILENAME
-    xsubseq DEPS NIL DEPENDENCIES NIL VERSION 20150113-git SIBLINGS (xsubseq-test)) */
+/* (SYSTEM xsubseq DESCRIPTION Efficient way to manage "subseq"s in Common Lisp
+    SHA256 0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q URL
+    http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz
+    MD5 56f7a4ac1f05f10e7226e0e5b7b0bfa7 NAME xsubseq FILENAME xsubseq DEPS NIL
+    DEPENDENCIES NIL VERSION 20150113-git SIBLINGS (xsubseq-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
new file mode 100644
index 00000000000..c7031f4aa3f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''yacc'';
+  version = ''cl-20101006-darcs'';
+
+  description = ''A LALR(1) parser generator for Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz'';
+    sha256 = ''0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7'';
+  };
+
+  packageName = "yacc";
+
+  asdFilesToKeep = ["yacc.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM yacc DESCRIPTION A LALR(1) parser generator for Common Lisp SHA256
+    0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7 URL
+    http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz
+    MD5 748b9d59de8be3ccfdf0f001e15972ba NAME yacc FILENAME yacc DEPS NIL
+    DEPENDENCIES NIL VERSION cl-20101006-darcs SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index d581891c7cc..e14a540a178 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -11,26 +11,17 @@ rec {
     url = ''http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz'';
     sha256 = ''00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk'';
   };
-    
+
   packageName = "yason";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/yason[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["yason.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256 00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk URL
-    http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz MD5 79de5d242c5e9ce49dfda153d5f442ec NAME yason TESTNAME NIL FILENAME yason DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION
-    v0.7.6 SIBLINGS NIL) */
+/* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256
+    00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk URL
+    http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz MD5
+    79de5d242c5e9ce49dfda153d5f442ec NAME yason FILENAME yason DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.6 SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 0a1a9ee2f81..74e5d7e97e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -11,25 +11,15 @@ rec {
     url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz'';
     sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6'';
   };
-    
+
   packageName = "zpb-ttf";
 
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/zpb-ttf[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
+  asdFilesToKeep = ["zpb-ttf.asd"];
+  overrides = x: x;
 }
-/* (SYSTEM zpb-ttf DESCRIPTION Access TrueType font metrics and outlines from Common Lisp SHA256 1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6 URL
-    http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz MD5 1e896d8b0b01babab882e43fe4c3c2d4 NAME zpb-ttf TESTNAME NIL FILENAME zpb-ttf DEPS
-    NIL DEPENDENCIES NIL VERSION 1.0.3 SIBLINGS NIL) */
+/* (SYSTEM zpb-ttf DESCRIPTION
+    Access TrueType font metrics and outlines from Common Lisp SHA256
+    1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6 URL
+    http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz MD5
+    1e896d8b0b01babab882e43fe4c3c2d4 NAME zpb-ttf FILENAME zpb-ttf DEPS NIL
+    DEPENDENCIES NIL VERSION 1.0.3 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 6ea0a2166e3..93a533f6ecc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -84,6 +84,39 @@ in
     };
   };
   sqlite = addNativeLibs [pkgs.sqlite];
+  swank = x: {
+    overrides = y: (x.overrides y) // {
+      postPatch = ''
+        patch <<EOD
+        --- swank-loader.lisp	2017-08-30 16:46:16.554076684 -0700
+        +++ swank-loader-new.lisp	2017-08-30 16:49:23.333450928 -0700
+        @@ -155,7 +155,7 @@
+                          ,(unique-dir-name)))
+            (user-homedir-pathname)))
+         
+        -(defvar *fasl-directory* (default-fasl-dir)
+        +(defvar *fasl-directory* #P"$out/lib/common-lisp/swank/fasl/"
+           "The directory where fasl files should be placed.")
+         
+         (defun binary-pathname (src-pathname binary-dir)
+        @@ -277,12 +277,7 @@
+                          (contrib-dir src-dir))))
+         
+         (defun delete-stale-contrib-fasl-files (swank-files contrib-files fasl-dir)
+        -  (let ((newest (reduce #'max (mapcar #'file-write-date swank-files))))
+        -    (dolist (src contrib-files)
+        -      (let ((fasl (binary-pathname src fasl-dir)))
+        -        (when (and (probe-file fasl)
+        -                   (<= (file-write-date fasl) newest))
+        -          (delete-file fasl))))))
+        +  (declare (ignore swank-files contrib-files fasl-dir)))
+         
+         (defun compile-contribs (&key (src-dir (contrib-dir *source-directory*))
+                                    (fasl-dir (contrib-dir *fasl-directory*))
+        EOD
+      '';
+    };
+  };
   uiop = x: {
     parasites = (x.parasites or []) ++ [
       "uiop/version"
@@ -100,4 +133,9 @@ in
     };
   };
   mssql = addNativeLibs [pkgs.freetds];
+  cl-unification = x: {
+    asdFilesToKeep = (x.asdFilesToKeep or []) ++ [
+      "cl-unification-lib.asd"
+    ];
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index a257b7095cb..2b6b6e3817d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,94 +6,86 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
-  "closure-common" = buildLispPackage
+  "symbol-munger" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."closure-common" or (x: {}))
-       (import ./quicklisp-to-nix-output/closure-common.nix {
+       (qlOverrides."symbol-munger" or (x: {}))
+       (import ./quicklisp-to-nix-output/symbol-munger.nix {
          inherit fetchurl;
-           "babel" = quicklisp-to-nix-packages."babel";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "iterate" = quicklisp-to-nix-packages."iterate";
        }));
 
 
-  "list-of" = buildLispPackage
+  "simple-date-postgres-glue" = quicklisp-to-nix-packages."simple-date";
+
+
+  "cl-postgres-tests" = quicklisp-to-nix-packages."cl-postgres";
+
+
+  "asdf-finalizers" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."list-of" or (x: {}))
-       (import ./quicklisp-to-nix-output/list-of.nix {
+       (qlOverrides."asdf-finalizers" or (x: {}))
+       (import ./quicklisp-to-nix-output/asdf-finalizers.nix {
          inherit fetchurl;
        }));
 
 
-  "parse-number" = buildLispPackage
+  "lisp-unit2" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."parse-number" or (x: {}))
-       (import ./quicklisp-to-nix-output/parse-number.nix {
-         inherit fetchurl;
-       }));
-
-
-  "garbage-pools" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."garbage-pools" or (x: {}))
-       (import ./quicklisp-to-nix-output/garbage-pools.nix {
-         inherit fetchurl;
-       }));
-
-
-  "cl-containers" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-containers" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-containers.nix {
-         inherit fetchurl;
-           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
-           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
-       }));
-
-
-  "dynamic-classes" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."dynamic-classes" or (x: {}))
-       (import ./quicklisp-to-nix-output/dynamic-classes.nix {
-         inherit fetchurl;
-           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
-       }));
-
-
-  "metatilities-base" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."metatilities-base" or (x: {}))
-       (import ./quicklisp-to-nix-output/metatilities-base.nix {
-         inherit fetchurl;
-       }));
-
-
-  "cl-interpol" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-interpol" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-interpol.nix {
+       (qlOverrides."lisp-unit2" or (x: {}))
+       (import ./quicklisp-to-nix-output/lisp-unit2.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
        }));
 
 
-  "iolib_slash_syscalls" = buildLispPackage
+  "moptilities" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."iolib_slash_syscalls" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_syscalls.nix {
+       (qlOverrides."moptilities" or (x: {}))
+       (import ./quicklisp-to-nix-output/moptilities.nix {
          inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "cffi" = quicklisp-to-nix-packages."cffi";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
        }));
 
 
-  "cxml-xml" = buildLispPackage
+  "iolib_dot_common-lisp" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cxml-xml" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-xml.nix {
+       (qlOverrides."iolib_dot_common-lisp" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+           "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+       }));
+
+
+  "yacc" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."yacc" or (x: {}))
+       (import ./quicklisp-to-nix-output/yacc.nix {
+         inherit fetchurl;
+       }));
+
+
+  "unit-test" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."unit-test" or (x: {}))
+       (import ./quicklisp-to-nix-output/unit-test.nix {
+         inherit fetchurl;
+       }));
+
+
+  "map-set" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."map-set" or (x: {}))
+       (import ./quicklisp-to-nix-output/map-set.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "puri" = quicklisp-to-nix-packages."puri";
-           "closure-common" = quicklisp-to-nix-packages."closure-common";
        }));
 
 
@@ -102,15 +94,17 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel-streams" or (x: {}))
        (import ./quicklisp-to-nix-output/babel-streams.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
-  "map-set" = buildLispPackage
+  "rt" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."map-set" or (x: {}))
-       (import ./quicklisp-to-nix-output/map-set.nix {
+       (qlOverrides."rt" or (x: {}))
+       (import ./quicklisp-to-nix-output/rt.nix {
          inherit fetchurl;
        }));
 
@@ -123,12 +117,42 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "plump-parser" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."plump-parser" or (x: {}))
+       (import ./quicklisp-to-nix-output/plump-parser.nix {
+         inherit fetchurl;
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
+           "plump-dom" = quicklisp-to-nix-packages."plump-dom";
+           "plump-lexer" = quicklisp-to-nix-packages."plump-lexer";
+           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+       }));
+
+
+  "plump-lexer" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."plump-lexer" or (x: {}))
+       (import ./quicklisp-to-nix-output/plump-lexer.nix {
+         inherit fetchurl;
+       }));
+
+
+  "plump-dom" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."plump-dom" or (x: {}))
+       (import ./quicklisp-to-nix-output/plump-dom.nix {
+         inherit fetchurl;
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
+       }));
+
+
   "uuid" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."uuid" or (x: {}))
        (import ./quicklisp-to-nix-output/uuid.nix {
          inherit fetchurl;
            "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
            "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
        }));
 
@@ -138,6 +162,19 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."simple-date" or (x: {}))
        (import ./quicklisp-to-nix-output/simple-date.nix {
          inherit fetchurl;
+           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
+           "md5" = quicklisp-to-nix-packages."md5";
+       }));
+
+
+  "s-sql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."s-sql" or (x: {}))
+       (import ./quicklisp-to-nix-output/s-sql.nix {
+         inherit fetchurl;
+           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "md5" = quicklisp-to-nix-packages."md5";
        }));
 
 
@@ -146,12 +183,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."qmynd" or (x: {}))
        (import ./quicklisp-to-nix-output/qmynd.nix {
          inherit fetchurl;
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "list-of" = quicklisp-to-nix-packages."list-of";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "babel" = quicklisp-to-nix-packages."babel";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "list-of" = quicklisp-to-nix-packages."list-of";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "usocket" = quicklisp-to-nix-packages."usocket";
        }));
 
 
@@ -169,8 +206,16 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."postmodern" or (x: {}))
        (import ./quicklisp-to-nix-output/postmodern.nix {
          inherit fetchurl;
-           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "cl-postgres-tests" = quicklisp-to-nix-packages."cl-postgres-tests";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "s-sql" = quicklisp-to-nix-packages."s-sql";
+           "simple-date" = quicklisp-to-nix-packages."simple-date";
+           "simple-date-postgres-glue" = quicklisp-to-nix-packages."simple-date-postgres-glue";
        }));
 
 
@@ -186,13 +231,30 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "metatilities-base" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."metatilities-base" or (x: {}))
+       (import ./quicklisp-to-nix-output/metatilities-base.nix {
+         inherit fetchurl;
+       }));
+
+
   "lparallel" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."lparallel" or (x: {}))
        (import ./quicklisp-to-nix-output/lparallel.nix {
          inherit fetchurl;
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
+  "list-of" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."list-of" or (x: {}))
+       (import ./quicklisp-to-nix-output/list-of.nix {
+         inherit fetchurl;
+           "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers";
        }));
 
 
@@ -211,6 +273,23 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "garbage-pools" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."garbage-pools" or (x: {}))
+       (import ./quicklisp-to-nix-output/garbage-pools.nix {
+         inherit fetchurl;
+       }));
+
+
+  "dynamic-classes" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dynamic-classes" or (x: {}))
+       (import ./quicklisp-to-nix-output/dynamic-classes.nix {
+         inherit fetchurl;
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+       }));
+
+
   "db3" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."db3" or (x: {}))
@@ -224,12 +303,13 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-markdown" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-markdown.nix {
          inherit fetchurl;
-           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
-           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
-           "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-containers" = quicklisp-to-nix-packages."cl-containers";
            "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
+           "cl-containers" = quicklisp-to-nix-packages."cl-containers";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes";
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
        }));
 
 
@@ -241,14 +321,40 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-interpol" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-interpol" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-interpol.nix {
+         inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+       }));
+
+
   "cl-csv" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-csv" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-csv.nix {
          inherit fetchurl;
-           "iterate" = quicklisp-to-nix-packages."iterate";
-           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+       }));
+
+
+  "cl-containers" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-containers" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-containers.nix {
+         inherit fetchurl;
+           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+           "moptilities" = quicklisp-to-nix-packages."moptilities";
        }));
 
 
@@ -257,51 +363,102 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."abnf" or (x: {}))
        (import ./quicklisp-to-nix-output/abnf.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "esrap" = quicklisp-to-nix-packages."esrap";
        }));
 
 
-  "named-readtables" = buildLispPackage
+  "lack-component" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."named-readtables" or (x: {}))
-       (import ./quicklisp-to-nix-output/named-readtables.nix {
+       (qlOverrides."lack-component" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-component.nix {
          inherit fetchurl;
        }));
 
 
-  "iolib_slash_multiplex" = buildLispPackage
+  "iolib_dot_grovel" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."iolib_slash_multiplex" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_multiplex.nix {
+       (qlOverrides."iolib_dot_grovel" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix {
          inherit fetchurl;
-           "iolib_slash_syscalls" = quicklisp-to-nix-packages."iolib_slash_syscalls";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "cffi" = quicklisp-to-nix-packages."cffi";
+           "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+           "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base";
+           "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
-  "iolib_slash_sockets" = buildLispPackage
+  "iolib_dot_conf" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."iolib_slash_sockets" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_sockets.nix {
+       (qlOverrides."iolib_dot_conf" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_dot_conf.nix {
          inherit fetchurl;
-           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
-           "iolib_slash_syscalls" = quicklisp-to-nix-packages."iolib_slash_syscalls";
-           "iolib_slash_streams" = quicklisp-to-nix-packages."iolib_slash_streams";
-           "idna" = quicklisp-to-nix-packages."idna";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+       }));
+
+
+  "iolib_dot_base" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib_dot_base" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_dot_base.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+           "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
+           "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+       }));
+
+
+  "iolib_dot_asdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib_dot_asdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_dot_asdf.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "eos" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."eos" or (x: {}))
+       (import ./quicklisp-to-nix-output/eos.nix {
+         inherit fetchurl;
+       }));
+
+
+  "xpath" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."xpath" or (x: {}))
+       (import ./quicklisp-to-nix-output/xpath.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "cxml" = quicklisp-to-nix-packages."cxml";
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
+           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "yacc" = quicklisp-to-nix-packages."yacc";
        }));
 
 
-  "iolib_slash_streams" = buildLispPackage
+  "swank" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."iolib_slash_streams" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_slash_streams.nix {
+       (qlOverrides."swank" or (x: {}))
+       (import ./quicklisp-to-nix-output/swank.nix {
          inherit fetchurl;
-           "iolib_slash_multiplex" = quicklisp-to-nix-packages."iolib_slash_multiplex";
-           "cffi" = quicklisp-to-nix-packages."cffi";
        }));
 
 
@@ -313,11 +470,27 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "md5" = buildLispPackage
+  "cxml-stp" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."md5" or (x: {}))
-       (import ./quicklisp-to-nix-output/md5.nix {
+       (qlOverrides."cxml-stp" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-stp.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "cxml" = quicklisp-to-nix-packages."cxml";
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
+           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "rt" = quicklisp-to-nix-packages."rt";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "xpath" = quicklisp-to-nix-packages."xpath";
+           "yacc" = quicklisp-to-nix-packages."yacc";
        }));
 
 
@@ -326,14 +499,14 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."jonathan" or (x: {}))
        (import ./quicklisp-to-nix-output/jonathan.nix {
          inherit fetchurl;
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
            "babel" = quicklisp-to-nix-packages."babel";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
        }));
 
 
@@ -345,14 +518,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "puri" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."puri" or (x: {}))
-       (import ./quicklisp-to-nix-output/puri.nix {
-         inherit fetchurl;
-       }));
-
-
   "chunga" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."chunga" or (x: {}))
@@ -367,8 +532,19 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."sqlite" or (x: {}))
        (import ./quicklisp-to-nix-output/sqlite.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "iterate" = quicklisp-to-nix-packages."iterate";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
+  "md5" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."md5" or (x: {}))
+       (import ./quicklisp-to-nix-output/md5.nix {
+         inherit fetchurl;
        }));
 
 
@@ -377,39 +553,11 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-postgres" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-postgres.nix {
          inherit fetchurl;
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
            "md5" = quicklisp-to-nix-packages."md5";
        }));
 
 
-  "cxml-test" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cxml-test" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-test.nix {
-         inherit fetchurl;
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-       }));
-
-
-  "cxml-klacks" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cxml-klacks" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-klacks.nix {
-         inherit fetchurl;
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-       }));
-
-
-  "cxml-dom" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cxml-dom" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-dom.nix {
-         inherit fetchurl;
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-       }));
-
-
   "zpb-ttf" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."zpb-ttf" or (x: {}))
@@ -423,6 +571,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-store" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-store.nix {
          inherit fetchurl;
+           "rt" = quicklisp-to-nix-packages."rt";
        }));
 
 
@@ -431,10 +580,19 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-paths-ttf" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-paths-ttf.nix {
          inherit fetchurl;
+           "cl-paths" = quicklisp-to-nix-packages."cl-paths";
            "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
        }));
 
 
+  "cl-paths" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-paths" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-paths.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-aa" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-aa" or (x: {}))
@@ -443,15 +601,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl-unicode_slash_base" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-unicode_slash_base" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-unicode_slash_base.nix {
-         inherit fetchurl;
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-       }));
-
-
   "cl-markup" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-markup" or (x: {}))
@@ -468,19 +617,31 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl-annot" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-annot" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-annot.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-       }));
-
-
   "trivial-garbage" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-garbage" or (x: {}))
        (import ./quicklisp-to-nix-output/trivial-garbage.nix {
+         inherit fetchurl;
+           "rt" = quicklisp-to-nix-packages."rt";
+       }));
+
+
+  "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
+
+
+  "puri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."puri" or (x: {}))
+       (import ./quicklisp-to-nix-output/puri.nix {
+         inherit fetchurl;
+           "ptester" = quicklisp-to-nix-packages."ptester";
+       }));
+
+
+  "parse-number" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."parse-number" or (x: {}))
+       (import ./quicklisp-to-nix-output/parse-number.nix {
          inherit fetchurl;
        }));
 
@@ -493,6 +654,40 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "hu_dot_dwim_dot_stefil" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."hu_dot_dwim_dot_stefil" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "hu_dot_dwim_dot_asdf" = quicklisp-to-nix-packages."hu_dot_dwim_dot_asdf";
+       }));
+
+
+  "cxml-xml" = quicklisp-to-nix-packages."cxml";
+
+
+  "cxml-test" = quicklisp-to-nix-packages."cxml";
+
+
+  "cxml-klacks" = quicklisp-to-nix-packages."cxml";
+
+
+  "cxml-dom" = quicklisp-to-nix-packages."cxml";
+
+
+  "closure-common" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."closure-common" or (x: {}))
+       (import ./quicklisp-to-nix-output/closure-common.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
   "cl-l10n-cldr" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-l10n-cldr" or (x: {}))
@@ -501,6 +696,50 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "pcall-queue" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."pcall-queue" or (x: {}))
+       (import ./quicklisp-to-nix-output/pcall-queue.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
+  "named-readtables" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."named-readtables" or (x: {}))
+       (import ./quicklisp-to-nix-output/named-readtables.nix {
+         inherit fetchurl;
+       }));
+
+
+  "dbi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dbi" or (x: {}))
+       (import ./quicklisp-to-nix-output/dbi.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+       }));
+
+
+  "cl-annot" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-annot" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-annot.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
   "cl-fad" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-fad" or (x: {}))
@@ -508,20 +747,61 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "unit-test" = quicklisp-to-nix-packages."unit-test";
        }));
 
 
-  "cl-async-util" = buildLispPackage
+  "lift" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."cl-async-util" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-async-util.nix {
+       (qlOverrides."lift" or (x: {}))
+       (import ./quicklisp-to-nix-output/lift.nix {
          inherit fetchurl;
-           "vom" = quicklisp-to-nix-packages."vom";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
-           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
-           "cffi" = quicklisp-to-nix-packages."cffi";
+       }));
+
+
+  "ptester" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."ptester" or (x: {}))
+       (import ./quicklisp-to-nix-output/ptester.nix {
+         inherit fetchurl;
+       }));
+
+
+  "kmrcl" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."kmrcl" or (x: {}))
+       (import ./quicklisp-to-nix-output/kmrcl.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-async-util" = quicklisp-to-nix-packages."cl-async";
+
+
+  "clack-test" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack-test" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack-test.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "clack" = quicklisp-to-nix-packages."clack";
+           "dexador" = quicklisp-to-nix-packages."dexador";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "http-body" = quicklisp-to-nix-packages."http-body";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "prove" = quicklisp-to-nix-packages."prove";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+       }));
+
+
+  "lack-util" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-util" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-util.nix {
+         inherit fetchurl;
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
        }));
 
 
@@ -534,15 +814,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "lack-util" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-util" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-util.nix {
-         inherit fetchurl;
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-       }));
-
-
   "trivial-gray-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-gray-streams" or (x: {}))
@@ -551,6 +822,18 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cffi-toolchain" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-toolchain" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-toolchain.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
   "uiop" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."uiop" or (x: {}))
@@ -559,34 +842,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "anaphora" = buildLispPackage
+  "myway" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."anaphora" or (x: {}))
-       (import ./quicklisp-to-nix-output/anaphora.nix {
+       (qlOverrides."myway" or (x: {}))
+       (import ./quicklisp-to-nix-output/myway.nix {
          inherit fetchurl;
-       }));
-
-
-  "cl-project" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-project" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-project.nix {
-         inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "prove" = quicklisp-to-nix-packages."prove";
-           "local-time" = quicklisp-to-nix-packages."local-time";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
-       }));
-
-
-  "cl-syntax" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-syntax" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-syntax.nix {
-         inherit fetchurl;
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "map-set" = quicklisp-to-nix-packages."map-set";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -595,21 +863,50 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."do-urlencode" or (x: {}))
        (import ./quicklisp-to-nix-output/do-urlencode.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
            "babel-streams" = quicklisp-to-nix-packages."babel-streams";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
-  "myway" = buildLispPackage
+  "cl-syntax" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."myway" or (x: {}))
-       (import ./quicklisp-to-nix-output/myway.nix {
+       (qlOverrides."cl-syntax" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-syntax.nix {
+         inherit fetchurl;
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+       }));
+
+
+  "cl-project" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-project" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-project.nix {
          inherit fetchurl;
-           "quri" = quicklisp-to-nix-packages."quri";
-           "map-set" = quicklisp-to-nix-packages."map-set";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "prove" = quicklisp-to-nix-packages."prove";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
+  "anaphora" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."anaphora" or (x: {}))
+       (import ./quicklisp-to-nix-output/anaphora.nix {
+         inherit fetchurl;
+           "rt" = quicklisp-to-nix-packages."rt";
        }));
 
 
@@ -655,6 +952,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "xkeyboard" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."xkeyboard" or (x: {}))
+       (import ./quicklisp-to-nix-output/xkeyboard.nix {
+         inherit fetchurl;
+           "clx" = quicklisp-to-nix-packages."clx";
+       }));
+
+
   "wookie" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."wookie" or (x: {}))
@@ -681,21 +987,29 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."woo" or (x: {}))
        (import ./quicklisp-to-nix-output/woo.nix {
          inherit fetchurl;
-           "vom" = quicklisp-to-nix-packages."vom";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
-           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
-           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "lev" = quicklisp-to-nix-packages."lev";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "fast-http" = quicklisp-to-nix-packages."fast-http";
-           "clack-socket" = quicklisp-to-nix-packages."clack-socket";
-           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "clack-socket" = quicklisp-to-nix-packages."clack-socket";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "lev" = quicklisp-to-nix-packages."lev";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "vom" = quicklisp-to-nix-packages."vom";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
 
 
@@ -761,6 +1075,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."swap-bytes" or (x: {}))
        (import ./quicklisp-to-nix-output/swap-bytes.nix {
          inherit fetchurl;
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
@@ -782,8 +1097,11 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/static-vectors.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -792,6 +1110,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."split-sequence" or (x: {}))
        (import ./quicklisp-to-nix-output/split-sequence.nix {
          inherit fetchurl;
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
        }));
 
 
@@ -800,9 +1119,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."smart-buffer" or (x: {}))
        (import ./quicklisp-to-nix-output/smart-buffer.nix {
          inherit fetchurl;
-           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
-           "uiop" = quicklisp-to-nix-packages."uiop";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
 
 
@@ -819,10 +1139,11 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."quri" or (x: {}))
        (import ./quicklisp-to-nix-output/quri.nix {
          inherit fetchurl;
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-           "babel" = quicklisp-to-nix-packages."babel";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -831,13 +1152,22 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."query-fs" or (x: {}))
        (import ./quicklisp-to-nix-output/query-fs.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
            "cl-fuse" = quicklisp-to-nix-packages."cl-fuse";
            "cl-fuse-meta-fs" = quicklisp-to-nix-packages."cl-fuse-meta-fs";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments";
            "iterate" = quicklisp-to-nix-packages."iterate";
+           "pcall" = quicklisp-to-nix-packages."pcall";
+           "pcall-queue" = quicklisp-to-nix-packages."pcall-queue";
            "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
        }));
 
 
@@ -846,11 +1176,13 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."prove" or (x: {}))
        (import ./quicklisp-to-nix-output/prove.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
-           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -859,8 +1191,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."proc-parse" or (x: {}))
        (import ./quicklisp-to-nix-output/proc-parse.nix {
          inherit fetchurl;
-           "babel" = quicklisp-to-nix-packages."babel";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -869,6 +1202,11 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."plump" or (x: {}))
        (import ./quicklisp-to-nix-output/plump.nix {
          inherit fetchurl;
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
+           "plump-dom" = quicklisp-to-nix-packages."plump-dom";
+           "plump-lexer" = quicklisp-to-nix-packages."plump-lexer";
+           "plump-parser" = quicklisp-to-nix-packages."plump-parser";
+           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
        }));
 
 
@@ -879,31 +1217,59 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "abnf" = quicklisp-to-nix-packages."abnf";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
            "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-containers" = quicklisp-to-nix-packages."cl-containers";
            "cl-csv" = quicklisp-to-nix-packages."cl-csv";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
            "cl-log" = quicklisp-to-nix-packages."cl-log";
            "cl-markdown" = quicklisp-to-nix-packages."cl-markdown";
            "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
            "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments";
            "db3" = quicklisp-to-nix-packages."db3";
            "drakma" = quicklisp-to-nix-packages."drakma";
+           "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes";
            "esrap" = quicklisp-to-nix-packages."esrap";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "garbage-pools" = quicklisp-to-nix-packages."garbage-pools";
+           "ieee-floats" = quicklisp-to-nix-packages."ieee-floats";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "iterate" = quicklisp-to-nix-packages."iterate";
            "ixf" = quicklisp-to-nix-packages."ixf";
+           "list-of" = quicklisp-to-nix-packages."list-of";
            "local-time" = quicklisp-to-nix-packages."local-time";
            "lparallel" = quicklisp-to-nix-packages."lparallel";
+           "md5" = quicklisp-to-nix-packages."md5";
            "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
            "mssql" = quicklisp-to-nix-packages."mssql";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
            "postmodern" = quicklisp-to-nix-packages."postmodern";
+           "puri" = quicklisp-to-nix-packages."puri";
            "py-configparser" = quicklisp-to-nix-packages."py-configparser";
            "qmynd" = quicklisp-to-nix-packages."qmynd";
            "quri" = quicklisp-to-nix-packages."quri";
+           "s-sql" = quicklisp-to-nix-packages."s-sql";
            "simple-date" = quicklisp-to-nix-packages."simple-date";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "sqlite" = quicklisp-to-nix-packages."sqlite";
            "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
            "uiop" = quicklisp-to-nix-packages."uiop";
            "usocket" = quicklisp-to-nix-packages."usocket";
            "uuid" = quicklisp-to-nix-packages."uuid";
@@ -915,7 +1281,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."pcall" or (x: {}))
        (import ./quicklisp-to-nix-output/pcall.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
+           "pcall-queue" = quicklisp-to-nix-packages."pcall-queue";
        }));
 
 
@@ -924,9 +1293,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."parenscript" or (x: {}))
        (import ./quicklisp-to-nix-output/parenscript.nix {
          inherit fetchurl;
-           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
        }));
 
 
@@ -935,8 +1304,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."optima" or (x: {}))
        (import ./quicklisp-to-nix-output/optima.nix {
          inherit fetchurl;
-           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
        }));
 
 
@@ -977,10 +1346,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lquery" or (x: {}))
        (import ./quicklisp-to-nix-output/lquery.nix {
          inherit fetchurl;
-           "plump" = quicklisp-to-nix-packages."plump";
-           "form-fiddle" = quicklisp-to-nix-packages."form-fiddle";
-           "clss" = quicklisp-to-nix-packages."clss";
            "array-utils" = quicklisp-to-nix-packages."array-utils";
+           "clss" = quicklisp-to-nix-packages."clss";
+           "form-fiddle" = quicklisp-to-nix-packages."form-fiddle";
+           "plump" = quicklisp-to-nix-packages."plump";
        }));
 
 
@@ -989,6 +1358,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."local-time" or (x: {}))
        (import ./quicklisp-to-nix-output/local-time.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
        }));
 
@@ -1007,7 +1378,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lev" or (x: {}))
        (import ./quicklisp-to-nix-output/lev.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -1018,6 +1392,7 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "lift" = quicklisp-to-nix-packages."lift";
        }));
 
 
@@ -1026,6 +1401,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lack" or (x: {}))
        (import ./quicklisp-to-nix-output/lack.nix {
          inherit fetchurl;
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
        }));
 
 
@@ -1051,9 +1430,18 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."iolib" or (x: {}))
        (import ./quicklisp-to-nix-output/iolib.nix {
          inherit fetchurl;
-           "iolib_slash_streams" = quicklisp-to-nix-packages."iolib_slash_streams";
-           "iolib_slash_sockets" = quicklisp-to-nix-packages."iolib_slash_sockets";
-           "iolib_slash_multiplex" = quicklisp-to-nix-packages."iolib_slash_multiplex";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "idna" = quicklisp-to-nix-packages."idna";
+           "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+           "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base";
+           "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+           "iolib_dot_grovel" = quicklisp-to-nix-packages."iolib_dot_grovel";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -1062,6 +1450,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."ieee-floats" or (x: {}))
        (import ./quicklisp-to-nix-output/ieee-floats.nix {
          inherit fetchurl;
+           "eos" = quicklisp-to-nix-packages."eos";
        }));
 
 
@@ -1079,29 +1468,29 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."hunchentoot" or (x: {}))
        (import ./quicklisp-to-nix-output/hunchentoot.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
            "chunga" = quicklisp-to-nix-packages."chunga";
            "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
            "cl-base64" = quicklisp-to-nix-packages."cl-base64";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-who" = quicklisp-to-nix-packages."cl-who";
+           "cxml-stp" = quicklisp-to-nix-packages."cxml-stp";
+           "drakma" = quicklisp-to-nix-packages."drakma";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "md5" = quicklisp-to-nix-packages."md5";
            "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "swank" = quicklisp-to-nix-packages."swank";
            "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "usocket" = quicklisp-to-nix-packages."usocket";
-       }));
-
-
-  "hu_dot_dwim_dot_def" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."hu_dot_dwim_dot_def" or (x: {}))
-       (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix {
-         inherit fetchurl;
-           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
-           "iterate" = quicklisp-to-nix-packages."iterate";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "xpath" = quicklisp-to-nix-packages."xpath";
        }));
 
 
@@ -1119,14 +1508,22 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."http-body" or (x: {}))
        (import ./quicklisp-to-nix-output/http-body.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "jonathan" = quicklisp-to-nix-packages."jonathan";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "fast-http" = quicklisp-to-nix-packages."fast-http";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "jonathan" = quicklisp-to-nix-packages."jonathan";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
 
 
@@ -1174,9 +1571,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."fast-io" or (x: {}))
        (import ./quicklisp-to-nix-output/fast-io.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
@@ -1185,12 +1582,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."fast-http" or (x: {}))
        (import ./quicklisp-to-nix-output/fast-http.nix {
          inherit fetchurl;
-           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
-           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-           "babel" = quicklisp-to-nix-packages."babel";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
 
 
@@ -1199,16 +1596,30 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."external-program" or (x: {}))
        (import ./quicklisp-to-nix-output/external-program.nix {
          inherit fetchurl;
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
+  "esrap-peg" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."esrap-peg" or (x: {}))
+       (import ./quicklisp-to-nix-output/esrap-peg.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-unification" = quicklisp-to-nix-packages."cl-unification";
+           "esrap" = quicklisp-to-nix-packages."esrap";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+       }));
+
+
   "esrap" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."esrap" or (x: {}))
        (import ./quicklisp-to-nix-output/esrap.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
        }));
 
 
@@ -1217,14 +1628,14 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."drakma" or (x: {}))
        (import ./quicklisp-to-nix-output/drakma.nix {
          inherit fetchurl;
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "puri" = quicklisp-to-nix-packages."puri";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
-           "chunga" = quicklisp-to-nix-packages."chunga";
            "chipz" = quicklisp-to-nix-packages."chipz";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "usocket" = quicklisp-to-nix-packages."usocket";
        }));
 
 
@@ -1242,22 +1653,34 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."dexador" or (x: {}))
        (import ./quicklisp-to-nix-output/dexador.nix {
          inherit fetchurl;
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "fast-http" = quicklisp-to-nix-packages."fast-http";
-           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
-           "chunga" = quicklisp-to-nix-packages."chunga";
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "babel" = quicklisp-to-nix-packages."babel";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
 
 
@@ -1266,10 +1689,22 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."dbd-sqlite3" or (x: {}))
        (import ./quicklisp-to-nix-output/dbd-sqlite3.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "sqlite" = quicklisp-to-nix-packages."sqlite";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
            "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "dbi" = quicklisp-to-nix-packages."dbi";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "sqlite" = quicklisp-to-nix-packages."sqlite";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -1278,10 +1713,19 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."dbd-postgres" or (x: {}))
        (import ./quicklisp-to-nix-output/dbd-postgres.nix {
          inherit fetchurl;
-           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
            "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "dbi" = quicklisp-to-nix-packages."dbi";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
        }));
 
 
@@ -1290,9 +1734,20 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."dbd-mysql" or (x: {}))
        (import ./quicklisp-to-nix-output/dbd-mysql.nix {
          inherit fetchurl;
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
            "cl-mysql" = quicklisp-to-nix-packages."cl-mysql";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "dbi" = quicklisp-to-nix-packages."dbi";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
        }));
 
 
@@ -1301,9 +1756,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cxml" or (x: {}))
        (import ./quicklisp-to-nix-output/cxml.nix {
          inherit fetchurl;
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
@@ -1328,6 +1786,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clx-truetype" or (x: {}))
        (import ./quicklisp-to-nix-output/clx-truetype.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cl-aa" = quicklisp-to-nix-packages."cl-aa";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
            "cl-paths-ttf" = quicklisp-to-nix-packages."cl-paths-ttf";
@@ -1352,6 +1812,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-who" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-who.nix {
          inherit fetchurl;
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
        }));
 
 
@@ -1360,6 +1821,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-vectors" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-vectors.nix {
          inherit fetchurl;
+           "cl-aa" = quicklisp-to-nix-packages."cl-aa";
+           "cl-paths" = quicklisp-to-nix-packages."cl-paths";
        }));
 
 
@@ -1384,7 +1847,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-unicode" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-unicode.nix {
          inherit fetchurl;
-           "cl-unicode_slash_base" = quicklisp-to-nix-packages."cl-unicode_slash_base";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
        }));
 
 
@@ -1393,6 +1857,13 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-test-more" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-test-more.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
+           "prove" = quicklisp-to-nix-packages."prove";
        }));
 
 
@@ -1402,6 +1873,9 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/cl-syntax-markup.nix {
          inherit fetchurl;
            "cl-markup" = quicklisp-to-nix-packages."cl-markup";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
        }));
 
 
@@ -1411,6 +1885,9 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/cl-syntax-anonfun.nix {
          inherit fetchurl;
            "cl-anonfun" = quicklisp-to-nix-packages."cl-anonfun";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
        }));
 
 
@@ -1419,7 +1896,11 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-syntax-annot" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-syntax-annot.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
        }));
 
 
@@ -1428,14 +1909,15 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl+ssl" or (x: {}))
        (import ./quicklisp-to-nix-output/cl+ssl.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -1463,9 +1945,16 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-smtp" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-smtp.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
            "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
            "cl-base64" = quicklisp-to-nix-packages."cl-base64";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "usocket" = quicklisp-to-nix-packages."usocket";
        }));
@@ -1485,7 +1974,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-ppcre-unicode" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-ppcre-unicode.nix {
          inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre-test";
            "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
        }));
 
 
@@ -1495,6 +1987,7 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/cl-ppcre-template.nix {
          inherit fetchurl;
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-unification" = quicklisp-to-nix-packages."cl-unification";
        }));
 
 
@@ -1503,6 +1996,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-ppcre" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-ppcre.nix {
          inherit fetchurl;
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
        }));
 
 
@@ -1519,7 +2013,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-mysql" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-mysql.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -1529,8 +2026,10 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/cl-libuv.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -1540,15 +2039,27 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/cl-l10n.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
            "cl-l10n-cldr" = quicklisp-to-nix-packages."cl-l10n-cldr";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
            "cxml" = quicklisp-to-nix-packages."cxml";
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
+           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "local-time" = quicklisp-to-nix-packages."local-time";
            "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
@@ -1557,6 +2068,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-json" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-json.nix {
          inherit fetchurl;
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
        }));
 
 
@@ -1565,10 +2077,19 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-fuse-meta-fs" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-fuse-meta-fs.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
            "cl-fuse" = quicklisp-to-nix-packages."cl-fuse";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "pcall" = quicklisp-to-nix-packages."pcall";
+           "pcall-queue" = quicklisp-to-nix-packages."pcall-queue";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
        }));
 
 
@@ -1577,12 +2098,15 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-fuse" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-fuse.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
            "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
        }));
 
@@ -1601,6 +2125,16 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-dbi" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-dbi.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "dbi" = quicklisp-to-nix-packages."dbi";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
        }));
 
 
@@ -1609,11 +2143,17 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-cookie" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-cookie.nix {
          inherit fetchurl;
-           "quri" = quicklisp-to-nix-packages."quri";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -1623,7 +2163,9 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/cl-colors.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
            "let-plus" = quicklisp-to-nix-packages."let-plus";
+           "lift" = quicklisp-to-nix-packages."lift";
        }));
 
 
@@ -1641,6 +2183,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-base64" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-base64.nix {
          inherit fetchurl;
+           "kmrcl" = quicklisp-to-nix-packages."kmrcl";
+           "ptester" = quicklisp-to-nix-packages."ptester";
        }));
 
 
@@ -1649,8 +2193,21 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-async-ssl" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-async-ssl.nix {
          inherit fetchurl;
-           "vom" = quicklisp-to-nix-packages."vom";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cl-async" = quicklisp-to-nix-packages."cl-async";
+           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
+           "cl-async-util" = quicklisp-to-nix-packages."cl-async-util";
+           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "vom" = quicklisp-to-nix-packages."vom";
        }));
 
 
@@ -1659,36 +2216,45 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-async-repl" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-async-repl.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-       }));
-
-
-  "cl-async-base" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-async-base" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-async-base.nix {
-         inherit fetchurl;
-           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
            "cffi" = quicklisp-to-nix-packages."cffi";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cl-async" = quicklisp-to-nix-packages."cl-async";
+           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
+           "cl-async-util" = quicklisp-to-nix-packages."cl-async-util";
+           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "vom" = quicklisp-to-nix-packages."vom";
        }));
 
 
+  "cl-async-base" = quicklisp-to-nix-packages."cl-async";
+
+
   "cl-async" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-async" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-async.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
-           "cl-async-util" = quicklisp-to-nix-packages."cl-async-util";
-           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
-           "cffi" = quicklisp-to-nix-packages."cffi";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "vom" = quicklisp-to-nix-packages."vom";
        }));
 
 
@@ -1697,8 +2263,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-ansi-text" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-ansi-text.nix {
          inherit fetchurl;
-           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
        }));
 
 
@@ -1707,24 +2275,30 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack-v1-compat" or (x: {}))
        (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "marshal" = quicklisp-to-nix-packages."marshal";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "http-body" = quicklisp-to-nix-packages."http-body";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "clack" = quicklisp-to-nix-packages."clack";
+           "clack-test" = quicklisp-to-nix-packages."clack-test";
+           "dexador" = quicklisp-to-nix-packages."dexador";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "http-body" = quicklisp-to-nix-packages."http-body";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "marshal" = quicklisp-to-nix-packages."marshal";
+           "prove" = quicklisp-to-nix-packages."prove";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "usocket" = quicklisp-to-nix-packages."usocket";
        }));
 
 
@@ -1733,12 +2307,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack" or (x: {}))
        (import ./quicklisp-to-nix-output/clack.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -1747,8 +2321,10 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."circular-streams" or (x: {}))
        (import ./quicklisp-to-nix-output/circular-streams.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
            "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
@@ -1766,6 +2342,10 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/cffi-grovel.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -1774,10 +2354,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cffi" or (x: {}))
        (import ./quicklisp-to-nix-output/cffi.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "babel" = quicklisp-to-nix-packages."babel";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-json" = quicklisp-to-nix-packages."cl-json";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -1786,16 +2368,16 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."caveman" or (x: {}))
        (import ./quicklisp-to-nix-output/caveman.nix {
          inherit fetchurl;
-           "myway" = quicklisp-to-nix-packages."myway";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "do-urlencode" = quicklisp-to-nix-packages."do-urlencode";
-           "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
-           "cl-project" = quicklisp-to-nix-packages."cl-project";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
            "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "cl-emb" = quicklisp-to-nix-packages."cl-emb";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-project" = quicklisp-to-nix-packages."cl-project";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
+           "do-urlencode" = quicklisp-to-nix-packages."do-urlencode";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "myway" = quicklisp-to-nix-packages."myway";
        }));
 
 
@@ -1805,6 +2387,7 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/bordeaux-threads.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
        }));
 
 
@@ -1822,8 +2405,8 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel" or (x: {}))
        (import ./quicklisp-to-nix-output/babel.nix {
          inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -1856,13 +2439,12 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."_3bmd" or (x: {}))
        (import ./quicklisp-to-nix-output/_3bmd.nix {
          inherit fetchurl;
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "esrap" = quicklisp-to-nix-packages."esrap";
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "esrap" = quicklisp-to-nix-packages."esrap";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
        }));
 
 
-} // qlAliases {inherit quicklisp-to-nix-packages;};
-qlAliases = import ./quicklisp-to-nix-aliases.nix;
+};
 in
    quicklisp-to-nix-packages

From d908b6a1b7d617595739b88d27329b9a55ab5342 Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Fri, 1 Sep 2017 12:01:37 +0930
Subject: [PATCH 3163/3246] lftp: fix build on darwin

Add `gettext` (which provides `-lintl`) and disable `format` hardening in order
to fix build.
---
 pkgs/tools/networking/lftp/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index 67181d8aec3..b6d8baeee7e 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn, gmp, libiconv }:
+{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, gettext }:
 
 stdenv.mkDerivation rec {
   name = "lftp-${version}";
@@ -14,7 +14,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gnutls readline zlib libidn gmp libiconv ];
+
+  buildInputs = [ gnutls readline zlib libidn2 gmp libiconv ]
+    ++ stdenv.lib.optional stdenv.isDarwin gettext;
+
+  hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
 
   configureFlags = [
     "--with-readline=${readline.dev}"

From 3b9f0c6a469a574c1c030e4c23f6c766819cbd2d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 1 Sep 2017 07:49:35 +0200
Subject: [PATCH 3164/3246] gnome3 tests: fix by providing more memory

/cc #28053.
---
 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 4787d42d695..492fa61484a 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       services.xserver.displayManager.auto.user = "alice";
       services.xserver.desktopManager.gnome3.enable = true;
 
-      virtualisation.memorySize = 512;
+      virtualisation.memorySize = 1024;
     };
 
   testScript =

From 786e9711f5b3a9c27840c260354f0ea774d5f826 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Thu, 31 Aug 2017 16:47:54 +0200
Subject: [PATCH 3165/3246] nixos/piwik: fix nginx submodule's ssl defaults
 previous mkDefault did not work as expected, as it did not overwrite the
 original submodule's defaults when the user did not specify any custom
 options at all.

---
 nixos/modules/services/web-apps/piwik.nix | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/piwik.nix
index d59f800cf36..ce86c6873dd 100644
--- a/nixos/modules/services/web-apps/piwik.nix
+++ b/nixos/modules/services/web-apps/piwik.nix
@@ -60,9 +60,17 @@ in {
       };
 
       nginx = mkOption {
-        type = types.nullOr (types.submodule (import ../web-servers/nginx/vhost-options.nix {
-          inherit config lib;
-        }));
+        type = types.nullOr (types.submodule (
+          recursiveUpdate
+            (import ../web-servers/nginx/vhost-options.nix { inherit config lib; })
+            {
+              # enable encryption by default,
+              # as sensitive login and piwik data should not be transmitted in clear text.
+              options.forceSSL.default = true;
+              options.enableACME.default = true;
+            }
+        )
+        );
         default = null;
         example = {
           serverName = "stats.$\{config.networking.hostName\}";
@@ -168,14 +176,14 @@ in {
       # https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html
       # https://github.com/perusio/piwik-nginx
       "${user}.${config.networking.hostName}" = mkMerge [ cfg.nginx {
-        # don't allow to override root, as it will almost certainly break piwik
+        # don't allow to override the root easily, as it will almost certainly break piwik.
+        # disadvantage: not shown as default in docs.
         root = mkForce "${pkgs.piwik}/share";
 
-        # allow to override SSL settings if necessary, i.e. when using another method than ACME
-        # but enable them by default, as sensitive login and piwik data should not be transmitted in clear text.
-        forceSSL = mkDefault true;
-        enableACME = mkDefault true;
-
+        # define locations here instead of as the submodule option's default
+        # so that they can easily be extended with additional locations if required
+        # without needing to redefine the piwik ones.
+        # disadvantage: not shown as default in docs.
         locations."/" = {
           index = "index.php";
         };

From d52eaf878caaf7a3b81e3fb8d005dbb293f41d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 1 Sep 2017 08:55:19 +0100
Subject: [PATCH 3166/3246] python.pkgs.pytest-django: fix patch hash

---
 pkgs/development/python-modules/pytest-django/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index a91bf9d6d0e..0bd59bc85ac 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , pytest, django, setuptools_scm
 , fetchpatch
 }:
@@ -7,8 +7,8 @@ buildPythonPackage rec {
   name = "${pname}-${version}";
   version = "3.1.2";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pytest-django/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303";
   };
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     # Unpin setuptools-scm
     (fetchpatch {
       url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
-      sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp";
+      sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws";
     })
   ];
 

From 9280937cd4c95cb027e316605df04b842f98e7b7 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Fri, 1 Sep 2017 11:35:49 +0300
Subject: [PATCH 3167/3246] grml-zsh-config: generalize support to unix systems

---
 pkgs/shells/grml-zsh-config/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/grml-zsh-config/default.nix
index a5482ce93cc..d49e13e1eb3 100644
--- a/pkgs/shells/grml-zsh-config/default.nix
+++ b/pkgs/shells/grml-zsh-config/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm";
   };
 
-  buildInputs = [ zsh coreutils inetutils procps txt2tags ];
+  buildInputs = [ zsh coreutils txt2tags ]
+    ++ optional stdenv.isLinux [ inetutils procps ];
 
   buildPhase = ''
     cd doc
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "grml's zsh setup";
     homepage = http://grml.org/zsh/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ msteen rvolosatovs ];
   };
 }

From 017561209e933f3de086e04211dc48cf37d1ee82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 1 Sep 2017 12:24:47 +0200
Subject: [PATCH 3168/3246] chromium: try to hack around Hydra problems

Discussion: https://github.com/NixOS/nixpkgs/commit/e8f1ddcbd1d
---
 pkgs/applications/networking/browsers/chromium/common.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 7802e1bf1b5..33b8ee220ba 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -228,9 +228,14 @@ let
     '';
 
     buildPhase = let
+      # Build paralelism: on Hydra the build was frequently running into memory
+      # exhaustion, and even other users might be running into similar issues.
+      # -j is halved to avoid memory problems, and -l is slightly increased
+      # so that the build gets slight preference before others
+      # (it will often be on "critical path" and at risk of timing out)
       buildCommand = target: ''
         ninja -C "${buildPath}"  \
-          -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
+          -j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \
           "${target}"
       '' + optionalString (target == "mksnapshot" || target == "chrome") ''
         paxmark m "${buildPath}/${target}"

From 52eb0e0fbde795dc998158dac2e9ccef4f30f088 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 1 Sep 2017 13:07:39 +0200
Subject: [PATCH 3169/3246] gnome3.dconf-editor: include
 gsettings_desktop_schemas

---
 pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
index 6e0184e134e..cd401962c99 100644
--- a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
   buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
+                  gnome3.gsettings_desktop_schemas
                   intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
 
   meta = with stdenv.lib; {

From 94649061c8a6641e98397f827146f87956de4815 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Fri, 1 Sep 2017 14:18:36 +0200
Subject: [PATCH 3170/3246] mopidy-iris: 3.2.0 -> 3.3.3

---
 pkgs/applications/audio/mopidy-iris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index 32d7bf78730..b85e4a39a8e 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-iris-${version}";
-  version = "3.2.0";
+  version = "3.3.3";
 
   src = pythonPackages.fetchPypi {
     inherit version;
     pname = "Mopidy-Iris";
-    sha256 = "cb97cb14b2d6836f3c28c5fd0ada44b4a33f2e74380f44bd5d03beffa5f67b30";
+    sha256 = "1lfqkmjvdmc2pb3xx9z21ay095b2bk5cvdwharxqqx8fjq6n27hq";
   };
 
   propagatedBuildInputs = [

From e92f5b54fbe06c8564e2ce8a3718c9f1a41244a9 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Fri, 1 Sep 2017 08:37:50 -0400
Subject: [PATCH 3171/3246] crda: fix build with gcc6

---
 pkgs/os-specific/linux/crda/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index 5e63524e7dc..63330020afe 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     "REG_BIN=${wireless-regdb}/lib/crda/regulatory.bin"
   ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=unused-const-variable";
+
   buildFlags = [ "all_noverify" ];
   enableParallelBuilding = true;
 

From e3d7c4ca194693b3c80734511e61719ea8d4ffb6 Mon Sep 17 00:00:00 2001
From: shak-mar <shakmar@openmailbox.org>
Date: Fri, 16 Jun 2017 08:03:05 +0200
Subject: [PATCH 3172/3246] pybitmessage: 0.4.4 -> 0.6.2

squashed hashes:
3ee20b2de7c02761aeb7389821f31bbfb6626301
b9a3a3b6a25b998893a1d861849890792b9e664b

(details -> #26616)
---
 .../pybitmessage/default.nix                  | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index ec4eb91d6ab..582ff687d59 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -1,33 +1,30 @@
 { stdenv, fetchFromGitHub, pythonPackages, openssl }:
 
-stdenv.mkDerivation rec {
+pythonPackages.buildPythonApplication rec {
   name = "pybitmessage-${version}";
 
-  version = "0.4.4";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "bitmessage";
     repo = "PyBitmessage";
     rev = "v${version}";
-    sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax";
+    sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8";
   };
 
-  buildInputs = with pythonPackages; [ python pyqt4 wrapPython ] ++ [ openssl ];
+  propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 ] ++ [ openssl ];
 
   preConfigure = ''
-    substituteInPlace Makefile \
-      --replace "PREFIX?=/usr/local" "" \
-      --replace "/usr" ""
+    # Remove interaction and misleading output
+    substituteInPlace setup.py \
+      --replace "nothing = raw_input()" pass \
+      --replace 'print "It looks like building the package failed.\n" \' pass \
+      --replace '    "You may be missing a C++ compiler and the OpenSSL headers."' pass
+
   '';
 
-  makeFlags = [ "DESTDIR=$(out)" ];
-
-  postInstall = ''
-    substituteInPlace $out/bin/pybitmessage \
-      --replace "exec python2" "exec ${pythonPackages.python}/bin/python" \
-      --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/"
-    wrapProgram $out/bin/pybitmessage \
-      --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+  makeWrapperArgs = ''
+    --prefix LD_LIBRARY_PATH : "${openssl.out}/lib/"
   '';
 
   meta = with stdenv.lib; {

From e9203772f2e19e9abad52297d5a6cd3aaa1c89b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Fri, 1 Sep 2017 14:43:27 +0200
Subject: [PATCH 3173/3246] pybitmessage: replace find_library() calls with
 paths

fixes requested changes in #26616
---
 .../instant-messengers/pybitmessage/default.nix           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index 582ff687d59..78f0a9c31fc 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -21,10 +21,12 @@ pythonPackages.buildPythonApplication rec {
       --replace 'print "It looks like building the package failed.\n" \' pass \
       --replace '    "You may be missing a C++ compiler and the OpenSSL headers."' pass
 
-  '';
+    substituteInPlace src/pyelliptic/openssl.py \
+      --replace "libdir.append(find_library('ssl'))" "libdir.append('${openssl.out}/lib/libssl.so')"
+
+    substituteInPlace src/depends.py \
+      --replace "ctypes.util.find_library('ssl')" "'${openssl.out}/lib/libssl.so'"
 
-  makeWrapperArgs = ''
-    --prefix LD_LIBRARY_PATH : "${openssl.out}/lib/"
   '';
 
   meta = with stdenv.lib; {

From 6bc775cdf62bac2ae084f5173c91a350008dd4cd Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Fri, 1 Sep 2017 08:54:58 -0400
Subject: [PATCH 3174/3246] crrcsim: build with gcc6

---
 pkgs/games/crrcsim/default.nix |  4 ++++
 pkgs/games/crrcsim/gcc6.patch  | 13 +++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/games/crrcsim/gcc6.patch

diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix
index 68dfefad8d2..23980c5842b 100644
--- a/pkgs/games/crrcsim/default.nix
+++ b/pkgs/games/crrcsim/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
     mesa SDL SDL_mixer plib libjpeg
   ];
 
+  patches = [
+    ./gcc6.patch
+  ];
+
   meta = {
     description = "A model-airplane flight simulator";
     maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ];
diff --git a/pkgs/games/crrcsim/gcc6.patch b/pkgs/games/crrcsim/gcc6.patch
new file mode 100644
index 00000000000..c19f28c514d
--- /dev/null
+++ b/pkgs/games/crrcsim/gcc6.patch
@@ -0,0 +1,13 @@
+diff --git c/src/mod_video/crrc_animation.cpp i/src/mod_video/crrc_animation.cpp
+index ee7d7f4..855b106 100644
+--- c/src/mod_video/crrc_animation.cpp
++++ i/src/mod_video/crrc_animation.cpp
+@@ -84,7 +84,7 @@ void createAnimation(SimpleXMLTransfer *animation, ssgEntity* model)
+       else
+       {
+         std::cerr << "createAnimation: unknown animation type \'"
+-                  << type << "\'" << std::cerr;
++                  << type << "\'" << std::endl;
+       }
+       
+       if (anim != NULL)

From d13f7c54e30b5eb9e90f226d2a947f66a0ce1b38 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Fri, 1 Sep 2017 13:44:00 +0000
Subject: [PATCH 3175/3246] Use older version of jailbreak-cabal with ghcHEAD

See https://github.com/peti/jailbreak-cabal/issues/13
---
 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 4b7fc3d8360..7cc32533458 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 = pkgs.haskell.packages.ghc802.jailbreak-cabal;
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;

From d1ce5b69c0ab43c73c618c505738014d2bc43977 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Fri, 1 Sep 2017 13:48:53 +0000
Subject: [PATCH 3176/3246] ghcHEAD: Add new boot packages to configuration
 file

---
 pkgs/development/haskell-modules/configuration-ghc-head.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 7cc32533458..f81920edd61 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -18,6 +18,9 @@ self: super: {
   deepseq = null;
   directory = null;
   filepath = null;
+  ghc-boot = null;
+  ghc-boot-th = null;
+  ghc-compact = null;
   ghc-prim = null;
   ghci = null;
   haskeline = null;

From 1f48ad86991832d71792c1bf85d481a40dfa2619 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 1 Sep 2017 11:21:16 -0300
Subject: [PATCH 3177/3246] uget: 2.0.8 -> 2.0.10

- Update to version 2.0.10
- Use wrapGAppsHook to wrap binaries
- Use gstreamer-1.0
- Add dependence on libappindicator
---
 pkgs/tools/networking/uget/default.nix | 39 +++++++++++++++-----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index d3877260450..7d3e4ba1c61 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -1,32 +1,37 @@
-{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, gstreamer,
-  gst-plugins-base, gst-plugins-good, gnome3, makeWrapper, aria2 ? null }:
+{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
+  libappindicator-gtk3, gst_all_1, gnome3, wrapGAppsHook, aria2 ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "uget-${version}";
-  version = "2.0.8";
+  version = "2.0.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/urlget/${name}.tar.gz";
-    sha256 = "0919cf7lfk1djdl003cahqjvafdliv7v2l8r5wg95n4isqggdk75";
+    sha256 = "1zldsiy83xxpm8jdh1i9h7zrh8ak52srgy38fiyszysfapl8nx8a";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool makeWrapper ];
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
   
   buildInputs = [
-    openssl curl libnotify gstreamer gst-plugins-base gst-plugins-good
-    gnome3.gtk (stdenv.lib.getLib gnome3.dconf)
+    openssl
+    curl
+    libnotify
+    libappindicator-gtk3
+    gnome3.gtk
+    (stdenv.lib.getLib gnome3.dconf)
   ]
+  ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])
   ++ (stdenv.lib.optional (aria2 != null) aria2);
 
   enableParallelBuilding = true;
-  
-  preFixup = ''
-    wrapProgram $out/bin/uget-gtk \
-      ${stdenv.lib.optionalString (aria2 != null) ''--suffix PATH : "${aria2}/bin"''} \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
-      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
-  '';
+
+  preFixup = stdenv.lib.optionalString (aria2 != null)
+               ''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")'';
 
   meta = with stdenv.lib; {
     description = "Download manager using gtk+ and libcurl";
@@ -37,9 +42,9 @@ stdenv.mkDerivation rec {
       thinking that it "might be too powerful" because remember power is good
       and lightweight power is uGet!
     '';
-    license = licenses.lgpl21;
     homepage = http://www.ugetdm.com;
-    maintainers = with maintainers; [ romildo ];
+    license = licenses.lgpl21;
     platforms = platforms.unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 6c1364712afd2d48173d2e87d49b7cdc6aecda51 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Fri, 1 Sep 2017 10:25:48 -0400
Subject: [PATCH 3178/3246] espeak-classic: fix build with gcc6

---
 pkgs/applications/audio/espeak/default.nix |  6 +++++-
 pkgs/applications/audio/espeak/gcc6.patch  | 13 +++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/espeak/gcc6.patch

diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix
index 0faf4841c71..6b5101b50b5 100644
--- a/pkgs/applications/audio/espeak/default.nix
+++ b/pkgs/applications/audio/espeak/default.nix
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip portaudio ];
 
-  patchPhase = ''
+  patches = [
+    ./gcc6.patch
+  ];
+
+  prePatch = ''
     sed -e s,/bin/ln,ln,g -i src/Makefile
     sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile
   '' + (if portaudio.api_version == 19 then ''
diff --git a/pkgs/applications/audio/espeak/gcc6.patch b/pkgs/applications/audio/espeak/gcc6.patch
new file mode 100644
index 00000000000..58036ecbe50
--- /dev/null
+++ b/pkgs/applications/audio/espeak/gcc6.patch
@@ -0,0 +1,13 @@
+diff --git c/src/tr_languages.cpp i/src/tr_languages.cpp
+index ec210a5..9503f47 100755
+--- c/src/tr_languages.cpp
++++ i/src/tr_languages.cpp
+@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = {
+ 	0x200d,  1, // zero width joiner
+ 	0, 0 };
+ 
+-const char string_ordinal[] = {0xc2,0xba,0};  // masculine ordinal character, UTF-8
++const char string_ordinal[] = {char(0xc2),char(0xba),0};  // masculine ordinal character, UTF-8
+ 
+ 
+ static Translator* NewTranslator(void)

From b2fd2a8100819913c2740003e82d3418a0b6a672 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Fri, 1 Sep 2017 10:47:04 -0400
Subject: [PATCH 3179/3246] espeakedit: fix build with gcc6

---
 pkgs/applications/audio/espeak/edit.nix       |  2 +
 .../audio/espeak/espeakedit-gcc6.patch        | 57 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/applications/audio/espeak/espeakedit-gcc6.patch

diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix
index 524a95bcca0..11a0576bf43 100644
--- a/pkgs/applications/audio/espeak/edit.nix
+++ b/pkgs/applications/audio/espeak/edit.nix
@@ -20,9 +20,11 @@ stdenv.mkDerivation rec {
   #  chmod +w ~/espeak-data
 
   patches = [
+    ./gcc6.patch
     ./espeakedit-fix-makefile.patch
     ./espeakedit-configurable-sox-path.patch
     ./espeakedit-configurable-path-espeak-data.patch
+    ./espeakedit-gcc6.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/audio/espeak/espeakedit-gcc6.patch b/pkgs/applications/audio/espeak/espeakedit-gcc6.patch
new file mode 100644
index 00000000000..1e0cb20bbf7
--- /dev/null
+++ b/pkgs/applications/audio/espeak/espeakedit-gcc6.patch
@@ -0,0 +1,57 @@
+diff --git i/src/compiledata.cpp w/src/compiledata.cpp
+index f1bcb30..30e9e2d 100755
+--- i/src/compiledata.cpp
++++ w/src/compiledata.cpp
+@@ -212,7 +212,7 @@ enum {
+ 	kTUNE_SPLIT,
+ };
+ 
+-static const char utf8_bom[] = {0xef,0xbb,0xbf,0};
++static const char utf8_bom[] = {char(0xef),char(0xbb),char(0xbf),0};
+ 
+ static keywtab_t k_intonation[] = {
+ 	{"tune",      0,   kTUNE},
+diff --git i/src/espeakedit.cpp w/src/espeakedit.cpp
+index bde03ea..071689d 100755
+--- i/src/espeakedit.cpp
++++ w/src/espeakedit.cpp
+@@ -744,7 +744,7 @@ void MyFrame::OnTools(wxCommandEvent& event)
+ 	int debug_flag=0;
+ 	char fname_log[sizeof(path_dsource)+12];
+ 	char err_fname[sizeof(path_home)+15];
+-	static const char utf8_bom[] = {0xef,0xbb,0xbf,0};
++	static const char utf8_bom[] = {char(0xef),char(0xbb),char(0xbf),0};
+ 
+ 	switch(event.GetId())
+ 	{
+diff --git i/src/extras.cpp w/src/extras.cpp
+index fa6ac3b..ee68f59 100644
+--- i/src/extras.cpp
++++ w/src/extras.cpp
+@@ -335,16 +335,16 @@ void Lexicon_It(int pass)
+ 	static const char *vowels1 = "aeiou";
+ 	static const char *vowels2 = "aeou";
+ 
+-	static const char ex1[] = {'a',0xc3,0xac,0};  // aì
+-	static const char ex2[] = {'e',0xc3,0xac,0};  // eì
+-	static const char ex3[] = {0xc3,0xb9,'a',0};  // ùa
+-	static const char ex4[] = {0xc3,0xb9,'e',0};  // ùe
+-	static const char ex5[] = {0xc3,0xb9,'i',0};  // ùi
+-	static const char ex6[] = {0xc3,0xb9,'o',0};  // ùo
+-	static const char ex7[] = {'c',0xc3,0xac,'a',0};  // cìa
+-	static const char ex8[] = {'c',0xc3,0xac,'o',0};  // cìo
+-	static const char ex9[] = {'c',0xc3,0xac,'u',0};  // cìu
+-	static const char ex10[] = {'g','l',0xc3,0xac,0};  // glì
++	static const char ex1[] = {'a',char(0xc3),char(0xac),0};  // aì
++	static const char ex2[] = {'e',char(0xc3),char(0xac),0};  // eì
++	static const char ex3[] = {char(0xc3),char(0xb9),'a',0};  // ùa
++	static const char ex4[] = {char(0xc3),char(0xb9),'e',0};  // ùe
++	static const char ex5[] = {char(0xc3),char(0xb9),'i',0};  // ùi
++	static const char ex6[] = {char(0xc3),char(0xb9),'o',0};  // ùo
++	static const char ex7[] = {'c',char(0xc3),char(0xac),'a',0};  // cìa
++	static const char ex8[] = {'c',char(0xc3),char(0xac),'o',0};  // cìo
++	static const char ex9[] = {'c',char(0xc3),char(0xac),'u',0};  // cìu
++	static const char ex10[] = {'g','l',char(0xc3),char(0xac),0};  // glì
+ 
+ 
+ 	static const char *exceptions[] = {ex1, ex2, ex3, ex4, ex5, ex6, ex7, ex8, ex9, ex10, NULL};

From 101ccc0629790b8a404904f72e2fbf824de7c169 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 1 Sep 2017 15:49:24 +0100
Subject: [PATCH 3180/3246] terraform: providers list (#28818)

* terraform: move plugin index

* terraform: introduce update script for plugins

* terraform: update provider list
---
 .../networking/cluster/terraform/default.nix  |   8 +-
 .../cluster/terraform/providers/aws.nix       |  16 -
 .../cluster/terraform/providers/azurerm.nix   |  16 -
 .../cluster/terraform/providers/data.nix      | 333 ++++++++++++++++++
 .../cluster/terraform/providers/default.nix   |  12 +
 .../cluster/terraform/providers/google.nix    |  16 -
 .../terraform/providers/kubernetes.nix        |  16 -
 .../cluster/terraform/providers/update-all    |  82 +++++
 8 files changed, 428 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/terraform/providers/aws.nix
 delete mode 100644 pkgs/applications/networking/cluster/terraform/providers/azurerm.nix
 create mode 100644 pkgs/applications/networking/cluster/terraform/providers/data.nix
 create mode 100644 pkgs/applications/networking/cluster/terraform/providers/default.nix
 delete mode 100644 pkgs/applications/networking/cluster/terraform/providers/google.nix
 delete mode 100644 pkgs/applications/networking/cluster/terraform/providers/kubernetes.nix
 create mode 100755 pkgs/applications/networking/cluster/terraform/providers/update-all

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8643159aa8f..cc7a93bdb53 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -71,13 +71,7 @@ let
             };
     in withPlugins (_: []);
 
-  plugins = {
-    aws = import providers/aws.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
-    azurerm = import providers/azurerm.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
-    google = import providers/google.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
-    kubernetes = import providers/kubernetes.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
-    template = import providers/template.nix { inherit stdenv lib buildGoPackage fetchFromGitHub; };
-  };
+  plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; };
 in {
   terraform_0_8_5 = generic {
     version = "0.8.5";
diff --git a/pkgs/applications/networking/cluster/terraform/providers/aws.nix b/pkgs/applications/networking/cluster/terraform/providers/aws.nix
deleted file mode 100644
index 744c13df329..00000000000
--- a/pkgs/applications/networking/cluster/terraform/providers/aws.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "terraform-provider-aws";
-  name = "${pname}-${version}";
-  version = "0.1.4";
-
-  goPackagePath = "github.com/terraform-providers/terraform-provider-aws";
-
-  src = fetchFromGitHub {
-    owner  = "terraform-providers";
-    repo   = pname;
-    rev    = "v${version}";
-    sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform/providers/azurerm.nix b/pkgs/applications/networking/cluster/terraform/providers/azurerm.nix
deleted file mode 100644
index e6907d1b2aa..00000000000
--- a/pkgs/applications/networking/cluster/terraform/providers/azurerm.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "terraform-provider-azurerm";
-  name = "${pname}-${version}";
-  version = "0.1.5";
-
-  goPackagePath = "github.com/terraform-providers/terraform-provider-azurerm";
-
-  src = fetchFromGitHub {
-    owner  = "terraform-providers";
-    repo   = pname;
-    rev    = "v${version}";
-    sha256 = "02g8wnzwaii24nx5iin1yd4bx0rx22ly8aqhwa39mr5hsjj1qy4k";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
new file mode 100644
index 00000000000..76eaa21a42c
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -0,0 +1,333 @@
+{
+  aws =
+    {
+      pname = "terraform-provider-aws";
+      version = "0.1.4";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-aws";
+        rev    = "v0.1.4";
+        sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8";
+      };
+    };
+  azurerm =
+    {
+      pname = "terraform-provider-azurerm";
+      version = "0.1.6";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-azurerm";
+        rev    = "v0.1.6";
+        sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6";
+      };
+    };
+  bitbucket =
+    {
+      pname = "terraform-provider-bitbucket";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-bitbucket";
+        rev    = "v0.1.0";
+        sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43";
+      };
+    };
+  chef =
+    {
+      pname = "terraform-provider-chef";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-chef";
+        rev    = "v0.1.0";
+        sha256 = "17fppyhxi0rd5v8khw2psdn2hdv5j79hxhinwkzrq5s4iccqk5dw";
+      };
+    };
+  circonus =
+    {
+      pname = "terraform-provider-circonus";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-circonus";
+        rev    = "v0.1.0";
+        sha256 = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64";
+      };
+    };
+  cloudstack =
+    {
+      pname = "terraform-provider-cloudstack";
+      version = "0.1.1";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-cloudstack";
+        rev    = "v0.1.1";
+        sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb";
+      };
+    };
+  cobbler =
+    {
+      pname = "terraform-provider-cobbler";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-cobbler";
+        rev    = "v0.1.0";
+        sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz";
+      };
+    };
+  consul =
+    {
+      pname = "terraform-provider-consul";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-consul";
+        rev    = "v0.1.0";
+        sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94";
+      };
+    };
+  datadog =
+    {
+      pname = "terraform-provider-datadog";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-datadog";
+        rev    = "v0.1.0";
+        sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk";
+      };
+    };
+  dme =
+    {
+      pname = "terraform-provider-dme";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-dme";
+        rev    = "v0.1.0";
+        sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv";
+      };
+    };
+  dnsimple =
+    {
+      pname = "terraform-provider-dnsimple";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-dnsimple";
+        rev    = "v0.1.0";
+        sha256 = "0gkd5i69ldm5zn34p3k68aqk798g6g0d60gw7yp316l7mskvrx7h";
+      };
+    };
+  dyn =
+    {
+      pname = "terraform-provider-dyn";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-dyn";
+        rev    = "v0.1.0";
+        sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p";
+      };
+    };
+  google =
+    {
+      pname = "terraform-provider-google";
+      version = "0.1.3";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-google";
+        rev    = "v0.1.3";
+        sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf";
+      };
+    };
+  http =
+    {
+      pname = "terraform-provider-http";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-http";
+        rev    = "v0.1.0";
+        sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah";
+      };
+    };
+  ignition =
+    {
+      pname = "terraform-provider-ignition";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-ignition";
+        rev    = "v0.1.0";
+        sha256 = "03jvngd3fjyqmdzg2847p0k2fjyqykgmdng5vss4rcsn0n3b9d39";
+      };
+    };
+  influxdb =
+    {
+      pname = "terraform-provider-influxdb";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-influxdb";
+        rev    = "v0.1.0";
+        sha256 = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5";
+      };
+    };
+  logentries =
+    {
+      pname = "terraform-provider-logentries";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-logentries";
+        rev    = "v0.1.0";
+        sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa";
+      };
+    };
+  mailgun =
+    {
+      pname = "terraform-provider-mailgun";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-mailgun";
+        rev    = "v0.1.0";
+        sha256 = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj";
+      };
+    };
+  nomad =
+    {
+      pname = "terraform-provider-nomad";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-nomad";
+        rev    = "v0.1.0";
+        sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8";
+      };
+    };
+  oneandone =
+    {
+      pname = "terraform-provider-oneandone";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-oneandone";
+        rev    = "v0.1.0";
+        sha256 = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i";
+      };
+    };
+  opsgenie =
+    {
+      pname = "terraform-provider-opsgenie";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-opsgenie";
+        rev    = "v0.1.0";
+        sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm";
+      };
+    };
+  ovh =
+    {
+      pname = "terraform-provider-ovh";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-ovh";
+        rev    = "v0.1.0";
+        sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr";
+      };
+    };
+  pagerduty =
+    {
+      pname = "terraform-provider-pagerduty";
+      version = "0.1.2";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-pagerduty";
+        rev    = "v0.1.2";
+        sha256 = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm";
+      };
+    };
+  postgresql =
+    {
+      pname = "terraform-provider-postgresql";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-postgresql";
+        rev    = "v0.1.0";
+        sha256 = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j";
+      };
+    };
+  profitbricks =
+    {
+      pname = "terraform-provider-profitbricks";
+      version = "0.1.2";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-profitbricks";
+        rev    = "v0.1.2";
+        sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp";
+      };
+    };
+  scaleway =
+    {
+      pname = "terraform-provider-scaleway";
+      version = "0.1.1";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-scaleway";
+        rev    = "v0.1.1";
+        sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6";
+      };
+    };
+  tls =
+    {
+      pname = "terraform-provider-tls";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-tls";
+        rev    = "v0.1.0";
+        sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7";
+      };
+    };
+  triton =
+    {
+      pname = "terraform-provider-triton";
+      version = "0.1.2";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-triton";
+        rev    = "v0.1.2";
+        sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw";
+      };
+    };
+  ultradns =
+    {
+      pname = "terraform-provider-ultradns";
+      version = "0.1.0";
+      src = {
+        owner  = "terraform-providers";
+        repo   = "terraform-provider-ultradns";
+        rev    = "v0.1.0";
+        sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj";
+      };
+    };
+  # Broken with go/src/github.com/terraform-providers/terraform-provider-vsphere/vendor/github.com/hashicorp/terraform/config/testing.go:9: t.Helper undefined (type *testing.T has no field or method Helper)
+  # vsphere =
+    # {
+      # pname = "terraform-provider-vsphere";
+      # version = "0.2.1";
+      # src = {
+        # owner  = "terraform-providers";
+        # repo   = "terraform-provider-vsphere";
+        # rev    = "v0.2.1";
+        # sha256 = "04vz34w28nx7j6wlikgjabrb2l5fxj9icfm8d34w2fffz63nk77l";
+      # };
+    # };
+}
diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix
new file mode 100644
index 00000000000..df59439c7bf
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+let
+  list = import ./data.nix;
+  toDrv = _: data:
+    buildGoPackage rec {
+      inherit (data) pname version;
+      name = "${pname}-${version}";
+      goPackagePath = "github.com/${data.src.owner}/${data.src.repo}";
+      src = fetchFromGitHub data.src;
+    };
+in
+  lib.mapAttrs toDrv list
diff --git a/pkgs/applications/networking/cluster/terraform/providers/google.nix b/pkgs/applications/networking/cluster/terraform/providers/google.nix
deleted file mode 100644
index 0f8ad21bb13..00000000000
--- a/pkgs/applications/networking/cluster/terraform/providers/google.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "terraform-provider-google";
-  name = "${pname}-${version}";
-  version = "0.1.3";
-
-  goPackagePath = "github.com/terraform-providers/terraform-provider-google";
-
-  src = fetchFromGitHub {
-    owner  = "terraform-providers";
-    repo   = pname;
-    rev    = "v${version}";
-    sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform/providers/kubernetes.nix b/pkgs/applications/networking/cluster/terraform/providers/kubernetes.nix
deleted file mode 100644
index 6a8bc8902b6..00000000000
--- a/pkgs/applications/networking/cluster/terraform/providers/kubernetes.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "terraform-provider-kubernetes";
-  name = "${pname}-${version}";
-  version = "1.0.0";
-
-  goPackagePath = "github.com/terraform-providers/terraform-provider-kubernetes";
-
-  src = fetchFromGitHub {
-    owner  = "terraform-providers";
-    repo   = pname;
-    rev    = "v${version}";
-    sha256 = "1kh7a83f98v6b4v3zj84ddhrg2hya4nmvrw0mjc26q12g4z2d5g6";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
new file mode 100755
index 00000000000..42c55a4c19d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -0,0 +1,82 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash coreutils curl jq nix
+# vim: ft=sh sw=2 et
+#
+# This scripts scans the github terraform-providers repo for new releases,
+# generates the corresponding nix code and finally generates an index of
+# all the providers.
+set -euo pipefail
+
+GET() {
+  local url=$1
+  echo "fetching $url" >&2
+  curl -#fL "$url"
+}
+
+get_org_repos() {
+  local org=$1
+  GET "https://api.github.com/orgs/$org/repos" | jq -r '.[].name'
+}
+
+get_repo_tags() {
+  local owner=$1
+  local repo=$2
+  GET "https://api.github.com/repos/$owner/$repo/git/refs/tags" | \
+    jq -r '.[].ref' | \
+    cut -d '/' -f 3- | \
+    sort --version-sort
+}
+
+prefetch_github() {
+  local owner=$1
+  local repo=$2
+  local rev=$3
+  nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz"
+}
+
+echo_entry() {
+  local owner=$1
+  local repo=$2
+  local rev=$3
+  local sha256=$4
+  local version=${3:1}
+  cat <<EOF
+{
+  pname = "$repo";
+  version = "$version";
+  src = {
+    owner  = "$owner";
+    repo   = "$repo";
+    rev    = "$rev";
+    sha256 = "$sha256";
+  };
+};
+EOF
+}
+
+indent() { sed 's/^/    /'; }
+
+org=terraform-providers
+
+repos=$(get_org_repos "$org" | grep terraform-provider- | sort)
+
+
+# Get all the providers with index
+
+echo -n > data.nix
+
+echo "{" >> data.nix
+for repo in $repos; do
+  echo "*** $repo ***"
+  name=$(echo "$repo" | cut -d - -f 3-)
+  last_tag=$(get_repo_tags "$org" "$repo" | tail -1)
+  last_tag_sha256=$(prefetch_github "$org" "$repo" "$last_tag")
+
+  {
+    echo "  $name ="
+    echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent
+  } >> data.nix
+done
+echo "}" >> data.nix
+
+echo Done.

From 28b1170f492da51c95277e0868d14182d4ce0e6c Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Fri, 1 Sep 2017 11:02:38 -0400
Subject: [PATCH 3181/3246] john: workaroud for build failure

---
 pkgs/tools/security/john/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index f5d253af9ff..37946b940cf 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -26,7 +26,13 @@ stdenv.mkDerivation rec {
     }' run/*.conf
   '';
 
-  preConfigure = "cd src";
+  preConfigure = ''
+    cd src
+    # Makefile.in depends on AS and LD being set to CC, which is set by default in configure.ac.
+    # This ensures we override the environment variables set in cc-wrapper/setup-hook.sh
+    export AS=$CC
+    export LD=$CC
+  '';
   configureFlags = [ "--disable-native-macro" ];
 
   buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc ];

From 7f99876f506af05cb4ed8566a5e2dc1b27c5bc2f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 1 Sep 2017 17:35:17 +0200
Subject: [PATCH 3182/3246] conky: Don't enable nvidiaSupport by default

This has been introduced in 6a6fb6d31cc736af4cf9893deffcd0151f0b8c11.

Relying on non-free software by default is probably a bad idea. Apart
from the fact that (sane) people usually don't want to have it sitting
on their system even people who don't care will have to set
"allowUnfree" to true in order to install conky.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @canndrew, @Mic92
---
 pkgs/os-specific/linux/conky/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 35bcb6151c5..2eb1888a85f 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -26,7 +26,7 @@
 , toluapp ? null
 
 , wirelessSupport     ? true      , wirelesstools ? null
-, nvidiaSupport       ? true      , libXNVCtrl ? null
+, nvidiaSupport       ? false     , libXNVCtrl ? null
 
 , curlSupport         ? true      , curl ? null
 , rssSupport          ? curlSupport

From 86587ea95b8f0bb468f6e55bad929cdc6163028d Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 1 Sep 2017 10:37:49 +0100
Subject: [PATCH 3183/3246] nodePackages.live-server : init at 1.2.0

fixes #28813
---
 .../node-packages/node-packages-v6.json       |   1 +
 .../node-packages/node-packages-v6.nix        | 611 +++++++++++++-----
 2 files changed, 458 insertions(+), 154 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index c719d11f170..bbda1ac88be 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -43,6 +43,7 @@
 , "lerna"
 , "lcov-result-merger"
 , "livedown"
+, "live-server"
 , "meat"
 , "mocha"
 , "multi-file-swagger"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index a626d7b9657..ab7695e907d 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -8927,13 +8927,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.106.0" = {
+    "aws-sdk-2.107.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.106.0";
+      version = "2.107.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.106.0.tgz";
-        sha1 = "8296b8ffbc63be61ae0a73b0e66f72b98baf293c";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.107.0.tgz";
+        sha1 = "fe3922e7cf8fa5fd383746f37e3a93b0dfb51b47";
       };
     };
     "request-2.81.0" = {
@@ -12825,13 +12825,13 @@ let
         sha512 = "20pswi06vxjrv64d6i7z1zcsml98fma05a3xbyaycyfn7xmhbg8zwhnswx9pd03hrlxr4ypgikjgr65a0kkycjcyw9819gffaw95jvm";
       };
     };
-    "chai-4.1.1" = {
+    "chai-4.1.2" = {
       name = "chai";
       packageName = "chai";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chai/-/chai-4.1.1.tgz";
-        sha1 = "66e21279e6f3c6415ff8231878227900e2171b39";
+        url = "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz";
+        sha1 = "0f64584ba642f0f2ace2806279f4f06ca23ad73c";
       };
     };
     "chai-as-promised-7.1.1" = {
@@ -12978,13 +12978,13 @@ let
         sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82";
       };
     };
-    "deep-eql-2.0.2" = {
+    "deep-eql-3.0.0" = {
       name = "deep-eql";
       packageName = "deep-eql";
-      version = "2.0.2";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-eql/-/deep-eql-2.0.2.tgz";
-        sha1 = "b1bac06e56f0a76777686d50c9feb75c2ed7679a";
+        url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.0.tgz";
+        sha512 = "0p3knvwz8hchakm9qxcd6a60s1v8k66hsrbrjv9d6267lfwlj3c397aslrzmpnz88wfp1smax6lq7k2pbcxhv7vsj2280b3rgc9ydzp";
       };
     };
     "get-func-name-2.0.0" = {
@@ -13014,15 +13014,6 @@ let
         sha1 = "0e3f2670b44099b0b46c284d136a7ef49c74c2ea";
       };
     };
-    "type-detect-3.0.0" = {
-      name = "type-detect";
-      packageName = "type-detect";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-detect/-/type-detect-3.0.0.tgz";
-        sha1 = "46d0cc8553abb7b13a352b0d6dea2fd58f2d9b55";
-      };
-    };
     "node-int64-0.4.0" = {
       name = "node-int64";
       packageName = "node-int64";
@@ -14679,13 +14670,13 @@ let
         sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf";
       };
     };
-    "conventional-changelog-cli-1.3.2" = {
+    "conventional-changelog-cli-1.3.3" = {
       name = "conventional-changelog-cli";
       packageName = "conventional-changelog-cli";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz";
-        sha512 = "0mvmzv0c23159jkmwd32hlbilf9lby2iz7xpmxi6i5ym75am5m355dpfv0wwkw2s41f8lncgnx6plxl361bqkfbmds8083llmf6dkv7";
+        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.3.tgz";
+        sha512 = "1ihqjs3rh8v1g78l7k5bhp8c9qizmc5xzy9m8i2vvff1aa0jaxlzrpcvscvddxfx7mw1cgdgdqf9wqc12grfixi2bbb8wwx11f07fyr";
       };
     };
     "conventional-recommended-bump-1.0.1" = {
@@ -14850,13 +14841,13 @@ let
         sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa";
       };
     };
-    "conventional-changelog-1.1.4" = {
+    "conventional-changelog-1.1.5" = {
       name = "conventional-changelog";
       packageName = "conventional-changelog";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.4.tgz";
-        sha1 = "108bc750c2a317e200e2f9b413caaa1f8c7efa3b";
+        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.5.tgz";
+        sha512 = "3iwdmfgds5827b1sf3lv05i5hxkwr0m3327vdn8wlr2l13j9v5p8nc8ycjif6cdyykz4ziijz63j031drql411a8ip5s4v0g24k8hqd";
       };
     };
     "tempfile-1.1.1" = {
@@ -14868,13 +14859,13 @@ let
         sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
       };
     };
-    "conventional-changelog-angular-1.4.0" = {
+    "conventional-changelog-angular-1.5.0" = {
       name = "conventional-changelog-angular";
       packageName = "conventional-changelog-angular";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz";
-        sha512 = "2cp0yhzf0kjmhawbj1v8kq71ddksbx8g7k1h7snwxijqy2xdgl6y6c63q6qg8ck3ar6n6wcs7yxzrq6kc9ddphclaqdg5s9d7drfhms";
+        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.0.tgz";
+        sha512 = "1adk6b8bghfbfhb0ra4rma0ym0ws6k74k1cafvkcf14izfl34g2b4cns9nyb1w5jxa7nkcqzjcc1q42ldd4l7dqd65mjx3hzr4jmp8s";
       };
     };
     "conventional-changelog-atom-0.1.1" = {
@@ -14886,49 +14877,49 @@ let
         sha512 = "0h2y3wj5pfwir1ynh6i7qibcv30z2vy6l6q11nh9z9vzl15433c00bvjy1iz9zirkb57g4xyilak59hdzfzinadxqi8h3r2wgznxng8";
       };
     };
-    "conventional-changelog-codemirror-0.1.0" = {
+    "conventional-changelog-codemirror-0.2.0" = {
       name = "conventional-changelog-codemirror";
       packageName = "conventional-changelog-codemirror";
-      version = "0.1.0";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz";
-        sha1 = "7577a591dbf9b538e7a150a7ee62f65a2872b334";
+        url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz";
+        sha512 = "3b5q7575vplhqxypaq7jzwkmn3pys0kln0gk9grr6il64c2swappb2vj4s5ly5w5whww5vnvg7qi7r9cbha8dwr8w7d0ab8qbvxhild";
       };
     };
-    "conventional-changelog-core-1.9.0" = {
+    "conventional-changelog-core-1.9.1" = {
       name = "conventional-changelog-core";
       packageName = "conventional-changelog-core";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz";
-        sha1 = "de5dfbc091847656508d4a389e35c9a1bc49e7f4";
+        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.1.tgz";
+        sha512 = "2nmgnplgql55fplnnba0s53mf8893qpp2a7r7ml740lx4f5gh3hknwgca32n3ag7m9h0s7ipaj921y56kdmx46v3axc6dmywd4ip38n";
       };
     };
-    "conventional-changelog-ember-0.2.6" = {
+    "conventional-changelog-ember-0.2.7" = {
       name = "conventional-changelog-ember";
       packageName = "conventional-changelog-ember";
-      version = "0.2.6";
+      version = "0.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz";
-        sha1 = "8b7355419f5127493c4c562473ab2fc792f1c2b6";
+        url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.7.tgz";
+        sha512 = "092v9z574yp59rna4m9kjav5fif1avlvgrnqh5wvyb4a45gkax8d2z7hvcqvpg4jf48xg3jh7qb0a7bvsz348fzxw6wya2wwpv6ygay";
       };
     };
-    "conventional-changelog-eslint-0.1.0" = {
+    "conventional-changelog-eslint-0.2.0" = {
       name = "conventional-changelog-eslint";
       packageName = "conventional-changelog-eslint";
-      version = "0.1.0";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz";
-        sha1 = "a52411e999e0501ce500b856b0a643d0330907e2";
+        url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz";
+        sha512 = "148g8219ij95sjk72v8b4nwkd833nvx72xfyf2y1hdsn6hx0vmzsvi3zha3vcawng36i7s36vlg4rrl5bv0b4b83j0kwg668q5sfqjq";
       };
     };
-    "conventional-changelog-express-0.1.0" = {
+    "conventional-changelog-express-0.2.0" = {
       name = "conventional-changelog-express";
       packageName = "conventional-changelog-express";
-      version = "0.1.0";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz";
-        sha1 = "55c6c841c811962036c037bdbd964a54ae310fce";
+        url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz";
+        sha512 = "2znlyzw006zmdhm1607ybfs9j0w5aiv6rggvl330yfjkr2asshfg4lx7fksnd8vq9s5s0igih953aq0ggwy9iw8i2sk18wznncq8d5s";
       };
     };
     "conventional-changelog-jquery-0.1.0" = {
@@ -14949,13 +14940,13 @@ let
         sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c";
       };
     };
-    "conventional-changelog-jshint-0.1.0" = {
+    "conventional-changelog-jshint-0.2.0" = {
       name = "conventional-changelog-jshint";
       packageName = "conventional-changelog-jshint";
-      version = "0.1.0";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz";
-        sha1 = "00cab8e9a3317487abd94c4d84671342918d2a07";
+        url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz";
+        sha512 = "20xl3db9slzbzvbz6fdhlgkygssjlw42y8q2skq2ax1qx015z6vak2kyb1kygh2j914xm9l7qf40w946s3gjrdag6nmvs5d8xrzhhxr";
       };
     };
     "compare-func-1.3.2" = {
@@ -14967,24 +14958,6 @@ let
         sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648";
       };
     };
-    "github-url-from-git-1.5.0" = {
-      name = "github-url-from-git";
-      packageName = "github-url-from-git";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz";
-        sha1 = "f985fedcc0a9aa579dc88d7aff068d55cc6251a0";
-      };
-    };
-    "read-pkg-up-2.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
-      };
-    };
     "array-ify-1.0.0" = {
       name = "array-ify";
       packageName = "array-ify";
@@ -14994,22 +14967,22 @@ let
         sha1 = "9e528762b4a9066ad163a6962a364418e9626ece";
       };
     };
-    "conventional-changelog-writer-1.4.1" = {
+    "conventional-changelog-writer-2.0.1" = {
       name = "conventional-changelog-writer";
       packageName = "conventional-changelog-writer";
-      version = "1.4.1";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz";
-        sha1 = "3f4cb4d003ebb56989d30d345893b52a43639c8e";
+        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz";
+        sha512 = "0m9wq87p40hbc08y9hbdxmdl5559mbna5n5mc8nhsjcnq3cm0hd4pvgazlxsp41drfxxs67lxghk6qz5kq508hd5c758yhwkzpq52jz";
       };
     };
-    "conventional-commits-parser-1.3.0" = {
+    "conventional-commits-parser-2.0.0" = {
       name = "conventional-commits-parser";
       packageName = "conventional-commits-parser";
-      version = "1.3.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz";
-        sha1 = "e327b53194e1a7ad5dc63479ee9099a52b024865";
+        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz";
+        sha512 = "0mh43bfdx21ll5dn629cyh7p65drm2zcrazqvi6kq0m17h0y27brzsf8shjpi4idj3h9sqqa1dnq47xdwa00y4saswih5iqmy1pm1zj";
       };
     };
     "dateformat-1.0.12" = {
@@ -15165,15 +15138,6 @@ let
         sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b";
       };
     };
-    "conventional-commits-parser-2.0.0" = {
-      name = "conventional-commits-parser";
-      packageName = "conventional-commits-parser";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz";
-        sha512 = "0mh43bfdx21ll5dn629cyh7p65drm2zcrazqvi6kq0m17h0y27brzsf8shjpi4idj3h9sqqa1dnq47xdwa00y4saswih5iqmy1pm1zj";
-      };
-    };
     "jsonfile-3.0.1" = {
       name = "jsonfile";
       packageName = "jsonfile";
@@ -15327,6 +15291,15 @@ let
         sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy";
       };
     };
+    "read-pkg-up-2.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+      };
+    };
     "which-module-2.0.0" = {
       name = "which-module";
       packageName = "which-module";
@@ -15687,6 +15660,105 @@ let
         sha1 = "415a9852badb14fa008fa3ef1e31608db6761325";
       };
     };
+    "connect-3.5.1" = {
+      name = "connect";
+      packageName = "connect";
+      version = "3.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect/-/connect-3.5.1.tgz";
+        sha1 = "6d30d7a63c7f170857a6b3aa6b363d973dca588e";
+      };
+    };
+    "event-stream-3.3.4" = {
+      name = "event-stream";
+      packageName = "event-stream";
+      version = "3.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz";
+        sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571";
+      };
+    };
+    "http-auth-3.1.3" = {
+      name = "http-auth";
+      packageName = "http-auth";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz";
+        sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31";
+      };
+    };
+    "proxy-middleware-0.15.0" = {
+      name = "proxy-middleware";
+      packageName = "proxy-middleware";
+      version = "0.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz";
+        sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56";
+      };
+    };
+    "serve-index-1.9.0" = {
+      name = "serve-index";
+      packageName = "serve-index";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.0.tgz";
+        sha1 = "d2b280fc560d616ee81b48bf0fa82abed2485ce7";
+      };
+    };
+    "finalhandler-0.5.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
+      };
+    };
+    "apache-crypt-1.2.1" = {
+      name = "apache-crypt";
+      packageName = "apache-crypt";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.1.tgz";
+        sha1 = "d6fc72aa6d27d99c95a94fd188d731eefffa663c";
+      };
+    };
+    "apache-md5-1.1.2" = {
+      name = "apache-md5";
+      packageName = "apache-md5";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.2.tgz";
+        sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692";
+      };
+    };
+    "bcryptjs-2.4.3" = {
+      name = "bcryptjs";
+      packageName = "bcryptjs";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz";
+        sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb";
+      };
+    };
+    "unix-crypt-td-js-1.0.0" = {
+      name = "unix-crypt-td-js";
+      packageName = "unix-crypt-td-js";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz";
+        sha1 = "1c0824150481bc7a01d49e98f1ec668d82412f3b";
+      };
+    };
+    "batch-0.6.1" = {
+      name = "batch";
+      packageName = "batch";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz";
+        sha1 = "dc34314f4e679318093fc760272525f94bf25c16";
+      };
+    };
     "express-2.5.11" = {
       name = "express";
       packageName = "express";
@@ -16263,15 +16335,6 @@ let
         sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e";
       };
     };
-    "event-stream-3.3.4" = {
-      name = "event-stream";
-      packageName = "event-stream";
-      version = "3.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz";
-        sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571";
-      };
-    };
     "nopt-1.0.10" = {
       name = "nopt";
       packageName = "nopt";
@@ -16281,15 +16344,6 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "bcryptjs-2.4.3" = {
-      name = "bcryptjs";
-      packageName = "bcryptjs";
-      version = "2.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz";
-        sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb";
-      };
-    };
     "cheerio-0.22.0" = {
       name = "cheerio";
       packageName = "cheerio";
@@ -19234,15 +19288,6 @@ let
         sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f";
       };
     };
-    "finalhandler-0.5.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
-        sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
-      };
-    };
     "mediawiki-title-0.5.6" = {
       name = "mediawiki-title";
       packageName = "mediawiki-title";
@@ -21749,6 +21794,15 @@ let
         sha512 = "2pddj1k7206wrs3q5z7dzwc657rbdd2m00llzz0h1241fp0y5i32qi2slmfys217hqszbqmvnmjr32msgbjgzh33nxw6py49p4j35mr";
       };
     };
+    "regex-cache-0.4.4" = {
+      name = "regex-cache";
+      packageName = "regex-cache";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz";
+        sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx";
+      };
+    };
     "source-list-map-2.0.0" = {
       name = "source-list-map";
       packageName = "source-list-map";
@@ -24536,7 +24590,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.5.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.106.0"
+      sources."aws-sdk-2.107.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
@@ -26370,7 +26424,7 @@ in
     };
     dependencies = [
       sources."@reactivex/rxjs-5.4.3"
-      sources."chai-4.1.1"
+      sources."chai-4.1.2"
       sources."chai-as-promised-7.1.1"
       sources."chalk-2.1.0"
       sources."commander-2.11.0"
@@ -26395,11 +26449,7 @@ in
       sources."symbol-observable-1.0.4"
       sources."assertion-error-1.0.2"
       sources."check-error-1.0.2"
-      (sources."deep-eql-2.0.2" // {
-        dependencies = [
-          sources."type-detect-3.0.0"
-        ];
-      })
+      sources."deep-eql-3.0.0"
       sources."get-func-name-2.0.0"
       sources."pathval-1.1.0"
       sources."type-detect-4.0.3"
@@ -27492,12 +27542,8 @@ in
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
       sources."command-join-2.0.0"
-      sources."conventional-changelog-cli-1.3.2"
-      (sources."conventional-recommended-bump-1.0.1" // {
-        dependencies = [
-          sources."conventional-commits-parser-2.0.0"
-        ];
-      })
+      sources."conventional-changelog-cli-1.3.3"
+      sources."conventional-recommended-bump-1.0.1"
       sources."dedent-0.7.0"
       sources."execa-0.8.0"
       sources."find-up-2.1.0"
@@ -27562,6 +27608,7 @@ in
               sources."string-width-1.0.2"
             ];
           })
+          sources."read-pkg-up-2.0.0"
           sources."is-fullwidth-code-point-1.0.0"
         ];
       })
@@ -27579,51 +27626,49 @@ in
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
       sources."add-stream-1.0.0"
-      sources."conventional-changelog-1.1.4"
+      sources."conventional-changelog-1.1.5"
       (sources."meow-3.7.0" // {
         dependencies = [
           sources."minimist-1.2.0"
-          sources."read-pkg-up-1.0.1"
-          sources."find-up-1.1.2"
-          sources."read-pkg-1.1.0"
-          sources."path-exists-2.1.0"
-          sources."load-json-file-1.1.0"
         ];
       })
       sources."tempfile-1.1.1"
-      sources."conventional-changelog-angular-1.4.0"
+      sources."conventional-changelog-angular-1.5.0"
       sources."conventional-changelog-atom-0.1.1"
-      sources."conventional-changelog-codemirror-0.1.0"
-      (sources."conventional-changelog-core-1.9.0" // {
+      sources."conventional-changelog-codemirror-0.2.0"
+      (sources."conventional-changelog-core-1.9.1" // {
         dependencies = [
           sources."read-pkg-1.1.0"
-          sources."read-pkg-up-1.0.1"
           sources."load-json-file-1.1.0"
-          sources."find-up-1.1.2"
-          sources."path-exists-2.1.0"
         ];
       })
-      sources."conventional-changelog-ember-0.2.6"
-      sources."conventional-changelog-eslint-0.1.0"
-      sources."conventional-changelog-express-0.1.0"
+      sources."conventional-changelog-ember-0.2.7"
+      sources."conventional-changelog-eslint-0.2.0"
+      sources."conventional-changelog-express-0.2.0"
       sources."conventional-changelog-jquery-0.1.0"
       sources."conventional-changelog-jscs-0.1.0"
-      sources."conventional-changelog-jshint-0.1.0"
+      sources."conventional-changelog-jshint-0.2.0"
       sources."compare-func-1.3.2"
-      sources."github-url-from-git-1.5.0"
       sources."q-1.5.0"
-      sources."read-pkg-up-2.0.0"
       sources."array-ify-1.0.0"
       sources."dot-prop-3.0.0"
       sources."is-obj-1.0.1"
-      sources."conventional-changelog-writer-1.4.1"
-      sources."conventional-commits-parser-1.3.0"
+      sources."conventional-changelog-writer-2.0.1"
+      sources."conventional-commits-parser-2.0.0"
       sources."dateformat-1.0.12"
       sources."get-pkg-repo-1.4.0"
       sources."git-raw-commits-1.2.0"
       sources."git-remote-origin-url-2.0.0"
       sources."git-semver-tags-1.2.1"
       sources."normalize-package-data-2.4.0"
+      (sources."read-pkg-up-1.0.1" // {
+        dependencies = [
+          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."through2-2.0.3"
       sources."conventional-commits-filter-1.0.0"
       sources."handlebars-4.0.10"
@@ -28291,6 +28336,264 @@ in
     };
     production = true;
   };
+  live-server = nodeEnv.buildNodePackage {
+    name = "live-server";
+    packageName = "live-server";
+    version = "1.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/live-server/-/live-server-1.2.0.tgz";
+      sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3";
+    };
+    dependencies = [
+      sources."chokidar-1.7.0"
+      sources."colors-1.1.2"
+      (sources."connect-3.5.1" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
+      sources."cors-2.8.4"
+      sources."event-stream-3.3.4"
+      sources."faye-websocket-0.11.1"
+      sources."http-auth-3.1.3"
+      sources."morgan-1.8.2"
+      sources."object-assign-4.1.1"
+      sources."opn-5.1.0"
+      sources."proxy-middleware-0.15.0"
+      sources."send-0.15.4"
+      sources."serve-index-1.9.0"
+      sources."anymatch-1.3.2"
+      sources."async-each-1.0.1"
+      sources."glob-parent-2.0.0"
+      sources."inherits-2.0.3"
+      sources."is-binary-path-1.0.1"
+      sources."is-glob-2.0.1"
+      sources."path-is-absolute-1.0.1"
+      sources."readdirp-2.1.0"
+      sources."fsevents-1.1.2"
+      sources."micromatch-2.3.11"
+      sources."normalize-path-2.1.1"
+      sources."arr-diff-2.0.0"
+      sources."array-unique-0.2.1"
+      sources."braces-1.8.5"
+      sources."expand-brackets-0.1.5"
+      sources."extglob-0.3.2"
+      sources."filename-regex-2.0.1"
+      sources."is-extglob-1.0.0"
+      sources."kind-of-3.2.2"
+      sources."object.omit-2.0.1"
+      sources."parse-glob-3.0.4"
+      sources."regex-cache-0.4.3"
+      sources."arr-flatten-1.1.0"
+      sources."expand-range-1.8.2"
+      sources."preserve-0.2.0"
+      sources."repeat-element-1.1.2"
+      sources."fill-range-2.2.3"
+      sources."is-number-2.1.0"
+      sources."isobject-2.1.0"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."repeat-string-1.6.1"
+      sources."isarray-1.0.0"
+      sources."is-buffer-1.1.5"
+      sources."is-posix-bracket-0.1.1"
+      sources."for-own-0.1.5"
+      sources."is-extendable-0.1.1"
+      sources."for-in-1.0.2"
+      sources."glob-base-0.3.0"
+      sources."is-dotfile-1.0.3"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-primitive-2.0.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."binary-extensions-1.10.0"
+      sources."graceful-fs-4.1.11"
+      sources."minimatch-3.0.4"
+      sources."readable-stream-2.3.3"
+      sources."set-immediate-shim-1.0.1"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.1"
+      sources."string_decoder-1.0.3"
+      sources."util-deprecate-1.0.2"
+      sources."nan-2.7.0"
+      sources."node-pre-gyp-0.6.36"
+      sources."mkdirp-0.5.1"
+      sources."nopt-4.0.1"
+      sources."npmlog-4.1.2"
+      (sources."rc-1.2.1" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."request-2.81.0"
+      sources."rimraf-2.6.1"
+      sources."semver-5.4.1"
+      sources."tar-2.2.1"
+      sources."tar-pack-3.4.0"
+      sources."minimist-0.0.8"
+      sources."abbrev-1.1.0"
+      sources."osenv-0.1.4"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."are-we-there-yet-1.1.4"
+      sources."console-control-strings-1.1.0"
+      sources."gauge-2.7.4"
+      sources."set-blocking-2.0.0"
+      sources."delegates-1.0.0"
+      sources."aproba-1.1.2"
+      sources."has-unicode-2.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.2"
+      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."deep-extend-0.4.2"
+      sources."ini-1.3.4"
+      sources."strip-json-comments-2.0.1"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.6.0"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.5"
+      sources."extend-3.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."hawk-3.1.3"
+      sources."http-signature-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."mime-types-2.1.16"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."qs-6.4.0"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.2"
+      sources."tunnel-agent-0.6.0"
+      sources."uuid-3.1.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."sshpk-1.13.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."extsprintf-1.3.0"
+      sources."json-schema-0.2.3"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsbn-0.1.1"
+      sources."tweetnacl-0.14.5"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."mime-db-1.29.0"
+      sources."punycode-1.4.1"
+      sources."glob-7.1.2"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."once-1.4.0"
+      sources."wrappy-1.0.2"
+      sources."block-stream-0.0.9"
+      sources."fstream-1.0.11"
+      sources."debug-2.6.8"
+      sources."fstream-ignore-1.0.5"
+      sources."uid-number-0.0.6"
+      sources."ms-2.0.0"
+      (sources."finalhandler-0.5.1" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
+      sources."parseurl-1.3.1"
+      sources."utils-merge-1.0.0"
+      sources."escape-html-1.0.3"
+      sources."on-finished-2.3.0"
+      sources."statuses-1.3.1"
+      sources."unpipe-1.0.0"
+      sources."ee-first-1.1.1"
+      sources."vary-1.1.1"
+      sources."through-2.3.8"
+      sources."duplexer-0.1.1"
+      sources."from-0.1.7"
+      sources."map-stream-0.1.0"
+      sources."pause-stream-0.0.11"
+      sources."split-0.3.3"
+      sources."stream-combiner-0.0.4"
+      sources."websocket-driver-0.6.5"
+      sources."websocket-extensions-0.1.1"
+      sources."apache-crypt-1.2.1"
+      sources."apache-md5-1.1.2"
+      sources."bcryptjs-2.4.3"
+      sources."unix-crypt-td-js-1.0.0"
+      sources."basic-auth-1.1.0"
+      sources."depd-1.1.1"
+      sources."on-headers-1.0.1"
+      sources."is-wsl-1.1.0"
+      sources."destroy-1.0.4"
+      sources."encodeurl-1.0.1"
+      sources."etag-1.8.0"
+      sources."fresh-0.5.0"
+      sources."http-errors-1.6.2"
+      sources."mime-1.3.4"
+      sources."range-parser-1.2.0"
+      sources."setprototypeof-1.0.3"
+      sources."accepts-1.3.4"
+      sources."batch-0.6.1"
+      sources."negotiator-0.6.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "simple development http server with live reload capability";
+      homepage = "https://github.com/tapio/live-server#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
   meat = nodeEnv.buildNodePackage {
     name = "meat";
     packageName = "meat";
@@ -34545,7 +34848,7 @@ in
       sources."is-extglob-1.0.0"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
-      sources."regex-cache-0.4.3"
+      sources."regex-cache-0.4.4"
       sources."arr-flatten-1.1.0"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"
@@ -34908,7 +35211,7 @@ in
       sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
-      sources."regex-cache-0.4.3"
+      sources."regex-cache-0.4.4"
       sources."arr-flatten-1.1.0"
       sources."expand-range-1.8.2"
       sources."preserve-0.2.0"

From 799435b7cab97a39893a104999b3bc589e1172b1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 1 Sep 2017 18:04:59 +0200
Subject: [PATCH 3184/3246] nixos/deluge: Fix deluge package attribute

Regression introduced by fa5e34324204fc626d9b644a37982bcedec9e4bc.

The deluge package no longer resides in pythonPackages but now is a
top-level package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @grantwwu, @fpletz
---
 nixos/modules/services/torrent/deluge.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 2534f09b555..1ea6bf88d7a 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -42,9 +42,9 @@ in {
       after = [ "network.target" ];
       description = "Deluge BitTorrent Daemon";
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.pythonPackages.deluge ];
+      path = [ pkgs.deluge ];
       serviceConfig = {
-        ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluged -d";
+        ExecStart = "${pkgs.deluge}/bin/deluged -d";
         # To prevent "Quit & shutdown daemon" from working; we want systemd to manage it!
         Restart = "on-success";
         User = "deluge";
@@ -58,12 +58,12 @@ in {
       description = "Deluge BitTorrent WebUI";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.pythonPackages.deluge ];
-      serviceConfig.ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluge --ui web";
+      serviceConfig.ExecStart = "${pkgs.deluge}/bin/deluge --ui web";
       serviceConfig.User = "deluge";
       serviceConfig.Group = "deluge";
     };
 
-    environment.systemPackages = [ pkgs.pythonPackages.deluge ];
+    environment.systemPackages = [ pkgs.deluge ];
 
     users.extraUsers.deluge = {
       group = "deluge";

From cc45a96aea5609d3cc19460c5edf02f631df539e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 1 Sep 2017 12:08:25 -0500
Subject: [PATCH 3185/3246] clang_34: Disable hardening bits (#28543)

---
 pkgs/top-level/all-packages.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2993b0647e..b743b7dcbe9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5242,7 +5242,13 @@ with pkgs;
   clang_38 = llvmPackages_38.clang;
   clang_37 = llvmPackages_37.clang;
   clang_35 = wrapCC llvmPackages_35.clang;
-  clang_34 = wrapCC llvmPackages_34.clang;
+  clang_34 = (wrapCC llvmPackages_34.clang).override {
+    # Default cc-wrapper's hardening flags don't work with clang-3.4,
+    # so just remove it entirely for this wrapper.
+    extraBuildCommands = ''
+    :> $out/nix-support/add-hardening.sh
+    '';
+  };
 
   clang-tools = callPackage ../development/tools/clang-tools { };
 

From 8f932af2631131f2d02d41ead9596c3fb39d320e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 1 Sep 2017 18:21:27 +0100
Subject: [PATCH 3186/3246] python.pkgs.requests-oauthlib: fix source hash

Was accidentally broken during merge.
---
 pkgs/development/python-modules/requests-oauthlib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix
index d7706f3a667..8674a05af38 100644
--- a/pkgs/development/python-modules/requests-oauthlib.nix
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18gg9dwral153c10f8bwhz2dy4nw7c6mws5a2g7gidk3z5xhqy4n";
+    sha256 = "0s7lh5q661gjza1czlmibkrwf8dcj9qfqm3hs39sdbbyflbc8fl8";
   };
 
   doCheck = false;        # Internet tests fail when building in chroot

From 26068822d801b348fd6d96e730625d394eb56974 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 1 Sep 2017 13:38:07 -0400
Subject: [PATCH 3187/3246] documentation: fix some spelling

---
 doc/coding-conventions.xml         | 4 ++--
 doc/languages-frameworks/python.md | 2 +-
 doc/languages-frameworks/rust.md   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 0457018f7d0..0776e70f14e 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -365,7 +365,7 @@ splitting up an existing category.</para>
   <varlistentry>
     <term>If it’s a (set of) <emphasis>tool(s)</emphasis>:</term>
     <listitem>
-      <para>(A tool is a relatively small program, especially one intented
+      <para>(A tool is a relatively small program, especially one intended
       to be used non-interactively.)</para>
       <variablelist>
         <varlistentry>
@@ -608,7 +608,7 @@ evaluate correctly.</para>
 </section>
 <section xml:id="sec-sources"><title>Fetching Sources</title>
   <para>There are multiple ways to fetch a package source in nixpkgs. The
-    general guidline is that you should package sources with a high degree of
+    general guideline is that you should package sources with a high degree of
     availability. Right now there is only one fetcher which has mirroring
     support and that is <literal>fetchurl</literal>. Note that you should also
     prefer protocols which have a corresponding proxy environment variable.
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index c57fd4aec17..f2de0225b1d 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -590,7 +590,7 @@ By default tests are run because `doCheck = true`. Test dependencies, like
 e.g. the test runner, should be added to `buildInputs`.
 
 By default `meta.platforms` is set to the same value
-as the interpreter unless overriden otherwise.
+as the interpreter unless overridden otherwise.
 
 ##### `buildPythonPackage` parameters
 
diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index ef6ebc392b3..481b76fb78f 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -17,7 +17,7 @@ into the `environment.systemPackages` or bring them into scope with
 `nix-shell -p rustStable.rustc -p rustStable.cargo`.
 
 There are also `rustBeta` and `rustNightly` package sets available.
-These are not updated very regulary. For daily builds use either rustup from
+These are not updated very regularly. For daily builds use either rustup from
 nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay).
 
 ## Packaging Rust applications

From 4a6295e6fbcfc0e13db74960b3f39b10c1335f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 28 Aug 2017 12:43:26 +0100
Subject: [PATCH 3188/3246] turses: fix build

---
 .../instant-messengers/turses/default.nix     | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            | 35 ----------------
 3 files changed, 43 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/turses/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix
new file mode 100644
index 00000000000..1e7da4c119b
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, python3Packages }:
+
+with stdenv.lib;
+with python3Packages;
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "turses";
+  version = "0.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6";
+  };
+
+  buildInputs = [ mock pytest coverage tox ];
+  propagatedBuildInputs = [ urwid tweepy future ];
+
+  checkPhase = ''
+    TMP_TURSES=`echo turses-$RANDOM`
+    mkdir $TMP_TURSES
+    PYTHONPATH=tests:$PYTHONPATH HOME=$TMP_TURSES py.test tests/
+    rm -rf $TMP_TURSES
+  '';
+
+  patchPhase = ''
+    sed -i -e 's|urwid==1.3.0|urwid==${getVersion urwid}|' setup.py
+    sed -i -e "s|future==0.14.3|future==${getVersion future}|" setup.py
+    sed -i -e "s|tweepy==3.3.0|tweepy==${getVersion tweepy}|" setup.py
+    sed -i -e "s|config.generate_config_file.assert_called_once()|assert config.generate_config_file.call_count == 1|" tests/test_config.py
+    sed -i -e "s|self.observer.update.assert_called_once()|assert self.observer.update.call_count == 1|" tests/test_meta.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/alejandrogomez/turses;
+    description = "A Twitter client for the console";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ garbas ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2993b0647e..dc6cba46119 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4611,6 +4611,8 @@ with pkgs;
 
   ttylog = callPackage ../tools/misc/ttylog { };
 
+  turses = callPackage ../applications/networking/instant-messengers/turses { };
+
   twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
   twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {};
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 165a92c315e..2ee488477ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22972,41 +22972,6 @@ in {
    };
 
 
-  turses = buildPythonPackage (rec {
-    name = "turses-0.3.1";
-    disabled = isPyPy || isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/turses/${name}.tar.gz";
-      sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6";
-    };
-
-    buildInputs = with self; [ mock pytest coverage tox ];
-    propagatedBuildInputs = with self; [ urwid tweepy future ] ++ optional isPy26 argparse;
-
-    checkPhase = ''
-      TMP_TURSES=`echo turses-$RANDOM`
-      mkdir $TMP_TURSES
-      HOME=$TMP_TURSES py.test tests/
-      rm -rf $TMP_TURSES
-    '';
-
-    patchPhase = ''
-      sed -i -e "s|future==0.14.3|future==${pkgs.lib.getVersion self.future}|" setup.py
-      sed -i -e "s|tweepy==3.3.0|tweepy==${pkgs.lib.getVersion self.tweepy}|" setup.py
-      sed -i -e "s|config.generate_config_file.assert_called_once()|assert config.generate_config_file.call_count == 1|" tests/test_config.py
-      sed -i -e "s|self.observer.update.assert_called_once()|assert self.observer.update.call_count == 1|" tests/test_meta.py
-    '';
-
-    meta = {
-      homepage = https://github.com/alejandrogomez/turses;
-      description = "A Twitter client for the console";
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ garbas ];
-      platforms = platforms.linux;
-    };
-  });
-
   tweepy = buildPythonPackage (rec {
     name = "tweepy-3.5.0";
 

From b6a1e439e14b50874b5bc42207ed666862771eee Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 1 Sep 2017 13:55:34 -0400
Subject: [PATCH 3189/3246] documentation: use modern Firefox version in
 example

---
 .github/CONTRIBUTING.md    | 2 +-
 doc/submitting-changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b77ca7eefb9..f7fac647f41 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -23,7 +23,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
   Examples:
 
   * nginx: init at 2.0.1
-  * firefox: 3.0 -> 3.1.1
+  * firefox: 54.0.1 -> 55.0
   * nixos/hydra: add bazBaz option
   
     Dual baz behavior is needed to do foo.
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index c8742a083c3..342941a442a 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -78,7 +78,7 @@ Additional information.
 
 <listitem>
 <para>
-<command>firefox: 3.0 -> 3.1.1</command>
+<command>firefox: 54.0.1 -> 55.0</command>
 </para>
 </listitem>
 

From e4bc14f6b79b398b4bd6c588f83a658be8326a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 1 Sep 2017 19:05:56 +0100
Subject: [PATCH 3190/3246] python2Packages.jedi: fix tests

---
 pkgs/development/python-modules/jedi/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 3f5d4897537..1199435c7d2 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pytest
+, glibcLocales
 }:
 
 buildPythonPackage rec {
@@ -14,10 +15,10 @@ buildPythonPackage rec {
     sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e";
   };
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest glibcLocales ];
 
   checkPhase = ''
-    py.test test
+    LC_ALL="en_US.UTF-8" py.test test
   '';
 
   # 7 failed

From 10e8214b93a3e9a02e2e909a91f97230d7f577b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Fri, 1 Sep 2017 20:08:33 +0200
Subject: [PATCH 3191/3246] pytools: 2016.2.1 -> 2017.4

---
 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 165a92c315e..9b28c0d1c94 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8051,13 +8051,13 @@ in {
 
   pytools = buildPythonPackage rec {
     name = "pytools-${version}";
-    version = "2016.2.1";
+    version = "2017.4";
 
     src = pkgs.fetchFromGitHub {
       owner = "inducer";
       repo = "pytools";
-      rev = "e357a9de14d0ff5131284f369d220d8b439a7906";
-      sha256 = "0g5w1cira1bl9f2ji11cbr9daj947nrfydydymjp4bbxbpl2jnaq";
+      rev = "8078e74265bb5a3c9676c698595ab5450cd2bfe7";
+      sha256 = "17q61l79fcxkj5jxg3fnymi652sdjp5s6kpsabgxp22kma9crr28";
     };
 
     buildInputs = with self; [

From 235b63d96c8e1c46035c0614d9dc4abb926fc1ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Fri, 1 Sep 2017 19:38:51 +0200
Subject: [PATCH 3192/3246] pybitmessage: add numpy + pyopencl to
 propagatedBuildInputs

---
 .../networking/instant-messengers/pybitmessage/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index 78f0a9c31fc..0e052e847cc 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 ] ++ [ openssl ];
+  propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ];
 
   preConfigure = ''
     # Remove interaction and misleading output

From b02f227791509a55c4db0c84a4b8f19350ecddc2 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 1 Sep 2017 17:18:59 -0300
Subject: [PATCH 3193/3246] mate-desktop: remove unneeded dependencies
 gnome3.defaultIconTheme and gnome3.gnome_themes_standard

---
 pkgs/desktops/mate/mate-desktop/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index eb247efe052..8fea89cdcb6 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -20,11 +20,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gnome3.dconf
     gnome3.gtk
-    gnome3.defaultIconTheme
-  ];
-
-  propagatedUserEnvPkgs = [
-    gnome3.gnome_themes_standard
   ];
 
   meta = with stdenv.lib; {

From fbed066d4be053655668b9713962f8170404413b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 1 Sep 2017 17:22:07 -0300
Subject: [PATCH 3194/3246] mate-control-center: add dependence librsvg, needed
 by the mate-control-center application

---
 pkgs/desktops/mate/mate-control-center/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index ad91069356f..6586d0df0d9 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, desktop_file_utils, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, librsvg, desktop_file_utils, gnome3, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-control-center-${version}";
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     dbus_glib
     libxklavier
     libcanberra_gtk3
+    librsvg
     gnome3.gtk
     gnome3.dconf
     mate.mate-desktop

From c4dd81b81db8e908e1e00ec59d547d1d2a92d466 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 1 Sep 2017 17:27:24 -0300
Subject: [PATCH 3195/3246] mate: remove icon cache

---
 nixos/modules/services/x11/desktop-managers/mate.nix | 5 +----
 pkgs/desktops/mate/atril/default.nix                 | 3 ++-
 pkgs/desktops/mate/engrampa/default.nix              | 3 ++-
 pkgs/desktops/mate/eom/default.nix                   | 3 ++-
 pkgs/desktops/mate/libmateweather/default.nix        | 2 ++
 pkgs/desktops/mate/mate-control-center/default.nix   | 3 ++-
 pkgs/desktops/mate/mate-panel/default.nix            | 3 ++-
 pkgs/desktops/mate/mate-session-manager/default.nix  | 3 ++-
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 1230d9cf534..7a95ac6549d 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -60,10 +60,7 @@ in
       '';
     };
 
-    environment.systemPackages = [
-      pkgs.hicolor_icon_theme
-      pkgs.mate.mate-icon-theme
-    ]  ++
+    environment.systemPackages =
       pkgs.mate.basePackages ++
       (removePackagesByName
         pkgs.mate.extraPackages
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 089b54de15e..5b02c6ad117 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "atril-${version}";
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     libsecret
     libxml2
     poppler
+    hicolor_icon_theme
     mate.mate-desktop
   ];
 
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index dea2bea5ee9..02689082989 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "engrampa-${version}";
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     libxml2
     gnome3.gtk
     mate.caja
+    hicolor_icon_theme
     mate.mate-desktop
   ];
 
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 1c27958b0c9..c7651e1b5be 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "eom-${version}";
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     pkgconfig
     intltool
     itstool
+    hicolor_icon_theme
     wrapGAppsHook
   ];
 
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index aafc0fa9ceb..4d7c9dd61d6 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     "--enable-locations-compression"
   ];
 
+  preFixup = "rm -f $out/share/icons/mate/icon-theme.cache";
+
   meta = with stdenv.lib; {
     description = "Library to access weather information from online services for MATE";
     homepage = https://github.com/mate-desktop/libmateweather;
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 6586d0df0d9..74012499953 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, librsvg, desktop_file_utils, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, librsvg, desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-control-center-${version}";
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     librsvg
     gnome3.gtk
     gnome3.dconf
+    hicolor_icon_theme
     mate.mate-desktop
     mate.libmatekbd
     mate.mate-menus
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index cc6fd6c363c..d3e6f11fd94 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-panel-${version}";
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     libwnck3
     librsvg
     libxml2
+    hicolor_icon_theme
     gnome3.gtk
     gnome3.dconf
     mate.libmateweather
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 316104334ac..48d2890388a 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-session-manager-${version}";
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     dbus_glib
     systemd
     xtrans
+    hicolor_icon_theme
     xorg.libSM
     gnome3.gtk3
     gnome3.gsettings_desktop_schemas

From 808794032731c7899856b6973bf57e336eb76f89 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 1 Sep 2017 17:43:28 -0300
Subject: [PATCH 3196/3246] mate-control-center: add dependence libappindicator

---
 pkgs/desktops/mate/mate-control-center/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 74012499953..3b04d4b48aa 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, librsvg, desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib,
+  libxklavier, libcanberra_gtk3, librsvg, libappindicator-gtk3,
+  desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   name = "mate-control-center-${version}";
@@ -25,6 +28,7 @@ stdenv.mkDerivation rec {
     libxklavier
     libcanberra_gtk3
     librsvg
+    libappindicator-gtk3
     gnome3.gtk
     gnome3.dconf
     hicolor_icon_theme

From f907ad9f2f468cfcbf809e4ccfea9326c385d894 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 1 Sep 2017 18:02:24 -0300
Subject: [PATCH 3197/3246] mate-notification-daemon: init at 1.18.0

---
 pkgs/desktops/mate/default.nix                |  2 ++
 .../mate/mate-notification-daemon/default.nix | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/desktops/mate/mate-notification-daemon/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 3cac721c0eb..0db1d3f74c0 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -23,6 +23,7 @@ let
     mate-icon-theme = callPackage ./mate-icon-theme { };
     mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
     mate-menus = callPackage ./mate-menus { };
+    mate-notification-daemon = callPackage ./mate-notification-daemon { };
     mate-panel = callPackage ./mate-panel { };
     mate-session-manager = callPackage ./mate-session-manager { };
     mate-settings-daemon = callPackage ./mate-settings-daemon { };
@@ -41,6 +42,7 @@ let
       mate-desktop
       mate-icon-theme
       mate-menus
+      mate-notification-daemon
       mate-panel
       mate-session-manager
       mate-settings-daemon
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
new file mode 100644
index 00000000000..5a64727419c
--- /dev/null
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3,
+  libnotify, libwnck3, gnome3, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "mate-notification-daemon-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.18";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0rhhv99ipxy7l4fdgwvqp3g0c3d4njq0fhkag2vs1nwc6kx0h7sc";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    dbus_glib
+    libcanberra_gtk3
+    libnotify
+    libwnck3
+    gnome3.gtk
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Notification daemon for MATE";
+    homepage = https://github.com/mate-desktop/mate-notification-daemon;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}

From 232c6a00ce415b6ca7e07dd7d71335ae41ed4450 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Fri, 1 Sep 2017 17:21:42 -0400
Subject: [PATCH 3198/3246] freewheeling: UNSTABLE -> 0.6.2

---
 .../audio/freewheeling/default.nix             | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index f37b44f9231..25704d26280 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
+{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
 , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
-, libSM, libsndfile, libogg
+, libSM, libsndfile, libogg, libtool
 }:
+let
+  makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
+in
 
 stdenv.mkDerivation rec {
   name = "freewheeling-${version}";
-  version = "2016-11-15";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "free-wheeling";
     repo = "freewheeling";
-    rev = "05ef3bf150fa6ba1b1d437b1fd70ef363289742f";
-    sha256 = "19plf7r0sq4271ln5bya95mp4i1j30x8hsxxga2kla27z953n9ih";
+    rev = "v${version}";
+    sha256 = "01hmp0jxzxpb5sl0x91hdlwmbw9n4yffrpra4f89s4n8cixrz3d9";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook libtool ];
   buildInputs = [
     freetype SDL SDL_gfx SDL_ttf
     liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
@@ -22,8 +25,7 @@ stdenv.mkDerivation rec {
       configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
     }))
   ];
-
-  patches = [ ./am_path_sdl.patch ./xml.patch ];
+  NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ];
 
   hardeningDisable = [ "format" ];
 

From 11e92ecca73f6ee5e05676ec7c9f91d64d203bb7 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sat, 2 Sep 2017 01:08:07 +0200
Subject: [PATCH 3199/3246] freeradius: 3.0.14 -> 3.0.15

---
 pkgs/servers/freeradius/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index ec6610b8245..33434402f25 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -40,11 +40,11 @@ assert withCollectd -> collectd != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "freeradius-${version}";
-  version = "3.0.14";
+  version = "3.0.15";
 
   src = fetchurl {
     url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
-    sha256 = "02ar0xn4dfrs95cmd4c798k95rmnzzvcryyyl2vjv53ak16igmpw";
+    sha256 = "1qygf5if2xjzl7kfzwl428ydz5q1m0j5sx077n12v7znlgnwaagx";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -78,8 +78,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://freeradius.org/;
     description = "A modular, high performance free RADIUS suite";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with maintainers; [ sheenobu ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ sheenobu willibutz ];
     platforms = with platforms; linux;
   };
 

From bd2aeb4883176554214bdf2af404b88eb09d83fa Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 2 Sep 2017 01:50:36 +0200
Subject: [PATCH 3200/3246] beets-alternatives: Disable test suite for now

Regression introduced by 94351197cd40d7e2d22e8a971e888b8333764cb5.

Running the tests results in the following traceback:
  ...
  File ".../unittest/loader.py", line 91, in loadTestsFromName
    module = __import__('.'.join(parts_copy))
  File ".../test/regrtest.py", line 184, in <module>
    for module in sys.modules.itervalues():
RuntimeError: dictionary changed size during iteration

The reason for this is that the test directory itself is called "test"
and the package including regrtest.py is also called "test", so the
loader tries to load tests from its own implementation.

We could fix this by changing PYTHONPATH and/or making the test
directory a proper package, but we'd still have failing tests because
beets itself is required to run the tests.

However for now I'm just removing the unit_tests kwarg in setup.py so
that we have the same behaviour as before the initially mentioned
commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/audio/beets/alternatives-plugin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 116281e0a05..35562a85a4d 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -13,6 +13,7 @@ pythonPackages.buildPythonApplication rec {
 
   postPatch = ''
     sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py
+    sed -i -e '/test_suite/d' setup.py
   '';
 
   propagatedBuildInputs = with pythonPackages; [ futures ];

From 40b76c880943af92f38df406c666e4eea8f758b2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 2 Sep 2017 02:03:03 +0200
Subject: [PATCH 3201/3246] beets: Run tests for external plugins

In order to run the tests for the external plugins of beets, we need to
have beets itself as a dependency. So in order to do that, we now pass
beets without plugins and tests to the nativeBuildInputs of the plugins
so that we can run them.

As soon as the plugins are built they become part of the final beets,
which also has tests enabled, so disabling the tests for beets
derivation that is used for external plugin tests is a non-issue here
because they're going to be executed anyway.

Enabling tests for the alternatives plugin is pretty straightforward,
but in order to run tests for the copyartifacts plugin, we need to bump
the source code to the latest Git master.

The reason for this is that the version that was in use until now
required to have the beets source directory alongside of the
copyartifacts source code, but we already have beets available as a
normal dependency.

Updating copyartifacts to latest master largely consists of unit test
changes and a few Python 3 compatibility changes. However, one change
has the biggest stat, which is
sbarakat/beets-copyartifacts@1a0c281da0be7251f414397960a83d60dc3a1520.

Fortunately, the last change is just moving the implementation to a
newer API from upstream beets and by the looks of the implementation it
seems to break support for moving files. However, reverting this commit
also reveals that moving files was already broken before, so it wouldn't
matter much whether we have this version bump or not.

Tested with the following command:

nix-build -E '(import ./. {}).beets.override {
  enableAlternatives = true;
  enableCopyArtifacts = true;
}'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @domenkozar, @pjones, @Profpatsch, @michalrus
---
 .../tools/audio/beets/alternatives-plugin.nix |  6 ++-
 .../audio/beets/copyartifacts-plugin.nix      | 15 +++++--
 pkgs/tools/audio/beets/default.nix            | 44 ++++++++++++-------
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 35562a85a4d..27be81733d3 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, beets, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   name = "beets-alternatives-${version}";
@@ -16,6 +16,10 @@ pythonPackages.buildPythonApplication rec {
     sed -i -e '/test_suite/d' setup.py
   '';
 
+  nativeBuildInputs = [ beets pythonPackages.nose ];
+
+  checkPhase = "nosetests";
+
   propagatedBuildInputs = with pythonPackages; [ futures ];
 
   meta = {
diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
index fdd70db4e64..6f84e98d23e 100644
--- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix
+++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
   name = "beets-copyartifacts";
@@ -6,16 +6,25 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = "beets-copyartifacts";
     owner = "sbarakat";
-    rev = "dac4a1605111e24bb5b498aa84cead7c87480834";
-    sha256 = "0p5cskfgqinzh48a58hw56f96g9lar3k3g2p0ip1m9kawzf6axng";
+    rev = "4a5d347c858d25641c8a0eb7d8cb1a2cac10252a";
+    sha256 = "0bn6fci480ilghrdhpsjxxq29dxgni22sv1qalz770xy130g1zk3";
   };
 
   postPatch = ''
     sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py
     sed -i -e '/namespace_packages/d' setup.py
     printf 'from pkgutil import extend_path\n__path__ = extend_path(__path__, __name__)\n' >beetsplug/__init__.py
+
+    # Skip test which is already failing upstream.
+    sed -i -e '1i import unittest' \
+           -e 's/\(^ *\)# failing/\1@unittest.skip/' \
+           tests/test_reimport.py
   '';
 
+  nativeBuildInputs = [ beets pythonPackages.nose glibcLocales ];
+
+  checkPhase = "LANG=en_US.UTF-8 nosetests";
+
   meta = {
     description = "Beets plugin to move non-music files during the import process";
     homepage = https://github.com/sbarakat/beets-copyartifacts;
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index ff033e62a8b..7e9d0ff9d86 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,6 +1,9 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins
 , pythonPackages, imagemagick, gobjectIntrospection, gst_all_1
 
+# Attributes needed for tests of the external plugins
+, callPackage, beets
+
 , enableAcousticbrainz ? true
 , enableAcoustid       ? true
 , enableBadfiles       ? true, flac ? null, mp3val ? null
@@ -77,6 +80,19 @@ let
   testShell = "${bashInteractive}/bin/bash --norc";
   completion = "${bash-completion}/share/bash-completion/bash_completion";
 
+  # This is a stripped down beets for testing of the external plugins.
+  externalTestArgs.beets = (beets.override {
+    enableAlternatives = false;
+    enableCopyArtifacts = false;
+  }).overrideAttrs (stdenv.lib.const {
+    doInstallCheck = false;
+  });
+
+  plugins = {
+    alternatives = callPackage ./alternatives-plugin.nix externalTestArgs;
+    copyartifacts = callPackage ./copyartifacts-plugin.nix externalTestArgs;
+  };
+
 in pythonPackages.buildPythonApplication rec {
   name = "beets-${version}";
   version = "1.4.5";
@@ -101,26 +117,22 @@ in pythonPackages.buildPythonApplication rec {
     pythonPackages.gst-python
     pythonPackages.pygobject3
     gobjectIntrospection
-  ] ++ optional enableAcoustid     pythonPackages.pyacoustid
+  ] ++ optional enableAcoustid      pythonPackages.pyacoustid
     ++ optional (enableFetchart
               || enableEmbyupdate
               || enableKodiupdate
               || enableAcousticbrainz)
-                                   pythonPackages.requests
-    ++ optional enableConvert      ffmpeg
-    ++ optional enableDiscogs      pythonPackages.discogs_client
-    ++ optional enableGmusic       pythonPackages.gmusicapi
-    ++ optional enableKeyfinder    keyfinder-cli
-    ++ optional enableLastfm       pythonPackages.pylast
-    ++ optional enableMpd          pythonPackages.mpd2
-    ++ optional enableThumbnails   pythonPackages.pyxdg
-    ++ optional enableWeb          pythonPackages.flask
-    ++ optional enableAlternatives (import ./alternatives-plugin.nix {
-      inherit stdenv pythonPackages fetchFromGitHub;
-    })
-    ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix {
-      inherit stdenv pythonPackages fetchFromGitHub;
-    });
+                                    pythonPackages.requests
+    ++ optional enableConvert       ffmpeg
+    ++ optional enableDiscogs       pythonPackages.discogs_client
+    ++ optional enableGmusic        pythonPackages.gmusicapi
+    ++ optional enableKeyfinder     keyfinder-cli
+    ++ optional enableLastfm        pythonPackages.pylast
+    ++ optional enableMpd           pythonPackages.mpd2
+    ++ optional enableThumbnails    pythonPackages.pyxdg
+    ++ optional enableWeb           pythonPackages.flask
+    ++ optional enableAlternatives  plugins.alternatives
+    ++ optional enableCopyArtifacts plugins.copyartifacts;
 
   buildInputs = with pythonPackages; [
     beautifulsoup4

From 3086fc7f832eec68db3e540202481c114f23133f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 2 Sep 2017 03:43:21 +0200
Subject: [PATCH 3202/3246] python/pyocr: Move package into python-modules

We already have a patch feeling lonely inside the python-modules
directory and to have everything at one place let's actually move pyocr
into its own dedicated directory so it's easier to patch it up (which
we're going to).

Right now, the package fails to build because of a few test failures, so
I haven't tested this apart from evaluating.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../python-modules/pyocr/default.nix          | 64 +++++++++++++++++++
 .../tesseract.patch}                          |  0
 pkgs/top-level/python-packages.nix            | 61 +-----------------
 3 files changed, 65 insertions(+), 60 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyocr/default.nix
 rename pkgs/development/python-modules/{pyocr-tesseract.patch => pyocr/tesseract.patch} (100%)

diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
new file mode 100644
index 00000000000..65a8c741d6e
--- /dev/null
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -0,0 +1,64 @@
+{ lib, fetchFromGitHub, buildPythonPackage, pillow, six
+, tesseract, cuneiform
+}:
+
+buildPythonPackage rec {
+  name = "pyocr-${version}";
+  version = "0.4.6";
+
+  # Don't fetch from PYPI because it doesn't contain tests.
+  src = fetchFromGitHub {
+    owner = "jflesch";
+    repo = "pyocr";
+    rev = version;
+    sha256 = "0amyhkkm400qzbw65ivyzrzxl2r7vxqgsgqm7ml95m7gwkwhnzz0";
+  };
+
+  patches = [ ./tesseract.patch ];
+
+  postPatch = ''
+    sed -i \
+      -e 's,^\(TESSERACT_CMD *= *\).*,\1"${tesseract}/bin/tesseract",' \
+      -e 's,^\(CUNEIFORM_CMD *= *\).*,\1"${cuneiform}/bin/cuneiform",' \
+      -e '/^CUNIFORM_POSSIBLE_PATHS *= *\[/,/^\]$/ {
+        c CUNIFORM_POSSIBLE_PATHS = ["${cuneiform}/share/cuneiform"]
+      }' src/pyocr/{tesseract,cuneiform}.py
+
+    sed -i -r \
+      -e 's,"libtesseract\.so\.3","${tesseract}/lib/libtesseract.so",' \
+      -e 's,^(TESSDATA_PREFIX *=).*,\1 "${tesseract}/share/tessdata",' \
+      src/pyocr/libtesseract/tesseract_raw.py
+
+    # Disable specific tests that are probably failing because of this issue:
+    # https://github.com/jflesch/pyocr/issues/52
+    for test in $disabledTests; do
+      file="''${test%%:*}"
+      fun="''${test#*:}"
+      echo "$fun = unittest.skip($fun)" >> "tests/tests_$file.py"
+    done
+  '';
+
+  disabledTests = [
+    "cuneiform:TestTxt.test_basic"
+    "cuneiform:TestTxt.test_european"
+    "cuneiform:TestTxt.test_french"
+    "cuneiform:TestWordBox.test_basic"
+    "cuneiform:TestWordBox.test_european"
+    "cuneiform:TestWordBox.test_french"
+    "libtesseract:TestBasicDoc.test_basic"
+    "libtesseract:TestDigitLineBox.test_digits"
+    "libtesseract:TestLineBox.test_japanese"
+    "libtesseract:TestTxt.test_japanese"
+    "libtesseract:TestWordBox.test_japanese"
+    "tesseract:TestDigitLineBox.test_digits"
+    "tesseract:TestTxt.test_japanese"
+  ];
+
+  propagatedBuildInputs = [ pillow six ];
+
+  meta = {
+    homepage = "https://github.com/jflesch/pyocr";
+    description = "A Python wrapper for Tesseract and Cuneiform";
+    license = lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/development/python-modules/pyocr-tesseract.patch b/pkgs/development/python-modules/pyocr/tesseract.patch
similarity index 100%
rename from pkgs/development/python-modules/pyocr-tesseract.patch
rename to pkgs/development/python-modules/pyocr/tesseract.patch
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ee488477ba..8c22c8a2c9d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18113,66 +18113,7 @@ in {
     };
   };
 
-  pyocr = buildPythonPackage rec {
-    name = "pyocr-${version}";
-    version = "0.4.6";
-
-    # Don't fetch from PYPI because it doesn't contain tests.
-    src = pkgs.fetchFromGitHub {
-      owner = "jflesch";
-      repo = "pyocr";
-      rev = version;
-      sha256 = "0amyhkkm400qzbw65ivyzrzxl2r7vxqgsgqm7ml95m7gwkwhnzz0";
-    };
-
-    patches = [ ../development/python-modules/pyocr-tesseract.patch ];
-
-    postPatch = ''
-      sed -i \
-        -e 's,^\(TESSERACT_CMD *= *\).*,\1"${pkgs.tesseract}/bin/tesseract",' \
-        -e 's,^\(CUNEIFORM_CMD *= *\).*,\1"${pkgs.cuneiform}/bin/cuneiform",' \
-        -e '/^CUNIFORM_POSSIBLE_PATHS *= *\[/,/^\]$/ {
-          c CUNIFORM_POSSIBLE_PATHS = ["${pkgs.cuneiform}/share/cuneiform"]
-        }' src/pyocr/{tesseract,cuneiform}.py
-
-      sed -i -r \
-        -e 's,"libtesseract\.so\.3","${pkgs.tesseract}/lib/libtesseract.so",' \
-        -e 's,^(TESSDATA_PREFIX *=).*,\1 "${pkgs.tesseract}/share/tessdata",' \
-        src/pyocr/libtesseract/tesseract_raw.py
-
-      # Disable specific tests that are probably failing because of this issue:
-      # https://github.com/jflesch/pyocr/issues/52
-      for test in $disabledTests; do
-        file="''${test%%:*}"
-        fun="''${test#*:}"
-        echo "$fun = unittest.skip($fun)" >> "tests/tests_$file.py"
-      done
-    '';
-
-    disabledTests = [
-      "cuneiform:TestTxt.test_basic"
-      "cuneiform:TestTxt.test_european"
-      "cuneiform:TestTxt.test_french"
-      "cuneiform:TestWordBox.test_basic"
-      "cuneiform:TestWordBox.test_european"
-      "cuneiform:TestWordBox.test_french"
-      "libtesseract:TestBasicDoc.test_basic"
-      "libtesseract:TestDigitLineBox.test_digits"
-      "libtesseract:TestLineBox.test_japanese"
-      "libtesseract:TestTxt.test_japanese"
-      "libtesseract:TestWordBox.test_japanese"
-      "tesseract:TestDigitLineBox.test_digits"
-      "tesseract:TestTxt.test_japanese"
-    ];
-
-    propagatedBuildInputs = [ self.pillow self.six ];
-
-    meta = {
-      homepage = "https://github.com/jflesch/pyocr";
-      description = "A Python wrapper for Tesseract and Cuneiform";
-      license = licenses.gpl3Plus;
-    };
-  };
+  pyocr = callPackage ../development/python-modules/pyocr { };
 
   pyparsing = callPackage ../development/python-modules/pyparsing { };
 

From 7ef6d3ced9b865a7180d58ce78ed62aad93189a0 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 1 Sep 2017 22:54:58 -0300
Subject: [PATCH 3203/3246] theme-vertex: do not explicitly indicate the gnome
 version

---
 pkgs/misc/themes/vertex/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index 5db712f818e..9c41d838659 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk-engine-murrine ];
 
-  configureFlags = [ "--disable-unity" "--with-gnome=${gnome3.version}" ];
+  configureFlags = [ "--disable-unity" ];
 
   postInstall = ''
     mkdir -p $out/share/plank/themes

From 917a0e3e778813e1e1b052ccc6818223a3d89f0f Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Fri, 1 Sep 2017 22:01:24 -0400
Subject: [PATCH 3204/3246] glmark2: 2016-05-11 -> 2017-09-01

---
 pkgs/tools/graphics/glmark2/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix
index b794d7ffbef..e37ebb50bf7 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/pkgs/tools/graphics/glmark2/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm, python27, wayland }:
+{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm,
+  python27, wayland, libudev }:
 
 stdenv.mkDerivation rec {
   name = "glmark2-${version}";
-  version = "2015-06-11";
+  version = "2017-09-01";
 
   src = fetchFromGitHub {
     owner = "glmark2";
     repo = "glmark2";
-    rev = "fa71af2dfab711fac87b9504b6fc9862f44bf72a";
-    sha256 = "1razwrmwk94wf8y7rnqpas9520gidixzcwa65pg946n823105znw";
+    rev = "7265e8e6c77c4f60302507eca0e18560b1117a86";
+    sha256 = "076l75rfl6pnp1wgiwlaihy1vg2advg1z8bi0x84kk259kldgvwn";
   };
 
   buildInputs = [
-    pkgconfig libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland
+    pkgconfig libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland libudev
   ];
 
   buildPhase = ''

From 6c84bda4967c1d81cdd4e75f5971a5c9d5051a23 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 1 Sep 2017 23:16:55 -0300
Subject: [PATCH 3205/3246] arc-theme: 2016-11-25 -> 2017-05-12

---
 pkgs/misc/themes/arc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index 544642bc014..a277c796eb4 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -3,22 +3,22 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "arc-theme";
-  version = "2016-11-25";
+  version = "2017-05-12";
 
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = pname;
-    rev = "d641d3de1641a9aa0a0f6ac1bacec91d9fdd3326";
-    sha256 = "06ysd19bpqsng2bp2gqzn0wpjhldxgwvlzngrs6mkm9hr7ky5z00";
+    rev = "8290cb813f157a22e64ae58ac3dfb5983b0416e6";
+    sha256 = "1lxiw5iq9n62xzs0fks572c5vkz202jigndxaankxb44wcgn9zyf";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  buildInputs = [ gtk-engine-murrine ];
+  buildInputs = [ gtk-engine-murrine gnome3.gtk ];
 
   preferLocalBuild = true;
 
-  configureFlags = [ "--disable-unity" "--with-gnome=${gnome3.version}" ];
+  configureFlags = [ "--disable-unity" ];
 
   postInstall = ''
     mkdir -p $out/share/plank/themes

From ca1ea6997280ca398f928725e1b78c16d55c45dc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 2 Sep 2017 05:18:38 +0200
Subject: [PATCH 3206/3246] python/pyocr: 0.4.6 -> 0.4.7

Upstream changes:

  * Tesseract 4.00.00alpha:
    * Version parsing: Ignore suffix (so '4.00.00alpha' == (4, 0, 0))
    * Libtesseract: Load libtesseract.so.4 instead of libtesseract.so.3
      if available
  * Support for Tesseract 3.05.00:
    * Builders: Split field 'tess_conf' into 'tess_flags' and 'tess_conf'
    * Libtesseract: If available, use
                    TessBaseAPIDetectOrientationScript() instead of
                    TessBaseAPIDetectOS
  * Libtesseract:
    * Workaround: Prevents possible segfault in image_to_string() when
                  the target language is not available

Full upstream change log can be found at:

https://github.com/openpaperwork/pyocr/blob/b006123d1d002711b9/ChangeLog

The tesseract.patch for supporting Tesseract version 3.05.00 has been
applied upstream and we can safely drop it.

We now use substituteInPlace in conjunction with a patch to insert the
relevant store paths instead of sed, so it's less fragile whenever we
have upstream changes in handling of these paths.

I've tested this by reverting 48a941e29faa95e897f and applying a build
fix patch of Cuneiform 1.1.0 from Arch Linux, because right now
Cuneiform is an experimental version that can't be fixed on behalf of
pyocr (the reason is that pyocr needs to get a list of languages, which
doesn't work in that version anymore).

In addition to that I've successfully built paperwork-backend which by
now is the one package which depends on pyocr. However, I didn't do
runtime tests of Paperwork.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @7c6f434c
---
 .../python-modules/pyocr/default.nix          |  31 +-
 .../python-modules/pyocr/paths.patch          | 111 ++++++
 .../python-modules/pyocr/tesseract.patch      | 316 ------------------
 3 files changed, 129 insertions(+), 329 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyocr/paths.patch
 delete mode 100644 pkgs/development/python-modules/pyocr/tesseract.patch

diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
index 65a8c741d6e..54caba10189 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -4,30 +4,35 @@
 
 buildPythonPackage rec {
   name = "pyocr-${version}";
-  version = "0.4.6";
+  version = "0.4.7";
 
   # Don't fetch from PYPI because it doesn't contain tests.
   src = fetchFromGitHub {
     owner = "jflesch";
     repo = "pyocr";
     rev = version;
-    sha256 = "0amyhkkm400qzbw65ivyzrzxl2r7vxqgsgqm7ml95m7gwkwhnzz0";
+    sha256 = "1iw73r8yrgjf8g00yzpz62ymqbf89cqhyhl9g430srmsrq7mn2yd";
   };
 
-  patches = [ ./tesseract.patch ];
+  NIX_CUNEIFORM_CMD = "${cuneiform}/bin/cuneiform";
+  NIX_CUNEIFORM_DATA = "${cuneiform}/share/cuneiform";
+  NIX_LIBTESSERACT_PATH = "${tesseract}/lib/libtesseract.so";
+  NIX_TESSDATA_PREFIX = "${tesseract}/share/tessdata";
+  NIX_TESSERACT_CMD = "${tesseract}/bin/tesseract";
+
+  patches = [ ./paths.patch ];
 
   postPatch = ''
-    sed -i \
-      -e 's,^\(TESSERACT_CMD *= *\).*,\1"${tesseract}/bin/tesseract",' \
-      -e 's,^\(CUNEIFORM_CMD *= *\).*,\1"${cuneiform}/bin/cuneiform",' \
-      -e '/^CUNIFORM_POSSIBLE_PATHS *= *\[/,/^\]$/ {
-        c CUNIFORM_POSSIBLE_PATHS = ["${cuneiform}/share/cuneiform"]
-      }' src/pyocr/{tesseract,cuneiform}.py
+    substituteInPlace src/pyocr/cuneiform.py \
+      --subst-var NIX_CUNEIFORM_CMD \
+      --subst-var NIX_CUNEIFORM_CMD
 
-    sed -i -r \
-      -e 's,"libtesseract\.so\.3","${tesseract}/lib/libtesseract.so",' \
-      -e 's,^(TESSDATA_PREFIX *=).*,\1 "${tesseract}/share/tessdata",' \
-      src/pyocr/libtesseract/tesseract_raw.py
+    substituteInPlace src/pyocr/tesseract.py \
+      --subst-var NIX_TESSERACT_CMD
+
+    substituteInPlace src/pyocr/libtesseract/tesseract_raw.py \
+      --subst-var NIX_TESSDATA_PREFIX \
+      --subst-var NIX_LIBTESSERACT_PATH
 
     # Disable specific tests that are probably failing because of this issue:
     # https://github.com/jflesch/pyocr/issues/52
diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths.patch
new file mode 100644
index 00000000000..3fe11598b7d
--- /dev/null
+++ b/pkgs/development/python-modules/pyocr/paths.patch
@@ -0,0 +1,111 @@
+diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py
+index a461d92..1f2b914 100644
+--- a/src/pyocr/cuneiform.py
++++ b/src/pyocr/cuneiform.py
+@@ -27,13 +27,9 @@ from . import error
+ from . import util
+ 
+ 
+-# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY
+-CUNEIFORM_CMD = 'cuneiform'
++CUNEIFORM_CMD = '@NIX_CUNEIFORM_CMD@'
+ 
+-CUNEIFORM_DATA_POSSIBLE_PATHS = [
+-    "/usr/local/share/cuneiform",
+-    "/usr/share/cuneiform",
+-]
++CUNEIFORM_DATA_POSSIBLE_PATHS = ['@NIX_CUNEIFORM_DATA@']
+ 
+ LANGUAGES_LINE_PREFIX = "Supported languages: "
+ LANGUAGES_SPLIT_RE = re.compile("[^a-z]")
+diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py
+index b4e7bda..47505f7 100644
+--- a/src/pyocr/libtesseract/tesseract_raw.py
++++ b/src/pyocr/libtesseract/tesseract_raw.py
+@@ -1,55 +1,13 @@
+ import ctypes
+ import logging
+ import os
+-import sys
+ 
+ from ..error import TesseractError
+ 
+ 
+ logger = logging.getLogger(__name__)
+ 
+-TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None)
+-libnames = []
+-
+-if getattr(sys, 'frozen', False):
+-    # Pyinstaller integration
+-    libnames += [os.path.join(sys._MEIPASS, "libtesseract-4.dll")]
+-    libnames += [os.path.join(sys._MEIPASS, "libtesseract-3.dll")]
+-    tessdata = os.path.join(sys._MEIPASS, "data")
+-    if not os.path.exists(os.path.join(tessdata, "tessdata")):
+-        logger.warning(
+-            "Running from container, but no tessdata ({}) found !".format(
+-                tessdata
+-            )
+-        )
+-    else:
+-        TESSDATA_PREFIX = tessdata
+-
+-
+-if sys.platform[:3] == "win":
+-    libnames += [
+-        # Jflesch> Don't they have the equivalent of LD_LIBRARY_PATH on
+-        # Windows ?
+-        "../vs2010/DLL_Release/libtesseract302.dll",
+-        "libtesseract302.dll",
+-        "C:\\Program Files (x86)\\Tesseract-OCR\\libtesseract-4.dll",
+-        "C:\\Program Files (x86)\\Tesseract-OCR\\libtesseract-3.dll",
+-    ]
+-else:
+-    libnames += [
+-        "libtesseract.so.4",
+-        "libtesseract.so.3",
+-    ]
+-
+-
+-g_libtesseract = None
+-
+-for libname in libnames:
+-    try:
+-        g_libtesseract = ctypes.cdll.LoadLibrary(libname)
+-        break
+-    except OSError:
+-        pass
++g_libtesseract = ctypes.cdll.LoadLibrary('@NIX_LIBTESSERACT_PATH@')
+ 
+ 
+ class PageSegMode(object):
+@@ -326,12 +284,11 @@ def init(lang=None):
+     try:
+         if lang:
+             lang = lang.encode("utf-8")
+-        prefix = None
+-        if TESSDATA_PREFIX:
+-            prefix = TESSDATA_PREFIX.encode("utf-8")
++        prefix = os.getenv('TESSDATA_PREFIX', '@NIX_TESSDATA_PREFIX@')
++        os.environ['TESSDATA_PREFIX'] = prefix
+         g_libtesseract.TessBaseAPIInit3(
+             ctypes.c_void_p(handle),
+-            ctypes.c_char_p(prefix),
++            ctypes.c_char_p(prefix.encode('utf-8')),
+             ctypes.c_char_p(lang)
+         )
+         g_libtesseract.TessBaseAPISetVariable(
+diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py
+index c935881..7139ffe 100755
+--- a/src/pyocr/tesseract.py
++++ b/src/pyocr/tesseract.py
+@@ -31,8 +31,7 @@ from .builders import DigitBuilder  # backward compatibility
+ from .error import TesseractError  # backward compatibility
+ from .util import digits_only
+ 
+-# CHANGE THIS IF TESSERACT IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY
+-TESSERACT_CMD = 'tesseract.exe' if os.name == 'nt' else 'tesseract'
++TESSERACT_CMD = '@NIX_TESSERACT_CMD@'
+ 
+ TESSDATA_EXTENSION = ".traineddata"
+ 
diff --git a/pkgs/development/python-modules/pyocr/tesseract.patch b/pkgs/development/python-modules/pyocr/tesseract.patch
deleted file mode 100644
index d09a7c57352..00000000000
--- a/pkgs/development/python-modules/pyocr/tesseract.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-This patch is required for pyocr to work with Tesseract version 3.05.00
-and has been submitted upstream at the following URL:
-
-https://github.com/jflesch/pyocr/pull/62
-
-diff --git a/src/pyocr/builders.py b/src/pyocr/builders.py
-index 73c964d..20f390c 100644
---- a/src/pyocr/builders.py
-+++ b/src/pyocr/builders.py
-@@ -240,8 +240,10 @@ class BaseBuilder(object):
-         cuneiform_args : Arguments passed to the Cuneiform command line.
-     """
- 
--    def __init__(self, file_extensions, tesseract_configs, cuneiform_args):
-+    def __init__(self, file_extensions, tesseract_flags, tesseract_configs,
-+                 cuneiform_args):
-         self.file_extensions = file_extensions
-+        self.tesseract_flags = tesseract_flags
-         self.tesseract_configs = tesseract_configs
-         self.cuneiform_args = cuneiform_args
- 
-@@ -298,7 +300,7 @@ class TextBuilder(BaseBuilder):
-     def __init__(self, tesseract_layout=3, cuneiform_dotmatrix=False,
-                  cuneiform_fax=False, cuneiform_singlecolumn=False):
-         file_ext = ["txt"]
--        tess_conf = ["-psm", str(tesseract_layout)]
-+        tess_flags = ["-psm", str(tesseract_layout)]
-         cun_args = ["-f", "text"]
-         # Add custom cuneiform parameters if needed
-         for par, arg in [(cuneiform_dotmatrix, "--dotmatrix"),
-@@ -306,7 +308,7 @@ class TextBuilder(BaseBuilder):
-                          (cuneiform_singlecolumn, "--singlecolumn")]:
-             if par:
-                 cun_args.append(arg)
--        super(TextBuilder, self).__init__(file_ext, tess_conf, cun_args)
-+        super(TextBuilder, self).__init__(file_ext, tess_flags, [], cun_args)
-         self.tesseract_layout = tesseract_layout
-         self.built_text = []
- 
-@@ -540,9 +542,11 @@ class WordBoxBuilder(BaseBuilder):
- 
-     def __init__(self, tesseract_layout=1):
-         file_ext = ["html", "hocr"]
--        tess_conf = ["hocr", "-psm", str(tesseract_layout)]
-+        tess_flags = ["-psm", str(tesseract_layout)]
-+        tess_conf = ["hocr"]
-         cun_args = ["-f", "hocr"]
--        super(WordBoxBuilder, self).__init__(file_ext, tess_conf, cun_args)
-+        super(WordBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf,
-+                                             cun_args)
-         self.word_boxes = []
-         self.tesseract_layout = tesseract_layout
- 
-@@ -614,9 +618,11 @@ class LineBoxBuilder(BaseBuilder):
- 
-     def __init__(self, tesseract_layout=1):
-         file_ext = ["html", "hocr"]
--        tess_conf = ["hocr", "-psm", str(tesseract_layout)]
-+        tess_flags = ["-psm", str(tesseract_layout)]
-+        tess_conf = ["hocr"]
-         cun_args = ["-f", "hocr"]
--        super(LineBoxBuilder, self).__init__(file_ext, tess_conf, cun_args)
-+        super(LineBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf,
-+                                             cun_args)
-         self.lines = []
-         self.tesseract_layout = tesseract_layout
- 
-diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py
-index 0c2259a..f7ab309 100644
---- a/src/pyocr/libtesseract/tesseract_raw.py
-+++ b/src/pyocr/libtesseract/tesseract_raw.py
-@@ -263,11 +263,22 @@ if g_libtesseract:
-     ]
-     g_libtesseract.TessDeleteText.restype = None
- 
--    g_libtesseract.TessBaseAPIDetectOS.argtypes = [
--        ctypes.c_void_p,  # TessBaseAPI*
--        ctypes.POINTER(OSResults),
--    ]
--    g_libtesseract.TessBaseAPIDetectOS.restype = ctypes.c_bool
-+    if hasattr(g_libtesseract, 'TessBaseAPIDetectOrientationScript'):
-+        g_libtesseract.TessBaseAPIDetectOrientationScript.argtypes = [
-+            ctypes.c_void_p,  # TessBaseAPI*
-+            ctypes.POINTER(ctypes.c_int),  # orient_deg
-+            ctypes.POINTER(ctypes.c_float),  # orient_conf
-+            ctypes.POINTER(ctypes.c_char_p),  # script_name
-+            ctypes.POINTER(ctypes.c_float),  # script_conf
-+        ]
-+        g_libtesseract.TessBaseAPIDetectOrientationScript.restype = \
-+            ctypes.c_bool
-+    else:
-+        g_libtesseract.TessBaseAPIDetectOS.argtypes = [
-+            ctypes.c_void_p,  # TessBaseAPI*
-+            ctypes.POINTER(OSResults),
-+        ]
-+        g_libtesseract.TessBaseAPIDetectOS.restype = ctypes.c_bool
- 
- 
- def init(lang=None):
-@@ -526,15 +537,37 @@ def detect_os(handle):
-     global g_libtesseract
-     assert(g_libtesseract)
- 
--    results = OSResults()
--    r = g_libtesseract.TessBaseAPIDetectOS(
--        ctypes.c_void_p(handle),
--        ctypes.pointer(results)
--    )
--    if not r:
--        raise TesseractError("detect_orientation failed",
--                             "TessBaseAPIDetectOS() failed")
--    return {
--        "orientation": results.best_orientation_id,
--        "confidence": results.best_oconfidence,
--    }
-+    # Use the new API function if it is available, because since Tesseract
-+    # 3.05.00 the old API function _always_ returns False.
-+    if hasattr(g_libtesseract, 'TessBaseAPIDetectOrientationScript'):
-+        orientation_deg = ctypes.c_int(0)
-+        orientation_confidence = ctypes.c_float(0.0)
-+
-+        r = g_libtesseract.TessBaseAPIDetectOrientationScript(
-+            ctypes.c_void_p(handle),
-+            ctypes.byref(orientation_deg),
-+            ctypes.byref(orientation_confidence),
-+            None,  # script_name
-+            None  # script_confidence
-+        )
-+
-+        if not r:
-+            raise TesseractError("detect_orientation failed",
-+                                 "TessBaseAPIDetectOrientationScript() failed")
-+        return {
-+            "orientation": round(orientation_deg.value / 90),
-+            "confidence": orientation_confidence.value,
-+        }
-+    else:  # old API (before Tesseract 3.05.00)
-+        results = OSResults()
-+        r = g_libtesseract.TessBaseAPIDetectOS(
-+            ctypes.c_void_p(handle),
-+            ctypes.pointer(results)
-+        )
-+        if not r:
-+            raise TesseractError("detect_orientation failed",
-+                                 "TessBaseAPIDetectOS() failed")
-+        return {
-+            "orientation": results.best_orientation_id,
-+            "confidence": results.best_oconfidence,
-+        }
-diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py
-index 99b0121..658c96b 100755
---- a/src/pyocr/tesseract.py
-+++ b/src/pyocr/tesseract.py
-@@ -22,6 +22,8 @@ import os
- import subprocess
- import sys
- import tempfile
-+import contextlib
-+import shutil
- 
- from . import builders
- from . import error
-@@ -62,9 +64,11 @@ class CharBoxBuilder(builders.BaseBuilder):
- 
-     def __init__(self):
-         file_ext = ["box"]
-+        tess_flags = []
-         tess_conf = ["batch.nochop", "makebox"]
-         cun_args = []
--        super(CharBoxBuilder, self).__init__(file_ext, tess_conf, cun_args)
-+        super(CharBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf,
-+                                             cun_args)
-         self.tesseract_layout = 1
- 
-     @staticmethod
-@@ -173,18 +177,19 @@ def detect_orientation(image, lang=None):
-         TesseractError --- if no script detected on the image
-     """
-     _set_environment()
--    with temp_file(".bmp") as input_file:
--        command = [TESSERACT_CMD, input_file.name, 'stdout', "-psm", "0"]
-+    with temp_dir() as tmpdir:
-+        command = [TESSERACT_CMD, "input.bmp", 'stdout', "-psm", "0"]
-         if lang is not None:
-             command += ['-l', lang]
- 
-         if image.mode != "RGB":
-             image = image.convert("RGB")
--        image.save(input_file.name)
-+        image.save(os.path.join(tmpdir, "input.bmp"))
- 
-         proc = subprocess.Popen(command, stdin=subprocess.PIPE, shell=False,
-                                 startupinfo=g_subprocess_startup_info,
-                                 creationflags=g_creation_flags,
-+                                cwd=tmpdir,
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.STDOUT)
-         proc.stdin.close()
-@@ -224,8 +229,8 @@ def get_available_builders():
-     ]
- 
- 
--def run_tesseract(input_filename, output_filename_base, lang=None,
--                  configs=None):
-+def run_tesseract(input_filename, output_filename_base, cwd=None, lang=None,
-+                  flags=None, configs=None):
-     '''
-     Runs Tesseract:
-         `TESSERACT_CMD` \
-@@ -238,6 +243,8 @@ def run_tesseract(input_filename, output_filename_base, lang=None,
-         input_filename --- image to read
-         output_filename_base --- file name in which must be stored the result
-             (without the extension)
-+        cwd --- Run Tesseract in the specified working directory or use current
-+            one if None
-         lang --- Tesseract language to use (if None, none will be specified)
-         config --- List of Tesseract configs to use (if None, none will be
-             specified)
-@@ -252,10 +259,13 @@ def run_tesseract(input_filename, output_filename_base, lang=None,
-     if lang is not None:
-         command += ['-l', lang]
- 
-+    if flags is not None:
-+        command += flags
-+
-     if configs is not None:
-         command += configs
- 
--    proc = subprocess.Popen(command,
-+    proc = subprocess.Popen(command, cwd=cwd,
-                             startupinfo=g_subprocess_startup_info,
-                             creationflags=g_creation_flags,
-                             stdout=subprocess.PIPE,
-@@ -301,11 +311,18 @@ class ReOpenableTempfile(object):
-             self.name = None
- 
- 
--def temp_file(suffix):
--    ''' Returns a temporary file '''
--    if os.name == 'nt':  # Windows
--        return ReOpenableTempfile(suffix)
--    return tempfile.NamedTemporaryFile(prefix='tess_', suffix=suffix)
-+@contextlib.contextmanager
-+def temp_dir():
-+    """
-+    A context manager for maintaining a temporary directory
-+    """
-+    # NOTE: Drop this as soon as we don't support Python 2.7 anymore, because
-+    # since Python 3.2 there is a context manager called TemporaryDirectory().
-+    path = tempfile.mkdtemp(prefix='tess_')
-+    try:
-+        yield path
-+    finally:
-+        shutil.rmtree(path)
- 
- 
- def image_to_string(image, lang=None, builder=None):
-@@ -329,23 +346,20 @@ def image_to_string(image, lang=None, builder=None):
- 
-     if builder is None:
-         builder = builders.TextBuilder()
--    with temp_file(".bmp") as input_file:
--        with temp_file('') as output_file:
--            output_file_name_base = output_file.name
--
-+    with temp_dir() as tmpdir:
-         if image.mode != "RGB":
-             image = image.convert("RGB")
--        image.save(input_file.name)
--        (status, errors) = run_tesseract(input_file.name,
--                                         output_file_name_base,
-+        image.save(os.path.join(tmpdir, "input.bmp"))
-+        (status, errors) = run_tesseract("input.bmp", "output", cwd=tmpdir,
-                                          lang=lang,
-+                                         flags=builder.tesseract_flags,
-                                          configs=builder.tesseract_configs)
-         if status:
-             raise TesseractError(status, errors)
- 
-         output_file_name = "ERROR"
-         for file_extension in builder.file_extensions:
--            output_file_name = ('%s.%s' % (output_file_name_base,
-+            output_file_name = ('%s.%s' % (os.path.join(tmpdir, "output"),
-                                            file_extension))
-             if not os.access(output_file_name, os.F_OK):
-                 continue
-diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py
-index ccddd07..1ac2a4b 100644
---- a/tests/tests_libtesseract.py
-+++ b/tests/tests_libtesseract.py
-@@ -33,8 +33,9 @@ class TestContext(unittest.TestCase):
-             (3, 3, 0),
-             (3, 4, 0),
-             (3, 4, 1),
-+            (3, 5, 0),
-         ), ("Tesseract does not have the expected version"
--            " (3.4.0) ! Some tests will be skipped !"))
-+            " (3.5.0) ! Some tests will be skipped !"))
- 
-     def test_langs(self):
-         langs = libtesseract.get_available_languages()
-diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py
-index e29c512..fa4d483 100644
---- a/tests/tests_tesseract.py
-+++ b/tests/tests_tesseract.py
-@@ -27,8 +27,9 @@ class TestContext(unittest.TestCase):
-             (3, 3, 0),
-             (3, 4, 0),
-             (3, 4, 1),
-+            (3, 5, 0),
-         ), ("Tesseract does not have the expected version"
--            " (3.4.0) ! Some tests will be skipped !"))
-+            " (3.5.0) ! Some tests will be skipped !"))
- 
-     def test_langs(self):
-         langs = tesseract.get_available_languages()

From e0b44a09b84ed462b98b2c1fa841253be801ef8c Mon Sep 17 00:00:00 2001
From: xd1le <elisp.vim@gmail.com>
Date: Sat, 2 Sep 2017 16:17:53 +1000
Subject: [PATCH 3207/3246] interception-tools: init at 0.1.1

The latest release of libyamlcpp in nixpkgs does not build because it
uses an older version of boost than the one in nixpkgs and therefore
expects a particular header file which does not exist in the latest
boost anymore. For this reason, a later (git) version of libyamlcpp is
used here (which actually doesn't even require boost).

The substituteInPlace in the prePatch phase is needed because libevdev
places its headers in non-standard places, meaning Nix cannot normally
find them. The `cut` command removes the first two "-I" characters from
the output of `pkg-config`. This needs to be in the prePatch phase
because otherwise Nix will patch these lines to `/var/empty`, meaning
you would have less specific replacement (in case other lines are also
patched to `/var/empty`).

I wrote the patch. (I believe it is NixOS specific.)
---
 nixos/modules/module-list.nix                 |  1 +
 .../services/hardware/interception-tools.nix  | 61 +++++++++++++++++++
 .../interception-tools/caps2esc.nix           | 23 +++++++
 .../interception-tools/default.nix            | 33 ++++++++++
 .../fix-udevmon-configuration-job-path.patch  | 32 ++++++++++
 pkgs/top-level/all-packages.nix               | 22 +++++++
 6 files changed, 172 insertions(+)
 create mode 100644 nixos/modules/services/hardware/interception-tools.nix
 create mode 100644 pkgs/tools/inputmethods/interception-tools/caps2esc.nix
 create mode 100644 pkgs/tools/inputmethods/interception-tools/default.nix
 create mode 100644 pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bfc554cc936..b2400d14d35 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -224,6 +224,7 @@
   ./services/hardware/brltty.nix
   ./services/hardware/freefall.nix
   ./services/hardware/illum.nix
+  ./services/hardware/interception-tools.nix
   ./services/hardware/irqbalance.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
diff --git a/nixos/modules/services/hardware/interception-tools.nix b/nixos/modules/services/hardware/interception-tools.nix
new file mode 100644
index 00000000000..fadcb19a016
--- /dev/null
+++ b/nixos/modules/services/hardware/interception-tools.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.interception-tools;
+in {
+  options.services.interception-tools = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Whether to enable the interception tools service.";
+    };
+
+    plugins = mkOption {
+      type = types.listOf types.package;
+      default = [ pkgs.interception-tools-plugins.caps2esc ];
+      description = ''
+        A list of interception tools plugins that will be made available to use
+        inside the udevmon configuration.
+      '';
+    };
+
+    udevmonConfig = mkOption {
+      type = types.either types.str types.path;
+      default = ''
+        - JOB: "intercept -g $DEVNODE | caps2esc | uinput -d $DEVNODE"
+          DEVICE:
+            EVENTS:
+              EV_KEY: [KEY_CAPSLOCK, KEY_ESC]
+      '';
+      example = ''
+        - JOB: "intercept -g $DEVNODE | y2z | x2y | uinput -d $DEVNODE"
+          DEVICE:
+            EVENTS:
+              EV_KEY: [KEY_X, KEY_Y]
+      '';
+      description = ''
+        String of udevmon YAML configuration, or path to a udevmon YAML
+        configuration file.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.interception-tools = {
+      description = "Interception tools";
+      path = [ pkgs.bash pkgs.interception-tools ] ++ cfg.plugins;
+      serviceConfig = {
+        ExecStart = ''
+          ${pkgs.interception-tools}/bin/udevmon -c \
+          ${if builtins.typeOf cfg.udevmonConfig == "path"
+          then cfg.udevmonConfig
+          else pkgs.writeText "udevmon.yaml" cfg.udevmonConfig}
+        '';
+        Nice = -20;
+      };
+      wantedBy = [ "multi-user.target" ];
+    };
+  };
+}
diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
new file mode 100644
index 00000000000..b31a24b0c83
--- /dev/null
+++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake }:
+
+let
+  version = "0.1.0";
+  pname = "interception-tools-caps2esc";
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://gitlab.com/interception/linux/plugins/caps2esc/repository/v${version}/archive.tar.gz";
+    sha256 = "1fdxqp54gwsrm2c63168l256nfwdk4mvgr7nlwdv62wd3l7zzrg8";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = {
+    homepage = "https://gitlab.com/interception/linux/plugins/caps2esc";
+    description = "Transforming the most useless key ever into the most useful one";
+    license = stdenv.lib.licenses.mit;
+    maintainers = stdenv.lib.maintainers.vyp;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
new file mode 100644
index 00000000000..ba54d4954c5
--- /dev/null
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcppWithoutBoost,
+  libevdev, libudev }:
+
+let
+  version = "0.1.1";
+  baseName = "interception-tools";
+in stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://gitlab.com/interception/linux/tools/repository/v${version}/archive.tar.gz";
+    sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake libevdev libudev libyamlcppWithoutBoost ];
+
+  prePatch = ''
+    substituteInPlace CMakeLists.txt --replace \
+      '"/usr/include/libevdev-1.0"' \
+      "\"$(pkg-config --cflags libevdev | cut -c 3-)\""
+  '';
+
+  patches = [ ./fix-udevmon-configuration-job-path.patch ];
+
+  meta = {
+    description = "A minimal composable infrastructure on top of libudev and libevdev";
+    homepage = "https://gitlab.com/interception/linux/tools";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = stdenv.lib.maintainers.vyp;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch b/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch
new file mode 100644
index 00000000000..469c96647d6
--- /dev/null
+++ b/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch
@@ -0,0 +1,32 @@
+From d3a5d661b80f3597368f517ebaeddfdfaafc1bf2 Mon Sep 17 00:00:00 2001
+From: xd1le <elisp.vim@gmail.com>
+Date: Mon, 28 Aug 2017 00:19:09 +1000
+Subject: [PATCH] fix udevmon configuration job path
+
+For some reason, the udevmon job $PATH seems to be empty (or otherwise
+seems to point to `/no-such-path`). This commit fixes that by setting
+its $PATH to the same $PATH that the parent udevmon process has.
+---
+ udevmon.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/udevmon.cpp b/udevmon.cpp
+index ebdd909..b523efd 100644
+--- a/udevmon.cpp
++++ b/udevmon.cpp
+@@ -237,8 +237,11 @@ private:
+             case 0: {
+                 char *command[] = {(char *)"sh", (char *)"-c",
+                                    (char *)job.c_str(), nullptr};
++                std::string path = getenv("PATH");
+                 std::string variables = "DEVNODE=" + devnode;
+-                char *environment[]   = {(char *)variables.c_str(), nullptr};
++                std::string pathenv = "PATH=" + path;
++                char *environment[] = {(char *)variables.c_str(),
++                                       (char *)pathenv.c_str(), nullptr};
+                 execvpe(command[0], command, environment);
+                 std::fprintf(stderr,
+                              R"(exec failed for devnode %s, job "%s" )"
+-- 
+2.14.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6684d0accd0..6af019c9167 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1450,6 +1450,11 @@ with pkgs;
     plugins = [ ];
   };
 
+  interception-tools = callPackage ../tools/inputmethods/interception-tools { };
+  interception-tools-plugins = {
+    caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { };
+  };
+
   brotli = callPackage ../tools/compression/brotli { };
 
   brotliUnstable = callPackage ../tools/compression/brotli/unstable.nix { };
@@ -9383,6 +9388,23 @@ with pkgs;
 
   libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
 
+  # interception-tools needs this. This should be removed when there is a new
+  # release of libyamlcpp, i.e. when the version of libyamlcpp is newer than
+  # 0.5.3.
+  libyamlcppWithoutBoost = libyamlcpp.overrideAttrs (oldAttrs: rec {
+    name = "libyaml-cpp-${version}";
+    version = "2017-08-25";
+
+    src = fetchFromGitHub {
+      owner = "jbeder";
+      repo = "yaml-cpp";
+      rev = "beb44b872c07c74556314e730c6f20a00b32e8e5";
+      sha256 = "1qkr3i5lin6m36w5rbimc7pjx3nx686xnjb6lw00xf67iqrl4h4m";
+    };
+
+    buildInputs = [ cmake ];
+  });
+
   libykneomgr = callPackage ../development/libraries/libykneomgr { };
 
   libytnef = callPackage ../development/libraries/libytnef { };

From 3ff173ffde475f96f12b379f4ae21658e63045c1 Mon Sep 17 00:00:00 2001
From: Unai Zalakain <unai@gisa-elkartea.org>
Date: Wed, 30 Aug 2017 16:04:29 +0200
Subject: [PATCH 3208/3246] jrnl: support journal encryption by default

---
 pkgs/applications/misc/jrnl/default.nix | 32 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 pkgs/top-level/python-packages.nix      | 21 ----------------
 3 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/applications/misc/jrnl/default.nix

diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix
new file mode 100644
index 00000000000..fc8b8043b94
--- /dev/null
+++ b/pkgs/applications/misc/jrnl/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, python
+}:
+
+with python.pkgs;
+
+buildPythonApplication rec {
+  pname = "jrnl";
+  version = "1.9.8";
+  name = "${pname}-${version}";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d254c9c8f24dcf985b98a1d5311337c7f416e6305107eec34c567f58c95b06f4";
+  };
+
+  propagatedBuildInputs = [
+    pytz six tzlocal keyring argparse dateutil_1_5
+    parsedatetime pycrypto
+  ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://maebert.github.io/jrnl/;
+    description = "A simple command line journal application that stores your journal in a plain text file";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zalakain ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 417c45b73d9..d25400b0001 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2732,6 +2732,8 @@ with pkgs;
 
   jo = callPackage ../development/tools/jo { };
 
+  jrnl = callPackage ../applications/misc/jrnl { };
+
   jscoverage = callPackage ../development/tools/misc/jscoverage { };
 
   jsduck = callPackage ../development/tools/jsduck { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 46014eee0c3..97265230beb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11503,27 +11503,6 @@ in {
     inherit (self) systemd pytest;
   };
 
-  jrnl = buildPythonPackage rec {
-    name = "jrnl-1.9.7";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jrnl/${name}.tar.gz";
-      sha256 = "af599a863ac298533685a7236fb86307eebc00a38eb8bb96f4f67b5d83227ec8";
-    };
-
-    propagatedBuildInputs = with self; [
-      pytz six tzlocal keyring argparse dateutil_1_5
-      parsedatetime
-    ];
-
-    meta = {
-      homepage = http://maebert.github.io/jrnl/;
-      description = "A simple command line journal application that stores your journal in a plain text file";
-      license = licenses.mit;
-    };
-  };
-
   jsonnet = buildPythonPackage {
     inherit (pkgs.jsonnet) name src;
   };

From fc143bf1a3b6bde93385c825d1b9cf7c84d65ac1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 2 Sep 2017 03:54:33 -0500
Subject: [PATCH 3209/3246] iverilog: 2016.05.21 -> 2017.08.12

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/electronics/verilog/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix
index d5c5f2ad130..f31685b68ea 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/pkgs/applications/science/electronics/verilog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "iverilog-${version}";
-  version = "2016.05.21";
+  version = "2017.08.12";
 
   src = fetchFromGitHub {
     owner = "steveicarus";
     repo = "iverilog";
-    rev = "45fbf558065c0fdac9aa088ecd34e9bf49e81305";
-    sha256 = "137p7gkmp5kwih93i2a3lcf36a6k38j7fxglvw9y59w0233vj452";
+    rev = "ac87138c44cd6089046668c59a328b4d14c16ddc";
+    sha256 = "1npv0533h0h2wxrxkgiaxqiasw2p4kj2vv5bd69w5xld227xcwpg";
   };
 
   patchPhase = ''

From e3bc5171df2ba1d640da05b1dfc870e5e1557483 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 2 Sep 2017 04:03:53 -0500
Subject: [PATCH 3210/3246] icestorm: 2016.11.01 -> 2017.08.31

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/icestorm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 9bfd0123ef1..149901b78ea 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "icestorm-${version}";
-  version = "2016.11.01";
+  version = "2017.08.31";
 
   src = fetchFromGitHub {
     owner = "cliffordwolf";
     repo = "icestorm";
-    rev = "01b9822638d60e048c295d005257daa4c147761f";
-    sha256 = "088wnf55m9ii98w8j7qc99spq95y19xw4fnnw9mxi7cfkxxggsls";
+    rev = "8354bc6086f11002cc58497f91f43200a09c13a9";
+    sha256 = "0mg6sp5ymdxmkyzmssyavsjicw0z74bn4lv1jqwxjnmynw5l0f9b";
   };
 
   buildInputs = [ python3 libftdi ];

From 32297e1baf4993fbda4240800025acf754f65f55 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 2 Sep 2017 04:02:52 -0500
Subject: [PATCH 3211/3246] arachne-pnr: 2016.08.18 -> 2017.06.29, license
 switch

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/arachne-pnr/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index 52a3b485d91..6508b05a534 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "arachne-pnr-${version}";
-  version = "2016.08.18";
+  version = "2017.06.29";
 
   src = fetchFromGitHub {
     owner = "cseed";
     repo = "arachne-pnr";
-    rev = "52e69ed207342710080d85c7c639480e74a021d7";
-    sha256 = "15bdw5yxj76lxrwksp6liwmr6l1x77isf4bs50ys9rsnmiwh8c3w";
+    rev = "7e135edb31feacde85ec5b7e5c03fc9157080977";
+    sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8";
   };
 
   preBuild = ''
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       the IceStorm [2] icepack command.
     '';
     homepage = https://github.com/cseed/arachne-pnr;
-    license = stdenv.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.shell ];
     platforms = stdenv.lib.platforms.linux;
   };

From cd7b2ec77a8556126eab697b2cc20e26a159f37b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 2 Sep 2017 04:01:19 -0500
Subject: [PATCH 3212/3246] yosys: 2016.11.25 -> 2017.09.01

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index b91eddee3bf..ed374ea6822 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2016.11.25";
+  version = "2017.09.01";
 
   srcs = [
     (fetchFromGitHub {
       owner = "cliffordwolf";
       repo = "yosys";
-      rev = "5c2c78e2dd12a860f830dafd73fbed8edf1a3823";
-      sha256 = "1cvfkg0hllp7k2g52mxczd8d0ad7inlpkg27rrbyani2kg0066bk";
+      rev = "18609f3df82a3403c41d552908183f7e49ff5678";
+      sha256 = "0qdjxqg3l098g8pda5a4cif4bd78rx7vilv3z62r56ppj55mgw96";
       name = "yosys";
     })
     (fetchFromBitbucket {
       owner = "alanmi";
       repo = "abc";
-      rev = "238674cd44f2";
-      sha256 = "18xk7lqai05am11zymixilgam4jvz5f2jwy9cgillz035man2yzw";
+      rev = "ff5be0604997";
+      sha256 = "08gdvxm44dvhgjw6lf2jx0xyk6h4ai37h6b88dysvaa69sx7rh8n";
       name = "yosys-abc";
     })
   ];

From 583ebc086c64d6456af8e6d960377d0693ffc8a2 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 2 Sep 2017 04:06:22 -0500
Subject: [PATCH 3213/3246] yices: now under GPLv3

This means Hydra can build it now!

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/yices/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 489ca744bea..5e2bf8d2624 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A high-performance theorem prover and SMT solver";
     homepage    = "http://yices.csl.sri.com";
-    license     = licenses.unfreeRedistributable;
+    license     = licenses.gpl3;
     platforms   = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.thoughtpolice ];
   };

From 54ae0aa1b08efbb82d76dbe5601e06cf7dc7a8b1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 2 Sep 2017 04:15:20 -0500
Subject: [PATCH 3214/3246] z3_opt: remove and replace with z3

Z3 has supported optimization features since the 4.4.x release, so this can be
removed.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/z3_opt/default.nix          | 46 -------------------
 pkgs/development/compilers/souper/default.nix |  4 +-
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/z3_opt/default.nix

diff --git a/pkgs/applications/science/logic/z3_opt/default.nix b/pkgs/applications/science/logic/z3_opt/default.nix
deleted file mode 100644
index d3d63795d69..00000000000
--- a/pkgs/applications/science/logic/z3_opt/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchFromGitHub, python2 }:
-
-# Copied shamelessly from the normal z3 .nix
-
-let
-  python = python2;
-in stdenv.mkDerivation rec {
-  name = "z3_opt-${version}";
-  version = "4.3.2";
-
-  src = fetchFromGitHub {
-    owner  = "Z3Prover";
-    repo   = "z3";
-    rev    = "9377779e5818b2ca15c4f39921b2ba3a42f948e7";
-    sha256 = "15d6hsb61hrm5vy3l2gnkrfnqr68lvspnznm17vyhm61ld33yaff";
-  };
-
-  buildInputs = [ python ];
-  enableParallelBuilding = true;
-
-  configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build";
-
-  # z3's install phase is stupid because it tries to calculate the
-  # python package store location itself, meaning it'll attempt to
-  # write files into the nix store, and fail.
-  soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
-  installPhase = ''
-    mkdir -p $out/bin $out/${python.sitePackages} $out/include
-    cp ../src/api/z3*.h       $out/include
-    cp ../src/api/c++/z3*.h   $out/include
-    cp z3                     $out/bin
-    cp libz3${soext}          $out/lib
-    cp libz3${soext}          $out/${python.sitePackages}
-    cp z3*.pyc                $out/${python.sitePackages}
-    cp ../src/api/python/*.py $out/${python.sitePackages}
-  '';
-
-  meta = {
-    description = "A high-performance theorem prover and SMT solver, optimization edition";
-    homepage    = "https://github.com/Z3Prover/z3";
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice sheganinans ];
-  };
-}
-
diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix
index 327139ce045..2203dc980b1 100644
--- a/pkgs/development/compilers/souper/default.nix
+++ b/pkgs/development/compilers/souper/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, makeWrapper
-, llvmPackages_4, hiredis, z3_opt, gtest
+, llvmPackages_4, hiredis, z3, gtest
 }:
 
 let
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
       cp -v ./souper       $out/bin/
       cp -v ./clang-souper $out/bin/
       wrapProgram "$out/bin/souper" \
-          --add-flags "-z3-path=\"${z3_opt}/bin/z3\""
+          --add-flags "-z3-path=\"${z3}/bin/z3\""
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d25400b0001..6bbba06b9ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18407,7 +18407,6 @@ with pkgs;
   };
 
   z3 = callPackage ../applications/science/logic/z3 {};
-  z3_opt = callPackage ../applications/science/logic/z3_opt {};
 
   boolector = callPackage ../applications/science/logic/boolector {};
 

From b7d257a5207f3b7e9cfe002e8b77853c97d5b697 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Sep 2017 12:06:37 +0200
Subject: [PATCH 3215/3246] Python docs: add section on tests

---
 doc/languages-frameworks/python.md | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index f2de0225b1d..298da8f9f0d 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -774,6 +774,21 @@ The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and
 Both are also exported in `nix-shell`.
 
 
+### Automatic tests
+
+It is recommended to test packages as part of the build process.
+Source distributions (`sdist`) often include test files, but not always.
+
+By default the command `python setup.py test` is run as part of the
+`checkPhase`, but often it is necessary to pass a custom `checkPhase`. An
+example of such a situation is when `py.test` is used.
+
+#### Common issues
+
+- Non-working tests can often be deselected. In the case of `py.test`: `py.test -k 'not function_name and not other_function'`.
+- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`.
+- Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
+
 ## FAQ
 
 ### How to solve circular dependencies?
@@ -985,8 +1000,9 @@ rec {
 
 Following rules are desired to be respected:
 
-* Python libraries are supposed to be called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in `pkgs/development/python-modules/<name>/default.nix`. Libraries in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
+* Python libraries are called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in `pkgs/development/python-modules/<name>/default.nix`. Libraries in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
 * Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
 * Make sure libraries build for all Python interpreters.
 * By default we enable tests. Make sure the tests are found and, in the case of libraries, are passing for all interpreters. If certain tests fail they can be disabled individually. Try to avoid disabling the tests altogether. In any case, when you disable tests, leave a comment explaining why.
-* Commit names of Python libraries should include `pythonPackages`, for example `pythonPackages.numpy: 1.11 -> 1.12`.
+* Commit names of Python libraries should reflect that they are Python libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`.
+

From 991654fa4ab7be07ce70b02bcc935491239a52c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 1 Sep 2017 16:49:50 +0200
Subject: [PATCH 3216/3246] haskell: add combinator to enable DWARF debugging

Tested using:

$ cat test-strip.nix
with (import ./. {});
with haskell.lib;

haskell.packages.ghc802.override {
  overrides = self: super: {
    microlens = enableDWARFDebugging super.microlens;
  };
}

$ nix-build -A microlens test-strip.nix
$ objdump -t <path-to-so-file>
---
 pkgs/development/haskell-modules/lib.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 6da19794f6f..48110cffabf 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -73,6 +73,17 @@ rec {
 
   disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; });
 
+  # Controls if Nix should strip the binary files (removes debug symbols)
+  doStrip = drv: overrideCabal drv (drv: { dontStrip = false; });
+  dontStrip = drv: overrideCabal drv (drv: { dontStrip = true; });
+
+  # Useful for debugging segfaults with gdb. 
+  # -g: enables debugging symbols
+  # --disable-*-stripping: tell GHC not to strip resulting binaries
+  # dontStrip: see above
+  enableDWARFDebugging = drv:
+   appendConfigureFlag (dontStrip drv) "--ghc-options=-g --disable-executable-stripping --disable-library-stripping";
+
   sdistTarball = pkg: lib.overrideDerivation pkg (drv: {
     name = "${drv.pname}-source-${drv.version}";
     # Since we disable the haddock phase, we also need to override the

From 6a1be3d4f4ed5d4163f7fd0c061744e472f97183 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 2 Sep 2017 03:57:10 -0700
Subject: [PATCH 3217/3246] dolphinEmuMaster: 20170730 -> 20170902

many bugfixes and features implemented, included accurate NAND support
and ubershaders v2
---
 pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 31e22240c3b..ca36d16072d 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -4,12 +4,12 @@
 , libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20170730";
+  name = "dolphin-emu-20170902";
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "141fb0f03ca4e0d05f7ccbf3e020997097f60dbe";
-    sha256 = "1b4ygrfj1dpmyv7qqfnqrrvm96a3b68cwcnvv2pknrcpc17g52im";
+    rev = "b073db51e5f3df8c9890e09a3f4f8a2276c31e3f";
+    sha256 = "0pr5inkd7swc6s7im7axhvmkdbqidhrha2wpflnr25aiwq0dzm10";
   };
 
   cmakeFlags = ''

From 0604ea66c680828c0d56d7fbfbdb4e25d8dd1e3f Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 2 Sep 2017 21:39:40 +1000
Subject: [PATCH 3218/3246] ekiga: fix build

---
 .../networking/instant-messengers/ekiga/default.nix   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 575759ad437..d4bb8bd55e0 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, glib, fetchurl, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
+{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
 , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook
 , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
 , pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme
@@ -34,7 +34,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = [ ./autofoo.patch ./boost.patch ];
+  patches = [
+    ./autofoo.patch
+    ./boost.patch
+    (fetchpatch { url = https://src.fedoraproject.org/rpms/ekiga/raw/dbf5f5ba449d22bd79f0394cddb7d4d8a88ec6ac/f/ekiga-4.0.1-libresolv.patch;
+      sha256 = "18wc68im8422ibpa0gkrkgjq41m7hikaha3xqmjs2km45i1cwcaz";
+    })
+  ];
 
   postInstall = ''
     wrapProgram "$out"/bin/ekiga \
@@ -45,7 +51,6 @@ stdenv.mkDerivation rec {
     description = "VOIP/Videoconferencing app with full SIP and H.323 support";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
-    broken = true; # because of glibc-2.25
   };
 
   passthru = {

From f9c2cb80a6176df9b9f06938eaab9a356626ded2 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 2 Sep 2017 22:58:23 +1000
Subject: [PATCH 3219/3246] ekiga: make debian patches use fetchpatch

---
 .../instant-messengers/ekiga/autofoo.patch    | 11 -------
 .../instant-messengers/ekiga/boost.patch      | 31 -------------------
 .../instant-messengers/ekiga/default.nix      |  8 +++--
 3 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/ekiga/boost.patch

diff --git a/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch b/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch
deleted file mode 100644
index d15e8b6ccfd..00000000000
--- a/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@
- AC_PREREQ([2.53])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR(src/ekiga.cpp)
--AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
-+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
- 
- AM_MAINTAINER_MODE([enable])
- AC_CONFIG_HEADERS([config.h])
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/boost.patch b/pkgs/applications/networking/instant-messengers/ekiga/boost.patch
deleted file mode 100644
index 9dad3d94f04..00000000000
--- a/pkgs/applications/networking/instant-messengers/ekiga/boost.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/m4/ax_boost_base.m4
-+++ b/m4/ax_boost_base.m4
-@@ -33,7 +33,7 @@
- #   and this notice are preserved. This file is offered as-is, without any
- #   warranty.
- 
--#serial 20
-+#serial 22
- 
- AC_DEFUN([AX_BOOST_BASE],
- [
-@@ -91,9 +91,17 @@ if test "x$want_boost" = "xyes"; then
-     dnl are found, e.g. when only header-only libraries are installed!
-     libsubdirs="lib"
-     ax_arch=`uname -m`
--    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
-+    case $ax_arch in
-+      x86_64|ppc64|s390x|sparc64|aarch64)
-         libsubdirs="lib64 lib lib64"
--    fi
-+        ;;
-+    esac
-+
-+    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
-+    dnl them priority over the other paths since, if libs are found there, they
-+    dnl are almost assuredly the ones desired.
-+    AC_REQUIRE([AC_CANONICAL_HOST])
-+    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
- 
-     dnl first we check the system location for boost libraries
-     dnl this location ist chosen if boost libraries are installed with the --layout=system option
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index d4bb8bd55e0..283d38ef5c7 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -35,8 +35,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [
-    ./autofoo.patch
-    ./boost.patch
+    (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/autofoo.patch;
+      sha256 = "1vyagslws4mm9yfz1m5p1kv9sxmk5lls9vxpm6j72q2ahsgydzx4";
+    })
+    (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/boost.patch;
+      sha256 = "01k0rw8ibrrf9zn9lx6dzbrgy58w089hqxqxqdv9whb65cldlj5s";
+    })
     (fetchpatch { url = https://src.fedoraproject.org/rpms/ekiga/raw/dbf5f5ba449d22bd79f0394cddb7d4d8a88ec6ac/f/ekiga-4.0.1-libresolv.patch;
       sha256 = "18wc68im8422ibpa0gkrkgjq41m7hikaha3xqmjs2km45i1cwcaz";
     })

From 9dc256099f3bc143cd44180775a03d1ac2ff83cc Mon Sep 17 00:00:00 2001
From: Andrew Cobb <andrew.cobb@gmail.com>
Date: Sat, 2 Sep 2017 09:11:10 -0400
Subject: [PATCH 3220/3246] kupfer: init at 319 (#28719)

* kupfer: init at 319

* kupfer: wrap with wrapGAppsHook

* kupfer: fixing up runtime dependencies

* kupfer: added cobbal as maintainer
---
 lib/maintainers.nix                       |  1 +
 pkgs/applications/misc/kupfer/default.nix | 66 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 3 files changed, 69 insertions(+)
 create mode 100644 pkgs/applications/misc/kupfer/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fbdeff3c073..0859fba7b1d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -113,6 +113,7 @@
   cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
   cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>";
   cmfwyp = "cmfwyp <cmfwyp@riseup.net>";
+  cobbal = "Andrew Cobb <andrew.cobb@gmail.com>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   codsl = "codsl <codsl@riseup.net>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
new file mode 100644
index 00000000000..f3bb825cbf7
--- /dev/null
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -0,0 +1,66 @@
+{ stdenv
+, makeWrapper
+, fetchurl
+, intltool
+, python3Packages
+, gtk3
+, dbus
+, libwnck3
+, keybinder3
+, hicolor_icon_theme
+, wrapGAppsHook
+}:
+
+with python3Packages;
+
+buildPythonApplication rec {
+  name = "kupfer-${version}";
+  version = "319";
+
+  src = fetchurl {
+    url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz";
+    sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92";
+  };
+
+  nativeBuildInputs = [ wrapGAppsHook intltool ];
+  buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ];
+  propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
+
+  configurePhase = ''
+    runHook preConfigure
+    python ./waf configure --prefix=$prefix
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    python ./waf
+    runHook postBuild
+  '';
+
+  installPhase = let
+    pythonPath = (stdenv.lib.concatMapStringsSep ":"
+      (m: "${m}/lib/${python.libPrefix}/site-packages")
+      propagatedBuildInputs);
+  in ''
+    runHook preInstall
+    python ./waf install
+
+    gappsWrapperArgs+=(
+      "--prefix" "PYTHONPATH" : "${pythonPath}"
+      "--set" "PYTHONNOUSERSITE" "1"
+    )
+
+    runHook postInstall
+  '';
+
+  doCheck = false; # no tests
+
+  meta = with stdenv.lib; {
+    description = "A smart, quick launcher";
+    homepage    = "https://kupferlauncher.github.io/";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ cobbal ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bbba06b9ee..44f4c63bb23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15038,6 +15038,8 @@ with pkgs;
     go = go_1_7;
   };
 
+  kupfer = callPackage ../applications/misc/kupfer { };
+
   lame = callPackage ../development/libraries/lame { };
 
   larswm = callPackage ../applications/window-managers/larswm { };

From d5c342c657105495d74198c5cd5fc668509b7dd1 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Sat, 2 Sep 2017 07:02:02 -0400
Subject: [PATCH 3221/3246] i-score: 1.0.0-a67 -> 1.0.0-b31

---
 pkgs/applications/audio/i-score/default.nix | 34 ++++++++++++---------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index eb2b2ca0702..69fc4b419c0 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -1,8 +1,9 @@
 {
+  alsaLib,
   boost,
   cln,
   cmake,
-  fetchgit,
+  fetchFromGitHub,
   gcc,
   ginac,
   jamomacore,
@@ -10,9 +11,13 @@
   libsndfile,
   ninja,
   portaudio,
+  portmidi,
   qtbase,
   qtdeclarative,
   qtimageformats,
+  qtmultimedia,
+  qtquickcontrols2,
+  qtserialport,
   qtsvg,
   qttools,
   qtwebsockets,
@@ -21,18 +26,19 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0-a67";
+  version = "1.0.0-b31";
   name = "i-score-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/OSSIA/i-score.git";
-    rev = "ede2453b139346ae46702b5e2643c5488f8c89fb";
-    sha256 = "0cl9vdmxkshdacgpp7s2rg40b7xbsjrzw916jds9i3rpq1pcy5pj";
-    leaveDotGit = true;
-    deepClone = true;
+  src = fetchFromGitHub {
+    owner = "OSSIA";
+    repo = "i-score";
+    rev = "v${version}";
+    sha256 = "0g7s6n11w3wflrv5i2047dxx56lryms7xj0mznnlk5bii7g8dxzb";
+    fetchSubmodules = true;
   };
 
   buildInputs = [
+    alsaLib
     boost
     cln
     cmake
@@ -43,9 +49,13 @@ stdenv.mkDerivation rec {
     libsndfile
     ninja
     portaudio
+    portmidi
     qtbase
     qtdeclarative
     qtimageformats
+    qtmultimedia
+    qtquickcontrols2
+    qtserialport
     qtsvg
     qttools
     qtwebsockets
@@ -59,17 +69,11 @@ stdenv.mkDerivation rec {
     "-DISCORE_BUILD_FOR_PACKAGE_MANAGER=True"
   ];
 
-  patchPhase = ''
-    sed -e '77d' -i CMake/modules/GetGitRevisionDescription.cmake
-  '';
-
   preConfigure = ''
     export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
   '';
 
-  installPhase = ''
-    cmake --build . --target install
-  '';
+  postInstall = ''rm $out/bin/i-score.sh'';
 
   meta = {
     description = "An interactive sequencer for the intermedia arts";

From 5125e209a986977b052f8545fd94244817687d1c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 2 Sep 2017 14:32:28 +0200
Subject: [PATCH 3222/3246] pkgs/top-level: remove grsec attributes

These have been throwing exceptions since grsec was deprecated, so
potential users should have had due to time to migrate their configs.
---
 pkgs/top-level/all-packages.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44f4c63bb23..431321452fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12439,15 +12439,6 @@ with pkgs;
   linuxPackages_hardened =
     recurseIntoAttrs (linuxPackagesFor linux_hardened);
 
-  # Grsecurity packages
-
-  linux_grsec_nixos = kernelPatches.grsecurity_testing;
-
-  linuxPackages_grsec_nixos =
-    recurseIntoAttrs (linuxPackagesFor linux_grsec_nixos);
-
-  linux_grsec_server_xen = linux_grsec_nixos;
-
   # Samus kernels
   linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
   linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest);

From 697cbbc6179de7d22e311ccd6e1a883711024acf Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 2 Sep 2017 14:34:24 +0200
Subject: [PATCH 3223/3246] kernelPatches.grsecurity_testing: remove

---
 pkgs/os-specific/linux/kernel/patches.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index e5f430b4d82..0a364823640 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -51,14 +51,6 @@ rec {
       patch = ./modinst-arg-list-too-long.patch;
     };
 
-  grsecurity_testing = throw ''
-    Upstream has ceased free support for grsecurity/PaX.
-
-    See https://grsecurity.net/passing_the_baton.php
-    and https://grsecurity.net/passing_the_baton_faq.php
-    for more information.
-  '';
-
   genksyms_fix_segfault =
     { name = "genksyms-fix-segfault";
       patch = ./genksyms-fix-segfault.patch;

From b3f9b0d0cce969374bd2e155369c5adf2b6b1526 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 2 Sep 2017 15:56:11 +0200
Subject: [PATCH 3224/3246] libgcrypt: fix typo in meta.description

---
 pkgs/development/libraries/libgcrypt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 732f3710563..592f670a071 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.gnu.org/software/libgcrypt/;
-    description = "General-pupose cryptographic library";
+    description = "General-purpose cryptographic library";
     license = licenses.lgpl2Plus;
     platforms = platforms.all;
     maintainers = [ maintainers.wkennington maintainers.vrthra ];

From 5b943136fc6c4d5aedbcd466b6edb5f9c088b8a8 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 2 Sep 2017 14:59:21 +0100
Subject: [PATCH 3225/3246] pokerth: fix build error which was probably due to
 a changing C++ dependency (boost/g++?)

Ticks one box in #28643
---
 pkgs/games/pokerth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index 24a0281a874..122ce3f6e2f 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "server" ];
 
-  qmakeFlags = [ "pokerth.pro" ];
+  qmakeFlags = [ "pokerth.pro" "DEFINES+=_WEBSOCKETPP_NOEXCEPT_TOKEN_=noexcept" ];
 
   NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
 

From 71d377fcb02c774d75bd4a410022f683682e3d3e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 2 Sep 2017 09:13:06 -0500
Subject: [PATCH 3226/3246] kscreenlocker: 5.10.5 -> 5.10.5.1

Fix segfault with nVidia drivers; see
https://bugs.kde.org/show_bug.cgi?id=384005
---
 pkgs/desktops/plasma-5/srcs.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 4e582bcef10..854b86c1640 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -131,11 +131,11 @@
     };
   };
   kscreenlocker = {
-    version = "5.10.5";
+    version = "5.10.5.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.tar.xz";
-      sha256 = "07c8x4pj9adwwm5036wbrrw2sj8xi9d8b6d7qya6bam9xrq0mxkb";
-      name = "kscreenlocker-5.10.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.1.tar.xz";
+      sha256 = "03ih0dyyjljv40wl7mpbssfirkkljw8mnpjjhzk357lzadkplzvp";
+      name = "kscreenlocker-5.10.5.1.tar.xz";
     };
   };
   ksshaskpass = {

From dd096753476cb921a01508b3d560fbeb1dd1cbf8 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 2 Sep 2017 15:17:12 +0100
Subject: [PATCH 3227/3246] python27Packages.smugline: fix to accomodate new
 behavior of makeWrapper

Ticks one box in #28643
---
 pkgs/top-level/python-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 97265230beb..5ef570bc5e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27898,7 +27898,8 @@ EOF
     installPhase = ''
       mkdir -p $out/bin $out/libexec
       cp smugline.py $out/libexec
-      makeWrapper "${python.interpreter} $out/libexec/smugline.py" $out/bin/smugline \
+      makeWrapper ${python.interpreter} $out/bin/smugline \
+        --add-flags "$out/libexec/smugline.py" \
         --prefix PYTHONPATH : "$PYTHONPATH"
     '';
   };

From 2cf1b94b82ff557b5e37a3a944eced6ccff8d720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 2 Sep 2017 16:41:05 +0200
Subject: [PATCH 3228/3246] pythonPackages.pyrtlsdr: unbreak build

pyrtlsdr needs pandoc at build time. Fixes the build since commit
f6eb190e7030feac015bd1624d0dbb6825e28a9e
("python.pkgs.pyrtlsdr: disable tests to fix build"). (That commit
bumped the package to a new version.)
---
 pkgs/development/python-modules/pyrtlsdr/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix
index 4ce373ee7ad..274e5b61c14 100644
--- a/pkgs/development/python-modules/pyrtlsdr/default.nix
+++ b/pkgs/development/python-modules/pyrtlsdr/default.nix
@@ -2,6 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , rtl-sdr
+, pypandoc
+, pandoc
 }:
 
 buildPythonPackage rec {
@@ -14,6 +16,8 @@ buildPythonPackage rec {
     sha256 = "dd041143b68628c713c2227c78c40b0b4a0cb5d08df116f7bdc5f83c529be0e4";
   };
 
+  buildInputs = [ pypandoc pandoc ];
+
   postPatch = ''
     sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
   '';

From 8693cc542546c19633daa2211962f1c98b8e6519 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 2 Sep 2017 17:00:30 +0200
Subject: [PATCH 3229/3246] android-studio-preview: 3.0.0.10 -> 3.0.0.12

---
 pkgs/applications/editors/android-studio/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 471f78f0c07..dbdeed06ef8 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,9 +27,9 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.10"; # "Android Studio 3.0 Beta 2"
-    build = "171.4263559";
-    sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w";
+    version = "3.0.0.12"; # "Android Studio 3.0 Beta 4"
+    build = "171.4304935";
+    sha256Hash = "127ys250m1gdglj5y2qzxl73kh5qb4zlwyf79as7765mmcfcikn5";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";

From 2c301b1b48f7443a8346301162de24bfcb30dc1d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 2 Sep 2017 11:16:58 -0400
Subject: [PATCH 3230/3246] linux: 4.9.46 -> 4.9.47

(cherry picked from commit 27c8378c0c81aa17aef615615421aa5de3d8246b)
---
 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 87b225dfd3d..faa61372fef 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.46";
+  version = "4.9.47";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0arbm9l8pq7d6c1hr0c64p94qcxrxf4q4famvcm13273y3lr70r2";
+    sha256 = "1ja14l9gy7cpj94zwacr3gi4vqzfv2k78556fxga8q4lsrwrdgkm";
   };
 
   kernelPatches = args.kernelPatches;

From 491f5be49b9b802962f698fe77835f4647b34b38 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 2 Sep 2017 18:53:06 +0200
Subject: [PATCH 3231/3246] Trying a less disruptive patch for Cuneiform

---
 pkgs/tools/graphics/cuneiform/default.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 28699bf6931..7e639940d07 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchbzr, cmake, patchelf, imagemagick }:
+{ stdenv, fetchurl, cmake, patchelf, imagemagick }:
 
 stdenv.mkDerivation rec {
   name = "cuneiform-${version}";
   version = "1.1.0";
 
-  src = fetchbzr {
-    url = "lp:~f0ma/cuneiform-linux/devel";
-    rev = "540";
-    sha256 = "0sj7v3plf2rrc2vzxl946h9yfribc0jfn4b3ffppghxk2g6kicsb";
+  src = fetchurl {
+    url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2";
+    sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp";
   };
 
-  buildInputs = [
-    cmake imagemagick
+  patches = [
+  (fetchurl {
+    url = "https://git.archlinux.org/svntogit/community.git/plain/cuneiform/trunk/build-fix.patch?id=a2ec92f05de006b56d16ac6a6c370d54a554861a";
+    sha256 = "19cmrlx4khn30qqrpyayn7bicg8yi0wpz1x1bvqqrbvr3kwldxyj";
+  })
   ];
 
+  buildInputs = [ imagemagick ];
+
+  nativeBuildInputs = [ cmake ];
+
   meta = {
     description = "Multi-language OCR system";
     platforms = stdenv.lib.platforms.linux;

From aa598653339337b08f8418841d4059930661a30d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 2 Sep 2017 12:54:19 -0400
Subject: [PATCH 3232/3246] sbt: 1.0.0 -> 1.0.1

---
 pkgs/development/tools/build-managers/sbt/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 4627a6bd312..6d49b81bd61 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,14 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchurl {
     urls = [
       "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
+      "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "0njwch97g69vzxfqhlaibjwbif2vka68dssddk2jlpqlf94lzq4s";
+    sha256 = "0nhf7fksgaa8snrhfaac4n6gf29bbv59lfyiv7pr2jhbi5m9js2v";
   };
 
   patchPhase = ''

From 0ca6c58d26f64377a324da8b05019bef237a4603 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 2 Sep 2017 19:34:35 +0200
Subject: [PATCH 3233/3246] emby: 3.2.28.0 -> 3.2.30.0

---
 pkgs/servers/emby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 2ba0146520a..5b749b92c03 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.28.0";
+  version = "3.2.30.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0bv0wj7rny3gh4d6qdyd8widd549ap3fl35sz3q6w9x8sqhw5nfi";
+    sha256 = "1aqal7n4a9dvy97zw4aah9a8jm4l2v1qgjgs5kvskrvir2dbid27";
   };
 
   buildInputs = with pkgs; [

From 880a0409e8cc03b4aa5e69d041bf5e293c71da3f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 2 Sep 2017 19:44:14 +0200
Subject: [PATCH 3234/3246] nixos/deluge: Fix last wrong package attribute

I missed this in 799435b7cab97a39893a104999b3bc589e1172b1.

This time I used "git grep -F pythonPackages.deluge" just to be sure :-)

Thanks a lot to @roconnor for spotting this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: @roconnor
---
 nixos/modules/services/torrent/deluge.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 1ea6bf88d7a..ec1e97f4125 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -57,7 +57,7 @@ in {
       after = [ "network.target" ];
       description = "Deluge BitTorrent WebUI";
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.pythonPackages.deluge ];
+      path = [ pkgs.deluge ];
       serviceConfig.ExecStart = "${pkgs.deluge}/bin/deluge --ui web";
       serviceConfig.User = "deluge";
       serviceConfig.Group = "deluge";

From 32d4a3dec842df9b4d746e671ab065276d730e78 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 3 Sep 2017 03:19:44 +1000
Subject: [PATCH 3235/3246] ptlib: fix gcc6 build

---
 pkgs/development/libraries/ptlib/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index 604f246e711..7941df032a6 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, bison, flex, unixODBC
+{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, unixODBC
 , openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }:
 
 stdenv.mkDerivation rec {
@@ -9,12 +9,20 @@ stdenv.mkDerivation rec {
     sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs";
   };
 
+  NIX_CFLAGS_COMPILE = "-std=gnu++98";
+
   buildInputs = [ pkgconfig bison flex unixODBC openssl openldap
                   cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ];
 
   enableParallelBuilding = true;
 
-  patches = [ ./bison.patch ./sslv3.patch ];
+  patches = [
+    ./bison.patch
+    ./sslv3.patch
+    (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/gcc-5_support;
+      sha256 = "0pf2yj0150r4cnc6nv65mclrm3dillqh1xjk7m6gsjnk9b96i5d4";
+    })
+  ];
 
   meta = with stdenv.lib; {
     description = "Portable Tools from OPAL VoIP";

From 377b42a8ade438245ba12ba92e82eff11e668cdd Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 3 Sep 2017 03:48:39 +1000
Subject: [PATCH 3236/3246] ptlib: use fetchpatch

---
 pkgs/development/libraries/ptlib/bison.patch | 2887 ------------------
 pkgs/development/libraries/ptlib/default.nix |    8 +-
 pkgs/development/libraries/ptlib/sslv3.patch |   16 -
 3 files changed, 6 insertions(+), 2905 deletions(-)
 delete mode 100644 pkgs/development/libraries/ptlib/bison.patch
 delete mode 100644 pkgs/development/libraries/ptlib/sslv3.patch

diff --git a/pkgs/development/libraries/ptlib/bison.patch b/pkgs/development/libraries/ptlib/bison.patch
deleted file mode 100644
index 58593470c21..00000000000
--- a/pkgs/development/libraries/ptlib/bison.patch
+++ /dev/null
@@ -1,2887 +0,0 @@
---- a/src/ptlib/common/getdate.tab.c	(revision 0)
-+++ b/src/ptlib/common/getdate.tab.c	(revision 31087)
-@@ -0,0 +1,2884 @@
-+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
-+
-+/* Bison implementation for Yacc-like parsers in C
-+   
-+      Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-+   
-+   This program 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.
-+   
-+   This program 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/>.  */
-+
-+/* As a special exception, you may create a larger work that contains
-+   part or all of the Bison parser skeleton and distribute that work
-+   under terms of your choice, so long as that work isn't itself a
-+   parser generator using the skeleton or a modified version thereof
-+   as a parser skeleton.  Alternatively, if you modify or redistribute
-+   the parser skeleton itself, you may (at your option) remove this
-+   special exception, which will cause the skeleton and the resulting
-+   Bison output files to be licensed under the GNU General Public
-+   License without this special exception.
-+   
-+   This special exception was added by the Free Software Foundation in
-+   version 2.2 of Bison.  */
-+
-+/* C LALR(1) parser skeleton written by Richard Stallman, by
-+   simplifying the original so-called "semantic" parser.  */
-+
-+/* All symbols defined below should begin with yy or YY, to avoid
-+   infringing on user name space.  This should be done even for local
-+   variables, as they might otherwise be expanded by user macros.
-+   There are some unavoidable exceptions within include files to
-+   define necessary library symbols; they are noted "INFRINGES ON
-+   USER NAME SPACE" below.  */
-+
-+/* Identify Bison output.  */
-+#define YYBISON 1
-+
-+/* Bison version.  */
-+#define YYBISON_VERSION "2.7.12-4996"
-+
-+/* Skeleton name.  */
-+#define YYSKELETON_NAME "yacc.c"
-+
-+/* Pure parsers.  */
-+#define YYPURE 1
-+
-+/* Push parsers.  */
-+#define YYPUSH 0
-+
-+/* Pull parsers.  */
-+#define YYPULL 1
-+
-+
-+
-+
-+/* Copy the first part of user declarations.  */
-+/* Line 371 of yacc.c  */
-+#line 1 "ptlib/common/getdate.y"
-+
-+/*
-+**  Originally written by Steven M. Bellovin <smb@research.att.com> while
-+**  at the University of North Carolina at Chapel Hill.  Later tweaked by
-+**  a couple of people on Usenet.  Completely overhauled by Rich $alz
-+**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990;
-+**
-+**  Major hack to coerce it into use with the Equivalence Portable
-+**  Windows Library.
-+**
-+**  This grammar has 10 shift/reduce conflicts.
-+**
-+**  This code is in the public domain and has no copyright.
-+*/
-+/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */
-+/* SUPPRESS 288 on yyerrlab *//* Label unused */
-+
-+
-+#include <time.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <stdlib.h>
-+
-+#ifndef EOF
-+#include <stdio.h>
-+#endif
-+
-+
-+#ifdef _WIN32
-+#ifdef _MSC_VER
-+#pragma warning(disable:4131 4701 4996)
-+#endif
-+#define STDAPICALLTYPE __stdcall
-+#define MSDOS
-+#else
-+#define STDAPICALLTYPE
-+#endif
-+
-+
-+extern int  STDAPICALLTYPE PTimeGetChar(void * stream);
-+extern void STDAPICALLTYPE PTimeUngetChar(void * stream, int c);
-+int STDAPICALLTYPE PTimeGetDateOrder();
-+int STDAPICALLTYPE PTimeIsMonthName(const char *, int, int);
-+int STDAPICALLTYPE PTimeIsDayName(const char *, int, int);
-+
-+
-+#define EPOCH		1970
-+#define HOUR(x)		((time_t)(x) * 60)
-+#define SECSPERDAY	(24L * 60L * 60L)
-+
-+
-+/*
-+**  An entry in the lexical lookup table.
-+*/
-+typedef struct _TABLE {
-+    char	*name;
-+    int		type;
-+    time_t	value;
-+} TABLE;
-+
-+
-+/*
-+**  Daylight-savings mode:  on, off, or not yet known.
-+*/
-+typedef enum _DSTMODE {
-+    DSTon, DSToff, DSTmaybe
-+} DSTMODE;
-+
-+/*
-+**  Meridian:  am, pm, or 24-hour style.
-+*/
-+typedef enum _MERIDIAN {
-+    MERam, MERpm, MER24
-+} MERIDIAN;
-+
-+
-+/*
-+**  Global variables.  We could get rid of most of these by using a good
-+**  union as the yacc stack.  (This routine was originally written before
-+**  yacc had the %union construct.)  Maybe someday; right now we only use
-+**  the %union very rarely.
-+*/
-+struct Variables {
-+    void	*yyInput;
-+    DSTMODE	yyDSTmode;
-+    time_t	yyDayOrdinal;
-+    time_t	yyDayNumber;
-+    int	yyHaveDate;
-+    int	yyHaveDay;
-+    int	yyHaveRel;
-+    int	yyHaveTime;
-+    int	yyHaveZone;
-+    time_t	yyTimezone;
-+    time_t	yyDay;
-+    time_t	yyHour;
-+    time_t	yyMinutes;
-+    time_t	yyMonth;
-+    time_t	yySeconds;
-+    time_t	yyYear;
-+    MERIDIAN	yyMeridian;
-+    time_t	yyRelMonth;
-+    time_t	yyRelSeconds;
-+};
-+
-+#define VARIABLE ((struct Variables*)parseParam)
-+
-+
-+#define YYPURE		1
-+#define YYLEX_PARAM	VARIABLE
-+#define YYPARSE_PARAM	parseParam
-+
-+#define yyparse		PTime_yyparse
-+#define yylex		PTime_yylex
-+#define yyerror		PTime_yyerror
-+
-+#define GCC_VERSION (__GNUC__ * 10000 \
-+                    + __GNUC_MINOR__ * 100 \
-+                    + __GNUC_PATCHLEVEL__)
-+
-+static int yyparse(void *); 
-+static int yylex();
-+
-+#ifdef __GNUC__
-+static int yyerror(char const *msg);
-+#else
-+static void yyerror(char const *msg);
-+#endif
-+
-+
-+static void SetPossibleDate(struct Variables*, time_t, time_t, time_t);
-+
-+
-+
-+/* Line 371 of yacc.c  */
-+#line 202 "ptlib/common/getdate.tab.c"
-+
-+# ifndef YY_NULL
-+#  if defined __cplusplus && 201103L <= __cplusplus
-+#   define YY_NULL nullptr
-+#  else
-+#   define YY_NULL 0
-+#  endif
-+# endif
-+
-+/* Enabling verbose error messages.  */
-+#ifdef YYERROR_VERBOSE
-+# undef YYERROR_VERBOSE
-+# define YYERROR_VERBOSE 1
-+#else
-+# define YYERROR_VERBOSE 0
-+#endif
-+
-+
-+/* Enabling traces.  */
-+#ifndef YYDEBUG
-+# define YYDEBUG 0
-+#endif
-+#if YYDEBUG
-+extern int yydebug;
-+#endif
-+
-+/* Tokens.  */
-+#ifndef YYTOKENTYPE
-+# define YYTOKENTYPE
-+   /* Put the tokens into the symbol table, so that GDB and other debuggers
-+      know about them.  */
-+   enum yytokentype {
-+     tAGO = 258,
-+     tDAY = 259,
-+     tDAYZONE = 260,
-+     tID = 261,
-+     tMERIDIAN = 262,
-+     tMINUTE_UNIT = 263,
-+     tMONTH = 264,
-+     tMONTH_UNIT = 265,
-+     tSNUMBER = 266,
-+     tS4DIGITNUMBER = 267,
-+     tUNUMBER = 268,
-+     t4DIGITNUMBER = 269,
-+     t6DIGITNUMBER = 270,
-+     t8DIGITNUMBER = 271,
-+     tSEC_UNIT = 272,
-+     tZONE = 273,
-+     tMILZONE = 274,
-+     tRFC3339 = 275,
-+     tDST = 276
-+   };
-+#endif
-+
-+
-+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-+typedef union YYSTYPE
-+{
-+/* Line 387 of yacc.c  */
-+#line 137 "ptlib/common/getdate.y"
-+
-+    time_t		Number;
-+    enum _MERIDIAN	Meridian;
-+
-+
-+/* Line 387 of yacc.c  */
-+#line 269 "ptlib/common/getdate.tab.c"
-+} YYSTYPE;
-+# define YYSTYPE_IS_TRIVIAL 1
-+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-+# define YYSTYPE_IS_DECLARED 1
-+#endif
-+
-+
-+#ifdef YYPARSE_PARAM
-+#if defined __STDC__ || defined __cplusplus
-+int yyparse (void *YYPARSE_PARAM);
-+#else
-+int yyparse ();
-+#endif
-+#else /* ! YYPARSE_PARAM */
-+#if defined __STDC__ || defined __cplusplus
-+int yyparse (void);
-+#else
-+int yyparse ();
-+#endif
-+#endif /* ! YYPARSE_PARAM */
-+
-+
-+
-+/* Copy the second part of user declarations.  */
-+
-+/* Line 390 of yacc.c  */
-+#line 296 "ptlib/common/getdate.tab.c"
-+
-+#ifdef short
-+# undef short
-+#endif
-+
-+#ifdef YYTYPE_UINT8
-+typedef YYTYPE_UINT8 yytype_uint8;
-+#else
-+typedef unsigned char yytype_uint8;
-+#endif
-+
-+#ifdef YYTYPE_INT8
-+typedef YYTYPE_INT8 yytype_int8;
-+#elif (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+typedef signed char yytype_int8;
-+#else
-+typedef short int yytype_int8;
-+#endif
-+
-+#ifdef YYTYPE_UINT16
-+typedef YYTYPE_UINT16 yytype_uint16;
-+#else
-+typedef unsigned short int yytype_uint16;
-+#endif
-+
-+#ifdef YYTYPE_INT16
-+typedef YYTYPE_INT16 yytype_int16;
-+#else
-+typedef short int yytype_int16;
-+#endif
-+
-+#ifndef YYSIZE_T
-+# ifdef __SIZE_TYPE__
-+#  define YYSIZE_T __SIZE_TYPE__
-+# elif defined size_t
-+#  define YYSIZE_T size_t
-+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-+#  define YYSIZE_T size_t
-+# else
-+#  define YYSIZE_T unsigned int
-+# endif
-+#endif
-+
-+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-+
-+#ifndef YY_
-+# if defined YYENABLE_NLS && YYENABLE_NLS
-+#  if ENABLE_NLS
-+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-+#  endif
-+# endif
-+# ifndef YY_
-+#  define YY_(Msgid) Msgid
-+# endif
-+#endif
-+
-+#ifndef __attribute__
-+/* This feature is available in gcc versions 2.5 and later.  */
-+# if (! defined __GNUC__ || __GNUC__ < 2 \
-+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
-+#  define __attribute__(Spec) /* empty */
-+# endif
-+#endif
-+
-+/* Suppress unused-variable warnings by "using" E.  */
-+#if ! defined lint || defined __GNUC__
-+# define YYUSE(E) ((void) (E))
-+#else
-+# define YYUSE(E) /* empty */
-+#endif
-+
-+
-+/* Identity function, used to suppress warnings about constant conditions.  */
-+#ifndef lint
-+# define YYID(N) (N)
-+#else
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static int
-+YYID (int yyi)
-+#else
-+static int
-+YYID (yyi)
-+    int yyi;
-+#endif
-+{
-+  return yyi;
-+}
-+#endif
-+
-+#if ! defined yyoverflow || YYERROR_VERBOSE
-+
-+/* The parser invokes alloca or malloc; define the necessary symbols.  */
-+
-+# ifdef YYSTACK_USE_ALLOCA
-+#  if YYSTACK_USE_ALLOCA
-+#   ifdef __GNUC__
-+#    define YYSTACK_ALLOC __builtin_alloca
-+#   elif defined __BUILTIN_VA_ARG_INCR
-+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-+#   elif defined _AIX
-+#    define YYSTACK_ALLOC __alloca
-+#   elif defined _MSC_VER
-+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-+#    define alloca _alloca
-+#   else
-+#    define YYSTACK_ALLOC alloca
-+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-+#     ifndef EXIT_SUCCESS
-+#      define EXIT_SUCCESS 0
-+#     endif
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+
-+# ifdef YYSTACK_ALLOC
-+   /* Pacify GCC's `empty if-body' warning.  */
-+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-+#  ifndef YYSTACK_ALLOC_MAXIMUM
-+    /* The OS might guarantee only one guard page at the bottom of the stack,
-+       and a page size can be as small as 4096 bytes.  So we cannot safely
-+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-+       to allow for a few compiler-allocated temporary stack slots.  */
-+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-+#  endif
-+# else
-+#  define YYSTACK_ALLOC YYMALLOC
-+#  define YYSTACK_FREE YYFREE
-+#  ifndef YYSTACK_ALLOC_MAXIMUM
-+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-+#  endif
-+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-+       && ! ((defined YYMALLOC || defined malloc) \
-+	     && (defined YYFREE || defined free)))
-+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-+#   ifndef EXIT_SUCCESS
-+#    define EXIT_SUCCESS 0
-+#   endif
-+#  endif
-+#  ifndef YYMALLOC
-+#   define YYMALLOC malloc
-+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-+#   endif
-+#  endif
-+#  ifndef YYFREE
-+#   define YYFREE free
-+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+void free (void *); /* INFRINGES ON USER NAME SPACE */
-+#   endif
-+#  endif
-+# endif
-+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-+
-+
-+#if (! defined yyoverflow \
-+     && (! defined __cplusplus \
-+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-+
-+/* A type that is properly aligned for any stack member.  */
-+union yyalloc
-+{
-+  yytype_int16 yyss_alloc;
-+  YYSTYPE yyvs_alloc;
-+};
-+
-+/* The size of the maximum gap between one aligned stack and the next.  */
-+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-+
-+/* The size of an array large to enough to hold all stacks, each with
-+   N elements.  */
-+# define YYSTACK_BYTES(N) \
-+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-+      + YYSTACK_GAP_MAXIMUM)
-+
-+# define YYCOPY_NEEDED 1
-+
-+/* Relocate STACK from its old location to the new one.  The
-+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-+   elements in the stack, and YYPTR gives the new location of the
-+   stack.  Advance YYPTR to a properly aligned location for the next
-+   stack.  */
-+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-+    do									\
-+      {									\
-+	YYSIZE_T yynewbytes;						\
-+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-+	Stack = &yyptr->Stack_alloc;					\
-+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-+	yyptr += yynewbytes / sizeof (*yyptr);				\
-+      }									\
-+    while (YYID (0))
-+
-+#endif
-+
-+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-+/* Copy COUNT objects from SRC to DST.  The source and destination do
-+   not overlap.  */
-+# ifndef YYCOPY
-+#  if defined __GNUC__ && 1 < __GNUC__
-+#   define YYCOPY(Dst, Src, Count) \
-+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-+#  else
-+#   define YYCOPY(Dst, Src, Count)              \
-+      do                                        \
-+        {                                       \
-+          YYSIZE_T yyi;                         \
-+          for (yyi = 0; yyi < (Count); yyi++)   \
-+            (Dst)[yyi] = (Src)[yyi];            \
-+        }                                       \
-+      while (YYID (0))
-+#  endif
-+# endif
-+#endif /* !YYCOPY_NEEDED */
-+
-+/* YYFINAL -- State number of the termination state.  */
-+#define YYFINAL  2
-+/* YYLAST -- Last index in YYTABLE.  */
-+#define YYLAST   105
-+
-+/* YYNTOKENS -- Number of terminals.  */
-+#define YYNTOKENS  25
-+/* YYNNTS -- Number of nonterminals.  */
-+#define YYNNTS  12
-+/* YYNRULES -- Number of rules.  */
-+#define YYNRULES  51
-+/* YYNRULES -- Number of states.  */
-+#define YYNSTATES  63
-+
-+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-+#define YYUNDEFTOK  2
-+#define YYMAXUTOK   276
-+
-+#define YYTRANSLATE(YYX)						\
-+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-+
-+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-+static const yytype_uint8 yytranslate[] =
-+{
-+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,    23,     2,     2,    24,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,    22,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-+      15,    16,    17,    18,    19,    20,    21
-+};
-+
-+#if YYDEBUG
-+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-+   YYRHS.  */
-+static const yytype_uint8 yyprhs[] =
-+{
-+       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
-+      19,    22,    25,    28,    33,    38,    45,    52,    54,    56,
-+      59,    61,    63,    66,    69,    73,    79,    84,    86,    90,
-+      93,    98,   101,   105,   108,   110,   113,   116,   118,   121,
-+     124,   126,   129,   132,   134,   136,   138,   140,   142,   144,
-+     146,   147
-+};
-+
-+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-+static const yytype_int8 yyrhs[] =
-+{
-+      26,     0,    -1,    -1,    26,    27,    -1,    28,    -1,    29,
-+      -1,    31,    -1,    30,    -1,    32,    -1,    35,    -1,    13,
-+       7,    -1,    14,    12,    -1,    15,    12,    -1,    34,    22,
-+      34,    36,    -1,    34,    22,    34,    12,    -1,    34,    22,
-+      34,    22,    34,    36,    -1,    34,    22,    34,    22,    34,
-+      12,    -1,    18,    -1,     5,    -1,    18,    21,    -1,    19,
-+      -1,     4,    -1,     4,    23,    -1,    34,     4,    -1,    34,
-+      24,    34,    -1,    34,    24,    34,    24,    34,    -1,    34,
-+      11,    11,    20,    -1,    16,    -1,    34,     9,    11,    -1,
-+       9,    34,    -1,     9,    34,    23,    34,    -1,    34,     9,
-+      -1,    34,     9,    34,    -1,    33,     3,    -1,    33,    -1,
-+      34,     8,    -1,    11,     8,    -1,     8,    -1,    11,    17,
-+      -1,    34,    17,    -1,    17,    -1,    11,    10,    -1,    34,
-+      10,    -1,    10,    -1,    13,    -1,    14,    -1,    15,    -1,
-+      13,    -1,    14,    -1,    15,    -1,    -1,     7,    -1
-+};
-+
-+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-+static const yytype_uint16 yyrline[] =
-+{
-+       0,   153,   153,   154,   157,   160,   163,   166,   169,   172,
-+     175,   181,   189,   197,   203,   210,   216,   226,   230,   235,
-+     239,   249,   253,   257,   263,   266,   269,   273,   278,   282,
-+     289,   294,   301,   306,   310,   313,   316,   319,   322,   325,
-+     328,   331,   334,   337,   342,   345,   348,   353,   379,   390,
-+     407,   410
-+};
-+#endif
-+
-+#if YYDEBUG || YYERROR_VERBOSE || 0
-+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-+static const char *const yytname[] =
-+{
-+  "$end", "error", "$undefined", "tAGO", "tDAY", "tDAYZONE", "tID",
-+  "tMERIDIAN", "tMINUTE_UNIT", "tMONTH", "tMONTH_UNIT", "tSNUMBER",
-+  "tS4DIGITNUMBER", "tUNUMBER", "t4DIGITNUMBER", "t6DIGITNUMBER",
-+  "t8DIGITNUMBER", "tSEC_UNIT", "tZONE", "tMILZONE", "tRFC3339", "tDST",
-+  "':'", "','", "'/'", "$accept", "spec", "item", "time", "zone", "day",
-+  "date", "rel", "relunit", "unumber", "number", "o_merid", YY_NULL
-+};
-+#endif
-+
-+# ifdef YYPRINT
-+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-+   token YYLEX-NUM.  */
-+static const yytype_uint16 yytoknum[] =
-+{
-+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-+     275,   276,    58,    44,    47
-+};
-+# endif
-+
-+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-+static const yytype_uint8 yyr1[] =
-+{
-+       0,    25,    26,    26,    27,    27,    27,    27,    27,    27,
-+      28,    28,    28,    28,    28,    28,    28,    29,    29,    29,
-+      29,    30,    30,    30,    31,    31,    31,    31,    31,    31,
-+      31,    31,    31,    32,    32,    33,    33,    33,    33,    33,
-+      33,    33,    33,    33,    34,    34,    34,    35,    35,    35,
-+      36,    36
-+};
-+
-+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-+static const yytype_uint8 yyr2[] =
-+{
-+       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
-+       2,     2,     2,     4,     4,     6,     6,     1,     1,     2,
-+       1,     1,     2,     2,     3,     5,     4,     1,     3,     2,
-+       4,     2,     3,     2,     1,     2,     2,     1,     2,     2,
-+       1,     2,     2,     1,     1,     1,     1,     1,     1,     1,
-+       0,     1
-+};
-+
-+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-+   Performed when YYTABLE doesn't specify something else to do.  Zero
-+   means the default is an error.  */
-+static const yytype_uint8 yydefact[] =
-+{
-+       2,     0,     1,    21,    18,    37,     0,    43,     0,    44,
-+      45,    46,    27,    40,    17,    20,     3,     4,     5,     7,
-+       6,     8,    34,     0,     9,    22,    44,    45,    46,    29,
-+      36,    41,    38,    10,    11,    12,    19,    33,    23,    35,
-+      31,    42,     0,    39,     0,     0,     0,    28,    32,     0,
-+      50,    24,    30,    26,    51,    14,     0,    13,     0,    50,
-+      25,    16,    15
-+};
-+
-+/* YYDEFGOTO[NTERM-NUM].  */
-+static const yytype_int8 yydefgoto[] =
-+{
-+      -1,     1,    16,    17,    18,    19,    20,    21,    22,    23,
-+      24,    57
-+};
-+
-+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-+   STATE-NUM.  */
-+#define YYPACT_NINF -27
-+static const yytype_int8 yypact[] =
-+{
-+     -27,    49,   -27,   -10,   -27,   -27,   -11,   -27,     1,    10,
-+      69,    86,   -27,   -27,    -9,   -27,   -27,   -27,   -27,   -27,
-+     -27,   -27,    13,    -3,   -27,   -27,   -27,   -27,   -27,     8,
-+     -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,
-+      30,   -27,     9,   -27,   -11,   -11,   -11,   -27,   -27,    12,
-+      15,    18,   -27,   -27,   -27,   -27,   -11,   -27,   -11,    23,
-+     -27,   -27,   -27
-+};
-+
-+/* YYPGOTO[NTERM-NUM].  */
-+static const yytype_int8 yypgoto[] =
-+{
-+     -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,    -6,
-+     -27,   -26
-+};
-+
-+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-+   positive, shift that token.  If negative, reduce the rule which
-+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-+#define YYTABLE_NINF -50
-+static const yytype_int8 yytable[] =
-+{
-+      29,    38,    26,    27,    28,    39,    40,    41,    42,    30,
-+     -47,    31,    36,    25,    43,   -47,    37,    33,    32,    44,
-+      49,    45,    54,   -47,   -47,   -47,   -47,    55,   -47,   -47,
-+      54,    46,    53,    62,    48,    61,     0,    56,    50,    51,
-+      52,    47,    58,    26,    27,    28,     0,     0,     0,     2,
-+      59,     0,    60,     3,     4,     0,     0,     5,     6,     7,
-+       8,     0,     9,    10,    11,    12,    13,    14,    15,   -48,
-+       0,     0,     0,     0,   -48,     0,     0,     0,     0,     0,
-+       0,    34,   -48,   -48,   -48,   -48,   -49,   -48,   -48,     0,
-+       0,   -49,     0,     0,     0,     0,     0,     0,    35,   -49,
-+     -49,   -49,   -49,     0,   -49,   -49
-+};
-+
-+#define yypact_value_is_default(Yystate) \
-+  (!!((Yystate) == (-27)))
-+
-+#define yytable_value_is_error(Yytable_value) \
-+  YYID (0)
-+
-+static const yytype_int8 yycheck[] =
-+{
-+       6,     4,    13,    14,    15,     8,     9,    10,    11,     8,
-+       0,    10,    21,    23,    17,     5,     3,     7,    17,    22,
-+      11,    24,     7,    13,    14,    15,    16,    12,    18,    19,
-+       7,    23,    20,    59,    40,    12,    -1,    22,    44,    45,
-+      46,    11,    24,    13,    14,    15,    -1,    -1,    -1,     0,
-+      56,    -1,    58,     4,     5,    -1,    -1,     8,     9,    10,
-+      11,    -1,    13,    14,    15,    16,    17,    18,    19,     0,
-+      -1,    -1,    -1,    -1,     5,    -1,    -1,    -1,    -1,    -1,
-+      -1,    12,    13,    14,    15,    16,     0,    18,    19,    -1,
-+      -1,     5,    -1,    -1,    -1,    -1,    -1,    -1,    12,    13,
-+      14,    15,    16,    -1,    18,    19
-+};
-+
-+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-+   symbol of state STATE-NUM.  */
-+static const yytype_uint8 yystos[] =
-+{
-+       0,    26,     0,     4,     5,     8,     9,    10,    11,    13,
-+      14,    15,    16,    17,    18,    19,    27,    28,    29,    30,
-+      31,    32,    33,    34,    35,    23,    13,    14,    15,    34,
-+       8,    10,    17,     7,    12,    12,    21,     3,     4,     8,
-+       9,    10,    11,    17,    22,    24,    23,    11,    34,    11,
-+      34,    34,    34,    20,     7,    12,    22,    36,    24,    34,
-+      34,    12,    36
-+};
-+
-+#define yyerrok		(yyerrstatus = 0)
-+#define yyclearin	(yychar = YYEMPTY)
-+#define YYEMPTY		(-2)
-+#define YYEOF		0
-+
-+#define YYACCEPT	goto yyacceptlab
-+#define YYABORT		goto yyabortlab
-+#define YYERROR		goto yyerrorlab
-+
-+
-+/* Like YYERROR except do call yyerror.  This remains here temporarily
-+   to ease the transition to the new meaning of YYERROR, for GCC.
-+   Once GCC version 2 has supplanted version 1, this can go.  However,
-+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-+   discussed.  */
-+
-+#define YYFAIL		goto yyerrlab
-+#if defined YYFAIL
-+  /* This is here to suppress warnings from the GCC cpp's
-+     -Wunused-macros.  Normally we don't worry about that warning, but
-+     some users do, and we want to make it easy for users to remove
-+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-+#endif
-+
-+#define YYRECOVERING()  (!!yyerrstatus)
-+
-+#define YYBACKUP(Token, Value)                                  \
-+do                                                              \
-+  if (yychar == YYEMPTY)                                        \
-+    {                                                           \
-+      yychar = (Token);                                         \
-+      yylval = (Value);                                         \
-+      YYPOPSTACK (yylen);                                       \
-+      yystate = *yyssp;                                         \
-+      goto yybackup;                                            \
-+    }                                                           \
-+  else                                                          \
-+    {                                                           \
-+      yyerror (YY_("syntax error: cannot back up")); \
-+      YYERROR;							\
-+    }								\
-+while (YYID (0))
-+
-+/* Error token number */
-+#define YYTERROR	1
-+#define YYERRCODE	256
-+
-+
-+/* This macro is provided for backward compatibility. */
-+#ifndef YY_LOCATION_PRINT
-+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-+#endif
-+
-+
-+/* YYLEX -- calling `yylex' with the right arguments.  */
-+#ifdef YYLEX_PARAM
-+# define YYLEX yylex (&yylval, YYLEX_PARAM)
-+#else
-+# define YYLEX yylex (&yylval)
-+#endif
-+
-+/* Enable debugging if requested.  */
-+#if YYDEBUG
-+
-+# ifndef YYFPRINTF
-+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-+#  define YYFPRINTF fprintf
-+# endif
-+
-+# define YYDPRINTF(Args)			\
-+do {						\
-+  if (yydebug)					\
-+    YYFPRINTF Args;				\
-+} while (YYID (0))
-+
-+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-+do {									  \
-+  if (yydebug)								  \
-+    {									  \
-+      YYFPRINTF (stderr, "%s ", Title);					  \
-+      yy_symbol_print (stderr,						  \
-+		  Type, Value); \
-+      YYFPRINTF (stderr, "\n");						  \
-+    }									  \
-+} while (YYID (0))
-+
-+
-+/*--------------------------------.
-+| Print this symbol on YYOUTPUT.  |
-+`--------------------------------*/
-+
-+/*ARGSUSED*/
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-+#else
-+static void
-+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-+    FILE *yyoutput;
-+    int yytype;
-+    YYSTYPE const * const yyvaluep;
-+#endif
-+{
-+  FILE *yyo = yyoutput;
-+  YYUSE (yyo);
-+  if (!yyvaluep)
-+    return;
-+# ifdef YYPRINT
-+  if (yytype < YYNTOKENS)
-+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-+# else
-+  YYUSE (yyoutput);
-+# endif
-+  YYUSE (yytype);
-+}
-+
-+
-+/*--------------------------------.
-+| Print this symbol on YYOUTPUT.  |
-+`--------------------------------*/
-+
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-+#else
-+static void
-+yy_symbol_print (yyoutput, yytype, yyvaluep)
-+    FILE *yyoutput;
-+    int yytype;
-+    YYSTYPE const * const yyvaluep;
-+#endif
-+{
-+  if (yytype < YYNTOKENS)
-+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-+  else
-+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-+
-+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-+  YYFPRINTF (yyoutput, ")");
-+}
-+
-+/*------------------------------------------------------------------.
-+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-+| TOP (included).                                                   |
-+`------------------------------------------------------------------*/
-+
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-+#else
-+static void
-+yy_stack_print (yybottom, yytop)
-+    yytype_int16 *yybottom;
-+    yytype_int16 *yytop;
-+#endif
-+{
-+  YYFPRINTF (stderr, "Stack now");
-+  for (; yybottom <= yytop; yybottom++)
-+    {
-+      int yybot = *yybottom;
-+      YYFPRINTF (stderr, " %d", yybot);
-+    }
-+  YYFPRINTF (stderr, "\n");
-+}
-+
-+# define YY_STACK_PRINT(Bottom, Top)				\
-+do {								\
-+  if (yydebug)							\
-+    yy_stack_print ((Bottom), (Top));				\
-+} while (YYID (0))
-+
-+
-+/*------------------------------------------------.
-+| Report that the YYRULE is going to be reduced.  |
-+`------------------------------------------------*/
-+
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-+#else
-+static void
-+yy_reduce_print (yyvsp, yyrule)
-+    YYSTYPE *yyvsp;
-+    int yyrule;
-+#endif
-+{
-+  int yynrhs = yyr2[yyrule];
-+  int yyi;
-+  unsigned long int yylno = yyrline[yyrule];
-+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-+	     yyrule - 1, yylno);
-+  /* The symbols being reduced.  */
-+  for (yyi = 0; yyi < yynrhs; yyi++)
-+    {
-+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-+		       &(yyvsp[(yyi + 1) - (yynrhs)])
-+		       		       );
-+      YYFPRINTF (stderr, "\n");
-+    }
-+}
-+
-+# define YY_REDUCE_PRINT(Rule)		\
-+do {					\
-+  if (yydebug)				\
-+    yy_reduce_print (yyvsp, Rule); \
-+} while (YYID (0))
-+
-+/* Nonzero means print parse trace.  It is left uninitialized so that
-+   multiple parsers can coexist.  */
-+int yydebug;
-+#else /* !YYDEBUG */
-+# define YYDPRINTF(Args)
-+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-+# define YY_STACK_PRINT(Bottom, Top)
-+# define YY_REDUCE_PRINT(Rule)
-+#endif /* !YYDEBUG */
-+
-+
-+/* YYINITDEPTH -- initial size of the parser's stacks.  */
-+#ifndef	YYINITDEPTH
-+# define YYINITDEPTH 200
-+#endif
-+
-+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-+   if the built-in stack extension method is used).
-+
-+   Do not make this value too large; the results are undefined if
-+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-+   evaluated with infinite-precision integer arithmetic.  */
-+
-+#ifndef YYMAXDEPTH
-+# define YYMAXDEPTH 10000
-+#endif
-+
-+
-+#if YYERROR_VERBOSE
-+
-+# ifndef yystrlen
-+#  if defined __GLIBC__ && defined _STRING_H
-+#   define yystrlen strlen
-+#  else
-+/* Return the length of YYSTR.  */
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static YYSIZE_T
-+yystrlen (const char *yystr)
-+#else
-+static YYSIZE_T
-+yystrlen (yystr)
-+    const char *yystr;
-+#endif
-+{
-+  YYSIZE_T yylen;
-+  for (yylen = 0; yystr[yylen]; yylen++)
-+    continue;
-+  return yylen;
-+}
-+#  endif
-+# endif
-+
-+# ifndef yystpcpy
-+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+#   define yystpcpy stpcpy
-+#  else
-+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-+   YYDEST.  */
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static char *
-+yystpcpy (char *yydest, const char *yysrc)
-+#else
-+static char *
-+yystpcpy (yydest, yysrc)
-+    char *yydest;
-+    const char *yysrc;
-+#endif
-+{
-+  char *yyd = yydest;
-+  const char *yys = yysrc;
-+
-+  while ((*yyd++ = *yys++) != '\0')
-+    continue;
-+
-+  return yyd - 1;
-+}
-+#  endif
-+# endif
-+
-+# ifndef yytnamerr
-+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-+   quotes and backslashes, so that it's suitable for yyerror.  The
-+   heuristic is that double-quoting is unnecessary unless the string
-+   contains an apostrophe, a comma, or backslash (other than
-+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-+   null, do not copy; instead, return the length of what the result
-+   would have been.  */
-+static YYSIZE_T
-+yytnamerr (char *yyres, const char *yystr)
-+{
-+  if (*yystr == '"')
-+    {
-+      YYSIZE_T yyn = 0;
-+      char const *yyp = yystr;
-+
-+      for (;;)
-+	switch (*++yyp)
-+	  {
-+	  case '\'':
-+	  case ',':
-+	    goto do_not_strip_quotes;
-+
-+	  case '\\':
-+	    if (*++yyp != '\\')
-+	      goto do_not_strip_quotes;
-+	    /* Fall through.  */
-+	  default:
-+	    if (yyres)
-+	      yyres[yyn] = *yyp;
-+	    yyn++;
-+	    break;
-+
-+	  case '"':
-+	    if (yyres)
-+	      yyres[yyn] = '\0';
-+	    return yyn;
-+	  }
-+    do_not_strip_quotes: ;
-+    }
-+
-+  if (! yyres)
-+    return yystrlen (yystr);
-+
-+  return yystpcpy (yyres, yystr) - yyres;
-+}
-+# endif
-+
-+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-+   about the unexpected token YYTOKEN for the state stack whose top is
-+   YYSSP.
-+
-+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-+   not large enough to hold the message.  In that case, also set
-+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-+   required number of bytes is too large to store.  */
-+static int
-+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-+                yytype_int16 *yyssp, int yytoken)
-+{
-+  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
-+  YYSIZE_T yysize = yysize0;
-+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-+  /* Internationalized format string. */
-+  const char *yyformat = YY_NULL;
-+  /* Arguments of yyformat. */
-+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-+  /* Number of reported tokens (one for the "unexpected", one per
-+     "expected"). */
-+  int yycount = 0;
-+
-+  /* There are many possibilities here to consider:
-+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-+       for details.  YYERROR is fine as it does not invoke this
-+       function.
-+     - If this state is a consistent state with a default action, then
-+       the only way this function was invoked is if the default action
-+       is an error action.  In that case, don't check for expected
-+       tokens because there are none.
-+     - The only way there can be no lookahead present (in yychar) is if
-+       this state is a consistent state with a default action.  Thus,
-+       detecting the absence of a lookahead is sufficient to determine
-+       that there is no unexpected or expected token to report.  In that
-+       case, just report a simple "syntax error".
-+     - Don't assume there isn't a lookahead just because this state is a
-+       consistent state with a default action.  There might have been a
-+       previous inconsistent state, consistent state with a non-default
-+       action, or user semantic action that manipulated yychar.
-+     - Of course, the expected token list depends on states to have
-+       correct lookahead information, and it depends on the parser not
-+       to perform extra reductions after fetching a lookahead from the
-+       scanner and before detecting a syntax error.  Thus, state merging
-+       (from LALR or IELR) and default reductions corrupt the expected
-+       token list.  However, the list is correct for canonical LR with
-+       one exception: it will still contain any token that will not be
-+       accepted due to an error action in a later state.
-+  */
-+  if (yytoken != YYEMPTY)
-+    {
-+      int yyn = yypact[*yyssp];
-+      yyarg[yycount++] = yytname[yytoken];
-+      if (!yypact_value_is_default (yyn))
-+        {
-+          /* Start YYX at -YYN if negative to avoid negative indexes in
-+             YYCHECK.  In other words, skip the first -YYN actions for
-+             this state because they are default actions.  */
-+          int yyxbegin = yyn < 0 ? -yyn : 0;
-+          /* Stay within bounds of both yycheck and yytname.  */
-+          int yychecklim = YYLAST - yyn + 1;
-+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-+          int yyx;
-+
-+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-+                && !yytable_value_is_error (yytable[yyx + yyn]))
-+              {
-+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-+                  {
-+                    yycount = 1;
-+                    yysize = yysize0;
-+                    break;
-+                  }
-+                yyarg[yycount++] = yytname[yyx];
-+                {
-+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-+                  if (! (yysize <= yysize1
-+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-+                    return 2;
-+                  yysize = yysize1;
-+                }
-+              }
-+        }
-+    }
-+
-+  switch (yycount)
-+    {
-+# define YYCASE_(N, S)                      \
-+      case N:                               \
-+        yyformat = S;                       \
-+      break
-+      YYCASE_(0, YY_("syntax error"));
-+      YYCASE_(1, YY_("syntax error, unexpected %s"));
-+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-+# undef YYCASE_
-+    }
-+
-+  {
-+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-+      return 2;
-+    yysize = yysize1;
-+  }
-+
-+  if (*yymsg_alloc < yysize)
-+    {
-+      *yymsg_alloc = 2 * yysize;
-+      if (! (yysize <= *yymsg_alloc
-+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-+      return 1;
-+    }
-+
-+  /* Avoid sprintf, as that infringes on the user's name space.
-+     Don't have undefined behavior even if the translation
-+     produced a string with the wrong number of "%s"s.  */
-+  {
-+    char *yyp = *yymsg;
-+    int yyi = 0;
-+    while ((*yyp = *yyformat) != '\0')
-+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-+        {
-+          yyp += yytnamerr (yyp, yyarg[yyi++]);
-+          yyformat += 2;
-+        }
-+      else
-+        {
-+          yyp++;
-+          yyformat++;
-+        }
-+  }
-+  return 0;
-+}
-+#endif /* YYERROR_VERBOSE */
-+
-+/*-----------------------------------------------.
-+| Release the memory associated to this symbol.  |
-+`-----------------------------------------------*/
-+
-+/*ARGSUSED*/
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-+#else
-+static void
-+yydestruct (yymsg, yytype, yyvaluep)
-+    const char *yymsg;
-+    int yytype;
-+    YYSTYPE *yyvaluep;
-+#endif
-+{
-+  YYUSE (yyvaluep);
-+
-+  if (!yymsg)
-+    yymsg = "Deleting";
-+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-+
-+  YYUSE (yytype);
-+}
-+
-+
-+
-+
-+/*----------.
-+| yyparse.  |
-+`----------*/
-+
-+#ifdef YYPARSE_PARAM
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+int
-+yyparse (void *YYPARSE_PARAM)
-+#else
-+int
-+yyparse (YYPARSE_PARAM)
-+    void *YYPARSE_PARAM;
-+#endif
-+#else /* ! YYPARSE_PARAM */
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+int
-+yyparse (void)
-+#else
-+int
-+yyparse ()
-+
-+#endif
-+#endif
-+{
-+/* The lookahead symbol.  */
-+int yychar;
-+
-+
-+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-+    _Pragma ("GCC diagnostic push") \
-+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-+    _Pragma ("GCC diagnostic pop")
-+#else
-+/* Default value used for initialization, for pacifying older GCCs
-+   or non-GCC compilers.  */
-+static YYSTYPE yyval_default;
-+# define YY_INITIAL_VALUE(Value) = Value
-+#endif
-+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-+#endif
-+#ifndef YY_INITIAL_VALUE
-+# define YY_INITIAL_VALUE(Value) /* Nothing. */
-+#endif
-+
-+/* The semantic value of the lookahead symbol.  */
-+YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
-+
-+    /* Number of syntax errors so far.  */
-+    int yynerrs;
-+
-+    int yystate;
-+    /* Number of tokens to shift before error messages enabled.  */
-+    int yyerrstatus;
-+
-+    /* The stacks and their tools:
-+       `yyss': related to states.
-+       `yyvs': related to semantic values.
-+
-+       Refer to the stacks through separate pointers, to allow yyoverflow
-+       to reallocate them elsewhere.  */
-+
-+    /* The state stack.  */
-+    yytype_int16 yyssa[YYINITDEPTH];
-+    yytype_int16 *yyss;
-+    yytype_int16 *yyssp;
-+
-+    /* The semantic value stack.  */
-+    YYSTYPE yyvsa[YYINITDEPTH];
-+    YYSTYPE *yyvs;
-+    YYSTYPE *yyvsp;
-+
-+    YYSIZE_T yystacksize;
-+
-+  int yyn;
-+  int yyresult;
-+  /* Lookahead token as an internal (translated) token number.  */
-+  int yytoken = 0;
-+  /* The variables used to return semantic value and location from the
-+     action routines.  */
-+  YYSTYPE yyval;
-+
-+#if YYERROR_VERBOSE
-+  /* Buffer for error messages, and its allocated size.  */
-+  char yymsgbuf[128];
-+  char *yymsg = yymsgbuf;
-+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-+#endif
-+
-+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-+
-+  /* The number of symbols on the RHS of the reduced rule.
-+     Keep to zero when no symbol should be popped.  */
-+  int yylen = 0;
-+
-+  yyssp = yyss = yyssa;
-+  yyvsp = yyvs = yyvsa;
-+  yystacksize = YYINITDEPTH;
-+
-+  YYDPRINTF ((stderr, "Starting parse\n"));
-+
-+  yystate = 0;
-+  yyerrstatus = 0;
-+  yynerrs = 0;
-+  yychar = YYEMPTY; /* Cause a token to be read.  */
-+  goto yysetstate;
-+
-+/*------------------------------------------------------------.
-+| yynewstate -- Push a new state, which is found in yystate.  |
-+`------------------------------------------------------------*/
-+ yynewstate:
-+  /* In all cases, when you get here, the value and location stacks
-+     have just been pushed.  So pushing a state here evens the stacks.  */
-+  yyssp++;
-+
-+ yysetstate:
-+  *yyssp = yystate;
-+
-+  if (yyss + yystacksize - 1 <= yyssp)
-+    {
-+      /* Get the current used size of the three stacks, in elements.  */
-+      YYSIZE_T yysize = yyssp - yyss + 1;
-+
-+#ifdef yyoverflow
-+      {
-+	/* Give user a chance to reallocate the stack.  Use copies of
-+	   these so that the &'s don't force the real ones into
-+	   memory.  */
-+	YYSTYPE *yyvs1 = yyvs;
-+	yytype_int16 *yyss1 = yyss;
-+
-+	/* Each stack pointer address is followed by the size of the
-+	   data in use in that stack, in bytes.  This used to be a
-+	   conditional around just the two extra args, but that might
-+	   be undefined if yyoverflow is a macro.  */
-+	yyoverflow (YY_("memory exhausted"),
-+		    &yyss1, yysize * sizeof (*yyssp),
-+		    &yyvs1, yysize * sizeof (*yyvsp),
-+		    &yystacksize);
-+
-+	yyss = yyss1;
-+	yyvs = yyvs1;
-+      }
-+#else /* no yyoverflow */
-+# ifndef YYSTACK_RELOCATE
-+      goto yyexhaustedlab;
-+# else
-+      /* Extend the stack our own way.  */
-+      if (YYMAXDEPTH <= yystacksize)
-+	goto yyexhaustedlab;
-+      yystacksize *= 2;
-+      if (YYMAXDEPTH < yystacksize)
-+	yystacksize = YYMAXDEPTH;
-+
-+      {
-+	yytype_int16 *yyss1 = yyss;
-+	union yyalloc *yyptr =
-+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-+	if (! yyptr)
-+	  goto yyexhaustedlab;
-+	YYSTACK_RELOCATE (yyss_alloc, yyss);
-+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-+#  undef YYSTACK_RELOCATE
-+	if (yyss1 != yyssa)
-+	  YYSTACK_FREE (yyss1);
-+      }
-+# endif
-+#endif /* no yyoverflow */
-+
-+      yyssp = yyss + yysize - 1;
-+      yyvsp = yyvs + yysize - 1;
-+
-+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-+		  (unsigned long int) yystacksize));
-+
-+      if (yyss + yystacksize - 1 <= yyssp)
-+	YYABORT;
-+    }
-+
-+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-+
-+  if (yystate == YYFINAL)
-+    YYACCEPT;
-+
-+  goto yybackup;
-+
-+/*-----------.
-+| yybackup.  |
-+`-----------*/
-+yybackup:
-+
-+  /* Do appropriate processing given the current state.  Read a
-+     lookahead token if we need one and don't already have one.  */
-+
-+  /* First try to decide what to do without reference to lookahead token.  */
-+  yyn = yypact[yystate];
-+  if (yypact_value_is_default (yyn))
-+    goto yydefault;
-+
-+  /* Not known => get a lookahead token if don't already have one.  */
-+
-+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-+  if (yychar == YYEMPTY)
-+    {
-+      YYDPRINTF ((stderr, "Reading a token: "));
-+      yychar = YYLEX;
-+    }
-+
-+  if (yychar <= YYEOF)
-+    {
-+      yychar = yytoken = YYEOF;
-+      YYDPRINTF ((stderr, "Now at end of input.\n"));
-+    }
-+  else
-+    {
-+      yytoken = YYTRANSLATE (yychar);
-+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-+    }
-+
-+  /* If the proper action on seeing token YYTOKEN is to reduce or to
-+     detect an error, take that action.  */
-+  yyn += yytoken;
-+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-+    goto yydefault;
-+  yyn = yytable[yyn];
-+  if (yyn <= 0)
-+    {
-+      if (yytable_value_is_error (yyn))
-+        goto yyerrlab;
-+      yyn = -yyn;
-+      goto yyreduce;
-+    }
-+
-+  /* Count tokens shifted since error; after three, turn off error
-+     status.  */
-+  if (yyerrstatus)
-+    yyerrstatus--;
-+
-+  /* Shift the lookahead token.  */
-+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-+
-+  /* Discard the shifted token.  */
-+  yychar = YYEMPTY;
-+
-+  yystate = yyn;
-+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-+  *++yyvsp = yylval;
-+  YY_IGNORE_MAYBE_UNINITIALIZED_END
-+
-+  goto yynewstate;
-+
-+
-+/*-----------------------------------------------------------.
-+| yydefault -- do the default action for the current state.  |
-+`-----------------------------------------------------------*/
-+yydefault:
-+  yyn = yydefact[yystate];
-+  if (yyn == 0)
-+    goto yyerrlab;
-+  goto yyreduce;
-+
-+
-+/*-----------------------------.
-+| yyreduce -- Do a reduction.  |
-+`-----------------------------*/
-+yyreduce:
-+  /* yyn is the number of a rule to reduce with.  */
-+  yylen = yyr2[yyn];
-+
-+  /* If YYLEN is nonzero, implement the default value of the action:
-+     `$$ = $1'.
-+
-+     Otherwise, the following line sets YYVAL to garbage.
-+     This behavior is undocumented and Bison
-+     users should not rely upon it.  Assigning to YYVAL
-+     unconditionally makes the parser a bit smaller, and it avoids a
-+     GCC warning that YYVAL may be used uninitialized.  */
-+  yyval = yyvsp[1-yylen];
-+
-+
-+  YY_REDUCE_PRINT (yyn);
-+  switch (yyn)
-+    {
-+        case 4:
-+/* Line 1787 of yacc.c  */
-+#line 157 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHaveTime++;
-+	}
-+    break;
-+
-+  case 5:
-+/* Line 1787 of yacc.c  */
-+#line 160 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHaveZone++;
-+	}
-+    break;
-+
-+  case 6:
-+/* Line 1787 of yacc.c  */
-+#line 163 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHaveDate++;
-+	}
-+    break;
-+
-+  case 7:
-+/* Line 1787 of yacc.c  */
-+#line 166 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHaveDay++;
-+	}
-+    break;
-+
-+  case 8:
-+/* Line 1787 of yacc.c  */
-+#line 169 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHaveRel++;
-+	}
-+    break;
-+
-+  case 10:
-+/* Line 1787 of yacc.c  */
-+#line 175 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHour = (yyvsp[(1) - (2)].Number);
-+	    VARIABLE->yyMinutes = 0;
-+	    VARIABLE->yySeconds = 0;
-+	    VARIABLE->yyMeridian = (yyvsp[(2) - (2)].Meridian);
-+	}
-+    break;
-+
-+  case 11:
-+/* Line 1787 of yacc.c  */
-+#line 181 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/100;
-+	    VARIABLE->yyMinutes = (yyvsp[(1) - (2)].Number)%100;
-+	    VARIABLE->yySeconds = 0;
-+	    VARIABLE->yyMeridian = MER24;
-+	    VARIABLE->yyDSTmode = DSToff;
-+	    VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60);
-+        }
-+    break;
-+
-+  case 12:
-+/* Line 1787 of yacc.c  */
-+#line 189 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/10000;
-+	    VARIABLE->yyMinutes = ((yyvsp[(1) - (2)].Number)/100)%100;
-+	    VARIABLE->yySeconds = (yyvsp[(1) - (2)].Number) % 100;
-+	    VARIABLE->yyMeridian = MER24;
-+	    VARIABLE->yyDSTmode = DSToff;
-+	    VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60);
-+        }
-+    break;
-+
-+  case 13:
-+/* Line 1787 of yacc.c  */
-+#line 197 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHour = (yyvsp[(1) - (4)].Number);
-+	    VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number);
-+	    VARIABLE->yySeconds = 0;
-+	    VARIABLE->yyMeridian = (yyvsp[(4) - (4)].Meridian);
-+	}
-+    break;
-+
-+  case 14:
-+/* Line 1787 of yacc.c  */
-+#line 203 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHour = (yyvsp[(1) - (4)].Number);
-+	    VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number);
-+	    VARIABLE->yyMeridian = MER24;
-+	    VARIABLE->yyDSTmode = DSToff;
-+	    VARIABLE->yyTimezone = - ((yyvsp[(4) - (4)].Number) % 100 + ((yyvsp[(4) - (4)].Number) / 100) * 60);
-+	}
-+    break;
-+
-+  case 15:
-+/* Line 1787 of yacc.c  */
-+#line 210 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHour = (yyvsp[(1) - (6)].Number);
-+	    VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number);
-+	    VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number);
-+	    VARIABLE->yyMeridian = (yyvsp[(6) - (6)].Meridian);
-+	}
-+    break;
-+
-+  case 16:
-+/* Line 1787 of yacc.c  */
-+#line 216 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyHour = (yyvsp[(1) - (6)].Number);
-+	    VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number);
-+	    VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number);
-+	    VARIABLE->yyMeridian = MER24;
-+	    VARIABLE->yyDSTmode = DSToff;
-+	    VARIABLE->yyTimezone = - ((yyvsp[(6) - (6)].Number) % 100 + ((yyvsp[(6) - (6)].Number) / 100) * 60);
-+	}
-+    break;
-+
-+  case 17:
-+/* Line 1787 of yacc.c  */
-+#line 226 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number);
-+	    VARIABLE->yyDSTmode = DSToff;
-+	}
-+    break;
-+
-+  case 18:
-+/* Line 1787 of yacc.c  */
-+#line 230 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number);
-+	    VARIABLE->yyDSTmode = DSTon;
-+	}
-+    break;
-+
-+  case 19:
-+/* Line 1787 of yacc.c  */
-+#line 235 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyTimezone = (yyvsp[(1) - (2)].Number);
-+	    VARIABLE->yyDSTmode = DSTon;
-+	}
-+    break;
-+
-+  case 20:
-+/* Line 1787 of yacc.c  */
-+#line 239 "ptlib/common/getdate.y"
-+    {
-+            if (VARIABLE->yyHaveTime > 0) {
-+	      VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number);
-+	      VARIABLE->yyDSTmode = DSToff;
-+            }
-+            else
-+              VARIABLE->yyHaveZone--;
-+        }
-+    break;
-+
-+  case 21:
-+/* Line 1787 of yacc.c  */
-+#line 249 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyDayOrdinal = 1;
-+	    VARIABLE->yyDayNumber = (yyvsp[(1) - (1)].Number);
-+	}
-+    break;
-+
-+  case 22:
-+/* Line 1787 of yacc.c  */
-+#line 253 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyDayOrdinal = 1;
-+	    VARIABLE->yyDayNumber = (yyvsp[(1) - (2)].Number);
-+	}
-+    break;
-+
-+  case 23:
-+/* Line 1787 of yacc.c  */
-+#line 257 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyDayOrdinal = (yyvsp[(1) - (2)].Number);
-+	    VARIABLE->yyDayNumber = (yyvsp[(2) - (2)].Number);
-+	}
-+    break;
-+
-+  case 24:
-+/* Line 1787 of yacc.c  */
-+#line 263 "ptlib/common/getdate.y"
-+    {
-+	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(3) - (3)].Number), VARIABLE->yyYear);
-+	}
-+    break;
-+
-+  case 25:
-+/* Line 1787 of yacc.c  */
-+#line 266 "ptlib/common/getdate.y"
-+    {
-+	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (5)].Number), (yyvsp[(3) - (5)].Number), (yyvsp[(5) - (5)].Number));
-+	}
-+    break;
-+
-+  case 26:
-+/* Line 1787 of yacc.c  */
-+#line 269 "ptlib/common/getdate.y"
-+    {
-+	    /* ISO 8601 format.  yyyy-mm-dd.  */
-+	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (4)].Number), -(yyvsp[(2) - (4)].Number), -(yyvsp[(3) - (4)].Number));
-+	}
-+    break;
-+
-+  case 27:
-+/* Line 1787 of yacc.c  */
-+#line 273 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100;
-+	    VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100;
-+	    VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000;
-+	}
-+    break;
-+
-+  case 28:
-+/* Line 1787 of yacc.c  */
-+#line 278 "ptlib/common/getdate.y"
-+    {
-+	    /* e.g. 17-JUN-1992.  */
-+	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), -(yyvsp[(3) - (3)].Number));
-+	}
-+    break;
-+
-+  case 29:
-+/* Line 1787 of yacc.c  */
-+#line 282 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyMonth = (yyvsp[(1) - (2)].Number);
-+	    if ((yyvsp[(2) - (2)].Number) > 31)
-+	      VARIABLE->yyYear = (yyvsp[(2) - (2)].Number);
-+	    else
-+	      VARIABLE->yyDay = (yyvsp[(2) - (2)].Number);
-+	}
-+    break;
-+
-+  case 30:
-+/* Line 1787 of yacc.c  */
-+#line 289 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyMonth = (yyvsp[(1) - (4)].Number);
-+	    VARIABLE->yyDay = (yyvsp[(2) - (4)].Number);
-+	    VARIABLE->yyYear = (yyvsp[(4) - (4)].Number);
-+	}
-+    break;
-+
-+  case 31:
-+/* Line 1787 of yacc.c  */
-+#line 294 "ptlib/common/getdate.y"
-+    {
-+	    if ((yyvsp[(1) - (2)].Number) > 31)
-+	      VARIABLE->yyYear = (yyvsp[(1) - (2)].Number);
-+	    else
-+	      VARIABLE->yyDay = (yyvsp[(1) - (2)].Number);
-+	    VARIABLE->yyMonth = (yyvsp[(2) - (2)].Number);
-+	}
-+    break;
-+
-+  case 32:
-+/* Line 1787 of yacc.c  */
-+#line 301 "ptlib/common/getdate.y"
-+    {
-+	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), (yyvsp[(3) - (3)].Number));
-+	}
-+    break;
-+
-+  case 33:
-+/* Line 1787 of yacc.c  */
-+#line 306 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelSeconds = -VARIABLE->yyRelSeconds;
-+	    VARIABLE->yyRelMonth = -VARIABLE->yyRelMonth;
-+	}
-+    break;
-+
-+  case 35:
-+/* Line 1787 of yacc.c  */
-+#line 313 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L;
-+	}
-+    break;
-+
-+  case 36:
-+/* Line 1787 of yacc.c  */
-+#line 316 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L;
-+	}
-+    break;
-+
-+  case 37:
-+/* Line 1787 of yacc.c  */
-+#line 319 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (1)].Number) * 60L;
-+	}
-+    break;
-+
-+  case 38:
-+/* Line 1787 of yacc.c  */
-+#line 322 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number);
-+	}
-+    break;
-+
-+  case 39:
-+/* Line 1787 of yacc.c  */
-+#line 325 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number);
-+	}
-+    break;
-+
-+  case 40:
-+/* Line 1787 of yacc.c  */
-+#line 328 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelSeconds++;
-+	}
-+    break;
-+
-+  case 41:
-+/* Line 1787 of yacc.c  */
-+#line 331 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
-+	}
-+    break;
-+
-+  case 42:
-+/* Line 1787 of yacc.c  */
-+#line 334 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
-+	}
-+    break;
-+
-+  case 43:
-+/* Line 1787 of yacc.c  */
-+#line 337 "ptlib/common/getdate.y"
-+    {
-+	    VARIABLE->yyRelMonth += (yyvsp[(1) - (1)].Number);
-+	}
-+    break;
-+
-+  case 44:
-+/* Line 1787 of yacc.c  */
-+#line 342 "ptlib/common/getdate.y"
-+    {
-+	    (yyval.Number) = (yyvsp[(1) - (1)].Number);
-+	}
-+    break;
-+
-+  case 45:
-+/* Line 1787 of yacc.c  */
-+#line 345 "ptlib/common/getdate.y"
-+    {
-+	    (yyval.Number) = (yyvsp[(1) - (1)].Number);
-+	}
-+    break;
-+
-+  case 46:
-+/* Line 1787 of yacc.c  */
-+#line 348 "ptlib/common/getdate.y"
-+    {
-+	    (yyval.Number) = (yyvsp[(1) - (1)].Number);
-+	}
-+    break;
-+
-+  case 47:
-+/* Line 1787 of yacc.c  */
-+#line 353 "ptlib/common/getdate.y"
-+    {
-+	    if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel)
-+		VARIABLE->yyYear = (yyvsp[(1) - (1)].Number);
-+	    else {
-+		if((yyvsp[(1) - (1)].Number)>240000) {
-+		    VARIABLE->yyHaveDate++;
-+		    VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100;
-+		    VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100;
-+		    VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000;
-+		}
-+		else {
-+		    VARIABLE->yyHaveTime++;
-+		    if ((yyvsp[(1) - (1)].Number) < 10000) {
-+		    	VARIABLE->yyHour = (yyvsp[(1) - (1)].Number) / 100;
-+		    	VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number) % 100;
-+		        VARIABLE->yySeconds = 0;
-+		    }
-+		    else {
-+	                VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000;
-+	                VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100;
-+	                VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100;
-+                    }
-+		    VARIABLE->yyMeridian = MER24;
-+	        }
-+	    }
-+	}
-+    break;
-+
-+  case 48:
-+/* Line 1787 of yacc.c  */
-+#line 379 "ptlib/common/getdate.y"
-+    {
-+	    if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel)
-+		VARIABLE->yyYear = (yyvsp[(1) - (1)].Number);
-+	    else {
-+	        VARIABLE->yyHaveTime++;
-+	        VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/100;
-+	        VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number)%100;
-+	        VARIABLE->yySeconds = 0;
-+	        VARIABLE->yyMeridian = MER24;
-+            }
-+        }
-+    break;
-+
-+  case 49:
-+/* Line 1787 of yacc.c  */
-+#line 390 "ptlib/common/getdate.y"
-+    {
-+	    if (!VARIABLE->yyHaveDate && (yyvsp[(1) - (1)].Number)>240000) {
-+		VARIABLE->yyHaveDate++;
-+		VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100;
-+		VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100;
-+		VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000;
-+	    }
-+	    else if (!VARIABLE->yyHaveTime) {
-+	        VARIABLE->yyHaveTime++;
-+	        VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000;
-+	        VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100;
-+	        VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100;
-+	        VARIABLE->yyMeridian = MER24;
-+            }
-+        }
-+    break;
-+
-+  case 50:
-+/* Line 1787 of yacc.c  */
-+#line 407 "ptlib/common/getdate.y"
-+    {
-+	    (yyval.Meridian) = MER24;
-+	}
-+    break;
-+
-+  case 51:
-+/* Line 1787 of yacc.c  */
-+#line 410 "ptlib/common/getdate.y"
-+    {
-+	    (yyval.Meridian) = (yyvsp[(1) - (1)].Meridian);
-+	}
-+    break;
-+
-+
-+/* Line 1787 of yacc.c  */
-+#line 2031 "ptlib/common/getdate.tab.c"
-+      default: break;
-+    }
-+  /* User semantic actions sometimes alter yychar, and that requires
-+     that yytoken be updated with the new translation.  We take the
-+     approach of translating immediately before every use of yytoken.
-+     One alternative is translating here after every semantic action,
-+     but that translation would be missed if the semantic action invokes
-+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-+     incorrect destructor might then be invoked immediately.  In the
-+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-+     to an incorrect destructor call or verbose syntax error message
-+     before the lookahead is translated.  */
-+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-+
-+  YYPOPSTACK (yylen);
-+  yylen = 0;
-+  YY_STACK_PRINT (yyss, yyssp);
-+
-+  *++yyvsp = yyval;
-+
-+  /* Now `shift' the result of the reduction.  Determine what state
-+     that goes to, based on the state we popped back to and the rule
-+     number reduced by.  */
-+
-+  yyn = yyr1[yyn];
-+
-+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-+    yystate = yytable[yystate];
-+  else
-+    yystate = yydefgoto[yyn - YYNTOKENS];
-+
-+  goto yynewstate;
-+
-+
-+/*------------------------------------.
-+| yyerrlab -- here on detecting error |
-+`------------------------------------*/
-+yyerrlab:
-+  /* Make sure we have latest lookahead translation.  See comments at
-+     user semantic actions for why this is necessary.  */
-+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-+
-+  /* If not already recovering from an error, report this error.  */
-+  if (!yyerrstatus)
-+    {
-+      ++yynerrs;
-+#if ! YYERROR_VERBOSE
-+      yyerror (YY_("syntax error"));
-+#else
-+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-+                                        yyssp, yytoken)
-+      {
-+        char const *yymsgp = YY_("syntax error");
-+        int yysyntax_error_status;
-+        yysyntax_error_status = YYSYNTAX_ERROR;
-+        if (yysyntax_error_status == 0)
-+          yymsgp = yymsg;
-+        else if (yysyntax_error_status == 1)
-+          {
-+            if (yymsg != yymsgbuf)
-+              YYSTACK_FREE (yymsg);
-+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-+            if (!yymsg)
-+              {
-+                yymsg = yymsgbuf;
-+                yymsg_alloc = sizeof yymsgbuf;
-+                yysyntax_error_status = 2;
-+              }
-+            else
-+              {
-+                yysyntax_error_status = YYSYNTAX_ERROR;
-+                yymsgp = yymsg;
-+              }
-+          }
-+        yyerror (yymsgp);
-+        if (yysyntax_error_status == 2)
-+          goto yyexhaustedlab;
-+      }
-+# undef YYSYNTAX_ERROR
-+#endif
-+    }
-+
-+
-+
-+  if (yyerrstatus == 3)
-+    {
-+      /* If just tried and failed to reuse lookahead token after an
-+	 error, discard it.  */
-+
-+      if (yychar <= YYEOF)
-+	{
-+	  /* Return failure if at end of input.  */
-+	  if (yychar == YYEOF)
-+	    YYABORT;
-+	}
-+      else
-+	{
-+	  yydestruct ("Error: discarding",
-+		      yytoken, &yylval);
-+	  yychar = YYEMPTY;
-+	}
-+    }
-+
-+  /* Else will try to reuse lookahead token after shifting the error
-+     token.  */
-+  goto yyerrlab1;
-+
-+
-+/*---------------------------------------------------.
-+| yyerrorlab -- error raised explicitly by YYERROR.  |
-+`---------------------------------------------------*/
-+yyerrorlab:
-+
-+  /* Pacify compilers like GCC when the user code never invokes
-+     YYERROR and the label yyerrorlab therefore never appears in user
-+     code.  */
-+  if (/*CONSTCOND*/ 0)
-+     goto yyerrorlab;
-+
-+  /* Do not reclaim the symbols of the rule which action triggered
-+     this YYERROR.  */
-+  YYPOPSTACK (yylen);
-+  yylen = 0;
-+  YY_STACK_PRINT (yyss, yyssp);
-+  yystate = *yyssp;
-+  goto yyerrlab1;
-+
-+
-+/*-------------------------------------------------------------.
-+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-+`-------------------------------------------------------------*/
-+yyerrlab1:
-+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
-+
-+  for (;;)
-+    {
-+      yyn = yypact[yystate];
-+      if (!yypact_value_is_default (yyn))
-+	{
-+	  yyn += YYTERROR;
-+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-+	    {
-+	      yyn = yytable[yyn];
-+	      if (0 < yyn)
-+		break;
-+	    }
-+	}
-+
-+      /* Pop the current state because it cannot handle the error token.  */
-+      if (yyssp == yyss)
-+	YYABORT;
-+
-+
-+      yydestruct ("Error: popping",
-+		  yystos[yystate], yyvsp);
-+      YYPOPSTACK (1);
-+      yystate = *yyssp;
-+      YY_STACK_PRINT (yyss, yyssp);
-+    }
-+
-+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-+  *++yyvsp = yylval;
-+  YY_IGNORE_MAYBE_UNINITIALIZED_END
-+
-+
-+  /* Shift the error token.  */
-+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-+
-+  yystate = yyn;
-+  goto yynewstate;
-+
-+
-+/*-------------------------------------.
-+| yyacceptlab -- YYACCEPT comes here.  |
-+`-------------------------------------*/
-+yyacceptlab:
-+  yyresult = 0;
-+  goto yyreturn;
-+
-+/*-----------------------------------.
-+| yyabortlab -- YYABORT comes here.  |
-+`-----------------------------------*/
-+yyabortlab:
-+  yyresult = 1;
-+  goto yyreturn;
-+
-+#if !defined yyoverflow || YYERROR_VERBOSE
-+/*-------------------------------------------------.
-+| yyexhaustedlab -- memory exhaustion comes here.  |
-+`-------------------------------------------------*/
-+yyexhaustedlab:
-+  yyerror (YY_("memory exhausted"));
-+  yyresult = 2;
-+  /* Fall through.  */
-+#endif
-+
-+yyreturn:
-+  if (yychar != YYEMPTY)
-+    {
-+      /* Make sure we have latest lookahead translation.  See comments at
-+         user semantic actions for why this is necessary.  */
-+      yytoken = YYTRANSLATE (yychar);
-+      yydestruct ("Cleanup: discarding lookahead",
-+                  yytoken, &yylval);
-+    }
-+  /* Do not reclaim the symbols of the rule which action triggered
-+     this YYABORT or YYACCEPT.  */
-+  YYPOPSTACK (yylen);
-+  YY_STACK_PRINT (yyss, yyssp);
-+  while (yyssp != yyss)
-+    {
-+      yydestruct ("Cleanup: popping",
-+		  yystos[*yyssp], yyvsp);
-+      YYPOPSTACK (1);
-+    }
-+#ifndef yyoverflow
-+  if (yyss != yyssa)
-+    YYSTACK_FREE (yyss);
-+#endif
-+#if YYERROR_VERBOSE
-+  if (yymsg != yymsgbuf)
-+    YYSTACK_FREE (yymsg);
-+#endif
-+  /* Make sure YYID is used.  */
-+  return YYID (yyresult);
-+}
-+
-+
-+/* Line 2050 of yacc.c  */
-+#line 415 "ptlib/common/getdate.y"
-+
-+
-+/* Month and day table. */
-+static TABLE const MonthDayTable[] = {
-+    { "january",	tMONTH,  1 },
-+    { "february",	tMONTH,  2 },
-+    { "march",		tMONTH,  3 },
-+    { "april",		tMONTH,  4 },
-+    { "may",		tMONTH,  5 },
-+    { "june",		tMONTH,  6 },
-+    { "july",		tMONTH,  7 },
-+    { "august",		tMONTH,  8 },
-+    { "september",	tMONTH,  9 },
-+    { "sept",		tMONTH,  9 },
-+    { "october",	tMONTH, 10 },
-+    { "november",	tMONTH, 11 },
-+    { "december",	tMONTH, 12 },
-+    { "sunday",		tDAY, 0 },
-+    { "monday",		tDAY, 1 },
-+    { "tuesday",	tDAY, 2 },
-+    { "tues",		tDAY, 2 },
-+    { "wednesday",	tDAY, 3 },
-+    { "wednes",		tDAY, 3 },
-+    { "thursday",	tDAY, 4 },
-+    { "thur",		tDAY, 4 },
-+    { "thurs",		tDAY, 4 },
-+    { "friday",		tDAY, 5 },
-+    { "saturday",	tDAY, 6 },
-+    { NULL }
-+};
-+
-+/* Time units table. */
-+static TABLE const UnitsTable[] = {
-+    { "year",		tMONTH_UNIT,	12 },
-+    { "month",		tMONTH_UNIT,	1 },
-+    { "fortnight",	tMINUTE_UNIT,	14 * 24 * 60 },
-+    { "week",		tMINUTE_UNIT,	7 * 24 * 60 },
-+    { "day",		tMINUTE_UNIT,	1 * 24 * 60 },
-+    { "hour",		tMINUTE_UNIT,	60 },
-+    { "minute",		tMINUTE_UNIT,	1 },
-+    { "min",		tMINUTE_UNIT,	1 },
-+    { "second",		tSEC_UNIT,	1 },
-+    { "sec",		tSEC_UNIT,	1 },
-+    { NULL }
-+};
-+
-+/* Assorted relative-time words. */
-+static TABLE const OtherTable[] = {
-+    { "tomorrow",	tMINUTE_UNIT,	1 * 24 * 60 },
-+    { "yesterday",	tMINUTE_UNIT,	-1 * 24 * 60 },
-+    { "today",		tMINUTE_UNIT,	0 },
-+    { "now",		tMINUTE_UNIT,	0 },
-+    { "last",		tUNUMBER,	-1 },
-+    { "this",		tMINUTE_UNIT,	0 },
-+    { "next",		tUNUMBER,	2 },
-+    { "first",		tUNUMBER,	1 },
-+/*  { "second",		tUNUMBER,	2 }, */
-+    { "third",		tUNUMBER,	3 },
-+    { "fourth",		tUNUMBER,	4 },
-+    { "fifth",		tUNUMBER,	5 },
-+    { "sixth",		tUNUMBER,	6 },
-+    { "seventh",	tUNUMBER,	7 },
-+    { "eighth",		tUNUMBER,	8 },
-+    { "ninth",		tUNUMBER,	9 },
-+    { "tenth",		tUNUMBER,	10 },
-+    { "eleventh",	tUNUMBER,	11 },
-+    { "twelfth",	tUNUMBER,	12 },
-+    { "ago",		tAGO,	1 },
-+    { NULL }
-+};
-+
-+/* The timezone table. */
-+/* Some of these are commented out because a time_t can't store a float. */
-+static TABLE const TimezoneTable[] = {
-+    { "gmt",	tZONE,     HOUR( 0) },	/* Greenwich Mean */
-+    { "ut",	tZONE,     HOUR( 0) },	/* Universal (Coordinated) */
-+    { "utc",	tZONE,     HOUR( 0) },
-+    { "wet",	tZONE,     HOUR( 0) },	/* Western European */
-+    { "bst",	tDAYZONE,  HOUR( 0) },	/* British Summer */
-+    { "wat",	tZONE,     HOUR( 1) },	/* West Africa */
-+    { "at",	tZONE,     HOUR( 2) },	/* Azores */
-+#if	0
-+    /* For completeness.  BST is also British Summer, and GST is
-+     * also Guam Standard. */
-+    { "bst",	tZONE,     HOUR( 3) },	/* Brazil Standard */
-+    { "gst",	tZONE,     HOUR( 3) },	/* Greenland Standard */
-+#endif
-+#if 0
-+    { "nft",	tZONE,     HOUR(3.5) },	/* Newfoundland */
-+    { "nst",	tZONE,     HOUR(3.5) },	/* Newfoundland Standard */
-+    { "ndt",	tDAYZONE,  HOUR(3.5) },	/* Newfoundland Daylight */
-+#endif
-+    { "ast",	tZONE,     HOUR( 4) },	/* Atlantic Standard */
-+    { "adt",	tDAYZONE,  HOUR( 4) },	/* Atlantic Daylight */
-+    { "est",	tZONE,     HOUR( 5) },	/* Eastern Standard */
-+    { "edt",	tDAYZONE,  HOUR( 5) },	/* Eastern Daylight */
-+    { "cst",	tZONE,     HOUR( 6) },	/* Central Standard */
-+    { "cdt",	tDAYZONE,  HOUR( 6) },	/* Central Daylight */
-+    { "mst",	tZONE,     HOUR( 7) },	/* Mountain Standard */
-+    { "mdt",	tDAYZONE,  HOUR( 7) },	/* Mountain Daylight */
-+    { "pst",	tZONE,     HOUR( 8) },	/* Pacific Standard */
-+    { "pdt",	tDAYZONE,  HOUR( 8) },	/* Pacific Daylight */
-+    { "yst",	tZONE,     HOUR( 9) },	/* Yukon Standard */
-+    { "ydt",	tDAYZONE,  HOUR( 9) },	/* Yukon Daylight */
-+    { "hst",	tZONE,     HOUR(10) },	/* Hawaii Standard */
-+    { "hdt",	tDAYZONE,  HOUR(10) },	/* Hawaii Daylight */
-+    { "cat",	tZONE,     HOUR(10) },	/* Central Alaska */
-+    { "ahst",	tZONE,     HOUR(10) },	/* Alaska-Hawaii Standard */
-+    { "nt",	tZONE,     HOUR(11) },	/* Nome */
-+    { "idlw",	tZONE,     HOUR(12) },	/* International Date Line West */
-+    { "cet",	tZONE,     -HOUR(1) },	/* Central European */
-+    { "met",	tZONE,     -HOUR(1) },	/* Middle European */
-+    { "mewt",	tZONE,     -HOUR(1) },	/* Middle European Winter */
-+    { "mest",	tDAYZONE,  -HOUR(1) },	/* Middle European Summer */
-+    { "swt",	tZONE,     -HOUR(1) },	/* Swedish Winter */
-+    { "sst",	tDAYZONE,  -HOUR(1) },	/* Swedish Summer */
-+    { "fwt",	tZONE,     -HOUR(1) },	/* French Winter */
-+    { "fst",	tDAYZONE,  -HOUR(1) },	/* French Summer */
-+    { "eet",	tZONE,     -HOUR(2) },	/* Eastern Europe, USSR Zone 1 */
-+    { "bt",	tZONE,     -HOUR(3) },	/* Baghdad, USSR Zone 2 */
-+#if 0
-+    { "it",	tZONE,     -HOUR(3.5) },/* Iran */
-+#endif
-+    { "zp4",	tZONE,     -HOUR(4) },	/* USSR Zone 3 */
-+    { "zp5",	tZONE,     -HOUR(5) },	/* USSR Zone 4 */
-+#if 0
-+    { "ist",	tZONE,     -HOUR(5.5) },/* Indian Standard */
-+#endif
-+    { "zp6",	tZONE,     -HOUR(6) },	/* USSR Zone 5 */
-+#if	0
-+    /* For completeness.  NST is also Newfoundland Stanard, and SST is
-+     * also Swedish Summer. */
-+    { "nst",	tZONE,     -HOUR(6.5) },/* North Sumatra */
-+    { "sst",	tZONE,     -HOUR(7) },	/* South Sumatra, USSR Zone 6 */
-+#endif	/* 0 */
-+    { "wast",	tZONE,     -HOUR(7) },	/* West Australian Standard */
-+    { "wadt",	tDAYZONE,  -HOUR(7) },	/* West Australian Daylight */
-+#if 0
-+    { "jt",	tZONE,     -HOUR(7.5) },/* Java (3pm in Cronusland!) */
-+#endif
-+    { "cct",	tZONE,     -HOUR(8) },	/* China Coast, USSR Zone 7 */
-+    { "jst",	tZONE,     -HOUR(9) },	/* Japan Standard, USSR Zone 8 */
-+#if 0
-+    { "cast",	tZONE,     -HOUR(9.5) },/* Central Australian Standard */
-+    { "cadt",	tDAYZONE,  -HOUR(9.5) },/* Central Australian Daylight */
-+#endif
-+    { "east",	tZONE,     -HOUR(10) },	/* Eastern Australian Standard */
-+    { "eadt",	tDAYZONE,  -HOUR(10) },	/* Eastern Australian Daylight */
-+    { "gst",	tZONE,     -HOUR(10) },	/* Guam Standard, USSR Zone 9 */
-+    { "nzt",	tZONE,     -HOUR(12) },	/* New Zealand */
-+    { "nzst",	tZONE,     -HOUR(12) },	/* New Zealand Standard */
-+    { "nzdt",	tDAYZONE,  -HOUR(12) },	/* New Zealand Daylight */
-+    { "idle",	tZONE,     -HOUR(12) },	/* International Date Line East */
-+    {  NULL  }
-+};
-+
-+/* Military timezone table. */
-+static TABLE const MilitaryTable[] = {
-+    { "a",	tMILZONE,	HOUR(  1) },
-+    { "b",	tMILZONE,	HOUR(  2) },
-+    { "c",	tMILZONE,	HOUR(  3) },
-+    { "d",	tMILZONE,	HOUR(  4) },
-+    { "e",	tMILZONE,	HOUR(  5) },
-+    { "f",	tMILZONE,	HOUR(  6) },
-+    { "g",	tMILZONE,	HOUR(  7) },
-+    { "h",	tMILZONE,	HOUR(  8) },
-+    { "i",	tMILZONE,	HOUR(  9) },
-+    { "k",	tMILZONE,	HOUR( 10) },
-+    { "l",	tMILZONE,	HOUR( 11) },
-+    { "m",	tMILZONE,	HOUR( 12) },
-+    { "n",	tMILZONE,	HOUR(- 1) },
-+    { "o",	tMILZONE,	HOUR(- 2) },
-+    { "p",	tMILZONE,	HOUR(- 3) },
-+    { "q",	tMILZONE,	HOUR(- 4) },
-+    { "r",	tMILZONE,	HOUR(- 5) },
-+    { "s",	tMILZONE,	HOUR(- 6) },
-+    { "t",	tMILZONE,	HOUR(- 7) },
-+    { "u",	tMILZONE,	HOUR(- 8) },
-+    { "v",	tMILZONE,	HOUR(- 9) },
-+    { "w",	tMILZONE,	HOUR(-10) },
-+    { "x",	tMILZONE,	HOUR(-11) },
-+    { "y",	tMILZONE,	HOUR(-12) },
-+    { "z",	tZONE,		HOUR(  0) }, /* Deliberately tZONE */
-+    { NULL }
-+};
-+
-+static int LookupWord(char * buff, YYSTYPE * yylval, struct Variables * vars)
-+{
-+    register char	*p;
-+    register char	*q;
-+    register const TABLE	*tp;
-+    int			i;
-+    int			abbrev;
-+
-+    /* Make it lowercase. */
-+    for (p = buff; *p != '\0'; p++)
-+        *p = (char)tolower(*p);
-+
-+    if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
-+	yylval->Meridian = MERam;
-+	return tMERIDIAN;
-+    }
-+    if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) {
-+	yylval->Meridian = MERpm;
-+	return tMERIDIAN;
-+    }
-+
-+    /* See if we have an abbreviation for a month. */
-+    if (strlen(buff) == 3)
-+	abbrev = 1;
-+    else if (strlen(buff) == 4 && buff[3] == '.') {
-+	abbrev = 1;
-+	buff[3] = '\0';
-+    }
-+    else
-+	abbrev = 0;
-+
-+    for (tp = MonthDayTable; tp->name; tp++) {
-+	if (abbrev) {
-+	    if (strncmp(buff, tp->name, 3) == 0) {
-+		yylval->Number = tp->value;
-+		return tp->type;
-+	    }
-+	}
-+	else if (strcmp(buff, tp->name) == 0) {
-+	    yylval->Number = tp->value;
-+	    return tp->type;
-+	}
-+    }
-+
-+    for (tp = TimezoneTable; tp->name; tp++)
-+	if (strcmp(buff, tp->name) == 0) {
-+	    yylval->Number = tp->value;
-+	    return tp->type;
-+	}
-+
-+    if (strcmp(buff, "dst") == 0) 
-+	return tDST;
-+
-+    for (tp = UnitsTable; tp->name; tp++)
-+	if (strcmp(buff, tp->name) == 0) {
-+	    yylval->Number = tp->value;
-+	    return tp->type;
-+	}
-+
-+    /* Strip off any plural and try the units table again. */
-+    i = strlen(buff) - 1;
-+    if (buff[i] == 's') {
-+	buff[i] = '\0';
-+	for (tp = UnitsTable; tp->name; tp++)
-+	    if (strcmp(buff, tp->name) == 0) {
-+		yylval->Number = tp->value;
-+		return tp->type;
-+	    }
-+	buff[i] = 's';		/* Put back for "this" in OtherTable. */
-+    }
-+
-+    for (tp = OtherTable; tp->name; tp++)
-+	if (strcmp(buff, tp->name) == 0) {
-+	    yylval->Number = tp->value;
-+	    return tp->type;
-+	}
-+
-+    /* Avoid confusion with 'T' in RFC3339 and 't' in Military timezones */
-+    if (!vars->yyHaveTime && strcmp(buff, "t") == 0)
-+	return tRFC3339;
-+ 
-+    /* Military timezones. */
-+   if (buff[1] == '\0' && isalpha(*buff)) {
-+	for (tp = MilitaryTable; tp->name; tp++)
-+	    if (strcmp(buff, tp->name) == 0) {
-+		yylval->Number = tp->value;
-+		return tp->type;
-+	    }
-+    }
-+
-+    /* Drop out any periods and try the timezone table again. */
-+    for (i = 0, p = q = buff; *q; q++)
-+	if (*q != '.')
-+	    *p++ = *q;
-+	else
-+	    i++;
-+    *p = '\0';
-+    if (i)
-+	for (tp = TimezoneTable; tp->name; tp++)
-+	    if (strcmp(buff, tp->name) == 0) {
-+		yylval->Number = tp->value;
-+		return tp->type;
-+	    }
-+
-+    for (i = 1; i <= 12; i++)
-+	for (abbrev = 0; abbrev < 2; abbrev++)
-+	    if (PTimeIsMonthName(buff, i, abbrev)) {
-+		yylval->Number = i;
-+		return tMONTH;
-+	    }
-+
-+    for (i = 1; i <= 7; i++)
-+	for (abbrev = 0; abbrev < 2; abbrev++)
-+	    if (PTimeIsDayName(buff, i, abbrev)) {
-+		yylval->Number = i;
-+		return tDAY;
-+	    }
-+
-+    return tID;
-+}
-+
-+
-+#ifdef _MSC_VER
-+#pragma warning(disable:4211)
-+#endif
-+
-+#ifndef __GNUC__
-+static
-+#endif
-+int yylex(YYSTYPE * yylval, struct Variables * vars)
-+{
-+    register char	*p;
-+    char		buff[20];
-+    int			Count;
-+    int			sign;
-+    register int	c = PTimeGetChar(vars->yyInput);
-+
-+    while (c != EOF && c != '\0' && c != '\n') {
-+	while (isspace(c))
-+	    c = PTimeGetChar(vars->yyInput);
-+
-+	if (isdigit(c) || c == '-' || c == '+') {
-+	    if (c == '-' || c == '+') {
-+		sign = c == '-' ? -1 : 1;
-+		if (!isdigit(c = PTimeGetChar(vars->yyInput)))
-+		    /* skip the '-' sign */
-+		    continue;
-+	    }
-+	    else
-+		sign = 0;
-+	    yylval->Number = 0;
-+            Count = 0; /* Count number of digits */
-+	    while (isdigit(c)) {
-+		yylval->Number = 10 * yylval->Number + c - '0';
-+		c = PTimeGetChar(vars->yyInput);
-+                Count++;
-+	    }
-+	    PTimeUngetChar(vars->yyInput, c);
-+	    if (sign < 0)
-+		yylval->Number = -yylval->Number;
-+            if (Count == 4)
-+              return sign ? tS4DIGITNUMBER : t4DIGITNUMBER;
-+	    if (sign)
-+              return tSNUMBER;
-+            if (Count == 6)
-+              return t6DIGITNUMBER;
-+            if (Count == 8)
-+              return t8DIGITNUMBER;
-+            return tUNUMBER;
-+	}
-+
-+	if (isalpha(c)) {
-+	    for (p = buff; isalpha(c) || c == '.'; c = PTimeGetChar(vars->yyInput)) {
-+		if (p < &buff[sizeof(buff)-1])
-+		    *p++ = (char)c;
-+	    }
-+	    *p = '\0';
-+	    PTimeUngetChar(vars->yyInput, c);
-+	    return LookupWord(buff, yylval, vars);
-+	}
-+
-+	if (c != '(')
-+	    return c;
-+
-+	Count = 0;
-+	do {
-+	    c = PTimeGetChar(vars->yyInput);
-+	    if (c == '\0' || c == EOF)
-+		return c;
-+	    if (c == '(')
-+		Count++;
-+	    else if (c == ')')
-+		Count--;
-+	} while (Count > 0);
-+    }
-+
-+    if (c == '\n')
-+        PTimeUngetChar(vars->yyInput, c);
-+
-+    return EOF;
-+}
-+
-+#ifdef _MSC_VER
-+#pragma warning(default:4211)
-+#endif
-+
-+
-+static time_t ToSeconds(time_t Hours, time_t Minutes, time_t Seconds,
-+			MERIDIAN Meridian)
-+{
-+    if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59)
-+	return -1;
-+    switch (Meridian) {
-+    case MER24:
-+	if (Hours < 0 || Hours > 23)
-+	    return -1;
-+	return (Hours * 60L + Minutes) * 60L + Seconds;
-+    case MERam:
-+	if (Hours < 1 || Hours > 12)
-+	    return -1;
-+	if (Hours == 12)
-+	    Hours = 0;
-+	return (Hours * 60L + Minutes) * 60L + Seconds;
-+    case MERpm:
-+	if (Hours < 1 || Hours > 12)
-+	    return -1;
-+	if (Hours == 12)
-+	    Hours = 0;
-+	return ((Hours + 12) * 60L + Minutes) * 60L + Seconds;
-+    }
-+
-+    return -1;
-+}
-+
-+
-+static time_t Convert(time_t Month, time_t Day, time_t Year,
-+		      time_t Hours, time_t Minutes, time_t Seconds,
-+		      MERIDIAN Meridian, DSTMODE DSTmode, time_t yyTimezone)
-+{
-+    static int DaysInMonth[12] = {
-+	31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-+    };
-+    time_t	tod;
-+    time_t	Julian;
-+    int		i;
-+
-+    if (Year < 0)
-+	Year = -Year;
-+    if (Year < 70)
-+	Year += 2000;
-+    else if (Year < 100)
-+	Year += 1900;
-+    DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0)
-+		    ? 29 : 28;
-+    /* Checking for 2038 bogusly assumes that time_t is 32 bits.  But
-+       I'm too lazy to try to check for time_t overflow in another way.  */
-+    if (Year < EPOCH || Year > 2038
-+     || Month < 1 || Month > 12
-+     /* Lint fluff:  "conversion from long may lose accuracy" */
-+     || Day < 1 || Day > DaysInMonth[(int)--Month])
-+	return -1;
-+
-+    for (Julian = Day - 1, i = 0; i < Month; i++)
-+	Julian += DaysInMonth[i];
-+    for (i = EPOCH; i < Year; i++)
-+	Julian += 365 + (i % 4 == 0);
-+    Julian *= SECSPERDAY;
-+    Julian += yyTimezone * 60L;
-+    if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0)
-+	return -1;
-+    Julian += tod;
-+    if (DSTmode == DSTon
-+     || (DSTmode == DSTmaybe && localtime(&Julian)->tm_isdst))
-+	Julian -= 60 * 60;
-+    return Julian;
-+}
-+
-+
-+static time_t DSTcorrect(time_t Start, time_t Future)
-+{
-+    time_t	StartDay;
-+    time_t	FutureDay;
-+
-+    StartDay = (localtime(&Start)->tm_hour + 1) % 24;
-+    FutureDay = (localtime(&Future)->tm_hour + 1) % 24;
-+    return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
-+}
-+
-+
-+static time_t RelativeDate(time_t Start, time_t DayOrdinal, time_t DayNumber)
-+{
-+    struct tm	*tm;
-+    time_t	now;
-+
-+    now = Start;
-+    tm = localtime(&now);
-+    now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
-+    now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
-+    return DSTcorrect(Start, now);
-+}
-+
-+
-+static time_t RelativeMonth(time_t Start, time_t RelMonth, time_t yyTimezone)
-+{
-+    struct tm	*tm;
-+    time_t	Month;
-+    time_t	Year;
-+
-+    if (RelMonth == 0)
-+	return 0;
-+    tm = localtime(&Start);
-+    Month = 12 * tm->tm_year + tm->tm_mon + RelMonth;
-+    Year = Month / 12 + 1900;
-+    Month = Month % 12 + 1;
-+    return DSTcorrect(Start,
-+	    Convert(Month, (time_t)tm->tm_mday, Year,
-+		(time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
-+		MER24, DSTmaybe, yyTimezone));
-+}
-+
-+
-+static void SetPossibleDate(struct Variables * var,
-+			      time_t possible_day,
-+			      time_t possible_month,
-+			      time_t possible_year)
-+{
-+    int date_order;
-+
-+    if (possible_day > 31) /* test for ymd */
-+	date_order = 2;
-+    else if (possible_day > 12) /* test for dmy */
-+	date_order = 1;
-+    else if (possible_month > 12) /* test for mdy */
-+	date_order = 0;
-+    else
-+	date_order = PTimeGetDateOrder();
-+
-+    switch (date_order) {
-+      case 0 :
-+	var->yyDay   = possible_month;
-+	var->yyMonth = possible_day;
-+	var->yyYear  = possible_year;
-+	break;
-+      case 1 :
-+	var->yyDay   = possible_day;
-+	var->yyMonth = possible_month;
-+	var->yyYear  = possible_year;
-+	break;
-+      default :
-+	var->yyDay   = possible_year;
-+	var->yyMonth = possible_month;
-+	var->yyYear  = possible_day;
-+    }
-+}
-+
-+
-+time_t STDAPICALLTYPE PTimeParse(void * inputStream, struct tm * now, int timezone)
-+{
-+    time_t		Start;
-+    struct Variables	var;
-+
-+
-+    var.yyInput = inputStream;
-+    var.yyYear = now->tm_year + 1900;
-+    var.yyMonth = now->tm_mon + 1;
-+    var.yyDay = now->tm_mday;
-+    var.yyTimezone = -timezone;
-+    var.yyDSTmode = DSTmaybe;
-+    var.yyHour = 0;
-+    var.yyMinutes = 0;
-+    var.yySeconds = 0;
-+    var.yyMeridian = MER24;
-+    var.yyRelSeconds = 0;
-+    var.yyRelMonth = 0;
-+    var.yyHaveDate = 0;
-+    var.yyHaveDay = 0;
-+    var.yyHaveRel = 0;
-+    var.yyHaveTime = 0;
-+    var.yyHaveZone = 0;
-+
-+    yyparse(&var);
-+
-+    if (var.yyHaveTime > 1 || var.yyHaveZone > 1 ||
-+	var.yyHaveDate > 1 || var.yyHaveDay > 1)
-+	return -1;
-+
-+    if (var.yyHaveTime == 0 && var.yyHaveZone == 0 &&
-+	var.yyHaveDate == 0 && var.yyHaveDay == 0 && var.yyHaveRel == 0)
-+	return -1;
-+
-+    if (var.yyHaveDate || var.yyHaveTime || var.yyHaveDay) {
-+	Start = Convert(var.yyMonth, var.yyDay, var.yyYear,
-+			var.yyHour, var.yyMinutes, var.yySeconds,
-+			var.yyMeridian, var.yyDSTmode, var.yyTimezone);
-+	if (Start < 0)
-+	    return -1;
-+    }
-+    else {
-+	time(&Start);
-+	if (!var.yyHaveRel)
-+	    Start -= ((now->tm_hour * 60L + now->tm_min) * 60L) + now->tm_sec;
-+    }
-+
-+    Start += var.yyRelSeconds;
-+    Start += RelativeMonth(Start, var.yyRelMonth, var.yyTimezone);
-+
-+    if (var.yyHaveDay && !var.yyHaveDate)
-+	Start += RelativeDate(Start, var.yyDayOrdinal, var.yyDayNumber);
-+
-+    /* Have to do *something* with a legitimate -1 so it's distinguishable
-+     * from the error return value.  (Alternately could set errno on error.) */
-+    return Start == -1 ? 0 : Start;
-+}
-+
-+
-+#ifdef _MSC_VER
-+#pragma warning(disable:4028 4100 4211)
-+#endif
-+
-+#ifdef __GNUC__
-+int yyerror(const char * s)
-+{
-+  return 0;
-+}
-+#else
-+static void yyerror(const char * s)
-+{
-+}
-+#endif
-+
-+#ifdef _MSC_VER
-+#pragma warning(default:4028 4100 4211)
-+#endif
-+
-+
-+/* End of file ***************************************************************/
diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index 7941df032a6..ecea72d2e8f 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -17,8 +17,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [
-    ./bison.patch
-    ./sslv3.patch
+    (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/bison-fix;
+      sha256 = "0vzv9kyn9s628z8wy2gva380gi1rmhxilwlg5pikl5a0wn8p46nw";
+    })
+    (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3;
+      sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0";
+    })
     (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/gcc-5_support;
       sha256 = "0pf2yj0150r4cnc6nv65mclrm3dillqh1xjk7m6gsjnk9b96i5d4";
     })
diff --git a/pkgs/development/libraries/ptlib/sslv3.patch b/pkgs/development/libraries/ptlib/sslv3.patch
deleted file mode 100644
index 1ccf3593ec1..00000000000
--- a/pkgs/development/libraries/ptlib/sslv3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ptlib-2.10.11/src/ptclib/pssl.cxx	2016-02-07 09:54:36.326325637 +0000
-+++ ptlib-2.10.11/src/ptclib/pssl.cxx	2016-02-07 09:55:55.677870908 +0000
-@@ -805,11 +805,13 @@
-   SSL_METHOD * meth;
- 
-   switch (method) {
-+#if !defined(OPENSSL_NO_SSL3)
-     case SSLv3:
-       meth = SSLv3_method();
-       break;
-+#endif
-     case TLSv1:
-       meth = TLSv1_method(); 
-       break;
-     case SSLv23:
-     default:

From 776d149c7656706a08e56821d60ad9c9c248e8e9 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 3 Sep 2017 03:49:18 +1000
Subject: [PATCH 3237/3246] opal: fix gcc6 build

---
 pkgs/development/libraries/opal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix
index 5090aa874ec..36a4c3b0bb6 100644
--- a/pkgs/development/libraries/opal/default.nix
+++ b/pkgs/development/libraries/opal/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1";
+  NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98";
 
   patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];
       

From 08fe8eacd9c35cffbedcb4f51b84cadbe9d5b957 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Fri, 1 Sep 2017 16:18:33 -0400
Subject: [PATCH 3238/3246] freetalk: set guile version to 2.0

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 431321452fc..38f874e62f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2052,7 +2052,9 @@ with pkgs;
 
   freeipmi = callPackage ../tools/system/freeipmi {};
 
-  freetalk = callPackage ../applications/networking/instant-messengers/freetalk { };
+  freetalk = callPackage ../applications/networking/instant-messengers/freetalk {
+    guile = guile_2_0;
+  };
 
   freetds = callPackage ../development/libraries/freetds { };
 

From 62652be1118a9b8dfc8657f53cc16252c31dc979 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 2 Sep 2017 14:27:36 -0400
Subject: [PATCH 3239/3246] Include date and NixOS version in systemd-boot
 entries

Grub configs include the NixOS version and date they were built, now
systemd can have fun too:

    version Generation 99 NixOS 17.03.1700.51a83266d1, Linux Kernel 4.9.43, Built on 2017-08-30
    version Generation 100 NixOS 17.03.1700.51a83266d1, Linux Kernel 4.9.43, Built on 2017-08-30
    version Generation 101 NixOS 17.03.1700.51a83266d1, Linux Kernel 4.9.43, Built on 2017-08-31
    version Generation 102 NixOS 17.03.1700.51a83266d1, Linux Kernel 4.9.43, Built on 2017-09-01
    version Generation 103 NixOS 17.03.1700.51a83266d1, Linux Kernel 4.9.43, Built on 2017-09-02
    version Generation 104 NixOS 17.09beta41.1b8c7786ee, Linux Kernel 4.9.46, Built on 2017-09-02
    version Generation 105 NixOS 17.09.git.1b8c778, Linux Kernel 4.9.46, Built on 2017-09-02
---
 .../systemd-boot/systemd-boot-builder.py      | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index 779005c0df5..3333569c36b 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -12,6 +12,9 @@ import warnings
 import ctypes
 libc = ctypes.CDLL("libc.so.6")
 import re
+import datetime
+import glob
+import os.path
 
 def copy_if_not_exists(source, dest):
     if not os.path.exists(dest):
@@ -24,7 +27,7 @@ def system_dir(profile, generation):
         return "/nix/var/nix/profiles/system-%d-link" % (generation)
 
 BOOT_ENTRY = """title NixOS{profile}
-version Generation {generation}
+version Generation {generation} {description}
 linux {kernel}
 initrd {initrd}
 options {kernel_params}
@@ -54,6 +57,26 @@ def copy_from_profile(profile, generation, name, dry_run=False):
         copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
     return efi_file_path
 
+def describe_generation(generation_dir):
+    try:
+        with open("%s/nixos-version" % generation_dir) as f:
+            nixos_version = f.read()
+    except IOError:
+        nixos_version = "Unknown"
+
+    kernel_dir = os.path.dirname(os.path.realpath("%s/kernel" % generation_dir))
+    module_dir = glob.glob("%s/lib/modules/*" % kernel_dir)[0]
+    kernel_version = os.path.basename(module_dir)
+
+    build_time = int(os.path.getctime(generation_dir))
+    build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F')
+
+    description = "NixOS {}, Linux Kernel {}, Built on {}".format(
+        nixos_version, kernel_version, build_date
+    )
+
+    return description
+
 def write_entry(profile, generation, machine_id):
     kernel = copy_from_profile(profile, generation, "kernel")
     initrd = copy_from_profile(profile, generation, "initrd")
@@ -69,6 +92,7 @@ def write_entry(profile, generation, machine_id):
     generation_dir = os.readlink(system_dir(profile, generation))
     tmp_path = "%s.tmp" % (entry_file)
     kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir)
+
     with open("%s/kernel-params" % (generation_dir)) as params_file:
         kernel_params = kernel_params + params_file.read()
     with open(tmp_path, 'w') as f:
@@ -76,7 +100,8 @@ def write_entry(profile, generation, machine_id):
                     generation=generation,
                     kernel=kernel,
                     initrd=initrd,
-                    kernel_params=kernel_params))
+                    kernel_params=kernel_params,
+                    description=describe_generation(generation_dir)))
         if machine_id is not None:
             f.write("machine-id %s\n" % machine_id)
     os.rename(tmp_path, entry_file)

From 99358068947bb2e81c752eea1aea25e6f24272a6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 2 Sep 2017 20:23:40 +0200
Subject: [PATCH 3240/3246] nixos/release-notes: grsecurity support removed for
 17.09

---
 nixos/doc/manual/release-notes/rl-1709.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 88b28c29118..c275fe46d11 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -184,6 +184,15 @@ rmdir /var/lib/ipfs/.ipfs
       <literal>services.xserver.libinput.enable</literal>.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      grsecurity/PaX support has been dropped, following upstream's
+      decision to cease free support.  See
+      <link xlink:href="https://grsecurity.net/passing_the_baton.php">
+      upstream's announcement</link> for more information.
+      No complete replacement for grsecurity/PaX is available presently.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>

From 268eb4adb7e58833a11ba555aded6dd697e8233d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 2 Sep 2017 20:25:22 +0200
Subject: [PATCH 3241/3246] nixos: purge remaining grsecurity bits

:(

Fixes https://github.com/NixOS/nixpkgs/issues/28859
---
 nixos/doc/manual/release-notes/rl-1609.xml |   2 +-
 nixos/modules/module-list.nix              |   1 -
 nixos/modules/rename.nix                   |  20 --
 nixos/modules/security/grsecurity.nix      | 169 ---------
 nixos/modules/security/grsecurity.xml      | 385 ---------------------
 5 files changed, 1 insertion(+), 576 deletions(-)
 delete mode 100644 nixos/modules/security/grsecurity.nix
 delete mode 100644 nixos/modules/security/grsecurity.xml

diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index 3abafac9737..893f894f42f 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -176,7 +176,7 @@ following incompatible changes:</para>
   streamlined.  Desktop users should be able to simply set
   <programlisting>security.grsecurity.enable = true</programlisting> to get
   a reasonably secure system without having to sacrifice too much
-  functionality.  See <xref linkend="sec-grsecurity" /> for documentation
+  functionality.
   </para></listitem>
 
   <listitem><para>Special filesystems, like <literal>/proc</literal>,
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 641a9e6095e..cc7aa519478 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -121,7 +121,6 @@
   ./security/chromium-suid-sandbox.nix
   ./security/dhparams.nix
   ./security/duosec.nix
-  ./security/grsecurity.nix
   ./security/hidepid.nix
   ./security/lock-kernel-modules.nix
   ./security/oath.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 6b33eeb6e4e..fcf4c32d277 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -124,26 +124,6 @@ with lib;
     (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ])
     (mkRemovedOptionModule [ "services" "iodined" "client" ] "")
 
-    # Grsecurity
-    (mkRemovedOptionModule [ "security" "grsecurity" "kernelPatch" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "mode" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "priority" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "system" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationConfig" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "hardwareVirtualisation" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationSoftware" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "sysctl" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootChmod" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootCaps" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyUSB" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProc" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProcWithGroup" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "unrestrictProcGid" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableRBAC" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableSimultConnect" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "verboseVersion" ] "")
-    (mkRemovedOptionModule [ "security" "grsecurity" "config" "kernelExtraConfig" ] "")
-
     # Unity3D
     (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])
 
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
deleted file mode 100644
index d23c7f2e86d..00000000000
--- a/nixos/modules/security/grsecurity.nix
+++ /dev/null
@@ -1,169 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.security.grsecurity;
-  grsecLockPath = "/proc/sys/kernel/grsecurity/grsec_lock";
-
-  # Ascertain whether NixOS container support is required
-  containerSupportRequired =
-    config.boot.enableContainers && config.containers != {};
-in
-
-{
-  meta = {
-    maintainers = with maintainers; [ ];
-    doc = ./grsecurity.xml;
-  };
-
-  options.security.grsecurity = {
-
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Enable grsecurity/PaX.
-      '';
-    };
-
-    lockTunables = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to automatically lock grsecurity tunables
-        (<option>boot.kernel.sysctl."kernel.grsecurity.*"</option>).  Disable
-        this to allow runtime configuration of grsecurity features.  Activate
-        the <literal>grsec-lock</literal> service unit to prevent further
-        configuration until the next reboot.
-      '';
-    };
-
-    disableEfiRuntimeServices = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to disable access to EFI runtime services.  Enabling EFI runtime
-        services creates a venue for code injection attacks on the kernel and
-        should be disabled if at all possible.  Changing this option enters into
-        effect upon reboot.
-      '';
-    };
-
-  };
-
-  config = mkIf cfg.enable {
-
-    boot.kernelPackages = mkForce pkgs.linuxPackages_grsec_nixos;
-
-    boot.kernelParams = [ "grsec_sysfs_restrict=0" ]
-      ++ optional cfg.disableEfiRuntimeServices "noefi";
-
-    nixpkgs.config.grsecurity = true;
-
-    # Install PaX related utillities into the system profile.
-    environment.systemPackages = with pkgs; [ gradm paxctl pax-utils ];
-
-    # Install rules for the grsec device node
-    services.udev.packages = [ pkgs.gradm ];
-
-    # This service unit is responsible for locking the grsecurity tunables.  The
-    # unit is always defined, but only activated on bootup if lockTunables is
-    # toggled.  When lockTunables is toggled, failure to activate the unit will
-    # enter emergency mode.  The intent is to make it difficult to silently
-    # enter multi-user mode without having locked the tunables.  Some effort is
-    # made to ensure that starting the unit is an idempotent operation.
-    systemd.services.grsec-lock = {
-      description = "Lock grsecurity tunables";
-
-      wantedBy = optional cfg.lockTunables "multi-user.target";
-
-      wants = [ "local-fs.target" "systemd-sysctl.service" ];
-      after = [ "local-fs.target" "systemd-sysctl.service" ];
-      conflicts = [ "shutdown.target" ];
-
-      restartIfChanged = false;
-
-      script = ''
-        if ${pkgs.gnugrep}/bin/grep -Fq 0 ${grsecLockPath} ; then
-          echo -n 1 > ${grsecLockPath}
-        fi
-      '';
-
-      unitConfig = {
-        ConditionPathIsReadWrite = grsecLockPath;
-        DefaultDependencies = false;
-      } // optionalAttrs cfg.lockTunables {
-        OnFailure = "emergency.target";
-      };
-
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-      };
-    };
-
-    # Configure system tunables
-    boot.kernel.sysctl = {
-      # Read-only under grsecurity
-      "kernel.kptr_restrict" = mkForce null;
-
-      # All grsec tunables default to off, those not enabled below are
-      # *disabled*.  We use mkDefault to allow expert users to override
-      # our choices, but use mkForce where tunables would outright
-      # conflict with other settings.
-
-      # Enable all chroot restrictions by default (overwritten as
-      # necessary below)
-      "kernel.grsecurity.chroot_caps" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_bad_rename" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_chmod" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_chroot" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_fchdir" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_mknod" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_mount" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_pivot" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_shmat" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_sysctl" = mkDefault 1;
-      "kernel.grsecurity.chroot_deny_unix" = mkDefault 1;
-      "kernel.grsecurity.chroot_enforce_chdir" = mkDefault 1;
-      "kernel.grsecurity.chroot_findtask" = mkDefault 1;
-      "kernel.grsecurity.chroot_restrict_nice" = mkDefault 1;
-
-      # Enable various grsec protections
-      "kernel.grsecurity.consistent_setxid" = mkDefault 1;
-      "kernel.grsecurity.deter_bruteforce" = mkDefault 1;
-      "kernel.grsecurity.fifo_restrictions" = mkDefault 1;
-      "kernel.grsecurity.harden_ipc" = mkDefault 1;
-      "kernel.grsecurity.harden_ptrace" = mkDefault 1;
-      "kernel.grsecurity.harden_tty" = mkDefault 1;
-      "kernel.grsecurity.ip_blackhole" = mkDefault 1;
-      "kernel.grsecurity.linking_restrictions" = mkDefault 1;
-      "kernel.grsecurity.ptrace_readexec" = mkDefault 1;
-
-      # Enable auditing
-      "kernel.grsecurity.audit_ptrace" = mkDefault 1;
-      "kernel.grsecurity.forkfail_logging" = mkDefault 1;
-      "kernel.grsecurity.rwxmap_logging" = mkDefault 1;
-      "kernel.grsecurity.signal_logging" = mkDefault 1;
-      "kernel.grsecurity.timechange_logging" = mkDefault 1;
-    } // optionalAttrs config.nix.useSandbox {
-      # chroot(2) restrictions that conflict with sandboxed Nix builds
-      "kernel.grsecurity.chroot_caps" = mkForce 0;
-      "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;
-      "kernel.grsecurity.chroot_deny_chroot" = mkForce 0;
-      "kernel.grsecurity.chroot_deny_mount" = mkForce 0;
-      "kernel.grsecurity.chroot_deny_pivot" = mkForce 0;
-    } // optionalAttrs containerSupportRequired {
-      # chroot(2) restrictions that conflict with NixOS lightweight containers
-      "kernel.grsecurity.chroot_caps" = mkForce 0;
-      "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;
-      "kernel.grsecurity.chroot_deny_mount" = mkForce 0;
-      "kernel.grsecurity.chroot_restrict_nice" = mkForce 0;
-      # Disable privileged IO by default, unless X is enabled
-    } // optionalAttrs (!config.services.xserver.enable) {
-      "kernel.grsecurity.disable_priv_io" = mkDefault 1;
-    };
-
-  };
-}
diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml
deleted file mode 100644
index 0a884b3f9b5..00000000000
--- a/nixos/modules/security/grsecurity.xml
+++ /dev/null
@@ -1,385 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         version="5.0"
-         xml:id="sec-grsecurity">
-
-  <title>Grsecurity/PaX</title>
-
-  <para>
-    Grsecurity/PaX is a set of patches against the Linux kernel that
-    implements an extensive suite of
-    <link xlink:href="https://grsecurity.net/features.php">features</link>
-    designed to increase the difficulty of exploiting kernel and
-    application bugs.
-  </para>
-
-  <para>
-    The NixOS grsecurity/PaX module is designed with casual users in mind and is
-    intended to be compatible with normal desktop usage, without
-    <emphasis>unnecessarily</emphasis> compromising security.  The
-    following sections describe the configuration and administration of
-    a grsecurity/PaX enabled NixOS system.  For more comprehensive
-    coverage, please refer to the
-    <link xlink:href="https://en.wikibooks.org/wiki/Grsecurity">grsecurity wikibook</link>
-    and the
-    <link xlink:href="https://wiki.archlinux.org/index.php/Grsecurity">Arch
-    Linux wiki page on grsecurity</link>.
-
-    <warning><para>Upstream has ceased free support for grsecurity/PaX.  See
-    <link xlink:href="https://grsecurity.net/passing_the_baton.php">
-    the announcement</link> for more information.  Consequently, NixOS
-    support for grsecurity/PaX also must cease.  Enabling this module will
-    result in a build error.</para></warning>
-    <note><para>We standardise on a desktop oriented configuration primarily due
-    to lack of resources.  The grsecurity/PaX configuration state space is huge
-    and each configuration requires quite a bit of testing to ensure that the
-    resulting packages work as advertised.  Defining additional package sets
-    would likely result in a large number of functionally broken packages, to
-    nobody's benefit.</para></note>
-  </para>
-
-  <sect1 xml:id="sec-grsec-enable"><title>Enabling grsecurity/PaX</title>
-
-  <para>
-    To make use of grsecurity/PaX on NixOS, add the following to your
-    <filename>configuration.nix</filename>:
-    <programlisting>
-      security.grsecurity.enable = true;
-    </programlisting>
-    followed by
-    <programlisting>
-      # nixos-rebuild boot
-      # reboot
-    </programlisting>
-    <note><para>
-      Enabling the grsecurity module overrides
-      <option>boot.kernelPackages</option>, to reduce the risk of
-      misconfiguration.  <xref linkend="sec-grsec-custom-kernel" />
-      describes how to use a custom kernel package set.
-    </para></note>
-
-    For most users, further configuration should be unnecessary.  All users
-    are encouraged to look over <xref linkend="sec-grsec-security" /> before
-    using the system, however.  If you experience problems, please refer to
-    <xref linkend="sec-grsec-issues" />.
-  </para>
-
-  <para>
-    Once booted into the new system, you can optionally use
-    <command>paxtest</command> to exercise various PaX features:
-    <screen><![CDATA[
-    # nix-shell -p paxtest --command 'paxtest blackhat'
-    Executable anonymous mapping             : Killed
-    Executable bss                           : Killed
-    # ... remaining output truncated for brevity
-    ]]></screen>
-  </para>
-
-  </sect1>
-
-  <sect1 xml:id="sec-grsec-declarative-tuning"><title>Declarative tuning</title>
-
-  <para>
-    The default configuration mode is strictly declarative.  Some features
-    simply cannot be changed at all after boot, while others are locked once the
-    system is up and running.  Moreover, changes to the configuration enter
-    into effect only upon booting into the new system.
-  </para>
-
-  <para>
-    The NixOS module exposes a limited number of options for tuning the behavior
-    of grsecurity/PaX.  These are options thought to be of particular interest
-    to most users.  For experts, further tuning is possible via
-    <option>boot.kernelParams</option> (see
-    <xref linkend="sec-grsec-kernel-params" />) and
-    <option>boot.kernel.sysctl."kernel.grsecurity.*"</option> (the wikibook
-    contains an <link xlink:href="https://en.wikibooks.org/wiki/Grsecurity/Appendix/Sysctl_Options">
-    exhaustive listing of grsecurity sysctl tunables</link>).
-  </para>
-
-  </sect1>
-
-  <sect1 xml:id="sec-grsec-manual-tuning"><title>Manual tuning</title>
-
-  <para>
-    To permit manual tuning of grsecurity runtime parameters, set:
-    <programlisting>
-      security.grsecurity.lockTunables = false;
-    </programlisting>
-    Once booted into this system, grsecurity features that have a corresponding
-    sysctl tunable can be changed without rebooting, either by switching into
-    a new system profile or via the <command>sysctl</command> utility.
-  </para>
-
-  <para>
-    To lock all grsecurity tunables until the next boot, do:
-    <screen>
-      # systemctl start grsec-lock
-    </screen>
-  </para>
-
-  </sect1>
-
-  <sect1 xml:id="sec-grsec-security"><title>Security considerations</title>
-
-  <para>
-    The NixOS kernel is built using upstream's recommended settings for a
-    desktop deployment that generally favours security over performance.  This
-    section details deviations from upstream's recommendations that may
-    compromise security.
-
-    <warning><para>There may be additional problems not covered here!</para>
-    </warning>
-  </para>
-
-  <itemizedlist>
-
-    <listitem><para>
-      The following hardening features are disabled in the NixOS kernel:
-      <itemizedlist>
-        <listitem><para>Kernel symbol hiding: rendered useless by redistributing
-        kernel objects.</para></listitem>
-
-        <listitem><para>Randomization of kernel structures: rendered useless by
-        redistributing kernel objects.</para></listitem>
-
-        <listitem><para>TCP simultaneous OPEN connection is permitted: breaking
-        strict TCP conformance is inappropriate for a general purpose kernel.
-        The trade-off is that an attacker may be able to deny outgoing
-        connections if they are able to guess the source port allocated by your
-        OS for that connection <emphasis>and</emphasis> also manage to initiate
-        a TCP simultaneous OPEN on that port before the connection is actually
-        established.</para></listitem>
-
-        <listitem><para>Trusted path execution: a desirable feature, but
-        requires some more work to operate smoothly on NixOS.</para></listitem>
-      </itemizedlist>
-    </para></listitem>
-
-    <listitem><para>
-      The NixOS module conditionally weakens <command>chroot</command>
-      restrictions to accommodate NixOS lightweight containers and sandboxed Nix
-      builds.  This can be problematic if the deployment also runs privileged
-      network facing processes that <emphasis>rely</emphasis> on
-      <command>chroot</command> for isolation.
-    </para></listitem>
-
-    <listitem><para>
-      The NixOS kernel is patched to allow usermode helpers from anywhere in the
-      Nix store.  A usermode helper is an executable called by the kernel in
-      certain circumstances, e.g., <command>modprobe</command>.  Vanilla
-      grsecurity only allows usermode helpers from paths typically owned by the
-      super user.  The NixOS kernel allows an attacker to inject malicious code
-      into the Nix store which could then be executed by the kernel as a
-      usermode helper.
-    </para></listitem>
-
-    <listitem><para>
-      The following features are disabled because they overlap with
-      vanilla kernel mechanisms:
-
-      <itemizedlist>
-        <listitem><para><filename class="directory">/proc</filename> hardening:
-        use <option>security.hideProcessInformation</option> instead.  This
-        trades weaker protection for greater compatibility.
-        </para></listitem>
-
-        <listitem><para><command>dmesg</command> restrictions:
-        use <option>boot.kernel.sysctl."kernel.dmesg_restrict"</option> instead
-        </para></listitem>
-      </itemizedlist>
-    </para></listitem>
-
-  </itemizedlist>
-
-  </sect1>
-
-  <sect1 xml:id="sec-grsec-custom-kernel"><title>Using a custom grsecurity/PaX kernel</title>
-
-  <para>
-    The NixOS kernel is likely to be either too permissive or too restrictive
-    for many deployment scenarios.  In addition to producing a kernel more
-    suitable for a particular deployment, a custom kernel may improve security
-    by depriving an attacker the ability to study the kernel object code, adding
-    yet more guesswork to successfully carry out certain exploits.
-  </para>
-
-  <para>
-    To build a custom kernel using upstream's recommended settings for server
-    deployments, while still using the NixOS module:
-    <programlisting>
-      nixpkgs.config.packageOverrides = super: {
-        linux_grsec_nixos = super.linux_grsec_nixos.override {
-          extraConfig = ''
-            GRKERNSEC_CONFIG_AUTO y
-            GRKERNSEC_CONFIG_SERVER y
-            GRKERNSEC_CONFIG_SECURITY y
-          '';
-        };
-      };
-    </programlisting>
-  </para>
-
-  <para>
-    The grsecurity/PaX wikibook provides an exhaustive listing of
-    <link xlink:href="https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options">kernel configuration options</link>.
-  </para>
-
-  <para>
-    The NixOS module makes several assumptions about the kernel and so
-    may be incompatible with your customised kernel. Currently, the only way
-    to work around these incompatibilities is to eschew the NixOS
-    module.
-  </para>
-
-  <para>
-    If not using the NixOS module, a custom grsecurity package set can
-    be specified inline instead, as in
-    <programlisting>
-      boot.kernelPackages =
-        let
-          kernel = pkgs.linux_grsec_nixos.override {
-            extraConfig = /* as above */;
-          };
-          self = pkgs.linuxPackagesFor kernel self;
-        in self;
-    </programlisting>
-  </para>
-
-  </sect1>
-
-  <sect1 xml:id="sec-grsec-pax-flags"><title>Per-executable PaX flags</title>
-
-  <para>
-    Manual tuning of per-file PaX flags for executables in the Nix store is
-    impossible on a properly configured system.  If a package in Nixpkgs fails
-    due to PaX, that is a bug in the package recipe and should be reported to
-    the maintainer (including relevant <command>dmesg</command> output).
-  </para>
-
-  <para>
-    For executables installed outside of the Nix store, PaX flags can be set
-    using the <command>paxctl</command> utility:
-    <programlisting>
-      paxctl -czem <replaceable>foo</replaceable>
-    </programlisting>
-
-    <warning>
-      <para><command>paxctl</command> overwrites files in-place.</para>
-    </warning>
-
-    Equivalently, on file systems that support extended attributes:
-    <programlisting>
-      setfattr -n user.pax.flags -v em <replaceable>foo</replaceable>
-    </programlisting>
-
-    <!-- TODO: PaX flags via RBAC policy -->
-  </para>
-
-  </sect1>
-
-  <sect1 xml:id="sec-grsec-issues"><title>Issues and work-arounds</title>
-
-  <itemizedlist>
-    <listitem><para>User namespaces require <literal>CAP_SYS_ADMIN</literal>:
-    consequently, unprivileged namespaces are unsupported. Applications that
-    rely on namespaces for sandboxing must use a privileged helper. For chromium
-    there is <option>security.chromiumSuidSandbox.enable</option>.</para></listitem>
-
-    <listitem><para>Access to EFI runtime services is disabled by default:
-    this plugs a potential code injection attack vector; use
-    <option>security.grsecurity.disableEfiRuntimeServices</option> to override
-    this behavior.</para></listitem>
-
-    <listitem><para>User initiated autoloading of modules (e.g., when
-    using fuse or loop devices) is disallowed; either load requisite modules
-    as root or add them to <option>boot.kernelModules</option>.</para></listitem>
-
-    <listitem><para>Virtualization: KVM is the preferred virtualization
-    solution. Xen, Virtualbox, and VMWare are
-    <emphasis>unsupported</emphasis> and most likely require a custom kernel.
-    </para></listitem>
-
-    <listitem><para>
-      Attaching <command>gdb</command> to a running process is disallowed by
-      default: unprivileged users can only ptrace processes that are children of
-      the ptracing process.  To relax this restriction, set
-      <programlisting>
-        boot.kernel.sysctl."kernel.grsecurity.harden_ptrace" = 0;
-      </programlisting>
-    </para></listitem>
-
-    <listitem><para>
-      Overflows in boot critical code (e.g., the root filesystem module) can
-      render the system unbootable.  Work around by setting
-      <programlisting>
-        boot.kernelParams = [ "pax_size_overflow_report_only" ];
-      </programlisting>
-    </para></listitem>
-
-    <listitem><para>
-      The <citerefentry><refentrytitle>modify_ldt
-      </refentrytitle><manvolnum>2</manvolnum></citerefentry> syscall is disabled
-      by default.  This restriction can interfere with programs designed to run
-      legacy 16-bit or segmented 32-bit code.  To support applications that rely
-      on this syscall, set
-      <programlisting>
-        boot.kernel.sysctl."kernel.modify_ldt" = 1;
-      </programlisting>
-    </para></listitem>
-
-    <listitem><para>
-      The gitlab service (<xref linkend="module-services-gitlab" />)
-      requires a variant of the <literal>ruby</literal> interpreter
-      built without `mprotect()` hardening, as in
-      <programlisting>
-        services.gitlab.packages.gitlab = pkgs.gitlab.override {
-          ruby = pkgs.ruby.overrideAttrs (attrs: {
-            postFixup = "paxmark m $out/bin/ruby";
-          });
-        };
-      </programlisting>
-    </para></listitem>
-
-  </itemizedlist>
-
-  </sect1>
-
-  <sect1 xml:id="sec-grsec-kernel-params"><title>Grsecurity/PaX kernel parameters</title>
-
-  <para>
-    The NixOS kernel supports the following kernel command line parameters:
-    <itemizedlist>
-      <listitem><para>
-        <literal>pax_nouderef</literal>: disable UDEREF (separate kernel and
-        user address spaces).
-      </para></listitem>
-
-      <listitem><para>
-        <literal>pax_weakuderef</literal>: enable a faster but
-        weaker variant of UDEREF on 64-bit processors with PCID support
-        (check <code>grep pcid /proc/cpuinfo</code>).
-      </para></listitem>
-
-      <listitem><para>
-        <literal>pax_sanitize_slab={off|fast|full}</literal>: control kernel
-        slab object sanitization. Defaults to <literal>fast</literal>
-      </para></listitem>
-
-      <listitem><para>
-        <literal>pax_size_overflow_report_only</literal>: log size overflow
-        violations but leave the violating task running
-      </para></listitem>
-
-      <listitem><para>
-        <literal>grsec_sysfs_restrict=[0|1]</literal>: toggle sysfs
-        restrictions. The NixOS module sets this to <literal>0</literal>
-        for systemd compatibility
-      </para></listitem>
-    </itemizedlist>
-  </para>
-
-  </sect1>
-
-</chapter>

From bb036a327cca6601900991f70daaf82152de243c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 2 Sep 2017 20:33:15 +0200
Subject: [PATCH 3242/3246] nixos/chromium-suid-sandbox: remove reference to
 grsecurity

---
 nixos/modules/security/chromium-suid-sandbox.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix
index 0458ffb6c46..be6acb3f1f5 100644
--- a/nixos/modules/security/chromium-suid-sandbox.nix
+++ b/nixos/modules/security/chromium-suid-sandbox.nix
@@ -19,9 +19,6 @@ in
 
       Also, if the URL chrome://sandbox tells you that "You are not adequately
       sandboxed!", turning this on might resolve the issue.
-
-      Finally, if you have <option>security.grsecurity</option> enabled and you
-      use Chromium, you probably need this.
     '';
   };
 

From 004463152a63f6ec7e31c972c0f6b50c2dc75802 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 2 Sep 2017 22:36:21 +0200
Subject: [PATCH 3243/3246] tinycc: 0.9.27pre-20170710 ->  0.9.27pre-20170821

---
 pkgs/development/compilers/tinycc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 7e083ffe67b..094007aa2d0 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,10 +2,10 @@
 with stdenv.lib;
 
 let
-  date = "20170710";
+  date = "20170821";
   version = "0.9.27pre-${date}";
-  rev = "2acb04f7f2077a4cff103421d79ceee48441918a";
-  sha256 = "1rh89dx1myqfm752d4rlzrm8aadfm17fm88ps0q9ibmbxavb45qw";
+  rev = "b8fe8fc2105455eb5004be89fa8575aa928a18f3";
+  sha256 = "0rsv5pikm7ai2n7r93qlbvkyky23dsgc3sdc83crbcxjjk6xh378";
 in
 
 stdenv.mkDerivation rec {

From fd7aa385e1ffd8ef67eefe715b11c02596002d15 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sat, 2 Sep 2017 22:46:43 +0200
Subject: [PATCH 3244/3246] sbcl: 1.3.20 -> 1.3.21

---
 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 82859a0e429..2ee7d2b7e11 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.20";
+  version = "1.3.21";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0qhzrl2msdyzqp3165qlh9s6jrif5rddsmj9q50z0bxnaf0330jj";
+    sha256 = "13hmavfmxsqp2s89aa6kljpgjm6c2063bgrz0maq1ms1y3052k38";
   };
 
   patchPhase = ''

From 7da8192959f06c060a7fffd75e9c91ebebf090c6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 2 Sep 2017 22:51:24 +0200
Subject: [PATCH 3245/3246] : 2.2.0 -> 2.3.0

---
 .../python-modules/marionette-harness/marionette_driver.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
index 27c4d1bcb61..3f4e4e17581 100644
--- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
+++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "marionette_driver";
-  version = "2.2.0";
+  version = "2.3.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0phlb4r6xf3yv1z23kn6paxkq6fvfywj2h4gcbavg4w6jd63vd5z";
+    sha256 = "0ab9xxsp0zvckf32k84n52hpibw2c62sa2pmx821d3q0d67yv2vv";
   };
 
   propagatedBuildInputs = [ mozversion mozrunner ]; 

From d784b830051bb86172b9a3669826774cc20e1f41 Mon Sep 17 00:00:00 2001
From: Philipp Steinpass <philipp@xndr.de>
Date: Sat, 2 Sep 2017 21:23:56 +0200
Subject: [PATCH 3246/3246] nixos/hydra postgresql: Fix #27314 and add test
 case

---
 .../continuous-integration/hydra/default.nix  |  4 +--
 .../modules/services/databases/postgresql.nix | 19 +++++++----
 nixos/tests/hydra.nix                         | 32 +++++++++++++++++++
 3 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 nixos/tests/hydra.nix

diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index fcc0f58637c..43fec5ff5bb 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -270,8 +270,8 @@ in
 
           ${optionalString haveLocalDB ''
             if ! [ -e ${baseDir}/.db-created ]; then
-              ${config.services.postgresql.package}/bin/createuser hydra
-              ${config.services.postgresql.package}/bin/createdb -O hydra hydra
+              ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra
+              ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra
               touch ${baseDir}/.db-created
             fi
           ''}
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index d06e03a5297..1bbab329600 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -38,9 +38,6 @@ let
 
   pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4";
 
-  # NixOS traditionally used `root` as superuser, most other distros use `postgres`. From 17.09
-  # we also try to follow this standard
-  superuser = (if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root");
 
 in
 
@@ -151,6 +148,16 @@ in
           Contents of the <filename>recovery.conf</filename> file.
         '';
       };
+      superUser = mkOption {
+        type = types.str;
+        default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root";
+        internal = true;
+        description = ''
+          NixOS traditionally used `root` as superuser, most other distros use `postgres`.
+          From 17.09 we also try to follow this standard. Internal since changing this value
+          would lead to breakage while setting up databases.
+        '';
+        };
     };
 
   };
@@ -215,7 +222,7 @@ in
           ''
             # Initialise the database.
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
-              initdb -U ${superuser}
+              initdb -U ${cfg.superUser}
               # See postStart!
               touch "${cfg.dataDir}/.first_startup"
             fi
@@ -247,14 +254,14 @@ in
         # Wait for PostgreSQL to be ready to accept connections.
         postStart =
           ''
-            while ! ${pkgs.sudo}/bin/sudo -u ${superuser} psql --port=${toString cfg.port} -d postgres -c "" 2> /dev/null; do
+            while ! ${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql --port=${toString cfg.port} -d postgres -c "" 2> /dev/null; do
                 if ! kill -0 "$MAINPID"; then exit 1; fi
                 sleep 0.1
             done
 
             if test -e "${cfg.dataDir}/.first_startup"; then
               ${optionalString (cfg.initialScript != null) ''
-                ${pkgs.sudo}/bin/sudo -u ${superuser} psql -f "${cfg.initialScript}" --port=${toString cfg.port} -d postgres
+                ${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql -f "${cfg.initialScript}" --port=${toString cfg.port} -d postgres
               ''}
               rm -f "${cfg.dataDir}/.first_startup"
             fi
diff --git a/nixos/tests/hydra.nix b/nixos/tests/hydra.nix
new file mode 100644
index 00000000000..6abd7a5ad30
--- /dev/null
+++ b/nixos/tests/hydra.nix
@@ -0,0 +1,32 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "hydra-init-localdb";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ pstn ];
+  };
+
+  machine =
+    { config, pkgs, ... }:
+
+    {
+      services.hydra = {
+        enable = true;
+
+        #Hydra needs those settings to start up, so we add something not harmfull.
+        hydraURL = "example.com";
+        notificationSender = "example@example.com";
+      };
+    };
+
+  testScript =
+    ''
+      # let the system boot up
+      $machine->waitForUnit("multi-user.target");
+      # test whether the database is running
+      $machine->succeed("systemctl status postgresql.service");
+      # test whether the actual hydra daemons are running
+      $machine->succeed("systemctl status hydra-queue-runner.service");
+      $machine->succeed("systemctl status hydra-init.service");
+      $machine->succeed("systemctl status hydra-evaluator.service");
+      $machine->succeed("systemctl status hydra-send-stats.service");
+     '';
+})